diff --git a/.checkpackageignore b/.checkpackageignore new file mode 100644 index 00000000000..4faa3a8b8f8 --- /dev/null +++ b/.checkpackageignore @@ -0,0 +1,199 @@ +package/alsamixergui/0001-misc-fixes.patch Sob +package/am33x-cm3/S93-am335x-pm-firmware-load Variables +package/android-tools/0008-Include-sysmacros.h-to-compile-with-glibc-2.28.patch Sob +package/apache/S50apache Indent Shellcheck Variables +package/at/S99at Indent Variables +package/audit/S02auditd Shellcheck Variables +package/avahi/S05avahi-setup.sh Indent Variables +package/avahi/S50avahi-daemon Indent Variables +package/babeld/S50babeld Indent Shellcheck Variables +package/bind/S81named Indent Shellcheck Variables +package/boinc/S99boinc-client Indent Shellcheck Variables +package/brickd/S70brickd Indent Shellcheck Variables +package/brltty/S10brltty Indent Shellcheck Variables +package/busybox/S02sysctl Variables +package/busybox/S10mdev ConsecutiveEmptyLines Indent Shellcheck +package/busybox/S15watchdog Indent Variables +package/busybox/S50telnet Indent Shellcheck Variables +package/busybox/udhcpc.script Shellcheck +package/c-icap/S96cicap Indent Shellcheck Variables +package/cfm/S65cfm Indent Variables +package/cgroupfs-mount/S30cgroupfs Indent Shellcheck Variables +package/chrony/S49chrony Indent Shellcheck Variables +package/connman/S45connman Variables +package/coremark-pro/coremark-pro.sh.in Shellcheck +package/curlftpfs/0001-fix-CURLOPT_INFILESIZE.patch Sob +package/curlftpfs/0002-free_ftpfs_file-memleak-fix.patch Sob +package/curlftpfs/0003-nocache-memleak-fix.patch Sob +package/dante/S50dante Indent Shellcheck Variables +package/darkhttpd/S50darkhttpd Indent Shellcheck Variables +package/dbus/S30dbus Indent Shellcheck TrailingSpace Variables +package/dcron/S90dcron Variables +package/dhcp/S80dhcp-relay Shellcheck Variables +package/dhcp/S80dhcp-server Shellcheck Variables +package/dhcp/dhclient-script Shellcheck TrailingSpace +package/dhcpcd/S41dhcpcd Indent Variables +package/dhrystone/0001-cmdline-nruns.patch Sob +package/dhrystone/0002-HZ.patch Sob +package/dhrystone/0003-exit.patch Sob +package/dhrystone/0004-headers.patch Sob +package/dhrystone/0005-prototypes.patch Sob +package/directfb-examples/0001-remove-bzero.patch Sob +package/dmraid/S20dmraid Variables +package/dnsmasq/S80dnsmasq Shellcheck Variables +package/docker-engine/S60dockerd Indent Shellcheck Variables +package/domoticz/S99domoticz Shellcheck +package/dracut/merged-usr-module-setup.sh Shellcheck +package/dropbear/S50dropbear Indent Shellcheck Variables +package/earlyoom/S02earlyoom Indent Shellcheck +package/ejabberd/S50ejabberd Indent Shellcheck Variables +package/ejabberd/check-erlang-lib Shellcheck +package/eudev/S10udev ConsecutiveEmptyLines Indent Shellcheck Variables +package/exim/S86exim Indent Variables +package/fail2ban/S60fail2ban Shellcheck Variables +package/fakedate/fakedate Shellcheck +package/fbv/0001-cross.patch Sob +package/fbv/0002-fix-24bpp-support-on-big-endian.patch Sob +package/fbv/0005-include.patch Sob +package/freescale-imx/imx-uuc/S80imx-uuc Indent Shellcheck Variables +package/frr/S50frr Shellcheck +package/gamin/0002-no-const-return.patch Sob +package/gcc/arc-2020.09-release/0002-libsanitizer-Remove-cyclades-from-libsanitizer.patch Sob +package/genromfs/0001-build-system.patch Sob +package/gerbera/S99gerbera Indent +package/google-breakpad/gen-syms.sh Shellcheck +package/gpsd/S50gpsd Indent Shellcheck Variables +package/haveged/S21haveged Shellcheck Variables +package/htpdate/S43htpdate Shellcheck +package/i2pd/S99i2pd Indent Shellcheck Variables +package/ifplugd/0001-cross.patch Sob +package/ifplugd/0002-fix-headers.patch Sob +package/ifupdown-scripts/S40network EmptyLastLine Indent Shellcheck Variables +package/ifupdown-scripts/network/if-pre-up.d/wait_iface EmptyLastLine Shellcheck +package/ifupdown-scripts/nfs_check Shellcheck +package/igd2-for-linux/S99upnpd Indent Shellcheck Variables +package/inadyn/S70inadyn Indent NotExecutable +package/initscripts/init.d/rcK ConsecutiveEmptyLines EmptyLastLine Shellcheck +package/initscripts/init.d/rcS ConsecutiveEmptyLines EmptyLastLine Shellcheck +package/input-event-daemon/S99input-event-daemon ConsecutiveEmptyLines Indent Variables +package/iptables/S35iptables Shellcheck +package/irda-utils/0001-daemon.patch Sob +package/irda-utils/0002-nommu.patch Sob +package/irda-utils/0003-subdir.patch Sob +package/irqbalance/S13irqbalance Indent Shellcheck Variables +package/iucode-tool/S00iucode-tool Variables +package/iwd/S40iwd Shellcheck Variables +package/keyutils/0002-cifs.patch Sob +package/kodi/S50kodi Shellcheck Variables +package/libart/0001-art-config-cross.patch Sob +package/libcgicc/0001-disable-documentation-option.patch Sob +package/libfcgi/0002-disable-examples.patch Sob +package/libftdi/0001-pkgconfig_libusb.patch Sob +package/libftdi/0002-libftdi.pc-requires-libusb-fix-static-build.patch Sob +package/libiio/S99iiod Shellcheck Variables +package/libmad/0001-mips-h-constraint-removal.patch Sob +package/lighttpd/S50lighttpd EmptyLastLine Indent Shellcheck Variables +package/linux-tools/S10hyperv Variables +package/linuxptp/S65ptp4l Indent Shellcheck +package/linuxptp/S66phc2sys Indent Shellcheck +package/lirc-tools/S25lircd Indent Variables +package/lite/0001-dfbspy-stat.patch Sob +package/lite/0002-no-tests.patch Sob +package/lite/0003-pkg-config.patch Sob +package/lldpd/S60lldpd Indent Shellcheck Variables +package/lockfile-progs/0001-sus3v-legacy.patch Sob +package/madplay/0001-switch-to-new-alsa-api.patch Sob +package/mariadb/S97mysqld Indent Shellcheck Variables +package/matchbox-keyboard/mb-applet-kbd-wrapper.sh Shellcheck TrailingSpace +package/mender-connect/S43mender-connect Shellcheck +package/mii-diag/0001-strchr.patch Sob +package/minidlna/S60minidlnad Indent Shellcheck Variables +package/minissdpd/S50minissdpd Indent Shellcheck Variables +package/modem-manager/S44modem-manager Shellcheck Variables +package/mosquitto/S50mosquitto Indent Shellcheck Variables +package/motion/S99motion Indent Shellcheck Variables +package/mpd/S95mpd Variables +package/mrouted/S41mrouted NotExecutable +package/mrp/S65mrp Indent Variables +package/multipath-tools/S60multipathd Shellcheck +package/neard/S53neard Indent Shellcheck Variables +package/netatalk/S50netatalk EmptyLastLine Indent Variables +package/netcat/0001-signed-bit-counting.patch Sob +package/netopeer2/S52netopeer2 Shellcheck Variables +package/netplug/0001-makefile-flags.patch Sob +package/netplug/S29netplug Indent Shellcheck Variables +package/netplug/netplug-script ConsecutiveEmptyLines Shellcheck +package/netsnmp/S59snmpd Indent Shellcheck Variables +package/network-manager/S45network-manager ConsecutiveEmptyLines EmptyLastLine Shellcheck Variables +package/nfs-utils/S60nfs ConsecutiveEmptyLines Shellcheck Variables +package/nginx/S50nginx Indent Variables +package/nodm/S90nodm Indent Shellcheck Variables +package/nss-pam-ldapd/S45nslcd EmptyLastLine Indent Shellcheck Variables +package/ntp/S49ntp.in Variables +package/ofono/S46ofono Variables +package/olsr/S50olsr Indent Shellcheck Variables +package/openntpd/S49ntp Shellcheck Variables +package/openssh/S50sshd EmptyLastLine Indent Variables +package/openvmtools/shutdown Shellcheck +package/openvpn/S60openvpn Indent Shellcheck Variables +package/oracle-mysql/S97mysqld Shellcheck Variables +package/owfs/S55owserver Shellcheck Variables +package/owfs/S60owfs Shellcheck Variables +package/pigpio/S50pigpio Shellcheck Variables +package/pkgconf/pkg-config.in Shellcheck +package/poco/0001-Fix-optional-JSON-support-for-MySQL-3753.patch Sob +package/postgresql/S50postgresql Variables +package/procps-ng/S02sysctl Variables +package/proftpd/S50proftpd Indent Shellcheck Variables +package/prosody/S50prosody Indent Shellcheck Variables +package/ptpd/S65ptpd Indent Shellcheck Variables +package/ptpd2/S65ptpd2 Indent Shellcheck Variables +package/pulseaudio/S50pulseaudio ConsecutiveEmptyLines EmptyLastLine Indent Variables +package/python-web2py/S51web2py Shellcheck Variables +package/rdesktop/0001-8bit-colors.patch Sob +package/redis/S50redis Shellcheck Variables +package/restorecond/S02restorecond Shellcheck +package/rng-tools/S21rngd Shellcheck Variables +package/rpcbind/S30rpcbind EmptyLastLine Indent Variables +package/rubix/0002-misc-fixes.patch Sob +package/rygel/S99rygel Indent Shellcheck Variables +package/samba4/S91smb Indent Shellcheck Variables +package/seatd/S70seatd NotExecutable Variables +package/ser2net/S50ser2net Indent Shellcheck Variables +package/shairport-sync/S99shairport-sync Indent Shellcheck Variables +package/skeleton-init-systemd/fakeroot_tmpfiles.sh Shellcheck +package/smcroute/S41smcroute Indent NotExecutable Variables +package/smstools3/S50smsd Shellcheck Variables +package/solarus/0002-Add-a-basic-FindOpenGLES2.cmake.patch Sob +package/squid/S97squid Indent Shellcheck Variables +package/sshguard/S49sshguard Indent +package/sslh/S35sslh Indent Shellcheck Variables +package/stunnel/S50stunnel Indent Shellcheck Variables +package/supervisor/S99supervisord Variables +package/suricata/S99suricata Shellcheck +package/swupdate/swupdate.sh Shellcheck +package/sysrepo/S51sysrepo-plugind Indent Shellcheck +package/targetcli-fb/S50target Shellcheck Variables +package/tcf-agent/S55tcf-agent Shellcheck Variables +package/tftpd/S80tftpd-hpa Indent Shellcheck Variables +package/ti-gfx/S80ti-gfx Shellcheck Variables +package/ti-gfx/esrev.sh Shellcheck +package/ti-sgx-um/S80ti-sgx Variables +package/tpm2-abrmd/S80tpm2-abrmd Indent Shellcheck Variables +package/transmission/S92transmission ConsecutiveEmptyLines Indent Shellcheck Variables +package/triggerhappy/S10triggerhappy Indent Shellcheck Variables +package/tvheadend/S99tvheadend Indent Shellcheck Variables +package/unbound/S70unbound Shellcheck +package/unscd/S46unscd Indent Shellcheck Variables +package/upmpdcli/S99upmpdcli Indent Shellcheck Variables +package/usbguard/S20usbguard Indent Shellcheck Variables +package/vala/vala-wrapper Shellcheck +package/vsftpd/S70vsftpd Indent Shellcheck Variables +package/watchdogd/S01watchdogd Indent NotExecutable +package/wpa_supplicant/ifupdown.sh Shellcheck +package/x11r7/xapp_xdm/S99xdm Indent Variables +package/x11r7/xdriver_xf86-video-mach64/0001-cross-compile.patch Sob +package/x11r7/xdriver_xf86-video-savage/0001-cross-compile.patch Sob +package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch Sob +package/x11r7/xserver_xorg-server/S40xorg Shellcheck Variables +package/xl2tp/xl2tpd TrailingSpace diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cad35c96bc8..3d7719568f0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ # Configuration for Gitlab-CI. # Builds appear on https://gitlab.com/buildroot.org/buildroot/pipelines -image: $CI_REGISTRY/buildroot.org/buildroot/base:20220206.1756 +image: $CI_REGISTRY/buildroot.org/buildroot/base:20230207.1123 stages: - generate-gitlab-ci @@ -10,6 +10,11 @@ stages: generate-gitlab-ci-yml: stage: generate-gitlab-ci script: ./support/scripts/generate-gitlab-ci-yml support/misc/gitlab-ci.yml.in > generated-gitlab-ci.yml + retry: + max: 2 + when: + - runner_system_failure + - stuck_or_timeout_failure artifacts: when: always paths: diff --git a/.shellcheckrc b/.shellcheckrc new file mode 100644 index 00000000000..e69de29bb2d diff --git a/CHANGES b/CHANGES index 59ae8f15cef..c6ccc09e3f2 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,1288 @@ +2023.02.5, released September 27th, 2023 + + Important / security related fixes. + + Updated/fixed packages: agentpp, asterisk, at91dataflashboot, + aubio, berkeleydb, bind, bwm-ng, chocolate-doom, clamav, + compiler-rt, connman, cups, dav1d, diffutils, dracut, dt, + expect, fail2ban, fio, flite, freerdp, freeswitch, fstrcmp, + gcc, gdb, ghostscript, gmp, go, grub2, haproxy, + heirloom-mailx, hwloc, icu, intel-microcode, irssi, libcoap, + libcurl, libiec61850, libjxl, libks, libksba, libmodsecurity, + libpjsip, libqb, libraw, libssh, libtommath, less, lldpd, + log4cxx, lsof, mdadm, mosquitto, mpd, mutt, mv-ddr-marvell, + ne10, netatalk, network-manager, nftables, nodejs, ntpsec, + nut, openblas, openjdk, openjdk-bin, opensc, openssh, + pcm-tools, perftest, php, pixman, poppler, postgresql, pppd, + python-django, python-ipython, python-pip, python-pylibfdt, + python-tornado, python3, qt5, ramspeed, rtl8189fs, samba4, + screen, screenfetch, sngrep, sofia-sip, stellarium, + strongswan, sysstat, tar, tcl, uboot, uclibc, vim, webkitgtk, + webp, wireshark, xfsprogs, xserver_xorg-server, xterm, yajl, + zbar, zxing-cpp + + Issues resolved (http://bugs.uclibc.org): + + #14366: Nodejs fails with "version `GLIBC_2.34' not found".. + #15754: The docker-engine and docker-cli versions are not... + #15787: atmel_sama5d3_xplained_mmc_defconfig: Missing... + #15790: at91sam9x5ek_dev_defconfig: Missing... + +2023.02.4, released August 31th, 2023 + + Important / security related fixes. + + Toolchains: Correctly mark Bootlin external toolchains as + having OpenMP support. + + Arch: Mark Alderlake x86 variants as having no AVX512 support. + + Utils: Ensure utils/docker-run correctly supports git + worktrees. + + Defconfigs: Beaglebone qt5: Enable support for green wireless + variant. + + Updated/fixed packages: arm-trusted-firmware, bind, cairo, + cmocka, containerd, crudini, dmidecode, ffmpeg, freescale-imx, + gcc, gdb, ghostscript, gkrellm, gnuradio, go, heimdall, + iperf3, libcurl, libmodsecurity, libopenssl, libssh, + libubootenv, libuhttpd, linux-tools, ntp, openssh, php, + pipewire, python-iniparse, python-iptables, python-pysmb, + rtl8189fs, sam-ba, samba4, seatd, speex, supertuxkart, sysdig, + tor, tpm2-tss, uboot, unzip, webkitgtk, wireless-regdb, + wolfssl, wpebackend-fdo wpewebkit, xenomai, yaml-cpp, yavta + + Issues resolved (http://bugs.uclibc.org): + + #15634: fluidsynths refers to missing libgomp.so.1 + +2023.02.3, released July 17th, 2023 + + Important / security related fixes. + + Defconfigs: Chiliboard: fix build on hosts without openssl + development headers. + Nitrogen*: fix build on hosts without openssl or pylibfdt. + Raspberrypi: Handle DTB overlays for all variants + + Updated/fixed packages: agentpp, alsa-plugins, assimp, bind, + busybox, dbus, c-ares, check, dav1d, fluidsynth, fftw, fwts, + ghostscript, gnupg2, gnuradio, gupnp, haproxy, heimdal, + hwdata, jhead, libcap, libgcrypt, libgpg-error, libgtk3, + libxslt, mesa3d-demos, mpir, nodejs, php, pkgconf, + python-cryptography, python-dbus-fast, python-django, + python-pyicu, python-requests, python3, qt6, quickjs, + sconeserver, taglib, tiff, wireshark, xdriver_xf86-video-dummy + + Issues resolved (http://bugs.uclibc.org): + + #15643: ERROR: No hash found for linux-6.3.8.tar.xz + #15673: PKGCONF_SITE in pkgconf.mk points to parked domain + #15682: pkgconf: no longer able to download source from... + +2023.02.2, released June 16th, 2023 + + Important / security related fixes. + + Infrastructure: Add BR2_HOST_CMAKE_AT_LEAST_* for packages + needing a newer host-cmake than what is currently enforced + (3.18) - Up to the version provided by the cmake package (3.22). + + utils/docker-run: Now correctly handles git + workdirs/worktrees. + + Defconfigs: QEMU s390x: Bump rootfs size to make room for + kernel modules, Stm32f4xx: Tweak config to save RAM, Xilinx + Versal vck190: Use correct (A72) CPU variant + + Updated/fixed packages: atkmm, bird, busybox, cairomm1_14, + cmake, containerd, crudini, cups, delve, docker-cli, + docker-engine, earlyoom, edid-decode, fluent-bit, freeswitch, + gcc, gdb, glibmm_2_66, gnupg2, go, gptfdisk, graphicsmagick, + intel-microcode, libass, libcurl, libdeflate, libgeos, + libgtk3, libjxl, libnftl, libopenssl, libressl, libssh, llvm, + lua, mesa3d, micropython, minidlna, moby-buildkit, mpd, mupdf, + ncurses, nftables, openjdk, openjdk-bin, php, postgresql, + python-can, python-django, python-django, python-ipython, + python-matplotlib, python-mupdf, python-requests, python3, + qemu, redis, rpm, runc, sdl2_mixer, tzdata, uclibc, vdr, + wilc-firmware, xapp_xcalc, xapp_xdpyinfo, xapp_xinput, + xapp_xwininfo, xdata_xbitmaps, xdata_xcursor-themes, + xdriver_xf86-input-mouse, xdriver_xf86-video-ark, + xdriver_xf86-video-geode, xdriver_xf86-video-neomagic, + xfont_encodings, xlib_libX11, xlib_libXaw, xlib_libXi, + xlib_libXfixes, xlib_libXft, xlib_libXpm, zfs, znc + + New packages: perl-clone, perl-http-message, python-asttokens, + python-executing, python-pure-eval, python-stack-data + + Issues resolved (http://bugs.uclibc.org): + + #15421: qemu_aarch64_ebbr_defconfig: Missing Linux kernel source code + +2023.02.1, released May 9th, 2023 + + Important / security related fixes. + + Infrastucture: + - go: Ensure go versions of os/user and net are used for + static builds so CGO is not used + + - rust / cargo: Correctly split up rust flags for host and + target builds + + Defconfigs: Olimex a20 olinuxino lime*: Bring up network at + boot, stmf469 disco sd: Lock U-Boot version + + Updated/fixed packages: agentpp, apache, bluez5_utils, + ca-certificates, containerd, coremark, dcron, dnsmasq, + docker-cli, docker-engine, efivar, eudev, ffmpeg, flann, + fluidsynth, git, go, 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, intel-microcode, + kexec, libcurl, libite, libgtk3, libmicrohttpd, libxml2, + linux-tools, lua, mali-driver, matio, mdadm, nginx, openocd, + openssh, php, poppler, postgresql, python-web2py, qt6base, + readline, rtl8189fs, rtl8723ds, rtl8812au-aircrack-ng, runc, + rust, rust-bin, s390-tools, samba4, sdl2, snmppp, sudo, + systemd, tcpdump, uclibc, vim, webkitgtk, wireshark, + wpewebkit, xr819-radio, xserver_xorg-server, zeek + + Issues resolved (http://bugs.uclibc.org): + + #14356: cronstamp jobs are not performed with bumped version of... + #15306: glibc build fails in Docker container + #15376: Libiconv config + #15461: QtVirtualKeyboard segfaults + +2023.02, released March 12th, 2023 + + Fixes all over the tree. + + Updated/fixed packages: ace, apache, audit, bridge-utils, + docker-engine, go, gtkmm3, janet, libbpf, libev, libgcrypt, + libgpg-error, libmad, linux, mesa3d, network-manager, nut, + pcre2, php, rdma-core, rsync, rtl8821cu, rtl_433, + s6-linux-utils, speechd, uqmi, xdriver_xf86-video-qxl, znc + + New packages: atkmm2_28, cairomm1_14, glibmm2_66, libsigc2, + pangomm2_46, python-glslang + + Issues resolved (http://bugs.uclibc.org): + + #15306: glibc build fails in Docker container + #15321: docker-engine now requires libseccomp by default + +2023.02-rc3, released March 8th, 2023 + + Fixes all over the tree. + + Updated/fixed packages: apr, bash, docker-engine, exfat, + exfat-utils, f2fs-tools, gensio, gr-osmosdr, libcurl, libglfw, + libolm, libpcap, libpjsip, linux, mender, mpv, + multipath-tools, opus, paho-mqtt-c, proftpd, pugixml, + pulseaudio, qemu, quazip, quickjs, rtl8189es, rtl8821cu, + uacme, uqmi, wpebackend-fdo, + +2023.02-rc2, released February 27th, 2023 + + Fixes all over the tree. + + Updated/fixed packages: asterisk, at91dataflashboot, bind, + efivar, erlang, flac, fluent-bit, freerdp, gcc, gdal, gerbera, + gnuradio, gqrx, haproxy, hawktracer, imx-gpu-g2d, + intel-gmmlib, libarchive, libblockdev, libcamera-apps, libjxl, + libmodsecurity, libsigrokdecode, lightning, lirc-tools, + lttng-babeltrace, modem-manager, modsecurity2, + multipath-tools, mutt, mxs-bootlets, netsurf, network-manager, + nginx-naxsi, ntpsec, opensbi, optee-client, pcm-tools, + php-xdebug, pistache, postgresql, proxychains-ng, + python-m2crypto, python-numpy, python-webargs, + python-werkzeug, rtl8723bu, rtty, speechd, sudo, systemd, + tiff, tmux, wilc-driver, wpa_supplicant, xerces, + xtables-addons, xwayland, zabbix + + Removed packages: uccp420wlan + +2023.02-rc1, released February 20th, 2023 + + Numerous package updates and many (62) new packages. + + Toolchain: + + - The check for access to "unsafe" (E.G. from the build host) + header files and libraries by the cross compiler is now + unconditionally enabled. + + - Bootlin external toolchains updated to 2022.08 + + - The handling of the CCACHE_* environment variables by the + toolchain wrapper is now more strict, causing the variables + to only be exported when BR2_CCACHE is enabled. + + Infrastructure: + + - Br2-external: Fix make performance issue when many (> 6) + external trees are used together. + + - Legal-info: Stop warning about not saving sources for local + / override packages if _REDISTRIBUTE is set to NO. + + - Go: Ensure our go build and module cache is used, even for the + download step. + + - Cargo: CARGO_HOME (the location where cargo stores it + downloaded artifacts) is now located under DL_DIR rather + than in HOST_DIR/share/cargo, ensuring it is shared between + builds. + + Misc: + + - Erofs: Use fixed timestamp and UUID when BR2_REPRODUCIBLE is + used. + + - Ext2: Year 2038+ compatible inodes are now used by default, + independently of the filesystem size. + + - Linux: Fix build of < 5.6 kernels with host-gcc >= 10. + + A large number of NXP related packages and defconfigs have + been updated as upstream moved the git repositories to Github. + + New defconfigs: i.MX8mn BSH SMM S2 / pro, QEMU ARM EBBR, + Sipeed Lichee rv / rv dock, Starfive Visionfive2, Xilinx Versal + VCK190. + + New packages: catch2, cli11, dotconf, edk2-non-osi, + fluent-bit, fxdiv, hddtemp, highway, imx-vpu-hantro-daemon, + libjxl, libsolv, libunibreak, neon-2-sse, open-iscsi, + opencv4-contrib, perftest, perl-image-exiftool, + python-apispec, python-async-generator, python-cppy, + python-dbus-fast, python-dicttoxml2, python-flask-smorest, + python-h11, python-hkdf, python-magic-wormhole, + python-magic-wormhole-mailbox-server, + python-magic-wormhole-transit-relay, python-marshmallow, + python-munch, python-outcome, python-pycrate, python-pyspnego, + python-reedsolo, python-selenium, python-smbprotocol, + python-sniffio, python-spake2, python-trio, + python-trio-websocket, python-uhid, python-webargs, + python-wsproto, qt5speech, qt6serialbus, rdma-core, reproc, + rtl8723ds-bt, rtl8821cu, sexpect, speechd, sscep, stb, sway, + termcolor, ti-k3-r5-loader, tl-expected, unifdef, + versal-firmware, xwayland, z3 + + Removed packages: docker-proxy, elixir, gummiboot, + python-bunch, python-m2r, sun20i-d1-spl, ucl, + xdriver_xf86-input-keyboard, xdriver_xf86-video-glint, + xdriver_xf86-video-imx-viv, xdriver_xf86-video-tga + + Issues resolved (http://bugs.uclibc.org): + + #14971: Kernel 3.10.108 fail to build in Buildroot 2022.08-rc1 + #14996: Too many directories in BR2_EXTERNAL causes hang during make + #15161: kernel can't support SUBDIR + #15196: Setting BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE does not work + #15226: lsblk: not found + #15271: no start-qemu.sh + #15281: Error compiling GDAL library for RPi-64 if libgdal-dev install.. + #15291: BR2_PACKAGE_GNU_EFI_ARCH_SUPPORTS without location + #15301: Selecting NAND Flash boot media (NAND_BOOT) breaks the uboot.. + #15331: Warning on python-flit-core license when generating legal info + +2022.11.2, released March 1st, 2023 + + Important / security related fixes. + + Fix make O=..._defconfig builds (regression in 2022.11.1). + + A number of additional/stricter checks have been added to + ./utils/check-package. + + Build host dependencies check extended to check for a number + of specific perl modules to better handle distributions (like + Fedora) with very fine grained perl packages. Also ensure + build host has git >= 2.0.0 when using packages written in + go/rust because the vendoring may need it. + + Defconfigs: ASUS tinker rk3288: Fix boot issue related to TPL + + Updated/fixed packages: afboot-stm32, apache, barebox, c-ares, + elf2flt, freeswitch, fwts, gcc, gdal, git, gitlab-runner, + ipmitool, kodi, libgit2, libks, libopenssl, libressl, live555, + lua, lxc, mariadb, mesa3d-headers, modsecurity2, mongoose, + netopeer2, nodejs, openjdk, openpowerlink, openvpn, opusfile, + postgresql, proftpd, pugixml, python-future, python-idna, qt5, + rtl8192eu, rtl8723ds, sdl2, sofia-sip, ssdp-responder, sudo, + sunxi-mali-utgard, thermald, ti-sgx-km, tmux, uboot, upx, vim, + webkitgtk, wolfssl, wpewebkit, xlib_libXpm, + xserver_xorg-server, xxhash, xz, yajl, zabbix + + Issues resolved (http://bugs.uclibc.org): + + #15271: no start-qemu.sh + #15281: Error compiling GDAL library for RPi-64 if libgdal-dev install.. + #15291: BR2_PACKAGE_GNU_EFI_ARCH_SUPPORTS without location + #15301: Selecting NAND Flash boot media (NAND_BOOT) breaks the uboot.. + #15331: Warning on python-flit-core license when generating legal info + +2022.11.1, released January 18th, 2023 + + Important / security related fixes. + + Br2-external: Fix make performance issue when many (> 6) + external trees are used together. + + Erofs: Use fixed timestamp and UUID when BR2_REPRODUCIBLE is + used. + + Go: Ensure our go build and module cache is used, even for the + download step. + + Legal-info: Stop warning about not saving sources for local / + override packages if _REDISTRIBUTE is set to NO. + + Linux: Fix build of < 5.6 kernels with host-gcc >= 10. + + A large number of NXP related packages and defconfigs have + been updated as upstream moved the git repositories to Github. + + Defconfigs: zcu106, kria kv260: Fix U-Boot build + + Updated/fixed packages: asterisk, bearssl, botan, cairo, + capnproto, check, checkpolicy, connman, containerd, crun, + dbus-cxx, docker-cli, docker-engine, exempi, exfat, + exfat-utils, falcosecurity-libs, fluidsynth, fmc, fmlib, + freeradius-server, gcc, glib-networking, go, + gobject-introspection, gperf, i2pd, ima-evm-utils, + imx-alsa-plugins, imx-kobs, imx-lib, imx-m4fwloader, + imx-mkimage, intel-microcode, janus-gateway, libcurl, + libdeflate, libftdi1, libkcapi, libksba, libmbim, libmng, + libpjsip, libtalloc, libuwsc, libxkbcommon, lpeg, lrzsz, + lttng-tools, lua-cqueues, mali-driver, mbedtls, mfgtools, + moby-buildkit, mutt, opensc, php, policycoreutils, polkit, + postgresql, pptp-linux, qcom-db410c-firmware, qemu, qoriq-rcw, + qt5virtualkeyboard, redis, rhash, rtl8189es, rtl8192eu, + rtl_433, ruby, sqlite, swupdate, tealdeer, tekui, tiff, + tinyxml, tor, webkitgtk, wireshark, wpasupplicant, wpewebkit, + xr819-xradio, xdriver_xf86-video-imx-viv, xserver_xorg-server, + xxhash, zip + + Issues resolved (http://bugs.uclibc.org): + + #14971: Kernel 3.10.108 fail to build in Buildroot 2022.08-rc1 + #14996: Too many directories in BR2_EXTERNAL causes hang during make + #15161: kernel can't support SUBDIR + #15196: Setting BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE does not work + #15226: lsblk: not found + +2022.11, released December 5th, 2022 + + Fixes all over the tree. + + Defconfigs: Nitrogen8*: Bump rootfs size, Zynqmp + kv260/zcu102/zcu106: Update to Xilinx 2022.2, + + Updated/fixed packages: dash, dovecot, elf2flt, exim, gcc, + gdb, git, kodi, libarchive, libmdbx, linuxptp, lxc, + matchbox-keyboard, memcached, netsnmp, optee-client, + python-scipy, python3, qt6base, qt6serialport, rtl8188eu, + rtl8723bu, rtl8723ds, rtl8821au, vim, vlc, wilc-driver + + Removed packages: rabbitmq-server + + Issues resolved (http://bugs.uclibc.org): + + #15131: Target GDB uses internal zlib + #15151: Busybox /etc/init.d scripts are not executable + +2022.11-rc3, released November 24th, 2022 + + Fixes all over the tree. + + Updated/fixed packages: asterisk, edk2, edk2-platforms, + freerdp, gitlab-runner, gnupg2, gptfdisk, heimdal, + igh-ethercat, iwd, libkrb5, libksba, libnss, libopenssl, + mesa3d, nginx, nodejs, openpgm, python3, rsync, rtl8189es, + rtl8723ds, samba4, sdl, sdl2, swupdate, sysstat, systemd, + uboot, xen, xterm + + Issues resolved (http://bugs.uclibc.org): + + #15141: kernel 5.16.2 (realtime patch 19) fails to build + +2022.11-rc2, released November 16th, 2022 + + Fixes all over the tree. + + Removed defconfigs: Amarule a64 relic, ARM Juno, Bananapi M1 / + M1 plus / M2 plus / M64, FriendlyARM NanoPC T4 / A64 / M1 / M1 + plus / M4 / Neo2 / Neo4 / Neo plus2 / R1 / Orangepi PC2 / Plus + / Prime / rk3399 / Win, Rock PC rk3399 / PI4 / N10. + + Updated/fixed packages: alsa-utils, arm-trusted-firmware, + bdwgc, boost, botan, ca-certificates, crun, dbus-broker, + docopt-cpp, dracut, efivar, freeipmi, gawk, gensio, gptfdisk, + gsl, guile, imagemagick, ipmitool, libidn2, libkcapi, + libopenssl, libqb, libuhttpd, libvncserver, linux, + linux-tools, lxc, makedumpfile, matchbox-startup-monitor, + mdio-tools, multipath-tools, mupdf, ntfs-3g, numactl, + perl-net-ssleay, pixman, procps-ng, rpi-userland, rsync, + s6-linux-init, socat, strongswan, sudo, swupdate, systemd, + udisks, vlc, wavemon, wolfssl, zlib-ng + + Removed packages: libdcadec + + Issues resolved (http://bugs.uclibc.org): + + #15121: make nconfig failes with nvidia drivers and mesa3d selected + +2022.11-rc1, released November 3rd, 2022 + + Fixes all over the tree and new features. + + Architecture: + + - PowerPC: add Power9 CPU type + - ARM: support dropped for iWMMXt processors + + Toolchain: + + - binutils 2.39 added, binutils 2.38 is now the default + - gdb 12 added, gdb 11 is now the default + - support for 5.18, 5.19 and 6.0 kernel headers + - glibc updated to 2.36 + + Filesystem: + + - Ability to use dracut to create an initramfs that contains a + subset of the root filesystem contents. + + New packages: agent-proxy, catatonit, cni-plugins, crun, + docopt-cpp, dracut, forge, kmemd, libmanette, mdio-tools, + open-isns, python-editables, python-hatch-fancy-pypi-readme, + python-hatch-vcs, python-hatchling, python-libevdev, + python-minimalmodbus, python-pathspec, qt6-serialport, + rtl8192eu, signal-estimator, slirp4netns, tinycompress + + More than 400 packages have been updated to a newer version. + + New defconfigs: ls1028ardb, qemu_aarch64_ebbr, visionfive. + + Issues resolved: + + #11776: qt5webengine 5.12.2 build failed with arm toolchain + and linaro toolchain + #12131: qt5webengine builderror in the latest stable Buildroot + 2019.05.01 version + #13216: 2020.02.6 requires GNU find utils + #14601: Python build fails on 2022.02-rc2 + #14746: Lack of management after loading + #14796: 64 bit time and seccomp conflict (OpenSSH server crash) + #14921: wpewebkit build fails because of internal build order + #14936: nodejs does not build + #15006: toolchain Arm AArch64 toolchain 11.2-2022.02 + #15021: Buildroot not compiling with systemd and glibc. + #15026: package/udisks: install to staging + #15061: Node.js Package fails to build against musl i386 + #15071: RTL8723BS library is outdated + +2022.08.3, released December 10th, 2022 + + Important / security related fixes. + + Updated/fixed packages: asterisk, dash, dovecot, edk2, + edk2-platforms, elf2flt, exim, freerdp, gcc, gdb, git, gnupg2, + heimdal, iwd, kodi, libarchive, libkrb5, libksba, libmdbx, + libopenssl, matchbox-keyboard, memcached, netsnmp, nginx, + nodejs, openpgm, optee-client, python-scipy, python3, rsync, + rtl8723bu, samba4, sdl, sdl2, swupdate, sysstat, systemd, + uboot, vim, vlc, wilc-driver, xen, xterm + + Issues resolved (http://bugs.uclibc.org): + + 15131: Target GDB uses internal zlib + +2022.08.2, released November 16th, 2022 + + Important / security related fixes. + + Defconfig: Aspeed ast2600evb: Correct FPU config, Kontron bl + imx8mm: Bump U-Boot to fix build issue, Pine64: Change to + mainline ATF to fix build issue, Zynqmp zcu102 / zcu106 / kria + kv260: Fix pmufw reset issue + + Updated/fixed packages: arm-trusted-firmware, bind, botan, + ca-certificates, collectd, darkhttpd, dbus, dbus-broker, dhcp, + dnsmasq, docker-cli, docker-engine, exfatprogs, expat, + f2fs-tools, faad2, ffmpeg, freerdp, gitlab-runner, glibc, + gnutls, go, gpsd, gptfdisk, grub2, gsl, 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, hdparm, hostapd, imagemagick, + iwd, jack2, libbpf, libcurl, libidn2, libinput, libmdbx, + libopenssl, libosip2, libpng, libtasn1, libtorrent-rasterbar, + libuhttpd, libvncserver, libxml2, linux, linux-tools, lldpd, + lrzip, lz4, matchbox-startup-monitor, meson, msmtp, + multipath-tools, mupdf, musl, mv-ddr-marvell, mxml, nodejs, + ntfs-3g, numactl, openssh, openvmtools, oracle-mysql, + paho-mqtt-c, perl-net-ssleay, php, pixman, poppler, procps-ng, + python-django, python3, qdecoder, redis, rpi-userland, rsync, + rtl8189es, rtl8189fs, rtl8723bu, rtl8723ds, + rtl8812au-aircrack-ng, rtl8821au, rtl_433, samba4, shapelib, + socat, sqlite, squashfs, squid, strongswan, sudo, swupdate, + timescaledb, uclibc-ng-test, udisks, uftp, uhd, umtprd, + usbguard, vim, vlc, volk, wavemon, wilc-driver, + wireguard-linux-compat, wolfssl, wpa_supplicant, wpewebkit, + zlib-ng, zsh + + Issues resolved (http://bugs.uclibc.org): + + #14936: nodejs does not build + #15026: package/udisks: install to staging + #15061: Node.js Package fails to build against musl i386 + +2022.08.1, released October 2nd, 2022 + + Important / security related fixes. + + Updated/fixed packages: botan, busybox, docker-cli, + docker-engine, expat, git, haproxy, heirloom-mailx, icu, + imx-gpu-viv, libconfuse, libmdbx, libupnp, libxml2, + ltp-testsuite, m4, makedevs, mariadb, mesa3d, meson, + mosquitto, ncurses, openssh, pango, python3, qlibc, + qt5xmlpatterns, rtl8189es, rtl8723bu, rt8723ds, + rtl8812au-aircrack-ng, runc, sox, tinyproxy, uacme, unbound, + unzip, vim, xtables-addons + + Issues resolved (http://bugs.uclibc.org): + + #14796: 64 bit time and seccomp conflict (OpenSSH server crash) + #14921: wpewebkit build fails because of internal build order + +2022.08, released September 10th, 2022 + + Fixes all over the tree. + + Autotools: Drop --runstatedir=/run as it causes build issues + with older packages + + Defconfigs: rockpro64: Change to mainline ATF to fix build issue + + Updated/fixed packages: dhcpd, fwup, gcc, gdb, go, linux-tools, + minidlna, mosquitto, mv-ddr-mervell, networkd-dispatcher, + optee-os, polkit, python-pillow, python3, sconeserver, uuu, + wolfssl + +2022.08-rc2, released September 1st, 2022 + + Fixes all over the tree. + + dependencies: Ensure 'find' and 'xargs' are available on the + build host. + + A large number of typo fixes. + + Defconfigs: bananapi m1, olimex a20/a33/lime: Use standard FPU + configuration, pine64_sopine: Use mainline ATF to fix build + + Updated/fixed packages: ace, alsa-utils, busybox, cups, + dbus-broker, directfb, domoticz, drbd-utils, edk2, + edk2-platforms, ffmpeg, freeradius-server, freeswitch, gauche, + gcc, gdb, glibc, gnutls, gst1-plugins-bad, gst1-plugins-good, + hawktracer, igd-ethercat, imagemagick, intel-mediadriver, + jack2, jose, jpeg, jquery-ui-themes, kodi, libcamera, libdill, + libgit2, libglvnd, libgpg-error, libgpgme, libinput, libp11, + libsepol, libtirpc, libvirtd, libvncserver, libwpe, libzlib, + linux, linux-tools-perf, llvm, lshw, makedumpfile, + mali-driver, memcached, minetest, mutt, ne10, netsniff-ng, + ntpsec, ocrad, ola, opencv4, openocd, opensc, optee-os, + pcsc-lite, postgresql, protobuf, pulseaudio, python-autobahn, + python-paho-mqtt, python-protobuf, python-pygame, python3, qemu, + qoriq-cadence-dp-firmware, qt5doc, qt6base, ranger, rng-tools, + rsync, rustc, sconeserver, sdl2, snort, sqlite, squid, + stress-ng, strongswan, sunxi-mali-utgard-driver, sysdig, + sysklogd, syslinux, syslog-ng, tcf-agent, tcpreplay, + tesseract-ocr, uacme, uboot-tools, uclibc, udpcast, usbguard, + v4l2loopback, vim, webkitgtk, wolftpm, wpewebkit, xenomai, + xserver_xorg-server, zeek, zerofree + +2022.08-rc1, released August 12th, 2022 + + Fixes all over the tree and new features. + + Architecture + + - Support for NDS32 removed + - Support for C-SKY removed + - Support for configurable page size on ARM64 added + - Architecture menu re-organized: the MMU selection now + appears in this architecture menu. + + Toolchain: + + - GCC 12.x support added, GCC 11.x is now the default + compiler, and support for building a GCC 9.x toolchain has + been removed. + - glibc bumped to 2.35-134-gb6aade18a7e5719c942aa2da6cf3157aca993fa4 + - uclibc bumped to 1.0.42 + - BR2_GCC_ENABLE_LTO option removed, the toolchain is now + always built with LTO support. The new option BR2_ENABLE_LTO + enables the use of LTO in a subset of packages that have + explicit handling for LTO. + - GDB enabled on OpenRISC. + - Toolchain menu now appears before "Build options". The + selection of the C library now determines whether static + library (BR2_STATIC_LIBS) will be available or not, instead + of the other way around. + + Filesystem: + + - genimage.cfg files now use shortcuts from genimage for the + GUID of well-known GPT partitions. + + Bootloaders: + + - U-Boot can now be built with host-gnutls as a dependency, + needed for some configurations + - OP-TEE can now be built with host-python-pillow as a + dependency, needed for some configurations. + - OP-TEE source can now be retrieved from a custom tarball + URL. + - Grub has been bumped to 2.06. + + Over 390 packages updated. + + New defconfigs: aspeed_ast2500evb, aspeed_ast2600evb, + broadcom_northstar, canaan_kd233, qemu_riscv64_nommu_virt, + sipeed_maix_bit, sipeed_maix_bit_sdcard, sipeed_maix_dock, + sipeed_maix_dock_sdcard, sipeed_maix_go, + sipeed_maix_go_sdcard, sipeed_maixduino, + sipeed_maixduino_sdcard + + Removed defconfigs: andes_ae300, csky_gx6605s, + friendlyarm_nanopi_neo, minnowboard_max-graphical + + New packages: clpeak, compiler-rt, crucible, dbus-broker, dht, + double-conversion, dust, freeradius-server, gdal, hawktracer, + hyperfine, libb2, libdeflate, libdill, mbw, mender-connect, + minizip-zlib, nerdctl, ntpsec, opencl-hpp, opensc, + python-alembic, python-appdirs, python-beniget, + python-construct, python-dtschema, python-gast, python-kflash, + python-lark, python-maturin, python-mypy-extensions, + python-pylibfdt, python-pythran, python-pyrsistent, + python-qrcode, python-rfc3987, python-rtoml, + python-ruamel-yaml, python-scipy, python-typeguard, + python-typing-inspect, python-zlmdb, qt6base, rtl8723ds, + spirv-llvm-translator, tealdeer, uuu, vis-network, volk, + wolftpm, zeek, zerofree + + Removed packages: rtl8723bs + + Issues resolved: + + #14556: python-crossbar fails to build + #14951: boost compile error when running make silently + #14646: OpenSSH 8.9p1 compiler error under mipsel + #14841: support/download/git fails with "fatal: No such remote + 'origin'" due to incorrect check for origin remote + #13356: libabseil-cpp: not building for raspberry pi + #14911: host-python3 build needs python3 on the host + #13831: mesa3d - kmsro driver requires dri3 + #13816: xstart failed since update the x11 libraries + #13796: Problems compiling package gst-plugins-good + #14191: patchelf v0.9 corrupt Nvidia shared libraries + #14891: sudo: group setup fails since commit 9b7f8da96b + #14881: Watchdogd Package missing INSTALL_STAGING + #14876: arm-trusted-firmware can no longer be compiled with fPIE + +2022.05.3, released October 2nd, 2022 + + Important / security related fixes. + + Fixed compatibility issue with make 4.3 and the 'printvars' / + 'show-vars' commands. + + Dependencies: Ensure 'find' and 'xargs' are available on the + build host. + + A large number of typo fixes. + + Defconfigs: Galileo: Fix defconfig syntax, Licheepi zero: Fix + U-Boot dependencies, Bananapi m1, Olimx a20 olinuxino lime + 1+2, a33 olinuxino: Use standard FPU configuration, Pine 64 + sopine, Rockpro 64: Change to mainline ATF to fix build issue. + + Updated/fixed packages: ace, arm-trusted-firmware, + babeltrace2, boost, botan, busybox, clamav, cog, containerd, + cups, dhcpcd, directfb, docker-cli, docker-engine, connman, + edk2, edk2-platform, elf2flt, expat, ffmpeg, ficl, freeswitch, + gcc, gdb, git, glibc, gnutls, go, gocryptfs, graphicsmagick, + grub2, gst1-plugins-bad, gst1-plugins-good, heirloom-mailx, + icu, igh-ethercat, imagemagick, imx-gpu-viv, jack2, jose, + jpeg, jquery-ui-themes, kodi, kvm-unit-tests, libcamera, + libconfuse, libfreeimage, libglvnd, libgpg-error, libinput, + libmdbx, libp11, libsepol, libtirpc, libupnp, libvirt, + libvncserver, libwpe, libxml2, libzlib, linux, linux-tools, + lshw, m4, makedevs, mali-driver, mariadb, memcached, mesa3d, + minidlna, mosquitto, mutt, mv-ddr-marvell, ncurses, ne10, + netsniff-ng, networkd-dispatcher, ocrad, ola, opencv4, + openocd, openssh, openvmtools, pango, pcsc-lite, pistache, + polkit, postgis, postgresql, python-crossbar, + python-paho-mqtt, python-pygame, python-service-identity, + python-txdbus, python3, qemu, qlibc, + qoriq-cadence-dp-firmware, qt5xmlpatterns, ranger, redis, + rng-tools, rsync, rsyslog, rtl8189es, rtl8723bu, runc, rustc, + sconeserver, sdl2, snort, sox, sqlite, squid, stress-ng, + strongswan, sunxi-mali-utgard-driver, sysdig, syslinux, + syslog-ng, tcf-agent, tcpreplay, tesseract-ocr, tinyproxy, + uacme, uboot-tools, uclibc, unzip, usbguard, v4l2loopback, + vim, waffle, webkitgtk, weston, wolfssl, wpewebkit, xfsprogs, + xserver_xorg-server, xtables-addons, zziplib + + Issues resolved: + + #13216: [Documentation] 2020.02.6 requires GNU find utils + #14556: python-crossbar fails to build + #14796: 64 bit time and seccomp conflict (OpenSSH server crash) + #14951: boost compile error when running make silently + +2022.05.2, released August 31st, 2022 + + Important / security related fixes. + + dependencies: Ensure 'cmp' is available on the build host. + + pkg-utils: The KCONFIG_ENABLE_OPT macro used to enforce a specific + Kconfig option to be enabled (E.G. for kernel options needed by + packages) no longer changes a =m (modular) with =y (built in). + + check-host-rpath: Silence readelf warnings when clang is used + + GCC 10.x updated to 10.4.0 + + Defconfigs: Kria kv260: Fix u-boot configuration + + Updated/fixed packages: apg, arm-trusted-firmware, assimp, + bayer2rgb-neon, bind, bird, cog, cwiid, diffutils, freerdp, + fluidsynth, gcc, gdk-pixbuf, glibc, glslsandbox-player, + gnupg2, gtest, i2pd, jack2, jquery-validation, jszip, + kvm-unit-tests, libbsd, libcamera, libcurl, libest, libiio, + libkrb5, libopenssl, libp11, libpsl, libwebsockets, localedef, + luasyslog, lxc, mbedtls, mstpd, mutt, netdata, netsniff-ng, + nodejs, nvidia-driver, ola, openssl, opkg-utils, paho-mqtt-c, + pango, pcsc-lite, perl, perl-crypt-openssl-rsa, pimd, poppler, + postgis, powerpc-utils, pppd, protobuf-c, pulseaudio, + python-bottle, python-django, python-lxml, python3, qt5webkit, + redis, rpi-userland, rsyslog, runc, rustc, sconeserver, + sg3_utils, shadowsocks-libev, stellarium, suricata, swupdate, + tcpreplay, uacme, uclibc, v4l2loopback, webkitgtk, + wilc-driver, wine, wpewebkit, xdg-dbus-proxy, + xserver_xorg-server, zeromq, zfs, zlib-ng + + Issues resolved (http://bugs.uclibc.org): + + #13796: Problems compiling package gst-plugins-good + +2022.05.1, released July 24th, 2022 + + Important / security related fixes. + + Disable big endian no-mmu on ARM as it is not supported by + elf2flt. + + Tighten dependencies for external Bootlin toolchains to ensure + they can only be selected in compatible configurations. + + Support external toolchains without gdbserver. + + Updated/fixed packages: apache, avahi, bdwgc, bind, bpftool, + cups, darkhttpd, dmalloc, ecryptfs-utils, fxload, ghostscript, + gnutls, gst-omx, gst1-devtools, gst1-libav, gst1-plugins-base, + gst1-plugins-bad, gst1-plugins-good, gst1-plugins-ugly, + gst1-python, gst1-rtsp-server, gst1-vaapi, gstreamer1, + gstreamer1-editing-services, gtest, iptables, keyutils, lcms2, + libabseil-cpp, libcamera, libcurl, libeastl, libgpgme, + libgtk3, libmdbx, libmediaart, libmodsecurity, libnetconf2, + libopenssl, libpjsip, libsamplerate, libsndfile, libtalloc, + logrotate, luajit, nginx, noip, paxtest, php, postgresql, + procrank_linux, pure-ftpd, python-pillow, qdecoder, + rabbitmq-server, rpi-userland, ruby, rustc, sofia-sip, + systemd, tcpreplay, tinyproxy, tor, uacme, uboot-tools, vim, + watchdogd, webkitgtk, weston, wireguard-linux-compat, + wpa_supplicant, wpewebkit, zstd + + Issues resolved (http://bugs.uclibc.org): + + #14881: Watchdogd Package missing INSTALL_STAGING + +2022.05, released June 6th, 2022 + + Fixes all over the tree. + + Rework BR2_STATIC_LIBS handling to ensure it can only be + enabled if a suitable C library is available. + + Updated/fixed packages: arm-trusted-firmware, at91bootstap, + boinc, boost, cpulimit, diffutils, edk2, eigen, fbv, gcr, + gensio, glibc, go, gtest, iucode-tool, kvm-unit-tests, libcec, + libcurl, libks, linux, linux-tools, lttng-modules, mariadb, + memcached, mono, musl, mutt, netdata, network-manager, nginx, + ogre, openjpeg, openvpn, pipewire, python-crossbar, qemu, + qpid-proton, rauc, rockchip-mali, rsyslog, + rtl8812au-aircrack-ng, ruby, runc, rustc, samba4, tiff, + uclibc, unrar, vim, webkitgtk, wpewebkit, + xdriver_xf86-video-ati, xml-security-c, zchunk, zlib-ng + + Issues resolved (http://bugs.uclibc.org): + + #14821: Samba server is failing to compile + #14826: make qemu_x86_64_defconfig stopped working + +2022.05-rc2, released May 30th, 2022 + + Fixes all over the tree. + + Defconfigs: qemu_ppc64*: Use binutils 2.36.1 to fix build + issue, qemu_arm_vexpress_tz: Fix optee-os build issue, + qemu_arm_versatile_nommu: Drop now that nommu for ARMv5 is no + longer available + + Updated/fixed packages: dhcp, edk2, gcr, glibc, i2pd, janet, + janus-gateway, libfreeimage, libnftnl, libnss, libodb-boost, + libostree, libwebsockets, linux-tools, midori, ntfs-3g, ola, + optee-client, pcsc-lite, pipewire, python-flask, + python-service-identity, python-werkzeug, qemu, rng-tools, + rockchip-mali, strace, xdriver_xf86-video-amdgpu + + Removed packages: ktap + +2022.05-rc1, released May 18th, 2022 + + Fixes all over the tree and new features. + + Toolchain: + - glibc update to 2.35, musl updated to 1.2.3 + - gcc 11.x updated to 11.3, support for external gcc 12.x + - binutils 2.38 added, 2.32/2.35.2 removed, default changed to 2.37 + - s390x Bootlin external toolchain added + - 5.17.x kernel headers support added + + Filesystem: + - Rework OCI entrypoint/command logic to handle command arguments + - Squashfs block size is now configurable + + Graphs: Also generate a build time timeline graph (for top + level parallel builds). + + scripts/pkg-stats: Optimize memory consumption for CPE parsing + + Fix compatibility issue with the fakeroot script logic and + modern versions of dash. + + Change git:// URLs pointing to Github to https://, now that + Github has turned off support for git:// + + New defconfigs: Octavo osd32mp1_brk / osd32mp1_red + + New packages: falcosecurity-libs, lzma-alone, octave, + python-flit-core, python-orjson, python-pydevmem, + qt5webengine-chromium, qt5webengine-chromium-catapult, ragel, + tbb, wilc-driver, wtfutil + + Wilc1000-firmware renamed to wilc-firmware + + Issues resolved (http://bugs.uclibc.org): + + #14596: package dialog is outdated and contains a bug + #14651: OpenSSH 8.9p1 compiler error under ARM + #14656: Adding dependencies from an external tree does not work + #14661: Fakeroot script relies on bash-isms, does not work with.. + #14681: QT5WEBENGINE not building + #14686: genimage.cfg have a hard-coded .ext4 extension which.. + #14701: Multiple unresolved symbols while building kernel .. + #14706: nodjs build problem + #14711: nodjs build problem missing bzip + #14721: python-argon2_cffi no longer works + #14731: BR2_PACKAGE_IOSTAT + #14751: LVM2 Outdated Link + +2022.02.10, released March 1st, 2023 + + Important / security related fixes. + + Fix make O=..._defconfig builds (regression in 2022.02.9). + + A number of additional/stricter checks have been added to + ./utils/check-package. + + Build host dependencies check extended to check for a number + of specific perl modules to better handle distributions (like + Fedora) with very fine grained perl packages. Also ensure + build host has git >= 2.0.0 when using packages written in + go/rust because the vendoring may need it. + + Defconfigs: ASUS tinker rk3288: Fix boot issue related to TPL + + Updated/fixed packages: afboot-stm32, apache, barebox, c-ares, + elf2flt, freeswitch, fwts, gcc, git, kodi, libgit2, libks, + libopenssl, live555, lua, lxc, mesa3d-headers, modsecurity2, + netopeer2, openjdk, openpowerlink, openvpn, opusfile, + postgresql, pugixml, python-future, qt5, sdl2, sofia-sip, + ssdp-responder, sudo, sunxi-mali-utgard, ti-sgx-km, tmux, + uboot, upx, vim, webkitgtk, wolfssl, wpewebkit, xlib_libXpm, + xserver_xorg-server, xxhash, xz, yajl, zabbix + + Issues resolved (http://bugs.uclibc.org): + + #15271: no start-qemu.sh + #15291: BR2_PACKAGE_GNU_EFI_ARCH_SUPPORTS without location + #15301: Selecting NAND Flash boot media (NAND_BOOT) breaks the uboot.. + +2022.02.9, released January 18th, 2023 + + Important / security related fixes. + + Br2-external: Fix make performance issue when many (> 6) + external trees are used together. + + Erofs: Use fixed timestamp and UUID when BR2_REPRODUCIBLE is + used. + + Go: Ensure our go build and module cache is used, even for the + download step. + + Legal-info: Stop warning about not saving sources for local / + override packages if _REDISTRIBUTE is set to NO. + + Linux: Fix build of < 5.6 kernels with host-gcc >= 10. + + A large number of NXP related packages and defconfigs have + been updated as upstream moved the git repositories to Github. + + Updated/fixed packages: asterisk, bearssl, botan, cairo, + capnproto, check, checkpolicy, connman, containerd, + docker-cli, docker-engine, exempi, exfat, exfat-utils, fmc, + fmlib, glib-networking, go, gobject-introspection, gperf, + i2pd, ima-evm-utils, imx-alsa-plugins, imx-kobs, imx-lib, + imx-m4fwloader, imx-mkimage, intel-microcode, janus-gateway, + libcurl, libftdi1, libksba, libmbim, libmng, libpjsip, + libtalloc, libuwsc, libxkbcommon, linux, lpeg, lrzsz, + lttng-tools, lua-cqueues, mbedtls, mfgtools, mutt, php, + policycoreutils, polkit, postgresql, pptp-linux, + qcom-db410c-firmware, qemu, qoriq-rcw, qt5virtualkeyboard, + rhash, rtl_433, ruby, sqlite, swupdate, tekui, tiff, tinyxml, + tor, wayland, wireshark, wpa_supplicant, + xdriver_xf86-video-imx-viv, xserver_xorg-server, xxhash, zip + + Issues resolved (http://bugs.uclibc.org): + + #14971: Kernel 3.10.108 fail to build in Buildroot 2022.08-rc1 + #14996: Too many directories in BR2_EXTERNAL causes hang during make + #15161: kernel can't support SUBDIR + #15196: Setting BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE does not work + #15226: lsblk: not found + +2022.02.8, released December 10th, 2022 + + Important / security related fixes. + + Updated/fixed packages: asterisk, dash, dovecot, + dovecot-pigeonhole, edk2, edk2-platforms, elf2flt, exim, + freerdp, gcc, gdb, git, gnupg2, heimdal, iwd, kodi, + libarchive, libmdbx, libkrb5, libksba, libopenssl, memcached, + netsnmp, nginx, openpgm, optee-client, python3, rsync, + rtl8723bu, samba4, sdl, sdl2, swupdate, sysstat, systemd, + uboot, vim, vlc, xen, xterm + + Issues resolved (http://bugs.uclibc.org): + + #15131: Target GDB uses internal zlib + +2022.02.7, released November 17th, 2022 + + Important / security related fixes. + + Defconfig: Pine64: Change to mainline ATF to fix build + issue, Zynqmp zcu102 / zcu106: Fix pmufw reset issue + + Updated/fixed packages: arm-trusted-firmware, bind, botan, + collectd, darkhttpd, dbus, dhcp, dnsmasq, docker-cli, + docker-engine, exfatprogs, expat, f2fs-tools, faad2, ffmpeg, + freerdp, gnutls, go, gpsd, grub2, gsl, 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, hdparm, hostapd, imagemagick, + iwd, jack2, libbpf, libcurl, libfribi, libidn2, libinput, + libmdbx, libopenssl, libosip2, libpng, libtasn1, + libtorrent-rasterbar, libuhttpd, libvncserver, libxml2, linux, + linux-tools, lldpd, lrzip, lz4, matchbox-startup-monitor, + msmtp, multipath-tools, mupdf, musl, mv-ddr-marvell, mxml, + nodejs, ntfs-3g, numactl, openvmtools, oracle-mysql, + paho-mqtt-c, perl-net-ssleay, php, pixman, poppler, procps-ng, + python-django, python3, qdecoder, rpi-userland, rsync, + rtl8189es, rtl8189fs, rtl8723bu, rtl8812au-aircrack-ng, + rtl8821au, rtl_433, samba4, shapelib, socat, squid, sqlite, + squashfs, strongswan, sudo, swupdate, timescaledb, u-boot, + uclibc-ng-test, udisks, uftp, uhd, umtprd, vim, wavemon, + wireguard-linux-compat, wolfssl, wpa_supplicant, wpewebkit, + zlib-ng, zsh + + Issues resolved (http://bugs.uclibc.org): + + #15026: package/udisks: install to staging + #15061: Node.js Package fails to build against musl i386 + +2022.02.6, released October 2nd, 2022 + + Important / security related fixes. + + Fixed compatibility issue with make 4.3 and the 'printvars' / + 'show-vars' commands. + + Dependencies: Ensure 'find' and 'xargs' are available on the + build host. + + A large number of typo fixes. + + Defconfigs: Galileo: Fix defconfig syntax, Licheepi zero: Fix + U-Boot dependencies, Bananapi m1, Olimx a20 olinuxino lime + 1+2, a33 olinuxino: Use standard FPU configuration, Pine 64 + sopine, Rockpro 64: Change to mainline ATF to fix build issue. + + Updated/fixed packages: ace, arm-trusted-firmware, + babeltrace2, boost, botan, busybox, clamav, cog, connman, + containerd, cups, dhcpcd, directfb, docker-cli, docker-engine, + edk2, edk2-platforms, elf2flt, expat, ffmpeg, ficl, + freeswitch, freetype, gcc, gdb, git, gnutls, go, + graphicsmagic, grub2, gst1-plugins-bad, gst1-plugins-good, + heirloom-mailx, icu, igh-ethercat, imagemagick, imx-gpu-viv, + jose, jpeg, jquery-ui-themes, kodi, libconfuse, libfreeimage, + libglvnd, libgpg-error, libinput, libmdbx, libsepol, libtirpc, + libupnp, libvirt, libvncserver, libwpe, libxml2, libzlib, + linux, linux-tools, lshw, m4, makedevs, makedumpfile, + mali-driver, mariadb, memcached, mesa3d, minidlna, mosquitto, + mutt, mv-ddr-marvell, ncurses, ne10, netsniff-ng, + networkd-dispatcher, ocrad, opencv4, openocd, openssh, pango, + pcsc-lite, polkit, postgis, postgresql, python-paho-mqtt, + python-pygame, python3, qemu, qlibc, + qoriq-cadence-dp-firmware, qt5xmlpatterns, ranger, rng-tools, + rsync, rsyslog, rtl8189es, rtl8723be, runc, rustc, + sconeserver, sdl2, snort, sox, sqlite, squid, stress-ng, + strongswan, sunxi-mali-utgard-driver, syslinux, syslog-ng, + tcf-agent, tcpreplay, tesseract-ocr, tinyproxy, uacme, + uboot-tools, uclibc, unzip, usbguard, v4l2loopback, vim, + webkitgtk, wolfssl, wpewebkit, xfsprogs, xserver_xorg-server, + xtables-addons, zziplib + + Issues resolved: + + #13216: [Documentation] 2020.02.6 requires GNU find utils + #14796: 64 bit time and seccomp conflict (OpenSSH server crash) + #14951: boost compile error when running make silently + +2022.02.5, released August 31st, 2022 + + Important / security related fixes. + + dependencies: Ensure 'cmp' is available on the build host. + + pkg-utils: The KCONFIG_ENABLE_OPT macro used to enforce a specific + Kconfig option to be enabled (E.G. for kernel options needed by + packages) no longer changes a =m (modular) with =y (built in). + + check-host-rpath: Silence readelf warnings when clang is used + + GCC 10.x updated to 10.4.0 + + Updated/fixed packages: apg, arm-trusted-firmware, assimp, + bayer2rgb-neon, bind, bird, cog, cwiid, diffutils, fluidsynth, + freerdp, gcc, glibc, glslsandbox-player, gdk-pixbuf, gnupg2, + gtest, i2pd, jack2, jquery-validation, jszip, libbsd, libcamera, + libcurl, libest, libiio, libkrb5, libopenssl, libpsl, + luasyslog, lxc, mbedtls, mstpd, mutt, netdata, netsniff-ng, + nodejs, nvidia-driver, openssl, opkg-utils, paho-mqtt-c, + pango, pcsc-lite, perl, pimd, poppler, postgis, powerpc-utils, + pppd, protobuf-c, pulseaudio, python-bottle, python-django, + python-lxml, python3, qt5webkit, rpi-userland, rsyslog, runc, + rustc, sconeserver, sg3_utils, shadowsocks-libev, suricata, + tcpreplay, uacme, uclibc, v4l2loopback,, webkitgtk, wine, + wpewebkit, xdg-dbus-proxy, xserver_xorg-server, zeromq, zfs, + zlib-ng + + Issues resolved (http://bugs.uclibc.org): + + #13796: Problems compiling package gst-plugins-good + #14926: package/nodejs: build for host fails with GTEST errors + +2022.02.4, released July 28th, 2022 + + Important / security related fixes. + + Disable big endian no-mmu on ARM as it is not supported by + elf2flt. + + Tighten dependencies for external Bootlin toolchains to ensure + they can only be selected in compatible configurations. + + Support external toolchains without gdbserver. + + Updated/fixed packages: apache, avahi, bdwgc, bind, bpftool, + cups, darkhttpd, dmalloc, ecryptfs-utils, fxload, ghostscript, + gnutls, gst-omx, gst1-devtools, gst1-libav, gst1-plugins-base, + gst1-plugins-bad, gst1-plugins-good, gst1-plugins-ugly, + gst1-python, gst1-rtsp-server, gst1-vaapi, gstreamer1, + gstreamer1-editing-services, gtest, iptables, keyutils, lcms2, + libabseil-cpp, libcamera, libcurl, libeastl, libgpgme, + libgtk3, libmdbx, libmediaart, libmodsecurity, libnetconf2, + libopenssl, libpjsip, libsamplerate, libsndfile, libtalloc, + logrotate, luajit, nginx, noip, paxtest, php, postgresql, + procrank_linux, pure-ftpd, python-pillow, qdecoder, + rabbitmq-server, rpi-userland, rustc, sofia-sip, systemd, + tcpreplay, tinyproxy, tor, uacme, uboot-tools, vim, watchdogd, + webkitgtk, wireguard-linux-compat, wpa_supplicant, wpewebkit, + zstd + + Issues resolved (http://bugs.uclibc.org): + + #14881: Watchdogd Package missing INSTALL_STAGING + +2022.02.3, released June 19th, 2022 + + Important / security related fixes. + + Infrastructure: Fix building under paths containing regex + characters (E.G. '+') + + Toolchain: Only allow ppc64le variants for which a + glibc/musl/uclibc toolchain is supported. + Mark codescape mti/img mips toolchains as shared library only + (glibc). + + Updated/fixed packages: arm-trusted-firmware, + at91dataflashboot, boinc, dhcp, diffutils, edk2, fbv, gensio, + glibc, go, gtest, iucode-tool, janet, libcec, libcurl, + libfreeimage, libnftnl, libodb-boost, linux, linux-tools, + lttng-modules, mariadb, memcached, mono, mutt, + network-manager, nginx, ntfs-3g, ogre, openjpeg, openvpn, + qemu, qpid-proton, qt5webengine, rauc, rockchip-mali, rsyslog, + ruby, runc, rustc, samba4, strace, tiff, uclibc, unrar, vim, + webkitgtk, wpewebkit, xdriver_xf86-video-amdgpu, + xdriver_xf86-video-ati, zlib-ng + + New packages: qt5webengine-chromium, + qt5webengine-chromium-catapult + + Issues resolved (http://bugs.uclibc.org): + + #14766: package dhcp on buildroot 2022.02.1 failed + #14821: Samba server is failing to compile + #14826: make qemu_x86_64_defconfig stopped working + +2022.02.2, released May 29th, 2022 + + Important / security related fixes. + + Archictures: Drop sh2a, correct x86 Bonnell variant + + Toolchain: Bump GCC 11.x to 11.3, correct pre-installed + external toolchain logic when toolchain is available in path. + + Rework OCI filesystem entrypoint/command logic to handle + command arguments + + Defconfigs: Update Zynqmp zcu102/106 to final 2022.1 release, + fix zcu106 PLL config + + Updated/fixed packages: adwaita-icon-theme, afboot-stm32, + aircrack-ng, alchemy, alsa-lib, arptables, assimp, asterisk, + aubio, avrdude, azure-iot-sdk-c, batman-adv, binutils, + bpftool, brotli, cairo, cifs-utils, clamav, cryptodev-linux, + dhcp, diffutils, dmalloc, duktape, e2fsprogs, elf2flt, espeak, + expat, ffmpeg, fluidsynth, freerdp, gcc, git, glorytun, + glslsandbox-player, gnutls, go, gst1-imx, gst1-plugins-good, + gzip, imagemagick, janus-gateway, keepalived, kompexsqlite, + kvm-unit-tests, libarchive, libcgi, libcurl, libevdev, + libeXosip2, libhtp, libinput, libkcapi, libkrb5, libks, + libmdbx, libmnl, libnpupnp, libnspr, libopenssl, liboping, + libpjsip, libpri, libselinux, libsigsegv, libv4l, + libwebsockets, libxml2, linux, linux-tools, ltp-testsuite, + luajit, lvm2, mali-driver, mariadb, mc, minizip, mpd, mutt, + netatalk, netsurf, network-manager, nodejs, numactl, nut, + omniorb, openbox, opencv4, openjdk, openjdk-bin, openocd, + pamtester, pango, pcre2, php, php-apcu, pinentry, pixman, + polkit, postgis, postgresql, pure-ftpd, python-aenum, + python-avro, python-django, python-pillow, python-simplejson, + python-urllib3, python-zopfli, python3, qemu, qpdf, quazip, + redis, rockchip-mali, rsync, rt-tests, rust, rtl8818eu, + rtl8189es, rtl8189fs, rtl_433, sam-ba, samba4, sdl2_ttf, + shadowsocks-libev, shim, subversion, sun20i-d1-spl, suricata, + systemd, tftpd, trinity, tvheadend, udev, uftrace, + urandom-scripts, usb_modeswitch, valgrind, vde2, vim, + wireplumber, wolfssl, wpa_supplicant, xlib_libXfont2, xz, + zlib, zlog + + Issues resolved (http://bugs.uclibc.org): + + #14751: LVM2 Outdated Link + +2022.02.1, released April 11th, 2022 + + Important / security related fixes. + + Graphs: Also generate a build time timeline graph (for top + level parallel builds). + + scripts/pkg-stats: Optimize memory consumption for CPE parsing + + Fix compatibility issue with the fakeroot script logic and + modern versions of dash. + + Change git:// URLs pointing to Github to https://, now that + Github has turned off support for git:// + + Updated/fixed packages: ace, apache, apr, apr-util, belr, + bind, bluez5_utils, boinc, bpftool, busybox, cloop, cog, + containerd, cppcms, dav1d, dhcp, dieharder, dnsmasq, + docker-cli, docker-engine, efl, ell, fakeroot, flac, + fluidsynth, gdk-pixbuf, glib-networking, gnutls, 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, haproxy, htop, intel-gmmlib, + ipmiutil, iwd, jack1, jack2, lftp, libabseil-cpp, libbluray, + libcamera-apps, libcoap, libcurl, libest, libgee, libglib2, + libgtk3, libiec61850, libkrb5, libminiupnpc, libodb, + libodb-boost, libopenssl, libp11, libpsl, libressl, librstp, + librtlsdr, liburing, libyang, libzlib, luasec, lxc, matio, + meson, minidlna, minizip, mpd, mtools, netatalk, nbd, odb, + openblas, openssh, openvpn, optee-os, opus, paho-mqtt-c, + pango, php, pipewire, pkcs11-helper, postgresql, ppp, + protozero, python-aioconsole, python-avro, python-brotli, + python-greenlet, python-paramiko, python-pillow, + python-rpi-gpio, python-treq, python-twisted, python-ujson, + python-weasyprint, qt5base, qt5wayland, raptor, rpi-firmware, + rpi-userland, rtl_433, runc, rust, rygel, samba4, + shairport-sync, spice, spidev_test, stunnel, systemd, + timescaledb, trace-cmd, trousers, ts4900-fpga, tvheadend, + udpcast, unbound, upower, urandom-scripts, usbguard, valgrind, + valijson, vim, wavpack, wget, wireplumber, wireshark, woff2, + xmrig, zabbix, zlib-ng, zynaddsubfx, zziplib + + Issues resolved (http://bugs.uclibc.org): + + #13971: ip6tables-nft build does not include MASQUERADE target.. + #14651: OpenSSH 8.9p1 compiler error under ARM + #14656: Adding dependencies from an external tree does not work + #14661: Fakeroot script relies on bash-isms, does not work .. + #14686: genimage.cfg have a hard-coded .ext4 extension which.. + #14701: Multiple unresolved symbols while building kernel .. + #14711: nodjs build problem missing bzip + #14731: BR2_PACKAGE_IOSTAT + 2022.02, released March 8th, 2022 Various fixes. @@ -131,6 +1416,29 @@ #14501: lttng-modules v2.11 package fails to build #14531: Package EFL - build error +2021.11.3, released March 24th, 2022 + + Important / security related fixes. + + Updated/fixed packages: apache, azure-iot-sdk-c, boinc, dbus, + directfb, docker-engine, exempi, expat, flac, gdb, gdk-pixbuf, + gnutls, go, haproxy, libcurl, libiec61850, libminiupnpc, + libodb, libodb-boost, libopenssl, libpjsip, libressl, librsvg, + libsrtp, libvirt, libxml2, libxslt, lxc, mariadb, minidlna, + odb, openblas, openvpn, oprofile, php, pppd, python-ipython, + python-twisted, raptor, rpi-firmware, samba4, seatd, + timescaledb, usbguard, util-linux, vim, wavpack, + wireless-regdb, wireplumber, wireshark, wolfssl, xscreensaver, + xterm, zsh + + New packages: gdk-pixbuf-xlib + + Issues resolved (http://bugs.uclibc.org): + + #13126: make fails - bzip2-1.0.6.tar.gz and DirectFB-1.7.7.tar.. + #14636: azure-iot-sdk-c: Installed headers do not compile + #14641: oprofile can not find the events files + 2021.11.2, released February 28th, 2022 Important / security related fixes. @@ -780,6 +2088,41 @@ #13751: libopenssl (static): huge drop in performance in newer .. #13771: package htop has undeclared dependency on host python +2021.02.12, released April 6th, 2022 + + Important / security related fixes. + + pkg-stats: Limit memory use for CPE matching + + Updated/fixed packages: gdk-pixbuf, jack2, libzlib, matio, + nbd, netatalk, opus, python-paramiko, python-treq, + python-twisted, spidev_test, unbound, urandom-scripts, vim, + wireshark, zlib-ng, zziplib + +2021.02.11, released March 25th, 2022 + + Important / security related fixes. + + Updated/fixed packages: apache, azure-iot-sdk-c, dbus, + directfb, docker-engine, exempi, expat, flac, gdk-pixbuf, + gnutls, go, haproxy, libcurl, libiec61850, libminiupnpc, + libodb, libodb-boost, libopenssl, libpjsip, libressl, librsvg, + libsrtp, libxml2, libxslt, lxc, mariadb, odbm openblas, + openvpn, oprofile, php, pppd, python-ipython, python-treq, + python-twisted, python-txbus, python-txtorcon, raptor, + rpi-firmware, samba4, timescaledb, util-linux, vim, wavpack, + wireless-regdb, wireshark, wolfssl, xscreensaver, xterm, zsh + + New packages: gdk-pixbuf-xlib + + Removed packages: python-coherence + + Issues resolved (http://bugs.uclibc.org): + + #13126: make fails - bzip2-1.0.6.tar.gz and DirectFB-1.7.7.tar.. + #14636: azure-iot-sdk-c: Installed headers do not compile + #14641: oprofile can not find the events files + 2021.02.10, released February 28th, 2022 Important / security related fixes. @@ -6755,7 +8098,7 @@ Architecture: Default to bf532 CPU variant for blackfin, Fix flat one memory region support for m68k and disable flat - seperate data support because of compatibility issues. + separate data support because of compatibility issues. Defconfigs: Minnowboard and Raspberrypi: Fix errors with post-build scripts when systemd is used. @@ -7291,7 +8634,7 @@ Minor fixes. - Merged/seperate /usr handling is now also performed for + Merged/separate /usr handling is now also performed for staging so cross-gdb / gdbserver can find the libraries. Updated/fixed packages: autossh, conntrack-tools, dcron, diff --git a/Config.in b/Config.in index f0cd6f48eda..670e199c0b0 100644 --- a/Config.in +++ b/Config.in @@ -65,7 +65,7 @@ config BR2_NEEDS_HOST_JAVA # Hidden boolean selected by pre-built packages for x86, when they # need to run on x86-64 machines (example: pre-built external -# toolchains, binary tools like SAM-BA, etc.). +# toolchains, binary tools, etc.). config BR2_HOSTARCH_NEEDS_IA32_LIBS bool @@ -87,6 +87,8 @@ config BR2_NEEDS_HOST_GCC_PLUGIN_SUPPORT source "arch/Config.in" +source "toolchain/Config.in" + menu "Build options" menu "Commands" @@ -285,14 +287,15 @@ config BR2_LUAROCKS_MIRROR config BR2_CPAN_MIRROR string "CPAN mirror (Perl packages)" - default "http://cpan.metacpan.org" + default "https://cpan.metacpan.org" help CPAN (Comprehensive Perl Archive Network) is a repository of Perl packages. It has multiple software mirrors scattered around the world. This option allows you to select a mirror. The list of mirrors is available at: - http://search.cpan.org/mirror + http://mirrors.cpan.org/ (tabular) + http://mirrors.cpan.org/map.html (clickable world map) endif @@ -432,7 +435,7 @@ config BR2_ENABLE_RUNTIME_DEBUG config BR2_STRIP_strip bool "strip target binaries" default y - depends on !BR2_PACKAGE_HOST_ELF2FLT + depends on BR2_BINFMT_ELF help Binaries and libraries in the target filesystem will be stripped using the normal 'strip' command. This allows to save @@ -551,6 +554,25 @@ config BR2_OPTIMIZE_FAST endchoice +config BR2_ENABLE_LTO + bool "build packages with link-time optimisation" + help + Enable the link-time optimisation (LTO) option when building + packages. Link-time optimisation re-runs optimisations at + link time, which allows the compiler to do interprocedural + analysis across compilation units and thus come with better + results: smaller size and better performance. + + Note that this analysis is limited to statically linked + object files and libraries. + + This option may significantly increase build times, + sometimes 5 times longer, with only limited gains. + + At this time, this option only enables LTO in packages that + have an explicit configuration option for it. Other packages + always enable LTO, but most packages never enable LTO. + config BR2_GOOGLE_BREAKPAD_ENABLE bool "Enable google-breakpad support" depends on BR2_INSTALL_LIBSTDCPP @@ -601,6 +623,7 @@ choice config BR2_STATIC_LIBS bool "static only" + depends on !BR2_TOOLCHAIN_USES_GLIBC help Build and use only static libraries. No shared libraries will be installed on the target. This potentially increases your @@ -609,6 +632,9 @@ config BR2_STATIC_LIBS option is enabled, due to their need for dynamic library support. +comment "static only needs a toolchain w/ uclibc or musl" + depends on BR2_TOOLCHAIN_USES_GLIBC + config BR2_SHARED_LIBS bool "shared only" depends on BR2_BINFMT_SUPPORTS_SHARED @@ -659,24 +685,6 @@ config BR2_GLOBAL_PATCH_DIR menu "Advanced" -config BR2_COMPILER_PARANOID_UNSAFE_PATH - bool "paranoid check of library/header paths" - default y - help - By default, when this option is disabled, when the Buildroot - cross-compiler will encounter an unsafe library or header path - (such as /usr/include, or /usr/lib), the compiler will display - a warning. - - By enabling this option, this warning is turned into an error, - which will completely abort the build when such unsafe paths - are encountered. - - Note that this mechanism is available for both the internal - toolchain (through the toolchain wrapper and binutils patches) - and external toolchain backends (through the toolchain - wrapper). - config BR2_FORCE_HOST_BUILD bool "Force the building of host dependencies" help @@ -904,6 +912,15 @@ config BR2_FORTIFY_SOURCE_2 Also adds checks at run-time (detected buffer overflow terminates the program) +config BR2_FORTIFY_SOURCE_3 + bool "Extended" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_12 + help + This option sets _FORTIFY_SOURCES to 3 and even more + checking is added compared to level 2. Extends checks at + run-time that can introduce an additional performance + overhead. + endchoice comment "Fortify Source needs a glibc toolchain and optimization" @@ -911,8 +928,6 @@ comment "Fortify Source needs a glibc toolchain and optimization" depends on (!BR2_TOOLCHAIN_USES_GLIBC || BR2_OPTIMIZE_0) endmenu -source "toolchain/Config.in" - source "system/Config.in" source "linux/Config.in" diff --git a/Config.in.legacy b/Config.in.legacy index 3b066bbf726..64419a26153 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -144,8 +144,414 @@ endif ############################################################################### +comment "Legacy options removed in 2023.02" + +config BR2_PACKAGE_PUGIXML_HEADER_ONLY + bool "pugixml header-only removed" + select BR2_LEGACY + help + The header-only version raises a build failure with gerbera. + +config BR2_PACKAGE_UCCP420WLAN + bool "uccp420wlan removed" + select BR2_LEGACY + help + The uccp420wlan package is unmaintained and doesn't build + with any "recent" kernel (e.g. >= 4.7). + +config BR2_PACKAGE_IMX_GPU_G2D_EXAMPLES + bool "imx-gpu-g2d examples removed" + select BR2_LEGACY + help + The examples are not provided by NXP anymore. + +config BR2_KERNEL_HEADERS_6_0 + bool "kernel headers version 6.0.x are no longer supported" + select BR2_LEGACY + help + Version 6.0.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + +config BR2_KERNEL_HEADERS_4_9 + bool "kernel headers version 4.9.x are no longer supported" + select BR2_LEGACY + help + Version 4.9.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + +config BR2_PACKAGE_DOCKER_PROXY + bool "docker-proxy removed" + select BR2_LEGACY + select BR2_PACKAGE_DOCKER_ENGINE + help + docker-proxy has been dropped by upstream since version + 563fe8. it has been merged into docker-engine (moby). + +config BR2_PACKAGE_PYTHON_BUNCH + bool "python-bunch removed" + select BR2_LEGACY + help + The python-bunch package is unmaintained and is replaced + by the python-munch package. + +config BR2_TARGET_GUMMIBOOT + bool "gummiboot removed" + select BR2_LEGACY + help + gummiboot has been deprecated since 2015, with no further + updates. It became integrated into the systemd project as + systemd-boot. + +config BR2_PACKAGE_IPUTILS_NINFOD + bool "iputils 20221126 removed ninfod" + select BR2_LEGACY + help + iputils 20221126 removed ninfod. + +config BR2_PACKAGE_IPUTILS_RARPD + bool "iputils 20221126 removed rarpd" + select BR2_LEGACY + help + iputils 20221126 removed rarpd. + +config BR2_PACKAGE_IPUTILS_RDISC + bool "iputils 20221126 removed rdisc" + select BR2_LEGACY + help + iputils 20221126 removed rdisc. + +config BR2_PACKAGE_IPUTILS_RDISC_SERVER + bool "iputils 20221126 removed rdisc" + select BR2_LEGACY + help + iputils 20221126 removed rdisc. + +config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_XINGMUX + bool "xingmux moved" + select BR2_LEGACY + select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_XINGMUX + help + The xingmux option has been moved to gst1-plugins-good. + +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE + bool "videoscale removed" + select BR2_LEGACY + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERTSCALE + help + The videoscale option has been combined with videoconvert. + +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT + bool "videoconvert removed" + select BR2_LEGACY + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERTSCALE + help + The videoconvert option has been combined with videoscale. + +config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 + bool "imx-gpu-viv X11 output has been removed" + select BR2_LEGACY + help + The X11 output was dropped by NXP. + +config BR2_PACKAGE_XDRIVER_XF86_VIDEO_IMX_VIV + bool "xf86-video-imx-viv has been removed" + select BR2_LEGACY + help + The X11 output was dropped by NXP. + +config BR2_PACKAGE_QEMU_CUSTOM_TARGETS + string "the QEMU specific targets option has been removed" + help + This option has been replaced by a list of individual targets + for the many architectures supported by QEMU. + +config BR2_PACKAGE_QEMU_CUSTOM_TARGETS_WRAP + bool + default y if BR2_PACKAGE_QEMU_CUSTOM_TARGETS != "" + select BR2_LEGACY + +config BR2_PACKAGE_XDRIVER_XF86_INPUT_KEYBOARD + bool "xf86-input-keyboard removed" + select BR2_LEGACY + help + The X.org keyboard input driver no longer support Linux. + +config BR2_TARGET_SUN20I_D1_SPL + bool "sun20-d1-spl removed" + select BR2_LEGACY + help + U-Boot has gained SPL support for D1, so this temporary + bootloader is no longer supported. + +config BR2_PACKAGE_PYTHON_M2R + bool "python-m2r removed" + select BR2_LEGACY + help + The python-m2r package is unmaintained. + +config BR2_PACKAGE_MESA3D_XVMC + bool "mesa Gallium XvMC state tracker removed" + select BR2_LEGACY + help + The Gallium XvMC state tracker was removed upstream. + +config BR2_KERNEL_HEADERS_5_19 + bool "kernel headers version 5.19.x are no longer supported" + select BR2_LEGACY + help + Version 5.19.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + +config BR2_PACKAGE_XDRIVER_XF86_VIDEO_TGA + bool "xf86-video-tga removed" + select BR2_LEGACY + help + The X.org xf86-video-tga package was removed. + +config BR2_PACKAGE_XDRIVER_XF86_VIDEO_GLINT + bool "xf86-video-glint removed" + select BR2_LEGACY + help + The X.org xf86-video-glint package no longer builds with + Xserver 21 and is unmaintained. + +config BR2_PACKAGE_USBREDIR_SERVER + bool "usbredirserver removed" + select BR2_LEGACY + help + usbredirserver has been dropped by upstream since version + 0.13.0. usbredir tools (which include usbredirect binary) can + be used as a replacement. + +comment "Legacy options removed in 2022.11" + +config BR2_BINUTILS_VERSION_2_36_X + bool "binutils 2.36.x has been removed" + select BR2_LEGACY + help + binutils 2.36 has been removed, use a newer version. + +config BR2_PACKAGE_RABBITMQ_SERVER + bool "rabbitmq-server removed" + select BR2_LEGACY + help + Package was removed because it was unmaintained and had + known security issues. + +config BR2_PACKAGE_LIBOPENSSL_ENABLE_RC5 + bool "libopenssl rc5 was never enabled" + select BR2_LEGACY + help + The libopenssl option for rc5 never actually enabled rc5, + which had always been disabled in Buildroot. + +config BR2_PACKAGE_LIBDCADEC + bool "package was deprecated upstream, use ffmpeg instead" + select BR2_LEGACY + help + This decoder has been fully integrated into FFmpeg master + branch and further development will continue there. Using + FFmpeg for DTS decoding is now recommended. + +config BR2_KERNEL_HEADERS_5_17 + bool "kernel headers version 5.17.x are no longer supported" + select BR2_LEGACY + help + Version 5.17.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + +config BR2_iwmmxt + bool "ARM iwmmxt variant removed" + select BR2_LEGACY + help + Support for the ARM iwmmxt architecture variant in GCC has + bitroten and is no longer maintained. GCC maintainers + recommend to no longer use it, and suggest to use "xscale" + as a replacement architecture variant. See + https://gcc.gnu.org/bugzilla/show_bug.cgi?id=106972 + +config BR2_PACKAGE_UHD_N230 + bool "uhd N230 support removed" + select BR2_LEGACY + help + uhd N230 support has been dropped by upstream since version + 4.0.0.0. + +config BR2_PACKAGE_UHD_RFNOC + bool "uhd RFNoC support removed" + select BR2_LEGACY + help + uhd RFNoC support has been dropped by upstream since version + 4.0.0.0. + +config BR2_PACKAGE_GPSD_OLDSTYLE + bool "gpsd oldstyle removed" + select BR2_LEGACY + help + gpsd oldstyle option has been removed by upstream in 2015. + +config BR2_GDB_VERSION_9_2 + bool "gdb 9.2 removed" + select BR2_LEGACY + help + Support for GDB 9.2 has been removed. A new version has + automatically been selected. + +comment "Legacy options removed in 2022.08" + +config BR2_ECLIPSE_REGISTER + bool "Eclipse integration removed" + select BR2_LEGACY + help + The Buildroot integration with the Eclipse IDE has been + removed, as the corresponding Eclipse plugin is no longer + maintained, and is no longer usable with current versions of + Eclipse. + +config BR2_csky + bool "csky architecture removed" + select BR2_LEGACY + help + The csky architecture was removed, by lack of toolchain + support. + +config BR2_PACKAGE_MESA3D_DRI_DRIVER_I915 + bool "mesa DRI i915 driver removed" + select BR2_LEGACY + help + The DRI i915 driver was removed upstream. + +config BR2_PACKAGE_MESA3D_DRI_DRIVER_I965 + bool "mesa DRI i965 driver removed" + select BR2_LEGACY + help + The DRI i965 driver was removed upstream. + +config BR2_PACKAGE_MESA3D_DRI_DRIVER_NOUVEAU + bool "mesa DRI nouveau driver removed" + select BR2_LEGACY + help + The DRI radeon nouveau was removed upstream. + +config BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON + bool "mesa DRI radeon r100 driver removed" + select BR2_LEGACY + help + The DRI radeon r100 driver was removed upstream. + +config BR2_GCC_VERSION_9_X + bool "gcc 9.x support removed" + select BR2_LEGACY + help + Support for gcc version 9.x has been removed. The current + default version (11.x or later) has been selected instead. + +config BR2_PACKAGE_PHP_EXT_WDDX + bool "php wddx removed" + select BR2_LEGACY + help + The WDDX extension was removed from php. + +config BR2_nds32 + bool "nds32 architecture removed" + select BR2_LEGACY + help + Support for the nds32 architecture has been removed, due to + its support being removed from the upstream Linux kernel, + and its lack of maintenance in Buildroot. + +config BR2_PACKAGE_RTL8723BS + bool "rtl8723bs removed" + select BR2_LEGACY + help + Package was removed because it is not compatible with latest + kernels and is not maintained anymore: code has been removed + in 2017 as driver is available in the linux-next tree. + +comment "Legacy options removed in 2022.05" + +config BR2_PACKAGE_KTAP + bool "ktap removed" + select BR2_LEGACY + help + Package was removed because it is not compatible with latest + kernels and is not maintained anymore (no release since 2013). + +config BR2_KERNEL_HEADERS_5_16 + bool "kernel headers version 5.16.x are no longer supported" + select BR2_LEGACY + help + Version 5.16.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + +config BR2_KERNEL_HEADERS_4_4 + bool "kernel headers version 4.4.x are no longer supported" + select BR2_LEGACY + help + Version 4.4.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + +config BR2_BINUTILS_VERSION_2_32_X + bool "binutils 2.32.x has been removed" + select BR2_LEGACY + help + binutils 2.32 has been removed, use a newer version. + +config BR2_sh2a + bool "sh2a architecture support removed" + select BR2_LEGACY + help + The SuperH 2A (SH2A) architecture was not maintained, and + broken, so its support was dropped. + +config BR2_BINUTILS_VERSION_2_35_X + bool "binutils 2.35.x has been removed" + select BR2_LEGACY + help + binutils 2.35 has been removed, use a newer version. + +config BR2_PACKAGE_BOOST_LAYOUT_TAGGED + bool "boost tagged layout removed" + select BR2_LEGACY + help + Boost tagged layout isn't handled by some packages (e.g. botan + or libcpprestsdk). + +config BR2_PACKAGE_BOOST_LAYOUT_VERSIONED + bool "boost versioned layout removed" + select BR2_LEGACY + help + Boost versioned layout isn't handled by a number of autotools + and cmake packages (e.g. azmq, cc-tool, i2pd). + comment "Legacy options removed in 2022.02" +config BR2_TARGET_ROOTFS_OCI_ENTRYPOINT_ARGS + string "entrypoint argumetns has been changed as command" + help + The OCI image BR2_TARGET_ROOTFS_OCI_ENTRYPOINT_ARGS option + has been renamed to BR2_TARGET_ROOTFS_OCI_CMD to better + reflect its relation to the actual 'command' of the OCI + image. + + The new semantic for BR2_TARGET_ROOTFS_OCI_CMD is slightly + differnt in relation to how it is interpreted, so be sure to + review the help entry for it. + + Due to this breaking change, the old value here could not be + set to the new variable. + +config BR2_TARGET_ROOTFS_OCI_ENTRYPOINT_ARGS_WRAP + bool + default y if BR2_TARGET_ROOTFS_OCI_ENTRYPOINT_ARGS != "" + select BR2_LEGACY + +config BR2_PACKAGE_LIBCURL_LIBNSS + bool "libcurl NSS removed" + select BR2_LEGACY + help + NSS was deprecated in libcurl 7.82.0. + config BR2_PACKAGE_WESTON_DEFAULT_FBDEV bool "weston fbdev removed" select BR2_LEGACY @@ -424,20 +830,22 @@ config BR2_PACKAGE_SUNXI_MALI_MAINLINE config BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 bool "sunxi-mali-mainline-r6p2 was renamed" select BR2_LEGACY - select BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 help The sunxi-mali-mainline package has been renamed sunxi-mali-utgard, the suboptions of this package have also been renamed accordingly. +# Note: BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 is still referenced from +# package/sunxi-mali-utgard/Config.in config BR2_PACKAGE_SUNXI_MALI_MAINLINE_R8P1 bool "sunxi-mali-mainline-r8p1 was renamed" select BR2_LEGACY - select BR2_PACKAGE_SUNXI_MALI_UTGARD_R8P1 help The sunxi-mali-mainline package has been renamed sunxi-mali-utgard, the suboptions of this package have also been renamed accordingly. +# Note: BR2_PACKAGE_SUNXI_MALI_MAINLINE_R8P1 is still referenced from +# package/sunxi-mali-utgard/Config.in config BR2_PACKAGE_QT5WEBKIT_EXAMPLES bool "qt5webkit-examples removed" @@ -495,18 +903,20 @@ comment "Legacy options removed in 2021.11" config BR2_OPENJDK_VERSION_LTS bool "OpenJDK LTS version was renamed to OpenJDK 11" select BR2_LEGACY - select BR2_PACKAGE_OPENJDK_VERSION_11 help The LTS version option was renamed to OpenJDK 11 to make it clear what LTS version is. +# Note: BR2_OPENJDK_VERSION_LTS is still referenced from +# package/openjdk/Config.in config BR2_OPENJDK_VERSION_LATEST bool "OpenJDK latest version (16.x) was removed" select BR2_LEGACY - select BR2_PACKAGE_OPENJDK_VERSION_17 help OpenJDK 16.x is no longer mainted, so the option has been removed. Use OpenJDK 17.x instead. +# Note: BR2_OPENJDK_VERSION_LATEST is still referenced from +# package/openjdk/Config.in config BR2_PACKAGE_MPD_TIDAL bool "mpd tidal option removed" @@ -1422,6 +1832,35 @@ config BR2_PACKAGE_RPI_USERLAND_START_VCFILED help The vcfiled support was removed upstream. +config BR2_PACKAGE_TI_SGX_KM_AM335X + bool "ti-sgx-km AM335X option removed" + select BR2_LEGACY + select BR2_PACKAGE_TI_SGX_KM + help + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. + +config BR2_PACKAGE_TI_SGX_KM_AM437X + bool "ti-sgx-km AM437X option removed" + select BR2_LEGACY + help + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. + +config BR2_PACKAGE_TI_SGX_KM_AM4430 + bool "ti-sgx-km AM4430 option removed" + select BR2_LEGACY + help + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. + +config BR2_PACKAGE_TI_SGX_KM_AM5430 + bool "ti-sgx-km AM5430 option removed" + select BR2_LEGACY + help + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. + comment "Legacy options removed in 2019.11" config BR2_PACKAGE_OPENVMTOOLS_PROCPS @@ -1887,9 +2326,9 @@ config BR2_PACKAGE_FFTW_PRECISION_QUAD config BR2_PACKAGE_LUA_5_2 bool "Lua 5.2.x version removed" select BR2_LEGACY - select BR2_PACKAGE_LUA_5_3 help The Lua 5.2.x version was removed. +# Note: BR2_PACKAGE_LUA_5_2 is still referenced from package/lua/Config.in config BR2_TARGET_GENERIC_PASSWD_MD5 bool "target passwd md5 format support has been removed" @@ -2387,7 +2826,7 @@ config BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF has been renamed to BR2_PACKAGE_LIBMEDIAART_BACKEND_GDK_PIXBUF -config BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF +config BR2_PACKAGE_MEDIAART_BACKEND_QT bool "libmediaart qt backend option renamed" select BR2_LEGACY help @@ -2395,45 +2834,34 @@ config BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF BR2_PACKAGE_MEDIAART_BACKEND_QT has been renamed to BR2_PACKAGE_LIBMEDIAART_BACKEND_QT -# Note: BR2_PACKAGE_TI_SGX_AM335X is still referenced from -# package/ti-sgx-km/Config.in config BR2_PACKAGE_TI_SGX_AM335X - bool "ti-sgx-km AM335X option renamed" + bool "ti-sgx-km AM335X option removed" select BR2_LEGACY + select BR2_PACKAGE_TI_SGX_KM help - For consistency reasons, the option - BR2_PACKAGE_TI_SGX_AM335X has been renamed to - BR2_PACKAGE_TI_SGX_KM_AM335X. + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. -# Note: BR2_PACKAGE_TI_SGX_AM437X is still referenced from -# package/ti-sgx-km/Config.in config BR2_PACKAGE_TI_SGX_AM437X - bool "ti-sgx-km AM437X option renamed" + bool "ti-sgx-km AM437X option removed" select BR2_LEGACY help - For consistency reasons, the option - BR2_PACKAGE_TI_SGX_AM437X has been renamed to - BR2_PACKAGE_TI_SGX_KM_AM437X. + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. -# Note: BR2_PACKAGE_TI_SGX_AM4430 is still referenced from -# package/ti-sgx-km/Config.in config BR2_PACKAGE_TI_SGX_AM4430 - bool "ti-sgx-km AM4430 option renamed" + bool "ti-sgx-km AM4430 option removed" select BR2_LEGACY help - For consistency reasons, the option - BR2_PACKAGE_TI_SGX_AM4430 has been renamed to - BR2_PACKAGE_TI_SGX_KM_AM4430. + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. -# Note: BR2_PACKAGE_TI_SGX_AM5430 is still referenced from -# package/ti-sgx-km/Config.in config BR2_PACKAGE_TI_SGX_AM5430 - bool "ti-sgx-km AM5430 option renamed" + bool "ti-sgx-km AM5430 option removed" select BR2_LEGACY help - For consistency reasons, the option - BR2_PACKAGE_TI_SGX_AM5430 has been renamed to - BR2_PACKAGE_TI_SGX_KM_AM5430. + Starting from buildroot release 2020.02, the buildroot package + only supports the target am335x. config BR2_PACKAGE_JANUS_AUDIO_BRIDGE bool "janus-gateway audio-bridge option renamed" @@ -3033,7 +3461,7 @@ config BR2_PACKAGE_POLICYCOREUTILS_RESTORECOND select BR2_PACKAGE_RESTORECOND help The policycoreutils package no longer offers restorecond - as a option. This package has been moved into a seperate + as a option. This package has been moved into a separate package maintained by the SELinux maintainers. config BR2_PACKAGE_SEPOLGEN @@ -3627,7 +4055,7 @@ config BR2_GDB_VERSION_7_9 comment "Legacy options removed in 2016.11" config BR2_PACKAGE_PHP_SAPI_CLI_CGI - bool "PHP CGI and CLI options are now seperate" + bool "PHP CGI and CLI options are now separate" select BR2_PACKAGE_PHP_SAPI_CLI select BR2_PACKAGE_PHP_SAPI_CGI select BR2_LEGACY @@ -3763,10 +4191,11 @@ config BR2_LINUX_KERNEL_TOOL_SELFTESTS config BR2_GCC_VERSION_4_8_ARC bool "gcc arc option renamed" select BR2_LEGACY - select BR2_GCC_VERSION_ARC help The option that selects the gcc version for the ARC architecture has been renamed to BR2_GCC_VERSION_ARC. +# Note: BR2_GCC_VERSION_4_8_ARC is still referenced from +# package/gcc/Config.in.host config BR2_KERNEL_HEADERS_4_0 bool "kernel headers version 4.0.x are no longer supported" @@ -3800,6 +4229,7 @@ config BR2_PACKAGE_ELEMENTARY config BR2_LINUX_KERNEL_CUSTOM_LOCAL bool "Linux kernel local directory option removed" + select BR2_LEGACY help The option to select a local directory as the source of the Linux kernel has been removed. It hurts reproducibility of @@ -4105,19 +4535,21 @@ config BR2_PACKAGE_OPENPOWERLINK_DEBUG_LEVEL config BR2_PACKAGE_OPENPOWERLINK_KERNEL_MODULE bool "openpowerlink package has been updated" select BR2_LEGACY - select BR2_PACKAGE_OPENPOWERLINK_STACK_KERNEL_STACK_LIB help openpowerlink kernel modules are built if the kernel stack library is selected. +# Note: BR2_PACKAGE_OPENPOWERLINK_KERNEL_MODULE is still referenced from +# package/openpowerlink/Config.in config BR2_PACKAGE_OPENPOWERLINK_LIBPCAP bool "openpowerlink package has been updated" select BR2_LEGACY - select BR2_PACKAGE_OPENPOWERLINK_STACK_USERSPACE_DAEMON_LIB help The user space support has been split in two part: - - a monolitic user space library - - a user spae deamon driver + - a monolithic user space library + - a user space daemon driver +# Note: BR2_PACKAGE_OPENPOWERLINK_LIBPCAP is still referenced from +# package/openpowerlink/Config.in config BR2_LINUX_KERNEL_SAME_AS_HEADERS bool "using the linux headers version for the kernel has been removed" @@ -4656,7 +5088,7 @@ config BR2_PACKAGE_KODI_PVR_ADDONS select BR2_PACKAGE_KODI_PVR_VUPLUS select BR2_PACKAGE_KODI_PVR_WMC help - Kodi PVR addon was split into seperate modules + Kodi PVR addon was split into separate modules config BR2_BINUTILS_VERSION_2_23_2 bool "binutils 2.23 option renamed" diff --git a/DEVELOPERS b/DEVELOPERS index b5183711b59..974fc8b2848 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -35,6 +35,7 @@ F: package/bubblewrap/ F: package/cage/ F: package/cog/ F: package/libepoxy/ +F: package/libmanette/ F: package/libpsl/ F: package/libwpe/ F: package/webkitgtk/ @@ -127,12 +128,11 @@ F: package/dcron/ F: package/libxmlrpc/ F: package/python-docopt/ -N: Anders Darander -F: package/ktap/ +N: Anand Gadiyar +F: boot/ti-k3-r5-loader/ N: André Zwing F: package/libkrb5/ -F: package/openal/ F: package/p7zip/ F: package/wine/ @@ -156,6 +156,9 @@ N: Andrey Yurovsky F: package/rauc/ N: Angelo Compagnucci +F: board/sipeed/lichee_rv/ +F: board/sipeed/lichee_rv_dock/ +F: configs/sipeed_lichee_rv* F: package/apparmor/ F: package/corkscrew/ F: package/cups/ @@ -167,6 +170,7 @@ F: package/i2c-tools/ F: package/jq/ F: package/libapparmor/ F: package/libb64/ +F: package/libdill/ F: package/mender/ F: package/mender-artifact/ F: package/mono/ @@ -174,6 +178,7 @@ F: package/mono-gtksharp3/ F: package/monolite/ F: package/openjpeg/ F: package/python-can/ +F: package/python-minimalmodbus/ F: package/python-pillow/ F: package/python-pydal/ F: package/python-spidev/ @@ -181,6 +186,8 @@ F: package/python-web2py/ F: package/qt5/qt5coap/ F: package/qt5/qt5knx/ F: package/qt5/qt5mqtt/ +F: package/rtl8723ds/ +F: package/rtl8723ds-bt/ F: package/sam-ba/ F: package/sshguard/ F: package/sunwait/ @@ -217,6 +224,8 @@ F: configs/snps_archs38_haps_defconfig F: configs/snps_archs38_hsdk_defconfig N: Ariel D'Alessandro +F: board/bsh/ +F: configs/imx8mn_bsh_smm_s2_pro_defconfig F: package/axfsutils/ F: package/mali-t76x/ @@ -226,6 +235,7 @@ F: package/espeak/ N: Arnout Vandecappelle F: package/arp-scan/ F: package/dehydrated/ +F: package/dracut/ F: package/freescale-imx/firmware-imx/ F: package/freescale-imx/imx-lib/ F: package/libpagekite/ @@ -263,6 +273,9 @@ F: package/orbit/ N: Attila Wagner F: package/python-canopen/ +N: Bagas Sanjaya +F: package/git/ + N: Bartosz Bilas F: board/stmicroelectronics/stm32mp157a-dk1/ F: configs/stm32mp157a_dk1_defconfig @@ -274,17 +287,6 @@ F: package/ttyd/ F: package/qt5/qt5scxml/ F: package/qt5/qt5webview/ -N: Bartosz Golaszewski -F: package/autoconf-archive/ -F: package/doxygen/ -F: package/libgpiod/ -F: package/libserialport/ -F: package/libsigrok/ -F: package/libsigrokdecode/ -F: package/libzip/ -F: package/pulseview/ -F: package/sigrok-cli/ - N: Baruch Siach F: board/solidrun/clearfog_gt_8k/ F: configs/solidrun_clearfog_gt_8k_defconfig @@ -296,6 +298,7 @@ F: package/ebtables/ F: package/i2c-tools/ F: package/libcurl/ F: package/libpcap/ +F: package/sexpect/ F: package/socat/ F: package/strace/ F: package/tcpdump/ @@ -308,7 +311,7 @@ F: package/taskd/ N: Benjamin Kamath F: package/lapack/ -N: Bernd Kuhls +N: Bernd Kuhls F: package/alsa-lib/ F: package/alsa-utils/ F: package/apache/ @@ -318,18 +321,19 @@ F: package/apr-util/ F: package/bcg729/ F: package/bento4/ F: package/bitcoin/ -F: package/bluez-tools/ -F: package/boinc/ F: package/clamav/ F: package/dav1d/ +F: package/dht/ F: package/dovecot/ F: package/dovecot-pigeonhole/ F: package/dtv-scan-tables/ +F: package/ethtool/ F: package/eudev/ F: package/exim/ F: package/fetchmail/ F: package/ffmpeg/ F: package/flac/ +F: package/flatbuffers/ F: package/freeswitch/ F: package/freeswitch-mod-bcg729/ F: package/freetype/ @@ -337,18 +341,18 @@ F: package/fstrcmp/ F: package/ghostscript/ F: package/giflib/ F: package/gkrellm/ -F: package/gli/ -F: package/glmark2/ F: package/gpsd/ F: package/gptfdisk/ +F: package/hddtemp/ F: package/hdparm/ -F: package/inih/ F: package/intel-gmmlib/ F: package/intel-mediadriver/ F: package/intel-mediasdk/ +F: package/intel-microcode/ F: package/jsoncpp/ F: package/kodi* F: package/lame/ +F: package/lcms2/ F: package/leafnode2/ F: package/libaacs/ F: package/libasplib/ @@ -356,11 +360,12 @@ F: package/libass/ F: package/libbdplus/ F: package/libbluray/ F: package/libbroadvoice/ +F: package/libcap/ F: package/libcdio/ F: package/libcec/ F: package/libcodec2/ F: package/libcrossguid/ -F: package/libdcadec/ +F: package/libdeflate/ F: package/libdrm/ F: package/libdvbcsa/ F: package/libdvdcss/ @@ -368,6 +373,7 @@ F: package/libdvdnav/ F: package/libdvdread/ F: package/libebur128/ F: package/libfreeglut/ +F: package/libfribidi/ F: package/libg7221/ F: package/libglew/ F: package/libglfw/ @@ -390,18 +396,27 @@ F: package/libsidplay2/ F: package/libsilk/ F: package/libsndfile/ F: package/libsoundtouch/ -F: package/libsquish/ F: package/libudfread/ +F: package/libunibreak/ F: package/liburiparser/ +F: package/libutp/ +F: package/libuv/ F: package/libva/ F: package/libva-intel-driver/ F: package/libva-utils/ F: package/libvorbis/ F: package/libvpx/ F: package/libyuv/ +F: package/linux-firmware/ +F: package/mc/ F: package/mesa3d/ F: package/minidlna/ F: package/mjpg-streamer/ +F: package/mpg123/ +F: package/ntp/ +F: package/nut/ +F: package/opus/ +F: package/pciutils/ F: package/perl-crypt-openssl-guess/ F: package/perl-crypt-openssl-random/ F: package/perl-crypt-openssl-rsa/ @@ -420,32 +435,34 @@ F: package/perl-io-html/ F: package/perl-lwp-mediatypes/ F: package/perl-mail-dkim/ F: package/perl-mailtools/ +F: package/perl-netaddr-ip/ F: package/perl-net-dns/ F: package/perl-net-http/ -F: package/perl-netaddr-ip/ F: package/perl-timedate/ F: package/perl-uri/ F: package/perl-www-robotrules/ F: package/php/ -F: package/pixman/ F: package/pngquant/ -F: package/pound/ -F: package/pulseaudio/ +F: package/pppd/ +F: package/privoxy/ F: package/pure-ftpd/ F: package/python-couchdb/ F: package/python-cssutils/ +F: package/python-glslang/ +F: package/python-mako/ F: package/python-mwclient/ F: package/python-mwscrape/ F: package/python-mwscrape2slob/ -F: package/python-mako/ F: package/python-oauthlib/ F: package/python-pyicu/ F: package/python-pylru/ F: package/python-requests-oauthlib/ F: package/python-slob/ +F: package/rrdtool/ +F: package/rsync/ F: package/rtmpdump/ F: package/samba4/ -F: package/softether/ +F: package/sofia-sip/ F: package/spandsp/ F: package/sqlite/ F: package/stellarium/ @@ -455,13 +472,10 @@ F: package/tor/ F: package/transmission/ F: package/tvheadend/ F: package/unixodbc/ -F: package/utf8proc/ -F: package/vdr/ -F: package/vdr-plugin-vnsiserver/ F: package/vlc/ -F: package/vnstat/ -F: package/waylandpp/ -F: package/x11r7/ +F: package/wget/ +F: package/wireless-regdb/ +F: package/wireless_tools/ F: package/x264/ F: package/x265/ F: package/xmrig/ @@ -501,8 +515,10 @@ N: Cédric Chépied F: package/znc/ N: Cédric Le Goater +F: board/aspeed/ F: board/qemu/ppc-bamboo/ F: board/qemu/ppc64le-powernv8/readme.txt +F: configs/aspeed* F: configs/qemu_ppc_bamboo_defconfig F: configs/qemu_ppc64le_powernv8_defconfig @@ -512,6 +528,9 @@ 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/ @@ -523,13 +542,17 @@ F: package/syslog-ng/ N: Christian Kellermann F: package/python-pylibftdi/ -N: Christian Stewart +N: Christian Stewart +F: package/balena-engine/ F: package/batman-adv/ +F: package/catatonit/ +F: package/cni-plugins/ F: package/containerd/ +F: package/crun/ F: package/delve/ F: package/docker-cli/ +F: package/docker-compose/ F: package/docker-engine/ -F: package/docker-proxy/ F: package/embiggen-disk/ F: package/fuse-overlayfs/ F: package/go/ @@ -537,10 +560,13 @@ F: package/gocryptfs/ F: package/mbpfan/ F: package/moby-buildkit/ F: package/mosh/ +F: package/nerdctl/ F: package/pkg-golang.mk F: package/rtl8821au/ +F: package/rtl8821cu/ F: package/runc/ F: package/tini/ +F: support/testing/tests/package/test_docker_compose.py N: Christophe Priouzeau F: board/stmicroelectronics/stm32f429-disco/ @@ -621,14 +647,40 @@ F: package/odroidc2-firmware/ N: Daniel J. Leach F: package/dacapo/ -N: Daniel Lang +N: Daniel Lang +F: package/atkmm/ +F: package/atkmm2_28/ +F: package/cairomm/ +F: package/cairomm1_14/ F: package/dbus-cxx/ +F: package/glibmm/ +F: package/glibmm2_66/ +F: package/gtkmm3/ +F: package/libsigc/ +F: package/libsigc2/ F: package/paho-mqtt-cpp/ +F: package/pangomm/ +F: package/pangomm2_46/ +F: package/sam-ba/ N: Damien Lanson F: package/libvdpau/ F: package/log4cpp/ +N: Damien Le Moal +F: package/python-kflash/ +F: board/canaan/ +F: configs/canaan_kd233_defconfig +F: board/sipeed/ +F: configs/sipeed_maix_bit_defconfig +F: configs/sipeed_maix_bit_sdcard_defconfig +F: configs/sipeed_maixduino_defconfig +F: configs/sipeed_maixduino_sdcard_defconfig +F: configs/sipeed_maix_dock_defconfig +F: configs/sipeed_maix_dock_sdcard_defconfig +F: configs/sipeed_maix_go_defconfig +F: configs/sipeed_maix_go_sdcard_defconfig + N: Daniel Nicoletti F: package/cutelyst/ @@ -642,6 +694,7 @@ F: package/libftdi1/ N: Danilo Bargen F: board/pcengines/apu2/ F: configs/pcengines_apu2_defconfig +F: package/tealdeer/ N: Danomi Manchego F: package/cjson/ @@ -652,8 +705,16 @@ F: package/lua-cjson/ F: package/luaexpat/ F: package/xinetd/ +N: Dario Binacchi +F: board/bsh/ +F: configs/imx8mn_bsh_smm_s2_defconfig +F: configs/imx8mn_bsh_smm_s2_pro_defconfig +F: package/sscep/ +F: package/uuu/ + N: Dario Binacchi F: package/davinci-bootcount/ +F: package/libmnl/ N: David Bachelart F: package/ccrypt/ @@ -674,6 +735,7 @@ N: David du Colombier <0intro@gmail.com> F: package/x264/ N: David GOUARIN +F: package/freeradius-server/ F: package/librelp/ F: package/libtalloc/ @@ -688,8 +750,6 @@ N: David Pierret F: package/bat/ N: Davide Viti -F: board/friendlyarm/nanopi-r1/ -F: configs/friendlyarm_nanopi_r1_defconfig F: package/flann/ F: package/python-paho-mqtt/ F: package/qhull/ @@ -698,9 +758,6 @@ F: package/tcllib/ N: Denis Bodor F: package/libstrophe/ -N: Derrick Lyndon Pallas -F: package/ipcalc/ - N: Dick Olsson F: board/aarch64-efi/ F: board/pc/ @@ -723,12 +780,18 @@ F: package/s6/ F: package/skalibs/ F: support/testing/tests/boot/test_edk2.py +N: Dimitar Tomov +F: package/wolftpm/ + N: Dimitrios Siganos F: package/wireless-regdb/ N: Dominik Faessler F: package/logsurfer/ +N: Dominik Michael Rauh +F: package/gdal/ + N: Doug Kehn F: package/nss-pam-ldapd/ F: package/sp-oops-extract/ @@ -742,6 +805,9 @@ F: board/acmesystems/acqua-a5/ F: configs/acmesystems_acqua_a5_256mb_defconfig F: configs/acmesystems_acqua_a5_512mb_defconfig +N: Eero Aaltonen +F: package/docopt-cpp/ + N: Eloi Bail F: package/bayer2rgb-neon/ F: package/gstreamer1/gst1-plugins-bayer2rgb-neon/ @@ -797,10 +863,9 @@ N: Ernesto L. Williams Jr F: package/szip/ N: Esben Haabendal -F: boot/gummiboot/ F: package/python-kiwisolver/ -N: Etienne Carriere +N: Etienne Carriere F: boot/optee-os/ F: package/optee-benchmark/ F: package/optee-client/ @@ -825,7 +890,6 @@ F: package/jimtcl/ F: package/mimic/ F: package/nodm/ F: package/openbox/ -F: package/rtl8723bs/ F: package/supertuxkart/ N: Fabio Estevam @@ -852,6 +916,7 @@ F: configs/wandboard_defconfig F: configs/warp7_defconfig F: configs/warpboard_defconfig F: package/atest/ +F: package/crucible/ F: package/kmscube/ N: Fabio Porcedda @@ -929,6 +994,7 @@ F: package/libxslt/ F: package/mbedtls/ F: package/minissdpd/ F: package/minizip/ +F: package/minizip-zlib/ F: package/mongodb/ F: package/motion/ F: package/mutt/ @@ -952,6 +1018,7 @@ F: package/tinycbor/ F: package/tinydtls/ F: package/tinymembench/ F: package/whois/ +F: package/zeek/ N: Fabrice Goucem F: board/freescale/imx6ullevk/ @@ -960,24 +1027,32 @@ F: configs/freescale_imx6ullevk_defconfig N: Falco Hyfing F: package/python-pymodbus/ -N: Filip Skoneczny -F: board/sinovoip/m1-plus -F: configs/bananapi_m1_plus_defconfig +N: Florian Fainelli +F: package/cpulimit/ N: Floris Bos F: package/ipmitool/ F: package/odhcploc/ N: Francis Laniel +F: package/falcosecurity-libs F: package/pahole/ +F: package/sysdig/ +F: package/tbb/ N: Francisco Gonzalez F: package/ser2net/ +N: Francois Dugast +F: board/visionfive2/ +F: configs/visionfive2_defconfig + N: Francois Perrad +F: board/freescale/ls1028ardb/ F: board/olimex/a20_olinuxino F: board/olimex/imx233_olinuxino/ F: board/olimex/stmp1_olinuxino/ +F: configs/ls1028ardb_defconfig F: configs/olimex_a20_olinuxino_* F: configs/olimex_imx233_olinuxino_defconfig F: configs/olimex_stmp157_olinuxino_lime_defconfig @@ -1028,22 +1103,14 @@ F: package/libdmtx/ F: package/libsodium/ F: package/php-amqp/ F: package/python-cherrypy/ -F: package/rabbitmq-server/ F: package/sane-backends/ -F: package/ucl/ F: package/upx/ F: package/zxing-cpp/ -N: Frank Vanbever -F: package/elixir/ +N: Frank Vanbever F: package/libmodsecurity/ F: package/nginx-modsecurity/ -N: Gaël Portay -F: package/qt5/qt5virtualkeyboard/ -F: package/qt5/qt5webengine/ -F: package/qt5/qt5webkit/ - N: Gao Xiang F: package/erofs-utils/ @@ -1055,7 +1122,6 @@ F: package/gstreamer1/gst1-imx/ F: package/libimxvpuapi/ F: package/mfgtools/ F: package/sshpass/ -F: package/x11r7/xdriver_xf86-video-imx-viv/ N: Geoff Levand F: package/flannel/ @@ -1063,18 +1129,16 @@ F: package/flannel/ N: Geoffrey Ragot F: package/python-pyyaml/ -N: Gerome Burlats -F: board/qemu/ -F: configs/qemu_* - N: Gilles Talis F: board/freescale/imx8mmevk/ F: board/friendlyarm/nanopi-r2s/ F: configs/freescale_imx8mmevk_defconfig F: configs/friendlyarm_nanopi_r2s_defconfig F: package/cctz/ +F: package/clpeak/ F: package/faad2/ F: package/fdk-aac/ +F: package/hawktracer/ F: package/httping/ F: package/iozone/ F: package/leptonica/ @@ -1082,6 +1146,7 @@ F: package/libeXosip2/ F: package/libolm/ F: package/libosip2/ F: package/ocrad/ +F: package/opencl-clhpp/ F: package/opusfile/ F: package/restclient-cpp/ F: package/tesseract-ocr/ @@ -1104,16 +1169,30 @@ F: package/libnspr/ F: package/libnss/ F: package/mali-driver/ F: package/minicom/ +F: package/mmc-utils/ F: package/nfs-utils/ F: package/python-uvloop/ +F: package/qt5/ F: package/rockchip-mali/ +F: package/rtl8188eu/ +F: package/rtl8189es/ +F: package/rtl8192eu/ +F: package/rtl8723bu/ +F: package/rtl8723ds/ +F: package/rtl8812au-aircrack-ng/ +F: package/rtl8821au/ +F: package/rtl8821cu/ F: package/sunxi-mali-utgard/ F: package/sunxi-mali-utgard-driver/ F: package/sunxi-tools/ F: package/trace-cmd/ F: package/udisks/ +F: package/wilc-driver/ F: toolchain/ +N: Graeme Smecher +F: package/python-orjson/ + N: Gregory Dymarek F: package/ding-libs/ F: package/gengetopt/ @@ -1147,25 +1226,23 @@ N: Guillaume William Brs F: package/libnids/ F: package/libxcrypt/ F: package/liquid-dsp/ +F: package/mbw/ F: package/pixiewps/ +F: package/python-beniget/ +F: package/python-gast/ F: package/python-pybind/ +F: package/python-pythran/ +F: package/python-scipy/ F: package/reaver/ F: support/testing/tests/package/br2-external/python-pybind F: support/testing/tests/package/sample_python_pybind.py +F: support/testing/tests/package/sample_python_scipy.py F: support/testing/tests/package/test_python_pybind.py - -N: Guo Ren -F: arch/Config.in.csky -F: board/csky/ -F: configs/csky_* +F: support/testing/tests/package/test_python_scipy.py N: Gustavo Heinz F: package/python-m2crypto/ -N: Gustavo Pimentel -F: configs/arm_juno_defconfig -F: board/arm/juno/ - N: Gwenhael Goavec-Merou F: board/terasic/de10nano_cyclone5/ F: configs/terasic_de10nano_cyclone5_defconfig @@ -1180,11 +1257,14 @@ F: package/python-markdown/ F: package/python-remi/ F: package/python-sip/ F: package/uhd/ +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/ipmitool/ @@ -1192,6 +1272,7 @@ F: package/libnetconf2/ F: package/libyang/ F: package/linuxptp/ F: package/netopeer2/ +F: package/rauc/ F: package/sysrepo/ N: Hervé Codina @@ -1247,49 +1328,41 @@ F: board/amarula/ F: board/asus/ F: board/bananapi/ F: board/engicam/ -F: board/friendlyarm/nanopi-a64/ -F: board/friendlyarm/nanopi-neo2/ 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-pc2/ -F: board/orangepi/orangepi-prime/ -F: board/orangepi/orangepi-win/ F: board/orangepi/orangepi-zero-plus2/ F: board/pine64/ -F: configs/amarula_a64_relic_defconfig F: configs/amarula_vyasa_rk3288_defconfig F: configs/asus_tinker_rk3288_defconfig -F: configs/bananapi_m1_defconfig -F: configs/bananapi_m64_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/friendlyarm_nanopi_a64_defconfig -F: configs/friendlyarm_nanopi_neo2_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_pc2_defconfig -F: configs/orangepi_prime_defconfig -F: configs/orangepi_win_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 N: James Hilliard F: package/apcupsd/ F: package/bpftool/ F: package/exfatprogs/ +F: package/fxdiv/ F: package/gensio/ F: package/lua-std-debug/ F: package/lua-std-normalize/ F: package/lilv/ F: package/lv2/ +F: package/neon-2-sse/ F: package/pipewire/ F: package/python-aioconsole/ F: package/python-aiodns/ @@ -1311,6 +1384,7 @@ F: package/python-aiosignal/ F: package/python-aiozipkin/ F: package/python-argon2-cffi/ F: package/python-argon2-cffi-bindings/ +F: package/python-async-generator/ F: package/python-async-lru/ F: package/python-async-timeout/ F: package/python-bidict/ @@ -1319,31 +1393,53 @@ F: package/python-cbor2/ F: package/python-cchardet/ F: package/python-charset-normalizer/ F: package/python-cssselect2/ +F: package/python-editables/ F: package/python-flatbuffers/ F: package/python-fonttools/ F: package/python-frozenlist/ F: package/python-greenlet/ +F: package/python-h11/ +F: package/python-hatchling/ +F: package/python-hatch-fancy-pypi-readme/ +F: package/python-hatch-vcs/ F: package/python-installer/ F: package/python-janus/ F: package/python-logstash/ +F: package/python-maturin/ F: package/python-multidict/ +F: package/python-mypy-extensions/ +F: package/python-outcome/ +F: package/python-pathspec/ F: package/python-pep517/ F: package/python-pycares/ F: package/python-pydyf/ F: package/python-pypa-build/ F: package/python-pyphen/ +F: package/python-rtoml/ +F: package/python-selenium/ F: package/python-snappy/ +F: package/python-sniffio/ F: package/python-sockjs/ F: package/python-terminaltables/ F: package/python-tinycss2/ F: package/python-tomli/ +F: package/python-trio/ +F: package/python-trio-websocket/ +F: package/python-typeguard/ +F: package/python-typing-inspect/ +F: package/python-uhid/ F: package/python-weasyprint/ +F: package/python-wsproto/ F: package/python-yarl/ F: package/python-zopfli/ +F: package/rtl8192eu/ F: package/serd/ F: package/sord/ F: package/sratom/ +F: package/stb/ F: package/zchunk/ +F: support/testing/tests/package/sample_python_rtoml.py +F: support/testing/tests/package/test_python_rtoml.py N: James Knight F: package/atkmm/ @@ -1409,7 +1505,9 @@ F: package/lxc/ F: package/strongswan/ F: package/wmctrl/ F: package/x11r7/xdriver_xf86-video-imx/ -F: package/x11r7/xdriver_xf86-video-imx-viv/ + +N: Jesse Van Gavere +F: package/qt6/ N: Jianhui Zhao F: package/libuhttpd/ @@ -1420,15 +1518,21 @@ N: Joachim Wiberg F: configs/globalscale_espressobin_defconfig F: board/globalscale/espressobin/ F: package/inadyn/ +F: package/libconfuse/ F: package/libite/ +F: package/libnet/ F: package/libteam/ F: package/libuev/ F: package/mg/ +F: package/mini-snmpd/ F: package/mrouted/ F: package/netcalc/ +F: package/pimd/ +F: package/redir/ F: package/smcroute/ F: package/ssdp-responder/ F: package/sysklogd/ +F: package/uredir/ F: package/watchdogd/ N: Jochen Baltes @@ -1447,6 +1551,8 @@ F: board/qemu/ppc64le-pseries/ F: configs/qemu_ppc64le_pseries_defconfig F: board/qemu/ppc-mac99/ F: configs/qemu_ppc_mac99_defconfig +F: board/aspeed/ +F: configs/aspeed* N: Johan Derycke F: package/python-libconfig/ @@ -1475,7 +1581,9 @@ F: package/erlang-p1-xmpp/ F: package/erlang-p1-yaml/ F: package/erlang-p1-yconf/ F: package/erlang-p1-zlib/ +F: package/forge/ F: package/nginx-dav-ext/ +F: package/vis-network/ F: package/vuejs/ N: John Stile @@ -1498,23 +1606,6 @@ N: Joris Offouga F: package/python-colorlog/ F: package/python-simplelogging/ -N: Jörg Krause -F: board/lemaker/bananapro/ -F: configs/bananapro_defconfig -F: package/augeas/ -F: package/bluez-alsa/ -F: package/caps/ -F: package/freescale-imx/imx-alsa-plugins/ -F: package/libopusenc/ -F: package/libupnpp/ -F: package/luv/ -F: package/luvi/ -F: package/mpd/ -F: package/shairport-sync/ -F: package/swupdate/ -F: package/upmpdcli/ -F: package/wavemon/ - N: Joris Lijssens F: package/emlog/ F: package/libcoap/ @@ -1527,14 +1618,6 @@ N: José Luis Salvador Rufo F: package/zfs/ F: support/testing/tests/package/test_zfs.py -N: José Pekkarinen -F: package/alfred/ -F: package/bmx7/ -F: package/python-aexpect/ -F: package/softhsm2/ -F: support/testing/tests/package/sample_python_aexpect.py -F: support/testing/tests/package/test_python_aexpect.py - N: Joseph Kogut F: package/at-spi2-atk/ F: package/at-spi2-core/ @@ -1610,16 +1693,52 @@ F: configs/zynq_qmtech_defconfig F: package/fluid-soundfont/ F: package/fluidsynth/ F: package/glslsandbox-player/ +F: package/gnupg2/ +F: package/highway/ +F: package/kexec/ +F: package/libjxl/ +F: package/octave/ +F: package/ola/ +F: package/openblas/ +F: package/openmpi/ +F: package/perftest/ F: package/ptm2human/ F: package/python-distro/ F: package/python-gnupg/ +F: package/python-hkdf/ +F: package/python-magic-wormhole/ +F: package/python-magic-wormhole-mailbox-server/ +F: package/python-magic-wormhole-transit-relay/ F: package/python-pyalsa/ +F: package/python-spake2/ +F: package/rdma-core/ F: package/riscv-isa-sim/ +F: package/tinycompress/ +F: package/z3/ F: package/zynaddsubfx/ F: support/testing/tests/package/sample_python_distro.py F: support/testing/tests/package/sample_python_gnupg.py +F: support/testing/tests/package/sample_python_pyalsa.py +F: support/testing/tests/package/sample_python_spake2.py +F: support/testing/tests/package/test_gnupg2.py +F: support/testing/tests/package/test_highway.py +F: support/testing/tests/package/test_hwloc.py +F: support/testing/tests/package/test_libjxl.py +F: support/testing/tests/package/test_ncdu.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_perftest.py F: support/testing/tests/package/test_python_distro.py F: support/testing/tests/package/test_python_gnupg.py +F: support/testing/tests/package/test_python_hkdf.py +F: support/testing/tests/package/test_python_magic_wormhole.py +F: support/testing/tests/package/test_python_pyalsa.py +F: support/testing/tests/package/test_python_spake2.py +F: support/testing/tests/package/test_rdma_core.py +F: support/testing/tests/package/test_rdma_core/ +F: support/testing/tests/package/test_z3.py +F: support/testing/tests/package/test_z3/ N: Julien Viard de Galbert F: package/dieharder/ @@ -1653,6 +1772,16 @@ N: Koen Martens F: package/capnproto/ F: package/linuxconsoletools/ +N: Kory Maincent +F: board/octavo/osd32mp1-brk/ +F: board/octavo/osd32mp1-red/ +F: configs/octavo_osd32mp1_brk_defconfig +F: configs/octavo_osd32mp1_red_defconfig + +N: Kris Bahnsen +F: package/wilc-firmware/ +F: package/wilc-driver/ + N: Kurt Van Dijck F: package/bcusdk/ F: package/libpthsem/ @@ -1697,8 +1826,6 @@ F: package/ti-sgx-km/ F: package/ti-sgx-um/ N: Louis Aussedat -F: board/friendlyarm/nanopi-neo-plus2/ -F: configs/friendlyarm_nanopi_neo_plus2_defconfig F: package/mfoc F: package/libpam-nfc F: package/python-dnspython/ @@ -1712,7 +1839,7 @@ F: package/intel-gmmlib/ F: package/intel-mediadriver/ F: package/intel-mediasdk/ -N: Luca Ceresoli +N: Luca Ceresoli F: board/olimex/a20_olinuxino/ F: board/zynq/ F: board/zynqmp/ @@ -1750,7 +1877,7 @@ F: package/python-json-schema-validator/ F: package/python-keyring/ F: package/python-simplejson/ F: package/python-versiontools/ -F: package/wilc1000-firmware/ +F: package/wilc-firmware/ N: Maeva Manuel F: board/freescale/imx8qmmek/ @@ -1763,10 +1890,6 @@ F: package/mpv/ F: package/rpi-firmware/ F: package/rpi-userland/ -N: Manuel Vögele -F: package/python-pyqt5/ -F: package/python-requests-toolbelt/ - N: Marcin Bis F: package/bluez5_utils/ F: package/cc-tool/ @@ -1780,6 +1903,7 @@ F: configs/orangepi_zero_plus_defconfig F: package/argparse/ F: package/dt-utils/ F: package/easydbus/ +F: package/gitlab-runner/ F: package/lua-flu/ F: package/lua-stdlib/ F: package/luaossl/ @@ -1787,6 +1911,7 @@ F: package/murata-cyw-fw/ F: package/netdata/ F: package/python-ansicolors/ F: package/python-bleak/ +F: package/python-dbus-fast/ F: package/python-dbus-next/ F: package/python-iniconfig/ F: package/python-intelhex/ @@ -1798,6 +1923,7 @@ F: package/python-typing-extensions/ F: package/python-xmodem/ F: package/rs485conf/ F: package/turbolua/ +F: support/testing/tests/package/sample_python_dbus_fast.py F: support/testing/tests/package/sample_python_dbus_next.py F: support/testing/tests/package/sample_python_pytest.py F: support/testing/tests/package/sample_python_pytest_asyncio.py @@ -1807,6 +1933,8 @@ F: support/testing/tests/package/test_python_pytest.py F: support/testing/tests/package/test_python_pytest_asyncio.py N: Marcus Folkesson +F: package/libcamera/ +F: package/libcamera-apps/ F: package/libostree/ F: package/libselinux/ F: package/libsemanage/ @@ -1816,8 +1944,6 @@ F: utils/config F: utils/diffconfig N: Marek Belisko -F: board/friendlyarm/nanopi-neo4/ -F: configs/friendlyarm_nanopi_neo4_defconfig F: package/libatasmart/ F: package/polkit/ F: package/sg3_utils/ @@ -1849,11 +1975,23 @@ F: package/rpi-firmware/ F: package/tzdata/ F: package/zic/ +N: Martin Hundebøll +F: package/python-apispec/ +F: package/python-flask-smorest/ +F: package/python-marshmallow/ +F: package/python-marshmallow-sqlalchemy/ +F: package/python-webargs/ + N: Martin Kepplinger F: package/tslib/ F: package/x11r7/xdriver_xf86-input-tslib/ F: package/x11vnc/ +N: Martin Povišer +F: package/python-construct/ +F: support/testing/tests/package/sample_python_construct.py +F: support/testing/tests/package/test_python_construct.py + N: Masahiro Yamada F: board/arm/foundation-v8/ F: configs/arm_foundationv8_defconfig @@ -1863,108 +2001,6 @@ F: board/technologic/ts4900/ F: configs/ts4900_defconfig F: package/ts4900-fpga/ -N: Matt Weber -F: board/freescale/p* -F: board/freescale/t* -F: board/qemu/ppc64-e5500/ -F: configs/freescale_p* -F: configs/freescale_t* -F: configs/qemu_ppc64_e5500_defconfig -F: package/ace/ -F: package/argp-standalone/ -F: package/aufs/ -F: package/aufs-util/ -F: package/bc/ -F: package/bridge-utils/ -F: package/checkpolicy/ -F: package/checksec/ -F: package/cgroupfs-mount/ -F: package/crda/ -F: package/cunit/ -F: package/dacapo/ -F: package/davici/ -F: package/dnsmasq/ -F: package/dosfstools/ -F: package/eigen/ -F: package/ethtool/ -F: package/flashbench/ -F: package/fmc/ -F: package/fmlib/ -F: package/git/ -F: package/gnutls/ -F: package/hostapd/ -F: package/i2c-tools/ -F: package/ifplugd/ -F: package/igmpproxy/ -F: package/iperf/ -F: package/iperf3/ -F: package/iputils/ -F: package/iw/ -F: package/jitterentropy-library/ -F: package/kvm-unit-tests/ -F: package/kvmtool/ -F: package/libcsv/ -F: package/libcurl/ -F: package/libeastl/ -F: package/libfcgi/ -F: package/libopenssl/ -F: package/libselinux/ -F: package/libsemanage/ -F: package/libsepol/ -F: package/libssh2/ -F: package/libtalloc/ -F: package/libqmi/ -F: package/lighttpd/ -F: package/logrotate/ -F: package/makedevs/ -F: package/memtester/ -F: package/mii-diag/ -F: package/mrouted/ -F: package/mtd/ -F: package/mtools/ -F: package/nginx-upload/ -F: package/omniorb/ -F: package/openresolv/ -F: package/paxtest/ -F: package/picocom/ -F: package/policycoreutils/ -F: package/proftpd/ -F: package/protobuf-c/ -F: package/protobuf/ -F: package/python-bunch/ -F: package/python-colorama/ -F: package/python-filelock/ -F: package/python-flask-cors/ -F: package/python-iptables/ -F: package/python-ipy/ -F: package/python-iwlib/ -F: package/python-posix-ipc/ -F: package/python-pycairo/ -F: package/python-pysftp/ -F: package/python-tinyrpc/ -F: package/python-txdbus/ -F: package/qoriq-rcw/ -F: package/raptor/ -F: package/rng-tools/ -F: package/rsyslog/ -F: package/setools/ -F: package/sloci-image/ -F: package/smcroute/ -F: package/tclap/ -F: package/tini/ -F: package/uboot-tools/ -F: package/unionfs/ -F: package/valijson/ -F: package/wpa_supplicant/ -F: package/wireless_tools/ -F: package/xen/ -F: package/xml-security-c/ -F: support/testing/tests/fs/test_oci.py -F: support/testing/tests/package/br2-external/openjdk/ -F: support/testing/tests/package/test_openjdk.py -F: support/testing/tests/package/test_opkg/ -F: support/testing/tests/package/test_opkg.py - N: Mauro Condarelli F: package/mc/ F: package/python-autobahn/ @@ -1994,6 +2030,7 @@ F: package/libgeos/ F: package/libosmium/ F: package/osm2pgsql/ F: package/postgis/ +F: package/postgresql/ F: package/protozero/ F: package/timescaledb/ @@ -2007,19 +2044,22 @@ F: package/gnuplot/ F: package/sdl2/ N: Michael Nosthoff +F: package/boost/ +F: package/catch2/ +F: package/fmt/ F: package/grpc/ F: package/gtest/ +F: package/json-for-modern-cpp/ F: package/libabseil-cpp/ F: package/networkd-dispatcher/ F: package/protobuf/ F: package/re2/ - -N: Michael Rommel -F: package/knock/ -F: package/python-crc16/ -F: package/python-pyzmq/ +F: package/spdlog/ N: Michael Trimarchi +F: board/bsh/ +F: configs/imx8mn_bsh_smm_s2_defconfig +F: configs/imx8mn_bsh_smm_s2_pro_defconfig F: package/python-spidev/ N: Michael Vetter @@ -2048,20 +2088,9 @@ F: configs/licheepi_zero_defconfig N: Mike Frampton F: package/qcom-db410c-firmware/ -N: Mike Harmony -F: board/sinovoip/m2-plus/ -F: configs/bananapi_m2_plus_defconfig - N: Mikhail Boiko F: package/libfribidi/ -N: Min Xu -F: package/shadowsocks-libev/ - -N: Miquèl Raynal -F: package/mali-driver/ -F: package/rockchip-mali/ - N: Mircea Gliga F: package/mbuffer/ @@ -2069,8 +2098,8 @@ N: Murat Demirten F: package/jpeg-turbo/ F: package/libgeotiff/ -N: Mylène Josserand -F: package/rtl8723bu/ +N: Nasser Afshin +F: package/python-pycrate/ N: Nathaniel Roach F: package/bandwidthd/ @@ -2082,9 +2111,17 @@ F: package/libevdev/ F: package/pkg-qmake.mk F: package/qt5/qt5opcua/ -N: Neal Frager +N: Neal Frager +F: board/versal/ +F: board/zynq/ F: board/zynqmp/ +F: configs/versal_vck190_defconfig +F: configs/zynq_zc706_defconfig +F: configs/zynqmp_kria_kv260_defconfig F: configs/zynqmp_zcu102_defconfig +F: configs/zynqmp_zcu106_defconfig +F: package/bootgen/ +F: package/versal-firmware/ N: Nicola Di Lieto F: package/uacme/ @@ -2131,6 +2168,9 @@ N: Nicolas Serafini F: package/exiv2/ F: package/ofono/ +N: Niklas Cassel +F: configs/qemu_riscv64_nommu_virt_defconfig + N: Nikolay Dimitrov F: board/embest/riotboard/ F: configs/riotboard_defconfig @@ -2143,14 +2183,13 @@ F: package/tpm-tools/ F: package/trousers/ N: Norbert Lange +F: package/dbus-broker/ F: package/systemd/ F: package/tcf-agent/ -N: Nylon Chen -F: arch/Config.in.nds32 +N: Yu Chien Peter Lin F: board/andes -F: configs/andes_ae3xx_defconfig -F: toolchain/toolchain-external/toolchain-external-andes-nds32/ +F: configs/andes_ae350_45_defconfig N: Olaf Rempel F: package/ctorrent/ @@ -2218,12 +2257,11 @@ F: board/openblocks/a6/ F: board/orangepi/ F: board/pandaboard/ F: board/roseapplepi/ +F: board/visionfive/ F: boot/shim/ -F: boot/sun20i-d1-spl/ F: configs/avenger96_defconfig F: configs/beagleboneai_defconfig F: configs/lafrite_defconfig -F: configs/minnowboard_max-graphical_defconfig F: configs/minnowboard_max_defconfig F: configs/nexbox_a95x_defconfig F: configs/nezha_defconfig @@ -2233,6 +2271,7 @@ F: configs/orangepi_r1_defconfig F: configs/pandaboard_defconfig F: configs/roseapplepi_defconfig F: configs/sheevaplug_defconfig +F: configs/visionfive_defconfig F: package/bats-core/ F: package/docker-compose/ F: package/dump1090/ @@ -2267,36 +2306,9 @@ F: package/wireguard-tools/ F: support/testing/tests/package/test_docker_compose.py N: Peter Seiderer -F: board/raspberrypi/ -F: configs/raspberrypi*_defconfig -F: package/assimp/ -F: package/bcm2835/ -F: package/ddrescue/ -F: package/dejavu/ -F: package/dillo/ -F: package/edid-decode/ -F: package/ell/ -F: package/ghostscript-fonts/ -F: package/gstreamer1/gst1-devtools/ -F: package/gstreamer1/gst1-interpipe/ -F: package/gstreamer1/gstreamer1-editing-services/ -F: package/iwd/ -F: package/libcamera-apps/ -F: package/libevdev/ -F: package/libuev/ -F: package/log4cplus/ -F: package/postgresql/ -F: package/python-colorzero/ -F: package/python-flask-wtf/ -F: package/python-gpiozero/ -F: package/qt5/ -F: package/quotatool/ -F: package/racehound/ -F: package/redir/ -F: package/rtl8812au-aircrack-ng/ -F: package/uredir/ -F: package/uqmi/ -F: package/wayland-utils/ +F: package/dotconf/ +F: package/qt5/qt5speech/ +F: package/speechd/ N: Peter Thompson F: package/sdl2_gfx/ @@ -2371,7 +2383,7 @@ F: package/tree/ N: Pieter De Gendt F: package/libvips/ -N: Pieterjan Camerlynck +N: Pieterjan Camerlynck F: package/libdvbpsi/ F: package/mraa/ F: package/synergy/ @@ -2381,6 +2393,8 @@ F: board/avnet/s6lx9_microboard/ F: configs/s6lx9_microboard_defconfig N: Rafał Miłecki +F: board/broadcom/northstar/ +F: configs/broadcom_northstar_defconfig F: package/firmware-utils/ N: Rahul Bedarkar @@ -2406,8 +2420,17 @@ F: package/python-jmespath/ F: package/python-pymupdf/ F: package/python-rsa/ F: package/python-s3transfer/ +F: support/testing/tests/package/sample_python_jmespath.py F: support/testing/tests/package/sample_python_rsa.py +F: support/testing/tests/package/sample_python_s3transfer.py +F: support/testing/tests/package/test_python_jmespath.py F: support/testing/tests/package/test_python_rsa.py +F: support/testing/tests/package/test_python_s3transfer.py + +N: Raphael Pavlidis +F: package/slirp4netns/ +F: package/sway/ +F: package/x11r7/xwayland/ N: Refik Tuzakli F: package/freescale-imx/ @@ -2420,21 +2443,19 @@ N: Renaud Aubin F: package/libhttpparser/ N: Ricardo Martincoski +F: .flake8 +F: .shellcheckrc F: package/atop/ F: package/thermald/ - -N: Ricardo Martincoski F: support/testing/infra/ F: support/testing/run-tests -F: support/testing/tests/core/test_file_capabilities.py -F: support/testing/tests/download/ -F: support/testing/tests/package/*_python*.py F: support/testing/tests/package/test_atop.py -F: support/testing/tests/package/test_syslog_ng.py -F: support/testing/tests/package/test_tmux.py F: support/testing/tests/utils/test_check_package.py F: utils/check-package +F: utils/check-symbols F: utils/checkpackagelib/ +F: utils/checksymbolslib/ +F: utils/docker-run N: Richard Braun F: package/curlftpfs/ @@ -2443,6 +2464,9 @@ F: package/tzdata/ N: RJ Ascani F: package/azmq/ +N: Robert Marko +F: package/mdio-tools/ + N: Robert Rose F: package/grpc/ @@ -2466,6 +2490,7 @@ F: package/enlightenment/ F: package/flare-engine/ F: package/flare-game/ F: package/gcc/ +F: package/gitlab-runner/ F: package/glibc/ F: package/irrlicht/ F: package/liblinear/ @@ -2486,6 +2511,7 @@ F: package/ogre/ F: package/openpowerlink/ F: package/physfs/ F: package/piglit/ +F: package/python-libevdev/ F: package/qemu/ F: package/solarus/ F: package/stress-ng/ @@ -2501,6 +2527,9 @@ F: support/testing/tests/package/test_glxinfo.py F: support/testing/tests/package/test_openssh.py F: toolchain/ +N: Rufus Segar +F: package/agent-proxy/ + N: Ryan Wilkins F: package/biosdevname/ @@ -2536,6 +2565,10 @@ F: package/libbson/ F: package/lua-resty-http/ F: package/mpir/ +N: Sen Hastings +F: package/systemd +F: support/scripts/pkg-stats + N: Sergey Bobrenok F: package/sdbus-cpp/ @@ -2545,10 +2578,12 @@ F: board/linksprite/pcduino F: board/orangepi/orangepi-zero F: board/orangepi/orangepi-one F: board/orangepi/orangepi-pc-plus/ +F: board/orangepi/orangepi-zero-plus2/ F: configs/linksprite_pcduino_defconfig F: configs/orangepi_one_defconfig F: configs/orangepi_pc_plus_defconfig F: configs/orangepi_zero_defconfig +F: configs/orangepi_zero_plus2_defconfig F: package/armbian-firmware/ F: package/hostapd/ F: package/rtl8189fs/ @@ -2574,9 +2609,6 @@ F: package/tunctl/ F: package/ubus/ F: package/wolfssl/ -N: Shyam Saini -F: package/cukinia/ - N: Simon Dawson F: boot/at91bootstrap3/ F: package/cppzmq/ @@ -2665,37 +2697,34 @@ F: package/hwloc/ F: package/powertop/ N: Suniel Mahesh -F: board/firefly/ -F: board/friendlyarm/nanopc-t4 -F: board/friendlyarm/nanopi-m4 -F: board/orangepi/orangepi-rk3399 F: board/pine64/rockpro64 -F: board/radxa/rockpi-4 F: board/radxa/rockpi-n8 -F: board/radxa/rockpi-n10 -F: configs/friendlyarm_nanopc_t4_defconfig -F: configs/friendlyarm_nanopi_m4_defconfig -F: configs/orangepi_rk3399_defconfig -F: configs/roc_pc_rk3399_defconfig -F: configs/rock_pi_4_defconfig F: configs/rock_pi_n8_defconfig -F: configs/rock_pi_n10_defconfig F: configs/rockpro64_defconfig -F: package/arm-gnu-a-toolchain/ - -N: Sven Haardiek -F: package/lcdproc/ -F: package/python-influxdb/ +F: package/arm-gnu-toolchain/ N: Sven Oliver Moll F: package/most/ +N: TIAN Yuanhao +F: package/cli11/ +F: package/libsolv/ +F: package/open-iscsi/ +F: package/open-isns/ +F: package/reproc/ +F: package/termcolor/ +F: package/tl-expected/ + +N: Tan En De +F: package/libkcapi/ + N: Theo Debrouwere F: board/beagleboardx15/ F: configs/beagleboardx15_defconfig F: package/pugixml/ N: Thierry Bultel +F: package/dracut/ F: package/mpd-mpc/ N: Thijs Vermeir @@ -2705,6 +2734,7 @@ F: package/x265/ N: Thomas Claveirole F: package/fcgiwrap/ F: package/openlayers/ +F: package/vuejs/ F: package/vuejs-router/ N: Thomas De Schampheleire @@ -2748,9 +2778,15 @@ F: support/testing/tests/package/test_perl_lwp_protocol_https.py F: utils/size-stats-compare F: toolchain/ +N: Thomas Devoogdt +F: package/fluent-bit/ + N: Thomas Huth +F: board/qemu/m68k-mcf5208/ +F: configs/qemu_m68k_mcf5208_defconfig F: package/ascii-invaders/ F: package/frotz/ +F: package/kvm-unit-tests/ F: package/xorcurses/ N: Thomas Petazzoni @@ -2761,7 +2797,6 @@ F: boot/beaglev-ddrinit/ F: boot/beaglev-secondboot/ F: boot/boot-wrapper-aarch64/ F: boot/grub2/ -F: boot/gummiboot/ F: configs/beaglev_defconfig F: configs/stm32mp157c_dk2_defconfig F: package/android-tools/ @@ -2775,6 +2810,7 @@ F: package/cloop/ F: package/cmake/ F: package/cramfs/ F: package/dmidecode/ +F: package/double-conversion/ F: package/flashrom/ F: package/gcc/ F: package/genext2fs/ @@ -2786,6 +2822,7 @@ F: package/hiawatha/ F: package/igh-ethercat/ F: package/intltool/ F: package/jh71xx-tools/ +F: package/libb2/ F: package/libcap/ F: package/libffi/ F: package/libsha1/ @@ -2807,9 +2844,11 @@ F: package/python3/ F: package/python-augeas/ F: package/python-flask-expects-json/ F: package/python-git/ +F: package/python-qrcode/ F: package/python-serial/ F: package/python-unittest-xml-reporting/ F: package/qextserialport/ +F: package/qt6/ F: package/riscv64-elf-toolchain/ F: package/rpcbind/ F: package/rt-tests/ @@ -2820,12 +2859,17 @@ F: package/squashfs/ F: package/tinifier/ F: package/wayland/ F: package/weston/ +F: support/testing/tests/boot/test_grub.py +F: support/testing/tests/boot/test_grub/ F: support/testing/tests/boot/test_syslinux.py +F: support/testing/tests/package/sample_nodejs_basic.js +F: support/testing/tests/package/sample_nodejs_module.js F: support/testing/tests/package/sample_python_augeas.py F: support/testing/tests/package/sample_python_flask.py F: support/testing/tests/package/sample_python_flask_expects_json.py 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_flask.py F: support/testing/tests/package/test_python_flask_expects_json.py @@ -2845,6 +2889,9 @@ F: package/waf/ F: support/testing/tests/package/test_crudini.py F: support/testing/tests/package/test_redis.py +N: Tobias Waldekranz +F: package/kmemd/ + N: Tudor Holton F: package/openjdk/ @@ -2877,6 +2924,13 @@ N: Vincent Prince F: package/nss-myhostname/ F: package/utp_com/ +N: Vincent Stehlé +F: board/qemu/aarch64-ebbr/ +F: board/qemu/arm-ebbr/ +F: configs/qemu_aarch64_ebbr_defconfig +F: configs/qemu_arm_ebbr_defconfig +F: package/edk2-non-osi/ + N: Vincent Stehlé F: board/bananapi/bananapi-m2-zero/ F: configs/bananapi_m2_zero_defconfig @@ -2884,6 +2938,10 @@ F: configs/uevm5432_defconfig F: package/i7z/ F: package/msr-tools/ 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_zerofree.py N: Vinicius Tinti F: package/python-thrift/ @@ -2924,19 +2982,21 @@ F: package/python-pyusb/ N: Wojciech Niziński F: package/fwup/ +N: Xuanhao Shi +F: boot/ti-k3-r5-loader/ + N: Yair Ben Avraham F: package/casync/ F: package/gloox/ F: package/tpm2-pkcs11/ N: Yann E. MORIN -F: board/friendlyarm/nanopi-neo/ -F: configs/friendlyarm_nanopi_neo_defconfig F: fs/squashfs/ F: package/asterisk/ F: package/cegui/ F: package/dahdi-linux/ F: package/dahdi-tools/ +F: package/dbus-broker/ F: package/dtc/ F: package/dtv-scan-tables/ F: package/dvb-apps/ @@ -2975,9 +3035,13 @@ F: package/vde2/ F: package/w_scan/ F: package/wayland/ F: package/weston/ +F: package/wtfutil/ F: package/zisofs-tools/ F: support/download/ +N: Yann E. MORIN +F: package/gpsd/ + N: Yegor Yefremov F: configs/beaglebone_defconfig F: configs/beaglebone_qt5_defconfig @@ -3027,8 +3091,14 @@ F: package/wpa_supplicant/ F: package/x11r7/xapp_xconsole/ F: package/x11r7/xapp_xinput-calibrator/ F: package/zlog/ +F: support/testing/tests/package/sample_python_dicttoxml2.py +F: support/testing/tests/package/sample_python_dtschema.py +F: support/testing/tests/package/sample_python_munch.py F: support/testing/tests/package/test_libftdi1.py F: support/testing/tests/package/test_python_can.py +F: support/testing/tests/package/test_python_dicttoxml2.py +F: support/testing/tests/package/test_python_dtschema.py +F: support/testing/tests/package/test_python_munch.py F: utils/scanpypi N: Yunhao Tian diff --git a/Makefile b/Makefile index 71f8096b711..a7b77299467 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,6 @@ # Makefile for buildroot # -# Copyright (C) 1999-2005 by Erik Andersen -# Copyright (C) 2006-2014 by the Buildroot developers -# Copyright (C) 2014-2020 by the Buildroot developers +# Copyright (C) the Buildroot developers # # 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 @@ -92,9 +90,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2022.02 +export BR2_VERSION := 2023.02.5 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1646777000 +BR2_VERSION_EPOCH = 1695815000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) @@ -396,6 +394,9 @@ unexport DESTDIR # Causes breakage with packages that needs host-ruby unexport RUBYOPT +# Compilation of perl-related packages will fail otherwise +unexport PERL_MM_OPT + include package/pkg-utils.mk include package/doc-asciidoc.mk @@ -478,8 +479,7 @@ BR_CACHE_DIR ?= $(call qstrip,$(BR2_CCACHE_DIR)) export BR_CACHE_DIR HOSTCC = $(CCACHE) $(HOSTCC_NOCCACHE) HOSTCXX = $(CCACHE) $(HOSTCXX_NOCCACHE) -else -export BR_NO_CCACHE +export BR2_USE_CCACHE ?= 1 endif # Scripts in support/ or post-build scripts may need to reference @@ -565,14 +565,12 @@ ifeq ($(BR_FORCE_CHECK_DEPENDENCIES),YES) define CHECK_ONE_DEPENDENCY ifeq ($$($(2)_TYPE),target) -ifeq ($$($(2)_IS_VIRTUAL),) ifneq ($$($$($(2)_KCONFIG_VAR)),y) $$(error $$($(2)_NAME) is in the dependency chain of $$($(1)_NAME) that \ has added it to its _DEPENDENCIES variable without selecting it or \ depending on it from Config.in) endif endif -endif endef $(foreach pkg,$(call UPPERCASE,$(PACKAGES)),\ @@ -649,14 +647,6 @@ STRIP_FIND_SPECIAL_LIBS_CMD = \ \( -name 'ld-*.so*' -o -name 'libpthread*.so*' \) \ -print0 -ifeq ($(BR2_ECLIPSE_REGISTER),y) -define TOOLCHAIN_ECLIPSE_REGISTER - ./support/scripts/eclipse-register-toolchain `readlink -f $(O)` \ - $(notdir $(TARGET_CROSS)) $(BR2_ARCH) -endef -TARGET_FINALIZE_HOOKS += TOOLCHAIN_ECLIPSE_REGISTER -endif - # Generate locale data. ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),y) GLIBC_GENERATE_LOCALES = $(call qstrip,$(BR2_GENERATE_LOCALE)) @@ -664,7 +654,7 @@ ifneq ($(GLIBC_GENERATE_LOCALES),) PACKAGES += host-localedef define GENERATE_GLIBC_LOCALES - $(MAKE) -f support/misc/gen-glibc-locales.mk \ + +$(MAKE) -f support/misc/gen-glibc-locales.mk \ ENDIAN=$(call LOWERCASE,$(BR2_ENDIAN)) \ LOCALES="$(GLIBC_GENERATE_LOCALES)" \ Q=$(Q) @@ -735,7 +725,7 @@ target-finalize: $(PACKAGES) $(TARGET_DIR) host-finalize rm -rf $(TARGET_DIR)/usr/include $(TARGET_DIR)/usr/share/aclocal \ $(TARGET_DIR)/usr/lib/pkgconfig $(TARGET_DIR)/usr/share/pkgconfig \ $(TARGET_DIR)/usr/lib/cmake $(TARGET_DIR)/usr/share/cmake \ - $(TARGET_DIR)/usr/doc + $(TARGET_DIR)/usr/lib/rpm $(TARGET_DIR)/usr/doc find $(TARGET_DIR)/usr/{lib,share}/ -name '*.cmake' -print0 | xargs -0 rm -f find $(TARGET_DIR)/lib/ $(TARGET_DIR)/usr/lib/ $(TARGET_DIR)/usr/libexec/ \ \( -name '*.a' -o -name '*.la' -o -name '*.prl' \) -print0 | xargs -0 rm -f @@ -810,6 +800,14 @@ endif # merged /usr touch $(TARGET_DIR)/usr +# Note: this will run in the filesystem context, so will use a copy +# of target/, not the real one, so the files are still available on +# re-builds (foo-rebuild, etc...) +define ROOTFS_RM_HWDB_DATA + rm -rf $(TARGET_DIR)/usr/lib/udev/hwdb.d/ $(TARGET_DIR)/etc/udev/hwdb.d/ +endef +ROOTFS_PRE_CMD_HOOKS += ROOTFS_RM_HWDB_DATA + .PHONY: target-post-image target-post-image: $(TARGETS_ROOTFS) target-finalize staging-finalize @rm -f $(ROOTFS_COMMON_TAR) @@ -873,6 +871,9 @@ graph-build: $(O)/build/build-time.log --type=pie-$(t) --input=$(<) \ --output=$(GRAPHS_DIR)/build.pie-$(t).$(BR_GRAPH_OUT) \ $(if $(BR2_GRAPH_ALT),--alternate-colors)$(sep)) + ./support/scripts/graph-build-time --type=timeline --input=$(<) \ + --output=$(GRAPHS_DIR)/build.timeline.$(BR_GRAPH_OUT) \ + $(if $(BR2_GRAPH_ALT),--alternate-colors) .PHONY: graph-depends-requirements graph-depends-requirements: @@ -1010,13 +1011,18 @@ oldconfig syncconfig olddefconfig: $(BUILD_DIR)/buildroot-config/conf outputmake defconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile @$(COMMON_CONFIG_ENV) $< --defconfig$(if $(DEFCONFIG),=$(DEFCONFIG)) $(CONFIG_CONFIG_IN) -define percent_defconfig -# Override the BR2_DEFCONFIG from COMMON_CONFIG_ENV with the new defconfig -%_defconfig: $(BUILD_DIR)/buildroot-config/conf $(1)/configs/%_defconfig outputmakefile - @$$(COMMON_CONFIG_ENV) BR2_DEFCONFIG=$(1)/configs/$$@ \ - $$< --defconfig=$(1)/configs/$$@ $$(CONFIG_CONFIG_IN) -endef -$(eval $(foreach d,$(call reverse,$(TOPDIR) $(BR2_EXTERNAL_DIRS)),$(call percent_defconfig,$(d))$(sep))) +%_defconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile + @defconfig=$(or \ + $(firstword \ + $(foreach d, \ + $(call reverse,$(TOPDIR) $(BR2_EXTERNAL_DIRS)), \ + $(wildcard $(d)/configs/$@) \ + ) \ + ), \ + $(error "Can't find $@") \ + ); \ + $(COMMON_CONFIG_ENV) BR2_DEFCONFIG=$${defconfig} \ + $< --defconfig=$${defconfig} $(CONFIG_CONFIG_IN) update-defconfig: savedefconfig @@ -1036,7 +1042,7 @@ savedefconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile # staging and target directories do NOT list these as # dependencies anywhere else -$(BUILD_DIR) $(BASE_TARGET_DIR) $(HOST_DIR) $(BINARIES_DIR) $(LEGAL_INFO_DIR) $(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST) $(PER_PACKAGE_DIR): +$(BASE_DIR) $(BUILD_DIR) $(BASE_TARGET_DIR) $(HOST_DIR) $(BINARIES_DIR) $(LEGAL_INFO_DIR) $(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST) $(PER_PACKAGE_DIR): @mkdir -p $@ # outputmakefile generates a Makefile in the output directory, if using a @@ -1048,23 +1054,22 @@ ifeq ($(NEED_WRAPPER),y) $(Q)$(TOPDIR)/support/scripts/mkmakefile $(TOPDIR) $(O) endif -.PHONY: check-make-version -check-make-version: -ifneq ($(filter $(RUNNING_MAKE_VERSION),4.3),) - @echo "Make 4.3 doesn't support 'printvars' and 'show-vars' recipes" - @exit 1 -endif - # printvars prints all the variables currently defined in our # Makefiles. Alternatively, if a non-empty VARS variable is passed, # only the variables matching the make pattern passed in VARS are # displayed. # show-vars does the same, but as a JSON dictionnary. +# +# Note: we iterate of .VARIABLES and filter each variable individually, +# to workaround a bug in make 4.3; see https://savannah.gnu.org/bugs/?59093 .PHONY: printvars -printvars: check-make-version +printvars: +ifndef VARS + $(error Please pass a non-empty VARS to 'make printvars') +endif @: $(foreach V, \ - $(sort $(filter $(VARS),$(.VARIABLES))), \ + $(sort $(foreach X, $(.VARIABLES), $(filter $(VARS),$(X)))), \ $(if $(filter-out environment% default automatic, \ $(origin $V)), \ $(if $(QUOTED_VARS),\ @@ -1072,21 +1077,29 @@ printvars: check-make-version $(info $V=$(if $(RAW_VARS),$(value $V),$($V)))))) # ')))) # Syntax colouring... +# See details above, same as for printvars .PHONY: show-vars show-vars: VARS?=% -show-vars: check-make-version +show-vars: @: - $(info $(call clean-json, { \ + $(foreach i, \ + $(call clean-json, { \ $(foreach V, \ - $(sort $(filter $(VARS),$(.VARIABLES))), \ - $(if $(filter-out environment% default automatic, $(origin $V)), \ + $(.VARIABLES), \ + $(and $(filter $(VARS),$(V)) \ + , \ + $(filter-out environment% default automatic, $(origin $V)) \ + , \ "$V": { \ "expanded": $(call mk-json-str,$($V))$(comma) \ "raw": $(call mk-json-str,$(value $V)) \ }$(comma) \ ) \ ) \ - } )) + } ) \ + , \ + $(info $(i)) \ + ) .PHONY: clean clean: @@ -1244,8 +1257,13 @@ check-flake8: | xargs -- python3 -m flake8 --statistics check-package: - find $(TOPDIR) -type f \( -name '*.mk' -o -name '*.hash' -o -name 'Config.*' -o -name '*.patch' \) \ - -exec ./utils/check-package --exclude=Sob --exclude=HashSpaces {} + + $(Q)./utils/check-package `git ls-tree -r --name-only HEAD` \ + --ignore-list=$(TOPDIR)/.checkpackageignore + +.PHONY: .checkpackageignore +.checkpackageignore: + $(Q)./utils/check-package --failed-only `git ls-tree -r --name-only HEAD` \ + > .checkpackageignore include docs/manual/manual.mk -include $(foreach dir,$(BR2_EXTERNAL_DIRS),$(sort $(wildcard $(dir)/docs/*/*.mk))) diff --git a/arch/Config.in b/arch/Config.in index 98b0e40d516..1c0c400a987 100644 --- a/arch/Config.in +++ b/arch/Config.in @@ -9,10 +9,7 @@ config BR2_KERNEL_64_USERLAND_32 config BR2_SOFT_FLOAT bool -config BR2_ARCH_HAS_MMU_MANDATORY - bool - -config BR2_ARCH_HAS_MMU_OPTIONAL +config BR2_USE_MMU bool choice @@ -23,7 +20,7 @@ choice config BR2_arcle bool "ARC (little endian)" - select BR2_ARCH_HAS_MMU_MANDATORY + select BR2_USE_MMU help Synopsys' DesignWare ARC Processor Cores are a family of 32-bit CPUs that can be used from deeply embedded to high @@ -31,7 +28,7 @@ config BR2_arcle config BR2_arceb bool "ARC (big endian)" - select BR2_ARCH_HAS_MMU_MANDATORY + select BR2_USE_MMU help Synopsys' DesignWare ARC Processor Cores are a family of 32-bit CPUs that can be used from deeply embedded to high @@ -49,7 +46,7 @@ config BR2_arm config BR2_armeb bool "ARM (big endian)" - # MMU support is set by the subarchitecture file, arch/Config.in.arm + select BR2_USE_MMU help ARM is a 32-bit reduced instruction set computer (RISC) instruction set architecture (ISA) developed by ARM Holdings. @@ -60,7 +57,6 @@ config BR2_armeb config BR2_aarch64 bool "AArch64 (little endian)" select BR2_ARCH_IS_64 - select BR2_ARCH_HAS_MMU_MANDATORY help Aarch64 is a 64-bit architecture developed by ARM Holdings. http://www.arm.com/products/processors/instruction-set-architectures/armv8-architecture.php @@ -69,25 +65,14 @@ config BR2_aarch64 config BR2_aarch64_be bool "AArch64 (big endian)" select BR2_ARCH_IS_64 - select BR2_ARCH_HAS_MMU_MANDATORY help Aarch64 is a 64-bit architecture developed by ARM Holdings. http://www.arm.com/products/processors/instruction-set-architectures/armv8-architecture.php http://en.wikipedia.org/wiki/ARM -config BR2_csky - bool "csky" - select BR2_ARCH_HAS_NO_TOOLCHAIN_BUILDROOT - select BR2_ARCH_HAS_MMU_MANDATORY - select BR2_ARCH_NEEDS_GCC_AT_LEAST_9 - help - csky is processor IP from china. - http://www.c-sky.com/ - http://www.github.com/c-sky - config BR2_i386 bool "i386" - select BR2_ARCH_HAS_MMU_MANDATORY + select BR2_USE_MMU help Intel i386 architecture compatible microprocessor http://en.wikipedia.org/wiki/I386 @@ -101,7 +86,7 @@ config BR2_m68k config BR2_microblazeel bool "Microblaze AXI (little endian)" - select BR2_ARCH_HAS_MMU_MANDATORY + select BR2_USE_MMU help Soft processor core designed for Xilinx FPGAs from Xilinx. AXI bus based architecture (little endian) @@ -110,7 +95,7 @@ config BR2_microblazeel config BR2_microblazebe bool "Microblaze non-AXI (big endian)" - select BR2_ARCH_HAS_MMU_MANDATORY + select BR2_USE_MMU help Soft processor core designed for Xilinx FPGAs from Xilinx. PLB bus based architecture (non-AXI, big endian) @@ -119,7 +104,7 @@ config BR2_microblazebe config BR2_mips bool "MIPS (big endian)" - select BR2_ARCH_HAS_MMU_MANDATORY + select BR2_USE_MMU help MIPS is a RISC microprocessor from MIPS Technologies. Big endian. @@ -128,7 +113,7 @@ config BR2_mips config BR2_mipsel bool "MIPS (little endian)" - select BR2_ARCH_HAS_MMU_MANDATORY + select BR2_USE_MMU help MIPS is a RISC microprocessor from MIPS Technologies. Little endian. @@ -138,7 +123,7 @@ config BR2_mipsel config BR2_mips64 bool "MIPS64 (big endian)" select BR2_ARCH_IS_64 - select BR2_ARCH_HAS_MMU_MANDATORY + select BR2_USE_MMU help MIPS is a RISC microprocessor from MIPS Technologies. Big endian. @@ -148,24 +133,16 @@ config BR2_mips64 config BR2_mips64el bool "MIPS64 (little endian)" select BR2_ARCH_IS_64 - select BR2_ARCH_HAS_MMU_MANDATORY + select BR2_USE_MMU help MIPS is a RISC microprocessor from MIPS Technologies. Little endian. http://www.mips.com/ http://en.wikipedia.org/wiki/MIPS_Technologies -config BR2_nds32 - bool "nds32" - select BR2_ARCH_HAS_NO_TOOLCHAIN_BUILDROOT - select BR2_ARCH_HAS_MMU_MANDATORY - help - nds32 is a 32-bit architecture developed by Andes Technology. - https://en.wikipedia.org/wiki/Andes_Technology - config BR2_nios2 bool "Nios II" - select BR2_ARCH_HAS_MMU_MANDATORY + select BR2_USE_MMU help Nios II is a soft core processor from Altera Corporation. http://www.altera.com/ @@ -173,14 +150,14 @@ config BR2_nios2 config BR2_or1k bool "OpenRISC" - select BR2_ARCH_HAS_MMU_MANDATORY + select BR2_USE_MMU help OpenRISC is a free and open processor for embedded system. http://openrisc.io config BR2_powerpc bool "PowerPC" - select BR2_ARCH_HAS_MMU_MANDATORY + select BR2_USE_MMU help PowerPC is a RISC architecture created by Apple-IBM-Motorola alliance. Big endian. @@ -190,7 +167,7 @@ config BR2_powerpc config BR2_powerpc64 bool "PowerPC64 (big endian)" select BR2_ARCH_IS_64 - select BR2_ARCH_HAS_MMU_MANDATORY + select BR2_USE_MMU help PowerPC is a RISC architecture created by Apple-IBM-Motorola alliance. Big endian. @@ -200,7 +177,7 @@ config BR2_powerpc64 config BR2_powerpc64le bool "PowerPC64 (little endian)" select BR2_ARCH_IS_64 - select BR2_ARCH_HAS_MMU_MANDATORY + select BR2_USE_MMU help PowerPC is a RISC architecture created by Apple-IBM-Motorola alliance. Little endian. @@ -220,7 +197,7 @@ config BR2_riscv config BR2_s390x bool "s390x" select BR2_ARCH_IS_64 - select BR2_ARCH_HAS_MMU_MANDATORY + select BR2_USE_MMU help s390x is a big-endian architecture made by IBM. http://www.ibm.com/ @@ -228,7 +205,7 @@ config BR2_s390x config BR2_sh bool "SuperH" - select BR2_ARCH_HAS_MMU_OPTIONAL + select BR2_USE_MMU help SuperH (or SH) is a 32-bit reduced instruction set computer (RISC) instruction set architecture (ISA) developed by @@ -238,7 +215,7 @@ config BR2_sh config BR2_sparc bool "SPARC" - select BR2_ARCH_HAS_MMU_MANDATORY + select BR2_USE_MMU help SPARC (from Scalable Processor Architecture) is a RISC instruction set architecture (ISA) developed by Sun @@ -249,7 +226,7 @@ config BR2_sparc config BR2_sparc64 bool "SPARC64" select BR2_ARCH_IS_64 - select BR2_ARCH_HAS_MMU_MANDATORY + select BR2_USE_MMU help SPARC (from Scalable Processor Architecture) is a RISC instruction set architecture (ISA) developed by Sun @@ -260,7 +237,7 @@ config BR2_sparc64 config BR2_x86_64 bool "x86_64" select BR2_ARCH_IS_64 - select BR2_ARCH_HAS_MMU_MANDATORY + select BR2_USE_MMU help x86-64 is an extension of the x86 instruction set (Intel i386 architecture compatible microprocessor). @@ -323,6 +300,10 @@ config BR2_ARCH_NEEDS_GCC_AT_LEAST_11 bool select BR2_ARCH_NEEDS_GCC_AT_LEAST_10 +config BR2_ARCH_NEEDS_GCC_AT_LEAST_12 + bool + select BR2_ARCH_NEEDS_GCC_AT_LEAST_11 + # The following string values are defined by the individual # Config.in.$ARCH files config BR2_ARCH @@ -377,56 +358,6 @@ config BR2_BINFMT_SUPPORTS_SHARED config BR2_READELF_ARCH_NAME string -# Set up target binary format -choice - prompt "Target Binary Format" - default BR2_BINFMT_ELF if BR2_USE_MMU - default BR2_BINFMT_FLAT - -config BR2_BINFMT_ELF - bool "ELF" - depends on BR2_USE_MMU - select BR2_BINFMT_SUPPORTS_SHARED - help - ELF (Executable and Linkable Format) is a format for libraries - and executables used across different architectures and - operating systems. - -config BR2_BINFMT_FLAT - bool "FLAT" - depends on !BR2_USE_MMU - help - FLAT binary is a relatively simple and lightweight executable - format based on the original a.out format. It is widely used - in environment where no MMU is available. - -endchoice - -# Set up flat binary type -choice - prompt "FLAT Binary type" - default BR2_BINFMT_FLAT_ONE - depends on BR2_BINFMT_FLAT - -config BR2_BINFMT_FLAT_ONE - bool "One memory region" - help - All segments are linked into one memory region. - -config BR2_BINFMT_FLAT_SHARED - bool "Shared binary" - depends on BR2_m68k - # Even though this really generates shared binaries, there is no libdl - # and dlopen() cannot be used. So packages that require shared - # libraries cannot be built. Therefore, we don't select - # BR2_BINFMT_SUPPORTS_SHARED and therefore force BR2_STATIC_LIBS. - # Although this adds -static to the compilation, that's not a problem - # because the -mid-shared-library option overrides it. - help - Allow to load and link indiviual FLAT binaries at run time. - -endchoice - if BR2_arcle || BR2_arceb source "arch/Config.in.arc" endif @@ -435,10 +366,6 @@ if BR2_arm || BR2_armeb || BR2_aarch64 || BR2_aarch64_be source "arch/Config.in.arm" endif -if BR2_csky -source "arch/Config.in.csky" -endif - if BR2_m68k source "arch/Config.in.m68k" endif @@ -451,10 +378,6 @@ if BR2_mips || BR2_mips64 || BR2_mipsel || BR2_mips64el source "arch/Config.in.mips" endif -if BR2_nds32 -source "arch/Config.in.nds32" -endif - if BR2_nios2 source "arch/Config.in.nios2" endif @@ -491,4 +414,54 @@ if BR2_xtensa source "arch/Config.in.xtensa" endif +# Set up target binary format +choice + prompt "Target Binary Format" + default BR2_BINFMT_ELF if BR2_USE_MMU + default BR2_BINFMT_FLAT + +config BR2_BINFMT_ELF + bool "ELF" + depends on BR2_USE_MMU + select BR2_BINFMT_SUPPORTS_SHARED + help + ELF (Executable and Linkable Format) is a format for libraries + and executables used across different architectures and + operating systems. + +config BR2_BINFMT_FLAT + bool "FLAT" + depends on !BR2_USE_MMU + help + FLAT binary is a relatively simple and lightweight executable + format based on the original a.out format. It is widely used + in environment where no MMU is available. + +endchoice + +# Set up flat binary type +choice + prompt "FLAT Binary type" + default BR2_BINFMT_FLAT_ONE + depends on BR2_BINFMT_FLAT + +config BR2_BINFMT_FLAT_ONE + bool "One memory region" + help + All segments are linked into one memory region. + +config BR2_BINFMT_FLAT_SHARED + bool "Shared binary" + depends on BR2_m68k + # Even though this really generates shared binaries, there is no libdl + # and dlopen() cannot be used. So packages that require shared + # libraries cannot be built. Therefore, we don't select + # BR2_BINFMT_SUPPORTS_SHARED and therefore force BR2_STATIC_LIBS. + # Although this adds -static to the compilation, that's not a problem + # because the -mid-shared-library option overrides it. + help + Allow to load and link indiviual FLAT binaries at run time. + +endchoice + endmenu # Target options diff --git a/arch/Config.in.arm b/arch/Config.in.arm index 85040ac89f2..78621e321c9 100644 --- a/arch/Config.in.arm +++ b/arch/Config.in.arm @@ -73,21 +73,26 @@ config BR2_ARM_CPU_HAS_THUMB2 config BR2_ARM_CPU_ARMV4 bool + select BR2_USE_MMU config BR2_ARM_CPU_ARMV5 bool + select BR2_USE_MMU config BR2_ARM_CPU_ARMV6 bool + select BR2_USE_MMU config BR2_ARM_CPU_ARMV7A bool + select BR2_USE_MMU config BR2_ARM_CPU_ARMV7M bool config BR2_ARM_CPU_ARMV8A bool + select BR2_USE_MMU choice prompt "Target Architecture Variant" @@ -103,23 +108,19 @@ config BR2_arm920t select BR2_ARM_CPU_HAS_ARM select BR2_ARM_CPU_HAS_THUMB select BR2_ARM_CPU_ARMV4 - select BR2_ARCH_HAS_MMU_OPTIONAL config BR2_arm922t bool "arm922t" select BR2_ARM_CPU_HAS_ARM select BR2_ARM_CPU_HAS_THUMB select BR2_ARM_CPU_ARMV4 - select BR2_ARCH_HAS_MMU_OPTIONAL config BR2_fa526 bool "fa526/626" select BR2_ARM_CPU_HAS_ARM select BR2_ARM_CPU_ARMV4 - select BR2_ARCH_HAS_MMU_OPTIONAL config BR2_strongarm bool "strongarm sa110/sa1100" select BR2_ARM_CPU_HAS_ARM select BR2_ARM_CPU_ARMV4 - select BR2_ARCH_HAS_MMU_OPTIONAL comment "armv5 cores" config BR2_arm926t @@ -128,18 +129,11 @@ config BR2_arm926t select BR2_ARM_CPU_MAYBE_HAS_VFPV2 select BR2_ARM_CPU_HAS_THUMB select BR2_ARM_CPU_ARMV5 - select BR2_ARCH_HAS_MMU_OPTIONAL -config BR2_iwmmxt - bool "iwmmxt" - select BR2_ARM_CPU_HAS_ARM - select BR2_ARM_CPU_ARMV5 - select BR2_ARCH_HAS_MMU_OPTIONAL config BR2_xscale bool "xscale" select BR2_ARM_CPU_HAS_ARM select BR2_ARM_CPU_HAS_THUMB select BR2_ARM_CPU_ARMV5 - select BR2_ARCH_HAS_MMU_OPTIONAL comment "armv6 cores" config BR2_arm1136j_s @@ -147,34 +141,29 @@ config BR2_arm1136j_s select BR2_ARM_CPU_HAS_ARM select BR2_ARM_CPU_HAS_THUMB select BR2_ARM_CPU_ARMV6 - select BR2_ARCH_HAS_MMU_OPTIONAL config BR2_arm1136jf_s bool "arm1136jf-s" select BR2_ARM_CPU_HAS_ARM select BR2_ARM_CPU_HAS_VFPV2 select BR2_ARM_CPU_HAS_THUMB select BR2_ARM_CPU_ARMV6 - select BR2_ARCH_HAS_MMU_OPTIONAL config BR2_arm1176jz_s bool "arm1176jz-s" select BR2_ARM_CPU_HAS_ARM select BR2_ARM_CPU_HAS_THUMB select BR2_ARM_CPU_ARMV6 - select BR2_ARCH_HAS_MMU_OPTIONAL config BR2_arm1176jzf_s bool "arm1176jzf-s" select BR2_ARM_CPU_HAS_ARM select BR2_ARM_CPU_HAS_VFPV2 select BR2_ARM_CPU_HAS_THUMB select BR2_ARM_CPU_ARMV6 - select BR2_ARCH_HAS_MMU_OPTIONAL config BR2_arm11mpcore bool "mpcore" select BR2_ARM_CPU_HAS_ARM select BR2_ARM_CPU_MAYBE_HAS_VFPV2 select BR2_ARM_CPU_HAS_THUMB select BR2_ARM_CPU_ARMV6 - select BR2_ARCH_HAS_MMU_OPTIONAL comment "armv7a cores" config BR2_cortex_a5 @@ -184,7 +173,6 @@ config BR2_cortex_a5 select BR2_ARM_CPU_MAYBE_HAS_VFPV4 select BR2_ARM_CPU_HAS_THUMB2 select BR2_ARM_CPU_ARMV7A - select BR2_ARCH_HAS_MMU_OPTIONAL config BR2_cortex_a7 bool "cortex-A7" select BR2_ARM_CPU_HAS_ARM @@ -192,7 +180,6 @@ config BR2_cortex_a7 select BR2_ARM_CPU_HAS_VFPV4 select BR2_ARM_CPU_HAS_THUMB2 select BR2_ARM_CPU_ARMV7A - select BR2_ARCH_HAS_MMU_OPTIONAL config BR2_cortex_a8 bool "cortex-A8" select BR2_ARM_CPU_HAS_ARM @@ -200,7 +187,6 @@ config BR2_cortex_a8 select BR2_ARM_CPU_HAS_VFPV3 select BR2_ARM_CPU_HAS_THUMB2 select BR2_ARM_CPU_ARMV7A - select BR2_ARCH_HAS_MMU_OPTIONAL config BR2_cortex_a9 bool "cortex-A9" select BR2_ARM_CPU_HAS_ARM @@ -208,7 +194,6 @@ config BR2_cortex_a9 select BR2_ARM_CPU_MAYBE_HAS_VFPV3 select BR2_ARM_CPU_HAS_THUMB2 select BR2_ARM_CPU_ARMV7A - select BR2_ARCH_HAS_MMU_OPTIONAL config BR2_cortex_a12 bool "cortex-A12" select BR2_ARM_CPU_HAS_ARM @@ -216,7 +201,6 @@ config BR2_cortex_a12 select BR2_ARM_CPU_HAS_VFPV4 select BR2_ARM_CPU_HAS_THUMB2 select BR2_ARM_CPU_ARMV7A - select BR2_ARCH_HAS_MMU_OPTIONAL config BR2_cortex_a15 bool "cortex-A15" select BR2_ARM_CPU_HAS_ARM @@ -224,7 +208,6 @@ config BR2_cortex_a15 select BR2_ARM_CPU_HAS_VFPV4 select BR2_ARM_CPU_HAS_THUMB2 select BR2_ARM_CPU_ARMV7A - select BR2_ARCH_HAS_MMU_OPTIONAL config BR2_cortex_a15_a7 bool "cortex-A15/A7 big.LITTLE" select BR2_ARM_CPU_HAS_ARM @@ -232,7 +215,6 @@ config BR2_cortex_a15_a7 select BR2_ARM_CPU_HAS_VFPV4 select BR2_ARM_CPU_HAS_THUMB2 select BR2_ARM_CPU_ARMV7A - select BR2_ARCH_HAS_MMU_OPTIONAL select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 config BR2_cortex_a17 bool "cortex-A17" @@ -241,7 +223,6 @@ config BR2_cortex_a17 select BR2_ARM_CPU_HAS_VFPV4 select BR2_ARM_CPU_HAS_THUMB2 select BR2_ARM_CPU_ARMV7A - select BR2_ARCH_HAS_MMU_OPTIONAL select BR2_ARCH_NEEDS_GCC_AT_LEAST_5 config BR2_cortex_a17_a7 bool "cortex-A17/A7 big.LITTLE" @@ -250,15 +231,15 @@ config BR2_cortex_a17_a7 select BR2_ARM_CPU_HAS_VFPV4 select BR2_ARM_CPU_HAS_THUMB2 select BR2_ARM_CPU_ARMV7A - select BR2_ARCH_HAS_MMU_OPTIONAL select BR2_ARCH_NEEDS_GCC_AT_LEAST_5 config BR2_pj4 bool "pj4" select BR2_ARM_CPU_HAS_ARM select BR2_ARM_CPU_HAS_VFPV3 select BR2_ARM_CPU_ARMV7A - select BR2_ARCH_HAS_MMU_OPTIONAL +# Cortex-M cores are only supported for little endian configurations +if BR2_arm comment "armv7m cores" config BR2_cortex_m3 bool "cortex-M3" @@ -275,6 +256,7 @@ config BR2_cortex_m7 select BR2_ARM_CPU_MAYBE_HAS_FPV5 select BR2_ARM_CPU_ARMV7M select BR2_ARCH_NEEDS_GCC_AT_LEAST_5 +endif # BR2_arm endif # !BR2_ARCH_IS_64 comment "armv8 cores" @@ -286,7 +268,6 @@ config BR2_cortex_a32 select BR2_ARM_CPU_HAS_THUMB2 select BR2_ARM_CPU_HAS_FP_ARMV8 select BR2_ARM_CPU_ARMV8A - select BR2_ARCH_HAS_MMU_OPTIONAL select BR2_ARCH_NEEDS_GCC_AT_LEAST_6 config BR2_cortex_a35 bool "cortex-A35" @@ -295,7 +276,6 @@ config BR2_cortex_a35 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_HAS_MMU_OPTIONAL select BR2_ARCH_NEEDS_GCC_AT_LEAST_6 config BR2_cortex_a53 bool "cortex-A53" @@ -304,7 +284,6 @@ config BR2_cortex_a53 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_HAS_MMU_OPTIONAL config BR2_cortex_a57 bool "cortex-A57" select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64 @@ -312,7 +291,6 @@ config BR2_cortex_a57 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_HAS_MMU_OPTIONAL config BR2_cortex_a57_a53 bool "cortex-A57/A53 big.LITTLE" select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64 @@ -320,7 +298,6 @@ config BR2_cortex_a57_a53 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_HAS_MMU_OPTIONAL select BR2_ARCH_NEEDS_GCC_AT_LEAST_6 config BR2_cortex_a72 bool "cortex-A72" @@ -329,7 +306,6 @@ config BR2_cortex_a72 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_HAS_MMU_OPTIONAL select BR2_ARCH_NEEDS_GCC_AT_LEAST_5 config BR2_cortex_a72_a53 bool "cortex-A72/A53 big.LITTLE" @@ -338,7 +314,6 @@ config BR2_cortex_a72_a53 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_HAS_MMU_OPTIONAL select BR2_ARCH_NEEDS_GCC_AT_LEAST_6 config BR2_cortex_a73 bool "cortex-A73" @@ -347,7 +322,6 @@ config BR2_cortex_a73 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_HAS_MMU_OPTIONAL select BR2_ARCH_NEEDS_GCC_AT_LEAST_7 config BR2_cortex_a73_a35 bool "cortex-A73/A35 big.LITTLE" @@ -356,7 +330,6 @@ config BR2_cortex_a73_a35 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_HAS_MMU_OPTIONAL select BR2_ARCH_NEEDS_GCC_AT_LEAST_7 config BR2_cortex_a73_a53 bool "cortex-A73/A53 big.LITTLE" @@ -365,14 +338,12 @@ config BR2_cortex_a73_a53 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_HAS_MMU_OPTIONAL select BR2_ARCH_NEEDS_GCC_AT_LEAST_7 config BR2_emag bool "emag" depends on BR2_ARCH_IS_64 select BR2_ARM_CPU_HAS_FP_ARMV8 select BR2_ARM_CPU_ARMV8A - select BR2_ARCH_HAS_MMU_OPTIONAL select BR2_ARCH_NEEDS_GCC_AT_LEAST_9 config BR2_exynos_m1 bool "exynos-m1" @@ -381,63 +352,54 @@ config BR2_exynos_m1 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_HAS_MMU_OPTIONAL select BR2_ARCH_NEEDS_GCC_AT_LEAST_5 config BR2_falkor bool "falkor" depends on BR2_ARCH_IS_64 select BR2_ARM_CPU_HAS_FP_ARMV8 select BR2_ARM_CPU_ARMV8A - select BR2_ARCH_HAS_MMU_OPTIONAL select BR2_ARCH_NEEDS_GCC_AT_LEAST_7 config BR2_phecda bool "phecda" depends on BR2_ARCH_IS_64 select BR2_ARM_CPU_HAS_FP_ARMV8 select BR2_ARM_CPU_ARMV8A - select BR2_ARCH_HAS_MMU_OPTIONAL select BR2_ARCH_NEEDS_GCC_AT_LEAST_9 config BR2_qdf24xx bool "qdf24xx" depends on BR2_ARCH_IS_64 select BR2_ARM_CPU_HAS_FP_ARMV8 select BR2_ARM_CPU_ARMV8A - select BR2_ARCH_HAS_MMU_OPTIONAL select BR2_ARCH_NEEDS_GCC_AT_LEAST_6 config BR2_thunderx bool "thunderx (aka octeontx)" depends on BR2_ARCH_IS_64 select BR2_ARM_CPU_HAS_FP_ARMV8 select BR2_ARM_CPU_ARMV8A - select BR2_ARCH_HAS_MMU_OPTIONAL select BR2_ARCH_NEEDS_GCC_AT_LEAST_5 config BR2_thunderxt81 bool "thunderxt81 (aka octeontx81)" depends on BR2_ARCH_IS_64 select BR2_ARM_CPU_HAS_FP_ARMV8 select BR2_ARM_CPU_ARMV8A - select BR2_ARCH_HAS_MMU_OPTIONAL select BR2_ARCH_NEEDS_GCC_AT_LEAST_7 config BR2_thunderxt83 bool "thunderxt83 (aka octeontx83)" depends on BR2_ARCH_IS_64 select BR2_ARM_CPU_HAS_FP_ARMV8 select BR2_ARM_CPU_ARMV8A - select BR2_ARCH_HAS_MMU_OPTIONAL select BR2_ARCH_NEEDS_GCC_AT_LEAST_7 config BR2_thunderxt88 bool "thunderxt88" depends on BR2_ARCH_IS_64 select BR2_ARM_CPU_HAS_FP_ARMV8 select BR2_ARM_CPU_ARMV8A - select BR2_ARCH_HAS_MMU_OPTIONAL select BR2_ARCH_NEEDS_GCC_AT_LEAST_7 config BR2_thunderxt88p1 bool "thunderxt88p1" depends on BR2_ARCH_IS_64 select BR2_ARM_CPU_HAS_FP_ARMV8 select BR2_ARM_CPU_ARMV8A - select BR2_ARCH_HAS_MMU_OPTIONAL select BR2_ARCH_NEEDS_GCC_AT_LEAST_7 config BR2_xgene1 bool "xgene1" @@ -446,7 +408,6 @@ config BR2_xgene1 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_HAS_MMU_OPTIONAL select BR2_ARCH_NEEDS_GCC_AT_LEAST_5 comment "armv8.1a cores" @@ -455,21 +416,18 @@ config BR2_thunderx2t99 depends on BR2_ARCH_IS_64 select BR2_ARM_CPU_HAS_FP_ARMV8 select BR2_ARM_CPU_ARMV8A - select BR2_ARCH_HAS_MMU_OPTIONAL select BR2_ARCH_NEEDS_GCC_AT_LEAST_7 config BR2_thunderx2t99p1 bool "thunderx2t99p1" depends on BR2_ARCH_IS_64 select BR2_ARM_CPU_HAS_FP_ARMV8 select BR2_ARM_CPU_ARMV8A - select BR2_ARCH_HAS_MMU_OPTIONAL select BR2_ARCH_NEEDS_GCC_AT_LEAST_7 config BR2_vulcan bool "vulcan" depends on BR2_ARCH_IS_64 select BR2_ARM_CPU_HAS_FP_ARMV8 select BR2_ARM_CPU_ARMV8A - select BR2_ARCH_HAS_MMU_OPTIONAL select BR2_ARCH_NEEDS_GCC_AT_LEAST_7 comment "armv8.2a cores" @@ -478,21 +436,18 @@ config BR2_cortex_a55 depends on BR2_ARCH_IS_64 select BR2_ARM_CPU_HAS_FP_ARMV8 select BR2_ARM_CPU_ARMV8A - select BR2_ARCH_HAS_MMU_OPTIONAL select BR2_ARCH_NEEDS_GCC_AT_LEAST_8 config BR2_cortex_a75 bool "cortex-A75" depends on BR2_ARCH_IS_64 select BR2_ARM_CPU_HAS_FP_ARMV8 select BR2_ARM_CPU_ARMV8A - select BR2_ARCH_HAS_MMU_OPTIONAL select BR2_ARCH_NEEDS_GCC_AT_LEAST_8 config BR2_cortex_a75_a55 bool "cortex-A75/A55 big.LITTLE" depends on BR2_ARCH_IS_64 select BR2_ARM_CPU_HAS_FP_ARMV8 select BR2_ARM_CPU_ARMV8A - select BR2_ARCH_HAS_MMU_OPTIONAL select BR2_ARCH_NEEDS_GCC_AT_LEAST_8 config BR2_cortex_a76 bool "cortex-A76" @@ -501,7 +456,6 @@ config BR2_cortex_a76 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_HAS_MMU_OPTIONAL select BR2_ARCH_NEEDS_GCC_AT_LEAST_9 config BR2_cortex_a76_a55 bool "cortex-A76/A55 big.LITTLE" @@ -510,7 +464,6 @@ config BR2_cortex_a76_a55 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_HAS_MMU_OPTIONAL select BR2_ARCH_NEEDS_GCC_AT_LEAST_9 config BR2_neoverse_n1 bool "neoverse-N1 (aka ares)" @@ -519,14 +472,12 @@ config BR2_neoverse_n1 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_HAS_MMU_OPTIONAL select BR2_ARCH_NEEDS_GCC_AT_LEAST_9 config BR2_tsv110 bool "tsv110" depends on BR2_ARCH_IS_64 select BR2_ARM_CPU_HAS_FP_ARMV8 select BR2_ARM_CPU_ARMV8A - select BR2_ARCH_HAS_MMU_OPTIONAL select BR2_ARCH_NEEDS_GCC_AT_LEAST_9 comment "armv8.4a cores" @@ -535,7 +486,6 @@ config BR2_saphira depends on BR2_ARCH_IS_64 select BR2_ARM_CPU_HAS_FP_ARMV8 select BR2_ARM_CPU_ARMV8A - select BR2_ARCH_HAS_MMU_OPTIONAL select BR2_ARCH_NEEDS_GCC_AT_LEAST_8 endchoice @@ -816,6 +766,31 @@ config BR2_ARM_INSTRUCTIONS_THUMB2 endchoice +choice + prompt "MMU Page Size" + default BR2_ARM64_PAGE_SIZE_4K + depends on BR2_aarch64 || BR2_aarch64_be + help + The default is 4KB, and you should probably keep this unless + you know what you are doing. In particular, the kernel + configuration must match this choice. If your kernel is + built by Buildroot, the kernel configuration is + automatically adjusted, but not if you built your kernel + outside of Buildroot. + +config BR2_ARM64_PAGE_SIZE_4K + bool "4KB" + +config BR2_ARM64_PAGE_SIZE_64K + bool "64KB" + +endchoice + +config BR2_ARM64_PAGE_SIZE + string + default "4K" if BR2_ARM64_PAGE_SIZE_4K + default "64K" if BR2_ARM64_PAGE_SIZE_64K + config BR2_ARCH default "arm" if BR2_arm default "armeb" if BR2_armeb @@ -838,7 +813,6 @@ config BR2_GCC_TARGET_CPU default "strongarm" if BR2_strongarm # armv5 default "arm926ej-s" if BR2_arm926t - default "iwmmxt" if BR2_iwmmxt default "xscale" if BR2_xscale # armv6 default "arm1136j-s" if BR2_arm1136j_s diff --git a/arch/Config.in.csky b/arch/Config.in.csky deleted file mode 100644 index b20b39e2259..00000000000 --- a/arch/Config.in.csky +++ /dev/null @@ -1,52 +0,0 @@ -choice - prompt "Target Architecture Variant" - default BR2_ck610 - help - Specific CPU variant to use - -config BR2_ck610 - # Not supported by upstream gcc <= 9, and handled as a special - # exception in package/gcc/Config.in.host - bool "ck610" - -config BR2_ck807 - bool "ck807" - -config BR2_ck810 - bool "ck810" - -config BR2_ck860 - bool "ck860" - -endchoice - -config BR2_CSKY_FPU - bool "Enable FPU coprocessor" - depends on BR2_ck810 || BR2_ck807 || BR2_ck860 - help - You can say N here if your C-SKY CPU doesn't have a - Floating-Point Coprocessor or if you don't need FPU support - for your user-space programs. - -config BR2_CSKY_VDSP - bool "Enable VDSP enhanced instructions Co-processor" - depends on BR2_CSKY_FPU - -config BR2_GCC_TARGET_FLOAT_ABI - default "soft" if !BR2_CSKY_FPU - default "hard" if BR2_CSKY_FPU - -config BR2_ARCH - default "csky" - -config BR2_NORMALIZED_ARCH - default "csky" - -config BR2_ENDIAN - default "LITTLE" - -config BR2_READELF_ARCH_NAME - default "CSKY" - -# vim: ft=kconfig -# -*- mode:kconfig; -*- diff --git a/arch/Config.in.m68k b/arch/Config.in.m68k index 1f7d9446214..9fd22aaf1e5 100644 --- a/arch/Config.in.m68k +++ b/arch/Config.in.m68k @@ -26,7 +26,7 @@ choice config BR2_m68k_68040 bool "68040" select BR2_m68k_m68k - select BR2_ARCH_HAS_MMU_MANDATORY + select BR2_USE_MMU config BR2_m68k_cf5208 bool "5208" diff --git a/arch/Config.in.nds32 b/arch/Config.in.nds32 deleted file mode 100644 index 0babb2cf7f9..00000000000 --- a/arch/Config.in.nds32 +++ /dev/null @@ -1,17 +0,0 @@ -config BR2_ARCH - default "nds32le" - -config BR2_NORMALIZED_ARCH - default "nds32" - -config BR2_GCC_TARGET_ARCH - default "v3" - -config BR2_ENDIAN - default "LITTLE" - -config BR2_READELF_ARCH_NAME - default "Andes Technology compact code size embedded RISC processor family" - -# vim: ft=kconfig -# -*- mode:kconfig; -*- diff --git a/arch/Config.in.powerpc b/arch/Config.in.powerpc index 4a39cfee70d..d4e204a463a 100644 --- a/arch/Config.in.powerpc +++ b/arch/Config.in.powerpc @@ -1,6 +1,10 @@ config BR2_POWERPC_CPU_HAS_ALTIVEC bool +config BR2_POWERPC_CPU_HAS_VSX + bool + select BR2_POWERPC_CPU_HAS_ALTIVEC + config BR2_POWERPC_CPU_HAS_SPE bool @@ -11,121 +15,135 @@ choice Specific CPU variant to use config BR2_generic_powerpc bool "generic" + # No C library supports this variant on ppc64le + depends on BR2_powerpc || BR2_powerpc64 config BR2_powerpc_401 bool "401" - depends on !BR2_ARCH_IS_64 + depends on BR2_powerpc config BR2_powerpc_403 bool "403" - depends on !BR2_ARCH_IS_64 + depends on BR2_powerpc config BR2_powerpc_405 bool "405" - depends on !BR2_ARCH_IS_64 + depends on BR2_powerpc config BR2_powerpc_405fp bool "405 with FPU" - depends on !BR2_ARCH_IS_64 + depends on BR2_powerpc config BR2_powerpc_440 bool "440" - depends on !BR2_ARCH_IS_64 + depends on BR2_powerpc config BR2_powerpc_440fp bool "440 with FPU" - depends on !BR2_ARCH_IS_64 + depends on BR2_powerpc config BR2_powerpc_464 bool "464" - depends on !BR2_ARCH_IS_64 + depends on BR2_powerpc config BR2_powerpc_464fp bool "464 with FPU" - depends on !BR2_ARCH_IS_64 + depends on BR2_powerpc config BR2_powerpc_476 bool "476" - depends on !BR2_ARCH_IS_64 + depends on BR2_powerpc config BR2_powerpc_476fp bool "476 with FPU" - depends on !BR2_ARCH_IS_64 + depends on BR2_powerpc config BR2_powerpc_505 bool "505" - depends on !BR2_ARCH_IS_64 + depends on BR2_powerpc config BR2_powerpc_602 bool "602" - depends on !BR2_ARCH_IS_64 + depends on BR2_powerpc config BR2_powerpc_603 bool "603" - depends on !BR2_ARCH_IS_64 + depends on BR2_powerpc config BR2_powerpc_603e bool "603e" - depends on !BR2_ARCH_IS_64 + depends on BR2_powerpc config BR2_powerpc_604 bool "604" - depends on !BR2_ARCH_IS_64 + depends on BR2_powerpc config BR2_powerpc_604e bool "604e" - depends on !BR2_ARCH_IS_64 + depends on BR2_powerpc config BR2_powerpc_620 bool "620" + depends on BR2_powerpc || BR2_powerpc64 config BR2_powerpc_630 bool "630" + depends on BR2_powerpc || BR2_powerpc64 config BR2_powerpc_740 bool "740" - depends on !BR2_ARCH_IS_64 + depends on BR2_powerpc config BR2_powerpc_7400 bool "7400" - depends on !BR2_ARCH_IS_64 + depends on BR2_powerpc select BR2_POWERPC_CPU_HAS_ALTIVEC config BR2_powerpc_7450 bool "7450" - depends on !BR2_ARCH_IS_64 + depends on BR2_powerpc select BR2_POWERPC_CPU_HAS_ALTIVEC config BR2_powerpc_750 bool "750" - depends on !BR2_ARCH_IS_64 + depends on BR2_powerpc config BR2_powerpc_821 bool "821" - depends on !BR2_ARCH_IS_64 + depends on BR2_powerpc config BR2_powerpc_823 bool "823" - depends on !BR2_ARCH_IS_64 + depends on BR2_powerpc config BR2_powerpc_860 bool "860" - depends on !BR2_ARCH_IS_64 + depends on BR2_powerpc config BR2_powerpc_970 bool "970" + depends on BR2_powerpc || BR2_powerpc64 select BR2_POWERPC_CPU_HAS_ALTIVEC config BR2_powerpc_8540 bool "8540 / e500v1" - depends on !BR2_ARCH_IS_64 + depends on BR2_powerpc select BR2_POWERPC_CPU_HAS_SPE config BR2_powerpc_8548 bool "8548 / e500v2" - depends on !BR2_ARCH_IS_64 + depends on BR2_powerpc select BR2_POWERPC_CPU_HAS_SPE config BR2_powerpc_e300c2 bool "e300c2" - depends on !BR2_ARCH_IS_64 + depends on BR2_powerpc config BR2_powerpc_e300c3 bool "e300c3" - depends on !BR2_ARCH_IS_64 + depends on BR2_powerpc config BR2_powerpc_e500mc bool "e500mc" - depends on !BR2_ARCH_IS_64 + depends on BR2_powerpc config BR2_powerpc_e5500 bool "e5500" - depends on !BR2_powerpc64le + depends on BR2_powerpc || BR2_powerpc64 config BR2_powerpc_e6500 bool "e6500" - depends on !BR2_powerpc64le + depends on BR2_powerpc || BR2_powerpc64 select BR2_POWERPC_CPU_HAS_ALTIVEC config BR2_powerpc_power4 bool "power4" + depends on BR2_powerpc || BR2_powerpc64 config BR2_powerpc_power5 bool "power5" + depends on BR2_powerpc || BR2_powerpc64 config BR2_powerpc_power6 bool "power6" + depends on BR2_powerpc || BR2_powerpc64 select BR2_POWERPC_CPU_HAS_ALTIVEC config BR2_powerpc_power7 bool "power7" - select BR2_POWERPC_CPU_HAS_ALTIVEC + depends on BR2_powerpc || BR2_powerpc64 + select BR2_POWERPC_CPU_HAS_VSX config BR2_powerpc_power8 bool "power8" + select BR2_POWERPC_CPU_HAS_VSX +config BR2_powerpc_power9 + bool "power9" select BR2_POWERPC_CPU_HAS_ALTIVEC + select BR2_POWERPC_CPU_HAS_VSX + select BR2_ARCH_NEEDS_GCC_AT_LEAST_6 endchoice choice @@ -203,6 +221,7 @@ config BR2_GCC_TARGET_CPU default "power6" if BR2_powerpc_power6 default "power7" if BR2_powerpc_power7 default "power8" if BR2_powerpc_power8 + default "power9" if BR2_powerpc_power9 config BR2_READELF_ARCH_NAME default "PowerPC" if BR2_powerpc diff --git a/arch/Config.in.riscv b/arch/Config.in.riscv index 288ed833eb7..b5e84389e0a 100644 --- a/arch/Config.in.riscv +++ b/arch/Config.in.riscv @@ -71,15 +71,23 @@ choice config BR2_RISCV_32 bool "32-bit" - select BR2_ARCH_HAS_MMU_MANDATORY + select BR2_USE_MMU config BR2_RISCV_64 bool "64-bit" select BR2_ARCH_IS_64 - select BR2_ARCH_HAS_MMU_OPTIONAL endchoice +config BR2_RISCV_USE_MMU + bool "MMU support" + default y + depends on BR2_RISCV_64 + select BR2_USE_MMU + help + Enable this option if your RISC-V core has a MMU (Memory + Management Unit). + choice prompt "Target ABI" default BR2_RISCV_ABI_ILP32D if !BR2_ARCH_IS_64 && BR2_RISCV_ISA_RVD @@ -108,6 +116,7 @@ config BR2_RISCV_ABI_LP64 config BR2_RISCV_ABI_LP64F bool "lp64f" depends on BR2_ARCH_IS_64 && BR2_RISCV_ISA_RVF + depends on BR2_USE_MMU config BR2_RISCV_ABI_LP64D bool "lp64d" diff --git a/arch/Config.in.sh b/arch/Config.in.sh index c1ba449dd5c..d3acc8ccf8e 100644 --- a/arch/Config.in.sh +++ b/arch/Config.in.sh @@ -5,8 +5,6 @@ choice help Specific CPU variant to use -config BR2_sh2a - bool "sh2a (SH2A big endian)" config BR2_sh4 bool "sh4 (SH4 little endian)" config BR2_sh4eb @@ -18,7 +16,6 @@ config BR2_sh4aeb endchoice config BR2_ARCH - default "sh2a" if BR2_sh2a default "sh4" if BR2_sh4 default "sh4eb" if BR2_sh4eb default "sh4a" if BR2_sh4a @@ -29,7 +26,7 @@ config BR2_NORMALIZED_ARCH config BR2_ENDIAN default "LITTLE" if BR2_sh4 || BR2_sh4a - default "BIG" if BR2_sh2a || BR2_sh4eb || BR2_sh4aeb + default "BIG" if BR2_sh4eb || BR2_sh4aeb config BR2_READELF_ARCH_NAME default "Renesas / SuperH SH" diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index 2560da922be..56ce1eb0cc0 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -286,9 +286,9 @@ config BR2_x86_atom select BR2_X86_CPU_HAS_SSSE3 help This option is deprecated. Since gcc 4.9, the gcc option - "bonnel" is preferred. Use BR2_x86_bonnel instead. -config BR2_x86_bonnel - bool "bonnel" + "bonnell" is preferred. Use BR2_x86_bonnell instead. +config BR2_x86_bonnell + bool "bonnell" select BR2_X86_CPU_HAS_MMX select BR2_X86_CPU_HAS_SSE select BR2_X86_CPU_HAS_SSE2 @@ -450,7 +450,6 @@ config BR2_x86_alderlake select BR2_X86_CPU_HAS_SSE42 select BR2_X86_CPU_HAS_AVX select BR2_X86_CPU_HAS_AVX2 - select BR2_X86_CPU_HAS_AVX512 select BR2_ARCH_NEEDS_GCC_AT_LEAST_11 config BR2_x86_rocketlake bool "rocketlake" @@ -598,7 +597,7 @@ config BR2_GCC_TARGET_ARCH default "broadwell" if BR2_x86_broadwell default "skylake" if BR2_x86_skylake default "atom" if BR2_x86_atom - default "bonnel" if BR2_x86_bonnel + default "bonnell" if BR2_x86_bonnell default "westmere" if BR2_x86_westmere default "silvermont" if BR2_x86_silvermont default "goldmont" if BR2_x86_goldmont diff --git a/arch/Config.in.xtensa b/arch/Config.in.xtensa index 45ad2dc4874..f9d5adb4c97 100644 --- a/arch/Config.in.xtensa +++ b/arch/Config.in.xtensa @@ -5,11 +5,10 @@ choice config BR2_XTENSA_CUSTOM bool "Custom Xtensa processor configuration" - select BR2_ARCH_HAS_MMU_OPTIONAL config BR2_xtensa_fsf bool "fsf - Default configuration" - select BR2_ARCH_HAS_MMU_MANDATORY + select BR2_USE_MMU endchoice @@ -41,6 +40,15 @@ config BR2_XTENSA_BIG_ENDIAN endchoice +config BR2_XTENSA_USE_MMU + bool "MMU support" + default y + depends on BR2_XTENSA_CUSTOM + select BR2_USE_MMU + help + Enable this option if your Xtensa core has a MMU (Memory + Management Unit). + config BR2_ENDIAN default "LITTLE" if BR2_XTENSA_LITTLE_ENDIAN default "BIG" if BR2_xtensa_fsf || BR2_XTENSA_BIG_ENDIAN diff --git a/arch/arch.mk b/arch/arch.mk index 289c5a11257..2e737b92acc 100644 --- a/arch/arch.mk +++ b/arch/arch.mk @@ -18,5 +18,16 @@ GCC_TARGET_FPU := $(call qstrip,$(BR2_GCC_TARGET_FPU)) GCC_TARGET_FLOAT_ABI := $(call qstrip,$(BR2_GCC_TARGET_FLOAT_ABI)) GCC_TARGET_MODE := $(call qstrip,$(BR2_GCC_TARGET_MODE)) +# Explicitly set LD's "max-page-size" instead of relying on some defaults +ifeq ($(BR2_ARC_PAGE_SIZE_4K)$(BR2_ARM64_PAGE_SIZE_4K),y) +ARCH_TOOLCHAIN_WRAPPER_OPTS += -Wl,-z,max-page-size=4096 -Wl,-z,common-page-size=4096 +else ifeq ($(BR2_ARC_PAGE_SIZE_8K),y) +ARCH_TOOLCHAIN_WRAPPER_OPTS += -Wl,-z,max-page-size=8192 -Wl,-z,common-page-size=8192 +else ifeq ($(BR2_ARC_PAGE_SIZE_16K),y) +ARCH_TOOLCHAIN_WRAPPER_OPTS += -Wl,-z,max-page-size=16384 -Wl,-z,common-page-size=16384 +else ifeq ($(BR2_ARM64_PAGE_SIZE_64K),y) +ARCH_TOOLCHAIN_WRAPPER_OPTS += -Wl,-z,max-page-size=65536 -Wl,-z,common-page-size=65536 +endif + # Include any architecture specific makefiles. -include $(sort $(wildcard arch/arch.mk.*)) diff --git a/arch/arch.mk.arc b/arch/arch.mk.arc index 32b818b0e04..42037626a6a 100644 --- a/arch/arch.mk.arc +++ b/arch/arch.mk.arc @@ -2,16 +2,7 @@ ifeq ($(BR2_arc),y) # -matomic is always required when the ARC core has the atomic extensions ifeq ($(BR2_ARC_ATOMIC_EXT),y) -ARCH_TOOLCHAIN_WRAPPER_OPTS = -matomic -endif - -# Explicitly set LD's "max-page-size" instead of relying on some defaults -ifeq ($(BR2_ARC_PAGE_SIZE_4K),y) -ARCH_TOOLCHAIN_WRAPPER_OPTS += -Wl,-z,max-page-size=4096 -else ifeq ($(BR2_ARC_PAGE_SIZE_8K),y) -ARCH_TOOLCHAIN_WRAPPER_OPTS += -Wl,-z,max-page-size=8192 -else ifeq ($(BR2_ARC_PAGE_SIZE_16K),y) -ARCH_TOOLCHAIN_WRAPPER_OPTS += -Wl,-z,max-page-size=16384 +ARCH_TOOLCHAIN_WRAPPER_OPTS += -matomic endif endif diff --git a/arch/arch.mk.csky b/arch/arch.mk.csky deleted file mode 100644 index fb59ae22fd3..00000000000 --- a/arch/arch.mk.csky +++ /dev/null @@ -1,26 +0,0 @@ -# -# Configure the GCC_TARGET_ARCH variable and append the -# appropriate C-SKY ISA extensions. -# - -ifeq ($(BR2_csky),y) - -ifeq ($(BR2_ck610),y) -GCC_TARGET_CPU := ck610 -else ifeq ($(BR2_ck807),y) -GCC_TARGET_CPU := ck807 -else ifeq ($(BR2_ck810),y) -GCC_TARGET_CPU := ck810 -else ifeq ($(BR2_ck860),y) -GCC_TARGET_CPU := ck860 -endif - -ifeq ($(BR2_CSKY_FPU),y) -GCC_TARGET_CPU := $(GCC_TARGET_CPU)f -endif - -ifeq ($(BR2_CSKY_VDSP),y) -GCC_TARGET_CPU := $(GCC_TARGET_CPU)v -endif - -endif diff --git a/arch/arch.mk.riscv b/arch/arch.mk.riscv index f3bf2b34679..8d2236147c8 100644 --- a/arch/arch.mk.riscv +++ b/arch/arch.mk.riscv @@ -27,4 +27,13 @@ ifeq ($(BR2_RISCV_ISA_RVC),y) GCC_TARGET_ARCH := $(GCC_TARGET_ARCH)c endif +# Starting from gcc 12.x, csr and fence instructions have been +# separated from the base I instruction set, and special -march +# suffixes are needed to enable their support. In Buildroot, we assume +# all RISC-V cores that support Linux implement those instructions, so +# we unconditionally enable those extensions. +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_12),y) +GCC_TARGET_ARCH := $(GCC_TARGET_ARCH)_zicsr_zifencei +endif + endif diff --git a/arch/arch.mk.xtensa b/arch/arch.mk.xtensa index fd410f6bfac..75145e725ff 100644 --- a/arch/arch.mk.xtensa +++ b/arch/arch.mk.xtensa @@ -1,3 +1,9 @@ +BR_ARCH_XTENSA_OVERLAY_FILE = $(call qstrip,$(BR2_XTENSA_OVERLAY_FILE)) + +ifeq ($(BR_BUILDING)$(BR2_XTENSA_CUSTOM)$(BR2_TOOLCHAIN_BUILDROOT):$(BR_ARCH_XTENSA_OVERLAY_FILE),yyy:) +$(error No xtensa overlay file provided. Check your BR2_XTENSA_OVERLAY_FILE setting) +endif + ################################################################################ # This variable can be used by packages that need to extract the overlay. # @@ -9,7 +15,6 @@ # tar xf $(ARCH_XTENSA_OVERLAY_FILE) -C $(@D) --strip-components=1 gcc # endif ################################################################################ -BR_ARCH_XTENSA_OVERLAY_FILE = $(call qstrip,$(BR2_XTENSA_OVERLAY_FILE)) ifneq ($(filter http://% https://% ftp://% scp://%,$(BR_ARCH_XTENSA_OVERLAY_FILE)),) ARCH_XTENSA_OVERLAY_URL = $(BR_ARCH_XTENSA_OVERLAY_FILE) ARCH_XTENSA_OVERLAY_FILE = $($(PKG)_DL_DIR)/$(notdir $(BR_ARCH_XTENSA_OVERLAY_FILE)) diff --git a/board/aarch64-efi/genimage-efi.cfg b/board/aarch64-efi/genimage-efi.cfg index 87e85816bc3..158deab87dc 100644 --- a/board/aarch64-efi/genimage-efi.cfg +++ b/board/aarch64-efi/genimage-efi.cfg @@ -18,7 +18,7 @@ image disk.img { partition boot { image = "efi-part.vfat" - partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b + partition-type-uuid = U offset = 32K bootable = true } diff --git a/board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts b/board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts index 264af298097..39fa4df1b1f 100644 --- a/board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts +++ b/board/acmesystems/acqua-a5/at91-sama5d3_acqua.dts @@ -4,7 +4,7 @@ * Copyright (C) 2014 Atmel, * 2014 Nicolas Ferre * - * 2020 Sergio Tanzilli + * 2022 Sergio Tanzilli * * Licensed under GPLv2 or later. */ @@ -17,7 +17,7 @@ chosen { stdout-path = "serial0:115200n8"; - bootargs = "mem=256M console=ttyS0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rw rootwait consoleblank=0"; + bootargs = "mem=256M console=ttyS0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rw rootwait net.ifnames=0"; }; memory { @@ -128,15 +128,19 @@ i2c3@ { compatible = "i2c-gpio"; - gpios = <&pioE 1 0 /* SDA */ - &pioE 2 0 /* SCK */ - >; - i2c-gpio,delay-us = <4>; /* ~178 kHz */ + + 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>; @@ -149,6 +153,7 @@ reg = <0x0 0x06>; }; }; + }; pwm0: pwm@f002c000 { @@ -204,6 +209,17 @@ }; 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 = @@ -217,6 +233,13 @@ ; }; + pinctrl_i2c3_gpio: i2c3-gpio { + atmel,pins = + ; + }; + + pinctrl_key_gpio: key_gpio_0 { atmel,pins = ; @@ -236,12 +259,20 @@ atmel,pins = ; /* PE9, conflicts with A9 */ }; + + pinctrl_gpio_leds: gpio_leds_default { + atmel,pins = + ; + }; }; }; }; usb0: gadget@500000 { - status = "okay"; + status = "disabled"; }; usb1: ohci@600000 { @@ -272,6 +303,8 @@ leds { compatible = "gpio-leds"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gpio_leds>; led0 { label = "led0"; diff --git a/board/amarula/a64-relic/extlinux.conf b/board/amarula/a64-relic/extlinux.conf deleted file mode 100644 index 9f469846bcf..00000000000 --- a/board/amarula/a64-relic/extlinux.conf +++ /dev/null @@ -1,4 +0,0 @@ -label linux-4.17.0-rc3 - kernel /Image - devicetree /sun50i-a64-amarula-relic.dtb - append console=ttyS0,115200 earlyprintk root=/dev/mmcblk1p4 rootwait diff --git a/board/amarula/a64-relic/genimage.cfg b/board/amarula/a64-relic/genimage.cfg deleted file mode 100644 index 58b607f5fbe..00000000000 --- a/board/amarula/a64-relic/genimage.cfg +++ /dev/null @@ -1,11 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "sun50i-a64-amarula-relic.dtb", - "extlinux" - } - } - - size = 64M -} diff --git a/board/amarula/a64-relic/post-build.sh b/board/amarula/a64-relic/post-build.sh deleted file mode 100755 index ec20fca7d96..00000000000 --- a/board/amarula/a64-relic/post-build.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -BOARD_DIR="$(dirname $0)" - -install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf diff --git a/board/amarula/a64-relic/readme.txt b/board/amarula/a64-relic/readme.txt deleted file mode 100644 index 77f79e3094f..00000000000 --- a/board/amarula/a64-relic/readme.txt +++ /dev/null @@ -1,90 +0,0 @@ -Amarula A64 Relic -================ - -Amarula A64-Relic is an Allwinner A64 based IoT device, which supports: -- Allwinner A64 Cortex-A53 -- Mali-400MP2 GPU -- AXP803 PMIC -- 1GB DDR3 RAM -- 8GB eMMC -- AP6330 Wifi/BLE -- MIPI-DSI -- CSI: OV5640 sensor -- USB OTG -- 12V DC power supply - -Wiki link: -https://openedev.amarulasolutions.com/display/ODWIKI/Amarual+A64-Relic - -Build -===== - - $ make amarula_a64_relic_defconfig - - $ make - -build files at output/images/: - - sunxi-spl.bin - - u-boot.itb - - Image - - sun50i-a64-amarula-relic.dtb - - boot.vfat - - rootfs.ext4 - -Write eMMC -========= - -The board comes with an operating system preloaded on the eMMC. -To replace it with the Buildroot-built system, take the following -steps - -1. Connect the board UART with host and open minicom(ttyUSBx/115200N8) - -2. Supply 12V DC for power-on the board. - -3. Interrupt U-Boot by pressing enter - -4. Create GPT partitions - => mmc dev 1 - => gpt write mmc 1 $partitions - -5. Connect the board USB-OTG with USB slot on the host. - -6. Initiate fastboot - => fastboot 0 - -7. Write images from host onto eMMC using fastboot - $ cd output/images - $ sudo fastboot -i 0x1f3a flash loader1 sunxi-spl.bin - $ sudo fastboot -i 0x1f3a flash loader2 u-boot.itb - $ sudo fastboot -i 0x1f3a flash esp boot.vfat - $ sudo fastboot -i 0x1f3a flash system rootfs.ext4 - -Update eMMC during Development -============================== - -During development, reflashing the entire filesystem image at every -change is time consuming. A useful alternative is to directly access -over USB the filesystem stored on the eMMC, using the USB Mass Storage -capability of U-Boot. To achieve this: - -1. Build U-Boot by enabling UMS - $ make uboot-menuconfig - (select CONFIG_CMD_USB_MASS_STORAGE=y) - -2. Follow all 6 steps from 'Write eMMC' and mount eMMC on host - => mmc dev 1 - => ums 0 mmc 1 - -WiFi -==== - - # wpa_passphrase ACCESSPOINTNAME >> /etc/wpa_supplicant.conf - (type password and enter) - # wpa_supplicant -i wlan0 -c /etc/wpa_supplicant.conf -B - # udhcpc -i wlan0 - # ping google.com - --- -Jagan Teki -29-Jun-2018 diff --git a/board/amarula/a64-relic/rootfs_overlay/lib/firmware/brcm/brcmfmac4330-sdio.txt b/board/amarula/a64-relic/rootfs_overlay/lib/firmware/brcm/brcmfmac4330-sdio.txt deleted file mode 100644 index d095f24c26b..00000000000 --- a/board/amarula/a64-relic/rootfs_overlay/lib/firmware/brcm/brcmfmac4330-sdio.txt +++ /dev/null @@ -1,83 +0,0 @@ -#AP6330_NVRAM_V1.0_20121130 -#Sample variables file for BCM94330 SD FC AGB board -manfid=0x2d0 -prodid=0x0547 -vendid=0x14e4 -devid=0x4360 -boardtype=0x05e1 -boardrev=0x1202 -boardflags=0x0080200 -nocrc=1 -xtalfreq=26000 -boardnum=22 -macaddr=00:90:4c:c5:12:38 -ag0=254 -aa2g=1 -ccode=ALL -pa0itssit=0x20 -pa0b0=5587 -pa0b1=-633 -pa0b2=-158 -rssismf2g=0xa -rssismc2g=0x3 -rssisav2g=0x7 -#rssi params for 5GHz -rssismf5g=0x4 -rssismc5g=0x3 -rssisav5g=0x7 -#PA parameters for lower a-band -pa1lob0=4748 -pa1lob1=-566 -pa1lob2=-180 -#PA parameters for midband -pa1b0=4762 -pa1b1=-593 -pa1b2=-172 -#PA parameters for high band -#pa1hib0=4596 -pa1hib0=4666 -pa1hib1=-619 -pa1hib2=-163 -rxpo5g=0 -maxp2ga0=74 -maxp5ga0=66 -maxp5gla0=66 -maxp5gha0=66 -# 2.4G Tx Power offsets -cck2gpo=0x2222 -ofdm2gpo=0x44444444 -mcs2gpo0=0x6666 -mcs2gpo1=0x6666 -# 5G Tx Power offsets -ofdm5gpo=0x44444444 -ofdm5glpo=0x44444444 -ofdm5ghpo=0x44444444 -mcs5gpo0=0x6666 -mcs5gpo1=0x6666 -mcs5glpo0=0x6666 -mcs5glpo1=0x6666 -mcs5ghpo0=0x6666 -mcs5ghpo1=0x6666 -sromrev=3 -il0macaddr=00:90:4c:c5:12:38 -wl0id=0x431b -cckPwrOffset=4 -swctrlmap_2g=0x44844484,0x42824282,0x40804484,0x18282,0x1ff -triso5g=0 -swctrlmap_5g=0x00100010,0x20202020,0x20202020,0x14202,0x0f0 -rfreg033=0x19 -rfreg033_cck=0x1f -dacrate2g=160 -dacrate5g=160 -txalpfbyp2g=1 -bphyscale=17 -cckPwrIdxCorr=-15 -pacalidx2g=50 -#pacalidx5g=20 -noise_cal_ref_2g=53 -noise_cal_po_2g=0 -noise_cal_ref_5g=52 -noise_cal_po_5g=5,0,0 -# 4330 OOB parameter: High level trigger -muxenab=0x10 - diff --git a/board/andes/ae350/genimage_sdcard.cfg b/board/andes/ae350/genimage_sdcard.cfg new file mode 100644 index 00000000000..58c6f8f1560 --- /dev/null +++ b/board/andes/ae350/genimage_sdcard.cfg @@ -0,0 +1,26 @@ +image boot.vfat { + vfat { + files = { + "u-boot-spl.bin", + "u-boot.itb", + "ae350_ax45mp.dtb", + } + } + size = 2M +} + +image sdcard.img { + hdimage { + } + + partition boot { + partition-type = 0xC + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + bootable = true + image = "rootfs.ext4" + } +} diff --git a/board/andes/ae350/patches/uboot/0001-mmc-ftsdc010_mci-Support-DTS-of-ftsdc010-driver-for-.patch b/board/andes/ae350/patches/uboot/0001-mmc-ftsdc010_mci-Support-DTS-of-ftsdc010-driver-for-.patch new file mode 100644 index 00000000000..be89a1563f7 --- /dev/null +++ b/board/andes/ae350/patches/uboot/0001-mmc-ftsdc010_mci-Support-DTS-of-ftsdc010-driver-for-.patch @@ -0,0 +1,38 @@ +From 16aad5594e08550295ea3c12c1c9ed6f64774748 Mon Sep 17 00:00:00 2001 +From: Rick Chen +Date: Tue, 29 Mar 2022 13:41:10 +0800 +Subject: [PATCH] mmc: ftsdc010_mci: Support DTS of ftsdc010 driver for + generic dma + +The ftsdc010 driver has been implemented for generic dma in Linux +kernel. And its compatible is andestech,atfsdc010g to distinguish +the legacy andestech,atfsdc010 which is not for generic dma. + +Althought the ftsdc010_mci driver in U-Boot does not use dma, but +it still can work well with the mmc node for generic dma. So add +the compatible string to support it. + +Signed-off-by: Rick Chen + +Upstream-Status: Pending + +Signed-off-by: Yu Chien Peter Lin +--- + drivers/mmc/ftsdc010_mci.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/mmc/ftsdc010_mci.c b/drivers/mmc/ftsdc010_mci.c +index 570d54cf9d..65b1d447a8 100644 +--- a/drivers/mmc/ftsdc010_mci.c ++++ b/drivers/mmc/ftsdc010_mci.c +@@ -460,6 +460,7 @@ int ftsdc010_mmc_bind(struct udevice *dev) + + static const struct udevice_id ftsdc010_mmc_ids[] = { + { .compatible = "andestech,atfsdc010" }, ++ { .compatible = "andestech,atfsdc010g" }, + { } + }; + +-- +2.34.1 + diff --git a/board/andes/ae350/patches/uboot/0002-spl-Align-device-tree-blob-address-at-8-byte-boundar.patch b/board/andes/ae350/patches/uboot/0002-spl-Align-device-tree-blob-address-at-8-byte-boundar.patch new file mode 100644 index 00000000000..5080554ca1f --- /dev/null +++ b/board/andes/ae350/patches/uboot/0002-spl-Align-device-tree-blob-address-at-8-byte-boundar.patch @@ -0,0 +1,42 @@ +From 933ad8a59f7fd9b2088badc3e97167d750a40b5a Mon Sep 17 00:00:00 2001 +From: Bin Meng +Date: Mon, 12 Jul 2021 11:52:31 +0800 +Subject: [PATCH] spl: Align device tree blob address at 8-byte boundary + +Since libfdt v1.6.1, a new requirement on the device tree address via: + + commit 5e735860c478 ("libfdt: Check for 8-byte address alignment in fdt_ro_probe_()") + +must be met that the device tree must be loaded in to memory at an +8-byte aligned address. + +Signed-off-by: Bin Meng + +This patch was imported from U-boot patchwork: +https://patchwork.ozlabs.org/project/uboot/patch/20210712035231.26475-1-bmeng.cn@gmail.com/ + +Signed-off-by: Yu Chien Peter Lin +--- + common/spl/spl_fit.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c +index a35be529..a76ad14a 100644 +--- a/common/spl/spl_fit.c ++++ b/common/spl/spl_fit.c +@@ -382,6 +382,12 @@ static int spl_fit_append_fdt(struct spl_image_info *spl_image, + */ + image_info.load_addr = spl_image->load_addr + spl_image->size; + ++ /* ++ * Since libfdt v1.6.1, the device tree must be loaded in to memory ++ * at an 8-byte aligned address. ++ */ ++ image_info.load_addr = roundup(image_info.load_addr, 8); ++ + /* Figure out which device tree the board wants to use */ + node = spl_fit_get_image_node(ctx, FIT_FDT_PROP, index++); + if (node < 0) { +-- +2.34.1 + diff --git a/board/andes/ae350/post-build.sh b/board/andes/ae350/post-build.sh new file mode 100755 index 00000000000..84187a064bc --- /dev/null +++ b/board/andes/ae350/post-build.sh @@ -0,0 +1,3 @@ +#!/bin/sh +cp $BINARIES_DIR/Image $TARGET_DIR/boot +cp $BINARIES_DIR/ae350_ax45mp.dtb $TARGET_DIR/boot diff --git a/board/andes/ae350/readme.txt b/board/andes/ae350/readme.txt new file mode 100644 index 00000000000..4de4cb38943 --- /dev/null +++ b/board/andes/ae350/readme.txt @@ -0,0 +1,63 @@ +Intro +===== + +Andestech AE350 Platform + +The AE350 prototype demonstrates the AE350 platform on the FPGA. + +How to build it +=============== + +Configure Buildroot +------------------- + + $ make andes_ae350_45_defconfig + +If you want to customize your configuration: + + $ make menuconfig + +Build everything +---------------- +Note: you will need to access to the network, since Buildroot will +download the packages' sources. + + $ make + +Result of the build +------------------- + +After building, you should obtain the following files: + + output/images/ + |-- ae350_ax45mp.dtb + |-- boot.vfat + |-- fw_dynamic.bin + |-- fw_dynamic.elf + |-- Image + |-- rootfs.ext2 + |-- rootfs.ext4 -> rootfs.ext2 + |-- sdcard.img + |-- u-boot-spl.bin + `-- u-boot.itb + +Copy the sdcard.img to a SD card with "dd": + + $ sudo dd if=sdcard.img of=/dev/sdX bs=4096 + $ sudo sync + +Your SD card partition should be: + + Disk /dev/sdb: 14.48 GiB, 15552479232 bytes, 30375936 sectors + Disk model: Multi-Card + Units: sectors of 1 * 512 = 512 bytes + Sector size (logical/physical): 512 bytes / 512 bytes + I/O size (minimum/optimal): 512 bytes / 512 bytes + Disklabel type: dos + Disk identifier: 0x00000000 + + Device Boot Start End Sectors Size Id Type + /dev/sdb1 1 4096 4096 2M c W95 FAT32 (LBA) + /dev/sdb2 * 4097 126976 122880 60M 83 Linux + +Insert SD card and reset the board, it should boot Linux from mmc. diff --git a/board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf b/board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf new file mode 100644 index 00000000000..be19e196a80 --- /dev/null +++ b/board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +label linux + kernel /boot/Image + fdt /boot/ae350_ax45mp.dtb + append earlycon=sbi root=/dev/mmcblk0p2 rootwait diff --git a/board/andes/ae350/uboot.config.fragment b/board/andes/ae350/uboot.config.fragment new file mode 100644 index 00000000000..fa38bbca3a6 --- /dev/null +++ b/board/andes/ae350/uboot.config.fragment @@ -0,0 +1,7 @@ +CONFIG_SPL_FS_FAT=y +CONFIG_SPL_MMC=y +# CONFIG_SPL_RAM_SUPPORT is not set +CONFIG_SPL_OPENSBI_LOAD_ADDR=0x0 +CONFIG_SPL_OPENSBI_SCRATCH_OPTIONS=0x0 +CONFIG_DISPLAY_CPUINFO=y +CONFIG_DISPLAY_BOARDINFO=y diff --git a/board/andes/ae3xx/ae3xx.fragment b/board/andes/ae3xx/ae3xx.fragment deleted file mode 100644 index 3b13d10740b..00000000000 --- a/board/andes/ae3xx/ae3xx.fragment +++ /dev/null @@ -1 +0,0 @@ -CONFIG_NDS32_BUILTIN_DTB="ae3xx" diff --git a/board/andes/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch b/board/andes/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch deleted file mode 100644 index adb60937bd5..00000000000 --- a/board/andes/patches/linux/0001-nds32-Fix-boot-messages-garbled.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 90d52d180dcc5d1300dc352ca709eb6453894143 Mon Sep 17 00:00:00 2001 -From: Nylon Chen -Date: Wed, 28 Nov 2018 16:26:46 +0800 -Subject: [PATCH] nds32: Fix boot messages garbled - -In order to display uart correctly we have to pass the correct setting of uart to kernel by bootarg. -This patch will provide such settings to set the correct uart baud rate. - -Signed-off-by: Nylon Chen ---- - arch/nds32/boot/dts/ae3xx.dts | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/arch/nds32/boot/dts/ae3xx.dts b/arch/nds32/boot/dts/ae3xx.dts -index bb39749a6673..aefe2090926a 100644 ---- a/arch/nds32/boot/dts/ae3xx.dts -+++ b/arch/nds32/boot/dts/ae3xx.dts -@@ -6,6 +6,7 @@ - interrupt-parent = <&intc>; - - chosen { -+ bootargs = "memblock=debug earlycon console=ttyS0,38400n8 debug loglevel=7"; - stdout-path = &serial0; - }; - --- -2.18.0 - diff --git a/board/andes/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch b/board/andes/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch deleted file mode 100644 index 71ae991816c..00000000000 --- a/board/andes/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch +++ /dev/null @@ -1,52 +0,0 @@ -From f9df4186c17d686f1ca38f973d7a3a49e8e37c01 Mon Sep 17 00:00:00 2001 -From: Dirk Mueller -Date: Tue, 14 Jan 2020 18:53:41 +0100 -Subject: [PATCH] scripts/dtc: Remove redundant YYLOC global declaration - -gcc 10 will default to -fno-common, which causes this error at link -time: - - (.text+0x0): multiple definition of `yylloc'; dtc-lexer.lex.o (symbol from plugin):(.text+0x0): first defined here - -This is because both dtc-lexer as well as dtc-parser define the same -global symbol yyloc. Before with -fcommon those were merged into one -defintion. The proper solution would be to to mark this as "extern", -however that leads to: - - dtc-lexer.l:26:16: error: redundant redeclaration of 'yylloc' [-Werror=redundant-decls] - 26 | extern YYLTYPE yylloc; - | ^~~~~~ -In file included from dtc-lexer.l:24: -dtc-parser.tab.h:127:16: note: previous declaration of 'yylloc' was here - 127 | extern YYLTYPE yylloc; - | ^~~~~~ -cc1: all warnings being treated as errors - -which means the declaration is completely redundant and can just be -dropped. - -Signed-off-by: Dirk Mueller -Signed-off-by: David Gibson -[robh: cherry-pick from upstream] -Cc: stable@vger.kernel.org -Signed-off-by: Rob Herring -Signed-off-by: Giulio Benetti ---- - scripts/dtc/dtc-lexer.l | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/scripts/dtc/dtc-lexer.l b/scripts/dtc/dtc-lexer.l -index 06c040902444..d1b3810156c7 100644 ---- a/scripts/dtc/dtc-lexer.l -+++ b/scripts/dtc/dtc-lexer.l -@@ -38,7 +38,6 @@ LINECOMMENT "//".*\n - #include "srcpos.h" - #include "dtc-parser.tab.h" - --YYLTYPE yylloc; - extern bool treesource_error; - - /* CAUTION: this will stop working if we ever use yyless() or yyunput() */ --- -2.25.1 - diff --git a/board/andes/readme.txt b/board/andes/readme.txt deleted file mode 100644 index 0f95c655499..00000000000 --- a/board/andes/readme.txt +++ /dev/null @@ -1,49 +0,0 @@ -Intro -===== - -Andestech(nds32) AE3XX Platform - -The AE3XX prototype demonstrates the AE3XX example platform on the FPGA. -It is composed of one Andestech(nds32) processor and AE3XX. - -How to build it -=============== - -Configure Buildroot -------------------- - -The andes_ae3xx_defconfig configuration is a sample configuration with -all that is required to bring the FPGA Development Board: - - $ make andes_ae3xx_defconfig - -Build everything ----------------- -Note: you will need to have access to the network, since Buildroot will -download the packages' sources. - - $ make - -Result of the build -------------------- - -After building, you should obtain this tree: - -output/images/ - +-- vmlinux - +-- rootfs.cpio - +-- rootfs.tar - -How to run it -============= - -Run ---- - - Setup the Console with the rate 38400/8-N-1. - - $ cd output/images - $ ../host/bin/nds32le-linux-gdb vmlinux - $ target remote [your host] - $ lo - $ c diff --git a/board/arcturus/aarch64-ucls1012a/post-build.sh b/board/arcturus/aarch64-ucls1012a/post-build.sh index f8ba78095f9..372df59c61f 100755 --- a/board/arcturus/aarch64-ucls1012a/post-build.sh +++ b/board/arcturus/aarch64-ucls1012a/post-build.sh @@ -1,5 +1,4 @@ #!/bin/sh mkdir -p ${TARGET_DIR}/lib/firmware -cp -f ${BUILD_DIR}/linux-custom/firmware/ppfe/* ${TARGET_DIR}/lib/firmware/ cp -f ${BUILD_DIR}/linux-custom/br2-ucls1012a.its ${BINARIES_DIR}/ diff --git a/board/arcturus/aarch64-ucls1012a/readme.txt b/board/arcturus/aarch64-ucls1012a/readme.txt index 483d5e9aef6..b486ecebc71 100644 --- a/board/arcturus/aarch64-ucls1012a/readme.txt +++ b/board/arcturus/aarch64-ucls1012a/readme.txt @@ -24,13 +24,13 @@ After building, you should obtain this tree: output/images/ +-- arc-ucls1012a.dtb - +-- Image + +-- Image.gz +-- part0-000000.itb +-- rootfs.cpio +-- rootfs.cpio.gz +-- rootfs.tar +-- u-boot.bin - +-- ucls1012a.its + +-- br2-ucls1012a.its Flashing -------- diff --git a/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload b/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload deleted file mode 100755 index c87ffda14f6..00000000000 --- a/board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -# -case "$1" in - start) - modprobe pfe - ;; - stop) - ;; - restart|reload) - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac diff --git a/board/arm/juno/linux-juno-defconfig b/board/arm/juno/linux-juno-defconfig deleted file mode 100644 index 64598d21a1a..00000000000 --- a/board/arm/juno/linux-juno-defconfig +++ /dev/null @@ -1,169 +0,0 @@ -CONFIG_SMP=y -CONFIG_SYSVIPC=y -CONFIG_POSIX_MQUEUE=y -CONFIG_FHANDLE=y -CONFIG_AUDIT=y -CONFIG_NO_HZ_IDLE=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_BSD_PROCESS_ACCT_V3=y -CONFIG_TASKSTATS=y -CONFIG_TASK_DELAY_ACCT=y -CONFIG_TASK_XACCT=y -CONFIG_TASK_IO_ACCOUNTING=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_MEMCG=y -CONFIG_MEMCG_SWAP=y -CONFIG_MEMCG_KMEM=y -CONFIG_CGROUP_HUGETLB=y -CONFIG_SCHED_AUTOGROUP=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_KALLSYMS_ALL=y -CONFIG_PROFILING=y -CONFIG_JUMP_LABEL=y -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_ARCH_VEXPRESS=y -CONFIG_PCI=y -CONFIG_PCI_MSI=y -CONFIG_PCI_HOST_GENERIC=y -CONFIG_PCIEPORTBUS=y -CONFIG_HOTPLUG_PCI_PCIE=y -CONFIG_HOTPLUG_PCI=y -CONFIG_NR_CPUS=6 -CONFIG_PREEMPT=y -CONFIG_KSM=y -CONFIG_TRANSPARENT_HUGEPAGE=y -CONFIG_CMA=y -CONFIG_CMDLINE="console=ttyAMA0" -CONFIG_COMPAT=y -CONFIG_CPU_IDLE=y -CONFIG_ARM_CPUIDLE=y -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_GOV_USERSPACE=y -CONFIG_CPU_FREQ_GOV_ONDEMAND=y -CONFIG_CPU_FREQ_GOV_INTERACTIVE=y -CONFIG_ARM_BIG_LITTLE_CPUFREQ=y -CONFIG_ARM_DT_BL_CPUFREQ=y -CONFIG_ARM_SCPI_CPUFREQ=y -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_BPF_JIT=y -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_DEVTMPFS=y -CONFIG_DEVTMPFS_MOUNT=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_SD=y -CONFIG_ATA=y -CONFIG_SATA_AHCI=y -CONFIG_SATA_AHCI_PLATFORM=y -CONFIG_AHCI_XGENE=y -CONFIG_PATA_PLATFORM=y -CONFIG_PATA_OF_PLATFORM=y -CONFIG_NETDEVICES=y -CONFIG_TUN=y -CONFIG_SKY2=y -CONFIG_SMC91X=y -CONFIG_SMSC911X=y -CONFIG_INPUT_EVDEV=y -CONFIG_SERIO_AMBAKMI=y -CONFIG_LEGACY_PTY_COUNT=16 -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_AMBA_PL011=y -CONFIG_SERIAL_AMBA_PL011_CONSOLE=y -CONFIG_SERIAL_OF_PLATFORM=y -CONFIG_SERIAL_XILINX_PS_UART=y -CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_DESIGNWARE_PLATFORM=y -CONFIG_I2C_SLAVE=y -CONFIG_SPI=y -CONFIG_SPI_PL022=y -CONFIG_PTP_1588_CLOCK=m -CONFIG_GPIO_PL061=y -CONFIG_GPIO_XGENE=y -CONFIG_POWER_RESET_XGENE=y -CONFIG_POWER_RESET_SYSCON=y -CONFIG_REGULATOR=y -CONFIG_REGULATOR_FIXED_VOLTAGE=y -CONFIG_REGULATOR_VEXPRESS=m -CONFIG_DRM=y -CONFIG_DRM_I2C_NXP_TDA998X=y -CONFIG_DRM_ARM=y -CONFIG_DRM_HDLCD=y -CONFIG_DRM_VIRTUAL_HDLCD=y -CONFIG_FB_ARMCLCD=y -CONFIG_LOGO=y -CONFIG_USB=y -CONFIG_USB_ANNOUNCE_NEW_DEVICES=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_STORAGE=y -CONFIG_USB_ISP1760=y -CONFIG_NOP_USB_XCEIV=y -CONFIG_USB_ULPI=y -CONFIG_MMC=y -CONFIG_MMC_ARMMMCI=y -CONFIG_MMC_SDHCI=y -CONFIG_MMC_SDHCI_PLTFM=y -CONFIG_MMC_SPI=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_EFI=y -CONFIG_RTC_DRV_PL030=y -CONFIG_RTC_DRV_PL031=y -CONFIG_DMADEVICES=y -CONFIG_PL330_DMA=y -CONFIG_COMMON_CLK_SCPI=y -CONFIG_ARM_TIMER_SP804=y -CONFIG_MAILBOX=y -CONFIG_ARM_MHU=y -CONFIG_PHY_XGENE=y -CONFIG_ARM_SCPI_PROTOCOL=y -CONFIG_EXT2_FS=y -CONFIG_EXT3_FS=y -CONFIG_FANOTIFY=y -CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y -CONFIG_QUOTA=y -CONFIG_AUTOFS4_FS=y -CONFIG_FUSE_FS=y -CONFIG_CUSE=y -CONFIG_VFAT_FS=y -CONFIG_TMPFS=y -CONFIG_HUGETLBFS=y -CONFIG_EFIVAR_FS=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ISO8859_1=y -CONFIG_VIRTUALIZATION=y -CONFIG_KVM=y -CONFIG_DYNAMIC_DEBUG=y -CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_FS=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_KERNEL=y -CONFIG_LOCKUP_DETECTOR=y -CONFIG_SECURITY=y -CONFIG_CRYPTO_ANSI_CPRNG=y -CONFIG_ARM64_CRYPTO=y -CONFIG_CRYPTO_SHA1_ARM64_CE=y -CONFIG_CRYPTO_SHA2_ARM64_CE=y -CONFIG_CRYPTO_GHASH_ARM64_CE=y -CONFIG_CRYPTO_AES_ARM64_CE_CCM=y -CONFIG_CRYPTO_AES_ARM64_CE_BLK=y -CONFIG_SOUND=y -CONFIG_SND=y -CONFIG_SND_SOC=y -CONFIG_SND_SIMPLE_CARD=y -CONFIG_SND_DESIGNWARE_I2S=y -CONFIG_CMA=y -CONFIG_CMA_SIZE_MBYTES=64 diff --git a/board/arm/juno/readme.txt b/board/arm/juno/readme.txt deleted file mode 100644 index b292d9636da..00000000000 --- a/board/arm/juno/readme.txt +++ /dev/null @@ -1,134 +0,0 @@ -ARM Juno r1/r0 - -Intro -===== - -These instructions apply to all models of the ARM Juno: - - Juno r0 (does not support PCIe) - - Juno r1 (supports PCIe) - - Juno r2 (Big Cluster with A72) - -Buildroot will generate the kernel image, device tree blob, bootloader binaries -and a minimal root filesystem. - -How to build it -=============== - -Configure Buildroot -------------------- - -Configuring Buildroot is pretty simple, just execute: - - $ make arm_juno_defconfig - -Build the rootfs, kernel and DTB --------------------------------- - -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) - -Result of the build -------------------- - -After building, you should obtain this tree: - - output/images/ - +-- rootfs.tar - +-- juno.dtb (if Juno r0 is used) - +-- juno-r1.dtb (if Juno r1 is used) - +-- juno-r2.dtb (if Juno r2 is used) - +-- Image - +-- bl1.bin - +-- bl2.bin - +-- bl2u.bin - +-- bl31.bin - +-- fip.bin - +-- scp-fw.bin - +-- u-boot.bin - -Preparing your rootfs -====================== - -Format your pen drive as a ext3 filesystem by executing: - - $ mkfs.ext3 /dev/ - -Preparing your rootfs -====================== - -Format your pen drive as a ext3 filesystem by executing: - - $ mkfs.ext3 /dev/ - -Installing your rootfs -====================== - -After mounting the pen drive please execute the following: - - $ sudo tar -xvf output/images/rootfs.tar -C - -When completed make sure to unmount the device: - - $ umount - -Insert the pen drive in one of the ARM Juno' USB type A connectors. - -Configure *.dtb in the boot configuration for Juno r0 -===================================================== - -SITE1/HBI0262B/images.txt -..... -NOR3UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE -NOR3ADDRESS: 0x00C00000 ;Image Flash Address -NOR3FILE: \SOFTWARE\juno.dtb ;Image File Name -NOR3NAME: board.dtb ;Specify Image name to preserve file extension -NOR3LOAD: 00000000 ;Image Load Address -NOR3ENTRY: 00000000 ;Image Entry Point -...... - -Configure *.dtb in the boot configuration for Juno r1 -===================================================== - -SITE1/HBI0262C/images.txt -...... -NOR3UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE -NOR3ADDRESS: 0x00C00000 ;Image Flash Address -NOR3FILE: \SOFTWARE\juno-r1.dtb ;Image File Name -NOR3NAME: board.dtb ;Specify target filename to preserve file extension -NOR3LOAD: 00000000 ;Image Load Address -NOR3ENTRY: 00000000 ;Image Entry Point -...... - -Configure *.dtb in the boot configuration for Juno r2 -===================================================== - -SITE1/HBI0262D/images.txt -...... -NOR3UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE -NOR3ADDRESS: 0x02000000 ;Image Flash Address -NOR3FILE: \SOFTWARE\juno-r2.dtb ;Image File Name -NOR3NAME: board.dtb ;Specify target filename to preserve file extension -NOR3LOAD: 00000000 ;Image Load Address -NOR3ENTRY: 00000000 ;Image Entry Point -...... - -Installing kernel image and DTB -=============================== - -1. Connect to the ARM Juno UART0 and execute USB_ON in the terminal -2. Connect a USB cable between your PC and ARM Juno USB type B connector - A mass storage device should appear in your desktop. -3. Open the software/ folder -4. Copy the 'Image' file to software/ -5. Copy the 'juno-r1.dtb' (r1), 'juno.dtb' (r0) or juno-r2.dtb (r2) file to software/ -6. Copy the bootloader binaries (bl1.bin and fip.bin) to software/ -7. Press the red button in the front pannel of ARM Juno - -At this time, the board will erase the Flash entry for each new item and -replace it with the lastest ones. diff --git a/board/aspeed/ast2500-evb/genimage.cfg b/board/aspeed/ast2500-evb/genimage.cfg new file mode 100644 index 00000000000..498a71e4d75 --- /dev/null +++ b/board/aspeed/ast2500-evb/genimage.cfg @@ -0,0 +1,40 @@ +# +# This config reproduces the OpenBMC flash layout defined in Linux : +# +# arch/arm/boot/dts/openbmc-flash-layout.dtsi +# +# and included by aspeed-ast2500-evb.dts +# +flash nor-32M-256 { + pebsize = 4K + numpebs = 8K + minimum-io-unit-size = 256 +} + +image flash.img { + flash { + } + flashtype = "nor-32M-256" + + partition uboot { + image = "u-boot.bin" + size = 384K + } + + partition ubootenv { + /* TODO */ + offset = 384K + size = 128K + } + + partition fitimage { + image = "image.itb" + offset = 512K + size = 4352K + } + + partition spare { + offset = 4864K + size = 27904K + } +} diff --git a/board/aspeed/ast2500-evb/linux.fragment b/board/aspeed/ast2500-evb/linux.fragment new file mode 100644 index 00000000000..1cee95f8427 --- /dev/null +++ b/board/aspeed/ast2500-evb/linux.fragment @@ -0,0 +1,7 @@ +CONFIG_KERNEL_XZ=y +CONFIG_ARCH_MULTI_V7=n +CONFIG_MACH_ASPEED_G6=n +CONFIG_SMP=n +CONFIG_EXT4_FS=n +CONFIG_DEBUG_FS=n +CONFIG_SUSPEND=n diff --git a/board/aspeed/ast2500-evb/readme.txt b/board/aspeed/ast2500-evb/readme.txt new file mode 100644 index 00000000000..f509be553bc --- /dev/null +++ b/board/aspeed/ast2500-evb/readme.txt @@ -0,0 +1,80 @@ +Aspeed AST2500 EVB + +Introduction +============ + +The AST2500 EVB is an evaluation board for the AST2500 SoC, most +commonly used as a Server Management Processor. It includes an 800MHz +ARM11 processor with DDR3 or DDR4 SDRAM (up to 1GB), SPI flash memory +devices for BMC and host firmwares and numerous controllers to drive +the server board. + + https://www.aspeedtech.com/server_ast2500/ + +How to build it +=============== + +Configure buildroot: + + $ make aspeed_ast2500evb_defconfig + +Compile everything and build the rootfs image: + + $ make + +Result of the build +=================== + +After building, the output/images directory contains: + + output/images/ + ├── aspeed-ast2500-evb.dtb + ├── flash.img + ├── image.itb + ├── rootfs.cpio + ├── rootfs.cpio.xz + ├── rootfs.tar + ├── u-boot.bin + └── zImage + +Flashing the image +================== + +To update the contents of the first flash device, copy flash.img : + + $ flashcp flash.img /dev/mtd0 + +or simply the boot loader: + + $ flashcp u-boot.bin /dev/mtd1 + +Preparing the board +=================== + + * Connect a serial line to the board + * Power-up the board + +Booting the board +================= + +The AST2500 EVB boots from the SPI flash device directly and loads a +first bootloader (usually U-Boot). U-Boot will attempt to load a Linux +kernel from the same flash device by default but other storage could +be used. + + * from U-Boot + + The FIT image image.itb can be used to boot the board from U-Boot + using tftp + + * with QEMU + + $ qemu-system-arm -M ast2500-evb \ + -drive file=output/images/flash.img,format=raw,if=mtd \ + -nographic + + $ qemu-system-arm -M ast2500-evb \ + -kernel output/images/zImage \ + -initrd output/images/rootfs.cpio \ + -dtb output/images/aspeed-ast2500-evb.dtb \ + -nographic diff --git a/board/aspeed/ast2500-evb/uboot.fragment b/board/aspeed/ast2500-evb/uboot.fragment new file mode 100644 index 00000000000..8463252e591 --- /dev/null +++ b/board/aspeed/ast2500-evb/uboot.fragment @@ -0,0 +1,3 @@ +CONFIG_BOOTCOMMAND="bootm 20080000" +CONFIG_FIT=y +CONFIG_SHA256=y diff --git a/board/aspeed/ast2600-evb/genimage.cfg b/board/aspeed/ast2600-evb/genimage.cfg new file mode 100644 index 00000000000..56932d47875 --- /dev/null +++ b/board/aspeed/ast2600-evb/genimage.cfg @@ -0,0 +1,40 @@ +# +# This config reproduces the OpenBMC flash layout defined in Linux : +# +# arch/arm/boot/dts/openbmc-flash-layout-64.dtsi +# +# and included by aspeed-ast2600-evb.dts +# +flash nor-64M-256 { + pebsize = 4K + numpebs = 16K + minimum-io-unit-size = 256 +} + +image flash.img { + flash { + } + flashtype = "nor-64M-256" + + partition uboot { + image = "u-boot.bin" + size = 896K + } + + partition ubootenv { + /* TODO */ + offset = 896K + size = 128K + } + + partition fitimage { + image = "image.itb" + offset = 1M + size = 9M + } + + partition spare { + offset = 10M + size = 54M + } +} diff --git a/board/aspeed/ast2600-evb/readme.txt b/board/aspeed/ast2600-evb/readme.txt new file mode 100644 index 00000000000..1f7ba13d5d9 --- /dev/null +++ b/board/aspeed/ast2600-evb/readme.txt @@ -0,0 +1,80 @@ +Aspeed AST2600 EVB + +Introduction +============ + +The AST2600 EVB is an evaluation board for the AST2600 SoC, most +commonly used as a Server Management Processor. It includes a +Dual-core ARM Cortex A7 processor with DDR4 SDRAM (up to 2GB), SPI +flash memory devices for BMC and host firmwares and numerous +controllers to drive the server board. + + https://www.aspeedtech.com/server_ast2600/ + +How to build it +=============== + +Configure buildroot: + + $ make aspeed_ast2600evb_defconfig + +Compile everything and build the rootfs image: + + $ make + +Result of the build +=================== + +After building, the output/images directory contains: + + output/images/ + ├── aspeed-ast2600-evb.dtb + ├── flash.img + ├── image.itb + ├── rootfs.cpio + ├── rootfs.cpio.xz + ├── rootfs.tar + ├── u-boot.bin + └── zImage + +Flashing the image +================== + +To update the contents of the first flash device, copy flash.img : + + $ flashcp flash.img /dev/mtd0 + +or simply the boot loader: + + $ flashcp u-boot.bin /dev/mtd1 + +Preparing the board +=================== + + * Connect a serial line to the board + * Power-up the board + +Booting the board +================= + +The AST2600 EVB boots from the SPI flash device directly and loads a +first bootloader (usually U-Boot). U-Boot will attempt to load a Linux +kernel from the same flash device by default but other storage could +be used. + + * from U-Boot + + The FIT image image.itb can be used to boot the board from U-Boot + using tftp + + * with QEMU + + $ qemu-system-arm -M ast2600-evb \ + -drive file=output/images/flash.img,format=raw,if=mtd \ + -nographic + + $ qemu-system-arm -M ast2600-evb \ + -kernel output/images/zImage \ + -initrd output/images/rootfs.cpio \ + -dtb output/images/aspeed-ast2600-evb.dtb \ + -nographic diff --git a/board/aspeed/common/image.its.template b/board/aspeed/common/image.its.template new file mode 100644 index 00000000000..e3200e24070 --- /dev/null +++ b/board/aspeed/common/image.its.template @@ -0,0 +1,56 @@ +/dts-v1/; + +/ { + description = "Kernel and buildroot image"; + #address-cells = <1>; + + images { + kernel-1 { + description = "Linux kernel"; + data = /incbin/("zImage"); + type = "kernel"; + arch = "arm"; + os = "linux"; + compression = "none"; + load = <0x80001000>; + entry = <0x80001000>; + hash-1 { + algo = "sha256"; + }; + }; + fdt-1 { + description = "Flattened Device Tree blob"; + data = /incbin/("%BOARD_DTB%"); + type = "flat_dt"; + arch = "arm"; + compression = "none"; + hash-1 { + algo = "sha256"; + }; + }; + ramdisk-1 { + description = "ramdisk"; + data = /incbin/("rootfs.cpio.xz"); + type = "ramdisk"; + arch = "arm"; + os = "linux"; + compression = "none"; + hash-1 { + algo = "sha256"; + }; + }; + }; + + configurations { + default = "conf-1"; + conf-1 { + description = "Boot Linux kernel with FDT blob, ramdisk"; + kernel = "kernel-1"; + fdt = "fdt-1"; + ramdisk = "ramdisk-1"; + hash-1 { + algo = "sha256"; + }; + }; + }; +}; diff --git a/board/aspeed/common/post-image.sh b/board/aspeed/common/post-image.sh new file mode 100755 index 00000000000..ea65a49afff --- /dev/null +++ b/board/aspeed/common/post-image.sh @@ -0,0 +1,27 @@ +#!/bin/bash + +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' \ + ${BR2_CONFIG}) + +sed -e "s/%BOARD_DTB%/${BOARD_DT}.dtb/" \ + $BOARD_DIR/image.its.template > $BINARIES_DIR/image.its + +(cd $BINARIES_DIR && $mkimage -f image.its image.itb) + +GENIMAGE_CFG="board/aspeed/${BOARD_DT#aspeed-*}/genimage.cfg" +GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" + +rm -rf "${GENIMAGE_TMP}" + +genimage \ + --rootpath "${TARGET_DIR}" \ + --tmppath "${GENIMAGE_TMP}" \ + --inputpath "${BINARIES_DIR}" \ + --outputpath "${BINARIES_DIR}" \ + --config "${GENIMAGE_CFG}" + +rm -f $BINARIES_DIR/image.its diff --git a/board/asus/tinker/extlinux.conf b/board/asus/tinker/extlinux.conf index 136af0debd5..bb96ddb8930 100644 --- a/board/asus/tinker/extlinux.conf +++ b/board/asus/tinker/extlinux.conf @@ -1,4 +1,4 @@ -label Tinker linux-next +label Tinker linux kernel /boot/uImage devicetree /boot/rk3288-tinker.dtb append console=ttyS2,115200n8 root=/dev/mmcblk0p1 rootwait diff --git a/board/asus/tinker/genimage.cfg b/board/asus/tinker/genimage.cfg index a4b1e8d608f..fa7fd734f20 100644 --- a/board/asus/tinker/genimage.cfg +++ b/board/asus/tinker/genimage.cfg @@ -2,12 +2,19 @@ image sdcard.img { hdimage { } - partition u-boot-spl-dtb { + partition u-boot-tpl-spl-dtb { in-partition-table = "no" - image = "u-boot-spl-dtb.img" + image = "u-boot-tpl-spl-dtb.img" offset = 32K } + partition u-boot-dtb { + in-partition-table = "no" + image = "u-boot-dtb.img" + offset = 8M + size = 30M + } + partition rootfs { partition-type = 0x83 image = "rootfs.ext4" diff --git a/board/asus/tinker/post-build.sh b/board/asus/tinker/post-build.sh index 8108ed83ff0..ffbbcdeb589 100755 --- a/board/asus/tinker/post-build.sh +++ b/board/asus/tinker/post-build.sh @@ -3,7 +3,7 @@ MKIMAGE=$HOST_DIR/bin/mkimage BOARD_DIR="$(dirname $0)" -$MKIMAGE -n rk3288 -T rksd -d $BINARIES_DIR/u-boot-spl-dtb.bin $BINARIES_DIR/u-boot-spl-dtb.img -cat $BINARIES_DIR/u-boot-dtb.bin >> $BINARIES_DIR/u-boot-spl-dtb.img +$MKIMAGE -n rk3288 -T rksd -d $BINARIES_DIR/u-boot-tpl.bin $BINARIES_DIR/u-boot-tpl.img +cat $BINARIES_DIR/u-boot-tpl.img $BINARIES_DIR/u-boot-spl-dtb.bin > $BINARIES_DIR/u-boot-tpl-spl-dtb.img install -m 0644 -D $BOARD_DIR/extlinux.conf $TARGET_DIR/boot/extlinux/extlinux.conf diff --git a/board/asus/tinker/readme.txt b/board/asus/tinker/readme.txt index 7372d295202..110e2168c9a 100644 --- a/board/asus/tinker/readme.txt +++ b/board/asus/tinker/readme.txt @@ -35,3 +35,9 @@ You can write this image directly to an SD card device (i.e. /dev/xxx): $ sudo sync Finally, you can insert the SD card to the Tinker RK3288 board and boot it. + +NOTE: +USB power supply requires more than the standard 500mA USB current, so +this board must be supplied from a capable port or from an external +AC/DC adapter. Otherwise it will hang forever while loading the kernel +image. diff --git a/board/bananapi/bananapi-m1/boot.cmd b/board/bananapi/bananapi-m1/boot.cmd deleted file mode 100644 index 0cf6f4d63e3..00000000000 --- a/board/bananapi/bananapi-m1/boot.cmd +++ /dev/null @@ -1,7 +0,0 @@ -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -mmc dev 0 -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun7i-a20-bananapi.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/bananapi/bananapi-m1/genimage.cfg b/board/bananapi/bananapi-m1/genimage.cfg deleted file mode 100644 index ce62fbf712c..00000000000 --- a/board/bananapi/bananapi-m1/genimage.cfg +++ /dev/null @@ -1,34 +0,0 @@ -image boot.vfat { - vfat { - files = { - "zImage", - "sun7i-a20-bananapi.dtb", - "boot.scr" - } - } - - size = 64M -} - -image sdcard.img { - hdimage { - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot-sunxi-with-spl.bin" - offset = 8K - size = 1016K # 1MB - 8KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/board/bananapi/bananapi-m1/readme.txt b/board/bananapi/bananapi-m1/readme.txt deleted file mode 100644 index 382ba63c493..00000000000 --- a/board/bananapi/bananapi-m1/readme.txt +++ /dev/null @@ -1,37 +0,0 @@ -Intro -===== - -This default configuration will allow you to start experimenting with the -buildroot environment for the Bananapi M1. With the current configuration -it will bring-up the board, and allow access through the serial console. - -Bananapi M1 link: -http://www.banana-pi.org/m1.html - -Wiki link: -https://openedev.amarulasolutions.com/display/ODWIKI/Bananapi+M1 - -This configuration uses U-Boot mainline and kernel mainline. - -How to build -============ - - $ make bananapi_m1_defconfig - $ make - -Note: you will need access to the internet to download the required -sources. - -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 Bananapi M1 and power it up. The console -is on the serial line, 115200 8N1. diff --git a/board/bananapi/bananapi-m64/boot.cmd b/board/bananapi/bananapi-m64/boot.cmd deleted file mode 100644 index d35c9b0b2c5..00000000000 --- a/board/bananapi/bananapi-m64/boot.cmd +++ /dev/null @@ -1,6 +0,0 @@ -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r Image -fatload mmc 0 $fdt_addr_r sun50i-a64-bananapi-m64.dtb - -booti $kernel_addr_r - $fdt_addr_r diff --git a/board/bananapi/bananapi-m64/genimage.cfg b/board/bananapi/bananapi-m64/genimage.cfg deleted file mode 100644 index e922c0dba2d..00000000000 --- a/board/bananapi/bananapi-m64/genimage.cfg +++ /dev/null @@ -1,40 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "sun50i-a64-bananapi-m64.dtb", - "boot.scr" - } - } - - size = 64M -} - -image sdcard.img { - hdimage { - } - - partition spl { - in-partition-table = "no" - image = "sunxi-spl.bin" - offset = 8K - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot.itb" - offset = 40K - size = 1M # 1MB - 40KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/board/bananapi/bananapi-m64/readme.txt b/board/bananapi/bananapi-m64/readme.txt deleted file mode 100644 index 0dec3e52ee9..00000000000 --- a/board/bananapi/bananapi-m64/readme.txt +++ /dev/null @@ -1,37 +0,0 @@ -Intro -===== - -This default configuration will allow you to start experimenting with the -buildroot environment for the Bananapi M64. With the current configuration -it will bring-up the board, and allow access through the serial console. - -Bananapi M64 link: -http://www.banana-pi.org/m64.html - -Wiki link: -https://openedev.amarulasolutions.com/display/ODWIKI/Bananapi+M64 - -This configuration uses U-Boot mainline and kernel mainline. - -How to build -============ - - $ make bananapi_m64_defconfig - $ make - -Note: you will need access to the internet to download the required -sources. - -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 Bananapi M64 and power it up. The console -is on the serial line, 115200 8N1. diff --git a/board/beaglebone/extlinux.conf b/board/beaglebone/extlinux.conf new file mode 100644 index 00000000000..13affcabd4e --- /dev/null +++ b/board/beaglebone/extlinux.conf @@ -0,0 +1,4 @@ +label beaglebone-buildroot + kernel /zImage + fdtdir / + append console=ttyS0,115200n8 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait diff --git a/board/beaglebone/genimage.cfg b/board/beaglebone/genimage.cfg index 42ca2cf107e..4b026fda843 100644 --- a/board/beaglebone/genimage.cfg +++ b/board/beaglebone/genimage.cfg @@ -11,6 +11,8 @@ image boot.vfat { "am335x-boneblack.dtb", "am335x-bonegreen.dtb", "am335x-boneblack-wireless.dtb", + "am335x-bonegreen-wireless.dtb", + "extlinux" } } diff --git a/board/beaglebone/post-build.sh b/board/beaglebone/post-build.sh index ffdd19138c7..b7afd92ffea 100755 --- a/board/beaglebone/post-build.sh +++ b/board/beaglebone/post-build.sh @@ -2,3 +2,5 @@ BOARD_DIR="$(dirname $0)" cp $BOARD_DIR/uEnv.txt $BINARIES_DIR/uEnv.txt + +install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf diff --git a/board/beaglebone/readme.txt b/board/beaglebone/readme.txt index 231e977a892..a11377eaee5 100644 --- a/board/beaglebone/readme.txt +++ b/board/beaglebone/readme.txt @@ -28,6 +28,10 @@ Result of the build =================== output/images/ +-- am335x-boneblack.dtb ++-- am335x-boneblack-wireless.dtb ++-- am335x-boneblue.dtb ++-- am335x-bonegreen.dtb ++-- am335x-bonegreen-wireless.dtb +-- am335x-bone.dtb +-- am335x-evm.dtb +-- am335x-evmsk.dtb diff --git a/board/beaglev/readme.txt b/board/beaglev/readme.txt index 60678059e15..472d6b1cf16 100644 --- a/board/beaglev/readme.txt +++ b/board/beaglev/readme.txt @@ -17,7 +17,7 @@ Build results After building, output/images contains: -+ bootloader-BEAGLEV-buildroot.bin.out ++ bootloader-JH7100-buildroot.bin.out + ddrinit-2133-buildroot.bin.out + Image + fw_payload.bin @@ -30,7 +30,7 @@ After building, output/images contains: The four important files are: - - bootloader-BEAGLEV-buildroot.bin.out, the first stage bootloader + - bootloader-JH7100-buildroot.bin.out, the first stage bootloader - ddrinit-2133-buildroot.bin.out, the DDR initialization firmware @@ -109,7 +109,7 @@ You can flash them as follows: "expert" features. - Then, press 0 and send over X-modem the - bootloader-BEAGLEV-buildroot.bin.out file. + bootloader-JH7100-buildroot.bin.out file. - Then, press 1 and send over X-modem the ddrinit-2133-buildroot.bin.out. diff --git a/board/broadcom/northstar/linux.config b/board/broadcom/northstar/linux.config new file mode 100644 index 00000000000..47e69900329 --- /dev/null +++ b/board/broadcom/northstar/linux.config @@ -0,0 +1,70 @@ +CONFIG_EMBEDDED=y +CONFIG_ARCH_BCM=y +CONFIG_ARCH_BCM_5301X=y +CONFIG_ARCH_BCM_53573=y +CONFIG_SMP=y +CONFIG_NR_CPUS=2 +CONFIG_HIGHMEM=y +CONFIG_ARM_APPENDED_DTB=y +CONFIG_CMDLINE="ubi.mtd=ubi root=ubi0:rootfs rootfstype=ubifs" +CONFIG_CMDLINE_FORCE=y +# CONFIG_SUSPEND is not set +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_BRIDGE=y +CONFIG_BRIDGE_VLAN_FILTERING=y +CONFIG_NET_DSA=y +CONFIG_VLAN_8021Q=y +CONFIG_PCI=y +CONFIG_BCM47XX_NVRAM=y +CONFIG_BCM47XX_SPROM=y +CONFIG_MTD=y +CONFIG_MTD_BCM47XX_PARTS=y +CONFIG_MTD_PARSER_TRX=y +CONFIG_MTD_BCM47XXSFLASH=y +CONFIG_MTD_RAW_NAND=y +CONFIG_MTD_NAND_BRCMNAND=y +CONFIG_MTD_SPI_NOR=y +CONFIG_MTD_UBI=y +CONFIG_NETDEVICES=y +CONFIG_VXLAN=y +CONFIG_VETH=y +CONFIG_B53=y +CONFIG_BGMAC_BCMA=y +CONFIG_BROADCOM_PHY=y +CONFIG_MDIO_BUS_MUX_MMIOREG=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_NR_UARTS=2 +CONFIG_SERIAL_8250_RUNTIME_UARTS=2 +CONFIG_SERIAL_OF_PLATFORM=y +CONFIG_SPI=y +CONFIG_THERMAL=y +CONFIG_WATCHDOG=y +CONFIG_BCM47XX_WDT=y +CONFIG_BCMA_HOST_SOC=y +CONFIG_BCMA_DRIVER_GMAC_CMN=y +CONFIG_BCMA_DRIVER_GPIO=y +CONFIG_USB=y +CONFIG_USB_LEDS_TRIGGER_USBPORT=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_PLATFORM=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_OHCI_HCD=y +# CONFIG_USB_OHCI_HCD_PCI is not set +CONFIG_USB_HCD_BCMA=y +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y +CONFIG_LEDS_GPIO=y +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=y +CONFIG_LEDS_TRIGGER_DEFAULT_ON=y +CONFIG_PHY_BCM_NS_USB2=y +CONFIG_PHY_BCM_NS_USB3=y +CONFIG_UBIFS_FS=y +CONFIG_DEBUG_LL=y +CONFIG_DEBUG_UNCOMPRESS=y +CONFIG_EARLY_PRINTK=y diff --git a/board/broadcom/northstar/post-image.sh b/board/broadcom/northstar/post-image.sh new file mode 100755 index 00000000000..b6150fc5397 --- /dev/null +++ b/board/broadcom/northstar/post-image.sh @@ -0,0 +1,40 @@ +#!/bin/sh + +# $1: images directory path +# $2: device dts filename +# $3: board id +build_lxl() { + local images="$1" + local device="$2" + local board="$3" + + $HOST_DIR/bin/lzma_alone e $images/zImage.$device $images/zImage.$device.lzma -d16 + rm -f $images/zImage.$device + $HOST_DIR/bin/otrx create $images/$device.trx -f $images/zImage.$device.lzma -a 0x20000 -f $images/rootfs.ubi + rm -f $images/zImage.$device.lzma + $HOST_DIR/bin/lxlfw create $images/$device.lxl -i $images/$device.trx -b "$board" +} + +# $1: images directory path +# $2: device dts filename +build_trx() { + local images="$1" + local device="$2" + + $HOST_DIR/bin/lzma_alone e $images/zImage.$device $images/zImage.$device.lzma -d16 + rm -f $images/zImage.$device + $HOST_DIR/bin/otrx create $images/$device.trx -f $images/zImage.$device.lzma -a 0x20000 -f $images/rootfs.ubi + rm -f $images/zImage.$device.lzma +} + +devices="$(sed -n 's/^BR2_LINUX_KERNEL_INTREE_DTS_NAME="\([a-z0-9 \-]*\)"$/\1/p' ${BR2_CONFIG})" +for device in $devices; do + case "$device" in + "bcm4708-smartrg-sr400ac") + build_trx "$1" "$device" + ;; + "bcm47094-luxul-xwr-3150-v1") + build_lxl "$1" "$device" "XWR-3150" + ;; + esac +done diff --git a/board/broadcom/northstar/readme.txt b/board/broadcom/northstar/readme.txt new file mode 100644 index 00000000000..523bb439e37 --- /dev/null +++ b/board/broadcom/northstar/readme.txt @@ -0,0 +1,38 @@ +Broadcom Northstar + +Intro +===== + +This readme covers Northstar family of Broadcom SoCs. It includes: + - BCM4708 (2 x 800 MHz) + - BCM47081 (1 x 800 MHz) + - BCM4709 (2 x 1 GHz) + - BCM47094 (2 x 1 GHz) (AKA BCM4709C0) + +Northstar platform is used in some home routers by multiple vendors. There are +over 100 market devices based on it and they can all be supported with 1 kernel. + +There is no point in having separated board for each model. This board code is +meant for all supported Northstar devices. + +All Northstar devices come with CFE bootloader by default. It's basically closed +source as sources are available for some old releases only. There is no U-Boot (or +any other) drop-in replacement or second stage loader with Northstar support. + +CFE supports flashing firmware images over TFTP and HTTP (depending on vendor / +device setup). + +How to build it +=============== + + $ make broadcom_northstar_defconfig + + $ make + +How to flash over HTTP +====================== + +Power on device and press (and hold) CTRL+C in serial console terminal. When CFE +gets into prompt mode it'll automatically start built-in HTTP server. Navigate +to http://192.168.1.1/ (unless IP was changed - verify with "ifconfig") and +upload new firmware using a web browser. diff --git a/board/bsh/common/imx8mn-bsh-smm-s2/linux.fragment b/board/bsh/common/imx8mn-bsh-smm-s2/linux.fragment new file mode 100644 index 00000000000..80803ab0888 --- /dev/null +++ b/board/bsh/common/imx8mn-bsh-smm-s2/linux.fragment @@ -0,0 +1,895 @@ +# CONFIG_BPF_SYSCALL is not set +CONFIG_TASK_DELAY_ACCT=y +CONFIG_CGROUP_FREEZER=y +# CONFIG_CGROUP_BPF is not set +CONFIG_RELAY=y +# CONFIG_ARCH_ACTIONS is not set +# CONFIG_ARCH_SUNXI is not set +# CONFIG_ARCH_ALPINE is not set +# CONFIG_ARCH_APPLE is not set +# CONFIG_ARCH_BCM2835 is not set +# CONFIG_ARCH_BCM4908 is not set +# CONFIG_ARCH_BCM_IPROC is not set +# CONFIG_ARCH_BERLIN is not set +# CONFIG_ARCH_BRCMSTB is not set +# CONFIG_ARCH_EXYNOS is not set +# CONFIG_ARCH_K3 is not set +# CONFIG_ARCH_LAYERSCAPE is not set +# CONFIG_ARCH_LG1K is not set +# CONFIG_ARCH_HISI is not set +# CONFIG_ARCH_KEEMBAY is not set +# CONFIG_ARCH_MEDIATEK is not set +# CONFIG_ARCH_MESON is not set +# CONFIG_ARCH_MVEBU is not set +# CONFIG_ARCH_QCOM is not set +# CONFIG_ARCH_RENESAS is not set +# CONFIG_ARCH_ROCKCHIP is not set +# CONFIG_ARCH_S32 is not set +# CONFIG_ARCH_SEATTLE is not set +# CONFIG_ARCH_INTEL_SOCFPGA is not set +# CONFIG_ARCH_SYNQUACER is not set +# CONFIG_ARCH_TEGRA is not set +# CONFIG_ARCH_TESLA_FSD is not set +# CONFIG_ARCH_SPRD is not set +# CONFIG_ARCH_THUNDER is not set +# CONFIG_ARCH_THUNDER2 is not set +# CONFIG_ARCH_UNIPHIER is not set +# CONFIG_ARCH_VEXPRESS is not set +# CONFIG_ARCH_VISCONTI is not set +# CONFIG_ARCH_XGENE is not set +# CONFIG_ARCH_ZYNQMP is not set +# CONFIG_KEXEC is not set +# CONFIG_KEXEC_FILE is not set +# CONFIG_XEN is not set +# CONFIG_ARM64_PTR_AUTH is not set +# CONFIG_ARM64_TLB_RANGE is not set +# CONFIG_ARM64_MTE is not set +CONFIG_PM_DEBUG=y +CONFIG_PM_TEST_SUSPEND=y +# CONFIG_HIBERNATION is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=y +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y +CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y +# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set +# CONFIG_ARM_ALLWINNER_SUN50I_CPUFREQ_NVMEM is not set +# CONFIG_ARM_ARMADA_37XX_CPUFREQ is not set +CONFIG_ARM_IMX_CPUFREQ_DT=y +# CONFIG_ARM_QCOM_CPUFREQ_NVMEM is not set +# CONFIG_ARM_QCOM_CPUFREQ_HW is not set +# CONFIG_ARM_RASPBERRYPI_CPUFREQ is not set +# CONFIG_ARM_SCMI_CPUFREQ is not set +# CONFIG_ARM_TEGRA186_CPUFREQ is not set +# CONFIG_ARM_MEDIATEK_CPUFREQ is not set +# CONFIG_QORIQ_CPUFREQ is not set +# CONFIG_ACPI_APEI_PCIEAER is not set +# CONFIG_VIRTUALIZATION is not set +# CONFIG_KVM is not set +# CONFIG_GCC_PLUGINS is not set +CONFIG_IPV6=y +CONFIG_MODVERSIONS=y +CONFIG_IPV6_SIT=m +CONFIG_NET_DSA_TAG_OCELOT=m +CONFIG_VLAN_8021Q=y +CONFIG_LLC2=y +CONFIG_NET_SCH_MULTIQ=m +CONFIG_NET_CLS_TCINDEX=m +CONFIG_NET_PKTGEN=m +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_HIDP=y +# CONFIG_CAN_RCAR is not set +# CONFIG_CAN_RCAR_CANFD is not set +# CONFIG_CAN_MCP251XFD is not set +CONFIG_BT_HCIUART=y +CONFIG_BT_HCIUART_BCSP=y +CONFIG_BT_HCIUART_ATH3K=y +CONFIG_BT_HCIUART_3WIRE=y +CONFIG_BT_HCIVHCI=y +CONFIG_CFG80211=y +CONFIG_NL80211_TESTMODE=y +CONFIG_CFG80211_WEXT=y +CONFIG_MAC80211=y +# CONFIG_BT_HCIUART_MRVL is not set +# CONFIG_BT_MRVL is not set +# CONFIG_BT_MRVL_SDIO is not set +# CONFIG_BT_QCOMSMD is not set +# CONFIG_RFKILL is not set +# CONFIG_PCI is not set +# CONFIG_PCIEPORTBUS is not set +# CONFIG_PCIEAER is not set +# CONFIG_PCI_IOV is not set +# CONFIG_PCI_PASID is not set +# CONFIG_HOTPLUG_PCI is not set +# CONFIG_HOTPLUG_PCI_ACPI is not set +# CONFIG_PCI_AARDVARK is not set +# CONFIG_PCI_TEGRA is not set +# CONFIG_PCIE_RCAR_HOST is not set +# CONFIG_PCIE_RCAR_EP is not set +# CONFIG_PCI_HOST_GENERIC is not set +# CONFIG_PCI_XGENE is not set +# CONFIG_PCIE_ALTERA is not set +# CONFIG_PCIE_ALTERA_MSI is not set +# CONFIG_PCI_HOST_THUNDER_PEM is not set +# CONFIG_PCI_HOST_THUNDER_ECAM is not set +# CONFIG_PCIE_ROCKCHIP_HOST is not set +# CONFIG_PCIE_BRCMSTB is not set +# CONFIG_PCI_IMX6 is not set +# CONFIG_PCI_LAYERSCAPE is not set +# CONFIG_PCI_HISI is not set +# CONFIG_PCIE_QCOM is not set +# CONFIG_PCIE_ARMADA_8K is not set +# CONFIG_PCIE_KIRIN is not set +# CONFIG_PCIE_HISI_STB is not set +# CONFIG_PCIE_TEGRA194_HOST is not set +# CONFIG_PCIE_VISCONTI_HOST is not set +# CONFIG_PCIE_LAYERSCAPE_GEN4 is not set +# CONFIG_PCI_ENDPOINT is not set +# CONFIG_PCI_ENDPOINT_CONFIGFS is not set +# CONFIG_PCI_EPF_TEST is not set +CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y +CONFIG_BRCMSTB_GISB_ARB=y +CONFIG_VEXPRESS_CONFIG=y +# CONFIG_HISILICON_LPC is not set +# CONFIG_TEGRA_ACONNECT is not set +# CONFIG_RASPBERRYPI_FIRMWARE is not set +# CONFIG_INTEL_STRATIX10_SERVICE is not set +# CONFIG_INTEL_STRATIX10_RSU is not set +CONFIG_IMX_DSP=y +# CONFIG_GNSS is not set +# CONFIG_GNSS_MTK_SERIAL is not set +CONFIG_MTD_CMDLINE_PARTS=y +# CONFIG_MTD_NAND_BRCMNAND is not set +CONFIG_MTD_NAND_GPMI_NAND=y +# CONFIG_MTD_NAND_MARVELL is not set +# CONFIG_MTD_NAND_FSL_IFC is not set +# CONFIG_MTD_NAND_QCOM is not set +# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set +CONFIG_MTD_UBI=y +# CONFIG_BLK_DEV_NVME is not set +# CONFIG_PCI_ENDPOINT_TEST is not set +CONFIG_RAID_ATTRS=m +# CONFIG_SCSI_HISI_SAS_PCI is not set +# CONFIG_MEGARAID_SAS is not set +# CONFIG_SCSI_MPT3SAS is not set +# CONFIG_SCSI_UFS_QCOM is not set +# CONFIG_SCSI_UFS_HISI is not set +# CONFIG_SCSI_UFS_EXYNOS is not set +# CONFIG_SATA_AHCI is not set +CONFIG_AHCI_IMX=y +# CONFIG_AHCI_BRCM is not set +# CONFIG_AHCI_MVEBU is not set +# CONFIG_SATA_SIL24 is not set +# CONFIG_SATA_RCAR is not set +CONFIG_DM_CRYPT=m +# CONFIG_NET_DSA_BCM_SF2 is not set +# CONFIG_NET_DSA_MSCC_FELIX is not set +# CONFIG_NET_XGENE is not set +# CONFIG_ATL1C is not set +# CONFIG_SYSTEMPORT is not set +# CONFIG_BNX2X is not set +# CONFIG_THUNDER_NIC_PF is not set +CONFIG_FSL_XGMAC_MDIO=y +CONFIG_FSL_ENETC_IERB=y +# CONFIG_FSL_FMAN is not set +# CONFIG_FSL_DPAA_ETH is not set +# CONFIG_FSL_DPAA2_ETH is not set +# CONFIG_FSL_ENETC is not set +# CONFIG_FSL_ENETC_VF is not set +# CONFIG_FSL_ENETC_QOS is not set +CONFIG_MVMDIO=y +CONFIG_MSCC_OCELOT_SWITCH=m +# CONFIG_HNS3 is not set +# CONFIG_HNS3_HCLGE is not set +# CONFIG_HNS3_ENET is not set +# CONFIG_E1000 is not set +# CONFIG_E1000E is not set +# CONFIG_IGB is not set +# CONFIG_IGBVF is not set +# CONFIG_MVNETA is not set +# CONFIG_MVPP2 is not set +# CONFIG_SKY2 is not set +# CONFIG_MLX4_EN is not set +# CONFIG_MLX5_CORE is not set +# CONFIG_MLX5_CORE_EN is not set +# CONFIG_R8169 is not set +# CONFIG_SH_ETH is not set +# CONFIG_RAVB is not set +CONFIG_STMMAC_ETH=y +CONFIG_DWMAC_GENERIC=m +CONFIG_MICROCHIP_PHY=y +CONFIG_NXP_TJA11XX_PHY=y +CONFIG_MDIO_BITBANG=y +# CONFIG_SNI_AVE is not set +# CONFIG_SNI_NETSEC is not set +# CONFIG_TI_K3_AM65_CPSW_NUSS is not set +# CONFIG_QCOM_IPA is not set +# CONFIG_MESON_GXL_PHY is not set +# CONFIG_AQUANTIA_PHY is not set +# CONFIG_BCM54140_PHY is not set +# CONFIG_MARVELL_PHY is not set +# CONFIG_MARVELL_10G_PHY is not set +# CONFIG_MICREL_PHY is not set +# CONFIG_MICROSEMI_PHY is not set +# CONFIG_AT803X_PHY is not set +# CONFIG_REALTEK_PHY is not set +# CONFIG_ROCKCHIP_PHY is not set +# CONFIG_DP83867_PHY is not set +# CONFIG_VITESSE_PHY is not set +# CONFIG_USB_BRCMSTB is not set +CONFIG_USB_RTL8152=y +CONFIG_USB_USBNET=y +CONFIG_BRCMFMAC=y +CONFIG_HOSTAP=y +# CONFIG_ATH10K is not set +# CONFIG_ATH10K_PCI is not set +# CONFIG_ATH10K_SNOC is not set +# CONFIG_WCN36XX is not set +# CONFIG_MWIFIEX is not set +# CONFIG_MWIFIEX_SDIO is not set +# CONFIG_MWIFIEX_PCIE is not set +CONFIG_KEYBOARD_SNVS_PWRKEY=y +# CONFIG_KEYBOARD_IMX_SC_KEY is not set +# CONFIG_TOUCHSCREEN_EDT_FT5X06 is not set +# CONFIG_INPUT_PM8941_PWRKEY is not set +# CONFIG_INPUT_PM8XXX_VIBRATOR is not set +# CONFIG_INPUT_PWM_BEEPER is not set +# CONFIG_INPUT_PWM_VIBRA is not set +# CONFIG_INPUT_HISI_POWERKEY is not set +# CONFIG_SERIAL_8250_BCM2835AUX is not set +# CONFIG_SERIAL_8250_OMAP is not set +# CONFIG_SERIAL_8250_MT6577 is not set +# CONFIG_SERIAL_8250_UNIPHIER is not set +# CONFIG_SERIAL_MESON is not set +# CONFIG_SERIAL_MESON_CONSOLE is not set +# CONFIG_SERIAL_SAMSUNG is not set +# CONFIG_SERIAL_SAMSUNG_CONSOLE is not set +# CONFIG_SERIAL_TEGRA is not set +# CONFIG_SERIAL_TEGRA_TCU is not set +# CONFIG_SERIAL_SH_SCI is not set +# CONFIG_SERIAL_MSM is not set +# CONFIG_SERIAL_MSM_CONSOLE is not set +# CONFIG_SERIAL_QCOM_GENI is not set +# CONFIG_SERIAL_QCOM_GENI_CONSOLE is not set +# CONFIG_SERIAL_MVEBU_UART is not set +# CONFIG_SERIAL_OWL is not set +# CONFIG_I2C_MUX is not set +# CONFIG_I2C_BCM2835 is not set +# CONFIG_I2C_MESON is not set +# CONFIG_I2C_MT65XX is not set +# CONFIG_I2C_MV64XXX is not set +# CONFIG_I2C_OMAP is not set +# CONFIG_I2C_OWL is not set +# CONFIG_I2C_PXA is not set +# CONFIG_I2C_QCOM_CCI is not set +# CONFIG_I2C_QCOM_GENI is not set +# CONFIG_I2C_QUP is not set +# CONFIG_I2C_RIIC is not set +# CONFIG_I2C_S3C2410 is not set +# CONFIG_I2C_SH_MOBILE is not set +# CONFIG_I2C_TEGRA is not set +# CONFIG_I2C_UNIPHIER_F is not set +# CONFIG_I2C_RCAR is not set +# CONFIG_SPI_ARMADA_3700 is not set +# CONFIG_SPI_BCM2835 is not set +# CONFIG_SPI_BCM2835AUX is not set +# CONFIG_SPI_DESIGNWARE is not set +# CONFIG_SPI_DW_DMA is not set +# CONFIG_SPI_DW_MMIO is not set +CONFIG_SPI_IMX=y +# CONFIG_SPI_FSL_DSPI is not set +# CONFIG_SPI_MESON_SPICC is not set +# CONFIG_SPI_MESON_SPIFC is not set +# CONFIG_SPI_ORION is not set +CONFIG_SPI_SPIDEV=y +CONFIG_SPI_SLAVE=y +CONFIG_SPI_SLAVE_TIME=y +CONFIG_SPI_SLAVE_SYSTEM_CONTROL=y +CONFIG_PINCTRL=y +# CONFIG_SPI_RPCIF is not set +# CONFIG_SPI_RSPI is not set +# CONFIG_SPI_QCOM_QSPI is not set +# CONFIG_SPI_QUP is not set +# CONFIG_SPI_QCOM_GENI is not set +# CONFIG_SPI_S3C64XX is not set +# CONFIG_SPI_SH_MSIOF is not set +# CONFIG_SPI_SUN6I is not set +# CONFIG_SPMI is not set +# CONFIG_PINCTRL_OWL is not set +# CONFIG_PINCTRL_S700 is not set +# CONFIG_PINCTRL_S900 is not set +CONFIG_GPIOLIB=y +# CONFIG_PINCTRL_MSM is not set +# CONFIG_PINCTRL_IPQ8074 is not set +# CONFIG_PINCTRL_IPQ6018 is not set +# CONFIG_PINCTRL_MSM8916 is not set +# CONFIG_PINCTRL_MSM8994 is not set +# CONFIG_PINCTRL_MSM8996 is not set +# CONFIG_PINCTRL_MSM8998 is not set +# CONFIG_PINCTRL_QCS404 is not set +# CONFIG_PINCTRL_QDF2XXX is not set +# CONFIG_PINCTRL_QCOM_SPMI_PMIC is not set +# CONFIG_PINCTRL_SC7180 is not set +# CONFIG_PINCTRL_SC7280 is not set +# CONFIG_PINCTRL_SDM845 is not set +# CONFIG_PINCTRL_SM8150 is not set +# CONFIG_PINCTRL_SM8250 is not set +# CONFIG_PINCTRL_SM8350 is not set +# CONFIG_PINCTRL_SM8450 is not set +# CONFIG_PINCTRL_LPASS_LPI is not set +# CONFIG_GPIO_DAVINCI is not set +# CONFIG_GPIO_MPC8XXX is not set +# CONFIG_GPIO_RCAR is not set +# CONFIG_GPIO_UNIPHIER is not set +# CONFIG_GPIO_VISCONTI is not set +# CONFIG_GPIO_XGENE_SB is not set +CONFIG_POWER_RESET_BRCMSTB=y +# CONFIG_GPIO_MAX77620 is not set +# CONFIG_GPIO_SL28CPLD is not set +# CONFIG_POWER_RESET_MSM is not set +# CONFIG_POWER_RESET_QCOM_PON is not set +# CONFIG_BATTERY_MAX17042 is not set +# CONFIG_CHARGER_BQ25890 is not set +# CONFIG_CHARGER_BQ25980 is not set +# CONFIG_SENSORS_JC42 is not set +# CONFIG_SENSORS_LM75 is not set +# CONFIG_SENSORS_RASPBERRYPI_HWMON is not set +# CONFIG_SENSORS_SL28CPLD is not set +CONFIG_THERMAL_WRITABLE_TRIPS=y +CONFIG_IMX_SC_THERMAL=y +CONFIG_IMX8MM_THERMAL=y +CONFIG_QORIQ_THERMAL=y +# CONFIG_SUN8I_THERMAL is not set +# CONFIG_ROCKCHIP_THERMAL is not set +# CONFIG_RCAR_THERMAL is not set +# CONFIG_RCAR_GEN3_THERMAL is not set +# CONFIG_RZG2L_THERMAL is not set +# CONFIG_ARMADA_THERMAL is not set +# CONFIG_BCM2711_THERMAL is not set +# CONFIG_BCM2835_THERMAL is not set +# CONFIG_BRCMSTB_THERMAL is not set +# CONFIG_EXYNOS_THERMAL is not set +# CONFIG_TEGRA_SOCTHERM is not set +# CONFIG_TEGRA_BPMP_THERMAL is not set +# CONFIG_QCOM_TSENS is not set +# CONFIG_QCOM_SPMI_TEMP_ALARM is not set +# CONFIG_QCOM_LMH is not set +# CONFIG_UNIPHIER_THERMAL is not set +# CONFIG_SL28CPLD_WATCHDOG is not set +# CONFIG_S3C2410_WATCHDOG is not set +# CONFIG_BCM7038_WDT is not set +# CONFIG_SUNXI_WATCHDOG is not set +CONFIG_IMX_SC_WDT=y +CONFIG_IMX7ULP_WDT=y +# CONFIG_QCOM_WDT is not set +# CONFIG_MESON_GXBB_WATCHDOG is not set +# CONFIG_MESON_WATCHDOG is not set +# CONFIG_RENESAS_WDT is not set +# CONFIG_RENESAS_RZG2LWDT is not set +# CONFIG_UNIPHIER_WATCHDOG is not set +# CONFIG_BCM2835_WDT is not set +# CONFIG_MFD_ALTERA_SYSMGR is not set +# CONFIG_MFD_AXP20X_RSB is not set +# CONFIG_MFD_EXYNOS_LPASS is not set +# CONFIG_MFD_HI655X_PMIC is not set +# CONFIG_MFD_MT6397 is not set +# CONFIG_MFD_SPMI_PMIC is not set +# CONFIG_MFD_SL28CPLD is not set +CONFIG_REGULATOR=y +# CONFIG_REGULATOR_HI655X is not set +# CONFIG_REGULATOR_MP8859 is not set +# CONFIG_REGULATOR_MT6358 is not set +# CONFIG_REGULATOR_MT6397 is not set +# CONFIG_REGULATOR_PF8X00 is not set +# CONFIG_REGULATOR_QCOM_RPMH is not set +# CONFIG_REGULATOR_QCOM_SMD_RPM is not set +# CONFIG_REGULATOR_QCOM_SPMI is not set +# CONFIG_REGULATOR_TPS65132 is not set +CONFIG_MEDIA_SUPPORT=y +# CONFIG_RC_CORE is not set +# CONFIG_RC_DECODERS is not set +# CONFIG_RC_DEVICES is not set +# CONFIG_IR_MESON is not set +# CONFIG_IR_SUNXI is not set +CONFIG_SDR_PLATFORM_DRIVERS=y +# CONFIG_VIDEO_QCOM_CAMSS is not set +# CONFIG_VIDEO_RCAR_CSI2 is not set +# CONFIG_VIDEO_RCAR_VIN is not set +# CONFIG_VIDEO_SUN6I_CSI is not set +# CONFIG_VIDEO_RCAR_ISP is not set +# CONFIG_VIDEO_SAMSUNG_S5P_JPEG is not set +# CONFIG_VIDEO_SAMSUNG_S5P_MFC is not set +# CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC is not set +# CONFIG_VIDEO_RENESAS_FDP1 is not set +# CONFIG_VIDEO_RENESAS_FCP is not set +# CONFIG_VIDEO_RENESAS_VSP1 is not set +# CONFIG_VIDEO_QCOM_VENUS is not set +# CONFIG_VIDEO_RCAR_DRIF is not set +CONFIG_VIDEO_OV5640=y +CONFIG_DRM=y +CONFIG_DRM_I2C_CH7006=m +CONFIG_DRM_I2C_SIL164=m +# CONFIG_DRM_NOUVEAU is not set +# CONFIG_DRM_EXYNOS is not set +# CONFIG_DRM_EXYNOS5433_DECON is not set +# CONFIG_DRM_EXYNOS7_DECON is not set +# CONFIG_DRM_EXYNOS_DSI is not set +# CONFIG_DRM_EXYNOS_DP is not set +# CONFIG_DRM_EXYNOS_HDMI is not set +# CONFIG_DRM_EXYNOS_MIC is not set +# CONFIG_DRM_ROCKCHIP is not set +# CONFIG_ROCKCHIP_ANALOGIX_DP is not set +# CONFIG_ROCKCHIP_CDN_DP is not set +# CONFIG_ROCKCHIP_DW_HDMI is not set +# CONFIG_ROCKCHIP_DW_MIPI_DSI is not set +# CONFIG_ROCKCHIP_INNO_HDMI is not set +# CONFIG_ROCKCHIP_LVDS is not set +# CONFIG_DRM_RCAR_DU is not set +# CONFIG_DRM_RCAR_MIPI_DSI is not set +# CONFIG_DRM_SUN4I is not set +# CONFIG_DRM_SUN6I_DSI is not set +# CONFIG_DRM_SUN8I_DW_HDMI is not set +# CONFIG_DRM_SUN8I_MIXER is not set +# CONFIG_DRM_MSM is not set +# CONFIG_DRM_TEGRA is not set +# CONFIG_DRM_PANEL_BOE_TV101WUM_NL6 is not set +# CONFIG_DRM_PANEL_LVDS is not set +# CONFIG_DRM_PANEL_SIMPLE is not set +# CONFIG_DRM_PANEL_EDP is not set +# CONFIG_DRM_PANEL_MANTIX_MLAF057WE51 is not set +# CONFIG_DRM_PANEL_RAYDIUM_RM67191 is not set +# CONFIG_DRM_PANEL_SITRONIX_ST7703 is not set +CONFIG_DRM_DISPLAY_CONNECTOR=m +# CONFIG_DRM_LONTIUM_LT8912B is not set +CONFIG_DRM_NWL_MIPI_DSI=y +# CONFIG_DRM_LONTIUM_LT9611UXC is not set +# CONFIG_DRM_PARADE_PS8640 is not set +CONFIG_DRM_I2C_ADV7511=y +CONFIG_DRM_DW_HDMI_I2S_AUDIO=m +CONFIG_DRM_IMX_DCSS=y +# CONFIG_DRM_VC4 is not set +# CONFIG_DRM_HISI_HIBMC is not set +CONFIG_DRM_MXSFB=y +# CONFIG_DRM_MEDIATEK is not set +# CONFIG_DRM_MEDIATEK_HDMI is not set +# CONFIG_DRM_MESON is not set +CONFIG_DRM_LEGACY=y +# CONFIG_FB is not set +# CONFIG_FB_MODE_HELPERS is not set +# CONFIG_FB_EFI is not set +# CONFIG_BACKLIGHT_PWM is not set +# CONFIG_BACKLIGHT_LP855X is not set +# CONFIG_LOGO is not set +CONFIG_SND_DYNAMIC_MINORS=y +CONFIG_SND_ALOOP=m +# CONFIG_SND_SPI is not set +# CONFIG_SND_USB is not set +# CONFIG_SND_HDA_TEGRA is not set +# CONFIG_SND_HDA_CODEC_HDMI is not set +CONFIG_SND_SOC_FSL_ASRC=y +CONFIG_SND_SOC_FSL_EASRC=y +CONFIG_SND_IMX_SOC=y +CONFIG_SND_SOC_FSL_ASOC_CARD=y +CONFIG_SND_SOC_SOF_TOPLEVEL=y +CONFIG_SND_SOC_SOF_OF=m +CONFIG_SND_SOC_SOF_IMX_TOPLEVEL=y +CONFIG_SND_SOC_AK4458=y +CONFIG_SND_SOC_AK5558=y +CONFIG_SND_SOC_PCM512x_I2C=y +CONFIG_SND_SIMPLE_CARD=y +CONFIG_SND_AUDIO_GRAPH_CARD=y +CONFIG_USB_CONN_GPIO=y +# CONFIG_SND_BCM2835_SOC_I2S is not set +# CONFIG_SND_SOC_FSL_MICFIL is not set +# CONFIG_SND_SOC_IMX_SGTL5000 is not set +# CONFIG_SND_SOC_IMX_SPDIF is not set +# CONFIG_SND_SOC_IMX_AUDMIX is not set +# CONFIG_SND_MESON_AXG_SOUND_CARD is not set +# CONFIG_SND_MESON_GX_SOUND_CARD is not set +# CONFIG_SND_SOC_QCOM is not set +# CONFIG_SND_SOC_APQ8016_SBC is not set +# CONFIG_SND_SOC_MSM8996 is not set +# CONFIG_SND_SOC_SDM845 is not set +# CONFIG_SND_SOC_SM8250 is not set +# CONFIG_SND_SOC_ROCKCHIP is not set +# CONFIG_SND_SOC_ROCKCHIP_SPDIF is not set +# CONFIG_SND_SOC_ROCKCHIP_RT5645 is not set +# CONFIG_SND_SOC_RK3399_GRU_SOUND is not set +# CONFIG_SND_SOC_SAMSUNG is not set +# CONFIG_SND_SOC_RCAR is not set +# CONFIG_SND_SOC_RZ is not set +# CONFIG_SND_SUN4I_I2S is not set +# CONFIG_SND_SUN4I_SPDIF is not set +# CONFIG_SND_SOC_TEGRA is not set +# CONFIG_SND_SOC_TEGRA210_AHUB is not set +# CONFIG_SND_SOC_TEGRA210_DMIC is not set +# CONFIG_SND_SOC_TEGRA210_I2S is not set +# CONFIG_SND_SOC_TEGRA186_DSPK is not set +# CONFIG_SND_SOC_TEGRA210_ADMAIF is not set +# CONFIG_SND_SOC_TEGRA210_MVC is not set +# CONFIG_SND_SOC_TEGRA210_SFC is not set +# CONFIG_SND_SOC_TEGRA210_AMX is not set +# CONFIG_SND_SOC_TEGRA210_ADX is not set +# CONFIG_SND_SOC_TEGRA210_MIXER is not set +# CONFIG_SND_SOC_TEGRA_AUDIO_GRAPH_CARD is not set +# CONFIG_SND_SOC_AK4613 is not set +# CONFIG_SND_SOC_ES7134 is not set +# CONFIG_SND_SOC_ES7241 is not set +# CONFIG_SND_SOC_GTM601 is not set +# CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set +# CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set +# CONFIG_SND_SOC_PCM3168A_I2C is not set +# CONFIG_SND_SOC_RT5659 is not set +# CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set +# CONFIG_SND_SOC_SIMPLE_MUX is not set +# CONFIG_SND_SOC_TAS571X is not set +# CONFIG_SND_SOC_TLV320AIC32X4_I2C is not set +# CONFIG_SND_SOC_WCD934X is not set +# CONFIG_SND_SOC_WM8904 is not set +# CONFIG_SND_SOC_WM8960 is not set +# CONFIG_SND_SOC_WM8962 is not set +# CONFIG_SND_SOC_WM8978 is not set +# CONFIG_SND_SOC_WSA881X is not set +# CONFIG_SND_SOC_NAU8822 is not set +# CONFIG_SND_SOC_LPASS_WSA_MACRO is not set +# CONFIG_SND_SOC_LPASS_VA_MACRO is not set +# CONFIG_SND_AUDIO_GRAPH_CARD2 is not set +# CONFIG_HID_MULTITOUCH is not set +# CONFIG_I2C_HID_ACPI is not set +# CONFIG_I2C_HID_OF is not set +# CONFIG_USB_XHCI_PCI_RENESAS is not set +# CONFIG_USB_XHCI_TEGRA is not set +# CONFIG_USB_EHCI_EXYNOS is not set +# CONFIG_USB_OHCI_EXYNOS is not set +CONFIG_USB_HCD_TEST_MODE=y +# CONFIG_USB_RENESAS_USBHS_HCD is not set +# CONFIG_USB_RENESAS_USBHS is not set +CONFIG_USB_UAS=y +# CONFIG_USB_CDNS_SUPPORT is not set +# CONFIG_USB_CDNS3 is not set +# CONFIG_USB_CDNS3_GADGET is not set +# CONFIG_USB_CDNS3_HOST is not set +# CONFIG_USB_MTU3 is not set +# CONFIG_USB_MUSB_SUNXI is not set +CONFIG_USB_SERIAL=y +CONFIG_USB_SERIAL_CONSOLE=y +CONFIG_USB_SERIAL_GENERIC=y +CONFIG_USB_SERIAL_SIMPLE=y +CONFIG_USB_SERIAL_FTDI_SIO=y +CONFIG_USB_TEST=m +CONFIG_USB_EHSET_TEST_FIXTURE=y +# CONFIG_USB_SERIAL_CP210X is not set +# CONFIG_USB_SERIAL_OPTION is not set +CONFIG_USB_MXS_PHY=y +CONFIG_USB_ULPI=y +CONFIG_USB_SNP_UDC_PLAT=y +CONFIG_USB_BDC_UDC=y +CONFIG_USB_CONFIGFS=y +# CONFIG_USB_RENESAS_USBHS_UDC is not set +# CONFIG_USB_RENESAS_USB3 is not set +# CONFIG_USB_TEGRA_XUDC is not set +CONFIG_USB_CONFIGFS_F_LB_SS=y +CONFIG_USB_CONFIGFS_F_UAC1=y +CONFIG_USB_CONFIGFS_F_UAC1_LEGACY=y +CONFIG_USB_CONFIGFS_F_UAC2=y +CONFIG_USB_CONFIGFS_F_MIDI=y +CONFIG_USB_CONFIGFS_F_HID=y +CONFIG_USB_CONFIGFS_F_UVC=y +CONFIG_USB_ZERO=m +CONFIG_USB_AUDIO=m +CONFIG_USB_ETH=m +CONFIG_USB_MASS_STORAGE=m +CONFIG_USB_G_SERIAL=m +CONFIG_TYPEC=y +CONFIG_TYPEC_TCPM=y +CONFIG_TYPEC_TCPCI=y +# CONFIG_TYPEC_TPS6598X is not set +# CONFIG_MMC_SDHCI_ACPI is not set +# CONFIG_MMC_SDHCI_TEGRA is not set +# CONFIG_MMC_MESON_GX is not set +# CONFIG_MMC_SDHCI_MSM is not set +# CONFIG_MMC_SDHI is not set +# CONFIG_MMC_UNIPHIER is not set +# CONFIG_MMC_DW_ROCKCHIP is not set +# CONFIG_MMC_SUNXI is not set +# CONFIG_MMC_BCM2835 is not set +# CONFIG_MMC_MTK is not set +# CONFIG_MMC_OWL is not set +# CONFIG_LEDS_LM3692X is not set +# CONFIG_LEDS_PCA9532 is not set +# CONFIG_EDAC_LAYERSCAPE is not set +# CONFIG_RTC_DRV_HYM8563 is not set +# CONFIG_RTC_DRV_PCF85063 is not set +# CONFIG_RTC_DRV_M41T80 is not set +# CONFIG_RTC_DRV_RV3028 is not set +# CONFIG_RTC_DRV_FSL_FTM_ALARM is not set +# CONFIG_RTC_DRV_S3C is not set +CONFIG_RTC_DRV_SNVS=y +CONFIG_RTC_DRV_IMX_SC=y +# CONFIG_RTC_DRV_SUN6I is not set +# CONFIG_RTC_DRV_ARMADA38X is not set +# CONFIG_RTC_DRV_PM8XXX is not set +# CONFIG_RTC_DRV_TEGRA is not set +# CONFIG_RTC_DRV_XGENE is not set +# CONFIG_RTC_DRV_MT6397 is not set +CONFIG_BCM_SBA_RAID=m +# CONFIG_DMA_BCM2835 is not set +# CONFIG_DMA_SUN6I is not set +CONFIG_FSL_QDMA=m +CONFIG_IMX_SDMA=y +# CONFIG_K3_DMA is not set +# CONFIG_MV_XOR is not set +CONFIG_MXS_DMA=y +# CONFIG_OWL_DMA is not set +# CONFIG_TEGRA186_GPC_DMA is not set +# CONFIG_TEGRA20_APB_DMA is not set +# CONFIG_TEGRA210_ADMA is not set +# CONFIG_QCOM_BAM_DMA is not set +CONFIG_DMATEST=y +CONFIG_DMABUF_HEAPS=y +CONFIG_DMABUF_HEAPS_SYSTEM=y +CONFIG_DMABUF_HEAPS_CMA=y +# CONFIG_RCAR_DMAC is not set +# CONFIG_RENESAS_USB_DMAC is not set +# CONFIG_RZ_DMAC is not set +# CONFIG_TI_K3_UDMA is not set +# CONFIG_TI_K3_UDMA_GLUE_LAYER is not set +# CONFIG_VFIO_PCI is not set +# CONFIG_VIRTIO_PCI is not set +# CONFIG_XEN_GNTDEV is not set +# CONFIG_XEN_GRANT_DEV_ALLOC is not set +# CONFIG_VIDEO_HANTRO is not set +# CONFIG_VIDEO_IMX_MEDIA is not set +# CONFIG_COMMON_CLK_SCMI is not set +# CONFIG_COMMON_CLK_FSL_SAI is not set +CONFIG_COMMON_CLK_XGENE=y +# CONFIG_COMMON_CLK_BD718XX is not set +# CONFIG_CLK_RASPBERRYPI is not set +# CONFIG_CLK_IMX8MM is not set +# CONFIG_CLK_IMX8MP is not set +# CONFIG_CLK_IMX8MQ is not set +# CONFIG_CLK_IMX8QXP is not set +# CONFIG_CLK_IMX8ULP is not set +# CONFIG_TI_SCI_CLK is not set +# CONFIG_COMMON_CLK_QCOM is not set +# CONFIG_QCOM_A53PLL is not set +# CONFIG_QCOM_CLK_APCS_MSM8916 is not set +# CONFIG_QCOM_CLK_APCC_MSM8996 is not set +# CONFIG_QCOM_CLK_SMD_RPM is not set +# CONFIG_QCOM_CLK_RPMH is not set +# CONFIG_IPQ_GCC_6018 is not set +# CONFIG_IPQ_GCC_8074 is not set +# CONFIG_MSM_GCC_8916 is not set +# CONFIG_MSM_GCC_8994 is not set +# CONFIG_MSM_MMCC_8996 is not set +# CONFIG_MSM_GCC_8998 is not set +# CONFIG_QCS_GCC_404 is not set +# CONFIG_SC_GCC_7180 is not set +# CONFIG_SC_GCC_7280 is not set +# CONFIG_SDM_CAMCC_845 is not set +# CONFIG_SDM_GPUCC_845 is not set +# CONFIG_SDM_VIDEOCC_845 is not set +# CONFIG_SDM_DISPCC_845 is not set +# CONFIG_SM_GCC_8350 is not set +# CONFIG_SM_GCC_8450 is not set +# CONFIG_SM_GPUCC_8150 is not set +# CONFIG_SM_GPUCC_8250 is not set +# CONFIG_QCOM_HFPLL is not set +# CONFIG_CLK_GFM_LPASS_SM8250 is not set +# CONFIG_CLK_RCAR_USB2_CLOCK_SEL is not set +# CONFIG_HWSPINLOCK_QCOM is not set +# CONFIG_RENESAS_OSTM is not set +# CONFIG_BCM2835_MBOX is not set +# CONFIG_QCOM_APCS_IPC is not set +# CONFIG_QCOM_IPCC is not set +# CONFIG_ROCKCHIP_IOMMU is not set +# CONFIG_TEGRA_IOMMU_SMMU is not set +# CONFIG_MTK_IOMMU is not set +# CONFIG_QCOM_IOMMU is not set +CONFIG_IMX_REMOTEPROC=y +CONFIG_IMX_DSP_REMOTEPROC=y +CONFIG_RPMSG_CHAR=y +# CONFIG_QCOM_Q6V5_MSS is not set +# CONFIG_QCOM_Q6V5_PAS is not set +# CONFIG_QCOM_SYSMON is not set +# CONFIG_QCOM_WCNSS_PIL is not set +# CONFIG_RPMSG_QCOM_GLINK_SMEM is not set +# CONFIG_RPMSG_QCOM_SMD is not set +CONFIG_SOC_BRCMSTB=y +# CONFIG_OWL_PM_DOMAINS is not set +# CONFIG_RASPBERRYPI_POWER is not set +# CONFIG_FSL_DPAA is not set +# CONFIG_FSL_MC_DPIO is not set +CONFIG_SOC_TI=y +# CONFIG_MTK_DEVAPC is not set +# CONFIG_MTK_PMIC_WRAP is not set +# CONFIG_QCOM_AOSS_QMP is not set +# CONFIG_QCOM_COMMAND_DB is not set +# CONFIG_QCOM_CPR is not set +# CONFIG_QCOM_GENI_SE is not set +# CONFIG_QCOM_RMTFS_MEM is not set +# CONFIG_QCOM_RPMH is not set +# CONFIG_QCOM_RPMHPD is not set +# CONFIG_QCOM_RPMPD is not set +# CONFIG_QCOM_SMEM is not set +# CONFIG_QCOM_SMD_RPM is not set +# CONFIG_QCOM_SMP2P is not set +# CONFIG_QCOM_SMSM is not set +# CONFIG_QCOM_SOCINFO is not set +# CONFIG_QCOM_STATS is not set +# CONFIG_QCOM_WCNSS_CTRL is not set +# CONFIG_QCOM_APR is not set +# CONFIG_ARCH_R8A77995 is not set +# CONFIG_ARCH_R8A77990 is not set +# CONFIG_ARCH_R8A77950 is not set +# CONFIG_ARCH_R8A77951 is not set +# CONFIG_ARCH_R8A77965 is not set +# CONFIG_ARCH_R8A77960 is not set +# CONFIG_ARCH_R8A77961 is not set +# CONFIG_ARCH_R8A779F0 is not set +# CONFIG_ARCH_R8A77980 is not set +# CONFIG_ARCH_R8A77970 is not set +# CONFIG_ARCH_R8A779A0 is not set +# CONFIG_ARCH_R8A774C0 is not set +# CONFIG_ARCH_R8A774E1 is not set +# CONFIG_ARCH_R8A774A1 is not set +# CONFIG_ARCH_R8A774B1 is not set +# CONFIG_ARCH_R9A07G044 is not set +# CONFIG_ROCKCHIP_IODOMAIN is not set +# CONFIG_ROCKCHIP_PM_DOMAINS is not set +# CONFIG_ARCH_TEGRA_132_SOC is not set +# CONFIG_ARCH_TEGRA_210_SOC is not set +# CONFIG_ARCH_TEGRA_186_SOC is not set +# CONFIG_ARCH_TEGRA_194_SOC is not set +# CONFIG_ARCH_TEGRA_234_SOC is not set +# CONFIG_TI_SCI_PM_DOMAINS is not set +# CONFIG_ARM_IMX_BUS_DEVFREQ is not set +# CONFIG_ARM_IMX8M_DDRC_DEVFREQ is not set +CONFIG_MEMORY=y +# CONFIG_RENESAS_RPCIF is not set +CONFIG_IMX8QXP_ADC=y +# CONFIG_EXYNOS_ADC is not set +# CONFIG_QCOM_SPMI_VADC is not set +# CONFIG_QCOM_SPMI_ADC5 is not set +# CONFIG_ROCKCHIP_SARADC is not set +# CONFIG_RZG2L_ADC is not set +# CONFIG_TI_ADS1015 is not set +CONFIG_IIO_ST_LSM6DSX=y +# CONFIG_SENSORS_ISL29018 is not set +# CONFIG_VCNL4000 is not set +# CONFIG_IIO_ST_MAGN_3AXIS is not set +# CONFIG_MPL3115 is not set +# CONFIG_PWM_BCM2835 is not set +# CONFIG_PWM_BRCMSTB is not set +CONFIG_PWM_FSL_FTM=m +CONFIG_PWM_IMX27=y +# CONFIG_PWM_MESON is not set +# CONFIG_PWM_MTK_DISP is not set +# CONFIG_PWM_MEDIATEK is not set +# CONFIG_PWM_RCAR is not set +# CONFIG_PWM_RENESAS_TPU is not set +# CONFIG_PWM_ROCKCHIP is not set +# CONFIG_PWM_SAMSUNG is not set +# CONFIG_PWM_SL28CPLD is not set +# CONFIG_PWM_SUN4I is not set +# CONFIG_PWM_TEGRA is not set +# CONFIG_PWM_VISCONTI is not set +# CONFIG_SL28CPLD_INTC is not set +# CONFIG_QCOM_PDC is not set +# CONFIG_RESET_QCOM_AOSS is not set +# CONFIG_RESET_QCOM_PDC is not set +# CONFIG_RESET_RZG2L_USBPHY_CTRL is not set +# CONFIG_RESET_TI_SCI is not set +CONFIG_PHY_CADENCE_SALVO=y +CONFIG_PHY_MIXEL_MIPI_DPHY=y +# CONFIG_PHY_SUN4I_USB is not set +# CONFIG_PHY_CADENCE_SIERRA is not set +# CONFIG_PHY_FSL_IMX8M_PCIE is not set +# CONFIG_PHY_HI6220_USB is not set +# CONFIG_PHY_HISTB_COMBPHY is not set +# CONFIG_PHY_HISI_INNO_USB2 is not set +# CONFIG_PHY_MVEBU_CP110_COMPHY is not set +# CONFIG_PHY_MTK_TPHY is not set +# CONFIG_PHY_QCOM_QMP is not set +# CONFIG_PHY_QCOM_QUSB2 is not set +CONFIG_PHY_SAMSUNG_USB2=y +# CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2 is not set +# CONFIG_PHY_RCAR_GEN3_PCIE is not set +# CONFIG_PHY_RCAR_GEN3_USB2 is not set +# CONFIG_PHY_RCAR_GEN3_USB3 is not set +# CONFIG_PHY_ROCKCHIP_EMMC is not set +# CONFIG_PHY_ROCKCHIP_INNO_HDMI is not set +# CONFIG_PHY_ROCKCHIP_INNO_USB2 is not set +# CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY is not set +# CONFIG_PHY_ROCKCHIP_PCIE is not set +# CONFIG_PHY_ROCKCHIP_TYPEC is not set +# CONFIG_PHY_SAMSUNG_UFS is not set +# CONFIG_PHY_UNIPHIER_USB2 is not set +# CONFIG_PHY_UNIPHIER_USB3 is not set +# CONFIG_PHY_TEGRA_XUSB is not set +# CONFIG_PHY_AM654_SERDES is not set +# CONFIG_PHY_J721E_WIZ is not set +CONFIG_FSL_IMX8_DDR_PMU=y +# CONFIG_QCOM_L2_PMU is not set +# CONFIG_QCOM_L3_PMU is not set +# CONFIG_MTK_EFUSE is not set +# CONFIG_QCOM_QFPROM is not set +# CONFIG_ROCKCHIP_EFUSE is not set +# CONFIG_NVMEM_SUNXI_SID is not set +# CONFIG_UNIPHIER_EFUSE is not set +# CONFIG_MESON_EFUSE is not set +# CONFIG_NVMEM_RMEM is not set +# CONFIG_NVMEM_LAYERSCAPE_SFP is not set +# CONFIG_FPGA_MGR_ALTERA_CVP is not set +# CONFIG_FPGA_MGR_STRATIX10_SOC is not set +# CONFIG_SLIMBUS is not set +# CONFIG_SLIM_QCOM_NGD_CTRL is not set +# CONFIG_INTERCONNECT_IMX is not set +# CONFIG_INTERCONNECT_IMX8MM is not set +# CONFIG_INTERCONNECT_IMX8MN is not set +# CONFIG_INTERCONNECT_IMX8MQ is not set +# CONFIG_INTERCONNECT_QCOM is not set +# CONFIG_INTERCONNECT_QCOM_MSM8916 is not set +# CONFIG_INTERCONNECT_QCOM_OSM_L3 is not set +# CONFIG_INTERCONNECT_QCOM_SC7280 is not set +# CONFIG_INTERCONNECT_QCOM_SDM845 is not set +# CONFIG_INTERCONNECT_QCOM_SM8150 is not set +# CONFIG_INTERCONNECT_QCOM_SM8250 is not set +# CONFIG_INTERCONNECT_QCOM_SM8350 is not set +# CONFIG_INTERCONNECT_QCOM_SM8450 is not set +# CONFIG_TMPFS_POSIX_ACL is not set +# CONFIG_CONFIGFS_FS is not set +CONFIG_JFFS2_FS=y +CONFIG_UBIFS_FS=y +CONFIG_SQUASHFS_XZ=y +CONFIG_CRYPTO_USER=y +CONFIG_CRYPTO_TEST=m +CONFIG_CRYPTO_DH=m +CONFIG_CRYPTO_CHACHA20POLY1305=m +CONFIG_CRYPTO_CFB=m +CONFIG_CRYPTO_CTS=m +CONFIG_CRYPTO_LRW=m +CONFIG_CRYPTO_OFB=m +CONFIG_CRYPTO_PCBC=m +CONFIG_CRYPTO_XCBC=m +CONFIG_CRYPTO_VMAC=m +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_RMD160=m +CONFIG_CRYPTO_STREEBOG=m +CONFIG_CRYPTO_WP512=m +CONFIG_CRYPTO_ANUBIS=m +CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_CAMELLIA=m +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_DES=m +CONFIG_CRYPTO_FCRYPT=m +CONFIG_CRYPTO_KHAZAD=m +CONFIG_CRYPTO_SEED=m +CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_USER_API_HASH=m +CONFIG_CRYPTO_USER_API_SKCIPHER=m +CONFIG_CRYPTO_USER_API_AEAD=m +# CONFIG_CRYPTO_DEV_SUN8I_CE is not set +# CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM is not set +# CONFIG_CRYPTO_DEV_QCOM_RNG is not set +CONFIG_CRYPTO_DEV_AMLOGIC_GXL=m +CONFIG_INDIRECT_PIO=y +CONFIG_CRC_CCITT=m +# CONFIG_CRYPTO_DEV_HISI_SEC2 is not set +# CONFIG_CRYPTO_DEV_HISI_ZIP is not set +# CONFIG_CRYPTO_DEV_HISI_HPRE is not set +# CONFIG_CRYPTO_DEV_HISI_TRNG is not set +CONFIG_IRQ_POLL=y +# CONFIG_DEBUG_INFO is not set +# CONFIG_DEBUG_INFO_REDUCED is not set +CONFIG_CORESIGHT=y +CONFIG_CORESIGHT_LINK_AND_SINK_TMC=y +CONFIG_CORESIGHT_SOURCE_ETM4X=y diff --git a/board/bsh/imx8mn-bsh-smm-s2-pro/extlinux.conf b/board/bsh/imx8mn-bsh-smm-s2-pro/extlinux.conf new file mode 100644 index 00000000000..91113547425 --- /dev/null +++ b/board/bsh/imx8mn-bsh-smm-s2-pro/extlinux.conf @@ -0,0 +1,4 @@ +label buildroot + kernel /boot/Image + devicetree /boot/freescale/imx8mn-bsh-smm-s2pro.dtb + append root=PARTUUID=%PARTUUID% rootwait rw diff --git a/board/bsh/imx8mn-bsh-smm-s2-pro/flash.sh b/board/bsh/imx8mn-bsh-smm-s2-pro/flash.sh new file mode 100755 index 00000000000..17b20f00977 --- /dev/null +++ b/board/bsh/imx8mn-bsh-smm-s2-pro/flash.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +if [ $# -eq 0 ]; then + OUTPUT_DIR=output +else + OUTPUT_DIR=$1 +fi + +if ! test -d "${OUTPUT_DIR}" ; then + echo "ERROR: no output directory specified." + echo "Usage: $0 OUTPUT_DIR" + echo "" + echo "Arguments:" + echo " OUTPUT_DIR The Buildroot output directory." + exit 1 +fi + +IMAGES_DIR=${OUTPUT_DIR}/images + +${OUTPUT_DIR}/host/bin/uuu -v -b emmc_all \ + ${IMAGES_DIR}/flash.bin \ + ${IMAGES_DIR}/sdcard.img + diff --git a/board/bsh/imx8mn-bsh-smm-s2-pro/genimage.cfg b/board/bsh/imx8mn-bsh-smm-s2-pro/genimage.cfg new file mode 100644 index 00000000000..10c52548cdf --- /dev/null +++ b/board/bsh/imx8mn-bsh-smm-s2-pro/genimage.cfg @@ -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/bsh/imx8mn-bsh-smm-s2-pro/post-build.sh b/board/bsh/imx8mn-bsh-smm-s2-pro/post-build.sh new file mode 100755 index 00000000000..bf8861f6a91 --- /dev/null +++ b/board/bsh/imx8mn-bsh-smm-s2-pro/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" > "$TARGET_DIR/boot/extlinux/extlinux.conf" +sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/genimage.cfg" > "$BINARIES_DIR/genimage.cfg" diff --git a/board/kontron/pitx-imx8m/post-image.sh b/board/bsh/imx8mn-bsh-smm-s2-pro/post-image.sh similarity index 100% rename from board/kontron/pitx-imx8m/post-image.sh rename to board/bsh/imx8mn-bsh-smm-s2-pro/post-image.sh diff --git a/board/bsh/imx8mn-bsh-smm-s2-pro/readme.txt b/board/bsh/imx8mn-bsh-smm-s2-pro/readme.txt new file mode 100644 index 00000000000..5763f164fe1 --- /dev/null +++ b/board/bsh/imx8mn-bsh-smm-s2-pro/readme.txt @@ -0,0 +1,73 @@ +i.MX8MN BSH SMM S2 PRO +====================== + +How to build it +--------------- + +Configure buildroot: + + $ make imx8mn_bsh_smm_s2_pro_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 + ├── Image + ├── flash.bin + ├── ddr3* + ├── rootfs.ext2 + ├── rootfs.ext4 -> rootfs.ext2 + ├── rootfs.tar + ├── sdcard.img + ├── u-boot.bin + ├── u-boot-nodtb.bin + └── u-boot-spl.bin + + +Preparing the board +------------------- + +Plug the USB type A to micro B cable into the USB Debug +Connector (DBG UART). Use serial port settings 115200 8N1 +to access the debug console. + +Plug another USB type A to micro B cable into the USB-OTG +Connector (USB1). This connection is used to flash the board +firmware using the Freescale/NXP UUU tool. + +Connect the power supply/adaptor to the DC Power Jack (labelled ++5V). + + +Flashing the emmc card image +---------------------------- + +Power up the board by switching on the Power ON Switch, which is +placed right next to the DC Jack. + +Enter the following U-Boot commands on the debug serial console: + + $ fastboot usb 0 + +Flash the images on eMMC. On your computer, run: + + $ board/bsh/imx8mn-bsh-smm-s2-pro/flash.sh output/ + + +Booting the board +----------------- + +By default the bootloader will search for the first valid image, +starting with the internal eMMC. diff --git a/board/bsh/imx8mn-bsh-smm-s2/flash.sh b/board/bsh/imx8mn-bsh-smm-s2/flash.sh new file mode 100755 index 00000000000..1f343d516dc --- /dev/null +++ b/board/bsh/imx8mn-bsh-smm-s2/flash.sh @@ -0,0 +1,26 @@ +#!/bin/bash + +if [ $# -eq 0 ]; then + OUTPUT_DIR=output +else + OUTPUT_DIR=$1 +fi + +if ! test -d "${OUTPUT_DIR}" ; then + echo "ERROR: no output directory specified." + echo "Usage: $0 OUTPUT_DIR" + echo "" + echo "Arguments:" + echo " OUTPUT_DIR The Buildroot output directory." + exit 1 +fi + +IMAGES_DIR=${OUTPUT_DIR}/images + +${OUTPUT_DIR}/host/bin/uuu -v -b ${IMAGES_DIR}/nand-full.lst \ + ${IMAGES_DIR}/flash.bin \ + ${IMAGES_DIR}/flash.bin \ + ${IMAGES_DIR}/rootfs.ubifs \ + ${IMAGES_DIR}/Image \ + ${IMAGES_DIR}/freescale/imx8mn-bsh-smm-s2.dtb + diff --git a/board/bsh/imx8mn-bsh-smm-s2/nand-full.lst b/board/bsh/imx8mn-bsh-smm-s2/nand-full.lst new file mode 100644 index 00000000000..c01d2d6c1da --- /dev/null +++ b/board/bsh/imx8mn-bsh-smm-s2/nand-full.lst @@ -0,0 +1,29 @@ +# @_flash.bin | bootloader +# @_image [_flash.bin] | image burn to nand, default is the same as bootloader +# @_filesystem | filesystem to burn +# @_kernel | kernel image +# @_dtb | dtb image + +# This command will be run when ROM support stream mode +# i.MX8QXP, i.MX8QM +SDPS: boot -f _flash.bin + +FB: ucmd setenv fastboot_buffer ${loadaddr} +FB: download -f _image +# 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} + +FB[-t 10000]: ucmd ubi part nandrootfs +FB[-t 10000]: ucmd ubi create root - +FB: download -f _filesystem +FB[-t 60000]: ucmd ubi write ${loadaddr} root ${filesize} + +FB: download -f _kernel +FB[-t 10000]: ucmd nand write ${loadaddr} nandkernel ${filesize} + +FB: download -f _dtb +FB[-t 8000]: ucmd nand write ${loadaddr} nanddtb ${filesize} + +FB: reboot +FB: done diff --git a/board/bsh/imx8mn-bsh-smm-s2/patches/uboot/0001-include-configs-Remove-rootwait-1-to-all-the-affecte.patch b/board/bsh/imx8mn-bsh-smm-s2/patches/uboot/0001-include-configs-Remove-rootwait-1-to-all-the-affecte.patch new file mode 100644 index 00000000000..59db559b930 --- /dev/null +++ b/board/bsh/imx8mn-bsh-smm-s2/patches/uboot/0001-include-configs-Remove-rootwait-1-to-all-the-affecte.patch @@ -0,0 +1,160 @@ +From 3878b941c6bde84e29b2725e4261d85bea828752 Mon Sep 17 00:00:00 2001 +From: Michael Trimarchi +Date: Sun, 22 May 2022 15:22:08 +0200 +Subject: [PATCH] include/configs: Remove rootwait=1 to all the affected boards + +rootwait=1 is not a valid kernel boot parameters. According +to the documenation is only rootwait + +rootwait [KNL] Wait (indefinitely) for root device to show up. + Useful for devices that are detected asynchronously + (e.g. USB and MMC devices). + +Fix: +Unknown kernel command line parameters "rootwait=1", will be passed to user space. + +Signed-off-by: Michael Trimarchi +Reviewed-by: Heiko Schocher +Link: https://patchwork.ozlabs.org/project/uboot/patch/20220520110013.32811-1-michael@amarulasolutions.com/ +Signed-off-by: Dario Binacchi +--- + include/configs/am335x_evm.h | 2 +- + include/configs/am43xx_evm.h | 2 +- + include/configs/baltos.h | 2 +- + include/configs/chiliboard.h | 2 +- + include/configs/etamin.h | 2 +- + include/configs/imx8mn_bsh_smm_s2.h | 2 +- + include/configs/siemens-am33x-common.h | 4 ++-- + include/configs/ti_armv7_keystone2.h | 2 +- + include/environment/ti/nand.h | 2 +- + 9 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h +index fd5b209a52db..f301a6dc835b 100644 +--- a/include/configs/am335x_evm.h ++++ b/include/configs/am335x_evm.h +@@ -34,7 +34,7 @@ + "root=${nandroot} " \ + "rootfstype=${nandrootfstype}\0" \ + "nandroot=ubi0:rootfs rw ubi.mtd=NAND.file-system,2048\0" \ +- "nandrootfstype=ubifs rootwait=1\0" \ ++ "nandrootfstype=ubifs rootwait\0" \ + "nandboot=echo Booting from nand ...; " \ + "run nandargs; " \ + "nand read ${fdtaddr} NAND.u-boot-spl-os; " \ +diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h +index 5057441f7506..1f5c3cd04e88 100644 +--- a/include/configs/am43xx_evm.h ++++ b/include/configs/am43xx_evm.h +@@ -166,7 +166,7 @@ + "root=${nandroot} " \ + "rootfstype=${nandrootfstype}\0" \ + "nandroot=ubi0:rootfs rw ubi.mtd=NAND.file-system,4096\0" \ +- "nandrootfstype=ubifs rootwait=1\0" \ ++ "nandrootfstype=ubifs rootwait\0" \ + "nandboot=echo Booting from nand ...; " \ + "run nandargs; " \ + "nand read ${fdtaddr} NAND.u-boot-spl-os; " \ +diff --git a/include/configs/baltos.h b/include/configs/baltos.h +index b881d8c03fd7..7b43741fde7c 100644 +--- a/include/configs/baltos.h ++++ b/include/configs/baltos.h +@@ -37,7 +37,7 @@ + "root=${nandroot} " \ + "rootfstype=${nandrootfstype}\0" \ + "nandroot=ubi0:rootfs rw ubi.mtd=5\0" \ +- "nandrootfstype=ubifs rootwait=1\0" \ ++ "nandrootfstype=ubifs rootwait\0" \ + "nandboot=echo Booting from nand ...; " \ + "run nandargs; " \ + "setenv loadaddr 0x84000000; " \ +diff --git a/include/configs/chiliboard.h b/include/configs/chiliboard.h +index 82acda595f09..8bad0f9ac4b6 100644 +--- a/include/configs/chiliboard.h ++++ b/include/configs/chiliboard.h +@@ -20,7 +20,7 @@ + "root=${nandroot} " \ + "rootfstype=${nandrootfstype}\0" \ + "nandroot=ubi0:rootfs rw ubi.mtd=NAND.file-system\0" \ +- "nandrootfstype=ubifs rootwait=1\0" \ ++ "nandrootfstype=ubifs rootwait\0" \ + "nandboot=echo Booting from nand ...; " \ + "run nandargs; " \ + "nand read ${fdt_addr} NAND.u-boot-spl-os; " \ +diff --git a/include/configs/etamin.h b/include/configs/etamin.h +index 9cf93924df93..1c0a86d1ed10 100644 +--- a/include/configs/etamin.h ++++ b/include/configs/etamin.h +@@ -113,7 +113,7 @@ + "nand_active_ubi_vol=rootfs_a\0" \ + "rootfs_name=rootfs\0" \ + "kernel_name=uImage\0"\ +- "nand_root_fs_type=ubifs rootwait=1\0" \ ++ "nand_root_fs_type=ubifs rootwait\0" \ + "nand_args=run bootargs_defaults;" \ + "mtdparts default;" \ + "setenv ${partitionset_active} true;" \ +diff --git a/include/configs/imx8mn_bsh_smm_s2.h b/include/configs/imx8mn_bsh_smm_s2.h +index d09c2ab01610..0dc514f00684 100644 +--- a/include/configs/imx8mn_bsh_smm_s2.h ++++ b/include/configs/imx8mn_bsh_smm_s2.h +@@ -22,7 +22,7 @@ + "root=${nandroot} " \ + "rootfstype=${nandrootfstype}\0" \ + "nandroot=ubi0:root rw ubi.mtd=nandrootfs\0" \ +- "nandrootfstype=ubifs rootwait=1\0" \ ++ "nandrootfstype=ubifs rootwait\0" \ + "nandboot=echo Booting from nand ...; " \ + "run nandargs; " \ + "nand read ${fdt_addr_r} nanddtb; " \ +diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h +index 08c4d52d658f..9f1a6cd51b40 100644 +--- a/include/configs/siemens-am33x-common.h ++++ b/include/configs/siemens-am33x-common.h +@@ -237,7 +237,7 @@ + "nand_active_ubi_vol=rootfs_a\0" \ + "nand_active_ubi_vol_A=rootfs_a\0" \ + "nand_active_ubi_vol_B=rootfs_b\0" \ +- "nand_root_fs_type=ubifs rootwait=1\0" \ ++ "nand_root_fs_type=ubifs rootwait\0" \ + "nand_src_addr=0x280000\0" \ + "nand_src_addr_A=0x280000\0" \ + "nand_src_addr_B=0x780000\0" \ +@@ -314,7 +314,7 @@ + "nand_active_ubi_vol=rootfs_a\0" \ + "rootfs_name=rootfs\0" \ + "kernel_name=uImage\0"\ +- "nand_root_fs_type=ubifs rootwait=1\0" \ ++ "nand_root_fs_type=ubifs rootwait\0" \ + "nand_args=run bootargs_defaults;" \ + "mtdparts default;" \ + "setenv ${partitionset_active} true;" \ +diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h +index 57f013cbf846..133daecf7164 100644 +--- a/include/configs/ti_armv7_keystone2.h ++++ b/include/configs/ti_armv7_keystone2.h +@@ -180,7 +180,7 @@ + "sf write ${loadaddr} 0 ${filesize}\0" \ + "burn_uboot_nand=nand erase 0 0x100000; " \ + "nand write ${loadaddr} 0 ${filesize}\0" \ +- "args_all=setenv bootargs console=ttyS0,115200n8 rootwait=1 " \ ++ "args_all=setenv bootargs console=ttyS0,115200n8 rootwait " \ + KERNEL_MTD_PARTS \ + "args_net=setenv bootargs ${bootargs} rootfstype=nfs " \ + "root=/dev/nfs rw nfsroot=${serverip}:${nfs_root}," \ +diff --git a/include/environment/ti/nand.h b/include/environment/ti/nand.h +index 11dcefcc41ca..7d00afa2b10f 100644 +--- a/include/environment/ti/nand.h ++++ b/include/environment/ti/nand.h +@@ -14,7 +14,7 @@ + "root=${nandroot} " \ + "rootfstype=${nandrootfstype}\0" \ + "nandroot=ubi0:rootfs rw ubi.mtd=NAND.file-system,2048\0" \ +- "nandrootfstype=ubifs rootwait=1\0" \ ++ "nandrootfstype=ubifs rootwait\0" \ + "nandboot=echo Booting from nand ...; " \ + "run nandargs; " \ + "nand read ${fdtaddr} NAND.u-boot-spl-os; " \ +-- +2.32.0 + diff --git a/board/bsh/imx8mn-bsh-smm-s2/post-build.sh b/board/bsh/imx8mn-bsh-smm-s2/post-build.sh new file mode 100755 index 00000000000..49df4cd6fb1 --- /dev/null +++ b/board/bsh/imx8mn-bsh-smm-s2/post-build.sh @@ -0,0 +1,4 @@ +#!/bin/sh +BOARD_DIR="$(dirname $0)" + +cp ${BOARD_DIR}/nand-full.lst ${BINARIES_DIR} diff --git a/board/bsh/imx8mn-bsh-smm-s2/readme.txt b/board/bsh/imx8mn-bsh-smm-s2/readme.txt new file mode 100644 index 00000000000..6b8cd031990 --- /dev/null +++ b/board/bsh/imx8mn-bsh-smm-s2/readme.txt @@ -0,0 +1,75 @@ +i.MX8MN BSH SMM S2 +================== + +This tutorial describes how to use the predefined Buildroot +configuration for the i.MX8MN BSH SMM S2 board. + +Building +-------- + +Configure buildroot: + + $ make imx8mn_bsh_smm_s2_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 + ├── ddr3* + ├── flash.bin + ├── freescale/imx8mn-bsh-smm-s2.dtb + ├── Image + ├── nand-full.lst + ├── rootfs.ext2 + ├── rootfs.ext4 -> rootfs.ext2 + ├── rootfs.tar + ├── rootfs.ubifs + ├── u-boot.bin + └── u-boot-spl.bin + + +Preparing the board +------------------- + +Plug the USB type A to micro B cable into the USB Debug +Connector (DBG UART). Use serial port settings 115200 8N1 +to access the debug console. + +Plug another USB type A to micro B cable into the USB-OTG +Connector (USB1). This connection is used to flash the board +firmware using the Freescale/NXP UUU tool. + +Connect the power supply/adaptor to the DC Power Jack (labelled ++5V). + + +Flashing +-------- + +Power up the board by switching on the Power ON Switch, which is +placed right next to the DC Jack. + +Enter the following U-Boot commands on the debug serial console: + + $ nand erase.chip + $ reset + +Flash the built images directly to board’s memory. On your computer, +run: + + $ board/bsh/imx8mn-bsh-smm-s2/flash.sh output/ + +It will flash the bootloader, the Device Tree Blob, the kernel image +and the UBI root file system. diff --git a/board/canaan/k210-soc/busybox-tiny.config b/board/canaan/k210-soc/busybox-tiny.config new file mode 100644 index 00000000000..9db12b560ac --- /dev/null +++ b/board/canaan/k210-soc/busybox-tiny.config @@ -0,0 +1,231 @@ +# +# Additional config changes for busybox-minimal.config +# to reduce the size of the busybox executable. +# + +# +# Settings +# +# CONFIG_INCLUDE_SUSv2 is not set +# CONFIG_LONG_OPTS is not set +# CONFIG_LFS is not set +# CONFIG_FEATURE_DEVPTS is not set +# CONFIG_FEATURE_SYSLOG_INFO is not set +# CONFIG_FEATURE_SYSLOG is not set + +# +# Library Tuning +# +# CONFIG_FEATURE_RTMINMAX is not set +# CONFIG_FEATURE_RTMINMAX_USE_LIBC_DEFINITIONS is not set +# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set +CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y +# CONFIG_FEATURE_EDITING_VI is not set +# CONFIG_FEATURE_EDITING_SAVEHISTORY is not set +# CONFIG_FEATURE_REVERSE_SEARCH is not set +# CONFIG_FEATURE_EDITING_WINCH is not set +# CONFIG_FEATURE_HWIB is not set + +# +# Archival Utilities +# +# CONFIG_ZCAT is not set +# CONFIG_BZCAT is not set +# CONFIG_LZCAT is not set +# CONFIG_XZCAT is not set +# CONFIG_UNLZOP is not set +# CONFIG_LZOPCAT is not set + +# +# Coreutils +# +# CONFIG_CKSUM is not set +# CONFIG_DOS2UNIX is not set +# CONFIG_UNIX2DOS is not set +# CONFIG_DU is not set +# CONFIG_FACTOR is not set +# CONFIG_FOLD is not set +# CONFIG_HEAD is not set +# CONFIG_INSTALL is not set +# CONFIG_LINK is not set +# CONFIG_LOGNAME is not set +# CONFIG_MD5SUM is not set +# CONFIG_SHA1SUM is not set +# CONFIG_SHA256SUM is not set +# CONFIG_SHA512SUM is not set +# CONFIG_SHA3SUM is not set +# CONFIG_MKFIFO is not set +# CONFIG_NICE is not set +# CONFIG_NL is not set +# CONFIG_NOHUP is not set +# CONFIG_OD is not set +# CONFIG_PASTE is not set +# CONFIG_SHRED is not set +# CONFIG_SORT is not set +# CONFIG_TAIL is not set +# CONFIG_TEE is not set +# CONFIG_TIMEOUT is not set +# CONFIG_TR is not set +# CONFIG_UNIQ is not set +# CONFIG_UUDECODE is not set +# CONFIG_BASE32 is not set +# CONFIG_UUENCODE is not set +# CONFIG_WC is not set +# CONFIG_WHOAMI is not set +# CONFIG_WHO is not set +# CONFIG_W is not set +# CONFIG_USERS is not set +# CONFIG_YES is not set + +# +# Common options +# +# CONFIG_FEATURE_VERBOSE is not set + +# +# Debian Utilities +# +# CONFIG_RUN_PARTS is not set +# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set +# CONFIG_FEATURE_RUN_PARTS_FANCY is not set +# CONFIG_START_STOP_DAEMON is not set +# CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set +# CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set +# CONFIG_WHICH is not set + +# +# klibc-utils +# +# CONFIG_NUKE is not set +# CONFIG_RESUME is not set +# CONFIG_RUN_INIT is not set + +# +# Editors +# +# CONFIG_SED is not set +CONFIG_VI=y +CONFIG_FEATURE_VI_MAX_LEN=4096 +CONFIG_FEATURE_VI_COLON=y +CONFIG_FEATURE_VI_YANKMARK=y +CONFIG_FEATURE_VI_USE_SIGNALS=y +CONFIG_FEATURE_VI_DOT_CMD=y +CONFIG_FEATURE_VI_READONLY=y +CONFIG_FEATURE_VI_SETOPTS=y +CONFIG_FEATURE_VI_SET=y +CONFIG_FEATURE_VI_WIN_RESIZE=y +CONFIG_FEATURE_VI_ASK_TERMINAL=y +CONFIG_FEATURE_VI_UNDO=y + +# +# Finding Utilities +# +CONFIG_GREP=y +# CONFIG_EGREP is not set +# CONFIG_FGREP is not set +# CONFIG_XARGS is not set + +# +# Init Utilities +# +# CONFIG_HALT is not set +# CONFIG_POWEROFF is not set +# CONFIG_FEATURE_WAIT_FOR_INIT is not set +# CONFIG_FEATURE_CALL_TELINIT is not set +# CONFIG_INIT is not set +# CONFIG_LINUXRC is not set + +# +# Login/Password Management Utilities +# +# CONFIG_FEATURE_SHADOWPASSWDS is not set +# CONFIG_USE_BB_CRYPT is not set +# CONFIG_USE_BB_CRYPT_SHA is not set +# CONFIG_ADDUSER is not set +# CONFIG_GETTY is not set +# CONFIG_LOGIN is not set +# CONFIG_PASSWD is not set + +# +# Linux System Utilities +# +# CONFIG_FALLOCATE is not set +# CONFIG_FREERAMDISK is not set +# CONFIG_FSFREEZE is not set +# CONFIG_GETOPT is not set +# CONFIG_XXD is not set +# CONFIG_MESG is not set +# CONFIG_MKE2FS is not set +# CONFIG_MKDOSFS is not set +# CONFIG_FEATURE_MOUNT_CIFS is not set +# CONFIG_FEATURE_MOUNT_FSTAB is not set +# CONFIG_FEATURE_MOUNT_OTHERTAB is not set +# CONFIG_NOLOGIN is not set +# CONFIG_LINUX32 is not set +# CONFIG_LINUX64 is not set +# CONFIG_SETPRIV is not set + +# +# Common options for mount/umount +# +# CONFIG_FEATURE_MOUNT_LOOP is not set +# CONFIG_FEATURE_MOUNT_LOOP_CREATE is not set + +# +# Miscellaneous Utilities +# +# CONFIG_BC is not set +# CONFIG_HEXEDIT is not set +# CONFIG_I2CTRANSFER is not set +# CONFIG_LSSCSI is not set +# CONFIG_MIM is not set +# CONFIG_PARTPROBE is not set +# CONFIG_SETFATTR is not set +# CONFIG_SETSERIAL is not set +# CONFIG_TS is not set + +# +# Networking Utilities +# +# CONFIG_HOSTNAME is not set +# CONFIG_DNSDOMAINNAME is not set +# CONFIG_IFCONFIG is not set +# CONFIG_IFUP is not set +# CONFIG_IFDOWN is not set +# CONFIG_IP is not set +# CONFIG_IPADDR is not set +# CONFIG_IPLINK is not set +# CONFIG_IPROUTE is not set +# CONFIG_NC is not set +# CONFIG_NETSTAT is not set +# CONFIG_PING is not set +# CONFIG_ROUTE is not set +# CONFIG_TC is not set +# CONFIG_TELNET is not set +# CONFIG_WGET is not set +# CONFIG_UDHCPC is not set + +# +# Process Utilities +# +# CONFIG_KILLALL is not set +# CONFIG_KILLALL5 is not set + +# +# Runit Utilities +# +# CONFIG_SVC is not set +# CONFIG_SVOK is not set + +# +# Shells +# +CONFIG_BASH_IS_HUSH=y +# CONFIG_BASH_IS_NONE is not set +# CONFIG_HUSH_SAVEHISTORY is not set + +# +# Options common to all shells +# +# CONFIG_FEATURE_SH_READ_FRAC is not set +# CONFIG_FEATURE_SH_EMBEDDED_SCRIPTS is not set diff --git a/board/canaan/k210-soc/genimage.cfg b/board/canaan/k210-soc/genimage.cfg new file mode 100644 index 00000000000..da7d5dbafb2 --- /dev/null +++ b/board/canaan/k210-soc/genimage.cfg @@ -0,0 +1,30 @@ +image boot.vfat { + vfat { + file uImage { + image = "uImage" + } + + file k210.dtb { + image = "k210.dtb" + } + } + size = 4M +} + +image sdcard.img { + hdimage { + } + + partition boot { + partition-type = 0xC + image = "boot.vfat" + bootable = "true" + offset = 4M + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext2" + size = 64M + } +} diff --git a/board/canaan/k210-soc/linux-sdcard.config b/board/canaan/k210-soc/linux-sdcard.config new file mode 100644 index 00000000000..4b0ead78a76 --- /dev/null +++ b/board/canaan/k210-soc/linux-sdcard.config @@ -0,0 +1,4 @@ +CONFIG_BUILTIN_DTB=n +CONFIG_SOC_CANAAN_K210_DTB_BUILTIN=n +CONFIG_SOC_CANAAN_K210_DTB_SOURCE="" +CONFIG_CMDLINE="earlycon console=ttySIF0 root=/dev/mmcblk0p2 rootwait ro" diff --git a/board/canaan/k210-soc/post-build.sh b/board/canaan/k210-soc/post-build.sh new file mode 100755 index 00000000000..5b6f56a2c59 --- /dev/null +++ b/board/canaan/k210-soc/post-build.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +MKIMAGE=${HOST_DIR}/bin/mkimage + +# Generate u-Boot kernel image +${MKIMAGE} -A riscv -O linux -T kernel -C none \ + -a 0x80000000 -e 0x80000000 \ + -n Linux -d ${BINARIES_DIR}/loader.bin ${BINARIES_DIR}/uImage + +# Link the kernel-built board dtb file to using the k210.dtb generic +# name for use by genimage.cfg +BOARDDTBKPATH="$(grep BR2_LINUX_KERNEL_INTREE_DTS_NAME ${BR2_CONFIG} | cut -d'=' -f2 | tr -d \")" + +BOARDDTB="$(basename ${BOARDDTBKPATH})" +if [ -z "${BOARDDTB}" ]; then + echo "Board DTB file not specified" + exit 1 +fi + +BOARDDTB="${BINARIES_DIR}/${BOARDDTB}.dtb" +if [ ! -f "${BOARDDTB}" ]; then + echo "Board DTB file not found in ${BINARIES_DIR}" + exit 1 +fi + +TARGETDTB=${BINARIES_DIR}/k210.dtb +rm -f ${TARGETDTB} +ln -s ${BOARDDTB} ${TARGETDTB} diff --git a/board/canaan/k210-soc/rootfs_overlay/init b/board/canaan/k210-soc/rootfs_overlay/init new file mode 120000 index 00000000000..a0b71977c06 --- /dev/null +++ b/board/canaan/k210-soc/rootfs_overlay/init @@ -0,0 +1 @@ +/sbin/init \ No newline at end of file diff --git a/board/canaan/k210-soc/rootfs_overlay/sbin/init b/board/canaan/k210-soc/rootfs_overlay/sbin/init new file mode 100755 index 00000000000..d4bf53d4523 --- /dev/null +++ b/board/canaan/k210-soc/rootfs_overlay/sbin/init @@ -0,0 +1,41 @@ +#!/bin/sh + +# This script replaces the default busybox init process to avoid having that +# process staying alive and sleeping in the background, (uselessly) consuming +# precious memory. + +# Mount procfs and sysfs +/bin/mount -t proc proc /proc +/bin/mount -t sysfs sysfs /sys + +# When the kernel is directly booted, devtmpfs is not automatically mounted. +# Manually mount it if needed. +devmnt=$(mount | grep -c devtmpfs) +if [ ${devmnt} -eq 0 ]; then + /bin/mount -t devtmpfs devtmpfs /dev +fi + +# Use the /dev/console device node from devtmpfs if possible to not +# confuse glibc's ttyname_r(). +# This may fail (E.G. booted with console=), and errors from exec will +# terminate the shell, so use a subshell for the test +if (exec 0/dev/null; then + exec 0/dev/console + exec 2>/dev/console +fi + +# Clear memory to reduce page fragmentation +echo 3 > /proc/sys/vm/drop_caches + +# Print a fun logo :) +echo " __ _" +echo " / / (_) ____ _ _ __ __" +echo " / / | || _ \\ | | | |\\ \\/ /" +echo " / /___| || | | || |_| | > < " +echo " /_____/|_||_| |_| \\____|/_/\\_\\" +echo " 64-bits RISC-V Kendryte K210 NOMMU" +echo "" + +# Finally, let's start an interactive shell +exec /bin/sh diff --git a/board/canaan/k210-soc/uboot.config b/board/canaan/k210-soc/uboot.config new file mode 100644 index 00000000000..159085f8025 --- /dev/null +++ b/board/canaan/k210-soc/uboot.config @@ -0,0 +1 @@ +# CONFIG_WATCHDOG_AUTOSTART is not set diff --git a/board/canaan/kd233/linux-cpio.config b/board/canaan/kd233/linux-cpio.config new file mode 100644 index 00000000000..d5b107124a8 --- /dev/null +++ b/board/canaan/kd233/linux-cpio.config @@ -0,0 +1,2 @@ +CONFIG_SOC_CANAAN_K210_DTB_BUILTIN=y +CONFIG_SOC_CANAAN_K210_DTB_SOURCE="canaan_kd233" diff --git a/board/canaan/kd233/readme.txt b/board/canaan/kd233/readme.txt new file mode 100644 index 00000000000..47b78fa2d77 --- /dev/null +++ b/board/canaan/kd233/readme.txt @@ -0,0 +1,149 @@ +Canaan KD233 Board +================== + +The Canaan KD233 is a dual-core RISC-V 64-bits board based on the Canaan +Kendryte K210 SoC. + +Prerequisite +------------ + +In order to use the kflash utility to program this board, the user must have +access to the board USB serial device file. The simplest way to do this is to +add your user to the same group as this device file. Assume the device file is +/dev/ttyUSB0, first identify the device group name. In most cases, it is +either "dialout" or "uucp". Also verify that read-write access is enabled for +the group: + +``` +$ ls -l /dev/ttyUSB0 +crw-rw---- 1 root dialout 188, 0 May 26 13:48 /dev/ttyUSB0 +``` + +Then add yourself to that group (dialout in this example): + +``` +$ sudo usermod -a -G dialout $(whoami) +``` + +To enable the above, it is sometimes necessary to logout and login again. + +Buildroot Configuration +----------------------- + +Unlike other K210 based boards (Sipeed boards), U-Boot does not work on the +KD233 board due to the different wiring for the SD-Card mmc controller. As such, +the KD233 board can only be used by directly booting into Linux Kernel. + +buildroot can be configured to do so using the canaan_kd233_defconfig +configuration file. This configuration allows building a bootable kernel image +with a built-in initramfs root file system (the board SD card is not used). The +built kernel image can be flashed directly to the board ROM for direct booting. +No boot loader is required. + +Once booted, the on-board SD card can be used by Linux. + +The configuration file will also compile and install the kflash and +pyserial-miniterm host utilities to program bootable image files to the board +and open a serial terminal console. + +Direct Linux Kernel Boot +------------------------- + +Using the canaan_kd233_defconfig configuration, the bootable kernel binary image +is built as follows. + +``` +$ make canaan_kd233_defconfig +$ make +``` + +The bootable binary image is the output/images/loader.bin file. This image file +can be written to the board boot flash using the kflash utility. + +``` +$ output/host/bin/kflash -b 1500000 -p /dev/ttyUSB0 -t output/images/loader.bin +``` + +Once the kernel image file is fully programmed, a terminal console is open and +the board can be rebooted by pressing the reset button on the board (if it does +not reboot automatically). + +The output will be similar to the following. + +``` +[ 0.000000] Linux version 5.17.0 (foo@bar.com) (riscv64-buildroot-linux-uclibc-gcc.br_real (Buildroot 2022.02-560-g6a2b542a09-dirty) 10.3.0, GNU ld (GNU Binutils) 2.32) #2 SMP Thu Apr 21 16:40:44 JST 2022 +[ 0.000000] Machine model: Kendryte KD233 +[ 0.000000] earlycon: sifive0 at MMIO 0x0000000038000000 (options '115200n8') +[ 0.000000] printk: bootconsole [sifive0] enabled +[ 0.000000] Zone ranges: +[ 0.000000] DMA32 [mem 0x0000000080000000-0x00000000807fffff] +[ 0.000000] Normal empty +[ 0.000000] Movable zone start for each node +[ 0.000000] Early memory node ranges +[ 0.000000] node 0: [mem 0x0000000080000000-0x00000000807fffff] +[ 0.000000] Initmem setup node 0 [mem 0x0000000080000000-0x00000000807fffff] +[ 0.000000] riscv: ISA extensions acdfim +[ 0.000000] riscv: ELF capabilities acdfim +[ 0.000000] percpu: max_distance=0x16000 too large for vmalloc space 0x0 +[ 0.000000] percpu: Embedded 11 pages/cpu s15264 r0 d29792 u45056 +[ 0.000000] percpu: wasting 10 pages per chunk +[ 0.000000] Built 1 zonelists, mobility grouping off. Total pages: 2020 +[ 0.000000] Kernel command line: earlycon console=ttySIF0 +[ 0.000000] Dentry cache hash table entries: 1024 (order: 1, 8192 bytes, linear) +[ 0.000000] Inode-cache hash table entries: 512 (order: 0, 4096 bytes, linear) +[ 0.000000] mem auto-init: stack:off, heap alloc:off, heap free:off +[ 0.000000] Memory: 5984K/8192K available (964K kernel code, 137K rwdata, 205K rodata, 546K init, 66K bss, 2208K reserved, 0K cma-reserved) +[ 0.000000] rcu: Hierarchical RCU implementation. +[ 0.000000] rcu: RCU calculated value of scheduler-enlistment delay is 25 jiffies. +[ 0.000000] NR_IRQS: 64, nr_irqs: 64, preallocated irqs: 0 +[ 0.000000] riscv-intc: 64 local interrupts mapped +[ 0.000000] plic: interrupt-controller@c000000: mapped 65 interrupts with 2 handlers for 4 contexts. +[ 0.000000] k210-clk: clock-controller: CPU running at 390 MHz +[ 0.000000] clint: timer@2000000: timer running at 7800000 Hz +[ 0.000000] clocksource: clint_clocksource: mask: 0xffffffffffffffff max_cycles: 0x3990be68b, max_idle_ns: 881590404272 ns +[ 0.000001] sched_clock: 64 bits at 7MHz, resolution 128ns, wraps every 4398046511054ns +[ 0.008178] Calibrating delay loop (skipped), value calculated using timer frequency.. 15.60 BogoMIPS (lpj=31200) +[ 0.018251] pid_max: default: 4096 minimum: 301 +[ 0.022861] Mount-cache hash table entries: 512 (order: 0, 4096 bytes, linear) +[ 0.029971] Mountpoint-cache hash table entries: 512 (order: 0, 4096 bytes, linear) +[ 0.040234] rcu: Hierarchical SRCU implementation. +[ 0.045110] smp: Bringing up secondary CPUs ... +[ 0.050211] smp: Brought up 1 node, 2 CPUs +[ 0.054340] devtmpfs: initialized +[ 0.070401] clocksource: jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 7645041785100000 ns +[ 0.079473] pinctrl core: initialized pinctrl subsystem +[ 0.117795] clocksource: Switched to clocksource clint_clocksource +[ 0.130245] workingset: timestamp_bits=62 max_order=11 bucket_order=0 +[ 0.176925] k210-sysctl 50440000.syscon: K210 system controller +[ 0.192947] k210-rst 50440000.syscon:reset-controller: K210 reset controller +[ 0.200870] cacheinfo: Unable to detect cache hierarchy for CPU 0 +[ 0.210947] i2c_dev: i2c /dev entries driver +[ 0.220535] k210-fpioa 502b0000.pinmux: K210 FPIOA pin controller +[ 0.232253] 38000000.serial: ttySIF0 at MMIO 0x38000000 (irq = 1, base_baud = 115200) is a SiFive UART v0 +[ 0.241202] printk: console [ttySIF0] enabled +[ 0.241202] printk: console [ttySIF0] enabled +[ 0.249818] printk: bootconsole [sifive0] disabled +[ 0.249818] printk: bootconsole [sifive0] disabled +[ 0.261664] panel@0 enforce active low on chipselect handle +[ 0.275950] Freeing unused kernel image (initmem) memory: 540K +[ 0.281098] This architecture does not have kernel memory protection. +[ 0.287520] Run /init as init process + __ _ + / / (_) ____ _ _ __ __ + / / | || _ \ | | | |\ \/ / + / /___| || | | || |_| | > < + /_____/|_||_| |_| \____|/_/\_\ + 64-bits RISC-V Kendryte K210 NOMMU + +/ # +``` + +To open a terminal console without re-flashing the board, the pyserial-miniterm +host tool can be used. + +``` +$ output/host/bin/pyserial-miniterm --raw --eol=LF /dev/ttyUSB0 115200 +``` + +The options "--raw" and "--eol=LF" are added here to avoid a double carriage +return each time a command is entered. diff --git a/board/csky/gx6605s/gdbinit b/board/csky/gx6605s/gdbinit deleted file mode 100644 index d602aad46d5..00000000000 --- a/board/csky/gx6605s/gdbinit +++ /dev/null @@ -1,25 +0,0 @@ -tar jtag jtag://127.0.0.1:1025 -reset - -# setup CCR (Cache Config Reg) -# 0-1:MP,2:IE,3:DE,4:WB,5:RS,6:Z,7:BE -set $cr18 = 0x7d - -# vendor custom setup, double cache line & preload -set $cr30 = 0xc - -# pin mux for serial8250 -set *(unsigned int *) 0xa030a14c |= (1 << 22) | (1 << 23) - -# pass devicetree blob -# r2 is magic -# r3 is address -set $r2 = 0x20150401 -set $r3 = 0x92000000 -restore gx6605s.dtb binary 0x92000000 - -# flush cache -set $cr17 = 0x33 - -load - diff --git a/board/csky/gx6605s/gx6605s.dts b/board/csky/gx6605s/gx6605s.dts deleted file mode 100644 index e4d46f59a04..00000000000 --- a/board/csky/gx6605s/gx6605s.dts +++ /dev/null @@ -1,155 +0,0 @@ -/dts-v1/; -#include -#include - -/ { - model = "C-SKY gx6605s"; - compatible = "csky,gx6605s"; - #address-cells = <1>; - #size-cells = <1>; - - memory { - device_type = "memory"; - reg = <0x10000000 0x04000000>; - }; - - soc { - #address-cells = <1>; - #size-cells = <1>; - compatible = "simple-bus"; - ranges; - - dummy_apb: apb-clock { - compatible = "fixed-clock"; - clock-frequency = <27000000>; - clock-output-names = "dummy_apb"; - #clock-cells = <0>; - }; - - intc: interrupt-controller@500000 { - compatible = "csky,gx6605s-intc"; - reg = <0x00500000 0x400>; - interrupt-controller; - #interrupt-cells = <1>; - }; - - timer@20a000 { - compatible = "csky,gx6605s-timer"; - reg = <0x0020a000 0x400>; - clocks = <&dummy_apb>; - interrupts = <10>; - interrupt-parent = <&intc>; - }; - - ehci-hcd@900000 { - compatible = "generic-ehci"; - reg = <0x00900000 0x400>; - interrupt-parent = <&intc>; - interrupts = <59>; - }; - - ohci-hcd0@a00000 { - compatible = "generic-ohci"; - reg = <0x00a00000 0x400>; - interrupt-parent = <&intc>; - interrupts = <58>; - }; - - ohci-hcd1@b00000 { - compatible = "generic-ohci"; - reg = <0x00b00000 0x400>; - interrupt-parent = <&intc>; - interrupts = <57>; - }; - - serial@403000 { - compatible = "ns16550a"; - reg = <0x00403000 0x400>; - interrupt-parent = <&intc>; - interrupts = <15>; - clock-frequency = <29491200>; - baud = <115200>; - reg-shift = <2>; - reg-io-width = <1>; - }; - - gpio0: gpio@305000 { - compatible = "wd,mbl-gpio"; - reg-names = "dirout", "dat", "set", "clr"; - reg = <0x305000 4>, <0x305004 4>, <0x305008 4>, <0x30500c 4>; - bgpio-base = <0>; - #gpio-cells = <2>; - gpio-controller; - }; - - gpio_buttons { - compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; - poll-interval = <100>; - autorepeat; - - button0 { - label = "button8"; - linux,code = ; - gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; - }; - - button1 { - label = "button6"; - linux,code = ; - gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; - }; - - button2 { - label = "button5"; - linux,code = ; - gpios = <&gpio0 5 GPIO_ACTIVE_LOW>; - }; - - button3 { - label = "button9"; - linux,code = ; - gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; - }; - - button4 { - label = "button7"; - linux,code = ; - gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; - }; - }; - - gpio_leds { - compatible = "gpio-leds"; - - led0 { - label = "led10"; - gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; - linux,default-trigger = "heartbeat"; - }; - - led1 { - label = "led11"; - gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; - linux,default-trigger = "timer"; - }; - - led2 { - label = "led12"; - gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; - linux,default-trigger = "default-on"; - }; - - led3 { - label = "led13"; - gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; - linux,default-trigger = "default-on"; - }; - }; - }; - - chosen { - bootargs = "console=ttyS0,115200 init=/sbin/init root=/dev/sda2 rw rootwait"; - }; -}; diff --git a/board/csky/readme.txt b/board/csky/readme.txt deleted file mode 100644 index dc82dcc1d7a..00000000000 --- a/board/csky/readme.txt +++ /dev/null @@ -1,88 +0,0 @@ -C-SKY Development Kit - -Intro -===== - -C-SKY is a CPU Architecture from www.c-sky.com and has it own instruction set. -Just like arm and mips in linux/arch, it named as 'csky'. - -gx6605s develop board is made by Hangzhou Nationalchip and C-SKY. - -Hardware Spec: - * CPU: ck610 up to 594Mhz - * Integrate with 64MB ddr2 in SOC. - * Integrate with hardware Jtag. - * Integrate with usb-to-serial chip. - * USB ehci controller in SOC. - * Power Supply: DC 5V from two micro-usb. - -How to build it -=============== - -Configure Buildroot -------------------- - -The csky_gx6605s_defconfig configuration is a sample configuration with -all that is required to bring the gx6605s Development Board: - - $ make csky_gx6605s_defconfig - -Build everything ----------------- - -Note: you will need to have access to the network, since Buildroot will -download the packages' sources. - - $ make - -Result of the build -------------------- - -After building, you should obtain this tree: - - output/images/ - +-- vmlinux - +-- rootfs.ext2 - +-- .dtb - -How to run it -============= - -Prepare Jtag-Server -------------------- - - Download the Jtag-Server here: - - https://github.com/c-sky/tools/raw/master/DebugServerConsole-linux-x86_64-V4.2.00-20161213.tar.gz - - Go to the unpacked directory: - - $./DebugServerConsole -ddc -rstwait 1000 -prereset -port 1025 - - Perhaps you need to use "sudo", which need libusb to detect c510:b210 - - $ sudo ./DebugServerConsole -ddc -rstwait 1000 -prereset -port 1025 - -Prepare USB drive ------------------ - - You sould determine which device associated to the usb drive - carefully. eg: - - $ cat /proc/partitions - 8 48 1971712 sdd - 8 49 976720 sdd1 - - $ sudo dd if=rootfs.ext2 of=/dev/sdd1 - $ sudo sync - -Run ---- - - Plug the usb drive on gx6605s dev board. - - Setup the Console with the rate 115200/8-N-1. - - $ cd output/images - $ ../host/bin/csky-linux-gdb -x ../../board/csky/gx6605s/gdbinit vmlinux - diff --git a/board/firefly/roc-rk3399-pc/extlinux.conf b/board/firefly/roc-rk3399-pc/extlinux.conf deleted file mode 100644 index 50a358fadcc..00000000000 --- a/board/firefly/roc-rk3399-pc/extlinux.conf +++ /dev/null @@ -1,4 +0,0 @@ -label RK3399RocPC linux - kernel /boot/Image - devicetree /boot/rk3399-roc-pc.dtb - append earlycon=uart8250,mmio32,0xff1a0000 root=/dev/mmcblk0p1 rootwait diff --git a/board/firefly/roc-rk3399-pc/genimage.cfg b/board/firefly/roc-rk3399-pc/genimage.cfg deleted file mode 100644 index 966c869273f..00000000000 --- a/board/firefly/roc-rk3399-pc/genimage.cfg +++ /dev/null @@ -1,22 +0,0 @@ -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/firefly/roc-rk3399-pc/post-build.sh b/board/firefly/roc-rk3399-pc/post-build.sh deleted file mode 100755 index 1f5ff6a6113..00000000000 --- a/board/firefly/roc-rk3399-pc/post-build.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -BOARD_DIR="$(dirname $0)" - -install -m 0644 -D $BOARD_DIR/extlinux.conf $TARGET_DIR/boot/extlinux/extlinux.conf diff --git a/board/firefly/roc-rk3399-pc/readme.txt b/board/firefly/roc-rk3399-pc/readme.txt deleted file mode 100644 index 8a6f1cdee6b..00000000000 --- a/board/firefly/roc-rk3399-pc/readme.txt +++ /dev/null @@ -1,40 +0,0 @@ -Libre Computer Board ROC-RK3399-PC -=================================== - -Build: - - $ make roc_pc_rk3399_defconfig - $ make - -Files created in output directory -================================= - -output/images - -├── bl31.elf -├── idbloader.img -├── Image -├── rk3399-roc-pc.dtb -├── rootfs.ext2 -├── rootfs.ext4 -> rootfs.ext2 -├── rootfs.tar -├── sdcard.img -├── u-boot.bin -└── u-boot.itb - -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 - -Serial console --------------- - -Baudrate for this board is 1500000 - -Wiki link: -https://wiki.amarulasolutions.com/bsp/rockchip/rk3399/roc-rk3399-pc.html diff --git a/board/freescale/common/imx/imx8-bootloader-prepare.sh b/board/freescale/common/imx/imx8-bootloader-prepare.sh index 56f65e31262..ace0f6d6102 100755 --- a/board/freescale/common/imx/imx8-bootloader-prepare.sh +++ b/board/freescale/common/imx/imx8-bootloader-prepare.sh @@ -9,29 +9,49 @@ main () fi if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y$" ${BR2_CONFIG}; then - cat ${BINARIES_DIR}/u-boot-spl.bin ${BINARIES_DIR}/ddr_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin - BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot-nodtb.bin ATF_LOAD_ADDR=0x00910000 ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its + dd if=${BINARIES_DIR}/u-boot-spl.bin of=${BINARIES_DIR}/u-boot-spl-padded.bin bs=4 conv=sync + cat ${BINARIES_DIR}/u-boot-spl-padded.bin ${BINARIES_DIR}/ddr_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin + if grep -Eq "^BR2_TARGET_OPTEE_OS=y$" ${BR2_CONFIG}; then + BL31=${BINARIES_DIR}/bl31.bin BL32=${BINARIES_DIR}/tee.bin BL33=${BINARIES_DIR}/u-boot-nodtb.bin TEE_LOAD_ADDR=0xfe000000 ATF_LOAD_ADDR=0x00910000 ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its + else + BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot-nodtb.bin ATF_LOAD_ADDR=0x00910000 ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its + fi ${HOST_DIR}/bin/mkimage -E -p 0x3000 -f ${BINARIES_DIR}/u-boot.its ${BINARIES_DIR}/u-boot.itb rm -f ${BINARIES_DIR}/u-boot.its ${HOST_DIR}/bin/mkimage_imx8 -fit -signed_hdmi ${BINARIES_DIR}/signed_hdmi_imx8m.bin -loader ${BINARIES_DIR}/u-boot-spl-ddr.bin 0x7E1000 -second_loader ${BINARIES_DIR}/u-boot.itb 0x40200000 0x60000 -out ${BINARIES_DIR}/imx8-boot-sd.bin elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y$" ${BR2_CONFIG}; then - cat ${BINARIES_DIR}/u-boot-spl.bin ${BINARIES_DIR}/ddr_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin - BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot-nodtb.bin ATF_LOAD_ADDR=0x00920000 ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its + dd if=${BINARIES_DIR}/u-boot-spl.bin of=${BINARIES_DIR}/u-boot-spl-padded.bin bs=4 conv=sync + cat ${BINARIES_DIR}/u-boot-spl-padded.bin ${BINARIES_DIR}/ddr_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin + if grep -Eq "^BR2_TARGET_OPTEE_OS=y$" ${BR2_CONFIG}; then + BL31=${BINARIES_DIR}/bl31.bin BL32=${BINARIES_DIR}/tee.bin BL33=${BINARIES_DIR}/u-boot-nodtb.bin TEE_LOAD_ADDR=0xbe000000 ATF_LOAD_ADDR=0x00920000 ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its + else + BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot-nodtb.bin ATF_LOAD_ADDR=0x00920000 ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its + fi ${HOST_DIR}/bin/mkimage -E -p 0x3000 -f ${BINARIES_DIR}/u-boot.its ${BINARIES_DIR}/u-boot.itb rm -f ${BINARIES_DIR}/u-boot.its ${HOST_DIR}/bin/mkimage_imx8 -fit -loader ${BINARIES_DIR}/u-boot-spl-ddr.bin 0x7E1000 -second_loader ${BINARIES_DIR}/u-boot.itb 0x40200000 0x60000 -out ${BINARIES_DIR}/imx8-boot-sd.bin elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN=y$" ${BR2_CONFIG}; then - cat ${BINARIES_DIR}/u-boot-spl.bin ${BINARIES_DIR}/ddr_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin - BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot-nodtb.bin ATF_LOAD_ADDR=0x00960000 ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its + dd if=${BINARIES_DIR}/u-boot-spl.bin of=${BINARIES_DIR}/u-boot-spl-padded.bin bs=4 conv=sync + cat ${BINARIES_DIR}/u-boot-spl-padded.bin ${BINARIES_DIR}/ddr_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin + if grep -Eq "^BR2_TARGET_OPTEE_OS=y$" ${BR2_CONFIG}; then + BL31=${BINARIES_DIR}/bl31.bin BL32=${BINARIES_DIR}/tee.bin BL33=${BINARIES_DIR}/u-boot-nodtb.bin TEE_LOAD_ADDR=0x56000000 ATF_LOAD_ADDR=0x00960000 ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its + else + BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot-nodtb.bin ATF_LOAD_ADDR=0x00960000 ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its + fi ${HOST_DIR}/bin/mkimage -E -p 0x3000 -f ${BINARIES_DIR}/u-boot.its ${BINARIES_DIR}/u-boot.itb rm -f ${BINARIES_DIR}/u-boot.its ${HOST_DIR}/bin/mkimage_imx8 -v v2 -fit -loader ${BINARIES_DIR}/u-boot-spl-ddr.bin 0x912000 -second_loader ${BINARIES_DIR}/u-boot.itb 0x40200000 0x60000 -out ${BINARIES_DIR}/imx8-boot-sd.bin elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MP=y$" ${BR2_CONFIG}; then - cat ${BINARIES_DIR}/u-boot-spl.bin ${BINARIES_DIR}/ddr_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin - BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot-nodtb.bin ATF_LOAD_ADDR=0x00970000 ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its + dd if=${BINARIES_DIR}/u-boot-spl.bin of=${BINARIES_DIR}/u-boot-spl-padded.bin bs=4 conv=sync + cat ${BINARIES_DIR}/u-boot-spl-padded.bin ${BINARIES_DIR}/ddr_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin + if grep -Eq "^BR2_TARGET_OPTEE_OS=y$" ${BR2_CONFIG}; then + BL31=${BINARIES_DIR}/bl31.bin BL32=${BINARIES_DIR}/tee.bin BL33=${BINARIES_DIR}/u-boot-nodtb.bin TEE_LOAD_ADDR=0x56000000 ATF_LOAD_ADDR=0x00970000 ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its + else + BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot-nodtb.bin ATF_LOAD_ADDR=0x00970000 ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its + fi ${HOST_DIR}/bin/mkimage -E -p 0x3000 -f ${BINARIES_DIR}/u-boot.its ${BINARIES_DIR}/u-boot.itb rm -f ${BINARIES_DIR}/u-boot.its diff --git a/board/freescale/imx28evk/readme.txt b/board/freescale/imx28evk/readme.txt index 2920cb04cd0..3b77634fe11 100644 --- a/board/freescale/imx28evk/readme.txt +++ b/board/freescale/imx28evk/readme.txt @@ -54,4 +54,4 @@ Enjoy! References ========== -[1] http://cache.freescale.com/files/32bit/doc/user_guide/EVK_imx28_QuickStart.pdf +[1] https://www.nxp.com/docs/en/user-guide/EVK_imx28_QuickStart.pdf diff --git a/board/freescale/imx6sabre/readme.txt b/board/freescale/imx6sabre/readme.txt index 4b8db5233a9..320ee463e20 100644 --- a/board/freescale/imx6sabre/readme.txt +++ b/board/freescale/imx6sabre/readme.txt @@ -8,15 +8,15 @@ as well as the Freescale SABRE Board for Automotive Infotainment. Read the i.MX 6 SABRESD Quick Start Guide for an introduction to the board: -http://cache.freescale.com/files/32bit/doc/quick_start_guide/SABRESDB_IMX6_QSG.pdf +https://www.nxp.com/files-static/32bit/doc/quick_start_guide/SABRESDB_IMX6_QSG.pdf Read the i.MX 6 SoloX SABRESD Quick Start Guide for an introduction to the board: -http://cache.freescale.com/files/32bit/doc/user_guide/IMX6SOLOXQSG.pdf +https://www.nxp.com/files-static/32bit/doc/quick_start_guide/IMX6SOLOXQSG.pdf Read the SABRE for Automotive Infotainment Quick Start Guide for an introduction to the board: -http://cache.freescale.com/files/32bit/doc/user_guide/IMX6SABREINFOQSG.pdf +https://www.nxp.com/webapp/Download?colCode=IMX6SABREINFOQSG Building with NXP kernel and NXP U-Boot ======================================= @@ -166,6 +166,6 @@ Enjoy! References ========== -https://community.freescale.com/docs/DOC-95015 -https://community.freescale.com/docs/DOC-95017 -https://community.freescale.com/docs/DOC-99218 +https://community.nxp.com/docs/DOC-95015 +https://community.nxp.com/docs/DOC-95017 +https://community.nxp.com/docs/DOC-99218 diff --git a/board/freescale/imx6ulevk/readme.txt b/board/freescale/imx6ulevk/readme.txt index 90355f354f1..5a5b4ae5a37 100644 --- a/board/freescale/imx6ulevk/readme.txt +++ b/board/freescale/imx6ulevk/readme.txt @@ -12,7 +12,7 @@ Build First, configure Buildroot for your i.MX6UL EVK board: -In order to to do so there are two supported options: +In order to do so there are two supported options: make freescale_imx6ulevk_defconfig @@ -71,4 +71,4 @@ Enjoy! References ========== -[1] http://cache.freescale.com/files/32bit/doc/quick_start_guide/IMX6ULTRALITEQSG.pdf +[1] https://www.nxp.com/webapp/Download?colCode=IMX6ULTRALITEQSG diff --git a/board/freescale/imx6ullevk/readme.txt b/board/freescale/imx6ullevk/readme.txt index 77acec26158..dc7c5f3678f 100644 --- a/board/freescale/imx6ullevk/readme.txt +++ b/board/freescale/imx6ullevk/readme.txt @@ -9,7 +9,7 @@ Build First, configure Buildroot for your i.MX6ULL EVK board: -In order to to do so there are two supported options: +In order to do so there are two supported options: make freescale_imx6ullevk_defconfig diff --git a/board/freescale/ls1028ardb/genimage.cfg b/board/freescale/ls1028ardb/genimage.cfg new file mode 100644 index 00000000000..3efef0bffcc --- /dev/null +++ b/board/freescale/ls1028ardb/genimage.cfg @@ -0,0 +1,23 @@ +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 rootfs { + offset = 8M + partition-type = 0x83 + bootable = "true" + image = "rootfs.ext4" + } +} diff --git a/board/freescale/ls1028ardb/readme.txt b/board/freescale/ls1028ardb/readme.txt new file mode 100644 index 00000000000..cfd1c8c4906 --- /dev/null +++ b/board/freescale/ls1028ardb/readme.txt @@ -0,0 +1,87 @@ +************** +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: + - 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 + +the components from NXP are: + - rcw, LSDK 21.08 + - atf (fork), LSDK 21.08 + - uboot (fork), LSDK 21.08 + - cadence-dp-firmware (blob), LSDK 20.12 + - linux (fork), LSDK 21.08 + +Build +===== + +First, configure Buildroot for the LS1028ARDB board: + + make ls1028ardb_defconfig + +Build all components: + + make + +You will find in output/images/ the following files: + - bl2_sd.pbl + - fip.bin + - fsl-ls1028a-rdb.dtb + - Image + - PBL.bin + - rootfs.ext2 + - rootfs.ext4 -> rootfs.ext2 + - 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/ls1028ardb/genimage.cfg. + +Boot the LS1028ARDB board +========================= + +To boot your newly created system: +- insert the SD card in the SD slot of the board; +- Configure the switches SW2[1:4] = 1000 (select SD Card boot option) +- put a DB9F cable into the UART1 Port and connect using a terminal + emulator at 115200 bps, 8n1; +- power on the board. + +The Cadence DP (Display Port) firmware must loaded from uboot with the following commands: + + => ext2load mmc 0 0x80000000 /boot/ls1028a-dp-fw.bin + 102464 bytes read in 24 ms (4.1 MiB/s) + => hdp load 0x80000000 0x2000 + Loading hdp firmware from 0x0000000080000000 offset 0x0000000000002000 + Loading hdp firmware Complete + => boot + +The interfaces of Ethernet switch (Felix DSA) are bring up with the following commands: + + ip link set eno2 up + ip link set swp0 up + ip link set swp1 up + ip link set swp2 up + ip link set swp3 up diff --git a/board/freescale/ls1028ardb/rootfs_overlay/boot/extlinux/extlinux.conf b/board/freescale/ls1028ardb/rootfs_overlay/boot/extlinux/extlinux.conf new file mode 100644 index 00000000000..bd6c7c95c3d --- /dev/null +++ b/board/freescale/ls1028ardb/rootfs_overlay/boot/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +label ls1028ardb-buildroot + kernel /boot/Image + devicetree /boot/fsl-ls1028a-rdb.dtb + append root=/dev/mmcblk0p1 rootwait video=1920x1080-32@60 cma=256M diff --git a/board/freescale/ls1028ardb/rootfs_overlay/etc/udev/rules.d/73-fsl-enetc-networking.rules b/board/freescale/ls1028ardb/rootfs_overlay/etc/udev/rules.d/73-fsl-enetc-networking.rules new file mode 100644 index 00000000000..19f41634bd3 --- /dev/null +++ b/board/freescale/ls1028ardb/rootfs_overlay/etc/udev/rules.d/73-fsl-enetc-networking.rules @@ -0,0 +1,16 @@ +# ENETC rules +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.0", DRIVERS=="fsl_enetc", NAME:="eno0" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.1", DRIVERS=="fsl_enetc", NAME:="eno1" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.2", DRIVERS=="fsl_enetc", NAME:="eno2" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.6", DRIVERS=="fsl_enetc", NAME:="eno3" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:01.0", DRIVERS=="fsl_enetc_vf", NAME:="eno0vf0" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:01.1", DRIVERS=="fsl_enetc_vf", NAME:="eno0vf1" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:01.2", DRIVERS=="fsl_enetc_vf", NAME:="eno1vf0" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:01.3", DRIVERS=="fsl_enetc_vf", NAME:="eno1vf1" +# LS1028 switch rules +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.5", DRIVERS=="mscc_felix", ATTR{phys_port_name}=="p0", NAME="swp0" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.5", DRIVERS=="mscc_felix", ATTR{phys_port_name}=="p1", NAME="swp1" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.5", DRIVERS=="mscc_felix", ATTR{phys_port_name}=="p2", NAME="swp2" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.5", DRIVERS=="mscc_felix", ATTR{phys_port_name}=="p3", NAME="swp3" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.5", DRIVERS=="mscc_felix", ATTR{phys_port_name}=="p4", NAME="swp4" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:00:00.5", DRIVERS=="mscc_felix", ATTR{phys_port_name}=="p5", NAME="swp5" diff --git a/board/friendlyarm/nanopc-t4/extlinux.conf b/board/friendlyarm/nanopc-t4/extlinux.conf deleted file mode 100644 index 31c6b30d327..00000000000 --- a/board/friendlyarm/nanopc-t4/extlinux.conf +++ /dev/null @@ -1,4 +0,0 @@ -label RK3399_NanoPC_T4 linux - kernel /Image - devicetree /rk3399-nanopc-t4.dtb - append earlycon=uart8250,mmio32,0xff1a0000 root=/dev/mmcblk1p4 rootwait diff --git a/board/friendlyarm/nanopc-t4/genimage.cfg b/board/friendlyarm/nanopc-t4/genimage.cfg deleted file mode 100644 index 98dc2f38925..00000000000 --- a/board/friendlyarm/nanopc-t4/genimage.cfg +++ /dev/null @@ -1,39 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "rk3399-nanopc-t4.dtb", - "extlinux" - } - } - - size = 64M -} - -image sdcard.img { - hdimage { - partition-table-type = "gpt" - } - - partition loader1 { - image = "idbloader.img" - offset = 32K - } - - partition loader2 { - image = "u-boot.itb" - offset = 8M - } - - partition boot { - partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b - bootable = "true" - image = "boot.vfat" - offset = 16M - } - - partition rootfs { - partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae - image = "rootfs.ext4" - } -} diff --git a/board/friendlyarm/nanopc-t4/post-build.sh b/board/friendlyarm/nanopc-t4/post-build.sh deleted file mode 100755 index ba29375c05e..00000000000 --- a/board/friendlyarm/nanopc-t4/post-build.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -BOARD_DIR="$(dirname $0)" - -install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf diff --git a/board/friendlyarm/nanopc-t4/readme.txt b/board/friendlyarm/nanopc-t4/readme.txt deleted file mode 100644 index 0989c6cc1ed..00000000000 --- a/board/friendlyarm/nanopc-t4/readme.txt +++ /dev/null @@ -1,45 +0,0 @@ -FriendlyARM NANOPC-T4 -===================== - -Build: - - $ make friendlyarm_nanopc_t4_defconfig - $ make - -Files created in output directory -================================= - -output/images - -├── bl31.elf -├── boot.vfat -├── extlinux -├── idbloader.img -├── Image -├── rk3399-nanopc-t4.dtb -├── rootfs.ext2 -├── rootfs.ext4 -> rootfs.ext2 -├── rootfs.tar -├── sdcard.img -├── u-boot.bin -└── u-boot.itb - -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 - -Serial console --------------- - -Baudrate for this board is 1500000 - -Login: ------- -Apply power and press the PWR button for 3 sec. Enter 'root' as login user, and the prompt is ready. - -https://wiki.amarulasolutions.com/bsp/rockchip/rk3399/npc_t4.html diff --git a/board/friendlyarm/nanopi-a64/boot.cmd b/board/friendlyarm/nanopi-a64/boot.cmd deleted file mode 100644 index 446bd856723..00000000000 --- a/board/friendlyarm/nanopi-a64/boot.cmd +++ /dev/null @@ -1,6 +0,0 @@ -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r Image -fatload mmc 0 $fdt_addr_r sun50i-a64-nanopi-a64.dtb - -booti $kernel_addr_r - $fdt_addr_r diff --git a/board/friendlyarm/nanopi-a64/genimage.cfg b/board/friendlyarm/nanopi-a64/genimage.cfg deleted file mode 100644 index 6907314149d..00000000000 --- a/board/friendlyarm/nanopi-a64/genimage.cfg +++ /dev/null @@ -1,40 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "sun50i-a64-nanopi-a64.dtb", - "boot.scr" - } - } - - size = 64M -} - -image sdcard.img { - hdimage { - } - - partition spl { - in-partition-table = "no" - image = "sunxi-spl.bin" - offset = 8K - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot.itb" - offset = 40K - size = 1M # 1MB - 40KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/board/friendlyarm/nanopi-a64/readme.txt b/board/friendlyarm/nanopi-a64/readme.txt deleted file mode 100644 index 88c4e661cb8..00000000000 --- a/board/friendlyarm/nanopi-a64/readme.txt +++ /dev/null @@ -1,37 +0,0 @@ -Intro -===== - -This default configuration will allow you to start experimenting with the -buildroot environment for the Nanopi A64. With the current configuration -it will bring-up the board, and allow access through the serial console. - -Nanopi A64 link: -http://nanopi.io/nanopi-a64.html - -Wiki link: -https://openedev.amarulasolutions.com/display/ODWIKI/FriendlyARM+Nanopi+A64 - -This configuration uses U-Boot mainline and kernel mainline. - -How to build -============ - - $ make friendlyarm_nanopi_a64_defconfig - $ make - -Note: you will need access to the internet to download the required -sources. - -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 Nanopi A64 and power it up. The console -is on the serial line, 115200 8N1. diff --git a/board/friendlyarm/nanopi-m1-plus/boot.cmd b/board/friendlyarm/nanopi-m1-plus/boot.cmd deleted file mode 100644 index 35a1d65d3dd..00000000000 --- a/board/friendlyarm/nanopi-m1-plus/boot.cmd +++ /dev/null @@ -1,8 +0,0 @@ -setenv fdt_high ffffffff - -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun8i-h3-nanopi-m1-plus.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/friendlyarm/nanopi-m1-plus/genimage.cfg b/board/friendlyarm/nanopi-m1-plus/genimage.cfg deleted file mode 100644 index 5257cf89c78..00000000000 --- a/board/friendlyarm/nanopi-m1-plus/genimage.cfg +++ /dev/null @@ -1,36 +0,0 @@ -# Minimal SD card image for the NanoPi M1 Plus -# -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-h3-nanopi-m1-plus.dtb", - "boot.scr" - } - } - - size = 10M -} - -image sdcard.img { - hdimage { - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot-sunxi-with-spl.bin" - offset = 8K - size = 1016K # 1MB - 8KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/board/friendlyarm/nanopi-m1-plus/readme.txt b/board/friendlyarm/nanopi-m1-plus/readme.txt deleted file mode 100644 index 0327dec80e7..00000000000 --- a/board/friendlyarm/nanopi-m1-plus/readme.txt +++ /dev/null @@ -1,29 +0,0 @@ -NanoPi M1 Plus - -Intro -===== - -This default configuration will allow you to start experimenting with the -buildroot environment for the NanoPi M1 Plus. With the current configuration -it will bring-up the board, and allow access through the serial console. - -How to build it -=============== - -Configure Buildroot: - - $ make friendlyarm_nanopi_m1_plus_defconfig - -Compile everything and build the SD card image: - - $ 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 diff --git a/board/friendlyarm/nanopi-m1/boot.cmd b/board/friendlyarm/nanopi-m1/boot.cmd deleted file mode 100644 index b4d612ede74..00000000000 --- a/board/friendlyarm/nanopi-m1/boot.cmd +++ /dev/null @@ -1,8 +0,0 @@ -setenv fdt_high ffffffff - -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun8i-h3-nanopi-m1.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/friendlyarm/nanopi-m1/genimage.cfg b/board/friendlyarm/nanopi-m1/genimage.cfg deleted file mode 100644 index 3b2b82ce968..00000000000 --- a/board/friendlyarm/nanopi-m1/genimage.cfg +++ /dev/null @@ -1,37 +0,0 @@ -# Minimal SD card image for the NanoPi M1 -# -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-h3-nanopi-m1.dtb", - "boot.scr" - } - } - - size = 10M -} - -image sdcard.img { - hdimage { - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot-sunxi-with-spl.bin" - offset = 8K - 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/friendlyarm/nanopi-m1/readme.txt b/board/friendlyarm/nanopi-m1/readme.txt deleted file mode 100644 index 6a34c4239d1..00000000000 --- a/board/friendlyarm/nanopi-m1/readme.txt +++ /dev/null @@ -1,29 +0,0 @@ -NanoPi M1 - -Intro -===== - -This default configuration will allow you to start experimenting with the -buildroot environment for the NanoPi M1. With the current configuration -it will bring-up the board, and allow access through the serial console. - -How to build it -=============== - -Configure Buildroot: - - $ make friendlyarm_nanopi_m1_defconfig - -Compile everything and build the SD card image: - - $ 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 diff --git a/board/friendlyarm/nanopi-m4/extlinux.conf b/board/friendlyarm/nanopi-m4/extlinux.conf deleted file mode 100644 index fb24f09eb1e..00000000000 --- a/board/friendlyarm/nanopi-m4/extlinux.conf +++ /dev/null @@ -1,4 +0,0 @@ -label RK3399_NANOPI_M4 linux - kernel /Image - devicetree /rk3399-nanopi-m4.dtb - append earlycon=uart8250,mmio32,0xff1a0000 root=/dev/mmcblk1p4 rw rootwait diff --git a/board/friendlyarm/nanopi-m4/genimage.cfg b/board/friendlyarm/nanopi-m4/genimage.cfg deleted file mode 100644 index 8d0e6ad13bd..00000000000 --- a/board/friendlyarm/nanopi-m4/genimage.cfg +++ /dev/null @@ -1,39 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "rk3399-nanopi-m4.dtb", - "extlinux" - } - } - - size = 64M -} - -image sdcard.img { - hdimage { - partition-table-type = "gpt" - } - - partition loader1 { - image = "idbloader.img" - offset = 32K - } - - partition loader2 { - image = "u-boot.itb" - offset = 8M - } - - partition boot { - partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b - bootable = "true" - image = "boot.vfat" - offset = 16M - } - - partition rootfs { - partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae - image = "rootfs.ext4" - } -} diff --git a/board/friendlyarm/nanopi-m4/post-build.sh b/board/friendlyarm/nanopi-m4/post-build.sh deleted file mode 100755 index ba29375c05e..00000000000 --- a/board/friendlyarm/nanopi-m4/post-build.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -BOARD_DIR="$(dirname $0)" - -install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf diff --git a/board/friendlyarm/nanopi-m4/readme.txt b/board/friendlyarm/nanopi-m4/readme.txt deleted file mode 100644 index 0553bf8377a..00000000000 --- a/board/friendlyarm/nanopi-m4/readme.txt +++ /dev/null @@ -1,45 +0,0 @@ -FriendlyARM NANOPI-M4 -===================== - -Build: - - $ make friendlyarm_nanopi_m4_defconfig - $ make - -Files created in output directory -================================= - -output/images - -├── bl31.elf -├── boot.vfat -├── extlinux -├── idbloader.img -├── Image -├── rk3399-nanopi-m4.dtb -├── rootfs.ext2 -├── rootfs.ext4 -> rootfs.ext2 -├── rootfs.tar -├── sdcard.img -├── u-boot.bin -└── u-boot.itb - -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 - -Serial console --------------- - -Baudrate for this board is 1500000 - -Login: ------- -Enter 'root' as login user, and the prompt is ready. - -https://wiki.amarulasolutions.com/bsp/rockchip/rk3399/nanopi_m4.html diff --git a/board/friendlyarm/nanopi-neo-plus2/extlinux.conf b/board/friendlyarm/nanopi-neo-plus2/extlinux.conf deleted file mode 100644 index fcb6f632c1c..00000000000 --- a/board/friendlyarm/nanopi-neo-plus2/extlinux.conf +++ /dev/null @@ -1,4 +0,0 @@ -label linux - kernel /Image - devicetree /sun50i-h5-nanopi-neo-plus2.dtb - append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait diff --git a/board/friendlyarm/nanopi-neo-plus2/genimage.cfg b/board/friendlyarm/nanopi-neo-plus2/genimage.cfg deleted file mode 100644 index 9000201399d..00000000000 --- a/board/friendlyarm/nanopi-neo-plus2/genimage.cfg +++ /dev/null @@ -1,40 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "sun50i-h5-nanopi-neo-plus2.dtb", - "extlinux" - } - } - - size = 64M -} - -image sdcard.img { - hdimage { - } - - partition spl { - in-partition-table = "no" - image = "sunxi-spl.bin" - offset = 8K - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot.itb" - offset = 40K - size = 1M # 1MB - 40KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/board/friendlyarm/nanopi-neo-plus2/linux-extras.config b/board/friendlyarm/nanopi-neo-plus2/linux-extras.config deleted file mode 100644 index 52b4b4b29e1..00000000000 --- a/board/friendlyarm/nanopi-neo-plus2/linux-extras.config +++ /dev/null @@ -1,10 +0,0 @@ -# wireless core -CONFIG_WIRELESS=y -CONFIG_CFG80211=y -CONFIG_MAC80211=y -CONFIG_CFG80211_WEXT=y - -# wireless drivers -CONFIG_WLAN=y -CONFIG_WLAN_VENDOR_BROADCOM=y -CONFIG_BRCMFMAC=m diff --git a/board/friendlyarm/nanopi-neo-plus2/post-build.sh b/board/friendlyarm/nanopi-neo-plus2/post-build.sh deleted file mode 100755 index ec20fca7d96..00000000000 --- a/board/friendlyarm/nanopi-neo-plus2/post-build.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -BOARD_DIR="$(dirname $0)" - -install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf diff --git a/board/friendlyarm/nanopi-neo-plus2/readme.txt b/board/friendlyarm/nanopi-neo-plus2/readme.txt deleted file mode 100644 index ae59952029d..00000000000 --- a/board/friendlyarm/nanopi-neo-plus2/readme.txt +++ /dev/null @@ -1,37 +0,0 @@ -Intro -===== - -This default configuration will allow you to start experimenting with the -buildroot environment for the Nanopi NEO Plus2. With the current configuration -it will bring-up the board, and allow access through the serial console. - -Nanopi NEO2 link: -http://nanopi.io/nanopi-neo-plus2.html - -Wiki link: -http://wiki.friendlyarm.com/wiki/index.php/NanoPi_NEO_Plus2 - -This configuration uses U-Boot mainline and kernel mainline. - -How to build -============ - - $ make friendlyarm_nanopi_neo_plus2_defconfig - $ make - -Note: you will need access to the internet to download the required -sources. - -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 Nanopi NEO Plus2 and power it up. The console -is on the serial line, 115200 8N1. diff --git a/board/friendlyarm/nanopi-neo-plus2/rootfs_overlay/lib/firmware/brcm/brcmfmac43430-sdio.friendlyarm,nanopi-neo-plus2.txt b/board/friendlyarm/nanopi-neo-plus2/rootfs_overlay/lib/firmware/brcm/brcmfmac43430-sdio.friendlyarm,nanopi-neo-plus2.txt deleted file mode 100644 index 740d172eb5d..00000000000 --- a/board/friendlyarm/nanopi-neo-plus2/rootfs_overlay/lib/firmware/brcm/brcmfmac43430-sdio.friendlyarm,nanopi-neo-plus2.txt +++ /dev/null @@ -1,53 +0,0 @@ -#AP6212_NVRAM_V1.0.1_20160606 -# 2.4 GHz, 20 MHz BW mode -# The following parameter values are just placeholders, need to be updated. -manfid=0x2d0 -prodid=0x0726 -vendid=0x14e4 -devid=0x43e2 -boardtype=0x0726 -boardrev=0x1101 -boardnum=22 -macaddr=00:90:4c:c5:12:38 -sromrev=11 -boardflags=0x00404201 -xtalfreq=26000 -nocrc=1 -ag0=255 -aa2g=1 -ccode=ALL - -pa0itssit=0x20 -extpagain2g=0 - -#PA parameters for 2.4GHz, measured at CHIP OUTPUT -pa2ga0=-168,7161,-820 -AvVmid_c0=0x0,0xc8 -cckpwroffset0=5 - -# PPR params -maxp2ga0=90 -txpwrbckof=6 -cckbw202gpo=0x5555 -legofdmbw202gpo=0x77777777 -mcsbw202gpo=0xaaaaaaaa - -# OFDM IIR : -ofdmdigfilttype=7 -# PAPD mode: -papdmode=2 - -il0macaddr=00:90:4c:c5:12:38 -wl0id=0x431b - -#OOB parameters -hostwake=0x40 -hostrdy=0x41 -usbrdy=0x03 -usbrdydelay=100 -deadman_to=0xffffffff -# muxenab: 0x1 for UART enable, 0x10 for Host awake -muxenab=0x10 -# CLDO PWM voltage settings - 0x4 - 1.1 volt -#cldo_pwm=0x4 -glitch_based_crsmin=1 diff --git a/board/friendlyarm/nanopi-neo/boot.cmd b/board/friendlyarm/nanopi-neo/boot.cmd deleted file mode 100644 index 7874057859c..00000000000 --- a/board/friendlyarm/nanopi-neo/boot.cmd +++ /dev/null @@ -1,8 +0,0 @@ -setenv fdt_high ffffffff - -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun8i-h3-nanopi-neo.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/friendlyarm/nanopi-neo/genimage.cfg b/board/friendlyarm/nanopi-neo/genimage.cfg deleted file mode 100644 index 92af6675525..00000000000 --- a/board/friendlyarm/nanopi-neo/genimage.cfg +++ /dev/null @@ -1,34 +0,0 @@ -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-h3-nanopi-neo.dtb", - "boot.scr" - } - } - - size = 10M -} - -image sdcard.img { - hdimage { - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot-sunxi-with-spl.bin" - offset = 8K - size = 1016K # 1MB - 8KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/board/friendlyarm/nanopi-neo/readme.txt b/board/friendlyarm/nanopi-neo/readme.txt deleted file mode 100644 index 84fb9cc484e..00000000000 --- a/board/friendlyarm/nanopi-neo/readme.txt +++ /dev/null @@ -1,42 +0,0 @@ -Intro -===== - -The instructions herein are valid for the FriendlyARM NanoPi NEO, -both the 256MiB and 512MiB versions. They should also work for the -NanoPi NEO Air, but this is untested so far. - -The FriendlyARM Nanopi NEO is a 4x4cm² board with an Allwiner H3 SoC: - - quad-core Cortex-A7 @1.2GHz - - 256 or 512MiB of DDR - - uSDCard as only storage option - - 3x USB 2.0 host (one socket, two on expansion pin-holes) - - 1x USB 2.0 OTG (also used as power source) - - 10/100 ethernet MAC - - GPIOs, SPI, I2c... - -Support for the Nanopi NEO in U-Boot and Linux is very recent, so only -core, basic features are available. - -Unfortunately, support for the ethernet MAC and the USB OTG are not -yet upstream, but are being actively worked on. - - -How to build -============ - - $ make friendlyarm_nanopi_neo_defconfig - $ make - -Note: you will need access to the internet to download the required -sources. - -You will then obtain an image ready to be written to your micro SDcard: - - $ dd if=output/images/sdcard.img of=/dev/sdX bs=1M - -Notes: - - replace 'sdX' with the actual device with your micro SDcard, - - you may need to be root to do that (use 'sudo'). - -Insert the micro SDcard in your NanoPi NEO and power it up. The console -is on the serial line, 115200 8N1. diff --git a/board/friendlyarm/nanopi-neo2/boot.cmd b/board/friendlyarm/nanopi-neo2/boot.cmd deleted file mode 100644 index 9a39f4afc92..00000000000 --- a/board/friendlyarm/nanopi-neo2/boot.cmd +++ /dev/null @@ -1,6 +0,0 @@ -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r Image -fatload mmc 0 $fdt_addr_r sun50i-h5-nanopi-neo2.dtb - -booti $kernel_addr_r - $fdt_addr_r diff --git a/board/friendlyarm/nanopi-neo2/genimage.cfg b/board/friendlyarm/nanopi-neo2/genimage.cfg deleted file mode 100644 index 3163a065923..00000000000 --- a/board/friendlyarm/nanopi-neo2/genimage.cfg +++ /dev/null @@ -1,40 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "sun50i-h5-nanopi-neo2.dtb", - "boot.scr" - } - } - - size = 64M -} - -image sdcard.img { - hdimage { - } - - partition spl { - in-partition-table = "no" - image = "sunxi-spl.bin" - offset = 8K - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot.itb" - offset = 40K - size = 1M # 1MB - 40KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/board/friendlyarm/nanopi-neo2/readme.txt b/board/friendlyarm/nanopi-neo2/readme.txt deleted file mode 100644 index 0f445e2beaa..00000000000 --- a/board/friendlyarm/nanopi-neo2/readme.txt +++ /dev/null @@ -1,37 +0,0 @@ -Intro -===== - -This default configuration will allow you to start experimenting with the -buildroot environment for the Nanopi NEO2. With the current configuration -it will bring-up the board, and allow access through the serial console. - -Nanopi NEO2 link: -http://nanopi.io/nanopi-neo2.html - -Wiki link: -https://openedev.amarulasolutions.com/display/ODWIKI/FriendlyARM+NanoPi+NEO2 - -This configuration uses U-Boot mainline and kernel mainline. - -How to build -============ - - $ make friendlyarm_nanopi_neo2_defconfig - $ make - -Note: you will need access to the internet to download the required -sources. - -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 Nanopi NEO2 and power it up. The console -is on the serial line, 115200 8N1. diff --git a/board/friendlyarm/nanopi-neo4/extlinux.conf b/board/friendlyarm/nanopi-neo4/extlinux.conf deleted file mode 100644 index 91eef67fb9a..00000000000 --- a/board/friendlyarm/nanopi-neo4/extlinux.conf +++ /dev/null @@ -1,4 +0,0 @@ -label NanoPi Neo4 linux - kernel /boot/Image - devicetree /boot/rk3399-nanopi-neo4.dtb - append earlycon=uart8250,mmio32,0xff1a0000 root=/dev/mmcblk1p1 rootwait diff --git a/board/friendlyarm/nanopi-neo4/genimage.cfg b/board/friendlyarm/nanopi-neo4/genimage.cfg deleted file mode 100644 index 966c869273f..00000000000 --- a/board/friendlyarm/nanopi-neo4/genimage.cfg +++ /dev/null @@ -1,22 +0,0 @@ -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/friendlyarm/nanopi-neo4/post-build.sh b/board/friendlyarm/nanopi-neo4/post-build.sh deleted file mode 100755 index 1f5ff6a6113..00000000000 --- a/board/friendlyarm/nanopi-neo4/post-build.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -BOARD_DIR="$(dirname $0)" - -install -m 0644 -D $BOARD_DIR/extlinux.conf $TARGET_DIR/boot/extlinux/extlinux.conf diff --git a/board/friendlyarm/nanopi-neo4/readme.txt b/board/friendlyarm/nanopi-neo4/readme.txt deleted file mode 100644 index 7c04a52806a..00000000000 --- a/board/friendlyarm/nanopi-neo4/readme.txt +++ /dev/null @@ -1,53 +0,0 @@ -Intro -===== - -NanoPi Neo4 is a RK3399 SoC based ARM64 board. - - -Official wiki: http://wiki.friendlyarm.com/wiki/index.php/NanoPi_NEO4 -Mainline wiki: https://wiki.amarulasolutions.com/bsp/rockchip/rk3399/neo4.html - -Build -===== - -Run NanoPi Neo4 configuration - - $ make friendlyarm_nanopi_neo4_defconfig - -To build, run make comamnd. - - $ make - -Files created in output directory -================================= - -output/images - -├── bl31.bin -├── bl31.elf -├── Image -├── rk3399-nanopi-neo4.dtb -├── rootfs.ext2 -├── rootfs.ext4 -> rootfs.ext2 -├── rootfs.tar -├── sdcard.img -├── u-boot.bin -├── u-boot.itb -├── u-boot-spl-dtb.bin -├── u-boot-tpl-dtb.bin -├── u-boot-tpl-dtb.img -└── u-boot-tpl-spl-dtb.img - -Creating bootable SD card: -========================= - -Simply invoke (as root) - - # dd if=output/images/sdcard.img of=/dev/sdX && sync - -Where X is your SD card device - -Serial console --------------- - -Baudrate for this board is 1500000 diff --git a/board/friendlyarm/nanopi-r1/boot.cmd b/board/friendlyarm/nanopi-r1/boot.cmd deleted file mode 100644 index 9f0cdbfe51f..00000000000 --- a/board/friendlyarm/nanopi-r1/boot.cmd +++ /dev/null @@ -1,8 +0,0 @@ -setenv fdt_high ffffffff - -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun8i-h3-nanopi-r1.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/friendlyarm/nanopi-r1/genimage.cfg b/board/friendlyarm/nanopi-r1/genimage.cfg deleted file mode 100644 index a180311cae9..00000000000 --- a/board/friendlyarm/nanopi-r1/genimage.cfg +++ /dev/null @@ -1,37 +0,0 @@ -# Minimal SD card image for the NanoPi M1 -# -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-h3-nanopi-r1.dtb", - "boot.scr" - } - } - - size = 10M -} - -image sdcard.img { - hdimage { - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot-sunxi-with-spl.bin" - offset = 8K - 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/friendlyarm/nanopi-r1/kernel/linux-extras.config b/board/friendlyarm/nanopi-r1/kernel/linux-extras.config deleted file mode 100644 index 206b3810a7f..00000000000 --- a/board/friendlyarm/nanopi-r1/kernel/linux-extras.config +++ /dev/null @@ -1,2 +0,0 @@ -# USB ethernet -CONFIG_USB_RTL8152=y diff --git a/board/friendlyarm/nanopi-r1/kernel/sun8i-h3-nanopi-r1.dts b/board/friendlyarm/nanopi-r1/kernel/sun8i-h3-nanopi-r1.dts deleted file mode 100644 index ca15a57beec..00000000000 --- a/board/friendlyarm/nanopi-r1/kernel/sun8i-h3-nanopi-r1.dts +++ /dev/null @@ -1,170 +0,0 @@ -/* - * Copyright (C) 2019 Igor Pecovnik - * - * This file is dual-licensed: you can use it either under the terms - * of the GPL or the X11 license, at your option. Note that this dual - * licensing only applies to this file, and not this project as a - * whole. - * - * a) This file 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 file 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. - * - * Or, alternatively, - * - * b) 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, subject to the following - * conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * 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. - */ - -#include "sun8i-h3-nanopi.dtsi" - -/ { - model = "FriendlyElec NanoPi-R1"; - compatible = "friendlyarm,nanopi-r1", "allwinner,sun8i-h3"; - - aliases { - serial1 = &uart3; - ethernet0 = &emac; - ethernet1 = &emac; - ethernet2 = &sdio_wifi; - }; - - wifi_pwrseq: wifi_pwrseq { - compatible = "mmc-pwrseq-simple"; - pinctrl-names = "default"; - reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */ - }; - - reg_gmac_3v3: gmac-3v3 { - compatible = "regulator-fixed"; - regulator-name = "gmac-3v3"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - startup-delay-us = <100000>; - enable-active-high; - gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>; - }; - - leds { - /delete-node/ status; - /delete-node/ pwr; - led1 { - label = "LED1"; - gpios = <&pio 0 10 GPIO_ACTIVE_HIGH>; - linux,default-trigger = "heartbeat"; - }; - - led2 { - label = "LED2"; - gpios = <&pio 6 11 GPIO_ACTIVE_HIGH>; - default-state = "off"; - linux,default-trigger = "netdev"; - }; - - led3 { - label = "LED3"; - gpios = <&pio 0 9 GPIO_ACTIVE_HIGH>; - default-state = "off"; - linux,default-trigger = "netdev"; - }; - }; - - r_gpio_keys { - compatible = "gpio-keys"; - input-name = "k1"; - pinctrl-names = "default"; - pinctrl-0 = <&sw_r_npi>; - - /delete-node/ k1; - reset { - label = "reset"; - linux,code = ; - gpios = <&r_pio 0 3 GPIO_ACTIVE_LOW>; - }; - }; -}; - -&emac { - pinctrl-names = "default"; - pinctrl-0 = <&emac_rgmii_pins>; - phy-supply = <®_gmac_3v3>; - phy-handle = <&ext_rgmii_phy>; - phy-mode = "rgmii"; - - status = "okay"; -}; - -&external_mdio { - ext_rgmii_phy: ethernet-phy@1 { - compatible = "ethernet-phy-ieee802.3-c22"; - reg = <7>; - }; -}; - -&mmc1 { - vmmc-supply = <®_vcc3v3>; - vqmmc-supply = <®_vcc3v3>; - mmc-pwrseq = <&wifi_pwrseq>; - bus-width = <4>; - non-removable; - status = "okay"; - - sdio_wifi: sdio_wifi@1 { - reg = <1>; - compatible = "brcm,bcm4329-fmac"; - interrupt-parent = <&pio>; - interrupts = <6 10 IRQ_TYPE_LEVEL_LOW>; /* PG10 / EINT10 */ - interrupt-names = "host-wake"; - }; -}; - -&mmc2 { - pinctrl-names = "default"; - pinctrl-0 = <&mmc2_8bit_pins>; - vmmc-supply = <®_vcc3v3>; - vqmmc-supply = <®_vcc3v3>; - bus-width = <8>; - non-removable; - status = "okay"; -}; - -&ohci0 { - status = "okay"; -}; - -&ohci1 { - status = "okay"; -}; - -&usb_otg { - dr_mode = "peripheral"; - status = "okay"; -}; - -&usbphy { - status = "okay"; -}; diff --git a/board/friendlyarm/nanopi-r1/readme.txt b/board/friendlyarm/nanopi-r1/readme.txt deleted file mode 100644 index fa3114fc83b..00000000000 --- a/board/friendlyarm/nanopi-r1/readme.txt +++ /dev/null @@ -1,29 +0,0 @@ -NanoPi R1 - -Intro -===== - -This default configuration will allow you to start experimenting with the -buildroot environment for the NanoPi R1. With the current configuration -it will bring-up the board, and allow access through the serial console. - -How to build it -=============== - -Configure Buildroot: - - $ make friendlyarm_nanopi_r1_defconfig - -Compile everything and build the SD card image: - - $ 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 diff --git a/board/friendlyarm/nanopi-r1/uboot/nanopi_r1_defconfig b/board/friendlyarm/nanopi-r1/uboot/nanopi_r1_defconfig deleted file mode 100644 index e028b41a46e..00000000000 --- a/board/friendlyarm/nanopi-r1/uboot/nanopi_r1_defconfig +++ /dev/null @@ -1,22 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARCH_SUNXI=y -CONFIG_SPL=y -CONFIG_MACH_SUN8I_H3=y -CONFIG_DRAM_CLK=408 -CONFIG_DRAM_ZQ=3881979 -CONFIG_DRAM_ODT_EN=y -CONFIG_MACPWR="PD6" -# CONFIG_VIDEO_DE2 is not set -CONFIG_NR_DRAM_BANKS=1 -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set -CONFIG_CONSOLE_MUX=y -CONFIG_SYS_CLK_FREQ=480000000 -# CONFIG_CMD_FLASH is not set -# CONFIG_SPL_DOS_PARTITION is not set -# CONFIG_SPL_EFI_PARTITION is not set -CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-nanopi-r1" -CONFIG_SUN8I_EMAC=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_OHCI_HCD=y -CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y -CONFIG_MMC_SUNXI_SLOT_EXTRA=2 diff --git a/board/friendlyarm/nanopi-r1/uboot/sun8i-h3-nanopi-r1.dts b/board/friendlyarm/nanopi-r1/uboot/sun8i-h3-nanopi-r1.dts deleted file mode 100644 index 9c3c574e0f0..00000000000 --- a/board/friendlyarm/nanopi-r1/uboot/sun8i-h3-nanopi-r1.dts +++ /dev/null @@ -1,102 +0,0 @@ -/* - * Copyright (C) 2019 Igor Pecovnik - * - * This file is dual-licensed: you can use it either under the terms - * of the GPL or the X11 license, at your option. Note that this dual - * licensing only applies to this file, and not this project as a - * whole. - * - * a) This file 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 file 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. - * - * Or, alternatively, - * - * b) 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, subject to the following - * conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * 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. - */ - -#include "sun8i-h3-nanopi.dtsi" - -/ { - model = "FriendlyARM NanoPi R1"; - compatible = "friendlyarm,nanopi-neo", "allwinner,sun8i-h3"; - - reg_gmac_3v3: gmac-3v3 { - compatible = "regulator-fixed"; - pinctrl-names = "default"; - regulator-name = "gmac-3v3"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - startup-delay-us = <100000>; - enable-active-high; - gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>; - }; - -}; - -&ehci0 { - status = "okay"; -}; - -&pio { - gmac_power_pin_nanopi: gmac_power_pin@0 { - pins = "PD6"; - function = "gpio_out"; - }; -}; - -&ohci0 { - status = "okay"; -}; - -&mmc2 { - pinctrl-names = "default"; - pinctrl-0 = <&mmc2_8bit_pins>; - vmmc-supply = <®_vcc3v3>; - bus-width = <8>; - non-removable; - cap-mmc-hw-reset; - status = "okay"; -}; - -&emac { - pinctrl-names = "default"; - pinctrl-0 = <&emac_rgmii_pins>; - phy-supply = <®_gmac_3v3>; - phy-handle = <&ext_rgmii_phy>; - phy-mode = "rgmii"; - - status = "okay"; -}; - -&external_mdio { - ext_rgmii_phy: ethernet-phy@1 { - compatible = "ethernet-phy-ieee802.3-c22"; - reg = <7>; - }; -}; diff --git a/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch b/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch deleted file mode 100644 index 6d76282defb..00000000000 --- a/board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 95a311af81cd47c44d3d6e3f717f06a06d8f3dfd Mon Sep 17 00:00:00 2001 -From: Heiko Thiery -Date: Mon, 10 Jan 2022 14:13:02 +0100 -Subject: [PATCH 1/2] imx: imx8mm: imx8mm-kontron-n801x-s: convert options to Kconfig - -CONFIG_SPL_MMC and CONFIG_SPL_SERIAL - -Patch submitted upstream: -https://patchwork.ozlabs.org/project/uboot/patch/20220112085755.7396-1-heiko.thiery@gmail.com/ - -Signed-off-by: Heiko Thiery ---- - configs/kontron-sl-mx8mm_defconfig | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/configs/kontron-sl-mx8mm_defconfig b/configs/kontron-sl-mx8mm_defconfig -index 35d12fca32..940bf07a92 100644 ---- a/configs/kontron-sl-mx8mm_defconfig -+++ b/configs/kontron-sl-mx8mm_defconfig -@@ -15,6 +15,8 @@ CONFIG_SPL_DM_SPI=y - CONFIG_DEFAULT_DEVICE_TREE="imx8mm-kontron-n801x-s" - CONFIG_SPL_TEXT_BASE=0x7E1000 - CONFIG_TARGET_KONTRON_MX8MM=y -+CONFIG_SPL_MMC=y -+CONFIG_SPL_SERIAL=y - CONFIG_BOOTCOUNT_BOOTLIMIT=3 - CONFIG_SPL=y - CONFIG_DISTRO_DEFAULTS=y --- -2.30.2 - diff --git a/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch b/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch deleted file mode 100644 index a88d7aba870..00000000000 --- a/board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch +++ /dev/null @@ -1,305 +0,0 @@ -From ef694c19c074333fd16589ec6ffef3e7ca895186 Mon Sep 17 00:00:00 2001 -From: Heiko Thiery -Date: Wed, 12 Jan 2022 08:44:36 +0100 -Subject: [PATCH 2/2] imx: imx8mm: imx8mm-kontron-n801x-s: add common board - u-boot.dtsi - -When using a board variant that selects the lvds specific dtb the -*.u-boot.dtsi file will not be included. To have a lvds dtb specific -u-boot.dtsi file move this part to a common board u-boot.dtsi file and -include this in the board base u-boot.dtsi and create an additional one -for the lvds variant. - -Patch submitted upstream: -https://patchwork.ozlabs.org/project/uboot/patch/20220112085755.7396-2-heiko.thiery@gmail.com/ - -Signed-off-by: Heiko Thiery ---- - .../imx8mm-kontron-n801x-s-lvds-u-boot.dtsi | 6 + - .../dts/imx8mm-kontron-n801x-s-u-boot.dtsi | 124 +---------------- - arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi | 128 ++++++++++++++++++ - 3 files changed, 135 insertions(+), 123 deletions(-) - create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi - create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi - -diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi -new file mode 100644 -index 0000000000..4bf75722bf ---- /dev/null -+++ b/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi -@@ -0,0 +1,6 @@ -+// SPDX-License-Identifier: GPL-2.0+ -+/* -+ * Copyright (C) 2019 Kontron Electronics GmbH -+ */ -+ -+#include "imx8mm-kontron-n801x-u-boot.dtsi" -diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi -index 22d18e6f1c..4bf75722bf 100644 ---- a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi -+++ b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi -@@ -3,126 +3,4 @@ - * Copyright (C) 2019 Kontron Electronics GmbH - */ - --#include "imx8mm-u-boot.dtsi" -- --/ { -- aliases { -- usb0 = &usbotg1; -- usb1 = &usbotg2; -- }; -- -- wdt-reboot { -- compatible = "wdt-reboot"; -- wdt = <&wdog1>; -- u-boot,dm-spl; -- }; -- -- firmware { -- optee { -- compatible = "linaro,optee-tz"; -- method = "smc"; -- }; -- }; --}; -- --&fec1 { -- phy-mode = "rgmii-rxid"; --}; -- --&i2c1 { -- u-boot,dm-spl; -- u-boot,dm-pre-reloc; --}; -- --&i2c2 { -- status = "okay"; -- u-boot,dm-spl; -- u-boot,dm-pre-reloc; --}; -- --&pinctrl_ecspi1 { -- u-boot,dm-spl; --}; -- --&pinctrl_i2c1 { -- u-boot,dm-spl; --}; -- --&pinctrl_pmic { -- u-boot,dm-spl; -- fsl,pins = < -- MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x141 -- /* Disable Pullup for SD_VSEL */ -- MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x41 -- >; --}; -- --&pinctrl_uart3 { -- u-boot,dm-spl; -- u-boot,dm-pre-reloc; --}; -- --&pinctrl_usdhc1 { -- u-boot,dm-spl; --}; -- --&pinctrl_usdhc1_100mhz { -- u-boot,dm-spl; --}; -- --&pinctrl_usdhc1_200mhz { -- u-boot,dm-spl; --}; -- --&pinctrl_usdhc2 { -- u-boot,dm-spl; --}; -- --&pca9450 { -- u-boot,dm-spl; --}; -- --&{/soc@0/bus@30800000/i2c@30a20000/pmic@25/regulators} { -- u-boot,dm-spl; --}; -- --&ecspi1 { -- u-boot,dm-spl; --}; -- --&gpio1 { -- u-boot,dm-spl; --}; -- --&gpio2 { -- u-boot,dm-spl; --}; -- --&gpio3 { -- u-boot,dm-spl; --}; -- --&gpio4 { -- u-boot,dm-spl; --}; -- --&gpio5 { -- u-boot,dm-spl; --}; -- --&uart3 { -- u-boot,dm-spl; -- u-boot,dm-pre-reloc; --}; -- --&usdhc1 { -- u-boot,dm-spl; --}; -- --&usdhc2 { -- u-boot,dm-spl; --}; -- --&wdog1 { -- u-boot,dm-spl; --}; -+#include "imx8mm-kontron-n801x-u-boot.dtsi" -diff --git a/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi -new file mode 100644 -index 0000000000..22d18e6f1c ---- /dev/null -+++ b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi -@@ -0,0 +1,128 @@ -+// SPDX-License-Identifier: GPL-2.0+ -+/* -+ * Copyright (C) 2019 Kontron Electronics GmbH -+ */ -+ -+#include "imx8mm-u-boot.dtsi" -+ -+/ { -+ aliases { -+ usb0 = &usbotg1; -+ usb1 = &usbotg2; -+ }; -+ -+ wdt-reboot { -+ compatible = "wdt-reboot"; -+ wdt = <&wdog1>; -+ u-boot,dm-spl; -+ }; -+ -+ firmware { -+ optee { -+ compatible = "linaro,optee-tz"; -+ method = "smc"; -+ }; -+ }; -+}; -+ -+&fec1 { -+ phy-mode = "rgmii-rxid"; -+}; -+ -+&i2c1 { -+ u-boot,dm-spl; -+ u-boot,dm-pre-reloc; -+}; -+ -+&i2c2 { -+ status = "okay"; -+ u-boot,dm-spl; -+ u-boot,dm-pre-reloc; -+}; -+ -+&pinctrl_ecspi1 { -+ u-boot,dm-spl; -+}; -+ -+&pinctrl_i2c1 { -+ u-boot,dm-spl; -+}; -+ -+&pinctrl_pmic { -+ u-boot,dm-spl; -+ fsl,pins = < -+ MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0 0x141 -+ /* Disable Pullup for SD_VSEL */ -+ MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4 0x41 -+ >; -+}; -+ -+&pinctrl_uart3 { -+ u-boot,dm-spl; -+ u-boot,dm-pre-reloc; -+}; -+ -+&pinctrl_usdhc1 { -+ u-boot,dm-spl; -+}; -+ -+&pinctrl_usdhc1_100mhz { -+ u-boot,dm-spl; -+}; -+ -+&pinctrl_usdhc1_200mhz { -+ u-boot,dm-spl; -+}; -+ -+&pinctrl_usdhc2 { -+ u-boot,dm-spl; -+}; -+ -+&pca9450 { -+ u-boot,dm-spl; -+}; -+ -+&{/soc@0/bus@30800000/i2c@30a20000/pmic@25/regulators} { -+ u-boot,dm-spl; -+}; -+ -+&ecspi1 { -+ u-boot,dm-spl; -+}; -+ -+&gpio1 { -+ u-boot,dm-spl; -+}; -+ -+&gpio2 { -+ u-boot,dm-spl; -+}; -+ -+&gpio3 { -+ u-boot,dm-spl; -+}; -+ -+&gpio4 { -+ u-boot,dm-spl; -+}; -+ -+&gpio5 { -+ u-boot,dm-spl; -+}; -+ -+&uart3 { -+ u-boot,dm-spl; -+ u-boot,dm-pre-reloc; -+}; -+ -+&usdhc1 { -+ u-boot,dm-spl; -+}; -+ -+&usdhc2 { -+ u-boot,dm-spl; -+}; -+ -+&wdog1 { -+ u-boot,dm-spl; -+}; --- -2.30.2 - diff --git a/board/kontron/pitx-imx8m/genimage.cfg b/board/kontron/pitx-imx8m/genimage.cfg index 4a0aa117fb0..bc100b171dd 100644 --- a/board/kontron/pitx-imx8m/genimage.cfg +++ b/board/kontron/pitx-imx8m/genimage.cfg @@ -5,7 +5,7 @@ image sdcard.img { partition imx-boot { in-partition-table = "no" - image = "imx8-boot-sd.bin" + image = "flash.bin" offset = 33K } diff --git a/board/kontron/pitx-imx8m/patches/uboot/2022.04/0001-tools-mkeficapsule-use-pkg-config-to-get-luuid-and-l.patch b/board/kontron/pitx-imx8m/patches/uboot/2022.04/0001-tools-mkeficapsule-use-pkg-config-to-get-luuid-and-l.patch new file mode 100644 index 00000000000..9530a45efec --- /dev/null +++ b/board/kontron/pitx-imx8m/patches/uboot/2022.04/0001-tools-mkeficapsule-use-pkg-config-to-get-luuid-and-l.patch @@ -0,0 +1,33 @@ +From f3523977e8f5f6b2173708777001332431ebc609 Mon Sep 17 00:00:00 2001 +From: Heiko Thiery +Date: Tue, 19 Jul 2022 16:17:09 +0200 +Subject: [PATCH 1/2] tools: mkeficapsule: use pkg-config to get -luuid and -lgnutls + +Instead of hardcoding -luuid -lgnutls as the flags needed to build +mkeficapsule, use pkg-config when available. + +We gracefully fallback on the previous behavior of hardcoding -luuid +-lgnutls if pkg-config is not available or fails with an error. + +Signed-off-by: Heiko Thiery +--- + tools/Makefile | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tools/Makefile b/tools/Makefile +index 9f2339666a..9f6b282ad8 100644 +--- a/tools/Makefile ++++ b/tools/Makefile +@@ -242,7 +242,8 @@ hostprogs-$(CONFIG_MIPS) += mips-relocs + hostprogs-$(CONFIG_ASN1_COMPILER) += asn1_compiler + HOSTCFLAGS_asn1_compiler.o = -idirafter $(srctree)/include + +-HOSTLDLIBS_mkeficapsule += -lgnutls -luuid ++HOSTLDLIBS_mkeficapsule += \ ++ $(shell pkg-config --libs gnutls uuid 2> /dev/null || echo "-lgnutls -luuid") + hostprogs-$(CONFIG_TOOLS_MKEFICAPSULE) += mkeficapsule + + # We build some files with extra pedantic flags to try to minimize things +-- +2.30.2 + diff --git a/board/kontron/smarc-sal28/genimage.cfg b/board/kontron/smarc-sal28/genimage.cfg index c885cd51a66..82bab26fecd 100644 --- a/board/kontron/smarc-sal28/genimage.cfg +++ b/board/kontron/smarc-sal28/genimage.cfg @@ -17,7 +17,7 @@ image sdcard-emmc.img { } partition rootfs { - offset = 2M + offset = 4M image = rootfs.ext4 partition-uuid = %PARTUUID% } diff --git a/board/linksprite/pcduino/boot.cmd b/board/linksprite/pcduino/boot.cmd deleted file mode 100644 index 0db8363599e..00000000000 --- a/board/linksprite/pcduino/boot.cmd +++ /dev/null @@ -1,8 +0,0 @@ -setenv fdt_high ffffffff - -setenv bootargs console=ttyS0,115200 console=tty1 earlyprintk root=/dev/mmcblk0p2 rootwait panic=10 ${extra} - -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun4i-a10-pcduino.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/linksprite/pcduino/genimage.cfg b/board/linksprite/pcduino/genimage.cfg deleted file mode 100644 index db33322118b..00000000000 --- a/board/linksprite/pcduino/genimage.cfg +++ /dev/null @@ -1,43 +0,0 @@ -# -# Minimal SD card image for the pcDuino -# - -image boot.vfat { - vfat { - files = { - "zImage", - "sun4i-a10-pcduino.dtb", - "boot.scr" - } - } - - size = 16M -} - -# -# Note: u-boot environment is stored between u-boot and boot partitions -# - -image sdcard.img { - hdimage { - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot-sunxi-with-spl.bin" - offset = 8K - size = 1016K # 1MB - 8KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - offset = 1M - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/board/linksprite/pcduino/post-build.sh b/board/linksprite/pcduino/post-build.sh deleted file mode 100755 index e1e18776718..00000000000 --- a/board/linksprite/pcduino/post-build.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -# post-build.sh for pcDuino taken from OrangePi post-build.sh -# 2013, Carlo Caione - -BOARD_DIR="$(dirname $0)" -MKIMAGE=$HOST_DIR/bin/mkimage -BOOT_CMD=$BOARD_DIR/boot.cmd -BOOT_CMD_H=$BINARIES_DIR/boot.scr - -# U-Boot script -$MKIMAGE -C none -A arm -T script -d $BOOT_CMD $BOOT_CMD_H diff --git a/board/linksprite/pcduino/post-image.sh b/board/linksprite/pcduino/post-image.sh deleted file mode 100755 index c82b189f9c8..00000000000 --- a/board/linksprite/pcduino/post-image.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -BOARD_DIR="$(dirname $0)" -GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" -GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" - -rm -rf "${GENIMAGE_TMP}" - -genimage \ - --rootpath "${TARGET_DIR}" \ - --tmppath "${GENIMAGE_TMP}" \ - --inputpath "${BINARIES_DIR}" \ - --outputpath "${BINARIES_DIR}" \ - --config "${GENIMAGE_CFG}" - -exit $? diff --git a/board/mender/x86_64/genimage-efi.cfg b/board/mender/x86_64/genimage-efi.cfg new file mode 100644 index 00000000000..9c2723d8fb1 --- /dev/null +++ b/board/mender/x86_64/genimage-efi.cfg @@ -0,0 +1,43 @@ +image efi-part.vfat { + vfat { + file EFI { + image = "efi-part/EFI" + } + file grub-mender-grubenv { + image = "efi-part/grub-mender-grubenv" + } + file bzImage { + image = "bzImage" + } + } + + size = 16M +} + +image disk.img { + hdimage { + partition-table-type = "gpt" + } + + partition boot { + partition-type-uuid = U + offset = 32K + image = "efi-part.vfat" + bootable = true + } + + partition roota { + partition-type-uuid = 4F68BCE3-E8CD-4DB1-96E7-FBCAF984B709 + image = "rootfs.ext2" + } + + partition rootb { + partition-type-uuid = 4F68BCE3-E8CD-4DB1-96E7-FBCAF984B709 + image = "rootfs.ext2" + } + + partition data { + partition-type-uuid = L + image = "data-part.ext4" + } +} diff --git a/board/mender/x86_64/linux.config b/board/mender/x86_64/linux.config new file mode 100644 index 00000000000..f17fc18edb4 --- /dev/null +++ b/board/mender/x86_64/linux.config @@ -0,0 +1,64 @@ +CONFIG_SYSVIPC=y +CONFIG_SMP=y +CONFIG_HYPERVISOR_GUEST=y +CONFIG_PARAVIRT=y +CONFIG_EFI=y +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_NETFILTER=y +CONFIG_IP_NF_IPTABLES=y +CONFIG_IP_NF_FILTER=y +CONFIG_CFG80211=m +CONFIG_CFG80211_WEXT=y +CONFIG_MAC80211=m +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_NETDEVICES=y +CONFIG_VIRTIO_NET=y +CONFIG_ATH9K=m +CONFIG_ATH9K_HTC=m +CONFIG_CARL9170=m +CONFIG_ATH10K=m +CONFIG_RT2X00=m +CONFIG_RT73USB=m +CONFIG_RT2800USB=m +CONFIG_RT2800USB_RT3573=y +CONFIG_RT2800USB_RT53XX=y +CONFIG_RT2800USB_RT55XX=y +# CONFIG_RTL_CARDS is not set +CONFIG_RTL8XXXU=m +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_VIRTIO_GPU=y +CONFIG_FB_VESA=y +CONFIG_SOUND=y +CONFIG_SND=y +CONFIG_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_EHCI_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_VFAT_FS=y +CONFIG_SQUASHFS=y +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_ISO8859_1=y +CONFIG_UNWINDER_FRAME_POINTER=y diff --git a/board/mender/x86_64/mender_grubenv_defines b/board/mender/x86_64/mender_grubenv_defines new file mode 100644 index 00000000000..77f68fe6b26 --- /dev/null +++ b/board/mender/x86_64/mender_grubenv_defines @@ -0,0 +1,25 @@ +################################################################################ +# Mandatory +################################################################################ +# Warning: This file is an example and should be customized to fit your needs! + +# Partition index of root filesystem A +mender_rootfsa_part=2 + +# Partition index of root filesystem B +mender_rootfsb_part=3 + +# Device file corresponding to the root filesystem partitions, without index. +mender_kernel_root_base=/dev/vda + +# Name of the storage device containing root filesystem partitions in GRUB +# format. +mender_grub_storage_device=hd0 + +# Type of kernel (bzImage or zImage) +kernel_imagetype=bzImage + +# Type of initrd image. +# Note: An initrd image is not strictly necessary, and the system will boot and +# update without a initrd image. +# initrd_imagetype=initrd.img diff --git a/board/mender/x86_64/overlay/etc/fstab b/board/mender/x86_64/overlay/etc/fstab new file mode 100644 index 00000000000..45a7ba02605 --- /dev/null +++ b/board/mender/x86_64/overlay/etc/fstab @@ -0,0 +1,7 @@ +# +/dev/root / ext4 rw,noauto 0 1 +/dev/vda1 /boot vfat defaults 0 0 +/dev/vda4 /var/lib/mender ext4 rw,relatime 0 0 +proc /proc proc defaults 0 0 +devpts /dev/pts devpts defaults,gid=5,mode=620,ptmxmode=0666 0 0 +sysfs /sys sysfs defaults 0 0 diff --git a/board/mender/x86_64/overlay/etc/mender/mender.conf b/board/mender/x86_64/overlay/etc/mender/mender.conf new file mode 100644 index 00000000000..5f423fb2cb8 --- /dev/null +++ b/board/mender/x86_64/overlay/etc/mender/mender.conf @@ -0,0 +1,11 @@ +{ + "InventoryPollIntervalSeconds": 1800, + "UpdatePollIntervalSeconds": 1800, + "RetryPollIntervalSeconds": 300, + "RootfsPartA": "/dev/vda2", + "RootfsPartB": "/dev/vda3", + "ServerCertificate": "/etc/mender/server.crt", + "ServerURL": "https://docker.mender.io", + "TenantToken": "dummy", + "DeviceTypeFile": "/etc/mender/device_type" +} diff --git a/board/mender/x86_64/post-build.sh b/board/mender/x86_64/post-build.sh new file mode 100755 index 00000000000..23d1120d45d --- /dev/null +++ b/board/mender/x86_64/post-build.sh @@ -0,0 +1,54 @@ +#!/usr/bin/env bash +set -e +DEVICE_TYPE="buildroot-x86_64" +ARTIFACT_NAME="1.0" + +function parse_args { + local o O opts + o='a:o:d:' + O='artifact-name:,data-part-size:,device-type:' + opts="$(getopt -o "${o}" -l "${O}" -- "${@}")" + eval set -- "${opts}" + while [ ${#} -gt 0 ]; do + case "${1}" in + (-o|--data-part-size) + # Ignored to have same options as other scripts + shift 2 + ;; + (-d|--device-type) + DEVICE_TYPE="${2}"; shift 2 + ;; + (-a|--artifact-name) + ARTIFACT_NAME="${2}"; shift 2 + ;; + (--) + shift; break + ;; + esac + done +} + + # Create a persistent directory to mount the data partition at. +function 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 + fi + + popd +} + +function 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 new file mode 100755 index 00000000000..97b9e06d213 --- /dev/null +++ b/board/mender/x86_64/post-image-efi.sh @@ -0,0 +1,72 @@ +#!/usr/bin/env bash +set -e +BOARD_DIR="$(realpath "$(dirname "$0")")" +DATA_PART_SIZE="32M" +DEVICE_TYPE="buildroot-x86_64" +ARTIFACT_NAME="1.0" + + +# Parse arguments. +function parse_args { + local o O opts + o='a:o:d:' + O='artifact-name:,data-part-size:,device-type:' + opts="$(getopt -o "${o}" -l "${O}" -- "${@}")" + eval set -- "${opts}" + while [ ${#} -gt 0 ]; do + case "${1}" in + (-o|--data-part-size) + DATA_PART_SIZE="${2}"; shift 2 + ;; + (-d|--device-type) + DEVICE_TYPE="${2}"; shift 2 + ;; + (-a|--artifact-name) + ARTIFACT_NAME="${2}"; shift 2 + ;; + (--) + shift; break + ;; + esac + done +} + +# Create the data partition +function make_data_partition { + "${HOST_DIR}/sbin/mkfs.ext4" \ + -F \ + -r 1 \ + -N 0 \ + -m 5 \ + -L "data" \ + "${BINARIES_DIR}/data-part.ext4" "${DATA_PART_SIZE}" +} + + +# Create a mender image. +function generate_mender_image { + echo "Creating ${BINARIES_DIR}/${DEVICE_TYPE}-${ARTIFACT_NAME}.mender" + "${HOST_DIR}/bin/mender-artifact" \ + --compression lzma \ + write rootfs-image \ + -t "${DEVICE_TYPE}" \ + -n "${BR2_VERSION}" \ + -f "${BINARIES_DIR}/rootfs.ext2" \ + -o "${BINARIES_DIR}/${DEVICE_TYPE}-${ARTIFACT_NAME}.mender" +} + + +function generate_image { + sh support/scripts/genimage.sh -c "${BOARD_DIR}/genimage-efi.cfg" +} + +# Main function. +function main { + parse_args "${@}" + make_data_partition + generate_image + generate_mender_image + exit $? +} + +main "${@}" diff --git a/board/mender/x86_64/readme.txt b/board/mender/x86_64/readme.txt new file mode 100644 index 00000000000..a9755ec58b0 --- /dev/null +++ b/board/mender/x86_64/readme.txt @@ -0,0 +1,69 @@ +Mender UEFI PC sample config +===================== + +1. Build + + $ make mender_x86_64_efi_defconfig + + Add any additional packages required. Update the files in board/mender/x86_64 + and change /dev/vda to what is relevant for your platform: typically + /dev/mmcblk0p for eMMC and /dev/sda for USB or SATA. + + $ make + +2. Write the Pendrive + + The build process will create a Pendrive image called disk.img in + output/images. + + Write the image to a pendrive: + + $ dd if=output/images/disk.img of=/dev/${pendrive}; sync + + Once the process is complete, insert it into the target PC and boot. + + Remember that if said PC has another boot device you might need to + select this alternative for it to boot. + + You might need to disable Secure Boot from the setup as well. + +3. Enjoy + +Emulation in qemu +======================== + +Run the emulation with: + +qemu-system-x86_64 \ + -M pc \ + -drive file=output/images/disk.img,if=virtio,format=raw \ + -net nic,model=virtio \ + -net user \ + -serial stdio \ + -bios + +Note that needs to point to a valid x86_64 UEFI +firmware image for qemu. It may be provided by your distribution as an +edk2 or OVMF package, in a path such as /usr/share/edk2/ovmf/OVMF_CODE.fd. + +Optional arguments: + - -enable-kvm to speed up qemu. This requires a loaded kvm module on the host + system. + - Add -smp N to emulate an SMP system with N CPUs. + +The login prompt will appear in the serial window. + +Tested with QEMU 4.1.1 on Fedora 31 + +Creating a mender-artifact +======================== + +The mender artifact is created in output/images/buildroot-x86_64-1.0.mender + +You may wish to change --artifact-name=1.0 to a name that best suits your +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 diff --git a/board/minnowboard/fs-overlay-graphical/etc/X11/Xsession b/board/minnowboard/fs-overlay-graphical/etc/X11/Xsession deleted file mode 100755 index d8862f170cb..00000000000 --- a/board/minnowboard/fs-overlay-graphical/etc/X11/Xsession +++ /dev/null @@ -1,7 +0,0 @@ -# Start a terminal on the top left corner -xterm -geom 80x30+0+0 & - -# OpenGL demo -glmark2 & - -exec /usr/bin/openbox-session diff --git a/board/minnowboard/fs-overlay-graphical/etc/X11/xorg.conf.d/01-modules.conf b/board/minnowboard/fs-overlay-graphical/etc/X11/xorg.conf.d/01-modules.conf deleted file mode 100644 index 91659baa652..00000000000 --- a/board/minnowboard/fs-overlay-graphical/etc/X11/xorg.conf.d/01-modules.conf +++ /dev/null @@ -1,11 +0,0 @@ - -# Xorg does not implement real dynamic linking and requires that its -# modules get loaded in the right order. -# https://forums.gentoo.org/viewtopic-p-8245578.html#8245578 -Section "Module" - Load "vgahw" - Load "fb" - Load "shadowfb" - Load "int10" - Load "vbe" -EndSection diff --git a/board/minnowboard/fs-overlay-graphical/etc/asound.conf b/board/minnowboard/fs-overlay-graphical/etc/asound.conf deleted file mode 100644 index b75b2383647..00000000000 --- a/board/minnowboard/fs-overlay-graphical/etc/asound.conf +++ /dev/null @@ -1,4 +0,0 @@ -# Customize ALSA: -# the HDMI PCM is at card=0, device=3 (i.e. hw:0,3) -defaults.pcm.card 0 -defaults.pcm.device 3 diff --git a/board/nezha/genimage.cfg b/board/nezha/genimage.cfg index 783391fb994..836666ff8e6 100644 --- a/board/nezha/genimage.cfg +++ b/board/nezha/genimage.cfg @@ -4,34 +4,16 @@ image sdcard.img { hdimage { } - partition boot0-1 { - in-partition-table = "no" - image = "boot0_sdcard_sun20iw1p1.bin" + partition u-boot { + in-partition-table = false + image = "u-boot-sunxi-with-spl.bin" offset = 8K } - partition boot0-2 { - in-partition-table = "no" - image = "boot0_sdcard_sun20iw1p1.bin" - offset = 128K - } - - partition u-boot-1 { - in-partition-table = "no" - image = "u-boot.toc1" - offset = 12M - } - - partition u-boot-2 { - in-partition-table = "no" - image = "u-boot.toc1" - offset = 16400K - } - partition rootfs { partition-type = 0x83 image = "rootfs.ext4" bootable = "true" - offset = 18M + offset = 1M } } diff --git a/board/nezha/overlay/boot/extlinux/extlinux.conf b/board/nezha/overlay/boot/extlinux/extlinux.conf index 02232f4d16c..91b2298628b 100644 --- a/board/nezha/overlay/boot/extlinux/extlinux.conf +++ b/board/nezha/overlay/boot/extlinux/extlinux.conf @@ -1,4 +1,4 @@ label linux kernel /boot/Image - devicetree /boot/sun20i-d1-nezha.dtb + # use devicetree from u-boot append console=ttyS0,115200 root=/dev/mmcblk0p1 ro rootwait diff --git a/board/nezha/patches/uboot/0001-arch-riscv-dts-sun20i-d1.dtsi-adjust-plic-compatible.patch b/board/nezha/patches/uboot/0001-arch-riscv-dts-sun20i-d1.dtsi-adjust-plic-compatible.patch deleted file mode 100644 index 3524f44a61d..00000000000 --- a/board/nezha/patches/uboot/0001-arch-riscv-dts-sun20i-d1.dtsi-adjust-plic-compatible.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 99cf8f37ceb1def9e7bbaccc395cf2275723e03d Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Thu, 4 Nov 2021 22:15:13 +0100 -Subject: [PATCH] arch/riscv/dts/sun20i-d1.dtsi: adjust plic compatible to - match opensbi - -The T-HEAD PLIC is by default not accessible from S-mode, and access must be -enabled by opensbi to make it accessible to Linux. - -The DTB is used both by U-Boot and opensbi (but the PLIC node is ignored by -U-Boot), so change the compatible to match what opensbi expects to fix a -crash during Linux boot: - -https://github.com/riscv-software-src/opensbi/commit/78c2b19218bd - -Signed-off-by: Peter Korsgaard ---- - arch/riscv/dts/sun20i-d1.dtsi | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/riscv/dts/sun20i-d1.dtsi b/arch/riscv/dts/sun20i-d1.dtsi -index 280e0336d4..56d02c33b0 100644 ---- a/arch/riscv/dts/sun20i-d1.dtsi -+++ b/arch/riscv/dts/sun20i-d1.dtsi -@@ -1136,7 +1136,7 @@ - - plic: interrupt-controller@10000000 { - compatible = "allwinner,sun20i-d1-plic", -- "sifive,plic-1.0.0"; -+ "thead,c900-plic"; - reg = <0x10000000 0x4000000>; - #address-cells = <0>; - interrupts-extended = <&cpu0_intc 11>, --- -2.20.1 - diff --git a/board/nezha/patches/uboot/0002-Makefile-HACK-Support-building-u-boot.toc1-for-nezda.patch b/board/nezha/patches/uboot/0002-Makefile-HACK-Support-building-u-boot.toc1-for-nezda.patch deleted file mode 100644 index 6e89a921df3..00000000000 --- a/board/nezha/patches/uboot/0002-Makefile-HACK-Support-building-u-boot.toc1-for-nezda.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 4a923e0e4ef6d2b41cb89d658e269adada847573 Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Thu, 4 Nov 2021 22:32:04 +0100 -Subject: [PATCH] Makefile: HACK: Support building u-boot.toc1 for nezda board - -For easier integration into Buildroot. The boot0 / toc1 logic is WIP until -U-Boot gains SPL support for the D1, so add a hack to make it easier to -integrate in Buildroot as-is. - -Signed-off-by: Peter Korsgaard ---- - Makefile | 9 +++++++++ - nezha.cfg | 9 +++++++++ - 2 files changed, 18 insertions(+) - create mode 100644 nezha.cfg - -diff --git a/Makefile b/Makefile -index f911f70344..259d93bf80 100644 ---- a/Makefile -+++ b/Makefile -@@ -1084,6 +1084,15 @@ endif - .binman_stamp: FORCE - @touch $@ - -+fw_dynamic.bin: $(OPENSBI) -+ $(call if_changed,copy) -+ -+MKIMAGEFLAGS_u-boot.toc1 = -T sunxi_toc1 -+u-boot.toc1: nezha.cfg fw_dynamic.bin inputs -+ $(call if_changed,mkimage) -+ -+all: u-boot.toc1 -+ - ifeq ($(CONFIG_DEPRECATED),y) - $(warning "You have deprecated configuration options enabled in your .config! Please check your configuration.") - endif -diff --git a/nezha.cfg b/nezha.cfg -new file mode 100644 -index 0000000000..2d23b9b388 ---- /dev/null -+++ b/nezha.cfg -@@ -0,0 +1,9 @@ -+[opensbi] -+file = fw_dynamic.bin -+addr = 0x40000000 -+[dtb] -+file = arch/riscv/dts/sun20i-d1-nezha.dtb -+addr = 0x44000000 -+[u-boot] -+file = u-boot-nodtb.bin -+addr = 0x4a000000 --- -2.20.1 - diff --git a/board/octavo/osd32mp1-brk/genimage.cfg b/board/octavo/osd32mp1-brk/genimage.cfg new file mode 100644 index 00000000000..40bde81e861 --- /dev/null +++ b/board/octavo/osd32mp1-brk/genimage.cfg @@ -0,0 +1,23 @@ +image sdcard.img { + hdimage { + partition-table-type = "gpt" + } + + partition fsbl1 { + image = "tf-a-stm32mp157c-osd32mp1-brk.stm32" + } + + partition fsbl2 { + image = "tf-a-stm32mp157c-osd32mp1-brk.stm32" + } + + partition fip { + image = "fip.bin" + size = 2M + } + + partition rootfs { + image = "rootfs.ext4" + bootable = "yes" + } +} diff --git a/board/octavo/osd32mp1-brk/linux-dts/stm32mp157c-osd32mp1-brk.dts b/board/octavo/osd32mp1-brk/linux-dts/stm32mp157c-osd32mp1-brk.dts new file mode 100644 index 00000000000..d5f2793f548 --- /dev/null +++ b/board/octavo/osd32mp1-brk/linux-dts/stm32mp157c-osd32mp1-brk.dts @@ -0,0 +1,1120 @@ +/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */ +/* + * Copyright (C) Octavo Systems LLC 2020 - All Rights Reserved + */ + +/* For more information on Device Tree configuration, please refer to + * https://wiki.st.com/stm32mpu/wiki/Category:Device_tree_configuration + */ + +/dts-v1/; +#include +#include "stm32mp157.dtsi" +#include "stm32mp15xc.dtsi" +#include "stm32mp15xxac-pinctrl.dtsi" +#include "stm32mp15-m4-srm.dtsi" +#include +#include +#include + +/ { + model = "Octavo OSD32MP1 BRK board"; + compatible = "st,stm32mp157c-osd32mp1-brk", "st,stm32mp157"; + + memory@c0000000 { + device_type = "memory"; + reg = <0xc0000000 0x20000000>; + }; + + reserved-memory { + #address-cells = <1>; + #size-cells = <1>; + ranges; + + mcuram2:mcuram2@10000000{ + compatible = "shared-dma-pool"; + reg = <0x10000000 0x40000>; + no-map; + }; + + vdev0vring0:vdev0vring0@10040000{ + compatible = "shared-dma-pool"; + reg = <0x10040000 0x1000>; + no-map; + }; + + vdev0vring1:vdev0vring1@10041000{ + compatible = "shared-dma-pool"; + reg = <0x10041000 0x1000>; + no-map; + }; + + vdev0buffer:vdev0buffer@10042000{ + compatible = "shared-dma-pool"; + reg = <0x10042000 0x4000>; + no-map; + }; + + mcuram:mcuram@30000000{ + compatible = "shared-dma-pool"; + reg = <0x30000000 0x40000>; + no-map; + }; + + retram:retram@38000000{ + compatible = "shared-dma-pool"; + reg = <0x38000000 0x10000>; + no-map; + }; + + gpu_reserved:gpu@d4000000{ + reg = <0xd4000000 0x4000000>; + no-map; + }; + }; + + led{ + compatible = "gpio-leds"; + + red1{ + label = "LED1_RED"; + gpios = <&gpioz 6 GPIO_ACTIVE_LOW>; + linux,default-trigger = "heartbeat"; + status = "okay"; + default-state = "off"; + }; + + green1{ + label = "LED1_GRN"; + gpios = <&gpioz 7 GPIO_ACTIVE_LOW>; + status = "okay"; + default-state = "on"; + }; + + red2{ + label = "LED2_RED"; + gpios = <&gpioi 8 GPIO_ACTIVE_LOW>; + status = "okay"; + default-state = "off"; + }; + + green2{ + label = "LED2_GRN"; + gpios = <&gpioi 9 GPIO_ACTIVE_LOW>; + default-state = "off"; + }; + }; + + usb_phy_tuning:usb-phy-tuning{ + st,hs-dc-level = <2>; + st,fs-rftime-tuning; + st,hs-rftime-reduction; + st,hs-current-trim = <15>; + st,hs-impedance-trim = <1>; + st,squelch-level = <3>; + st,hs-rx-offset = <2>; + st,no-lsfs-sc; + }; + + vin:vin{ + compatible = "regulator-fixed"; + regulator-name = "vin"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-always-on; + }; + + aliases{ + serial0 = &uart4; + serial2 = &usart2; + serial5 = &uart5; + serial7 = &uart7; + serial1 = &uart8; + }; + + chosen{ + stdout-path = "serial0:115200n8"; + }; + +}; /*root*/ + +&pinctrl { + u-boot,dm-pre-reloc; + i2c1_pins_mx: i2c1-0 { + pins { + pinmux = , /* I2C1_SCL */ + ; /* I2C1_SDA */ + bias-disable; + drive-open-drain; + slew-rate = <0>; + }; + }; + + i2c1_pins_sleep_mx: i2c1-1 { + pins { + pinmux = , /* I2C1_SCL */ + ; /* I2C1_SDA */ + }; + }; + + i2c2_pins_mx: i2c2-0 { + pins { + pinmux = , /* I2C2_SCL */ + ; /* I2C2_SDA */ + bias-disable; + drive-open-drain; + slew-rate = <0>; + }; + }; + + i2c2_pins_sleep_mx: i2c2-1 { + pins { + pinmux = , /* I2C2_SCL */ + ; /* I2C2_SDA */ + }; + }; + + i2c5_pins_mx: i2c5-0 { + pins { + pinmux = , /* I2C5_SCL */ + ; /* I2C5_SDA */ + bias-disable; + drive-open-drain; + slew-rate = <0>; + }; + }; + + i2c5_pins_sleep_mx: i2c5-1 { + pins { + pinmux = , /* I2C5_SCL */ + ; /* I2C5_SDA */ + }; + }; + + spi2_pins_mx: spi2-0 { + pins1 { + pinmux = , /* SPI2_SCK */ + ; /* SPI2_MOSI */ + bias-disable; + drive-push-pull; + slew-rate = <1>; + }; + + pins2 { + pinmux = ; /* SPI2_MISO */ + bias-disable; + }; + }; + + spi2_sleep_pins_mx: spi2-sleep-0 { + pins { + pinmux = , /* SPI2_SCK */ + , /* SPI2_MISO */ + ; /* SPI2_MOSI */ + }; + }; + + spi4_pins_mx: spi4-0 { + pins1 { + pinmux = , /* SPI4_SCK */ + ; /* SPI4_MOSI */ + bias-disable; + drive-push-pull; + slew-rate = <1>; + }; + + pins2 { + pinmux = ; /* SPI4_MISO */ + bias-disable; + }; + }; + + spi4_sleep_pins_mx: spi4-sleep-0 { + pins { + pinmux = , /* SPI2_SCK */ + , /* SPI2_MISO */ + ; /* SPI2_MOSI */ + }; + }; + + usart2_pins_mx: usart2-0 { + pins1 { + pinmux = ; /* USART2_TX */ + bias-disable; + drive-push-pull; + slew-rate = <0>; + }; + pins2 { + pinmux = ; /* USART2_RX */ + bias-disable; + }; + }; + + usart2_idle_pins_mx: usart2-idle-0 { + pins1 { + pinmux = ; /* USART2_TX */ + }; + pins2 { + pinmux = ; /* USART2_RX */ + bias-disable; + }; + }; + + usart2_sleep_pins_mx: usart2-sleep-0 { + pins { + pinmux = , /* USART2_TX */ + ; /* USART2_RX */ + }; + }; + + uart5_pins_mx: uart5-0 { + pins1 { + pinmux = ; /* USART5_TX */ + bias-disable; + drive-push-pull; + slew-rate = <0>; + }; + pins2 { + pinmux = ; /* USART5_RX */ + bias-disable; + }; + }; + + uart5_idle_pins_mx: uart5-idle-0 { + pins1 { + pinmux = ; /* USART5_TX */ + }; + pins2 { + pinmux = ; /* USART5_RX */ + bias-disable; + }; + }; + + uart5_sleep_pins_mx: uart5-sleep-0 { + pins { + pinmux = , /* USART5_TX */ + ; /* USART5_RX */ + }; + }; + + uart7_pins_mx: uart7-0 { + pins1 { + pinmux = ; /* USART7_TX */ + bias-disable; + drive-push-pull; + slew-rate = <0>; + }; + pins2 { + pinmux = ; /* USART7_RX */ + bias-disable; + }; + }; + + uart7_idle_pins_mx: uart7-idle-0 { + pins1 { + pinmux = ; /* USART7_TX */ + }; + pins2 { + pinmux = ; /* USART7_RX */ + bias-disable; + }; + }; + + uart7_sleep_pins_mx: uart7-sleep-0 { + pins { + pinmux = , /* USART7_TX */ + ; /* USART7_RX */ + }; + }; + + uart8_pins_mx: uart8-0 { + pins1 { + pinmux = ; /* USART8_TX */ + bias-disable; + drive-push-pull; + slew-rate = <0>; + }; + pins2 { + pinmux = ; /* USART8_RX */ + bias-disable; + }; + }; + + uart8_idle_pins_mx: uart8-idle-0 { + pins1 { + pinmux = ; /* USART8_TX */ + }; + pins2 { + pinmux = ; /* USART8_RX */ + bias-disable; + }; + }; + + uart8_sleep_pins_mx: uart8-sleep-0 { + pins { + pinmux = , /* USART8_TX */ + ; /* USART8_RX */ + }; + }; + + m_can1_pins_mx: m-can1-0 { + pins1 { + pinmux = ; /* CAN1_TX */ + slew-rate = <0>; + drive-push-pull; + bias-disable; + }; + pins2 { + pinmux = ; /* CAN1_RX */ + bias-disable; + }; + }; + + m_can1_sleep_pins_mx: m_can1-sleep@0 { + pins { + pinmux = , /* CAN1_TX */ + ; /* CAN1_RX */ + }; + }; + + pwm1_pins_mx: pwm1-0 { + pins { + pinmux = ; /* TIM1_CH2 */ + bias-pull-down; + drive-push-pull; + slew-rate = <0>; + }; + }; + + pwm1_sleep_pins_mx: pwm1-sleep-0 { + pins { + pinmux = ; /* TIM1_CH1 */ + }; + }; + + pwm3_pins_mx: pwm3-0 { + pins { + pinmux = ; /* TIM3_CH2 */ + bias-pull-down; + drive-push-pull; + slew-rate = <0>; + }; + }; + + pwm3_sleep_pins_mx: pwm3-sleep-0 { + pins { + pinmux = ; /* TIM3_CH2 */ + }; + }; + + pwm4_pins_mx: pwm4-0 { + pins { + pinmux = ; /* TIM4_CH2 */ + bias-pull-down; + drive-push-pull; + slew-rate = <0>; + }; + }; + + pwm4_sleep_pins_mx: pwm4-sleep-0 { + pins { + pinmux = ; /* TIM4_CH2 */ + }; + }; + + pwm8_pins_mx: pwm8-0 { + pins { + pinmux = ; /* TIM8_CH2 */ + bias-pull-down; + drive-push-pull; + slew-rate = <0>; + }; + }; + + pwm8_sleep_pins_mx: pwm8-sleep-0 { + pins { + pinmux = ; /* TIM8_CH2 */ + }; + }; + + + pwm12_pins_mx: pwm12-0 { + pins { + pinmux = ; /* TIM12_CH2 */ + bias-pull-down; + drive-push-pull; + slew-rate = <0>; + }; + }; + + pwm12_sleep_pins_mx: pwm12-sleep-0 { + pins { + pinmux = ; /* TIM12_CH2 */ + }; + }; + + sdmmc1_pins_mx: sdmmc1_mx-0 { + u-boot,dm-pre-reloc; + pins1 { + u-boot,dm-pre-reloc; + pinmux = , /* SDMMC1_D0 */ + , /* SDMMC1_D1 */ + , /* SDMMC1_D2 */ + , /* SDMMC1_D3 */ + ; /* SDMMC1_CMD */ + bias-disable; + drive-push-pull; + slew-rate = <1>; + }; + pins2 { + u-boot,dm-pre-reloc; + pinmux = ; /* SDMMC1_CK */ + bias-disable; + drive-push-pull; + slew-rate = <2>; + }; + }; + + sdmmc1_opendrain_pins_mx: sdmmc1_opendrain_mx-0 { + u-boot,dm-pre-reloc; + pins1 { + u-boot,dm-pre-reloc; + pinmux = , /* SDMMC1_D0 */ + , /* SDMMC1_D1 */ + , /* SDMMC1_D2 */ + ; /* SDMMC1_D3 */ + bias-disable; + drive-push-pull; + slew-rate = <1>; + }; + pins2 { + u-boot,dm-pre-reloc; + pinmux = ; /* SDMMC1_CK */ + bias-disable; + drive-push-pull; + slew-rate = <2>; + }; + pins3 { + u-boot,dm-pre-reloc; + pinmux = ; /* SDMMC1_CMD */ + bias-disable; + drive-open-drain; + slew-rate = <1>; + }; + }; + + sdmmc1_sleep_pins_mx: sdmmc1_sleep_mx-0 { + u-boot,dm-pre-reloc; + pins { + u-boot,dm-pre-reloc; + pinmux = , /* SDMMC1_D0 */ + , /* SDMMC1_D1 */ + , /* SDMMC1_D2 */ + , /* SDMMC1_D3 */ + , /* SDMMC1_CK */ + ; /* SDMMC1_CMD */ + }; + }; + + uart4_pins_mx: uart4_mx-0 { + u-boot,dm-pre-reloc; + pins1 { + u-boot,dm-pre-reloc; + pinmux = ; /* UART4_RX */ + /* pull-up on rx to avoid floating level */ + bias-pull-up; + }; + pins2 { + u-boot,dm-pre-reloc; + pinmux = ; /* UART4_TX */ + bias-disable; + drive-push-pull; + slew-rate = <0>; + }; + }; + + uart4_sleep_pins_mx: uart4_sleep_mx-0 { + u-boot,dm-pre-reloc; + pins { + u-boot,dm-pre-reloc; + pinmux = , /* UART4_RX */ + ; /* UART4_TX */ + }; + }; +}; + +&pinctrl_z { + u-boot,dm-pre-reloc; + + i2c4_pins_z_mx: i2c4_mx-0 { + u-boot,dm-pre-reloc; + pins { + u-boot,dm-pre-reloc; + pinmux = , /* I2C4_SCL */ + ; /* I2C4_SDA */ + bias-disable; + drive-open-drain; + slew-rate = <0>; + }; + }; + + i2c4_sleep_pins_z_mx: i2c4_sleep_mx-0 { + u-boot,dm-pre-reloc; + pins { + u-boot,dm-pre-reloc; + pinmux = , /* I2C4_SCL */ + ; /* I2C4_SDA */ + }; + }; + + spi6_pins_mx: spi6-0 { + pins1 { + pinmux = , /* SPI6_SCK */ + ; /* SPI6_MOSI */ + bias-disable; + drive-push-pull; + slew-rate = <1>; + }; + + pins2 { + pinmux = ; /* SPI6_MISO */ + bias-disable; + }; + }; + + spi6_sleep_pins_mx: spi6-sleep-0 { + pins { + pinmux = , /* SPI6_SCK */ + , /* SPI6_MISO */ + ; /* SPI6_MOSI */ + }; + }; +}; + +&m4_rproc{ + memory-region = <&retram>, <&mcuram>, <&mcuram2>, <&vdev0vring0>, + <&vdev0vring1>, <&vdev0buffer>; + mboxes = <&ipcc 0>, <&ipcc 1>, <&ipcc 2>; + mbox-names = "vq0", "vq1", "shutdown"; + interrupt-parent = <&exti>; + interrupts = <68 1>; + wakeup-source; + status = "okay"; +}; + +&pwr_regulators { + vdd-supply = <&vdd>; + vdd_3v3_usbfs-supply = <&vdd_usb>; +}; + + +&crc1{ + status = "okay"; +}; + +&cryp1{ + u-boot,dm-pre-reloc; + status = "okay"; +}; + +&dma1{ + status = "okay"; + sram = <&dma_pool>; +}; + +&dma2{ + status = "okay"; + sram = <&dma_pool>; +}; + +&dts{ + status = "okay"; +}; + +&gpu{ + status = "okay"; + contiguous-area = <&gpu_reserved>; +}; + +&hash1{ + u-boot,dm-pre-reloc; + status = "okay"; +}; + +&hsem{ + status = "okay"; +}; + +&i2c1 { + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&i2c1_pins_mx>; + pinctrl-1 = <&i2c1_pins_sleep_mx>; + i2c-scl-rising-time-ns = <100>; + i2c-scl-falling-time-ns = <7>; + status = "okay"; + /delete-property/dmas; + /delete-property/dma-names; +}; + +&i2c2 { + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&i2c2_pins_mx>; + pinctrl-1 = <&i2c2_pins_sleep_mx>; + i2c-scl-rising-time-ns = <100>; + i2c-scl-falling-time-ns = <7>; + status = "okay"; + /delete-property/dmas; + /delete-property/dma-names; +}; + +&i2c5 { + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&i2c5_pins_mx>; + pinctrl-1 = <&i2c5_pins_sleep_mx>; + i2c-scl-rising-time-ns = <100>; + i2c-scl-falling-time-ns = <7>; + status = "okay"; + /delete-property/dmas; + /delete-property/dma-names; +}; + +&i2c4{ + u-boot,dm-pre-reloc; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&i2c4_pins_z_mx>; + pinctrl-1 = <&i2c4_sleep_pins_z_mx>; + status = "okay"; + + i2c-scl-rising-time-ns = <185>; + i2c-scl-falling-time-ns = <20>; + clock-frequency = <400000>; + /delete-property/ dmas; + /delete-property/ dma-names; + + pmic:stpmic@33{ + compatible = "st,stpmic1"; + reg = <0x33>; + interrupts-extended = <&exti_pwr 55 IRQ_TYPE_EDGE_FALLING>; + interrupt-controller; + #interrupt-cells = <2>; + status = "okay"; + + regulators{ + compatible = "st,stpmic1-regulators"; + buck1-supply = <&vin>; + buck2-supply = <&vin>; + buck3-supply = <&vin>; + buck4-supply = <&vin>; + ldo1-supply = <&v3v3>; + ldo2-supply = <&vin>; + ldo3-supply = <&vdd_ddr>; + ldo4-supply = <&vin>; + ldo5-supply = <&vin>; + ldo6-supply = <&v3v3>; + vref_ddr-supply = <&vin>; + boost-supply = <&vin>; + pwr_sw1-supply = <&bst_out>; + pwr_sw2-supply = <&bst_out>; + + vddcore:buck1{ + regulator-name = "vddcore"; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1350000>; + regulator-always-on; + regulator-initial-mode = <0>; + regulator-over-current-protection; + }; + + vdd_ddr:buck2{ + regulator-name = "vdd_ddr"; + regulator-min-microvolt = <1350000>; + regulator-max-microvolt = <1350000>; + regulator-always-on; + regulator-initial-mode = <0>; + regulator-over-current-protection; + }; + + vdd:buck3{ + regulator-name = "vdd"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + st,mask-reset; + regulator-initial-mode = <0>; + regulator-over-current-protection; + }; + + v3v3:buck4{ + regulator-name = "v3v3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + regulator-over-current-protection; + regulator-initial-mode = <0>; + }; + + v1v8_audio:ldo1{ + regulator-name = "v1v8_audio"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-always-on; + interrupts = ; + }; + + v3v3_hdmi:ldo2{ + regulator-name = "v3v3_hdmi"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + interrupts = ; + }; + + vtt_ddr:ldo3{ + regulator-name = "vtt_ddr"; + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <750000>; + regulator-always-on; + regulator-over-current-protection; + }; + + vdd_usb:ldo4{ + regulator-name = "vdd_usb"; + interrupts = ; + }; + + vdda:ldo5{ + regulator-name = "vdda"; + regulator-min-microvolt = <2900000>; + regulator-max-microvolt = <2900000>; + interrupts = ; + regulator-boot-on; + }; + + v1v2_hdmi:ldo6{ + regulator-name = "v1v2_hdmi"; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + regulator-always-on; + interrupts = ; + }; + + vref_ddr:vref_ddr{ + regulator-name = "vref_ddr"; + regulator-always-on; + regulator-over-current-protection; + }; + + bst_out:boost{ + regulator-name = "bst_out"; + interrupts = ; + }; + + vbus_otg:pwr_sw1{ + regulator-name = "vbus_otg"; + interrupts = ; + }; + + vbus_sw:pwr_sw2{ + regulator-name = "vbus_sw"; + interrupts = ; + regulator-active-discharge = <1>; + }; + }; + + onkey{ + compatible = "st,stpmic1-onkey"; + interrupts = , ; + interrupt-names = "onkey-falling", "onkey-rising"; + power-off-time-sec = <10>; + status = "okay"; + }; + + watchdog { + compatible = "st,stpmic1-wdt"; + status = "disabled"; + }; + }; + eeprom@50 { + compatible = "atmel,24c02"; + reg = <0x50>; + pagesize = <16>; + }; +}; + +&ipcc{ + status = "okay"; +}; + +&iwdg2{ + status = "okay"; + timeout-sec = <32>; +}; + +&mdma1{ + status = "okay"; +}; + +&rcc{ + u-boot,dm-pre-reloc; + status = "okay"; +}; + +&rng1{ + status = "okay"; +}; + +&rtc{ + status = "okay"; +}; + +&sdmmc1{ + u-boot,dm-pre-reloc; + pinctrl-names = "default", "opendrain", "sleep"; + pinctrl-0 = <&sdmmc1_pins_mx>; + pinctrl-1 = <&sdmmc1_opendrain_pins_mx>; + pinctrl-2 = <&sdmmc1_sleep_pins_mx>; + status = "okay"; + + cd-gpios = <&gpiog 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; + disable-wp; + st,neg-edge; + bus-width = <4>; + vmmc-supply = <&v3v3>; +}; + +&tamp{ + status = "okay"; +}; + +&uart4{ + u-boot,dm-pre-reloc; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&uart4_pins_mx>; + pinctrl-1 = <&uart4_sleep_pins_mx>; + status = "okay"; + + /delete-property/ dmas; + /delete-property/ dma-names; +}; + +&usbh_ehci{ + status = "okay"; + phys = <&usbphyc_port0>; +}; + +&usbh_ohci{ + status = "okay"; +}; + +&usbotg_hs{ + u-boot,dm-pre-reloc; + status = "okay"; + phys = <&usbphyc_port1 0>; + phy-names = "usb2-phy"; +}; + +&usbphyc{ + u-boot,dm-pre-reloc; + status = "okay"; +}; + +&usbphyc_port0{ + u-boot,dm-pre-reloc; + status = "okay"; + phy-supply = <&vdd_usb>; + st,phy-tuning = <&usb_phy_tuning>; +}; + +&usbphyc_port1{ + u-boot,dm-pre-reloc; + status = "okay"; + phy-supply = <&vdd_usb>; + st,phy-tuning = <&usb_phy_tuning>; +}; + +&adc { + vdd-supply = <&vdd>; + vdda-supply = <&vdda>; + vref-supply = <&vdda>; + status = "okay"; + adc1: adc@0 { + st,min-sample-time-nsecs = <5000>; + st,adc-channels = <0 1>; + status = "okay"; + }; + + adc2: adc@100 { + status = "okay"; + }; + + adc_temp: temp { + status = "okay"; + }; +}; + +&usbh_ohci{ + phys = <&usbphyc_port0>; +}; + +&cpu0{ + cpu-supply = <&vddcore>; +}; + +&cpu1{ + cpu-supply = <&vddcore>; +}; + +&sram{ + dma_pool:dma_pool@0{ + reg = <0x50000 0x10000>; + pool; + }; +}; + +&spi2 { + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&spi2_pins_mx>; + pinctrl-1 = <&spi2_sleep_pins_mx>; + cs-gpios = <&gpioi 0 0>; + status = "okay"; + + spidev2: spidev2@0{ + compatible = "rohm,dh2228fv"; + spi-max-frequency = <30000000>; + reg = <0>; + }; +}; + +&spi4 { + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&spi4_pins_mx>; + pinctrl-1 = <&spi4_sleep_pins_mx>; + cs-gpios = <&gpioe 11 0>; + status = "okay"; + + spidev4: spidev4@0{ + compatible = "rohm,dh2228fv"; + spi-max-frequency = <30000000>; + reg = <0>; + }; +}; + +&spi6 { + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&spi6_pins_mx>; + pinctrl-1 = <&spi6_sleep_pins_mx>; + cs-gpios = <&gpioz 3 0>; + status = "okay"; + + spidev6: spidev6@0{ + compatible = "rohm,dh2228fv"; + spi-max-frequency = <30000000>; + reg = <0>; + }; +}; + +&usart2 { + pinctrl-names = "default", "sleep", "idle"; + pinctrl-0 = <&usart2_pins_mx>; + pinctrl-1 = <&usart2_sleep_pins_mx>; + pinctrl-2 = <&usart2_idle_pins_mx>; + status = "okay"; +}; + +&uart5 { + pinctrl-names = "default", "sleep", "idle"; + pinctrl-0 = <&uart5_pins_mx>; + pinctrl-1 = <&uart5_sleep_pins_mx>; + pinctrl-2 = <&uart5_idle_pins_mx>; + status = "okay"; +}; + +&uart7 { + pinctrl-names = "default", "sleep", "idle"; + pinctrl-0 = <&uart7_pins_mx>; + pinctrl-1 = <&uart7_sleep_pins_mx>; + pinctrl-2 = <&uart7_idle_pins_mx>; + status = "okay"; +}; + +&uart8 { + pinctrl-names = "default", "sleep", "idle"; + pinctrl-0 = <&uart8_pins_mx>; + pinctrl-1 = <&uart8_sleep_pins_mx>; + pinctrl-2 = <&uart8_idle_pins_mx>; + status = "okay"; +}; + +&m_can1 { + pinctrl-names = "default"; + pinctrl-0 = <&m_can1_pins_mx>; + status = "okay"; + can-transceiver { + max-bitrate = <5000000>; + }; +}; + +&timers1 { + status = "okay"; + /* spare dmas for other usage */ + /delete-property/dmas; + /delete-property/dma-names; + pwm1: pwm { + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&pwm1_pins_mx>; + pinctrl-1 = <&pwm1_sleep_pins_mx>; + status = "okay"; + }; +}; + +&timers3 { + status = "okay"; + /* spare dmas for other usage */ + /delete-property/dmas; + /delete-property/dma-names; + pwm3: pwm { + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&pwm3_pins_mx>; + pinctrl-1 = <&pwm3_sleep_pins_mx>; + status = "okay"; + }; +}; + +&timers4 { + status = "okay"; + /* spare dmas for other usage */ + /delete-property/dmas; + /delete-property/dma-names; + pwm4: pwm { + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&pwm4_pins_mx>; + pinctrl-1 = <&pwm4_sleep_pins_mx>; + status = "okay"; + }; +}; + +&timers8 { + status = "okay"; + /* spare dmas for other usage */ + /delete-property/dmas; + /delete-property/dma-names; + pwm8: pwm { + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&pwm8_pins_mx>; + pinctrl-1 = <&pwm8_sleep_pins_mx>; + status = "okay"; + }; +}; + +&timers12 { + status = "okay"; + /* spare dmas for other usage */ + /delete-property/dmas; + /delete-property/dma-names; + pwm12: pwm { + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&pwm12_pins_mx>; + pinctrl-1 = <&pwm12_sleep_pins_mx>; + status = "okay"; + }; +}; diff --git a/board/octavo/osd32mp1-brk/overlay/boot/extlinux/extlinux.conf b/board/octavo/osd32mp1-brk/overlay/boot/extlinux/extlinux.conf new file mode 100644 index 00000000000..a1ca2e58d6c --- /dev/null +++ b/board/octavo/osd32mp1-brk/overlay/boot/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +label osd32mp1-brk-buildroot + kernel /boot/zImage + devicetree /boot/stm32mp157c-osd32mp1-brk.dtb + append root=/dev/mmcblk0p4 rootwait diff --git a/board/octavo/osd32mp1-brk/patches/uboot/0001-Add-OSD32MP1-BRK-device-tree-support.patch b/board/octavo/osd32mp1-brk/patches/uboot/0001-Add-OSD32MP1-BRK-device-tree-support.patch new file mode 100644 index 00000000000..3e4b6de2359 --- /dev/null +++ b/board/octavo/osd32mp1-brk/patches/uboot/0001-Add-OSD32MP1-BRK-device-tree-support.patch @@ -0,0 +1,1509 @@ +From 4731b1f73e0bfe3e3539f6b7c17e0f5366996a98 Mon Sep 17 00:00:00 2001 +From: "neeraj.dantu" +Date: Sun, 21 Nov 2021 23:26:05 -0600 +Subject: [PATCH 1/2] Add OSD32MP1-BRK device tree support + +Signed-off-by: Kory Maincent +--- + arch/arm/dts/Makefile | 3 +- + .../dts/stm32mp15-osd32mp1-ddr3-1x4Gb.dtsi | 119 ++ + .../dts/stm32mp157c-osd32mp1-brk-u-boot.dtsi | 219 ++++ + arch/arm/dts/stm32mp157c-osd32mp1-brk.dts | 1120 +++++++++++++++++ + 4 files changed, 1460 insertions(+), 1 deletion(-) + create mode 100644 arch/arm/dts/stm32mp15-osd32mp1-ddr3-1x4Gb.dtsi + create mode 100644 arch/arm/dts/stm32mp157c-osd32mp1-brk-u-boot.dtsi + create mode 100644 arch/arm/dts/stm32mp157c-osd32mp1-brk.dts + +diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile +index 83677c3d4f..6e67c6d18a 100644 +--- a/arch/arm/dts/Makefile ++++ b/arch/arm/dts/Makefile +@@ -959,7 +959,8 @@ dtb-$(CONFIG_STM32MP15x) += \ + stm32mp157f-ed1.dtb \ + stm32mp157f-ev1.dtb \ + stm32mp15xx-dhcom-pdk2.dtb \ +- stm32mp15xx-dhcor-avenger96.dtb ++ stm32mp15xx-dhcor-avenger96.dtb \ ++ stm32mp157c-osd32mp1-brk.dtb + + dtb-$(CONFIG_SOC_K3_AM6) += k3-am654-base-board.dtb k3-am654-r5-base-board.dtb + dtb-$(CONFIG_SOC_K3_J721E) += k3-j721e-common-proc-board.dtb \ +diff --git a/arch/arm/dts/stm32mp15-osd32mp1-ddr3-1x4Gb.dtsi b/arch/arm/dts/stm32mp15-osd32mp1-ddr3-1x4Gb.dtsi +new file mode 100644 +index 0000000000..362f3281b8 +--- /dev/null ++++ b/arch/arm/dts/stm32mp15-osd32mp1-ddr3-1x4Gb.dtsi +@@ -0,0 +1,119 @@ ++/* ++ * Copyright (C) 2015-2018, STMicroelectronics - All Rights Reserved ++ * ++ * SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause ++ * ++ */ ++ ++/* ++ * File generated by STMicroelectronics STM32CubeMX DDR Tool for MPUs ++ * DDR type: DDR3 / DDR3L ++ * DDR width: 16bits ++ * DDR density: 4Gb ++ * System frequency: 533000Khz ++ * Relaxed Timing Mode: false ++ * Address mapping type: RBC ++ * ++ * Save Date: 2020.08.20, save Time: 10:57:25 ++ */ ++ ++#define DDR_MEM_NAME "DDR3-DDR3L 16bits 533000Khz" ++#define DDR_MEM_SPEED 533000 ++#define DDR_MEM_SIZE 0x20000000 ++ ++#define DDR_MSTR 0x00041401 ++#define DDR_MRCTRL0 0x00000010 ++#define DDR_MRCTRL1 0x00000000 ++#define DDR_DERATEEN 0x00000000 ++#define DDR_DERATEINT 0x00800000 ++#define DDR_PWRCTL 0x00000000 ++#define DDR_PWRTMG 0x00400010 ++#define DDR_HWLPCTL 0x00000000 ++#define DDR_RFSHCTL0 0x00210000 ++#define DDR_RFSHCTL3 0x00000000 ++#define DDR_RFSHTMG 0x0081008B ++#define DDR_CRCPARCTL0 0x00000000 ++#define DDR_DRAMTMG0 0x121B2414 ++#define DDR_DRAMTMG1 0x000A041C ++#define DDR_DRAMTMG2 0x0608090F ++#define DDR_DRAMTMG3 0x0050400C ++#define DDR_DRAMTMG4 0x08040608 ++#define DDR_DRAMTMG5 0x06060403 ++#define DDR_DRAMTMG6 0x02020002 ++#define DDR_DRAMTMG7 0x00000202 ++#define DDR_DRAMTMG8 0x00001005 ++#define DDR_DRAMTMG14 0x000000A0 ++#define DDR_ZQCTL0 0xC2000040 ++#define DDR_DFITMG0 0x02060105 ++#define DDR_DFITMG1 0x00000202 ++#define DDR_DFILPCFG0 0x07000000 ++#define DDR_DFIUPD0 0xC0400003 ++#define DDR_DFIUPD1 0x00000000 ++#define DDR_DFIUPD2 0x00000000 ++#define DDR_DFIPHYMSTR 0x00000000 ++#define DDR_ODTCFG 0x06000600 ++#define DDR_ODTMAP 0x00000001 ++#define DDR_SCHED 0x00000C01 ++#define DDR_SCHED1 0x00000000 ++#define DDR_PERFHPR1 0x01000001 ++#define DDR_PERFLPR1 0x08000200 ++#define DDR_PERFWR1 0x08000400 ++#define DDR_DBG0 0x00000000 ++#define DDR_DBG1 0x00000000 ++#define DDR_DBGCMD 0x00000000 ++#define DDR_POISONCFG 0x00000000 ++#define DDR_PCCFG 0x00000010 ++#define DDR_PCFGR_0 0x00010000 ++#define DDR_PCFGW_0 0x00000000 ++#define DDR_PCFGQOS0_0 0x02100C03 ++#define DDR_PCFGQOS1_0 0x00800100 ++#define DDR_PCFGWQOS0_0 0x01100C03 ++#define DDR_PCFGWQOS1_0 0x01000200 ++#define DDR_PCFGR_1 0x00010000 ++#define DDR_PCFGW_1 0x00000000 ++#define DDR_PCFGQOS0_1 0x02100C03 ++#define DDR_PCFGQOS1_1 0x00800040 ++#define DDR_PCFGWQOS0_1 0x01100C03 ++#define DDR_PCFGWQOS1_1 0x01000200 ++#define DDR_ADDRMAP1 0x00070707 ++#define DDR_ADDRMAP2 0x00000000 ++#define DDR_ADDRMAP3 0x1F000000 ++#define DDR_ADDRMAP4 0x00001F1F ++#define DDR_ADDRMAP5 0x06060606 ++#define DDR_ADDRMAP6 0x0F060606 ++#define DDR_ADDRMAP9 0x00000000 ++#define DDR_ADDRMAP10 0x00000000 ++#define DDR_ADDRMAP11 0x00000000 ++#define DDR_PGCR 0x01442E02 ++#define DDR_PTR0 0x0022AA5B ++#define DDR_PTR1 0x04841104 ++#define DDR_PTR2 0x042DA068 ++#define DDR_ACIOCR 0x10400812 ++#define DDR_DXCCR 0x00000C40 ++#define DDR_DSGCR 0xF200011F ++#define DDR_DCR 0x0000000B ++#define DDR_DTPR0 0x38D488D0 ++#define DDR_DTPR1 0x098B00D8 ++#define DDR_DTPR2 0x10023600 ++#define DDR_MR0 0x00000840 ++#define DDR_MR1 0x00000000 ++#define DDR_MR2 0x00000208 ++#define DDR_MR3 0x00000000 ++#define DDR_ODTCR 0x00010000 ++#define DDR_ZQ0CR1 0x00000038 ++#define DDR_DX0GCR 0x0000CE81 ++#define DDR_DX0DLLCR 0x40000000 ++#define DDR_DX0DQTR 0xFFFFFFFF ++#define DDR_DX0DQSTR 0x3DB02000 ++#define DDR_DX1GCR 0x0000CE81 ++#define DDR_DX1DLLCR 0x40000000 ++#define DDR_DX1DQTR 0xFFFFFFFF ++#define DDR_DX1DQSTR 0x3DB02000 ++#define DDR_DX2GCR 0x0000CE80 ++#define DDR_DX2DLLCR 0x40000000 ++#define DDR_DX2DQTR 0xFFFFFFFF ++#define DDR_DX2DQSTR 0x3DB02000 ++#define DDR_DX3GCR 0x0000CE80 ++#define DDR_DX3DLLCR 0x40000000 ++#define DDR_DX3DQTR 0xFFFFFFFF ++#define DDR_DX3DQSTR 0x3DB02000 +diff --git a/arch/arm/dts/stm32mp157c-osd32mp1-brk-u-boot.dtsi b/arch/arm/dts/stm32mp157c-osd32mp1-brk-u-boot.dtsi +new file mode 100644 +index 0000000000..b7284f3028 +--- /dev/null ++++ b/arch/arm/dts/stm32mp157c-osd32mp1-brk-u-boot.dtsi +@@ -0,0 +1,219 @@ ++/* SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause*/ ++/* ++ * Copyright (C) 2020, Octavo Systems LLC - All Rights Reserved ++ */ ++ ++/* For more information on Device Tree configuration, please refer to ++ * https://wiki.st.com/stm32mpu/wiki/Category:Device_tree_configuration ++ */ ++ ++#include ++#include "stm32mp15-osd32mp1-ddr3-1x4Gb.dtsi" ++#include "stm32mp15-u-boot.dtsi" ++#include "stm32mp15-ddr.dtsi" ++ ++ ++/ { ++ ++ aliases{ ++ i2c0 = &i2c4; ++ mmc0 = &sdmmc1; ++ usb0 = &usbotg_hs; ++ }; ++ ++ config{ ++ u-boot,boot-led = "LED2_GRN"; ++ u-boot,error-led = "LED2_RED"; ++ u-boot,mmc-env-partition = "fip"; ++ st,stm32prog-gpios = <&gpiod 9 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; ++ }; ++ ++#ifdef CONFIG_STM32MP15x_STM32IMAGE ++ config { ++ u-boot,mmc-env-partition = "ssbl"; ++ }; ++ ++ /* only needed for boot with TF-A, witout FIP support */ ++ firmware { ++ optee { ++ compatible = "linaro,optee-tz"; ++ method = "smc"; ++ }; ++ }; ++ ++ reserved-memory { ++ optee@de000000 { ++ reg = <0xde000000 0x02000000>; ++ no-map; ++ }; ++ }; ++#endif ++ ++}; /*root*/ ++ ++#ifndef CONFIG_TFABOOT ++ ++&clk_hse { ++ st,digbypass; ++}; ++ ++&rcc { ++ u-boot,dm-pre-reloc; ++ st,clksrc = < ++ CLK_MPU_PLL1P ++ CLK_AXI_PLL2P ++ CLK_MCU_PLL3P ++ CLK_PLL12_HSE ++ CLK_PLL3_HSE ++ CLK_PLL4_HSE ++ CLK_RTC_LSE ++ CLK_MCO1_DISABLED ++ CLK_MCO2_DISABLED ++ >; ++ st,clkdiv = < ++ 1 /*MPU*/ ++ 0 /*AXI*/ ++ 0 /*MCU*/ ++ 1 /*APB1*/ ++ 1 /*APB2*/ ++ 1 /*APB3*/ ++ 1 /*APB4*/ ++ 2 /*APB5*/ ++ 23 /*RTC*/ ++ 0 /*MCO1*/ ++ 0 /*MCO2*/ ++ >; ++ st,pkcs = < ++ CLK_CKPER_HSE ++ CLK_FMC_ACLK ++ CLK_QSPI_ACLK ++ CLK_ETH_DISABLED ++ CLK_SDMMC12_PLL4P ++ CLK_DSI_DSIPLL ++ CLK_STGEN_HSE ++ CLK_USBPHY_HSE ++ CLK_SPI2S1_PLL3Q ++ CLK_SPI2S23_PLL3Q ++ CLK_SPI45_HSI ++ CLK_SPI6_HSI ++ CLK_I2C46_HSI ++ CLK_SDMMC3_PLL4P ++ CLK_USBO_USBPHY ++ CLK_ADC_CKPER ++ CLK_CEC_LSE ++ CLK_I2C12_HSI ++ CLK_I2C35_HSI ++ CLK_UART1_HSI ++ CLK_UART24_HSI ++ CLK_UART35_HSI ++ CLK_UART6_HSI ++ CLK_UART78_HSI ++ CLK_SPDIF_PLL4P ++ CLK_FDCAN_PLL4R ++ CLK_SAI1_PLL3Q ++ CLK_SAI2_PLL3Q ++ CLK_SAI3_PLL3Q ++ CLK_SAI4_PLL3Q ++ CLK_RNG1_LSI ++ CLK_RNG2_LSI ++ CLK_LPTIM1_PCLK1 ++ CLK_LPTIM23_PCLK3 ++ CLK_LPTIM45_LSE ++ >; ++ pll2:st,pll@1 { ++ compatible = "st,stm32mp1-pll"; ++ reg = <1>; ++ cfg = < 2 65 1 0 0 PQR(1,1,1) >; ++ frac = < 0x1400 >; ++ u-boot,dm-pre-reloc; ++ }; ++ pll3:st,pll@2 { ++ compatible = "st,stm32mp1-pll"; ++ reg = <2>; ++ cfg = < 1 33 1 16 36 PQR(1,1,1) >; ++ frac = < 0x1a04 >; ++ u-boot,dm-pre-reloc; ++ }; ++ pll4:st,pll@3 { ++ compatible = "st,stm32mp1-pll"; ++ reg = <3>; ++ cfg = < 3 98 5 7 7 PQR(1,1,1) >; ++ u-boot,dm-pre-reloc; ++ }; ++}; ++ ++&i2c4{ ++ u-boot,dm-pre-reloc; ++}; ++ ++&i2c4_pins_z_mx { ++ u-boot,dm-pre-reloc; ++ pins { ++ u-boot,dm-pre-reloc; ++ }; ++}; ++ ++&sdmmc1{ ++ u-boot,dm-pre-reloc; ++}; ++ ++&sdmmc1_pins_mx { ++ u-boot,dm-spl; ++ pins1 { ++ u-boot,dm-spl; ++ }; ++ pins2 { ++ u-boot,dm-spl; ++ }; ++}; ++ ++#endif /*CONFIG_TFABOOT*/ ++ ++&cryp1{ ++ u-boot,dm-pre-reloc; ++}; ++ ++&hash1{ ++ u-boot,dm-pre-reloc; ++}; ++ ++&uart4{ ++ u-boot,dm-pre-reloc; ++}; ++ ++&usbotg_hs{ ++ u-boot,dm-pre-reloc; ++ u-boot,force-b-session-valid; ++ hnp-srp-disable; ++ dr_mode = "peripheral"; ++}; ++ ++&usbphyc{ ++ u-boot,dm-pre-reloc; ++}; ++ ++&usbphyc_port0{ ++ u-boot,dm-pre-reloc; ++}; ++ ++&usbphyc_port1{ ++ u-boot,dm-pre-reloc; ++}; ++ ++&adc{ ++ status = "okay"; ++}; ++ ++#ifndef CONFIG_STM32MP1_TRUSTED ++&i2s2{ ++ clocks = <&rcc SPI2>, <&rcc SPI2_K>, <&rcc PLL3_Q>, <&rcc PLL3_R>; ++}; ++ ++&pmic{ ++ u-boot,dm-pre-reloc; ++}; ++ ++&sai2{ ++ clocks = <&rcc SAI2>, <&rcc PLL3_Q>, <&rcc PLL3_R>; ++}; ++#endif /*CONFIG_STM32MP1_TRUSTED*/ +diff --git a/arch/arm/dts/stm32mp157c-osd32mp1-brk.dts b/arch/arm/dts/stm32mp157c-osd32mp1-brk.dts +new file mode 100644 +index 0000000000..d5f2793f54 +--- /dev/null ++++ b/arch/arm/dts/stm32mp157c-osd32mp1-brk.dts +@@ -0,0 +1,1120 @@ ++/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */ ++/* ++ * Copyright (C) Octavo Systems LLC 2020 - All Rights Reserved ++ */ ++ ++/* For more information on Device Tree configuration, please refer to ++ * https://wiki.st.com/stm32mpu/wiki/Category:Device_tree_configuration ++ */ ++ ++/dts-v1/; ++#include ++#include "stm32mp157.dtsi" ++#include "stm32mp15xc.dtsi" ++#include "stm32mp15xxac-pinctrl.dtsi" ++#include "stm32mp15-m4-srm.dtsi" ++#include ++#include ++#include ++ ++/ { ++ model = "Octavo OSD32MP1 BRK board"; ++ compatible = "st,stm32mp157c-osd32mp1-brk", "st,stm32mp157"; ++ ++ memory@c0000000 { ++ device_type = "memory"; ++ reg = <0xc0000000 0x20000000>; ++ }; ++ ++ reserved-memory { ++ #address-cells = <1>; ++ #size-cells = <1>; ++ ranges; ++ ++ mcuram2:mcuram2@10000000{ ++ compatible = "shared-dma-pool"; ++ reg = <0x10000000 0x40000>; ++ no-map; ++ }; ++ ++ vdev0vring0:vdev0vring0@10040000{ ++ compatible = "shared-dma-pool"; ++ reg = <0x10040000 0x1000>; ++ no-map; ++ }; ++ ++ vdev0vring1:vdev0vring1@10041000{ ++ compatible = "shared-dma-pool"; ++ reg = <0x10041000 0x1000>; ++ no-map; ++ }; ++ ++ vdev0buffer:vdev0buffer@10042000{ ++ compatible = "shared-dma-pool"; ++ reg = <0x10042000 0x4000>; ++ no-map; ++ }; ++ ++ mcuram:mcuram@30000000{ ++ compatible = "shared-dma-pool"; ++ reg = <0x30000000 0x40000>; ++ no-map; ++ }; ++ ++ retram:retram@38000000{ ++ compatible = "shared-dma-pool"; ++ reg = <0x38000000 0x10000>; ++ no-map; ++ }; ++ ++ gpu_reserved:gpu@d4000000{ ++ reg = <0xd4000000 0x4000000>; ++ no-map; ++ }; ++ }; ++ ++ led{ ++ compatible = "gpio-leds"; ++ ++ red1{ ++ label = "LED1_RED"; ++ gpios = <&gpioz 6 GPIO_ACTIVE_LOW>; ++ linux,default-trigger = "heartbeat"; ++ status = "okay"; ++ default-state = "off"; ++ }; ++ ++ green1{ ++ label = "LED1_GRN"; ++ gpios = <&gpioz 7 GPIO_ACTIVE_LOW>; ++ status = "okay"; ++ default-state = "on"; ++ }; ++ ++ red2{ ++ label = "LED2_RED"; ++ gpios = <&gpioi 8 GPIO_ACTIVE_LOW>; ++ status = "okay"; ++ default-state = "off"; ++ }; ++ ++ green2{ ++ label = "LED2_GRN"; ++ gpios = <&gpioi 9 GPIO_ACTIVE_LOW>; ++ default-state = "off"; ++ }; ++ }; ++ ++ usb_phy_tuning:usb-phy-tuning{ ++ st,hs-dc-level = <2>; ++ st,fs-rftime-tuning; ++ st,hs-rftime-reduction; ++ st,hs-current-trim = <15>; ++ st,hs-impedance-trim = <1>; ++ st,squelch-level = <3>; ++ st,hs-rx-offset = <2>; ++ st,no-lsfs-sc; ++ }; ++ ++ vin:vin{ ++ compatible = "regulator-fixed"; ++ regulator-name = "vin"; ++ regulator-min-microvolt = <5000000>; ++ regulator-max-microvolt = <5000000>; ++ regulator-always-on; ++ }; ++ ++ aliases{ ++ serial0 = &uart4; ++ serial2 = &usart2; ++ serial5 = &uart5; ++ serial7 = &uart7; ++ serial1 = &uart8; ++ }; ++ ++ chosen{ ++ stdout-path = "serial0:115200n8"; ++ }; ++ ++}; /*root*/ ++ ++&pinctrl { ++ u-boot,dm-pre-reloc; ++ i2c1_pins_mx: i2c1-0 { ++ pins { ++ pinmux = , /* I2C1_SCL */ ++ ; /* I2C1_SDA */ ++ bias-disable; ++ drive-open-drain; ++ slew-rate = <0>; ++ }; ++ }; ++ ++ i2c1_pins_sleep_mx: i2c1-1 { ++ pins { ++ pinmux = , /* I2C1_SCL */ ++ ; /* I2C1_SDA */ ++ }; ++ }; ++ ++ i2c2_pins_mx: i2c2-0 { ++ pins { ++ pinmux = , /* I2C2_SCL */ ++ ; /* I2C2_SDA */ ++ bias-disable; ++ drive-open-drain; ++ slew-rate = <0>; ++ }; ++ }; ++ ++ i2c2_pins_sleep_mx: i2c2-1 { ++ pins { ++ pinmux = , /* I2C2_SCL */ ++ ; /* I2C2_SDA */ ++ }; ++ }; ++ ++ i2c5_pins_mx: i2c5-0 { ++ pins { ++ pinmux = , /* I2C5_SCL */ ++ ; /* I2C5_SDA */ ++ bias-disable; ++ drive-open-drain; ++ slew-rate = <0>; ++ }; ++ }; ++ ++ i2c5_pins_sleep_mx: i2c5-1 { ++ pins { ++ pinmux = , /* I2C5_SCL */ ++ ; /* I2C5_SDA */ ++ }; ++ }; ++ ++ spi2_pins_mx: spi2-0 { ++ pins1 { ++ pinmux = , /* SPI2_SCK */ ++ ; /* SPI2_MOSI */ ++ bias-disable; ++ drive-push-pull; ++ slew-rate = <1>; ++ }; ++ ++ pins2 { ++ pinmux = ; /* SPI2_MISO */ ++ bias-disable; ++ }; ++ }; ++ ++ spi2_sleep_pins_mx: spi2-sleep-0 { ++ pins { ++ pinmux = , /* SPI2_SCK */ ++ , /* SPI2_MISO */ ++ ; /* SPI2_MOSI */ ++ }; ++ }; ++ ++ spi4_pins_mx: spi4-0 { ++ pins1 { ++ pinmux = , /* SPI4_SCK */ ++ ; /* SPI4_MOSI */ ++ bias-disable; ++ drive-push-pull; ++ slew-rate = <1>; ++ }; ++ ++ pins2 { ++ pinmux = ; /* SPI4_MISO */ ++ bias-disable; ++ }; ++ }; ++ ++ spi4_sleep_pins_mx: spi4-sleep-0 { ++ pins { ++ pinmux = , /* SPI2_SCK */ ++ , /* SPI2_MISO */ ++ ; /* SPI2_MOSI */ ++ }; ++ }; ++ ++ usart2_pins_mx: usart2-0 { ++ pins1 { ++ pinmux = ; /* USART2_TX */ ++ bias-disable; ++ drive-push-pull; ++ slew-rate = <0>; ++ }; ++ pins2 { ++ pinmux = ; /* USART2_RX */ ++ bias-disable; ++ }; ++ }; ++ ++ usart2_idle_pins_mx: usart2-idle-0 { ++ pins1 { ++ pinmux = ; /* USART2_TX */ ++ }; ++ pins2 { ++ pinmux = ; /* USART2_RX */ ++ bias-disable; ++ }; ++ }; ++ ++ usart2_sleep_pins_mx: usart2-sleep-0 { ++ pins { ++ pinmux = , /* USART2_TX */ ++ ; /* USART2_RX */ ++ }; ++ }; ++ ++ uart5_pins_mx: uart5-0 { ++ pins1 { ++ pinmux = ; /* USART5_TX */ ++ bias-disable; ++ drive-push-pull; ++ slew-rate = <0>; ++ }; ++ pins2 { ++ pinmux = ; /* USART5_RX */ ++ bias-disable; ++ }; ++ }; ++ ++ uart5_idle_pins_mx: uart5-idle-0 { ++ pins1 { ++ pinmux = ; /* USART5_TX */ ++ }; ++ pins2 { ++ pinmux = ; /* USART5_RX */ ++ bias-disable; ++ }; ++ }; ++ ++ uart5_sleep_pins_mx: uart5-sleep-0 { ++ pins { ++ pinmux = , /* USART5_TX */ ++ ; /* USART5_RX */ ++ }; ++ }; ++ ++ uart7_pins_mx: uart7-0 { ++ pins1 { ++ pinmux = ; /* USART7_TX */ ++ bias-disable; ++ drive-push-pull; ++ slew-rate = <0>; ++ }; ++ pins2 { ++ pinmux = ; /* USART7_RX */ ++ bias-disable; ++ }; ++ }; ++ ++ uart7_idle_pins_mx: uart7-idle-0 { ++ pins1 { ++ pinmux = ; /* USART7_TX */ ++ }; ++ pins2 { ++ pinmux = ; /* USART7_RX */ ++ bias-disable; ++ }; ++ }; ++ ++ uart7_sleep_pins_mx: uart7-sleep-0 { ++ pins { ++ pinmux = , /* USART7_TX */ ++ ; /* USART7_RX */ ++ }; ++ }; ++ ++ uart8_pins_mx: uart8-0 { ++ pins1 { ++ pinmux = ; /* USART8_TX */ ++ bias-disable; ++ drive-push-pull; ++ slew-rate = <0>; ++ }; ++ pins2 { ++ pinmux = ; /* USART8_RX */ ++ bias-disable; ++ }; ++ }; ++ ++ uart8_idle_pins_mx: uart8-idle-0 { ++ pins1 { ++ pinmux = ; /* USART8_TX */ ++ }; ++ pins2 { ++ pinmux = ; /* USART8_RX */ ++ bias-disable; ++ }; ++ }; ++ ++ uart8_sleep_pins_mx: uart8-sleep-0 { ++ pins { ++ pinmux = , /* USART8_TX */ ++ ; /* USART8_RX */ ++ }; ++ }; ++ ++ m_can1_pins_mx: m-can1-0 { ++ pins1 { ++ pinmux = ; /* CAN1_TX */ ++ slew-rate = <0>; ++ drive-push-pull; ++ bias-disable; ++ }; ++ pins2 { ++ pinmux = ; /* CAN1_RX */ ++ bias-disable; ++ }; ++ }; ++ ++ m_can1_sleep_pins_mx: m_can1-sleep@0 { ++ pins { ++ pinmux = , /* CAN1_TX */ ++ ; /* CAN1_RX */ ++ }; ++ }; ++ ++ pwm1_pins_mx: pwm1-0 { ++ pins { ++ pinmux = ; /* TIM1_CH2 */ ++ bias-pull-down; ++ drive-push-pull; ++ slew-rate = <0>; ++ }; ++ }; ++ ++ pwm1_sleep_pins_mx: pwm1-sleep-0 { ++ pins { ++ pinmux = ; /* TIM1_CH1 */ ++ }; ++ }; ++ ++ pwm3_pins_mx: pwm3-0 { ++ pins { ++ pinmux = ; /* TIM3_CH2 */ ++ bias-pull-down; ++ drive-push-pull; ++ slew-rate = <0>; ++ }; ++ }; ++ ++ pwm3_sleep_pins_mx: pwm3-sleep-0 { ++ pins { ++ pinmux = ; /* TIM3_CH2 */ ++ }; ++ }; ++ ++ pwm4_pins_mx: pwm4-0 { ++ pins { ++ pinmux = ; /* TIM4_CH2 */ ++ bias-pull-down; ++ drive-push-pull; ++ slew-rate = <0>; ++ }; ++ }; ++ ++ pwm4_sleep_pins_mx: pwm4-sleep-0 { ++ pins { ++ pinmux = ; /* TIM4_CH2 */ ++ }; ++ }; ++ ++ pwm8_pins_mx: pwm8-0 { ++ pins { ++ pinmux = ; /* TIM8_CH2 */ ++ bias-pull-down; ++ drive-push-pull; ++ slew-rate = <0>; ++ }; ++ }; ++ ++ pwm8_sleep_pins_mx: pwm8-sleep-0 { ++ pins { ++ pinmux = ; /* TIM8_CH2 */ ++ }; ++ }; ++ ++ ++ pwm12_pins_mx: pwm12-0 { ++ pins { ++ pinmux = ; /* TIM12_CH2 */ ++ bias-pull-down; ++ drive-push-pull; ++ slew-rate = <0>; ++ }; ++ }; ++ ++ pwm12_sleep_pins_mx: pwm12-sleep-0 { ++ pins { ++ pinmux = ; /* TIM12_CH2 */ ++ }; ++ }; ++ ++ sdmmc1_pins_mx: sdmmc1_mx-0 { ++ u-boot,dm-pre-reloc; ++ pins1 { ++ u-boot,dm-pre-reloc; ++ pinmux = , /* SDMMC1_D0 */ ++ , /* SDMMC1_D1 */ ++ , /* SDMMC1_D2 */ ++ , /* SDMMC1_D3 */ ++ ; /* SDMMC1_CMD */ ++ bias-disable; ++ drive-push-pull; ++ slew-rate = <1>; ++ }; ++ pins2 { ++ u-boot,dm-pre-reloc; ++ pinmux = ; /* SDMMC1_CK */ ++ bias-disable; ++ drive-push-pull; ++ slew-rate = <2>; ++ }; ++ }; ++ ++ sdmmc1_opendrain_pins_mx: sdmmc1_opendrain_mx-0 { ++ u-boot,dm-pre-reloc; ++ pins1 { ++ u-boot,dm-pre-reloc; ++ pinmux = , /* SDMMC1_D0 */ ++ , /* SDMMC1_D1 */ ++ , /* SDMMC1_D2 */ ++ ; /* SDMMC1_D3 */ ++ bias-disable; ++ drive-push-pull; ++ slew-rate = <1>; ++ }; ++ pins2 { ++ u-boot,dm-pre-reloc; ++ pinmux = ; /* SDMMC1_CK */ ++ bias-disable; ++ drive-push-pull; ++ slew-rate = <2>; ++ }; ++ pins3 { ++ u-boot,dm-pre-reloc; ++ pinmux = ; /* SDMMC1_CMD */ ++ bias-disable; ++ drive-open-drain; ++ slew-rate = <1>; ++ }; ++ }; ++ ++ sdmmc1_sleep_pins_mx: sdmmc1_sleep_mx-0 { ++ u-boot,dm-pre-reloc; ++ pins { ++ u-boot,dm-pre-reloc; ++ pinmux = , /* SDMMC1_D0 */ ++ , /* SDMMC1_D1 */ ++ , /* SDMMC1_D2 */ ++ , /* SDMMC1_D3 */ ++ , /* SDMMC1_CK */ ++ ; /* SDMMC1_CMD */ ++ }; ++ }; ++ ++ uart4_pins_mx: uart4_mx-0 { ++ u-boot,dm-pre-reloc; ++ pins1 { ++ u-boot,dm-pre-reloc; ++ pinmux = ; /* UART4_RX */ ++ /* pull-up on rx to avoid floating level */ ++ bias-pull-up; ++ }; ++ pins2 { ++ u-boot,dm-pre-reloc; ++ pinmux = ; /* UART4_TX */ ++ bias-disable; ++ drive-push-pull; ++ slew-rate = <0>; ++ }; ++ }; ++ ++ uart4_sleep_pins_mx: uart4_sleep_mx-0 { ++ u-boot,dm-pre-reloc; ++ pins { ++ u-boot,dm-pre-reloc; ++ pinmux = , /* UART4_RX */ ++ ; /* UART4_TX */ ++ }; ++ }; ++}; ++ ++&pinctrl_z { ++ u-boot,dm-pre-reloc; ++ ++ i2c4_pins_z_mx: i2c4_mx-0 { ++ u-boot,dm-pre-reloc; ++ pins { ++ u-boot,dm-pre-reloc; ++ pinmux = , /* I2C4_SCL */ ++ ; /* I2C4_SDA */ ++ bias-disable; ++ drive-open-drain; ++ slew-rate = <0>; ++ }; ++ }; ++ ++ i2c4_sleep_pins_z_mx: i2c4_sleep_mx-0 { ++ u-boot,dm-pre-reloc; ++ pins { ++ u-boot,dm-pre-reloc; ++ pinmux = , /* I2C4_SCL */ ++ ; /* I2C4_SDA */ ++ }; ++ }; ++ ++ spi6_pins_mx: spi6-0 { ++ pins1 { ++ pinmux = , /* SPI6_SCK */ ++ ; /* SPI6_MOSI */ ++ bias-disable; ++ drive-push-pull; ++ slew-rate = <1>; ++ }; ++ ++ pins2 { ++ pinmux = ; /* SPI6_MISO */ ++ bias-disable; ++ }; ++ }; ++ ++ spi6_sleep_pins_mx: spi6-sleep-0 { ++ pins { ++ pinmux = , /* SPI6_SCK */ ++ , /* SPI6_MISO */ ++ ; /* SPI6_MOSI */ ++ }; ++ }; ++}; ++ ++&m4_rproc{ ++ memory-region = <&retram>, <&mcuram>, <&mcuram2>, <&vdev0vring0>, ++ <&vdev0vring1>, <&vdev0buffer>; ++ mboxes = <&ipcc 0>, <&ipcc 1>, <&ipcc 2>; ++ mbox-names = "vq0", "vq1", "shutdown"; ++ interrupt-parent = <&exti>; ++ interrupts = <68 1>; ++ wakeup-source; ++ status = "okay"; ++}; ++ ++&pwr_regulators { ++ vdd-supply = <&vdd>; ++ vdd_3v3_usbfs-supply = <&vdd_usb>; ++}; ++ ++ ++&crc1{ ++ status = "okay"; ++}; ++ ++&cryp1{ ++ u-boot,dm-pre-reloc; ++ status = "okay"; ++}; ++ ++&dma1{ ++ status = "okay"; ++ sram = <&dma_pool>; ++}; ++ ++&dma2{ ++ status = "okay"; ++ sram = <&dma_pool>; ++}; ++ ++&dts{ ++ status = "okay"; ++}; ++ ++&gpu{ ++ status = "okay"; ++ contiguous-area = <&gpu_reserved>; ++}; ++ ++&hash1{ ++ u-boot,dm-pre-reloc; ++ status = "okay"; ++}; ++ ++&hsem{ ++ status = "okay"; ++}; ++ ++&i2c1 { ++ pinctrl-names = "default", "sleep"; ++ pinctrl-0 = <&i2c1_pins_mx>; ++ pinctrl-1 = <&i2c1_pins_sleep_mx>; ++ i2c-scl-rising-time-ns = <100>; ++ i2c-scl-falling-time-ns = <7>; ++ status = "okay"; ++ /delete-property/dmas; ++ /delete-property/dma-names; ++}; ++ ++&i2c2 { ++ pinctrl-names = "default", "sleep"; ++ pinctrl-0 = <&i2c2_pins_mx>; ++ pinctrl-1 = <&i2c2_pins_sleep_mx>; ++ i2c-scl-rising-time-ns = <100>; ++ i2c-scl-falling-time-ns = <7>; ++ status = "okay"; ++ /delete-property/dmas; ++ /delete-property/dma-names; ++}; ++ ++&i2c5 { ++ pinctrl-names = "default", "sleep"; ++ pinctrl-0 = <&i2c5_pins_mx>; ++ pinctrl-1 = <&i2c5_pins_sleep_mx>; ++ i2c-scl-rising-time-ns = <100>; ++ i2c-scl-falling-time-ns = <7>; ++ status = "okay"; ++ /delete-property/dmas; ++ /delete-property/dma-names; ++}; ++ ++&i2c4{ ++ u-boot,dm-pre-reloc; ++ pinctrl-names = "default", "sleep"; ++ pinctrl-0 = <&i2c4_pins_z_mx>; ++ pinctrl-1 = <&i2c4_sleep_pins_z_mx>; ++ status = "okay"; ++ ++ i2c-scl-rising-time-ns = <185>; ++ i2c-scl-falling-time-ns = <20>; ++ clock-frequency = <400000>; ++ /delete-property/ dmas; ++ /delete-property/ dma-names; ++ ++ pmic:stpmic@33{ ++ compatible = "st,stpmic1"; ++ reg = <0x33>; ++ interrupts-extended = <&exti_pwr 55 IRQ_TYPE_EDGE_FALLING>; ++ interrupt-controller; ++ #interrupt-cells = <2>; ++ status = "okay"; ++ ++ regulators{ ++ compatible = "st,stpmic1-regulators"; ++ buck1-supply = <&vin>; ++ buck2-supply = <&vin>; ++ buck3-supply = <&vin>; ++ buck4-supply = <&vin>; ++ ldo1-supply = <&v3v3>; ++ ldo2-supply = <&vin>; ++ ldo3-supply = <&vdd_ddr>; ++ ldo4-supply = <&vin>; ++ ldo5-supply = <&vin>; ++ ldo6-supply = <&v3v3>; ++ vref_ddr-supply = <&vin>; ++ boost-supply = <&vin>; ++ pwr_sw1-supply = <&bst_out>; ++ pwr_sw2-supply = <&bst_out>; ++ ++ vddcore:buck1{ ++ regulator-name = "vddcore"; ++ regulator-min-microvolt = <1200000>; ++ regulator-max-microvolt = <1350000>; ++ regulator-always-on; ++ regulator-initial-mode = <0>; ++ regulator-over-current-protection; ++ }; ++ ++ vdd_ddr:buck2{ ++ regulator-name = "vdd_ddr"; ++ regulator-min-microvolt = <1350000>; ++ regulator-max-microvolt = <1350000>; ++ regulator-always-on; ++ regulator-initial-mode = <0>; ++ regulator-over-current-protection; ++ }; ++ ++ vdd:buck3{ ++ regulator-name = "vdd"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-always-on; ++ st,mask-reset; ++ regulator-initial-mode = <0>; ++ regulator-over-current-protection; ++ }; ++ ++ v3v3:buck4{ ++ regulator-name = "v3v3"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-always-on; ++ regulator-over-current-protection; ++ regulator-initial-mode = <0>; ++ }; ++ ++ v1v8_audio:ldo1{ ++ regulator-name = "v1v8_audio"; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <1800000>; ++ regulator-always-on; ++ interrupts = ; ++ }; ++ ++ v3v3_hdmi:ldo2{ ++ regulator-name = "v3v3_hdmi"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-always-on; ++ interrupts = ; ++ }; ++ ++ vtt_ddr:ldo3{ ++ regulator-name = "vtt_ddr"; ++ regulator-min-microvolt = <500000>; ++ regulator-max-microvolt = <750000>; ++ regulator-always-on; ++ regulator-over-current-protection; ++ }; ++ ++ vdd_usb:ldo4{ ++ regulator-name = "vdd_usb"; ++ interrupts = ; ++ }; ++ ++ vdda:ldo5{ ++ regulator-name = "vdda"; ++ regulator-min-microvolt = <2900000>; ++ regulator-max-microvolt = <2900000>; ++ interrupts = ; ++ regulator-boot-on; ++ }; ++ ++ v1v2_hdmi:ldo6{ ++ regulator-name = "v1v2_hdmi"; ++ regulator-min-microvolt = <1200000>; ++ regulator-max-microvolt = <1200000>; ++ regulator-always-on; ++ interrupts = ; ++ }; ++ ++ vref_ddr:vref_ddr{ ++ regulator-name = "vref_ddr"; ++ regulator-always-on; ++ regulator-over-current-protection; ++ }; ++ ++ bst_out:boost{ ++ regulator-name = "bst_out"; ++ interrupts = ; ++ }; ++ ++ vbus_otg:pwr_sw1{ ++ regulator-name = "vbus_otg"; ++ interrupts = ; ++ }; ++ ++ vbus_sw:pwr_sw2{ ++ regulator-name = "vbus_sw"; ++ interrupts = ; ++ regulator-active-discharge = <1>; ++ }; ++ }; ++ ++ onkey{ ++ compatible = "st,stpmic1-onkey"; ++ interrupts = , ; ++ interrupt-names = "onkey-falling", "onkey-rising"; ++ power-off-time-sec = <10>; ++ status = "okay"; ++ }; ++ ++ watchdog { ++ compatible = "st,stpmic1-wdt"; ++ status = "disabled"; ++ }; ++ }; ++ eeprom@50 { ++ compatible = "atmel,24c02"; ++ reg = <0x50>; ++ pagesize = <16>; ++ }; ++}; ++ ++&ipcc{ ++ status = "okay"; ++}; ++ ++&iwdg2{ ++ status = "okay"; ++ timeout-sec = <32>; ++}; ++ ++&mdma1{ ++ status = "okay"; ++}; ++ ++&rcc{ ++ u-boot,dm-pre-reloc; ++ status = "okay"; ++}; ++ ++&rng1{ ++ status = "okay"; ++}; ++ ++&rtc{ ++ status = "okay"; ++}; ++ ++&sdmmc1{ ++ u-boot,dm-pre-reloc; ++ pinctrl-names = "default", "opendrain", "sleep"; ++ pinctrl-0 = <&sdmmc1_pins_mx>; ++ pinctrl-1 = <&sdmmc1_opendrain_pins_mx>; ++ pinctrl-2 = <&sdmmc1_sleep_pins_mx>; ++ status = "okay"; ++ ++ cd-gpios = <&gpiog 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; ++ disable-wp; ++ st,neg-edge; ++ bus-width = <4>; ++ vmmc-supply = <&v3v3>; ++}; ++ ++&tamp{ ++ status = "okay"; ++}; ++ ++&uart4{ ++ u-boot,dm-pre-reloc; ++ pinctrl-names = "default", "sleep"; ++ pinctrl-0 = <&uart4_pins_mx>; ++ pinctrl-1 = <&uart4_sleep_pins_mx>; ++ status = "okay"; ++ ++ /delete-property/ dmas; ++ /delete-property/ dma-names; ++}; ++ ++&usbh_ehci{ ++ status = "okay"; ++ phys = <&usbphyc_port0>; ++}; ++ ++&usbh_ohci{ ++ status = "okay"; ++}; ++ ++&usbotg_hs{ ++ u-boot,dm-pre-reloc; ++ status = "okay"; ++ phys = <&usbphyc_port1 0>; ++ phy-names = "usb2-phy"; ++}; ++ ++&usbphyc{ ++ u-boot,dm-pre-reloc; ++ status = "okay"; ++}; ++ ++&usbphyc_port0{ ++ u-boot,dm-pre-reloc; ++ status = "okay"; ++ phy-supply = <&vdd_usb>; ++ st,phy-tuning = <&usb_phy_tuning>; ++}; ++ ++&usbphyc_port1{ ++ u-boot,dm-pre-reloc; ++ status = "okay"; ++ phy-supply = <&vdd_usb>; ++ st,phy-tuning = <&usb_phy_tuning>; ++}; ++ ++&adc { ++ vdd-supply = <&vdd>; ++ vdda-supply = <&vdda>; ++ vref-supply = <&vdda>; ++ status = "okay"; ++ adc1: adc@0 { ++ st,min-sample-time-nsecs = <5000>; ++ st,adc-channels = <0 1>; ++ status = "okay"; ++ }; ++ ++ adc2: adc@100 { ++ status = "okay"; ++ }; ++ ++ adc_temp: temp { ++ status = "okay"; ++ }; ++}; ++ ++&usbh_ohci{ ++ phys = <&usbphyc_port0>; ++}; ++ ++&cpu0{ ++ cpu-supply = <&vddcore>; ++}; ++ ++&cpu1{ ++ cpu-supply = <&vddcore>; ++}; ++ ++&sram{ ++ dma_pool:dma_pool@0{ ++ reg = <0x50000 0x10000>; ++ pool; ++ }; ++}; ++ ++&spi2 { ++ pinctrl-names = "default", "sleep"; ++ pinctrl-0 = <&spi2_pins_mx>; ++ pinctrl-1 = <&spi2_sleep_pins_mx>; ++ cs-gpios = <&gpioi 0 0>; ++ status = "okay"; ++ ++ spidev2: spidev2@0{ ++ compatible = "rohm,dh2228fv"; ++ spi-max-frequency = <30000000>; ++ reg = <0>; ++ }; ++}; ++ ++&spi4 { ++ pinctrl-names = "default", "sleep"; ++ pinctrl-0 = <&spi4_pins_mx>; ++ pinctrl-1 = <&spi4_sleep_pins_mx>; ++ cs-gpios = <&gpioe 11 0>; ++ status = "okay"; ++ ++ spidev4: spidev4@0{ ++ compatible = "rohm,dh2228fv"; ++ spi-max-frequency = <30000000>; ++ reg = <0>; ++ }; ++}; ++ ++&spi6 { ++ pinctrl-names = "default", "sleep"; ++ pinctrl-0 = <&spi6_pins_mx>; ++ pinctrl-1 = <&spi6_sleep_pins_mx>; ++ cs-gpios = <&gpioz 3 0>; ++ status = "okay"; ++ ++ spidev6: spidev6@0{ ++ compatible = "rohm,dh2228fv"; ++ spi-max-frequency = <30000000>; ++ reg = <0>; ++ }; ++}; ++ ++&usart2 { ++ pinctrl-names = "default", "sleep", "idle"; ++ pinctrl-0 = <&usart2_pins_mx>; ++ pinctrl-1 = <&usart2_sleep_pins_mx>; ++ pinctrl-2 = <&usart2_idle_pins_mx>; ++ status = "okay"; ++}; ++ ++&uart5 { ++ pinctrl-names = "default", "sleep", "idle"; ++ pinctrl-0 = <&uart5_pins_mx>; ++ pinctrl-1 = <&uart5_sleep_pins_mx>; ++ pinctrl-2 = <&uart5_idle_pins_mx>; ++ status = "okay"; ++}; ++ ++&uart7 { ++ pinctrl-names = "default", "sleep", "idle"; ++ pinctrl-0 = <&uart7_pins_mx>; ++ pinctrl-1 = <&uart7_sleep_pins_mx>; ++ pinctrl-2 = <&uart7_idle_pins_mx>; ++ status = "okay"; ++}; ++ ++&uart8 { ++ pinctrl-names = "default", "sleep", "idle"; ++ pinctrl-0 = <&uart8_pins_mx>; ++ pinctrl-1 = <&uart8_sleep_pins_mx>; ++ pinctrl-2 = <&uart8_idle_pins_mx>; ++ status = "okay"; ++}; ++ ++&m_can1 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&m_can1_pins_mx>; ++ status = "okay"; ++ can-transceiver { ++ max-bitrate = <5000000>; ++ }; ++}; ++ ++&timers1 { ++ status = "okay"; ++ /* spare dmas for other usage */ ++ /delete-property/dmas; ++ /delete-property/dma-names; ++ pwm1: pwm { ++ pinctrl-names = "default", "sleep"; ++ pinctrl-0 = <&pwm1_pins_mx>; ++ pinctrl-1 = <&pwm1_sleep_pins_mx>; ++ status = "okay"; ++ }; ++}; ++ ++&timers3 { ++ status = "okay"; ++ /* spare dmas for other usage */ ++ /delete-property/dmas; ++ /delete-property/dma-names; ++ pwm3: pwm { ++ pinctrl-names = "default", "sleep"; ++ pinctrl-0 = <&pwm3_pins_mx>; ++ pinctrl-1 = <&pwm3_sleep_pins_mx>; ++ status = "okay"; ++ }; ++}; ++ ++&timers4 { ++ status = "okay"; ++ /* spare dmas for other usage */ ++ /delete-property/dmas; ++ /delete-property/dma-names; ++ pwm4: pwm { ++ pinctrl-names = "default", "sleep"; ++ pinctrl-0 = <&pwm4_pins_mx>; ++ pinctrl-1 = <&pwm4_sleep_pins_mx>; ++ status = "okay"; ++ }; ++}; ++ ++&timers8 { ++ status = "okay"; ++ /* spare dmas for other usage */ ++ /delete-property/dmas; ++ /delete-property/dma-names; ++ pwm8: pwm { ++ pinctrl-names = "default", "sleep"; ++ pinctrl-0 = <&pwm8_pins_mx>; ++ pinctrl-1 = <&pwm8_sleep_pins_mx>; ++ status = "okay"; ++ }; ++}; ++ ++&timers12 { ++ status = "okay"; ++ /* spare dmas for other usage */ ++ /delete-property/dmas; ++ /delete-property/dma-names; ++ pwm12: pwm { ++ pinctrl-names = "default", "sleep"; ++ pinctrl-0 = <&pwm12_pins_mx>; ++ pinctrl-1 = <&pwm12_sleep_pins_mx>; ++ status = "okay"; ++ }; ++}; +-- +2.25.1 + diff --git a/board/octavo/osd32mp1-brk/patches/uboot/0002-Add-OSD32MP1-BRK-build-config.patch b/board/octavo/osd32mp1-brk/patches/uboot/0002-Add-OSD32MP1-BRK-build-config.patch new file mode 100644 index 00000000000..ff323562e69 --- /dev/null +++ b/board/octavo/osd32mp1-brk/patches/uboot/0002-Add-OSD32MP1-BRK-build-config.patch @@ -0,0 +1,881 @@ +From cbe33390a338428d74a4549cb28e25af42d7f7d9 Mon Sep 17 00:00:00 2001 +From: "neeraj.dantu" +Date: Sun, 21 Nov 2021 23:31:02 -0600 +Subject: [PATCH 2/2] Add OSD32MP1-BRK build config + +Signed-off-by: Kory Maincent +--- + arch/arm/mach-stm32mp/Kconfig | 10 +- + board/octavo/osd32mp1-brk/Kconfig | 13 + + board/octavo/osd32mp1-brk/MAINTAINERS | 8 + + board/octavo/osd32mp1-brk/Makefile | 9 + + board/octavo/osd32mp1-brk/board.c | 631 +++++++++++++++++++++++++ + configs/osd32mp1_brk_trusted_defconfig | 141 ++++++ + 6 files changed, 811 insertions(+), 1 deletion(-) + create mode 100644 board/octavo/osd32mp1-brk/Kconfig + create mode 100644 board/octavo/osd32mp1-brk/MAINTAINERS + create mode 100644 board/octavo/osd32mp1-brk/Makefile + create mode 100644 board/octavo/osd32mp1-brk/board.c + create mode 100644 configs/osd32mp1_brk_trusted_defconfig + +diff --git a/arch/arm/mach-stm32mp/Kconfig b/arch/arm/mach-stm32mp/Kconfig +index 44bfac9000..006855acad 100644 +--- a/arch/arm/mach-stm32mp/Kconfig ++++ b/arch/arm/mach-stm32mp/Kconfig +@@ -92,6 +92,14 @@ config TARGET_DH_STM32MP1_PDK2 + help + Target the DH PDK2 development kit with STM32MP15x SoM. + ++config TARGET_OCTAVO_OSD32MP1_BRK ++ bool "Octavo OSD32MP1 BRK" ++ select STM32MP15x ++ imply BOOTCOUNT_LIMIT ++ imply CMD_BOOTCOUNT ++ help ++ Target the Octavo BRK board based on OSD32MP1 SiP. ++ + endchoice + + config SYS_TEXT_BASE +@@ -172,5 +180,5 @@ endif + source "arch/arm/mach-stm32mp/cmd_stm32prog/Kconfig" + source "board/st/stm32mp1/Kconfig" + source "board/dhelectronics/dh_stm32mp1/Kconfig" +- ++source "board/octavo/osd32mp1-brk/Kconfig" + endif +diff --git a/board/octavo/osd32mp1-brk/Kconfig b/board/octavo/osd32mp1-brk/Kconfig +new file mode 100644 +index 0000000000..907a09c170 +--- /dev/null ++++ b/board/octavo/osd32mp1-brk/Kconfig +@@ -0,0 +1,13 @@ ++if TARGET_OCTAVO_OSD32MP1_BRK ++ ++config SYS_BOARD ++ default "osd32mp1-brk" ++ ++config SYS_VENDOR ++ default "octavo" ++ ++config SYS_CONFIG_NAME ++ default "stm32mp1" ++ ++source "board/st/common/Kconfig" ++endif +diff --git a/board/octavo/osd32mp1-brk/MAINTAINERS b/board/octavo/osd32mp1-brk/MAINTAINERS +new file mode 100644 +index 0000000000..9c0addbc21 +--- /dev/null ++++ b/board/octavo/osd32mp1-brk/MAINTAINERS +@@ -0,0 +1,8 @@ ++OCTAVO osd32mp1-brk BOARD ++M: Martin Lesniak ++M: Neeraj Dantu ++S: Maintained ++F: arch/arm/dts/stm32mp157c-osd32mp1-brk* ++F: board/Octavo/osd32mp1-brk/ ++F: configs/osd32mp1_brk_trusted_defconfig ++F: include/configs/stm32mp1.h +diff --git a/board/octavo/osd32mp1-brk/Makefile b/board/octavo/osd32mp1-brk/Makefile +new file mode 100644 +index 0000000000..b368b396a4 +--- /dev/null ++++ b/board/octavo/osd32mp1-brk/Makefile +@@ -0,0 +1,9 @@ ++# SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause ++# ++# Copyright (C) 2018, STMicroelectronics - All Rights Reserved ++# ++ ++obj-y += ../../st/common/stpmic1.o board.o ++ ++obj-$(CONFIG_SYS_MTDPARTS_RUNTIME) += ../../st/common/stm32mp_mtdparts.o ++obj-$(CONFIG_SET_DFU_ALT_INFO) += ../../st/common/stm32mp_dfu.o +diff --git a/board/octavo/osd32mp1-brk/board.c b/board/octavo/osd32mp1-brk/board.c +new file mode 100644 +index 0000000000..fd97c9a390 +--- /dev/null ++++ b/board/octavo/osd32mp1-brk/board.c +@@ -0,0 +1,631 @@ ++// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause ++/* ++ * Copyright (C) 2018, STMicroelectronics - All Rights Reserved ++ */ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++/* SYSCFG registers */ ++#define SYSCFG_BOOTR 0x00 ++#define SYSCFG_PMCSETR 0x04 ++#define SYSCFG_IOCTRLSETR 0x18 ++#define SYSCFG_ICNR 0x1C ++#define SYSCFG_CMPCR 0x20 ++#define SYSCFG_CMPENSETR 0x24 ++#define SYSCFG_PMCCLRR 0x44 ++ ++#define SYSCFG_BOOTR_BOOT_MASK GENMASK(2, 0) ++#define SYSCFG_BOOTR_BOOTPD_SHIFT 4 ++ ++#define SYSCFG_IOCTRLSETR_HSLVEN_TRACE BIT(0) ++#define SYSCFG_IOCTRLSETR_HSLVEN_QUADSPI BIT(1) ++#define SYSCFG_IOCTRLSETR_HSLVEN_ETH BIT(2) ++#define SYSCFG_IOCTRLSETR_HSLVEN_SDMMC BIT(3) ++#define SYSCFG_IOCTRLSETR_HSLVEN_SPI BIT(4) ++ ++#define SYSCFG_CMPCR_SW_CTRL BIT(1) ++#define SYSCFG_CMPCR_READY BIT(8) ++ ++#define SYSCFG_CMPENSETR_MPU_EN BIT(0) ++ ++#define SYSCFG_PMCSETR_ETH_CLK_SEL BIT(16) ++#define SYSCFG_PMCSETR_ETH_REF_CLK_SEL BIT(17) ++ ++#define SYSCFG_PMCSETR_ETH_SELMII BIT(20) ++ ++#define SYSCFG_PMCSETR_ETH_SEL_MASK GENMASK(23, 21) ++#define SYSCFG_PMCSETR_ETH_SEL_GMII_MII 0 ++#define SYSCFG_PMCSETR_ETH_SEL_RGMII BIT(21) ++#define SYSCFG_PMCSETR_ETH_SEL_RMII BIT(23) ++ ++/* ++ * Get a global data pointer ++ */ ++DECLARE_GLOBAL_DATA_PTR; ++ ++int setup_mac_address(void) ++{ ++ struct udevice *dev; ++ ofnode eeprom; ++ unsigned char enetaddr[6]; ++ int ret; ++ ++ ret = eth_env_get_enetaddr("ethaddr", enetaddr); ++ if (ret) /* ethaddr is already set */ ++ return 0; ++ ++ eeprom = ofnode_path("/soc/i2c@5c002000/eeprom@50"); ++ if (!ofnode_valid(eeprom)) { ++ printf("Invalid hardware path to EEPROM!\n"); ++ return -ENODEV; ++ } ++ ++ ret = uclass_get_device_by_ofnode(UCLASS_I2C_EEPROM, eeprom, &dev); ++ if (ret) { ++ printf("Cannot find EEPROM!\n"); ++ return ret; ++ } ++ ++ ret = i2c_eeprom_read(dev, 0xfa, enetaddr, 0x6); ++ if (ret) { ++ printf("Error reading configuration EEPROM!\n"); ++ return ret; ++ } ++ ++ if (is_valid_ethaddr(enetaddr)) ++ eth_env_set_enetaddr("ethaddr", enetaddr); ++ ++ return 0; ++} ++ ++int checkboard(void) ++{ ++ char *mode; ++ const char *fdt_compat; ++ int fdt_compat_len; ++ ++ if (IS_ENABLED(CONFIG_STM32MP15x_STM32IMAGE)) ++ mode = "trusted - stm32image"; ++ else if (IS_ENABLED(CONFIG_TFABOOT)) ++ mode = "trusted"; ++ else ++ mode = "basic"; ++ ++ printf("Board: stm32mp1 in %s mode", mode); ++ fdt_compat = fdt_getprop(gd->fdt_blob, 0, "compatible", ++ &fdt_compat_len); ++ if (fdt_compat && fdt_compat_len) ++ printf(" (%s)", fdt_compat); ++ puts("\n"); ++ ++ return 0; ++} ++ ++static void board_key_check(void) ++{ ++ ofnode node; ++ struct gpio_desc gpio; ++ enum forced_boot_mode boot_mode = BOOT_NORMAL; ++ ++ if (!IS_ENABLED(CONFIG_FASTBOOT) && !IS_ENABLED(CONFIG_CMD_STM32PROG)) ++ return; ++ ++ node = ofnode_path("/config"); ++ if (!ofnode_valid(node)) { ++ debug("%s: no /config node?\n", __func__); ++ return; ++ } ++ if (IS_ENABLED(CONFIG_FASTBOOT)) { ++ if (gpio_request_by_name_nodev(node, "st,fastboot-gpios", 0, ++ &gpio, GPIOD_IS_IN)) { ++ debug("%s: could not find a /config/st,fastboot-gpios\n", ++ __func__); ++ } else { ++ if (dm_gpio_get_value(&gpio)) { ++ puts("Fastboot key pressed, "); ++ boot_mode = BOOT_FASTBOOT; ++ } ++ ++ dm_gpio_free(NULL, &gpio); ++ } ++ } ++ if (IS_ENABLED(CONFIG_CMD_STM32PROG)) { ++ if (gpio_request_by_name_nodev(node, "st,stm32prog-gpios", 0, ++ &gpio, GPIOD_IS_IN)) { ++ debug("%s: could not find a /config/st,stm32prog-gpios\n", ++ __func__); ++ } else { ++ if (dm_gpio_get_value(&gpio)) { ++ puts("STM32Programmer key pressed, "); ++ boot_mode = BOOT_STM32PROG; ++ } ++ dm_gpio_free(NULL, &gpio); ++ } ++ } ++ if (boot_mode != BOOT_NORMAL) { ++ puts("entering download mode...\n"); ++ clrsetbits_le32(TAMP_BOOT_CONTEXT, ++ TAMP_BOOT_FORCED_MASK, ++ boot_mode); ++ } ++} ++ ++int g_dnl_board_usb_cable_connected(void) ++{ ++ struct udevice *dwc2_udc_otg; ++ int ret; ++ ++ if (!IS_ENABLED(CONFIG_USB_GADGET_DWC2_OTG)) ++ return -ENODEV; ++ ret = uclass_get_device_by_driver(UCLASS_USB_GADGET_GENERIC, ++ DM_GET_DRIVER(dwc2_udc_otg), ++ &dwc2_udc_otg); ++ if (!ret) ++ debug("dwc2_udc_otg init failed\n"); ++ ++ return dwc2_udc_B_session_valid(dwc2_udc_otg); ++} ++ ++#ifdef CONFIG_USB_GADGET_DOWNLOAD ++#define STM32MP1_G_DNL_DFU_PRODUCT_NUM 0xdf11 ++#define STM32MP1_G_DNL_FASTBOOT_PRODUCT_NUM 0x0afb ++ ++int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name) ++{ ++ if (IS_ENABLED(CONFIG_DFU_OVER_USB) && ++ !strcmp(name, "usb_dnl_dfu")) ++ put_unaligned(STM32MP1_G_DNL_DFU_PRODUCT_NUM, &dev->idProduct); ++ else if (IS_ENABLED(CONFIG_FASTBOOT) && ++ !strcmp(name, "usb_dnl_fastboot")) ++ put_unaligned(STM32MP1_G_DNL_FASTBOOT_PRODUCT_NUM, ++ &dev->idProduct); ++ else ++ put_unaligned(CONFIG_USB_GADGET_PRODUCT_NUM, &dev->idProduct); ++ ++ return 0; ++} ++#endif /* CONFIG_USB_GADGET_DOWNLOAD */ ++ ++static int get_led(struct udevice **dev, char *led_string) ++{ ++ char *led_name; ++ int ret; ++ ++ led_name = fdtdec_get_config_string(gd->fdt_blob, led_string); ++ if (!led_name) { ++ pr_debug("%s: could not find %s config string\n", ++ __func__, led_string); ++ return -ENOENT; ++ } ++ ret = led_get_by_label(led_name, dev); ++ if (ret) { ++ debug("%s: get=%d\n", __func__, ret); ++ return ret; ++ } ++ ++ return 0; ++} ++ ++static int setup_led(enum led_state_t cmd) ++{ ++ struct udevice *dev; ++ int ret; ++ ++ if (!CONFIG_IS_ENABLED(LED)) ++ return 0; ++ ++ ret = get_led(&dev, "u-boot,boot-led"); ++ if (ret) ++ return ret; ++ ++ ret = led_set_state(dev, cmd); ++ return ret; ++} ++ ++static void __maybe_unused led_error_blink(u32 nb_blink) ++{ ++ int ret; ++ struct udevice *led; ++ u32 i; ++ ++ if (!nb_blink) ++ return; ++ ++ if (CONFIG_IS_ENABLED(LED)) { ++ ret = get_led(&led, "u-boot,error-led"); ++ if (!ret) { ++ /* make u-boot,error-led blinking */ ++ /* if U32_MAX and 125ms interval, for 17.02 years */ ++ for (i = 0; i < 2 * nb_blink; i++) { ++ led_set_state(led, LEDST_TOGGLE); ++ mdelay(125); ++ WATCHDOG_RESET(); ++ } ++ led_set_state(led, LEDST_ON); ++ } ++ } ++ ++ /* infinite: the boot process must be stopped */ ++ if (nb_blink == U32_MAX) ++ hang(); ++} ++ ++static void sysconf_init(void) ++{ ++ u8 *syscfg; ++ struct udevice *pwr_dev; ++ struct udevice *pwr_reg; ++ struct udevice *dev; ++ u32 otp = 0; ++ int ret; ++ u32 bootr, val; ++ ++ syscfg = (u8 *)syscon_get_first_range(STM32MP_SYSCON_SYSCFG); ++ ++ /* interconnect update : select master using the port 1 */ ++ /* LTDC = AXI_M9 */ ++ /* GPU = AXI_M8 */ ++ /* today information is hardcoded in U-Boot */ ++ writel(BIT(9), syscfg + SYSCFG_ICNR); ++ ++ /* disable Pull-Down for boot pin connected to VDD */ ++ bootr = readl(syscfg + SYSCFG_BOOTR); ++ bootr &= ~(SYSCFG_BOOTR_BOOT_MASK << SYSCFG_BOOTR_BOOTPD_SHIFT); ++ bootr |= (bootr & SYSCFG_BOOTR_BOOT_MASK) << SYSCFG_BOOTR_BOOTPD_SHIFT; ++ writel(bootr, syscfg + SYSCFG_BOOTR); ++ ++ /* High Speed Low Voltage Pad mode Enable for SPI, SDMMC, ETH, QSPI ++ * and TRACE. Needed above ~50MHz and conditioned by AFMUX selection. ++ * The customer will have to disable this for low frequencies ++ * or if AFMUX is selected but the function not used, typically for ++ * TRACE. Otherwise, impact on power consumption. ++ * ++ * WARNING: ++ * enabling High Speed mode while VDD>2.7V ++ * with the OTP product_below_2v5 (OTP 18, BIT 13) ++ * erroneously set to 1 can damage the IC! ++ * => U-Boot set the register only if VDD < 2.7V (in DT) ++ * but this value need to be consistent with board design ++ */ ++ ret = uclass_get_device_by_driver(UCLASS_PMIC, ++ DM_GET_DRIVER(stm32mp_pwr_pmic), ++ &pwr_dev); ++ if (!ret && IS_ENABLED(CONFIG_DM_REGULATOR)) { ++ ret = uclass_get_device_by_driver(UCLASS_MISC, ++ DM_GET_DRIVER(stm32mp_bsec), ++ &dev); ++ if (ret) { ++ pr_err("Can't find stm32mp_bsec driver\n"); ++ return; ++ } ++ ++ ret = misc_read(dev, STM32_BSEC_SHADOW(18), &otp, 4); ++ if (ret > 0) ++ otp = otp & BIT(13); ++ ++ /* get VDD = vdd-supply */ ++ ret = device_get_supply_regulator(pwr_dev, "vdd-supply", ++ &pwr_reg); ++ ++ /* check if VDD is Low Voltage */ ++ if (!ret) { ++ if (regulator_get_value(pwr_reg) < 2700000) { ++ writel(SYSCFG_IOCTRLSETR_HSLVEN_TRACE | ++ SYSCFG_IOCTRLSETR_HSLVEN_QUADSPI | ++ SYSCFG_IOCTRLSETR_HSLVEN_ETH | ++ SYSCFG_IOCTRLSETR_HSLVEN_SDMMC | ++ SYSCFG_IOCTRLSETR_HSLVEN_SPI, ++ syscfg + SYSCFG_IOCTRLSETR); ++ ++ if (!otp) ++ pr_err("product_below_2v5=0: HSLVEN protected by HW\n"); ++ } else { ++ if (otp) ++ pr_err("product_below_2v5=1: HSLVEN update is destructive, no update as VDD>2.7V\n"); ++ } ++ } else { ++ debug("VDD unknown"); ++ } ++ } ++ ++ /* activate automatic I/O compensation ++ * warning: need to ensure CSI enabled and ready in clock driver ++ */ ++ writel(SYSCFG_CMPENSETR_MPU_EN, syscfg + SYSCFG_CMPENSETR); ++ ++ /* poll until ready (1s timeout) */ ++ ret = readl_poll_timeout(syscfg + SYSCFG_CMPCR, val, ++ val & SYSCFG_CMPCR_READY, ++ 1000000); ++ if (ret) { ++ pr_err("SYSCFG: I/O compensation failed, timeout.\n"); ++ led_error_blink(10); ++ } ++ ++ clrbits_le32(syscfg + SYSCFG_CMPCR, SYSCFG_CMPCR_SW_CTRL); ++} ++ ++/* board dependent setup after realloc */ ++int board_init(void) ++{ ++ /* address of boot parameters */ ++ gd->bd->bi_boot_params = STM32_DDR_BASE + 0x100; ++ ++ if (CONFIG_IS_ENABLED(DM_GPIO_HOG)) ++ gpio_hog_probe_all(); ++ ++ board_key_check(); ++ ++ if (IS_ENABLED(CONFIG_DM_REGULATOR)) ++ regulators_enable_boot_on(_DEBUG); ++ ++ if (!IS_ENABLED(CONFIG_TFABOOT)) ++ sysconf_init(); ++ ++ if (CONFIG_IS_ENABLED(LED)) ++ led_default_state(); ++ ++ return 0; ++} ++ ++int board_late_init(void) ++{ ++ char *boot_device; ++ const void *fdt_compat; ++ int fdt_compat_len; ++ int ret; ++ u32 otp; ++ struct udevice *dev; ++ char buf[10]; ++ char dtb_name[256]; ++ int buf_len; ++ ++ if (IS_ENABLED(CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG)) { ++ fdt_compat = fdt_getprop(gd->fdt_blob, 0, "compatible", ++ &fdt_compat_len); ++ if (fdt_compat && fdt_compat_len) { ++ if (strncmp(fdt_compat, "st,", 3) != 0) { ++ env_set("board_name", fdt_compat); ++ } else { ++ env_set("board_name", fdt_compat + 3); ++ ++ buf_len = sizeof(dtb_name); ++ strncpy(dtb_name, fdt_compat + 3, buf_len); ++ buf_len -= strlen(fdt_compat + 3); ++ strncat(dtb_name, ".dtb", buf_len); ++ env_set("fdtfile", dtb_name); ++ } ++ } ++ ret = uclass_get_device_by_driver(UCLASS_MISC, ++ DM_GET_DRIVER(stm32mp_bsec), ++ &dev); ++ ++ if (!ret) ++ ret = misc_read(dev, STM32_BSEC_SHADOW(BSEC_OTP_BOARD), ++ &otp, sizeof(otp)); ++ if (ret > 0 && otp) { ++ snprintf(buf, sizeof(buf), "0x%04x", otp >> 16); ++ env_set("board_id", buf); ++ ++ snprintf(buf, sizeof(buf), "0x%04x", ++ ((otp >> 8) & 0xF) - 1 + 0xA); ++ env_set("board_rev", buf); ++ } ++ } ++ ++ /* Check the boot-source to disable bootdelay */ ++ boot_device = env_get("boot_device"); ++ if (!strcmp(boot_device, "serial") || !strcmp(boot_device, "usb")) ++ env_set("bootdelay", "0"); ++ ++ return 0; ++} ++ ++void board_quiesce_devices(void) ++{ ++ setup_led(LEDST_OFF); ++} ++ ++/* eth init function : weak called in eqos driver */ ++int board_interface_eth_init(struct udevice *dev, ++ phy_interface_t interface_type, ulong rate) ++{ ++ u8 *syscfg; ++ u32 value; ++ bool eth_clk_sel_reg = false; ++ bool eth_ref_clk_sel_reg = false; ++ ++ /* Gigabit Ethernet 125MHz clock selection. */ ++ eth_clk_sel_reg = dev_read_bool(dev, "st,eth_clk_sel"); ++ ++ /* Ethernet 50Mhz RMII clock selection */ ++ eth_ref_clk_sel_reg = ++ dev_read_bool(dev, "st,eth_ref_clk_sel"); ++ ++ syscfg = (u8 *)syscon_get_first_range(STM32MP_SYSCON_SYSCFG); ++ ++ if (!syscfg) ++ return -ENODEV; ++ ++ switch (interface_type) { ++ case PHY_INTERFACE_MODE_MII: ++ value = SYSCFG_PMCSETR_ETH_SEL_GMII_MII | ++ SYSCFG_PMCSETR_ETH_REF_CLK_SEL; ++ debug("%s: PHY_INTERFACE_MODE_MII\n", __func__); ++ break; ++ case PHY_INTERFACE_MODE_GMII: ++ if (eth_clk_sel_reg) ++ value = SYSCFG_PMCSETR_ETH_SEL_GMII_MII | ++ SYSCFG_PMCSETR_ETH_CLK_SEL; ++ else ++ value = SYSCFG_PMCSETR_ETH_SEL_GMII_MII; ++ debug("%s: PHY_INTERFACE_MODE_GMII\n", __func__); ++ break; ++ case PHY_INTERFACE_MODE_RMII: ++ if (eth_ref_clk_sel_reg) ++ value = SYSCFG_PMCSETR_ETH_SEL_RMII | ++ SYSCFG_PMCSETR_ETH_REF_CLK_SEL; ++ else ++ value = SYSCFG_PMCSETR_ETH_SEL_RMII; ++ debug("%s: PHY_INTERFACE_MODE_RMII\n", __func__); ++ break; ++ case PHY_INTERFACE_MODE_RGMII: ++ case PHY_INTERFACE_MODE_RGMII_ID: ++ case PHY_INTERFACE_MODE_RGMII_RXID: ++ case PHY_INTERFACE_MODE_RGMII_TXID: ++ if (eth_clk_sel_reg) ++ value = SYSCFG_PMCSETR_ETH_SEL_RGMII | ++ SYSCFG_PMCSETR_ETH_CLK_SEL; ++ else ++ value = SYSCFG_PMCSETR_ETH_SEL_RGMII; ++ debug("%s: PHY_INTERFACE_MODE_RGMII\n", __func__); ++ break; ++ default: ++ debug("%s: Do not manage %d interface\n", ++ __func__, interface_type); ++ /* Do not manage others interfaces */ ++ return -EINVAL; ++ } ++ ++ /* clear and set ETH configuration bits */ ++ writel(SYSCFG_PMCSETR_ETH_SEL_MASK | SYSCFG_PMCSETR_ETH_SELMII | ++ SYSCFG_PMCSETR_ETH_REF_CLK_SEL | SYSCFG_PMCSETR_ETH_CLK_SEL, ++ syscfg + SYSCFG_PMCCLRR); ++ writel(value, syscfg + SYSCFG_PMCSETR); ++ ++ return 0; ++} ++ ++enum env_location env_get_location(enum env_operation op, int prio) ++{ ++ u32 bootmode = get_bootmode(); ++ ++ if (prio) ++ return ENVL_UNKNOWN; ++ ++ switch (bootmode & TAMP_BOOT_DEVICE_MASK) { ++ case BOOT_FLASH_SD: ++ case BOOT_FLASH_EMMC: ++ if (CONFIG_IS_ENABLED(ENV_IS_IN_MMC)) ++ return ENVL_MMC; ++ else if (CONFIG_IS_ENABLED(ENV_IS_IN_EXT4)) ++ return ENVL_EXT4; ++ else ++ return ENVL_NOWHERE; ++ ++ case BOOT_FLASH_NAND: ++ case BOOT_FLASH_SPINAND: ++ if (CONFIG_IS_ENABLED(ENV_IS_IN_UBI)) ++ return ENVL_UBI; ++ else ++ return ENVL_NOWHERE; ++ ++ case BOOT_FLASH_NOR: ++ if (CONFIG_IS_ENABLED(ENV_IS_IN_SPI_FLASH)) ++ return ENVL_SPI_FLASH; ++ else ++ return ENVL_NOWHERE; ++ ++ default: ++ return ENVL_NOWHERE; ++ } ++} ++ ++const char *env_ext4_get_intf(void) ++{ ++ u32 bootmode = get_bootmode(); ++ ++ switch (bootmode & TAMP_BOOT_DEVICE_MASK) { ++ case BOOT_FLASH_SD: ++ case BOOT_FLASH_EMMC: ++ return "mmc"; ++ default: ++ return ""; ++ } ++} ++ ++const char *env_ext4_get_dev_part(void) ++{ ++ static char *const dev_part[] = {"0:auto", "1:auto", "2:auto"}; ++ u32 bootmode = get_bootmode(); ++ ++ return dev_part[(bootmode & TAMP_BOOT_INSTANCE_MASK) - 1]; ++} ++ ++int mmc_get_env_dev(void) ++{ ++ u32 bootmode; ++ ++ if (CONFIG_SYS_MMC_ENV_DEV >= 0) ++ return CONFIG_SYS_MMC_ENV_DEV; ++ ++ bootmode = get_bootmode(); ++ ++ /* use boot instance to select the correct mmc device identifier */ ++ return (bootmode & TAMP_BOOT_INSTANCE_MASK) - 1; ++} ++ ++#if defined(CONFIG_OF_BOARD_SETUP) ++int ft_board_setup(void *blob, struct bd_info *bd) ++{ ++ return 0; ++} ++#endif ++ ++static void board_copro_image_process(ulong fw_image, size_t fw_size) ++{ ++ int ret, id = 0; /* Copro id fixed to 0 as only one coproc on mp1 */ ++ ++ if (!rproc_is_initialized()) ++ if (rproc_init()) { ++ printf("Remote Processor %d initialization failed\n", ++ id); ++ return; ++ } ++ ++ ret = rproc_load(id, fw_image, fw_size); ++ printf("Load Remote Processor %d with data@addr=0x%08lx %u bytes:%s\n", ++ id, fw_image, fw_size, ret ? " Failed!" : " Success!"); ++ ++ if (!ret) ++ rproc_start(id); ++} ++ ++U_BOOT_FIT_LOADABLE_HANDLER(IH_TYPE_COPRO, board_copro_image_process); +diff --git a/configs/osd32mp1_brk_trusted_defconfig b/configs/osd32mp1_brk_trusted_defconfig +new file mode 100644 +index 0000000000..6d41af8886 +--- /dev/null ++++ b/configs/osd32mp1_brk_trusted_defconfig +@@ -0,0 +1,141 @@ ++CONFIG_ARM=y ++CONFIG_ARCH_STM32MP=y ++CONFIG_TFABOOT=y ++CONFIG_SYS_MALLOC_F_LEN=0x3000 ++CONFIG_ENV_OFFSET=0x480000 ++CONFIG_ENV_SECT_SIZE=0x40000 ++# CONFIG_TARGET_ST_STM32MP15x=y ++CONFIG_TARGET_OCTAVO_OSD32MP1_BRK=y ++CONFIG_CMD_STM32PROG=y ++CONFIG_ENV_OFFSET_REDUND=0x4C0000 ++CONFIG_DEFAULT_DEVICE_TREE="stm32mp157c-osd32mp1-brk" ++CONFIG_DISTRO_DEFAULTS=y ++CONFIG_FIT=y ++CONFIG_BOOTDELAY=1 ++CONFIG_BOOTCOMMAND="run bootcmd_stm32mp" ++CONFIG_SYS_PROMPT="OSD32MP> " ++# CONFIG_CMD_BOOTD is not set ++CONFIG_CMD_ADTIMG=y ++# CONFIG_CMD_ELF is not set ++CONFIG_CMD_EEPROM=y ++CONFIG_CMD_ERASEENV=y ++CONFIG_CMD_MEMINFO=y ++CONFIG_CMD_MEMTEST=y ++CONFIG_SYS_MEMTEST_START=0xc0000000 ++CONFIG_SYS_MEMTEST_END=0xc4000000 ++CONFIG_CMD_ADC=y ++CONFIG_CMD_CLK=y ++CONFIG_CMD_DFU=y ++CONFIG_CMD_FUSE=y ++CONFIG_CMD_GPIO=y ++CONFIG_CMD_I2C=y ++CONFIG_CMD_MMC=y ++CONFIG_CMD_REMOTEPROC=y ++CONFIG_CMD_SPI=y ++CONFIG_CMD_USB=y ++CONFIG_CMD_USB_MASS_STORAGE=y ++CONFIG_CMD_BMP=y ++CONFIG_CMD_CACHE=y ++CONFIG_CMD_TIME=y ++CONFIG_CMD_TIMER=y ++CONFIG_CMD_PMIC=y ++CONFIG_CMD_REGULATOR=y ++CONFIG_CMD_EXT4_WRITE=y ++CONFIG_CMD_MTDPARTS=y ++CONFIG_CMD_UBI=y ++CONFIG_ENV_IS_NOWHERE=y ++CONFIG_ENV_IS_IN_MMC=y ++CONFIG_ENV_IS_IN_UBI=y ++CONFIG_SYS_REDUNDAND_ENVIRONMENT=y ++CONFIG_ENV_UBI_PART="UBI" ++CONFIG_ENV_UBI_VOLUME="uboot_config" ++CONFIG_ENV_UBI_VOLUME_REDUND="uboot_config_r" ++CONFIG_SYS_RELOC_GD_ENV_ADDR=y ++CONFIG_SYS_MMC_ENV_DEV=-1 ++CONFIG_STM32_ADC=y ++CONFIG_CLK_SCMI=y ++CONFIG_SET_DFU_ALT_INFO=y ++CONFIG_USB_FUNCTION_FASTBOOT=y ++CONFIG_FASTBOOT_BUF_ADDR=0xC0000000 ++CONFIG_FASTBOOT_BUF_SIZE=0x02000000 ++CONFIG_FASTBOOT_USB_DEV=1 ++CONFIG_FASTBOOT_FLASH=y ++CONFIG_FASTBOOT_FLASH_MMC_DEV=1 ++CONFIG_GPIO_HOG=y ++CONFIG_DM_HWSPINLOCK=y ++CONFIG_HWSPINLOCK_STM32=y ++CONFIG_DM_I2C=y ++CONFIG_SYS_I2C_STM32F7=y ++CONFIG_LED=y ++CONFIG_LED_GPIO=y ++CONFIG_DM_MAILBOX=y ++CONFIG_STM32_IPCC=y ++CONFIG_STM32_FMC2_EBI=y ++CONFIG_I2C_EEPROM=y ++CONFIG_DM_MMC=y ++CONFIG_SUPPORT_EMMC_BOOT=y ++CONFIG_STM32_SDMMC2=y ++CONFIG_MTD=y ++CONFIG_DM_MTD=y ++CONFIG_SYS_MTDPARTS_RUNTIME=y ++CONFIG_MTD_RAW_NAND=y ++CONFIG_NAND_STM32_FMC2=y ++CONFIG_MTD_SPI_NAND=y ++CONFIG_DM_SPI_FLASH=y ++CONFIG_SPI_FLASH_MACRONIX=y ++CONFIG_SPI_FLASH_SPANSION=y ++CONFIG_SPI_FLASH_STMICRO=y ++CONFIG_SPI_FLASH_WINBOND=y ++# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set ++CONFIG_SPI_FLASH_MTD=y ++CONFIG_PHY_REALTEK=y ++CONFIG_DM_ETH=y ++CONFIG_DWC_ETH_QOS=y ++CONFIG_PHY=y ++CONFIG_PHY_STM32_USBPHYC=y ++CONFIG_PINCONF=y ++CONFIG_PINCTRL_STMFX=y ++CONFIG_DM_PMIC=y ++CONFIG_PMIC_STPMIC1=y ++CONFIG_DM_REGULATOR=y ++CONFIG_DM_REGULATOR_FIXED=y ++CONFIG_DM_REGULATOR_GPIO=y ++CONFIG_DM_REGULATOR_STM32_VREFBUF=y ++CONFIG_DM_REGULATOR_STPMIC1=y ++CONFIG_REMOTEPROC_STM32_COPRO=y ++CONFIG_RESET_SCMI=y ++CONFIG_DM_RNG=y ++CONFIG_RNG_STM32MP1=y ++CONFIG_DM_RTC=y ++CONFIG_RTC_STM32=y ++CONFIG_SERIAL_RX_BUFFER=y ++CONFIG_SPI=y ++CONFIG_DM_SPI=y ++CONFIG_STM32_QSPI=y ++CONFIG_STM32_SPI=y ++CONFIG_TEE=y ++CONFIG_OPTEE=y ++# CONFIG_OPTEE_TA_AVB is not set ++CONFIG_USB=y ++CONFIG_DM_USB=y ++CONFIG_DM_USB_GADGET=y ++CONFIG_USB_EHCI_HCD=y ++CONFIG_USB_EHCI_GENERIC=y ++CONFIG_USB_GADGET=y ++CONFIG_USB_GADGET_MANUFACTURER="STMicroelectronics" ++CONFIG_USB_GADGET_VENDOR_NUM=0x0483 ++CONFIG_USB_GADGET_PRODUCT_NUM=0x5720 ++CONFIG_USB_GADGET_DWC2_OTG=y ++CONFIG_DM_VIDEO=y ++CONFIG_BACKLIGHT_GPIO=y ++CONFIG_VIDEO_LCD_ORISETECH_OTM8009A=y ++CONFIG_VIDEO_LCD_RAYDIUM_RM68200=y ++CONFIG_VIDEO_STM32=y ++CONFIG_VIDEO_STM32_DSI=y ++CONFIG_VIDEO_STM32_MAX_XRES=1280 ++CONFIG_VIDEO_STM32_MAX_YRES=800 ++CONFIG_WDT=y ++CONFIG_WDT_STM32MP=y ++CONFIG_ERRNO_STR=y ++CONFIG_FDT_FIXUP_PARTITIONS=y ++CONFIG_LMB_RESERVED_REGIONS=16 +-- +2.25.1 + diff --git a/board/octavo/osd32mp1-brk/readme.txt b/board/octavo/osd32mp1-brk/readme.txt new file mode 100644 index 00000000000..8aae419f96c --- /dev/null +++ b/board/octavo/osd32mp1-brk/readme.txt @@ -0,0 +1,35 @@ +OSD32MP1-BRK + +Intro +===== + +This configuration supports the OSD32MP1-BRK platform: + + https://octavosystems.com/octavo_products/osd32mp1-brk/ + +How to build +============ + + $ make octavo_osd32mp1_brk_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. + + (2) Plug an USB-SERIAL cable on the RX, TX and GND pins + + (3) Plug a micro-USB cable to power-up the board. + + (4) The system will start, with the console on UART. diff --git a/board/octavo/osd32mp1-brk/tfa-dts/osd32mp1_ddr_1x4Gb.dtsi b/board/octavo/osd32mp1-brk/tfa-dts/osd32mp1_ddr_1x4Gb.dtsi new file mode 100644 index 00000000000..3cd2c3f5d17 --- /dev/null +++ b/board/octavo/osd32mp1-brk/tfa-dts/osd32mp1_ddr_1x4Gb.dtsi @@ -0,0 +1,121 @@ +/* + * Copyright (C) 2015-2018, STMicroelectronics - All Rights Reserved + * + * SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause + * + */ + +/* + * File generated by STMicroelectronics STM32CubeMX DDR Tool for MPUs + * DDR type: DDR3 / DDR3L + * DDR width: 16bits + * DDR density: 4Gb + * System frequency: 533000Khz + * Relaxed Timing Mode: false + * Address mapping type: RBC + * + * Save Date: 2020.08.27, save Time: 15:22:11 + */ + +#define DDR_MEM_NAME "DDR3-DDR3L 16bits 533000Khz" +#define DDR_MEM_SPEED 533000 +#define DDR_MEM_SIZE 0x20000000 + +#define DDR_MSTR 0x00041401 +#define DDR_MRCTRL0 0x00000010 +#define DDR_MRCTRL1 0x00000000 +#define DDR_DERATEEN 0x00000000 +#define DDR_DERATEINT 0x00800000 +#define DDR_PWRCTL 0x00000000 +#define DDR_PWRTMG 0x00400010 +#define DDR_HWLPCTL 0x00000000 +#define DDR_RFSHCTL0 0x00210000 +#define DDR_RFSHCTL3 0x00000000 +#define DDR_RFSHTMG 0x0081008B +#define DDR_CRCPARCTL0 0x00000000 +#define DDR_DRAMTMG0 0x121B2414 +#define DDR_DRAMTMG1 0x000A041C +#define DDR_DRAMTMG2 0x0608090F +#define DDR_DRAMTMG3 0x0050400C +#define DDR_DRAMTMG4 0x08040608 +#define DDR_DRAMTMG5 0x06060403 +#define DDR_DRAMTMG6 0x02020002 +#define DDR_DRAMTMG7 0x00000202 +#define DDR_DRAMTMG8 0x00001005 +#define DDR_DRAMTMG14 0x000000A0 +#define DDR_ZQCTL0 0xC2000040 +#define DDR_DFITMG0 0x02060105 +#define DDR_DFITMG1 0x00000202 +#define DDR_DFILPCFG0 0x07000000 +#define DDR_DFIUPD0 0xC0400003 +#define DDR_DFIUPD1 0x00000000 +#define DDR_DFIUPD2 0x00000000 +#define DDR_DFIPHYMSTR 0x00000000 +#define DDR_ODTCFG 0x06000600 +#define DDR_ODTMAP 0x00000001 +#define DDR_SCHED 0x00000C01 +#define DDR_SCHED1 0x00000000 +#define DDR_PERFHPR1 0x01000001 +#define DDR_PERFLPR1 0x08000200 +#define DDR_PERFWR1 0x08000400 +#define DDR_DBG0 0x00000000 +#define DDR_DBG1 0x00000000 +#define DDR_DBGCMD 0x00000000 +#define DDR_POISONCFG 0x00000000 +#define DDR_PCCFG 0x00000010 +#define DDR_PCFGR_0 0x00010000 +#define DDR_PCFGW_0 0x00000000 +#define DDR_PCFGQOS0_0 0x02100C03 +#define DDR_PCFGQOS1_0 0x00800100 +#define DDR_PCFGWQOS0_0 0x01100C03 +#define DDR_PCFGWQOS1_0 0x01000200 +#define DDR_PCFGR_1 0x00010000 +#define DDR_PCFGW_1 0x00000000 +#define DDR_PCFGQOS0_1 0x02100C03 +#define DDR_PCFGQOS1_1 0x00800040 +#define DDR_PCFGWQOS0_1 0x01100C03 +#define DDR_PCFGWQOS1_1 0x01000200 +#define DDR_ADDRMAP1 0x00070707 +#define DDR_ADDRMAP2 0x00000000 +#define DDR_ADDRMAP3 0x1F000000 +#define DDR_ADDRMAP4 0x00001F1F +#define DDR_ADDRMAP5 0x06060606 +#define DDR_ADDRMAP6 0x0F060606 +#define DDR_ADDRMAP9 0x00000000 +#define DDR_ADDRMAP10 0x00000000 +#define DDR_ADDRMAP11 0x00000000 +#define DDR_PGCR 0x01442E02 +#define DDR_PTR0 0x0022AA5B +#define DDR_PTR1 0x04841104 +#define DDR_PTR2 0x042DA068 +#define DDR_ACIOCR 0x10400812 +#define DDR_DXCCR 0x00000C40 +#define DDR_DSGCR 0xF200011F +#define DDR_DCR 0x0000000B +#define DDR_DTPR0 0x38D488D0 +#define DDR_DTPR1 0x098B00D8 +#define DDR_DTPR2 0x10023600 +#define DDR_MR0 0x00000840 +#define DDR_MR1 0x00000000 +#define DDR_MR2 0x00000208 +#define DDR_MR3 0x00000000 +#define DDR_ODTCR 0x00010000 +#define DDR_ZQ0CR1 0x00000038 +#define DDR_DX0GCR 0x0000CE81 +#define DDR_DX0DLLCR 0x40000000 +#define DDR_DX0DQTR 0x00112121 +#define DDR_DX0DQSTR 0x3D200000 +#define DDR_DX1GCR 0x0000CE81 +#define DDR_DX1DLLCR 0x40000000 +#define DDR_DX1DQTR 0x11100121 +#define DDR_DX1DQSTR 0x3D200000 +#define DDR_DX2GCR 0x0000CE80 +#define DDR_DX2DLLCR 0x40000000 +#define DDR_DX2DQTR 0xFFFFFFFF +#define DDR_DX2DQSTR 0x3DB02000 +#define DDR_DX3GCR 0x0000CE80 +#define DDR_DX3DLLCR 0x40000000 +#define DDR_DX3DQTR 0xFFFFFFFF +#define DDR_DX3DQSTR 0x3DB02000 + +#include "stm32mp15-ddr.dtsi" diff --git a/board/octavo/osd32mp1-brk/tfa-dts/stm32mp157c-osd32mp1-brk-fw-config.dts b/board/octavo/osd32mp1-brk/tfa-dts/stm32mp157c-osd32mp1-brk-fw-config.dts new file mode 100644 index 00000000000..256d0db9352 --- /dev/null +++ b/board/octavo/osd32mp1-brk/tfa-dts/stm32mp157c-osd32mp1-brk-fw-config.dts @@ -0,0 +1,6 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +/* + * Copyright (c) 2020, STMicroelectronics - All Rights Reserved + */ + +#include "stm32mp15-ddr-512m-fw-config.dts" diff --git a/board/octavo/osd32mp1-brk/tfa-dts/stm32mp157c-osd32mp1-brk.dts b/board/octavo/osd32mp1-brk/tfa-dts/stm32mp157c-osd32mp1-brk.dts new file mode 100644 index 00000000000..4f21a21158f --- /dev/null +++ b/board/octavo/osd32mp1-brk/tfa-dts/stm32mp157c-osd32mp1-brk.dts @@ -0,0 +1,547 @@ +/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */ +/* + * Copyright (C) STMicroelectronics 2020 - All Rights Reserved + * Author: STM32CubeMX code generation for STMicroelectronics. + */ + +/dts-v1/; +#include +#include +#include +#include + +#include "stm32mp157.dtsi" +#include "stm32mp15xc.dtsi" +#include "stm32mp15xxac-pinctrl.dtsi" +#include "osd32mp1_ddr_1x4Gb.dtsi" + +/ { + model = "Octavo OSD32MP1 BRK board"; + compatible = "st,stm32mp157c-osd32mp1-brk", "st,stm32mp157"; + + aliases { + serial0 = &uart4; + }; + + memory@c0000000 { + device_type = "memory"; + reg = <0xc0000000 0x20000000>; + }; + + vin: vin { + compatible = "regulator-fixed"; + regulator-name = "vin"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-always-on; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; + +&bsec { + board_id: board_id@ec { + reg = <0xec 0x4>; + st,non-secure-otp; + }; +}; + +&clk_hse { + st,digbypass; +}; + +&cpu0 { + cpu-supply = <&vddcore>; +}; + +&cpu1 { + cpu-supply = <&vddcore>; +}; + +&hash1 { + status = "okay"; +}; + +&cryp1 { + status = "okay"; +}; + +&etzpc { + st,decprot = < + DECPROT(STM32MP1_ETZPC_USART1_ID, DECPROT_NS_RW, DECPROT_UNLOCK) + DECPROT(STM32MP1_ETZPC_SPI6_ID, DECPROT_NS_RW, DECPROT_UNLOCK) + DECPROT(STM32MP1_ETZPC_I2C4_ID, DECPROT_NS_RW, DECPROT_UNLOCK) + DECPROT(STM32MP1_ETZPC_I2C6_ID, DECPROT_NS_RW, DECPROT_UNLOCK) + DECPROT(STM32MP1_ETZPC_RNG1_ID, DECPROT_NS_RW, DECPROT_UNLOCK) + DECPROT(STM32MP1_ETZPC_HASH1_ID, DECPROT_NS_RW, DECPROT_UNLOCK) + DECPROT(STM32MP1_ETZPC_CRYP1_ID, DECPROT_NS_RW, DECPROT_UNLOCK) + DECPROT(STM32MP1_ETZPC_DDRCTRL_ID, DECPROT_NS_R_S_W, DECPROT_LOCK) + DECPROT(STM32MP1_ETZPC_DDRPHYC_ID, DECPROT_NS_R_S_W, DECPROT_LOCK) + DECPROT(STM32MP1_ETZPC_STGENC_ID, DECPROT_S_RW, DECPROT_LOCK) + DECPROT(STM32MP1_ETZPC_BKPSRAM_ID, DECPROT_S_RW, DECPROT_LOCK) + DECPROT(STM32MP1_ETZPC_IWDG1_ID, DECPROT_S_RW, DECPROT_LOCK) + >; +}; + + + +&i2c4 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c4_pins_z_mx>; + i2c-scl-rising-time-ns = <185>; + i2c-scl-falling-time-ns = <20>; + clock-frequency = <400000>; + status = "okay"; + secure-status = "okay"; + + pmic: stpmic@33 { + compatible = "st,stpmic1"; + reg = <0x33>; + interrupts-extended = <&exti_pwr 55 IRQ_TYPE_EDGE_FALLING>; + interrupt-controller; + #interrupt-cells = <2>; + status = "okay"; + secure-status = "okay"; + + regulators { + compatible = "st,stpmic1-regulators"; + buck1-supply = <&vin>; + buck2-supply = <&vin>; + buck3-supply = <&vin>; + buck4-supply = <&vin>; + ldo1-supply = <&v3v3>; + ldo2-supply = <&vin>; + ldo3-supply = <&vdd_ddr>; + ldo4-supply = <&vin>; + ldo5-supply = <&vin>; + ldo6-supply = <&v3v3>; + vref_ddr-supply = <&vin>; + boost-supply = <&vin>; + pwr_sw1-supply = <&bst_out>; + pwr_sw2-supply = <&bst_out>; + + vddcore: buck1 { + regulator-name = "vddcore"; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1350000>; + regulator-always-on; + regulator-initial-mode = <0>; + regulator-over-current-protection; + lp-stop{ + regulator-on-in-suspend; + regulator-suspend-microvolt = <1200000>; + }; + standby-ddr-sr{ + regulator-off-in-suspend; + }; + standby-ddr-off{ + regulator-off-in-suspend; + }; + }; + + vdd_ddr: buck2 { + regulator-name = "vdd_ddr"; + regulator-min-microvolt = <1350000>; + regulator-max-microvolt = <1350000>; + regulator-always-on; + regulator-initial-mode = <0>; + regulator-over-current-protection; + lp-stop{ + regulator-suspend-microvolt = <1350000>; + regulator-on-in-suspend; + }; + standby-ddr-sr{ + regulator-suspend-microvolt = <1350000>; + regulator-on-in-suspend; + }; + standby-ddr-off{ + regulator-off-in-suspend; + }; + }; + + vdd: buck3 { + regulator-name = "vdd"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + st,mask-reset; + regulator-initial-mode = <0>; + regulator-over-current-protection; + lp-stop{ + regulator-suspend-microvolt = <3300000>; + regulator-on-in-suspend; + }; + standby-ddr-sr{ + regulator-suspend-microvolt = <3300000>; + regulator-on-in-suspend; + }; + standby-ddr-off{ + regulator-suspend-microvolt = <3300000>; + regulator-on-in-suspend; + }; + }; + + v3v3: buck4 { + regulator-name = "v3v3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + regulator-over-current-protection; + regulator-initial-mode = <0>; + lp-stop{ + regulator-suspend-microvolt = <3300000>; + regulator-on-in-suspend; + }; + standby-ddr-sr{ + regulator-off-in-suspend; + }; + standby-ddr-off{ + regulator-off-in-suspend; + }; + }; + + v1v8_ldo1: ldo1 { + regulator-name = "v1v8_audio"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-always-on; + standby-ddr-sr{ + regulator-off-in-suspend; + }; + standby-ddr-off{ + regulator-off-in-suspend; + }; + }; + + v3v3_ldo2: ldo2 { + regulator-name = "v3v3_hdmi"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + standby-ddr-sr{ + regulator-off-in-suspend; + }; + standby-ddr-off{ + regulator-off-in-suspend; + }; + }; + + vtt_ddr: ldo3 { + regulator-name = "vtt_ddr"; + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <750000>; + regulator-always-on; + regulator-over-current-protection; + lp-stop{ + regulator-off-in-suspend; + }; + standby-ddr-sr{ + regulator-off-in-suspend; + }; + standby-ddr-off{ + regulator-off-in-suspend; + }; + }; + + vdd_usb: ldo4 { + regulator-name = "vdd_usb"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + standby-ddr-sr{ + regulator-on-in-suspend; + }; + standby-ddr-off{ + regulator-off-in-suspend; + }; + }; + + vdda: ldo5 { + regulator-name = "vdda"; + regulator-min-microvolt = <2900000>; + regulator-max-microvolt = <2900000>; + regulator-boot-on; + standby-ddr-sr{ + regulator-off-in-suspend; + }; + standby-ddr-off{ + regulator-off-in-suspend; + }; + }; + + v1v2_ldo6: ldo6 { + regulator-name = "v1v2_ldo6"; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + regulator-always-on; + standby-ddr-sr{ + regulator-off-in-suspend; + }; + standby-ddr-off{ + regulator-off-in-suspend; + }; + }; + + vref_ddr: vref_ddr { + regulator-name = "vref_ddr"; + regulator-always-on; + regulator-over-current-protection; + lp-stop{ + regulator-on-in-suspend; + }; + standby-ddr-sr{ + regulator-on-in-suspend; + }; + standby-ddr-off{ + regulator-off-in-suspend; + }; + }; + + bst_out: boost { + regulator-name = "bst_out"; + }; + + vbus_otg: pwr_sw1 { + regulator-name = "vbus_otg"; + }; + + vbus_sw: pwr_sw2 { + regulator-name = "vbus_sw"; + regulator-active-discharge = <1>; + }; + }; + }; +}; + +&iwdg2 { + timeout-sec = <32>; + secure-timeout-sec = <5>; + status = "okay"; + secure-status = "okay"; +}; + +&nvmem_layout { + nvmem-cells = <&cfg0_otp>, + <&part_number_otp>, + <&monotonic_otp>, + <&nand_otp>, + <&uid_otp>, + <&package_otp>, + <&hw2_otp>, + <&pkh_otp>, + <&board_id>; + + nvmem-cell-names = "cfg0_otp", + "part_number_otp", + "monotonic_otp", + "nand_otp", + "uid_otp", + "package_otp", + "hw2_otp", + "pkh_otp", + "board_id"; +}; + +&pwr_regulators { + system_suspend_supported_soc_modes = < + STM32_PM_CSLEEP_RUN + STM32_PM_CSTOP_ALLOW_LP_STOP + STM32_PM_CSTOP_ALLOW_STANDBY_DDR_SR + >; + system_off_soc_mode = ; + vdd-supply = <&vdd>; + vdd_3v3_usbfs-supply = <&vdd_usb>; +}; + +&rcc { + st,hsi-cal; + st,csi-cal; + st,cal-sec = <60>; + st,clksrc = < + CLK_MPU_PLL1P + CLK_AXI_PLL2P + CLK_MCU_PLL3P + CLK_PLL12_HSE + CLK_PLL3_HSE + CLK_PLL4_HSE + CLK_RTC_LSE + CLK_MCO1_DISABLED + CLK_MCO2_DISABLED + >; + + st,clkdiv = < + 1 /*MPU*/ + 0 /*AXI*/ + 0 /*MCU*/ + 1 /*APB1*/ + 1 /*APB2*/ + 1 /*APB3*/ + 1 /*APB4*/ + 2 /*APB5*/ + 23 /*RTC*/ + 0 /*MCO1*/ + 0 /*MCO2*/ + >; + + st,pkcs = < + CLK_CKPER_HSE + CLK_FMC_ACLK + CLK_QSPI_ACLK + CLK_ETH_DISABLED + CLK_SDMMC12_PLL4P + CLK_DSI_DSIPLL + CLK_STGEN_HSE + CLK_USBPHY_HSE + CLK_SPI2S1_PLL3Q + CLK_SPI2S23_PLL3Q + CLK_SPI45_HSI + CLK_SPI6_HSI + CLK_I2C46_HSI + CLK_SDMMC3_PLL4P + CLK_USBO_USBPHY + CLK_ADC_CKPER + CLK_CEC_LSE + CLK_I2C12_HSI + CLK_I2C35_HSI + CLK_UART1_HSI + CLK_UART24_HSI + CLK_UART35_HSI + CLK_UART6_HSI + CLK_UART78_HSI + CLK_SPDIF_PLL4P + CLK_FDCAN_PLL4R + CLK_SAI1_PLL3Q + CLK_SAI2_PLL3Q + CLK_SAI3_PLL3Q + CLK_SAI4_PLL3Q + CLK_RNG1_LSI + CLK_RNG2_LSI + CLK_LPTIM1_PCLK1 + CLK_LPTIM23_PCLK3 + CLK_LPTIM45_LSE + >; + + /* VCO = 1066.0 MHz => P = 266 (AXI), Q = 533 (GPU), R = 533 (DDR) */ + pll2: st,pll@1 { + compatible = "st,stm32mp1-pll"; + reg = <1>; + cfg = <2 65 1 0 0 PQR(1,1,1)>; + frac = <0x1400>; + }; + + /* VCO = 417.8 MHz => P = 209, Q = 24, R = 11 */ + pll3: st,pll@2 { + compatible = "st,stm32mp1-pll"; + reg = <2>; + cfg = <1 33 1 16 36 PQR(1,1,1)>; + frac = <0x1a04>; + }; + + /* VCO = 594.0 MHz => P = 99, Q = 74, R = 74 */ + pll4: st,pll@3 { + compatible = "st,stm32mp1-pll"; + reg = <3>; + cfg = <3 98 5 7 7 PQR(1,1,1)>; + }; +}; + +&rng1 { + status = "okay"; + secure-status = "okay"; +}; + +&rtc { + status = "okay"; + secure-status = "okay"; +}; + +&sdmmc1 { + pinctrl-names = "default"; + pinctrl-0 = <&sdmmc1_pins_mx>; + disable-wp; + st,neg-edge; + bus-width = <4>; + vmmc-supply = <&v3v3>; + status = "okay"; +}; + +&timers15 { + secure-status = "okay"; + st,hsi-cal-input = <7>; + st,csi-cal-input = <8>; +}; +&uart4 { + pinctrl-names = "default"; + pinctrl-0 = <&uart4_pins_mx>; + status = "okay"; +}; + +&usbotg_hs { + phys = <&usbphyc_port1 0>; + phy-names = "usb2-phy"; + usb-role-switch; + status = "okay"; +}; + +&usbphyc { + status = "okay"; +}; + +&usbphyc_port0 { + phy-supply = <&vdd_usb>; +}; + +&usbphyc_port1 { + phy-supply = <&vdd_usb>; +}; + + + + +&pinctrl { + sdmmc1_pins_mx: sdmmc1-b4-0 { + pins1 { + pinmux = , /* SDMMC1_D0 */ + , /* SDMMC1_D1 */ + , /* SDMMC1_D2 */ + , /* SDMMC1_D3 */ + ; /* SDMMC1_CMD */ + slew-rate = <1>; + drive-push-pull; + bias-disable; + }; + pins2 { + pinmux = ; /* SDMMC1_CK */ + slew-rate = <2>; + drive-push-pull; + bias-disable; + }; + }; + + uart4_pins_mx: uart4-0 { + pins1 { + pinmux = ; /* UART4_TX */ + bias-disable; + drive-push-pull; + slew-rate = <0>; + }; + pins2 { + pinmux = ; /* UART4_RX */ + bias-disable; + }; + }; +}; + +&pinctrl_z { + i2c4_pins_z_mx: i2c4-0 { + pins { + pinmux = , /* I2C4_SCL */ + ; /* I2C4_SDA */ + bias-disable; + drive-open-drain; + slew-rate = <0>; + }; + }; +}; diff --git a/board/octavo/osd32mp1-red/genimage.cfg b/board/octavo/osd32mp1-red/genimage.cfg new file mode 100644 index 00000000000..bdad1914891 --- /dev/null +++ b/board/octavo/osd32mp1-red/genimage.cfg @@ -0,0 +1,23 @@ +image sdcard.img { + hdimage { + partition-table-type = "gpt" + } + + partition fsbl1 { + image = "tf-a-stm32mp157c-osd32mp1-red.stm32" + } + + partition fsbl2 { + image = "tf-a-stm32mp157c-osd32mp1-red.stm32" + } + + partition fip { + image = "fip.bin" + size = 2M + } + + partition rootfs { + image = "rootfs.ext4" + bootable = "yes" + } +} diff --git a/board/octavo/osd32mp1-red/linux-dts/stm32mp157c-osd32mp1-red.dts b/board/octavo/osd32mp1-red/linux-dts/stm32mp157c-osd32mp1-red.dts new file mode 100644 index 00000000000..bf0e23c7615 --- /dev/null +++ b/board/octavo/osd32mp1-red/linux-dts/stm32mp157c-osd32mp1-red.dts @@ -0,0 +1,1440 @@ +/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */ +/* + * Copyright (C) Octavo Systems 2021 - All Rights Reserved + * Author: Neeraj Dantu for Octavo Systems + */ + +/dts-v1/; + +#include +#include "stm32mp157.dtsi" +#include "stm32mp15xc.dtsi" +#include "stm32mp15xxac-pinctrl.dtsi" +#include "stm32mp15-m4-srm.dtsi" +#include +#include +#include + +/ { + model = "Octavo OSD32MP1 RED board"; + compatible = "octavo,stm32mp157c-osd32mp1-red", "st,stm32mp157"; + + memory@c0000000 { + device_type = "memory"; + reg = <0xc0000000 0x20000000>; + }; + + wifi_pwrseq: wifi-pwrseq { + compatible = "mmc-pwrseq-simple"; + reset-gpios = <&gpiog 5 GPIO_ACTIVE_LOW>; + }; + + clocks { + clk_ext_camera: clk-ext-camera { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <24000000>; + }; + }; + + reserved-memory { + #address-cells = <1>; + #size-cells = <1>; + ranges; + + mcuram2:mcuram2@10000000{ + compatible = "shared-dma-pool"; + reg = <0x10000000 0x40000>; + no-map; + }; + + vdev0vring0:vdev0vring0@10040000{ + compatible = "shared-dma-pool"; + reg = <0x10040000 0x1000>; + no-map; + }; + + vdev0vring1:vdev0vring1@10041000{ + compatible = "shared-dma-pool"; + reg = <0x10041000 0x1000>; + no-map; + }; + + vdev0buffer:vdev0buffer@10042000{ + compatible = "shared-dma-pool"; + reg = <0x10042000 0x4000>; + no-map; + }; + + mcuram:mcuram@30000000{ + compatible = "shared-dma-pool"; + reg = <0x30000000 0x40000>; + no-map; + }; + + retram:retram@38000000{ + compatible = "shared-dma-pool"; + reg = <0x38000000 0x10000>; + no-map; + }; + + gpu_reserved:gpu@d4000000{ + reg = <0xd4000000 0x4000000>; + no-map; + }; + }; + + + aliases { + ethernet0 = ðernet0; + serial0 = &uart4; + serial1 = &usart3; + serial2 = &uart7; + serial3 = &usart2; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; + + led { + compatible = "gpio-leds"; + blue { + label = "heartbeat"; + gpios = <&gpiod 11 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "heartbeat"; + default-state = "off"; + }; + }; + + usb_phy_tuning:usb-phy-tuning{ + st,hs-dc-level = <2>; + st,fs-rftime-tuning; + st,hs-rftime-reduction; + st,hs-current-trim = <15>; + st,hs-impedance-trim = <1>; + st,squelch-level = <3>; + st,hs-rx-offset = <2>; + st,no-lsfs-sc; + }; + + vin:vin{ + compatible = "regulator-fixed"; + regulator-name = "vin"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-always-on; + }; + + sound { + compatible = "audio-graph-card"; + label = "STM32MP15-DK"; + dais = <&i2s2_port>; + status = "okay"; + }; +}; + +&pinctrl { + u-boot,dm-pre-reloc; + dcmi_pins_mx: dcmi_mx-0 { + pins { + pinmux = , /* DCMI_HSYNC */ + , /* DCMI_PIXCLK */ + , /* DCMI_D1 */ + , /* DCMI_D7 */ + , /* DCMI_D0 */ + , /* DCMI_D2 */ + , /* DCMI_D3 */ + , /* DCMI_D4 */ + , /* DCMI_D6 */ + , /* DCMI_VSYNC */ + , /* DCMI_D8 */ + , /* DCMI_D9 */ + , /* DCMI_D11 */ + , /* DCMI_D10 */ + ; /* DCMI_D5 */ + bias-disable; + }; + }; + + dcmi_sleep_pins_mx: dcmi_sleep_mx-0 { + pins { + pinmux = , /* DCMI_HSYNC */ + , /* DCMI_PIXCLK */ + , /* DCMI_D1 */ + , /* DCMI_D7 */ + , /* DCMI_D0 */ + , /* DCMI_D2 */ + , /* DCMI_D3 */ + , /* DCMI_D4 */ + , /* DCMI_D6 */ + , /* DCMI_VSYNC */ + , /* DCMI_D8 */ + , /* DCMI_D9 */ + , /* DCMI_D11 */ + , /* DCMI_D10 */ + ; /* DCMI_D5 */ + }; + }; + + eth1_pins_mx: eth1_mx-0 { + pins1 { + pinmux = , /* ETH1_RX_CLK */ + , /* ETH1_RX_CTL */ + , /* ETH1_RXD2 */ + , /* ETH1_RXD3 */ + , /* ETH1_RXD0 */ + ; /* ETH1_RXD1 */ + bias-disable; + }; + pins2 { + pinmux = ; /* ETH1_MDIO */ + bias-disable; + drive-push-pull; + slew-rate = <0>; + }; + pins3 { + pinmux = , /* ETH1_TX_CTL */ + , /* ETH1_MDC */ + , /* ETH1_TXD2 */ + , /* ETH1_TXD3 */ + , /* ETH1_GTX_CLK */ + , /* ETH1_TXD0 */ + ; /* ETH1_TXD1 */ + bias-disable; + drive-push-pull; + slew-rate = <2>; + }; + }; + + eth1_sleep_pins_mx: eth1_sleep_mx-0 { + pins { + pinmux = , /* ETH1_RX_CLK */ + , /* ETH1_MDIO */ + , /* ETH1_RX_CTL */ + , /* ETH1_RXD2 */ + , /* ETH1_RXD3 */ + , /* ETH1_TX_CTL */ + , /* ETH1_MDC */ + , /* ETH1_TXD2 */ + , /* ETH1_RXD0 */ + , /* ETH1_RXD1 */ + , /* ETH1_TXD3 */ + , /* ETH1_GTX_CLK */ + , /* ETH1_TXD0 */ + ; /* ETH1_TXD1 */ + }; + }; + + i2c1_pins_mx: i2c1_mx-0 { + pins { + pinmux = , /* I2C1_SCL */ + ; /* I2C1_SDA */ + bias-disable; + drive-open-drain; + slew-rate = <0>; + }; + }; + + i2c1_sleep_pins_mx: i2c1_sleep_mx-0 { + pins { + pinmux = , /* I2C1_SCL */ + ; /* I2C1_SDA */ + }; + }; + + i2c2_pins_mx: i2c2_mx-0 { + pins { + pinmux = ; /* I2C2_SDA */ + bias-disable; + drive-open-drain; + slew-rate = <0>; + }; + }; + + i2c2_sleep_pins_mx: i2c2_sleep_mx-0 { + pins { + pinmux = ; /* I2C2_SDA */ + }; + }; + + i2c5_pins_mx: i2c5_mx-0 { + pins { + pinmux = , /* I2C5_SCL */ + ; /* I2C5_SDA */ + bias-disable; + drive-open-drain; + slew-rate = <0>; + }; + }; + + i2c5_sleep_pins_mx: i2c5_sleep_mx-0 { + pins { + pinmux = , /* I2C5_SCL */ + ; /* I2C5_SDA */ + }; + }; + + i2s2_pins_mx: i2s2_mx-0 { + pins { + pinmux = , /* I2S2_WS */ + , /* I2S2_CK */ + ; /* I2S2_SDO */ + bias-disable; + drive-push-pull; + slew-rate = <1>; + }; + }; + + i2s2_sleep_pins_mx: i2s2_sleep_mx-0 { + pins { + pinmux = , /* I2S2_WS */ + , /* I2S2_CK */ + ; /* I2S2_SDO */ + }; + }; + + ltdc_pins_mx: ltdc_mx-0 { + pins1 { + pinmux = , /* LTDC_B5 */ + , /* LTDC_B6 */ + , /* LTDC_R5 */ + , /* LTDC_B7 */ + , /* LTDC_B0 */ + , /* LTDC_B3 */ + , /* LTDC_G1 */ + , /* LTDC_B4 */ + , /* LTDC_G0 */ + , /* LTDC_R7 */ + , /* LTDC_DE */ + , /* LTDC_B2 */ + , /* LTDC_B1 */ + , /* LTDC_R0 */ + , /* LTDC_R1 */ + , /* LTDC_G4 */ + , /* LTDC_R2 */ + , /* LTDC_R3 */ + , /* LTDC_R4 */ + , /* LTDC_R6 */ + , /* LTDC_G2 */ + , /* LTDC_G3 */ + , /* LTDC_G5 */ + , /* LTDC_G6 */ + , /* LTDC_G7 */ + , /* LTDC_VSYNC */ + ; /* LTDC_HSYNC */ + bias-disable; + drive-push-pull; + slew-rate = <0>; + }; + pins2 { + pinmux = ; /* LTDC_CLK */ + bias-disable; + drive-push-pull; + slew-rate = <1>; + }; + }; + + ltdc_sleep_pins_mx: ltdc_sleep_mx-0 { + pins { + pinmux = , /* LTDC_B5 */ + , /* LTDC_B6 */ + , /* LTDC_R5 */ + , /* LTDC_B7 */ + , /* LTDC_B0 */ + , /* LTDC_B3 */ + , /* LTDC_G1 */ + , /* LTDC_B4 */ + , /* LTDC_G0 */ + , /* LTDC_R7 */ + , /* LTDC_DE */ + , /* LTDC_CLK */ + , /* LTDC_B2 */ + , /* LTDC_B1 */ + , /* LTDC_R0 */ + , /* LTDC_R1 */ + , /* LTDC_G4 */ + , /* LTDC_R2 */ + , /* LTDC_R3 */ + , /* LTDC_R4 */ + , /* LTDC_R6 */ + , /* LTDC_G2 */ + , /* LTDC_G3 */ + , /* LTDC_G5 */ + , /* LTDC_G6 */ + , /* LTDC_G7 */ + , /* LTDC_VSYNC */ + ; /* LTDC_HSYNC */ + }; + }; + + sdmmc1_pins_mx: sdmmc1_mx-0 { + u-boot,dm-pre-reloc; + pins1 { + u-boot,dm-pre-reloc; + pinmux = , /* SDMMC1_D0 */ + , /* SDMMC1_D1 */ + , /* SDMMC1_D2 */ + , /* SDMMC1_D3 */ + ; /* SDMMC1_CMD */ + bias-disable; + drive-push-pull; + slew-rate = <1>; + }; + pins2 { + u-boot,dm-pre-reloc; + pinmux = ; /* SDMMC1_CK */ + bias-disable; + drive-push-pull; + slew-rate = <2>; + }; + }; + + sdmmc1_opendrain_pins_mx: sdmmc1_opendrain_mx-0 { + u-boot,dm-pre-reloc; + pins1 { + u-boot,dm-pre-reloc; + pinmux = , /* SDMMC1_D0 */ + , /* SDMMC1_D1 */ + , /* SDMMC1_D2 */ + ; /* SDMMC1_D3 */ + bias-disable; + drive-push-pull; + slew-rate = <1>; + }; + pins2 { + u-boot,dm-pre-reloc; + pinmux = ; /* SDMMC1_CK */ + bias-disable; + drive-push-pull; + slew-rate = <2>; + }; + pins3 { + u-boot,dm-pre-reloc; + pinmux = ; /* SDMMC1_CMD */ + bias-disable; + drive-open-drain; + slew-rate = <1>; + }; + }; + + sdmmc1_sleep_pins_mx: sdmmc1_sleep_mx-0 { + u-boot,dm-pre-reloc; + pins { + u-boot,dm-pre-reloc; + pinmux = , /* SDMMC1_D0 */ + , /* SDMMC1_D1 */ + , /* SDMMC1_D2 */ + , /* SDMMC1_D3 */ + , /* SDMMC1_CK */ + ; /* SDMMC1_CMD */ + }; + }; + + sdmmc2_pins_mx: sdmmc2_mx-0 { + u-boot,dm-pre-reloc; + pins1 { + u-boot,dm-pre-reloc; + pinmux = , /* SDMMC2_D4 */ + , /* SDMMC2_D5 */ + , /* SDMMC2_D2 */ + , /* SDMMC2_D3 */ + , /* SDMMC2_D0 */ + , /* SDMMC2_D1 */ + , /* SDMMC2_D7 */ + , /* SDMMC2_D6 */ + ; /* SDMMC2_CMD */ + bias-pull-up; + drive-push-pull; + slew-rate = <1>; + }; + pins2 { + u-boot,dm-pre-reloc; + pinmux = ; /* SDMMC2_CK */ + bias-pull-up; + drive-push-pull; + slew-rate = <2>; + }; + }; + + sdmmc2_opendrain_pins_mx: sdmmc2_opendrain_mx-0 { + u-boot,dm-pre-reloc; + pins1 { + u-boot,dm-pre-reloc; + pinmux = , /* SDMMC2_D4 */ + , /* SDMMC2_D5 */ + , /* SDMMC2_D2 */ + , /* SDMMC2_D3 */ + , /* SDMMC2_D0 */ + , /* SDMMC2_D1 */ + , /* SDMMC2_D7 */ + ; /* SDMMC2_D6 */ + bias-pull-up; + drive-push-pull; + slew-rate = <1>; + }; + pins2 { + u-boot,dm-pre-reloc; + pinmux = ; /* SDMMC2_CK */ + bias-pull-up; + drive-push-pull; + slew-rate = <2>; + }; + pins3 { + u-boot,dm-pre-reloc; + pinmux = ; /* SDMMC2_CMD */ + bias-pull-up; + drive-open-drain; + slew-rate = <1>; + }; + }; + + sdmmc2_sleep_pins_mx: sdmmc2_sleep_mx-0 { + u-boot,dm-pre-reloc; + pins { + u-boot,dm-pre-reloc; + pinmux = , /* SDMMC2_D4 */ + , /* SDMMC2_D5 */ + , /* SDMMC2_D2 */ + , /* SDMMC2_D3 */ + , /* SDMMC2_D0 */ + , /* SDMMC2_D1 */ + , /* SDMMC2_D7 */ + , /* SDMMC2_CK */ + , /* SDMMC2_D6 */ + ; /* SDMMC2_CMD */ + }; + }; + + sdmmc3_pins_mx: sdmmc3_mx-0 { + u-boot,dm-pre-reloc; + pins1 { + u-boot,dm-pre-reloc; + pinmux = , /* SDMMC3_D3 */ + , /* SDMMC3_D0 */ + , /* SDMMC3_CMD */ + , /* SDMMC3_D1 */ + ; /* SDMMC3_D2 */ + bias-disable; + drive-push-pull; + slew-rate = <1>; + }; + pins2 { + u-boot,dm-pre-reloc; + pinmux = ; /* SDMMC3_CK */ + bias-disable; + drive-push-pull; + slew-rate = <2>; + }; + }; + + sdmmc3_opendrain_pins_mx: sdmmc3_opendrain_mx-0 { + u-boot,dm-pre-reloc; + pins1 { + u-boot,dm-pre-reloc; + pinmux = , /* SDMMC3_D3 */ + , /* SDMMC3_D0 */ + , /* SDMMC3_D1 */ + ; /* SDMMC3_D2 */ + bias-disable; + drive-push-pull; + slew-rate = <1>; + }; + pins2 { + u-boot,dm-pre-reloc; + pinmux = ; /* SDMMC3_CMD */ + bias-disable; + drive-open-drain; + slew-rate = <1>; + }; + pins3 { + u-boot,dm-pre-reloc; + pinmux = ; /* SDMMC3_CK */ + bias-disable; + drive-push-pull; + slew-rate = <2>; + }; + }; + + sdmmc3_sleep_pins_mx: sdmmc3_sleep_mx-0 { + u-boot,dm-pre-reloc; + pins { + u-boot,dm-pre-reloc; + pinmux = , /* SDMMC3_D3 */ + , /* SDMMC3_D0 */ + , /* SDMMC3_CMD */ + , /* SDMMC3_D1 */ + , /* SDMMC3_D2 */ + ; /* SDMMC3_CK */ + }; + }; + + spi5_pins_mx: spi5_mx-0 { + pins { + pinmux = , /* SPI5_SCK */ + , /* SPI5_MISO */ + ; /* SPI5_MOSI */ + bias-disable; + drive-push-pull; + slew-rate = <1>; + }; + }; + + spi5_sleep_pins_mx: spi5_sleep_mx-0 { + pins { + pinmux = , /* SPI5_SCK */ + , /* SPI5_MISO */ + ; /* SPI5_MOSI */ + }; + }; + + tim5_pwm_pins_mx: tim5_pwm_mx-0 { + pins { + pinmux = ; /* TIM5_CH2 */ + bias-disable; + drive-push-pull; + slew-rate = <0>; + }; + }; + + tim5_pwm_sleep_pins_mx: tim5_pwm_sleep_mx-0 { + pins { + pinmux = ; /* TIM5_CH2 */ + }; + }; + + uart4_pins_mx: uart4_mx-0 { + u-boot,dm-pre-reloc; + pins1 { + u-boot,dm-pre-reloc; + pinmux = ; /* UART4_RX */ + bias-disable; + }; + pins2 { + u-boot,dm-pre-reloc; + pinmux = ; /* UART4_TX */ + bias-disable; + drive-push-pull; + slew-rate = <0>; + }; + }; + + uart4_sleep_pins_mx: uart4_sleep_mx-0 { + u-boot,dm-pre-reloc; + pins { + u-boot,dm-pre-reloc; + pinmux = , /* UART4_RX */ + ; /* UART4_TX */ + }; + }; + + usart2_pins_mx: usart2_mx-0 { + pins1 { + pinmux = , /* USART2_CTS */ + ; /* USART2_RX */ + bias-disable; + }; + pins2 { + pinmux = , /* USART2_RTS */ + ; /* USART2_TX */ + bias-disable; + drive-push-pull; + slew-rate = <0>; + }; + }; + + usart2_sleep_pins_mx: usart2_sleep_mx-0 { + pins { + pinmux = , /* USART2_CTS */ + , /* USART2_RTS */ + , /* USART2_TX */ + ; /* USART2_RX */ + }; + }; + + cec_pins_mx: cec-1 { + pins { + pinmux = ; + bias-disable; + drive-open-drain; + slew-rate = <0>; + }; + }; + + cec_sleep_pins_mx: cec-sleep-1 { + pins { + pinmux = ; /* HDMI_CEC */ + }; + }; + + stusb1600_pins_mx: stusb1600-0 { + pins { + pinmux = ; + bias-pull-up; + }; + }; + + m_can1_pins_mx: m_can1_sleep_mx-0 { + pins1 { + pinmux = ; /* CAN1_TX */ + slew-rate = <0>; + drive-push-pull; + bias-disable; + }; + pins2 { + pinmux = ; /* CAN1_RX */ + bias-disable; + }; + }; + + m_can1_sleep_pins_mx: m_can1_sleep-0 { + pins { + pinmux = , /* CAN1_TX */ + ; /* CAN1_RX */ + }; + }; + +}; + +&pinctrl_z { + u-boot,dm-pre-reloc; + + i2c2_pins_z_mx: i2c2_mx-0 { + pins { + pinmux = ; /* I2C2_SCL */ + bias-disable; + drive-open-drain; + slew-rate = <0>; + }; + }; + + i2c2_sleep_pins_z_mx: i2c2_sleep_mx-0 { + pins { + pinmux = ; /* I2C2_SCL */ + }; + }; + + i2c4_pins_z_mx: i2c4_mx-0 { + u-boot,dm-pre-reloc; + pins { + u-boot,dm-pre-reloc; + pinmux = , /* I2C4_SCL */ + ; /* I2C4_SDA */ + bias-disable; + drive-open-drain; + slew-rate = <0>; + }; + }; + + i2c4_sleep_pins_z_mx: i2c4_sleep_mx-0 { + u-boot,dm-pre-reloc; + pins { + u-boot,dm-pre-reloc; + pinmux = , /* I2C4_SCL */ + ; /* I2C4_SDA */ + }; + }; +}; + +&m4_rproc{ + memory-region = <&retram>, <&mcuram>, <&mcuram2>, <&vdev0vring0>, + <&vdev0vring1>, <&vdev0buffer>; + mboxes = <&ipcc 0>, <&ipcc 1>, <&ipcc 2>; + mbox-names = "vq0", "vq1", "shutdown"; + interrupt-parent = <&exti>; + interrupts = <68 1>; + wakeup-source; + status = "okay"; +}; + +&dcmi{ + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&dcmi_pins_mx>; + pinctrl-1 = <&dcmi_sleep_pins_mx>; + status = "okay"; + + port { + dcmi_0: endpoint { + remote-endpoint = <&ov5640_0>; + bus-width = <8>; + hsync-active = <0>; + vsync-active = <0>; + pclk-sample = <1>; + pclk-max-frequency = <77000000>; + }; + }; +}; + +&dsi{ + status = "okay"; + + ports { + port@0 { + reg = <0>; + dsi_in: endpoint { + remote-endpoint = <<dc_ep1_out>; + }; + }; + + port@1 { + reg = <1>; + dsi_out: endpoint { + remote-endpoint = <&panel_in>; + }; + }; + }; + + panel_otm8009a: panel-otm8009a@0 { + compatible = "orisetech,otm8009a"; + reg = <0>; + reset-gpios = <&gpioe 9 GPIO_ACTIVE_LOW>; + power-supply = <&v3v3>; + status = "okay"; + + port { + panel_in: endpoint { + remote-endpoint = <&dsi_out>; + }; + }; + }; +}; + +ðernet0{ + pinctrl-names = "default", "sleep"; + pinctrl-0 = <ð1_pins_mx>; + pinctrl-1 = <ð1_sleep_pins_mx>; + status = "okay"; + + + st,eth-clk-sel; //custom + phy-mode = "rgmii-id"; + max-speed = <1000>; + phy-handle = <&phy0>; + nvmem-cells = <ðernet_mac_address>; + nvmem-cell-names = "mac-address"; + + mdio0 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "snps,dwmac-mdio"; + phy0: ethernet-phy@0 { + reg = <3>; + }; + }; +}; + +&gpu{ + status = "okay"; + contiguous-area = <&gpu_reserved>; +}; + +&hash1 { + status = "okay"; +}; + +&hsem{ + status = "okay"; +}; + +&cryp1{ + u-boot,dm-pre-reloc; + status = "okay"; +}; + +&i2c1{ + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&i2c1_pins_mx>; + pinctrl-1 = <&i2c1_sleep_pins_mx>; + status = "okay"; + i2c-scl-rising-time-ns = <100>; + i2c-scl-falling-time-ns = <7>; + /delete-property/dmas; + /delete-property/dma-names; + + touchscreen@2a { + compatible = "focaltech,ft6236"; + reg = <0x2a>; + interrupts = <2 2>; + interrupt-parent = <&gpiof>; + interrupt-controller; + touchscreen-size-x = <480>; + touchscreen-size-y = <800>; + panel = <&panel_otm8009a>; + vcc-supply = <&v3v3>; + status = "okay"; + }; + touchscreen@38 { + compatible = "focaltech,ft6236"; + reg = <0x38>; + interrupts = <2 2>; + interrupt-parent = <&gpiof>; + interrupt-controller; + touchscreen-size-x = <480>; + touchscreen-size-y = <800>; + panel = <&panel_otm8009a>; + vcc-supply = <&v3v3>; + status = "okay"; + }; + + hdmi-transmitter@39 { + compatible = "sil,sii9022"; + reg = <0x39>; + reset-gpios = <&gpiog 0 GPIO_ACTIVE_LOW>; + interrupts = <1 IRQ_TYPE_EDGE_FALLING>; + interrupt-parent = <&gpiog>; + #sound-dai-cells = <0>; + status = "okay"; + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + sii9022_in: endpoint { + remote-endpoint = <<dc_ep0_out>; + }; + }; + + port@3 { + reg = <3>; + sii9022_tx_endpoint: endpoint { + remote-endpoint = <&i2s2_endpoint>; + }; + }; + }; + }; +}; + +&i2c2{ + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&i2c2_pins_mx &i2c2_pins_z_mx>; + pinctrl-1 = <&i2c2_sleep_pins_mx &i2c2_sleep_pins_z_mx>; + status = "okay"; + i2c-scl-rising-time-ns = <185>; + i2c-scl-falling-time-ns = <20>; + /delete-property/dmas; + /delete-property/dma-names; + + ov5640: camera@3c { + compatible = "ovti,ov5640"; + reg = <0x3c>; + clocks = <&clk_ext_camera>; + clock-names = "xclk"; + DOVDD-supply = <&v3v3>; + //powerdown-gpios = <&stmfx_pinctrl 18 (GPIO_ACTIVE_HIGH | GPIO_PUSH_PULL)>; + //reset-gpios = <&stmfx_pinctrl 19 (GPIO_ACTIVE_LOW | GPIO_PUSH_PULL)>; + //powerdown-gpios = <&gpioc 3 GPIO_ACTIVE_HIGH>; //custom + //reset-gpios = <&gpioa 14 GPIO_ACTIVE_LOW>; //custom + rotation = <180>; + status = "okay"; + + port { + ov5640_0: endpoint { + remote-endpoint = <&dcmi_0>; + bus-width = <8>; + data-shift = <2>; /* lines 9:2 are used */ + hsync-active = <0>; + vsync-active = <0>; + pclk-sample = <1>; + pclk-max-frequency = <77000000>; + }; + }; + }; +}; + +&i2c4{ + u-boot,dm-pre-reloc; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&i2c4_pins_z_mx>; + pinctrl-1 = <&i2c4_sleep_pins_z_mx>; + status = "okay"; + i2c-scl-rising-time-ns = <185>; + i2c-scl-falling-time-ns = <20>; + clock-frequency = <400000>; + /delete-property/ dmas; + /delete-property/ dma-names; + + typec: stusb1600@28 { + compatible = "st,stusb1600"; + reg = <0x28>; + interrupt-parent = <&gpioe>; + interrupts = <8 IRQ_TYPE_EDGE_FALLING>; + pinctrl-0 = <&stusb1600_pins_mx>; + pinctrl-names = "default"; + status = "okay"; + vdd-supply = <&vin>; + + typec_con: connector { + compatible = "usb-c-connector"; + label = "USB-C"; + power-role = "dual"; + power-opmode = "default"; + + port { + con_usbotg_hs_ep: endpoint { + remote-endpoint = <&usbotg_hs_ep>; + }; + }; + }; + }; + + pmic:stpmic@33{ + compatible = "st,stpmic1"; + reg = <0x33>; + interrupts-extended = <&exti_pwr 55 IRQ_TYPE_EDGE_FALLING>; + interrupt-controller; + #interrupt-cells = <2>; + status = "okay"; + + st,main-control-register = <0x04>; + st,vin-control-register = <0xc0>; + st,usb-control-register = <0x20>; + + regulators{ + compatible = "st,stpmic1-regulators"; + buck1-supply = <&vin>; + buck2-supply = <&vin>; + buck3-supply = <&vin>; + buck4-supply = <&vin>; + ldo1-supply = <&v3v3>; + ldo2-supply = <&vin>; + ldo3-supply = <&vdd_ddr>; + ldo4-supply = <&vin>; + ldo5-supply = <&vin>; + ldo6-supply = <&v3v3>; + vref_ddr-supply = <&vin>; + boost-supply = <&vin>; + pwr_sw1-supply = <&bst_out>; + pwr_sw2-supply = <&bst_out>; + + + vddcore:buck1{ + regulator-name = "vddcore"; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1350000>; + regulator-always-on; + regulator-initial-mode = <0>; + regulator-over-current-protection; + }; + + vdd_ddr:buck2{ + regulator-name = "vdd_ddr"; + regulator-min-microvolt = <1350000>; + regulator-max-microvolt = <1350000>; + regulator-always-on; + regulator-initial-mode = <0>; + regulator-over-current-protection; + }; + + vdd:buck3{ + regulator-name = "vdd"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + st,mask-reset; + regulator-initial-mode = <0>; + regulator-over-current-protection; + }; + + v3v3:buck4{ + regulator-name = "v3v3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + regulator-over-current-protection; + regulator-initial-mode = <0>; + }; + + v1v8_audio:ldo1{ + regulator-name = "v1v8_audio"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-always-on; + interrupts = ; + }; + + v3v3_hdmi:ldo2{ + regulator-name = "v3v3_hdmi"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + interrupts = ; + }; + + vtt_ddr:ldo3{ + regulator-name = "vtt_ddr"; + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <750000>; + regulator-always-on; + regulator-over-current-protection; + }; + + vdd_usb:ldo4{ + regulator-name = "vdd_usb"; + interrupts = ; + }; + + v3v3_eth:ldo5{ + regulator-name = "v3v3_eth"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + interrupts = ; + regulator-boot-on; + }; + + v3v3_dsi:ldo6{ + regulator-name = "v3v3_dsi"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + interrupts = ; + }; + + vref_ddr:vref_ddr{ + regulator-name = "vref_ddr"; + regulator-always-on; + regulator-over-current-protection; + }; + + bst_out:boost{ + regulator-name = "bst_out"; + interrupts = ; + regulator-always-on; + }; + + vbus_otg:pwr_sw1{ + regulator-name = "vbus_otg"; + interrupts = ; + regulator-active-discharge; + regulator-always-on; + }; + + vbus_sw:pwr_sw2{ + regulator-name = "vbus_sw"; + interrupts = ; + regulator-active-discharge = <1>; + regulator-always-on; + }; + }; + + onkey{ + compatible = "st,stpmic1-onkey"; + interrupts = , ; + interrupt-names = "onkey-falling", "onkey-rising"; + power-off-time-sec = <10>; + status = "okay"; + }; + + watchdog { + compatible = "st,stpmic1-wdt"; + status = "disabled"; + }; + }; + eeprom@50 { + compatible = "atmel,24c02"; + reg = <0x50>; + pagesize = <16>; + }; +}; + +&i2c5{ + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&i2c5_pins_mx>; + pinctrl-1 = <&i2c5_sleep_pins_mx>; + status = "okay"; + + /delete-property/dmas; + /delete-property/dma-names; + +}; + +&spi5 { + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&spi5_pins_mx>; + pinctrl-1 = <&spi5_sleep_pins_mx>; + cs-gpios = <&gpiof 6 0>; + status = "okay"; + + spidev: spidev@0 { + compatible = "rohm,dh2228fv"; + spi-max-frequency = <30000000>; + reg = <0>; + }; +}; + +&i2s2{ + clocks = <&rcc SPI2>, <&rcc SPI2_K>, <&rcc PLL3_Q>, <&rcc PLL3_R>; + clock-names = "pclk", "i2sclk", "x8k", "x11k"; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&i2s2_pins_mx>; + pinctrl-1 = <&i2s2_sleep_pins_mx>; + status = "okay"; + + i2s2_port: port { + i2s2_endpoint: endpoint { + remote-endpoint = <&sii9022_tx_endpoint>; + format = "i2s"; + mclk-fs = <256>; + }; + }; +}; + +&ipcc{ + status = "okay"; +}; + +&iwdg2{ + status = "okay"; + timeout-sec = <32>; +}; + +<dc{ + pinctrl-names = "default", "sleep"; + pinctrl-0 = <<dc_pins_mx>; + pinctrl-1 = <<dc_sleep_pins_mx>; + status = "okay"; + port { + ltdc_ep0_out: endpoint@0 { + reg = <0>; + remote-endpoint = <&sii9022_in>; + }; + + ltdc_ep1_out: endpoint@1 { + reg = <1>; + remote-endpoint = <&dsi_in>; + }; + }; +}; + +&pwr_regulators { + vdd-supply = <&vdd>; + vdd_3v3_usbfs-supply = <&vdd_usb>; +}; + +&rcc{ + u-boot,dm-pre-reloc; + status = "okay"; +}; + +&rng1{ + status = "okay"; +}; + +&rtc{ + status = "okay"; +}; + +&cec { + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&cec_pins_mx>; + pinctrl-1 = <&cec_sleep_pins_mx>; + status = "okay"; +}; + +&cpu0{ + cpu-supply = <&vddcore>; +}; + +&cpu1{ + cpu-supply = <&vddcore>; +}; + +&crc1 { + status = "okay"; +}; + +&dts { + status = "okay"; +}; + +&sdmmc1{ + u-boot,dm-pre-reloc; + pinctrl-names = "default", "opendrain", "sleep"; + pinctrl-0 = <&sdmmc1_pins_mx>; + pinctrl-1 = <&sdmmc1_opendrain_pins_mx>; + pinctrl-2 = <&sdmmc1_sleep_pins_mx>; + status = "okay"; + + cd-gpios = <&gpioe 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; + disable-wp; + st,neg-edge; + bus-width = <4>; + vmmc-supply = <&v3v3>; +}; + +&sdmmc2{ + u-boot,dm-pre-reloc; + pinctrl-names = "default", "opendrain", "sleep"; + pinctrl-0 = <&sdmmc2_pins_mx>; + pinctrl-1 = <&sdmmc2_opendrain_pins_mx>; + pinctrl-2 = <&sdmmc2_sleep_pins_mx>; + status = "okay"; + non-removable; + no-sd; + no-sdio; + st,neg-edge; + bus-width = <8>; + vmmc-supply = <&v3v3>; + vqmmc-supply = <&v3v3>; + mmc-ddr-3_3v; +}; + +&sdmmc3{ + pinctrl-names = "default", "opendrain", "sleep"; + pinctrl-0 = <&sdmmc3_pins_mx>; + pinctrl-1 = <&sdmmc3_opendrain_pins_mx>; + pinctrl-2 = <&sdmmc3_sleep_pins_mx>; + arm,primecell-periphid = <0x10153180>; + non-removable; + st,neg-edge; + bus-width = <4>; + vmmc-supply = <&v3v3>; + mmc-pwrseq = <&wifi_pwrseq>; + #address-cells = <1>; + #size-cells = <0>; + keep-power-in-suspend; + status = "okay"; + + brcmf: bcrmf@1 { + reg = <1>; + compatible = "brcm,bcm4329-fmac"; + }; +}; + +&tamp{ + status = "okay"; +}; + +&timers5 { + /delete-property/dmas; + /delete-property/dma-names; + status = "okay"; + pwm { + pinctrl-0 = <&tim5_pwm_pins_mx>; + pinctrl-1 = <&tim5_pwm_sleep_pins_mx>; + pinctrl-names = "default", "sleep"; + status = "okay"; + }; + timer@4 { + status = "okay"; + }; +}; + +&uart4{ + u-boot,dm-pre-reloc; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&uart4_pins_mx>; + pinctrl-1 = <&uart4_sleep_pins_mx>; + /delete-property/dmas; + /delete-property/dma-names; + status = "okay"; +}; + +&usart2{ + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&usart2_pins_mx>; + pinctrl-1 = <&usart2_sleep_pins_mx>; + uart-has-rtscts; + status = "okay"; + + bluetooth { + shutdown-gpios = <&gpioe 10 GPIO_ACTIVE_HIGH>; + compatible = "brcm,bcm43438-bt"; + max-speed = <3000000>; + vbat-supply = <&v3v3>; + vddio-supply = <&v3v3>; + }; +}; + +&sram { + dma_pool: dma_pool@0 { + reg = <0x50000 0x10000>; + pool; + }; +}; + +&dma1 { + sram = <&dma_pool>; +}; + +&dma2 { + sram = <&dma_pool>; +}; + +&adc { + vdd-supply = <&vdd>; + vdda-supply = <&v3v3_eth>; + vref-supply = <&v3v3_eth>; + status = "okay"; + adc1: adc@0 { + st,min-sample-time-nsecs = <5000>; + st,adc-channels = <0 1>; + status = "okay"; + }; + + adc_temp: temp { + status = "okay"; + }; +}; + + +// WARNING: Do not try to enable DAC1 and DCMI +// This devices share the same pin PA4 +/* &dac { + pinctrl-names = "default"; + status = "okay"; + dac1: dac@1 { + pinctrl-0 = <&dac_ch1_pins_a>; + status = "disabled"; + }; + dac2: dac@2 { + pinctrl-0 = <&dac_ch2_pins_a>; + status = "okay"; + }; +};*/ + +&usbh_ehci { + phys = <&usbphyc_port0>; + phy-names = "usb"; + status = "okay"; +}; + +&usbh_ohci{ + phys = <&usbphyc_port0>; + phy-names = "usb"; + status = "okay"; +}; + +&usbotg_hs { + phys = <&usbphyc_port1 0>; + phy-names = "usb2-phy"; + usb-role-switch; + status = "okay"; + + port { + usbotg_hs_ep: endpoint { + remote-endpoint = <&con_usbotg_hs_ep>; + }; + }; +}; + +&usbphyc { + status = "okay"; +}; + +&usbphyc_port0 { + phy-supply = <&vdd_usb>; + st,phy-tuning = <&usb_phy_tuning>; +}; + +&usbphyc_port1 { + phy-supply = <&vdd_usb>; + st,phy-tuning = <&usb_phy_tuning>; +}; + +&m_can1 { + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&m_can1_pins_mx>; + pinctrl-1 = <&m_can1_sleep_pins_mx>; + status = "okay"; +}; diff --git a/board/octavo/osd32mp1-red/overlay/boot/extlinux/extlinux.conf b/board/octavo/osd32mp1-red/overlay/boot/extlinux/extlinux.conf new file mode 100644 index 00000000000..b3f16b2247e --- /dev/null +++ b/board/octavo/osd32mp1-red/overlay/boot/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +label osd32mp1-red-buildroot + kernel /boot/zImage + devicetree /boot/stm32mp157c-osd32mp1-red.dtb + append root=/dev/mmcblk1p4 rootwait diff --git a/board/octavo/osd32mp1-red/patches/uboot/0001-Add-OSD32MP1-RED-Device-Tree-support.patch b/board/octavo/osd32mp1-red/patches/uboot/0001-Add-OSD32MP1-RED-Device-Tree-support.patch new file mode 100644 index 00000000000..9b075139ee9 --- /dev/null +++ b/board/octavo/osd32mp1-red/patches/uboot/0001-Add-OSD32MP1-RED-Device-Tree-support.patch @@ -0,0 +1,1848 @@ +From 69029a32acdfac1499750f657c16ab3a3cbfa8f8 Mon Sep 17 00:00:00 2001 +From: Kory Maincent +Date: Mon, 3 Oct 2022 12:17:37 +0200 +Subject: [PATCH 1/2] Add OSD32MP1-RED Device Tree support + +Signed-off-by: Kory Maincent +--- + arch/arm/dts/Makefile | 3 +- + .../dts/stm32mp15-osd32mp1-ddr3-1x4Gb.dtsi | 119 ++ + .../dts/stm32mp157c-osd32mp1-red-u-boot.dtsi | 233 +++ + arch/arm/dts/stm32mp157c-osd32mp1-red.dts | 1445 +++++++++++++++++ + 4 files changed, 1799 insertions(+), 1 deletion(-) + create mode 100644 arch/arm/dts/stm32mp15-osd32mp1-ddr3-1x4Gb.dtsi + create mode 100644 arch/arm/dts/stm32mp157c-osd32mp1-red-u-boot.dtsi + create mode 100644 arch/arm/dts/stm32mp157c-osd32mp1-red.dts + +diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile +index 83677c3d4f..00b27c8695 100644 +--- a/arch/arm/dts/Makefile ++++ b/arch/arm/dts/Makefile +@@ -959,7 +959,8 @@ dtb-$(CONFIG_STM32MP15x) += \ + stm32mp157f-ed1.dtb \ + stm32mp157f-ev1.dtb \ + stm32mp15xx-dhcom-pdk2.dtb \ +- stm32mp15xx-dhcor-avenger96.dtb ++ stm32mp15xx-dhcor-avenger96.dtb \ ++ stm32mp157c-osd32mp1-red.dtb + + dtb-$(CONFIG_SOC_K3_AM6) += k3-am654-base-board.dtb k3-am654-r5-base-board.dtb + dtb-$(CONFIG_SOC_K3_J721E) += k3-j721e-common-proc-board.dtb \ +diff --git a/arch/arm/dts/stm32mp15-osd32mp1-ddr3-1x4Gb.dtsi b/arch/arm/dts/stm32mp15-osd32mp1-ddr3-1x4Gb.dtsi +new file mode 100644 +index 0000000000..362f3281b8 +--- /dev/null ++++ b/arch/arm/dts/stm32mp15-osd32mp1-ddr3-1x4Gb.dtsi +@@ -0,0 +1,119 @@ ++/* ++ * Copyright (C) 2015-2018, STMicroelectronics - All Rights Reserved ++ * ++ * SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause ++ * ++ */ ++ ++/* ++ * File generated by STMicroelectronics STM32CubeMX DDR Tool for MPUs ++ * DDR type: DDR3 / DDR3L ++ * DDR width: 16bits ++ * DDR density: 4Gb ++ * System frequency: 533000Khz ++ * Relaxed Timing Mode: false ++ * Address mapping type: RBC ++ * ++ * Save Date: 2020.08.20, save Time: 10:57:25 ++ */ ++ ++#define DDR_MEM_NAME "DDR3-DDR3L 16bits 533000Khz" ++#define DDR_MEM_SPEED 533000 ++#define DDR_MEM_SIZE 0x20000000 ++ ++#define DDR_MSTR 0x00041401 ++#define DDR_MRCTRL0 0x00000010 ++#define DDR_MRCTRL1 0x00000000 ++#define DDR_DERATEEN 0x00000000 ++#define DDR_DERATEINT 0x00800000 ++#define DDR_PWRCTL 0x00000000 ++#define DDR_PWRTMG 0x00400010 ++#define DDR_HWLPCTL 0x00000000 ++#define DDR_RFSHCTL0 0x00210000 ++#define DDR_RFSHCTL3 0x00000000 ++#define DDR_RFSHTMG 0x0081008B ++#define DDR_CRCPARCTL0 0x00000000 ++#define DDR_DRAMTMG0 0x121B2414 ++#define DDR_DRAMTMG1 0x000A041C ++#define DDR_DRAMTMG2 0x0608090F ++#define DDR_DRAMTMG3 0x0050400C ++#define DDR_DRAMTMG4 0x08040608 ++#define DDR_DRAMTMG5 0x06060403 ++#define DDR_DRAMTMG6 0x02020002 ++#define DDR_DRAMTMG7 0x00000202 ++#define DDR_DRAMTMG8 0x00001005 ++#define DDR_DRAMTMG14 0x000000A0 ++#define DDR_ZQCTL0 0xC2000040 ++#define DDR_DFITMG0 0x02060105 ++#define DDR_DFITMG1 0x00000202 ++#define DDR_DFILPCFG0 0x07000000 ++#define DDR_DFIUPD0 0xC0400003 ++#define DDR_DFIUPD1 0x00000000 ++#define DDR_DFIUPD2 0x00000000 ++#define DDR_DFIPHYMSTR 0x00000000 ++#define DDR_ODTCFG 0x06000600 ++#define DDR_ODTMAP 0x00000001 ++#define DDR_SCHED 0x00000C01 ++#define DDR_SCHED1 0x00000000 ++#define DDR_PERFHPR1 0x01000001 ++#define DDR_PERFLPR1 0x08000200 ++#define DDR_PERFWR1 0x08000400 ++#define DDR_DBG0 0x00000000 ++#define DDR_DBG1 0x00000000 ++#define DDR_DBGCMD 0x00000000 ++#define DDR_POISONCFG 0x00000000 ++#define DDR_PCCFG 0x00000010 ++#define DDR_PCFGR_0 0x00010000 ++#define DDR_PCFGW_0 0x00000000 ++#define DDR_PCFGQOS0_0 0x02100C03 ++#define DDR_PCFGQOS1_0 0x00800100 ++#define DDR_PCFGWQOS0_0 0x01100C03 ++#define DDR_PCFGWQOS1_0 0x01000200 ++#define DDR_PCFGR_1 0x00010000 ++#define DDR_PCFGW_1 0x00000000 ++#define DDR_PCFGQOS0_1 0x02100C03 ++#define DDR_PCFGQOS1_1 0x00800040 ++#define DDR_PCFGWQOS0_1 0x01100C03 ++#define DDR_PCFGWQOS1_1 0x01000200 ++#define DDR_ADDRMAP1 0x00070707 ++#define DDR_ADDRMAP2 0x00000000 ++#define DDR_ADDRMAP3 0x1F000000 ++#define DDR_ADDRMAP4 0x00001F1F ++#define DDR_ADDRMAP5 0x06060606 ++#define DDR_ADDRMAP6 0x0F060606 ++#define DDR_ADDRMAP9 0x00000000 ++#define DDR_ADDRMAP10 0x00000000 ++#define DDR_ADDRMAP11 0x00000000 ++#define DDR_PGCR 0x01442E02 ++#define DDR_PTR0 0x0022AA5B ++#define DDR_PTR1 0x04841104 ++#define DDR_PTR2 0x042DA068 ++#define DDR_ACIOCR 0x10400812 ++#define DDR_DXCCR 0x00000C40 ++#define DDR_DSGCR 0xF200011F ++#define DDR_DCR 0x0000000B ++#define DDR_DTPR0 0x38D488D0 ++#define DDR_DTPR1 0x098B00D8 ++#define DDR_DTPR2 0x10023600 ++#define DDR_MR0 0x00000840 ++#define DDR_MR1 0x00000000 ++#define DDR_MR2 0x00000208 ++#define DDR_MR3 0x00000000 ++#define DDR_ODTCR 0x00010000 ++#define DDR_ZQ0CR1 0x00000038 ++#define DDR_DX0GCR 0x0000CE81 ++#define DDR_DX0DLLCR 0x40000000 ++#define DDR_DX0DQTR 0xFFFFFFFF ++#define DDR_DX0DQSTR 0x3DB02000 ++#define DDR_DX1GCR 0x0000CE81 ++#define DDR_DX1DLLCR 0x40000000 ++#define DDR_DX1DQTR 0xFFFFFFFF ++#define DDR_DX1DQSTR 0x3DB02000 ++#define DDR_DX2GCR 0x0000CE80 ++#define DDR_DX2DLLCR 0x40000000 ++#define DDR_DX2DQTR 0xFFFFFFFF ++#define DDR_DX2DQSTR 0x3DB02000 ++#define DDR_DX3GCR 0x0000CE80 ++#define DDR_DX3DLLCR 0x40000000 ++#define DDR_DX3DQTR 0xFFFFFFFF ++#define DDR_DX3DQSTR 0x3DB02000 +diff --git a/arch/arm/dts/stm32mp157c-osd32mp1-red-u-boot.dtsi b/arch/arm/dts/stm32mp157c-osd32mp1-red-u-boot.dtsi +new file mode 100644 +index 0000000000..6da91e0bb8 +--- /dev/null ++++ b/arch/arm/dts/stm32mp157c-osd32mp1-red-u-boot.dtsi +@@ -0,0 +1,233 @@ ++/* SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause*/ ++/* ++ * Copyright (C) 2020, Octavo Systems LLC - All Rights Reserved ++ */ ++ ++/* For more information on Device Tree configuration, please refer to ++ * https://wiki.st.com/stm32mpu/wiki/Category:Device_tree_configuration ++ */ ++ ++#include ++#include "stm32mp15-osd32mp1-ddr3-1x4Gb.dtsi" ++#include "stm32mp15-u-boot.dtsi" ++#include "stm32mp15-ddr.dtsi" ++ ++ ++/ { ++ ++ aliases{ ++ i2c0 = &i2c4; ++ mmc0 = &sdmmc1; ++ usb0 = &usbotg_hs; ++ }; ++ ++ config{ ++ u-boot,boot-led = "heartbeat"; ++ u-boot,error-led = "error"; ++ u-boot,mmc-env-partition = "fip"; ++ }; ++ ++#ifdef CONFIG_STM32MP15x_STM32IMAGE ++ config { ++ u-boot,mmc-env-partition = "ssbl"; ++ }; ++ ++ /* only needed for boot with TF-A, witout FIP support */ ++ firmware { ++ optee { ++ compatible = "linaro,optee-tz"; ++ method = "smc"; ++ }; ++ }; ++ ++ reserved-memory { ++ optee@de000000 { ++ reg = <0xde000000 0x02000000>; ++ no-map; ++ }; ++ }; ++#endif ++ ++ led { ++ red { ++ label = "error"; ++ gpios = <&gpioa 13 GPIO_ACTIVE_LOW>; ++ default-state = "off"; ++ status = "okay"; ++ }; ++ ++ blue { ++ default-state = "on"; ++ }; ++ }; ++}; /*root*/ ++ ++#ifndef CONFIG_TFABOOT ++ ++&i2s2{ ++ clocks = <&rcc SPI2>, <&rcc SPI2_K>, <&rcc PLL3_Q>, <&rcc PLL3_R>; ++}; ++ ++ ++ ++&sai2{ ++ clocks = <&rcc SAI2>, <&rcc PLL3_Q>, <&rcc PLL3_R>; ++}; ++ ++ ++&clk_hse { ++ st,digbypass; ++}; ++ ++&rcc { ++ u-boot,dm-pre-reloc; ++ st,clksrc = < ++ CLK_MPU_PLL1P ++ CLK_AXI_PLL2P ++ CLK_MCU_PLL3P ++ CLK_PLL12_HSE ++ CLK_PLL3_HSE ++ CLK_PLL4_HSE ++ CLK_RTC_LSE ++ CLK_MCO1_DISABLED ++ CLK_MCO2_DISABLED ++ >; ++ st,clkdiv = < ++ 1 /*MPU*/ ++ 0 /*AXI*/ ++ 0 /*MCU*/ ++ 1 /*APB1*/ ++ 1 /*APB2*/ ++ 1 /*APB3*/ ++ 1 /*APB4*/ ++ 2 /*APB5*/ ++ 23 /*RTC*/ ++ 0 /*MCO1*/ ++ 0 /*MCO2*/ ++ >; ++ st,pkcs = < ++ CLK_CKPER_HSE ++ CLK_ETH_PLL3Q ++ CLK_SDMMC12_PLL4P ++ CLK_DSI_DSIPLL ++ CLK_STGEN_HSE ++ CLK_USBPHY_HSE ++ CLK_SPI2S1_PLL3Q ++ CLK_SPI2S23_CKPER ++ CLK_SPI45_PCLK2 ++ CLK_SPI6_DISABLED ++ CLK_I2C46_HSI ++ CLK_SDMMC3_PLL4P ++ CLK_USBO_USBPHY ++ CLK_ADC_CKPER ++ CLK_CEC_LSE ++ CLK_I2C12_HSI ++ CLK_I2C35_HSI ++ CLK_UART1_DISABLED ++ CLK_UART24_HSI ++ CLK_UART35_HSI ++ CLK_UART6_DISABLED ++ CLK_UART78_DISABLED ++ CLK_SPDIF_DISABLED ++ CLK_SAI1_DISABLED ++ CLK_SAI2_DISABLED ++ CLK_SAI3_DISABLED ++ CLK_SAI4_DISABLED ++ CLK_RNG1_LSI ++ CLK_LPTIM1_DISABLED ++ CLK_LPTIM23_DISABLED ++ CLK_LPTIM45_DISABLED ++ >; ++ pll1:st,pll@0 { ++ cfg = < 2 80 0 1 1 PQR(1,0,0) >; ++ frac = < 0x800>; ++ u-boot,dm-pre-reloc; ++ }; ++ pll2:st,pll@1 { ++ cfg = < 2 65 1 0 0 PQR(1,1,1) >; ++ frac = < 0x1400>; ++ u-boot,dm-pre-reloc; ++ }; ++ pll3:st,pll@2 { ++ cfg = < 1 61 3 5 36 PQR(1,1,0) >; ++ frac = < 0x1000 >; ++ u-boot,dm-pre-reloc; ++ }; ++ pll4:st,pll@3 { ++ cfg = < 3 98 5 7 7 PQR(1,1,1) >; ++ u-boot,dm-pre-reloc; ++ }; ++}; ++ ++&i2c4{ ++ u-boot,dm-pre-reloc; ++}; ++ ++&i2c4_pins_z_mx { ++ u-boot,dm-pre-reloc; ++ pins { ++ u-boot,dm-pre-reloc; ++ }; ++}; ++ ++&sdmmc1{ ++ u-boot,dm-pre-reloc; ++}; ++ ++&sdmmc2{ ++ u-boot,dm-pre-reloc; ++}; ++ ++&sdmmc1_pins_mx { ++ u-boot,dm-spl; ++ pins1 { ++ u-boot,dm-spl; ++ }; ++ pins2 { ++ u-boot,dm-spl; ++ }; ++}; ++ ++&sdmmc2_pins_mx { ++ u-boot,dm-spl; ++ pins1 { ++ u-boot,dm-spl; ++ }; ++ pins2 { ++ u-boot,dm-spl; ++ }; ++}; ++ ++#endif /*CONFIG_TFABOOT*/ ++ ++&cryp1{ ++ u-boot,dm-pre-reloc; ++}; ++ ++&hash1{ ++ u-boot,dm-pre-reloc; ++}; ++ ++&uart4{ ++ u-boot,dm-pre-reloc; ++}; ++ ++&usbotg_hs{ ++ u-boot,dm-pre-reloc; ++ u-boot,force-b-session-valid; ++ hnp-srp-disable; ++ dr_mode = "peripheral"; ++}; ++ ++&usbphyc{ ++ u-boot,dm-pre-reloc; ++}; ++ ++&usbphyc_port0{ ++ u-boot,dm-pre-reloc; ++}; ++ ++&usbphyc_port1{ ++ u-boot,dm-pre-reloc; ++}; ++ +diff --git a/arch/arm/dts/stm32mp157c-osd32mp1-red.dts b/arch/arm/dts/stm32mp157c-osd32mp1-red.dts +new file mode 100644 +index 0000000000..6104aff03d +--- /dev/null ++++ b/arch/arm/dts/stm32mp157c-osd32mp1-red.dts +@@ -0,0 +1,1445 @@ ++/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */ ++/* ++ * Copyright (C) Octavo Systems 2021 - All Rights Reserved ++ * Author: Neeraj Dantu for Octavo Systems ++ */ ++ ++/dts-v1/; ++ ++#include ++#include "stm32mp157.dtsi" ++#include "stm32mp15xc.dtsi" ++#include "stm32mp15xxac-pinctrl.dtsi" ++#include "stm32mp15-m4-srm.dtsi" ++#include ++#include ++#include ++ ++/ { ++ model = "Octavo OSD32MP1 RED board"; ++ compatible = "st,stm32mp157c-osd32mp1-red", "st,stm32mp157"; ++ ++ memory@c0000000 { ++ device_type = "memory"; ++ reg = <0xc0000000 0x20000000>; ++ }; ++ ++ wifi_pwrseq: wifi-pwrseq { ++ compatible = "mmc-pwrseq-simple"; ++ reset-gpios = <&gpiog 5 GPIO_ACTIVE_LOW>; ++ }; ++ ++ clocks { ++ clk_ext_camera: clk-ext-camera { ++ #clock-cells = <0>; ++ compatible = "fixed-clock"; ++ clock-frequency = <24000000>; ++ }; ++ }; ++ ++ reserved-memory { ++ #address-cells = <1>; ++ #size-cells = <1>; ++ ranges; ++ ++ mcuram2:mcuram2@10000000{ ++ compatible = "shared-dma-pool"; ++ reg = <0x10000000 0x40000>; ++ no-map; ++ }; ++ ++ vdev0vring0:vdev0vring0@10040000{ ++ compatible = "shared-dma-pool"; ++ reg = <0x10040000 0x1000>; ++ no-map; ++ }; ++ ++ vdev0vring1:vdev0vring1@10041000{ ++ compatible = "shared-dma-pool"; ++ reg = <0x10041000 0x1000>; ++ no-map; ++ }; ++ ++ vdev0buffer:vdev0buffer@10042000{ ++ compatible = "shared-dma-pool"; ++ reg = <0x10042000 0x4000>; ++ no-map; ++ }; ++ ++ mcuram:mcuram@30000000{ ++ compatible = "shared-dma-pool"; ++ reg = <0x30000000 0x40000>; ++ no-map; ++ }; ++ ++ retram:retram@38000000{ ++ compatible = "shared-dma-pool"; ++ reg = <0x38000000 0x10000>; ++ no-map; ++ }; ++ ++ gpu_reserved:gpu@d4000000{ ++ reg = <0xd4000000 0x4000000>; ++ no-map; ++ }; ++ }; ++ ++ ++ aliases { ++ ethernet0 = ðernet0; ++ serial0 = &uart4; ++ serial1 = &usart3; ++ serial2 = &uart7; ++ serial3 = &usart2; ++ }; ++ ++ chosen { ++ stdout-path = "serial0:115200n8"; ++ }; ++ ++ led { ++ compatible = "gpio-leds"; ++ blue { ++ label = "heartbeat"; ++ gpios = <&gpiod 11 GPIO_ACTIVE_HIGH>; ++ linux,default-trigger = "heartbeat"; ++ default-state = "off"; ++ }; ++ }; ++ ++ usb_phy_tuning:usb-phy-tuning{ ++ st,hs-dc-level = <2>; ++ st,fs-rftime-tuning; ++ st,hs-rftime-reduction; ++ st,hs-current-trim = <15>; ++ st,hs-impedance-trim = <1>; ++ st,squelch-level = <3>; ++ st,hs-rx-offset = <2>; ++ st,no-lsfs-sc; ++ }; ++ ++ vin:vin{ ++ compatible = "regulator-fixed"; ++ regulator-name = "vin"; ++ regulator-min-microvolt = <5000000>; ++ regulator-max-microvolt = <5000000>; ++ regulator-always-on; ++ }; ++ ++ sound { ++ compatible = "audio-graph-card"; ++ label = "STM32MP15-DK"; ++ routing = ++ "Playback" , "MCLK", ++ "Capture" , "MCLK", ++ "MICL" , "Mic Bias"; ++ dais = <&i2s2_port>; ++ status = "okay"; ++ }; ++}; ++ ++&pinctrl { ++ u-boot,dm-pre-reloc; ++ dcmi_pins_mx: dcmi_mx-0 { ++ pins { ++ pinmux = , /* DCMI_HSYNC */ ++ , /* DCMI_PIXCLK */ ++ , /* DCMI_D1 */ ++ , /* DCMI_D7 */ ++ , /* DCMI_D0 */ ++ , /* DCMI_D2 */ ++ , /* DCMI_D3 */ ++ , /* DCMI_D4 */ ++ , /* DCMI_D6 */ ++ , /* DCMI_VSYNC */ ++ , /* DCMI_D8 */ ++ , /* DCMI_D9 */ ++ , /* DCMI_D11 */ ++ , /* DCMI_D10 */ ++ ; /* DCMI_D5 */ ++ bias-disable; ++ }; ++ }; ++ ++ dcmi_sleep_pins_mx: dcmi_sleep_mx-0 { ++ pins { ++ pinmux = , /* DCMI_HSYNC */ ++ , /* DCMI_PIXCLK */ ++ , /* DCMI_D1 */ ++ , /* DCMI_D7 */ ++ , /* DCMI_D0 */ ++ , /* DCMI_D2 */ ++ , /* DCMI_D3 */ ++ , /* DCMI_D4 */ ++ , /* DCMI_D6 */ ++ , /* DCMI_VSYNC */ ++ , /* DCMI_D8 */ ++ , /* DCMI_D9 */ ++ , /* DCMI_D11 */ ++ , /* DCMI_D10 */ ++ ; /* DCMI_D5 */ ++ }; ++ }; ++ ++ eth1_pins_mx: eth1_mx-0 { ++ pins1 { ++ pinmux = , /* ETH1_RX_CLK */ ++ , /* ETH1_RX_CTL */ ++ , /* ETH1_RXD2 */ ++ , /* ETH1_RXD3 */ ++ , /* ETH1_RXD0 */ ++ ; /* ETH1_RXD1 */ ++ bias-disable; ++ }; ++ pins2 { ++ pinmux = ; /* ETH1_MDIO */ ++ bias-disable; ++ drive-push-pull; ++ slew-rate = <0>; ++ }; ++ pins3 { ++ pinmux = , /* ETH1_TX_CTL */ ++ , /* ETH1_MDC */ ++ , /* ETH1_TXD2 */ ++ , /* ETH1_TXD3 */ ++ , /* ETH1_GTX_CLK */ ++ , /* ETH1_TXD0 */ ++ ; /* ETH1_TXD1 */ ++ bias-disable; ++ drive-push-pull; ++ slew-rate = <2>; ++ }; ++ }; ++ ++ eth1_sleep_pins_mx: eth1_sleep_mx-0 { ++ pins { ++ pinmux = , /* ETH1_RX_CLK */ ++ , /* ETH1_MDIO */ ++ , /* ETH1_RX_CTL */ ++ , /* ETH1_RXD2 */ ++ , /* ETH1_RXD3 */ ++ , /* ETH1_TX_CTL */ ++ , /* ETH1_MDC */ ++ , /* ETH1_TXD2 */ ++ , /* ETH1_RXD0 */ ++ , /* ETH1_RXD1 */ ++ , /* ETH1_TXD3 */ ++ , /* ETH1_GTX_CLK */ ++ , /* ETH1_TXD0 */ ++ ; /* ETH1_TXD1 */ ++ }; ++ }; ++ ++ i2c1_pins_mx: i2c1_mx-0 { ++ pins { ++ pinmux = , /* I2C1_SCL */ ++ ; /* I2C1_SDA */ ++ bias-disable; ++ drive-open-drain; ++ slew-rate = <0>; ++ }; ++ }; ++ ++ i2c1_sleep_pins_mx: i2c1_sleep_mx-0 { ++ pins { ++ pinmux = , /* I2C1_SCL */ ++ ; /* I2C1_SDA */ ++ }; ++ }; ++ ++ i2c2_pins_mx: i2c2_mx-0 { ++ pins { ++ pinmux = ; /* I2C2_SDA */ ++ bias-disable; ++ drive-open-drain; ++ slew-rate = <0>; ++ }; ++ }; ++ ++ i2c2_sleep_pins_mx: i2c2_sleep_mx-0 { ++ pins { ++ pinmux = ; /* I2C2_SDA */ ++ }; ++ }; ++ ++ i2c5_pins_mx: i2c5_mx-0 { ++ pins { ++ pinmux = , /* I2C5_SCL */ ++ ; /* I2C5_SDA */ ++ bias-disable; ++ drive-open-drain; ++ slew-rate = <0>; ++ }; ++ }; ++ ++ i2c5_sleep_pins_mx: i2c5_sleep_mx-0 { ++ pins { ++ pinmux = , /* I2C5_SCL */ ++ ; /* I2C5_SDA */ ++ }; ++ }; ++ ++ i2s2_pins_mx: i2s2_mx-0 { ++ pins { ++ pinmux = , /* I2S2_WS */ ++ , /* I2S2_CK */ ++ ; /* I2S2_SDO */ ++ bias-disable; ++ drive-push-pull; ++ slew-rate = <1>; ++ }; ++ }; ++ ++ i2s2_sleep_pins_mx: i2s2_sleep_mx-0 { ++ pins { ++ pinmux = , /* I2S2_WS */ ++ , /* I2S2_CK */ ++ ; /* I2S2_SDO */ ++ }; ++ }; ++ ++ ltdc_pins_mx: ltdc_mx-0 { ++ pins1 { ++ pinmux = , /* LTDC_B5 */ ++ , /* LTDC_B6 */ ++ , /* LTDC_R5 */ ++ , /* LTDC_B7 */ ++ , /* LTDC_B0 */ ++ , /* LTDC_B3 */ ++ , /* LTDC_G1 */ ++ , /* LTDC_B4 */ ++ , /* LTDC_G0 */ ++ , /* LTDC_R7 */ ++ , /* LTDC_DE */ ++ , /* LTDC_B2 */ ++ , /* LTDC_B1 */ ++ , /* LTDC_R0 */ ++ , /* LTDC_R1 */ ++ , /* LTDC_G4 */ ++ , /* LTDC_R2 */ ++ , /* LTDC_R3 */ ++ , /* LTDC_R4 */ ++ , /* LTDC_R6 */ ++ , /* LTDC_G2 */ ++ , /* LTDC_G3 */ ++ , /* LTDC_G5 */ ++ , /* LTDC_G6 */ ++ , /* LTDC_G7 */ ++ , /* LTDC_VSYNC */ ++ ; /* LTDC_HSYNC */ ++ bias-disable; ++ drive-push-pull; ++ slew-rate = <0>; ++ }; ++ pins2 { ++ pinmux = ; /* LTDC_CLK */ ++ bias-disable; ++ drive-push-pull; ++ slew-rate = <1>; ++ }; ++ }; ++ ++ ltdc_sleep_pins_mx: ltdc_sleep_mx-0 { ++ pins { ++ pinmux = , /* LTDC_B5 */ ++ , /* LTDC_B6 */ ++ , /* LTDC_R5 */ ++ , /* LTDC_B7 */ ++ , /* LTDC_B0 */ ++ , /* LTDC_B3 */ ++ , /* LTDC_G1 */ ++ , /* LTDC_B4 */ ++ , /* LTDC_G0 */ ++ , /* LTDC_R7 */ ++ , /* LTDC_DE */ ++ , /* LTDC_CLK */ ++ , /* LTDC_B2 */ ++ , /* LTDC_B1 */ ++ , /* LTDC_R0 */ ++ , /* LTDC_R1 */ ++ , /* LTDC_G4 */ ++ , /* LTDC_R2 */ ++ , /* LTDC_R3 */ ++ , /* LTDC_R4 */ ++ , /* LTDC_R6 */ ++ , /* LTDC_G2 */ ++ , /* LTDC_G3 */ ++ , /* LTDC_G5 */ ++ , /* LTDC_G6 */ ++ , /* LTDC_G7 */ ++ , /* LTDC_VSYNC */ ++ ; /* LTDC_HSYNC */ ++ }; ++ }; ++ ++ sdmmc1_pins_mx: sdmmc1_mx-0 { ++ u-boot,dm-pre-reloc; ++ pins1 { ++ u-boot,dm-pre-reloc; ++ pinmux = , /* SDMMC1_D0 */ ++ , /* SDMMC1_D1 */ ++ , /* SDMMC1_D2 */ ++ , /* SDMMC1_D3 */ ++ ; /* SDMMC1_CMD */ ++ bias-disable; ++ drive-push-pull; ++ slew-rate = <1>; ++ }; ++ pins2 { ++ u-boot,dm-pre-reloc; ++ pinmux = ; /* SDMMC1_CK */ ++ bias-disable; ++ drive-push-pull; ++ slew-rate = <2>; ++ }; ++ }; ++ ++ sdmmc1_opendrain_pins_mx: sdmmc1_opendrain_mx-0 { ++ u-boot,dm-pre-reloc; ++ pins1 { ++ u-boot,dm-pre-reloc; ++ pinmux = , /* SDMMC1_D0 */ ++ , /* SDMMC1_D1 */ ++ , /* SDMMC1_D2 */ ++ ; /* SDMMC1_D3 */ ++ bias-disable; ++ drive-push-pull; ++ slew-rate = <1>; ++ }; ++ pins2 { ++ u-boot,dm-pre-reloc; ++ pinmux = ; /* SDMMC1_CK */ ++ bias-disable; ++ drive-push-pull; ++ slew-rate = <2>; ++ }; ++ pins3 { ++ u-boot,dm-pre-reloc; ++ pinmux = ; /* SDMMC1_CMD */ ++ bias-disable; ++ drive-open-drain; ++ slew-rate = <1>; ++ }; ++ }; ++ ++ sdmmc1_sleep_pins_mx: sdmmc1_sleep_mx-0 { ++ u-boot,dm-pre-reloc; ++ pins { ++ u-boot,dm-pre-reloc; ++ pinmux = , /* SDMMC1_D0 */ ++ , /* SDMMC1_D1 */ ++ , /* SDMMC1_D2 */ ++ , /* SDMMC1_D3 */ ++ , /* SDMMC1_CK */ ++ ; /* SDMMC1_CMD */ ++ }; ++ }; ++ ++ sdmmc2_pins_mx: sdmmc2_mx-0 { ++ u-boot,dm-pre-reloc; ++ pins1 { ++ u-boot,dm-pre-reloc; ++ pinmux = , /* SDMMC2_D4 */ ++ , /* SDMMC2_D5 */ ++ , /* SDMMC2_D2 */ ++ , /* SDMMC2_D3 */ ++ , /* SDMMC2_D0 */ ++ , /* SDMMC2_D1 */ ++ , /* SDMMC2_D7 */ ++ , /* SDMMC2_D6 */ ++ ; /* SDMMC2_CMD */ ++ bias-pull-up; ++ drive-push-pull; ++ slew-rate = <1>; ++ }; ++ pins2 { ++ u-boot,dm-pre-reloc; ++ pinmux = ; /* SDMMC2_CK */ ++ bias-pull-up; ++ drive-push-pull; ++ slew-rate = <2>; ++ }; ++ }; ++ ++ sdmmc2_opendrain_pins_mx: sdmmc2_opendrain_mx-0 { ++ u-boot,dm-pre-reloc; ++ pins1 { ++ u-boot,dm-pre-reloc; ++ pinmux = , /* SDMMC2_D4 */ ++ , /* SDMMC2_D5 */ ++ , /* SDMMC2_D2 */ ++ , /* SDMMC2_D3 */ ++ , /* SDMMC2_D0 */ ++ , /* SDMMC2_D1 */ ++ , /* SDMMC2_D7 */ ++ ; /* SDMMC2_D6 */ ++ bias-pull-up; ++ drive-push-pull; ++ slew-rate = <1>; ++ }; ++ pins2 { ++ u-boot,dm-pre-reloc; ++ pinmux = ; /* SDMMC2_CK */ ++ bias-pull-up; ++ drive-push-pull; ++ slew-rate = <2>; ++ }; ++ pins3 { ++ u-boot,dm-pre-reloc; ++ pinmux = ; /* SDMMC2_CMD */ ++ bias-pull-up; ++ drive-open-drain; ++ slew-rate = <1>; ++ }; ++ }; ++ ++ sdmmc2_sleep_pins_mx: sdmmc2_sleep_mx-0 { ++ u-boot,dm-pre-reloc; ++ pins { ++ u-boot,dm-pre-reloc; ++ pinmux = , /* SDMMC2_D4 */ ++ , /* SDMMC2_D5 */ ++ , /* SDMMC2_D2 */ ++ , /* SDMMC2_D3 */ ++ , /* SDMMC2_D0 */ ++ , /* SDMMC2_D1 */ ++ , /* SDMMC2_D7 */ ++ , /* SDMMC2_CK */ ++ , /* SDMMC2_D6 */ ++ ; /* SDMMC2_CMD */ ++ }; ++ }; ++ ++ sdmmc3_pins_mx: sdmmc3_mx-0 { ++ u-boot,dm-pre-reloc; ++ pins1 { ++ u-boot,dm-pre-reloc; ++ pinmux = , /* SDMMC3_D3 */ ++ , /* SDMMC3_D0 */ ++ , /* SDMMC3_CMD */ ++ , /* SDMMC3_D1 */ ++ ; /* SDMMC3_D2 */ ++ bias-disable; ++ drive-push-pull; ++ slew-rate = <1>; ++ }; ++ pins2 { ++ u-boot,dm-pre-reloc; ++ pinmux = ; /* SDMMC3_CK */ ++ bias-disable; ++ drive-push-pull; ++ slew-rate = <2>; ++ }; ++ }; ++ ++ sdmmc3_opendrain_pins_mx: sdmmc3_opendrain_mx-0 { ++ u-boot,dm-pre-reloc; ++ pins1 { ++ u-boot,dm-pre-reloc; ++ pinmux = , /* SDMMC3_D3 */ ++ , /* SDMMC3_D0 */ ++ , /* SDMMC3_D1 */ ++ ; /* SDMMC3_D2 */ ++ bias-disable; ++ drive-push-pull; ++ slew-rate = <1>; ++ }; ++ pins2 { ++ u-boot,dm-pre-reloc; ++ pinmux = ; /* SDMMC3_CMD */ ++ bias-disable; ++ drive-open-drain; ++ slew-rate = <1>; ++ }; ++ pins3 { ++ u-boot,dm-pre-reloc; ++ pinmux = ; /* SDMMC3_CK */ ++ bias-disable; ++ drive-push-pull; ++ slew-rate = <2>; ++ }; ++ }; ++ ++ sdmmc3_sleep_pins_mx: sdmmc3_sleep_mx-0 { ++ u-boot,dm-pre-reloc; ++ pins { ++ u-boot,dm-pre-reloc; ++ pinmux = , /* SDMMC3_D3 */ ++ , /* SDMMC3_D0 */ ++ , /* SDMMC3_CMD */ ++ , /* SDMMC3_D1 */ ++ , /* SDMMC3_D2 */ ++ ; /* SDMMC3_CK */ ++ }; ++ }; ++ ++ spi5_pins_mx: spi5_mx-0 { ++ pins { ++ pinmux = , /* SPI5_SCK */ ++ , /* SPI5_MISO */ ++ ; /* SPI5_MOSI */ ++ bias-disable; ++ drive-push-pull; ++ slew-rate = <1>; ++ }; ++ }; ++ ++ spi5_sleep_pins_mx: spi5_sleep_mx-0 { ++ pins { ++ pinmux = , /* SPI5_SCK */ ++ , /* SPI5_MISO */ ++ ; /* SPI5_MOSI */ ++ }; ++ }; ++ ++ tim5_pwm_pins_mx: tim5_pwm_mx-0 { ++ pins { ++ pinmux = ; /* TIM5_CH2 */ ++ bias-disable; ++ drive-push-pull; ++ slew-rate = <0>; ++ }; ++ }; ++ ++ tim5_pwm_sleep_pins_mx: tim5_pwm_sleep_mx-0 { ++ pins { ++ pinmux = ; /* TIM5_CH2 */ ++ }; ++ }; ++ ++ uart4_pins_mx: uart4_mx-0 { ++ u-boot,dm-pre-reloc; ++ pins1 { ++ u-boot,dm-pre-reloc; ++ pinmux = ; /* UART4_RX */ ++ bias-disable; ++ }; ++ pins2 { ++ u-boot,dm-pre-reloc; ++ pinmux = ; /* UART4_TX */ ++ bias-disable; ++ drive-push-pull; ++ slew-rate = <0>; ++ }; ++ }; ++ ++ uart4_sleep_pins_mx: uart4_sleep_mx-0 { ++ u-boot,dm-pre-reloc; ++ pins { ++ u-boot,dm-pre-reloc; ++ pinmux = , /* UART4_RX */ ++ ; /* UART4_TX */ ++ }; ++ }; ++ ++ usart2_pins_mx: usart2_mx-0 { ++ pins1 { ++ pinmux = , /* USART2_CTS */ ++ ; /* USART2_RX */ ++ bias-disable; ++ }; ++ pins2 { ++ pinmux = , /* USART2_RTS */ ++ ; /* USART2_TX */ ++ bias-disable; ++ drive-push-pull; ++ slew-rate = <0>; ++ }; ++ }; ++ ++ usart2_sleep_pins_mx: usart2_sleep_mx-0 { ++ pins { ++ pinmux = , /* USART2_CTS */ ++ , /* USART2_RTS */ ++ , /* USART2_TX */ ++ ; /* USART2_RX */ ++ }; ++ }; ++ ++ cec_pins_mx: cec-1 { ++ pins { ++ pinmux = ; ++ bias-disable; ++ drive-open-drain; ++ slew-rate = <0>; ++ }; ++ }; ++ ++ cec_sleep_pins_mx: cec-sleep-1 { ++ pins { ++ pinmux = ; /* HDMI_CEC */ ++ }; ++ }; ++ ++ stusb1600_pins_mx: stusb1600-0 { ++ pins { ++ pinmux = ; ++ bias-pull-up; ++ }; ++ }; ++ ++ m_can1_pins_mx: m_can1_sleep_mx-0 { ++ pins1 { ++ pinmux = ; /* CAN1_TX */ ++ slew-rate = <0>; ++ drive-push-pull; ++ bias-disable; ++ }; ++ pins2 { ++ pinmux = ; /* CAN1_RX */ ++ bias-disable; ++ }; ++ }; ++ ++ m_can1_sleep_pins_mx: m_can1_sleep-0 { ++ pins { ++ pinmux = , /* CAN1_TX */ ++ ; /* CAN1_RX */ ++ }; ++ }; ++ ++}; ++ ++&pinctrl_z { ++ u-boot,dm-pre-reloc; ++ ++ i2c2_pins_z_mx: i2c2_mx-0 { ++ pins { ++ pinmux = ; /* I2C2_SCL */ ++ bias-disable; ++ drive-open-drain; ++ slew-rate = <0>; ++ }; ++ }; ++ ++ i2c2_sleep_pins_z_mx: i2c2_sleep_mx-0 { ++ pins { ++ pinmux = ; /* I2C2_SCL */ ++ }; ++ }; ++ ++ i2c4_pins_z_mx: i2c4_mx-0 { ++ u-boot,dm-pre-reloc; ++ pins { ++ u-boot,dm-pre-reloc; ++ pinmux = , /* I2C4_SCL */ ++ ; /* I2C4_SDA */ ++ bias-disable; ++ drive-open-drain; ++ slew-rate = <0>; ++ }; ++ }; ++ ++ i2c4_sleep_pins_z_mx: i2c4_sleep_mx-0 { ++ u-boot,dm-pre-reloc; ++ pins { ++ u-boot,dm-pre-reloc; ++ pinmux = , /* I2C4_SCL */ ++ ; /* I2C4_SDA */ ++ }; ++ }; ++}; ++ ++&m4_rproc{ ++ memory-region = <&retram>, <&mcuram>, <&mcuram2>, <&vdev0vring0>, ++ <&vdev0vring1>, <&vdev0buffer>; ++ mboxes = <&ipcc 0>, <&ipcc 1>, <&ipcc 2>; ++ mbox-names = "vq0", "vq1", "shutdown"; ++ interrupt-parent = <&exti>; ++ interrupts = <68 1>; ++ wakeup-source; ++ status = "okay"; ++}; ++ ++&dcmi{ ++ pinctrl-names = "default", "sleep"; ++ pinctrl-0 = <&dcmi_pins_mx>; ++ pinctrl-1 = <&dcmi_sleep_pins_mx>; ++ status = "okay"; ++ ++ port { ++ dcmi_0: endpoint { ++ remote-endpoint = <&ov5640_0>; ++ bus-width = <8>; ++ hsync-active = <0>; ++ vsync-active = <0>; ++ pclk-sample = <1>; ++ pclk-max-frequency = <77000000>; ++ }; ++ }; ++}; ++ ++&dsi{ ++ status = "okay"; ++ ++ ports { ++ port@0 { ++ reg = <0>; ++ dsi_in: endpoint { ++ remote-endpoint = <<dc_ep1_out>; ++ }; ++ }; ++ ++ port@1 { ++ reg = <1>; ++ dsi_out: endpoint { ++ remote-endpoint = <&panel_in>; ++ }; ++ }; ++ }; ++ ++ panel_otm8009a: panel-otm8009a@0 { ++ compatible = "orisetech,otm8009a"; ++ reg = <0>; ++ reset-gpios = <&gpioe 9 GPIO_ACTIVE_LOW>; ++ power-supply = <&v3v3>; ++ status = "okay"; ++ ++ port { ++ panel_in: endpoint { ++ remote-endpoint = <&dsi_out>; ++ }; ++ }; ++ }; ++}; ++ ++ðernet0{ ++ pinctrl-names = "default", "sleep"; ++ pinctrl-0 = <ð1_pins_mx>; ++ pinctrl-1 = <ð1_sleep_pins_mx>; ++ status = "okay"; ++ ++ ++ st,eth-clk-sel; //custom ++ phy-mode = "rgmii-id"; ++ max-speed = <1000>; ++ phy-handle = <&phy0>; ++ nvmem-cells = <ðernet_mac_address>; ++ nvmem-cell-names = "mac-address"; ++ ++ mdio0 { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ compatible = "snps,dwmac-mdio"; ++ phy0: ethernet-phy@0 { ++ reg = <3>; ++ }; ++ }; ++}; ++ ++&gpu{ ++ status = "okay"; ++ contiguous-area = <&gpu_reserved>; ++}; ++ ++&hash1 { ++ status = "okay"; ++}; ++ ++&hsem{ ++ status = "okay"; ++}; ++ ++&cryp1{ ++ u-boot,dm-pre-reloc; ++ status = "okay"; ++}; ++ ++&i2c1{ ++ pinctrl-names = "default", "sleep"; ++ pinctrl-0 = <&i2c1_pins_mx>; ++ pinctrl-1 = <&i2c1_sleep_pins_mx>; ++ status = "okay"; ++ i2c-scl-rising-time-ns = <100>; ++ i2c-scl-falling-time-ns = <7>; ++ /delete-property/dmas; ++ /delete-property/dma-names; ++ ++ touchscreen@2a { ++ compatible = "focaltech,ft6236"; ++ reg = <0x2a>; ++ interrupts = <2 2>; ++ interrupt-parent = <&gpiof>; ++ interrupt-controller; ++ touchscreen-size-x = <480>; ++ touchscreen-size-y = <800>; ++ panel = <&panel_otm8009a>; ++ vcc-supply = <&v3v3>; ++ status = "okay"; ++ }; ++ touchscreen@38 { ++ compatible = "focaltech,ft6236"; ++ reg = <0x38>; ++ interrupts = <2 2>; ++ interrupt-parent = <&gpiof>; ++ interrupt-controller; ++ touchscreen-size-x = <480>; ++ touchscreen-size-y = <800>; ++ panel = <&panel_otm8009a>; ++ vcc-supply = <&v3v3>; ++ status = "okay"; ++ }; ++ ++ hdmi-transmitter@39 { ++ compatible = "sil,sii9022"; ++ reg = <0x39>; ++ reset-gpios = <&gpiog 0 GPIO_ACTIVE_LOW>; ++ interrupts = <1 IRQ_TYPE_EDGE_FALLING>; ++ interrupt-parent = <&gpiog>; ++ pinctrl-names = "default", "sleep"; ++ pinctrl-0 = <<dc_pins_mx>; ++ pinctrl-1 = <<dc_sleep_pins_mx>; ++ status = "okay"; ++ ++ ports { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ port@0 { ++ reg = <0>; ++ sii9022_in: endpoint { ++ remote-endpoint = <<dc_ep0_out>; ++ }; ++ }; ++ ++ port@1 { ++ reg = <1>; ++ sii9022_tx_endpoint: endpoint { ++ remote-endpoint = <&i2s2_endpoint>; ++ }; ++ }; ++ }; ++ }; ++}; ++ ++&i2c2{ ++ pinctrl-names = "default", "sleep"; ++ pinctrl-0 = <&i2c2_pins_mx &i2c2_pins_z_mx>; ++ pinctrl-1 = <&i2c2_sleep_pins_mx &i2c2_sleep_pins_z_mx>; ++ status = "okay"; ++ i2c-scl-rising-time-ns = <185>; ++ i2c-scl-falling-time-ns = <20>; ++ /delete-property/dmas; ++ /delete-property/dma-names; ++ ++ ov5640: camera@3c { ++ compatible = "ovti,ov5640"; ++ reg = <0x3c>; ++ clocks = <&clk_ext_camera>; ++ clock-names = "xclk"; ++ DOVDD-supply = <&v3v3>; ++ //powerdown-gpios = <&stmfx_pinctrl 18 (GPIO_ACTIVE_HIGH | GPIO_PUSH_PULL)>; ++ //reset-gpios = <&stmfx_pinctrl 19 (GPIO_ACTIVE_LOW | GPIO_PUSH_PULL)>; ++ //powerdown-gpios = <&gpioc 3 GPIO_ACTIVE_HIGH>; //custom ++ //reset-gpios = <&gpioa 14 GPIO_ACTIVE_LOW>; //custom ++ rotation = <180>; ++ status = "okay"; ++ ++ port { ++ ov5640_0: endpoint { ++ remote-endpoint = <&dcmi_0>; ++ bus-width = <8>; ++ data-shift = <2>; /* lines 9:2 are used */ ++ hsync-active = <0>; ++ vsync-active = <0>; ++ pclk-sample = <1>; ++ pclk-max-frequency = <77000000>; ++ }; ++ }; ++ }; ++}; ++ ++&i2c4{ ++ u-boot,dm-pre-reloc; ++ pinctrl-names = "default", "sleep"; ++ pinctrl-0 = <&i2c4_pins_z_mx>; ++ pinctrl-1 = <&i2c4_sleep_pins_z_mx>; ++ status = "okay"; ++ i2c-scl-rising-time-ns = <185>; ++ i2c-scl-falling-time-ns = <20>; ++ clock-frequency = <400000>; ++ /delete-property/ dmas; ++ /delete-property/ dma-names; ++ ++ typec: stusb1600@28 { ++ compatible = "st,stusb1600"; ++ reg = <0x28>; ++ interrupt-parent = <&gpioe>; ++ interrupts = <8 IRQ_TYPE_EDGE_FALLING>; ++ pinctrl-0 = <&stusb1600_pins_mx>; ++ pinctrl-names = "default"; ++ status = "okay"; ++ vdd-supply = <&vin>; ++ ++ typec_con: connector { ++ compatible = "usb-c-connector"; ++ label = "USB-C"; ++ power-role = "dual"; ++ power-opmode = "default"; ++ ++ port { ++ con_usbotg_hs_ep: endpoint { ++ remote-endpoint = <&usbotg_hs_ep>; ++ }; ++ }; ++ }; ++ }; ++ ++ pmic:stpmic@33{ ++ compatible = "st,stpmic1"; ++ reg = <0x33>; ++ interrupts-extended = <&exti_pwr 55 IRQ_TYPE_EDGE_FALLING>; ++ interrupt-controller; ++ #interrupt-cells = <2>; ++ status = "okay"; ++ ++ st,main-control-register = <0x04>; ++ st,vin-control-register = <0xc0>; ++ st,usb-control-register = <0x20>; ++ ++ regulators{ ++ compatible = "st,stpmic1-regulators"; ++ buck1-supply = <&vin>; ++ buck2-supply = <&vin>; ++ buck3-supply = <&vin>; ++ buck4-supply = <&vin>; ++ ldo1-supply = <&v3v3>; ++ ldo2-supply = <&vin>; ++ ldo3-supply = <&vdd_ddr>; ++ ldo4-supply = <&vin>; ++ ldo5-supply = <&vin>; ++ ldo6-supply = <&v3v3>; ++ vref_ddr-supply = <&vin>; ++ boost-supply = <&vin>; ++ pwr_sw1-supply = <&bst_out>; ++ pwr_sw2-supply = <&bst_out>; ++ ++ ++ vddcore:buck1{ ++ regulator-name = "vddcore"; ++ regulator-min-microvolt = <1200000>; ++ regulator-max-microvolt = <1350000>; ++ regulator-always-on; ++ regulator-initial-mode = <0>; ++ regulator-over-current-protection; ++ }; ++ ++ vdd_ddr:buck2{ ++ regulator-name = "vdd_ddr"; ++ regulator-min-microvolt = <1350000>; ++ regulator-max-microvolt = <1350000>; ++ regulator-always-on; ++ regulator-initial-mode = <0>; ++ regulator-over-current-protection; ++ }; ++ ++ vdd:buck3{ ++ regulator-name = "vdd"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-always-on; ++ st,mask-reset; ++ regulator-initial-mode = <0>; ++ regulator-over-current-protection; ++ }; ++ ++ v3v3:buck4{ ++ regulator-name = "v3v3"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-always-on; ++ regulator-over-current-protection; ++ regulator-initial-mode = <0>; ++ }; ++ ++ v1v8_audio:ldo1{ ++ regulator-name = "v1v8_audio"; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <1800000>; ++ regulator-always-on; ++ interrupts = ; ++ }; ++ ++ v3v3_hdmi:ldo2{ ++ regulator-name = "v3v3_hdmi"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-always-on; ++ interrupts = ; ++ }; ++ ++ vtt_ddr:ldo3{ ++ regulator-name = "vtt_ddr"; ++ regulator-min-microvolt = <500000>; ++ regulator-max-microvolt = <750000>; ++ regulator-always-on; ++ regulator-over-current-protection; ++ }; ++ ++ vdd_usb:ldo4{ ++ regulator-name = "vdd_usb"; ++ interrupts = ; ++ }; ++ ++ v3v3_eth:ldo5{ ++ regulator-name = "v3v3_eth"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ interrupts = ; ++ regulator-boot-on; ++ }; ++ ++ v3v3_dsi:ldo6{ ++ regulator-name = "v3v3_dsi"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-always-on; ++ interrupts = ; ++ }; ++ ++ vref_ddr:vref_ddr{ ++ regulator-name = "vref_ddr"; ++ regulator-always-on; ++ regulator-over-current-protection; ++ }; ++ ++ bst_out:boost{ ++ regulator-name = "bst_out"; ++ interrupts = ; ++ regulator-always-on; ++ }; ++ ++ vbus_otg:pwr_sw1{ ++ regulator-name = "vbus_otg"; ++ interrupts = ; ++ regulator-active-discharge; ++ regulator-always-on; ++ }; ++ ++ vbus_sw:pwr_sw2{ ++ regulator-name = "vbus_sw"; ++ interrupts = ; ++ regulator-active-discharge = <1>; ++ regulator-always-on; ++ }; ++ }; ++ ++ onkey{ ++ compatible = "st,stpmic1-onkey"; ++ interrupts = , ; ++ interrupt-names = "onkey-falling", "onkey-rising"; ++ power-off-time-sec = <10>; ++ status = "okay"; ++ }; ++ ++ watchdog { ++ compatible = "st,stpmic1-wdt"; ++ status = "disabled"; ++ }; ++ }; ++ eeprom@50 { ++ compatible = "atmel,24c02"; ++ reg = <0x50>; ++ pagesize = <16>; ++ }; ++}; ++ ++&i2c5{ ++ pinctrl-names = "default", "sleep"; ++ pinctrl-0 = <&i2c5_pins_mx>; ++ pinctrl-1 = <&i2c5_sleep_pins_mx>; ++ status = "okay"; ++ ++ /delete-property/dmas; ++ /delete-property/dma-names; ++ ++}; ++ ++&spi5 { ++ pinctrl-names = "default", "sleep"; ++ pinctrl-0 = <&spi5_pins_mx>; ++ pinctrl-1 = <&spi5_sleep_pins_mx>; ++ cs-gpios = <&gpiof 6 0>; ++ status = "okay"; ++ ++ spidev: spidev@0 { ++ compatible = "rohm,dh2228fv"; ++ spi-max-frequency = <30000000>; ++ reg = <0>; ++ }; ++}; ++ ++&i2s2{ ++ clocks = <&rcc SPI2>, <&rcc SPI2_K>, <&rcc PLL3_Q>, <&rcc PLL3_R>; ++ clock-names = "pclk", "i2sclk", "x8k", "x11k"; ++ pinctrl-names = "default", "sleep"; ++ pinctrl-0 = <&i2s2_pins_mx>; ++ pinctrl-1 = <&i2s2_sleep_pins_mx>; ++ status = "okay"; ++ ++ i2s2_port: port { ++ i2s2_endpoint: endpoint { ++ remote-endpoint = <&sii9022_tx_endpoint>; ++ format = "i2s"; ++ mclk-fs = <256>; ++ }; ++ }; ++}; ++ ++&ipcc{ ++ status = "okay"; ++}; ++ ++&iwdg2{ ++ status = "okay"; ++ timeout-sec = <32>; ++}; ++ ++<dc{ ++ status = "okay"; ++ port { ++ ltdc_ep0_out: endpoint@0 { ++ reg = <0>; ++ remote-endpoint = <&sii9022_in>; ++ }; ++ ++ ltdc_ep1_out: endpoint@1 { ++ reg = <1>; ++ remote-endpoint = <&dsi_in>; ++ }; ++ }; ++}; ++ ++&pwr_regulators { ++ vdd-supply = <&vdd>; ++ vdd_3v3_usbfs-supply = <&vdd_usb>; ++}; ++ ++&rcc{ ++ u-boot,dm-pre-reloc; ++ status = "okay"; ++}; ++ ++&rng1{ ++ status = "okay"; ++}; ++ ++&rtc{ ++ status = "okay"; ++}; ++ ++&cec { ++ pinctrl-names = "default", "sleep"; ++ pinctrl-0 = <&cec_pins_mx>; ++ pinctrl-1 = <&cec_sleep_pins_mx>; ++ status = "okay"; ++}; ++ ++&cpu0{ ++ cpu-supply = <&vddcore>; ++}; ++ ++&cpu1{ ++ cpu-supply = <&vddcore>; ++}; ++ ++&crc1 { ++ status = "okay"; ++}; ++ ++&dts { ++ status = "okay"; ++}; ++ ++&sdmmc1{ ++ u-boot,dm-pre-reloc; ++ pinctrl-names = "default", "opendrain", "sleep"; ++ pinctrl-0 = <&sdmmc1_pins_mx>; ++ pinctrl-1 = <&sdmmc1_opendrain_pins_mx>; ++ pinctrl-2 = <&sdmmc1_sleep_pins_mx>; ++ status = "okay"; ++ ++ cd-gpios = <&gpioe 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; ++ disable-wp; ++ st,neg-edge; ++ bus-width = <4>; ++ vmmc-supply = <&v3v3>; ++}; ++ ++&sdmmc2{ ++ u-boot,dm-pre-reloc; ++ pinctrl-names = "default", "opendrain", "sleep"; ++ pinctrl-0 = <&sdmmc2_pins_mx>; ++ pinctrl-1 = <&sdmmc2_opendrain_pins_mx>; ++ pinctrl-2 = <&sdmmc2_sleep_pins_mx>; ++ status = "okay"; ++ non-removable; ++ no-sd; ++ no-sdio; ++ st,neg-edge; ++ bus-width = <8>; ++ vmmc-supply = <&v3v3>; ++ vqmmc-supply = <&v3v3>; ++ mmc-ddr-3_3v; ++}; ++ ++&sdmmc3{ ++ pinctrl-names = "default", "opendrain", "sleep"; ++ pinctrl-0 = <&sdmmc3_pins_mx>; ++ pinctrl-1 = <&sdmmc3_opendrain_pins_mx>; ++ pinctrl-2 = <&sdmmc3_sleep_pins_mx>; ++ arm,primecell-periphid = <0x10153180>; ++ non-removable; ++ st,neg-edge; ++ bus-width = <4>; ++ vmmc-supply = <&v3v3>; ++ //mmc-pwrseq = <&wifi_pwrseq>; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ keep-power-in-suspend; ++ status = "disabled"; ++ //status = "okay"; ++ ++ brcmf: bcrmf@1 { ++ reg = <1>; ++ compatible = "brcm,bcm4329-fmac"; ++ }; ++}; ++ ++&tamp{ ++ status = "okay"; ++}; ++ ++&timers5 { ++ /delete-property/dmas; ++ /delete-property/dma-names; ++ status = "okay"; ++ pwm { ++ pinctrl-0 = <&tim5_pwm_pins_mx>; ++ pinctrl-1 = <&tim5_pwm_sleep_pins_mx>; ++ pinctrl-names = "default", "sleep"; ++ status = "okay"; ++ }; ++ timer@4 { ++ status = "okay"; ++ }; ++}; ++ ++&uart4{ ++ u-boot,dm-pre-reloc; ++ pinctrl-names = "default", "sleep"; ++ pinctrl-0 = <&uart4_pins_mx>; ++ pinctrl-1 = <&uart4_sleep_pins_mx>; ++ /delete-property/dmas; ++ /delete-property/dma-names; ++ status = "okay"; ++}; ++ ++&usart2{ ++ pinctrl-names = "default", "sleep"; ++ pinctrl-0 = <&usart2_pins_mx>; ++ pinctrl-1 = <&usart2_sleep_pins_mx>; ++ uart-has-rtscts; ++ status = "okay"; ++ ++ bluetooth { ++ shutdown-gpios = <&gpioe 10 GPIO_ACTIVE_HIGH>; ++ compatible = "brcm,bcm43438-bt"; ++ max-speed = <3000000>; ++ vbat-supply = <&v3v3>; ++ vddio-supply = <&v3v3>; ++ }; ++}; ++ ++&sram { ++ dma_pool: dma_pool@0 { ++ reg = <0x50000 0x10000>; ++ pool; ++ }; ++}; ++ ++&dma1 { ++ sram = <&dma_pool>; ++}; ++ ++&dma2 { ++ sram = <&dma_pool>; ++}; ++ ++&adc { ++ vdd-supply = <&vdd>; ++ vdda-supply = <&v3v3_eth>; ++ vref-supply = <&v3v3_eth>; ++ status = "okay"; ++ adc1: adc@0 { ++ st,min-sample-time-nsecs = <5000>; ++ st,adc-channels = <0 1>; ++ status = "okay"; ++ }; ++ ++ adc_temp: temp { ++ status = "okay"; ++ }; ++}; ++ ++ ++// WARNING: Do not try to enable DAC1 and DCMI ++// This devices share the same pin PA4 ++/* &dac { ++ pinctrl-names = "default"; ++ status = "okay"; ++ dac1: dac@1 { ++ pinctrl-0 = <&dac_ch1_pins_a>; ++ status = "disabled"; ++ }; ++ dac2: dac@2 { ++ pinctrl-0 = <&dac_ch2_pins_a>; ++ status = "okay"; ++ }; ++};*/ ++ ++&usbh_ehci { ++ phys = <&usbphyc_port0>; ++ phy-names = "usb"; ++ status = "okay"; ++}; ++ ++&usbh_ohci{ ++ phys = <&usbphyc_port0>; ++ phy-names = "usb"; ++ status = "okay"; ++}; ++ ++&usbotg_hs { ++ phys = <&usbphyc_port1 0>; ++ phy-names = "usb2-phy"; ++ usb-role-switch; ++ status = "okay"; ++ ++ port { ++ usbotg_hs_ep: endpoint { ++ remote-endpoint = <&con_usbotg_hs_ep>; ++ }; ++ }; ++}; ++ ++&usbphyc { ++ status = "okay"; ++}; ++ ++&usbphyc_port0 { ++ phy-supply = <&vdd_usb>; ++ st,phy-tuning = <&usb_phy_tuning>; ++}; ++ ++&usbphyc_port1 { ++ phy-supply = <&vdd_usb>; ++ st,phy-tuning = <&usb_phy_tuning>; ++}; ++ ++&m_can1 { ++ pinctrl-names = "default", "sleep"; ++ pinctrl-0 = <&m_can1_pins_mx>; ++ pinctrl-1 = <&m_can1_sleep_pins_mx>; ++ status = "okay"; ++}; +-- +2.25.1 + diff --git a/board/octavo/osd32mp1-red/patches/uboot/0002-configs-stm32mp15_trusted_defconfig-disable-environm.patch b/board/octavo/osd32mp1-red/patches/uboot/0002-configs-stm32mp15_trusted_defconfig-disable-environm.patch new file mode 100644 index 00000000000..a2ec783e1bd --- /dev/null +++ b/board/octavo/osd32mp1-red/patches/uboot/0002-configs-stm32mp15_trusted_defconfig-disable-environm.patch @@ -0,0 +1,49 @@ +From 27a516e2ad464bf1de5e23e8277e0f6d6735bd21 Mon Sep 17 00:00:00 2001 +From: Kory Maincent +Date: Mon, 3 Oct 2022 12:20:40 +0200 +Subject: [PATCH 2/2] configs/stm32mp15_trusted_defconfig: disable environment + +Signed-off-by: Kory Maincent +--- + board/st/stm32mp1/stm32mp1.c | 4 ++++ + configs/stm32mp15_trusted_defconfig | 9 --------- + 2 files changed, 4 insertions(+), 9 deletions(-) + +diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c +index 48591b2f1e..ba510d843c 100644 +--- a/board/st/stm32mp1/stm32mp1.c ++++ b/board/st/stm32mp1/stm32mp1.c +@@ -78,6 +78,10 @@ DECLARE_GLOBAL_DATA_PTR; + #define USB_START_LOW_THRESHOLD_UV 1230000 + #define USB_START_HIGH_THRESHOLD_UV 2150000 + ++#ifndef CONFIG_SYS_MMC_ENV_DEV ++#define CONFIG_SYS_MMC_ENV_DEV -1 ++#endif ++ + int board_early_init_f(void) + { + /* nothing to do, only used in SPL */ +diff --git a/configs/stm32mp15_trusted_defconfig b/configs/stm32mp15_trusted_defconfig +index 2161ccbefa..fd3fed8fb0 100644 +--- a/configs/stm32mp15_trusted_defconfig ++++ b/configs/stm32mp15_trusted_defconfig +@@ -45,15 +45,6 @@ CONFIG_CMD_EXT4_WRITE=y + CONFIG_CMD_MTDPARTS=y + CONFIG_CMD_UBI=y + CONFIG_ENV_IS_NOWHERE=y +-CONFIG_ENV_IS_IN_MMC=y +-CONFIG_ENV_IS_IN_SPI_FLASH=y +-CONFIG_ENV_IS_IN_UBI=y +-CONFIG_SYS_REDUNDAND_ENVIRONMENT=y +-CONFIG_ENV_UBI_PART="UBI" +-CONFIG_ENV_UBI_VOLUME="uboot_config" +-CONFIG_ENV_UBI_VOLUME_REDUND="uboot_config_r" +-CONFIG_SYS_RELOC_GD_ENV_ADDR=y +-CONFIG_SYS_MMC_ENV_DEV=-1 + CONFIG_STM32_ADC=y + CONFIG_CLK_SCMI=y + CONFIG_SET_DFU_ALT_INFO=y +-- +2.25.1 + diff --git a/board/octavo/osd32mp1-red/readme.txt b/board/octavo/osd32mp1-red/readme.txt new file mode 100644 index 00000000000..e087e386400 --- /dev/null +++ b/board/octavo/osd32mp1-red/readme.txt @@ -0,0 +1,37 @@ +OSD32MP1-RED + +Intro +===== + +This configuration supports the OSD32MP1-RED platform: + + https://octavosystems.com/octavo_products/osd32mp1-red/ + +How to build +============ + + $ make octavo_osd32mp1_red_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 X5. + + (2) Plug an USB-SERIAL cable in the JP4 pin connector and run your serial + communication program on /dev/ttySTM0. + + (3) Plug an USB-C cable in the J2 connector or use barrel power supply to + power-up the board. + + (4) The system will start, with the console on UART. diff --git a/board/octavo/osd32mp1-red/tfa-dts/osd32mp1_ddr_1x4Gb.dtsi b/board/octavo/osd32mp1-red/tfa-dts/osd32mp1_ddr_1x4Gb.dtsi new file mode 100644 index 00000000000..3cd2c3f5d17 --- /dev/null +++ b/board/octavo/osd32mp1-red/tfa-dts/osd32mp1_ddr_1x4Gb.dtsi @@ -0,0 +1,121 @@ +/* + * Copyright (C) 2015-2018, STMicroelectronics - All Rights Reserved + * + * SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause + * + */ + +/* + * File generated by STMicroelectronics STM32CubeMX DDR Tool for MPUs + * DDR type: DDR3 / DDR3L + * DDR width: 16bits + * DDR density: 4Gb + * System frequency: 533000Khz + * Relaxed Timing Mode: false + * Address mapping type: RBC + * + * Save Date: 2020.08.27, save Time: 15:22:11 + */ + +#define DDR_MEM_NAME "DDR3-DDR3L 16bits 533000Khz" +#define DDR_MEM_SPEED 533000 +#define DDR_MEM_SIZE 0x20000000 + +#define DDR_MSTR 0x00041401 +#define DDR_MRCTRL0 0x00000010 +#define DDR_MRCTRL1 0x00000000 +#define DDR_DERATEEN 0x00000000 +#define DDR_DERATEINT 0x00800000 +#define DDR_PWRCTL 0x00000000 +#define DDR_PWRTMG 0x00400010 +#define DDR_HWLPCTL 0x00000000 +#define DDR_RFSHCTL0 0x00210000 +#define DDR_RFSHCTL3 0x00000000 +#define DDR_RFSHTMG 0x0081008B +#define DDR_CRCPARCTL0 0x00000000 +#define DDR_DRAMTMG0 0x121B2414 +#define DDR_DRAMTMG1 0x000A041C +#define DDR_DRAMTMG2 0x0608090F +#define DDR_DRAMTMG3 0x0050400C +#define DDR_DRAMTMG4 0x08040608 +#define DDR_DRAMTMG5 0x06060403 +#define DDR_DRAMTMG6 0x02020002 +#define DDR_DRAMTMG7 0x00000202 +#define DDR_DRAMTMG8 0x00001005 +#define DDR_DRAMTMG14 0x000000A0 +#define DDR_ZQCTL0 0xC2000040 +#define DDR_DFITMG0 0x02060105 +#define DDR_DFITMG1 0x00000202 +#define DDR_DFILPCFG0 0x07000000 +#define DDR_DFIUPD0 0xC0400003 +#define DDR_DFIUPD1 0x00000000 +#define DDR_DFIUPD2 0x00000000 +#define DDR_DFIPHYMSTR 0x00000000 +#define DDR_ODTCFG 0x06000600 +#define DDR_ODTMAP 0x00000001 +#define DDR_SCHED 0x00000C01 +#define DDR_SCHED1 0x00000000 +#define DDR_PERFHPR1 0x01000001 +#define DDR_PERFLPR1 0x08000200 +#define DDR_PERFWR1 0x08000400 +#define DDR_DBG0 0x00000000 +#define DDR_DBG1 0x00000000 +#define DDR_DBGCMD 0x00000000 +#define DDR_POISONCFG 0x00000000 +#define DDR_PCCFG 0x00000010 +#define DDR_PCFGR_0 0x00010000 +#define DDR_PCFGW_0 0x00000000 +#define DDR_PCFGQOS0_0 0x02100C03 +#define DDR_PCFGQOS1_0 0x00800100 +#define DDR_PCFGWQOS0_0 0x01100C03 +#define DDR_PCFGWQOS1_0 0x01000200 +#define DDR_PCFGR_1 0x00010000 +#define DDR_PCFGW_1 0x00000000 +#define DDR_PCFGQOS0_1 0x02100C03 +#define DDR_PCFGQOS1_1 0x00800040 +#define DDR_PCFGWQOS0_1 0x01100C03 +#define DDR_PCFGWQOS1_1 0x01000200 +#define DDR_ADDRMAP1 0x00070707 +#define DDR_ADDRMAP2 0x00000000 +#define DDR_ADDRMAP3 0x1F000000 +#define DDR_ADDRMAP4 0x00001F1F +#define DDR_ADDRMAP5 0x06060606 +#define DDR_ADDRMAP6 0x0F060606 +#define DDR_ADDRMAP9 0x00000000 +#define DDR_ADDRMAP10 0x00000000 +#define DDR_ADDRMAP11 0x00000000 +#define DDR_PGCR 0x01442E02 +#define DDR_PTR0 0x0022AA5B +#define DDR_PTR1 0x04841104 +#define DDR_PTR2 0x042DA068 +#define DDR_ACIOCR 0x10400812 +#define DDR_DXCCR 0x00000C40 +#define DDR_DSGCR 0xF200011F +#define DDR_DCR 0x0000000B +#define DDR_DTPR0 0x38D488D0 +#define DDR_DTPR1 0x098B00D8 +#define DDR_DTPR2 0x10023600 +#define DDR_MR0 0x00000840 +#define DDR_MR1 0x00000000 +#define DDR_MR2 0x00000208 +#define DDR_MR3 0x00000000 +#define DDR_ODTCR 0x00010000 +#define DDR_ZQ0CR1 0x00000038 +#define DDR_DX0GCR 0x0000CE81 +#define DDR_DX0DLLCR 0x40000000 +#define DDR_DX0DQTR 0x00112121 +#define DDR_DX0DQSTR 0x3D200000 +#define DDR_DX1GCR 0x0000CE81 +#define DDR_DX1DLLCR 0x40000000 +#define DDR_DX1DQTR 0x11100121 +#define DDR_DX1DQSTR 0x3D200000 +#define DDR_DX2GCR 0x0000CE80 +#define DDR_DX2DLLCR 0x40000000 +#define DDR_DX2DQTR 0xFFFFFFFF +#define DDR_DX2DQSTR 0x3DB02000 +#define DDR_DX3GCR 0x0000CE80 +#define DDR_DX3DLLCR 0x40000000 +#define DDR_DX3DQTR 0xFFFFFFFF +#define DDR_DX3DQSTR 0x3DB02000 + +#include "stm32mp15-ddr.dtsi" diff --git a/board/octavo/osd32mp1-red/tfa-dts/stm32mp157c-osd32mp1-red-fw-config.dts b/board/octavo/osd32mp1-red/tfa-dts/stm32mp157c-osd32mp1-red-fw-config.dts new file mode 100644 index 00000000000..256d0db9352 --- /dev/null +++ b/board/octavo/osd32mp1-red/tfa-dts/stm32mp157c-osd32mp1-red-fw-config.dts @@ -0,0 +1,6 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +/* + * Copyright (c) 2020, STMicroelectronics - All Rights Reserved + */ + +#include "stm32mp15-ddr-512m-fw-config.dts" diff --git a/board/octavo/osd32mp1-red/tfa-dts/stm32mp157c-osd32mp1-red.dts b/board/octavo/osd32mp1-red/tfa-dts/stm32mp157c-osd32mp1-red.dts new file mode 100644 index 00000000000..7cf64d9d987 --- /dev/null +++ b/board/octavo/osd32mp1-red/tfa-dts/stm32mp157c-osd32mp1-red.dts @@ -0,0 +1,571 @@ +/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */ +/* + * Copyright (C) STMicroelectronics 2020 - All Rights Reserved + * Author: STM32CubeMX code generation for STMicroelectronics. + */ + +/dts-v1/; +#include +#include +#include +#include + +#include "stm32mp157.dtsi" +#include "stm32mp15xc.dtsi" +#include "stm32mp15xxac-pinctrl.dtsi" +#include "osd32mp1_ddr_1x4Gb.dtsi" + +/ { + model = "Octavo OSD32MP1 RED board"; + compatible = "octavo,stm32mp157c-osd32mp1-red", "st,stm32mp157"; + + aliases { + serial0 = &uart4; + }; + + memory@c0000000 { + device_type = "memory"; + reg = <0xc0000000 0x20000000>; + }; + + vin: vin { + compatible = "regulator-fixed"; + regulator-name = "vin"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-always-on; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; + +&bsec { + board_id: board_id@ec { + reg = <0xec 0x4>; + st,non-secure-otp; + }; +}; + +&clk_hse { + st,digbypass; +}; + +&cpu0 { + cpu-supply = <&vddcore>; +}; + +&cpu1 { + cpu-supply = <&vddcore>; +}; + +&hash1 { + status = "okay"; +}; + +&cryp1 { + status = "okay"; +}; + +&etzpc { + st,decprot = < + DECPROT(STM32MP1_ETZPC_DCMI_ID, DECPROT_NS_RW, DECPROT_UNLOCK) + DECPROT(STM32MP1_ETZPC_ETH_ID, DECPROT_NS_RW, DECPROT_UNLOCK) + DECPROT(STM32MP1_ETZPC_USART1_ID, DECPROT_NS_RW, DECPROT_UNLOCK) + DECPROT(STM32MP1_ETZPC_SPI6_ID, DECPROT_NS_RW, DECPROT_UNLOCK) + DECPROT(STM32MP1_ETZPC_I2C4_ID, DECPROT_NS_RW, DECPROT_UNLOCK) + DECPROT(STM32MP1_ETZPC_SPI2_ID, DECPROT_NS_RW, DECPROT_UNLOCK) + DECPROT(STM32MP1_ETZPC_I2C6_ID, DECPROT_NS_RW, DECPROT_UNLOCK) + DECPROT(STM32MP1_ETZPC_RNG1_ID, DECPROT_NS_RW, DECPROT_UNLOCK) + DECPROT(STM32MP1_ETZPC_HASH1_ID, DECPROT_NS_RW, DECPROT_UNLOCK) + DECPROT(STM32MP1_ETZPC_CRYP1_ID, DECPROT_NS_RW, DECPROT_UNLOCK) + DECPROT(STM32MP1_ETZPC_DDRCTRL_ID, DECPROT_NS_R_S_W, DECPROT_LOCK) + DECPROT(STM32MP1_ETZPC_DDRPHYC_ID, DECPROT_NS_R_S_W, DECPROT_LOCK) + DECPROT(STM32MP1_ETZPC_STGENC_ID, DECPROT_S_RW, DECPROT_LOCK) + DECPROT(STM32MP1_ETZPC_BKPSRAM_ID, DECPROT_S_RW, DECPROT_LOCK) + DECPROT(STM32MP1_ETZPC_IWDG1_ID, DECPROT_S_RW, DECPROT_LOCK) + >; +}; + + + +&i2c4 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c4_pins_z_mx>; + i2c-scl-rising-time-ns = <185>; + i2c-scl-falling-time-ns = <20>; + clock-frequency = <400000>; + status = "okay"; + secure-status = "okay"; + + pmic: stpmic@33 { + compatible = "st,stpmic1"; + reg = <0x33>; + interrupts-extended = <&exti_pwr 55 IRQ_TYPE_EDGE_FALLING>; + interrupt-controller; + #interrupt-cells = <2>; + status = "okay"; + secure-status = "okay"; + + regulators { + compatible = "st,stpmic1-regulators"; + buck1-supply = <&vin>; + buck2-supply = <&vin>; + buck3-supply = <&vin>; + buck4-supply = <&vin>; + ldo1-supply = <&v3v3>; + ldo2-supply = <&vin>; + ldo3-supply = <&vdd_ddr>; + ldo4-supply = <&vin>; + ldo5-supply = <&vin>; + ldo6-supply = <&v3v3>; + vref_ddr-supply = <&vin>; + boost-supply = <&vin>; + pwr_sw1-supply = <&bst_out>; + pwr_sw2-supply = <&bst_out>; + + vddcore: buck1 { + regulator-name = "vddcore"; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1350000>; + regulator-always-on; + regulator-initial-mode = <0>; + regulator-over-current-protection; + lp-stop{ + regulator-on-in-suspend; + regulator-suspend-microvolt = <1200000>; + }; + standby-ddr-sr{ + regulator-off-in-suspend; + }; + standby-ddr-off{ + regulator-off-in-suspend; + }; + }; + + vdd_ddr: buck2 { + regulator-name = "vdd_ddr"; + regulator-min-microvolt = <1350000>; + regulator-max-microvolt = <1350000>; + regulator-always-on; + regulator-initial-mode = <0>; + regulator-over-current-protection; + lp-stop{ + regulator-suspend-microvolt = <1350000>; + regulator-on-in-suspend; + }; + standby-ddr-sr{ + regulator-suspend-microvolt = <1350000>; + regulator-on-in-suspend; + }; + standby-ddr-off{ + regulator-off-in-suspend; + }; + }; + + vdd: buck3 { + regulator-name = "vdd"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + st,mask-reset; + regulator-initial-mode = <0>; + regulator-over-current-protection; + lp-stop{ + regulator-suspend-microvolt = <3300000>; + regulator-on-in-suspend; + }; + standby-ddr-sr{ + regulator-suspend-microvolt = <3300000>; + regulator-on-in-suspend; + }; + standby-ddr-off{ + regulator-suspend-microvolt = <3300000>; + regulator-on-in-suspend; + }; + }; + + v3v3: buck4 { + regulator-name = "v3v3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + regulator-over-current-protection; + regulator-initial-mode = <0>; + lp-stop{ + regulator-suspend-microvolt = <3300000>; + regulator-on-in-suspend; + }; + standby-ddr-sr{ + regulator-off-in-suspend; + }; + standby-ddr-off{ + regulator-off-in-suspend; + }; + }; + + v1v8_ldo1: ldo1 { + regulator-name = "v1v8_audio"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-always-on; + standby-ddr-sr{ + regulator-off-in-suspend; + }; + standby-ddr-off{ + regulator-off-in-suspend; + }; + }; + + v3v3_ldo2: ldo2 { + regulator-name = "v3v3_hdmi"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + standby-ddr-sr{ + regulator-off-in-suspend; + }; + standby-ddr-off{ + regulator-off-in-suspend; + }; + }; + + vtt_ddr: ldo3 { + regulator-name = "vtt_ddr"; + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <750000>; + regulator-always-on; + regulator-over-current-protection; + lp-stop{ + regulator-off-in-suspend; + }; + standby-ddr-sr{ + regulator-off-in-suspend; + }; + standby-ddr-off{ + regulator-off-in-suspend; + }; + }; + + vdd_usb: ldo4 { + regulator-name = "vdd_usb"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + standby-ddr-sr{ + regulator-on-in-suspend; + }; + standby-ddr-off{ + regulator-off-in-suspend; + }; + }; + + vdda: ldo5 { + regulator-name = "vdda"; + regulator-min-microvolt = <2900000>; + regulator-max-microvolt = <2900000>; + regulator-boot-on; + standby-ddr-sr{ + regulator-off-in-suspend; + }; + standby-ddr-off{ + regulator-off-in-suspend; + }; + }; + + v1v2_ldo6: ldo6 { + regulator-name = "v1v2_ldo6"; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + regulator-always-on; + standby-ddr-sr{ + regulator-off-in-suspend; + }; + standby-ddr-off{ + regulator-off-in-suspend; + }; + }; + + vref_ddr: vref_ddr { + regulator-name = "vref_ddr"; + regulator-always-on; + regulator-over-current-protection; + lp-stop{ + regulator-on-in-suspend; + }; + standby-ddr-sr{ + regulator-on-in-suspend; + }; + standby-ddr-off{ + regulator-off-in-suspend; + }; + }; + + bst_out: boost { + regulator-name = "bst_out"; + }; + + vbus_otg: pwr_sw1 { + regulator-name = "vbus_otg"; + }; + + vbus_sw: pwr_sw2 { + regulator-name = "vbus_sw"; + regulator-active-discharge = <1>; + }; + }; + }; +}; + +&iwdg2 { + timeout-sec = <32>; + secure-timeout-sec = <5>; + status = "okay"; + secure-status = "okay"; +}; + +&nvmem_layout { + nvmem-cells = <&cfg0_otp>, + <&part_number_otp>, + <&monotonic_otp>, + <&nand_otp>, + <&uid_otp>, + <&package_otp>, + <&hw2_otp>, + <&pkh_otp>, + <&board_id>; + + nvmem-cell-names = "cfg0_otp", + "part_number_otp", + "monotonic_otp", + "nand_otp", + "uid_otp", + "package_otp", + "hw2_otp", + "pkh_otp", + "board_id"; +}; + +&pwr_regulators { + system_suspend_supported_soc_modes = < + STM32_PM_CSLEEP_RUN + STM32_PM_CSTOP_ALLOW_LP_STOP + STM32_PM_CSTOP_ALLOW_STANDBY_DDR_SR + >; + system_off_soc_mode = ; + vdd-supply = <&vdd>; + vdd_3v3_usbfs-supply = <&vdd_usb>; +}; + +&rcc { + st,hsi-cal; + st,csi-cal; + st,cal-sec = <60>; + st,clksrc = < + CLK_MPU_PLL1P + CLK_AXI_PLL2P + CLK_MCU_PLL3P + CLK_PLL12_HSE + CLK_PLL3_HSE + CLK_PLL4_HSE + CLK_RTC_LSE + CLK_MCO1_DISABLED + CLK_MCO2_DISABLED + >; + + st,clkdiv = < + 1 /*MPU*/ + 0 /*AXI*/ + 0 /*MCU*/ + 1 /*APB1*/ + 1 /*APB2*/ + 1 /*APB3*/ + 1 /*APB4*/ + 2 /*APB5*/ + 23 /*RTC*/ + 0 /*MCO1*/ + 0 /*MCO2*/ + >; + + st,pkcs = < + CLK_CKPER_HSE + CLK_ETH_PLL3Q + CLK_SDMMC12_PLL4P + CLK_DSI_DSIPLL + CLK_STGEN_HSE + CLK_USBPHY_HSE + CLK_SPI2S1_PLL3Q + CLK_SPI2S23_CKPER + CLK_SPI45_PCLK2 + CLK_SPI6_DISABLED + CLK_I2C46_HSI + CLK_SDMMC3_PLL4P + CLK_USBO_USBPHY + CLK_ADC_CKPER + CLK_CEC_LSE + CLK_I2C12_HSI + CLK_I2C35_HSI + CLK_UART1_DISABLED + CLK_UART24_HSI + CLK_UART35_HSI + CLK_UART6_DISABLED + CLK_UART78_DISABLED + CLK_SPDIF_DISABLED + CLK_SAI1_DISABLED + CLK_SAI2_DISABLED + CLK_SAI3_DISABLED + CLK_SAI4_DISABLED + CLK_RNG1_LSI + CLK_LPTIM1_DISABLED + CLK_LPTIM23_DISABLED + CLK_LPTIM45_DISABLED + >; + + pll1:st,pll@0 { + cfg = < 2 80 0 1 1 PQR(1,0,0) >; + frac = < 0x800>; + }; + + pll2:st,pll@1 { + cfg = < 2 65 1 0 0 PQR(1,1,1) >; + frac = < 0x1400>; + }; + + pll3:st,pll@2 { + cfg = < 1 61 3 5 36 PQR(1,1,0) >; + frac = < 0x1000 >; + }; + + pll4: st,pll@3 { + cfg = < 3 98 5 7 7 PQR(1,1,1) >; + }; +}; + +&rng1 { + status = "okay"; + secure-status = "okay"; +}; + +&rtc { + status = "okay"; + secure-status = "okay"; +}; + +&sdmmc1 { + pinctrl-names = "default"; + pinctrl-0 = <&sdmmc1_pins_mx>; + disable-wp; + st,neg-edge; + bus-width = <4>; + vmmc-supply = <&v3v3>; + status = "okay"; +}; + +&sdmmc2{ + pinctrl-names = "default"; + pinctrl-0 = <&sdmmc2_pins_mx>; + status = "okay"; +}; + +&timers15 { + secure-status = "okay"; + st,hsi-cal-input = <7>; + st,csi-cal-input = <8>; +}; +&uart4 { + pinctrl-names = "default"; + pinctrl-0 = <&uart4_pins_mx>; + status = "okay"; +}; + +&usbotg_hs { + phys = <&usbphyc_port1 0>; + phy-names = "usb2-phy"; + usb-role-switch; + status = "okay"; +}; + +&usbphyc { + status = "okay"; +}; + +&usbphyc_port0 { + phy-supply = <&vdd_usb>; +}; + +&usbphyc_port1 { + phy-supply = <&vdd_usb>; +}; + + + + +&pinctrl { + sdmmc1_pins_mx: sdmmc1-b4-0 { + pins1 { + pinmux = , /* SDMMC1_D0 */ + , /* SDMMC1_D1 */ + , /* SDMMC1_D2 */ + , /* SDMMC1_D3 */ + ; /* SDMMC1_CMD */ + slew-rate = <1>; + drive-push-pull; + bias-disable; + }; + pins2 { + pinmux = ; /* SDMMC1_CK */ + slew-rate = <2>; + drive-push-pull; + bias-disable; + }; + }; + + sdmmc2_pins_mx: sdmmc2_mx-0 { + pins1 { + pinmux = , /* SDMMC2_D4 */ + , /* SDMMC2_D5 */ + , /* SDMMC2_D2 */ + , /* SDMMC2_D3 */ + , /* SDMMC2_D0 */ + , /* SDMMC2_D1 */ + , /* SDMMC2_D7 */ + , /* SDMMC2_D6 */ + ; /* SDMMC2_CMD */ + bias-pull-up; + drive-push-pull; + slew-rate = <1>; + }; + pins2 { + pinmux = ; /* SDMMC2_CK */ + bias-pull-up; + drive-push-pull; + slew-rate = <2>; + }; + }; + + uart4_pins_mx: uart4-0 { + pins1 { + pinmux = ; /* UART4_TX */ + bias-disable; + drive-push-pull; + slew-rate = <0>; + }; + pins2 { + pinmux = ; /* UART4_RX */ + bias-disable; + }; + }; +}; + +&pinctrl_z { + i2c4_pins_z_mx: i2c4-0 { + pins { + pinmux = , /* I2C4_SCL */ + ; /* I2C4_SDA */ + bias-disable; + drive-open-drain; + slew-rate = <0>; + }; + }; +}; diff --git a/board/olimex/stmp1_olinuxino/genimage.cfg b/board/olimex/stmp1_olinuxino/genimage.cfg index 2f00ee979a8..02800db8d49 100644 --- a/board/olimex/stmp1_olinuxino/genimage.cfg +++ b/board/olimex/stmp1_olinuxino/genimage.cfg @@ -1,6 +1,6 @@ image sdcard.img { hdimage { - gpt = "true" + partition-table-type = "gpt" } partition fsbl1 { diff --git a/board/orangepi/common/genimage.cfg b/board/orangepi/common/genimage.cfg index a61c4a039fb..c748108ca07 100644 --- a/board/orangepi/common/genimage.cfg +++ b/board/orangepi/common/genimage.cfg @@ -7,7 +7,7 @@ image sdcard.img { } hdimage { - partition-table-type = gpt + partition-table-type = "gpt" gpt-location = 1008K # 1MB - 16KB(GPT) gpt-no-backup = true } diff --git a/board/orangepi/orangepi-lite2/readme.txt b/board/orangepi/orangepi-lite2/readme.txt index bed561b5620..7f88250418e 100644 --- a/board/orangepi/orangepi-lite2/readme.txt +++ b/board/orangepi/orangepi-lite2/readme.txt @@ -6,7 +6,7 @@ buildroot environment for the Orangepi Lite2. With the current configuration it will bring-up the board, and allow access through the serial console. Orangepi Lite2 link: -http://www.orangepi.org/Orange%20Pi%20Lite%202/ +http://www.orangepi.org/html/hardWare/computerAndMicrocontrollers/details/Orange-Pi-Lite-2.html Wiki link: https://openedev.amarulasolutions.com/display/ODWIKI/Orangepi+Lite2 diff --git a/board/orangepi/orangepi-one-plus/readme.txt b/board/orangepi/orangepi-one-plus/readme.txt index 87f6de85100..547f8742880 100644 --- a/board/orangepi/orangepi-one-plus/readme.txt +++ b/board/orangepi/orangepi-one-plus/readme.txt @@ -6,7 +6,7 @@ buildroot environment for the Orangepi One Plus. With the current configuration it will bring-up the board, and allow access through the serial console. Orangepi One Plus link: -http://www.orangepi.org/OrangePiOneplus/ +http://www.orangepi.org/html/hardWare/computerAndMicrocontrollers/details/Orange-Pi-One-Plus.html Wiki link: https://openedev.amarulasolutions.com/display/ODWIKI/Orangepi+One+Plus diff --git a/board/orangepi/orangepi-one/boot.cmd b/board/orangepi/orangepi-one/boot.cmd deleted file mode 100644 index ab616e6ac9e..00000000000 --- a/board/orangepi/orangepi-one/boot.cmd +++ /dev/null @@ -1,8 +0,0 @@ -setenv fdt_high ffffffff - -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun8i-h3-orangepi-one.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/orangepi/orangepi-one/genimage.cfg b/board/orangepi/orangepi-one/genimage.cfg deleted file mode 100644 index 2a14dcdec25..00000000000 --- a/board/orangepi/orangepi-one/genimage.cfg +++ /dev/null @@ -1,37 +0,0 @@ -# Minimal SD card image for the OrangePi PC -# -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-h3-orangepi-one.dtb", - "boot.scr" - } - } - - size = 10M -} - -image sdcard.img { - hdimage { - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot-sunxi-with-spl.bin" - offset = 8K - 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/orangepi/orangepi-pc-plus/boot.cmd b/board/orangepi/orangepi-pc-plus/boot.cmd deleted file mode 100644 index c91f77942f9..00000000000 --- a/board/orangepi/orangepi-pc-plus/boot.cmd +++ /dev/null @@ -1,8 +0,0 @@ -setenv fdt_high ffffffff - -setenv bootargs console=ttyS0,115200 earlyprintk root=PARTLABEL=rootfs rootwait - -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun8i-h3-orangepi-pc-plus.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/orangepi/orangepi-pc-plus/genimage.cfg b/board/orangepi/orangepi-pc-plus/genimage.cfg deleted file mode 100644 index 3812d785d55..00000000000 --- a/board/orangepi/orangepi-pc-plus/genimage.cfg +++ /dev/null @@ -1,43 +0,0 @@ -# Minimal SD card image for the OrangePi PC Plus -# -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-h3-orangepi-pc-plus.dtb", - "boot.scr" - } - } - - size = 10M -} - -image sdcard.img { - hdimage { - # for root=PARTLABEL support - partition-table-type = "gpt" - # default GPT location conflicts with bootloaders, move it after - gpt-location = 1M - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot-sunxi-with-spl.bin" - offset = 8K - size = 1016K # 1MB - 8KB - } - - partition boot { - partition-type-uuid = "F" - bootable = "true" - image = "boot.vfat" - } - - # 'rootfs' will be used as the partition label, used - # with root=PARTLABEL=rootfs kernel command line - partition rootfs { - partition-type-uuid = "L" - image = "rootfs.ext4" - size = 512M - } -} diff --git a/board/orangepi/orangepi-pc/boot.cmd b/board/orangepi/orangepi-pc/boot.cmd deleted file mode 100644 index 9da625c8033..00000000000 --- a/board/orangepi/orangepi-pc/boot.cmd +++ /dev/null @@ -1,8 +0,0 @@ -setenv fdt_high ffffffff - -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun8i-h3-orangepi-pc.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/orangepi/orangepi-pc/genimage.cfg b/board/orangepi/orangepi-pc/genimage.cfg deleted file mode 100644 index 14e326cc56a..00000000000 --- a/board/orangepi/orangepi-pc/genimage.cfg +++ /dev/null @@ -1,37 +0,0 @@ -# Minimal SD card image for the OrangePi PC -# -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-h3-orangepi-pc.dtb", - "boot.scr" - } - } - - size = 10M -} - -image sdcard.img { - hdimage { - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot-sunxi-with-spl.bin" - offset = 8K - 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/orangepi/orangepi-pc2/boot.cmd b/board/orangepi/orangepi-pc2/boot.cmd deleted file mode 100644 index 4d4fc7bf67a..00000000000 --- a/board/orangepi/orangepi-pc2/boot.cmd +++ /dev/null @@ -1,6 +0,0 @@ -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r Image -fatload mmc 0 $fdt_addr_r sun50i-h5-orangepi-pc2.dtb - -booti $kernel_addr_r - $fdt_addr_r diff --git a/board/orangepi/orangepi-pc2/genimage.cfg b/board/orangepi/orangepi-pc2/genimage.cfg deleted file mode 100644 index cc8695c9f1e..00000000000 --- a/board/orangepi/orangepi-pc2/genimage.cfg +++ /dev/null @@ -1,40 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "sun50i-h5-orangepi-pc2.dtb", - "boot.scr" - } - } - - size = 64M -} - -image sdcard.img { - hdimage { - } - - partition spl { - in-partition-table = "no" - image = "sunxi-spl.bin" - offset = 8K - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot.itb" - offset = 40K - size = 1M # 1MB - 40KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/board/orangepi/orangepi-pc2/readme.txt b/board/orangepi/orangepi-pc2/readme.txt deleted file mode 100644 index 12004819521..00000000000 --- a/board/orangepi/orangepi-pc2/readme.txt +++ /dev/null @@ -1,37 +0,0 @@ -Intro -===== - -This default configuration will allow you to start experimenting with the -buildroot environment for the Orangepi PC2. With the current configuration -it will bring-up the board, and allow access through the serial console. - -Orangepi PC2 link: -http://www.orangepi.org/orangepipc2/ - -Wiki link: -https://openedev.amarulasolutions.com/display/ODWIKI/Orangepi+PC2 - -This configuration uses U-Boot mainline and kernel mainline. - -How to build -============ - - $ make orangepi_pc2_defconfig - $ make - -Note: you will need access to the internet to download the required -sources. - -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 Orangepi PC2 and power it up. The console -is on the serial line, 115200 8N1. diff --git a/board/orangepi/orangepi-plus/boot.cmd b/board/orangepi/orangepi-plus/boot.cmd deleted file mode 100644 index 1a378cb9187..00000000000 --- a/board/orangepi/orangepi-plus/boot.cmd +++ /dev/null @@ -1,8 +0,0 @@ -setenv fdt_high ffffffff - -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun8i-h3-orangepi-plus.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/orangepi/orangepi-plus/genimage.cfg b/board/orangepi/orangepi-plus/genimage.cfg deleted file mode 100644 index 1ca30258dcb..00000000000 --- a/board/orangepi/orangepi-plus/genimage.cfg +++ /dev/null @@ -1,36 +0,0 @@ -# Minimal SD card image for the OrangePi Plus\Plus2 -# -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-h3-orangepi-plus.dtb", - "boot.scr" - } - } - - size = 10M -} - -image sdcard.img { - hdimage { - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot-sunxi-with-spl.bin" - offset = 8K - size = 1016K # 1MB - 8KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/board/orangepi/orangepi-plus/readme.txt b/board/orangepi/orangepi-plus/readme.txt deleted file mode 100644 index 7f871bcfab1..00000000000 --- a/board/orangepi/orangepi-plus/readme.txt +++ /dev/null @@ -1,29 +0,0 @@ -OrangePi Plus/Plus2 - -Intro -===== - -This default configuration will allow you to start experimenting with the -buildroot environment for the OrangePi Plus/Plus2. With the current configuration -it will bring-up the board, and allow access through the serial console. - -How to build it -=============== - -Configure Buildroot: - - $ make orangepi_plus_defconfig - -Compile everything and build the SD card image: - - $ 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 diff --git a/board/orangepi/orangepi-prime/boot.cmd b/board/orangepi/orangepi-prime/boot.cmd deleted file mode 100644 index 34887880d84..00000000000 --- a/board/orangepi/orangepi-prime/boot.cmd +++ /dev/null @@ -1,6 +0,0 @@ -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r Image -fatload mmc 0 $fdt_addr_r sun50i-h5-orangepi-prime.dtb - -booti $kernel_addr_r - $fdt_addr_r diff --git a/board/orangepi/orangepi-prime/genimage.cfg b/board/orangepi/orangepi-prime/genimage.cfg deleted file mode 100644 index dde9a6485fb..00000000000 --- a/board/orangepi/orangepi-prime/genimage.cfg +++ /dev/null @@ -1,40 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "sun50i-h5-orangepi-prime.dtb", - "boot.scr" - } - } - - size = 64M -} - -image sdcard.img { - hdimage { - } - - partition spl { - in-partition-table = "no" - image = "sunxi-spl.bin" - offset = 8K - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot.itb" - offset = 40K - size = 1M # 1MB - 40KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/board/orangepi/orangepi-prime/readme.txt b/board/orangepi/orangepi-prime/readme.txt deleted file mode 100644 index 5811884d4dc..00000000000 --- a/board/orangepi/orangepi-prime/readme.txt +++ /dev/null @@ -1,37 +0,0 @@ -Intro -===== - -This default configuration will allow you to start experimenting with the -buildroot environment for the Orangepi Prime. With the current configuration -it will bring-up the board, and allow access through the serial console. - -Orangepi Prime link: -http://www.orangepi.org/OrangePiPrime/ - -Wiki link: -https://openedev.amarulasolutions.com/display/ODWIKI/Orangepi+Prime - -This configuration uses U-Boot mainline and kernel mainline. - -How to build -============ - - $ make orangepi_prime_defconfig - $ make - -Note: you will need access to the internet to download the required -sources. - -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 Orangepi Prime and power it up. The console -is on the serial line, 115200 8N1. diff --git a/board/orangepi/orangepi-r1/genimage.cfg b/board/orangepi/orangepi-r1/genimage.cfg index e93e802bd92..78b69269b7f 100644 --- a/board/orangepi/orangepi-r1/genimage.cfg +++ b/board/orangepi/orangepi-r1/genimage.cfg @@ -28,7 +28,7 @@ image sdcard.img { } partition boot { - partition-type-uuid = "U" + partition-type-uuid = F bootable = "true" image = "boot.vfat" } @@ -36,7 +36,7 @@ image sdcard.img { # 'rootfs' will be used as the partition label, used # with root=PARTLABEL=rootfs kernel command line partition rootfs { - partition-type-uuid = "L" + partition-type-uuid = L image = "rootfs.ext4" size = 512M } diff --git a/board/orangepi/orangepi-rk3399/extlinux.conf b/board/orangepi/orangepi-rk3399/extlinux.conf deleted file mode 100644 index 157c6a715e7..00000000000 --- a/board/orangepi/orangepi-rk3399/extlinux.conf +++ /dev/null @@ -1,4 +0,0 @@ -label RK3399_ORANGEPI linux - kernel /Image - devicetree /rk3399-orangepi.dtb - append earlycon=uart8250,mmio32,0xff1a0000 root=/dev/mmcblk1p4 rw rootwait diff --git a/board/orangepi/orangepi-rk3399/genimage.cfg b/board/orangepi/orangepi-rk3399/genimage.cfg deleted file mode 100644 index a02166172fb..00000000000 --- a/board/orangepi/orangepi-rk3399/genimage.cfg +++ /dev/null @@ -1,38 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "rk3399-orangepi.dtb", - "extlinux" - } - } - - size = 64M -} - -image sdcard.img { - hdimage { - partition-table-type = "gpt" - } - - partition loader1 { - image = "idbloader.img" - offset = 32K - } - - partition loader2 { - image = "u-boot.itb" - offset = 8M - } - - partition boot { - partition-type-uuid = F - bootable = "true" - image = "boot.vfat" - offset = 16M - } - - partition rootfs { - image = "rootfs.ext4" - } -} diff --git a/board/orangepi/orangepi-rk3399/post-build.sh b/board/orangepi/orangepi-rk3399/post-build.sh deleted file mode 100755 index ba29375c05e..00000000000 --- a/board/orangepi/orangepi-rk3399/post-build.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -BOARD_DIR="$(dirname $0)" - -install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf diff --git a/board/orangepi/orangepi-rk3399/readme.txt b/board/orangepi/orangepi-rk3399/readme.txt deleted file mode 100644 index 197e1fb448f..00000000000 --- a/board/orangepi/orangepi-rk3399/readme.txt +++ /dev/null @@ -1,56 +0,0 @@ -Orangepi Rk3399 -================ -http://www.orangepi.org/Orange%20Pi%20RK3399/ - -Build: -====== - $ make orangepi_rk3399_defconfig - $ make - -Files created in output directory -================================= - -output/images - -├── bl31.elf -├── boot.vfat -├── extlinux -├── idbloader.img -├── Image -├── rk3399-orangepi.dtb -├── rootfs.ext2 -├── rootfs.ext4 -> rootfs.ext2 -├── rootfs.tar -├── sdcard.img -├── u-boot.bin -└── u-boot.itb - -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: -======== -Orangepi-RK3399 by default boots from emmc. For SD card boot to -happen, emmc should be empty. If emmc happens to have any bootable -image then erase emmc so that bootrom will look for a proper image in SD. - -emmc can be erased once after booted into linux as shown in below link. - -https://wiki.amarulasolutions.com/bsp/setup/rockchip/rk3399_emmc.html - -Serial console: ---------------- - -Baudrate for this board is 1500000. - -Login: ------- -Enter 'root' as login user, and the prompt is ready. - -https://wiki.amarulasolutions.com/bsp/rockchip/rk3399/orangepi.html diff --git a/board/orangepi/orangepi-win/boot.cmd b/board/orangepi/orangepi-win/boot.cmd deleted file mode 100644 index 2ddb769d6d9..00000000000 --- a/board/orangepi/orangepi-win/boot.cmd +++ /dev/null @@ -1,6 +0,0 @@ -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r Image -fatload mmc 0 $fdt_addr_r sun50i-a64-orangepi-win.dtb - -booti $kernel_addr_r - $fdt_addr_r diff --git a/board/orangepi/orangepi-win/genimage.cfg b/board/orangepi/orangepi-win/genimage.cfg deleted file mode 100644 index 98fd1a033d8..00000000000 --- a/board/orangepi/orangepi-win/genimage.cfg +++ /dev/null @@ -1,40 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "sun50i-a64-orangepi-win.dtb", - "boot.scr" - } - } - - size = 64M -} - -image sdcard.img { - hdimage { - } - - partition spl { - in-partition-table = "no" - image = "sunxi-spl.bin" - offset = 8K - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot.itb" - offset = 40K - size = 1M # 1MB - 40KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/board/orangepi/orangepi-win/readme.txt b/board/orangepi/orangepi-win/readme.txt deleted file mode 100644 index 93adddd86b9..00000000000 --- a/board/orangepi/orangepi-win/readme.txt +++ /dev/null @@ -1,37 +0,0 @@ -Intro -===== - -This default configuration will allow you to start experimenting with the -buildroot environment for the Orangepi Win/Win Plus. With the current configuration -it will bring-up the board, and allow access through the serial console. - -Orangepi Win/Win Plus link: -http://www.orangepi.org/OrangePiWin_WinPlus/ - -Wiki link: -https://openedev.amarulasolutions.com/display/ODWIKI/Orangepi+Win - -This configuration uses U-Boot mainline and kernel mainline. - -How to build -============ - - $ make orangepi_win_defconfig - $ make - -Note: you will need access to the internet to download the required -sources. - -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 Orangepi Win/Win Plus and power it up. The console -is on the serial line, 115200 8N1. diff --git a/board/orangepi/orangepi-zero-plus/boot.cmd b/board/orangepi/orangepi-zero-plus/boot.cmd deleted file mode 100644 index 18c4d521af2..00000000000 --- a/board/orangepi/orangepi-zero-plus/boot.cmd +++ /dev/null @@ -1,6 +0,0 @@ -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -fatload mmc 0 $kernel_addr_r Image -fatload mmc 0 $fdt_addr_r sun50i-h5-orangepi-zero-plus.dtb - -booti $kernel_addr_r - $fdt_addr_r diff --git a/board/orangepi/orangepi-zero-plus/genimage.cfg b/board/orangepi/orangepi-zero-plus/genimage.cfg deleted file mode 100644 index a8f3161c392..00000000000 --- a/board/orangepi/orangepi-zero-plus/genimage.cfg +++ /dev/null @@ -1,40 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "sun50i-h5-orangepi-zero-plus.dtb", - "boot.scr" - } - } - - size = 64M -} - -image sdcard.img { - hdimage { - } - - partition spl { - in-partition-table = "no" - image = "sunxi-spl.bin" - offset = 8K - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot.itb" - offset = 40K - size = 1M # 1MB - 40KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/board/orangepi/orangepi-zero-plus/readme.txt b/board/orangepi/orangepi-zero-plus/readme.txt index 5556eae8907..1e60e0f825b 100644 --- a/board/orangepi/orangepi-zero-plus/readme.txt +++ b/board/orangepi/orangepi-zero-plus/readme.txt @@ -6,7 +6,7 @@ buildroot environment for the Orangepi Zero Plus. With the current configuration it will bring-up the board, and allow access through the serial console. Orangepi Zero Plus link: -http://www.orangepi.org/OrangePiZeroPlus/ +http://www.orangepi.org/html/hardWare/computerAndMicrocontrollers/details/Orange-Pi-Zero-Plus.html This configuration uses U-Boot mainline and kernel mainline. diff --git a/board/orangepi/orangepi-zero-plus2/boot.cmd b/board/orangepi/orangepi-zero-plus2/boot.cmd deleted file mode 100644 index aa5162004be..00000000000 --- a/board/orangepi/orangepi-zero-plus2/boot.cmd +++ /dev/null @@ -1,6 +0,0 @@ -setenv bootargs console=ttyS0,115200 earlyprintk root=PARTLABEL=rootfs rootwait - -fatload mmc 0 $kernel_addr_r Image -fatload mmc 0 $fdt_addr_r sun50i-h5-orangepi-zero-plus2.dtb - -booti $kernel_addr_r - $fdt_addr_r diff --git a/board/orangepi/orangepi-zero-plus2/genimage.cfg b/board/orangepi/orangepi-zero-plus2/genimage.cfg deleted file mode 100644 index 5a7ee7707ab..00000000000 --- a/board/orangepi/orangepi-zero-plus2/genimage.cfg +++ /dev/null @@ -1,41 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "sun50i-h5-orangepi-zero-plus2.dtb", - "boot.scr" - } - } - - size = 64M -} - -image sdcard.img { - hdimage { - # for root=PARTLABEL support - partition-table-type = "gpt" - # default GPT location conflicts with bootloaders, move it after - gpt-location = 1M - } - - partition spl { - in-partition-table = "no" - image = "u-boot-sunxi-with-spl.bin" - offset = 8K - size = 1016K # 1MB - 8KB - } - - partition boot { - partition-type-uuid = "F" - bootable = "true" - image = "boot.vfat" - } - - # 'rootfs' will be used as the partition label, used - # with root=PARTLABEL=rootfs kernel command line - partition rootfs { - partition-type-uuid = "L" - image = "rootfs.ext4" - size = 256M - } -} diff --git a/board/orangepi/orangepi-zero-plus2/readme.txt b/board/orangepi/orangepi-zero-plus2/readme.txt index 322ba0e12ae..2df6dd9b112 100644 --- a/board/orangepi/orangepi-zero-plus2/readme.txt +++ b/board/orangepi/orangepi-zero-plus2/readme.txt @@ -6,7 +6,7 @@ buildroot environment for the Orangepi Zero Plus2. With the current configuratio it will bring-up the board, and allow access through the serial console. Orangepi Zero Plus2 link: -http://www.orangepi.org/OrangePiZeroPlus2/ +http://www.orangepi.org/html/hardWare/computerAndMicrocontrollers/details/Orange-Pi-Zero-Plus-2.html Wiki link: https://openedev.amarulasolutions.com/display/ODWIKI/Orangepi+Zero+Plus2 diff --git a/board/pc/genimage-efi.cfg b/board/pc/genimage-efi.cfg index 035a077a78c..c231e1b9b26 100644 --- a/board/pc/genimage-efi.cfg +++ b/board/pc/genimage-efi.cfg @@ -19,7 +19,7 @@ image disk.img { partition boot { image = "efi-part.vfat" - partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b + partition-type-uuid = U offset = 32K bootable = true } diff --git a/board/pine64/rockpro64/genimage.cfg b/board/pine64/rockpro64/genimage.cfg index d3926f2df6e..94fa2f7c060 100644 --- a/board/pine64/rockpro64/genimage.cfg +++ b/board/pine64/rockpro64/genimage.cfg @@ -26,7 +26,7 @@ image sdcard.img { } partition boot { - partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b + partition-type-uuid = F bootable = "true" image = "boot.vfat" offset = 16M diff --git a/board/qemu/aarch64-ebbr/genimage.cfg b/board/qemu/aarch64-ebbr/genimage.cfg new file mode 100644 index 00000000000..1ca8332b9cd --- /dev/null +++ b/board/qemu/aarch64-ebbr/genimage.cfg @@ -0,0 +1,31 @@ +image efi-part.vfat { + vfat { + file EFI { + image = "efi-part/EFI" + } + + file Image { + image = "Image" + } + } + + size = 128M +} + +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 = b921b045-1df0-41c3-af44-4c6f280d3fae + image = "rootfs.ext2" + } +} diff --git a/board/qemu/aarch64-ebbr/grub.cfg b/board/qemu/aarch64-ebbr/grub.cfg new file mode 100644 index 00000000000..d99e19c4cd5 --- /dev/null +++ b/board/qemu/aarch64-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/qemu/aarch64-ebbr/post-image.sh b/board/qemu/aarch64-ebbr/post-image.sh new file mode 100755 index 00000000000..c884a8b6f66 --- /dev/null +++ b/board/qemu/aarch64-ebbr/post-image.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -eu + +BOARD_DIR=$(dirname "$0") + +# Create flash.bin TF-A FIP image from bl1.bin and fip.bin +dd if="${BINARIES_DIR}/bl1.bin" of="${BINARIES_DIR}/flash.bin" bs=1M +dd if="${BINARIES_DIR}/fip.bin" of="${BINARIES_DIR}/flash.bin" seek=64 bs=4096 conv=notrunc + +# Override the default GRUB configuration file with our own. +cp -f "${BOARD_DIR}/grub.cfg" "${BINARIES_DIR}/efi-part/EFI/BOOT/grub.cfg" diff --git a/board/qemu/aarch64-ebbr/readme.txt b/board/qemu/aarch64-ebbr/readme.txt new file mode 100644 index 00000000000..a2027dad448 --- /dev/null +++ b/board/qemu/aarch64-ebbr/readme.txt @@ -0,0 +1,103 @@ +Introduction +============ + +The qemu_aarch64_ebbr_defconfig is meant to illustrate some aspects of the Arm +EBBR specification[1] and the Arm SystemReady IR[2] compliance program. +It allows building an AArch64 U-Boot based firmware implementing the subset of +UEFI defined by EBBR, as well as a Linux OS disk image booting with UEFI, to run +on Qemu. + +Building +======== + + $ make qemu_aarch64_ebbr_defconfig + $ make + +Generated files under output/images: + +* flash.bin: A firmware image comprising TF-A, OP-TEE and the U-Boot bootloader. + +* disk.img: An OS disk image comprising the GRUB bootloader, the Linux kernel + and the root filesystem. + +Running under Qemu +================== + +Run the emulation with: + + qemu-system-aarch64 \ + -M virt,secure=on \ + -bios output/images/flash.bin \ + -cpu cortex-a53 \ + -device virtio-blk-device,drive=hd0 \ + -device virtio-net-device,netdev=eth0 \ + -device virtio-rng-device,rng=rng0 \ + -drive file=output/images/disk.img,if=none,format=raw,id=hd0 \ + -m 1024 \ + -netdev user,id=eth0 \ + -no-acpi \ + -nographic \ + -object rng-random,filename=/dev/urandom,id=rng0 \ + -rtc base=utc,clock=host \ + -smp 2 # qemu_aarch64_ebbr_defconfig + +The login prompt will appear in the terminal that started Qemu. + +Using the EBBR firmware to run another OS under Qemu +---------------------------------------------------- + +It is possible to use the generated firmware binary to install or run another OS +supporting the EBBR specification. + +To run another OS on emulation using a live or pre-installed image, use the same +Qemu command line as for the generated OS but adapt the OS image path in the +-drive stanza. +The image generated by the aarch64_efi_defconfig or the Arm ACS-IR images[3] are +examples of pre-installed OS images. + +To install another OS using an installer iso image, prepare a destination disk +image first with: + + qemu-img create -f qcow2 disk.qcow2 10G + +Then run the OS installer iso image on emulation with: + + qemu-system-aarch64 \ + -M virt,secure=on \ + -bios output/images/flash.bin \ + -cpu cortex-a53 \ + -device virtio-blk-device,drive=hd1 \ + -device virtio-blk-device,drive=hd0 \ + -device virtio-net-device,netdev=eth0 \ + -device virtio-rng-device,rng=rng0 \ + -drive file=,if=none,format=raw,readonly=on,id=hd0 \ + -drive file=disk.qcow2,if=none,id=hd1 \ + -m 1024 \ + -netdev user,id=eth0 \ + -no-acpi \ + -nographic \ + -object rng-random,filename=/dev/urandom,id=rng0 \ + -rtc base=utc,clock=host \ + -smp 2 + +The installation medium will show up under the Linux OS installer as /dev/vda +and the destination disk as /dev/vdb. +To reboot into the installed OS, use the same Qemu command line as for the +installation, but without the two stanzas +referring to hd0. +Linux distributions such as Debian, Fedora, openSUSE or Ubuntu provide an OS +installer iso image. + +Miscellaneous +============= + +This configuration is inspired by the qemu_aarch64_virt_defconfig, the +aarch64_efi_defconfig and the Arm SystemReady IR IoT Integration, Test, and +Certification Guide[4]. + +Firmware update is currently not supported. + +[1]: https://github.com/ARM-software/ebbr +[2]: https://developer.arm.com/Architectures/Arm%20SystemReady%20IR +[3]: https://github.com/ARM-software/arm-systemready/tree/main/IR/prebuilt_images +[4]: https://developer.arm.com/documentation/DUI1101/1-1/?lang=en diff --git a/board/qemu/aarch64-ebbr/u-boot.config b/board/qemu/aarch64-ebbr/u-boot.config new file mode 100644 index 00000000000..94aae9d2aae --- /dev/null +++ b/board/qemu/aarch64-ebbr/u-boot.config @@ -0,0 +1,34 @@ +CONFIG_BOOTM_EFI=y +CONFIG_CMD_BOOTEFI=y +CONFIG_CMD_BOOTEFI_HELLO=y +CONFIG_CMD_BOOTEFI_HELLO_COMPILE=y +CONFIG_CMD_BOOTEFI_SELFTEST=y +CONFIG_CMD_EFIDEBUG=y +CONFIG_CMD_EFI_VARIABLE_FILE_STORE=y +CONFIG_CMD_GPT=y +CONFIG_CMD_NVEDIT_EFI=y +CONFIG_CMD_RNG=y +CONFIG_CMD_RTC=y +CONFIG_DM_RTC=y +CONFIG_EFI_DEVICE_PATH_TO_TEXT=y +CONFIG_EFI_GET_TIME=y +CONFIG_EFI_HAVE_RUNTIME_RESET=y +CONFIG_EFI_LOADER=y +CONFIG_EFI_LOADER_HII=y +CONFIG_EFI_MM_COMM_TEE=y +CONFIG_EFI_PARTITION=y +CONFIG_EFI_SECURE_BOOT=y +CONFIG_EFI_SET_TIME=y +CONFIG_EFI_UNICODE_CAPITALIZATION=y +CONFIG_EFI_UNICODE_COLLATION_PROTOCOL2=y +CONFIG_EFI_VARIABLE_FILE_STORE=y +CONFIG_FAT_WRITE=y +CONFIG_FIT=y +CONFIG_FS_FAT=y +CONFIG_OF_LIBFDT=y +CONFIG_OPTEE=y +CONFIG_PARTITION_TYPE_GUID=y +CONFIG_RNG_OPTEE=y +CONFIG_RTC_EMULATION=y +CONFIG_SCMI_FIRMWARE=y +CONFIG_TEE=y diff --git a/board/qemu/aarch64-sbsa/genimage.cfg b/board/qemu/aarch64-sbsa/genimage.cfg index bdf8a89d75b..e7ac7f2ee1a 100644 --- a/board/qemu/aarch64-sbsa/genimage.cfg +++ b/board/qemu/aarch64-sbsa/genimage.cfg @@ -19,7 +19,7 @@ image disk.img { partition boot { image = "efi-part.vfat" - partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b + partition-type-uuid = U offset = 32K bootable = true } diff --git a/board/qemu/arm-ebbr/genimage.cfg b/board/qemu/arm-ebbr/genimage.cfg new file mode 100644 index 00000000000..3d4c9cff1ad --- /dev/null +++ b/board/qemu/arm-ebbr/genimage.cfg @@ -0,0 +1,31 @@ +image efi-part.vfat { + vfat { + file EFI { + image = "efi-part/EFI" + } + + file zImage { + image = "zImage" + } + } + + size = 128M +} + +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 = 69dad710-2ce4-4e3c-b16c-21a1d49abed3 + image = "rootfs.ext2" + } +} diff --git a/board/qemu/arm-ebbr/grub.cfg b/board/qemu/arm-ebbr/grub.cfg new file mode 100644 index 00000000000..ab3a6ec26b0 --- /dev/null +++ b/board/qemu/arm-ebbr/grub.cfg @@ -0,0 +1,6 @@ +set default="0" +set timeout="5" + +menuentry "Buildroot" { + linux /zImage root=PARTLABEL=root rootwait +} diff --git a/board/qemu/arm-ebbr/linux.fragment b/board/qemu/arm-ebbr/linux.fragment new file mode 100644 index 00000000000..07554cf843d --- /dev/null +++ b/board/qemu/arm-ebbr/linux.fragment @@ -0,0 +1,2 @@ +CONFIG_TEE=y +CONFIG_OPTEE=y diff --git a/board/qemu/arm-ebbr/post-image.sh b/board/qemu/arm-ebbr/post-image.sh new file mode 100755 index 00000000000..c884a8b6f66 --- /dev/null +++ b/board/qemu/arm-ebbr/post-image.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -eu + +BOARD_DIR=$(dirname "$0") + +# Create flash.bin TF-A FIP image from bl1.bin and fip.bin +dd if="${BINARIES_DIR}/bl1.bin" of="${BINARIES_DIR}/flash.bin" bs=1M +dd if="${BINARIES_DIR}/fip.bin" of="${BINARIES_DIR}/flash.bin" seek=64 bs=4096 conv=notrunc + +# Override the default GRUB configuration file with our own. +cp -f "${BOARD_DIR}/grub.cfg" "${BINARIES_DIR}/efi-part/EFI/BOOT/grub.cfg" diff --git a/board/qemu/arm-ebbr/readme.txt b/board/qemu/arm-ebbr/readme.txt new file mode 100644 index 00000000000..085e723fe6c --- /dev/null +++ b/board/qemu/arm-ebbr/readme.txt @@ -0,0 +1,71 @@ +Introduction +============ + +The qemu_arm_ebbr_defconfig is meant to illustrate some aspects of the Arm +EBBR specification[1] and the Arm SystemReady IR[2] compliance program. +It allows building a 32b ARMv7-A U-Boot based firmware implementing the subset +of UEFI defined by EBBR, as well as a Linux OS disk image booting with UEFI, to +run on Qemu. + +Building +======== + + $ make qemu_arm_ebbr_defconfig + $ make + +Generated files under output/images: + +* flash.bin: A firmware image comprising TF-A, OP-TEE and the U-Boot bootloader. + +* disk.img: An OS disk image comprising the GRUB bootloader, the Linux kernel + and the root filesystem. + +Running under Qemu +================== + +Run the emulation with: + + qemu-system-arm \ + -M virt,secure=on \ + -bios output/images/flash.bin \ + -cpu cortex-a15 \ + -device virtio-blk-device,drive=hd0 \ + -device virtio-net-device,netdev=eth0 \ + -device virtio-rng-device,rng=rng0 \ + -drive file=output/images/disk.img,if=none,format=raw,id=hd0 \ + -m 1024 \ + -netdev user,id=eth0 \ + -no-acpi \ + -nographic \ + -object rng-random,filename=/dev/urandom,id=rng0 \ + -rtc base=utc,clock=host \ + -smp 2 # qemu_arm_ebbr_defconfig + +The login prompt will appear in the terminal that started Qemu. + +Using the EBBR firmware to run another OS under Qemu +---------------------------------------------------- + +It is possible to use the generated firmware binary to run another OS +supporting the EBBR specification. + +To run another OS on emulation using a live or pre-installed image, use the same +Qemu command line as for the generated OS but adapt the OS image path in the +-drive stanza. +The 32b Arm ACS-IR image[3] is an example of a pre-installed OS image. +Linux distributions such as Debian or openSUSE provide a pre-installed OS +image. + +Miscellaneous +============= + +This configuration is inspired by the qemu_arm_vexpress_tz_defconfig, the +qemu_aarch64_ebbr_defconfig and the Arm SystemReady IR IoT Integration, Test, +and Certification Guide[4]. + +Firmware update is currently not supported. + +[1]: https://github.com/ARM-software/ebbr +[2]: https://developer.arm.com/Architectures/Arm%20SystemReady%20IR +[3]: https://github.com/ARM-software/arm-systemready/tree/main/IR/prebuilt_images +[4]: https://developer.arm.com/documentation/DUI1101/1-1/?lang=en diff --git a/board/qemu/arm-ebbr/u-boot.fragment b/board/qemu/arm-ebbr/u-boot.fragment new file mode 100644 index 00000000000..bfc382cde90 --- /dev/null +++ b/board/qemu/arm-ebbr/u-boot.fragment @@ -0,0 +1,35 @@ +CONFIG_BOOTM_EFI=y +CONFIG_CMD_BOOTEFI=y +CONFIG_CMD_BOOTEFI_HELLO=y +CONFIG_CMD_BOOTEFI_HELLO_COMPILE=y +CONFIG_CMD_BOOTEFI_SELFTEST=y +CONFIG_CMD_EFIDEBUG=y +CONFIG_CMD_EFI_VARIABLE_FILE_STORE=y +CONFIG_CMD_GPT=y +CONFIG_CMD_NVEDIT_EFI=y +CONFIG_CMD_RNG=y +CONFIG_CMD_RTC=y +CONFIG_DM_RTC=y +CONFIG_EFI_DEVICE_PATH_TO_TEXT=y +CONFIG_EFI_GET_TIME=y +CONFIG_EFI_HAVE_RUNTIME_RESET=y +CONFIG_EFI_LOADER=y +CONFIG_EFI_LOADER_HII=y +CONFIG_EFI_MM_COMM_TEE=y +CONFIG_EFI_PARTITION=y +CONFIG_EFI_SECURE_BOOT=y +CONFIG_EFI_SET_TIME=y +CONFIG_EFI_UNICODE_CAPITALIZATION=y +CONFIG_EFI_UNICODE_COLLATION_PROTOCOL2=y +CONFIG_EFI_VARIABLE_FILE_STORE=y +CONFIG_FAT_WRITE=y +CONFIG_FIT=y +CONFIG_FS_FAT=y +CONFIG_OF_LIBFDT=y +CONFIG_OPTEE=y +CONFIG_PARTITION_TYPE_GUID=y +CONFIG_RNG_OPTEE=y +CONFIG_RTC_EMULATION=y +CONFIG_SCMI_FIRMWARE=y +CONFIG_SYS_TEXT_BASE=0x60000000 +CONFIG_TEE=y diff --git a/board/qemu/arm-versatile/linux-nommu.fragment b/board/qemu/arm-versatile/linux-nommu.fragment deleted file mode 100644 index 6f1cc3f26d4..00000000000 --- a/board/qemu/arm-versatile/linux-nommu.fragment +++ /dev/null @@ -1,59 +0,0 @@ -# CONFIG_ARM_SINGLE_ARMV7M is not set -CONFIG_ARM_SINGLE_ARCH_VERSATILE=y -CONFIG_BINFMT_ELF_FDPIC=y -CONFIG_BINFMT_FLAT=y -# CONFIG_BLK_DEV_RAM is not set -# CONFIG_CRAMFS is not set -CONFIG_CMDLINE="" -# CONFIG_DEBUG_FS is not set -# CONFIG_DEBUG_KERNEL is not set -# CONFIG_DEBUG_USER is not set -# CONFIG_DRM is not set -# CONFIG_EEPROM_LEGACY is not set -# CONFIG_EXT2_FS is not set -CONFIG_EXT4_FS=y -CONFIG_FB_ARMCLCD=y -# CONFIG_FONTS is not set -CONFIG_FONT_8x16=y -CONFIG_FONT_8x8=y -# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set -# CONFIG_FTRACE is not set -# CONFIG_GPIO_PL061 is not set -# CONFIG_HIGH_RES_TIMERS is not set -CONFIG_HWMON=y -# CONFIG_I2C_VERSATILE is not set -CONFIG_INET_DIAG=y -CONFIG_INPUT_EVDEV=y -CONFIG_IPV6=y -# CONFIG_IP_MULTICAST is not set -# CONFIG_IP_PNP is not set -# CONFIG_MMU is not set -CONFIG_LOCALVERSION_AUTO=y -# CONFIG_LOGO is not set -CONFIG_LOG_BUF_SHIFT=17 -CONFIG_MDIO_DEVICE=y -# CONFIG_MINIX_FS is not set -# CONFIG_MMC is not set -# CONFIG_MTD is not set -# CONFIG_NEW_LEDS is not set -# CONFIG_NFSD is not set -# CONFIG_NFS_FS is not set -# CONFIG_NLS_CODEPAGE_850 is not set -# CONFIG_NLS_ISO8859_1 is not set -# CONFIG_NO_HZ_IDLE is not set -# CONFIG_NVMEM is not set -CONFIG_DRAM_BASE=0x00000000 -CONFIG_DRAM_SIZE=0x08000000 -CONFIG_INITRAMFS_SOURCE="${BR_BINARIES_DIR}/rootfs.cpio" -# CONFIG_PARTITION_ADVANCED is not set -# CONFIG_OABI_COMPAT is not set -CONFIG_PHYLIB=y -# CONFIG_ROMFS_FS is not set -# CONFIG_RTC_CLASS is not set -CONFIG_SERIAL_CORE=y -CONFIG_SERIO_SERPORT=y -CONFIG_SET_MEM_PARAM=y -CONFIG_SLUB=y -# CONFIG_SPI is not set -# CONFIG_SYNC_FILE is not set -# CONFIG_VFP is not set diff --git a/board/qemu/arm-versatile/patches/linux/versatile-nommu.patch b/board/qemu/arm-versatile/patches/linux/versatile-nommu.patch deleted file mode 100644 index 1a5130deb48..00000000000 --- a/board/qemu/arm-versatile/patches/linux/versatile-nommu.patch +++ /dev/null @@ -1,122 +0,0 @@ -From 7c245ffc17a9ab6215830d4ecd8b2f9beddb487c Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb -Date: Fri, 1 Feb 2019 11:36:20 +0100 -Subject: [PATCH] arm-versatile-nommu: Linux patch - -Originally made by Waldemar Brodkorb from LKML. - -Rename CLKSRC_OF to TIMER_OF (kernel >= 4.13) -https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=bb0eb050a577a866cb47c2dc37596f1207f4c2d9 - -Remove GENERIC_CLOCKEVENTS since its enabled by default (kernel >= 5.11) -https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=0774a6ed294b963dc76df2d8342ab86d030759ec - -Select CONFIG_GENERIC_IRQ_MULTI_HANDLER since irqchip doesn't select it anymore (kernel >= 5.12) -https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=a79f7051cccb6f3bcd3d2a0a058c7d5c79bb0371 - -Signed-Off-by: Waldemar Brodkorb -[Gerome: reformated as a Git patch] -Signed-off-by: Gerome Burlats -[Romain: fix Waldemar's authorship in Git patch] -Signed-off-by: Romain Naour ---- - arch/arm/Kconfig | 11 +++++++++++ - arch/arm/Kconfig.debug | 3 ++- - arch/arm/include/asm/mach/map.h | 1 + - arch/arm/mach-versatile/Kconfig | 5 +++-- - arch/arm/mach-versatile/Makefile.boot | 3 +++ - arch/arm/mach-versatile/versatile_dt.c | 4 ++++ - 6 files changed, 24 insertions(+), 3 deletions(-) - create mode 100644 arch/arm/mach-versatile/Makefile.boot - -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index dcf2df6da98f..c2155c1a2eba 100644 ---- a/arch/arm/Kconfig -+++ b/arch/arm/Kconfig -@@ -337,6 +337,17 @@ config ARM_SINGLE_ARMV7M - select SPARSE_IRQ - select USE_OF - -+config ARM_SINGLE_ARCH_VERSATILE -+ bool "ARM Ltd. Versatile family" -+ depends on !MMU -+ select AUTO_ZRELADDR -+ select TIMER_OF -+ select COMMON_CLK -+ select GENERIC_IRQ_MULTI_HANDLER -+ select GPIOLIB -+ select SPARSE_IRQ -+ select USE_OF -+ - config ARCH_EP93XX - bool "EP93xx-based" - select ARCH_SPARSEMEM_ENABLE -diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug -index 98436702e0c7..7e63299ceb40 100644 ---- a/arch/arm/Kconfig.debug -+++ b/arch/arm/Kconfig.debug -@@ -1891,7 +1891,8 @@ config DEBUG_UNCOMPRESS - config UNCOMPRESS_INCLUDE - string - default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM || \ -- PLAT_SAMSUNG || ARM_SINGLE_ARMV7M -+ PLAT_SAMSUNG || ARM_SINGLE_ARMV7M || \ -+ ARM_SINGLE_ARCH_VERSATILE - default "mach/uncompress.h" - - config EARLY_PRINTK -diff --git a/arch/arm/include/asm/mach/map.h b/arch/arm/include/asm/mach/map.h -index 92282558caf7..90bd9c069ffc 100644 ---- a/arch/arm/include/asm/mach/map.h -+++ b/arch/arm/include/asm/mach/map.h -@@ -59,6 +59,7 @@ extern int ioremap_page(unsigned long virt, unsigned long phys, - #else - #define iotable_init(map,num) do { } while (0) - #define vm_reserve_area_early(a,s,c) do { } while (0) -+#define debug_ll_io_init() do { } while (0) - #endif - - #endif -diff --git a/arch/arm/mach-versatile/Kconfig b/arch/arm/mach-versatile/Kconfig -index d88e7725bf99..d38b90157f13 100644 ---- a/arch/arm/mach-versatile/Kconfig -+++ b/arch/arm/mach-versatile/Kconfig -@@ -1,7 +1,8 @@ - # SPDX-License-Identifier: GPL-2.0 - config ARCH_VERSATILE -- bool "ARM Ltd. Versatile family" -- depends on ARCH_MULTI_V5 -+ bool "ARM Ltd. Versatile family" if ARCH_MULTI_V5 -+ depends on ARCH_MULTI_V5 || ARM_SINGLE_ARCH_VERSATILE -+ default y if ARM_SINGLE_ARCH_VERSATILE - select ARM_AMBA - select ARM_TIMER_SP804 - select ARM_VIC -diff --git a/arch/arm/mach-versatile/Makefile.boot b/arch/arm/mach-versatile/Makefile.boot -new file mode 100644 -index 000000000000..eacfc3f5c33e ---- /dev/null -+++ b/arch/arm/mach-versatile/Makefile.boot -@@ -0,0 +1,3 @@ -+# Empty file waiting for deletion once Makefile.boot isn't needed any more. -+# Patch waits for application at -+# http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=7889/1 . -diff --git a/arch/arm/mach-versatile/versatile_dt.c b/arch/arm/mach-versatile/versatile_dt.c -index 02ba68abe533..835b51bc597b 100644 ---- a/arch/arm/mach-versatile/versatile_dt.c -+++ b/arch/arm/mach-versatile/versatile_dt.c -@@ -22,7 +22,11 @@ - #include - - /* macro to get at MMIO space when running virtually */ -+#ifdef CONFIG_MMU - #define IO_ADDRESS(x) (((x) & 0x0fffffff) + (((x) >> 4) & 0x0f000000) + 0xf0000000) -+#else -+#define IO_ADDRESS(x) (x) -+#endif - #define __io_address(n) ((void __iomem __force *)IO_ADDRESS(n)) - - /* --- -2.31.1 - diff --git a/board/qemu/arm-versatile/readme.txt b/board/qemu/arm-versatile/readme.txt index 223bd55c015..757ef378e95 100644 --- a/board/qemu/arm-versatile/readme.txt +++ b/board/qemu/arm-versatile/readme.txt @@ -2,9 +2,5 @@ Run the emulation with: qemu-system-arm -M versatilepb -kernel output/images/zImage -dtb output/images/versatile-pb.dtb -drive file=output/images/rootfs.ext2,if=scsi,format=raw -append "rootwait root=/dev/sda console=ttyAMA0,115200" -serial stdio -net nic,model=rtl8139 -net user # qemu_arm_versatile_defconfig -Or for the noMMU emulation: - - qemu-system-arm -M versatilepb -kernel output/images/zImage -dtb output/images/versatile-pb.dtb -append "console=ttyAMA0,115200" -serial stdio -net user -net nic,model=smc91c111 # qemu_arm_versatile_nommu_defconfig - The login prompt will appear in the terminal that started Qemu. The graphical window is the framebuffer. diff --git a/board/qemu/ppc-bamboo/readme.txt b/board/qemu/ppc-bamboo/readme.txt index 0b70d2fa544..53d1970698f 100644 --- a/board/qemu/ppc-bamboo/readme.txt +++ b/board/qemu/ppc-bamboo/readme.txt @@ -1,5 +1,5 @@ Run the emulation with: -qemu-system-ppc -nographic -M bamboo -kernel vmlinux -net nic,model=virtio-net-pci -net user # qemu_ppc_bamboo_defconfig +qemu-system-ppc -nographic -M bamboo -kernel output/images/vmlinux -net nic,model=virtio-net-pci -net user # qemu_ppc_bamboo_defconfig The login prompt will appear in the terminal that started Qemu. diff --git a/board/qemu/ppc64le-powernv8/readme.txt b/board/qemu/ppc64le-powernv8/readme.txt index 059f55fbc91..b57c97464a8 100644 --- a/board/qemu/ppc64le-powernv8/readme.txt +++ b/board/qemu/ppc64le-powernv8/readme.txt @@ -1,5 +1,5 @@ Run the emulation with: -qemu-system-ppc64 -M powernv9 -kernel vmlinux -append "console=hvc0 rootwait root=/dev/nvme0n1" -device nvme,bus=pcie.3,addr=0x0,drive=drive0,serial=1234 -drive file=./rootfs.ext2,if=none,id=drive0,format=raw,cache=none -device e1000e,netdev=net0,mac=C0:FF:EE:00:01:03,bus=pcie.1,addr=0x0 -netdev user,id=net0 -serial mon:stdio -nographic # qemu_ppc64le_powernv8_defconfig +qemu-system-ppc64 -M powernv9 -kernel output/images/vmlinux -append "console=hvc0 rootwait root=/dev/nvme0n1" -device nvme,bus=pcie.3,addr=0x0,drive=drive0,serial=1234 -drive file=output/images/rootfs.ext2,if=none,id=drive0,format=raw,cache=none -device e1000e,netdev=net0,mac=C0:FF:EE:00:01:03,bus=pcie.1,addr=0x0 -netdev user,id=net0 -serial mon:stdio -nographic # qemu_ppc64le_powernv8_defconfig The login prompt will appear in the terminal window. diff --git a/board/qemu/ppc64le-pseries/readme.txt b/board/qemu/ppc64le-pseries/readme.txt index 8ee72ea6cf8..3d5577aa320 100644 --- a/board/qemu/ppc64le-pseries/readme.txt +++ b/board/qemu/ppc64le-pseries/readme.txt @@ -1,5 +1,5 @@ Run the emulation with: -qemu-system-ppc64 -M pseries -cpu POWER8 -m 256 -kernel output/images/vmlinux -append "console=hvc0 rootwait root=/dev/sda" -drive file=output/images/rootfs.ext2,if=scsi,index=0,format=raw -serial stdio -display curses # qemu_ppc64le_pseries_defconfig +qemu-system-ppc64 -M pseries,x-vof=on -cpu POWER8 -m 256 -kernel output/images/vmlinux -append "console=hvc0 rootwait root=/dev/sda" -drive file=output/images/rootfs.ext2,if=scsi,index=0,format=raw -serial stdio -display curses # qemu_ppc64le_pseries_defconfig The login prompt will appear in the terminal window. diff --git a/board/qemu/riscv64-virt/readme.txt b/board/qemu/riscv64-virt/readme.txt index 747a9ea6741..9e4cfc8c554 100644 --- a/board/qemu/riscv64-virt/readme.txt +++ b/board/qemu/riscv64-virt/readme.txt @@ -2,4 +2,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,id=hd0 -device virtio-blk-device,drive=hd0 -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 -device virtio-blk-device,drive=hd0 -nographic -cpu rv64,mmu=off # qemu_riscv64_nommu_virt_defconfig + The login prompt will appear in the terminal that started Qemu. diff --git a/board/radxa/rockpi-4/extlinux.conf b/board/radxa/rockpi-4/extlinux.conf deleted file mode 100644 index 83374f174af..00000000000 --- a/board/radxa/rockpi-4/extlinux.conf +++ /dev/null @@ -1,4 +0,0 @@ -label RK3399_ROCK_PI_4 linux - kernel /Image - devicetree /rk3399-rock-pi-4.dtb - append earlycon=uart8250,mmio32,0xff1a0000 root=/dev/mmcblk1p4 rw rootwait diff --git a/board/radxa/rockpi-4/genimage.cfg b/board/radxa/rockpi-4/genimage.cfg deleted file mode 100644 index 68cc4d61a82..00000000000 --- a/board/radxa/rockpi-4/genimage.cfg +++ /dev/null @@ -1,39 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "rk3399-rock-pi-4.dtb", - "extlinux" - } - } - - size = 112M -} - -image sdcard.img { - hdimage { - partition-table-type = "gpt" - } - - partition loader1 { - image = "idbloader.img" - offset = 32K - } - - partition loader2 { - image = "u-boot.itb" - offset = 8M - } - - partition boot { - partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b - bootable = "true" - image = "boot.vfat" - offset = 16M - } - - partition rootfs { - partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae - image = "rootfs.ext4" - } -} diff --git a/board/radxa/rockpi-4/post-build.sh b/board/radxa/rockpi-4/post-build.sh deleted file mode 100755 index ba29375c05e..00000000000 --- a/board/radxa/rockpi-4/post-build.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -BOARD_DIR="$(dirname $0)" - -install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf diff --git a/board/radxa/rockpi-4/readme.txt b/board/radxa/rockpi-4/readme.txt deleted file mode 100644 index 1db7569ed94..00000000000 --- a/board/radxa/rockpi-4/readme.txt +++ /dev/null @@ -1,61 +0,0 @@ -RADXA ROCK_PI_4 -================ -https://rockpi.org/rockpi4 - -ROCK Pi 4 is a Single Board Computer (SBC) from radxa. This guide is valid -for the below models: -- ROCK PI 4 Model A -- ROCK PI 4 Model B -- ROCK PI 4 Model C - -Build: -====== - $ make rock_pi_4_defconfig - $ make - -Files created in output directory -================================= - -output/images - -├── bl31.elf -├── boot.vfat -├── extlinux -├── idbloader.img -├── Image -├── rk3399-rock-pi-4.dtb -├── rootfs.ext2 -├── rootfs.ext4 -> rootfs.ext2 -├── rootfs.tar -├── sdcard.img -├── u-boot.bin -└── u-boot.itb - -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: ---------------- -RockPi4 has a 40-pin GPIO header. The pin layout is 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. - -Wiki link: -https://wiki.amarulasolutions.com/bsp/rockchip/rk3399/rock-pi-4.html diff --git a/board/radxa/rockpi-n10/extlinux.conf b/board/radxa/rockpi-n10/extlinux.conf deleted file mode 100644 index b6a4c97cd97..00000000000 --- a/board/radxa/rockpi-n10/extlinux.conf +++ /dev/null @@ -1,4 +0,0 @@ -label RK3399_ROCK_PI_N10 linux - kernel /Image - devicetree /rk3399pro-rock-pi-n10.dtb - append earlycon=uart8250,mmio32,0xff1a0000 root=/dev/mmcblk0p4 rw rootwait diff --git a/board/radxa/rockpi-n10/genimage.cfg b/board/radxa/rockpi-n10/genimage.cfg deleted file mode 100644 index 7f4b639bbca..00000000000 --- a/board/radxa/rockpi-n10/genimage.cfg +++ /dev/null @@ -1,39 +0,0 @@ -image boot.vfat { - vfat { - files = { - "Image", - "rk3399pro-rock-pi-n10.dtb", - "extlinux" - } - } - - size = 112M -} - -image sdcard.img { - hdimage { - partition-table-type = "gpt" - } - - partition loader1 { - image = "idbloader.img" - offset = 32K - } - - partition loader2 { - image = "u-boot.itb" - offset = 8M - } - - partition boot { - partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b - bootable = "true" - image = "boot.vfat" - offset = 16M - } - - partition rootfs { - partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae - image = "rootfs.ext4" - } -} diff --git a/board/radxa/rockpi-n10/post-build.sh b/board/radxa/rockpi-n10/post-build.sh deleted file mode 100755 index ba29375c05e..00000000000 --- a/board/radxa/rockpi-n10/post-build.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -BOARD_DIR="$(dirname $0)" - -install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf diff --git a/board/radxa/rockpi-n10/readme.txt b/board/radxa/rockpi-n10/readme.txt deleted file mode 100644 index 49decbb3d90..00000000000 --- a/board/radxa/rockpi-n10/readme.txt +++ /dev/null @@ -1,61 +0,0 @@ -RADXA ROCKPI-N10 -================ -https://wiki.radxa.com/RockpiN10 - -Build: -====== - $ make rock_pi_n10_defconfig - $ make - -Files created in output directory -================================= - -output/images -. -├── bl31.elf -├── boot.vfat -├── extlinux -├── idbloader.img -├── Image -├── rk3399pro-rock-pi-n10.dtb -├── rootfs.ext2 -├── rootfs.ext4 -> rootfs.ext2 -├── rootfs.tar -├── sdcard.img -├── u-boot.bin -└── u-boot.itb - -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: ---------------- -RockPi-N10 has a 40-pin GPIO header. The pin layout is as follows: - -pin 6: gnd -pin 8: tx -pin 10: rx - -Baudrate for this board is 1500000. - -The boot order on rockpi-n10 is emmc, sd. If emmc contains a valid Image, the board -always boots from emmc. To boot from SD, erase emmc as per the guide: - -https://wiki.amarulasolutions.com/bsp/setup/rockchip/rk3399_emmc.html - -Login: ------- -Enter 'root' as login user, and the prompt is ready. - -wiki link: ----------- -https://wiki.amarulasolutions.com/bsp/rockchip/rk3399pro/rock-pi-n10.html diff --git a/board/radxa/rockpi-n8/genimage.cfg b/board/radxa/rockpi-n8/genimage.cfg index 909a646499c..bfcd92f590e 100644 --- a/board/radxa/rockpi-n8/genimage.cfg +++ b/board/radxa/rockpi-n8/genimage.cfg @@ -26,7 +26,7 @@ image sdcard.img { } partition boot { - partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b + partition-type-uuid = F bootable = "true" image = "boot.vfat" offset = 16M diff --git a/package/rpi-firmware/cmdline.txt b/board/raspberrypi/cmdline.txt similarity index 100% rename from package/rpi-firmware/cmdline.txt rename to board/raspberrypi/cmdline.txt diff --git a/board/raspberrypi/genimage-raspberrypi0.cfg b/board/raspberrypi/genimage-raspberrypi0.cfg index 1fa3f5096fd..313f85f651c 100644 --- a/board/raspberrypi/genimage-raspberrypi0.cfg +++ b/board/raspberrypi/genimage-raspberrypi0.cfg @@ -7,6 +7,7 @@ image boot.vfat { "rpi-firmware/config.txt", "rpi-firmware/fixup.dat", "rpi-firmware/start.elf", + "rpi-firmware/overlays", "zImage" } } diff --git a/board/raspberrypi/genimage-raspberrypi2.cfg b/board/raspberrypi/genimage-raspberrypi2.cfg index acd23e7ca8f..dad92755375 100644 --- a/board/raspberrypi/genimage-raspberrypi2.cfg +++ b/board/raspberrypi/genimage-raspberrypi2.cfg @@ -7,6 +7,7 @@ image boot.vfat { "rpi-firmware/config.txt", "rpi-firmware/fixup.dat", "rpi-firmware/start.elf", + "rpi-firmware/overlays", "zImage" } } diff --git a/board/raspberrypi/post-build.sh b/board/raspberrypi/post-build.sh index 5e5eb711007..38fdc807345 100755 --- a/board/raspberrypi/post-build.sh +++ b/board/raspberrypi/post-build.sh @@ -8,4 +8,12 @@ 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 # HDMI console' ${TARGET_DIR}/etc/inittab +# systemd doesn't use /etc/inittab, enable getty.tty1.service instead +elif [ -d ${TARGET_DIR}/etc/systemd ]; then + mkdir -p "${TARGET_DIR}/etc/systemd/system/getty.target.wants" + ln -sf /lib/systemd/system/getty@.service \ + "${TARGET_DIR}/etc/systemd/system/getty.target.wants/getty@tty1.service" fi + +# exnsure overlays exists for genimage +mkdir -p "${BINARIES_DIR}/rpi-firmware/overlays" diff --git a/board/seeed/stm32mp157c-odyssey/genimage.cfg b/board/seeed/stm32mp157c-odyssey/genimage.cfg index 170dedc254e..4c18a2eb040 100644 --- a/board/seeed/stm32mp157c-odyssey/genimage.cfg +++ b/board/seeed/stm32mp157c-odyssey/genimage.cfg @@ -1,6 +1,6 @@ image sdcard.img { hdimage { - gpt = "true" + partition-table-type = "gpt" } partition fsbl1 { diff --git a/board/sifive/hifive-unleashed/genimage_sdcard.cfg b/board/sifive/hifive-unleashed/genimage_sdcard.cfg index e66f221d73c..079ac5ed262 100644 --- a/board/sifive/hifive-unleashed/genimage_sdcard.cfg +++ b/board/sifive/hifive-unleashed/genimage_sdcard.cfg @@ -6,18 +6,18 @@ image sdcard.img { partition u-boot-spl { image = "u-boot-spl.bin" offset = 17K - partition-type-uuid = 5B193300-FC78-40CD-8002-E86C45580B47 + 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-type-uuid = 2e54b353-1271-4842-806f-e436d6af6985 } partition rootfs { image = "rootfs.ext4" - partition-type-uuid = 0FC63DAF-8483-4772-8E79-3D69D8477DE4 + partition-type-uuid = 0fc63daf-8483-4772-8e79-3d69d8477de4 bootable = true } } diff --git a/board/sifive/hifive-unleashed/genimage_spi-nor.cfg b/board/sifive/hifive-unleashed/genimage_spi-nor.cfg index 903e675a90e..14b7bb1e1c9 100644 --- a/board/sifive/hifive-unleashed/genimage_spi-nor.cfg +++ b/board/sifive/hifive-unleashed/genimage_spi-nor.cfg @@ -8,12 +8,12 @@ image spi-nor.img { partition u-boot-spl { image = "u-boot-spl.bin" offset = 20K - partition-type-uuid = 5B193300-FC78-40CD-8002-E86C45580B47 + 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 + partition-type-uuid = 2e54b353-1271-4842-806f-e436d6af6985 } } diff --git a/board/sinovoip/m1-plus/boot.cmd b/board/sinovoip/m1-plus/boot.cmd deleted file mode 100644 index 48299964743..00000000000 --- a/board/sinovoip/m1-plus/boot.cmd +++ /dev/null @@ -1,5 +0,0 @@ -setenv fdt_high ffffffff -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun7i-a20-bananapi-m1-plus.dtb -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/sinovoip/m1-plus/genimage.cfg b/board/sinovoip/m1-plus/genimage.cfg deleted file mode 100644 index 18a549e6315..00000000000 --- a/board/sinovoip/m1-plus/genimage.cfg +++ /dev/null @@ -1,38 +0,0 @@ -# Minimal SD card image for the Banana Pi M1+ -# Based on the Banana Pro genimage.cfg - -image boot.vfat { - vfat { - files = { - "zImage", - "sun7i-a20-bananapi-m1-plus.dtb", - "boot.scr" - } - } - - size = 10M -} - -image sdcard.img { - hdimage { - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot-sunxi-with-spl.bin" - offset = 8K - 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/sinovoip/m1-plus/linux-wifi.fragment b/board/sinovoip/m1-plus/linux-wifi.fragment deleted file mode 100644 index 5576d738ad7..00000000000 --- a/board/sinovoip/m1-plus/linux-wifi.fragment +++ /dev/null @@ -1,10 +0,0 @@ -# Networking support -CONFIG_WIRELESS=y -CONFIG_CFG80211=y -CONFIG_CFG80211_WEXT=y -CONFIG_RFKILL=y - -# Network device support -CONFIG_WLAN=y -CONFIG_WLAN_VENDOR_BROADCOM=y -CONFIG_BRCMFMAC=m diff --git a/board/sinovoip/m1-plus/patches/linux/0001-ARM-dts-sun7i-bananapi-m1-plus-Disable-OOB-IRQ-for-b.patch b/board/sinovoip/m1-plus/patches/linux/0001-ARM-dts-sun7i-bananapi-m1-plus-Disable-OOB-IRQ-for-b.patch deleted file mode 100644 index b01b6b28293..00000000000 --- a/board/sinovoip/m1-plus/patches/linux/0001-ARM-dts-sun7i-bananapi-m1-plus-Disable-OOB-IRQ-for-b.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 58bae4096a7bf8d5d3bfbddb82cb37dd0561c938 Mon Sep 17 00:00:00 2001 -From: Filip Skoneczny -Date: Sun, 10 Jan 2021 19:07:14 +0100 -Subject: [PATCH] ARM: dts: sun7i: bananapi-m1-plus: Disable OOB IRQ for brcm - wifi module - - Based on 23bc805. - BugLink: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=908438 - -Signed-off-by: Filip Skoneczny ---- - arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - -diff --git a/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts b/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts -index 32d5d45a35c0..97f9987f51d7 100644 ---- a/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts -+++ b/arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts -@@ -193,9 +193,14 @@ &mmc3 { - brcmf: wifi@1 { - reg = <1>; - compatible = "brcm,bcm4329-fmac"; -- interrupt-parent = <&pio>; -- interrupts = <7 15 IRQ_TYPE_LEVEL_LOW>; -- interrupt-names = "host-wake"; -+ /* -+ * OOB interrupt support is broken ATM, drv probe failing with: -+ * ieee80211 phy0: brcmf_attach: dongle is not responding: err=-110 -+ * -+ * interrupt-parent = <&pio>; -+ * interrupts = <7 15 IRQ_TYPE_LEVEL_LOW>; -+ * interrupt-names = "host-wake"; -+ */ - }; - }; - --- -2.25.1 - diff --git a/board/sinovoip/m1-plus/post-build.sh b/board/sinovoip/m1-plus/post-build.sh deleted file mode 100755 index 4ee6fa3bc4e..00000000000 --- a/board/sinovoip/m1-plus/post-build.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -# Remove all but the brcmfmac43362 firmware files -find $TARGET_DIR/lib/firmware/brcm -type f -not -name "brcmfmac43362*" -delete diff --git a/board/sinovoip/m1-plus/readme.txt b/board/sinovoip/m1-plus/readme.txt deleted file mode 100644 index ae647c21a9d..00000000000 --- a/board/sinovoip/m1-plus/readme.txt +++ /dev/null @@ -1,64 +0,0 @@ -Banana Pi M1+ - -Intro -===== - -This default configuration will allow you to start experimenting with the -Buildroot environment for the Banana Pi M1+. With the current configuration -it will bring-up the board, and allow access through the serial console. - -How to build it -=============== - -Configure Buildroot: - - $ make bananapi_m1_plus_defconfig - -Compile everything and build the SD card image: - - $ 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": - - $ dd if=output/images/sdcard.img of=/dev/sdX - -Notes: - - replace 'sdX' with the actual device with your micro SD card - - you may need to be root to do that (use 'sudo') - -Insert the micro SD card in your Banana Pi M1+ and power it up. The console -is on the debug TTL UART, 115200 8N1. - -Ethernet -========== - - # udhcpc -i eth0 - -Wifi -========== - - # wpa_passphrase YOUR_SSID >> /etc/wpa_supplicant.conf - (enter the wifi password and press enter) - # wpa_supplicant -i wlan0 -c /etc/wpa_supplicant.conf -B - # udhcpc -i wlan0 - -Note: - - replace 'YOUR_SSID' with the actual SSID from your access point - -Audio -========== - -For this example you need package alsa-utils. - -Connect a headphone to the 3.5mm jack (TRRS). Note, that the Banana Pi M1+ -has an on-board microphone, too. - - # amixer cset name='Power Amplifier DAC Playback Switch' on - # amixer cset name='Power Amplifier Mute Switch' on - # amixer cset name='Power Amplifier Volume' 42 diff --git a/board/sinovoip/m1-plus/rootfs_overlay/lib/firmware/brcm/brcmfmac43362-sdio.sinovoip,bpi-m1-plus.txt b/board/sinovoip/m1-plus/rootfs_overlay/lib/firmware/brcm/brcmfmac43362-sdio.sinovoip,bpi-m1-plus.txt deleted file mode 120000 index 93947975ee8..00000000000 --- a/board/sinovoip/m1-plus/rootfs_overlay/lib/firmware/brcm/brcmfmac43362-sdio.sinovoip,bpi-m1-plus.txt +++ /dev/null @@ -1 +0,0 @@ -brcmfmac43362-sdio.txt \ No newline at end of file diff --git a/board/sinovoip/m1-plus/rootfs_overlay/lib/firmware/brcm/brcmfmac43362-sdio.txt b/board/sinovoip/m1-plus/rootfs_overlay/lib/firmware/brcm/brcmfmac43362-sdio.txt deleted file mode 100644 index 14a554fdd8c..00000000000 --- a/board/sinovoip/m1-plus/rootfs_overlay/lib/firmware/brcm/brcmfmac43362-sdio.txt +++ /dev/null @@ -1,56 +0,0 @@ -#AP6210_NVRAM_V1.2_03192013 -manfid=0x2d0 -prodid=0x492 -vendid=0x14e4 -devid=0x4343 -boardtype=0x0598 - -# Board Revision is P307, same nvram file can be used for P304, P305, P306 and P307 as the tssi pa params used are same -#Please force the automatic RX PER data to the respective board directory if not using P307 board, for e.g. for P305 boards force the data into the following directory /projects/BCM43362/a1_labdata/boardtests/results/sdg_rev0305 -boardrev=0x1307 -boardnum=777 -xtalfreq=26000 -boardflags=0x80201 -boardflags2=0x80 -sromrev=3 -wl0id=0x431b -macaddr=00:90:4c:07:71:12 -aa2g=1 -ag0=2 -maxp2ga0=74 -cck2gpo=0x2222 -ofdm2gpo=0x44444444 -mcs2gpo0=0x6666 -mcs2gpo1=0x6666 -pa0maxpwr=56 - -#P207 PA params -#pa0b0=5447 -#pa0b1=-658 -#pa0b2=-175 - -#Same PA params for P304,P305, P306, P307 - -pa0b0=5447 -pa0b1=-607 -pa0b2=-160 -pa0itssit=62 -pa1itssit=62 - - -cckPwrOffset=5 -ccode=0 -rssismf2g=0xa -rssismc2g=0x3 -rssisav2g=0x7 -triso2g=0 -noise_cal_enable_2g=0 -noise_cal_po_2g=0 -swctrlmap_2g=0x04040404,0x02020202,0x02020202,0x010101,0x1ff -temp_add=29767 -temp_mult=425 - -btc_flags=0x6 -btc_params0=5000 -btc_params1=1000 -btc_params6=63 diff --git a/board/sinovoip/m2-plus/boot.cmd b/board/sinovoip/m2-plus/boot.cmd deleted file mode 100644 index d22464a1c10..00000000000 --- a/board/sinovoip/m2-plus/boot.cmd +++ /dev/null @@ -1,7 +0,0 @@ -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait - -mmc dev 0 -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun8i-h3-bananapi-m2-plus.dtb - -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/sinovoip/m2-plus/genimage.cfg b/board/sinovoip/m2-plus/genimage.cfg deleted file mode 100644 index 9311e026dd3..00000000000 --- a/board/sinovoip/m2-plus/genimage.cfg +++ /dev/null @@ -1,34 +0,0 @@ -image boot.vfat { - vfat { - files = { - "zImage", - "sun8i-h3-bananapi-m2-plus.dtb", - "boot.scr" - } - } - - size = 64M -} - -image sdcard.img { - hdimage { - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot-sunxi-with-spl.bin" - offset = 8K - size = 1016K # 1MB - 8KB - } - - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - - partition rootfs { - partition-type = 0x83 - image = "rootfs.ext4" - } -} diff --git a/board/sipeed/lichee_rv/genimage.cfg b/board/sipeed/lichee_rv/genimage.cfg new file mode 100644 index 00000000000..d5df41203df --- /dev/null +++ b/board/sipeed/lichee_rv/genimage.cfg @@ -0,0 +1,19 @@ +# Minimal SD card image for the sipeed Lichee RV + +image sdcard.img { + hdimage { + } + + partition u-boot { + in-partition-table = false + image = "u-boot-sunxi-with-spl.bin" + offset = 8K + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + bootable = "true" + offset = 1M + } +} diff --git a/board/sipeed/lichee_rv/overlay/boot/extlinux/extlinux.conf b/board/sipeed/lichee_rv/overlay/boot/extlinux/extlinux.conf new file mode 100644 index 00000000000..91b2298628b --- /dev/null +++ b/board/sipeed/lichee_rv/overlay/boot/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +label linux + kernel /boot/Image + # use devicetree from u-boot + append console=ttyS0,115200 root=/dev/mmcblk0p1 ro rootwait diff --git a/board/sipeed/lichee_rv/readme.txt b/board/sipeed/lichee_rv/readme.txt new file mode 100644 index 00000000000..24e81418511 --- /dev/null +++ b/board/sipeed/lichee_rv/readme.txt @@ -0,0 +1,26 @@ +Lichee RV +=============== + +Lichee RV - Nezha CM is a compute module with modular design, equipped +with Allwinner D1 chip (based on T-Head XuanTie C906 core), 512MB DDR3 RAM. +It can boot from TF card or SD-NAND, uses two sets of M.2 b key 67 pin +connectors to route all IO, making it convient for wide use and easy to replace. + +How to build +============ + +$ make sipeed_lichee_rv_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 + +Connect a TTL UART to the debug connector, insert the microSD card and +plug in a USB-C cable to the PWR connector to boot the system. diff --git a/board/sipeed/lichee_rv_dock/genimage.cfg b/board/sipeed/lichee_rv_dock/genimage.cfg new file mode 100644 index 00000000000..38078f0ae3f --- /dev/null +++ b/board/sipeed/lichee_rv_dock/genimage.cfg @@ -0,0 +1,19 @@ +# Minimal SD card image for the sipeed Lichee RV dock + +image sdcard.img { + hdimage { + } + + partition u-boot { + in-partition-table = false + image = "u-boot-sunxi-with-spl.bin" + offset = 8K + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + bootable = "true" + offset = 1M + } +} diff --git a/board/sipeed/lichee_rv_dock/linux.fragment b/board/sipeed/lichee_rv_dock/linux.fragment new file mode 100644 index 00000000000..10016889ab8 --- /dev/null +++ b/board/sipeed/lichee_rv_dock/linux.fragment @@ -0,0 +1,7 @@ +CONFIG_BT=y +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_SERDEV=y +CONFIG_BT_HCIUART_3WIRE=y +CONFIG_BT_HCIUART_RTL=y +CONFIG_SERIAL_DEV_BUS=y +CONFIG_SERIAL_DEV_CTRL_TTYPORT=y diff --git a/board/sipeed/lichee_rv_dock/overlay/etc/network/interfaces b/board/sipeed/lichee_rv_dock/overlay/etc/network/interfaces new file mode 100644 index 00000000000..89e7d74aff7 --- /dev/null +++ b/board/sipeed/lichee_rv_dock/overlay/etc/network/interfaces @@ -0,0 +1,6 @@ +auto lo +iface lo inet loopback + +auto wlan0 +iface wlan0 inet dhcp +wpa-conf /etc/wpa_supplicant.conf diff --git a/board/sipeed/lichee_rv_dock/overlay/etc/wpa_supplicant.conf b/board/sipeed/lichee_rv_dock/overlay/etc/wpa_supplicant.conf new file mode 100644 index 00000000000..b43292b0a7f --- /dev/null +++ b/board/sipeed/lichee_rv_dock/overlay/etc/wpa_supplicant.conf @@ -0,0 +1,8 @@ +ap_scan=1 + +network={ + ssid="YOURSSID" + scan_ssid=1 + key_mgmt=WPA-PSK + psk="YOURPASSWD" +} diff --git a/board/sipeed/lichee_rv_dock/readme.txt b/board/sipeed/lichee_rv_dock/readme.txt new file mode 100644 index 00000000000..048ba64d26e --- /dev/null +++ b/board/sipeed/lichee_rv_dock/readme.txt @@ -0,0 +1,45 @@ +Lichee RV dock +=============== + +Lichee RV Dock is a RISC-V Linux development kits with high integration, small +size and affordable price designed for opensource developer. It's equipped with +HDMI interface and it supports many screen by its screen convert board. It's +also equipped with many peripherals, including a UAB-A port, 2.4G Wifi-BT module, +an analog microphone and a speaker jack interface. + +How to build +============ + +$ make sipeed_lichee_rv_dock_defconfig +$ make + +Wifi +========== + +Edit board/sipeed/lichee_rv_dock/overlay/etc/wpa_supplicant.conf or +/etc/wpa_supplicant.conf once connected to the board: + +* Replace YOURSSID with your AP ssid +* Replace YOURPASSWD with your AP password + +Bluetooth +========== + +To make the device discoverable and pairable, once connected to the board: + +* bluetoothctl power on +* bluetoothctl discoverable yes +* bluetoothctl pairable yes + +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 + +Connect a TTL UART to the debug connector, insert the microSD card and +plug in a USB-C cable to the PWR connector to boot the system. diff --git a/board/sipeed/maix-bit/linux-cpio.config b/board/sipeed/maix-bit/linux-cpio.config new file mode 100644 index 00000000000..de2f8fd074f --- /dev/null +++ b/board/sipeed/maix-bit/linux-cpio.config @@ -0,0 +1,2 @@ +CONFIG_SOC_CANAAN_K210_DTB_BUILTIN=y +CONFIG_SOC_CANAAN_K210_DTB_SOURCE="sipeed_maix_bit" diff --git a/board/sipeed/maix-bit/readme.txt b/board/sipeed/maix-bit/readme.txt new file mode 100644 index 00000000000..7cc53bca67c --- /dev/null +++ b/board/sipeed/maix-bit/readme.txt @@ -0,0 +1,316 @@ +Sipeed MAIX-Bit Board +===================== + +The Sipeed MAXI-Bit board is a dual-core RISC-V 64-bits board based on the +Canaan Kendryte K210 SoC. + +Prerequisite +------------ + +In order to use the kflash utility to program this board, the user must have +access to the board USB serial device file. The simplest way to do this is to +add your user to the same group as this device file. Assume the device file is +/dev/ttyUSB0, first identify the device group name. In most cases, it is +either "dialout" or "uucp". Also verify that read-write access is enabled for +the group: + +``` +$ ls -l /dev/ttyUSB0 +crw-rw---- 1 root dialout 188, 0 May 26 13:48 /dev/ttyUSB0 +``` + +Then add yourself to that group (dialout in this example): + +``` +$ sudo usermod -a -G dialout $(whoami) +``` + +To enable the above, it is sometimes necessary to logout and login again. + +Buildroot Configuration +----------------------- + +Two buildroot configuration files are provided: + +(1) Direct Linux Kernel Boot + +This is defined by the sipeed_maix_bit_defconfig configuration. This +configuration allows building a bootable kernel image with a built-in initramfs +root file system (the board SD card is not used). The built kernel image can be +flashed directly to the board ROM for direct booting. No boot loader is +required. + +(2) U-Boot SD-Card Boot + +The sipeed_maix_bit_sdcard_defconfig configuration allows building a kernel +image with the root file system on the board SD card. U-Boot is used as the +boot loader. + +Both configuration files will also compile and install the kflash and +pyserial-miniterm host utilities to program bootable image files to the board +and open a serial terminal console. + +Direct Linux Kernel Boot +------------------------- + +Using the sipeed_maix_bit_defconfig configuration, the bootable kernel binary +image is built as follows. + +``` +$ make sipeed_maix_bit_defconfig +$ make +``` + +The bootable binary image is the output/images/loader.bin file. This image file +can be written to the board boot ROM using the kflash utility. + +``` +$ output/host/bin/kflash -b 1500000 -p /dev/ttyUSB0 -t output/images/loader.bin +``` + +Once the kernel image file is fully programmed, a terminal console is open and +the board can be rebooted by pressing the reset button on the board (if it does +not reboot automatically). + +The output will be similar to the following. + +``` +[ 0.000000] Linux version 5.18.0 (foo@bar.com) (riscv64-buildroot-linux-uclibc-gcc.br_real (Buildroot 2022.02-560-g6a2b542a09-dirty) 10.3.0, GNU ld (GNU Binutils) 2.32) #2 SMP Thu Apr 21 14:30:02 JST 2022 +[ 0.000000] Machine model: SiPeed MAIX BiT +[ 0.000000] earlycon: sifive0 at MMIO 0x0000000038000000 (options '115200n8') +[ 0.000000] printk: bootconsole [sifive0] enabled +[ 0.000000] Zone ranges: +[ 0.000000] DMA32 [mem 0x0000000080000000-0x00000000807fffff] +[ 0.000000] Normal empty +[ 0.000000] Movable zone start for each node +[ 0.000000] Early memory node ranges +[ 0.000000] node 0: [mem 0x0000000080000000-0x00000000807fffff] +[ 0.000000] Initmem setup node 0 [mem 0x0000000080000000-0x00000000807fffff] +[ 0.000000] riscv: ISA extensions acdfim +[ 0.000000] riscv: ELF capabilities acdfim +[ 0.000000] percpu: max_distance=0x16000 too large for vmalloc space 0x0 +[ 0.000000] percpu: Embedded 11 pages/cpu s15264 r0 d29792 u45056 +[ 0.000000] percpu: wasting 10 pages per chunk +[ 0.000000] Built 1 zonelists, mobility grouping off. Total pages: 2020 +[ 0.000000] Kernel command line: earlycon console=ttySIF0 +[ 0.000000] Dentry cache hash table entries: 1024 (order: 1, 8192 bytes, linear) +[ 0.000000] Inode-cache hash table entries: 512 (order: 0, 4096 bytes, linear) +[ 0.000000] mem auto-init: stack:off, heap alloc:off, heap free:off +[ 0.000000] Memory: 5996K/8192K available (964K kernel code, 137K rwdata, 205K rodata, 530K init, 66K bss, 2196K reserved, 0K cma-reserved) +[ 0.000000] rcu: Hierarchical RCU implementation. +[ 0.000000] rcu: RCU calculated value of scheduler-enlistment delay is 25 jiffies. +[ 0.000000] NR_IRQS: 64, nr_irqs: 64, preallocated irqs: 0 +[ 0.000000] riscv-intc: 64 local interrupts mapped +[ 0.000000] plic: interrupt-controller@c000000: mapped 65 interrupts with 2 handlers for 4 contexts. +[ 0.000000] k210-clk: clock-controller: CPU running at 390 MHz +[ 0.000000] clint: timer@2000000: timer running at 7800000 Hz +[ 0.000000] clocksource: clint_clocksource: mask: 0xffffffffffffffff max_cycles: 0x3990be68b, max_idle_ns: 881590404272 ns +[ 0.000001] sched_clock: 64 bits at 7MHz, resolution 128ns, wraps every 4398046511054ns +[ 0.008188] Calibrating delay loop (skipped), value calculated using timer frequency.. 15.60 BogoMIPS (lpj=31200) +[ 0.018250] pid_max: default: 4096 minimum: 301 +[ 0.022860] Mount-cache hash table entries: 512 (order: 0, 4096 bytes, linear) +[ 0.029972] Mountpoint-cache hash table entries: 512 (order: 0, 4096 bytes, linear) +[ 0.040244] rcu: Hierarchical SRCU implementation. +[ 0.045121] smp: Bringing up secondary CPUs ... +[ 0.050225] smp: Brought up 1 node, 2 CPUs +[ 0.054355] devtmpfs: initialized +[ 0.071168] clocksource: jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 7645041785100000 ns +[ 0.080240] pinctrl core: initialized pinctrl subsystem +[ 0.119221] clocksource: Switched to clocksource clint_clocksource +[ 0.131498] workingset: timestamp_bits=62 max_order=11 bucket_order=0 +[ 0.176943] k210-sysctl 50440000.syscon: K210 system controller +[ 0.193558] k210-rst 50440000.syscon:reset-controller: K210 reset controller +[ 0.201526] cacheinfo: Unable to detect cache hierarchy for CPU 0 +[ 0.211611] i2c_dev: i2c /dev entries driver +[ 0.221375] k210-fpioa 502b0000.pinmux: K210 FPIOA pin controller +[ 0.233591] 38000000.serial: ttySIF0 at MMIO 0x38000000 (irq = 1, base_baud = 115200) is a SiFive UART v0 +[ 0.242529] printk: console [ttySIF0] enabled +[ 0.242529] printk: console [ttySIF0] enabled +[ 0.251165] printk: bootconsole [sifive0] disabled +[ 0.251165] printk: bootconsole [sifive0] disabled +[ 0.274348] Freeing unused kernel image (initmem) memory: 524K +[ 0.279504] This architecture does not have kernel memory protection. +[ 0.285908] Run /init as init process + __ _ + / / (_) ____ _ _ __ __ + / / | || _ \ | | | |\ \/ / + / /___| || | | || |_| | > < + /_____/|_||_| |_| \____|/_/\_\ + 64-bits RISC-V Kendryte K210 NOMMU + +/ # +``` + +To open a terminal console without re-flashing the board, the pyserial-miniterm +host tool can be used. + +``` +$ output/host/bin/pyserial-miniterm --raw --eol=LF /dev/ttyUSB0 115200 +``` + +The options "--raw" and "--eol=LF" are added here to avoid a double carriage +return each time a command is entered. + + +U-Boot SD-Card Boot +------------------- + +The build procedure is similar to the direct Linux kernel boot case. + +``` +$ make sipeed_maix_bit_sdcard_defconfig +$ make +``` + +The build process will generate two files under the output/images directory. + +* sdcard.img: The image file for the SD card filesystem. This image has 2 + partitions. The first partition is a vfat partition containing the kernel + uImage and the board device tree binary. The second partition is the root + filesystem with busybox installed. The second partition is formatted using + ext2 (rev1). + +* uboot.bin: U-Boot bootable binary to load and boot the kernel from the SD + card. + +The SD card can be prepared by writing the sdcard.img file, as follows. + +``` +$ sudo dd if=output/images/sdcard.img of=/dev/sdX bs=1M +$ sync +$ eject /dev/sdX +``` + +Where /dev/sdX is the device file name of the SD card. Once completed, the SD +card can be inserted into the board and the U-Boot binary image written to the +board boot flash using the kflash utility. + +``` +$ output/host/bin/kflash -b 1500000 -p /dev/ttyUSB0 -t output/images/u-boot.bin +``` + +The above command will program U-Boot image to the board boot ROM and open a +terminal console once the u-boot.bin file is fully programmed. Reboot into the +newly programmed environment by pressing the board reset button. + +The output will be similar to the following. + +``` +U-Boot 2022.04 (May 24 2022 - 17:08:34 +0900) + +DRAM: 8 MiB +Core: 34 devices, 17 uclasses, devicetree: separate +WDT: Not starting watchdog@50400000 +MMC: spi@53000000:slot@0: 0 +Loading Environment from SPIFlash... SF: Detected gd25lq128 with page size 256 Bytes, erase size 4 KiB, total 16 MiB +*** Warning - bad CRC, using default environment + +In: serial@38000000 +Out: serial@38000000 +Err: serial@38000000 +Hit any key to stop autoboot: 0 +1668562 bytes read in 933 ms (1.7 MiB/s) +10468 bytes read in 11 ms (928.7 KiB/s) +## Booting kernel from Legacy Image at 80060000 ... + Image Name: Linux + Image Type: RISC-V Linux Kernel Image (uncompressed) + Data Size: 1668498 Bytes = 1.6 MiB + Load Address: 80000000 + Entry Point: 80000000 + Verifying Checksum ... OK +## Flattened Device Tree blob at 80400000 + Booting using the fdt blob at 0x80400000 + Loading Kernel Image + Loading Device Tree to 00000000803fa000, end 00000000803ff8e3 ... OK + +Starting kernel ... + +[ 0.000000] Linux version 5.18.0 (foo@bar.com) (riscv64-buildroot-linux-uclibc-gcc.br_real (Buildroot 2022.02-1056-gc356b62332) 10.3.0, GNU ld (GNU Binutils) 2.37) #1 SMP Tue May 24 06:45:04 JST 2022 +[ 0.000000] Machine model: SiPeed MAIX BiT +[ 0.000000] earlycon: sifive0 at MMIO 0x0000000038000000 (options '115200n8') +[ 0.000000] printk: bootconsole [sifive0] enabled +[ 0.000000] Zone ranges: +[ 0.000000] DMA32 [mem 0x0000000080000000-0x00000000807fffff] +[ 0.000000] Normal empty +[ 0.000000] Movable zone start for each node +[ 0.000000] Early memory node ranges +[ 0.000000] node 0: [mem 0x0000000080000000-0x00000000807fffff] +[ 0.000000] Initmem setup node 0 [mem 0x0000000080000000-0x00000000807fffff] +[ 0.000000] riscv: base ISA extensions acdfim +[ 0.000000] riscv: ELF capabilities acdfim +[ 0.000000] percpu: max_distance=0x16000 too large for vmalloc space 0x0 +[ 0.000000] percpu: Embedded 11 pages/cpu s15648 r0 d29408 u45056 +[ 0.000000] percpu: wasting 10 pages per chunk +[ 0.000000] Built 1 zonelists, mobility grouping off. Total pages: 2020 +[ 0.000000] Kernel command line: earlycon console=ttySIF0 root=/dev/mmcblk0p2 rootwait ro +[ 0.000000] Dentry cache hash table entries: 1024 (order: 1, 8192 bytes, linear) +[ 0.000000] Inode-cache hash table entries: 512 (order: 0, 4096 bytes, linear) +[ 0.000000] mem auto-init: stack:off, heap alloc:off, heap free:off +[ 0.000000] Memory: 6204K/8192K available (1134K kernel code, 150K rwdata, 239K rodata, 100K init, 68K bss, 1988K reserved, 0K cma-reserved) +[ 0.000000] rcu: Hierarchical RCU implementation. +[ 0.000000] rcu: RCU calculated value of scheduler-enlistment delay is 25 jiffies. +[ 0.000000] NR_IRQS: 64, nr_irqs: 64, preallocated irqs: 0 +[ 0.000000] riscv-intc: 64 local interrupts mapped +[ 0.000000] plic: interrupt-controller@c000000: mapped 65 interrupts with 2 handlers for 4 contexts. +[ 0.000000] k210-clk: clock-controller: CPU running at 390 MHz +[ 0.000000] clint: timer@2000000: timer running at 7800000 Hz +[ 0.000000] clocksource: clint_clocksource: mask: 0xffffffffffffffff max_cycles: 0x3990be68b, max_idle_ns: 881590404272 ns +[ 0.000001] sched_clock: 64 bits at 7MHz, resolution 128ns, wraps every 4398046511054ns +[ 0.008194] Calibrating delay loop (skipped), value calculated using timer frequency.. 15.60 BogoMIPS (lpj=31200) +[ 0.018257] pid_max: default: 4096 minimum: 301 +[ 0.022869] Mount-cache hash table entries: 512 (order: 0, 4096 bytes, linear) +[ 0.029982] Mountpoint-cache hash table entries: 512 (order: 0, 4096 bytes, linear) +[ 0.040424] rcu: Hierarchical SRCU implementation. +[ 0.045397] smp: Bringing up secondary CPUs ... +[ 0.050518] smp: Brought up 1 node, 2 CPUs +[ 0.054676] devtmpfs: initialized +[ 0.072365] clocksource: jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 7645041785100000 ns +[ 0.081396] pinctrl core: initialized pinctrl subsystem +[ 0.123762] clocksource: Switched to clocksource clint_clocksource +[ 0.136796] workingset: timestamp_bits=62 max_order=11 bucket_order=0 +[ 0.181768] k210-sysctl 50440000.syscon: K210 system controller +[ 0.198397] k210-rst 50440000.syscon:reset-controller: K210 reset controller +[ 0.207373] cacheinfo: Unable to detect cache hierarchy for CPU 0 +[ 0.218270] spi spi1.0: setup: ignoring unsupported mode bits a00 +[ 0.224786] i2c_dev: i2c /dev entries driver +[ 0.235984] k210-fpioa 502b0000.pinmux: K210 FPIOA pin controller +[ 0.249172] 38000000.serial: ttySIF0 at MMIO 0x38000000 (irq = 1, base_baud = 115200) is a SiFive UART v0 +[ 0.258078] printk: console [ttySIF0] enabled +[ 0.258078] printk: console [ttySIF0] enabled +[ 0.266707] printk: bootconsole [sifive0] disabled +[ 0.266707] printk: bootconsole [sifive0] disabled +[ 0.307910] mmc_spi spi3.0: SD/MMC host mmc0, no WP, no poweroff, cd polling +[ 0.319869] Waiting for root device /dev/mmcblk0p2... +[ 0.345016] mmc0: host does not support reading read-only switch, assuming write-enable +[ 0.352330] mmc0: new SDHC card on SPI +[ 0.359338] mmcblk0: mmc0:0000 SA16G 14.5 GiB +[ 0.367589] random: fast init done +[ 0.371533] mmcblk0: p1 p2 +[ 0.391794] random: get_random_bytes called from 0x0000000080095ae8 with crng_init=1 +[ 0.393388] VFS: Mounted root (ext2 filesystem) readonly on device 179:2. +[ 0.411377] devtmpfs: mounted +[ 0.413922] Freeing unused kernel image (initmem) memory: 96K +[ 0.419344] This architecture does not have kernel memory protection. +[ 0.425777] Run /sbin/init as init process +[ 0.718314] random: crng init done +[ 0.799903] init (1): drop_caches: 3 + __ _ + / / (_) ____ _ _ __ __ + / / | || _ \ | | | |\ \/ / + / /___| || | | || |_| | > < + /_____/|_||_| |_| \____|/_/\_\ + 64-bits RISC-V Kendryte K210 NOMMU + +/ # +``` + +Of note is that the kernel mounts the SD card as read-only by default to avoid +corruptions of the ext2 root file system when the board is powered down. This +is recommended as this board does not support clean shutdown or halt. + +Similarly to the initramfs build case, a console can be open without +re-flashing the board using the host tool pyserial-miniterm. + +``` +$ output/host/bin/pyserial-miniterm --raw --eol=LF /dev/ttyUSB0 115200 +``` diff --git a/board/sipeed/maix-dock/linux-cpio.config b/board/sipeed/maix-dock/linux-cpio.config new file mode 100644 index 00000000000..b1ca3166f85 --- /dev/null +++ b/board/sipeed/maix-dock/linux-cpio.config @@ -0,0 +1,2 @@ +CONFIG_SOC_CANAAN_K210_DTB_BUILTIN=y +CONFIG_SOC_CANAAN_K210_DTB_SOURCE="sipeed_maix_dock" diff --git a/board/sipeed/maix-dock/readme.txt b/board/sipeed/maix-dock/readme.txt new file mode 100644 index 00000000000..5971f6e50bc --- /dev/null +++ b/board/sipeed/maix-dock/readme.txt @@ -0,0 +1,321 @@ +Sipeed MAIX-Dock Board +====================== + +The Sipeed MAXI-Dock board is a dual-core RISC-V 64-bits board based on the +Canaan Kendryte K210 SoC. + +Prerequisite +------------ + +In order to use the kflash utility to program this board, the user must have +access to the board USB serial device file. The simplest way to do this is to +add your user to the same group as this device file. Assume the device file is +/dev/ttyUSB0, first identify the device group name. In most cases, it is +either "dialout" or "uucp". Also verify that read-write access is enabled for +the group: + +``` +$ ls -l /dev/ttyUSB0 +crw-rw---- 1 root dialout 188, 0 May 26 13:48 /dev/ttyUSB0 +``` + +Then add yourself to that group (dialout in this example): + +``` +$ sudo usermod -a -G dialout $(whoami) +``` + +To enable the above, it is sometimes necessary to logout and login again. + +Buildroot Configuration +----------------------- + +Two buildroot configuration files are provided: + +(1) Direct Linux Kernel Boot + +This is defined by the sipeed_maix_dock_defconfig configuration. This +configuration allows building a bootable kernel image with a built-in initramfs +root file system (the board SD card is not used). The built kernel image can be +flashed directly to the board ROM for direct booting. No boot loader is +required. + +(2) U-Boot SD-Card Boot + +The sipeed_maix_dock_sdcard_defconfig configuration allows building a kernel +image with the root file system on the board SD card. U-Boot is used as the +boot loader. + +Note: U-Boot does not natively support the Sipeed MAIX-Dock board. However, the +board and device tree differences with the Sipeed MAIX-Bit board are small +enough for U-Boot to work. + +Both configuration files will also compile the pyserial-miniterm host tool open +a serial terminal console for the board. + +Direct Linux Kernel Boot +------------------------- + +Using the sipeed_maix_dock_defconfig configuration, the bootable kernel binary +image is built as follows. + +``` +$ make sipeed_maix_dock_defconfig +$ make +``` + +Both configuration files will also compile and install the kflash and +pyserial-miniterm host utilities to program bootable image files to the board +and open a serial terminal console. + +``` +$ output/host/bin/kflash -b 1500000 -p /dev/ttyUSB0 -t output/images/loader.bin +``` + +Once the kernel image file is fully programmed, a terminal console is open and +the board can be rebooted by pressing the reset button on the board (if it does +not reboot automatically). + +The output will be similar to the following. + +``` +[ 0.000000] Linux version 5.18.0 (foo@bar.com) (riscv64-buildroot-linux-uclibc-gcc.br_real (Buildroot 2022.02-560-g6a2b542a09-dirty) 10.3.0, GNU ld (GNU Binutils) 2.32) #2 SMP Thu Apr 21 15:47:42 JST 2022 +[ 0.000000] Machine model: SiPeed MAIX Dock +[ 0.000000] earlycon: sifive0 at MMIO 0x0000000038000000 (options '115200n8') +[ 0.000000] printk: bootconsole [sifive0] enabled +[ 0.000000] Zone ranges: +[ 0.000000] DMA32 [mem 0x0000000080000000-0x00000000807fffff] +[ 0.000000] Normal empty +[ 0.000000] Movable zone start for each node +[ 0.000000] Early memory node ranges +[ 0.000000] node 0: [mem 0x0000000080000000-0x00000000807fffff] +[ 0.000000] Initmem setup node 0 [mem 0x0000000080000000-0x00000000807fffff] +[ 0.000000] riscv: ISA extensions acdfim +[ 0.000000] riscv: ELF capabilities acdfim +[ 0.000000] percpu: max_distance=0x16000 too large for vmalloc space 0x0 +[ 0.000000] percpu: Embedded 11 pages/cpu s15264 r0 d29792 u45056 +[ 0.000000] percpu: wasting 10 pages per chunk +[ 0.000000] Built 1 zonelists, mobility grouping off. Total pages: 2020 +[ 0.000000] Kernel command line: earlycon console=ttySIF0 +[ 0.000000] Dentry cache hash table entries: 1024 (order: 1, 8192 bytes, linear) +[ 0.000000] Inode-cache hash table entries: 512 (order: 0, 4096 bytes, linear) +[ 0.000000] mem auto-init: stack:off, heap alloc:off, heap free:off +[ 0.000000] Memory: 5980K/8192K available (964K kernel code, 137K rwdata, 205K rodata, 546K init, 66K bss, 2212K reserved, 0K cma-reserved) +[ 0.000000] rcu: Hierarchical RCU implementation. +[ 0.000000] rcu: RCU calculated value of scheduler-enlistment delay is 25 jiffies. +[ 0.000000] NR_IRQS: 64, nr_irqs: 64, preallocated irqs: 0 +[ 0.000000] riscv-intc: 64 local interrupts mapped +[ 0.000000] plic: interrupt-controller@c000000: mapped 65 interrupts with 2 handlers for 4 contexts. +[ 0.000000] k210-clk: clock-controller: CPU running at 390 MHz +[ 0.000000] clint: timer@2000000: timer running at 7800000 Hz +[ 0.000000] clocksource: clint_clocksource: mask: 0xffffffffffffffff max_cycles: 0x3990be68b, max_idle_ns: 881590404272 ns +[ 0.000001] sched_clock: 64 bits at 7MHz, resolution 128ns, wraps every 4398046511054ns +[ 0.008187] Calibrating delay loop (skipped), value calculated using timer frequency.. 15.60 BogoMIPS (lpj=31200) +[ 0.018250] pid_max: default: 4096 minimum: 301 +[ 0.022859] Mount-cache hash table entries: 512 (order: 0, 4096 bytes, linear) +[ 0.029971] Mountpoint-cache hash table entries: 512 (order: 0, 4096 bytes, linear) +[ 0.040238] rcu: Hierarchical SRCU implementation. +[ 0.045110] smp: Bringing up secondary CPUs ... +[ 0.050215] smp: Brought up 1 node, 2 CPUs +[ 0.054345] devtmpfs: initialized +[ 0.071112] clocksource: jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 7645041785100000 ns +[ 0.080182] pinctrl core: initialized pinctrl subsystem +[ 0.120689] clocksource: Switched to clocksource clint_clocksource +[ 0.133165] workingset: timestamp_bits=62 max_order=11 bucket_order=0 +[ 0.181750] k210-sysctl 50440000.syscon: K210 system controller +[ 0.198612] k210-rst 50440000.syscon:reset-controller: K210 reset controller +[ 0.206644] cacheinfo: Unable to detect cache hierarchy for CPU 0 +[ 0.216569] i2c_dev: i2c /dev entries driver +[ 0.225905] k210-fpioa 502b0000.pinmux: K210 FPIOA pin controller +[ 0.238866] 38000000.serial: ttySIF0 at MMIO 0x38000000 (irq = 1, base_baud = 115200) is a SiFive UART v0 +[ 0.247778] printk: console [ttySIF0] enabled +[ 0.247778] printk: console [ttySIF0] enabled +[ 0.256459] printk: bootconsole [sifive0] disabled +[ 0.256459] printk: bootconsole [sifive0] disabled +[ 0.268225] panel@0 enforce active low on chipselect handle +[ 0.285238] Freeing unused kernel image (initmem) memory: 540K +[ 0.290372] This architecture does not have kernel memory protection. +[ 0.296807] Run /init as init process + __ _ + / / (_) ____ _ _ __ __ + / / | || _ \ | | | |\ \/ / + / /___| || | | || |_| | > < + /_____/|_||_| |_| \____|/_/\_\ + 64-bits RISC-V Kendryte K210 NOMMU + +/ # +``` + +To open a terminal console without re-flashing the board, the pyserial-miniterm +host tool can be used. + +``` +$ output/host/bin/pyserial-miniterm --raw --eol=LF /dev/ttyUSB0 115200 +``` + +The options "--raw" and "--eol=LF" are added here to avoid a double carriage +return each time a command is entered. + + +U-Boot SD-Card Boot +------------------- + +The build procedure is similar to the built-in initramfs case. + +``` +$ make sipeed_maix_dock_sdcard_defconfig +$ make +``` + +The build process will generate two files under the output/images directory. + +* sdcard.img: The image file for the SD card filesystem. This image has 2 + partitions. The first partition is a vfat partition containing the kernel + uImage and the board device tree binary. The second partition is the root + filesystem with busybox installed. The second partition is formatted using + ext2 (rev1). + +* uboot.bin: U-Boot bootable binary to load and boot the kernel from the SD + card. + +The SD card can be prepared by writing the sdcard.img file, as follows. + +``` +$ sudo dd if=output/images/sdcard.img of=/dev/sdX bs=1M +$ sync +$ eject /dev/sdX +``` + +Where /dev/sdX is the device file name of the SD card. Once completed, the SD +card can be inserted into the board and the U-Boot binary image written to the +board boot flash using the kflash utility. + +``` +$ output/host/bin/kflash -b 1500000 -p /dev/ttyUSB0 -t output/images/u-boot.bin +``` + +The above command will program U-Boot image to the board boot ROM and open a +terminal console once the u-boot.bin file is fully programmed. Reboot into the +newly programmed environment by pressing the board reset button if it does not +reboot automatically. + +The output will be similar to the following. + +``` +U-Boot 2022.04 (Apr 21 2022 - 15:59:50 +0900) + +DRAM: 8 MiB +Core: 34 devices, 17 uclasses, devicetree: separate +WDT: Not starting watchdog@50400000 +MMC: spi@53000000:slot@0: 0 +Loading Environment from SPIFlash... SF: Detected w25q128fw with page size 256 Bytes, erase size 4 KiB, total 16 MiB +*** Warning - bad CRC, using default environment + +In: serial@38000000 +Out: serial@38000000 +Err: serial@38000000 +Hit any key to stop autoboot: 0 +1717730 bytes read in 957 ms (1.7 MiB/s) +10382 bytes read in 11 ms (920.9 KiB/s) +## Booting kernel from Legacy Image at 80060000 ... + Image Name: Linux + Image Type: RISC-V Linux Kernel Image (uncompressed) + Data Size: 1717666 Bytes = 1.6 MiB + Load Address: 80000000 + Entry Point: 80000000 + Verifying Checksum ... OK +## Flattened Device Tree blob at 80400000 + Booting using the fdt blob at 0x80400000 + Loading Kernel Image + Loading Device Tree to 00000000803fa000, end 00000000803ff88d ... OK + +Starting kernel ... + +[ 0.000000] Linux version 5.18.0 (foo@bar.com) (riscv64-buildroot-linux-uclibc-gcc.br_real (Buildroot 2022.02-560-g6a2b542a09-dirty) 10.3.0, GNU ld (GNU Binutils) 2.32) #1 SMP Thu Apr 21 16:00:03 JST 2022 +[ 0.000000] Machine model: SiPeed MAIX Dock +[ 0.000000] earlycon: sifive0 at MMIO 0x0000000038000000 (options '115200n8') +[ 0.000000] printk: bootconsole [sifive0] enabled +[ 0.000000] Zone ranges: +[ 0.000000] DMA32 [mem 0x0000000080000000-0x00000000807fffff] +[ 0.000000] Normal empty +[ 0.000000] Movable zone start for each node +[ 0.000000] Early memory node ranges +[ 0.000000] node 0: [mem 0x0000000080000000-0x00000000807fffff] +[ 0.000000] Initmem setup node 0 [mem 0x0000000080000000-0x00000000807fffff] +[ 0.000000] riscv: ISA extensions acdfim +[ 0.000000] riscv: ELF capabilities acdfim +[ 0.000000] percpu: max_distance=0x16000 too large for vmalloc space 0x0 +[ 0.000000] percpu: Embedded 11 pages/cpu s15392 r0 d29664 u45056 +[ 0.000000] percpu: wasting 10 pages per chunk +[ 0.000000] Built 1 zonelists, mobility grouping off. Total pages: 2020 +[ 0.000000] Kernel command line: earlycon console=ttySIF0 root=/dev/mmcblk0p2 rootwait ro +[ 0.000000] Dentry cache hash table entries: 1024 (order: 1, 8192 bytes, linear) +[ 0.000000] Inode-cache hash table entries: 512 (order: 0, 4096 bytes, linear) +[ 0.000000] mem auto-init: stack:off, heap alloc:off, heap free:off +[ 0.000000] Memory: 6156K/8192K available (1180K kernel code, 151K rwdata, 239K rodata, 102K init, 69K bss, 2036K reserved, 0K cma-reserved) +[ 0.000000] rcu: Hierarchical RCU implementation. +[ 0.000000] rcu: RCU calculated value of scheduler-enlistment delay is 25 jiffies. +[ 0.000000] NR_IRQS: 64, nr_irqs: 64, preallocated irqs: 0 +[ 0.000000] riscv-intc: 64 local interrupts mapped +[ 0.000000] plic: interrupt-controller@c000000: mapped 65 interrupts with 2 handlers for 4 contexts. +[ 0.000000] k210-clk: clock-controller: CPU running at 390 MHz +[ 0.000000] clint: timer@2000000: timer running at 7800000 Hz +[ 0.000000] clocksource: clint_clocksource: mask: 0xffffffffffffffff max_cycles: 0x3990be68b, max_idle_ns: 881590404272 ns +[ 0.000001] sched_clock: 64 bits at 7MHz, resolution 128ns, wraps every 4398046511054ns +[ 0.008196] Calibrating delay loop (skipped), value calculated using timer frequency.. 15.60 BogoMIPS (lpj=31200) +[ 0.018256] pid_max: default: 4096 minimum: 301 +[ 0.022876] Mount-cache hash table entries: 512 (order: 0, 4096 bytes, linear) +[ 0.029980] Mountpoint-cache hash table entries: 512 (order: 0, 4096 bytes, linear) +[ 0.040401] rcu: Hierarchical SRCU implementation. +[ 0.045379] smp: Bringing up secondary CPUs ... +[ 0.050494] smp: Brought up 1 node, 2 CPUs +[ 0.054656] devtmpfs: initialized +[ 0.072338] clocksource: jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 7645041785100000 ns +[ 0.081415] pinctrl core: initialized pinctrl subsystem +[ 0.123902] clocksource: Switched to clocksource clint_clocksource +[ 0.136898] workingset: timestamp_bits=62 max_order=11 bucket_order=0 +[ 0.182570] k210-sysctl 50440000.syscon: K210 system controller +[ 0.198158] k210-rst 50440000.syscon:reset-controller: K210 reset controller +[ 0.207473] cacheinfo: Unable to detect cache hierarchy for CPU 0 +[ 0.219724] i2c_dev: i2c /dev entries driver +[ 0.230080] k210-fpioa 502b0000.pinmux: K210 FPIOA pin controller +[ 0.243091] 38000000.serial: ttySIF0 at MMIO 0x38000000 (irq = 1, base_baud = 115200) is a SiFive UART v0 +[ 0.252034] printk: console [ttySIF0] enabled +[ 0.252034] printk: console [ttySIF0] enabled +[ 0.260656] printk: bootconsole [sifive0] disabled +[ 0.260656] printk: bootconsole [sifive0] disabled +[ 0.272546] panel@0 enforce active low on chipselect handle +[ 0.308098] mmc_spi spi3.0: SD/MMC host mmc0, no WP, no poweroff, cd polling +[ 0.320197] Waiting for root device /dev/mmcblk0p2... +[ 0.344667] mmc0: host does not support reading read-only switch, assuming write-enable +[ 0.352020] mmc0: new SDHC card on SPI +[ 0.358566] mmcblk0: mmc0:0000 SA16G 14.5 GiB +[ 0.366866] random: fast init done +[ 0.371439] mmcblk0: p1 p2 +[ 0.391314] random: get_random_bytes called from 0x000000008009b7d2 with crng_init=1 +[ 0.400977] VFS: Mounted root (ext2 filesystem) readonly on device 179:2. +[ 0.410966] devtmpfs: mounted +[ 0.413521] Freeing unused kernel image (initmem) memory: 96K +[ 0.418944] This architecture does not have kernel memory protection. +[ 0.425370] Run /sbin/init as init process +[ 0.633502] random: crng init done + __ _ + / / (_) ____ _ _ __ __ + / / | || _ \ | | | |\ \/ / + / /___| || | | || |_| | > < + /_____/|_||_| |_| \____|/_/\_\ + 64-bits RISC-V Kendryte K210 NOMMU + +/ # +``` + +Of note is that the kernel mounts the SD card as read-only by default to avoid +corruptions of the ext2 root file system when the board is powered down. This +is recommended as this board does not support clean shutdown or halt. + +Similarly to the initramfs build case, a console can be open without +re-flashing the board using the host tool pyserial-miniterm. + +``` +$ output/host/bin/pyserial-miniterm --raw --eol=LF /dev/ttyUSB0 115200 +``` diff --git a/board/sipeed/maix-go/linux-cpio.config b/board/sipeed/maix-go/linux-cpio.config new file mode 100644 index 00000000000..ea8c30e266b --- /dev/null +++ b/board/sipeed/maix-go/linux-cpio.config @@ -0,0 +1,2 @@ +CONFIG_SOC_CANAAN_K210_DTB_BUILTIN=y +CONFIG_SOC_CANAAN_K210_DTB_SOURCE="sipeed_maix_go" diff --git a/board/sipeed/maix-go/readme.txt b/board/sipeed/maix-go/readme.txt new file mode 100644 index 00000000000..9f930fb6ac4 --- /dev/null +++ b/board/sipeed/maix-go/readme.txt @@ -0,0 +1,320 @@ +Sipeed MAIX-Go Board +==================== + +The Sipeed MAXI-Go board is a dual-core RISC-V 64-bits board based on the +Canaan Kendryte K210 SoC. + +Prerequisite +------------ + +In order to use the kflash utility to program this board, the user must have +access to the board USB serial device file. The simplest way to do this is to +add your user to the same group as this device file. Assume the device file is +/dev/ttyUSB0, first identify the device group name. In most cases, it is +either "dialout" or "uucp". Also verify that read-write access is enabled for +the group: + +``` +$ ls -l /dev/ttyUSB0 +crw-rw---- 1 root dialout 188, 0 May 26 13:48 /dev/ttyUSB0 +``` + +Then add yourself to that group (dialout in this example): + +``` +$ sudo usermod -a -G dialout $(whoami) +``` + +To enable the above, it is sometimes necessary to logout and login again. + +Buildroot Configuration +----------------------- + +Two buildroot configuration files are provided: + +(1) Direct Linux Kernel Boot + +This is defined by the sipeed_maix_go_defconfig configuration. This +configuration allows building a bootable kernel image with a built-in initramfs +root file system (the board SD card is not used). The built kernel image can be +flashed directly to the board ROM for direct booting. No boot loader is +required. + +(2) U-Boot SD-Card Boot + +The sipeed_maix_go_sdcard_defconfig configuration allows building a kernel +image with the root file system on the board SD card. U-Boot is used as the +boot loader. + +Note: U-Boot does not natively support the Sipeed MAIX-Go board. However, the +board and device tree differences with the Sipeed MAIX-bit board are small +enough for U-Boot to work. + +Both configuration files will also compile and install the kflash and +pyserial-miniterm host utilities to program bootable image files to the board +and open a serial terminal console. + +Direct Linux Kernel Boot +------------------------- + +Using the sipeed_maix_go_defconfig configuration, the bootable kernel binary +image is built as follows. + +``` +$ make sipeed_maix_go_defconfig +$ make +``` + +The bootable binary image is the output/images/loader.bin file. This image file +can be written to the board boot flash using the kflash utility. + +``` +$ output/host/bin/kflash -b 1500000 -p /dev/ttyUSB0 -t output/images/loader.bin +``` + +Once the kernel image file is fully programmed, a terminal console is open and +the board can be rebooted by pressing the reset button on the board (if it does +not reboot automatically). + +The output will be similar to the following. + +``` +[ 0.000000] Linux version 5.17.0 (foo@bar.com) (riscv64-buildroot-linux-uclibc-gcc.br_real (Buildroot 2022.02-560-g6a2b542a09-dirty) 10.3.0, GNU ld (GNU Binutils) 2.32) #2 SMP Thu Apr 21 16:09:24 JST 2022 +[ 0.000000] Machine model: SiPeed MAIX GO +[ 0.000000] earlycon: sifive0 at MMIO 0x0000000038000000 (options '115200n8') +[ 0.000000] printk: bootconsole [sifive0] enabled +[ 0.000000] Zone ranges: +[ 0.000000] DMA32 [mem 0x0000000080000000-0x00000000807fffff] +[ 0.000000] Normal empty +[ 0.000000] Movable zone start for each node +[ 0.000000] Early memory node ranges +[ 0.000000] node 0: [mem 0x0000000080000000-0x00000000807fffff] +[ 0.000000] Initmem setup node 0 [mem 0x0000000080000000-0x00000000807fffff] +[ 0.000000] riscv: ISA extensions acdfim +[ 0.000000] riscv: ELF capabilities acdfim +[ 0.000000] percpu: max_distance=0x16000 too large for vmalloc space 0x0 +[ 0.000000] percpu: Embedded 11 pages/cpu s15264 r0 d29792 u45056 +[ 0.000000] percpu: wasting 10 pages per chunk +[ 0.000000] Built 1 zonelists, mobility grouping off. Total pages: 2020 +[ 0.000000] Kernel command line: earlycon console=ttySIF0 +[ 0.000000] Dentry cache hash table entries: 1024 (order: 1, 8192 bytes, linear) +[ 0.000000] Inode-cache hash table entries: 512 (order: 0, 4096 bytes, linear) +[ 0.000000] mem auto-init: stack:off, heap alloc:off, heap free:off +[ 0.000000] Memory: 5980K/8192K available (964K kernel code, 137K rwdata, 205K rodata, 546K init, 66K bss, 2212K reserved, 0K cma-reserved) +[ 0.000000] rcu: Hierarchical RCU implementation. +[ 0.000000] rcu: RCU calculated value of scheduler-enlistment delay is 25 jiffies. +[ 0.000000] NR_IRQS: 64, nr_irqs: 64, preallocated irqs: 0 +[ 0.000000] riscv-intc: 64 local interrupts mapped +[ 0.000000] plic: interrupt-controller@c000000: mapped 65 interrupts with 2 handlers for 4 contexts. +[ 0.000000] k210-clk: clock-controller: CPU running at 390 MHz +[ 0.000000] clint: timer@2000000: timer running at 7800000 Hz +[ 0.000000] clocksource: clint_clocksource: mask: 0xffffffffffffffff max_cycles: 0x3990be68b, max_idle_ns: 881590404272 ns +[ 0.000001] sched_clock: 64 bits at 7MHz, resolution 128ns, wraps every 4398046511054ns +[ 0.008193] Calibrating delay loop (skipped), value calculated using timer frequency.. 15.60 BogoMIPS (lpj=31200) +[ 0.018250] pid_max: default: 4096 minimum: 301 +[ 0.022862] Mount-cache hash table entries: 512 (order: 0, 4096 bytes, linear) +[ 0.029971] Mountpoint-cache hash table entries: 512 (order: 0, 4096 bytes, linear) +[ 0.040239] rcu: Hierarchical SRCU implementation. +[ 0.045118] smp: Bringing up secondary CPUs ... +[ 0.050204] smp: Brought up 1 node, 2 CPUs +[ 0.054336] devtmpfs: initialized +[ 0.071519] clocksource: jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 7645041785100000 ns +[ 0.080591] pinctrl core: initialized pinctrl subsystem +[ 0.121163] clocksource: Switched to clocksource clint_clocksource +[ 0.133221] workingset: timestamp_bits=62 max_order=11 bucket_order=0 +[ 0.180960] k210-sysctl 50440000.syscon: K210 system controller +[ 0.196811] k210-rst 50440000.syscon:reset-controller: K210 reset controller +[ 0.204879] cacheinfo: Unable to detect cache hierarchy for CPU 0 +[ 0.214087] i2c_dev: i2c /dev entries driver +[ 0.222736] k210-fpioa 502b0000.pinmux: K210 FPIOA pin controller +[ 0.236173] 38000000.serial: ttySIF0 at MMIO 0x38000000 (irq = 1, base_baud = 115200) is a SiFive UART v0 +[ 0.245104] printk: console [ttySIF0] enabled +[ 0.245104] printk: console [ttySIF0] enabled +[ 0.253726] printk: bootconsole [sifive0] disabled +[ 0.253726] printk: bootconsole [sifive0] disabled +[ 0.265588] panel@0 enforce active low on chipselect handle +[ 0.282358] Freeing unused kernel image (initmem) memory: 540K +[ 0.287492] This architecture does not have kernel memory protection. +[ 0.293926] Run /init as init process + __ _ + / / (_) ____ _ _ __ __ + / / | || _ \ | | | |\ \/ / + / /___| || | | || |_| | > < + /_____/|_||_| |_| \____|/_/\_\ + 64-bits RISC-V Kendryte K210 NOMMU + +/ # +``` + +To open a terminal console without re-flashing the board, the pyserial-miniterm +host tool can be used. + +``` +$ output/host/bin/pyserial-miniterm --raw --eol=LF /dev/ttyUSB0 115200 +``` + +The options "--raw" and "--eol=LF" are added here to avoid a double carriage +return each time a command is entered. + + +U-Boot SD-Card Boot +------------------- + +The build procedure is similar to the built-in initramfs case. + +``` +$ make sipeed_maix_go_sdcard_defconfig +$ make +``` + +The build process will generate two files under the output/images directory. + +* sdcard.img: The image file for the SD card filesystem. This image has 2 + partitions. The first partition is a vfat partition containing the kernel + uImage and the board device tree binary. The second partition is the root + filesystem with busybox installed. The second partition is formatted using + ext2 (rev1). + +* uboot.bin: U-Boot bootable binary to load and boot the kernel from the SD + card. + +The SD card can be prepared by writing the sdcard.img file, as follows. + +``` +$ sudo dd if=output/images/sdcard.img of=/dev/sdX bs=1M +$ sync +$ eject /dev/sdX +``` + +Where /dev/sdX is the device file name of the SD card. Once completed, the SD +card can be inserted into the board and the U-Boot binary image written to the +board boot flash using the kflash utility. + +``` +$ output/host/bin/kflash -b 1500000 -p /dev/ttyUSB0 -t output/images/u-boot.bin +``` + +The above command will program U-Boot image to the board boot ROM and open a +terminal console once the u-boot.bin file is fully programmed. Reboot into the +newly programmed environment by pressing the board reset button. + +The output will be similar to the following. + +``` +U-Boot 2022.04 (Apr 21 2022 - 16:28:58 +0900) + +DRAM: 8 MiB +Core: 34 devices, 17 uclasses, devicetree: separate +WDT: Not starting watchdog@50400000 +MMC: spi@53000000:slot@0: 0 +Loading Environment from SPIFlash... SF: Detected gd25lq128 with page size 256 Bytes, erase size 4 KiB, total 16 MiB +*** Warning - bad CRC, using default environment + +In: serial@38000000 +Out: serial@38000000 +Err: serial@38000000 +Hit any key to stop autoboot: 0 +1717730 bytes read in 956 ms (1.7 MiB/s) +10502 bytes read in 11 ms (931.6 KiB/s) +## Booting kernel from Legacy Image at 80060000 ... + Image Name: Linux + Image Type: RISC-V Linux Kernel Image (uncompressed) + Data Size: 1717666 Bytes = 1.6 MiB + Load Address: 80000000 + Entry Point: 80000000 + Verifying Checksum ... OK +## Flattened Device Tree blob at 80400000 + Booting using the fdt blob at 0x80400000 + Loading Kernel Image + Loading Device Tree to 00000000803fa000, end 00000000803ff905 ... OK + +Starting kernel ... + +[ 0.000000] Linux version 5.17.0 (foo@bar.com) (riscv64-buildroot-linux-uclibc-gcc.br_real (Buildroot 2022.02-560-g6a2b542a09-dirty) 10.3.0, GNU ld (GNU Binutils) 2.32) #1 SMP Thu Apr 21 16:29:10 JST 2022 +[ 0.000000] Machine model: SiPeed MAIX GO +[ 0.000000] earlycon: sifive0 at MMIO 0x0000000038000000 (options '115200n8') +[ 0.000000] printk: bootconsole [sifive0] enabled +[ 0.000000] Zone ranges: +[ 0.000000] DMA32 [mem 0x0000000080000000-0x00000000807fffff] +[ 0.000000] Normal empty +[ 0.000000] Movable zone start for each node +[ 0.000000] Early memory node ranges +[ 0.000000] node 0: [mem 0x0000000080000000-0x00000000807fffff] +[ 0.000000] Initmem setup node 0 [mem 0x0000000080000000-0x00000000807fffff] +[ 0.000000] riscv: ISA extensions acdfim +[ 0.000000] riscv: ELF capabilities acdfim +[ 0.000000] percpu: max_distance=0x16000 too large for vmalloc space 0x0 +[ 0.000000] percpu: Embedded 11 pages/cpu s15392 r0 d29664 u45056 +[ 0.000000] percpu: wasting 10 pages per chunk +[ 0.000000] Built 1 zonelists, mobility grouping off. Total pages: 2020 +[ 0.000000] Kernel command line: earlycon console=ttySIF0 root=/dev/mmcblk0p2 rootwait ro +[ 0.000000] Dentry cache hash table entries: 1024 (order: 1, 8192 bytes, linear) +[ 0.000000] Inode-cache hash table entries: 512 (order: 0, 4096 bytes, linear) +[ 0.000000] mem auto-init: stack:off, heap alloc:off, heap free:off +[ 0.000000] Memory: 6156K/8192K available (1180K kernel code, 151K rwdata, 239K rodata, 102K init, 69K bss, 2036K reserved, 0K cma-reserved) +[ 0.000000] rcu: Hierarchical RCU implementation. +[ 0.000000] rcu: RCU calculated value of scheduler-enlistment delay is 25 jiffies. +[ 0.000000] NR_IRQS: 64, nr_irqs: 64, preallocated irqs: 0 +[ 0.000000] riscv-intc: 64 local interrupts mapped +[ 0.000000] plic: interrupt-controller@c000000: mapped 65 interrupts with 2 handlers for 4 contexts. +[ 0.000000] k210-clk: clock-controller: CPU running at 390 MHz +[ 0.000000] clint: timer@2000000: timer running at 7800000 Hz +[ 0.000000] clocksource: clint_clocksource: mask: 0xffffffffffffffff max_cycles: 0x3990be68b, max_idle_ns: 881590404272 ns +[ 0.000001] sched_clock: 64 bits at 7MHz, resolution 128ns, wraps every 4398046511054ns +[ 0.008201] Calibrating delay loop (skipped), value calculated using timer frequency.. 15.60 BogoMIPS (lpj=31200) +[ 0.018256] pid_max: default: 4096 minimum: 301 +[ 0.022875] Mount-cache hash table entries: 512 (order: 0, 4096 bytes, linear) +[ 0.029983] Mountpoint-cache hash table entries: 512 (order: 0, 4096 bytes, linear) +[ 0.040405] rcu: Hierarchical SRCU implementation. +[ 0.045387] smp: Bringing up secondary CPUs ... +[ 0.050501] smp: Brought up 1 node, 2 CPUs +[ 0.054662] devtmpfs: initialized +[ 0.072840] clocksource: jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 7645041785100000 ns +[ 0.081918] pinctrl core: initialized pinctrl subsystem +[ 0.124601] clocksource: Switched to clocksource clint_clocksource +[ 0.137869] workingset: timestamp_bits=62 max_order=11 bucket_order=0 +[ 0.183507] k210-sysctl 50440000.syscon: K210 system controller +[ 0.199987] k210-rst 50440000.syscon:reset-controller: K210 reset controller +[ 0.209219] cacheinfo: Unable to detect cache hierarchy for CPU 0 +[ 0.221062] i2c_dev: i2c /dev entries driver +[ 0.232254] k210-fpioa 502b0000.pinmux: K210 FPIOA pin controller +[ 0.245342] 38000000.serial: ttySIF0 at MMIO 0x38000000 (irq = 1, base_baud = 115200) is a SiFive UART v0 +[ 0.254281] printk: console [ttySIF0] enabled +[ 0.254281] printk: console [ttySIF0] enabled +[ 0.262908] printk: bootconsole [sifive0] disabled +[ 0.262908] printk: bootconsole [sifive0] disabled +[ 0.274939] panel@0 enforce active low on chipselect handle +[ 0.308760] mmc_spi spi3.0: SD/MMC host mmc0, no WP, no poweroff, cd polling +[ 0.321220] Waiting for root device /dev/mmcblk0p2... +[ 0.344805] mmc0: host does not support reading read-only switch, assuming write-enable +[ 0.352142] mmc0: new SDHC card on SPI +[ 0.358622] mmcblk0: mmc0:0000 SA16G 14.5 GiB +[ 0.366636] random: fast init done +[ 0.371323] mmcblk0: p1 p2 +[ 0.392887] random: get_random_bytes called from 0x000000008009b7d2 with crng_init=1 +[ 0.394338] VFS: Mounted root (ext2 filesystem) readonly on device 179:2. +[ 0.411277] devtmpfs: mounted +[ 0.413836] Freeing unused kernel image (initmem) memory: 96K +[ 0.419267] This architecture does not have kernel memory protection. +[ 0.425683] Run /sbin/init as init process +[ 0.594251] random: crng init done + __ _ + / / (_) ____ _ _ __ __ + / / | || _ \ | | | |\ \/ / + / /___| || | | || |_| | > < + /_____/|_||_| |_| \____|/_/\_\ + 64-bits RISC-V Kendryte K210 NOMMU + +/ # +``` + +Of note is that the kernel mounts the SD card as read-only by default to avoid +corruptions of the ext2 root file system when the board is powered down. This +is recommended as this board does not support clean shutdown or halt. + +Similarly to the initramfs build case, a console can be open without +re-flashing the board using the host tool pyserial-miniterm. + +``` +$ output/host/bin/pyserial-miniterm --raw --eol=LF /dev/ttyUSB0 115200 +``` diff --git a/board/sipeed/maixduino/linux-cpio.config b/board/sipeed/maixduino/linux-cpio.config new file mode 100644 index 00000000000..049a2550c5f --- /dev/null +++ b/board/sipeed/maixduino/linux-cpio.config @@ -0,0 +1,2 @@ +CONFIG_SOC_CANAAN_K210_DTB_BUILTIN=y +CONFIG_SOC_CANAAN_K210_DTB_SOURCE="sipeed_maixduino" diff --git a/board/sipeed/maixduino/readme.txt b/board/sipeed/maixduino/readme.txt new file mode 100644 index 00000000000..53a9e5c2ac6 --- /dev/null +++ b/board/sipeed/maixduino/readme.txt @@ -0,0 +1,292 @@ +Sipeed MAIXDUINO Board +====================== + +The Sipeed MAIXDUINO board is a dual-core RISC-V 64-bits board based on the +Canaan Kendryte K210 SoC. This board has the same form factor as the Arduino +UNO board. + +Prerequisite +------------ + +In order to use the kflash utility to program this board, the user must have +access to the board USB serial device file. The simplest way to do this is to +add your user to the same group as this device file. Assume the device file is +/dev/ttyUSB0, first identify the device group name. In most cases, it is +either "dialout" or "uucp". Also verify that read-write access is enabled for +the group: + +``` +$ ls -l /dev/ttyUSB0 +crw-rw---- 1 root dialout 188, 0 May 26 13:48 /dev/ttyUSB0 +``` + +Then add yourself to that group (dialout in this example): + +``` +$ sudo usermod -a -G dialout $(whoami) +``` + +To enable the above, it is sometimes necessary to logout and login again. + +Buildroot Configuration +----------------------- + +Two buildroot configurations are provided: + +(1) Direct Linux Kernel Boot + +This is defined by the sipeed_maixduino_defconfig configuration. This +configuration allows building a bootable kernel image with a built-in initramfs +root file system (the board SD card is not used). The built kernel image can be +flashed directly to the board ROM for direct booting. No boot loader is +required. + +(2) U-Boot SD-Card Boot + +The sipeed_maixduino_sdcard_defconfig configuration allows building a kernel +image with the root file system on the board SD card. U-Boot is used as the +boot loader. + +Note: U-Boot does not natively support the Sipeed MAIXDUINO board. However, the +board and device tree differences with the Sipeed MAIX-bit board are small +enough for U-Boot to work. + +Both configuration files will also compile and install the kflash and +pyserial-miniterm host utilities to program bootable image files to the board +and open a serial terminal console. + +Direct Linux Kernel Boot +------------------------ + +Using the sipeed_maixduino_defconfig configuration, the bootable kernel binary +image is built as follows. + +``` +$ make sipeed_maixduino_defconfig +$ make +``` + +The bootable binary image is the output/images/loader.bin file. This image file +can be written to the board boot flash using the kflash utility. + +``` +$ output/host/bin/kflash -b 1500000 -p /dev/ttyUSB0 -t output/images/loader.bin +``` + +Once the kernel image file is fully programmed, a terminal console is open and +the board can be rebooted by pressing the reset button on the board (if it does +not reboot automatically). + +The output will be similar to the following. + +``` +[ 0.000000] Linux version 5.18.0 (foo@bar.com) (riscv64-buildroot-linux-uclibc-gcc.br_real (Buildroot 2022.02-560-g6a2b542a09-dirty) 10.3.0, GNU ld (GNU Binutils) 2.32) #2 SMP Thu Apr 21 15:16:00 JST 2022 +[ 0.000000] Machine model: SiPeed MAIXDUINO +[ 0.000000] earlycon: sifive0 at MMIO 0x0000000038000000 (options '115200n8') +[ 0.000000] printk: bootconsole [sifive0] enabled +[ 0.000000] Zone ranges: +[ 0.000000] DMA32 [mem 0x0000000080000000-0x00000000807fffff] +[ 0.000000] Normal empty +[ 0.000000] Movable zone start for each node +[ 0.000000] Early memory node ranges +[ 0.000000] node 0: [mem 0x0000000080000000-0x00000000807fffff] +[ 0.000000] Initmem setup node 0 [mem 0x0000000080000000-0x00000000807fffff] +[ 0.000000] riscv: ISA extensions acdfim +[ 0.000000] riscv: ELF capabilities acdfim +[ 0.000000] percpu: max_distance=0x16000 too large for vmalloc space 0x0 +[ 0.000000] percpu: Embedded 11 pages/cpu s15264 r0 d29792 u45056 +[ 0.000000] percpu: wasting 10 pages per chunk +[ 0.000000] Built 1 zonelists, mobility grouping off. Total pages: 2020 +[ 0.000000] Kernel command line: earlycon console=ttySIF0 +[ 0.000000] Dentry cache hash table entries: 1024 (order: 1, 8192 bytes, linear) +[ 0.000000] Inode-cache hash table entries: 512 (order: 0, 4096 bytes, linear) +[ 0.000000] mem auto-init: stack:off, heap alloc:off, heap free:off +[ 0.000000] Memory: 6000K/8192K available (964K kernel code, 137K rwdata, 205K rodata, 530K init, 66K bss, 2192K reserved, 0K cma-reserved) +[ 0.000000] rcu: Hierarchical RCU implementation. +[ 0.000000] rcu: RCU calculated value of scheduler-enlistment delay is 25 jiffies. +[ 0.000000] NR_IRQS: 64, nr_irqs: 64, preallocated irqs: 0 +[ 0.000000] riscv-intc: 64 local interrupts mapped +[ 0.000000] plic: interrupt-controller@c000000: mapped 65 interrupts with 2 handlers for 4 contexts. +[ 0.000000] k210-clk: clock-controller: CPU running at 390 MHz +[ 0.000000] clint: timer@2000000: timer running at 7800000 Hz +[ 0.000000] clocksource: clint_clocksource: mask: 0xffffffffffffffff max_cycles: 0x3990be68b, max_idle_ns: 881590404272 ns +[ 0.000001] sched_clock: 64 bits at 7MHz, resolution 128ns, wraps every 4398046511054ns +[ 0.008183] Calibrating delay loop (skipped), value calculated using timer frequency.. 15.60 BogoMIPS (lpj=31200) +[ 0.018249] pid_max: default: 4096 minimum: 301 +[ 0.022860] Mount-cache hash table entries: 512 (order: 0, 4096 bytes, linear) +[ 0.029971] Mountpoint-cache hash table entries: 512 (order: 0, 4096 bytes, linear) +[ 0.040242] rcu: Hierarchical SRCU implementation. +[ 0.045124] smp: Bringing up secondary CPUs ... +[ 0.050217] smp: Brought up 1 node, 2 CPUs +[ 0.054346] devtmpfs: initialized +[ 0.070924] clocksource: jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 7645041785100000 ns +[ 0.079996] pinctrl core: initialized pinctrl subsystem +[ 0.119893] clocksource: Switched to clocksource clint_clocksource +[ 0.131992] workingset: timestamp_bits=62 max_order=11 bucket_order=0 +[ 0.179099] k210-sysctl 50440000.syscon: K210 system controller +[ 0.194904] k210-rst 50440000.syscon:reset-controller: K210 reset controller +[ 0.203108] cacheinfo: Unable to detect cache hierarchy for CPU 0 +[ 0.213867] i2c_dev: i2c /dev entries driver +[ 0.223397] k210-fpioa 502b0000.pinmux: K210 FPIOA pin controller +[ 0.235632] 38000000.serial: ttySIF0 at MMIO 0x38000000 (irq = 1, base_baud = 115200) is a SiFive UART v0 +[ 0.244585] printk: console [ttySIF0] enabled +[ 0.244585] printk: console [ttySIF0] enabled +[ 0.253190] printk: bootconsole [sifive0] disabled +[ 0.253190] printk: bootconsole [sifive0] disabled +[ 0.264820] panel@0 enforce active low on chipselect handle +[ 0.281482] Freeing unused kernel image (initmem) memory: 524K +[ 0.286621] This architecture does not have kernel memory protection. +[ 0.293047] Run /init as init process + __ _ + / / (_) ____ _ _ __ __ + / / | || _ \ | | | |\ \/ / + / /___| || | | || |_| | > < + /_____/|_||_| |_| \____|/_/\_\ + 64-bits RISC-V Kendryte K210 NOMMU + +/ # +``` + +To open a terminal console without re-flashing the board, the pyserial-miniterm +host tool can be used. + +``` +$ output/host/bin/pyserial-miniterm --raw --eol=LF /dev/ttyUSB0 115200 +``` + +The options "--raw" and "--eol=LF" are added here to avoid a double carriage +return each time a command is entered. + + +U-Boot SD-Card Boot +------------------- + +The build procedure is similar to the built-in initramfs case. + +``` +$ make sipeed_maixduino_sdcard_defconfig +$ make +``` + +The build process will generate two files under the output/images directory. + +* sdcard.img: The image file for the SD card filesystem. This image has 2 + partitions. The first partition is a vfat partition containing the kernel + uImage and the board device tree binary. The second partition is the root + filesystem with busybox installed. The second partition is formatted using + ext2 (rev1). + +* uboot.bin: U-Boot bootable binary to load and boot the kernel from the SD + card. + +The SD card can be prepared by writing the sdcard.img file, as follows. + +``` +$ sudo dd if=output/images/sdcard.img of=/dev/sdX bs=1M +$ sync +$ eject /dev/sdX +``` + +Where /dev/sdX is the device file name of the SD card. Once completed, the SD +card can be inserted into the board and the U-Boot binary image written to the +board boot flash using the kflash utility. + +``` +$ output/host/bin/kflash -b 1500000 -p /dev/ttyUSB0 -t output/images/u-boot.bin +``` + +The above command will program U-Boot image to the board boot ROM and open a +terminal console once the u-boot.bin file is fully programmed. Reboot into the +newly programmed environment by pressing the board reset button. + +The output will be similar to the following. + +``` +[ 0.000000] Linux version 5.18.0 (foo@bar.com) (riscv64-buildroot-linux-uclibc-gcc.br_real (Buildroot 2022.02-560-g6a2b542a09-dirty) 10.3.0, GNU ld (GNU Binutils) 2.32) #1 SMP Thu Apr 21 15:30:18 JST 2022 +[ 0.000000] Machine model: SiPeed MAIXDUINO +[ 0.000000] earlycon: sifive0 at MMIO 0x0000000038000000 (options '115200n8') +[ 0.000000] printk: bootconsole [sifive0] enabled +[ 0.000000] Zone ranges: +[ 0.000000] DMA32 [mem 0x0000000080000000-0x00000000807fffff] +[ 0.000000] Normal empty +[ 0.000000] Movable zone start for each node +[ 0.000000] Early memory node ranges +[ 0.000000] node 0: [mem 0x0000000080000000-0x00000000807fffff] +[ 0.000000] Initmem setup node 0 [mem 0x0000000080000000-0x00000000807fffff] +[ 0.000000] riscv: ISA extensions acdfim +[ 0.000000] riscv: ELF capabilities acdfim +[ 0.000000] percpu: max_distance=0x16000 too large for vmalloc space 0x0 +[ 0.000000] percpu: Embedded 11 pages/cpu s15392 r0 d29664 u45056 +[ 0.000000] percpu: wasting 10 pages per chunk +[ 0.000000] Built 1 zonelists, mobility grouping off. Total pages: 2020 +[ 0.000000] Kernel command line: earlycon console=ttySIF0 root=/dev/mmcblk0p2 rootwait ro +[ 0.000000] Dentry cache hash table entries: 1024 (order: 1, 8192 bytes, linear) +[ 0.000000] Inode-cache hash table entries: 512 (order: 0, 4096 bytes, linear) +[ 0.000000] mem auto-init: stack:off, heap alloc:off, heap free:off +[ 0.000000] Memory: 6156K/8192K available (1180K kernel code, 151K rwdata, 239K rodata, 102K init, 69K bss, 2036K reserved, 0K cma-reserved) +[ 0.000000] rcu: Hierarchical RCU implementation. +[ 0.000000] rcu: RCU calculated value of scheduler-enlistment delay is 25 jiffies. +[ 0.000000] NR_IRQS: 64, nr_irqs: 64, preallocated irqs: 0 +[ 0.000000] riscv-intc: 64 local interrupts mapped +[ 0.000000] plic: interrupt-controller@c000000: mapped 65 interrupts with 2 handlers for 4 contexts. +[ 0.000000] k210-clk: clock-controller: CPU running at 390 MHz +[ 0.000000] clint: timer@2000000: timer running at 7800000 Hz +[ 0.000000] clocksource: clint_clocksource: mask: 0xffffffffffffffff max_cycles: 0x3990be68b, max_idle_ns: 881590404272 ns +[ 0.000001] sched_clock: 64 bits at 7MHz, resolution 128ns, wraps every 4398046511054ns +[ 0.008191] Calibrating delay loop (skipped), value calculated using timer frequency.. 15.60 BogoMIPS (lpj=31200) +[ 0.018255] pid_max: default: 4096 minimum: 301 +[ 0.022876] Mount-cache hash table entries: 512 (order: 0, 4096 bytes, linear) +[ 0.029982] Mountpoint-cache hash table entries: 512 (order: 0, 4096 bytes, linear) +[ 0.040417] rcu: Hierarchical SRCU implementation. +[ 0.045397] smp: Bringing up secondary CPUs ... +[ 0.050513] smp: Brought up 1 node, 2 CPUs +[ 0.054680] devtmpfs: initialized +[ 0.072127] clocksource: jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 7645041785100000 ns +[ 0.081205] pinctrl core: initialized pinctrl subsystem +[ 0.125074] clocksource: Switched to clocksource clint_clocksource +[ 0.138311] workingset: timestamp_bits=62 max_order=11 bucket_order=0 +[ 0.183471] k210-sysctl 50440000.syscon: K210 system controller +[ 0.199873] k210-rst 50440000.syscon:reset-controller: K210 reset controller +[ 0.208858] cacheinfo: Unable to detect cache hierarchy for CPU 0 +[ 0.221586] i2c_dev: i2c /dev entries driver +[ 0.232786] k210-fpioa 502b0000.pinmux: K210 FPIOA pin controller +[ 0.246572] 38000000.serial: ttySIF0 at MMIO 0x38000000 (irq = 1, base_baud = 115200) is a SiFive UART v0 +[ 0.255508] printk: console [ttySIF0] enabled +[ 0.255508] printk: console [ttySIF0] enabled +[ 0.264137] printk: bootconsole [sifive0] disabled +[ 0.264137] printk: bootconsole [sifive0] disabled +[ 0.275560] panel@0 enforce active low on chipselect handle +[ 0.313245] mmc_spi spi3.0: SD/MMC host mmc0, no WP, no poweroff, cd polling +[ 0.322845] Waiting for root device /dev/mmcblk0p2... +[ 0.345869] mmc0: host does not support reading read-only switch, assuming write-enable +[ 0.353221] mmc0: new SDHC card on SPI +[ 0.360233] mmcblk0: mmc0:0000 SA16G 14.5 GiB +[ 0.368350] random: fast init done +[ 0.372926] mmcblk0: p1 p2 +[ 0.391887] random: get_random_bytes called from 0x000000008009b7d2 with crng_init=1 +[ 0.400427] VFS: Mounted root (ext2 filesystem) readonly on device 179:2. +[ 0.410128] devtmpfs: mounted +[ 0.412628] Freeing unused kernel image (initmem) memory: 96K +[ 0.418137] This architecture does not have kernel memory protection. +[ 0.424530] Run /sbin/init as init process +[ 0.563384] random: crng init done + __ _ + / / (_) ____ _ _ __ __ + / / | || _ \ | | | |\ \/ / + / /___| || | | || |_| | > < + /_____/|_||_| |_| \____|/_/\_\ + 64-bits RISC-V Kendryte K210 NOMMU + +/ # +``` + +Of note is that the kernel mounts the SD card as read-only by default to avoid +corruptions of the ext2 root file system when the board is powered down. This +is recommended as this board does not support clean shutdown or halt. + +Similarly to the initramfs build case, a console can be open without +re-flashing the board using the host tool pyserial-miniterm. + +``` +$ output/host/bin/pyserial-miniterm --raw --eol=LF /dev/ttyUSB0 115200 +``` diff --git a/board/solidrun/macchiatobin/readme.txt b/board/solidrun/macchiatobin/readme.txt index 7412951aabd..ef5a6cba6bd 100644 --- a/board/solidrun/macchiatobin/readme.txt +++ b/board/solidrun/macchiatobin/readme.txt @@ -13,9 +13,9 @@ How to build ============ Default configuration provides the following BSP versions: - - Linux v5.6.3 (mainline) - - U-Boot v2020.01 (mainline) - - ATF v1.5-18.12.2 (Marvell) + - Linux v5.10.5 + - U-Boot v2020.10 + - ATF v2.4 To build images run the following commands: diff --git a/board/stmicroelectronics/common/stm32f4xx/stm32-post-build.sh b/board/stmicroelectronics/common/stm32f4xx/stm32-post-build.sh index e324afe59a9..2ac9c653c32 100755 --- a/board/stmicroelectronics/common/stm32f4xx/stm32-post-build.sh +++ b/board/stmicroelectronics/common/stm32f4xx/stm32-post-build.sh @@ -2,7 +2,3 @@ # Kernel is built without devpts support sed -i '/^devpts/d' ${TARGET_DIR}/etc/fstab - -# Kernel is built without network support -rm -f ${TARGET_DIR}/etc/init.d/S40network -rm -rf ${TARGET_DIR}/etc/network/ diff --git a/board/stmicroelectronics/common/stm32mp157/genimage.cfg.template b/board/stmicroelectronics/common/stm32mp157/genimage.cfg.template index 03fba8daf07..ff4aeceeedc 100644 --- a/board/stmicroelectronics/common/stm32mp157/genimage.cfg.template +++ b/board/stmicroelectronics/common/stm32mp157/genimage.cfg.template @@ -1,6 +1,6 @@ image sdcard.img { hdimage { - gpt = "true" + partition-table-type = "gpt" } partition fsbl1 { diff --git a/board/stmicroelectronics/stm32f429-disco/linux.config b/board/stmicroelectronics/stm32f429-disco/linux.config index 7b5c60f1806..02d9c2d1e09 100644 --- a/board/stmicroelectronics/stm32f429-disco/linux.config +++ b/board/stmicroelectronics/stm32f429-disco/linux.config @@ -95,10 +95,6 @@ CONFIG_STM32_MDMA=y CONFIG_SYNC_FILE=y # CONFIG_VIRTIO_MENU is not set # CONFIG_VHOST_MENU is not set -CONFIG_IIO=y -CONFIG_IIO_BUFFER=y -CONFIG_IIO_TRIGGERED_BUFFER=y -CONFIG_IIO_STM32_TIMER_TRIGGER=y # CONFIG_FILE_LOCKING is not set # CONFIG_DNOTIFY is not set # CONFIG_INOTIFY_USER is not set diff --git a/board/technexion/imx8mmpico/readme.txt b/board/technexion/imx8mmpico/readme.txt index 3095d67b2c9..56a8c9bdfee 100644 --- a/board/technexion/imx8mmpico/readme.txt +++ b/board/technexion/imx8mmpico/readme.txt @@ -46,7 +46,7 @@ J2: jumper on pins 2 and 4. In case the board was flashed with a wrong u-boot, or the eMMC is erased, u-boot can be loaded by USB Serial Download boot mode, using -imx-usb-loader. See [3] and [4]. +imx-usb-loader. See [3]. For flashing: - Plug the micro USB cable from the Debug USB Port, to your computer @@ -54,9 +54,13 @@ For flashing: In the U-Boot prompt launch: -=> ums 0 mmc 1 +=> ums 0 mmc ${mmcdev} This will mount the eMMC content in the host PC as a mass storage device. +Note: the ${mmcdev} id may change from one uboot version to another. The +actual id can be confirmed by running commands "mmc rescan" then +"mmc list", to find the eMMC entry. Finally it's possible to enter +directly the mmc device id, for example: "ums 0 mmc 2". To determine the device associated to the eMMC card have a look in the /proc/partitions file: @@ -70,12 +74,13 @@ Buildroot prepares a bootable "sdcard.img" image in the output/images/ directory, ready to be dumped on the eMMC. Launch the following command as root: - dd if=output/images/sdcard.img of=/dev/ + dd bs=1M if=output/images/sdcard.img of=/dev/ *** WARNING! This will destroy all the eMMC content. Use with care! *** This operation can take several minutes, depending on the image -size. When tested, a 2MB/s transfer rate was observed. +size. When tested, a 10MB/s transfer rate was observed. Note: the +blocksize "bs=1M" parameter gives better transfer performances. For details about the medium image layout, see the definition in board/freescale/common/imx/genimage.cfg.template. @@ -91,6 +96,5 @@ To boot your newly created system: Enjoy! [1]. https://www.technexion.com/products/system-on-modules/pico/pico-compute-modules/detail/PICO-IMX8M-MINI -[2]. https://www.technexion.com/products/pico-evaluation-kits/detail/PICOPIIMX8MM1GDEV -[3]. https://www.technexion.com/support/knowledgebase/boot-configuration-settings-for-pico-baseboards/ -[4]. https://www.technexion.com/support/knowledgebase/loading-bootable-software-images-onto-the-emmc-of-picosom-on-pico-pi/ +[2]. https://www.technexion.com/products/system-on-modules/evk/pico-pi-imx8m-mini/ +[3]. https://developer.technexion.com/docs/recover-to-factory-settings-pico-imx8m-mini diff --git a/board/technexion/imx8mpico/readme.txt b/board/technexion/imx8mpico/readme.txt index 1a04e445725..c20bfc0f448 100644 --- a/board/technexion/imx8mpico/readme.txt +++ b/board/technexion/imx8mpico/readme.txt @@ -45,7 +45,7 @@ J2: jumper on pins 2 and 4. In case the board was flashed with a wrong u-boot, or the eMMC is erased, u-boot can be loaded by USB Serial Download boot mode, using -imx-usb-loader. See [3] and [4]. +imx-usb-loader. See [3]. For flashing: - Plug the micro USB cable from the Debug USB Port, to your computer @@ -53,9 +53,13 @@ For flashing: In the U-Boot prompt launch: -=> ums 0 mmc 0 +=> ums 0 mmc ${mmcdev} This will mount the eMMC content in the host PC as a mass storage device. +Note: the ${mmcdev} id may change from one uboot version to another. The +actual id can be confirmed by running commands "mmc rescan" then +"mmc list", to find the eMMC entry. Finally it's possible to enter +directly the mmc device id, for example: "ums 0 mmc 2". To determine the device associated to the eMMC card have a look in the /proc/partitions file: @@ -69,12 +73,13 @@ Buildroot prepares a bootable "sdcard.img" image in the output/images/ directory, ready to be dumped on the eMMC. Launch the following command as root: - dd if=output/images/sdcard.img of=/dev/ + dd bs=1M if=output/images/sdcard.img of=/dev/ *** WARNING! This will destroy all the eMMC content. Use with care! *** This operation can take several minutes, depending on the image -size. When tested, a 2MB/s transfer rate was observed. +size. When tested, a 10MB/s transfer rate was observed. Note: the +blocksize "bs=1M" parameter gives better transfer performances. For details about the medium image layout, see the definition in board/freescale/common/imx/genimage.cfg.template. @@ -90,6 +95,5 @@ To boot your newly created system: Enjoy! [1]. https://www.technexion.com/products/system-on-modules/pico/pico-compute-modules/detail/PICO-IMX8M -[2]. https://www.technexion.com/products/system-on-modules/pico-evaluation-kits/detail/PICO-PI-IMX8M-BASIC -[3]. https://www.technexion.com/support/knowledgebase/boot-configuration-settings-for-pico-baseboards/ -[4]. https://www.technexion.com/support/knowledgebase/loading-bootable-software-images-onto-the-emmc-of-picosom-on-pico-pi/ +[2]. https://www.technexion.com/products/system-on-modules/evk/pico-pi-imx8m/ +[3]. https://developer.technexion.com/docs/pico-evaluation-kit-boot-mode-settings#picoimx8m-and-picoimx8mmini diff --git a/board/technologic/ts4900/readme.txt b/board/technologic/ts4900/readme.txt index 679454fdeb9..121e6397495 100644 --- a/board/technologic/ts4900/readme.txt +++ b/board/technologic/ts4900/readme.txt @@ -9,7 +9,7 @@ Freescale i.MX6 Single or Quad Core ARM Cortex-A9 CPU clocked at 1GHz. The TS-4900 features Gigabit Ethernet, SATA II Port, PCI Express Bus, high speed USB host and device (OTG), and microSD card. More details on the board here: - http://wiki.embeddedarm.com/wiki/TS-4900 + https://docs.embeddedTS.com/TS-4900 The TS-4900 is not currently supported by mainline Linux, so a Technologic Systems Linux is used based on Linux 4.1. @@ -48,5 +48,5 @@ connector etc. The bootloader comes pre-flashed on the board on an SPI flash. Since updating the bootloader is risky and not trivial, it is not included in the Buildroot defconfig. Refer to -http://wiki.embeddedarm.com/wiki/TS-4900#U-Boot for details on which +https://docs.embeddedTS.com/TS-4900#U-Boot for details on which U-Boot config to use and how to flash it. diff --git a/board/technologic/ts5500/readme.txt b/board/technologic/ts5500/readme.txt index 1e73ab3ea17..1fe384faae9 100644 --- a/board/technologic/ts5500/readme.txt +++ b/board/technologic/ts5500/readme.txt @@ -5,7 +5,7 @@ This document explains how to set up a basic Buildroot system for the Technologic Systems TS-5x00 serie of x86-based Single Board Computers. TS-5x00 Single Board Computers are based on the AMD Elan520 processor. For more -information please have a look at http://wiki.embeddedarm.com/wiki/#AMD +information please have a look at https://docs.embeddedTS.com/Documentation_Home#AMD The kernel configuration works for any AMD Elan520-based SBCs, but the support is enhanced for the TS-5500 and TS-5400 models (on-board devices registration @@ -45,7 +45,7 @@ config, the BIOS must use Logical Block Addressing (LBA). You can do it by choosing "Ide 0: AUTOCONFIG, LBA" under "IDE DRIVE GEOMETRY" in the "Basic CMOS Configuration" screen. Also, don't forget to set the 'active' (or 'bootable') flag on partition 1. For details about the CMOS setup, please see: -http://wiki.embeddedarm.com/wiki/TS-5500#System_BIOS_Setup_Screens +https://docs.embeddedts.com/TS-5500#System_BIOS_Setup_Screens Connect a terminal program to the rs232 connector marked "COM2" with baudrate set to 115200, insert the Compact Flash card into the socket, diff --git a/board/technologic/ts7680/readme.txt b/board/technologic/ts7680/readme.txt index 43d5d135e88..3f703330bf9 100644 --- a/board/technologic/ts7680/readme.txt +++ b/board/technologic/ts7680/readme.txt @@ -8,7 +8,7 @@ The TS-7680 SBC is based on the Freescale i.MX286 ARM ARM926EJ-S running at 454MHz. The TS-7680 features are 10/100 Ethernet ports, Wi-Fi, microSD card, eMMC, NOR Flash, USB host port, CAN ports, relays and ADC/DAC. More details on the board here: -https://wiki.embeddedarm.com/wiki/TS-7680 +https://docs.embeddedTS.com/TS-7680 The TS-7680 uses a 4.9 Linux kernel provided by Technologic Systems. @@ -46,5 +46,5 @@ the SD jumper is present and the U-Boot jumper is not. The bootloader comes pre-flashed on the board on an SPI flash. Since updating the bootloader is risky and not trivial, it is not included in the Buildroot defconfig. Refer to -https://wiki.embeddedarm.com/wiki/TS-7680#U-Boot for details on +https://docs.embeddedts.com/TS-7680#U-Boot for details on which U-Boot config to use and how to flash it. diff --git a/board/versal/genimage.cfg b/board/versal/genimage.cfg new file mode 100644 index 00000000000..d994d3a2bfb --- /dev/null +++ b/board/versal/genimage.cfg @@ -0,0 +1,30 @@ +image boot.vfat { + vfat { + files = { + "boot.bin", + "system.dtb", + "Image" + } + file extlinux/extlinux.conf { + image = extlinux.conf + } + } + + size = 32M +} + +image sdcard.img { + hdimage { + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } +} diff --git a/board/versal/post-build.sh b/board/versal/post-build.sh new file mode 100755 index 00000000000..ed08ea2d497 --- /dev/null +++ b/board/versal/post-build.sh @@ -0,0 +1,15 @@ +#!/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} clk_ignore_unused root=/dev/${ROOT} rw rootwait + __HEADER_EOF diff --git a/board/versal/post-image.sh b/board/versal/post-image.sh new file mode 100755 index 00000000000..1d9802c34d2 --- /dev/null +++ b/board/versal/post-image.sh @@ -0,0 +1,35 @@ +#!/bin/sh + +# By default U-Boot loads DTB from a file named "system.dtb", so +# let's use a symlink with that name that points to the *first* +# devicetree listed in the config. + +FIRST_DT=$(sed -nr \ + -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="(xilinx/)?([-_/[:alnum:]\\.]*).*"$|\2|p' \ + "${BR2_CONFIG}") + +[ -z "${FIRST_DT}" ] || ln -fs "${FIRST_DT}.dtb" "${BINARIES_DIR}/system.dtb" + +BOARD_DIR="$(dirname "$0")" +BOARD_NAME="$4" + +mkdir -p "${BINARIES_DIR}" +cat <<-__HEADER_EOF > "${BINARIES_DIR}/bootgen.bif" + the_ROM_image: + { + image { + { type=bootimage, file=${BINARIES_DIR}/${BOARD_NAME}_vpl_gen_fixed.pdi } + { type=bootloader, file=${BINARIES_DIR}/${BOARD_NAME}_plm.elf } + { core=psm, file=${BINARIES_DIR}/${BOARD_NAME}_psmfw.elf } + } + image { + id = 0x1c000000, name=apu_subsystem + { type=raw, load=0x00001000, file=${BINARIES_DIR}/u-boot.dtb } + { core=a72-0, exception_level=el-3, trustzone, file=${BINARIES_DIR}/bl31.elf } + { core=a72-0, exception_level=el-2, file=${BINARIES_DIR}/u-boot.elf } + } + } + __HEADER_EOF + +"${HOST_DIR}/bin/bootgen" -arch versal -image "${BINARIES_DIR}/bootgen.bif" -o "${BINARIES_DIR}/boot.bin" -w on +support/scripts/genimage.sh -c "${BOARD_DIR}/genimage.cfg" diff --git a/board/versal/readme.txt b/board/versal/readme.txt new file mode 100644 index 00000000000..9f234be6201 --- /dev/null +++ b/board/versal/readme.txt @@ -0,0 +1,54 @@ +****************************************** +Xilinx VCK190 board - Versal +****************************************** + +This document describes the Buildroot support for the VCK190 +board by Xilinx, based on Versal. It has been tested with the +VCK190 production board. + +Evaluation board features can be found here with the link below. + +VCK190: +https://www.xilinx.com/products/boards-and-kits/vck190.html + + +How to build it +=============== + +Configure Buildroot: + + $ make versal_vck190_defconfig + +Compile everything and build the rootfs image: + + $ make + +Result of the build +------------------- + +After building, you should get a tree like this: + + output/images/ + +-- boot.bin + +-- boot.vfat + +-- Image + +-- rootfs.ext2 + +-- rootfs.ext4 -> rootfs.ext2 + +-- sdcard.img + +-- system.dtb -> versal-vck190-rev1.1.dtb + `-- versal-vck190-rev1.1.dtb + +How to write the SD card +======================== + +WARNING! This will destroy all the card content. Use with care! + +The sdcard.img file is a complete bootable image ready to be written +on the boot medium. To install it, simply copy the image to an SD +card: + + # dd if=output/images/sdcard.img of=/dev/sdX + +Where 'sdX' is the device node of the SD. + +Eject the SD card, insert it in the board, and power it up. diff --git a/board/versal/uboot.fragment b/board/versal/uboot.fragment new file mode 100644 index 00000000000..6f71907379f --- /dev/null +++ b/board/versal/uboot.fragment @@ -0,0 +1 @@ +CONFIG_OF_SEPARATE=y diff --git a/board/visionfive/genimage.cfg b/board/visionfive/genimage.cfg new file mode 100644 index 00000000000..433387c901c --- /dev/null +++ b/board/visionfive/genimage.cfg @@ -0,0 +1,21 @@ +# Minimal SD card image for the Starfive VisionFive board + +image sdcard.img { + hdimage { + } + + # u-boot is hard coded to look at 3rd partition + partition dummy1 { + size = 512 + } + + partition dummy2 { + size = 512 + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + bootable = "true" + } +} diff --git a/board/visionfive/overlay/boot/extlinux/extlinux.conf b/board/visionfive/overlay/boot/extlinux/extlinux.conf new file mode 100644 index 00000000000..44ac6f79448 --- /dev/null +++ b/board/visionfive/overlay/boot/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +label linux + kernel /boot/Image + devicetree /boot/jh7100-starfive-visionfive-v1.dtb + append console=ttyS0,115200 root=/dev/mmcblk0p3 diff --git a/board/visionfive/overlay/boot/uEnv.txt b/board/visionfive/overlay/boot/uEnv.txt new file mode 100644 index 00000000000..b831d2d2305 --- /dev/null +++ b/board/visionfive/overlay/boot/uEnv.txt @@ -0,0 +1,15 @@ +fdt_high=0xffffffffffffffff +initrd_high=0xffffffffffffffff + +scriptaddr=0x88100000 +script_offset_f=0x1fff000 +script_size_f=0x1000 + +kernel_addr_r=0x84000000 +kernel_comp_addr_r=0x90000000 +kernel_comp_size=0x10000000 + +fdt_addr_r=0x88000000 +ramdisk_addr_r=0x88300000 + +bootcmd=devnum=0; run mmc_boot diff --git a/board/visionfive/readme.txt b/board/visionfive/readme.txt new file mode 100644 index 00000000000..7aefa241673 --- /dev/null +++ b/board/visionfive/readme.txt @@ -0,0 +1,32 @@ +Starfive VisionFive +=================== + +The VisionFive is a low-cost RISC-V 64-bit based platform, powered by a +Starfive JH7100 processor. + +https://doc-en.rvspace.org/Doc_Center/visionfive.html + +How to build +============ + +$ make visionfive_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 + +Preparing the board +=================== + +Connect a TTL UART cable to pin 6 (GND), 8 (TX) and 10 (RX). + +Insert your SD card. + +Power-up the board using an USB-C cable. diff --git a/board/visionfive2/genimage.cfg b/board/visionfive2/genimage.cfg new file mode 100644 index 00000000000..c221b49c7b7 --- /dev/null +++ b/board/visionfive2/genimage.cfg @@ -0,0 +1,21 @@ +# Minimal SD card image for the Starfive VisionFive2 board + +image sdcard.img { + hdimage { + } + + # u-boot is hard coded to look at 3rd partition + partition dummy1 { + size = 512 + } + + partition dummy2 { + size = 512 + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + bootable = "true" + } +} diff --git a/board/visionfive2/overlay/boot/extlinux/extlinux.conf b/board/visionfive2/overlay/boot/extlinux/extlinux.conf new file mode 100644 index 00000000000..6e2c5660d6c --- /dev/null +++ b/board/visionfive2/overlay/boot/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +label linux + kernel /boot/Image + devicetree /boot/jh7110-visionfive-v2.dtb + append console=ttyS0,115200 root=/dev/mmcblk1p3 diff --git a/board/visionfive2/readme.txt b/board/visionfive2/readme.txt new file mode 100644 index 00000000000..1924cbc12b7 --- /dev/null +++ b/board/visionfive2/readme.txt @@ -0,0 +1,32 @@ +Starfive VisionFive2 +==================== + +The VisionFive2 is a low-cost RISC-V 64-bit based platform, powered by a +Starfive JH7110 processor. + +https://doc-en.rvspace.org/Doc_Center/visionfive_2.html + +How to build +============ + +$ make visionfive2_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 + +Preparing the board +=================== + +Connect a TTL UART cable to pin 6 (GND), 8 (TX) and 10 (RX). + +Insert your SD card. + +Power-up the board using an USB-C cable. diff --git a/board/zynq/extlinux.conf b/board/zynq/extlinux.conf new file mode 100644 index 00000000000..3c2ab4f46a3 --- /dev/null +++ b/board/zynq/extlinux.conf @@ -0,0 +1,4 @@ +label linux + kernel /uImage + devicetree /system.dtb + append console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait diff --git a/board/zynq/genimage.cfg b/board/zynq/genimage.cfg index 67baca795ed..78eb9275dd3 100644 --- a/board/zynq/genimage.cfg +++ b/board/zynq/genimage.cfg @@ -3,12 +3,12 @@ image boot.vfat { files = { "boot.bin", "u-boot.img", - "devicetree.dtb", + "system.dtb", "uImage" } - file uramdisk.image.gz { - image = "rootfs.cpio.uboot" + file extlinux/extlinux.conf { + image = extlinux.conf } } @@ -24,4 +24,9 @@ image sdcard.img { bootable = "true" image = "boot.vfat" } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + } } diff --git a/board/zynq/post-build.sh b/board/zynq/post-build.sh new file mode 100755 index 00000000000..810fe998794 --- /dev/null +++ b/board/zynq/post-build.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +# genimage will need to find the extlinux.conf +# in the binaries directory + +BOARD_DIR="$(dirname "$0")" + +install -m 0644 -D "${BOARD_DIR}/extlinux.conf" "${BINARIES_DIR}/extlinux.conf" diff --git a/board/zynq/post-image.sh b/board/zynq/post-image.sh index 0cf92e0aa98..192354b5bea 100755 --- a/board/zynq/post-image.sh +++ b/board/zynq/post-image.sh @@ -1,13 +1,15 @@ #!/bin/sh -# By default U-Boot loads DTB from a file named "devicetree.dtb", so +# By default U-Boot loads DTB from a file named "system.dtb", so # let's use a symlink with that name that points to the *first* # devicetree listed in the config. FIRST_DT=$(sed -n \ 's/^BR2_LINUX_KERNEL_INTREE_DTS_NAME="\([a-z0-9\-]*\).*"$/\1/p' \ - ${BR2_CONFIG}) + "${BR2_CONFIG}") -[ -z "${FIRST_DT}" ] || ln -fs ${FIRST_DT}.dtb ${BINARIES_DIR}/devicetree.dtb +[ -z "${FIRST_DT}" ] || ln -fs "${FIRST_DT}.dtb" "${BINARIES_DIR}/system.dtb" -support/scripts/genimage.sh -c board/zynq/genimage.cfg +BOARD_DIR="$(dirname "$0")" + +support/scripts/genimage.sh -c "${BOARD_DIR}/genimage.cfg" diff --git a/board/zynqmp/extlinux.conf b/board/zynqmp/extlinux.conf deleted file mode 100644 index ae3ec8614a7..00000000000 --- a/board/zynqmp/extlinux.conf +++ /dev/null @@ -1,5 +0,0 @@ -label linux - kernel /Image - devicetree /system.dtb - append console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait - diff --git a/board/zynqmp/kria/kv260/kv260.sh b/board/zynqmp/kria/kv260/kv260.sh new file mode 100755 index 00000000000..dc92c51d43e --- /dev/null +++ b/board/zynqmp/kria/kv260/kv260.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +# This is a temporary work around for generating kv260 u-boot.itb. +# The problem is there is no way to currently configure u-boot to apply +# the carrier board dtb overlay during build, so all kv260 carrier board +# drivers are missing. +# This will be removed when u-boot can build the kv260 u-boot.itb natively. + +UBOOT_DIR="$4" + +fdtoverlay -o "${UBOOT_DIR}/fit-dtb.blob" \ + -i "${UBOOT_DIR}/arch/arm/dts/zynqmp-smk-k26-revA.dtb" \ + "${UBOOT_DIR}/arch/arm/dts/zynqmp-sck-kv-g-revB.dtbo" + +"${UBOOT_DIR}/tools/mkimage" -E -f "${UBOOT_DIR}/u-boot.its" \ + -B 0x8 "${BINARIES_DIR}/u-boot.itb" diff --git a/board/zynqmp/kria/kv260/pm_cfg_obj.c b/board/zynqmp/kria/kv260/pm_cfg_obj.c new file mode 100644 index 00000000000..019df6e2371 --- /dev/null +++ b/board/zynqmp/kria/kv260/pm_cfg_obj.c @@ -0,0 +1,556 @@ +/****************************************************************************** +* Copyright (c) 2017 - 2021 Xilinx, Inc. All rights reserved. +* SPDX-License-Identifier: MIT +******************************************************************************/ + +#include "xil_types.h" +#include "pm_defs.h" + +#define PM_CONFIG_MASTER_SECTION_ID 0x101U +#define PM_CONFIG_SLAVE_SECTION_ID 0x102U +#define PM_CONFIG_PREALLOC_SECTION_ID 0x103U +#define PM_CONFIG_POWER_SECTION_ID 0x104U +#define PM_CONFIG_RESET_SECTION_ID 0x105U +#define PM_CONFIG_SHUTDOWN_SECTION_ID 0x106U +#define PM_CONFIG_SET_CONFIG_SECTION_ID 0x107U +#define PM_CONFIG_GPO_SECTION_ID 0x108U + +#define PM_SLAVE_FLAG_IS_SHAREABLE 0x1U +#define PM_MASTER_USING_SLAVE_MASK 0x2U + +#define PM_CONFIG_GPO1_MIO_PIN_34_MAP (1U << 10U) +#define PM_CONFIG_GPO1_MIO_PIN_35_MAP (1U << 11U) +#define PM_CONFIG_GPO1_MIO_PIN_36_MAP (1U << 12U) +#define PM_CONFIG_GPO1_MIO_PIN_37_MAP (1U << 13U) + +#define PM_CONFIG_GPO1_BIT_2_MASK (1U << 2U) +#define PM_CONFIG_GPO1_BIT_3_MASK (1U << 3U) +#define PM_CONFIG_GPO1_BIT_4_MASK (1U << 4U) +#define PM_CONFIG_GPO1_BIT_5_MASK (1U << 5U) + +#define SUSPEND_TIMEOUT 0xFFFFFFFFU + +#define PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK 0x00000001 +#define PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK 0x00000100 +#define PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK 0x00000200 + + + +#if defined (__ICCARM__) +#pragma language=save +#pragma language=extended +#endif +#if defined (__GNUC__) + const u32 XPm_ConfigObject[] __attribute__((used, section(".sys_cfg_data"))) = +#elif defined (__ICCARM__) +#pragma location = ".sys_cfg_data" +__root const u32 XPm_ConfigObject[] = +#endif +{ + /**********************************************************************/ + /* HEADER */ + 2, /* Number of remaining words in the header */ + 8, /* Number of sections included in config object */ + 1U, /* Type of config object as base */ + /**********************************************************************/ + /* MASTER SECTION */ + PM_CONFIG_MASTER_SECTION_ID, /* Master SectionID */ + 3U, /* No. of Masters*/ + + NODE_APU, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ + + NODE_RPU_0, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Wake permissions */ + + NODE_RPU_1, /* Master Node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask of this master */ + SUSPEND_TIMEOUT, /* Suspend timeout */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Suspend permissions */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* Wake permissions */ + + + /**********************************************************************/ + /* SLAVE SECTION */ + + + PM_CONFIG_SLAVE_SECTION_ID, /* Section ID */ + 49, /* Number of slaves */ + + NODE_OCM_BANK_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_OCM_BANK_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TCM_0_A, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_TCM_0_B, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_TCM_1_A, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TCM_1_B, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_L2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU_PP_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU_PP_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_USB_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_USB_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_TTC_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_TTC_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SATA, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_2, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_ETH_3, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_UART_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_UART_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SPI_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_SPI_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_I2C_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_I2C_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_SD_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_SD_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_DP, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GDMA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_ADMA, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_NAND, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_QSPI, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPIO, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_CAN_0, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_CAN_1, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_EXTERN, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_DDR, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK| PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_IPI_APU, + 0U, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, /* IPI Mask */ + + NODE_IPI_RPU_0, + 0U, + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, /* IPI Mask */ + + NODE_IPI_RPU_1, + 0U, + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_GPU, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_PCIE, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_PCAP, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_RTC, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + NODE_VCU, + PM_SLAVE_FLAG_IS_SHAREABLE, + 0U, /* IPI Mask */ + + NODE_PL, + PM_SLAVE_FLAG_IS_SHAREABLE, + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* IPI Mask */ + + + /**********************************************************************/ + /* PREALLOC SECTION */ + + PM_CONFIG_PREALLOC_SECTION_ID, /* Preallaoc SectionID */ + 3U, /* No. of Masters*/ + +/* Prealloc for psu_cortexa53_0 */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK, + 11, + NODE_DDR, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_L2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_2, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_OCM_BANK_3, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_I2C_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_SD_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_QSPI, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_PL, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_APU, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /* Prealloc for psu_cortexr5_0 */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, + 3, + NODE_TCM_0_A, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_TCM_0_B, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_RPU_0, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + /* Prealloc for psu_cortexr5_1 */ + PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + 3, + NODE_TCM_1_A, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_TCM_1_B, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + NODE_IPI_RPU_1, + PM_MASTER_USING_SLAVE_MASK, /* Master is using Slave */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Current Requirements */ + PM_CAP_ACCESS | PM_CAP_CONTEXT, /* Default Requirements */ + + + + /**********************************************************************/ + /* POWER SECTION */ + + PM_CONFIG_POWER_SECTION_ID, /* Power Section ID */ + 4U, /* Number of power nodes */ + + NODE_APU, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_RPU, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_FPD, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + NODE_PLD, /* Power node ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* Force power down permissions */ + + + /**********************************************************************/ + /* RESET SECTION */ + + PM_CONFIG_RESET_SECTION_ID, /* Reset Section ID */ + 120U, /* Number of resets */ + + XILPM_RESET_PCIE_CFG, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PCIE_BRIDGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PCIE_CTRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SWDT_CRF, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_AFI_FM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GDMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU_PP1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU_PP0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPU, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SATA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU3_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU2_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU1_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU0_PWRON, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APU_L2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ACPU0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DDR, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APM_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SOFT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GEM3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_QSPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_UART0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_UART1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SPI0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SPI1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SDIO0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SDIO1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_CAN0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_CAN1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_I2C0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_I2C1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TTC3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SWDT_CRL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_NAND, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_ADMA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IOU_CC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_TIMESTAMP, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_R50, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_R51, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_AMBA, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_OCM, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_PGE, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_CORERESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_HIBERRESET, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB0_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_USB1_APB, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IPI, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APM_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RTC, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_SYSMON, 0, + XILPM_RESET_AFI_FM6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_LPD_SWDT, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_FPD, PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK, + XILPM_RESET_RPU_DBG1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_DBG0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DBG_LPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DBG_FPD, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_APLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_DPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_VPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_IOPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPLL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_0, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_1, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_2, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_3, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_4, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_5, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_6, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_7, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_8, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_9, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_10, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_11, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_12, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_13, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_14, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_15, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_16, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_17, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_18, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_19, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_20, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_21, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_22, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_23, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_24, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_25, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_26, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_27, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_28, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_29, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_30, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPO3_PL_31, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_RPU_LS, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PS_ONLY, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_PL, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_92, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_93, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_94, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + XILPM_RESET_GPIO5_EMIO_95, PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, + + /**********************************************************************/ + /* SET CONFIG SECTION */ + PM_CONFIG_SET_CONFIG_SECTION_ID, /* Set Config Section ID */ + 0U, /* Permissions to load base config object */ + 0U, /* Permissions to load overlay config object */ + + /**********************************************************************/ + /* SHUTDOWN SECTION */ + + PM_CONFIG_SHUTDOWN_SECTION_ID, /* Shutdown Section ID */ + PM_CONFIG_IPI_PSU_CORTEXA53_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_0_MASK | PM_CONFIG_IPI_PSU_CORTEXR5_1_MASK, /* System Shutdown/Restart Permission */ + + /**********************************************************************/ + /* GPO SECTION */ + PM_CONFIG_GPO_SECTION_ID, /* GPO Section ID */ + PM_CONFIG_GPO1_BIT_2_MASK | + PM_CONFIG_GPO1_MIO_PIN_34_MAP | + PM_CONFIG_GPO1_MIO_PIN_35_MAP | + 0, /* State of GPO pins */ +}; +#if defined (__ICCARM__) +#pragma language=restore +#endif + diff --git a/board/zynqmp/kria/patches/uboot/v1-0001-makefile-add-multi_dtb_fit-dep.patch b/board/zynqmp/kria/patches/uboot/v1-0001-makefile-add-multi_dtb_fit-dep.patch new file mode 100644 index 00000000000..ddc04cacacc --- /dev/null +++ b/board/zynqmp/kria/patches/uboot/v1-0001-makefile-add-multi_dtb_fit-dep.patch @@ -0,0 +1,32 @@ +From 8b181bf582c17cf709a62cf499f9709c94f49d33 Mon Sep 17 00:00:00 2001 +From: Neal Frager +Date: Wed, 21 Dec 2022 07:51:42 +0000 +Subject: [PATCH v1 1/1] makefile: add multi_dtb_fit dep + +With certain gcc compilers, the u-boot.itb is built immediately after dtb +generation. If CONFIG_MULTI_DTB_FIT is used, it is possible that the +fit-dtb.blob is not finished in time. + +This patch adds a necessary dependency to guarantee that the fit-dtb.blob +is built before attempting to build the u-boot.itb. + +Signed-off-by: Neal Frager +--- + Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile b/Makefile +index b96e2ffa15..682a5d94fd 100644 +--- a/Makefile ++++ b/Makefile +@@ -1425,6 +1425,7 @@ MKIMAGEFLAGS_u-boot.itb += -B 0x8 + ifdef U_BOOT_ITS + u-boot.itb: u-boot-nodtb.bin \ + $(if $(CONFIG_OF_SEPARATE)$(CONFIG_OF_EMBED)$(CONFIG_SANDBOX),dts/dt.dtb) \ ++ $(if $(CONFIG_MULTI_DTB_FIT),$(FINAL_DTB_CONTAINER)) \ + $(U_BOOT_ITS) FORCE + $(call if_changed,mkfitimage) + $(BOARD_SIZE_CHECK) +-- +2.17.1 + diff --git a/board/zynqmp/kria/readme.txt b/board/zynqmp/kria/readme.txt new file mode 100644 index 00000000000..bea1430482a --- /dev/null +++ b/board/zynqmp/kria/readme.txt @@ -0,0 +1,94 @@ +************************************************** +Xilinx Kria SOM Starter Kits - ZynqMP SoC +************************************************** + +This document describes the Buildroot support for the Kria +KV260 starter kit by Xilinx, based on Kria SOM including the +Zynq UltraScale+ MPSoC (aka ZynqMP). It has been tested with +the KV260 production board. + +Evaluation board features can be found here with the link below. + +KV260: +https://www.xilinx.com/products/boards-and-kits/kv260.html + +How to build it +=============== + +Configure Buildroot: + + $ make zynqmp_kria_kv260_defconfig + +Compile everything and build the rootfs image: + + $ make + +Result of the build +------------------- + +After building, you should get a tree like this: + + output/images/ + +-- atf-uboot.ub + +-- bl31.bin + +-- boot.bin + +-- boot.vfat + +-- Image + +-- rootfs.ext2 + +-- rootfs.ext4 -> rootfs.ext2 + +-- sdcard.img + +-- system.dtb -> smk-k26-revA-sck-kv-g-revB.dtb + +-- u-boot.itb + `-- smk-k26-revA-sck-kv-g-revB.dtb + +How to write the SD card +======================== + +WARNING! This will destroy all the card content. Use with care! + +The sdcard.img file is a complete bootable image ready to be written +on the boot medium. To install it, simply copy the image to an SD +card: + + # dd if=output/images/sdcard.img of=/dev/sdX + +Where 'sdX' is the device node of the SD. + +Eject the SD card, insert it in the board, and power it up. + +How to write boot.bin and u-boot.itb to QSPI boot flash +======================================================= + +The Kria SOMs are preconfigured to boot initially from QSPI. +This makes these boards different from other ZynqMP boards +in that the boot.bin and u-boot.itb files need to be flashed +into the QSPI boot flash such that U-Boot can then load all +of the remaining images from the SD card. + +In addition, the KV260 Starter Kit QSPI comes pre-flashed with +a utility designed to make updating the QSPI flash memory +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 + +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: + +Flashing u-boot.itb: + $ sf probe + $ fatload mmc 1 0x1000000 u-boot.itb + $ sf erase 0xf80000 +$filesize + $ sf write 0x1000000 0xf80000 $filesize + +Flashing boot.bin: + $ sf probe + $ fatload mmc 1 0x1000000 boot.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. diff --git a/board/zynqmp/kria/uboot.fragment b/board/zynqmp/kria/uboot.fragment new file mode 100644 index 00000000000..d8efc230a07 --- /dev/null +++ b/board/zynqmp/kria/uboot.fragment @@ -0,0 +1,11 @@ +CONFIG_SYS_SPI_U_BOOT_OFFS=0xF80000 +CONFIG_MULTI_DTB_FIT=y +CONFIG_DTB_RESELECT=y +CONFIG_DMA=y +CONFIG_XILINX_DPDMA=y +CONFIG_PHY=y +CONFIG_PHY_XILINX_ZYNQMP=y +CONFIG_PINCTRL=y +CONFIG_PINCONF=y +CONFIG_VIDEO_ZYNQMP_DPSUB=y +CONFIG_SF_DEFAULT_SPEED=40000000 diff --git a/board/zynqmp/post-build.sh b/board/zynqmp/post-build.sh index 9fd8bbf2c8d..747991e3f1d 100755 --- a/board/zynqmp/post-build.sh +++ b/board/zynqmp/post-build.sh @@ -3,6 +3,13 @@ # genimage will need to find the extlinux.conf # in the binaries directory -BOARD_DIR="$(dirname $0)" +CONSOLE="$2" +ROOT="$3" -install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux.conf +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/zynqmp/post-image.sh b/board/zynqmp/post-image.sh index ed6dbe188c0..f44b66342d4 100755 --- a/board/zynqmp/post-image.sh +++ b/board/zynqmp/post-image.sh @@ -5,11 +5,11 @@ # devicetree listed in the config. FIRST_DT=$(sed -nr \ - -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/([-_/[:alnum:]\\.]*).*"$|\1|p' \ - ${BR2_CONFIG}) + -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="(xilinx/)?([-_/[:alnum:]\\.]*).*"$|\2|p' \ + "${BR2_CONFIG}") -[ -z "${FIRST_DT}" ] || ln -fs ${FIRST_DT}.dtb ${BINARIES_DIR}/system.dtb +[ -z "${FIRST_DT}" ] || ln -fs "${FIRST_DT}.dtb" "${BINARIES_DIR}/system.dtb" -BOARD_DIR="$(dirname $0)" +BOARD_DIR="$(dirname "$0")" -support/scripts/genimage.sh -c $BOARD_DIR/genimage.cfg +support/scripts/genimage.sh -c "${BOARD_DIR}/genimage.cfg" diff --git a/board/zynqmp/zcu102/uboot.fragment b/board/zynqmp/zcu102/uboot.fragment deleted file mode 100644 index 52d6d9dff82..00000000000 --- a/board/zynqmp/zcu102/uboot.fragment +++ /dev/null @@ -1 +0,0 @@ -CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu102-rev1.0" diff --git a/board/zynqmp/zcu106/uboot.fragment b/board/zynqmp/zcu106/uboot.fragment deleted file mode 100644 index cd571171ac2..00000000000 --- a/board/zynqmp/zcu106/uboot.fragment +++ /dev/null @@ -1 +0,0 @@ -CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu106-revA" diff --git a/boot/Config.in b/boot/Config.in index 40472ae07da..58366e035ea 100644 --- a/boot/Config.in +++ b/boot/Config.in @@ -12,7 +12,6 @@ source "boot/binaries-marvell/Config.in" source "boot/boot-wrapper-aarch64/Config.in" source "boot/edk2/Config.in" source "boot/grub2/Config.in" -source "boot/gummiboot/Config.in" source "boot/lpc32xxcdl/Config.in" source "boot/mv-ddr-marvell/Config.in" source "boot/mxs-bootlets/Config.in" @@ -20,8 +19,8 @@ source "boot/optee-os/Config.in" source "boot/opensbi/Config.in" source "boot/s500-bootloader/Config.in" source "boot/shim/Config.in" -source "boot/sun20i-d1-spl/Config.in" source "boot/syslinux/Config.in" +source "boot/ti-k3-r5-loader/Config.in" source "boot/uboot/Config.in" source "boot/vexpress-firmware/Config.in" diff --git a/boot/afboot-stm32/0001-Pass-fno-builtin-to-fix-build-with-gcc-10.patch b/boot/afboot-stm32/0001-Pass-fno-builtin-to-fix-build-with-gcc-10.patch index 5ef47b59ff5..aef283270e7 100644 --- a/boot/afboot-stm32/0001-Pass-fno-builtin-to-fix-build-with-gcc-10.patch +++ b/boot/afboot-stm32/0001-Pass-fno-builtin-to-fix-build-with-gcc-10.patch @@ -1,4 +1,4 @@ -From 5448f328ff63a6ca4a64519c2f1dfc63a33df4b7 Mon Sep 17 00:00:00 2001 +From 9901603e18524c4c52fd1dd47bda4ab4016628fc Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 10 Sep 2020 11:37:33 +0200 Subject: [PATCH] Pass -fno-builtin to fix build with gcc 10 @@ -23,7 +23,7 @@ stm32f429i-disco.c:(.text.reset+0x1a): undefined reference to `memcpy' /home/thomas/projets/buildroot/output/host/opt/ext-toolchain/bin/../arm-buildroot-uclinux-uclibcgnueabi/bin/ld.real: stm32f429i-disco.c:(.text.reset+0x34): undefined reference to `memset' make[1]: *** [Makefile:26: stm32f429i-disco] Error 1 -Upstream: https://github.com/mcoquelin-stm32/afboot-stm32/pull/9 +Upstream: https://github.com/mcoquelin-stm32/afboot-stm32/pull/11 Signed-off-by: Thomas Petazzoni --- Makefile | 1 + @@ -42,5 +42,5 @@ index f699176..1e8557d 100644 obj-y += gpio.o mpu.o qspi.o start_kernel.o -- -2.26.2 +2.35.1 diff --git a/boot/afboot-stm32/0002-Makefile-drop-nostartfiles.patch b/boot/afboot-stm32/0002-Makefile-drop-nostartfiles.patch new file mode 100644 index 00000000000..7e5a6430bcd --- /dev/null +++ b/boot/afboot-stm32/0002-Makefile-drop-nostartfiles.patch @@ -0,0 +1,40 @@ +From be760c062c5d05bd2223f3916afafd37120d3318 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Thu, 28 Apr 2022 22:47:09 +0200 +Subject: [PATCH] Makefile: drop -nostartfiles + +In commit 0f3e61c9dd48fd8b4248ce4672c044c2562e4de1 ("Use ld instead of +gcc for linking "), we started using ld instead of gcc for the link +step. This worked fine for a while, but recent versions of ld no +longer accept the -nostartfiles option, causing the build to break: + +Error: unable to disambiguate: -nostartfiles (did you mean --nostartfiles ?) + +In fact, -nostartfiles was passed to gcc prior to +0f3e61c9dd48fd8b4248ce4672c044c2562e4de1, but it is not a ld +option. It is only by luck that it was accepted and ignored by older +ld versions. Since this option is useless when calling ld directly, we +can simply drop it. + +Upstream: https://github.com/mcoquelin-stm32/afboot-stm32/pull/11 +Signed-off-by: Thomas Petazzoni +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 1e8557d..8f42be1 100644 +--- a/Makefile ++++ b/Makefile +@@ -14,7 +14,7 @@ CFLAGS := -mthumb -mcpu=cortex-m4 + CFLAGS += -ffunction-sections -fdata-sections + CFLAGS += -Os -std=gnu99 -Wall + CFLAGS += -fno-builtin +-LINKERFLAGS := -nostartfiles --gc-sections ++LINKERFLAGS := --gc-sections + + obj-y += gpio.o mpu.o qspi.o start_kernel.o + obj-f4 += $(obj-y) usart-f4.o +-- +2.35.1 + diff --git a/boot/afboot-stm32/0003-Makefile-disable-stack-protector.patch b/boot/afboot-stm32/0003-Makefile-disable-stack-protector.patch new file mode 100644 index 00000000000..27a81b45d55 --- /dev/null +++ b/boot/afboot-stm32/0003-Makefile-disable-stack-protector.patch @@ -0,0 +1,36 @@ +From d65b07d6fe438e760fdbc33a8e42650a27d5b417 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 31 Dec 2022 11:09:38 +0100 +Subject: [PATCH] Makefile: disable stack-protector + +Disable stack-protector to avoid the following build failure: + +/home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld -T stm32f429.lds --gc-sections -o stm32f469i-disco.elf stm32f469i-disco.o gpio.o mpu.o qspi.o start_kernel.o usart-f4.o +/home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.o: in function `main': +stm32f469i-disco.c:(.text.startup.main+0x3b0): undefined reference to `__stack_chk_guard' +/home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.c:(.text.startup.main+0x4c0): undefined reference to `__stack_chk_fail' +/home/autobuild/autobuild/instance-14/output-1/host/bin/arm-buildroot-linux-gnueabi-ld: stm32f469i-disco.c:(.text.startup.main+0x4ec): undefined reference to `__stack_chk_guard' + +Fixes: + - http://autobuild.buildroot.org/results/fa6ffab24c3998f21034ab24e8d2852cacde08c1 + +Signed-off-by: Fabrice Fontaine +--- + Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile b/Makefile +index 8f42be1..8da7a25 100644 +--- a/Makefile ++++ b/Makefile +@@ -14,6 +14,7 @@ CFLAGS := -mthumb -mcpu=cortex-m4 + CFLAGS += -ffunction-sections -fdata-sections + CFLAGS += -Os -std=gnu99 -Wall + CFLAGS += -fno-builtin ++CFLAGS += -fno-stack-protector + LINKERFLAGS := --gc-sections + + obj-y += gpio.o mpu.o qspi.o start_kernel.o +-- +2.35.1 + diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted-firmware/Config.in index b1fc03e10b1..a9b9bbcc5a1 100644 --- a/boot/arm-trusted-firmware/Config.in +++ b/boot/arm-trusted-firmware/Config.in @@ -1,7 +1,6 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE bool "ARM Trusted Firmware (ATF)" - depends on (BR2_ARM_CPU_ARMV8A || BR2_ARM_CPU_ARMV7A) && \ - (BR2_TARGET_UBOOT || BR2_TARGET_EDK2) + depends on (BR2_ARM_CPU_ARMV8A || BR2_ARM_CPU_ARMV7A) help Enable this option if you want to build the ATF for your ARM based embedded device. @@ -15,7 +14,7 @@ choice Select the specific ATF version you want to use config BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION - bool "v2.5" + bool "v2.7" config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION bool "Custom version" @@ -43,7 +42,7 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE config BR2_TARGET_ARM_TRUSTED_FIRMWARE_VERSION string - default "v2.5" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION + default "v2.7" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION default "custom" if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL default BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION \ if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT @@ -68,6 +67,12 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM help Target plaform to build for. +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD + string "ATF target board" + help + Target board to build for. In many cases, this can be left + empty. + config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_DTS_PATH string "Device Tree Source file paths" help @@ -157,6 +162,14 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_EDK2_AS_BL33 for the 'qemu_sbsa' platform. In this case, due to the EDK2 build system, the dependency between ATF and EDK is reversed. +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_RCW + bool "Include NXP RCW in BL2" + depends on BR2_PACKAGE_HOST_QORIQ_RCW + help + Include the NXP RCW (Reset Control Word) in BL2. See + package/qoriq-rcw/ for more details. This is mostly useful + on NXP LayerScape platforms. + config BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_TARGETS string "Additional ATF make targets" help @@ -199,7 +212,6 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN config BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP bool "Build with SSP" - default y depends on BR2_TOOLCHAIN_HAS_SSP depends on !BR2_SSP_NONE help @@ -213,10 +225,6 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP config BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP_LEVEL string - # While newer versions of TF-A support "none" as - # ENABLE_STACK_PROTECTOR value, older versions (e.g 2.0) only - # supported "0" to disable SSP. - default "0" if !BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP default "default" if BR2_SSP_REGULAR default "strong" if BR2_SSP_STRONG default "all" if BR2_SSP_ALL diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.hash b/boot/arm-trusted-firmware/arm-trusted-firmware.hash index 80402ec374b..d931610dc43 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d12a824afcc5cb90d005f9820f3274f1319cef1bb282e40a6a190b75900206d3 arm-trusted-firmware-v2.5.tar.gz -sha256 0171b0795501ee90634fbc4a7835e2fb215d9423daf1cf5b0d0682adde12c597 docs/license.rst +sha256 327c65b1bc231608a7a808b068b00c1a22310e9fc86158813cd10a9711d5725e arm-trusted-firmware-v2.7.tar.gz +sha256 130d0c6e5159fa454b1e969fd281fa1d388819aefb203f65dd282544b5ab7ba9 docs/license.rst diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk index 03fa83b7b50..1164c814106 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk @@ -6,7 +6,7 @@ ARM_TRUSTED_FIRMWARE_VERSION = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_VERSION)) -ifeq ($(ARM_TRUSTED_FIRMWARE_VERSION),custom) +ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL),y) # Handle custom ATF tarballs as specified by the configuration ARM_TRUSTED_FIRMWARE_TARBALL = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION)) ARM_TRUSTED_FIRMWARE_SITE = $(patsubst %/,%,$(dir $(ARM_TRUSTED_FIRMWARE_TARBALL))) @@ -36,26 +36,48 @@ ARM_TRUSTED_FIRMWARE_DEPENDENCIES += host-dtc endif ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN),y) -ARM_TRUSTED_FIRMWARE_DEPENDENCIES += host-arm-gnu-a-toolchain +ARM_TRUSTED_FIRMWARE_DEPENDENCIES += host-arm-gnu-toolchain endif ARM_TRUSTED_FIRMWARE_PLATFORM = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM)) +ARM_TRUSTED_FIRMWARE_TARGET_BOARD = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD)) + ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_DEBUG),y) ARM_TRUSTED_FIRMWARE_MAKE_OPTS += DEBUG=1 +ifneq ($(ARM_TRUSTED_FIRMWARE_TARGET_BOARD),) +ARM_TRUSTED_FIRMWARE_IMG_DIR = $(@D)/build/$(ARM_TRUSTED_FIRMWARE_PLATFORM)/$(ARM_TRUSTED_FIRMWARE_TARGET_BOARD)/debug +else ARM_TRUSTED_FIRMWARE_IMG_DIR = $(@D)/build/$(ARM_TRUSTED_FIRMWARE_PLATFORM)/debug +endif +else +ifneq ($(ARM_TRUSTED_FIRMWARE_TARGET_BOARD),) +ARM_TRUSTED_FIRMWARE_IMG_DIR = $(@D)/build/$(ARM_TRUSTED_FIRMWARE_PLATFORM)/$(ARM_TRUSTED_FIRMWARE_TARGET_BOARD)/release else ARM_TRUSTED_FIRMWARE_IMG_DIR = $(@D)/build/$(ARM_TRUSTED_FIRMWARE_PLATFORM)/release endif +endif ARM_TRUSTED_FIRMWARE_MAKE_OPTS += \ CROSS_COMPILE="$(TARGET_CROSS)" \ $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES)) \ - PLAT=$(ARM_TRUSTED_FIRMWARE_PLATFORM) + PLAT=$(ARM_TRUSTED_FIRMWARE_PLATFORM) \ + TARGET_BOARD=$(ARM_TRUSTED_FIRMWARE_TARGET_BOARD) + +ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP),y) +ARM_TRUSTED_FIRMWARE_MAKE_OPTS += \ + ENABLE_STACK_PROTECTOR=$(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP_LEVEL)) +else +ARM_TRUSTED_FIRMWARE_CFLAGS += -fno-stack-protector +endif + +ifeq ($(BR2_PIC_PIE),y) +ARM_TRUSTED_FIRMWARE_CFLAGS += -fno-PIE +endif ARM_TRUSTED_FIRMWARE_MAKE_ENV += \ $(TARGET_MAKE_ENV) \ - ENABLE_STACK_PROTECTOR=$(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP_LEVEL)) + CFLAGS="$(ARM_TRUSTED_FIRMWARE_CFLAGS)" ifeq ($(BR2_ARM_CPU_ARMV7A),y) ARM_TRUSTED_FIRMWARE_MAKE_OPTS += ARM_ARCH_MAJOR=7 @@ -132,6 +154,12 @@ define ARM_TRUSTED_FIRMWARE_BUILD_FIPTOOL endef endif +ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_RCW),y) +ARM_TRUSTED_FIRMWARE_DEPENDENCIES += host-qoriq-rcw +ARM_TRUSTED_FIRMWARE_MAKE_TARGETS += pbl +ARM_TRUSTED_FIRMWARE_MAKE_OPTS += RCW=$(BINARIES_DIR)/PBL.bin +endif + ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31),y) ARM_TRUSTED_FIRMWARE_MAKE_TARGETS += bl31 endif @@ -189,9 +217,9 @@ endef # Configuration check ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE)$(BR_BUILDING),yy) -ifeq ($(ARM_TRUSTED_FIRMWARE_VERSION),custom) -ifeq ($(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION))),) -$(error No tarball location specified. Please check BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION)) +ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL),y) +ifeq ($(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION)),) +$(error No tarball location specified. Please check BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION) endif endif diff --git a/boot/arm-trusted-firmware/v2.8/0002-build-tools-avoid-unnecessary-link.patch b/boot/arm-trusted-firmware/v2.8/0002-build-tools-avoid-unnecessary-link.patch new file mode 100644 index 00000000000..9e0ea74248b --- /dev/null +++ b/boot/arm-trusted-firmware/v2.8/0002-build-tools-avoid-unnecessary-link.patch @@ -0,0 +1,77 @@ +From aa57ce632c629fe72ff417e261e0f5bfd8db6bab Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= +Date: Tue, 4 Jul 2023 16:14:02 +0200 +Subject: [PATCH] build(tools): avoid unnecessary link +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +In their respective makefiles, cert_create, encrypt_fw and fiptool +depend on the --openssl phony target as a prerequisite. This forces +those tools to be re-linked each time. + +Move the dependencies on the --openssl target from the tools to their +makefiles all targets, to avoid unnecessary linking while preserving the +OpenSSL version printing done in the --openssl targets when in debug. + +Fixes: cf2dd17ddda2 ("refactor(security): add OpenSSL 1.x compatibility") +Signed-off-by: Vincent Stehlé +Change-Id: I98a3ab30f36dffc253cecaaf3a57d2712522135d +Upstream: https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/commit/?id=aa57ce632c629fe72ff417e261e0f5bfd8db6bab +--- + tools/cert_create/Makefile | 4 ++-- + tools/encrypt_fw/Makefile | 4 ++-- + tools/fiptool/Makefile | 4 ++-- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/tools/cert_create/Makefile b/tools/cert_create/Makefile +index 042e844626..b911d19d2b 100644 +--- a/tools/cert_create/Makefile ++++ b/tools/cert_create/Makefile +@@ -85,9 +85,9 @@ HOSTCC ?= gcc + + .PHONY: all clean realclean --openssl + +-all: ${BINARY} ++all: --openssl ${BINARY} + +-${BINARY}: --openssl ${OBJECTS} Makefile ++${BINARY}: ${OBJECTS} Makefile + @echo " HOSTLD $@" + @echo 'const char build_msg[] = "Built : "__TIME__", "__DATE__; \ + const char platform_msg[] = "${PLAT_MSG}";' | \ +diff --git a/tools/encrypt_fw/Makefile b/tools/encrypt_fw/Makefile +index 2939b142be..924e5febab 100644 +--- a/tools/encrypt_fw/Makefile ++++ b/tools/encrypt_fw/Makefile +@@ -65,9 +65,9 @@ HOSTCC ?= gcc + + .PHONY: all clean realclean --openssl + +-all: ${BINARY} ++all: --openssl ${BINARY} + +-${BINARY}: --openssl ${OBJECTS} Makefile ++${BINARY}: ${OBJECTS} Makefile + @echo " HOSTLD $@" + @echo 'const char build_msg[] = "Built : "__TIME__", "__DATE__;' | \ + ${HOSTCC} -c ${HOSTCCFLAGS} -xc - -o src/build_msg.o +diff --git a/tools/fiptool/Makefile b/tools/fiptool/Makefile +index 2ebee33931..4bdebd9235 100644 +--- a/tools/fiptool/Makefile ++++ b/tools/fiptool/Makefile +@@ -68,9 +68,9 @@ DEPS := $(patsubst %.o,%.d,$(OBJECTS)) + + .PHONY: all clean distclean --openssl + +-all: ${PROJECT} ++all: --openssl ${PROJECT} + +-${PROJECT}: --openssl ${OBJECTS} Makefile ++${PROJECT}: ${OBJECTS} Makefile + @echo " HOSTLD $@" + ${Q}${HOSTCC} ${OBJECTS} -o $@ ${LDLIBS} + @${ECHO_BLANK_LINE} +-- +2.25.1 + diff --git a/boot/arm-trusted-firmware/v2.9/0001-build-tools-avoid-unnecessary-link.patch b/boot/arm-trusted-firmware/v2.9/0001-build-tools-avoid-unnecessary-link.patch new file mode 100644 index 00000000000..9e0ea74248b --- /dev/null +++ b/boot/arm-trusted-firmware/v2.9/0001-build-tools-avoid-unnecessary-link.patch @@ -0,0 +1,77 @@ +From aa57ce632c629fe72ff417e261e0f5bfd8db6bab Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= +Date: Tue, 4 Jul 2023 16:14:02 +0200 +Subject: [PATCH] build(tools): avoid unnecessary link +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +In their respective makefiles, cert_create, encrypt_fw and fiptool +depend on the --openssl phony target as a prerequisite. This forces +those tools to be re-linked each time. + +Move the dependencies on the --openssl target from the tools to their +makefiles all targets, to avoid unnecessary linking while preserving the +OpenSSL version printing done in the --openssl targets when in debug. + +Fixes: cf2dd17ddda2 ("refactor(security): add OpenSSL 1.x compatibility") +Signed-off-by: Vincent Stehlé +Change-Id: I98a3ab30f36dffc253cecaaf3a57d2712522135d +Upstream: https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/commit/?id=aa57ce632c629fe72ff417e261e0f5bfd8db6bab +--- + tools/cert_create/Makefile | 4 ++-- + tools/encrypt_fw/Makefile | 4 ++-- + tools/fiptool/Makefile | 4 ++-- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/tools/cert_create/Makefile b/tools/cert_create/Makefile +index 042e844626..b911d19d2b 100644 +--- a/tools/cert_create/Makefile ++++ b/tools/cert_create/Makefile +@@ -85,9 +85,9 @@ HOSTCC ?= gcc + + .PHONY: all clean realclean --openssl + +-all: ${BINARY} ++all: --openssl ${BINARY} + +-${BINARY}: --openssl ${OBJECTS} Makefile ++${BINARY}: ${OBJECTS} Makefile + @echo " HOSTLD $@" + @echo 'const char build_msg[] = "Built : "__TIME__", "__DATE__; \ + const char platform_msg[] = "${PLAT_MSG}";' | \ +diff --git a/tools/encrypt_fw/Makefile b/tools/encrypt_fw/Makefile +index 2939b142be..924e5febab 100644 +--- a/tools/encrypt_fw/Makefile ++++ b/tools/encrypt_fw/Makefile +@@ -65,9 +65,9 @@ HOSTCC ?= gcc + + .PHONY: all clean realclean --openssl + +-all: ${BINARY} ++all: --openssl ${BINARY} + +-${BINARY}: --openssl ${OBJECTS} Makefile ++${BINARY}: ${OBJECTS} Makefile + @echo " HOSTLD $@" + @echo 'const char build_msg[] = "Built : "__TIME__", "__DATE__;' | \ + ${HOSTCC} -c ${HOSTCCFLAGS} -xc - -o src/build_msg.o +diff --git a/tools/fiptool/Makefile b/tools/fiptool/Makefile +index 2ebee33931..4bdebd9235 100644 +--- a/tools/fiptool/Makefile ++++ b/tools/fiptool/Makefile +@@ -68,9 +68,9 @@ DEPS := $(patsubst %.o,%.d,$(OBJECTS)) + + .PHONY: all clean distclean --openssl + +-all: ${PROJECT} ++all: --openssl ${PROJECT} + +-${PROJECT}: --openssl ${OBJECTS} Makefile ++${PROJECT}: ${OBJECTS} Makefile + @echo " HOSTLD $@" + ${Q}${HOSTCC} ${OBJECTS} -o $@ ${LDLIBS} + @${ECHO_BLANK_LINE} +-- +2.25.1 + diff --git a/boot/at91dataflashboot/Config.in b/boot/at91dataflashboot/Config.in index 4055f964107..8b37d844095 100644 --- a/boot/at91dataflashboot/Config.in +++ b/boot/at91dataflashboot/Config.in @@ -1,3 +1,3 @@ config BR2_TARGET_AT91DATAFLASHBOOT bool "AT91 DataFlashBoot" - depends on BR2_arm926t + depends on BR2_arm && BR2_arm926t diff --git a/boot/at91dataflashboot/at91dataflashboot.mk b/boot/at91dataflashboot/at91dataflashboot.mk index 0ad8b6fc447..cb329a90dff 100644 --- a/boot/at91dataflashboot/at91dataflashboot.mk +++ b/boot/at91dataflashboot/at91dataflashboot.mk @@ -11,8 +11,14 @@ AT91DATAFLASHBOOT_SITE = ftp://www.at91.com/pub/buildroot AT91DATAFLASHBOOT_INSTALL_TARGET = NO AT91DATAFLASHBOOT_INSTALL_IMAGES = YES +AT91DATAFLASHBOOT_CFLAGS = $(TARGET_CFLAGS) -fno-stack-protector +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +AT91DATAFLASHBOOT_CFLAGS += -marm +endif + define AT91DATAFLASHBOOT_BUILD_CMDS - make -C $(@D) CROSS_COMPILE=$(TARGET_CROSS) + make -C $(@D) CROSS_COMPILE=$(TARGET_CROSS) \ + CFLAGS="$(AT91DATAFLASHBOOT_CFLAGS)" endef define AT91DATAFLASHBOOT_INSTALL_IMAGES_CMDS diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in index 23f8a5ac8ad..3961c69c567 100644 --- a/boot/barebox/Config.in +++ b/boot/barebox/Config.in @@ -12,7 +12,7 @@ choice Select the specific Barebox version you want to use config BR2_TARGET_BAREBOX_LATEST_VERSION - bool "2021.12.0" + bool "2022.12.0" config BR2_TARGET_BAREBOX_CUSTOM_VERSION bool "Custom version" @@ -40,7 +40,7 @@ endif config BR2_TARGET_BAREBOX_VERSION string - default "2021.12.0" if BR2_TARGET_BAREBOX_LATEST_VERSION + default "2022.12.0" if BR2_TARGET_BAREBOX_LATEST_VERSION default BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE if BR2_TARGET_BAREBOX_CUSTOM_VERSION default "custom" if BR2_TARGET_BAREBOX_CUSTOM_TARBALL default BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT diff --git a/boot/barebox/barebox.hash b/boot/barebox/barebox.hash index 0a853866b59..161fc43d43d 100644 --- a/boot/barebox/barebox.hash +++ b/boot/barebox/barebox.hash @@ -1,8 +1,8 @@ -# From https://www.barebox.org/download/barebox-2021.12.0.tar.bz2.md5 -md5 199b6d7ff3441cec2062ab18a52454dc barebox-2021.12.0.tar.bz2 +# From https://www.barebox.org/download/barebox-2022.12.0.tar.bz2.md5 +md5 e4bf25cbf1e0b0c9a67ee56214617b9c barebox-2022.12.0.tar.bz2 # Locally calculated -sha256 555569fe9e71524e0bf927eaa2c1aa2e81ee2c34dd71e39fe21620db6ccc8aa6 barebox-2021.12.0.tar.bz2 +sha256 9f570d4ae089560bd6c17b2b7d21cdb6557ecb00612c77ecee72ac47575a6b74 barebox-2022.12.0.tar.bz2 # License files, locally computed sha256 ab1122aa9f9073ad1ec824edcd970b16a6a7881a34a18fd56c080debb2dca5d4 COPYING diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk index 6506294d6df..d7bcafe436e 100644 --- a/boot/barebox/barebox.mk +++ b/boot/barebox/barebox.mk @@ -17,7 +17,7 @@ define inner-barebox-package $(1)_VERSION = $$(call qstrip,$$(BR2_TARGET_BAREBOX_VERSION)) -ifeq ($$($(1)_VERSION),custom) +ifeq ($$(BR2_TARGET_BAREBOX_CUSTOM_TARBALL),y) # Handle custom Barebox tarballs as specified by the configuration $(1)_TARBALL = $$(call qstrip,$$(BR2_TARGET_BAREBOX_CUSTOM_TARBALL_LOCATION)) $(1)_SITE = $$(patsubst %/,%,$$(dir $$($(1)_TARBALL))) @@ -74,6 +74,13 @@ endif $(1)_MAKE_FLAGS = ARCH=$$($(1)_ARCH) CROSS_COMPILE="$$(TARGET_CROSS)" $(1)_MAKE_ENV = $$(TARGET_MAKE_ENV) +ifeq ($$(BR2_REPRODUCIBLE),y) +$(1)_MAKE_ENV += \ + KBUILD_BUILD_USER=buildroot \ + KBUILD_BUILD_HOST=buildroot \ + KBUILD_BUILD_TIMESTAMP="$$(shell LC_ALL=C TZ='UTC' date -d @$(SOURCE_DATE_EPOCH))" +endif + ifeq ($$(BR2_TARGET_$(1)_USE_DEFCONFIG),y) $(1)_KCONFIG_DEFCONFIG = $$(call qstrip,$$(BR2_TARGET_$(1)_BOARD_DEFCONFIG))_defconfig else ifeq ($$(BR2_TARGET_$(1)_USE_CUSTOM_CONFIG),y) @@ -121,7 +128,7 @@ endef define $(1)_BUILD_CMDS $$($(1)_BUILD_BAREBOXENV_CMDS) - $$(TARGET_MAKE_ENV) $$(MAKE) $$($(1)_MAKE_FLAGS) -C $$(@D) + $$($(1)_MAKE_ENV) $$(MAKE) $$($(1)_MAKE_FLAGS) -C $$(@D) $$($(1)_BUILD_CUSTOM_ENV) endef diff --git a/boot/beaglev-ddrinit/beaglev-ddrinit.hash b/boot/beaglev-ddrinit/beaglev-ddrinit.hash index 2aaab53a3b8..d4235904d1c 100644 --- a/boot/beaglev-ddrinit/beaglev-ddrinit.hash +++ b/boot/beaglev-ddrinit/beaglev-ddrinit.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2d491f64bd77de9dfd4b8ae6c00e83670e80c205cc20917fefa6194b1dc1fe4e beaglev-ddrinit-c0839f25246d9e308c23498d344ca13d8a7ad6ed.tar.gz +sha256 08a49355f89fc2cb4f5101183339c9c6f86b722545d0abbc319aab26a511dad7 beaglev-ddrinit-8d6318acfe71e790c983b34448c9abfcfcec3ed8.tar.gz sha256 284d26192537710910ec1f112ec5f4c981601ae23702391986d6ce0b8ba90813 LICENSE diff --git a/boot/beaglev-ddrinit/beaglev-ddrinit.mk b/boot/beaglev-ddrinit/beaglev-ddrinit.mk index 76406ed4c59..d9707de6104 100644 --- a/boot/beaglev-ddrinit/beaglev-ddrinit.mk +++ b/boot/beaglev-ddrinit/beaglev-ddrinit.mk @@ -5,7 +5,7 @@ ################################################################################ # Commit on the 'starfive' branch -BEAGLEV_DDRINIT_VERSION = c0839f25246d9e308c23498d344ca13d8a7ad6ed +BEAGLEV_DDRINIT_VERSION = 8d6318acfe71e790c983b34448c9abfcfcec3ed8 BEAGLEV_DDRINIT_SITE = $(call github,starfive-tech,beagle_ddrinit,$(BEAGLEV_DDRINIT_VERSION)) BEAGLEV_DDRINIT_INSTALL_TARGET = NO BEAGLEV_DDRINIT_INSTALL_IMAGES = YES @@ -15,7 +15,7 @@ BEAGLEV_DDRINIT_LICENSE_FILES = LICENSE define BEAGLEV_DDRINIT_BUILD_CMDS $(MAKE) -C $(@D)/build \ - CROSSCOMPILE=$(HOST_DIR)/bin/riscv64-unknown-elf- \ + CROSS_COMPILE=$(HOST_DIR)/bin/riscv64-unknown-elf- \ SUFFIX=buildroot \ GIT_VERSION=$(BEAGLEV_DDRINIT_VERSION) endef diff --git a/boot/beaglev-secondboot/beaglev-secondboot.hash b/boot/beaglev-secondboot/beaglev-secondboot.hash index efc93347b16..d35d3a38564 100644 --- a/boot/beaglev-secondboot/beaglev-secondboot.hash +++ b/boot/beaglev-secondboot/beaglev-secondboot.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 fe4d37f3ff38e7f2da70a08f9cb1668c0b928e85d2e0935bd985f910b3ce30e9 beaglev-secondboot-2d20047960044308126117ad56bc08a1164e82b2.tar.gz +sha256 bf152500e9f7e467bb1dee95a2291f9ecfaaebe1d64b93f6d403cfaf50e540e0 beaglev-secondboot-e17302063c9a4b74475b18ff24dd149c27257354.tar.gz sha256 284d26192537710910ec1f112ec5f4c981601ae23702391986d6ce0b8ba90813 LICENSE diff --git a/boot/beaglev-secondboot/beaglev-secondboot.mk b/boot/beaglev-secondboot/beaglev-secondboot.mk index a423c6c6a69..7e5f5681f4a 100644 --- a/boot/beaglev-secondboot/beaglev-secondboot.mk +++ b/boot/beaglev-secondboot/beaglev-secondboot.mk @@ -5,7 +5,7 @@ ################################################################################ # Commit on the 'starfive' branch -BEAGLEV_SECONDBOOT_VERSION = 2d20047960044308126117ad56bc08a1164e82b2 +BEAGLEV_SECONDBOOT_VERSION = e17302063c9a4b74475b18ff24dd149c27257354 BEAGLEV_SECONDBOOT_SITE = $(call github,starfive-tech,beagle_secondBoot,$(BEAGLEV_SECONDBOOT_VERSION)) BEAGLEV_SECONDBOOT_INSTALL_TARGET = NO BEAGLEV_SECONDBOOT_INSTALL_IMAGES = YES @@ -15,14 +15,14 @@ BEAGLEV_SECONDBOOT_LICENSE_FILES = LICENSE define BEAGLEV_SECONDBOOT_BUILD_CMDS $(MAKE) -C $(@D)/build \ - CROSSCOMPILE=$(HOST_DIR)/bin/riscv64-unknown-elf- \ + CROSS_COMPILE=$(HOST_DIR)/bin/riscv64-unknown-elf- \ SUFFIX=buildroot \ GIT_VERSION=$(BEAGLEV_SECONDBOOT_VERSION) endef define BEAGLEV_SECONDBOOT_INSTALL_IMAGES_CMDS - $(INSTALL) -D -m 0644 $(@D)/build/bootloader-BEAGLEV-buildroot.bin.out \ - $(BINARIES_DIR)/bootloader-BEAGLEV-buildroot.bin.out + $(INSTALL) -D -m 0644 $(@D)/build/bootloader-JH7100-buildroot.bin.out \ + $(BINARIES_DIR)/bootloader-JH7100-buildroot.bin.out endef $(eval $(generic-package)) diff --git a/boot/binaries-marvell/binaries-marvell.hash b/boot/binaries-marvell/binaries-marvell.hash index a7d5928a5da..654fb94ec02 100644 --- a/boot/binaries-marvell/binaries-marvell.hash +++ b/boot/binaries-marvell/binaries-marvell.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d818c95bcd4d5c026238d6e554151184ed7fea15bce1f861f9068b97b4cd320a binaries-marvell-c5d3ef2b63ba66d8717ecbe679fd2e639cde88ee.tar.gz -sha256 e6d08ef60068ee72c68835001a24eb832dcba27cac0dde0f179dfb428be050ca README.md +sha256 d818c95bcd4d5c026238d6e554151184ed7fea15bce1f861f9068b97b4cd320a binaries-marvell-c5d3ef2b63ba66d8717ecbe679fd2e639cde88ee.tar.gz +sha256 e6d08ef60068ee72c68835001a24eb832dcba27cac0dde0f179dfb428be050ca README.md diff --git a/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk b/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk index 3a1af9b02c7..30b352f8e7d 100644 --- a/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk +++ b/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk @@ -5,7 +5,8 @@ ################################################################################ BOOT_WRAPPER_AARCH64_VERSION = 8d5a765251d9113c3c0f9fa14de42a9e7486fe8a -BOOT_WRAPPER_AARCH64_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/mark/boot-wrapper-aarch64.git +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 BOOT_WRAPPER_AARCH64_LICENSE_FILES = LICENSE.txt BOOT_WRAPPER_AARCH64_DEPENDENCIES = linux diff --git a/boot/edk2/Config.in b/boot/edk2/Config.in index df723122ee0..855a62f70b3 100644 --- a/boot/edk2/Config.in +++ b/boot/edk2/Config.in @@ -88,6 +88,7 @@ config BR2_TARGET_EDK2_PLATFORM_SOLIDRUN_ARMADA80X0MCBIN bool "SolidRun MacchiatoBin" depends on BR2_aarch64 depends on BR2_TARGET_ARM_TRUSTED_FIRMWARE + select BR2_PACKAGE_EDK2_NON_OSI select BR2_PACKAGE_HOST_DTC select BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP help diff --git a/boot/edk2/edk2.hash b/boot/edk2/edk2.hash index f28e9ce841b..94ee22ddc4e 100644 --- a/boot/edk2/edk2.hash +++ b/boot/edk2/edk2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 04791c13b414a6d1877182a6d565cb762c30aa63e49bb4d495fca68ef4dd209d edk2-edk2-stable202102-br1.tar.gz +sha256 c10520f269557d566e35fe8104141aa2865f9085ad2b3a30aae8a7e78a3ca5aa edk2-edk2-stable202208-br1.tar.gz sha256 50ce20c9cfdb0e19ee34fe0a51fc0afe961f743697b068359ab2f862b494df80 License.txt diff --git a/boot/edk2/edk2.mk b/boot/edk2/edk2.mk index 2b12de53cb1..fb6b9a32808 100644 --- a/boot/edk2/edk2.mk +++ b/boot/edk2/edk2.mk @@ -4,11 +4,11 @@ # ################################################################################ -EDK2_VERSION = edk2-stable202102 +EDK2_VERSION = edk2-stable202208 EDK2_SITE = https://github.com/tianocore/edk2 EDK2_SITE_METHOD = git -EDK2_LICENSE = BSD-2-Clause -EDK2_LICENSE_FILE = License.txt +EDK2_LICENSE = BSD-2-Clause-Patent +EDK2_LICENSE_FILES = License.txt EDK2_CPE_ID_VENDOR = tianocore EDK2_DEPENDENCIES = edk2-platforms host-python3 host-acpica host-util-linux EDK2_INSTALL_TARGET = NO @@ -47,7 +47,7 @@ endif EDK2_GIT_SUBMODULES = YES EDK2_BUILD_PACKAGES = $(@D)/Build/Buildroot -EDK2_PACKAGES_PATH = $(@D):$(EDK2_BUILD_PACKAGES):$(STAGING_DIR)/usr/share/edk2-platforms +EDK2_PACKAGES_PATHS = $(@D) $(EDK2_BUILD_PACKAGES) $(STAGING_DIR)/usr/share/edk2-platforms ifeq ($(BR2_TARGET_EDK2_PLATFORM_OVMF_I386),y) EDK2_ARCH = IA32 @@ -75,6 +75,12 @@ EDK2_PACKAGE_NAME = ArmVirtPkg EDK2_PLATFORM_NAME = ArmVirtQemuKernel EDK2_BUILD_DIR = $(EDK2_PLATFORM_NAME)-$(EDK2_ARCH) +else ifeq ($(BR2_TARGET_EDK2_PLATFORM_ARM_SGI575),y) +EDK2_ARCH = AARCH64 +EDK2_PACKAGE_NAME = Platform/ARM/SgiPkg/Sgi575 +EDK2_PLATFORM_NAME = Sgi575 +EDK2_BUILD_DIR = $(EDK2_PLATFORM_NAME) + else ifeq ($(BR2_TARGET_EDK2_PLATFORM_ARM_VEXPRESS_FVP_AARCH64),y) EDK2_ARCH = AARCH64 EDK2_PACKAGE_NAME = Platform/ARM/VExpressPkg @@ -102,12 +108,13 @@ endef else ifeq ($(BR2_TARGET_EDK2_PLATFORM_SOLIDRUN_ARMADA80X0MCBIN),y) EDK2_ARCH = AARCH64 -EDK2_DEPENDENCIES += host-dtc arm-trusted-firmware +EDK2_DEPENDENCIES += host-dtc arm-trusted-firmware edk2-non-osi EDK2_PACKAGE_NAME = Platform/SolidRun/Armada80x0McBin EDK2_PLATFORM_NAME = Armada80x0McBin EDK2_BUILD_DIR = $(EDK2_PLATFORM_NAME)-$(EDK2_ARCH) EDK2_BUILD_ENV += DTC_PREFIX=$(HOST_DIR)/bin/ EDK2_BUILD_OPTS += -D INCLUDE_TFTP_COMMAND +EDK2_PACKAGES_PATHS += $(STAGING_DIR)/usr/share/edk2-non-osi else ifeq ($(BR2_TARGET_EDK2_PLATFORM_QEMU_SBSA),y) EDK2_ARCH = AARCH64 @@ -128,6 +135,8 @@ EDK2_BASETOOLS_OPTS = \ EXTRA_LDFLAGS="$(HOST_LDFLAGS)" \ EXTRA_OPTFLAGS="$(HOST_CPPFLAGS)" +EDK2_PACKAGES_PATH = $(subst $(space),:,$(strip $(EDK2_PACKAGES_PATHS))) + EDK2_BUILD_ENV += \ WORKSPACE=$(@D) \ PACKAGES_PATH=$(EDK2_PACKAGES_PATH) \ diff --git a/boot/grub2/0001-Makefile-Make-grub_fstest.pp-depend-on-config-util.h.patch b/boot/grub2/0001-Makefile-Make-grub_fstest.pp-depend-on-config-util.h.patch new file mode 100644 index 00000000000..ea8787de7a8 --- /dev/null +++ b/boot/grub2/0001-Makefile-Make-grub_fstest.pp-depend-on-config-util.h.patch @@ -0,0 +1,45 @@ +From bb08b723fa7bc56439c7bc166cff361628e73453 Mon Sep 17 00:00:00 2001 +Message-Id: +From: Stefan Agner +Date: Fri, 5 Aug 2022 08:59:52 +0200 +Subject: [PATCH] Makefile: Make grub_fstest.pp depend on config-util.h + +Warning: This commit does not apply to the GRUB git repository. This +patch applies against the release tarballs. + +Upstream status: https://lists.gnu.org/archive/html/grub-devel/2022-08/msg00045.html +Signed-off-by: Stefan Agner +--- + Makefile.am | 2 +- + Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index bf9c1ba..f08cfc0 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -51,7 +51,7 @@ libgrub_a_init.c: libgrub_a_init.lst $(top_srcdir)/geninit.sh + CLEANFILES += libgrub_a_init.c + + # For grub-fstest +-grub_fstest.pp: $(grub_fstest_SOURCES) ++grub_fstest.pp: config-util.h $(grub_fstest_SOURCES) + $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(grub_fstest_CPPFLAGS) $(CPPFLAGS) \ + -D'GRUB_MOD_INIT(x)=@MARKER@x@' $^ > $@ || (rm -f $@; exit 1) + CLEANFILES += grub_fstest.pp +diff --git a/Makefile.in b/Makefile.in +index 13f2eef..2c1d20b 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -13312,7 +13312,7 @@ libgrub_a_init.c: libgrub_a_init.lst $(top_srcdir)/geninit.sh + sh $(top_srcdir)/geninit.sh `cat $<` > $@ || (rm -f $@; exit 1) + + # For grub-fstest +-grub_fstest.pp: $(grub_fstest_SOURCES) ++grub_fstest.pp: config-util.h $(grub_fstest_SOURCES) + $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(grub_fstest_CPPFLAGS) $(CPPFLAGS) \ + -D'GRUB_MOD_INIT(x)=@MARKER@x@' $^ > $@ || (rm -f $@; exit 1) + +-- +2.37.1 + diff --git a/boot/grub2/0001-build-Fix-GRUB-i386-pc-build-with-Ubuntu-gcc.patch b/boot/grub2/0001-build-Fix-GRUB-i386-pc-build-with-Ubuntu-gcc.patch deleted file mode 100644 index 357c825f3c8..00000000000 --- a/boot/grub2/0001-build-Fix-GRUB-i386-pc-build-with-Ubuntu-gcc.patch +++ /dev/null @@ -1,313 +0,0 @@ -From 6643507ce30f775008e093580f0c9499dfb2c485 Mon Sep 17 00:00:00 2001 -From: Simon Hardy -Date: Tue, 24 Mar 2020 13:29:12 +0000 -Subject: build: Fix GRUB i386-pc build with Ubuntu gcc - -With recent versions of gcc on Ubuntu a very large lzma_decompress.img file is -output. (e.g. 134479600 bytes instead of 2864.) This causes grub-mkimage to -fail with: "error: Decompressor is too big." - -This seems to be caused by a section .note.gnu.property that is placed at an -offset such that objcopy needs to pad the img file with zeros. - -This issue is present on: -Ubuntu 19.10 with gcc (Ubuntu 8.3.0-26ubuntu1~19.10) 8.3.0 -Ubuntu 19.10 with gcc (Ubuntu 9.2.1-9ubuntu2) 9.2.1 20191008 - -This issue is not present on: -Ubuntu 19.10 with gcc (Ubuntu 7.5.0-3ubuntu1~19.10) 7.5.0 -RHEL 8.0 with gcc 8.3.1 20190507 (Red Hat 8.3.1-4) - -The issue can be fixed by removing the section using objcopy as shown in -this patch. - -Signed-off-by: Simon Hardy -Reviewed-by: Daniel Kiper -[Retrieved (and updated to directly patch Makefile.in instead of -gentpl.py to avoid adding a dependency on python) from: -http://git.savannah.gnu.org/cgit/grub.git/commit/?id=6643507ce30f775008e093580f0c9499dfb2c485] -Signed-off-by: Fabrice Fontaine -[yann.morin.1998@free.fr: - - keep the part patching gentpl.py - - restore it as a git-formatted patch - - introduce the hunk about the generated .am file -] -Signed-off-by: Yann E. MORIN ---- - gentpl.py | 2 1 1 0 +- - grub-core/Makefile.in | 38 19 19 0 +++++++++++++++++++------------------- - 2 files changed, 20 insertions(+), 20 deletions(-) - -diff --git a/gentpl.py b/gentpl.py -index 387588c05..c86550d4f 100644 ---- a/gentpl.py -+++ b/gentpl.py -@@ -766,7 +766,7 @@ def image(defn, platform): - if test x$(TARGET_APPLE_LINKER) = x1; then \ - $(MACHO2IMG) $< $@; \ - else \ -- $(TARGET_OBJCOPY) $(""" + cname(defn) + """_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; \ -+ $(TARGET_OBJCOPY) $(""" + cname(defn) + """_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; \ - fi - """) - -diff --git a/grub-core/Makefile.core.am b/grub-core/Makefile.core.am -index 387588c05..c86550d4f 100644 ---- a/grub-core/Makefile.core.am -+++ 2/grub-core/Makefile.core.am -@@ -22897,7 +22897,7 @@ - CLEANFILES += boot.img - - boot.img: boot.image$(EXEEXT) -- if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - endif - -@@ -22918,7 +22918,7 @@ - CLEANFILES += boot.img - - boot.img: boot.image$(EXEEXT) -- if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - endif - -@@ -22939,7 +22939,7 @@ - CLEANFILES += boot.img - - boot.img: boot.image$(EXEEXT) -- if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - endif - -@@ -22960,7 +22960,7 @@ - CLEANFILES += boot_hybrid.img - - boot_hybrid.img: boot_hybrid.image$(EXEEXT) -- if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(boot_hybrid_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(boot_hybrid_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - endif - -@@ -22981,7 +22981,7 @@ - CLEANFILES += cdboot.img - - cdboot.img: cdboot.image$(EXEEXT) -- if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(cdboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(cdboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - endif - -@@ -23002,7 +23002,7 @@ - CLEANFILES += cdboot.img - - cdboot.img: cdboot.image$(EXEEXT) -- if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(cdboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(cdboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - endif - -@@ -23023,7 +23023,7 @@ - CLEANFILES += pxeboot.img - - pxeboot.img: pxeboot.image$(EXEEXT) -- if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(pxeboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(pxeboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - endif - -@@ -23044,7 +23044,7 @@ - CLEANFILES += diskboot.img - - diskboot.img: diskboot.image$(EXEEXT) -- if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(diskboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(diskboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - endif - -@@ -23065,7 +23065,7 @@ - CLEANFILES += diskboot.img - - diskboot.img: diskboot.image$(EXEEXT) -- if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(diskboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(diskboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - endif - -@@ -23086,7 +23086,7 @@ - CLEANFILES += lnxboot.img - - lnxboot.img: lnxboot.image$(EXEEXT) -- if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(lnxboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(lnxboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - endif - -@@ -23107,7 +23107,7 @@ - CLEANFILES += xz_decompress.img - - xz_decompress.img: xz_decompress.image$(EXEEXT) -- if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - endif - -@@ -23128,7 +23128,7 @@ - CLEANFILES += xz_decompress.img - - xz_decompress.img: xz_decompress.image$(EXEEXT) -- if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - endif - -@@ -23149,7 +23149,7 @@ - CLEANFILES += xz_decompress.img - - xz_decompress.img: xz_decompress.image$(EXEEXT) -- if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - endif - -@@ -23170,7 +23170,7 @@ - CLEANFILES += none_decompress.img - - none_decompress.img: none_decompress.image$(EXEEXT) -- if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - endif - -@@ -23191,7 +23191,7 @@ - CLEANFILES += none_decompress.img - - none_decompress.img: none_decompress.image$(EXEEXT) -- if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - endif - -@@ -23212,7 +23212,7 @@ - CLEANFILES += none_decompress.img - - none_decompress.img: none_decompress.image$(EXEEXT) -- if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - endif - -@@ -23233,7 +23233,7 @@ - CLEANFILES += lzma_decompress.img - - lzma_decompress.img: lzma_decompress.image$(EXEEXT) -- if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(lzma_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(lzma_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - endif - -@@ -23254,7 +23254,7 @@ - CLEANFILES += fwstart.img - - fwstart.img: fwstart.image$(EXEEXT) -- if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(fwstart_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(fwstart_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - endif - -@@ -23275,7 +23275,7 @@ - CLEANFILES += fwstart_fuloong2f.img - - fwstart_fuloong2f.img: fwstart_fuloong2f.image$(EXEEXT) -- if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(fwstart_fuloong2f_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(fwstart_fuloong2f_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - endif - -diff --git a/grub-core/Makefile.in b/grub-core/Makefile.in -index 387588c05..c86550d4f 100644 ---- a/grub-core/Makefile.in -+++ b/grub-core/Makefile.in -@@ -46531,61 +46531,61 @@ - @COND_riscv64_efi_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(TARGET_STRIP) -S -x $(kernel_exec) -o $@.bin $<; $(TARGET_OBJCONV) -f$(TARGET_MODULE_FORMAT) -nr:_grub_mod_init:grub_mod_init -nr:_grub_mod_fini:grub_mod_fini -ed2022 -ed2016 -wd1106 -nu -nd $@.bin $@; rm -f $@.bin; elif test ! -z '$(TARGET_OBJ2ELF)'; then $(TARGET_STRIP) $(kernel_exec_STRIPFLAGS) -o $@.bin $< && $(TARGET_OBJ2ELF) $@.bin $@ || (rm -f $@; rm -f $@.bin; exit 1); rm -f $@.bin; else $(TARGET_STRIP) $(kernel_exec_STRIPFLAGS) -o $@ $<; fi - - @COND_i386_pc_TRUE@boot.img: boot.image$(EXEEXT) --@COND_i386_pc_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+@COND_i386_pc_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - @COND_i386_qemu_TRUE@boot.img: boot.image$(EXEEXT) --@COND_i386_qemu_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+@COND_i386_qemu_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - @COND_sparc64_ieee1275_TRUE@boot.img: boot.image$(EXEEXT) --@COND_sparc64_ieee1275_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+@COND_sparc64_ieee1275_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(boot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - @COND_i386_pc_TRUE@boot_hybrid.img: boot_hybrid.image$(EXEEXT) --@COND_i386_pc_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(boot_hybrid_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+@COND_i386_pc_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(boot_hybrid_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - @COND_i386_pc_TRUE@cdboot.img: cdboot.image$(EXEEXT) --@COND_i386_pc_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(cdboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+@COND_i386_pc_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(cdboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - @COND_sparc64_ieee1275_TRUE@cdboot.img: cdboot.image$(EXEEXT) --@COND_sparc64_ieee1275_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(cdboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+@COND_sparc64_ieee1275_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(cdboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - @COND_i386_pc_TRUE@pxeboot.img: pxeboot.image$(EXEEXT) --@COND_i386_pc_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(pxeboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+@COND_i386_pc_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(pxeboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - @COND_i386_pc_TRUE@diskboot.img: diskboot.image$(EXEEXT) --@COND_i386_pc_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(diskboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+@COND_i386_pc_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(diskboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - @COND_sparc64_ieee1275_TRUE@diskboot.img: diskboot.image$(EXEEXT) --@COND_sparc64_ieee1275_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(diskboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+@COND_sparc64_ieee1275_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(diskboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - @COND_i386_pc_TRUE@lnxboot.img: lnxboot.image$(EXEEXT) --@COND_i386_pc_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(lnxboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+@COND_i386_pc_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(lnxboot_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - @COND_mips_loongson_TRUE@xz_decompress.img: xz_decompress.image$(EXEEXT) --@COND_mips_loongson_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+@COND_mips_loongson_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - @COND_mips_arc_TRUE@xz_decompress.img: xz_decompress.image$(EXEEXT) --@COND_mips_arc_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+@COND_mips_arc_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - @COND_mips_qemu_mips_TRUE@xz_decompress.img: xz_decompress.image$(EXEEXT) --@COND_mips_qemu_mips_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+@COND_mips_qemu_mips_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(xz_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - @COND_mips_loongson_TRUE@none_decompress.img: none_decompress.image$(EXEEXT) --@COND_mips_loongson_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+@COND_mips_loongson_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - @COND_mips_arc_TRUE@none_decompress.img: none_decompress.image$(EXEEXT) --@COND_mips_arc_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+@COND_mips_arc_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - @COND_mips_qemu_mips_TRUE@none_decompress.img: none_decompress.image$(EXEEXT) --@COND_mips_qemu_mips_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+@COND_mips_qemu_mips_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(none_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - @COND_i386_pc_TRUE@lzma_decompress.img: lzma_decompress.image$(EXEEXT) --@COND_i386_pc_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(lzma_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+@COND_i386_pc_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(lzma_decompress_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - @COND_mips_loongson_TRUE@fwstart.img: fwstart.image$(EXEEXT) --@COND_mips_loongson_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(fwstart_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+@COND_mips_loongson_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(fwstart_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - @COND_mips_loongson_TRUE@fwstart_fuloong2f.img: fwstart_fuloong2f.image$(EXEEXT) --@COND_mips_loongson_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(fwstart_fuloong2f_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .ARM.exidx $< $@; fi -+@COND_mips_loongson_TRUE@ if test x$(TARGET_APPLE_LINKER) = x1; then $(MACHO2IMG) $< $@; else $(TARGET_OBJCOPY) $(fwstart_fuloong2f_image_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; fi - - @COND_MAN_PAGES_TRUE@@COND_emu_TRUE@grub-emu.1: grub-emu - @COND_MAN_PAGES_TRUE@@COND_emu_TRUE@ chmod a+x grub-emu diff --git a/boot/grub2/0002-grub-mkconfig-Restore-umask-for-the-grub.cfg.patch b/boot/grub2/0002-grub-mkconfig-Restore-umask-for-the-grub.cfg.patch new file mode 100644 index 00000000000..ba9c8a93444 --- /dev/null +++ b/boot/grub2/0002-grub-mkconfig-Restore-umask-for-the-grub.cfg.patch @@ -0,0 +1,43 @@ +From 4c1ad500e73d46c83dec369da85db39ae2fe62dd Mon Sep 17 00:00:00 2001 +From: Michael Chang +Date: Fri, 3 Dec 2021 16:13:28 +0800 +Subject: [PATCH] grub-mkconfig: Restore umask for the grub.cfg + +The commit ab2e53c8a (grub-mkconfig: Honor a symlink when generating +configuration by grub-mkconfig) has inadvertently discarded umask for +creating grub.cfg in the process of running grub-mkconfig. The resulting +wrong permission (0644) would allow unprivileged users to read GRUB +configuration file content. This presents a low confidentiality risk +as grub.cfg may contain non-secured plain-text passwords. + +This patch restores the missing umask and sets the creation file mode +to 0600 preventing unprivileged access. + +Fixes: CVE-2021-3981 + +Signed-off-by: Michael Chang +Reviewed-by: Daniel Kiper +Upstream: https://git.savannah.gnu.org/gitweb/?p=grub.git;a=commit;h=0adec29674561034771c13e446069b41ef41e4d4 +Signed-off-by: Thomas Petazzoni +--- + util/grub-mkconfig.in | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in +index f8cbb8d7a..84f356ea4 100644 +--- a/util/grub-mkconfig.in ++++ b/util/grub-mkconfig.in +@@ -300,7 +300,10 @@ and /etc/grub.d/* files or please file a bug report with + exit 1 + else + # none of the children aborted with error, install the new grub.cfg ++ oldumask=$(umask) ++ umask 077 + cat ${grub_cfg}.new > ${grub_cfg} ++ umask $oldumask + rm -f ${grub_cfg}.new + fi + fi +-- +2.41.0 + diff --git a/boot/grub2/0002-yylex-Make-lexer-fatal-errors-actually-be-fatal.patch b/boot/grub2/0002-yylex-Make-lexer-fatal-errors-actually-be-fatal.patch deleted file mode 100644 index 001dda820bf..00000000000 --- a/boot/grub2/0002-yylex-Make-lexer-fatal-errors-actually-be-fatal.patch +++ /dev/null @@ -1,73 +0,0 @@ -From a7ab0cc98fa89a3d5098c29cbe44bcd24b0a6454 Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Wed, 15 Apr 2020 15:45:02 -0400 -Subject: [PATCH] yylex: Make lexer fatal errors actually be fatal -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -When presented with a command that can't be tokenized to anything -smaller than YYLMAX characters, the parser calls YY_FATAL_ERROR(errmsg), -expecting that will stop further processing, as such: - - #define YY_DO_BEFORE_ACTION \ - yyg->yytext_ptr = yy_bp; \ - yyleng = (int) (yy_cp - yy_bp); \ - yyg->yy_hold_char = *yy_cp; \ - *yy_cp = '\0'; \ - if ( yyleng >= YYLMAX ) \ - YY_FATAL_ERROR( "token too large, exceeds YYLMAX" ); \ - yy_flex_strncpy( yytext, yyg->yytext_ptr, yyleng + 1 , yyscanner); \ - yyg->yy_c_buf_p = yy_cp; - -The code flex generates expects that YY_FATAL_ERROR() will either return -for it or do some form of longjmp(), or handle the error in some way at -least, and so the strncpy() call isn't in an "else" clause, and thus if -YY_FATAL_ERROR() is *not* actually fatal, it does the call with the -questionable limit, and predictable results ensue. - -Unfortunately, our implementation of YY_FATAL_ERROR() is: - - #define YY_FATAL_ERROR(msg) \ - do { \ - grub_printf (_("fatal error: %s\n"), _(msg)); \ - } while (0) - -The same pattern exists in yyless(), and similar problems exist in users -of YY_INPUT(), several places in the main parsing loop, -yy_get_next_buffer(), yy_load_buffer_state(), yyensure_buffer_stack, -yy_scan_buffer(), etc. - -All of these callers expect YY_FATAL_ERROR() to actually be fatal, and -the things they do if it returns after calling it are wildly unsafe. - -Fixes: CVE-2020-10713 - -Signed-off-by: Peter Jones -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/script/yylex.l | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/grub-core/script/yylex.l b/grub-core/script/yylex.l -index 7b44c37b7..b7203c823 100644 ---- a/grub-core/script/yylex.l -+++ b/grub-core/script/yylex.l -@@ -37,11 +37,11 @@ - - /* - * As we don't have access to yyscanner, we cannot do much except to -- * print the fatal error. -+ * print the fatal error and exit. - */ - #define YY_FATAL_ERROR(msg) \ - do { \ -- grub_printf (_("fatal error: %s\n"), _(msg)); \ -+ grub_fatal (_("fatal error: %s\n"), _(msg));\ - } while (0) - - #define COPY(str, hint) \ --- -2.26.2 - diff --git a/boot/grub2/0003-loader-efi-chainloader-Simplify-the-loader-state.patch b/boot/grub2/0003-loader-efi-chainloader-Simplify-the-loader-state.patch new file mode 100644 index 00000000000..f6073add0bf --- /dev/null +++ b/boot/grub2/0003-loader-efi-chainloader-Simplify-the-loader-state.patch @@ -0,0 +1,126 @@ +From dfdc742bdb22be468035f96cce0be5fee23b6df5 Mon Sep 17 00:00:00 2001 +From: Chris Coulson +Date: Tue, 5 Apr 2022 10:02:04 +0100 +Subject: [PATCH] loader/efi/chainloader: Simplify the loader state + +The chainloader command retains the source buffer and device path passed +to LoadImage(), requiring the unload hook passed to grub_loader_set() to +free them. It isn't required to retain this state though - they aren't +required by StartImage() or anything else in the boot hook, so clean them +up before grub_cmd_chainloader() finishes. + +Signed-off-by: Chris Coulson +Reviewed-by: Daniel Kiper +Upstream: 1469983ebb9674753ad333d37087fb8cb20e1dce +[Thomas: needed to cherry-pick +04c86e0bb7b58fc2f913f798cdb18934933e532d which fixes CVE-2022-28736] +Signed-off-by: Thomas Petazzoni +--- + grub-core/loader/efi/chainloader.c | 38 +++++++++++++++++------------- + 1 file changed, 21 insertions(+), 17 deletions(-) + +diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c +index 2bd80f4db..d1602c89b 100644 +--- a/grub-core/loader/efi/chainloader.c ++++ b/grub-core/loader/efi/chainloader.c +@@ -44,25 +44,20 @@ GRUB_MOD_LICENSE ("GPLv3+"); + + static grub_dl_t my_mod; + +-static grub_efi_physical_address_t address; +-static grub_efi_uintn_t pages; +-static grub_efi_device_path_t *file_path; + static grub_efi_handle_t image_handle; +-static grub_efi_char16_t *cmdline; + + static grub_err_t + grub_chainloader_unload (void) + { ++ grub_efi_loaded_image_t *loaded_image; + grub_efi_boot_services_t *b; + ++ loaded_image = grub_efi_get_loaded_image (image_handle); ++ if (loaded_image != NULL) ++ grub_free (loaded_image->load_options); ++ + b = grub_efi_system_table->boot_services; + efi_call_1 (b->unload_image, image_handle); +- efi_call_2 (b->free_pages, address, pages); +- +- grub_free (file_path); +- grub_free (cmdline); +- cmdline = 0; +- file_path = 0; + + grub_dl_unref (my_mod); + return GRUB_ERR_NONE; +@@ -140,7 +135,7 @@ make_file_path (grub_efi_device_path_t *dp, const char *filename) + char *dir_start; + char *dir_end; + grub_size_t size; +- grub_efi_device_path_t *d; ++ grub_efi_device_path_t *d, *file_path; + + dir_start = grub_strchr (filename, ')'); + if (! dir_start) +@@ -222,11 +217,14 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)), + grub_efi_status_t status; + grub_efi_boot_services_t *b; + grub_device_t dev = 0; +- grub_efi_device_path_t *dp = 0; ++ grub_efi_device_path_t *dp = NULL, *file_path = NULL; + grub_efi_loaded_image_t *loaded_image; + char *filename; + void *boot_image = 0; + grub_efi_handle_t dev_handle = 0; ++ grub_efi_physical_address_t address = 0; ++ grub_efi_uintn_t pages = 0; ++ grub_efi_char16_t *cmdline = NULL; + + if (argc == 0) + return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected")); +@@ -234,11 +232,6 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)), + + grub_dl_ref (my_mod); + +- /* Initialize some global variables. */ +- address = 0; +- image_handle = 0; +- file_path = 0; +- + b = grub_efi_system_table->boot_services; + + file = grub_file_open (filename, GRUB_FILE_TYPE_EFI_CHAINLOADED_IMAGE); +@@ -408,6 +401,10 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)), + grub_file_close (file); + grub_device_close (dev); + ++ /* We're finished with the source image buffer and file path now. */ ++ efi_call_2 (b->free_pages, address, pages); ++ grub_free (file_path); ++ + grub_loader_set (grub_chainloader_boot, grub_chainloader_unload, 0); + return 0; + +@@ -419,11 +416,18 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)), + if (file) + grub_file_close (file); + ++ grub_free (cmdline); + grub_free (file_path); + + if (address) + efi_call_2 (b->free_pages, address, pages); + ++ if (image_handle != NULL) ++ { ++ efi_call_1 (b->unload_image, image_handle); ++ image_handle = NULL; ++ } ++ + grub_dl_unref (my_mod); + + return grub_errno; +-- +2.41.0 + diff --git a/boot/grub2/0003-safemath-Add-some-arithmetic-primitives-that-check-f.patch b/boot/grub2/0003-safemath-Add-some-arithmetic-primitives-that-check-f.patch deleted file mode 100644 index 5c521134680..00000000000 --- a/boot/grub2/0003-safemath-Add-some-arithmetic-primitives-that-check-f.patch +++ /dev/null @@ -1,128 +0,0 @@ -From 782a4580a5e347793443aa8e9152db1bf4a0fff8 Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Mon, 15 Jun 2020 10:58:42 -0400 -Subject: [PATCH] safemath: Add some arithmetic primitives that check for - overflow -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This adds a new header, include/grub/safemath.h, that includes easy to -use wrappers for __builtin_{add,sub,mul}_overflow() declared like: - - bool OP(a, b, res) - -where OP is grub_add, grub_sub or grub_mul. OP() returns true in the -case where the operation would overflow and res is not modified. -Otherwise, false is returned and the operation is executed. - -These arithmetic primitives require newer compiler versions. So, bump -these requirements in the INSTALL file too. - -Signed-off-by: Peter Jones -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - INSTALL | 22 ++-------------------- - include/grub/compiler.h | 8 ++++++++ - include/grub/safemath.h | 37 +++++++++++++++++++++++++++++++++++++ - 3 files changed, 47 insertions(+), 20 deletions(-) - create mode 100644 include/grub/safemath.h - -diff --git a/INSTALL b/INSTALL -index 8acb40902..dcb9b7d7b 100644 ---- a/INSTALL -+++ b/INSTALL -@@ -11,27 +11,9 @@ GRUB depends on some software packages installed into your system. If - you don't have any of them, please obtain and install them before - configuring the GRUB. - --* GCC 4.1.3 or later -- Note: older versions may work but support is limited -- -- Experimental support for clang 3.3 or later (results in much bigger binaries) -+* GCC 5.1.0 or later -+ Experimental support for clang 3.8.0 or later (results in much bigger binaries) - for i386, x86_64, arm (including thumb), arm64, mips(el), powerpc, sparc64 -- Note: clang 3.2 or later works for i386 and x86_64 targets but results in -- much bigger binaries. -- earlier versions not tested -- Note: clang 3.2 or later works for arm -- earlier versions not tested -- Note: clang on arm64 is not supported due to -- https://llvm.org/bugs/show_bug.cgi?id=26030 -- Note: clang 3.3 or later works for mips(el) -- earlier versions fail to generate .reginfo and hence gprel relocations -- fail. -- Note: clang 3.2 or later works for powerpc -- earlier versions not tested -- Note: clang 3.5 or later works for sparc64 -- earlier versions return "error: unable to interface with target machine" -- Note: clang has no support for ia64 and hence you can't compile GRUB -- for ia64 with clang - * GNU Make - * GNU Bison 2.3 or later - * GNU gettext 0.17 or later -diff --git a/include/grub/compiler.h b/include/grub/compiler.h -index c9e1d7a73..8f3be3ae7 100644 ---- a/include/grub/compiler.h -+++ b/include/grub/compiler.h -@@ -48,4 +48,12 @@ - # define WARN_UNUSED_RESULT - #endif - -+#if defined(__clang__) && defined(__clang_major__) && defined(__clang_minor__) -+# define CLANG_PREREQ(maj,min) \ -+ ((__clang_major__ > (maj)) || \ -+ (__clang_major__ == (maj) && __clang_minor__ >= (min))) -+#else -+# define CLANG_PREREQ(maj,min) 0 -+#endif -+ - #endif /* ! GRUB_COMPILER_HEADER */ -diff --git a/include/grub/safemath.h b/include/grub/safemath.h -new file mode 100644 -index 000000000..c17b89bba ---- /dev/null -+++ b/include/grub/safemath.h -@@ -0,0 +1,37 @@ -+/* -+ * GRUB -- GRand Unified Bootloader -+ * Copyright (C) 2020 Free Software Foundation, Inc. -+ * -+ * GRUB 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 of the License, or -+ * (at your option) any later version. -+ * -+ * GRUB 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 GRUB. If not, see . -+ * -+ * Arithmetic operations that protect against overflow. -+ */ -+ -+#ifndef GRUB_SAFEMATH_H -+#define GRUB_SAFEMATH_H 1 -+ -+#include -+ -+/* These appear in gcc 5.1 and clang 3.8. */ -+#if GNUC_PREREQ(5, 1) || CLANG_PREREQ(3, 8) -+ -+#define grub_add(a, b, res) __builtin_add_overflow(a, b, res) -+#define grub_sub(a, b, res) __builtin_sub_overflow(a, b, res) -+#define grub_mul(a, b, res) __builtin_mul_overflow(a, b, res) -+ -+#else -+#error gcc 5.1 or newer or clang 3.8 or newer is required -+#endif -+ -+#endif /* GRUB_SAFEMATH_H */ --- -2.26.2 - diff --git a/boot/grub2/0004-calloc-Make-sure-we-always-have-an-overflow-checking.patch b/boot/grub2/0004-calloc-Make-sure-we-always-have-an-overflow-checking.patch deleted file mode 100644 index a2e19f0eafc..00000000000 --- a/boot/grub2/0004-calloc-Make-sure-we-always-have-an-overflow-checking.patch +++ /dev/null @@ -1,246 +0,0 @@ -From 5775eb40862b67468ced816e6d7560dbe22a3670 Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Mon, 15 Jun 2020 12:15:29 -0400 -Subject: [PATCH] calloc: Make sure we always have an overflow-checking - calloc() available -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This tries to make sure that everywhere in this source tree, we always have -an appropriate version of calloc() (i.e. grub_calloc(), xcalloc(), etc.) -available, and that they all safely check for overflow and return NULL when -it would occur. - -Signed-off-by: Peter Jones -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/kern/emu/misc.c | 12 +++++++++ - grub-core/kern/emu/mm.c | 10 ++++++++ - grub-core/kern/mm.c | 40 ++++++++++++++++++++++++++++++ - grub-core/lib/libgcrypt_wrap/mem.c | 11 ++++++-- - grub-core/lib/posix_wrap/stdlib.h | 8 +++++- - include/grub/emu/misc.h | 1 + - include/grub/mm.h | 6 +++++ - 7 files changed, 85 insertions(+), 3 deletions(-) - -diff --git a/grub-core/kern/emu/misc.c b/grub-core/kern/emu/misc.c -index 65db79baa..dfd8a8ec4 100644 ---- a/grub-core/kern/emu/misc.c -+++ b/grub-core/kern/emu/misc.c -@@ -85,6 +85,18 @@ grub_util_error (const char *fmt, ...) - exit (1); - } - -+void * -+xcalloc (grub_size_t nmemb, grub_size_t size) -+{ -+ void *p; -+ -+ p = calloc (nmemb, size); -+ if (!p) -+ grub_util_error ("%s", _("out of memory")); -+ -+ return p; -+} -+ - void * - xmalloc (grub_size_t size) - { -diff --git a/grub-core/kern/emu/mm.c b/grub-core/kern/emu/mm.c -index f262e95e3..145b01d37 100644 ---- a/grub-core/kern/emu/mm.c -+++ b/grub-core/kern/emu/mm.c -@@ -25,6 +25,16 @@ - #include - #include - -+void * -+grub_calloc (grub_size_t nmemb, grub_size_t size) -+{ -+ void *ret; -+ ret = calloc (nmemb, size); -+ if (!ret) -+ grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("out of memory")); -+ return ret; -+} -+ - void * - grub_malloc (grub_size_t size) - { -diff --git a/grub-core/kern/mm.c b/grub-core/kern/mm.c -index ee88ff611..f2822a836 100644 ---- a/grub-core/kern/mm.c -+++ b/grub-core/kern/mm.c -@@ -67,8 +67,10 @@ - #include - #include - #include -+#include - - #ifdef MM_DEBUG -+# undef grub_calloc - # undef grub_malloc - # undef grub_zalloc - # undef grub_realloc -@@ -375,6 +377,30 @@ grub_memalign (grub_size_t align, grub_size_t size) - return 0; - } - -+/* -+ * Allocate NMEMB instances of SIZE bytes and return the pointer, or error on -+ * integer overflow. -+ */ -+void * -+grub_calloc (grub_size_t nmemb, grub_size_t size) -+{ -+ void *ret; -+ grub_size_t sz = 0; -+ -+ if (grub_mul (nmemb, size, &sz)) -+ { -+ grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow is detected")); -+ return NULL; -+ } -+ -+ ret = grub_memalign (0, sz); -+ if (!ret) -+ return NULL; -+ -+ grub_memset (ret, 0, sz); -+ return ret; -+} -+ - /* Allocate SIZE bytes and return the pointer. */ - void * - grub_malloc (grub_size_t size) -@@ -561,6 +587,20 @@ grub_mm_dump (unsigned lineno) - grub_printf ("\n"); - } - -+void * -+grub_debug_calloc (const char *file, int line, grub_size_t nmemb, grub_size_t size) -+{ -+ void *ptr; -+ -+ if (grub_mm_debug) -+ grub_printf ("%s:%d: calloc (0x%" PRIxGRUB_SIZE ", 0x%" PRIxGRUB_SIZE ") = ", -+ file, line, size); -+ ptr = grub_calloc (nmemb, size); -+ if (grub_mm_debug) -+ grub_printf ("%p\n", ptr); -+ return ptr; -+} -+ - void * - grub_debug_malloc (const char *file, int line, grub_size_t size) - { -diff --git a/grub-core/lib/libgcrypt_wrap/mem.c b/grub-core/lib/libgcrypt_wrap/mem.c -index beeb661a3..74c6eafe5 100644 ---- a/grub-core/lib/libgcrypt_wrap/mem.c -+++ b/grub-core/lib/libgcrypt_wrap/mem.c -@@ -4,6 +4,7 @@ - #include - #include - #include -+#include - - GRUB_MOD_LICENSE ("GPLv3+"); - -@@ -36,7 +37,10 @@ void * - gcry_xcalloc (size_t n, size_t m) - { - void *ret; -- ret = grub_zalloc (n * m); -+ size_t sz; -+ if (grub_mul (n, m, &sz)) -+ grub_fatal ("gcry_xcalloc would overflow"); -+ ret = grub_zalloc (sz); - if (!ret) - grub_fatal ("gcry_xcalloc failed"); - return ret; -@@ -56,7 +60,10 @@ void * - gcry_xcalloc_secure (size_t n, size_t m) - { - void *ret; -- ret = grub_zalloc (n * m); -+ size_t sz; -+ if (grub_mul (n, m, &sz)) -+ grub_fatal ("gcry_xcalloc would overflow"); -+ ret = grub_zalloc (sz); - if (!ret) - grub_fatal ("gcry_xcalloc failed"); - return ret; -diff --git a/grub-core/lib/posix_wrap/stdlib.h b/grub-core/lib/posix_wrap/stdlib.h -index 3b46f47ff..7a8d385e9 100644 ---- a/grub-core/lib/posix_wrap/stdlib.h -+++ b/grub-core/lib/posix_wrap/stdlib.h -@@ -21,6 +21,7 @@ - - #include - #include -+#include - - static inline void - free (void *ptr) -@@ -37,7 +38,12 @@ malloc (grub_size_t size) - static inline void * - calloc (grub_size_t size, grub_size_t nelem) - { -- return grub_zalloc (size * nelem); -+ grub_size_t sz; -+ -+ if (grub_mul (size, nelem, &sz)) -+ return NULL; -+ -+ return grub_zalloc (sz); - } - - static inline void * -diff --git a/include/grub/emu/misc.h b/include/grub/emu/misc.h -index ce464cfd0..ff9c48a64 100644 ---- a/include/grub/emu/misc.h -+++ b/include/grub/emu/misc.h -@@ -47,6 +47,7 @@ grub_util_device_is_mapped (const char *dev); - #define GRUB_HOST_PRIuLONG_LONG "llu" - #define GRUB_HOST_PRIxLONG_LONG "llx" - -+void * EXPORT_FUNC(xcalloc) (grub_size_t nmemb, grub_size_t size) WARN_UNUSED_RESULT; - void * EXPORT_FUNC(xmalloc) (grub_size_t size) WARN_UNUSED_RESULT; - void * EXPORT_FUNC(xrealloc) (void *ptr, grub_size_t size) WARN_UNUSED_RESULT; - char * EXPORT_FUNC(xstrdup) (const char *str) WARN_UNUSED_RESULT; -diff --git a/include/grub/mm.h b/include/grub/mm.h -index 28e2e53eb..9c38dd3ca 100644 ---- a/include/grub/mm.h -+++ b/include/grub/mm.h -@@ -29,6 +29,7 @@ - #endif - - void grub_mm_init_region (void *addr, grub_size_t size); -+void *EXPORT_FUNC(grub_calloc) (grub_size_t nmemb, grub_size_t size); - void *EXPORT_FUNC(grub_malloc) (grub_size_t size); - void *EXPORT_FUNC(grub_zalloc) (grub_size_t size); - void EXPORT_FUNC(grub_free) (void *ptr); -@@ -48,6 +49,9 @@ extern int EXPORT_VAR(grub_mm_debug); - void grub_mm_dump_free (void); - void grub_mm_dump (unsigned lineno); - -+#define grub_calloc(nmemb, size) \ -+ grub_debug_calloc (GRUB_FILE, __LINE__, nmemb, size) -+ - #define grub_malloc(size) \ - grub_debug_malloc (GRUB_FILE, __LINE__, size) - -@@ -63,6 +67,8 @@ void grub_mm_dump (unsigned lineno); - #define grub_free(ptr) \ - grub_debug_free (GRUB_FILE, __LINE__, ptr) - -+void *EXPORT_FUNC(grub_debug_calloc) (const char *file, int line, -+ grub_size_t nmemb, grub_size_t size); - void *EXPORT_FUNC(grub_debug_malloc) (const char *file, int line, - grub_size_t size); - void *EXPORT_FUNC(grub_debug_zalloc) (const char *file, int line, --- -2.26.2 - diff --git a/boot/grub2/0004-commands-boot-Add-API-to-pass-context-to-loader.patch b/boot/grub2/0004-commands-boot-Add-API-to-pass-context-to-loader.patch new file mode 100644 index 00000000000..30b410e38a6 --- /dev/null +++ b/boot/grub2/0004-commands-boot-Add-API-to-pass-context-to-loader.patch @@ -0,0 +1,165 @@ +From 8b6336696d93b51703c2015eff3e2d8a02145e43 Mon Sep 17 00:00:00 2001 +From: Chris Coulson +Date: Tue, 5 Apr 2022 10:58:28 +0100 +Subject: [PATCH] commands/boot: Add API to pass context to loader + +Loaders rely on global variables for saving context which is consumed +in the boot hook and freed in the unload hook. In the case where a loader +command is executed twice, calling grub_loader_set() a second time executes +the unload hook, but in some cases this runs when the loader's global +context has already been updated, resulting in the updated context being +freed and potential use-after-free bugs when the boot hook is subsequently +called. + +This adds a new API, grub_loader_set_ex(), which allows a loader to specify +context that is passed to its boot and unload hooks. This is an alternative +to requiring that loaders call grub_loader_unset() before mutating their +global context. + +Signed-off-by: Chris Coulson +Reviewed-by: Daniel Kiper +Upstream: 14ceb3b3ff6db664649138442b6562c114dcf56e +[Thomas: needed to backport 04c86e0bb7b58fc2f913f798cdb18934933e532d, +which fixes CVE-2022-28736] +Signed-off-by: Thomas Petazzoni +--- + grub-core/commands/boot.c | 66 ++++++++++++++++++++++++++++++++++----- + include/grub/loader.h | 5 +++ + 2 files changed, 63 insertions(+), 8 deletions(-) + +diff --git a/grub-core/commands/boot.c b/grub-core/commands/boot.c +index bbca81e94..61514788e 100644 +--- a/grub-core/commands/boot.c ++++ b/grub-core/commands/boot.c +@@ -27,10 +27,20 @@ + + GRUB_MOD_LICENSE ("GPLv3+"); + +-static grub_err_t (*grub_loader_boot_func) (void); +-static grub_err_t (*grub_loader_unload_func) (void); ++static grub_err_t (*grub_loader_boot_func) (void *context); ++static grub_err_t (*grub_loader_unload_func) (void *context); ++static void *grub_loader_context; + static int grub_loader_flags; + ++struct grub_simple_loader_hooks ++{ ++ grub_err_t (*boot) (void); ++ grub_err_t (*unload) (void); ++}; ++ ++/* Don't heap allocate this to avoid making grub_loader_set() fallible. */ ++static struct grub_simple_loader_hooks simple_loader_hooks; ++ + struct grub_preboot + { + grub_err_t (*preboot_func) (int); +@@ -44,6 +54,29 @@ static int grub_loader_loaded; + static struct grub_preboot *preboots_head = 0, + *preboots_tail = 0; + ++static grub_err_t ++grub_simple_boot_hook (void *context) ++{ ++ struct grub_simple_loader_hooks *hooks; ++ ++ hooks = (struct grub_simple_loader_hooks *) context; ++ return hooks->boot (); ++} ++ ++static grub_err_t ++grub_simple_unload_hook (void *context) ++{ ++ struct grub_simple_loader_hooks *hooks; ++ grub_err_t ret; ++ ++ hooks = (struct grub_simple_loader_hooks *) context; ++ ++ ret = hooks->unload (); ++ grub_memset (hooks, 0, sizeof (*hooks)); ++ ++ return ret; ++} ++ + int + grub_loader_is_loaded (void) + { +@@ -110,28 +143,45 @@ grub_loader_unregister_preboot_hook (struct grub_preboot *hnd) + } + + void +-grub_loader_set (grub_err_t (*boot) (void), +- grub_err_t (*unload) (void), +- int flags) ++grub_loader_set_ex (grub_err_t (*boot) (void *context), ++ grub_err_t (*unload) (void *context), ++ void *context, ++ int flags) + { + if (grub_loader_loaded && grub_loader_unload_func) +- grub_loader_unload_func (); ++ grub_loader_unload_func (grub_loader_context); + + grub_loader_boot_func = boot; + grub_loader_unload_func = unload; ++ grub_loader_context = context; + grub_loader_flags = flags; + + grub_loader_loaded = 1; + } + ++void ++grub_loader_set (grub_err_t (*boot) (void), ++ grub_err_t (*unload) (void), ++ int flags) ++{ ++ grub_loader_set_ex (grub_simple_boot_hook, ++ grub_simple_unload_hook, ++ &simple_loader_hooks, ++ flags); ++ ++ simple_loader_hooks.boot = boot; ++ simple_loader_hooks.unload = unload; ++} ++ + void + grub_loader_unset(void) + { + if (grub_loader_loaded && grub_loader_unload_func) +- grub_loader_unload_func (); ++ grub_loader_unload_func (grub_loader_context); + + grub_loader_boot_func = 0; + grub_loader_unload_func = 0; ++ grub_loader_context = 0; + + grub_loader_loaded = 0; + } +@@ -158,7 +208,7 @@ grub_loader_boot (void) + return err; + } + } +- err = (grub_loader_boot_func) (); ++ err = (grub_loader_boot_func) (grub_loader_context); + + for (cur = preboots_tail; cur; cur = cur->prev) + if (! err) +diff --git a/include/grub/loader.h b/include/grub/loader.h +index b20864282..97f231054 100644 +--- a/include/grub/loader.h ++++ b/include/grub/loader.h +@@ -40,6 +40,11 @@ void EXPORT_FUNC (grub_loader_set) (grub_err_t (*boot) (void), + grub_err_t (*unload) (void), + int flags); + ++void EXPORT_FUNC (grub_loader_set_ex) (grub_err_t (*boot) (void *context), ++ grub_err_t (*unload) (void *context), ++ void *context, ++ int flags); ++ + /* Unset current loader, if any. */ + void EXPORT_FUNC (grub_loader_unset) (void); + +-- +2.41.0 + diff --git a/boot/grub2/0005-calloc-Use-calloc-at-most-places.patch b/boot/grub2/0005-calloc-Use-calloc-at-most-places.patch deleted file mode 100644 index 096c2dfc403..00000000000 --- a/boot/grub2/0005-calloc-Use-calloc-at-most-places.patch +++ /dev/null @@ -1,1840 +0,0 @@ -From 8185711241d73931269f402bb6799f7e2c58f04b Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Mon, 15 Jun 2020 12:26:01 -0400 -Subject: [PATCH] calloc: Use calloc() at most places -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This modifies most of the places we do some form of: - - X = malloc(Y * Z); - -to use calloc(Y, Z) instead. - -Among other issues, this fixes: - - allocation of integer overflow in grub_png_decode_image_header() - reported by Chris Coulson, - - allocation of integer overflow in luks_recover_key() - reported by Chris Coulson, - - allocation of integer overflow in grub_lvm_detect() - reported by Chris Coulson. - -Fixes: CVE-2020-14308 - -Signed-off-by: Peter Jones -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/bus/usb/usbhub.c | 8 ++++---- - grub-core/commands/efi/lsefisystab.c | 3 ++- - grub-core/commands/legacycfg.c | 6 +++--- - grub-core/commands/menuentry.c | 2 +- - grub-core/commands/nativedisk.c | 2 +- - grub-core/commands/parttool.c | 12 +++++++++--- - grub-core/commands/regexp.c | 2 +- - grub-core/commands/search_wrap.c | 2 +- - grub-core/disk/diskfilter.c | 4 ++-- - grub-core/disk/ieee1275/ofdisk.c | 2 +- - grub-core/disk/ldm.c | 14 +++++++------- - grub-core/disk/luks.c | 2 +- - grub-core/disk/lvm.c | 8 ++++---- - grub-core/disk/xen/xendisk.c | 2 +- - grub-core/efiemu/loadcore.c | 2 +- - grub-core/efiemu/mm.c | 6 +++--- - grub-core/font/font.c | 3 +-- - grub-core/fs/affs.c | 6 +++--- - grub-core/fs/btrfs.c | 6 +++--- - grub-core/fs/hfs.c | 2 +- - grub-core/fs/hfsplus.c | 6 +++--- - grub-core/fs/iso9660.c | 2 +- - grub-core/fs/ntfs.c | 4 ++-- - grub-core/fs/sfs.c | 2 +- - grub-core/fs/tar.c | 2 +- - grub-core/fs/udf.c | 4 ++-- - grub-core/fs/zfs/zfs.c | 4 ++-- - grub-core/gfxmenu/gui_string_util.c | 2 +- - grub-core/gfxmenu/widget-box.c | 4 ++-- - grub-core/io/gzio.c | 2 +- - grub-core/kern/efi/efi.c | 6 +++--- - grub-core/kern/emu/hostdisk.c | 2 +- - grub-core/kern/fs.c | 2 +- - grub-core/kern/misc.c | 2 +- - grub-core/kern/parser.c | 2 +- - grub-core/kern/uboot/uboot.c | 2 +- - grub-core/lib/libgcrypt/cipher/ac.c | 8 ++++---- - grub-core/lib/libgcrypt/cipher/primegen.c | 4 ++-- - grub-core/lib/libgcrypt/cipher/pubkey.c | 4 ++-- - grub-core/lib/priority_queue.c | 2 +- - grub-core/lib/reed_solomon.c | 7 +++---- - grub-core/lib/relocator.c | 10 +++++----- - grub-core/lib/zstd/fse_decompress.c | 2 +- - grub-core/loader/arm/linux.c | 2 +- - grub-core/loader/efi/chainloader.c | 2 +- - grub-core/loader/i386/bsdXX.c | 2 +- - grub-core/loader/i386/xnu.c | 4 ++-- - grub-core/loader/macho.c | 2 +- - grub-core/loader/multiboot_elfxx.c | 2 +- - grub-core/loader/xnu.c | 2 +- - grub-core/mmap/mmap.c | 4 ++-- - grub-core/net/bootp.c | 2 +- - grub-core/net/dns.c | 10 +++++----- - grub-core/net/net.c | 4 ++-- - grub-core/normal/charset.c | 10 +++++----- - grub-core/normal/cmdline.c | 14 +++++++------- - grub-core/normal/menu_entry.c | 14 +++++++------- - grub-core/normal/menu_text.c | 4 ++-- - grub-core/normal/term.c | 4 ++-- - grub-core/osdep/linux/getroot.c | 6 +++--- - grub-core/osdep/unix/config.c | 2 +- - grub-core/osdep/windows/getroot.c | 2 +- - grub-core/osdep/windows/hostdisk.c | 4 ++-- - grub-core/osdep/windows/init.c | 2 +- - grub-core/osdep/windows/platform.c | 4 ++-- - grub-core/osdep/windows/relpath.c | 2 +- - grub-core/partmap/gpt.c | 2 +- - grub-core/partmap/msdos.c | 2 +- - grub-core/script/execute.c | 2 +- - grub-core/tests/fake_input.c | 2 +- - grub-core/tests/video_checksum.c | 6 +++--- - grub-core/video/capture.c | 2 +- - grub-core/video/emu/sdl.c | 2 +- - grub-core/video/i386/pc/vga.c | 2 +- - grub-core/video/readers/png.c | 2 +- - include/grub/unicode.h | 4 ++-- - util/getroot.c | 2 +- - util/grub-file.c | 2 +- - util/grub-fstest.c | 4 ++-- - util/grub-install-common.c | 2 +- - util/grub-install.c | 4 ++-- - util/grub-mkimagexx.c | 6 ++---- - util/grub-mkrescue.c | 4 ++-- - util/grub-mkstandalone.c | 2 +- - util/grub-pe2elf.c | 12 +++++------- - util/grub-probe.c | 4 ++-- - 86 files changed, 176 insertions(+), 175 deletions(-) - -diff --git a/grub-core/bus/usb/usbhub.c b/grub-core/bus/usb/usbhub.c -index 34a7ff1b5..a06cce302 100644 ---- a/grub-core/bus/usb/usbhub.c -+++ b/grub-core/bus/usb/usbhub.c -@@ -149,8 +149,8 @@ grub_usb_add_hub (grub_usb_device_t dev) - grub_usb_set_configuration (dev, 1); - - dev->nports = hubdesc.portcnt; -- dev->children = grub_zalloc (hubdesc.portcnt * sizeof (dev->children[0])); -- dev->ports = grub_zalloc (dev->nports * sizeof (dev->ports[0])); -+ dev->children = grub_calloc (hubdesc.portcnt, sizeof (dev->children[0])); -+ dev->ports = grub_calloc (dev->nports, sizeof (dev->ports[0])); - if (!dev->children || !dev->ports) - { - grub_free (dev->children); -@@ -268,8 +268,8 @@ grub_usb_controller_dev_register_iter (grub_usb_controller_t controller, void *d - - /* Query the number of ports the root Hub has. */ - hub->nports = controller->dev->hubports (controller); -- hub->devices = grub_zalloc (sizeof (hub->devices[0]) * hub->nports); -- hub->ports = grub_zalloc (sizeof (hub->ports[0]) * hub->nports); -+ hub->devices = grub_calloc (hub->nports, sizeof (hub->devices[0])); -+ hub->ports = grub_calloc (hub->nports, sizeof (hub->ports[0])); - if (!hub->devices || !hub->ports) - { - grub_free (hub->devices); -diff --git a/grub-core/commands/efi/lsefisystab.c b/grub-core/commands/efi/lsefisystab.c -index df1030221..cd81507f5 100644 ---- a/grub-core/commands/efi/lsefisystab.c -+++ b/grub-core/commands/efi/lsefisystab.c -@@ -71,7 +71,8 @@ grub_cmd_lsefisystab (struct grub_command *cmd __attribute__ ((unused)), - grub_printf ("Vendor: "); - - for (vendor_utf16 = st->firmware_vendor; *vendor_utf16; vendor_utf16++); -- vendor = grub_malloc (4 * (vendor_utf16 - st->firmware_vendor) + 1); -+ /* Allocate extra 3 bytes to simplify math. */ -+ vendor = grub_calloc (4, vendor_utf16 - st->firmware_vendor + 1); - if (!vendor) - return grub_errno; - *grub_utf16_to_utf8 ((grub_uint8_t *) vendor, st->firmware_vendor, -diff --git a/grub-core/commands/legacycfg.c b/grub-core/commands/legacycfg.c -index db7a8f002..5e3ec0d5e 100644 ---- a/grub-core/commands/legacycfg.c -+++ b/grub-core/commands/legacycfg.c -@@ -314,7 +314,7 @@ grub_cmd_legacy_kernel (struct grub_command *mycmd __attribute__ ((unused)), - if (argc < 2) - return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected")); - -- cutargs = grub_malloc (sizeof (cutargs[0]) * (argc - 1)); -+ cutargs = grub_calloc (argc - 1, sizeof (cutargs[0])); - if (!cutargs) - return grub_errno; - cutargc = argc - 1; -@@ -436,7 +436,7 @@ grub_cmd_legacy_kernel (struct grub_command *mycmd __attribute__ ((unused)), - { - char rbuf[3] = "-r"; - bsdargc = cutargc + 2; -- bsdargs = grub_malloc (sizeof (bsdargs[0]) * bsdargc); -+ bsdargs = grub_calloc (bsdargc, sizeof (bsdargs[0])); - if (!bsdargs) - { - err = grub_errno; -@@ -559,7 +559,7 @@ grub_cmd_legacy_initrdnounzip (struct grub_command *mycmd __attribute__ ((unused - return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("can't find command `%s'"), - "module"); - -- newargs = grub_malloc ((argc + 1) * sizeof (newargs[0])); -+ newargs = grub_calloc (argc + 1, sizeof (newargs[0])); - if (!newargs) - return grub_errno; - grub_memcpy (newargs + 1, args, argc * sizeof (newargs[0])); -diff --git a/grub-core/commands/menuentry.c b/grub-core/commands/menuentry.c -index 2c5363da7..9164df744 100644 ---- a/grub-core/commands/menuentry.c -+++ b/grub-core/commands/menuentry.c -@@ -154,7 +154,7 @@ grub_normal_add_menu_entry (int argc, const char **args, - goto fail; - - /* Save argc, args to pass as parameters to block arg later. */ -- menu_args = grub_malloc (sizeof (char*) * (argc + 1)); -+ menu_args = grub_calloc (argc + 1, sizeof (char *)); - if (! menu_args) - goto fail; - -diff --git a/grub-core/commands/nativedisk.c b/grub-core/commands/nativedisk.c -index 699447d11..7c8f97f6a 100644 ---- a/grub-core/commands/nativedisk.c -+++ b/grub-core/commands/nativedisk.c -@@ -195,7 +195,7 @@ grub_cmd_nativedisk (grub_command_t cmd __attribute__ ((unused)), - else - path_prefix = prefix; - -- mods = grub_malloc (argc * sizeof (mods[0])); -+ mods = grub_calloc (argc, sizeof (mods[0])); - if (!mods) - return grub_errno; - -diff --git a/grub-core/commands/parttool.c b/grub-core/commands/parttool.c -index 22b46b187..051e31320 100644 ---- a/grub-core/commands/parttool.c -+++ b/grub-core/commands/parttool.c -@@ -59,7 +59,13 @@ grub_parttool_register(const char *part_name, - for (nargs = 0; args[nargs].name != 0; nargs++); - cur->nargs = nargs; - cur->args = (struct grub_parttool_argdesc *) -- grub_malloc ((nargs + 1) * sizeof (struct grub_parttool_argdesc)); -+ grub_calloc (nargs + 1, sizeof (struct grub_parttool_argdesc)); -+ if (!cur->args) -+ { -+ grub_free (cur); -+ curhandle--; -+ return -1; -+ } - grub_memcpy (cur->args, args, - (nargs + 1) * sizeof (struct grub_parttool_argdesc)); - -@@ -257,7 +263,7 @@ grub_cmd_parttool (grub_command_t cmd __attribute__ ((unused)), - return err; - } - -- parsed = (int *) grub_zalloc (argc * sizeof (int)); -+ parsed = (int *) grub_calloc (argc, sizeof (int)); - - for (i = 1; i < argc; i++) - if (! parsed[i]) -@@ -290,7 +296,7 @@ grub_cmd_parttool (grub_command_t cmd __attribute__ ((unused)), - } - ptool = cur; - pargs = (struct grub_parttool_args *) -- grub_zalloc (ptool->nargs * sizeof (struct grub_parttool_args)); -+ grub_calloc (ptool->nargs, sizeof (struct grub_parttool_args)); - for (j = i; j < argc; j++) - if (! parsed[j]) - { -diff --git a/grub-core/commands/regexp.c b/grub-core/commands/regexp.c -index f00b184c8..4019164f3 100644 ---- a/grub-core/commands/regexp.c -+++ b/grub-core/commands/regexp.c -@@ -116,7 +116,7 @@ grub_cmd_regexp (grub_extcmd_context_t ctxt, int argc, char **args) - if (ret) - goto fail; - -- matches = grub_zalloc (sizeof (*matches) * (regex.re_nsub + 1)); -+ matches = grub_calloc (regex.re_nsub + 1, sizeof (*matches)); - if (! matches) - goto fail; - -diff --git a/grub-core/commands/search_wrap.c b/grub-core/commands/search_wrap.c -index d7fd26b94..47fc8eb99 100644 ---- a/grub-core/commands/search_wrap.c -+++ b/grub-core/commands/search_wrap.c -@@ -122,7 +122,7 @@ grub_cmd_search (grub_extcmd_context_t ctxt, int argc, char **args) - for (i = 0; state[SEARCH_HINT_BAREMETAL].args[i]; i++) - nhints++; - -- hints = grub_malloc (sizeof (hints[0]) * nhints); -+ hints = grub_calloc (nhints, sizeof (hints[0])); - if (!hints) - return grub_errno; - j = 0; -diff --git a/grub-core/disk/diskfilter.c b/grub-core/disk/diskfilter.c -index c3b578acf..68ca9e0be 100644 ---- a/grub-core/disk/diskfilter.c -+++ b/grub-core/disk/diskfilter.c -@@ -1134,7 +1134,7 @@ grub_diskfilter_make_raid (grub_size_t uuidlen, char *uuid, int nmemb, - array->lvs->segments->node_count = nmemb; - array->lvs->segments->raid_member_size = disk_size; - array->lvs->segments->nodes -- = grub_zalloc (nmemb * sizeof (array->lvs->segments->nodes[0])); -+ = grub_calloc (nmemb, sizeof (array->lvs->segments->nodes[0])); - array->lvs->segments->stripe_size = stripe_size; - for (i = 0; i < nmemb; i++) - { -@@ -1226,7 +1226,7 @@ insert_array (grub_disk_t disk, const struct grub_diskfilter_pv_id *id, - grub_partition_t p; - for (p = disk->partition; p; p = p->parent) - s++; -- pv->partmaps = xmalloc (s * sizeof (pv->partmaps[0])); -+ pv->partmaps = xcalloc (s, sizeof (pv->partmaps[0])); - s = 0; - for (p = disk->partition; p; p = p->parent) - pv->partmaps[s++] = xstrdup (p->partmap->name); -diff --git a/grub-core/disk/ieee1275/ofdisk.c b/grub-core/disk/ieee1275/ofdisk.c -index f73257e66..03674cb47 100644 ---- a/grub-core/disk/ieee1275/ofdisk.c -+++ b/grub-core/disk/ieee1275/ofdisk.c -@@ -297,7 +297,7 @@ dev_iterate (const struct grub_ieee1275_devalias *alias) - /* Power machines documentation specify 672 as maximum SAS disks in - one system. Using a slightly larger value to be safe. */ - table_size = 768; -- table = grub_malloc (table_size * sizeof (grub_uint64_t)); -+ table = grub_calloc (table_size, sizeof (grub_uint64_t)); - - if (!table) - { -diff --git a/grub-core/disk/ldm.c b/grub-core/disk/ldm.c -index 2a22d2d6c..e6323701a 100644 ---- a/grub-core/disk/ldm.c -+++ b/grub-core/disk/ldm.c -@@ -323,8 +323,8 @@ make_vg (grub_disk_t disk, - lv->segments->type = GRUB_DISKFILTER_MIRROR; - lv->segments->node_count = 0; - lv->segments->node_alloc = 8; -- lv->segments->nodes = grub_zalloc (sizeof (*lv->segments->nodes) -- * lv->segments->node_alloc); -+ lv->segments->nodes = grub_calloc (lv->segments->node_alloc, -+ sizeof (*lv->segments->nodes)); - if (!lv->segments->nodes) - goto fail2; - ptr = vblk[i].dynamic; -@@ -543,8 +543,8 @@ make_vg (grub_disk_t disk, - { - comp->segment_alloc = 8; - comp->segment_count = 0; -- comp->segments = grub_malloc (sizeof (*comp->segments) -- * comp->segment_alloc); -+ comp->segments = grub_calloc (comp->segment_alloc, -+ sizeof (*comp->segments)); - if (!comp->segments) - goto fail2; - } -@@ -590,8 +590,8 @@ make_vg (grub_disk_t disk, - } - comp->segments->node_count = read_int (ptr + 1, *ptr); - comp->segments->node_alloc = comp->segments->node_count; -- comp->segments->nodes = grub_zalloc (sizeof (*comp->segments->nodes) -- * comp->segments->node_alloc); -+ comp->segments->nodes = grub_calloc (comp->segments->node_alloc, -+ sizeof (*comp->segments->nodes)); - if (!lv->segments->nodes) - goto fail2; - } -@@ -1017,7 +1017,7 @@ grub_util_ldm_embed (struct grub_disk *disk, unsigned int *nsectors, - *nsectors = lv->size; - if (*nsectors > max_nsectors) - *nsectors = max_nsectors; -- *sectors = grub_malloc (*nsectors * sizeof (**sectors)); -+ *sectors = grub_calloc (*nsectors, sizeof (**sectors)); - if (!*sectors) - return grub_errno; - for (i = 0; i < *nsectors; i++) -diff --git a/grub-core/disk/luks.c b/grub-core/disk/luks.c -index 86c50c612..18b3a8bb1 100644 ---- a/grub-core/disk/luks.c -+++ b/grub-core/disk/luks.c -@@ -336,7 +336,7 @@ luks_recover_key (grub_disk_t source, - && grub_be_to_cpu32 (header.keyblock[i].stripes) > max_stripes) - max_stripes = grub_be_to_cpu32 (header.keyblock[i].stripes); - -- split_key = grub_malloc (keysize * max_stripes); -+ split_key = grub_calloc (keysize, max_stripes); - if (!split_key) - return grub_errno; - -diff --git a/grub-core/disk/lvm.c b/grub-core/disk/lvm.c -index 7b265c780..d1df640b3 100644 ---- a/grub-core/disk/lvm.c -+++ b/grub-core/disk/lvm.c -@@ -173,7 +173,7 @@ grub_lvm_detect (grub_disk_t disk, - first one. */ - - /* Allocate buffer space for the circular worst-case scenario. */ -- metadatabuf = grub_malloc (2 * mda_size); -+ metadatabuf = grub_calloc (2, mda_size); - if (! metadatabuf) - goto fail; - -@@ -426,7 +426,7 @@ grub_lvm_detect (grub_disk_t disk, - #endif - goto lvs_fail; - } -- lv->segments = grub_zalloc (sizeof (*seg) * lv->segment_count); -+ lv->segments = grub_calloc (lv->segment_count, sizeof (*seg)); - seg = lv->segments; - - for (i = 0; i < lv->segment_count; i++) -@@ -483,8 +483,8 @@ grub_lvm_detect (grub_disk_t disk, - if (seg->node_count != 1) - seg->stripe_size = grub_lvm_getvalue (&p, "stripe_size = "); - -- seg->nodes = grub_zalloc (sizeof (*stripe) -- * seg->node_count); -+ seg->nodes = grub_calloc (seg->node_count, -+ sizeof (*stripe)); - stripe = seg->nodes; - - p = grub_strstr (p, "stripes = ["); -diff --git a/grub-core/disk/xen/xendisk.c b/grub-core/disk/xen/xendisk.c -index 48476cbbf..d6612eebd 100644 ---- a/grub-core/disk/xen/xendisk.c -+++ b/grub-core/disk/xen/xendisk.c -@@ -426,7 +426,7 @@ grub_xendisk_init (void) - if (!ctr) - return; - -- virtdisks = grub_malloc (ctr * sizeof (virtdisks[0])); -+ virtdisks = grub_calloc (ctr, sizeof (virtdisks[0])); - if (!virtdisks) - return; - if (grub_xenstore_dir ("device/vbd", fill, &ctr)) -diff --git a/grub-core/efiemu/loadcore.c b/grub-core/efiemu/loadcore.c -index 44085ef81..2b924623f 100644 ---- a/grub-core/efiemu/loadcore.c -+++ b/grub-core/efiemu/loadcore.c -@@ -201,7 +201,7 @@ grub_efiemu_count_symbols (const Elf_Ehdr *e) - - grub_efiemu_nelfsyms = (unsigned) s->sh_size / (unsigned) s->sh_entsize; - grub_efiemu_elfsyms = (struct grub_efiemu_elf_sym *) -- grub_malloc (sizeof (struct grub_efiemu_elf_sym) * grub_efiemu_nelfsyms); -+ grub_calloc (grub_efiemu_nelfsyms, sizeof (struct grub_efiemu_elf_sym)); - - /* Relocators */ - for (i = 0, s = (Elf_Shdr *) ((char *) e + e->e_shoff); -diff --git a/grub-core/efiemu/mm.c b/grub-core/efiemu/mm.c -index 52a032f7b..9b8e0d0ad 100644 ---- a/grub-core/efiemu/mm.c -+++ b/grub-core/efiemu/mm.c -@@ -554,11 +554,11 @@ grub_efiemu_mmap_sort_and_uniq (void) - /* Initialize variables*/ - grub_memset (present, 0, sizeof (int) * GRUB_EFI_MAX_MEMORY_TYPE); - scanline_events = (struct grub_efiemu_mmap_scan *) -- grub_malloc (sizeof (struct grub_efiemu_mmap_scan) * 2 * mmap_num); -+ grub_calloc (mmap_num, sizeof (struct grub_efiemu_mmap_scan) * 2); - - /* Number of chunks can't increase more than by factor of 2 */ - result = (grub_efi_memory_descriptor_t *) -- grub_malloc (sizeof (grub_efi_memory_descriptor_t) * 2 * mmap_num); -+ grub_calloc (mmap_num, sizeof (grub_efi_memory_descriptor_t) * 2); - if (!result || !scanline_events) - { - grub_free (result); -@@ -660,7 +660,7 @@ grub_efiemu_mm_do_alloc (void) - - /* Preallocate mmap */ - efiemu_mmap = (grub_efi_memory_descriptor_t *) -- grub_malloc (mmap_reserved_size * sizeof (grub_efi_memory_descriptor_t)); -+ grub_calloc (mmap_reserved_size, sizeof (grub_efi_memory_descriptor_t)); - if (!efiemu_mmap) - { - grub_efiemu_unload (); -diff --git a/grub-core/font/font.c b/grub-core/font/font.c -index 85a292557..8e118b315 100644 ---- a/grub-core/font/font.c -+++ b/grub-core/font/font.c -@@ -293,8 +293,7 @@ load_font_index (grub_file_t file, grub_uint32_t sect_length, struct - font->num_chars = sect_length / FONT_CHAR_INDEX_ENTRY_SIZE; - - /* Allocate the character index array. */ -- font->char_index = grub_malloc (font->num_chars -- * sizeof (struct char_index_entry)); -+ font->char_index = grub_calloc (font->num_chars, sizeof (struct char_index_entry)); - if (!font->char_index) - return 1; - font->bmp_idx = grub_malloc (0x10000 * sizeof (grub_uint16_t)); -diff --git a/grub-core/fs/affs.c b/grub-core/fs/affs.c -index 6b6a2bc91..220b3712f 100644 ---- a/grub-core/fs/affs.c -+++ b/grub-core/fs/affs.c -@@ -301,7 +301,7 @@ grub_affs_read_symlink (grub_fshelp_node_t node) - return 0; - } - latin1[symlink_size] = 0; -- utf8 = grub_malloc (symlink_size * GRUB_MAX_UTF8_PER_LATIN1 + 1); -+ utf8 = grub_calloc (GRUB_MAX_UTF8_PER_LATIN1 + 1, symlink_size); - if (!utf8) - { - grub_free (latin1); -@@ -422,7 +422,7 @@ grub_affs_iterate_dir (grub_fshelp_node_t dir, - return 1; - } - -- hashtable = grub_zalloc (data->htsize * sizeof (*hashtable)); -+ hashtable = grub_calloc (data->htsize, sizeof (*hashtable)); - if (!hashtable) - return 1; - -@@ -628,7 +628,7 @@ grub_affs_label (grub_device_t device, char **label) - len = file.namelen; - if (len > sizeof (file.name)) - len = sizeof (file.name); -- *label = grub_malloc (len * GRUB_MAX_UTF8_PER_LATIN1 + 1); -+ *label = grub_calloc (GRUB_MAX_UTF8_PER_LATIN1 + 1, len); - if (*label) - *grub_latin1_to_utf8 ((grub_uint8_t *) *label, file.name, len) = '\0'; - } -diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c -index 48bd3d04a..11272efc1 100644 ---- a/grub-core/fs/btrfs.c -+++ b/grub-core/fs/btrfs.c -@@ -413,7 +413,7 @@ lower_bound (struct grub_btrfs_data *data, - { - desc->allocated = 16; - desc->depth = 0; -- desc->data = grub_malloc (sizeof (desc->data[0]) * desc->allocated); -+ desc->data = grub_calloc (desc->allocated, sizeof (desc->data[0])); - if (!desc->data) - return grub_errno; - } -@@ -752,7 +752,7 @@ raid56_read_retry (struct grub_btrfs_data *data, - grub_err_t ret = GRUB_ERR_OUT_OF_MEMORY; - grub_uint64_t i, failed_devices; - -- buffers = grub_zalloc (sizeof(*buffers) * nstripes); -+ buffers = grub_calloc (nstripes, sizeof (*buffers)); - if (!buffers) - goto cleanup; - -@@ -2160,7 +2160,7 @@ grub_btrfs_embed (grub_device_t device __attribute__ ((unused)), - *nsectors = 64 * 2 - 1; - if (*nsectors > max_nsectors) - *nsectors = max_nsectors; -- *sectors = grub_malloc (*nsectors * sizeof (**sectors)); -+ *sectors = grub_calloc (*nsectors, sizeof (**sectors)); - if (!*sectors) - return grub_errno; - for (i = 0; i < *nsectors; i++) -diff --git a/grub-core/fs/hfs.c b/grub-core/fs/hfs.c -index ac0a40990..3fe842b4d 100644 ---- a/grub-core/fs/hfs.c -+++ b/grub-core/fs/hfs.c -@@ -1360,7 +1360,7 @@ grub_hfs_label (grub_device_t device, char **label) - grub_size_t len = data->sblock.volname[0]; - if (len > sizeof (data->sblock.volname) - 1) - len = sizeof (data->sblock.volname) - 1; -- *label = grub_malloc (len * MAX_UTF8_PER_MAC_ROMAN + 1); -+ *label = grub_calloc (MAX_UTF8_PER_MAC_ROMAN + 1, len); - if (*label) - macroman_to_utf8 (*label, data->sblock.volname + 1, - len + 1, 0); -diff --git a/grub-core/fs/hfsplus.c b/grub-core/fs/hfsplus.c -index 54786bb1c..dae43becc 100644 ---- a/grub-core/fs/hfsplus.c -+++ b/grub-core/fs/hfsplus.c -@@ -720,7 +720,7 @@ list_nodes (void *record, void *hook_arg) - if (! filename) - return 0; - -- keyname = grub_malloc (grub_be_to_cpu16 (catkey->namelen) * sizeof (*keyname)); -+ keyname = grub_calloc (grub_be_to_cpu16 (catkey->namelen), sizeof (*keyname)); - if (!keyname) - { - grub_free (filename); -@@ -1007,7 +1007,7 @@ grub_hfsplus_label (grub_device_t device, char **label) - grub_hfsplus_btree_recptr (&data->catalog_tree, node, ptr); - - label_len = grub_be_to_cpu16 (catkey->namelen); -- label_name = grub_malloc (label_len * sizeof (*label_name)); -+ label_name = grub_calloc (label_len, sizeof (*label_name)); - if (!label_name) - { - grub_free (node); -@@ -1029,7 +1029,7 @@ grub_hfsplus_label (grub_device_t device, char **label) - } - } - -- *label = grub_malloc (label_len * GRUB_MAX_UTF8_PER_UTF16 + 1); -+ *label = grub_calloc (label_len, GRUB_MAX_UTF8_PER_UTF16 + 1); - if (! *label) - { - grub_free (label_name); -diff --git a/grub-core/fs/iso9660.c b/grub-core/fs/iso9660.c -index 49c0c632b..4f1b52a55 100644 ---- a/grub-core/fs/iso9660.c -+++ b/grub-core/fs/iso9660.c -@@ -331,7 +331,7 @@ grub_iso9660_convert_string (grub_uint8_t *us, int len) - int i; - grub_uint16_t t[MAX_NAMELEN / 2 + 1]; - -- p = grub_malloc (len * GRUB_MAX_UTF8_PER_UTF16 + 1); -+ p = grub_calloc (len, GRUB_MAX_UTF8_PER_UTF16 + 1); - if (! p) - return NULL; - -diff --git a/grub-core/fs/ntfs.c b/grub-core/fs/ntfs.c -index fc4e1f678..2f34f76da 100644 ---- a/grub-core/fs/ntfs.c -+++ b/grub-core/fs/ntfs.c -@@ -556,8 +556,8 @@ get_utf8 (grub_uint8_t *in, grub_size_t len) - grub_uint16_t *tmp; - grub_size_t i; - -- buf = grub_malloc (len * GRUB_MAX_UTF8_PER_UTF16 + 1); -- tmp = grub_malloc (len * sizeof (tmp[0])); -+ buf = grub_calloc (len, GRUB_MAX_UTF8_PER_UTF16 + 1); -+ tmp = grub_calloc (len, sizeof (tmp[0])); - if (!buf || !tmp) - { - grub_free (buf); -diff --git a/grub-core/fs/sfs.c b/grub-core/fs/sfs.c -index 50c1fe72f..90f7fb379 100644 ---- a/grub-core/fs/sfs.c -+++ b/grub-core/fs/sfs.c -@@ -266,7 +266,7 @@ grub_sfs_read_block (grub_fshelp_node_t node, grub_disk_addr_t fileblock) - node->next_extent = node->block; - node->cache_size = 0; - -- node->cache = grub_malloc (sizeof (node->cache[0]) * cache_size); -+ node->cache = grub_calloc (cache_size, sizeof (node->cache[0])); - if (!node->cache) - { - grub_errno = 0; -diff --git a/grub-core/fs/tar.c b/grub-core/fs/tar.c -index 7d63e0c99..c551ed6b5 100644 ---- a/grub-core/fs/tar.c -+++ b/grub-core/fs/tar.c -@@ -120,7 +120,7 @@ grub_cpio_find_file (struct grub_archelp_data *data, char **name, - if (data->linkname_alloc < linksize + 1) - { - char *n; -- n = grub_malloc (2 * (linksize + 1)); -+ n = grub_calloc (2, linksize + 1); - if (!n) - return grub_errno; - grub_free (data->linkname); -diff --git a/grub-core/fs/udf.c b/grub-core/fs/udf.c -index dc8b6e2d1..a83761674 100644 ---- a/grub-core/fs/udf.c -+++ b/grub-core/fs/udf.c -@@ -873,7 +873,7 @@ read_string (const grub_uint8_t *raw, grub_size_t sz, char *outbuf) - { - unsigned i; - utf16len = sz - 1; -- utf16 = grub_malloc (utf16len * sizeof (utf16[0])); -+ utf16 = grub_calloc (utf16len, sizeof (utf16[0])); - if (!utf16) - return NULL; - for (i = 0; i < utf16len; i++) -@@ -883,7 +883,7 @@ read_string (const grub_uint8_t *raw, grub_size_t sz, char *outbuf) - { - unsigned i; - utf16len = (sz - 1) / 2; -- utf16 = grub_malloc (utf16len * sizeof (utf16[0])); -+ utf16 = grub_calloc (utf16len, sizeof (utf16[0])); - if (!utf16) - return NULL; - for (i = 0; i < utf16len; i++) -diff --git a/grub-core/fs/zfs/zfs.c b/grub-core/fs/zfs/zfs.c -index 2f72e42bf..381dde556 100644 ---- a/grub-core/fs/zfs/zfs.c -+++ b/grub-core/fs/zfs/zfs.c -@@ -3325,7 +3325,7 @@ dnode_get_fullpath (const char *fullpath, struct subvolume *subvol, - } - subvol->nkeys = 0; - zap_iterate (&keychain_dn, 8, count_zap_keys, &ctx, data); -- subvol->keyring = grub_zalloc (subvol->nkeys * sizeof (subvol->keyring[0])); -+ subvol->keyring = grub_calloc (subvol->nkeys, sizeof (subvol->keyring[0])); - if (!subvol->keyring) - { - grub_free (fsname); -@@ -4336,7 +4336,7 @@ grub_zfs_embed (grub_device_t device __attribute__ ((unused)), - *nsectors = (VDEV_BOOT_SIZE >> GRUB_DISK_SECTOR_BITS); - if (*nsectors > max_nsectors) - *nsectors = max_nsectors; -- *sectors = grub_malloc (*nsectors * sizeof (**sectors)); -+ *sectors = grub_calloc (*nsectors, sizeof (**sectors)); - if (!*sectors) - return grub_errno; - for (i = 0; i < *nsectors; i++) -diff --git a/grub-core/gfxmenu/gui_string_util.c b/grub-core/gfxmenu/gui_string_util.c -index a9a415e31..ba1e1eab3 100644 ---- a/grub-core/gfxmenu/gui_string_util.c -+++ b/grub-core/gfxmenu/gui_string_util.c -@@ -55,7 +55,7 @@ canonicalize_path (const char *path) - if (*p == '/') - components++; - -- char **path_array = grub_malloc (components * sizeof (*path_array)); -+ char **path_array = grub_calloc (components, sizeof (*path_array)); - if (! path_array) - return 0; - -diff --git a/grub-core/gfxmenu/widget-box.c b/grub-core/gfxmenu/widget-box.c -index b60602889..470597ded 100644 ---- a/grub-core/gfxmenu/widget-box.c -+++ b/grub-core/gfxmenu/widget-box.c -@@ -303,10 +303,10 @@ grub_gfxmenu_create_box (const char *pixmaps_prefix, - box->content_height = 0; - box->raw_pixmaps = - (struct grub_video_bitmap **) -- grub_malloc (BOX_NUM_PIXMAPS * sizeof (struct grub_video_bitmap *)); -+ grub_calloc (BOX_NUM_PIXMAPS, sizeof (struct grub_video_bitmap *)); - box->scaled_pixmaps = - (struct grub_video_bitmap **) -- grub_malloc (BOX_NUM_PIXMAPS * sizeof (struct grub_video_bitmap *)); -+ grub_calloc (BOX_NUM_PIXMAPS, sizeof (struct grub_video_bitmap *)); - - /* Initialize all pixmap pointers to NULL so that proper destruction can - be performed if an error is encountered partway through construction. */ -diff --git a/grub-core/io/gzio.c b/grub-core/io/gzio.c -index 6208a9763..43d98a7bd 100644 ---- a/grub-core/io/gzio.c -+++ b/grub-core/io/gzio.c -@@ -554,7 +554,7 @@ huft_build (unsigned *b, /* code lengths in bits (all assumed <= BMAX) */ - z = 1 << j; /* table entries for j-bit table */ - - /* allocate and link in new table */ -- q = (struct huft *) grub_zalloc ((z + 1) * sizeof (struct huft)); -+ q = (struct huft *) grub_calloc (z + 1, sizeof (struct huft)); - if (! q) - { - if (h) -diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c -index 6e1ceb905..dc31caa21 100644 ---- a/grub-core/kern/efi/efi.c -+++ b/grub-core/kern/efi/efi.c -@@ -202,7 +202,7 @@ grub_efi_set_variable(const char *var, const grub_efi_guid_t *guid, - - len = grub_strlen (var); - len16 = len * GRUB_MAX_UTF16_PER_UTF8; -- var16 = grub_malloc ((len16 + 1) * sizeof (var16[0])); -+ var16 = grub_calloc (len16 + 1, sizeof (var16[0])); - if (!var16) - return grub_errno; - len16 = grub_utf8_to_utf16 (var16, len16, (grub_uint8_t *) var, len, NULL); -@@ -237,7 +237,7 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid, - - len = grub_strlen (var); - len16 = len * GRUB_MAX_UTF16_PER_UTF8; -- var16 = grub_malloc ((len16 + 1) * sizeof (var16[0])); -+ var16 = grub_calloc (len16 + 1, sizeof (var16[0])); - if (!var16) - return NULL; - len16 = grub_utf8_to_utf16 (var16, len16, (grub_uint8_t *) var, len, NULL); -@@ -383,7 +383,7 @@ grub_efi_get_filename (grub_efi_device_path_t *dp0) - while (len > 0 && fp->path_name[len - 1] == 0) - len--; - -- dup_name = grub_malloc (len * sizeof (*dup_name)); -+ dup_name = grub_calloc (len, sizeof (*dup_name)); - if (!dup_name) - { - grub_free (name); -diff --git a/grub-core/kern/emu/hostdisk.c b/grub-core/kern/emu/hostdisk.c -index e9ec680cd..d975265b2 100644 ---- a/grub-core/kern/emu/hostdisk.c -+++ b/grub-core/kern/emu/hostdisk.c -@@ -615,7 +615,7 @@ static char * - grub_util_path_concat_real (size_t n, int ext, va_list ap) - { - size_t totlen = 0; -- char **l = xmalloc ((n + ext) * sizeof (l[0])); -+ char **l = xcalloc (n + ext, sizeof (l[0])); - char *r, *p, *pi; - size_t i; - int first = 1; -diff --git a/grub-core/kern/fs.c b/grub-core/kern/fs.c -index 2b85f4950..f90be6566 100644 ---- a/grub-core/kern/fs.c -+++ b/grub-core/kern/fs.c -@@ -151,7 +151,7 @@ grub_fs_blocklist_open (grub_file_t file, const char *name) - while (p); - - /* Allocate a block list. */ -- blocks = grub_zalloc (sizeof (struct grub_fs_block) * (num + 1)); -+ blocks = grub_calloc (num + 1, sizeof (struct grub_fs_block)); - if (! blocks) - return 0; - -diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c -index 3b633d51f..a7abd367a 100644 ---- a/grub-core/kern/misc.c -+++ b/grub-core/kern/misc.c -@@ -690,7 +690,7 @@ parse_printf_args (const char *fmt0, struct printf_args *args, - args->ptr = args->prealloc; - else - { -- args->ptr = grub_malloc (args->count * sizeof (args->ptr[0])); -+ args->ptr = grub_calloc (args->count, sizeof (args->ptr[0])); - if (!args->ptr) - { - grub_errno = GRUB_ERR_NONE; -diff --git a/grub-core/kern/parser.c b/grub-core/kern/parser.c -index 78175aac2..619db3122 100644 ---- a/grub-core/kern/parser.c -+++ b/grub-core/kern/parser.c -@@ -213,7 +213,7 @@ grub_parser_split_cmdline (const char *cmdline, - return grub_errno; - grub_memcpy (args, buffer, bp - buffer); - -- *argv = grub_malloc (sizeof (char *) * (*argc + 1)); -+ *argv = grub_calloc (*argc + 1, sizeof (char *)); - if (!*argv) - { - grub_free (args); -diff --git a/grub-core/kern/uboot/uboot.c b/grub-core/kern/uboot/uboot.c -index be4816fe6..aac8f9ae1 100644 ---- a/grub-core/kern/uboot/uboot.c -+++ b/grub-core/kern/uboot/uboot.c -@@ -133,7 +133,7 @@ grub_uboot_dev_enum (void) - return num_devices; - - max_devices = 2; -- enum_devices = grub_malloc (sizeof(struct device_info) * max_devices); -+ enum_devices = grub_calloc (max_devices, sizeof(struct device_info)); - if (!enum_devices) - return 0; - -diff --git a/grub-core/lib/libgcrypt/cipher/ac.c b/grub-core/lib/libgcrypt/cipher/ac.c -index f5e946a2d..63f6fcd11 100644 ---- a/grub-core/lib/libgcrypt/cipher/ac.c -+++ b/grub-core/lib/libgcrypt/cipher/ac.c -@@ -185,7 +185,7 @@ ac_data_mpi_copy (gcry_ac_mpi_t *data_mpis, unsigned int data_mpis_n, - gcry_mpi_t mpi; - char *label; - -- data_mpis_new = gcry_malloc (sizeof (*data_mpis_new) * data_mpis_n); -+ data_mpis_new = gcry_calloc (data_mpis_n, sizeof (*data_mpis_new)); - if (! data_mpis_new) - { - err = gcry_error_from_errno (errno); -@@ -572,7 +572,7 @@ _gcry_ac_data_to_sexp (gcry_ac_data_t data, gcry_sexp_t *sexp, - } - - /* Add MPI list. */ -- arg_list = gcry_malloc (sizeof (*arg_list) * (data_n + 1)); -+ arg_list = gcry_calloc (data_n + 1, sizeof (*arg_list)); - if (! arg_list) - { - err = gcry_error_from_errno (errno); -@@ -1283,7 +1283,7 @@ ac_data_construct (const char *identifier, int include_flags, - /* We build a list of arguments to pass to - gcry_sexp_build_array(). */ - data_length = _gcry_ac_data_length (data); -- arg_list = gcry_malloc (sizeof (*arg_list) * (data_length * 2)); -+ arg_list = gcry_calloc (data_length, sizeof (*arg_list) * 2); - if (! arg_list) - { - err = gcry_error_from_errno (errno); -@@ -1593,7 +1593,7 @@ _gcry_ac_key_pair_generate (gcry_ac_handle_t handle, unsigned int nbits, - arg_list_n += 2; - - /* Allocate list. */ -- arg_list = gcry_malloc (sizeof (*arg_list) * arg_list_n); -+ arg_list = gcry_calloc (arg_list_n, sizeof (*arg_list)); - if (! arg_list) - { - err = gcry_error_from_errno (errno); -diff --git a/grub-core/lib/libgcrypt/cipher/primegen.c b/grub-core/lib/libgcrypt/cipher/primegen.c -index 2788e349f..b12e79b19 100644 ---- a/grub-core/lib/libgcrypt/cipher/primegen.c -+++ b/grub-core/lib/libgcrypt/cipher/primegen.c -@@ -383,7 +383,7 @@ prime_generate_internal (int need_q_factor, - } - - /* Allocate an array to track pool usage. */ -- pool_in_use = gcry_malloc (n * sizeof *pool_in_use); -+ pool_in_use = gcry_calloc (n, sizeof *pool_in_use); - if (!pool_in_use) - { - err = gpg_err_code_from_errno (errno); -@@ -765,7 +765,7 @@ gen_prime (unsigned int nbits, int secret, int randomlevel, - if (nbits < 16) - log_fatal ("can't generate a prime with less than %d bits\n", 16); - -- mods = gcry_xmalloc( no_of_small_prime_numbers * sizeof *mods ); -+ mods = gcry_xcalloc( no_of_small_prime_numbers, sizeof *mods); - /* Make nbits fit into gcry_mpi_t implementation. */ - val_2 = mpi_alloc_set_ui( 2 ); - val_3 = mpi_alloc_set_ui( 3); -diff --git a/grub-core/lib/libgcrypt/cipher/pubkey.c b/grub-core/lib/libgcrypt/cipher/pubkey.c -index 910982141..ca087ad75 100644 ---- a/grub-core/lib/libgcrypt/cipher/pubkey.c -+++ b/grub-core/lib/libgcrypt/cipher/pubkey.c -@@ -2941,7 +2941,7 @@ gcry_pk_encrypt (gcry_sexp_t *r_ciph, gcry_sexp_t s_data, gcry_sexp_t s_pkey) - * array to a format string, so we have to do it this way :-(. */ - /* FIXME: There is now such a format specifier, so we can - change the code to be more clear. */ -- arg_list = malloc (nelem * sizeof *arg_list); -+ arg_list = calloc (nelem, sizeof *arg_list); - if (!arg_list) - { - rc = gpg_err_code_from_syserror (); -@@ -3233,7 +3233,7 @@ gcry_pk_sign (gcry_sexp_t *r_sig, gcry_sexp_t s_hash, gcry_sexp_t s_skey) - } - strcpy (p, "))"); - -- arg_list = malloc (nelem * sizeof *arg_list); -+ arg_list = calloc (nelem, sizeof *arg_list); - if (!arg_list) - { - rc = gpg_err_code_from_syserror (); -diff --git a/grub-core/lib/priority_queue.c b/grub-core/lib/priority_queue.c -index 659be0b7f..7d5e7c05a 100644 ---- a/grub-core/lib/priority_queue.c -+++ b/grub-core/lib/priority_queue.c -@@ -92,7 +92,7 @@ grub_priority_queue_new (grub_size_t elsize, - { - struct grub_priority_queue *ret; - void *els; -- els = grub_malloc (elsize * 8); -+ els = grub_calloc (8, elsize); - if (!els) - return 0; - ret = (struct grub_priority_queue *) grub_malloc (sizeof (*ret)); -diff --git a/grub-core/lib/reed_solomon.c b/grub-core/lib/reed_solomon.c -index ee9fa7b4f..467305b46 100644 ---- a/grub-core/lib/reed_solomon.c -+++ b/grub-core/lib/reed_solomon.c -@@ -20,6 +20,7 @@ - #include - #include - #include -+#define xcalloc calloc - #define xmalloc malloc - #define grub_memset memset - #define grub_memcpy memcpy -@@ -158,11 +159,9 @@ rs_encode (gf_single_t *data, grub_size_t s, grub_size_t rs) - gf_single_t *rs_polynomial; - int i, j; - gf_single_t *m; -- m = xmalloc ((s + rs) * sizeof (gf_single_t)); -+ m = xcalloc (s + rs, sizeof (gf_single_t)); - grub_memcpy (m, data, s * sizeof (gf_single_t)); -- grub_memset (m + s, 0, rs * sizeof (gf_single_t)); -- rs_polynomial = xmalloc ((rs + 1) * sizeof (gf_single_t)); -- grub_memset (rs_polynomial, 0, (rs + 1) * sizeof (gf_single_t)); -+ rs_polynomial = xcalloc (rs + 1, sizeof (gf_single_t)); - rs_polynomial[rs] = 1; - /* Multiply with X - a^r */ - for (j = 0; j < rs; j++) -diff --git a/grub-core/lib/relocator.c b/grub-core/lib/relocator.c -index ea3ebc719..5847aac36 100644 ---- a/grub-core/lib/relocator.c -+++ b/grub-core/lib/relocator.c -@@ -495,9 +495,9 @@ malloc_in_range (struct grub_relocator *rel, - } - #endif - -- eventt = grub_malloc (maxevents * sizeof (events[0])); -+ eventt = grub_calloc (maxevents, sizeof (events[0])); - counter = grub_malloc ((DIGITSORT_MASK + 2) * sizeof (counter[0])); -- events = grub_malloc (maxevents * sizeof (events[0])); -+ events = grub_calloc (maxevents, sizeof (events[0])); - if (!events || !eventt || !counter) - { - grub_dprintf ("relocator", "events or counter allocation failed %d\n", -@@ -963,7 +963,7 @@ malloc_in_range (struct grub_relocator *rel, - #endif - unsigned cural = 0; - int oom = 0; -- res->subchunks = grub_malloc (sizeof (res->subchunks[0]) * nallocs); -+ res->subchunks = grub_calloc (nallocs, sizeof (res->subchunks[0])); - if (!res->subchunks) - oom = 1; - res->nsubchunks = nallocs; -@@ -1562,8 +1562,8 @@ grub_relocator_prepare_relocs (struct grub_relocator *rel, grub_addr_t addr, - count[(chunk->src & 0xff) + 1]++; - } - } -- from = grub_malloc (nchunks * sizeof (sorted[0])); -- to = grub_malloc (nchunks * sizeof (sorted[0])); -+ from = grub_calloc (nchunks, sizeof (sorted[0])); -+ to = grub_calloc (nchunks, sizeof (sorted[0])); - if (!from || !to) - { - grub_free (from); -diff --git a/grub-core/lib/zstd/fse_decompress.c b/grub-core/lib/zstd/fse_decompress.c -index 72bbead5b..2227b84bc 100644 ---- a/grub-core/lib/zstd/fse_decompress.c -+++ b/grub-core/lib/zstd/fse_decompress.c -@@ -82,7 +82,7 @@ - FSE_DTable* FSE_createDTable (unsigned tableLog) - { - if (tableLog > FSE_TABLELOG_ABSOLUTE_MAX) tableLog = FSE_TABLELOG_ABSOLUTE_MAX; -- return (FSE_DTable*)malloc( FSE_DTABLE_SIZE_U32(tableLog) * sizeof (U32) ); -+ return (FSE_DTable*)calloc( FSE_DTABLE_SIZE_U32(tableLog), sizeof (U32) ); - } - - void FSE_freeDTable (FSE_DTable* dt) -diff --git a/grub-core/loader/arm/linux.c b/grub-core/loader/arm/linux.c -index 51684914c..d70c17486 100644 ---- a/grub-core/loader/arm/linux.c -+++ b/grub-core/loader/arm/linux.c -@@ -78,7 +78,7 @@ linux_prepare_atag (void *target_atag) - - /* some place for cmdline, initrd and terminator. */ - tmp_size = get_atag_size (atag_orig) + 20 + (arg_size) / 4; -- tmp_atag = grub_malloc (tmp_size * sizeof (grub_uint32_t)); -+ tmp_atag = grub_calloc (tmp_size, sizeof (grub_uint32_t)); - if (!tmp_atag) - return grub_errno; - -diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c -index cd92ea3f2..daf8c6b54 100644 ---- a/grub-core/loader/efi/chainloader.c -+++ b/grub-core/loader/efi/chainloader.c -@@ -116,7 +116,7 @@ copy_file_path (grub_efi_file_path_device_path_t *fp, - fp->header.type = GRUB_EFI_MEDIA_DEVICE_PATH_TYPE; - fp->header.subtype = GRUB_EFI_FILE_PATH_DEVICE_PATH_SUBTYPE; - -- path_name = grub_malloc (len * GRUB_MAX_UTF16_PER_UTF8 * sizeof (*path_name)); -+ path_name = grub_calloc (len, GRUB_MAX_UTF16_PER_UTF8 * sizeof (*path_name)); - if (!path_name) - return; - -diff --git a/grub-core/loader/i386/bsdXX.c b/grub-core/loader/i386/bsdXX.c -index af6741d15..a8d8bf7da 100644 ---- a/grub-core/loader/i386/bsdXX.c -+++ b/grub-core/loader/i386/bsdXX.c -@@ -48,7 +48,7 @@ read_headers (grub_file_t file, const char *filename, Elf_Ehdr *e, char **shdr) - if (e->e_ident[EI_CLASS] != SUFFIX (ELFCLASS)) - return grub_error (GRUB_ERR_BAD_OS, N_("invalid arch-dependent ELF magic")); - -- *shdr = grub_malloc ((grub_uint32_t) e->e_shnum * e->e_shentsize); -+ *shdr = grub_calloc (e->e_shnum, e->e_shentsize); - if (! *shdr) - return grub_errno; - -diff --git a/grub-core/loader/i386/xnu.c b/grub-core/loader/i386/xnu.c -index e64ed08f5..b7d176b5d 100644 ---- a/grub-core/loader/i386/xnu.c -+++ b/grub-core/loader/i386/xnu.c -@@ -295,7 +295,7 @@ grub_xnu_devprop_add_property_utf8 (struct grub_xnu_devprop_device_descriptor *d - return grub_errno; - - len = grub_strlen (name); -- utf16 = grub_malloc (sizeof (grub_uint16_t) * len); -+ utf16 = grub_calloc (len, sizeof (grub_uint16_t)); - if (!utf16) - { - grub_free (utf8); -@@ -331,7 +331,7 @@ grub_xnu_devprop_add_property_utf16 (struct grub_xnu_devprop_device_descriptor * - grub_uint16_t *utf16; - grub_err_t err; - -- utf16 = grub_malloc (sizeof (grub_uint16_t) * namelen); -+ utf16 = grub_calloc (namelen, sizeof (grub_uint16_t)); - if (!utf16) - return grub_errno; - grub_memcpy (utf16, name, sizeof (grub_uint16_t) * namelen); -diff --git a/grub-core/loader/macho.c b/grub-core/loader/macho.c -index 085f9c689..05710c48e 100644 ---- a/grub-core/loader/macho.c -+++ b/grub-core/loader/macho.c -@@ -97,7 +97,7 @@ grub_macho_file (grub_file_t file, const char *filename, int is_64bit) - if (grub_file_seek (macho->file, sizeof (struct grub_macho_fat_header)) - == (grub_off_t) -1) - goto fail; -- archs = grub_malloc (sizeof (struct grub_macho_fat_arch) * narchs); -+ archs = grub_calloc (narchs, sizeof (struct grub_macho_fat_arch)); - if (!archs) - goto fail; - if (grub_file_read (macho->file, archs, -diff --git a/grub-core/loader/multiboot_elfxx.c b/grub-core/loader/multiboot_elfxx.c -index 70cd1db51..cc6853692 100644 ---- a/grub-core/loader/multiboot_elfxx.c -+++ b/grub-core/loader/multiboot_elfxx.c -@@ -217,7 +217,7 @@ CONCAT(grub_multiboot_load_elf, XX) (mbi_load_data_t *mld) - { - grub_uint8_t *shdr, *shdrptr; - -- shdr = grub_malloc ((grub_uint32_t) ehdr->e_shnum * ehdr->e_shentsize); -+ shdr = grub_calloc (ehdr->e_shnum, ehdr->e_shentsize); - if (!shdr) - return grub_errno; - -diff --git a/grub-core/loader/xnu.c b/grub-core/loader/xnu.c -index 7f74d1d6f..77d7060e1 100644 ---- a/grub-core/loader/xnu.c -+++ b/grub-core/loader/xnu.c -@@ -800,7 +800,7 @@ grub_cmd_xnu_mkext (grub_command_t cmd __attribute__ ((unused)), - if (grub_be_to_cpu32 (head.magic) == GRUB_MACHO_FAT_MAGIC) - { - narchs = grub_be_to_cpu32 (head.nfat_arch); -- archs = grub_malloc (sizeof (struct grub_macho_fat_arch) * narchs); -+ archs = grub_calloc (narchs, sizeof (struct grub_macho_fat_arch)); - if (! archs) - { - grub_file_close (file); -diff --git a/grub-core/mmap/mmap.c b/grub-core/mmap/mmap.c -index 6a31cbae3..57b4e9a72 100644 ---- a/grub-core/mmap/mmap.c -+++ b/grub-core/mmap/mmap.c -@@ -143,9 +143,9 @@ grub_mmap_iterate (grub_memory_hook_t hook, void *hook_data) - - /* Initialize variables. */ - ctx.scanline_events = (struct grub_mmap_scan *) -- grub_malloc (sizeof (struct grub_mmap_scan) * 2 * mmap_num); -+ grub_calloc (mmap_num, sizeof (struct grub_mmap_scan) * 2); - -- present = grub_zalloc (sizeof (present[0]) * current_priority); -+ present = grub_calloc (current_priority, sizeof (present[0])); - - if (! ctx.scanline_events || !present) - { -diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c -index 04cfbb045..653957200 100644 ---- a/grub-core/net/bootp.c -+++ b/grub-core/net/bootp.c -@@ -766,7 +766,7 @@ grub_cmd_bootp (struct grub_command *cmd __attribute__ ((unused)), - if (ncards == 0) - return grub_error (GRUB_ERR_NET_NO_CARD, N_("no network card found")); - -- ifaces = grub_zalloc (ncards * sizeof (ifaces[0])); -+ ifaces = grub_calloc (ncards, sizeof (ifaces[0])); - if (!ifaces) - return grub_errno; - -diff --git a/grub-core/net/dns.c b/grub-core/net/dns.c -index 5d9afe093..e332d5eb4 100644 ---- a/grub-core/net/dns.c -+++ b/grub-core/net/dns.c -@@ -285,8 +285,8 @@ recv_hook (grub_net_udp_socket_t sock __attribute__ ((unused)), - ptr++; - ptr += 4; - } -- *data->addresses = grub_malloc (sizeof ((*data->addresses)[0]) -- * grub_be_to_cpu16 (head->ancount)); -+ *data->addresses = grub_calloc (grub_be_to_cpu16 (head->ancount), -+ sizeof ((*data->addresses)[0])); - if (!*data->addresses) - { - grub_errno = GRUB_ERR_NONE; -@@ -406,8 +406,8 @@ recv_hook (grub_net_udp_socket_t sock __attribute__ ((unused)), - dns_cache[h].addresses = 0; - dns_cache[h].name = grub_strdup (data->oname); - dns_cache[h].naddresses = *data->naddresses; -- dns_cache[h].addresses = grub_malloc (*data->naddresses -- * sizeof (dns_cache[h].addresses[0])); -+ dns_cache[h].addresses = grub_calloc (*data->naddresses, -+ sizeof (dns_cache[h].addresses[0])); - dns_cache[h].limit_time = grub_get_time_ms () + 1000 * ttl_all; - if (!dns_cache[h].addresses || !dns_cache[h].name) - { -@@ -479,7 +479,7 @@ grub_net_dns_lookup (const char *name, - } - } - -- sockets = grub_malloc (sizeof (sockets[0]) * n_servers); -+ sockets = grub_calloc (n_servers, sizeof (sockets[0])); - if (!sockets) - return grub_errno; - -diff --git a/grub-core/net/net.c b/grub-core/net/net.c -index d5d726a31..38f19dfc9 100644 ---- a/grub-core/net/net.c -+++ b/grub-core/net/net.c -@@ -333,8 +333,8 @@ grub_cmd_ipv6_autoconf (struct grub_command *cmd __attribute__ ((unused)), - ncards++; - } - -- ifaces = grub_zalloc (ncards * sizeof (ifaces[0])); -- slaacs = grub_zalloc (ncards * sizeof (slaacs[0])); -+ ifaces = grub_calloc (ncards, sizeof (ifaces[0])); -+ slaacs = grub_calloc (ncards, sizeof (slaacs[0])); - if (!ifaces || !slaacs) - { - grub_free (ifaces); -diff --git a/grub-core/normal/charset.c b/grub-core/normal/charset.c -index b0ab47d73..d57fb72fa 100644 ---- a/grub-core/normal/charset.c -+++ b/grub-core/normal/charset.c -@@ -203,7 +203,7 @@ grub_utf8_to_ucs4_alloc (const char *msg, grub_uint32_t **unicode_msg, - { - grub_size_t msg_len = grub_strlen (msg); - -- *unicode_msg = grub_malloc (msg_len * sizeof (grub_uint32_t)); -+ *unicode_msg = grub_calloc (msg_len, sizeof (grub_uint32_t)); - - if (!*unicode_msg) - return -1; -@@ -488,7 +488,7 @@ grub_unicode_aglomerate_comb (const grub_uint32_t *in, grub_size_t inlen, - } - else - { -- n = grub_malloc (sizeof (n[0]) * (out->ncomb + 1)); -+ n = grub_calloc (out->ncomb + 1, sizeof (n[0])); - if (!n) - { - grub_errno = GRUB_ERR_NONE; -@@ -842,7 +842,7 @@ grub_bidi_line_logical_to_visual (const grub_uint32_t *logical, - } \ - } - -- visual = grub_malloc (sizeof (visual[0]) * logical_len); -+ visual = grub_calloc (logical_len, sizeof (visual[0])); - if (!visual) - return -1; - -@@ -1165,8 +1165,8 @@ grub_bidi_logical_to_visual (const grub_uint32_t *logical, - { - const grub_uint32_t *line_start = logical, *ptr; - struct grub_unicode_glyph *visual_ptr; -- *visual_out = visual_ptr = grub_malloc (3 * sizeof (visual_ptr[0]) -- * (logical_len + 2)); -+ *visual_out = visual_ptr = grub_calloc (logical_len + 2, -+ 3 * sizeof (visual_ptr[0])); - if (!visual_ptr) - return -1; - for (ptr = logical; ptr <= logical + logical_len; ptr++) -diff --git a/grub-core/normal/cmdline.c b/grub-core/normal/cmdline.c -index c037d5050..c57242e2e 100644 ---- a/grub-core/normal/cmdline.c -+++ b/grub-core/normal/cmdline.c -@@ -41,7 +41,7 @@ grub_err_t - grub_set_history (int newsize) - { - grub_uint32_t **old_hist_lines = hist_lines; -- hist_lines = grub_malloc (sizeof (grub_uint32_t *) * newsize); -+ hist_lines = grub_calloc (newsize, sizeof (grub_uint32_t *)); - - /* Copy the old lines into the new buffer. */ - if (old_hist_lines) -@@ -114,7 +114,7 @@ static void - grub_history_set (int pos, grub_uint32_t *s, grub_size_t len) - { - grub_free (hist_lines[pos]); -- hist_lines[pos] = grub_malloc ((len + 1) * sizeof (grub_uint32_t)); -+ hist_lines[pos] = grub_calloc (len + 1, sizeof (grub_uint32_t)); - if (!hist_lines[pos]) - { - grub_print_error (); -@@ -349,7 +349,7 @@ grub_cmdline_get (const char *prompt_translated) - char *ret; - unsigned nterms; - -- buf = grub_malloc (max_len * sizeof (grub_uint32_t)); -+ buf = grub_calloc (max_len, sizeof (grub_uint32_t)); - if (!buf) - return 0; - -@@ -377,7 +377,7 @@ grub_cmdline_get (const char *prompt_translated) - FOR_ACTIVE_TERM_OUTPUTS(cur) - nterms++; - -- cl_terms = grub_malloc (sizeof (cl_terms[0]) * nterms); -+ cl_terms = grub_calloc (nterms, sizeof (cl_terms[0])); - if (!cl_terms) - { - grub_free (buf); -@@ -385,7 +385,7 @@ grub_cmdline_get (const char *prompt_translated) - } - cl_term_cur = cl_terms; - -- unicode_msg = grub_malloc (msg_len * sizeof (grub_uint32_t)); -+ unicode_msg = grub_calloc (msg_len, sizeof (grub_uint32_t)); - if (!unicode_msg) - { - grub_free (buf); -@@ -495,7 +495,7 @@ grub_cmdline_get (const char *prompt_translated) - grub_uint32_t *insert; - - insertlen = grub_strlen (insertu8); -- insert = grub_malloc ((insertlen + 1) * sizeof (grub_uint32_t)); -+ insert = grub_calloc (insertlen + 1, sizeof (grub_uint32_t)); - if (!insert) - { - grub_free (insertu8); -@@ -602,7 +602,7 @@ grub_cmdline_get (const char *prompt_translated) - - grub_free (kill_buf); - -- kill_buf = grub_malloc ((n + 1) * sizeof(grub_uint32_t)); -+ kill_buf = grub_calloc (n + 1, sizeof (grub_uint32_t)); - if (grub_errno) - { - grub_print_error (); -diff --git a/grub-core/normal/menu_entry.c b/grub-core/normal/menu_entry.c -index cdf3590a3..1993995be 100644 ---- a/grub-core/normal/menu_entry.c -+++ b/grub-core/normal/menu_entry.c -@@ -95,8 +95,8 @@ init_line (struct screen *screen, struct line *linep) - { - linep->len = 0; - linep->max_len = 80; -- linep->buf = grub_malloc ((linep->max_len + 1) * sizeof (linep->buf[0])); -- linep->pos = grub_zalloc (screen->nterms * sizeof (linep->pos[0])); -+ linep->buf = grub_calloc (linep->max_len + 1, sizeof (linep->buf[0])); -+ linep->pos = grub_calloc (screen->nterms, sizeof (linep->pos[0])); - if (! linep->buf || !linep->pos) - { - grub_free (linep->buf); -@@ -287,7 +287,7 @@ update_screen (struct screen *screen, struct per_term_screen *term_screen, - pos = linep->pos + (term_screen - screen->terms); - - if (!*pos) -- *pos = grub_zalloc ((linep->len + 1) * sizeof (**pos)); -+ *pos = grub_calloc (linep->len + 1, sizeof (**pos)); - - if (i == region_start || linep == screen->lines + screen->line - || (i > region_start && mode == ALL_LINES)) -@@ -471,7 +471,7 @@ insert_string (struct screen *screen, const char *s, int update) - - /* Insert the string. */ - current_linep = screen->lines + screen->line; -- unicode_msg = grub_malloc ((p - s) * sizeof (grub_uint32_t)); -+ unicode_msg = grub_calloc (p - s, sizeof (grub_uint32_t)); - - if (!unicode_msg) - return 0; -@@ -1023,7 +1023,7 @@ complete (struct screen *screen, int continuous, int update) - if (completion_buffer.buf) - { - buflen = grub_strlen (completion_buffer.buf); -- ucs4 = grub_malloc (sizeof (grub_uint32_t) * (buflen + 1)); -+ ucs4 = grub_calloc (buflen + 1, sizeof (grub_uint32_t)); - - if (!ucs4) - { -@@ -1268,7 +1268,7 @@ grub_menu_entry_run (grub_menu_entry_t entry) - for (i = 0; i < (unsigned) screen->num_lines; i++) - { - grub_free (screen->lines[i].pos); -- screen->lines[i].pos = grub_zalloc (screen->nterms * sizeof (screen->lines[i].pos[0])); -+ screen->lines[i].pos = grub_calloc (screen->nterms, sizeof (screen->lines[i].pos[0])); - if (! screen->lines[i].pos) - { - grub_print_error (); -@@ -1278,7 +1278,7 @@ grub_menu_entry_run (grub_menu_entry_t entry) - } - } - -- screen->terms = grub_zalloc (screen->nterms * sizeof (screen->terms[0])); -+ screen->terms = grub_calloc (screen->nterms, sizeof (screen->terms[0])); - if (!screen->terms) - { - grub_print_error (); -diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c -index e22bb91f6..18240e76c 100644 ---- a/grub-core/normal/menu_text.c -+++ b/grub-core/normal/menu_text.c -@@ -78,7 +78,7 @@ grub_print_message_indented_real (const char *msg, int margin_left, - grub_size_t msg_len = grub_strlen (msg) + 2; - int ret = 0; - -- unicode_msg = grub_malloc (msg_len * sizeof (grub_uint32_t)); -+ unicode_msg = grub_calloc (msg_len, sizeof (grub_uint32_t)); - - if (!unicode_msg) - return 0; -@@ -211,7 +211,7 @@ print_entry (int y, int highlight, grub_menu_entry_t entry, - - title = entry ? entry->title : ""; - title_len = grub_strlen (title); -- unicode_title = grub_malloc (title_len * sizeof (*unicode_title)); -+ unicode_title = grub_calloc (title_len, sizeof (*unicode_title)); - if (! unicode_title) - /* XXX How to show this error? */ - return; -diff --git a/grub-core/normal/term.c b/grub-core/normal/term.c -index a1e5c5a0d..cc8c173b6 100644 ---- a/grub-core/normal/term.c -+++ b/grub-core/normal/term.c -@@ -264,7 +264,7 @@ grub_term_save_pos (void) - FOR_ACTIVE_TERM_OUTPUTS(cur) - cnt++; - -- ret = grub_malloc (cnt * sizeof (ret[0])); -+ ret = grub_calloc (cnt, sizeof (ret[0])); - if (!ret) - return NULL; - -@@ -1013,7 +1013,7 @@ grub_xnputs (const char *str, grub_size_t msg_len) - - grub_error_push (); - -- unicode_str = grub_malloc (msg_len * sizeof (grub_uint32_t)); -+ unicode_str = grub_calloc (msg_len, sizeof (grub_uint32_t)); - - grub_error_pop (); - -diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c -index 90d92d3ad..5b41ad022 100644 ---- a/grub-core/osdep/linux/getroot.c -+++ b/grub-core/osdep/linux/getroot.c -@@ -168,7 +168,7 @@ grub_util_raid_getmembers (const char *name, int bootable) - if (ret != 0) - grub_util_error (_("ioctl GET_ARRAY_INFO error: %s"), strerror (errno)); - -- devicelist = xmalloc ((info.nr_disks + 1) * sizeof (char *)); -+ devicelist = xcalloc (info.nr_disks + 1, sizeof (char *)); - - for (i = 0, j = 0; j < info.nr_disks; i++) - { -@@ -241,7 +241,7 @@ grub_find_root_devices_from_btrfs (const char *dir) - return NULL; - } - -- ret = xmalloc ((fsi.num_devices + 1) * sizeof (ret[0])); -+ ret = xcalloc (fsi.num_devices + 1, sizeof (ret[0])); - - for (i = 1; i <= fsi.max_id && j < fsi.num_devices; i++) - { -@@ -396,7 +396,7 @@ grub_find_root_devices_from_mountinfo (const char *dir, char **relroot) - if (relroot) - *relroot = NULL; - -- entries = xmalloc (entry_max * sizeof (*entries)); -+ entries = xcalloc (entry_max, sizeof (*entries)); - - again: - fp = grub_util_fopen ("/proc/self/mountinfo", "r"); -diff --git a/grub-core/osdep/unix/config.c b/grub-core/osdep/unix/config.c -index 65effa9f3..7d6325138 100644 ---- a/grub-core/osdep/unix/config.c -+++ b/grub-core/osdep/unix/config.c -@@ -89,7 +89,7 @@ grub_util_load_config (struct grub_util_config *cfg) - argv[0] = "sh"; - argv[1] = "-c"; - -- script = xmalloc (4 * strlen (cfgfile) + 300); -+ script = xcalloc (4, strlen (cfgfile) + 300); - - ptr = script; - memcpy (ptr, ". '", 3); -diff --git a/grub-core/osdep/windows/getroot.c b/grub-core/osdep/windows/getroot.c -index 661d95461..eada663b2 100644 ---- a/grub-core/osdep/windows/getroot.c -+++ b/grub-core/osdep/windows/getroot.c -@@ -59,7 +59,7 @@ grub_get_mount_point (const TCHAR *path) - - for (ptr = path; *ptr; ptr++); - allocsize = (ptr - path + 10) * 2; -- out = xmalloc (allocsize * sizeof (out[0])); -+ out = xcalloc (allocsize, sizeof (out[0])); - - /* When pointing to EFI system partition GetVolumePathName fails - for ESP root and returns abberant information for everything -diff --git a/grub-core/osdep/windows/hostdisk.c b/grub-core/osdep/windows/hostdisk.c -index 355100789..0be327394 100644 ---- a/grub-core/osdep/windows/hostdisk.c -+++ b/grub-core/osdep/windows/hostdisk.c -@@ -111,7 +111,7 @@ grub_util_get_windows_path_real (const char *path) - - while (1) - { -- fpa = xmalloc (alloc * sizeof (fpa[0])); -+ fpa = xcalloc (alloc, sizeof (fpa[0])); - - len = GetFullPathName (tpath, alloc, fpa, NULL); - if (len >= alloc) -@@ -399,7 +399,7 @@ grub_util_fd_opendir (const char *name) - for (l = 0; name_windows[l]; l++); - for (l--; l >= 0 && (name_windows[l] == '\\' || name_windows[l] == '/'); l--); - l++; -- pattern = xmalloc ((l + 3) * sizeof (pattern[0])); -+ pattern = xcalloc (l + 3, sizeof (pattern[0])); - memcpy (pattern, name_windows, l * sizeof (pattern[0])); - pattern[l] = '\\'; - pattern[l + 1] = '*'; -diff --git a/grub-core/osdep/windows/init.c b/grub-core/osdep/windows/init.c -index e8ffd62c6..6297de632 100644 ---- a/grub-core/osdep/windows/init.c -+++ b/grub-core/osdep/windows/init.c -@@ -161,7 +161,7 @@ grub_util_host_init (int *argc __attribute__ ((unused)), - LPWSTR *targv; - - targv = CommandLineToArgvW (tcmdline, argc); -- *argv = xmalloc ((*argc + 1) * sizeof (argv[0])); -+ *argv = xcalloc (*argc + 1, sizeof (argv[0])); - - for (i = 0; i < *argc; i++) - (*argv)[i] = grub_util_tchar_to_utf8 (targv[i]); -diff --git a/grub-core/osdep/windows/platform.c b/grub-core/osdep/windows/platform.c -index 7eb53fe01..1ef86bf58 100644 ---- a/grub-core/osdep/windows/platform.c -+++ b/grub-core/osdep/windows/platform.c -@@ -225,8 +225,8 @@ grub_install_register_efi (grub_device_t efidir_grub_dev, - grub_util_error ("%s", _("no EFI routines are available when running in BIOS mode")); - - distrib8_len = grub_strlen (efi_distributor); -- distributor16 = xmalloc ((distrib8_len + 1) * GRUB_MAX_UTF16_PER_UTF8 -- * sizeof (grub_uint16_t)); -+ distributor16 = xcalloc (distrib8_len + 1, -+ GRUB_MAX_UTF16_PER_UTF8 * sizeof (grub_uint16_t)); - distrib16_len = grub_utf8_to_utf16 (distributor16, distrib8_len * GRUB_MAX_UTF16_PER_UTF8, - (const grub_uint8_t *) efi_distributor, - distrib8_len, 0); -diff --git a/grub-core/osdep/windows/relpath.c b/grub-core/osdep/windows/relpath.c -index cb0861744..478e8ef14 100644 ---- a/grub-core/osdep/windows/relpath.c -+++ b/grub-core/osdep/windows/relpath.c -@@ -72,7 +72,7 @@ grub_make_system_path_relative_to_its_root (const char *path) - if (dirwindows[0] && dirwindows[1] == ':') - offset = 2; - } -- ret = xmalloc (sizeof (ret[0]) * (flen - offset + 2)); -+ ret = xcalloc (flen - offset + 2, sizeof (ret[0])); - if (dirwindows[offset] != '\\' - && dirwindows[offset] != '/' - && dirwindows[offset]) -diff --git a/grub-core/partmap/gpt.c b/grub-core/partmap/gpt.c -index 103f6796f..72a2e37cd 100644 ---- a/grub-core/partmap/gpt.c -+++ b/grub-core/partmap/gpt.c -@@ -199,7 +199,7 @@ gpt_partition_map_embed (struct grub_disk *disk, unsigned int *nsectors, - *nsectors = ctx.len; - if (*nsectors > max_nsectors) - *nsectors = max_nsectors; -- *sectors = grub_malloc (*nsectors * sizeof (**sectors)); -+ *sectors = grub_calloc (*nsectors, sizeof (**sectors)); - if (!*sectors) - return grub_errno; - for (i = 0; i < *nsectors; i++) -diff --git a/grub-core/partmap/msdos.c b/grub-core/partmap/msdos.c -index 7b8e45076..ee3f24982 100644 ---- a/grub-core/partmap/msdos.c -+++ b/grub-core/partmap/msdos.c -@@ -337,7 +337,7 @@ pc_partition_map_embed (struct grub_disk *disk, unsigned int *nsectors, - avail_nsectors = *nsectors; - if (*nsectors > max_nsectors) - *nsectors = max_nsectors; -- *sectors = grub_malloc (*nsectors * sizeof (**sectors)); -+ *sectors = grub_calloc (*nsectors, sizeof (**sectors)); - if (!*sectors) - return grub_errno; - for (i = 0; i < *nsectors; i++) -diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c -index ee299fd0e..c8d6806fe 100644 ---- a/grub-core/script/execute.c -+++ b/grub-core/script/execute.c -@@ -553,7 +553,7 @@ gettext_append (struct grub_script_argv *result, const char *orig_str) - for (iptr = orig_str; *iptr; iptr++) - if (*iptr == '$') - dollar_cnt++; -- ctx.allowed_strings = grub_malloc (sizeof (ctx.allowed_strings[0]) * dollar_cnt); -+ ctx.allowed_strings = grub_calloc (dollar_cnt, sizeof (ctx.allowed_strings[0])); - - if (parse_string (orig_str, gettext_save_allow, &ctx, 0)) - goto fail; -diff --git a/grub-core/tests/fake_input.c b/grub-core/tests/fake_input.c -index 2d6085298..b5eb516be 100644 ---- a/grub-core/tests/fake_input.c -+++ b/grub-core/tests/fake_input.c -@@ -49,7 +49,7 @@ grub_terminal_input_fake_sequence (int *seq_in, int nseq_in) - saved = grub_term_inputs; - if (seq) - grub_free (seq); -- seq = grub_malloc (nseq_in * sizeof (seq[0])); -+ seq = grub_calloc (nseq_in, sizeof (seq[0])); - if (!seq) - return; - -diff --git a/grub-core/tests/video_checksum.c b/grub-core/tests/video_checksum.c -index 74d5b65e5..44d081069 100644 ---- a/grub-core/tests/video_checksum.c -+++ b/grub-core/tests/video_checksum.c -@@ -336,7 +336,7 @@ grub_video_capture_write_bmp (const char *fname, - { - case 4: - { -- grub_uint8_t *buffer = xmalloc (mode_info->width * 3); -+ grub_uint8_t *buffer = xcalloc (3, mode_info->width); - grub_uint32_t rmask = ((1 << mode_info->red_mask_size) - 1); - grub_uint32_t gmask = ((1 << mode_info->green_mask_size) - 1); - grub_uint32_t bmask = ((1 << mode_info->blue_mask_size) - 1); -@@ -367,7 +367,7 @@ grub_video_capture_write_bmp (const char *fname, - } - case 3: - { -- grub_uint8_t *buffer = xmalloc (mode_info->width * 3); -+ grub_uint8_t *buffer = xcalloc (3, mode_info->width); - grub_uint32_t rmask = ((1 << mode_info->red_mask_size) - 1); - grub_uint32_t gmask = ((1 << mode_info->green_mask_size) - 1); - grub_uint32_t bmask = ((1 << mode_info->blue_mask_size) - 1); -@@ -407,7 +407,7 @@ grub_video_capture_write_bmp (const char *fname, - } - case 2: - { -- grub_uint8_t *buffer = xmalloc (mode_info->width * 3); -+ grub_uint8_t *buffer = xcalloc (3, mode_info->width); - grub_uint16_t rmask = ((1 << mode_info->red_mask_size) - 1); - grub_uint16_t gmask = ((1 << mode_info->green_mask_size) - 1); - grub_uint16_t bmask = ((1 << mode_info->blue_mask_size) - 1); -diff --git a/grub-core/video/capture.c b/grub-core/video/capture.c -index 4f83c7441..4d3195e01 100644 ---- a/grub-core/video/capture.c -+++ b/grub-core/video/capture.c -@@ -89,7 +89,7 @@ grub_video_capture_start (const struct grub_video_mode_info *mode_info, - framebuffer.mode_info = *mode_info; - framebuffer.mode_info.blit_format = grub_video_get_blit_format (&framebuffer.mode_info); - -- framebuffer.ptr = grub_malloc (framebuffer.mode_info.height * framebuffer.mode_info.pitch); -+ framebuffer.ptr = grub_calloc (framebuffer.mode_info.height, framebuffer.mode_info.pitch); - if (!framebuffer.ptr) - return grub_errno; - -diff --git a/grub-core/video/emu/sdl.c b/grub-core/video/emu/sdl.c -index a2f639f66..0ebab6f57 100644 ---- a/grub-core/video/emu/sdl.c -+++ b/grub-core/video/emu/sdl.c -@@ -172,7 +172,7 @@ grub_video_sdl_set_palette (unsigned int start, unsigned int count, - if (start + count > mode_info.number_of_colors) - count = mode_info.number_of_colors - start; - -- tmp = grub_malloc (count * sizeof (tmp[0])); -+ tmp = grub_calloc (count, sizeof (tmp[0])); - for (i = 0; i < count; i++) - { - tmp[i].r = palette_data[i].r; -diff --git a/grub-core/video/i386/pc/vga.c b/grub-core/video/i386/pc/vga.c -index 01f47112d..b2f776c99 100644 ---- a/grub-core/video/i386/pc/vga.c -+++ b/grub-core/video/i386/pc/vga.c -@@ -127,7 +127,7 @@ grub_video_vga_setup (unsigned int width, unsigned int height, - - vga_height = height ? : 480; - -- framebuffer.temporary_buffer = grub_malloc (vga_height * VGA_WIDTH); -+ framebuffer.temporary_buffer = grub_calloc (vga_height, VGA_WIDTH); - framebuffer.front_page = 0; - framebuffer.back_page = 0; - if (!framebuffer.temporary_buffer) -diff --git a/grub-core/video/readers/png.c b/grub-core/video/readers/png.c -index 777e71334..61bd64537 100644 ---- a/grub-core/video/readers/png.c -+++ b/grub-core/video/readers/png.c -@@ -309,7 +309,7 @@ grub_png_decode_image_header (struct grub_png_data *data) - if (data->is_16bit || data->is_gray || data->is_palette) - #endif - { -- data->image_data = grub_malloc (data->image_height * data->row_bytes); -+ data->image_data = grub_calloc (data->image_height, data->row_bytes); - if (grub_errno) - return grub_errno; - -diff --git a/include/grub/unicode.h b/include/grub/unicode.h -index a0403e91f..4de986a85 100644 ---- a/include/grub/unicode.h -+++ b/include/grub/unicode.h -@@ -293,7 +293,7 @@ grub_unicode_glyph_dup (const struct grub_unicode_glyph *in) - grub_memcpy (out, in, sizeof (*in)); - if (in->ncomb > ARRAY_SIZE (out->combining_inline)) - { -- out->combining_ptr = grub_malloc (in->ncomb * sizeof (out->combining_ptr[0])); -+ out->combining_ptr = grub_calloc (in->ncomb, sizeof (out->combining_ptr[0])); - if (!out->combining_ptr) - { - grub_free (out); -@@ -315,7 +315,7 @@ grub_unicode_set_glyph (struct grub_unicode_glyph *out, - grub_memcpy (out, in, sizeof (*in)); - if (in->ncomb > ARRAY_SIZE (out->combining_inline)) - { -- out->combining_ptr = grub_malloc (in->ncomb * sizeof (out->combining_ptr[0])); -+ out->combining_ptr = grub_calloc (in->ncomb, sizeof (out->combining_ptr[0])); - if (!out->combining_ptr) - return; - grub_memcpy (out->combining_ptr, in->combining_ptr, -diff --git a/util/getroot.c b/util/getroot.c -index 847406fba..a5eaa64fd 100644 ---- a/util/getroot.c -+++ b/util/getroot.c -@@ -200,7 +200,7 @@ make_device_name (const char *drive) - char *ret, *ptr; - const char *iptr; - -- ret = xmalloc (strlen (drive) * 2); -+ ret = xcalloc (2, strlen (drive)); - ptr = ret; - for (iptr = drive; *iptr; iptr++) - { -diff --git a/util/grub-file.c b/util/grub-file.c -index 50c18b683..b2e7dd69f 100644 ---- a/util/grub-file.c -+++ b/util/grub-file.c -@@ -54,7 +54,7 @@ main (int argc, char *argv[]) - - grub_util_host_init (&argc, &argv); - -- argv2 = xmalloc (argc * sizeof (argv2[0])); -+ argv2 = xcalloc (argc, sizeof (argv2[0])); - - if (argc == 2 && strcmp (argv[1], "--version") == 0) - { -diff --git a/util/grub-fstest.c b/util/grub-fstest.c -index f14e02d97..57246af7c 100644 ---- a/util/grub-fstest.c -+++ b/util/grub-fstest.c -@@ -650,7 +650,7 @@ argp_parser (int key, char *arg, struct argp_state *state) - if (args_count < num_disks) - { - if (args_count == 0) -- images = xmalloc (num_disks * sizeof (images[0])); -+ images = xcalloc (num_disks, sizeof (images[0])); - images[args_count] = grub_canonicalize_file_name (arg); - args_count++; - return 0; -@@ -734,7 +734,7 @@ main (int argc, char *argv[]) - - grub_util_host_init (&argc, &argv); - -- args = xmalloc (argc * sizeof (args[0])); -+ args = xcalloc (argc, sizeof (args[0])); - - argp_parse (&argp, argc, argv, 0, 0, 0); - -diff --git a/util/grub-install-common.c b/util/grub-install-common.c -index ca0ac612a..0295d40f5 100644 ---- a/util/grub-install-common.c -+++ b/util/grub-install-common.c -@@ -286,7 +286,7 @@ handle_install_list (struct install_list *il, const char *val, - il->n_entries++; - } - il->n_alloc = il->n_entries + 1; -- il->entries = xmalloc (il->n_alloc * sizeof (il->entries[0])); -+ il->entries = xcalloc (il->n_alloc, sizeof (il->entries[0])); - ptr = val; - for (ce = il->entries; ; ce++) - { -diff --git a/util/grub-install.c b/util/grub-install.c -index 8a55ad4b8..a82725f29 100644 ---- a/util/grub-install.c -+++ b/util/grub-install.c -@@ -626,7 +626,7 @@ device_map_check_duplicates (const char *dev_map) - if (! fp) - return; - -- d = xmalloc (alloced * sizeof (d[0])); -+ d = xcalloc (alloced, sizeof (d[0])); - - while (fgets (buf, sizeof (buf), fp)) - { -@@ -1260,7 +1260,7 @@ main (int argc, char *argv[]) - ndev++; - } - -- grub_drives = xmalloc (sizeof (grub_drives[0]) * (ndev + 1)); -+ grub_drives = xcalloc (ndev + 1, sizeof (grub_drives[0])); - - for (curdev = grub_devices, curdrive = grub_drives; *curdev; curdev++, - curdrive++) -diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c -index bc087c2b5..d97d0e7be 100644 ---- a/util/grub-mkimagexx.c -+++ b/util/grub-mkimagexx.c -@@ -2294,10 +2294,8 @@ SUFFIX (grub_mkimage_load_image) (const char *kernel_path, - + grub_host_to_target16 (e->e_shstrndx) * smd.section_entsize); - smd.strtab = (char *) e + grub_host_to_target_addr (s->sh_offset); - -- smd.addrs = xmalloc (sizeof (*smd.addrs) * smd.num_sections); -- memset (smd.addrs, 0, sizeof (*smd.addrs) * smd.num_sections); -- smd.vaddrs = xmalloc (sizeof (*smd.vaddrs) * smd.num_sections); -- memset (smd.vaddrs, 0, sizeof (*smd.vaddrs) * smd.num_sections); -+ smd.addrs = xcalloc (smd.num_sections, sizeof (*smd.addrs)); -+ smd.vaddrs = xcalloc (smd.num_sections, sizeof (*smd.vaddrs)); - - SUFFIX (locate_sections) (e, kernel_path, &smd, layout, image_target); - -diff --git a/util/grub-mkrescue.c b/util/grub-mkrescue.c -index ce2cbc4f1..51831027f 100644 ---- a/util/grub-mkrescue.c -+++ b/util/grub-mkrescue.c -@@ -441,8 +441,8 @@ main (int argc, char *argv[]) - xorriso = xstrdup ("xorriso"); - label_font = grub_util_path_concat (2, pkgdatadir, "unicode.pf2"); - -- argp_argv = xmalloc (sizeof (argp_argv[0]) * argc); -- xorriso_tail_argv = xmalloc (sizeof (argp_argv[0]) * argc); -+ argp_argv = xcalloc (argc, sizeof (argp_argv[0])); -+ xorriso_tail_argv = xcalloc (argc, sizeof (argp_argv[0])); - - xorriso_tail_argc = 0; - /* Program name */ -diff --git a/util/grub-mkstandalone.c b/util/grub-mkstandalone.c -index 4907d44c0..edf309717 100644 ---- a/util/grub-mkstandalone.c -+++ b/util/grub-mkstandalone.c -@@ -296,7 +296,7 @@ main (int argc, char *argv[]) - grub_util_host_init (&argc, &argv); - grub_util_disable_fd_syncs (); - -- files = xmalloc ((argc + 1) * sizeof (files[0])); -+ files = xcalloc (argc + 1, sizeof (files[0])); - - argp_parse (&argp, argc, argv, 0, 0, 0); - -diff --git a/util/grub-pe2elf.c b/util/grub-pe2elf.c -index 0d4084a10..11331294f 100644 ---- a/util/grub-pe2elf.c -+++ b/util/grub-pe2elf.c -@@ -100,9 +100,9 @@ write_section_data (FILE* fp, const char *name, char *image, - char *pe_strtab = (image + pe_chdr->symtab_offset - + pe_chdr->num_symbols * sizeof (struct grub_pe32_symbol)); - -- section_map = xmalloc ((2 * pe_chdr->num_sections + 5) * sizeof (int)); -+ section_map = xcalloc (2 * pe_chdr->num_sections + 5, sizeof (int)); - section_map[0] = 0; -- shdr = xmalloc ((2 * pe_chdr->num_sections + 5) * sizeof (shdr[0])); -+ shdr = xcalloc (2 * pe_chdr->num_sections + 5, sizeof (shdr[0])); - idx = 1; - idx_reloc = pe_chdr->num_sections + 1; - -@@ -233,7 +233,7 @@ write_reloc_section (FILE* fp, const char *name, char *image, - - pe_sec = pe_shdr + shdr[i].sh_link; - pe_rel = (struct grub_pe32_reloc *) (image + pe_sec->relocations_offset); -- rel = (elf_reloc_t *) xmalloc (pe_sec->num_relocations * sizeof (elf_reloc_t)); -+ rel = (elf_reloc_t *) xcalloc (pe_sec->num_relocations, sizeof (elf_reloc_t)); - num_rels = 0; - modified = 0; - -@@ -365,12 +365,10 @@ write_symbol_table (FILE* fp, const char *name, char *image, - pe_symtab = (struct grub_pe32_symbol *) (image + pe_chdr->symtab_offset); - pe_strtab = (char *) (pe_symtab + pe_chdr->num_symbols); - -- symtab = (Elf_Sym *) xmalloc ((pe_chdr->num_symbols + 1) * -- sizeof (Elf_Sym)); -- memset (symtab, 0, (pe_chdr->num_symbols + 1) * sizeof (Elf_Sym)); -+ symtab = (Elf_Sym *) xcalloc (pe_chdr->num_symbols + 1, sizeof (Elf_Sym)); - num_syms = 1; - -- symtab_map = (int *) xmalloc (pe_chdr->num_symbols * sizeof (int)); -+ symtab_map = (int *) xcalloc (pe_chdr->num_symbols, sizeof (int)); - - for (i = 0; i < (int) pe_chdr->num_symbols; - i += pe_symtab->num_aux + 1, pe_symtab += pe_symtab->num_aux + 1) -diff --git a/util/grub-probe.c b/util/grub-probe.c -index 81d27eead..cbe6ed94c 100644 ---- a/util/grub-probe.c -+++ b/util/grub-probe.c -@@ -361,8 +361,8 @@ probe (const char *path, char **device_names, char delim) - grub_util_pull_device (*curdev); - ndev++; - } -- -- drives_names = xmalloc (sizeof (drives_names[0]) * (ndev + 1)); -+ -+ drives_names = xcalloc (ndev + 1, sizeof (drives_names[0])); - - for (curdev = device_names, curdrive = drives_names; *curdev; curdev++, - curdrive++) --- -2.26.2 - diff --git a/boot/grub2/0005-loader-efi-chainloader-Use-grub_loader_set_ex.patch b/boot/grub2/0005-loader-efi-chainloader-Use-grub_loader_set_ex.patch new file mode 100644 index 00000000000..4308e3170f6 --- /dev/null +++ b/boot/grub2/0005-loader-efi-chainloader-Use-grub_loader_set_ex.patch @@ -0,0 +1,80 @@ +From 583fca49f413e00fe26f8ae7abe0837bbc574f79 Mon Sep 17 00:00:00 2001 +From: Chris Coulson +Date: Tue, 5 Apr 2022 11:48:58 +0100 +Subject: [PATCH] loader/efi/chainloader: Use grub_loader_set_ex() + +This ports the EFI chainloader to use grub_loader_set_ex() in order to fix +a use-after-free bug that occurs when grub_cmd_chainloader() is executed +more than once before a boot attempt is performed. + +Fixes: CVE-2022-28736 + +Signed-off-by: Chris Coulson +Reviewed-by: Daniel Kiper +Upstream: 04c86e0bb7b58fc2f913f798cdb18934933e532d +Signed-off-by: Thomas Petazzoni +--- + grub-core/loader/efi/chainloader.c | 16 +++++++--------- + 1 file changed, 7 insertions(+), 9 deletions(-) + +diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c +index d1602c89b..7557eb269 100644 +--- a/grub-core/loader/efi/chainloader.c ++++ b/grub-core/loader/efi/chainloader.c +@@ -44,11 +44,10 @@ GRUB_MOD_LICENSE ("GPLv3+"); + + static grub_dl_t my_mod; + +-static grub_efi_handle_t image_handle; +- + static grub_err_t +-grub_chainloader_unload (void) ++grub_chainloader_unload (void *context) + { ++ grub_efi_handle_t image_handle = (grub_efi_handle_t) context; + grub_efi_loaded_image_t *loaded_image; + grub_efi_boot_services_t *b; + +@@ -64,8 +63,9 @@ grub_chainloader_unload (void) + } + + static grub_err_t +-grub_chainloader_boot (void) ++grub_chainloader_boot (void *context) + { ++ grub_efi_handle_t image_handle = (grub_efi_handle_t) context; + grub_efi_boot_services_t *b; + grub_efi_status_t status; + grub_efi_uintn_t exit_data_size; +@@ -225,6 +225,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)), + grub_efi_physical_address_t address = 0; + grub_efi_uintn_t pages = 0; + grub_efi_char16_t *cmdline = NULL; ++ grub_efi_handle_t image_handle = NULL; + + if (argc == 0) + return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected")); +@@ -405,7 +406,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)), + efi_call_2 (b->free_pages, address, pages); + grub_free (file_path); + +- grub_loader_set (grub_chainloader_boot, grub_chainloader_unload, 0); ++ grub_loader_set_ex (grub_chainloader_boot, grub_chainloader_unload, image_handle, 0); + return 0; + + fail: +@@ -423,10 +424,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)), + efi_call_2 (b->free_pages, address, pages); + + if (image_handle != NULL) +- { +- efi_call_1 (b->unload_image, image_handle); +- image_handle = NULL; +- } ++ efi_call_1 (b->unload_image, image_handle); + + grub_dl_unref (my_mod); + +-- +2.41.0 + diff --git a/boot/grub2/0006-kern-efi-sb-Reject-non-kernel-files-in-the-shim_lock.patch b/boot/grub2/0006-kern-efi-sb-Reject-non-kernel-files-in-the-shim_lock.patch new file mode 100644 index 00000000000..b6fec1e6bbe --- /dev/null +++ b/boot/grub2/0006-kern-efi-sb-Reject-non-kernel-files-in-the-shim_lock.patch @@ -0,0 +1,105 @@ +From 1e1b1271b7a7c6ac20a4c5f8e0dc29614b4975d1 Mon Sep 17 00:00:00 2001 +From: Julian Andres Klode +Date: Thu, 2 Dec 2021 15:03:53 +0100 +Subject: [PATCH] kern/efi/sb: Reject non-kernel files in the shim_lock + verifier + +We must not allow other verifiers to pass things like the GRUB modules. +Instead of maintaining a blocklist, maintain an allowlist of things +that we do not care about. + +This allowlist really should be made reusable, and shared by the +lockdown verifier, but this is the minimal patch addressing +security concerns where the TPM verifier was able to mark modules +as verified (or the OpenPGP verifier for that matter), when it +should not do so on shim-powered secure boot systems. + +Fixes: CVE-2022-28735 + +Signed-off-by: Julian Andres Klode +Reviewed-by: Daniel Kiper +Upstream: 6fe755c5c07bb386fda58306bfd19e4a1c974c53 +Signed-off-by: Thomas Petazzoni +--- + grub-core/kern/efi/sb.c | 39 ++++++++++++++++++++++++++++++++++++--- + include/grub/verify.h | 1 + + 2 files changed, 37 insertions(+), 3 deletions(-) + +diff --git a/grub-core/kern/efi/sb.c b/grub-core/kern/efi/sb.c +index c52ec6226..89c4bb3fd 100644 +--- a/grub-core/kern/efi/sb.c ++++ b/grub-core/kern/efi/sb.c +@@ -119,10 +119,11 @@ shim_lock_verifier_init (grub_file_t io __attribute__ ((unused)), + void **context __attribute__ ((unused)), + enum grub_verify_flags *flags) + { +- *flags = GRUB_VERIFY_FLAGS_SKIP_VERIFICATION; ++ *flags = GRUB_VERIFY_FLAGS_NONE; + + switch (type & GRUB_FILE_TYPE_MASK) + { ++ /* Files we check. */ + case GRUB_FILE_TYPE_LINUX_KERNEL: + case GRUB_FILE_TYPE_MULTIBOOT_KERNEL: + case GRUB_FILE_TYPE_BSD_KERNEL: +@@ -130,11 +131,43 @@ shim_lock_verifier_init (grub_file_t io __attribute__ ((unused)), + case GRUB_FILE_TYPE_PLAN9_KERNEL: + case GRUB_FILE_TYPE_EFI_CHAINLOADED_IMAGE: + *flags = GRUB_VERIFY_FLAGS_SINGLE_CHUNK; ++ return GRUB_ERR_NONE; + +- /* Fall through. */ ++ /* Files that do not affect secureboot state. */ ++ case GRUB_FILE_TYPE_NONE: ++ case GRUB_FILE_TYPE_LOOPBACK: ++ case GRUB_FILE_TYPE_LINUX_INITRD: ++ case GRUB_FILE_TYPE_OPENBSD_RAMDISK: ++ case GRUB_FILE_TYPE_XNU_RAMDISK: ++ case GRUB_FILE_TYPE_SIGNATURE: ++ case GRUB_FILE_TYPE_PUBLIC_KEY: ++ case GRUB_FILE_TYPE_PUBLIC_KEY_TRUST: ++ case GRUB_FILE_TYPE_PRINT_BLOCKLIST: ++ case GRUB_FILE_TYPE_TESTLOAD: ++ case GRUB_FILE_TYPE_GET_SIZE: ++ case GRUB_FILE_TYPE_FONT: ++ case GRUB_FILE_TYPE_ZFS_ENCRYPTION_KEY: ++ case GRUB_FILE_TYPE_CAT: ++ case GRUB_FILE_TYPE_HEXCAT: ++ case GRUB_FILE_TYPE_CMP: ++ case GRUB_FILE_TYPE_HASHLIST: ++ case GRUB_FILE_TYPE_TO_HASH: ++ case GRUB_FILE_TYPE_KEYBOARD_LAYOUT: ++ case GRUB_FILE_TYPE_PIXMAP: ++ case GRUB_FILE_TYPE_GRUB_MODULE_LIST: ++ case GRUB_FILE_TYPE_CONFIG: ++ case GRUB_FILE_TYPE_THEME: ++ case GRUB_FILE_TYPE_GETTEXT_CATALOG: ++ case GRUB_FILE_TYPE_FS_SEARCH: ++ case GRUB_FILE_TYPE_LOADENV: ++ case GRUB_FILE_TYPE_SAVEENV: ++ case GRUB_FILE_TYPE_VERIFY_SIGNATURE: ++ *flags = GRUB_VERIFY_FLAGS_SKIP_VERIFICATION; ++ return GRUB_ERR_NONE; + ++ /* Other files. */ + default: +- return GRUB_ERR_NONE; ++ return grub_error (GRUB_ERR_ACCESS_DENIED, N_("prohibited by secure boot policy")); + } + } + +diff --git a/include/grub/verify.h b/include/grub/verify.h +index cd129c398..672ae1692 100644 +--- a/include/grub/verify.h ++++ b/include/grub/verify.h +@@ -24,6 +24,7 @@ + + enum grub_verify_flags + { ++ GRUB_VERIFY_FLAGS_NONE = 0, + GRUB_VERIFY_FLAGS_SKIP_VERIFICATION = 1, + GRUB_VERIFY_FLAGS_SINGLE_CHUNK = 2, + /* Defer verification to another authority. */ +-- +2.41.0 + diff --git a/boot/grub2/0006-malloc-Use-overflow-checking-primitives-where-we-do-.patch b/boot/grub2/0006-malloc-Use-overflow-checking-primitives-where-we-do-.patch deleted file mode 100644 index aaad7256338..00000000000 --- a/boot/grub2/0006-malloc-Use-overflow-checking-primitives-where-we-do-.patch +++ /dev/null @@ -1,1326 +0,0 @@ -From 4ad7e85adc3803788d65707a9db11fd681aebe4a Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Mon, 15 Jun 2020 12:28:27 -0400 -Subject: [PATCH] malloc: Use overflow checking primitives where we do - complex allocations -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This attempts to fix the places where we do the following where -arithmetic_expr may include unvalidated data: - - X = grub_malloc(arithmetic_expr); - -It accomplishes this by doing the arithmetic ahead of time using grub_add(), -grub_sub(), grub_mul() and testing for overflow before proceeding. - -Among other issues, this fixes: - - allocation of integer overflow in grub_video_bitmap_create() - reported by Chris Coulson, - - allocation of integer overflow in grub_png_decode_image_header() - reported by Chris Coulson, - - allocation of integer overflow in grub_squash_read_symlink() - reported by Chris Coulson, - - allocation of integer overflow in grub_ext2_read_symlink() - reported by Chris Coulson, - - allocation of integer overflow in read_section_as_string() - reported by Chris Coulson. - -Fixes: CVE-2020-14309, CVE-2020-14310, CVE-2020-14311 - -Signed-off-by: Peter Jones -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/commands/legacycfg.c | 29 +++++++++++++++---- - grub-core/commands/wildcard.c | 36 ++++++++++++++++++++---- - grub-core/disk/ldm.c | 32 +++++++++++++++------ - grub-core/font/font.c | 7 ++++- - grub-core/fs/btrfs.c | 28 +++++++++++++------ - grub-core/fs/ext2.c | 10 ++++++- - grub-core/fs/iso9660.c | 51 ++++++++++++++++++++++++---------- - grub-core/fs/sfs.c | 27 ++++++++++++++---- - grub-core/fs/squash4.c | 45 ++++++++++++++++++++++-------- - grub-core/fs/udf.c | 41 +++++++++++++++++---------- - grub-core/fs/xfs.c | 11 +++++--- - grub-core/fs/zfs/zfs.c | 22 ++++++++++----- - grub-core/fs/zfs/zfscrypt.c | 7 ++++- - grub-core/lib/arg.c | 20 +++++++++++-- - grub-core/loader/i386/bsd.c | 8 +++++- - grub-core/net/dns.c | 9 +++++- - grub-core/normal/charset.c | 10 +++++-- - grub-core/normal/cmdline.c | 14 ++++++++-- - grub-core/normal/menu_entry.c | 13 +++++++-- - grub-core/script/argv.c | 16 +++++++++-- - grub-core/script/lexer.c | 21 ++++++++++++-- - grub-core/video/bitmap.c | 25 +++++++++++------ - grub-core/video/readers/png.c | 13 +++++++-- - 23 files changed, 382 insertions(+), 113 deletions(-) - -diff --git a/grub-core/commands/legacycfg.c b/grub-core/commands/legacycfg.c -index 5e3ec0d5e..cc5971f4d 100644 ---- a/grub-core/commands/legacycfg.c -+++ b/grub-core/commands/legacycfg.c -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - - GRUB_MOD_LICENSE ("GPLv3+"); - -@@ -104,13 +105,22 @@ legacy_file (const char *filename) - if (newsuffix) - { - char *t; -- -+ grub_size_t sz; -+ -+ if (grub_add (grub_strlen (suffix), grub_strlen (newsuffix), &sz) || -+ grub_add (sz, 1, &sz)) -+ { -+ grub_errno = GRUB_ERR_OUT_OF_RANGE; -+ goto fail_0; -+ } -+ - t = suffix; -- suffix = grub_realloc (suffix, grub_strlen (suffix) -- + grub_strlen (newsuffix) + 1); -+ suffix = grub_realloc (suffix, sz); - if (!suffix) - { - grub_free (t); -+ -+ fail_0: - grub_free (entrysrc); - grub_free (parsed); - grub_free (newsuffix); -@@ -154,13 +164,22 @@ legacy_file (const char *filename) - else - { - char *t; -+ grub_size_t sz; -+ -+ if (grub_add (grub_strlen (entrysrc), grub_strlen (parsed), &sz) || -+ grub_add (sz, 1, &sz)) -+ { -+ grub_errno = GRUB_ERR_OUT_OF_RANGE; -+ goto fail_1; -+ } - - t = entrysrc; -- entrysrc = grub_realloc (entrysrc, grub_strlen (entrysrc) -- + grub_strlen (parsed) + 1); -+ entrysrc = grub_realloc (entrysrc, sz); - if (!entrysrc) - { - grub_free (t); -+ -+ fail_1: - grub_free (parsed); - grub_free (suffix); - return grub_errno; -diff --git a/grub-core/commands/wildcard.c b/grub-core/commands/wildcard.c -index 4a106ca04..cc3290311 100644 ---- a/grub-core/commands/wildcard.c -+++ b/grub-core/commands/wildcard.c -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - - #include - -@@ -48,6 +49,7 @@ merge (char **dest, char **ps) - int i; - int j; - char **p; -+ grub_size_t sz; - - if (! dest) - return ps; -@@ -60,7 +62,12 @@ merge (char **dest, char **ps) - for (j = 0; ps[j]; j++) - ; - -- p = grub_realloc (dest, sizeof (char*) * (i + j + 1)); -+ if (grub_add (i, j, &sz) || -+ grub_add (sz, 1, &sz) || -+ grub_mul (sz, sizeof (char *), &sz)) -+ return dest; -+ -+ p = grub_realloc (dest, sz); - if (! p) - { - grub_free (dest); -@@ -115,8 +122,15 @@ make_regex (const char *start, const char *end, regex_t *regexp) - char ch; - int i = 0; - unsigned len = end - start; -- char *buffer = grub_malloc (len * 2 + 2 + 1); /* worst case size. */ -+ char *buffer; -+ grub_size_t sz; - -+ /* Worst case size is (len * 2 + 2 + 1). */ -+ if (grub_mul (len, 2, &sz) || -+ grub_add (sz, 3, &sz)) -+ return 1; -+ -+ buffer = grub_malloc (sz); - if (! buffer) - return 1; - -@@ -226,6 +240,7 @@ match_devices_iter (const char *name, void *data) - struct match_devices_ctx *ctx = data; - char **t; - char *buffer; -+ grub_size_t sz; - - /* skip partitions if asked to. */ - if (ctx->noparts && grub_strchr (name, ',')) -@@ -239,11 +254,16 @@ match_devices_iter (const char *name, void *data) - if (regexec (ctx->regexp, buffer, 0, 0, 0)) - { - grub_dprintf ("expand", "not matched\n"); -+ fail: - grub_free (buffer); - return 0; - } - -- t = grub_realloc (ctx->devs, sizeof (char*) * (ctx->ndev + 2)); -+ if (grub_add (ctx->ndev, 2, &sz) || -+ grub_mul (sz, sizeof (char *), &sz)) -+ goto fail; -+ -+ t = grub_realloc (ctx->devs, sz); - if (! t) - { - grub_free (buffer); -@@ -300,6 +320,7 @@ match_files_iter (const char *name, - struct match_files_ctx *ctx = data; - char **t; - char *buffer; -+ grub_size_t sz; - - /* skip . and .. names */ - if (grub_strcmp(".", name) == 0 || grub_strcmp("..", name) == 0) -@@ -315,9 +336,14 @@ match_files_iter (const char *name, - if (! buffer) - return 1; - -- t = grub_realloc (ctx->files, sizeof (char*) * (ctx->nfile + 2)); -- if (! t) -+ if (grub_add (ctx->nfile, 2, &sz) || -+ grub_mul (sz, sizeof (char *), &sz)) -+ goto fail; -+ -+ t = grub_realloc (ctx->files, sz); -+ if (!t) - { -+ fail: - grub_free (buffer); - return 1; - } -diff --git a/grub-core/disk/ldm.c b/grub-core/disk/ldm.c -index e6323701a..58f8a53e1 100644 ---- a/grub-core/disk/ldm.c -+++ b/grub-core/disk/ldm.c -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - - #ifdef GRUB_UTIL - #include -@@ -289,6 +290,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) -@@ -350,7 +352,13 @@ make_vg (grub_disk_t disk, - grub_free (lv); - goto fail2; - } -- lv->name = grub_malloc (*ptr + 1); -+ if (grub_add (*ptr, 1, &sz)) -+ { -+ grub_free (lv->internal_id); -+ grub_free (lv); -+ goto fail2; -+ } -+ lv->name = grub_malloc (sz); - if (!lv->name) - { - grub_free (lv->internal_id); -@@ -599,10 +607,13 @@ make_vg (grub_disk_t disk, - if (lv->segments->node_alloc == lv->segments->node_count) - { - void *t; -- lv->segments->node_alloc *= 2; -- t = grub_realloc (lv->segments->nodes, -- sizeof (*lv->segments->nodes) -- * lv->segments->node_alloc); -+ 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)) -+ goto fail2; -+ -+ t = grub_realloc (lv->segments->nodes, sz); - if (!t) - goto fail2; - lv->segments->nodes = t; -@@ -723,10 +734,13 @@ make_vg (grub_disk_t disk, - if (comp->segment_alloc == comp->segment_count) - { - void *t; -- comp->segment_alloc *= 2; -- t = grub_realloc (comp->segments, -- comp->segment_alloc -- * sizeof (*comp->segments)); -+ grub_size_t sz; -+ -+ if (grub_mul (comp->segment_alloc, 2, &comp->segment_alloc) || -+ grub_mul (comp->segment_alloc, sizeof (*comp->segments), &sz)) -+ goto fail2; -+ -+ t = grub_realloc (comp->segments, sz); - if (!t) - goto fail2; - comp->segments = t; -diff --git a/grub-core/font/font.c b/grub-core/font/font.c -index 8e118b315..5edb477ac 100644 ---- a/grub-core/font/font.c -+++ b/grub-core/font/font.c -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - - GRUB_MOD_LICENSE ("GPLv3+"); - -@@ -360,9 +361,13 @@ static char * - read_section_as_string (struct font_file_section *section) - { - char *str; -+ grub_size_t sz; - grub_ssize_t ret; - -- str = grub_malloc (section->length + 1); -+ if (grub_add (section->length, 1, &sz)) -+ return NULL; -+ -+ str = grub_malloc (sz); - if (!str) - return 0; - -diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c -index 11272efc1..2b65bd56a 100644 ---- a/grub-core/fs/btrfs.c -+++ b/grub-core/fs/btrfs.c -@@ -40,6 +40,7 @@ - #include - #include - #include -+#include - - GRUB_MOD_LICENSE ("GPLv3+"); - -@@ -329,9 +330,13 @@ save_ref (struct grub_btrfs_leaf_descriptor *desc, - if (desc->allocated < desc->depth) - { - void *newdata; -- desc->allocated *= 2; -- newdata = grub_realloc (desc->data, sizeof (desc->data[0]) -- * desc->allocated); -+ grub_size_t sz; -+ -+ if (grub_mul (desc->allocated, 2, &desc->allocated) || -+ grub_mul (desc->allocated, sizeof (desc->data[0]), &sz)) -+ return GRUB_ERR_OUT_OF_RANGE; -+ -+ newdata = grub_realloc (desc->data, sz); - if (!newdata) - return grub_errno; - desc->data = newdata; -@@ -622,16 +627,21 @@ find_device (struct grub_btrfs_data *data, grub_uint64_t id) - if (data->n_devices_attached > data->n_devices_allocated) - { - void *tmp; -- data->n_devices_allocated = 2 * data->n_devices_attached + 1; -- data->devices_attached -- = grub_realloc (tmp = data->devices_attached, -- data->n_devices_allocated -- * sizeof (data->devices_attached[0])); -+ grub_size_t sz; -+ -+ if (grub_mul (data->n_devices_attached, 2, &data->n_devices_allocated) || -+ grub_add (data->n_devices_allocated, 1, &data->n_devices_allocated) || -+ grub_mul (data->n_devices_allocated, sizeof (data->devices_attached[0]), &sz)) -+ goto fail; -+ -+ data->devices_attached = grub_realloc (tmp = data->devices_attached, sz); - if (!data->devices_attached) - { -+ data->devices_attached = tmp; -+ -+ fail: - if (ctx.dev_found) - grub_device_close (ctx.dev_found); -- data->devices_attached = tmp; - return NULL; - } - } -diff --git a/grub-core/fs/ext2.c b/grub-core/fs/ext2.c -index 9b389802a..ac33bcd68 100644 ---- a/grub-core/fs/ext2.c -+++ b/grub-core/fs/ext2.c -@@ -46,6 +46,7 @@ - #include - #include - #include -+#include - - GRUB_MOD_LICENSE ("GPLv3+"); - -@@ -703,6 +704,7 @@ grub_ext2_read_symlink (grub_fshelp_node_t node) - { - char *symlink; - struct grub_fshelp_node *diro = node; -+ grub_size_t sz; - - if (! diro->inode_read) - { -@@ -717,7 +719,13 @@ grub_ext2_read_symlink (grub_fshelp_node_t node) - } - } - -- symlink = grub_malloc (grub_le_to_cpu32 (diro->inode.size) + 1); -+ if (grub_add (grub_le_to_cpu32 (diro->inode.size), 1, &sz)) -+ { -+ grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow is detected")); -+ return NULL; -+ } -+ -+ symlink = grub_malloc (sz); - if (! symlink) - return 0; - -diff --git a/grub-core/fs/iso9660.c b/grub-core/fs/iso9660.c -index 4f1b52a55..7ba5b300b 100644 ---- a/grub-core/fs/iso9660.c -+++ b/grub-core/fs/iso9660.c -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - GRUB_MOD_LICENSE ("GPLv3+"); - -@@ -531,8 +532,13 @@ add_part (struct iterate_dir_ctx *ctx, - int len2) - { - int size = ctx->symlink ? grub_strlen (ctx->symlink) : 0; -+ grub_size_t sz; - -- ctx->symlink = grub_realloc (ctx->symlink, size + len2 + 1); -+ if (grub_add (size, len2, &sz) || -+ grub_add (sz, 1, &sz)) -+ return; -+ -+ ctx->symlink = grub_realloc (ctx->symlink, sz); - if (! ctx->symlink) - return; - -@@ -560,17 +566,24 @@ susp_iterate_dir (struct grub_iso9660_susp_entry *entry, - { - grub_size_t off = 0, csize = 1; - char *old; -+ grub_size_t sz; -+ - csize = entry->len - 5; - old = ctx->filename; - if (ctx->filename_alloc) - { - off = grub_strlen (ctx->filename); -- ctx->filename = grub_realloc (ctx->filename, csize + off + 1); -+ if (grub_add (csize, off, &sz) || -+ grub_add (sz, 1, &sz)) -+ return GRUB_ERR_OUT_OF_RANGE; -+ ctx->filename = grub_realloc (ctx->filename, sz); - } - else - { - off = 0; -- ctx->filename = grub_zalloc (csize + 1); -+ if (grub_add (csize, 1, &sz)) -+ return GRUB_ERR_OUT_OF_RANGE; -+ ctx->filename = grub_zalloc (sz); - } - if (!ctx->filename) - { -@@ -776,14 +789,18 @@ grub_iso9660_iterate_dir (grub_fshelp_node_t dir, - if (node->have_dirents >= node->alloc_dirents) - { - struct grub_fshelp_node *new_node; -- node->alloc_dirents *= 2; -- new_node = grub_realloc (node, -- sizeof (struct grub_fshelp_node) -- + ((node->alloc_dirents -- - ARRAY_SIZE (node->dirents)) -- * sizeof (node->dirents[0]))); -+ grub_size_t sz; -+ -+ if (grub_mul (node->alloc_dirents, 2, &node->alloc_dirents) || -+ grub_sub (node->alloc_dirents, ARRAY_SIZE (node->dirents), &sz) || -+ grub_mul (sz, sizeof (node->dirents[0]), &sz) || -+ grub_add (sz, sizeof (struct grub_fshelp_node), &sz)) -+ goto fail_0; -+ -+ new_node = grub_realloc (node, sz); - if (!new_node) - { -+ fail_0: - if (ctx.filename_alloc) - grub_free (ctx.filename); - grub_free (node); -@@ -799,14 +816,18 @@ grub_iso9660_iterate_dir (grub_fshelp_node_t dir, - * sizeof (node->dirents[0]) < grub_strlen (ctx.symlink) + 1) - { - struct grub_fshelp_node *new_node; -- new_node = grub_realloc (node, -- sizeof (struct grub_fshelp_node) -- + ((node->alloc_dirents -- - ARRAY_SIZE (node->dirents)) -- * sizeof (node->dirents[0])) -- + grub_strlen (ctx.symlink) + 1); -+ grub_size_t sz; -+ -+ if (grub_sub (node->alloc_dirents, ARRAY_SIZE (node->dirents), &sz) || -+ grub_mul (sz, sizeof (node->dirents[0]), &sz) || -+ grub_add (sz, sizeof (struct grub_fshelp_node) + 1, &sz) || -+ grub_add (sz, grub_strlen (ctx.symlink), &sz)) -+ goto fail_1; -+ -+ new_node = grub_realloc (node, sz); - if (!new_node) - { -+ fail_1: - if (ctx.filename_alloc) - grub_free (ctx.filename); - grub_free (node); -diff --git a/grub-core/fs/sfs.c b/grub-core/fs/sfs.c -index 90f7fb379..de2b107a4 100644 ---- a/grub-core/fs/sfs.c -+++ b/grub-core/fs/sfs.c -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - - GRUB_MOD_LICENSE ("GPLv3+"); - -@@ -307,10 +308,15 @@ grub_sfs_read_block (grub_fshelp_node_t node, grub_disk_addr_t fileblock) - if (node->cache && node->cache_size >= node->cache_allocated) - { - struct cache_entry *e = node->cache; -- e = grub_realloc (node->cache,node->cache_allocated * 2 -- * sizeof (e[0])); -+ grub_size_t sz; -+ -+ if (grub_mul (node->cache_allocated, 2 * sizeof (e[0]), &sz)) -+ goto fail; -+ -+ e = grub_realloc (node->cache, sz); - if (!e) - { -+ fail: - grub_errno = 0; - grub_free (node->cache); - node->cache = 0; -@@ -477,10 +483,16 @@ grub_sfs_create_node (struct grub_fshelp_node **node, - grub_size_t len = grub_strlen (name); - grub_uint8_t *name_u8; - int ret; -+ grub_size_t sz; -+ -+ if (grub_mul (len, GRUB_MAX_UTF8_PER_LATIN1, &sz) || -+ grub_add (sz, 1, &sz)) -+ return 1; -+ - *node = grub_malloc (sizeof (**node)); - if (!*node) - return 1; -- name_u8 = grub_malloc (len * GRUB_MAX_UTF8_PER_LATIN1 + 1); -+ name_u8 = grub_malloc (sz); - if (!name_u8) - { - grub_free (*node); -@@ -724,8 +736,13 @@ grub_sfs_label (grub_device_t device, char **label) - data = grub_sfs_mount (disk); - if (data) - { -- grub_size_t len = grub_strlen (data->label); -- *label = grub_malloc (len * GRUB_MAX_UTF8_PER_LATIN1 + 1); -+ grub_size_t sz, len = grub_strlen (data->label); -+ -+ if (grub_mul (len, GRUB_MAX_UTF8_PER_LATIN1, &sz) || -+ grub_add (sz, 1, &sz)) -+ return GRUB_ERR_OUT_OF_RANGE; -+ -+ *label = grub_malloc (sz); - if (*label) - *grub_latin1_to_utf8 ((grub_uint8_t *) *label, - (const grub_uint8_t *) data->label, -diff --git a/grub-core/fs/squash4.c b/grub-core/fs/squash4.c -index 95d5c1e1f..785123894 100644 ---- a/grub-core/fs/squash4.c -+++ b/grub-core/fs/squash4.c -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - #include - - #include "xz.h" -@@ -459,7 +460,17 @@ grub_squash_read_symlink (grub_fshelp_node_t node) - { - char *ret; - grub_err_t err; -- ret = grub_malloc (grub_le_to_cpu32 (node->ino.symlink.namelen) + 1); -+ grub_size_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")); -+ return NULL; -+ } -+ -+ ret = grub_malloc (sz); -+ if (!ret) -+ return NULL; - - err = read_chunk (node->data, ret, - grub_le_to_cpu32 (node->ino.symlink.namelen), -@@ -506,11 +517,16 @@ grub_squash_iterate_dir (grub_fshelp_node_t dir, - - { - grub_fshelp_node_t node; -- node = grub_malloc (sizeof (*node) + dir->stsize * sizeof (dir->stack[0])); -+ grub_size_t sz; -+ -+ if (grub_mul (dir->stsize, sizeof (dir->stack[0]), &sz) || -+ grub_add (sz, sizeof (*node), &sz)) -+ return 0; -+ -+ node = grub_malloc (sz); - if (!node) - return 0; -- grub_memcpy (node, dir, -- sizeof (*node) + dir->stsize * sizeof (dir->stack[0])); -+ grub_memcpy (node, dir, sz); - if (hook (".", GRUB_FSHELP_DIR, node, hook_data)) - return 1; - -@@ -518,12 +534,15 @@ grub_squash_iterate_dir (grub_fshelp_node_t dir, - { - grub_err_t err; - -- node = grub_malloc (sizeof (*node) + dir->stsize * sizeof (dir->stack[0])); -+ if (grub_mul (dir->stsize, sizeof (dir->stack[0]), &sz) || -+ grub_add (sz, sizeof (*node), &sz)) -+ return 0; -+ -+ node = grub_malloc (sz); - if (!node) - return 0; - -- grub_memcpy (node, dir, -- sizeof (*node) + dir->stsize * sizeof (dir->stack[0])); -+ grub_memcpy (node, dir, sz); - - node->stsize--; - err = read_chunk (dir->data, &node->ino, sizeof (node->ino), -@@ -557,6 +576,7 @@ grub_squash_iterate_dir (grub_fshelp_node_t dir, - enum grub_fshelp_filetype filetype = GRUB_FSHELP_REG; - struct grub_squash_dirent di; - struct grub_squash_inode ino; -+ grub_size_t sz; - - err = read_chunk (dir->data, &di, sizeof (di), - grub_le_to_cpu64 (dir->data->sb.diroffset) -@@ -589,13 +609,16 @@ grub_squash_iterate_dir (grub_fshelp_node_t dir, - if (grub_le_to_cpu16 (di.type) == SQUASH_TYPE_SYMLINK) - filetype = GRUB_FSHELP_SYMLINK; - -- node = grub_malloc (sizeof (*node) -- + (dir->stsize + 1) * sizeof (dir->stack[0])); -+ if (grub_add (dir->stsize, 1, &sz) || -+ grub_mul (sz, sizeof (dir->stack[0]), &sz) || -+ grub_add (sz, sizeof (*node), &sz)) -+ return 0; -+ -+ node = grub_malloc (sz); - if (! node) - return 0; - -- grub_memcpy (node, dir, -- sizeof (*node) + dir->stsize * sizeof (dir->stack[0])); -+ grub_memcpy (node, dir, sz - sizeof(dir->stack[0])); - - node->ino = ino; - node->stack[node->stsize].ino_chunk = grub_le_to_cpu32 (dh.ino_chunk); -diff --git a/grub-core/fs/udf.c b/grub-core/fs/udf.c -index a83761674..21ac7f446 100644 ---- a/grub-core/fs/udf.c -+++ b/grub-core/fs/udf.c -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - GRUB_MOD_LICENSE ("GPLv3+"); - -@@ -890,9 +891,19 @@ read_string (const grub_uint8_t *raw, grub_size_t sz, char *outbuf) - utf16[i] = (raw[2 * i + 1] << 8) | raw[2*i + 2]; - } - if (!outbuf) -- outbuf = grub_malloc (utf16len * GRUB_MAX_UTF8_PER_UTF16 + 1); -+ { -+ grub_size_t size; -+ -+ if (grub_mul (utf16len, GRUB_MAX_UTF8_PER_UTF16, &size) || -+ grub_add (size, 1, &size)) -+ goto fail; -+ -+ outbuf = grub_malloc (size); -+ } - if (outbuf) - *grub_utf16_to_utf8 ((grub_uint8_t *) outbuf, utf16, utf16len) = '\0'; -+ -+ fail: - grub_free (utf16); - return outbuf; - } -@@ -1005,7 +1016,7 @@ grub_udf_read_symlink (grub_fshelp_node_t node) - grub_size_t sz = U64 (node->block.fe.file_size); - grub_uint8_t *raw; - const grub_uint8_t *ptr; -- char *out, *optr; -+ char *out = NULL, *optr; - - if (sz < 4) - return NULL; -@@ -1013,14 +1024,16 @@ grub_udf_read_symlink (grub_fshelp_node_t node) - if (!raw) - return NULL; - if (grub_udf_read_file (node, NULL, NULL, 0, sz, (char *) raw) < 0) -- { -- grub_free (raw); -- return NULL; -- } -+ goto fail_1; - -- out = grub_malloc (sz * 2 + 1); -+ if (grub_mul (sz, 2, &sz) || -+ grub_add (sz, 1, &sz)) -+ goto fail_0; -+ -+ out = grub_malloc (sz); - if (!out) - { -+ fail_0: - grub_free (raw); - return NULL; - } -@@ -1031,17 +1044,17 @@ grub_udf_read_symlink (grub_fshelp_node_t node) - { - grub_size_t s; - if ((grub_size_t) (ptr - raw + 4) > sz) -- goto fail; -+ goto fail_1; - if (!(ptr[2] == 0 && ptr[3] == 0)) -- goto fail; -+ goto fail_1; - s = 4 + ptr[1]; - if ((grub_size_t) (ptr - raw + s) > sz) -- goto fail; -+ goto fail_1; - switch (*ptr) - { - case 1: - if (ptr[1]) -- goto fail; -+ goto fail_1; - /* Fallthrough. */ - case 2: - /* in 4 bytes. out: 1 byte. */ -@@ -1066,11 +1079,11 @@ grub_udf_read_symlink (grub_fshelp_node_t node) - if (optr != out) - *optr++ = '/'; - if (!read_string (ptr + 4, s - 4, optr)) -- goto fail; -+ goto fail_1; - optr += grub_strlen (optr); - break; - default: -- goto fail; -+ goto fail_1; - } - ptr += s; - } -@@ -1078,7 +1091,7 @@ grub_udf_read_symlink (grub_fshelp_node_t node) - grub_free (raw); - return out; - -- fail: -+ fail_1: - grub_free (raw); - grub_free (out); - grub_error (GRUB_ERR_BAD_FS, "invalid symlink"); -diff --git a/grub-core/fs/xfs.c b/grub-core/fs/xfs.c -index 96ffecbfc..ea6590290 100644 ---- a/grub-core/fs/xfs.c -+++ b/grub-core/fs/xfs.c -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - - GRUB_MOD_LICENSE ("GPLv3+"); - -@@ -899,6 +900,7 @@ static struct grub_xfs_data * - grub_xfs_mount (grub_disk_t disk) - { - struct grub_xfs_data *data = 0; -+ grub_size_t sz; - - data = grub_zalloc (sizeof (struct grub_xfs_data)); - if (!data) -@@ -913,10 +915,11 @@ grub_xfs_mount (grub_disk_t disk) - if (!grub_xfs_sb_valid(data)) - goto fail; - -- data = grub_realloc (data, -- sizeof (struct grub_xfs_data) -- - sizeof (struct grub_xfs_inode) -- + grub_xfs_inode_size(data) + 1); -+ if (grub_add (grub_xfs_inode_size (data), -+ sizeof (struct grub_xfs_data) - sizeof (struct grub_xfs_inode) + 1, &sz)) -+ goto fail; -+ -+ data = grub_realloc (data, sz); - - if (! data) - goto fail; -diff --git a/grub-core/fs/zfs/zfs.c b/grub-core/fs/zfs/zfs.c -index 381dde556..36d0373a6 100644 ---- a/grub-core/fs/zfs/zfs.c -+++ b/grub-core/fs/zfs/zfs.c -@@ -55,6 +55,7 @@ - #include - #include - #include -+#include - - GRUB_MOD_LICENSE ("GPLv3+"); - -@@ -773,11 +774,14 @@ fill_vdev_info (struct grub_zfs_data *data, - if (data->n_devices_attached > data->n_devices_allocated) - { - void *tmp; -- data->n_devices_allocated = 2 * data->n_devices_attached + 1; -- data->devices_attached -- = grub_realloc (tmp = data->devices_attached, -- data->n_devices_allocated -- * sizeof (data->devices_attached[0])); -+ grub_size_t sz; -+ -+ if (grub_mul (data->n_devices_attached, 2, &data->n_devices_allocated) || -+ grub_add (data->n_devices_allocated, 1, &data->n_devices_allocated) || -+ grub_mul (data->n_devices_allocated, sizeof (data->devices_attached[0]), &sz)) -+ return GRUB_ERR_OUT_OF_RANGE; -+ -+ data->devices_attached = grub_realloc (tmp = data->devices_attached, sz); - if (!data->devices_attached) - { - data->devices_attached = tmp; -@@ -3468,14 +3472,18 @@ grub_zfs_nvlist_lookup_nvlist (const char *nvlist, const char *name) - { - char *nvpair; - char *ret; -- grub_size_t size; -+ grub_size_t size, sz; - int found; - - found = nvlist_find_value (nvlist, name, DATA_TYPE_NVLIST, &nvpair, - &size, 0); - if (!found) - return 0; -- ret = grub_zalloc (size + 3 * sizeof (grub_uint32_t)); -+ -+ if (grub_add (size, 3 * sizeof (grub_uint32_t), &sz)) -+ return 0; -+ -+ ret = grub_zalloc (sz); - if (!ret) - return 0; - grub_memcpy (ret, nvlist, sizeof (grub_uint32_t)); -diff --git a/grub-core/fs/zfs/zfscrypt.c b/grub-core/fs/zfs/zfscrypt.c -index 1402e0bc2..de3b015f5 100644 ---- a/grub-core/fs/zfs/zfscrypt.c -+++ b/grub-core/fs/zfs/zfscrypt.c -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -82,9 +83,13 @@ grub_zfs_add_key (grub_uint8_t *key_in, - int passphrase) - { - struct grub_zfs_wrap_key *key; -+ grub_size_t sz; -+ - if (!passphrase && keylen > 32) - keylen = 32; -- key = grub_malloc (sizeof (*key) + keylen); -+ if (grub_add (sizeof (*key), keylen, &sz)) -+ return GRUB_ERR_OUT_OF_RANGE; -+ key = grub_malloc (sz); - if (!key) - return grub_errno; - key->is_passphrase = passphrase; -diff --git a/grub-core/lib/arg.c b/grub-core/lib/arg.c -index fd7744a6f..3288609a5 100644 ---- a/grub-core/lib/arg.c -+++ b/grub-core/lib/arg.c -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - - /* Built-in parser for default options. */ - static const struct grub_arg_option help_options[] = -@@ -216,7 +217,13 @@ static inline grub_err_t - add_arg (char ***argl, int *num, char *s) - { - char **p = *argl; -- *argl = grub_realloc (*argl, (++(*num) + 1) * sizeof (char *)); -+ grub_size_t sz; -+ -+ if (grub_add (++(*num), 1, &sz) || -+ grub_mul (sz, sizeof (char *), &sz)) -+ return grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow is detected")); -+ -+ *argl = grub_realloc (*argl, sz); - if (! *argl) - { - grub_free (p); -@@ -431,6 +438,7 @@ grub_arg_list_alloc(grub_extcmd_t extcmd, int argc, - grub_size_t argcnt; - struct grub_arg_list *list; - const struct grub_arg_option *options; -+ grub_size_t sz0, sz1; - - options = extcmd->options; - if (! options) -@@ -443,7 +451,15 @@ grub_arg_list_alloc(grub_extcmd_t extcmd, int argc, - argcnt += ((grub_size_t) argc + 1) / 2 + 1; /* max possible for any option */ - } - -- list = grub_zalloc (sizeof (*list) * i + sizeof (char*) * argcnt); -+ if (grub_mul (sizeof (*list), i, &sz0) || -+ grub_mul (sizeof (char *), argcnt, &sz1) || -+ grub_add (sz0, sz1, &sz0)) -+ { -+ grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow is detected")); -+ return 0; -+ } -+ -+ list = grub_zalloc (sz0); - if (! list) - return 0; - -diff --git a/grub-core/loader/i386/bsd.c b/grub-core/loader/i386/bsd.c -index 3730ed382..b92cbe98d 100644 ---- a/grub-core/loader/i386/bsd.c -+++ b/grub-core/loader/i386/bsd.c -@@ -35,6 +35,7 @@ - #include - #include - #include -+#include - #include - #ifdef GRUB_MACHINE_PCBIOS - #include -@@ -1012,11 +1013,16 @@ grub_netbsd_add_modules (void) - struct grub_netbsd_btinfo_modules *mods; - unsigned i; - grub_err_t err; -+ grub_size_t sz; - - for (mod = netbsd_mods; mod; mod = mod->next) - modcnt++; - -- mods = grub_malloc (sizeof (*mods) + sizeof (mods->mods[0]) * modcnt); -+ if (grub_mul (modcnt, sizeof (mods->mods[0]), &sz) || -+ grub_add (sz, sizeof (*mods), &sz)) -+ return GRUB_ERR_OUT_OF_RANGE; -+ -+ mods = grub_malloc (sz); - if (!mods) - return grub_errno; - -diff --git a/grub-core/net/dns.c b/grub-core/net/dns.c -index e332d5eb4..906ec7d67 100644 ---- a/grub-core/net/dns.c -+++ b/grub-core/net/dns.c -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - - struct dns_cache_element - { -@@ -51,9 +52,15 @@ grub_net_add_dns_server (const struct grub_net_network_level_address *s) - { - int na = dns_servers_alloc * 2; - struct grub_net_network_level_address *ns; -+ grub_size_t sz; -+ - if (na < 8) - na = 8; -- ns = grub_realloc (dns_servers, na * sizeof (ns[0])); -+ -+ if (grub_mul (na, sizeof (ns[0]), &sz)) -+ return GRUB_ERR_OUT_OF_RANGE; -+ -+ ns = grub_realloc (dns_servers, sz); - if (!ns) - return grub_errno; - dns_servers_alloc = na; -diff --git a/grub-core/normal/charset.c b/grub-core/normal/charset.c -index d57fb72fa..4dfcc3107 100644 ---- a/grub-core/normal/charset.c -+++ b/grub-core/normal/charset.c -@@ -48,6 +48,7 @@ - #include - #include - #include -+#include - - #if HAVE_FONT_SOURCE - #include "widthspec.h" -@@ -464,6 +465,7 @@ grub_unicode_aglomerate_comb (const grub_uint32_t *in, grub_size_t inlen, - { - struct grub_unicode_combining *n; - unsigned j; -+ grub_size_t sz; - - if (!haveout) - continue; -@@ -477,10 +479,14 @@ grub_unicode_aglomerate_comb (const grub_uint32_t *in, grub_size_t inlen, - n = out->combining_inline; - else if (out->ncomb > (int) ARRAY_SIZE (out->combining_inline)) - { -- n = grub_realloc (out->combining_ptr, -- sizeof (n[0]) * (out->ncomb + 1)); -+ if (grub_add (out->ncomb, 1, &sz) || -+ grub_mul (sz, sizeof (n[0]), &sz)) -+ goto fail; -+ -+ n = grub_realloc (out->combining_ptr, sz); - if (!n) - { -+ fail: - grub_errno = GRUB_ERR_NONE; - continue; - } -diff --git a/grub-core/normal/cmdline.c b/grub-core/normal/cmdline.c -index c57242e2e..de03fe63b 100644 ---- a/grub-core/normal/cmdline.c -+++ b/grub-core/normal/cmdline.c -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - static grub_uint32_t *kill_buf; - -@@ -307,12 +308,21 @@ cl_insert (struct cmdline_term *cl_terms, unsigned nterms, - if (len + (*llen) >= (*max_len)) - { - grub_uint32_t *nbuf; -- (*max_len) *= 2; -- nbuf = grub_realloc ((*buf), sizeof (grub_uint32_t) * (*max_len)); -+ grub_size_t sz; -+ -+ if (grub_mul (*max_len, 2, max_len) || -+ grub_mul (*max_len, sizeof (grub_uint32_t), &sz)) -+ { -+ grub_errno = GRUB_ERR_OUT_OF_RANGE; -+ goto fail; -+ } -+ -+ nbuf = grub_realloc ((*buf), sz); - if (nbuf) - (*buf) = nbuf; - else - { -+ fail: - grub_print_error (); - grub_errno = GRUB_ERR_NONE; - (*max_len) /= 2; -diff --git a/grub-core/normal/menu_entry.c b/grub-core/normal/menu_entry.c -index 1993995be..50eef918c 100644 ---- a/grub-core/normal/menu_entry.c -+++ b/grub-core/normal/menu_entry.c -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - - enum update_mode - { -@@ -113,10 +114,18 @@ ensure_space (struct line *linep, int extra) - { - if (linep->max_len < linep->len + extra) - { -- linep->max_len = 2 * (linep->len + extra); -- linep->buf = grub_realloc (linep->buf, (linep->max_len + 1) * sizeof (linep->buf[0])); -+ grub_size_t sz0, sz1; -+ -+ if (grub_add (linep->len, extra, &sz0) || -+ grub_mul (sz0, 2, &sz0) || -+ grub_add (sz0, 1, &sz1) || -+ grub_mul (sz1, sizeof (linep->buf[0]), &sz1)) -+ return 0; -+ -+ linep->buf = grub_realloc (linep->buf, sz1); - if (! linep->buf) - return 0; -+ linep->max_len = sz0; - } - - return 1; -diff --git a/grub-core/script/argv.c b/grub-core/script/argv.c -index 217ec5d1e..5751fdd57 100644 ---- a/grub-core/script/argv.c -+++ b/grub-core/script/argv.c -@@ -20,6 +20,7 @@ - #include - #include - #include -+#include - - /* Return nearest power of two that is >= v. */ - static unsigned -@@ -81,11 +82,16 @@ int - grub_script_argv_next (struct grub_script_argv *argv) - { - char **p = argv->args; -+ grub_size_t sz; - - if (argv->args && argv->argc && argv->args[argv->argc - 1] == 0) - return 0; - -- p = grub_realloc (p, round_up_exp ((argv->argc + 2) * sizeof (char *))); -+ if (grub_add (argv->argc, 2, &sz) || -+ grub_mul (sz, sizeof (char *), &sz)) -+ return 1; -+ -+ p = grub_realloc (p, round_up_exp (sz)); - if (! p) - return 1; - -@@ -105,13 +111,19 @@ grub_script_argv_append (struct grub_script_argv *argv, const char *s, - { - grub_size_t a; - char *p = argv->args[argv->argc - 1]; -+ grub_size_t sz; - - if (! s) - return 0; - - a = p ? grub_strlen (p) : 0; - -- p = grub_realloc (p, round_up_exp ((a + slen + 1) * sizeof (char))); -+ if (grub_add (a, slen, &sz) || -+ grub_add (sz, 1, &sz) || -+ grub_mul (sz, sizeof (char), &sz)) -+ return 1; -+ -+ p = grub_realloc (p, round_up_exp (sz)); - if (! p) - return 1; - -diff --git a/grub-core/script/lexer.c b/grub-core/script/lexer.c -index c6bd3172f..5fb0cbd0b 100644 ---- a/grub-core/script/lexer.c -+++ b/grub-core/script/lexer.c -@@ -24,6 +24,7 @@ - #include - #include - #include -+#include - - #define yytext_ptr char * - #include "grub_script.tab.h" -@@ -110,10 +111,14 @@ grub_script_lexer_record (struct grub_parser_param *parser, char *str) - old = lexer->recording; - if (lexer->recordlen < len) - lexer->recordlen = len; -- lexer->recordlen *= 2; -+ -+ if (grub_mul (lexer->recordlen, 2, &lexer->recordlen)) -+ goto fail; -+ - lexer->recording = grub_realloc (lexer->recording, lexer->recordlen); - if (!lexer->recording) - { -+ fail: - grub_free (old); - lexer->recordpos = 0; - lexer->recordlen = 0; -@@ -130,7 +135,7 @@ int - grub_script_lexer_yywrap (struct grub_parser_param *parserstate, - const char *input) - { -- grub_size_t len = 0; -+ grub_size_t len = 0, sz; - char *p = 0; - char *line = 0; - YY_BUFFER_STATE buffer; -@@ -168,12 +173,22 @@ grub_script_lexer_yywrap (struct grub_parser_param *parserstate, - } - else if (len && line[len - 1] != '\n') - { -- p = grub_realloc (line, len + 2); -+ if (grub_add (len, 2, &sz)) -+ { -+ grub_free (line); -+ grub_script_yyerror (parserstate, N_("overflow is detected")); -+ return 1; -+ } -+ -+ p = grub_realloc (line, sz); - if (p) - { - p[len++] = '\n'; - p[len] = '\0'; - } -+ else -+ grub_free (line); -+ - line = p; - } - -diff --git a/grub-core/video/bitmap.c b/grub-core/video/bitmap.c -index b2e031566..6256e209a 100644 ---- a/grub-core/video/bitmap.c -+++ b/grub-core/video/bitmap.c -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - - GRUB_MOD_LICENSE ("GPLv3+"); - -@@ -58,7 +59,7 @@ grub_video_bitmap_create (struct grub_video_bitmap **bitmap, - enum grub_video_blit_format blit_format) - { - struct grub_video_mode_info *mode_info; -- unsigned int size; -+ grub_size_t size; - - if (!bitmap) - return grub_error (GRUB_ERR_BUG, "invalid argument"); -@@ -137,19 +138,25 @@ grub_video_bitmap_create (struct grub_video_bitmap **bitmap, - - mode_info->pitch = width * mode_info->bytes_per_pixel; - -- /* Calculate size needed for the data. */ -- size = (width * mode_info->bytes_per_pixel) * height; -+ /* Calculate size needed for the data. */ -+ if (grub_mul (width, mode_info->bytes_per_pixel, &size) || -+ grub_mul (size, height, &size)) -+ { -+ grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow is detected")); -+ goto fail; -+ } - - (*bitmap)->data = grub_zalloc (size); - if (! (*bitmap)->data) -- { -- grub_free (*bitmap); -- *bitmap = 0; -- -- return grub_errno; -- } -+ goto fail; - - return GRUB_ERR_NONE; -+ -+ fail: -+ grub_free (*bitmap); -+ *bitmap = NULL; -+ -+ return grub_errno; - } - - /* Frees all resources allocated by bitmap. */ -diff --git a/grub-core/video/readers/png.c b/grub-core/video/readers/png.c -index 61bd64537..0157ff742 100644 ---- a/grub-core/video/readers/png.c -+++ b/grub-core/video/readers/png.c -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - - GRUB_MOD_LICENSE ("GPLv3+"); - -@@ -301,9 +302,17 @@ grub_png_decode_image_header (struct grub_png_data *data) - data->bpp <<= 1; - - data->color_bits = color_bits; -- data->row_bytes = data->image_width * data->bpp; -+ -+ if (grub_mul (data->image_width, data->bpp, &data->row_bytes)) -+ return grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow is detected")); -+ - if (data->color_bits <= 4) -- data->row_bytes = (data->image_width * data->color_bits + 7) / 8; -+ { -+ if (grub_mul (data->image_width, data->color_bits + 7, &data->row_bytes)) -+ return grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow is detected")); -+ -+ data->row_bytes >>= 3; -+ } - - #ifndef GRUB_CPU_WORDS_BIGENDIAN - if (data->is_16bit || data->is_gray || data->is_palette) --- -2.26.2 - diff --git a/boot/grub2/0007-iso9660-Don-t-leak-memory-on-realloc-failures.patch b/boot/grub2/0007-iso9660-Don-t-leak-memory-on-realloc-failures.patch deleted file mode 100644 index 6b0aee080c2..00000000000 --- a/boot/grub2/0007-iso9660-Don-t-leak-memory-on-realloc-failures.patch +++ /dev/null @@ -1,72 +0,0 @@ -From e0dd17a3ce79c6622dc78c96e1f2ef1b20e2bf7b Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Sat, 4 Jul 2020 12:25:09 -0400 -Subject: [PATCH] iso9660: Don't leak memory on realloc() failures -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Peter Jones -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/fs/iso9660.c | 24 ++++++++++++++++++++---- - 1 file changed, 20 insertions(+), 4 deletions(-) - -diff --git a/grub-core/fs/iso9660.c b/grub-core/fs/iso9660.c -index 7ba5b300b..5ec4433b8 100644 ---- a/grub-core/fs/iso9660.c -+++ b/grub-core/fs/iso9660.c -@@ -533,14 +533,20 @@ add_part (struct iterate_dir_ctx *ctx, - { - int size = ctx->symlink ? grub_strlen (ctx->symlink) : 0; - grub_size_t sz; -+ char *new; - - if (grub_add (size, len2, &sz) || - grub_add (sz, 1, &sz)) - return; - -- ctx->symlink = grub_realloc (ctx->symlink, sz); -- if (! ctx->symlink) -- return; -+ new = grub_realloc (ctx->symlink, sz); -+ if (!new) -+ { -+ grub_free (ctx->symlink); -+ ctx->symlink = NULL; -+ return; -+ } -+ ctx->symlink = new; - - grub_memcpy (ctx->symlink + size, part, len2); - ctx->symlink[size + len2] = 0; -@@ -634,7 +640,12 @@ susp_iterate_dir (struct grub_iso9660_susp_entry *entry, - is the length. Both are part of the `Component - Record'. */ - if (ctx->symlink && !ctx->was_continue) -- add_part (ctx, "/", 1); -+ { -+ add_part (ctx, "/", 1); -+ if (grub_errno) -+ return grub_errno; -+ } -+ - add_part (ctx, (char *) &entry->data[pos + 2], - entry->data[pos + 1]); - ctx->was_continue = (entry->data[pos] & 1); -@@ -653,6 +664,11 @@ susp_iterate_dir (struct grub_iso9660_susp_entry *entry, - add_part (ctx, "/", 1); - break; - } -+ -+ /* Check if grub_realloc() failed in add_part(). */ -+ if (grub_errno) -+ return grub_errno; -+ - /* In pos + 1 the length of the `Component Record' is - stored. */ - pos += entry->data[pos + 1] + 2; --- -2.26.2 - diff --git a/boot/grub2/0007-video-Remove-trailing-whitespaces.patch b/boot/grub2/0007-video-Remove-trailing-whitespaces.patch new file mode 100644 index 00000000000..94d6aeefe7d --- /dev/null +++ b/boot/grub2/0007-video-Remove-trailing-whitespaces.patch @@ -0,0 +1,689 @@ +From 1faa412c502c7c4ca1230fc152be30b88847fdd2 Mon Sep 17 00:00:00 2001 +From: Elyes Haouas +Date: Fri, 4 Mar 2022 07:42:13 +0100 +Subject: [PATCH] video: Remove trailing whitespaces + +Signed-off-by: Elyes Haouas +Reviewed-by: Daniel Kiper +Upstream: 1f48917d8ddb490dcdc70176e0f58136b7f7811a +[Thomas: needed to backport patches fixing CVEs in the video code] +Signed-off-by: Thomas Petazzoni +--- + grub-core/video/bochs.c | 2 +- + grub-core/video/capture.c | 2 +- + grub-core/video/cirrus.c | 4 ++-- + grub-core/video/coreboot/cbfb.c | 2 +- + grub-core/video/efi_gop.c | 22 +++++++++---------- + grub-core/video/fb/fbblit.c | 8 +++---- + grub-core/video/fb/video_fb.c | 10 ++++----- + grub-core/video/i386/pc/vbe.c | 34 ++++++++++++++--------------- + grub-core/video/i386/pc/vga.c | 6 ++--- + grub-core/video/ieee1275.c | 4 ++-- + grub-core/video/radeon_fuloong2e.c | 6 ++--- + grub-core/video/radeon_yeeloong3a.c | 6 ++--- + grub-core/video/readers/png.c | 2 +- + grub-core/video/readers/tga.c | 2 +- + grub-core/video/sis315_init.c | 2 +- + grub-core/video/sis315pro.c | 8 +++---- + grub-core/video/sm712.c | 10 ++++----- + grub-core/video/video.c | 8 +++---- + 18 files changed, 69 insertions(+), 69 deletions(-) + +diff --git a/grub-core/video/bochs.c b/grub-core/video/bochs.c +index 30ea1bd82..edc651697 100644 +--- a/grub-core/video/bochs.c ++++ b/grub-core/video/bochs.c +@@ -212,7 +212,7 @@ find_card (grub_pci_device_t dev, grub_pci_id_t pciid, void *data) + + if (((class >> 16) & 0xffff) != 0x0300 || pciid != 0x11111234) + return 0; +- ++ + addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0); + framebuffer.base = grub_pci_read (addr) & GRUB_PCI_ADDR_MEM_MASK; + if (!framebuffer.base) +diff --git a/grub-core/video/capture.c b/grub-core/video/capture.c +index 4d3195e01..c653d89f9 100644 +--- a/grub-core/video/capture.c ++++ b/grub-core/video/capture.c +@@ -92,7 +92,7 @@ grub_video_capture_start (const struct grub_video_mode_info *mode_info, + framebuffer.ptr = grub_calloc (framebuffer.mode_info.height, framebuffer.mode_info.pitch); + if (!framebuffer.ptr) + return grub_errno; +- ++ + err = grub_video_fb_create_render_target_from_pointer (&framebuffer.render_target, + &framebuffer.mode_info, + framebuffer.ptr); +diff --git a/grub-core/video/cirrus.c b/grub-core/video/cirrus.c +index e2149e8ce..f5542ccdc 100644 +--- a/grub-core/video/cirrus.c ++++ b/grub-core/video/cirrus.c +@@ -354,11 +354,11 @@ grub_video_cirrus_setup (unsigned int width, unsigned int height, + grub_uint8_t sr_ext = 0, hidden_dac = 0; + + grub_vga_set_geometry (&config, grub_vga_cr_write); +- ++ + grub_vga_gr_write (GRUB_VGA_GR_MODE_256_COLOR | GRUB_VGA_GR_MODE_READ_MODE1, + GRUB_VGA_GR_MODE); + grub_vga_gr_write (GRUB_VGA_GR_GR6_GRAPHICS_MODE, GRUB_VGA_GR_GR6); +- ++ + grub_vga_sr_write (GRUB_VGA_SR_MEMORY_MODE_NORMAL, GRUB_VGA_SR_MEMORY_MODE); + + grub_vga_cr_write ((config.pitch >> CIRRUS_CR_EXTENDED_DISPLAY_PITCH_SHIFT) +diff --git a/grub-core/video/coreboot/cbfb.c b/grub-core/video/coreboot/cbfb.c +index 9af81fa5b..986003c51 100644 +--- a/grub-core/video/coreboot/cbfb.c ++++ b/grub-core/video/coreboot/cbfb.c +@@ -106,7 +106,7 @@ grub_video_cbfb_setup (unsigned int width, unsigned int height, + + grub_video_fb_set_palette (0, GRUB_VIDEO_FBSTD_NUMCOLORS, + grub_video_fbstd_colors); +- ++ + return err; + } + +diff --git a/grub-core/video/efi_gop.c b/grub-core/video/efi_gop.c +index b7590dc6c..7a5054631 100644 +--- a/grub-core/video/efi_gop.c ++++ b/grub-core/video/efi_gop.c +@@ -273,7 +273,7 @@ grub_video_gop_iterate (int (*hook) (const struct grub_video_mode_info *info, vo + grub_efi_status_t status; + struct grub_efi_gop_mode_info *info = NULL; + struct grub_video_mode_info mode_info; +- ++ + status = efi_call_4 (gop->query_mode, gop, mode, &size, &info); + + if (status) +@@ -390,7 +390,7 @@ grub_video_gop_setup (unsigned int width, unsigned int height, + found = 1; + } + } +- ++ + if (!found) + { + unsigned mode; +@@ -399,7 +399,7 @@ grub_video_gop_setup (unsigned int width, unsigned int height, + { + grub_efi_uintn_t size; + grub_efi_status_t status; +- ++ + status = efi_call_4 (gop->query_mode, gop, mode, &size, &info); + if (status) + { +@@ -472,11 +472,11 @@ grub_video_gop_setup (unsigned int width, unsigned int height, + framebuffer.ptr = (void *) (grub_addr_t) gop->mode->fb_base; + framebuffer.offscreen + = grub_malloc (framebuffer.mode_info.height +- * framebuffer.mode_info.width ++ * framebuffer.mode_info.width + * sizeof (struct grub_efi_gop_blt_pixel)); + + buffer = framebuffer.offscreen; +- ++ + if (!buffer) + { + grub_dprintf ("video", "GOP: couldn't allocate shadow\n"); +@@ -485,11 +485,11 @@ grub_video_gop_setup (unsigned int width, unsigned int height, + &framebuffer.mode_info); + buffer = framebuffer.ptr; + } +- ++ + grub_dprintf ("video", "GOP: initialising FB @ %p %dx%dx%d\n", + framebuffer.ptr, framebuffer.mode_info.width, + framebuffer.mode_info.height, framebuffer.mode_info.bpp); +- ++ + err = grub_video_fb_create_render_target_from_pointer + (&framebuffer.render_target, &framebuffer.mode_info, buffer); + +@@ -498,15 +498,15 @@ grub_video_gop_setup (unsigned int width, unsigned int height, + grub_dprintf ("video", "GOP: Couldn't create FB target\n"); + return err; + } +- ++ + err = grub_video_fb_set_active_render_target (framebuffer.render_target); +- ++ + if (err) + { + grub_dprintf ("video", "GOP: Couldn't set FB target\n"); + return err; + } +- ++ + err = grub_video_fb_set_palette (0, GRUB_VIDEO_FBSTD_NUMCOLORS, + grub_video_fbstd_colors); + +@@ -514,7 +514,7 @@ grub_video_gop_setup (unsigned int width, unsigned int height, + grub_dprintf ("video", "GOP: Couldn't set palette\n"); + else + grub_dprintf ("video", "GOP: Success\n"); +- ++ + return err; + } + +diff --git a/grub-core/video/fb/fbblit.c b/grub-core/video/fb/fbblit.c +index d55924837..1010ef393 100644 +--- a/grub-core/video/fb/fbblit.c ++++ b/grub-core/video/fb/fbblit.c +@@ -466,7 +466,7 @@ grub_video_fbblit_replace_24bit_indexa (struct grub_video_fbblit_info *dst, + for (i = 0; i < width; i++) + { + register grub_uint32_t col; +- if (*srcptr == 0xf0) ++ if (*srcptr == 0xf0) + col = palette[16]; + else + col = palette[*srcptr & 0xf]; +@@ -478,7 +478,7 @@ grub_video_fbblit_replace_24bit_indexa (struct grub_video_fbblit_info *dst, + *dstptr++ = col >> 0; + *dstptr++ = col >> 8; + *dstptr++ = col >> 16; +-#endif ++#endif + srcptr++; + } + +@@ -651,7 +651,7 @@ grub_video_fbblit_blend_24bit_indexa (struct grub_video_fbblit_info *dst, + for (i = 0; i < width; i++) + { + register grub_uint32_t col; +- if (*srcptr != 0xf0) ++ if (*srcptr != 0xf0) + { + col = palette[*srcptr & 0xf]; + #ifdef GRUB_CPU_WORDS_BIGENDIAN +@@ -662,7 +662,7 @@ grub_video_fbblit_blend_24bit_indexa (struct grub_video_fbblit_info *dst, + *dstptr++ = col >> 0; + *dstptr++ = col >> 8; + *dstptr++ = col >> 16; +-#endif ++#endif + } + else + dstptr += 3; +diff --git a/grub-core/video/fb/video_fb.c b/grub-core/video/fb/video_fb.c +index ae6b89f9a..fa4ebde26 100644 +--- a/grub-core/video/fb/video_fb.c ++++ b/grub-core/video/fb/video_fb.c +@@ -754,7 +754,7 @@ grub_video_fb_unmap_color_int (struct grub_video_fbblit_info * source, + *alpha = 0; + return; + } +- ++ + /* If we have an out-of-bounds color, return transparent black. */ + if (color > 255) + { +@@ -1141,7 +1141,7 @@ grub_video_fb_scroll (grub_video_color_t color, int dx, int dy) + /* If everything is aligned on 32-bit use 32-bit copy. */ + if ((grub_addr_t) grub_video_fb_get_video_ptr (&target, src_x, src_y) + % sizeof (grub_uint32_t) == 0 +- && (grub_addr_t) grub_video_fb_get_video_ptr (&target, dst_x, dst_y) ++ && (grub_addr_t) grub_video_fb_get_video_ptr (&target, dst_x, dst_y) + % sizeof (grub_uint32_t) == 0 + && linelen % sizeof (grub_uint32_t) == 0 + && linedelta % sizeof (grub_uint32_t) == 0) +@@ -1155,7 +1155,7 @@ grub_video_fb_scroll (grub_video_color_t color, int dx, int dy) + else if ((grub_addr_t) grub_video_fb_get_video_ptr (&target, src_x, src_y) + % sizeof (grub_uint16_t) == 0 + && (grub_addr_t) grub_video_fb_get_video_ptr (&target, +- dst_x, dst_y) ++ dst_x, dst_y) + % sizeof (grub_uint16_t) == 0 + && linelen % sizeof (grub_uint16_t) == 0 + && linedelta % sizeof (grub_uint16_t) == 0) +@@ -1170,7 +1170,7 @@ grub_video_fb_scroll (grub_video_color_t color, int dx, int dy) + { + grub_uint8_t *src, *dst; + DO_SCROLL +- } ++ } + } + + /* 4. Fill empty space with specified color. In this implementation +@@ -1615,7 +1615,7 @@ grub_video_fb_setup (unsigned int mode_type, unsigned int mode_mask, + framebuffer.render_target = framebuffer.back_target; + return GRUB_ERR_NONE; + } +- ++ + mode_info->mode_type &= ~(GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED + | GRUB_VIDEO_MODE_TYPE_UPDATING_SWAP); + +diff --git a/grub-core/video/i386/pc/vbe.c b/grub-core/video/i386/pc/vbe.c +index b7f911926..0e65b5206 100644 +--- a/grub-core/video/i386/pc/vbe.c ++++ b/grub-core/video/i386/pc/vbe.c +@@ -219,7 +219,7 @@ grub_vbe_disable_mtrr (int mtrr) + } + + /* Call VESA BIOS 0x4f09 to set palette data, return status. */ +-static grub_vbe_status_t ++static grub_vbe_status_t + grub_vbe_bios_set_palette_data (grub_uint32_t color_count, + grub_uint32_t start_index, + struct grub_vbe_palette_data *palette_data) +@@ -237,7 +237,7 @@ grub_vbe_bios_set_palette_data (grub_uint32_t color_count, + } + + /* Call VESA BIOS 0x4f00 to get VBE Controller Information, return status. */ +-grub_vbe_status_t ++grub_vbe_status_t + grub_vbe_bios_get_controller_info (struct grub_vbe_info_block *ci) + { + struct grub_bios_int_registers regs; +@@ -251,7 +251,7 @@ grub_vbe_bios_get_controller_info (struct grub_vbe_info_block *ci) + } + + /* Call VESA BIOS 0x4f01 to get VBE Mode Information, return status. */ +-grub_vbe_status_t ++grub_vbe_status_t + grub_vbe_bios_get_mode_info (grub_uint32_t mode, + struct grub_vbe_mode_info_block *mode_info) + { +@@ -285,7 +285,7 @@ grub_vbe_bios_set_mode (grub_uint32_t mode, + } + + /* Call VESA BIOS 0x4f03 to return current VBE Mode, return status. */ +-grub_vbe_status_t ++grub_vbe_status_t + grub_vbe_bios_get_mode (grub_uint32_t *mode) + { + struct grub_bios_int_registers regs; +@@ -298,7 +298,7 @@ grub_vbe_bios_get_mode (grub_uint32_t *mode) + return regs.eax & 0xffff; + } + +-grub_vbe_status_t ++grub_vbe_status_t + grub_vbe_bios_getset_dac_palette_width (int set, int *dac_mask_size) + { + struct grub_bios_int_registers regs; +@@ -346,7 +346,7 @@ grub_vbe_bios_get_memory_window (grub_uint32_t window, + } + + /* Call VESA BIOS 0x4f06 to set scanline length (in bytes), return status. */ +-grub_vbe_status_t ++grub_vbe_status_t + grub_vbe_bios_set_scanline_length (grub_uint32_t length) + { + struct grub_bios_int_registers regs; +@@ -354,14 +354,14 @@ grub_vbe_bios_set_scanline_length (grub_uint32_t length) + regs.ecx = length; + regs.eax = 0x4f06; + /* BL = 2, Set Scan Line in Bytes. */ +- regs.ebx = 0x0002; ++ regs.ebx = 0x0002; + regs.flags = GRUB_CPU_INT_FLAGS_DEFAULT; + grub_bios_interrupt (0x10, ®s); + return regs.eax & 0xffff; + } + + /* Call VESA BIOS 0x4f06 to return scanline length (in bytes), return status. */ +-grub_vbe_status_t ++grub_vbe_status_t + grub_vbe_bios_get_scanline_length (grub_uint32_t *length) + { + struct grub_bios_int_registers regs; +@@ -377,7 +377,7 @@ grub_vbe_bios_get_scanline_length (grub_uint32_t *length) + } + + /* Call VESA BIOS 0x4f07 to set display start, return status. */ +-static grub_vbe_status_t ++static grub_vbe_status_t + grub_vbe_bios_set_display_start (grub_uint32_t x, grub_uint32_t y) + { + struct grub_bios_int_registers regs; +@@ -390,7 +390,7 @@ grub_vbe_bios_set_display_start (grub_uint32_t x, grub_uint32_t y) + regs.edx = y; + regs.eax = 0x4f07; + /* BL = 80h, Set Display Start during Vertical Retrace. */ +- regs.ebx = 0x0080; ++ regs.ebx = 0x0080; + regs.flags = GRUB_CPU_INT_FLAGS_DEFAULT; + grub_bios_interrupt (0x10, ®s); + +@@ -401,7 +401,7 @@ grub_vbe_bios_set_display_start (grub_uint32_t x, grub_uint32_t y) + } + + /* Call VESA BIOS 0x4f07 to get display start, return status. */ +-grub_vbe_status_t ++grub_vbe_status_t + grub_vbe_bios_get_display_start (grub_uint32_t *x, + grub_uint32_t *y) + { +@@ -419,7 +419,7 @@ grub_vbe_bios_get_display_start (grub_uint32_t *x, + } + + /* Call VESA BIOS 0x4f0a. */ +-grub_vbe_status_t ++grub_vbe_status_t + grub_vbe_bios_get_pm_interface (grub_uint16_t *segment, grub_uint16_t *offset, + grub_uint16_t *length) + { +@@ -896,7 +896,7 @@ vbe2videoinfo (grub_uint32_t mode, + case GRUB_VBE_MEMORY_MODEL_YUV: + mode_info->mode_type |= GRUB_VIDEO_MODE_TYPE_YUV; + break; +- ++ + case GRUB_VBE_MEMORY_MODEL_DIRECT_COLOR: + mode_info->mode_type |= GRUB_VIDEO_MODE_TYPE_RGB; + break; +@@ -923,10 +923,10 @@ vbe2videoinfo (grub_uint32_t mode, + break; + case 8: + mode_info->bytes_per_pixel = 1; +- break; ++ break; + case 4: + mode_info->bytes_per_pixel = 0; +- break; ++ break; + } + + if (controller_info.version >= 0x300) +@@ -976,7 +976,7 @@ grub_video_vbe_iterate (int (*hook) (const struct grub_video_mode_info *info, vo + + static grub_err_t + grub_video_vbe_setup (unsigned int width, unsigned int height, +- grub_video_mode_type_t mode_type, ++ grub_video_mode_type_t mode_type, + grub_video_mode_type_t mode_mask) + { + grub_uint16_t *p; +@@ -1193,7 +1193,7 @@ grub_video_vbe_print_adapter_specific_info (void) + controller_info.version & 0xFF, + controller_info.oem_software_rev >> 8, + controller_info.oem_software_rev & 0xFF); +- ++ + /* The total_memory field is in 64 KiB units. */ + grub_printf_ (N_(" total memory: %d KiB\n"), + (controller_info.total_memory << 6)); +diff --git a/grub-core/video/i386/pc/vga.c b/grub-core/video/i386/pc/vga.c +index b2f776c99..50d0b5e02 100644 +--- a/grub-core/video/i386/pc/vga.c ++++ b/grub-core/video/i386/pc/vga.c +@@ -48,7 +48,7 @@ static struct + int back_page; + } framebuffer; + +-static unsigned char ++static unsigned char + grub_vga_set_mode (unsigned char mode) + { + struct grub_bios_int_registers regs; +@@ -182,10 +182,10 @@ grub_video_vga_setup (unsigned int width, unsigned int height, + + is_target = 1; + err = grub_video_fb_set_active_render_target (framebuffer.render_target); +- ++ + if (err) + return err; +- ++ + err = grub_video_fb_set_palette (0, GRUB_VIDEO_FBSTD_NUMCOLORS, + grub_video_fbstd_colors); + +diff --git a/grub-core/video/ieee1275.c b/grub-core/video/ieee1275.c +index 17a3dbbb5..f8cf94d96 100644 +--- a/grub-core/video/ieee1275.c ++++ b/grub-core/video/ieee1275.c +@@ -234,7 +234,7 @@ grub_video_ieee1275_setup (unsigned int width, unsigned int height, + /* TODO. */ + return grub_error (GRUB_ERR_IO, "can't set mode %dx%d", width, height); + } +- ++ + err = grub_video_ieee1275_fill_mode_info (dev, &framebuffer.mode_info); + if (err) + { +@@ -261,7 +261,7 @@ grub_video_ieee1275_setup (unsigned int width, unsigned int height, + + grub_video_ieee1275_set_palette (0, framebuffer.mode_info.number_of_colors, + grub_video_fbstd_colors); +- ++ + return err; + } + +diff --git a/grub-core/video/radeon_fuloong2e.c b/grub-core/video/radeon_fuloong2e.c +index b4da34b5e..40917acb7 100644 +--- a/grub-core/video/radeon_fuloong2e.c ++++ b/grub-core/video/radeon_fuloong2e.c +@@ -75,7 +75,7 @@ find_card (grub_pci_device_t dev, grub_pci_id_t pciid, void *data) + if (((class >> 16) & 0xffff) != GRUB_PCI_CLASS_SUBCLASS_VGA + || pciid != 0x515a1002) + return 0; +- ++ + *found = 1; + + addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0); +@@ -139,7 +139,7 @@ grub_video_radeon_fuloong2e_setup (unsigned int width, unsigned int height, + framebuffer.mapped = 1; + + /* Prevent garbage from appearing on the screen. */ +- grub_memset (framebuffer.ptr, 0x55, ++ grub_memset (framebuffer.ptr, 0x55, + framebuffer.mode_info.height * framebuffer.mode_info.pitch); + + #ifndef TEST +@@ -152,7 +152,7 @@ grub_video_radeon_fuloong2e_setup (unsigned int width, unsigned int height, + return err; + + err = grub_video_fb_set_active_render_target (framebuffer.render_target); +- ++ + if (err) + return err; + +diff --git a/grub-core/video/radeon_yeeloong3a.c b/grub-core/video/radeon_yeeloong3a.c +index 52614feb6..48631c181 100644 +--- a/grub-core/video/radeon_yeeloong3a.c ++++ b/grub-core/video/radeon_yeeloong3a.c +@@ -74,7 +74,7 @@ find_card (grub_pci_device_t dev, grub_pci_id_t pciid, void *data) + if (((class >> 16) & 0xffff) != GRUB_PCI_CLASS_SUBCLASS_VGA + || pciid != 0x96151002) + return 0; +- ++ + *found = 1; + + addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0); +@@ -137,7 +137,7 @@ grub_video_radeon_yeeloong3a_setup (unsigned int width, unsigned int height, + #endif + + /* Prevent garbage from appearing on the screen. */ +- grub_memset (framebuffer.ptr, 0, ++ grub_memset (framebuffer.ptr, 0, + framebuffer.mode_info.height * framebuffer.mode_info.pitch); + + #ifndef TEST +@@ -150,7 +150,7 @@ grub_video_radeon_yeeloong3a_setup (unsigned int width, unsigned int height, + return err; + + err = grub_video_fb_set_active_render_target (framebuffer.render_target); +- ++ + if (err) + return err; + +diff --git a/grub-core/video/readers/png.c b/grub-core/video/readers/png.c +index 0157ff742..54dfedf43 100644 +--- a/grub-core/video/readers/png.c ++++ b/grub-core/video/readers/png.c +@@ -916,7 +916,7 @@ grub_png_convert_image (struct grub_png_data *data) + } + return; + } +- ++ + if (data->is_gray) + { + switch (data->bpp) +diff --git a/grub-core/video/readers/tga.c b/grub-core/video/readers/tga.c +index 7cb9d1d2a..a9ec3a1b6 100644 +--- a/grub-core/video/readers/tga.c ++++ b/grub-core/video/readers/tga.c +@@ -127,7 +127,7 @@ tga_load_palette (struct tga_data *data) + + if (len > sizeof (data->palette)) + len = sizeof (data->palette); +- ++ + if (grub_file_read (data->file, &data->palette, len) + != (grub_ssize_t) len) + return grub_errno; +diff --git a/grub-core/video/sis315_init.c b/grub-core/video/sis315_init.c +index ae5c1419c..09c3c7bbe 100644 +--- a/grub-core/video/sis315_init.c ++++ b/grub-core/video/sis315_init.c +@@ -1,4 +1,4 @@ +-static const struct { grub_uint8_t reg; grub_uint8_t val; } sr_dump [] = ++static const struct { grub_uint8_t reg; grub_uint8_t val; } sr_dump [] = + { + { 0x28, 0x81 }, + { 0x2a, 0x00 }, +diff --git a/grub-core/video/sis315pro.c b/grub-core/video/sis315pro.c +index 22a0c85a6..4d2f9999a 100644 +--- a/grub-core/video/sis315pro.c ++++ b/grub-core/video/sis315pro.c +@@ -103,7 +103,7 @@ find_card (grub_pci_device_t dev, grub_pci_id_t pciid, void *data) + if (((class >> 16) & 0xffff) != GRUB_PCI_CLASS_SUBCLASS_VGA + || pciid != GRUB_SIS315PRO_PCIID) + return 0; +- ++ + *found = 1; + + addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0); +@@ -218,7 +218,7 @@ grub_video_sis315pro_setup (unsigned int width, unsigned int height, + + #ifndef TEST + /* Prevent garbage from appearing on the screen. */ +- grub_memset (framebuffer.ptr, 0, ++ grub_memset (framebuffer.ptr, 0, + framebuffer.mode_info.height * framebuffer.mode_info.pitch); + grub_arch_sync_dma_caches (framebuffer.ptr, + framebuffer.mode_info.height +@@ -231,7 +231,7 @@ grub_video_sis315pro_setup (unsigned int width, unsigned int height, + | GRUB_VGA_IO_MISC_EXTERNAL_CLOCK_0 + | GRUB_VGA_IO_MISC_28MHZ + | GRUB_VGA_IO_MISC_ENABLE_VRAM_ACCESS +- | GRUB_VGA_IO_MISC_COLOR, ++ | GRUB_VGA_IO_MISC_COLOR, + GRUB_VGA_IO_MISC_WRITE + GRUB_MACHINE_PCI_IO_BASE); + + grub_vga_sr_write (0x86, 5); +@@ -335,7 +335,7 @@ grub_video_sis315pro_setup (unsigned int width, unsigned int height, + { + if (read_sis_cmd (0x5) != 0xa1) + write_sis_cmd (0x86, 0x5); +- ++ + write_sis_cmd (read_sis_cmd (0x20) | 0xa1, 0x20); + write_sis_cmd (read_sis_cmd (0x1e) | 0xda, 0x1e); + +diff --git a/grub-core/video/sm712.c b/grub-core/video/sm712.c +index 10c46eb65..65f59f84b 100644 +--- a/grub-core/video/sm712.c ++++ b/grub-core/video/sm712.c +@@ -167,7 +167,7 @@ enum + GRUB_SM712_CR_SHADOW_VGA_VBLANK_START = 0x46, + GRUB_SM712_CR_SHADOW_VGA_VBLANK_END = 0x47, + GRUB_SM712_CR_SHADOW_VGA_VRETRACE_START = 0x48, +- GRUB_SM712_CR_SHADOW_VGA_VRETRACE_END = 0x49, ++ GRUB_SM712_CR_SHADOW_VGA_VRETRACE_END = 0x49, + GRUB_SM712_CR_SHADOW_VGA_OVERFLOW = 0x4a, + GRUB_SM712_CR_SHADOW_VGA_CELL_HEIGHT = 0x4b, + GRUB_SM712_CR_SHADOW_VGA_HDISPLAY_END = 0x4c, +@@ -375,7 +375,7 @@ find_card (grub_pci_device_t dev, grub_pci_id_t pciid, void *data) + if (((class >> 16) & 0xffff) != GRUB_PCI_CLASS_SUBCLASS_VGA + || pciid != GRUB_SM712_PCIID) + return 0; +- ++ + *found = 1; + + addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0); +@@ -471,7 +471,7 @@ grub_video_sm712_setup (unsigned int width, unsigned int height, + + #if !defined (TEST) && !defined(GENINIT) + /* Prevent garbage from appearing on the screen. */ +- grub_memset ((void *) framebuffer.cached_ptr, 0, ++ grub_memset ((void *) framebuffer.cached_ptr, 0, + framebuffer.mode_info.height * framebuffer.mode_info.pitch); + #endif + +@@ -482,7 +482,7 @@ grub_video_sm712_setup (unsigned int width, unsigned int height, + grub_sm712_sr_write (0x2, 0x6b); + grub_sm712_write_reg (0, GRUB_VGA_IO_PIXEL_MASK); + grub_sm712_sr_write (GRUB_VGA_SR_RESET_ASYNC, GRUB_VGA_SR_RESET); +- grub_sm712_write_reg (GRUB_VGA_IO_MISC_NEGATIVE_VERT_POLARITY ++ grub_sm712_write_reg (GRUB_VGA_IO_MISC_NEGATIVE_VERT_POLARITY + | GRUB_VGA_IO_MISC_NEGATIVE_HORIZ_POLARITY + | GRUB_VGA_IO_MISC_UPPER_64K + | GRUB_VGA_IO_MISC_EXTERNAL_CLOCK_0 +@@ -694,7 +694,7 @@ grub_video_sm712_setup (unsigned int width, unsigned int height, + for (i = 0; i < ARRAY_SIZE (dda_lookups); i++) + grub_sm712_write_dda_lookup (i, dda_lookups[i].compare, dda_lookups[i].dda, + dda_lookups[i].vcentering); +- ++ + /* Undocumented */ + grub_sm712_cr_write (0, 0x9c); + grub_sm712_cr_write (0, 0x9d); +diff --git a/grub-core/video/video.c b/grub-core/video/video.c +index 983424107..8937da745 100644 +--- a/grub-core/video/video.c ++++ b/grub-core/video/video.c +@@ -491,13 +491,13 @@ parse_modespec (const char *current_mode, int *width, int *height, int *depth) + current_mode); + + param++; +- ++ + *width = grub_strtoul (value, 0, 0); + if (grub_errno != GRUB_ERR_NONE) + return grub_error (GRUB_ERR_BAD_ARGUMENT, + N_("invalid video mode specification `%s'"), + current_mode); +- ++ + /* Find height value. */ + value = param; + param = grub_strchr(param, 'x'); +@@ -513,13 +513,13 @@ parse_modespec (const char *current_mode, int *width, int *height, int *depth) + { + /* We have optional color depth value. */ + param++; +- ++ + *height = grub_strtoul (value, 0, 0); + if (grub_errno != GRUB_ERR_NONE) + return grub_error (GRUB_ERR_BAD_ARGUMENT, + N_("invalid video mode specification `%s'"), + current_mode); +- ++ + /* Convert color depth value. */ + value = param; + *depth = grub_strtoul (value, 0, 0); +-- +2.41.0 + diff --git a/boot/grub2/0008-font-Do-not-load-more-than-one-NAME-section.patch b/boot/grub2/0008-font-Do-not-load-more-than-one-NAME-section.patch deleted file mode 100644 index f4616292fea..00000000000 --- a/boot/grub2/0008-font-Do-not-load-more-than-one-NAME-section.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 73bc7a964c9496d5b0f00dbd69959dacf5adcebe Mon Sep 17 00:00:00 2001 -From: Daniel Kiper -Date: Tue, 7 Jul 2020 15:36:26 +0200 -Subject: [PATCH] font: Do not load more than one NAME section -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The GRUB font file can have one NAME section only. Though if somebody -crafts a broken font file with many NAME sections and loads it then the -GRUB leaks memory. So, prevent against that by loading first NAME -section and failing in controlled way on following one. - -Reported-by: Chris Coulson -Signed-off-by: Daniel Kiper -Reviewed-by: Jan Setje-Eilers -Signed-off-by: Stefan Sørensen ---- - grub-core/font/font.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/grub-core/font/font.c b/grub-core/font/font.c -index 5edb477ac..d09bb38d8 100644 ---- a/grub-core/font/font.c -+++ b/grub-core/font/font.c -@@ -532,6 +532,12 @@ grub_font_load (const char *filename) - if (grub_memcmp (section.name, FONT_FORMAT_SECTION_NAMES_FONT_NAME, - sizeof (FONT_FORMAT_SECTION_NAMES_FONT_NAME) - 1) == 0) - { -+ if (font->name != NULL) -+ { -+ grub_error (GRUB_ERR_BAD_FONT, "invalid font file: too many NAME sections"); -+ goto fail; -+ } -+ - font->name = read_section_as_string (§ion); - if (!font->name) - goto fail; --- -2.26.2 - diff --git a/boot/grub2/0008-video-readers-png-Abort-sooner-if-a-read-operation-f.patch b/boot/grub2/0008-video-readers-png-Abort-sooner-if-a-read-operation-f.patch new file mode 100644 index 00000000000..94431a4ef17 --- /dev/null +++ b/boot/grub2/0008-video-readers-png-Abort-sooner-if-a-read-operation-f.patch @@ -0,0 +1,204 @@ +From 91d16e415b79f5080fa2bcc21bff6471f6be9f08 Mon Sep 17 00:00:00 2001 +From: Daniel Axtens +Date: Tue, 6 Jul 2021 14:02:55 +1000 +Subject: [PATCH] video/readers/png: Abort sooner if a read operation fails + +Fuzzing revealed some inputs that were taking a long time, potentially +forever, because they did not bail quickly upon encountering an I/O error. + +Try to catch I/O errors sooner and bail out. + +Signed-off-by: Daniel Axtens +Reviewed-by: Daniel Kiper +Upstream: d5caac8ab79d068ad9a41030c772d03a4d4fbd7b +[Thomas: needed to cherry-pick +e623866d9286410156e8b9d2c82d6253a1b22d08, which fixes CVE-2021-3695] +Signed-off-by: Thomas Petazzoni +--- + grub-core/video/readers/png.c | 55 ++++++++++++++++++++++++++++++----- + 1 file changed, 47 insertions(+), 8 deletions(-) + +diff --git a/grub-core/video/readers/png.c b/grub-core/video/readers/png.c +index 54dfedf43..d715c4629 100644 +--- a/grub-core/video/readers/png.c ++++ b/grub-core/video/readers/png.c +@@ -142,6 +142,7 @@ static grub_uint8_t + grub_png_get_byte (struct grub_png_data *data) + { + grub_uint8_t r; ++ grub_ssize_t bytes_read = 0; + + if ((data->inside_idat) && (data->idat_remain == 0)) + { +@@ -175,7 +176,14 @@ grub_png_get_byte (struct grub_png_data *data) + } + + r = 0; +- grub_file_read (data->file, &r, 1); ++ bytes_read = grub_file_read (data->file, &r, 1); ++ ++ if (bytes_read != 1) ++ { ++ grub_error (GRUB_ERR_BAD_FILE_TYPE, ++ "png: unexpected end of data"); ++ return 0; ++ } + + if (data->inside_idat) + data->idat_remain--; +@@ -231,15 +239,16 @@ grub_png_decode_image_palette (struct grub_png_data *data, + if (len == 0) + return GRUB_ERR_NONE; + +- for (i = 0; 3 * i < len && i < 256; i++) ++ grub_errno = GRUB_ERR_NONE; ++ for (i = 0; 3 * i < len && i < 256 && grub_errno == GRUB_ERR_NONE; i++) + for (j = 0; j < 3; j++) + data->palette[i][j] = grub_png_get_byte (data); +- for (i *= 3; i < len; i++) ++ for (i *= 3; i < len && grub_errno == GRUB_ERR_NONE; i++) + grub_png_get_byte (data); + + grub_png_get_dword (data); + +- return GRUB_ERR_NONE; ++ return grub_errno; + } + + static grub_err_t +@@ -256,9 +265,13 @@ grub_png_decode_image_header (struct grub_png_data *data) + return grub_error (GRUB_ERR_BAD_FILE_TYPE, "png: invalid image size"); + + color_bits = grub_png_get_byte (data); ++ if (grub_errno != GRUB_ERR_NONE) ++ return grub_errno; + data->is_16bit = (color_bits == 16); + + color_type = grub_png_get_byte (data); ++ if (grub_errno != GRUB_ERR_NONE) ++ return grub_errno; + + /* According to PNG spec, no other types are valid. */ + if ((color_type & ~(PNG_COLOR_MASK_ALPHA | PNG_COLOR_MASK_COLOR)) +@@ -340,14 +353,20 @@ grub_png_decode_image_header (struct grub_png_data *data) + if (grub_png_get_byte (data) != PNG_COMPRESSION_BASE) + return grub_error (GRUB_ERR_BAD_FILE_TYPE, + "png: compression method not supported"); ++ if (grub_errno != GRUB_ERR_NONE) ++ return grub_errno; + + if (grub_png_get_byte (data) != PNG_FILTER_TYPE_BASE) + return grub_error (GRUB_ERR_BAD_FILE_TYPE, + "png: filter method not supported"); ++ if (grub_errno != GRUB_ERR_NONE) ++ return grub_errno; + + if (grub_png_get_byte (data) != PNG_INTERLACE_NONE) + return grub_error (GRUB_ERR_BAD_FILE_TYPE, + "png: interlace method not supported"); ++ if (grub_errno != GRUB_ERR_NONE) ++ return grub_errno; + + /* Skip crc checksum. */ + grub_png_get_dword (data); +@@ -449,7 +468,7 @@ grub_png_get_huff_code (struct grub_png_data *data, struct huff_table *ht) + int code, i; + + code = 0; +- for (i = 0; i < ht->max_length; i++) ++ for (i = 0; i < ht->max_length && grub_errno == GRUB_ERR_NONE; i++) + { + code = (code << 1) + grub_png_get_bits (data, 1); + if (code < ht->maxval[i]) +@@ -504,8 +523,14 @@ grub_png_init_dynamic_block (struct grub_png_data *data) + grub_uint8_t lens[DEFLATE_HCLEN_MAX]; + + nl = DEFLATE_HLIT_BASE + grub_png_get_bits (data, 5); ++ if (grub_errno != GRUB_ERR_NONE) ++ return grub_errno; + nd = DEFLATE_HDIST_BASE + grub_png_get_bits (data, 5); ++ if (grub_errno != GRUB_ERR_NONE) ++ return grub_errno; + nb = DEFLATE_HCLEN_BASE + grub_png_get_bits (data, 4); ++ if (grub_errno != GRUB_ERR_NONE) ++ return grub_errno; + + if ((nl > DEFLATE_HLIT_MAX) || (nd > DEFLATE_HDIST_MAX) || + (nb > DEFLATE_HCLEN_MAX)) +@@ -533,7 +558,7 @@ grub_png_init_dynamic_block (struct grub_png_data *data) + data->dist_offset); + + prev = 0; +- for (i = 0; i < nl + nd; i++) ++ for (i = 0; i < nl + nd && grub_errno == GRUB_ERR_NONE; i++) + { + int n, code; + struct huff_table *ht; +@@ -721,17 +746,21 @@ grub_png_read_dynamic_block (struct grub_png_data *data) + len = cplens[n]; + if (cplext[n]) + len += grub_png_get_bits (data, cplext[n]); ++ if (grub_errno != GRUB_ERR_NONE) ++ return grub_errno; + + n = grub_png_get_huff_code (data, &data->dist_table); + dist = cpdist[n]; + if (cpdext[n]) + dist += grub_png_get_bits (data, cpdext[n]); ++ if (grub_errno != GRUB_ERR_NONE) ++ return grub_errno; + + pos = data->wp - dist; + if (pos < 0) + pos += WSIZE; + +- while (len > 0) ++ while (len > 0 && grub_errno == GRUB_ERR_NONE) + { + data->slide[data->wp] = data->slide[pos]; + grub_png_output_byte (data, data->slide[data->wp]); +@@ -759,7 +788,11 @@ grub_png_decode_image_data (struct grub_png_data *data) + int final; + + cmf = grub_png_get_byte (data); ++ if (grub_errno != GRUB_ERR_NONE) ++ return grub_errno; + flg = grub_png_get_byte (data); ++ if (grub_errno != GRUB_ERR_NONE) ++ return grub_errno; + + if ((cmf & 0xF) != Z_DEFLATED) + return grub_error (GRUB_ERR_BAD_FILE_TYPE, +@@ -774,7 +807,11 @@ grub_png_decode_image_data (struct grub_png_data *data) + int block_type; + + final = grub_png_get_bits (data, 1); ++ if (grub_errno != GRUB_ERR_NONE) ++ return grub_errno; + block_type = grub_png_get_bits (data, 2); ++ if (grub_errno != GRUB_ERR_NONE) ++ return grub_errno; + + switch (block_type) + { +@@ -790,7 +827,7 @@ grub_png_decode_image_data (struct grub_png_data *data) + grub_png_get_byte (data); + grub_png_get_byte (data); + +- for (i = 0; i < len; i++) ++ for (i = 0; i < len && grub_errno == GRUB_ERR_NONE; i++) + grub_png_output_byte (data, grub_png_get_byte (data)); + + break; +@@ -1045,6 +1082,8 @@ grub_png_decode_png (struct grub_png_data *data) + + len = grub_png_get_dword (data); + type = grub_png_get_dword (data); ++ if (grub_errno != GRUB_ERR_NONE) ++ break; + data->next_offset = data->file->offset + len + 4; + + switch (type) +-- +2.41.0 + diff --git a/boot/grub2/0009-gfxmenu-Fix-double-free-in-load_image.patch b/boot/grub2/0009-gfxmenu-Fix-double-free-in-load_image.patch deleted file mode 100644 index 732d166642c..00000000000 --- a/boot/grub2/0009-gfxmenu-Fix-double-free-in-load_image.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 9ff609f0e7798bc5fb04f791131c98e7693bdd9b Mon Sep 17 00:00:00 2001 -From: Alexey Makhalov -Date: Wed, 8 Jul 2020 20:41:56 +0000 -Subject: [PATCH] gfxmenu: Fix double free in load_image() -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -self->bitmap should be zeroed after free. Otherwise, there is a chance -to double free (USE_AFTER_FREE) it later in rescale_image(). - -Fixes: CID 292472 - -Signed-off-by: Alexey Makhalov -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/gfxmenu/gui_image.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/grub-core/gfxmenu/gui_image.c b/grub-core/gfxmenu/gui_image.c -index 29784ed2d..6b2e976f1 100644 ---- a/grub-core/gfxmenu/gui_image.c -+++ b/grub-core/gfxmenu/gui_image.c -@@ -195,7 +195,10 @@ load_image (grub_gui_image_t self, const char *path) - return grub_errno; - - if (self->bitmap && (self->bitmap != self->raw_bitmap)) -- grub_video_bitmap_destroy (self->bitmap); -+ { -+ grub_video_bitmap_destroy (self->bitmap); -+ self->bitmap = 0; -+ } - if (self->raw_bitmap) - grub_video_bitmap_destroy (self->raw_bitmap); - --- -2.26.2 - diff --git a/boot/grub2/0009-video-readers-png-Refuse-to-handle-multiple-image-he.patch b/boot/grub2/0009-video-readers-png-Refuse-to-handle-multiple-image-he.patch new file mode 100644 index 00000000000..903d33b7b51 --- /dev/null +++ b/boot/grub2/0009-video-readers-png-Refuse-to-handle-multiple-image-he.patch @@ -0,0 +1,34 @@ +From e170edd18fcfdd9e6f91ba750fd022cef8d43cd4 Mon Sep 17 00:00:00 2001 +From: Daniel Axtens +Date: Tue, 6 Jul 2021 14:13:40 +1000 +Subject: [PATCH] video/readers/png: Refuse to handle multiple image headers + +This causes the bitmap to be leaked. Do not permit multiple image headers. + +Signed-off-by: Daniel Axtens +Reviewed-by: Daniel Kiper +Upstream: 166a4d61448f74745afe1dac2f2cfb85d04909bf +[Thomas: needed to cherry-pick +e623866d9286410156e8b9d2c82d6253a1b22d08, which fixes CVE-2021-3695] +Signed-off-by: Thomas Petazzoni +--- + grub-core/video/readers/png.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/grub-core/video/readers/png.c b/grub-core/video/readers/png.c +index d715c4629..35ae553c8 100644 +--- a/grub-core/video/readers/png.c ++++ b/grub-core/video/readers/png.c +@@ -258,6 +258,9 @@ grub_png_decode_image_header (struct grub_png_data *data) + int color_bits; + enum grub_video_blit_format blt; + ++ if (data->image_width || data->image_height) ++ return grub_error (GRUB_ERR_BAD_FILE_TYPE, "png: two image headers found"); ++ + data->image_width = grub_png_get_dword (data); + data->image_height = grub_png_get_dword (data); + +-- +2.41.0 + diff --git a/boot/grub2/0010-video-readers-png-Drop-greyscale-support-to-fix-heap.patch b/boot/grub2/0010-video-readers-png-Drop-greyscale-support-to-fix-heap.patch new file mode 100644 index 00000000000..686a0beafd7 --- /dev/null +++ b/boot/grub2/0010-video-readers-png-Drop-greyscale-support-to-fix-heap.patch @@ -0,0 +1,173 @@ +From 5b42d132a029c1d245d94c813a45836522b46226 Mon Sep 17 00:00:00 2001 +From: Daniel Axtens +Date: Tue, 6 Jul 2021 18:51:35 +1000 +Subject: [PATCH] video/readers/png: Drop greyscale support to fix heap + out-of-bounds write + +A 16-bit greyscale PNG without alpha is processed in the following loop: + + for (i = 0; i < (data->image_width * data->image_height); + i++, d1 += 4, d2 += 2) + { + d1[R3] = d2[1]; + d1[G3] = d2[1]; + d1[B3] = d2[1]; + } + +The increment of d1 is wrong. d1 is incremented by 4 bytes per iteration, +but there are only 3 bytes allocated for storage. This means that image +data will overwrite somewhat-attacker-controlled parts of memory - 3 bytes +out of every 4 following the end of the image. + +This has existed since greyscale support was added in 2013 in commit +3ccf16dff98f (grub-core/video/readers/png.c: Support grayscale). + +Saving starfield.png as a 16-bit greyscale image without alpha in the gimp +and attempting to load it causes grub-emu to crash - I don't think this code +has ever worked. + +Delete all PNG greyscale support. + +Fixes: CVE-2021-3695 + +Signed-off-by: Daniel Axtens +Reviewed-by: Daniel Kiper +Upstream: e623866d9286410156e8b9d2c82d6253a1b22d08 +Signed-off-by: Thomas Petazzoni +--- + grub-core/video/readers/png.c | 87 +++-------------------------------- + 1 file changed, 7 insertions(+), 80 deletions(-) + +diff --git a/grub-core/video/readers/png.c b/grub-core/video/readers/png.c +index 35ae553c8..a3161e25b 100644 +--- a/grub-core/video/readers/png.c ++++ b/grub-core/video/readers/png.c +@@ -100,7 +100,7 @@ struct grub_png_data + + unsigned image_width, image_height; + int bpp, is_16bit; +- int raw_bytes, is_gray, is_alpha, is_palette; ++ int raw_bytes, is_alpha, is_palette; + int row_bytes, color_bits; + grub_uint8_t *image_data; + +@@ -296,13 +296,13 @@ grub_png_decode_image_header (struct grub_png_data *data) + data->bpp = 3; + else + { +- data->is_gray = 1; +- data->bpp = 1; ++ return grub_error (GRUB_ERR_BAD_FILE_TYPE, ++ "png: color type not supported"); + } + + if ((color_bits != 8) && (color_bits != 16) + && (color_bits != 4 +- || !(data->is_gray || data->is_palette))) ++ || !data->is_palette)) + return grub_error (GRUB_ERR_BAD_FILE_TYPE, + "png: bit depth must be 8 or 16"); + +@@ -331,7 +331,7 @@ grub_png_decode_image_header (struct grub_png_data *data) + } + + #ifndef GRUB_CPU_WORDS_BIGENDIAN +- if (data->is_16bit || data->is_gray || data->is_palette) ++ if (data->is_16bit || data->is_palette) + #endif + { + data->image_data = grub_calloc (data->image_height, data->row_bytes); +@@ -899,27 +899,8 @@ grub_png_convert_image (struct grub_png_data *data) + int shift; + int mask = (1 << data->color_bits) - 1; + unsigned j; +- if (data->is_gray) +- { +- /* Generic formula is +- (0xff * i) / ((1U << data->color_bits) - 1) +- but for allowed bit depth of 1, 2 and for it's +- equivalent to +- (0xff / ((1U << data->color_bits) - 1)) * i +- Precompute the multipliers to avoid division. +- */ +- +- const grub_uint8_t multipliers[5] = { 0xff, 0xff, 0x55, 0x24, 0x11 }; +- for (i = 0; i < (1U << data->color_bits); i++) +- { +- grub_uint8_t col = multipliers[data->color_bits] * i; +- palette[i][0] = col; +- palette[i][1] = col; +- palette[i][2] = col; +- } +- } +- else +- grub_memcpy (palette, data->palette, 3 << data->color_bits); ++ ++ grub_memcpy (palette, data->palette, 3 << data->color_bits); + d1c = d1; + d2c = d2; + for (j = 0; j < data->image_height; j++, d1c += data->image_width * 3, +@@ -957,60 +938,6 @@ grub_png_convert_image (struct grub_png_data *data) + return; + } + +- if (data->is_gray) +- { +- switch (data->bpp) +- { +- case 4: +- /* 16-bit gray with alpha. */ +- for (i = 0; i < (data->image_width * data->image_height); +- i++, d1 += 4, d2 += 4) +- { +- d1[R4] = d2[3]; +- d1[G4] = d2[3]; +- d1[B4] = d2[3]; +- d1[A4] = d2[1]; +- } +- break; +- case 2: +- if (data->is_16bit) +- /* 16-bit gray without alpha. */ +- { +- for (i = 0; i < (data->image_width * data->image_height); +- i++, d1 += 4, d2 += 2) +- { +- d1[R3] = d2[1]; +- d1[G3] = d2[1]; +- d1[B3] = d2[1]; +- } +- } +- else +- /* 8-bit gray with alpha. */ +- { +- for (i = 0; i < (data->image_width * data->image_height); +- i++, d1 += 4, d2 += 2) +- { +- d1[R4] = d2[1]; +- d1[G4] = d2[1]; +- d1[B4] = d2[1]; +- d1[A4] = d2[0]; +- } +- } +- break; +- /* 8-bit gray without alpha. */ +- case 1: +- for (i = 0; i < (data->image_width * data->image_height); +- i++, d1 += 3, d2++) +- { +- d1[R3] = d2[0]; +- d1[G3] = d2[0]; +- d1[B3] = d2[0]; +- } +- break; +- } +- return; +- } +- + { + /* Only copy the upper 8 bit. */ + #ifndef GRUB_CPU_WORDS_BIGENDIAN +-- +2.41.0 + diff --git a/boot/grub2/0010-xnu-Fix-double-free-in-grub_xnu_devprop_add_property.patch b/boot/grub2/0010-xnu-Fix-double-free-in-grub_xnu_devprop_add_property.patch deleted file mode 100644 index 72cf58d446b..00000000000 --- a/boot/grub2/0010-xnu-Fix-double-free-in-grub_xnu_devprop_add_property.patch +++ /dev/null @@ -1,58 +0,0 @@ -From dc9777dc17697b196c415c53187a55861d41fd2a Mon Sep 17 00:00:00 2001 -From: Alexey Makhalov -Date: Wed, 8 Jul 2020 21:30:43 +0000 -Subject: [PATCH] xnu: Fix double free in grub_xnu_devprop_add_property() -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -grub_xnu_devprop_add_property() should not free utf8 and utf16 as it get -allocated and freed in the caller. - -Minor improvement: do prop fields initialization after memory allocations. - -Fixes: CID 292442, CID 292457, CID 292460, CID 292466 - -Signed-off-by: Alexey Makhalov -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/loader/i386/xnu.c | 17 ++++++++--------- - 1 file changed, 8 insertions(+), 9 deletions(-) - -diff --git a/grub-core/loader/i386/xnu.c b/grub-core/loader/i386/xnu.c -index b7d176b5d..e9e119259 100644 ---- a/grub-core/loader/i386/xnu.c -+++ b/grub-core/loader/i386/xnu.c -@@ -262,20 +262,19 @@ grub_xnu_devprop_add_property (struct grub_xnu_devprop_device_descriptor *dev, - if (!prop) - return grub_errno; - -- prop->name = utf8; -- prop->name16 = utf16; -- prop->name16len = utf16len; -- -- prop->length = datalen; -- prop->data = grub_malloc (prop->length); -+ prop->data = grub_malloc (datalen); - if (!prop->data) - { -- grub_free (prop->name); -- grub_free (prop->name16); - grub_free (prop); - return grub_errno; - } -- grub_memcpy (prop->data, data, prop->length); -+ grub_memcpy (prop->data, data, datalen); -+ -+ prop->name = utf8; -+ prop->name16 = utf16; -+ prop->name16len = utf16len; -+ prop->length = datalen; -+ - grub_list_push (GRUB_AS_LIST_P (&dev->properties), - GRUB_AS_LIST (prop)); - return GRUB_ERR_NONE; --- -2.26.2 - diff --git a/boot/grub2/0011-lzma-Make-sure-we-don-t-dereference-past-array.patch b/boot/grub2/0011-lzma-Make-sure-we-don-t-dereference-past-array.patch deleted file mode 100644 index a7d5a48e5c8..00000000000 --- a/boot/grub2/0011-lzma-Make-sure-we-don-t-dereference-past-array.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 78829f0c230680e386fff9f420bb1631bc20f761 Mon Sep 17 00:00:00 2001 -From: Konrad Rzeszutek Wilk -Date: Thu, 9 Jul 2020 03:05:23 +0000 -Subject: [PATCH] lzma: Make sure we don't dereference past array -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The two dimensional array p->posSlotEncoder[4][64] is being dereferenced -using the GetLenToPosState() macro which checks if len is less than 5, -and if so subtracts 2 from it. If len = 0, that is 0 - 2 = 4294967294. -Obviously we don't want to dereference that far out so we check if the -position found is greater or equal kNumLenToPosStates (4) and bail out. - -N.B.: Upstream LZMA 18.05 and later has this function completely rewritten -without any history. - -Fixes: CID 51526 - -Signed-off-by: Konrad Rzeszutek Wilk -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/lib/LzmaEnc.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/grub-core/lib/LzmaEnc.c b/grub-core/lib/LzmaEnc.c -index f2ec04a8c..753e56a95 100644 ---- a/grub-core/lib/LzmaEnc.c -+++ b/grub-core/lib/LzmaEnc.c -@@ -1877,13 +1877,19 @@ static SRes LzmaEnc_CodeOneBlock(CLzmaEnc *p, Bool useLimits, UInt32 maxPackSize - } - else - { -- UInt32 posSlot; -+ UInt32 posSlot, lenToPosState; - RangeEnc_EncodeBit(&p->rc, &p->isRep[p->state], 0); - p->state = kMatchNextStates[p->state]; - LenEnc_Encode2(&p->lenEnc, &p->rc, len - LZMA_MATCH_LEN_MIN, posState, !p->fastMode, p->ProbPrices); - pos -= LZMA_NUM_REPS; - GetPosSlot(pos, posSlot); -- RcTree_Encode(&p->rc, p->posSlotEncoder[GetLenToPosState(len)], kNumPosSlotBits, posSlot); -+ lenToPosState = GetLenToPosState(len); -+ if (lenToPosState >= kNumLenToPosStates) -+ { -+ p->result = SZ_ERROR_DATA; -+ return CheckErrors(p); -+ } -+ RcTree_Encode(&p->rc, p->posSlotEncoder[lenToPosState], kNumPosSlotBits, posSlot); - - if (posSlot >= kStartPosModelIndex) - { --- -2.26.2 - diff --git a/boot/grub2/0011-video-readers-png-Avoid-heap-OOB-R-W-inserting-huff-.patch b/boot/grub2/0011-video-readers-png-Avoid-heap-OOB-R-W-inserting-huff-.patch new file mode 100644 index 00000000000..19fde07060c --- /dev/null +++ b/boot/grub2/0011-video-readers-png-Avoid-heap-OOB-R-W-inserting-huff-.patch @@ -0,0 +1,44 @@ +From 43a7d9cb829467993ba683a26c980fcfdaa924c8 Mon Sep 17 00:00:00 2001 +From: Daniel Axtens +Date: Tue, 6 Jul 2021 23:25:07 +1000 +Subject: [PATCH] video/readers/png: Avoid heap OOB R/W inserting huff table + items + +In fuzzing we observed crashes where a code would attempt to be inserted +into a huffman table before the start, leading to a set of heap OOB reads +and writes as table entries with negative indices were shifted around and +the new code written in. + +Catch the case where we would underflow the array and bail. + +Fixes: CVE-2021-3696 + +Signed-off-by: Daniel Axtens +Reviewed-by: Daniel Kiper +Upstream: 210245129c932dc9e1c2748d9d35524fb95b5042 +Signed-off-by: Thomas Petazzoni +--- + grub-core/video/readers/png.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/grub-core/video/readers/png.c b/grub-core/video/readers/png.c +index a3161e25b..d7ed5aa6c 100644 +--- a/grub-core/video/readers/png.c ++++ b/grub-core/video/readers/png.c +@@ -438,6 +438,13 @@ grub_png_insert_huff_item (struct huff_table *ht, int code, int len) + for (i = len; i < ht->max_length; i++) + n += ht->maxval[i]; + ++ if (n > ht->num_values) ++ { ++ grub_error (GRUB_ERR_BAD_FILE_TYPE, ++ "png: out of range inserting huffman table item"); ++ return; ++ } ++ + for (i = 0; i < n; i++) + ht->values[ht->num_values - i] = ht->values[ht->num_values - i - 1]; + +-- +2.41.0 + diff --git a/boot/grub2/0012-term-Fix-overflow-on-user-inputs.patch b/boot/grub2/0012-term-Fix-overflow-on-user-inputs.patch deleted file mode 100644 index 77b01a48183..00000000000 --- a/boot/grub2/0012-term-Fix-overflow-on-user-inputs.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 8d3b6f9da468f666e3a7976657f2ab5c52762a21 Mon Sep 17 00:00:00 2001 -From: Konrad Rzeszutek Wilk -Date: Tue, 7 Jul 2020 15:12:25 -0400 -Subject: [PATCH] term: Fix overflow on user inputs -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This requires a very weird input from the serial interface but can cause -an overflow in input_buf (keys) overwriting the next variable (npending) -with the user choice: - -(pahole output) - -struct grub_terminfo_input_state { - int input_buf[6]; /* 0 24 */ - int npending; /* 24 4 */ <- CORRUPT - ...snip... - -The magic string requires causing this is "ESC,O,],0,1,2,q" and we overflow -npending with "q" (aka increase npending to 161). The simplest fix is to -just to disallow overwrites input_buf, which exactly what this patch does. - -Fixes: CID 292449 - -Signed-off-by: Konrad Rzeszutek Wilk -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/term/terminfo.c | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - -diff --git a/grub-core/term/terminfo.c b/grub-core/term/terminfo.c -index d317efa36..5fa94c0c3 100644 ---- a/grub-core/term/terminfo.c -+++ b/grub-core/term/terminfo.c -@@ -398,7 +398,7 @@ grub_terminfo_getwh (struct grub_term_output *term) - } - - static void --grub_terminfo_readkey (struct grub_term_input *term, int *keys, int *len, -+grub_terminfo_readkey (struct grub_term_input *term, int *keys, int *len, int max_len, - int (*readkey) (struct grub_term_input *term)) - { - int c; -@@ -414,6 +414,9 @@ grub_terminfo_readkey (struct grub_term_input *term, int *keys, int *len, - if (c == -1) \ - return; \ - \ -+ if (*len >= max_len) \ -+ return; \ -+ \ - keys[*len] = c; \ - (*len)++; \ - } -@@ -602,8 +605,8 @@ grub_terminfo_getkey (struct grub_term_input *termi) - return ret; - } - -- grub_terminfo_readkey (termi, data->input_buf, -- &data->npending, data->readkey); -+ grub_terminfo_readkey (termi, data->input_buf, &data->npending, -+ GRUB_TERMINFO_READKEY_MAX_LEN, data->readkey); - - #if defined(__powerpc__) && defined(GRUB_MACHINE_IEEE1275) - if (data->npending == 1 && data->input_buf[0] == GRUB_TERM_ESC --- -2.26.2 - diff --git a/boot/grub2/0012-video-readers-jpeg-Block-int-underflow-wild-pointer-.patch b/boot/grub2/0012-video-readers-jpeg-Block-int-underflow-wild-pointer-.patch new file mode 100644 index 00000000000..75c3f8e43b7 --- /dev/null +++ b/boot/grub2/0012-video-readers-jpeg-Block-int-underflow-wild-pointer-.patch @@ -0,0 +1,78 @@ +From 6be7ccfcc33da513de66f71de63fdc129fa019c2 Mon Sep 17 00:00:00 2001 +From: Daniel Axtens +Date: Wed, 7 Jul 2021 15:38:19 +1000 +Subject: [PATCH] video/readers/jpeg: Block int underflow -> wild pointer write + +Certain 1 px wide images caused a wild pointer write in +grub_jpeg_ycrcb_to_rgb(). This was caused because in grub_jpeg_decode_data(), +we have the following loop: + +for (; data->r1 < nr1 && (!data->dri || rst); + data->r1++, data->bitmap_ptr += (vb * data->image_width - hb * nc1) * 3) + +We did not check if vb * width >= hb * nc1. + +On a 64-bit platform, if that turns out to be negative, it will underflow, +be interpreted as unsigned 64-bit, then be added to the 64-bit pointer, so +we see data->bitmap_ptr jump, e.g.: + +0x6180_0000_0480 to +0x6181_0000_0498 + ^ + ~--- carry has occurred and this pointer is now far away from + any object. + +On a 32-bit platform, it will decrement the pointer, creating a pointer +that won't crash but will overwrite random data. + +Catch the underflow and error out. + +Fixes: CVE-2021-3697 + +Signed-off-by: Daniel Axtens +Reviewed-by: Daniel Kiper +Upstream: 22a3f97d39f6a10b08ad7fd1cc47c4dcd10413f6 +Signed-off-by: Thomas Petazzoni +--- + grub-core/video/readers/jpeg.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/grub-core/video/readers/jpeg.c b/grub-core/video/readers/jpeg.c +index e31602f76..1d256af01 100644 +--- a/grub-core/video/readers/jpeg.c ++++ b/grub-core/video/readers/jpeg.c +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + + GRUB_MOD_LICENSE ("GPLv3+"); + +@@ -639,6 +640,7 @@ static grub_err_t + grub_jpeg_decode_data (struct grub_jpeg_data *data) + { + unsigned c1, vb, hb, nr1, nc1; ++ unsigned stride_a, stride_b, stride; + int rst = data->dri; + + vb = 8 << data->log_vs; +@@ -650,8 +652,14 @@ grub_jpeg_decode_data (struct grub_jpeg_data *data) + return grub_error(GRUB_ERR_BAD_FILE_TYPE, + "jpeg: attempted to decode data before start of stream"); + ++ if (grub_mul(vb, data->image_width, &stride_a) || ++ grub_mul(hb, nc1, &stride_b) || ++ grub_sub(stride_a, stride_b, &stride)) ++ return grub_error (GRUB_ERR_BAD_FILE_TYPE, ++ "jpeg: cannot decode image with these dimensions"); ++ + for (; data->r1 < nr1 && (!data->dri || rst); +- data->r1++, data->bitmap_ptr += (vb * data->image_width - hb * nc1) * 3) ++ data->r1++, data->bitmap_ptr += stride * 3) + for (c1 = 0; c1 < nc1 && (!data->dri || rst); + c1++, rst--, data->bitmap_ptr += hb * 3) + { +-- +2.41.0 + diff --git a/boot/grub2/0013-net-ip-Do-IP-fragment-maths-safely.patch b/boot/grub2/0013-net-ip-Do-IP-fragment-maths-safely.patch new file mode 100644 index 00000000000..3acec5cc209 --- /dev/null +++ b/boot/grub2/0013-net-ip-Do-IP-fragment-maths-safely.patch @@ -0,0 +1,56 @@ +From cadde7e36b8797060ac8cdf7cca7d8e1e09697e6 Mon Sep 17 00:00:00 2001 +From: Daniel Axtens +Date: Mon, 20 Dec 2021 19:41:21 +1100 +Subject: [PATCH] net/ip: Do IP fragment maths safely + +We can receive packets with invalid IP fragmentation information. This +can lead to rsm->total_len underflowing and becoming very large. + +Then, in grub_netbuff_alloc(), we add to this very large number, which can +cause it to overflow and wrap back around to a small positive number. +The allocation then succeeds, but the resulting buffer is too small and +subsequent operations can write past the end of the buffer. + +Catch the underflow here. + +Fixes: CVE-2022-28733 + +Signed-off-by: Daniel Axtens +Reviewed-by: Daniel Kiper +Upstream: 3e4817538de828319ba6d59ced2fbb9b5ca13287 +Signed-off-by: Thomas Petazzoni +--- + grub-core/net/ip.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/grub-core/net/ip.c b/grub-core/net/ip.c +index ea5edf8f1..74e4e8b06 100644 +--- a/grub-core/net/ip.c ++++ b/grub-core/net/ip.c +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + #include + + struct iphdr { +@@ -512,7 +513,14 @@ grub_net_recv_ip4_packets (struct grub_net_buff *nb, + { + rsm->total_len = (8 * (grub_be_to_cpu16 (iph->frags) & OFFSET_MASK) + + (nb->tail - nb->data)); +- rsm->total_len -= ((iph->verhdrlen & 0xf) * sizeof (grub_uint32_t)); ++ ++ if (grub_sub (rsm->total_len, (iph->verhdrlen & 0xf) * sizeof (grub_uint32_t), ++ &rsm->total_len)) ++ { ++ grub_dprintf ("net", "IP reassembly size underflow\n"); ++ return GRUB_ERR_NONE; ++ } ++ + rsm->asm_netbuff = grub_netbuff_alloc (rsm->total_len); + if (!rsm->asm_netbuff) + { +-- +2.41.0 + diff --git a/boot/grub2/0013-udf-Fix-memory-leak.patch b/boot/grub2/0013-udf-Fix-memory-leak.patch deleted file mode 100644 index d79de905939..00000000000 --- a/boot/grub2/0013-udf-Fix-memory-leak.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 748b691761d31bfff7e9d0d210caa606294c2b52 Mon Sep 17 00:00:00 2001 -From: Konrad Rzeszutek Wilk -Date: Tue, 7 Jul 2020 22:02:31 -0400 -Subject: [PATCH] udf: Fix memory leak -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes: CID 73796 - -Signed-off-by: Konrad Rzeszutek Wilk -Reviewed-by: Daniel Kiper -Reviewed-by: Jan Setje-Eilers -Signed-off-by: Stefan Sørensen ---- - grub-core/fs/udf.c | 17 +++++++++++++---- - 1 file changed, 13 insertions(+), 4 deletions(-) - -diff --git a/grub-core/fs/udf.c b/grub-core/fs/udf.c -index 21ac7f446..2ac5c1d00 100644 ---- a/grub-core/fs/udf.c -+++ b/grub-core/fs/udf.c -@@ -965,8 +965,10 @@ grub_udf_iterate_dir (grub_fshelp_node_t dir, - return 0; - - if (grub_udf_read_icb (dir->data, &dirent.icb, child)) -- return 0; -- -+ { -+ grub_free (child); -+ return 0; -+ } - if (dirent.characteristics & GRUB_UDF_FID_CHAR_PARENT) - { - /* This is the parent directory. */ -@@ -988,11 +990,18 @@ grub_udf_iterate_dir (grub_fshelp_node_t dir, - dirent.file_ident_length, - (char *) raw)) - != dirent.file_ident_length) -- return 0; -+ { -+ grub_free (child); -+ return 0; -+ } - - filename = read_string (raw, dirent.file_ident_length, 0); - if (!filename) -- grub_print_error (); -+ { -+ /* As the hook won't get called. */ -+ grub_free (child); -+ grub_print_error (); -+ } - - if (filename && hook (filename, type, child, hook_data)) - { --- -2.26.2 - diff --git a/boot/grub2/0014-multiboot2-Fix-memory-leak-if-grub_create_loader_cmd.patch b/boot/grub2/0014-multiboot2-Fix-memory-leak-if-grub_create_loader_cmd.patch deleted file mode 100644 index f3e2a041416..00000000000 --- a/boot/grub2/0014-multiboot2-Fix-memory-leak-if-grub_create_loader_cmd.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 49bf3faa106498e151306fc780c63194a14751e3 Mon Sep 17 00:00:00 2001 -From: Konrad Rzeszutek Wilk -Date: Fri, 26 Jun 2020 10:51:43 -0400 -Subject: [PATCH] multiboot2: Fix memory leak if - grub_create_loader_cmdline() fails -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes: CID 292468 - -Signed-off-by: Konrad Rzeszutek Wilk -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/loader/multiboot_mbi2.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/grub-core/loader/multiboot_mbi2.c b/grub-core/loader/multiboot_mbi2.c -index 53da78615..0efc66062 100644 ---- a/grub-core/loader/multiboot_mbi2.c -+++ b/grub-core/loader/multiboot_mbi2.c -@@ -1070,7 +1070,11 @@ grub_multiboot2_add_module (grub_addr_t start, grub_size_t size, - err = grub_create_loader_cmdline (argc, argv, newmod->cmdline, - newmod->cmdline_size, GRUB_VERIFY_MODULE_CMDLINE); - if (err) -- return err; -+ { -+ grub_free (newmod->cmdline); -+ grub_free (newmod); -+ return err; -+ } - - if (modules_last) - modules_last->next = newmod; --- -2.26.2 - diff --git a/boot/grub2/0014-net-http-Fix-OOB-write-for-split-http-headers.patch b/boot/grub2/0014-net-http-Fix-OOB-write-for-split-http-headers.patch new file mode 100644 index 00000000000..cd249299be6 --- /dev/null +++ b/boot/grub2/0014-net-http-Fix-OOB-write-for-split-http-headers.patch @@ -0,0 +1,50 @@ +From 6bb49bda656e1121fd303cf3e69709172e267718 Mon Sep 17 00:00:00 2001 +From: Daniel Axtens +Date: Tue, 8 Mar 2022 18:17:03 +1100 +Subject: [PATCH] net/http: Fix OOB write for split http headers + +GRUB has special code for handling an http header that is split +across two packets. + +The code tracks the end of line by looking for a "\n" byte. The +code for split headers has always advanced the pointer just past the +end of the line, whereas the code that handles unsplit headers does +not advance the pointer. This extra advance causes the length to be +one greater, which breaks an assumption in parse_line(), leading to +it writing a NUL byte one byte past the end of the buffer where we +reconstruct the line from the two packets. + +It's conceivable that an attacker controlled set of packets could +cause this to zero out the first byte of the "next" pointer of the +grub_mm_region structure following the current_line buffer. + +Do not advance the pointer in the split header case. + +Fixes: CVE-2022-28734 + +Signed-off-by: Daniel Axtens +Reviewed-by: Daniel Kiper +Upstream: ec6bfd3237394c1c7dbf2fd73417173318d22f4b +Signed-off-by: Thomas Petazzoni +--- + grub-core/net/http.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/grub-core/net/http.c b/grub-core/net/http.c +index b616cf40b..a19b0a205 100644 +--- a/grub-core/net/http.c ++++ b/grub-core/net/http.c +@@ -190,9 +190,7 @@ http_receive (grub_net_tcp_socket_t sock __attribute__ ((unused)), + int have_line = 1; + char *t; + ptr = grub_memchr (nb->data, '\n', nb->tail - nb->data); +- if (ptr) +- ptr++; +- else ++ if (ptr == NULL) + { + have_line = 0; + ptr = (char *) nb->tail; +-- +2.41.0 + diff --git a/boot/grub2/0015-net-http-Error-out-on-headers-with-LF-without-CR.patch b/boot/grub2/0015-net-http-Error-out-on-headers-with-LF-without-CR.patch new file mode 100644 index 00000000000..684bb88a9c1 --- /dev/null +++ b/boot/grub2/0015-net-http-Error-out-on-headers-with-LF-without-CR.patch @@ -0,0 +1,52 @@ +From 2974684d2f7f85a5c57af8155cc3b70c04ec1d6b Mon Sep 17 00:00:00 2001 +From: Daniel Axtens +Date: Tue, 8 Mar 2022 19:04:40 +1100 +Subject: [PATCH] net/http: Error out on headers with LF without CR + +In a similar vein to the previous patch, parse_line() would write +a NUL byte past the end of the buffer if there was an HTTP header +with a LF rather than a CRLF. + +RFC-2616 says: + + Many HTTP/1.1 header field values consist of words separated by LWS + or special characters. These special characters MUST be in a quoted + string to be used within a parameter value (as defined in section 3.6). + +We don't support quoted sections or continuation lines, etc. + +If we see an LF that's not part of a CRLF, bail out. + +Fixes: CVE-2022-28734 + +Signed-off-by: Daniel Axtens +Reviewed-by: Daniel Kiper +Upstream: b26b4c08e7119281ff30d0fb4a6169bd2afa8fe4 +Signed-off-by: Thomas Petazzoni +--- + grub-core/net/http.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/grub-core/net/http.c b/grub-core/net/http.c +index a19b0a205..1fa62b5cb 100644 +--- a/grub-core/net/http.c ++++ b/grub-core/net/http.c +@@ -68,7 +68,15 @@ parse_line (grub_file_t file, http_data_t data, char *ptr, grub_size_t len) + char *end = ptr + len; + while (end > ptr && *(end - 1) == '\r') + end--; ++ ++ /* LF without CR. */ ++ if (end == ptr + len) ++ { ++ data->errmsg = grub_strdup (_("invalid HTTP header - LF without CR")); ++ return GRUB_ERR_NONE; ++ } + *end = 0; ++ + /* Trailing CRLF. */ + if (data->in_chunk_len == 1) + { +-- +2.41.0 + diff --git a/boot/grub2/0015-tftp-Do-not-use-priority-queue.patch b/boot/grub2/0015-tftp-Do-not-use-priority-queue.patch deleted file mode 100644 index 833606befee..00000000000 --- a/boot/grub2/0015-tftp-Do-not-use-priority-queue.patch +++ /dev/null @@ -1,283 +0,0 @@ -From b6c4a1b204740fe52b32e7f530831a59f4038e20 Mon Sep 17 00:00:00 2001 -From: Alexey Makhalov -Date: Thu, 9 Jul 2020 08:10:40 +0000 -Subject: [PATCH] tftp: Do not use priority queue -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -There is not need to reassemble the order of blocks. Per RFC 1350, -server must wait for the ACK, before sending next block. Data packets -can be served immediately without putting them to priority queue. - -Logic to handle incoming packet is this: - - if packet block id equal to expected block id, then - process the packet, - - if packet block id is less than expected - this is retransmit - of old packet, then ACK it and drop the packet, - - if packet block id is more than expected - that shouldn't - happen, just drop the packet. - -It makes the tftp receive path code simpler, smaller and faster. -As a benefit, this change fixes CID# 73624 and CID# 96690, caused -by following while loop: - - while (cmp_block (grub_be_to_cpu16 (tftph->u.data.block), data->block + 1) == 0) - -where tftph pointer is not moving from one iteration to another, causing -to serve same packet again. Luckily, double serving didn't happen due to -data->block++ during the first iteration. - -Fixes: CID 73624, CID 96690 - -Signed-off-by: Alexey Makhalov -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/net/tftp.c | 168 ++++++++++++++----------------------------- - 1 file changed, 53 insertions(+), 115 deletions(-) - -diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c -index 7d90bf66e..b4297bc8d 100644 ---- a/grub-core/net/tftp.c -+++ b/grub-core/net/tftp.c -@@ -25,7 +25,6 @@ - #include - #include - #include --#include - #include - - GRUB_MOD_LICENSE ("GPLv3+"); -@@ -106,31 +105,8 @@ typedef struct tftp_data - int have_oack; - struct grub_error_saved save_err; - grub_net_udp_socket_t sock; -- grub_priority_queue_t pq; - } *tftp_data_t; - --static int --cmp_block (grub_uint16_t a, grub_uint16_t b) --{ -- grub_int16_t i = (grub_int16_t) (a - b); -- if (i > 0) -- return +1; -- if (i < 0) -- return -1; -- return 0; --} -- --static int --cmp (const void *a__, const void *b__) --{ -- struct grub_net_buff *a_ = *(struct grub_net_buff **) a__; -- struct grub_net_buff *b_ = *(struct grub_net_buff **) b__; -- struct tftphdr *a = (struct tftphdr *) a_->data; -- struct tftphdr *b = (struct tftphdr *) b_->data; -- /* We want the first elements to be on top. */ -- return -cmp_block (grub_be_to_cpu16 (a->u.data.block), grub_be_to_cpu16 (b->u.data.block)); --} -- - static grub_err_t - ack (tftp_data_t data, grub_uint64_t block) - { -@@ -207,73 +183,60 @@ tftp_receive (grub_net_udp_socket_t sock __attribute__ ((unused)), - return GRUB_ERR_NONE; - } - -- err = grub_priority_queue_push (data->pq, &nb); -- if (err) -- return err; -- -- { -- struct grub_net_buff **nb_top_p, *nb_top; -- while (1) -- { -- nb_top_p = grub_priority_queue_top (data->pq); -- if (!nb_top_p) -- return GRUB_ERR_NONE; -- nb_top = *nb_top_p; -- tftph = (struct tftphdr *) nb_top->data; -- if (cmp_block (grub_be_to_cpu16 (tftph->u.data.block), data->block + 1) >= 0) -- break; -- ack (data, grub_be_to_cpu16 (tftph->u.data.block)); -- grub_netbuff_free (nb_top); -- grub_priority_queue_pop (data->pq); -- } -- while (cmp_block (grub_be_to_cpu16 (tftph->u.data.block), data->block + 1) == 0) -- { -- unsigned size; -- -- grub_priority_queue_pop (data->pq); -- -- if (file->device->net->packs.count < 50) -+ /* Ack old/retransmitted block. */ -+ if (grub_be_to_cpu16 (tftph->u.data.block) < data->block + 1) -+ ack (data, grub_be_to_cpu16 (tftph->u.data.block)); -+ /* Ignore unexpected block. */ -+ else if (grub_be_to_cpu16 (tftph->u.data.block) > data->block + 1) -+ grub_dprintf ("tftp", "TFTP unexpected block # %d\n", tftph->u.data.block); -+ else -+ { -+ unsigned size; -+ -+ if (file->device->net->packs.count < 50) -+ { - err = ack (data, data->block + 1); -- else -- { -- file->device->net->stall = 1; -- err = 0; -- } -- if (err) -- return err; -- -- err = grub_netbuff_pull (nb_top, sizeof (tftph->opcode) + -- sizeof (tftph->u.data.block)); -- if (err) -- return err; -- size = nb_top->tail - nb_top->data; -- -- data->block++; -- if (size < data->block_size) -- { -- if (data->ack_sent < data->block) -- ack (data, data->block); -- file->device->net->eof = 1; -- file->device->net->stall = 1; -- grub_net_udp_close (data->sock); -- data->sock = NULL; -- } -- /* Prevent garbage in broken cards. Is it still necessary -- given that IP implementation has been fixed? -- */ -- if (size > data->block_size) -- { -- err = grub_netbuff_unput (nb_top, size - data->block_size); -- if (err) -- return err; -- } -- /* If there is data, puts packet in socket list. */ -- if ((nb_top->tail - nb_top->data) > 0) -- grub_net_put_packet (&file->device->net->packs, nb_top); -- else -- grub_netbuff_free (nb_top); -- } -- } -+ if (err) -+ return err; -+ } -+ else -+ file->device->net->stall = 1; -+ -+ err = grub_netbuff_pull (nb, sizeof (tftph->opcode) + -+ sizeof (tftph->u.data.block)); -+ if (err) -+ return err; -+ size = nb->tail - nb->data; -+ -+ data->block++; -+ if (size < data->block_size) -+ { -+ if (data->ack_sent < data->block) -+ ack (data, data->block); -+ file->device->net->eof = 1; -+ file->device->net->stall = 1; -+ grub_net_udp_close (data->sock); -+ data->sock = NULL; -+ } -+ /* -+ * Prevent garbage in broken cards. Is it still necessary -+ * given that IP implementation has been fixed? -+ */ -+ if (size > data->block_size) -+ { -+ err = grub_netbuff_unput (nb, size - data->block_size); -+ if (err) -+ return err; -+ } -+ /* If there is data, puts packet in socket list. */ -+ if ((nb->tail - nb->data) > 0) -+ { -+ grub_net_put_packet (&file->device->net->packs, nb); -+ /* Do not free nb. */ -+ return GRUB_ERR_NONE; -+ } -+ } -+ grub_netbuff_free (nb); - return GRUB_ERR_NONE; - case TFTP_ERROR: - data->have_oack = 1; -@@ -287,19 +250,6 @@ tftp_receive (grub_net_udp_socket_t sock __attribute__ ((unused)), - } - } - --static void --destroy_pq (tftp_data_t data) --{ -- struct grub_net_buff **nb_p; -- while ((nb_p = grub_priority_queue_top (data->pq))) -- { -- grub_netbuff_free (*nb_p); -- grub_priority_queue_pop (data->pq); -- } -- -- grub_priority_queue_destroy (data->pq); --} -- - static grub_err_t - tftp_open (struct grub_file *file, const char *filename) - { -@@ -372,17 +322,9 @@ tftp_open (struct grub_file *file, const char *filename) - file->not_easily_seekable = 1; - file->data = data; - -- data->pq = grub_priority_queue_new (sizeof (struct grub_net_buff *), cmp); -- if (!data->pq) -- { -- grub_free (data); -- return grub_errno; -- } -- - err = grub_net_resolve_address (file->device->net->server, &addr); - if (err) - { -- destroy_pq (data); - grub_free (data); - return err; - } -@@ -392,7 +334,6 @@ tftp_open (struct grub_file *file, const char *filename) - file); - if (!data->sock) - { -- destroy_pq (data); - grub_free (data); - return grub_errno; - } -@@ -406,7 +347,6 @@ tftp_open (struct grub_file *file, const char *filename) - if (err) - { - grub_net_udp_close (data->sock); -- destroy_pq (data); - grub_free (data); - return err; - } -@@ -423,7 +363,6 @@ tftp_open (struct grub_file *file, const char *filename) - if (grub_errno) - { - grub_net_udp_close (data->sock); -- destroy_pq (data); - grub_free (data); - return grub_errno; - } -@@ -466,7 +405,6 @@ tftp_close (struct grub_file *file) - grub_print_error (); - grub_net_udp_close (data->sock); - } -- destroy_pq (data); - grub_free (data); - return GRUB_ERR_NONE; - } --- -2.26.2 - diff --git a/boot/grub2/0016-font-Fix-size-overflow-in-grub_font_get_glyph_intern.patch b/boot/grub2/0016-font-Fix-size-overflow-in-grub_font_get_glyph_intern.patch new file mode 100644 index 00000000000..680df1f5e9b --- /dev/null +++ b/boot/grub2/0016-font-Fix-size-overflow-in-grub_font_get_glyph_intern.patch @@ -0,0 +1,116 @@ +From 1aefeca0f6304a20c1a3711cb9e89c5fdb901b6b Mon Sep 17 00:00:00 2001 +From: Zhang Boyang +Date: Fri, 5 Aug 2022 00:51:20 +0800 +Subject: [PATCH] font: Fix size overflow in grub_font_get_glyph_internal() + +The length of memory allocation and file read may overflow. This patch +fixes the problem by using safemath macros. + +There is a lot of code repetition like "(x * y + 7) / 8". It is unsafe +if overflow happens. This patch introduces grub_video_bitmap_calc_1bpp_bufsz(). +It is safe replacement for such code. It has safemath-like prototype. + +This patch also introduces grub_cast(value, pointer), it casts value to +typeof(*pointer) then store the value to *pointer. It returns true when +overflow occurs or false if there is no overflow. The semantics of arguments +and return value are designed to be consistent with other safemath macros. + +Signed-off-by: Zhang Boyang +Reviewed-by: Daniel Kiper +Upstream: 9c76ec09ae08155df27cd237eaea150b4f02f532 +[Thomas: needed to backport 768e1ef2fc159f6e14e7246e4be09363708ac39e, +which fixes CVE-2022-2601] +Signed-off-by: Thomas Petazzoni +--- + grub-core/font/font.c | 17 +++++++++++++---- + include/grub/bitmap.h | 18 ++++++++++++++++++ + include/grub/safemath.h | 2 ++ + 3 files changed, 33 insertions(+), 4 deletions(-) + +diff --git a/grub-core/font/font.c b/grub-core/font/font.c +index d09bb38d8..876b5b695 100644 +--- a/grub-core/font/font.c ++++ b/grub-core/font/font.c +@@ -739,7 +739,8 @@ grub_font_get_glyph_internal (grub_font_t font, grub_uint32_t code) + grub_int16_t xoff; + grub_int16_t yoff; + grub_int16_t dwidth; +- int len; ++ grub_ssize_t len; ++ grub_size_t sz; + + if (index_entry->glyph) + /* Return cached glyph. */ +@@ -766,9 +767,17 @@ grub_font_get_glyph_internal (grub_font_t font, grub_uint32_t code) + return 0; + } + +- len = (width * height + 7) / 8; +- glyph = grub_malloc (sizeof (struct grub_font_glyph) + len); +- if (!glyph) ++ /* Calculate real struct size of current glyph. */ ++ if (grub_video_bitmap_calc_1bpp_bufsz (width, height, &len) || ++ grub_add (sizeof (struct grub_font_glyph), len, &sz)) ++ { ++ remove_font (font); ++ return 0; ++ } ++ ++ /* Allocate and initialize the glyph struct. */ ++ glyph = grub_malloc (sz); ++ if (glyph == NULL) + { + remove_font (font); + return 0; +diff --git a/include/grub/bitmap.h b/include/grub/bitmap.h +index 5728f8ca3..0d9603f61 100644 +--- a/include/grub/bitmap.h ++++ b/include/grub/bitmap.h +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + + struct grub_video_bitmap + { +@@ -79,6 +80,23 @@ grub_video_bitmap_get_height (struct grub_video_bitmap *bitmap) + return bitmap->mode_info.height; + } + ++/* ++ * Calculate and store the size of data buffer of 1bit bitmap in result. ++ * Equivalent to "*result = (width * height + 7) / 8" if no overflow occurs. ++ * Return true when overflow occurs or false if there is no overflow. ++ * This function is intentionally implemented as a macro instead of ++ * an inline function. Although a bit awkward, it preserves data types for ++ * safemath macros and reduces macro side effects as much as possible. ++ * ++ * XXX: Will report false overflow if width * height > UINT64_MAX. ++ */ ++#define grub_video_bitmap_calc_1bpp_bufsz(width, height, result) \ ++({ \ ++ grub_uint64_t _bitmap_pixels; \ ++ grub_mul ((width), (height), &_bitmap_pixels) ? 1 : \ ++ grub_cast (_bitmap_pixels / GRUB_CHAR_BIT + !!(_bitmap_pixels % GRUB_CHAR_BIT), (result)); \ ++}) ++ + void EXPORT_FUNC (grub_video_bitmap_get_mode_info) (struct grub_video_bitmap *bitmap, + struct grub_video_mode_info *mode_info); + +diff --git a/include/grub/safemath.h b/include/grub/safemath.h +index c17b89bba..bb0f826de 100644 +--- a/include/grub/safemath.h ++++ b/include/grub/safemath.h +@@ -30,6 +30,8 @@ + #define grub_sub(a, b, res) __builtin_sub_overflow(a, b, res) + #define grub_mul(a, b, res) __builtin_mul_overflow(a, b, res) + ++#define grub_cast(a, res) grub_add ((a), 0, (res)) ++ + #else + #error gcc 5.1 or newer or clang 3.8 or newer is required + #endif +-- +2.41.0 + diff --git a/boot/grub2/0016-relocator-Protect-grub_relocator_alloc_chunk_addr-in.patch b/boot/grub2/0016-relocator-Protect-grub_relocator_alloc_chunk_addr-in.patch deleted file mode 100644 index 293b9f89b32..00000000000 --- a/boot/grub2/0016-relocator-Protect-grub_relocator_alloc_chunk_addr-in.patch +++ /dev/null @@ -1,153 +0,0 @@ -From 1c7b619c84f229c1602c1958bcd054b6d9937562 Mon Sep 17 00:00:00 2001 -From: Alexey Makhalov -Date: Wed, 15 Jul 2020 06:42:37 +0000 -Subject: [PATCH] relocator: Protect grub_relocator_alloc_chunk_addr() - input args against integer underflow/overflow -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Use arithmetic macros from safemath.h to accomplish it. In this commit, -I didn't want to be too paranoid to check every possible math equation -for overflow/underflow. Only obvious places (with non zero chance of -overflow/underflow) were refactored. - -Signed-off-by: Alexey Makhalov -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/loader/i386/linux.c | 9 +++++++-- - grub-core/loader/i386/pc/linux.c | 9 +++++++-- - grub-core/loader/i386/xen.c | 12 ++++++++++-- - grub-core/loader/xnu.c | 11 +++++++---- - 4 files changed, 31 insertions(+), 10 deletions(-) - -diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c -index d0501e229..02a73463a 100644 ---- a/grub-core/loader/i386/linux.c -+++ b/grub-core/loader/i386/linux.c -@@ -36,6 +36,7 @@ - #include - #include - #include -+#include - - GRUB_MOD_LICENSE ("GPLv3+"); - -@@ -547,9 +548,13 @@ grub_linux_boot (void) - - { - grub_relocator_chunk_t ch; -+ grub_size_t sz; -+ -+ if (grub_add (ctx.real_size, efi_mmap_size, &sz)) -+ return GRUB_ERR_OUT_OF_RANGE; -+ - err = grub_relocator_alloc_chunk_addr (relocator, &ch, -- ctx.real_mode_target, -- (ctx.real_size + efi_mmap_size)); -+ ctx.real_mode_target, sz); - if (err) - return err; - real_mode_mem = get_virtual_current_address (ch); -diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c -index 47ea2945e..31f09922b 100644 ---- a/grub-core/loader/i386/pc/linux.c -+++ b/grub-core/loader/i386/pc/linux.c -@@ -35,6 +35,7 @@ - #include - #include - #include -+#include - - GRUB_MOD_LICENSE ("GPLv3+"); - -@@ -218,8 +219,12 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), - setup_sects = GRUB_LINUX_DEFAULT_SETUP_SECTS; - - real_size = setup_sects << GRUB_DISK_SECTOR_BITS; -- grub_linux16_prot_size = grub_file_size (file) -- - real_size - GRUB_DISK_SECTOR_SIZE; -+ if (grub_sub (grub_file_size (file), real_size, &grub_linux16_prot_size) || -+ grub_sub (grub_linux16_prot_size, GRUB_DISK_SECTOR_SIZE, &grub_linux16_prot_size)) -+ { -+ grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow is detected")); -+ goto fail; -+ } - - if (! grub_linux_is_bzimage - && GRUB_LINUX_ZIMAGE_ADDR + grub_linux16_prot_size -diff --git a/grub-core/loader/i386/xen.c b/grub-core/loader/i386/xen.c -index 8f662c8ac..cd24874ca 100644 ---- a/grub-core/loader/i386/xen.c -+++ b/grub-core/loader/i386/xen.c -@@ -41,6 +41,7 @@ - #include - #include - #include -+#include - - GRUB_MOD_LICENSE ("GPLv3+"); - -@@ -636,6 +637,7 @@ grub_cmd_xen (grub_command_t cmd __attribute__ ((unused)), - grub_relocator_chunk_t ch; - grub_addr_t kern_start; - grub_addr_t kern_end; -+ grub_size_t sz; - - if (argc == 0) - return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected")); -@@ -703,8 +705,14 @@ grub_cmd_xen (grub_command_t cmd __attribute__ ((unused)), - - xen_state.max_addr = ALIGN_UP (kern_end, PAGE_SIZE); - -- err = grub_relocator_alloc_chunk_addr (xen_state.relocator, &ch, kern_start, -- kern_end - kern_start); -+ -+ if (grub_sub (kern_end, kern_start, &sz)) -+ { -+ err = GRUB_ERR_OUT_OF_RANGE; -+ goto fail; -+ } -+ -+ err = grub_relocator_alloc_chunk_addr (xen_state.relocator, &ch, kern_start, sz); - if (err) - goto fail; - kern_chunk_src = get_virtual_current_address (ch); -diff --git a/grub-core/loader/xnu.c b/grub-core/loader/xnu.c -index 77d7060e1..9ae4ceb35 100644 ---- a/grub-core/loader/xnu.c -+++ b/grub-core/loader/xnu.c -@@ -34,6 +34,7 @@ - #include - #include - #include -+#include - - GRUB_MOD_LICENSE ("GPLv3+"); - -@@ -59,15 +60,17 @@ grub_xnu_heap_malloc (int size, void **src, grub_addr_t *target) - { - grub_err_t err; - grub_relocator_chunk_t ch; -+ grub_addr_t tgt; -+ -+ if (grub_add (grub_xnu_heap_target_start, grub_xnu_heap_size, &tgt)) -+ return GRUB_ERR_OUT_OF_RANGE; - -- err = grub_relocator_alloc_chunk_addr (grub_xnu_relocator, &ch, -- grub_xnu_heap_target_start -- + grub_xnu_heap_size, size); -+ err = grub_relocator_alloc_chunk_addr (grub_xnu_relocator, &ch, tgt, size); - if (err) - return err; - - *src = get_virtual_current_address (ch); -- *target = grub_xnu_heap_target_start + grub_xnu_heap_size; -+ *target = tgt; - grub_xnu_heap_size += size; - grub_dprintf ("xnu", "val=%p\n", *src); - return GRUB_ERR_NONE; --- -2.26.2 - diff --git a/boot/grub2/0017-font-Fix-several-integer-overflows-in-grub_font_cons.patch b/boot/grub2/0017-font-Fix-several-integer-overflows-in-grub_font_cons.patch new file mode 100644 index 00000000000..d8e5835e181 --- /dev/null +++ b/boot/grub2/0017-font-Fix-several-integer-overflows-in-grub_font_cons.patch @@ -0,0 +1,83 @@ +From fefba72d17364d6212cfd3be2232f4ce0ba23b82 Mon Sep 17 00:00:00 2001 +From: Zhang Boyang +Date: Fri, 5 Aug 2022 01:58:27 +0800 +Subject: [PATCH] font: Fix several integer overflows in + grub_font_construct_glyph() + +This patch fixes several integer overflows in grub_font_construct_glyph(). +Glyphs of invalid size, zero or leading to an overflow, are rejected. +The inconsistency between "glyph" and "max_glyph_size" when grub_malloc() +returns NULL is fixed too. + +Fixes: CVE-2022-2601 + +Reported-by: Zhang Boyang +Signed-off-by: Zhang Boyang +Reviewed-by: Daniel Kiper +Upstream: 768e1ef2fc159f6e14e7246e4be09363708ac39e +Signed-off-by: Thomas Petazzoni +--- + grub-core/font/font.c | 29 +++++++++++++++++------------ + 1 file changed, 17 insertions(+), 12 deletions(-) + +diff --git a/grub-core/font/font.c b/grub-core/font/font.c +index 876b5b695..0ff552578 100644 +--- a/grub-core/font/font.c ++++ b/grub-core/font/font.c +@@ -1515,6 +1515,7 @@ grub_font_construct_glyph (grub_font_t hinted_font, + struct grub_video_signed_rect bounds; + static struct grub_font_glyph *glyph = 0; + static grub_size_t max_glyph_size = 0; ++ grub_size_t cur_glyph_size; + + ensure_comb_space (glyph_id); + +@@ -1531,29 +1532,33 @@ grub_font_construct_glyph (grub_font_t hinted_font, + if (!glyph_id->ncomb && !glyph_id->attributes) + return main_glyph; + +- if (max_glyph_size < sizeof (*glyph) + (bounds.width * bounds.height + GRUB_CHAR_BIT - 1) / GRUB_CHAR_BIT) ++ if (grub_video_bitmap_calc_1bpp_bufsz (bounds.width, bounds.height, &cur_glyph_size) || ++ grub_add (sizeof (*glyph), cur_glyph_size, &cur_glyph_size)) ++ return main_glyph; ++ ++ if (max_glyph_size < cur_glyph_size) + { + grub_free (glyph); +- max_glyph_size = (sizeof (*glyph) + (bounds.width * bounds.height + GRUB_CHAR_BIT - 1) / GRUB_CHAR_BIT) * 2; +- if (max_glyph_size < 8) +- max_glyph_size = 8; +- glyph = grub_malloc (max_glyph_size); ++ if (grub_mul (cur_glyph_size, 2, &max_glyph_size)) ++ max_glyph_size = 0; ++ glyph = max_glyph_size > 0 ? grub_malloc (max_glyph_size) : NULL; + } + if (!glyph) + { ++ max_glyph_size = 0; + grub_errno = GRUB_ERR_NONE; + return main_glyph; + } + +- grub_memset (glyph, 0, sizeof (*glyph) +- + (bounds.width * bounds.height +- + GRUB_CHAR_BIT - 1) / GRUB_CHAR_BIT); ++ grub_memset (glyph, 0, cur_glyph_size); + + glyph->font = main_glyph->font; +- glyph->width = bounds.width; +- glyph->height = bounds.height; +- glyph->offset_x = bounds.x; +- glyph->offset_y = bounds.y; ++ if (bounds.width == 0 || bounds.height == 0 || ++ grub_cast (bounds.width, &glyph->width) || ++ grub_cast (bounds.height, &glyph->height) || ++ grub_cast (bounds.x, &glyph->offset_x) || ++ grub_cast (bounds.y, &glyph->offset_y)) ++ return main_glyph; + + if (glyph_id->attributes & GRUB_UNICODE_GLYPH_ATTRIBUTE_MIRROR) + grub_font_blit_glyph_mirror (glyph, main_glyph, +-- +2.41.0 + diff --git a/boot/grub2/0017-relocator-Protect-grub_relocator_alloc_chunk_align-m.patch b/boot/grub2/0017-relocator-Protect-grub_relocator_alloc_chunk_align-m.patch deleted file mode 100644 index e04e72abac2..00000000000 --- a/boot/grub2/0017-relocator-Protect-grub_relocator_alloc_chunk_align-m.patch +++ /dev/null @@ -1,341 +0,0 @@ -From 0cfbbca3ccd84d36ffb1bcd6644ada7c73b19fc0 Mon Sep 17 00:00:00 2001 -From: Alexey Makhalov -Date: Wed, 8 Jul 2020 01:44:38 +0000 -Subject: [PATCH] relocator: Protect grub_relocator_alloc_chunk_align() - max_addr against integer underflow -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This commit introduces integer underflow mitigation in max_addr calculation -in grub_relocator_alloc_chunk_align() invocation. - -It consists of 2 fixes: - 1. Introduced grub_relocator_alloc_chunk_align_safe() wrapper function to perform - sanity check for min/max and size values, and to make safe invocation of - grub_relocator_alloc_chunk_align() with validated max_addr value. Replace all - invocations such as grub_relocator_alloc_chunk_align(..., min_addr, max_addr - size, size, ...) - by grub_relocator_alloc_chunk_align_safe(..., min_addr, max_addr, size, ...). - 2. Introduced UP_TO_TOP32(s) macro for the cases where max_addr is 32-bit top - address (0xffffffff - size + 1) or similar. - -Signed-off-by: Alexey Makhalov -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/lib/i386/relocator.c | 28 ++++++++++---------------- - grub-core/lib/mips/relocator.c | 6 ++---- - grub-core/lib/powerpc/relocator.c | 6 ++---- - grub-core/lib/x86_64/efi/relocator.c | 7 +++---- - grub-core/loader/i386/linux.c | 5 ++--- - grub-core/loader/i386/multiboot_mbi.c | 7 +++---- - grub-core/loader/i386/pc/linux.c | 6 ++---- - grub-core/loader/mips/linux.c | 9 +++------ - grub-core/loader/multiboot.c | 2 +- - grub-core/loader/multiboot_elfxx.c | 10 ++++----- - grub-core/loader/multiboot_mbi2.c | 10 ++++----- - grub-core/loader/xnu_resume.c | 2 +- - include/grub/relocator.h | 29 +++++++++++++++++++++++++++ - 13 files changed, 69 insertions(+), 58 deletions(-) - -diff --git a/grub-core/lib/i386/relocator.c b/grub-core/lib/i386/relocator.c -index 71dd4f0ab..34cbe834f 100644 ---- a/grub-core/lib/i386/relocator.c -+++ b/grub-core/lib/i386/relocator.c -@@ -83,11 +83,10 @@ grub_relocator32_boot (struct grub_relocator *rel, - /* Specific memory range due to Global Descriptor Table for use by payload - that we will store in returned chunk. The address range and preference - are based on "THE LINUX/x86 BOOT PROTOCOL" specification. */ -- err = grub_relocator_alloc_chunk_align (rel, &ch, 0x1000, -- 0x9a000 - RELOCATOR_SIZEOF (32), -- RELOCATOR_SIZEOF (32), 16, -- GRUB_RELOCATOR_PREFERENCE_LOW, -- avoid_efi_bootservices); -+ err = grub_relocator_alloc_chunk_align_safe (rel, &ch, 0x1000, 0x9a000, -+ RELOCATOR_SIZEOF (32), 16, -+ GRUB_RELOCATOR_PREFERENCE_LOW, -+ avoid_efi_bootservices); - if (err) - return err; - -@@ -125,13 +124,10 @@ grub_relocator16_boot (struct grub_relocator *rel, - grub_relocator_chunk_t ch; - - /* Put it higher than the byte it checks for A20 check. */ -- err = grub_relocator_alloc_chunk_align (rel, &ch, 0x8010, -- 0xa0000 - RELOCATOR_SIZEOF (16) -- - GRUB_RELOCATOR16_STACK_SIZE, -- RELOCATOR_SIZEOF (16) -- + GRUB_RELOCATOR16_STACK_SIZE, 16, -- GRUB_RELOCATOR_PREFERENCE_NONE, -- 0); -+ err = grub_relocator_alloc_chunk_align_safe (rel, &ch, 0x8010, 0xa0000, -+ RELOCATOR_SIZEOF (16) + -+ GRUB_RELOCATOR16_STACK_SIZE, 16, -+ GRUB_RELOCATOR_PREFERENCE_NONE, 0); - if (err) - return err; - -@@ -183,11 +179,9 @@ grub_relocator64_boot (struct grub_relocator *rel, - void *relst; - grub_relocator_chunk_t ch; - -- err = grub_relocator_alloc_chunk_align (rel, &ch, min_addr, -- max_addr - RELOCATOR_SIZEOF (64), -- RELOCATOR_SIZEOF (64), 16, -- GRUB_RELOCATOR_PREFERENCE_NONE, -- 0); -+ err = grub_relocator_alloc_chunk_align_safe (rel, &ch, min_addr, max_addr, -+ RELOCATOR_SIZEOF (64), 16, -+ GRUB_RELOCATOR_PREFERENCE_NONE, 0); - if (err) - return err; - -diff --git a/grub-core/lib/mips/relocator.c b/grub-core/lib/mips/relocator.c -index 9d5f49cb9..743b213e6 100644 ---- a/grub-core/lib/mips/relocator.c -+++ b/grub-core/lib/mips/relocator.c -@@ -120,10 +120,8 @@ grub_relocator32_boot (struct grub_relocator *rel, - unsigned i; - grub_addr_t vtarget; - -- err = grub_relocator_alloc_chunk_align (rel, &ch, 0, -- (0xffffffff - stateset_size) -- + 1, stateset_size, -- sizeof (grub_uint32_t), -+ err = grub_relocator_alloc_chunk_align (rel, &ch, 0, UP_TO_TOP32 (stateset_size), -+ stateset_size, sizeof (grub_uint32_t), - GRUB_RELOCATOR_PREFERENCE_NONE, 0); - if (err) - return err; -diff --git a/grub-core/lib/powerpc/relocator.c b/grub-core/lib/powerpc/relocator.c -index bdf2b111b..8ffb8b686 100644 ---- a/grub-core/lib/powerpc/relocator.c -+++ b/grub-core/lib/powerpc/relocator.c -@@ -115,10 +115,8 @@ grub_relocator32_boot (struct grub_relocator *rel, - unsigned i; - grub_relocator_chunk_t ch; - -- err = grub_relocator_alloc_chunk_align (rel, &ch, 0, -- (0xffffffff - stateset_size) -- + 1, stateset_size, -- sizeof (grub_uint32_t), -+ err = grub_relocator_alloc_chunk_align (rel, &ch, 0, UP_TO_TOP32 (stateset_size), -+ stateset_size, sizeof (grub_uint32_t), - GRUB_RELOCATOR_PREFERENCE_NONE, 0); - if (err) - return err; -diff --git a/grub-core/lib/x86_64/efi/relocator.c b/grub-core/lib/x86_64/efi/relocator.c -index 3caef7a40..7d200a125 100644 ---- a/grub-core/lib/x86_64/efi/relocator.c -+++ b/grub-core/lib/x86_64/efi/relocator.c -@@ -50,10 +50,9 @@ grub_relocator64_efi_boot (struct grub_relocator *rel, - * 64-bit relocator code may live above 4 GiB quite well. - * However, I do not want ask for problems. Just in case. - */ -- err = grub_relocator_alloc_chunk_align (rel, &ch, 0, -- 0x100000000 - RELOCATOR_SIZEOF (64_efi), -- RELOCATOR_SIZEOF (64_efi), 16, -- GRUB_RELOCATOR_PREFERENCE_NONE, 1); -+ err = grub_relocator_alloc_chunk_align_safe (rel, &ch, 0, 0x100000000, -+ RELOCATOR_SIZEOF (64_efi), 16, -+ GRUB_RELOCATOR_PREFERENCE_NONE, 1); - if (err) - return err; - -diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c -index 02a73463a..efbb99307 100644 ---- a/grub-core/loader/i386/linux.c -+++ b/grub-core/loader/i386/linux.c -@@ -181,9 +181,8 @@ allocate_pages (grub_size_t prot_size, grub_size_t *align, - for (; err && *align + 1 > min_align; (*align)--) - { - grub_errno = GRUB_ERR_NONE; -- err = grub_relocator_alloc_chunk_align (relocator, &ch, -- 0x1000000, -- 0xffffffff & ~prot_size, -+ err = grub_relocator_alloc_chunk_align (relocator, &ch, 0x1000000, -+ UP_TO_TOP32 (prot_size), - prot_size, 1 << *align, - GRUB_RELOCATOR_PREFERENCE_LOW, - 1); -diff --git a/grub-core/loader/i386/multiboot_mbi.c b/grub-core/loader/i386/multiboot_mbi.c -index ad3cc292f..a67d9d0a8 100644 ---- a/grub-core/loader/i386/multiboot_mbi.c -+++ b/grub-core/loader/i386/multiboot_mbi.c -@@ -466,10 +466,9 @@ grub_multiboot_make_mbi (grub_uint32_t *target) - - bufsize = grub_multiboot_get_mbi_size (); - -- err = grub_relocator_alloc_chunk_align (grub_multiboot_relocator, &ch, -- 0x10000, 0xa0000 - bufsize, -- bufsize, 4, -- GRUB_RELOCATOR_PREFERENCE_NONE, 0); -+ err = grub_relocator_alloc_chunk_align_safe (grub_multiboot_relocator, &ch, -+ 0x10000, 0xa0000, bufsize, 4, -+ GRUB_RELOCATOR_PREFERENCE_NONE, 0); - if (err) - return err; - ptrorig = get_virtual_current_address (ch); -diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c -index 31f09922b..5fed5ffdf 100644 ---- a/grub-core/loader/i386/pc/linux.c -+++ b/grub-core/loader/i386/pc/linux.c -@@ -453,10 +453,8 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)), - - { - grub_relocator_chunk_t ch; -- err = grub_relocator_alloc_chunk_align (relocator, &ch, -- addr_min, addr_max - size, -- size, 0x1000, -- GRUB_RELOCATOR_PREFERENCE_HIGH, 0); -+ err = grub_relocator_alloc_chunk_align_safe (relocator, &ch, addr_min, addr_max, size, -+ 0x1000, GRUB_RELOCATOR_PREFERENCE_HIGH, 0); - if (err) - return err; - initrd_chunk = get_virtual_current_address (ch); -diff --git a/grub-core/loader/mips/linux.c b/grub-core/loader/mips/linux.c -index 7b723bf18..e4ed95921 100644 ---- a/grub-core/loader/mips/linux.c -+++ b/grub-core/loader/mips/linux.c -@@ -442,12 +442,9 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)), - { - grub_relocator_chunk_t ch; - -- err = grub_relocator_alloc_chunk_align (relocator, &ch, -- (target_addr & 0x1fffffff) -- + linux_size + 0x10000, -- (0x10000000 - size), -- size, 0x10000, -- GRUB_RELOCATOR_PREFERENCE_NONE, 0); -+ err = grub_relocator_alloc_chunk_align_safe (relocator, &ch, (target_addr & 0x1fffffff) + -+ linux_size + 0x10000, 0x10000000, size, -+ 0x10000, GRUB_RELOCATOR_PREFERENCE_NONE, 0); - - if (err) - goto fail; -diff --git a/grub-core/loader/multiboot.c b/grub-core/loader/multiboot.c -index 4a98d7082..facb13f3d 100644 ---- a/grub-core/loader/multiboot.c -+++ b/grub-core/loader/multiboot.c -@@ -403,7 +403,7 @@ grub_cmd_module (grub_command_t cmd __attribute__ ((unused)), - { - grub_relocator_chunk_t ch; - err = grub_relocator_alloc_chunk_align (GRUB_MULTIBOOT (relocator), &ch, -- lowest_addr, (0xffffffff - size) + 1, -+ lowest_addr, UP_TO_TOP32 (size), - size, MULTIBOOT_MOD_ALIGN, - GRUB_RELOCATOR_PREFERENCE_NONE, 1); - if (err) -diff --git a/grub-core/loader/multiboot_elfxx.c b/grub-core/loader/multiboot_elfxx.c -index cc6853692..f2318e0d1 100644 ---- a/grub-core/loader/multiboot_elfxx.c -+++ b/grub-core/loader/multiboot_elfxx.c -@@ -109,10 +109,10 @@ CONCAT(grub_multiboot_load_elf, XX) (mbi_load_data_t *mld) - if (load_size > mld->max_addr || mld->min_addr > mld->max_addr - load_size) - return grub_error (GRUB_ERR_BAD_OS, "invalid min/max address and/or load size"); - -- err = grub_relocator_alloc_chunk_align (GRUB_MULTIBOOT (relocator), &ch, -- mld->min_addr, mld->max_addr - load_size, -- load_size, mld->align ? mld->align : 1, -- mld->preference, mld->avoid_efi_boot_services); -+ err = grub_relocator_alloc_chunk_align_safe (GRUB_MULTIBOOT (relocator), &ch, -+ mld->min_addr, mld->max_addr, -+ load_size, mld->align ? mld->align : 1, -+ mld->preference, mld->avoid_efi_boot_services); - - if (err) - { -@@ -256,7 +256,7 @@ CONCAT(grub_multiboot_load_elf, XX) (mbi_load_data_t *mld) - continue; - - err = grub_relocator_alloc_chunk_align (GRUB_MULTIBOOT (relocator), &ch, 0, -- (0xffffffff - sh->sh_size) + 1, -+ UP_TO_TOP32 (sh->sh_size), - sh->sh_size, sh->sh_addralign, - GRUB_RELOCATOR_PREFERENCE_NONE, - mld->avoid_efi_boot_services); -diff --git a/grub-core/loader/multiboot_mbi2.c b/grub-core/loader/multiboot_mbi2.c -index 0efc66062..03967839c 100644 ---- a/grub-core/loader/multiboot_mbi2.c -+++ b/grub-core/loader/multiboot_mbi2.c -@@ -295,10 +295,10 @@ grub_multiboot2_load (grub_file_t file, const char *filename) - return grub_error (GRUB_ERR_BAD_OS, "invalid min/max address and/or load size"); - } - -- err = grub_relocator_alloc_chunk_align (grub_multiboot2_relocator, &ch, -- mld.min_addr, mld.max_addr - code_size, -- code_size, mld.align ? mld.align : 1, -- mld.preference, keep_bs); -+ err = grub_relocator_alloc_chunk_align_safe (grub_multiboot2_relocator, &ch, -+ mld.min_addr, mld.max_addr, -+ code_size, mld.align ? mld.align : 1, -+ mld.preference, keep_bs); - } - else - err = grub_relocator_alloc_chunk_addr (grub_multiboot2_relocator, -@@ -708,7 +708,7 @@ grub_multiboot2_make_mbi (grub_uint32_t *target) - COMPILE_TIME_ASSERT (MULTIBOOT_TAG_ALIGN % sizeof (grub_properly_aligned_t) == 0); - - err = grub_relocator_alloc_chunk_align (grub_multiboot2_relocator, &ch, -- 0, 0xffffffff - bufsize, -+ 0, UP_TO_TOP32 (bufsize), - bufsize, MULTIBOOT_TAG_ALIGN, - GRUB_RELOCATOR_PREFERENCE_NONE, 1); - if (err) -diff --git a/grub-core/loader/xnu_resume.c b/grub-core/loader/xnu_resume.c -index 8089804d4..d648ef0cd 100644 ---- a/grub-core/loader/xnu_resume.c -+++ b/grub-core/loader/xnu_resume.c -@@ -129,7 +129,7 @@ grub_xnu_resume (char *imagename) - { - grub_relocator_chunk_t ch; - err = grub_relocator_alloc_chunk_align (grub_xnu_relocator, &ch, 0, -- (0xffffffff - hibhead.image_size) + 1, -+ UP_TO_TOP32 (hibhead.image_size), - hibhead.image_size, - GRUB_XNU_PAGESIZE, - GRUB_RELOCATOR_PREFERENCE_NONE, 0); -diff --git a/include/grub/relocator.h b/include/grub/relocator.h -index 24d8672d2..1b3bdd92a 100644 ---- a/include/grub/relocator.h -+++ b/include/grub/relocator.h -@@ -49,6 +49,35 @@ grub_relocator_alloc_chunk_align (struct grub_relocator *rel, - int preference, - int avoid_efi_boot_services); - -+/* -+ * Wrapper for grub_relocator_alloc_chunk_align() with purpose of -+ * protecting against integer underflow. -+ * -+ * Compare to its callee, max_addr has different meaning here. -+ * It covers entire chunk and not just start address of the chunk. -+ */ -+static inline grub_err_t -+grub_relocator_alloc_chunk_align_safe (struct grub_relocator *rel, -+ grub_relocator_chunk_t *out, -+ grub_phys_addr_t min_addr, -+ grub_phys_addr_t max_addr, -+ grub_size_t size, grub_size_t align, -+ int preference, -+ int avoid_efi_boot_services) -+{ -+ /* Sanity check and ensure following equation (max_addr - size) is safe. */ -+ if (max_addr < size || (max_addr - size) < min_addr) -+ return GRUB_ERR_OUT_OF_RANGE; -+ -+ return grub_relocator_alloc_chunk_align (rel, out, min_addr, -+ max_addr - size, -+ size, align, preference, -+ avoid_efi_boot_services); -+} -+ -+/* Top 32-bit address minus s bytes and plus 1 byte. */ -+#define UP_TO_TOP32(s) ((~(s) & 0xffffffff) + 1) -+ - #define GRUB_RELOCATOR_PREFERENCE_NONE 0 - #define GRUB_RELOCATOR_PREFERENCE_LOW 1 - #define GRUB_RELOCATOR_PREFERENCE_HIGH 2 --- -2.26.2 - diff --git a/boot/grub2/0018-font-Fix-an-integer-underflow-in-blit_comb.patch b/boot/grub2/0018-font-Fix-an-integer-underflow-in-blit_comb.patch new file mode 100644 index 00000000000..1d3d26fb7bc --- /dev/null +++ b/boot/grub2/0018-font-Fix-an-integer-underflow-in-blit_comb.patch @@ -0,0 +1,93 @@ +From 79bd19e078c5053d800b1b4d3a901083da947e70 Mon Sep 17 00:00:00 2001 +From: Zhang Boyang +Date: Mon, 24 Oct 2022 08:05:35 +0800 +Subject: [PATCH] font: Fix an integer underflow in blit_comb() + +The expression (ctx.bounds.height - combining_glyphs[i]->height) / 2 may +evaluate to a very big invalid value even if both ctx.bounds.height and +combining_glyphs[i]->height are small integers. For example, if +ctx.bounds.height is 10 and combining_glyphs[i]->height is 12, this +expression evaluates to 2147483647 (expected -1). This is because +coordinates are allowed to be negative but ctx.bounds.height is an +unsigned int. So, the subtraction operates on unsigned ints and +underflows to a very big value. The division makes things even worse. +The quotient is still an invalid value even if converted back to int. + +This patch fixes the problem by casting ctx.bounds.height to int. As +a result the subtraction will operate on int and grub_uint16_t which +will be promoted to an int. So, the underflow will no longer happen. Other +uses of ctx.bounds.height (and ctx.bounds.width) are also casted to int, +to ensure coordinates are always calculated on signed integers. + +Fixes: CVE-2022-3775 + +Reported-by: Daniel Axtens +Signed-off-by: Zhang Boyang +Reviewed-by: Daniel Kiper +Upstream: 992c06191babc1e109caf40d6a07ec6fdef427af +Signed-off-by: Thomas Petazzoni +--- + grub-core/font/font.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/grub-core/font/font.c b/grub-core/font/font.c +index 0ff552578..7b1cbde07 100644 +--- a/grub-core/font/font.c ++++ b/grub-core/font/font.c +@@ -1206,12 +1206,12 @@ blit_comb (const struct grub_unicode_glyph *glyph_id, + ctx.bounds.height = main_glyph->height; + + above_rightx = main_glyph->offset_x + main_glyph->width; +- above_righty = ctx.bounds.y + ctx.bounds.height; ++ above_righty = ctx.bounds.y + (int) ctx.bounds.height; + + above_leftx = main_glyph->offset_x; +- above_lefty = ctx.bounds.y + ctx.bounds.height; ++ above_lefty = ctx.bounds.y + (int) ctx.bounds.height; + +- below_rightx = ctx.bounds.x + ctx.bounds.width; ++ below_rightx = ctx.bounds.x + (int) ctx.bounds.width; + below_righty = ctx.bounds.y; + + comb = grub_unicode_get_comb (glyph_id); +@@ -1224,7 +1224,7 @@ blit_comb (const struct grub_unicode_glyph *glyph_id, + + if (!combining_glyphs[i]) + continue; +- targetx = (ctx.bounds.width - combining_glyphs[i]->width) / 2 + ctx.bounds.x; ++ targetx = ((int) ctx.bounds.width - combining_glyphs[i]->width) / 2 + ctx.bounds.x; + /* CGJ is to avoid diacritics reordering. */ + if (comb[i].code + == GRUB_UNICODE_COMBINING_GRAPHEME_JOINER) +@@ -1234,8 +1234,8 @@ blit_comb (const struct grub_unicode_glyph *glyph_id, + case GRUB_UNICODE_COMB_OVERLAY: + do_blit (combining_glyphs[i], + targetx, +- (ctx.bounds.height - combining_glyphs[i]->height) / 2 +- - (ctx.bounds.height + ctx.bounds.y), &ctx); ++ ((int) ctx.bounds.height - combining_glyphs[i]->height) / 2 ++ - ((int) ctx.bounds.height + ctx.bounds.y), &ctx); + if (min_devwidth < combining_glyphs[i]->width) + min_devwidth = combining_glyphs[i]->width; + break; +@@ -1308,7 +1308,7 @@ blit_comb (const struct grub_unicode_glyph *glyph_id, + /* Fallthrough. */ + case GRUB_UNICODE_STACK_ATTACHED_ABOVE: + do_blit (combining_glyphs[i], targetx, +- -(ctx.bounds.height + ctx.bounds.y + space ++ -((int) ctx.bounds.height + ctx.bounds.y + space + + combining_glyphs[i]->height), &ctx); + if (min_devwidth < combining_glyphs[i]->width) + min_devwidth = combining_glyphs[i]->width; +@@ -1316,7 +1316,7 @@ blit_comb (const struct grub_unicode_glyph *glyph_id, + + case GRUB_UNICODE_COMB_HEBREW_DAGESH: + do_blit (combining_glyphs[i], targetx, +- -(ctx.bounds.height / 2 + ctx.bounds.y ++ -((int) ctx.bounds.height / 2 + ctx.bounds.y + + combining_glyphs[i]->height / 2), &ctx); + if (min_devwidth < combining_glyphs[i]->width) + min_devwidth = combining_glyphs[i]->width; +-- +2.41.0 + diff --git a/boot/grub2/0018-script-Remove-unused-fields-from-grub_script_functio.patch b/boot/grub2/0018-script-Remove-unused-fields-from-grub_script_functio.patch deleted file mode 100644 index 7b0a5e514ff..00000000000 --- a/boot/grub2/0018-script-Remove-unused-fields-from-grub_script_functio.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 73aa0776457066ee6ebc93486c3cf0e6b755d1b8 Mon Sep 17 00:00:00 2001 -From: Chris Coulson -Date: Fri, 10 Jul 2020 11:21:14 +0100 -Subject: [PATCH] script: Remove unused fields from grub_script_function - struct -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Chris Coulson -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - include/grub/script_sh.h | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/include/grub/script_sh.h b/include/grub/script_sh.h -index 360c2be1f..b382bcf09 100644 ---- a/include/grub/script_sh.h -+++ b/include/grub/script_sh.h -@@ -359,13 +359,8 @@ struct grub_script_function - /* The script function. */ - struct grub_script *func; - -- /* The flags. */ -- unsigned flags; -- - /* The next element. */ - struct grub_script_function *next; -- -- int references; - }; - typedef struct grub_script_function *grub_script_function_t; - --- -2.26.2 - diff --git a/boot/grub2/0019-script-Avoid-a-use-after-free-when-redefining-a-func.patch b/boot/grub2/0019-script-Avoid-a-use-after-free-when-redefining-a-func.patch deleted file mode 100644 index 0fd60357d92..00000000000 --- a/boot/grub2/0019-script-Avoid-a-use-after-free-when-redefining-a-func.patch +++ /dev/null @@ -1,113 +0,0 @@ -From 26349fcf80982b4d0120b73b2836e88bcf16853c Mon Sep 17 00:00:00 2001 -From: Chris Coulson -Date: Fri, 10 Jul 2020 14:41:45 +0100 -Subject: [PATCH] script: Avoid a use-after-free when redefining a - function during execution -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Defining a new function with the same name as a previously defined -function causes the grub_script and associated resources for the -previous function to be freed. If the previous function is currently -executing when a function with the same name is defined, this results -in use-after-frees when processing subsequent commands in the original -function. - -Instead, reject a new function definition if it has the same name as -a previously defined function, and that function is currently being -executed. Although a behavioural change, this should be backwards -compatible with existing configurations because they can't be -dependent on the current behaviour without being broken. - -Fixes: CVE-2020-15706 - -Signed-off-by: Chris Coulson -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/script/execute.c | 2 ++ - grub-core/script/function.c | 16 +++++++++++++--- - grub-core/script/parser.y | 3 ++- - include/grub/script_sh.h | 2 ++ - 4 files changed, 19 insertions(+), 4 deletions(-) - -diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c -index c8d6806fe..7e028e135 100644 ---- a/grub-core/script/execute.c -+++ b/grub-core/script/execute.c -@@ -838,7 +838,9 @@ grub_script_function_call (grub_script_function_t func, int argc, char **args) - old_scope = scope; - scope = &new_scope; - -+ func->executing++; - ret = grub_script_execute (func->func); -+ func->executing--; - - function_return = 0; - active_loops = loops; -diff --git a/grub-core/script/function.c b/grub-core/script/function.c -index d36655e51..3aad04bf9 100644 ---- a/grub-core/script/function.c -+++ b/grub-core/script/function.c -@@ -34,6 +34,7 @@ grub_script_function_create (struct grub_script_arg *functionname_arg, - func = (grub_script_function_t) grub_malloc (sizeof (*func)); - if (! func) - return 0; -+ func->executing = 0; - - func->name = grub_strdup (functionname_arg->str); - if (! func->name) -@@ -60,10 +61,19 @@ grub_script_function_create (struct grub_script_arg *functionname_arg, - grub_script_function_t q; - - q = *p; -- grub_script_free (q->func); -- q->func = cmd; - grub_free (func); -- func = q; -+ if (q->executing > 0) -+ { -+ grub_error (GRUB_ERR_BAD_ARGUMENT, -+ N_("attempt to redefine a function being executed")); -+ func = NULL; -+ } -+ else -+ { -+ grub_script_free (q->func); -+ q->func = cmd; -+ func = q; -+ } - } - else - { -diff --git a/grub-core/script/parser.y b/grub-core/script/parser.y -index 4f0ab8319..f80b86b6f 100644 ---- a/grub-core/script/parser.y -+++ b/grub-core/script/parser.y -@@ -289,7 +289,8 @@ function: "function" "name" - grub_script_mem_free (state->func_mem); - else { - script->children = state->scripts; -- grub_script_function_create ($2, script); -+ if (!grub_script_function_create ($2, script)) -+ grub_script_free (script); - } - - state->scripts = $3; -diff --git a/include/grub/script_sh.h b/include/grub/script_sh.h -index b382bcf09..6c48e0751 100644 ---- a/include/grub/script_sh.h -+++ b/include/grub/script_sh.h -@@ -361,6 +361,8 @@ struct grub_script_function - - /* The next element. */ - struct grub_script_function *next; -+ -+ unsigned executing; - }; - typedef struct grub_script_function *grub_script_function_t; - --- -2.26.2 - diff --git a/boot/grub2/0020-relocator-Fix-grub_relocator_alloc_chunk_align-top-m.patch b/boot/grub2/0020-relocator-Fix-grub_relocator_alloc_chunk_align-top-m.patch deleted file mode 100644 index fc518c5f3bd..00000000000 --- a/boot/grub2/0020-relocator-Fix-grub_relocator_alloc_chunk_align-top-m.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 06aa91f79f902752cb7e5d22ac0ea8e13bffd056 Mon Sep 17 00:00:00 2001 -From: Alexey Makhalov -Date: Fri, 17 Jul 2020 05:17:26 +0000 -Subject: [PATCH] relocator: Fix grub_relocator_alloc_chunk_align() top - memory allocation -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Current implementation of grub_relocator_alloc_chunk_align() -does not allow allocation of the top byte. - -Assuming input args are: - max_addr = 0xfffff000; - size = 0x1000; - -And this is valid. But following overflow protection will -unnecessarily move max_addr one byte down (to 0xffffefff): - if (max_addr > ~size) - max_addr = ~size; - -~size + 1 will fix the situation. In addition, check size -for non zero to do not zero max_addr. - -Signed-off-by: Alexey Makhalov -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/lib/relocator.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/grub-core/lib/relocator.c b/grub-core/lib/relocator.c -index 5847aac36..f2c1944c2 100644 ---- a/grub-core/lib/relocator.c -+++ b/grub-core/lib/relocator.c -@@ -1386,8 +1386,8 @@ grub_relocator_alloc_chunk_align (struct grub_relocator *rel, - }; - grub_addr_t min_addr2 = 0, max_addr2; - -- if (max_addr > ~size) -- max_addr = ~size; -+ if (size && (max_addr > ~size)) -+ max_addr = ~size + 1; - - #ifdef GRUB_MACHINE_PCBIOS - if (min_addr < 0x1000) --- -2.26.2 - diff --git a/boot/grub2/0021-hfsplus-Fix-two-more-overflows.patch b/boot/grub2/0021-hfsplus-Fix-two-more-overflows.patch deleted file mode 100644 index 9ea678021f3..00000000000 --- a/boot/grub2/0021-hfsplus-Fix-two-more-overflows.patch +++ /dev/null @@ -1,61 +0,0 @@ -From feec993673d8e13fcf22fe2389ac29222b6daebd Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Sun, 19 Jul 2020 14:43:31 -0400 -Subject: [PATCH] hfsplus: Fix two more overflows -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Both node->size and node->namelen come from the supplied filesystem, -which may be user-supplied. We can't trust them for the math unless we -know they don't overflow. Making sure they go through grub_add() or -grub_calloc() first will give us that. - -Signed-off-by: Peter Jones -Reviewed-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/fs/hfsplus.c | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - -diff --git a/grub-core/fs/hfsplus.c b/grub-core/fs/hfsplus.c -index dae43becc..9c4e4c88c 100644 ---- a/grub-core/fs/hfsplus.c -+++ b/grub-core/fs/hfsplus.c -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - - GRUB_MOD_LICENSE ("GPLv3+"); - -@@ -475,8 +476,12 @@ grub_hfsplus_read_symlink (grub_fshelp_node_t node) - { - char *symlink; - grub_ssize_t numread; -+ grub_size_t sz = node->size; - -- symlink = grub_malloc (node->size + 1); -+ if (grub_add (sz, 1, &sz)) -+ return NULL; -+ -+ symlink = grub_malloc (sz); - if (!symlink) - return 0; - -@@ -715,8 +720,8 @@ list_nodes (void *record, void *hook_arg) - if (type == GRUB_FSHELP_UNKNOWN) - return 0; - -- filename = grub_malloc (grub_be_to_cpu16 (catkey->namelen) -- * GRUB_MAX_UTF8_PER_UTF16 + 1); -+ filename = grub_calloc (grub_be_to_cpu16 (catkey->namelen), -+ GRUB_MAX_UTF8_PER_UTF16 + 1); - if (! filename) - return 0; - --- -2.26.2 - diff --git a/boot/grub2/0022-lvm-Fix-two-more-potential-data-dependent-alloc-over.patch b/boot/grub2/0022-lvm-Fix-two-more-potential-data-dependent-alloc-over.patch deleted file mode 100644 index ad97ad0b1df..00000000000 --- a/boot/grub2/0022-lvm-Fix-two-more-potential-data-dependent-alloc-over.patch +++ /dev/null @@ -1,116 +0,0 @@ -From a1845e90fc19fb5e904091bad8a378f458798e4a Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Sun, 19 Jul 2020 15:48:20 -0400 -Subject: [PATCH] lvm: Fix two more potential data-dependent alloc - overflows -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -It appears to be possible to make a (possibly invalid) lvm PV with -a metadata size field that overflows our type when adding it to the -address we've allocated. Even if it doesn't, it may be possible to do so -with the math using the outcome of that as an operand. Check them both. - -Signed-off-by: Peter Jones -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/disk/lvm.c | 48 ++++++++++++++++++++++++++++++++++++-------- - 1 file changed, 40 insertions(+), 8 deletions(-) - -diff --git a/grub-core/disk/lvm.c b/grub-core/disk/lvm.c -index d1df640b3..139fafd47 100644 ---- a/grub-core/disk/lvm.c -+++ b/grub-core/disk/lvm.c -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - - #ifdef GRUB_UTIL - #include -@@ -102,10 +103,11 @@ grub_lvm_detect (grub_disk_t disk, - { - grub_err_t err; - grub_uint64_t mda_offset, mda_size; -+ grub_size_t ptr; - char buf[GRUB_LVM_LABEL_SIZE]; - char vg_id[GRUB_LVM_ID_STRLEN+1]; - char pv_id[GRUB_LVM_ID_STRLEN+1]; -- char *metadatabuf, *p, *q, *vgname; -+ char *metadatabuf, *p, *q, *mda_end, *vgname; - struct grub_lvm_label_header *lh = (struct grub_lvm_label_header *) buf; - struct grub_lvm_pv_header *pvh; - struct grub_lvm_disk_locn *dlocn; -@@ -205,19 +207,31 @@ grub_lvm_detect (grub_disk_t disk, - grub_le_to_cpu64 (rlocn->size) - - grub_le_to_cpu64 (mdah->size)); - } -- p = q = metadatabuf + grub_le_to_cpu64 (rlocn->offset); - -- while (*q != ' ' && q < metadatabuf + mda_size) -- q++; -- -- if (q == metadatabuf + mda_size) -+ if (grub_add ((grub_size_t)metadatabuf, -+ (grub_size_t)grub_le_to_cpu64 (rlocn->offset), -+ &ptr)) - { -+ error_parsing_metadata: - #ifdef GRUB_UTIL - grub_util_info ("error parsing metadata"); - #endif - goto fail2; - } - -+ p = q = (char *)ptr; -+ -+ if (grub_add ((grub_size_t)metadatabuf, (grub_size_t)mda_size, &ptr)) -+ goto error_parsing_metadata; -+ -+ mda_end = (char *)ptr; -+ -+ while (*q != ' ' && q < mda_end) -+ q++; -+ -+ if (q == mda_end) -+ goto error_parsing_metadata; -+ - vgname_len = q - p; - vgname = grub_malloc (vgname_len + 1); - if (!vgname) -@@ -367,8 +381,26 @@ grub_lvm_detect (grub_disk_t disk, - { - const char *iptr; - char *optr; -- lv->fullname = grub_malloc (sizeof ("lvm/") - 1 + 2 * vgname_len -- + 1 + 2 * s + 1); -+ -+ /* -+ * This is kind of hard to read with our safe (but rather -+ * baroque) math primatives, but it boils down to: -+ * -+ * sz0 = vgname_len * 2 + 1 + -+ * s * 2 + 1 + -+ * sizeof ("lvm/") - 1; -+ */ -+ grub_size_t sz0 = vgname_len, sz1 = s; -+ -+ if (grub_mul (sz0, 2, &sz0) || -+ grub_add (sz0, 1, &sz0) || -+ grub_mul (sz1, 2, &sz1) || -+ grub_add (sz1, 1, &sz1) || -+ grub_add (sz0, sz1, &sz0) || -+ grub_add (sz0, sizeof ("lvm/") - 1, &sz0)) -+ goto lvs_fail; -+ -+ lv->fullname = grub_malloc (sz0); - if (!lv->fullname) - goto lvs_fail; - --- -2.26.2 - diff --git a/boot/grub2/0023-emu-Make-grub_free-NULL-safe.patch b/boot/grub2/0023-emu-Make-grub_free-NULL-safe.patch deleted file mode 100644 index f30e56a8b2f..00000000000 --- a/boot/grub2/0023-emu-Make-grub_free-NULL-safe.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 320e86747a32e4d46d24ee4b64493741c161da50 Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Sun, 19 Jul 2020 16:08:08 -0400 -Subject: [PATCH] emu: Make grub_free(NULL) safe -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The grub_free() implementation in grub-core/kern/mm.c safely handles -NULL pointers, and code at many places depends on this. We don't know -that the same is true on all host OSes, so we need to handle the same -behavior in grub-emu's implementation. - -Signed-off-by: Peter Jones -Reviewed-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/kern/emu/mm.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/grub-core/kern/emu/mm.c b/grub-core/kern/emu/mm.c -index 145b01d37..4d1046a21 100644 ---- a/grub-core/kern/emu/mm.c -+++ b/grub-core/kern/emu/mm.c -@@ -60,7 +60,8 @@ grub_zalloc (grub_size_t size) - void - grub_free (void *ptr) - { -- free (ptr); -+ if (ptr) -+ free (ptr); - } - - void * --- -2.26.2 - diff --git a/boot/grub2/0024-efi-Fix-some-malformed-device-path-arithmetic-errors.patch b/boot/grub2/0024-efi-Fix-some-malformed-device-path-arithmetic-errors.patch deleted file mode 100644 index 48b5b8912b9..00000000000 --- a/boot/grub2/0024-efi-Fix-some-malformed-device-path-arithmetic-errors.patch +++ /dev/null @@ -1,239 +0,0 @@ -From c330aa099a38bc5c4d3066954fe35767cc06adb1 Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Sun, 19 Jul 2020 16:53:27 -0400 -Subject: [PATCH] efi: Fix some malformed device path arithmetic errors -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Several places we take the length of a device path and subtract 4 from -it, without ever checking that it's >= 4. There are also cases where -this kind of malformation will result in unpredictable iteration, -including treating the length from one dp node as the type in the next -node. These are all errors, no matter where the data comes from. - -This patch adds a checking macro, GRUB_EFI_DEVICE_PATH_VALID(), which -can be used in several places, and makes GRUB_EFI_NEXT_DEVICE_PATH() -return NULL and GRUB_EFI_END_ENTIRE_DEVICE_PATH() evaluate as true when -the length is too small. Additionally, it makes several places in the -code check for and return errors in these cases. - -Signed-off-by: Peter Jones -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/kern/efi/efi.c | 64 +++++++++++++++++++++++++----- - grub-core/loader/efi/chainloader.c | 13 +++++- - grub-core/loader/i386/xnu.c | 9 +++-- - include/grub/efi/api.h | 14 ++++--- - 4 files changed, 79 insertions(+), 21 deletions(-) - -diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c -index dc31caa21..c97969a65 100644 ---- a/grub-core/kern/efi/efi.c -+++ b/grub-core/kern/efi/efi.c -@@ -332,7 +332,7 @@ grub_efi_get_filename (grub_efi_device_path_t *dp0) - - dp = dp0; - -- while (1) -+ while (dp) - { - grub_efi_uint8_t type = GRUB_EFI_DEVICE_PATH_TYPE (dp); - grub_efi_uint8_t subtype = GRUB_EFI_DEVICE_PATH_SUBTYPE (dp); -@@ -342,9 +342,15 @@ grub_efi_get_filename (grub_efi_device_path_t *dp0) - if (type == GRUB_EFI_MEDIA_DEVICE_PATH_TYPE - && subtype == GRUB_EFI_FILE_PATH_DEVICE_PATH_SUBTYPE) - { -- grub_efi_uint16_t len; -- len = ((GRUB_EFI_DEVICE_PATH_LENGTH (dp) - 4) -- / sizeof (grub_efi_char16_t)); -+ grub_efi_uint16_t len = GRUB_EFI_DEVICE_PATH_LENGTH (dp); -+ -+ if (len < 4) -+ { -+ grub_error (GRUB_ERR_OUT_OF_RANGE, -+ "malformed EFI Device Path node has length=%d", len); -+ return NULL; -+ } -+ len = (len - 4) / sizeof (grub_efi_char16_t); - filesize += GRUB_MAX_UTF8_PER_UTF16 * len + 2; - } - -@@ -360,7 +366,7 @@ grub_efi_get_filename (grub_efi_device_path_t *dp0) - if (!name) - return NULL; - -- while (1) -+ while (dp) - { - grub_efi_uint8_t type = GRUB_EFI_DEVICE_PATH_TYPE (dp); - grub_efi_uint8_t subtype = GRUB_EFI_DEVICE_PATH_SUBTYPE (dp); -@@ -376,8 +382,15 @@ grub_efi_get_filename (grub_efi_device_path_t *dp0) - - *p++ = '/'; - -- len = ((GRUB_EFI_DEVICE_PATH_LENGTH (dp) - 4) -- / sizeof (grub_efi_char16_t)); -+ len = GRUB_EFI_DEVICE_PATH_LENGTH (dp); -+ if (len < 4) -+ { -+ grub_error (GRUB_ERR_OUT_OF_RANGE, -+ "malformed EFI Device Path node has length=%d", len); -+ return NULL; -+ } -+ -+ len = (len - 4) / sizeof (grub_efi_char16_t); - fp = (grub_efi_file_path_device_path_t *) dp; - /* According to EFI spec Path Name is NULL terminated */ - while (len > 0 && fp->path_name[len - 1] == 0) -@@ -452,7 +465,26 @@ grub_efi_duplicate_device_path (const grub_efi_device_path_t *dp) - ; - p = GRUB_EFI_NEXT_DEVICE_PATH (p)) - { -- total_size += GRUB_EFI_DEVICE_PATH_LENGTH (p); -+ grub_size_t len = GRUB_EFI_DEVICE_PATH_LENGTH (p); -+ -+ /* -+ * In the event that we find a node that's completely garbage, for -+ * example if we get to 0x7f 0x01 0x02 0x00 ... (EndInstance with a size -+ * of 2), GRUB_EFI_END_ENTIRE_DEVICE_PATH() will be true and -+ * GRUB_EFI_NEXT_DEVICE_PATH() will return NULL, so we won't continue, -+ * and neither should our consumers, but there won't be any error raised -+ * even though the device path is junk. -+ * -+ * This keeps us from passing junk down back to our caller. -+ */ -+ if (len < 4) -+ { -+ grub_error (GRUB_ERR_OUT_OF_RANGE, -+ "malformed EFI Device Path node has length=%d", len); -+ return NULL; -+ } -+ -+ total_size += len; - if (GRUB_EFI_END_ENTIRE_DEVICE_PATH (p)) - break; - } -@@ -497,7 +529,7 @@ dump_vendor_path (const char *type, grub_efi_vendor_device_path_t *vendor) - void - grub_efi_print_device_path (grub_efi_device_path_t *dp) - { -- while (1) -+ while (GRUB_EFI_DEVICE_PATH_VALID (dp)) - { - grub_efi_uint8_t type = GRUB_EFI_DEVICE_PATH_TYPE (dp); - grub_efi_uint8_t subtype = GRUB_EFI_DEVICE_PATH_SUBTYPE (dp); -@@ -909,7 +941,10 @@ grub_efi_compare_device_paths (const grub_efi_device_path_t *dp1, - /* Return non-zero. */ - return 1; - -- while (1) -+ if (dp1 == dp2) -+ return 0; -+ -+ while (GRUB_EFI_DEVICE_PATH_VALID (dp1) && GRUB_EFI_DEVICE_PATH_VALID (dp2)) - { - grub_efi_uint8_t type1, type2; - grub_efi_uint8_t subtype1, subtype2; -@@ -945,5 +980,14 @@ grub_efi_compare_device_paths (const grub_efi_device_path_t *dp1, - dp2 = (grub_efi_device_path_t *) ((char *) dp2 + len2); - } - -+ /* -+ * There's no "right" answer here, but we probably don't want to call a valid -+ * dp and an invalid dp equal, so pick one way or the other. -+ */ -+ if (GRUB_EFI_DEVICE_PATH_VALID (dp1) && !GRUB_EFI_DEVICE_PATH_VALID (dp2)) -+ return 1; -+ else if (!GRUB_EFI_DEVICE_PATH_VALID (dp1) && GRUB_EFI_DEVICE_PATH_VALID (dp2)) -+ return -1; -+ - return 0; - } -diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c -index daf8c6b54..a8d7b9155 100644 ---- a/grub-core/loader/efi/chainloader.c -+++ b/grub-core/loader/efi/chainloader.c -@@ -156,9 +156,18 @@ make_file_path (grub_efi_device_path_t *dp, const char *filename) - - size = 0; - d = dp; -- while (1) -+ while (d) - { -- size += GRUB_EFI_DEVICE_PATH_LENGTH (d); -+ grub_size_t len = GRUB_EFI_DEVICE_PATH_LENGTH (d); -+ -+ if (len < 4) -+ { -+ grub_error (GRUB_ERR_OUT_OF_RANGE, -+ "malformed EFI Device Path node has length=%d", len); -+ return NULL; -+ } -+ -+ size += len; - if ((GRUB_EFI_END_ENTIRE_DEVICE_PATH (d))) - break; - d = GRUB_EFI_NEXT_DEVICE_PATH (d); -diff --git a/grub-core/loader/i386/xnu.c b/grub-core/loader/i386/xnu.c -index e9e119259..a70093607 100644 ---- a/grub-core/loader/i386/xnu.c -+++ b/grub-core/loader/i386/xnu.c -@@ -515,14 +515,15 @@ grub_cmd_devprop_load (grub_command_t cmd __attribute__ ((unused)), - - devhead = buf; - buf = devhead + 1; -- dpstart = buf; -+ dp = dpstart = buf; - -- do -+ while (GRUB_EFI_DEVICE_PATH_VALID (dp) && buf < bufend) - { -- dp = buf; - buf = (char *) buf + GRUB_EFI_DEVICE_PATH_LENGTH (dp); -+ if (GRUB_EFI_END_ENTIRE_DEVICE_PATH (dp)) -+ break; -+ dp = buf; - } -- while (!GRUB_EFI_END_ENTIRE_DEVICE_PATH (dp) && buf < bufend); - - dev = grub_xnu_devprop_add_device (dpstart, (char *) buf - - (char *) dpstart); -diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h -index addcbfa8f..cf1355a8c 100644 ---- a/include/grub/efi/api.h -+++ b/include/grub/efi/api.h -@@ -625,6 +625,7 @@ typedef struct grub_efi_device_path grub_efi_device_path_protocol_t; - #define GRUB_EFI_DEVICE_PATH_TYPE(dp) ((dp)->type & 0x7f) - #define GRUB_EFI_DEVICE_PATH_SUBTYPE(dp) ((dp)->subtype) - #define GRUB_EFI_DEVICE_PATH_LENGTH(dp) ((dp)->length) -+#define GRUB_EFI_DEVICE_PATH_VALID(dp) ((dp) != NULL && GRUB_EFI_DEVICE_PATH_LENGTH (dp) >= 4) - - /* The End of Device Path nodes. */ - #define GRUB_EFI_END_DEVICE_PATH_TYPE (0xff & 0x7f) -@@ -633,13 +634,16 @@ typedef struct grub_efi_device_path grub_efi_device_path_protocol_t; - #define GRUB_EFI_END_THIS_DEVICE_PATH_SUBTYPE 0x01 - - #define GRUB_EFI_END_ENTIRE_DEVICE_PATH(dp) \ -- (GRUB_EFI_DEVICE_PATH_TYPE (dp) == GRUB_EFI_END_DEVICE_PATH_TYPE \ -- && (GRUB_EFI_DEVICE_PATH_SUBTYPE (dp) \ -- == GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE)) -+ (!GRUB_EFI_DEVICE_PATH_VALID (dp) || \ -+ (GRUB_EFI_DEVICE_PATH_TYPE (dp) == GRUB_EFI_END_DEVICE_PATH_TYPE \ -+ && (GRUB_EFI_DEVICE_PATH_SUBTYPE (dp) \ -+ == GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE))) - - #define GRUB_EFI_NEXT_DEVICE_PATH(dp) \ -- ((grub_efi_device_path_t *) ((char *) (dp) \ -- + GRUB_EFI_DEVICE_PATH_LENGTH (dp))) -+ (GRUB_EFI_DEVICE_PATH_VALID (dp) \ -+ ? ((grub_efi_device_path_t *) \ -+ ((char *) (dp) + GRUB_EFI_DEVICE_PATH_LENGTH (dp))) \ -+ : NULL) - - /* Hardware Device Path. */ - #define GRUB_EFI_HARDWARE_DEVICE_PATH_TYPE 1 --- -2.26.2 - diff --git a/boot/grub2/0025-efi-chainloader-Propagate-errors-from-copy_file_path.patch b/boot/grub2/0025-efi-chainloader-Propagate-errors-from-copy_file_path.patch deleted file mode 100644 index eb3e0f0e208..00000000000 --- a/boot/grub2/0025-efi-chainloader-Propagate-errors-from-copy_file_path.patch +++ /dev/null @@ -1,78 +0,0 @@ -From fb55bc37dd510911df4eaf649da939f5fafdc7ce Mon Sep 17 00:00:00 2001 -From: Daniel Kiper -Date: Wed, 29 Jul 2020 13:38:31 +0200 -Subject: [PATCH] efi/chainloader: Propagate errors from copy_file_path() -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Without any error propagated to the caller, make_file_path() -would then try to advance the invalid device path node with -GRUB_EFI_NEXT_DEVICE_PATH(), which would fail, returning a NULL -pointer that would subsequently be dereferenced. Hence, propagate -errors from copy_file_path(). - -Signed-off-by: Chris Coulson -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/loader/efi/chainloader.c | 19 +++++++++++++------ - 1 file changed, 13 insertions(+), 6 deletions(-) - -diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c -index a8d7b9155..7b31c3fb9 100644 ---- a/grub-core/loader/efi/chainloader.c -+++ b/grub-core/loader/efi/chainloader.c -@@ -106,7 +106,7 @@ grub_chainloader_boot (void) - return grub_errno; - } - --static void -+static grub_err_t - copy_file_path (grub_efi_file_path_device_path_t *fp, - const char *str, grub_efi_uint16_t len) - { -@@ -118,7 +118,7 @@ copy_file_path (grub_efi_file_path_device_path_t *fp, - - path_name = grub_calloc (len, GRUB_MAX_UTF16_PER_UTF8 * sizeof (*path_name)); - if (!path_name) -- return; -+ return grub_error (GRUB_ERR_OUT_OF_MEMORY, "failed to allocate path buffer"); - - size = grub_utf8_to_utf16 (path_name, len * GRUB_MAX_UTF16_PER_UTF8, - (const grub_uint8_t *) str, len, 0); -@@ -131,6 +131,7 @@ copy_file_path (grub_efi_file_path_device_path_t *fp, - fp->path_name[size++] = '\0'; - fp->header.length = size * sizeof (grub_efi_char16_t) + sizeof (*fp); - grub_free (path_name); -+ return GRUB_ERR_NONE; - } - - static grub_efi_device_path_t * -@@ -189,13 +190,19 @@ make_file_path (grub_efi_device_path_t *dp, const char *filename) - d = (grub_efi_device_path_t *) ((char *) file_path - + ((char *) d - (char *) dp)); - grub_efi_print_device_path (d); -- copy_file_path ((grub_efi_file_path_device_path_t *) d, -- dir_start, dir_end - dir_start); -+ if (copy_file_path ((grub_efi_file_path_device_path_t *) d, -+ dir_start, dir_end - dir_start) != GRUB_ERR_NONE) -+ { -+ fail: -+ grub_free (file_path); -+ return 0; -+ } - - /* Fill the file path for the file. */ - d = GRUB_EFI_NEXT_DEVICE_PATH (d); -- copy_file_path ((grub_efi_file_path_device_path_t *) d, -- dir_end + 1, grub_strlen (dir_end + 1)); -+ if (copy_file_path ((grub_efi_file_path_device_path_t *) d, -+ dir_end + 1, grub_strlen (dir_end + 1)) != GRUB_ERR_NONE) -+ goto fail; - - /* Fill the end of device path nodes. */ - d = GRUB_EFI_NEXT_DEVICE_PATH (d); --- -2.26.2 - diff --git a/boot/grub2/0026-efi-Fix-use-after-free-in-halt-reboot-path.patch b/boot/grub2/0026-efi-Fix-use-after-free-in-halt-reboot-path.patch deleted file mode 100644 index 75dd05d48fa..00000000000 --- a/boot/grub2/0026-efi-Fix-use-after-free-in-halt-reboot-path.patch +++ /dev/null @@ -1,183 +0,0 @@ -From 8a6d6299efcffd14c1130942195e6c0d9b50cacd Mon Sep 17 00:00:00 2001 -From: Alexey Makhalov -Date: Mon, 20 Jul 2020 23:03:05 +0000 -Subject: [PATCH] efi: Fix use-after-free in halt/reboot path -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -commit 92bfc33db984 ("efi: Free malloc regions on exit") -introduced memory freeing in grub_efi_fini(), which is -used not only by exit path but by halt/reboot one as well. -As result of memory freeing, code and data regions used by -modules, such as halt, reboot, acpi (used by halt) also got -freed. After return to module code, CPU executes, filled -by UEFI firmware (tested with edk2), 0xAFAFAFAF pattern as -a code. Which leads to #UD exception later. - -grub> halt -!!!! X64 Exception Type - 06(#UD - Invalid Opcode) CPU Apic ID - 00000000 !!!! -RIP - 0000000003F4EC28, CS - 0000000000000038, RFLAGS - 0000000000200246 -RAX - 0000000000000000, RCX - 00000000061DA188, RDX - 0A74C0854DC35D41 -RBX - 0000000003E10E08, RSP - 0000000007F0F860, RBP - 0000000000000000 -RSI - 00000000064DB768, RDI - 000000000832C5C3 -R8 - 0000000000000002, R9 - 0000000000000000, R10 - 00000000061E2E52 -R11 - 0000000000000020, R12 - 0000000003EE5C1F, R13 - 00000000061E0FF4 -R14 - 0000000003E10D80, R15 - 00000000061E2F60 -DS - 0000000000000030, ES - 0000000000000030, FS - 0000000000000030 -GS - 0000000000000030, SS - 0000000000000030 -CR0 - 0000000080010033, CR2 - 0000000000000000, CR3 - 0000000007C01000 -CR4 - 0000000000000668, CR8 - 0000000000000000 -DR0 - 0000000000000000, DR1 - 0000000000000000, DR2 - 0000000000000000 -DR3 - 0000000000000000, DR6 - 00000000FFFF0FF0, DR7 - 0000000000000400 -GDTR - 00000000079EEA98 0000000000000047, LDTR - 0000000000000000 -IDTR - 0000000007598018 0000000000000FFF, TR - 0000000000000000 -FXSAVE_STATE - 0000000007F0F4C0 - -Proposal here is to continue to free allocated memory for -exit boot services path but keep it for halt/reboot path -as it won't be much security concern here. -Introduced GRUB_LOADER_FLAG_EFI_KEEP_ALLOCATED_MEMORY -loader flag to be used by efi halt/reboot path. - -Signed-off-by: Alexey Makhalov -Reviewed-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/kern/arm/efi/init.c | 3 +++ - grub-core/kern/arm64/efi/init.c | 3 +++ - grub-core/kern/efi/efi.c | 3 ++- - grub-core/kern/efi/init.c | 1 - - grub-core/kern/i386/efi/init.c | 9 +++++++-- - grub-core/kern/ia64/efi/init.c | 9 +++++++-- - grub-core/kern/riscv/efi/init.c | 3 +++ - grub-core/lib/efi/halt.c | 3 ++- - include/grub/loader.h | 1 + - 9 files changed, 28 insertions(+), 7 deletions(-) - -diff --git a/grub-core/kern/arm/efi/init.c b/grub-core/kern/arm/efi/init.c -index 06df60e2f..40c3b467f 100644 ---- a/grub-core/kern/arm/efi/init.c -+++ b/grub-core/kern/arm/efi/init.c -@@ -71,4 +71,7 @@ grub_machine_fini (int flags) - efi_call_1 (b->close_event, tmr_evt); - - grub_efi_fini (); -+ -+ if (!(flags & GRUB_LOADER_FLAG_EFI_KEEP_ALLOCATED_MEMORY)) -+ grub_efi_memory_fini (); - } -diff --git a/grub-core/kern/arm64/efi/init.c b/grub-core/kern/arm64/efi/init.c -index 6224999ec..5010caefd 100644 ---- a/grub-core/kern/arm64/efi/init.c -+++ b/grub-core/kern/arm64/efi/init.c -@@ -57,4 +57,7 @@ grub_machine_fini (int flags) - return; - - grub_efi_fini (); -+ -+ if (!(flags & GRUB_LOADER_FLAG_EFI_KEEP_ALLOCATED_MEMORY)) -+ grub_efi_memory_fini (); - } -diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c -index c97969a65..9cfd88d77 100644 ---- a/grub-core/kern/efi/efi.c -+++ b/grub-core/kern/efi/efi.c -@@ -157,7 +157,8 @@ grub_efi_get_loaded_image (grub_efi_handle_t image_handle) - void - grub_reboot (void) - { -- grub_machine_fini (GRUB_LOADER_FLAG_NORETURN); -+ grub_machine_fini (GRUB_LOADER_FLAG_NORETURN | -+ GRUB_LOADER_FLAG_EFI_KEEP_ALLOCATED_MEMORY); - efi_call_4 (grub_efi_system_table->runtime_services->reset_system, - GRUB_EFI_RESET_COLD, GRUB_EFI_SUCCESS, 0, NULL); - for (;;) ; -diff --git a/grub-core/kern/efi/init.c b/grub-core/kern/efi/init.c -index 3dfdf2d22..2c31847bf 100644 ---- a/grub-core/kern/efi/init.c -+++ b/grub-core/kern/efi/init.c -@@ -80,5 +80,4 @@ grub_efi_fini (void) - { - grub_efidisk_fini (); - grub_console_fini (); -- grub_efi_memory_fini (); - } -diff --git a/grub-core/kern/i386/efi/init.c b/grub-core/kern/i386/efi/init.c -index da499aba0..deb2eacd8 100644 ---- a/grub-core/kern/i386/efi/init.c -+++ b/grub-core/kern/i386/efi/init.c -@@ -39,6 +39,11 @@ grub_machine_init (void) - void - grub_machine_fini (int flags) - { -- if (flags & GRUB_LOADER_FLAG_NORETURN) -- grub_efi_fini (); -+ if (!(flags & GRUB_LOADER_FLAG_NORETURN)) -+ return; -+ -+ grub_efi_fini (); -+ -+ if (!(flags & GRUB_LOADER_FLAG_EFI_KEEP_ALLOCATED_MEMORY)) -+ grub_efi_memory_fini (); - } -diff --git a/grub-core/kern/ia64/efi/init.c b/grub-core/kern/ia64/efi/init.c -index b5ecbd091..f1965571b 100644 ---- a/grub-core/kern/ia64/efi/init.c -+++ b/grub-core/kern/ia64/efi/init.c -@@ -70,6 +70,11 @@ grub_machine_init (void) - void - grub_machine_fini (int flags) - { -- if (flags & GRUB_LOADER_FLAG_NORETURN) -- grub_efi_fini (); -+ if (!(flags & GRUB_LOADER_FLAG_NORETURN)) -+ return; -+ -+ grub_efi_fini (); -+ -+ if (!(flags & GRUB_LOADER_FLAG_EFI_KEEP_ALLOCATED_MEMORY)) -+ grub_efi_memory_fini (); - } -diff --git a/grub-core/kern/riscv/efi/init.c b/grub-core/kern/riscv/efi/init.c -index 7eb1969d0..38795fe67 100644 ---- a/grub-core/kern/riscv/efi/init.c -+++ b/grub-core/kern/riscv/efi/init.c -@@ -73,4 +73,7 @@ grub_machine_fini (int flags) - return; - - grub_efi_fini (); -+ -+ if (!(flags & GRUB_LOADER_FLAG_EFI_KEEP_ALLOCATED_MEMORY)) -+ grub_efi_memory_fini (); - } -diff --git a/grub-core/lib/efi/halt.c b/grub-core/lib/efi/halt.c -index 5859f0498..29d413641 100644 ---- a/grub-core/lib/efi/halt.c -+++ b/grub-core/lib/efi/halt.c -@@ -28,7 +28,8 @@ - void - grub_halt (void) - { -- grub_machine_fini (GRUB_LOADER_FLAG_NORETURN); -+ grub_machine_fini (GRUB_LOADER_FLAG_NORETURN | -+ GRUB_LOADER_FLAG_EFI_KEEP_ALLOCATED_MEMORY); - #if !defined(__ia64__) && !defined(__arm__) && !defined(__aarch64__) && \ - !defined(__riscv) - grub_acpi_halt (); -diff --git a/include/grub/loader.h b/include/grub/loader.h -index 7f82a499f..b20864282 100644 ---- a/include/grub/loader.h -+++ b/include/grub/loader.h -@@ -33,6 +33,7 @@ enum - { - GRUB_LOADER_FLAG_NORETURN = 1, - GRUB_LOADER_FLAG_PXE_NOT_UNLOAD = 2, -+ GRUB_LOADER_FLAG_EFI_KEEP_ALLOCATED_MEMORY = 4, - }; - - void EXPORT_FUNC (grub_loader_set) (grub_err_t (*boot) (void), --- -2.26.2 - diff --git a/boot/grub2/0027-loader-linux-Avoid-overflow-on-initrd-size-calculati.patch b/boot/grub2/0027-loader-linux-Avoid-overflow-on-initrd-size-calculati.patch deleted file mode 100644 index 823f205568b..00000000000 --- a/boot/grub2/0027-loader-linux-Avoid-overflow-on-initrd-size-calculati.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a2a7464e9f10a677d6f91e1c4fa527d084c22e7c Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Fri, 24 Jul 2020 13:57:27 -0400 -Subject: [PATCH] loader/linux: Avoid overflow on initrd size calculation -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Peter Jones -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/loader/linux.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/grub-core/loader/linux.c b/grub-core/loader/linux.c -index 471b214d6..4cd8c20c7 100644 ---- a/grub-core/loader/linux.c -+++ b/grub-core/loader/linux.c -@@ -151,8 +151,7 @@ grub_initrd_init (int argc, char *argv[], - initrd_ctx->nfiles = 0; - initrd_ctx->components = 0; - -- initrd_ctx->components = grub_zalloc (argc -- * sizeof (initrd_ctx->components[0])); -+ initrd_ctx->components = grub_calloc (argc, sizeof (initrd_ctx->components[0])); - if (!initrd_ctx->components) - return grub_errno; - --- -2.26.2 - diff --git a/boot/grub2/0028-linux-Fix-integer-overflows-in-initrd-size-handling.patch b/boot/grub2/0028-linux-Fix-integer-overflows-in-initrd-size-handling.patch deleted file mode 100644 index bf6590d8eb3..00000000000 --- a/boot/grub2/0028-linux-Fix-integer-overflows-in-initrd-size-handling.patch +++ /dev/null @@ -1,173 +0,0 @@ -From 0367e7d1b9bac3a78608a672bf6e4ace6a28b964 Mon Sep 17 00:00:00 2001 -From: Colin Watson -Date: Sat, 25 Jul 2020 12:15:37 +0100 -Subject: [PATCH] linux: Fix integer overflows in initrd size handling -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -These could be triggered by a crafted filesystem with very large files. - -Fixes: CVE-2020-15707 - -Signed-off-by: Colin Watson -Reviewed-by: Jan Setje-Eilers -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/loader/linux.c | 74 +++++++++++++++++++++++++++++----------- - 1 file changed, 54 insertions(+), 20 deletions(-) - -diff --git a/grub-core/loader/linux.c b/grub-core/loader/linux.c -index 4cd8c20c7..3fe390f17 100644 ---- a/grub-core/loader/linux.c -+++ b/grub-core/loader/linux.c -@@ -4,6 +4,7 @@ - #include - #include - #include -+#include - - struct newc_head - { -@@ -98,13 +99,13 @@ free_dir (struct dir *root) - grub_free (root); - } - --static grub_size_t -+static grub_err_t - insert_dir (const char *name, struct dir **root, -- grub_uint8_t *ptr) -+ grub_uint8_t *ptr, grub_size_t *size) - { - struct dir *cur, **head = root; - const char *cb, *ce = name; -- grub_size_t size = 0; -+ *size = 0; - while (1) - { - for (cb = ce; *cb == '/'; cb++); -@@ -130,14 +131,22 @@ insert_dir (const char *name, struct dir **root, - ptr = make_header (ptr, name, ce - name, - 040777, 0); - } -- size += ALIGN_UP ((ce - (char *) name) -- + sizeof (struct newc_head), 4); -+ if (grub_add (*size, -+ ALIGN_UP ((ce - (char *) name) -+ + sizeof (struct newc_head), 4), -+ size)) -+ { -+ grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow is detected")); -+ grub_free (n->name); -+ grub_free (n); -+ return grub_errno; -+ } - *head = n; - cur = n; - } - root = &cur->next; - } -- return size; -+ return GRUB_ERR_NONE; - } - - grub_err_t -@@ -172,26 +181,33 @@ grub_initrd_init (int argc, char *argv[], - eptr = grub_strchr (ptr, ':'); - if (eptr) - { -+ grub_size_t dir_size, name_len; -+ - initrd_ctx->components[i].newc_name = grub_strndup (ptr, eptr - ptr); -- if (!initrd_ctx->components[i].newc_name) -+ if (!initrd_ctx->components[i].newc_name || -+ insert_dir (initrd_ctx->components[i].newc_name, &root, 0, -+ &dir_size)) - { - grub_initrd_close (initrd_ctx); - return grub_errno; - } -- initrd_ctx->size -- += ALIGN_UP (sizeof (struct newc_head) -- + grub_strlen (initrd_ctx->components[i].newc_name), -- 4); -- initrd_ctx->size += insert_dir (initrd_ctx->components[i].newc_name, -- &root, 0); -+ name_len = grub_strlen (initrd_ctx->components[i].newc_name); -+ if (grub_add (initrd_ctx->size, -+ ALIGN_UP (sizeof (struct newc_head) + name_len, 4), -+ &initrd_ctx->size) || -+ grub_add (initrd_ctx->size, dir_size, &initrd_ctx->size)) -+ goto overflow; - newc = 1; - fname = eptr + 1; - } - } - else if (newc) - { -- initrd_ctx->size += ALIGN_UP (sizeof (struct newc_head) -- + sizeof ("TRAILER!!!") - 1, 4); -+ if (grub_add (initrd_ctx->size, -+ ALIGN_UP (sizeof (struct newc_head) -+ + sizeof ("TRAILER!!!") - 1, 4), -+ &initrd_ctx->size)) -+ goto overflow; - free_dir (root); - root = 0; - newc = 0; -@@ -207,19 +223,29 @@ grub_initrd_init (int argc, char *argv[], - initrd_ctx->nfiles++; - initrd_ctx->components[i].size - = grub_file_size (initrd_ctx->components[i].file); -- initrd_ctx->size += initrd_ctx->components[i].size; -+ if (grub_add (initrd_ctx->size, initrd_ctx->components[i].size, -+ &initrd_ctx->size)) -+ goto overflow; - } - - if (newc) - { - initrd_ctx->size = ALIGN_UP (initrd_ctx->size, 4); -- initrd_ctx->size += ALIGN_UP (sizeof (struct newc_head) -- + sizeof ("TRAILER!!!") - 1, 4); -+ if (grub_add (initrd_ctx->size, -+ ALIGN_UP (sizeof (struct newc_head) -+ + sizeof ("TRAILER!!!") - 1, 4), -+ &initrd_ctx->size)) -+ goto overflow; - free_dir (root); - root = 0; - } - - return GRUB_ERR_NONE; -+ -+ overflow: -+ free_dir (root); -+ grub_initrd_close (initrd_ctx); -+ return grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow is detected")); - } - - grub_size_t -@@ -260,8 +286,16 @@ grub_initrd_load (struct grub_linux_initrd_context *initrd_ctx, - - if (initrd_ctx->components[i].newc_name) - { -- ptr += insert_dir (initrd_ctx->components[i].newc_name, -- &root, ptr); -+ grub_size_t dir_size; -+ -+ if (insert_dir (initrd_ctx->components[i].newc_name, &root, ptr, -+ &dir_size)) -+ { -+ free_dir (root); -+ grub_initrd_close (initrd_ctx); -+ return grub_errno; -+ } -+ ptr += dir_size; - ptr = make_header (ptr, initrd_ctx->components[i].newc_name, - grub_strlen (initrd_ctx->components[i].newc_name), - 0100777, --- -2.26.2 - diff --git a/boot/grub2/0029-efi-Make-shim_lock-GUID-and-protocol-type-public.patch b/boot/grub2/0029-efi-Make-shim_lock-GUID-and-protocol-type-public.patch deleted file mode 100644 index ec1f62360a7..00000000000 --- a/boot/grub2/0029-efi-Make-shim_lock-GUID-and-protocol-type-public.patch +++ /dev/null @@ -1,97 +0,0 @@ -From f76a27996c34900f2c369a8a0d6ac72ae2faa988 Mon Sep 17 00:00:00 2001 -From: Daniel Kiper -Date: Thu, 3 Dec 2020 16:01:45 +0100 -Subject: [PATCH] efi: Make shim_lock GUID and protocol type public - -The GUID will be used to properly detect and report UEFI Secure Boot -status to the x86 Linux kernel. The functionality will be added by -subsequent patches. The shim_lock protocol type is made public for -completeness. - -Additionally, fix formatting of four preceding GUIDs. - -Signed-off-by: Daniel Kiper -Signed-off-by: Marco A Benatto -Signed-off-by: Javier Martinez Canillas -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/commands/efi/shim_lock.c | 12 ------------ - include/grub/efi/api.h | 19 +++++++++++++++---- - 2 files changed, 15 insertions(+), 16 deletions(-) - -diff --git a/grub-core/commands/efi/shim_lock.c b/grub-core/commands/efi/shim_lock.c -index 764098c..d8f52d7 100644 ---- a/grub-core/commands/efi/shim_lock.c -+++ b/grub-core/commands/efi/shim_lock.c -@@ -27,18 +27,6 @@ - - GRUB_MOD_LICENSE ("GPLv3+"); - --#define GRUB_EFI_SHIM_LOCK_GUID \ -- { 0x605dab50, 0xe046, 0x4300, \ -- { 0xab, 0xb6, 0x3d, 0xd8, 0x10, 0xdd, 0x8b, 0x23 } \ -- } -- --struct grub_efi_shim_lock_protocol --{ -- grub_efi_status_t -- (*verify) (void *buffer, grub_uint32_t size); --}; --typedef struct grub_efi_shim_lock_protocol grub_efi_shim_lock_protocol_t; -- - static grub_efi_guid_t shim_lock_guid = GRUB_EFI_SHIM_LOCK_GUID; - static grub_efi_shim_lock_protocol_t *sl; - -diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h -index cf1355a..13e5715 100644 ---- a/include/grub/efi/api.h -+++ b/include/grub/efi/api.h -@@ -316,22 +316,27 @@ - - #define GRUB_EFI_SAL_TABLE_GUID \ - { 0xeb9d2d32, 0x2d88, 0x11d3, \ -- { 0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \ -+ { 0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \ - } - - #define GRUB_EFI_HCDP_TABLE_GUID \ - { 0xf951938d, 0x620b, 0x42ef, \ -- { 0x82, 0x79, 0xa8, 0x4b, 0x79, 0x61, 0x78, 0x98 } \ -+ { 0x82, 0x79, 0xa8, 0x4b, 0x79, 0x61, 0x78, 0x98 } \ - } - - #define GRUB_EFI_DEVICE_TREE_GUID \ - { 0xb1b621d5, 0xf19c, 0x41a5, \ -- { 0x83, 0x0b, 0xd9, 0x15, 0x2c, 0x69, 0xaa, 0xe0 } \ -+ { 0x83, 0x0b, 0xd9, 0x15, 0x2c, 0x69, 0xaa, 0xe0 } \ - } - - #define GRUB_EFI_VENDOR_APPLE_GUID \ - { 0x2B0585EB, 0xD8B8, 0x49A9, \ -- { 0x8B, 0x8C, 0xE2, 0x1B, 0x01, 0xAE, 0xF2, 0xB7 } \ -+ { 0x8B, 0x8C, 0xE2, 0x1B, 0x01, 0xAE, 0xF2, 0xB7 } \ -+ } -+ -+#define GRUB_EFI_SHIM_LOCK_GUID \ -+ { 0x605dab50, 0xe046, 0x4300, \ -+ { 0xab, 0xb6, 0x3d, 0xd8, 0x10, 0xdd, 0x8b, 0x23 } \ - } - - struct grub_efi_sal_system_table -@@ -1689,6 +1694,12 @@ struct grub_efi_block_io - }; - typedef struct grub_efi_block_io grub_efi_block_io_t; - -+struct grub_efi_shim_lock_protocol -+{ -+ grub_efi_status_t (*verify) (void *buffer, grub_uint32_t size); -+}; -+typedef struct grub_efi_shim_lock_protocol grub_efi_shim_lock_protocol_t; -+ - #if (GRUB_TARGET_SIZEOF_VOID_P == 4) || defined (__ia64__) \ - || defined (__aarch64__) || defined (__MINGW64__) || defined (__CYGWIN__) \ - || defined(__riscv) --- -2.14.2 - diff --git a/boot/grub2/0030-efi-Return-grub_efi_status_t-from-grub_efi_get_varia.patch b/boot/grub2/0030-efi-Return-grub_efi_status_t-from-grub_efi_get_varia.patch deleted file mode 100644 index 39386a182b2..00000000000 --- a/boot/grub2/0030-efi-Return-grub_efi_status_t-from-grub_efi_get_varia.patch +++ /dev/null @@ -1,149 +0,0 @@ -From 04ae030d0eea8668d4417702d88bf2cf04713d80 Mon Sep 17 00:00:00 2001 -From: Daniel Kiper -Date: Thu, 3 Dec 2020 16:01:46 +0100 -Subject: [PATCH] efi: Return grub_efi_status_t from grub_efi_get_variable() -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This is needed to properly detect and report UEFI Secure Boot status -to the x86 Linux kernel. The functionality will be added by subsequent -patches. - -Signed-off-by: Daniel Kiper -Signed-off-by: Marco A Benatto -Signed-off-by: Javier Martinez Canillas -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/commands/efi/efifwsetup.c | 8 ++++---- - grub-core/kern/efi/efi.c | 16 +++++++++------- - grub-core/video/efi_gop.c | 2 +- - include/grub/efi/efi.h | 7 ++++--- - 4 files changed, 18 insertions(+), 15 deletions(-) - -diff --git a/grub-core/commands/efi/efifwsetup.c b/grub-core/commands/efi/efifwsetup.c -index 7a137a72a..eaca03283 100644 ---- a/grub-core/commands/efi/efifwsetup.c -+++ b/grub-core/commands/efi/efifwsetup.c -@@ -38,8 +38,8 @@ grub_cmd_fwsetup (grub_command_t cmd __attribute__ ((unused)), - grub_size_t oi_size; - grub_efi_guid_t global = GRUB_EFI_GLOBAL_VARIABLE_GUID; - -- old_os_indications = grub_efi_get_variable ("OsIndications", &global, -- &oi_size); -+ grub_efi_get_variable ("OsIndications", &global, &oi_size, -+ (void **) &old_os_indications); - - if (old_os_indications != NULL && oi_size == sizeof (os_indications)) - os_indications |= *old_os_indications; -@@ -63,8 +63,8 @@ efifwsetup_is_supported (void) - grub_size_t oi_size = 0; - grub_efi_guid_t global = GRUB_EFI_GLOBAL_VARIABLE_GUID; - -- os_indications_supported = grub_efi_get_variable ("OsIndicationsSupported", -- &global, &oi_size); -+ grub_efi_get_variable ("OsIndicationsSupported", &global, &oi_size, -+ (void **) &os_indications_supported); - - if (!os_indications_supported) - return 0; -diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c -index e0165e74c..9403b12cd 100644 ---- a/grub-core/kern/efi/efi.c -+++ b/grub-core/kern/efi/efi.c -@@ -223,9 +223,9 @@ grub_efi_set_variable(const char *var, const grub_efi_guid_t *guid, - return grub_error (GRUB_ERR_IO, "could not set EFI variable `%s'", var); - } - --void * -+grub_efi_status_t - grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid, -- grub_size_t *datasize_out) -+ grub_size_t *datasize_out, void **data_out) - { - grub_efi_status_t status; - grub_efi_uintn_t datasize = 0; -@@ -234,13 +234,14 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid, - void *data; - grub_size_t len, len16; - -+ *data_out = NULL; - *datasize_out = 0; - - len = grub_strlen (var); - len16 = len * GRUB_MAX_UTF16_PER_UTF8; - var16 = grub_calloc (len16 + 1, sizeof (var16[0])); - if (!var16) -- return NULL; -+ return GRUB_EFI_OUT_OF_RESOURCES; - len16 = grub_utf8_to_utf16 (var16, len16, (grub_uint8_t *) var, len, NULL); - var16[len16] = 0; - -@@ -251,14 +252,14 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid, - if (status != GRUB_EFI_BUFFER_TOO_SMALL || !datasize) - { - grub_free (var16); -- return NULL; -+ return status; - } - - data = grub_malloc (datasize); - if (!data) - { - grub_free (var16); -- return NULL; -+ return GRUB_EFI_OUT_OF_RESOURCES; - } - - status = efi_call_5 (r->get_variable, var16, guid, NULL, &datasize, data); -@@ -266,12 +267,13 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid, - - if (status == GRUB_EFI_SUCCESS) - { -+ *data_out = data; - *datasize_out = datasize; -- return data; -+ return status; - } - - grub_free (data); -- return NULL; -+ return status; - } - - #pragma GCC diagnostic ignored "-Wcast-align" -diff --git a/grub-core/video/efi_gop.c b/grub-core/video/efi_gop.c -index be446f8d2..7fe0cdabf 100644 ---- a/grub-core/video/efi_gop.c -+++ b/grub-core/video/efi_gop.c -@@ -316,7 +316,7 @@ grub_video_gop_get_edid (struct grub_video_edid_info *edid_info) - char edidname[] = "agp-internal-edid"; - grub_size_t datasize; - grub_uint8_t *data; -- data = grub_efi_get_variable (edidname, &efi_var_guid, &datasize); -+ grub_efi_get_variable (edidname, &efi_var_guid, &datasize, (void **) &data); - if (data && datasize > 16) - { - copy_size = datasize - 16; -diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h -index e90e00dc4..8b2a0f1f5 100644 ---- a/include/grub/efi/efi.h -+++ b/include/grub/efi/efi.h -@@ -74,9 +74,10 @@ grub_err_t EXPORT_FUNC (grub_efi_set_virtual_address_map) (grub_efi_uintn_t memo - grub_efi_uintn_t descriptor_size, - grub_efi_uint32_t descriptor_version, - grub_efi_memory_descriptor_t *virtual_map); --void *EXPORT_FUNC (grub_efi_get_variable) (const char *variable, -- const grub_efi_guid_t *guid, -- grub_size_t *datasize_out); -+grub_efi_status_t EXPORT_FUNC (grub_efi_get_variable) (const char *variable, -+ const grub_efi_guid_t *guid, -+ grub_size_t *datasize_out, -+ void **data_out); - grub_err_t - EXPORT_FUNC (grub_efi_set_variable) (const char *var, - const grub_efi_guid_t *guid, --- -2.29.2 - diff --git a/boot/grub2/0031-efi-Add-a-function-to-read-EFI-variables-with-attrib.patch b/boot/grub2/0031-efi-Add-a-function-to-read-EFI-variables-with-attrib.patch deleted file mode 100644 index d9fb6154b1f..00000000000 --- a/boot/grub2/0031-efi-Add-a-function-to-read-EFI-variables-with-attrib.patch +++ /dev/null @@ -1,78 +0,0 @@ -From ac5c9367548750e75ed1e7fc4354a3d20186d733 Mon Sep 17 00:00:00 2001 -From: Daniel Kiper -Date: Thu, 3 Dec 2020 16:01:47 +0100 -Subject: [PATCH] efi: Add a function to read EFI variables with attributes - -It will be used to properly detect and report UEFI Secure Boot status to -the x86 Linux kernel. The functionality will be added by subsequent patches. - -Signed-off-by: Ignat Korchagin -Signed-off-by: Daniel Kiper -Signed-off-by: Marco A Benatto -Signed-off-by: Javier Martinez Canillas -Reviewed-by: Daniel Kiper ---- - grub-core/kern/efi/efi.c | 16 +++++++++++++--- - include/grub/efi/efi.h | 5 +++++ - 2 files changed, 18 insertions(+), 3 deletions(-) - -diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c -index 9403b12cd..2942b8e35 100644 ---- a/grub-core/kern/efi/efi.c -+++ b/grub-core/kern/efi/efi.c -@@ -224,8 +224,11 @@ grub_efi_set_variable(const char *var, const grub_efi_guid_t *guid, - } - - grub_efi_status_t --grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid, -- grub_size_t *datasize_out, void **data_out) -+grub_efi_get_variable_with_attributes (const char *var, -+ const grub_efi_guid_t *guid, -+ grub_size_t *datasize_out, -+ void **data_out, -+ grub_efi_uint32_t *attributes) - { - grub_efi_status_t status; - grub_efi_uintn_t datasize = 0; -@@ -262,7 +265,7 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid, - return GRUB_EFI_OUT_OF_RESOURCES; - } - -- status = efi_call_5 (r->get_variable, var16, guid, NULL, &datasize, data); -+ status = efi_call_5 (r->get_variable, var16, guid, attributes, &datasize, data); - grub_free (var16); - - if (status == GRUB_EFI_SUCCESS) -@@ -276,6 +279,13 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid, - return status; - } - -+grub_efi_status_t -+grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid, -+ grub_size_t *datasize_out, void **data_out) -+{ -+ return grub_efi_get_variable_with_attributes (var, guid, datasize_out, data_out, NULL); -+} -+ - #pragma GCC diagnostic ignored "-Wcast-align" - - /* Search the mods section from the PE32/PE32+ image. This code uses -diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h -index 8b2a0f1f5..83d958f99 100644 ---- a/include/grub/efi/efi.h -+++ b/include/grub/efi/efi.h -@@ -74,6 +74,11 @@ grub_err_t EXPORT_FUNC (grub_efi_set_virtual_address_map) (grub_efi_uintn_t memo - grub_efi_uintn_t descriptor_size, - grub_efi_uint32_t descriptor_version, - grub_efi_memory_descriptor_t *virtual_map); -+grub_efi_status_t EXPORT_FUNC (grub_efi_get_variable_with_attributes) (const char *variable, -+ const grub_efi_guid_t *guid, -+ grub_size_t *datasize_out, -+ void **data_out, -+ grub_efi_uint32_t *attributes); - grub_efi_status_t EXPORT_FUNC (grub_efi_get_variable) (const char *variable, - const grub_efi_guid_t *guid, - grub_size_t *datasize_out, --- -2.29.2 - diff --git a/boot/grub2/0032-efi-Add-secure-boot-detection.patch b/boot/grub2/0032-efi-Add-secure-boot-detection.patch deleted file mode 100644 index f09a42b2073..00000000000 --- a/boot/grub2/0032-efi-Add-secure-boot-detection.patch +++ /dev/null @@ -1,541 +0,0 @@ -From d7e54b2e5feee95d2f83058ed30d883c450d1473 Mon Sep 17 00:00:00 2001 -From: Daniel Kiper -Date: Thu, 3 Dec 2020 16:01:48 +0100 -Subject: [PATCH] efi: Add secure boot detection - -Introduce grub_efi_get_secureboot() function which returns whether -UEFI Secure Boot is enabled or not on UEFI systems. - -Signed-off-by: Ignat Korchagin -Signed-off-by: Daniel Kiper -Signed-off-by: Marco A Benatto -Signed-off-by: Javier Martinez Canillas -Reviewed-by: Daniel Kiper -[Add changes to generated files] -Signed-off-by: Stefan Sørensen ---- - grub-core/Makefile.am | 1 + - grub-core/Makefile.core.am | 14 +++--- - grub-core/Makefile.core.def | 1 + - grub-core/Makefile.in | 102 ++++++++++++++++++++++++++--------------- - grub-core/kern/efi/sb.c | 109 ++++++++++++++++++++++++++++++++++++++++++++ - include/grub/efi/sb.h | 40 ++++++++++++++++ - po/POTFILES.in | 2 + - 7 files changed, 225 insertions(+), 44 deletions(-) - create mode 100644 grub-core/kern/efi/sb.c - create mode 100644 include/grub/efi/sb.h - -diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am -index 3ea8e7f..c6ba5b2 100644 ---- a/grub-core/Makefile.am -+++ b/grub-core/Makefile.am -@@ -71,6 +71,7 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/command.h - KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/device.h - KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/disk.h - KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/dl.h -+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/sb.h - KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/env.h - KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/env_private.h - KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/err.h -diff --git a/grub-core/Makefile.core.am b/grub-core/Makefile.core.am -index a217716..f28b753 100644 ---- a/grub-core/Makefile.core.am -+++ b/grub-core/Makefile.core.am -@@ -22421,7 +22421,7 @@ endif - if COND_i386_efi - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/i386/efi/startup.S --kernel_exec_SOURCES += kern/i386/efi/tsc.c kern/i386/tsc_pmtimer.c kern/i386/efi/init.c bus/pci.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += kern/i386/efi/tsc.c kern/i386/tsc_pmtimer.c kern/i386/efi/init.c bus/pci.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22531,7 +22531,7 @@ endif - if COND_x86_64_efi - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/x86_64/efi/startup.S --kernel_exec_SOURCES += kern/i386/efi/tsc.c kern/i386/tsc_pmtimer.c kern/x86_64/efi/callwrap.S kern/i386/efi/init.c bus/pci.c kern/x86_64/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += kern/i386/efi/tsc.c kern/i386/tsc_pmtimer.c kern/x86_64/efi/callwrap.S kern/i386/efi/init.c bus/pci.c kern/x86_64/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22707,7 +22707,7 @@ endif - if COND_ia64_efi - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = --kernel_exec_SOURCES += kern/ia64/efi/startup.S kern/ia64/efi/init.c kern/ia64/dl.c kern/ia64/dl_helper.c kern/ia64/cache.c lib/division.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += kern/ia64/efi/startup.S kern/ia64/efi/init.c kern/ia64/dl.c kern/ia64/dl_helper.c kern/ia64/cache.c lib/division.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -fno-builtin -fpic -minline-int-divide-max-throughput -@@ -22773,7 +22773,7 @@ endif - if COND_arm_efi - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/arm/efi/startup.S --kernel_exec_SOURCES += kern/arm/efi/init.c kern/efi/fdt.c kern/arm/dl.c kern/arm/dl_helper.c kern/arm/cache_armv6.S kern/arm/cache_armv7.S kern/arm/cache.c kern/arm/compiler-rt.S lib/division.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += kern/arm/efi/init.c kern/efi/fdt.c kern/arm/dl.c kern/arm/dl_helper.c kern/arm/cache_armv6.S kern/arm/cache_armv7.S kern/arm/cache.c kern/arm/compiler-rt.S lib/division.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22795,7 +22795,7 @@ endif - if COND_arm64_efi - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/arm64/efi/startup.S --kernel_exec_SOURCES += kern/arm64/efi/init.c kern/efi/fdt.c kern/arm64/cache.c kern/arm64/cache_flush.S kern/arm64/dl.c kern/arm64/dl_helper.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += kern/arm64/efi/init.c kern/efi/fdt.c kern/arm64/cache.c kern/arm64/cache_flush.S kern/arm64/dl.c kern/arm64/dl_helper.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22839,7 +22839,7 @@ endif - if COND_riscv32_efi - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/riscv/efi/startup.S --kernel_exec_SOURCES += kern/riscv/efi/init.c kern/efi/fdt.c kern/riscv/cache.c kern/riscv/cache_flush.S kern/riscv/dl.c lib/division.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += kern/riscv/efi/init.c kern/efi/fdt.c kern/riscv/cache.c kern/riscv/cache_flush.S kern/riscv/dl.c lib/division.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22861,7 +22861,7 @@ endif - if COND_riscv64_efi - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/riscv/efi/startup.S --kernel_exec_SOURCES += kern/riscv/efi/init.c kern/efi/fdt.c kern/riscv/cache.c kern/riscv/cache_flush.S kern/riscv/dl.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += kern/riscv/efi/init.c kern/efi/fdt.c kern/riscv/cache.c kern/riscv/cache_flush.S kern/riscv/dl.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index 474a63e..abd26cf 100644 ---- a/grub-core/Makefile.core.def -+++ b/grub-core/Makefile.core.def -@@ -203,6 +203,7 @@ kernel = { - efi = term/efi/console.c; - efi = kern/acpi.c; - efi = kern/efi/acpi.c; -+ efi = kern/efi/sb.c; - i386_coreboot = kern/i386/pc/acpi.c; - i386_multiboot = kern/i386/pc/acpi.c; - i386_coreboot = kern/acpi.c; -diff --git a/grub-core/Makefile.in b/grub-core/Makefile.in -index d287607..8fb81ee 100644 ---- a/grub-core/Makefile.in -+++ b/grub-core/Makefile.in -@@ -10468,32 +10468,33 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - kern/arm64/cache_flush.S kern/arm64/dl.c \ - kern/arm64/dl_helper.c disk/efi/efidisk.c kern/efi/efi.c \ - kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c \ -- kern/efi/acpi.c kern/compiler-rt.c kern/mm.c kern/time.c \ -- kern/generic/millisleep.c kern/command.c kern/corecmd.c \ -- kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c \ -- kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c \ -- kern/parser.c kern/partition.c kern/rescue_parser.c \ -- kern/rescue_reader.c kern/term.c kern/arm/startup.S \ -- kern/arm/coreboot/init.c kern/arm/coreboot/timer.c \ -- kern/arm/coreboot/coreboot.S lib/fdt.c bus/fdt.c term/ps2.c \ -- term/arm/pl050.c term/arm/cros.c term/arm/cros_ec.c \ -- bus/spi/rk3288_spi.c commands/keylayouts.c \ -- kern/arm/coreboot/dma.c kern/arm/coreboot/cbtable.c \ -- video/coreboot/cbfb.c kern/coreboot/mmap.c \ -- kern/coreboot/cbtable.c term/gfxterm.c font/font.c \ -- font/font_cmd.c io/bufio.c video/fb/fbblit.c video/fb/fbfill.c \ -- video/fb/fbutil.c video/fb/video_fb.c video/video.c \ -- kern/arm/dl.c kern/arm/dl_helper.c kern/arm/cache_armv6.S \ -- kern/arm/cache_armv7.S kern/arm/cache.c kern/arm/compiler-rt.S \ -- lib/division.c kern/arm/efi/startup.S kern/arm/efi/init.c \ -- kern/arm/uboot/init.c kern/arm/uboot/uboot.S \ -- disk/uboot/ubootdisk.c kern/uboot/uboot.c kern/uboot/init.c \ -- kern/uboot/hw.c term/uboot/console.c term/terminfo.c \ -- term/tparm.c commands/extcmd.c lib/arg.c disk/host.c \ -- kern/emu/cache_s.S kern/emu/hostdisk.c osdep/unix/hostdisk.c \ -- osdep/exec.c osdep/devmapper/hostdisk.c osdep/hostdisk.c \ -- kern/emu/hostfs.c kern/emu/main.c kern/emu/argp_common.c \ -- kern/emu/misc.c kern/emu/mm.c kern/emu/time.c kern/emu/cache.c \ -+ kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c \ -+ kern/time.c kern/generic/millisleep.c kern/command.c \ -+ kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c \ -+ kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c \ -+ kern/misc.c kern/parser.c kern/partition.c \ -+ kern/rescue_parser.c kern/rescue_reader.c kern/term.c \ -+ kern/arm/startup.S kern/arm/coreboot/init.c \ -+ kern/arm/coreboot/timer.c kern/arm/coreboot/coreboot.S \ -+ lib/fdt.c bus/fdt.c term/ps2.c term/arm/pl050.c \ -+ term/arm/cros.c term/arm/cros_ec.c bus/spi/rk3288_spi.c \ -+ commands/keylayouts.c kern/arm/coreboot/dma.c \ -+ kern/arm/coreboot/cbtable.c video/coreboot/cbfb.c \ -+ kern/coreboot/mmap.c kern/coreboot/cbtable.c term/gfxterm.c \ -+ font/font.c font/font_cmd.c io/bufio.c video/fb/fbblit.c \ -+ video/fb/fbfill.c video/fb/fbutil.c video/fb/video_fb.c \ -+ video/video.c kern/arm/dl.c kern/arm/dl_helper.c \ -+ kern/arm/cache_armv6.S kern/arm/cache_armv7.S kern/arm/cache.c \ -+ kern/arm/compiler-rt.S lib/division.c kern/arm/efi/startup.S \ -+ kern/arm/efi/init.c kern/arm/uboot/init.c \ -+ kern/arm/uboot/uboot.S disk/uboot/ubootdisk.c \ -+ kern/uboot/uboot.c kern/uboot/init.c kern/uboot/hw.c \ -+ term/uboot/console.c term/terminfo.c term/tparm.c \ -+ commands/extcmd.c lib/arg.c disk/host.c kern/emu/cache_s.S \ -+ kern/emu/hostdisk.c osdep/unix/hostdisk.c osdep/exec.c \ -+ osdep/devmapper/hostdisk.c osdep/hostdisk.c kern/emu/hostfs.c \ -+ kern/emu/main.c kern/emu/argp_common.c kern/emu/misc.c \ -+ kern/emu/mm.c kern/emu/time.c kern/emu/cache.c \ - osdep/emuconsole.c osdep/dl.c osdep/sleep.c osdep/init.c \ - osdep/emunet.c osdep/cputime.c kern/i386/coreboot/startup.S \ - kern/i386/coreboot/init.c kern/i386/pc/acpi.c \ -@@ -10580,6 +10581,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ term/efi/kernel_exec-console.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/kernel_exec-acpi.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/efi/kernel_exec-acpi.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/efi/kernel_exec-sb.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/kernel_exec-compiler-rt.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ -@@ -10651,6 +10653,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ term/efi/kernel_exec-console.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/kernel_exec-acpi.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/efi/kernel_exec-acpi.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/efi/kernel_exec-sb.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/kernel_exec-compiler-rt.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ -@@ -10686,6 +10689,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ term/efi/kernel_exec-console.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/kernel_exec-acpi.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/efi/kernel_exec-acpi.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/efi/kernel_exec-sb.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/kernel_exec-compiler-rt.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ -@@ -10881,6 +10885,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ term/efi/kernel_exec-console.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/kernel_exec-acpi.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/efi/kernel_exec-acpi.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/efi/kernel_exec-sb.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/kernel_exec-compiler-rt.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ -@@ -11109,6 +11114,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ term/efi/kernel_exec-console.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/kernel_exec-acpi.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/efi/kernel_exec-acpi.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/efi/kernel_exec-sb.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/kernel_exec-compiler-rt.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ -@@ -11271,6 +11277,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ term/efi/kernel_exec-console.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/kernel_exec-acpi.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/efi/kernel_exec-acpi.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/efi/kernel_exec-sb.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/kernel_exec-compiler-rt.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ -@@ -11360,6 +11367,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_TRUE@ term/efi/kernel_exec-console.$(OBJEXT) \ - @COND_arm64_efi_TRUE@ kern/kernel_exec-acpi.$(OBJEXT) \ - @COND_arm64_efi_TRUE@ kern/efi/kernel_exec-acpi.$(OBJEXT) \ -+@COND_arm64_efi_TRUE@ kern/efi/kernel_exec-sb.$(OBJEXT) \ - @COND_arm64_efi_TRUE@ kern/kernel_exec-compiler-rt.$(OBJEXT) \ - @COND_arm64_efi_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ -@@ -16380,6 +16388,7 @@ KERNEL_HEADER_FILES = $(top_srcdir)/include/grub/cache.h \ - $(top_srcdir)/include/grub/device.h \ - $(top_srcdir)/include/grub/disk.h \ - $(top_srcdir)/include/grub/dl.h \ -+ $(top_srcdir)/include/grub/efi/sb.h \ - $(top_srcdir)/include/grub/env.h \ - $(top_srcdir)/include/grub/env_private.h \ - $(top_srcdir)/include/grub/err.h \ -@@ -25612,7 +25621,7 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_arm64_efi_TRUE@ kern/arm64/dl_helper.c disk/efi/efidisk.c \ - @COND_arm64_efi_TRUE@ kern/efi/efi.c kern/efi/init.c \ - @COND_arm64_efi_TRUE@ kern/efi/mm.c term/efi/console.c \ --@COND_arm64_efi_TRUE@ kern/acpi.c kern/efi/acpi.c \ -+@COND_arm64_efi_TRUE@ kern/acpi.c kern/efi/acpi.c kern/efi/sb.c \ - @COND_arm64_efi_TRUE@ kern/compiler-rt.c kern/mm.c kern/time.c \ - @COND_arm64_efi_TRUE@ kern/generic/millisleep.c kern/command.c \ - @COND_arm64_efi_TRUE@ kern/corecmd.c kern/device.c kern/disk.c \ -@@ -25661,8 +25670,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_arm_efi_TRUE@ disk/efi/efidisk.c kern/efi/efi.c \ - @COND_arm_efi_TRUE@ kern/efi/init.c kern/efi/mm.c \ - @COND_arm_efi_TRUE@ term/efi/console.c kern/acpi.c \ --@COND_arm_efi_TRUE@ kern/efi/acpi.c kern/compiler-rt.c \ --@COND_arm_efi_TRUE@ kern/mm.c kern/time.c \ -+@COND_arm_efi_TRUE@ kern/efi/acpi.c kern/efi/sb.c \ -+@COND_arm_efi_TRUE@ kern/compiler-rt.c kern/mm.c kern/time.c \ - @COND_arm_efi_TRUE@ kern/generic/millisleep.c kern/command.c \ - @COND_arm_efi_TRUE@ kern/corecmd.c kern/device.c kern/disk.c \ - @COND_arm_efi_TRUE@ kern/dl.c kern/env.c kern/err.c kern/file.c \ -@@ -25739,7 +25748,7 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_i386_efi_TRUE@ kern/i386/tsc_pit.c disk/efi/efidisk.c \ - @COND_i386_efi_TRUE@ kern/efi/efi.c kern/efi/init.c \ - @COND_i386_efi_TRUE@ kern/efi/mm.c term/efi/console.c \ --@COND_i386_efi_TRUE@ kern/acpi.c kern/efi/acpi.c \ -+@COND_i386_efi_TRUE@ kern/acpi.c kern/efi/acpi.c kern/efi/sb.c \ - @COND_i386_efi_TRUE@ kern/compiler-rt.c kern/mm.c kern/time.c \ - @COND_i386_efi_TRUE@ kern/generic/millisleep.c kern/command.c \ - @COND_i386_efi_TRUE@ kern/corecmd.c kern/device.c kern/disk.c \ -@@ -25851,7 +25860,7 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_ia64_efi_TRUE@ lib/division.c disk/efi/efidisk.c \ - @COND_ia64_efi_TRUE@ kern/efi/efi.c kern/efi/init.c \ - @COND_ia64_efi_TRUE@ kern/efi/mm.c term/efi/console.c \ --@COND_ia64_efi_TRUE@ kern/acpi.c kern/efi/acpi.c \ -+@COND_ia64_efi_TRUE@ kern/acpi.c kern/efi/acpi.c kern/efi/sb.c \ - @COND_ia64_efi_TRUE@ kern/compiler-rt.c kern/mm.c kern/time.c \ - @COND_ia64_efi_TRUE@ kern/generic/millisleep.c kern/command.c \ - @COND_ia64_efi_TRUE@ kern/corecmd.c kern/device.c kern/disk.c \ -@@ -25959,9 +25968,9 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_riscv32_efi_TRUE@ disk/efi/efidisk.c kern/efi/efi.c \ - @COND_riscv32_efi_TRUE@ kern/efi/init.c kern/efi/mm.c \ - @COND_riscv32_efi_TRUE@ term/efi/console.c kern/acpi.c \ --@COND_riscv32_efi_TRUE@ kern/efi/acpi.c kern/compiler-rt.c \ --@COND_riscv32_efi_TRUE@ kern/mm.c kern/time.c \ --@COND_riscv32_efi_TRUE@ kern/generic/millisleep.c \ -+@COND_riscv32_efi_TRUE@ kern/efi/acpi.c kern/efi/sb.c \ -+@COND_riscv32_efi_TRUE@ kern/compiler-rt.c kern/mm.c \ -+@COND_riscv32_efi_TRUE@ kern/time.c kern/generic/millisleep.c \ - @COND_riscv32_efi_TRUE@ kern/command.c kern/corecmd.c \ - @COND_riscv32_efi_TRUE@ kern/device.c kern/disk.c kern/dl.c \ - @COND_riscv32_efi_TRUE@ kern/env.c kern/err.c kern/file.c \ -@@ -25977,8 +25986,9 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_riscv64_efi_TRUE@ kern/efi/efi.c kern/efi/init.c \ - @COND_riscv64_efi_TRUE@ kern/efi/mm.c term/efi/console.c \ - @COND_riscv64_efi_TRUE@ kern/acpi.c kern/efi/acpi.c \ --@COND_riscv64_efi_TRUE@ kern/compiler-rt.c kern/mm.c \ --@COND_riscv64_efi_TRUE@ kern/time.c kern/generic/millisleep.c \ -+@COND_riscv64_efi_TRUE@ kern/efi/sb.c kern/compiler-rt.c \ -+@COND_riscv64_efi_TRUE@ kern/mm.c kern/time.c \ -+@COND_riscv64_efi_TRUE@ kern/generic/millisleep.c \ - @COND_riscv64_efi_TRUE@ kern/command.c kern/corecmd.c \ - @COND_riscv64_efi_TRUE@ kern/device.c kern/disk.c kern/dl.c \ - @COND_riscv64_efi_TRUE@ kern/env.c kern/err.c kern/file.c \ -@@ -26022,7 +26032,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_x86_64_efi_TRUE@ kern/efi/efi.c kern/efi/init.c \ - @COND_x86_64_efi_TRUE@ kern/efi/mm.c term/efi/console.c \ - @COND_x86_64_efi_TRUE@ kern/acpi.c kern/efi/acpi.c \ --@COND_x86_64_efi_TRUE@ kern/compiler-rt.c kern/mm.c kern/time.c \ -+@COND_x86_64_efi_TRUE@ kern/efi/sb.c kern/compiler-rt.c \ -+@COND_x86_64_efi_TRUE@ kern/mm.c kern/time.c \ - @COND_x86_64_efi_TRUE@ kern/generic/millisleep.c kern/command.c \ - @COND_x86_64_efi_TRUE@ kern/corecmd.c kern/device.c kern/disk.c \ - @COND_x86_64_efi_TRUE@ kern/dl.c kern/env.c kern/err.c \ -@@ -27989,6 +28000,8 @@ kern/kernel_exec-acpi.$(OBJEXT): kern/$(am__dirstamp) \ - kern/$(DEPDIR)/$(am__dirstamp) - kern/efi/kernel_exec-acpi.$(OBJEXT): kern/efi/$(am__dirstamp) \ - kern/efi/$(DEPDIR)/$(am__dirstamp) -+kern/efi/kernel_exec-sb.$(OBJEXT): kern/efi/$(am__dirstamp) \ -+ kern/efi/$(DEPDIR)/$(am__dirstamp) - kern/kernel_exec-compiler-rt.$(OBJEXT): kern/$(am__dirstamp) \ - kern/$(DEPDIR)/$(am__dirstamp) - kern/kernel_exec-mm.$(OBJEXT): kern/$(am__dirstamp) \ -@@ -30994,6 +31007,7 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@kern/efi/$(DEPDIR)/kernel_exec-fdt.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@kern/efi/$(DEPDIR)/kernel_exec-init.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@kern/efi/$(DEPDIR)/kernel_exec-mm.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@kern/efi/$(DEPDIR)/kernel_exec-sb.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@kern/emu/$(DEPDIR)/grub_emu-full.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@kern/emu/$(DEPDIR)/grub_emu_lite-lite.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@kern/emu/$(DEPDIR)/kernel_exec-argp_common.Po@am__quote@ -@@ -35285,6 +35299,20 @@ kern/efi/kernel_exec-acpi.obj: kern/efi/acpi.c - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kernel_exec_CPPFLAGS) $(CPPFLAGS) $(kernel_exec_CFLAGS) $(CFLAGS) -c -o kern/efi/kernel_exec-acpi.obj `if test -f 'kern/efi/acpi.c'; then $(CYGPATH_W) 'kern/efi/acpi.c'; else $(CYGPATH_W) '$(srcdir)/kern/efi/acpi.c'; fi` - -+kern/efi/kernel_exec-sb.o: kern/efi/sb.c -+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kernel_exec_CPPFLAGS) $(CPPFLAGS) $(kernel_exec_CFLAGS) $(CFLAGS) -MT kern/efi/kernel_exec-sb.o -MD -MP -MF kern/efi/$(DEPDIR)/kernel_exec-sb.Tpo -c -o kern/efi/kernel_exec-sb.o `test -f 'kern/efi/sb.c' || echo '$(srcdir)/'`kern/efi/sb.c -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) kern/efi/$(DEPDIR)/kernel_exec-sb.Tpo kern/efi/$(DEPDIR)/kernel_exec-sb.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='kern/efi/sb.c' object='kern/efi/kernel_exec-sb.o' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kernel_exec_CPPFLAGS) $(CPPFLAGS) $(kernel_exec_CFLAGS) $(CFLAGS) -c -o kern/efi/kernel_exec-sb.o `test -f 'kern/efi/sb.c' || echo '$(srcdir)/'`kern/efi/sb.c -+ -+kern/efi/kernel_exec-sb.obj: kern/efi/sb.c -+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kernel_exec_CPPFLAGS) $(CPPFLAGS) $(kernel_exec_CFLAGS) $(CFLAGS) -MT kern/efi/kernel_exec-sb.obj -MD -MP -MF kern/efi/$(DEPDIR)/kernel_exec-sb.Tpo -c -o kern/efi/kernel_exec-sb.obj `if test -f 'kern/efi/sb.c'; then $(CYGPATH_W) 'kern/efi/sb.c'; else $(CYGPATH_W) '$(srcdir)/kern/efi/sb.c'; fi` -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) kern/efi/$(DEPDIR)/kernel_exec-sb.Tpo kern/efi/$(DEPDIR)/kernel_exec-sb.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='kern/efi/sb.c' object='kern/efi/kernel_exec-sb.obj' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kernel_exec_CPPFLAGS) $(CPPFLAGS) $(kernel_exec_CFLAGS) $(CFLAGS) -c -o kern/efi/kernel_exec-sb.obj `if test -f 'kern/efi/sb.c'; then $(CYGPATH_W) 'kern/efi/sb.c'; else $(CYGPATH_W) '$(srcdir)/kern/efi/sb.c'; fi` -+ - kern/kernel_exec-compiler-rt.o: kern/compiler-rt.c - @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kernel_exec_CPPFLAGS) $(CPPFLAGS) $(kernel_exec_CFLAGS) $(CFLAGS) -MT kern/kernel_exec-compiler-rt.o -MD -MP -MF kern/$(DEPDIR)/kernel_exec-compiler-rt.Tpo -c -o kern/kernel_exec-compiler-rt.o `test -f 'kern/compiler-rt.c' || echo '$(srcdir)/'`kern/compiler-rt.c - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) kern/$(DEPDIR)/kernel_exec-compiler-rt.Tpo kern/$(DEPDIR)/kernel_exec-compiler-rt.Po -diff --git a/grub-core/kern/efi/sb.c b/grub-core/kern/efi/sb.c -new file mode 100644 -index 0000000..19658d9 ---- /dev/null -+++ b/grub-core/kern/efi/sb.c -@@ -0,0 +1,109 @@ -+/* -+ * GRUB -- GRand Unified Bootloader -+ * Copyright (C) 2020 Free Software Foundation, Inc. -+ * -+ * GRUB 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 of the License, or -+ * (at your option) any later version. -+ * -+ * GRUB 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 GRUB. If not, see . -+ * -+ * UEFI Secure Boot related checkings. -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+/* -+ * Determine whether we're in secure boot mode. -+ * -+ * Please keep the logic in sync with the Linux kernel, -+ * drivers/firmware/efi/libstub/secureboot.c:efi_get_secureboot(). -+ */ -+grub_uint8_t -+grub_efi_get_secureboot (void) -+{ -+ static grub_efi_guid_t efi_variable_guid = GRUB_EFI_GLOBAL_VARIABLE_GUID; -+ static grub_efi_guid_t efi_shim_lock_guid = GRUB_EFI_SHIM_LOCK_GUID; -+ grub_efi_status_t status; -+ grub_efi_uint32_t attr = 0; -+ grub_size_t size = 0; -+ grub_uint8_t *secboot = NULL; -+ grub_uint8_t *setupmode = NULL; -+ grub_uint8_t *moksbstate = NULL; -+ grub_uint8_t secureboot = GRUB_EFI_SECUREBOOT_MODE_UNKNOWN; -+ const char *secureboot_str = "UNKNOWN"; -+ -+ status = grub_efi_get_variable ("SecureBoot", &efi_variable_guid, -+ &size, (void **) &secboot); -+ -+ if (status == GRUB_EFI_NOT_FOUND) -+ { -+ secureboot = GRUB_EFI_SECUREBOOT_MODE_DISABLED; -+ goto out; -+ } -+ -+ if (status != GRUB_EFI_SUCCESS) -+ goto out; -+ -+ status = grub_efi_get_variable ("SetupMode", &efi_variable_guid, -+ &size, (void **) &setupmode); -+ -+ if (status != GRUB_EFI_SUCCESS) -+ goto out; -+ -+ if ((*secboot == 0) || (*setupmode == 1)) -+ { -+ secureboot = GRUB_EFI_SECUREBOOT_MODE_DISABLED; -+ goto out; -+ } -+ -+ /* -+ * See if a user has put the shim into insecure mode. If so, and if the -+ * variable doesn't have the runtime attribute set, we might as well -+ * honor that. -+ */ -+ status = grub_efi_get_variable_with_attributes ("MokSBState", &efi_shim_lock_guid, -+ &size, (void **) &moksbstate, &attr); -+ -+ /* If it fails, we don't care why. Default to secure. */ -+ if (status != GRUB_EFI_SUCCESS) -+ { -+ secureboot = GRUB_EFI_SECUREBOOT_MODE_ENABLED; -+ goto out; -+ } -+ -+ if (!(attr & GRUB_EFI_VARIABLE_RUNTIME_ACCESS) && *moksbstate == 1) -+ { -+ secureboot = GRUB_EFI_SECUREBOOT_MODE_DISABLED; -+ goto out; -+ } -+ -+ secureboot = GRUB_EFI_SECUREBOOT_MODE_ENABLED; -+ -+ out: -+ grub_free (moksbstate); -+ grub_free (setupmode); -+ grub_free (secboot); -+ -+ if (secureboot == GRUB_EFI_SECUREBOOT_MODE_DISABLED) -+ secureboot_str = "Disabled"; -+ else if (secureboot == GRUB_EFI_SECUREBOOT_MODE_ENABLED) -+ secureboot_str = "Enabled"; -+ -+ grub_dprintf ("efi", "UEFI Secure Boot state: %s\n", secureboot_str); -+ -+ return secureboot; -+} -diff --git a/include/grub/efi/sb.h b/include/grub/efi/sb.h -new file mode 100644 -index 0000000..a33d985 ---- /dev/null -+++ b/include/grub/efi/sb.h -@@ -0,0 +1,40 @@ -+/* -+ * GRUB -- GRand Unified Bootloader -+ * Copyright (C) 2020 Free Software Foundation, Inc. -+ * -+ * GRUB 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 of the License, or -+ * (at your option) any later version. -+ * -+ * GRUB 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 GRUB. If not, see . -+ */ -+ -+#ifndef GRUB_EFI_SB_H -+#define GRUB_EFI_SB_H 1 -+ -+#include -+#include -+ -+#define GRUB_EFI_SECUREBOOT_MODE_UNSET 0 -+#define GRUB_EFI_SECUREBOOT_MODE_UNKNOWN 1 -+#define GRUB_EFI_SECUREBOOT_MODE_DISABLED 2 -+#define GRUB_EFI_SECUREBOOT_MODE_ENABLED 3 -+ -+#ifdef GRUB_MACHINE_EFI -+extern grub_uint8_t -+EXPORT_FUNC (grub_efi_get_secureboot) (void); -+#else -+static inline grub_uint8_t -+grub_efi_get_secureboot (void) -+{ -+ return GRUB_EFI_SECUREBOOT_MODE_UNSET; -+} -+#endif -+#endif /* GRUB_EFI_SB_H */ -diff --git a/po/POTFILES.in b/po/POTFILES.in -index 5574cbe..22543be 100644 ---- a/po/POTFILES.in -+++ b/po/POTFILES.in -@@ -266,6 +266,7 @@ - ./grub-core/kern/efi/fdt.c - ./grub-core/kern/efi/init.c - ./grub-core/kern/efi/mm.c -+./grub-core/kern/efi/sb.c - ./grub-core/kern/elf.c - ./grub-core/kern/elfXX.c - ./grub-core/kern/emu/argp_common.c -@@ -1053,6 +1054,7 @@ - ./include/grub/efi/memory.h - ./include/grub/efi/pci.h - ./include/grub/efi/pe32.h -+./include/grub/efi/sb.h - ./include/grub/efi/tpm.h - ./include/grub/efi/uga_draw.h - ./include/grub/efiemu/efiemu.h --- -2.14.2 - diff --git a/boot/grub2/0033-verifiers-Move-verifiers-API-to-kernel-image.patch b/boot/grub2/0033-verifiers-Move-verifiers-API-to-kernel-image.patch deleted file mode 100644 index 9ce969c769e..00000000000 --- a/boot/grub2/0033-verifiers-Move-verifiers-API-to-kernel-image.patch +++ /dev/null @@ -1,1650 +0,0 @@ -From 9e95f45ceeef36fcf93cbfffcf004276883dbc99 Mon Sep 17 00:00:00 2001 -From: Marco A Benatto -Date: Wed, 23 Sep 2020 11:33:33 -0400 -Subject: [PATCH] verifiers: Move verifiers API to kernel image - -Move verifiers API from a module to the kernel image, so it can be -used there as well. There are no functional changes in this patch. - -Signed-off-by: Marco A Benatto -Signed-off-by: Javier Martinez Canillas -Reviewed-by: Daniel Kiper -[Add changes to generated files] -Signed-off-by: Stefan Sørensen ---- - grub-core/Makefile.am | 1 + - grub-core/Makefile.core.am | 66 +++----- - grub-core/Makefile.core.def | 6 +- - grub-core/Makefile.in | 355 +++++++++++++++++++++-------------------- - grub-core/commands/verifiers.c | 228 -------------------------- - grub-core/kern/main.c | 4 + - grub-core/kern/verifiers.c | 224 ++++++++++++++++++++++++++ - include/grub/verify.h | 9 +- - po/POTFILES.in | 2 +- - 9 files changed, 446 insertions(+), 449 deletions(-) - delete mode 100644 grub-core/commands/verifiers.c - create mode 100644 grub-core/kern/verifiers.c - -diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am -index c6ba5b2..cc6fc7d 100644 ---- a/grub-core/Makefile.am -+++ b/grub-core/Makefile.am -@@ -91,6 +91,7 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/parser.h - KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/partition.h - KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/term.h - KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/time.h -+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/verify.h - KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/mm_private.h - KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/net.h - KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/memory.h -diff --git a/grub-core/Makefile.core.am b/grub-core/Makefile.core.am -index f28b753..c4d67d4 100644 ---- a/grub-core/Makefile.core.am -+++ b/grub-core/Makefile.core.am -@@ -6953,26 +6953,6 @@ CLEANFILES += pgp.marker - pgp.marker: $(pgp_module_SOURCES) $(nodist_pgp_module_SOURCES) - $(TARGET_CPP) -DGRUB_LST_GENERATOR $(CPPFLAGS_MARKER) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pgp_module_CPPFLAGS) $(CPPFLAGS) $^ > $@.new || (rm -f $@; exit 1) - grep 'MARKER' $@.new > $@; rm -f $@.new --platform_PROGRAMS += verifiers.module --MODULE_FILES += verifiers.module$(EXEEXT) --verifiers_module_SOURCES = commands/verifiers.c ## platform sources --nodist_verifiers_module_SOURCES = ## platform nodist sources --verifiers_module_LDADD = --verifiers_module_CFLAGS = $(AM_CFLAGS) $(CFLAGS_MODULE) --verifiers_module_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_MODULE) --verifiers_module_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_MODULE) --verifiers_module_CCASFLAGS = $(AM_CCASFLAGS) $(CCASFLAGS_MODULE) --verifiers_module_DEPENDENCIES = $(TARGET_OBJ2ELF) --dist_noinst_DATA += --BUILT_SOURCES += $(nodist_verifiers_module_SOURCES) --CLEANFILES += $(nodist_verifiers_module_SOURCES) --MOD_FILES += verifiers.mod --MARKER_FILES += verifiers.marker --CLEANFILES += verifiers.marker -- --verifiers.marker: $(verifiers_module_SOURCES) $(nodist_verifiers_module_SOURCES) -- $(TARGET_CPP) -DGRUB_LST_GENERATOR $(CPPFLAGS_MARKER) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(verifiers_module_CPPFLAGS) $(CPPFLAGS) $^ > $@.new || (rm -f $@; exit 1) -- grep 'MARKER' $@.new > $@; rm -f $@.new - - if COND_x86_64_efi - platform_PROGRAMS += shim_lock.module -@@ -22377,7 +22357,7 @@ gcry_whirlpool.marker: $(gcry_whirlpool_module_SOURCES) $(nodist_gcry_whirlpool_ - if COND_emu - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = --kernel_exec_SOURCES += disk/host.c kern/emu/cache_s.S kern/emu/hostdisk.c osdep/unix/hostdisk.c osdep/exec.c osdep/devmapper/hostdisk.c osdep/hostdisk.c kern/emu/hostfs.c kern/emu/main.c kern/emu/argp_common.c kern/emu/misc.c kern/emu/mm.c kern/emu/time.c kern/emu/cache.c osdep/emuconsole.c osdep/dl.c osdep/sleep.c osdep/init.c osdep/emunet.c osdep/cputime.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += disk/host.c kern/emu/cache_s.S kern/emu/hostdisk.c osdep/unix/hostdisk.c osdep/exec.c osdep/devmapper/hostdisk.c osdep/hostdisk.c kern/emu/hostfs.c kern/emu/main.c kern/emu/argp_common.c kern/emu/misc.c kern/emu/mm.c kern/emu/time.c kern/emu/cache.c osdep/emuconsole.c osdep/dl.c osdep/sleep.c osdep/init.c osdep/emunet.c osdep/cputime.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) $(CFLAGS_GNULIB) -@@ -22399,7 +22379,7 @@ endif - if COND_i386_pc - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/i386/pc/startup.S --kernel_exec_SOURCES += kern/i386/pc/init.c kern/i386/pc/mmap.c term/i386/pc/console.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += kern/i386/pc/init.c kern/i386/pc/mmap.c term/i386/pc/console.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22421,7 +22401,7 @@ endif - if COND_i386_efi - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/i386/efi/startup.S --kernel_exec_SOURCES += kern/i386/efi/tsc.c kern/i386/tsc_pmtimer.c kern/i386/efi/init.c bus/pci.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += kern/i386/efi/tsc.c kern/i386/tsc_pmtimer.c kern/i386/efi/init.c bus/pci.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22443,7 +22423,7 @@ endif - if COND_i386_qemu - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/i386/qemu/startup.S --kernel_exec_SOURCES += kern/i386/qemu/init.c bus/pci.c kern/vga_init.c kern/i386/qemu/mmap.c term/i386/pc/vga_text.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += kern/i386/qemu/init.c bus/pci.c kern/vga_init.c kern/i386/qemu/mmap.c term/i386/pc/vga_text.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22465,7 +22445,7 @@ endif - if COND_i386_coreboot - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/i386/coreboot/startup.S --kernel_exec_SOURCES += kern/i386/coreboot/init.c kern/i386/pc/acpi.c kern/acpi.c kern/i386/tsc_pmtimer.c kern/i386/coreboot/cbtable.c video/coreboot/cbfb.c kern/coreboot/mmap.c kern/coreboot/cbtable.c term/gfxterm.c font/font.c font/font_cmd.c io/bufio.c video/fb/fbblit.c video/fb/fbfill.c video/fb/fbutil.c video/fb/video_fb.c video/video.c term/i386/pc/vga_text.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += kern/i386/coreboot/init.c kern/i386/pc/acpi.c kern/acpi.c kern/i386/tsc_pmtimer.c kern/i386/coreboot/cbtable.c video/coreboot/cbfb.c kern/coreboot/mmap.c kern/coreboot/cbtable.c term/gfxterm.c font/font.c font/font_cmd.c io/bufio.c video/fb/fbblit.c video/fb/fbfill.c video/fb/fbutil.c video/fb/video_fb.c video/video.c term/i386/pc/vga_text.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22487,7 +22467,7 @@ endif - if COND_i386_multiboot - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/i386/coreboot/startup.S --kernel_exec_SOURCES += kern/i386/coreboot/init.c kern/i386/pc/acpi.c kern/acpi.c kern/i386/multiboot_mmap.c term/i386/pc/vga_text.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += kern/i386/coreboot/init.c kern/i386/pc/acpi.c kern/acpi.c kern/i386/multiboot_mmap.c term/i386/pc/vga_text.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22509,7 +22489,7 @@ endif - if COND_i386_ieee1275 - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/i386/ieee1275/startup.S --kernel_exec_SOURCES += disk/ieee1275/ofdisk.c kern/ieee1275/cmain.c kern/ieee1275/ieee1275.c kern/ieee1275/mmap.c kern/ieee1275/openfw.c term/ieee1275/console.c kern/ieee1275/init.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += disk/ieee1275/ofdisk.c kern/ieee1275/cmain.c kern/ieee1275/ieee1275.c kern/ieee1275/mmap.c kern/ieee1275/openfw.c term/ieee1275/console.c kern/ieee1275/init.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22531,7 +22511,7 @@ endif - if COND_x86_64_efi - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/x86_64/efi/startup.S --kernel_exec_SOURCES += kern/i386/efi/tsc.c kern/i386/tsc_pmtimer.c kern/x86_64/efi/callwrap.S kern/i386/efi/init.c bus/pci.c kern/x86_64/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += kern/i386/efi/tsc.c kern/i386/tsc_pmtimer.c kern/x86_64/efi/callwrap.S kern/i386/efi/init.c bus/pci.c kern/x86_64/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22553,7 +22533,7 @@ endif - if COND_i386_xen - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/i386/xen/startup.S --kernel_exec_SOURCES += kern/i386/dl.c kern/i386/xen/hypercall.S kern/i386/tsc.c kern/i386/xen/tsc.c kern/xen/init.c term/xen/console.c disk/xen/xendisk.c commands/boot.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += kern/i386/dl.c kern/i386/xen/hypercall.S kern/i386/tsc.c kern/i386/xen/tsc.c kern/xen/init.c term/xen/console.c disk/xen/xendisk.c commands/boot.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22575,7 +22555,7 @@ endif - if COND_x86_64_xen - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/x86_64/xen/startup.S --kernel_exec_SOURCES += kern/x86_64/dl.c kern/x86_64/xen/hypercall.S kern/i386/tsc.c kern/i386/xen/tsc.c kern/xen/init.c term/xen/console.c disk/xen/xendisk.c commands/boot.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += kern/x86_64/dl.c kern/x86_64/xen/hypercall.S kern/i386/tsc.c kern/i386/xen/tsc.c kern/xen/init.c term/xen/console.c disk/xen/xendisk.c commands/boot.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22597,7 +22577,7 @@ endif - if COND_i386_xen_pvh - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/i386/xen/startup_pvh.S --kernel_exec_SOURCES += kern/i386/dl.c commands/boot.c disk/xen/xendisk.c kern/i386/tsc.c kern/i386/xen/tsc.c kern/i386/xen/pvh.c kern/xen/init.c term/xen/console.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += kern/i386/dl.c commands/boot.c disk/xen/xendisk.c kern/i386/tsc.c kern/i386/xen/tsc.c kern/i386/xen/pvh.c kern/xen/init.c term/xen/console.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22619,7 +22599,7 @@ endif - if COND_mips_loongson - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/mips/startup.S --kernel_exec_SOURCES += term/ns8250.c bus/bonito.c bus/cs5536.c bus/pci.c kern/mips/loongson/init.c term/at_keyboard.c term/ps2.c commands/boot.c term/serial.c video/sm712.c video/sis315pro.c video/radeon_fuloong2e.c video/radeon_yeeloong3a.c commands/keylayouts.c term/gfxterm.c font/font.c font/font_cmd.c io/bufio.c video/fb/fbblit.c video/fb/fbfill.c video/fb/fbutil.c video/fb/video_fb.c video/video.c kern/generic/rtc_get_time_ms.c kern/mips/cache.S kern/mips/dl.c kern/mips/init.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += term/ns8250.c bus/bonito.c bus/cs5536.c bus/pci.c kern/mips/loongson/init.c term/at_keyboard.c term/ps2.c commands/boot.c term/serial.c video/sm712.c video/sis315pro.c video/radeon_fuloong2e.c video/radeon_yeeloong3a.c commands/keylayouts.c term/gfxterm.c font/font.c font/font_cmd.c io/bufio.c video/fb/fbblit.c video/fb/fbfill.c video/fb/fbutil.c video/fb/video_fb.c video/video.c kern/generic/rtc_get_time_ms.c kern/mips/cache.S kern/mips/dl.c kern/mips/init.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22641,7 +22621,7 @@ endif - if COND_sparc64_ieee1275 - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/sparc64/ieee1275/crt0.S --kernel_exec_SOURCES += kern/sparc64/cache.S kern/sparc64/dl.c kern/sparc64/ieee1275/ieee1275.c disk/ieee1275/obdisk.c disk/ieee1275/ofdisk.c kern/ieee1275/cmain.c kern/ieee1275/ieee1275.c kern/ieee1275/mmap.c kern/ieee1275/openfw.c term/ieee1275/console.c kern/ieee1275/init.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += kern/sparc64/cache.S kern/sparc64/dl.c kern/sparc64/ieee1275/ieee1275.c disk/ieee1275/obdisk.c disk/ieee1275/ofdisk.c kern/ieee1275/cmain.c kern/ieee1275/ieee1275.c kern/ieee1275/mmap.c kern/ieee1275/openfw.c term/ieee1275/console.c kern/ieee1275/init.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22663,7 +22643,7 @@ endif - if COND_powerpc_ieee1275 - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/powerpc/ieee1275/startup.S --kernel_exec_SOURCES += kern/powerpc/cache.S kern/powerpc/dl.c kern/powerpc/compiler-rt.S disk/ieee1275/ofdisk.c kern/ieee1275/cmain.c kern/ieee1275/ieee1275.c kern/ieee1275/mmap.c kern/ieee1275/openfw.c term/ieee1275/console.c kern/ieee1275/init.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += kern/powerpc/cache.S kern/powerpc/dl.c kern/powerpc/compiler-rt.S disk/ieee1275/ofdisk.c kern/ieee1275/cmain.c kern/ieee1275/ieee1275.c kern/ieee1275/mmap.c kern/ieee1275/openfw.c term/ieee1275/console.c kern/ieee1275/init.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22685,7 +22665,7 @@ endif - if COND_mips_arc - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/mips/startup.S --kernel_exec_SOURCES += kern/mips/arc/init.c term/arc/console.c disk/arc/arcdisk.c kern/generic/rtc_get_time_ms.c kern/mips/cache.S kern/mips/dl.c kern/mips/init.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += kern/mips/arc/init.c term/arc/console.c disk/arc/arcdisk.c kern/generic/rtc_get_time_ms.c kern/mips/cache.S kern/mips/dl.c kern/mips/init.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22707,7 +22687,7 @@ endif - if COND_ia64_efi - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = --kernel_exec_SOURCES += kern/ia64/efi/startup.S kern/ia64/efi/init.c kern/ia64/dl.c kern/ia64/dl_helper.c kern/ia64/cache.c lib/division.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += kern/ia64/efi/startup.S kern/ia64/efi/init.c kern/ia64/dl.c kern/ia64/dl_helper.c kern/ia64/cache.c lib/division.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -fno-builtin -fpic -minline-int-divide-max-throughput -@@ -22729,7 +22709,7 @@ endif - if COND_mips_qemu_mips - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/mips/startup.S --kernel_exec_SOURCES += kern/mips/qemu_mips/init.c term/ns8250.c term/serial.c term/at_keyboard.c term/ps2.c commands/boot.c commands/keylayouts.c term/i386/pc/vga_text.c kern/vga_init.c kern/generic/rtc_get_time_ms.c kern/mips/cache.S kern/mips/dl.c kern/mips/init.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += kern/mips/qemu_mips/init.c term/ns8250.c term/serial.c term/at_keyboard.c term/ps2.c commands/boot.c commands/keylayouts.c term/i386/pc/vga_text.c kern/vga_init.c kern/generic/rtc_get_time_ms.c kern/mips/cache.S kern/mips/dl.c kern/mips/init.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22751,7 +22731,7 @@ endif - if COND_arm_uboot - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/arm/startup.S --kernel_exec_SOURCES += kern/arm/uboot/init.c kern/arm/uboot/uboot.S disk/uboot/ubootdisk.c kern/uboot/uboot.c kern/uboot/init.c kern/uboot/hw.c term/uboot/console.c kern/arm/dl.c kern/arm/dl_helper.c kern/arm/cache_armv6.S kern/arm/cache_armv7.S kern/arm/cache.c kern/arm/compiler-rt.S lib/division.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += kern/arm/uboot/init.c kern/arm/uboot/uboot.S disk/uboot/ubootdisk.c kern/uboot/uboot.c kern/uboot/init.c kern/uboot/hw.c term/uboot/console.c kern/arm/dl.c kern/arm/dl_helper.c kern/arm/cache_armv6.S kern/arm/cache_armv7.S kern/arm/cache.c kern/arm/compiler-rt.S lib/division.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22773,7 +22753,7 @@ endif - if COND_arm_efi - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/arm/efi/startup.S --kernel_exec_SOURCES += kern/arm/efi/init.c kern/efi/fdt.c kern/arm/dl.c kern/arm/dl_helper.c kern/arm/cache_armv6.S kern/arm/cache_armv7.S kern/arm/cache.c kern/arm/compiler-rt.S lib/division.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += kern/arm/efi/init.c kern/efi/fdt.c kern/arm/dl.c kern/arm/dl_helper.c kern/arm/cache_armv6.S kern/arm/cache_armv7.S kern/arm/cache.c kern/arm/compiler-rt.S lib/division.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22795,7 +22775,7 @@ endif - if COND_arm64_efi - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/arm64/efi/startup.S --kernel_exec_SOURCES += kern/arm64/efi/init.c kern/efi/fdt.c kern/arm64/cache.c kern/arm64/cache_flush.S kern/arm64/dl.c kern/arm64/dl_helper.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += kern/arm64/efi/init.c kern/efi/fdt.c kern/arm64/cache.c kern/arm64/cache_flush.S kern/arm64/dl.c kern/arm64/dl_helper.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22817,7 +22797,7 @@ endif - if COND_arm_coreboot - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/arm/startup.S --kernel_exec_SOURCES += kern/arm/coreboot/init.c kern/arm/coreboot/timer.c kern/arm/coreboot/coreboot.S lib/fdt.c bus/fdt.c term/ps2.c term/arm/pl050.c term/arm/cros.c term/arm/cros_ec.c bus/spi/rk3288_spi.c commands/keylayouts.c kern/arm/coreboot/dma.c kern/arm/coreboot/cbtable.c video/coreboot/cbfb.c kern/coreboot/mmap.c kern/coreboot/cbtable.c term/gfxterm.c font/font.c font/font_cmd.c io/bufio.c video/fb/fbblit.c video/fb/fbfill.c video/fb/fbutil.c video/fb/video_fb.c video/video.c kern/arm/dl.c kern/arm/dl_helper.c kern/arm/cache_armv6.S kern/arm/cache_armv7.S kern/arm/cache.c kern/arm/compiler-rt.S lib/division.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += kern/arm/coreboot/init.c kern/arm/coreboot/timer.c kern/arm/coreboot/coreboot.S lib/fdt.c bus/fdt.c term/ps2.c term/arm/pl050.c term/arm/cros.c term/arm/cros_ec.c bus/spi/rk3288_spi.c commands/keylayouts.c kern/arm/coreboot/dma.c kern/arm/coreboot/cbtable.c video/coreboot/cbfb.c kern/coreboot/mmap.c kern/coreboot/cbtable.c term/gfxterm.c font/font.c font/font_cmd.c io/bufio.c video/fb/fbblit.c video/fb/fbfill.c video/fb/fbutil.c video/fb/video_fb.c video/video.c kern/arm/dl.c kern/arm/dl_helper.c kern/arm/cache_armv6.S kern/arm/cache_armv7.S kern/arm/cache.c kern/arm/compiler-rt.S lib/division.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22839,7 +22819,7 @@ endif - if COND_riscv32_efi - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/riscv/efi/startup.S --kernel_exec_SOURCES += kern/riscv/efi/init.c kern/efi/fdt.c kern/riscv/cache.c kern/riscv/cache_flush.S kern/riscv/dl.c lib/division.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += kern/riscv/efi/init.c kern/efi/fdt.c kern/riscv/cache.c kern/riscv/cache_flush.S kern/riscv/dl.c lib/division.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22861,7 +22841,7 @@ endif - if COND_riscv64_efi - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/riscv/efi/startup.S --kernel_exec_SOURCES += kern/riscv/efi/init.c kern/efi/fdt.c kern/riscv/cache.c kern/riscv/cache_flush.S kern/riscv/dl.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c -+kernel_exec_SOURCES += kern/riscv/efi/init.c kern/efi/fdt.c kern/riscv/cache.c kern/riscv/cache_flush.S kern/riscv/dl.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index abd26cf..f6c0348 100644 ---- a/grub-core/Makefile.core.def -+++ b/grub-core/Makefile.core.def -@@ -140,6 +140,7 @@ kernel = { - common = kern/rescue_parser.c; - common = kern/rescue_reader.c; - common = kern/term.c; -+ common = kern/verifiers.c; - - noemu = kern/compiler-rt.c; - noemu = kern/mm.c; -@@ -943,11 +944,6 @@ module = { - cppflags = '-I$(srcdir)/lib/posix_wrap'; - }; - --module = { -- name = verifiers; -- common = commands/verifiers.c; --}; -- - module = { - name = shim_lock; - common = commands/efi/shim_lock.c; -diff --git a/grub-core/Makefile.in b/grub-core/Makefile.in -index 8fb81ee..8930714 100644 ---- a/grub-core/Makefile.in -+++ b/grub-core/Makefile.in -@@ -202,39 +202,39 @@ platform_PROGRAMS = disk.module$(EXEEXT) trig.module$(EXEEXT) \ - $(am__EXEEXT_286) $(am__EXEEXT_287) $(am__EXEEXT_288) \ - $(am__EXEEXT_289) $(am__EXEEXT_290) $(am__EXEEXT_291) \ - $(am__EXEEXT_292) hashsum.module$(EXEEXT) pgp.module$(EXEEXT) \ -- verifiers.module$(EXEEXT) $(am__EXEEXT_293) $(am__EXEEXT_294) \ -- $(am__EXEEXT_295) $(am__EXEEXT_296) $(am__EXEEXT_297) \ -- $(am__EXEEXT_298) $(am__EXEEXT_299) $(am__EXEEXT_300) \ -- $(am__EXEEXT_301) $(am__EXEEXT_302) help.module$(EXEEXT) \ -- hexdump.module$(EXEEXT) keystatus.module$(EXEEXT) \ -- $(am__EXEEXT_303) $(am__EXEEXT_304) loadenv.module$(EXEEXT) \ -- ls.module$(EXEEXT) lsmmap.module$(EXEEXT) $(am__EXEEXT_305) \ -- $(am__EXEEXT_306) $(am__EXEEXT_307) $(am__EXEEXT_308) \ -- $(am__EXEEXT_309) $(am__EXEEXT_310) $(am__EXEEXT_311) \ -- $(am__EXEEXT_312) memrw.module$(EXEEXT) \ -- minicmd.module$(EXEEXT) parttool.module$(EXEEXT) \ -- password.module$(EXEEXT) password_pbkdf2.module$(EXEEXT) \ -- $(am__EXEEXT_313) $(am__EXEEXT_314) $(am__EXEEXT_315) \ -- $(am__EXEEXT_316) $(am__EXEEXT_317) $(am__EXEEXT_318) \ -- $(am__EXEEXT_319) $(am__EXEEXT_320) $(am__EXEEXT_321) \ -- $(am__EXEEXT_322) $(am__EXEEXT_323) $(am__EXEEXT_324) \ -- $(am__EXEEXT_325) $(am__EXEEXT_326) $(am__EXEEXT_327) \ -- $(am__EXEEXT_328) $(am__EXEEXT_329) $(am__EXEEXT_330) \ -- $(am__EXEEXT_331) $(am__EXEEXT_332) $(am__EXEEXT_333) \ -- probe.module$(EXEEXT) read.module$(EXEEXT) \ -- search.module$(EXEEXT) search_fs_file.module$(EXEEXT) \ -- search_fs_uuid.module$(EXEEXT) search_label.module$(EXEEXT) \ -- $(am__EXEEXT_334) $(am__EXEEXT_335) $(am__EXEEXT_336) \ -- $(am__EXEEXT_337) $(am__EXEEXT_338) $(am__EXEEXT_339) \ -- $(am__EXEEXT_340) $(am__EXEEXT_341) $(am__EXEEXT_342) \ -- $(am__EXEEXT_343) $(am__EXEEXT_344) $(am__EXEEXT_345) \ -- $(am__EXEEXT_346) $(am__EXEEXT_347) $(am__EXEEXT_348) \ -- $(am__EXEEXT_349) sleep.module$(EXEEXT) $(am__EXEEXT_350) \ -- $(am__EXEEXT_351) terminal.module$(EXEEXT) \ -- test.module$(EXEEXT) true.module$(EXEEXT) $(am__EXEEXT_352) \ -- $(am__EXEEXT_353) $(am__EXEEXT_354) $(am__EXEEXT_355) \ -- $(am__EXEEXT_356) $(am__EXEEXT_357) $(am__EXEEXT_358) \ -- $(am__EXEEXT_359) $(am__EXEEXT_360) videoinfo.module$(EXEEXT) \ -+ $(am__EXEEXT_293) $(am__EXEEXT_294) $(am__EXEEXT_295) \ -+ $(am__EXEEXT_296) $(am__EXEEXT_297) $(am__EXEEXT_298) \ -+ $(am__EXEEXT_299) $(am__EXEEXT_300) $(am__EXEEXT_301) \ -+ $(am__EXEEXT_302) help.module$(EXEEXT) hexdump.module$(EXEEXT) \ -+ keystatus.module$(EXEEXT) $(am__EXEEXT_303) $(am__EXEEXT_304) \ -+ loadenv.module$(EXEEXT) ls.module$(EXEEXT) \ -+ lsmmap.module$(EXEEXT) $(am__EXEEXT_305) $(am__EXEEXT_306) \ -+ $(am__EXEEXT_307) $(am__EXEEXT_308) $(am__EXEEXT_309) \ -+ $(am__EXEEXT_310) $(am__EXEEXT_311) $(am__EXEEXT_312) \ -+ memrw.module$(EXEEXT) minicmd.module$(EXEEXT) \ -+ parttool.module$(EXEEXT) password.module$(EXEEXT) \ -+ password_pbkdf2.module$(EXEEXT) $(am__EXEEXT_313) \ -+ $(am__EXEEXT_314) $(am__EXEEXT_315) $(am__EXEEXT_316) \ -+ $(am__EXEEXT_317) $(am__EXEEXT_318) $(am__EXEEXT_319) \ -+ $(am__EXEEXT_320) $(am__EXEEXT_321) $(am__EXEEXT_322) \ -+ $(am__EXEEXT_323) $(am__EXEEXT_324) $(am__EXEEXT_325) \ -+ $(am__EXEEXT_326) $(am__EXEEXT_327) $(am__EXEEXT_328) \ -+ $(am__EXEEXT_329) $(am__EXEEXT_330) $(am__EXEEXT_331) \ -+ $(am__EXEEXT_332) $(am__EXEEXT_333) probe.module$(EXEEXT) \ -+ read.module$(EXEEXT) search.module$(EXEEXT) \ -+ search_fs_file.module$(EXEEXT) search_fs_uuid.module$(EXEEXT) \ -+ search_label.module$(EXEEXT) $(am__EXEEXT_334) \ -+ $(am__EXEEXT_335) $(am__EXEEXT_336) $(am__EXEEXT_337) \ -+ $(am__EXEEXT_338) $(am__EXEEXT_339) $(am__EXEEXT_340) \ -+ $(am__EXEEXT_341) $(am__EXEEXT_342) $(am__EXEEXT_343) \ -+ $(am__EXEEXT_344) $(am__EXEEXT_345) $(am__EXEEXT_346) \ -+ $(am__EXEEXT_347) $(am__EXEEXT_348) $(am__EXEEXT_349) \ -+ sleep.module$(EXEEXT) $(am__EXEEXT_350) $(am__EXEEXT_351) \ -+ terminal.module$(EXEEXT) test.module$(EXEEXT) \ -+ true.module$(EXEEXT) $(am__EXEEXT_352) $(am__EXEEXT_353) \ -+ $(am__EXEEXT_354) $(am__EXEEXT_355) $(am__EXEEXT_356) \ -+ $(am__EXEEXT_357) $(am__EXEEXT_358) $(am__EXEEXT_359) \ -+ $(am__EXEEXT_360) videoinfo.module$(EXEEXT) \ - videotest.module$(EXEEXT) xnu_uuid.module$(EXEEXT) \ - dm_nv.module$(EXEEXT) loopback.module$(EXEEXT) \ - cryptodisk.module$(EXEEXT) luks.module$(EXEEXT) \ -@@ -10474,7 +10474,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c \ - kern/misc.c kern/parser.c kern/partition.c \ - kern/rescue_parser.c kern/rescue_reader.c kern/term.c \ -- kern/arm/startup.S kern/arm/coreboot/init.c \ -+ kern/verifiers.c kern/arm/startup.S kern/arm/coreboot/init.c \ - kern/arm/coreboot/timer.c kern/arm/coreboot/coreboot.S \ - lib/fdt.c bus/fdt.c term/ps2.c term/arm/pl050.c \ - term/arm/cros.c term/arm/cros_ec.c bus/spi/rk3288_spi.c \ -@@ -10564,7 +10564,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEXT) \ --@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_TRUE@ kern/kernel_exec-term.$(OBJEXT) -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_TRUE@ kern/kernel_exec-term.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT) - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@am_kernel_exec_OBJECTS = kern/x86_64/efi/kernel_exec-startup.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/i386/efi/kernel_exec-tsc.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/i386/kernel_exec-tsc_pmtimer.$(OBJEXT) \ -@@ -10602,7 +10603,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEXT) \ --@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/kernel_exec-term.$(OBJEXT) -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/kernel_exec-term.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT) - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_TRUE@am_kernel_exec_OBJECTS = kern/sparc64/ieee1275/kernel_exec-crt0.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_TRUE@ kern/sparc64/kernel_exec-cache.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_TRUE@ kern/sparc64/kernel_exec-dl.$(OBJEXT) \ -@@ -10639,7 +10641,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEXT) \ --@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_TRUE@ kern/kernel_exec-term.$(OBJEXT) -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_TRUE@ kern/kernel_exec-term.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT) - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@am_kernel_exec_OBJECTS = kern/riscv/efi/kernel_exec-startup.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/riscv/efi/kernel_exec-init.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/efi/kernel_exec-fdt.$(OBJEXT) \ -@@ -10674,7 +10677,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEXT) \ --@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/kernel_exec-term.$(OBJEXT) -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/kernel_exec-term.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT) - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@am_kernel_exec_OBJECTS = kern/riscv/efi/kernel_exec-startup.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/riscv/efi/kernel_exec-init.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/efi/kernel_exec-fdt.$(OBJEXT) \ -@@ -10710,7 +10714,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEXT) \ --@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/kernel_exec-term.$(OBJEXT) -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/kernel_exec-term.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT) - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_TRUE@am_kernel_exec_OBJECTS = kern/powerpc/ieee1275/kernel_exec-startup.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_TRUE@ kern/powerpc/kernel_exec-cache.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_TRUE@ kern/powerpc/kernel_exec-dl.$(OBJEXT) \ -@@ -10746,7 +10751,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEXT) \ --@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_TRUE@ kern/kernel_exec-term.$(OBJEXT) -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_TRUE@ kern/kernel_exec-term.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT) - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_TRUE@am_kernel_exec_OBJECTS = kern/mips/kernel_exec-startup.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_TRUE@ kern/mips/qemu_mips/kernel_exec-init.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_TRUE@ term/kernel_exec-ns8250.$(OBJEXT) \ -@@ -10785,7 +10791,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEXT) \ --@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_TRUE@ kern/kernel_exec-term.$(OBJEXT) -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_TRUE@ kern/kernel_exec-term.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT) - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_TRUE@am_kernel_exec_OBJECTS = kern/mips/kernel_exec-startup.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_TRUE@ term/kernel_exec-ns8250.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_TRUE@ bus/kernel_exec-bonito.$(OBJEXT) \ -@@ -10838,7 +10845,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEXT) \ --@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_TRUE@ kern/kernel_exec-term.$(OBJEXT) -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_TRUE@ kern/kernel_exec-term.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT) - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_TRUE@am_kernel_exec_OBJECTS = kern/mips/kernel_exec-startup.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_TRUE@ kern/mips/arc/kernel_exec-init.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_TRUE@ term/arc/kernel_exec-console.$(OBJEXT) \ -@@ -10871,7 +10879,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEXT) \ --@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_TRUE@ kern/kernel_exec-term.$(OBJEXT) -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_TRUE@ kern/kernel_exec-term.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT) - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@am_kernel_exec_OBJECTS = kern/ia64/efi/kernel_exec-startup.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/ia64/efi/kernel_exec-init.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/ia64/kernel_exec-dl.$(OBJEXT) \ -@@ -10906,7 +10915,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEXT) \ --@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/kernel_exec-term.$(OBJEXT) -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/kernel_exec-term.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT) - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_TRUE@am_kernel_exec_OBJECTS = kern/i386/xen/kernel_exec-startup_pvh.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_TRUE@ kern/i386/kernel_exec-dl.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_TRUE@ commands/kernel_exec-boot.$(OBJEXT) \ -@@ -10940,7 +10950,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEXT) \ --@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_TRUE@ kern/kernel_exec-term.$(OBJEXT) -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_TRUE@ kern/kernel_exec-term.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT) - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_TRUE@am_kernel_exec_OBJECTS = kern/i386/xen/kernel_exec-startup.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_TRUE@ kern/i386/kernel_exec-dl.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_TRUE@ kern/i386/xen/kernel_exec-hypercall.$(OBJEXT) \ -@@ -10974,7 +10985,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEXT) \ --@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_TRUE@ kern/kernel_exec-term.$(OBJEXT) -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_TRUE@ kern/kernel_exec-term.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT) - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_TRUE@am_kernel_exec_OBJECTS = kern/i386/qemu/kernel_exec-startup.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_TRUE@ kern/i386/qemu/kernel_exec-init.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_TRUE@ bus/kernel_exec-pci.$(OBJEXT) \ -@@ -11004,7 +11016,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEXT) \ --@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_TRUE@ kern/kernel_exec-term.$(OBJEXT) -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_TRUE@ kern/kernel_exec-term.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT) - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_TRUE@am_kernel_exec_OBJECTS = kern/i386/pc/kernel_exec-startup.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_TRUE@ kern/i386/pc/kernel_exec-init.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_TRUE@ kern/i386/pc/kernel_exec-mmap.$(OBJEXT) \ -@@ -11032,7 +11045,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEXT) \ --@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_TRUE@ kern/kernel_exec-term.$(OBJEXT) -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_TRUE@ kern/kernel_exec-term.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT) - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_TRUE@am_kernel_exec_OBJECTS = kern/i386/coreboot/kernel_exec-startup.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_TRUE@ kern/i386/coreboot/kernel_exec-init.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_TRUE@ kern/i386/pc/kernel_exec-acpi.$(OBJEXT) \ -@@ -11062,7 +11076,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEXT) \ --@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_TRUE@ kern/kernel_exec-term.$(OBJEXT) -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_TRUE@ kern/kernel_exec-term.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT) - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_TRUE@am_kernel_exec_OBJECTS = kern/i386/ieee1275/kernel_exec-startup.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_TRUE@ disk/ieee1275/kernel_exec-ofdisk.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_TRUE@ kern/ieee1275/kernel_exec-cmain.$(OBJEXT) \ -@@ -11098,7 +11113,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEXT) \ --@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_TRUE@ kern/kernel_exec-term.$(OBJEXT) -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_TRUE@ kern/kernel_exec-term.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT) - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@am_kernel_exec_OBJECTS = kern/i386/efi/kernel_exec-startup.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/i386/efi/kernel_exec-tsc.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/i386/kernel_exec-tsc_pmtimer.$(OBJEXT) \ -@@ -11135,7 +11151,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEXT) \ --@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/kernel_exec-term.$(OBJEXT) -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/kernel_exec-term.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT) - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_TRUE@am_kernel_exec_OBJECTS = kern/i386/coreboot/kernel_exec-startup.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_TRUE@ kern/i386/coreboot/kernel_exec-init.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_TRUE@ kern/i386/pc/kernel_exec-acpi.$(OBJEXT) \ -@@ -11178,7 +11195,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEXT) \ --@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_TRUE@ kern/kernel_exec-term.$(OBJEXT) -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_TRUE@ kern/kernel_exec-term.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT) - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_TRUE@am_kernel_exec_OBJECTS = disk/kernel_exec-host.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_TRUE@ kern/emu/kernel_exec-cache_s.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_TRUE@ kern/emu/kernel_exec-hostdisk.$(OBJEXT) \ -@@ -11219,7 +11237,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEXT) \ --@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_TRUE@ kern/kernel_exec-term.$(OBJEXT) -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_TRUE@ kern/kernel_exec-term.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT) - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_TRUE@am_kernel_exec_OBJECTS = kern/arm/kernel_exec-startup.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_TRUE@ kern/arm/uboot/kernel_exec-init.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_TRUE@ kern/arm/uboot/kernel_exec-uboot.$(OBJEXT) \ -@@ -11259,7 +11278,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEXT) \ --@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_TRUE@ kern/kernel_exec-term.$(OBJEXT) -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_TRUE@ kern/kernel_exec-term.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT) - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@am_kernel_exec_OBJECTS = kern/arm/efi/kernel_exec-startup.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/arm/efi/kernel_exec-init.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/efi/kernel_exec-fdt.$(OBJEXT) \ -@@ -11298,7 +11318,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEXT) \ --@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/kernel_exec-term.$(OBJEXT) -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/kernel_exec-term.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT) - @COND_arm64_efi_FALSE@@COND_arm_coreboot_TRUE@am_kernel_exec_OBJECTS = kern/arm/kernel_exec-startup.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_TRUE@ kern/arm/coreboot/kernel_exec-init.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_TRUE@ kern/arm/coreboot/kernel_exec-timer.$(OBJEXT) \ -@@ -11352,7 +11373,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEXT) \ --@COND_arm64_efi_FALSE@@COND_arm_coreboot_TRUE@ kern/kernel_exec-term.$(OBJEXT) -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_TRUE@ kern/kernel_exec-term.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT) - @COND_arm64_efi_TRUE@am_kernel_exec_OBJECTS = kern/arm64/efi/kernel_exec-startup.$(OBJEXT) \ - @COND_arm64_efi_TRUE@ kern/arm64/efi/kernel_exec-init.$(OBJEXT) \ - @COND_arm64_efi_TRUE@ kern/efi/kernel_exec-fdt.$(OBJEXT) \ -@@ -11388,7 +11410,8 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_TRUE@ kern/kernel_exec-partition.$(OBJEXT) \ - @COND_arm64_efi_TRUE@ kern/kernel_exec-rescue_parser.$(OBJEXT) \ - @COND_arm64_efi_TRUE@ kern/kernel_exec-rescue_reader.$(OBJEXT) \ --@COND_arm64_efi_TRUE@ kern/kernel_exec-term.$(OBJEXT) -+@COND_arm64_efi_TRUE@ kern/kernel_exec-term.$(OBJEXT) \ -+@COND_arm64_efi_TRUE@ kern/kernel_exec-verifiers.$(OBJEXT) - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_TRUE@nodist_kernel_exec_OBJECTS = kernel_exec-symlist.$(OBJEXT) - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@nodist_kernel_exec_OBJECTS = kernel_exec-symlist.$(OBJEXT) - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_TRUE@nodist_kernel_exec_OBJECTS = kernel_exec-symlist.$(OBJEXT) -@@ -13146,13 +13169,6 @@ vbe_module_OBJECTS = $(am_vbe_module_OBJECTS) \ - $(nodist_vbe_module_OBJECTS) - vbe_module_LINK = $(CCLD) $(vbe_module_CFLAGS) $(CFLAGS) \ - $(vbe_module_LDFLAGS) $(LDFLAGS) -o $@ --am_verifiers_module_OBJECTS = \ -- commands/verifiers_module-verifiers.$(OBJEXT) --nodist_verifiers_module_OBJECTS = --verifiers_module_OBJECTS = $(am_verifiers_module_OBJECTS) \ -- $(nodist_verifiers_module_OBJECTS) --verifiers_module_LINK = $(CCLD) $(verifiers_module_CFLAGS) $(CFLAGS) \ -- $(verifiers_module_LDFLAGS) $(LDFLAGS) -o $@ - am__vga_module_SOURCES_DIST = video/i386/pc/vga.c - @COND_i386_pc_TRUE@am_vga_module_OBJECTS = \ - @COND_i386_pc_TRUE@ video/i386/pc/vga_module-vga.$(OBJEXT) -@@ -13879,7 +13895,6 @@ SOURCES = $(acpi_module_SOURCES) $(nodist_acpi_module_SOURCES) \ - $(nodist_usbserial_usbdebug_module_SOURCES) \ - $(usbtest_module_SOURCES) $(nodist_usbtest_module_SOURCES) \ - $(vbe_module_SOURCES) $(nodist_vbe_module_SOURCES) \ -- $(verifiers_module_SOURCES) $(nodist_verifiers_module_SOURCES) \ - $(vga_module_SOURCES) $(nodist_vga_module_SOURCES) \ - $(vga_text_module_SOURCES) $(nodist_vga_text_module_SOURCES) \ - $(video_module_SOURCES) $(nodist_video_module_SOURCES) \ -@@ -14089,8 +14104,7 @@ DIST_SOURCES = $(am__acpi_module_SOURCES_DIST) \ - $(am__usbserial_pl2303_module_SOURCES_DIST) \ - $(am__usbserial_usbdebug_module_SOURCES_DIST) \ - $(am__usbtest_module_SOURCES_DIST) \ -- $(am__vbe_module_SOURCES_DIST) $(verifiers_module_SOURCES) \ -- $(am__vga_module_SOURCES_DIST) \ -+ $(am__vbe_module_SOURCES_DIST) $(am__vga_module_SOURCES_DIST) \ - $(am__vga_text_module_SOURCES_DIST) \ - $(am__video_module_SOURCES_DIST) \ - $(am__video_bochs_module_SOURCES_DIST) \ -@@ -15497,38 +15511,38 @@ MOD_FILES = disk.mod trig.mod $(am__append_8) $(am__append_15) \ - $(am__append_1989) $(am__append_1996) $(am__append_2003) \ - $(am__append_2010) $(am__append_2017) $(am__append_2024) \ - $(am__append_2031) $(am__append_2038) hashsum.mod pgp.mod \ -- verifiers.mod $(am__append_2045) $(am__append_2052) \ -- $(am__append_2059) $(am__append_2066) $(am__append_2073) \ -- $(am__append_2080) $(am__append_2087) $(am__append_2094) \ -- $(am__append_2101) $(am__append_2108) help.mod hexdump.mod \ -- keystatus.mod $(am__append_2115) $(am__append_2122) \ -- loadenv.mod ls.mod lsmmap.mod $(am__append_2129) \ -- $(am__append_2136) $(am__append_2143) $(am__append_2150) \ -- $(am__append_2157) $(am__append_2164) $(am__append_2171) \ -- $(am__append_2178) memrw.mod minicmd.mod parttool.mod \ -- password.mod password_pbkdf2.mod $(am__append_2185) \ -- $(am__append_2192) $(am__append_2199) $(am__append_2206) \ -- $(am__append_2213) $(am__append_2220) $(am__append_2227) \ -- $(am__append_2234) $(am__append_2241) $(am__append_2248) \ -- $(am__append_2255) $(am__append_2262) $(am__append_2269) \ -- $(am__append_2276) $(am__append_2283) $(am__append_2290) \ -- $(am__append_2297) $(am__append_2304) $(am__append_2311) \ -- $(am__append_2318) $(am__append_2325) probe.mod read.mod \ -- search.mod search_fs_file.mod search_fs_uuid.mod \ -- search_label.mod $(am__append_2332) $(am__append_2339) \ -- $(am__append_2346) $(am__append_2353) $(am__append_2360) \ -- $(am__append_2367) $(am__append_2374) $(am__append_2381) \ -- $(am__append_2388) $(am__append_2395) $(am__append_2402) \ -- $(am__append_2409) $(am__append_2416) $(am__append_2423) \ -- $(am__append_2430) $(am__append_2437) sleep.mod \ -- $(am__append_2444) $(am__append_2451) terminal.mod test.mod \ -- true.mod $(am__append_2458) $(am__append_2465) \ -- $(am__append_2472) $(am__append_2479) $(am__append_2486) \ -- $(am__append_2493) $(am__append_2500) $(am__append_2507) \ -- $(am__append_2514) videoinfo.mod videotest.mod xnu_uuid.mod \ -- dm_nv.mod loopback.mod cryptodisk.mod luks.mod geli.mod \ -- lvm.mod ldm.mod mdraid09.mod mdraid09_be.mod mdraid1x.mod \ -- diskfilter.mod raid5rec.mod raid6rec.mod scsi.mod memdisk.mod \ -+ $(am__append_2045) $(am__append_2052) $(am__append_2059) \ -+ $(am__append_2066) $(am__append_2073) $(am__append_2080) \ -+ $(am__append_2087) $(am__append_2094) $(am__append_2101) \ -+ $(am__append_2108) help.mod hexdump.mod keystatus.mod \ -+ $(am__append_2115) $(am__append_2122) loadenv.mod ls.mod \ -+ lsmmap.mod $(am__append_2129) $(am__append_2136) \ -+ $(am__append_2143) $(am__append_2150) $(am__append_2157) \ -+ $(am__append_2164) $(am__append_2171) $(am__append_2178) \ -+ memrw.mod minicmd.mod parttool.mod password.mod \ -+ password_pbkdf2.mod $(am__append_2185) $(am__append_2192) \ -+ $(am__append_2199) $(am__append_2206) $(am__append_2213) \ -+ $(am__append_2220) $(am__append_2227) $(am__append_2234) \ -+ $(am__append_2241) $(am__append_2248) $(am__append_2255) \ -+ $(am__append_2262) $(am__append_2269) $(am__append_2276) \ -+ $(am__append_2283) $(am__append_2290) $(am__append_2297) \ -+ $(am__append_2304) $(am__append_2311) $(am__append_2318) \ -+ $(am__append_2325) probe.mod read.mod search.mod \ -+ search_fs_file.mod search_fs_uuid.mod search_label.mod \ -+ $(am__append_2332) $(am__append_2339) $(am__append_2346) \ -+ $(am__append_2353) $(am__append_2360) $(am__append_2367) \ -+ $(am__append_2374) $(am__append_2381) $(am__append_2388) \ -+ $(am__append_2395) $(am__append_2402) $(am__append_2409) \ -+ $(am__append_2416) $(am__append_2423) $(am__append_2430) \ -+ $(am__append_2437) sleep.mod $(am__append_2444) \ -+ $(am__append_2451) terminal.mod test.mod true.mod \ -+ $(am__append_2458) $(am__append_2465) $(am__append_2472) \ -+ $(am__append_2479) $(am__append_2486) $(am__append_2493) \ -+ $(am__append_2500) $(am__append_2507) $(am__append_2514) \ -+ videoinfo.mod videotest.mod xnu_uuid.mod dm_nv.mod \ -+ loopback.mod cryptodisk.mod luks.mod geli.mod lvm.mod ldm.mod \ -+ mdraid09.mod mdraid09_be.mod mdraid1x.mod diskfilter.mod \ -+ raid5rec.mod raid6rec.mod scsi.mod memdisk.mod \ - $(am__append_2521) $(am__append_2528) $(am__append_2535) \ - $(am__append_2542) $(am__append_2549) $(am__append_2556) \ - $(am__append_2563) $(am__append_2570) $(am__append_2577) \ -@@ -15809,8 +15823,7 @@ MODULE_FILES = disk.module$(EXEEXT) trig.module$(EXEEXT) \ - $(am__append_1978) $(am__append_1985) $(am__append_1992) \ - $(am__append_1999) $(am__append_2006) $(am__append_2013) \ - $(am__append_2020) $(am__append_2027) $(am__append_2034) \ -- hashsum.module$(EXEEXT) pgp.module$(EXEEXT) \ -- verifiers.module$(EXEEXT) $(am__append_2041) \ -+ hashsum.module$(EXEEXT) pgp.module$(EXEEXT) $(am__append_2041) \ - $(am__append_2048) $(am__append_2055) $(am__append_2062) \ - $(am__append_2069) $(am__append_2076) $(am__append_2083) \ - $(am__append_2090) $(am__append_2097) $(am__append_2104) \ -@@ -16164,7 +16177,7 @@ MARKER_FILES = disk.marker trig.marker $(am__append_9) \ - $(am__append_1983) $(am__append_1990) $(am__append_1997) \ - $(am__append_2004) $(am__append_2011) $(am__append_2018) \ - $(am__append_2025) $(am__append_2032) $(am__append_2039) \ -- hashsum.marker pgp.marker verifiers.marker $(am__append_2046) \ -+ hashsum.marker pgp.marker $(am__append_2046) \ - $(am__append_2053) $(am__append_2060) $(am__append_2067) \ - $(am__append_2074) $(am__append_2081) $(am__append_2088) \ - $(am__append_2095) $(am__append_2102) $(am__append_2109) \ -@@ -16403,6 +16416,7 @@ KERNEL_HEADER_FILES = $(top_srcdir)/include/grub/cache.h \ - $(top_srcdir)/include/grub/partition.h \ - $(top_srcdir)/include/grub/term.h \ - $(top_srcdir)/include/grub/time.h \ -+ $(top_srcdir)/include/grub/verify.h \ - $(top_srcdir)/include/grub/mm_private.h \ - $(top_srcdir)/include/grub/net.h \ - $(top_srcdir)/include/grub/memory.h $(am__append_5803) \ -@@ -16845,12 +16859,11 @@ CLEANFILES = build-grub-pep2elf$(BUILD_EXEEXT) \ - $(am__append_2009) $(am__append_2016) $(am__append_2023) \ - $(am__append_2030) $(am__append_2037) \ - $(nodist_hashsum_module_SOURCES) hashsum.marker \ -- $(nodist_pgp_module_SOURCES) pgp.marker \ -- $(nodist_verifiers_module_SOURCES) verifiers.marker \ -- $(am__append_2044) $(am__append_2051) $(am__append_2058) \ -- $(am__append_2065) $(am__append_2072) $(am__append_2079) \ -- $(am__append_2086) $(am__append_2093) $(am__append_2100) \ -- $(am__append_2107) $(nodist_help_module_SOURCES) help.marker \ -+ $(nodist_pgp_module_SOURCES) pgp.marker $(am__append_2044) \ -+ $(am__append_2051) $(am__append_2058) $(am__append_2065) \ -+ $(am__append_2072) $(am__append_2079) $(am__append_2086) \ -+ $(am__append_2093) $(am__append_2100) $(am__append_2107) \ -+ $(nodist_help_module_SOURCES) help.marker \ - $(nodist_hexdump_module_SOURCES) hexdump.marker \ - $(nodist_keystatus_module_SOURCES) keystatus.marker \ - $(am__append_2114) $(am__append_2121) \ -@@ -17313,11 +17326,11 @@ BUILT_SOURCES = $(nodist_disk_module_SOURCES) \ - $(am__append_2001) $(am__append_2008) $(am__append_2015) \ - $(am__append_2022) $(am__append_2029) $(am__append_2036) \ - $(nodist_hashsum_module_SOURCES) $(nodist_pgp_module_SOURCES) \ -- $(nodist_verifiers_module_SOURCES) $(am__append_2043) \ -- $(am__append_2050) $(am__append_2057) $(am__append_2064) \ -- $(am__append_2071) $(am__append_2078) $(am__append_2085) \ -- $(am__append_2092) $(am__append_2099) $(am__append_2106) \ -- $(nodist_help_module_SOURCES) $(nodist_hexdump_module_SOURCES) \ -+ $(am__append_2043) $(am__append_2050) $(am__append_2057) \ -+ $(am__append_2064) $(am__append_2071) $(am__append_2078) \ -+ $(am__append_2085) $(am__append_2092) $(am__append_2099) \ -+ $(am__append_2106) $(nodist_help_module_SOURCES) \ -+ $(nodist_hexdump_module_SOURCES) \ - $(nodist_keystatus_module_SOURCES) $(am__append_2113) \ - $(am__append_2120) $(nodist_loadenv_module_SOURCES) \ - $(nodist_ls_module_SOURCES) $(nodist_lsmmap_module_SOURCES) \ -@@ -20070,14 +20083,6 @@ pgp_module_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_MODULE) - pgp_module_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_MODULE) -I$(srcdir)/lib/posix_wrap - pgp_module_CCASFLAGS = $(AM_CCASFLAGS) $(CCASFLAGS_MODULE) - pgp_module_DEPENDENCIES = $(TARGET_OBJ2ELF) --verifiers_module_SOURCES = commands/verifiers.c ## platform sources --nodist_verifiers_module_SOURCES = ## platform nodist sources --verifiers_module_LDADD = --verifiers_module_CFLAGS = $(AM_CFLAGS) $(CFLAGS_MODULE) --verifiers_module_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_MODULE) --verifiers_module_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_MODULE) --verifiers_module_CCASFLAGS = $(AM_CCASFLAGS) $(CCASFLAGS_MODULE) --verifiers_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_x86_64_efi_TRUE@shim_lock_module_SOURCES = commands/efi/shim_lock.c ## platform sources - @COND_x86_64_efi_TRUE@nodist_shim_lock_module_SOURCES = ## platform nodist sources - @COND_x86_64_efi_TRUE@shim_lock_module_LDADD = -@@ -25629,7 +25634,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_arm64_efi_TRUE@ kern/file.c kern/fs.c kern/list.c \ - @COND_arm64_efi_TRUE@ kern/main.c kern/misc.c kern/parser.c \ - @COND_arm64_efi_TRUE@ kern/partition.c kern/rescue_parser.c \ --@COND_arm64_efi_TRUE@ kern/rescue_reader.c kern/term.c -+@COND_arm64_efi_TRUE@ kern/rescue_reader.c kern/term.c \ -+@COND_arm64_efi_TRUE@ kern/verifiers.c - @COND_arm_coreboot_TRUE@kernel_exec_SOURCES = kern/arm/startup.S \ - @COND_arm_coreboot_TRUE@ kern/arm/coreboot/init.c \ - @COND_arm_coreboot_TRUE@ kern/arm/coreboot/timer.c \ -@@ -25660,7 +25666,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_arm_coreboot_TRUE@ kern/fs.c kern/list.c kern/main.c \ - @COND_arm_coreboot_TRUE@ kern/misc.c kern/parser.c \ - @COND_arm_coreboot_TRUE@ kern/partition.c kern/rescue_parser.c \ --@COND_arm_coreboot_TRUE@ kern/rescue_reader.c kern/term.c -+@COND_arm_coreboot_TRUE@ kern/rescue_reader.c kern/term.c \ -+@COND_arm_coreboot_TRUE@ kern/verifiers.c - @COND_arm_efi_TRUE@kernel_exec_SOURCES = kern/arm/efi/startup.S \ - @COND_arm_efi_TRUE@ kern/arm/efi/init.c kern/efi/fdt.c \ - @COND_arm_efi_TRUE@ kern/arm/dl.c kern/arm/dl_helper.c \ -@@ -25678,7 +25685,7 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_arm_efi_TRUE@ kern/fs.c kern/list.c kern/main.c \ - @COND_arm_efi_TRUE@ kern/misc.c kern/parser.c kern/partition.c \ - @COND_arm_efi_TRUE@ kern/rescue_parser.c kern/rescue_reader.c \ --@COND_arm_efi_TRUE@ kern/term.c -+@COND_arm_efi_TRUE@ kern/term.c kern/verifiers.c - @COND_arm_uboot_TRUE@kernel_exec_SOURCES = kern/arm/startup.S \ - @COND_arm_uboot_TRUE@ kern/arm/uboot/init.c \ - @COND_arm_uboot_TRUE@ kern/arm/uboot/uboot.S \ -@@ -25698,7 +25705,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_arm_uboot_TRUE@ kern/file.c kern/fs.c kern/list.c \ - @COND_arm_uboot_TRUE@ kern/main.c kern/misc.c kern/parser.c \ - @COND_arm_uboot_TRUE@ kern/partition.c kern/rescue_parser.c \ --@COND_arm_uboot_TRUE@ kern/rescue_reader.c kern/term.c -+@COND_arm_uboot_TRUE@ kern/rescue_reader.c kern/term.c \ -+@COND_arm_uboot_TRUE@ kern/verifiers.c - @COND_emu_TRUE@kernel_exec_SOURCES = disk/host.c kern/emu/cache_s.S \ - @COND_emu_TRUE@ kern/emu/hostdisk.c osdep/unix/hostdisk.c \ - @COND_emu_TRUE@ osdep/exec.c osdep/devmapper/hostdisk.c \ -@@ -25714,7 +25722,7 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_emu_TRUE@ kern/fs.c kern/list.c kern/main.c kern/misc.c \ - @COND_emu_TRUE@ kern/parser.c kern/partition.c \ - @COND_emu_TRUE@ kern/rescue_parser.c kern/rescue_reader.c \ --@COND_emu_TRUE@ kern/term.c -+@COND_emu_TRUE@ kern/term.c kern/verifiers.c - @COND_i386_coreboot_TRUE@kernel_exec_SOURCES = \ - @COND_i386_coreboot_TRUE@ kern/i386/coreboot/startup.S \ - @COND_i386_coreboot_TRUE@ kern/i386/coreboot/init.c \ -@@ -25739,7 +25747,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_i386_coreboot_TRUE@ kern/fs.c kern/list.c kern/main.c \ - @COND_i386_coreboot_TRUE@ kern/misc.c kern/parser.c \ - @COND_i386_coreboot_TRUE@ kern/partition.c kern/rescue_parser.c \ --@COND_i386_coreboot_TRUE@ kern/rescue_reader.c kern/term.c -+@COND_i386_coreboot_TRUE@ kern/rescue_reader.c kern/term.c \ -+@COND_i386_coreboot_TRUE@ kern/verifiers.c - @COND_i386_efi_TRUE@kernel_exec_SOURCES = kern/i386/efi/startup.S \ - @COND_i386_efi_TRUE@ kern/i386/efi/tsc.c \ - @COND_i386_efi_TRUE@ kern/i386/tsc_pmtimer.c \ -@@ -25756,7 +25765,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_i386_efi_TRUE@ kern/file.c kern/fs.c kern/list.c \ - @COND_i386_efi_TRUE@ kern/main.c kern/misc.c kern/parser.c \ - @COND_i386_efi_TRUE@ kern/partition.c kern/rescue_parser.c \ --@COND_i386_efi_TRUE@ kern/rescue_reader.c kern/term.c -+@COND_i386_efi_TRUE@ kern/rescue_reader.c kern/term.c \ -+@COND_i386_efi_TRUE@ kern/verifiers.c - @COND_i386_ieee1275_TRUE@kernel_exec_SOURCES = \ - @COND_i386_ieee1275_TRUE@ kern/i386/ieee1275/startup.S \ - @COND_i386_ieee1275_TRUE@ disk/ieee1275/ofdisk.c \ -@@ -25777,7 +25787,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_i386_ieee1275_TRUE@ kern/fs.c kern/list.c kern/main.c \ - @COND_i386_ieee1275_TRUE@ kern/misc.c kern/parser.c \ - @COND_i386_ieee1275_TRUE@ kern/partition.c kern/rescue_parser.c \ --@COND_i386_ieee1275_TRUE@ kern/rescue_reader.c kern/term.c -+@COND_i386_ieee1275_TRUE@ kern/rescue_reader.c kern/term.c \ -+@COND_i386_ieee1275_TRUE@ kern/verifiers.c - @COND_i386_multiboot_TRUE@kernel_exec_SOURCES = \ - @COND_i386_multiboot_TRUE@ kern/i386/coreboot/startup.S \ - @COND_i386_multiboot_TRUE@ kern/i386/coreboot/init.c \ -@@ -25796,7 +25807,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_i386_multiboot_TRUE@ kern/misc.c kern/parser.c \ - @COND_i386_multiboot_TRUE@ kern/partition.c \ - @COND_i386_multiboot_TRUE@ kern/rescue_parser.c \ --@COND_i386_multiboot_TRUE@ kern/rescue_reader.c kern/term.c -+@COND_i386_multiboot_TRUE@ kern/rescue_reader.c kern/term.c \ -+@COND_i386_multiboot_TRUE@ kern/verifiers.c - @COND_i386_pc_TRUE@kernel_exec_SOURCES = kern/i386/pc/startup.S \ - @COND_i386_pc_TRUE@ kern/i386/pc/init.c kern/i386/pc/mmap.c \ - @COND_i386_pc_TRUE@ term/i386/pc/console.c kern/i386/dl.c \ -@@ -25808,7 +25820,7 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_i386_pc_TRUE@ kern/fs.c kern/list.c kern/main.c \ - @COND_i386_pc_TRUE@ kern/misc.c kern/parser.c kern/partition.c \ - @COND_i386_pc_TRUE@ kern/rescue_parser.c kern/rescue_reader.c \ --@COND_i386_pc_TRUE@ kern/term.c -+@COND_i386_pc_TRUE@ kern/term.c kern/verifiers.c - @COND_i386_qemu_TRUE@kernel_exec_SOURCES = kern/i386/qemu/startup.S \ - @COND_i386_qemu_TRUE@ kern/i386/qemu/init.c bus/pci.c \ - @COND_i386_qemu_TRUE@ kern/vga_init.c kern/i386/qemu/mmap.c \ -@@ -25821,7 +25833,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_i386_qemu_TRUE@ kern/file.c kern/fs.c kern/list.c \ - @COND_i386_qemu_TRUE@ kern/main.c kern/misc.c kern/parser.c \ - @COND_i386_qemu_TRUE@ kern/partition.c kern/rescue_parser.c \ --@COND_i386_qemu_TRUE@ kern/rescue_reader.c kern/term.c -+@COND_i386_qemu_TRUE@ kern/rescue_reader.c kern/term.c \ -+@COND_i386_qemu_TRUE@ kern/verifiers.c - @COND_i386_xen_TRUE@kernel_exec_SOURCES = kern/i386/xen/startup.S \ - @COND_i386_xen_TRUE@ kern/i386/dl.c kern/i386/xen/hypercall.S \ - @COND_i386_xen_TRUE@ kern/i386/tsc.c kern/i386/xen/tsc.c \ -@@ -25836,7 +25849,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_i386_xen_TRUE@ kern/file.c kern/fs.c kern/list.c \ - @COND_i386_xen_TRUE@ kern/main.c kern/misc.c kern/parser.c \ - @COND_i386_xen_TRUE@ kern/partition.c kern/rescue_parser.c \ --@COND_i386_xen_TRUE@ kern/rescue_reader.c kern/term.c -+@COND_i386_xen_TRUE@ kern/rescue_reader.c kern/term.c \ -+@COND_i386_xen_TRUE@ kern/verifiers.c - @COND_i386_xen_pvh_TRUE@kernel_exec_SOURCES = \ - @COND_i386_xen_pvh_TRUE@ kern/i386/xen/startup_pvh.S \ - @COND_i386_xen_pvh_TRUE@ kern/i386/dl.c commands/boot.c \ -@@ -25853,7 +25867,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_i386_xen_pvh_TRUE@ kern/fs.c kern/list.c kern/main.c \ - @COND_i386_xen_pvh_TRUE@ kern/misc.c kern/parser.c \ - @COND_i386_xen_pvh_TRUE@ kern/partition.c kern/rescue_parser.c \ --@COND_i386_xen_pvh_TRUE@ kern/rescue_reader.c kern/term.c -+@COND_i386_xen_pvh_TRUE@ kern/rescue_reader.c kern/term.c \ -+@COND_i386_xen_pvh_TRUE@ kern/verifiers.c - @COND_ia64_efi_TRUE@kernel_exec_SOURCES = kern/ia64/efi/startup.S \ - @COND_ia64_efi_TRUE@ kern/ia64/efi/init.c kern/ia64/dl.c \ - @COND_ia64_efi_TRUE@ kern/ia64/dl_helper.c kern/ia64/cache.c \ -@@ -25868,7 +25883,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_ia64_efi_TRUE@ kern/file.c kern/fs.c kern/list.c \ - @COND_ia64_efi_TRUE@ kern/main.c kern/misc.c kern/parser.c \ - @COND_ia64_efi_TRUE@ kern/partition.c kern/rescue_parser.c \ --@COND_ia64_efi_TRUE@ kern/rescue_reader.c kern/term.c -+@COND_ia64_efi_TRUE@ kern/rescue_reader.c kern/term.c \ -+@COND_ia64_efi_TRUE@ kern/verifiers.c - @COND_mips_arc_TRUE@kernel_exec_SOURCES = kern/mips/startup.S \ - @COND_mips_arc_TRUE@ kern/mips/arc/init.c term/arc/console.c \ - @COND_mips_arc_TRUE@ disk/arc/arcdisk.c \ -@@ -25883,7 +25899,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_mips_arc_TRUE@ kern/file.c kern/fs.c kern/list.c \ - @COND_mips_arc_TRUE@ kern/main.c kern/misc.c kern/parser.c \ - @COND_mips_arc_TRUE@ kern/partition.c kern/rescue_parser.c \ --@COND_mips_arc_TRUE@ kern/rescue_reader.c kern/term.c -+@COND_mips_arc_TRUE@ kern/rescue_reader.c kern/term.c \ -+@COND_mips_arc_TRUE@ kern/verifiers.c - @COND_mips_loongson_TRUE@kernel_exec_SOURCES = kern/mips/startup.S \ - @COND_mips_loongson_TRUE@ term/ns8250.c bus/bonito.c \ - @COND_mips_loongson_TRUE@ bus/cs5536.c bus/pci.c \ -@@ -25911,7 +25928,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_mips_loongson_TRUE@ kern/fs.c kern/list.c kern/main.c \ - @COND_mips_loongson_TRUE@ kern/misc.c kern/parser.c \ - @COND_mips_loongson_TRUE@ kern/partition.c kern/rescue_parser.c \ --@COND_mips_loongson_TRUE@ kern/rescue_reader.c kern/term.c -+@COND_mips_loongson_TRUE@ kern/rescue_reader.c kern/term.c \ -+@COND_mips_loongson_TRUE@ kern/verifiers.c - @COND_mips_qemu_mips_TRUE@kernel_exec_SOURCES = kern/mips/startup.S \ - @COND_mips_qemu_mips_TRUE@ kern/mips/qemu_mips/init.c \ - @COND_mips_qemu_mips_TRUE@ term/ns8250.c term/serial.c \ -@@ -25934,7 +25952,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_mips_qemu_mips_TRUE@ kern/misc.c kern/parser.c \ - @COND_mips_qemu_mips_TRUE@ kern/partition.c \ - @COND_mips_qemu_mips_TRUE@ kern/rescue_parser.c \ --@COND_mips_qemu_mips_TRUE@ kern/rescue_reader.c kern/term.c -+@COND_mips_qemu_mips_TRUE@ kern/rescue_reader.c kern/term.c \ -+@COND_mips_qemu_mips_TRUE@ kern/verifiers.c - @COND_powerpc_ieee1275_TRUE@kernel_exec_SOURCES = \ - @COND_powerpc_ieee1275_TRUE@ kern/powerpc/ieee1275/startup.S \ - @COND_powerpc_ieee1275_TRUE@ kern/powerpc/cache.S \ -@@ -25959,7 +25978,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_powerpc_ieee1275_TRUE@ kern/main.c kern/misc.c \ - @COND_powerpc_ieee1275_TRUE@ kern/parser.c kern/partition.c \ - @COND_powerpc_ieee1275_TRUE@ kern/rescue_parser.c \ --@COND_powerpc_ieee1275_TRUE@ kern/rescue_reader.c kern/term.c -+@COND_powerpc_ieee1275_TRUE@ kern/rescue_reader.c kern/term.c \ -+@COND_powerpc_ieee1275_TRUE@ kern/verifiers.c - @COND_riscv32_efi_TRUE@kernel_exec_SOURCES = kern/riscv/efi/startup.S \ - @COND_riscv32_efi_TRUE@ kern/riscv/efi/init.c kern/efi/fdt.c \ - @COND_riscv32_efi_TRUE@ kern/riscv/cache.c \ -@@ -25977,7 +25997,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_riscv32_efi_TRUE@ kern/fs.c kern/list.c kern/main.c \ - @COND_riscv32_efi_TRUE@ kern/misc.c kern/parser.c \ - @COND_riscv32_efi_TRUE@ kern/partition.c kern/rescue_parser.c \ --@COND_riscv32_efi_TRUE@ kern/rescue_reader.c kern/term.c -+@COND_riscv32_efi_TRUE@ kern/rescue_reader.c kern/term.c \ -+@COND_riscv32_efi_TRUE@ kern/verifiers.c - @COND_riscv64_efi_TRUE@kernel_exec_SOURCES = kern/riscv/efi/startup.S \ - @COND_riscv64_efi_TRUE@ kern/riscv/efi/init.c kern/efi/fdt.c \ - @COND_riscv64_efi_TRUE@ kern/riscv/cache.c \ -@@ -25995,7 +26016,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_riscv64_efi_TRUE@ kern/fs.c kern/list.c kern/main.c \ - @COND_riscv64_efi_TRUE@ kern/misc.c kern/parser.c \ - @COND_riscv64_efi_TRUE@ kern/partition.c kern/rescue_parser.c \ --@COND_riscv64_efi_TRUE@ kern/rescue_reader.c kern/term.c -+@COND_riscv64_efi_TRUE@ kern/rescue_reader.c kern/term.c \ -+@COND_riscv64_efi_TRUE@ kern/verifiers.c - @COND_sparc64_ieee1275_TRUE@kernel_exec_SOURCES = \ - @COND_sparc64_ieee1275_TRUE@ kern/sparc64/ieee1275/crt0.S \ - @COND_sparc64_ieee1275_TRUE@ kern/sparc64/cache.S \ -@@ -26021,7 +26043,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_sparc64_ieee1275_TRUE@ kern/main.c kern/misc.c \ - @COND_sparc64_ieee1275_TRUE@ kern/parser.c kern/partition.c \ - @COND_sparc64_ieee1275_TRUE@ kern/rescue_parser.c \ --@COND_sparc64_ieee1275_TRUE@ kern/rescue_reader.c kern/term.c -+@COND_sparc64_ieee1275_TRUE@ kern/rescue_reader.c kern/term.c \ -+@COND_sparc64_ieee1275_TRUE@ kern/verifiers.c - @COND_x86_64_efi_TRUE@kernel_exec_SOURCES = kern/x86_64/efi/startup.S \ - @COND_x86_64_efi_TRUE@ kern/i386/efi/tsc.c \ - @COND_x86_64_efi_TRUE@ kern/i386/tsc_pmtimer.c \ -@@ -26040,7 +26063,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_x86_64_efi_TRUE@ kern/file.c kern/fs.c kern/list.c \ - @COND_x86_64_efi_TRUE@ kern/main.c kern/misc.c kern/parser.c \ - @COND_x86_64_efi_TRUE@ kern/partition.c kern/rescue_parser.c \ --@COND_x86_64_efi_TRUE@ kern/rescue_reader.c kern/term.c -+@COND_x86_64_efi_TRUE@ kern/rescue_reader.c kern/term.c \ -+@COND_x86_64_efi_TRUE@ kern/verifiers.c - @COND_x86_64_xen_TRUE@kernel_exec_SOURCES = kern/x86_64/xen/startup.S \ - @COND_x86_64_xen_TRUE@ kern/x86_64/dl.c \ - @COND_x86_64_xen_TRUE@ kern/x86_64/xen/hypercall.S \ -@@ -26056,7 +26080,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_x86_64_xen_TRUE@ kern/file.c kern/fs.c kern/list.c \ - @COND_x86_64_xen_TRUE@ kern/main.c kern/misc.c kern/parser.c \ - @COND_x86_64_xen_TRUE@ kern/partition.c kern/rescue_parser.c \ --@COND_x86_64_xen_TRUE@ kern/rescue_reader.c kern/term.c -+@COND_x86_64_xen_TRUE@ kern/rescue_reader.c kern/term.c \ -+@COND_x86_64_xen_TRUE@ kern/verifiers.c - @COND_arm64_efi_TRUE@nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - @COND_arm_coreboot_TRUE@nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - @COND_arm_efi_TRUE@nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources -@@ -28051,6 +28076,8 @@ kern/kernel_exec-rescue_reader.$(OBJEXT): kern/$(am__dirstamp) \ - kern/$(DEPDIR)/$(am__dirstamp) - kern/kernel_exec-term.$(OBJEXT): kern/$(am__dirstamp) \ - kern/$(DEPDIR)/$(am__dirstamp) -+kern/kernel_exec-verifiers.$(OBJEXT): kern/$(am__dirstamp) \ -+ kern/$(DEPDIR)/$(am__dirstamp) - kern/arm/$(am__dirstamp): - @$(MKDIR_P) kern/arm - @: > kern/arm/$(am__dirstamp) -@@ -30171,12 +30198,6 @@ video/i386/pc/vbe_module-vbe.$(OBJEXT): video/i386/pc/$(am__dirstamp) \ - vbe.module$(EXEEXT): $(vbe_module_OBJECTS) $(vbe_module_DEPENDENCIES) $(EXTRA_vbe_module_DEPENDENCIES) - @rm -f vbe.module$(EXEEXT) - $(AM_V_CCLD)$(vbe_module_LINK) $(vbe_module_OBJECTS) $(vbe_module_LDADD) $(LIBS) --commands/verifiers_module-verifiers.$(OBJEXT): \ -- commands/$(am__dirstamp) commands/$(DEPDIR)/$(am__dirstamp) -- --verifiers.module$(EXEEXT): $(verifiers_module_OBJECTS) $(verifiers_module_DEPENDENCIES) $(EXTRA_verifiers_module_DEPENDENCIES) -- @rm -f verifiers.module$(EXEEXT) -- $(AM_V_CCLD)$(verifiers_module_LINK) $(verifiers_module_OBJECTS) $(verifiers_module_LDADD) $(LIBS) - video/i386/pc/vga_module-vga.$(OBJEXT): video/i386/pc/$(am__dirstamp) \ - video/i386/pc/$(DEPDIR)/$(am__dirstamp) - -@@ -30799,7 +30820,6 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@commands/$(DEPDIR)/tr_module-tr.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@commands/$(DEPDIR)/true_module-true.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@commands/$(DEPDIR)/usbtest_module-usbtest.Po@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@commands/$(DEPDIR)/verifiers_module-verifiers.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@commands/$(DEPDIR)/videoinfo_module-videoinfo.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@commands/$(DEPDIR)/videotest_module-videotest.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@commands/$(DEPDIR)/xnu_uuid_module-xnu_uuid.Po@am__quote@ -@@ -30975,6 +30995,7 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@kern/$(DEPDIR)/kernel_exec-rescue_reader.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@kern/$(DEPDIR)/kernel_exec-term.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@kern/$(DEPDIR)/kernel_exec-time.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@kern/$(DEPDIR)/kernel_exec-verifiers.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@kern/$(DEPDIR)/kernel_exec-vga_init.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@kern/$(DEPDIR)/xz_decompress_image-compiler-rt.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@kern/arm/$(DEPDIR)/kernel_exec-cache.Po@am__quote@ -@@ -35607,6 +35628,20 @@ kern/kernel_exec-term.obj: kern/term.c - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kernel_exec_CPPFLAGS) $(CPPFLAGS) $(kernel_exec_CFLAGS) $(CFLAGS) -c -o kern/kernel_exec-term.obj `if test -f 'kern/term.c'; then $(CYGPATH_W) 'kern/term.c'; else $(CYGPATH_W) '$(srcdir)/kern/term.c'; fi` - -+kern/kernel_exec-verifiers.o: kern/verifiers.c -+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kernel_exec_CPPFLAGS) $(CPPFLAGS) $(kernel_exec_CFLAGS) $(CFLAGS) -MT kern/kernel_exec-verifiers.o -MD -MP -MF kern/$(DEPDIR)/kernel_exec-verifiers.Tpo -c -o kern/kernel_exec-verifiers.o `test -f 'kern/verifiers.c' || echo '$(srcdir)/'`kern/verifiers.c -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) kern/$(DEPDIR)/kernel_exec-verifiers.Tpo kern/$(DEPDIR)/kernel_exec-verifiers.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='kern/verifiers.c' object='kern/kernel_exec-verifiers.o' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kernel_exec_CPPFLAGS) $(CPPFLAGS) $(kernel_exec_CFLAGS) $(CFLAGS) -c -o kern/kernel_exec-verifiers.o `test -f 'kern/verifiers.c' || echo '$(srcdir)/'`kern/verifiers.c -+ -+kern/kernel_exec-verifiers.obj: kern/verifiers.c -+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kernel_exec_CPPFLAGS) $(CPPFLAGS) $(kernel_exec_CFLAGS) $(CFLAGS) -MT kern/kernel_exec-verifiers.obj -MD -MP -MF kern/$(DEPDIR)/kernel_exec-verifiers.Tpo -c -o kern/kernel_exec-verifiers.obj `if test -f 'kern/verifiers.c'; then $(CYGPATH_W) 'kern/verifiers.c'; else $(CYGPATH_W) '$(srcdir)/kern/verifiers.c'; fi` -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) kern/$(DEPDIR)/kernel_exec-verifiers.Tpo kern/$(DEPDIR)/kernel_exec-verifiers.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='kern/verifiers.c' object='kern/kernel_exec-verifiers.obj' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kernel_exec_CPPFLAGS) $(CPPFLAGS) $(kernel_exec_CFLAGS) $(CFLAGS) -c -o kern/kernel_exec-verifiers.obj `if test -f 'kern/verifiers.c'; then $(CYGPATH_W) 'kern/verifiers.c'; else $(CYGPATH_W) '$(srcdir)/kern/verifiers.c'; fi` -+ - kern/arm/coreboot/kernel_exec-init.o: kern/arm/coreboot/init.c - @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kernel_exec_CPPFLAGS) $(CPPFLAGS) $(kernel_exec_CFLAGS) $(CFLAGS) -MT kern/arm/coreboot/kernel_exec-init.o -MD -MP -MF kern/arm/coreboot/$(DEPDIR)/kernel_exec-init.Tpo -c -o kern/arm/coreboot/kernel_exec-init.o `test -f 'kern/arm/coreboot/init.c' || echo '$(srcdir)/'`kern/arm/coreboot/init.c - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) kern/arm/coreboot/$(DEPDIR)/kernel_exec-init.Tpo kern/arm/coreboot/$(DEPDIR)/kernel_exec-init.Po -@@ -40983,20 +41018,6 @@ video/i386/pc/vbe_module-vbe.obj: video/i386/pc/vbe.c - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(vbe_module_CPPFLAGS) $(CPPFLAGS) $(vbe_module_CFLAGS) $(CFLAGS) -c -o video/i386/pc/vbe_module-vbe.obj `if test -f 'video/i386/pc/vbe.c'; then $(CYGPATH_W) 'video/i386/pc/vbe.c'; else $(CYGPATH_W) '$(srcdir)/video/i386/pc/vbe.c'; fi` - --commands/verifiers_module-verifiers.o: commands/verifiers.c --@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(verifiers_module_CPPFLAGS) $(CPPFLAGS) $(verifiers_module_CFLAGS) $(CFLAGS) -MT commands/verifiers_module-verifiers.o -MD -MP -MF commands/$(DEPDIR)/verifiers_module-verifiers.Tpo -c -o commands/verifiers_module-verifiers.o `test -f 'commands/verifiers.c' || echo '$(srcdir)/'`commands/verifiers.c --@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) commands/$(DEPDIR)/verifiers_module-verifiers.Tpo commands/$(DEPDIR)/verifiers_module-verifiers.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='commands/verifiers.c' object='commands/verifiers_module-verifiers.o' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(verifiers_module_CPPFLAGS) $(CPPFLAGS) $(verifiers_module_CFLAGS) $(CFLAGS) -c -o commands/verifiers_module-verifiers.o `test -f 'commands/verifiers.c' || echo '$(srcdir)/'`commands/verifiers.c -- --commands/verifiers_module-verifiers.obj: commands/verifiers.c --@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(verifiers_module_CPPFLAGS) $(CPPFLAGS) $(verifiers_module_CFLAGS) $(CFLAGS) -MT commands/verifiers_module-verifiers.obj -MD -MP -MF commands/$(DEPDIR)/verifiers_module-verifiers.Tpo -c -o commands/verifiers_module-verifiers.obj `if test -f 'commands/verifiers.c'; then $(CYGPATH_W) 'commands/verifiers.c'; else $(CYGPATH_W) '$(srcdir)/commands/verifiers.c'; fi` --@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) commands/$(DEPDIR)/verifiers_module-verifiers.Tpo commands/$(DEPDIR)/verifiers_module-verifiers.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='commands/verifiers.c' object='commands/verifiers_module-verifiers.obj' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(verifiers_module_CPPFLAGS) $(CPPFLAGS) $(verifiers_module_CFLAGS) $(CFLAGS) -c -o commands/verifiers_module-verifiers.obj `if test -f 'commands/verifiers.c'; then $(CYGPATH_W) 'commands/verifiers.c'; else $(CYGPATH_W) '$(srcdir)/commands/verifiers.c'; fi` -- - video/i386/pc/vga_module-vga.o: video/i386/pc/vga.c - @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(vga_module_CPPFLAGS) $(CPPFLAGS) $(vga_module_CFLAGS) $(CFLAGS) -MT video/i386/pc/vga_module-vga.o -MD -MP -MF video/i386/pc/$(DEPDIR)/vga_module-vga.Tpo -c -o video/i386/pc/vga_module-vga.o `test -f 'video/i386/pc/vga.c' || echo '$(srcdir)/'`video/i386/pc/vga.c - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) video/i386/pc/$(DEPDIR)/vga_module-vga.Tpo video/i386/pc/$(DEPDIR)/vga_module-vga.Po -@@ -43717,10 +43738,6 @@ pgp.marker: $(pgp_module_SOURCES) $(nodist_pgp_module_SOURCES) - $(TARGET_CPP) -DGRUB_LST_GENERATOR $(CPPFLAGS_MARKER) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pgp_module_CPPFLAGS) $(CPPFLAGS) $^ > $@.new || (rm -f $@; exit 1) - grep 'MARKER' $@.new > $@; rm -f $@.new - --verifiers.marker: $(verifiers_module_SOURCES) $(nodist_verifiers_module_SOURCES) -- $(TARGET_CPP) -DGRUB_LST_GENERATOR $(CPPFLAGS_MARKER) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(verifiers_module_CPPFLAGS) $(CPPFLAGS) $^ > $@.new || (rm -f $@; exit 1) -- grep 'MARKER' $@.new > $@; rm -f $@.new -- - @COND_x86_64_efi_TRUE@shim_lock.marker: $(shim_lock_module_SOURCES) $(nodist_shim_lock_module_SOURCES) - @COND_x86_64_efi_TRUE@ $(TARGET_CPP) -DGRUB_LST_GENERATOR $(CPPFLAGS_MARKER) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shim_lock_module_CPPFLAGS) $(CPPFLAGS) $^ > $@.new || (rm -f $@; exit 1) - @COND_x86_64_efi_TRUE@ grep 'MARKER' $@.new > $@; rm -f $@.new -diff --git a/grub-core/commands/verifiers.c b/grub-core/commands/verifiers.c -deleted file mode 100644 -index 0dde481..0000000 ---- a/grub-core/commands/verifiers.c -+++ /dev/null -@@ -1,228 +0,0 @@ --/* -- * GRUB -- GRand Unified Bootloader -- * Copyright (C) 2017 Free Software Foundation, Inc. -- * -- * GRUB 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 of the License, or -- * (at your option) any later version. -- * -- * GRUB 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 GRUB. If not, see . -- * -- * Verifiers helper. -- */ -- --#include --#include --#include -- --GRUB_MOD_LICENSE ("GPLv3+"); -- --struct grub_file_verifier *grub_file_verifiers; -- --struct grub_verified --{ -- grub_file_t file; -- void *buf; --}; --typedef struct grub_verified *grub_verified_t; -- --static void --verified_free (grub_verified_t verified) --{ -- if (verified) -- { -- grub_free (verified->buf); -- grub_free (verified); -- } --} -- --static grub_ssize_t --verified_read (struct grub_file *file, char *buf, grub_size_t len) --{ -- grub_verified_t verified = file->data; -- -- grub_memcpy (buf, (char *) verified->buf + file->offset, len); -- return len; --} -- --static grub_err_t --verified_close (struct grub_file *file) --{ -- grub_verified_t verified = file->data; -- -- grub_file_close (verified->file); -- verified_free (verified); -- file->data = 0; -- -- /* Device and name are freed by parent. */ -- file->device = 0; -- file->name = 0; -- -- return grub_errno; --} -- --struct grub_fs verified_fs = --{ -- .name = "verified_read", -- .fs_read = verified_read, -- .fs_close = verified_close --}; -- --static grub_file_t --grub_verifiers_open (grub_file_t io, enum grub_file_type type) --{ -- grub_verified_t verified = NULL; -- struct grub_file_verifier *ver; -- void *context; -- grub_file_t ret = 0; -- grub_err_t err; -- int defer = 0; -- -- grub_dprintf ("verify", "file: %s type: %d\n", io->name, type); -- -- if ((type & GRUB_FILE_TYPE_MASK) == GRUB_FILE_TYPE_SIGNATURE -- || (type & GRUB_FILE_TYPE_MASK) == GRUB_FILE_TYPE_VERIFY_SIGNATURE -- || (type & GRUB_FILE_TYPE_SKIP_SIGNATURE)) -- return io; -- -- if (io->device->disk && -- (io->device->disk->dev->id == GRUB_DISK_DEVICE_MEMDISK_ID -- || io->device->disk->dev->id == GRUB_DISK_DEVICE_PROCFS_ID)) -- return io; -- -- FOR_LIST_ELEMENTS(ver, grub_file_verifiers) -- { -- enum grub_verify_flags flags = 0; -- err = ver->init (io, type, &context, &flags); -- if (err) -- goto fail_noclose; -- if (flags & GRUB_VERIFY_FLAGS_DEFER_AUTH) -- { -- defer = 1; -- continue; -- } -- if (!(flags & GRUB_VERIFY_FLAGS_SKIP_VERIFICATION)) -- break; -- } -- -- if (!ver) -- { -- if (defer) -- { -- grub_error (GRUB_ERR_ACCESS_DENIED, -- N_("verification requested but nobody cares: %s"), io->name); -- goto fail_noclose; -- } -- -- /* No verifiers wanted to verify. Just return underlying file. */ -- return io; -- } -- -- ret = grub_malloc (sizeof (*ret)); -- if (!ret) -- { -- goto fail; -- } -- *ret = *io; -- -- ret->fs = &verified_fs; -- ret->not_easily_seekable = 0; -- if (ret->size >> (sizeof (grub_size_t) * GRUB_CHAR_BIT - 1)) -- { -- grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, -- N_("big file signature isn't implemented yet")); -- goto fail; -- } -- verified = grub_malloc (sizeof (*verified)); -- if (!verified) -- { -- goto fail; -- } -- verified->buf = grub_malloc (ret->size); -- if (!verified->buf) -- { -- goto fail; -- } -- if (grub_file_read (io, verified->buf, ret->size) != (grub_ssize_t) ret->size) -- { -- if (!grub_errno) -- grub_error (GRUB_ERR_FILE_READ_ERROR, N_("premature end of file %s"), -- io->name); -- goto fail; -- } -- -- err = ver->write (context, verified->buf, ret->size); -- if (err) -- goto fail; -- -- err = ver->fini ? ver->fini (context) : GRUB_ERR_NONE; -- if (err) -- goto fail; -- -- if (ver->close) -- ver->close (context); -- -- FOR_LIST_ELEMENTS_NEXT(ver, grub_file_verifiers) -- { -- enum grub_verify_flags flags = 0; -- err = ver->init (io, type, &context, &flags); -- if (err) -- goto fail_noclose; -- if (flags & GRUB_VERIFY_FLAGS_SKIP_VERIFICATION || -- /* Verification done earlier. So, we are happy here. */ -- flags & GRUB_VERIFY_FLAGS_DEFER_AUTH) -- continue; -- err = ver->write (context, verified->buf, ret->size); -- if (err) -- goto fail; -- -- err = ver->fini ? ver->fini (context) : GRUB_ERR_NONE; -- if (err) -- goto fail; -- -- if (ver->close) -- ver->close (context); -- } -- -- verified->file = io; -- ret->data = verified; -- return ret; -- -- fail: -- ver->close (context); -- fail_noclose: -- verified_free (verified); -- grub_free (ret); -- return NULL; --} -- --grub_err_t --grub_verify_string (char *str, enum grub_verify_string_type type) --{ -- struct grub_file_verifier *ver; -- FOR_LIST_ELEMENTS(ver, grub_file_verifiers) -- { -- grub_err_t err; -- err = ver->verify_string ? ver->verify_string (str, type) : GRUB_ERR_NONE; -- if (err) -- return err; -- } -- return GRUB_ERR_NONE; --} -- --GRUB_MOD_INIT(verifiers) --{ -- grub_file_filter_register (GRUB_FILE_FILTER_VERIFY, grub_verifiers_open); --} -- --GRUB_MOD_FINI(verifiers) --{ -- grub_file_filter_unregister (GRUB_FILE_FILTER_VERIFY); --} -diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c -index 9cad0c4..73967e2 100644 ---- a/grub-core/kern/main.c -+++ b/grub-core/kern/main.c -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - - #ifdef GRUB_MACHINE_PCBIOS - #include -@@ -274,6 +275,9 @@ grub_main (void) - grub_printf ("Welcome to GRUB!\n\n"); - grub_setcolorstate (GRUB_TERM_COLOR_STANDARD); - -+ /* Init verifiers API. */ -+ grub_verifiers_init (); -+ - grub_load_config (); - - grub_boot_time ("Before loading embedded modules."); -diff --git a/grub-core/kern/verifiers.c b/grub-core/kern/verifiers.c -new file mode 100644 -index 0000000..aa3dc7c ---- /dev/null -+++ b/grub-core/kern/verifiers.c -@@ -0,0 +1,224 @@ -+/* -+ * GRUB -- GRand Unified Bootloader -+ * Copyright (C) 2017 Free Software Foundation, Inc. -+ * -+ * GRUB 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 of the License, or -+ * (at your option) any later version. -+ * -+ * GRUB 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 GRUB. If not, see . -+ * -+ * Verifiers helper. -+ */ -+ -+#include -+#include -+#include -+ -+GRUB_MOD_LICENSE ("GPLv3+"); -+ -+struct grub_file_verifier *grub_file_verifiers; -+ -+struct grub_verified -+{ -+ grub_file_t file; -+ void *buf; -+}; -+typedef struct grub_verified *grub_verified_t; -+ -+static void -+verified_free (grub_verified_t verified) -+{ -+ if (verified) -+ { -+ grub_free (verified->buf); -+ grub_free (verified); -+ } -+} -+ -+static grub_ssize_t -+verified_read (struct grub_file *file, char *buf, grub_size_t len) -+{ -+ grub_verified_t verified = file->data; -+ -+ grub_memcpy (buf, (char *) verified->buf + file->offset, len); -+ return len; -+} -+ -+static grub_err_t -+verified_close (struct grub_file *file) -+{ -+ grub_verified_t verified = file->data; -+ -+ grub_file_close (verified->file); -+ verified_free (verified); -+ file->data = 0; -+ -+ /* Device and name are freed by parent. */ -+ file->device = 0; -+ file->name = 0; -+ -+ return grub_errno; -+} -+ -+struct grub_fs verified_fs = -+{ -+ .name = "verified_read", -+ .fs_read = verified_read, -+ .fs_close = verified_close -+}; -+ -+static grub_file_t -+grub_verifiers_open (grub_file_t io, enum grub_file_type type) -+{ -+ grub_verified_t verified = NULL; -+ struct grub_file_verifier *ver; -+ void *context; -+ grub_file_t ret = 0; -+ grub_err_t err; -+ int defer = 0; -+ -+ grub_dprintf ("verify", "file: %s type: %d\n", io->name, type); -+ -+ if ((type & GRUB_FILE_TYPE_MASK) == GRUB_FILE_TYPE_SIGNATURE -+ || (type & GRUB_FILE_TYPE_MASK) == GRUB_FILE_TYPE_VERIFY_SIGNATURE -+ || (type & GRUB_FILE_TYPE_SKIP_SIGNATURE)) -+ return io; -+ -+ if (io->device->disk && -+ (io->device->disk->dev->id == GRUB_DISK_DEVICE_MEMDISK_ID -+ || io->device->disk->dev->id == GRUB_DISK_DEVICE_PROCFS_ID)) -+ return io; -+ -+ FOR_LIST_ELEMENTS(ver, grub_file_verifiers) -+ { -+ enum grub_verify_flags flags = 0; -+ err = ver->init (io, type, &context, &flags); -+ if (err) -+ goto fail_noclose; -+ if (flags & GRUB_VERIFY_FLAGS_DEFER_AUTH) -+ { -+ defer = 1; -+ continue; -+ } -+ if (!(flags & GRUB_VERIFY_FLAGS_SKIP_VERIFICATION)) -+ break; -+ } -+ -+ if (!ver) -+ { -+ if (defer) -+ { -+ grub_error (GRUB_ERR_ACCESS_DENIED, -+ N_("verification requested but nobody cares: %s"), io->name); -+ goto fail_noclose; -+ } -+ -+ /* No verifiers wanted to verify. Just return underlying file. */ -+ return io; -+ } -+ -+ ret = grub_malloc (sizeof (*ret)); -+ if (!ret) -+ { -+ goto fail; -+ } -+ *ret = *io; -+ -+ ret->fs = &verified_fs; -+ ret->not_easily_seekable = 0; -+ if (ret->size >> (sizeof (grub_size_t) * GRUB_CHAR_BIT - 1)) -+ { -+ grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, -+ N_("big file signature isn't implemented yet")); -+ goto fail; -+ } -+ verified = grub_malloc (sizeof (*verified)); -+ if (!verified) -+ { -+ goto fail; -+ } -+ verified->buf = grub_malloc (ret->size); -+ if (!verified->buf) -+ { -+ goto fail; -+ } -+ if (grub_file_read (io, verified->buf, ret->size) != (grub_ssize_t) ret->size) -+ { -+ if (!grub_errno) -+ grub_error (GRUB_ERR_FILE_READ_ERROR, N_("premature end of file %s"), -+ io->name); -+ goto fail; -+ } -+ -+ err = ver->write (context, verified->buf, ret->size); -+ if (err) -+ goto fail; -+ -+ err = ver->fini ? ver->fini (context) : GRUB_ERR_NONE; -+ if (err) -+ goto fail; -+ -+ if (ver->close) -+ ver->close (context); -+ -+ FOR_LIST_ELEMENTS_NEXT(ver, grub_file_verifiers) -+ { -+ enum grub_verify_flags flags = 0; -+ err = ver->init (io, type, &context, &flags); -+ if (err) -+ goto fail_noclose; -+ if (flags & GRUB_VERIFY_FLAGS_SKIP_VERIFICATION || -+ /* Verification done earlier. So, we are happy here. */ -+ flags & GRUB_VERIFY_FLAGS_DEFER_AUTH) -+ continue; -+ err = ver->write (context, verified->buf, ret->size); -+ if (err) -+ goto fail; -+ -+ err = ver->fini ? ver->fini (context) : GRUB_ERR_NONE; -+ if (err) -+ goto fail; -+ -+ if (ver->close) -+ ver->close (context); -+ } -+ -+ verified->file = io; -+ ret->data = verified; -+ return ret; -+ -+ fail: -+ ver->close (context); -+ fail_noclose: -+ verified_free (verified); -+ grub_free (ret); -+ return NULL; -+} -+ -+grub_err_t -+grub_verify_string (char *str, enum grub_verify_string_type type) -+{ -+ struct grub_file_verifier *ver; -+ FOR_LIST_ELEMENTS(ver, grub_file_verifiers) -+ { -+ grub_err_t err; -+ err = ver->verify_string ? ver->verify_string (str, type) : GRUB_ERR_NONE; -+ if (err) -+ return err; -+ } -+ return GRUB_ERR_NONE; -+} -+ -+void -+grub_verifiers_init (void) -+{ -+ grub_file_filter_register (GRUB_FILE_FILTER_VERIFY, grub_verifiers_open); -+} -diff --git a/include/grub/verify.h b/include/grub/verify.h -index ea04914..cd129c3 100644 ---- a/include/grub/verify.h -+++ b/include/grub/verify.h -@@ -64,7 +64,10 @@ struct grub_file_verifier - grub_err_t (*verify_string) (char *str, enum grub_verify_string_type type); - }; - --extern struct grub_file_verifier *grub_file_verifiers; -+extern struct grub_file_verifier *EXPORT_VAR (grub_file_verifiers); -+ -+extern void -+grub_verifiers_init (void); - - static inline void - grub_verifier_register (struct grub_file_verifier *ver) -@@ -78,7 +81,7 @@ grub_verifier_unregister (struct grub_file_verifier *ver) - grub_list_remove (GRUB_AS_LIST (ver)); - } - --grub_err_t --grub_verify_string (char *str, enum grub_verify_string_type type); -+extern grub_err_t -+EXPORT_FUNC (grub_verify_string) (char *str, enum grub_verify_string_type type); - - #endif /* ! GRUB_VERIFY_HEADER */ -diff --git a/po/POTFILES.in b/po/POTFILES.in -index 22543be..11c799f 100644 ---- a/po/POTFILES.in -+++ b/po/POTFILES.in -@@ -107,7 +107,6 @@ - ./grub-core/commands/tr.c - ./grub-core/commands/true.c - ./grub-core/commands/usbtest.c --./grub-core/commands/verifiers.c - ./grub-core/commands/videoinfo.c - ./grub-core/commands/videotest.c - ./grub-core/commands/wildcard.c -@@ -334,6 +333,7 @@ - ./grub-core/kern/uboot/hw.c - ./grub-core/kern/uboot/init.c - ./grub-core/kern/uboot/uboot.c -+./grub-core/kern/verifiers.c - ./grub-core/kern/vga_init.c - ./grub-core/kern/x86_64/dl.c - ./grub-core/kern/xen/init.c --- -2.14.2 - diff --git a/boot/grub2/0034-efi-Move-the-shim_lock-verifier-to-the-GRUB-core.patch b/boot/grub2/0034-efi-Move-the-shim_lock-verifier-to-the-GRUB-core.patch deleted file mode 100644 index 1b606f4c6ae..00000000000 --- a/boot/grub2/0034-efi-Move-the-shim_lock-verifier-to-the-GRUB-core.patch +++ /dev/null @@ -1,13225 +0,0 @@ -From 5e280caa6530ed160dcf2920c94f1605fb1f1f7c Mon Sep 17 00:00:00 2001 -From: Marco A Benatto -Date: Wed, 23 Sep 2020 14:21:14 -0400 -Subject: [PATCH] efi: Move the shim_lock verifier to the GRUB core - -Move the shim_lock verifier from its own module into the core image. The -Secure Boot lockdown mechanism has the intent to prevent the load of any -unsigned code or binary when Secure Boot is enabled. - -The reason is that GRUB must be able to prevent executing untrusted code -if UEFI Secure Boot is enabled, without depending on external modules. - -Signed-off-by: Marco A Benatto -Signed-off-by: Javier Martinez Canillas -Reviewed-by: Daniel Kiper -[Add changes to generated files] -Signed-off-by: Stefan Sørensen ---- - docs/grub.texi | 9 +- - grub-core/Makefile.core.am | 23 - - grub-core/Makefile.core.def | 6 - - grub-core/Makefile.in | 11139 +++++++++++++++++------------------ - grub-core/commands/efi/shim_lock.c | 130 - - grub-core/kern/efi/init.c | 4 + - grub-core/kern/efi/sb.c | 105 + - include/grub/efi/sb.h | 3 + - po/POTFILES.in | 1 - - 9 files changed, 5657 insertions(+), 5763 deletions(-) - delete mode 100644 grub-core/commands/efi/shim_lock.c - -diff --git a/docs/grub.texi b/docs/grub.texi -index 8779507..aefe032 100644 ---- a/docs/grub.texi -+++ b/docs/grub.texi -@@ -5747,15 +5747,16 @@ secure boot chain. - @section UEFI secure boot and shim support - - The GRUB, except the @command{chainloader} command, works with the UEFI secure --boot and the shim. This functionality is provided by the shim_lock module. It --is recommend to build in this and other required modules into the @file{core.img}. -+boot and the shim. This functionality is provided by the shim_lock verifier. It -+is built into the @file{core.img} and is registered if the UEFI secure boot is -+enabled. -+ - All modules not stored in the @file{core.img} and the ACPI tables for the - @command{acpi} command have to be signed, e.g. using PGP. Additionally, the - @command{iorw}, the @command{memrw} and the @command{wrmsr} commands are - prohibited if the UEFI secure boot is enabled. This is done due to - security reasons. All above mentioned requirements are enforced by the --shim_lock module. And itself it is a persistent module which means that --it cannot be unloaded if it was loaded into the memory. -+shim_lock verifier logic. - - @node Measured Boot - @section Measuring boot components -diff --git a/grub-core/Makefile.core.am b/grub-core/Makefile.core.am -index c4d67d4..5623a5e 100644 ---- a/grub-core/Makefile.core.am -+++ b/grub-core/Makefile.core.am -@@ -6954,29 +6954,6 @@ pgp.marker: $(pgp_module_SOURCES) $(nodist_pgp_module_SOURCES) - $(TARGET_CPP) -DGRUB_LST_GENERATOR $(CPPFLAGS_MARKER) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pgp_module_CPPFLAGS) $(CPPFLAGS) $^ > $@.new || (rm -f $@; exit 1) - grep 'MARKER' $@.new > $@; rm -f $@.new - --if COND_x86_64_efi --platform_PROGRAMS += shim_lock.module --MODULE_FILES += shim_lock.module$(EXEEXT) --shim_lock_module_SOURCES = commands/efi/shim_lock.c ## platform sources --nodist_shim_lock_module_SOURCES = ## platform nodist sources --shim_lock_module_LDADD = --shim_lock_module_CFLAGS = $(AM_CFLAGS) $(CFLAGS_MODULE) --shim_lock_module_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_MODULE) --shim_lock_module_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_MODULE) --shim_lock_module_CCASFLAGS = $(AM_CCASFLAGS) $(CCASFLAGS_MODULE) --shim_lock_module_DEPENDENCIES = $(TARGET_OBJ2ELF) --dist_noinst_DATA += --BUILT_SOURCES += $(nodist_shim_lock_module_SOURCES) --CLEANFILES += $(nodist_shim_lock_module_SOURCES) --MOD_FILES += shim_lock.mod --MARKER_FILES += shim_lock.marker --CLEANFILES += shim_lock.marker -- --shim_lock.marker: $(shim_lock_module_SOURCES) $(nodist_shim_lock_module_SOURCES) -- $(TARGET_CPP) -DGRUB_LST_GENERATOR $(CPPFLAGS_MARKER) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shim_lock_module_CPPFLAGS) $(CPPFLAGS) $^ > $@.new || (rm -f $@; exit 1) -- grep 'MARKER' $@.new > $@; rm -f $@.new --endif -- - if COND_i386_pc - platform_PROGRAMS += hdparm.module - MODULE_FILES += hdparm.module$(EXEEXT) -diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index f6c0348..4d380ed 100644 ---- a/grub-core/Makefile.core.def -+++ b/grub-core/Makefile.core.def -@@ -944,12 +944,6 @@ module = { - cppflags = '-I$(srcdir)/lib/posix_wrap'; - }; - --module = { -- name = shim_lock; -- common = commands/efi/shim_lock.c; -- enable = x86_64_efi; --}; -- - module = { - name = hdparm; - common = commands/hdparm.c; -diff --git a/grub-core/Makefile.in b/grub-core/Makefile.in -index 8930714..09dc802 100644 ---- a/grub-core/Makefile.in -+++ b/grub-core/Makefile.in -@@ -205,36 +205,36 @@ platform_PROGRAMS = disk.module$(EXEEXT) trig.module$(EXEEXT) \ - $(am__EXEEXT_293) $(am__EXEEXT_294) $(am__EXEEXT_295) \ - $(am__EXEEXT_296) $(am__EXEEXT_297) $(am__EXEEXT_298) \ - $(am__EXEEXT_299) $(am__EXEEXT_300) $(am__EXEEXT_301) \ -- $(am__EXEEXT_302) help.module$(EXEEXT) hexdump.module$(EXEEXT) \ -- keystatus.module$(EXEEXT) $(am__EXEEXT_303) $(am__EXEEXT_304) \ -+ help.module$(EXEEXT) hexdump.module$(EXEEXT) \ -+ keystatus.module$(EXEEXT) $(am__EXEEXT_302) $(am__EXEEXT_303) \ - loadenv.module$(EXEEXT) ls.module$(EXEEXT) \ -- lsmmap.module$(EXEEXT) $(am__EXEEXT_305) $(am__EXEEXT_306) \ -- $(am__EXEEXT_307) $(am__EXEEXT_308) $(am__EXEEXT_309) \ -- $(am__EXEEXT_310) $(am__EXEEXT_311) $(am__EXEEXT_312) \ -+ lsmmap.module$(EXEEXT) $(am__EXEEXT_304) $(am__EXEEXT_305) \ -+ $(am__EXEEXT_306) $(am__EXEEXT_307) $(am__EXEEXT_308) \ -+ $(am__EXEEXT_309) $(am__EXEEXT_310) $(am__EXEEXT_311) \ - memrw.module$(EXEEXT) minicmd.module$(EXEEXT) \ - parttool.module$(EXEEXT) password.module$(EXEEXT) \ -- password_pbkdf2.module$(EXEEXT) $(am__EXEEXT_313) \ -- $(am__EXEEXT_314) $(am__EXEEXT_315) $(am__EXEEXT_316) \ -- $(am__EXEEXT_317) $(am__EXEEXT_318) $(am__EXEEXT_319) \ -- $(am__EXEEXT_320) $(am__EXEEXT_321) $(am__EXEEXT_322) \ -- $(am__EXEEXT_323) $(am__EXEEXT_324) $(am__EXEEXT_325) \ -- $(am__EXEEXT_326) $(am__EXEEXT_327) $(am__EXEEXT_328) \ -- $(am__EXEEXT_329) $(am__EXEEXT_330) $(am__EXEEXT_331) \ -- $(am__EXEEXT_332) $(am__EXEEXT_333) probe.module$(EXEEXT) \ -+ password_pbkdf2.module$(EXEEXT) $(am__EXEEXT_312) \ -+ $(am__EXEEXT_313) $(am__EXEEXT_314) $(am__EXEEXT_315) \ -+ $(am__EXEEXT_316) $(am__EXEEXT_317) $(am__EXEEXT_318) \ -+ $(am__EXEEXT_319) $(am__EXEEXT_320) $(am__EXEEXT_321) \ -+ $(am__EXEEXT_322) $(am__EXEEXT_323) $(am__EXEEXT_324) \ -+ $(am__EXEEXT_325) $(am__EXEEXT_326) $(am__EXEEXT_327) \ -+ $(am__EXEEXT_328) $(am__EXEEXT_329) $(am__EXEEXT_330) \ -+ $(am__EXEEXT_331) $(am__EXEEXT_332) probe.module$(EXEEXT) \ - read.module$(EXEEXT) search.module$(EXEEXT) \ - search_fs_file.module$(EXEEXT) search_fs_uuid.module$(EXEEXT) \ -- search_label.module$(EXEEXT) $(am__EXEEXT_334) \ -- $(am__EXEEXT_335) $(am__EXEEXT_336) $(am__EXEEXT_337) \ -- $(am__EXEEXT_338) $(am__EXEEXT_339) $(am__EXEEXT_340) \ -- $(am__EXEEXT_341) $(am__EXEEXT_342) $(am__EXEEXT_343) \ -- $(am__EXEEXT_344) $(am__EXEEXT_345) $(am__EXEEXT_346) \ -- $(am__EXEEXT_347) $(am__EXEEXT_348) $(am__EXEEXT_349) \ -- sleep.module$(EXEEXT) $(am__EXEEXT_350) $(am__EXEEXT_351) \ -+ search_label.module$(EXEEXT) $(am__EXEEXT_333) \ -+ $(am__EXEEXT_334) $(am__EXEEXT_335) $(am__EXEEXT_336) \ -+ $(am__EXEEXT_337) $(am__EXEEXT_338) $(am__EXEEXT_339) \ -+ $(am__EXEEXT_340) $(am__EXEEXT_341) $(am__EXEEXT_342) \ -+ $(am__EXEEXT_343) $(am__EXEEXT_344) $(am__EXEEXT_345) \ -+ $(am__EXEEXT_346) $(am__EXEEXT_347) $(am__EXEEXT_348) \ -+ sleep.module$(EXEEXT) $(am__EXEEXT_349) $(am__EXEEXT_350) \ - terminal.module$(EXEEXT) test.module$(EXEEXT) \ -- true.module$(EXEEXT) $(am__EXEEXT_352) $(am__EXEEXT_353) \ -- $(am__EXEEXT_354) $(am__EXEEXT_355) $(am__EXEEXT_356) \ -- $(am__EXEEXT_357) $(am__EXEEXT_358) $(am__EXEEXT_359) \ -- $(am__EXEEXT_360) videoinfo.module$(EXEEXT) \ -+ true.module$(EXEEXT) $(am__EXEEXT_351) $(am__EXEEXT_352) \ -+ $(am__EXEEXT_353) $(am__EXEEXT_354) $(am__EXEEXT_355) \ -+ $(am__EXEEXT_356) $(am__EXEEXT_357) $(am__EXEEXT_358) \ -+ $(am__EXEEXT_359) videoinfo.module$(EXEEXT) \ - videotest.module$(EXEEXT) xnu_uuid.module$(EXEEXT) \ - dm_nv.module$(EXEEXT) loopback.module$(EXEEXT) \ - cryptodisk.module$(EXEEXT) luks.module$(EXEEXT) \ -@@ -242,27 +242,27 @@ platform_PROGRAMS = disk.module$(EXEEXT) trig.module$(EXEEXT) \ - mdraid09.module$(EXEEXT) mdraid09_be.module$(EXEEXT) \ - mdraid1x.module$(EXEEXT) diskfilter.module$(EXEEXT) \ - raid5rec.module$(EXEEXT) raid6rec.module$(EXEEXT) \ -- scsi.module$(EXEEXT) memdisk.module$(EXEEXT) $(am__EXEEXT_361) \ -- $(am__EXEEXT_362) $(am__EXEEXT_363) $(am__EXEEXT_364) \ -- $(am__EXEEXT_365) $(am__EXEEXT_366) $(am__EXEEXT_367) \ -- $(am__EXEEXT_368) $(am__EXEEXT_369) $(am__EXEEXT_370) \ -- $(am__EXEEXT_371) $(am__EXEEXT_372) $(am__EXEEXT_373) \ -- $(am__EXEEXT_374) $(am__EXEEXT_375) $(am__EXEEXT_376) \ -- $(am__EXEEXT_377) $(am__EXEEXT_378) $(am__EXEEXT_379) \ -- $(am__EXEEXT_380) $(am__EXEEXT_381) $(am__EXEEXT_382) \ -- $(am__EXEEXT_383) $(am__EXEEXT_384) $(am__EXEEXT_385) \ -- $(am__EXEEXT_386) $(am__EXEEXT_387) $(am__EXEEXT_388) \ -- $(am__EXEEXT_389) $(am__EXEEXT_390) $(am__EXEEXT_391) \ -- $(am__EXEEXT_392) $(am__EXEEXT_393) $(am__EXEEXT_394) \ -- $(am__EXEEXT_395) $(am__EXEEXT_396) $(am__EXEEXT_397) \ -- $(am__EXEEXT_398) $(am__EXEEXT_399) $(am__EXEEXT_400) \ -- $(am__EXEEXT_401) $(am__EXEEXT_402) $(am__EXEEXT_403) \ -- $(am__EXEEXT_404) $(am__EXEEXT_405) $(am__EXEEXT_406) \ -- $(am__EXEEXT_407) $(am__EXEEXT_408) $(am__EXEEXT_409) \ -- $(am__EXEEXT_410) $(am__EXEEXT_411) $(am__EXEEXT_412) \ -- $(am__EXEEXT_413) $(am__EXEEXT_414) $(am__EXEEXT_415) \ -- $(am__EXEEXT_416) $(am__EXEEXT_417) $(am__EXEEXT_418) \ -- $(am__EXEEXT_419) $(am__EXEEXT_420) $(am__EXEEXT_421) \ -+ scsi.module$(EXEEXT) memdisk.module$(EXEEXT) $(am__EXEEXT_360) \ -+ $(am__EXEEXT_361) $(am__EXEEXT_362) $(am__EXEEXT_363) \ -+ $(am__EXEEXT_364) $(am__EXEEXT_365) $(am__EXEEXT_366) \ -+ $(am__EXEEXT_367) $(am__EXEEXT_368) $(am__EXEEXT_369) \ -+ $(am__EXEEXT_370) $(am__EXEEXT_371) $(am__EXEEXT_372) \ -+ $(am__EXEEXT_373) $(am__EXEEXT_374) $(am__EXEEXT_375) \ -+ $(am__EXEEXT_376) $(am__EXEEXT_377) $(am__EXEEXT_378) \ -+ $(am__EXEEXT_379) $(am__EXEEXT_380) $(am__EXEEXT_381) \ -+ $(am__EXEEXT_382) $(am__EXEEXT_383) $(am__EXEEXT_384) \ -+ $(am__EXEEXT_385) $(am__EXEEXT_386) $(am__EXEEXT_387) \ -+ $(am__EXEEXT_388) $(am__EXEEXT_389) $(am__EXEEXT_390) \ -+ $(am__EXEEXT_391) $(am__EXEEXT_392) $(am__EXEEXT_393) \ -+ $(am__EXEEXT_394) $(am__EXEEXT_395) $(am__EXEEXT_396) \ -+ $(am__EXEEXT_397) $(am__EXEEXT_398) $(am__EXEEXT_399) \ -+ $(am__EXEEXT_400) $(am__EXEEXT_401) $(am__EXEEXT_402) \ -+ $(am__EXEEXT_403) $(am__EXEEXT_404) $(am__EXEEXT_405) \ -+ $(am__EXEEXT_406) $(am__EXEEXT_407) $(am__EXEEXT_408) \ -+ $(am__EXEEXT_409) $(am__EXEEXT_410) $(am__EXEEXT_411) \ -+ $(am__EXEEXT_412) $(am__EXEEXT_413) $(am__EXEEXT_414) \ -+ $(am__EXEEXT_415) $(am__EXEEXT_416) $(am__EXEEXT_417) \ -+ $(am__EXEEXT_418) $(am__EXEEXT_419) $(am__EXEEXT_420) \ - procfs.module$(EXEEXT) affs.module$(EXEEXT) \ - afs.module$(EXEEXT) bfs.module$(EXEEXT) zstd.module$(EXEEXT) \ - btrfs.module$(EXEEXT) archelp.module$(EXEEXT) \ -@@ -284,165 +284,165 @@ platform_PROGRAMS = disk.module$(EXEEXT) trig.module$(EXEEXT) \ - ufs1_be.module$(EXEEXT) ufs2.module$(EXEEXT) \ - xfs.module$(EXEEXT) zfs.module$(EXEEXT) \ - zfscrypt.module$(EXEEXT) zfsinfo.module$(EXEEXT) \ -- macbless.module$(EXEEXT) $(am__EXEEXT_422) \ -+ macbless.module$(EXEEXT) $(am__EXEEXT_421) \ - gettext.module$(EXEEXT) gfxmenu.module$(EXEEXT) \ - hello.module$(EXEEXT) gzio.module$(EXEEXT) \ -- offsetio.module$(EXEEXT) $(am__EXEEXT_423) $(am__EXEEXT_424) \ -- $(am__EXEEXT_425) $(am__EXEEXT_426) $(am__EXEEXT_427) \ -- $(am__EXEEXT_428) $(am__EXEEXT_429) $(am__EXEEXT_430) \ -- $(am__EXEEXT_431) $(am__EXEEXT_432) $(am__EXEEXT_433) \ -- $(am__EXEEXT_434) $(am__EXEEXT_435) $(am__EXEEXT_436) \ -- $(am__EXEEXT_437) $(am__EXEEXT_438) $(am__EXEEXT_439) \ -- $(am__EXEEXT_440) $(am__EXEEXT_441) $(am__EXEEXT_442) \ -+ offsetio.module$(EXEEXT) $(am__EXEEXT_422) $(am__EXEEXT_423) \ -+ $(am__EXEEXT_424) $(am__EXEEXT_425) $(am__EXEEXT_426) \ -+ $(am__EXEEXT_427) $(am__EXEEXT_428) $(am__EXEEXT_429) \ -+ $(am__EXEEXT_430) $(am__EXEEXT_431) $(am__EXEEXT_432) \ -+ $(am__EXEEXT_433) $(am__EXEEXT_434) $(am__EXEEXT_435) \ -+ $(am__EXEEXT_436) $(am__EXEEXT_437) $(am__EXEEXT_438) \ -+ $(am__EXEEXT_439) $(am__EXEEXT_440) $(am__EXEEXT_441) \ - elf.module$(EXEEXT) crypto.module$(EXEEXT) \ -- pbkdf2.module$(EXEEXT) $(am__EXEEXT_443) $(am__EXEEXT_444) \ -- $(am__EXEEXT_445) $(am__EXEEXT_446) $(am__EXEEXT_447) \ -- $(am__EXEEXT_448) $(am__EXEEXT_449) $(am__EXEEXT_450) \ -- $(am__EXEEXT_451) $(am__EXEEXT_452) $(am__EXEEXT_453) \ -- $(am__EXEEXT_454) $(am__EXEEXT_455) $(am__EXEEXT_456) \ -- $(am__EXEEXT_457) $(am__EXEEXT_458) $(am__EXEEXT_459) \ -- $(am__EXEEXT_460) $(am__EXEEXT_461) $(am__EXEEXT_462) \ -- $(am__EXEEXT_463) $(am__EXEEXT_464) $(am__EXEEXT_465) \ -- $(am__EXEEXT_466) $(am__EXEEXT_467) $(am__EXEEXT_468) \ -- $(am__EXEEXT_469) $(am__EXEEXT_470) $(am__EXEEXT_471) \ -- $(am__EXEEXT_472) $(am__EXEEXT_473) $(am__EXEEXT_474) \ -- $(am__EXEEXT_475) $(am__EXEEXT_476) $(am__EXEEXT_477) \ -- $(am__EXEEXT_478) setjmp.module$(EXEEXT) $(am__EXEEXT_479) \ -- $(am__EXEEXT_480) $(am__EXEEXT_481) $(am__EXEEXT_482) \ -- $(am__EXEEXT_483) $(am__EXEEXT_484) $(am__EXEEXT_485) \ -- $(am__EXEEXT_486) $(am__EXEEXT_487) $(am__EXEEXT_488) \ -- $(am__EXEEXT_489) $(am__EXEEXT_490) $(am__EXEEXT_491) \ -- $(am__EXEEXT_492) $(am__EXEEXT_493) $(am__EXEEXT_494) \ -- $(am__EXEEXT_495) $(am__EXEEXT_496) $(am__EXEEXT_497) \ -- $(am__EXEEXT_498) $(am__EXEEXT_499) $(am__EXEEXT_500) \ -- $(am__EXEEXT_501) $(am__EXEEXT_502) $(am__EXEEXT_503) \ -- $(am__EXEEXT_504) $(am__EXEEXT_505) $(am__EXEEXT_506) \ -- $(am__EXEEXT_507) $(am__EXEEXT_508) $(am__EXEEXT_509) \ -- $(am__EXEEXT_510) $(am__EXEEXT_511) $(am__EXEEXT_512) \ -- $(am__EXEEXT_513) $(am__EXEEXT_514) $(am__EXEEXT_515) \ -- $(am__EXEEXT_516) $(am__EXEEXT_517) $(am__EXEEXT_518) \ -- $(am__EXEEXT_519) $(am__EXEEXT_520) $(am__EXEEXT_521) \ -- $(am__EXEEXT_522) $(am__EXEEXT_523) $(am__EXEEXT_524) \ -- $(am__EXEEXT_525) $(am__EXEEXT_526) $(am__EXEEXT_527) \ -- $(am__EXEEXT_528) $(am__EXEEXT_529) $(am__EXEEXT_530) \ -- $(am__EXEEXT_531) $(am__EXEEXT_532) $(am__EXEEXT_533) \ -- $(am__EXEEXT_534) $(am__EXEEXT_535) $(am__EXEEXT_536) \ -- $(am__EXEEXT_537) $(am__EXEEXT_538) $(am__EXEEXT_539) \ -- $(am__EXEEXT_540) $(am__EXEEXT_541) $(am__EXEEXT_542) \ -- $(am__EXEEXT_543) $(am__EXEEXT_544) $(am__EXEEXT_545) \ -- $(am__EXEEXT_546) $(am__EXEEXT_547) $(am__EXEEXT_548) \ -- $(am__EXEEXT_549) $(am__EXEEXT_550) $(am__EXEEXT_551) \ -- $(am__EXEEXT_552) $(am__EXEEXT_553) $(am__EXEEXT_554) \ -- $(am__EXEEXT_555) $(am__EXEEXT_556) macho.module$(EXEEXT) \ -- $(am__EXEEXT_557) $(am__EXEEXT_558) $(am__EXEEXT_559) \ -- $(am__EXEEXT_560) $(am__EXEEXT_561) $(am__EXEEXT_562) \ -- $(am__EXEEXT_563) $(am__EXEEXT_564) $(am__EXEEXT_565) \ -- $(am__EXEEXT_566) $(am__EXEEXT_567) $(am__EXEEXT_568) \ -- $(am__EXEEXT_569) $(am__EXEEXT_570) $(am__EXEEXT_571) \ -- $(am__EXEEXT_572) $(am__EXEEXT_573) $(am__EXEEXT_574) \ -- $(am__EXEEXT_575) $(am__EXEEXT_576) $(am__EXEEXT_577) \ -- $(am__EXEEXT_578) $(am__EXEEXT_579) $(am__EXEEXT_580) \ -- $(am__EXEEXT_581) $(am__EXEEXT_582) $(am__EXEEXT_583) \ -+ pbkdf2.module$(EXEEXT) $(am__EXEEXT_442) $(am__EXEEXT_443) \ -+ $(am__EXEEXT_444) $(am__EXEEXT_445) $(am__EXEEXT_446) \ -+ $(am__EXEEXT_447) $(am__EXEEXT_448) $(am__EXEEXT_449) \ -+ $(am__EXEEXT_450) $(am__EXEEXT_451) $(am__EXEEXT_452) \ -+ $(am__EXEEXT_453) $(am__EXEEXT_454) $(am__EXEEXT_455) \ -+ $(am__EXEEXT_456) $(am__EXEEXT_457) $(am__EXEEXT_458) \ -+ $(am__EXEEXT_459) $(am__EXEEXT_460) $(am__EXEEXT_461) \ -+ $(am__EXEEXT_462) $(am__EXEEXT_463) $(am__EXEEXT_464) \ -+ $(am__EXEEXT_465) $(am__EXEEXT_466) $(am__EXEEXT_467) \ -+ $(am__EXEEXT_468) $(am__EXEEXT_469) $(am__EXEEXT_470) \ -+ $(am__EXEEXT_471) $(am__EXEEXT_472) $(am__EXEEXT_473) \ -+ $(am__EXEEXT_474) $(am__EXEEXT_475) $(am__EXEEXT_476) \ -+ $(am__EXEEXT_477) setjmp.module$(EXEEXT) $(am__EXEEXT_478) \ -+ $(am__EXEEXT_479) $(am__EXEEXT_480) $(am__EXEEXT_481) \ -+ $(am__EXEEXT_482) $(am__EXEEXT_483) $(am__EXEEXT_484) \ -+ $(am__EXEEXT_485) $(am__EXEEXT_486) $(am__EXEEXT_487) \ -+ $(am__EXEEXT_488) $(am__EXEEXT_489) $(am__EXEEXT_490) \ -+ $(am__EXEEXT_491) $(am__EXEEXT_492) $(am__EXEEXT_493) \ -+ $(am__EXEEXT_494) $(am__EXEEXT_495) $(am__EXEEXT_496) \ -+ $(am__EXEEXT_497) $(am__EXEEXT_498) $(am__EXEEXT_499) \ -+ $(am__EXEEXT_500) $(am__EXEEXT_501) $(am__EXEEXT_502) \ -+ $(am__EXEEXT_503) $(am__EXEEXT_504) $(am__EXEEXT_505) \ -+ $(am__EXEEXT_506) $(am__EXEEXT_507) $(am__EXEEXT_508) \ -+ $(am__EXEEXT_509) $(am__EXEEXT_510) $(am__EXEEXT_511) \ -+ $(am__EXEEXT_512) $(am__EXEEXT_513) $(am__EXEEXT_514) \ -+ $(am__EXEEXT_515) $(am__EXEEXT_516) $(am__EXEEXT_517) \ -+ $(am__EXEEXT_518) $(am__EXEEXT_519) $(am__EXEEXT_520) \ -+ $(am__EXEEXT_521) $(am__EXEEXT_522) $(am__EXEEXT_523) \ -+ $(am__EXEEXT_524) $(am__EXEEXT_525) $(am__EXEEXT_526) \ -+ $(am__EXEEXT_527) $(am__EXEEXT_528) $(am__EXEEXT_529) \ -+ $(am__EXEEXT_530) $(am__EXEEXT_531) $(am__EXEEXT_532) \ -+ $(am__EXEEXT_533) $(am__EXEEXT_534) $(am__EXEEXT_535) \ -+ $(am__EXEEXT_536) $(am__EXEEXT_537) $(am__EXEEXT_538) \ -+ $(am__EXEEXT_539) $(am__EXEEXT_540) $(am__EXEEXT_541) \ -+ $(am__EXEEXT_542) $(am__EXEEXT_543) $(am__EXEEXT_544) \ -+ $(am__EXEEXT_545) $(am__EXEEXT_546) $(am__EXEEXT_547) \ -+ $(am__EXEEXT_548) $(am__EXEEXT_549) $(am__EXEEXT_550) \ -+ $(am__EXEEXT_551) $(am__EXEEXT_552) $(am__EXEEXT_553) \ -+ $(am__EXEEXT_554) $(am__EXEEXT_555) macho.module$(EXEEXT) \ -+ $(am__EXEEXT_556) $(am__EXEEXT_557) $(am__EXEEXT_558) \ -+ $(am__EXEEXT_559) $(am__EXEEXT_560) $(am__EXEEXT_561) \ -+ $(am__EXEEXT_562) $(am__EXEEXT_563) $(am__EXEEXT_564) \ -+ $(am__EXEEXT_565) $(am__EXEEXT_566) $(am__EXEEXT_567) \ -+ $(am__EXEEXT_568) $(am__EXEEXT_569) $(am__EXEEXT_570) \ -+ $(am__EXEEXT_571) $(am__EXEEXT_572) $(am__EXEEXT_573) \ -+ $(am__EXEEXT_574) $(am__EXEEXT_575) $(am__EXEEXT_576) \ -+ $(am__EXEEXT_577) $(am__EXEEXT_578) $(am__EXEEXT_579) \ -+ $(am__EXEEXT_580) $(am__EXEEXT_581) $(am__EXEEXT_582) \ - normal.module$(EXEEXT) part_acorn.module$(EXEEXT) \ - part_amiga.module$(EXEEXT) part_apple.module$(EXEEXT) \ - part_gpt.module$(EXEEXT) part_msdos.module$(EXEEXT) \ - part_sun.module$(EXEEXT) part_plan.module$(EXEEXT) \ - part_dvh.module$(EXEEXT) part_bsd.module$(EXEEXT) \ - part_sunpc.module$(EXEEXT) part_dfly.module$(EXEEXT) \ -- msdospart.module$(EXEEXT) $(am__EXEEXT_584) $(am__EXEEXT_585) \ -- $(am__EXEEXT_586) $(am__EXEEXT_587) $(am__EXEEXT_588) \ -- $(am__EXEEXT_589) $(am__EXEEXT_590) $(am__EXEEXT_591) \ -- $(am__EXEEXT_592) $(am__EXEEXT_593) $(am__EXEEXT_594) \ -- $(am__EXEEXT_595) $(am__EXEEXT_596) $(am__EXEEXT_597) \ -- $(am__EXEEXT_598) $(am__EXEEXT_599) $(am__EXEEXT_600) \ -- $(am__EXEEXT_601) $(am__EXEEXT_602) $(am__EXEEXT_603) \ -- $(am__EXEEXT_604) $(am__EXEEXT_605) $(am__EXEEXT_606) \ -- $(am__EXEEXT_607) $(am__EXEEXT_608) $(am__EXEEXT_609) \ -- $(am__EXEEXT_610) gfxterm_background.module$(EXEEXT) \ -- $(am__EXEEXT_611) $(am__EXEEXT_612) $(am__EXEEXT_613) \ -- $(am__EXEEXT_614) $(am__EXEEXT_615) $(am__EXEEXT_616) \ -- $(am__EXEEXT_617) $(am__EXEEXT_618) $(am__EXEEXT_619) \ -- $(am__EXEEXT_620) $(am__EXEEXT_621) $(am__EXEEXT_622) \ -- $(am__EXEEXT_623) $(am__EXEEXT_624) $(am__EXEEXT_625) \ -- $(am__EXEEXT_626) $(am__EXEEXT_627) $(am__EXEEXT_628) \ -- $(am__EXEEXT_629) $(am__EXEEXT_630) $(am__EXEEXT_631) \ -- $(am__EXEEXT_632) $(am__EXEEXT_633) $(am__EXEEXT_634) \ -- $(am__EXEEXT_635) $(am__EXEEXT_636) $(am__EXEEXT_637) \ -- $(am__EXEEXT_638) $(am__EXEEXT_639) $(am__EXEEXT_640) \ -- $(am__EXEEXT_641) $(am__EXEEXT_642) $(am__EXEEXT_643) \ -- $(am__EXEEXT_644) $(am__EXEEXT_645) $(am__EXEEXT_646) \ -- $(am__EXEEXT_647) $(am__EXEEXT_648) $(am__EXEEXT_649) \ -- $(am__EXEEXT_650) $(am__EXEEXT_651) $(am__EXEEXT_652) \ -- $(am__EXEEXT_653) $(am__EXEEXT_654) $(am__EXEEXT_655) \ -- $(am__EXEEXT_656) $(am__EXEEXT_657) $(am__EXEEXT_658) \ -- $(am__EXEEXT_659) $(am__EXEEXT_660) $(am__EXEEXT_661) \ -- $(am__EXEEXT_662) $(am__EXEEXT_663) $(am__EXEEXT_664) \ -- $(am__EXEEXT_665) functional_test.module$(EXEEXT) \ -+ msdospart.module$(EXEEXT) $(am__EXEEXT_583) $(am__EXEEXT_584) \ -+ $(am__EXEEXT_585) $(am__EXEEXT_586) $(am__EXEEXT_587) \ -+ $(am__EXEEXT_588) $(am__EXEEXT_589) $(am__EXEEXT_590) \ -+ $(am__EXEEXT_591) $(am__EXEEXT_592) $(am__EXEEXT_593) \ -+ $(am__EXEEXT_594) $(am__EXEEXT_595) $(am__EXEEXT_596) \ -+ $(am__EXEEXT_597) $(am__EXEEXT_598) $(am__EXEEXT_599) \ -+ $(am__EXEEXT_600) $(am__EXEEXT_601) $(am__EXEEXT_602) \ -+ $(am__EXEEXT_603) $(am__EXEEXT_604) $(am__EXEEXT_605) \ -+ $(am__EXEEXT_606) $(am__EXEEXT_607) $(am__EXEEXT_608) \ -+ $(am__EXEEXT_609) gfxterm_background.module$(EXEEXT) \ -+ $(am__EXEEXT_610) $(am__EXEEXT_611) $(am__EXEEXT_612) \ -+ $(am__EXEEXT_613) $(am__EXEEXT_614) $(am__EXEEXT_615) \ -+ $(am__EXEEXT_616) $(am__EXEEXT_617) $(am__EXEEXT_618) \ -+ $(am__EXEEXT_619) $(am__EXEEXT_620) $(am__EXEEXT_621) \ -+ $(am__EXEEXT_622) $(am__EXEEXT_623) $(am__EXEEXT_624) \ -+ $(am__EXEEXT_625) $(am__EXEEXT_626) $(am__EXEEXT_627) \ -+ $(am__EXEEXT_628) $(am__EXEEXT_629) $(am__EXEEXT_630) \ -+ $(am__EXEEXT_631) $(am__EXEEXT_632) $(am__EXEEXT_633) \ -+ $(am__EXEEXT_634) $(am__EXEEXT_635) $(am__EXEEXT_636) \ -+ $(am__EXEEXT_637) $(am__EXEEXT_638) $(am__EXEEXT_639) \ -+ $(am__EXEEXT_640) $(am__EXEEXT_641) $(am__EXEEXT_642) \ -+ $(am__EXEEXT_643) $(am__EXEEXT_644) $(am__EXEEXT_645) \ -+ $(am__EXEEXT_646) $(am__EXEEXT_647) $(am__EXEEXT_648) \ -+ $(am__EXEEXT_649) $(am__EXEEXT_650) $(am__EXEEXT_651) \ -+ $(am__EXEEXT_652) $(am__EXEEXT_653) $(am__EXEEXT_654) \ -+ $(am__EXEEXT_655) $(am__EXEEXT_656) $(am__EXEEXT_657) \ -+ $(am__EXEEXT_658) $(am__EXEEXT_659) $(am__EXEEXT_660) \ -+ $(am__EXEEXT_661) $(am__EXEEXT_662) $(am__EXEEXT_663) \ -+ $(am__EXEEXT_664) functional_test.module$(EXEEXT) \ - exfctest.module$(EXEEXT) strtoull_test.module$(EXEEXT) \ - setjmp_test.module$(EXEEXT) signature_test.module$(EXEEXT) \ - sleep_test.module$(EXEEXT) xnu_uuid_test.module$(EXEEXT) \ -- pbkdf2_test.module$(EXEEXT) $(am__EXEEXT_666) \ -- $(am__EXEEXT_667) $(am__EXEEXT_668) $(am__EXEEXT_669) \ -- $(am__EXEEXT_670) $(am__EXEEXT_671) $(am__EXEEXT_672) \ -- $(am__EXEEXT_673) $(am__EXEEXT_674) $(am__EXEEXT_675) \ -- $(am__EXEEXT_676) $(am__EXEEXT_677) $(am__EXEEXT_678) \ -- $(am__EXEEXT_679) $(am__EXEEXT_680) $(am__EXEEXT_681) \ -- $(am__EXEEXT_682) $(am__EXEEXT_683) $(am__EXEEXT_684) \ -- $(am__EXEEXT_685) $(am__EXEEXT_686) $(am__EXEEXT_687) \ -- $(am__EXEEXT_688) $(am__EXEEXT_689) $(am__EXEEXT_690) \ -+ pbkdf2_test.module$(EXEEXT) $(am__EXEEXT_665) \ -+ $(am__EXEEXT_666) $(am__EXEEXT_667) $(am__EXEEXT_668) \ -+ $(am__EXEEXT_669) $(am__EXEEXT_670) $(am__EXEEXT_671) \ -+ $(am__EXEEXT_672) $(am__EXEEXT_673) $(am__EXEEXT_674) \ -+ $(am__EXEEXT_675) $(am__EXEEXT_676) $(am__EXEEXT_677) \ -+ $(am__EXEEXT_678) $(am__EXEEXT_679) $(am__EXEEXT_680) \ -+ $(am__EXEEXT_681) $(am__EXEEXT_682) $(am__EXEEXT_683) \ -+ $(am__EXEEXT_684) $(am__EXEEXT_685) $(am__EXEEXT_686) \ -+ $(am__EXEEXT_687) $(am__EXEEXT_688) $(am__EXEEXT_689) \ - div_test.module$(EXEEXT) mul_test.module$(EXEEXT) \ - shift_test.module$(EXEEXT) cmp_test.module$(EXEEXT) \ - ctz_test.module$(EXEEXT) bswap_test.module$(EXEEXT) \ - videotest_checksum.module$(EXEEXT) \ - gfxterm_menu.module$(EXEEXT) cmdline_cat_test.module$(EXEEXT) \ - bitmap.module$(EXEEXT) bitmap_scale.module$(EXEEXT) \ -- $(am__EXEEXT_691) $(am__EXEEXT_692) $(am__EXEEXT_693) \ -- $(am__EXEEXT_694) $(am__EXEEXT_695) $(am__EXEEXT_696) \ -- $(am__EXEEXT_697) $(am__EXEEXT_698) $(am__EXEEXT_699) \ -+ $(am__EXEEXT_690) $(am__EXEEXT_691) $(am__EXEEXT_692) \ -+ $(am__EXEEXT_693) $(am__EXEEXT_694) $(am__EXEEXT_695) \ -+ $(am__EXEEXT_696) $(am__EXEEXT_697) $(am__EXEEXT_698) \ - jpeg.module$(EXEEXT) png.module$(EXEEXT) tga.module$(EXEEXT) \ -- $(am__EXEEXT_700) $(am__EXEEXT_701) $(am__EXEEXT_702) \ -- $(am__EXEEXT_703) $(am__EXEEXT_704) $(am__EXEEXT_705) \ -- $(am__EXEEXT_706) $(am__EXEEXT_707) $(am__EXEEXT_708) \ -- $(am__EXEEXT_709) $(am__EXEEXT_710) $(am__EXEEXT_711) \ -- $(am__EXEEXT_712) $(am__EXEEXT_713) $(am__EXEEXT_714) \ -- $(am__EXEEXT_715) $(am__EXEEXT_716) $(am__EXEEXT_717) \ -- $(am__EXEEXT_718) $(am__EXEEXT_719) $(am__EXEEXT_720) \ -- $(am__EXEEXT_721) $(am__EXEEXT_722) $(am__EXEEXT_723) \ -- $(am__EXEEXT_724) $(am__EXEEXT_725) $(am__EXEEXT_726) \ -- $(am__EXEEXT_727) $(am__EXEEXT_728) $(am__EXEEXT_729) \ -- $(am__EXEEXT_730) $(am__EXEEXT_731) $(am__EXEEXT_732) \ -- $(am__EXEEXT_733) $(am__EXEEXT_734) $(am__EXEEXT_735) \ -- $(am__EXEEXT_736) $(am__EXEEXT_737) $(am__EXEEXT_738) \ -- $(am__EXEEXT_739) $(am__EXEEXT_740) \ -- video_colors.module$(EXEEXT) $(am__EXEEXT_741) \ -- $(am__EXEEXT_742) datehook.module$(EXEEXT) net.module$(EXEEXT) \ -- tftp.module$(EXEEXT) http.module$(EXEEXT) $(am__EXEEXT_743) \ -- $(am__EXEEXT_744) $(am__EXEEXT_745) $(am__EXEEXT_746) \ -- $(am__EXEEXT_747) $(am__EXEEXT_748) $(am__EXEEXT_749) \ -- $(am__EXEEXT_750) $(am__EXEEXT_751) $(am__EXEEXT_752) \ -- $(am__EXEEXT_753) $(am__EXEEXT_754) $(am__EXEEXT_755) \ -- $(am__EXEEXT_756) $(am__EXEEXT_757) $(am__EXEEXT_758) \ -- $(am__EXEEXT_759) $(am__EXEEXT_760) \ -+ $(am__EXEEXT_699) $(am__EXEEXT_700) $(am__EXEEXT_701) \ -+ $(am__EXEEXT_702) $(am__EXEEXT_703) $(am__EXEEXT_704) \ -+ $(am__EXEEXT_705) $(am__EXEEXT_706) $(am__EXEEXT_707) \ -+ $(am__EXEEXT_708) $(am__EXEEXT_709) $(am__EXEEXT_710) \ -+ $(am__EXEEXT_711) $(am__EXEEXT_712) $(am__EXEEXT_713) \ -+ $(am__EXEEXT_714) $(am__EXEEXT_715) $(am__EXEEXT_716) \ -+ $(am__EXEEXT_717) $(am__EXEEXT_718) $(am__EXEEXT_719) \ -+ $(am__EXEEXT_720) $(am__EXEEXT_721) $(am__EXEEXT_722) \ -+ $(am__EXEEXT_723) $(am__EXEEXT_724) $(am__EXEEXT_725) \ -+ $(am__EXEEXT_726) $(am__EXEEXT_727) $(am__EXEEXT_728) \ -+ $(am__EXEEXT_729) $(am__EXEEXT_730) $(am__EXEEXT_731) \ -+ $(am__EXEEXT_732) $(am__EXEEXT_733) $(am__EXEEXT_734) \ -+ $(am__EXEEXT_735) $(am__EXEEXT_736) $(am__EXEEXT_737) \ -+ $(am__EXEEXT_738) $(am__EXEEXT_739) \ -+ video_colors.module$(EXEEXT) $(am__EXEEXT_740) \ -+ $(am__EXEEXT_741) datehook.module$(EXEEXT) net.module$(EXEEXT) \ -+ tftp.module$(EXEEXT) http.module$(EXEEXT) $(am__EXEEXT_742) \ -+ $(am__EXEEXT_743) $(am__EXEEXT_744) $(am__EXEEXT_745) \ -+ $(am__EXEEXT_746) $(am__EXEEXT_747) $(am__EXEEXT_748) \ -+ $(am__EXEEXT_749) $(am__EXEEXT_750) $(am__EXEEXT_751) \ -+ $(am__EXEEXT_752) $(am__EXEEXT_753) $(am__EXEEXT_754) \ -+ $(am__EXEEXT_755) $(am__EXEEXT_756) $(am__EXEEXT_757) \ -+ $(am__EXEEXT_758) $(am__EXEEXT_759) \ - syslinuxcfg.module$(EXEEXT) test_blockarg.module$(EXEEXT) \ - xzio.module$(EXEEXT) lzopio.module$(EXEEXT) \ -- testload.module$(EXEEXT) $(am__EXEEXT_761) $(am__EXEEXT_762) \ -- $(am__EXEEXT_763) $(am__EXEEXT_764) $(am__EXEEXT_765) \ -- $(am__EXEEXT_766) $(am__EXEEXT_767) $(am__EXEEXT_768) \ -- $(am__EXEEXT_769) $(am__EXEEXT_770) $(am__EXEEXT_771) \ -- $(am__EXEEXT_772) $(am__EXEEXT_773) $(am__EXEEXT_774) \ -- $(am__EXEEXT_775) $(am__EXEEXT_776) $(am__EXEEXT_777) \ -+ testload.module$(EXEEXT) $(am__EXEEXT_760) $(am__EXEEXT_761) \ -+ $(am__EXEEXT_762) $(am__EXEEXT_763) $(am__EXEEXT_764) \ -+ $(am__EXEEXT_765) $(am__EXEEXT_766) $(am__EXEEXT_767) \ -+ $(am__EXEEXT_768) $(am__EXEEXT_769) $(am__EXEEXT_770) \ -+ $(am__EXEEXT_771) $(am__EXEEXT_772) $(am__EXEEXT_773) \ -+ $(am__EXEEXT_774) $(am__EXEEXT_775) $(am__EXEEXT_776) \ - priority_queue.module$(EXEEXT) time.module$(EXEEXT) \ -- $(am__EXEEXT_778) $(am__EXEEXT_779) adler32.module$(EXEEXT) \ -+ $(am__EXEEXT_777) $(am__EXEEXT_778) adler32.module$(EXEEXT) \ - crc64.module$(EXEEXT) mpi.module$(EXEEXT) \ -- all_video.module$(EXEEXT) $(am__EXEEXT_780) $(am__EXEEXT_781) \ -- $(am__EXEEXT_782) $(am__EXEEXT_783) $(am__EXEEXT_784) \ -- $(am__EXEEXT_785) testspeed.module$(EXEEXT) $(am__EXEEXT_786) \ -+ all_video.module$(EXEEXT) $(am__EXEEXT_779) $(am__EXEEXT_780) \ -+ $(am__EXEEXT_781) $(am__EXEEXT_782) $(am__EXEEXT_783) \ -+ $(am__EXEEXT_784) testspeed.module$(EXEEXT) $(am__EXEEXT_785) \ - tr.module$(EXEEXT) progress.module$(EXEEXT) \ -- file.module$(EXEEXT) $(am__EXEEXT_787) $(am__EXEEXT_788) \ -- $(am__EXEEXT_789) $(am__EXEEXT_790) $(am__EXEEXT_791) \ -- $(am__EXEEXT_792) $(am__EXEEXT_793) $(am__EXEEXT_794) \ -- $(am__EXEEXT_795) $(am__EXEEXT_796) $(am__EXEEXT_797) \ -- $(am__EXEEXT_798) $(am__EXEEXT_799) $(am__EXEEXT_800) \ -+ file.module$(EXEEXT) $(am__EXEEXT_786) $(am__EXEEXT_787) \ -+ $(am__EXEEXT_788) $(am__EXEEXT_789) $(am__EXEEXT_790) \ -+ $(am__EXEEXT_791) $(am__EXEEXT_792) $(am__EXEEXT_793) \ -+ $(am__EXEEXT_794) $(am__EXEEXT_795) $(am__EXEEXT_796) \ -+ $(am__EXEEXT_797) $(am__EXEEXT_798) $(am__EXEEXT_799) \ - gcry_arcfour.module$(EXEEXT) gcry_blowfish.module$(EXEEXT) \ - gcry_camellia.module$(EXEEXT) gcry_cast5.module$(EXEEXT) \ - gcry_crc.module$(EXEEXT) gcry_des.module$(EXEEXT) \ -@@ -454,19 +454,19 @@ platform_PROGRAMS = disk.module$(EXEEXT) trig.module$(EXEEXT) \ - gcry_sha1.module$(EXEEXT) gcry_sha256.module$(EXEEXT) \ - gcry_sha512.module$(EXEEXT) gcry_tiger.module$(EXEEXT) \ - gcry_twofish.module$(EXEEXT) gcry_whirlpool.module$(EXEEXT) \ -- $(am__EXEEXT_801) $(am__EXEEXT_802) $(am__EXEEXT_803) \ -- $(am__EXEEXT_804) $(am__EXEEXT_805) $(am__EXEEXT_806) \ -- $(am__EXEEXT_807) $(am__EXEEXT_808) $(am__EXEEXT_809) \ -- $(am__EXEEXT_810) $(am__EXEEXT_811) $(am__EXEEXT_812) \ -- $(am__EXEEXT_813) $(am__EXEEXT_814) $(am__EXEEXT_815) \ -- $(am__EXEEXT_816) $(am__EXEEXT_817) $(am__EXEEXT_818) \ -- $(am__EXEEXT_819) $(am__EXEEXT_820) $(am__EXEEXT_821) \ -- $(am__EXEEXT_822) $(am__EXEEXT_823) $(am__EXEEXT_824) \ -- $(am__EXEEXT_825) $(am__EXEEXT_826) $(am__EXEEXT_827) \ -- $(am__EXEEXT_828) $(am__EXEEXT_829) $(am__EXEEXT_830) \ -- $(am__EXEEXT_831) $(am__EXEEXT_832) $(am__EXEEXT_833) \ -- $(am__EXEEXT_834) $(am__EXEEXT_835) $(am__EXEEXT_836) \ -- $(am__EXEEXT_837) $(am__EXEEXT_838) $(am__EXEEXT_839) -+ $(am__EXEEXT_800) $(am__EXEEXT_801) $(am__EXEEXT_802) \ -+ $(am__EXEEXT_803) $(am__EXEEXT_804) $(am__EXEEXT_805) \ -+ $(am__EXEEXT_806) $(am__EXEEXT_807) $(am__EXEEXT_808) \ -+ $(am__EXEEXT_809) $(am__EXEEXT_810) $(am__EXEEXT_811) \ -+ $(am__EXEEXT_812) $(am__EXEEXT_813) $(am__EXEEXT_814) \ -+ $(am__EXEEXT_815) $(am__EXEEXT_816) $(am__EXEEXT_817) \ -+ $(am__EXEEXT_818) $(am__EXEEXT_819) $(am__EXEEXT_820) \ -+ $(am__EXEEXT_821) $(am__EXEEXT_822) $(am__EXEEXT_823) \ -+ $(am__EXEEXT_824) $(am__EXEEXT_825) $(am__EXEEXT_826) \ -+ $(am__EXEEXT_827) $(am__EXEEXT_828) $(am__EXEEXT_829) \ -+ $(am__EXEEXT_830) $(am__EXEEXT_831) $(am__EXEEXT_832) \ -+ $(am__EXEEXT_833) $(am__EXEEXT_834) $(am__EXEEXT_835) \ -+ $(am__EXEEXT_836) $(am__EXEEXT_837) $(am__EXEEXT_838) - TESTS = - @COND_i386_pc_TRUE@am__append_3 = cs5536.module - @COND_i386_pc_TRUE@am__append_4 = cs5536.module$(EXEEXT) -@@ -2996,1864 +2996,1854 @@ TESTS = - @COND_riscv64_efi_TRUE@ reboot.marker - @COND_riscv64_efi_TRUE@am__append_2038 = reboot.mod - @COND_riscv64_efi_TRUE@am__append_2039 = reboot.marker --@COND_x86_64_efi_TRUE@am__append_2040 = shim_lock.module --@COND_x86_64_efi_TRUE@am__append_2041 = shim_lock.module$(EXEEXT) --@COND_x86_64_efi_FALSE@shim_lock_module_DEPENDENCIES = --@COND_x86_64_efi_TRUE@am__append_2042 = --@COND_x86_64_efi_TRUE@am__append_2043 = $(nodist_shim_lock_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_2044 = \ --@COND_x86_64_efi_TRUE@ $(nodist_shim_lock_module_SOURCES) \ --@COND_x86_64_efi_TRUE@ shim_lock.marker --@COND_x86_64_efi_TRUE@am__append_2045 = shim_lock.mod --@COND_x86_64_efi_TRUE@am__append_2046 = shim_lock.marker --@COND_i386_pc_TRUE@am__append_2047 = hdparm.module --@COND_i386_pc_TRUE@am__append_2048 = hdparm.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__append_2040 = hdparm.module -+@COND_i386_pc_TRUE@am__append_2041 = hdparm.module$(EXEEXT) - @COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_x86_64_efi_FALSE@hdparm_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_2049 = --@COND_i386_pc_TRUE@am__append_2050 = $(nodist_hdparm_module_SOURCES) --@COND_i386_pc_TRUE@am__append_2051 = $(nodist_hdparm_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_2042 = -+@COND_i386_pc_TRUE@am__append_2043 = $(nodist_hdparm_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_2044 = $(nodist_hdparm_module_SOURCES) \ - @COND_i386_pc_TRUE@ hdparm.marker --@COND_i386_pc_TRUE@am__append_2052 = hdparm.mod --@COND_i386_pc_TRUE@am__append_2053 = hdparm.marker --@COND_i386_efi_TRUE@am__append_2054 = hdparm.module --@COND_i386_efi_TRUE@am__append_2055 = hdparm.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_2056 = --@COND_i386_efi_TRUE@am__append_2057 = $(nodist_hdparm_module_SOURCES) --@COND_i386_efi_TRUE@am__append_2058 = $(nodist_hdparm_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_2045 = hdparm.mod -+@COND_i386_pc_TRUE@am__append_2046 = hdparm.marker -+@COND_i386_efi_TRUE@am__append_2047 = hdparm.module -+@COND_i386_efi_TRUE@am__append_2048 = hdparm.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_2049 = -+@COND_i386_efi_TRUE@am__append_2050 = $(nodist_hdparm_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_2051 = $(nodist_hdparm_module_SOURCES) \ - @COND_i386_efi_TRUE@ hdparm.marker --@COND_i386_efi_TRUE@am__append_2059 = hdparm.mod --@COND_i386_efi_TRUE@am__append_2060 = hdparm.marker --@COND_i386_qemu_TRUE@am__append_2061 = hdparm.module --@COND_i386_qemu_TRUE@am__append_2062 = hdparm.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_2063 = --@COND_i386_qemu_TRUE@am__append_2064 = $(nodist_hdparm_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_2065 = \ -+@COND_i386_efi_TRUE@am__append_2052 = hdparm.mod -+@COND_i386_efi_TRUE@am__append_2053 = hdparm.marker -+@COND_i386_qemu_TRUE@am__append_2054 = hdparm.module -+@COND_i386_qemu_TRUE@am__append_2055 = hdparm.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_2056 = -+@COND_i386_qemu_TRUE@am__append_2057 = $(nodist_hdparm_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_2058 = \ - @COND_i386_qemu_TRUE@ $(nodist_hdparm_module_SOURCES) \ - @COND_i386_qemu_TRUE@ hdparm.marker --@COND_i386_qemu_TRUE@am__append_2066 = hdparm.mod --@COND_i386_qemu_TRUE@am__append_2067 = hdparm.marker --@COND_i386_coreboot_TRUE@am__append_2068 = hdparm.module --@COND_i386_coreboot_TRUE@am__append_2069 = hdparm.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_2070 = --@COND_i386_coreboot_TRUE@am__append_2071 = $(nodist_hdparm_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_2072 = \ -+@COND_i386_qemu_TRUE@am__append_2059 = hdparm.mod -+@COND_i386_qemu_TRUE@am__append_2060 = hdparm.marker -+@COND_i386_coreboot_TRUE@am__append_2061 = hdparm.module -+@COND_i386_coreboot_TRUE@am__append_2062 = hdparm.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_2063 = -+@COND_i386_coreboot_TRUE@am__append_2064 = $(nodist_hdparm_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_2065 = \ - @COND_i386_coreboot_TRUE@ $(nodist_hdparm_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ hdparm.marker --@COND_i386_coreboot_TRUE@am__append_2073 = hdparm.mod --@COND_i386_coreboot_TRUE@am__append_2074 = hdparm.marker --@COND_i386_multiboot_TRUE@am__append_2075 = hdparm.module --@COND_i386_multiboot_TRUE@am__append_2076 = hdparm.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_2077 = --@COND_i386_multiboot_TRUE@am__append_2078 = $(nodist_hdparm_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_2079 = \ -+@COND_i386_coreboot_TRUE@am__append_2066 = hdparm.mod -+@COND_i386_coreboot_TRUE@am__append_2067 = hdparm.marker -+@COND_i386_multiboot_TRUE@am__append_2068 = hdparm.module -+@COND_i386_multiboot_TRUE@am__append_2069 = hdparm.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_2070 = -+@COND_i386_multiboot_TRUE@am__append_2071 = $(nodist_hdparm_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_2072 = \ - @COND_i386_multiboot_TRUE@ $(nodist_hdparm_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ hdparm.marker --@COND_i386_multiboot_TRUE@am__append_2080 = hdparm.mod --@COND_i386_multiboot_TRUE@am__append_2081 = hdparm.marker --@COND_i386_ieee1275_TRUE@am__append_2082 = hdparm.module --@COND_i386_ieee1275_TRUE@am__append_2083 = hdparm.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_2084 = --@COND_i386_ieee1275_TRUE@am__append_2085 = $(nodist_hdparm_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_2086 = \ -+@COND_i386_multiboot_TRUE@am__append_2073 = hdparm.mod -+@COND_i386_multiboot_TRUE@am__append_2074 = hdparm.marker -+@COND_i386_ieee1275_TRUE@am__append_2075 = hdparm.module -+@COND_i386_ieee1275_TRUE@am__append_2076 = hdparm.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_2077 = -+@COND_i386_ieee1275_TRUE@am__append_2078 = $(nodist_hdparm_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_2079 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_hdparm_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ hdparm.marker --@COND_i386_ieee1275_TRUE@am__append_2087 = hdparm.mod --@COND_i386_ieee1275_TRUE@am__append_2088 = hdparm.marker --@COND_x86_64_efi_TRUE@am__append_2089 = hdparm.module --@COND_x86_64_efi_TRUE@am__append_2090 = hdparm.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_2091 = --@COND_x86_64_efi_TRUE@am__append_2092 = $(nodist_hdparm_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_2093 = \ -+@COND_i386_ieee1275_TRUE@am__append_2080 = hdparm.mod -+@COND_i386_ieee1275_TRUE@am__append_2081 = hdparm.marker -+@COND_x86_64_efi_TRUE@am__append_2082 = hdparm.module -+@COND_x86_64_efi_TRUE@am__append_2083 = hdparm.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_2084 = -+@COND_x86_64_efi_TRUE@am__append_2085 = $(nodist_hdparm_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_2086 = \ - @COND_x86_64_efi_TRUE@ $(nodist_hdparm_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ hdparm.marker --@COND_x86_64_efi_TRUE@am__append_2094 = hdparm.mod --@COND_x86_64_efi_TRUE@am__append_2095 = hdparm.marker --@COND_mips_loongson_TRUE@am__append_2096 = hdparm.module --@COND_mips_loongson_TRUE@am__append_2097 = hdparm.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__append_2098 = --@COND_mips_loongson_TRUE@am__append_2099 = $(nodist_hdparm_module_SOURCES) --@COND_mips_loongson_TRUE@am__append_2100 = \ -+@COND_x86_64_efi_TRUE@am__append_2087 = hdparm.mod -+@COND_x86_64_efi_TRUE@am__append_2088 = hdparm.marker -+@COND_mips_loongson_TRUE@am__append_2089 = hdparm.module -+@COND_mips_loongson_TRUE@am__append_2090 = hdparm.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__append_2091 = -+@COND_mips_loongson_TRUE@am__append_2092 = $(nodist_hdparm_module_SOURCES) -+@COND_mips_loongson_TRUE@am__append_2093 = \ - @COND_mips_loongson_TRUE@ $(nodist_hdparm_module_SOURCES) \ - @COND_mips_loongson_TRUE@ hdparm.marker --@COND_mips_loongson_TRUE@am__append_2101 = hdparm.mod --@COND_mips_loongson_TRUE@am__append_2102 = hdparm.marker --@COND_mips_qemu_mips_TRUE@am__append_2103 = hdparm.module --@COND_mips_qemu_mips_TRUE@am__append_2104 = hdparm.module$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__append_2105 = --@COND_mips_qemu_mips_TRUE@am__append_2106 = $(nodist_hdparm_module_SOURCES) --@COND_mips_qemu_mips_TRUE@am__append_2107 = \ -+@COND_mips_loongson_TRUE@am__append_2094 = hdparm.mod -+@COND_mips_loongson_TRUE@am__append_2095 = hdparm.marker -+@COND_mips_qemu_mips_TRUE@am__append_2096 = hdparm.module -+@COND_mips_qemu_mips_TRUE@am__append_2097 = hdparm.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__append_2098 = -+@COND_mips_qemu_mips_TRUE@am__append_2099 = $(nodist_hdparm_module_SOURCES) -+@COND_mips_qemu_mips_TRUE@am__append_2100 = \ - @COND_mips_qemu_mips_TRUE@ $(nodist_hdparm_module_SOURCES) \ - @COND_mips_qemu_mips_TRUE@ hdparm.marker --@COND_mips_qemu_mips_TRUE@am__append_2108 = hdparm.mod --@COND_mips_qemu_mips_TRUE@am__append_2109 = hdparm.marker --@COND_i386_efi_TRUE@am__append_2110 = loadbios.module --@COND_i386_efi_TRUE@am__append_2111 = loadbios.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__append_2101 = hdparm.mod -+@COND_mips_qemu_mips_TRUE@am__append_2102 = hdparm.marker -+@COND_i386_efi_TRUE@am__append_2103 = loadbios.module -+@COND_i386_efi_TRUE@am__append_2104 = loadbios.module$(EXEEXT) - @COND_i386_efi_FALSE@@COND_x86_64_efi_FALSE@loadbios_module_DEPENDENCIES = --@COND_i386_efi_TRUE@am__append_2112 = --@COND_i386_efi_TRUE@am__append_2113 = $(nodist_loadbios_module_SOURCES) --@COND_i386_efi_TRUE@am__append_2114 = \ -+@COND_i386_efi_TRUE@am__append_2105 = -+@COND_i386_efi_TRUE@am__append_2106 = $(nodist_loadbios_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_2107 = \ - @COND_i386_efi_TRUE@ $(nodist_loadbios_module_SOURCES) \ - @COND_i386_efi_TRUE@ loadbios.marker --@COND_i386_efi_TRUE@am__append_2115 = loadbios.mod --@COND_i386_efi_TRUE@am__append_2116 = loadbios.marker --@COND_x86_64_efi_TRUE@am__append_2117 = loadbios.module --@COND_x86_64_efi_TRUE@am__append_2118 = loadbios.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_2119 = --@COND_x86_64_efi_TRUE@am__append_2120 = $(nodist_loadbios_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_2121 = \ -+@COND_i386_efi_TRUE@am__append_2108 = loadbios.mod -+@COND_i386_efi_TRUE@am__append_2109 = loadbios.marker -+@COND_x86_64_efi_TRUE@am__append_2110 = loadbios.module -+@COND_x86_64_efi_TRUE@am__append_2111 = loadbios.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_2112 = -+@COND_x86_64_efi_TRUE@am__append_2113 = $(nodist_loadbios_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_2114 = \ - @COND_x86_64_efi_TRUE@ $(nodist_loadbios_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ loadbios.marker --@COND_x86_64_efi_TRUE@am__append_2122 = loadbios.mod --@COND_x86_64_efi_TRUE@am__append_2123 = loadbios.marker --@COND_i386_pc_TRUE@am__append_2124 = lspci.module --@COND_i386_pc_TRUE@am__append_2125 = lspci.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_2115 = loadbios.mod -+@COND_x86_64_efi_TRUE@am__append_2116 = loadbios.marker -+@COND_i386_pc_TRUE@am__append_2117 = lspci.module -+@COND_i386_pc_TRUE@am__append_2118 = lspci.module$(EXEEXT) - @COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_mips_loongson_FALSE@@COND_x86_64_efi_FALSE@lspci_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_2126 = --@COND_i386_pc_TRUE@am__append_2127 = $(nodist_lspci_module_SOURCES) --@COND_i386_pc_TRUE@am__append_2128 = $(nodist_lspci_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_2119 = -+@COND_i386_pc_TRUE@am__append_2120 = $(nodist_lspci_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_2121 = $(nodist_lspci_module_SOURCES) \ - @COND_i386_pc_TRUE@ lspci.marker --@COND_i386_pc_TRUE@am__append_2129 = lspci.mod --@COND_i386_pc_TRUE@am__append_2130 = lspci.marker --@COND_i386_efi_TRUE@am__append_2131 = lspci.module --@COND_i386_efi_TRUE@am__append_2132 = lspci.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_2133 = --@COND_i386_efi_TRUE@am__append_2134 = $(nodist_lspci_module_SOURCES) --@COND_i386_efi_TRUE@am__append_2135 = $(nodist_lspci_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_2122 = lspci.mod -+@COND_i386_pc_TRUE@am__append_2123 = lspci.marker -+@COND_i386_efi_TRUE@am__append_2124 = lspci.module -+@COND_i386_efi_TRUE@am__append_2125 = lspci.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_2126 = -+@COND_i386_efi_TRUE@am__append_2127 = $(nodist_lspci_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_2128 = $(nodist_lspci_module_SOURCES) \ - @COND_i386_efi_TRUE@ lspci.marker --@COND_i386_efi_TRUE@am__append_2136 = lspci.mod --@COND_i386_efi_TRUE@am__append_2137 = lspci.marker --@COND_i386_qemu_TRUE@am__append_2138 = lspci.module --@COND_i386_qemu_TRUE@am__append_2139 = lspci.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_2140 = --@COND_i386_qemu_TRUE@am__append_2141 = $(nodist_lspci_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_2142 = $(nodist_lspci_module_SOURCES) \ -+@COND_i386_efi_TRUE@am__append_2129 = lspci.mod -+@COND_i386_efi_TRUE@am__append_2130 = lspci.marker -+@COND_i386_qemu_TRUE@am__append_2131 = lspci.module -+@COND_i386_qemu_TRUE@am__append_2132 = lspci.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_2133 = -+@COND_i386_qemu_TRUE@am__append_2134 = $(nodist_lspci_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_2135 = $(nodist_lspci_module_SOURCES) \ - @COND_i386_qemu_TRUE@ lspci.marker --@COND_i386_qemu_TRUE@am__append_2143 = lspci.mod --@COND_i386_qemu_TRUE@am__append_2144 = lspci.marker --@COND_i386_coreboot_TRUE@am__append_2145 = lspci.module --@COND_i386_coreboot_TRUE@am__append_2146 = lspci.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_2147 = --@COND_i386_coreboot_TRUE@am__append_2148 = $(nodist_lspci_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_2149 = \ -+@COND_i386_qemu_TRUE@am__append_2136 = lspci.mod -+@COND_i386_qemu_TRUE@am__append_2137 = lspci.marker -+@COND_i386_coreboot_TRUE@am__append_2138 = lspci.module -+@COND_i386_coreboot_TRUE@am__append_2139 = lspci.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_2140 = -+@COND_i386_coreboot_TRUE@am__append_2141 = $(nodist_lspci_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_2142 = \ - @COND_i386_coreboot_TRUE@ $(nodist_lspci_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ lspci.marker --@COND_i386_coreboot_TRUE@am__append_2150 = lspci.mod --@COND_i386_coreboot_TRUE@am__append_2151 = lspci.marker --@COND_i386_multiboot_TRUE@am__append_2152 = lspci.module --@COND_i386_multiboot_TRUE@am__append_2153 = lspci.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_2154 = --@COND_i386_multiboot_TRUE@am__append_2155 = $(nodist_lspci_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_2156 = \ -+@COND_i386_coreboot_TRUE@am__append_2143 = lspci.mod -+@COND_i386_coreboot_TRUE@am__append_2144 = lspci.marker -+@COND_i386_multiboot_TRUE@am__append_2145 = lspci.module -+@COND_i386_multiboot_TRUE@am__append_2146 = lspci.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_2147 = -+@COND_i386_multiboot_TRUE@am__append_2148 = $(nodist_lspci_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_2149 = \ - @COND_i386_multiboot_TRUE@ $(nodist_lspci_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ lspci.marker --@COND_i386_multiboot_TRUE@am__append_2157 = lspci.mod --@COND_i386_multiboot_TRUE@am__append_2158 = lspci.marker --@COND_i386_ieee1275_TRUE@am__append_2159 = lspci.module --@COND_i386_ieee1275_TRUE@am__append_2160 = lspci.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_2161 = --@COND_i386_ieee1275_TRUE@am__append_2162 = $(nodist_lspci_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_2163 = \ -+@COND_i386_multiboot_TRUE@am__append_2150 = lspci.mod -+@COND_i386_multiboot_TRUE@am__append_2151 = lspci.marker -+@COND_i386_ieee1275_TRUE@am__append_2152 = lspci.module -+@COND_i386_ieee1275_TRUE@am__append_2153 = lspci.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_2154 = -+@COND_i386_ieee1275_TRUE@am__append_2155 = $(nodist_lspci_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_2156 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_lspci_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ lspci.marker --@COND_i386_ieee1275_TRUE@am__append_2164 = lspci.mod --@COND_i386_ieee1275_TRUE@am__append_2165 = lspci.marker --@COND_x86_64_efi_TRUE@am__append_2166 = lspci.module --@COND_x86_64_efi_TRUE@am__append_2167 = lspci.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_2168 = --@COND_x86_64_efi_TRUE@am__append_2169 = $(nodist_lspci_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_2170 = \ -+@COND_i386_ieee1275_TRUE@am__append_2157 = lspci.mod -+@COND_i386_ieee1275_TRUE@am__append_2158 = lspci.marker -+@COND_x86_64_efi_TRUE@am__append_2159 = lspci.module -+@COND_x86_64_efi_TRUE@am__append_2160 = lspci.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_2161 = -+@COND_x86_64_efi_TRUE@am__append_2162 = $(nodist_lspci_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_2163 = \ - @COND_x86_64_efi_TRUE@ $(nodist_lspci_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ lspci.marker --@COND_x86_64_efi_TRUE@am__append_2171 = lspci.mod --@COND_x86_64_efi_TRUE@am__append_2172 = lspci.marker --@COND_mips_loongson_TRUE@am__append_2173 = lspci.module --@COND_mips_loongson_TRUE@am__append_2174 = lspci.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__append_2175 = --@COND_mips_loongson_TRUE@am__append_2176 = $(nodist_lspci_module_SOURCES) --@COND_mips_loongson_TRUE@am__append_2177 = \ -+@COND_x86_64_efi_TRUE@am__append_2164 = lspci.mod -+@COND_x86_64_efi_TRUE@am__append_2165 = lspci.marker -+@COND_mips_loongson_TRUE@am__append_2166 = lspci.module -+@COND_mips_loongson_TRUE@am__append_2167 = lspci.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__append_2168 = -+@COND_mips_loongson_TRUE@am__append_2169 = $(nodist_lspci_module_SOURCES) -+@COND_mips_loongson_TRUE@am__append_2170 = \ - @COND_mips_loongson_TRUE@ $(nodist_lspci_module_SOURCES) \ - @COND_mips_loongson_TRUE@ lspci.marker --@COND_mips_loongson_TRUE@am__append_2178 = lspci.mod --@COND_mips_loongson_TRUE@am__append_2179 = lspci.marker --@COND_i386_pc_TRUE@am__append_2180 = play.module --@COND_i386_pc_TRUE@am__append_2181 = play.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__append_2171 = lspci.mod -+@COND_mips_loongson_TRUE@am__append_2172 = lspci.marker -+@COND_i386_pc_TRUE@am__append_2173 = play.module -+@COND_i386_pc_TRUE@am__append_2174 = play.module$(EXEEXT) - @COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_x86_64_efi_FALSE@play_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_2182 = --@COND_i386_pc_TRUE@am__append_2183 = $(nodist_play_module_SOURCES) --@COND_i386_pc_TRUE@am__append_2184 = $(nodist_play_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_2175 = -+@COND_i386_pc_TRUE@am__append_2176 = $(nodist_play_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_2177 = $(nodist_play_module_SOURCES) \ - @COND_i386_pc_TRUE@ play.marker --@COND_i386_pc_TRUE@am__append_2185 = play.mod --@COND_i386_pc_TRUE@am__append_2186 = play.marker --@COND_i386_efi_TRUE@am__append_2187 = play.module --@COND_i386_efi_TRUE@am__append_2188 = play.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_2189 = --@COND_i386_efi_TRUE@am__append_2190 = $(nodist_play_module_SOURCES) --@COND_i386_efi_TRUE@am__append_2191 = $(nodist_play_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_2178 = play.mod -+@COND_i386_pc_TRUE@am__append_2179 = play.marker -+@COND_i386_efi_TRUE@am__append_2180 = play.module -+@COND_i386_efi_TRUE@am__append_2181 = play.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_2182 = -+@COND_i386_efi_TRUE@am__append_2183 = $(nodist_play_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_2184 = $(nodist_play_module_SOURCES) \ - @COND_i386_efi_TRUE@ play.marker --@COND_i386_efi_TRUE@am__append_2192 = play.mod --@COND_i386_efi_TRUE@am__append_2193 = play.marker --@COND_i386_qemu_TRUE@am__append_2194 = play.module --@COND_i386_qemu_TRUE@am__append_2195 = play.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_2196 = --@COND_i386_qemu_TRUE@am__append_2197 = $(nodist_play_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_2198 = $(nodist_play_module_SOURCES) \ -+@COND_i386_efi_TRUE@am__append_2185 = play.mod -+@COND_i386_efi_TRUE@am__append_2186 = play.marker -+@COND_i386_qemu_TRUE@am__append_2187 = play.module -+@COND_i386_qemu_TRUE@am__append_2188 = play.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_2189 = -+@COND_i386_qemu_TRUE@am__append_2190 = $(nodist_play_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_2191 = $(nodist_play_module_SOURCES) \ - @COND_i386_qemu_TRUE@ play.marker --@COND_i386_qemu_TRUE@am__append_2199 = play.mod --@COND_i386_qemu_TRUE@am__append_2200 = play.marker --@COND_i386_coreboot_TRUE@am__append_2201 = play.module --@COND_i386_coreboot_TRUE@am__append_2202 = play.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_2203 = --@COND_i386_coreboot_TRUE@am__append_2204 = $(nodist_play_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_2205 = \ -+@COND_i386_qemu_TRUE@am__append_2192 = play.mod -+@COND_i386_qemu_TRUE@am__append_2193 = play.marker -+@COND_i386_coreboot_TRUE@am__append_2194 = play.module -+@COND_i386_coreboot_TRUE@am__append_2195 = play.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_2196 = -+@COND_i386_coreboot_TRUE@am__append_2197 = $(nodist_play_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_2198 = \ - @COND_i386_coreboot_TRUE@ $(nodist_play_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ play.marker --@COND_i386_coreboot_TRUE@am__append_2206 = play.mod --@COND_i386_coreboot_TRUE@am__append_2207 = play.marker --@COND_i386_multiboot_TRUE@am__append_2208 = play.module --@COND_i386_multiboot_TRUE@am__append_2209 = play.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_2210 = --@COND_i386_multiboot_TRUE@am__append_2211 = $(nodist_play_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_2212 = \ -+@COND_i386_coreboot_TRUE@am__append_2199 = play.mod -+@COND_i386_coreboot_TRUE@am__append_2200 = play.marker -+@COND_i386_multiboot_TRUE@am__append_2201 = play.module -+@COND_i386_multiboot_TRUE@am__append_2202 = play.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_2203 = -+@COND_i386_multiboot_TRUE@am__append_2204 = $(nodist_play_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_2205 = \ - @COND_i386_multiboot_TRUE@ $(nodist_play_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ play.marker --@COND_i386_multiboot_TRUE@am__append_2213 = play.mod --@COND_i386_multiboot_TRUE@am__append_2214 = play.marker --@COND_i386_ieee1275_TRUE@am__append_2215 = play.module --@COND_i386_ieee1275_TRUE@am__append_2216 = play.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_2217 = --@COND_i386_ieee1275_TRUE@am__append_2218 = $(nodist_play_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_2219 = \ -+@COND_i386_multiboot_TRUE@am__append_2206 = play.mod -+@COND_i386_multiboot_TRUE@am__append_2207 = play.marker -+@COND_i386_ieee1275_TRUE@am__append_2208 = play.module -+@COND_i386_ieee1275_TRUE@am__append_2209 = play.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_2210 = -+@COND_i386_ieee1275_TRUE@am__append_2211 = $(nodist_play_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_2212 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_play_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ play.marker --@COND_i386_ieee1275_TRUE@am__append_2220 = play.mod --@COND_i386_ieee1275_TRUE@am__append_2221 = play.marker --@COND_x86_64_efi_TRUE@am__append_2222 = play.module --@COND_x86_64_efi_TRUE@am__append_2223 = play.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_2224 = --@COND_x86_64_efi_TRUE@am__append_2225 = $(nodist_play_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_2226 = $(nodist_play_module_SOURCES) \ -+@COND_i386_ieee1275_TRUE@am__append_2213 = play.mod -+@COND_i386_ieee1275_TRUE@am__append_2214 = play.marker -+@COND_x86_64_efi_TRUE@am__append_2215 = play.module -+@COND_x86_64_efi_TRUE@am__append_2216 = play.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_2217 = -+@COND_x86_64_efi_TRUE@am__append_2218 = $(nodist_play_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_2219 = $(nodist_play_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ play.marker --@COND_x86_64_efi_TRUE@am__append_2227 = play.mod --@COND_x86_64_efi_TRUE@am__append_2228 = play.marker --@COND_i386_pc_TRUE@am__append_2229 = spkmodem.module --@COND_i386_pc_TRUE@am__append_2230 = spkmodem.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_2220 = play.mod -+@COND_x86_64_efi_TRUE@am__append_2221 = play.marker -+@COND_i386_pc_TRUE@am__append_2222 = spkmodem.module -+@COND_i386_pc_TRUE@am__append_2223 = spkmodem.module$(EXEEXT) - @COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_x86_64_efi_FALSE@spkmodem_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_2231 = --@COND_i386_pc_TRUE@am__append_2232 = $(nodist_spkmodem_module_SOURCES) --@COND_i386_pc_TRUE@am__append_2233 = \ -+@COND_i386_pc_TRUE@am__append_2224 = -+@COND_i386_pc_TRUE@am__append_2225 = $(nodist_spkmodem_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_2226 = \ - @COND_i386_pc_TRUE@ $(nodist_spkmodem_module_SOURCES) \ - @COND_i386_pc_TRUE@ spkmodem.marker --@COND_i386_pc_TRUE@am__append_2234 = spkmodem.mod --@COND_i386_pc_TRUE@am__append_2235 = spkmodem.marker --@COND_i386_efi_TRUE@am__append_2236 = spkmodem.module --@COND_i386_efi_TRUE@am__append_2237 = spkmodem.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_2238 = --@COND_i386_efi_TRUE@am__append_2239 = $(nodist_spkmodem_module_SOURCES) --@COND_i386_efi_TRUE@am__append_2240 = \ -+@COND_i386_pc_TRUE@am__append_2227 = spkmodem.mod -+@COND_i386_pc_TRUE@am__append_2228 = spkmodem.marker -+@COND_i386_efi_TRUE@am__append_2229 = spkmodem.module -+@COND_i386_efi_TRUE@am__append_2230 = spkmodem.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_2231 = -+@COND_i386_efi_TRUE@am__append_2232 = $(nodist_spkmodem_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_2233 = \ - @COND_i386_efi_TRUE@ $(nodist_spkmodem_module_SOURCES) \ - @COND_i386_efi_TRUE@ spkmodem.marker --@COND_i386_efi_TRUE@am__append_2241 = spkmodem.mod --@COND_i386_efi_TRUE@am__append_2242 = spkmodem.marker --@COND_i386_qemu_TRUE@am__append_2243 = spkmodem.module --@COND_i386_qemu_TRUE@am__append_2244 = spkmodem.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_2245 = --@COND_i386_qemu_TRUE@am__append_2246 = $(nodist_spkmodem_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_2247 = \ -+@COND_i386_efi_TRUE@am__append_2234 = spkmodem.mod -+@COND_i386_efi_TRUE@am__append_2235 = spkmodem.marker -+@COND_i386_qemu_TRUE@am__append_2236 = spkmodem.module -+@COND_i386_qemu_TRUE@am__append_2237 = spkmodem.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_2238 = -+@COND_i386_qemu_TRUE@am__append_2239 = $(nodist_spkmodem_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_2240 = \ - @COND_i386_qemu_TRUE@ $(nodist_spkmodem_module_SOURCES) \ - @COND_i386_qemu_TRUE@ spkmodem.marker --@COND_i386_qemu_TRUE@am__append_2248 = spkmodem.mod --@COND_i386_qemu_TRUE@am__append_2249 = spkmodem.marker --@COND_i386_coreboot_TRUE@am__append_2250 = spkmodem.module --@COND_i386_coreboot_TRUE@am__append_2251 = spkmodem.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_2252 = --@COND_i386_coreboot_TRUE@am__append_2253 = $(nodist_spkmodem_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_2254 = \ -+@COND_i386_qemu_TRUE@am__append_2241 = spkmodem.mod -+@COND_i386_qemu_TRUE@am__append_2242 = spkmodem.marker -+@COND_i386_coreboot_TRUE@am__append_2243 = spkmodem.module -+@COND_i386_coreboot_TRUE@am__append_2244 = spkmodem.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_2245 = -+@COND_i386_coreboot_TRUE@am__append_2246 = $(nodist_spkmodem_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_2247 = \ - @COND_i386_coreboot_TRUE@ $(nodist_spkmodem_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ spkmodem.marker --@COND_i386_coreboot_TRUE@am__append_2255 = spkmodem.mod --@COND_i386_coreboot_TRUE@am__append_2256 = spkmodem.marker --@COND_i386_multiboot_TRUE@am__append_2257 = spkmodem.module --@COND_i386_multiboot_TRUE@am__append_2258 = spkmodem.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_2259 = --@COND_i386_multiboot_TRUE@am__append_2260 = $(nodist_spkmodem_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_2261 = \ -+@COND_i386_coreboot_TRUE@am__append_2248 = spkmodem.mod -+@COND_i386_coreboot_TRUE@am__append_2249 = spkmodem.marker -+@COND_i386_multiboot_TRUE@am__append_2250 = spkmodem.module -+@COND_i386_multiboot_TRUE@am__append_2251 = spkmodem.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_2252 = -+@COND_i386_multiboot_TRUE@am__append_2253 = $(nodist_spkmodem_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_2254 = \ - @COND_i386_multiboot_TRUE@ $(nodist_spkmodem_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ spkmodem.marker --@COND_i386_multiboot_TRUE@am__append_2262 = spkmodem.mod --@COND_i386_multiboot_TRUE@am__append_2263 = spkmodem.marker --@COND_i386_ieee1275_TRUE@am__append_2264 = spkmodem.module --@COND_i386_ieee1275_TRUE@am__append_2265 = spkmodem.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_2266 = --@COND_i386_ieee1275_TRUE@am__append_2267 = $(nodist_spkmodem_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_2268 = \ -+@COND_i386_multiboot_TRUE@am__append_2255 = spkmodem.mod -+@COND_i386_multiboot_TRUE@am__append_2256 = spkmodem.marker -+@COND_i386_ieee1275_TRUE@am__append_2257 = spkmodem.module -+@COND_i386_ieee1275_TRUE@am__append_2258 = spkmodem.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_2259 = -+@COND_i386_ieee1275_TRUE@am__append_2260 = $(nodist_spkmodem_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_2261 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_spkmodem_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ spkmodem.marker --@COND_i386_ieee1275_TRUE@am__append_2269 = spkmodem.mod --@COND_i386_ieee1275_TRUE@am__append_2270 = spkmodem.marker --@COND_x86_64_efi_TRUE@am__append_2271 = spkmodem.module --@COND_x86_64_efi_TRUE@am__append_2272 = spkmodem.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_2273 = --@COND_x86_64_efi_TRUE@am__append_2274 = $(nodist_spkmodem_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_2275 = \ -+@COND_i386_ieee1275_TRUE@am__append_2262 = spkmodem.mod -+@COND_i386_ieee1275_TRUE@am__append_2263 = spkmodem.marker -+@COND_x86_64_efi_TRUE@am__append_2264 = spkmodem.module -+@COND_x86_64_efi_TRUE@am__append_2265 = spkmodem.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_2266 = -+@COND_x86_64_efi_TRUE@am__append_2267 = $(nodist_spkmodem_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_2268 = \ - @COND_x86_64_efi_TRUE@ $(nodist_spkmodem_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ spkmodem.marker --@COND_x86_64_efi_TRUE@am__append_2276 = spkmodem.mod --@COND_x86_64_efi_TRUE@am__append_2277 = spkmodem.marker --@COND_i386_pc_TRUE@am__append_2278 = morse.module --@COND_i386_pc_TRUE@am__append_2279 = morse.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_2269 = spkmodem.mod -+@COND_x86_64_efi_TRUE@am__append_2270 = spkmodem.marker -+@COND_i386_pc_TRUE@am__append_2271 = morse.module -+@COND_i386_pc_TRUE@am__append_2272 = morse.module$(EXEEXT) - @COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_x86_64_efi_FALSE@morse_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_2280 = --@COND_i386_pc_TRUE@am__append_2281 = $(nodist_morse_module_SOURCES) --@COND_i386_pc_TRUE@am__append_2282 = $(nodist_morse_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_2273 = -+@COND_i386_pc_TRUE@am__append_2274 = $(nodist_morse_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_2275 = $(nodist_morse_module_SOURCES) \ - @COND_i386_pc_TRUE@ morse.marker --@COND_i386_pc_TRUE@am__append_2283 = morse.mod --@COND_i386_pc_TRUE@am__append_2284 = morse.marker --@COND_i386_efi_TRUE@am__append_2285 = morse.module --@COND_i386_efi_TRUE@am__append_2286 = morse.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_2287 = --@COND_i386_efi_TRUE@am__append_2288 = $(nodist_morse_module_SOURCES) --@COND_i386_efi_TRUE@am__append_2289 = $(nodist_morse_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_2276 = morse.mod -+@COND_i386_pc_TRUE@am__append_2277 = morse.marker -+@COND_i386_efi_TRUE@am__append_2278 = morse.module -+@COND_i386_efi_TRUE@am__append_2279 = morse.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_2280 = -+@COND_i386_efi_TRUE@am__append_2281 = $(nodist_morse_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_2282 = $(nodist_morse_module_SOURCES) \ - @COND_i386_efi_TRUE@ morse.marker --@COND_i386_efi_TRUE@am__append_2290 = morse.mod --@COND_i386_efi_TRUE@am__append_2291 = morse.marker --@COND_i386_qemu_TRUE@am__append_2292 = morse.module --@COND_i386_qemu_TRUE@am__append_2293 = morse.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_2294 = --@COND_i386_qemu_TRUE@am__append_2295 = $(nodist_morse_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_2296 = $(nodist_morse_module_SOURCES) \ -+@COND_i386_efi_TRUE@am__append_2283 = morse.mod -+@COND_i386_efi_TRUE@am__append_2284 = morse.marker -+@COND_i386_qemu_TRUE@am__append_2285 = morse.module -+@COND_i386_qemu_TRUE@am__append_2286 = morse.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_2287 = -+@COND_i386_qemu_TRUE@am__append_2288 = $(nodist_morse_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_2289 = $(nodist_morse_module_SOURCES) \ - @COND_i386_qemu_TRUE@ morse.marker --@COND_i386_qemu_TRUE@am__append_2297 = morse.mod --@COND_i386_qemu_TRUE@am__append_2298 = morse.marker --@COND_i386_coreboot_TRUE@am__append_2299 = morse.module --@COND_i386_coreboot_TRUE@am__append_2300 = morse.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_2301 = --@COND_i386_coreboot_TRUE@am__append_2302 = $(nodist_morse_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_2303 = \ -+@COND_i386_qemu_TRUE@am__append_2290 = morse.mod -+@COND_i386_qemu_TRUE@am__append_2291 = morse.marker -+@COND_i386_coreboot_TRUE@am__append_2292 = morse.module -+@COND_i386_coreboot_TRUE@am__append_2293 = morse.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_2294 = -+@COND_i386_coreboot_TRUE@am__append_2295 = $(nodist_morse_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_2296 = \ - @COND_i386_coreboot_TRUE@ $(nodist_morse_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ morse.marker --@COND_i386_coreboot_TRUE@am__append_2304 = morse.mod --@COND_i386_coreboot_TRUE@am__append_2305 = morse.marker --@COND_i386_multiboot_TRUE@am__append_2306 = morse.module --@COND_i386_multiboot_TRUE@am__append_2307 = morse.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_2308 = --@COND_i386_multiboot_TRUE@am__append_2309 = $(nodist_morse_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_2310 = \ -+@COND_i386_coreboot_TRUE@am__append_2297 = morse.mod -+@COND_i386_coreboot_TRUE@am__append_2298 = morse.marker -+@COND_i386_multiboot_TRUE@am__append_2299 = morse.module -+@COND_i386_multiboot_TRUE@am__append_2300 = morse.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_2301 = -+@COND_i386_multiboot_TRUE@am__append_2302 = $(nodist_morse_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_2303 = \ - @COND_i386_multiboot_TRUE@ $(nodist_morse_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ morse.marker --@COND_i386_multiboot_TRUE@am__append_2311 = morse.mod --@COND_i386_multiboot_TRUE@am__append_2312 = morse.marker --@COND_i386_ieee1275_TRUE@am__append_2313 = morse.module --@COND_i386_ieee1275_TRUE@am__append_2314 = morse.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_2315 = --@COND_i386_ieee1275_TRUE@am__append_2316 = $(nodist_morse_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_2317 = \ -+@COND_i386_multiboot_TRUE@am__append_2304 = morse.mod -+@COND_i386_multiboot_TRUE@am__append_2305 = morse.marker -+@COND_i386_ieee1275_TRUE@am__append_2306 = morse.module -+@COND_i386_ieee1275_TRUE@am__append_2307 = morse.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_2308 = -+@COND_i386_ieee1275_TRUE@am__append_2309 = $(nodist_morse_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_2310 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_morse_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ morse.marker --@COND_i386_ieee1275_TRUE@am__append_2318 = morse.mod --@COND_i386_ieee1275_TRUE@am__append_2319 = morse.marker --@COND_x86_64_efi_TRUE@am__append_2320 = morse.module --@COND_x86_64_efi_TRUE@am__append_2321 = morse.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_2322 = --@COND_x86_64_efi_TRUE@am__append_2323 = $(nodist_morse_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_2324 = \ -+@COND_i386_ieee1275_TRUE@am__append_2311 = morse.mod -+@COND_i386_ieee1275_TRUE@am__append_2312 = morse.marker -+@COND_x86_64_efi_TRUE@am__append_2313 = morse.module -+@COND_x86_64_efi_TRUE@am__append_2314 = morse.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_2315 = -+@COND_x86_64_efi_TRUE@am__append_2316 = $(nodist_morse_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_2317 = \ - @COND_x86_64_efi_TRUE@ $(nodist_morse_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ morse.marker --@COND_x86_64_efi_TRUE@am__append_2325 = morse.mod --@COND_x86_64_efi_TRUE@am__append_2326 = morse.marker --@COND_i386_pc_TRUE@am__append_2327 = setpci.module --@COND_i386_pc_TRUE@am__append_2328 = setpci.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_2318 = morse.mod -+@COND_x86_64_efi_TRUE@am__append_2319 = morse.marker -+@COND_i386_pc_TRUE@am__append_2320 = setpci.module -+@COND_i386_pc_TRUE@am__append_2321 = setpci.module$(EXEEXT) - @COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_mips_loongson_FALSE@@COND_x86_64_efi_FALSE@setpci_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_2329 = --@COND_i386_pc_TRUE@am__append_2330 = $(nodist_setpci_module_SOURCES) --@COND_i386_pc_TRUE@am__append_2331 = $(nodist_setpci_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_2322 = -+@COND_i386_pc_TRUE@am__append_2323 = $(nodist_setpci_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_2324 = $(nodist_setpci_module_SOURCES) \ - @COND_i386_pc_TRUE@ setpci.marker --@COND_i386_pc_TRUE@am__append_2332 = setpci.mod --@COND_i386_pc_TRUE@am__append_2333 = setpci.marker --@COND_i386_efi_TRUE@am__append_2334 = setpci.module --@COND_i386_efi_TRUE@am__append_2335 = setpci.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_2336 = --@COND_i386_efi_TRUE@am__append_2337 = $(nodist_setpci_module_SOURCES) --@COND_i386_efi_TRUE@am__append_2338 = $(nodist_setpci_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_2325 = setpci.mod -+@COND_i386_pc_TRUE@am__append_2326 = setpci.marker -+@COND_i386_efi_TRUE@am__append_2327 = setpci.module -+@COND_i386_efi_TRUE@am__append_2328 = setpci.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_2329 = -+@COND_i386_efi_TRUE@am__append_2330 = $(nodist_setpci_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_2331 = $(nodist_setpci_module_SOURCES) \ - @COND_i386_efi_TRUE@ setpci.marker --@COND_i386_efi_TRUE@am__append_2339 = setpci.mod --@COND_i386_efi_TRUE@am__append_2340 = setpci.marker --@COND_i386_qemu_TRUE@am__append_2341 = setpci.module --@COND_i386_qemu_TRUE@am__append_2342 = setpci.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_2343 = --@COND_i386_qemu_TRUE@am__append_2344 = $(nodist_setpci_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_2345 = \ -+@COND_i386_efi_TRUE@am__append_2332 = setpci.mod -+@COND_i386_efi_TRUE@am__append_2333 = setpci.marker -+@COND_i386_qemu_TRUE@am__append_2334 = setpci.module -+@COND_i386_qemu_TRUE@am__append_2335 = setpci.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_2336 = -+@COND_i386_qemu_TRUE@am__append_2337 = $(nodist_setpci_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_2338 = \ - @COND_i386_qemu_TRUE@ $(nodist_setpci_module_SOURCES) \ - @COND_i386_qemu_TRUE@ setpci.marker --@COND_i386_qemu_TRUE@am__append_2346 = setpci.mod --@COND_i386_qemu_TRUE@am__append_2347 = setpci.marker --@COND_i386_coreboot_TRUE@am__append_2348 = setpci.module --@COND_i386_coreboot_TRUE@am__append_2349 = setpci.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_2350 = --@COND_i386_coreboot_TRUE@am__append_2351 = $(nodist_setpci_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_2352 = \ -+@COND_i386_qemu_TRUE@am__append_2339 = setpci.mod -+@COND_i386_qemu_TRUE@am__append_2340 = setpci.marker -+@COND_i386_coreboot_TRUE@am__append_2341 = setpci.module -+@COND_i386_coreboot_TRUE@am__append_2342 = setpci.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_2343 = -+@COND_i386_coreboot_TRUE@am__append_2344 = $(nodist_setpci_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_2345 = \ - @COND_i386_coreboot_TRUE@ $(nodist_setpci_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ setpci.marker --@COND_i386_coreboot_TRUE@am__append_2353 = setpci.mod --@COND_i386_coreboot_TRUE@am__append_2354 = setpci.marker --@COND_i386_multiboot_TRUE@am__append_2355 = setpci.module --@COND_i386_multiboot_TRUE@am__append_2356 = setpci.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_2357 = --@COND_i386_multiboot_TRUE@am__append_2358 = $(nodist_setpci_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_2359 = \ -+@COND_i386_coreboot_TRUE@am__append_2346 = setpci.mod -+@COND_i386_coreboot_TRUE@am__append_2347 = setpci.marker -+@COND_i386_multiboot_TRUE@am__append_2348 = setpci.module -+@COND_i386_multiboot_TRUE@am__append_2349 = setpci.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_2350 = -+@COND_i386_multiboot_TRUE@am__append_2351 = $(nodist_setpci_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_2352 = \ - @COND_i386_multiboot_TRUE@ $(nodist_setpci_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ setpci.marker --@COND_i386_multiboot_TRUE@am__append_2360 = setpci.mod --@COND_i386_multiboot_TRUE@am__append_2361 = setpci.marker --@COND_i386_ieee1275_TRUE@am__append_2362 = setpci.module --@COND_i386_ieee1275_TRUE@am__append_2363 = setpci.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_2364 = --@COND_i386_ieee1275_TRUE@am__append_2365 = $(nodist_setpci_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_2366 = \ -+@COND_i386_multiboot_TRUE@am__append_2353 = setpci.mod -+@COND_i386_multiboot_TRUE@am__append_2354 = setpci.marker -+@COND_i386_ieee1275_TRUE@am__append_2355 = setpci.module -+@COND_i386_ieee1275_TRUE@am__append_2356 = setpci.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_2357 = -+@COND_i386_ieee1275_TRUE@am__append_2358 = $(nodist_setpci_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_2359 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_setpci_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ setpci.marker --@COND_i386_ieee1275_TRUE@am__append_2367 = setpci.mod --@COND_i386_ieee1275_TRUE@am__append_2368 = setpci.marker --@COND_x86_64_efi_TRUE@am__append_2369 = setpci.module --@COND_x86_64_efi_TRUE@am__append_2370 = setpci.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_2371 = --@COND_x86_64_efi_TRUE@am__append_2372 = $(nodist_setpci_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_2373 = \ -+@COND_i386_ieee1275_TRUE@am__append_2360 = setpci.mod -+@COND_i386_ieee1275_TRUE@am__append_2361 = setpci.marker -+@COND_x86_64_efi_TRUE@am__append_2362 = setpci.module -+@COND_x86_64_efi_TRUE@am__append_2363 = setpci.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_2364 = -+@COND_x86_64_efi_TRUE@am__append_2365 = $(nodist_setpci_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_2366 = \ - @COND_x86_64_efi_TRUE@ $(nodist_setpci_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ setpci.marker --@COND_x86_64_efi_TRUE@am__append_2374 = setpci.mod --@COND_x86_64_efi_TRUE@am__append_2375 = setpci.marker --@COND_mips_loongson_TRUE@am__append_2376 = setpci.module --@COND_mips_loongson_TRUE@am__append_2377 = setpci.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__append_2378 = --@COND_mips_loongson_TRUE@am__append_2379 = $(nodist_setpci_module_SOURCES) --@COND_mips_loongson_TRUE@am__append_2380 = \ -+@COND_x86_64_efi_TRUE@am__append_2367 = setpci.mod -+@COND_x86_64_efi_TRUE@am__append_2368 = setpci.marker -+@COND_mips_loongson_TRUE@am__append_2369 = setpci.module -+@COND_mips_loongson_TRUE@am__append_2370 = setpci.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__append_2371 = -+@COND_mips_loongson_TRUE@am__append_2372 = $(nodist_setpci_module_SOURCES) -+@COND_mips_loongson_TRUE@am__append_2373 = \ - @COND_mips_loongson_TRUE@ $(nodist_setpci_module_SOURCES) \ - @COND_mips_loongson_TRUE@ setpci.marker --@COND_mips_loongson_TRUE@am__append_2381 = setpci.mod --@COND_mips_loongson_TRUE@am__append_2382 = setpci.marker --@COND_i386_pc_TRUE@am__append_2383 = pcidump.module --@COND_i386_pc_TRUE@am__append_2384 = pcidump.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__append_2374 = setpci.mod -+@COND_mips_loongson_TRUE@am__append_2375 = setpci.marker -+@COND_i386_pc_TRUE@am__append_2376 = pcidump.module -+@COND_i386_pc_TRUE@am__append_2377 = pcidump.module$(EXEEXT) - @COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_mips_loongson_FALSE@@COND_x86_64_efi_FALSE@pcidump_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_2385 = --@COND_i386_pc_TRUE@am__append_2386 = $(nodist_pcidump_module_SOURCES) --@COND_i386_pc_TRUE@am__append_2387 = $(nodist_pcidump_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_2378 = -+@COND_i386_pc_TRUE@am__append_2379 = $(nodist_pcidump_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_2380 = $(nodist_pcidump_module_SOURCES) \ - @COND_i386_pc_TRUE@ pcidump.marker --@COND_i386_pc_TRUE@am__append_2388 = pcidump.mod --@COND_i386_pc_TRUE@am__append_2389 = pcidump.marker --@COND_i386_efi_TRUE@am__append_2390 = pcidump.module --@COND_i386_efi_TRUE@am__append_2391 = pcidump.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_2392 = --@COND_i386_efi_TRUE@am__append_2393 = $(nodist_pcidump_module_SOURCES) --@COND_i386_efi_TRUE@am__append_2394 = \ -+@COND_i386_pc_TRUE@am__append_2381 = pcidump.mod -+@COND_i386_pc_TRUE@am__append_2382 = pcidump.marker -+@COND_i386_efi_TRUE@am__append_2383 = pcidump.module -+@COND_i386_efi_TRUE@am__append_2384 = pcidump.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_2385 = -+@COND_i386_efi_TRUE@am__append_2386 = $(nodist_pcidump_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_2387 = \ - @COND_i386_efi_TRUE@ $(nodist_pcidump_module_SOURCES) \ - @COND_i386_efi_TRUE@ pcidump.marker --@COND_i386_efi_TRUE@am__append_2395 = pcidump.mod --@COND_i386_efi_TRUE@am__append_2396 = pcidump.marker --@COND_i386_qemu_TRUE@am__append_2397 = pcidump.module --@COND_i386_qemu_TRUE@am__append_2398 = pcidump.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_2399 = --@COND_i386_qemu_TRUE@am__append_2400 = $(nodist_pcidump_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_2401 = \ -+@COND_i386_efi_TRUE@am__append_2388 = pcidump.mod -+@COND_i386_efi_TRUE@am__append_2389 = pcidump.marker -+@COND_i386_qemu_TRUE@am__append_2390 = pcidump.module -+@COND_i386_qemu_TRUE@am__append_2391 = pcidump.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_2392 = -+@COND_i386_qemu_TRUE@am__append_2393 = $(nodist_pcidump_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_2394 = \ - @COND_i386_qemu_TRUE@ $(nodist_pcidump_module_SOURCES) \ - @COND_i386_qemu_TRUE@ pcidump.marker --@COND_i386_qemu_TRUE@am__append_2402 = pcidump.mod --@COND_i386_qemu_TRUE@am__append_2403 = pcidump.marker --@COND_i386_coreboot_TRUE@am__append_2404 = pcidump.module --@COND_i386_coreboot_TRUE@am__append_2405 = pcidump.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_2406 = --@COND_i386_coreboot_TRUE@am__append_2407 = $(nodist_pcidump_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_2408 = \ -+@COND_i386_qemu_TRUE@am__append_2395 = pcidump.mod -+@COND_i386_qemu_TRUE@am__append_2396 = pcidump.marker -+@COND_i386_coreboot_TRUE@am__append_2397 = pcidump.module -+@COND_i386_coreboot_TRUE@am__append_2398 = pcidump.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_2399 = -+@COND_i386_coreboot_TRUE@am__append_2400 = $(nodist_pcidump_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_2401 = \ - @COND_i386_coreboot_TRUE@ $(nodist_pcidump_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ pcidump.marker --@COND_i386_coreboot_TRUE@am__append_2409 = pcidump.mod --@COND_i386_coreboot_TRUE@am__append_2410 = pcidump.marker --@COND_i386_multiboot_TRUE@am__append_2411 = pcidump.module --@COND_i386_multiboot_TRUE@am__append_2412 = pcidump.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_2413 = --@COND_i386_multiboot_TRUE@am__append_2414 = $(nodist_pcidump_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_2415 = \ -+@COND_i386_coreboot_TRUE@am__append_2402 = pcidump.mod -+@COND_i386_coreboot_TRUE@am__append_2403 = pcidump.marker -+@COND_i386_multiboot_TRUE@am__append_2404 = pcidump.module -+@COND_i386_multiboot_TRUE@am__append_2405 = pcidump.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_2406 = -+@COND_i386_multiboot_TRUE@am__append_2407 = $(nodist_pcidump_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_2408 = \ - @COND_i386_multiboot_TRUE@ $(nodist_pcidump_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ pcidump.marker --@COND_i386_multiboot_TRUE@am__append_2416 = pcidump.mod --@COND_i386_multiboot_TRUE@am__append_2417 = pcidump.marker --@COND_i386_ieee1275_TRUE@am__append_2418 = pcidump.module --@COND_i386_ieee1275_TRUE@am__append_2419 = pcidump.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_2420 = --@COND_i386_ieee1275_TRUE@am__append_2421 = $(nodist_pcidump_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_2422 = \ -+@COND_i386_multiboot_TRUE@am__append_2409 = pcidump.mod -+@COND_i386_multiboot_TRUE@am__append_2410 = pcidump.marker -+@COND_i386_ieee1275_TRUE@am__append_2411 = pcidump.module -+@COND_i386_ieee1275_TRUE@am__append_2412 = pcidump.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_2413 = -+@COND_i386_ieee1275_TRUE@am__append_2414 = $(nodist_pcidump_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_2415 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_pcidump_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ pcidump.marker --@COND_i386_ieee1275_TRUE@am__append_2423 = pcidump.mod --@COND_i386_ieee1275_TRUE@am__append_2424 = pcidump.marker --@COND_x86_64_efi_TRUE@am__append_2425 = pcidump.module --@COND_x86_64_efi_TRUE@am__append_2426 = pcidump.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_2427 = --@COND_x86_64_efi_TRUE@am__append_2428 = $(nodist_pcidump_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_2429 = \ -+@COND_i386_ieee1275_TRUE@am__append_2416 = pcidump.mod -+@COND_i386_ieee1275_TRUE@am__append_2417 = pcidump.marker -+@COND_x86_64_efi_TRUE@am__append_2418 = pcidump.module -+@COND_x86_64_efi_TRUE@am__append_2419 = pcidump.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_2420 = -+@COND_x86_64_efi_TRUE@am__append_2421 = $(nodist_pcidump_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_2422 = \ - @COND_x86_64_efi_TRUE@ $(nodist_pcidump_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ pcidump.marker --@COND_x86_64_efi_TRUE@am__append_2430 = pcidump.mod --@COND_x86_64_efi_TRUE@am__append_2431 = pcidump.marker --@COND_mips_loongson_TRUE@am__append_2432 = pcidump.module --@COND_mips_loongson_TRUE@am__append_2433 = pcidump.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__append_2434 = --@COND_mips_loongson_TRUE@am__append_2435 = $(nodist_pcidump_module_SOURCES) --@COND_mips_loongson_TRUE@am__append_2436 = \ -+@COND_x86_64_efi_TRUE@am__append_2423 = pcidump.mod -+@COND_x86_64_efi_TRUE@am__append_2424 = pcidump.marker -+@COND_mips_loongson_TRUE@am__append_2425 = pcidump.module -+@COND_mips_loongson_TRUE@am__append_2426 = pcidump.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__append_2427 = -+@COND_mips_loongson_TRUE@am__append_2428 = $(nodist_pcidump_module_SOURCES) -+@COND_mips_loongson_TRUE@am__append_2429 = \ - @COND_mips_loongson_TRUE@ $(nodist_pcidump_module_SOURCES) \ - @COND_mips_loongson_TRUE@ pcidump.marker --@COND_mips_loongson_TRUE@am__append_2437 = pcidump.mod --@COND_mips_loongson_TRUE@am__append_2438 = pcidump.marker --@COND_i386_ieee1275_TRUE@am__append_2439 = suspend.module --@COND_i386_ieee1275_TRUE@am__append_2440 = suspend.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__append_2430 = pcidump.mod -+@COND_mips_loongson_TRUE@am__append_2431 = pcidump.marker -+@COND_i386_ieee1275_TRUE@am__append_2432 = suspend.module -+@COND_i386_ieee1275_TRUE@am__append_2433 = suspend.module$(EXEEXT) - @COND_i386_ieee1275_FALSE@@COND_powerpc_ieee1275_FALSE@suspend_module_DEPENDENCIES = --@COND_i386_ieee1275_TRUE@am__append_2441 = --@COND_i386_ieee1275_TRUE@am__append_2442 = $(nodist_suspend_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_2443 = \ -+@COND_i386_ieee1275_TRUE@am__append_2434 = -+@COND_i386_ieee1275_TRUE@am__append_2435 = $(nodist_suspend_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_2436 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_suspend_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ suspend.marker --@COND_i386_ieee1275_TRUE@am__append_2444 = suspend.mod --@COND_i386_ieee1275_TRUE@am__append_2445 = suspend.marker --@COND_powerpc_ieee1275_TRUE@am__append_2446 = suspend.module \ -+@COND_i386_ieee1275_TRUE@am__append_2437 = suspend.mod -+@COND_i386_ieee1275_TRUE@am__append_2438 = suspend.marker -+@COND_powerpc_ieee1275_TRUE@am__append_2439 = suspend.module \ - @COND_powerpc_ieee1275_TRUE@ escc.module --@COND_powerpc_ieee1275_TRUE@am__append_2447 = suspend.module$(EXEEXT) \ -+@COND_powerpc_ieee1275_TRUE@am__append_2440 = suspend.module$(EXEEXT) \ - @COND_powerpc_ieee1275_TRUE@ escc.module$(EXEEXT) --@COND_powerpc_ieee1275_TRUE@am__append_2448 = --@COND_powerpc_ieee1275_TRUE@am__append_2449 = \ -+@COND_powerpc_ieee1275_TRUE@am__append_2441 = -+@COND_powerpc_ieee1275_TRUE@am__append_2442 = \ - @COND_powerpc_ieee1275_TRUE@ $(nodist_suspend_module_SOURCES) \ - @COND_powerpc_ieee1275_TRUE@ $(nodist_escc_module_SOURCES) --@COND_powerpc_ieee1275_TRUE@am__append_2450 = \ -+@COND_powerpc_ieee1275_TRUE@am__append_2443 = \ - @COND_powerpc_ieee1275_TRUE@ $(nodist_suspend_module_SOURCES) \ - @COND_powerpc_ieee1275_TRUE@ suspend.marker \ - @COND_powerpc_ieee1275_TRUE@ $(nodist_escc_module_SOURCES) \ - @COND_powerpc_ieee1275_TRUE@ escc.marker --@COND_powerpc_ieee1275_TRUE@am__append_2451 = suspend.mod escc.mod --@COND_powerpc_ieee1275_TRUE@am__append_2452 = suspend.marker \ -+@COND_powerpc_ieee1275_TRUE@am__append_2444 = suspend.mod escc.mod -+@COND_powerpc_ieee1275_TRUE@am__append_2445 = suspend.marker \ - @COND_powerpc_ieee1275_TRUE@ escc.marker - @COND_powerpc_ieee1275_FALSE@escc_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_2453 = usbtest.module --@COND_i386_pc_TRUE@am__append_2454 = usbtest.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__append_2446 = usbtest.module -+@COND_i386_pc_TRUE@am__append_2447 = usbtest.module$(EXEEXT) - @COND_arm_coreboot_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_mips_loongson_FALSE@@COND_x86_64_efi_FALSE@usbtest_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_2455 = --@COND_i386_pc_TRUE@am__append_2456 = $(nodist_usbtest_module_SOURCES) --@COND_i386_pc_TRUE@am__append_2457 = $(nodist_usbtest_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_2448 = -+@COND_i386_pc_TRUE@am__append_2449 = $(nodist_usbtest_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_2450 = $(nodist_usbtest_module_SOURCES) \ - @COND_i386_pc_TRUE@ usbtest.marker --@COND_i386_pc_TRUE@am__append_2458 = usbtest.mod --@COND_i386_pc_TRUE@am__append_2459 = usbtest.marker --@COND_i386_efi_TRUE@am__append_2460 = usbtest.module --@COND_i386_efi_TRUE@am__append_2461 = usbtest.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_2462 = --@COND_i386_efi_TRUE@am__append_2463 = $(nodist_usbtest_module_SOURCES) --@COND_i386_efi_TRUE@am__append_2464 = \ -+@COND_i386_pc_TRUE@am__append_2451 = usbtest.mod -+@COND_i386_pc_TRUE@am__append_2452 = usbtest.marker -+@COND_i386_efi_TRUE@am__append_2453 = usbtest.module -+@COND_i386_efi_TRUE@am__append_2454 = usbtest.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_2455 = -+@COND_i386_efi_TRUE@am__append_2456 = $(nodist_usbtest_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_2457 = \ - @COND_i386_efi_TRUE@ $(nodist_usbtest_module_SOURCES) \ - @COND_i386_efi_TRUE@ usbtest.marker --@COND_i386_efi_TRUE@am__append_2465 = usbtest.mod --@COND_i386_efi_TRUE@am__append_2466 = usbtest.marker --@COND_i386_qemu_TRUE@am__append_2467 = usbtest.module --@COND_i386_qemu_TRUE@am__append_2468 = usbtest.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_2469 = --@COND_i386_qemu_TRUE@am__append_2470 = $(nodist_usbtest_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_2471 = \ -+@COND_i386_efi_TRUE@am__append_2458 = usbtest.mod -+@COND_i386_efi_TRUE@am__append_2459 = usbtest.marker -+@COND_i386_qemu_TRUE@am__append_2460 = usbtest.module -+@COND_i386_qemu_TRUE@am__append_2461 = usbtest.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_2462 = -+@COND_i386_qemu_TRUE@am__append_2463 = $(nodist_usbtest_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_2464 = \ - @COND_i386_qemu_TRUE@ $(nodist_usbtest_module_SOURCES) \ - @COND_i386_qemu_TRUE@ usbtest.marker --@COND_i386_qemu_TRUE@am__append_2472 = usbtest.mod --@COND_i386_qemu_TRUE@am__append_2473 = usbtest.marker --@COND_i386_coreboot_TRUE@am__append_2474 = usbtest.module --@COND_i386_coreboot_TRUE@am__append_2475 = usbtest.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_2476 = --@COND_i386_coreboot_TRUE@am__append_2477 = $(nodist_usbtest_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_2478 = \ -+@COND_i386_qemu_TRUE@am__append_2465 = usbtest.mod -+@COND_i386_qemu_TRUE@am__append_2466 = usbtest.marker -+@COND_i386_coreboot_TRUE@am__append_2467 = usbtest.module -+@COND_i386_coreboot_TRUE@am__append_2468 = usbtest.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_2469 = -+@COND_i386_coreboot_TRUE@am__append_2470 = $(nodist_usbtest_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_2471 = \ - @COND_i386_coreboot_TRUE@ $(nodist_usbtest_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ usbtest.marker --@COND_i386_coreboot_TRUE@am__append_2479 = usbtest.mod --@COND_i386_coreboot_TRUE@am__append_2480 = usbtest.marker --@COND_i386_multiboot_TRUE@am__append_2481 = usbtest.module --@COND_i386_multiboot_TRUE@am__append_2482 = usbtest.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_2483 = --@COND_i386_multiboot_TRUE@am__append_2484 = $(nodist_usbtest_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_2485 = \ -+@COND_i386_coreboot_TRUE@am__append_2472 = usbtest.mod -+@COND_i386_coreboot_TRUE@am__append_2473 = usbtest.marker -+@COND_i386_multiboot_TRUE@am__append_2474 = usbtest.module -+@COND_i386_multiboot_TRUE@am__append_2475 = usbtest.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_2476 = -+@COND_i386_multiboot_TRUE@am__append_2477 = $(nodist_usbtest_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_2478 = \ - @COND_i386_multiboot_TRUE@ $(nodist_usbtest_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ usbtest.marker --@COND_i386_multiboot_TRUE@am__append_2486 = usbtest.mod --@COND_i386_multiboot_TRUE@am__append_2487 = usbtest.marker --@COND_i386_ieee1275_TRUE@am__append_2488 = usbtest.module --@COND_i386_ieee1275_TRUE@am__append_2489 = usbtest.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_2490 = --@COND_i386_ieee1275_TRUE@am__append_2491 = $(nodist_usbtest_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_2492 = \ -+@COND_i386_multiboot_TRUE@am__append_2479 = usbtest.mod -+@COND_i386_multiboot_TRUE@am__append_2480 = usbtest.marker -+@COND_i386_ieee1275_TRUE@am__append_2481 = usbtest.module -+@COND_i386_ieee1275_TRUE@am__append_2482 = usbtest.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_2483 = -+@COND_i386_ieee1275_TRUE@am__append_2484 = $(nodist_usbtest_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_2485 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_usbtest_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ usbtest.marker --@COND_i386_ieee1275_TRUE@am__append_2493 = usbtest.mod --@COND_i386_ieee1275_TRUE@am__append_2494 = usbtest.marker --@COND_x86_64_efi_TRUE@am__append_2495 = usbtest.module --@COND_x86_64_efi_TRUE@am__append_2496 = usbtest.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_2497 = --@COND_x86_64_efi_TRUE@am__append_2498 = $(nodist_usbtest_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_2499 = \ -+@COND_i386_ieee1275_TRUE@am__append_2486 = usbtest.mod -+@COND_i386_ieee1275_TRUE@am__append_2487 = usbtest.marker -+@COND_x86_64_efi_TRUE@am__append_2488 = usbtest.module -+@COND_x86_64_efi_TRUE@am__append_2489 = usbtest.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_2490 = -+@COND_x86_64_efi_TRUE@am__append_2491 = $(nodist_usbtest_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_2492 = \ - @COND_x86_64_efi_TRUE@ $(nodist_usbtest_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ usbtest.marker --@COND_x86_64_efi_TRUE@am__append_2500 = usbtest.mod --@COND_x86_64_efi_TRUE@am__append_2501 = usbtest.marker --@COND_mips_loongson_TRUE@am__append_2502 = usbtest.module --@COND_mips_loongson_TRUE@am__append_2503 = usbtest.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__append_2504 = --@COND_mips_loongson_TRUE@am__append_2505 = $(nodist_usbtest_module_SOURCES) --@COND_mips_loongson_TRUE@am__append_2506 = \ -+@COND_x86_64_efi_TRUE@am__append_2493 = usbtest.mod -+@COND_x86_64_efi_TRUE@am__append_2494 = usbtest.marker -+@COND_mips_loongson_TRUE@am__append_2495 = usbtest.module -+@COND_mips_loongson_TRUE@am__append_2496 = usbtest.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__append_2497 = -+@COND_mips_loongson_TRUE@am__append_2498 = $(nodist_usbtest_module_SOURCES) -+@COND_mips_loongson_TRUE@am__append_2499 = \ - @COND_mips_loongson_TRUE@ $(nodist_usbtest_module_SOURCES) \ - @COND_mips_loongson_TRUE@ usbtest.marker --@COND_mips_loongson_TRUE@am__append_2507 = usbtest.mod --@COND_mips_loongson_TRUE@am__append_2508 = usbtest.marker --@COND_arm_coreboot_TRUE@am__append_2509 = usbtest.module --@COND_arm_coreboot_TRUE@am__append_2510 = usbtest.module$(EXEEXT) --@COND_arm_coreboot_TRUE@am__append_2511 = --@COND_arm_coreboot_TRUE@am__append_2512 = $(nodist_usbtest_module_SOURCES) --@COND_arm_coreboot_TRUE@am__append_2513 = \ -+@COND_mips_loongson_TRUE@am__append_2500 = usbtest.mod -+@COND_mips_loongson_TRUE@am__append_2501 = usbtest.marker -+@COND_arm_coreboot_TRUE@am__append_2502 = usbtest.module -+@COND_arm_coreboot_TRUE@am__append_2503 = usbtest.module$(EXEEXT) -+@COND_arm_coreboot_TRUE@am__append_2504 = -+@COND_arm_coreboot_TRUE@am__append_2505 = $(nodist_usbtest_module_SOURCES) -+@COND_arm_coreboot_TRUE@am__append_2506 = \ - @COND_arm_coreboot_TRUE@ $(nodist_usbtest_module_SOURCES) \ - @COND_arm_coreboot_TRUE@ usbtest.marker --@COND_arm_coreboot_TRUE@am__append_2514 = usbtest.mod --@COND_arm_coreboot_TRUE@am__append_2515 = usbtest.marker --@COND_i386_pc_TRUE@am__append_2516 = ata.module --@COND_i386_pc_TRUE@am__append_2517 = ata.module$(EXEEXT) -+@COND_arm_coreboot_TRUE@am__append_2507 = usbtest.mod -+@COND_arm_coreboot_TRUE@am__append_2508 = usbtest.marker -+@COND_i386_pc_TRUE@am__append_2509 = ata.module -+@COND_i386_pc_TRUE@am__append_2510 = ata.module$(EXEEXT) - @COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_x86_64_efi_FALSE@ata_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_2518 = --@COND_i386_pc_TRUE@am__append_2519 = $(nodist_ata_module_SOURCES) --@COND_i386_pc_TRUE@am__append_2520 = $(nodist_ata_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_2511 = -+@COND_i386_pc_TRUE@am__append_2512 = $(nodist_ata_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_2513 = $(nodist_ata_module_SOURCES) \ - @COND_i386_pc_TRUE@ ata.marker --@COND_i386_pc_TRUE@am__append_2521 = ata.mod --@COND_i386_pc_TRUE@am__append_2522 = ata.marker --@COND_i386_efi_TRUE@am__append_2523 = ata.module --@COND_i386_efi_TRUE@am__append_2524 = ata.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_2525 = --@COND_i386_efi_TRUE@am__append_2526 = $(nodist_ata_module_SOURCES) --@COND_i386_efi_TRUE@am__append_2527 = $(nodist_ata_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_2514 = ata.mod -+@COND_i386_pc_TRUE@am__append_2515 = ata.marker -+@COND_i386_efi_TRUE@am__append_2516 = ata.module -+@COND_i386_efi_TRUE@am__append_2517 = ata.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_2518 = -+@COND_i386_efi_TRUE@am__append_2519 = $(nodist_ata_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_2520 = $(nodist_ata_module_SOURCES) \ - @COND_i386_efi_TRUE@ ata.marker --@COND_i386_efi_TRUE@am__append_2528 = ata.mod --@COND_i386_efi_TRUE@am__append_2529 = ata.marker --@COND_i386_qemu_TRUE@am__append_2530 = ata.module --@COND_i386_qemu_TRUE@am__append_2531 = ata.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_2532 = --@COND_i386_qemu_TRUE@am__append_2533 = $(nodist_ata_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_2534 = $(nodist_ata_module_SOURCES) \ -+@COND_i386_efi_TRUE@am__append_2521 = ata.mod -+@COND_i386_efi_TRUE@am__append_2522 = ata.marker -+@COND_i386_qemu_TRUE@am__append_2523 = ata.module -+@COND_i386_qemu_TRUE@am__append_2524 = ata.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_2525 = -+@COND_i386_qemu_TRUE@am__append_2526 = $(nodist_ata_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_2527 = $(nodist_ata_module_SOURCES) \ - @COND_i386_qemu_TRUE@ ata.marker --@COND_i386_qemu_TRUE@am__append_2535 = ata.mod --@COND_i386_qemu_TRUE@am__append_2536 = ata.marker --@COND_i386_coreboot_TRUE@am__append_2537 = ata.module --@COND_i386_coreboot_TRUE@am__append_2538 = ata.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_2539 = --@COND_i386_coreboot_TRUE@am__append_2540 = $(nodist_ata_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_2541 = \ -+@COND_i386_qemu_TRUE@am__append_2528 = ata.mod -+@COND_i386_qemu_TRUE@am__append_2529 = ata.marker -+@COND_i386_coreboot_TRUE@am__append_2530 = ata.module -+@COND_i386_coreboot_TRUE@am__append_2531 = ata.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_2532 = -+@COND_i386_coreboot_TRUE@am__append_2533 = $(nodist_ata_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_2534 = \ - @COND_i386_coreboot_TRUE@ $(nodist_ata_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ ata.marker --@COND_i386_coreboot_TRUE@am__append_2542 = ata.mod --@COND_i386_coreboot_TRUE@am__append_2543 = ata.marker --@COND_i386_multiboot_TRUE@am__append_2544 = ata.module --@COND_i386_multiboot_TRUE@am__append_2545 = ata.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_2546 = --@COND_i386_multiboot_TRUE@am__append_2547 = $(nodist_ata_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_2548 = \ -+@COND_i386_coreboot_TRUE@am__append_2535 = ata.mod -+@COND_i386_coreboot_TRUE@am__append_2536 = ata.marker -+@COND_i386_multiboot_TRUE@am__append_2537 = ata.module -+@COND_i386_multiboot_TRUE@am__append_2538 = ata.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_2539 = -+@COND_i386_multiboot_TRUE@am__append_2540 = $(nodist_ata_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_2541 = \ - @COND_i386_multiboot_TRUE@ $(nodist_ata_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ ata.marker --@COND_i386_multiboot_TRUE@am__append_2549 = ata.mod --@COND_i386_multiboot_TRUE@am__append_2550 = ata.marker --@COND_i386_ieee1275_TRUE@am__append_2551 = ata.module --@COND_i386_ieee1275_TRUE@am__append_2552 = ata.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_2553 = --@COND_i386_ieee1275_TRUE@am__append_2554 = $(nodist_ata_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_2555 = \ -+@COND_i386_multiboot_TRUE@am__append_2542 = ata.mod -+@COND_i386_multiboot_TRUE@am__append_2543 = ata.marker -+@COND_i386_ieee1275_TRUE@am__append_2544 = ata.module -+@COND_i386_ieee1275_TRUE@am__append_2545 = ata.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_2546 = -+@COND_i386_ieee1275_TRUE@am__append_2547 = $(nodist_ata_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_2548 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_ata_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ ata.marker --@COND_i386_ieee1275_TRUE@am__append_2556 = ata.mod --@COND_i386_ieee1275_TRUE@am__append_2557 = ata.marker --@COND_x86_64_efi_TRUE@am__append_2558 = ata.module --@COND_x86_64_efi_TRUE@am__append_2559 = ata.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_2560 = --@COND_x86_64_efi_TRUE@am__append_2561 = $(nodist_ata_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_2562 = $(nodist_ata_module_SOURCES) \ -+@COND_i386_ieee1275_TRUE@am__append_2549 = ata.mod -+@COND_i386_ieee1275_TRUE@am__append_2550 = ata.marker -+@COND_x86_64_efi_TRUE@am__append_2551 = ata.module -+@COND_x86_64_efi_TRUE@am__append_2552 = ata.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_2553 = -+@COND_x86_64_efi_TRUE@am__append_2554 = $(nodist_ata_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_2555 = $(nodist_ata_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ ata.marker --@COND_x86_64_efi_TRUE@am__append_2563 = ata.mod --@COND_x86_64_efi_TRUE@am__append_2564 = ata.marker --@COND_mips_loongson_TRUE@am__append_2565 = ata.module --@COND_mips_loongson_TRUE@am__append_2566 = ata.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__append_2567 = --@COND_mips_loongson_TRUE@am__append_2568 = $(nodist_ata_module_SOURCES) --@COND_mips_loongson_TRUE@am__append_2569 = \ -+@COND_x86_64_efi_TRUE@am__append_2556 = ata.mod -+@COND_x86_64_efi_TRUE@am__append_2557 = ata.marker -+@COND_mips_loongson_TRUE@am__append_2558 = ata.module -+@COND_mips_loongson_TRUE@am__append_2559 = ata.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__append_2560 = -+@COND_mips_loongson_TRUE@am__append_2561 = $(nodist_ata_module_SOURCES) -+@COND_mips_loongson_TRUE@am__append_2562 = \ - @COND_mips_loongson_TRUE@ $(nodist_ata_module_SOURCES) \ - @COND_mips_loongson_TRUE@ ata.marker --@COND_mips_loongson_TRUE@am__append_2570 = ata.mod --@COND_mips_loongson_TRUE@am__append_2571 = ata.marker --@COND_mips_qemu_mips_TRUE@am__append_2572 = ata.module --@COND_mips_qemu_mips_TRUE@am__append_2573 = ata.module$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__append_2574 = --@COND_mips_qemu_mips_TRUE@am__append_2575 = $(nodist_ata_module_SOURCES) --@COND_mips_qemu_mips_TRUE@am__append_2576 = \ -+@COND_mips_loongson_TRUE@am__append_2563 = ata.mod -+@COND_mips_loongson_TRUE@am__append_2564 = ata.marker -+@COND_mips_qemu_mips_TRUE@am__append_2565 = ata.module -+@COND_mips_qemu_mips_TRUE@am__append_2566 = ata.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__append_2567 = -+@COND_mips_qemu_mips_TRUE@am__append_2568 = $(nodist_ata_module_SOURCES) -+@COND_mips_qemu_mips_TRUE@am__append_2569 = \ - @COND_mips_qemu_mips_TRUE@ $(nodist_ata_module_SOURCES) \ - @COND_mips_qemu_mips_TRUE@ ata.marker --@COND_mips_qemu_mips_TRUE@am__append_2577 = ata.mod --@COND_mips_qemu_mips_TRUE@am__append_2578 = ata.marker --@COND_i386_pc_TRUE@am__append_2579 = ahci.module --@COND_i386_pc_TRUE@am__append_2580 = ahci.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__append_2570 = ata.mod -+@COND_mips_qemu_mips_TRUE@am__append_2571 = ata.marker -+@COND_i386_pc_TRUE@am__append_2572 = ahci.module -+@COND_i386_pc_TRUE@am__append_2573 = ahci.module$(EXEEXT) - @COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_mips_loongson_FALSE@@COND_x86_64_efi_FALSE@ahci_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_2581 = --@COND_i386_pc_TRUE@am__append_2582 = $(nodist_ahci_module_SOURCES) --@COND_i386_pc_TRUE@am__append_2583 = $(nodist_ahci_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_2574 = -+@COND_i386_pc_TRUE@am__append_2575 = $(nodist_ahci_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_2576 = $(nodist_ahci_module_SOURCES) \ - @COND_i386_pc_TRUE@ ahci.marker --@COND_i386_pc_TRUE@am__append_2584 = ahci.mod --@COND_i386_pc_TRUE@am__append_2585 = ahci.marker --@COND_i386_efi_TRUE@am__append_2586 = ahci.module --@COND_i386_efi_TRUE@am__append_2587 = ahci.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_2588 = --@COND_i386_efi_TRUE@am__append_2589 = $(nodist_ahci_module_SOURCES) --@COND_i386_efi_TRUE@am__append_2590 = $(nodist_ahci_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_2577 = ahci.mod -+@COND_i386_pc_TRUE@am__append_2578 = ahci.marker -+@COND_i386_efi_TRUE@am__append_2579 = ahci.module -+@COND_i386_efi_TRUE@am__append_2580 = ahci.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_2581 = -+@COND_i386_efi_TRUE@am__append_2582 = $(nodist_ahci_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_2583 = $(nodist_ahci_module_SOURCES) \ - @COND_i386_efi_TRUE@ ahci.marker --@COND_i386_efi_TRUE@am__append_2591 = ahci.mod --@COND_i386_efi_TRUE@am__append_2592 = ahci.marker --@COND_i386_qemu_TRUE@am__append_2593 = ahci.module --@COND_i386_qemu_TRUE@am__append_2594 = ahci.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_2595 = --@COND_i386_qemu_TRUE@am__append_2596 = $(nodist_ahci_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_2597 = $(nodist_ahci_module_SOURCES) \ -+@COND_i386_efi_TRUE@am__append_2584 = ahci.mod -+@COND_i386_efi_TRUE@am__append_2585 = ahci.marker -+@COND_i386_qemu_TRUE@am__append_2586 = ahci.module -+@COND_i386_qemu_TRUE@am__append_2587 = ahci.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_2588 = -+@COND_i386_qemu_TRUE@am__append_2589 = $(nodist_ahci_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_2590 = $(nodist_ahci_module_SOURCES) \ - @COND_i386_qemu_TRUE@ ahci.marker --@COND_i386_qemu_TRUE@am__append_2598 = ahci.mod --@COND_i386_qemu_TRUE@am__append_2599 = ahci.marker --@COND_i386_coreboot_TRUE@am__append_2600 = ahci.module --@COND_i386_coreboot_TRUE@am__append_2601 = ahci.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_2602 = --@COND_i386_coreboot_TRUE@am__append_2603 = $(nodist_ahci_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_2604 = \ -+@COND_i386_qemu_TRUE@am__append_2591 = ahci.mod -+@COND_i386_qemu_TRUE@am__append_2592 = ahci.marker -+@COND_i386_coreboot_TRUE@am__append_2593 = ahci.module -+@COND_i386_coreboot_TRUE@am__append_2594 = ahci.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_2595 = -+@COND_i386_coreboot_TRUE@am__append_2596 = $(nodist_ahci_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_2597 = \ - @COND_i386_coreboot_TRUE@ $(nodist_ahci_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ ahci.marker --@COND_i386_coreboot_TRUE@am__append_2605 = ahci.mod --@COND_i386_coreboot_TRUE@am__append_2606 = ahci.marker --@COND_i386_multiboot_TRUE@am__append_2607 = ahci.module --@COND_i386_multiboot_TRUE@am__append_2608 = ahci.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_2609 = --@COND_i386_multiboot_TRUE@am__append_2610 = $(nodist_ahci_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_2611 = \ -+@COND_i386_coreboot_TRUE@am__append_2598 = ahci.mod -+@COND_i386_coreboot_TRUE@am__append_2599 = ahci.marker -+@COND_i386_multiboot_TRUE@am__append_2600 = ahci.module -+@COND_i386_multiboot_TRUE@am__append_2601 = ahci.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_2602 = -+@COND_i386_multiboot_TRUE@am__append_2603 = $(nodist_ahci_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_2604 = \ - @COND_i386_multiboot_TRUE@ $(nodist_ahci_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ ahci.marker --@COND_i386_multiboot_TRUE@am__append_2612 = ahci.mod --@COND_i386_multiboot_TRUE@am__append_2613 = ahci.marker --@COND_i386_ieee1275_TRUE@am__append_2614 = ahci.module --@COND_i386_ieee1275_TRUE@am__append_2615 = ahci.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_2616 = --@COND_i386_ieee1275_TRUE@am__append_2617 = $(nodist_ahci_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_2618 = \ -+@COND_i386_multiboot_TRUE@am__append_2605 = ahci.mod -+@COND_i386_multiboot_TRUE@am__append_2606 = ahci.marker -+@COND_i386_ieee1275_TRUE@am__append_2607 = ahci.module -+@COND_i386_ieee1275_TRUE@am__append_2608 = ahci.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_2609 = -+@COND_i386_ieee1275_TRUE@am__append_2610 = $(nodist_ahci_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_2611 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_ahci_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ ahci.marker --@COND_i386_ieee1275_TRUE@am__append_2619 = ahci.mod --@COND_i386_ieee1275_TRUE@am__append_2620 = ahci.marker --@COND_x86_64_efi_TRUE@am__append_2621 = ahci.module --@COND_x86_64_efi_TRUE@am__append_2622 = ahci.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_2623 = --@COND_x86_64_efi_TRUE@am__append_2624 = $(nodist_ahci_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_2625 = $(nodist_ahci_module_SOURCES) \ -+@COND_i386_ieee1275_TRUE@am__append_2612 = ahci.mod -+@COND_i386_ieee1275_TRUE@am__append_2613 = ahci.marker -+@COND_x86_64_efi_TRUE@am__append_2614 = ahci.module -+@COND_x86_64_efi_TRUE@am__append_2615 = ahci.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_2616 = -+@COND_x86_64_efi_TRUE@am__append_2617 = $(nodist_ahci_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_2618 = $(nodist_ahci_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ ahci.marker --@COND_x86_64_efi_TRUE@am__append_2626 = ahci.mod --@COND_x86_64_efi_TRUE@am__append_2627 = ahci.marker --@COND_mips_loongson_TRUE@am__append_2628 = ahci.module --@COND_mips_loongson_TRUE@am__append_2629 = ahci.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__append_2630 = --@COND_mips_loongson_TRUE@am__append_2631 = $(nodist_ahci_module_SOURCES) --@COND_mips_loongson_TRUE@am__append_2632 = \ -+@COND_x86_64_efi_TRUE@am__append_2619 = ahci.mod -+@COND_x86_64_efi_TRUE@am__append_2620 = ahci.marker -+@COND_mips_loongson_TRUE@am__append_2621 = ahci.module -+@COND_mips_loongson_TRUE@am__append_2622 = ahci.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__append_2623 = -+@COND_mips_loongson_TRUE@am__append_2624 = $(nodist_ahci_module_SOURCES) -+@COND_mips_loongson_TRUE@am__append_2625 = \ - @COND_mips_loongson_TRUE@ $(nodist_ahci_module_SOURCES) \ - @COND_mips_loongson_TRUE@ ahci.marker --@COND_mips_loongson_TRUE@am__append_2633 = ahci.mod --@COND_mips_loongson_TRUE@am__append_2634 = ahci.marker --@COND_i386_pc_TRUE@am__append_2635 = pata.module --@COND_i386_pc_TRUE@am__append_2636 = pata.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__append_2626 = ahci.mod -+@COND_mips_loongson_TRUE@am__append_2627 = ahci.marker -+@COND_i386_pc_TRUE@am__append_2628 = pata.module -+@COND_i386_pc_TRUE@am__append_2629 = pata.module$(EXEEXT) - @COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_x86_64_efi_FALSE@pata_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_2637 = --@COND_i386_pc_TRUE@am__append_2638 = $(nodist_pata_module_SOURCES) --@COND_i386_pc_TRUE@am__append_2639 = $(nodist_pata_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_2630 = -+@COND_i386_pc_TRUE@am__append_2631 = $(nodist_pata_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_2632 = $(nodist_pata_module_SOURCES) \ - @COND_i386_pc_TRUE@ pata.marker --@COND_i386_pc_TRUE@am__append_2640 = pata.mod --@COND_i386_pc_TRUE@am__append_2641 = pata.marker --@COND_i386_efi_TRUE@am__append_2642 = pata.module --@COND_i386_efi_TRUE@am__append_2643 = pata.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_2644 = --@COND_i386_efi_TRUE@am__append_2645 = $(nodist_pata_module_SOURCES) --@COND_i386_efi_TRUE@am__append_2646 = $(nodist_pata_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_2633 = pata.mod -+@COND_i386_pc_TRUE@am__append_2634 = pata.marker -+@COND_i386_efi_TRUE@am__append_2635 = pata.module -+@COND_i386_efi_TRUE@am__append_2636 = pata.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_2637 = -+@COND_i386_efi_TRUE@am__append_2638 = $(nodist_pata_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_2639 = $(nodist_pata_module_SOURCES) \ - @COND_i386_efi_TRUE@ pata.marker --@COND_i386_efi_TRUE@am__append_2647 = pata.mod --@COND_i386_efi_TRUE@am__append_2648 = pata.marker --@COND_i386_qemu_TRUE@am__append_2649 = pata.module --@COND_i386_qemu_TRUE@am__append_2650 = pata.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_2651 = --@COND_i386_qemu_TRUE@am__append_2652 = $(nodist_pata_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_2653 = $(nodist_pata_module_SOURCES) \ -+@COND_i386_efi_TRUE@am__append_2640 = pata.mod -+@COND_i386_efi_TRUE@am__append_2641 = pata.marker -+@COND_i386_qemu_TRUE@am__append_2642 = pata.module -+@COND_i386_qemu_TRUE@am__append_2643 = pata.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_2644 = -+@COND_i386_qemu_TRUE@am__append_2645 = $(nodist_pata_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_2646 = $(nodist_pata_module_SOURCES) \ - @COND_i386_qemu_TRUE@ pata.marker --@COND_i386_qemu_TRUE@am__append_2654 = pata.mod --@COND_i386_qemu_TRUE@am__append_2655 = pata.marker --@COND_i386_coreboot_TRUE@am__append_2656 = pata.module --@COND_i386_coreboot_TRUE@am__append_2657 = pata.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_2658 = --@COND_i386_coreboot_TRUE@am__append_2659 = $(nodist_pata_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_2660 = \ -+@COND_i386_qemu_TRUE@am__append_2647 = pata.mod -+@COND_i386_qemu_TRUE@am__append_2648 = pata.marker -+@COND_i386_coreboot_TRUE@am__append_2649 = pata.module -+@COND_i386_coreboot_TRUE@am__append_2650 = pata.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_2651 = -+@COND_i386_coreboot_TRUE@am__append_2652 = $(nodist_pata_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_2653 = \ - @COND_i386_coreboot_TRUE@ $(nodist_pata_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ pata.marker --@COND_i386_coreboot_TRUE@am__append_2661 = pata.mod --@COND_i386_coreboot_TRUE@am__append_2662 = pata.marker --@COND_i386_multiboot_TRUE@am__append_2663 = pata.module --@COND_i386_multiboot_TRUE@am__append_2664 = pata.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_2665 = --@COND_i386_multiboot_TRUE@am__append_2666 = $(nodist_pata_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_2667 = \ -+@COND_i386_coreboot_TRUE@am__append_2654 = pata.mod -+@COND_i386_coreboot_TRUE@am__append_2655 = pata.marker -+@COND_i386_multiboot_TRUE@am__append_2656 = pata.module -+@COND_i386_multiboot_TRUE@am__append_2657 = pata.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_2658 = -+@COND_i386_multiboot_TRUE@am__append_2659 = $(nodist_pata_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_2660 = \ - @COND_i386_multiboot_TRUE@ $(nodist_pata_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ pata.marker --@COND_i386_multiboot_TRUE@am__append_2668 = pata.mod --@COND_i386_multiboot_TRUE@am__append_2669 = pata.marker --@COND_i386_ieee1275_TRUE@am__append_2670 = pata.module --@COND_i386_ieee1275_TRUE@am__append_2671 = pata.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_2672 = --@COND_i386_ieee1275_TRUE@am__append_2673 = $(nodist_pata_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_2674 = \ -+@COND_i386_multiboot_TRUE@am__append_2661 = pata.mod -+@COND_i386_multiboot_TRUE@am__append_2662 = pata.marker -+@COND_i386_ieee1275_TRUE@am__append_2663 = pata.module -+@COND_i386_ieee1275_TRUE@am__append_2664 = pata.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_2665 = -+@COND_i386_ieee1275_TRUE@am__append_2666 = $(nodist_pata_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_2667 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_pata_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ pata.marker --@COND_i386_ieee1275_TRUE@am__append_2675 = pata.mod --@COND_i386_ieee1275_TRUE@am__append_2676 = pata.marker --@COND_x86_64_efi_TRUE@am__append_2677 = pata.module --@COND_x86_64_efi_TRUE@am__append_2678 = pata.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_2679 = --@COND_x86_64_efi_TRUE@am__append_2680 = $(nodist_pata_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_2681 = $(nodist_pata_module_SOURCES) \ -+@COND_i386_ieee1275_TRUE@am__append_2668 = pata.mod -+@COND_i386_ieee1275_TRUE@am__append_2669 = pata.marker -+@COND_x86_64_efi_TRUE@am__append_2670 = pata.module -+@COND_x86_64_efi_TRUE@am__append_2671 = pata.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_2672 = -+@COND_x86_64_efi_TRUE@am__append_2673 = $(nodist_pata_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_2674 = $(nodist_pata_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ pata.marker --@COND_x86_64_efi_TRUE@am__append_2682 = pata.mod --@COND_x86_64_efi_TRUE@am__append_2683 = pata.marker --@COND_mips_loongson_TRUE@am__append_2684 = pata.module --@COND_mips_loongson_TRUE@am__append_2685 = pata.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__append_2686 = --@COND_mips_loongson_TRUE@am__append_2687 = $(nodist_pata_module_SOURCES) --@COND_mips_loongson_TRUE@am__append_2688 = \ -+@COND_x86_64_efi_TRUE@am__append_2675 = pata.mod -+@COND_x86_64_efi_TRUE@am__append_2676 = pata.marker -+@COND_mips_loongson_TRUE@am__append_2677 = pata.module -+@COND_mips_loongson_TRUE@am__append_2678 = pata.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__append_2679 = -+@COND_mips_loongson_TRUE@am__append_2680 = $(nodist_pata_module_SOURCES) -+@COND_mips_loongson_TRUE@am__append_2681 = \ - @COND_mips_loongson_TRUE@ $(nodist_pata_module_SOURCES) \ - @COND_mips_loongson_TRUE@ pata.marker --@COND_mips_loongson_TRUE@am__append_2689 = pata.mod --@COND_mips_loongson_TRUE@am__append_2690 = pata.marker --@COND_mips_qemu_mips_TRUE@am__append_2691 = pata.module --@COND_mips_qemu_mips_TRUE@am__append_2692 = pata.module$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__append_2693 = --@COND_mips_qemu_mips_TRUE@am__append_2694 = $(nodist_pata_module_SOURCES) --@COND_mips_qemu_mips_TRUE@am__append_2695 = \ -+@COND_mips_loongson_TRUE@am__append_2682 = pata.mod -+@COND_mips_loongson_TRUE@am__append_2683 = pata.marker -+@COND_mips_qemu_mips_TRUE@am__append_2684 = pata.module -+@COND_mips_qemu_mips_TRUE@am__append_2685 = pata.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__append_2686 = -+@COND_mips_qemu_mips_TRUE@am__append_2687 = $(nodist_pata_module_SOURCES) -+@COND_mips_qemu_mips_TRUE@am__append_2688 = \ - @COND_mips_qemu_mips_TRUE@ $(nodist_pata_module_SOURCES) \ - @COND_mips_qemu_mips_TRUE@ pata.marker --@COND_mips_qemu_mips_TRUE@am__append_2696 = pata.mod --@COND_mips_qemu_mips_TRUE@am__append_2697 = pata.marker --@COND_i386_pc_TRUE@am__append_2698 = biosdisk.module usbms.module --@COND_i386_pc_TRUE@am__append_2699 = biosdisk.module$(EXEEXT) \ -+@COND_mips_qemu_mips_TRUE@am__append_2689 = pata.mod -+@COND_mips_qemu_mips_TRUE@am__append_2690 = pata.marker -+@COND_i386_pc_TRUE@am__append_2691 = biosdisk.module usbms.module -+@COND_i386_pc_TRUE@am__append_2692 = biosdisk.module$(EXEEXT) \ - @COND_i386_pc_TRUE@ usbms.module$(EXEEXT) - @COND_i386_pc_FALSE@biosdisk_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_2700 = --@COND_i386_pc_TRUE@am__append_2701 = \ -+@COND_i386_pc_TRUE@am__append_2693 = -+@COND_i386_pc_TRUE@am__append_2694 = \ - @COND_i386_pc_TRUE@ $(nodist_biosdisk_module_SOURCES) \ - @COND_i386_pc_TRUE@ $(nodist_usbms_module_SOURCES) --@COND_i386_pc_TRUE@am__append_2702 = \ -+@COND_i386_pc_TRUE@am__append_2695 = \ - @COND_i386_pc_TRUE@ $(nodist_biosdisk_module_SOURCES) \ - @COND_i386_pc_TRUE@ biosdisk.marker \ - @COND_i386_pc_TRUE@ $(nodist_usbms_module_SOURCES) usbms.marker --@COND_i386_pc_TRUE@am__append_2703 = biosdisk.mod usbms.mod --@COND_i386_pc_TRUE@am__append_2704 = biosdisk.marker usbms.marker -+@COND_i386_pc_TRUE@am__append_2696 = biosdisk.mod usbms.mod -+@COND_i386_pc_TRUE@am__append_2697 = biosdisk.marker usbms.marker - @COND_arm_coreboot_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_mips_loongson_FALSE@@COND_x86_64_efi_FALSE@usbms_module_DEPENDENCIES = --@COND_i386_efi_TRUE@am__append_2705 = usbms.module --@COND_i386_efi_TRUE@am__append_2706 = usbms.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_2707 = --@COND_i386_efi_TRUE@am__append_2708 = $(nodist_usbms_module_SOURCES) --@COND_i386_efi_TRUE@am__append_2709 = $(nodist_usbms_module_SOURCES) \ -+@COND_i386_efi_TRUE@am__append_2698 = usbms.module -+@COND_i386_efi_TRUE@am__append_2699 = usbms.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_2700 = -+@COND_i386_efi_TRUE@am__append_2701 = $(nodist_usbms_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_2702 = $(nodist_usbms_module_SOURCES) \ - @COND_i386_efi_TRUE@ usbms.marker --@COND_i386_efi_TRUE@am__append_2710 = usbms.mod --@COND_i386_efi_TRUE@am__append_2711 = usbms.marker --@COND_i386_qemu_TRUE@am__append_2712 = usbms.module --@COND_i386_qemu_TRUE@am__append_2713 = usbms.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_2714 = --@COND_i386_qemu_TRUE@am__append_2715 = $(nodist_usbms_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_2716 = $(nodist_usbms_module_SOURCES) \ -+@COND_i386_efi_TRUE@am__append_2703 = usbms.mod -+@COND_i386_efi_TRUE@am__append_2704 = usbms.marker -+@COND_i386_qemu_TRUE@am__append_2705 = usbms.module -+@COND_i386_qemu_TRUE@am__append_2706 = usbms.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_2707 = -+@COND_i386_qemu_TRUE@am__append_2708 = $(nodist_usbms_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_2709 = $(nodist_usbms_module_SOURCES) \ - @COND_i386_qemu_TRUE@ usbms.marker --@COND_i386_qemu_TRUE@am__append_2717 = usbms.mod --@COND_i386_qemu_TRUE@am__append_2718 = usbms.marker --@COND_i386_coreboot_TRUE@am__append_2719 = usbms.module --@COND_i386_coreboot_TRUE@am__append_2720 = usbms.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_2721 = --@COND_i386_coreboot_TRUE@am__append_2722 = $(nodist_usbms_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_2723 = \ -+@COND_i386_qemu_TRUE@am__append_2710 = usbms.mod -+@COND_i386_qemu_TRUE@am__append_2711 = usbms.marker -+@COND_i386_coreboot_TRUE@am__append_2712 = usbms.module -+@COND_i386_coreboot_TRUE@am__append_2713 = usbms.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_2714 = -+@COND_i386_coreboot_TRUE@am__append_2715 = $(nodist_usbms_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_2716 = \ - @COND_i386_coreboot_TRUE@ $(nodist_usbms_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ usbms.marker --@COND_i386_coreboot_TRUE@am__append_2724 = usbms.mod --@COND_i386_coreboot_TRUE@am__append_2725 = usbms.marker --@COND_i386_multiboot_TRUE@am__append_2726 = usbms.module --@COND_i386_multiboot_TRUE@am__append_2727 = usbms.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_2728 = --@COND_i386_multiboot_TRUE@am__append_2729 = $(nodist_usbms_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_2730 = \ -+@COND_i386_coreboot_TRUE@am__append_2717 = usbms.mod -+@COND_i386_coreboot_TRUE@am__append_2718 = usbms.marker -+@COND_i386_multiboot_TRUE@am__append_2719 = usbms.module -+@COND_i386_multiboot_TRUE@am__append_2720 = usbms.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_2721 = -+@COND_i386_multiboot_TRUE@am__append_2722 = $(nodist_usbms_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_2723 = \ - @COND_i386_multiboot_TRUE@ $(nodist_usbms_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ usbms.marker --@COND_i386_multiboot_TRUE@am__append_2731 = usbms.mod --@COND_i386_multiboot_TRUE@am__append_2732 = usbms.marker --@COND_i386_ieee1275_TRUE@am__append_2733 = usbms.module --@COND_i386_ieee1275_TRUE@am__append_2734 = usbms.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_2735 = --@COND_i386_ieee1275_TRUE@am__append_2736 = $(nodist_usbms_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_2737 = \ -+@COND_i386_multiboot_TRUE@am__append_2724 = usbms.mod -+@COND_i386_multiboot_TRUE@am__append_2725 = usbms.marker -+@COND_i386_ieee1275_TRUE@am__append_2726 = usbms.module -+@COND_i386_ieee1275_TRUE@am__append_2727 = usbms.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_2728 = -+@COND_i386_ieee1275_TRUE@am__append_2729 = $(nodist_usbms_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_2730 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_usbms_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ usbms.marker --@COND_i386_ieee1275_TRUE@am__append_2738 = usbms.mod --@COND_i386_ieee1275_TRUE@am__append_2739 = usbms.marker --@COND_x86_64_efi_TRUE@am__append_2740 = usbms.module --@COND_x86_64_efi_TRUE@am__append_2741 = usbms.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_2742 = --@COND_x86_64_efi_TRUE@am__append_2743 = $(nodist_usbms_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_2744 = \ -+@COND_i386_ieee1275_TRUE@am__append_2731 = usbms.mod -+@COND_i386_ieee1275_TRUE@am__append_2732 = usbms.marker -+@COND_x86_64_efi_TRUE@am__append_2733 = usbms.module -+@COND_x86_64_efi_TRUE@am__append_2734 = usbms.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_2735 = -+@COND_x86_64_efi_TRUE@am__append_2736 = $(nodist_usbms_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_2737 = \ - @COND_x86_64_efi_TRUE@ $(nodist_usbms_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ usbms.marker --@COND_x86_64_efi_TRUE@am__append_2745 = usbms.mod --@COND_x86_64_efi_TRUE@am__append_2746 = usbms.marker --@COND_mips_loongson_TRUE@am__append_2747 = usbms.module --@COND_mips_loongson_TRUE@am__append_2748 = usbms.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__append_2749 = --@COND_mips_loongson_TRUE@am__append_2750 = $(nodist_usbms_module_SOURCES) --@COND_mips_loongson_TRUE@am__append_2751 = \ -+@COND_x86_64_efi_TRUE@am__append_2738 = usbms.mod -+@COND_x86_64_efi_TRUE@am__append_2739 = usbms.marker -+@COND_mips_loongson_TRUE@am__append_2740 = usbms.module -+@COND_mips_loongson_TRUE@am__append_2741 = usbms.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__append_2742 = -+@COND_mips_loongson_TRUE@am__append_2743 = $(nodist_usbms_module_SOURCES) -+@COND_mips_loongson_TRUE@am__append_2744 = \ - @COND_mips_loongson_TRUE@ $(nodist_usbms_module_SOURCES) \ - @COND_mips_loongson_TRUE@ usbms.marker --@COND_mips_loongson_TRUE@am__append_2752 = usbms.mod --@COND_mips_loongson_TRUE@am__append_2753 = usbms.marker --@COND_arm_coreboot_TRUE@am__append_2754 = usbms.module --@COND_arm_coreboot_TRUE@am__append_2755 = usbms.module$(EXEEXT) --@COND_arm_coreboot_TRUE@am__append_2756 = --@COND_arm_coreboot_TRUE@am__append_2757 = $(nodist_usbms_module_SOURCES) --@COND_arm_coreboot_TRUE@am__append_2758 = \ -+@COND_mips_loongson_TRUE@am__append_2745 = usbms.mod -+@COND_mips_loongson_TRUE@am__append_2746 = usbms.marker -+@COND_arm_coreboot_TRUE@am__append_2747 = usbms.module -+@COND_arm_coreboot_TRUE@am__append_2748 = usbms.module$(EXEEXT) -+@COND_arm_coreboot_TRUE@am__append_2749 = -+@COND_arm_coreboot_TRUE@am__append_2750 = $(nodist_usbms_module_SOURCES) -+@COND_arm_coreboot_TRUE@am__append_2751 = \ - @COND_arm_coreboot_TRUE@ $(nodist_usbms_module_SOURCES) \ - @COND_arm_coreboot_TRUE@ usbms.marker --@COND_arm_coreboot_TRUE@am__append_2759 = usbms.mod --@COND_arm_coreboot_TRUE@am__append_2760 = usbms.marker --@COND_i386_ieee1275_TRUE@am__append_2761 = nand.module --@COND_i386_ieee1275_TRUE@am__append_2762 = nand.module$(EXEEXT) -+@COND_arm_coreboot_TRUE@am__append_2752 = usbms.mod -+@COND_arm_coreboot_TRUE@am__append_2753 = usbms.marker -+@COND_i386_ieee1275_TRUE@am__append_2754 = nand.module -+@COND_i386_ieee1275_TRUE@am__append_2755 = nand.module$(EXEEXT) - @COND_i386_ieee1275_FALSE@nand_module_DEPENDENCIES = --@COND_i386_ieee1275_TRUE@am__append_2763 = --@COND_i386_ieee1275_TRUE@am__append_2764 = $(nodist_nand_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_2765 = \ -+@COND_i386_ieee1275_TRUE@am__append_2756 = -+@COND_i386_ieee1275_TRUE@am__append_2757 = $(nodist_nand_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_2758 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_nand_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ nand.marker --@COND_i386_ieee1275_TRUE@am__append_2766 = nand.mod --@COND_i386_ieee1275_TRUE@am__append_2767 = nand.marker --@COND_i386_pc_TRUE@am__append_2768 = efiemu.module --@COND_i386_pc_TRUE@am__append_2769 = efiemu.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_2759 = nand.mod -+@COND_i386_ieee1275_TRUE@am__append_2760 = nand.marker -+@COND_i386_pc_TRUE@am__append_2761 = efiemu.module -+@COND_i386_pc_TRUE@am__append_2762 = efiemu.module$(EXEEXT) - @COND_i386_coreboot_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@efiemu_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_2770 = efiemu/prepare.c efiemu/loadcore.c efiemu/runtime/efiemu.S efiemu/runtime/efiemu.c --@COND_i386_pc_TRUE@am__append_2771 = $(nodist_efiemu_module_SOURCES) --@COND_i386_pc_TRUE@am__append_2772 = $(nodist_efiemu_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_2763 = efiemu/prepare.c efiemu/loadcore.c efiemu/runtime/efiemu.S efiemu/runtime/efiemu.c -+@COND_i386_pc_TRUE@am__append_2764 = $(nodist_efiemu_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_2765 = $(nodist_efiemu_module_SOURCES) \ - @COND_i386_pc_TRUE@ efiemu.marker --@COND_i386_pc_TRUE@am__append_2773 = efiemu.mod --@COND_i386_pc_TRUE@am__append_2774 = efiemu.marker --@COND_i386_qemu_TRUE@am__append_2775 = efiemu.module --@COND_i386_qemu_TRUE@am__append_2776 = efiemu.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_2777 = efiemu/prepare.c efiemu/loadcore.c efiemu/runtime/efiemu.S efiemu/runtime/efiemu.c --@COND_i386_qemu_TRUE@am__append_2778 = $(nodist_efiemu_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_2779 = \ -+@COND_i386_pc_TRUE@am__append_2766 = efiemu.mod -+@COND_i386_pc_TRUE@am__append_2767 = efiemu.marker -+@COND_i386_qemu_TRUE@am__append_2768 = efiemu.module -+@COND_i386_qemu_TRUE@am__append_2769 = efiemu.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_2770 = efiemu/prepare.c efiemu/loadcore.c efiemu/runtime/efiemu.S efiemu/runtime/efiemu.c -+@COND_i386_qemu_TRUE@am__append_2771 = $(nodist_efiemu_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_2772 = \ - @COND_i386_qemu_TRUE@ $(nodist_efiemu_module_SOURCES) \ - @COND_i386_qemu_TRUE@ efiemu.marker --@COND_i386_qemu_TRUE@am__append_2780 = efiemu.mod --@COND_i386_qemu_TRUE@am__append_2781 = efiemu.marker --@COND_i386_coreboot_TRUE@am__append_2782 = efiemu.module --@COND_i386_coreboot_TRUE@am__append_2783 = efiemu.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_2784 = efiemu/prepare.c efiemu/loadcore.c efiemu/runtime/efiemu.S efiemu/runtime/efiemu.c --@COND_i386_coreboot_TRUE@am__append_2785 = $(nodist_efiemu_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_2786 = \ -+@COND_i386_qemu_TRUE@am__append_2773 = efiemu.mod -+@COND_i386_qemu_TRUE@am__append_2774 = efiemu.marker -+@COND_i386_coreboot_TRUE@am__append_2775 = efiemu.module -+@COND_i386_coreboot_TRUE@am__append_2776 = efiemu.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_2777 = efiemu/prepare.c efiemu/loadcore.c efiemu/runtime/efiemu.S efiemu/runtime/efiemu.c -+@COND_i386_coreboot_TRUE@am__append_2778 = $(nodist_efiemu_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_2779 = \ - @COND_i386_coreboot_TRUE@ $(nodist_efiemu_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ efiemu.marker --@COND_i386_coreboot_TRUE@am__append_2787 = efiemu.mod --@COND_i386_coreboot_TRUE@am__append_2788 = efiemu.marker --@COND_i386_multiboot_TRUE@am__append_2789 = efiemu.module --@COND_i386_multiboot_TRUE@am__append_2790 = efiemu.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_2791 = efiemu/prepare.c efiemu/loadcore.c efiemu/runtime/efiemu.S efiemu/runtime/efiemu.c --@COND_i386_multiboot_TRUE@am__append_2792 = $(nodist_efiemu_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_2793 = \ -+@COND_i386_coreboot_TRUE@am__append_2780 = efiemu.mod -+@COND_i386_coreboot_TRUE@am__append_2781 = efiemu.marker -+@COND_i386_multiboot_TRUE@am__append_2782 = efiemu.module -+@COND_i386_multiboot_TRUE@am__append_2783 = efiemu.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_2784 = efiemu/prepare.c efiemu/loadcore.c efiemu/runtime/efiemu.S efiemu/runtime/efiemu.c -+@COND_i386_multiboot_TRUE@am__append_2785 = $(nodist_efiemu_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_2786 = \ - @COND_i386_multiboot_TRUE@ $(nodist_efiemu_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ efiemu.marker --@COND_i386_multiboot_TRUE@am__append_2794 = efiemu.mod --@COND_i386_multiboot_TRUE@am__append_2795 = efiemu.marker --@COND_i386_ieee1275_TRUE@am__append_2796 = efiemu.module --@COND_i386_ieee1275_TRUE@am__append_2797 = efiemu.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_2798 = efiemu/prepare.c efiemu/loadcore.c efiemu/runtime/efiemu.S efiemu/runtime/efiemu.c --@COND_i386_ieee1275_TRUE@am__append_2799 = $(nodist_efiemu_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_2800 = \ -+@COND_i386_multiboot_TRUE@am__append_2787 = efiemu.mod -+@COND_i386_multiboot_TRUE@am__append_2788 = efiemu.marker -+@COND_i386_ieee1275_TRUE@am__append_2789 = efiemu.module -+@COND_i386_ieee1275_TRUE@am__append_2790 = efiemu.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_2791 = efiemu/prepare.c efiemu/loadcore.c efiemu/runtime/efiemu.S efiemu/runtime/efiemu.c -+@COND_i386_ieee1275_TRUE@am__append_2792 = $(nodist_efiemu_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_2793 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_efiemu_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ efiemu.marker --@COND_i386_ieee1275_TRUE@am__append_2801 = efiemu.mod --@COND_i386_ieee1275_TRUE@am__append_2802 = efiemu.marker --@COND_emu_TRUE@am__append_2803 = font.module --@COND_emu_TRUE@am__append_2804 = font.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_2794 = efiemu.mod -+@COND_i386_ieee1275_TRUE@am__append_2795 = efiemu.marker -+@COND_emu_TRUE@am__append_2796 = font.module -+@COND_emu_TRUE@am__append_2797 = font.module$(EXEEXT) - @COND_arm64_efi_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_FALSE@font_module_DEPENDENCIES = --@COND_emu_TRUE@am__append_2805 = --@COND_emu_TRUE@am__append_2806 = $(nodist_font_module_SOURCES) --@COND_emu_TRUE@am__append_2807 = $(nodist_font_module_SOURCES) \ -+@COND_emu_TRUE@am__append_2798 = -+@COND_emu_TRUE@am__append_2799 = $(nodist_font_module_SOURCES) -+@COND_emu_TRUE@am__append_2800 = $(nodist_font_module_SOURCES) \ - @COND_emu_TRUE@ font.marker --@COND_emu_TRUE@am__append_2808 = font.mod --@COND_emu_TRUE@am__append_2809 = font.marker --@COND_i386_pc_TRUE@am__append_2810 = font.module --@COND_i386_pc_TRUE@am__append_2811 = font.module$(EXEEXT) --@COND_i386_pc_TRUE@am__append_2812 = --@COND_i386_pc_TRUE@am__append_2813 = $(nodist_font_module_SOURCES) --@COND_i386_pc_TRUE@am__append_2814 = $(nodist_font_module_SOURCES) \ -+@COND_emu_TRUE@am__append_2801 = font.mod -+@COND_emu_TRUE@am__append_2802 = font.marker -+@COND_i386_pc_TRUE@am__append_2803 = font.module -+@COND_i386_pc_TRUE@am__append_2804 = font.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__append_2805 = -+@COND_i386_pc_TRUE@am__append_2806 = $(nodist_font_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_2807 = $(nodist_font_module_SOURCES) \ - @COND_i386_pc_TRUE@ font.marker --@COND_i386_pc_TRUE@am__append_2815 = font.mod --@COND_i386_pc_TRUE@am__append_2816 = font.marker --@COND_i386_efi_TRUE@am__append_2817 = font.module --@COND_i386_efi_TRUE@am__append_2818 = font.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_2819 = --@COND_i386_efi_TRUE@am__append_2820 = $(nodist_font_module_SOURCES) --@COND_i386_efi_TRUE@am__append_2821 = $(nodist_font_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_2808 = font.mod -+@COND_i386_pc_TRUE@am__append_2809 = font.marker -+@COND_i386_efi_TRUE@am__append_2810 = font.module -+@COND_i386_efi_TRUE@am__append_2811 = font.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_2812 = -+@COND_i386_efi_TRUE@am__append_2813 = $(nodist_font_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_2814 = $(nodist_font_module_SOURCES) \ - @COND_i386_efi_TRUE@ font.marker --@COND_i386_efi_TRUE@am__append_2822 = font.mod --@COND_i386_efi_TRUE@am__append_2823 = font.marker --@COND_i386_qemu_TRUE@am__append_2824 = font.module --@COND_i386_qemu_TRUE@am__append_2825 = font.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_2826 = --@COND_i386_qemu_TRUE@am__append_2827 = $(nodist_font_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_2828 = $(nodist_font_module_SOURCES) \ -+@COND_i386_efi_TRUE@am__append_2815 = font.mod -+@COND_i386_efi_TRUE@am__append_2816 = font.marker -+@COND_i386_qemu_TRUE@am__append_2817 = font.module -+@COND_i386_qemu_TRUE@am__append_2818 = font.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_2819 = -+@COND_i386_qemu_TRUE@am__append_2820 = $(nodist_font_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_2821 = $(nodist_font_module_SOURCES) \ - @COND_i386_qemu_TRUE@ font.marker --@COND_i386_qemu_TRUE@am__append_2829 = font.mod --@COND_i386_qemu_TRUE@am__append_2830 = font.marker --@COND_i386_multiboot_TRUE@am__append_2831 = font.module --@COND_i386_multiboot_TRUE@am__append_2832 = font.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_2833 = --@COND_i386_multiboot_TRUE@am__append_2834 = $(nodist_font_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_2835 = \ -+@COND_i386_qemu_TRUE@am__append_2822 = font.mod -+@COND_i386_qemu_TRUE@am__append_2823 = font.marker -+@COND_i386_multiboot_TRUE@am__append_2824 = font.module -+@COND_i386_multiboot_TRUE@am__append_2825 = font.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_2826 = -+@COND_i386_multiboot_TRUE@am__append_2827 = $(nodist_font_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_2828 = \ - @COND_i386_multiboot_TRUE@ $(nodist_font_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ font.marker --@COND_i386_multiboot_TRUE@am__append_2836 = font.mod --@COND_i386_multiboot_TRUE@am__append_2837 = font.marker --@COND_i386_ieee1275_TRUE@am__append_2838 = font.module --@COND_i386_ieee1275_TRUE@am__append_2839 = font.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_2840 = --@COND_i386_ieee1275_TRUE@am__append_2841 = $(nodist_font_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_2842 = \ -+@COND_i386_multiboot_TRUE@am__append_2829 = font.mod -+@COND_i386_multiboot_TRUE@am__append_2830 = font.marker -+@COND_i386_ieee1275_TRUE@am__append_2831 = font.module -+@COND_i386_ieee1275_TRUE@am__append_2832 = font.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_2833 = -+@COND_i386_ieee1275_TRUE@am__append_2834 = $(nodist_font_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_2835 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_font_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ font.marker --@COND_i386_ieee1275_TRUE@am__append_2843 = font.mod --@COND_i386_ieee1275_TRUE@am__append_2844 = font.marker --@COND_x86_64_efi_TRUE@am__append_2845 = font.module --@COND_x86_64_efi_TRUE@am__append_2846 = font.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_2847 = --@COND_x86_64_efi_TRUE@am__append_2848 = $(nodist_font_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_2849 = $(nodist_font_module_SOURCES) \ -+@COND_i386_ieee1275_TRUE@am__append_2836 = font.mod -+@COND_i386_ieee1275_TRUE@am__append_2837 = font.marker -+@COND_x86_64_efi_TRUE@am__append_2838 = font.module -+@COND_x86_64_efi_TRUE@am__append_2839 = font.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_2840 = -+@COND_x86_64_efi_TRUE@am__append_2841 = $(nodist_font_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_2842 = $(nodist_font_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ font.marker --@COND_x86_64_efi_TRUE@am__append_2850 = font.mod --@COND_x86_64_efi_TRUE@am__append_2851 = font.marker --@COND_i386_xen_TRUE@am__append_2852 = font.module --@COND_i386_xen_TRUE@am__append_2853 = font.module$(EXEEXT) --@COND_i386_xen_TRUE@am__append_2854 = --@COND_i386_xen_TRUE@am__append_2855 = $(nodist_font_module_SOURCES) --@COND_i386_xen_TRUE@am__append_2856 = $(nodist_font_module_SOURCES) \ -+@COND_x86_64_efi_TRUE@am__append_2843 = font.mod -+@COND_x86_64_efi_TRUE@am__append_2844 = font.marker -+@COND_i386_xen_TRUE@am__append_2845 = font.module -+@COND_i386_xen_TRUE@am__append_2846 = font.module$(EXEEXT) -+@COND_i386_xen_TRUE@am__append_2847 = -+@COND_i386_xen_TRUE@am__append_2848 = $(nodist_font_module_SOURCES) -+@COND_i386_xen_TRUE@am__append_2849 = $(nodist_font_module_SOURCES) \ - @COND_i386_xen_TRUE@ font.marker --@COND_i386_xen_TRUE@am__append_2857 = font.mod --@COND_i386_xen_TRUE@am__append_2858 = font.marker --@COND_x86_64_xen_TRUE@am__append_2859 = font.module --@COND_x86_64_xen_TRUE@am__append_2860 = font.module$(EXEEXT) --@COND_x86_64_xen_TRUE@am__append_2861 = --@COND_x86_64_xen_TRUE@am__append_2862 = $(nodist_font_module_SOURCES) --@COND_x86_64_xen_TRUE@am__append_2863 = $(nodist_font_module_SOURCES) \ -+@COND_i386_xen_TRUE@am__append_2850 = font.mod -+@COND_i386_xen_TRUE@am__append_2851 = font.marker -+@COND_x86_64_xen_TRUE@am__append_2852 = font.module -+@COND_x86_64_xen_TRUE@am__append_2853 = font.module$(EXEEXT) -+@COND_x86_64_xen_TRUE@am__append_2854 = -+@COND_x86_64_xen_TRUE@am__append_2855 = $(nodist_font_module_SOURCES) -+@COND_x86_64_xen_TRUE@am__append_2856 = $(nodist_font_module_SOURCES) \ - @COND_x86_64_xen_TRUE@ font.marker --@COND_x86_64_xen_TRUE@am__append_2864 = font.mod --@COND_x86_64_xen_TRUE@am__append_2865 = font.marker --@COND_i386_xen_pvh_TRUE@am__append_2866 = font.module --@COND_i386_xen_pvh_TRUE@am__append_2867 = font.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__append_2868 = --@COND_i386_xen_pvh_TRUE@am__append_2869 = $(nodist_font_module_SOURCES) --@COND_i386_xen_pvh_TRUE@am__append_2870 = \ -+@COND_x86_64_xen_TRUE@am__append_2857 = font.mod -+@COND_x86_64_xen_TRUE@am__append_2858 = font.marker -+@COND_i386_xen_pvh_TRUE@am__append_2859 = font.module -+@COND_i386_xen_pvh_TRUE@am__append_2860 = font.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__append_2861 = -+@COND_i386_xen_pvh_TRUE@am__append_2862 = $(nodist_font_module_SOURCES) -+@COND_i386_xen_pvh_TRUE@am__append_2863 = \ - @COND_i386_xen_pvh_TRUE@ $(nodist_font_module_SOURCES) \ - @COND_i386_xen_pvh_TRUE@ font.marker --@COND_i386_xen_pvh_TRUE@am__append_2871 = font.mod --@COND_i386_xen_pvh_TRUE@am__append_2872 = font.marker --@COND_sparc64_ieee1275_TRUE@am__append_2873 = font.module --@COND_sparc64_ieee1275_TRUE@am__append_2874 = font.module$(EXEEXT) --@COND_sparc64_ieee1275_TRUE@am__append_2875 = --@COND_sparc64_ieee1275_TRUE@am__append_2876 = $(nodist_font_module_SOURCES) --@COND_sparc64_ieee1275_TRUE@am__append_2877 = \ -+@COND_i386_xen_pvh_TRUE@am__append_2864 = font.mod -+@COND_i386_xen_pvh_TRUE@am__append_2865 = font.marker -+@COND_sparc64_ieee1275_TRUE@am__append_2866 = font.module -+@COND_sparc64_ieee1275_TRUE@am__append_2867 = font.module$(EXEEXT) -+@COND_sparc64_ieee1275_TRUE@am__append_2868 = -+@COND_sparc64_ieee1275_TRUE@am__append_2869 = $(nodist_font_module_SOURCES) -+@COND_sparc64_ieee1275_TRUE@am__append_2870 = \ - @COND_sparc64_ieee1275_TRUE@ $(nodist_font_module_SOURCES) \ - @COND_sparc64_ieee1275_TRUE@ font.marker --@COND_sparc64_ieee1275_TRUE@am__append_2878 = font.mod --@COND_sparc64_ieee1275_TRUE@am__append_2879 = font.marker --@COND_powerpc_ieee1275_TRUE@am__append_2880 = font.module --@COND_powerpc_ieee1275_TRUE@am__append_2881 = font.module$(EXEEXT) --@COND_powerpc_ieee1275_TRUE@am__append_2882 = --@COND_powerpc_ieee1275_TRUE@am__append_2883 = $(nodist_font_module_SOURCES) --@COND_powerpc_ieee1275_TRUE@am__append_2884 = \ -+@COND_sparc64_ieee1275_TRUE@am__append_2871 = font.mod -+@COND_sparc64_ieee1275_TRUE@am__append_2872 = font.marker -+@COND_powerpc_ieee1275_TRUE@am__append_2873 = font.module -+@COND_powerpc_ieee1275_TRUE@am__append_2874 = font.module$(EXEEXT) -+@COND_powerpc_ieee1275_TRUE@am__append_2875 = -+@COND_powerpc_ieee1275_TRUE@am__append_2876 = $(nodist_font_module_SOURCES) -+@COND_powerpc_ieee1275_TRUE@am__append_2877 = \ - @COND_powerpc_ieee1275_TRUE@ $(nodist_font_module_SOURCES) \ - @COND_powerpc_ieee1275_TRUE@ font.marker --@COND_powerpc_ieee1275_TRUE@am__append_2885 = font.mod --@COND_powerpc_ieee1275_TRUE@am__append_2886 = font.marker --@COND_mips_arc_TRUE@am__append_2887 = font.module --@COND_mips_arc_TRUE@am__append_2888 = font.module$(EXEEXT) --@COND_mips_arc_TRUE@am__append_2889 = --@COND_mips_arc_TRUE@am__append_2890 = $(nodist_font_module_SOURCES) --@COND_mips_arc_TRUE@am__append_2891 = $(nodist_font_module_SOURCES) \ -+@COND_powerpc_ieee1275_TRUE@am__append_2878 = font.mod -+@COND_powerpc_ieee1275_TRUE@am__append_2879 = font.marker -+@COND_mips_arc_TRUE@am__append_2880 = font.module -+@COND_mips_arc_TRUE@am__append_2881 = font.module$(EXEEXT) -+@COND_mips_arc_TRUE@am__append_2882 = -+@COND_mips_arc_TRUE@am__append_2883 = $(nodist_font_module_SOURCES) -+@COND_mips_arc_TRUE@am__append_2884 = $(nodist_font_module_SOURCES) \ - @COND_mips_arc_TRUE@ font.marker --@COND_mips_arc_TRUE@am__append_2892 = font.mod --@COND_mips_arc_TRUE@am__append_2893 = font.marker --@COND_ia64_efi_TRUE@am__append_2894 = font.module --@COND_ia64_efi_TRUE@am__append_2895 = font.module$(EXEEXT) --@COND_ia64_efi_TRUE@am__append_2896 = --@COND_ia64_efi_TRUE@am__append_2897 = $(nodist_font_module_SOURCES) --@COND_ia64_efi_TRUE@am__append_2898 = $(nodist_font_module_SOURCES) \ -+@COND_mips_arc_TRUE@am__append_2885 = font.mod -+@COND_mips_arc_TRUE@am__append_2886 = font.marker -+@COND_ia64_efi_TRUE@am__append_2887 = font.module -+@COND_ia64_efi_TRUE@am__append_2888 = font.module$(EXEEXT) -+@COND_ia64_efi_TRUE@am__append_2889 = -+@COND_ia64_efi_TRUE@am__append_2890 = $(nodist_font_module_SOURCES) -+@COND_ia64_efi_TRUE@am__append_2891 = $(nodist_font_module_SOURCES) \ - @COND_ia64_efi_TRUE@ font.marker --@COND_ia64_efi_TRUE@am__append_2899 = font.mod --@COND_ia64_efi_TRUE@am__append_2900 = font.marker --@COND_mips_qemu_mips_TRUE@am__append_2901 = font.module --@COND_mips_qemu_mips_TRUE@am__append_2902 = font.module$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__append_2903 = --@COND_mips_qemu_mips_TRUE@am__append_2904 = $(nodist_font_module_SOURCES) --@COND_mips_qemu_mips_TRUE@am__append_2905 = \ -+@COND_ia64_efi_TRUE@am__append_2892 = font.mod -+@COND_ia64_efi_TRUE@am__append_2893 = font.marker -+@COND_mips_qemu_mips_TRUE@am__append_2894 = font.module -+@COND_mips_qemu_mips_TRUE@am__append_2895 = font.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__append_2896 = -+@COND_mips_qemu_mips_TRUE@am__append_2897 = $(nodist_font_module_SOURCES) -+@COND_mips_qemu_mips_TRUE@am__append_2898 = \ - @COND_mips_qemu_mips_TRUE@ $(nodist_font_module_SOURCES) \ - @COND_mips_qemu_mips_TRUE@ font.marker --@COND_mips_qemu_mips_TRUE@am__append_2906 = font.mod --@COND_mips_qemu_mips_TRUE@am__append_2907 = font.marker --@COND_arm_uboot_TRUE@am__append_2908 = font.module --@COND_arm_uboot_TRUE@am__append_2909 = font.module$(EXEEXT) --@COND_arm_uboot_TRUE@am__append_2910 = --@COND_arm_uboot_TRUE@am__append_2911 = $(nodist_font_module_SOURCES) --@COND_arm_uboot_TRUE@am__append_2912 = $(nodist_font_module_SOURCES) \ -+@COND_mips_qemu_mips_TRUE@am__append_2899 = font.mod -+@COND_mips_qemu_mips_TRUE@am__append_2900 = font.marker -+@COND_arm_uboot_TRUE@am__append_2901 = font.module -+@COND_arm_uboot_TRUE@am__append_2902 = font.module$(EXEEXT) -+@COND_arm_uboot_TRUE@am__append_2903 = -+@COND_arm_uboot_TRUE@am__append_2904 = $(nodist_font_module_SOURCES) -+@COND_arm_uboot_TRUE@am__append_2905 = $(nodist_font_module_SOURCES) \ - @COND_arm_uboot_TRUE@ font.marker --@COND_arm_uboot_TRUE@am__append_2913 = font.mod --@COND_arm_uboot_TRUE@am__append_2914 = font.marker --@COND_arm_efi_TRUE@am__append_2915 = font.module --@COND_arm_efi_TRUE@am__append_2916 = font.module$(EXEEXT) --@COND_arm_efi_TRUE@am__append_2917 = --@COND_arm_efi_TRUE@am__append_2918 = $(nodist_font_module_SOURCES) --@COND_arm_efi_TRUE@am__append_2919 = $(nodist_font_module_SOURCES) \ -+@COND_arm_uboot_TRUE@am__append_2906 = font.mod -+@COND_arm_uboot_TRUE@am__append_2907 = font.marker -+@COND_arm_efi_TRUE@am__append_2908 = font.module -+@COND_arm_efi_TRUE@am__append_2909 = font.module$(EXEEXT) -+@COND_arm_efi_TRUE@am__append_2910 = -+@COND_arm_efi_TRUE@am__append_2911 = $(nodist_font_module_SOURCES) -+@COND_arm_efi_TRUE@am__append_2912 = $(nodist_font_module_SOURCES) \ - @COND_arm_efi_TRUE@ font.marker --@COND_arm_efi_TRUE@am__append_2920 = font.mod --@COND_arm_efi_TRUE@am__append_2921 = font.marker --@COND_arm64_efi_TRUE@am__append_2922 = font.module --@COND_arm64_efi_TRUE@am__append_2923 = font.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__append_2924 = --@COND_arm64_efi_TRUE@am__append_2925 = $(nodist_font_module_SOURCES) --@COND_arm64_efi_TRUE@am__append_2926 = $(nodist_font_module_SOURCES) \ -+@COND_arm_efi_TRUE@am__append_2913 = font.mod -+@COND_arm_efi_TRUE@am__append_2914 = font.marker -+@COND_arm64_efi_TRUE@am__append_2915 = font.module -+@COND_arm64_efi_TRUE@am__append_2916 = font.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__append_2917 = -+@COND_arm64_efi_TRUE@am__append_2918 = $(nodist_font_module_SOURCES) -+@COND_arm64_efi_TRUE@am__append_2919 = $(nodist_font_module_SOURCES) \ - @COND_arm64_efi_TRUE@ font.marker --@COND_arm64_efi_TRUE@am__append_2927 = font.mod --@COND_arm64_efi_TRUE@am__append_2928 = font.marker --@COND_riscv32_efi_TRUE@am__append_2929 = font.module --@COND_riscv32_efi_TRUE@am__append_2930 = font.module$(EXEEXT) --@COND_riscv32_efi_TRUE@am__append_2931 = --@COND_riscv32_efi_TRUE@am__append_2932 = $(nodist_font_module_SOURCES) --@COND_riscv32_efi_TRUE@am__append_2933 = \ -+@COND_arm64_efi_TRUE@am__append_2920 = font.mod -+@COND_arm64_efi_TRUE@am__append_2921 = font.marker -+@COND_riscv32_efi_TRUE@am__append_2922 = font.module -+@COND_riscv32_efi_TRUE@am__append_2923 = font.module$(EXEEXT) -+@COND_riscv32_efi_TRUE@am__append_2924 = -+@COND_riscv32_efi_TRUE@am__append_2925 = $(nodist_font_module_SOURCES) -+@COND_riscv32_efi_TRUE@am__append_2926 = \ - @COND_riscv32_efi_TRUE@ $(nodist_font_module_SOURCES) \ - @COND_riscv32_efi_TRUE@ font.marker --@COND_riscv32_efi_TRUE@am__append_2934 = font.mod --@COND_riscv32_efi_TRUE@am__append_2935 = font.marker --@COND_riscv64_efi_TRUE@am__append_2936 = font.module --@COND_riscv64_efi_TRUE@am__append_2937 = font.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__append_2938 = --@COND_riscv64_efi_TRUE@am__append_2939 = $(nodist_font_module_SOURCES) --@COND_riscv64_efi_TRUE@am__append_2940 = \ -+@COND_riscv32_efi_TRUE@am__append_2927 = font.mod -+@COND_riscv32_efi_TRUE@am__append_2928 = font.marker -+@COND_riscv64_efi_TRUE@am__append_2929 = font.module -+@COND_riscv64_efi_TRUE@am__append_2930 = font.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__append_2931 = -+@COND_riscv64_efi_TRUE@am__append_2932 = $(nodist_font_module_SOURCES) -+@COND_riscv64_efi_TRUE@am__append_2933 = \ - @COND_riscv64_efi_TRUE@ $(nodist_font_module_SOURCES) \ - @COND_riscv64_efi_TRUE@ font.marker --@COND_riscv64_efi_TRUE@am__append_2941 = font.mod --@COND_riscv64_efi_TRUE@am__append_2942 = font.marker --@COND_i386_pc_TRUE@am__append_2943 = pxe.module --@COND_i386_pc_TRUE@am__append_2944 = pxe.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__append_2934 = font.mod -+@COND_riscv64_efi_TRUE@am__append_2935 = font.marker -+@COND_i386_pc_TRUE@am__append_2936 = pxe.module -+@COND_i386_pc_TRUE@am__append_2937 = pxe.module$(EXEEXT) - @COND_i386_pc_FALSE@pxe_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_2945 = --@COND_i386_pc_TRUE@am__append_2946 = $(nodist_pxe_module_SOURCES) --@COND_i386_pc_TRUE@am__append_2947 = $(nodist_pxe_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_2938 = -+@COND_i386_pc_TRUE@am__append_2939 = $(nodist_pxe_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_2940 = $(nodist_pxe_module_SOURCES) \ - @COND_i386_pc_TRUE@ pxe.marker --@COND_i386_pc_TRUE@am__append_2948 = pxe.mod --@COND_i386_pc_TRUE@am__append_2949 = pxe.marker --@COND_emu_TRUE@am__append_2950 = bufio.module --@COND_emu_TRUE@am__append_2951 = bufio.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__append_2941 = pxe.mod -+@COND_i386_pc_TRUE@am__append_2942 = pxe.marker -+@COND_emu_TRUE@am__append_2943 = bufio.module -+@COND_emu_TRUE@am__append_2944 = bufio.module$(EXEEXT) - @COND_arm64_efi_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_FALSE@bufio_module_DEPENDENCIES = --@COND_emu_TRUE@am__append_2952 = --@COND_emu_TRUE@am__append_2953 = $(nodist_bufio_module_SOURCES) --@COND_emu_TRUE@am__append_2954 = $(nodist_bufio_module_SOURCES) \ -+@COND_emu_TRUE@am__append_2945 = -+@COND_emu_TRUE@am__append_2946 = $(nodist_bufio_module_SOURCES) -+@COND_emu_TRUE@am__append_2947 = $(nodist_bufio_module_SOURCES) \ - @COND_emu_TRUE@ bufio.marker --@COND_emu_TRUE@am__append_2955 = bufio.mod --@COND_emu_TRUE@am__append_2956 = bufio.marker --@COND_i386_pc_TRUE@am__append_2957 = bufio.module --@COND_i386_pc_TRUE@am__append_2958 = bufio.module$(EXEEXT) --@COND_i386_pc_TRUE@am__append_2959 = --@COND_i386_pc_TRUE@am__append_2960 = $(nodist_bufio_module_SOURCES) --@COND_i386_pc_TRUE@am__append_2961 = $(nodist_bufio_module_SOURCES) \ -+@COND_emu_TRUE@am__append_2948 = bufio.mod -+@COND_emu_TRUE@am__append_2949 = bufio.marker -+@COND_i386_pc_TRUE@am__append_2950 = bufio.module -+@COND_i386_pc_TRUE@am__append_2951 = bufio.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__append_2952 = -+@COND_i386_pc_TRUE@am__append_2953 = $(nodist_bufio_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_2954 = $(nodist_bufio_module_SOURCES) \ - @COND_i386_pc_TRUE@ bufio.marker --@COND_i386_pc_TRUE@am__append_2962 = bufio.mod --@COND_i386_pc_TRUE@am__append_2963 = bufio.marker --@COND_i386_efi_TRUE@am__append_2964 = bufio.module --@COND_i386_efi_TRUE@am__append_2965 = bufio.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_2966 = --@COND_i386_efi_TRUE@am__append_2967 = $(nodist_bufio_module_SOURCES) --@COND_i386_efi_TRUE@am__append_2968 = $(nodist_bufio_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_2955 = bufio.mod -+@COND_i386_pc_TRUE@am__append_2956 = bufio.marker -+@COND_i386_efi_TRUE@am__append_2957 = bufio.module -+@COND_i386_efi_TRUE@am__append_2958 = bufio.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_2959 = -+@COND_i386_efi_TRUE@am__append_2960 = $(nodist_bufio_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_2961 = $(nodist_bufio_module_SOURCES) \ - @COND_i386_efi_TRUE@ bufio.marker --@COND_i386_efi_TRUE@am__append_2969 = bufio.mod --@COND_i386_efi_TRUE@am__append_2970 = bufio.marker --@COND_i386_qemu_TRUE@am__append_2971 = bufio.module --@COND_i386_qemu_TRUE@am__append_2972 = bufio.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_2973 = --@COND_i386_qemu_TRUE@am__append_2974 = $(nodist_bufio_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_2975 = $(nodist_bufio_module_SOURCES) \ -+@COND_i386_efi_TRUE@am__append_2962 = bufio.mod -+@COND_i386_efi_TRUE@am__append_2963 = bufio.marker -+@COND_i386_qemu_TRUE@am__append_2964 = bufio.module -+@COND_i386_qemu_TRUE@am__append_2965 = bufio.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_2966 = -+@COND_i386_qemu_TRUE@am__append_2967 = $(nodist_bufio_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_2968 = $(nodist_bufio_module_SOURCES) \ - @COND_i386_qemu_TRUE@ bufio.marker --@COND_i386_qemu_TRUE@am__append_2976 = bufio.mod --@COND_i386_qemu_TRUE@am__append_2977 = bufio.marker --@COND_i386_multiboot_TRUE@am__append_2978 = bufio.module --@COND_i386_multiboot_TRUE@am__append_2979 = bufio.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_2980 = --@COND_i386_multiboot_TRUE@am__append_2981 = $(nodist_bufio_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_2982 = \ -+@COND_i386_qemu_TRUE@am__append_2969 = bufio.mod -+@COND_i386_qemu_TRUE@am__append_2970 = bufio.marker -+@COND_i386_multiboot_TRUE@am__append_2971 = bufio.module -+@COND_i386_multiboot_TRUE@am__append_2972 = bufio.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_2973 = -+@COND_i386_multiboot_TRUE@am__append_2974 = $(nodist_bufio_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_2975 = \ - @COND_i386_multiboot_TRUE@ $(nodist_bufio_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ bufio.marker --@COND_i386_multiboot_TRUE@am__append_2983 = bufio.mod --@COND_i386_multiboot_TRUE@am__append_2984 = bufio.marker --@COND_i386_ieee1275_TRUE@am__append_2985 = bufio.module --@COND_i386_ieee1275_TRUE@am__append_2986 = bufio.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_2987 = --@COND_i386_ieee1275_TRUE@am__append_2988 = $(nodist_bufio_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_2989 = \ -+@COND_i386_multiboot_TRUE@am__append_2976 = bufio.mod -+@COND_i386_multiboot_TRUE@am__append_2977 = bufio.marker -+@COND_i386_ieee1275_TRUE@am__append_2978 = bufio.module -+@COND_i386_ieee1275_TRUE@am__append_2979 = bufio.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_2980 = -+@COND_i386_ieee1275_TRUE@am__append_2981 = $(nodist_bufio_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_2982 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_bufio_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ bufio.marker --@COND_i386_ieee1275_TRUE@am__append_2990 = bufio.mod --@COND_i386_ieee1275_TRUE@am__append_2991 = bufio.marker --@COND_x86_64_efi_TRUE@am__append_2992 = bufio.module --@COND_x86_64_efi_TRUE@am__append_2993 = bufio.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_2994 = --@COND_x86_64_efi_TRUE@am__append_2995 = $(nodist_bufio_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_2996 = \ -+@COND_i386_ieee1275_TRUE@am__append_2983 = bufio.mod -+@COND_i386_ieee1275_TRUE@am__append_2984 = bufio.marker -+@COND_x86_64_efi_TRUE@am__append_2985 = bufio.module -+@COND_x86_64_efi_TRUE@am__append_2986 = bufio.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_2987 = -+@COND_x86_64_efi_TRUE@am__append_2988 = $(nodist_bufio_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_2989 = \ - @COND_x86_64_efi_TRUE@ $(nodist_bufio_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ bufio.marker --@COND_x86_64_efi_TRUE@am__append_2997 = bufio.mod --@COND_x86_64_efi_TRUE@am__append_2998 = bufio.marker --@COND_i386_xen_TRUE@am__append_2999 = bufio.module --@COND_i386_xen_TRUE@am__append_3000 = bufio.module$(EXEEXT) --@COND_i386_xen_TRUE@am__append_3001 = --@COND_i386_xen_TRUE@am__append_3002 = $(nodist_bufio_module_SOURCES) --@COND_i386_xen_TRUE@am__append_3003 = $(nodist_bufio_module_SOURCES) \ -+@COND_x86_64_efi_TRUE@am__append_2990 = bufio.mod -+@COND_x86_64_efi_TRUE@am__append_2991 = bufio.marker -+@COND_i386_xen_TRUE@am__append_2992 = bufio.module -+@COND_i386_xen_TRUE@am__append_2993 = bufio.module$(EXEEXT) -+@COND_i386_xen_TRUE@am__append_2994 = -+@COND_i386_xen_TRUE@am__append_2995 = $(nodist_bufio_module_SOURCES) -+@COND_i386_xen_TRUE@am__append_2996 = $(nodist_bufio_module_SOURCES) \ - @COND_i386_xen_TRUE@ bufio.marker --@COND_i386_xen_TRUE@am__append_3004 = bufio.mod --@COND_i386_xen_TRUE@am__append_3005 = bufio.marker --@COND_x86_64_xen_TRUE@am__append_3006 = bufio.module --@COND_x86_64_xen_TRUE@am__append_3007 = bufio.module$(EXEEXT) --@COND_x86_64_xen_TRUE@am__append_3008 = --@COND_x86_64_xen_TRUE@am__append_3009 = $(nodist_bufio_module_SOURCES) --@COND_x86_64_xen_TRUE@am__append_3010 = \ -+@COND_i386_xen_TRUE@am__append_2997 = bufio.mod -+@COND_i386_xen_TRUE@am__append_2998 = bufio.marker -+@COND_x86_64_xen_TRUE@am__append_2999 = bufio.module -+@COND_x86_64_xen_TRUE@am__append_3000 = bufio.module$(EXEEXT) -+@COND_x86_64_xen_TRUE@am__append_3001 = -+@COND_x86_64_xen_TRUE@am__append_3002 = $(nodist_bufio_module_SOURCES) -+@COND_x86_64_xen_TRUE@am__append_3003 = \ - @COND_x86_64_xen_TRUE@ $(nodist_bufio_module_SOURCES) \ - @COND_x86_64_xen_TRUE@ bufio.marker --@COND_x86_64_xen_TRUE@am__append_3011 = bufio.mod --@COND_x86_64_xen_TRUE@am__append_3012 = bufio.marker --@COND_i386_xen_pvh_TRUE@am__append_3013 = bufio.module --@COND_i386_xen_pvh_TRUE@am__append_3014 = bufio.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__append_3015 = --@COND_i386_xen_pvh_TRUE@am__append_3016 = $(nodist_bufio_module_SOURCES) --@COND_i386_xen_pvh_TRUE@am__append_3017 = \ -+@COND_x86_64_xen_TRUE@am__append_3004 = bufio.mod -+@COND_x86_64_xen_TRUE@am__append_3005 = bufio.marker -+@COND_i386_xen_pvh_TRUE@am__append_3006 = bufio.module -+@COND_i386_xen_pvh_TRUE@am__append_3007 = bufio.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__append_3008 = -+@COND_i386_xen_pvh_TRUE@am__append_3009 = $(nodist_bufio_module_SOURCES) -+@COND_i386_xen_pvh_TRUE@am__append_3010 = \ - @COND_i386_xen_pvh_TRUE@ $(nodist_bufio_module_SOURCES) \ - @COND_i386_xen_pvh_TRUE@ bufio.marker --@COND_i386_xen_pvh_TRUE@am__append_3018 = bufio.mod --@COND_i386_xen_pvh_TRUE@am__append_3019 = bufio.marker --@COND_sparc64_ieee1275_TRUE@am__append_3020 = bufio.module --@COND_sparc64_ieee1275_TRUE@am__append_3021 = bufio.module$(EXEEXT) --@COND_sparc64_ieee1275_TRUE@am__append_3022 = --@COND_sparc64_ieee1275_TRUE@am__append_3023 = $(nodist_bufio_module_SOURCES) --@COND_sparc64_ieee1275_TRUE@am__append_3024 = \ -+@COND_i386_xen_pvh_TRUE@am__append_3011 = bufio.mod -+@COND_i386_xen_pvh_TRUE@am__append_3012 = bufio.marker -+@COND_sparc64_ieee1275_TRUE@am__append_3013 = bufio.module -+@COND_sparc64_ieee1275_TRUE@am__append_3014 = bufio.module$(EXEEXT) -+@COND_sparc64_ieee1275_TRUE@am__append_3015 = -+@COND_sparc64_ieee1275_TRUE@am__append_3016 = $(nodist_bufio_module_SOURCES) -+@COND_sparc64_ieee1275_TRUE@am__append_3017 = \ - @COND_sparc64_ieee1275_TRUE@ $(nodist_bufio_module_SOURCES) \ - @COND_sparc64_ieee1275_TRUE@ bufio.marker --@COND_sparc64_ieee1275_TRUE@am__append_3025 = bufio.mod --@COND_sparc64_ieee1275_TRUE@am__append_3026 = bufio.marker --@COND_powerpc_ieee1275_TRUE@am__append_3027 = bufio.module --@COND_powerpc_ieee1275_TRUE@am__append_3028 = bufio.module$(EXEEXT) --@COND_powerpc_ieee1275_TRUE@am__append_3029 = --@COND_powerpc_ieee1275_TRUE@am__append_3030 = $(nodist_bufio_module_SOURCES) --@COND_powerpc_ieee1275_TRUE@am__append_3031 = \ -+@COND_sparc64_ieee1275_TRUE@am__append_3018 = bufio.mod -+@COND_sparc64_ieee1275_TRUE@am__append_3019 = bufio.marker -+@COND_powerpc_ieee1275_TRUE@am__append_3020 = bufio.module -+@COND_powerpc_ieee1275_TRUE@am__append_3021 = bufio.module$(EXEEXT) -+@COND_powerpc_ieee1275_TRUE@am__append_3022 = -+@COND_powerpc_ieee1275_TRUE@am__append_3023 = $(nodist_bufio_module_SOURCES) -+@COND_powerpc_ieee1275_TRUE@am__append_3024 = \ - @COND_powerpc_ieee1275_TRUE@ $(nodist_bufio_module_SOURCES) \ - @COND_powerpc_ieee1275_TRUE@ bufio.marker --@COND_powerpc_ieee1275_TRUE@am__append_3032 = bufio.mod --@COND_powerpc_ieee1275_TRUE@am__append_3033 = bufio.marker --@COND_mips_arc_TRUE@am__append_3034 = bufio.module --@COND_mips_arc_TRUE@am__append_3035 = bufio.module$(EXEEXT) --@COND_mips_arc_TRUE@am__append_3036 = --@COND_mips_arc_TRUE@am__append_3037 = $(nodist_bufio_module_SOURCES) --@COND_mips_arc_TRUE@am__append_3038 = $(nodist_bufio_module_SOURCES) \ -+@COND_powerpc_ieee1275_TRUE@am__append_3025 = bufio.mod -+@COND_powerpc_ieee1275_TRUE@am__append_3026 = bufio.marker -+@COND_mips_arc_TRUE@am__append_3027 = bufio.module -+@COND_mips_arc_TRUE@am__append_3028 = bufio.module$(EXEEXT) -+@COND_mips_arc_TRUE@am__append_3029 = -+@COND_mips_arc_TRUE@am__append_3030 = $(nodist_bufio_module_SOURCES) -+@COND_mips_arc_TRUE@am__append_3031 = $(nodist_bufio_module_SOURCES) \ - @COND_mips_arc_TRUE@ bufio.marker --@COND_mips_arc_TRUE@am__append_3039 = bufio.mod --@COND_mips_arc_TRUE@am__append_3040 = bufio.marker --@COND_ia64_efi_TRUE@am__append_3041 = bufio.module --@COND_ia64_efi_TRUE@am__append_3042 = bufio.module$(EXEEXT) --@COND_ia64_efi_TRUE@am__append_3043 = --@COND_ia64_efi_TRUE@am__append_3044 = $(nodist_bufio_module_SOURCES) --@COND_ia64_efi_TRUE@am__append_3045 = $(nodist_bufio_module_SOURCES) \ -+@COND_mips_arc_TRUE@am__append_3032 = bufio.mod -+@COND_mips_arc_TRUE@am__append_3033 = bufio.marker -+@COND_ia64_efi_TRUE@am__append_3034 = bufio.module -+@COND_ia64_efi_TRUE@am__append_3035 = bufio.module$(EXEEXT) -+@COND_ia64_efi_TRUE@am__append_3036 = -+@COND_ia64_efi_TRUE@am__append_3037 = $(nodist_bufio_module_SOURCES) -+@COND_ia64_efi_TRUE@am__append_3038 = $(nodist_bufio_module_SOURCES) \ - @COND_ia64_efi_TRUE@ bufio.marker --@COND_ia64_efi_TRUE@am__append_3046 = bufio.mod --@COND_ia64_efi_TRUE@am__append_3047 = bufio.marker --@COND_mips_qemu_mips_TRUE@am__append_3048 = bufio.module --@COND_mips_qemu_mips_TRUE@am__append_3049 = bufio.module$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__append_3050 = --@COND_mips_qemu_mips_TRUE@am__append_3051 = $(nodist_bufio_module_SOURCES) --@COND_mips_qemu_mips_TRUE@am__append_3052 = \ -+@COND_ia64_efi_TRUE@am__append_3039 = bufio.mod -+@COND_ia64_efi_TRUE@am__append_3040 = bufio.marker -+@COND_mips_qemu_mips_TRUE@am__append_3041 = bufio.module -+@COND_mips_qemu_mips_TRUE@am__append_3042 = bufio.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__append_3043 = -+@COND_mips_qemu_mips_TRUE@am__append_3044 = $(nodist_bufio_module_SOURCES) -+@COND_mips_qemu_mips_TRUE@am__append_3045 = \ - @COND_mips_qemu_mips_TRUE@ $(nodist_bufio_module_SOURCES) \ - @COND_mips_qemu_mips_TRUE@ bufio.marker --@COND_mips_qemu_mips_TRUE@am__append_3053 = bufio.mod --@COND_mips_qemu_mips_TRUE@am__append_3054 = bufio.marker --@COND_arm_uboot_TRUE@am__append_3055 = bufio.module --@COND_arm_uboot_TRUE@am__append_3056 = bufio.module$(EXEEXT) --@COND_arm_uboot_TRUE@am__append_3057 = --@COND_arm_uboot_TRUE@am__append_3058 = $(nodist_bufio_module_SOURCES) --@COND_arm_uboot_TRUE@am__append_3059 = $(nodist_bufio_module_SOURCES) \ -+@COND_mips_qemu_mips_TRUE@am__append_3046 = bufio.mod -+@COND_mips_qemu_mips_TRUE@am__append_3047 = bufio.marker -+@COND_arm_uboot_TRUE@am__append_3048 = bufio.module -+@COND_arm_uboot_TRUE@am__append_3049 = bufio.module$(EXEEXT) -+@COND_arm_uboot_TRUE@am__append_3050 = -+@COND_arm_uboot_TRUE@am__append_3051 = $(nodist_bufio_module_SOURCES) -+@COND_arm_uboot_TRUE@am__append_3052 = $(nodist_bufio_module_SOURCES) \ - @COND_arm_uboot_TRUE@ bufio.marker --@COND_arm_uboot_TRUE@am__append_3060 = bufio.mod --@COND_arm_uboot_TRUE@am__append_3061 = bufio.marker --@COND_arm_efi_TRUE@am__append_3062 = bufio.module --@COND_arm_efi_TRUE@am__append_3063 = bufio.module$(EXEEXT) --@COND_arm_efi_TRUE@am__append_3064 = --@COND_arm_efi_TRUE@am__append_3065 = $(nodist_bufio_module_SOURCES) --@COND_arm_efi_TRUE@am__append_3066 = $(nodist_bufio_module_SOURCES) \ -+@COND_arm_uboot_TRUE@am__append_3053 = bufio.mod -+@COND_arm_uboot_TRUE@am__append_3054 = bufio.marker -+@COND_arm_efi_TRUE@am__append_3055 = bufio.module -+@COND_arm_efi_TRUE@am__append_3056 = bufio.module$(EXEEXT) -+@COND_arm_efi_TRUE@am__append_3057 = -+@COND_arm_efi_TRUE@am__append_3058 = $(nodist_bufio_module_SOURCES) -+@COND_arm_efi_TRUE@am__append_3059 = $(nodist_bufio_module_SOURCES) \ - @COND_arm_efi_TRUE@ bufio.marker --@COND_arm_efi_TRUE@am__append_3067 = bufio.mod --@COND_arm_efi_TRUE@am__append_3068 = bufio.marker --@COND_arm64_efi_TRUE@am__append_3069 = bufio.module --@COND_arm64_efi_TRUE@am__append_3070 = bufio.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__append_3071 = --@COND_arm64_efi_TRUE@am__append_3072 = $(nodist_bufio_module_SOURCES) --@COND_arm64_efi_TRUE@am__append_3073 = $(nodist_bufio_module_SOURCES) \ -+@COND_arm_efi_TRUE@am__append_3060 = bufio.mod -+@COND_arm_efi_TRUE@am__append_3061 = bufio.marker -+@COND_arm64_efi_TRUE@am__append_3062 = bufio.module -+@COND_arm64_efi_TRUE@am__append_3063 = bufio.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__append_3064 = -+@COND_arm64_efi_TRUE@am__append_3065 = $(nodist_bufio_module_SOURCES) -+@COND_arm64_efi_TRUE@am__append_3066 = $(nodist_bufio_module_SOURCES) \ - @COND_arm64_efi_TRUE@ bufio.marker --@COND_arm64_efi_TRUE@am__append_3074 = bufio.mod --@COND_arm64_efi_TRUE@am__append_3075 = bufio.marker --@COND_riscv32_efi_TRUE@am__append_3076 = bufio.module --@COND_riscv32_efi_TRUE@am__append_3077 = bufio.module$(EXEEXT) --@COND_riscv32_efi_TRUE@am__append_3078 = --@COND_riscv32_efi_TRUE@am__append_3079 = $(nodist_bufio_module_SOURCES) --@COND_riscv32_efi_TRUE@am__append_3080 = \ -+@COND_arm64_efi_TRUE@am__append_3067 = bufio.mod -+@COND_arm64_efi_TRUE@am__append_3068 = bufio.marker -+@COND_riscv32_efi_TRUE@am__append_3069 = bufio.module -+@COND_riscv32_efi_TRUE@am__append_3070 = bufio.module$(EXEEXT) -+@COND_riscv32_efi_TRUE@am__append_3071 = -+@COND_riscv32_efi_TRUE@am__append_3072 = $(nodist_bufio_module_SOURCES) -+@COND_riscv32_efi_TRUE@am__append_3073 = \ - @COND_riscv32_efi_TRUE@ $(nodist_bufio_module_SOURCES) \ - @COND_riscv32_efi_TRUE@ bufio.marker --@COND_riscv32_efi_TRUE@am__append_3081 = bufio.mod --@COND_riscv32_efi_TRUE@am__append_3082 = bufio.marker --@COND_riscv64_efi_TRUE@am__append_3083 = bufio.module --@COND_riscv64_efi_TRUE@am__append_3084 = bufio.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__append_3085 = --@COND_riscv64_efi_TRUE@am__append_3086 = $(nodist_bufio_module_SOURCES) --@COND_riscv64_efi_TRUE@am__append_3087 = \ -+@COND_riscv32_efi_TRUE@am__append_3074 = bufio.mod -+@COND_riscv32_efi_TRUE@am__append_3075 = bufio.marker -+@COND_riscv64_efi_TRUE@am__append_3076 = bufio.module -+@COND_riscv64_efi_TRUE@am__append_3077 = bufio.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__append_3078 = -+@COND_riscv64_efi_TRUE@am__append_3079 = $(nodist_bufio_module_SOURCES) -+@COND_riscv64_efi_TRUE@am__append_3080 = \ - @COND_riscv64_efi_TRUE@ $(nodist_bufio_module_SOURCES) \ - @COND_riscv64_efi_TRUE@ bufio.marker --@COND_riscv64_efi_TRUE@am__append_3088 = bufio.mod --@COND_riscv64_efi_TRUE@am__append_3089 = bufio.marker --@COND_i386_pc_TRUE@am__append_3090 = relocator.module --@COND_i386_pc_TRUE@am__append_3091 = relocator.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__append_3081 = bufio.mod -+@COND_riscv64_efi_TRUE@am__append_3082 = bufio.marker -+@COND_i386_pc_TRUE@am__append_3083 = relocator.module -+@COND_i386_pc_TRUE@am__append_3084 = relocator.module$(EXEEXT) - @COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_FALSE@relocator_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_3092 = lib/i386/relocator_common.S kern/powerpc/cache_flush.S --@COND_i386_pc_TRUE@am__append_3093 = $(nodist_relocator_module_SOURCES) --@COND_i386_pc_TRUE@am__append_3094 = \ -+@COND_i386_pc_TRUE@am__append_3085 = lib/i386/relocator_common.S kern/powerpc/cache_flush.S -+@COND_i386_pc_TRUE@am__append_3086 = $(nodist_relocator_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_3087 = \ - @COND_i386_pc_TRUE@ $(nodist_relocator_module_SOURCES) \ - @COND_i386_pc_TRUE@ relocator.marker --@COND_i386_pc_TRUE@am__append_3095 = relocator.mod --@COND_i386_pc_TRUE@am__append_3096 = relocator.marker --@COND_i386_efi_TRUE@am__append_3097 = relocator.module --@COND_i386_efi_TRUE@am__append_3098 = relocator.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_3099 = lib/i386/relocator_common.S kern/powerpc/cache_flush.S --@COND_i386_efi_TRUE@am__append_3100 = $(nodist_relocator_module_SOURCES) --@COND_i386_efi_TRUE@am__append_3101 = \ -+@COND_i386_pc_TRUE@am__append_3088 = relocator.mod -+@COND_i386_pc_TRUE@am__append_3089 = relocator.marker -+@COND_i386_efi_TRUE@am__append_3090 = relocator.module -+@COND_i386_efi_TRUE@am__append_3091 = relocator.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_3092 = lib/i386/relocator_common.S kern/powerpc/cache_flush.S -+@COND_i386_efi_TRUE@am__append_3093 = $(nodist_relocator_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_3094 = \ - @COND_i386_efi_TRUE@ $(nodist_relocator_module_SOURCES) \ - @COND_i386_efi_TRUE@ relocator.marker --@COND_i386_efi_TRUE@am__append_3102 = relocator.mod --@COND_i386_efi_TRUE@am__append_3103 = relocator.marker --@COND_i386_qemu_TRUE@am__append_3104 = relocator.module --@COND_i386_qemu_TRUE@am__append_3105 = relocator.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_3106 = lib/i386/relocator_common.S kern/powerpc/cache_flush.S --@COND_i386_qemu_TRUE@am__append_3107 = $(nodist_relocator_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_3108 = \ -+@COND_i386_efi_TRUE@am__append_3095 = relocator.mod -+@COND_i386_efi_TRUE@am__append_3096 = relocator.marker -+@COND_i386_qemu_TRUE@am__append_3097 = relocator.module -+@COND_i386_qemu_TRUE@am__append_3098 = relocator.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_3099 = lib/i386/relocator_common.S kern/powerpc/cache_flush.S -+@COND_i386_qemu_TRUE@am__append_3100 = $(nodist_relocator_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_3101 = \ - @COND_i386_qemu_TRUE@ $(nodist_relocator_module_SOURCES) \ - @COND_i386_qemu_TRUE@ relocator.marker --@COND_i386_qemu_TRUE@am__append_3109 = relocator.mod --@COND_i386_qemu_TRUE@am__append_3110 = relocator.marker --@COND_i386_coreboot_TRUE@am__append_3111 = relocator.module --@COND_i386_coreboot_TRUE@am__append_3112 = relocator.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_3113 = lib/i386/relocator_common.S kern/powerpc/cache_flush.S --@COND_i386_coreboot_TRUE@am__append_3114 = $(nodist_relocator_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_3115 = \ -+@COND_i386_qemu_TRUE@am__append_3102 = relocator.mod -+@COND_i386_qemu_TRUE@am__append_3103 = relocator.marker -+@COND_i386_coreboot_TRUE@am__append_3104 = relocator.module -+@COND_i386_coreboot_TRUE@am__append_3105 = relocator.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_3106 = lib/i386/relocator_common.S kern/powerpc/cache_flush.S -+@COND_i386_coreboot_TRUE@am__append_3107 = $(nodist_relocator_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_3108 = \ - @COND_i386_coreboot_TRUE@ $(nodist_relocator_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ relocator.marker --@COND_i386_coreboot_TRUE@am__append_3116 = relocator.mod --@COND_i386_coreboot_TRUE@am__append_3117 = relocator.marker --@COND_i386_multiboot_TRUE@am__append_3118 = relocator.module --@COND_i386_multiboot_TRUE@am__append_3119 = relocator.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_3120 = lib/i386/relocator_common.S kern/powerpc/cache_flush.S --@COND_i386_multiboot_TRUE@am__append_3121 = $(nodist_relocator_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_3122 = \ -+@COND_i386_coreboot_TRUE@am__append_3109 = relocator.mod -+@COND_i386_coreboot_TRUE@am__append_3110 = relocator.marker -+@COND_i386_multiboot_TRUE@am__append_3111 = relocator.module -+@COND_i386_multiboot_TRUE@am__append_3112 = relocator.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_3113 = lib/i386/relocator_common.S kern/powerpc/cache_flush.S -+@COND_i386_multiboot_TRUE@am__append_3114 = $(nodist_relocator_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_3115 = \ - @COND_i386_multiboot_TRUE@ $(nodist_relocator_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ relocator.marker --@COND_i386_multiboot_TRUE@am__append_3123 = relocator.mod --@COND_i386_multiboot_TRUE@am__append_3124 = relocator.marker --@COND_i386_ieee1275_TRUE@am__append_3125 = relocator.module --@COND_i386_ieee1275_TRUE@am__append_3126 = relocator.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_3127 = lib/i386/relocator_common.S kern/powerpc/cache_flush.S --@COND_i386_ieee1275_TRUE@am__append_3128 = $(nodist_relocator_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_3129 = \ -+@COND_i386_multiboot_TRUE@am__append_3116 = relocator.mod -+@COND_i386_multiboot_TRUE@am__append_3117 = relocator.marker -+@COND_i386_ieee1275_TRUE@am__append_3118 = relocator.module -+@COND_i386_ieee1275_TRUE@am__append_3119 = relocator.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_3120 = lib/i386/relocator_common.S kern/powerpc/cache_flush.S -+@COND_i386_ieee1275_TRUE@am__append_3121 = $(nodist_relocator_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_3122 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_relocator_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ relocator.marker --@COND_i386_ieee1275_TRUE@am__append_3130 = relocator.mod --@COND_i386_ieee1275_TRUE@am__append_3131 = relocator.marker --@COND_x86_64_efi_TRUE@am__append_3132 = relocator.module --@COND_x86_64_efi_TRUE@am__append_3133 = relocator.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_3134 = lib/i386/relocator_common.S kern/powerpc/cache_flush.S --@COND_x86_64_efi_TRUE@am__append_3135 = $(nodist_relocator_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_3136 = \ -+@COND_i386_ieee1275_TRUE@am__append_3123 = relocator.mod -+@COND_i386_ieee1275_TRUE@am__append_3124 = relocator.marker -+@COND_x86_64_efi_TRUE@am__append_3125 = relocator.module -+@COND_x86_64_efi_TRUE@am__append_3126 = relocator.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_3127 = lib/i386/relocator_common.S kern/powerpc/cache_flush.S -+@COND_x86_64_efi_TRUE@am__append_3128 = $(nodist_relocator_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_3129 = \ - @COND_x86_64_efi_TRUE@ $(nodist_relocator_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ relocator.marker --@COND_x86_64_efi_TRUE@am__append_3137 = relocator.mod --@COND_x86_64_efi_TRUE@am__append_3138 = relocator.marker --@COND_i386_xen_TRUE@am__append_3139 = relocator.module --@COND_i386_xen_TRUE@am__append_3140 = relocator.module$(EXEEXT) --@COND_i386_xen_TRUE@am__append_3141 = lib/i386/relocator_common.S kern/powerpc/cache_flush.S --@COND_i386_xen_TRUE@am__append_3142 = $(nodist_relocator_module_SOURCES) --@COND_i386_xen_TRUE@am__append_3143 = \ -+@COND_x86_64_efi_TRUE@am__append_3130 = relocator.mod -+@COND_x86_64_efi_TRUE@am__append_3131 = relocator.marker -+@COND_i386_xen_TRUE@am__append_3132 = relocator.module -+@COND_i386_xen_TRUE@am__append_3133 = relocator.module$(EXEEXT) -+@COND_i386_xen_TRUE@am__append_3134 = lib/i386/relocator_common.S kern/powerpc/cache_flush.S -+@COND_i386_xen_TRUE@am__append_3135 = $(nodist_relocator_module_SOURCES) -+@COND_i386_xen_TRUE@am__append_3136 = \ - @COND_i386_xen_TRUE@ $(nodist_relocator_module_SOURCES) \ - @COND_i386_xen_TRUE@ relocator.marker --@COND_i386_xen_TRUE@am__append_3144 = relocator.mod --@COND_i386_xen_TRUE@am__append_3145 = relocator.marker --@COND_x86_64_xen_TRUE@am__append_3146 = relocator.module --@COND_x86_64_xen_TRUE@am__append_3147 = relocator.module$(EXEEXT) --@COND_x86_64_xen_TRUE@am__append_3148 = lib/i386/relocator_common.S kern/powerpc/cache_flush.S --@COND_x86_64_xen_TRUE@am__append_3149 = $(nodist_relocator_module_SOURCES) --@COND_x86_64_xen_TRUE@am__append_3150 = \ -+@COND_i386_xen_TRUE@am__append_3137 = relocator.mod -+@COND_i386_xen_TRUE@am__append_3138 = relocator.marker -+@COND_x86_64_xen_TRUE@am__append_3139 = relocator.module -+@COND_x86_64_xen_TRUE@am__append_3140 = relocator.module$(EXEEXT) -+@COND_x86_64_xen_TRUE@am__append_3141 = lib/i386/relocator_common.S kern/powerpc/cache_flush.S -+@COND_x86_64_xen_TRUE@am__append_3142 = $(nodist_relocator_module_SOURCES) -+@COND_x86_64_xen_TRUE@am__append_3143 = \ - @COND_x86_64_xen_TRUE@ $(nodist_relocator_module_SOURCES) \ - @COND_x86_64_xen_TRUE@ relocator.marker --@COND_x86_64_xen_TRUE@am__append_3151 = relocator.mod --@COND_x86_64_xen_TRUE@am__append_3152 = relocator.marker --@COND_i386_xen_pvh_TRUE@am__append_3153 = relocator.module --@COND_i386_xen_pvh_TRUE@am__append_3154 = relocator.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__append_3155 = lib/i386/relocator_common.S kern/powerpc/cache_flush.S --@COND_i386_xen_pvh_TRUE@am__append_3156 = $(nodist_relocator_module_SOURCES) --@COND_i386_xen_pvh_TRUE@am__append_3157 = \ -+@COND_x86_64_xen_TRUE@am__append_3144 = relocator.mod -+@COND_x86_64_xen_TRUE@am__append_3145 = relocator.marker -+@COND_i386_xen_pvh_TRUE@am__append_3146 = relocator.module -+@COND_i386_xen_pvh_TRUE@am__append_3147 = relocator.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__append_3148 = lib/i386/relocator_common.S kern/powerpc/cache_flush.S -+@COND_i386_xen_pvh_TRUE@am__append_3149 = $(nodist_relocator_module_SOURCES) -+@COND_i386_xen_pvh_TRUE@am__append_3150 = \ - @COND_i386_xen_pvh_TRUE@ $(nodist_relocator_module_SOURCES) \ - @COND_i386_xen_pvh_TRUE@ relocator.marker --@COND_i386_xen_pvh_TRUE@am__append_3158 = relocator.mod --@COND_i386_xen_pvh_TRUE@am__append_3159 = relocator.marker --@COND_mips_loongson_TRUE@am__append_3160 = relocator.module --@COND_mips_loongson_TRUE@am__append_3161 = relocator.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__append_3162 = lib/i386/relocator_common.S kern/powerpc/cache_flush.S --@COND_mips_loongson_TRUE@am__append_3163 = $(nodist_relocator_module_SOURCES) --@COND_mips_loongson_TRUE@am__append_3164 = \ -+@COND_i386_xen_pvh_TRUE@am__append_3151 = relocator.mod -+@COND_i386_xen_pvh_TRUE@am__append_3152 = relocator.marker -+@COND_mips_loongson_TRUE@am__append_3153 = relocator.module -+@COND_mips_loongson_TRUE@am__append_3154 = relocator.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__append_3155 = lib/i386/relocator_common.S kern/powerpc/cache_flush.S -+@COND_mips_loongson_TRUE@am__append_3156 = $(nodist_relocator_module_SOURCES) -+@COND_mips_loongson_TRUE@am__append_3157 = \ - @COND_mips_loongson_TRUE@ $(nodist_relocator_module_SOURCES) \ - @COND_mips_loongson_TRUE@ relocator.marker --@COND_mips_loongson_TRUE@am__append_3165 = relocator.mod --@COND_mips_loongson_TRUE@am__append_3166 = relocator.marker --@COND_powerpc_ieee1275_TRUE@am__append_3167 = relocator.module --@COND_powerpc_ieee1275_TRUE@am__append_3168 = relocator.module$(EXEEXT) --@COND_powerpc_ieee1275_TRUE@am__append_3169 = lib/i386/relocator_common.S kern/powerpc/cache_flush.S --@COND_powerpc_ieee1275_TRUE@am__append_3170 = $(nodist_relocator_module_SOURCES) --@COND_powerpc_ieee1275_TRUE@am__append_3171 = $(nodist_relocator_module_SOURCES) \ -+@COND_mips_loongson_TRUE@am__append_3158 = relocator.mod -+@COND_mips_loongson_TRUE@am__append_3159 = relocator.marker -+@COND_powerpc_ieee1275_TRUE@am__append_3160 = relocator.module -+@COND_powerpc_ieee1275_TRUE@am__append_3161 = relocator.module$(EXEEXT) -+@COND_powerpc_ieee1275_TRUE@am__append_3162 = lib/i386/relocator_common.S kern/powerpc/cache_flush.S -+@COND_powerpc_ieee1275_TRUE@am__append_3163 = $(nodist_relocator_module_SOURCES) -+@COND_powerpc_ieee1275_TRUE@am__append_3164 = $(nodist_relocator_module_SOURCES) \ - @COND_powerpc_ieee1275_TRUE@ relocator.marker --@COND_powerpc_ieee1275_TRUE@am__append_3172 = relocator.mod --@COND_powerpc_ieee1275_TRUE@am__append_3173 = relocator.marker --@COND_mips_arc_TRUE@am__append_3174 = relocator.module --@COND_mips_arc_TRUE@am__append_3175 = relocator.module$(EXEEXT) --@COND_mips_arc_TRUE@am__append_3176 = lib/i386/relocator_common.S kern/powerpc/cache_flush.S --@COND_mips_arc_TRUE@am__append_3177 = $(nodist_relocator_module_SOURCES) --@COND_mips_arc_TRUE@am__append_3178 = \ -+@COND_powerpc_ieee1275_TRUE@am__append_3165 = relocator.mod -+@COND_powerpc_ieee1275_TRUE@am__append_3166 = relocator.marker -+@COND_mips_arc_TRUE@am__append_3167 = relocator.module -+@COND_mips_arc_TRUE@am__append_3168 = relocator.module$(EXEEXT) -+@COND_mips_arc_TRUE@am__append_3169 = lib/i386/relocator_common.S kern/powerpc/cache_flush.S -+@COND_mips_arc_TRUE@am__append_3170 = $(nodist_relocator_module_SOURCES) -+@COND_mips_arc_TRUE@am__append_3171 = \ - @COND_mips_arc_TRUE@ $(nodist_relocator_module_SOURCES) \ - @COND_mips_arc_TRUE@ relocator.marker --@COND_mips_arc_TRUE@am__append_3179 = relocator.mod --@COND_mips_arc_TRUE@am__append_3180 = relocator.marker --@COND_mips_qemu_mips_TRUE@am__append_3181 = relocator.module --@COND_mips_qemu_mips_TRUE@am__append_3182 = relocator.module$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__append_3183 = lib/i386/relocator_common.S kern/powerpc/cache_flush.S --@COND_mips_qemu_mips_TRUE@am__append_3184 = $(nodist_relocator_module_SOURCES) --@COND_mips_qemu_mips_TRUE@am__append_3185 = \ -+@COND_mips_arc_TRUE@am__append_3172 = relocator.mod -+@COND_mips_arc_TRUE@am__append_3173 = relocator.marker -+@COND_mips_qemu_mips_TRUE@am__append_3174 = relocator.module -+@COND_mips_qemu_mips_TRUE@am__append_3175 = relocator.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__append_3176 = lib/i386/relocator_common.S kern/powerpc/cache_flush.S -+@COND_mips_qemu_mips_TRUE@am__append_3177 = $(nodist_relocator_module_SOURCES) -+@COND_mips_qemu_mips_TRUE@am__append_3178 = \ - @COND_mips_qemu_mips_TRUE@ $(nodist_relocator_module_SOURCES) \ - @COND_mips_qemu_mips_TRUE@ relocator.marker --@COND_mips_qemu_mips_TRUE@am__append_3186 = relocator.mod --@COND_mips_qemu_mips_TRUE@am__append_3187 = relocator.marker --@COND_i386_pc_TRUE@am__append_3188 = datetime.module --@COND_i386_pc_TRUE@am__append_3189 = datetime.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__append_3179 = relocator.mod -+@COND_mips_qemu_mips_TRUE@am__append_3180 = relocator.marker -+@COND_i386_pc_TRUE@am__append_3181 = datetime.module -+@COND_i386_pc_TRUE@am__append_3182 = datetime.module$(EXEEXT) - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_FALSE@datetime_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_3190 = --@COND_i386_pc_TRUE@am__append_3191 = $(nodist_datetime_module_SOURCES) --@COND_i386_pc_TRUE@am__append_3192 = \ -+@COND_i386_pc_TRUE@am__append_3183 = -+@COND_i386_pc_TRUE@am__append_3184 = $(nodist_datetime_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_3185 = \ - @COND_i386_pc_TRUE@ $(nodist_datetime_module_SOURCES) \ - @COND_i386_pc_TRUE@ datetime.marker --@COND_i386_pc_TRUE@am__append_3193 = datetime.mod --@COND_i386_pc_TRUE@am__append_3194 = datetime.marker --@COND_i386_efi_TRUE@am__append_3195 = datetime.module --@COND_i386_efi_TRUE@am__append_3196 = datetime.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_3197 = --@COND_i386_efi_TRUE@am__append_3198 = $(nodist_datetime_module_SOURCES) --@COND_i386_efi_TRUE@am__append_3199 = \ -+@COND_i386_pc_TRUE@am__append_3186 = datetime.mod -+@COND_i386_pc_TRUE@am__append_3187 = datetime.marker -+@COND_i386_efi_TRUE@am__append_3188 = datetime.module -+@COND_i386_efi_TRUE@am__append_3189 = datetime.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_3190 = -+@COND_i386_efi_TRUE@am__append_3191 = $(nodist_datetime_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_3192 = \ - @COND_i386_efi_TRUE@ $(nodist_datetime_module_SOURCES) \ - @COND_i386_efi_TRUE@ datetime.marker --@COND_i386_efi_TRUE@am__append_3200 = datetime.mod --@COND_i386_efi_TRUE@am__append_3201 = datetime.marker --@COND_i386_qemu_TRUE@am__append_3202 = datetime.module --@COND_i386_qemu_TRUE@am__append_3203 = datetime.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_3204 = --@COND_i386_qemu_TRUE@am__append_3205 = $(nodist_datetime_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_3206 = \ -+@COND_i386_efi_TRUE@am__append_3193 = datetime.mod -+@COND_i386_efi_TRUE@am__append_3194 = datetime.marker -+@COND_i386_qemu_TRUE@am__append_3195 = datetime.module -+@COND_i386_qemu_TRUE@am__append_3196 = datetime.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_3197 = -+@COND_i386_qemu_TRUE@am__append_3198 = $(nodist_datetime_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_3199 = \ - @COND_i386_qemu_TRUE@ $(nodist_datetime_module_SOURCES) \ - @COND_i386_qemu_TRUE@ datetime.marker --@COND_i386_qemu_TRUE@am__append_3207 = datetime.mod --@COND_i386_qemu_TRUE@am__append_3208 = datetime.marker --@COND_i386_coreboot_TRUE@am__append_3209 = datetime.module --@COND_i386_coreboot_TRUE@am__append_3210 = datetime.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_3211 = --@COND_i386_coreboot_TRUE@am__append_3212 = $(nodist_datetime_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_3213 = \ -+@COND_i386_qemu_TRUE@am__append_3200 = datetime.mod -+@COND_i386_qemu_TRUE@am__append_3201 = datetime.marker -+@COND_i386_coreboot_TRUE@am__append_3202 = datetime.module -+@COND_i386_coreboot_TRUE@am__append_3203 = datetime.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_3204 = -+@COND_i386_coreboot_TRUE@am__append_3205 = $(nodist_datetime_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_3206 = \ - @COND_i386_coreboot_TRUE@ $(nodist_datetime_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ datetime.marker --@COND_i386_coreboot_TRUE@am__append_3214 = datetime.mod --@COND_i386_coreboot_TRUE@am__append_3215 = datetime.marker --@COND_i386_multiboot_TRUE@am__append_3216 = datetime.module --@COND_i386_multiboot_TRUE@am__append_3217 = datetime.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_3218 = --@COND_i386_multiboot_TRUE@am__append_3219 = $(nodist_datetime_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_3220 = \ -+@COND_i386_coreboot_TRUE@am__append_3207 = datetime.mod -+@COND_i386_coreboot_TRUE@am__append_3208 = datetime.marker -+@COND_i386_multiboot_TRUE@am__append_3209 = datetime.module -+@COND_i386_multiboot_TRUE@am__append_3210 = datetime.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_3211 = -+@COND_i386_multiboot_TRUE@am__append_3212 = $(nodist_datetime_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_3213 = \ - @COND_i386_multiboot_TRUE@ $(nodist_datetime_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ datetime.marker --@COND_i386_multiboot_TRUE@am__append_3221 = datetime.mod --@COND_i386_multiboot_TRUE@am__append_3222 = datetime.marker --@COND_i386_ieee1275_TRUE@am__append_3223 = datetime.module --@COND_i386_ieee1275_TRUE@am__append_3224 = datetime.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_3225 = --@COND_i386_ieee1275_TRUE@am__append_3226 = $(nodist_datetime_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_3227 = \ -+@COND_i386_multiboot_TRUE@am__append_3214 = datetime.mod -+@COND_i386_multiboot_TRUE@am__append_3215 = datetime.marker -+@COND_i386_ieee1275_TRUE@am__append_3216 = datetime.module -+@COND_i386_ieee1275_TRUE@am__append_3217 = datetime.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_3218 = -+@COND_i386_ieee1275_TRUE@am__append_3219 = $(nodist_datetime_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_3220 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_datetime_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ datetime.marker --@COND_i386_ieee1275_TRUE@am__append_3228 = datetime.mod --@COND_i386_ieee1275_TRUE@am__append_3229 = datetime.marker --@COND_x86_64_efi_TRUE@am__append_3230 = datetime.module --@COND_x86_64_efi_TRUE@am__append_3231 = datetime.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_3232 = --@COND_x86_64_efi_TRUE@am__append_3233 = $(nodist_datetime_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_3234 = \ -+@COND_i386_ieee1275_TRUE@am__append_3221 = datetime.mod -+@COND_i386_ieee1275_TRUE@am__append_3222 = datetime.marker -+@COND_x86_64_efi_TRUE@am__append_3223 = datetime.module -+@COND_x86_64_efi_TRUE@am__append_3224 = datetime.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_3225 = -+@COND_x86_64_efi_TRUE@am__append_3226 = $(nodist_datetime_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_3227 = \ - @COND_x86_64_efi_TRUE@ $(nodist_datetime_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ datetime.marker --@COND_x86_64_efi_TRUE@am__append_3235 = datetime.mod --@COND_x86_64_efi_TRUE@am__append_3236 = datetime.marker --@COND_i386_xen_TRUE@am__append_3237 = datetime.module --@COND_i386_xen_TRUE@am__append_3238 = datetime.module$(EXEEXT) --@COND_i386_xen_TRUE@am__append_3239 = --@COND_i386_xen_TRUE@am__append_3240 = $(nodist_datetime_module_SOURCES) --@COND_i386_xen_TRUE@am__append_3241 = \ -+@COND_x86_64_efi_TRUE@am__append_3228 = datetime.mod -+@COND_x86_64_efi_TRUE@am__append_3229 = datetime.marker -+@COND_i386_xen_TRUE@am__append_3230 = datetime.module -+@COND_i386_xen_TRUE@am__append_3231 = datetime.module$(EXEEXT) -+@COND_i386_xen_TRUE@am__append_3232 = -+@COND_i386_xen_TRUE@am__append_3233 = $(nodist_datetime_module_SOURCES) -+@COND_i386_xen_TRUE@am__append_3234 = \ - @COND_i386_xen_TRUE@ $(nodist_datetime_module_SOURCES) \ - @COND_i386_xen_TRUE@ datetime.marker --@COND_i386_xen_TRUE@am__append_3242 = datetime.mod --@COND_i386_xen_TRUE@am__append_3243 = datetime.marker --@COND_x86_64_xen_TRUE@am__append_3244 = datetime.module --@COND_x86_64_xen_TRUE@am__append_3245 = datetime.module$(EXEEXT) --@COND_x86_64_xen_TRUE@am__append_3246 = --@COND_x86_64_xen_TRUE@am__append_3247 = $(nodist_datetime_module_SOURCES) --@COND_x86_64_xen_TRUE@am__append_3248 = \ -+@COND_i386_xen_TRUE@am__append_3235 = datetime.mod -+@COND_i386_xen_TRUE@am__append_3236 = datetime.marker -+@COND_x86_64_xen_TRUE@am__append_3237 = datetime.module -+@COND_x86_64_xen_TRUE@am__append_3238 = datetime.module$(EXEEXT) -+@COND_x86_64_xen_TRUE@am__append_3239 = -+@COND_x86_64_xen_TRUE@am__append_3240 = $(nodist_datetime_module_SOURCES) -+@COND_x86_64_xen_TRUE@am__append_3241 = \ - @COND_x86_64_xen_TRUE@ $(nodist_datetime_module_SOURCES) \ - @COND_x86_64_xen_TRUE@ datetime.marker --@COND_x86_64_xen_TRUE@am__append_3249 = datetime.mod --@COND_x86_64_xen_TRUE@am__append_3250 = datetime.marker --@COND_i386_xen_pvh_TRUE@am__append_3251 = datetime.module --@COND_i386_xen_pvh_TRUE@am__append_3252 = datetime.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__append_3253 = --@COND_i386_xen_pvh_TRUE@am__append_3254 = $(nodist_datetime_module_SOURCES) --@COND_i386_xen_pvh_TRUE@am__append_3255 = \ -+@COND_x86_64_xen_TRUE@am__append_3242 = datetime.mod -+@COND_x86_64_xen_TRUE@am__append_3243 = datetime.marker -+@COND_i386_xen_pvh_TRUE@am__append_3244 = datetime.module -+@COND_i386_xen_pvh_TRUE@am__append_3245 = datetime.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__append_3246 = -+@COND_i386_xen_pvh_TRUE@am__append_3247 = $(nodist_datetime_module_SOURCES) -+@COND_i386_xen_pvh_TRUE@am__append_3248 = \ - @COND_i386_xen_pvh_TRUE@ $(nodist_datetime_module_SOURCES) \ - @COND_i386_xen_pvh_TRUE@ datetime.marker --@COND_i386_xen_pvh_TRUE@am__append_3256 = datetime.mod --@COND_i386_xen_pvh_TRUE@am__append_3257 = datetime.marker --@COND_mips_loongson_TRUE@am__append_3258 = datetime.module --@COND_mips_loongson_TRUE@am__append_3259 = datetime.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__append_3260 = --@COND_mips_loongson_TRUE@am__append_3261 = $(nodist_datetime_module_SOURCES) --@COND_mips_loongson_TRUE@am__append_3262 = \ -+@COND_i386_xen_pvh_TRUE@am__append_3249 = datetime.mod -+@COND_i386_xen_pvh_TRUE@am__append_3250 = datetime.marker -+@COND_mips_loongson_TRUE@am__append_3251 = datetime.module -+@COND_mips_loongson_TRUE@am__append_3252 = datetime.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__append_3253 = -+@COND_mips_loongson_TRUE@am__append_3254 = $(nodist_datetime_module_SOURCES) -+@COND_mips_loongson_TRUE@am__append_3255 = \ - @COND_mips_loongson_TRUE@ $(nodist_datetime_module_SOURCES) \ - @COND_mips_loongson_TRUE@ datetime.marker --@COND_mips_loongson_TRUE@am__append_3263 = datetime.mod --@COND_mips_loongson_TRUE@am__append_3264 = datetime.marker --@COND_sparc64_ieee1275_TRUE@am__append_3265 = datetime.module --@COND_sparc64_ieee1275_TRUE@am__append_3266 = datetime.module$(EXEEXT) --@COND_sparc64_ieee1275_TRUE@am__append_3267 = --@COND_sparc64_ieee1275_TRUE@am__append_3268 = $(nodist_datetime_module_SOURCES) --@COND_sparc64_ieee1275_TRUE@am__append_3269 = \ -+@COND_mips_loongson_TRUE@am__append_3256 = datetime.mod -+@COND_mips_loongson_TRUE@am__append_3257 = datetime.marker -+@COND_sparc64_ieee1275_TRUE@am__append_3258 = datetime.module -+@COND_sparc64_ieee1275_TRUE@am__append_3259 = datetime.module$(EXEEXT) -+@COND_sparc64_ieee1275_TRUE@am__append_3260 = -+@COND_sparc64_ieee1275_TRUE@am__append_3261 = $(nodist_datetime_module_SOURCES) -+@COND_sparc64_ieee1275_TRUE@am__append_3262 = \ - @COND_sparc64_ieee1275_TRUE@ $(nodist_datetime_module_SOURCES) \ - @COND_sparc64_ieee1275_TRUE@ datetime.marker --@COND_sparc64_ieee1275_TRUE@am__append_3270 = datetime.mod --@COND_sparc64_ieee1275_TRUE@am__append_3271 = datetime.marker --@COND_powerpc_ieee1275_TRUE@am__append_3272 = datetime.module --@COND_powerpc_ieee1275_TRUE@am__append_3273 = datetime.module$(EXEEXT) --@COND_powerpc_ieee1275_TRUE@am__append_3274 = --@COND_powerpc_ieee1275_TRUE@am__append_3275 = $(nodist_datetime_module_SOURCES) --@COND_powerpc_ieee1275_TRUE@am__append_3276 = \ -+@COND_sparc64_ieee1275_TRUE@am__append_3263 = datetime.mod -+@COND_sparc64_ieee1275_TRUE@am__append_3264 = datetime.marker -+@COND_powerpc_ieee1275_TRUE@am__append_3265 = datetime.module -+@COND_powerpc_ieee1275_TRUE@am__append_3266 = datetime.module$(EXEEXT) -+@COND_powerpc_ieee1275_TRUE@am__append_3267 = -+@COND_powerpc_ieee1275_TRUE@am__append_3268 = $(nodist_datetime_module_SOURCES) -+@COND_powerpc_ieee1275_TRUE@am__append_3269 = \ - @COND_powerpc_ieee1275_TRUE@ $(nodist_datetime_module_SOURCES) \ - @COND_powerpc_ieee1275_TRUE@ datetime.marker --@COND_powerpc_ieee1275_TRUE@am__append_3277 = datetime.mod --@COND_powerpc_ieee1275_TRUE@am__append_3278 = datetime.marker --@COND_mips_arc_TRUE@am__append_3279 = datetime.module --@COND_mips_arc_TRUE@am__append_3280 = datetime.module$(EXEEXT) --@COND_mips_arc_TRUE@am__append_3281 = --@COND_mips_arc_TRUE@am__append_3282 = $(nodist_datetime_module_SOURCES) --@COND_mips_arc_TRUE@am__append_3283 = \ -+@COND_powerpc_ieee1275_TRUE@am__append_3270 = datetime.mod -+@COND_powerpc_ieee1275_TRUE@am__append_3271 = datetime.marker -+@COND_mips_arc_TRUE@am__append_3272 = datetime.module -+@COND_mips_arc_TRUE@am__append_3273 = datetime.module$(EXEEXT) -+@COND_mips_arc_TRUE@am__append_3274 = -+@COND_mips_arc_TRUE@am__append_3275 = $(nodist_datetime_module_SOURCES) -+@COND_mips_arc_TRUE@am__append_3276 = \ - @COND_mips_arc_TRUE@ $(nodist_datetime_module_SOURCES) \ - @COND_mips_arc_TRUE@ datetime.marker --@COND_mips_arc_TRUE@am__append_3284 = datetime.mod --@COND_mips_arc_TRUE@am__append_3285 = datetime.marker --@COND_ia64_efi_TRUE@am__append_3286 = datetime.module --@COND_ia64_efi_TRUE@am__append_3287 = datetime.module$(EXEEXT) --@COND_ia64_efi_TRUE@am__append_3288 = --@COND_ia64_efi_TRUE@am__append_3289 = $(nodist_datetime_module_SOURCES) --@COND_ia64_efi_TRUE@am__append_3290 = \ -+@COND_mips_arc_TRUE@am__append_3277 = datetime.mod -+@COND_mips_arc_TRUE@am__append_3278 = datetime.marker -+@COND_ia64_efi_TRUE@am__append_3279 = datetime.module -+@COND_ia64_efi_TRUE@am__append_3280 = datetime.module$(EXEEXT) -+@COND_ia64_efi_TRUE@am__append_3281 = -+@COND_ia64_efi_TRUE@am__append_3282 = $(nodist_datetime_module_SOURCES) -+@COND_ia64_efi_TRUE@am__append_3283 = \ - @COND_ia64_efi_TRUE@ $(nodist_datetime_module_SOURCES) \ - @COND_ia64_efi_TRUE@ datetime.marker --@COND_ia64_efi_TRUE@am__append_3291 = datetime.mod --@COND_ia64_efi_TRUE@am__append_3292 = datetime.marker --@COND_mips_qemu_mips_TRUE@am__append_3293 = datetime.module --@COND_mips_qemu_mips_TRUE@am__append_3294 = datetime.module$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__append_3295 = --@COND_mips_qemu_mips_TRUE@am__append_3296 = $(nodist_datetime_module_SOURCES) --@COND_mips_qemu_mips_TRUE@am__append_3297 = \ -+@COND_ia64_efi_TRUE@am__append_3284 = datetime.mod -+@COND_ia64_efi_TRUE@am__append_3285 = datetime.marker -+@COND_mips_qemu_mips_TRUE@am__append_3286 = datetime.module -+@COND_mips_qemu_mips_TRUE@am__append_3287 = datetime.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__append_3288 = -+@COND_mips_qemu_mips_TRUE@am__append_3289 = $(nodist_datetime_module_SOURCES) -+@COND_mips_qemu_mips_TRUE@am__append_3290 = \ - @COND_mips_qemu_mips_TRUE@ $(nodist_datetime_module_SOURCES) \ - @COND_mips_qemu_mips_TRUE@ datetime.marker --@COND_mips_qemu_mips_TRUE@am__append_3298 = datetime.mod --@COND_mips_qemu_mips_TRUE@am__append_3299 = datetime.marker --@COND_arm_uboot_TRUE@am__append_3300 = datetime.module --@COND_arm_uboot_TRUE@am__append_3301 = datetime.module$(EXEEXT) --@COND_arm_uboot_TRUE@am__append_3302 = --@COND_arm_uboot_TRUE@am__append_3303 = $(nodist_datetime_module_SOURCES) --@COND_arm_uboot_TRUE@am__append_3304 = \ -+@COND_mips_qemu_mips_TRUE@am__append_3291 = datetime.mod -+@COND_mips_qemu_mips_TRUE@am__append_3292 = datetime.marker -+@COND_arm_uboot_TRUE@am__append_3293 = datetime.module -+@COND_arm_uboot_TRUE@am__append_3294 = datetime.module$(EXEEXT) -+@COND_arm_uboot_TRUE@am__append_3295 = -+@COND_arm_uboot_TRUE@am__append_3296 = $(nodist_datetime_module_SOURCES) -+@COND_arm_uboot_TRUE@am__append_3297 = \ - @COND_arm_uboot_TRUE@ $(nodist_datetime_module_SOURCES) \ - @COND_arm_uboot_TRUE@ datetime.marker --@COND_arm_uboot_TRUE@am__append_3305 = datetime.mod --@COND_arm_uboot_TRUE@am__append_3306 = datetime.marker --@COND_arm_efi_TRUE@am__append_3307 = datetime.module --@COND_arm_efi_TRUE@am__append_3308 = datetime.module$(EXEEXT) --@COND_arm_efi_TRUE@am__append_3309 = --@COND_arm_efi_TRUE@am__append_3310 = $(nodist_datetime_module_SOURCES) --@COND_arm_efi_TRUE@am__append_3311 = \ -+@COND_arm_uboot_TRUE@am__append_3298 = datetime.mod -+@COND_arm_uboot_TRUE@am__append_3299 = datetime.marker -+@COND_arm_efi_TRUE@am__append_3300 = datetime.module -+@COND_arm_efi_TRUE@am__append_3301 = datetime.module$(EXEEXT) -+@COND_arm_efi_TRUE@am__append_3302 = -+@COND_arm_efi_TRUE@am__append_3303 = $(nodist_datetime_module_SOURCES) -+@COND_arm_efi_TRUE@am__append_3304 = \ - @COND_arm_efi_TRUE@ $(nodist_datetime_module_SOURCES) \ - @COND_arm_efi_TRUE@ datetime.marker --@COND_arm_efi_TRUE@am__append_3312 = datetime.mod --@COND_arm_efi_TRUE@am__append_3313 = datetime.marker --@COND_arm64_efi_TRUE@am__append_3314 = datetime.module --@COND_arm64_efi_TRUE@am__append_3315 = datetime.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__append_3316 = --@COND_arm64_efi_TRUE@am__append_3317 = $(nodist_datetime_module_SOURCES) --@COND_arm64_efi_TRUE@am__append_3318 = \ -+@COND_arm_efi_TRUE@am__append_3305 = datetime.mod -+@COND_arm_efi_TRUE@am__append_3306 = datetime.marker -+@COND_arm64_efi_TRUE@am__append_3307 = datetime.module -+@COND_arm64_efi_TRUE@am__append_3308 = datetime.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__append_3309 = -+@COND_arm64_efi_TRUE@am__append_3310 = $(nodist_datetime_module_SOURCES) -+@COND_arm64_efi_TRUE@am__append_3311 = \ - @COND_arm64_efi_TRUE@ $(nodist_datetime_module_SOURCES) \ - @COND_arm64_efi_TRUE@ datetime.marker --@COND_arm64_efi_TRUE@am__append_3319 = datetime.mod --@COND_arm64_efi_TRUE@am__append_3320 = datetime.marker --@COND_arm_coreboot_TRUE@am__append_3321 = datetime.module --@COND_arm_coreboot_TRUE@am__append_3322 = datetime.module$(EXEEXT) --@COND_arm_coreboot_TRUE@am__append_3323 = --@COND_arm_coreboot_TRUE@am__append_3324 = $(nodist_datetime_module_SOURCES) --@COND_arm_coreboot_TRUE@am__append_3325 = \ -+@COND_arm64_efi_TRUE@am__append_3312 = datetime.mod -+@COND_arm64_efi_TRUE@am__append_3313 = datetime.marker -+@COND_arm_coreboot_TRUE@am__append_3314 = datetime.module -+@COND_arm_coreboot_TRUE@am__append_3315 = datetime.module$(EXEEXT) -+@COND_arm_coreboot_TRUE@am__append_3316 = -+@COND_arm_coreboot_TRUE@am__append_3317 = $(nodist_datetime_module_SOURCES) -+@COND_arm_coreboot_TRUE@am__append_3318 = \ - @COND_arm_coreboot_TRUE@ $(nodist_datetime_module_SOURCES) \ - @COND_arm_coreboot_TRUE@ datetime.marker --@COND_arm_coreboot_TRUE@am__append_3326 = datetime.mod --@COND_arm_coreboot_TRUE@am__append_3327 = datetime.marker --@COND_riscv32_efi_TRUE@am__append_3328 = datetime.module --@COND_riscv32_efi_TRUE@am__append_3329 = datetime.module$(EXEEXT) --@COND_riscv32_efi_TRUE@am__append_3330 = --@COND_riscv32_efi_TRUE@am__append_3331 = $(nodist_datetime_module_SOURCES) --@COND_riscv32_efi_TRUE@am__append_3332 = \ -+@COND_arm_coreboot_TRUE@am__append_3319 = datetime.mod -+@COND_arm_coreboot_TRUE@am__append_3320 = datetime.marker -+@COND_riscv32_efi_TRUE@am__append_3321 = datetime.module -+@COND_riscv32_efi_TRUE@am__append_3322 = datetime.module$(EXEEXT) -+@COND_riscv32_efi_TRUE@am__append_3323 = -+@COND_riscv32_efi_TRUE@am__append_3324 = $(nodist_datetime_module_SOURCES) -+@COND_riscv32_efi_TRUE@am__append_3325 = \ - @COND_riscv32_efi_TRUE@ $(nodist_datetime_module_SOURCES) \ - @COND_riscv32_efi_TRUE@ datetime.marker --@COND_riscv32_efi_TRUE@am__append_3333 = datetime.mod --@COND_riscv32_efi_TRUE@am__append_3334 = datetime.marker --@COND_riscv64_efi_TRUE@am__append_3335 = datetime.module --@COND_riscv64_efi_TRUE@am__append_3336 = datetime.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__append_3337 = --@COND_riscv64_efi_TRUE@am__append_3338 = $(nodist_datetime_module_SOURCES) --@COND_riscv64_efi_TRUE@am__append_3339 = \ -+@COND_riscv32_efi_TRUE@am__append_3326 = datetime.mod -+@COND_riscv32_efi_TRUE@am__append_3327 = datetime.marker -+@COND_riscv64_efi_TRUE@am__append_3328 = datetime.module -+@COND_riscv64_efi_TRUE@am__append_3329 = datetime.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__append_3330 = -+@COND_riscv64_efi_TRUE@am__append_3331 = $(nodist_datetime_module_SOURCES) -+@COND_riscv64_efi_TRUE@am__append_3332 = \ - @COND_riscv64_efi_TRUE@ $(nodist_datetime_module_SOURCES) \ - @COND_riscv64_efi_TRUE@ datetime.marker --@COND_riscv64_efi_TRUE@am__append_3340 = datetime.mod --@COND_riscv64_efi_TRUE@am__append_3341 = datetime.marker --@COND_i386_pc_TRUE@am__append_3342 = aout.module --@COND_i386_pc_TRUE@am__append_3343 = aout.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__append_3333 = datetime.mod -+@COND_riscv64_efi_TRUE@am__append_3334 = datetime.marker -+@COND_i386_pc_TRUE@am__append_3335 = aout.module -+@COND_i386_pc_TRUE@am__append_3336 = aout.module$(EXEEXT) - @COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_x86_64_efi_FALSE@aout_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_3344 = --@COND_i386_pc_TRUE@am__append_3345 = $(nodist_aout_module_SOURCES) --@COND_i386_pc_TRUE@am__append_3346 = $(nodist_aout_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_3337 = -+@COND_i386_pc_TRUE@am__append_3338 = $(nodist_aout_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_3339 = $(nodist_aout_module_SOURCES) \ - @COND_i386_pc_TRUE@ aout.marker --@COND_i386_pc_TRUE@am__append_3347 = aout.mod --@COND_i386_pc_TRUE@am__append_3348 = aout.marker --@COND_i386_efi_TRUE@am__append_3349 = aout.module --@COND_i386_efi_TRUE@am__append_3350 = aout.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_3351 = --@COND_i386_efi_TRUE@am__append_3352 = $(nodist_aout_module_SOURCES) --@COND_i386_efi_TRUE@am__append_3353 = $(nodist_aout_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_3340 = aout.mod -+@COND_i386_pc_TRUE@am__append_3341 = aout.marker -+@COND_i386_efi_TRUE@am__append_3342 = aout.module -+@COND_i386_efi_TRUE@am__append_3343 = aout.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_3344 = -+@COND_i386_efi_TRUE@am__append_3345 = $(nodist_aout_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_3346 = $(nodist_aout_module_SOURCES) \ - @COND_i386_efi_TRUE@ aout.marker --@COND_i386_efi_TRUE@am__append_3354 = aout.mod --@COND_i386_efi_TRUE@am__append_3355 = aout.marker --@COND_i386_qemu_TRUE@am__append_3356 = aout.module --@COND_i386_qemu_TRUE@am__append_3357 = aout.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_3358 = --@COND_i386_qemu_TRUE@am__append_3359 = $(nodist_aout_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_3360 = $(nodist_aout_module_SOURCES) \ -+@COND_i386_efi_TRUE@am__append_3347 = aout.mod -+@COND_i386_efi_TRUE@am__append_3348 = aout.marker -+@COND_i386_qemu_TRUE@am__append_3349 = aout.module -+@COND_i386_qemu_TRUE@am__append_3350 = aout.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_3351 = -+@COND_i386_qemu_TRUE@am__append_3352 = $(nodist_aout_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_3353 = $(nodist_aout_module_SOURCES) \ - @COND_i386_qemu_TRUE@ aout.marker --@COND_i386_qemu_TRUE@am__append_3361 = aout.mod --@COND_i386_qemu_TRUE@am__append_3362 = aout.marker --@COND_i386_coreboot_TRUE@am__append_3363 = aout.module --@COND_i386_coreboot_TRUE@am__append_3364 = aout.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_3365 = --@COND_i386_coreboot_TRUE@am__append_3366 = $(nodist_aout_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_3367 = \ -+@COND_i386_qemu_TRUE@am__append_3354 = aout.mod -+@COND_i386_qemu_TRUE@am__append_3355 = aout.marker -+@COND_i386_coreboot_TRUE@am__append_3356 = aout.module -+@COND_i386_coreboot_TRUE@am__append_3357 = aout.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_3358 = -+@COND_i386_coreboot_TRUE@am__append_3359 = $(nodist_aout_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_3360 = \ - @COND_i386_coreboot_TRUE@ $(nodist_aout_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ aout.marker --@COND_i386_coreboot_TRUE@am__append_3368 = aout.mod --@COND_i386_coreboot_TRUE@am__append_3369 = aout.marker --@COND_i386_multiboot_TRUE@am__append_3370 = aout.module --@COND_i386_multiboot_TRUE@am__append_3371 = aout.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_3372 = --@COND_i386_multiboot_TRUE@am__append_3373 = $(nodist_aout_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_3374 = \ -+@COND_i386_coreboot_TRUE@am__append_3361 = aout.mod -+@COND_i386_coreboot_TRUE@am__append_3362 = aout.marker -+@COND_i386_multiboot_TRUE@am__append_3363 = aout.module -+@COND_i386_multiboot_TRUE@am__append_3364 = aout.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_3365 = -+@COND_i386_multiboot_TRUE@am__append_3366 = $(nodist_aout_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_3367 = \ - @COND_i386_multiboot_TRUE@ $(nodist_aout_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ aout.marker --@COND_i386_multiboot_TRUE@am__append_3375 = aout.mod --@COND_i386_multiboot_TRUE@am__append_3376 = aout.marker --@COND_i386_ieee1275_TRUE@am__append_3377 = aout.module --@COND_i386_ieee1275_TRUE@am__append_3378 = aout.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_3379 = --@COND_i386_ieee1275_TRUE@am__append_3380 = $(nodist_aout_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_3381 = \ -+@COND_i386_multiboot_TRUE@am__append_3368 = aout.mod -+@COND_i386_multiboot_TRUE@am__append_3369 = aout.marker -+@COND_i386_ieee1275_TRUE@am__append_3370 = aout.module -+@COND_i386_ieee1275_TRUE@am__append_3371 = aout.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_3372 = -+@COND_i386_ieee1275_TRUE@am__append_3373 = $(nodist_aout_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_3374 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_aout_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ aout.marker --@COND_i386_ieee1275_TRUE@am__append_3382 = aout.mod --@COND_i386_ieee1275_TRUE@am__append_3383 = aout.marker --@COND_x86_64_efi_TRUE@am__append_3384 = aout.module --@COND_x86_64_efi_TRUE@am__append_3385 = aout.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_3386 = --@COND_x86_64_efi_TRUE@am__append_3387 = $(nodist_aout_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_3388 = $(nodist_aout_module_SOURCES) \ -+@COND_i386_ieee1275_TRUE@am__append_3375 = aout.mod -+@COND_i386_ieee1275_TRUE@am__append_3376 = aout.marker -+@COND_x86_64_efi_TRUE@am__append_3377 = aout.module -+@COND_x86_64_efi_TRUE@am__append_3378 = aout.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_3379 = -+@COND_x86_64_efi_TRUE@am__append_3380 = $(nodist_aout_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_3381 = $(nodist_aout_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ aout.marker --@COND_x86_64_efi_TRUE@am__append_3389 = aout.mod --@COND_x86_64_efi_TRUE@am__append_3390 = aout.marker --@COND_i386_pc_TRUE@am__append_3391 = bsd.module --@COND_i386_pc_TRUE@am__append_3392 = bsd.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_3382 = aout.mod -+@COND_x86_64_efi_TRUE@am__append_3383 = aout.marker -+@COND_i386_pc_TRUE@am__append_3384 = bsd.module -+@COND_i386_pc_TRUE@am__append_3385 = bsd.module$(EXEEXT) - @COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_x86_64_efi_FALSE@bsd_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_3393 = loader/i386/bsdXX.c loader/i386/bsd_pagetable.c --@COND_i386_pc_TRUE@am__append_3394 = $(nodist_bsd_module_SOURCES) --@COND_i386_pc_TRUE@am__append_3395 = $(nodist_bsd_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_3386 = loader/i386/bsdXX.c loader/i386/bsd_pagetable.c -+@COND_i386_pc_TRUE@am__append_3387 = $(nodist_bsd_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_3388 = $(nodist_bsd_module_SOURCES) \ - @COND_i386_pc_TRUE@ bsd.marker --@COND_i386_pc_TRUE@am__append_3396 = bsd.mod --@COND_i386_pc_TRUE@am__append_3397 = bsd.marker --@COND_i386_efi_TRUE@am__append_3398 = bsd.module --@COND_i386_efi_TRUE@am__append_3399 = bsd.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_3400 = loader/i386/bsdXX.c loader/i386/bsd_pagetable.c --@COND_i386_efi_TRUE@am__append_3401 = $(nodist_bsd_module_SOURCES) --@COND_i386_efi_TRUE@am__append_3402 = $(nodist_bsd_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_3389 = bsd.mod -+@COND_i386_pc_TRUE@am__append_3390 = bsd.marker -+@COND_i386_efi_TRUE@am__append_3391 = bsd.module -+@COND_i386_efi_TRUE@am__append_3392 = bsd.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_3393 = loader/i386/bsdXX.c loader/i386/bsd_pagetable.c -+@COND_i386_efi_TRUE@am__append_3394 = $(nodist_bsd_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_3395 = $(nodist_bsd_module_SOURCES) \ - @COND_i386_efi_TRUE@ bsd.marker --@COND_i386_efi_TRUE@am__append_3403 = bsd.mod --@COND_i386_efi_TRUE@am__append_3404 = bsd.marker --@COND_i386_qemu_TRUE@am__append_3405 = bsd.module --@COND_i386_qemu_TRUE@am__append_3406 = bsd.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_3407 = loader/i386/bsdXX.c loader/i386/bsd_pagetable.c --@COND_i386_qemu_TRUE@am__append_3408 = $(nodist_bsd_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_3409 = $(nodist_bsd_module_SOURCES) \ -+@COND_i386_efi_TRUE@am__append_3396 = bsd.mod -+@COND_i386_efi_TRUE@am__append_3397 = bsd.marker -+@COND_i386_qemu_TRUE@am__append_3398 = bsd.module -+@COND_i386_qemu_TRUE@am__append_3399 = bsd.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_3400 = loader/i386/bsdXX.c loader/i386/bsd_pagetable.c -+@COND_i386_qemu_TRUE@am__append_3401 = $(nodist_bsd_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_3402 = $(nodist_bsd_module_SOURCES) \ - @COND_i386_qemu_TRUE@ bsd.marker --@COND_i386_qemu_TRUE@am__append_3410 = bsd.mod --@COND_i386_qemu_TRUE@am__append_3411 = bsd.marker --@COND_i386_coreboot_TRUE@am__append_3412 = bsd.module --@COND_i386_coreboot_TRUE@am__append_3413 = bsd.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_3414 = loader/i386/bsdXX.c loader/i386/bsd_pagetable.c --@COND_i386_coreboot_TRUE@am__append_3415 = $(nodist_bsd_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_3416 = \ -+@COND_i386_qemu_TRUE@am__append_3403 = bsd.mod -+@COND_i386_qemu_TRUE@am__append_3404 = bsd.marker -+@COND_i386_coreboot_TRUE@am__append_3405 = bsd.module -+@COND_i386_coreboot_TRUE@am__append_3406 = bsd.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_3407 = loader/i386/bsdXX.c loader/i386/bsd_pagetable.c -+@COND_i386_coreboot_TRUE@am__append_3408 = $(nodist_bsd_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_3409 = \ - @COND_i386_coreboot_TRUE@ $(nodist_bsd_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ bsd.marker --@COND_i386_coreboot_TRUE@am__append_3417 = bsd.mod --@COND_i386_coreboot_TRUE@am__append_3418 = bsd.marker --@COND_i386_multiboot_TRUE@am__append_3419 = bsd.module --@COND_i386_multiboot_TRUE@am__append_3420 = bsd.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_3421 = loader/i386/bsdXX.c loader/i386/bsd_pagetable.c --@COND_i386_multiboot_TRUE@am__append_3422 = $(nodist_bsd_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_3423 = \ -+@COND_i386_coreboot_TRUE@am__append_3410 = bsd.mod -+@COND_i386_coreboot_TRUE@am__append_3411 = bsd.marker -+@COND_i386_multiboot_TRUE@am__append_3412 = bsd.module -+@COND_i386_multiboot_TRUE@am__append_3413 = bsd.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_3414 = loader/i386/bsdXX.c loader/i386/bsd_pagetable.c -+@COND_i386_multiboot_TRUE@am__append_3415 = $(nodist_bsd_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_3416 = \ - @COND_i386_multiboot_TRUE@ $(nodist_bsd_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ bsd.marker --@COND_i386_multiboot_TRUE@am__append_3424 = bsd.mod --@COND_i386_multiboot_TRUE@am__append_3425 = bsd.marker --@COND_i386_ieee1275_TRUE@am__append_3426 = bsd.module --@COND_i386_ieee1275_TRUE@am__append_3427 = bsd.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_3428 = loader/i386/bsdXX.c loader/i386/bsd_pagetable.c --@COND_i386_ieee1275_TRUE@am__append_3429 = $(nodist_bsd_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_3430 = \ -+@COND_i386_multiboot_TRUE@am__append_3417 = bsd.mod -+@COND_i386_multiboot_TRUE@am__append_3418 = bsd.marker -+@COND_i386_ieee1275_TRUE@am__append_3419 = bsd.module -+@COND_i386_ieee1275_TRUE@am__append_3420 = bsd.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_3421 = loader/i386/bsdXX.c loader/i386/bsd_pagetable.c -+@COND_i386_ieee1275_TRUE@am__append_3422 = $(nodist_bsd_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_3423 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_bsd_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ bsd.marker --@COND_i386_ieee1275_TRUE@am__append_3431 = bsd.mod --@COND_i386_ieee1275_TRUE@am__append_3432 = bsd.marker --@COND_x86_64_efi_TRUE@am__append_3433 = bsd.module --@COND_x86_64_efi_TRUE@am__append_3434 = bsd.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_3435 = loader/i386/bsdXX.c loader/i386/bsd_pagetable.c --@COND_x86_64_efi_TRUE@am__append_3436 = $(nodist_bsd_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_3437 = $(nodist_bsd_module_SOURCES) \ -+@COND_i386_ieee1275_TRUE@am__append_3424 = bsd.mod -+@COND_i386_ieee1275_TRUE@am__append_3425 = bsd.marker -+@COND_x86_64_efi_TRUE@am__append_3426 = bsd.module -+@COND_x86_64_efi_TRUE@am__append_3427 = bsd.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_3428 = loader/i386/bsdXX.c loader/i386/bsd_pagetable.c -+@COND_x86_64_efi_TRUE@am__append_3429 = $(nodist_bsd_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_3430 = $(nodist_bsd_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ bsd.marker --@COND_x86_64_efi_TRUE@am__append_3438 = bsd.mod --@COND_x86_64_efi_TRUE@am__append_3439 = bsd.marker --@COND_i386_pc_TRUE@am__append_3440 = plan9.module linux16.module --@COND_i386_pc_TRUE@am__append_3441 = plan9.module$(EXEEXT) \ -+@COND_x86_64_efi_TRUE@am__append_3431 = bsd.mod -+@COND_x86_64_efi_TRUE@am__append_3432 = bsd.marker -+@COND_i386_pc_TRUE@am__append_3433 = plan9.module linux16.module -+@COND_i386_pc_TRUE@am__append_3434 = plan9.module$(EXEEXT) \ - @COND_i386_pc_TRUE@ linux16.module$(EXEEXT) - @COND_i386_pc_FALSE@plan9_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_3442 = --@COND_i386_pc_TRUE@am__append_3443 = $(nodist_plan9_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_3435 = -+@COND_i386_pc_TRUE@am__append_3436 = $(nodist_plan9_module_SOURCES) \ - @COND_i386_pc_TRUE@ $(nodist_linux16_module_SOURCES) --@COND_i386_pc_TRUE@am__append_3444 = $(nodist_plan9_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_3437 = $(nodist_plan9_module_SOURCES) \ - @COND_i386_pc_TRUE@ plan9.marker \ - @COND_i386_pc_TRUE@ $(nodist_linux16_module_SOURCES) \ - @COND_i386_pc_TRUE@ linux16.marker --@COND_i386_pc_TRUE@am__append_3445 = plan9.mod linux16.mod --@COND_i386_pc_TRUE@am__append_3446 = plan9.marker linux16.marker -+@COND_i386_pc_TRUE@am__append_3438 = plan9.mod linux16.mod -+@COND_i386_pc_TRUE@am__append_3439 = plan9.marker linux16.marker - @COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_x86_64_efi_FALSE@linux16_module_DEPENDENCIES = --@COND_i386_efi_TRUE@am__append_3447 = linux16.module --@COND_i386_efi_TRUE@am__append_3448 = linux16.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_3449 = --@COND_i386_efi_TRUE@am__append_3450 = $(nodist_linux16_module_SOURCES) --@COND_i386_efi_TRUE@am__append_3451 = \ -+@COND_i386_efi_TRUE@am__append_3440 = linux16.module -+@COND_i386_efi_TRUE@am__append_3441 = linux16.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_3442 = -+@COND_i386_efi_TRUE@am__append_3443 = $(nodist_linux16_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_3444 = \ - @COND_i386_efi_TRUE@ $(nodist_linux16_module_SOURCES) \ - @COND_i386_efi_TRUE@ linux16.marker --@COND_i386_efi_TRUE@am__append_3452 = linux16.mod --@COND_i386_efi_TRUE@am__append_3453 = linux16.marker --@COND_i386_qemu_TRUE@am__append_3454 = linux16.module --@COND_i386_qemu_TRUE@am__append_3455 = linux16.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_3456 = --@COND_i386_qemu_TRUE@am__append_3457 = $(nodist_linux16_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_3458 = \ -+@COND_i386_efi_TRUE@am__append_3445 = linux16.mod -+@COND_i386_efi_TRUE@am__append_3446 = linux16.marker -+@COND_i386_qemu_TRUE@am__append_3447 = linux16.module -+@COND_i386_qemu_TRUE@am__append_3448 = linux16.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_3449 = -+@COND_i386_qemu_TRUE@am__append_3450 = $(nodist_linux16_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_3451 = \ - @COND_i386_qemu_TRUE@ $(nodist_linux16_module_SOURCES) \ - @COND_i386_qemu_TRUE@ linux16.marker --@COND_i386_qemu_TRUE@am__append_3459 = linux16.mod --@COND_i386_qemu_TRUE@am__append_3460 = linux16.marker --@COND_i386_coreboot_TRUE@am__append_3461 = linux16.module --@COND_i386_coreboot_TRUE@am__append_3462 = linux16.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_3463 = --@COND_i386_coreboot_TRUE@am__append_3464 = $(nodist_linux16_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_3465 = \ -+@COND_i386_qemu_TRUE@am__append_3452 = linux16.mod -+@COND_i386_qemu_TRUE@am__append_3453 = linux16.marker -+@COND_i386_coreboot_TRUE@am__append_3454 = linux16.module -+@COND_i386_coreboot_TRUE@am__append_3455 = linux16.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_3456 = -+@COND_i386_coreboot_TRUE@am__append_3457 = $(nodist_linux16_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_3458 = \ - @COND_i386_coreboot_TRUE@ $(nodist_linux16_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ linux16.marker --@COND_i386_coreboot_TRUE@am__append_3466 = linux16.mod --@COND_i386_coreboot_TRUE@am__append_3467 = linux16.marker --@COND_i386_multiboot_TRUE@am__append_3468 = linux16.module --@COND_i386_multiboot_TRUE@am__append_3469 = linux16.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_3470 = --@COND_i386_multiboot_TRUE@am__append_3471 = $(nodist_linux16_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_3472 = \ -+@COND_i386_coreboot_TRUE@am__append_3459 = linux16.mod -+@COND_i386_coreboot_TRUE@am__append_3460 = linux16.marker -+@COND_i386_multiboot_TRUE@am__append_3461 = linux16.module -+@COND_i386_multiboot_TRUE@am__append_3462 = linux16.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_3463 = -+@COND_i386_multiboot_TRUE@am__append_3464 = $(nodist_linux16_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_3465 = \ - @COND_i386_multiboot_TRUE@ $(nodist_linux16_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ linux16.marker --@COND_i386_multiboot_TRUE@am__append_3473 = linux16.mod --@COND_i386_multiboot_TRUE@am__append_3474 = linux16.marker --@COND_i386_ieee1275_TRUE@am__append_3475 = linux16.module --@COND_i386_ieee1275_TRUE@am__append_3476 = linux16.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_3477 = --@COND_i386_ieee1275_TRUE@am__append_3478 = $(nodist_linux16_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_3479 = \ -+@COND_i386_multiboot_TRUE@am__append_3466 = linux16.mod -+@COND_i386_multiboot_TRUE@am__append_3467 = linux16.marker -+@COND_i386_ieee1275_TRUE@am__append_3468 = linux16.module -+@COND_i386_ieee1275_TRUE@am__append_3469 = linux16.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_3470 = -+@COND_i386_ieee1275_TRUE@am__append_3471 = $(nodist_linux16_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_3472 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_linux16_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ linux16.marker --@COND_i386_ieee1275_TRUE@am__append_3480 = linux16.mod --@COND_i386_ieee1275_TRUE@am__append_3481 = linux16.marker --@COND_x86_64_efi_TRUE@am__append_3482 = linux16.module --@COND_x86_64_efi_TRUE@am__append_3483 = linux16.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_3484 = --@COND_x86_64_efi_TRUE@am__append_3485 = $(nodist_linux16_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_3486 = \ -+@COND_i386_ieee1275_TRUE@am__append_3473 = linux16.mod -+@COND_i386_ieee1275_TRUE@am__append_3474 = linux16.marker -+@COND_x86_64_efi_TRUE@am__append_3475 = linux16.module -+@COND_x86_64_efi_TRUE@am__append_3476 = linux16.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_3477 = -+@COND_x86_64_efi_TRUE@am__append_3478 = $(nodist_linux16_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_3479 = \ - @COND_x86_64_efi_TRUE@ $(nodist_linux16_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ linux16.marker --@COND_x86_64_efi_TRUE@am__append_3487 = linux16.mod --@COND_x86_64_efi_TRUE@am__append_3488 = linux16.marker --@COND_i386_pc_TRUE@am__append_3489 = ntldr.module truecrypt.module \ -+@COND_x86_64_efi_TRUE@am__append_3480 = linux16.mod -+@COND_x86_64_efi_TRUE@am__append_3481 = linux16.marker -+@COND_i386_pc_TRUE@am__append_3482 = ntldr.module truecrypt.module \ - @COND_i386_pc_TRUE@ freedos.module pxechain.module \ - @COND_i386_pc_TRUE@ multiboot2.module --@COND_i386_pc_TRUE@am__append_3490 = ntldr.module$(EXEEXT) \ -+@COND_i386_pc_TRUE@am__append_3483 = ntldr.module$(EXEEXT) \ - @COND_i386_pc_TRUE@ truecrypt.module$(EXEEXT) \ - @COND_i386_pc_TRUE@ freedos.module$(EXEEXT) \ - @COND_i386_pc_TRUE@ pxechain.module$(EXEEXT) \ - @COND_i386_pc_TRUE@ multiboot2.module$(EXEEXT) - @COND_i386_pc_FALSE@ntldr_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_3491 = --@COND_i386_pc_TRUE@am__append_3492 = $(nodist_ntldr_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_3484 = -+@COND_i386_pc_TRUE@am__append_3485 = $(nodist_ntldr_module_SOURCES) \ - @COND_i386_pc_TRUE@ $(nodist_truecrypt_module_SOURCES) \ - @COND_i386_pc_TRUE@ $(nodist_freedos_module_SOURCES) \ - @COND_i386_pc_TRUE@ $(nodist_pxechain_module_SOURCES) \ - @COND_i386_pc_TRUE@ $(nodist_multiboot2_module_SOURCES) --@COND_i386_pc_TRUE@am__append_3493 = $(nodist_ntldr_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_3486 = $(nodist_ntldr_module_SOURCES) \ - @COND_i386_pc_TRUE@ ntldr.marker \ - @COND_i386_pc_TRUE@ $(nodist_truecrypt_module_SOURCES) \ - @COND_i386_pc_TRUE@ truecrypt.marker \ -@@ -4863,2969 +4853,2969 @@ TESTS = - @COND_i386_pc_TRUE@ pxechain.marker \ - @COND_i386_pc_TRUE@ $(nodist_multiboot2_module_SOURCES) \ - @COND_i386_pc_TRUE@ multiboot2.marker --@COND_i386_pc_TRUE@am__append_3494 = ntldr.mod truecrypt.mod \ -+@COND_i386_pc_TRUE@am__append_3487 = ntldr.mod truecrypt.mod \ - @COND_i386_pc_TRUE@ freedos.mod pxechain.mod multiboot2.mod --@COND_i386_pc_TRUE@am__append_3495 = ntldr.marker truecrypt.marker \ -+@COND_i386_pc_TRUE@am__append_3488 = ntldr.marker truecrypt.marker \ - @COND_i386_pc_TRUE@ freedos.marker pxechain.marker \ - @COND_i386_pc_TRUE@ multiboot2.marker - @COND_i386_pc_FALSE@truecrypt_module_DEPENDENCIES = - @COND_i386_pc_FALSE@freedos_module_DEPENDENCIES = - @COND_i386_pc_FALSE@pxechain_module_DEPENDENCIES = - @COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_pvh_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_x86_64_efi_FALSE@multiboot2_module_DEPENDENCIES = --@COND_i386_efi_TRUE@am__append_3496 = multiboot2.module --@COND_i386_efi_TRUE@am__append_3497 = multiboot2.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_3498 = --@COND_i386_efi_TRUE@am__append_3499 = $(nodist_multiboot2_module_SOURCES) --@COND_i386_efi_TRUE@am__append_3500 = \ -+@COND_i386_efi_TRUE@am__append_3489 = multiboot2.module -+@COND_i386_efi_TRUE@am__append_3490 = multiboot2.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_3491 = -+@COND_i386_efi_TRUE@am__append_3492 = $(nodist_multiboot2_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_3493 = \ - @COND_i386_efi_TRUE@ $(nodist_multiboot2_module_SOURCES) \ - @COND_i386_efi_TRUE@ multiboot2.marker --@COND_i386_efi_TRUE@am__append_3501 = multiboot2.mod --@COND_i386_efi_TRUE@am__append_3502 = multiboot2.marker --@COND_i386_qemu_TRUE@am__append_3503 = multiboot2.module --@COND_i386_qemu_TRUE@am__append_3504 = multiboot2.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_3505 = --@COND_i386_qemu_TRUE@am__append_3506 = $(nodist_multiboot2_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_3507 = \ -+@COND_i386_efi_TRUE@am__append_3494 = multiboot2.mod -+@COND_i386_efi_TRUE@am__append_3495 = multiboot2.marker -+@COND_i386_qemu_TRUE@am__append_3496 = multiboot2.module -+@COND_i386_qemu_TRUE@am__append_3497 = multiboot2.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_3498 = -+@COND_i386_qemu_TRUE@am__append_3499 = $(nodist_multiboot2_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_3500 = \ - @COND_i386_qemu_TRUE@ $(nodist_multiboot2_module_SOURCES) \ - @COND_i386_qemu_TRUE@ multiboot2.marker --@COND_i386_qemu_TRUE@am__append_3508 = multiboot2.mod --@COND_i386_qemu_TRUE@am__append_3509 = multiboot2.marker --@COND_i386_coreboot_TRUE@am__append_3510 = multiboot2.module --@COND_i386_coreboot_TRUE@am__append_3511 = multiboot2.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_3512 = --@COND_i386_coreboot_TRUE@am__append_3513 = $(nodist_multiboot2_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_3514 = \ -+@COND_i386_qemu_TRUE@am__append_3501 = multiboot2.mod -+@COND_i386_qemu_TRUE@am__append_3502 = multiboot2.marker -+@COND_i386_coreboot_TRUE@am__append_3503 = multiboot2.module -+@COND_i386_coreboot_TRUE@am__append_3504 = multiboot2.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_3505 = -+@COND_i386_coreboot_TRUE@am__append_3506 = $(nodist_multiboot2_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_3507 = \ - @COND_i386_coreboot_TRUE@ $(nodist_multiboot2_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ multiboot2.marker --@COND_i386_coreboot_TRUE@am__append_3515 = multiboot2.mod --@COND_i386_coreboot_TRUE@am__append_3516 = multiboot2.marker --@COND_i386_multiboot_TRUE@am__append_3517 = multiboot2.module --@COND_i386_multiboot_TRUE@am__append_3518 = multiboot2.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_3519 = --@COND_i386_multiboot_TRUE@am__append_3520 = $(nodist_multiboot2_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_3521 = \ -+@COND_i386_coreboot_TRUE@am__append_3508 = multiboot2.mod -+@COND_i386_coreboot_TRUE@am__append_3509 = multiboot2.marker -+@COND_i386_multiboot_TRUE@am__append_3510 = multiboot2.module -+@COND_i386_multiboot_TRUE@am__append_3511 = multiboot2.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_3512 = -+@COND_i386_multiboot_TRUE@am__append_3513 = $(nodist_multiboot2_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_3514 = \ - @COND_i386_multiboot_TRUE@ $(nodist_multiboot2_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ multiboot2.marker --@COND_i386_multiboot_TRUE@am__append_3522 = multiboot2.mod --@COND_i386_multiboot_TRUE@am__append_3523 = multiboot2.marker --@COND_i386_ieee1275_TRUE@am__append_3524 = multiboot2.module --@COND_i386_ieee1275_TRUE@am__append_3525 = multiboot2.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_3526 = --@COND_i386_ieee1275_TRUE@am__append_3527 = $(nodist_multiboot2_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_3528 = \ -+@COND_i386_multiboot_TRUE@am__append_3515 = multiboot2.mod -+@COND_i386_multiboot_TRUE@am__append_3516 = multiboot2.marker -+@COND_i386_ieee1275_TRUE@am__append_3517 = multiboot2.module -+@COND_i386_ieee1275_TRUE@am__append_3518 = multiboot2.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_3519 = -+@COND_i386_ieee1275_TRUE@am__append_3520 = $(nodist_multiboot2_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_3521 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_multiboot2_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ multiboot2.marker --@COND_i386_ieee1275_TRUE@am__append_3529 = multiboot2.mod --@COND_i386_ieee1275_TRUE@am__append_3530 = multiboot2.marker --@COND_x86_64_efi_TRUE@am__append_3531 = multiboot2.module --@COND_x86_64_efi_TRUE@am__append_3532 = multiboot2.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_3533 = --@COND_x86_64_efi_TRUE@am__append_3534 = $(nodist_multiboot2_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_3535 = \ -+@COND_i386_ieee1275_TRUE@am__append_3522 = multiboot2.mod -+@COND_i386_ieee1275_TRUE@am__append_3523 = multiboot2.marker -+@COND_x86_64_efi_TRUE@am__append_3524 = multiboot2.module -+@COND_x86_64_efi_TRUE@am__append_3525 = multiboot2.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_3526 = -+@COND_x86_64_efi_TRUE@am__append_3527 = $(nodist_multiboot2_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_3528 = \ - @COND_x86_64_efi_TRUE@ $(nodist_multiboot2_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ multiboot2.marker --@COND_x86_64_efi_TRUE@am__append_3536 = multiboot2.mod --@COND_x86_64_efi_TRUE@am__append_3537 = multiboot2.marker --@COND_i386_xen_pvh_TRUE@am__append_3538 = multiboot2.module --@COND_i386_xen_pvh_TRUE@am__append_3539 = multiboot2.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__append_3540 = --@COND_i386_xen_pvh_TRUE@am__append_3541 = $(nodist_multiboot2_module_SOURCES) --@COND_i386_xen_pvh_TRUE@am__append_3542 = \ -+@COND_x86_64_efi_TRUE@am__append_3529 = multiboot2.mod -+@COND_x86_64_efi_TRUE@am__append_3530 = multiboot2.marker -+@COND_i386_xen_pvh_TRUE@am__append_3531 = multiboot2.module -+@COND_i386_xen_pvh_TRUE@am__append_3532 = multiboot2.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__append_3533 = -+@COND_i386_xen_pvh_TRUE@am__append_3534 = $(nodist_multiboot2_module_SOURCES) -+@COND_i386_xen_pvh_TRUE@am__append_3535 = \ - @COND_i386_xen_pvh_TRUE@ $(nodist_multiboot2_module_SOURCES) \ - @COND_i386_xen_pvh_TRUE@ multiboot2.marker --@COND_i386_xen_pvh_TRUE@am__append_3543 = multiboot2.mod --@COND_i386_xen_pvh_TRUE@am__append_3544 = multiboot2.marker --@COND_mips_loongson_TRUE@am__append_3545 = multiboot2.module --@COND_mips_loongson_TRUE@am__append_3546 = multiboot2.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__append_3547 = --@COND_mips_loongson_TRUE@am__append_3548 = $(nodist_multiboot2_module_SOURCES) --@COND_mips_loongson_TRUE@am__append_3549 = \ -+@COND_i386_xen_pvh_TRUE@am__append_3536 = multiboot2.mod -+@COND_i386_xen_pvh_TRUE@am__append_3537 = multiboot2.marker -+@COND_mips_loongson_TRUE@am__append_3538 = multiboot2.module -+@COND_mips_loongson_TRUE@am__append_3539 = multiboot2.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__append_3540 = -+@COND_mips_loongson_TRUE@am__append_3541 = $(nodist_multiboot2_module_SOURCES) -+@COND_mips_loongson_TRUE@am__append_3542 = \ - @COND_mips_loongson_TRUE@ $(nodist_multiboot2_module_SOURCES) \ - @COND_mips_loongson_TRUE@ multiboot2.marker --@COND_mips_loongson_TRUE@am__append_3550 = multiboot2.mod --@COND_mips_loongson_TRUE@am__append_3551 = multiboot2.marker --@COND_mips_arc_TRUE@am__append_3552 = multiboot2.module --@COND_mips_arc_TRUE@am__append_3553 = multiboot2.module$(EXEEXT) --@COND_mips_arc_TRUE@am__append_3554 = --@COND_mips_arc_TRUE@am__append_3555 = $(nodist_multiboot2_module_SOURCES) --@COND_mips_arc_TRUE@am__append_3556 = \ -+@COND_mips_loongson_TRUE@am__append_3543 = multiboot2.mod -+@COND_mips_loongson_TRUE@am__append_3544 = multiboot2.marker -+@COND_mips_arc_TRUE@am__append_3545 = multiboot2.module -+@COND_mips_arc_TRUE@am__append_3546 = multiboot2.module$(EXEEXT) -+@COND_mips_arc_TRUE@am__append_3547 = -+@COND_mips_arc_TRUE@am__append_3548 = $(nodist_multiboot2_module_SOURCES) -+@COND_mips_arc_TRUE@am__append_3549 = \ - @COND_mips_arc_TRUE@ $(nodist_multiboot2_module_SOURCES) \ - @COND_mips_arc_TRUE@ multiboot2.marker --@COND_mips_arc_TRUE@am__append_3557 = multiboot2.mod --@COND_mips_arc_TRUE@am__append_3558 = multiboot2.marker --@COND_mips_qemu_mips_TRUE@am__append_3559 = multiboot2.module --@COND_mips_qemu_mips_TRUE@am__append_3560 = multiboot2.module$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__append_3561 = --@COND_mips_qemu_mips_TRUE@am__append_3562 = $(nodist_multiboot2_module_SOURCES) --@COND_mips_qemu_mips_TRUE@am__append_3563 = \ -+@COND_mips_arc_TRUE@am__append_3550 = multiboot2.mod -+@COND_mips_arc_TRUE@am__append_3551 = multiboot2.marker -+@COND_mips_qemu_mips_TRUE@am__append_3552 = multiboot2.module -+@COND_mips_qemu_mips_TRUE@am__append_3553 = multiboot2.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__append_3554 = -+@COND_mips_qemu_mips_TRUE@am__append_3555 = $(nodist_multiboot2_module_SOURCES) -+@COND_mips_qemu_mips_TRUE@am__append_3556 = \ - @COND_mips_qemu_mips_TRUE@ $(nodist_multiboot2_module_SOURCES) \ - @COND_mips_qemu_mips_TRUE@ multiboot2.marker --@COND_mips_qemu_mips_TRUE@am__append_3564 = multiboot2.mod --@COND_mips_qemu_mips_TRUE@am__append_3565 = multiboot2.marker --@COND_i386_pc_TRUE@am__append_3566 = multiboot.module --@COND_i386_pc_TRUE@am__append_3567 = multiboot.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__append_3557 = multiboot2.mod -+@COND_mips_qemu_mips_TRUE@am__append_3558 = multiboot2.marker -+@COND_i386_pc_TRUE@am__append_3559 = multiboot.module -+@COND_i386_pc_TRUE@am__append_3560 = multiboot.module$(EXEEXT) - @COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_pvh_FALSE@@COND_x86_64_efi_FALSE@multiboot_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_3568 = loader/multiboot_elfxx.c --@COND_i386_pc_TRUE@am__append_3569 = $(nodist_multiboot_module_SOURCES) --@COND_i386_pc_TRUE@am__append_3570 = \ -+@COND_i386_pc_TRUE@am__append_3561 = loader/multiboot_elfxx.c -+@COND_i386_pc_TRUE@am__append_3562 = $(nodist_multiboot_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_3563 = \ - @COND_i386_pc_TRUE@ $(nodist_multiboot_module_SOURCES) \ - @COND_i386_pc_TRUE@ multiboot.marker --@COND_i386_pc_TRUE@am__append_3571 = multiboot.mod --@COND_i386_pc_TRUE@am__append_3572 = multiboot.marker --@COND_i386_efi_TRUE@am__append_3573 = multiboot.module --@COND_i386_efi_TRUE@am__append_3574 = multiboot.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_3575 = loader/multiboot_elfxx.c --@COND_i386_efi_TRUE@am__append_3576 = $(nodist_multiboot_module_SOURCES) --@COND_i386_efi_TRUE@am__append_3577 = \ -+@COND_i386_pc_TRUE@am__append_3564 = multiboot.mod -+@COND_i386_pc_TRUE@am__append_3565 = multiboot.marker -+@COND_i386_efi_TRUE@am__append_3566 = multiboot.module -+@COND_i386_efi_TRUE@am__append_3567 = multiboot.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_3568 = loader/multiboot_elfxx.c -+@COND_i386_efi_TRUE@am__append_3569 = $(nodist_multiboot_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_3570 = \ - @COND_i386_efi_TRUE@ $(nodist_multiboot_module_SOURCES) \ - @COND_i386_efi_TRUE@ multiboot.marker --@COND_i386_efi_TRUE@am__append_3578 = multiboot.mod --@COND_i386_efi_TRUE@am__append_3579 = multiboot.marker --@COND_i386_qemu_TRUE@am__append_3580 = multiboot.module --@COND_i386_qemu_TRUE@am__append_3581 = multiboot.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_3582 = loader/multiboot_elfxx.c --@COND_i386_qemu_TRUE@am__append_3583 = $(nodist_multiboot_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_3584 = \ -+@COND_i386_efi_TRUE@am__append_3571 = multiboot.mod -+@COND_i386_efi_TRUE@am__append_3572 = multiboot.marker -+@COND_i386_qemu_TRUE@am__append_3573 = multiboot.module -+@COND_i386_qemu_TRUE@am__append_3574 = multiboot.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_3575 = loader/multiboot_elfxx.c -+@COND_i386_qemu_TRUE@am__append_3576 = $(nodist_multiboot_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_3577 = \ - @COND_i386_qemu_TRUE@ $(nodist_multiboot_module_SOURCES) \ - @COND_i386_qemu_TRUE@ multiboot.marker --@COND_i386_qemu_TRUE@am__append_3585 = multiboot.mod --@COND_i386_qemu_TRUE@am__append_3586 = multiboot.marker --@COND_i386_coreboot_TRUE@am__append_3587 = multiboot.module --@COND_i386_coreboot_TRUE@am__append_3588 = multiboot.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_3589 = loader/multiboot_elfxx.c --@COND_i386_coreboot_TRUE@am__append_3590 = $(nodist_multiboot_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_3591 = \ -+@COND_i386_qemu_TRUE@am__append_3578 = multiboot.mod -+@COND_i386_qemu_TRUE@am__append_3579 = multiboot.marker -+@COND_i386_coreboot_TRUE@am__append_3580 = multiboot.module -+@COND_i386_coreboot_TRUE@am__append_3581 = multiboot.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_3582 = loader/multiboot_elfxx.c -+@COND_i386_coreboot_TRUE@am__append_3583 = $(nodist_multiboot_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_3584 = \ - @COND_i386_coreboot_TRUE@ $(nodist_multiboot_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ multiboot.marker --@COND_i386_coreboot_TRUE@am__append_3592 = multiboot.mod --@COND_i386_coreboot_TRUE@am__append_3593 = multiboot.marker --@COND_i386_multiboot_TRUE@am__append_3594 = multiboot.module --@COND_i386_multiboot_TRUE@am__append_3595 = multiboot.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_3596 = loader/multiboot_elfxx.c --@COND_i386_multiboot_TRUE@am__append_3597 = $(nodist_multiboot_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_3598 = \ -+@COND_i386_coreboot_TRUE@am__append_3585 = multiboot.mod -+@COND_i386_coreboot_TRUE@am__append_3586 = multiboot.marker -+@COND_i386_multiboot_TRUE@am__append_3587 = multiboot.module -+@COND_i386_multiboot_TRUE@am__append_3588 = multiboot.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_3589 = loader/multiboot_elfxx.c -+@COND_i386_multiboot_TRUE@am__append_3590 = $(nodist_multiboot_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_3591 = \ - @COND_i386_multiboot_TRUE@ $(nodist_multiboot_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ multiboot.marker --@COND_i386_multiboot_TRUE@am__append_3599 = multiboot.mod --@COND_i386_multiboot_TRUE@am__append_3600 = multiboot.marker --@COND_i386_ieee1275_TRUE@am__append_3601 = multiboot.module --@COND_i386_ieee1275_TRUE@am__append_3602 = multiboot.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_3603 = loader/multiboot_elfxx.c --@COND_i386_ieee1275_TRUE@am__append_3604 = $(nodist_multiboot_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_3605 = \ -+@COND_i386_multiboot_TRUE@am__append_3592 = multiboot.mod -+@COND_i386_multiboot_TRUE@am__append_3593 = multiboot.marker -+@COND_i386_ieee1275_TRUE@am__append_3594 = multiboot.module -+@COND_i386_ieee1275_TRUE@am__append_3595 = multiboot.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_3596 = loader/multiboot_elfxx.c -+@COND_i386_ieee1275_TRUE@am__append_3597 = $(nodist_multiboot_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_3598 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_multiboot_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ multiboot.marker --@COND_i386_ieee1275_TRUE@am__append_3606 = multiboot.mod --@COND_i386_ieee1275_TRUE@am__append_3607 = multiboot.marker --@COND_x86_64_efi_TRUE@am__append_3608 = multiboot.module --@COND_x86_64_efi_TRUE@am__append_3609 = multiboot.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_3610 = loader/multiboot_elfxx.c --@COND_x86_64_efi_TRUE@am__append_3611 = $(nodist_multiboot_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_3612 = \ -+@COND_i386_ieee1275_TRUE@am__append_3599 = multiboot.mod -+@COND_i386_ieee1275_TRUE@am__append_3600 = multiboot.marker -+@COND_x86_64_efi_TRUE@am__append_3601 = multiboot.module -+@COND_x86_64_efi_TRUE@am__append_3602 = multiboot.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_3603 = loader/multiboot_elfxx.c -+@COND_x86_64_efi_TRUE@am__append_3604 = $(nodist_multiboot_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_3605 = \ - @COND_x86_64_efi_TRUE@ $(nodist_multiboot_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ multiboot.marker --@COND_x86_64_efi_TRUE@am__append_3613 = multiboot.mod --@COND_x86_64_efi_TRUE@am__append_3614 = multiboot.marker --@COND_i386_xen_pvh_TRUE@am__append_3615 = multiboot.module --@COND_i386_xen_pvh_TRUE@am__append_3616 = multiboot.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__append_3617 = loader/multiboot_elfxx.c --@COND_i386_xen_pvh_TRUE@am__append_3618 = $(nodist_multiboot_module_SOURCES) --@COND_i386_xen_pvh_TRUE@am__append_3619 = \ -+@COND_x86_64_efi_TRUE@am__append_3606 = multiboot.mod -+@COND_x86_64_efi_TRUE@am__append_3607 = multiboot.marker -+@COND_i386_xen_pvh_TRUE@am__append_3608 = multiboot.module -+@COND_i386_xen_pvh_TRUE@am__append_3609 = multiboot.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__append_3610 = loader/multiboot_elfxx.c -+@COND_i386_xen_pvh_TRUE@am__append_3611 = $(nodist_multiboot_module_SOURCES) -+@COND_i386_xen_pvh_TRUE@am__append_3612 = \ - @COND_i386_xen_pvh_TRUE@ $(nodist_multiboot_module_SOURCES) \ - @COND_i386_xen_pvh_TRUE@ multiboot.marker --@COND_i386_xen_pvh_TRUE@am__append_3620 = multiboot.mod --@COND_i386_xen_pvh_TRUE@am__append_3621 = multiboot.marker --@COND_arm64_efi_TRUE@am__append_3622 = xen_boot.module --@COND_arm64_efi_TRUE@am__append_3623 = xen_boot.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__append_3613 = multiboot.mod -+@COND_i386_xen_pvh_TRUE@am__append_3614 = multiboot.marker -+@COND_arm64_efi_TRUE@am__append_3615 = xen_boot.module -+@COND_arm64_efi_TRUE@am__append_3616 = xen_boot.module$(EXEEXT) - @COND_arm64_efi_FALSE@xen_boot_module_DEPENDENCIES = --@COND_arm64_efi_TRUE@am__append_3624 = --@COND_arm64_efi_TRUE@am__append_3625 = $(nodist_xen_boot_module_SOURCES) --@COND_arm64_efi_TRUE@am__append_3626 = \ -+@COND_arm64_efi_TRUE@am__append_3617 = -+@COND_arm64_efi_TRUE@am__append_3618 = $(nodist_xen_boot_module_SOURCES) -+@COND_arm64_efi_TRUE@am__append_3619 = \ - @COND_arm64_efi_TRUE@ $(nodist_xen_boot_module_SOURCES) \ - @COND_arm64_efi_TRUE@ xen_boot.marker --@COND_arm64_efi_TRUE@am__append_3627 = xen_boot.mod --@COND_arm64_efi_TRUE@am__append_3628 = xen_boot.marker --@COND_i386_pc_TRUE@am__append_3629 = linux.module --@COND_i386_pc_TRUE@am__append_3630 = linux.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__append_3620 = xen_boot.mod -+@COND_arm64_efi_TRUE@am__append_3621 = xen_boot.marker -+@COND_i386_pc_TRUE@am__append_3622 = linux.module -+@COND_i386_pc_TRUE@am__append_3623 = linux.module$(EXEEXT) - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_FALSE@linux_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_3631 = --@COND_i386_pc_TRUE@am__append_3632 = $(nodist_linux_module_SOURCES) --@COND_i386_pc_TRUE@am__append_3633 = $(nodist_linux_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_3624 = -+@COND_i386_pc_TRUE@am__append_3625 = $(nodist_linux_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_3626 = $(nodist_linux_module_SOURCES) \ - @COND_i386_pc_TRUE@ linux.marker --@COND_i386_pc_TRUE@am__append_3634 = linux.mod --@COND_i386_pc_TRUE@am__append_3635 = linux.marker --@COND_i386_efi_TRUE@am__append_3636 = linux.module --@COND_i386_efi_TRUE@am__append_3637 = linux.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_3638 = --@COND_i386_efi_TRUE@am__append_3639 = $(nodist_linux_module_SOURCES) --@COND_i386_efi_TRUE@am__append_3640 = $(nodist_linux_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_3627 = linux.mod -+@COND_i386_pc_TRUE@am__append_3628 = linux.marker -+@COND_i386_efi_TRUE@am__append_3629 = linux.module -+@COND_i386_efi_TRUE@am__append_3630 = linux.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_3631 = -+@COND_i386_efi_TRUE@am__append_3632 = $(nodist_linux_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_3633 = $(nodist_linux_module_SOURCES) \ - @COND_i386_efi_TRUE@ linux.marker --@COND_i386_efi_TRUE@am__append_3641 = linux.mod --@COND_i386_efi_TRUE@am__append_3642 = linux.marker --@COND_i386_qemu_TRUE@am__append_3643 = linux.module --@COND_i386_qemu_TRUE@am__append_3644 = linux.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_3645 = --@COND_i386_qemu_TRUE@am__append_3646 = $(nodist_linux_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_3647 = $(nodist_linux_module_SOURCES) \ -+@COND_i386_efi_TRUE@am__append_3634 = linux.mod -+@COND_i386_efi_TRUE@am__append_3635 = linux.marker -+@COND_i386_qemu_TRUE@am__append_3636 = linux.module -+@COND_i386_qemu_TRUE@am__append_3637 = linux.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_3638 = -+@COND_i386_qemu_TRUE@am__append_3639 = $(nodist_linux_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_3640 = $(nodist_linux_module_SOURCES) \ - @COND_i386_qemu_TRUE@ linux.marker --@COND_i386_qemu_TRUE@am__append_3648 = linux.mod --@COND_i386_qemu_TRUE@am__append_3649 = linux.marker --@COND_i386_coreboot_TRUE@am__append_3650 = linux.module --@COND_i386_coreboot_TRUE@am__append_3651 = linux.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_3652 = --@COND_i386_coreboot_TRUE@am__append_3653 = $(nodist_linux_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_3654 = \ -+@COND_i386_qemu_TRUE@am__append_3641 = linux.mod -+@COND_i386_qemu_TRUE@am__append_3642 = linux.marker -+@COND_i386_coreboot_TRUE@am__append_3643 = linux.module -+@COND_i386_coreboot_TRUE@am__append_3644 = linux.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_3645 = -+@COND_i386_coreboot_TRUE@am__append_3646 = $(nodist_linux_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_3647 = \ - @COND_i386_coreboot_TRUE@ $(nodist_linux_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ linux.marker --@COND_i386_coreboot_TRUE@am__append_3655 = linux.mod --@COND_i386_coreboot_TRUE@am__append_3656 = linux.marker --@COND_i386_multiboot_TRUE@am__append_3657 = linux.module --@COND_i386_multiboot_TRUE@am__append_3658 = linux.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_3659 = --@COND_i386_multiboot_TRUE@am__append_3660 = $(nodist_linux_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_3661 = \ -+@COND_i386_coreboot_TRUE@am__append_3648 = linux.mod -+@COND_i386_coreboot_TRUE@am__append_3649 = linux.marker -+@COND_i386_multiboot_TRUE@am__append_3650 = linux.module -+@COND_i386_multiboot_TRUE@am__append_3651 = linux.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_3652 = -+@COND_i386_multiboot_TRUE@am__append_3653 = $(nodist_linux_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_3654 = \ - @COND_i386_multiboot_TRUE@ $(nodist_linux_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ linux.marker --@COND_i386_multiboot_TRUE@am__append_3662 = linux.mod --@COND_i386_multiboot_TRUE@am__append_3663 = linux.marker --@COND_i386_ieee1275_TRUE@am__append_3664 = linux.module --@COND_i386_ieee1275_TRUE@am__append_3665 = linux.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_3666 = --@COND_i386_ieee1275_TRUE@am__append_3667 = $(nodist_linux_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_3668 = \ -+@COND_i386_multiboot_TRUE@am__append_3655 = linux.mod -+@COND_i386_multiboot_TRUE@am__append_3656 = linux.marker -+@COND_i386_ieee1275_TRUE@am__append_3657 = linux.module -+@COND_i386_ieee1275_TRUE@am__append_3658 = linux.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_3659 = -+@COND_i386_ieee1275_TRUE@am__append_3660 = $(nodist_linux_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_3661 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_linux_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ linux.marker --@COND_i386_ieee1275_TRUE@am__append_3669 = linux.mod --@COND_i386_ieee1275_TRUE@am__append_3670 = linux.marker --@COND_x86_64_efi_TRUE@am__append_3671 = linux.module --@COND_x86_64_efi_TRUE@am__append_3672 = linux.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_3673 = --@COND_x86_64_efi_TRUE@am__append_3674 = $(nodist_linux_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_3675 = \ -+@COND_i386_ieee1275_TRUE@am__append_3662 = linux.mod -+@COND_i386_ieee1275_TRUE@am__append_3663 = linux.marker -+@COND_x86_64_efi_TRUE@am__append_3664 = linux.module -+@COND_x86_64_efi_TRUE@am__append_3665 = linux.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_3666 = -+@COND_x86_64_efi_TRUE@am__append_3667 = $(nodist_linux_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_3668 = \ - @COND_x86_64_efi_TRUE@ $(nodist_linux_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ linux.marker --@COND_x86_64_efi_TRUE@am__append_3676 = linux.mod --@COND_x86_64_efi_TRUE@am__append_3677 = linux.marker --@COND_i386_xen_TRUE@am__append_3678 = linux.module --@COND_i386_xen_TRUE@am__append_3679 = linux.module$(EXEEXT) --@COND_i386_xen_TRUE@am__append_3680 = --@COND_i386_xen_TRUE@am__append_3681 = $(nodist_linux_module_SOURCES) --@COND_i386_xen_TRUE@am__append_3682 = $(nodist_linux_module_SOURCES) \ -+@COND_x86_64_efi_TRUE@am__append_3669 = linux.mod -+@COND_x86_64_efi_TRUE@am__append_3670 = linux.marker -+@COND_i386_xen_TRUE@am__append_3671 = linux.module -+@COND_i386_xen_TRUE@am__append_3672 = linux.module$(EXEEXT) -+@COND_i386_xen_TRUE@am__append_3673 = -+@COND_i386_xen_TRUE@am__append_3674 = $(nodist_linux_module_SOURCES) -+@COND_i386_xen_TRUE@am__append_3675 = $(nodist_linux_module_SOURCES) \ - @COND_i386_xen_TRUE@ linux.marker --@COND_i386_xen_TRUE@am__append_3683 = linux.mod --@COND_i386_xen_TRUE@am__append_3684 = linux.marker --@COND_x86_64_xen_TRUE@am__append_3685 = linux.module --@COND_x86_64_xen_TRUE@am__append_3686 = linux.module$(EXEEXT) --@COND_x86_64_xen_TRUE@am__append_3687 = --@COND_x86_64_xen_TRUE@am__append_3688 = $(nodist_linux_module_SOURCES) --@COND_x86_64_xen_TRUE@am__append_3689 = \ -+@COND_i386_xen_TRUE@am__append_3676 = linux.mod -+@COND_i386_xen_TRUE@am__append_3677 = linux.marker -+@COND_x86_64_xen_TRUE@am__append_3678 = linux.module -+@COND_x86_64_xen_TRUE@am__append_3679 = linux.module$(EXEEXT) -+@COND_x86_64_xen_TRUE@am__append_3680 = -+@COND_x86_64_xen_TRUE@am__append_3681 = $(nodist_linux_module_SOURCES) -+@COND_x86_64_xen_TRUE@am__append_3682 = \ - @COND_x86_64_xen_TRUE@ $(nodist_linux_module_SOURCES) \ - @COND_x86_64_xen_TRUE@ linux.marker --@COND_x86_64_xen_TRUE@am__append_3690 = linux.mod --@COND_x86_64_xen_TRUE@am__append_3691 = linux.marker --@COND_i386_xen_pvh_TRUE@am__append_3692 = linux.module --@COND_i386_xen_pvh_TRUE@am__append_3693 = linux.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__append_3694 = --@COND_i386_xen_pvh_TRUE@am__append_3695 = $(nodist_linux_module_SOURCES) --@COND_i386_xen_pvh_TRUE@am__append_3696 = \ -+@COND_x86_64_xen_TRUE@am__append_3683 = linux.mod -+@COND_x86_64_xen_TRUE@am__append_3684 = linux.marker -+@COND_i386_xen_pvh_TRUE@am__append_3685 = linux.module -+@COND_i386_xen_pvh_TRUE@am__append_3686 = linux.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__append_3687 = -+@COND_i386_xen_pvh_TRUE@am__append_3688 = $(nodist_linux_module_SOURCES) -+@COND_i386_xen_pvh_TRUE@am__append_3689 = \ - @COND_i386_xen_pvh_TRUE@ $(nodist_linux_module_SOURCES) \ - @COND_i386_xen_pvh_TRUE@ linux.marker --@COND_i386_xen_pvh_TRUE@am__append_3697 = linux.mod --@COND_i386_xen_pvh_TRUE@am__append_3698 = linux.marker --@COND_mips_loongson_TRUE@am__append_3699 = linux.module --@COND_mips_loongson_TRUE@am__append_3700 = linux.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__append_3701 = --@COND_mips_loongson_TRUE@am__append_3702 = $(nodist_linux_module_SOURCES) --@COND_mips_loongson_TRUE@am__append_3703 = \ -+@COND_i386_xen_pvh_TRUE@am__append_3690 = linux.mod -+@COND_i386_xen_pvh_TRUE@am__append_3691 = linux.marker -+@COND_mips_loongson_TRUE@am__append_3692 = linux.module -+@COND_mips_loongson_TRUE@am__append_3693 = linux.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__append_3694 = -+@COND_mips_loongson_TRUE@am__append_3695 = $(nodist_linux_module_SOURCES) -+@COND_mips_loongson_TRUE@am__append_3696 = \ - @COND_mips_loongson_TRUE@ $(nodist_linux_module_SOURCES) \ - @COND_mips_loongson_TRUE@ linux.marker --@COND_mips_loongson_TRUE@am__append_3704 = linux.mod --@COND_mips_loongson_TRUE@am__append_3705 = linux.marker --@COND_sparc64_ieee1275_TRUE@am__append_3706 = linux.module --@COND_sparc64_ieee1275_TRUE@am__append_3707 = linux.module$(EXEEXT) --@COND_sparc64_ieee1275_TRUE@am__append_3708 = --@COND_sparc64_ieee1275_TRUE@am__append_3709 = $(nodist_linux_module_SOURCES) --@COND_sparc64_ieee1275_TRUE@am__append_3710 = \ -+@COND_mips_loongson_TRUE@am__append_3697 = linux.mod -+@COND_mips_loongson_TRUE@am__append_3698 = linux.marker -+@COND_sparc64_ieee1275_TRUE@am__append_3699 = linux.module -+@COND_sparc64_ieee1275_TRUE@am__append_3700 = linux.module$(EXEEXT) -+@COND_sparc64_ieee1275_TRUE@am__append_3701 = -+@COND_sparc64_ieee1275_TRUE@am__append_3702 = $(nodist_linux_module_SOURCES) -+@COND_sparc64_ieee1275_TRUE@am__append_3703 = \ - @COND_sparc64_ieee1275_TRUE@ $(nodist_linux_module_SOURCES) \ - @COND_sparc64_ieee1275_TRUE@ linux.marker --@COND_sparc64_ieee1275_TRUE@am__append_3711 = linux.mod --@COND_sparc64_ieee1275_TRUE@am__append_3712 = linux.marker --@COND_powerpc_ieee1275_TRUE@am__append_3713 = linux.module --@COND_powerpc_ieee1275_TRUE@am__append_3714 = linux.module$(EXEEXT) --@COND_powerpc_ieee1275_TRUE@am__append_3715 = --@COND_powerpc_ieee1275_TRUE@am__append_3716 = $(nodist_linux_module_SOURCES) --@COND_powerpc_ieee1275_TRUE@am__append_3717 = \ -+@COND_sparc64_ieee1275_TRUE@am__append_3704 = linux.mod -+@COND_sparc64_ieee1275_TRUE@am__append_3705 = linux.marker -+@COND_powerpc_ieee1275_TRUE@am__append_3706 = linux.module -+@COND_powerpc_ieee1275_TRUE@am__append_3707 = linux.module$(EXEEXT) -+@COND_powerpc_ieee1275_TRUE@am__append_3708 = -+@COND_powerpc_ieee1275_TRUE@am__append_3709 = $(nodist_linux_module_SOURCES) -+@COND_powerpc_ieee1275_TRUE@am__append_3710 = \ - @COND_powerpc_ieee1275_TRUE@ $(nodist_linux_module_SOURCES) \ - @COND_powerpc_ieee1275_TRUE@ linux.marker --@COND_powerpc_ieee1275_TRUE@am__append_3718 = linux.mod --@COND_powerpc_ieee1275_TRUE@am__append_3719 = linux.marker --@COND_mips_arc_TRUE@am__append_3720 = linux.module --@COND_mips_arc_TRUE@am__append_3721 = linux.module$(EXEEXT) --@COND_mips_arc_TRUE@am__append_3722 = --@COND_mips_arc_TRUE@am__append_3723 = $(nodist_linux_module_SOURCES) --@COND_mips_arc_TRUE@am__append_3724 = $(nodist_linux_module_SOURCES) \ -+@COND_powerpc_ieee1275_TRUE@am__append_3711 = linux.mod -+@COND_powerpc_ieee1275_TRUE@am__append_3712 = linux.marker -+@COND_mips_arc_TRUE@am__append_3713 = linux.module -+@COND_mips_arc_TRUE@am__append_3714 = linux.module$(EXEEXT) -+@COND_mips_arc_TRUE@am__append_3715 = -+@COND_mips_arc_TRUE@am__append_3716 = $(nodist_linux_module_SOURCES) -+@COND_mips_arc_TRUE@am__append_3717 = $(nodist_linux_module_SOURCES) \ - @COND_mips_arc_TRUE@ linux.marker --@COND_mips_arc_TRUE@am__append_3725 = linux.mod --@COND_mips_arc_TRUE@am__append_3726 = linux.marker --@COND_ia64_efi_TRUE@am__append_3727 = linux.module --@COND_ia64_efi_TRUE@am__append_3728 = linux.module$(EXEEXT) --@COND_ia64_efi_TRUE@am__append_3729 = --@COND_ia64_efi_TRUE@am__append_3730 = $(nodist_linux_module_SOURCES) --@COND_ia64_efi_TRUE@am__append_3731 = $(nodist_linux_module_SOURCES) \ -+@COND_mips_arc_TRUE@am__append_3718 = linux.mod -+@COND_mips_arc_TRUE@am__append_3719 = linux.marker -+@COND_ia64_efi_TRUE@am__append_3720 = linux.module -+@COND_ia64_efi_TRUE@am__append_3721 = linux.module$(EXEEXT) -+@COND_ia64_efi_TRUE@am__append_3722 = -+@COND_ia64_efi_TRUE@am__append_3723 = $(nodist_linux_module_SOURCES) -+@COND_ia64_efi_TRUE@am__append_3724 = $(nodist_linux_module_SOURCES) \ - @COND_ia64_efi_TRUE@ linux.marker --@COND_ia64_efi_TRUE@am__append_3732 = linux.mod --@COND_ia64_efi_TRUE@am__append_3733 = linux.marker --@COND_mips_qemu_mips_TRUE@am__append_3734 = linux.module --@COND_mips_qemu_mips_TRUE@am__append_3735 = linux.module$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__append_3736 = --@COND_mips_qemu_mips_TRUE@am__append_3737 = $(nodist_linux_module_SOURCES) --@COND_mips_qemu_mips_TRUE@am__append_3738 = \ -+@COND_ia64_efi_TRUE@am__append_3725 = linux.mod -+@COND_ia64_efi_TRUE@am__append_3726 = linux.marker -+@COND_mips_qemu_mips_TRUE@am__append_3727 = linux.module -+@COND_mips_qemu_mips_TRUE@am__append_3728 = linux.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__append_3729 = -+@COND_mips_qemu_mips_TRUE@am__append_3730 = $(nodist_linux_module_SOURCES) -+@COND_mips_qemu_mips_TRUE@am__append_3731 = \ - @COND_mips_qemu_mips_TRUE@ $(nodist_linux_module_SOURCES) \ - @COND_mips_qemu_mips_TRUE@ linux.marker --@COND_mips_qemu_mips_TRUE@am__append_3739 = linux.mod --@COND_mips_qemu_mips_TRUE@am__append_3740 = linux.marker --@COND_arm_uboot_TRUE@am__append_3741 = linux.module --@COND_arm_uboot_TRUE@am__append_3742 = linux.module$(EXEEXT) --@COND_arm_uboot_TRUE@am__append_3743 = --@COND_arm_uboot_TRUE@am__append_3744 = $(nodist_linux_module_SOURCES) --@COND_arm_uboot_TRUE@am__append_3745 = $(nodist_linux_module_SOURCES) \ -+@COND_mips_qemu_mips_TRUE@am__append_3732 = linux.mod -+@COND_mips_qemu_mips_TRUE@am__append_3733 = linux.marker -+@COND_arm_uboot_TRUE@am__append_3734 = linux.module -+@COND_arm_uboot_TRUE@am__append_3735 = linux.module$(EXEEXT) -+@COND_arm_uboot_TRUE@am__append_3736 = -+@COND_arm_uboot_TRUE@am__append_3737 = $(nodist_linux_module_SOURCES) -+@COND_arm_uboot_TRUE@am__append_3738 = $(nodist_linux_module_SOURCES) \ - @COND_arm_uboot_TRUE@ linux.marker --@COND_arm_uboot_TRUE@am__append_3746 = linux.mod --@COND_arm_uboot_TRUE@am__append_3747 = linux.marker --@COND_arm_efi_TRUE@am__append_3748 = linux.module --@COND_arm_efi_TRUE@am__append_3749 = linux.module$(EXEEXT) --@COND_arm_efi_TRUE@am__append_3750 = --@COND_arm_efi_TRUE@am__append_3751 = $(nodist_linux_module_SOURCES) --@COND_arm_efi_TRUE@am__append_3752 = $(nodist_linux_module_SOURCES) \ -+@COND_arm_uboot_TRUE@am__append_3739 = linux.mod -+@COND_arm_uboot_TRUE@am__append_3740 = linux.marker -+@COND_arm_efi_TRUE@am__append_3741 = linux.module -+@COND_arm_efi_TRUE@am__append_3742 = linux.module$(EXEEXT) -+@COND_arm_efi_TRUE@am__append_3743 = -+@COND_arm_efi_TRUE@am__append_3744 = $(nodist_linux_module_SOURCES) -+@COND_arm_efi_TRUE@am__append_3745 = $(nodist_linux_module_SOURCES) \ - @COND_arm_efi_TRUE@ linux.marker --@COND_arm_efi_TRUE@am__append_3753 = linux.mod --@COND_arm_efi_TRUE@am__append_3754 = linux.marker --@COND_arm64_efi_TRUE@am__append_3755 = linux.module --@COND_arm64_efi_TRUE@am__append_3756 = linux.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__append_3757 = --@COND_arm64_efi_TRUE@am__append_3758 = $(nodist_linux_module_SOURCES) --@COND_arm64_efi_TRUE@am__append_3759 = $(nodist_linux_module_SOURCES) \ -+@COND_arm_efi_TRUE@am__append_3746 = linux.mod -+@COND_arm_efi_TRUE@am__append_3747 = linux.marker -+@COND_arm64_efi_TRUE@am__append_3748 = linux.module -+@COND_arm64_efi_TRUE@am__append_3749 = linux.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__append_3750 = -+@COND_arm64_efi_TRUE@am__append_3751 = $(nodist_linux_module_SOURCES) -+@COND_arm64_efi_TRUE@am__append_3752 = $(nodist_linux_module_SOURCES) \ - @COND_arm64_efi_TRUE@ linux.marker --@COND_arm64_efi_TRUE@am__append_3760 = linux.mod --@COND_arm64_efi_TRUE@am__append_3761 = linux.marker --@COND_arm_coreboot_TRUE@am__append_3762 = linux.module --@COND_arm_coreboot_TRUE@am__append_3763 = linux.module$(EXEEXT) --@COND_arm_coreboot_TRUE@am__append_3764 = --@COND_arm_coreboot_TRUE@am__append_3765 = $(nodist_linux_module_SOURCES) --@COND_arm_coreboot_TRUE@am__append_3766 = \ -+@COND_arm64_efi_TRUE@am__append_3753 = linux.mod -+@COND_arm64_efi_TRUE@am__append_3754 = linux.marker -+@COND_arm_coreboot_TRUE@am__append_3755 = linux.module -+@COND_arm_coreboot_TRUE@am__append_3756 = linux.module$(EXEEXT) -+@COND_arm_coreboot_TRUE@am__append_3757 = -+@COND_arm_coreboot_TRUE@am__append_3758 = $(nodist_linux_module_SOURCES) -+@COND_arm_coreboot_TRUE@am__append_3759 = \ - @COND_arm_coreboot_TRUE@ $(nodist_linux_module_SOURCES) \ - @COND_arm_coreboot_TRUE@ linux.marker --@COND_arm_coreboot_TRUE@am__append_3767 = linux.mod --@COND_arm_coreboot_TRUE@am__append_3768 = linux.marker --@COND_riscv32_efi_TRUE@am__append_3769 = linux.module --@COND_riscv32_efi_TRUE@am__append_3770 = linux.module$(EXEEXT) --@COND_riscv32_efi_TRUE@am__append_3771 = --@COND_riscv32_efi_TRUE@am__append_3772 = $(nodist_linux_module_SOURCES) --@COND_riscv32_efi_TRUE@am__append_3773 = \ -+@COND_arm_coreboot_TRUE@am__append_3760 = linux.mod -+@COND_arm_coreboot_TRUE@am__append_3761 = linux.marker -+@COND_riscv32_efi_TRUE@am__append_3762 = linux.module -+@COND_riscv32_efi_TRUE@am__append_3763 = linux.module$(EXEEXT) -+@COND_riscv32_efi_TRUE@am__append_3764 = -+@COND_riscv32_efi_TRUE@am__append_3765 = $(nodist_linux_module_SOURCES) -+@COND_riscv32_efi_TRUE@am__append_3766 = \ - @COND_riscv32_efi_TRUE@ $(nodist_linux_module_SOURCES) \ - @COND_riscv32_efi_TRUE@ linux.marker --@COND_riscv32_efi_TRUE@am__append_3774 = linux.mod --@COND_riscv32_efi_TRUE@am__append_3775 = linux.marker --@COND_riscv64_efi_TRUE@am__append_3776 = linux.module --@COND_riscv64_efi_TRUE@am__append_3777 = linux.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__append_3778 = --@COND_riscv64_efi_TRUE@am__append_3779 = $(nodist_linux_module_SOURCES) --@COND_riscv64_efi_TRUE@am__append_3780 = \ -+@COND_riscv32_efi_TRUE@am__append_3767 = linux.mod -+@COND_riscv32_efi_TRUE@am__append_3768 = linux.marker -+@COND_riscv64_efi_TRUE@am__append_3769 = linux.module -+@COND_riscv64_efi_TRUE@am__append_3770 = linux.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__append_3771 = -+@COND_riscv64_efi_TRUE@am__append_3772 = $(nodist_linux_module_SOURCES) -+@COND_riscv64_efi_TRUE@am__append_3773 = \ - @COND_riscv64_efi_TRUE@ $(nodist_linux_module_SOURCES) \ - @COND_riscv64_efi_TRUE@ linux.marker --@COND_riscv64_efi_TRUE@am__append_3781 = linux.mod --@COND_riscv64_efi_TRUE@am__append_3782 = linux.marker --@COND_arm_uboot_TRUE@am__append_3783 = fdt.module --@COND_arm_uboot_TRUE@am__append_3784 = fdt.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__append_3774 = linux.mod -+@COND_riscv64_efi_TRUE@am__append_3775 = linux.marker -+@COND_arm_uboot_TRUE@am__append_3776 = fdt.module -+@COND_arm_uboot_TRUE@am__append_3777 = fdt.module$(EXEEXT) - @COND_arm64_efi_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@fdt_module_DEPENDENCIES = --@COND_arm_uboot_TRUE@am__append_3785 = --@COND_arm_uboot_TRUE@am__append_3786 = $(nodist_fdt_module_SOURCES) --@COND_arm_uboot_TRUE@am__append_3787 = $(nodist_fdt_module_SOURCES) \ -+@COND_arm_uboot_TRUE@am__append_3778 = -+@COND_arm_uboot_TRUE@am__append_3779 = $(nodist_fdt_module_SOURCES) -+@COND_arm_uboot_TRUE@am__append_3780 = $(nodist_fdt_module_SOURCES) \ - @COND_arm_uboot_TRUE@ fdt.marker --@COND_arm_uboot_TRUE@am__append_3788 = fdt.mod --@COND_arm_uboot_TRUE@am__append_3789 = fdt.marker --@COND_arm_efi_TRUE@am__append_3790 = fdt.module --@COND_arm_efi_TRUE@am__append_3791 = fdt.module$(EXEEXT) --@COND_arm_efi_TRUE@am__append_3792 = --@COND_arm_efi_TRUE@am__append_3793 = $(nodist_fdt_module_SOURCES) --@COND_arm_efi_TRUE@am__append_3794 = $(nodist_fdt_module_SOURCES) \ -+@COND_arm_uboot_TRUE@am__append_3781 = fdt.mod -+@COND_arm_uboot_TRUE@am__append_3782 = fdt.marker -+@COND_arm_efi_TRUE@am__append_3783 = fdt.module -+@COND_arm_efi_TRUE@am__append_3784 = fdt.module$(EXEEXT) -+@COND_arm_efi_TRUE@am__append_3785 = -+@COND_arm_efi_TRUE@am__append_3786 = $(nodist_fdt_module_SOURCES) -+@COND_arm_efi_TRUE@am__append_3787 = $(nodist_fdt_module_SOURCES) \ - @COND_arm_efi_TRUE@ fdt.marker --@COND_arm_efi_TRUE@am__append_3795 = fdt.mod --@COND_arm_efi_TRUE@am__append_3796 = fdt.marker --@COND_arm64_efi_TRUE@am__append_3797 = fdt.module --@COND_arm64_efi_TRUE@am__append_3798 = fdt.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__append_3799 = --@COND_arm64_efi_TRUE@am__append_3800 = $(nodist_fdt_module_SOURCES) --@COND_arm64_efi_TRUE@am__append_3801 = $(nodist_fdt_module_SOURCES) \ -+@COND_arm_efi_TRUE@am__append_3788 = fdt.mod -+@COND_arm_efi_TRUE@am__append_3789 = fdt.marker -+@COND_arm64_efi_TRUE@am__append_3790 = fdt.module -+@COND_arm64_efi_TRUE@am__append_3791 = fdt.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__append_3792 = -+@COND_arm64_efi_TRUE@am__append_3793 = $(nodist_fdt_module_SOURCES) -+@COND_arm64_efi_TRUE@am__append_3794 = $(nodist_fdt_module_SOURCES) \ - @COND_arm64_efi_TRUE@ fdt.marker --@COND_arm64_efi_TRUE@am__append_3802 = fdt.mod --@COND_arm64_efi_TRUE@am__append_3803 = fdt.marker --@COND_riscv32_efi_TRUE@am__append_3804 = fdt.module --@COND_riscv32_efi_TRUE@am__append_3805 = fdt.module$(EXEEXT) --@COND_riscv32_efi_TRUE@am__append_3806 = --@COND_riscv32_efi_TRUE@am__append_3807 = $(nodist_fdt_module_SOURCES) --@COND_riscv32_efi_TRUE@am__append_3808 = $(nodist_fdt_module_SOURCES) \ -+@COND_arm64_efi_TRUE@am__append_3795 = fdt.mod -+@COND_arm64_efi_TRUE@am__append_3796 = fdt.marker -+@COND_riscv32_efi_TRUE@am__append_3797 = fdt.module -+@COND_riscv32_efi_TRUE@am__append_3798 = fdt.module$(EXEEXT) -+@COND_riscv32_efi_TRUE@am__append_3799 = -+@COND_riscv32_efi_TRUE@am__append_3800 = $(nodist_fdt_module_SOURCES) -+@COND_riscv32_efi_TRUE@am__append_3801 = $(nodist_fdt_module_SOURCES) \ - @COND_riscv32_efi_TRUE@ fdt.marker --@COND_riscv32_efi_TRUE@am__append_3809 = fdt.mod --@COND_riscv32_efi_TRUE@am__append_3810 = fdt.marker --@COND_riscv64_efi_TRUE@am__append_3811 = fdt.module --@COND_riscv64_efi_TRUE@am__append_3812 = fdt.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__append_3813 = --@COND_riscv64_efi_TRUE@am__append_3814 = $(nodist_fdt_module_SOURCES) --@COND_riscv64_efi_TRUE@am__append_3815 = $(nodist_fdt_module_SOURCES) \ -+@COND_riscv32_efi_TRUE@am__append_3802 = fdt.mod -+@COND_riscv32_efi_TRUE@am__append_3803 = fdt.marker -+@COND_riscv64_efi_TRUE@am__append_3804 = fdt.module -+@COND_riscv64_efi_TRUE@am__append_3805 = fdt.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__append_3806 = -+@COND_riscv64_efi_TRUE@am__append_3807 = $(nodist_fdt_module_SOURCES) -+@COND_riscv64_efi_TRUE@am__append_3808 = $(nodist_fdt_module_SOURCES) \ - @COND_riscv64_efi_TRUE@ fdt.marker --@COND_riscv64_efi_TRUE@am__append_3816 = fdt.mod --@COND_riscv64_efi_TRUE@am__append_3817 = fdt.marker --@COND_i386_pc_TRUE@am__append_3818 = xnu.module --@COND_i386_pc_TRUE@am__append_3819 = xnu.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__append_3809 = fdt.mod -+@COND_riscv64_efi_TRUE@am__append_3810 = fdt.marker -+@COND_i386_pc_TRUE@am__append_3811 = xnu.module -+@COND_i386_pc_TRUE@am__append_3812 = xnu.module$(EXEEXT) - @COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_x86_64_efi_FALSE@xnu_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_3820 = --@COND_i386_pc_TRUE@am__append_3821 = $(nodist_xnu_module_SOURCES) --@COND_i386_pc_TRUE@am__append_3822 = $(nodist_xnu_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_3813 = -+@COND_i386_pc_TRUE@am__append_3814 = $(nodist_xnu_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_3815 = $(nodist_xnu_module_SOURCES) \ - @COND_i386_pc_TRUE@ xnu.marker --@COND_i386_pc_TRUE@am__append_3823 = xnu.mod --@COND_i386_pc_TRUE@am__append_3824 = xnu.marker --@COND_i386_efi_TRUE@am__append_3825 = xnu.module --@COND_i386_efi_TRUE@am__append_3826 = xnu.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_3827 = --@COND_i386_efi_TRUE@am__append_3828 = $(nodist_xnu_module_SOURCES) --@COND_i386_efi_TRUE@am__append_3829 = $(nodist_xnu_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_3816 = xnu.mod -+@COND_i386_pc_TRUE@am__append_3817 = xnu.marker -+@COND_i386_efi_TRUE@am__append_3818 = xnu.module -+@COND_i386_efi_TRUE@am__append_3819 = xnu.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_3820 = -+@COND_i386_efi_TRUE@am__append_3821 = $(nodist_xnu_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_3822 = $(nodist_xnu_module_SOURCES) \ - @COND_i386_efi_TRUE@ xnu.marker --@COND_i386_efi_TRUE@am__append_3830 = xnu.mod --@COND_i386_efi_TRUE@am__append_3831 = xnu.marker --@COND_i386_coreboot_TRUE@am__append_3832 = xnu.module --@COND_i386_coreboot_TRUE@am__append_3833 = xnu.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_3834 = --@COND_i386_coreboot_TRUE@am__append_3835 = $(nodist_xnu_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_3836 = \ -+@COND_i386_efi_TRUE@am__append_3823 = xnu.mod -+@COND_i386_efi_TRUE@am__append_3824 = xnu.marker -+@COND_i386_coreboot_TRUE@am__append_3825 = xnu.module -+@COND_i386_coreboot_TRUE@am__append_3826 = xnu.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_3827 = -+@COND_i386_coreboot_TRUE@am__append_3828 = $(nodist_xnu_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_3829 = \ - @COND_i386_coreboot_TRUE@ $(nodist_xnu_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ xnu.marker --@COND_i386_coreboot_TRUE@am__append_3837 = xnu.mod --@COND_i386_coreboot_TRUE@am__append_3838 = xnu.marker --@COND_i386_multiboot_TRUE@am__append_3839 = xnu.module --@COND_i386_multiboot_TRUE@am__append_3840 = xnu.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_3841 = --@COND_i386_multiboot_TRUE@am__append_3842 = $(nodist_xnu_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_3843 = \ -+@COND_i386_coreboot_TRUE@am__append_3830 = xnu.mod -+@COND_i386_coreboot_TRUE@am__append_3831 = xnu.marker -+@COND_i386_multiboot_TRUE@am__append_3832 = xnu.module -+@COND_i386_multiboot_TRUE@am__append_3833 = xnu.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_3834 = -+@COND_i386_multiboot_TRUE@am__append_3835 = $(nodist_xnu_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_3836 = \ - @COND_i386_multiboot_TRUE@ $(nodist_xnu_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ xnu.marker --@COND_i386_multiboot_TRUE@am__append_3844 = xnu.mod --@COND_i386_multiboot_TRUE@am__append_3845 = xnu.marker --@COND_x86_64_efi_TRUE@am__append_3846 = xnu.module --@COND_x86_64_efi_TRUE@am__append_3847 = xnu.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_3848 = --@COND_x86_64_efi_TRUE@am__append_3849 = $(nodist_xnu_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_3850 = $(nodist_xnu_module_SOURCES) \ -+@COND_i386_multiboot_TRUE@am__append_3837 = xnu.mod -+@COND_i386_multiboot_TRUE@am__append_3838 = xnu.marker -+@COND_x86_64_efi_TRUE@am__append_3839 = xnu.module -+@COND_x86_64_efi_TRUE@am__append_3840 = xnu.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_3841 = -+@COND_x86_64_efi_TRUE@am__append_3842 = $(nodist_xnu_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_3843 = $(nodist_xnu_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ xnu.marker --@COND_x86_64_efi_TRUE@am__append_3851 = xnu.mod --@COND_x86_64_efi_TRUE@am__append_3852 = xnu.marker --@COND_i386_pc_TRUE@am__append_3853 = random.module --@COND_i386_pc_TRUE@am__append_3854 = random.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_3844 = xnu.mod -+@COND_x86_64_efi_TRUE@am__append_3845 = xnu.marker -+@COND_i386_pc_TRUE@am__append_3846 = random.module -+@COND_i386_pc_TRUE@am__append_3847 = random.module$(EXEEXT) - @COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_x86_64_efi_FALSE@random_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_3855 = --@COND_i386_pc_TRUE@am__append_3856 = $(nodist_random_module_SOURCES) --@COND_i386_pc_TRUE@am__append_3857 = $(nodist_random_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_3848 = -+@COND_i386_pc_TRUE@am__append_3849 = $(nodist_random_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_3850 = $(nodist_random_module_SOURCES) \ - @COND_i386_pc_TRUE@ random.marker --@COND_i386_pc_TRUE@am__append_3858 = random.mod --@COND_i386_pc_TRUE@am__append_3859 = random.marker --@COND_i386_efi_TRUE@am__append_3860 = random.module --@COND_i386_efi_TRUE@am__append_3861 = random.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_3862 = --@COND_i386_efi_TRUE@am__append_3863 = $(nodist_random_module_SOURCES) --@COND_i386_efi_TRUE@am__append_3864 = $(nodist_random_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_3851 = random.mod -+@COND_i386_pc_TRUE@am__append_3852 = random.marker -+@COND_i386_efi_TRUE@am__append_3853 = random.module -+@COND_i386_efi_TRUE@am__append_3854 = random.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_3855 = -+@COND_i386_efi_TRUE@am__append_3856 = $(nodist_random_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_3857 = $(nodist_random_module_SOURCES) \ - @COND_i386_efi_TRUE@ random.marker --@COND_i386_efi_TRUE@am__append_3865 = random.mod --@COND_i386_efi_TRUE@am__append_3866 = random.marker --@COND_i386_coreboot_TRUE@am__append_3867 = random.module --@COND_i386_coreboot_TRUE@am__append_3868 = random.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_3869 = --@COND_i386_coreboot_TRUE@am__append_3870 = $(nodist_random_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_3871 = \ -+@COND_i386_efi_TRUE@am__append_3858 = random.mod -+@COND_i386_efi_TRUE@am__append_3859 = random.marker -+@COND_i386_coreboot_TRUE@am__append_3860 = random.module -+@COND_i386_coreboot_TRUE@am__append_3861 = random.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_3862 = -+@COND_i386_coreboot_TRUE@am__append_3863 = $(nodist_random_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_3864 = \ - @COND_i386_coreboot_TRUE@ $(nodist_random_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ random.marker --@COND_i386_coreboot_TRUE@am__append_3872 = random.mod --@COND_i386_coreboot_TRUE@am__append_3873 = random.marker --@COND_i386_multiboot_TRUE@am__append_3874 = random.module --@COND_i386_multiboot_TRUE@am__append_3875 = random.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_3876 = --@COND_i386_multiboot_TRUE@am__append_3877 = $(nodist_random_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_3878 = \ -+@COND_i386_coreboot_TRUE@am__append_3865 = random.mod -+@COND_i386_coreboot_TRUE@am__append_3866 = random.marker -+@COND_i386_multiboot_TRUE@am__append_3867 = random.module -+@COND_i386_multiboot_TRUE@am__append_3868 = random.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_3869 = -+@COND_i386_multiboot_TRUE@am__append_3870 = $(nodist_random_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_3871 = \ - @COND_i386_multiboot_TRUE@ $(nodist_random_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ random.marker --@COND_i386_multiboot_TRUE@am__append_3879 = random.mod --@COND_i386_multiboot_TRUE@am__append_3880 = random.marker --@COND_x86_64_efi_TRUE@am__append_3881 = random.module --@COND_x86_64_efi_TRUE@am__append_3882 = random.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_3883 = --@COND_x86_64_efi_TRUE@am__append_3884 = $(nodist_random_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_3885 = \ -+@COND_i386_multiboot_TRUE@am__append_3872 = random.mod -+@COND_i386_multiboot_TRUE@am__append_3873 = random.marker -+@COND_x86_64_efi_TRUE@am__append_3874 = random.module -+@COND_x86_64_efi_TRUE@am__append_3875 = random.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_3876 = -+@COND_x86_64_efi_TRUE@am__append_3877 = $(nodist_random_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_3878 = \ - @COND_x86_64_efi_TRUE@ $(nodist_random_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ random.marker --@COND_x86_64_efi_TRUE@am__append_3886 = random.mod --@COND_x86_64_efi_TRUE@am__append_3887 = random.marker --@COND_i386_efi_TRUE@am__append_3888 = appleldr.module --@COND_i386_efi_TRUE@am__append_3889 = appleldr.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_3879 = random.mod -+@COND_x86_64_efi_TRUE@am__append_3880 = random.marker -+@COND_i386_efi_TRUE@am__append_3881 = appleldr.module -+@COND_i386_efi_TRUE@am__append_3882 = appleldr.module$(EXEEXT) - @COND_i386_efi_FALSE@@COND_x86_64_efi_FALSE@appleldr_module_DEPENDENCIES = --@COND_i386_efi_TRUE@am__append_3890 = --@COND_i386_efi_TRUE@am__append_3891 = $(nodist_appleldr_module_SOURCES) --@COND_i386_efi_TRUE@am__append_3892 = \ -+@COND_i386_efi_TRUE@am__append_3883 = -+@COND_i386_efi_TRUE@am__append_3884 = $(nodist_appleldr_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_3885 = \ - @COND_i386_efi_TRUE@ $(nodist_appleldr_module_SOURCES) \ - @COND_i386_efi_TRUE@ appleldr.marker --@COND_i386_efi_TRUE@am__append_3893 = appleldr.mod --@COND_i386_efi_TRUE@am__append_3894 = appleldr.marker --@COND_x86_64_efi_TRUE@am__append_3895 = appleldr.module --@COND_x86_64_efi_TRUE@am__append_3896 = appleldr.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_3897 = --@COND_x86_64_efi_TRUE@am__append_3898 = $(nodist_appleldr_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_3899 = \ -+@COND_i386_efi_TRUE@am__append_3886 = appleldr.mod -+@COND_i386_efi_TRUE@am__append_3887 = appleldr.marker -+@COND_x86_64_efi_TRUE@am__append_3888 = appleldr.module -+@COND_x86_64_efi_TRUE@am__append_3889 = appleldr.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_3890 = -+@COND_x86_64_efi_TRUE@am__append_3891 = $(nodist_appleldr_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_3892 = \ - @COND_x86_64_efi_TRUE@ $(nodist_appleldr_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ appleldr.marker --@COND_x86_64_efi_TRUE@am__append_3900 = appleldr.mod --@COND_x86_64_efi_TRUE@am__append_3901 = appleldr.marker --@COND_i386_pc_TRUE@am__append_3902 = chain.module --@COND_i386_pc_TRUE@am__append_3903 = chain.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_3893 = appleldr.mod -+@COND_x86_64_efi_TRUE@am__append_3894 = appleldr.marker -+@COND_i386_pc_TRUE@am__append_3895 = chain.module -+@COND_i386_pc_TRUE@am__append_3896 = chain.module$(EXEEXT) - @COND_arm64_efi_FALSE@@COND_arm_efi_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_pc_FALSE@@COND_ia64_efi_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_x86_64_efi_FALSE@chain_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_3904 = --@COND_i386_pc_TRUE@am__append_3905 = $(nodist_chain_module_SOURCES) --@COND_i386_pc_TRUE@am__append_3906 = $(nodist_chain_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_3897 = -+@COND_i386_pc_TRUE@am__append_3898 = $(nodist_chain_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_3899 = $(nodist_chain_module_SOURCES) \ - @COND_i386_pc_TRUE@ chain.marker --@COND_i386_pc_TRUE@am__append_3907 = chain.mod --@COND_i386_pc_TRUE@am__append_3908 = chain.marker --@COND_i386_efi_TRUE@am__append_3909 = chain.module --@COND_i386_efi_TRUE@am__append_3910 = chain.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_3911 = --@COND_i386_efi_TRUE@am__append_3912 = $(nodist_chain_module_SOURCES) --@COND_i386_efi_TRUE@am__append_3913 = $(nodist_chain_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_3900 = chain.mod -+@COND_i386_pc_TRUE@am__append_3901 = chain.marker -+@COND_i386_efi_TRUE@am__append_3902 = chain.module -+@COND_i386_efi_TRUE@am__append_3903 = chain.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_3904 = -+@COND_i386_efi_TRUE@am__append_3905 = $(nodist_chain_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_3906 = $(nodist_chain_module_SOURCES) \ - @COND_i386_efi_TRUE@ chain.marker --@COND_i386_efi_TRUE@am__append_3914 = chain.mod --@COND_i386_efi_TRUE@am__append_3915 = chain.marker --@COND_i386_coreboot_TRUE@am__append_3916 = chain.module --@COND_i386_coreboot_TRUE@am__append_3917 = chain.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_3918 = --@COND_i386_coreboot_TRUE@am__append_3919 = $(nodist_chain_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_3920 = \ -+@COND_i386_efi_TRUE@am__append_3907 = chain.mod -+@COND_i386_efi_TRUE@am__append_3908 = chain.marker -+@COND_i386_coreboot_TRUE@am__append_3909 = chain.module -+@COND_i386_coreboot_TRUE@am__append_3910 = chain.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_3911 = -+@COND_i386_coreboot_TRUE@am__append_3912 = $(nodist_chain_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_3913 = \ - @COND_i386_coreboot_TRUE@ $(nodist_chain_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ chain.marker --@COND_i386_coreboot_TRUE@am__append_3921 = chain.mod --@COND_i386_coreboot_TRUE@am__append_3922 = chain.marker --@COND_x86_64_efi_TRUE@am__append_3923 = chain.module --@COND_x86_64_efi_TRUE@am__append_3924 = chain.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_3925 = --@COND_x86_64_efi_TRUE@am__append_3926 = $(nodist_chain_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_3927 = \ -+@COND_i386_coreboot_TRUE@am__append_3914 = chain.mod -+@COND_i386_coreboot_TRUE@am__append_3915 = chain.marker -+@COND_x86_64_efi_TRUE@am__append_3916 = chain.module -+@COND_x86_64_efi_TRUE@am__append_3917 = chain.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_3918 = -+@COND_x86_64_efi_TRUE@am__append_3919 = $(nodist_chain_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_3920 = \ - @COND_x86_64_efi_TRUE@ $(nodist_chain_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ chain.marker --@COND_x86_64_efi_TRUE@am__append_3928 = chain.mod --@COND_x86_64_efi_TRUE@am__append_3929 = chain.marker --@COND_ia64_efi_TRUE@am__append_3930 = chain.module --@COND_ia64_efi_TRUE@am__append_3931 = chain.module$(EXEEXT) --@COND_ia64_efi_TRUE@am__append_3932 = --@COND_ia64_efi_TRUE@am__append_3933 = $(nodist_chain_module_SOURCES) --@COND_ia64_efi_TRUE@am__append_3934 = $(nodist_chain_module_SOURCES) \ -+@COND_x86_64_efi_TRUE@am__append_3921 = chain.mod -+@COND_x86_64_efi_TRUE@am__append_3922 = chain.marker -+@COND_ia64_efi_TRUE@am__append_3923 = chain.module -+@COND_ia64_efi_TRUE@am__append_3924 = chain.module$(EXEEXT) -+@COND_ia64_efi_TRUE@am__append_3925 = -+@COND_ia64_efi_TRUE@am__append_3926 = $(nodist_chain_module_SOURCES) -+@COND_ia64_efi_TRUE@am__append_3927 = $(nodist_chain_module_SOURCES) \ - @COND_ia64_efi_TRUE@ chain.marker --@COND_ia64_efi_TRUE@am__append_3935 = chain.mod --@COND_ia64_efi_TRUE@am__append_3936 = chain.marker --@COND_arm_efi_TRUE@am__append_3937 = chain.module --@COND_arm_efi_TRUE@am__append_3938 = chain.module$(EXEEXT) --@COND_arm_efi_TRUE@am__append_3939 = --@COND_arm_efi_TRUE@am__append_3940 = $(nodist_chain_module_SOURCES) --@COND_arm_efi_TRUE@am__append_3941 = $(nodist_chain_module_SOURCES) \ -+@COND_ia64_efi_TRUE@am__append_3928 = chain.mod -+@COND_ia64_efi_TRUE@am__append_3929 = chain.marker -+@COND_arm_efi_TRUE@am__append_3930 = chain.module -+@COND_arm_efi_TRUE@am__append_3931 = chain.module$(EXEEXT) -+@COND_arm_efi_TRUE@am__append_3932 = -+@COND_arm_efi_TRUE@am__append_3933 = $(nodist_chain_module_SOURCES) -+@COND_arm_efi_TRUE@am__append_3934 = $(nodist_chain_module_SOURCES) \ - @COND_arm_efi_TRUE@ chain.marker --@COND_arm_efi_TRUE@am__append_3942 = chain.mod --@COND_arm_efi_TRUE@am__append_3943 = chain.marker --@COND_arm64_efi_TRUE@am__append_3944 = chain.module --@COND_arm64_efi_TRUE@am__append_3945 = chain.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__append_3946 = --@COND_arm64_efi_TRUE@am__append_3947 = $(nodist_chain_module_SOURCES) --@COND_arm64_efi_TRUE@am__append_3948 = $(nodist_chain_module_SOURCES) \ -+@COND_arm_efi_TRUE@am__append_3935 = chain.mod -+@COND_arm_efi_TRUE@am__append_3936 = chain.marker -+@COND_arm64_efi_TRUE@am__append_3937 = chain.module -+@COND_arm64_efi_TRUE@am__append_3938 = chain.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__append_3939 = -+@COND_arm64_efi_TRUE@am__append_3940 = $(nodist_chain_module_SOURCES) -+@COND_arm64_efi_TRUE@am__append_3941 = $(nodist_chain_module_SOURCES) \ - @COND_arm64_efi_TRUE@ chain.marker --@COND_arm64_efi_TRUE@am__append_3949 = chain.mod --@COND_arm64_efi_TRUE@am__append_3950 = chain.marker --@COND_riscv32_efi_TRUE@am__append_3951 = chain.module --@COND_riscv32_efi_TRUE@am__append_3952 = chain.module$(EXEEXT) --@COND_riscv32_efi_TRUE@am__append_3953 = --@COND_riscv32_efi_TRUE@am__append_3954 = $(nodist_chain_module_SOURCES) --@COND_riscv32_efi_TRUE@am__append_3955 = \ -+@COND_arm64_efi_TRUE@am__append_3942 = chain.mod -+@COND_arm64_efi_TRUE@am__append_3943 = chain.marker -+@COND_riscv32_efi_TRUE@am__append_3944 = chain.module -+@COND_riscv32_efi_TRUE@am__append_3945 = chain.module$(EXEEXT) -+@COND_riscv32_efi_TRUE@am__append_3946 = -+@COND_riscv32_efi_TRUE@am__append_3947 = $(nodist_chain_module_SOURCES) -+@COND_riscv32_efi_TRUE@am__append_3948 = \ - @COND_riscv32_efi_TRUE@ $(nodist_chain_module_SOURCES) \ - @COND_riscv32_efi_TRUE@ chain.marker --@COND_riscv32_efi_TRUE@am__append_3956 = chain.mod --@COND_riscv32_efi_TRUE@am__append_3957 = chain.marker --@COND_riscv64_efi_TRUE@am__append_3958 = chain.module --@COND_riscv64_efi_TRUE@am__append_3959 = chain.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__append_3960 = --@COND_riscv64_efi_TRUE@am__append_3961 = $(nodist_chain_module_SOURCES) --@COND_riscv64_efi_TRUE@am__append_3962 = \ -+@COND_riscv32_efi_TRUE@am__append_3949 = chain.mod -+@COND_riscv32_efi_TRUE@am__append_3950 = chain.marker -+@COND_riscv64_efi_TRUE@am__append_3951 = chain.module -+@COND_riscv64_efi_TRUE@am__append_3952 = chain.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__append_3953 = -+@COND_riscv64_efi_TRUE@am__append_3954 = $(nodist_chain_module_SOURCES) -+@COND_riscv64_efi_TRUE@am__append_3955 = \ - @COND_riscv64_efi_TRUE@ $(nodist_chain_module_SOURCES) \ - @COND_riscv64_efi_TRUE@ chain.marker --@COND_riscv64_efi_TRUE@am__append_3963 = chain.mod --@COND_riscv64_efi_TRUE@am__append_3964 = chain.marker --@COND_i386_pc_TRUE@am__append_3965 = mmap.module --@COND_i386_pc_TRUE@am__append_3966 = mmap.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__append_3956 = chain.mod -+@COND_riscv64_efi_TRUE@am__append_3957 = chain.marker -+@COND_i386_pc_TRUE@am__append_3958 = mmap.module -+@COND_i386_pc_TRUE@am__append_3959 = mmap.module$(EXEEXT) - @COND_arm64_efi_FALSE@@COND_arm_efi_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_x86_64_efi_FALSE@mmap_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_3967 = --@COND_i386_pc_TRUE@am__append_3968 = $(nodist_mmap_module_SOURCES) --@COND_i386_pc_TRUE@am__append_3969 = $(nodist_mmap_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_3960 = -+@COND_i386_pc_TRUE@am__append_3961 = $(nodist_mmap_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_3962 = $(nodist_mmap_module_SOURCES) \ - @COND_i386_pc_TRUE@ mmap.marker --@COND_i386_pc_TRUE@am__append_3970 = mmap.mod --@COND_i386_pc_TRUE@am__append_3971 = mmap.marker --@COND_i386_efi_TRUE@am__append_3972 = mmap.module --@COND_i386_efi_TRUE@am__append_3973 = mmap.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_3974 = --@COND_i386_efi_TRUE@am__append_3975 = $(nodist_mmap_module_SOURCES) --@COND_i386_efi_TRUE@am__append_3976 = $(nodist_mmap_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_3963 = mmap.mod -+@COND_i386_pc_TRUE@am__append_3964 = mmap.marker -+@COND_i386_efi_TRUE@am__append_3965 = mmap.module -+@COND_i386_efi_TRUE@am__append_3966 = mmap.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_3967 = -+@COND_i386_efi_TRUE@am__append_3968 = $(nodist_mmap_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_3969 = $(nodist_mmap_module_SOURCES) \ - @COND_i386_efi_TRUE@ mmap.marker --@COND_i386_efi_TRUE@am__append_3977 = mmap.mod --@COND_i386_efi_TRUE@am__append_3978 = mmap.marker --@COND_i386_qemu_TRUE@am__append_3979 = mmap.module --@COND_i386_qemu_TRUE@am__append_3980 = mmap.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_3981 = --@COND_i386_qemu_TRUE@am__append_3982 = $(nodist_mmap_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_3983 = $(nodist_mmap_module_SOURCES) \ -+@COND_i386_efi_TRUE@am__append_3970 = mmap.mod -+@COND_i386_efi_TRUE@am__append_3971 = mmap.marker -+@COND_i386_qemu_TRUE@am__append_3972 = mmap.module -+@COND_i386_qemu_TRUE@am__append_3973 = mmap.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_3974 = -+@COND_i386_qemu_TRUE@am__append_3975 = $(nodist_mmap_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_3976 = $(nodist_mmap_module_SOURCES) \ - @COND_i386_qemu_TRUE@ mmap.marker --@COND_i386_qemu_TRUE@am__append_3984 = mmap.mod --@COND_i386_qemu_TRUE@am__append_3985 = mmap.marker --@COND_i386_coreboot_TRUE@am__append_3986 = mmap.module --@COND_i386_coreboot_TRUE@am__append_3987 = mmap.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_3988 = --@COND_i386_coreboot_TRUE@am__append_3989 = $(nodist_mmap_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_3990 = \ -+@COND_i386_qemu_TRUE@am__append_3977 = mmap.mod -+@COND_i386_qemu_TRUE@am__append_3978 = mmap.marker -+@COND_i386_coreboot_TRUE@am__append_3979 = mmap.module -+@COND_i386_coreboot_TRUE@am__append_3980 = mmap.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_3981 = -+@COND_i386_coreboot_TRUE@am__append_3982 = $(nodist_mmap_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_3983 = \ - @COND_i386_coreboot_TRUE@ $(nodist_mmap_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ mmap.marker --@COND_i386_coreboot_TRUE@am__append_3991 = mmap.mod --@COND_i386_coreboot_TRUE@am__append_3992 = mmap.marker --@COND_i386_multiboot_TRUE@am__append_3993 = mmap.module --@COND_i386_multiboot_TRUE@am__append_3994 = mmap.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_3995 = --@COND_i386_multiboot_TRUE@am__append_3996 = $(nodist_mmap_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_3997 = \ -+@COND_i386_coreboot_TRUE@am__append_3984 = mmap.mod -+@COND_i386_coreboot_TRUE@am__append_3985 = mmap.marker -+@COND_i386_multiboot_TRUE@am__append_3986 = mmap.module -+@COND_i386_multiboot_TRUE@am__append_3987 = mmap.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_3988 = -+@COND_i386_multiboot_TRUE@am__append_3989 = $(nodist_mmap_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_3990 = \ - @COND_i386_multiboot_TRUE@ $(nodist_mmap_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ mmap.marker --@COND_i386_multiboot_TRUE@am__append_3998 = mmap.mod --@COND_i386_multiboot_TRUE@am__append_3999 = mmap.marker --@COND_i386_ieee1275_TRUE@am__append_4000 = mmap.module --@COND_i386_ieee1275_TRUE@am__append_4001 = mmap.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_4002 = --@COND_i386_ieee1275_TRUE@am__append_4003 = $(nodist_mmap_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_4004 = \ -+@COND_i386_multiboot_TRUE@am__append_3991 = mmap.mod -+@COND_i386_multiboot_TRUE@am__append_3992 = mmap.marker -+@COND_i386_ieee1275_TRUE@am__append_3993 = mmap.module -+@COND_i386_ieee1275_TRUE@am__append_3994 = mmap.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_3995 = -+@COND_i386_ieee1275_TRUE@am__append_3996 = $(nodist_mmap_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_3997 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_mmap_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ mmap.marker --@COND_i386_ieee1275_TRUE@am__append_4005 = mmap.mod --@COND_i386_ieee1275_TRUE@am__append_4006 = mmap.marker --@COND_x86_64_efi_TRUE@am__append_4007 = mmap.module --@COND_x86_64_efi_TRUE@am__append_4008 = mmap.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_4009 = --@COND_x86_64_efi_TRUE@am__append_4010 = $(nodist_mmap_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_4011 = $(nodist_mmap_module_SOURCES) \ -+@COND_i386_ieee1275_TRUE@am__append_3998 = mmap.mod -+@COND_i386_ieee1275_TRUE@am__append_3999 = mmap.marker -+@COND_x86_64_efi_TRUE@am__append_4000 = mmap.module -+@COND_x86_64_efi_TRUE@am__append_4001 = mmap.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_4002 = -+@COND_x86_64_efi_TRUE@am__append_4003 = $(nodist_mmap_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_4004 = $(nodist_mmap_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ mmap.marker --@COND_x86_64_efi_TRUE@am__append_4012 = mmap.mod --@COND_x86_64_efi_TRUE@am__append_4013 = mmap.marker --@COND_i386_xen_pvh_TRUE@am__append_4014 = mmap.module --@COND_i386_xen_pvh_TRUE@am__append_4015 = mmap.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__append_4016 = --@COND_i386_xen_pvh_TRUE@am__append_4017 = $(nodist_mmap_module_SOURCES) --@COND_i386_xen_pvh_TRUE@am__append_4018 = \ -+@COND_x86_64_efi_TRUE@am__append_4005 = mmap.mod -+@COND_x86_64_efi_TRUE@am__append_4006 = mmap.marker -+@COND_i386_xen_pvh_TRUE@am__append_4007 = mmap.module -+@COND_i386_xen_pvh_TRUE@am__append_4008 = mmap.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__append_4009 = -+@COND_i386_xen_pvh_TRUE@am__append_4010 = $(nodist_mmap_module_SOURCES) -+@COND_i386_xen_pvh_TRUE@am__append_4011 = \ - @COND_i386_xen_pvh_TRUE@ $(nodist_mmap_module_SOURCES) \ - @COND_i386_xen_pvh_TRUE@ mmap.marker --@COND_i386_xen_pvh_TRUE@am__append_4019 = mmap.mod --@COND_i386_xen_pvh_TRUE@am__append_4020 = mmap.marker --@COND_mips_loongson_TRUE@am__append_4021 = mmap.module --@COND_mips_loongson_TRUE@am__append_4022 = mmap.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__append_4023 = --@COND_mips_loongson_TRUE@am__append_4024 = $(nodist_mmap_module_SOURCES) --@COND_mips_loongson_TRUE@am__append_4025 = \ -+@COND_i386_xen_pvh_TRUE@am__append_4012 = mmap.mod -+@COND_i386_xen_pvh_TRUE@am__append_4013 = mmap.marker -+@COND_mips_loongson_TRUE@am__append_4014 = mmap.module -+@COND_mips_loongson_TRUE@am__append_4015 = mmap.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__append_4016 = -+@COND_mips_loongson_TRUE@am__append_4017 = $(nodist_mmap_module_SOURCES) -+@COND_mips_loongson_TRUE@am__append_4018 = \ - @COND_mips_loongson_TRUE@ $(nodist_mmap_module_SOURCES) \ - @COND_mips_loongson_TRUE@ mmap.marker --@COND_mips_loongson_TRUE@am__append_4026 = mmap.mod --@COND_mips_loongson_TRUE@am__append_4027 = mmap.marker --@COND_mips_arc_TRUE@am__append_4028 = mmap.module --@COND_mips_arc_TRUE@am__append_4029 = mmap.module$(EXEEXT) --@COND_mips_arc_TRUE@am__append_4030 = --@COND_mips_arc_TRUE@am__append_4031 = $(nodist_mmap_module_SOURCES) --@COND_mips_arc_TRUE@am__append_4032 = $(nodist_mmap_module_SOURCES) \ -+@COND_mips_loongson_TRUE@am__append_4019 = mmap.mod -+@COND_mips_loongson_TRUE@am__append_4020 = mmap.marker -+@COND_mips_arc_TRUE@am__append_4021 = mmap.module -+@COND_mips_arc_TRUE@am__append_4022 = mmap.module$(EXEEXT) -+@COND_mips_arc_TRUE@am__append_4023 = -+@COND_mips_arc_TRUE@am__append_4024 = $(nodist_mmap_module_SOURCES) -+@COND_mips_arc_TRUE@am__append_4025 = $(nodist_mmap_module_SOURCES) \ - @COND_mips_arc_TRUE@ mmap.marker --@COND_mips_arc_TRUE@am__append_4033 = mmap.mod --@COND_mips_arc_TRUE@am__append_4034 = mmap.marker --@COND_ia64_efi_TRUE@am__append_4035 = mmap.module --@COND_ia64_efi_TRUE@am__append_4036 = mmap.module$(EXEEXT) --@COND_ia64_efi_TRUE@am__append_4037 = --@COND_ia64_efi_TRUE@am__append_4038 = $(nodist_mmap_module_SOURCES) --@COND_ia64_efi_TRUE@am__append_4039 = $(nodist_mmap_module_SOURCES) \ -+@COND_mips_arc_TRUE@am__append_4026 = mmap.mod -+@COND_mips_arc_TRUE@am__append_4027 = mmap.marker -+@COND_ia64_efi_TRUE@am__append_4028 = mmap.module -+@COND_ia64_efi_TRUE@am__append_4029 = mmap.module$(EXEEXT) -+@COND_ia64_efi_TRUE@am__append_4030 = -+@COND_ia64_efi_TRUE@am__append_4031 = $(nodist_mmap_module_SOURCES) -+@COND_ia64_efi_TRUE@am__append_4032 = $(nodist_mmap_module_SOURCES) \ - @COND_ia64_efi_TRUE@ mmap.marker --@COND_ia64_efi_TRUE@am__append_4040 = mmap.mod --@COND_ia64_efi_TRUE@am__append_4041 = mmap.marker --@COND_mips_qemu_mips_TRUE@am__append_4042 = mmap.module --@COND_mips_qemu_mips_TRUE@am__append_4043 = mmap.module$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__append_4044 = --@COND_mips_qemu_mips_TRUE@am__append_4045 = $(nodist_mmap_module_SOURCES) --@COND_mips_qemu_mips_TRUE@am__append_4046 = \ -+@COND_ia64_efi_TRUE@am__append_4033 = mmap.mod -+@COND_ia64_efi_TRUE@am__append_4034 = mmap.marker -+@COND_mips_qemu_mips_TRUE@am__append_4035 = mmap.module -+@COND_mips_qemu_mips_TRUE@am__append_4036 = mmap.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__append_4037 = -+@COND_mips_qemu_mips_TRUE@am__append_4038 = $(nodist_mmap_module_SOURCES) -+@COND_mips_qemu_mips_TRUE@am__append_4039 = \ - @COND_mips_qemu_mips_TRUE@ $(nodist_mmap_module_SOURCES) \ - @COND_mips_qemu_mips_TRUE@ mmap.marker --@COND_mips_qemu_mips_TRUE@am__append_4047 = mmap.mod --@COND_mips_qemu_mips_TRUE@am__append_4048 = mmap.marker --@COND_arm_efi_TRUE@am__append_4049 = mmap.module --@COND_arm_efi_TRUE@am__append_4050 = mmap.module$(EXEEXT) --@COND_arm_efi_TRUE@am__append_4051 = --@COND_arm_efi_TRUE@am__append_4052 = $(nodist_mmap_module_SOURCES) --@COND_arm_efi_TRUE@am__append_4053 = $(nodist_mmap_module_SOURCES) \ -+@COND_mips_qemu_mips_TRUE@am__append_4040 = mmap.mod -+@COND_mips_qemu_mips_TRUE@am__append_4041 = mmap.marker -+@COND_arm_efi_TRUE@am__append_4042 = mmap.module -+@COND_arm_efi_TRUE@am__append_4043 = mmap.module$(EXEEXT) -+@COND_arm_efi_TRUE@am__append_4044 = -+@COND_arm_efi_TRUE@am__append_4045 = $(nodist_mmap_module_SOURCES) -+@COND_arm_efi_TRUE@am__append_4046 = $(nodist_mmap_module_SOURCES) \ - @COND_arm_efi_TRUE@ mmap.marker --@COND_arm_efi_TRUE@am__append_4054 = mmap.mod --@COND_arm_efi_TRUE@am__append_4055 = mmap.marker --@COND_arm64_efi_TRUE@am__append_4056 = mmap.module --@COND_arm64_efi_TRUE@am__append_4057 = mmap.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__append_4058 = --@COND_arm64_efi_TRUE@am__append_4059 = $(nodist_mmap_module_SOURCES) --@COND_arm64_efi_TRUE@am__append_4060 = $(nodist_mmap_module_SOURCES) \ -+@COND_arm_efi_TRUE@am__append_4047 = mmap.mod -+@COND_arm_efi_TRUE@am__append_4048 = mmap.marker -+@COND_arm64_efi_TRUE@am__append_4049 = mmap.module -+@COND_arm64_efi_TRUE@am__append_4050 = mmap.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__append_4051 = -+@COND_arm64_efi_TRUE@am__append_4052 = $(nodist_mmap_module_SOURCES) -+@COND_arm64_efi_TRUE@am__append_4053 = $(nodist_mmap_module_SOURCES) \ - @COND_arm64_efi_TRUE@ mmap.marker --@COND_arm64_efi_TRUE@am__append_4061 = mmap.mod --@COND_arm64_efi_TRUE@am__append_4062 = mmap.marker --@COND_riscv32_efi_TRUE@am__append_4063 = mmap.module --@COND_riscv32_efi_TRUE@am__append_4064 = mmap.module$(EXEEXT) --@COND_riscv32_efi_TRUE@am__append_4065 = --@COND_riscv32_efi_TRUE@am__append_4066 = $(nodist_mmap_module_SOURCES) --@COND_riscv32_efi_TRUE@am__append_4067 = \ -+@COND_arm64_efi_TRUE@am__append_4054 = mmap.mod -+@COND_arm64_efi_TRUE@am__append_4055 = mmap.marker -+@COND_riscv32_efi_TRUE@am__append_4056 = mmap.module -+@COND_riscv32_efi_TRUE@am__append_4057 = mmap.module$(EXEEXT) -+@COND_riscv32_efi_TRUE@am__append_4058 = -+@COND_riscv32_efi_TRUE@am__append_4059 = $(nodist_mmap_module_SOURCES) -+@COND_riscv32_efi_TRUE@am__append_4060 = \ - @COND_riscv32_efi_TRUE@ $(nodist_mmap_module_SOURCES) \ - @COND_riscv32_efi_TRUE@ mmap.marker --@COND_riscv32_efi_TRUE@am__append_4068 = mmap.mod --@COND_riscv32_efi_TRUE@am__append_4069 = mmap.marker --@COND_riscv64_efi_TRUE@am__append_4070 = mmap.module --@COND_riscv64_efi_TRUE@am__append_4071 = mmap.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__append_4072 = --@COND_riscv64_efi_TRUE@am__append_4073 = $(nodist_mmap_module_SOURCES) --@COND_riscv64_efi_TRUE@am__append_4074 = \ -+@COND_riscv32_efi_TRUE@am__append_4061 = mmap.mod -+@COND_riscv32_efi_TRUE@am__append_4062 = mmap.marker -+@COND_riscv64_efi_TRUE@am__append_4063 = mmap.module -+@COND_riscv64_efi_TRUE@am__append_4064 = mmap.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__append_4065 = -+@COND_riscv64_efi_TRUE@am__append_4066 = $(nodist_mmap_module_SOURCES) -+@COND_riscv64_efi_TRUE@am__append_4067 = \ - @COND_riscv64_efi_TRUE@ $(nodist_mmap_module_SOURCES) \ - @COND_riscv64_efi_TRUE@ mmap.marker --@COND_riscv64_efi_TRUE@am__append_4075 = mmap.mod --@COND_riscv64_efi_TRUE@am__append_4076 = mmap.marker --@COND_i386_pc_TRUE@am__append_4077 = at_keyboard.module --@COND_i386_pc_TRUE@am__append_4078 = at_keyboard.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__append_4068 = mmap.mod -+@COND_riscv64_efi_TRUE@am__append_4069 = mmap.marker -+@COND_i386_pc_TRUE@am__append_4070 = at_keyboard.module -+@COND_i386_pc_TRUE@am__append_4071 = at_keyboard.module$(EXEEXT) - @COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_x86_64_efi_FALSE@at_keyboard_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_4079 = --@COND_i386_pc_TRUE@am__append_4080 = $(nodist_at_keyboard_module_SOURCES) --@COND_i386_pc_TRUE@am__append_4081 = \ -+@COND_i386_pc_TRUE@am__append_4072 = -+@COND_i386_pc_TRUE@am__append_4073 = $(nodist_at_keyboard_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_4074 = \ - @COND_i386_pc_TRUE@ $(nodist_at_keyboard_module_SOURCES) \ - @COND_i386_pc_TRUE@ at_keyboard.marker --@COND_i386_pc_TRUE@am__append_4082 = at_keyboard.mod --@COND_i386_pc_TRUE@am__append_4083 = at_keyboard.marker --@COND_i386_efi_TRUE@am__append_4084 = at_keyboard.module --@COND_i386_efi_TRUE@am__append_4085 = at_keyboard.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_4086 = --@COND_i386_efi_TRUE@am__append_4087 = $(nodist_at_keyboard_module_SOURCES) --@COND_i386_efi_TRUE@am__append_4088 = \ -+@COND_i386_pc_TRUE@am__append_4075 = at_keyboard.mod -+@COND_i386_pc_TRUE@am__append_4076 = at_keyboard.marker -+@COND_i386_efi_TRUE@am__append_4077 = at_keyboard.module -+@COND_i386_efi_TRUE@am__append_4078 = at_keyboard.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_4079 = -+@COND_i386_efi_TRUE@am__append_4080 = $(nodist_at_keyboard_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_4081 = \ - @COND_i386_efi_TRUE@ $(nodist_at_keyboard_module_SOURCES) \ - @COND_i386_efi_TRUE@ at_keyboard.marker --@COND_i386_efi_TRUE@am__append_4089 = at_keyboard.mod --@COND_i386_efi_TRUE@am__append_4090 = at_keyboard.marker --@COND_i386_qemu_TRUE@am__append_4091 = at_keyboard.module --@COND_i386_qemu_TRUE@am__append_4092 = at_keyboard.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_4093 = --@COND_i386_qemu_TRUE@am__append_4094 = $(nodist_at_keyboard_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_4095 = \ -+@COND_i386_efi_TRUE@am__append_4082 = at_keyboard.mod -+@COND_i386_efi_TRUE@am__append_4083 = at_keyboard.marker -+@COND_i386_qemu_TRUE@am__append_4084 = at_keyboard.module -+@COND_i386_qemu_TRUE@am__append_4085 = at_keyboard.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_4086 = -+@COND_i386_qemu_TRUE@am__append_4087 = $(nodist_at_keyboard_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_4088 = \ - @COND_i386_qemu_TRUE@ $(nodist_at_keyboard_module_SOURCES) \ - @COND_i386_qemu_TRUE@ at_keyboard.marker --@COND_i386_qemu_TRUE@am__append_4096 = at_keyboard.mod --@COND_i386_qemu_TRUE@am__append_4097 = at_keyboard.marker --@COND_i386_coreboot_TRUE@am__append_4098 = at_keyboard.module --@COND_i386_coreboot_TRUE@am__append_4099 = at_keyboard.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_4100 = --@COND_i386_coreboot_TRUE@am__append_4101 = $(nodist_at_keyboard_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_4102 = \ -+@COND_i386_qemu_TRUE@am__append_4089 = at_keyboard.mod -+@COND_i386_qemu_TRUE@am__append_4090 = at_keyboard.marker -+@COND_i386_coreboot_TRUE@am__append_4091 = at_keyboard.module -+@COND_i386_coreboot_TRUE@am__append_4092 = at_keyboard.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_4093 = -+@COND_i386_coreboot_TRUE@am__append_4094 = $(nodist_at_keyboard_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_4095 = \ - @COND_i386_coreboot_TRUE@ $(nodist_at_keyboard_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ at_keyboard.marker --@COND_i386_coreboot_TRUE@am__append_4103 = at_keyboard.mod --@COND_i386_coreboot_TRUE@am__append_4104 = at_keyboard.marker --@COND_i386_multiboot_TRUE@am__append_4105 = at_keyboard.module --@COND_i386_multiboot_TRUE@am__append_4106 = at_keyboard.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_4107 = --@COND_i386_multiboot_TRUE@am__append_4108 = $(nodist_at_keyboard_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_4109 = $(nodist_at_keyboard_module_SOURCES) \ -+@COND_i386_coreboot_TRUE@am__append_4096 = at_keyboard.mod -+@COND_i386_coreboot_TRUE@am__append_4097 = at_keyboard.marker -+@COND_i386_multiboot_TRUE@am__append_4098 = at_keyboard.module -+@COND_i386_multiboot_TRUE@am__append_4099 = at_keyboard.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_4100 = -+@COND_i386_multiboot_TRUE@am__append_4101 = $(nodist_at_keyboard_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_4102 = $(nodist_at_keyboard_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ at_keyboard.marker --@COND_i386_multiboot_TRUE@am__append_4110 = at_keyboard.mod --@COND_i386_multiboot_TRUE@am__append_4111 = at_keyboard.marker --@COND_i386_ieee1275_TRUE@am__append_4112 = at_keyboard.module --@COND_i386_ieee1275_TRUE@am__append_4113 = at_keyboard.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_4114 = --@COND_i386_ieee1275_TRUE@am__append_4115 = $(nodist_at_keyboard_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_4116 = \ -+@COND_i386_multiboot_TRUE@am__append_4103 = at_keyboard.mod -+@COND_i386_multiboot_TRUE@am__append_4104 = at_keyboard.marker -+@COND_i386_ieee1275_TRUE@am__append_4105 = at_keyboard.module -+@COND_i386_ieee1275_TRUE@am__append_4106 = at_keyboard.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_4107 = -+@COND_i386_ieee1275_TRUE@am__append_4108 = $(nodist_at_keyboard_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_4109 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_at_keyboard_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ at_keyboard.marker --@COND_i386_ieee1275_TRUE@am__append_4117 = at_keyboard.mod --@COND_i386_ieee1275_TRUE@am__append_4118 = at_keyboard.marker --@COND_x86_64_efi_TRUE@am__append_4119 = at_keyboard.module --@COND_x86_64_efi_TRUE@am__append_4120 = at_keyboard.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_4121 = --@COND_x86_64_efi_TRUE@am__append_4122 = $(nodist_at_keyboard_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_4123 = \ -+@COND_i386_ieee1275_TRUE@am__append_4110 = at_keyboard.mod -+@COND_i386_ieee1275_TRUE@am__append_4111 = at_keyboard.marker -+@COND_x86_64_efi_TRUE@am__append_4112 = at_keyboard.module -+@COND_x86_64_efi_TRUE@am__append_4113 = at_keyboard.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_4114 = -+@COND_x86_64_efi_TRUE@am__append_4115 = $(nodist_at_keyboard_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_4116 = \ - @COND_x86_64_efi_TRUE@ $(nodist_at_keyboard_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ at_keyboard.marker --@COND_x86_64_efi_TRUE@am__append_4124 = at_keyboard.mod --@COND_x86_64_efi_TRUE@am__append_4125 = at_keyboard.marker --@COND_emu_TRUE@am__append_4126 = gfxterm.module --@COND_emu_TRUE@am__append_4127 = gfxterm.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_4117 = at_keyboard.mod -+@COND_x86_64_efi_TRUE@am__append_4118 = at_keyboard.marker -+@COND_emu_TRUE@am__append_4119 = gfxterm.module -+@COND_emu_TRUE@am__append_4120 = gfxterm.module$(EXEEXT) - @COND_arm64_efi_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_FALSE@gfxterm_module_DEPENDENCIES = --@COND_emu_TRUE@am__append_4128 = --@COND_emu_TRUE@am__append_4129 = $(nodist_gfxterm_module_SOURCES) --@COND_emu_TRUE@am__append_4130 = $(nodist_gfxterm_module_SOURCES) \ -+@COND_emu_TRUE@am__append_4121 = -+@COND_emu_TRUE@am__append_4122 = $(nodist_gfxterm_module_SOURCES) -+@COND_emu_TRUE@am__append_4123 = $(nodist_gfxterm_module_SOURCES) \ - @COND_emu_TRUE@ gfxterm.marker --@COND_emu_TRUE@am__append_4131 = gfxterm.mod --@COND_emu_TRUE@am__append_4132 = gfxterm.marker --@COND_i386_pc_TRUE@am__append_4133 = gfxterm.module --@COND_i386_pc_TRUE@am__append_4134 = gfxterm.module$(EXEEXT) --@COND_i386_pc_TRUE@am__append_4135 = --@COND_i386_pc_TRUE@am__append_4136 = $(nodist_gfxterm_module_SOURCES) --@COND_i386_pc_TRUE@am__append_4137 = $(nodist_gfxterm_module_SOURCES) \ -+@COND_emu_TRUE@am__append_4124 = gfxterm.mod -+@COND_emu_TRUE@am__append_4125 = gfxterm.marker -+@COND_i386_pc_TRUE@am__append_4126 = gfxterm.module -+@COND_i386_pc_TRUE@am__append_4127 = gfxterm.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__append_4128 = -+@COND_i386_pc_TRUE@am__append_4129 = $(nodist_gfxterm_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_4130 = $(nodist_gfxterm_module_SOURCES) \ - @COND_i386_pc_TRUE@ gfxterm.marker --@COND_i386_pc_TRUE@am__append_4138 = gfxterm.mod --@COND_i386_pc_TRUE@am__append_4139 = gfxterm.marker --@COND_i386_efi_TRUE@am__append_4140 = gfxterm.module --@COND_i386_efi_TRUE@am__append_4141 = gfxterm.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_4142 = --@COND_i386_efi_TRUE@am__append_4143 = $(nodist_gfxterm_module_SOURCES) --@COND_i386_efi_TRUE@am__append_4144 = \ -+@COND_i386_pc_TRUE@am__append_4131 = gfxterm.mod -+@COND_i386_pc_TRUE@am__append_4132 = gfxterm.marker -+@COND_i386_efi_TRUE@am__append_4133 = gfxterm.module -+@COND_i386_efi_TRUE@am__append_4134 = gfxterm.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_4135 = -+@COND_i386_efi_TRUE@am__append_4136 = $(nodist_gfxterm_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_4137 = \ - @COND_i386_efi_TRUE@ $(nodist_gfxterm_module_SOURCES) \ - @COND_i386_efi_TRUE@ gfxterm.marker --@COND_i386_efi_TRUE@am__append_4145 = gfxterm.mod --@COND_i386_efi_TRUE@am__append_4146 = gfxterm.marker --@COND_i386_qemu_TRUE@am__append_4147 = gfxterm.module --@COND_i386_qemu_TRUE@am__append_4148 = gfxterm.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_4149 = --@COND_i386_qemu_TRUE@am__append_4150 = $(nodist_gfxterm_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_4151 = \ -+@COND_i386_efi_TRUE@am__append_4138 = gfxterm.mod -+@COND_i386_efi_TRUE@am__append_4139 = gfxterm.marker -+@COND_i386_qemu_TRUE@am__append_4140 = gfxterm.module -+@COND_i386_qemu_TRUE@am__append_4141 = gfxterm.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_4142 = -+@COND_i386_qemu_TRUE@am__append_4143 = $(nodist_gfxterm_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_4144 = \ - @COND_i386_qemu_TRUE@ $(nodist_gfxterm_module_SOURCES) \ - @COND_i386_qemu_TRUE@ gfxterm.marker --@COND_i386_qemu_TRUE@am__append_4152 = gfxterm.mod --@COND_i386_qemu_TRUE@am__append_4153 = gfxterm.marker --@COND_i386_multiboot_TRUE@am__append_4154 = gfxterm.module --@COND_i386_multiboot_TRUE@am__append_4155 = gfxterm.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_4156 = --@COND_i386_multiboot_TRUE@am__append_4157 = $(nodist_gfxterm_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_4158 = \ -+@COND_i386_qemu_TRUE@am__append_4145 = gfxterm.mod -+@COND_i386_qemu_TRUE@am__append_4146 = gfxterm.marker -+@COND_i386_multiboot_TRUE@am__append_4147 = gfxterm.module -+@COND_i386_multiboot_TRUE@am__append_4148 = gfxterm.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_4149 = -+@COND_i386_multiboot_TRUE@am__append_4150 = $(nodist_gfxterm_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_4151 = \ - @COND_i386_multiboot_TRUE@ $(nodist_gfxterm_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ gfxterm.marker --@COND_i386_multiboot_TRUE@am__append_4159 = gfxterm.mod --@COND_i386_multiboot_TRUE@am__append_4160 = gfxterm.marker --@COND_i386_ieee1275_TRUE@am__append_4161 = gfxterm.module --@COND_i386_ieee1275_TRUE@am__append_4162 = gfxterm.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_4163 = --@COND_i386_ieee1275_TRUE@am__append_4164 = $(nodist_gfxterm_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_4165 = \ -+@COND_i386_multiboot_TRUE@am__append_4152 = gfxterm.mod -+@COND_i386_multiboot_TRUE@am__append_4153 = gfxterm.marker -+@COND_i386_ieee1275_TRUE@am__append_4154 = gfxterm.module -+@COND_i386_ieee1275_TRUE@am__append_4155 = gfxterm.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_4156 = -+@COND_i386_ieee1275_TRUE@am__append_4157 = $(nodist_gfxterm_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_4158 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_gfxterm_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ gfxterm.marker --@COND_i386_ieee1275_TRUE@am__append_4166 = gfxterm.mod --@COND_i386_ieee1275_TRUE@am__append_4167 = gfxterm.marker --@COND_x86_64_efi_TRUE@am__append_4168 = gfxterm.module --@COND_x86_64_efi_TRUE@am__append_4169 = gfxterm.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_4170 = --@COND_x86_64_efi_TRUE@am__append_4171 = $(nodist_gfxterm_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_4172 = \ -+@COND_i386_ieee1275_TRUE@am__append_4159 = gfxterm.mod -+@COND_i386_ieee1275_TRUE@am__append_4160 = gfxterm.marker -+@COND_x86_64_efi_TRUE@am__append_4161 = gfxterm.module -+@COND_x86_64_efi_TRUE@am__append_4162 = gfxterm.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_4163 = -+@COND_x86_64_efi_TRUE@am__append_4164 = $(nodist_gfxterm_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_4165 = \ - @COND_x86_64_efi_TRUE@ $(nodist_gfxterm_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ gfxterm.marker --@COND_x86_64_efi_TRUE@am__append_4173 = gfxterm.mod --@COND_x86_64_efi_TRUE@am__append_4174 = gfxterm.marker --@COND_i386_xen_TRUE@am__append_4175 = gfxterm.module --@COND_i386_xen_TRUE@am__append_4176 = gfxterm.module$(EXEEXT) --@COND_i386_xen_TRUE@am__append_4177 = --@COND_i386_xen_TRUE@am__append_4178 = $(nodist_gfxterm_module_SOURCES) --@COND_i386_xen_TRUE@am__append_4179 = \ -+@COND_x86_64_efi_TRUE@am__append_4166 = gfxterm.mod -+@COND_x86_64_efi_TRUE@am__append_4167 = gfxterm.marker -+@COND_i386_xen_TRUE@am__append_4168 = gfxterm.module -+@COND_i386_xen_TRUE@am__append_4169 = gfxterm.module$(EXEEXT) -+@COND_i386_xen_TRUE@am__append_4170 = -+@COND_i386_xen_TRUE@am__append_4171 = $(nodist_gfxterm_module_SOURCES) -+@COND_i386_xen_TRUE@am__append_4172 = \ - @COND_i386_xen_TRUE@ $(nodist_gfxterm_module_SOURCES) \ - @COND_i386_xen_TRUE@ gfxterm.marker --@COND_i386_xen_TRUE@am__append_4180 = gfxterm.mod --@COND_i386_xen_TRUE@am__append_4181 = gfxterm.marker --@COND_x86_64_xen_TRUE@am__append_4182 = gfxterm.module --@COND_x86_64_xen_TRUE@am__append_4183 = gfxterm.module$(EXEEXT) --@COND_x86_64_xen_TRUE@am__append_4184 = --@COND_x86_64_xen_TRUE@am__append_4185 = $(nodist_gfxterm_module_SOURCES) --@COND_x86_64_xen_TRUE@am__append_4186 = \ -+@COND_i386_xen_TRUE@am__append_4173 = gfxterm.mod -+@COND_i386_xen_TRUE@am__append_4174 = gfxterm.marker -+@COND_x86_64_xen_TRUE@am__append_4175 = gfxterm.module -+@COND_x86_64_xen_TRUE@am__append_4176 = gfxterm.module$(EXEEXT) -+@COND_x86_64_xen_TRUE@am__append_4177 = -+@COND_x86_64_xen_TRUE@am__append_4178 = $(nodist_gfxterm_module_SOURCES) -+@COND_x86_64_xen_TRUE@am__append_4179 = \ - @COND_x86_64_xen_TRUE@ $(nodist_gfxterm_module_SOURCES) \ - @COND_x86_64_xen_TRUE@ gfxterm.marker --@COND_x86_64_xen_TRUE@am__append_4187 = gfxterm.mod --@COND_x86_64_xen_TRUE@am__append_4188 = gfxterm.marker --@COND_i386_xen_pvh_TRUE@am__append_4189 = gfxterm.module --@COND_i386_xen_pvh_TRUE@am__append_4190 = gfxterm.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__append_4191 = --@COND_i386_xen_pvh_TRUE@am__append_4192 = $(nodist_gfxterm_module_SOURCES) --@COND_i386_xen_pvh_TRUE@am__append_4193 = \ -+@COND_x86_64_xen_TRUE@am__append_4180 = gfxterm.mod -+@COND_x86_64_xen_TRUE@am__append_4181 = gfxterm.marker -+@COND_i386_xen_pvh_TRUE@am__append_4182 = gfxterm.module -+@COND_i386_xen_pvh_TRUE@am__append_4183 = gfxterm.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__append_4184 = -+@COND_i386_xen_pvh_TRUE@am__append_4185 = $(nodist_gfxterm_module_SOURCES) -+@COND_i386_xen_pvh_TRUE@am__append_4186 = \ - @COND_i386_xen_pvh_TRUE@ $(nodist_gfxterm_module_SOURCES) \ - @COND_i386_xen_pvh_TRUE@ gfxterm.marker --@COND_i386_xen_pvh_TRUE@am__append_4194 = gfxterm.mod --@COND_i386_xen_pvh_TRUE@am__append_4195 = gfxterm.marker --@COND_sparc64_ieee1275_TRUE@am__append_4196 = gfxterm.module --@COND_sparc64_ieee1275_TRUE@am__append_4197 = gfxterm.module$(EXEEXT) --@COND_sparc64_ieee1275_TRUE@am__append_4198 = --@COND_sparc64_ieee1275_TRUE@am__append_4199 = $(nodist_gfxterm_module_SOURCES) --@COND_sparc64_ieee1275_TRUE@am__append_4200 = \ -+@COND_i386_xen_pvh_TRUE@am__append_4187 = gfxterm.mod -+@COND_i386_xen_pvh_TRUE@am__append_4188 = gfxterm.marker -+@COND_sparc64_ieee1275_TRUE@am__append_4189 = gfxterm.module -+@COND_sparc64_ieee1275_TRUE@am__append_4190 = gfxterm.module$(EXEEXT) -+@COND_sparc64_ieee1275_TRUE@am__append_4191 = -+@COND_sparc64_ieee1275_TRUE@am__append_4192 = $(nodist_gfxterm_module_SOURCES) -+@COND_sparc64_ieee1275_TRUE@am__append_4193 = \ - @COND_sparc64_ieee1275_TRUE@ $(nodist_gfxterm_module_SOURCES) \ - @COND_sparc64_ieee1275_TRUE@ gfxterm.marker --@COND_sparc64_ieee1275_TRUE@am__append_4201 = gfxterm.mod --@COND_sparc64_ieee1275_TRUE@am__append_4202 = gfxterm.marker --@COND_powerpc_ieee1275_TRUE@am__append_4203 = gfxterm.module --@COND_powerpc_ieee1275_TRUE@am__append_4204 = gfxterm.module$(EXEEXT) --@COND_powerpc_ieee1275_TRUE@am__append_4205 = --@COND_powerpc_ieee1275_TRUE@am__append_4206 = $(nodist_gfxterm_module_SOURCES) --@COND_powerpc_ieee1275_TRUE@am__append_4207 = \ -+@COND_sparc64_ieee1275_TRUE@am__append_4194 = gfxterm.mod -+@COND_sparc64_ieee1275_TRUE@am__append_4195 = gfxterm.marker -+@COND_powerpc_ieee1275_TRUE@am__append_4196 = gfxterm.module -+@COND_powerpc_ieee1275_TRUE@am__append_4197 = gfxterm.module$(EXEEXT) -+@COND_powerpc_ieee1275_TRUE@am__append_4198 = -+@COND_powerpc_ieee1275_TRUE@am__append_4199 = $(nodist_gfxterm_module_SOURCES) -+@COND_powerpc_ieee1275_TRUE@am__append_4200 = \ - @COND_powerpc_ieee1275_TRUE@ $(nodist_gfxterm_module_SOURCES) \ - @COND_powerpc_ieee1275_TRUE@ gfxterm.marker --@COND_powerpc_ieee1275_TRUE@am__append_4208 = gfxterm.mod --@COND_powerpc_ieee1275_TRUE@am__append_4209 = gfxterm.marker --@COND_mips_arc_TRUE@am__append_4210 = gfxterm.module --@COND_mips_arc_TRUE@am__append_4211 = gfxterm.module$(EXEEXT) --@COND_mips_arc_TRUE@am__append_4212 = --@COND_mips_arc_TRUE@am__append_4213 = $(nodist_gfxterm_module_SOURCES) --@COND_mips_arc_TRUE@am__append_4214 = \ -+@COND_powerpc_ieee1275_TRUE@am__append_4201 = gfxterm.mod -+@COND_powerpc_ieee1275_TRUE@am__append_4202 = gfxterm.marker -+@COND_mips_arc_TRUE@am__append_4203 = gfxterm.module -+@COND_mips_arc_TRUE@am__append_4204 = gfxterm.module$(EXEEXT) -+@COND_mips_arc_TRUE@am__append_4205 = -+@COND_mips_arc_TRUE@am__append_4206 = $(nodist_gfxterm_module_SOURCES) -+@COND_mips_arc_TRUE@am__append_4207 = \ - @COND_mips_arc_TRUE@ $(nodist_gfxterm_module_SOURCES) \ - @COND_mips_arc_TRUE@ gfxterm.marker --@COND_mips_arc_TRUE@am__append_4215 = gfxterm.mod --@COND_mips_arc_TRUE@am__append_4216 = gfxterm.marker --@COND_ia64_efi_TRUE@am__append_4217 = gfxterm.module --@COND_ia64_efi_TRUE@am__append_4218 = gfxterm.module$(EXEEXT) --@COND_ia64_efi_TRUE@am__append_4219 = --@COND_ia64_efi_TRUE@am__append_4220 = $(nodist_gfxterm_module_SOURCES) --@COND_ia64_efi_TRUE@am__append_4221 = \ -+@COND_mips_arc_TRUE@am__append_4208 = gfxterm.mod -+@COND_mips_arc_TRUE@am__append_4209 = gfxterm.marker -+@COND_ia64_efi_TRUE@am__append_4210 = gfxterm.module -+@COND_ia64_efi_TRUE@am__append_4211 = gfxterm.module$(EXEEXT) -+@COND_ia64_efi_TRUE@am__append_4212 = -+@COND_ia64_efi_TRUE@am__append_4213 = $(nodist_gfxterm_module_SOURCES) -+@COND_ia64_efi_TRUE@am__append_4214 = \ - @COND_ia64_efi_TRUE@ $(nodist_gfxterm_module_SOURCES) \ - @COND_ia64_efi_TRUE@ gfxterm.marker --@COND_ia64_efi_TRUE@am__append_4222 = gfxterm.mod --@COND_ia64_efi_TRUE@am__append_4223 = gfxterm.marker --@COND_mips_qemu_mips_TRUE@am__append_4224 = gfxterm.module --@COND_mips_qemu_mips_TRUE@am__append_4225 = gfxterm.module$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__append_4226 = --@COND_mips_qemu_mips_TRUE@am__append_4227 = $(nodist_gfxterm_module_SOURCES) --@COND_mips_qemu_mips_TRUE@am__append_4228 = \ -+@COND_ia64_efi_TRUE@am__append_4215 = gfxterm.mod -+@COND_ia64_efi_TRUE@am__append_4216 = gfxterm.marker -+@COND_mips_qemu_mips_TRUE@am__append_4217 = gfxterm.module -+@COND_mips_qemu_mips_TRUE@am__append_4218 = gfxterm.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__append_4219 = -+@COND_mips_qemu_mips_TRUE@am__append_4220 = $(nodist_gfxterm_module_SOURCES) -+@COND_mips_qemu_mips_TRUE@am__append_4221 = \ - @COND_mips_qemu_mips_TRUE@ $(nodist_gfxterm_module_SOURCES) \ - @COND_mips_qemu_mips_TRUE@ gfxterm.marker --@COND_mips_qemu_mips_TRUE@am__append_4229 = gfxterm.mod --@COND_mips_qemu_mips_TRUE@am__append_4230 = gfxterm.marker --@COND_arm_uboot_TRUE@am__append_4231 = gfxterm.module --@COND_arm_uboot_TRUE@am__append_4232 = gfxterm.module$(EXEEXT) --@COND_arm_uboot_TRUE@am__append_4233 = --@COND_arm_uboot_TRUE@am__append_4234 = $(nodist_gfxterm_module_SOURCES) --@COND_arm_uboot_TRUE@am__append_4235 = \ -+@COND_mips_qemu_mips_TRUE@am__append_4222 = gfxterm.mod -+@COND_mips_qemu_mips_TRUE@am__append_4223 = gfxterm.marker -+@COND_arm_uboot_TRUE@am__append_4224 = gfxterm.module -+@COND_arm_uboot_TRUE@am__append_4225 = gfxterm.module$(EXEEXT) -+@COND_arm_uboot_TRUE@am__append_4226 = -+@COND_arm_uboot_TRUE@am__append_4227 = $(nodist_gfxterm_module_SOURCES) -+@COND_arm_uboot_TRUE@am__append_4228 = \ - @COND_arm_uboot_TRUE@ $(nodist_gfxterm_module_SOURCES) \ - @COND_arm_uboot_TRUE@ gfxterm.marker --@COND_arm_uboot_TRUE@am__append_4236 = gfxterm.mod --@COND_arm_uboot_TRUE@am__append_4237 = gfxterm.marker --@COND_arm_efi_TRUE@am__append_4238 = gfxterm.module --@COND_arm_efi_TRUE@am__append_4239 = gfxterm.module$(EXEEXT) --@COND_arm_efi_TRUE@am__append_4240 = --@COND_arm_efi_TRUE@am__append_4241 = $(nodist_gfxterm_module_SOURCES) --@COND_arm_efi_TRUE@am__append_4242 = $(nodist_gfxterm_module_SOURCES) \ -+@COND_arm_uboot_TRUE@am__append_4229 = gfxterm.mod -+@COND_arm_uboot_TRUE@am__append_4230 = gfxterm.marker -+@COND_arm_efi_TRUE@am__append_4231 = gfxterm.module -+@COND_arm_efi_TRUE@am__append_4232 = gfxterm.module$(EXEEXT) -+@COND_arm_efi_TRUE@am__append_4233 = -+@COND_arm_efi_TRUE@am__append_4234 = $(nodist_gfxterm_module_SOURCES) -+@COND_arm_efi_TRUE@am__append_4235 = $(nodist_gfxterm_module_SOURCES) \ - @COND_arm_efi_TRUE@ gfxterm.marker --@COND_arm_efi_TRUE@am__append_4243 = gfxterm.mod --@COND_arm_efi_TRUE@am__append_4244 = gfxterm.marker --@COND_arm64_efi_TRUE@am__append_4245 = gfxterm.module --@COND_arm64_efi_TRUE@am__append_4246 = gfxterm.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__append_4247 = --@COND_arm64_efi_TRUE@am__append_4248 = $(nodist_gfxterm_module_SOURCES) --@COND_arm64_efi_TRUE@am__append_4249 = \ -+@COND_arm_efi_TRUE@am__append_4236 = gfxterm.mod -+@COND_arm_efi_TRUE@am__append_4237 = gfxterm.marker -+@COND_arm64_efi_TRUE@am__append_4238 = gfxterm.module -+@COND_arm64_efi_TRUE@am__append_4239 = gfxterm.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__append_4240 = -+@COND_arm64_efi_TRUE@am__append_4241 = $(nodist_gfxterm_module_SOURCES) -+@COND_arm64_efi_TRUE@am__append_4242 = \ - @COND_arm64_efi_TRUE@ $(nodist_gfxterm_module_SOURCES) \ - @COND_arm64_efi_TRUE@ gfxterm.marker --@COND_arm64_efi_TRUE@am__append_4250 = gfxterm.mod --@COND_arm64_efi_TRUE@am__append_4251 = gfxterm.marker --@COND_riscv32_efi_TRUE@am__append_4252 = gfxterm.module --@COND_riscv32_efi_TRUE@am__append_4253 = gfxterm.module$(EXEEXT) --@COND_riscv32_efi_TRUE@am__append_4254 = --@COND_riscv32_efi_TRUE@am__append_4255 = $(nodist_gfxterm_module_SOURCES) --@COND_riscv32_efi_TRUE@am__append_4256 = \ -+@COND_arm64_efi_TRUE@am__append_4243 = gfxterm.mod -+@COND_arm64_efi_TRUE@am__append_4244 = gfxterm.marker -+@COND_riscv32_efi_TRUE@am__append_4245 = gfxterm.module -+@COND_riscv32_efi_TRUE@am__append_4246 = gfxterm.module$(EXEEXT) -+@COND_riscv32_efi_TRUE@am__append_4247 = -+@COND_riscv32_efi_TRUE@am__append_4248 = $(nodist_gfxterm_module_SOURCES) -+@COND_riscv32_efi_TRUE@am__append_4249 = \ - @COND_riscv32_efi_TRUE@ $(nodist_gfxterm_module_SOURCES) \ - @COND_riscv32_efi_TRUE@ gfxterm.marker --@COND_riscv32_efi_TRUE@am__append_4257 = gfxterm.mod --@COND_riscv32_efi_TRUE@am__append_4258 = gfxterm.marker --@COND_riscv64_efi_TRUE@am__append_4259 = gfxterm.module --@COND_riscv64_efi_TRUE@am__append_4260 = gfxterm.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__append_4261 = --@COND_riscv64_efi_TRUE@am__append_4262 = $(nodist_gfxterm_module_SOURCES) --@COND_riscv64_efi_TRUE@am__append_4263 = \ -+@COND_riscv32_efi_TRUE@am__append_4250 = gfxterm.mod -+@COND_riscv32_efi_TRUE@am__append_4251 = gfxterm.marker -+@COND_riscv64_efi_TRUE@am__append_4252 = gfxterm.module -+@COND_riscv64_efi_TRUE@am__append_4253 = gfxterm.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__append_4254 = -+@COND_riscv64_efi_TRUE@am__append_4255 = $(nodist_gfxterm_module_SOURCES) -+@COND_riscv64_efi_TRUE@am__append_4256 = \ - @COND_riscv64_efi_TRUE@ $(nodist_gfxterm_module_SOURCES) \ - @COND_riscv64_efi_TRUE@ gfxterm.marker --@COND_riscv64_efi_TRUE@am__append_4264 = gfxterm.mod --@COND_riscv64_efi_TRUE@am__append_4265 = gfxterm.marker --@COND_i386_pc_TRUE@am__append_4266 = serial.module --@COND_i386_pc_TRUE@am__append_4267 = serial.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__append_4257 = gfxterm.mod -+@COND_riscv64_efi_TRUE@am__append_4258 = gfxterm.marker -+@COND_i386_pc_TRUE@am__append_4259 = serial.module -+@COND_i386_pc_TRUE@am__append_4260 = serial.module$(EXEEXT) - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_FALSE@serial_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_4268 = --@COND_i386_pc_TRUE@am__append_4269 = $(nodist_serial_module_SOURCES) --@COND_i386_pc_TRUE@am__append_4270 = $(nodist_serial_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_4261 = -+@COND_i386_pc_TRUE@am__append_4262 = $(nodist_serial_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_4263 = $(nodist_serial_module_SOURCES) \ - @COND_i386_pc_TRUE@ serial.marker --@COND_i386_pc_TRUE@am__append_4271 = serial.mod --@COND_i386_pc_TRUE@am__append_4272 = serial.marker --@COND_i386_efi_TRUE@am__append_4273 = serial.module --@COND_i386_efi_TRUE@am__append_4274 = serial.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_4275 = --@COND_i386_efi_TRUE@am__append_4276 = $(nodist_serial_module_SOURCES) --@COND_i386_efi_TRUE@am__append_4277 = $(nodist_serial_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_4264 = serial.mod -+@COND_i386_pc_TRUE@am__append_4265 = serial.marker -+@COND_i386_efi_TRUE@am__append_4266 = serial.module -+@COND_i386_efi_TRUE@am__append_4267 = serial.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_4268 = -+@COND_i386_efi_TRUE@am__append_4269 = $(nodist_serial_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_4270 = $(nodist_serial_module_SOURCES) \ - @COND_i386_efi_TRUE@ serial.marker --@COND_i386_efi_TRUE@am__append_4278 = serial.mod --@COND_i386_efi_TRUE@am__append_4279 = serial.marker --@COND_i386_qemu_TRUE@am__append_4280 = serial.module --@COND_i386_qemu_TRUE@am__append_4281 = serial.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_4282 = --@COND_i386_qemu_TRUE@am__append_4283 = $(nodist_serial_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_4284 = \ -+@COND_i386_efi_TRUE@am__append_4271 = serial.mod -+@COND_i386_efi_TRUE@am__append_4272 = serial.marker -+@COND_i386_qemu_TRUE@am__append_4273 = serial.module -+@COND_i386_qemu_TRUE@am__append_4274 = serial.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_4275 = -+@COND_i386_qemu_TRUE@am__append_4276 = $(nodist_serial_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_4277 = \ - @COND_i386_qemu_TRUE@ $(nodist_serial_module_SOURCES) \ - @COND_i386_qemu_TRUE@ serial.marker --@COND_i386_qemu_TRUE@am__append_4285 = serial.mod --@COND_i386_qemu_TRUE@am__append_4286 = serial.marker --@COND_i386_coreboot_TRUE@am__append_4287 = serial.module --@COND_i386_coreboot_TRUE@am__append_4288 = serial.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_4289 = --@COND_i386_coreboot_TRUE@am__append_4290 = $(nodist_serial_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_4291 = \ -+@COND_i386_qemu_TRUE@am__append_4278 = serial.mod -+@COND_i386_qemu_TRUE@am__append_4279 = serial.marker -+@COND_i386_coreboot_TRUE@am__append_4280 = serial.module -+@COND_i386_coreboot_TRUE@am__append_4281 = serial.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_4282 = -+@COND_i386_coreboot_TRUE@am__append_4283 = $(nodist_serial_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_4284 = \ - @COND_i386_coreboot_TRUE@ $(nodist_serial_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ serial.marker --@COND_i386_coreboot_TRUE@am__append_4292 = serial.mod --@COND_i386_coreboot_TRUE@am__append_4293 = serial.marker --@COND_i386_multiboot_TRUE@am__append_4294 = serial.module --@COND_i386_multiboot_TRUE@am__append_4295 = serial.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_4296 = --@COND_i386_multiboot_TRUE@am__append_4297 = $(nodist_serial_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_4298 = \ -+@COND_i386_coreboot_TRUE@am__append_4285 = serial.mod -+@COND_i386_coreboot_TRUE@am__append_4286 = serial.marker -+@COND_i386_multiboot_TRUE@am__append_4287 = serial.module -+@COND_i386_multiboot_TRUE@am__append_4288 = serial.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_4289 = -+@COND_i386_multiboot_TRUE@am__append_4290 = $(nodist_serial_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_4291 = \ - @COND_i386_multiboot_TRUE@ $(nodist_serial_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ serial.marker --@COND_i386_multiboot_TRUE@am__append_4299 = serial.mod --@COND_i386_multiboot_TRUE@am__append_4300 = serial.marker --@COND_i386_ieee1275_TRUE@am__append_4301 = serial.module --@COND_i386_ieee1275_TRUE@am__append_4302 = serial.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_4303 = --@COND_i386_ieee1275_TRUE@am__append_4304 = $(nodist_serial_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_4305 = \ -+@COND_i386_multiboot_TRUE@am__append_4292 = serial.mod -+@COND_i386_multiboot_TRUE@am__append_4293 = serial.marker -+@COND_i386_ieee1275_TRUE@am__append_4294 = serial.module -+@COND_i386_ieee1275_TRUE@am__append_4295 = serial.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_4296 = -+@COND_i386_ieee1275_TRUE@am__append_4297 = $(nodist_serial_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_4298 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_serial_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ serial.marker --@COND_i386_ieee1275_TRUE@am__append_4306 = serial.mod --@COND_i386_ieee1275_TRUE@am__append_4307 = serial.marker --@COND_x86_64_efi_TRUE@am__append_4308 = serial.module --@COND_x86_64_efi_TRUE@am__append_4309 = serial.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_4310 = --@COND_x86_64_efi_TRUE@am__append_4311 = $(nodist_serial_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_4312 = \ -+@COND_i386_ieee1275_TRUE@am__append_4299 = serial.mod -+@COND_i386_ieee1275_TRUE@am__append_4300 = serial.marker -+@COND_x86_64_efi_TRUE@am__append_4301 = serial.module -+@COND_x86_64_efi_TRUE@am__append_4302 = serial.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_4303 = -+@COND_x86_64_efi_TRUE@am__append_4304 = $(nodist_serial_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_4305 = \ - @COND_x86_64_efi_TRUE@ $(nodist_serial_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ serial.marker --@COND_x86_64_efi_TRUE@am__append_4313 = serial.mod --@COND_x86_64_efi_TRUE@am__append_4314 = serial.marker --@COND_sparc64_ieee1275_TRUE@am__append_4315 = serial.module --@COND_sparc64_ieee1275_TRUE@am__append_4316 = serial.module$(EXEEXT) --@COND_sparc64_ieee1275_TRUE@am__append_4317 = --@COND_sparc64_ieee1275_TRUE@am__append_4318 = $(nodist_serial_module_SOURCES) --@COND_sparc64_ieee1275_TRUE@am__append_4319 = \ -+@COND_x86_64_efi_TRUE@am__append_4306 = serial.mod -+@COND_x86_64_efi_TRUE@am__append_4307 = serial.marker -+@COND_sparc64_ieee1275_TRUE@am__append_4308 = serial.module -+@COND_sparc64_ieee1275_TRUE@am__append_4309 = serial.module$(EXEEXT) -+@COND_sparc64_ieee1275_TRUE@am__append_4310 = -+@COND_sparc64_ieee1275_TRUE@am__append_4311 = $(nodist_serial_module_SOURCES) -+@COND_sparc64_ieee1275_TRUE@am__append_4312 = \ - @COND_sparc64_ieee1275_TRUE@ $(nodist_serial_module_SOURCES) \ - @COND_sparc64_ieee1275_TRUE@ serial.marker --@COND_sparc64_ieee1275_TRUE@am__append_4320 = serial.mod --@COND_sparc64_ieee1275_TRUE@am__append_4321 = serial.marker --@COND_powerpc_ieee1275_TRUE@am__append_4322 = serial.module --@COND_powerpc_ieee1275_TRUE@am__append_4323 = serial.module$(EXEEXT) --@COND_powerpc_ieee1275_TRUE@am__append_4324 = --@COND_powerpc_ieee1275_TRUE@am__append_4325 = $(nodist_serial_module_SOURCES) --@COND_powerpc_ieee1275_TRUE@am__append_4326 = \ -+@COND_sparc64_ieee1275_TRUE@am__append_4313 = serial.mod -+@COND_sparc64_ieee1275_TRUE@am__append_4314 = serial.marker -+@COND_powerpc_ieee1275_TRUE@am__append_4315 = serial.module -+@COND_powerpc_ieee1275_TRUE@am__append_4316 = serial.module$(EXEEXT) -+@COND_powerpc_ieee1275_TRUE@am__append_4317 = -+@COND_powerpc_ieee1275_TRUE@am__append_4318 = $(nodist_serial_module_SOURCES) -+@COND_powerpc_ieee1275_TRUE@am__append_4319 = \ - @COND_powerpc_ieee1275_TRUE@ $(nodist_serial_module_SOURCES) \ - @COND_powerpc_ieee1275_TRUE@ serial.marker --@COND_powerpc_ieee1275_TRUE@am__append_4327 = serial.mod --@COND_powerpc_ieee1275_TRUE@am__append_4328 = serial.marker --@COND_mips_arc_TRUE@am__append_4329 = serial.module --@COND_mips_arc_TRUE@am__append_4330 = serial.module$(EXEEXT) --@COND_mips_arc_TRUE@am__append_4331 = --@COND_mips_arc_TRUE@am__append_4332 = $(nodist_serial_module_SOURCES) --@COND_mips_arc_TRUE@am__append_4333 = $(nodist_serial_module_SOURCES) \ -+@COND_powerpc_ieee1275_TRUE@am__append_4320 = serial.mod -+@COND_powerpc_ieee1275_TRUE@am__append_4321 = serial.marker -+@COND_mips_arc_TRUE@am__append_4322 = serial.module -+@COND_mips_arc_TRUE@am__append_4323 = serial.module$(EXEEXT) -+@COND_mips_arc_TRUE@am__append_4324 = -+@COND_mips_arc_TRUE@am__append_4325 = $(nodist_serial_module_SOURCES) -+@COND_mips_arc_TRUE@am__append_4326 = $(nodist_serial_module_SOURCES) \ - @COND_mips_arc_TRUE@ serial.marker --@COND_mips_arc_TRUE@am__append_4334 = serial.mod --@COND_mips_arc_TRUE@am__append_4335 = serial.marker --@COND_ia64_efi_TRUE@am__append_4336 = serial.module --@COND_ia64_efi_TRUE@am__append_4337 = serial.module$(EXEEXT) --@COND_ia64_efi_TRUE@am__append_4338 = --@COND_ia64_efi_TRUE@am__append_4339 = $(nodist_serial_module_SOURCES) --@COND_ia64_efi_TRUE@am__append_4340 = $(nodist_serial_module_SOURCES) \ -+@COND_mips_arc_TRUE@am__append_4327 = serial.mod -+@COND_mips_arc_TRUE@am__append_4328 = serial.marker -+@COND_ia64_efi_TRUE@am__append_4329 = serial.module -+@COND_ia64_efi_TRUE@am__append_4330 = serial.module$(EXEEXT) -+@COND_ia64_efi_TRUE@am__append_4331 = -+@COND_ia64_efi_TRUE@am__append_4332 = $(nodist_serial_module_SOURCES) -+@COND_ia64_efi_TRUE@am__append_4333 = $(nodist_serial_module_SOURCES) \ - @COND_ia64_efi_TRUE@ serial.marker --@COND_ia64_efi_TRUE@am__append_4341 = serial.mod --@COND_ia64_efi_TRUE@am__append_4342 = serial.marker --@COND_arm_efi_TRUE@am__append_4343 = serial.module --@COND_arm_efi_TRUE@am__append_4344 = serial.module$(EXEEXT) --@COND_arm_efi_TRUE@am__append_4345 = --@COND_arm_efi_TRUE@am__append_4346 = $(nodist_serial_module_SOURCES) --@COND_arm_efi_TRUE@am__append_4347 = $(nodist_serial_module_SOURCES) \ -+@COND_ia64_efi_TRUE@am__append_4334 = serial.mod -+@COND_ia64_efi_TRUE@am__append_4335 = serial.marker -+@COND_arm_efi_TRUE@am__append_4336 = serial.module -+@COND_arm_efi_TRUE@am__append_4337 = serial.module$(EXEEXT) -+@COND_arm_efi_TRUE@am__append_4338 = -+@COND_arm_efi_TRUE@am__append_4339 = $(nodist_serial_module_SOURCES) -+@COND_arm_efi_TRUE@am__append_4340 = $(nodist_serial_module_SOURCES) \ - @COND_arm_efi_TRUE@ serial.marker --@COND_arm_efi_TRUE@am__append_4348 = serial.mod --@COND_arm_efi_TRUE@am__append_4349 = serial.marker --@COND_arm64_efi_TRUE@am__append_4350 = serial.module --@COND_arm64_efi_TRUE@am__append_4351 = serial.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__append_4352 = --@COND_arm64_efi_TRUE@am__append_4353 = $(nodist_serial_module_SOURCES) --@COND_arm64_efi_TRUE@am__append_4354 = \ -+@COND_arm_efi_TRUE@am__append_4341 = serial.mod -+@COND_arm_efi_TRUE@am__append_4342 = serial.marker -+@COND_arm64_efi_TRUE@am__append_4343 = serial.module -+@COND_arm64_efi_TRUE@am__append_4344 = serial.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__append_4345 = -+@COND_arm64_efi_TRUE@am__append_4346 = $(nodist_serial_module_SOURCES) -+@COND_arm64_efi_TRUE@am__append_4347 = \ - @COND_arm64_efi_TRUE@ $(nodist_serial_module_SOURCES) \ - @COND_arm64_efi_TRUE@ serial.marker --@COND_arm64_efi_TRUE@am__append_4355 = serial.mod --@COND_arm64_efi_TRUE@am__append_4356 = serial.marker --@COND_arm_coreboot_TRUE@am__append_4357 = serial.module --@COND_arm_coreboot_TRUE@am__append_4358 = serial.module$(EXEEXT) --@COND_arm_coreboot_TRUE@am__append_4359 = --@COND_arm_coreboot_TRUE@am__append_4360 = $(nodist_serial_module_SOURCES) --@COND_arm_coreboot_TRUE@am__append_4361 = \ -+@COND_arm64_efi_TRUE@am__append_4348 = serial.mod -+@COND_arm64_efi_TRUE@am__append_4349 = serial.marker -+@COND_arm_coreboot_TRUE@am__append_4350 = serial.module -+@COND_arm_coreboot_TRUE@am__append_4351 = serial.module$(EXEEXT) -+@COND_arm_coreboot_TRUE@am__append_4352 = -+@COND_arm_coreboot_TRUE@am__append_4353 = $(nodist_serial_module_SOURCES) -+@COND_arm_coreboot_TRUE@am__append_4354 = \ - @COND_arm_coreboot_TRUE@ $(nodist_serial_module_SOURCES) \ - @COND_arm_coreboot_TRUE@ serial.marker --@COND_arm_coreboot_TRUE@am__append_4362 = serial.mod --@COND_arm_coreboot_TRUE@am__append_4363 = serial.marker --@COND_riscv32_efi_TRUE@am__append_4364 = serial.module --@COND_riscv32_efi_TRUE@am__append_4365 = serial.module$(EXEEXT) --@COND_riscv32_efi_TRUE@am__append_4366 = --@COND_riscv32_efi_TRUE@am__append_4367 = $(nodist_serial_module_SOURCES) --@COND_riscv32_efi_TRUE@am__append_4368 = \ -+@COND_arm_coreboot_TRUE@am__append_4355 = serial.mod -+@COND_arm_coreboot_TRUE@am__append_4356 = serial.marker -+@COND_riscv32_efi_TRUE@am__append_4357 = serial.module -+@COND_riscv32_efi_TRUE@am__append_4358 = serial.module$(EXEEXT) -+@COND_riscv32_efi_TRUE@am__append_4359 = -+@COND_riscv32_efi_TRUE@am__append_4360 = $(nodist_serial_module_SOURCES) -+@COND_riscv32_efi_TRUE@am__append_4361 = \ - @COND_riscv32_efi_TRUE@ $(nodist_serial_module_SOURCES) \ - @COND_riscv32_efi_TRUE@ serial.marker --@COND_riscv32_efi_TRUE@am__append_4369 = serial.mod --@COND_riscv32_efi_TRUE@am__append_4370 = serial.marker --@COND_riscv64_efi_TRUE@am__append_4371 = serial.module --@COND_riscv64_efi_TRUE@am__append_4372 = serial.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__append_4373 = --@COND_riscv64_efi_TRUE@am__append_4374 = $(nodist_serial_module_SOURCES) --@COND_riscv64_efi_TRUE@am__append_4375 = \ -+@COND_riscv32_efi_TRUE@am__append_4362 = serial.mod -+@COND_riscv32_efi_TRUE@am__append_4363 = serial.marker -+@COND_riscv64_efi_TRUE@am__append_4364 = serial.module -+@COND_riscv64_efi_TRUE@am__append_4365 = serial.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__append_4366 = -+@COND_riscv64_efi_TRUE@am__append_4367 = $(nodist_serial_module_SOURCES) -+@COND_riscv64_efi_TRUE@am__append_4368 = \ - @COND_riscv64_efi_TRUE@ $(nodist_serial_module_SOURCES) \ - @COND_riscv64_efi_TRUE@ serial.marker --@COND_riscv64_efi_TRUE@am__append_4376 = serial.mod --@COND_riscv64_efi_TRUE@am__append_4377 = serial.marker --@COND_i386_pc_TRUE@am__append_4378 = sendkey.module terminfo.module --@COND_i386_pc_TRUE@am__append_4379 = sendkey.module$(EXEEXT) \ -+@COND_riscv64_efi_TRUE@am__append_4369 = serial.mod -+@COND_riscv64_efi_TRUE@am__append_4370 = serial.marker -+@COND_i386_pc_TRUE@am__append_4371 = sendkey.module terminfo.module -+@COND_i386_pc_TRUE@am__append_4372 = sendkey.module$(EXEEXT) \ - @COND_i386_pc_TRUE@ terminfo.module$(EXEEXT) - @COND_i386_pc_FALSE@sendkey_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_4380 = --@COND_i386_pc_TRUE@am__append_4381 = $(nodist_sendkey_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_4373 = -+@COND_i386_pc_TRUE@am__append_4374 = $(nodist_sendkey_module_SOURCES) \ - @COND_i386_pc_TRUE@ $(nodist_terminfo_module_SOURCES) --@COND_i386_pc_TRUE@am__append_4382 = $(nodist_sendkey_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_4375 = $(nodist_sendkey_module_SOURCES) \ - @COND_i386_pc_TRUE@ sendkey.marker \ - @COND_i386_pc_TRUE@ $(nodist_terminfo_module_SOURCES) \ - @COND_i386_pc_TRUE@ terminfo.marker --@COND_i386_pc_TRUE@am__append_4383 = sendkey.mod terminfo.mod --@COND_i386_pc_TRUE@am__append_4384 = sendkey.marker terminfo.marker -+@COND_i386_pc_TRUE@am__append_4376 = sendkey.mod terminfo.mod -+@COND_i386_pc_TRUE@am__append_4377 = sendkey.marker terminfo.marker - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_ia64_efi_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_x86_64_efi_FALSE@terminfo_module_DEPENDENCIES = --@COND_i386_efi_TRUE@am__append_4385 = terminfo.module --@COND_i386_efi_TRUE@am__append_4386 = terminfo.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_4387 = --@COND_i386_efi_TRUE@am__append_4388 = $(nodist_terminfo_module_SOURCES) --@COND_i386_efi_TRUE@am__append_4389 = \ -+@COND_i386_efi_TRUE@am__append_4378 = terminfo.module -+@COND_i386_efi_TRUE@am__append_4379 = terminfo.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_4380 = -+@COND_i386_efi_TRUE@am__append_4381 = $(nodist_terminfo_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_4382 = \ - @COND_i386_efi_TRUE@ $(nodist_terminfo_module_SOURCES) \ - @COND_i386_efi_TRUE@ terminfo.marker --@COND_i386_efi_TRUE@am__append_4390 = terminfo.mod --@COND_i386_efi_TRUE@am__append_4391 = terminfo.marker --@COND_i386_qemu_TRUE@am__append_4392 = terminfo.module --@COND_i386_qemu_TRUE@am__append_4393 = terminfo.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_4394 = --@COND_i386_qemu_TRUE@am__append_4395 = $(nodist_terminfo_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_4396 = \ -+@COND_i386_efi_TRUE@am__append_4383 = terminfo.mod -+@COND_i386_efi_TRUE@am__append_4384 = terminfo.marker -+@COND_i386_qemu_TRUE@am__append_4385 = terminfo.module -+@COND_i386_qemu_TRUE@am__append_4386 = terminfo.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_4387 = -+@COND_i386_qemu_TRUE@am__append_4388 = $(nodist_terminfo_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_4389 = \ - @COND_i386_qemu_TRUE@ $(nodist_terminfo_module_SOURCES) \ - @COND_i386_qemu_TRUE@ terminfo.marker --@COND_i386_qemu_TRUE@am__append_4397 = terminfo.mod --@COND_i386_qemu_TRUE@am__append_4398 = terminfo.marker --@COND_i386_coreboot_TRUE@am__append_4399 = terminfo.module --@COND_i386_coreboot_TRUE@am__append_4400 = terminfo.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_4401 = --@COND_i386_coreboot_TRUE@am__append_4402 = $(nodist_terminfo_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_4403 = \ -+@COND_i386_qemu_TRUE@am__append_4390 = terminfo.mod -+@COND_i386_qemu_TRUE@am__append_4391 = terminfo.marker -+@COND_i386_coreboot_TRUE@am__append_4392 = terminfo.module -+@COND_i386_coreboot_TRUE@am__append_4393 = terminfo.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_4394 = -+@COND_i386_coreboot_TRUE@am__append_4395 = $(nodist_terminfo_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_4396 = \ - @COND_i386_coreboot_TRUE@ $(nodist_terminfo_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ terminfo.marker --@COND_i386_coreboot_TRUE@am__append_4404 = terminfo.mod --@COND_i386_coreboot_TRUE@am__append_4405 = terminfo.marker --@COND_i386_multiboot_TRUE@am__append_4406 = terminfo.module --@COND_i386_multiboot_TRUE@am__append_4407 = terminfo.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_4408 = --@COND_i386_multiboot_TRUE@am__append_4409 = $(nodist_terminfo_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_4410 = \ -+@COND_i386_coreboot_TRUE@am__append_4397 = terminfo.mod -+@COND_i386_coreboot_TRUE@am__append_4398 = terminfo.marker -+@COND_i386_multiboot_TRUE@am__append_4399 = terminfo.module -+@COND_i386_multiboot_TRUE@am__append_4400 = terminfo.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_4401 = -+@COND_i386_multiboot_TRUE@am__append_4402 = $(nodist_terminfo_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_4403 = \ - @COND_i386_multiboot_TRUE@ $(nodist_terminfo_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ terminfo.marker --@COND_i386_multiboot_TRUE@am__append_4411 = terminfo.mod --@COND_i386_multiboot_TRUE@am__append_4412 = terminfo.marker --@COND_x86_64_efi_TRUE@am__append_4413 = terminfo.module --@COND_x86_64_efi_TRUE@am__append_4414 = terminfo.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_4415 = --@COND_x86_64_efi_TRUE@am__append_4416 = $(nodist_terminfo_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_4417 = \ -+@COND_i386_multiboot_TRUE@am__append_4404 = terminfo.mod -+@COND_i386_multiboot_TRUE@am__append_4405 = terminfo.marker -+@COND_x86_64_efi_TRUE@am__append_4406 = terminfo.module -+@COND_x86_64_efi_TRUE@am__append_4407 = terminfo.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_4408 = -+@COND_x86_64_efi_TRUE@am__append_4409 = $(nodist_terminfo_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_4410 = \ - @COND_x86_64_efi_TRUE@ $(nodist_terminfo_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ terminfo.marker --@COND_x86_64_efi_TRUE@am__append_4418 = terminfo.mod --@COND_x86_64_efi_TRUE@am__append_4419 = terminfo.marker --@COND_ia64_efi_TRUE@am__append_4420 = terminfo.module --@COND_ia64_efi_TRUE@am__append_4421 = terminfo.module$(EXEEXT) --@COND_ia64_efi_TRUE@am__append_4422 = --@COND_ia64_efi_TRUE@am__append_4423 = $(nodist_terminfo_module_SOURCES) --@COND_ia64_efi_TRUE@am__append_4424 = \ -+@COND_x86_64_efi_TRUE@am__append_4411 = terminfo.mod -+@COND_x86_64_efi_TRUE@am__append_4412 = terminfo.marker -+@COND_ia64_efi_TRUE@am__append_4413 = terminfo.module -+@COND_ia64_efi_TRUE@am__append_4414 = terminfo.module$(EXEEXT) -+@COND_ia64_efi_TRUE@am__append_4415 = -+@COND_ia64_efi_TRUE@am__append_4416 = $(nodist_terminfo_module_SOURCES) -+@COND_ia64_efi_TRUE@am__append_4417 = \ - @COND_ia64_efi_TRUE@ $(nodist_terminfo_module_SOURCES) \ - @COND_ia64_efi_TRUE@ terminfo.marker --@COND_ia64_efi_TRUE@am__append_4425 = terminfo.mod --@COND_ia64_efi_TRUE@am__append_4426 = terminfo.marker --@COND_arm_efi_TRUE@am__append_4427 = terminfo.module --@COND_arm_efi_TRUE@am__append_4428 = terminfo.module$(EXEEXT) --@COND_arm_efi_TRUE@am__append_4429 = --@COND_arm_efi_TRUE@am__append_4430 = $(nodist_terminfo_module_SOURCES) --@COND_arm_efi_TRUE@am__append_4431 = \ -+@COND_ia64_efi_TRUE@am__append_4418 = terminfo.mod -+@COND_ia64_efi_TRUE@am__append_4419 = terminfo.marker -+@COND_arm_efi_TRUE@am__append_4420 = terminfo.module -+@COND_arm_efi_TRUE@am__append_4421 = terminfo.module$(EXEEXT) -+@COND_arm_efi_TRUE@am__append_4422 = -+@COND_arm_efi_TRUE@am__append_4423 = $(nodist_terminfo_module_SOURCES) -+@COND_arm_efi_TRUE@am__append_4424 = \ - @COND_arm_efi_TRUE@ $(nodist_terminfo_module_SOURCES) \ - @COND_arm_efi_TRUE@ terminfo.marker --@COND_arm_efi_TRUE@am__append_4432 = terminfo.mod --@COND_arm_efi_TRUE@am__append_4433 = terminfo.marker --@COND_arm64_efi_TRUE@am__append_4434 = terminfo.module --@COND_arm64_efi_TRUE@am__append_4435 = terminfo.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__append_4436 = --@COND_arm64_efi_TRUE@am__append_4437 = $(nodist_terminfo_module_SOURCES) --@COND_arm64_efi_TRUE@am__append_4438 = \ -+@COND_arm_efi_TRUE@am__append_4425 = terminfo.mod -+@COND_arm_efi_TRUE@am__append_4426 = terminfo.marker -+@COND_arm64_efi_TRUE@am__append_4427 = terminfo.module -+@COND_arm64_efi_TRUE@am__append_4428 = terminfo.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__append_4429 = -+@COND_arm64_efi_TRUE@am__append_4430 = $(nodist_terminfo_module_SOURCES) -+@COND_arm64_efi_TRUE@am__append_4431 = \ - @COND_arm64_efi_TRUE@ $(nodist_terminfo_module_SOURCES) \ - @COND_arm64_efi_TRUE@ terminfo.marker --@COND_arm64_efi_TRUE@am__append_4439 = terminfo.mod --@COND_arm64_efi_TRUE@am__append_4440 = terminfo.marker --@COND_arm_coreboot_TRUE@am__append_4441 = terminfo.module --@COND_arm_coreboot_TRUE@am__append_4442 = terminfo.module$(EXEEXT) --@COND_arm_coreboot_TRUE@am__append_4443 = --@COND_arm_coreboot_TRUE@am__append_4444 = $(nodist_terminfo_module_SOURCES) --@COND_arm_coreboot_TRUE@am__append_4445 = \ -+@COND_arm64_efi_TRUE@am__append_4432 = terminfo.mod -+@COND_arm64_efi_TRUE@am__append_4433 = terminfo.marker -+@COND_arm_coreboot_TRUE@am__append_4434 = terminfo.module -+@COND_arm_coreboot_TRUE@am__append_4435 = terminfo.module$(EXEEXT) -+@COND_arm_coreboot_TRUE@am__append_4436 = -+@COND_arm_coreboot_TRUE@am__append_4437 = $(nodist_terminfo_module_SOURCES) -+@COND_arm_coreboot_TRUE@am__append_4438 = \ - @COND_arm_coreboot_TRUE@ $(nodist_terminfo_module_SOURCES) \ - @COND_arm_coreboot_TRUE@ terminfo.marker --@COND_arm_coreboot_TRUE@am__append_4446 = terminfo.mod --@COND_arm_coreboot_TRUE@am__append_4447 = terminfo.marker --@COND_riscv32_efi_TRUE@am__append_4448 = terminfo.module --@COND_riscv32_efi_TRUE@am__append_4449 = terminfo.module$(EXEEXT) --@COND_riscv32_efi_TRUE@am__append_4450 = --@COND_riscv32_efi_TRUE@am__append_4451 = $(nodist_terminfo_module_SOURCES) --@COND_riscv32_efi_TRUE@am__append_4452 = \ -+@COND_arm_coreboot_TRUE@am__append_4439 = terminfo.mod -+@COND_arm_coreboot_TRUE@am__append_4440 = terminfo.marker -+@COND_riscv32_efi_TRUE@am__append_4441 = terminfo.module -+@COND_riscv32_efi_TRUE@am__append_4442 = terminfo.module$(EXEEXT) -+@COND_riscv32_efi_TRUE@am__append_4443 = -+@COND_riscv32_efi_TRUE@am__append_4444 = $(nodist_terminfo_module_SOURCES) -+@COND_riscv32_efi_TRUE@am__append_4445 = \ - @COND_riscv32_efi_TRUE@ $(nodist_terminfo_module_SOURCES) \ - @COND_riscv32_efi_TRUE@ terminfo.marker --@COND_riscv32_efi_TRUE@am__append_4453 = terminfo.mod --@COND_riscv32_efi_TRUE@am__append_4454 = terminfo.marker --@COND_riscv64_efi_TRUE@am__append_4455 = terminfo.module --@COND_riscv64_efi_TRUE@am__append_4456 = terminfo.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__append_4457 = --@COND_riscv64_efi_TRUE@am__append_4458 = $(nodist_terminfo_module_SOURCES) --@COND_riscv64_efi_TRUE@am__append_4459 = \ -+@COND_riscv32_efi_TRUE@am__append_4446 = terminfo.mod -+@COND_riscv32_efi_TRUE@am__append_4447 = terminfo.marker -+@COND_riscv64_efi_TRUE@am__append_4448 = terminfo.module -+@COND_riscv64_efi_TRUE@am__append_4449 = terminfo.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__append_4450 = -+@COND_riscv64_efi_TRUE@am__append_4451 = $(nodist_terminfo_module_SOURCES) -+@COND_riscv64_efi_TRUE@am__append_4452 = \ - @COND_riscv64_efi_TRUE@ $(nodist_terminfo_module_SOURCES) \ - @COND_riscv64_efi_TRUE@ terminfo.marker --@COND_riscv64_efi_TRUE@am__append_4460 = terminfo.mod --@COND_riscv64_efi_TRUE@am__append_4461 = terminfo.marker --@COND_i386_pc_TRUE@am__append_4462 = usb_keyboard.module --@COND_i386_pc_TRUE@am__append_4463 = usb_keyboard.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__append_4453 = terminfo.mod -+@COND_riscv64_efi_TRUE@am__append_4454 = terminfo.marker -+@COND_i386_pc_TRUE@am__append_4455 = usb_keyboard.module -+@COND_i386_pc_TRUE@am__append_4456 = usb_keyboard.module$(EXEEXT) - @COND_arm_coreboot_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_mips_loongson_FALSE@@COND_x86_64_efi_FALSE@usb_keyboard_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_4464 = --@COND_i386_pc_TRUE@am__append_4465 = $(nodist_usb_keyboard_module_SOURCES) --@COND_i386_pc_TRUE@am__append_4466 = \ -+@COND_i386_pc_TRUE@am__append_4457 = -+@COND_i386_pc_TRUE@am__append_4458 = $(nodist_usb_keyboard_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_4459 = \ - @COND_i386_pc_TRUE@ $(nodist_usb_keyboard_module_SOURCES) \ - @COND_i386_pc_TRUE@ usb_keyboard.marker --@COND_i386_pc_TRUE@am__append_4467 = usb_keyboard.mod --@COND_i386_pc_TRUE@am__append_4468 = usb_keyboard.marker --@COND_i386_efi_TRUE@am__append_4469 = usb_keyboard.module --@COND_i386_efi_TRUE@am__append_4470 = usb_keyboard.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_4471 = --@COND_i386_efi_TRUE@am__append_4472 = $(nodist_usb_keyboard_module_SOURCES) --@COND_i386_efi_TRUE@am__append_4473 = \ -+@COND_i386_pc_TRUE@am__append_4460 = usb_keyboard.mod -+@COND_i386_pc_TRUE@am__append_4461 = usb_keyboard.marker -+@COND_i386_efi_TRUE@am__append_4462 = usb_keyboard.module -+@COND_i386_efi_TRUE@am__append_4463 = usb_keyboard.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_4464 = -+@COND_i386_efi_TRUE@am__append_4465 = $(nodist_usb_keyboard_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_4466 = \ - @COND_i386_efi_TRUE@ $(nodist_usb_keyboard_module_SOURCES) \ - @COND_i386_efi_TRUE@ usb_keyboard.marker --@COND_i386_efi_TRUE@am__append_4474 = usb_keyboard.mod --@COND_i386_efi_TRUE@am__append_4475 = usb_keyboard.marker --@COND_i386_qemu_TRUE@am__append_4476 = usb_keyboard.module --@COND_i386_qemu_TRUE@am__append_4477 = usb_keyboard.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_4478 = --@COND_i386_qemu_TRUE@am__append_4479 = $(nodist_usb_keyboard_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_4480 = \ -+@COND_i386_efi_TRUE@am__append_4467 = usb_keyboard.mod -+@COND_i386_efi_TRUE@am__append_4468 = usb_keyboard.marker -+@COND_i386_qemu_TRUE@am__append_4469 = usb_keyboard.module -+@COND_i386_qemu_TRUE@am__append_4470 = usb_keyboard.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_4471 = -+@COND_i386_qemu_TRUE@am__append_4472 = $(nodist_usb_keyboard_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_4473 = \ - @COND_i386_qemu_TRUE@ $(nodist_usb_keyboard_module_SOURCES) \ - @COND_i386_qemu_TRUE@ usb_keyboard.marker --@COND_i386_qemu_TRUE@am__append_4481 = usb_keyboard.mod --@COND_i386_qemu_TRUE@am__append_4482 = usb_keyboard.marker --@COND_i386_coreboot_TRUE@am__append_4483 = usb_keyboard.module --@COND_i386_coreboot_TRUE@am__append_4484 = usb_keyboard.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_4485 = --@COND_i386_coreboot_TRUE@am__append_4486 = $(nodist_usb_keyboard_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_4487 = $(nodist_usb_keyboard_module_SOURCES) \ -+@COND_i386_qemu_TRUE@am__append_4474 = usb_keyboard.mod -+@COND_i386_qemu_TRUE@am__append_4475 = usb_keyboard.marker -+@COND_i386_coreboot_TRUE@am__append_4476 = usb_keyboard.module -+@COND_i386_coreboot_TRUE@am__append_4477 = usb_keyboard.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_4478 = -+@COND_i386_coreboot_TRUE@am__append_4479 = $(nodist_usb_keyboard_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_4480 = $(nodist_usb_keyboard_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ usb_keyboard.marker --@COND_i386_coreboot_TRUE@am__append_4488 = usb_keyboard.mod --@COND_i386_coreboot_TRUE@am__append_4489 = usb_keyboard.marker --@COND_i386_multiboot_TRUE@am__append_4490 = usb_keyboard.module --@COND_i386_multiboot_TRUE@am__append_4491 = usb_keyboard.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_4492 = --@COND_i386_multiboot_TRUE@am__append_4493 = $(nodist_usb_keyboard_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_4494 = $(nodist_usb_keyboard_module_SOURCES) \ -+@COND_i386_coreboot_TRUE@am__append_4481 = usb_keyboard.mod -+@COND_i386_coreboot_TRUE@am__append_4482 = usb_keyboard.marker -+@COND_i386_multiboot_TRUE@am__append_4483 = usb_keyboard.module -+@COND_i386_multiboot_TRUE@am__append_4484 = usb_keyboard.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_4485 = -+@COND_i386_multiboot_TRUE@am__append_4486 = $(nodist_usb_keyboard_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_4487 = $(nodist_usb_keyboard_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ usb_keyboard.marker --@COND_i386_multiboot_TRUE@am__append_4495 = usb_keyboard.mod --@COND_i386_multiboot_TRUE@am__append_4496 = usb_keyboard.marker --@COND_i386_ieee1275_TRUE@am__append_4497 = usb_keyboard.module --@COND_i386_ieee1275_TRUE@am__append_4498 = usb_keyboard.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_4499 = --@COND_i386_ieee1275_TRUE@am__append_4500 = $(nodist_usb_keyboard_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_4501 = $(nodist_usb_keyboard_module_SOURCES) \ -+@COND_i386_multiboot_TRUE@am__append_4488 = usb_keyboard.mod -+@COND_i386_multiboot_TRUE@am__append_4489 = usb_keyboard.marker -+@COND_i386_ieee1275_TRUE@am__append_4490 = usb_keyboard.module -+@COND_i386_ieee1275_TRUE@am__append_4491 = usb_keyboard.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_4492 = -+@COND_i386_ieee1275_TRUE@am__append_4493 = $(nodist_usb_keyboard_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_4494 = $(nodist_usb_keyboard_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ usb_keyboard.marker --@COND_i386_ieee1275_TRUE@am__append_4502 = usb_keyboard.mod --@COND_i386_ieee1275_TRUE@am__append_4503 = usb_keyboard.marker --@COND_x86_64_efi_TRUE@am__append_4504 = usb_keyboard.module --@COND_x86_64_efi_TRUE@am__append_4505 = usb_keyboard.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_4506 = --@COND_x86_64_efi_TRUE@am__append_4507 = $(nodist_usb_keyboard_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_4508 = \ -+@COND_i386_ieee1275_TRUE@am__append_4495 = usb_keyboard.mod -+@COND_i386_ieee1275_TRUE@am__append_4496 = usb_keyboard.marker -+@COND_x86_64_efi_TRUE@am__append_4497 = usb_keyboard.module -+@COND_x86_64_efi_TRUE@am__append_4498 = usb_keyboard.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_4499 = -+@COND_x86_64_efi_TRUE@am__append_4500 = $(nodist_usb_keyboard_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_4501 = \ - @COND_x86_64_efi_TRUE@ $(nodist_usb_keyboard_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ usb_keyboard.marker --@COND_x86_64_efi_TRUE@am__append_4509 = usb_keyboard.mod --@COND_x86_64_efi_TRUE@am__append_4510 = usb_keyboard.marker --@COND_mips_loongson_TRUE@am__append_4511 = usb_keyboard.module --@COND_mips_loongson_TRUE@am__append_4512 = usb_keyboard.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__append_4513 = --@COND_mips_loongson_TRUE@am__append_4514 = $(nodist_usb_keyboard_module_SOURCES) --@COND_mips_loongson_TRUE@am__append_4515 = $(nodist_usb_keyboard_module_SOURCES) \ -+@COND_x86_64_efi_TRUE@am__append_4502 = usb_keyboard.mod -+@COND_x86_64_efi_TRUE@am__append_4503 = usb_keyboard.marker -+@COND_mips_loongson_TRUE@am__append_4504 = usb_keyboard.module -+@COND_mips_loongson_TRUE@am__append_4505 = usb_keyboard.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__append_4506 = -+@COND_mips_loongson_TRUE@am__append_4507 = $(nodist_usb_keyboard_module_SOURCES) -+@COND_mips_loongson_TRUE@am__append_4508 = $(nodist_usb_keyboard_module_SOURCES) \ - @COND_mips_loongson_TRUE@ usb_keyboard.marker --@COND_mips_loongson_TRUE@am__append_4516 = usb_keyboard.mod --@COND_mips_loongson_TRUE@am__append_4517 = usb_keyboard.marker --@COND_arm_coreboot_TRUE@am__append_4518 = usb_keyboard.module --@COND_arm_coreboot_TRUE@am__append_4519 = usb_keyboard.module$(EXEEXT) --@COND_arm_coreboot_TRUE@am__append_4520 = --@COND_arm_coreboot_TRUE@am__append_4521 = $(nodist_usb_keyboard_module_SOURCES) --@COND_arm_coreboot_TRUE@am__append_4522 = \ -+@COND_mips_loongson_TRUE@am__append_4509 = usb_keyboard.mod -+@COND_mips_loongson_TRUE@am__append_4510 = usb_keyboard.marker -+@COND_arm_coreboot_TRUE@am__append_4511 = usb_keyboard.module -+@COND_arm_coreboot_TRUE@am__append_4512 = usb_keyboard.module$(EXEEXT) -+@COND_arm_coreboot_TRUE@am__append_4513 = -+@COND_arm_coreboot_TRUE@am__append_4514 = $(nodist_usb_keyboard_module_SOURCES) -+@COND_arm_coreboot_TRUE@am__append_4515 = \ - @COND_arm_coreboot_TRUE@ $(nodist_usb_keyboard_module_SOURCES) \ - @COND_arm_coreboot_TRUE@ usb_keyboard.marker --@COND_arm_coreboot_TRUE@am__append_4523 = usb_keyboard.mod --@COND_arm_coreboot_TRUE@am__append_4524 = usb_keyboard.marker --@COND_i386_pc_TRUE@am__append_4525 = vga.module vga_text.module \ -+@COND_arm_coreboot_TRUE@am__append_4516 = usb_keyboard.mod -+@COND_arm_coreboot_TRUE@am__append_4517 = usb_keyboard.marker -+@COND_i386_pc_TRUE@am__append_4518 = vga.module vga_text.module \ - @COND_i386_pc_TRUE@ mda_text.module --@COND_i386_pc_TRUE@am__append_4526 = vga.module$(EXEEXT) \ -+@COND_i386_pc_TRUE@am__append_4519 = vga.module$(EXEEXT) \ - @COND_i386_pc_TRUE@ vga_text.module$(EXEEXT) \ - @COND_i386_pc_TRUE@ mda_text.module$(EXEEXT) - @COND_i386_pc_FALSE@vga_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_4527 = --@COND_i386_pc_TRUE@am__append_4528 = $(nodist_vga_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_4520 = -+@COND_i386_pc_TRUE@am__append_4521 = $(nodist_vga_module_SOURCES) \ - @COND_i386_pc_TRUE@ $(nodist_vga_text_module_SOURCES) \ - @COND_i386_pc_TRUE@ $(nodist_mda_text_module_SOURCES) --@COND_i386_pc_TRUE@am__append_4529 = $(nodist_vga_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_4522 = $(nodist_vga_module_SOURCES) \ - @COND_i386_pc_TRUE@ vga.marker \ - @COND_i386_pc_TRUE@ $(nodist_vga_text_module_SOURCES) \ - @COND_i386_pc_TRUE@ vga_text.marker \ - @COND_i386_pc_TRUE@ $(nodist_mda_text_module_SOURCES) \ - @COND_i386_pc_TRUE@ mda_text.marker --@COND_i386_pc_TRUE@am__append_4530 = vga.mod vga_text.mod mda_text.mod --@COND_i386_pc_TRUE@am__append_4531 = vga.marker vga_text.marker \ -+@COND_i386_pc_TRUE@am__append_4523 = vga.mod vga_text.mod mda_text.mod -+@COND_i386_pc_TRUE@am__append_4524 = vga.marker vga_text.marker \ - @COND_i386_pc_TRUE@ mda_text.marker - @COND_i386_pc_FALSE@vga_text_module_DEPENDENCIES = - @COND_i386_coreboot_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@mda_text_module_DEPENDENCIES = --@COND_i386_qemu_TRUE@am__append_4532 = mda_text.module --@COND_i386_qemu_TRUE@am__append_4533 = mda_text.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_4534 = --@COND_i386_qemu_TRUE@am__append_4535 = $(nodist_mda_text_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_4536 = \ -+@COND_i386_qemu_TRUE@am__append_4525 = mda_text.module -+@COND_i386_qemu_TRUE@am__append_4526 = mda_text.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_4527 = -+@COND_i386_qemu_TRUE@am__append_4528 = $(nodist_mda_text_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_4529 = \ - @COND_i386_qemu_TRUE@ $(nodist_mda_text_module_SOURCES) \ - @COND_i386_qemu_TRUE@ mda_text.marker --@COND_i386_qemu_TRUE@am__append_4537 = mda_text.mod --@COND_i386_qemu_TRUE@am__append_4538 = mda_text.marker --@COND_i386_coreboot_TRUE@am__append_4539 = mda_text.module --@COND_i386_coreboot_TRUE@am__append_4540 = mda_text.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_4541 = --@COND_i386_coreboot_TRUE@am__append_4542 = $(nodist_mda_text_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_4543 = \ -+@COND_i386_qemu_TRUE@am__append_4530 = mda_text.mod -+@COND_i386_qemu_TRUE@am__append_4531 = mda_text.marker -+@COND_i386_coreboot_TRUE@am__append_4532 = mda_text.module -+@COND_i386_coreboot_TRUE@am__append_4533 = mda_text.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_4534 = -+@COND_i386_coreboot_TRUE@am__append_4535 = $(nodist_mda_text_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_4536 = \ - @COND_i386_coreboot_TRUE@ $(nodist_mda_text_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ mda_text.marker --@COND_i386_coreboot_TRUE@am__append_4544 = mda_text.mod --@COND_i386_coreboot_TRUE@am__append_4545 = mda_text.marker --@COND_i386_multiboot_TRUE@am__append_4546 = mda_text.module --@COND_i386_multiboot_TRUE@am__append_4547 = mda_text.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_4548 = --@COND_i386_multiboot_TRUE@am__append_4549 = $(nodist_mda_text_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_4550 = \ -+@COND_i386_coreboot_TRUE@am__append_4537 = mda_text.mod -+@COND_i386_coreboot_TRUE@am__append_4538 = mda_text.marker -+@COND_i386_multiboot_TRUE@am__append_4539 = mda_text.module -+@COND_i386_multiboot_TRUE@am__append_4540 = mda_text.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_4541 = -+@COND_i386_multiboot_TRUE@am__append_4542 = $(nodist_mda_text_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_4543 = \ - @COND_i386_multiboot_TRUE@ $(nodist_mda_text_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ mda_text.marker --@COND_i386_multiboot_TRUE@am__append_4551 = mda_text.mod --@COND_i386_multiboot_TRUE@am__append_4552 = mda_text.marker --@COND_i386_pc_TRUE@am__append_4553 = video_cirrus.module --@COND_i386_pc_TRUE@am__append_4554 = video_cirrus.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_4544 = mda_text.mod -+@COND_i386_multiboot_TRUE@am__append_4545 = mda_text.marker -+@COND_i386_pc_TRUE@am__append_4546 = video_cirrus.module -+@COND_i386_pc_TRUE@am__append_4547 = video_cirrus.module$(EXEEXT) - @COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_x86_64_efi_FALSE@video_cirrus_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_4555 = --@COND_i386_pc_TRUE@am__append_4556 = $(nodist_video_cirrus_module_SOURCES) --@COND_i386_pc_TRUE@am__append_4557 = \ -+@COND_i386_pc_TRUE@am__append_4548 = -+@COND_i386_pc_TRUE@am__append_4549 = $(nodist_video_cirrus_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_4550 = \ - @COND_i386_pc_TRUE@ $(nodist_video_cirrus_module_SOURCES) \ - @COND_i386_pc_TRUE@ video_cirrus.marker --@COND_i386_pc_TRUE@am__append_4558 = video_cirrus.mod --@COND_i386_pc_TRUE@am__append_4559 = video_cirrus.marker --@COND_i386_efi_TRUE@am__append_4560 = video_cirrus.module --@COND_i386_efi_TRUE@am__append_4561 = video_cirrus.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_4562 = --@COND_i386_efi_TRUE@am__append_4563 = $(nodist_video_cirrus_module_SOURCES) --@COND_i386_efi_TRUE@am__append_4564 = \ -+@COND_i386_pc_TRUE@am__append_4551 = video_cirrus.mod -+@COND_i386_pc_TRUE@am__append_4552 = video_cirrus.marker -+@COND_i386_efi_TRUE@am__append_4553 = video_cirrus.module -+@COND_i386_efi_TRUE@am__append_4554 = video_cirrus.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_4555 = -+@COND_i386_efi_TRUE@am__append_4556 = $(nodist_video_cirrus_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_4557 = \ - @COND_i386_efi_TRUE@ $(nodist_video_cirrus_module_SOURCES) \ - @COND_i386_efi_TRUE@ video_cirrus.marker --@COND_i386_efi_TRUE@am__append_4565 = video_cirrus.mod --@COND_i386_efi_TRUE@am__append_4566 = video_cirrus.marker --@COND_i386_qemu_TRUE@am__append_4567 = video_cirrus.module --@COND_i386_qemu_TRUE@am__append_4568 = video_cirrus.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_4569 = --@COND_i386_qemu_TRUE@am__append_4570 = $(nodist_video_cirrus_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_4571 = \ -+@COND_i386_efi_TRUE@am__append_4558 = video_cirrus.mod -+@COND_i386_efi_TRUE@am__append_4559 = video_cirrus.marker -+@COND_i386_qemu_TRUE@am__append_4560 = video_cirrus.module -+@COND_i386_qemu_TRUE@am__append_4561 = video_cirrus.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_4562 = -+@COND_i386_qemu_TRUE@am__append_4563 = $(nodist_video_cirrus_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_4564 = \ - @COND_i386_qemu_TRUE@ $(nodist_video_cirrus_module_SOURCES) \ - @COND_i386_qemu_TRUE@ video_cirrus.marker --@COND_i386_qemu_TRUE@am__append_4572 = video_cirrus.mod --@COND_i386_qemu_TRUE@am__append_4573 = video_cirrus.marker --@COND_i386_coreboot_TRUE@am__append_4574 = video_cirrus.module --@COND_i386_coreboot_TRUE@am__append_4575 = video_cirrus.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_4576 = --@COND_i386_coreboot_TRUE@am__append_4577 = $(nodist_video_cirrus_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_4578 = $(nodist_video_cirrus_module_SOURCES) \ -+@COND_i386_qemu_TRUE@am__append_4565 = video_cirrus.mod -+@COND_i386_qemu_TRUE@am__append_4566 = video_cirrus.marker -+@COND_i386_coreboot_TRUE@am__append_4567 = video_cirrus.module -+@COND_i386_coreboot_TRUE@am__append_4568 = video_cirrus.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_4569 = -+@COND_i386_coreboot_TRUE@am__append_4570 = $(nodist_video_cirrus_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_4571 = $(nodist_video_cirrus_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ video_cirrus.marker --@COND_i386_coreboot_TRUE@am__append_4579 = video_cirrus.mod --@COND_i386_coreboot_TRUE@am__append_4580 = video_cirrus.marker --@COND_i386_multiboot_TRUE@am__append_4581 = video_cirrus.module --@COND_i386_multiboot_TRUE@am__append_4582 = video_cirrus.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_4583 = --@COND_i386_multiboot_TRUE@am__append_4584 = $(nodist_video_cirrus_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_4585 = $(nodist_video_cirrus_module_SOURCES) \ -+@COND_i386_coreboot_TRUE@am__append_4572 = video_cirrus.mod -+@COND_i386_coreboot_TRUE@am__append_4573 = video_cirrus.marker -+@COND_i386_multiboot_TRUE@am__append_4574 = video_cirrus.module -+@COND_i386_multiboot_TRUE@am__append_4575 = video_cirrus.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_4576 = -+@COND_i386_multiboot_TRUE@am__append_4577 = $(nodist_video_cirrus_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_4578 = $(nodist_video_cirrus_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ video_cirrus.marker --@COND_i386_multiboot_TRUE@am__append_4586 = video_cirrus.mod --@COND_i386_multiboot_TRUE@am__append_4587 = video_cirrus.marker --@COND_i386_ieee1275_TRUE@am__append_4588 = video_cirrus.module --@COND_i386_ieee1275_TRUE@am__append_4589 = video_cirrus.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_4590 = --@COND_i386_ieee1275_TRUE@am__append_4591 = $(nodist_video_cirrus_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_4592 = $(nodist_video_cirrus_module_SOURCES) \ -+@COND_i386_multiboot_TRUE@am__append_4579 = video_cirrus.mod -+@COND_i386_multiboot_TRUE@am__append_4580 = video_cirrus.marker -+@COND_i386_ieee1275_TRUE@am__append_4581 = video_cirrus.module -+@COND_i386_ieee1275_TRUE@am__append_4582 = video_cirrus.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_4583 = -+@COND_i386_ieee1275_TRUE@am__append_4584 = $(nodist_video_cirrus_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_4585 = $(nodist_video_cirrus_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ video_cirrus.marker --@COND_i386_ieee1275_TRUE@am__append_4593 = video_cirrus.mod --@COND_i386_ieee1275_TRUE@am__append_4594 = video_cirrus.marker --@COND_x86_64_efi_TRUE@am__append_4595 = video_cirrus.module --@COND_x86_64_efi_TRUE@am__append_4596 = video_cirrus.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_4597 = --@COND_x86_64_efi_TRUE@am__append_4598 = $(nodist_video_cirrus_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_4599 = \ -+@COND_i386_ieee1275_TRUE@am__append_4586 = video_cirrus.mod -+@COND_i386_ieee1275_TRUE@am__append_4587 = video_cirrus.marker -+@COND_x86_64_efi_TRUE@am__append_4588 = video_cirrus.module -+@COND_x86_64_efi_TRUE@am__append_4589 = video_cirrus.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_4590 = -+@COND_x86_64_efi_TRUE@am__append_4591 = $(nodist_video_cirrus_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_4592 = \ - @COND_x86_64_efi_TRUE@ $(nodist_video_cirrus_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ video_cirrus.marker --@COND_x86_64_efi_TRUE@am__append_4600 = video_cirrus.mod --@COND_x86_64_efi_TRUE@am__append_4601 = video_cirrus.marker --@COND_i386_pc_TRUE@am__append_4602 = video_bochs.module --@COND_i386_pc_TRUE@am__append_4603 = video_bochs.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_4593 = video_cirrus.mod -+@COND_x86_64_efi_TRUE@am__append_4594 = video_cirrus.marker -+@COND_i386_pc_TRUE@am__append_4595 = video_bochs.module -+@COND_i386_pc_TRUE@am__append_4596 = video_bochs.module$(EXEEXT) - @COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_x86_64_efi_FALSE@video_bochs_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_4604 = --@COND_i386_pc_TRUE@am__append_4605 = $(nodist_video_bochs_module_SOURCES) --@COND_i386_pc_TRUE@am__append_4606 = \ -+@COND_i386_pc_TRUE@am__append_4597 = -+@COND_i386_pc_TRUE@am__append_4598 = $(nodist_video_bochs_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_4599 = \ - @COND_i386_pc_TRUE@ $(nodist_video_bochs_module_SOURCES) \ - @COND_i386_pc_TRUE@ video_bochs.marker --@COND_i386_pc_TRUE@am__append_4607 = video_bochs.mod --@COND_i386_pc_TRUE@am__append_4608 = video_bochs.marker --@COND_i386_efi_TRUE@am__append_4609 = video_bochs.module --@COND_i386_efi_TRUE@am__append_4610 = video_bochs.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_4611 = --@COND_i386_efi_TRUE@am__append_4612 = $(nodist_video_bochs_module_SOURCES) --@COND_i386_efi_TRUE@am__append_4613 = \ -+@COND_i386_pc_TRUE@am__append_4600 = video_bochs.mod -+@COND_i386_pc_TRUE@am__append_4601 = video_bochs.marker -+@COND_i386_efi_TRUE@am__append_4602 = video_bochs.module -+@COND_i386_efi_TRUE@am__append_4603 = video_bochs.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_4604 = -+@COND_i386_efi_TRUE@am__append_4605 = $(nodist_video_bochs_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_4606 = \ - @COND_i386_efi_TRUE@ $(nodist_video_bochs_module_SOURCES) \ - @COND_i386_efi_TRUE@ video_bochs.marker --@COND_i386_efi_TRUE@am__append_4614 = video_bochs.mod --@COND_i386_efi_TRUE@am__append_4615 = video_bochs.marker --@COND_i386_qemu_TRUE@am__append_4616 = video_bochs.module --@COND_i386_qemu_TRUE@am__append_4617 = video_bochs.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_4618 = --@COND_i386_qemu_TRUE@am__append_4619 = $(nodist_video_bochs_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_4620 = \ -+@COND_i386_efi_TRUE@am__append_4607 = video_bochs.mod -+@COND_i386_efi_TRUE@am__append_4608 = video_bochs.marker -+@COND_i386_qemu_TRUE@am__append_4609 = video_bochs.module -+@COND_i386_qemu_TRUE@am__append_4610 = video_bochs.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_4611 = -+@COND_i386_qemu_TRUE@am__append_4612 = $(nodist_video_bochs_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_4613 = \ - @COND_i386_qemu_TRUE@ $(nodist_video_bochs_module_SOURCES) \ - @COND_i386_qemu_TRUE@ video_bochs.marker --@COND_i386_qemu_TRUE@am__append_4621 = video_bochs.mod --@COND_i386_qemu_TRUE@am__append_4622 = video_bochs.marker --@COND_i386_coreboot_TRUE@am__append_4623 = video_bochs.module --@COND_i386_coreboot_TRUE@am__append_4624 = video_bochs.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_4625 = --@COND_i386_coreboot_TRUE@am__append_4626 = $(nodist_video_bochs_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_4627 = \ -+@COND_i386_qemu_TRUE@am__append_4614 = video_bochs.mod -+@COND_i386_qemu_TRUE@am__append_4615 = video_bochs.marker -+@COND_i386_coreboot_TRUE@am__append_4616 = video_bochs.module -+@COND_i386_coreboot_TRUE@am__append_4617 = video_bochs.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_4618 = -+@COND_i386_coreboot_TRUE@am__append_4619 = $(nodist_video_bochs_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_4620 = \ - @COND_i386_coreboot_TRUE@ $(nodist_video_bochs_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ video_bochs.marker --@COND_i386_coreboot_TRUE@am__append_4628 = video_bochs.mod --@COND_i386_coreboot_TRUE@am__append_4629 = video_bochs.marker --@COND_i386_multiboot_TRUE@am__append_4630 = video_bochs.module --@COND_i386_multiboot_TRUE@am__append_4631 = video_bochs.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_4632 = --@COND_i386_multiboot_TRUE@am__append_4633 = $(nodist_video_bochs_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_4634 = $(nodist_video_bochs_module_SOURCES) \ -+@COND_i386_coreboot_TRUE@am__append_4621 = video_bochs.mod -+@COND_i386_coreboot_TRUE@am__append_4622 = video_bochs.marker -+@COND_i386_multiboot_TRUE@am__append_4623 = video_bochs.module -+@COND_i386_multiboot_TRUE@am__append_4624 = video_bochs.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_4625 = -+@COND_i386_multiboot_TRUE@am__append_4626 = $(nodist_video_bochs_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_4627 = $(nodist_video_bochs_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ video_bochs.marker --@COND_i386_multiboot_TRUE@am__append_4635 = video_bochs.mod --@COND_i386_multiboot_TRUE@am__append_4636 = video_bochs.marker --@COND_i386_ieee1275_TRUE@am__append_4637 = video_bochs.module --@COND_i386_ieee1275_TRUE@am__append_4638 = video_bochs.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_4639 = --@COND_i386_ieee1275_TRUE@am__append_4640 = $(nodist_video_bochs_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_4641 = \ -+@COND_i386_multiboot_TRUE@am__append_4628 = video_bochs.mod -+@COND_i386_multiboot_TRUE@am__append_4629 = video_bochs.marker -+@COND_i386_ieee1275_TRUE@am__append_4630 = video_bochs.module -+@COND_i386_ieee1275_TRUE@am__append_4631 = video_bochs.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_4632 = -+@COND_i386_ieee1275_TRUE@am__append_4633 = $(nodist_video_bochs_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_4634 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_video_bochs_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ video_bochs.marker --@COND_i386_ieee1275_TRUE@am__append_4642 = video_bochs.mod --@COND_i386_ieee1275_TRUE@am__append_4643 = video_bochs.marker --@COND_x86_64_efi_TRUE@am__append_4644 = video_bochs.module --@COND_x86_64_efi_TRUE@am__append_4645 = video_bochs.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_4646 = --@COND_x86_64_efi_TRUE@am__append_4647 = $(nodist_video_bochs_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_4648 = \ -+@COND_i386_ieee1275_TRUE@am__append_4635 = video_bochs.mod -+@COND_i386_ieee1275_TRUE@am__append_4636 = video_bochs.marker -+@COND_x86_64_efi_TRUE@am__append_4637 = video_bochs.module -+@COND_x86_64_efi_TRUE@am__append_4638 = video_bochs.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_4639 = -+@COND_x86_64_efi_TRUE@am__append_4640 = $(nodist_video_bochs_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_4641 = \ - @COND_x86_64_efi_TRUE@ $(nodist_video_bochs_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ video_bochs.marker --@COND_x86_64_efi_TRUE@am__append_4649 = video_bochs.mod --@COND_x86_64_efi_TRUE@am__append_4650 = video_bochs.marker --@COND_emu_TRUE@am__append_4651 = legacy_password_test.module --@COND_emu_TRUE@am__append_4652 = legacy_password_test.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_4642 = video_bochs.mod -+@COND_x86_64_efi_TRUE@am__append_4643 = video_bochs.marker -+@COND_emu_TRUE@am__append_4644 = legacy_password_test.module -+@COND_emu_TRUE@am__append_4645 = legacy_password_test.module$(EXEEXT) - @COND_emu_FALSE@@COND_i386_efi_FALSE@@COND_i386_pc_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_FALSE@legacy_password_test_module_DEPENDENCIES = --@COND_emu_TRUE@am__append_4653 = --@COND_emu_TRUE@am__append_4654 = $(nodist_legacy_password_test_module_SOURCES) --@COND_emu_TRUE@am__append_4655 = \ -+@COND_emu_TRUE@am__append_4646 = -+@COND_emu_TRUE@am__append_4647 = $(nodist_legacy_password_test_module_SOURCES) -+@COND_emu_TRUE@am__append_4648 = \ - @COND_emu_TRUE@ $(nodist_legacy_password_test_module_SOURCES) \ - @COND_emu_TRUE@ legacy_password_test.marker --@COND_emu_TRUE@am__append_4656 = legacy_password_test.mod --@COND_emu_TRUE@am__append_4657 = legacy_password_test.marker --@COND_i386_pc_TRUE@am__append_4658 = legacy_password_test.module --@COND_i386_pc_TRUE@am__append_4659 = legacy_password_test.module$(EXEEXT) --@COND_i386_pc_TRUE@am__append_4660 = --@COND_i386_pc_TRUE@am__append_4661 = $(nodist_legacy_password_test_module_SOURCES) --@COND_i386_pc_TRUE@am__append_4662 = $(nodist_legacy_password_test_module_SOURCES) \ -+@COND_emu_TRUE@am__append_4649 = legacy_password_test.mod -+@COND_emu_TRUE@am__append_4650 = legacy_password_test.marker -+@COND_i386_pc_TRUE@am__append_4651 = legacy_password_test.module -+@COND_i386_pc_TRUE@am__append_4652 = legacy_password_test.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__append_4653 = -+@COND_i386_pc_TRUE@am__append_4654 = $(nodist_legacy_password_test_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_4655 = $(nodist_legacy_password_test_module_SOURCES) \ - @COND_i386_pc_TRUE@ legacy_password_test.marker --@COND_i386_pc_TRUE@am__append_4663 = legacy_password_test.mod --@COND_i386_pc_TRUE@am__append_4664 = legacy_password_test.marker --@COND_i386_efi_TRUE@am__append_4665 = legacy_password_test.module --@COND_i386_efi_TRUE@am__append_4666 = legacy_password_test.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_4667 = --@COND_i386_efi_TRUE@am__append_4668 = $(nodist_legacy_password_test_module_SOURCES) --@COND_i386_efi_TRUE@am__append_4669 = $(nodist_legacy_password_test_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_4656 = legacy_password_test.mod -+@COND_i386_pc_TRUE@am__append_4657 = legacy_password_test.marker -+@COND_i386_efi_TRUE@am__append_4658 = legacy_password_test.module -+@COND_i386_efi_TRUE@am__append_4659 = legacy_password_test.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_4660 = -+@COND_i386_efi_TRUE@am__append_4661 = $(nodist_legacy_password_test_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_4662 = $(nodist_legacy_password_test_module_SOURCES) \ - @COND_i386_efi_TRUE@ legacy_password_test.marker --@COND_i386_efi_TRUE@am__append_4670 = legacy_password_test.mod --@COND_i386_efi_TRUE@am__append_4671 = legacy_password_test.marker --@COND_x86_64_efi_TRUE@am__append_4672 = legacy_password_test.module --@COND_x86_64_efi_TRUE@am__append_4673 = legacy_password_test.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_4674 = --@COND_x86_64_efi_TRUE@am__append_4675 = $(nodist_legacy_password_test_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_4676 = $(nodist_legacy_password_test_module_SOURCES) \ -+@COND_i386_efi_TRUE@am__append_4663 = legacy_password_test.mod -+@COND_i386_efi_TRUE@am__append_4664 = legacy_password_test.marker -+@COND_x86_64_efi_TRUE@am__append_4665 = legacy_password_test.module -+@COND_x86_64_efi_TRUE@am__append_4666 = legacy_password_test.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_4667 = -+@COND_x86_64_efi_TRUE@am__append_4668 = $(nodist_legacy_password_test_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_4669 = $(nodist_legacy_password_test_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ legacy_password_test.marker --@COND_x86_64_efi_TRUE@am__append_4677 = legacy_password_test.mod --@COND_x86_64_efi_TRUE@am__append_4678 = legacy_password_test.marker --@COND_i386_xen_TRUE@am__append_4679 = legacy_password_test.module --@COND_i386_xen_TRUE@am__append_4680 = legacy_password_test.module$(EXEEXT) --@COND_i386_xen_TRUE@am__append_4681 = --@COND_i386_xen_TRUE@am__append_4682 = $(nodist_legacy_password_test_module_SOURCES) --@COND_i386_xen_TRUE@am__append_4683 = $(nodist_legacy_password_test_module_SOURCES) \ -+@COND_x86_64_efi_TRUE@am__append_4670 = legacy_password_test.mod -+@COND_x86_64_efi_TRUE@am__append_4671 = legacy_password_test.marker -+@COND_i386_xen_TRUE@am__append_4672 = legacy_password_test.module -+@COND_i386_xen_TRUE@am__append_4673 = legacy_password_test.module$(EXEEXT) -+@COND_i386_xen_TRUE@am__append_4674 = -+@COND_i386_xen_TRUE@am__append_4675 = $(nodist_legacy_password_test_module_SOURCES) -+@COND_i386_xen_TRUE@am__append_4676 = $(nodist_legacy_password_test_module_SOURCES) \ - @COND_i386_xen_TRUE@ legacy_password_test.marker --@COND_i386_xen_TRUE@am__append_4684 = legacy_password_test.mod --@COND_i386_xen_TRUE@am__append_4685 = legacy_password_test.marker --@COND_x86_64_xen_TRUE@am__append_4686 = legacy_password_test.module --@COND_x86_64_xen_TRUE@am__append_4687 = legacy_password_test.module$(EXEEXT) --@COND_x86_64_xen_TRUE@am__append_4688 = --@COND_x86_64_xen_TRUE@am__append_4689 = $(nodist_legacy_password_test_module_SOURCES) --@COND_x86_64_xen_TRUE@am__append_4690 = $(nodist_legacy_password_test_module_SOURCES) \ -+@COND_i386_xen_TRUE@am__append_4677 = legacy_password_test.mod -+@COND_i386_xen_TRUE@am__append_4678 = legacy_password_test.marker -+@COND_x86_64_xen_TRUE@am__append_4679 = legacy_password_test.module -+@COND_x86_64_xen_TRUE@am__append_4680 = legacy_password_test.module$(EXEEXT) -+@COND_x86_64_xen_TRUE@am__append_4681 = -+@COND_x86_64_xen_TRUE@am__append_4682 = $(nodist_legacy_password_test_module_SOURCES) -+@COND_x86_64_xen_TRUE@am__append_4683 = $(nodist_legacy_password_test_module_SOURCES) \ - @COND_x86_64_xen_TRUE@ legacy_password_test.marker --@COND_x86_64_xen_TRUE@am__append_4691 = legacy_password_test.mod --@COND_x86_64_xen_TRUE@am__append_4692 = legacy_password_test.marker --@COND_i386_xen_pvh_TRUE@am__append_4693 = legacy_password_test.module --@COND_i386_xen_pvh_TRUE@am__append_4694 = legacy_password_test.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__append_4695 = --@COND_i386_xen_pvh_TRUE@am__append_4696 = $(nodist_legacy_password_test_module_SOURCES) --@COND_i386_xen_pvh_TRUE@am__append_4697 = $(nodist_legacy_password_test_module_SOURCES) \ -+@COND_x86_64_xen_TRUE@am__append_4684 = legacy_password_test.mod -+@COND_x86_64_xen_TRUE@am__append_4685 = legacy_password_test.marker -+@COND_i386_xen_pvh_TRUE@am__append_4686 = legacy_password_test.module -+@COND_i386_xen_pvh_TRUE@am__append_4687 = legacy_password_test.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__append_4688 = -+@COND_i386_xen_pvh_TRUE@am__append_4689 = $(nodist_legacy_password_test_module_SOURCES) -+@COND_i386_xen_pvh_TRUE@am__append_4690 = $(nodist_legacy_password_test_module_SOURCES) \ - @COND_i386_xen_pvh_TRUE@ legacy_password_test.marker --@COND_i386_xen_pvh_TRUE@am__append_4698 = legacy_password_test.mod --@COND_i386_xen_pvh_TRUE@am__append_4699 = legacy_password_test.marker --@COND_emu_TRUE@am__append_4700 = div.module --@COND_emu_TRUE@am__append_4701 = div.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__append_4691 = legacy_password_test.mod -+@COND_i386_xen_pvh_TRUE@am__append_4692 = legacy_password_test.marker -+@COND_emu_TRUE@am__append_4693 = div.module -+@COND_emu_TRUE@am__append_4694 = div.module$(EXEEXT) - @COND_arm64_efi_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_FALSE@div_module_DEPENDENCIES = --@COND_emu_TRUE@am__append_4702 = --@COND_emu_TRUE@am__append_4703 = $(nodist_div_module_SOURCES) --@COND_emu_TRUE@am__append_4704 = $(nodist_div_module_SOURCES) \ -+@COND_emu_TRUE@am__append_4695 = -+@COND_emu_TRUE@am__append_4696 = $(nodist_div_module_SOURCES) -+@COND_emu_TRUE@am__append_4697 = $(nodist_div_module_SOURCES) \ - @COND_emu_TRUE@ div.marker --@COND_emu_TRUE@am__append_4705 = div.mod --@COND_emu_TRUE@am__append_4706 = div.marker --@COND_i386_pc_TRUE@am__append_4707 = div.module --@COND_i386_pc_TRUE@am__append_4708 = div.module$(EXEEXT) --@COND_i386_pc_TRUE@am__append_4709 = --@COND_i386_pc_TRUE@am__append_4710 = $(nodist_div_module_SOURCES) --@COND_i386_pc_TRUE@am__append_4711 = $(nodist_div_module_SOURCES) \ -+@COND_emu_TRUE@am__append_4698 = div.mod -+@COND_emu_TRUE@am__append_4699 = div.marker -+@COND_i386_pc_TRUE@am__append_4700 = div.module -+@COND_i386_pc_TRUE@am__append_4701 = div.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__append_4702 = -+@COND_i386_pc_TRUE@am__append_4703 = $(nodist_div_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_4704 = $(nodist_div_module_SOURCES) \ - @COND_i386_pc_TRUE@ div.marker --@COND_i386_pc_TRUE@am__append_4712 = div.mod --@COND_i386_pc_TRUE@am__append_4713 = div.marker --@COND_i386_efi_TRUE@am__append_4714 = div.module --@COND_i386_efi_TRUE@am__append_4715 = div.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_4716 = --@COND_i386_efi_TRUE@am__append_4717 = $(nodist_div_module_SOURCES) --@COND_i386_efi_TRUE@am__append_4718 = $(nodist_div_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_4705 = div.mod -+@COND_i386_pc_TRUE@am__append_4706 = div.marker -+@COND_i386_efi_TRUE@am__append_4707 = div.module -+@COND_i386_efi_TRUE@am__append_4708 = div.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_4709 = -+@COND_i386_efi_TRUE@am__append_4710 = $(nodist_div_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_4711 = $(nodist_div_module_SOURCES) \ - @COND_i386_efi_TRUE@ div.marker --@COND_i386_efi_TRUE@am__append_4719 = div.mod --@COND_i386_efi_TRUE@am__append_4720 = div.marker --@COND_i386_qemu_TRUE@am__append_4721 = div.module --@COND_i386_qemu_TRUE@am__append_4722 = div.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_4723 = --@COND_i386_qemu_TRUE@am__append_4724 = $(nodist_div_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_4725 = $(nodist_div_module_SOURCES) \ -+@COND_i386_efi_TRUE@am__append_4712 = div.mod -+@COND_i386_efi_TRUE@am__append_4713 = div.marker -+@COND_i386_qemu_TRUE@am__append_4714 = div.module -+@COND_i386_qemu_TRUE@am__append_4715 = div.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_4716 = -+@COND_i386_qemu_TRUE@am__append_4717 = $(nodist_div_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_4718 = $(nodist_div_module_SOURCES) \ - @COND_i386_qemu_TRUE@ div.marker --@COND_i386_qemu_TRUE@am__append_4726 = div.mod --@COND_i386_qemu_TRUE@am__append_4727 = div.marker --@COND_i386_coreboot_TRUE@am__append_4728 = div.module --@COND_i386_coreboot_TRUE@am__append_4729 = div.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_4730 = --@COND_i386_coreboot_TRUE@am__append_4731 = $(nodist_div_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_4732 = \ -+@COND_i386_qemu_TRUE@am__append_4719 = div.mod -+@COND_i386_qemu_TRUE@am__append_4720 = div.marker -+@COND_i386_coreboot_TRUE@am__append_4721 = div.module -+@COND_i386_coreboot_TRUE@am__append_4722 = div.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_4723 = -+@COND_i386_coreboot_TRUE@am__append_4724 = $(nodist_div_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_4725 = \ - @COND_i386_coreboot_TRUE@ $(nodist_div_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ div.marker --@COND_i386_coreboot_TRUE@am__append_4733 = div.mod --@COND_i386_coreboot_TRUE@am__append_4734 = div.marker --@COND_i386_multiboot_TRUE@am__append_4735 = div.module --@COND_i386_multiboot_TRUE@am__append_4736 = div.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_4737 = --@COND_i386_multiboot_TRUE@am__append_4738 = $(nodist_div_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_4739 = \ -+@COND_i386_coreboot_TRUE@am__append_4726 = div.mod -+@COND_i386_coreboot_TRUE@am__append_4727 = div.marker -+@COND_i386_multiboot_TRUE@am__append_4728 = div.module -+@COND_i386_multiboot_TRUE@am__append_4729 = div.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_4730 = -+@COND_i386_multiboot_TRUE@am__append_4731 = $(nodist_div_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_4732 = \ - @COND_i386_multiboot_TRUE@ $(nodist_div_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ div.marker --@COND_i386_multiboot_TRUE@am__append_4740 = div.mod --@COND_i386_multiboot_TRUE@am__append_4741 = div.marker --@COND_i386_ieee1275_TRUE@am__append_4742 = div.module --@COND_i386_ieee1275_TRUE@am__append_4743 = div.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_4744 = --@COND_i386_ieee1275_TRUE@am__append_4745 = $(nodist_div_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_4746 = \ -+@COND_i386_multiboot_TRUE@am__append_4733 = div.mod -+@COND_i386_multiboot_TRUE@am__append_4734 = div.marker -+@COND_i386_ieee1275_TRUE@am__append_4735 = div.module -+@COND_i386_ieee1275_TRUE@am__append_4736 = div.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_4737 = -+@COND_i386_ieee1275_TRUE@am__append_4738 = $(nodist_div_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_4739 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_div_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ div.marker --@COND_i386_ieee1275_TRUE@am__append_4747 = div.mod --@COND_i386_ieee1275_TRUE@am__append_4748 = div.marker --@COND_x86_64_efi_TRUE@am__append_4749 = div.module --@COND_x86_64_efi_TRUE@am__append_4750 = div.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_4751 = --@COND_x86_64_efi_TRUE@am__append_4752 = $(nodist_div_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_4753 = $(nodist_div_module_SOURCES) \ -+@COND_i386_ieee1275_TRUE@am__append_4740 = div.mod -+@COND_i386_ieee1275_TRUE@am__append_4741 = div.marker -+@COND_x86_64_efi_TRUE@am__append_4742 = div.module -+@COND_x86_64_efi_TRUE@am__append_4743 = div.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_4744 = -+@COND_x86_64_efi_TRUE@am__append_4745 = $(nodist_div_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_4746 = $(nodist_div_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ div.marker --@COND_x86_64_efi_TRUE@am__append_4754 = div.mod --@COND_x86_64_efi_TRUE@am__append_4755 = div.marker --@COND_i386_xen_TRUE@am__append_4756 = div.module --@COND_i386_xen_TRUE@am__append_4757 = div.module$(EXEEXT) --@COND_i386_xen_TRUE@am__append_4758 = --@COND_i386_xen_TRUE@am__append_4759 = $(nodist_div_module_SOURCES) --@COND_i386_xen_TRUE@am__append_4760 = $(nodist_div_module_SOURCES) \ -+@COND_x86_64_efi_TRUE@am__append_4747 = div.mod -+@COND_x86_64_efi_TRUE@am__append_4748 = div.marker -+@COND_i386_xen_TRUE@am__append_4749 = div.module -+@COND_i386_xen_TRUE@am__append_4750 = div.module$(EXEEXT) -+@COND_i386_xen_TRUE@am__append_4751 = -+@COND_i386_xen_TRUE@am__append_4752 = $(nodist_div_module_SOURCES) -+@COND_i386_xen_TRUE@am__append_4753 = $(nodist_div_module_SOURCES) \ - @COND_i386_xen_TRUE@ div.marker --@COND_i386_xen_TRUE@am__append_4761 = div.mod --@COND_i386_xen_TRUE@am__append_4762 = div.marker --@COND_x86_64_xen_TRUE@am__append_4763 = div.module --@COND_x86_64_xen_TRUE@am__append_4764 = div.module$(EXEEXT) --@COND_x86_64_xen_TRUE@am__append_4765 = --@COND_x86_64_xen_TRUE@am__append_4766 = $(nodist_div_module_SOURCES) --@COND_x86_64_xen_TRUE@am__append_4767 = $(nodist_div_module_SOURCES) \ -+@COND_i386_xen_TRUE@am__append_4754 = div.mod -+@COND_i386_xen_TRUE@am__append_4755 = div.marker -+@COND_x86_64_xen_TRUE@am__append_4756 = div.module -+@COND_x86_64_xen_TRUE@am__append_4757 = div.module$(EXEEXT) -+@COND_x86_64_xen_TRUE@am__append_4758 = -+@COND_x86_64_xen_TRUE@am__append_4759 = $(nodist_div_module_SOURCES) -+@COND_x86_64_xen_TRUE@am__append_4760 = $(nodist_div_module_SOURCES) \ - @COND_x86_64_xen_TRUE@ div.marker --@COND_x86_64_xen_TRUE@am__append_4768 = div.mod --@COND_x86_64_xen_TRUE@am__append_4769 = div.marker --@COND_i386_xen_pvh_TRUE@am__append_4770 = div.module --@COND_i386_xen_pvh_TRUE@am__append_4771 = div.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__append_4772 = --@COND_i386_xen_pvh_TRUE@am__append_4773 = $(nodist_div_module_SOURCES) --@COND_i386_xen_pvh_TRUE@am__append_4774 = \ -+@COND_x86_64_xen_TRUE@am__append_4761 = div.mod -+@COND_x86_64_xen_TRUE@am__append_4762 = div.marker -+@COND_i386_xen_pvh_TRUE@am__append_4763 = div.module -+@COND_i386_xen_pvh_TRUE@am__append_4764 = div.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__append_4765 = -+@COND_i386_xen_pvh_TRUE@am__append_4766 = $(nodist_div_module_SOURCES) -+@COND_i386_xen_pvh_TRUE@am__append_4767 = \ - @COND_i386_xen_pvh_TRUE@ $(nodist_div_module_SOURCES) \ - @COND_i386_xen_pvh_TRUE@ div.marker --@COND_i386_xen_pvh_TRUE@am__append_4775 = div.mod --@COND_i386_xen_pvh_TRUE@am__append_4776 = div.marker --@COND_mips_loongson_TRUE@am__append_4777 = div.module --@COND_mips_loongson_TRUE@am__append_4778 = div.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__append_4779 = --@COND_mips_loongson_TRUE@am__append_4780 = $(nodist_div_module_SOURCES) --@COND_mips_loongson_TRUE@am__append_4781 = \ -+@COND_i386_xen_pvh_TRUE@am__append_4768 = div.mod -+@COND_i386_xen_pvh_TRUE@am__append_4769 = div.marker -+@COND_mips_loongson_TRUE@am__append_4770 = div.module -+@COND_mips_loongson_TRUE@am__append_4771 = div.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__append_4772 = -+@COND_mips_loongson_TRUE@am__append_4773 = $(nodist_div_module_SOURCES) -+@COND_mips_loongson_TRUE@am__append_4774 = \ - @COND_mips_loongson_TRUE@ $(nodist_div_module_SOURCES) \ - @COND_mips_loongson_TRUE@ div.marker --@COND_mips_loongson_TRUE@am__append_4782 = div.mod --@COND_mips_loongson_TRUE@am__append_4783 = div.marker --@COND_sparc64_ieee1275_TRUE@am__append_4784 = div.module --@COND_sparc64_ieee1275_TRUE@am__append_4785 = div.module$(EXEEXT) --@COND_sparc64_ieee1275_TRUE@am__append_4786 = --@COND_sparc64_ieee1275_TRUE@am__append_4787 = $(nodist_div_module_SOURCES) --@COND_sparc64_ieee1275_TRUE@am__append_4788 = \ -+@COND_mips_loongson_TRUE@am__append_4775 = div.mod -+@COND_mips_loongson_TRUE@am__append_4776 = div.marker -+@COND_sparc64_ieee1275_TRUE@am__append_4777 = div.module -+@COND_sparc64_ieee1275_TRUE@am__append_4778 = div.module$(EXEEXT) -+@COND_sparc64_ieee1275_TRUE@am__append_4779 = -+@COND_sparc64_ieee1275_TRUE@am__append_4780 = $(nodist_div_module_SOURCES) -+@COND_sparc64_ieee1275_TRUE@am__append_4781 = \ - @COND_sparc64_ieee1275_TRUE@ $(nodist_div_module_SOURCES) \ - @COND_sparc64_ieee1275_TRUE@ div.marker --@COND_sparc64_ieee1275_TRUE@am__append_4789 = div.mod --@COND_sparc64_ieee1275_TRUE@am__append_4790 = div.marker --@COND_powerpc_ieee1275_TRUE@am__append_4791 = div.module --@COND_powerpc_ieee1275_TRUE@am__append_4792 = div.module$(EXEEXT) --@COND_powerpc_ieee1275_TRUE@am__append_4793 = --@COND_powerpc_ieee1275_TRUE@am__append_4794 = $(nodist_div_module_SOURCES) --@COND_powerpc_ieee1275_TRUE@am__append_4795 = \ -+@COND_sparc64_ieee1275_TRUE@am__append_4782 = div.mod -+@COND_sparc64_ieee1275_TRUE@am__append_4783 = div.marker -+@COND_powerpc_ieee1275_TRUE@am__append_4784 = div.module -+@COND_powerpc_ieee1275_TRUE@am__append_4785 = div.module$(EXEEXT) -+@COND_powerpc_ieee1275_TRUE@am__append_4786 = -+@COND_powerpc_ieee1275_TRUE@am__append_4787 = $(nodist_div_module_SOURCES) -+@COND_powerpc_ieee1275_TRUE@am__append_4788 = \ - @COND_powerpc_ieee1275_TRUE@ $(nodist_div_module_SOURCES) \ - @COND_powerpc_ieee1275_TRUE@ div.marker --@COND_powerpc_ieee1275_TRUE@am__append_4796 = div.mod --@COND_powerpc_ieee1275_TRUE@am__append_4797 = div.marker --@COND_mips_arc_TRUE@am__append_4798 = div.module --@COND_mips_arc_TRUE@am__append_4799 = div.module$(EXEEXT) --@COND_mips_arc_TRUE@am__append_4800 = --@COND_mips_arc_TRUE@am__append_4801 = $(nodist_div_module_SOURCES) --@COND_mips_arc_TRUE@am__append_4802 = $(nodist_div_module_SOURCES) \ -+@COND_powerpc_ieee1275_TRUE@am__append_4789 = div.mod -+@COND_powerpc_ieee1275_TRUE@am__append_4790 = div.marker -+@COND_mips_arc_TRUE@am__append_4791 = div.module -+@COND_mips_arc_TRUE@am__append_4792 = div.module$(EXEEXT) -+@COND_mips_arc_TRUE@am__append_4793 = -+@COND_mips_arc_TRUE@am__append_4794 = $(nodist_div_module_SOURCES) -+@COND_mips_arc_TRUE@am__append_4795 = $(nodist_div_module_SOURCES) \ - @COND_mips_arc_TRUE@ div.marker --@COND_mips_arc_TRUE@am__append_4803 = div.mod --@COND_mips_arc_TRUE@am__append_4804 = div.marker --@COND_mips_qemu_mips_TRUE@am__append_4805 = div.module --@COND_mips_qemu_mips_TRUE@am__append_4806 = div.module$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__append_4807 = --@COND_mips_qemu_mips_TRUE@am__append_4808 = $(nodist_div_module_SOURCES) --@COND_mips_qemu_mips_TRUE@am__append_4809 = \ -+@COND_mips_arc_TRUE@am__append_4796 = div.mod -+@COND_mips_arc_TRUE@am__append_4797 = div.marker -+@COND_mips_qemu_mips_TRUE@am__append_4798 = div.module -+@COND_mips_qemu_mips_TRUE@am__append_4799 = div.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__append_4800 = -+@COND_mips_qemu_mips_TRUE@am__append_4801 = $(nodist_div_module_SOURCES) -+@COND_mips_qemu_mips_TRUE@am__append_4802 = \ - @COND_mips_qemu_mips_TRUE@ $(nodist_div_module_SOURCES) \ - @COND_mips_qemu_mips_TRUE@ div.marker --@COND_mips_qemu_mips_TRUE@am__append_4810 = div.mod --@COND_mips_qemu_mips_TRUE@am__append_4811 = div.marker --@COND_arm64_efi_TRUE@am__append_4812 = div.module --@COND_arm64_efi_TRUE@am__append_4813 = div.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__append_4814 = --@COND_arm64_efi_TRUE@am__append_4815 = $(nodist_div_module_SOURCES) --@COND_arm64_efi_TRUE@am__append_4816 = $(nodist_div_module_SOURCES) \ -+@COND_mips_qemu_mips_TRUE@am__append_4803 = div.mod -+@COND_mips_qemu_mips_TRUE@am__append_4804 = div.marker -+@COND_arm64_efi_TRUE@am__append_4805 = div.module -+@COND_arm64_efi_TRUE@am__append_4806 = div.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__append_4807 = -+@COND_arm64_efi_TRUE@am__append_4808 = $(nodist_div_module_SOURCES) -+@COND_arm64_efi_TRUE@am__append_4809 = $(nodist_div_module_SOURCES) \ - @COND_arm64_efi_TRUE@ div.marker --@COND_arm64_efi_TRUE@am__append_4817 = div.mod --@COND_arm64_efi_TRUE@am__append_4818 = div.marker --@COND_riscv64_efi_TRUE@am__append_4819 = div.module --@COND_riscv64_efi_TRUE@am__append_4820 = div.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__append_4821 = --@COND_riscv64_efi_TRUE@am__append_4822 = $(nodist_div_module_SOURCES) --@COND_riscv64_efi_TRUE@am__append_4823 = $(nodist_div_module_SOURCES) \ -+@COND_arm64_efi_TRUE@am__append_4810 = div.mod -+@COND_arm64_efi_TRUE@am__append_4811 = div.marker -+@COND_riscv64_efi_TRUE@am__append_4812 = div.module -+@COND_riscv64_efi_TRUE@am__append_4813 = div.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__append_4814 = -+@COND_riscv64_efi_TRUE@am__append_4815 = $(nodist_div_module_SOURCES) -+@COND_riscv64_efi_TRUE@am__append_4816 = $(nodist_div_module_SOURCES) \ - @COND_riscv64_efi_TRUE@ div.marker --@COND_riscv64_efi_TRUE@am__append_4824 = div.mod --@COND_riscv64_efi_TRUE@am__append_4825 = div.marker --@COND_i386_efi_TRUE@am__append_4826 = efi_gop.module --@COND_i386_efi_TRUE@am__append_4827 = efi_gop.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__append_4817 = div.mod -+@COND_riscv64_efi_TRUE@am__append_4818 = div.marker -+@COND_i386_efi_TRUE@am__append_4819 = efi_gop.module -+@COND_i386_efi_TRUE@am__append_4820 = efi_gop.module$(EXEEXT) - @COND_arm64_efi_FALSE@@COND_arm_efi_FALSE@@COND_i386_efi_FALSE@@COND_ia64_efi_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_x86_64_efi_FALSE@efi_gop_module_DEPENDENCIES = --@COND_i386_efi_TRUE@am__append_4828 = --@COND_i386_efi_TRUE@am__append_4829 = $(nodist_efi_gop_module_SOURCES) --@COND_i386_efi_TRUE@am__append_4830 = \ -+@COND_i386_efi_TRUE@am__append_4821 = -+@COND_i386_efi_TRUE@am__append_4822 = $(nodist_efi_gop_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_4823 = \ - @COND_i386_efi_TRUE@ $(nodist_efi_gop_module_SOURCES) \ - @COND_i386_efi_TRUE@ efi_gop.marker --@COND_i386_efi_TRUE@am__append_4831 = efi_gop.mod --@COND_i386_efi_TRUE@am__append_4832 = efi_gop.marker --@COND_x86_64_efi_TRUE@am__append_4833 = efi_gop.module --@COND_x86_64_efi_TRUE@am__append_4834 = efi_gop.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_4835 = --@COND_x86_64_efi_TRUE@am__append_4836 = $(nodist_efi_gop_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_4837 = \ -+@COND_i386_efi_TRUE@am__append_4824 = efi_gop.mod -+@COND_i386_efi_TRUE@am__append_4825 = efi_gop.marker -+@COND_x86_64_efi_TRUE@am__append_4826 = efi_gop.module -+@COND_x86_64_efi_TRUE@am__append_4827 = efi_gop.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_4828 = -+@COND_x86_64_efi_TRUE@am__append_4829 = $(nodist_efi_gop_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_4830 = \ - @COND_x86_64_efi_TRUE@ $(nodist_efi_gop_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ efi_gop.marker --@COND_x86_64_efi_TRUE@am__append_4838 = efi_gop.mod --@COND_x86_64_efi_TRUE@am__append_4839 = efi_gop.marker --@COND_ia64_efi_TRUE@am__append_4840 = efi_gop.module --@COND_ia64_efi_TRUE@am__append_4841 = efi_gop.module$(EXEEXT) --@COND_ia64_efi_TRUE@am__append_4842 = --@COND_ia64_efi_TRUE@am__append_4843 = $(nodist_efi_gop_module_SOURCES) --@COND_ia64_efi_TRUE@am__append_4844 = \ -+@COND_x86_64_efi_TRUE@am__append_4831 = efi_gop.mod -+@COND_x86_64_efi_TRUE@am__append_4832 = efi_gop.marker -+@COND_ia64_efi_TRUE@am__append_4833 = efi_gop.module -+@COND_ia64_efi_TRUE@am__append_4834 = efi_gop.module$(EXEEXT) -+@COND_ia64_efi_TRUE@am__append_4835 = -+@COND_ia64_efi_TRUE@am__append_4836 = $(nodist_efi_gop_module_SOURCES) -+@COND_ia64_efi_TRUE@am__append_4837 = \ - @COND_ia64_efi_TRUE@ $(nodist_efi_gop_module_SOURCES) \ - @COND_ia64_efi_TRUE@ efi_gop.marker --@COND_ia64_efi_TRUE@am__append_4845 = efi_gop.mod --@COND_ia64_efi_TRUE@am__append_4846 = efi_gop.marker --@COND_arm_efi_TRUE@am__append_4847 = efi_gop.module --@COND_arm_efi_TRUE@am__append_4848 = efi_gop.module$(EXEEXT) --@COND_arm_efi_TRUE@am__append_4849 = --@COND_arm_efi_TRUE@am__append_4850 = $(nodist_efi_gop_module_SOURCES) --@COND_arm_efi_TRUE@am__append_4851 = $(nodist_efi_gop_module_SOURCES) \ -+@COND_ia64_efi_TRUE@am__append_4838 = efi_gop.mod -+@COND_ia64_efi_TRUE@am__append_4839 = efi_gop.marker -+@COND_arm_efi_TRUE@am__append_4840 = efi_gop.module -+@COND_arm_efi_TRUE@am__append_4841 = efi_gop.module$(EXEEXT) -+@COND_arm_efi_TRUE@am__append_4842 = -+@COND_arm_efi_TRUE@am__append_4843 = $(nodist_efi_gop_module_SOURCES) -+@COND_arm_efi_TRUE@am__append_4844 = $(nodist_efi_gop_module_SOURCES) \ - @COND_arm_efi_TRUE@ efi_gop.marker --@COND_arm_efi_TRUE@am__append_4852 = efi_gop.mod --@COND_arm_efi_TRUE@am__append_4853 = efi_gop.marker --@COND_arm64_efi_TRUE@am__append_4854 = efi_gop.module --@COND_arm64_efi_TRUE@am__append_4855 = efi_gop.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__append_4856 = --@COND_arm64_efi_TRUE@am__append_4857 = $(nodist_efi_gop_module_SOURCES) --@COND_arm64_efi_TRUE@am__append_4858 = \ -+@COND_arm_efi_TRUE@am__append_4845 = efi_gop.mod -+@COND_arm_efi_TRUE@am__append_4846 = efi_gop.marker -+@COND_arm64_efi_TRUE@am__append_4847 = efi_gop.module -+@COND_arm64_efi_TRUE@am__append_4848 = efi_gop.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__append_4849 = -+@COND_arm64_efi_TRUE@am__append_4850 = $(nodist_efi_gop_module_SOURCES) -+@COND_arm64_efi_TRUE@am__append_4851 = \ - @COND_arm64_efi_TRUE@ $(nodist_efi_gop_module_SOURCES) \ - @COND_arm64_efi_TRUE@ efi_gop.marker --@COND_arm64_efi_TRUE@am__append_4859 = efi_gop.mod --@COND_arm64_efi_TRUE@am__append_4860 = efi_gop.marker --@COND_riscv32_efi_TRUE@am__append_4861 = efi_gop.module --@COND_riscv32_efi_TRUE@am__append_4862 = efi_gop.module$(EXEEXT) --@COND_riscv32_efi_TRUE@am__append_4863 = --@COND_riscv32_efi_TRUE@am__append_4864 = $(nodist_efi_gop_module_SOURCES) --@COND_riscv32_efi_TRUE@am__append_4865 = \ -+@COND_arm64_efi_TRUE@am__append_4852 = efi_gop.mod -+@COND_arm64_efi_TRUE@am__append_4853 = efi_gop.marker -+@COND_riscv32_efi_TRUE@am__append_4854 = efi_gop.module -+@COND_riscv32_efi_TRUE@am__append_4855 = efi_gop.module$(EXEEXT) -+@COND_riscv32_efi_TRUE@am__append_4856 = -+@COND_riscv32_efi_TRUE@am__append_4857 = $(nodist_efi_gop_module_SOURCES) -+@COND_riscv32_efi_TRUE@am__append_4858 = \ - @COND_riscv32_efi_TRUE@ $(nodist_efi_gop_module_SOURCES) \ - @COND_riscv32_efi_TRUE@ efi_gop.marker --@COND_riscv32_efi_TRUE@am__append_4866 = efi_gop.mod --@COND_riscv32_efi_TRUE@am__append_4867 = efi_gop.marker --@COND_riscv64_efi_TRUE@am__append_4868 = efi_gop.module --@COND_riscv64_efi_TRUE@am__append_4869 = efi_gop.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__append_4870 = --@COND_riscv64_efi_TRUE@am__append_4871 = $(nodist_efi_gop_module_SOURCES) --@COND_riscv64_efi_TRUE@am__append_4872 = \ -+@COND_riscv32_efi_TRUE@am__append_4859 = efi_gop.mod -+@COND_riscv32_efi_TRUE@am__append_4860 = efi_gop.marker -+@COND_riscv64_efi_TRUE@am__append_4861 = efi_gop.module -+@COND_riscv64_efi_TRUE@am__append_4862 = efi_gop.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__append_4863 = -+@COND_riscv64_efi_TRUE@am__append_4864 = $(nodist_efi_gop_module_SOURCES) -+@COND_riscv64_efi_TRUE@am__append_4865 = \ - @COND_riscv64_efi_TRUE@ $(nodist_efi_gop_module_SOURCES) \ - @COND_riscv64_efi_TRUE@ efi_gop.marker --@COND_riscv64_efi_TRUE@am__append_4873 = efi_gop.mod --@COND_riscv64_efi_TRUE@am__append_4874 = efi_gop.marker --@COND_i386_efi_TRUE@am__append_4875 = efi_uga.module --@COND_i386_efi_TRUE@am__append_4876 = efi_uga.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__append_4866 = efi_gop.mod -+@COND_riscv64_efi_TRUE@am__append_4867 = efi_gop.marker -+@COND_i386_efi_TRUE@am__append_4868 = efi_uga.module -+@COND_i386_efi_TRUE@am__append_4869 = efi_uga.module$(EXEEXT) - @COND_i386_efi_FALSE@@COND_x86_64_efi_FALSE@efi_uga_module_DEPENDENCIES = --@COND_i386_efi_TRUE@am__append_4877 = --@COND_i386_efi_TRUE@am__append_4878 = $(nodist_efi_uga_module_SOURCES) --@COND_i386_efi_TRUE@am__append_4879 = \ -+@COND_i386_efi_TRUE@am__append_4870 = -+@COND_i386_efi_TRUE@am__append_4871 = $(nodist_efi_uga_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_4872 = \ - @COND_i386_efi_TRUE@ $(nodist_efi_uga_module_SOURCES) \ - @COND_i386_efi_TRUE@ efi_uga.marker --@COND_i386_efi_TRUE@am__append_4880 = efi_uga.mod --@COND_i386_efi_TRUE@am__append_4881 = efi_uga.marker --@COND_x86_64_efi_TRUE@am__append_4882 = efi_uga.module --@COND_x86_64_efi_TRUE@am__append_4883 = efi_uga.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_4884 = --@COND_x86_64_efi_TRUE@am__append_4885 = $(nodist_efi_uga_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_4886 = \ -+@COND_i386_efi_TRUE@am__append_4873 = efi_uga.mod -+@COND_i386_efi_TRUE@am__append_4874 = efi_uga.marker -+@COND_x86_64_efi_TRUE@am__append_4875 = efi_uga.module -+@COND_x86_64_efi_TRUE@am__append_4876 = efi_uga.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_4877 = -+@COND_x86_64_efi_TRUE@am__append_4878 = $(nodist_efi_uga_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_4879 = \ - @COND_x86_64_efi_TRUE@ $(nodist_efi_uga_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ efi_uga.marker --@COND_x86_64_efi_TRUE@am__append_4887 = efi_uga.mod --@COND_x86_64_efi_TRUE@am__append_4888 = efi_uga.marker --@COND_i386_pc_TRUE@am__append_4889 = vbe.module --@COND_i386_pc_TRUE@am__append_4890 = vbe.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_4880 = efi_uga.mod -+@COND_x86_64_efi_TRUE@am__append_4881 = efi_uga.marker -+@COND_i386_pc_TRUE@am__append_4882 = vbe.module -+@COND_i386_pc_TRUE@am__append_4883 = vbe.module$(EXEEXT) - @COND_i386_pc_FALSE@vbe_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_4891 = --@COND_i386_pc_TRUE@am__append_4892 = $(nodist_vbe_module_SOURCES) --@COND_i386_pc_TRUE@am__append_4893 = $(nodist_vbe_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_4884 = -+@COND_i386_pc_TRUE@am__append_4885 = $(nodist_vbe_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_4886 = $(nodist_vbe_module_SOURCES) \ - @COND_i386_pc_TRUE@ vbe.marker --@COND_i386_pc_TRUE@am__append_4894 = vbe.mod --@COND_i386_pc_TRUE@am__append_4895 = vbe.marker --@COND_emu_TRUE@am__append_4896 = video_fb.module --@COND_emu_TRUE@am__append_4897 = video_fb.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__append_4887 = vbe.mod -+@COND_i386_pc_TRUE@am__append_4888 = vbe.marker -+@COND_emu_TRUE@am__append_4889 = video_fb.module -+@COND_emu_TRUE@am__append_4890 = video_fb.module$(EXEEXT) - @COND_arm64_efi_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_FALSE@video_fb_module_DEPENDENCIES = --@COND_emu_TRUE@am__append_4898 = --@COND_emu_TRUE@am__append_4899 = $(nodist_video_fb_module_SOURCES) --@COND_emu_TRUE@am__append_4900 = $(nodist_video_fb_module_SOURCES) \ -+@COND_emu_TRUE@am__append_4891 = -+@COND_emu_TRUE@am__append_4892 = $(nodist_video_fb_module_SOURCES) -+@COND_emu_TRUE@am__append_4893 = $(nodist_video_fb_module_SOURCES) \ - @COND_emu_TRUE@ video_fb.marker --@COND_emu_TRUE@am__append_4901 = video_fb.mod --@COND_emu_TRUE@am__append_4902 = video_fb.marker --@COND_i386_pc_TRUE@am__append_4903 = video_fb.module --@COND_i386_pc_TRUE@am__append_4904 = video_fb.module$(EXEEXT) --@COND_i386_pc_TRUE@am__append_4905 = --@COND_i386_pc_TRUE@am__append_4906 = $(nodist_video_fb_module_SOURCES) --@COND_i386_pc_TRUE@am__append_4907 = \ -+@COND_emu_TRUE@am__append_4894 = video_fb.mod -+@COND_emu_TRUE@am__append_4895 = video_fb.marker -+@COND_i386_pc_TRUE@am__append_4896 = video_fb.module -+@COND_i386_pc_TRUE@am__append_4897 = video_fb.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__append_4898 = -+@COND_i386_pc_TRUE@am__append_4899 = $(nodist_video_fb_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_4900 = \ - @COND_i386_pc_TRUE@ $(nodist_video_fb_module_SOURCES) \ - @COND_i386_pc_TRUE@ video_fb.marker --@COND_i386_pc_TRUE@am__append_4908 = video_fb.mod --@COND_i386_pc_TRUE@am__append_4909 = video_fb.marker --@COND_i386_efi_TRUE@am__append_4910 = video_fb.module --@COND_i386_efi_TRUE@am__append_4911 = video_fb.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_4912 = --@COND_i386_efi_TRUE@am__append_4913 = $(nodist_video_fb_module_SOURCES) --@COND_i386_efi_TRUE@am__append_4914 = \ -+@COND_i386_pc_TRUE@am__append_4901 = video_fb.mod -+@COND_i386_pc_TRUE@am__append_4902 = video_fb.marker -+@COND_i386_efi_TRUE@am__append_4903 = video_fb.module -+@COND_i386_efi_TRUE@am__append_4904 = video_fb.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_4905 = -+@COND_i386_efi_TRUE@am__append_4906 = $(nodist_video_fb_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_4907 = \ - @COND_i386_efi_TRUE@ $(nodist_video_fb_module_SOURCES) \ - @COND_i386_efi_TRUE@ video_fb.marker --@COND_i386_efi_TRUE@am__append_4915 = video_fb.mod --@COND_i386_efi_TRUE@am__append_4916 = video_fb.marker --@COND_i386_qemu_TRUE@am__append_4917 = video_fb.module --@COND_i386_qemu_TRUE@am__append_4918 = video_fb.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_4919 = --@COND_i386_qemu_TRUE@am__append_4920 = $(nodist_video_fb_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_4921 = \ -+@COND_i386_efi_TRUE@am__append_4908 = video_fb.mod -+@COND_i386_efi_TRUE@am__append_4909 = video_fb.marker -+@COND_i386_qemu_TRUE@am__append_4910 = video_fb.module -+@COND_i386_qemu_TRUE@am__append_4911 = video_fb.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_4912 = -+@COND_i386_qemu_TRUE@am__append_4913 = $(nodist_video_fb_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_4914 = \ - @COND_i386_qemu_TRUE@ $(nodist_video_fb_module_SOURCES) \ - @COND_i386_qemu_TRUE@ video_fb.marker --@COND_i386_qemu_TRUE@am__append_4922 = video_fb.mod --@COND_i386_qemu_TRUE@am__append_4923 = video_fb.marker --@COND_i386_multiboot_TRUE@am__append_4924 = video_fb.module --@COND_i386_multiboot_TRUE@am__append_4925 = video_fb.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_4926 = --@COND_i386_multiboot_TRUE@am__append_4927 = $(nodist_video_fb_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_4928 = \ -+@COND_i386_qemu_TRUE@am__append_4915 = video_fb.mod -+@COND_i386_qemu_TRUE@am__append_4916 = video_fb.marker -+@COND_i386_multiboot_TRUE@am__append_4917 = video_fb.module -+@COND_i386_multiboot_TRUE@am__append_4918 = video_fb.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_4919 = -+@COND_i386_multiboot_TRUE@am__append_4920 = $(nodist_video_fb_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_4921 = \ - @COND_i386_multiboot_TRUE@ $(nodist_video_fb_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ video_fb.marker --@COND_i386_multiboot_TRUE@am__append_4929 = video_fb.mod --@COND_i386_multiboot_TRUE@am__append_4930 = video_fb.marker --@COND_i386_ieee1275_TRUE@am__append_4931 = video_fb.module --@COND_i386_ieee1275_TRUE@am__append_4932 = video_fb.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_4933 = --@COND_i386_ieee1275_TRUE@am__append_4934 = $(nodist_video_fb_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_4935 = \ -+@COND_i386_multiboot_TRUE@am__append_4922 = video_fb.mod -+@COND_i386_multiboot_TRUE@am__append_4923 = video_fb.marker -+@COND_i386_ieee1275_TRUE@am__append_4924 = video_fb.module -+@COND_i386_ieee1275_TRUE@am__append_4925 = video_fb.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_4926 = -+@COND_i386_ieee1275_TRUE@am__append_4927 = $(nodist_video_fb_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_4928 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_video_fb_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ video_fb.marker --@COND_i386_ieee1275_TRUE@am__append_4936 = video_fb.mod --@COND_i386_ieee1275_TRUE@am__append_4937 = video_fb.marker --@COND_x86_64_efi_TRUE@am__append_4938 = video_fb.module --@COND_x86_64_efi_TRUE@am__append_4939 = video_fb.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_4940 = --@COND_x86_64_efi_TRUE@am__append_4941 = $(nodist_video_fb_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_4942 = \ -+@COND_i386_ieee1275_TRUE@am__append_4929 = video_fb.mod -+@COND_i386_ieee1275_TRUE@am__append_4930 = video_fb.marker -+@COND_x86_64_efi_TRUE@am__append_4931 = video_fb.module -+@COND_x86_64_efi_TRUE@am__append_4932 = video_fb.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_4933 = -+@COND_x86_64_efi_TRUE@am__append_4934 = $(nodist_video_fb_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_4935 = \ - @COND_x86_64_efi_TRUE@ $(nodist_video_fb_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ video_fb.marker --@COND_x86_64_efi_TRUE@am__append_4943 = video_fb.mod --@COND_x86_64_efi_TRUE@am__append_4944 = video_fb.marker --@COND_i386_xen_TRUE@am__append_4945 = video_fb.module --@COND_i386_xen_TRUE@am__append_4946 = video_fb.module$(EXEEXT) --@COND_i386_xen_TRUE@am__append_4947 = --@COND_i386_xen_TRUE@am__append_4948 = $(nodist_video_fb_module_SOURCES) --@COND_i386_xen_TRUE@am__append_4949 = \ -+@COND_x86_64_efi_TRUE@am__append_4936 = video_fb.mod -+@COND_x86_64_efi_TRUE@am__append_4937 = video_fb.marker -+@COND_i386_xen_TRUE@am__append_4938 = video_fb.module -+@COND_i386_xen_TRUE@am__append_4939 = video_fb.module$(EXEEXT) -+@COND_i386_xen_TRUE@am__append_4940 = -+@COND_i386_xen_TRUE@am__append_4941 = $(nodist_video_fb_module_SOURCES) -+@COND_i386_xen_TRUE@am__append_4942 = \ - @COND_i386_xen_TRUE@ $(nodist_video_fb_module_SOURCES) \ - @COND_i386_xen_TRUE@ video_fb.marker --@COND_i386_xen_TRUE@am__append_4950 = video_fb.mod --@COND_i386_xen_TRUE@am__append_4951 = video_fb.marker --@COND_x86_64_xen_TRUE@am__append_4952 = video_fb.module --@COND_x86_64_xen_TRUE@am__append_4953 = video_fb.module$(EXEEXT) --@COND_x86_64_xen_TRUE@am__append_4954 = --@COND_x86_64_xen_TRUE@am__append_4955 = $(nodist_video_fb_module_SOURCES) --@COND_x86_64_xen_TRUE@am__append_4956 = \ -+@COND_i386_xen_TRUE@am__append_4943 = video_fb.mod -+@COND_i386_xen_TRUE@am__append_4944 = video_fb.marker -+@COND_x86_64_xen_TRUE@am__append_4945 = video_fb.module -+@COND_x86_64_xen_TRUE@am__append_4946 = video_fb.module$(EXEEXT) -+@COND_x86_64_xen_TRUE@am__append_4947 = -+@COND_x86_64_xen_TRUE@am__append_4948 = $(nodist_video_fb_module_SOURCES) -+@COND_x86_64_xen_TRUE@am__append_4949 = \ - @COND_x86_64_xen_TRUE@ $(nodist_video_fb_module_SOURCES) \ - @COND_x86_64_xen_TRUE@ video_fb.marker --@COND_x86_64_xen_TRUE@am__append_4957 = video_fb.mod --@COND_x86_64_xen_TRUE@am__append_4958 = video_fb.marker --@COND_i386_xen_pvh_TRUE@am__append_4959 = video_fb.module --@COND_i386_xen_pvh_TRUE@am__append_4960 = video_fb.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__append_4961 = --@COND_i386_xen_pvh_TRUE@am__append_4962 = $(nodist_video_fb_module_SOURCES) --@COND_i386_xen_pvh_TRUE@am__append_4963 = \ -+@COND_x86_64_xen_TRUE@am__append_4950 = video_fb.mod -+@COND_x86_64_xen_TRUE@am__append_4951 = video_fb.marker -+@COND_i386_xen_pvh_TRUE@am__append_4952 = video_fb.module -+@COND_i386_xen_pvh_TRUE@am__append_4953 = video_fb.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__append_4954 = -+@COND_i386_xen_pvh_TRUE@am__append_4955 = $(nodist_video_fb_module_SOURCES) -+@COND_i386_xen_pvh_TRUE@am__append_4956 = \ - @COND_i386_xen_pvh_TRUE@ $(nodist_video_fb_module_SOURCES) \ - @COND_i386_xen_pvh_TRUE@ video_fb.marker --@COND_i386_xen_pvh_TRUE@am__append_4964 = video_fb.mod --@COND_i386_xen_pvh_TRUE@am__append_4965 = video_fb.marker --@COND_sparc64_ieee1275_TRUE@am__append_4966 = video_fb.module --@COND_sparc64_ieee1275_TRUE@am__append_4967 = video_fb.module$(EXEEXT) --@COND_sparc64_ieee1275_TRUE@am__append_4968 = --@COND_sparc64_ieee1275_TRUE@am__append_4969 = $(nodist_video_fb_module_SOURCES) --@COND_sparc64_ieee1275_TRUE@am__append_4970 = \ -+@COND_i386_xen_pvh_TRUE@am__append_4957 = video_fb.mod -+@COND_i386_xen_pvh_TRUE@am__append_4958 = video_fb.marker -+@COND_sparc64_ieee1275_TRUE@am__append_4959 = video_fb.module -+@COND_sparc64_ieee1275_TRUE@am__append_4960 = video_fb.module$(EXEEXT) -+@COND_sparc64_ieee1275_TRUE@am__append_4961 = -+@COND_sparc64_ieee1275_TRUE@am__append_4962 = $(nodist_video_fb_module_SOURCES) -+@COND_sparc64_ieee1275_TRUE@am__append_4963 = \ - @COND_sparc64_ieee1275_TRUE@ $(nodist_video_fb_module_SOURCES) \ - @COND_sparc64_ieee1275_TRUE@ video_fb.marker --@COND_sparc64_ieee1275_TRUE@am__append_4971 = video_fb.mod --@COND_sparc64_ieee1275_TRUE@am__append_4972 = video_fb.marker --@COND_powerpc_ieee1275_TRUE@am__append_4973 = video_fb.module --@COND_powerpc_ieee1275_TRUE@am__append_4974 = video_fb.module$(EXEEXT) --@COND_powerpc_ieee1275_TRUE@am__append_4975 = --@COND_powerpc_ieee1275_TRUE@am__append_4976 = $(nodist_video_fb_module_SOURCES) --@COND_powerpc_ieee1275_TRUE@am__append_4977 = \ -+@COND_sparc64_ieee1275_TRUE@am__append_4964 = video_fb.mod -+@COND_sparc64_ieee1275_TRUE@am__append_4965 = video_fb.marker -+@COND_powerpc_ieee1275_TRUE@am__append_4966 = video_fb.module -+@COND_powerpc_ieee1275_TRUE@am__append_4967 = video_fb.module$(EXEEXT) -+@COND_powerpc_ieee1275_TRUE@am__append_4968 = -+@COND_powerpc_ieee1275_TRUE@am__append_4969 = $(nodist_video_fb_module_SOURCES) -+@COND_powerpc_ieee1275_TRUE@am__append_4970 = \ - @COND_powerpc_ieee1275_TRUE@ $(nodist_video_fb_module_SOURCES) \ - @COND_powerpc_ieee1275_TRUE@ video_fb.marker --@COND_powerpc_ieee1275_TRUE@am__append_4978 = video_fb.mod --@COND_powerpc_ieee1275_TRUE@am__append_4979 = video_fb.marker --@COND_mips_arc_TRUE@am__append_4980 = video_fb.module --@COND_mips_arc_TRUE@am__append_4981 = video_fb.module$(EXEEXT) --@COND_mips_arc_TRUE@am__append_4982 = --@COND_mips_arc_TRUE@am__append_4983 = $(nodist_video_fb_module_SOURCES) --@COND_mips_arc_TRUE@am__append_4984 = \ -+@COND_powerpc_ieee1275_TRUE@am__append_4971 = video_fb.mod -+@COND_powerpc_ieee1275_TRUE@am__append_4972 = video_fb.marker -+@COND_mips_arc_TRUE@am__append_4973 = video_fb.module -+@COND_mips_arc_TRUE@am__append_4974 = video_fb.module$(EXEEXT) -+@COND_mips_arc_TRUE@am__append_4975 = -+@COND_mips_arc_TRUE@am__append_4976 = $(nodist_video_fb_module_SOURCES) -+@COND_mips_arc_TRUE@am__append_4977 = \ - @COND_mips_arc_TRUE@ $(nodist_video_fb_module_SOURCES) \ - @COND_mips_arc_TRUE@ video_fb.marker --@COND_mips_arc_TRUE@am__append_4985 = video_fb.mod --@COND_mips_arc_TRUE@am__append_4986 = video_fb.marker --@COND_ia64_efi_TRUE@am__append_4987 = video_fb.module --@COND_ia64_efi_TRUE@am__append_4988 = video_fb.module$(EXEEXT) --@COND_ia64_efi_TRUE@am__append_4989 = --@COND_ia64_efi_TRUE@am__append_4990 = $(nodist_video_fb_module_SOURCES) --@COND_ia64_efi_TRUE@am__append_4991 = \ -+@COND_mips_arc_TRUE@am__append_4978 = video_fb.mod -+@COND_mips_arc_TRUE@am__append_4979 = video_fb.marker -+@COND_ia64_efi_TRUE@am__append_4980 = video_fb.module -+@COND_ia64_efi_TRUE@am__append_4981 = video_fb.module$(EXEEXT) -+@COND_ia64_efi_TRUE@am__append_4982 = -+@COND_ia64_efi_TRUE@am__append_4983 = $(nodist_video_fb_module_SOURCES) -+@COND_ia64_efi_TRUE@am__append_4984 = \ - @COND_ia64_efi_TRUE@ $(nodist_video_fb_module_SOURCES) \ - @COND_ia64_efi_TRUE@ video_fb.marker --@COND_ia64_efi_TRUE@am__append_4992 = video_fb.mod --@COND_ia64_efi_TRUE@am__append_4993 = video_fb.marker --@COND_mips_qemu_mips_TRUE@am__append_4994 = video_fb.module --@COND_mips_qemu_mips_TRUE@am__append_4995 = video_fb.module$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__append_4996 = --@COND_mips_qemu_mips_TRUE@am__append_4997 = $(nodist_video_fb_module_SOURCES) --@COND_mips_qemu_mips_TRUE@am__append_4998 = \ -+@COND_ia64_efi_TRUE@am__append_4985 = video_fb.mod -+@COND_ia64_efi_TRUE@am__append_4986 = video_fb.marker -+@COND_mips_qemu_mips_TRUE@am__append_4987 = video_fb.module -+@COND_mips_qemu_mips_TRUE@am__append_4988 = video_fb.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__append_4989 = -+@COND_mips_qemu_mips_TRUE@am__append_4990 = $(nodist_video_fb_module_SOURCES) -+@COND_mips_qemu_mips_TRUE@am__append_4991 = \ - @COND_mips_qemu_mips_TRUE@ $(nodist_video_fb_module_SOURCES) \ - @COND_mips_qemu_mips_TRUE@ video_fb.marker --@COND_mips_qemu_mips_TRUE@am__append_4999 = video_fb.mod --@COND_mips_qemu_mips_TRUE@am__append_5000 = video_fb.marker --@COND_arm_uboot_TRUE@am__append_5001 = video_fb.module --@COND_arm_uboot_TRUE@am__append_5002 = video_fb.module$(EXEEXT) --@COND_arm_uboot_TRUE@am__append_5003 = --@COND_arm_uboot_TRUE@am__append_5004 = $(nodist_video_fb_module_SOURCES) --@COND_arm_uboot_TRUE@am__append_5005 = \ -+@COND_mips_qemu_mips_TRUE@am__append_4992 = video_fb.mod -+@COND_mips_qemu_mips_TRUE@am__append_4993 = video_fb.marker -+@COND_arm_uboot_TRUE@am__append_4994 = video_fb.module -+@COND_arm_uboot_TRUE@am__append_4995 = video_fb.module$(EXEEXT) -+@COND_arm_uboot_TRUE@am__append_4996 = -+@COND_arm_uboot_TRUE@am__append_4997 = $(nodist_video_fb_module_SOURCES) -+@COND_arm_uboot_TRUE@am__append_4998 = \ - @COND_arm_uboot_TRUE@ $(nodist_video_fb_module_SOURCES) \ - @COND_arm_uboot_TRUE@ video_fb.marker --@COND_arm_uboot_TRUE@am__append_5006 = video_fb.mod --@COND_arm_uboot_TRUE@am__append_5007 = video_fb.marker --@COND_arm_efi_TRUE@am__append_5008 = video_fb.module --@COND_arm_efi_TRUE@am__append_5009 = video_fb.module$(EXEEXT) --@COND_arm_efi_TRUE@am__append_5010 = --@COND_arm_efi_TRUE@am__append_5011 = $(nodist_video_fb_module_SOURCES) --@COND_arm_efi_TRUE@am__append_5012 = \ -+@COND_arm_uboot_TRUE@am__append_4999 = video_fb.mod -+@COND_arm_uboot_TRUE@am__append_5000 = video_fb.marker -+@COND_arm_efi_TRUE@am__append_5001 = video_fb.module -+@COND_arm_efi_TRUE@am__append_5002 = video_fb.module$(EXEEXT) -+@COND_arm_efi_TRUE@am__append_5003 = -+@COND_arm_efi_TRUE@am__append_5004 = $(nodist_video_fb_module_SOURCES) -+@COND_arm_efi_TRUE@am__append_5005 = \ - @COND_arm_efi_TRUE@ $(nodist_video_fb_module_SOURCES) \ - @COND_arm_efi_TRUE@ video_fb.marker --@COND_arm_efi_TRUE@am__append_5013 = video_fb.mod --@COND_arm_efi_TRUE@am__append_5014 = video_fb.marker --@COND_arm64_efi_TRUE@am__append_5015 = video_fb.module --@COND_arm64_efi_TRUE@am__append_5016 = video_fb.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__append_5017 = --@COND_arm64_efi_TRUE@am__append_5018 = $(nodist_video_fb_module_SOURCES) --@COND_arm64_efi_TRUE@am__append_5019 = \ -+@COND_arm_efi_TRUE@am__append_5006 = video_fb.mod -+@COND_arm_efi_TRUE@am__append_5007 = video_fb.marker -+@COND_arm64_efi_TRUE@am__append_5008 = video_fb.module -+@COND_arm64_efi_TRUE@am__append_5009 = video_fb.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__append_5010 = -+@COND_arm64_efi_TRUE@am__append_5011 = $(nodist_video_fb_module_SOURCES) -+@COND_arm64_efi_TRUE@am__append_5012 = \ - @COND_arm64_efi_TRUE@ $(nodist_video_fb_module_SOURCES) \ - @COND_arm64_efi_TRUE@ video_fb.marker --@COND_arm64_efi_TRUE@am__append_5020 = video_fb.mod --@COND_arm64_efi_TRUE@am__append_5021 = video_fb.marker --@COND_riscv32_efi_TRUE@am__append_5022 = video_fb.module --@COND_riscv32_efi_TRUE@am__append_5023 = video_fb.module$(EXEEXT) --@COND_riscv32_efi_TRUE@am__append_5024 = --@COND_riscv32_efi_TRUE@am__append_5025 = $(nodist_video_fb_module_SOURCES) --@COND_riscv32_efi_TRUE@am__append_5026 = \ -+@COND_arm64_efi_TRUE@am__append_5013 = video_fb.mod -+@COND_arm64_efi_TRUE@am__append_5014 = video_fb.marker -+@COND_riscv32_efi_TRUE@am__append_5015 = video_fb.module -+@COND_riscv32_efi_TRUE@am__append_5016 = video_fb.module$(EXEEXT) -+@COND_riscv32_efi_TRUE@am__append_5017 = -+@COND_riscv32_efi_TRUE@am__append_5018 = $(nodist_video_fb_module_SOURCES) -+@COND_riscv32_efi_TRUE@am__append_5019 = \ - @COND_riscv32_efi_TRUE@ $(nodist_video_fb_module_SOURCES) \ - @COND_riscv32_efi_TRUE@ video_fb.marker --@COND_riscv32_efi_TRUE@am__append_5027 = video_fb.mod --@COND_riscv32_efi_TRUE@am__append_5028 = video_fb.marker --@COND_riscv64_efi_TRUE@am__append_5029 = video_fb.module --@COND_riscv64_efi_TRUE@am__append_5030 = video_fb.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__append_5031 = --@COND_riscv64_efi_TRUE@am__append_5032 = $(nodist_video_fb_module_SOURCES) --@COND_riscv64_efi_TRUE@am__append_5033 = \ -+@COND_riscv32_efi_TRUE@am__append_5020 = video_fb.mod -+@COND_riscv32_efi_TRUE@am__append_5021 = video_fb.marker -+@COND_riscv64_efi_TRUE@am__append_5022 = video_fb.module -+@COND_riscv64_efi_TRUE@am__append_5023 = video_fb.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__append_5024 = -+@COND_riscv64_efi_TRUE@am__append_5025 = $(nodist_video_fb_module_SOURCES) -+@COND_riscv64_efi_TRUE@am__append_5026 = \ - @COND_riscv64_efi_TRUE@ $(nodist_video_fb_module_SOURCES) \ - @COND_riscv64_efi_TRUE@ video_fb.marker --@COND_riscv64_efi_TRUE@am__append_5034 = video_fb.mod --@COND_riscv64_efi_TRUE@am__append_5035 = video_fb.marker --@COND_emu_TRUE@am__append_5036 = video.module --@COND_emu_TRUE@am__append_5037 = video.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__append_5027 = video_fb.mod -+@COND_riscv64_efi_TRUE@am__append_5028 = video_fb.marker -+@COND_emu_TRUE@am__append_5029 = video.module -+@COND_emu_TRUE@am__append_5030 = video.module$(EXEEXT) - @COND_arm64_efi_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_FALSE@video_module_DEPENDENCIES = --@COND_emu_TRUE@am__append_5038 = --@COND_emu_TRUE@am__append_5039 = $(nodist_video_module_SOURCES) --@COND_emu_TRUE@am__append_5040 = $(nodist_video_module_SOURCES) \ -+@COND_emu_TRUE@am__append_5031 = -+@COND_emu_TRUE@am__append_5032 = $(nodist_video_module_SOURCES) -+@COND_emu_TRUE@am__append_5033 = $(nodist_video_module_SOURCES) \ - @COND_emu_TRUE@ video.marker --@COND_emu_TRUE@am__append_5041 = video.mod --@COND_emu_TRUE@am__append_5042 = video.marker --@COND_i386_pc_TRUE@am__append_5043 = video.module --@COND_i386_pc_TRUE@am__append_5044 = video.module$(EXEEXT) --@COND_i386_pc_TRUE@am__append_5045 = --@COND_i386_pc_TRUE@am__append_5046 = $(nodist_video_module_SOURCES) --@COND_i386_pc_TRUE@am__append_5047 = $(nodist_video_module_SOURCES) \ -+@COND_emu_TRUE@am__append_5034 = video.mod -+@COND_emu_TRUE@am__append_5035 = video.marker -+@COND_i386_pc_TRUE@am__append_5036 = video.module -+@COND_i386_pc_TRUE@am__append_5037 = video.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__append_5038 = -+@COND_i386_pc_TRUE@am__append_5039 = $(nodist_video_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_5040 = $(nodist_video_module_SOURCES) \ - @COND_i386_pc_TRUE@ video.marker --@COND_i386_pc_TRUE@am__append_5048 = video.mod --@COND_i386_pc_TRUE@am__append_5049 = video.marker --@COND_i386_efi_TRUE@am__append_5050 = video.module --@COND_i386_efi_TRUE@am__append_5051 = video.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_5052 = --@COND_i386_efi_TRUE@am__append_5053 = $(nodist_video_module_SOURCES) --@COND_i386_efi_TRUE@am__append_5054 = $(nodist_video_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_5041 = video.mod -+@COND_i386_pc_TRUE@am__append_5042 = video.marker -+@COND_i386_efi_TRUE@am__append_5043 = video.module -+@COND_i386_efi_TRUE@am__append_5044 = video.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_5045 = -+@COND_i386_efi_TRUE@am__append_5046 = $(nodist_video_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_5047 = $(nodist_video_module_SOURCES) \ - @COND_i386_efi_TRUE@ video.marker --@COND_i386_efi_TRUE@am__append_5055 = video.mod --@COND_i386_efi_TRUE@am__append_5056 = video.marker --@COND_i386_qemu_TRUE@am__append_5057 = video.module --@COND_i386_qemu_TRUE@am__append_5058 = video.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_5059 = --@COND_i386_qemu_TRUE@am__append_5060 = $(nodist_video_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_5061 = $(nodist_video_module_SOURCES) \ -+@COND_i386_efi_TRUE@am__append_5048 = video.mod -+@COND_i386_efi_TRUE@am__append_5049 = video.marker -+@COND_i386_qemu_TRUE@am__append_5050 = video.module -+@COND_i386_qemu_TRUE@am__append_5051 = video.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_5052 = -+@COND_i386_qemu_TRUE@am__append_5053 = $(nodist_video_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_5054 = $(nodist_video_module_SOURCES) \ - @COND_i386_qemu_TRUE@ video.marker --@COND_i386_qemu_TRUE@am__append_5062 = video.mod --@COND_i386_qemu_TRUE@am__append_5063 = video.marker --@COND_i386_multiboot_TRUE@am__append_5064 = video.module --@COND_i386_multiboot_TRUE@am__append_5065 = video.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_5066 = --@COND_i386_multiboot_TRUE@am__append_5067 = $(nodist_video_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_5068 = \ -+@COND_i386_qemu_TRUE@am__append_5055 = video.mod -+@COND_i386_qemu_TRUE@am__append_5056 = video.marker -+@COND_i386_multiboot_TRUE@am__append_5057 = video.module -+@COND_i386_multiboot_TRUE@am__append_5058 = video.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_5059 = -+@COND_i386_multiboot_TRUE@am__append_5060 = $(nodist_video_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_5061 = \ - @COND_i386_multiboot_TRUE@ $(nodist_video_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ video.marker --@COND_i386_multiboot_TRUE@am__append_5069 = video.mod --@COND_i386_multiboot_TRUE@am__append_5070 = video.marker --@COND_i386_ieee1275_TRUE@am__append_5071 = video.module --@COND_i386_ieee1275_TRUE@am__append_5072 = video.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_5073 = --@COND_i386_ieee1275_TRUE@am__append_5074 = $(nodist_video_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_5075 = \ -+@COND_i386_multiboot_TRUE@am__append_5062 = video.mod -+@COND_i386_multiboot_TRUE@am__append_5063 = video.marker -+@COND_i386_ieee1275_TRUE@am__append_5064 = video.module -+@COND_i386_ieee1275_TRUE@am__append_5065 = video.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_5066 = -+@COND_i386_ieee1275_TRUE@am__append_5067 = $(nodist_video_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_5068 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_video_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ video.marker --@COND_i386_ieee1275_TRUE@am__append_5076 = video.mod --@COND_i386_ieee1275_TRUE@am__append_5077 = video.marker --@COND_x86_64_efi_TRUE@am__append_5078 = video.module --@COND_x86_64_efi_TRUE@am__append_5079 = video.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_5080 = --@COND_x86_64_efi_TRUE@am__append_5081 = $(nodist_video_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_5082 = \ -+@COND_i386_ieee1275_TRUE@am__append_5069 = video.mod -+@COND_i386_ieee1275_TRUE@am__append_5070 = video.marker -+@COND_x86_64_efi_TRUE@am__append_5071 = video.module -+@COND_x86_64_efi_TRUE@am__append_5072 = video.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_5073 = -+@COND_x86_64_efi_TRUE@am__append_5074 = $(nodist_video_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_5075 = \ - @COND_x86_64_efi_TRUE@ $(nodist_video_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ video.marker --@COND_x86_64_efi_TRUE@am__append_5083 = video.mod --@COND_x86_64_efi_TRUE@am__append_5084 = video.marker --@COND_i386_xen_TRUE@am__append_5085 = video.module --@COND_i386_xen_TRUE@am__append_5086 = video.module$(EXEEXT) --@COND_i386_xen_TRUE@am__append_5087 = --@COND_i386_xen_TRUE@am__append_5088 = $(nodist_video_module_SOURCES) --@COND_i386_xen_TRUE@am__append_5089 = $(nodist_video_module_SOURCES) \ -+@COND_x86_64_efi_TRUE@am__append_5076 = video.mod -+@COND_x86_64_efi_TRUE@am__append_5077 = video.marker -+@COND_i386_xen_TRUE@am__append_5078 = video.module -+@COND_i386_xen_TRUE@am__append_5079 = video.module$(EXEEXT) -+@COND_i386_xen_TRUE@am__append_5080 = -+@COND_i386_xen_TRUE@am__append_5081 = $(nodist_video_module_SOURCES) -+@COND_i386_xen_TRUE@am__append_5082 = $(nodist_video_module_SOURCES) \ - @COND_i386_xen_TRUE@ video.marker --@COND_i386_xen_TRUE@am__append_5090 = video.mod --@COND_i386_xen_TRUE@am__append_5091 = video.marker --@COND_x86_64_xen_TRUE@am__append_5092 = video.module --@COND_x86_64_xen_TRUE@am__append_5093 = video.module$(EXEEXT) --@COND_x86_64_xen_TRUE@am__append_5094 = --@COND_x86_64_xen_TRUE@am__append_5095 = $(nodist_video_module_SOURCES) --@COND_x86_64_xen_TRUE@am__append_5096 = \ -+@COND_i386_xen_TRUE@am__append_5083 = video.mod -+@COND_i386_xen_TRUE@am__append_5084 = video.marker -+@COND_x86_64_xen_TRUE@am__append_5085 = video.module -+@COND_x86_64_xen_TRUE@am__append_5086 = video.module$(EXEEXT) -+@COND_x86_64_xen_TRUE@am__append_5087 = -+@COND_x86_64_xen_TRUE@am__append_5088 = $(nodist_video_module_SOURCES) -+@COND_x86_64_xen_TRUE@am__append_5089 = \ - @COND_x86_64_xen_TRUE@ $(nodist_video_module_SOURCES) \ - @COND_x86_64_xen_TRUE@ video.marker --@COND_x86_64_xen_TRUE@am__append_5097 = video.mod --@COND_x86_64_xen_TRUE@am__append_5098 = video.marker --@COND_i386_xen_pvh_TRUE@am__append_5099 = video.module --@COND_i386_xen_pvh_TRUE@am__append_5100 = video.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__append_5101 = --@COND_i386_xen_pvh_TRUE@am__append_5102 = $(nodist_video_module_SOURCES) --@COND_i386_xen_pvh_TRUE@am__append_5103 = \ -+@COND_x86_64_xen_TRUE@am__append_5090 = video.mod -+@COND_x86_64_xen_TRUE@am__append_5091 = video.marker -+@COND_i386_xen_pvh_TRUE@am__append_5092 = video.module -+@COND_i386_xen_pvh_TRUE@am__append_5093 = video.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__append_5094 = -+@COND_i386_xen_pvh_TRUE@am__append_5095 = $(nodist_video_module_SOURCES) -+@COND_i386_xen_pvh_TRUE@am__append_5096 = \ - @COND_i386_xen_pvh_TRUE@ $(nodist_video_module_SOURCES) \ - @COND_i386_xen_pvh_TRUE@ video.marker --@COND_i386_xen_pvh_TRUE@am__append_5104 = video.mod --@COND_i386_xen_pvh_TRUE@am__append_5105 = video.marker --@COND_sparc64_ieee1275_TRUE@am__append_5106 = video.module --@COND_sparc64_ieee1275_TRUE@am__append_5107 = video.module$(EXEEXT) --@COND_sparc64_ieee1275_TRUE@am__append_5108 = --@COND_sparc64_ieee1275_TRUE@am__append_5109 = $(nodist_video_module_SOURCES) --@COND_sparc64_ieee1275_TRUE@am__append_5110 = \ -+@COND_i386_xen_pvh_TRUE@am__append_5097 = video.mod -+@COND_i386_xen_pvh_TRUE@am__append_5098 = video.marker -+@COND_sparc64_ieee1275_TRUE@am__append_5099 = video.module -+@COND_sparc64_ieee1275_TRUE@am__append_5100 = video.module$(EXEEXT) -+@COND_sparc64_ieee1275_TRUE@am__append_5101 = -+@COND_sparc64_ieee1275_TRUE@am__append_5102 = $(nodist_video_module_SOURCES) -+@COND_sparc64_ieee1275_TRUE@am__append_5103 = \ - @COND_sparc64_ieee1275_TRUE@ $(nodist_video_module_SOURCES) \ - @COND_sparc64_ieee1275_TRUE@ video.marker --@COND_sparc64_ieee1275_TRUE@am__append_5111 = video.mod --@COND_sparc64_ieee1275_TRUE@am__append_5112 = video.marker --@COND_powerpc_ieee1275_TRUE@am__append_5113 = video.module --@COND_powerpc_ieee1275_TRUE@am__append_5114 = video.module$(EXEEXT) --@COND_powerpc_ieee1275_TRUE@am__append_5115 = --@COND_powerpc_ieee1275_TRUE@am__append_5116 = $(nodist_video_module_SOURCES) --@COND_powerpc_ieee1275_TRUE@am__append_5117 = \ -+@COND_sparc64_ieee1275_TRUE@am__append_5104 = video.mod -+@COND_sparc64_ieee1275_TRUE@am__append_5105 = video.marker -+@COND_powerpc_ieee1275_TRUE@am__append_5106 = video.module -+@COND_powerpc_ieee1275_TRUE@am__append_5107 = video.module$(EXEEXT) -+@COND_powerpc_ieee1275_TRUE@am__append_5108 = -+@COND_powerpc_ieee1275_TRUE@am__append_5109 = $(nodist_video_module_SOURCES) -+@COND_powerpc_ieee1275_TRUE@am__append_5110 = \ - @COND_powerpc_ieee1275_TRUE@ $(nodist_video_module_SOURCES) \ - @COND_powerpc_ieee1275_TRUE@ video.marker --@COND_powerpc_ieee1275_TRUE@am__append_5118 = video.mod --@COND_powerpc_ieee1275_TRUE@am__append_5119 = video.marker --@COND_mips_arc_TRUE@am__append_5120 = video.module --@COND_mips_arc_TRUE@am__append_5121 = video.module$(EXEEXT) --@COND_mips_arc_TRUE@am__append_5122 = --@COND_mips_arc_TRUE@am__append_5123 = $(nodist_video_module_SOURCES) --@COND_mips_arc_TRUE@am__append_5124 = $(nodist_video_module_SOURCES) \ -+@COND_powerpc_ieee1275_TRUE@am__append_5111 = video.mod -+@COND_powerpc_ieee1275_TRUE@am__append_5112 = video.marker -+@COND_mips_arc_TRUE@am__append_5113 = video.module -+@COND_mips_arc_TRUE@am__append_5114 = video.module$(EXEEXT) -+@COND_mips_arc_TRUE@am__append_5115 = -+@COND_mips_arc_TRUE@am__append_5116 = $(nodist_video_module_SOURCES) -+@COND_mips_arc_TRUE@am__append_5117 = $(nodist_video_module_SOURCES) \ - @COND_mips_arc_TRUE@ video.marker --@COND_mips_arc_TRUE@am__append_5125 = video.mod --@COND_mips_arc_TRUE@am__append_5126 = video.marker --@COND_ia64_efi_TRUE@am__append_5127 = video.module --@COND_ia64_efi_TRUE@am__append_5128 = video.module$(EXEEXT) --@COND_ia64_efi_TRUE@am__append_5129 = --@COND_ia64_efi_TRUE@am__append_5130 = $(nodist_video_module_SOURCES) --@COND_ia64_efi_TRUE@am__append_5131 = $(nodist_video_module_SOURCES) \ -+@COND_mips_arc_TRUE@am__append_5118 = video.mod -+@COND_mips_arc_TRUE@am__append_5119 = video.marker -+@COND_ia64_efi_TRUE@am__append_5120 = video.module -+@COND_ia64_efi_TRUE@am__append_5121 = video.module$(EXEEXT) -+@COND_ia64_efi_TRUE@am__append_5122 = -+@COND_ia64_efi_TRUE@am__append_5123 = $(nodist_video_module_SOURCES) -+@COND_ia64_efi_TRUE@am__append_5124 = $(nodist_video_module_SOURCES) \ - @COND_ia64_efi_TRUE@ video.marker --@COND_ia64_efi_TRUE@am__append_5132 = video.mod --@COND_ia64_efi_TRUE@am__append_5133 = video.marker --@COND_mips_qemu_mips_TRUE@am__append_5134 = video.module --@COND_mips_qemu_mips_TRUE@am__append_5135 = video.module$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__append_5136 = --@COND_mips_qemu_mips_TRUE@am__append_5137 = $(nodist_video_module_SOURCES) --@COND_mips_qemu_mips_TRUE@am__append_5138 = \ -+@COND_ia64_efi_TRUE@am__append_5125 = video.mod -+@COND_ia64_efi_TRUE@am__append_5126 = video.marker -+@COND_mips_qemu_mips_TRUE@am__append_5127 = video.module -+@COND_mips_qemu_mips_TRUE@am__append_5128 = video.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__append_5129 = -+@COND_mips_qemu_mips_TRUE@am__append_5130 = $(nodist_video_module_SOURCES) -+@COND_mips_qemu_mips_TRUE@am__append_5131 = \ - @COND_mips_qemu_mips_TRUE@ $(nodist_video_module_SOURCES) \ - @COND_mips_qemu_mips_TRUE@ video.marker --@COND_mips_qemu_mips_TRUE@am__append_5139 = video.mod --@COND_mips_qemu_mips_TRUE@am__append_5140 = video.marker --@COND_arm_uboot_TRUE@am__append_5141 = video.module --@COND_arm_uboot_TRUE@am__append_5142 = video.module$(EXEEXT) --@COND_arm_uboot_TRUE@am__append_5143 = --@COND_arm_uboot_TRUE@am__append_5144 = $(nodist_video_module_SOURCES) --@COND_arm_uboot_TRUE@am__append_5145 = $(nodist_video_module_SOURCES) \ -+@COND_mips_qemu_mips_TRUE@am__append_5132 = video.mod -+@COND_mips_qemu_mips_TRUE@am__append_5133 = video.marker -+@COND_arm_uboot_TRUE@am__append_5134 = video.module -+@COND_arm_uboot_TRUE@am__append_5135 = video.module$(EXEEXT) -+@COND_arm_uboot_TRUE@am__append_5136 = -+@COND_arm_uboot_TRUE@am__append_5137 = $(nodist_video_module_SOURCES) -+@COND_arm_uboot_TRUE@am__append_5138 = $(nodist_video_module_SOURCES) \ - @COND_arm_uboot_TRUE@ video.marker --@COND_arm_uboot_TRUE@am__append_5146 = video.mod --@COND_arm_uboot_TRUE@am__append_5147 = video.marker --@COND_arm_efi_TRUE@am__append_5148 = video.module --@COND_arm_efi_TRUE@am__append_5149 = video.module$(EXEEXT) --@COND_arm_efi_TRUE@am__append_5150 = --@COND_arm_efi_TRUE@am__append_5151 = $(nodist_video_module_SOURCES) --@COND_arm_efi_TRUE@am__append_5152 = $(nodist_video_module_SOURCES) \ -+@COND_arm_uboot_TRUE@am__append_5139 = video.mod -+@COND_arm_uboot_TRUE@am__append_5140 = video.marker -+@COND_arm_efi_TRUE@am__append_5141 = video.module -+@COND_arm_efi_TRUE@am__append_5142 = video.module$(EXEEXT) -+@COND_arm_efi_TRUE@am__append_5143 = -+@COND_arm_efi_TRUE@am__append_5144 = $(nodist_video_module_SOURCES) -+@COND_arm_efi_TRUE@am__append_5145 = $(nodist_video_module_SOURCES) \ - @COND_arm_efi_TRUE@ video.marker --@COND_arm_efi_TRUE@am__append_5153 = video.mod --@COND_arm_efi_TRUE@am__append_5154 = video.marker --@COND_arm64_efi_TRUE@am__append_5155 = video.module --@COND_arm64_efi_TRUE@am__append_5156 = video.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__append_5157 = --@COND_arm64_efi_TRUE@am__append_5158 = $(nodist_video_module_SOURCES) --@COND_arm64_efi_TRUE@am__append_5159 = $(nodist_video_module_SOURCES) \ -+@COND_arm_efi_TRUE@am__append_5146 = video.mod -+@COND_arm_efi_TRUE@am__append_5147 = video.marker -+@COND_arm64_efi_TRUE@am__append_5148 = video.module -+@COND_arm64_efi_TRUE@am__append_5149 = video.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__append_5150 = -+@COND_arm64_efi_TRUE@am__append_5151 = $(nodist_video_module_SOURCES) -+@COND_arm64_efi_TRUE@am__append_5152 = $(nodist_video_module_SOURCES) \ - @COND_arm64_efi_TRUE@ video.marker --@COND_arm64_efi_TRUE@am__append_5160 = video.mod --@COND_arm64_efi_TRUE@am__append_5161 = video.marker --@COND_riscv32_efi_TRUE@am__append_5162 = video.module --@COND_riscv32_efi_TRUE@am__append_5163 = video.module$(EXEEXT) --@COND_riscv32_efi_TRUE@am__append_5164 = --@COND_riscv32_efi_TRUE@am__append_5165 = $(nodist_video_module_SOURCES) --@COND_riscv32_efi_TRUE@am__append_5166 = \ -+@COND_arm64_efi_TRUE@am__append_5153 = video.mod -+@COND_arm64_efi_TRUE@am__append_5154 = video.marker -+@COND_riscv32_efi_TRUE@am__append_5155 = video.module -+@COND_riscv32_efi_TRUE@am__append_5156 = video.module$(EXEEXT) -+@COND_riscv32_efi_TRUE@am__append_5157 = -+@COND_riscv32_efi_TRUE@am__append_5158 = $(nodist_video_module_SOURCES) -+@COND_riscv32_efi_TRUE@am__append_5159 = \ - @COND_riscv32_efi_TRUE@ $(nodist_video_module_SOURCES) \ - @COND_riscv32_efi_TRUE@ video.marker --@COND_riscv32_efi_TRUE@am__append_5167 = video.mod --@COND_riscv32_efi_TRUE@am__append_5168 = video.marker --@COND_riscv64_efi_TRUE@am__append_5169 = video.module --@COND_riscv64_efi_TRUE@am__append_5170 = video.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__append_5171 = --@COND_riscv64_efi_TRUE@am__append_5172 = $(nodist_video_module_SOURCES) --@COND_riscv64_efi_TRUE@am__append_5173 = \ -+@COND_riscv32_efi_TRUE@am__append_5160 = video.mod -+@COND_riscv32_efi_TRUE@am__append_5161 = video.marker -+@COND_riscv64_efi_TRUE@am__append_5162 = video.module -+@COND_riscv64_efi_TRUE@am__append_5163 = video.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__append_5164 = -+@COND_riscv64_efi_TRUE@am__append_5165 = $(nodist_video_module_SOURCES) -+@COND_riscv64_efi_TRUE@am__append_5166 = \ - @COND_riscv64_efi_TRUE@ $(nodist_video_module_SOURCES) \ - @COND_riscv64_efi_TRUE@ video.marker --@COND_riscv64_efi_TRUE@am__append_5174 = video.mod --@COND_riscv64_efi_TRUE@am__append_5175 = video.marker --@COND_powerpc_ieee1275_TRUE@am__append_5176 = ieee1275_fb.module --@COND_powerpc_ieee1275_TRUE@am__append_5177 = ieee1275_fb.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__append_5167 = video.mod -+@COND_riscv64_efi_TRUE@am__append_5168 = video.marker -+@COND_powerpc_ieee1275_TRUE@am__append_5169 = ieee1275_fb.module -+@COND_powerpc_ieee1275_TRUE@am__append_5170 = ieee1275_fb.module$(EXEEXT) - @COND_powerpc_ieee1275_FALSE@ieee1275_fb_module_DEPENDENCIES = --@COND_powerpc_ieee1275_TRUE@am__append_5178 = --@COND_powerpc_ieee1275_TRUE@am__append_5179 = $(nodist_ieee1275_fb_module_SOURCES) --@COND_powerpc_ieee1275_TRUE@am__append_5180 = $(nodist_ieee1275_fb_module_SOURCES) \ -+@COND_powerpc_ieee1275_TRUE@am__append_5171 = -+@COND_powerpc_ieee1275_TRUE@am__append_5172 = $(nodist_ieee1275_fb_module_SOURCES) -+@COND_powerpc_ieee1275_TRUE@am__append_5173 = $(nodist_ieee1275_fb_module_SOURCES) \ - @COND_powerpc_ieee1275_TRUE@ ieee1275_fb.marker --@COND_powerpc_ieee1275_TRUE@am__append_5181 = ieee1275_fb.mod --@COND_powerpc_ieee1275_TRUE@am__append_5182 = ieee1275_fb.marker --@COND_GRUB_EMU_SDL_TRUE@@COND_emu_TRUE@am__append_5183 = sdl.module --@COND_GRUB_EMU_SDL_TRUE@@COND_emu_TRUE@am__append_5184 = sdl.module$(EXEEXT) -+@COND_powerpc_ieee1275_TRUE@am__append_5174 = ieee1275_fb.mod -+@COND_powerpc_ieee1275_TRUE@am__append_5175 = ieee1275_fb.marker -+@COND_GRUB_EMU_SDL_TRUE@@COND_emu_TRUE@am__append_5176 = sdl.module -+@COND_GRUB_EMU_SDL_TRUE@@COND_emu_TRUE@am__append_5177 = sdl.module$(EXEEXT) - @COND_GRUB_EMU_SDL_FALSE@sdl_module_DEPENDENCIES = - @COND_emu_FALSE@sdl_module_DEPENDENCIES = --@COND_GRUB_EMU_SDL_TRUE@@COND_emu_TRUE@am__append_5185 = --@COND_GRUB_EMU_SDL_TRUE@@COND_emu_TRUE@am__append_5186 = $(nodist_sdl_module_SOURCES) --@COND_GRUB_EMU_SDL_TRUE@@COND_emu_TRUE@am__append_5187 = $(nodist_sdl_module_SOURCES) \ -+@COND_GRUB_EMU_SDL_TRUE@@COND_emu_TRUE@am__append_5178 = -+@COND_GRUB_EMU_SDL_TRUE@@COND_emu_TRUE@am__append_5179 = $(nodist_sdl_module_SOURCES) -+@COND_GRUB_EMU_SDL_TRUE@@COND_emu_TRUE@am__append_5180 = $(nodist_sdl_module_SOURCES) \ - @COND_GRUB_EMU_SDL_TRUE@@COND_emu_TRUE@ sdl.marker --@COND_GRUB_EMU_SDL_TRUE@@COND_emu_TRUE@am__append_5188 = sdl.mod --@COND_GRUB_EMU_SDL_TRUE@@COND_emu_TRUE@am__append_5189 = sdl.marker --@COND_i386_ieee1275_TRUE@am__append_5190 = ofnet.module --@COND_i386_ieee1275_TRUE@am__append_5191 = ofnet.module$(EXEEXT) -+@COND_GRUB_EMU_SDL_TRUE@@COND_emu_TRUE@am__append_5181 = sdl.mod -+@COND_GRUB_EMU_SDL_TRUE@@COND_emu_TRUE@am__append_5182 = sdl.marker -+@COND_i386_ieee1275_TRUE@am__append_5183 = ofnet.module -+@COND_i386_ieee1275_TRUE@am__append_5184 = ofnet.module$(EXEEXT) - @COND_i386_ieee1275_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_sparc64_ieee1275_FALSE@ofnet_module_DEPENDENCIES = --@COND_i386_ieee1275_TRUE@am__append_5192 = --@COND_i386_ieee1275_TRUE@am__append_5193 = $(nodist_ofnet_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_5194 = \ -+@COND_i386_ieee1275_TRUE@am__append_5185 = -+@COND_i386_ieee1275_TRUE@am__append_5186 = $(nodist_ofnet_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_5187 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_ofnet_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ ofnet.marker --@COND_i386_ieee1275_TRUE@am__append_5195 = ofnet.mod --@COND_i386_ieee1275_TRUE@am__append_5196 = ofnet.marker --@COND_sparc64_ieee1275_TRUE@am__append_5197 = ofnet.module --@COND_sparc64_ieee1275_TRUE@am__append_5198 = ofnet.module$(EXEEXT) --@COND_sparc64_ieee1275_TRUE@am__append_5199 = --@COND_sparc64_ieee1275_TRUE@am__append_5200 = $(nodist_ofnet_module_SOURCES) --@COND_sparc64_ieee1275_TRUE@am__append_5201 = \ -+@COND_i386_ieee1275_TRUE@am__append_5188 = ofnet.mod -+@COND_i386_ieee1275_TRUE@am__append_5189 = ofnet.marker -+@COND_sparc64_ieee1275_TRUE@am__append_5190 = ofnet.module -+@COND_sparc64_ieee1275_TRUE@am__append_5191 = ofnet.module$(EXEEXT) -+@COND_sparc64_ieee1275_TRUE@am__append_5192 = -+@COND_sparc64_ieee1275_TRUE@am__append_5193 = $(nodist_ofnet_module_SOURCES) -+@COND_sparc64_ieee1275_TRUE@am__append_5194 = \ - @COND_sparc64_ieee1275_TRUE@ $(nodist_ofnet_module_SOURCES) \ - @COND_sparc64_ieee1275_TRUE@ ofnet.marker --@COND_sparc64_ieee1275_TRUE@am__append_5202 = ofnet.mod --@COND_sparc64_ieee1275_TRUE@am__append_5203 = ofnet.marker --@COND_powerpc_ieee1275_TRUE@am__append_5204 = ofnet.module --@COND_powerpc_ieee1275_TRUE@am__append_5205 = ofnet.module$(EXEEXT) --@COND_powerpc_ieee1275_TRUE@am__append_5206 = --@COND_powerpc_ieee1275_TRUE@am__append_5207 = $(nodist_ofnet_module_SOURCES) --@COND_powerpc_ieee1275_TRUE@am__append_5208 = \ -+@COND_sparc64_ieee1275_TRUE@am__append_5195 = ofnet.mod -+@COND_sparc64_ieee1275_TRUE@am__append_5196 = ofnet.marker -+@COND_powerpc_ieee1275_TRUE@am__append_5197 = ofnet.module -+@COND_powerpc_ieee1275_TRUE@am__append_5198 = ofnet.module$(EXEEXT) -+@COND_powerpc_ieee1275_TRUE@am__append_5199 = -+@COND_powerpc_ieee1275_TRUE@am__append_5200 = $(nodist_ofnet_module_SOURCES) -+@COND_powerpc_ieee1275_TRUE@am__append_5201 = \ - @COND_powerpc_ieee1275_TRUE@ $(nodist_ofnet_module_SOURCES) \ - @COND_powerpc_ieee1275_TRUE@ ofnet.marker --@COND_powerpc_ieee1275_TRUE@am__append_5209 = ofnet.mod --@COND_powerpc_ieee1275_TRUE@am__append_5210 = ofnet.marker --@COND_arm_uboot_TRUE@am__append_5211 = ubootnet.module --@COND_arm_uboot_TRUE@am__append_5212 = ubootnet.module$(EXEEXT) -+@COND_powerpc_ieee1275_TRUE@am__append_5202 = ofnet.mod -+@COND_powerpc_ieee1275_TRUE@am__append_5203 = ofnet.marker -+@COND_arm_uboot_TRUE@am__append_5204 = ubootnet.module -+@COND_arm_uboot_TRUE@am__append_5205 = ubootnet.module$(EXEEXT) - @COND_arm_uboot_FALSE@ubootnet_module_DEPENDENCIES = --@COND_arm_uboot_TRUE@am__append_5213 = --@COND_arm_uboot_TRUE@am__append_5214 = $(nodist_ubootnet_module_SOURCES) --@COND_arm_uboot_TRUE@am__append_5215 = \ -+@COND_arm_uboot_TRUE@am__append_5206 = -+@COND_arm_uboot_TRUE@am__append_5207 = $(nodist_ubootnet_module_SOURCES) -+@COND_arm_uboot_TRUE@am__append_5208 = \ - @COND_arm_uboot_TRUE@ $(nodist_ubootnet_module_SOURCES) \ - @COND_arm_uboot_TRUE@ ubootnet.marker --@COND_arm_uboot_TRUE@am__append_5216 = ubootnet.mod --@COND_arm_uboot_TRUE@am__append_5217 = ubootnet.marker --@COND_i386_efi_TRUE@am__append_5218 = efinet.module --@COND_i386_efi_TRUE@am__append_5219 = efinet.module$(EXEEXT) -+@COND_arm_uboot_TRUE@am__append_5209 = ubootnet.mod -+@COND_arm_uboot_TRUE@am__append_5210 = ubootnet.marker -+@COND_i386_efi_TRUE@am__append_5211 = efinet.module -+@COND_i386_efi_TRUE@am__append_5212 = efinet.module$(EXEEXT) - @COND_arm64_efi_FALSE@@COND_arm_efi_FALSE@@COND_i386_efi_FALSE@@COND_ia64_efi_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_x86_64_efi_FALSE@efinet_module_DEPENDENCIES = --@COND_i386_efi_TRUE@am__append_5220 = --@COND_i386_efi_TRUE@am__append_5221 = $(nodist_efinet_module_SOURCES) --@COND_i386_efi_TRUE@am__append_5222 = $(nodist_efinet_module_SOURCES) \ -+@COND_i386_efi_TRUE@am__append_5213 = -+@COND_i386_efi_TRUE@am__append_5214 = $(nodist_efinet_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_5215 = $(nodist_efinet_module_SOURCES) \ - @COND_i386_efi_TRUE@ efinet.marker --@COND_i386_efi_TRUE@am__append_5223 = efinet.mod --@COND_i386_efi_TRUE@am__append_5224 = efinet.marker --@COND_x86_64_efi_TRUE@am__append_5225 = efinet.module --@COND_x86_64_efi_TRUE@am__append_5226 = efinet.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_5227 = --@COND_x86_64_efi_TRUE@am__append_5228 = $(nodist_efinet_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_5229 = \ -+@COND_i386_efi_TRUE@am__append_5216 = efinet.mod -+@COND_i386_efi_TRUE@am__append_5217 = efinet.marker -+@COND_x86_64_efi_TRUE@am__append_5218 = efinet.module -+@COND_x86_64_efi_TRUE@am__append_5219 = efinet.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_5220 = -+@COND_x86_64_efi_TRUE@am__append_5221 = $(nodist_efinet_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_5222 = \ - @COND_x86_64_efi_TRUE@ $(nodist_efinet_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ efinet.marker --@COND_x86_64_efi_TRUE@am__append_5230 = efinet.mod --@COND_x86_64_efi_TRUE@am__append_5231 = efinet.marker --@COND_ia64_efi_TRUE@am__append_5232 = efinet.module --@COND_ia64_efi_TRUE@am__append_5233 = efinet.module$(EXEEXT) --@COND_ia64_efi_TRUE@am__append_5234 = --@COND_ia64_efi_TRUE@am__append_5235 = $(nodist_efinet_module_SOURCES) --@COND_ia64_efi_TRUE@am__append_5236 = $(nodist_efinet_module_SOURCES) \ -+@COND_x86_64_efi_TRUE@am__append_5223 = efinet.mod -+@COND_x86_64_efi_TRUE@am__append_5224 = efinet.marker -+@COND_ia64_efi_TRUE@am__append_5225 = efinet.module -+@COND_ia64_efi_TRUE@am__append_5226 = efinet.module$(EXEEXT) -+@COND_ia64_efi_TRUE@am__append_5227 = -+@COND_ia64_efi_TRUE@am__append_5228 = $(nodist_efinet_module_SOURCES) -+@COND_ia64_efi_TRUE@am__append_5229 = $(nodist_efinet_module_SOURCES) \ - @COND_ia64_efi_TRUE@ efinet.marker --@COND_ia64_efi_TRUE@am__append_5237 = efinet.mod --@COND_ia64_efi_TRUE@am__append_5238 = efinet.marker --@COND_arm_efi_TRUE@am__append_5239 = efinet.module --@COND_arm_efi_TRUE@am__append_5240 = efinet.module$(EXEEXT) --@COND_arm_efi_TRUE@am__append_5241 = --@COND_arm_efi_TRUE@am__append_5242 = $(nodist_efinet_module_SOURCES) --@COND_arm_efi_TRUE@am__append_5243 = $(nodist_efinet_module_SOURCES) \ -+@COND_ia64_efi_TRUE@am__append_5230 = efinet.mod -+@COND_ia64_efi_TRUE@am__append_5231 = efinet.marker -+@COND_arm_efi_TRUE@am__append_5232 = efinet.module -+@COND_arm_efi_TRUE@am__append_5233 = efinet.module$(EXEEXT) -+@COND_arm_efi_TRUE@am__append_5234 = -+@COND_arm_efi_TRUE@am__append_5235 = $(nodist_efinet_module_SOURCES) -+@COND_arm_efi_TRUE@am__append_5236 = $(nodist_efinet_module_SOURCES) \ - @COND_arm_efi_TRUE@ efinet.marker --@COND_arm_efi_TRUE@am__append_5244 = efinet.mod --@COND_arm_efi_TRUE@am__append_5245 = efinet.marker --@COND_arm64_efi_TRUE@am__append_5246 = efinet.module --@COND_arm64_efi_TRUE@am__append_5247 = efinet.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__append_5248 = --@COND_arm64_efi_TRUE@am__append_5249 = $(nodist_efinet_module_SOURCES) --@COND_arm64_efi_TRUE@am__append_5250 = \ -+@COND_arm_efi_TRUE@am__append_5237 = efinet.mod -+@COND_arm_efi_TRUE@am__append_5238 = efinet.marker -+@COND_arm64_efi_TRUE@am__append_5239 = efinet.module -+@COND_arm64_efi_TRUE@am__append_5240 = efinet.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__append_5241 = -+@COND_arm64_efi_TRUE@am__append_5242 = $(nodist_efinet_module_SOURCES) -+@COND_arm64_efi_TRUE@am__append_5243 = \ - @COND_arm64_efi_TRUE@ $(nodist_efinet_module_SOURCES) \ - @COND_arm64_efi_TRUE@ efinet.marker --@COND_arm64_efi_TRUE@am__append_5251 = efinet.mod --@COND_arm64_efi_TRUE@am__append_5252 = efinet.marker --@COND_riscv32_efi_TRUE@am__append_5253 = efinet.module --@COND_riscv32_efi_TRUE@am__append_5254 = efinet.module$(EXEEXT) --@COND_riscv32_efi_TRUE@am__append_5255 = --@COND_riscv32_efi_TRUE@am__append_5256 = $(nodist_efinet_module_SOURCES) --@COND_riscv32_efi_TRUE@am__append_5257 = \ -+@COND_arm64_efi_TRUE@am__append_5244 = efinet.mod -+@COND_arm64_efi_TRUE@am__append_5245 = efinet.marker -+@COND_riscv32_efi_TRUE@am__append_5246 = efinet.module -+@COND_riscv32_efi_TRUE@am__append_5247 = efinet.module$(EXEEXT) -+@COND_riscv32_efi_TRUE@am__append_5248 = -+@COND_riscv32_efi_TRUE@am__append_5249 = $(nodist_efinet_module_SOURCES) -+@COND_riscv32_efi_TRUE@am__append_5250 = \ - @COND_riscv32_efi_TRUE@ $(nodist_efinet_module_SOURCES) \ - @COND_riscv32_efi_TRUE@ efinet.marker --@COND_riscv32_efi_TRUE@am__append_5258 = efinet.mod --@COND_riscv32_efi_TRUE@am__append_5259 = efinet.marker --@COND_riscv64_efi_TRUE@am__append_5260 = efinet.module --@COND_riscv64_efi_TRUE@am__append_5261 = efinet.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__append_5262 = --@COND_riscv64_efi_TRUE@am__append_5263 = $(nodist_efinet_module_SOURCES) --@COND_riscv64_efi_TRUE@am__append_5264 = \ -+@COND_riscv32_efi_TRUE@am__append_5251 = efinet.mod -+@COND_riscv32_efi_TRUE@am__append_5252 = efinet.marker -+@COND_riscv64_efi_TRUE@am__append_5253 = efinet.module -+@COND_riscv64_efi_TRUE@am__append_5254 = efinet.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__append_5255 = -+@COND_riscv64_efi_TRUE@am__append_5256 = $(nodist_efinet_module_SOURCES) -+@COND_riscv64_efi_TRUE@am__append_5257 = \ - @COND_riscv64_efi_TRUE@ $(nodist_efinet_module_SOURCES) \ - @COND_riscv64_efi_TRUE@ efinet.marker --@COND_riscv64_efi_TRUE@am__append_5265 = efinet.mod --@COND_riscv64_efi_TRUE@am__append_5266 = efinet.marker --@COND_emu_TRUE@am__append_5267 = emunet.module legacycfg.module --@COND_emu_TRUE@am__append_5268 = emunet.module$(EXEEXT) \ -+@COND_riscv64_efi_TRUE@am__append_5258 = efinet.mod -+@COND_riscv64_efi_TRUE@am__append_5259 = efinet.marker -+@COND_emu_TRUE@am__append_5260 = emunet.module legacycfg.module -+@COND_emu_TRUE@am__append_5261 = emunet.module$(EXEEXT) \ - @COND_emu_TRUE@ legacycfg.module$(EXEEXT) - @COND_emu_FALSE@emunet_module_DEPENDENCIES = --@COND_emu_TRUE@am__append_5269 = --@COND_emu_TRUE@am__append_5270 = $(nodist_emunet_module_SOURCES) \ -+@COND_emu_TRUE@am__append_5262 = -+@COND_emu_TRUE@am__append_5263 = $(nodist_emunet_module_SOURCES) \ - @COND_emu_TRUE@ $(nodist_legacycfg_module_SOURCES) --@COND_emu_TRUE@am__append_5271 = $(nodist_emunet_module_SOURCES) \ -+@COND_emu_TRUE@am__append_5264 = $(nodist_emunet_module_SOURCES) \ - @COND_emu_TRUE@ emunet.marker \ - @COND_emu_TRUE@ $(nodist_legacycfg_module_SOURCES) \ - @COND_emu_TRUE@ legacycfg.marker --@COND_emu_TRUE@am__append_5272 = emunet.mod legacycfg.mod --@COND_emu_TRUE@am__append_5273 = emunet.marker legacycfg.marker -+@COND_emu_TRUE@am__append_5265 = emunet.mod legacycfg.mod -+@COND_emu_TRUE@am__append_5266 = emunet.marker legacycfg.marker - @COND_emu_FALSE@@COND_i386_efi_FALSE@@COND_i386_pc_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_FALSE@legacycfg_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_5274 = legacycfg.module --@COND_i386_pc_TRUE@am__append_5275 = legacycfg.module$(EXEEXT) --@COND_i386_pc_TRUE@am__append_5276 = --@COND_i386_pc_TRUE@am__append_5277 = $(nodist_legacycfg_module_SOURCES) --@COND_i386_pc_TRUE@am__append_5278 = \ -+@COND_i386_pc_TRUE@am__append_5267 = legacycfg.module -+@COND_i386_pc_TRUE@am__append_5268 = legacycfg.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__append_5269 = -+@COND_i386_pc_TRUE@am__append_5270 = $(nodist_legacycfg_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_5271 = \ - @COND_i386_pc_TRUE@ $(nodist_legacycfg_module_SOURCES) \ - @COND_i386_pc_TRUE@ legacycfg.marker --@COND_i386_pc_TRUE@am__append_5279 = legacycfg.mod --@COND_i386_pc_TRUE@am__append_5280 = legacycfg.marker --@COND_i386_efi_TRUE@am__append_5281 = legacycfg.module --@COND_i386_efi_TRUE@am__append_5282 = legacycfg.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_5283 = --@COND_i386_efi_TRUE@am__append_5284 = $(nodist_legacycfg_module_SOURCES) --@COND_i386_efi_TRUE@am__append_5285 = \ -+@COND_i386_pc_TRUE@am__append_5272 = legacycfg.mod -+@COND_i386_pc_TRUE@am__append_5273 = legacycfg.marker -+@COND_i386_efi_TRUE@am__append_5274 = legacycfg.module -+@COND_i386_efi_TRUE@am__append_5275 = legacycfg.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_5276 = -+@COND_i386_efi_TRUE@am__append_5277 = $(nodist_legacycfg_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_5278 = \ - @COND_i386_efi_TRUE@ $(nodist_legacycfg_module_SOURCES) \ - @COND_i386_efi_TRUE@ legacycfg.marker --@COND_i386_efi_TRUE@am__append_5286 = legacycfg.mod --@COND_i386_efi_TRUE@am__append_5287 = legacycfg.marker --@COND_x86_64_efi_TRUE@am__append_5288 = legacycfg.module --@COND_x86_64_efi_TRUE@am__append_5289 = legacycfg.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_5290 = --@COND_x86_64_efi_TRUE@am__append_5291 = $(nodist_legacycfg_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_5292 = \ -+@COND_i386_efi_TRUE@am__append_5279 = legacycfg.mod -+@COND_i386_efi_TRUE@am__append_5280 = legacycfg.marker -+@COND_x86_64_efi_TRUE@am__append_5281 = legacycfg.module -+@COND_x86_64_efi_TRUE@am__append_5282 = legacycfg.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_5283 = -+@COND_x86_64_efi_TRUE@am__append_5284 = $(nodist_legacycfg_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_5285 = \ - @COND_x86_64_efi_TRUE@ $(nodist_legacycfg_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ legacycfg.marker --@COND_x86_64_efi_TRUE@am__append_5293 = legacycfg.mod --@COND_x86_64_efi_TRUE@am__append_5294 = legacycfg.marker --@COND_i386_xen_TRUE@am__append_5295 = legacycfg.module --@COND_i386_xen_TRUE@am__append_5296 = legacycfg.module$(EXEEXT) --@COND_i386_xen_TRUE@am__append_5297 = --@COND_i386_xen_TRUE@am__append_5298 = $(nodist_legacycfg_module_SOURCES) --@COND_i386_xen_TRUE@am__append_5299 = \ -+@COND_x86_64_efi_TRUE@am__append_5286 = legacycfg.mod -+@COND_x86_64_efi_TRUE@am__append_5287 = legacycfg.marker -+@COND_i386_xen_TRUE@am__append_5288 = legacycfg.module -+@COND_i386_xen_TRUE@am__append_5289 = legacycfg.module$(EXEEXT) -+@COND_i386_xen_TRUE@am__append_5290 = -+@COND_i386_xen_TRUE@am__append_5291 = $(nodist_legacycfg_module_SOURCES) -+@COND_i386_xen_TRUE@am__append_5292 = \ - @COND_i386_xen_TRUE@ $(nodist_legacycfg_module_SOURCES) \ - @COND_i386_xen_TRUE@ legacycfg.marker --@COND_i386_xen_TRUE@am__append_5300 = legacycfg.mod --@COND_i386_xen_TRUE@am__append_5301 = legacycfg.marker --@COND_x86_64_xen_TRUE@am__append_5302 = legacycfg.module --@COND_x86_64_xen_TRUE@am__append_5303 = legacycfg.module$(EXEEXT) --@COND_x86_64_xen_TRUE@am__append_5304 = --@COND_x86_64_xen_TRUE@am__append_5305 = $(nodist_legacycfg_module_SOURCES) --@COND_x86_64_xen_TRUE@am__append_5306 = \ -+@COND_i386_xen_TRUE@am__append_5293 = legacycfg.mod -+@COND_i386_xen_TRUE@am__append_5294 = legacycfg.marker -+@COND_x86_64_xen_TRUE@am__append_5295 = legacycfg.module -+@COND_x86_64_xen_TRUE@am__append_5296 = legacycfg.module$(EXEEXT) -+@COND_x86_64_xen_TRUE@am__append_5297 = -+@COND_x86_64_xen_TRUE@am__append_5298 = $(nodist_legacycfg_module_SOURCES) -+@COND_x86_64_xen_TRUE@am__append_5299 = \ - @COND_x86_64_xen_TRUE@ $(nodist_legacycfg_module_SOURCES) \ - @COND_x86_64_xen_TRUE@ legacycfg.marker --@COND_x86_64_xen_TRUE@am__append_5307 = legacycfg.mod --@COND_x86_64_xen_TRUE@am__append_5308 = legacycfg.marker --@COND_i386_xen_pvh_TRUE@am__append_5309 = legacycfg.module --@COND_i386_xen_pvh_TRUE@am__append_5310 = legacycfg.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__append_5311 = --@COND_i386_xen_pvh_TRUE@am__append_5312 = $(nodist_legacycfg_module_SOURCES) --@COND_i386_xen_pvh_TRUE@am__append_5313 = \ -+@COND_x86_64_xen_TRUE@am__append_5300 = legacycfg.mod -+@COND_x86_64_xen_TRUE@am__append_5301 = legacycfg.marker -+@COND_i386_xen_pvh_TRUE@am__append_5302 = legacycfg.module -+@COND_i386_xen_pvh_TRUE@am__append_5303 = legacycfg.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__append_5304 = -+@COND_i386_xen_pvh_TRUE@am__append_5305 = $(nodist_legacycfg_module_SOURCES) -+@COND_i386_xen_pvh_TRUE@am__append_5306 = \ - @COND_i386_xen_pvh_TRUE@ $(nodist_legacycfg_module_SOURCES) \ - @COND_i386_xen_pvh_TRUE@ legacycfg.marker --@COND_i386_xen_pvh_TRUE@am__append_5314 = legacycfg.mod --@COND_i386_xen_pvh_TRUE@am__append_5315 = legacycfg.marker --@COND_i386_pc_TRUE@am__append_5316 = backtrace.module --@COND_i386_pc_TRUE@am__append_5317 = backtrace.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__append_5307 = legacycfg.mod -+@COND_i386_xen_pvh_TRUE@am__append_5308 = legacycfg.marker -+@COND_i386_pc_TRUE@am__append_5309 = backtrace.module -+@COND_i386_pc_TRUE@am__append_5310 = backtrace.module$(EXEEXT) - @COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_FALSE@backtrace_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_5318 = --@COND_i386_pc_TRUE@am__append_5319 = $(nodist_backtrace_module_SOURCES) --@COND_i386_pc_TRUE@am__append_5320 = \ -+@COND_i386_pc_TRUE@am__append_5311 = -+@COND_i386_pc_TRUE@am__append_5312 = $(nodist_backtrace_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_5313 = \ - @COND_i386_pc_TRUE@ $(nodist_backtrace_module_SOURCES) \ - @COND_i386_pc_TRUE@ backtrace.marker --@COND_i386_pc_TRUE@am__append_5321 = backtrace.mod --@COND_i386_pc_TRUE@am__append_5322 = backtrace.marker --@COND_i386_efi_TRUE@am__append_5323 = backtrace.module --@COND_i386_efi_TRUE@am__append_5324 = backtrace.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_5325 = --@COND_i386_efi_TRUE@am__append_5326 = $(nodist_backtrace_module_SOURCES) --@COND_i386_efi_TRUE@am__append_5327 = \ -+@COND_i386_pc_TRUE@am__append_5314 = backtrace.mod -+@COND_i386_pc_TRUE@am__append_5315 = backtrace.marker -+@COND_i386_efi_TRUE@am__append_5316 = backtrace.module -+@COND_i386_efi_TRUE@am__append_5317 = backtrace.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_5318 = -+@COND_i386_efi_TRUE@am__append_5319 = $(nodist_backtrace_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_5320 = \ - @COND_i386_efi_TRUE@ $(nodist_backtrace_module_SOURCES) \ - @COND_i386_efi_TRUE@ backtrace.marker --@COND_i386_efi_TRUE@am__append_5328 = backtrace.mod --@COND_i386_efi_TRUE@am__append_5329 = backtrace.marker --@COND_i386_qemu_TRUE@am__append_5330 = backtrace.module --@COND_i386_qemu_TRUE@am__append_5331 = backtrace.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_5332 = --@COND_i386_qemu_TRUE@am__append_5333 = $(nodist_backtrace_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_5334 = \ -+@COND_i386_efi_TRUE@am__append_5321 = backtrace.mod -+@COND_i386_efi_TRUE@am__append_5322 = backtrace.marker -+@COND_i386_qemu_TRUE@am__append_5323 = backtrace.module -+@COND_i386_qemu_TRUE@am__append_5324 = backtrace.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_5325 = -+@COND_i386_qemu_TRUE@am__append_5326 = $(nodist_backtrace_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_5327 = \ - @COND_i386_qemu_TRUE@ $(nodist_backtrace_module_SOURCES) \ - @COND_i386_qemu_TRUE@ backtrace.marker --@COND_i386_qemu_TRUE@am__append_5335 = backtrace.mod --@COND_i386_qemu_TRUE@am__append_5336 = backtrace.marker --@COND_i386_coreboot_TRUE@am__append_5337 = backtrace.module --@COND_i386_coreboot_TRUE@am__append_5338 = backtrace.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_5339 = --@COND_i386_coreboot_TRUE@am__append_5340 = $(nodist_backtrace_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_5341 = \ -+@COND_i386_qemu_TRUE@am__append_5328 = backtrace.mod -+@COND_i386_qemu_TRUE@am__append_5329 = backtrace.marker -+@COND_i386_coreboot_TRUE@am__append_5330 = backtrace.module -+@COND_i386_coreboot_TRUE@am__append_5331 = backtrace.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_5332 = -+@COND_i386_coreboot_TRUE@am__append_5333 = $(nodist_backtrace_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_5334 = \ - @COND_i386_coreboot_TRUE@ $(nodist_backtrace_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ backtrace.marker --@COND_i386_coreboot_TRUE@am__append_5342 = backtrace.mod --@COND_i386_coreboot_TRUE@am__append_5343 = backtrace.marker --@COND_i386_multiboot_TRUE@am__append_5344 = backtrace.module --@COND_i386_multiboot_TRUE@am__append_5345 = backtrace.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_5346 = --@COND_i386_multiboot_TRUE@am__append_5347 = $(nodist_backtrace_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_5348 = \ -+@COND_i386_coreboot_TRUE@am__append_5335 = backtrace.mod -+@COND_i386_coreboot_TRUE@am__append_5336 = backtrace.marker -+@COND_i386_multiboot_TRUE@am__append_5337 = backtrace.module -+@COND_i386_multiboot_TRUE@am__append_5338 = backtrace.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_5339 = -+@COND_i386_multiboot_TRUE@am__append_5340 = $(nodist_backtrace_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_5341 = \ - @COND_i386_multiboot_TRUE@ $(nodist_backtrace_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ backtrace.marker --@COND_i386_multiboot_TRUE@am__append_5349 = backtrace.mod --@COND_i386_multiboot_TRUE@am__append_5350 = backtrace.marker --@COND_i386_ieee1275_TRUE@am__append_5351 = backtrace.module --@COND_i386_ieee1275_TRUE@am__append_5352 = backtrace.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_5353 = --@COND_i386_ieee1275_TRUE@am__append_5354 = $(nodist_backtrace_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_5355 = \ -+@COND_i386_multiboot_TRUE@am__append_5342 = backtrace.mod -+@COND_i386_multiboot_TRUE@am__append_5343 = backtrace.marker -+@COND_i386_ieee1275_TRUE@am__append_5344 = backtrace.module -+@COND_i386_ieee1275_TRUE@am__append_5345 = backtrace.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_5346 = -+@COND_i386_ieee1275_TRUE@am__append_5347 = $(nodist_backtrace_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_5348 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_backtrace_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ backtrace.marker --@COND_i386_ieee1275_TRUE@am__append_5356 = backtrace.mod --@COND_i386_ieee1275_TRUE@am__append_5357 = backtrace.marker --@COND_x86_64_efi_TRUE@am__append_5358 = backtrace.module --@COND_x86_64_efi_TRUE@am__append_5359 = backtrace.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_5360 = --@COND_x86_64_efi_TRUE@am__append_5361 = $(nodist_backtrace_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_5362 = \ -+@COND_i386_ieee1275_TRUE@am__append_5349 = backtrace.mod -+@COND_i386_ieee1275_TRUE@am__append_5350 = backtrace.marker -+@COND_x86_64_efi_TRUE@am__append_5351 = backtrace.module -+@COND_x86_64_efi_TRUE@am__append_5352 = backtrace.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_5353 = -+@COND_x86_64_efi_TRUE@am__append_5354 = $(nodist_backtrace_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_5355 = \ - @COND_x86_64_efi_TRUE@ $(nodist_backtrace_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ backtrace.marker --@COND_x86_64_efi_TRUE@am__append_5363 = backtrace.mod --@COND_x86_64_efi_TRUE@am__append_5364 = backtrace.marker --@COND_i386_xen_TRUE@am__append_5365 = backtrace.module --@COND_i386_xen_TRUE@am__append_5366 = backtrace.module$(EXEEXT) --@COND_i386_xen_TRUE@am__append_5367 = --@COND_i386_xen_TRUE@am__append_5368 = $(nodist_backtrace_module_SOURCES) --@COND_i386_xen_TRUE@am__append_5369 = \ -+@COND_x86_64_efi_TRUE@am__append_5356 = backtrace.mod -+@COND_x86_64_efi_TRUE@am__append_5357 = backtrace.marker -+@COND_i386_xen_TRUE@am__append_5358 = backtrace.module -+@COND_i386_xen_TRUE@am__append_5359 = backtrace.module$(EXEEXT) -+@COND_i386_xen_TRUE@am__append_5360 = -+@COND_i386_xen_TRUE@am__append_5361 = $(nodist_backtrace_module_SOURCES) -+@COND_i386_xen_TRUE@am__append_5362 = \ - @COND_i386_xen_TRUE@ $(nodist_backtrace_module_SOURCES) \ - @COND_i386_xen_TRUE@ backtrace.marker --@COND_i386_xen_TRUE@am__append_5370 = backtrace.mod --@COND_i386_xen_TRUE@am__append_5371 = backtrace.marker --@COND_x86_64_xen_TRUE@am__append_5372 = backtrace.module --@COND_x86_64_xen_TRUE@am__append_5373 = backtrace.module$(EXEEXT) --@COND_x86_64_xen_TRUE@am__append_5374 = --@COND_x86_64_xen_TRUE@am__append_5375 = $(nodist_backtrace_module_SOURCES) --@COND_x86_64_xen_TRUE@am__append_5376 = \ -+@COND_i386_xen_TRUE@am__append_5363 = backtrace.mod -+@COND_i386_xen_TRUE@am__append_5364 = backtrace.marker -+@COND_x86_64_xen_TRUE@am__append_5365 = backtrace.module -+@COND_x86_64_xen_TRUE@am__append_5366 = backtrace.module$(EXEEXT) -+@COND_x86_64_xen_TRUE@am__append_5367 = -+@COND_x86_64_xen_TRUE@am__append_5368 = $(nodist_backtrace_module_SOURCES) -+@COND_x86_64_xen_TRUE@am__append_5369 = \ - @COND_x86_64_xen_TRUE@ $(nodist_backtrace_module_SOURCES) \ - @COND_x86_64_xen_TRUE@ backtrace.marker --@COND_x86_64_xen_TRUE@am__append_5377 = backtrace.mod --@COND_x86_64_xen_TRUE@am__append_5378 = backtrace.marker --@COND_i386_xen_pvh_TRUE@am__append_5379 = backtrace.module --@COND_i386_xen_pvh_TRUE@am__append_5380 = backtrace.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__append_5381 = --@COND_i386_xen_pvh_TRUE@am__append_5382 = $(nodist_backtrace_module_SOURCES) --@COND_i386_xen_pvh_TRUE@am__append_5383 = \ -+@COND_x86_64_xen_TRUE@am__append_5370 = backtrace.mod -+@COND_x86_64_xen_TRUE@am__append_5371 = backtrace.marker -+@COND_i386_xen_pvh_TRUE@am__append_5372 = backtrace.module -+@COND_i386_xen_pvh_TRUE@am__append_5373 = backtrace.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__append_5374 = -+@COND_i386_xen_pvh_TRUE@am__append_5375 = $(nodist_backtrace_module_SOURCES) -+@COND_i386_xen_pvh_TRUE@am__append_5376 = \ - @COND_i386_xen_pvh_TRUE@ $(nodist_backtrace_module_SOURCES) \ - @COND_i386_xen_pvh_TRUE@ backtrace.marker --@COND_i386_xen_pvh_TRUE@am__append_5384 = backtrace.mod --@COND_i386_xen_pvh_TRUE@am__append_5385 = backtrace.marker --@COND_i386_pc_TRUE@am__append_5386 = lsapm.module keylayouts.module --@COND_i386_pc_TRUE@am__append_5387 = lsapm.module$(EXEEXT) \ -+@COND_i386_xen_pvh_TRUE@am__append_5377 = backtrace.mod -+@COND_i386_xen_pvh_TRUE@am__append_5378 = backtrace.marker -+@COND_i386_pc_TRUE@am__append_5379 = lsapm.module keylayouts.module -+@COND_i386_pc_TRUE@am__append_5380 = lsapm.module$(EXEEXT) \ - @COND_i386_pc_TRUE@ keylayouts.module$(EXEEXT) - @COND_i386_pc_FALSE@lsapm_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_5388 = --@COND_i386_pc_TRUE@am__append_5389 = $(nodist_lsapm_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_5381 = -+@COND_i386_pc_TRUE@am__append_5382 = $(nodist_lsapm_module_SOURCES) \ - @COND_i386_pc_TRUE@ $(nodist_keylayouts_module_SOURCES) --@COND_i386_pc_TRUE@am__append_5390 = $(nodist_lsapm_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_5383 = $(nodist_lsapm_module_SOURCES) \ - @COND_i386_pc_TRUE@ lsapm.marker \ - @COND_i386_pc_TRUE@ $(nodist_keylayouts_module_SOURCES) \ - @COND_i386_pc_TRUE@ keylayouts.marker --@COND_i386_pc_TRUE@am__append_5391 = lsapm.mod keylayouts.mod --@COND_i386_pc_TRUE@am__append_5392 = lsapm.marker keylayouts.marker -+@COND_i386_pc_TRUE@am__append_5384 = lsapm.mod keylayouts.mod -+@COND_i386_pc_TRUE@am__append_5385 = lsapm.marker keylayouts.marker - @COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_x86_64_efi_FALSE@keylayouts_module_DEPENDENCIES = --@COND_i386_efi_TRUE@am__append_5393 = keylayouts.module --@COND_i386_efi_TRUE@am__append_5394 = keylayouts.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_5395 = --@COND_i386_efi_TRUE@am__append_5396 = $(nodist_keylayouts_module_SOURCES) --@COND_i386_efi_TRUE@am__append_5397 = \ -+@COND_i386_efi_TRUE@am__append_5386 = keylayouts.module -+@COND_i386_efi_TRUE@am__append_5387 = keylayouts.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_5388 = -+@COND_i386_efi_TRUE@am__append_5389 = $(nodist_keylayouts_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_5390 = \ - @COND_i386_efi_TRUE@ $(nodist_keylayouts_module_SOURCES) \ - @COND_i386_efi_TRUE@ keylayouts.marker --@COND_i386_efi_TRUE@am__append_5398 = keylayouts.mod --@COND_i386_efi_TRUE@am__append_5399 = keylayouts.marker --@COND_i386_qemu_TRUE@am__append_5400 = keylayouts.module --@COND_i386_qemu_TRUE@am__append_5401 = keylayouts.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_5402 = --@COND_i386_qemu_TRUE@am__append_5403 = $(nodist_keylayouts_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_5404 = \ -+@COND_i386_efi_TRUE@am__append_5391 = keylayouts.mod -+@COND_i386_efi_TRUE@am__append_5392 = keylayouts.marker -+@COND_i386_qemu_TRUE@am__append_5393 = keylayouts.module -+@COND_i386_qemu_TRUE@am__append_5394 = keylayouts.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_5395 = -+@COND_i386_qemu_TRUE@am__append_5396 = $(nodist_keylayouts_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_5397 = \ - @COND_i386_qemu_TRUE@ $(nodist_keylayouts_module_SOURCES) \ - @COND_i386_qemu_TRUE@ keylayouts.marker --@COND_i386_qemu_TRUE@am__append_5405 = keylayouts.mod --@COND_i386_qemu_TRUE@am__append_5406 = keylayouts.marker --@COND_i386_coreboot_TRUE@am__append_5407 = keylayouts.module --@COND_i386_coreboot_TRUE@am__append_5408 = keylayouts.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_5409 = --@COND_i386_coreboot_TRUE@am__append_5410 = $(nodist_keylayouts_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_5411 = \ -+@COND_i386_qemu_TRUE@am__append_5398 = keylayouts.mod -+@COND_i386_qemu_TRUE@am__append_5399 = keylayouts.marker -+@COND_i386_coreboot_TRUE@am__append_5400 = keylayouts.module -+@COND_i386_coreboot_TRUE@am__append_5401 = keylayouts.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_5402 = -+@COND_i386_coreboot_TRUE@am__append_5403 = $(nodist_keylayouts_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_5404 = \ - @COND_i386_coreboot_TRUE@ $(nodist_keylayouts_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ keylayouts.marker --@COND_i386_coreboot_TRUE@am__append_5412 = keylayouts.mod --@COND_i386_coreboot_TRUE@am__append_5413 = keylayouts.marker --@COND_i386_multiboot_TRUE@am__append_5414 = keylayouts.module --@COND_i386_multiboot_TRUE@am__append_5415 = keylayouts.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_5416 = --@COND_i386_multiboot_TRUE@am__append_5417 = $(nodist_keylayouts_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_5418 = \ -+@COND_i386_coreboot_TRUE@am__append_5405 = keylayouts.mod -+@COND_i386_coreboot_TRUE@am__append_5406 = keylayouts.marker -+@COND_i386_multiboot_TRUE@am__append_5407 = keylayouts.module -+@COND_i386_multiboot_TRUE@am__append_5408 = keylayouts.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_5409 = -+@COND_i386_multiboot_TRUE@am__append_5410 = $(nodist_keylayouts_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_5411 = \ - @COND_i386_multiboot_TRUE@ $(nodist_keylayouts_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ keylayouts.marker --@COND_i386_multiboot_TRUE@am__append_5419 = keylayouts.mod --@COND_i386_multiboot_TRUE@am__append_5420 = keylayouts.marker --@COND_i386_ieee1275_TRUE@am__append_5421 = keylayouts.module --@COND_i386_ieee1275_TRUE@am__append_5422 = keylayouts.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_5423 = --@COND_i386_ieee1275_TRUE@am__append_5424 = $(nodist_keylayouts_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_5425 = \ -+@COND_i386_multiboot_TRUE@am__append_5412 = keylayouts.mod -+@COND_i386_multiboot_TRUE@am__append_5413 = keylayouts.marker -+@COND_i386_ieee1275_TRUE@am__append_5414 = keylayouts.module -+@COND_i386_ieee1275_TRUE@am__append_5415 = keylayouts.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_5416 = -+@COND_i386_ieee1275_TRUE@am__append_5417 = $(nodist_keylayouts_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_5418 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_keylayouts_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ keylayouts.marker --@COND_i386_ieee1275_TRUE@am__append_5426 = keylayouts.mod --@COND_i386_ieee1275_TRUE@am__append_5427 = keylayouts.marker --@COND_x86_64_efi_TRUE@am__append_5428 = keylayouts.module --@COND_x86_64_efi_TRUE@am__append_5429 = keylayouts.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_5430 = --@COND_x86_64_efi_TRUE@am__append_5431 = $(nodist_keylayouts_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_5432 = \ -+@COND_i386_ieee1275_TRUE@am__append_5419 = keylayouts.mod -+@COND_i386_ieee1275_TRUE@am__append_5420 = keylayouts.marker -+@COND_x86_64_efi_TRUE@am__append_5421 = keylayouts.module -+@COND_x86_64_efi_TRUE@am__append_5422 = keylayouts.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_5423 = -+@COND_x86_64_efi_TRUE@am__append_5424 = $(nodist_keylayouts_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_5425 = \ - @COND_x86_64_efi_TRUE@ $(nodist_keylayouts_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ keylayouts.marker --@COND_x86_64_efi_TRUE@am__append_5433 = keylayouts.mod --@COND_x86_64_efi_TRUE@am__append_5434 = keylayouts.marker --@COND_ENABLE_CACHE_STATS_TRUE@am__append_5435 = cacheinfo.module --@COND_ENABLE_CACHE_STATS_TRUE@am__append_5436 = cacheinfo.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_5426 = keylayouts.mod -+@COND_x86_64_efi_TRUE@am__append_5427 = keylayouts.marker -+@COND_ENABLE_CACHE_STATS_TRUE@am__append_5428 = cacheinfo.module -+@COND_ENABLE_CACHE_STATS_TRUE@am__append_5429 = cacheinfo.module$(EXEEXT) - @COND_ENABLE_CACHE_STATS_FALSE@cacheinfo_module_DEPENDENCIES = --@COND_ENABLE_CACHE_STATS_TRUE@am__append_5437 = --@COND_ENABLE_CACHE_STATS_TRUE@am__append_5438 = $(nodist_cacheinfo_module_SOURCES) --@COND_ENABLE_CACHE_STATS_TRUE@am__append_5439 = $(nodist_cacheinfo_module_SOURCES) \ -+@COND_ENABLE_CACHE_STATS_TRUE@am__append_5430 = -+@COND_ENABLE_CACHE_STATS_TRUE@am__append_5431 = $(nodist_cacheinfo_module_SOURCES) -+@COND_ENABLE_CACHE_STATS_TRUE@am__append_5432 = $(nodist_cacheinfo_module_SOURCES) \ - @COND_ENABLE_CACHE_STATS_TRUE@ cacheinfo.marker --@COND_ENABLE_CACHE_STATS_TRUE@am__append_5440 = cacheinfo.mod --@COND_ENABLE_CACHE_STATS_TRUE@am__append_5441 = cacheinfo.marker --@COND_ENABLE_BOOT_TIME_STATS_TRUE@am__append_5442 = boottime.module --@COND_ENABLE_BOOT_TIME_STATS_TRUE@am__append_5443 = boottime.module$(EXEEXT) -+@COND_ENABLE_CACHE_STATS_TRUE@am__append_5433 = cacheinfo.mod -+@COND_ENABLE_CACHE_STATS_TRUE@am__append_5434 = cacheinfo.marker -+@COND_ENABLE_BOOT_TIME_STATS_TRUE@am__append_5435 = boottime.module -+@COND_ENABLE_BOOT_TIME_STATS_TRUE@am__append_5436 = boottime.module$(EXEEXT) - @COND_ENABLE_BOOT_TIME_STATS_FALSE@boottime_module_DEPENDENCIES = --@COND_ENABLE_BOOT_TIME_STATS_TRUE@am__append_5444 = --@COND_ENABLE_BOOT_TIME_STATS_TRUE@am__append_5445 = $(nodist_boottime_module_SOURCES) --@COND_ENABLE_BOOT_TIME_STATS_TRUE@am__append_5446 = $(nodist_boottime_module_SOURCES) \ -+@COND_ENABLE_BOOT_TIME_STATS_TRUE@am__append_5437 = -+@COND_ENABLE_BOOT_TIME_STATS_TRUE@am__append_5438 = $(nodist_boottime_module_SOURCES) -+@COND_ENABLE_BOOT_TIME_STATS_TRUE@am__append_5439 = $(nodist_boottime_module_SOURCES) \ - @COND_ENABLE_BOOT_TIME_STATS_TRUE@ boottime.marker --@COND_ENABLE_BOOT_TIME_STATS_TRUE@am__append_5447 = boottime.mod --@COND_ENABLE_BOOT_TIME_STATS_TRUE@am__append_5448 = boottime.marker --@COND_i386_pc_TRUE@am__append_5449 = gdb.module --@COND_i386_pc_TRUE@am__append_5450 = gdb.module$(EXEEXT) -+@COND_ENABLE_BOOT_TIME_STATS_TRUE@am__append_5440 = boottime.mod -+@COND_ENABLE_BOOT_TIME_STATS_TRUE@am__append_5441 = boottime.marker -+@COND_i386_pc_TRUE@am__append_5442 = gdb.module -+@COND_i386_pc_TRUE@am__append_5443 = gdb.module$(EXEEXT) - @COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@gdb_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_5451 = --@COND_i386_pc_TRUE@am__append_5452 = $(nodist_gdb_module_SOURCES) --@COND_i386_pc_TRUE@am__append_5453 = $(nodist_gdb_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_5444 = -+@COND_i386_pc_TRUE@am__append_5445 = $(nodist_gdb_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_5446 = $(nodist_gdb_module_SOURCES) \ - @COND_i386_pc_TRUE@ gdb.marker --@COND_i386_pc_TRUE@am__append_5454 = gdb.mod --@COND_i386_pc_TRUE@am__append_5455 = gdb.marker --@COND_i386_efi_TRUE@am__append_5456 = gdb.module --@COND_i386_efi_TRUE@am__append_5457 = gdb.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_5458 = --@COND_i386_efi_TRUE@am__append_5459 = $(nodist_gdb_module_SOURCES) --@COND_i386_efi_TRUE@am__append_5460 = $(nodist_gdb_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_5447 = gdb.mod -+@COND_i386_pc_TRUE@am__append_5448 = gdb.marker -+@COND_i386_efi_TRUE@am__append_5449 = gdb.module -+@COND_i386_efi_TRUE@am__append_5450 = gdb.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_5451 = -+@COND_i386_efi_TRUE@am__append_5452 = $(nodist_gdb_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_5453 = $(nodist_gdb_module_SOURCES) \ - @COND_i386_efi_TRUE@ gdb.marker --@COND_i386_efi_TRUE@am__append_5461 = gdb.mod --@COND_i386_efi_TRUE@am__append_5462 = gdb.marker --@COND_i386_qemu_TRUE@am__append_5463 = gdb.module --@COND_i386_qemu_TRUE@am__append_5464 = gdb.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_5465 = --@COND_i386_qemu_TRUE@am__append_5466 = $(nodist_gdb_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_5467 = $(nodist_gdb_module_SOURCES) \ -+@COND_i386_efi_TRUE@am__append_5454 = gdb.mod -+@COND_i386_efi_TRUE@am__append_5455 = gdb.marker -+@COND_i386_qemu_TRUE@am__append_5456 = gdb.module -+@COND_i386_qemu_TRUE@am__append_5457 = gdb.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_5458 = -+@COND_i386_qemu_TRUE@am__append_5459 = $(nodist_gdb_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_5460 = $(nodist_gdb_module_SOURCES) \ - @COND_i386_qemu_TRUE@ gdb.marker --@COND_i386_qemu_TRUE@am__append_5468 = gdb.mod --@COND_i386_qemu_TRUE@am__append_5469 = gdb.marker --@COND_i386_coreboot_TRUE@am__append_5470 = gdb.module --@COND_i386_coreboot_TRUE@am__append_5471 = gdb.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_5472 = --@COND_i386_coreboot_TRUE@am__append_5473 = $(nodist_gdb_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_5474 = \ -+@COND_i386_qemu_TRUE@am__append_5461 = gdb.mod -+@COND_i386_qemu_TRUE@am__append_5462 = gdb.marker -+@COND_i386_coreboot_TRUE@am__append_5463 = gdb.module -+@COND_i386_coreboot_TRUE@am__append_5464 = gdb.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_5465 = -+@COND_i386_coreboot_TRUE@am__append_5466 = $(nodist_gdb_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_5467 = \ - @COND_i386_coreboot_TRUE@ $(nodist_gdb_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ gdb.marker --@COND_i386_coreboot_TRUE@am__append_5475 = gdb.mod --@COND_i386_coreboot_TRUE@am__append_5476 = gdb.marker --@COND_i386_multiboot_TRUE@am__append_5477 = gdb.module --@COND_i386_multiboot_TRUE@am__append_5478 = gdb.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_5479 = --@COND_i386_multiboot_TRUE@am__append_5480 = $(nodist_gdb_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_5481 = \ -+@COND_i386_coreboot_TRUE@am__append_5468 = gdb.mod -+@COND_i386_coreboot_TRUE@am__append_5469 = gdb.marker -+@COND_i386_multiboot_TRUE@am__append_5470 = gdb.module -+@COND_i386_multiboot_TRUE@am__append_5471 = gdb.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_5472 = -+@COND_i386_multiboot_TRUE@am__append_5473 = $(nodist_gdb_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_5474 = \ - @COND_i386_multiboot_TRUE@ $(nodist_gdb_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ gdb.marker --@COND_i386_multiboot_TRUE@am__append_5482 = gdb.mod --@COND_i386_multiboot_TRUE@am__append_5483 = gdb.marker --@COND_i386_ieee1275_TRUE@am__append_5484 = gdb.module --@COND_i386_ieee1275_TRUE@am__append_5485 = gdb.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_5486 = --@COND_i386_ieee1275_TRUE@am__append_5487 = $(nodist_gdb_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_5488 = \ -+@COND_i386_multiboot_TRUE@am__append_5475 = gdb.mod -+@COND_i386_multiboot_TRUE@am__append_5476 = gdb.marker -+@COND_i386_ieee1275_TRUE@am__append_5477 = gdb.module -+@COND_i386_ieee1275_TRUE@am__append_5478 = gdb.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_5479 = -+@COND_i386_ieee1275_TRUE@am__append_5480 = $(nodist_gdb_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_5481 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_gdb_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ gdb.marker --@COND_i386_ieee1275_TRUE@am__append_5489 = gdb.mod --@COND_i386_ieee1275_TRUE@am__append_5490 = gdb.marker --@COND_x86_64_efi_TRUE@am__append_5491 = tpm.module --@COND_x86_64_efi_TRUE@am__append_5492 = tpm.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_5482 = gdb.mod -+@COND_i386_ieee1275_TRUE@am__append_5483 = gdb.marker -+@COND_x86_64_efi_TRUE@am__append_5484 = tpm.module -+@COND_x86_64_efi_TRUE@am__append_5485 = tpm.module$(EXEEXT) - @COND_x86_64_efi_FALSE@tpm_module_DEPENDENCIES = --@COND_x86_64_efi_TRUE@am__append_5493 = --@COND_x86_64_efi_TRUE@am__append_5494 = $(nodist_tpm_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_5495 = $(nodist_tpm_module_SOURCES) \ -+@COND_x86_64_efi_TRUE@am__append_5486 = -+@COND_x86_64_efi_TRUE@am__append_5487 = $(nodist_tpm_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_5488 = $(nodist_tpm_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ tpm.marker --@COND_x86_64_efi_TRUE@am__append_5496 = tpm.mod --@COND_x86_64_efi_TRUE@am__append_5497 = tpm.marker --@COND_i386_pc_TRUE@am__append_5498 = rdmsr.module --@COND_i386_pc_TRUE@am__append_5499 = rdmsr.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_5489 = tpm.mod -+@COND_x86_64_efi_TRUE@am__append_5490 = tpm.marker -+@COND_i386_pc_TRUE@am__append_5491 = rdmsr.module -+@COND_i386_pc_TRUE@am__append_5492 = rdmsr.module$(EXEEXT) - @COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_x86_64_efi_FALSE@rdmsr_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_5500 = --@COND_i386_pc_TRUE@am__append_5501 = $(nodist_rdmsr_module_SOURCES) --@COND_i386_pc_TRUE@am__append_5502 = $(nodist_rdmsr_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_5493 = -+@COND_i386_pc_TRUE@am__append_5494 = $(nodist_rdmsr_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_5495 = $(nodist_rdmsr_module_SOURCES) \ - @COND_i386_pc_TRUE@ rdmsr.marker --@COND_i386_pc_TRUE@am__append_5503 = rdmsr.mod --@COND_i386_pc_TRUE@am__append_5504 = rdmsr.marker --@COND_i386_efi_TRUE@am__append_5505 = rdmsr.module --@COND_i386_efi_TRUE@am__append_5506 = rdmsr.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_5507 = --@COND_i386_efi_TRUE@am__append_5508 = $(nodist_rdmsr_module_SOURCES) --@COND_i386_efi_TRUE@am__append_5509 = $(nodist_rdmsr_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_5496 = rdmsr.mod -+@COND_i386_pc_TRUE@am__append_5497 = rdmsr.marker -+@COND_i386_efi_TRUE@am__append_5498 = rdmsr.module -+@COND_i386_efi_TRUE@am__append_5499 = rdmsr.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_5500 = -+@COND_i386_efi_TRUE@am__append_5501 = $(nodist_rdmsr_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_5502 = $(nodist_rdmsr_module_SOURCES) \ - @COND_i386_efi_TRUE@ rdmsr.marker --@COND_i386_efi_TRUE@am__append_5510 = rdmsr.mod --@COND_i386_efi_TRUE@am__append_5511 = rdmsr.marker --@COND_i386_qemu_TRUE@am__append_5512 = rdmsr.module --@COND_i386_qemu_TRUE@am__append_5513 = rdmsr.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_5514 = --@COND_i386_qemu_TRUE@am__append_5515 = $(nodist_rdmsr_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_5516 = $(nodist_rdmsr_module_SOURCES) \ -+@COND_i386_efi_TRUE@am__append_5503 = rdmsr.mod -+@COND_i386_efi_TRUE@am__append_5504 = rdmsr.marker -+@COND_i386_qemu_TRUE@am__append_5505 = rdmsr.module -+@COND_i386_qemu_TRUE@am__append_5506 = rdmsr.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_5507 = -+@COND_i386_qemu_TRUE@am__append_5508 = $(nodist_rdmsr_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_5509 = $(nodist_rdmsr_module_SOURCES) \ - @COND_i386_qemu_TRUE@ rdmsr.marker --@COND_i386_qemu_TRUE@am__append_5517 = rdmsr.mod --@COND_i386_qemu_TRUE@am__append_5518 = rdmsr.marker --@COND_i386_coreboot_TRUE@am__append_5519 = rdmsr.module --@COND_i386_coreboot_TRUE@am__append_5520 = rdmsr.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_5521 = --@COND_i386_coreboot_TRUE@am__append_5522 = $(nodist_rdmsr_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_5523 = \ -+@COND_i386_qemu_TRUE@am__append_5510 = rdmsr.mod -+@COND_i386_qemu_TRUE@am__append_5511 = rdmsr.marker -+@COND_i386_coreboot_TRUE@am__append_5512 = rdmsr.module -+@COND_i386_coreboot_TRUE@am__append_5513 = rdmsr.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_5514 = -+@COND_i386_coreboot_TRUE@am__append_5515 = $(nodist_rdmsr_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_5516 = \ - @COND_i386_coreboot_TRUE@ $(nodist_rdmsr_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ rdmsr.marker --@COND_i386_coreboot_TRUE@am__append_5524 = rdmsr.mod --@COND_i386_coreboot_TRUE@am__append_5525 = rdmsr.marker --@COND_i386_multiboot_TRUE@am__append_5526 = rdmsr.module --@COND_i386_multiboot_TRUE@am__append_5527 = rdmsr.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_5528 = --@COND_i386_multiboot_TRUE@am__append_5529 = $(nodist_rdmsr_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_5530 = \ -+@COND_i386_coreboot_TRUE@am__append_5517 = rdmsr.mod -+@COND_i386_coreboot_TRUE@am__append_5518 = rdmsr.marker -+@COND_i386_multiboot_TRUE@am__append_5519 = rdmsr.module -+@COND_i386_multiboot_TRUE@am__append_5520 = rdmsr.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_5521 = -+@COND_i386_multiboot_TRUE@am__append_5522 = $(nodist_rdmsr_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_5523 = \ - @COND_i386_multiboot_TRUE@ $(nodist_rdmsr_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ rdmsr.marker --@COND_i386_multiboot_TRUE@am__append_5531 = rdmsr.mod --@COND_i386_multiboot_TRUE@am__append_5532 = rdmsr.marker --@COND_i386_ieee1275_TRUE@am__append_5533 = rdmsr.module --@COND_i386_ieee1275_TRUE@am__append_5534 = rdmsr.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_5535 = --@COND_i386_ieee1275_TRUE@am__append_5536 = $(nodist_rdmsr_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_5537 = \ -+@COND_i386_multiboot_TRUE@am__append_5524 = rdmsr.mod -+@COND_i386_multiboot_TRUE@am__append_5525 = rdmsr.marker -+@COND_i386_ieee1275_TRUE@am__append_5526 = rdmsr.module -+@COND_i386_ieee1275_TRUE@am__append_5527 = rdmsr.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_5528 = -+@COND_i386_ieee1275_TRUE@am__append_5529 = $(nodist_rdmsr_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_5530 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_rdmsr_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ rdmsr.marker --@COND_i386_ieee1275_TRUE@am__append_5538 = rdmsr.mod --@COND_i386_ieee1275_TRUE@am__append_5539 = rdmsr.marker --@COND_x86_64_efi_TRUE@am__append_5540 = rdmsr.module --@COND_x86_64_efi_TRUE@am__append_5541 = rdmsr.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_5542 = --@COND_x86_64_efi_TRUE@am__append_5543 = $(nodist_rdmsr_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_5544 = \ -+@COND_i386_ieee1275_TRUE@am__append_5531 = rdmsr.mod -+@COND_i386_ieee1275_TRUE@am__append_5532 = rdmsr.marker -+@COND_x86_64_efi_TRUE@am__append_5533 = rdmsr.module -+@COND_x86_64_efi_TRUE@am__append_5534 = rdmsr.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_5535 = -+@COND_x86_64_efi_TRUE@am__append_5536 = $(nodist_rdmsr_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_5537 = \ - @COND_x86_64_efi_TRUE@ $(nodist_rdmsr_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ rdmsr.marker --@COND_x86_64_efi_TRUE@am__append_5545 = rdmsr.mod --@COND_x86_64_efi_TRUE@am__append_5546 = rdmsr.marker --@COND_i386_pc_TRUE@am__append_5547 = wrmsr.module --@COND_i386_pc_TRUE@am__append_5548 = wrmsr.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_5538 = rdmsr.mod -+@COND_x86_64_efi_TRUE@am__append_5539 = rdmsr.marker -+@COND_i386_pc_TRUE@am__append_5540 = wrmsr.module -+@COND_i386_pc_TRUE@am__append_5541 = wrmsr.module$(EXEEXT) - @COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_x86_64_efi_FALSE@wrmsr_module_DEPENDENCIES = --@COND_i386_pc_TRUE@am__append_5549 = --@COND_i386_pc_TRUE@am__append_5550 = $(nodist_wrmsr_module_SOURCES) --@COND_i386_pc_TRUE@am__append_5551 = $(nodist_wrmsr_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_5542 = -+@COND_i386_pc_TRUE@am__append_5543 = $(nodist_wrmsr_module_SOURCES) -+@COND_i386_pc_TRUE@am__append_5544 = $(nodist_wrmsr_module_SOURCES) \ - @COND_i386_pc_TRUE@ wrmsr.marker --@COND_i386_pc_TRUE@am__append_5552 = wrmsr.mod --@COND_i386_pc_TRUE@am__append_5553 = wrmsr.marker --@COND_i386_efi_TRUE@am__append_5554 = wrmsr.module --@COND_i386_efi_TRUE@am__append_5555 = wrmsr.module$(EXEEXT) --@COND_i386_efi_TRUE@am__append_5556 = --@COND_i386_efi_TRUE@am__append_5557 = $(nodist_wrmsr_module_SOURCES) --@COND_i386_efi_TRUE@am__append_5558 = $(nodist_wrmsr_module_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_5545 = wrmsr.mod -+@COND_i386_pc_TRUE@am__append_5546 = wrmsr.marker -+@COND_i386_efi_TRUE@am__append_5547 = wrmsr.module -+@COND_i386_efi_TRUE@am__append_5548 = wrmsr.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__append_5549 = -+@COND_i386_efi_TRUE@am__append_5550 = $(nodist_wrmsr_module_SOURCES) -+@COND_i386_efi_TRUE@am__append_5551 = $(nodist_wrmsr_module_SOURCES) \ - @COND_i386_efi_TRUE@ wrmsr.marker --@COND_i386_efi_TRUE@am__append_5559 = wrmsr.mod --@COND_i386_efi_TRUE@am__append_5560 = wrmsr.marker --@COND_i386_qemu_TRUE@am__append_5561 = wrmsr.module --@COND_i386_qemu_TRUE@am__append_5562 = wrmsr.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__append_5563 = --@COND_i386_qemu_TRUE@am__append_5564 = $(nodist_wrmsr_module_SOURCES) --@COND_i386_qemu_TRUE@am__append_5565 = $(nodist_wrmsr_module_SOURCES) \ -+@COND_i386_efi_TRUE@am__append_5552 = wrmsr.mod -+@COND_i386_efi_TRUE@am__append_5553 = wrmsr.marker -+@COND_i386_qemu_TRUE@am__append_5554 = wrmsr.module -+@COND_i386_qemu_TRUE@am__append_5555 = wrmsr.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__append_5556 = -+@COND_i386_qemu_TRUE@am__append_5557 = $(nodist_wrmsr_module_SOURCES) -+@COND_i386_qemu_TRUE@am__append_5558 = $(nodist_wrmsr_module_SOURCES) \ - @COND_i386_qemu_TRUE@ wrmsr.marker --@COND_i386_qemu_TRUE@am__append_5566 = wrmsr.mod --@COND_i386_qemu_TRUE@am__append_5567 = wrmsr.marker --@COND_i386_coreboot_TRUE@am__append_5568 = wrmsr.module --@COND_i386_coreboot_TRUE@am__append_5569 = wrmsr.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__append_5570 = --@COND_i386_coreboot_TRUE@am__append_5571 = $(nodist_wrmsr_module_SOURCES) --@COND_i386_coreboot_TRUE@am__append_5572 = \ -+@COND_i386_qemu_TRUE@am__append_5559 = wrmsr.mod -+@COND_i386_qemu_TRUE@am__append_5560 = wrmsr.marker -+@COND_i386_coreboot_TRUE@am__append_5561 = wrmsr.module -+@COND_i386_coreboot_TRUE@am__append_5562 = wrmsr.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__append_5563 = -+@COND_i386_coreboot_TRUE@am__append_5564 = $(nodist_wrmsr_module_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_5565 = \ - @COND_i386_coreboot_TRUE@ $(nodist_wrmsr_module_SOURCES) \ - @COND_i386_coreboot_TRUE@ wrmsr.marker --@COND_i386_coreboot_TRUE@am__append_5573 = wrmsr.mod --@COND_i386_coreboot_TRUE@am__append_5574 = wrmsr.marker --@COND_i386_multiboot_TRUE@am__append_5575 = wrmsr.module --@COND_i386_multiboot_TRUE@am__append_5576 = wrmsr.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__append_5577 = --@COND_i386_multiboot_TRUE@am__append_5578 = $(nodist_wrmsr_module_SOURCES) --@COND_i386_multiboot_TRUE@am__append_5579 = \ -+@COND_i386_coreboot_TRUE@am__append_5566 = wrmsr.mod -+@COND_i386_coreboot_TRUE@am__append_5567 = wrmsr.marker -+@COND_i386_multiboot_TRUE@am__append_5568 = wrmsr.module -+@COND_i386_multiboot_TRUE@am__append_5569 = wrmsr.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__append_5570 = -+@COND_i386_multiboot_TRUE@am__append_5571 = $(nodist_wrmsr_module_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_5572 = \ - @COND_i386_multiboot_TRUE@ $(nodist_wrmsr_module_SOURCES) \ - @COND_i386_multiboot_TRUE@ wrmsr.marker --@COND_i386_multiboot_TRUE@am__append_5580 = wrmsr.mod --@COND_i386_multiboot_TRUE@am__append_5581 = wrmsr.marker --@COND_i386_ieee1275_TRUE@am__append_5582 = wrmsr.module --@COND_i386_ieee1275_TRUE@am__append_5583 = wrmsr.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__append_5584 = --@COND_i386_ieee1275_TRUE@am__append_5585 = $(nodist_wrmsr_module_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_5586 = \ -+@COND_i386_multiboot_TRUE@am__append_5573 = wrmsr.mod -+@COND_i386_multiboot_TRUE@am__append_5574 = wrmsr.marker -+@COND_i386_ieee1275_TRUE@am__append_5575 = wrmsr.module -+@COND_i386_ieee1275_TRUE@am__append_5576 = wrmsr.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__append_5577 = -+@COND_i386_ieee1275_TRUE@am__append_5578 = $(nodist_wrmsr_module_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_5579 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_wrmsr_module_SOURCES) \ - @COND_i386_ieee1275_TRUE@ wrmsr.marker --@COND_i386_ieee1275_TRUE@am__append_5587 = wrmsr.mod --@COND_i386_ieee1275_TRUE@am__append_5588 = wrmsr.marker --@COND_x86_64_efi_TRUE@am__append_5589 = wrmsr.module --@COND_x86_64_efi_TRUE@am__append_5590 = wrmsr.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__append_5591 = --@COND_x86_64_efi_TRUE@am__append_5592 = $(nodist_wrmsr_module_SOURCES) --@COND_x86_64_efi_TRUE@am__append_5593 = \ -+@COND_i386_ieee1275_TRUE@am__append_5580 = wrmsr.mod -+@COND_i386_ieee1275_TRUE@am__append_5581 = wrmsr.marker -+@COND_x86_64_efi_TRUE@am__append_5582 = wrmsr.module -+@COND_x86_64_efi_TRUE@am__append_5583 = wrmsr.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__append_5584 = -+@COND_x86_64_efi_TRUE@am__append_5585 = $(nodist_wrmsr_module_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_5586 = \ - @COND_x86_64_efi_TRUE@ $(nodist_wrmsr_module_SOURCES) \ - @COND_x86_64_efi_TRUE@ wrmsr.marker --@COND_x86_64_efi_TRUE@am__append_5594 = wrmsr.mod --@COND_x86_64_efi_TRUE@am__append_5595 = wrmsr.marker --@COND_emu_TRUE@am__append_5596 = kernel.exec -+@COND_x86_64_efi_TRUE@am__append_5587 = wrmsr.mod -+@COND_x86_64_efi_TRUE@am__append_5588 = wrmsr.marker -+@COND_emu_TRUE@am__append_5589 = kernel.exec - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_FALSE@kernel_exec_DEPENDENCIES = --@COND_emu_TRUE@am__append_5597 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S --@COND_emu_TRUE@am__append_5598 = $(nodist_kernel_exec_SOURCES) --@COND_emu_TRUE@am__append_5599 = $(nodist_kernel_exec_SOURCES) \ -+@COND_emu_TRUE@am__append_5590 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S -+@COND_emu_TRUE@am__append_5591 = $(nodist_kernel_exec_SOURCES) -+@COND_emu_TRUE@am__append_5592 = $(nodist_kernel_exec_SOURCES) \ - @COND_emu_TRUE@ kernel.img --@COND_emu_TRUE@am__append_5600 = kernel.img --@COND_i386_pc_TRUE@am__append_5601 = kernel.exec --@COND_i386_pc_TRUE@am__append_5602 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S --@COND_i386_pc_TRUE@am__append_5603 = $(nodist_kernel_exec_SOURCES) --@COND_i386_pc_TRUE@am__append_5604 = $(nodist_kernel_exec_SOURCES) \ -+@COND_emu_TRUE@am__append_5593 = kernel.img -+@COND_i386_pc_TRUE@am__append_5594 = kernel.exec -+@COND_i386_pc_TRUE@am__append_5595 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S -+@COND_i386_pc_TRUE@am__append_5596 = $(nodist_kernel_exec_SOURCES) -+@COND_i386_pc_TRUE@am__append_5597 = $(nodist_kernel_exec_SOURCES) \ - @COND_i386_pc_TRUE@ kernel.img --@COND_i386_pc_TRUE@am__append_5605 = kernel.img --@COND_i386_efi_TRUE@am__append_5606 = kernel.exec --@COND_i386_efi_TRUE@am__append_5607 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S --@COND_i386_efi_TRUE@am__append_5608 = $(nodist_kernel_exec_SOURCES) --@COND_i386_efi_TRUE@am__append_5609 = $(nodist_kernel_exec_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_5598 = kernel.img -+@COND_i386_efi_TRUE@am__append_5599 = kernel.exec -+@COND_i386_efi_TRUE@am__append_5600 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S -+@COND_i386_efi_TRUE@am__append_5601 = $(nodist_kernel_exec_SOURCES) -+@COND_i386_efi_TRUE@am__append_5602 = $(nodist_kernel_exec_SOURCES) \ - @COND_i386_efi_TRUE@ kernel.img --@COND_i386_efi_TRUE@am__append_5610 = kernel.img --@COND_i386_qemu_TRUE@am__append_5611 = kernel.exec --@COND_i386_qemu_TRUE@am__append_5612 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S --@COND_i386_qemu_TRUE@am__append_5613 = $(nodist_kernel_exec_SOURCES) --@COND_i386_qemu_TRUE@am__append_5614 = $(nodist_kernel_exec_SOURCES) \ -+@COND_i386_efi_TRUE@am__append_5603 = kernel.img -+@COND_i386_qemu_TRUE@am__append_5604 = kernel.exec -+@COND_i386_qemu_TRUE@am__append_5605 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S -+@COND_i386_qemu_TRUE@am__append_5606 = $(nodist_kernel_exec_SOURCES) -+@COND_i386_qemu_TRUE@am__append_5607 = $(nodist_kernel_exec_SOURCES) \ - @COND_i386_qemu_TRUE@ kernel.img --@COND_i386_qemu_TRUE@am__append_5615 = kernel.img --@COND_i386_coreboot_TRUE@am__append_5616 = kernel.exec --@COND_i386_coreboot_TRUE@am__append_5617 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S --@COND_i386_coreboot_TRUE@am__append_5618 = $(nodist_kernel_exec_SOURCES) --@COND_i386_coreboot_TRUE@am__append_5619 = \ -+@COND_i386_qemu_TRUE@am__append_5608 = kernel.img -+@COND_i386_coreboot_TRUE@am__append_5609 = kernel.exec -+@COND_i386_coreboot_TRUE@am__append_5610 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S -+@COND_i386_coreboot_TRUE@am__append_5611 = $(nodist_kernel_exec_SOURCES) -+@COND_i386_coreboot_TRUE@am__append_5612 = \ - @COND_i386_coreboot_TRUE@ $(nodist_kernel_exec_SOURCES) \ - @COND_i386_coreboot_TRUE@ kernel.img --@COND_i386_coreboot_TRUE@am__append_5620 = kernel.img --@COND_i386_multiboot_TRUE@am__append_5621 = kernel.exec --@COND_i386_multiboot_TRUE@am__append_5622 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S --@COND_i386_multiboot_TRUE@am__append_5623 = $(nodist_kernel_exec_SOURCES) --@COND_i386_multiboot_TRUE@am__append_5624 = \ -+@COND_i386_coreboot_TRUE@am__append_5613 = kernel.img -+@COND_i386_multiboot_TRUE@am__append_5614 = kernel.exec -+@COND_i386_multiboot_TRUE@am__append_5615 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S -+@COND_i386_multiboot_TRUE@am__append_5616 = $(nodist_kernel_exec_SOURCES) -+@COND_i386_multiboot_TRUE@am__append_5617 = \ - @COND_i386_multiboot_TRUE@ $(nodist_kernel_exec_SOURCES) \ - @COND_i386_multiboot_TRUE@ kernel.img --@COND_i386_multiboot_TRUE@am__append_5625 = kernel.img --@COND_i386_ieee1275_TRUE@am__append_5626 = kernel.exec --@COND_i386_ieee1275_TRUE@am__append_5627 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S --@COND_i386_ieee1275_TRUE@am__append_5628 = $(nodist_kernel_exec_SOURCES) --@COND_i386_ieee1275_TRUE@am__append_5629 = \ -+@COND_i386_multiboot_TRUE@am__append_5618 = kernel.img -+@COND_i386_ieee1275_TRUE@am__append_5619 = kernel.exec -+@COND_i386_ieee1275_TRUE@am__append_5620 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S -+@COND_i386_ieee1275_TRUE@am__append_5621 = $(nodist_kernel_exec_SOURCES) -+@COND_i386_ieee1275_TRUE@am__append_5622 = \ - @COND_i386_ieee1275_TRUE@ $(nodist_kernel_exec_SOURCES) \ - @COND_i386_ieee1275_TRUE@ kernel.img --@COND_i386_ieee1275_TRUE@am__append_5630 = kernel.img --@COND_x86_64_efi_TRUE@am__append_5631 = kernel.exec --@COND_x86_64_efi_TRUE@am__append_5632 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S --@COND_x86_64_efi_TRUE@am__append_5633 = $(nodist_kernel_exec_SOURCES) --@COND_x86_64_efi_TRUE@am__append_5634 = $(nodist_kernel_exec_SOURCES) \ -+@COND_i386_ieee1275_TRUE@am__append_5623 = kernel.img -+@COND_x86_64_efi_TRUE@am__append_5624 = kernel.exec -+@COND_x86_64_efi_TRUE@am__append_5625 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S -+@COND_x86_64_efi_TRUE@am__append_5626 = $(nodist_kernel_exec_SOURCES) -+@COND_x86_64_efi_TRUE@am__append_5627 = $(nodist_kernel_exec_SOURCES) \ - @COND_x86_64_efi_TRUE@ kernel.img --@COND_x86_64_efi_TRUE@am__append_5635 = kernel.img --@COND_i386_xen_TRUE@am__append_5636 = kernel.exec --@COND_i386_xen_TRUE@am__append_5637 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S --@COND_i386_xen_TRUE@am__append_5638 = $(nodist_kernel_exec_SOURCES) --@COND_i386_xen_TRUE@am__append_5639 = $(nodist_kernel_exec_SOURCES) \ -+@COND_x86_64_efi_TRUE@am__append_5628 = kernel.img -+@COND_i386_xen_TRUE@am__append_5629 = kernel.exec -+@COND_i386_xen_TRUE@am__append_5630 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S -+@COND_i386_xen_TRUE@am__append_5631 = $(nodist_kernel_exec_SOURCES) -+@COND_i386_xen_TRUE@am__append_5632 = $(nodist_kernel_exec_SOURCES) \ - @COND_i386_xen_TRUE@ kernel.img --@COND_i386_xen_TRUE@am__append_5640 = kernel.img --@COND_x86_64_xen_TRUE@am__append_5641 = kernel.exec --@COND_x86_64_xen_TRUE@am__append_5642 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S --@COND_x86_64_xen_TRUE@am__append_5643 = $(nodist_kernel_exec_SOURCES) --@COND_x86_64_xen_TRUE@am__append_5644 = $(nodist_kernel_exec_SOURCES) \ -+@COND_i386_xen_TRUE@am__append_5633 = kernel.img -+@COND_x86_64_xen_TRUE@am__append_5634 = kernel.exec -+@COND_x86_64_xen_TRUE@am__append_5635 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S -+@COND_x86_64_xen_TRUE@am__append_5636 = $(nodist_kernel_exec_SOURCES) -+@COND_x86_64_xen_TRUE@am__append_5637 = $(nodist_kernel_exec_SOURCES) \ - @COND_x86_64_xen_TRUE@ kernel.img --@COND_x86_64_xen_TRUE@am__append_5645 = kernel.img --@COND_i386_xen_pvh_TRUE@am__append_5646 = kernel.exec --@COND_i386_xen_pvh_TRUE@am__append_5647 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S --@COND_i386_xen_pvh_TRUE@am__append_5648 = $(nodist_kernel_exec_SOURCES) --@COND_i386_xen_pvh_TRUE@am__append_5649 = \ -+@COND_x86_64_xen_TRUE@am__append_5638 = kernel.img -+@COND_i386_xen_pvh_TRUE@am__append_5639 = kernel.exec -+@COND_i386_xen_pvh_TRUE@am__append_5640 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S -+@COND_i386_xen_pvh_TRUE@am__append_5641 = $(nodist_kernel_exec_SOURCES) -+@COND_i386_xen_pvh_TRUE@am__append_5642 = \ - @COND_i386_xen_pvh_TRUE@ $(nodist_kernel_exec_SOURCES) \ - @COND_i386_xen_pvh_TRUE@ kernel.img --@COND_i386_xen_pvh_TRUE@am__append_5650 = kernel.img --@COND_mips_loongson_TRUE@am__append_5651 = kernel.exec --@COND_mips_loongson_TRUE@am__append_5652 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S --@COND_mips_loongson_TRUE@am__append_5653 = $(nodist_kernel_exec_SOURCES) --@COND_mips_loongson_TRUE@am__append_5654 = \ -+@COND_i386_xen_pvh_TRUE@am__append_5643 = kernel.img -+@COND_mips_loongson_TRUE@am__append_5644 = kernel.exec -+@COND_mips_loongson_TRUE@am__append_5645 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S -+@COND_mips_loongson_TRUE@am__append_5646 = $(nodist_kernel_exec_SOURCES) -+@COND_mips_loongson_TRUE@am__append_5647 = \ - @COND_mips_loongson_TRUE@ $(nodist_kernel_exec_SOURCES) \ - @COND_mips_loongson_TRUE@ kernel.img --@COND_mips_loongson_TRUE@am__append_5655 = kernel.img --@COND_sparc64_ieee1275_TRUE@am__append_5656 = kernel.exec --@COND_sparc64_ieee1275_TRUE@am__append_5657 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S --@COND_sparc64_ieee1275_TRUE@am__append_5658 = $(nodist_kernel_exec_SOURCES) --@COND_sparc64_ieee1275_TRUE@am__append_5659 = \ -+@COND_mips_loongson_TRUE@am__append_5648 = kernel.img -+@COND_sparc64_ieee1275_TRUE@am__append_5649 = kernel.exec -+@COND_sparc64_ieee1275_TRUE@am__append_5650 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S -+@COND_sparc64_ieee1275_TRUE@am__append_5651 = $(nodist_kernel_exec_SOURCES) -+@COND_sparc64_ieee1275_TRUE@am__append_5652 = \ - @COND_sparc64_ieee1275_TRUE@ $(nodist_kernel_exec_SOURCES) \ - @COND_sparc64_ieee1275_TRUE@ kernel.img --@COND_sparc64_ieee1275_TRUE@am__append_5660 = kernel.img --@COND_powerpc_ieee1275_TRUE@am__append_5661 = kernel.exec --@COND_powerpc_ieee1275_TRUE@am__append_5662 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S --@COND_powerpc_ieee1275_TRUE@am__append_5663 = $(nodist_kernel_exec_SOURCES) --@COND_powerpc_ieee1275_TRUE@am__append_5664 = \ -+@COND_sparc64_ieee1275_TRUE@am__append_5653 = kernel.img -+@COND_powerpc_ieee1275_TRUE@am__append_5654 = kernel.exec -+@COND_powerpc_ieee1275_TRUE@am__append_5655 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S -+@COND_powerpc_ieee1275_TRUE@am__append_5656 = $(nodist_kernel_exec_SOURCES) -+@COND_powerpc_ieee1275_TRUE@am__append_5657 = \ - @COND_powerpc_ieee1275_TRUE@ $(nodist_kernel_exec_SOURCES) \ - @COND_powerpc_ieee1275_TRUE@ kernel.img --@COND_powerpc_ieee1275_TRUE@am__append_5665 = kernel.img --@COND_mips_arc_TRUE@am__append_5666 = kernel.exec --@COND_mips_arc_TRUE@am__append_5667 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S --@COND_mips_arc_TRUE@am__append_5668 = $(nodist_kernel_exec_SOURCES) --@COND_mips_arc_TRUE@am__append_5669 = $(nodist_kernel_exec_SOURCES) \ -+@COND_powerpc_ieee1275_TRUE@am__append_5658 = kernel.img -+@COND_mips_arc_TRUE@am__append_5659 = kernel.exec -+@COND_mips_arc_TRUE@am__append_5660 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S -+@COND_mips_arc_TRUE@am__append_5661 = $(nodist_kernel_exec_SOURCES) -+@COND_mips_arc_TRUE@am__append_5662 = $(nodist_kernel_exec_SOURCES) \ - @COND_mips_arc_TRUE@ kernel.img --@COND_mips_arc_TRUE@am__append_5670 = kernel.img --@COND_ia64_efi_TRUE@am__append_5671 = kernel.exec --@COND_ia64_efi_TRUE@am__append_5672 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S --@COND_ia64_efi_TRUE@am__append_5673 = $(nodist_kernel_exec_SOURCES) --@COND_ia64_efi_TRUE@am__append_5674 = $(nodist_kernel_exec_SOURCES) \ -+@COND_mips_arc_TRUE@am__append_5663 = kernel.img -+@COND_ia64_efi_TRUE@am__append_5664 = kernel.exec -+@COND_ia64_efi_TRUE@am__append_5665 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S -+@COND_ia64_efi_TRUE@am__append_5666 = $(nodist_kernel_exec_SOURCES) -+@COND_ia64_efi_TRUE@am__append_5667 = $(nodist_kernel_exec_SOURCES) \ - @COND_ia64_efi_TRUE@ kernel.img --@COND_ia64_efi_TRUE@am__append_5675 = kernel.img --@COND_mips_qemu_mips_TRUE@am__append_5676 = kernel.exec --@COND_mips_qemu_mips_TRUE@am__append_5677 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S --@COND_mips_qemu_mips_TRUE@am__append_5678 = $(nodist_kernel_exec_SOURCES) --@COND_mips_qemu_mips_TRUE@am__append_5679 = \ -+@COND_ia64_efi_TRUE@am__append_5668 = kernel.img -+@COND_mips_qemu_mips_TRUE@am__append_5669 = kernel.exec -+@COND_mips_qemu_mips_TRUE@am__append_5670 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S -+@COND_mips_qemu_mips_TRUE@am__append_5671 = $(nodist_kernel_exec_SOURCES) -+@COND_mips_qemu_mips_TRUE@am__append_5672 = \ - @COND_mips_qemu_mips_TRUE@ $(nodist_kernel_exec_SOURCES) \ - @COND_mips_qemu_mips_TRUE@ kernel.img --@COND_mips_qemu_mips_TRUE@am__append_5680 = kernel.img --@COND_arm_uboot_TRUE@am__append_5681 = kernel.exec --@COND_arm_uboot_TRUE@am__append_5682 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S --@COND_arm_uboot_TRUE@am__append_5683 = $(nodist_kernel_exec_SOURCES) --@COND_arm_uboot_TRUE@am__append_5684 = $(nodist_kernel_exec_SOURCES) \ -+@COND_mips_qemu_mips_TRUE@am__append_5673 = kernel.img -+@COND_arm_uboot_TRUE@am__append_5674 = kernel.exec -+@COND_arm_uboot_TRUE@am__append_5675 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S -+@COND_arm_uboot_TRUE@am__append_5676 = $(nodist_kernel_exec_SOURCES) -+@COND_arm_uboot_TRUE@am__append_5677 = $(nodist_kernel_exec_SOURCES) \ - @COND_arm_uboot_TRUE@ kernel.img --@COND_arm_uboot_TRUE@am__append_5685 = kernel.img --@COND_arm_efi_TRUE@am__append_5686 = kernel.exec --@COND_arm_efi_TRUE@am__append_5687 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S --@COND_arm_efi_TRUE@am__append_5688 = $(nodist_kernel_exec_SOURCES) --@COND_arm_efi_TRUE@am__append_5689 = $(nodist_kernel_exec_SOURCES) \ -+@COND_arm_uboot_TRUE@am__append_5678 = kernel.img -+@COND_arm_efi_TRUE@am__append_5679 = kernel.exec -+@COND_arm_efi_TRUE@am__append_5680 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S -+@COND_arm_efi_TRUE@am__append_5681 = $(nodist_kernel_exec_SOURCES) -+@COND_arm_efi_TRUE@am__append_5682 = $(nodist_kernel_exec_SOURCES) \ - @COND_arm_efi_TRUE@ kernel.img --@COND_arm_efi_TRUE@am__append_5690 = kernel.img --@COND_arm64_efi_TRUE@am__append_5691 = kernel.exec --@COND_arm64_efi_TRUE@am__append_5692 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S --@COND_arm64_efi_TRUE@am__append_5693 = $(nodist_kernel_exec_SOURCES) --@COND_arm64_efi_TRUE@am__append_5694 = $(nodist_kernel_exec_SOURCES) \ -+@COND_arm_efi_TRUE@am__append_5683 = kernel.img -+@COND_arm64_efi_TRUE@am__append_5684 = kernel.exec -+@COND_arm64_efi_TRUE@am__append_5685 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S -+@COND_arm64_efi_TRUE@am__append_5686 = $(nodist_kernel_exec_SOURCES) -+@COND_arm64_efi_TRUE@am__append_5687 = $(nodist_kernel_exec_SOURCES) \ - @COND_arm64_efi_TRUE@ kernel.img --@COND_arm64_efi_TRUE@am__append_5695 = kernel.img --@COND_arm_coreboot_TRUE@am__append_5696 = kernel.exec --@COND_arm_coreboot_TRUE@am__append_5697 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S --@COND_arm_coreboot_TRUE@am__append_5698 = $(nodist_kernel_exec_SOURCES) --@COND_arm_coreboot_TRUE@am__append_5699 = \ -+@COND_arm64_efi_TRUE@am__append_5688 = kernel.img -+@COND_arm_coreboot_TRUE@am__append_5689 = kernel.exec -+@COND_arm_coreboot_TRUE@am__append_5690 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S -+@COND_arm_coreboot_TRUE@am__append_5691 = $(nodist_kernel_exec_SOURCES) -+@COND_arm_coreboot_TRUE@am__append_5692 = \ - @COND_arm_coreboot_TRUE@ $(nodist_kernel_exec_SOURCES) \ - @COND_arm_coreboot_TRUE@ kernel.img --@COND_arm_coreboot_TRUE@am__append_5700 = kernel.img --@COND_riscv32_efi_TRUE@am__append_5701 = kernel.exec --@COND_riscv32_efi_TRUE@am__append_5702 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S --@COND_riscv32_efi_TRUE@am__append_5703 = $(nodist_kernel_exec_SOURCES) --@COND_riscv32_efi_TRUE@am__append_5704 = \ -+@COND_arm_coreboot_TRUE@am__append_5693 = kernel.img -+@COND_riscv32_efi_TRUE@am__append_5694 = kernel.exec -+@COND_riscv32_efi_TRUE@am__append_5695 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S -+@COND_riscv32_efi_TRUE@am__append_5696 = $(nodist_kernel_exec_SOURCES) -+@COND_riscv32_efi_TRUE@am__append_5697 = \ - @COND_riscv32_efi_TRUE@ $(nodist_kernel_exec_SOURCES) \ - @COND_riscv32_efi_TRUE@ kernel.img --@COND_riscv32_efi_TRUE@am__append_5705 = kernel.img --@COND_riscv64_efi_TRUE@am__append_5706 = kernel.exec --@COND_riscv64_efi_TRUE@am__append_5707 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S --@COND_riscv64_efi_TRUE@am__append_5708 = $(nodist_kernel_exec_SOURCES) --@COND_riscv64_efi_TRUE@am__append_5709 = \ -+@COND_riscv32_efi_TRUE@am__append_5698 = kernel.img -+@COND_riscv64_efi_TRUE@am__append_5699 = kernel.exec -+@COND_riscv64_efi_TRUE@am__append_5700 = video/sm712_init.c video/sis315_init.c kern/arm/cache.S osdep/unix/exec.c osdep/unix/emuconsole.c osdep/windows/emuconsole.c osdep/unix/dl.c osdep/windows/dl.c osdep/linux/emunet.c osdep/basic/emunet.c osdep/unix/cputime.c osdep/windows/cputime.c kern/i386/int.S kern/i386/realmode.S boot/i386/pc/lzma_decode.S kern/mips/cache_flush.S -+@COND_riscv64_efi_TRUE@am__append_5701 = $(nodist_kernel_exec_SOURCES) -+@COND_riscv64_efi_TRUE@am__append_5702 = \ - @COND_riscv64_efi_TRUE@ $(nodist_kernel_exec_SOURCES) \ - @COND_riscv64_efi_TRUE@ kernel.img --@COND_riscv64_efi_TRUE@am__append_5710 = kernel.img --@COND_i386_pc_TRUE@am__append_5711 = boot.image --@COND_i386_pc_TRUE@am__append_5712 = --@COND_i386_pc_TRUE@am__append_5713 = $(nodist_boot_image_SOURCES) --@COND_i386_pc_TRUE@am__append_5714 = $(nodist_boot_image_SOURCES) \ -+@COND_riscv64_efi_TRUE@am__append_5703 = kernel.img -+@COND_i386_pc_TRUE@am__append_5704 = boot.image -+@COND_i386_pc_TRUE@am__append_5705 = -+@COND_i386_pc_TRUE@am__append_5706 = $(nodist_boot_image_SOURCES) -+@COND_i386_pc_TRUE@am__append_5707 = $(nodist_boot_image_SOURCES) \ - @COND_i386_pc_TRUE@ boot.img --@COND_i386_pc_TRUE@am__append_5715 = boot.img --@COND_i386_qemu_TRUE@am__append_5716 = boot.image --@COND_i386_qemu_TRUE@am__append_5717 = --@COND_i386_qemu_TRUE@am__append_5718 = $(nodist_boot_image_SOURCES) --@COND_i386_qemu_TRUE@am__append_5719 = $(nodist_boot_image_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_5708 = boot.img -+@COND_i386_qemu_TRUE@am__append_5709 = boot.image -+@COND_i386_qemu_TRUE@am__append_5710 = -+@COND_i386_qemu_TRUE@am__append_5711 = $(nodist_boot_image_SOURCES) -+@COND_i386_qemu_TRUE@am__append_5712 = $(nodist_boot_image_SOURCES) \ - @COND_i386_qemu_TRUE@ boot.img --@COND_i386_qemu_TRUE@am__append_5720 = boot.img --@COND_sparc64_ieee1275_TRUE@am__append_5721 = boot.image --@COND_sparc64_ieee1275_TRUE@am__append_5722 = --@COND_sparc64_ieee1275_TRUE@am__append_5723 = $(nodist_boot_image_SOURCES) --@COND_sparc64_ieee1275_TRUE@am__append_5724 = \ -+@COND_i386_qemu_TRUE@am__append_5713 = boot.img -+@COND_sparc64_ieee1275_TRUE@am__append_5714 = boot.image -+@COND_sparc64_ieee1275_TRUE@am__append_5715 = -+@COND_sparc64_ieee1275_TRUE@am__append_5716 = $(nodist_boot_image_SOURCES) -+@COND_sparc64_ieee1275_TRUE@am__append_5717 = \ - @COND_sparc64_ieee1275_TRUE@ $(nodist_boot_image_SOURCES) \ - @COND_sparc64_ieee1275_TRUE@ boot.img --@COND_sparc64_ieee1275_TRUE@am__append_5725 = boot.img --@COND_i386_pc_TRUE@am__append_5726 = boot_hybrid.image cdboot.image --@COND_i386_pc_TRUE@am__append_5727 = --@COND_i386_pc_TRUE@am__append_5728 = \ -+@COND_sparc64_ieee1275_TRUE@am__append_5718 = boot.img -+@COND_i386_pc_TRUE@am__append_5719 = boot_hybrid.image cdboot.image -+@COND_i386_pc_TRUE@am__append_5720 = -+@COND_i386_pc_TRUE@am__append_5721 = \ - @COND_i386_pc_TRUE@ $(nodist_boot_hybrid_image_SOURCES) \ - @COND_i386_pc_TRUE@ $(nodist_cdboot_image_SOURCES) --@COND_i386_pc_TRUE@am__append_5729 = \ -+@COND_i386_pc_TRUE@am__append_5722 = \ - @COND_i386_pc_TRUE@ $(nodist_boot_hybrid_image_SOURCES) \ - @COND_i386_pc_TRUE@ boot_hybrid.img \ - @COND_i386_pc_TRUE@ $(nodist_cdboot_image_SOURCES) cdboot.img --@COND_i386_pc_TRUE@am__append_5730 = boot_hybrid.img cdboot.img --@COND_sparc64_ieee1275_TRUE@am__append_5731 = cdboot.image --@COND_sparc64_ieee1275_TRUE@am__append_5732 = --@COND_sparc64_ieee1275_TRUE@am__append_5733 = $(nodist_cdboot_image_SOURCES) --@COND_sparc64_ieee1275_TRUE@am__append_5734 = \ -+@COND_i386_pc_TRUE@am__append_5723 = boot_hybrid.img cdboot.img -+@COND_sparc64_ieee1275_TRUE@am__append_5724 = cdboot.image -+@COND_sparc64_ieee1275_TRUE@am__append_5725 = -+@COND_sparc64_ieee1275_TRUE@am__append_5726 = $(nodist_cdboot_image_SOURCES) -+@COND_sparc64_ieee1275_TRUE@am__append_5727 = \ - @COND_sparc64_ieee1275_TRUE@ $(nodist_cdboot_image_SOURCES) \ - @COND_sparc64_ieee1275_TRUE@ cdboot.img --@COND_sparc64_ieee1275_TRUE@am__append_5735 = cdboot.img --@COND_i386_pc_TRUE@am__append_5736 = pxeboot.image diskboot.image --@COND_i386_pc_TRUE@am__append_5737 = --@COND_i386_pc_TRUE@am__append_5738 = $(nodist_pxeboot_image_SOURCES) \ -+@COND_sparc64_ieee1275_TRUE@am__append_5728 = cdboot.img -+@COND_i386_pc_TRUE@am__append_5729 = pxeboot.image diskboot.image -+@COND_i386_pc_TRUE@am__append_5730 = -+@COND_i386_pc_TRUE@am__append_5731 = $(nodist_pxeboot_image_SOURCES) \ - @COND_i386_pc_TRUE@ $(nodist_diskboot_image_SOURCES) --@COND_i386_pc_TRUE@am__append_5739 = $(nodist_pxeboot_image_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_5732 = $(nodist_pxeboot_image_SOURCES) \ - @COND_i386_pc_TRUE@ pxeboot.img \ - @COND_i386_pc_TRUE@ $(nodist_diskboot_image_SOURCES) \ - @COND_i386_pc_TRUE@ diskboot.img --@COND_i386_pc_TRUE@am__append_5740 = pxeboot.img diskboot.img --@COND_sparc64_ieee1275_TRUE@am__append_5741 = diskboot.image --@COND_sparc64_ieee1275_TRUE@am__append_5742 = --@COND_sparc64_ieee1275_TRUE@am__append_5743 = $(nodist_diskboot_image_SOURCES) --@COND_sparc64_ieee1275_TRUE@am__append_5744 = \ -+@COND_i386_pc_TRUE@am__append_5733 = pxeboot.img diskboot.img -+@COND_sparc64_ieee1275_TRUE@am__append_5734 = diskboot.image -+@COND_sparc64_ieee1275_TRUE@am__append_5735 = -+@COND_sparc64_ieee1275_TRUE@am__append_5736 = $(nodist_diskboot_image_SOURCES) -+@COND_sparc64_ieee1275_TRUE@am__append_5737 = \ - @COND_sparc64_ieee1275_TRUE@ $(nodist_diskboot_image_SOURCES) \ - @COND_sparc64_ieee1275_TRUE@ diskboot.img --@COND_sparc64_ieee1275_TRUE@am__append_5745 = diskboot.img --@COND_i386_pc_TRUE@am__append_5746 = lnxboot.image --@COND_i386_pc_TRUE@am__append_5747 = --@COND_i386_pc_TRUE@am__append_5748 = $(nodist_lnxboot_image_SOURCES) --@COND_i386_pc_TRUE@am__append_5749 = $(nodist_lnxboot_image_SOURCES) \ -+@COND_sparc64_ieee1275_TRUE@am__append_5738 = diskboot.img -+@COND_i386_pc_TRUE@am__append_5739 = lnxboot.image -+@COND_i386_pc_TRUE@am__append_5740 = -+@COND_i386_pc_TRUE@am__append_5741 = $(nodist_lnxboot_image_SOURCES) -+@COND_i386_pc_TRUE@am__append_5742 = $(nodist_lnxboot_image_SOURCES) \ - @COND_i386_pc_TRUE@ lnxboot.img --@COND_i386_pc_TRUE@am__append_5750 = lnxboot.img --@COND_mips_loongson_TRUE@am__append_5751 = xz_decompress.image --@COND_mips_loongson_TRUE@am__append_5752 = --@COND_mips_loongson_TRUE@am__append_5753 = $(nodist_xz_decompress_image_SOURCES) --@COND_mips_loongson_TRUE@am__append_5754 = $(nodist_xz_decompress_image_SOURCES) \ -+@COND_i386_pc_TRUE@am__append_5743 = lnxboot.img -+@COND_mips_loongson_TRUE@am__append_5744 = xz_decompress.image -+@COND_mips_loongson_TRUE@am__append_5745 = -+@COND_mips_loongson_TRUE@am__append_5746 = $(nodist_xz_decompress_image_SOURCES) -+@COND_mips_loongson_TRUE@am__append_5747 = $(nodist_xz_decompress_image_SOURCES) \ - @COND_mips_loongson_TRUE@ xz_decompress.img --@COND_mips_loongson_TRUE@am__append_5755 = xz_decompress.img --@COND_mips_arc_TRUE@am__append_5756 = xz_decompress.image --@COND_mips_arc_TRUE@am__append_5757 = --@COND_mips_arc_TRUE@am__append_5758 = $(nodist_xz_decompress_image_SOURCES) --@COND_mips_arc_TRUE@am__append_5759 = \ -+@COND_mips_loongson_TRUE@am__append_5748 = xz_decompress.img -+@COND_mips_arc_TRUE@am__append_5749 = xz_decompress.image -+@COND_mips_arc_TRUE@am__append_5750 = -+@COND_mips_arc_TRUE@am__append_5751 = $(nodist_xz_decompress_image_SOURCES) -+@COND_mips_arc_TRUE@am__append_5752 = \ - @COND_mips_arc_TRUE@ $(nodist_xz_decompress_image_SOURCES) \ - @COND_mips_arc_TRUE@ xz_decompress.img --@COND_mips_arc_TRUE@am__append_5760 = xz_decompress.img --@COND_mips_qemu_mips_TRUE@am__append_5761 = xz_decompress.image --@COND_mips_qemu_mips_TRUE@am__append_5762 = --@COND_mips_qemu_mips_TRUE@am__append_5763 = $(nodist_xz_decompress_image_SOURCES) --@COND_mips_qemu_mips_TRUE@am__append_5764 = $(nodist_xz_decompress_image_SOURCES) \ -+@COND_mips_arc_TRUE@am__append_5753 = xz_decompress.img -+@COND_mips_qemu_mips_TRUE@am__append_5754 = xz_decompress.image -+@COND_mips_qemu_mips_TRUE@am__append_5755 = -+@COND_mips_qemu_mips_TRUE@am__append_5756 = $(nodist_xz_decompress_image_SOURCES) -+@COND_mips_qemu_mips_TRUE@am__append_5757 = $(nodist_xz_decompress_image_SOURCES) \ - @COND_mips_qemu_mips_TRUE@ xz_decompress.img --@COND_mips_qemu_mips_TRUE@am__append_5765 = xz_decompress.img --@COND_mips_loongson_TRUE@am__append_5766 = none_decompress.image --@COND_mips_loongson_TRUE@am__append_5767 = --@COND_mips_loongson_TRUE@am__append_5768 = $(nodist_none_decompress_image_SOURCES) --@COND_mips_loongson_TRUE@am__append_5769 = $(nodist_none_decompress_image_SOURCES) \ -+@COND_mips_qemu_mips_TRUE@am__append_5758 = xz_decompress.img -+@COND_mips_loongson_TRUE@am__append_5759 = none_decompress.image -+@COND_mips_loongson_TRUE@am__append_5760 = -+@COND_mips_loongson_TRUE@am__append_5761 = $(nodist_none_decompress_image_SOURCES) -+@COND_mips_loongson_TRUE@am__append_5762 = $(nodist_none_decompress_image_SOURCES) \ - @COND_mips_loongson_TRUE@ none_decompress.img --@COND_mips_loongson_TRUE@am__append_5770 = none_decompress.img --@COND_mips_arc_TRUE@am__append_5771 = none_decompress.image --@COND_mips_arc_TRUE@am__append_5772 = --@COND_mips_arc_TRUE@am__append_5773 = $(nodist_none_decompress_image_SOURCES) --@COND_mips_arc_TRUE@am__append_5774 = \ -+@COND_mips_loongson_TRUE@am__append_5763 = none_decompress.img -+@COND_mips_arc_TRUE@am__append_5764 = none_decompress.image -+@COND_mips_arc_TRUE@am__append_5765 = -+@COND_mips_arc_TRUE@am__append_5766 = $(nodist_none_decompress_image_SOURCES) -+@COND_mips_arc_TRUE@am__append_5767 = \ - @COND_mips_arc_TRUE@ $(nodist_none_decompress_image_SOURCES) \ - @COND_mips_arc_TRUE@ none_decompress.img --@COND_mips_arc_TRUE@am__append_5775 = none_decompress.img --@COND_mips_qemu_mips_TRUE@am__append_5776 = none_decompress.image --@COND_mips_qemu_mips_TRUE@am__append_5777 = --@COND_mips_qemu_mips_TRUE@am__append_5778 = $(nodist_none_decompress_image_SOURCES) --@COND_mips_qemu_mips_TRUE@am__append_5779 = $(nodist_none_decompress_image_SOURCES) \ -+@COND_mips_arc_TRUE@am__append_5768 = none_decompress.img -+@COND_mips_qemu_mips_TRUE@am__append_5769 = none_decompress.image -+@COND_mips_qemu_mips_TRUE@am__append_5770 = -+@COND_mips_qemu_mips_TRUE@am__append_5771 = $(nodist_none_decompress_image_SOURCES) -+@COND_mips_qemu_mips_TRUE@am__append_5772 = $(nodist_none_decompress_image_SOURCES) \ - @COND_mips_qemu_mips_TRUE@ none_decompress.img --@COND_mips_qemu_mips_TRUE@am__append_5780 = none_decompress.img --@COND_i386_pc_TRUE@am__append_5781 = lzma_decompress.image --@COND_i386_pc_TRUE@am__append_5782 = --@COND_i386_pc_TRUE@am__append_5783 = $(nodist_lzma_decompress_image_SOURCES) --@COND_i386_pc_TRUE@am__append_5784 = \ -+@COND_mips_qemu_mips_TRUE@am__append_5773 = none_decompress.img -+@COND_i386_pc_TRUE@am__append_5774 = lzma_decompress.image -+@COND_i386_pc_TRUE@am__append_5775 = -+@COND_i386_pc_TRUE@am__append_5776 = $(nodist_lzma_decompress_image_SOURCES) -+@COND_i386_pc_TRUE@am__append_5777 = \ - @COND_i386_pc_TRUE@ $(nodist_lzma_decompress_image_SOURCES) \ - @COND_i386_pc_TRUE@ lzma_decompress.img --@COND_i386_pc_TRUE@am__append_5785 = lzma_decompress.img --@COND_mips_loongson_TRUE@am__append_5786 = fwstart.image \ -+@COND_i386_pc_TRUE@am__append_5778 = lzma_decompress.img -+@COND_mips_loongson_TRUE@am__append_5779 = fwstart.image \ - @COND_mips_loongson_TRUE@ fwstart_fuloong2f.image --@COND_mips_loongson_TRUE@am__append_5787 = --@COND_mips_loongson_TRUE@am__append_5788 = \ -+@COND_mips_loongson_TRUE@am__append_5780 = -+@COND_mips_loongson_TRUE@am__append_5781 = \ - @COND_mips_loongson_TRUE@ $(nodist_fwstart_image_SOURCES) \ - @COND_mips_loongson_TRUE@ $(nodist_fwstart_fuloong2f_image_SOURCES) --@COND_mips_loongson_TRUE@am__append_5789 = \ -+@COND_mips_loongson_TRUE@am__append_5782 = \ - @COND_mips_loongson_TRUE@ $(nodist_fwstart_image_SOURCES) \ - @COND_mips_loongson_TRUE@ fwstart.img \ - @COND_mips_loongson_TRUE@ $(nodist_fwstart_fuloong2f_image_SOURCES) \ - @COND_mips_loongson_TRUE@ fwstart_fuloong2f.img --@COND_mips_loongson_TRUE@am__append_5790 = fwstart.img \ -+@COND_mips_loongson_TRUE@am__append_5783 = fwstart.img \ - @COND_mips_loongson_TRUE@ fwstart_fuloong2f.img --@COND_emu_TRUE@am__append_5791 = grub-emu grub-emu-lite --@COND_MAN_PAGES_TRUE@@COND_emu_TRUE@am__append_5792 = grub-emu.1 --@COND_MAN_PAGES_TRUE@@COND_emu_TRUE@am__append_5793 = grub-emu.1 --@COND_emu_TRUE@am__append_5794 = --@COND_emu_TRUE@am__append_5795 = $(nodist_grub_emu_SOURCES) \ -+@COND_emu_TRUE@am__append_5784 = grub-emu grub-emu-lite -+@COND_MAN_PAGES_TRUE@@COND_emu_TRUE@am__append_5785 = grub-emu.1 -+@COND_MAN_PAGES_TRUE@@COND_emu_TRUE@am__append_5786 = grub-emu.1 -+@COND_emu_TRUE@am__append_5787 = -+@COND_emu_TRUE@am__append_5788 = $(nodist_grub_emu_SOURCES) \ - @COND_emu_TRUE@ $(nodist_grub_emu_lite_SOURCES) --@COND_emu_TRUE@am__append_5796 = $(nodist_grub_emu_SOURCES) \ -+@COND_emu_TRUE@am__append_5789 = $(nodist_grub_emu_SOURCES) \ - @COND_emu_TRUE@ $(nodist_grub_emu_lite_SOURCES) --@COND_powerpc_ieee1275_TRUE@am__append_5797 = grub.chrp bootinfo.txt --@COND_powerpc_ieee1275_TRUE@am__append_5798 = grub.chrp bootinfo.txt --@COND_powerpc_ieee1275_TRUE@am__append_5799 = --@COND_powerpc_ieee1275_TRUE@am__append_5800 = \ -+@COND_powerpc_ieee1275_TRUE@am__append_5790 = grub.chrp bootinfo.txt -+@COND_powerpc_ieee1275_TRUE@am__append_5791 = grub.chrp bootinfo.txt -+@COND_powerpc_ieee1275_TRUE@am__append_5792 = -+@COND_powerpc_ieee1275_TRUE@am__append_5793 = \ - @COND_powerpc_ieee1275_TRUE@ boot/powerpc/grub.chrp.in \ - @COND_powerpc_ieee1275_TRUE@ boot/powerpc/bootinfo.txt.in --@COND_emu_TRUE@am__append_5801 = $(top_srcdir)/include/grub/compiler-rt-emu.h --@COND_emu_FALSE@am__append_5802 = $(top_srcdir)/include/grub/compiler-rt.h --@COND_i386_pc_TRUE@am__append_5803 = $(top_builddir)/include/grub/machine/kernel.h \ -+@COND_emu_TRUE@am__append_5794 = $(top_srcdir)/include/grub/compiler-rt-emu.h -+@COND_emu_FALSE@am__append_5795 = $(top_srcdir)/include/grub/compiler-rt.h -+@COND_i386_pc_TRUE@am__append_5796 = $(top_builddir)/include/grub/machine/kernel.h \ - @COND_i386_pc_TRUE@ $(top_builddir)/include/grub/machine/pxe.h \ - @COND_i386_pc_TRUE@ $(top_builddir)/include/grub/machine/int.h \ - @COND_i386_pc_TRUE@ $(top_srcdir)/include/grub/i386/tsc.h --@COND_i386_xen_pvh_TRUE@am__append_5804 = $(top_builddir)/include/grub/machine/kernel.h \ -+@COND_i386_xen_pvh_TRUE@am__append_5797 = $(top_builddir)/include/grub/machine/kernel.h \ - @COND_i386_xen_pvh_TRUE@ $(top_builddir)/include/grub/machine/int.h \ - @COND_i386_xen_pvh_TRUE@ $(top_srcdir)/include/grub/i386/tsc.h \ - @COND_i386_xen_pvh_TRUE@ $(top_srcdir)/include/grub/terminfo.h \ -@@ -7834,14 +7824,14 @@ TESTS = - @COND_i386_xen_pvh_TRUE@ $(top_srcdir)/include/grub/lib/arg.h \ - @COND_i386_xen_pvh_TRUE@ $(top_srcdir)/include/grub/xen.h \ - @COND_i386_xen_pvh_TRUE@ $(top_srcdir)/include/grub/i386/xen/hypercall.h --@COND_i386_efi_TRUE@am__append_5805 = $(top_builddir)/include/grub/machine/kernel.h \ -+@COND_i386_efi_TRUE@am__append_5798 = $(top_builddir)/include/grub/machine/kernel.h \ - @COND_i386_efi_TRUE@ $(top_srcdir)/include/grub/efi/efi.h \ - @COND_i386_efi_TRUE@ $(top_srcdir)/include/grub/efi/disk.h \ - @COND_i386_efi_TRUE@ $(top_srcdir)/include/grub/i386/tsc.h \ - @COND_i386_efi_TRUE@ $(top_srcdir)/include/grub/acpi.h \ - @COND_i386_efi_TRUE@ $(top_srcdir)/include/grub/pci.h \ - @COND_i386_efi_TRUE@ $(top_srcdir)/include/grub/i386/pmtimer.h --@COND_i386_coreboot_TRUE@am__append_5806 = $(top_builddir)/include/grub/machine/kernel.h \ -+@COND_i386_coreboot_TRUE@am__append_5799 = $(top_builddir)/include/grub/machine/kernel.h \ - @COND_i386_coreboot_TRUE@ $(top_srcdir)/include/grub/i386/tsc.h \ - @COND_i386_coreboot_TRUE@ $(top_srcdir)/include/grub/coreboot/lbio.h \ - @COND_i386_coreboot_TRUE@ $(top_srcdir)/include/grub/video.h \ -@@ -7850,56 +7840,56 @@ TESTS = - @COND_i386_coreboot_TRUE@ $(top_srcdir)/include/grub/font.h \ - @COND_i386_coreboot_TRUE@ $(top_srcdir)/include/grub/bufio.h \ - @COND_i386_coreboot_TRUE@ $(top_srcdir)/include/grub/acpi.h --@COND_i386_multiboot_TRUE@am__append_5807 = $(top_builddir)/include/grub/machine/kernel.h \ -+@COND_i386_multiboot_TRUE@am__append_5800 = $(top_builddir)/include/grub/machine/kernel.h \ - @COND_i386_multiboot_TRUE@ $(top_srcdir)/include/grub/i386/tsc.h \ - @COND_i386_multiboot_TRUE@ $(top_srcdir)/include/grub/acpi.h --@COND_i386_qemu_TRUE@am__append_5808 = \ -+@COND_i386_qemu_TRUE@am__append_5801 = \ - @COND_i386_qemu_TRUE@ $(top_srcdir)/include/grub/pci.h \ - @COND_i386_qemu_TRUE@ $(top_srcdir)/include/grub/i386/tsc.h --@COND_i386_ieee1275_TRUE@am__append_5809 = $(top_builddir)/include/grub/machine/kernel.h \ -+@COND_i386_ieee1275_TRUE@am__append_5802 = $(top_builddir)/include/grub/machine/kernel.h \ - @COND_i386_ieee1275_TRUE@ $(top_srcdir)/include/grub/ieee1275/ieee1275.h \ - @COND_i386_ieee1275_TRUE@ $(top_srcdir)/include/grub/terminfo.h \ - @COND_i386_ieee1275_TRUE@ $(top_srcdir)/include/grub/extcmd.h \ - @COND_i386_ieee1275_TRUE@ $(top_srcdir)/include/grub/lib/arg.h \ - @COND_i386_ieee1275_TRUE@ $(top_srcdir)/include/grub/i386/tsc.h --@COND_i386_xen_TRUE@am__append_5810 = $(top_builddir)/include/grub/machine/kernel.h \ -+@COND_i386_xen_TRUE@am__append_5803 = $(top_builddir)/include/grub/machine/kernel.h \ - @COND_i386_xen_TRUE@ $(top_srcdir)/include/grub/xen.h \ - @COND_i386_xen_TRUE@ $(top_srcdir)/include/grub/i386/xen/hypercall.h \ - @COND_i386_xen_TRUE@ $(top_srcdir)/include/grub/terminfo.h \ - @COND_i386_xen_TRUE@ $(top_srcdir)/include/grub/extcmd.h \ - @COND_i386_xen_TRUE@ $(top_srcdir)/include/grub/lib/arg.h \ - @COND_i386_xen_TRUE@ $(top_srcdir)/include/grub/loader.h --@COND_x86_64_xen_TRUE@am__append_5811 = \ -+@COND_x86_64_xen_TRUE@am__append_5804 = \ - @COND_x86_64_xen_TRUE@ $(top_srcdir)/include/grub/xen.h \ - @COND_x86_64_xen_TRUE@ $(top_srcdir)/include/grub/x86_64/xen/hypercall.h \ - @COND_x86_64_xen_TRUE@ $(top_srcdir)/include/grub/terminfo.h \ - @COND_x86_64_xen_TRUE@ $(top_srcdir)/include/grub/extcmd.h \ - @COND_x86_64_xen_TRUE@ $(top_srcdir)/include/grub/lib/arg.h \ - @COND_x86_64_xen_TRUE@ $(top_srcdir)/include/grub/loader.h --@COND_x86_64_efi_TRUE@am__append_5812 = $(top_builddir)/include/grub/machine/kernel.h \ -+@COND_x86_64_efi_TRUE@am__append_5805 = $(top_builddir)/include/grub/machine/kernel.h \ - @COND_x86_64_efi_TRUE@ $(top_srcdir)/include/grub/efi/efi.h \ - @COND_x86_64_efi_TRUE@ $(top_srcdir)/include/grub/efi/disk.h \ - @COND_x86_64_efi_TRUE@ $(top_srcdir)/include/grub/i386/tsc.h \ - @COND_x86_64_efi_TRUE@ $(top_srcdir)/include/grub/pci.h \ - @COND_x86_64_efi_TRUE@ $(top_srcdir)/include/grub/acpi.h \ - @COND_x86_64_efi_TRUE@ $(top_srcdir)/include/grub/i386/pmtimer.h --@COND_ia64_efi_TRUE@am__append_5813 = \ -+@COND_ia64_efi_TRUE@am__append_5806 = \ - @COND_ia64_efi_TRUE@ $(top_srcdir)/include/grub/efi/efi.h \ - @COND_ia64_efi_TRUE@ $(top_srcdir)/include/grub/efi/disk.h \ - @COND_ia64_efi_TRUE@ $(top_srcdir)/include/grub/acpi.h --@COND_mips_TRUE@am__append_5814 = $(top_builddir)/include/grub/cpu/kernel.h --@COND_mips_arc_TRUE@am__append_5815 = \ -+@COND_mips_TRUE@am__append_5807 = $(top_builddir)/include/grub/cpu/kernel.h -+@COND_mips_arc_TRUE@am__append_5808 = \ - @COND_mips_arc_TRUE@ $(top_srcdir)/include/grub/extcmd.h \ - @COND_mips_arc_TRUE@ $(top_srcdir)/include/grub/arc/arc.h \ - @COND_mips_arc_TRUE@ $(top_srcdir)/include/grub/terminfo.h --@COND_mips_qemu_mips_TRUE@am__append_5816 = $(top_builddir)/include/grub/keyboard_layouts.h \ -+@COND_mips_qemu_mips_TRUE@am__append_5809 = $(top_builddir)/include/grub/keyboard_layouts.h \ - @COND_mips_qemu_mips_TRUE@ $(top_builddir)/include/grub/machine/kernel.h \ - @COND_mips_qemu_mips_TRUE@ $(top_srcdir)/include/grub/serial.h \ - @COND_mips_qemu_mips_TRUE@ $(top_srcdir)/include/grub/loader.h \ - @COND_mips_qemu_mips_TRUE@ $(top_srcdir)/include/grub/terminfo.h \ - @COND_mips_qemu_mips_TRUE@ $(top_srcdir)/include/grub/extcmd.h \ - @COND_mips_qemu_mips_TRUE@ $(top_srcdir)/include/grub/lib/arg.h --@COND_mips_loongson_TRUE@am__append_5817 = $(top_builddir)/include/grub/keyboard_layouts.h \ -+@COND_mips_loongson_TRUE@am__append_5810 = $(top_builddir)/include/grub/keyboard_layouts.h \ - @COND_mips_loongson_TRUE@ $(top_builddir)/include/grub/machine/kernel.h \ - @COND_mips_loongson_TRUE@ $(top_builddir)/include/grub/machine/time.h \ - @COND_mips_loongson_TRUE@ $(top_srcdir)/include/grub/video.h \ -@@ -7915,24 +7905,24 @@ TESTS = - @COND_mips_loongson_TRUE@ $(top_srcdir)/include/grub/terminfo.h \ - @COND_mips_loongson_TRUE@ $(top_srcdir)/include/grub/extcmd.h \ - @COND_mips_loongson_TRUE@ $(top_srcdir)/include/grub/lib/arg.h --@COND_mips_qemu_mips_TRUE@am__append_5818 = $(top_builddir)/include/grub/machine/memory.h \ -+@COND_mips_qemu_mips_TRUE@am__append_5811 = $(top_builddir)/include/grub/machine/memory.h \ - @COND_mips_qemu_mips_TRUE@ $(top_builddir)/include/grub/machine/kernel.h --@COND_powerpc_ieee1275_TRUE@am__append_5819 = $(top_srcdir)/include/grub/ieee1275/ieee1275.h \ -+@COND_powerpc_ieee1275_TRUE@am__append_5812 = $(top_srcdir)/include/grub/ieee1275/ieee1275.h \ - @COND_powerpc_ieee1275_TRUE@ $(top_srcdir)/include/grub/terminfo.h \ - @COND_powerpc_ieee1275_TRUE@ $(top_srcdir)/include/grub/extcmd.h \ - @COND_powerpc_ieee1275_TRUE@ $(top_srcdir)/include/grub/lib/arg.h --@COND_sparc64_ieee1275_TRUE@am__append_5820 = $(top_srcdir)/include/grub/ieee1275/ieee1275.h \ -+@COND_sparc64_ieee1275_TRUE@am__append_5813 = $(top_srcdir)/include/grub/ieee1275/ieee1275.h \ - @COND_sparc64_ieee1275_TRUE@ $(top_srcdir)/include/grub/sparc64/ieee1275/ieee1275.h \ - @COND_sparc64_ieee1275_TRUE@ $(top_srcdir)/include/grub/terminfo.h \ - @COND_sparc64_ieee1275_TRUE@ $(top_srcdir)/include/grub/extcmd.h \ - @COND_sparc64_ieee1275_TRUE@ $(top_srcdir)/include/grub/lib/arg.h --@COND_arm_uboot_TRUE@am__append_5821 = \ -+@COND_arm_uboot_TRUE@am__append_5814 = \ - @COND_arm_uboot_TRUE@ $(top_srcdir)/include/grub/uboot/uboot.h \ - @COND_arm_uboot_TRUE@ $(top_srcdir)/include/grub/uboot/disk.h \ - @COND_arm_uboot_TRUE@ $(top_srcdir)/include/grub/extcmd.h \ - @COND_arm_uboot_TRUE@ $(top_srcdir)/include/grub/lib/arg.h \ - @COND_arm_uboot_TRUE@ $(top_srcdir)/include/grub/arm/system.h --@COND_arm_coreboot_TRUE@am__append_5822 = $(top_builddir)/include/grub/keyboard_layouts.h \ -+@COND_arm_coreboot_TRUE@am__append_5815 = $(top_builddir)/include/grub/keyboard_layouts.h \ - @COND_arm_coreboot_TRUE@ $(top_srcdir)/include/grub/arm/system.h \ - @COND_arm_coreboot_TRUE@ $(top_srcdir)/include/grub/video.h \ - @COND_arm_coreboot_TRUE@ $(top_srcdir)/include/grub/video_fb.h \ -@@ -7943,35 +7933,35 @@ TESTS = - @COND_arm_coreboot_TRUE@ $(top_srcdir)/include/grub/dma.h \ - @COND_arm_coreboot_TRUE@ $(top_srcdir)/include/grub/arm/coreboot/kernel.h \ - @COND_arm_coreboot_TRUE@ $(top_srcdir)/include/grub/fdtbus.h --@COND_arm_efi_TRUE@am__append_5823 = \ -+@COND_arm_efi_TRUE@am__append_5816 = \ - @COND_arm_efi_TRUE@ $(top_srcdir)/include/grub/efi/efi.h \ - @COND_arm_efi_TRUE@ $(top_srcdir)/include/grub/efi/disk.h \ - @COND_arm_efi_TRUE@ $(top_srcdir)/include/grub/arm/system.h \ - @COND_arm_efi_TRUE@ $(top_srcdir)/include/grub/acpi.h --@COND_arm64_efi_TRUE@am__append_5824 = \ -+@COND_arm64_efi_TRUE@am__append_5817 = \ - @COND_arm64_efi_TRUE@ $(top_srcdir)/include/grub/efi/efi.h \ - @COND_arm64_efi_TRUE@ $(top_srcdir)/include/grub/efi/disk.h \ - @COND_arm64_efi_TRUE@ $(top_srcdir)/include/grub/acpi.h --@COND_riscv32_efi_TRUE@am__append_5825 = \ -+@COND_riscv32_efi_TRUE@am__append_5818 = \ - @COND_riscv32_efi_TRUE@ $(top_srcdir)/include/grub/efi/efi.h \ - @COND_riscv32_efi_TRUE@ $(top_srcdir)/include/grub/efi/disk.h \ - @COND_riscv32_efi_TRUE@ $(top_srcdir)/include/grub/acpi.h --@COND_riscv64_efi_TRUE@am__append_5826 = \ -+@COND_riscv64_efi_TRUE@am__append_5819 = \ - @COND_riscv64_efi_TRUE@ $(top_srcdir)/include/grub/efi/efi.h \ - @COND_riscv64_efi_TRUE@ $(top_srcdir)/include/grub/efi/disk.h \ - @COND_riscv64_efi_TRUE@ $(top_srcdir)/include/grub/acpi.h --@COND_emu_TRUE@am__append_5827 = \ -+@COND_emu_TRUE@am__append_5820 = \ - @COND_emu_TRUE@ $(top_srcdir)/include/grub/datetime.h \ - @COND_emu_TRUE@ $(top_srcdir)/include/grub/emu/misc.h \ - @COND_emu_TRUE@ $(top_srcdir)/include/grub/emu/net.h \ - @COND_emu_TRUE@ $(top_srcdir)/include/grub/emu/hostdisk.h \ - @COND_emu_TRUE@ $(top_srcdir)/include/grub/emu/hostfile.h \ - @COND_emu_TRUE@ $(top_srcdir)/include/grub/extcmd.h --@COND_GRUB_EMU_SDL_TRUE@@COND_emu_TRUE@am__append_5828 = $(top_srcdir)/include/grub/sdl.h --@COND_GRUB_EMU_PCI_TRUE@@COND_emu_TRUE@am__append_5829 = $(top_srcdir)/include/grub/libpciaccess.h --@COND_emu_TRUE@am__append_5830 = grub_emu_init.h grub_emu_init.c --@COND_ENABLE_EFIEMU_TRUE@am__append_5831 = efiemu32.o efiemu64.o --@COND_ENABLE_EFIEMU_TRUE@am__append_5832 = efiemu32.o efiemu64.o efiemu64_c.o efiemu64_s.o -+@COND_GRUB_EMU_SDL_TRUE@@COND_emu_TRUE@am__append_5821 = $(top_srcdir)/include/grub/sdl.h -+@COND_GRUB_EMU_PCI_TRUE@@COND_emu_TRUE@am__append_5822 = $(top_srcdir)/include/grub/libpciaccess.h -+@COND_emu_TRUE@am__append_5823 = grub_emu_init.h grub_emu_init.c -+@COND_ENABLE_EFIEMU_TRUE@am__append_5824 = efiemu32.o efiemu64.o -+@COND_ENABLE_EFIEMU_TRUE@am__append_5825 = efiemu32.o efiemu64.o efiemu64_c.o efiemu64_s.o - subdir = grub-core - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ -@@ -8380,591 +8370,590 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(platformdir)" \ - @COND_arm_coreboot_TRUE@am__EXEEXT_290 = reboot.module$(EXEEXT) - @COND_riscv32_efi_TRUE@am__EXEEXT_291 = reboot.module$(EXEEXT) - @COND_riscv64_efi_TRUE@am__EXEEXT_292 = reboot.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_293 = shim_lock.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_294 = hdparm.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_295 = hdparm.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_296 = hdparm.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_297 = hdparm.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_298 = hdparm.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_299 = hdparm.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_300 = hdparm.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__EXEEXT_301 = hdparm.module$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__EXEEXT_302 = hdparm.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_303 = loadbios.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_304 = loadbios.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_305 = lspci.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_306 = lspci.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_307 = lspci.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_308 = lspci.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_309 = lspci.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_310 = lspci.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_311 = lspci.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__EXEEXT_312 = lspci.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_313 = play.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_314 = play.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_315 = play.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_316 = play.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_317 = play.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_318 = play.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_319 = play.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_320 = spkmodem.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_321 = spkmodem.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_322 = spkmodem.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_323 = spkmodem.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_324 = spkmodem.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_325 = spkmodem.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_326 = spkmodem.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_327 = morse.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_328 = morse.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_329 = morse.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_330 = morse.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_331 = morse.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_332 = morse.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_333 = morse.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_334 = setpci.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_335 = setpci.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_336 = setpci.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_337 = setpci.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_338 = setpci.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_339 = setpci.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_340 = setpci.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__EXEEXT_341 = setpci.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_342 = pcidump.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_343 = pcidump.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_344 = pcidump.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_345 = pcidump.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_346 = pcidump.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_347 = pcidump.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_348 = pcidump.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__EXEEXT_349 = pcidump.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_350 = suspend.module$(EXEEXT) --@COND_powerpc_ieee1275_TRUE@am__EXEEXT_351 = suspend.module$(EXEEXT) \ -+@COND_i386_pc_TRUE@am__EXEEXT_293 = hdparm.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_294 = hdparm.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_295 = hdparm.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_296 = hdparm.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_297 = hdparm.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_298 = hdparm.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_299 = hdparm.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__EXEEXT_300 = hdparm.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__EXEEXT_301 = hdparm.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_302 = loadbios.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_303 = loadbios.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_304 = lspci.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_305 = lspci.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_306 = lspci.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_307 = lspci.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_308 = lspci.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_309 = lspci.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_310 = lspci.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__EXEEXT_311 = lspci.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_312 = play.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_313 = play.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_314 = play.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_315 = play.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_316 = play.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_317 = play.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_318 = play.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_319 = spkmodem.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_320 = spkmodem.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_321 = spkmodem.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_322 = spkmodem.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_323 = spkmodem.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_324 = spkmodem.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_325 = spkmodem.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_326 = morse.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_327 = morse.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_328 = morse.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_329 = morse.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_330 = morse.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_331 = morse.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_332 = morse.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_333 = setpci.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_334 = setpci.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_335 = setpci.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_336 = setpci.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_337 = setpci.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_338 = setpci.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_339 = setpci.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__EXEEXT_340 = setpci.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_341 = pcidump.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_342 = pcidump.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_343 = pcidump.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_344 = pcidump.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_345 = pcidump.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_346 = pcidump.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_347 = pcidump.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__EXEEXT_348 = pcidump.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_349 = suspend.module$(EXEEXT) -+@COND_powerpc_ieee1275_TRUE@am__EXEEXT_350 = suspend.module$(EXEEXT) \ - @COND_powerpc_ieee1275_TRUE@ escc.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_352 = usbtest.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_353 = usbtest.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_354 = usbtest.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_355 = usbtest.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_356 = usbtest.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_357 = usbtest.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_358 = usbtest.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__EXEEXT_359 = usbtest.module$(EXEEXT) --@COND_arm_coreboot_TRUE@am__EXEEXT_360 = usbtest.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_361 = ata.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_362 = ata.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_363 = ata.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_364 = ata.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_365 = ata.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_366 = ata.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_367 = ata.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__EXEEXT_368 = ata.module$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__EXEEXT_369 = ata.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_370 = ahci.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_371 = ahci.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_372 = ahci.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_373 = ahci.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_374 = ahci.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_375 = ahci.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_376 = ahci.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__EXEEXT_377 = ahci.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_378 = pata.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_379 = pata.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_380 = pata.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_381 = pata.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_382 = pata.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_383 = pata.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_384 = pata.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__EXEEXT_385 = pata.module$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__EXEEXT_386 = pata.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_387 = biosdisk.module$(EXEEXT) \ -+@COND_i386_pc_TRUE@am__EXEEXT_351 = usbtest.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_352 = usbtest.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_353 = usbtest.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_354 = usbtest.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_355 = usbtest.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_356 = usbtest.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_357 = usbtest.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__EXEEXT_358 = usbtest.module$(EXEEXT) -+@COND_arm_coreboot_TRUE@am__EXEEXT_359 = usbtest.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_360 = ata.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_361 = ata.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_362 = ata.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_363 = ata.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_364 = ata.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_365 = ata.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_366 = ata.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__EXEEXT_367 = ata.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__EXEEXT_368 = ata.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_369 = ahci.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_370 = ahci.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_371 = ahci.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_372 = ahci.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_373 = ahci.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_374 = ahci.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_375 = ahci.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__EXEEXT_376 = ahci.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_377 = pata.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_378 = pata.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_379 = pata.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_380 = pata.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_381 = pata.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_382 = pata.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_383 = pata.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__EXEEXT_384 = pata.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__EXEEXT_385 = pata.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_386 = biosdisk.module$(EXEEXT) \ - @COND_i386_pc_TRUE@ usbms.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_388 = usbms.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_389 = usbms.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_390 = usbms.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_391 = usbms.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_392 = usbms.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_393 = usbms.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__EXEEXT_394 = usbms.module$(EXEEXT) --@COND_arm_coreboot_TRUE@am__EXEEXT_395 = usbms.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_396 = nand.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_397 = efiemu.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_398 = efiemu.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_399 = efiemu.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_400 = efiemu.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_401 = efiemu.module$(EXEEXT) --@COND_emu_TRUE@am__EXEEXT_402 = font.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_403 = font.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_404 = font.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_405 = font.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_406 = font.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_407 = font.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_408 = font.module$(EXEEXT) --@COND_i386_xen_TRUE@am__EXEEXT_409 = font.module$(EXEEXT) --@COND_x86_64_xen_TRUE@am__EXEEXT_410 = font.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__EXEEXT_411 = font.module$(EXEEXT) --@COND_sparc64_ieee1275_TRUE@am__EXEEXT_412 = font.module$(EXEEXT) --@COND_powerpc_ieee1275_TRUE@am__EXEEXT_413 = font.module$(EXEEXT) --@COND_mips_arc_TRUE@am__EXEEXT_414 = font.module$(EXEEXT) --@COND_ia64_efi_TRUE@am__EXEEXT_415 = font.module$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__EXEEXT_416 = font.module$(EXEEXT) --@COND_arm_uboot_TRUE@am__EXEEXT_417 = font.module$(EXEEXT) --@COND_arm_efi_TRUE@am__EXEEXT_418 = font.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__EXEEXT_419 = font.module$(EXEEXT) --@COND_riscv32_efi_TRUE@am__EXEEXT_420 = font.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__EXEEXT_421 = font.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_422 = pxe.module$(EXEEXT) --@COND_emu_TRUE@am__EXEEXT_423 = bufio.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_424 = bufio.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_425 = bufio.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_426 = bufio.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_427 = bufio.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_428 = bufio.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_429 = bufio.module$(EXEEXT) --@COND_i386_xen_TRUE@am__EXEEXT_430 = bufio.module$(EXEEXT) --@COND_x86_64_xen_TRUE@am__EXEEXT_431 = bufio.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__EXEEXT_432 = bufio.module$(EXEEXT) --@COND_sparc64_ieee1275_TRUE@am__EXEEXT_433 = bufio.module$(EXEEXT) --@COND_powerpc_ieee1275_TRUE@am__EXEEXT_434 = bufio.module$(EXEEXT) --@COND_mips_arc_TRUE@am__EXEEXT_435 = bufio.module$(EXEEXT) --@COND_ia64_efi_TRUE@am__EXEEXT_436 = bufio.module$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__EXEEXT_437 = bufio.module$(EXEEXT) --@COND_arm_uboot_TRUE@am__EXEEXT_438 = bufio.module$(EXEEXT) --@COND_arm_efi_TRUE@am__EXEEXT_439 = bufio.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__EXEEXT_440 = bufio.module$(EXEEXT) --@COND_riscv32_efi_TRUE@am__EXEEXT_441 = bufio.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__EXEEXT_442 = bufio.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_443 = relocator.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_444 = relocator.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_445 = relocator.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_446 = relocator.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_447 = relocator.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_448 = relocator.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_449 = relocator.module$(EXEEXT) --@COND_i386_xen_TRUE@am__EXEEXT_450 = relocator.module$(EXEEXT) --@COND_x86_64_xen_TRUE@am__EXEEXT_451 = relocator.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__EXEEXT_452 = relocator.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__EXEEXT_453 = relocator.module$(EXEEXT) --@COND_powerpc_ieee1275_TRUE@am__EXEEXT_454 = \ -+@COND_i386_efi_TRUE@am__EXEEXT_387 = usbms.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_388 = usbms.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_389 = usbms.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_390 = usbms.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_391 = usbms.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_392 = usbms.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__EXEEXT_393 = usbms.module$(EXEEXT) -+@COND_arm_coreboot_TRUE@am__EXEEXT_394 = usbms.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_395 = nand.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_396 = efiemu.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_397 = efiemu.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_398 = efiemu.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_399 = efiemu.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_400 = efiemu.module$(EXEEXT) -+@COND_emu_TRUE@am__EXEEXT_401 = font.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_402 = font.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_403 = font.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_404 = font.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_405 = font.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_406 = font.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_407 = font.module$(EXEEXT) -+@COND_i386_xen_TRUE@am__EXEEXT_408 = font.module$(EXEEXT) -+@COND_x86_64_xen_TRUE@am__EXEEXT_409 = font.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__EXEEXT_410 = font.module$(EXEEXT) -+@COND_sparc64_ieee1275_TRUE@am__EXEEXT_411 = font.module$(EXEEXT) -+@COND_powerpc_ieee1275_TRUE@am__EXEEXT_412 = font.module$(EXEEXT) -+@COND_mips_arc_TRUE@am__EXEEXT_413 = font.module$(EXEEXT) -+@COND_ia64_efi_TRUE@am__EXEEXT_414 = font.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__EXEEXT_415 = font.module$(EXEEXT) -+@COND_arm_uboot_TRUE@am__EXEEXT_416 = font.module$(EXEEXT) -+@COND_arm_efi_TRUE@am__EXEEXT_417 = font.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__EXEEXT_418 = font.module$(EXEEXT) -+@COND_riscv32_efi_TRUE@am__EXEEXT_419 = font.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__EXEEXT_420 = font.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_421 = pxe.module$(EXEEXT) -+@COND_emu_TRUE@am__EXEEXT_422 = bufio.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_423 = bufio.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_424 = bufio.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_425 = bufio.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_426 = bufio.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_427 = bufio.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_428 = bufio.module$(EXEEXT) -+@COND_i386_xen_TRUE@am__EXEEXT_429 = bufio.module$(EXEEXT) -+@COND_x86_64_xen_TRUE@am__EXEEXT_430 = bufio.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__EXEEXT_431 = bufio.module$(EXEEXT) -+@COND_sparc64_ieee1275_TRUE@am__EXEEXT_432 = bufio.module$(EXEEXT) -+@COND_powerpc_ieee1275_TRUE@am__EXEEXT_433 = bufio.module$(EXEEXT) -+@COND_mips_arc_TRUE@am__EXEEXT_434 = bufio.module$(EXEEXT) -+@COND_ia64_efi_TRUE@am__EXEEXT_435 = bufio.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__EXEEXT_436 = bufio.module$(EXEEXT) -+@COND_arm_uboot_TRUE@am__EXEEXT_437 = bufio.module$(EXEEXT) -+@COND_arm_efi_TRUE@am__EXEEXT_438 = bufio.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__EXEEXT_439 = bufio.module$(EXEEXT) -+@COND_riscv32_efi_TRUE@am__EXEEXT_440 = bufio.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__EXEEXT_441 = bufio.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_442 = relocator.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_443 = relocator.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_444 = relocator.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_445 = relocator.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_446 = relocator.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_447 = relocator.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_448 = relocator.module$(EXEEXT) -+@COND_i386_xen_TRUE@am__EXEEXT_449 = relocator.module$(EXEEXT) -+@COND_x86_64_xen_TRUE@am__EXEEXT_450 = relocator.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__EXEEXT_451 = relocator.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__EXEEXT_452 = relocator.module$(EXEEXT) -+@COND_powerpc_ieee1275_TRUE@am__EXEEXT_453 = \ - @COND_powerpc_ieee1275_TRUE@ relocator.module$(EXEEXT) --@COND_mips_arc_TRUE@am__EXEEXT_455 = relocator.module$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__EXEEXT_456 = relocator.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_457 = datetime.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_458 = datetime.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_459 = datetime.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_460 = datetime.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_461 = datetime.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_462 = datetime.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_463 = datetime.module$(EXEEXT) --@COND_i386_xen_TRUE@am__EXEEXT_464 = datetime.module$(EXEEXT) --@COND_x86_64_xen_TRUE@am__EXEEXT_465 = datetime.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__EXEEXT_466 = datetime.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__EXEEXT_467 = datetime.module$(EXEEXT) --@COND_sparc64_ieee1275_TRUE@am__EXEEXT_468 = datetime.module$(EXEEXT) --@COND_powerpc_ieee1275_TRUE@am__EXEEXT_469 = datetime.module$(EXEEXT) --@COND_mips_arc_TRUE@am__EXEEXT_470 = datetime.module$(EXEEXT) --@COND_ia64_efi_TRUE@am__EXEEXT_471 = datetime.module$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__EXEEXT_472 = datetime.module$(EXEEXT) --@COND_arm_uboot_TRUE@am__EXEEXT_473 = datetime.module$(EXEEXT) --@COND_arm_efi_TRUE@am__EXEEXT_474 = datetime.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__EXEEXT_475 = datetime.module$(EXEEXT) --@COND_arm_coreboot_TRUE@am__EXEEXT_476 = datetime.module$(EXEEXT) --@COND_riscv32_efi_TRUE@am__EXEEXT_477 = datetime.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__EXEEXT_478 = datetime.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_479 = aout.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_480 = aout.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_481 = aout.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_482 = aout.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_483 = aout.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_484 = aout.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_485 = aout.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_486 = bsd.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_487 = bsd.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_488 = bsd.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_489 = bsd.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_490 = bsd.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_491 = bsd.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_492 = bsd.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_493 = plan9.module$(EXEEXT) \ -+@COND_mips_arc_TRUE@am__EXEEXT_454 = relocator.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__EXEEXT_455 = relocator.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_456 = datetime.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_457 = datetime.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_458 = datetime.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_459 = datetime.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_460 = datetime.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_461 = datetime.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_462 = datetime.module$(EXEEXT) -+@COND_i386_xen_TRUE@am__EXEEXT_463 = datetime.module$(EXEEXT) -+@COND_x86_64_xen_TRUE@am__EXEEXT_464 = datetime.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__EXEEXT_465 = datetime.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__EXEEXT_466 = datetime.module$(EXEEXT) -+@COND_sparc64_ieee1275_TRUE@am__EXEEXT_467 = datetime.module$(EXEEXT) -+@COND_powerpc_ieee1275_TRUE@am__EXEEXT_468 = datetime.module$(EXEEXT) -+@COND_mips_arc_TRUE@am__EXEEXT_469 = datetime.module$(EXEEXT) -+@COND_ia64_efi_TRUE@am__EXEEXT_470 = datetime.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__EXEEXT_471 = datetime.module$(EXEEXT) -+@COND_arm_uboot_TRUE@am__EXEEXT_472 = datetime.module$(EXEEXT) -+@COND_arm_efi_TRUE@am__EXEEXT_473 = datetime.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__EXEEXT_474 = datetime.module$(EXEEXT) -+@COND_arm_coreboot_TRUE@am__EXEEXT_475 = datetime.module$(EXEEXT) -+@COND_riscv32_efi_TRUE@am__EXEEXT_476 = datetime.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__EXEEXT_477 = datetime.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_478 = aout.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_479 = aout.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_480 = aout.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_481 = aout.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_482 = aout.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_483 = aout.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_484 = aout.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_485 = bsd.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_486 = bsd.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_487 = bsd.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_488 = bsd.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_489 = bsd.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_490 = bsd.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_491 = bsd.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_492 = plan9.module$(EXEEXT) \ - @COND_i386_pc_TRUE@ linux16.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_494 = linux16.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_495 = linux16.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_496 = linux16.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_497 = linux16.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_498 = linux16.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_499 = linux16.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_500 = ntldr.module$(EXEEXT) \ -+@COND_i386_efi_TRUE@am__EXEEXT_493 = linux16.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_494 = linux16.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_495 = linux16.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_496 = linux16.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_497 = linux16.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_498 = linux16.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_499 = ntldr.module$(EXEEXT) \ - @COND_i386_pc_TRUE@ truecrypt.module$(EXEEXT) \ - @COND_i386_pc_TRUE@ freedos.module$(EXEEXT) \ - @COND_i386_pc_TRUE@ pxechain.module$(EXEEXT) \ - @COND_i386_pc_TRUE@ multiboot2.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_501 = multiboot2.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_502 = multiboot2.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_503 = multiboot2.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_504 = multiboot2.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_505 = multiboot2.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_506 = multiboot2.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__EXEEXT_507 = multiboot2.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__EXEEXT_508 = multiboot2.module$(EXEEXT) --@COND_mips_arc_TRUE@am__EXEEXT_509 = multiboot2.module$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__EXEEXT_510 = multiboot2.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_511 = multiboot.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_512 = multiboot.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_513 = multiboot.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_514 = multiboot.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_515 = multiboot.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_516 = multiboot.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_517 = multiboot.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__EXEEXT_518 = multiboot.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__EXEEXT_519 = xen_boot.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_520 = linux.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_521 = linux.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_522 = linux.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_523 = linux.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_524 = linux.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_525 = linux.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_526 = linux.module$(EXEEXT) --@COND_i386_xen_TRUE@am__EXEEXT_527 = linux.module$(EXEEXT) --@COND_x86_64_xen_TRUE@am__EXEEXT_528 = linux.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__EXEEXT_529 = linux.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__EXEEXT_530 = linux.module$(EXEEXT) --@COND_sparc64_ieee1275_TRUE@am__EXEEXT_531 = linux.module$(EXEEXT) --@COND_powerpc_ieee1275_TRUE@am__EXEEXT_532 = linux.module$(EXEEXT) --@COND_mips_arc_TRUE@am__EXEEXT_533 = linux.module$(EXEEXT) --@COND_ia64_efi_TRUE@am__EXEEXT_534 = linux.module$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__EXEEXT_535 = linux.module$(EXEEXT) --@COND_arm_uboot_TRUE@am__EXEEXT_536 = linux.module$(EXEEXT) --@COND_arm_efi_TRUE@am__EXEEXT_537 = linux.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__EXEEXT_538 = linux.module$(EXEEXT) --@COND_arm_coreboot_TRUE@am__EXEEXT_539 = linux.module$(EXEEXT) --@COND_riscv32_efi_TRUE@am__EXEEXT_540 = linux.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__EXEEXT_541 = linux.module$(EXEEXT) --@COND_arm_uboot_TRUE@am__EXEEXT_542 = fdt.module$(EXEEXT) --@COND_arm_efi_TRUE@am__EXEEXT_543 = fdt.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__EXEEXT_544 = fdt.module$(EXEEXT) --@COND_riscv32_efi_TRUE@am__EXEEXT_545 = fdt.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__EXEEXT_546 = fdt.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_547 = xnu.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_548 = xnu.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_549 = xnu.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_550 = xnu.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_551 = xnu.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_552 = random.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_553 = random.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_554 = random.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_555 = random.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_556 = random.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_557 = appleldr.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_558 = appleldr.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_559 = chain.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_560 = chain.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_561 = chain.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_562 = chain.module$(EXEEXT) --@COND_ia64_efi_TRUE@am__EXEEXT_563 = chain.module$(EXEEXT) --@COND_arm_efi_TRUE@am__EXEEXT_564 = chain.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__EXEEXT_565 = chain.module$(EXEEXT) --@COND_riscv32_efi_TRUE@am__EXEEXT_566 = chain.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__EXEEXT_567 = chain.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_568 = mmap.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_569 = mmap.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_570 = mmap.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_571 = mmap.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_572 = mmap.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_573 = mmap.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_574 = mmap.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__EXEEXT_575 = mmap.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__EXEEXT_576 = mmap.module$(EXEEXT) --@COND_mips_arc_TRUE@am__EXEEXT_577 = mmap.module$(EXEEXT) --@COND_ia64_efi_TRUE@am__EXEEXT_578 = mmap.module$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__EXEEXT_579 = mmap.module$(EXEEXT) --@COND_arm_efi_TRUE@am__EXEEXT_580 = mmap.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__EXEEXT_581 = mmap.module$(EXEEXT) --@COND_riscv32_efi_TRUE@am__EXEEXT_582 = mmap.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__EXEEXT_583 = mmap.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_584 = at_keyboard.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_585 = at_keyboard.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_586 = at_keyboard.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_587 = at_keyboard.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_588 = \ -+@COND_i386_efi_TRUE@am__EXEEXT_500 = multiboot2.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_501 = multiboot2.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_502 = multiboot2.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_503 = multiboot2.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_504 = multiboot2.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_505 = multiboot2.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__EXEEXT_506 = multiboot2.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__EXEEXT_507 = multiboot2.module$(EXEEXT) -+@COND_mips_arc_TRUE@am__EXEEXT_508 = multiboot2.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__EXEEXT_509 = multiboot2.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_510 = multiboot.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_511 = multiboot.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_512 = multiboot.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_513 = multiboot.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_514 = multiboot.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_515 = multiboot.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_516 = multiboot.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__EXEEXT_517 = multiboot.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__EXEEXT_518 = xen_boot.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_519 = linux.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_520 = linux.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_521 = linux.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_522 = linux.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_523 = linux.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_524 = linux.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_525 = linux.module$(EXEEXT) -+@COND_i386_xen_TRUE@am__EXEEXT_526 = linux.module$(EXEEXT) -+@COND_x86_64_xen_TRUE@am__EXEEXT_527 = linux.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__EXEEXT_528 = linux.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__EXEEXT_529 = linux.module$(EXEEXT) -+@COND_sparc64_ieee1275_TRUE@am__EXEEXT_530 = linux.module$(EXEEXT) -+@COND_powerpc_ieee1275_TRUE@am__EXEEXT_531 = linux.module$(EXEEXT) -+@COND_mips_arc_TRUE@am__EXEEXT_532 = linux.module$(EXEEXT) -+@COND_ia64_efi_TRUE@am__EXEEXT_533 = linux.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__EXEEXT_534 = linux.module$(EXEEXT) -+@COND_arm_uboot_TRUE@am__EXEEXT_535 = linux.module$(EXEEXT) -+@COND_arm_efi_TRUE@am__EXEEXT_536 = linux.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__EXEEXT_537 = linux.module$(EXEEXT) -+@COND_arm_coreboot_TRUE@am__EXEEXT_538 = linux.module$(EXEEXT) -+@COND_riscv32_efi_TRUE@am__EXEEXT_539 = linux.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__EXEEXT_540 = linux.module$(EXEEXT) -+@COND_arm_uboot_TRUE@am__EXEEXT_541 = fdt.module$(EXEEXT) -+@COND_arm_efi_TRUE@am__EXEEXT_542 = fdt.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__EXEEXT_543 = fdt.module$(EXEEXT) -+@COND_riscv32_efi_TRUE@am__EXEEXT_544 = fdt.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__EXEEXT_545 = fdt.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_546 = xnu.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_547 = xnu.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_548 = xnu.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_549 = xnu.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_550 = xnu.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_551 = random.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_552 = random.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_553 = random.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_554 = random.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_555 = random.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_556 = appleldr.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_557 = appleldr.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_558 = chain.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_559 = chain.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_560 = chain.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_561 = chain.module$(EXEEXT) -+@COND_ia64_efi_TRUE@am__EXEEXT_562 = chain.module$(EXEEXT) -+@COND_arm_efi_TRUE@am__EXEEXT_563 = chain.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__EXEEXT_564 = chain.module$(EXEEXT) -+@COND_riscv32_efi_TRUE@am__EXEEXT_565 = chain.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__EXEEXT_566 = chain.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_567 = mmap.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_568 = mmap.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_569 = mmap.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_570 = mmap.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_571 = mmap.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_572 = mmap.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_573 = mmap.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__EXEEXT_574 = mmap.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__EXEEXT_575 = mmap.module$(EXEEXT) -+@COND_mips_arc_TRUE@am__EXEEXT_576 = mmap.module$(EXEEXT) -+@COND_ia64_efi_TRUE@am__EXEEXT_577 = mmap.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__EXEEXT_578 = mmap.module$(EXEEXT) -+@COND_arm_efi_TRUE@am__EXEEXT_579 = mmap.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__EXEEXT_580 = mmap.module$(EXEEXT) -+@COND_riscv32_efi_TRUE@am__EXEEXT_581 = mmap.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__EXEEXT_582 = mmap.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_583 = at_keyboard.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_584 = at_keyboard.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_585 = at_keyboard.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_586 = at_keyboard.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_587 = \ - @COND_i386_multiboot_TRUE@ at_keyboard.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_589 = at_keyboard.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_590 = at_keyboard.module$(EXEEXT) --@COND_emu_TRUE@am__EXEEXT_591 = gfxterm.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_592 = gfxterm.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_593 = gfxterm.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_594 = gfxterm.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_595 = gfxterm.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_596 = gfxterm.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_597 = gfxterm.module$(EXEEXT) --@COND_i386_xen_TRUE@am__EXEEXT_598 = gfxterm.module$(EXEEXT) --@COND_x86_64_xen_TRUE@am__EXEEXT_599 = gfxterm.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__EXEEXT_600 = gfxterm.module$(EXEEXT) --@COND_sparc64_ieee1275_TRUE@am__EXEEXT_601 = gfxterm.module$(EXEEXT) --@COND_powerpc_ieee1275_TRUE@am__EXEEXT_602 = gfxterm.module$(EXEEXT) --@COND_mips_arc_TRUE@am__EXEEXT_603 = gfxterm.module$(EXEEXT) --@COND_ia64_efi_TRUE@am__EXEEXT_604 = gfxterm.module$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__EXEEXT_605 = gfxterm.module$(EXEEXT) --@COND_arm_uboot_TRUE@am__EXEEXT_606 = gfxterm.module$(EXEEXT) --@COND_arm_efi_TRUE@am__EXEEXT_607 = gfxterm.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__EXEEXT_608 = gfxterm.module$(EXEEXT) --@COND_riscv32_efi_TRUE@am__EXEEXT_609 = gfxterm.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__EXEEXT_610 = gfxterm.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_611 = serial.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_612 = serial.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_613 = serial.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_614 = serial.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_615 = serial.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_616 = serial.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_617 = serial.module$(EXEEXT) --@COND_sparc64_ieee1275_TRUE@am__EXEEXT_618 = serial.module$(EXEEXT) --@COND_powerpc_ieee1275_TRUE@am__EXEEXT_619 = serial.module$(EXEEXT) --@COND_mips_arc_TRUE@am__EXEEXT_620 = serial.module$(EXEEXT) --@COND_ia64_efi_TRUE@am__EXEEXT_621 = serial.module$(EXEEXT) --@COND_arm_efi_TRUE@am__EXEEXT_622 = serial.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__EXEEXT_623 = serial.module$(EXEEXT) --@COND_arm_coreboot_TRUE@am__EXEEXT_624 = serial.module$(EXEEXT) --@COND_riscv32_efi_TRUE@am__EXEEXT_625 = serial.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__EXEEXT_626 = serial.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_627 = sendkey.module$(EXEEXT) \ -+@COND_i386_ieee1275_TRUE@am__EXEEXT_588 = at_keyboard.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_589 = at_keyboard.module$(EXEEXT) -+@COND_emu_TRUE@am__EXEEXT_590 = gfxterm.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_591 = gfxterm.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_592 = gfxterm.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_593 = gfxterm.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_594 = gfxterm.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_595 = gfxterm.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_596 = gfxterm.module$(EXEEXT) -+@COND_i386_xen_TRUE@am__EXEEXT_597 = gfxterm.module$(EXEEXT) -+@COND_x86_64_xen_TRUE@am__EXEEXT_598 = gfxterm.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__EXEEXT_599 = gfxterm.module$(EXEEXT) -+@COND_sparc64_ieee1275_TRUE@am__EXEEXT_600 = gfxterm.module$(EXEEXT) -+@COND_powerpc_ieee1275_TRUE@am__EXEEXT_601 = gfxterm.module$(EXEEXT) -+@COND_mips_arc_TRUE@am__EXEEXT_602 = gfxterm.module$(EXEEXT) -+@COND_ia64_efi_TRUE@am__EXEEXT_603 = gfxterm.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__EXEEXT_604 = gfxterm.module$(EXEEXT) -+@COND_arm_uboot_TRUE@am__EXEEXT_605 = gfxterm.module$(EXEEXT) -+@COND_arm_efi_TRUE@am__EXEEXT_606 = gfxterm.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__EXEEXT_607 = gfxterm.module$(EXEEXT) -+@COND_riscv32_efi_TRUE@am__EXEEXT_608 = gfxterm.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__EXEEXT_609 = gfxterm.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_610 = serial.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_611 = serial.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_612 = serial.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_613 = serial.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_614 = serial.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_615 = serial.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_616 = serial.module$(EXEEXT) -+@COND_sparc64_ieee1275_TRUE@am__EXEEXT_617 = serial.module$(EXEEXT) -+@COND_powerpc_ieee1275_TRUE@am__EXEEXT_618 = serial.module$(EXEEXT) -+@COND_mips_arc_TRUE@am__EXEEXT_619 = serial.module$(EXEEXT) -+@COND_ia64_efi_TRUE@am__EXEEXT_620 = serial.module$(EXEEXT) -+@COND_arm_efi_TRUE@am__EXEEXT_621 = serial.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__EXEEXT_622 = serial.module$(EXEEXT) -+@COND_arm_coreboot_TRUE@am__EXEEXT_623 = serial.module$(EXEEXT) -+@COND_riscv32_efi_TRUE@am__EXEEXT_624 = serial.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__EXEEXT_625 = serial.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_626 = sendkey.module$(EXEEXT) \ - @COND_i386_pc_TRUE@ terminfo.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_628 = terminfo.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_629 = terminfo.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_630 = terminfo.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_631 = terminfo.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_632 = terminfo.module$(EXEEXT) --@COND_ia64_efi_TRUE@am__EXEEXT_633 = terminfo.module$(EXEEXT) --@COND_arm_efi_TRUE@am__EXEEXT_634 = terminfo.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__EXEEXT_635 = terminfo.module$(EXEEXT) --@COND_arm_coreboot_TRUE@am__EXEEXT_636 = terminfo.module$(EXEEXT) --@COND_riscv32_efi_TRUE@am__EXEEXT_637 = terminfo.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__EXEEXT_638 = terminfo.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_639 = usb_keyboard.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_640 = usb_keyboard.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_641 = usb_keyboard.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_642 = \ -+@COND_i386_efi_TRUE@am__EXEEXT_627 = terminfo.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_628 = terminfo.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_629 = terminfo.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_630 = terminfo.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_631 = terminfo.module$(EXEEXT) -+@COND_ia64_efi_TRUE@am__EXEEXT_632 = terminfo.module$(EXEEXT) -+@COND_arm_efi_TRUE@am__EXEEXT_633 = terminfo.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__EXEEXT_634 = terminfo.module$(EXEEXT) -+@COND_arm_coreboot_TRUE@am__EXEEXT_635 = terminfo.module$(EXEEXT) -+@COND_riscv32_efi_TRUE@am__EXEEXT_636 = terminfo.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__EXEEXT_637 = terminfo.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_638 = usb_keyboard.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_639 = usb_keyboard.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_640 = usb_keyboard.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_641 = \ - @COND_i386_coreboot_TRUE@ usb_keyboard.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_643 = \ -+@COND_i386_multiboot_TRUE@am__EXEEXT_642 = \ - @COND_i386_multiboot_TRUE@ usb_keyboard.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_644 = \ -+@COND_i386_ieee1275_TRUE@am__EXEEXT_643 = \ - @COND_i386_ieee1275_TRUE@ usb_keyboard.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_645 = usb_keyboard.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__EXEEXT_646 = \ -+@COND_x86_64_efi_TRUE@am__EXEEXT_644 = usb_keyboard.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__EXEEXT_645 = \ - @COND_mips_loongson_TRUE@ usb_keyboard.module$(EXEEXT) --@COND_arm_coreboot_TRUE@am__EXEEXT_647 = usb_keyboard.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_648 = vga.module$(EXEEXT) \ -+@COND_arm_coreboot_TRUE@am__EXEEXT_646 = usb_keyboard.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_647 = vga.module$(EXEEXT) \ - @COND_i386_pc_TRUE@ vga_text.module$(EXEEXT) \ - @COND_i386_pc_TRUE@ mda_text.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_649 = mda_text.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_650 = mda_text.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_651 = mda_text.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_652 = video_cirrus.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_653 = video_cirrus.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_654 = video_cirrus.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_655 = \ -+@COND_i386_qemu_TRUE@am__EXEEXT_648 = mda_text.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_649 = mda_text.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_650 = mda_text.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_651 = video_cirrus.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_652 = video_cirrus.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_653 = video_cirrus.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_654 = \ - @COND_i386_coreboot_TRUE@ video_cirrus.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_656 = \ -+@COND_i386_multiboot_TRUE@am__EXEEXT_655 = \ - @COND_i386_multiboot_TRUE@ video_cirrus.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_657 = \ -+@COND_i386_ieee1275_TRUE@am__EXEEXT_656 = \ - @COND_i386_ieee1275_TRUE@ video_cirrus.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_658 = video_cirrus.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_659 = video_bochs.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_660 = video_bochs.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_661 = video_bochs.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_662 = video_bochs.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_663 = \ -+@COND_x86_64_efi_TRUE@am__EXEEXT_657 = video_cirrus.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_658 = video_bochs.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_659 = video_bochs.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_660 = video_bochs.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_661 = video_bochs.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_662 = \ - @COND_i386_multiboot_TRUE@ video_bochs.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_664 = video_bochs.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_665 = video_bochs.module$(EXEEXT) --@COND_emu_TRUE@am__EXEEXT_666 = legacy_password_test.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_667 = \ -+@COND_i386_ieee1275_TRUE@am__EXEEXT_663 = video_bochs.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_664 = video_bochs.module$(EXEEXT) -+@COND_emu_TRUE@am__EXEEXT_665 = legacy_password_test.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_666 = \ - @COND_i386_pc_TRUE@ legacy_password_test.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_668 = \ -+@COND_i386_efi_TRUE@am__EXEEXT_667 = \ - @COND_i386_efi_TRUE@ legacy_password_test.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_669 = \ -+@COND_x86_64_efi_TRUE@am__EXEEXT_668 = \ - @COND_x86_64_efi_TRUE@ legacy_password_test.module$(EXEEXT) --@COND_i386_xen_TRUE@am__EXEEXT_670 = \ -+@COND_i386_xen_TRUE@am__EXEEXT_669 = \ - @COND_i386_xen_TRUE@ legacy_password_test.module$(EXEEXT) --@COND_x86_64_xen_TRUE@am__EXEEXT_671 = \ -+@COND_x86_64_xen_TRUE@am__EXEEXT_670 = \ - @COND_x86_64_xen_TRUE@ legacy_password_test.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__EXEEXT_672 = \ -+@COND_i386_xen_pvh_TRUE@am__EXEEXT_671 = \ - @COND_i386_xen_pvh_TRUE@ legacy_password_test.module$(EXEEXT) --@COND_emu_TRUE@am__EXEEXT_673 = div.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_674 = div.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_675 = div.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_676 = div.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_677 = div.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_678 = div.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_679 = div.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_680 = div.module$(EXEEXT) --@COND_i386_xen_TRUE@am__EXEEXT_681 = div.module$(EXEEXT) --@COND_x86_64_xen_TRUE@am__EXEEXT_682 = div.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__EXEEXT_683 = div.module$(EXEEXT) --@COND_mips_loongson_TRUE@am__EXEEXT_684 = div.module$(EXEEXT) --@COND_sparc64_ieee1275_TRUE@am__EXEEXT_685 = div.module$(EXEEXT) --@COND_powerpc_ieee1275_TRUE@am__EXEEXT_686 = div.module$(EXEEXT) --@COND_mips_arc_TRUE@am__EXEEXT_687 = div.module$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__EXEEXT_688 = div.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__EXEEXT_689 = div.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__EXEEXT_690 = div.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_691 = efi_gop.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_692 = efi_gop.module$(EXEEXT) --@COND_ia64_efi_TRUE@am__EXEEXT_693 = efi_gop.module$(EXEEXT) --@COND_arm_efi_TRUE@am__EXEEXT_694 = efi_gop.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__EXEEXT_695 = efi_gop.module$(EXEEXT) --@COND_riscv32_efi_TRUE@am__EXEEXT_696 = efi_gop.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__EXEEXT_697 = efi_gop.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_698 = efi_uga.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_699 = efi_uga.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_700 = vbe.module$(EXEEXT) --@COND_emu_TRUE@am__EXEEXT_701 = video_fb.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_702 = video_fb.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_703 = video_fb.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_704 = video_fb.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_705 = video_fb.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_706 = video_fb.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_707 = video_fb.module$(EXEEXT) --@COND_i386_xen_TRUE@am__EXEEXT_708 = video_fb.module$(EXEEXT) --@COND_x86_64_xen_TRUE@am__EXEEXT_709 = video_fb.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__EXEEXT_710 = video_fb.module$(EXEEXT) --@COND_sparc64_ieee1275_TRUE@am__EXEEXT_711 = video_fb.module$(EXEEXT) --@COND_powerpc_ieee1275_TRUE@am__EXEEXT_712 = video_fb.module$(EXEEXT) --@COND_mips_arc_TRUE@am__EXEEXT_713 = video_fb.module$(EXEEXT) --@COND_ia64_efi_TRUE@am__EXEEXT_714 = video_fb.module$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__EXEEXT_715 = video_fb.module$(EXEEXT) --@COND_arm_uboot_TRUE@am__EXEEXT_716 = video_fb.module$(EXEEXT) --@COND_arm_efi_TRUE@am__EXEEXT_717 = video_fb.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__EXEEXT_718 = video_fb.module$(EXEEXT) --@COND_riscv32_efi_TRUE@am__EXEEXT_719 = video_fb.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__EXEEXT_720 = video_fb.module$(EXEEXT) --@COND_emu_TRUE@am__EXEEXT_721 = video.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_722 = video.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_723 = video.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_724 = video.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_725 = video.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_726 = video.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_727 = video.module$(EXEEXT) --@COND_i386_xen_TRUE@am__EXEEXT_728 = video.module$(EXEEXT) --@COND_x86_64_xen_TRUE@am__EXEEXT_729 = video.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__EXEEXT_730 = video.module$(EXEEXT) --@COND_sparc64_ieee1275_TRUE@am__EXEEXT_731 = video.module$(EXEEXT) --@COND_powerpc_ieee1275_TRUE@am__EXEEXT_732 = video.module$(EXEEXT) --@COND_mips_arc_TRUE@am__EXEEXT_733 = video.module$(EXEEXT) --@COND_ia64_efi_TRUE@am__EXEEXT_734 = video.module$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__EXEEXT_735 = video.module$(EXEEXT) --@COND_arm_uboot_TRUE@am__EXEEXT_736 = video.module$(EXEEXT) --@COND_arm_efi_TRUE@am__EXEEXT_737 = video.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__EXEEXT_738 = video.module$(EXEEXT) --@COND_riscv32_efi_TRUE@am__EXEEXT_739 = video.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__EXEEXT_740 = video.module$(EXEEXT) --@COND_powerpc_ieee1275_TRUE@am__EXEEXT_741 = \ -+@COND_emu_TRUE@am__EXEEXT_672 = div.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_673 = div.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_674 = div.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_675 = div.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_676 = div.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_677 = div.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_678 = div.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_679 = div.module$(EXEEXT) -+@COND_i386_xen_TRUE@am__EXEEXT_680 = div.module$(EXEEXT) -+@COND_x86_64_xen_TRUE@am__EXEEXT_681 = div.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__EXEEXT_682 = div.module$(EXEEXT) -+@COND_mips_loongson_TRUE@am__EXEEXT_683 = div.module$(EXEEXT) -+@COND_sparc64_ieee1275_TRUE@am__EXEEXT_684 = div.module$(EXEEXT) -+@COND_powerpc_ieee1275_TRUE@am__EXEEXT_685 = div.module$(EXEEXT) -+@COND_mips_arc_TRUE@am__EXEEXT_686 = div.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__EXEEXT_687 = div.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__EXEEXT_688 = div.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__EXEEXT_689 = div.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_690 = efi_gop.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_691 = efi_gop.module$(EXEEXT) -+@COND_ia64_efi_TRUE@am__EXEEXT_692 = efi_gop.module$(EXEEXT) -+@COND_arm_efi_TRUE@am__EXEEXT_693 = efi_gop.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__EXEEXT_694 = efi_gop.module$(EXEEXT) -+@COND_riscv32_efi_TRUE@am__EXEEXT_695 = efi_gop.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__EXEEXT_696 = efi_gop.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_697 = efi_uga.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_698 = efi_uga.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_699 = vbe.module$(EXEEXT) -+@COND_emu_TRUE@am__EXEEXT_700 = video_fb.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_701 = video_fb.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_702 = video_fb.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_703 = video_fb.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_704 = video_fb.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_705 = video_fb.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_706 = video_fb.module$(EXEEXT) -+@COND_i386_xen_TRUE@am__EXEEXT_707 = video_fb.module$(EXEEXT) -+@COND_x86_64_xen_TRUE@am__EXEEXT_708 = video_fb.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__EXEEXT_709 = video_fb.module$(EXEEXT) -+@COND_sparc64_ieee1275_TRUE@am__EXEEXT_710 = video_fb.module$(EXEEXT) -+@COND_powerpc_ieee1275_TRUE@am__EXEEXT_711 = video_fb.module$(EXEEXT) -+@COND_mips_arc_TRUE@am__EXEEXT_712 = video_fb.module$(EXEEXT) -+@COND_ia64_efi_TRUE@am__EXEEXT_713 = video_fb.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__EXEEXT_714 = video_fb.module$(EXEEXT) -+@COND_arm_uboot_TRUE@am__EXEEXT_715 = video_fb.module$(EXEEXT) -+@COND_arm_efi_TRUE@am__EXEEXT_716 = video_fb.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__EXEEXT_717 = video_fb.module$(EXEEXT) -+@COND_riscv32_efi_TRUE@am__EXEEXT_718 = video_fb.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__EXEEXT_719 = video_fb.module$(EXEEXT) -+@COND_emu_TRUE@am__EXEEXT_720 = video.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_721 = video.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_722 = video.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_723 = video.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_724 = video.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_725 = video.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_726 = video.module$(EXEEXT) -+@COND_i386_xen_TRUE@am__EXEEXT_727 = video.module$(EXEEXT) -+@COND_x86_64_xen_TRUE@am__EXEEXT_728 = video.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__EXEEXT_729 = video.module$(EXEEXT) -+@COND_sparc64_ieee1275_TRUE@am__EXEEXT_730 = video.module$(EXEEXT) -+@COND_powerpc_ieee1275_TRUE@am__EXEEXT_731 = video.module$(EXEEXT) -+@COND_mips_arc_TRUE@am__EXEEXT_732 = video.module$(EXEEXT) -+@COND_ia64_efi_TRUE@am__EXEEXT_733 = video.module$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__EXEEXT_734 = video.module$(EXEEXT) -+@COND_arm_uboot_TRUE@am__EXEEXT_735 = video.module$(EXEEXT) -+@COND_arm_efi_TRUE@am__EXEEXT_736 = video.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__EXEEXT_737 = video.module$(EXEEXT) -+@COND_riscv32_efi_TRUE@am__EXEEXT_738 = video.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__EXEEXT_739 = video.module$(EXEEXT) -+@COND_powerpc_ieee1275_TRUE@am__EXEEXT_740 = \ - @COND_powerpc_ieee1275_TRUE@ ieee1275_fb.module$(EXEEXT) --@COND_GRUB_EMU_SDL_TRUE@@COND_emu_TRUE@am__EXEEXT_742 = \ -+@COND_GRUB_EMU_SDL_TRUE@@COND_emu_TRUE@am__EXEEXT_741 = \ - @COND_GRUB_EMU_SDL_TRUE@@COND_emu_TRUE@ sdl.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_743 = ofnet.module$(EXEEXT) --@COND_sparc64_ieee1275_TRUE@am__EXEEXT_744 = ofnet.module$(EXEEXT) --@COND_powerpc_ieee1275_TRUE@am__EXEEXT_745 = ofnet.module$(EXEEXT) --@COND_arm_uboot_TRUE@am__EXEEXT_746 = ubootnet.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_747 = efinet.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_748 = efinet.module$(EXEEXT) --@COND_ia64_efi_TRUE@am__EXEEXT_749 = efinet.module$(EXEEXT) --@COND_arm_efi_TRUE@am__EXEEXT_750 = efinet.module$(EXEEXT) --@COND_arm64_efi_TRUE@am__EXEEXT_751 = efinet.module$(EXEEXT) --@COND_riscv32_efi_TRUE@am__EXEEXT_752 = efinet.module$(EXEEXT) --@COND_riscv64_efi_TRUE@am__EXEEXT_753 = efinet.module$(EXEEXT) --@COND_emu_TRUE@am__EXEEXT_754 = emunet.module$(EXEEXT) \ -+@COND_i386_ieee1275_TRUE@am__EXEEXT_742 = ofnet.module$(EXEEXT) -+@COND_sparc64_ieee1275_TRUE@am__EXEEXT_743 = ofnet.module$(EXEEXT) -+@COND_powerpc_ieee1275_TRUE@am__EXEEXT_744 = ofnet.module$(EXEEXT) -+@COND_arm_uboot_TRUE@am__EXEEXT_745 = ubootnet.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_746 = efinet.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_747 = efinet.module$(EXEEXT) -+@COND_ia64_efi_TRUE@am__EXEEXT_748 = efinet.module$(EXEEXT) -+@COND_arm_efi_TRUE@am__EXEEXT_749 = efinet.module$(EXEEXT) -+@COND_arm64_efi_TRUE@am__EXEEXT_750 = efinet.module$(EXEEXT) -+@COND_riscv32_efi_TRUE@am__EXEEXT_751 = efinet.module$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__EXEEXT_752 = efinet.module$(EXEEXT) -+@COND_emu_TRUE@am__EXEEXT_753 = emunet.module$(EXEEXT) \ - @COND_emu_TRUE@ legacycfg.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_755 = legacycfg.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_756 = legacycfg.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_757 = legacycfg.module$(EXEEXT) --@COND_i386_xen_TRUE@am__EXEEXT_758 = legacycfg.module$(EXEEXT) --@COND_x86_64_xen_TRUE@am__EXEEXT_759 = legacycfg.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__EXEEXT_760 = legacycfg.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_761 = backtrace.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_762 = backtrace.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_763 = backtrace.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_764 = backtrace.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_765 = backtrace.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_766 = backtrace.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_767 = backtrace.module$(EXEEXT) --@COND_i386_xen_TRUE@am__EXEEXT_768 = backtrace.module$(EXEEXT) --@COND_x86_64_xen_TRUE@am__EXEEXT_769 = backtrace.module$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__EXEEXT_770 = backtrace.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_771 = lsapm.module$(EXEEXT) \ -+@COND_i386_pc_TRUE@am__EXEEXT_754 = legacycfg.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_755 = legacycfg.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_756 = legacycfg.module$(EXEEXT) -+@COND_i386_xen_TRUE@am__EXEEXT_757 = legacycfg.module$(EXEEXT) -+@COND_x86_64_xen_TRUE@am__EXEEXT_758 = legacycfg.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__EXEEXT_759 = legacycfg.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_760 = backtrace.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_761 = backtrace.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_762 = backtrace.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_763 = backtrace.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_764 = backtrace.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_765 = backtrace.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_766 = backtrace.module$(EXEEXT) -+@COND_i386_xen_TRUE@am__EXEEXT_767 = backtrace.module$(EXEEXT) -+@COND_x86_64_xen_TRUE@am__EXEEXT_768 = backtrace.module$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__EXEEXT_769 = backtrace.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_770 = lsapm.module$(EXEEXT) \ - @COND_i386_pc_TRUE@ keylayouts.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_772 = keylayouts.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_773 = keylayouts.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_774 = keylayouts.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_775 = keylayouts.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_776 = keylayouts.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_777 = keylayouts.module$(EXEEXT) --@COND_ENABLE_CACHE_STATS_TRUE@am__EXEEXT_778 = \ -+@COND_i386_efi_TRUE@am__EXEEXT_771 = keylayouts.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_772 = keylayouts.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_773 = keylayouts.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_774 = keylayouts.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_775 = keylayouts.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_776 = keylayouts.module$(EXEEXT) -+@COND_ENABLE_CACHE_STATS_TRUE@am__EXEEXT_777 = \ - @COND_ENABLE_CACHE_STATS_TRUE@ cacheinfo.module$(EXEEXT) --@COND_ENABLE_BOOT_TIME_STATS_TRUE@am__EXEEXT_779 = \ -+@COND_ENABLE_BOOT_TIME_STATS_TRUE@am__EXEEXT_778 = \ - @COND_ENABLE_BOOT_TIME_STATS_TRUE@ boottime.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_780 = gdb.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_781 = gdb.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_782 = gdb.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_783 = gdb.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_784 = gdb.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_785 = gdb.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_786 = tpm.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_787 = rdmsr.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_788 = rdmsr.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_789 = rdmsr.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_790 = rdmsr.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_791 = rdmsr.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_792 = rdmsr.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_793 = rdmsr.module$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_794 = wrmsr.module$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_795 = wrmsr.module$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_796 = wrmsr.module$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_797 = wrmsr.module$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_798 = wrmsr.module$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_799 = wrmsr.module$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_800 = wrmsr.module$(EXEEXT) --@COND_emu_TRUE@am__EXEEXT_801 = kernel.exec$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_802 = kernel.exec$(EXEEXT) --@COND_i386_efi_TRUE@am__EXEEXT_803 = kernel.exec$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_804 = kernel.exec$(EXEEXT) --@COND_i386_coreboot_TRUE@am__EXEEXT_805 = kernel.exec$(EXEEXT) --@COND_i386_multiboot_TRUE@am__EXEEXT_806 = kernel.exec$(EXEEXT) --@COND_i386_ieee1275_TRUE@am__EXEEXT_807 = kernel.exec$(EXEEXT) --@COND_x86_64_efi_TRUE@am__EXEEXT_808 = kernel.exec$(EXEEXT) --@COND_i386_xen_TRUE@am__EXEEXT_809 = kernel.exec$(EXEEXT) --@COND_x86_64_xen_TRUE@am__EXEEXT_810 = kernel.exec$(EXEEXT) --@COND_i386_xen_pvh_TRUE@am__EXEEXT_811 = kernel.exec$(EXEEXT) --@COND_mips_loongson_TRUE@am__EXEEXT_812 = kernel.exec$(EXEEXT) --@COND_sparc64_ieee1275_TRUE@am__EXEEXT_813 = kernel.exec$(EXEEXT) --@COND_powerpc_ieee1275_TRUE@am__EXEEXT_814 = kernel.exec$(EXEEXT) --@COND_mips_arc_TRUE@am__EXEEXT_815 = kernel.exec$(EXEEXT) --@COND_ia64_efi_TRUE@am__EXEEXT_816 = kernel.exec$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__EXEEXT_817 = kernel.exec$(EXEEXT) --@COND_arm_uboot_TRUE@am__EXEEXT_818 = kernel.exec$(EXEEXT) --@COND_arm_efi_TRUE@am__EXEEXT_819 = kernel.exec$(EXEEXT) --@COND_arm64_efi_TRUE@am__EXEEXT_820 = kernel.exec$(EXEEXT) --@COND_arm_coreboot_TRUE@am__EXEEXT_821 = kernel.exec$(EXEEXT) --@COND_riscv32_efi_TRUE@am__EXEEXT_822 = kernel.exec$(EXEEXT) --@COND_riscv64_efi_TRUE@am__EXEEXT_823 = kernel.exec$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_824 = boot.image$(EXEEXT) --@COND_i386_qemu_TRUE@am__EXEEXT_825 = boot.image$(EXEEXT) --@COND_sparc64_ieee1275_TRUE@am__EXEEXT_826 = boot.image$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_827 = boot_hybrid.image$(EXEEXT) \ -+@COND_i386_pc_TRUE@am__EXEEXT_779 = gdb.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_780 = gdb.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_781 = gdb.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_782 = gdb.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_783 = gdb.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_784 = gdb.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_785 = tpm.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_786 = rdmsr.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_787 = rdmsr.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_788 = rdmsr.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_789 = rdmsr.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_790 = rdmsr.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_791 = rdmsr.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_792 = rdmsr.module$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_793 = wrmsr.module$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_794 = wrmsr.module$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_795 = wrmsr.module$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_796 = wrmsr.module$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_797 = wrmsr.module$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_798 = wrmsr.module$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_799 = wrmsr.module$(EXEEXT) -+@COND_emu_TRUE@am__EXEEXT_800 = kernel.exec$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_801 = kernel.exec$(EXEEXT) -+@COND_i386_efi_TRUE@am__EXEEXT_802 = kernel.exec$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_803 = kernel.exec$(EXEEXT) -+@COND_i386_coreboot_TRUE@am__EXEEXT_804 = kernel.exec$(EXEEXT) -+@COND_i386_multiboot_TRUE@am__EXEEXT_805 = kernel.exec$(EXEEXT) -+@COND_i386_ieee1275_TRUE@am__EXEEXT_806 = kernel.exec$(EXEEXT) -+@COND_x86_64_efi_TRUE@am__EXEEXT_807 = kernel.exec$(EXEEXT) -+@COND_i386_xen_TRUE@am__EXEEXT_808 = kernel.exec$(EXEEXT) -+@COND_x86_64_xen_TRUE@am__EXEEXT_809 = kernel.exec$(EXEEXT) -+@COND_i386_xen_pvh_TRUE@am__EXEEXT_810 = kernel.exec$(EXEEXT) -+@COND_mips_loongson_TRUE@am__EXEEXT_811 = kernel.exec$(EXEEXT) -+@COND_sparc64_ieee1275_TRUE@am__EXEEXT_812 = kernel.exec$(EXEEXT) -+@COND_powerpc_ieee1275_TRUE@am__EXEEXT_813 = kernel.exec$(EXEEXT) -+@COND_mips_arc_TRUE@am__EXEEXT_814 = kernel.exec$(EXEEXT) -+@COND_ia64_efi_TRUE@am__EXEEXT_815 = kernel.exec$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__EXEEXT_816 = kernel.exec$(EXEEXT) -+@COND_arm_uboot_TRUE@am__EXEEXT_817 = kernel.exec$(EXEEXT) -+@COND_arm_efi_TRUE@am__EXEEXT_818 = kernel.exec$(EXEEXT) -+@COND_arm64_efi_TRUE@am__EXEEXT_819 = kernel.exec$(EXEEXT) -+@COND_arm_coreboot_TRUE@am__EXEEXT_820 = kernel.exec$(EXEEXT) -+@COND_riscv32_efi_TRUE@am__EXEEXT_821 = kernel.exec$(EXEEXT) -+@COND_riscv64_efi_TRUE@am__EXEEXT_822 = kernel.exec$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_823 = boot.image$(EXEEXT) -+@COND_i386_qemu_TRUE@am__EXEEXT_824 = boot.image$(EXEEXT) -+@COND_sparc64_ieee1275_TRUE@am__EXEEXT_825 = boot.image$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_826 = boot_hybrid.image$(EXEEXT) \ - @COND_i386_pc_TRUE@ cdboot.image$(EXEEXT) --@COND_sparc64_ieee1275_TRUE@am__EXEEXT_828 = cdboot.image$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_829 = pxeboot.image$(EXEEXT) \ -+@COND_sparc64_ieee1275_TRUE@am__EXEEXT_827 = cdboot.image$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_828 = pxeboot.image$(EXEEXT) \ - @COND_i386_pc_TRUE@ diskboot.image$(EXEEXT) --@COND_sparc64_ieee1275_TRUE@am__EXEEXT_830 = diskboot.image$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_831 = lnxboot.image$(EXEEXT) --@COND_mips_loongson_TRUE@am__EXEEXT_832 = \ -+@COND_sparc64_ieee1275_TRUE@am__EXEEXT_829 = diskboot.image$(EXEEXT) -+@COND_i386_pc_TRUE@am__EXEEXT_830 = lnxboot.image$(EXEEXT) -+@COND_mips_loongson_TRUE@am__EXEEXT_831 = \ - @COND_mips_loongson_TRUE@ xz_decompress.image$(EXEEXT) --@COND_mips_arc_TRUE@am__EXEEXT_833 = xz_decompress.image$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__EXEEXT_834 = \ -+@COND_mips_arc_TRUE@am__EXEEXT_832 = xz_decompress.image$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__EXEEXT_833 = \ - @COND_mips_qemu_mips_TRUE@ xz_decompress.image$(EXEEXT) --@COND_mips_loongson_TRUE@am__EXEEXT_835 = \ -+@COND_mips_loongson_TRUE@am__EXEEXT_834 = \ - @COND_mips_loongson_TRUE@ none_decompress.image$(EXEEXT) --@COND_mips_arc_TRUE@am__EXEEXT_836 = none_decompress.image$(EXEEXT) --@COND_mips_qemu_mips_TRUE@am__EXEEXT_837 = \ -+@COND_mips_arc_TRUE@am__EXEEXT_835 = none_decompress.image$(EXEEXT) -+@COND_mips_qemu_mips_TRUE@am__EXEEXT_836 = \ - @COND_mips_qemu_mips_TRUE@ none_decompress.image$(EXEEXT) --@COND_i386_pc_TRUE@am__EXEEXT_838 = lzma_decompress.image$(EXEEXT) --@COND_mips_loongson_TRUE@am__EXEEXT_839 = fwstart.image$(EXEEXT) \ -+@COND_i386_pc_TRUE@am__EXEEXT_837 = lzma_decompress.image$(EXEEXT) -+@COND_mips_loongson_TRUE@am__EXEEXT_838 = fwstart.image$(EXEEXT) \ - @COND_mips_loongson_TRUE@ fwstart_fuloong2f.image$(EXEEXT) - PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) $(platform_PROGRAMS) \ - $(sbin_PROGRAMS) -@@ -12775,13 +12764,6 @@ shift_test_module_OBJECTS = $(am_shift_test_module_OBJECTS) \ - $(nodist_shift_test_module_OBJECTS) - shift_test_module_LINK = $(CCLD) $(shift_test_module_CFLAGS) $(CFLAGS) \ - $(shift_test_module_LDFLAGS) $(LDFLAGS) -o $@ --am__shim_lock_module_SOURCES_DIST = commands/efi/shim_lock.c --@COND_x86_64_efi_TRUE@am_shim_lock_module_OBJECTS = commands/efi/shim_lock_module-shim_lock.$(OBJEXT) --nodist_shim_lock_module_OBJECTS = --shim_lock_module_OBJECTS = $(am_shim_lock_module_OBJECTS) \ -- $(nodist_shim_lock_module_OBJECTS) --shim_lock_module_LINK = $(CCLD) $(shim_lock_module_CFLAGS) $(CFLAGS) \ -- $(shim_lock_module_LDFLAGS) $(LDFLAGS) -o $@ - am_signature_test_module_OBJECTS = \ - tests/signature_test_module-signature_test.$(OBJEXT) - nodist_signature_test_module_OBJECTS = -@@ -13847,7 +13829,6 @@ SOURCES = $(acpi_module_SOURCES) $(nodist_acpi_module_SOURCES) \ - $(nodist_setpci_module_SOURCES) $(sfs_module_SOURCES) \ - $(nodist_sfs_module_SOURCES) $(shift_test_module_SOURCES) \ - $(nodist_shift_test_module_SOURCES) \ -- $(shim_lock_module_SOURCES) $(nodist_shim_lock_module_SOURCES) \ - $(signature_test_module_SOURCES) \ - $(nodist_signature_test_module_SOURCES) \ - $(sleep_module_SOURCES) $(nodist_sleep_module_SOURCES) \ -@@ -14078,10 +14059,8 @@ DIST_SOURCES = $(am__acpi_module_SOURCES_DIST) \ - $(am__serial_module_SOURCES_DIST) $(setjmp_module_SOURCES) \ - $(setjmp_test_module_SOURCES) \ - $(am__setpci_module_SOURCES_DIST) $(sfs_module_SOURCES) \ -- $(shift_test_module_SOURCES) \ -- $(am__shim_lock_module_SOURCES_DIST) \ -- $(signature_test_module_SOURCES) $(sleep_module_SOURCES) \ -- $(sleep_test_module_SOURCES) \ -+ $(shift_test_module_SOURCES) $(signature_test_module_SOURCES) \ -+ $(sleep_module_SOURCES) $(sleep_test_module_SOURCES) \ - $(am__spkmodem_module_SOURCES_DIST) $(squash4_module_SOURCES) \ - $(strtoull_test_module_SOURCES) \ - $(am__suspend_module_SOURCES_DIST) \ -@@ -15514,56 +15493,55 @@ MOD_FILES = disk.mod trig.mod $(am__append_8) $(am__append_15) \ - $(am__append_2045) $(am__append_2052) $(am__append_2059) \ - $(am__append_2066) $(am__append_2073) $(am__append_2080) \ - $(am__append_2087) $(am__append_2094) $(am__append_2101) \ -- $(am__append_2108) help.mod hexdump.mod keystatus.mod \ -- $(am__append_2115) $(am__append_2122) loadenv.mod ls.mod \ -- lsmmap.mod $(am__append_2129) $(am__append_2136) \ -+ help.mod hexdump.mod keystatus.mod $(am__append_2108) \ -+ $(am__append_2115) loadenv.mod ls.mod lsmmap.mod \ -+ $(am__append_2122) $(am__append_2129) $(am__append_2136) \ - $(am__append_2143) $(am__append_2150) $(am__append_2157) \ -- $(am__append_2164) $(am__append_2171) $(am__append_2178) \ -- memrw.mod minicmd.mod parttool.mod password.mod \ -- password_pbkdf2.mod $(am__append_2185) $(am__append_2192) \ -+ $(am__append_2164) $(am__append_2171) memrw.mod minicmd.mod \ -+ parttool.mod password.mod password_pbkdf2.mod \ -+ $(am__append_2178) $(am__append_2185) $(am__append_2192) \ - $(am__append_2199) $(am__append_2206) $(am__append_2213) \ - $(am__append_2220) $(am__append_2227) $(am__append_2234) \ - $(am__append_2241) $(am__append_2248) $(am__append_2255) \ - $(am__append_2262) $(am__append_2269) $(am__append_2276) \ - $(am__append_2283) $(am__append_2290) $(am__append_2297) \ - $(am__append_2304) $(am__append_2311) $(am__append_2318) \ -- $(am__append_2325) probe.mod read.mod search.mod \ -- search_fs_file.mod search_fs_uuid.mod search_label.mod \ -+ probe.mod read.mod search.mod search_fs_file.mod \ -+ search_fs_uuid.mod search_label.mod $(am__append_2325) \ - $(am__append_2332) $(am__append_2339) $(am__append_2346) \ - $(am__append_2353) $(am__append_2360) $(am__append_2367) \ - $(am__append_2374) $(am__append_2381) $(am__append_2388) \ - $(am__append_2395) $(am__append_2402) $(am__append_2409) \ - $(am__append_2416) $(am__append_2423) $(am__append_2430) \ -- $(am__append_2437) sleep.mod $(am__append_2444) \ -- $(am__append_2451) terminal.mod test.mod true.mod \ -- $(am__append_2458) $(am__append_2465) $(am__append_2472) \ -- $(am__append_2479) $(am__append_2486) $(am__append_2493) \ -- $(am__append_2500) $(am__append_2507) $(am__append_2514) \ -- videoinfo.mod videotest.mod xnu_uuid.mod dm_nv.mod \ -- loopback.mod cryptodisk.mod luks.mod geli.mod lvm.mod ldm.mod \ -- mdraid09.mod mdraid09_be.mod mdraid1x.mod diskfilter.mod \ -- raid5rec.mod raid6rec.mod scsi.mod memdisk.mod \ -- $(am__append_2521) $(am__append_2528) $(am__append_2535) \ -- $(am__append_2542) $(am__append_2549) $(am__append_2556) \ -- $(am__append_2563) $(am__append_2570) $(am__append_2577) \ -- $(am__append_2584) $(am__append_2591) $(am__append_2598) \ -- $(am__append_2605) $(am__append_2612) $(am__append_2619) \ -- $(am__append_2626) $(am__append_2633) $(am__append_2640) \ -- $(am__append_2647) $(am__append_2654) $(am__append_2661) \ -- $(am__append_2668) $(am__append_2675) $(am__append_2682) \ -- $(am__append_2689) $(am__append_2696) $(am__append_2703) \ -- $(am__append_2710) $(am__append_2717) $(am__append_2724) \ -- $(am__append_2731) $(am__append_2738) $(am__append_2745) \ -- $(am__append_2752) $(am__append_2759) $(am__append_2766) \ -- $(am__append_2773) $(am__append_2780) $(am__append_2787) \ -- $(am__append_2794) $(am__append_2801) $(am__append_2808) \ -- $(am__append_2815) $(am__append_2822) $(am__append_2829) \ -- $(am__append_2836) $(am__append_2843) $(am__append_2850) \ -- $(am__append_2857) $(am__append_2864) $(am__append_2871) \ -- $(am__append_2878) $(am__append_2885) $(am__append_2892) \ -- $(am__append_2899) $(am__append_2906) $(am__append_2913) \ -- $(am__append_2920) $(am__append_2927) $(am__append_2934) \ -- $(am__append_2941) procfs.mod affs.mod afs.mod bfs.mod \ -+ sleep.mod $(am__append_2437) $(am__append_2444) terminal.mod \ -+ test.mod true.mod $(am__append_2451) $(am__append_2458) \ -+ $(am__append_2465) $(am__append_2472) $(am__append_2479) \ -+ $(am__append_2486) $(am__append_2493) $(am__append_2500) \ -+ $(am__append_2507) videoinfo.mod videotest.mod xnu_uuid.mod \ -+ dm_nv.mod loopback.mod cryptodisk.mod luks.mod geli.mod \ -+ lvm.mod ldm.mod mdraid09.mod mdraid09_be.mod mdraid1x.mod \ -+ diskfilter.mod raid5rec.mod raid6rec.mod scsi.mod memdisk.mod \ -+ $(am__append_2514) $(am__append_2521) $(am__append_2528) \ -+ $(am__append_2535) $(am__append_2542) $(am__append_2549) \ -+ $(am__append_2556) $(am__append_2563) $(am__append_2570) \ -+ $(am__append_2577) $(am__append_2584) $(am__append_2591) \ -+ $(am__append_2598) $(am__append_2605) $(am__append_2612) \ -+ $(am__append_2619) $(am__append_2626) $(am__append_2633) \ -+ $(am__append_2640) $(am__append_2647) $(am__append_2654) \ -+ $(am__append_2661) $(am__append_2668) $(am__append_2675) \ -+ $(am__append_2682) $(am__append_2689) $(am__append_2696) \ -+ $(am__append_2703) $(am__append_2710) $(am__append_2717) \ -+ $(am__append_2724) $(am__append_2731) $(am__append_2738) \ -+ $(am__append_2745) $(am__append_2752) $(am__append_2759) \ -+ $(am__append_2766) $(am__append_2773) $(am__append_2780) \ -+ $(am__append_2787) $(am__append_2794) $(am__append_2801) \ -+ $(am__append_2808) $(am__append_2815) $(am__append_2822) \ -+ $(am__append_2829) $(am__append_2836) $(am__append_2843) \ -+ $(am__append_2850) $(am__append_2857) $(am__append_2864) \ -+ $(am__append_2871) $(am__append_2878) $(am__append_2885) \ -+ $(am__append_2892) $(am__append_2899) $(am__append_2906) \ -+ $(am__append_2913) $(am__append_2920) $(am__append_2927) \ -+ $(am__append_2934) procfs.mod affs.mod afs.mod bfs.mod \ - zstd.mod btrfs.mod archelp.mod cbfs.mod cpio.mod cpio_be.mod \ - newc.mod odc.mod ext2.mod fat.mod exfat.mod f2fs.mod \ - fshelp.mod hfs.mod hfsplus.mod hfspluscomp.mod iso9660.mod \ -@@ -15571,150 +15549,150 @@ MOD_FILES = disk.mod trig.mod $(am__append_8) $(am__append_15) \ - minix2_be.mod minix3_be.mod nilfs2.mod ntfs.mod ntfscomp.mod \ - reiserfs.mod romfs.mod sfs.mod squash4.mod tar.mod udf.mod \ - ufs1.mod ufs1_be.mod ufs2.mod xfs.mod zfs.mod zfscrypt.mod \ -- zfsinfo.mod macbless.mod $(am__append_2948) gettext.mod \ -- gfxmenu.mod hello.mod gzio.mod offsetio.mod $(am__append_2955) \ -- $(am__append_2962) $(am__append_2969) $(am__append_2976) \ -- $(am__append_2983) $(am__append_2990) $(am__append_2997) \ -- $(am__append_3004) $(am__append_3011) $(am__append_3018) \ -- $(am__append_3025) $(am__append_3032) $(am__append_3039) \ -- $(am__append_3046) $(am__append_3053) $(am__append_3060) \ -- $(am__append_3067) $(am__append_3074) $(am__append_3081) \ -- $(am__append_3088) elf.mod crypto.mod pbkdf2.mod \ -- $(am__append_3095) $(am__append_3102) $(am__append_3109) \ -- $(am__append_3116) $(am__append_3123) $(am__append_3130) \ -- $(am__append_3137) $(am__append_3144) $(am__append_3151) \ -- $(am__append_3158) $(am__append_3165) $(am__append_3172) \ -- $(am__append_3179) $(am__append_3186) $(am__append_3193) \ -- $(am__append_3200) $(am__append_3207) $(am__append_3214) \ -- $(am__append_3221) $(am__append_3228) $(am__append_3235) \ -- $(am__append_3242) $(am__append_3249) $(am__append_3256) \ -- $(am__append_3263) $(am__append_3270) $(am__append_3277) \ -- $(am__append_3284) $(am__append_3291) $(am__append_3298) \ -- $(am__append_3305) $(am__append_3312) $(am__append_3319) \ -- $(am__append_3326) $(am__append_3333) $(am__append_3340) \ -- setjmp.mod $(am__append_3347) $(am__append_3354) \ -- $(am__append_3361) $(am__append_3368) $(am__append_3375) \ -- $(am__append_3382) $(am__append_3389) $(am__append_3396) \ -- $(am__append_3403) $(am__append_3410) $(am__append_3417) \ -- $(am__append_3424) $(am__append_3431) $(am__append_3438) \ -- $(am__append_3445) $(am__append_3452) $(am__append_3459) \ -- $(am__append_3466) $(am__append_3473) $(am__append_3480) \ -- $(am__append_3487) $(am__append_3494) $(am__append_3501) \ -- $(am__append_3508) $(am__append_3515) $(am__append_3522) \ -- $(am__append_3529) $(am__append_3536) $(am__append_3543) \ -- $(am__append_3550) $(am__append_3557) $(am__append_3564) \ -- $(am__append_3571) $(am__append_3578) $(am__append_3585) \ -- $(am__append_3592) $(am__append_3599) $(am__append_3606) \ -- $(am__append_3613) $(am__append_3620) $(am__append_3627) \ -- $(am__append_3634) $(am__append_3641) $(am__append_3648) \ -- $(am__append_3655) $(am__append_3662) $(am__append_3669) \ -- $(am__append_3676) $(am__append_3683) $(am__append_3690) \ -- $(am__append_3697) $(am__append_3704) $(am__append_3711) \ -- $(am__append_3718) $(am__append_3725) $(am__append_3732) \ -- $(am__append_3739) $(am__append_3746) $(am__append_3753) \ -- $(am__append_3760) $(am__append_3767) $(am__append_3774) \ -- $(am__append_3781) $(am__append_3788) $(am__append_3795) \ -- $(am__append_3802) $(am__append_3809) $(am__append_3816) \ -- $(am__append_3823) $(am__append_3830) $(am__append_3837) \ -- $(am__append_3844) $(am__append_3851) $(am__append_3858) \ -- $(am__append_3865) $(am__append_3872) $(am__append_3879) \ -- $(am__append_3886) macho.mod $(am__append_3893) \ -- $(am__append_3900) $(am__append_3907) $(am__append_3914) \ -- $(am__append_3921) $(am__append_3928) $(am__append_3935) \ -- $(am__append_3942) $(am__append_3949) $(am__append_3956) \ -- $(am__append_3963) $(am__append_3970) $(am__append_3977) \ -- $(am__append_3984) $(am__append_3991) $(am__append_3998) \ -- $(am__append_4005) $(am__append_4012) $(am__append_4019) \ -- $(am__append_4026) $(am__append_4033) $(am__append_4040) \ -- $(am__append_4047) $(am__append_4054) $(am__append_4061) \ -- $(am__append_4068) $(am__append_4075) normal.mod \ -+ zfsinfo.mod macbless.mod $(am__append_2941) gettext.mod \ -+ gfxmenu.mod hello.mod gzio.mod offsetio.mod $(am__append_2948) \ -+ $(am__append_2955) $(am__append_2962) $(am__append_2969) \ -+ $(am__append_2976) $(am__append_2983) $(am__append_2990) \ -+ $(am__append_2997) $(am__append_3004) $(am__append_3011) \ -+ $(am__append_3018) $(am__append_3025) $(am__append_3032) \ -+ $(am__append_3039) $(am__append_3046) $(am__append_3053) \ -+ $(am__append_3060) $(am__append_3067) $(am__append_3074) \ -+ $(am__append_3081) elf.mod crypto.mod pbkdf2.mod \ -+ $(am__append_3088) $(am__append_3095) $(am__append_3102) \ -+ $(am__append_3109) $(am__append_3116) $(am__append_3123) \ -+ $(am__append_3130) $(am__append_3137) $(am__append_3144) \ -+ $(am__append_3151) $(am__append_3158) $(am__append_3165) \ -+ $(am__append_3172) $(am__append_3179) $(am__append_3186) \ -+ $(am__append_3193) $(am__append_3200) $(am__append_3207) \ -+ $(am__append_3214) $(am__append_3221) $(am__append_3228) \ -+ $(am__append_3235) $(am__append_3242) $(am__append_3249) \ -+ $(am__append_3256) $(am__append_3263) $(am__append_3270) \ -+ $(am__append_3277) $(am__append_3284) $(am__append_3291) \ -+ $(am__append_3298) $(am__append_3305) $(am__append_3312) \ -+ $(am__append_3319) $(am__append_3326) $(am__append_3333) \ -+ setjmp.mod $(am__append_3340) $(am__append_3347) \ -+ $(am__append_3354) $(am__append_3361) $(am__append_3368) \ -+ $(am__append_3375) $(am__append_3382) $(am__append_3389) \ -+ $(am__append_3396) $(am__append_3403) $(am__append_3410) \ -+ $(am__append_3417) $(am__append_3424) $(am__append_3431) \ -+ $(am__append_3438) $(am__append_3445) $(am__append_3452) \ -+ $(am__append_3459) $(am__append_3466) $(am__append_3473) \ -+ $(am__append_3480) $(am__append_3487) $(am__append_3494) \ -+ $(am__append_3501) $(am__append_3508) $(am__append_3515) \ -+ $(am__append_3522) $(am__append_3529) $(am__append_3536) \ -+ $(am__append_3543) $(am__append_3550) $(am__append_3557) \ -+ $(am__append_3564) $(am__append_3571) $(am__append_3578) \ -+ $(am__append_3585) $(am__append_3592) $(am__append_3599) \ -+ $(am__append_3606) $(am__append_3613) $(am__append_3620) \ -+ $(am__append_3627) $(am__append_3634) $(am__append_3641) \ -+ $(am__append_3648) $(am__append_3655) $(am__append_3662) \ -+ $(am__append_3669) $(am__append_3676) $(am__append_3683) \ -+ $(am__append_3690) $(am__append_3697) $(am__append_3704) \ -+ $(am__append_3711) $(am__append_3718) $(am__append_3725) \ -+ $(am__append_3732) $(am__append_3739) $(am__append_3746) \ -+ $(am__append_3753) $(am__append_3760) $(am__append_3767) \ -+ $(am__append_3774) $(am__append_3781) $(am__append_3788) \ -+ $(am__append_3795) $(am__append_3802) $(am__append_3809) \ -+ $(am__append_3816) $(am__append_3823) $(am__append_3830) \ -+ $(am__append_3837) $(am__append_3844) $(am__append_3851) \ -+ $(am__append_3858) $(am__append_3865) $(am__append_3872) \ -+ $(am__append_3879) macho.mod $(am__append_3886) \ -+ $(am__append_3893) $(am__append_3900) $(am__append_3907) \ -+ $(am__append_3914) $(am__append_3921) $(am__append_3928) \ -+ $(am__append_3935) $(am__append_3942) $(am__append_3949) \ -+ $(am__append_3956) $(am__append_3963) $(am__append_3970) \ -+ $(am__append_3977) $(am__append_3984) $(am__append_3991) \ -+ $(am__append_3998) $(am__append_4005) $(am__append_4012) \ -+ $(am__append_4019) $(am__append_4026) $(am__append_4033) \ -+ $(am__append_4040) $(am__append_4047) $(am__append_4054) \ -+ $(am__append_4061) $(am__append_4068) normal.mod \ - part_acorn.mod part_amiga.mod part_apple.mod part_gpt.mod \ - part_msdos.mod part_sun.mod part_plan.mod part_dvh.mod \ - part_bsd.mod part_sunpc.mod part_dfly.mod msdospart.mod \ -- $(am__append_4082) $(am__append_4089) $(am__append_4096) \ -- $(am__append_4103) $(am__append_4110) $(am__append_4117) \ -- $(am__append_4124) $(am__append_4131) $(am__append_4138) \ -- $(am__append_4145) $(am__append_4152) $(am__append_4159) \ -- $(am__append_4166) $(am__append_4173) $(am__append_4180) \ -- $(am__append_4187) $(am__append_4194) $(am__append_4201) \ -- $(am__append_4208) $(am__append_4215) $(am__append_4222) \ -- $(am__append_4229) $(am__append_4236) $(am__append_4243) \ -- $(am__append_4250) $(am__append_4257) $(am__append_4264) \ -- gfxterm_background.mod $(am__append_4271) $(am__append_4278) \ -- $(am__append_4285) $(am__append_4292) $(am__append_4299) \ -- $(am__append_4306) $(am__append_4313) $(am__append_4320) \ -- $(am__append_4327) $(am__append_4334) $(am__append_4341) \ -- $(am__append_4348) $(am__append_4355) $(am__append_4362) \ -- $(am__append_4369) $(am__append_4376) $(am__append_4383) \ -- $(am__append_4390) $(am__append_4397) $(am__append_4404) \ -- $(am__append_4411) $(am__append_4418) $(am__append_4425) \ -- $(am__append_4432) $(am__append_4439) $(am__append_4446) \ -- $(am__append_4453) $(am__append_4460) $(am__append_4467) \ -- $(am__append_4474) $(am__append_4481) $(am__append_4488) \ -- $(am__append_4495) $(am__append_4502) $(am__append_4509) \ -- $(am__append_4516) $(am__append_4523) $(am__append_4530) \ -- $(am__append_4537) $(am__append_4544) $(am__append_4551) \ -- $(am__append_4558) $(am__append_4565) $(am__append_4572) \ -- $(am__append_4579) $(am__append_4586) $(am__append_4593) \ -- $(am__append_4600) $(am__append_4607) $(am__append_4614) \ -- $(am__append_4621) $(am__append_4628) $(am__append_4635) \ -- $(am__append_4642) $(am__append_4649) functional_test.mod \ -+ $(am__append_4075) $(am__append_4082) $(am__append_4089) \ -+ $(am__append_4096) $(am__append_4103) $(am__append_4110) \ -+ $(am__append_4117) $(am__append_4124) $(am__append_4131) \ -+ $(am__append_4138) $(am__append_4145) $(am__append_4152) \ -+ $(am__append_4159) $(am__append_4166) $(am__append_4173) \ -+ $(am__append_4180) $(am__append_4187) $(am__append_4194) \ -+ $(am__append_4201) $(am__append_4208) $(am__append_4215) \ -+ $(am__append_4222) $(am__append_4229) $(am__append_4236) \ -+ $(am__append_4243) $(am__append_4250) $(am__append_4257) \ -+ gfxterm_background.mod $(am__append_4264) $(am__append_4271) \ -+ $(am__append_4278) $(am__append_4285) $(am__append_4292) \ -+ $(am__append_4299) $(am__append_4306) $(am__append_4313) \ -+ $(am__append_4320) $(am__append_4327) $(am__append_4334) \ -+ $(am__append_4341) $(am__append_4348) $(am__append_4355) \ -+ $(am__append_4362) $(am__append_4369) $(am__append_4376) \ -+ $(am__append_4383) $(am__append_4390) $(am__append_4397) \ -+ $(am__append_4404) $(am__append_4411) $(am__append_4418) \ -+ $(am__append_4425) $(am__append_4432) $(am__append_4439) \ -+ $(am__append_4446) $(am__append_4453) $(am__append_4460) \ -+ $(am__append_4467) $(am__append_4474) $(am__append_4481) \ -+ $(am__append_4488) $(am__append_4495) $(am__append_4502) \ -+ $(am__append_4509) $(am__append_4516) $(am__append_4523) \ -+ $(am__append_4530) $(am__append_4537) $(am__append_4544) \ -+ $(am__append_4551) $(am__append_4558) $(am__append_4565) \ -+ $(am__append_4572) $(am__append_4579) $(am__append_4586) \ -+ $(am__append_4593) $(am__append_4600) $(am__append_4607) \ -+ $(am__append_4614) $(am__append_4621) $(am__append_4628) \ -+ $(am__append_4635) $(am__append_4642) functional_test.mod \ - exfctest.mod strtoull_test.mod setjmp_test.mod \ - signature_test.mod sleep_test.mod xnu_uuid_test.mod \ -- pbkdf2_test.mod $(am__append_4656) $(am__append_4663) \ -- $(am__append_4670) $(am__append_4677) $(am__append_4684) \ -- $(am__append_4691) $(am__append_4698) $(am__append_4705) \ -- $(am__append_4712) $(am__append_4719) $(am__append_4726) \ -- $(am__append_4733) $(am__append_4740) $(am__append_4747) \ -- $(am__append_4754) $(am__append_4761) $(am__append_4768) \ -- $(am__append_4775) $(am__append_4782) $(am__append_4789) \ -- $(am__append_4796) $(am__append_4803) $(am__append_4810) \ -- $(am__append_4817) $(am__append_4824) div_test.mod \ -+ pbkdf2_test.mod $(am__append_4649) $(am__append_4656) \ -+ $(am__append_4663) $(am__append_4670) $(am__append_4677) \ -+ $(am__append_4684) $(am__append_4691) $(am__append_4698) \ -+ $(am__append_4705) $(am__append_4712) $(am__append_4719) \ -+ $(am__append_4726) $(am__append_4733) $(am__append_4740) \ -+ $(am__append_4747) $(am__append_4754) $(am__append_4761) \ -+ $(am__append_4768) $(am__append_4775) $(am__append_4782) \ -+ $(am__append_4789) $(am__append_4796) $(am__append_4803) \ -+ $(am__append_4810) $(am__append_4817) div_test.mod \ - mul_test.mod shift_test.mod cmp_test.mod ctz_test.mod \ - bswap_test.mod videotest_checksum.mod gfxterm_menu.mod \ - cmdline_cat_test.mod bitmap.mod bitmap_scale.mod \ -- $(am__append_4831) $(am__append_4838) $(am__append_4845) \ -- $(am__append_4852) $(am__append_4859) $(am__append_4866) \ -- $(am__append_4873) $(am__append_4880) $(am__append_4887) \ -- jpeg.mod png.mod tga.mod $(am__append_4894) $(am__append_4901) \ -- $(am__append_4908) $(am__append_4915) $(am__append_4922) \ -- $(am__append_4929) $(am__append_4936) $(am__append_4943) \ -- $(am__append_4950) $(am__append_4957) $(am__append_4964) \ -- $(am__append_4971) $(am__append_4978) $(am__append_4985) \ -- $(am__append_4992) $(am__append_4999) $(am__append_5006) \ -- $(am__append_5013) $(am__append_5020) $(am__append_5027) \ -- $(am__append_5034) $(am__append_5041) $(am__append_5048) \ -- $(am__append_5055) $(am__append_5062) $(am__append_5069) \ -- $(am__append_5076) $(am__append_5083) $(am__append_5090) \ -- $(am__append_5097) $(am__append_5104) $(am__append_5111) \ -- $(am__append_5118) $(am__append_5125) $(am__append_5132) \ -- $(am__append_5139) $(am__append_5146) $(am__append_5153) \ -- $(am__append_5160) $(am__append_5167) $(am__append_5174) \ -- video_colors.mod $(am__append_5181) $(am__append_5188) \ -- datehook.mod net.mod tftp.mod http.mod $(am__append_5195) \ -- $(am__append_5202) $(am__append_5209) $(am__append_5216) \ -- $(am__append_5223) $(am__append_5230) $(am__append_5237) \ -- $(am__append_5244) $(am__append_5251) $(am__append_5258) \ -- $(am__append_5265) $(am__append_5272) $(am__append_5279) \ -- $(am__append_5286) $(am__append_5293) $(am__append_5300) \ -- $(am__append_5307) $(am__append_5314) syslinuxcfg.mod \ -+ $(am__append_4824) $(am__append_4831) $(am__append_4838) \ -+ $(am__append_4845) $(am__append_4852) $(am__append_4859) \ -+ $(am__append_4866) $(am__append_4873) $(am__append_4880) \ -+ jpeg.mod png.mod tga.mod $(am__append_4887) $(am__append_4894) \ -+ $(am__append_4901) $(am__append_4908) $(am__append_4915) \ -+ $(am__append_4922) $(am__append_4929) $(am__append_4936) \ -+ $(am__append_4943) $(am__append_4950) $(am__append_4957) \ -+ $(am__append_4964) $(am__append_4971) $(am__append_4978) \ -+ $(am__append_4985) $(am__append_4992) $(am__append_4999) \ -+ $(am__append_5006) $(am__append_5013) $(am__append_5020) \ -+ $(am__append_5027) $(am__append_5034) $(am__append_5041) \ -+ $(am__append_5048) $(am__append_5055) $(am__append_5062) \ -+ $(am__append_5069) $(am__append_5076) $(am__append_5083) \ -+ $(am__append_5090) $(am__append_5097) $(am__append_5104) \ -+ $(am__append_5111) $(am__append_5118) $(am__append_5125) \ -+ $(am__append_5132) $(am__append_5139) $(am__append_5146) \ -+ $(am__append_5153) $(am__append_5160) $(am__append_5167) \ -+ video_colors.mod $(am__append_5174) $(am__append_5181) \ -+ datehook.mod net.mod tftp.mod http.mod $(am__append_5188) \ -+ $(am__append_5195) $(am__append_5202) $(am__append_5209) \ -+ $(am__append_5216) $(am__append_5223) $(am__append_5230) \ -+ $(am__append_5237) $(am__append_5244) $(am__append_5251) \ -+ $(am__append_5258) $(am__append_5265) $(am__append_5272) \ -+ $(am__append_5279) $(am__append_5286) $(am__append_5293) \ -+ $(am__append_5300) $(am__append_5307) syslinuxcfg.mod \ - test_blockarg.mod xzio.mod lzopio.mod testload.mod \ -- $(am__append_5321) $(am__append_5328) $(am__append_5335) \ -- $(am__append_5342) $(am__append_5349) $(am__append_5356) \ -- $(am__append_5363) $(am__append_5370) $(am__append_5377) \ -- $(am__append_5384) $(am__append_5391) $(am__append_5398) \ -- $(am__append_5405) $(am__append_5412) $(am__append_5419) \ -- $(am__append_5426) $(am__append_5433) priority_queue.mod \ -- time.mod $(am__append_5440) $(am__append_5447) adler32.mod \ -- crc64.mod mpi.mod all_video.mod $(am__append_5454) \ -- $(am__append_5461) $(am__append_5468) $(am__append_5475) \ -- $(am__append_5482) $(am__append_5489) testspeed.mod \ -- $(am__append_5496) tr.mod progress.mod file.mod \ -- $(am__append_5503) $(am__append_5510) $(am__append_5517) \ -- $(am__append_5524) $(am__append_5531) $(am__append_5538) \ -- $(am__append_5545) $(am__append_5552) $(am__append_5559) \ -- $(am__append_5566) $(am__append_5573) $(am__append_5580) \ -- $(am__append_5587) $(am__append_5594) gcry_arcfour.mod \ -+ $(am__append_5314) $(am__append_5321) $(am__append_5328) \ -+ $(am__append_5335) $(am__append_5342) $(am__append_5349) \ -+ $(am__append_5356) $(am__append_5363) $(am__append_5370) \ -+ $(am__append_5377) $(am__append_5384) $(am__append_5391) \ -+ $(am__append_5398) $(am__append_5405) $(am__append_5412) \ -+ $(am__append_5419) $(am__append_5426) priority_queue.mod \ -+ time.mod $(am__append_5433) $(am__append_5440) adler32.mod \ -+ crc64.mod mpi.mod all_video.mod $(am__append_5447) \ -+ $(am__append_5454) $(am__append_5461) $(am__append_5468) \ -+ $(am__append_5475) $(am__append_5482) testspeed.mod \ -+ $(am__append_5489) tr.mod progress.mod file.mod \ -+ $(am__append_5496) $(am__append_5503) $(am__append_5510) \ -+ $(am__append_5517) $(am__append_5524) $(am__append_5531) \ -+ $(am__append_5538) $(am__append_5545) $(am__append_5552) \ -+ $(am__append_5559) $(am__append_5566) $(am__append_5573) \ -+ $(am__append_5580) $(am__append_5587) gcry_arcfour.mod \ - gcry_blowfish.mod gcry_camellia.mod gcry_cast5.mod \ - gcry_crc.mod gcry_des.mod gcry_dsa.mod gcry_idea.mod \ - gcry_md4.mod gcry_md5.mod gcry_rfc2268.mod gcry_rijndael.mod \ -@@ -15826,72 +15804,71 @@ MODULE_FILES = disk.module$(EXEEXT) trig.module$(EXEEXT) \ - hashsum.module$(EXEEXT) pgp.module$(EXEEXT) $(am__append_2041) \ - $(am__append_2048) $(am__append_2055) $(am__append_2062) \ - $(am__append_2069) $(am__append_2076) $(am__append_2083) \ -- $(am__append_2090) $(am__append_2097) $(am__append_2104) \ -- help.module$(EXEEXT) hexdump.module$(EXEEXT) \ -- keystatus.module$(EXEEXT) $(am__append_2111) \ -- $(am__append_2118) loadenv.module$(EXEEXT) ls.module$(EXEEXT) \ -- lsmmap.module$(EXEEXT) $(am__append_2125) $(am__append_2132) \ -- $(am__append_2139) $(am__append_2146) $(am__append_2153) \ -- $(am__append_2160) $(am__append_2167) $(am__append_2174) \ -- memrw.module$(EXEEXT) minicmd.module$(EXEEXT) \ -- parttool.module$(EXEEXT) password.module$(EXEEXT) \ -- password_pbkdf2.module$(EXEEXT) $(am__append_2181) \ -- $(am__append_2188) $(am__append_2195) $(am__append_2202) \ -- $(am__append_2209) $(am__append_2216) $(am__append_2223) \ -- $(am__append_2230) $(am__append_2237) $(am__append_2244) \ -- $(am__append_2251) $(am__append_2258) $(am__append_2265) \ -- $(am__append_2272) $(am__append_2279) $(am__append_2286) \ -- $(am__append_2293) $(am__append_2300) $(am__append_2307) \ -- $(am__append_2314) $(am__append_2321) probe.module$(EXEEXT) \ -- read.module$(EXEEXT) search.module$(EXEEXT) \ -- search_fs_file.module$(EXEEXT) search_fs_uuid.module$(EXEEXT) \ -- search_label.module$(EXEEXT) $(am__append_2328) \ -- $(am__append_2335) $(am__append_2342) $(am__append_2349) \ -- $(am__append_2356) $(am__append_2363) $(am__append_2370) \ -- $(am__append_2377) $(am__append_2384) $(am__append_2391) \ -- $(am__append_2398) $(am__append_2405) $(am__append_2412) \ -- $(am__append_2419) $(am__append_2426) $(am__append_2433) \ -- sleep.module$(EXEEXT) $(am__append_2440) $(am__append_2447) \ -- terminal.module$(EXEEXT) test.module$(EXEEXT) \ -- true.module$(EXEEXT) $(am__append_2454) $(am__append_2461) \ -- $(am__append_2468) $(am__append_2475) $(am__append_2482) \ -- $(am__append_2489) $(am__append_2496) $(am__append_2503) \ -- $(am__append_2510) videoinfo.module$(EXEEXT) \ -- videotest.module$(EXEEXT) xnu_uuid.module$(EXEEXT) \ -- dm_nv.module$(EXEEXT) loopback.module$(EXEEXT) \ -- cryptodisk.module$(EXEEXT) luks.module$(EXEEXT) \ -- geli.module$(EXEEXT) lvm.module$(EXEEXT) ldm.module$(EXEEXT) \ -- mdraid09.module$(EXEEXT) mdraid09_be.module$(EXEEXT) \ -- mdraid1x.module$(EXEEXT) diskfilter.module$(EXEEXT) \ -- raid5rec.module$(EXEEXT) raid6rec.module$(EXEEXT) \ -- scsi.module$(EXEEXT) memdisk.module$(EXEEXT) \ -- $(am__append_2517) $(am__append_2524) $(am__append_2531) \ -- $(am__append_2538) $(am__append_2545) $(am__append_2552) \ -- $(am__append_2559) $(am__append_2566) $(am__append_2573) \ -- $(am__append_2580) $(am__append_2587) $(am__append_2594) \ -- $(am__append_2601) $(am__append_2608) $(am__append_2615) \ -- $(am__append_2622) $(am__append_2629) $(am__append_2636) \ -- $(am__append_2643) $(am__append_2650) $(am__append_2657) \ -- $(am__append_2664) $(am__append_2671) $(am__append_2678) \ -- $(am__append_2685) $(am__append_2692) $(am__append_2699) \ -- $(am__append_2706) $(am__append_2713) $(am__append_2720) \ -- $(am__append_2727) $(am__append_2734) $(am__append_2741) \ -- $(am__append_2748) $(am__append_2755) $(am__append_2762) \ -- $(am__append_2769) $(am__append_2776) $(am__append_2783) \ -- $(am__append_2790) $(am__append_2797) $(am__append_2804) \ -- $(am__append_2811) $(am__append_2818) $(am__append_2825) \ -- $(am__append_2832) $(am__append_2839) $(am__append_2846) \ -- $(am__append_2853) $(am__append_2860) $(am__append_2867) \ -- $(am__append_2874) $(am__append_2881) $(am__append_2888) \ -- $(am__append_2895) $(am__append_2902) $(am__append_2909) \ -- $(am__append_2916) $(am__append_2923) $(am__append_2930) \ -- $(am__append_2937) procfs.module$(EXEEXT) affs.module$(EXEEXT) \ -- afs.module$(EXEEXT) bfs.module$(EXEEXT) zstd.module$(EXEEXT) \ -- btrfs.module$(EXEEXT) archelp.module$(EXEEXT) \ -- cbfs.module$(EXEEXT) cpio.module$(EXEEXT) \ -- cpio_be.module$(EXEEXT) newc.module$(EXEEXT) \ -- odc.module$(EXEEXT) ext2.module$(EXEEXT) fat.module$(EXEEXT) \ -- exfat.module$(EXEEXT) f2fs.module$(EXEEXT) \ -+ $(am__append_2090) $(am__append_2097) help.module$(EXEEXT) \ -+ hexdump.module$(EXEEXT) keystatus.module$(EXEEXT) \ -+ $(am__append_2104) $(am__append_2111) loadenv.module$(EXEEXT) \ -+ ls.module$(EXEEXT) lsmmap.module$(EXEEXT) $(am__append_2118) \ -+ $(am__append_2125) $(am__append_2132) $(am__append_2139) \ -+ $(am__append_2146) $(am__append_2153) $(am__append_2160) \ -+ $(am__append_2167) memrw.module$(EXEEXT) \ -+ minicmd.module$(EXEEXT) parttool.module$(EXEEXT) \ -+ password.module$(EXEEXT) password_pbkdf2.module$(EXEEXT) \ -+ $(am__append_2174) $(am__append_2181) $(am__append_2188) \ -+ $(am__append_2195) $(am__append_2202) $(am__append_2209) \ -+ $(am__append_2216) $(am__append_2223) $(am__append_2230) \ -+ $(am__append_2237) $(am__append_2244) $(am__append_2251) \ -+ $(am__append_2258) $(am__append_2265) $(am__append_2272) \ -+ $(am__append_2279) $(am__append_2286) $(am__append_2293) \ -+ $(am__append_2300) $(am__append_2307) $(am__append_2314) \ -+ probe.module$(EXEEXT) read.module$(EXEEXT) \ -+ search.module$(EXEEXT) search_fs_file.module$(EXEEXT) \ -+ search_fs_uuid.module$(EXEEXT) search_label.module$(EXEEXT) \ -+ $(am__append_2321) $(am__append_2328) $(am__append_2335) \ -+ $(am__append_2342) $(am__append_2349) $(am__append_2356) \ -+ $(am__append_2363) $(am__append_2370) $(am__append_2377) \ -+ $(am__append_2384) $(am__append_2391) $(am__append_2398) \ -+ $(am__append_2405) $(am__append_2412) $(am__append_2419) \ -+ $(am__append_2426) sleep.module$(EXEEXT) $(am__append_2433) \ -+ $(am__append_2440) terminal.module$(EXEEXT) \ -+ test.module$(EXEEXT) true.module$(EXEEXT) $(am__append_2447) \ -+ $(am__append_2454) $(am__append_2461) $(am__append_2468) \ -+ $(am__append_2475) $(am__append_2482) $(am__append_2489) \ -+ $(am__append_2496) $(am__append_2503) \ -+ videoinfo.module$(EXEEXT) videotest.module$(EXEEXT) \ -+ xnu_uuid.module$(EXEEXT) dm_nv.module$(EXEEXT) \ -+ loopback.module$(EXEEXT) cryptodisk.module$(EXEEXT) \ -+ luks.module$(EXEEXT) geli.module$(EXEEXT) lvm.module$(EXEEXT) \ -+ ldm.module$(EXEEXT) mdraid09.module$(EXEEXT) \ -+ mdraid09_be.module$(EXEEXT) mdraid1x.module$(EXEEXT) \ -+ diskfilter.module$(EXEEXT) raid5rec.module$(EXEEXT) \ -+ raid6rec.module$(EXEEXT) scsi.module$(EXEEXT) \ -+ memdisk.module$(EXEEXT) $(am__append_2510) $(am__append_2517) \ -+ $(am__append_2524) $(am__append_2531) $(am__append_2538) \ -+ $(am__append_2545) $(am__append_2552) $(am__append_2559) \ -+ $(am__append_2566) $(am__append_2573) $(am__append_2580) \ -+ $(am__append_2587) $(am__append_2594) $(am__append_2601) \ -+ $(am__append_2608) $(am__append_2615) $(am__append_2622) \ -+ $(am__append_2629) $(am__append_2636) $(am__append_2643) \ -+ $(am__append_2650) $(am__append_2657) $(am__append_2664) \ -+ $(am__append_2671) $(am__append_2678) $(am__append_2685) \ -+ $(am__append_2692) $(am__append_2699) $(am__append_2706) \ -+ $(am__append_2713) $(am__append_2720) $(am__append_2727) \ -+ $(am__append_2734) $(am__append_2741) $(am__append_2748) \ -+ $(am__append_2755) $(am__append_2762) $(am__append_2769) \ -+ $(am__append_2776) $(am__append_2783) $(am__append_2790) \ -+ $(am__append_2797) $(am__append_2804) $(am__append_2811) \ -+ $(am__append_2818) $(am__append_2825) $(am__append_2832) \ -+ $(am__append_2839) $(am__append_2846) $(am__append_2853) \ -+ $(am__append_2860) $(am__append_2867) $(am__append_2874) \ -+ $(am__append_2881) $(am__append_2888) $(am__append_2895) \ -+ $(am__append_2902) $(am__append_2909) $(am__append_2916) \ -+ $(am__append_2923) $(am__append_2930) procfs.module$(EXEEXT) \ -+ affs.module$(EXEEXT) afs.module$(EXEEXT) bfs.module$(EXEEXT) \ -+ zstd.module$(EXEEXT) btrfs.module$(EXEEXT) \ -+ archelp.module$(EXEEXT) cbfs.module$(EXEEXT) \ -+ cpio.module$(EXEEXT) cpio_be.module$(EXEEXT) \ -+ newc.module$(EXEEXT) odc.module$(EXEEXT) ext2.module$(EXEEXT) \ -+ fat.module$(EXEEXT) exfat.module$(EXEEXT) f2fs.module$(EXEEXT) \ - fshelp.module$(EXEEXT) hfs.module$(EXEEXT) \ - hfsplus.module$(EXEEXT) hfspluscomp.module$(EXEEXT) \ - iso9660.module$(EXEEXT) jfs.module$(EXEEXT) \ -@@ -15906,166 +15883,166 @@ MODULE_FILES = disk.module$(EXEEXT) trig.module$(EXEEXT) \ - ufs1_be.module$(EXEEXT) ufs2.module$(EXEEXT) \ - xfs.module$(EXEEXT) zfs.module$(EXEEXT) \ - zfscrypt.module$(EXEEXT) zfsinfo.module$(EXEEXT) \ -- macbless.module$(EXEEXT) $(am__append_2944) \ -+ macbless.module$(EXEEXT) $(am__append_2937) \ - gettext.module$(EXEEXT) gfxmenu.module$(EXEEXT) \ - hello.module$(EXEEXT) gzio.module$(EXEEXT) \ -- offsetio.module$(EXEEXT) $(am__append_2951) $(am__append_2958) \ -- $(am__append_2965) $(am__append_2972) $(am__append_2979) \ -- $(am__append_2986) $(am__append_2993) $(am__append_3000) \ -- $(am__append_3007) $(am__append_3014) $(am__append_3021) \ -- $(am__append_3028) $(am__append_3035) $(am__append_3042) \ -- $(am__append_3049) $(am__append_3056) $(am__append_3063) \ -- $(am__append_3070) $(am__append_3077) $(am__append_3084) \ -+ offsetio.module$(EXEEXT) $(am__append_2944) $(am__append_2951) \ -+ $(am__append_2958) $(am__append_2965) $(am__append_2972) \ -+ $(am__append_2979) $(am__append_2986) $(am__append_2993) \ -+ $(am__append_3000) $(am__append_3007) $(am__append_3014) \ -+ $(am__append_3021) $(am__append_3028) $(am__append_3035) \ -+ $(am__append_3042) $(am__append_3049) $(am__append_3056) \ -+ $(am__append_3063) $(am__append_3070) $(am__append_3077) \ - elf.module$(EXEEXT) crypto.module$(EXEEXT) \ -- pbkdf2.module$(EXEEXT) $(am__append_3091) $(am__append_3098) \ -- $(am__append_3105) $(am__append_3112) $(am__append_3119) \ -- $(am__append_3126) $(am__append_3133) $(am__append_3140) \ -- $(am__append_3147) $(am__append_3154) $(am__append_3161) \ -- $(am__append_3168) $(am__append_3175) $(am__append_3182) \ -- $(am__append_3189) $(am__append_3196) $(am__append_3203) \ -- $(am__append_3210) $(am__append_3217) $(am__append_3224) \ -- $(am__append_3231) $(am__append_3238) $(am__append_3245) \ -- $(am__append_3252) $(am__append_3259) $(am__append_3266) \ -- $(am__append_3273) $(am__append_3280) $(am__append_3287) \ -- $(am__append_3294) $(am__append_3301) $(am__append_3308) \ -- $(am__append_3315) $(am__append_3322) $(am__append_3329) \ -- $(am__append_3336) setjmp.module$(EXEEXT) $(am__append_3343) \ -- $(am__append_3350) $(am__append_3357) $(am__append_3364) \ -- $(am__append_3371) $(am__append_3378) $(am__append_3385) \ -- $(am__append_3392) $(am__append_3399) $(am__append_3406) \ -- $(am__append_3413) $(am__append_3420) $(am__append_3427) \ -- $(am__append_3434) $(am__append_3441) $(am__append_3448) \ -- $(am__append_3455) $(am__append_3462) $(am__append_3469) \ -- $(am__append_3476) $(am__append_3483) $(am__append_3490) \ -- $(am__append_3497) $(am__append_3504) $(am__append_3511) \ -- $(am__append_3518) $(am__append_3525) $(am__append_3532) \ -- $(am__append_3539) $(am__append_3546) $(am__append_3553) \ -- $(am__append_3560) $(am__append_3567) $(am__append_3574) \ -- $(am__append_3581) $(am__append_3588) $(am__append_3595) \ -- $(am__append_3602) $(am__append_3609) $(am__append_3616) \ -- $(am__append_3623) $(am__append_3630) $(am__append_3637) \ -- $(am__append_3644) $(am__append_3651) $(am__append_3658) \ -- $(am__append_3665) $(am__append_3672) $(am__append_3679) \ -- $(am__append_3686) $(am__append_3693) $(am__append_3700) \ -- $(am__append_3707) $(am__append_3714) $(am__append_3721) \ -- $(am__append_3728) $(am__append_3735) $(am__append_3742) \ -- $(am__append_3749) $(am__append_3756) $(am__append_3763) \ -- $(am__append_3770) $(am__append_3777) $(am__append_3784) \ -- $(am__append_3791) $(am__append_3798) $(am__append_3805) \ -- $(am__append_3812) $(am__append_3819) $(am__append_3826) \ -- $(am__append_3833) $(am__append_3840) $(am__append_3847) \ -- $(am__append_3854) $(am__append_3861) $(am__append_3868) \ -- $(am__append_3875) $(am__append_3882) macho.module$(EXEEXT) \ -- $(am__append_3889) $(am__append_3896) $(am__append_3903) \ -- $(am__append_3910) $(am__append_3917) $(am__append_3924) \ -- $(am__append_3931) $(am__append_3938) $(am__append_3945) \ -- $(am__append_3952) $(am__append_3959) $(am__append_3966) \ -- $(am__append_3973) $(am__append_3980) $(am__append_3987) \ -- $(am__append_3994) $(am__append_4001) $(am__append_4008) \ -- $(am__append_4015) $(am__append_4022) $(am__append_4029) \ -- $(am__append_4036) $(am__append_4043) $(am__append_4050) \ -- $(am__append_4057) $(am__append_4064) $(am__append_4071) \ -+ pbkdf2.module$(EXEEXT) $(am__append_3084) $(am__append_3091) \ -+ $(am__append_3098) $(am__append_3105) $(am__append_3112) \ -+ $(am__append_3119) $(am__append_3126) $(am__append_3133) \ -+ $(am__append_3140) $(am__append_3147) $(am__append_3154) \ -+ $(am__append_3161) $(am__append_3168) $(am__append_3175) \ -+ $(am__append_3182) $(am__append_3189) $(am__append_3196) \ -+ $(am__append_3203) $(am__append_3210) $(am__append_3217) \ -+ $(am__append_3224) $(am__append_3231) $(am__append_3238) \ -+ $(am__append_3245) $(am__append_3252) $(am__append_3259) \ -+ $(am__append_3266) $(am__append_3273) $(am__append_3280) \ -+ $(am__append_3287) $(am__append_3294) $(am__append_3301) \ -+ $(am__append_3308) $(am__append_3315) $(am__append_3322) \ -+ $(am__append_3329) setjmp.module$(EXEEXT) $(am__append_3336) \ -+ $(am__append_3343) $(am__append_3350) $(am__append_3357) \ -+ $(am__append_3364) $(am__append_3371) $(am__append_3378) \ -+ $(am__append_3385) $(am__append_3392) $(am__append_3399) \ -+ $(am__append_3406) $(am__append_3413) $(am__append_3420) \ -+ $(am__append_3427) $(am__append_3434) $(am__append_3441) \ -+ $(am__append_3448) $(am__append_3455) $(am__append_3462) \ -+ $(am__append_3469) $(am__append_3476) $(am__append_3483) \ -+ $(am__append_3490) $(am__append_3497) $(am__append_3504) \ -+ $(am__append_3511) $(am__append_3518) $(am__append_3525) \ -+ $(am__append_3532) $(am__append_3539) $(am__append_3546) \ -+ $(am__append_3553) $(am__append_3560) $(am__append_3567) \ -+ $(am__append_3574) $(am__append_3581) $(am__append_3588) \ -+ $(am__append_3595) $(am__append_3602) $(am__append_3609) \ -+ $(am__append_3616) $(am__append_3623) $(am__append_3630) \ -+ $(am__append_3637) $(am__append_3644) $(am__append_3651) \ -+ $(am__append_3658) $(am__append_3665) $(am__append_3672) \ -+ $(am__append_3679) $(am__append_3686) $(am__append_3693) \ -+ $(am__append_3700) $(am__append_3707) $(am__append_3714) \ -+ $(am__append_3721) $(am__append_3728) $(am__append_3735) \ -+ $(am__append_3742) $(am__append_3749) $(am__append_3756) \ -+ $(am__append_3763) $(am__append_3770) $(am__append_3777) \ -+ $(am__append_3784) $(am__append_3791) $(am__append_3798) \ -+ $(am__append_3805) $(am__append_3812) $(am__append_3819) \ -+ $(am__append_3826) $(am__append_3833) $(am__append_3840) \ -+ $(am__append_3847) $(am__append_3854) $(am__append_3861) \ -+ $(am__append_3868) $(am__append_3875) macho.module$(EXEEXT) \ -+ $(am__append_3882) $(am__append_3889) $(am__append_3896) \ -+ $(am__append_3903) $(am__append_3910) $(am__append_3917) \ -+ $(am__append_3924) $(am__append_3931) $(am__append_3938) \ -+ $(am__append_3945) $(am__append_3952) $(am__append_3959) \ -+ $(am__append_3966) $(am__append_3973) $(am__append_3980) \ -+ $(am__append_3987) $(am__append_3994) $(am__append_4001) \ -+ $(am__append_4008) $(am__append_4015) $(am__append_4022) \ -+ $(am__append_4029) $(am__append_4036) $(am__append_4043) \ -+ $(am__append_4050) $(am__append_4057) $(am__append_4064) \ - normal.module$(EXEEXT) part_acorn.module$(EXEEXT) \ - part_amiga.module$(EXEEXT) part_apple.module$(EXEEXT) \ - part_gpt.module$(EXEEXT) part_msdos.module$(EXEEXT) \ - part_sun.module$(EXEEXT) part_plan.module$(EXEEXT) \ - part_dvh.module$(EXEEXT) part_bsd.module$(EXEEXT) \ - part_sunpc.module$(EXEEXT) part_dfly.module$(EXEEXT) \ -- msdospart.module$(EXEEXT) $(am__append_4078) \ -- $(am__append_4085) $(am__append_4092) $(am__append_4099) \ -- $(am__append_4106) $(am__append_4113) $(am__append_4120) \ -- $(am__append_4127) $(am__append_4134) $(am__append_4141) \ -- $(am__append_4148) $(am__append_4155) $(am__append_4162) \ -- $(am__append_4169) $(am__append_4176) $(am__append_4183) \ -- $(am__append_4190) $(am__append_4197) $(am__append_4204) \ -- $(am__append_4211) $(am__append_4218) $(am__append_4225) \ -- $(am__append_4232) $(am__append_4239) $(am__append_4246) \ -- $(am__append_4253) $(am__append_4260) \ -- gfxterm_background.module$(EXEEXT) $(am__append_4267) \ -- $(am__append_4274) $(am__append_4281) $(am__append_4288) \ -- $(am__append_4295) $(am__append_4302) $(am__append_4309) \ -- $(am__append_4316) $(am__append_4323) $(am__append_4330) \ -- $(am__append_4337) $(am__append_4344) $(am__append_4351) \ -- $(am__append_4358) $(am__append_4365) $(am__append_4372) \ -- $(am__append_4379) $(am__append_4386) $(am__append_4393) \ -- $(am__append_4400) $(am__append_4407) $(am__append_4414) \ -- $(am__append_4421) $(am__append_4428) $(am__append_4435) \ -- $(am__append_4442) $(am__append_4449) $(am__append_4456) \ -- $(am__append_4463) $(am__append_4470) $(am__append_4477) \ -- $(am__append_4484) $(am__append_4491) $(am__append_4498) \ -- $(am__append_4505) $(am__append_4512) $(am__append_4519) \ -- $(am__append_4526) $(am__append_4533) $(am__append_4540) \ -- $(am__append_4547) $(am__append_4554) $(am__append_4561) \ -- $(am__append_4568) $(am__append_4575) $(am__append_4582) \ -- $(am__append_4589) $(am__append_4596) $(am__append_4603) \ -- $(am__append_4610) $(am__append_4617) $(am__append_4624) \ -- $(am__append_4631) $(am__append_4638) $(am__append_4645) \ -+ msdospart.module$(EXEEXT) $(am__append_4071) \ -+ $(am__append_4078) $(am__append_4085) $(am__append_4092) \ -+ $(am__append_4099) $(am__append_4106) $(am__append_4113) \ -+ $(am__append_4120) $(am__append_4127) $(am__append_4134) \ -+ $(am__append_4141) $(am__append_4148) $(am__append_4155) \ -+ $(am__append_4162) $(am__append_4169) $(am__append_4176) \ -+ $(am__append_4183) $(am__append_4190) $(am__append_4197) \ -+ $(am__append_4204) $(am__append_4211) $(am__append_4218) \ -+ $(am__append_4225) $(am__append_4232) $(am__append_4239) \ -+ $(am__append_4246) $(am__append_4253) \ -+ gfxterm_background.module$(EXEEXT) $(am__append_4260) \ -+ $(am__append_4267) $(am__append_4274) $(am__append_4281) \ -+ $(am__append_4288) $(am__append_4295) $(am__append_4302) \ -+ $(am__append_4309) $(am__append_4316) $(am__append_4323) \ -+ $(am__append_4330) $(am__append_4337) $(am__append_4344) \ -+ $(am__append_4351) $(am__append_4358) $(am__append_4365) \ -+ $(am__append_4372) $(am__append_4379) $(am__append_4386) \ -+ $(am__append_4393) $(am__append_4400) $(am__append_4407) \ -+ $(am__append_4414) $(am__append_4421) $(am__append_4428) \ -+ $(am__append_4435) $(am__append_4442) $(am__append_4449) \ -+ $(am__append_4456) $(am__append_4463) $(am__append_4470) \ -+ $(am__append_4477) $(am__append_4484) $(am__append_4491) \ -+ $(am__append_4498) $(am__append_4505) $(am__append_4512) \ -+ $(am__append_4519) $(am__append_4526) $(am__append_4533) \ -+ $(am__append_4540) $(am__append_4547) $(am__append_4554) \ -+ $(am__append_4561) $(am__append_4568) $(am__append_4575) \ -+ $(am__append_4582) $(am__append_4589) $(am__append_4596) \ -+ $(am__append_4603) $(am__append_4610) $(am__append_4617) \ -+ $(am__append_4624) $(am__append_4631) $(am__append_4638) \ - functional_test.module$(EXEEXT) exfctest.module$(EXEEXT) \ - strtoull_test.module$(EXEEXT) setjmp_test.module$(EXEEXT) \ - signature_test.module$(EXEEXT) sleep_test.module$(EXEEXT) \ - xnu_uuid_test.module$(EXEEXT) pbkdf2_test.module$(EXEEXT) \ -- $(am__append_4652) $(am__append_4659) $(am__append_4666) \ -- $(am__append_4673) $(am__append_4680) $(am__append_4687) \ -- $(am__append_4694) $(am__append_4701) $(am__append_4708) \ -- $(am__append_4715) $(am__append_4722) $(am__append_4729) \ -- $(am__append_4736) $(am__append_4743) $(am__append_4750) \ -- $(am__append_4757) $(am__append_4764) $(am__append_4771) \ -- $(am__append_4778) $(am__append_4785) $(am__append_4792) \ -- $(am__append_4799) $(am__append_4806) $(am__append_4813) \ -- $(am__append_4820) div_test.module$(EXEEXT) \ -+ $(am__append_4645) $(am__append_4652) $(am__append_4659) \ -+ $(am__append_4666) $(am__append_4673) $(am__append_4680) \ -+ $(am__append_4687) $(am__append_4694) $(am__append_4701) \ -+ $(am__append_4708) $(am__append_4715) $(am__append_4722) \ -+ $(am__append_4729) $(am__append_4736) $(am__append_4743) \ -+ $(am__append_4750) $(am__append_4757) $(am__append_4764) \ -+ $(am__append_4771) $(am__append_4778) $(am__append_4785) \ -+ $(am__append_4792) $(am__append_4799) $(am__append_4806) \ -+ $(am__append_4813) div_test.module$(EXEEXT) \ - mul_test.module$(EXEEXT) shift_test.module$(EXEEXT) \ - cmp_test.module$(EXEEXT) ctz_test.module$(EXEEXT) \ - bswap_test.module$(EXEEXT) videotest_checksum.module$(EXEEXT) \ - gfxterm_menu.module$(EXEEXT) cmdline_cat_test.module$(EXEEXT) \ - bitmap.module$(EXEEXT) bitmap_scale.module$(EXEEXT) \ -- $(am__append_4827) $(am__append_4834) $(am__append_4841) \ -- $(am__append_4848) $(am__append_4855) $(am__append_4862) \ -- $(am__append_4869) $(am__append_4876) $(am__append_4883) \ -+ $(am__append_4820) $(am__append_4827) $(am__append_4834) \ -+ $(am__append_4841) $(am__append_4848) $(am__append_4855) \ -+ $(am__append_4862) $(am__append_4869) $(am__append_4876) \ - jpeg.module$(EXEEXT) png.module$(EXEEXT) tga.module$(EXEEXT) \ -- $(am__append_4890) $(am__append_4897) $(am__append_4904) \ -- $(am__append_4911) $(am__append_4918) $(am__append_4925) \ -- $(am__append_4932) $(am__append_4939) $(am__append_4946) \ -- $(am__append_4953) $(am__append_4960) $(am__append_4967) \ -- $(am__append_4974) $(am__append_4981) $(am__append_4988) \ -- $(am__append_4995) $(am__append_5002) $(am__append_5009) \ -- $(am__append_5016) $(am__append_5023) $(am__append_5030) \ -- $(am__append_5037) $(am__append_5044) $(am__append_5051) \ -- $(am__append_5058) $(am__append_5065) $(am__append_5072) \ -- $(am__append_5079) $(am__append_5086) $(am__append_5093) \ -- $(am__append_5100) $(am__append_5107) $(am__append_5114) \ -- $(am__append_5121) $(am__append_5128) $(am__append_5135) \ -- $(am__append_5142) $(am__append_5149) $(am__append_5156) \ -- $(am__append_5163) $(am__append_5170) \ -- video_colors.module$(EXEEXT) $(am__append_5177) \ -- $(am__append_5184) datehook.module$(EXEEXT) \ -+ $(am__append_4883) $(am__append_4890) $(am__append_4897) \ -+ $(am__append_4904) $(am__append_4911) $(am__append_4918) \ -+ $(am__append_4925) $(am__append_4932) $(am__append_4939) \ -+ $(am__append_4946) $(am__append_4953) $(am__append_4960) \ -+ $(am__append_4967) $(am__append_4974) $(am__append_4981) \ -+ $(am__append_4988) $(am__append_4995) $(am__append_5002) \ -+ $(am__append_5009) $(am__append_5016) $(am__append_5023) \ -+ $(am__append_5030) $(am__append_5037) $(am__append_5044) \ -+ $(am__append_5051) $(am__append_5058) $(am__append_5065) \ -+ $(am__append_5072) $(am__append_5079) $(am__append_5086) \ -+ $(am__append_5093) $(am__append_5100) $(am__append_5107) \ -+ $(am__append_5114) $(am__append_5121) $(am__append_5128) \ -+ $(am__append_5135) $(am__append_5142) $(am__append_5149) \ -+ $(am__append_5156) $(am__append_5163) \ -+ video_colors.module$(EXEEXT) $(am__append_5170) \ -+ $(am__append_5177) datehook.module$(EXEEXT) \ - net.module$(EXEEXT) tftp.module$(EXEEXT) http.module$(EXEEXT) \ -- $(am__append_5191) $(am__append_5198) $(am__append_5205) \ -- $(am__append_5212) $(am__append_5219) $(am__append_5226) \ -- $(am__append_5233) $(am__append_5240) $(am__append_5247) \ -- $(am__append_5254) $(am__append_5261) $(am__append_5268) \ -- $(am__append_5275) $(am__append_5282) $(am__append_5289) \ -- $(am__append_5296) $(am__append_5303) $(am__append_5310) \ -+ $(am__append_5184) $(am__append_5191) $(am__append_5198) \ -+ $(am__append_5205) $(am__append_5212) $(am__append_5219) \ -+ $(am__append_5226) $(am__append_5233) $(am__append_5240) \ -+ $(am__append_5247) $(am__append_5254) $(am__append_5261) \ -+ $(am__append_5268) $(am__append_5275) $(am__append_5282) \ -+ $(am__append_5289) $(am__append_5296) $(am__append_5303) \ - syslinuxcfg.module$(EXEEXT) test_blockarg.module$(EXEEXT) \ - xzio.module$(EXEEXT) lzopio.module$(EXEEXT) \ -- testload.module$(EXEEXT) $(am__append_5317) $(am__append_5324) \ -- $(am__append_5331) $(am__append_5338) $(am__append_5345) \ -- $(am__append_5352) $(am__append_5359) $(am__append_5366) \ -- $(am__append_5373) $(am__append_5380) $(am__append_5387) \ -- $(am__append_5394) $(am__append_5401) $(am__append_5408) \ -- $(am__append_5415) $(am__append_5422) $(am__append_5429) \ -+ testload.module$(EXEEXT) $(am__append_5310) $(am__append_5317) \ -+ $(am__append_5324) $(am__append_5331) $(am__append_5338) \ -+ $(am__append_5345) $(am__append_5352) $(am__append_5359) \ -+ $(am__append_5366) $(am__append_5373) $(am__append_5380) \ -+ $(am__append_5387) $(am__append_5394) $(am__append_5401) \ -+ $(am__append_5408) $(am__append_5415) $(am__append_5422) \ - priority_queue.module$(EXEEXT) time.module$(EXEEXT) \ -- $(am__append_5436) $(am__append_5443) adler32.module$(EXEEXT) \ -+ $(am__append_5429) $(am__append_5436) adler32.module$(EXEEXT) \ - crc64.module$(EXEEXT) mpi.module$(EXEEXT) \ -- all_video.module$(EXEEXT) $(am__append_5450) \ -- $(am__append_5457) $(am__append_5464) $(am__append_5471) \ -- $(am__append_5478) $(am__append_5485) \ -- testspeed.module$(EXEEXT) $(am__append_5492) \ -+ all_video.module$(EXEEXT) $(am__append_5443) \ -+ $(am__append_5450) $(am__append_5457) $(am__append_5464) \ -+ $(am__append_5471) $(am__append_5478) \ -+ testspeed.module$(EXEEXT) $(am__append_5485) \ - tr.module$(EXEEXT) progress.module$(EXEEXT) \ -- file.module$(EXEEXT) $(am__append_5499) $(am__append_5506) \ -- $(am__append_5513) $(am__append_5520) $(am__append_5527) \ -- $(am__append_5534) $(am__append_5541) $(am__append_5548) \ -- $(am__append_5555) $(am__append_5562) $(am__append_5569) \ -- $(am__append_5576) $(am__append_5583) $(am__append_5590) \ -+ file.module$(EXEEXT) $(am__append_5492) $(am__append_5499) \ -+ $(am__append_5506) $(am__append_5513) $(am__append_5520) \ -+ $(am__append_5527) $(am__append_5534) $(am__append_5541) \ -+ $(am__append_5548) $(am__append_5555) $(am__append_5562) \ -+ $(am__append_5569) $(am__append_5576) $(am__append_5583) \ - gcry_arcfour.module$(EXEEXT) gcry_blowfish.module$(EXEEXT) \ - gcry_camellia.module$(EXEEXT) gcry_cast5.module$(EXEEXT) \ - gcry_crc.module$(EXEEXT) gcry_des.module$(EXEEXT) \ -@@ -16180,58 +16157,58 @@ MARKER_FILES = disk.marker trig.marker $(am__append_9) \ - hashsum.marker pgp.marker $(am__append_2046) \ - $(am__append_2053) $(am__append_2060) $(am__append_2067) \ - $(am__append_2074) $(am__append_2081) $(am__append_2088) \ -- $(am__append_2095) $(am__append_2102) $(am__append_2109) \ -- help.marker hexdump.marker keystatus.marker $(am__append_2116) \ -- $(am__append_2123) loadenv.marker ls.marker lsmmap.marker \ -- $(am__append_2130) $(am__append_2137) $(am__append_2144) \ -- $(am__append_2151) $(am__append_2158) $(am__append_2165) \ -- $(am__append_2172) $(am__append_2179) memrw.marker \ -+ $(am__append_2095) $(am__append_2102) help.marker \ -+ hexdump.marker keystatus.marker $(am__append_2109) \ -+ $(am__append_2116) loadenv.marker ls.marker lsmmap.marker \ -+ $(am__append_2123) $(am__append_2130) $(am__append_2137) \ -+ $(am__append_2144) $(am__append_2151) $(am__append_2158) \ -+ $(am__append_2165) $(am__append_2172) memrw.marker \ - minicmd.marker parttool.marker password.marker \ -- password_pbkdf2.marker $(am__append_2186) $(am__append_2193) \ -- $(am__append_2200) $(am__append_2207) $(am__append_2214) \ -- $(am__append_2221) $(am__append_2228) $(am__append_2235) \ -- $(am__append_2242) $(am__append_2249) $(am__append_2256) \ -- $(am__append_2263) $(am__append_2270) $(am__append_2277) \ -- $(am__append_2284) $(am__append_2291) $(am__append_2298) \ -- $(am__append_2305) $(am__append_2312) $(am__append_2319) \ -- $(am__append_2326) probe.marker read.marker search.marker \ -+ password_pbkdf2.marker $(am__append_2179) $(am__append_2186) \ -+ $(am__append_2193) $(am__append_2200) $(am__append_2207) \ -+ $(am__append_2214) $(am__append_2221) $(am__append_2228) \ -+ $(am__append_2235) $(am__append_2242) $(am__append_2249) \ -+ $(am__append_2256) $(am__append_2263) $(am__append_2270) \ -+ $(am__append_2277) $(am__append_2284) $(am__append_2291) \ -+ $(am__append_2298) $(am__append_2305) $(am__append_2312) \ -+ $(am__append_2319) probe.marker read.marker search.marker \ - search_fs_file.marker search_fs_uuid.marker \ -- search_label.marker $(am__append_2333) $(am__append_2340) \ -- $(am__append_2347) $(am__append_2354) $(am__append_2361) \ -- $(am__append_2368) $(am__append_2375) $(am__append_2382) \ -- $(am__append_2389) $(am__append_2396) $(am__append_2403) \ -- $(am__append_2410) $(am__append_2417) $(am__append_2424) \ -- $(am__append_2431) $(am__append_2438) sleep.marker \ -- $(am__append_2445) $(am__append_2452) terminal.marker \ -- test.marker true.marker $(am__append_2459) $(am__append_2466) \ -- $(am__append_2473) $(am__append_2480) $(am__append_2487) \ -- $(am__append_2494) $(am__append_2501) $(am__append_2508) \ -- $(am__append_2515) videoinfo.marker videotest.marker \ -+ search_label.marker $(am__append_2326) $(am__append_2333) \ -+ $(am__append_2340) $(am__append_2347) $(am__append_2354) \ -+ $(am__append_2361) $(am__append_2368) $(am__append_2375) \ -+ $(am__append_2382) $(am__append_2389) $(am__append_2396) \ -+ $(am__append_2403) $(am__append_2410) $(am__append_2417) \ -+ $(am__append_2424) $(am__append_2431) sleep.marker \ -+ $(am__append_2438) $(am__append_2445) terminal.marker \ -+ test.marker true.marker $(am__append_2452) $(am__append_2459) \ -+ $(am__append_2466) $(am__append_2473) $(am__append_2480) \ -+ $(am__append_2487) $(am__append_2494) $(am__append_2501) \ -+ $(am__append_2508) videoinfo.marker videotest.marker \ - xnu_uuid.marker dm_nv.marker loopback.marker cryptodisk.marker \ - luks.marker geli.marker lvm.marker ldm.marker mdraid09.marker \ - mdraid09_be.marker mdraid1x.marker diskfilter.marker \ - raid5rec.marker raid6rec.marker scsi.marker memdisk.marker \ -- $(am__append_2522) $(am__append_2529) $(am__append_2536) \ -- $(am__append_2543) $(am__append_2550) $(am__append_2557) \ -- $(am__append_2564) $(am__append_2571) $(am__append_2578) \ -- $(am__append_2585) $(am__append_2592) $(am__append_2599) \ -- $(am__append_2606) $(am__append_2613) $(am__append_2620) \ -- $(am__append_2627) $(am__append_2634) $(am__append_2641) \ -- $(am__append_2648) $(am__append_2655) $(am__append_2662) \ -- $(am__append_2669) $(am__append_2676) $(am__append_2683) \ -- $(am__append_2690) $(am__append_2697) $(am__append_2704) \ -- $(am__append_2711) $(am__append_2718) $(am__append_2725) \ -- $(am__append_2732) $(am__append_2739) $(am__append_2746) \ -- $(am__append_2753) $(am__append_2760) $(am__append_2767) \ -- $(am__append_2774) $(am__append_2781) $(am__append_2788) \ -- $(am__append_2795) $(am__append_2802) $(am__append_2809) \ -- $(am__append_2816) $(am__append_2823) $(am__append_2830) \ -- $(am__append_2837) $(am__append_2844) $(am__append_2851) \ -- $(am__append_2858) $(am__append_2865) $(am__append_2872) \ -- $(am__append_2879) $(am__append_2886) $(am__append_2893) \ -- $(am__append_2900) $(am__append_2907) $(am__append_2914) \ -- $(am__append_2921) $(am__append_2928) $(am__append_2935) \ -- $(am__append_2942) procfs.marker affs.marker afs.marker \ -+ $(am__append_2515) $(am__append_2522) $(am__append_2529) \ -+ $(am__append_2536) $(am__append_2543) $(am__append_2550) \ -+ $(am__append_2557) $(am__append_2564) $(am__append_2571) \ -+ $(am__append_2578) $(am__append_2585) $(am__append_2592) \ -+ $(am__append_2599) $(am__append_2606) $(am__append_2613) \ -+ $(am__append_2620) $(am__append_2627) $(am__append_2634) \ -+ $(am__append_2641) $(am__append_2648) $(am__append_2655) \ -+ $(am__append_2662) $(am__append_2669) $(am__append_2676) \ -+ $(am__append_2683) $(am__append_2690) $(am__append_2697) \ -+ $(am__append_2704) $(am__append_2711) $(am__append_2718) \ -+ $(am__append_2725) $(am__append_2732) $(am__append_2739) \ -+ $(am__append_2746) $(am__append_2753) $(am__append_2760) \ -+ $(am__append_2767) $(am__append_2774) $(am__append_2781) \ -+ $(am__append_2788) $(am__append_2795) $(am__append_2802) \ -+ $(am__append_2809) $(am__append_2816) $(am__append_2823) \ -+ $(am__append_2830) $(am__append_2837) $(am__append_2844) \ -+ $(am__append_2851) $(am__append_2858) $(am__append_2865) \ -+ $(am__append_2872) $(am__append_2879) $(am__append_2886) \ -+ $(am__append_2893) $(am__append_2900) $(am__append_2907) \ -+ $(am__append_2914) $(am__append_2921) $(am__append_2928) \ -+ $(am__append_2935) procfs.marker affs.marker afs.marker \ - bfs.marker zstd.marker btrfs.marker archelp.marker cbfs.marker \ - cpio.marker cpio_be.marker newc.marker odc.marker ext2.marker \ - fat.marker exfat.marker f2fs.marker fshelp.marker hfs.marker \ -@@ -16242,153 +16219,153 @@ MARKER_FILES = disk.marker trig.marker $(am__append_9) \ - squash4.marker tar.marker udf.marker ufs1.marker \ - ufs1_be.marker ufs2.marker xfs.marker zfs.marker \ - zfscrypt.marker zfsinfo.marker macbless.marker \ -- $(am__append_2949) gettext.marker gfxmenu.marker hello.marker \ -- gzio.marker offsetio.marker $(am__append_2956) \ -- $(am__append_2963) $(am__append_2970) $(am__append_2977) \ -- $(am__append_2984) $(am__append_2991) $(am__append_2998) \ -- $(am__append_3005) $(am__append_3012) $(am__append_3019) \ -- $(am__append_3026) $(am__append_3033) $(am__append_3040) \ -- $(am__append_3047) $(am__append_3054) $(am__append_3061) \ -- $(am__append_3068) $(am__append_3075) $(am__append_3082) \ -- $(am__append_3089) elf.marker crypto.marker pbkdf2.marker \ -- $(am__append_3096) $(am__append_3103) $(am__append_3110) \ -- $(am__append_3117) $(am__append_3124) $(am__append_3131) \ -- $(am__append_3138) $(am__append_3145) $(am__append_3152) \ -- $(am__append_3159) $(am__append_3166) $(am__append_3173) \ -- $(am__append_3180) $(am__append_3187) $(am__append_3194) \ -- $(am__append_3201) $(am__append_3208) $(am__append_3215) \ -- $(am__append_3222) $(am__append_3229) $(am__append_3236) \ -- $(am__append_3243) $(am__append_3250) $(am__append_3257) \ -- $(am__append_3264) $(am__append_3271) $(am__append_3278) \ -- $(am__append_3285) $(am__append_3292) $(am__append_3299) \ -- $(am__append_3306) $(am__append_3313) $(am__append_3320) \ -- $(am__append_3327) $(am__append_3334) $(am__append_3341) \ -- setjmp.marker $(am__append_3348) $(am__append_3355) \ -- $(am__append_3362) $(am__append_3369) $(am__append_3376) \ -- $(am__append_3383) $(am__append_3390) $(am__append_3397) \ -- $(am__append_3404) $(am__append_3411) $(am__append_3418) \ -- $(am__append_3425) $(am__append_3432) $(am__append_3439) \ -- $(am__append_3446) $(am__append_3453) $(am__append_3460) \ -- $(am__append_3467) $(am__append_3474) $(am__append_3481) \ -- $(am__append_3488) $(am__append_3495) $(am__append_3502) \ -- $(am__append_3509) $(am__append_3516) $(am__append_3523) \ -- $(am__append_3530) $(am__append_3537) $(am__append_3544) \ -- $(am__append_3551) $(am__append_3558) $(am__append_3565) \ -- $(am__append_3572) $(am__append_3579) $(am__append_3586) \ -- $(am__append_3593) $(am__append_3600) $(am__append_3607) \ -- $(am__append_3614) $(am__append_3621) $(am__append_3628) \ -- $(am__append_3635) $(am__append_3642) $(am__append_3649) \ -- $(am__append_3656) $(am__append_3663) $(am__append_3670) \ -- $(am__append_3677) $(am__append_3684) $(am__append_3691) \ -- $(am__append_3698) $(am__append_3705) $(am__append_3712) \ -- $(am__append_3719) $(am__append_3726) $(am__append_3733) \ -- $(am__append_3740) $(am__append_3747) $(am__append_3754) \ -- $(am__append_3761) $(am__append_3768) $(am__append_3775) \ -- $(am__append_3782) $(am__append_3789) $(am__append_3796) \ -- $(am__append_3803) $(am__append_3810) $(am__append_3817) \ -- $(am__append_3824) $(am__append_3831) $(am__append_3838) \ -- $(am__append_3845) $(am__append_3852) $(am__append_3859) \ -- $(am__append_3866) $(am__append_3873) $(am__append_3880) \ -- $(am__append_3887) macho.marker $(am__append_3894) \ -- $(am__append_3901) $(am__append_3908) $(am__append_3915) \ -- $(am__append_3922) $(am__append_3929) $(am__append_3936) \ -- $(am__append_3943) $(am__append_3950) $(am__append_3957) \ -- $(am__append_3964) $(am__append_3971) $(am__append_3978) \ -- $(am__append_3985) $(am__append_3992) $(am__append_3999) \ -- $(am__append_4006) $(am__append_4013) $(am__append_4020) \ -- $(am__append_4027) $(am__append_4034) $(am__append_4041) \ -- $(am__append_4048) $(am__append_4055) $(am__append_4062) \ -- $(am__append_4069) $(am__append_4076) normal.marker \ -+ $(am__append_2942) gettext.marker gfxmenu.marker hello.marker \ -+ gzio.marker offsetio.marker $(am__append_2949) \ -+ $(am__append_2956) $(am__append_2963) $(am__append_2970) \ -+ $(am__append_2977) $(am__append_2984) $(am__append_2991) \ -+ $(am__append_2998) $(am__append_3005) $(am__append_3012) \ -+ $(am__append_3019) $(am__append_3026) $(am__append_3033) \ -+ $(am__append_3040) $(am__append_3047) $(am__append_3054) \ -+ $(am__append_3061) $(am__append_3068) $(am__append_3075) \ -+ $(am__append_3082) elf.marker crypto.marker pbkdf2.marker \ -+ $(am__append_3089) $(am__append_3096) $(am__append_3103) \ -+ $(am__append_3110) $(am__append_3117) $(am__append_3124) \ -+ $(am__append_3131) $(am__append_3138) $(am__append_3145) \ -+ $(am__append_3152) $(am__append_3159) $(am__append_3166) \ -+ $(am__append_3173) $(am__append_3180) $(am__append_3187) \ -+ $(am__append_3194) $(am__append_3201) $(am__append_3208) \ -+ $(am__append_3215) $(am__append_3222) $(am__append_3229) \ -+ $(am__append_3236) $(am__append_3243) $(am__append_3250) \ -+ $(am__append_3257) $(am__append_3264) $(am__append_3271) \ -+ $(am__append_3278) $(am__append_3285) $(am__append_3292) \ -+ $(am__append_3299) $(am__append_3306) $(am__append_3313) \ -+ $(am__append_3320) $(am__append_3327) $(am__append_3334) \ -+ setjmp.marker $(am__append_3341) $(am__append_3348) \ -+ $(am__append_3355) $(am__append_3362) $(am__append_3369) \ -+ $(am__append_3376) $(am__append_3383) $(am__append_3390) \ -+ $(am__append_3397) $(am__append_3404) $(am__append_3411) \ -+ $(am__append_3418) $(am__append_3425) $(am__append_3432) \ -+ $(am__append_3439) $(am__append_3446) $(am__append_3453) \ -+ $(am__append_3460) $(am__append_3467) $(am__append_3474) \ -+ $(am__append_3481) $(am__append_3488) $(am__append_3495) \ -+ $(am__append_3502) $(am__append_3509) $(am__append_3516) \ -+ $(am__append_3523) $(am__append_3530) $(am__append_3537) \ -+ $(am__append_3544) $(am__append_3551) $(am__append_3558) \ -+ $(am__append_3565) $(am__append_3572) $(am__append_3579) \ -+ $(am__append_3586) $(am__append_3593) $(am__append_3600) \ -+ $(am__append_3607) $(am__append_3614) $(am__append_3621) \ -+ $(am__append_3628) $(am__append_3635) $(am__append_3642) \ -+ $(am__append_3649) $(am__append_3656) $(am__append_3663) \ -+ $(am__append_3670) $(am__append_3677) $(am__append_3684) \ -+ $(am__append_3691) $(am__append_3698) $(am__append_3705) \ -+ $(am__append_3712) $(am__append_3719) $(am__append_3726) \ -+ $(am__append_3733) $(am__append_3740) $(am__append_3747) \ -+ $(am__append_3754) $(am__append_3761) $(am__append_3768) \ -+ $(am__append_3775) $(am__append_3782) $(am__append_3789) \ -+ $(am__append_3796) $(am__append_3803) $(am__append_3810) \ -+ $(am__append_3817) $(am__append_3824) $(am__append_3831) \ -+ $(am__append_3838) $(am__append_3845) $(am__append_3852) \ -+ $(am__append_3859) $(am__append_3866) $(am__append_3873) \ -+ $(am__append_3880) macho.marker $(am__append_3887) \ -+ $(am__append_3894) $(am__append_3901) $(am__append_3908) \ -+ $(am__append_3915) $(am__append_3922) $(am__append_3929) \ -+ $(am__append_3936) $(am__append_3943) $(am__append_3950) \ -+ $(am__append_3957) $(am__append_3964) $(am__append_3971) \ -+ $(am__append_3978) $(am__append_3985) $(am__append_3992) \ -+ $(am__append_3999) $(am__append_4006) $(am__append_4013) \ -+ $(am__append_4020) $(am__append_4027) $(am__append_4034) \ -+ $(am__append_4041) $(am__append_4048) $(am__append_4055) \ -+ $(am__append_4062) $(am__append_4069) normal.marker \ - part_acorn.marker part_amiga.marker part_apple.marker \ - part_gpt.marker part_msdos.marker part_sun.marker \ - part_plan.marker part_dvh.marker part_bsd.marker \ - part_sunpc.marker part_dfly.marker msdospart.marker \ -- $(am__append_4083) $(am__append_4090) $(am__append_4097) \ -- $(am__append_4104) $(am__append_4111) $(am__append_4118) \ -- $(am__append_4125) $(am__append_4132) $(am__append_4139) \ -- $(am__append_4146) $(am__append_4153) $(am__append_4160) \ -- $(am__append_4167) $(am__append_4174) $(am__append_4181) \ -- $(am__append_4188) $(am__append_4195) $(am__append_4202) \ -- $(am__append_4209) $(am__append_4216) $(am__append_4223) \ -- $(am__append_4230) $(am__append_4237) $(am__append_4244) \ -- $(am__append_4251) $(am__append_4258) $(am__append_4265) \ -- gfxterm_background.marker $(am__append_4272) \ -- $(am__append_4279) $(am__append_4286) $(am__append_4293) \ -- $(am__append_4300) $(am__append_4307) $(am__append_4314) \ -- $(am__append_4321) $(am__append_4328) $(am__append_4335) \ -- $(am__append_4342) $(am__append_4349) $(am__append_4356) \ -- $(am__append_4363) $(am__append_4370) $(am__append_4377) \ -- $(am__append_4384) $(am__append_4391) $(am__append_4398) \ -- $(am__append_4405) $(am__append_4412) $(am__append_4419) \ -- $(am__append_4426) $(am__append_4433) $(am__append_4440) \ -- $(am__append_4447) $(am__append_4454) $(am__append_4461) \ -- $(am__append_4468) $(am__append_4475) $(am__append_4482) \ -- $(am__append_4489) $(am__append_4496) $(am__append_4503) \ -- $(am__append_4510) $(am__append_4517) $(am__append_4524) \ -- $(am__append_4531) $(am__append_4538) $(am__append_4545) \ -- $(am__append_4552) $(am__append_4559) $(am__append_4566) \ -- $(am__append_4573) $(am__append_4580) $(am__append_4587) \ -- $(am__append_4594) $(am__append_4601) $(am__append_4608) \ -- $(am__append_4615) $(am__append_4622) $(am__append_4629) \ -- $(am__append_4636) $(am__append_4643) $(am__append_4650) \ -+ $(am__append_4076) $(am__append_4083) $(am__append_4090) \ -+ $(am__append_4097) $(am__append_4104) $(am__append_4111) \ -+ $(am__append_4118) $(am__append_4125) $(am__append_4132) \ -+ $(am__append_4139) $(am__append_4146) $(am__append_4153) \ -+ $(am__append_4160) $(am__append_4167) $(am__append_4174) \ -+ $(am__append_4181) $(am__append_4188) $(am__append_4195) \ -+ $(am__append_4202) $(am__append_4209) $(am__append_4216) \ -+ $(am__append_4223) $(am__append_4230) $(am__append_4237) \ -+ $(am__append_4244) $(am__append_4251) $(am__append_4258) \ -+ gfxterm_background.marker $(am__append_4265) \ -+ $(am__append_4272) $(am__append_4279) $(am__append_4286) \ -+ $(am__append_4293) $(am__append_4300) $(am__append_4307) \ -+ $(am__append_4314) $(am__append_4321) $(am__append_4328) \ -+ $(am__append_4335) $(am__append_4342) $(am__append_4349) \ -+ $(am__append_4356) $(am__append_4363) $(am__append_4370) \ -+ $(am__append_4377) $(am__append_4384) $(am__append_4391) \ -+ $(am__append_4398) $(am__append_4405) $(am__append_4412) \ -+ $(am__append_4419) $(am__append_4426) $(am__append_4433) \ -+ $(am__append_4440) $(am__append_4447) $(am__append_4454) \ -+ $(am__append_4461) $(am__append_4468) $(am__append_4475) \ -+ $(am__append_4482) $(am__append_4489) $(am__append_4496) \ -+ $(am__append_4503) $(am__append_4510) $(am__append_4517) \ -+ $(am__append_4524) $(am__append_4531) $(am__append_4538) \ -+ $(am__append_4545) $(am__append_4552) $(am__append_4559) \ -+ $(am__append_4566) $(am__append_4573) $(am__append_4580) \ -+ $(am__append_4587) $(am__append_4594) $(am__append_4601) \ -+ $(am__append_4608) $(am__append_4615) $(am__append_4622) \ -+ $(am__append_4629) $(am__append_4636) $(am__append_4643) \ - functional_test.marker exfctest.marker strtoull_test.marker \ - setjmp_test.marker signature_test.marker sleep_test.marker \ -- xnu_uuid_test.marker pbkdf2_test.marker $(am__append_4657) \ -- $(am__append_4664) $(am__append_4671) $(am__append_4678) \ -- $(am__append_4685) $(am__append_4692) $(am__append_4699) \ -- $(am__append_4706) $(am__append_4713) $(am__append_4720) \ -- $(am__append_4727) $(am__append_4734) $(am__append_4741) \ -- $(am__append_4748) $(am__append_4755) $(am__append_4762) \ -- $(am__append_4769) $(am__append_4776) $(am__append_4783) \ -- $(am__append_4790) $(am__append_4797) $(am__append_4804) \ -- $(am__append_4811) $(am__append_4818) $(am__append_4825) \ -+ xnu_uuid_test.marker pbkdf2_test.marker $(am__append_4650) \ -+ $(am__append_4657) $(am__append_4664) $(am__append_4671) \ -+ $(am__append_4678) $(am__append_4685) $(am__append_4692) \ -+ $(am__append_4699) $(am__append_4706) $(am__append_4713) \ -+ $(am__append_4720) $(am__append_4727) $(am__append_4734) \ -+ $(am__append_4741) $(am__append_4748) $(am__append_4755) \ -+ $(am__append_4762) $(am__append_4769) $(am__append_4776) \ -+ $(am__append_4783) $(am__append_4790) $(am__append_4797) \ -+ $(am__append_4804) $(am__append_4811) $(am__append_4818) \ - div_test.marker mul_test.marker shift_test.marker \ - cmp_test.marker ctz_test.marker bswap_test.marker \ - videotest_checksum.marker gfxterm_menu.marker \ - cmdline_cat_test.marker bitmap.marker bitmap_scale.marker \ -- $(am__append_4832) $(am__append_4839) $(am__append_4846) \ -- $(am__append_4853) $(am__append_4860) $(am__append_4867) \ -- $(am__append_4874) $(am__append_4881) $(am__append_4888) \ -- jpeg.marker png.marker tga.marker $(am__append_4895) \ -- $(am__append_4902) $(am__append_4909) $(am__append_4916) \ -- $(am__append_4923) $(am__append_4930) $(am__append_4937) \ -- $(am__append_4944) $(am__append_4951) $(am__append_4958) \ -- $(am__append_4965) $(am__append_4972) $(am__append_4979) \ -- $(am__append_4986) $(am__append_4993) $(am__append_5000) \ -- $(am__append_5007) $(am__append_5014) $(am__append_5021) \ -- $(am__append_5028) $(am__append_5035) $(am__append_5042) \ -- $(am__append_5049) $(am__append_5056) $(am__append_5063) \ -- $(am__append_5070) $(am__append_5077) $(am__append_5084) \ -- $(am__append_5091) $(am__append_5098) $(am__append_5105) \ -- $(am__append_5112) $(am__append_5119) $(am__append_5126) \ -- $(am__append_5133) $(am__append_5140) $(am__append_5147) \ -- $(am__append_5154) $(am__append_5161) $(am__append_5168) \ -- $(am__append_5175) video_colors.marker $(am__append_5182) \ -- $(am__append_5189) datehook.marker net.marker tftp.marker \ -- http.marker $(am__append_5196) $(am__append_5203) \ -- $(am__append_5210) $(am__append_5217) $(am__append_5224) \ -- $(am__append_5231) $(am__append_5238) $(am__append_5245) \ -- $(am__append_5252) $(am__append_5259) $(am__append_5266) \ -- $(am__append_5273) $(am__append_5280) $(am__append_5287) \ -- $(am__append_5294) $(am__append_5301) $(am__append_5308) \ -- $(am__append_5315) syslinuxcfg.marker test_blockarg.marker \ -- xzio.marker lzopio.marker testload.marker $(am__append_5322) \ -- $(am__append_5329) $(am__append_5336) $(am__append_5343) \ -- $(am__append_5350) $(am__append_5357) $(am__append_5364) \ -- $(am__append_5371) $(am__append_5378) $(am__append_5385) \ -- $(am__append_5392) $(am__append_5399) $(am__append_5406) \ -- $(am__append_5413) $(am__append_5420) $(am__append_5427) \ -- $(am__append_5434) priority_queue.marker time.marker \ -- $(am__append_5441) $(am__append_5448) adler32.marker \ -- crc64.marker mpi.marker all_video.marker $(am__append_5455) \ -- $(am__append_5462) $(am__append_5469) $(am__append_5476) \ -- $(am__append_5483) $(am__append_5490) testspeed.marker \ -- $(am__append_5497) tr.marker progress.marker file.marker \ -- $(am__append_5504) $(am__append_5511) $(am__append_5518) \ -- $(am__append_5525) $(am__append_5532) $(am__append_5539) \ -- $(am__append_5546) $(am__append_5553) $(am__append_5560) \ -- $(am__append_5567) $(am__append_5574) $(am__append_5581) \ -- $(am__append_5588) $(am__append_5595) gcry_arcfour.marker \ -+ $(am__append_4825) $(am__append_4832) $(am__append_4839) \ -+ $(am__append_4846) $(am__append_4853) $(am__append_4860) \ -+ $(am__append_4867) $(am__append_4874) $(am__append_4881) \ -+ jpeg.marker png.marker tga.marker $(am__append_4888) \ -+ $(am__append_4895) $(am__append_4902) $(am__append_4909) \ -+ $(am__append_4916) $(am__append_4923) $(am__append_4930) \ -+ $(am__append_4937) $(am__append_4944) $(am__append_4951) \ -+ $(am__append_4958) $(am__append_4965) $(am__append_4972) \ -+ $(am__append_4979) $(am__append_4986) $(am__append_4993) \ -+ $(am__append_5000) $(am__append_5007) $(am__append_5014) \ -+ $(am__append_5021) $(am__append_5028) $(am__append_5035) \ -+ $(am__append_5042) $(am__append_5049) $(am__append_5056) \ -+ $(am__append_5063) $(am__append_5070) $(am__append_5077) \ -+ $(am__append_5084) $(am__append_5091) $(am__append_5098) \ -+ $(am__append_5105) $(am__append_5112) $(am__append_5119) \ -+ $(am__append_5126) $(am__append_5133) $(am__append_5140) \ -+ $(am__append_5147) $(am__append_5154) $(am__append_5161) \ -+ $(am__append_5168) video_colors.marker $(am__append_5175) \ -+ $(am__append_5182) datehook.marker net.marker tftp.marker \ -+ http.marker $(am__append_5189) $(am__append_5196) \ -+ $(am__append_5203) $(am__append_5210) $(am__append_5217) \ -+ $(am__append_5224) $(am__append_5231) $(am__append_5238) \ -+ $(am__append_5245) $(am__append_5252) $(am__append_5259) \ -+ $(am__append_5266) $(am__append_5273) $(am__append_5280) \ -+ $(am__append_5287) $(am__append_5294) $(am__append_5301) \ -+ $(am__append_5308) syslinuxcfg.marker test_blockarg.marker \ -+ xzio.marker lzopio.marker testload.marker $(am__append_5315) \ -+ $(am__append_5322) $(am__append_5329) $(am__append_5336) \ -+ $(am__append_5343) $(am__append_5350) $(am__append_5357) \ -+ $(am__append_5364) $(am__append_5371) $(am__append_5378) \ -+ $(am__append_5385) $(am__append_5392) $(am__append_5399) \ -+ $(am__append_5406) $(am__append_5413) $(am__append_5420) \ -+ $(am__append_5427) priority_queue.marker time.marker \ -+ $(am__append_5434) $(am__append_5441) adler32.marker \ -+ crc64.marker mpi.marker all_video.marker $(am__append_5448) \ -+ $(am__append_5455) $(am__append_5462) $(am__append_5469) \ -+ $(am__append_5476) $(am__append_5483) testspeed.marker \ -+ $(am__append_5490) tr.marker progress.marker file.marker \ -+ $(am__append_5497) $(am__append_5504) $(am__append_5511) \ -+ $(am__append_5518) $(am__append_5525) $(am__append_5532) \ -+ $(am__append_5539) $(am__append_5546) $(am__append_5553) \ -+ $(am__append_5560) $(am__append_5567) $(am__append_5574) \ -+ $(am__append_5581) $(am__append_5588) gcry_arcfour.marker \ - gcry_blowfish.marker gcry_camellia.marker gcry_cast5.marker \ - gcry_crc.marker gcry_des.marker gcry_dsa.marker \ - gcry_idea.marker gcry_md4.marker gcry_md5.marker \ -@@ -16410,8 +16387,8 @@ KERNEL_HEADER_FILES = $(top_srcdir)/include/grub/cache.h \ - $(top_srcdir)/include/grub/i18n.h \ - $(top_srcdir)/include/grub/kernel.h \ - $(top_srcdir)/include/grub/list.h \ -- $(top_srcdir)/include/grub/misc.h $(am__append_5801) \ -- $(am__append_5802) $(top_srcdir)/include/grub/mm.h \ -+ $(top_srcdir)/include/grub/misc.h $(am__append_5794) \ -+ $(am__append_5795) $(top_srcdir)/include/grub/mm.h \ - $(top_srcdir)/include/grub/parser.h \ - $(top_srcdir)/include/grub/partition.h \ - $(top_srcdir)/include/grub/term.h \ -@@ -16419,38 +16396,38 @@ KERNEL_HEADER_FILES = $(top_srcdir)/include/grub/cache.h \ - $(top_srcdir)/include/grub/verify.h \ - $(top_srcdir)/include/grub/mm_private.h \ - $(top_srcdir)/include/grub/net.h \ -- $(top_srcdir)/include/grub/memory.h $(am__append_5803) \ -- $(am__append_5804) $(am__append_5805) $(am__append_5806) \ -- $(am__append_5807) $(am__append_5808) $(am__append_5809) \ -- $(am__append_5810) $(am__append_5811) $(am__append_5812) \ -- $(am__append_5813) $(am__append_5814) $(am__append_5815) \ -- $(am__append_5816) $(am__append_5817) $(am__append_5818) \ -- $(am__append_5819) $(am__append_5820) $(am__append_5821) \ -- $(am__append_5822) $(am__append_5823) $(am__append_5824) \ -- $(am__append_5825) $(am__append_5826) $(am__append_5827) \ -- $(am__append_5828) $(am__append_5829) --man_MANS = $(am__append_5792) -+ $(top_srcdir)/include/grub/memory.h $(am__append_5796) \ -+ $(am__append_5797) $(am__append_5798) $(am__append_5799) \ -+ $(am__append_5800) $(am__append_5801) $(am__append_5802) \ -+ $(am__append_5803) $(am__append_5804) $(am__append_5805) \ -+ $(am__append_5806) $(am__append_5807) $(am__append_5808) \ -+ $(am__append_5809) $(am__append_5810) $(am__append_5811) \ -+ $(am__append_5812) $(am__append_5813) $(am__append_5814) \ -+ $(am__append_5815) $(am__append_5816) $(am__append_5817) \ -+ $(am__append_5818) $(am__append_5819) $(am__append_5820) \ -+ $(am__append_5821) $(am__append_5822) -+man_MANS = $(am__append_5785) - noinst_DATA = gensyminfo.sh genmod.sh modinfo.sh kernel_syms.lst - pkgdata_DATA = - bin_SCRIPTS = - sbin_SCRIPTS = --platform_DATA = $(am__append_5600) $(am__append_5605) \ -- $(am__append_5610) $(am__append_5615) $(am__append_5620) \ -- $(am__append_5625) $(am__append_5630) $(am__append_5635) \ -- $(am__append_5640) $(am__append_5645) $(am__append_5650) \ -- $(am__append_5655) $(am__append_5660) $(am__append_5665) \ -- $(am__append_5670) $(am__append_5675) $(am__append_5680) \ -- $(am__append_5685) $(am__append_5690) $(am__append_5695) \ -- $(am__append_5700) $(am__append_5705) $(am__append_5710) \ -- $(am__append_5715) $(am__append_5720) $(am__append_5725) \ -- $(am__append_5730) $(am__append_5735) $(am__append_5740) \ -- $(am__append_5745) $(am__append_5750) $(am__append_5755) \ -- $(am__append_5760) $(am__append_5765) $(am__append_5770) \ -- $(am__append_5775) $(am__append_5780) $(am__append_5785) \ -- $(am__append_5790) gmodule.pl gdb_grub $(am__append_5797) \ -+platform_DATA = $(am__append_5593) $(am__append_5598) \ -+ $(am__append_5603) $(am__append_5608) $(am__append_5613) \ -+ $(am__append_5618) $(am__append_5623) $(am__append_5628) \ -+ $(am__append_5633) $(am__append_5638) $(am__append_5643) \ -+ $(am__append_5648) $(am__append_5653) $(am__append_5658) \ -+ $(am__append_5663) $(am__append_5668) $(am__append_5673) \ -+ $(am__append_5678) $(am__append_5683) $(am__append_5688) \ -+ $(am__append_5693) $(am__append_5698) $(am__append_5703) \ -+ $(am__append_5708) $(am__append_5713) $(am__append_5718) \ -+ $(am__append_5723) $(am__append_5728) $(am__append_5733) \ -+ $(am__append_5738) $(am__append_5743) $(am__append_5748) \ -+ $(am__append_5753) $(am__append_5758) $(am__append_5763) \ -+ $(am__append_5768) $(am__append_5773) $(am__append_5778) \ -+ $(am__append_5783) gmodule.pl gdb_grub $(am__append_5790) \ - fs.lst command.lst partmap.lst terminal.lst fdt.lst \ - parttool.lst video.lst crypto.lst moddep.lst $(MOD_FILES) \ -- modinfo.sh $(am__append_5831) -+ modinfo.sh $(am__append_5824) - check_SCRIPTS = - dist_grubconf_DATA = - noinst_SCRIPTS = -@@ -16567,7 +16544,7 @@ dist_noinst_DATA = kern/disk_common.c gentrigtables.c $(am__append_5) \ - $(am__append_2259) $(am__append_2266) $(am__append_2273) \ - $(am__append_2280) $(am__append_2287) $(am__append_2294) \ - $(am__append_2301) $(am__append_2308) $(am__append_2315) \ -- $(am__append_2322) commands/search.c $(am__append_2329) \ -+ commands/search.c $(am__append_2322) $(am__append_2329) \ - $(am__append_2336) $(am__append_2343) $(am__append_2350) \ - $(am__append_2357) $(am__append_2364) $(am__append_2371) \ - $(am__append_2378) $(am__append_2385) $(am__append_2392) \ -@@ -16603,8 +16580,8 @@ dist_noinst_DATA = kern/disk_common.c gentrigtables.c $(am__append_5) \ - $(am__append_3008) $(am__append_3015) $(am__append_3022) \ - $(am__append_3029) $(am__append_3036) $(am__append_3043) \ - $(am__append_3050) $(am__append_3057) $(am__append_3064) \ -- $(am__append_3071) $(am__append_3078) $(am__append_3085) \ -- kern/elfXX.c lib/libgcrypt-grub/cipher/crypto.lst \ -+ $(am__append_3071) $(am__append_3078) kern/elfXX.c \ -+ lib/libgcrypt-grub/cipher/crypto.lst $(am__append_3085) \ - $(am__append_3092) $(am__append_3099) $(am__append_3106) \ - $(am__append_3113) $(am__append_3120) $(am__append_3127) \ - $(am__append_3134) $(am__append_3141) $(am__append_3148) \ -@@ -16616,11 +16593,11 @@ dist_noinst_DATA = kern/disk_common.c gentrigtables.c $(am__append_5) \ - $(am__append_3260) $(am__append_3267) $(am__append_3274) \ - $(am__append_3281) $(am__append_3288) $(am__append_3295) \ - $(am__append_3302) $(am__append_3309) $(am__append_3316) \ -- $(am__append_3323) $(am__append_3330) $(am__append_3337) \ -- lib/i386/setjmp.S lib/mips/setjmp.S lib/x86_64/setjmp.S \ -- lib/sparc64/setjmp.S lib/powerpc/setjmp.S lib/ia64/setjmp.S \ -- lib/ia64/longjmp.S lib/arm/setjmp.S lib/arm64/setjmp.S \ -- lib/riscv/setjmp.S $(am__append_3344) $(am__append_3351) \ -+ $(am__append_3323) $(am__append_3330) lib/i386/setjmp.S \ -+ lib/mips/setjmp.S lib/x86_64/setjmp.S lib/sparc64/setjmp.S \ -+ lib/powerpc/setjmp.S lib/ia64/setjmp.S lib/ia64/longjmp.S \ -+ lib/arm/setjmp.S lib/arm64/setjmp.S lib/riscv/setjmp.S \ -+ $(am__append_3337) $(am__append_3344) $(am__append_3351) \ - $(am__append_3358) $(am__append_3365) $(am__append_3372) \ - $(am__append_3379) $(am__append_3386) $(am__append_3393) \ - $(am__append_3400) $(am__append_3407) $(am__append_3414) \ -@@ -16646,7 +16623,7 @@ dist_noinst_DATA = kern/disk_common.c gentrigtables.c $(am__append_5) \ - $(am__append_3820) $(am__append_3827) $(am__append_3834) \ - $(am__append_3841) $(am__append_3848) $(am__append_3855) \ - $(am__append_3862) $(am__append_3869) $(am__append_3876) \ -- $(am__append_3883) loader/machoXX.c $(am__append_3890) \ -+ loader/machoXX.c $(am__append_3883) $(am__append_3890) \ - $(am__append_3897) $(am__append_3904) $(am__append_3911) \ - $(am__append_3918) $(am__append_3925) $(am__append_3932) \ - $(am__append_3939) $(am__append_3946) $(am__append_3953) \ -@@ -16655,8 +16632,8 @@ dist_noinst_DATA = kern/disk_common.c gentrigtables.c $(am__append_5) \ - $(am__append_4002) $(am__append_4009) $(am__append_4016) \ - $(am__append_4023) $(am__append_4030) $(am__append_4037) \ - $(am__append_4044) $(am__append_4051) $(am__append_4058) \ -- $(am__append_4065) $(am__append_4072) script/yylex.l \ -- script/parser.y $(am__append_4079) $(am__append_4086) \ -+ $(am__append_4065) script/yylex.l script/parser.y \ -+ $(am__append_4072) $(am__append_4079) $(am__append_4086) \ - $(am__append_4093) $(am__append_4100) $(am__append_4107) \ - $(am__append_4114) $(am__append_4121) $(am__append_4128) \ - $(am__append_4135) $(am__append_4142) $(am__append_4149) \ -@@ -16723,30 +16700,29 @@ dist_noinst_DATA = kern/disk_common.c gentrigtables.c $(am__append_5) \ - $(am__append_5416) $(am__append_5423) $(am__append_5430) \ - $(am__append_5437) $(am__append_5444) $(am__append_5451) \ - $(am__append_5458) $(am__append_5465) $(am__append_5472) \ -- $(am__append_5479) $(am__append_5486) $(am__append_5493) \ -- commands/fileXX.c loader/i386/xen_fileXX.c $(am__append_5500) \ -+ $(am__append_5479) $(am__append_5486) commands/fileXX.c \ -+ loader/i386/xen_fileXX.c $(am__append_5493) $(am__append_5500) \ - $(am__append_5507) $(am__append_5514) $(am__append_5521) \ - $(am__append_5528) $(am__append_5535) $(am__append_5542) \ - $(am__append_5549) $(am__append_5556) $(am__append_5563) \ - $(am__append_5570) $(am__append_5577) $(am__append_5584) \ -- $(am__append_5591) $(am__append_5597) $(am__append_5602) \ -- $(am__append_5607) $(am__append_5612) $(am__append_5617) \ -- $(am__append_5622) $(am__append_5627) $(am__append_5632) \ -- $(am__append_5637) $(am__append_5642) $(am__append_5647) \ -- $(am__append_5652) $(am__append_5657) $(am__append_5662) \ -- $(am__append_5667) $(am__append_5672) $(am__append_5677) \ -- $(am__append_5682) $(am__append_5687) $(am__append_5692) \ -- $(am__append_5697) $(am__append_5702) $(am__append_5707) \ -- $(am__append_5712) $(am__append_5717) $(am__append_5722) \ -- $(am__append_5727) $(am__append_5732) $(am__append_5737) \ -- $(am__append_5742) $(am__append_5747) $(am__append_5752) \ -- $(am__append_5757) $(am__append_5762) $(am__append_5767) \ -- $(am__append_5772) $(am__append_5777) $(am__append_5782) \ -- $(am__append_5787) $(am__append_5794) gensyminfo.sh.in \ -- genmod.sh.in modinfo.sh.in gmodule.pl.in gdb_grub.in \ -- $(am__append_5800) -+ $(am__append_5590) $(am__append_5595) $(am__append_5600) \ -+ $(am__append_5605) $(am__append_5610) $(am__append_5615) \ -+ $(am__append_5620) $(am__append_5625) $(am__append_5630) \ -+ $(am__append_5635) $(am__append_5640) $(am__append_5645) \ -+ $(am__append_5650) $(am__append_5655) $(am__append_5660) \ -+ $(am__append_5665) $(am__append_5670) $(am__append_5675) \ -+ $(am__append_5680) $(am__append_5685) $(am__append_5690) \ -+ $(am__append_5695) $(am__append_5700) $(am__append_5705) \ -+ $(am__append_5710) $(am__append_5715) $(am__append_5720) \ -+ $(am__append_5725) $(am__append_5730) $(am__append_5735) \ -+ $(am__append_5740) $(am__append_5745) $(am__append_5750) \ -+ $(am__append_5755) $(am__append_5760) $(am__append_5765) \ -+ $(am__append_5770) $(am__append_5775) $(am__append_5780) \ -+ $(am__append_5787) gensyminfo.sh.in genmod.sh.in modinfo.sh.in \ -+ gmodule.pl.in gdb_grub.in $(am__append_5793) - platform_SCRIPTS = --EXTRA_DIST = $(am__append_5799) -+EXTRA_DIST = $(am__append_5792) - CLEANFILES = build-grub-pep2elf$(BUILD_EXEEXT) \ - build-grub-pe2elf$(BUILD_EXEEXT) gentrigtables$(BUILD_EXEEXT) \ - build-grub-module-verifier$(BUILD_EXEEXT) trigtables.c \ -@@ -16862,48 +16838,48 @@ CLEANFILES = build-grub-pep2elf$(BUILD_EXEEXT) \ - $(nodist_pgp_module_SOURCES) pgp.marker $(am__append_2044) \ - $(am__append_2051) $(am__append_2058) $(am__append_2065) \ - $(am__append_2072) $(am__append_2079) $(am__append_2086) \ -- $(am__append_2093) $(am__append_2100) $(am__append_2107) \ -+ $(am__append_2093) $(am__append_2100) \ - $(nodist_help_module_SOURCES) help.marker \ - $(nodist_hexdump_module_SOURCES) hexdump.marker \ - $(nodist_keystatus_module_SOURCES) keystatus.marker \ -- $(am__append_2114) $(am__append_2121) \ -+ $(am__append_2107) $(am__append_2114) \ - $(nodist_loadenv_module_SOURCES) loadenv.marker \ - $(nodist_ls_module_SOURCES) ls.marker \ - $(nodist_lsmmap_module_SOURCES) lsmmap.marker \ -- $(am__append_2128) $(am__append_2135) $(am__append_2142) \ -- $(am__append_2149) $(am__append_2156) $(am__append_2163) \ -- $(am__append_2170) $(am__append_2177) \ -+ $(am__append_2121) $(am__append_2128) $(am__append_2135) \ -+ $(am__append_2142) $(am__append_2149) $(am__append_2156) \ -+ $(am__append_2163) $(am__append_2170) \ - $(nodist_memrw_module_SOURCES) memrw.marker \ - $(nodist_minicmd_module_SOURCES) minicmd.marker \ - $(nodist_parttool_module_SOURCES) parttool.marker \ - $(nodist_password_module_SOURCES) password.marker \ - $(nodist_password_pbkdf2_module_SOURCES) \ -- password_pbkdf2.marker $(am__append_2184) $(am__append_2191) \ -- $(am__append_2198) $(am__append_2205) $(am__append_2212) \ -- $(am__append_2219) $(am__append_2226) $(am__append_2233) \ -- $(am__append_2240) $(am__append_2247) $(am__append_2254) \ -- $(am__append_2261) $(am__append_2268) $(am__append_2275) \ -- $(am__append_2282) $(am__append_2289) $(am__append_2296) \ -- $(am__append_2303) $(am__append_2310) $(am__append_2317) \ -- $(am__append_2324) $(nodist_probe_module_SOURCES) probe.marker \ -+ password_pbkdf2.marker $(am__append_2177) $(am__append_2184) \ -+ $(am__append_2191) $(am__append_2198) $(am__append_2205) \ -+ $(am__append_2212) $(am__append_2219) $(am__append_2226) \ -+ $(am__append_2233) $(am__append_2240) $(am__append_2247) \ -+ $(am__append_2254) $(am__append_2261) $(am__append_2268) \ -+ $(am__append_2275) $(am__append_2282) $(am__append_2289) \ -+ $(am__append_2296) $(am__append_2303) $(am__append_2310) \ -+ $(am__append_2317) $(nodist_probe_module_SOURCES) probe.marker \ - $(nodist_read_module_SOURCES) read.marker \ - $(nodist_search_module_SOURCES) search.marker \ - $(nodist_search_fs_file_module_SOURCES) search_fs_file.marker \ - $(nodist_search_fs_uuid_module_SOURCES) search_fs_uuid.marker \ - $(nodist_search_label_module_SOURCES) search_label.marker \ -- $(am__append_2331) $(am__append_2338) $(am__append_2345) \ -- $(am__append_2352) $(am__append_2359) $(am__append_2366) \ -- $(am__append_2373) $(am__append_2380) $(am__append_2387) \ -- $(am__append_2394) $(am__append_2401) $(am__append_2408) \ -- $(am__append_2415) $(am__append_2422) $(am__append_2429) \ -- $(am__append_2436) $(nodist_sleep_module_SOURCES) sleep.marker \ -- $(am__append_2443) $(am__append_2450) \ -+ $(am__append_2324) $(am__append_2331) $(am__append_2338) \ -+ $(am__append_2345) $(am__append_2352) $(am__append_2359) \ -+ $(am__append_2366) $(am__append_2373) $(am__append_2380) \ -+ $(am__append_2387) $(am__append_2394) $(am__append_2401) \ -+ $(am__append_2408) $(am__append_2415) $(am__append_2422) \ -+ $(am__append_2429) $(nodist_sleep_module_SOURCES) sleep.marker \ -+ $(am__append_2436) $(am__append_2443) \ - $(nodist_terminal_module_SOURCES) terminal.marker \ - $(nodist_test_module_SOURCES) test.marker \ -- $(nodist_true_module_SOURCES) true.marker $(am__append_2457) \ -- $(am__append_2464) $(am__append_2471) $(am__append_2478) \ -- $(am__append_2485) $(am__append_2492) $(am__append_2499) \ -- $(am__append_2506) $(am__append_2513) \ -+ $(nodist_true_module_SOURCES) true.marker $(am__append_2450) \ -+ $(am__append_2457) $(am__append_2464) $(am__append_2471) \ -+ $(am__append_2478) $(am__append_2485) $(am__append_2492) \ -+ $(am__append_2499) $(am__append_2506) \ - $(nodist_videoinfo_module_SOURCES) videoinfo.marker \ - $(nodist_videotest_module_SOURCES) videotest.marker \ - $(nodist_xnu_uuid_module_SOURCES) xnu_uuid.marker \ -@@ -16922,27 +16898,27 @@ CLEANFILES = build-grub-pep2elf$(BUILD_EXEEXT) \ - $(nodist_raid6rec_module_SOURCES) raid6rec.marker \ - $(nodist_scsi_module_SOURCES) scsi.marker \ - $(nodist_memdisk_module_SOURCES) memdisk.marker \ -- $(am__append_2520) $(am__append_2527) $(am__append_2534) \ -- $(am__append_2541) $(am__append_2548) $(am__append_2555) \ -- $(am__append_2562) $(am__append_2569) $(am__append_2576) \ -- $(am__append_2583) $(am__append_2590) $(am__append_2597) \ -- $(am__append_2604) $(am__append_2611) $(am__append_2618) \ -- $(am__append_2625) $(am__append_2632) $(am__append_2639) \ -- $(am__append_2646) $(am__append_2653) $(am__append_2660) \ -- $(am__append_2667) $(am__append_2674) $(am__append_2681) \ -- $(am__append_2688) $(am__append_2695) $(am__append_2702) \ -- $(am__append_2709) $(am__append_2716) $(am__append_2723) \ -- $(am__append_2730) $(am__append_2737) $(am__append_2744) \ -- $(am__append_2751) $(am__append_2758) $(am__append_2765) \ -- $(am__append_2772) $(am__append_2779) $(am__append_2786) \ -- $(am__append_2793) $(am__append_2800) $(am__append_2807) \ -- $(am__append_2814) $(am__append_2821) $(am__append_2828) \ -- $(am__append_2835) $(am__append_2842) $(am__append_2849) \ -- $(am__append_2856) $(am__append_2863) $(am__append_2870) \ -- $(am__append_2877) $(am__append_2884) $(am__append_2891) \ -- $(am__append_2898) $(am__append_2905) $(am__append_2912) \ -- $(am__append_2919) $(am__append_2926) $(am__append_2933) \ -- $(am__append_2940) $(nodist_procfs_module_SOURCES) \ -+ $(am__append_2513) $(am__append_2520) $(am__append_2527) \ -+ $(am__append_2534) $(am__append_2541) $(am__append_2548) \ -+ $(am__append_2555) $(am__append_2562) $(am__append_2569) \ -+ $(am__append_2576) $(am__append_2583) $(am__append_2590) \ -+ $(am__append_2597) $(am__append_2604) $(am__append_2611) \ -+ $(am__append_2618) $(am__append_2625) $(am__append_2632) \ -+ $(am__append_2639) $(am__append_2646) $(am__append_2653) \ -+ $(am__append_2660) $(am__append_2667) $(am__append_2674) \ -+ $(am__append_2681) $(am__append_2688) $(am__append_2695) \ -+ $(am__append_2702) $(am__append_2709) $(am__append_2716) \ -+ $(am__append_2723) $(am__append_2730) $(am__append_2737) \ -+ $(am__append_2744) $(am__append_2751) $(am__append_2758) \ -+ $(am__append_2765) $(am__append_2772) $(am__append_2779) \ -+ $(am__append_2786) $(am__append_2793) $(am__append_2800) \ -+ $(am__append_2807) $(am__append_2814) $(am__append_2821) \ -+ $(am__append_2828) $(am__append_2835) $(am__append_2842) \ -+ $(am__append_2849) $(am__append_2856) $(am__append_2863) \ -+ $(am__append_2870) $(am__append_2877) $(am__append_2884) \ -+ $(am__append_2891) $(am__append_2898) $(am__append_2905) \ -+ $(am__append_2912) $(am__append_2919) $(am__append_2926) \ -+ $(am__append_2933) $(nodist_procfs_module_SOURCES) \ - procfs.marker $(nodist_affs_module_SOURCES) affs.marker \ - $(nodist_afs_module_SOURCES) afs.marker \ - $(nodist_bfs_module_SOURCES) bfs.marker \ -@@ -16987,70 +16963,70 @@ CLEANFILES = build-grub-pep2elf$(BUILD_EXEEXT) \ - $(nodist_zfscrypt_module_SOURCES) zfscrypt.marker \ - $(nodist_zfsinfo_module_SOURCES) zfsinfo.marker \ - $(nodist_macbless_module_SOURCES) macbless.marker \ -- $(am__append_2947) $(nodist_gettext_module_SOURCES) \ -+ $(am__append_2940) $(nodist_gettext_module_SOURCES) \ - gettext.marker $(nodist_gfxmenu_module_SOURCES) gfxmenu.marker \ - $(nodist_hello_module_SOURCES) hello.marker \ - $(nodist_gzio_module_SOURCES) gzio.marker \ - $(nodist_offsetio_module_SOURCES) offsetio.marker \ -- $(am__append_2954) $(am__append_2961) $(am__append_2968) \ -- $(am__append_2975) $(am__append_2982) $(am__append_2989) \ -- $(am__append_2996) $(am__append_3003) $(am__append_3010) \ -- $(am__append_3017) $(am__append_3024) $(am__append_3031) \ -- $(am__append_3038) $(am__append_3045) $(am__append_3052) \ -- $(am__append_3059) $(am__append_3066) $(am__append_3073) \ -- $(am__append_3080) $(am__append_3087) \ -+ $(am__append_2947) $(am__append_2954) $(am__append_2961) \ -+ $(am__append_2968) $(am__append_2975) $(am__append_2982) \ -+ $(am__append_2989) $(am__append_2996) $(am__append_3003) \ -+ $(am__append_3010) $(am__append_3017) $(am__append_3024) \ -+ $(am__append_3031) $(am__append_3038) $(am__append_3045) \ -+ $(am__append_3052) $(am__append_3059) $(am__append_3066) \ -+ $(am__append_3073) $(am__append_3080) \ - $(nodist_elf_module_SOURCES) elf.marker \ - $(nodist_crypto_module_SOURCES) crypto.marker \ - $(nodist_pbkdf2_module_SOURCES) pbkdf2.marker \ -- $(am__append_3094) $(am__append_3101) $(am__append_3108) \ -- $(am__append_3115) $(am__append_3122) $(am__append_3129) \ -- $(am__append_3136) $(am__append_3143) $(am__append_3150) \ -- $(am__append_3157) $(am__append_3164) $(am__append_3171) \ -- $(am__append_3178) $(am__append_3185) $(am__append_3192) \ -- $(am__append_3199) $(am__append_3206) $(am__append_3213) \ -- $(am__append_3220) $(am__append_3227) $(am__append_3234) \ -- $(am__append_3241) $(am__append_3248) $(am__append_3255) \ -- $(am__append_3262) $(am__append_3269) $(am__append_3276) \ -- $(am__append_3283) $(am__append_3290) $(am__append_3297) \ -- $(am__append_3304) $(am__append_3311) $(am__append_3318) \ -- $(am__append_3325) $(am__append_3332) $(am__append_3339) \ -+ $(am__append_3087) $(am__append_3094) $(am__append_3101) \ -+ $(am__append_3108) $(am__append_3115) $(am__append_3122) \ -+ $(am__append_3129) $(am__append_3136) $(am__append_3143) \ -+ $(am__append_3150) $(am__append_3157) $(am__append_3164) \ -+ $(am__append_3171) $(am__append_3178) $(am__append_3185) \ -+ $(am__append_3192) $(am__append_3199) $(am__append_3206) \ -+ $(am__append_3213) $(am__append_3220) $(am__append_3227) \ -+ $(am__append_3234) $(am__append_3241) $(am__append_3248) \ -+ $(am__append_3255) $(am__append_3262) $(am__append_3269) \ -+ $(am__append_3276) $(am__append_3283) $(am__append_3290) \ -+ $(am__append_3297) $(am__append_3304) $(am__append_3311) \ -+ $(am__append_3318) $(am__append_3325) $(am__append_3332) \ - $(nodist_setjmp_module_SOURCES) setjmp.marker \ -- $(am__append_3346) $(am__append_3353) $(am__append_3360) \ -- $(am__append_3367) $(am__append_3374) $(am__append_3381) \ -- $(am__append_3388) $(am__append_3395) $(am__append_3402) \ -- $(am__append_3409) $(am__append_3416) $(am__append_3423) \ -- $(am__append_3430) $(am__append_3437) $(am__append_3444) \ -- $(am__append_3451) $(am__append_3458) $(am__append_3465) \ -- $(am__append_3472) $(am__append_3479) $(am__append_3486) \ -- $(am__append_3493) $(am__append_3500) $(am__append_3507) \ -- $(am__append_3514) $(am__append_3521) $(am__append_3528) \ -- $(am__append_3535) $(am__append_3542) $(am__append_3549) \ -- $(am__append_3556) $(am__append_3563) $(am__append_3570) \ -- $(am__append_3577) $(am__append_3584) $(am__append_3591) \ -- $(am__append_3598) $(am__append_3605) $(am__append_3612) \ -- $(am__append_3619) $(am__append_3626) $(am__append_3633) \ -- $(am__append_3640) $(am__append_3647) $(am__append_3654) \ -- $(am__append_3661) $(am__append_3668) $(am__append_3675) \ -- $(am__append_3682) $(am__append_3689) $(am__append_3696) \ -- $(am__append_3703) $(am__append_3710) $(am__append_3717) \ -- $(am__append_3724) $(am__append_3731) $(am__append_3738) \ -- $(am__append_3745) $(am__append_3752) $(am__append_3759) \ -- $(am__append_3766) $(am__append_3773) $(am__append_3780) \ -- $(am__append_3787) $(am__append_3794) $(am__append_3801) \ -- $(am__append_3808) $(am__append_3815) $(am__append_3822) \ -- $(am__append_3829) $(am__append_3836) $(am__append_3843) \ -- $(am__append_3850) $(am__append_3857) $(am__append_3864) \ -- $(am__append_3871) $(am__append_3878) $(am__append_3885) \ -- $(nodist_macho_module_SOURCES) macho.marker $(am__append_3892) \ -- $(am__append_3899) $(am__append_3906) $(am__append_3913) \ -- $(am__append_3920) $(am__append_3927) $(am__append_3934) \ -- $(am__append_3941) $(am__append_3948) $(am__append_3955) \ -- $(am__append_3962) $(am__append_3969) $(am__append_3976) \ -- $(am__append_3983) $(am__append_3990) $(am__append_3997) \ -- $(am__append_4004) $(am__append_4011) $(am__append_4018) \ -- $(am__append_4025) $(am__append_4032) $(am__append_4039) \ -- $(am__append_4046) $(am__append_4053) $(am__append_4060) \ -- $(am__append_4067) $(am__append_4074) \ -+ $(am__append_3339) $(am__append_3346) $(am__append_3353) \ -+ $(am__append_3360) $(am__append_3367) $(am__append_3374) \ -+ $(am__append_3381) $(am__append_3388) $(am__append_3395) \ -+ $(am__append_3402) $(am__append_3409) $(am__append_3416) \ -+ $(am__append_3423) $(am__append_3430) $(am__append_3437) \ -+ $(am__append_3444) $(am__append_3451) $(am__append_3458) \ -+ $(am__append_3465) $(am__append_3472) $(am__append_3479) \ -+ $(am__append_3486) $(am__append_3493) $(am__append_3500) \ -+ $(am__append_3507) $(am__append_3514) $(am__append_3521) \ -+ $(am__append_3528) $(am__append_3535) $(am__append_3542) \ -+ $(am__append_3549) $(am__append_3556) $(am__append_3563) \ -+ $(am__append_3570) $(am__append_3577) $(am__append_3584) \ -+ $(am__append_3591) $(am__append_3598) $(am__append_3605) \ -+ $(am__append_3612) $(am__append_3619) $(am__append_3626) \ -+ $(am__append_3633) $(am__append_3640) $(am__append_3647) \ -+ $(am__append_3654) $(am__append_3661) $(am__append_3668) \ -+ $(am__append_3675) $(am__append_3682) $(am__append_3689) \ -+ $(am__append_3696) $(am__append_3703) $(am__append_3710) \ -+ $(am__append_3717) $(am__append_3724) $(am__append_3731) \ -+ $(am__append_3738) $(am__append_3745) $(am__append_3752) \ -+ $(am__append_3759) $(am__append_3766) $(am__append_3773) \ -+ $(am__append_3780) $(am__append_3787) $(am__append_3794) \ -+ $(am__append_3801) $(am__append_3808) $(am__append_3815) \ -+ $(am__append_3822) $(am__append_3829) $(am__append_3836) \ -+ $(am__append_3843) $(am__append_3850) $(am__append_3857) \ -+ $(am__append_3864) $(am__append_3871) $(am__append_3878) \ -+ $(nodist_macho_module_SOURCES) macho.marker $(am__append_3885) \ -+ $(am__append_3892) $(am__append_3899) $(am__append_3906) \ -+ $(am__append_3913) $(am__append_3920) $(am__append_3927) \ -+ $(am__append_3934) $(am__append_3941) $(am__append_3948) \ -+ $(am__append_3955) $(am__append_3962) $(am__append_3969) \ -+ $(am__append_3976) $(am__append_3983) $(am__append_3990) \ -+ $(am__append_3997) $(am__append_4004) $(am__append_4011) \ -+ $(am__append_4018) $(am__append_4025) $(am__append_4032) \ -+ $(am__append_4039) $(am__append_4046) $(am__append_4053) \ -+ $(am__append_4060) $(am__append_4067) \ - $(nodist_normal_module_SOURCES) normal.marker \ - $(nodist_part_acorn_module_SOURCES) part_acorn.marker \ - $(nodist_part_amiga_module_SOURCES) part_amiga.marker \ -@@ -17064,35 +17040,35 @@ CLEANFILES = build-grub-pep2elf$(BUILD_EXEEXT) \ - $(nodist_part_sunpc_module_SOURCES) part_sunpc.marker \ - $(nodist_part_dfly_module_SOURCES) part_dfly.marker \ - $(nodist_msdospart_module_SOURCES) msdospart.marker \ -- $(am__append_4081) $(am__append_4088) $(am__append_4095) \ -- $(am__append_4102) $(am__append_4109) $(am__append_4116) \ -- $(am__append_4123) $(am__append_4130) $(am__append_4137) \ -- $(am__append_4144) $(am__append_4151) $(am__append_4158) \ -- $(am__append_4165) $(am__append_4172) $(am__append_4179) \ -- $(am__append_4186) $(am__append_4193) $(am__append_4200) \ -- $(am__append_4207) $(am__append_4214) $(am__append_4221) \ -- $(am__append_4228) $(am__append_4235) $(am__append_4242) \ -- $(am__append_4249) $(am__append_4256) $(am__append_4263) \ -+ $(am__append_4074) $(am__append_4081) $(am__append_4088) \ -+ $(am__append_4095) $(am__append_4102) $(am__append_4109) \ -+ $(am__append_4116) $(am__append_4123) $(am__append_4130) \ -+ $(am__append_4137) $(am__append_4144) $(am__append_4151) \ -+ $(am__append_4158) $(am__append_4165) $(am__append_4172) \ -+ $(am__append_4179) $(am__append_4186) $(am__append_4193) \ -+ $(am__append_4200) $(am__append_4207) $(am__append_4214) \ -+ $(am__append_4221) $(am__append_4228) $(am__append_4235) \ -+ $(am__append_4242) $(am__append_4249) $(am__append_4256) \ - $(nodist_gfxterm_background_module_SOURCES) \ -- gfxterm_background.marker $(am__append_4270) \ -- $(am__append_4277) $(am__append_4284) $(am__append_4291) \ -- $(am__append_4298) $(am__append_4305) $(am__append_4312) \ -- $(am__append_4319) $(am__append_4326) $(am__append_4333) \ -- $(am__append_4340) $(am__append_4347) $(am__append_4354) \ -- $(am__append_4361) $(am__append_4368) $(am__append_4375) \ -- $(am__append_4382) $(am__append_4389) $(am__append_4396) \ -- $(am__append_4403) $(am__append_4410) $(am__append_4417) \ -- $(am__append_4424) $(am__append_4431) $(am__append_4438) \ -- $(am__append_4445) $(am__append_4452) $(am__append_4459) \ -- $(am__append_4466) $(am__append_4473) $(am__append_4480) \ -- $(am__append_4487) $(am__append_4494) $(am__append_4501) \ -- $(am__append_4508) $(am__append_4515) $(am__append_4522) \ -- $(am__append_4529) $(am__append_4536) $(am__append_4543) \ -- $(am__append_4550) $(am__append_4557) $(am__append_4564) \ -- $(am__append_4571) $(am__append_4578) $(am__append_4585) \ -- $(am__append_4592) $(am__append_4599) $(am__append_4606) \ -- $(am__append_4613) $(am__append_4620) $(am__append_4627) \ -- $(am__append_4634) $(am__append_4641) $(am__append_4648) \ -+ gfxterm_background.marker $(am__append_4263) \ -+ $(am__append_4270) $(am__append_4277) $(am__append_4284) \ -+ $(am__append_4291) $(am__append_4298) $(am__append_4305) \ -+ $(am__append_4312) $(am__append_4319) $(am__append_4326) \ -+ $(am__append_4333) $(am__append_4340) $(am__append_4347) \ -+ $(am__append_4354) $(am__append_4361) $(am__append_4368) \ -+ $(am__append_4375) $(am__append_4382) $(am__append_4389) \ -+ $(am__append_4396) $(am__append_4403) $(am__append_4410) \ -+ $(am__append_4417) $(am__append_4424) $(am__append_4431) \ -+ $(am__append_4438) $(am__append_4445) $(am__append_4452) \ -+ $(am__append_4459) $(am__append_4466) $(am__append_4473) \ -+ $(am__append_4480) $(am__append_4487) $(am__append_4494) \ -+ $(am__append_4501) $(am__append_4508) $(am__append_4515) \ -+ $(am__append_4522) $(am__append_4529) $(am__append_4536) \ -+ $(am__append_4543) $(am__append_4550) $(am__append_4557) \ -+ $(am__append_4564) $(am__append_4571) $(am__append_4578) \ -+ $(am__append_4585) $(am__append_4592) $(am__append_4599) \ -+ $(am__append_4606) $(am__append_4613) $(am__append_4620) \ -+ $(am__append_4627) $(am__append_4634) $(am__append_4641) \ - $(nodist_functional_test_module_SOURCES) \ - functional_test.marker $(nodist_exfctest_module_SOURCES) \ - exfctest.marker $(nodist_strtoull_test_module_SOURCES) \ -@@ -17101,15 +17077,15 @@ CLEANFILES = build-grub-pep2elf$(BUILD_EXEEXT) \ - signature_test.marker $(nodist_sleep_test_module_SOURCES) \ - sleep_test.marker $(nodist_xnu_uuid_test_module_SOURCES) \ - xnu_uuid_test.marker $(nodist_pbkdf2_test_module_SOURCES) \ -- pbkdf2_test.marker $(am__append_4655) $(am__append_4662) \ -- $(am__append_4669) $(am__append_4676) $(am__append_4683) \ -- $(am__append_4690) $(am__append_4697) $(am__append_4704) \ -- $(am__append_4711) $(am__append_4718) $(am__append_4725) \ -- $(am__append_4732) $(am__append_4739) $(am__append_4746) \ -- $(am__append_4753) $(am__append_4760) $(am__append_4767) \ -- $(am__append_4774) $(am__append_4781) $(am__append_4788) \ -- $(am__append_4795) $(am__append_4802) $(am__append_4809) \ -- $(am__append_4816) $(am__append_4823) \ -+ pbkdf2_test.marker $(am__append_4648) $(am__append_4655) \ -+ $(am__append_4662) $(am__append_4669) $(am__append_4676) \ -+ $(am__append_4683) $(am__append_4690) $(am__append_4697) \ -+ $(am__append_4704) $(am__append_4711) $(am__append_4718) \ -+ $(am__append_4725) $(am__append_4732) $(am__append_4739) \ -+ $(am__append_4746) $(am__append_4753) $(am__append_4760) \ -+ $(am__append_4767) $(am__append_4774) $(am__append_4781) \ -+ $(am__append_4788) $(am__append_4795) $(am__append_4802) \ -+ $(am__append_4809) $(am__append_4816) \ - $(nodist_div_test_module_SOURCES) div_test.marker \ - $(nodist_mul_test_module_SOURCES) mul_test.marker \ - $(nodist_shift_test_module_SOURCES) shift_test.marker \ -@@ -17122,65 +17098,65 @@ CLEANFILES = build-grub-pep2elf$(BUILD_EXEEXT) \ - $(nodist_cmdline_cat_test_module_SOURCES) \ - cmdline_cat_test.marker $(nodist_bitmap_module_SOURCES) \ - bitmap.marker $(nodist_bitmap_scale_module_SOURCES) \ -- bitmap_scale.marker $(am__append_4830) $(am__append_4837) \ -- $(am__append_4844) $(am__append_4851) $(am__append_4858) \ -- $(am__append_4865) $(am__append_4872) $(am__append_4879) \ -- $(am__append_4886) $(nodist_jpeg_module_SOURCES) jpeg.marker \ -+ bitmap_scale.marker $(am__append_4823) $(am__append_4830) \ -+ $(am__append_4837) $(am__append_4844) $(am__append_4851) \ -+ $(am__append_4858) $(am__append_4865) $(am__append_4872) \ -+ $(am__append_4879) $(nodist_jpeg_module_SOURCES) jpeg.marker \ - $(nodist_png_module_SOURCES) png.marker \ -- $(nodist_tga_module_SOURCES) tga.marker $(am__append_4893) \ -- $(am__append_4900) $(am__append_4907) $(am__append_4914) \ -- $(am__append_4921) $(am__append_4928) $(am__append_4935) \ -- $(am__append_4942) $(am__append_4949) $(am__append_4956) \ -- $(am__append_4963) $(am__append_4970) $(am__append_4977) \ -- $(am__append_4984) $(am__append_4991) $(am__append_4998) \ -- $(am__append_5005) $(am__append_5012) $(am__append_5019) \ -- $(am__append_5026) $(am__append_5033) $(am__append_5040) \ -- $(am__append_5047) $(am__append_5054) $(am__append_5061) \ -- $(am__append_5068) $(am__append_5075) $(am__append_5082) \ -- $(am__append_5089) $(am__append_5096) $(am__append_5103) \ -- $(am__append_5110) $(am__append_5117) $(am__append_5124) \ -- $(am__append_5131) $(am__append_5138) $(am__append_5145) \ -- $(am__append_5152) $(am__append_5159) $(am__append_5166) \ -- $(am__append_5173) $(nodist_video_colors_module_SOURCES) \ -- video_colors.marker $(am__append_5180) $(am__append_5187) \ -+ $(nodist_tga_module_SOURCES) tga.marker $(am__append_4886) \ -+ $(am__append_4893) $(am__append_4900) $(am__append_4907) \ -+ $(am__append_4914) $(am__append_4921) $(am__append_4928) \ -+ $(am__append_4935) $(am__append_4942) $(am__append_4949) \ -+ $(am__append_4956) $(am__append_4963) $(am__append_4970) \ -+ $(am__append_4977) $(am__append_4984) $(am__append_4991) \ -+ $(am__append_4998) $(am__append_5005) $(am__append_5012) \ -+ $(am__append_5019) $(am__append_5026) $(am__append_5033) \ -+ $(am__append_5040) $(am__append_5047) $(am__append_5054) \ -+ $(am__append_5061) $(am__append_5068) $(am__append_5075) \ -+ $(am__append_5082) $(am__append_5089) $(am__append_5096) \ -+ $(am__append_5103) $(am__append_5110) $(am__append_5117) \ -+ $(am__append_5124) $(am__append_5131) $(am__append_5138) \ -+ $(am__append_5145) $(am__append_5152) $(am__append_5159) \ -+ $(am__append_5166) $(nodist_video_colors_module_SOURCES) \ -+ video_colors.marker $(am__append_5173) $(am__append_5180) \ - $(nodist_datehook_module_SOURCES) datehook.marker \ - $(nodist_net_module_SOURCES) net.marker \ - $(nodist_tftp_module_SOURCES) tftp.marker \ -- $(nodist_http_module_SOURCES) http.marker $(am__append_5194) \ -- $(am__append_5201) $(am__append_5208) $(am__append_5215) \ -- $(am__append_5222) $(am__append_5229) $(am__append_5236) \ -- $(am__append_5243) $(am__append_5250) $(am__append_5257) \ -- $(am__append_5264) $(am__append_5271) $(am__append_5278) \ -- $(am__append_5285) $(am__append_5292) $(am__append_5299) \ -- $(am__append_5306) $(am__append_5313) \ -+ $(nodist_http_module_SOURCES) http.marker $(am__append_5187) \ -+ $(am__append_5194) $(am__append_5201) $(am__append_5208) \ -+ $(am__append_5215) $(am__append_5222) $(am__append_5229) \ -+ $(am__append_5236) $(am__append_5243) $(am__append_5250) \ -+ $(am__append_5257) $(am__append_5264) $(am__append_5271) \ -+ $(am__append_5278) $(am__append_5285) $(am__append_5292) \ -+ $(am__append_5299) $(am__append_5306) \ - $(nodist_syslinuxcfg_module_SOURCES) syslinuxcfg.marker \ - $(nodist_test_blockarg_module_SOURCES) test_blockarg.marker \ - $(nodist_xzio_module_SOURCES) xzio.marker \ - $(nodist_lzopio_module_SOURCES) lzopio.marker \ - $(nodist_testload_module_SOURCES) testload.marker \ -- $(am__append_5320) $(am__append_5327) $(am__append_5334) \ -- $(am__append_5341) $(am__append_5348) $(am__append_5355) \ -- $(am__append_5362) $(am__append_5369) $(am__append_5376) \ -- $(am__append_5383) $(am__append_5390) $(am__append_5397) \ -- $(am__append_5404) $(am__append_5411) $(am__append_5418) \ -- $(am__append_5425) $(am__append_5432) \ -+ $(am__append_5313) $(am__append_5320) $(am__append_5327) \ -+ $(am__append_5334) $(am__append_5341) $(am__append_5348) \ -+ $(am__append_5355) $(am__append_5362) $(am__append_5369) \ -+ $(am__append_5376) $(am__append_5383) $(am__append_5390) \ -+ $(am__append_5397) $(am__append_5404) $(am__append_5411) \ -+ $(am__append_5418) $(am__append_5425) \ - $(nodist_priority_queue_module_SOURCES) priority_queue.marker \ -- $(nodist_time_module_SOURCES) time.marker $(am__append_5439) \ -- $(am__append_5446) $(nodist_adler32_module_SOURCES) \ -+ $(nodist_time_module_SOURCES) time.marker $(am__append_5432) \ -+ $(am__append_5439) $(nodist_adler32_module_SOURCES) \ - adler32.marker $(nodist_crc64_module_SOURCES) crc64.marker \ - $(nodist_mpi_module_SOURCES) mpi.marker \ - $(nodist_all_video_module_SOURCES) all_video.marker \ -- $(am__append_5453) $(am__append_5460) $(am__append_5467) \ -- $(am__append_5474) $(am__append_5481) $(am__append_5488) \ -+ $(am__append_5446) $(am__append_5453) $(am__append_5460) \ -+ $(am__append_5467) $(am__append_5474) $(am__append_5481) \ - $(nodist_testspeed_module_SOURCES) testspeed.marker \ -- $(am__append_5495) $(nodist_tr_module_SOURCES) tr.marker \ -+ $(am__append_5488) $(nodist_tr_module_SOURCES) tr.marker \ - $(nodist_progress_module_SOURCES) progress.marker \ -- $(nodist_file_module_SOURCES) file.marker $(am__append_5502) \ -- $(am__append_5509) $(am__append_5516) $(am__append_5523) \ -- $(am__append_5530) $(am__append_5537) $(am__append_5544) \ -- $(am__append_5551) $(am__append_5558) $(am__append_5565) \ -- $(am__append_5572) $(am__append_5579) $(am__append_5586) \ -- $(am__append_5593) $(nodist_gcry_arcfour_module_SOURCES) \ -+ $(nodist_file_module_SOURCES) file.marker $(am__append_5495) \ -+ $(am__append_5502) $(am__append_5509) $(am__append_5516) \ -+ $(am__append_5523) $(am__append_5530) $(am__append_5537) \ -+ $(am__append_5544) $(am__append_5551) $(am__append_5558) \ -+ $(am__append_5565) $(am__append_5572) $(am__append_5579) \ -+ $(am__append_5586) $(nodist_gcry_arcfour_module_SOURCES) \ - gcry_arcfour.marker $(nodist_gcry_blowfish_module_SOURCES) \ - gcry_blowfish.marker $(nodist_gcry_camellia_module_SOURCES) \ - gcry_camellia.marker $(nodist_gcry_cast5_module_SOURCES) \ -@@ -17202,25 +17178,25 @@ CLEANFILES = build-grub-pep2elf$(BUILD_EXEEXT) \ - gcry_sha512.marker $(nodist_gcry_tiger_module_SOURCES) \ - gcry_tiger.marker $(nodist_gcry_twofish_module_SOURCES) \ - gcry_twofish.marker $(nodist_gcry_whirlpool_module_SOURCES) \ -- gcry_whirlpool.marker $(am__append_5599) $(am__append_5604) \ -- $(am__append_5609) $(am__append_5614) $(am__append_5619) \ -- $(am__append_5624) $(am__append_5629) $(am__append_5634) \ -- $(am__append_5639) $(am__append_5644) $(am__append_5649) \ -- $(am__append_5654) $(am__append_5659) $(am__append_5664) \ -- $(am__append_5669) $(am__append_5674) $(am__append_5679) \ -- $(am__append_5684) $(am__append_5689) $(am__append_5694) \ -- $(am__append_5699) $(am__append_5704) $(am__append_5709) \ -- $(am__append_5714) $(am__append_5719) $(am__append_5724) \ -- $(am__append_5729) $(am__append_5734) $(am__append_5739) \ -- $(am__append_5744) $(am__append_5749) $(am__append_5754) \ -- $(am__append_5759) $(am__append_5764) $(am__append_5769) \ -- $(am__append_5774) $(am__append_5779) $(am__append_5784) \ -- $(am__append_5789) $(am__append_5793) $(am__append_5796) \ -+ gcry_whirlpool.marker $(am__append_5592) $(am__append_5597) \ -+ $(am__append_5602) $(am__append_5607) $(am__append_5612) \ -+ $(am__append_5617) $(am__append_5622) $(am__append_5627) \ -+ $(am__append_5632) $(am__append_5637) $(am__append_5642) \ -+ $(am__append_5647) $(am__append_5652) $(am__append_5657) \ -+ $(am__append_5662) $(am__append_5667) $(am__append_5672) \ -+ $(am__append_5677) $(am__append_5682) $(am__append_5687) \ -+ $(am__append_5692) $(am__append_5697) $(am__append_5702) \ -+ $(am__append_5707) $(am__append_5712) $(am__append_5717) \ -+ $(am__append_5722) $(am__append_5727) $(am__append_5732) \ -+ $(am__append_5737) $(am__append_5742) $(am__append_5747) \ -+ $(am__append_5752) $(am__append_5757) $(am__append_5762) \ -+ $(am__append_5767) $(am__append_5772) $(am__append_5777) \ -+ $(am__append_5782) $(am__append_5786) $(am__append_5789) \ - gensyminfo.sh genmod.sh modinfo.sh gmodule.pl gdb_grub \ -- $(am__append_5798) symlist.h symlist.c kernel_syms.lst \ -- $(am__append_5830) fs.lst command.lst partmap.lst terminal.lst \ -+ $(am__append_5791) symlist.h symlist.c kernel_syms.lst \ -+ $(am__append_5823) fs.lst command.lst partmap.lst terminal.lst \ - fdt.lst parttool.lst video.lst crypto.lst config.log \ -- syminfo.lst moddep.lst $(MOD_FILES) $(am__append_5832) -+ syminfo.lst moddep.lst $(MOD_FILES) $(am__append_5825) - BUILT_SOURCES = $(nodist_disk_module_SOURCES) \ - $(nodist_trig_module_SOURCES) $(am__append_6) $(am__append_13) \ - $(am__append_20) $(am__append_27) $(am__append_34) \ -@@ -17329,42 +17305,41 @@ BUILT_SOURCES = $(nodist_disk_module_SOURCES) \ - $(am__append_2043) $(am__append_2050) $(am__append_2057) \ - $(am__append_2064) $(am__append_2071) $(am__append_2078) \ - $(am__append_2085) $(am__append_2092) $(am__append_2099) \ -- $(am__append_2106) $(nodist_help_module_SOURCES) \ -- $(nodist_hexdump_module_SOURCES) \ -- $(nodist_keystatus_module_SOURCES) $(am__append_2113) \ -- $(am__append_2120) $(nodist_loadenv_module_SOURCES) \ -+ $(nodist_help_module_SOURCES) $(nodist_hexdump_module_SOURCES) \ -+ $(nodist_keystatus_module_SOURCES) $(am__append_2106) \ -+ $(am__append_2113) $(nodist_loadenv_module_SOURCES) \ - $(nodist_ls_module_SOURCES) $(nodist_lsmmap_module_SOURCES) \ -- $(am__append_2127) $(am__append_2134) $(am__append_2141) \ -- $(am__append_2148) $(am__append_2155) $(am__append_2162) \ -- $(am__append_2169) $(am__append_2176) \ -+ $(am__append_2120) $(am__append_2127) $(am__append_2134) \ -+ $(am__append_2141) $(am__append_2148) $(am__append_2155) \ -+ $(am__append_2162) $(am__append_2169) \ - $(nodist_memrw_module_SOURCES) \ - $(nodist_minicmd_module_SOURCES) \ - $(nodist_parttool_module_SOURCES) \ - $(nodist_password_module_SOURCES) \ -- $(nodist_password_pbkdf2_module_SOURCES) $(am__append_2183) \ -- $(am__append_2190) $(am__append_2197) $(am__append_2204) \ -- $(am__append_2211) $(am__append_2218) $(am__append_2225) \ -- $(am__append_2232) $(am__append_2239) $(am__append_2246) \ -- $(am__append_2253) $(am__append_2260) $(am__append_2267) \ -- $(am__append_2274) $(am__append_2281) $(am__append_2288) \ -- $(am__append_2295) $(am__append_2302) $(am__append_2309) \ -- $(am__append_2316) $(am__append_2323) \ -+ $(nodist_password_pbkdf2_module_SOURCES) $(am__append_2176) \ -+ $(am__append_2183) $(am__append_2190) $(am__append_2197) \ -+ $(am__append_2204) $(am__append_2211) $(am__append_2218) \ -+ $(am__append_2225) $(am__append_2232) $(am__append_2239) \ -+ $(am__append_2246) $(am__append_2253) $(am__append_2260) \ -+ $(am__append_2267) $(am__append_2274) $(am__append_2281) \ -+ $(am__append_2288) $(am__append_2295) $(am__append_2302) \ -+ $(am__append_2309) $(am__append_2316) \ - $(nodist_probe_module_SOURCES) $(nodist_read_module_SOURCES) \ - $(nodist_search_module_SOURCES) \ - $(nodist_search_fs_file_module_SOURCES) \ - $(nodist_search_fs_uuid_module_SOURCES) \ -- $(nodist_search_label_module_SOURCES) $(am__append_2330) \ -- $(am__append_2337) $(am__append_2344) $(am__append_2351) \ -- $(am__append_2358) $(am__append_2365) $(am__append_2372) \ -- $(am__append_2379) $(am__append_2386) $(am__append_2393) \ -- $(am__append_2400) $(am__append_2407) $(am__append_2414) \ -- $(am__append_2421) $(am__append_2428) $(am__append_2435) \ -- $(nodist_sleep_module_SOURCES) $(am__append_2442) \ -- $(am__append_2449) $(nodist_terminal_module_SOURCES) \ -+ $(nodist_search_label_module_SOURCES) $(am__append_2323) \ -+ $(am__append_2330) $(am__append_2337) $(am__append_2344) \ -+ $(am__append_2351) $(am__append_2358) $(am__append_2365) \ -+ $(am__append_2372) $(am__append_2379) $(am__append_2386) \ -+ $(am__append_2393) $(am__append_2400) $(am__append_2407) \ -+ $(am__append_2414) $(am__append_2421) $(am__append_2428) \ -+ $(nodist_sleep_module_SOURCES) $(am__append_2435) \ -+ $(am__append_2442) $(nodist_terminal_module_SOURCES) \ - $(nodist_test_module_SOURCES) $(nodist_true_module_SOURCES) \ -- $(am__append_2456) $(am__append_2463) $(am__append_2470) \ -- $(am__append_2477) $(am__append_2484) $(am__append_2491) \ -- $(am__append_2498) $(am__append_2505) $(am__append_2512) \ -+ $(am__append_2449) $(am__append_2456) $(am__append_2463) \ -+ $(am__append_2470) $(am__append_2477) $(am__append_2484) \ -+ $(am__append_2491) $(am__append_2498) $(am__append_2505) \ - $(nodist_videoinfo_module_SOURCES) \ - $(nodist_videotest_module_SOURCES) \ - $(nodist_xnu_uuid_module_SOURCES) \ -@@ -17380,27 +17355,27 @@ BUILT_SOURCES = $(nodist_disk_module_SOURCES) \ - $(nodist_raid5rec_module_SOURCES) \ - $(nodist_raid6rec_module_SOURCES) \ - $(nodist_scsi_module_SOURCES) $(nodist_memdisk_module_SOURCES) \ -- $(am__append_2519) $(am__append_2526) $(am__append_2533) \ -- $(am__append_2540) $(am__append_2547) $(am__append_2554) \ -- $(am__append_2561) $(am__append_2568) $(am__append_2575) \ -- $(am__append_2582) $(am__append_2589) $(am__append_2596) \ -- $(am__append_2603) $(am__append_2610) $(am__append_2617) \ -- $(am__append_2624) $(am__append_2631) $(am__append_2638) \ -- $(am__append_2645) $(am__append_2652) $(am__append_2659) \ -- $(am__append_2666) $(am__append_2673) $(am__append_2680) \ -- $(am__append_2687) $(am__append_2694) $(am__append_2701) \ -- $(am__append_2708) $(am__append_2715) $(am__append_2722) \ -- $(am__append_2729) $(am__append_2736) $(am__append_2743) \ -- $(am__append_2750) $(am__append_2757) $(am__append_2764) \ -- $(am__append_2771) $(am__append_2778) $(am__append_2785) \ -- $(am__append_2792) $(am__append_2799) $(am__append_2806) \ -- $(am__append_2813) $(am__append_2820) $(am__append_2827) \ -- $(am__append_2834) $(am__append_2841) $(am__append_2848) \ -- $(am__append_2855) $(am__append_2862) $(am__append_2869) \ -- $(am__append_2876) $(am__append_2883) $(am__append_2890) \ -- $(am__append_2897) $(am__append_2904) $(am__append_2911) \ -- $(am__append_2918) $(am__append_2925) $(am__append_2932) \ -- $(am__append_2939) $(nodist_procfs_module_SOURCES) \ -+ $(am__append_2512) $(am__append_2519) $(am__append_2526) \ -+ $(am__append_2533) $(am__append_2540) $(am__append_2547) \ -+ $(am__append_2554) $(am__append_2561) $(am__append_2568) \ -+ $(am__append_2575) $(am__append_2582) $(am__append_2589) \ -+ $(am__append_2596) $(am__append_2603) $(am__append_2610) \ -+ $(am__append_2617) $(am__append_2624) $(am__append_2631) \ -+ $(am__append_2638) $(am__append_2645) $(am__append_2652) \ -+ $(am__append_2659) $(am__append_2666) $(am__append_2673) \ -+ $(am__append_2680) $(am__append_2687) $(am__append_2694) \ -+ $(am__append_2701) $(am__append_2708) $(am__append_2715) \ -+ $(am__append_2722) $(am__append_2729) $(am__append_2736) \ -+ $(am__append_2743) $(am__append_2750) $(am__append_2757) \ -+ $(am__append_2764) $(am__append_2771) $(am__append_2778) \ -+ $(am__append_2785) $(am__append_2792) $(am__append_2799) \ -+ $(am__append_2806) $(am__append_2813) $(am__append_2820) \ -+ $(am__append_2827) $(am__append_2834) $(am__append_2841) \ -+ $(am__append_2848) $(am__append_2855) $(am__append_2862) \ -+ $(am__append_2869) $(am__append_2876) $(am__append_2883) \ -+ $(am__append_2890) $(am__append_2897) $(am__append_2904) \ -+ $(am__append_2911) $(am__append_2918) $(am__append_2925) \ -+ $(am__append_2932) $(nodist_procfs_module_SOURCES) \ - $(nodist_affs_module_SOURCES) $(nodist_afs_module_SOURCES) \ - $(nodist_bfs_module_SOURCES) $(nodist_zstd_module_SOURCES) \ - $(nodist_btrfs_module_SOURCES) \ -@@ -17428,69 +17403,69 @@ BUILT_SOURCES = $(nodist_disk_module_SOURCES) \ - $(nodist_xfs_module_SOURCES) $(nodist_zfs_module_SOURCES) \ - $(nodist_zfscrypt_module_SOURCES) \ - $(nodist_zfsinfo_module_SOURCES) \ -- $(nodist_macbless_module_SOURCES) $(am__append_2946) \ -+ $(nodist_macbless_module_SOURCES) $(am__append_2939) \ - $(nodist_gettext_module_SOURCES) \ - $(nodist_gfxmenu_module_SOURCES) \ - $(nodist_hello_module_SOURCES) $(nodist_gzio_module_SOURCES) \ -- $(nodist_offsetio_module_SOURCES) $(am__append_2953) \ -- $(am__append_2960) $(am__append_2967) $(am__append_2974) \ -- $(am__append_2981) $(am__append_2988) $(am__append_2995) \ -- $(am__append_3002) $(am__append_3009) $(am__append_3016) \ -- $(am__append_3023) $(am__append_3030) $(am__append_3037) \ -- $(am__append_3044) $(am__append_3051) $(am__append_3058) \ -- $(am__append_3065) $(am__append_3072) $(am__append_3079) \ -- $(am__append_3086) $(nodist_elf_module_SOURCES) \ -+ $(nodist_offsetio_module_SOURCES) $(am__append_2946) \ -+ $(am__append_2953) $(am__append_2960) $(am__append_2967) \ -+ $(am__append_2974) $(am__append_2981) $(am__append_2988) \ -+ $(am__append_2995) $(am__append_3002) $(am__append_3009) \ -+ $(am__append_3016) $(am__append_3023) $(am__append_3030) \ -+ $(am__append_3037) $(am__append_3044) $(am__append_3051) \ -+ $(am__append_3058) $(am__append_3065) $(am__append_3072) \ -+ $(am__append_3079) $(nodist_elf_module_SOURCES) \ - $(nodist_crypto_module_SOURCES) \ -- $(nodist_pbkdf2_module_SOURCES) $(am__append_3093) \ -- $(am__append_3100) $(am__append_3107) $(am__append_3114) \ -- $(am__append_3121) $(am__append_3128) $(am__append_3135) \ -- $(am__append_3142) $(am__append_3149) $(am__append_3156) \ -- $(am__append_3163) $(am__append_3170) $(am__append_3177) \ -- $(am__append_3184) $(am__append_3191) $(am__append_3198) \ -- $(am__append_3205) $(am__append_3212) $(am__append_3219) \ -- $(am__append_3226) $(am__append_3233) $(am__append_3240) \ -- $(am__append_3247) $(am__append_3254) $(am__append_3261) \ -- $(am__append_3268) $(am__append_3275) $(am__append_3282) \ -- $(am__append_3289) $(am__append_3296) $(am__append_3303) \ -- $(am__append_3310) $(am__append_3317) $(am__append_3324) \ -- $(am__append_3331) $(am__append_3338) \ -- $(nodist_setjmp_module_SOURCES) $(am__append_3345) \ -- $(am__append_3352) $(am__append_3359) $(am__append_3366) \ -- $(am__append_3373) $(am__append_3380) $(am__append_3387) \ -- $(am__append_3394) $(am__append_3401) $(am__append_3408) \ -- $(am__append_3415) $(am__append_3422) $(am__append_3429) \ -- $(am__append_3436) $(am__append_3443) $(am__append_3450) \ -- $(am__append_3457) $(am__append_3464) $(am__append_3471) \ -- $(am__append_3478) $(am__append_3485) $(am__append_3492) \ -- $(am__append_3499) $(am__append_3506) $(am__append_3513) \ -- $(am__append_3520) $(am__append_3527) $(am__append_3534) \ -- $(am__append_3541) $(am__append_3548) $(am__append_3555) \ -- $(am__append_3562) $(am__append_3569) $(am__append_3576) \ -- $(am__append_3583) $(am__append_3590) $(am__append_3597) \ -- $(am__append_3604) $(am__append_3611) $(am__append_3618) \ -- $(am__append_3625) $(am__append_3632) $(am__append_3639) \ -- $(am__append_3646) $(am__append_3653) $(am__append_3660) \ -- $(am__append_3667) $(am__append_3674) $(am__append_3681) \ -- $(am__append_3688) $(am__append_3695) $(am__append_3702) \ -- $(am__append_3709) $(am__append_3716) $(am__append_3723) \ -- $(am__append_3730) $(am__append_3737) $(am__append_3744) \ -- $(am__append_3751) $(am__append_3758) $(am__append_3765) \ -- $(am__append_3772) $(am__append_3779) $(am__append_3786) \ -- $(am__append_3793) $(am__append_3800) $(am__append_3807) \ -- $(am__append_3814) $(am__append_3821) $(am__append_3828) \ -- $(am__append_3835) $(am__append_3842) $(am__append_3849) \ -- $(am__append_3856) $(am__append_3863) $(am__append_3870) \ -- $(am__append_3877) $(am__append_3884) \ -- $(nodist_macho_module_SOURCES) $(am__append_3891) \ -- $(am__append_3898) $(am__append_3905) $(am__append_3912) \ -- $(am__append_3919) $(am__append_3926) $(am__append_3933) \ -- $(am__append_3940) $(am__append_3947) $(am__append_3954) \ -- $(am__append_3961) $(am__append_3968) $(am__append_3975) \ -- $(am__append_3982) $(am__append_3989) $(am__append_3996) \ -- $(am__append_4003) $(am__append_4010) $(am__append_4017) \ -- $(am__append_4024) $(am__append_4031) $(am__append_4038) \ -- $(am__append_4045) $(am__append_4052) $(am__append_4059) \ -- $(am__append_4066) $(am__append_4073) \ -+ $(nodist_pbkdf2_module_SOURCES) $(am__append_3086) \ -+ $(am__append_3093) $(am__append_3100) $(am__append_3107) \ -+ $(am__append_3114) $(am__append_3121) $(am__append_3128) \ -+ $(am__append_3135) $(am__append_3142) $(am__append_3149) \ -+ $(am__append_3156) $(am__append_3163) $(am__append_3170) \ -+ $(am__append_3177) $(am__append_3184) $(am__append_3191) \ -+ $(am__append_3198) $(am__append_3205) $(am__append_3212) \ -+ $(am__append_3219) $(am__append_3226) $(am__append_3233) \ -+ $(am__append_3240) $(am__append_3247) $(am__append_3254) \ -+ $(am__append_3261) $(am__append_3268) $(am__append_3275) \ -+ $(am__append_3282) $(am__append_3289) $(am__append_3296) \ -+ $(am__append_3303) $(am__append_3310) $(am__append_3317) \ -+ $(am__append_3324) $(am__append_3331) \ -+ $(nodist_setjmp_module_SOURCES) $(am__append_3338) \ -+ $(am__append_3345) $(am__append_3352) $(am__append_3359) \ -+ $(am__append_3366) $(am__append_3373) $(am__append_3380) \ -+ $(am__append_3387) $(am__append_3394) $(am__append_3401) \ -+ $(am__append_3408) $(am__append_3415) $(am__append_3422) \ -+ $(am__append_3429) $(am__append_3436) $(am__append_3443) \ -+ $(am__append_3450) $(am__append_3457) $(am__append_3464) \ -+ $(am__append_3471) $(am__append_3478) $(am__append_3485) \ -+ $(am__append_3492) $(am__append_3499) $(am__append_3506) \ -+ $(am__append_3513) $(am__append_3520) $(am__append_3527) \ -+ $(am__append_3534) $(am__append_3541) $(am__append_3548) \ -+ $(am__append_3555) $(am__append_3562) $(am__append_3569) \ -+ $(am__append_3576) $(am__append_3583) $(am__append_3590) \ -+ $(am__append_3597) $(am__append_3604) $(am__append_3611) \ -+ $(am__append_3618) $(am__append_3625) $(am__append_3632) \ -+ $(am__append_3639) $(am__append_3646) $(am__append_3653) \ -+ $(am__append_3660) $(am__append_3667) $(am__append_3674) \ -+ $(am__append_3681) $(am__append_3688) $(am__append_3695) \ -+ $(am__append_3702) $(am__append_3709) $(am__append_3716) \ -+ $(am__append_3723) $(am__append_3730) $(am__append_3737) \ -+ $(am__append_3744) $(am__append_3751) $(am__append_3758) \ -+ $(am__append_3765) $(am__append_3772) $(am__append_3779) \ -+ $(am__append_3786) $(am__append_3793) $(am__append_3800) \ -+ $(am__append_3807) $(am__append_3814) $(am__append_3821) \ -+ $(am__append_3828) $(am__append_3835) $(am__append_3842) \ -+ $(am__append_3849) $(am__append_3856) $(am__append_3863) \ -+ $(am__append_3870) $(am__append_3877) \ -+ $(nodist_macho_module_SOURCES) $(am__append_3884) \ -+ $(am__append_3891) $(am__append_3898) $(am__append_3905) \ -+ $(am__append_3912) $(am__append_3919) $(am__append_3926) \ -+ $(am__append_3933) $(am__append_3940) $(am__append_3947) \ -+ $(am__append_3954) $(am__append_3961) $(am__append_3968) \ -+ $(am__append_3975) $(am__append_3982) $(am__append_3989) \ -+ $(am__append_3996) $(am__append_4003) $(am__append_4010) \ -+ $(am__append_4017) $(am__append_4024) $(am__append_4031) \ -+ $(am__append_4038) $(am__append_4045) $(am__append_4052) \ -+ $(am__append_4059) $(am__append_4066) \ - $(nodist_normal_module_SOURCES) \ - $(nodist_part_acorn_module_SOURCES) \ - $(nodist_part_amiga_module_SOURCES) \ -@@ -17503,35 +17478,35 @@ BUILT_SOURCES = $(nodist_disk_module_SOURCES) \ - $(nodist_part_bsd_module_SOURCES) \ - $(nodist_part_sunpc_module_SOURCES) \ - $(nodist_part_dfly_module_SOURCES) \ -- $(nodist_msdospart_module_SOURCES) $(am__append_4080) \ -- $(am__append_4087) $(am__append_4094) $(am__append_4101) \ -- $(am__append_4108) $(am__append_4115) $(am__append_4122) \ -- $(am__append_4129) $(am__append_4136) $(am__append_4143) \ -- $(am__append_4150) $(am__append_4157) $(am__append_4164) \ -- $(am__append_4171) $(am__append_4178) $(am__append_4185) \ -- $(am__append_4192) $(am__append_4199) $(am__append_4206) \ -- $(am__append_4213) $(am__append_4220) $(am__append_4227) \ -- $(am__append_4234) $(am__append_4241) $(am__append_4248) \ -- $(am__append_4255) $(am__append_4262) \ -- $(nodist_gfxterm_background_module_SOURCES) $(am__append_4269) \ -- $(am__append_4276) $(am__append_4283) $(am__append_4290) \ -- $(am__append_4297) $(am__append_4304) $(am__append_4311) \ -- $(am__append_4318) $(am__append_4325) $(am__append_4332) \ -- $(am__append_4339) $(am__append_4346) $(am__append_4353) \ -- $(am__append_4360) $(am__append_4367) $(am__append_4374) \ -- $(am__append_4381) $(am__append_4388) $(am__append_4395) \ -- $(am__append_4402) $(am__append_4409) $(am__append_4416) \ -- $(am__append_4423) $(am__append_4430) $(am__append_4437) \ -- $(am__append_4444) $(am__append_4451) $(am__append_4458) \ -- $(am__append_4465) $(am__append_4472) $(am__append_4479) \ -- $(am__append_4486) $(am__append_4493) $(am__append_4500) \ -- $(am__append_4507) $(am__append_4514) $(am__append_4521) \ -- $(am__append_4528) $(am__append_4535) $(am__append_4542) \ -- $(am__append_4549) $(am__append_4556) $(am__append_4563) \ -- $(am__append_4570) $(am__append_4577) $(am__append_4584) \ -- $(am__append_4591) $(am__append_4598) $(am__append_4605) \ -- $(am__append_4612) $(am__append_4619) $(am__append_4626) \ -- $(am__append_4633) $(am__append_4640) $(am__append_4647) \ -+ $(nodist_msdospart_module_SOURCES) $(am__append_4073) \ -+ $(am__append_4080) $(am__append_4087) $(am__append_4094) \ -+ $(am__append_4101) $(am__append_4108) $(am__append_4115) \ -+ $(am__append_4122) $(am__append_4129) $(am__append_4136) \ -+ $(am__append_4143) $(am__append_4150) $(am__append_4157) \ -+ $(am__append_4164) $(am__append_4171) $(am__append_4178) \ -+ $(am__append_4185) $(am__append_4192) $(am__append_4199) \ -+ $(am__append_4206) $(am__append_4213) $(am__append_4220) \ -+ $(am__append_4227) $(am__append_4234) $(am__append_4241) \ -+ $(am__append_4248) $(am__append_4255) \ -+ $(nodist_gfxterm_background_module_SOURCES) $(am__append_4262) \ -+ $(am__append_4269) $(am__append_4276) $(am__append_4283) \ -+ $(am__append_4290) $(am__append_4297) $(am__append_4304) \ -+ $(am__append_4311) $(am__append_4318) $(am__append_4325) \ -+ $(am__append_4332) $(am__append_4339) $(am__append_4346) \ -+ $(am__append_4353) $(am__append_4360) $(am__append_4367) \ -+ $(am__append_4374) $(am__append_4381) $(am__append_4388) \ -+ $(am__append_4395) $(am__append_4402) $(am__append_4409) \ -+ $(am__append_4416) $(am__append_4423) $(am__append_4430) \ -+ $(am__append_4437) $(am__append_4444) $(am__append_4451) \ -+ $(am__append_4458) $(am__append_4465) $(am__append_4472) \ -+ $(am__append_4479) $(am__append_4486) $(am__append_4493) \ -+ $(am__append_4500) $(am__append_4507) $(am__append_4514) \ -+ $(am__append_4521) $(am__append_4528) $(am__append_4535) \ -+ $(am__append_4542) $(am__append_4549) $(am__append_4556) \ -+ $(am__append_4563) $(am__append_4570) $(am__append_4577) \ -+ $(am__append_4584) $(am__append_4591) $(am__append_4598) \ -+ $(am__append_4605) $(am__append_4612) $(am__append_4619) \ -+ $(am__append_4626) $(am__append_4633) $(am__append_4640) \ - $(nodist_functional_test_module_SOURCES) \ - $(nodist_exfctest_module_SOURCES) \ - $(nodist_strtoull_test_module_SOURCES) \ -@@ -17539,15 +17514,15 @@ BUILT_SOURCES = $(nodist_disk_module_SOURCES) \ - $(nodist_signature_test_module_SOURCES) \ - $(nodist_sleep_test_module_SOURCES) \ - $(nodist_xnu_uuid_test_module_SOURCES) \ -- $(nodist_pbkdf2_test_module_SOURCES) $(am__append_4654) \ -- $(am__append_4661) $(am__append_4668) $(am__append_4675) \ -- $(am__append_4682) $(am__append_4689) $(am__append_4696) \ -- $(am__append_4703) $(am__append_4710) $(am__append_4717) \ -- $(am__append_4724) $(am__append_4731) $(am__append_4738) \ -- $(am__append_4745) $(am__append_4752) $(am__append_4759) \ -- $(am__append_4766) $(am__append_4773) $(am__append_4780) \ -- $(am__append_4787) $(am__append_4794) $(am__append_4801) \ -- $(am__append_4808) $(am__append_4815) $(am__append_4822) \ -+ $(nodist_pbkdf2_test_module_SOURCES) $(am__append_4647) \ -+ $(am__append_4654) $(am__append_4661) $(am__append_4668) \ -+ $(am__append_4675) $(am__append_4682) $(am__append_4689) \ -+ $(am__append_4696) $(am__append_4703) $(am__append_4710) \ -+ $(am__append_4717) $(am__append_4724) $(am__append_4731) \ -+ $(am__append_4738) $(am__append_4745) $(am__append_4752) \ -+ $(am__append_4759) $(am__append_4766) $(am__append_4773) \ -+ $(am__append_4780) $(am__append_4787) $(am__append_4794) \ -+ $(am__append_4801) $(am__append_4808) $(am__append_4815) \ - $(nodist_div_test_module_SOURCES) \ - $(nodist_mul_test_module_SOURCES) \ - $(nodist_shift_test_module_SOURCES) \ -@@ -17558,59 +17533,59 @@ BUILT_SOURCES = $(nodist_disk_module_SOURCES) \ - $(nodist_gfxterm_menu_module_SOURCES) \ - $(nodist_cmdline_cat_test_module_SOURCES) \ - $(nodist_bitmap_module_SOURCES) \ -- $(nodist_bitmap_scale_module_SOURCES) $(am__append_4829) \ -- $(am__append_4836) $(am__append_4843) $(am__append_4850) \ -- $(am__append_4857) $(am__append_4864) $(am__append_4871) \ -- $(am__append_4878) $(am__append_4885) \ -+ $(nodist_bitmap_scale_module_SOURCES) $(am__append_4822) \ -+ $(am__append_4829) $(am__append_4836) $(am__append_4843) \ -+ $(am__append_4850) $(am__append_4857) $(am__append_4864) \ -+ $(am__append_4871) $(am__append_4878) \ - $(nodist_jpeg_module_SOURCES) $(nodist_png_module_SOURCES) \ -- $(nodist_tga_module_SOURCES) $(am__append_4892) \ -- $(am__append_4899) $(am__append_4906) $(am__append_4913) \ -- $(am__append_4920) $(am__append_4927) $(am__append_4934) \ -- $(am__append_4941) $(am__append_4948) $(am__append_4955) \ -- $(am__append_4962) $(am__append_4969) $(am__append_4976) \ -- $(am__append_4983) $(am__append_4990) $(am__append_4997) \ -- $(am__append_5004) $(am__append_5011) $(am__append_5018) \ -- $(am__append_5025) $(am__append_5032) $(am__append_5039) \ -- $(am__append_5046) $(am__append_5053) $(am__append_5060) \ -- $(am__append_5067) $(am__append_5074) $(am__append_5081) \ -- $(am__append_5088) $(am__append_5095) $(am__append_5102) \ -- $(am__append_5109) $(am__append_5116) $(am__append_5123) \ -- $(am__append_5130) $(am__append_5137) $(am__append_5144) \ -- $(am__append_5151) $(am__append_5158) $(am__append_5165) \ -- $(am__append_5172) $(nodist_video_colors_module_SOURCES) \ -- $(am__append_5179) $(am__append_5186) \ -+ $(nodist_tga_module_SOURCES) $(am__append_4885) \ -+ $(am__append_4892) $(am__append_4899) $(am__append_4906) \ -+ $(am__append_4913) $(am__append_4920) $(am__append_4927) \ -+ $(am__append_4934) $(am__append_4941) $(am__append_4948) \ -+ $(am__append_4955) $(am__append_4962) $(am__append_4969) \ -+ $(am__append_4976) $(am__append_4983) $(am__append_4990) \ -+ $(am__append_4997) $(am__append_5004) $(am__append_5011) \ -+ $(am__append_5018) $(am__append_5025) $(am__append_5032) \ -+ $(am__append_5039) $(am__append_5046) $(am__append_5053) \ -+ $(am__append_5060) $(am__append_5067) $(am__append_5074) \ -+ $(am__append_5081) $(am__append_5088) $(am__append_5095) \ -+ $(am__append_5102) $(am__append_5109) $(am__append_5116) \ -+ $(am__append_5123) $(am__append_5130) $(am__append_5137) \ -+ $(am__append_5144) $(am__append_5151) $(am__append_5158) \ -+ $(am__append_5165) $(nodist_video_colors_module_SOURCES) \ -+ $(am__append_5172) $(am__append_5179) \ - $(nodist_datehook_module_SOURCES) $(nodist_net_module_SOURCES) \ - $(nodist_tftp_module_SOURCES) $(nodist_http_module_SOURCES) \ -- $(am__append_5193) $(am__append_5200) $(am__append_5207) \ -- $(am__append_5214) $(am__append_5221) $(am__append_5228) \ -- $(am__append_5235) $(am__append_5242) $(am__append_5249) \ -- $(am__append_5256) $(am__append_5263) $(am__append_5270) \ -- $(am__append_5277) $(am__append_5284) $(am__append_5291) \ -- $(am__append_5298) $(am__append_5305) $(am__append_5312) \ -+ $(am__append_5186) $(am__append_5193) $(am__append_5200) \ -+ $(am__append_5207) $(am__append_5214) $(am__append_5221) \ -+ $(am__append_5228) $(am__append_5235) $(am__append_5242) \ -+ $(am__append_5249) $(am__append_5256) $(am__append_5263) \ -+ $(am__append_5270) $(am__append_5277) $(am__append_5284) \ -+ $(am__append_5291) $(am__append_5298) $(am__append_5305) \ - $(nodist_syslinuxcfg_module_SOURCES) \ - $(nodist_test_blockarg_module_SOURCES) \ - $(nodist_xzio_module_SOURCES) $(nodist_lzopio_module_SOURCES) \ -- $(nodist_testload_module_SOURCES) $(am__append_5319) \ -- $(am__append_5326) $(am__append_5333) $(am__append_5340) \ -- $(am__append_5347) $(am__append_5354) $(am__append_5361) \ -- $(am__append_5368) $(am__append_5375) $(am__append_5382) \ -- $(am__append_5389) $(am__append_5396) $(am__append_5403) \ -- $(am__append_5410) $(am__append_5417) $(am__append_5424) \ -- $(am__append_5431) $(nodist_priority_queue_module_SOURCES) \ -- $(nodist_time_module_SOURCES) $(am__append_5438) \ -- $(am__append_5445) $(nodist_adler32_module_SOURCES) \ -+ $(nodist_testload_module_SOURCES) $(am__append_5312) \ -+ $(am__append_5319) $(am__append_5326) $(am__append_5333) \ -+ $(am__append_5340) $(am__append_5347) $(am__append_5354) \ -+ $(am__append_5361) $(am__append_5368) $(am__append_5375) \ -+ $(am__append_5382) $(am__append_5389) $(am__append_5396) \ -+ $(am__append_5403) $(am__append_5410) $(am__append_5417) \ -+ $(am__append_5424) $(nodist_priority_queue_module_SOURCES) \ -+ $(nodist_time_module_SOURCES) $(am__append_5431) \ -+ $(am__append_5438) $(nodist_adler32_module_SOURCES) \ - $(nodist_crc64_module_SOURCES) $(nodist_mpi_module_SOURCES) \ -- $(nodist_all_video_module_SOURCES) $(am__append_5452) \ -- $(am__append_5459) $(am__append_5466) $(am__append_5473) \ -- $(am__append_5480) $(am__append_5487) \ -- $(nodist_testspeed_module_SOURCES) $(am__append_5494) \ -+ $(nodist_all_video_module_SOURCES) $(am__append_5445) \ -+ $(am__append_5452) $(am__append_5459) $(am__append_5466) \ -+ $(am__append_5473) $(am__append_5480) \ -+ $(nodist_testspeed_module_SOURCES) $(am__append_5487) \ - $(nodist_tr_module_SOURCES) $(nodist_progress_module_SOURCES) \ -- $(nodist_file_module_SOURCES) $(am__append_5501) \ -- $(am__append_5508) $(am__append_5515) $(am__append_5522) \ -- $(am__append_5529) $(am__append_5536) $(am__append_5543) \ -- $(am__append_5550) $(am__append_5557) $(am__append_5564) \ -- $(am__append_5571) $(am__append_5578) $(am__append_5585) \ -- $(am__append_5592) $(nodist_gcry_arcfour_module_SOURCES) \ -+ $(nodist_file_module_SOURCES) $(am__append_5494) \ -+ $(am__append_5501) $(am__append_5508) $(am__append_5515) \ -+ $(am__append_5522) $(am__append_5529) $(am__append_5536) \ -+ $(am__append_5543) $(am__append_5550) $(am__append_5557) \ -+ $(am__append_5564) $(am__append_5571) $(am__append_5578) \ -+ $(am__append_5585) $(nodist_gcry_arcfour_module_SOURCES) \ - $(nodist_gcry_blowfish_module_SOURCES) \ - $(nodist_gcry_camellia_module_SOURCES) \ - $(nodist_gcry_cast5_module_SOURCES) \ -@@ -17631,20 +17606,20 @@ BUILT_SOURCES = $(nodist_disk_module_SOURCES) \ - $(nodist_gcry_sha512_module_SOURCES) \ - $(nodist_gcry_tiger_module_SOURCES) \ - $(nodist_gcry_twofish_module_SOURCES) \ -- $(nodist_gcry_whirlpool_module_SOURCES) $(am__append_5598) \ -- $(am__append_5603) $(am__append_5608) $(am__append_5613) \ -- $(am__append_5618) $(am__append_5623) $(am__append_5628) \ -- $(am__append_5633) $(am__append_5638) $(am__append_5643) \ -- $(am__append_5648) $(am__append_5653) $(am__append_5658) \ -- $(am__append_5663) $(am__append_5668) $(am__append_5673) \ -- $(am__append_5678) $(am__append_5683) $(am__append_5688) \ -- $(am__append_5693) $(am__append_5698) $(am__append_5703) \ -- $(am__append_5708) $(am__append_5713) $(am__append_5718) \ -- $(am__append_5723) $(am__append_5728) $(am__append_5733) \ -- $(am__append_5738) $(am__append_5743) $(am__append_5748) \ -- $(am__append_5753) $(am__append_5758) $(am__append_5763) \ -- $(am__append_5768) $(am__append_5773) $(am__append_5778) \ -- $(am__append_5783) $(am__append_5788) $(am__append_5795) \ -+ $(nodist_gcry_whirlpool_module_SOURCES) $(am__append_5591) \ -+ $(am__append_5596) $(am__append_5601) $(am__append_5606) \ -+ $(am__append_5611) $(am__append_5616) $(am__append_5621) \ -+ $(am__append_5626) $(am__append_5631) $(am__append_5636) \ -+ $(am__append_5641) $(am__append_5646) $(am__append_5651) \ -+ $(am__append_5656) $(am__append_5661) $(am__append_5666) \ -+ $(am__append_5671) $(am__append_5676) $(am__append_5681) \ -+ $(am__append_5686) $(am__append_5691) $(am__append_5696) \ -+ $(am__append_5701) $(am__append_5706) $(am__append_5711) \ -+ $(am__append_5716) $(am__append_5721) $(am__append_5726) \ -+ $(am__append_5731) $(am__append_5736) $(am__append_5741) \ -+ $(am__append_5746) $(am__append_5751) $(am__append_5756) \ -+ $(am__append_5761) $(am__append_5766) $(am__append_5771) \ -+ $(am__append_5776) $(am__append_5781) $(am__append_5788) \ - symlist.h symlist.c - MACHO2IMG = $(top_builddir)/grub-macho2img - AM_CFLAGS = $(TARGET_CFLAGS) -@@ -20083,14 +20058,6 @@ pgp_module_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_MODULE) - pgp_module_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_MODULE) -I$(srcdir)/lib/posix_wrap - pgp_module_CCASFLAGS = $(AM_CCASFLAGS) $(CCASFLAGS_MODULE) - pgp_module_DEPENDENCIES = $(TARGET_OBJ2ELF) --@COND_x86_64_efi_TRUE@shim_lock_module_SOURCES = commands/efi/shim_lock.c ## platform sources --@COND_x86_64_efi_TRUE@nodist_shim_lock_module_SOURCES = ## platform nodist sources --@COND_x86_64_efi_TRUE@shim_lock_module_LDADD = --@COND_x86_64_efi_TRUE@shim_lock_module_CFLAGS = $(AM_CFLAGS) $(CFLAGS_MODULE) --@COND_x86_64_efi_TRUE@shim_lock_module_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_MODULE) --@COND_x86_64_efi_TRUE@shim_lock_module_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_MODULE) --@COND_x86_64_efi_TRUE@shim_lock_module_CCASFLAGS = $(AM_CCASFLAGS) $(CCASFLAGS_MODULE) --@COND_x86_64_efi_TRUE@shim_lock_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_i386_coreboot_TRUE@hdparm_module_SOURCES = commands/hdparm.c ## platform sources - @COND_i386_efi_TRUE@hdparm_module_SOURCES = commands/hdparm.c ## platform sources - @COND_i386_ieee1275_TRUE@hdparm_module_SOURCES = commands/hdparm.c ## platform sources -@@ -29924,13 +29891,6 @@ tests/shift_test_module-shift_test.$(OBJEXT): tests/$(am__dirstamp) \ - shift_test.module$(EXEEXT): $(shift_test_module_OBJECTS) $(shift_test_module_DEPENDENCIES) $(EXTRA_shift_test_module_DEPENDENCIES) - @rm -f shift_test.module$(EXEEXT) - $(AM_V_CCLD)$(shift_test_module_LINK) $(shift_test_module_OBJECTS) $(shift_test_module_LDADD) $(LIBS) --commands/efi/shim_lock_module-shim_lock.$(OBJEXT): \ -- commands/efi/$(am__dirstamp) \ -- commands/efi/$(DEPDIR)/$(am__dirstamp) -- --shim_lock.module$(EXEEXT): $(shim_lock_module_OBJECTS) $(shim_lock_module_DEPENDENCIES) $(EXTRA_shim_lock_module_DEPENDENCIES) -- @rm -f shim_lock.module$(EXEEXT) -- $(AM_V_CCLD)$(shim_lock_module_LINK) $(shim_lock_module_OBJECTS) $(shim_lock_module_LDADD) $(LIBS) - tests/signature_test_module-signature_test.$(OBJEXT): \ - tests/$(am__dirstamp) tests/$(DEPDIR)/$(am__dirstamp) - -@@ -30831,7 +30791,6 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@commands/efi/$(DEPDIR)/lsefimmap_module-lsefimmap.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@commands/efi/$(DEPDIR)/lsefisystab_module-lsefisystab.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@commands/efi/$(DEPDIR)/lssal_module-lssal.Po@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@commands/efi/$(DEPDIR)/shim_lock_module-shim_lock.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@commands/efi/$(DEPDIR)/tpm_module-tpm.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@commands/i386/$(DEPDIR)/cmosdump_module-cmosdump.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@commands/i386/$(DEPDIR)/cmostest_module-cmostest.Po@am__quote@ -@@ -40402,20 +40361,6 @@ tests/shift_test_module-shift_test.obj: tests/shift_test.c - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shift_test_module_CPPFLAGS) $(CPPFLAGS) $(shift_test_module_CFLAGS) $(CFLAGS) -c -o tests/shift_test_module-shift_test.obj `if test -f 'tests/shift_test.c'; then $(CYGPATH_W) 'tests/shift_test.c'; else $(CYGPATH_W) '$(srcdir)/tests/shift_test.c'; fi` - --commands/efi/shim_lock_module-shim_lock.o: commands/efi/shim_lock.c --@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shim_lock_module_CPPFLAGS) $(CPPFLAGS) $(shim_lock_module_CFLAGS) $(CFLAGS) -MT commands/efi/shim_lock_module-shim_lock.o -MD -MP -MF commands/efi/$(DEPDIR)/shim_lock_module-shim_lock.Tpo -c -o commands/efi/shim_lock_module-shim_lock.o `test -f 'commands/efi/shim_lock.c' || echo '$(srcdir)/'`commands/efi/shim_lock.c --@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) commands/efi/$(DEPDIR)/shim_lock_module-shim_lock.Tpo commands/efi/$(DEPDIR)/shim_lock_module-shim_lock.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='commands/efi/shim_lock.c' object='commands/efi/shim_lock_module-shim_lock.o' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shim_lock_module_CPPFLAGS) $(CPPFLAGS) $(shim_lock_module_CFLAGS) $(CFLAGS) -c -o commands/efi/shim_lock_module-shim_lock.o `test -f 'commands/efi/shim_lock.c' || echo '$(srcdir)/'`commands/efi/shim_lock.c -- --commands/efi/shim_lock_module-shim_lock.obj: commands/efi/shim_lock.c --@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shim_lock_module_CPPFLAGS) $(CPPFLAGS) $(shim_lock_module_CFLAGS) $(CFLAGS) -MT commands/efi/shim_lock_module-shim_lock.obj -MD -MP -MF commands/efi/$(DEPDIR)/shim_lock_module-shim_lock.Tpo -c -o commands/efi/shim_lock_module-shim_lock.obj `if test -f 'commands/efi/shim_lock.c'; then $(CYGPATH_W) 'commands/efi/shim_lock.c'; else $(CYGPATH_W) '$(srcdir)/commands/efi/shim_lock.c'; fi` --@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) commands/efi/$(DEPDIR)/shim_lock_module-shim_lock.Tpo commands/efi/$(DEPDIR)/shim_lock_module-shim_lock.Po --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='commands/efi/shim_lock.c' object='commands/efi/shim_lock_module-shim_lock.obj' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shim_lock_module_CPPFLAGS) $(CPPFLAGS) $(shim_lock_module_CFLAGS) $(CFLAGS) -c -o commands/efi/shim_lock_module-shim_lock.obj `if test -f 'commands/efi/shim_lock.c'; then $(CYGPATH_W) 'commands/efi/shim_lock.c'; else $(CYGPATH_W) '$(srcdir)/commands/efi/shim_lock.c'; fi` -- - tests/signature_test_module-signature_test.o: tests/signature_test.c - @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(signature_test_module_CPPFLAGS) $(CPPFLAGS) $(signature_test_module_CFLAGS) $(CFLAGS) -MT tests/signature_test_module-signature_test.o -MD -MP -MF tests/$(DEPDIR)/signature_test_module-signature_test.Tpo -c -o tests/signature_test_module-signature_test.o `test -f 'tests/signature_test.c' || echo '$(srcdir)/'`tests/signature_test.c - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) tests/$(DEPDIR)/signature_test_module-signature_test.Tpo tests/$(DEPDIR)/signature_test_module-signature_test.Po -@@ -43738,10 +43683,6 @@ pgp.marker: $(pgp_module_SOURCES) $(nodist_pgp_module_SOURCES) - $(TARGET_CPP) -DGRUB_LST_GENERATOR $(CPPFLAGS_MARKER) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pgp_module_CPPFLAGS) $(CPPFLAGS) $^ > $@.new || (rm -f $@; exit 1) - grep 'MARKER' $@.new > $@; rm -f $@.new - --@COND_x86_64_efi_TRUE@shim_lock.marker: $(shim_lock_module_SOURCES) $(nodist_shim_lock_module_SOURCES) --@COND_x86_64_efi_TRUE@ $(TARGET_CPP) -DGRUB_LST_GENERATOR $(CPPFLAGS_MARKER) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shim_lock_module_CPPFLAGS) $(CPPFLAGS) $^ > $@.new || (rm -f $@; exit 1) --@COND_x86_64_efi_TRUE@ grep 'MARKER' $@.new > $@; rm -f $@.new -- - @COND_i386_pc_TRUE@hdparm.marker: $(hdparm_module_SOURCES) $(nodist_hdparm_module_SOURCES) - @COND_i386_pc_TRUE@ $(TARGET_CPP) -DGRUB_LST_GENERATOR $(CPPFLAGS_MARKER) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hdparm_module_CPPFLAGS) $(CPPFLAGS) $^ > $@.new || (rm -f $@; exit 1) - @COND_i386_pc_TRUE@ grep 'MARKER' $@.new > $@; rm -f $@.new -diff --git a/grub-core/commands/efi/shim_lock.c b/grub-core/commands/efi/shim_lock.c -deleted file mode 100644 -index d8f52d7..0000000 ---- a/grub-core/commands/efi/shim_lock.c -+++ /dev/null -@@ -1,130 +0,0 @@ --/* -- * GRUB -- GRand Unified Bootloader -- * Copyright (C) 2017 Free Software Foundation, Inc. -- * -- * GRUB 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 of the License, or -- * (at your option) any later version. -- * -- * GRUB 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 GRUB. If not, see . -- * -- * EFI shim lock verifier. -- */ -- --#include --#include --#include --#include --#include --#include -- --GRUB_MOD_LICENSE ("GPLv3+"); -- --static grub_efi_guid_t shim_lock_guid = GRUB_EFI_SHIM_LOCK_GUID; --static grub_efi_shim_lock_protocol_t *sl; -- --/* List of modules which cannot be loaded if UEFI secure boot mode is enabled. */ --static const char * const disabled_mods[] = {"iorw", "memrw", "wrmsr", NULL}; -- --static grub_err_t --shim_lock_init (grub_file_t io, enum grub_file_type type, -- void **context __attribute__ ((unused)), -- enum grub_verify_flags *flags) --{ -- const char *b, *e; -- int i; -- -- *flags = GRUB_VERIFY_FLAGS_SKIP_VERIFICATION; -- -- if (!sl) -- return GRUB_ERR_NONE; -- -- switch (type & GRUB_FILE_TYPE_MASK) -- { -- case GRUB_FILE_TYPE_GRUB_MODULE: -- /* Establish GRUB module name. */ -- b = grub_strrchr (io->name, '/'); -- e = grub_strrchr (io->name, '.'); -- -- b = b ? (b + 1) : io->name; -- e = e ? e : io->name + grub_strlen (io->name); -- e = (e > b) ? e : io->name + grub_strlen (io->name); -- -- for (i = 0; disabled_mods[i]; i++) -- if (!grub_strncmp (b, disabled_mods[i], grub_strlen (b) - grub_strlen (e))) -- { -- grub_error (GRUB_ERR_ACCESS_DENIED, -- N_("module cannot be loaded in UEFI secure boot mode: %s"), -- io->name); -- return GRUB_ERR_ACCESS_DENIED; -- } -- -- /* Fall through. */ -- -- case GRUB_FILE_TYPE_ACPI_TABLE: -- case GRUB_FILE_TYPE_DEVICE_TREE_IMAGE: -- *flags = GRUB_VERIFY_FLAGS_DEFER_AUTH; -- -- return GRUB_ERR_NONE; -- -- case GRUB_FILE_TYPE_LINUX_KERNEL: -- case GRUB_FILE_TYPE_MULTIBOOT_KERNEL: -- case GRUB_FILE_TYPE_BSD_KERNEL: -- case GRUB_FILE_TYPE_XNU_KERNEL: -- case GRUB_FILE_TYPE_PLAN9_KERNEL: -- for (i = 0; disabled_mods[i]; i++) -- if (grub_dl_get (disabled_mods[i])) -- { -- grub_error (GRUB_ERR_ACCESS_DENIED, -- N_("cannot boot due to dangerous module in memory: %s"), -- disabled_mods[i]); -- return GRUB_ERR_ACCESS_DENIED; -- } -- -- *flags = GRUB_VERIFY_FLAGS_SINGLE_CHUNK; -- -- /* Fall through. */ -- -- default: -- return GRUB_ERR_NONE; -- } --} -- --static grub_err_t --shim_lock_write (void *context __attribute__ ((unused)), void *buf, grub_size_t size) --{ -- if (sl->verify (buf, size) != GRUB_EFI_SUCCESS) -- return grub_error (GRUB_ERR_BAD_SIGNATURE, N_("bad shim signature")); -- -- return GRUB_ERR_NONE; --} -- --struct grub_file_verifier shim_lock = -- { -- .name = "shim_lock", -- .init = shim_lock_init, -- .write = shim_lock_write -- }; -- --GRUB_MOD_INIT(shim_lock) --{ -- sl = grub_efi_locate_protocol (&shim_lock_guid, 0); -- grub_verifier_register (&shim_lock); -- -- if (!sl) -- return; -- -- grub_dl_set_persistent (mod); --} -- --GRUB_MOD_FINI(shim_lock) --{ -- grub_verifier_unregister (&shim_lock); --} -diff --git a/grub-core/kern/efi/init.c b/grub-core/kern/efi/init.c -index 2c31847..b683bec 100644 ---- a/grub-core/kern/efi/init.c -+++ b/grub-core/kern/efi/init.c -@@ -20,6 +20,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -39,6 +40,9 @@ grub_efi_init (void) - /* Initialize the memory management system. */ - grub_efi_mm_init (); - -+ /* Register the shim_lock verifier if UEFI Secure Boot is enabled. */ -+ grub_shim_lock_verifier_setup (); -+ - efi_call_4 (grub_efi_system_table->boot_services->set_watchdog_timer, - 0, 0, 0, NULL); - -diff --git a/grub-core/kern/efi/sb.c b/grub-core/kern/efi/sb.c -index 19658d9..ce3b7f6 100644 ---- a/grub-core/kern/efi/sb.c -+++ b/grub-core/kern/efi/sb.c -@@ -22,9 +22,16 @@ - #include - #include - #include -+#include - #include - #include - #include -+#include -+ -+static grub_efi_guid_t shim_lock_guid = GRUB_EFI_SHIM_LOCK_GUID; -+ -+/* List of modules which cannot be loaded if UEFI secure boot mode is enabled. */ -+static const char * const disabled_mods[] = {"iorw", "memrw", NULL}; - - /* - * Determine whether we're in secure boot mode. -@@ -107,3 +114,101 @@ grub_efi_get_secureboot (void) - - return secureboot; - } -+ -+static grub_err_t -+shim_lock_verifier_init (grub_file_t io __attribute__ ((unused)), -+ enum grub_file_type type, -+ void **context __attribute__ ((unused)), -+ enum grub_verify_flags *flags) -+{ -+ const char *b, *e; -+ int i; -+ -+ *flags = GRUB_VERIFY_FLAGS_SKIP_VERIFICATION; -+ -+ switch (type & GRUB_FILE_TYPE_MASK) -+ { -+ case GRUB_FILE_TYPE_GRUB_MODULE: -+ /* Establish GRUB module name. */ -+ b = grub_strrchr (io->name, '/'); -+ e = grub_strrchr (io->name, '.'); -+ -+ b = b ? (b + 1) : io->name; -+ e = e ? e : io->name + grub_strlen (io->name); -+ e = (e > b) ? e : io->name + grub_strlen (io->name); -+ -+ for (i = 0; disabled_mods[i]; i++) -+ if (!grub_strncmp (b, disabled_mods[i], grub_strlen (b) - grub_strlen (e))) -+ { -+ grub_error (GRUB_ERR_ACCESS_DENIED, -+ N_("module cannot be loaded in UEFI secure boot mode: %s"), -+ io->name); -+ return GRUB_ERR_ACCESS_DENIED; -+ } -+ -+ /* Fall through. */ -+ -+ case GRUB_FILE_TYPE_ACPI_TABLE: -+ case GRUB_FILE_TYPE_DEVICE_TREE_IMAGE: -+ *flags = GRUB_VERIFY_FLAGS_DEFER_AUTH; -+ -+ return GRUB_ERR_NONE; -+ -+ case GRUB_FILE_TYPE_LINUX_KERNEL: -+ case GRUB_FILE_TYPE_MULTIBOOT_KERNEL: -+ case GRUB_FILE_TYPE_BSD_KERNEL: -+ case GRUB_FILE_TYPE_XNU_KERNEL: -+ case GRUB_FILE_TYPE_PLAN9_KERNEL: -+ for (i = 0; disabled_mods[i]; i++) -+ if (grub_dl_get (disabled_mods[i])) -+ { -+ grub_error (GRUB_ERR_ACCESS_DENIED, -+ N_("cannot boot due to dangerous module in memory: %s"), -+ disabled_mods[i]); -+ return GRUB_ERR_ACCESS_DENIED; -+ } -+ -+ *flags = GRUB_VERIFY_FLAGS_SINGLE_CHUNK; -+ -+ /* Fall through. */ -+ -+ default: -+ return GRUB_ERR_NONE; -+ } -+} -+ -+static grub_err_t -+shim_lock_verifier_write (void *context __attribute__ ((unused)), void *buf, grub_size_t size) -+{ -+ grub_efi_shim_lock_protocol_t *sl = grub_efi_locate_protocol (&shim_lock_guid, 0); -+ -+ if (!sl) -+ return grub_error (GRUB_ERR_ACCESS_DENIED, N_("shim_lock protocol not found")); -+ -+ if (sl->verify (buf, size) != GRUB_EFI_SUCCESS) -+ return grub_error (GRUB_ERR_BAD_SIGNATURE, N_("bad shim signature")); -+ -+ return GRUB_ERR_NONE; -+} -+ -+struct grub_file_verifier shim_lock_verifier = -+ { -+ .name = "shim_lock_verifier", -+ .init = shim_lock_verifier_init, -+ .write = shim_lock_verifier_write -+ }; -+ -+void -+grub_shim_lock_verifier_setup (void) -+{ -+ grub_efi_shim_lock_protocol_t *sl = -+ grub_efi_locate_protocol (&shim_lock_guid, 0); -+ -+ if (!sl) -+ return; -+ -+ if (grub_efi_get_secureboot () != GRUB_EFI_SECUREBOOT_MODE_ENABLED) -+ return; -+ -+ grub_verifier_register (&shim_lock_verifier); -+} -diff --git a/include/grub/efi/sb.h b/include/grub/efi/sb.h -index a33d985..30c4335 100644 ---- a/include/grub/efi/sb.h -+++ b/include/grub/efi/sb.h -@@ -30,6 +30,9 @@ - #ifdef GRUB_MACHINE_EFI - extern grub_uint8_t - EXPORT_FUNC (grub_efi_get_secureboot) (void); -+ -+extern void -+grub_shim_lock_verifier_setup (void); - #else - static inline grub_uint8_t - grub_efi_get_secureboot (void) -diff --git a/po/POTFILES.in b/po/POTFILES.in -index 11c799f..49755d3 100644 ---- a/po/POTFILES.in -+++ b/po/POTFILES.in -@@ -39,7 +39,6 @@ - ./grub-core/commands/efi/lsefimmap.c - ./grub-core/commands/efi/lsefisystab.c - ./grub-core/commands/efi/lssal.c --./grub-core/commands/efi/shim_lock.c - ./grub-core/commands/efi/tpm.c - ./grub-core/commands/eval.c - ./grub-core/commands/extcmd.c --- -2.14.2 - diff --git a/boot/grub2/0035-kern-Add-lockdown-support.patch b/boot/grub2/0035-kern-Add-lockdown-support.patch deleted file mode 100644 index 268b6527859..00000000000 --- a/boot/grub2/0035-kern-Add-lockdown-support.patch +++ /dev/null @@ -1,763 +0,0 @@ -From 578c95298bcc46e0296f4c786db64c2ff26ce2cc Mon Sep 17 00:00:00 2001 -From: Javier Martinez Canillas -Date: Mon, 28 Sep 2020 20:08:02 +0200 -Subject: [PATCH] kern: Add lockdown support - -When the GRUB starts on a secure boot platform, some commands can be -used to subvert the protections provided by the verification mechanism and -could lead to booting untrusted system. - -To prevent that situation, allow GRUB to be locked down. That way the code -may check if GRUB has been locked down and further restrict the commands -that are registered or what subset of their functionality could be used. - -The lockdown support adds the following components: - -* The grub_lockdown() function which can be used to lockdown GRUB if, - e.g., UEFI Secure Boot is enabled. - -* The grub_is_lockdown() function which can be used to check if the GRUB - was locked down. - -* A verifier that flags OS kernels, the GRUB modules, Device Trees and ACPI - tables as GRUB_VERIFY_FLAGS_DEFER_AUTH to defer verification to other - verifiers. These files are only successfully verified if another registered - verifier returns success. Otherwise, the whole verification process fails. - - For example, PE/COFF binaries verification can be done by the shim_lock - verifier which validates the signatures using the shim_lock protocol. - However, the verification is not deferred directly to the shim_lock verifier. - The shim_lock verifier is hooked into the verification process instead. - -* A set of grub_{command,extcmd}_lockdown functions that can be used by - code registering command handlers, to only register unsafe commands if - the GRUB has not been locked down. - -Signed-off-by: Javier Martinez Canillas -Reviewed-by: Daniel Kiper -[Add changes to generated files] -Signed-off-by: Stefan Sørensen ---- - Makefile.in | 2 ++ - conf/Makefile.common | 2 ++ - docs/grub-dev.texi | 27 +++++++++++++++ - docs/grub.texi | 8 +++++ - grub-core/Makefile.am | 5 ++- - grub-core/Makefile.core.am | 14 ++++---- - grub-core/Makefile.core.def | 1 + - grub-core/Makefile.in | 73 ++++++++++++++++++++++++++++++----------- - grub-core/commands/extcmd.c | 23 +++++++++++++ - grub-core/kern/command.c | 24 ++++++++++++++ - grub-core/kern/lockdown.c | 80 +++++++++++++++++++++++++++++++++++++++++++++ - include/grub/command.h | 5 +++ - include/grub/extcmd.h | 7 ++++ - include/grub/lockdown.h | 44 +++++++++++++++++++++++++ - po/POTFILES.in | 2 ++ - 15 files changed, 290 insertions(+), 27 deletions(-) - create mode 100644 grub-core/kern/lockdown.c - create mode 100644 include/grub/lockdown.h - -diff --git a/Makefile.in b/Makefile.in -index e6a185b..ecb3278 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -2617,7 +2617,9 @@ CPPFLAGS_PARTTOOL_LIST = -Dgrub_parttool_register=PARTTOOL_LIST_MARKER - CPPFLAGS_TERMINAL_LIST = '-Dgrub_term_register_input(...)=INPUT_TERMINAL_LIST_MARKER(__VA_ARGS__)' \ - '-Dgrub_term_register_output(...)=OUTPUT_TERMINAL_LIST_MARKER(__VA_ARGS__)' - CPPFLAGS_COMMAND_LIST = '-Dgrub_register_command(...)=COMMAND_LIST_MARKER(__VA_ARGS__)' \ -+ '-Dgrub_register_command_lockdown(...)=COMMAND_LOCKDOWN_LIST_MARKER(__VA_ARGS__)' \ - '-Dgrub_register_extcmd(...)=EXTCOMMAND_LIST_MARKER(__VA_ARGS__)' \ -+ '-Dgrub_register_extcmd_lockdown(...)=EXTCOMMAND_LOCKDOWN_LIST_MARKER(__VA_ARGS__)' \ - '-Dgrub_register_command_p1(...)=P1COMMAND_LIST_MARKER(__VA_ARGS__)' - CPPFLAGS_FDT_LIST := '-Dgrub_fdtbus_register(...)=FDT_DRIVER_LIST_MARKER(__VA_ARGS__)' - CPPFLAGS_MARKER = $(CPPFLAGS_FS_LIST) $(CPPFLAGS_VIDEO_LIST) \ -diff --git a/conf/Makefile.common b/conf/Makefile.common -index 6cd71cb..2a1a886 100644 ---- a/conf/Makefile.common -+++ b/conf/Makefile.common -@@ -84,7 +84,9 @@ CPPFLAGS_PARTTOOL_LIST = -Dgrub_parttool_register=PARTTOOL_LIST_MARKER - CPPFLAGS_TERMINAL_LIST = '-Dgrub_term_register_input(...)=INPUT_TERMINAL_LIST_MARKER(__VA_ARGS__)' - CPPFLAGS_TERMINAL_LIST += '-Dgrub_term_register_output(...)=OUTPUT_TERMINAL_LIST_MARKER(__VA_ARGS__)' - CPPFLAGS_COMMAND_LIST = '-Dgrub_register_command(...)=COMMAND_LIST_MARKER(__VA_ARGS__)' -+CPPFLAGS_COMMAND_LIST += '-Dgrub_register_command_lockdown(...)=COMMAND_LOCKDOWN_LIST_MARKER(__VA_ARGS__)' - CPPFLAGS_COMMAND_LIST += '-Dgrub_register_extcmd(...)=EXTCOMMAND_LIST_MARKER(__VA_ARGS__)' -+CPPFLAGS_COMMAND_LIST += '-Dgrub_register_extcmd_lockdown(...)=EXTCOMMAND_LOCKDOWN_LIST_MARKER(__VA_ARGS__)' - CPPFLAGS_COMMAND_LIST += '-Dgrub_register_command_p1(...)=P1COMMAND_LIST_MARKER(__VA_ARGS__)' - CPPFLAGS_FDT_LIST := '-Dgrub_fdtbus_register(...)=FDT_DRIVER_LIST_MARKER(__VA_ARGS__)' - CPPFLAGS_MARKER = $(CPPFLAGS_FS_LIST) $(CPPFLAGS_VIDEO_LIST) \ -diff --git a/docs/grub-dev.texi b/docs/grub-dev.texi -index ee389fd..635ec72 100644 ---- a/docs/grub-dev.texi -+++ b/docs/grub-dev.texi -@@ -86,6 +86,7 @@ This edition documents version @value{VERSION}. - * PFF2 Font File Format:: - * Graphical Menu Software Design:: - * Verifiers framework:: -+* Lockdown framework:: - * Copying This Manual:: Copying This Manual - * Index:: - @end menu -@@ -2086,6 +2087,32 @@ Optionally at the end of the file @samp{fini}, if it exists, is called with just - the context. If you return no error during any of @samp{init}, @samp{write} and - @samp{fini} then the file is considered as having succeded verification. - -+@node Lockdown framework -+@chapter Lockdown framework -+ -+The GRUB can be locked down, which is a restricted mode where some operations -+are not allowed. For instance, some commands cannot be used when the GRUB is -+locked down. -+ -+The function -+@code{grub_lockdown()} is used to lockdown GRUB and the function -+@code{grub_is_lockdown()} function can be used to check whether lockdown is -+enabled or not. When enabled, the function returns @samp{GRUB_LOCKDOWN_ENABLED} -+and @samp{GRUB_LOCKDOWN_DISABLED} when is not enabled. -+ -+The following functions can be used to register the commands that can only be -+used when lockdown is disabled: -+ -+@itemize -+ -+@item @code{grub_cmd_lockdown()} registers command which should not run when the -+GRUB is in lockdown mode. -+ -+@item @code{grub_cmd_lockdown()} registers extended command which should not run -+when the GRUB is in lockdown mode. -+ -+@end itemize -+ - @node Copying This Manual - @appendix Copying This Manual - -diff --git a/docs/grub.texi b/docs/grub.texi -index aefe032..a25459f 100644 ---- a/docs/grub.texi -+++ b/docs/grub.texi -@@ -5581,6 +5581,7 @@ environment variables and commands are listed in the same order. - * Using digital signatures:: Booting digitally signed code - * UEFI secure boot and shim:: Booting digitally signed PE files - * Measured Boot:: Measuring boot components -+* Lockdown:: Lockdown when booting on a secure setup - @end menu - - @node Authentication and authorisation -@@ -5795,6 +5796,13 @@ into @file{core.img} in order to avoid a potential gap in measurement between - - Measured boot is currently only supported on EFI platforms. - -+@node Lockdown -+@section Lockdown when booting on a secure setup -+ -+The GRUB can be locked down when booted on a secure boot environment, for example -+if the UEFI secure boot is enabled. On a locked down configuration, the GRUB will -+be restricted and some operations/commands cannot be executed. -+ - @node Platform limitations - @chapter Platform limitations - -diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am -index cc6fc7d..30e23ad 100644 ---- a/grub-core/Makefile.am -+++ b/grub-core/Makefile.am -@@ -80,6 +80,7 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/fs.h - KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i18n.h - KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/kernel.h - KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/list.h -+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/lockdown.h - KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/misc.h - if COND_emu - KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/compiler-rt-emu.h -@@ -377,8 +378,10 @@ command.lst: $(MARKER_FILES) - b=`basename $$pp .marker`; \ - sed -n \ - -e "/EXTCOMMAND_LIST_MARKER *( *\"/{s/.*( *\"\([^\"]*\)\".*/*\1: $$b/;p;}" \ -+ -e "/EXTCOMMAND_LOCKDOWN_LIST_MARKER *( *\"/{s/.*( *\"\([^\"]*\)\".*/*\1: $$b/;p;}" \ - -e "/P1COMMAND_LIST_MARKER *( *\"/{s/.*( *\"\([^\"]*\)\".*/*\1: $$b/;p;}" \ -- -e "/COMMAND_LIST_MARKER *( *\"/{s/.*( *\"\([^\"]*\)\".*/\1: $$b/;p;}" $$pp; \ -+ -e "/COMMAND_LIST_MARKER *( *\"/{s/.*( *\"\([^\"]*\)\".*/\1: $$b/;p;}" \ -+ -e "/COMMAND_LOCKDOWN_LIST_MARKER *( *\"/{s/.*( *\"\([^\"]*\)\".*/\1: $$b/;p;}" $$pp; \ - done) | sort -u > $@ - platform_DATA += command.lst - CLEANFILES += command.lst -diff --git a/grub-core/Makefile.core.am b/grub-core/Makefile.core.am -index 5623a5e..fbfb627 100644 ---- a/grub-core/Makefile.core.am -+++ b/grub-core/Makefile.core.am -@@ -22378,7 +22378,7 @@ endif - if COND_i386_efi - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/i386/efi/startup.S --kernel_exec_SOURCES += kern/i386/efi/tsc.c kern/i386/tsc_pmtimer.c kern/i386/efi/init.c bus/pci.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += kern/i386/efi/tsc.c kern/i386/tsc_pmtimer.c kern/i386/efi/init.c bus/pci.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/lockdown.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22488,7 +22488,7 @@ endif - if COND_x86_64_efi - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/x86_64/efi/startup.S --kernel_exec_SOURCES += kern/i386/efi/tsc.c kern/i386/tsc_pmtimer.c kern/x86_64/efi/callwrap.S kern/i386/efi/init.c bus/pci.c kern/x86_64/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += kern/i386/efi/tsc.c kern/i386/tsc_pmtimer.c kern/x86_64/efi/callwrap.S kern/i386/efi/init.c bus/pci.c kern/x86_64/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/lockdown.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22664,7 +22664,7 @@ endif - if COND_ia64_efi - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = --kernel_exec_SOURCES += kern/ia64/efi/startup.S kern/ia64/efi/init.c kern/ia64/dl.c kern/ia64/dl_helper.c kern/ia64/cache.c lib/division.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += kern/ia64/efi/startup.S kern/ia64/efi/init.c kern/ia64/dl.c kern/ia64/dl_helper.c kern/ia64/cache.c lib/division.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/lockdown.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -fno-builtin -fpic -minline-int-divide-max-throughput -@@ -22730,7 +22730,7 @@ endif - if COND_arm_efi - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/arm/efi/startup.S --kernel_exec_SOURCES += kern/arm/efi/init.c kern/efi/fdt.c kern/arm/dl.c kern/arm/dl_helper.c kern/arm/cache_armv6.S kern/arm/cache_armv7.S kern/arm/cache.c kern/arm/compiler-rt.S lib/division.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += kern/arm/efi/init.c kern/efi/fdt.c kern/arm/dl.c kern/arm/dl_helper.c kern/arm/cache_armv6.S kern/arm/cache_armv7.S kern/arm/cache.c kern/arm/compiler-rt.S lib/division.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/lockdown.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22752,7 +22752,7 @@ endif - if COND_arm64_efi - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/arm64/efi/startup.S --kernel_exec_SOURCES += kern/arm64/efi/init.c kern/efi/fdt.c kern/arm64/cache.c kern/arm64/cache_flush.S kern/arm64/dl.c kern/arm64/dl_helper.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += kern/arm64/efi/init.c kern/efi/fdt.c kern/arm64/cache.c kern/arm64/cache_flush.S kern/arm64/dl.c kern/arm64/dl_helper.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/lockdown.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22796,7 +22796,7 @@ endif - if COND_riscv32_efi - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/riscv/efi/startup.S --kernel_exec_SOURCES += kern/riscv/efi/init.c kern/efi/fdt.c kern/riscv/cache.c kern/riscv/cache_flush.S kern/riscv/dl.c lib/division.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += kern/riscv/efi/init.c kern/efi/fdt.c kern/riscv/cache.c kern/riscv/cache_flush.S kern/riscv/dl.c lib/division.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/lockdown.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22818,7 +22818,7 @@ endif - if COND_riscv64_efi - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/riscv/efi/startup.S --kernel_exec_SOURCES += kern/riscv/efi/init.c kern/efi/fdt.c kern/riscv/cache.c kern/riscv/cache_flush.S kern/riscv/dl.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += kern/riscv/efi/init.c kern/efi/fdt.c kern/riscv/cache.c kern/riscv/cache_flush.S kern/riscv/dl.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/lockdown.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index 4d380ed..ee8dc55 100644 ---- a/grub-core/Makefile.core.def -+++ b/grub-core/Makefile.core.def -@@ -205,6 +205,7 @@ kernel = { - efi = kern/acpi.c; - efi = kern/efi/acpi.c; - efi = kern/efi/sb.c; -+ efi = kern/lockdown.c; - i386_coreboot = kern/i386/pc/acpi.c; - i386_multiboot = kern/i386/pc/acpi.c; - i386_coreboot = kern/acpi.c; -diff --git a/grub-core/Makefile.in b/grub-core/Makefile.in -index 09dc802..ac400ea 100644 ---- a/grub-core/Makefile.in -+++ b/grub-core/Makefile.in -@@ -10457,13 +10457,14 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - kern/arm64/cache_flush.S kern/arm64/dl.c \ - kern/arm64/dl_helper.c disk/efi/efidisk.c kern/efi/efi.c \ - kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c \ -- kern/efi/acpi.c kern/efi/sb.c kern/compiler-rt.c kern/mm.c \ -- kern/time.c kern/generic/millisleep.c kern/command.c \ -- kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c \ -- kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c \ -- kern/misc.c kern/parser.c kern/partition.c \ -- kern/rescue_parser.c kern/rescue_reader.c kern/term.c \ -- kern/verifiers.c kern/arm/startup.S kern/arm/coreboot/init.c \ -+ kern/efi/acpi.c kern/efi/sb.c kern/lockdown.c \ -+ kern/compiler-rt.c kern/mm.c kern/time.c \ -+ kern/generic/millisleep.c kern/command.c kern/corecmd.c \ -+ kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c \ -+ kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c \ -+ kern/parser.c kern/partition.c kern/rescue_parser.c \ -+ kern/rescue_reader.c kern/term.c kern/verifiers.c \ -+ kern/arm/startup.S kern/arm/coreboot/init.c \ - kern/arm/coreboot/timer.c kern/arm/coreboot/coreboot.S \ - lib/fdt.c bus/fdt.c term/ps2.c term/arm/pl050.c \ - term/arm/cros.c term/arm/cros_ec.c bus/spi/rk3288_spi.c \ -@@ -10572,6 +10573,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/kernel_exec-acpi.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/efi/kernel_exec-acpi.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/efi/kernel_exec-sb.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/kernel_exec-lockdown.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/kernel_exec-compiler-rt.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ -@@ -10646,6 +10648,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/kernel_exec-acpi.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/efi/kernel_exec-acpi.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/efi/kernel_exec-sb.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/kernel_exec-lockdown.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/kernel_exec-compiler-rt.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ -@@ -10683,6 +10686,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/kernel_exec-acpi.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/efi/kernel_exec-acpi.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/efi/kernel_exec-sb.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/kernel_exec-lockdown.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/kernel_exec-compiler-rt.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ -@@ -10884,6 +10888,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/kernel_exec-acpi.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/efi/kernel_exec-acpi.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/efi/kernel_exec-sb.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/kernel_exec-lockdown.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/kernel_exec-compiler-rt.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ -@@ -11120,6 +11125,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/kernel_exec-acpi.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/efi/kernel_exec-acpi.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/efi/kernel_exec-sb.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/kernel_exec-lockdown.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/kernel_exec-compiler-rt.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ -@@ -11287,6 +11293,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/kernel_exec-acpi.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/efi/kernel_exec-acpi.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/efi/kernel_exec-sb.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/kernel_exec-lockdown.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/kernel_exec-compiler-rt.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ -@@ -11379,6 +11386,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_TRUE@ kern/kernel_exec-acpi.$(OBJEXT) \ - @COND_arm64_efi_TRUE@ kern/efi/kernel_exec-acpi.$(OBJEXT) \ - @COND_arm64_efi_TRUE@ kern/efi/kernel_exec-sb.$(OBJEXT) \ -+@COND_arm64_efi_TRUE@ kern/kernel_exec-lockdown.$(OBJEXT) \ - @COND_arm64_efi_TRUE@ kern/kernel_exec-compiler-rt.$(OBJEXT) \ - @COND_arm64_efi_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ -@@ -15379,7 +15387,9 @@ CPPFLAGS_PARTTOOL_LIST = -Dgrub_parttool_register=PARTTOOL_LIST_MARKER - CPPFLAGS_TERMINAL_LIST = '-Dgrub_term_register_input(...)=INPUT_TERMINAL_LIST_MARKER(__VA_ARGS__)' \ - '-Dgrub_term_register_output(...)=OUTPUT_TERMINAL_LIST_MARKER(__VA_ARGS__)' - CPPFLAGS_COMMAND_LIST = '-Dgrub_register_command(...)=COMMAND_LIST_MARKER(__VA_ARGS__)' \ -+ '-Dgrub_register_command_lockdown(...)=COMMAND_LOCKDOWN_LIST_MARKER(__VA_ARGS__)' \ - '-Dgrub_register_extcmd(...)=EXTCOMMAND_LIST_MARKER(__VA_ARGS__)' \ -+ '-Dgrub_register_extcmd_lockdown(...)=EXTCOMMAND_LOCKDOWN_LIST_MARKER(__VA_ARGS__)' \ - '-Dgrub_register_command_p1(...)=P1COMMAND_LIST_MARKER(__VA_ARGS__)' - CPPFLAGS_FDT_LIST := '-Dgrub_fdtbus_register(...)=FDT_DRIVER_LIST_MARKER(__VA_ARGS__)' - CPPFLAGS_MARKER = $(CPPFLAGS_FS_LIST) $(CPPFLAGS_VIDEO_LIST) \ -@@ -16387,6 +16397,7 @@ KERNEL_HEADER_FILES = $(top_srcdir)/include/grub/cache.h \ - $(top_srcdir)/include/grub/i18n.h \ - $(top_srcdir)/include/grub/kernel.h \ - $(top_srcdir)/include/grub/list.h \ -+ $(top_srcdir)/include/grub/lockdown.h \ - $(top_srcdir)/include/grub/misc.h $(am__append_5794) \ - $(am__append_5795) $(top_srcdir)/include/grub/mm.h \ - $(top_srcdir)/include/grub/parser.h \ -@@ -25594,7 +25605,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_arm64_efi_TRUE@ kern/efi/efi.c kern/efi/init.c \ - @COND_arm64_efi_TRUE@ kern/efi/mm.c term/efi/console.c \ - @COND_arm64_efi_TRUE@ kern/acpi.c kern/efi/acpi.c kern/efi/sb.c \ --@COND_arm64_efi_TRUE@ kern/compiler-rt.c kern/mm.c kern/time.c \ -+@COND_arm64_efi_TRUE@ kern/lockdown.c kern/compiler-rt.c \ -+@COND_arm64_efi_TRUE@ kern/mm.c kern/time.c \ - @COND_arm64_efi_TRUE@ kern/generic/millisleep.c kern/command.c \ - @COND_arm64_efi_TRUE@ kern/corecmd.c kern/device.c kern/disk.c \ - @COND_arm64_efi_TRUE@ kern/dl.c kern/env.c kern/err.c \ -@@ -25645,7 +25657,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_arm_efi_TRUE@ kern/efi/init.c kern/efi/mm.c \ - @COND_arm_efi_TRUE@ term/efi/console.c kern/acpi.c \ - @COND_arm_efi_TRUE@ kern/efi/acpi.c kern/efi/sb.c \ --@COND_arm_efi_TRUE@ kern/compiler-rt.c kern/mm.c kern/time.c \ -+@COND_arm_efi_TRUE@ kern/lockdown.c kern/compiler-rt.c \ -+@COND_arm_efi_TRUE@ kern/mm.c kern/time.c \ - @COND_arm_efi_TRUE@ kern/generic/millisleep.c kern/command.c \ - @COND_arm_efi_TRUE@ kern/corecmd.c kern/device.c kern/disk.c \ - @COND_arm_efi_TRUE@ kern/dl.c kern/env.c kern/err.c kern/file.c \ -@@ -25725,7 +25738,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_i386_efi_TRUE@ kern/efi/efi.c kern/efi/init.c \ - @COND_i386_efi_TRUE@ kern/efi/mm.c term/efi/console.c \ - @COND_i386_efi_TRUE@ kern/acpi.c kern/efi/acpi.c kern/efi/sb.c \ --@COND_i386_efi_TRUE@ kern/compiler-rt.c kern/mm.c kern/time.c \ -+@COND_i386_efi_TRUE@ kern/lockdown.c kern/compiler-rt.c \ -+@COND_i386_efi_TRUE@ kern/mm.c kern/time.c \ - @COND_i386_efi_TRUE@ kern/generic/millisleep.c kern/command.c \ - @COND_i386_efi_TRUE@ kern/corecmd.c kern/device.c kern/disk.c \ - @COND_i386_efi_TRUE@ kern/dl.c kern/env.c kern/err.c \ -@@ -25843,7 +25857,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_ia64_efi_TRUE@ kern/efi/efi.c kern/efi/init.c \ - @COND_ia64_efi_TRUE@ kern/efi/mm.c term/efi/console.c \ - @COND_ia64_efi_TRUE@ kern/acpi.c kern/efi/acpi.c kern/efi/sb.c \ --@COND_ia64_efi_TRUE@ kern/compiler-rt.c kern/mm.c kern/time.c \ -+@COND_ia64_efi_TRUE@ kern/lockdown.c kern/compiler-rt.c \ -+@COND_ia64_efi_TRUE@ kern/mm.c kern/time.c \ - @COND_ia64_efi_TRUE@ kern/generic/millisleep.c kern/command.c \ - @COND_ia64_efi_TRUE@ kern/corecmd.c kern/device.c kern/disk.c \ - @COND_ia64_efi_TRUE@ kern/dl.c kern/env.c kern/err.c \ -@@ -25956,8 +25971,9 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_riscv32_efi_TRUE@ kern/efi/init.c kern/efi/mm.c \ - @COND_riscv32_efi_TRUE@ term/efi/console.c kern/acpi.c \ - @COND_riscv32_efi_TRUE@ kern/efi/acpi.c kern/efi/sb.c \ --@COND_riscv32_efi_TRUE@ kern/compiler-rt.c kern/mm.c \ --@COND_riscv32_efi_TRUE@ kern/time.c kern/generic/millisleep.c \ -+@COND_riscv32_efi_TRUE@ kern/lockdown.c kern/compiler-rt.c \ -+@COND_riscv32_efi_TRUE@ kern/mm.c kern/time.c \ -+@COND_riscv32_efi_TRUE@ kern/generic/millisleep.c \ - @COND_riscv32_efi_TRUE@ kern/command.c kern/corecmd.c \ - @COND_riscv32_efi_TRUE@ kern/device.c kern/disk.c kern/dl.c \ - @COND_riscv32_efi_TRUE@ kern/env.c kern/err.c kern/file.c \ -@@ -25974,9 +25990,9 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_riscv64_efi_TRUE@ kern/efi/efi.c kern/efi/init.c \ - @COND_riscv64_efi_TRUE@ kern/efi/mm.c term/efi/console.c \ - @COND_riscv64_efi_TRUE@ kern/acpi.c kern/efi/acpi.c \ --@COND_riscv64_efi_TRUE@ kern/efi/sb.c kern/compiler-rt.c \ --@COND_riscv64_efi_TRUE@ kern/mm.c kern/time.c \ --@COND_riscv64_efi_TRUE@ kern/generic/millisleep.c \ -+@COND_riscv64_efi_TRUE@ kern/efi/sb.c kern/lockdown.c \ -+@COND_riscv64_efi_TRUE@ kern/compiler-rt.c kern/mm.c \ -+@COND_riscv64_efi_TRUE@ kern/time.c kern/generic/millisleep.c \ - @COND_riscv64_efi_TRUE@ kern/command.c kern/corecmd.c \ - @COND_riscv64_efi_TRUE@ kern/device.c kern/disk.c kern/dl.c \ - @COND_riscv64_efi_TRUE@ kern/env.c kern/err.c kern/file.c \ -@@ -26022,8 +26038,8 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_x86_64_efi_TRUE@ kern/efi/efi.c kern/efi/init.c \ - @COND_x86_64_efi_TRUE@ kern/efi/mm.c term/efi/console.c \ - @COND_x86_64_efi_TRUE@ kern/acpi.c kern/efi/acpi.c \ --@COND_x86_64_efi_TRUE@ kern/efi/sb.c kern/compiler-rt.c \ --@COND_x86_64_efi_TRUE@ kern/mm.c kern/time.c \ -+@COND_x86_64_efi_TRUE@ kern/efi/sb.c kern/lockdown.c \ -+@COND_x86_64_efi_TRUE@ kern/compiler-rt.c kern/mm.c kern/time.c \ - @COND_x86_64_efi_TRUE@ kern/generic/millisleep.c kern/command.c \ - @COND_x86_64_efi_TRUE@ kern/corecmd.c kern/device.c kern/disk.c \ - @COND_x86_64_efi_TRUE@ kern/dl.c kern/env.c kern/err.c \ -@@ -27994,6 +28010,8 @@ kern/efi/kernel_exec-acpi.$(OBJEXT): kern/efi/$(am__dirstamp) \ - kern/efi/$(DEPDIR)/$(am__dirstamp) - kern/efi/kernel_exec-sb.$(OBJEXT): kern/efi/$(am__dirstamp) \ - kern/efi/$(DEPDIR)/$(am__dirstamp) -+kern/kernel_exec-lockdown.$(OBJEXT): kern/$(am__dirstamp) \ -+ kern/$(DEPDIR)/$(am__dirstamp) - kern/kernel_exec-compiler-rt.$(OBJEXT): kern/$(am__dirstamp) \ - kern/$(DEPDIR)/$(am__dirstamp) - kern/kernel_exec-mm.$(OBJEXT): kern/$(am__dirstamp) \ -@@ -30945,6 +30963,7 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@kern/$(DEPDIR)/kernel_exec-file.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@kern/$(DEPDIR)/kernel_exec-fs.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@kern/$(DEPDIR)/kernel_exec-list.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@kern/$(DEPDIR)/kernel_exec-lockdown.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@kern/$(DEPDIR)/kernel_exec-main.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@kern/$(DEPDIR)/kernel_exec-misc.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@kern/$(DEPDIR)/kernel_exec-mm.Po@am__quote@ -@@ -35293,6 +35312,20 @@ kern/efi/kernel_exec-sb.obj: kern/efi/sb.c - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kernel_exec_CPPFLAGS) $(CPPFLAGS) $(kernel_exec_CFLAGS) $(CFLAGS) -c -o kern/efi/kernel_exec-sb.obj `if test -f 'kern/efi/sb.c'; then $(CYGPATH_W) 'kern/efi/sb.c'; else $(CYGPATH_W) '$(srcdir)/kern/efi/sb.c'; fi` - -+kern/kernel_exec-lockdown.o: kern/lockdown.c -+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kernel_exec_CPPFLAGS) $(CPPFLAGS) $(kernel_exec_CFLAGS) $(CFLAGS) -MT kern/kernel_exec-lockdown.o -MD -MP -MF kern/$(DEPDIR)/kernel_exec-lockdown.Tpo -c -o kern/kernel_exec-lockdown.o `test -f 'kern/lockdown.c' || echo '$(srcdir)/'`kern/lockdown.c -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) kern/$(DEPDIR)/kernel_exec-lockdown.Tpo kern/$(DEPDIR)/kernel_exec-lockdown.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='kern/lockdown.c' object='kern/kernel_exec-lockdown.o' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kernel_exec_CPPFLAGS) $(CPPFLAGS) $(kernel_exec_CFLAGS) $(CFLAGS) -c -o kern/kernel_exec-lockdown.o `test -f 'kern/lockdown.c' || echo '$(srcdir)/'`kern/lockdown.c -+ -+kern/kernel_exec-lockdown.obj: kern/lockdown.c -+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kernel_exec_CPPFLAGS) $(CPPFLAGS) $(kernel_exec_CFLAGS) $(CFLAGS) -MT kern/kernel_exec-lockdown.obj -MD -MP -MF kern/$(DEPDIR)/kernel_exec-lockdown.Tpo -c -o kern/kernel_exec-lockdown.obj `if test -f 'kern/lockdown.c'; then $(CYGPATH_W) 'kern/lockdown.c'; else $(CYGPATH_W) '$(srcdir)/kern/lockdown.c'; fi` -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) kern/$(DEPDIR)/kernel_exec-lockdown.Tpo kern/$(DEPDIR)/kernel_exec-lockdown.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='kern/lockdown.c' object='kern/kernel_exec-lockdown.obj' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kernel_exec_CPPFLAGS) $(CPPFLAGS) $(kernel_exec_CFLAGS) $(CFLAGS) -c -o kern/kernel_exec-lockdown.obj `if test -f 'kern/lockdown.c'; then $(CYGPATH_W) 'kern/lockdown.c'; else $(CYGPATH_W) '$(srcdir)/kern/lockdown.c'; fi` -+ - kern/kernel_exec-compiler-rt.o: kern/compiler-rt.c - @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kernel_exec_CPPFLAGS) $(CPPFLAGS) $(kernel_exec_CFLAGS) $(CFLAGS) -MT kern/kernel_exec-compiler-rt.o -MD -MP -MF kern/$(DEPDIR)/kernel_exec-compiler-rt.Tpo -c -o kern/kernel_exec-compiler-rt.o `test -f 'kern/compiler-rt.c' || echo '$(srcdir)/'`kern/compiler-rt.c - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) kern/$(DEPDIR)/kernel_exec-compiler-rt.Tpo kern/$(DEPDIR)/kernel_exec-compiler-rt.Po -@@ -46650,8 +46683,10 @@ command.lst: $(MARKER_FILES) - b=`basename $$pp .marker`; \ - sed -n \ - -e "/EXTCOMMAND_LIST_MARKER *( *\"/{s/.*( *\"\([^\"]*\)\".*/*\1: $$b/;p;}" \ -+ -e "/EXTCOMMAND_LOCKDOWN_LIST_MARKER *( *\"/{s/.*( *\"\([^\"]*\)\".*/*\1: $$b/;p;}" \ - -e "/P1COMMAND_LIST_MARKER *( *\"/{s/.*( *\"\([^\"]*\)\".*/*\1: $$b/;p;}" \ -- -e "/COMMAND_LIST_MARKER *( *\"/{s/.*( *\"\([^\"]*\)\".*/\1: $$b/;p;}" $$pp; \ -+ -e "/COMMAND_LIST_MARKER *( *\"/{s/.*( *\"\([^\"]*\)\".*/\1: $$b/;p;}" \ -+ -e "/COMMAND_LOCKDOWN_LIST_MARKER *( *\"/{s/.*( *\"\([^\"]*\)\".*/\1: $$b/;p;}" $$pp; \ - done) | sort -u > $@ - - partmap.lst: $(MARKER_FILES) -diff --git a/grub-core/commands/extcmd.c b/grub-core/commands/extcmd.c -index 69574e2..90a5ca2 100644 ---- a/grub-core/commands/extcmd.c -+++ b/grub-core/commands/extcmd.c -@@ -19,6 +19,7 @@ - - #include - #include -+#include - #include - #include - #include -@@ -110,6 +111,28 @@ grub_register_extcmd (const char *name, grub_extcmd_func_t func, - summary, description, parser, 1); - } - -+static grub_err_t -+grub_extcmd_lockdown (grub_extcmd_context_t ctxt __attribute__ ((unused)), -+ int argc __attribute__ ((unused)), -+ char **argv __attribute__ ((unused))) -+{ -+ return grub_error (GRUB_ERR_ACCESS_DENIED, -+ N_("%s: the command is not allowed when lockdown is enforced"), -+ ctxt->extcmd->cmd->name); -+} -+ -+grub_extcmd_t -+grub_register_extcmd_lockdown (const char *name, grub_extcmd_func_t func, -+ grub_command_flags_t flags, const char *summary, -+ const char *description, -+ const struct grub_arg_option *parser) -+{ -+ if (grub_is_lockdown () == GRUB_LOCKDOWN_ENABLED) -+ func = grub_extcmd_lockdown; -+ -+ return grub_register_extcmd (name, func, flags, summary, description, parser); -+} -+ - void - grub_unregister_extcmd (grub_extcmd_t ext) - { -diff --git a/grub-core/kern/command.c b/grub-core/kern/command.c -index acd7218..4aabcd4 100644 ---- a/grub-core/kern/command.c -+++ b/grub-core/kern/command.c -@@ -17,6 +17,7 @@ - * along with GRUB. If not, see . - */ - -+#include - #include - #include - -@@ -77,6 +78,29 @@ grub_register_command_prio (const char *name, - return cmd; - } - -+static grub_err_t -+grub_cmd_lockdown (grub_command_t cmd __attribute__ ((unused)), -+ int argc __attribute__ ((unused)), -+ char **argv __attribute__ ((unused))) -+ -+{ -+ return grub_error (GRUB_ERR_ACCESS_DENIED, -+ N_("%s: the command is not allowed when lockdown is enforced"), -+ cmd->name); -+} -+ -+grub_command_t -+grub_register_command_lockdown (const char *name, -+ grub_command_func_t func, -+ const char *summary, -+ const char *description) -+{ -+ if (grub_is_lockdown () == GRUB_LOCKDOWN_ENABLED) -+ func = grub_cmd_lockdown; -+ -+ return grub_register_command_prio (name, func, summary, description, 0); -+} -+ - void - grub_unregister_command (grub_command_t cmd) - { -diff --git a/grub-core/kern/lockdown.c b/grub-core/kern/lockdown.c -new file mode 100644 -index 0000000..1e56c0b ---- /dev/null -+++ b/grub-core/kern/lockdown.c -@@ -0,0 +1,80 @@ -+/* -+ * GRUB -- GRand Unified Bootloader -+ * Copyright (C) 2020 Free Software Foundation, Inc. -+ * -+ * GRUB 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 of the License, or -+ * (at your option) any later version. -+ * -+ * GRUB 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 GRUB. If not, see . -+ * -+ */ -+ -+#include -+#include -+#include -+#include -+ -+static int lockdown = GRUB_LOCKDOWN_DISABLED; -+ -+static grub_err_t -+lockdown_verifier_init (grub_file_t io __attribute__ ((unused)), -+ enum grub_file_type type, -+ void **context __attribute__ ((unused)), -+ enum grub_verify_flags *flags) -+{ -+ *flags = GRUB_VERIFY_FLAGS_SKIP_VERIFICATION; -+ -+ switch (type & GRUB_FILE_TYPE_MASK) -+ { -+ case GRUB_FILE_TYPE_GRUB_MODULE: -+ case GRUB_FILE_TYPE_LINUX_KERNEL: -+ case GRUB_FILE_TYPE_MULTIBOOT_KERNEL: -+ case GRUB_FILE_TYPE_XEN_HYPERVISOR: -+ case GRUB_FILE_TYPE_BSD_KERNEL: -+ case GRUB_FILE_TYPE_XNU_KERNEL: -+ case GRUB_FILE_TYPE_PLAN9_KERNEL: -+ case GRUB_FILE_TYPE_NTLDR: -+ case GRUB_FILE_TYPE_TRUECRYPT: -+ case GRUB_FILE_TYPE_FREEDOS: -+ case GRUB_FILE_TYPE_PXECHAINLOADER: -+ case GRUB_FILE_TYPE_PCCHAINLOADER: -+ case GRUB_FILE_TYPE_COREBOOT_CHAINLOADER: -+ case GRUB_FILE_TYPE_EFI_CHAINLOADED_IMAGE: -+ case GRUB_FILE_TYPE_ACPI_TABLE: -+ case GRUB_FILE_TYPE_DEVICE_TREE_IMAGE: -+ *flags = GRUB_VERIFY_FLAGS_DEFER_AUTH; -+ -+ /* Fall through. */ -+ -+ default: -+ return GRUB_ERR_NONE; -+ } -+} -+ -+struct grub_file_verifier lockdown_verifier = -+ { -+ .name = "lockdown_verifier", -+ .init = lockdown_verifier_init, -+ }; -+ -+void -+grub_lockdown (void) -+{ -+ lockdown = GRUB_LOCKDOWN_ENABLED; -+ -+ grub_verifier_register (&lockdown_verifier); -+} -+ -+int -+grub_is_lockdown (void) -+{ -+ return lockdown; -+} -diff --git a/include/grub/command.h b/include/grub/command.h -index eee4e84..2a6f7f8 100644 ---- a/include/grub/command.h -+++ b/include/grub/command.h -@@ -86,6 +86,11 @@ EXPORT_FUNC(grub_register_command_prio) (const char *name, - const char *summary, - const char *description, - int prio); -+grub_command_t -+EXPORT_FUNC(grub_register_command_lockdown) (const char *name, -+ grub_command_func_t func, -+ const char *summary, -+ const char *description); - void EXPORT_FUNC(grub_unregister_command) (grub_command_t cmd); - - static inline grub_command_t -diff --git a/include/grub/extcmd.h b/include/grub/extcmd.h -index 19fe592..fe9248b 100644 ---- a/include/grub/extcmd.h -+++ b/include/grub/extcmd.h -@@ -62,6 +62,13 @@ grub_extcmd_t EXPORT_FUNC(grub_register_extcmd) (const char *name, - const char *description, - const struct grub_arg_option *parser); - -+grub_extcmd_t EXPORT_FUNC(grub_register_extcmd_lockdown) (const char *name, -+ grub_extcmd_func_t func, -+ grub_command_flags_t flags, -+ const char *summary, -+ const char *description, -+ const struct grub_arg_option *parser); -+ - grub_extcmd_t EXPORT_FUNC(grub_register_extcmd_prio) (const char *name, - grub_extcmd_func_t func, - grub_command_flags_t flags, -diff --git a/include/grub/lockdown.h b/include/grub/lockdown.h -new file mode 100644 -index 0000000..40531fa ---- /dev/null -+++ b/include/grub/lockdown.h -@@ -0,0 +1,44 @@ -+/* -+ * GRUB -- GRand Unified Bootloader -+ * Copyright (C) 2020 Free Software Foundation, Inc. -+ * -+ * GRUB 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 of the License, or -+ * (at your option) any later version. -+ * -+ * GRUB 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 GRUB. If not, see . -+ */ -+ -+#ifndef GRUB_LOCKDOWN_H -+#define GRUB_LOCKDOWN_H 1 -+ -+#include -+ -+#define GRUB_LOCKDOWN_DISABLED 0 -+#define GRUB_LOCKDOWN_ENABLED 1 -+ -+#ifdef GRUB_MACHINE_EFI -+extern void -+EXPORT_FUNC (grub_lockdown) (void); -+extern int -+EXPORT_FUNC (grub_is_lockdown) (void); -+#else -+static inline void -+grub_lockdown (void) -+{ -+} -+ -+static inline int -+grub_is_lockdown (void) -+{ -+ return GRUB_LOCKDOWN_DISABLED; -+} -+#endif -+#endif /* ! GRUB_LOCKDOWN_H */ -diff --git a/po/POTFILES.in b/po/POTFILES.in -index 49755d3..5e26845 100644 ---- a/po/POTFILES.in -+++ b/po/POTFILES.in -@@ -309,6 +309,7 @@ - ./grub-core/kern/ieee1275/mmap.c - ./grub-core/kern/ieee1275/openfw.c - ./grub-core/kern/list.c -+./grub-core/kern/lockdown.c - ./grub-core/kern/main.c - ./grub-core/kern/mips/arc/init.c - ./grub-core/kern/mips/dl.c -@@ -1207,6 +1208,7 @@ - ./include/grub/linux.h - ./include/grub/list.h - ./include/grub/loader.h -+./include/grub/lockdown.h - ./include/grub/lvm.h - ./include/grub/macho.h - ./include/grub/machoload.h --- -2.14.2 - diff --git a/boot/grub2/0036-kern-lockdown-Set-a-variable-if-the-GRUB-is-locked-d.patch b/boot/grub2/0036-kern-lockdown-Set-a-variable-if-the-GRUB-is-locked-d.patch deleted file mode 100644 index e630d332eb2..00000000000 --- a/boot/grub2/0036-kern-lockdown-Set-a-variable-if-the-GRUB-is-locked-d.patch +++ /dev/null @@ -1,57 +0,0 @@ -From d90367471779c240e002e62edfb6b31fc85b4908 Mon Sep 17 00:00:00 2001 -From: Javier Martinez Canillas -Date: Tue, 2 Feb 2021 19:59:48 +0100 -Subject: [PATCH] kern/lockdown: Set a variable if the GRUB is locked down - -It may be useful for scripts to determine whether the GRUB is locked -down or not. Add the lockdown variable which is set to "y" when the GRUB -is locked down. - -Suggested-by: Dimitri John Ledkov -Signed-off-by: Javier Martinez Canillas -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - docs/grub.texi | 3 +++ - grub-core/kern/lockdown.c | 4 ++++ - 2 files changed, 7 insertions(+) - -diff --git a/docs/grub.texi b/docs/grub.texi -index a25459f..bdbb329 100644 ---- a/docs/grub.texi -+++ b/docs/grub.texi -@@ -5803,6 +5803,9 @@ The GRUB can be locked down when booted on a secure boot environment, for exampl - if the UEFI secure boot is enabled. On a locked down configuration, the GRUB will - be restricted and some operations/commands cannot be executed. - -+The @samp{lockdown} variable is set to @samp{y} when the GRUB is locked down. -+Otherwise it does not exit. -+ - @node Platform limitations - @chapter Platform limitations - -diff --git a/grub-core/kern/lockdown.c b/grub-core/kern/lockdown.c -index 1e56c0b..0bc70fd 100644 ---- a/grub-core/kern/lockdown.c -+++ b/grub-core/kern/lockdown.c -@@ -18,6 +18,7 @@ - */ - - #include -+#include - #include - #include - #include -@@ -71,6 +72,9 @@ grub_lockdown (void) - lockdown = GRUB_LOCKDOWN_ENABLED; - - grub_verifier_register (&lockdown_verifier); -+ -+ grub_env_set ("lockdown", "y"); -+ grub_env_export ("lockdown"); - } - - int --- -2.14.2 - diff --git a/boot/grub2/0037-efi-Lockdown-the-GRUB-when-the-UEFI-Secure-Boot-is-e.patch b/boot/grub2/0037-efi-Lockdown-the-GRUB-when-the-UEFI-Secure-Boot-is-e.patch deleted file mode 100644 index b55772de9a0..00000000000 --- a/boot/grub2/0037-efi-Lockdown-the-GRUB-when-the-UEFI-Secure-Boot-is-e.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 98b00a403cbf2ba6833d1ac0499871b27a08eb77 Mon Sep 17 00:00:00 2001 -From: Javier Martinez Canillas -Date: Mon, 28 Sep 2020 20:08:29 +0200 -Subject: [PATCH] efi: Lockdown the GRUB when the UEFI Secure Boot is enabled - -If the UEFI Secure Boot is enabled then the GRUB must be locked down -to prevent executing code that can potentially be used to subvert its -verification mechanisms. - -Signed-off-by: Javier Martinez Canillas -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/kern/efi/init.c | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/grub-core/kern/efi/init.c b/grub-core/kern/efi/init.c -index b683bec..1333465 100644 ---- a/grub-core/kern/efi/init.c -+++ b/grub-core/kern/efi/init.c -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -40,8 +41,15 @@ grub_efi_init (void) - /* Initialize the memory management system. */ - grub_efi_mm_init (); - -- /* Register the shim_lock verifier if UEFI Secure Boot is enabled. */ -- grub_shim_lock_verifier_setup (); -+ /* -+ * Lockdown the GRUB and register the shim_lock verifier -+ * if the UEFI Secure Boot is enabled. -+ */ -+ if (grub_efi_get_secureboot () == GRUB_EFI_SECUREBOOT_MODE_ENABLED) -+ { -+ grub_lockdown (); -+ grub_shim_lock_verifier_setup (); -+ } - - efi_call_4 (grub_efi_system_table->boot_services->set_watchdog_timer, - 0, 0, 0, NULL); --- -2.14.2 - diff --git a/boot/grub2/0038-efi-Use-grub_is_lockdown-instead-of-hardcoding-a-dis.patch b/boot/grub2/0038-efi-Use-grub_is_lockdown-instead-of-hardcoding-a-dis.patch deleted file mode 100644 index c551822bf0d..00000000000 --- a/boot/grub2/0038-efi-Use-grub_is_lockdown-instead-of-hardcoding-a-dis.patch +++ /dev/null @@ -1,232 +0,0 @@ -From 8f73052885892bc0dbc01e297f79d7cf4925e491 Mon Sep 17 00:00:00 2001 -From: Javier Martinez Canillas -Date: Mon, 28 Sep 2020 20:08:33 +0200 -Subject: [PATCH] efi: Use grub_is_lockdown() instead of hardcoding a disabled - modules list - -Now the GRUB can check if it has been locked down and this can be used to -prevent executing commands that can be utilized to circumvent the UEFI -Secure Boot mechanisms. So, instead of hardcoding a list of modules that -have to be disabled, prevent the usage of commands that can be dangerous. - -This not only allows the commands to be disabled on other platforms, but -also properly separate the concerns. Since the shim_lock verifier logic -should be only about preventing to run untrusted binaries and not about -defining these kind of policies. - -Signed-off-by: Javier Martinez Canillas -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - docs/grub.texi | 15 +++++++++------ - grub-core/commands/i386/wrmsr.c | 5 +++-- - grub-core/commands/iorw.c | 19 ++++++++++--------- - grub-core/commands/memrw.c | 19 ++++++++++--------- - grub-core/kern/efi/sb.c | 41 ----------------------------------------- - 5 files changed, 32 insertions(+), 67 deletions(-) - -diff --git a/docs/grub.texi b/docs/grub.texi -index bdbb329..bbe60a4 100644 ---- a/docs/grub.texi -+++ b/docs/grub.texi -@@ -5256,6 +5256,9 @@ only applies to the particular cpu/core/thread that runs the command. - Also, if you specify a reserved or unimplemented MSR address, it will - cause a general protection exception (which is not currently being handled) - and the system will reboot. -+ -+Note: The command is not allowed when lockdown is enforced (@pxref{Lockdown}). -+ This is done to prevent subverting various security mechanisms. - @end deffn - - @node xen_hypervisor -@@ -5752,12 +5755,12 @@ boot and the shim. This functionality is provided by the shim_lock verifier. It - is built into the @file{core.img} and is registered if the UEFI secure boot is - enabled. - --All modules not stored in the @file{core.img} and the ACPI tables for the --@command{acpi} command have to be signed, e.g. using PGP. Additionally, the --@command{iorw}, the @command{memrw} and the @command{wrmsr} commands are --prohibited if the UEFI secure boot is enabled. This is done due to --security reasons. All above mentioned requirements are enforced by the --shim_lock verifier logic. -+All GRUB modules not stored in the @file{core.img}, OS kernels, ACPI tables, -+Device Trees, etc. have to be signed, e.g, using PGP. Additionally, the commands -+that can be used to subvert the UEFI secure boot mechanism, such as @command{iorw} -+and @command{memrw} will not be available when the UEFI secure boot is enabled. -+This is done for security reasons and are enforced by the GRUB Lockdown mechanism -+(@pxref{Lockdown}). - - @node Measured Boot - @section Measuring boot components -diff --git a/grub-core/commands/i386/wrmsr.c b/grub-core/commands/i386/wrmsr.c -index 9c5e510..56a29c2 100644 ---- a/grub-core/commands/i386/wrmsr.c -+++ b/grub-core/commands/i386/wrmsr.c -@@ -24,6 +24,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -83,8 +84,8 @@ grub_cmd_msr_write (grub_command_t cmd __attribute__ ((unused)), int argc, char - - GRUB_MOD_INIT(wrmsr) - { -- cmd_write = grub_register_command ("wrmsr", grub_cmd_msr_write, N_("ADDR VALUE"), -- N_("Write a value to a CPU model specific register.")); -+ cmd_write = grub_register_command_lockdown ("wrmsr", grub_cmd_msr_write, N_("ADDR VALUE"), -+ N_("Write a value to a CPU model specific register.")); - } - - GRUB_MOD_FINI(wrmsr) -diff --git a/grub-core/commands/iorw.c b/grub-core/commands/iorw.c -index a0c164e..584baec 100644 ---- a/grub-core/commands/iorw.c -+++ b/grub-core/commands/iorw.c -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - - GRUB_MOD_LICENSE ("GPLv3+"); - -@@ -131,17 +132,17 @@ GRUB_MOD_INIT(memrw) - N_("PORT"), N_("Read 32-bit value from PORT."), - options); - cmd_write_byte = -- grub_register_command ("outb", grub_cmd_write, -- N_("PORT VALUE [MASK]"), -- N_("Write 8-bit VALUE to PORT.")); -+ grub_register_command_lockdown ("outb", grub_cmd_write, -+ N_("PORT VALUE [MASK]"), -+ N_("Write 8-bit VALUE to PORT.")); - cmd_write_word = -- grub_register_command ("outw", grub_cmd_write, -- N_("PORT VALUE [MASK]"), -- N_("Write 16-bit VALUE to PORT.")); -+ grub_register_command_lockdown ("outw", grub_cmd_write, -+ N_("PORT VALUE [MASK]"), -+ N_("Write 16-bit VALUE to PORT.")); - cmd_write_dword = -- grub_register_command ("outl", grub_cmd_write, -- N_("ADDR VALUE [MASK]"), -- N_("Write 32-bit VALUE to PORT.")); -+ grub_register_command_lockdown ("outl", grub_cmd_write, -+ N_("ADDR VALUE [MASK]"), -+ N_("Write 32-bit VALUE to PORT.")); - } - - GRUB_MOD_FINI(memrw) -diff --git a/grub-core/commands/memrw.c b/grub-core/commands/memrw.c -index 98769ea..d401a6d 100644 ---- a/grub-core/commands/memrw.c -+++ b/grub-core/commands/memrw.c -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - - GRUB_MOD_LICENSE ("GPLv3+"); - -@@ -133,17 +134,17 @@ GRUB_MOD_INIT(memrw) - N_("ADDR"), N_("Read 32-bit value from ADDR."), - options); - cmd_write_byte = -- grub_register_command ("write_byte", grub_cmd_write, -- N_("ADDR VALUE [MASK]"), -- N_("Write 8-bit VALUE to ADDR.")); -+ grub_register_command_lockdown ("write_byte", grub_cmd_write, -+ N_("ADDR VALUE [MASK]"), -+ N_("Write 8-bit VALUE to ADDR.")); - cmd_write_word = -- grub_register_command ("write_word", grub_cmd_write, -- N_("ADDR VALUE [MASK]"), -- N_("Write 16-bit VALUE to ADDR.")); -+ grub_register_command_lockdown ("write_word", grub_cmd_write, -+ N_("ADDR VALUE [MASK]"), -+ N_("Write 16-bit VALUE to ADDR.")); - cmd_write_dword = -- grub_register_command ("write_dword", grub_cmd_write, -- N_("ADDR VALUE [MASK]"), -- N_("Write 32-bit VALUE to ADDR.")); -+ grub_register_command_lockdown ("write_dword", grub_cmd_write, -+ N_("ADDR VALUE [MASK]"), -+ N_("Write 32-bit VALUE to ADDR.")); - } - - GRUB_MOD_FINI(memrw) -diff --git a/grub-core/kern/efi/sb.c b/grub-core/kern/efi/sb.c -index ce3b7f6..5d7210a 100644 ---- a/grub-core/kern/efi/sb.c -+++ b/grub-core/kern/efi/sb.c -@@ -30,9 +30,6 @@ - - static grub_efi_guid_t shim_lock_guid = GRUB_EFI_SHIM_LOCK_GUID; - --/* List of modules which cannot be loaded if UEFI secure boot mode is enabled. */ --static const char * const disabled_mods[] = {"iorw", "memrw", NULL}; -- - /* - * Determine whether we're in secure boot mode. - * -@@ -121,53 +118,15 @@ shim_lock_verifier_init (grub_file_t io __attribute__ ((unused)), - void **context __attribute__ ((unused)), - enum grub_verify_flags *flags) - { -- const char *b, *e; -- int i; -- - *flags = GRUB_VERIFY_FLAGS_SKIP_VERIFICATION; - - switch (type & GRUB_FILE_TYPE_MASK) - { -- case GRUB_FILE_TYPE_GRUB_MODULE: -- /* Establish GRUB module name. */ -- b = grub_strrchr (io->name, '/'); -- e = grub_strrchr (io->name, '.'); -- -- b = b ? (b + 1) : io->name; -- e = e ? e : io->name + grub_strlen (io->name); -- e = (e > b) ? e : io->name + grub_strlen (io->name); -- -- for (i = 0; disabled_mods[i]; i++) -- if (!grub_strncmp (b, disabled_mods[i], grub_strlen (b) - grub_strlen (e))) -- { -- grub_error (GRUB_ERR_ACCESS_DENIED, -- N_("module cannot be loaded in UEFI secure boot mode: %s"), -- io->name); -- return GRUB_ERR_ACCESS_DENIED; -- } -- -- /* Fall through. */ -- -- case GRUB_FILE_TYPE_ACPI_TABLE: -- case GRUB_FILE_TYPE_DEVICE_TREE_IMAGE: -- *flags = GRUB_VERIFY_FLAGS_DEFER_AUTH; -- -- return GRUB_ERR_NONE; -- - case GRUB_FILE_TYPE_LINUX_KERNEL: - case GRUB_FILE_TYPE_MULTIBOOT_KERNEL: - case GRUB_FILE_TYPE_BSD_KERNEL: - case GRUB_FILE_TYPE_XNU_KERNEL: - case GRUB_FILE_TYPE_PLAN9_KERNEL: -- for (i = 0; disabled_mods[i]; i++) -- if (grub_dl_get (disabled_mods[i])) -- { -- grub_error (GRUB_ERR_ACCESS_DENIED, -- N_("cannot boot due to dangerous module in memory: %s"), -- disabled_mods[i]); -- return GRUB_ERR_ACCESS_DENIED; -- } -- - *flags = GRUB_VERIFY_FLAGS_SINGLE_CHUNK; - - /* Fall through. */ --- -2.14.2 - diff --git a/boot/grub2/0039-acpi-Don-t-register-the-acpi-command-when-locked-dow.patch b/boot/grub2/0039-acpi-Don-t-register-the-acpi-command-when-locked-dow.patch deleted file mode 100644 index b258b517b7a..00000000000 --- a/boot/grub2/0039-acpi-Don-t-register-the-acpi-command-when-locked-dow.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 3e8e4c0549240fa209acffceb473e1e509b50c95 Mon Sep 17 00:00:00 2001 -From: Javier Martinez Canillas -Date: Mon, 28 Sep 2020 20:08:41 +0200 -Subject: [PATCH] acpi: Don't register the acpi command when locked down -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The command is not allowed when lockdown is enforced. Otherwise an -attacker can instruct the GRUB to load an SSDT table to overwrite -the kernel lockdown configuration and later load and execute -unsigned code. - -Fixes: CVE-2020-14372 - -Reported-by: Máté Kukri -Signed-off-by: Javier Martinez Canillas -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - docs/grub.texi | 5 +++++ - grub-core/commands/acpi.c | 15 ++++++++------- - 2 files changed, 13 insertions(+), 7 deletions(-) - -diff --git a/docs/grub.texi b/docs/grub.texi -index bbe60a4..98592d3 100644 ---- a/docs/grub.texi -+++ b/docs/grub.texi -@@ -3986,6 +3986,11 @@ Normally, this command will replace the Root System Description Pointer - (RSDP) in the Extended BIOS Data Area to point to the new tables. If the - @option{--no-ebda} option is used, the new tables will be known only to - GRUB, but may be used by GRUB's EFI emulation. -+ -+Note: The command is not allowed when lockdown is enforced (@pxref{Lockdown}). -+ Otherwise an attacker can instruct the GRUB to load an SSDT table to -+ overwrite the kernel lockdown configuration and later load and execute -+ unsigned code. - @end deffn - - -diff --git a/grub-core/commands/acpi.c b/grub-core/commands/acpi.c -index 5a1499a..1215f2a 100644 ---- a/grub-core/commands/acpi.c -+++ b/grub-core/commands/acpi.c -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - - #ifdef GRUB_MACHINE_EFI - #include -@@ -775,13 +776,13 @@ static grub_extcmd_t cmd; - - GRUB_MOD_INIT(acpi) - { -- cmd = grub_register_extcmd ("acpi", grub_cmd_acpi, 0, -- N_("[-1|-2] [--exclude=TABLE1,TABLE2|" -- "--load-only=TABLE1,TABLE2] FILE1" -- " [FILE2] [...]"), -- N_("Load host ACPI tables and tables " -- "specified by arguments."), -- options); -+ cmd = grub_register_extcmd_lockdown ("acpi", grub_cmd_acpi, 0, -+ N_("[-1|-2] [--exclude=TABLE1,TABLE2|" -+ "--load-only=TABLE1,TABLE2] FILE1" -+ " [FILE2] [...]"), -+ N_("Load host ACPI tables and tables " -+ "specified by arguments."), -+ options); - } - - GRUB_MOD_FINI(acpi) --- -2.14.2 - diff --git a/boot/grub2/0040-mmap-Don-t-register-cutmem-and-badram-commands-when-.patch b/boot/grub2/0040-mmap-Don-t-register-cutmem-and-badram-commands-when-.patch deleted file mode 100644 index e7376e6a5d0..00000000000 --- a/boot/grub2/0040-mmap-Don-t-register-cutmem-and-badram-commands-when-.patch +++ /dev/null @@ -1,70 +0,0 @@ -From d298b41f90cbf1f2e5a10e29daa1fc92ddee52c9 Mon Sep 17 00:00:00 2001 -From: Javier Martinez Canillas -Date: Wed, 14 Oct 2020 16:33:42 +0200 -Subject: [PATCH] mmap: Don't register cutmem and badram commands when lockdown - is enforced - -The cutmem and badram commands can be used to remove EFI memory regions -and potentially disable the UEFI Secure Boot. Prevent the commands to be -registered if the GRUB is locked down. - -Fixes: CVE-2020-27779 - -Reported-by: Teddy Reed -Signed-off-by: Javier Martinez Canillas -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - docs/grub.texi | 4 ++++ - grub-core/mmap/mmap.c | 13 +++++++------ - 2 files changed, 11 insertions(+), 6 deletions(-) - -diff --git a/docs/grub.texi b/docs/grub.texi -index 98592d3..f2fe149 100644 ---- a/docs/grub.texi -+++ b/docs/grub.texi -@@ -4051,6 +4051,10 @@ this page is to be filtered. This syntax makes it easy to represent patterns - that are often result of memory damage, due to physical distribution of memory - cells. - -+Note: The command is not allowed when lockdown is enforced (@pxref{Lockdown}). -+ This prevents removing EFI memory regions to potentially subvert the -+ security mechanisms provided by the UEFI secure boot. -+ - @node blocklist - @subsection blocklist - -diff --git a/grub-core/mmap/mmap.c b/grub-core/mmap/mmap.c -index 57b4e9a..7ebf32e 100644 ---- a/grub-core/mmap/mmap.c -+++ b/grub-core/mmap/mmap.c -@@ -20,6 +20,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -534,12 +535,12 @@ static grub_command_t cmd, cmd_cut; - - GRUB_MOD_INIT(mmap) - { -- cmd = grub_register_command ("badram", grub_cmd_badram, -- N_("ADDR1,MASK1[,ADDR2,MASK2[,...]]"), -- N_("Declare memory regions as faulty (badram).")); -- cmd_cut = grub_register_command ("cutmem", grub_cmd_cutmem, -- N_("FROM[K|M|G] TO[K|M|G]"), -- N_("Remove any memory regions in specified range.")); -+ cmd = grub_register_command_lockdown ("badram", grub_cmd_badram, -+ N_("ADDR1,MASK1[,ADDR2,MASK2[,...]]"), -+ N_("Declare memory regions as faulty (badram).")); -+ cmd_cut = grub_register_command_lockdown ("cutmem", grub_cmd_cutmem, -+ N_("FROM[K|M|G] TO[K|M|G]"), -+ N_("Remove any memory regions in specified range.")); - - } - --- -2.14.2 - diff --git a/boot/grub2/0041-commands-Restrict-commands-that-can-load-BIOS-or-DT-.patch b/boot/grub2/0041-commands-Restrict-commands-that-can-load-BIOS-or-DT-.patch deleted file mode 100644 index 1980d6d97d0..00000000000 --- a/boot/grub2/0041-commands-Restrict-commands-that-can-load-BIOS-or-DT-.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 468a5699b249fe6816b4e7e86c5dc9d325c9b09e Mon Sep 17 00:00:00 2001 -From: Javier Martinez Canillas -Date: Wed, 24 Feb 2021 09:00:05 +0100 -Subject: [PATCH] commands: Restrict commands that can load BIOS or DT blobs - when locked down - -There are some more commands that should be restricted when the GRUB is -locked down. Following is the list of commands and reasons to restrict: - - * fakebios: creates BIOS-like structures for backward compatibility with - existing OSes. This should not be allowed when locked down. - - * loadbios: reads a BIOS dump from storage and loads it. This action - should not be allowed when locked down. - - * devicetree: loads a Device Tree blob and passes it to the OS. It replaces - any Device Tree provided by the firmware. This also should - not be allowed when locked down. - -Signed-off-by: Javier Martinez Canillas -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - docs/grub.texi | 3 +++ - grub-core/commands/efi/loadbios.c | 16 ++++++++-------- - grub-core/loader/arm/linux.c | 6 +++--- - grub-core/loader/efi/fdt.c | 4 ++-- - 4 files changed, 16 insertions(+), 13 deletions(-) - -diff --git a/docs/grub.texi b/docs/grub.texi -index f2fe149..79f58c5 100644 ---- a/docs/grub.texi -+++ b/docs/grub.texi -@@ -4235,6 +4235,9 @@ hour, minute, and second unchanged. - Load a device tree blob (.dtb) from a filesystem, for later use by a Linux - kernel. Does not perform merging with any device tree supplied by firmware, - but rather replaces it completely. -+ -+Note: The command is not allowed when lockdown is enforced (@pxref{Lockdown}). -+ This is done to prevent subverting various security mechanisms. - @ref{GNU/Linux}. - @end deffn - -diff --git a/grub-core/commands/efi/loadbios.c b/grub-core/commands/efi/loadbios.c -index d41d521..5c7725f 100644 ---- a/grub-core/commands/efi/loadbios.c -+++ b/grub-core/commands/efi/loadbios.c -@@ -205,14 +205,14 @@ static grub_command_t cmd_fakebios, cmd_loadbios; - - GRUB_MOD_INIT(loadbios) - { -- cmd_fakebios = grub_register_command ("fakebios", grub_cmd_fakebios, -- 0, N_("Create BIOS-like structures for" -- " backward compatibility with" -- " existing OS.")); -- -- cmd_loadbios = grub_register_command ("loadbios", grub_cmd_loadbios, -- N_("BIOS_DUMP [INT10_DUMP]"), -- N_("Load BIOS dump.")); -+ cmd_fakebios = grub_register_command_lockdown ("fakebios", grub_cmd_fakebios, -+ 0, N_("Create BIOS-like structures for" -+ " backward compatibility with" -+ " existing OS.")); -+ -+ cmd_loadbios = grub_register_command_lockdown ("loadbios", grub_cmd_loadbios, -+ N_("BIOS_DUMP [INT10_DUMP]"), -+ N_("Load BIOS dump.")); - } - - GRUB_MOD_FINI(loadbios) -diff --git a/grub-core/loader/arm/linux.c b/grub-core/loader/arm/linux.c -index d70c174..ed23dc7 100644 ---- a/grub-core/loader/arm/linux.c -+++ b/grub-core/loader/arm/linux.c -@@ -493,9 +493,9 @@ GRUB_MOD_INIT (linux) - 0, N_("Load Linux.")); - cmd_initrd = grub_register_command ("initrd", grub_cmd_initrd, - 0, N_("Load initrd.")); -- cmd_devicetree = grub_register_command ("devicetree", grub_cmd_devicetree, -- /* TRANSLATORS: DTB stands for device tree blob. */ -- 0, N_("Load DTB file.")); -+ cmd_devicetree = grub_register_command_lockdown ("devicetree", grub_cmd_devicetree, -+ /* TRANSLATORS: DTB stands for device tree blob. */ -+ 0, N_("Load DTB file.")); - my_mod = mod; - current_fdt = (const void *) grub_arm_firmware_get_boot_data (); - machine_type = grub_arm_firmware_get_machine_type (); -diff --git a/grub-core/loader/efi/fdt.c b/grub-core/loader/efi/fdt.c -index ee9c559..003d07c 100644 ---- a/grub-core/loader/efi/fdt.c -+++ b/grub-core/loader/efi/fdt.c -@@ -165,8 +165,8 @@ static grub_command_t cmd_devicetree; - GRUB_MOD_INIT (fdt) - { - cmd_devicetree = -- grub_register_command ("devicetree", grub_cmd_devicetree, 0, -- N_("Load DTB file.")); -+ grub_register_command_lockdown ("devicetree", grub_cmd_devicetree, 0, -+ N_("Load DTB file.")); - } - - GRUB_MOD_FINI (fdt) --- -2.14.2 - diff --git a/boot/grub2/0042-commands-setpci-Restrict-setpci-command-when-locked-.patch b/boot/grub2/0042-commands-setpci-Restrict-setpci-command-when-locked-.patch deleted file mode 100644 index dcddfe19576..00000000000 --- a/boot/grub2/0042-commands-setpci-Restrict-setpci-command-when-locked-.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 58b77d4069823b44c5fa916fa8ddfc9c4cd51e02 Mon Sep 17 00:00:00 2001 -From: Javier Martinez Canillas -Date: Wed, 24 Feb 2021 22:59:59 +0100 -Subject: [PATCH] commands/setpci: Restrict setpci command when locked down - -This command can set PCI devices register values, which makes it dangerous -in a locked down configuration. Restrict it so can't be used on this setup. - -Signed-off-by: Javier Martinez Canillas -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/commands/setpci.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/grub-core/commands/setpci.c b/grub-core/commands/setpci.c -index d5bc97d..fa2ba7d 100644 ---- a/grub-core/commands/setpci.c -+++ b/grub-core/commands/setpci.c -@@ -329,10 +329,10 @@ static grub_extcmd_t cmd; - - GRUB_MOD_INIT(setpci) - { -- cmd = grub_register_extcmd ("setpci", grub_cmd_setpci, 0, -- N_("[-s POSITION] [-d DEVICE] [-v VAR] " -- "REGISTER[=VALUE[:MASK]]"), -- N_("Manipulate PCI devices."), options); -+ cmd = grub_register_extcmd_lockdown ("setpci", grub_cmd_setpci, 0, -+ N_("[-s POSITION] [-d DEVICE] [-v VAR] " -+ "REGISTER[=VALUE[:MASK]]"), -+ N_("Manipulate PCI devices."), options); - } - - GRUB_MOD_FINI(setpci) --- -2.14.2 - diff --git a/boot/grub2/0043-commands-hdparm-Restrict-hdparm-command-when-locked-.patch b/boot/grub2/0043-commands-hdparm-Restrict-hdparm-command-when-locked-.patch deleted file mode 100644 index 3c26c8604a5..00000000000 --- a/boot/grub2/0043-commands-hdparm-Restrict-hdparm-command-when-locked-.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 5c97492a29c6063567b65ed1a069f5e6f4e211f0 Mon Sep 17 00:00:00 2001 -From: Javier Martinez Canillas -Date: Wed, 24 Feb 2021 12:59:29 +0100 -Subject: [PATCH] commands/hdparm: Restrict hdparm command when locked down - -The command can be used to get/set ATA disk parameters. Some of these can -be dangerous since change the disk behavior. Restrict it when locked down. - -Signed-off-by: Javier Martinez Canillas -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/commands/hdparm.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/grub-core/commands/hdparm.c b/grub-core/commands/hdparm.c -index d3fa966..2e2319e 100644 ---- a/grub-core/commands/hdparm.c -+++ b/grub-core/commands/hdparm.c -@@ -436,9 +436,9 @@ static grub_extcmd_t cmd; - - GRUB_MOD_INIT(hdparm) - { -- cmd = grub_register_extcmd ("hdparm", grub_cmd_hdparm, 0, -- N_("[OPTIONS] DISK"), -- N_("Get/set ATA disk parameters."), options); -+ cmd = grub_register_extcmd_lockdown ("hdparm", grub_cmd_hdparm, 0, -+ N_("[OPTIONS] DISK"), -+ N_("Get/set ATA disk parameters."), options); - } - - GRUB_MOD_FINI(hdparm) --- -2.14.2 - diff --git a/boot/grub2/0044-gdb-Restrict-GDB-access-when-locked-down.patch b/boot/grub2/0044-gdb-Restrict-GDB-access-when-locked-down.patch deleted file mode 100644 index c671ad88200..00000000000 --- a/boot/grub2/0044-gdb-Restrict-GDB-access-when-locked-down.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 508270838998f151a82e9c13e7cb8a470a2dc23d Mon Sep 17 00:00:00 2001 -From: Javier Martinez Canillas -Date: Wed, 24 Feb 2021 15:03:26 +0100 -Subject: [PATCH] gdb: Restrict GDB access when locked down - -The gdbstub* commands allow to start and control a GDB stub running on -local host that can be used to connect from a remote debugger. Restrict -this functionality when the GRUB is locked down. - -Signed-off-by: Javier Martinez Canillas -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/gdb/gdb.c | 32 ++++++++++++++++++-------------- - 1 file changed, 18 insertions(+), 14 deletions(-) - -diff --git a/grub-core/gdb/gdb.c b/grub-core/gdb/gdb.c -index 847a1e1..1818cb6 100644 ---- a/grub-core/gdb/gdb.c -+++ b/grub-core/gdb/gdb.c -@@ -75,20 +75,24 @@ static grub_command_t cmd, cmd_stop, cmd_break; - GRUB_MOD_INIT (gdb) - { - grub_gdb_idtinit (); -- cmd = grub_register_command ("gdbstub", grub_cmd_gdbstub, -- N_("PORT"), -- /* TRANSLATORS: GDB stub is a small part of -- GDB functionality running on local host -- which allows remote debugger to -- connect to it. */ -- N_("Start GDB stub on given port")); -- cmd_break = grub_register_command ("gdbstub_break", grub_cmd_gdb_break, -- /* TRANSLATORS: this refers to triggering -- a breakpoint so that the user will land -- into GDB. */ -- 0, N_("Break into GDB")); -- cmd_stop = grub_register_command ("gdbstub_stop", grub_cmd_gdbstop, -- 0, N_("Stop GDB stub")); -+ cmd = grub_register_command_lockdown ("gdbstub", grub_cmd_gdbstub, -+ N_("PORT"), -+ /* -+ * TRANSLATORS: GDB stub is a small part of -+ * GDB functionality running on local host -+ * which allows remote debugger to -+ * connect to it. -+ */ -+ N_("Start GDB stub on given port")); -+ cmd_break = grub_register_command_lockdown ("gdbstub_break", grub_cmd_gdb_break, -+ /* -+ * TRANSLATORS: this refers to triggering -+ * a breakpoint so that the user will land -+ * into GDB. -+ */ -+ 0, N_("Break into GDB")); -+ cmd_stop = grub_register_command_lockdown ("gdbstub_stop", grub_cmd_gdbstop, -+ 0, N_("Stop GDB stub")); - } - - GRUB_MOD_FINI (gdb) --- -2.14.2 - diff --git a/boot/grub2/0045-loader-xnu-Don-t-allow-loading-extension-and-package.patch b/boot/grub2/0045-loader-xnu-Don-t-allow-loading-extension-and-package.patch deleted file mode 100644 index 6548c0d6e21..00000000000 --- a/boot/grub2/0045-loader-xnu-Don-t-allow-loading-extension-and-package.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 9c5565135f12400a925ee901b25984e7af4442f5 Mon Sep 17 00:00:00 2001 -From: Javier Martinez Canillas -Date: Wed, 24 Feb 2021 14:44:38 +0100 -Subject: [PATCH] loader/xnu: Don't allow loading extension and packages when - locked down - -The shim_lock verifier validates the XNU kernels but no its extensions -and packages. Prevent these to be loaded when the GRUB is locked down. - -Signed-off-by: Javier Martinez Canillas -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/loader/xnu.c | 31 +++++++++++++++++-------------- - 1 file changed, 17 insertions(+), 14 deletions(-) - -diff --git a/grub-core/loader/xnu.c b/grub-core/loader/xnu.c -index 9ae4ceb..44fd5a9 100644 ---- a/grub-core/loader/xnu.c -+++ b/grub-core/loader/xnu.c -@@ -1485,20 +1485,23 @@ GRUB_MOD_INIT(xnu) - N_("Load XNU image.")); - cmd_kernel64 = grub_register_command ("xnu_kernel64", grub_cmd_xnu_kernel64, - 0, N_("Load 64-bit XNU image.")); -- cmd_mkext = grub_register_command ("xnu_mkext", grub_cmd_xnu_mkext, 0, -- N_("Load XNU extension package.")); -- cmd_kext = grub_register_command ("xnu_kext", grub_cmd_xnu_kext, 0, -- N_("Load XNU extension.")); -- cmd_kextdir = grub_register_command ("xnu_kextdir", grub_cmd_xnu_kextdir, -- /* TRANSLATORS: OSBundleRequired is a -- variable name in xnu extensions -- manifests. It behaves mostly like -- GNU/Linux runlevels. -- */ -- N_("DIRECTORY [OSBundleRequired]"), -- /* TRANSLATORS: There are many extensions -- in extension directory. */ -- N_("Load XNU extension directory.")); -+ cmd_mkext = grub_register_command_lockdown ("xnu_mkext", grub_cmd_xnu_mkext, 0, -+ N_("Load XNU extension package.")); -+ cmd_kext = grub_register_command_lockdown ("xnu_kext", grub_cmd_xnu_kext, 0, -+ N_("Load XNU extension.")); -+ cmd_kextdir = grub_register_command_lockdown ("xnu_kextdir", grub_cmd_xnu_kextdir, -+ /* -+ * TRANSLATORS: OSBundleRequired is -+ * a variable name in xnu extensions -+ * manifests. It behaves mostly like -+ * GNU/Linux runlevels. -+ */ -+ N_("DIRECTORY [OSBundleRequired]"), -+ /* -+ * TRANSLATORS: There are many extensions -+ * in extension directory. -+ */ -+ N_("Load XNU extension directory.")); - cmd_ramdisk = grub_register_command ("xnu_ramdisk", grub_cmd_xnu_ramdisk, 0, - /* TRANSLATORS: ramdisk here isn't identifier. It can be translated. */ - N_("Load XNU ramdisk. " --- -2.14.2 - diff --git a/boot/grub2/0046-docs-Document-the-cutmem-command.patch b/boot/grub2/0046-docs-Document-the-cutmem-command.patch deleted file mode 100644 index 978aeabc949..00000000000 --- a/boot/grub2/0046-docs-Document-the-cutmem-command.patch +++ /dev/null @@ -1,65 +0,0 @@ -From f05e79a0143beb2d9a482a3ebf4fe0ce76778122 Mon Sep 17 00:00:00 2001 -From: Javier Martinez Canillas -Date: Sat, 7 Nov 2020 01:03:18 +0100 -Subject: [PATCH] docs: Document the cutmem command - -The command is not present in the docs/grub.texi user documentation. - -Reported-by: Daniel Kiper -Signed-off-by: Javier Martinez Canillas -Signed-off-by: Daniel Kiper -Reviewed-by: Javier Martinez Canillas -Signed-off-by: Stefan Sørensen ---- - docs/grub.texi | 21 +++++++++++++++++++++ - 1 file changed, 21 insertions(+) - -diff --git a/docs/grub.texi b/docs/grub.texi -index 79f58c5..8518cc0 100644 ---- a/docs/grub.texi -+++ b/docs/grub.texi -@@ -3892,6 +3892,7 @@ you forget a command, you can run the command @command{help} - * cpuid:: Check for CPU features - * crc:: Compute or check CRC32 checksums - * cryptomount:: Mount a crypto device -+* cutmem:: Remove memory regions - * date:: Display or set current date and time - * devicetree:: Load a device tree blob - * distrust:: Remove a pubkey from trusted keys -@@ -4051,6 +4052,8 @@ this page is to be filtered. This syntax makes it easy to represent patterns - that are often result of memory damage, due to physical distribution of memory - cells. - -+The command is similar to @command{cutmem} command. -+ - Note: The command is not allowed when lockdown is enforced (@pxref{Lockdown}). - This prevents removing EFI memory regions to potentially subvert the - security mechanisms provided by the UEFI secure boot. -@@ -4214,6 +4217,24 @@ GRUB suports devices encrypted using LUKS and geli. Note that necessary modules - be used. - @end deffn - -+@node cutmem -+@subsection cutmem -+ -+@deffn Command cutmem from[K|M|G] to[K|M|G] -+Remove any memory regions in specified range. -+@end deffn -+ -+This command notifies the memory manager that specified regions of RAM ought to -+be filtered out. This remains in effect after a payload kernel has been loaded -+by GRUB, as long as the loaded kernel obtains its memory map from GRUB. Kernels -+that support this include Linux, GNU Mach, the kernel of FreeBSD and Multiboot -+kernels in general. -+ -+The command is similar to @command{badram} command. -+ -+Note: The command is not allowed when lockdown is enforced (@pxref{Lockdown}). -+ This prevents removing EFI memory regions to potentially subvert the -+ security mechanisms provided by the UEFI secure boot. - - @node date - @subsection date --- -2.14.2 - diff --git a/boot/grub2/0047-dl-Only-allow-unloading-modules-that-are-not-depende.patch b/boot/grub2/0047-dl-Only-allow-unloading-modules-that-are-not-depende.patch deleted file mode 100644 index 3bb02ad4fb6..00000000000 --- a/boot/grub2/0047-dl-Only-allow-unloading-modules-that-are-not-depende.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 7630ec5397fe418276b360f9011934b8c034936c Mon Sep 17 00:00:00 2001 -From: Javier Martinez Canillas -Date: Tue, 29 Sep 2020 14:08:55 +0200 -Subject: [PATCH] dl: Only allow unloading modules that are not dependencies - -When a module is attempted to be removed its reference counter is always -decremented. This means that repeated rmmod invocations will cause the -module to be unloaded even if another module depends on it. - -This may lead to a use-after-free scenario allowing an attacker to execute -arbitrary code and by-pass the UEFI Secure Boot protection. - -While being there, add the extern keyword to some function declarations in -that header file. - -Fixes: CVE-2020-25632 - -Reported-by: Chris Coulson -Signed-off-by: Javier Martinez Canillas -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/commands/minicmd.c | 7 +++++-- - grub-core/kern/dl.c | 9 +++++++++ - include/grub/dl.h | 8 +++++--- - 3 files changed, 19 insertions(+), 5 deletions(-) - -diff --git a/grub-core/commands/minicmd.c b/grub-core/commands/minicmd.c -index 6bbce31..fa49893 100644 ---- a/grub-core/commands/minicmd.c -+++ b/grub-core/commands/minicmd.c -@@ -140,8 +140,11 @@ grub_mini_cmd_rmmod (struct grub_command *cmd __attribute__ ((unused)), - if (grub_dl_is_persistent (mod)) - return grub_error (GRUB_ERR_BAD_ARGUMENT, "cannot unload persistent module"); - -- if (grub_dl_unref (mod) <= 0) -- grub_dl_unload (mod); -+ if (grub_dl_ref_count (mod) > 1) -+ return grub_error (GRUB_ERR_BAD_ARGUMENT, "cannot unload referenced module"); -+ -+ grub_dl_unref (mod); -+ grub_dl_unload (mod); - - return 0; - } -diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c -index 48eb5e7..48f8a79 100644 ---- a/grub-core/kern/dl.c -+++ b/grub-core/kern/dl.c -@@ -549,6 +549,15 @@ grub_dl_unref (grub_dl_t mod) - return --mod->ref_count; - } - -+int -+grub_dl_ref_count (grub_dl_t mod) -+{ -+ if (mod == NULL) -+ return 0; -+ -+ return mod->ref_count; -+} -+ - static void - grub_dl_flush_cache (grub_dl_t mod) - { -diff --git a/include/grub/dl.h b/include/grub/dl.h -index f03c035..b3753c9 100644 ---- a/include/grub/dl.h -+++ b/include/grub/dl.h -@@ -203,9 +203,11 @@ 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); --void grub_dl_unload_unneeded (void); --int EXPORT_FUNC(grub_dl_ref) (grub_dl_t mod); --int EXPORT_FUNC(grub_dl_unref) (grub_dl_t mod); -+extern void grub_dl_unload_unneeded (void); -+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_dl_t EXPORT_VAR(grub_dl_head); - - #ifndef GRUB_UTIL --- -2.14.2 - diff --git a/boot/grub2/0048-usb-Avoid-possible-out-of-bound-accesses-caused-by-m.patch b/boot/grub2/0048-usb-Avoid-possible-out-of-bound-accesses-caused-by-m.patch deleted file mode 100644 index 6a056e52a67..00000000000 --- a/boot/grub2/0048-usb-Avoid-possible-out-of-bound-accesses-caused-by-m.patch +++ /dev/null @@ -1,116 +0,0 @@ -From 128c16a682034263eb519c89bc0934eeb6fa8cfa Mon Sep 17 00:00:00 2001 -From: Javier Martinez Canillas -Date: Fri, 11 Dec 2020 19:19:21 +0100 -Subject: [PATCH] usb: Avoid possible out-of-bound accesses caused by malicious - devices - -The maximum number of configurations and interfaces are fixed but there is -no out-of-bound checking to prevent a malicious USB device to report large -values for these and cause accesses outside the arrays' memory. - -Fixes: CVE-2020-25647 - -Reported-by: Joseph Tartaro -Reported-by: Ilja Van Sprundel -Signed-off-by: Javier Martinez Canillas -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/bus/usb/usb.c | 15 ++++++++++++--- - include/grub/usb.h | 10 +++++++--- - 2 files changed, 19 insertions(+), 6 deletions(-) - -diff --git a/grub-core/bus/usb/usb.c b/grub-core/bus/usb/usb.c -index 8da5e4c..7cb3cc2 100644 ---- a/grub-core/bus/usb/usb.c -+++ b/grub-core/bus/usb/usb.c -@@ -75,6 +75,9 @@ grub_usb_controller_iterate (grub_usb_controller_iterate_hook_t hook, - grub_usb_err_t - grub_usb_clear_halt (grub_usb_device_t dev, int endpoint) - { -+ if (endpoint >= GRUB_USB_MAX_TOGGLE) -+ return GRUB_USB_ERR_BADDEVICE; -+ - dev->toggle[endpoint] = 0; - return grub_usb_control_msg (dev, (GRUB_USB_REQTYPE_OUT - | GRUB_USB_REQTYPE_STANDARD -@@ -134,10 +137,10 @@ grub_usb_device_initialize (grub_usb_device_t dev) - return err; - descdev = &dev->descdev; - -- for (i = 0; i < 8; i++) -+ for (i = 0; i < GRUB_USB_MAX_CONF; i++) - dev->config[i].descconf = NULL; - -- if (descdev->configcnt == 0) -+ if (descdev->configcnt == 0 || descdev->configcnt > GRUB_USB_MAX_CONF) - { - err = GRUB_USB_ERR_BADDEVICE; - goto fail; -@@ -172,6 +175,12 @@ grub_usb_device_initialize (grub_usb_device_t dev) - /* Skip the configuration descriptor. */ - pos = dev->config[i].descconf->length; - -+ if (dev->config[i].descconf->numif > GRUB_USB_MAX_IF) -+ { -+ err = GRUB_USB_ERR_BADDEVICE; -+ goto fail; -+ } -+ - /* Read all interfaces. */ - for (currif = 0; currif < dev->config[i].descconf->numif; currif++) - { -@@ -217,7 +226,7 @@ grub_usb_device_initialize (grub_usb_device_t dev) - - fail: - -- for (i = 0; i < 8; i++) -+ for (i = 0; i < GRUB_USB_MAX_CONF; i++) - grub_free (dev->config[i].descconf); - - return err; -diff --git a/include/grub/usb.h b/include/grub/usb.h -index 512ae1d..6475c55 100644 ---- a/include/grub/usb.h -+++ b/include/grub/usb.h -@@ -23,6 +23,10 @@ - #include - #include - -+#define GRUB_USB_MAX_CONF 8 -+#define GRUB_USB_MAX_IF 32 -+#define GRUB_USB_MAX_TOGGLE 256 -+ - typedef struct grub_usb_device *grub_usb_device_t; - typedef struct grub_usb_controller *grub_usb_controller_t; - typedef struct grub_usb_controller_dev *grub_usb_controller_dev_t; -@@ -167,7 +171,7 @@ struct grub_usb_configuration - struct grub_usb_desc_config *descconf; - - /* Interfaces associated to this configuration. */ -- struct grub_usb_interface interf[32]; -+ struct grub_usb_interface interf[GRUB_USB_MAX_IF]; - }; - - struct grub_usb_hub_port -@@ -191,7 +195,7 @@ struct grub_usb_device - struct grub_usb_controller controller; - - /* Device configurations (after opening the device). */ -- struct grub_usb_configuration config[8]; -+ struct grub_usb_configuration config[GRUB_USB_MAX_CONF]; - - /* Device address. */ - int addr; -@@ -203,7 +207,7 @@ struct grub_usb_device - int initialized; - - /* Data toggle values (used for bulk transfers only). */ -- int toggle[256]; -+ int toggle[GRUB_USB_MAX_TOGGLE]; - - /* Used by libusb wrapper. Schedulded for removal. */ - void *data; --- -2.14.2 - diff --git a/boot/grub2/0049-mmap-Fix-memory-leak-when-iterating-over-mapped-memo.patch b/boot/grub2/0049-mmap-Fix-memory-leak-when-iterating-over-mapped-memo.patch deleted file mode 100644 index f443f190279..00000000000 --- a/boot/grub2/0049-mmap-Fix-memory-leak-when-iterating-over-mapped-memo.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 8cb2848f9699642a698af84b12ba187cab722031 Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Thu, 3 Dec 2020 14:39:45 +0000 -Subject: [PATCH] mmap: Fix memory leak when iterating over mapped memory - -When returning from grub_mmap_iterate() the memory allocated to present -is not being released causing it to leak. - -Fixes: CID 96655 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/mmap/mmap.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/grub-core/mmap/mmap.c b/grub-core/mmap/mmap.c -index 7ebf32e..8bf235f 100644 ---- a/grub-core/mmap/mmap.c -+++ b/grub-core/mmap/mmap.c -@@ -270,6 +270,7 @@ grub_mmap_iterate (grub_memory_hook_t hook, void *hook_data) - hook_data)) - { - grub_free (ctx.scanline_events); -+ grub_free (present); - return GRUB_ERR_NONE; - } - -@@ -282,6 +283,7 @@ grub_mmap_iterate (grub_memory_hook_t hook, void *hook_data) - } - - grub_free (ctx.scanline_events); -+ grub_free (present); - return GRUB_ERR_NONE; - } - --- -2.14.2 - diff --git a/boot/grub2/0050-net-net-Fix-possible-dereference-to-of-a-NULL-pointe.patch b/boot/grub2/0050-net-net-Fix-possible-dereference-to-of-a-NULL-pointe.patch deleted file mode 100644 index 5a8cc6d191e..00000000000 --- a/boot/grub2/0050-net-net-Fix-possible-dereference-to-of-a-NULL-pointe.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 03f2515ae0c503406f1a99a2178405049c6555db Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Fri, 27 Nov 2020 15:10:26 +0000 -Subject: [PATCH] net/net: Fix possible dereference to of a NULL pointer - -It is always possible that grub_zalloc() could fail, so we should check for -a NULL return. Otherwise we run the risk of dereferencing a NULL pointer. - -Fixes: CID 296221 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/net/net.c | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/grub-core/net/net.c b/grub-core/net/net.c -index 38f19df..7c2cdf2 100644 ---- a/grub-core/net/net.c -+++ b/grub-core/net/net.c -@@ -86,8 +86,13 @@ 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_zalloc (LINK_LAYER_CACHE_SIZE -+ * sizeof (card->link_layer_table[0])); -+ if (card->link_layer_table == NULL) -+ return; -+ } -+ - entry = &(card->link_layer_table[card->new_ll_entry]); - entry->avail = 1; - grub_memcpy (&entry->ll_address, ll, sizeof (entry->ll_address)); --- -2.14.2 - diff --git a/boot/grub2/0051-net-tftp-Fix-dangling-memory-pointer.patch b/boot/grub2/0051-net-tftp-Fix-dangling-memory-pointer.patch deleted file mode 100644 index cc3983ea9c0..00000000000 --- a/boot/grub2/0051-net-tftp-Fix-dangling-memory-pointer.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 0cb838b281a68b536a09681f9557ea6a7ac5da7a Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Fri, 19 Feb 2021 17:12:23 +0000 -Subject: [PATCH] net/tftp: Fix dangling memory pointer - -The static code analysis tool, Parfait, reported that the valid of -file->data was left referencing memory that was freed by the call to -grub_free(data) where data was initialized from file->data. - -To ensure that there is no unintentional access to this memory -referenced by file->data we should set the pointer to NULL. - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/net/tftp.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c -index b4297bc..c106704 100644 ---- a/grub-core/net/tftp.c -+++ b/grub-core/net/tftp.c -@@ -406,6 +406,7 @@ tftp_close (struct grub_file *file) - grub_net_udp_close (data->sock); - } - grub_free (data); -+ file->data = NULL; - return GRUB_ERR_NONE; - } - --- -2.14.2 - diff --git a/boot/grub2/0052-kern-parser-Fix-resource-leak-if-argc-0.patch b/boot/grub2/0052-kern-parser-Fix-resource-leak-if-argc-0.patch deleted file mode 100644 index dd01092d29c..00000000000 --- a/boot/grub2/0052-kern-parser-Fix-resource-leak-if-argc-0.patch +++ /dev/null @@ -1,51 +0,0 @@ -From d06161b035dde4769199ad65aa0a587a5920012b Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Fri, 22 Jan 2021 12:32:41 +0000 -Subject: [PATCH] kern/parser: Fix resource leak if argc == 0 - -After processing the command-line yet arriving at the point where we are -setting argv, we are allocating memory, even if argc == 0, which makes -no sense since we never put anything into the allocated argv. - -The solution is to simply return that we've successfully processed the -arguments but that argc == 0, and also ensure that argv is NULL when -we're not allocating anything in it. - -There are only 2 callers of this function, and both are handling a zero -value in argc assuming nothing is allocated in argv. - -Fixes: CID 96680 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/kern/parser.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/grub-core/kern/parser.c b/grub-core/kern/parser.c -index 619db31..d1cf061 100644 ---- a/grub-core/kern/parser.c -+++ b/grub-core/kern/parser.c -@@ -146,6 +146,7 @@ grub_parser_split_cmdline (const char *cmdline, - int i; - - *argc = 0; -+ *argv = NULL; - do - { - if (!rd || !*rd) -@@ -207,6 +208,10 @@ grub_parser_split_cmdline (const char *cmdline, - (*argc)++; - } - -+ /* If there are no args, then we're done. */ -+ if (!*argc) -+ return 0; -+ - /* Reserve memory for the return values. */ - args = grub_malloc (bp - buffer); - if (!args) --- -2.14.2 - diff --git a/boot/grub2/0053-kern-efi-Fix-memory-leak-on-failure.patch b/boot/grub2/0053-kern-efi-Fix-memory-leak-on-failure.patch deleted file mode 100644 index e2c49979600..00000000000 --- a/boot/grub2/0053-kern-efi-Fix-memory-leak-on-failure.patch +++ /dev/null @@ -1,31 +0,0 @@ -From ed286ceba6015d37a9304f04602451c47bf195d7 Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Thu, 5 Nov 2020 10:15:25 +0000 -Subject: [PATCH] kern/efi: Fix memory leak on failure - -Free the memory allocated to name before returning on failure. - -Fixes: CID 296222 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/kern/efi/efi.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c -index 9cfd88d..4fc14d6 100644 ---- a/grub-core/kern/efi/efi.c -+++ b/grub-core/kern/efi/efi.c -@@ -388,6 +388,7 @@ grub_efi_get_filename (grub_efi_device_path_t *dp0) - { - grub_error (GRUB_ERR_OUT_OF_RANGE, - "malformed EFI Device Path node has length=%d", len); -+ grub_free (name); - return NULL; - } - --- -2.14.2 - diff --git a/boot/grub2/0054-kern-efi-mm-Fix-possible-NULL-pointer-dereference.patch b/boot/grub2/0054-kern-efi-mm-Fix-possible-NULL-pointer-dereference.patch deleted file mode 100644 index 04ef9fc686c..00000000000 --- a/boot/grub2/0054-kern-efi-mm-Fix-possible-NULL-pointer-dereference.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 6aee4bfd6973c714056fb7b56890b8d524e94ee1 Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Fri, 11 Dec 2020 15:03:13 +0000 -Subject: [PATCH] kern/efi/mm: Fix possible NULL pointer dereference - -The model of grub_efi_get_memory_map() is that if memory_map is NULL, -then the purpose is to discover how much memory should be allocated to -it for the subsequent call. - -The problem here is that with grub_efi_is_finished set to 1, there is no -check at all that the function is being called with a non-NULL memory_map. - -While this MAY be true, we shouldn't assume it. - -The solution to this is to behave as expected, and if memory_map is NULL, -then don't try to use it and allow memory_map_size to be filled in, and -return 0 as is done later in the code if the buffer is too small (or NULL). - -Additionally, drop unneeded ret = 1. - -Fixes: CID 96632 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/kern/efi/mm.c | 19 ++++++++++++++----- - 1 file changed, 14 insertions(+), 5 deletions(-) - -diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c -index b02fab1..5afcef7 100644 ---- a/grub-core/kern/efi/mm.c -+++ b/grub-core/kern/efi/mm.c -@@ -328,15 +328,24 @@ grub_efi_get_memory_map (grub_efi_uintn_t *memory_map_size, - if (grub_efi_is_finished) - { - int ret = 1; -- if (*memory_map_size < finish_mmap_size) -+ -+ if (memory_map != NULL) - { -- grub_memcpy (memory_map, finish_mmap_buf, *memory_map_size); -- ret = 0; -+ if (*memory_map_size < finish_mmap_size) -+ { -+ grub_memcpy (memory_map, finish_mmap_buf, *memory_map_size); -+ ret = 0; -+ } -+ else -+ grub_memcpy (memory_map, finish_mmap_buf, finish_mmap_size); - } - else - { -- grub_memcpy (memory_map, finish_mmap_buf, finish_mmap_size); -- ret = 1; -+ /* -+ * Incomplete, no buffer to copy into, same as -+ * GRUB_EFI_BUFFER_TOO_SMALL below. -+ */ -+ ret = 0; - } - *memory_map_size = finish_mmap_size; - if (map_key) --- -2.14.2 - diff --git a/boot/grub2/0055-gnulib-regexec-Resolve-unused-variable.patch b/boot/grub2/0055-gnulib-regexec-Resolve-unused-variable.patch deleted file mode 100644 index 99e13546624..00000000000 --- a/boot/grub2/0055-gnulib-regexec-Resolve-unused-variable.patch +++ /dev/null @@ -1,90 +0,0 @@ -From a983d36bd9178d377d2072fd4b11c635fdc404b4 Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Wed, 21 Oct 2020 14:41:27 +0000 -Subject: [PATCH] gnulib/regexec: Resolve unused variable - -This is a really minor issue where a variable is being assigned to but -not checked before it is overwritten again. - -The reason for this issue is that we are not building with DEBUG set and -this in turn means that the assert() that reads the value of the -variable match_last is being processed out. - -The solution, move the assignment to match_last in to an ifdef DEBUG too. - -Fixes: CID 292459 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -[Add changes to generated files] -Signed-off-by: Stefan Sørensen ---- - Makefile.in | 1 + - conf/Makefile.extra-dist | 1 + - grub-core/lib/gnulib-patches/fix-unused-value.patch | 14 ++++++++++++++ - grub-core/lib/gnulib/regexec.c | 4 ++++ - 4 files changed, 20 insertions(+) - create mode 100644 grub-core/lib/gnulib-patches/fix-unused-value.patch - -diff --git a/Makefile.in b/Makefile.in -index ecb3278..e6b287b 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -2742,6 +2742,7 @@ EXTRA_DIST = autogen.sh geninit.sh gentpl.py Makefile.util.def \ - grub-core/gensyminfo.sh.in grub-core/gensymlist.sh \ - grub-core/genemuinit.sh grub-core/genemuinitheader.sh \ - grub-core/lib/gnulib-patches/fix-null-deref.patch \ -+ grub-core/lib/gnulib-patches/fix-unused-value.patch \ - grub-core/lib/gnulib-patches/fix-width.patch \ - grub-core/lib/gnulib-patches/no-abort.patch \ - grub-core/lib/libgcrypt \ -diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist -index 46c4e95..9b01152 100644 ---- a/conf/Makefile.extra-dist -+++ b/conf/Makefile.extra-dist -@@ -29,6 +29,7 @@ EXTRA_DIST += grub-core/genemuinit.sh - EXTRA_DIST += grub-core/genemuinitheader.sh - - EXTRA_DIST += grub-core/lib/gnulib-patches/fix-null-deref.patch -+EXTRA_DIST += grub-core/lib/gnulib-patches/fix-unused-value.patch - EXTRA_DIST += grub-core/lib/gnulib-patches/fix-width.patch - EXTRA_DIST += grub-core/lib/gnulib-patches/no-abort.patch - -diff --git a/grub-core/lib/gnulib-patches/fix-unused-value.patch b/grub-core/lib/gnulib-patches/fix-unused-value.patch -new file mode 100644 -index 0000000..ba51f1b ---- /dev/null -+++ b/grub-core/lib/gnulib-patches/fix-unused-value.patch -@@ -0,0 +1,14 @@ -+--- a/lib/regexec.c 2020-10-21 14:25:35.310195912 +0000 -++++ b/lib/regexec.c 2020-10-21 14:32:07.961765604 +0000 -+@@ -828,7 +828,11 @@ -+ break; -+ if (__glibc_unlikely (err != REG_NOMATCH)) -+ goto free_return; -++#ifdef DEBUG -++ /* Only used for assertion below when DEBUG is set, otherwise -++ it will be over-written when we loop around. */ -+ match_last = -1; -++#endif -+ } -+ else -+ break; /* We found a match. */ -diff --git a/grub-core/lib/gnulib/regexec.c b/grub-core/lib/gnulib/regexec.c -index 21cf791..98a25f5 100644 ---- a/grub-core/lib/gnulib/regexec.c -+++ b/grub-core/lib/gnulib/regexec.c -@@ -828,6 +828,10 @@ re_search_internal (const regex_t *preg, const char *string, Idx length, - break; - if (__glibc_unlikely (err != REG_NOMATCH)) - goto free_return; -+#ifdef DEBUG -+ /* Only used for assertion below when DEBUG is set, otherwise -+ it will be over-written when we loop around. */ -+#endif - match_last = -1; - } - else --- -2.14.2 - diff --git a/boot/grub2/0056-gnulib-regcomp-Fix-uninitialized-token-structure.patch b/boot/grub2/0056-gnulib-regcomp-Fix-uninitialized-token-structure.patch deleted file mode 100644 index 24645615d09..00000000000 --- a/boot/grub2/0056-gnulib-regcomp-Fix-uninitialized-token-structure.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 75c3d3cec4f408848f575d6d5e30a95bd6313db0 Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Thu, 22 Oct 2020 13:54:06 +0000 -Subject: [PATCH] gnulib/regcomp: Fix uninitialized token structure - -The code is assuming that the value of br_token.constraint was -initialized to zero when it wasn't. - -While some compilers will ensure that, not all do, so it is better to -fix this explicitly than leave it to chance. - -Fixes: CID 73749 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -[Add changes to generated files] -Signed-off-by: Stefan Sørensen ---- - Makefile.in | 1 + - conf/Makefile.extra-dist | 1 + - grub-core/lib/gnulib-patches/fix-uninit-structure.patch | 11 +++++++++++ - grub-core/lib/gnulib/regcomp.c | 2 +- - 4 files changed, 14 insertions(+), 1 deletion(-) - create mode 100644 grub-core/lib/gnulib-patches/fix-uninit-structure.patch - -diff --git a/Makefile.in b/Makefile.in -index e6b287b..d58a7d7 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -2742,6 +2742,7 @@ EXTRA_DIST = autogen.sh geninit.sh gentpl.py Makefile.util.def \ - grub-core/gensyminfo.sh.in grub-core/gensymlist.sh \ - grub-core/genemuinit.sh grub-core/genemuinitheader.sh \ - grub-core/lib/gnulib-patches/fix-null-deref.patch \ -+ grub-core/lib/gnulib-patches/fix-uninit-structure.patch \ - grub-core/lib/gnulib-patches/fix-unused-value.patch \ - grub-core/lib/gnulib-patches/fix-width.patch \ - grub-core/lib/gnulib-patches/no-abort.patch \ -diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist -index 9b01152..9e55458 100644 ---- a/conf/Makefile.extra-dist -+++ b/conf/Makefile.extra-dist -@@ -29,6 +29,7 @@ EXTRA_DIST += grub-core/genemuinit.sh - EXTRA_DIST += grub-core/genemuinitheader.sh - - EXTRA_DIST += grub-core/lib/gnulib-patches/fix-null-deref.patch -+EXTRA_DIST += grub-core/lib/gnulib-patches/fix-uninit-structure.patch - EXTRA_DIST += grub-core/lib/gnulib-patches/fix-unused-value.patch - EXTRA_DIST += grub-core/lib/gnulib-patches/fix-width.patch - EXTRA_DIST += grub-core/lib/gnulib-patches/no-abort.patch -diff --git a/grub-core/lib/gnulib-patches/fix-uninit-structure.patch b/grub-core/lib/gnulib-patches/fix-uninit-structure.patch -new file mode 100644 -index 0000000..7b4d9f6 ---- /dev/null -+++ b/grub-core/lib/gnulib-patches/fix-uninit-structure.patch -@@ -0,0 +1,11 @@ -+--- a/lib/regcomp.c 2020-10-22 13:49:06.770168928 +0000 -++++ b/lib/regcomp.c 2020-10-22 13:50:37.026528298 +0000 -+@@ -3662,7 +3662,7 @@ -+ Idx alloc = 0; -+ #endif /* not RE_ENABLE_I18N */ -+ reg_errcode_t ret; -+- re_token_t br_token; -++ re_token_t br_token = {0}; -+ bin_tree_t *tree; -+ -+ sbcset = (re_bitset_ptr_t) calloc (sizeof (bitset_t), 1); -diff --git a/grub-core/lib/gnulib/regcomp.c b/grub-core/lib/gnulib/regcomp.c -index fe7dfcb..2545d3e 100644 ---- a/grub-core/lib/gnulib/regcomp.c -+++ b/grub-core/lib/gnulib/regcomp.c -@@ -3662,7 +3662,7 @@ build_charclass_op (re_dfa_t *dfa, RE_TRANSLATE_TYPE trans, - Idx alloc = 0; - #endif /* not RE_ENABLE_I18N */ - reg_errcode_t ret; -- re_token_t br_token; -+ re_token_t br_token = {0}; - bin_tree_t *tree; - - sbcset = (re_bitset_ptr_t) calloc (sizeof (bitset_t), 1); --- -2.14.2 - diff --git a/boot/grub2/0057-gnulib-argp-help-Fix-dereference-of-a-possibly-NULL-.patch b/boot/grub2/0057-gnulib-argp-help-Fix-dereference-of-a-possibly-NULL-.patch deleted file mode 100644 index 34c630bf079..00000000000 --- a/boot/grub2/0057-gnulib-argp-help-Fix-dereference-of-a-possibly-NULL-.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 3a37bf120a9194c373257c70175cdb5b337bc107 Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Wed, 28 Oct 2020 14:43:01 +0000 -Subject: [PATCH] gnulib/argp-help: Fix dereference of a possibly NULL state - -All other instances of call to __argp_failure() where there is -a dgettext() call is first checking whether state is NULL before -attempting to dereference it to get the root_argp->argp_domain. - -Fixes: CID 292436 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -[Add changes to generated files] -Signed-off-by: Stefan Sørensen ---- - Makefile.in | 1 + - conf/Makefile.extra-dist | 1 + - grub-core/lib/gnulib-patches/fix-null-state-deref.patch | 12 ++++++++++++ - grub-core/lib/gnulib/argp-help.c | 3 ++- - 4 files changed, 16 insertions(+), 1 deletion(-) - create mode 100644 grub-core/lib/gnulib-patches/fix-null-state-deref.patch - -diff --git a/Makefile.in b/Makefile.in -index d58a7d7..812b7c2 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -2742,6 +2742,7 @@ EXTRA_DIST = autogen.sh geninit.sh gentpl.py Makefile.util.def \ - grub-core/gensyminfo.sh.in grub-core/gensymlist.sh \ - grub-core/genemuinit.sh grub-core/genemuinitheader.sh \ - grub-core/lib/gnulib-patches/fix-null-deref.patch \ -+ grub-core/lib/gnulib-patches/fix-null-state-deref.patch \ - grub-core/lib/gnulib-patches/fix-uninit-structure.patch \ - grub-core/lib/gnulib-patches/fix-unused-value.patch \ - grub-core/lib/gnulib-patches/fix-width.patch \ -diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist -index 9e55458..96d7e69 100644 ---- a/conf/Makefile.extra-dist -+++ b/conf/Makefile.extra-dist -@@ -29,6 +29,7 @@ EXTRA_DIST += grub-core/genemuinit.sh - EXTRA_DIST += grub-core/genemuinitheader.sh - - EXTRA_DIST += grub-core/lib/gnulib-patches/fix-null-deref.patch -+EXTRA_DIST += grub-core/lib/gnulib-patches/fix-null-state-deref.patch - EXTRA_DIST += grub-core/lib/gnulib-patches/fix-uninit-structure.patch - EXTRA_DIST += grub-core/lib/gnulib-patches/fix-unused-value.patch - EXTRA_DIST += grub-core/lib/gnulib-patches/fix-width.patch -diff --git a/grub-core/lib/gnulib-patches/fix-null-state-deref.patch b/grub-core/lib/gnulib-patches/fix-null-state-deref.patch -new file mode 100644 -index 0000000..813ec09 ---- /dev/null -+++ b/grub-core/lib/gnulib-patches/fix-null-state-deref.patch -@@ -0,0 +1,12 @@ -+--- a/lib/argp-help.c 2020-10-28 14:32:19.189215988 +0000 -++++ b/lib/argp-help.c 2020-10-28 14:38:21.204673940 +0000 -+@@ -145,7 +145,8 @@ -+ if (*(int *)((char *)upptr + up->uparams_offs) >= upptr->rmargin) -+ { -+ __argp_failure (state, 0, 0, -+- dgettext (state->root_argp->argp_domain, -++ dgettext (state == NULL ? NULL -++ : state->root_argp->argp_domain, -+ "\ -+ ARGP_HELP_FMT: %s value is less than or equal to %s"), -+ "rmargin", up->name); -diff --git a/grub-core/lib/gnulib/argp-help.c b/grub-core/lib/gnulib/argp-help.c -index 5d8f451..c75568c 100644 ---- a/grub-core/lib/gnulib/argp-help.c -+++ b/grub-core/lib/gnulib/argp-help.c -@@ -145,7 +145,8 @@ validate_uparams (const struct argp_state *state, struct uparams *upptr) - if (*(int *)((char *)upptr + up->uparams_offs) >= upptr->rmargin) - { - __argp_failure (state, 0, 0, -- dgettext (state->root_argp->argp_domain, -+ dgettext (state == NULL ? NULL -+ : state->root_argp->argp_domain, - "\ - ARGP_HELP_FMT: %s value is less than or equal to %s"), - "rmargin", up->name); --- -2.14.2 - diff --git a/boot/grub2/0058-gnulib-regexec-Fix-possible-null-dereference.patch b/boot/grub2/0058-gnulib-regexec-Fix-possible-null-dereference.patch deleted file mode 100644 index 0ced54ae96f..00000000000 --- a/boot/grub2/0058-gnulib-regexec-Fix-possible-null-dereference.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 0b7f347638153e403ee2dd518af3ce26f4f99647 Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Thu, 5 Nov 2020 10:57:14 +0000 -Subject: [PATCH] gnulib/regexec: Fix possible null-dereference - -It appears to be possible that the mctx->state_log field may be NULL, -and the name of this function, clean_state_log_if_needed(), suggests -that it should be checking that it is valid to be cleaned before -assuming that it does. - -Fixes: CID 86720 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -[Add changes to generated files] -Signed-off-by: Stefan Sørensen ---- - Makefile.in | 1 + - conf/Makefile.extra-dist | 1 + - grub-core/lib/gnulib-patches/fix-regexec-null-deref.patch | 12 ++++++++++++ - grub-core/lib/gnulib/regexec.c | 3 +++ - 4 files changed, 17 insertions(+) - create mode 100644 grub-core/lib/gnulib-patches/fix-regexec-null-deref.patch - -diff --git a/Makefile.in b/Makefile.in -index 812b7c2..d9da6e9 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -2743,6 +2743,7 @@ EXTRA_DIST = autogen.sh geninit.sh gentpl.py Makefile.util.def \ - grub-core/genemuinit.sh grub-core/genemuinitheader.sh \ - grub-core/lib/gnulib-patches/fix-null-deref.patch \ - grub-core/lib/gnulib-patches/fix-null-state-deref.patch \ -+ grub-core/lib/gnulib-patches/fix-regexec-null-deref.patch \ - grub-core/lib/gnulib-patches/fix-uninit-structure.patch \ - grub-core/lib/gnulib-patches/fix-unused-value.patch \ - grub-core/lib/gnulib-patches/fix-width.patch \ -diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist -index 96d7e69..d27d3a9 100644 ---- a/conf/Makefile.extra-dist -+++ b/conf/Makefile.extra-dist -@@ -30,6 +30,7 @@ EXTRA_DIST += grub-core/genemuinitheader.sh - - EXTRA_DIST += grub-core/lib/gnulib-patches/fix-null-deref.patch - EXTRA_DIST += grub-core/lib/gnulib-patches/fix-null-state-deref.patch -+EXTRA_DIST += grub-core/lib/gnulib-patches/fix-regexec-null-deref.patch - EXTRA_DIST += grub-core/lib/gnulib-patches/fix-uninit-structure.patch - EXTRA_DIST += grub-core/lib/gnulib-patches/fix-unused-value.patch - EXTRA_DIST += grub-core/lib/gnulib-patches/fix-width.patch -diff --git a/grub-core/lib/gnulib-patches/fix-regexec-null-deref.patch b/grub-core/lib/gnulib-patches/fix-regexec-null-deref.patch -new file mode 100644 -index 0000000..db6dac9 ---- /dev/null -+++ b/grub-core/lib/gnulib-patches/fix-regexec-null-deref.patch -@@ -0,0 +1,12 @@ -+--- a/lib/regexec.c 2020-10-21 14:25:35.310195912 +0000 -++++ b/lib/regexec.c 2020-11-05 10:55:09.621542984 +0000 -+@@ -1692,6 +1692,9 @@ -+ { -+ Idx top = mctx->state_log_top; -+ -++ if (mctx->state_log == NULL) -++ return REG_NOERROR; -++ -+ if ((next_state_log_idx >= mctx->input.bufs_len -+ && mctx->input.bufs_len < mctx->input.len) -+ || (next_state_log_idx >= mctx->input.valid_len -diff --git a/grub-core/lib/gnulib/regexec.c b/grub-core/lib/gnulib/regexec.c -index 98a25f5..df97667 100644 ---- a/grub-core/lib/gnulib/regexec.c -+++ b/grub-core/lib/gnulib/regexec.c -@@ -1696,6 +1696,9 @@ clean_state_log_if_needed (re_match_context_t *mctx, Idx next_state_log_idx) - { - Idx top = mctx->state_log_top; - -+ if (mctx->state_log == NULL) -+ return REG_NOERROR; -+ - if ((next_state_log_idx >= mctx->input.bufs_len - && mctx->input.bufs_len < mctx->input.len) - || (next_state_log_idx >= mctx->input.valid_len --- -2.14.2 - diff --git a/boot/grub2/0059-gnulib-regcomp-Fix-uninitialized-re_token.patch b/boot/grub2/0059-gnulib-regcomp-Fix-uninitialized-re_token.patch deleted file mode 100644 index ecdc93c8cde..00000000000 --- a/boot/grub2/0059-gnulib-regcomp-Fix-uninitialized-re_token.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 03477085f9a33789ba6cca7cd49ab9326a1baa0e Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Tue, 24 Nov 2020 18:04:22 +0000 -Subject: [PATCH] gnulib/regcomp: Fix uninitialized re_token - -This issue has been fixed in the latest version of gnulib, so to -maintain consistency, I've backported that change rather than doing -something different. - -Fixes: CID 73828 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -[Add changes to generated files] -Signed-off-by: Stefan Sørensen ---- - Makefile.in | 1 + - conf/Makefile.extra-dist | 1 + - .../lib/gnulib-patches/fix-regcomp-uninit-token.patch | 15 +++++++++++++++ - grub-core/lib/gnulib/regcomp.c | 6 +----- - 4 files changed, 18 insertions(+), 5 deletions(-) - create mode 100644 grub-core/lib/gnulib-patches/fix-regcomp-uninit-token.patch - -diff --git a/Makefile.in b/Makefile.in -index d9da6e9..9442504 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -2743,6 +2743,7 @@ EXTRA_DIST = autogen.sh geninit.sh gentpl.py Makefile.util.def \ - grub-core/genemuinit.sh grub-core/genemuinitheader.sh \ - grub-core/lib/gnulib-patches/fix-null-deref.patch \ - grub-core/lib/gnulib-patches/fix-null-state-deref.patch \ -+ grub-core/lib/gnulib-patches/fix-regcomp-uninit-token.patch \ - grub-core/lib/gnulib-patches/fix-regexec-null-deref.patch \ - grub-core/lib/gnulib-patches/fix-uninit-structure.patch \ - grub-core/lib/gnulib-patches/fix-unused-value.patch \ -diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist -index d27d3a9..ffe6829 100644 ---- a/conf/Makefile.extra-dist -+++ b/conf/Makefile.extra-dist -@@ -30,6 +30,7 @@ EXTRA_DIST += grub-core/genemuinitheader.sh - - EXTRA_DIST += grub-core/lib/gnulib-patches/fix-null-deref.patch - EXTRA_DIST += grub-core/lib/gnulib-patches/fix-null-state-deref.patch -+EXTRA_DIST += grub-core/lib/gnulib-patches/fix-regcomp-uninit-token.patch - EXTRA_DIST += grub-core/lib/gnulib-patches/fix-regexec-null-deref.patch - EXTRA_DIST += grub-core/lib/gnulib-patches/fix-uninit-structure.patch - EXTRA_DIST += grub-core/lib/gnulib-patches/fix-unused-value.patch -diff --git a/grub-core/lib/gnulib-patches/fix-regcomp-uninit-token.patch b/grub-core/lib/gnulib-patches/fix-regcomp-uninit-token.patch -new file mode 100644 -index 0000000..02e0631 ---- /dev/null -+++ b/grub-core/lib/gnulib-patches/fix-regcomp-uninit-token.patch -@@ -0,0 +1,15 @@ -+--- a/lib/regcomp.c 2020-11-24 17:06:08.159223858 +0000 -++++ b/lib/regcomp.c 2020-11-24 17:06:15.630253923 +0000 -+@@ -3808,11 +3808,7 @@ -+ create_tree (re_dfa_t *dfa, bin_tree_t *left, bin_tree_t *right, -+ re_token_type_t type) -+ { -+- re_token_t t; -+-#if defined GCC_LINT || defined lint -+- memset (&t, 0, sizeof t); -+-#endif -+- t.type = type; -++ re_token_t t = { .type = type }; -+ return create_token_tree (dfa, left, right, &t); -+ } -+ -diff --git a/grub-core/lib/gnulib/regcomp.c b/grub-core/lib/gnulib/regcomp.c -index 2545d3e..64a4fa7 100644 ---- a/grub-core/lib/gnulib/regcomp.c -+++ b/grub-core/lib/gnulib/regcomp.c -@@ -3808,11 +3808,7 @@ static bin_tree_t * - create_tree (re_dfa_t *dfa, bin_tree_t *left, bin_tree_t *right, - re_token_type_t type) - { -- re_token_t t; --#if defined GCC_LINT || defined lint -- memset (&t, 0, sizeof t); --#endif -- t.type = type; -+ re_token_t t = { .type = type }; - return create_token_tree (dfa, left, right, &t); - } - --- -2.14.2 - diff --git a/boot/grub2/0060-io-lzopio-Resolve-unnecessary-self-assignment-errors.patch b/boot/grub2/0060-io-lzopio-Resolve-unnecessary-self-assignment-errors.patch deleted file mode 100644 index cc6b217245e..00000000000 --- a/boot/grub2/0060-io-lzopio-Resolve-unnecessary-self-assignment-errors.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 59666e520f44177c97b82a44c169b3b315d63b42 Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Wed, 21 Oct 2020 14:44:10 +0000 -Subject: [PATCH] io/lzopio: Resolve unnecessary self-assignment errors - -These 2 assignments are unnecessary since they are just assigning -to themselves. - -Fixes: CID 73643 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/io/lzopio.c | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/grub-core/io/lzopio.c b/grub-core/io/lzopio.c -index 3014485..a7d4425 100644 ---- a/grub-core/io/lzopio.c -+++ b/grub-core/io/lzopio.c -@@ -125,8 +125,6 @@ read_block_header (struct grub_lzopio *lzopio) - sizeof (lzopio->block.ucheck)) != - sizeof (lzopio->block.ucheck)) - return -1; -- -- lzopio->block.ucheck = lzopio->block.ucheck; - } - - /* Read checksum of compressed data. */ -@@ -143,8 +141,6 @@ read_block_header (struct grub_lzopio *lzopio) - sizeof (lzopio->block.ccheck)) != - sizeof (lzopio->block.ccheck)) - return -1; -- -- lzopio->block.ccheck = lzopio->block.ccheck; - } - } - --- -2.14.2 - diff --git a/boot/grub2/0061-zstd-Initialize-seq_t-structure-fully.patch b/boot/grub2/0061-zstd-Initialize-seq_t-structure-fully.patch deleted file mode 100644 index 5e1752b3a51..00000000000 --- a/boot/grub2/0061-zstd-Initialize-seq_t-structure-fully.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 2777cf4466719921dbe4b30af358a75e7d76f217 Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Thu, 5 Nov 2020 10:29:59 +0000 -Subject: [PATCH] zstd: Initialize seq_t structure fully - -While many compilers will initialize this to zero, not all will, so it -is better to be sure that fields not being explicitly set are at known -values, and there is code that checks this fields value elsewhere in the -code. - -Fixes: CID 292440 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/lib/zstd/zstd_decompress.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/grub-core/lib/zstd/zstd_decompress.c b/grub-core/lib/zstd/zstd_decompress.c -index 711b5b6..e4b5670 100644 ---- a/grub-core/lib/zstd/zstd_decompress.c -+++ b/grub-core/lib/zstd/zstd_decompress.c -@@ -1325,7 +1325,7 @@ typedef enum { ZSTD_lo_isRegularOffset, ZSTD_lo_isLongOffset=1 } ZSTD_longOffset - FORCE_INLINE_TEMPLATE seq_t - ZSTD_decodeSequence(seqState_t* seqState, const ZSTD_longOffset_e longOffsets) - { -- seq_t seq; -+ seq_t seq = {0}; - U32 const llBits = seqState->stateLL.table[seqState->stateLL.state].nbAdditionalBits; - U32 const mlBits = seqState->stateML.table[seqState->stateML.state].nbAdditionalBits; - U32 const ofBits = seqState->stateOffb.table[seqState->stateOffb.state].nbAdditionalBits; --- -2.14.2 - diff --git a/boot/grub2/0062-kern-partition-Check-for-NULL-before-dereferencing-i.patch b/boot/grub2/0062-kern-partition-Check-for-NULL-before-dereferencing-i.patch deleted file mode 100644 index 431d45fd171..00000000000 --- a/boot/grub2/0062-kern-partition-Check-for-NULL-before-dereferencing-i.patch +++ /dev/null @@ -1,44 +0,0 @@ -From bc9c468a2ce84bc767234eec888b71f1bc744fff Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Fri, 23 Oct 2020 09:49:59 +0000 -Subject: [PATCH] kern/partition: Check for NULL before dereferencing input - string - -There is the possibility that the value of str comes from an external -source and continuing to use it before ever checking its validity is -wrong. So, needs fixing. - -Additionally, drop unneeded part initialization. - -Fixes: CID 292444 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/kern/partition.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/grub-core/kern/partition.c b/grub-core/kern/partition.c -index e499147..b10a184 100644 ---- a/grub-core/kern/partition.c -+++ b/grub-core/kern/partition.c -@@ -109,11 +109,14 @@ grub_partition_map_probe (const grub_partition_map_t partmap, - grub_partition_t - grub_partition_probe (struct grub_disk *disk, const char *str) - { -- grub_partition_t part = 0; -+ grub_partition_t part; - grub_partition_t curpart = 0; - grub_partition_t tail; - const char *ptr; - -+ if (str == NULL) -+ return 0; -+ - part = tail = disk->partition; - - for (ptr = str; *ptr;) --- -2.14.2 - diff --git a/boot/grub2/0063-disk-ldm-Make-sure-comp-data-is-freed-before-exiting.patch b/boot/grub2/0063-disk-ldm-Make-sure-comp-data-is-freed-before-exiting.patch deleted file mode 100644 index 5bebd400f6c..00000000000 --- a/boot/grub2/0063-disk-ldm-Make-sure-comp-data-is-freed-before-exiting.patch +++ /dev/null @@ -1,129 +0,0 @@ -From 23e39f50ca7a107f6b66396ed4d177a914dee035 Mon Sep 17 00:00:00 2001 -From: Marco A Benatto -Date: Mon, 7 Dec 2020 11:53:03 -0300 -Subject: [PATCH] disk/ldm: Make sure comp data is freed before exiting from - make_vg() - -Several error handling paths in make_vg() do not free comp data before -jumping to fail2 label and returning from the function. This will leak -memory. So, let's fix all issues of that kind. - -Fixes: CID 73804 - -Signed-off-by: Marco A Benatto -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/disk/ldm.c | 51 ++++++++++++++++++++++++++++++++++++++++++++------- - 1 file changed, 44 insertions(+), 7 deletions(-) - -diff --git a/grub-core/disk/ldm.c b/grub-core/disk/ldm.c -index 58f8a53..428415f 100644 ---- a/grub-core/disk/ldm.c -+++ b/grub-core/disk/ldm.c -@@ -554,7 +554,11 @@ make_vg (grub_disk_t disk, - comp->segments = grub_calloc (comp->segment_alloc, - sizeof (*comp->segments)); - if (!comp->segments) -- goto fail2; -+ { -+ grub_free (comp->internal_id); -+ grub_free (comp); -+ goto fail2; -+ } - } - else - { -@@ -562,7 +566,11 @@ make_vg (grub_disk_t disk, - comp->segment_count = 1; - comp->segments = grub_malloc (sizeof (*comp->segments)); - if (!comp->segments) -- goto fail2; -+ { -+ grub_free (comp->internal_id); -+ grub_free (comp); -+ goto fail2; -+ } - comp->segments->start_extent = 0; - comp->segments->extent_count = lv->size; - comp->segments->layout = 0; -@@ -574,15 +582,26 @@ make_vg (grub_disk_t disk, - comp->segments->layout = GRUB_RAID_LAYOUT_SYMMETRIC_MASK; - } - else -- goto fail2; -+ { -+ grub_free (comp->segments); -+ grub_free (comp->internal_id); -+ grub_free (comp); -+ goto fail2; -+ } - ptr += *ptr + 1; - ptr++; - if (!(vblk[i].flags & 0x10)) -- goto fail2; -+ { -+ grub_free (comp->segments); -+ grub_free (comp->internal_id); -+ grub_free (comp); -+ goto fail2; -+ } - if (ptr >= vblk[i].dynamic + sizeof (vblk[i].dynamic) - || ptr + *ptr + 1 >= vblk[i].dynamic - + sizeof (vblk[i].dynamic)) - { -+ grub_free (comp->segments); - grub_free (comp->internal_id); - grub_free (comp); - goto fail2; -@@ -592,6 +611,7 @@ make_vg (grub_disk_t disk, - if (ptr + *ptr + 1 >= vblk[i].dynamic - + sizeof (vblk[i].dynamic)) - { -+ grub_free (comp->segments); - grub_free (comp->internal_id); - grub_free (comp); - goto fail2; -@@ -601,7 +621,12 @@ make_vg (grub_disk_t disk, - comp->segments->nodes = grub_calloc (comp->segments->node_alloc, - sizeof (*comp->segments->nodes)); - if (!lv->segments->nodes) -- goto fail2; -+ { -+ grub_free (comp->segments); -+ grub_free (comp->internal_id); -+ grub_free (comp); -+ goto fail2; -+ } - } - - if (lv->segments->node_alloc == lv->segments->node_count) -@@ -611,11 +636,23 @@ make_vg (grub_disk_t disk, - - if (grub_mul (lv->segments->node_alloc, 2, &lv->segments->node_alloc) || - grub_mul (lv->segments->node_alloc, sizeof (*lv->segments->nodes), &sz)) -- goto fail2; -+ { -+ grub_free (comp->segments->nodes); -+ grub_free (comp->segments); -+ grub_free (comp->internal_id); -+ grub_free (comp); -+ goto fail2; -+ } - - t = grub_realloc (lv->segments->nodes, sz); - if (!t) -- goto fail2; -+ { -+ grub_free (comp->segments->nodes); -+ grub_free (comp->segments); -+ grub_free (comp->internal_id); -+ grub_free (comp); -+ goto fail2; -+ } - lv->segments->nodes = t; - } - lv->segments->nodes[lv->segments->node_count].pv = 0; --- -2.14.2 - diff --git a/boot/grub2/0064-disk-ldm-If-failed-then-free-vg-variable-too.patch b/boot/grub2/0064-disk-ldm-If-failed-then-free-vg-variable-too.patch deleted file mode 100644 index 24417a16111..00000000000 --- a/boot/grub2/0064-disk-ldm-If-failed-then-free-vg-variable-too.patch +++ /dev/null @@ -1,29 +0,0 @@ -From e0b83df5da538d2a38f770e60817b3a4b9d5b4d7 Mon Sep 17 00:00:00 2001 -From: Paulo Flabiano Smorigo -Date: Mon, 7 Dec 2020 10:07:47 -0300 -Subject: [PATCH] disk/ldm: If failed then free vg variable too - -Fixes: CID 73809 - -Signed-off-by: Paulo Flabiano Smorigo -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/disk/ldm.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/grub-core/disk/ldm.c b/grub-core/disk/ldm.c -index 428415f..54713f4 100644 ---- a/grub-core/disk/ldm.c -+++ b/grub-core/disk/ldm.c -@@ -199,6 +199,7 @@ make_vg (grub_disk_t disk, - { - grub_free (vg->uuid); - grub_free (vg->name); -+ grub_free (vg); - return NULL; - } - grub_memcpy (vg->uuid, label->group_guid, LDM_GUID_STRLEN); --- -2.14.2 - diff --git a/boot/grub2/0065-disk-ldm-Fix-memory-leak-on-uninserted-lv-references.patch b/boot/grub2/0065-disk-ldm-Fix-memory-leak-on-uninserted-lv-references.patch deleted file mode 100644 index ee424e80140..00000000000 --- a/boot/grub2/0065-disk-ldm-Fix-memory-leak-on-uninserted-lv-references.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 156c281a1625dc73fd350530630c6f2d5673d4f6 Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Tue, 8 Dec 2020 10:00:51 +0000 -Subject: [PATCH] disk/ldm: Fix memory leak on uninserted lv references - -The problem here is that the memory allocated to the variable lv is not -yet inserted into the list that is being processed at the label fail2. - -As we can already see at line 342, which correctly frees lv before going -to fail2, we should also be doing that at these earlier jumps to fail2. - -Fixes: CID 73824 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/disk/ldm.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/grub-core/disk/ldm.c b/grub-core/disk/ldm.c -index 54713f4..e82e989 100644 ---- a/grub-core/disk/ldm.c -+++ b/grub-core/disk/ldm.c -@@ -321,7 +321,10 @@ make_vg (grub_disk_t disk, - lv->visible = 1; - lv->segments = grub_zalloc (sizeof (*lv->segments)); - if (!lv->segments) -- goto fail2; -+ { -+ grub_free (lv); -+ goto fail2; -+ } - lv->segments->start_extent = 0; - lv->segments->type = GRUB_DISKFILTER_MIRROR; - lv->segments->node_count = 0; -@@ -329,7 +332,10 @@ make_vg (grub_disk_t disk, - lv->segments->nodes = grub_calloc (lv->segments->node_alloc, - sizeof (*lv->segments->nodes)); - if (!lv->segments->nodes) -- goto fail2; -+ { -+ grub_free (lv); -+ goto fail2; -+ } - ptr = vblk[i].dynamic; - if (ptr + *ptr + 1 >= vblk[i].dynamic - + sizeof (vblk[i].dynamic)) --- -2.14.2 - diff --git a/boot/grub2/0066-disk-cryptodisk-Fix-potential-integer-overflow.patch b/boot/grub2/0066-disk-cryptodisk-Fix-potential-integer-overflow.patch deleted file mode 100644 index 781ebc180c1..00000000000 --- a/boot/grub2/0066-disk-cryptodisk-Fix-potential-integer-overflow.patch +++ /dev/null @@ -1,51 +0,0 @@ -From a201ad17caa430aa710654fdf2e6ab4c8166f031 Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Thu, 21 Jan 2021 11:38:31 +0000 -Subject: [PATCH] disk/cryptodisk: Fix potential integer overflow - -The encrypt and decrypt functions expect a grub_size_t. So, we need to -ensure that the constant bit shift is using grub_size_t rather than -unsigned int when it is performing the shift. - -Fixes: CID 307788 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/disk/cryptodisk.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c -index 5037768..6883f48 100644 ---- a/grub-core/disk/cryptodisk.c -+++ b/grub-core/disk/cryptodisk.c -@@ -311,10 +311,10 @@ grub_cryptodisk_endecrypt (struct grub_cryptodisk *dev, - case GRUB_CRYPTODISK_MODE_CBC: - if (do_encrypt) - err = grub_crypto_cbc_encrypt (dev->cipher, data + i, data + i, -- (1U << dev->log_sector_size), iv); -+ ((grub_size_t) 1 << dev->log_sector_size), iv); - else - err = grub_crypto_cbc_decrypt (dev->cipher, data + i, data + i, -- (1U << dev->log_sector_size), iv); -+ ((grub_size_t) 1 << dev->log_sector_size), iv); - if (err) - return err; - break; -@@ -322,10 +322,10 @@ grub_cryptodisk_endecrypt (struct grub_cryptodisk *dev, - case GRUB_CRYPTODISK_MODE_PCBC: - if (do_encrypt) - err = grub_crypto_pcbc_encrypt (dev->cipher, data + i, data + i, -- (1U << dev->log_sector_size), iv); -+ ((grub_size_t) 1 << dev->log_sector_size), iv); - else - err = grub_crypto_pcbc_decrypt (dev->cipher, data + i, data + i, -- (1U << dev->log_sector_size), iv); -+ ((grub_size_t) 1 << dev->log_sector_size), iv); - if (err) - return err; - break; --- -2.14.2 - diff --git a/boot/grub2/0067-hfsplus-Check-that-the-volume-name-length-is-valid.patch b/boot/grub2/0067-hfsplus-Check-that-the-volume-name-length-is-valid.patch deleted file mode 100644 index 78cff9b458d..00000000000 --- a/boot/grub2/0067-hfsplus-Check-that-the-volume-name-length-is-valid.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 2298f6e0d951251bb9ca97d891d1bc8b74515f8c Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Fri, 23 Oct 2020 17:09:31 +0000 -Subject: [PATCH] hfsplus: Check that the volume name length is valid - -HFS+ documentation suggests that the maximum filename and volume name is -255 Unicode characters in length. - -So, when converting from big-endian to little-endian, we should ensure -that the name of the volume has a length that is between 0 and 255, -inclusive. - -Fixes: CID 73641 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/fs/hfsplus.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/grub-core/fs/hfsplus.c b/grub-core/fs/hfsplus.c -index 9c4e4c8..8fe7c12 100644 ---- a/grub-core/fs/hfsplus.c -+++ b/grub-core/fs/hfsplus.c -@@ -1012,6 +1012,15 @@ grub_hfsplus_label (grub_device_t device, char **label) - grub_hfsplus_btree_recptr (&data->catalog_tree, node, ptr); - - label_len = grub_be_to_cpu16 (catkey->namelen); -+ -+ /* Ensure that the length is >= 0. */ -+ if (label_len < 0) -+ label_len = 0; -+ -+ /* Ensure label length is at most 255 Unicode characters. */ -+ if (label_len > 255) -+ label_len = 255; -+ - label_name = grub_calloc (label_len, sizeof (*label_name)); - if (!label_name) - { --- -2.14.2 - diff --git a/boot/grub2/0068-zfs-Fix-possible-negative-shift-operation.patch b/boot/grub2/0068-zfs-Fix-possible-negative-shift-operation.patch deleted file mode 100644 index 3445619de23..00000000000 --- a/boot/grub2/0068-zfs-Fix-possible-negative-shift-operation.patch +++ /dev/null @@ -1,43 +0,0 @@ -From a02091834d3e167320d8a262ff04b8e83c5e616d Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Tue, 24 Nov 2020 16:41:49 +0000 -Subject: [PATCH] zfs: Fix possible negative shift operation - -While it is possible for the return value from zfs_log2() to be zero -(0), it is quite unlikely, given that the previous assignment to blksz -is shifted up by SPA_MINBLOCKSHIFT (9) before 9 is subtracted at the -assignment to epbs. - -But, while unlikely during a normal operation, it may be that a carefully -crafted ZFS filesystem could result in a zero (0) value to the -dn_datalbkszsec field, which means that the shift left does nothing -and assigns zero (0) to blksz, resulting in a negative epbs value. - -Fixes: CID 73608 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/fs/zfs/zfs.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/grub-core/fs/zfs/zfs.c b/grub-core/fs/zfs/zfs.c -index 36d0373..0c42cba 100644 ---- a/grub-core/fs/zfs/zfs.c -+++ b/grub-core/fs/zfs/zfs.c -@@ -2667,6 +2667,11 @@ dnode_get (dnode_end_t * mdn, grub_uint64_t objnum, grub_uint8_t type, - blksz = grub_zfs_to_cpu16 (mdn->dn.dn_datablkszsec, - mdn->endian) << SPA_MINBLOCKSHIFT; - epbs = zfs_log2 (blksz) - DNODE_SHIFT; -+ -+ /* While this should never happen, we should check that epbs is not negative. */ -+ if (epbs < 0) -+ epbs = 0; -+ - blkid = objnum >> epbs; - idx = objnum & ((1 << epbs) - 1); - --- -2.14.2 - diff --git a/boot/grub2/0069-zfs-Fix-resource-leaks-while-constructing-path.patch b/boot/grub2/0069-zfs-Fix-resource-leaks-while-constructing-path.patch deleted file mode 100644 index d4a3f649666..00000000000 --- a/boot/grub2/0069-zfs-Fix-resource-leaks-while-constructing-path.patch +++ /dev/null @@ -1,122 +0,0 @@ -From 89bdab965805e8d54d7f75349024e1a11cbe2eb8 Mon Sep 17 00:00:00 2001 -From: Paulo Flabiano Smorigo -Date: Mon, 14 Dec 2020 18:54:49 -0300 -Subject: [PATCH] zfs: Fix resource leaks while constructing path - -There are several exit points in dnode_get_path() that are causing possible -memory leaks. - -In the while(1) the correct exit mechanism should not be to do a direct return, -but to instead break out of the loop, setting err first if it is not already set. - -The reason behind this is that the dnode_path is a linked list, and while doing -through this loop, it is being allocated and built up - the only way to -correctly unravel it is to traverse it, which is what is being done at the end -of the function outside of the loop. - -Several of the existing exit points correctly did a break, but not all so this -change makes that more consistent and should resolve the leaking of memory as -found by Coverity. - -Fixes: CID 73741 - -Signed-off-by: Paulo Flabiano Smorigo -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/fs/zfs/zfs.c | 30 +++++++++++++++++++++--------- - 1 file changed, 21 insertions(+), 9 deletions(-) - -diff --git a/grub-core/fs/zfs/zfs.c b/grub-core/fs/zfs/zfs.c -index 0c42cba..9087a72 100644 ---- a/grub-core/fs/zfs/zfs.c -+++ b/grub-core/fs/zfs/zfs.c -@@ -2836,8 +2836,8 @@ dnode_get_path (struct subvolume *subvol, const char *path_in, dnode_end_t *dn, - - if (dnode_path->dn.dn.dn_type != DMU_OT_DIRECTORY_CONTENTS) - { -- grub_free (path_buf); -- return grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("not a directory")); -+ err = grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("not a directory")); -+ break; - } - err = zap_lookup (&(dnode_path->dn), cname, &objnum, - data, subvol->case_insensitive); -@@ -2879,11 +2879,18 @@ dnode_get_path (struct subvolume *subvol, const char *path_in, dnode_end_t *dn, - << SPA_MINBLOCKSHIFT); - - if (blksz == 0) -- return grub_error(GRUB_ERR_BAD_FS, "0-sized block"); -+ { -+ err = grub_error (GRUB_ERR_BAD_FS, "0-sized block"); -+ break; -+ } - - sym_value = grub_malloc (sym_sz); - if (!sym_value) -- return grub_errno; -+ { -+ err = grub_errno; -+ break; -+ } -+ - for (block = 0; block < (sym_sz + blksz - 1) / blksz; block++) - { - void *t; -@@ -2893,7 +2900,7 @@ dnode_get_path (struct subvolume *subvol, const char *path_in, dnode_end_t *dn, - if (err) - { - grub_free (sym_value); -- return err; -+ break; - } - - movesize = sym_sz - block * blksz; -@@ -2903,6 +2910,8 @@ dnode_get_path (struct subvolume *subvol, const char *path_in, dnode_end_t *dn, - grub_memcpy (sym_value + block * blksz, t, movesize); - grub_free (t); - } -+ if (err) -+ break; - free_symval = 1; - } - path = path_buf = grub_malloc (sym_sz + grub_strlen (oldpath) + 1); -@@ -2911,7 +2920,8 @@ dnode_get_path (struct subvolume *subvol, const char *path_in, dnode_end_t *dn, - grub_free (oldpathbuf); - if (free_symval) - grub_free (sym_value); -- return grub_errno; -+ err = grub_errno; -+ break; - } - grub_memcpy (path, sym_value, sym_sz); - if (free_symval) -@@ -2949,11 +2959,12 @@ dnode_get_path (struct subvolume *subvol, const char *path_in, dnode_end_t *dn, - - err = zio_read (bp, dnode_path->dn.endian, &sahdrp, NULL, data); - if (err) -- return err; -+ break; - } - else - { -- return grub_error (GRUB_ERR_BAD_FS, "filesystem is corrupt"); -+ err = grub_error (GRUB_ERR_BAD_FS, "filesystem is corrupt"); -+ break; - } - - hdrsize = SA_HDR_SIZE (((sa_hdr_phys_t *) sahdrp)); -@@ -2974,7 +2985,8 @@ dnode_get_path (struct subvolume *subvol, const char *path_in, dnode_end_t *dn, - if (!path_buf) - { - grub_free (oldpathbuf); -- return grub_errno; -+ err = grub_errno; -+ break; - } - grub_memcpy (path, sym_value, sym_sz); - path [sym_sz] = 0; --- -2.14.2 - diff --git a/boot/grub2/0070-zfs-Fix-possible-integer-overflows.patch b/boot/grub2/0070-zfs-Fix-possible-integer-overflows.patch deleted file mode 100644 index b4791e6116c..00000000000 --- a/boot/grub2/0070-zfs-Fix-possible-integer-overflows.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 302c12ff5714bc455949117c1c9548ccb324d55b Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Tue, 8 Dec 2020 22:17:04 +0000 -Subject: [PATCH] zfs: Fix possible integer overflows - -In all cases the problem is that the value being acted upon by -a left-shift is a 32-bit number which is then being used in the -context of a 64-bit number. - -To avoid overflow we ensure that the number being shifted is 64-bit -before the shift is done. - -Fixes: CID 73684, CID 73695, CID 73764 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - 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 9087a72..b078ccc 100644 ---- a/grub-core/fs/zfs/zfs.c -+++ b/grub-core/fs/zfs/zfs.c -@@ -564,7 +564,7 @@ find_bestub (uberblock_phys_t * ub_array, - ubptr = (uberblock_phys_t *) ((grub_properly_aligned_t *) ub_array - + ((i << ub_shift) - / sizeof (grub_properly_aligned_t))); -- err = uberblock_verify (ubptr, offset, 1 << ub_shift); -+ err = uberblock_verify (ubptr, offset, (grub_size_t) 1 << ub_shift); - if (err) - { - grub_errno = GRUB_ERR_NONE; -@@ -1543,7 +1543,7 @@ read_device (grub_uint64_t offset, struct grub_zfs_device_desc *desc, - - high = grub_divmod64 ((offset >> desc->ashift) + c, - desc->n_children, &devn); -- csize = bsize << desc->ashift; -+ csize = (grub_size_t) bsize << desc->ashift; - if (csize > len) - csize = len; - -@@ -1635,8 +1635,8 @@ read_device (grub_uint64_t offset, struct grub_zfs_device_desc *desc, - - while (len > 0) - { -- grub_size_t csize; -- csize = ((s / (desc->n_children - desc->nparity)) -+ grub_size_t csize = s; -+ csize = ((csize / (desc->n_children - desc->nparity)) - << desc->ashift); - if (csize > len) - csize = len; --- -2.14.2 - diff --git a/boot/grub2/0071-zfsinfo-Correct-a-check-for-error-allocating-memory.patch b/boot/grub2/0071-zfsinfo-Correct-a-check-for-error-allocating-memory.patch deleted file mode 100644 index 817fbc37ad0..00000000000 --- a/boot/grub2/0071-zfsinfo-Correct-a-check-for-error-allocating-memory.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 7aab03418ec6a9b991aa44416cb2585aff4e7972 Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Thu, 26 Nov 2020 10:56:45 +0000 -Subject: [PATCH] zfsinfo: Correct a check for error allocating memory - -While arguably the check for grub_errno is correct, we should really be -checking the return value from the function since it is always possible -that grub_errno was set elsewhere, making this code behave incorrectly. - -Fixes: CID 73668 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/fs/zfs/zfsinfo.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/grub-core/fs/zfs/zfsinfo.c b/grub-core/fs/zfs/zfsinfo.c -index c8a28ac..bf29180 100644 ---- a/grub-core/fs/zfs/zfsinfo.c -+++ b/grub-core/fs/zfs/zfsinfo.c -@@ -358,8 +358,8 @@ grub_cmd_zfs_bootfs (grub_command_t cmd __attribute__ ((unused)), int argc, - return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("one argument expected")); - - devname = grub_file_get_device_name (args[0]); -- if (grub_errno) -- return grub_errno; -+ if (devname == NULL) -+ return GRUB_ERR_OUT_OF_MEMORY; - - dev = grub_device_open (devname); - grub_free (devname); --- -2.14.2 - diff --git a/boot/grub2/0072-affs-Fix-memory-leaks.patch b/boot/grub2/0072-affs-Fix-memory-leaks.patch deleted file mode 100644 index bcbc0377e35..00000000000 --- a/boot/grub2/0072-affs-Fix-memory-leaks.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 178ac5107389f8e5b32489d743d6824a5ebf342a Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Thu, 26 Nov 2020 12:48:07 +0000 -Subject: [PATCH] affs: Fix memory leaks - -The node structure reference is being allocated but not freed if it -reaches the end of the function. If any of the hooks had returned -a non-zero value, then node would have been copied in to the context -reference, but otherwise node is not stored and should be freed. - -Similarly, the call to grub_affs_create_node() replaces the allocated -memory in node with a newly allocated structure, leaking the existing -memory pointed by node. - -Finally, when dir->parent is set, then we again replace node with newly -allocated memory, which seems unnecessary when we copy in the values -from dir->parent immediately after. - -Fixes: CID 73759 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/fs/affs.c | 18 ++++++++---------- - 1 file changed, 8 insertions(+), 10 deletions(-) - -diff --git a/grub-core/fs/affs.c b/grub-core/fs/affs.c -index 220b371..230e26a 100644 ---- a/grub-core/fs/affs.c -+++ b/grub-core/fs/affs.c -@@ -400,12 +400,12 @@ grub_affs_iterate_dir (grub_fshelp_node_t dir, - { - unsigned int i; - struct grub_affs_file file; -- struct grub_fshelp_node *node = 0; -+ struct grub_fshelp_node *node, *orig_node; - struct grub_affs_data *data = dir->data; - grub_uint32_t *hashtable; - - /* Create the directory entries for `.' and `..'. */ -- node = grub_zalloc (sizeof (*node)); -+ node = orig_node = grub_zalloc (sizeof (*node)); - if (!node) - return 1; - -@@ -414,9 +414,6 @@ grub_affs_iterate_dir (grub_fshelp_node_t dir, - return 1; - if (dir->parent) - { -- node = grub_zalloc (sizeof (*node)); -- if (!node) -- return 1; - *node = *dir->parent; - if (hook ("..", GRUB_FSHELP_DIR, node, hook_data)) - return 1; -@@ -456,17 +453,18 @@ grub_affs_iterate_dir (grub_fshelp_node_t dir, - - if (grub_affs_create_node (dir, hook, hook_data, &node, &hashtable, - next, &file)) -- return 1; -+ { -+ /* Node has been replaced in function. */ -+ grub_free (orig_node); -+ return 1; -+ } - - next = grub_be_to_cpu32 (file.next); - } - } - -- grub_free (hashtable); -- return 0; -- - fail: -- grub_free (node); -+ grub_free (orig_node); - grub_free (hashtable); - return 0; - } --- -2.14.2 - diff --git a/boot/grub2/0073-libgcrypt-mpi-Fix-possible-unintended-sign-extension.patch b/boot/grub2/0073-libgcrypt-mpi-Fix-possible-unintended-sign-extension.patch deleted file mode 100644 index 5e5bb2f00f6..00000000000 --- a/boot/grub2/0073-libgcrypt-mpi-Fix-possible-unintended-sign-extension.patch +++ /dev/null @@ -1,50 +0,0 @@ -From e8814c811132a70f9b55418f7567378a34ad3883 Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Tue, 3 Nov 2020 16:43:37 +0000 -Subject: [PATCH] libgcrypt/mpi: Fix possible unintended sign extension - -The array of unsigned char gets promoted to a signed 32-bit int before -it is finally promoted to a size_t. There is the possibility that this -may result in the signed-bit being set for the intermediate signed -32-bit int. We should ensure that the promotion is to the correct type -before we bitwise-OR the values. - -Fixes: CID 96697 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/lib/libgcrypt-grub/mpi/mpicoder.c | 2 +- - grub-core/lib/libgcrypt/mpi/mpicoder.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/grub-core/lib/libgcrypt-grub/mpi/mpicoder.c b/grub-core/lib/libgcrypt-grub/mpi/mpicoder.c -index 3d55dfc..faf1cd6 100644 ---- a/grub-core/lib/libgcrypt-grub/mpi/mpicoder.c -+++ b/grub-core/lib/libgcrypt-grub/mpi/mpicoder.c -@@ -460,7 +460,7 @@ gcry_mpi_scan (struct gcry_mpi **ret_mpi, enum gcry_mpi_format format, - if (len && len < 4) - return gcry_error (GPG_ERR_TOO_SHORT); - -- n = (s[0] << 24 | s[1] << 16 | s[2] << 8 | s[3]); -+ n = ((size_t)s[0] << 24 | (size_t)s[1] << 16 | (size_t)s[2] << 8 | (size_t)s[3]); - s += 4; - if (len) - len -= 4; -diff --git a/grub-core/lib/libgcrypt/mpi/mpicoder.c b/grub-core/lib/libgcrypt/mpi/mpicoder.c -index a3435ed..7ecad27 100644 ---- a/grub-core/lib/libgcrypt/mpi/mpicoder.c -+++ b/grub-core/lib/libgcrypt/mpi/mpicoder.c -@@ -458,7 +458,7 @@ gcry_mpi_scan (struct gcry_mpi **ret_mpi, enum gcry_mpi_format format, - if (len && len < 4) - return gcry_error (GPG_ERR_TOO_SHORT); - -- n = (s[0] << 24 | s[1] << 16 | s[2] << 8 | s[3]); -+ n = ((size_t)s[0] << 24 | (size_t)s[1] << 16 | (size_t)s[2] << 8 | (size_t)s[3]); - s += 4; - if (len) - len -= 4; --- -2.14.2 - diff --git a/boot/grub2/0074-libgcrypt-mpi-Fix-possible-NULL-dereference.patch b/boot/grub2/0074-libgcrypt-mpi-Fix-possible-NULL-dereference.patch deleted file mode 100644 index 80446aa078b..00000000000 --- a/boot/grub2/0074-libgcrypt-mpi-Fix-possible-NULL-dereference.patch +++ /dev/null @@ -1,49 +0,0 @@ -From ae0f3fabeba7b393113d5dc185b6aff9b728136d Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Thu, 26 Nov 2020 10:41:54 +0000 -Subject: [PATCH] libgcrypt/mpi: Fix possible NULL dereference - -The code in gcry_mpi_scan() assumes that buffer is not NULL, but there -is no explicit check for that, so we add one. - -Fixes: CID 73757 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/lib/libgcrypt-grub/mpi/mpicoder.c | 3 +++ - grub-core/lib/libgcrypt/mpi/mpicoder.c | 3 +++ - 2 files changed, 6 insertions(+) - -diff --git a/grub-core/lib/libgcrypt-grub/mpi/mpicoder.c b/grub-core/lib/libgcrypt-grub/mpi/mpicoder.c -index faf1cd6..e734dcf 100644 ---- a/grub-core/lib/libgcrypt-grub/mpi/mpicoder.c -+++ b/grub-core/lib/libgcrypt-grub/mpi/mpicoder.c -@@ -381,6 +381,9 @@ gcry_mpi_scan (struct gcry_mpi **ret_mpi, enum gcry_mpi_format format, - unsigned int len; - int secure = (buffer && gcry_is_secure (buffer)); - -+ if (!buffer) -+ return gcry_error (GPG_ERR_INV_ARG); -+ - if (format == GCRYMPI_FMT_SSH) - len = 0; - else -diff --git a/grub-core/lib/libgcrypt/mpi/mpicoder.c b/grub-core/lib/libgcrypt/mpi/mpicoder.c -index 7ecad27..6fe3891 100644 ---- a/grub-core/lib/libgcrypt/mpi/mpicoder.c -+++ b/grub-core/lib/libgcrypt/mpi/mpicoder.c -@@ -379,6 +379,9 @@ gcry_mpi_scan (struct gcry_mpi **ret_mpi, enum gcry_mpi_format format, - unsigned int len; - int secure = (buffer && gcry_is_secure (buffer)); - -+ if (!buffer) -+ return gcry_error (GPG_ERR_INV_ARG); -+ - if (format == GCRYMPI_FMT_SSH) - len = 0; - else --- -2.14.2 - diff --git a/boot/grub2/0075-syslinux-Fix-memory-leak-while-parsing.patch b/boot/grub2/0075-syslinux-Fix-memory-leak-while-parsing.patch deleted file mode 100644 index acc3034e76a..00000000000 --- a/boot/grub2/0075-syslinux-Fix-memory-leak-while-parsing.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 95bc016dba94cab3d398dd74160665915cd08ad6 Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Thu, 26 Nov 2020 15:31:53 +0000 -Subject: [PATCH] syslinux: Fix memory leak while parsing - -In syslinux_parse_real() the 2 points where return is being called -didn't release the memory stored in buf which is no longer required. - -Fixes: CID 176634 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/lib/syslinux_parse.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/grub-core/lib/syslinux_parse.c b/grub-core/lib/syslinux_parse.c -index 4afa992..3acc6b4 100644 ---- a/grub-core/lib/syslinux_parse.c -+++ b/grub-core/lib/syslinux_parse.c -@@ -737,7 +737,10 @@ syslinux_parse_real (struct syslinux_menu *menu) - && grub_strncasecmp ("help", ptr3, ptr4 - ptr3) == 0)) - { - if (helptext (ptr5, file, menu)) -- return 1; -+ { -+ grub_free (buf); -+ return 1; -+ } - continue; - } - -@@ -757,6 +760,7 @@ syslinux_parse_real (struct syslinux_menu *menu) - } - fail: - grub_file_close (file); -+ grub_free (buf); - return err; - } - --- -2.14.2 - diff --git a/boot/grub2/0076-normal-completion-Fix-leaking-of-memory-when-process.patch b/boot/grub2/0076-normal-completion-Fix-leaking-of-memory-when-process.patch deleted file mode 100644 index 52f01ab96ea..00000000000 --- a/boot/grub2/0076-normal-completion-Fix-leaking-of-memory-when-process.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 9213575b7a95b514bce80be5964a28d407d7d56d Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Fri, 4 Dec 2020 18:56:48 +0000 -Subject: [PATCH] normal/completion: Fix leaking of memory when processing a - completion - -It is possible for the code to reach the end of the function without -freeing the memory allocated to argv and argc still to be 0. - -We should always call grub_free(argv). The grub_free() will handle -a NULL argument correctly if it reaches that code without the memory -being allocated. - -Fixes: CID 96672 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/normal/completion.c | 10 ++++------ - 1 file changed, 4 insertions(+), 6 deletions(-) - -diff --git a/grub-core/normal/completion.c b/grub-core/normal/completion.c -index 5961028..46e473c 100644 ---- a/grub-core/normal/completion.c -+++ b/grub-core/normal/completion.c -@@ -400,8 +400,8 @@ char * - grub_normal_do_completion (char *buf, int *restore, - void (*hook) (const char *, grub_completion_type_t, int)) - { -- int argc; -- char **argv; -+ int argc = 0; -+ char **argv = NULL; - - /* Initialize variables. */ - match = 0; -@@ -516,10 +516,8 @@ grub_normal_do_completion (char *buf, int *restore, - - fail: - if (argc != 0) -- { -- grub_free (argv[0]); -- grub_free (argv); -- } -+ grub_free (argv[0]); -+ grub_free (argv); - grub_free (match); - grub_errno = GRUB_ERR_NONE; - --- -2.14.2 - diff --git a/boot/grub2/0077-commands-hashsum-Fix-a-memory-leak.patch b/boot/grub2/0077-commands-hashsum-Fix-a-memory-leak.patch deleted file mode 100644 index ce06c5502e0..00000000000 --- a/boot/grub2/0077-commands-hashsum-Fix-a-memory-leak.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 8b6f528e52e18b7a69f90b8dc3671d7b1147d9f3 Mon Sep 17 00:00:00 2001 -From: Chris Coulson -Date: Tue, 1 Dec 2020 23:41:24 +0000 -Subject: [PATCH] commands/hashsum: Fix a memory leak - -check_list() uses grub_file_getline(), which allocates a buffer. -If the hash list file contains invalid lines, the function leaks -this buffer when it returns an error. - -Fixes: CID 176635 - -Signed-off-by: Chris Coulson -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/commands/hashsum.c | 15 ++++++++++++--- - 1 file changed, 12 insertions(+), 3 deletions(-) - -diff --git a/grub-core/commands/hashsum.c b/grub-core/commands/hashsum.c -index 456ba90..b8a22b0 100644 ---- a/grub-core/commands/hashsum.c -+++ b/grub-core/commands/hashsum.c -@@ -128,11 +128,17 @@ check_list (const gcry_md_spec_t *hash, const char *hashfilename, - high = hextoval (*p++); - low = hextoval (*p++); - if (high < 0 || low < 0) -- return grub_error (GRUB_ERR_BAD_FILE_TYPE, "invalid hash list"); -+ { -+ grub_free (buf); -+ return grub_error (GRUB_ERR_BAD_FILE_TYPE, "invalid hash list"); -+ } - expected[i] = (high << 4) | low; - } - if ((p[0] != ' ' && p[0] != '\t') || (p[1] != ' ' && p[1] != '\t')) -- return grub_error (GRUB_ERR_BAD_FILE_TYPE, "invalid hash list"); -+ { -+ grub_free (buf); -+ return grub_error (GRUB_ERR_BAD_FILE_TYPE, "invalid hash list"); -+ } - p += 2; - if (prefix) - { -@@ -140,7 +146,10 @@ check_list (const gcry_md_spec_t *hash, const char *hashfilename, - - filename = grub_xasprintf ("%s/%s", prefix, p); - if (!filename) -- return grub_errno; -+ { -+ grub_free (buf); -+ return grub_errno; -+ } - file = grub_file_open (filename, GRUB_FILE_TYPE_TO_HASH - | (!uncompress ? GRUB_FILE_TYPE_NO_DECOMPRESS - : GRUB_FILE_TYPE_NONE)); --- -2.14.2 - diff --git a/boot/grub2/0079-video-efi_gop-Remove-unnecessary-return-value-of-gru.patch b/boot/grub2/0079-video-efi_gop-Remove-unnecessary-return-value-of-gru.patch deleted file mode 100644 index f45915933c0..00000000000 --- a/boot/grub2/0079-video-efi_gop-Remove-unnecessary-return-value-of-gru.patch +++ /dev/null @@ -1,95 +0,0 @@ -From fc5951d3b1616055ef81a019a5affc09d13344d0 Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Tue, 8 Dec 2020 21:14:31 +0000 -Subject: [PATCH] video/efi_gop: Remove unnecessary return value of - grub_video_gop_fill_mode_info() - -The return value of grub_video_gop_fill_mode_info() is never able to be -anything other than GRUB_ERR_NONE. So, rather than continue to return -a value and checking it each time, it is more correct to redefine the -function to not return anything and remove checks of its return value -altogether. - -Fixes: CID 96701 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/video/efi_gop.c | 25 ++++++------------------- - 1 file changed, 6 insertions(+), 19 deletions(-) - -diff --git a/grub-core/video/efi_gop.c b/grub-core/video/efi_gop.c -index 7f9d1c2..db2ee98 100644 ---- a/grub-core/video/efi_gop.c -+++ b/grub-core/video/efi_gop.c -@@ -227,7 +227,7 @@ grub_video_gop_fill_real_mode_info (unsigned mode, - return GRUB_ERR_NONE; - } - --static grub_err_t -+static void - grub_video_gop_fill_mode_info (unsigned mode, - struct grub_efi_gop_mode_info *in, - struct grub_video_mode_info *out) -@@ -252,8 +252,6 @@ grub_video_gop_fill_mode_info (unsigned mode, - out->blit_format = GRUB_VIDEO_BLIT_FORMAT_BGRA_8888; - out->mode_type |= (GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED - | GRUB_VIDEO_MODE_TYPE_UPDATING_SWAP); -- -- return GRUB_ERR_NONE; - } - - static int -@@ -266,7 +264,6 @@ grub_video_gop_iterate (int (*hook) (const struct grub_video_mode_info *info, vo - grub_efi_uintn_t size; - grub_efi_status_t status; - struct grub_efi_gop_mode_info *info = NULL; -- grub_err_t err; - struct grub_video_mode_info mode_info; - - status = efi_call_4 (gop->query_mode, gop, mode, &size, &info); -@@ -277,12 +274,7 @@ grub_video_gop_iterate (int (*hook) (const struct grub_video_mode_info *info, vo - continue; - } - -- err = grub_video_gop_fill_mode_info (mode, info, &mode_info); -- if (err) -- { -- grub_errno = GRUB_ERR_NONE; -- continue; -- } -+ grub_video_gop_fill_mode_info (mode, info, &mode_info); - if (hook (&mode_info, hook_arg)) - return 1; - } -@@ -466,13 +458,8 @@ grub_video_gop_setup (unsigned int width, unsigned int height, - - info = gop->mode->info; - -- err = grub_video_gop_fill_mode_info (gop->mode->mode, info, -- &framebuffer.mode_info); -- if (err) -- { -- grub_dprintf ("video", "GOP: couldn't fill mode info\n"); -- return err; -- } -+ grub_video_gop_fill_mode_info (gop->mode->mode, info, -+ &framebuffer.mode_info); - - framebuffer.ptr = (void *) (grub_addr_t) gop->mode->fb_base; - framebuffer.offscreen -@@ -486,8 +473,8 @@ grub_video_gop_setup (unsigned int width, unsigned int height, - { - grub_dprintf ("video", "GOP: couldn't allocate shadow\n"); - grub_errno = 0; -- err = grub_video_gop_fill_mode_info (gop->mode->mode, info, -- &framebuffer.mode_info); -+ grub_video_gop_fill_mode_info (gop->mode->mode, info, -+ &framebuffer.mode_info); - buffer = framebuffer.ptr; - } - --- -2.14.2 - diff --git a/boot/grub2/0080-video-fb-fbfill-Fix-potential-integer-overflow.patch b/boot/grub2/0080-video-fb-fbfill-Fix-potential-integer-overflow.patch deleted file mode 100644 index ef0cb1d79e1..00000000000 --- a/boot/grub2/0080-video-fb-fbfill-Fix-potential-integer-overflow.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 7ce3259f67ac2cd93acb0ec0080c24b3b69e66c6 Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Wed, 4 Nov 2020 15:10:51 +0000 -Subject: [PATCH] video/fb/fbfill: Fix potential integer overflow - -The multiplication of 2 unsigned 32-bit integers may overflow before -promotion to unsigned 64-bit. We should ensure that the multiplication -is done with overflow detection. Additionally, use grub_sub() for -subtraction. - -Fixes: CID 73640, CID 73697, CID 73702, CID 73823 - -Signed-off-by: Darren Kenny -Signed-off-by: Marco A Benatto -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/video/fb/fbfill.c | 17 +++++++++++++---- - 1 file changed, 13 insertions(+), 4 deletions(-) - -diff --git a/grub-core/video/fb/fbfill.c b/grub-core/video/fb/fbfill.c -index 11816d0..a37acd1 100644 ---- a/grub-core/video/fb/fbfill.c -+++ b/grub-core/video/fb/fbfill.c -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - #include - - /* Generic filler that works for every supported mode. */ -@@ -61,7 +62,9 @@ grub_video_fbfill_direct32 (struct grub_video_fbblit_info *dst, - - /* Calculate the number of bytes to advance from the end of one line - to the beginning of the next line. */ -- rowskip = dst->mode_info->pitch - dst->mode_info->bytes_per_pixel * width; -+ if (grub_mul (dst->mode_info->bytes_per_pixel, width, &rowskip) || -+ grub_sub (dst->mode_info->pitch, rowskip, &rowskip)) -+ return; - - /* Get the start address. */ - dstptr = grub_video_fb_get_video_ptr (dst, x, y); -@@ -98,7 +101,9 @@ grub_video_fbfill_direct24 (struct grub_video_fbblit_info *dst, - #endif - /* Calculate the number of bytes to advance from the end of one line - to the beginning of the next line. */ -- rowskip = dst->mode_info->pitch - dst->mode_info->bytes_per_pixel * width; -+ if (grub_mul (dst->mode_info->bytes_per_pixel, width, &rowskip) || -+ grub_sub (dst->mode_info->pitch, rowskip, &rowskip)) -+ return; - - /* Get the start address. */ - dstptr = grub_video_fb_get_video_ptr (dst, x, y); -@@ -131,7 +136,9 @@ grub_video_fbfill_direct16 (struct grub_video_fbblit_info *dst, - - /* Calculate the number of bytes to advance from the end of one line - to the beginning of the next line. */ -- rowskip = (dst->mode_info->pitch - dst->mode_info->bytes_per_pixel * width); -+ if (grub_mul (dst->mode_info->bytes_per_pixel, width, &rowskip) || -+ grub_sub (dst->mode_info->pitch, rowskip, &rowskip)) -+ return; - - /* Get the start address. */ - dstptr = grub_video_fb_get_video_ptr (dst, x, y); -@@ -161,7 +168,9 @@ grub_video_fbfill_direct8 (struct grub_video_fbblit_info *dst, - - /* Calculate the number of bytes to advance from the end of one line - to the beginning of the next line. */ -- rowskip = dst->mode_info->pitch - dst->mode_info->bytes_per_pixel * width; -+ if (grub_mul (dst->mode_info->bytes_per_pixel, width, &rowskip) || -+ grub_sub (dst->mode_info->pitch, rowskip, &rowskip)) -+ return; - - /* Get the start address. */ - dstptr = grub_video_fb_get_video_ptr (dst, x, y); --- -2.14.2 - diff --git a/boot/grub2/0081-video-fb-video_fb-Fix-multiple-integer-overflows.patch b/boot/grub2/0081-video-fb-video_fb-Fix-multiple-integer-overflows.patch deleted file mode 100644 index cd75284c187..00000000000 --- a/boot/grub2/0081-video-fb-video_fb-Fix-multiple-integer-overflows.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 08e098b1dbf01e96376f594b337491bc4cfa48dd Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Wed, 4 Nov 2020 14:43:44 +0000 -Subject: [PATCH] video/fb/video_fb: Fix multiple integer overflows - -The calculation of the unsigned 64-bit value is being generated by -multiplying 2, signed or unsigned, 32-bit integers which may overflow -before promotion to unsigned 64-bit. Fix all of them. - -Fixes: CID 73703, CID 73767, CID 73833 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/video/fb/video_fb.c | 52 ++++++++++++++++++++++++++++++------------- - 1 file changed, 36 insertions(+), 16 deletions(-) - -diff --git a/grub-core/video/fb/video_fb.c b/grub-core/video/fb/video_fb.c -index 1a602c8..1c9a138 100644 ---- a/grub-core/video/fb/video_fb.c -+++ b/grub-core/video/fb/video_fb.c -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - - GRUB_MOD_LICENSE ("GPLv3+"); - -@@ -1417,15 +1418,23 @@ doublebuf_blit_update_screen (void) - { - if (framebuffer.current_dirty.first_line - <= framebuffer.current_dirty.last_line) -- grub_memcpy ((char *) framebuffer.pages[0] -- + framebuffer.current_dirty.first_line -- * framebuffer.back_target->mode_info.pitch, -- (char *) framebuffer.back_target->data -- + framebuffer.current_dirty.first_line -- * framebuffer.back_target->mode_info.pitch, -- framebuffer.back_target->mode_info.pitch -- * (framebuffer.current_dirty.last_line -- - framebuffer.current_dirty.first_line)); -+ { -+ grub_size_t copy_size; -+ -+ if (grub_sub (framebuffer.current_dirty.last_line, -+ framebuffer.current_dirty.first_line, ©_size) || -+ grub_mul (framebuffer.back_target->mode_info.pitch, copy_size, ©_size)) -+ { -+ /* Shouldn't happen, but if it does we've a bug. */ -+ return GRUB_ERR_BUG; -+ } -+ -+ grub_memcpy ((char *) framebuffer.pages[0] + framebuffer.current_dirty.first_line * -+ framebuffer.back_target->mode_info.pitch, -+ (char *) framebuffer.back_target->data + framebuffer.current_dirty.first_line * -+ framebuffer.back_target->mode_info.pitch, -+ copy_size); -+ } - framebuffer.current_dirty.first_line - = framebuffer.back_target->mode_info.height; - framebuffer.current_dirty.last_line = 0; -@@ -1439,7 +1448,7 @@ grub_video_fb_doublebuf_blit_init (struct grub_video_fbrender_target **back, - volatile void *framebuf) - { - grub_err_t err; -- grub_size_t page_size = mode_info.pitch * mode_info.height; -+ grub_size_t page_size = (grub_size_t) mode_info.pitch * mode_info.height; - - framebuffer.offscreen_buffer = grub_zalloc (page_size); - if (! framebuffer.offscreen_buffer) -@@ -1482,12 +1491,23 @@ doublebuf_pageflipping_update_screen (void) - last_line = framebuffer.previous_dirty.last_line; - - if (first_line <= last_line) -- grub_memcpy ((char *) framebuffer.pages[framebuffer.render_page] -- + first_line * framebuffer.back_target->mode_info.pitch, -- (char *) framebuffer.back_target->data -- + first_line * framebuffer.back_target->mode_info.pitch, -- framebuffer.back_target->mode_info.pitch -- * (last_line - first_line)); -+ { -+ grub_size_t copy_size; -+ -+ if (grub_sub (last_line, first_line, ©_size) || -+ grub_mul (framebuffer.back_target->mode_info.pitch, copy_size, ©_size)) -+ { -+ /* Shouldn't happen, but if it does we've a bug. */ -+ return GRUB_ERR_BUG; -+ } -+ -+ grub_memcpy ((char *) framebuffer.pages[framebuffer.render_page] + first_line * -+ framebuffer.back_target->mode_info.pitch, -+ (char *) framebuffer.back_target->data + first_line * -+ framebuffer.back_target->mode_info.pitch, -+ copy_size); -+ } -+ - framebuffer.previous_dirty = framebuffer.current_dirty; - framebuffer.current_dirty.first_line - = framebuffer.back_target->mode_info.height; --- -2.14.2 - diff --git a/boot/grub2/0082-video-fb-video_fb-Fix-possible-integer-overflow.patch b/boot/grub2/0082-video-fb-video_fb-Fix-possible-integer-overflow.patch deleted file mode 100644 index 3b4bc2271cd..00000000000 --- a/boot/grub2/0082-video-fb-video_fb-Fix-possible-integer-overflow.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 08413f2f4edec0e2d9bf15f836f6ee5ca2e379cb Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Fri, 4 Dec 2020 14:51:30 +0000 -Subject: [PATCH] video/fb/video_fb: Fix possible integer overflow - -It is minimal possibility that the values being used here will overflow. -So, change the code to use the safemath function grub_mul() to ensure -that doesn't happen. - -Fixes: CID 73761 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/video/fb/video_fb.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/grub-core/video/fb/video_fb.c b/grub-core/video/fb/video_fb.c -index 1c9a138..ae6b89f 100644 ---- a/grub-core/video/fb/video_fb.c -+++ b/grub-core/video/fb/video_fb.c -@@ -1537,7 +1537,13 @@ doublebuf_pageflipping_init (struct grub_video_mode_info *mode_info, - volatile void *page1_ptr) - { - grub_err_t err; -- grub_size_t page_size = mode_info->pitch * mode_info->height; -+ grub_size_t page_size = 0; -+ -+ if (grub_mul (mode_info->pitch, mode_info->height, &page_size)) -+ { -+ /* Shouldn't happen, but if it does we've a bug. */ -+ return GRUB_ERR_BUG; -+ } - - framebuffer.offscreen_buffer = grub_malloc (page_size); - if (! framebuffer.offscreen_buffer) --- -2.14.2 - diff --git a/boot/grub2/0083-video-readers-jpeg-Test-for-an-invalid-next-marker-r.patch b/boot/grub2/0083-video-readers-jpeg-Test-for-an-invalid-next-marker-r.patch deleted file mode 100644 index 12aba3647d8..00000000000 --- a/boot/grub2/0083-video-readers-jpeg-Test-for-an-invalid-next-marker-r.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 5f5eb7ca8e971227e95745abe541df3e1509360e Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Fri, 4 Dec 2020 15:39:00 +0000 -Subject: [PATCH] video/readers/jpeg: Test for an invalid next marker reference - from a jpeg file - -While it may never happen, and potentially could be caught at the end of -the function, it is worth checking up front for a bad reference to the -next marker just in case of a maliciously crafted file being provided. - -Fixes: CID 73694 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/video/readers/jpeg.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/grub-core/video/readers/jpeg.c b/grub-core/video/readers/jpeg.c -index 31359a4..0b6ce3c 100644 ---- a/grub-core/video/readers/jpeg.c -+++ b/grub-core/video/readers/jpeg.c -@@ -253,6 +253,12 @@ grub_jpeg_decode_quan_table (struct grub_jpeg_data *data) - next_marker = data->file->offset; - next_marker += grub_jpeg_get_word (data); - -+ if (next_marker > data->file->size) -+ { -+ /* Should never be set beyond the size of the file. */ -+ return grub_error (GRUB_ERR_BAD_FILE_TYPE, "jpeg: invalid next reference"); -+ } -+ - while (data->file->offset + sizeof (data->quan_table[id]) + 1 - <= next_marker) - { --- -2.14.2 - diff --git a/boot/grub2/0084-gfxmenu-gui_list-Remove-code-that-coverity-is-flaggi.patch b/boot/grub2/0084-gfxmenu-gui_list-Remove-code-that-coverity-is-flaggi.patch deleted file mode 100644 index 73fcd7806a0..00000000000 --- a/boot/grub2/0084-gfxmenu-gui_list-Remove-code-that-coverity-is-flaggi.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 4a1aa5917595650efbd46b581368c470ebee42ab Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Mon, 7 Dec 2020 14:44:47 +0000 -Subject: [PATCH] gfxmenu/gui_list: Remove code that coverity is flagging as - dead - -The test of value for NULL before calling grub_strdup() is not required, -since the if condition prior to this has already tested for value being -NULL and cannot reach this code if it is. - -Fixes: CID 73659 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/gfxmenu/gui_list.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/grub-core/gfxmenu/gui_list.c b/grub-core/gfxmenu/gui_list.c -index 01477cd..df334a6 100644 ---- a/grub-core/gfxmenu/gui_list.c -+++ b/grub-core/gfxmenu/gui_list.c -@@ -771,7 +771,7 @@ list_set_property (void *vself, const char *name, const char *value) - { - self->need_to_recreate_boxes = 1; - grub_free (self->selected_item_box_pattern); -- self->selected_item_box_pattern = value ? grub_strdup (value) : 0; -+ self->selected_item_box_pattern = grub_strdup (value); - self->selected_item_box_pattern_inherit = 0; - } - } --- -2.14.2 - diff --git a/boot/grub2/0085-loader-bsd-Check-for-NULL-arg-up-front.patch b/boot/grub2/0085-loader-bsd-Check-for-NULL-arg-up-front.patch deleted file mode 100644 index c3704575956..00000000000 --- a/boot/grub2/0085-loader-bsd-Check-for-NULL-arg-up-front.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 5d5391b0a05abe76e04c1eb68dcc6cbef5326c4a Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Tue, 8 Dec 2020 21:47:13 +0000 -Subject: [PATCH] loader/bsd: Check for NULL arg up-front - -The code in the next block suggests that it is possible for .set to be -true but .arg may still be NULL. - -This code assumes that it is never NULL, yet later is testing if it is -NULL - that is inconsistent. - -So we should check first if .arg is not NULL, and remove this check that -is being flagged by Coverity since it is no longer required. - -Fixes: CID 292471 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/loader/i386/bsd.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/grub-core/loader/i386/bsd.c b/grub-core/loader/i386/bsd.c -index b92cbe9..8432283 100644 ---- a/grub-core/loader/i386/bsd.c -+++ b/grub-core/loader/i386/bsd.c -@@ -1605,7 +1605,7 @@ grub_cmd_openbsd (grub_extcmd_context_t ctxt, int argc, char *argv[]) - kernel_type = KERNEL_TYPE_OPENBSD; - bootflags = grub_bsd_parse_flags (ctxt->state, openbsd_flags); - -- if (ctxt->state[OPENBSD_ROOT_ARG].set) -+ if (ctxt->state[OPENBSD_ROOT_ARG].set && ctxt->state[OPENBSD_ROOT_ARG].arg != NULL) - { - const char *arg = ctxt->state[OPENBSD_ROOT_ARG].arg; - unsigned type, unit, part; -@@ -1622,7 +1622,7 @@ grub_cmd_openbsd (grub_extcmd_context_t ctxt, int argc, char *argv[]) - "unknown disk type name"); - - unit = grub_strtoul (arg, (char **) &arg, 10); -- if (! (arg && *arg >= 'a' && *arg <= 'z')) -+ if (! (*arg >= 'a' && *arg <= 'z')) - return grub_error (GRUB_ERR_BAD_ARGUMENT, - "only device specifications of form " - " are supported"); --- -2.14.2 - diff --git a/boot/grub2/0086-loader-xnu-Fix-memory-leak.patch b/boot/grub2/0086-loader-xnu-Fix-memory-leak.patch deleted file mode 100644 index aae6774cf68..00000000000 --- a/boot/grub2/0086-loader-xnu-Fix-memory-leak.patch +++ /dev/null @@ -1,39 +0,0 @@ -From bcb59ece3263d118510c4440c4da0950f224bb7f Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Thu, 26 Nov 2020 12:53:10 +0000 -Subject: [PATCH] loader/xnu: Fix memory leak - -The code here is finished with the memory stored in name, but it only -frees it if there curvalue is valid, while it could actually free it -regardless. - -The fix is a simple relocation of the grub_free() to before the test -of curvalue. - -Fixes: CID 96646 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/loader/xnu.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/grub-core/loader/xnu.c b/grub-core/loader/xnu.c -index 44fd5a9..eb14462 100644 ---- a/grub-core/loader/xnu.c -+++ b/grub-core/loader/xnu.c -@@ -1391,9 +1391,9 @@ grub_xnu_fill_devicetree (void) - name[len] = 0; - - curvalue = grub_xnu_create_value (curkey, name); -+ grub_free (name); - if (!curvalue) - return grub_errno; -- grub_free (name); - - data = grub_malloc (grub_strlen (var->value) + 1); - if (!data) --- -2.14.2 - diff --git a/boot/grub2/0087-loader-xnu-Free-driverkey-data-when-an-error-is-dete.patch b/boot/grub2/0087-loader-xnu-Free-driverkey-data-when-an-error-is-dete.patch deleted file mode 100644 index 6388c5cfc0b..00000000000 --- a/boot/grub2/0087-loader-xnu-Free-driverkey-data-when-an-error-is-dete.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 4b4027b6b1c877d7ab467896b04c7bd1aadcfa15 Mon Sep 17 00:00:00 2001 -From: Marco A Benatto -Date: Mon, 30 Nov 2020 12:18:24 -0300 -Subject: [PATCH] loader/xnu: Free driverkey data when an error is detected in - grub_xnu_writetree_toheap() - -... to avoid memory leaks. - -Fixes: CID 96640 - -Signed-off-by: Marco A Benatto -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/loader/xnu.c | 24 ++++++++++++++++++++---- - 1 file changed, 20 insertions(+), 4 deletions(-) - -diff --git a/grub-core/loader/xnu.c b/grub-core/loader/xnu.c -index eb14462..1a590db 100644 ---- a/grub-core/loader/xnu.c -+++ b/grub-core/loader/xnu.c -@@ -227,26 +227,33 @@ grub_xnu_writetree_toheap (grub_addr_t *target, grub_size_t *size) - if (! memorymap) - return grub_errno; - -- driverkey = (struct grub_xnu_devtree_key *) grub_malloc (sizeof (*driverkey)); -+ driverkey = (struct grub_xnu_devtree_key *) grub_zalloc (sizeof (*driverkey)); - if (! driverkey) - return grub_errno; - driverkey->name = grub_strdup ("DeviceTree"); - if (! driverkey->name) -- return grub_errno; -+ { -+ err = grub_errno; -+ goto fail; -+ } -+ - driverkey->datasize = sizeof (*extdesc); - driverkey->next = memorymap->first_child; - memorymap->first_child = driverkey; - driverkey->data = extdesc - = (struct grub_xnu_extdesc *) grub_malloc (sizeof (*extdesc)); - if (! driverkey->data) -- return grub_errno; -+ { -+ err = grub_errno; -+ goto fail; -+ } - - /* Allocate the space based on the size with dummy value. */ - *size = grub_xnu_writetree_get_size (grub_xnu_devtree_root, "/"); - err = grub_xnu_heap_malloc (ALIGN_UP (*size + 1, GRUB_XNU_PAGESIZE), - &src, target); - if (err) -- return err; -+ goto fail; - - /* Put real data in the dummy. */ - extdesc->addr = *target; -@@ -255,6 +262,15 @@ grub_xnu_writetree_toheap (grub_addr_t *target, grub_size_t *size) - /* Write the tree to heap. */ - grub_xnu_writetree_toheap_real (src, grub_xnu_devtree_root, "/"); - return GRUB_ERR_NONE; -+ -+ fail: -+ memorymap->first_child = NULL; -+ -+ grub_free (driverkey->data); -+ grub_free (driverkey->name); -+ grub_free (driverkey); -+ -+ return err; - } - - /* Find a key or value in parent key. */ --- -2.14.2 - diff --git a/boot/grub2/0088-loader-xnu-Check-if-pointer-is-NULL-before-using-it.patch b/boot/grub2/0088-loader-xnu-Check-if-pointer-is-NULL-before-using-it.patch deleted file mode 100644 index c26c26441ed..00000000000 --- a/boot/grub2/0088-loader-xnu-Check-if-pointer-is-NULL-before-using-it.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 7c8a2b5d1421a0f2a33d33531f7561f3da93b844 Mon Sep 17 00:00:00 2001 -From: Paulo Flabiano Smorigo -Date: Mon, 30 Nov 2020 10:36:00 -0300 -Subject: [PATCH] loader/xnu: Check if pointer is NULL before using it - -Fixes: CID 73654 - -Signed-off-by: Paulo Flabiano Smorigo -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/loader/xnu.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/grub-core/loader/xnu.c b/grub-core/loader/xnu.c -index 1a590db..1c0cf6a 100644 ---- a/grub-core/loader/xnu.c -+++ b/grub-core/loader/xnu.c -@@ -670,6 +670,9 @@ grub_xnu_load_driver (char *infoplistname, grub_file_t binaryfile, - char *name, *nameend; - int namelen; - -+ if (infoplistname == NULL) -+ return grub_error (GRUB_ERR_BAD_FILENAME, N_("missing p-list filename")); -+ - name = get_name_ptr (infoplistname); - nameend = grub_strchr (name, '/'); - -@@ -701,10 +704,7 @@ grub_xnu_load_driver (char *infoplistname, grub_file_t binaryfile, - else - macho = 0; - -- if (infoplistname) -- infoplist = grub_file_open (infoplistname, GRUB_FILE_TYPE_XNU_INFO_PLIST); -- else -- infoplist = 0; -+ infoplist = grub_file_open (infoplistname, GRUB_FILE_TYPE_XNU_INFO_PLIST); - grub_errno = GRUB_ERR_NONE; - if (infoplist) - { --- -2.14.2 - diff --git a/boot/grub2/0089-util-grub-install-Fix-NULL-pointer-dereferences.patch b/boot/grub2/0089-util-grub-install-Fix-NULL-pointer-dereferences.patch deleted file mode 100644 index f9c3f5d6867..00000000000 --- a/boot/grub2/0089-util-grub-install-Fix-NULL-pointer-dereferences.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 8b3a95655b4391122e7b0315d8cc6f876caf8183 Mon Sep 17 00:00:00 2001 -From: Daniel Kiper -Date: Thu, 25 Feb 2021 18:35:01 +0100 -Subject: [PATCH] util/grub-install: Fix NULL pointer dereferences - -Two grub_device_open() calls does not have associated NULL checks -for returned values. Fix that and appease the Coverity. - -Fixes: CID 314583 - -Signed-off-by: Daniel Kiper -Reviewed-by: Javier Martinez Canillas -Signed-off-by: Stefan Sørensen ---- - util/grub-install.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/util/grub-install.c b/util/grub-install.c -index a82725f..367350f 100644 ---- a/util/grub-install.c -+++ b/util/grub-install.c -@@ -1775,6 +1775,8 @@ main (int argc, char *argv[]) - fill_core_services (core_services); - - ins_dev = grub_device_open (install_drive); -+ if (ins_dev == NULL) -+ grub_util_error ("%s", grub_errmsg); - - bless (ins_dev, core_services, 0); - -@@ -1875,6 +1877,8 @@ main (int argc, char *argv[]) - fill_core_services(core_services); - - ins_dev = grub_device_open (install_drive); -+ if (ins_dev == NULL) -+ grub_util_error ("%s", grub_errmsg); - - bless (ins_dev, boot_efi, 1); - if (!removable && update_nvram) --- -2.14.2 - diff --git a/boot/grub2/0090-util-grub-editenv-Fix-incorrect-casting-of-a-signed-.patch b/boot/grub2/0090-util-grub-editenv-Fix-incorrect-casting-of-a-signed-.patch deleted file mode 100644 index 4420152a853..00000000000 --- a/boot/grub2/0090-util-grub-editenv-Fix-incorrect-casting-of-a-signed-.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 5dc41edc4eba259c6043ae7698c245ec1baaacc6 Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Thu, 5 Nov 2020 14:33:50 +0000 -Subject: [PATCH] util/grub-editenv: Fix incorrect casting of a signed value - -The return value of ftell() may be negative (-1) on error. While it is -probably unlikely to occur, we should not blindly cast to an unsigned -value without first testing that it is not negative. - -Fixes: CID 73856 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - util/grub-editenv.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/util/grub-editenv.c b/util/grub-editenv.c -index f3662c9..db6f187 100644 ---- a/util/grub-editenv.c -+++ b/util/grub-editenv.c -@@ -125,6 +125,7 @@ open_envblk_file (const char *name) - { - FILE *fp; - char *buf; -+ long loc; - size_t size; - grub_envblk_t envblk; - -@@ -143,7 +144,12 @@ open_envblk_file (const char *name) - grub_util_error (_("cannot seek `%s': %s"), name, - strerror (errno)); - -- size = (size_t) ftell (fp); -+ loc = ftell (fp); -+ if (loc < 0) -+ grub_util_error (_("cannot get file location `%s': %s"), name, -+ strerror (errno)); -+ -+ size = (size_t) loc; - - if (fseek (fp, 0, SEEK_SET) < 0) - grub_util_error (_("cannot seek `%s': %s"), name, --- -2.14.2 - diff --git a/boot/grub2/0091-util-glue-efi-Fix-incorrect-use-of-a-possibly-negati.patch b/boot/grub2/0091-util-glue-efi-Fix-incorrect-use-of-a-possibly-negati.patch deleted file mode 100644 index 6acc37189fd..00000000000 --- a/boot/grub2/0091-util-glue-efi-Fix-incorrect-use-of-a-possibly-negati.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 1641d74e16f9d1ca35ba1a87ee4a0bf3afa48e72 Mon Sep 17 00:00:00 2001 -From: Darren Kenny -Date: Fri, 4 Dec 2020 15:04:28 +0000 -Subject: [PATCH] util/glue-efi: Fix incorrect use of a possibly negative value - -It is possible for the ftell() function to return a negative value, -although it is fairly unlikely here, we should be checking for -a negative value before we assign it to an unsigned value. - -Fixes: CID 73744 - -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - util/glue-efi.c | 14 ++++++++++++-- - 1 file changed, 12 insertions(+), 2 deletions(-) - -diff --git a/util/glue-efi.c b/util/glue-efi.c -index 68f5316..de0fa6d 100644 ---- a/util/glue-efi.c -+++ b/util/glue-efi.c -@@ -39,13 +39,23 @@ write_fat (FILE *in32, FILE *in64, FILE *out, const char *out_filename, - struct grub_macho_fat_header head; - struct grub_macho_fat_arch arch32, arch64; - grub_uint32_t size32, size64; -+ long size; - char *buf; - - fseek (in32, 0, SEEK_END); -- size32 = ftell (in32); -+ size = ftell (in32); -+ if (size < 0) -+ grub_util_error ("cannot get end of input file '%s': %s", -+ name32, strerror (errno)); -+ size32 = (grub_uint32_t) size; - fseek (in32, 0, SEEK_SET); -+ - fseek (in64, 0, SEEK_END); -- size64 = ftell (in64); -+ size = ftell (in64); -+ if (size < 0) -+ grub_util_error ("cannot get end of input file '%s': %s", -+ name64, strerror (errno)); -+ size64 = (grub_uint64_t) size; - fseek (in64, 0, SEEK_SET); - - head.magic = grub_cpu_to_le32_compile_time (GRUB_MACHO_FAT_EFI_MAGIC); --- -2.14.2 - diff --git a/boot/grub2/0092-script-execute-Fix-NULL-dereference-in-grub_script_e.patch b/boot/grub2/0092-script-execute-Fix-NULL-dereference-in-grub_script_e.patch deleted file mode 100644 index 028e587952f..00000000000 --- a/boot/grub2/0092-script-execute-Fix-NULL-dereference-in-grub_script_e.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 41ae93b2e6c75453514629bcfe684300e3aec0ce Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Fri, 3 Apr 2020 23:05:13 +1100 -Subject: [PATCH] script/execute: Fix NULL dereference in - grub_script_execute_cmdline() - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/script/execute.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c -index 7e028e1..5ea2aef 100644 ---- a/grub-core/script/execute.c -+++ b/grub-core/script/execute.c -@@ -940,7 +940,7 @@ grub_script_execute_cmdline (struct grub_script_cmd *cmd) - struct grub_script_argv argv = { 0, 0, 0 }; - - /* Lookup the command. */ -- if (grub_script_arglist_to_argv (cmdline->arglist, &argv) || ! argv.args[0]) -+ if (grub_script_arglist_to_argv (cmdline->arglist, &argv) || ! argv.args || ! argv.args[0]) - return grub_errno; - - for (i = 0; i < argv.argc; i++) --- -2.14.2 - diff --git a/boot/grub2/0093-commands-ls-Require-device_name-is-not-NULL-before-p.patch b/boot/grub2/0093-commands-ls-Require-device_name-is-not-NULL-before-p.patch deleted file mode 100644 index 58b61fd636a..00000000000 --- a/boot/grub2/0093-commands-ls-Require-device_name-is-not-NULL-before-p.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 6afbe6063c95b827372f9ec310c9fc7461311eb1 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Mon, 11 Jan 2021 16:57:37 +1100 -Subject: [PATCH] commands/ls: Require device_name is not NULL before printing - -This can be triggered with: - ls -l (0 0*) -and causes a NULL deref in grub_normal_print_device_info(). - -I'm not sure if there's any implication with the IEEE 1275 platform. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/commands/ls.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/grub-core/commands/ls.c b/grub-core/commands/ls.c -index 5b7491a..326d2d6 100644 ---- a/grub-core/commands/ls.c -+++ b/grub-core/commands/ls.c -@@ -196,7 +196,7 @@ grub_ls_list_files (char *dirname, int longlist, int all, int human) - goto fail; - } - -- if (! *path) -+ if (! *path && device_name) - { - if (grub_errno == GRUB_ERR_UNKNOWN_FS) - grub_errno = GRUB_ERR_NONE; --- -2.14.2 - diff --git a/boot/grub2/0094-script-execute-Avoid-crash-when-using-outside-a-func.patch b/boot/grub2/0094-script-execute-Avoid-crash-when-using-outside-a-func.patch deleted file mode 100644 index a37390890f3..00000000000 --- a/boot/grub2/0094-script-execute-Avoid-crash-when-using-outside-a-func.patch +++ /dev/null @@ -1,38 +0,0 @@ -From fe0586347ee46f927ae27bb9673532da9f5dead5 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Mon, 11 Jan 2021 17:30:42 +1100 -Subject: [PATCH] script/execute: Avoid crash when using "$#" outside a - function scope - -"$#" represents the number of arguments to a function. It is only -defined in a function scope, where "scope" is non-NULL. Currently, -if we attempt to evaluate "$#" outside a function scope, "scope" will -be NULL and we will crash with a NULL pointer dereference. - -Do not attempt to count arguments for "$#" if "scope" is NULL. This -will result in "$#" being interpreted as an empty string if evaluated -outside a function scope. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/script/execute.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c -index 5ea2aef..23d34bd 100644 ---- a/grub-core/script/execute.c -+++ b/grub-core/script/execute.c -@@ -485,7 +485,7 @@ gettext_putvar (const char *str, grub_size_t len, - return 0; - - /* Enough for any number. */ -- if (len == 1 && str[0] == '#') -+ if (len == 1 && str[0] == '#' && scope != NULL) - { - grub_snprintf (*ptr, 30, "%u", scope->argv.argc); - *ptr += grub_strlen (*ptr); --- -2.14.2 - diff --git a/boot/grub2/0095-lib-arg-Block-repeated-short-options-that-require-an.patch b/boot/grub2/0095-lib-arg-Block-repeated-short-options-that-require-an.patch deleted file mode 100644 index 0338502a23e..00000000000 --- a/boot/grub2/0095-lib-arg-Block-repeated-short-options-that-require-an.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 2a330dba93ff11bc00eda76e9419bc52b0c7ead6 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Fri, 22 Jan 2021 16:07:29 +1100 -Subject: [PATCH] lib/arg: Block repeated short options that require an - argument - -Fuzzing found the following crash: - - search -hhhhhhhhhhhhhf - -We didn't allocate enough option space for 13 hints because the -allocation code counts the number of discrete arguments (i.e. argc). -However, the shortopt parsing code will happily keep processing -a combination of short options without checking if those short -options require an argument. This means you can easily end writing -past the allocated option space. - -This fixes a OOB write which can cause heap corruption. - -Fixes: CVE-2021-20225 - -Reported-by: Daniel Axtens -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/lib/arg.c | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - -diff --git a/grub-core/lib/arg.c b/grub-core/lib/arg.c -index 3288609..537c5e9 100644 ---- a/grub-core/lib/arg.c -+++ b/grub-core/lib/arg.c -@@ -299,6 +299,19 @@ grub_arg_parse (grub_extcmd_t cmd, int argc, char **argv, - it can have an argument value. */ - if (*curshort) - { -+ /* -+ * Only permit further short opts if this one doesn't -+ * require a value. -+ */ -+ if (opt->type != ARG_TYPE_NONE && -+ !(opt->flags & GRUB_ARG_OPTION_OPTIONAL)) -+ { -+ grub_error (GRUB_ERR_BAD_ARGUMENT, -+ N_("missing mandatory option for `%s'"), -+ opt->longarg); -+ goto fail; -+ } -+ - if (parse_option (cmd, opt, 0, usr) || grub_errno) - goto fail; - } --- -2.14.2 - diff --git a/boot/grub2/0096-script-execute-Don-t-crash-on-a-for-loop-with-no-ite.patch b/boot/grub2/0096-script-execute-Don-t-crash-on-a-for-loop-with-no-ite.patch deleted file mode 100644 index 4f543c5e22e..00000000000 --- a/boot/grub2/0096-script-execute-Don-t-crash-on-a-for-loop-with-no-ite.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 0a05f88e2bb33ed2a0cfd93f481f471efb7791aa Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Fri, 22 Jan 2021 16:18:26 +1100 -Subject: [PATCH] script/execute: Don't crash on a "for" loop with no items - -The following crashes the parser: - - for x in; do - 0 - done - -This is because grub_script_arglist_to_argv() doesn't consider the -possibility that arglist is NULL. Catch that explicitly. - -This avoids a NULL pointer dereference. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - 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 23d34bd..31dac25 100644 ---- a/grub-core/script/execute.c -+++ b/grub-core/script/execute.c -@@ -624,6 +624,9 @@ grub_script_arglist_to_argv (struct grub_script_arglist *arglist, - struct grub_script_arg *arg = 0; - struct grub_script_argv result = { 0, 0, 0 }; - -+ if (arglist == NULL) -+ return 1; -+ - for (; arglist && arglist->arg; arglist = arglist->next) - { - if (grub_script_argv_next (&result)) --- -2.14.2 - diff --git a/boot/grub2/0097-commands-menuentry-Fix-quoting-in-setparams_prefix.patch b/boot/grub2/0097-commands-menuentry-Fix-quoting-in-setparams_prefix.patch deleted file mode 100644 index 23818d4eb4d..00000000000 --- a/boot/grub2/0097-commands-menuentry-Fix-quoting-in-setparams_prefix.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 2f533a89a8dfcacbf2c9dbc77d910f111f24bf33 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Fri, 22 Jan 2021 17:10:48 +1100 -Subject: [PATCH] commands/menuentry: Fix quoting in setparams_prefix() - -Commit 9acdcbf32542 (use single quotes in menuentry setparams command) -says that expressing a quoted single quote will require 3 characters. It -actually requires (and always did require!) 4 characters: - - str: a'b => a'\''b - len: 3 => 6 (2 for the letters + 4 for the quote) - -This leads to not allocating enough memory and thus out of bounds writes -that have been observed to cause heap corruption. - -Allocate 4 bytes for each single quote. - -Commit 22e7dbb2bb81 (Fix quoting in legacy parser.) does the same -quoting, but it adds 3 as extra overhead on top of the single byte that -the quote already needs. So it's correct. - -Fixes: 9acdcbf32542 (use single quotes in menuentry setparams command) -Fixes: CVE-2021-20233 - -Reported-by: Daniel Axtens -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/commands/menuentry.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/grub-core/commands/menuentry.c b/grub-core/commands/menuentry.c -index 9164df7..720e6d8 100644 ---- a/grub-core/commands/menuentry.c -+++ b/grub-core/commands/menuentry.c -@@ -230,7 +230,7 @@ setparams_prefix (int argc, char **args) - len += 3; /* 3 = 1 space + 2 quotes */ - p = args[i]; - while (*p) -- len += (*p++ == '\'' ? 3 : 1); -+ len += (*p++ == '\'' ? 4 : 1); - } - - result = grub_malloc (len + 2); --- -2.14.2 - diff --git a/boot/grub2/0098-kern-misc-Always-set-end-in-grub_strtoull.patch b/boot/grub2/0098-kern-misc-Always-set-end-in-grub_strtoull.patch deleted file mode 100644 index 838804a82de..00000000000 --- a/boot/grub2/0098-kern-misc-Always-set-end-in-grub_strtoull.patch +++ /dev/null @@ -1,47 +0,0 @@ -From f41f0af48ab7f7c135aac17ac862c30bde0bbab7 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Wed, 13 Jan 2021 22:19:01 +1100 -Subject: [PATCH] kern/misc: Always set *end in grub_strtoull() - -Currently, if there is an error in grub_strtoull(), *end is not set. -This differs from the usual behavior of strtoull(), and also means that -some callers may use an uninitialized value for *end. - -Set *end unconditionally. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/kern/misc.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c -index a7abd36..b02693b 100644 ---- a/grub-core/kern/misc.c -+++ b/grub-core/kern/misc.c -@@ -406,6 +406,10 @@ grub_strtoull (const char *str, char **end, int base) - { - grub_error (GRUB_ERR_OUT_OF_RANGE, - N_("overflow is detected")); -+ -+ if (end) -+ *end = (char *) str; -+ - return ~0ULL; - } - -@@ -417,6 +421,10 @@ grub_strtoull (const char *str, char **end, int base) - { - grub_error (GRUB_ERR_BAD_NUMBER, - N_("unrecognized number")); -+ -+ if (end) -+ *end = (char *) str; -+ - return 0; - } - --- -2.14.2 - diff --git a/boot/grub2/0099-video-readers-jpeg-Catch-files-with-unsupported-quan.patch b/boot/grub2/0099-video-readers-jpeg-Catch-files-with-unsupported-quan.patch deleted file mode 100644 index d09f7771866..00000000000 --- a/boot/grub2/0099-video-readers-jpeg-Catch-files-with-unsupported-quan.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 693989598fd38c3c0b2a928f4f64865b5681762f Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Fri, 15 Jan 2021 12:57:04 +1100 -Subject: [PATCH] video/readers/jpeg: Catch files with unsupported quantization - or Huffman tables - -Our decoder only supports 2 quantization tables. If a file asks for -a quantization table with index > 1, reject it. - -Similarly, our decoder only supports 4 Huffman tables. If a file asks -for a Huffman table with index > 3, reject it. - -This fixes some out of bounds reads. It's not clear what degree of control -over subsequent execution could be gained by someone who can carefully -set up the contents of memory before loading an invalid JPEG file. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/video/readers/jpeg.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/grub-core/video/readers/jpeg.c b/grub-core/video/readers/jpeg.c -index 0b6ce3c..23f919a 100644 ---- a/grub-core/video/readers/jpeg.c -+++ b/grub-core/video/readers/jpeg.c -@@ -333,7 +333,11 @@ grub_jpeg_decode_sof (struct grub_jpeg_data *data) - else if (ss != JPEG_SAMPLING_1x1) - return grub_error (GRUB_ERR_BAD_FILE_TYPE, - "jpeg: sampling method not supported"); -+ - data->comp_index[id][0] = grub_jpeg_get_byte (data); -+ if (data->comp_index[id][0] > 1) -+ return grub_error (GRUB_ERR_BAD_FILE_TYPE, -+ "jpeg: too many quantization tables"); - } - - if (data->file->offset != next_marker) -@@ -602,6 +606,10 @@ grub_jpeg_decode_sos (struct grub_jpeg_data *data) - ht = grub_jpeg_get_byte (data); - data->comp_index[id][1] = (ht >> 4); - data->comp_index[id][2] = (ht & 0xF) + 2; -+ -+ if ((data->comp_index[id][1] < 0) || (data->comp_index[id][1] > 3) || -+ (data->comp_index[id][2] < 0) || (data->comp_index[id][2] > 3)) -+ return grub_error (GRUB_ERR_BAD_FILE_TYPE, "jpeg: invalid hufftable index"); - } - - grub_jpeg_get_byte (data); /* Skip 3 unused bytes. */ --- -2.14.2 - diff --git a/boot/grub2/0100-video-readers-jpeg-Catch-OOB-reads-writes-in-grub_jp.patch b/boot/grub2/0100-video-readers-jpeg-Catch-OOB-reads-writes-in-grub_jp.patch deleted file mode 100644 index 9dabd97bd5a..00000000000 --- a/boot/grub2/0100-video-readers-jpeg-Catch-OOB-reads-writes-in-grub_jp.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 34b85a6e07014383ddcad09f99ff239ad752dd1a Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Fri, 15 Jan 2021 13:29:53 +1100 -Subject: [PATCH] video/readers/jpeg: Catch OOB reads/writes in - grub_jpeg_decode_du() - -The key line is: - - du[jpeg_zigzag_order[pos]] = val * (int) data->quan_table[qt][pos]; - -jpeg_zigzag_order is grub_uint8_t[64]. - -I don't understand JPEG decoders quite well enough to explain what's -going on here. However, I observe sometimes pos=64, which leads to an -OOB read of the jpeg_zigzag_order global then an OOB write to du. -That leads to various unpleasant memory corruption conditions. - -Catch where pos >= ARRAY_SIZE(jpeg_zigzag_order) and bail. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/video/readers/jpeg.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/grub-core/video/readers/jpeg.c b/grub-core/video/readers/jpeg.c -index 23f919a..e514812 100644 ---- a/grub-core/video/readers/jpeg.c -+++ b/grub-core/video/readers/jpeg.c -@@ -526,6 +526,14 @@ grub_jpeg_decode_du (struct grub_jpeg_data *data, int id, jpeg_data_unit_t du) - val = grub_jpeg_get_number (data, num & 0xF); - num >>= 4; - pos += num; -+ -+ if (pos >= ARRAY_SIZE (jpeg_zigzag_order)) -+ { -+ grub_error (GRUB_ERR_BAD_FILE_TYPE, -+ "jpeg: invalid position in zigzag order!?"); -+ return; -+ } -+ - du[jpeg_zigzag_order[pos]] = val * (int) data->quan_table[qt][pos]; - pos++; - } --- -2.14.2 - diff --git a/boot/grub2/0101-video-readers-jpeg-Don-t-decode-data-before-start-of.patch b/boot/grub2/0101-video-readers-jpeg-Don-t-decode-data-before-start-of.patch deleted file mode 100644 index 89d08303cb4..00000000000 --- a/boot/grub2/0101-video-readers-jpeg-Don-t-decode-data-before-start-of.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 8338a8238f08d9f3ae4c2ddfff0603eff80af9e2 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Fri, 15 Jan 2021 14:06:46 +1100 -Subject: [PATCH] video/readers/jpeg: Don't decode data before start of stream - -When a start of stream marker is encountered, we call grub_jpeg_decode_sos() -which allocates space for a bitmap. - -When a restart marker is encountered, we call grub_jpeg_decode_data() which -then fills in that bitmap. - -If we get a restart marker before the start of stream marker, we will -attempt to write to a bitmap_ptr that hasn't been allocated. Catch this -and bail out. This fixes an attempt to write to NULL. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - 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 e514812..e31602f 100644 ---- a/grub-core/video/readers/jpeg.c -+++ b/grub-core/video/readers/jpeg.c -@@ -646,6 +646,10 @@ grub_jpeg_decode_data (struct grub_jpeg_data *data) - nr1 = (data->image_height + vb - 1) >> (3 + data->log_vs); - nc1 = (data->image_width + hb - 1) >> (3 + data->log_hs); - -+ if (data->bitmap_ptr == NULL) -+ return grub_error(GRUB_ERR_BAD_FILE_TYPE, -+ "jpeg: attempted to decode data before start of stream"); -+ - for (; data->r1 < nr1 && (!data->dri || rst); - data->r1++, data->bitmap_ptr += (vb * data->image_width - hb * nc1) * 3) - for (c1 = 0; c1 < nc1 && (!data->dri || rst); --- -2.14.2 - diff --git a/boot/grub2/0102-term-gfxterm-Don-t-set-up-a-font-with-glyphs-that-ar.patch b/boot/grub2/0102-term-gfxterm-Don-t-set-up-a-font-with-glyphs-that-ar.patch deleted file mode 100644 index fa818747c4e..00000000000 --- a/boot/grub2/0102-term-gfxterm-Don-t-set-up-a-font-with-glyphs-that-ar.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 829329bddb2c3e623270cc634cc9ab32e6455fe7 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Fri, 15 Jan 2021 20:03:20 +1100 -Subject: [PATCH] term/gfxterm: Don't set up a font with glyphs that are too - big - -Catch the case where we have a font so big that it causes the number of -rows or columns to be 0. Currently we continue and allocate a -virtual_screen.text_buffer of size 0. We then try to use that for glpyhs -and things go badly. - -On the emu platform, malloc() may give us a valid pointer, in which case -we'll access heap memory which we shouldn't. Alternatively, it may give us -NULL, in which case we'll crash. For other platforms, if I understand -grub_memalign() correctly, we will receive a valid but small allocation -that we will very likely later overrun. - -Prevent the creation of a virtual screen that isn't at least 40 cols -by 12 rows. This is arbitrary, but it seems that if your width or height -is half a standard 80x24 terminal, you're probably going to struggle to -read anything anyway. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/term/gfxterm.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/grub-core/term/gfxterm.c b/grub-core/term/gfxterm.c -index af7c090..b40fcce 100644 ---- a/grub-core/term/gfxterm.c -+++ b/grub-core/term/gfxterm.c -@@ -232,6 +232,15 @@ grub_virtual_screen_setup (unsigned int x, unsigned int y, - virtual_screen.columns = virtual_screen.width / virtual_screen.normal_char_width; - virtual_screen.rows = virtual_screen.height / virtual_screen.normal_char_height; - -+ /* -+ * There must be a minimum number of rows and columns for the screen to -+ * make sense. Arbitrarily pick half of 80x24. If either dimensions is 0 -+ * we would allocate 0 bytes for the text_buffer. -+ */ -+ if (virtual_screen.columns < 40 || virtual_screen.rows < 12) -+ return grub_error (GRUB_ERR_BAD_FONT, -+ "font: glyphs too large to fit on screen"); -+ - /* Allocate memory for text buffer. */ - virtual_screen.text_buffer = - (struct grub_colored_char *) grub_malloc (virtual_screen.columns --- -2.14.2 - diff --git a/boot/grub2/0103-fs-fshelp-Catch-impermissibly-large-block-sizes-in-r.patch b/boot/grub2/0103-fs-fshelp-Catch-impermissibly-large-block-sizes-in-r.patch deleted file mode 100644 index 00523ec80a0..00000000000 --- a/boot/grub2/0103-fs-fshelp-Catch-impermissibly-large-block-sizes-in-r.patch +++ /dev/null @@ -1,47 +0,0 @@ -From b5bc456f664bc301ab4cd5a17d3d23c6661c259e Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Mon, 18 Jan 2021 11:46:39 +1100 -Subject: [PATCH] fs/fshelp: Catch impermissibly large block sizes in read - helper - -A fuzzed HFS+ filesystem had log2blocksize = 22. This gave -log2blocksize + GRUB_DISK_SECTOR_BITS = 31. 1 << 31 = 0x80000000, -which is -1 as an int. This caused some wacky behavior later on in -the function, leading to out-of-bounds writes on the destination buffer. - -Catch log2blocksize + GRUB_DISK_SECTOR_BITS >= 31. We could be stricter, -but this is the minimum that will prevent integer size weirdness. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/fs/fshelp.c | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/grub-core/fs/fshelp.c b/grub-core/fs/fshelp.c -index 4c902ad..a2d0d29 100644 ---- a/grub-core/fs/fshelp.c -+++ b/grub-core/fs/fshelp.c -@@ -362,6 +362,18 @@ grub_fshelp_read_file (grub_disk_t disk, grub_fshelp_node_t node, - grub_disk_addr_t i, blockcnt; - int blocksize = 1 << (log2blocksize + GRUB_DISK_SECTOR_BITS); - -+ /* -+ * Catch blatantly invalid log2blocksize. We could be a lot stricter, but -+ * this is the most permissive we can be before we start to see integer -+ * overflow/underflow issues. -+ */ -+ if (log2blocksize + GRUB_DISK_SECTOR_BITS >= 31) -+ { -+ grub_error (GRUB_ERR_OUT_OF_RANGE, -+ N_("blocksize too large")); -+ return -1; -+ } -+ - if (pos > filesize) - { - grub_error (GRUB_ERR_OUT_OF_RANGE, --- -2.14.2 - diff --git a/boot/grub2/0104-fs-hfsplus-Don-t-fetch-a-key-beyond-the-end-of-the-n.patch b/boot/grub2/0104-fs-hfsplus-Don-t-fetch-a-key-beyond-the-end-of-the-n.patch deleted file mode 100644 index a8609a67056..00000000000 --- a/boot/grub2/0104-fs-hfsplus-Don-t-fetch-a-key-beyond-the-end-of-the-n.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 58ea11d5b9ca0966bd9c68d8ba5240cf7dc3ba83 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Fri, 22 Jan 2021 18:13:56 +1100 -Subject: [PATCH] fs/hfsplus: Don't fetch a key beyond the end of the node - -Otherwise you get a wild pointer, leading to a bunch of invalid reads. -Check it falls inside the given node. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/fs/hfsplus.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/grub-core/fs/hfsplus.c b/grub-core/fs/hfsplus.c -index 8fe7c12..1c7791b 100644 ---- a/grub-core/fs/hfsplus.c -+++ b/grub-core/fs/hfsplus.c -@@ -635,6 +635,10 @@ grub_hfsplus_btree_search (struct grub_hfsplus_btree *btree, - pointer = ((char *) currkey - + grub_be_to_cpu16 (currkey->keylen) - + 2); -+ -+ if ((char *) pointer > node + btree->nodesize - 2) -+ return grub_error (GRUB_ERR_BAD_FS, "HFS+ key beyond end of node"); -+ - currnode = grub_be_to_cpu32 (grub_get_unaligned32 (pointer)); - match = 1; - } --- -2.14.2 - diff --git a/boot/grub2/0105-fs-hfsplus-Don-t-use-uninitialized-data-on-corrupt-f.patch b/boot/grub2/0105-fs-hfsplus-Don-t-use-uninitialized-data-on-corrupt-f.patch deleted file mode 100644 index a83a21ef579..00000000000 --- a/boot/grub2/0105-fs-hfsplus-Don-t-use-uninitialized-data-on-corrupt-f.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 2ca0e5dbcdcb6fc93ccae39a0f39d0dba4a7ff20 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Tue, 2 Feb 2021 16:59:35 +1100 -Subject: [PATCH] fs/hfsplus: Don't use uninitialized data on corrupt - filesystems - -Valgrind identified the following use of uninitialized data: - - ==2782220== Conditional jump or move depends on uninitialised value(s) - ==2782220== at 0x42B364: grub_hfsplus_btree_search (hfsplus.c:566) - ==2782220== by 0x42B21D: grub_hfsplus_read_block (hfsplus.c:185) - ==2782220== by 0x42A693: grub_fshelp_read_file (fshelp.c:386) - ==2782220== by 0x42C598: grub_hfsplus_read_file (hfsplus.c:219) - ==2782220== by 0x42C598: grub_hfsplus_mount (hfsplus.c:330) - ==2782220== by 0x42B8C5: grub_hfsplus_dir (hfsplus.c:958) - ==2782220== by 0x4C1AE6: grub_fs_probe (fs.c:73) - ==2782220== by 0x407C94: grub_ls_list_files (ls.c:186) - ==2782220== by 0x407C94: grub_cmd_ls (ls.c:284) - ==2782220== by 0x4D7130: grub_extcmd_dispatcher (extcmd.c:55) - ==2782220== by 0x4045A6: execute_command (grub-fstest.c:59) - ==2782220== by 0x4045A6: fstest (grub-fstest.c:433) - ==2782220== by 0x4045A6: main (grub-fstest.c:772) - ==2782220== Uninitialised value was created by a heap allocation - ==2782220== at 0x483C7F3: malloc (in /usr/lib/x86_64-linux-gnu/valgrind/vgpreload_memcheck-amd64-linux.so) - ==2782220== by 0x4C0305: grub_malloc (mm.c:42) - ==2782220== by 0x42C21D: grub_hfsplus_mount (hfsplus.c:239) - ==2782220== by 0x42B8C5: grub_hfsplus_dir (hfsplus.c:958) - ==2782220== by 0x4C1AE6: grub_fs_probe (fs.c:73) - ==2782220== by 0x407C94: grub_ls_list_files (ls.c:186) - ==2782220== by 0x407C94: grub_cmd_ls (ls.c:284) - ==2782220== by 0x4D7130: grub_extcmd_dispatcher (extcmd.c:55) - ==2782220== by 0x4045A6: execute_command (grub-fstest.c:59) - ==2782220== by 0x4045A6: fstest (grub-fstest.c:433) - ==2782220== by 0x4045A6: main (grub-fstest.c:772) - -This happens when the process of reading the catalog file goes sufficiently -wrong that there's an attempt to read the extent overflow file, which has -not yet been loaded. Keep track of when the extent overflow file is -fully loaded and refuse to use it before then. - -The load valgrind doesn't like is btree->nodesize, and that's then used -to allocate a data structure. It looks like there are subsequently a lot -of reads based on that pointer so OOB reads are likely, and indeed crashes -(albeit difficult-to-replicate ones) have been observed in fuzzing. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/fs/hfsplus.c | 14 ++++++++++++++ - include/grub/hfsplus.h | 2 ++ - 2 files changed, 16 insertions(+) - -diff --git a/grub-core/fs/hfsplus.c b/grub-core/fs/hfsplus.c -index 1c7791b..361e5be 100644 ---- a/grub-core/fs/hfsplus.c -+++ b/grub-core/fs/hfsplus.c -@@ -177,6 +177,17 @@ grub_hfsplus_read_block (grub_fshelp_node_t node, grub_disk_addr_t fileblock) - break; - } - -+ /* -+ * If the extent overflow tree isn't ready yet, we can't look -+ * in it. This can happen where the catalog file is corrupted. -+ */ -+ if (!node->data->extoverflow_tree_ready) -+ { -+ grub_error (GRUB_ERR_BAD_FS, -+ "attempted to read extent overflow tree before loading"); -+ break; -+ } -+ - /* Set up the key to look for in the extent overflow file. */ - extoverflow.extkey.fileid = node->fileid; - extoverflow.extkey.type = 0; -@@ -241,6 +252,7 @@ grub_hfsplus_mount (grub_disk_t disk) - return 0; - - data->disk = disk; -+ data->extoverflow_tree_ready = 0; - - /* Read the bootblock. */ - grub_disk_read (disk, GRUB_HFSPLUS_SBLOCK, 0, sizeof (volheader), -@@ -357,6 +369,8 @@ grub_hfsplus_mount (grub_disk_t disk) - if (data->extoverflow_tree.nodesize < 2) - goto fail; - -+ data->extoverflow_tree_ready = 1; -+ - if (grub_hfsplus_read_file (&data->attr_tree.file, 0, 0, - sizeof (struct grub_hfsplus_btnode), - sizeof (header), (char *) &header) <= 0) -diff --git a/include/grub/hfsplus.h b/include/grub/hfsplus.h -index 117740a..e14dd31 100644 ---- a/include/grub/hfsplus.h -+++ b/include/grub/hfsplus.h -@@ -113,6 +113,8 @@ struct grub_hfsplus_data - struct grub_hfsplus_btree extoverflow_tree; - struct grub_hfsplus_btree attr_tree; - -+ int extoverflow_tree_ready; -+ - struct grub_hfsplus_file dirroot; - struct grub_hfsplus_file opened_file; - --- -2.14.2 - diff --git a/boot/grub2/0106-fs-hfs-Disable-under-lockdown.patch b/boot/grub2/0106-fs-hfs-Disable-under-lockdown.patch deleted file mode 100644 index 42e4ee44616..00000000000 --- a/boot/grub2/0106-fs-hfs-Disable-under-lockdown.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 1c15848838d924552611247110723e2a1c17a5a1 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Mon, 18 Jan 2021 12:19:07 +1100 -Subject: [PATCH] fs/hfs: Disable under lockdown - -HFS has issues such as infinite mutual recursion that are simply too -complex to fix for such a legacy format. So simply do not permit -it to be loaded under lockdown. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/fs/hfs.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/grub-core/fs/hfs.c b/grub-core/fs/hfs.c -index 3fe842b..9a5b7bb 100644 ---- a/grub-core/fs/hfs.c -+++ b/grub-core/fs/hfs.c -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - - GRUB_MOD_LICENSE ("GPLv3+"); - -@@ -1433,11 +1434,13 @@ static struct grub_fs grub_hfs_fs = - - GRUB_MOD_INIT(hfs) - { -- grub_fs_register (&grub_hfs_fs); -+ if (!grub_is_lockdown ()) -+ grub_fs_register (&grub_hfs_fs); - my_mod = mod; - } - - GRUB_MOD_FINI(hfs) - { -- grub_fs_unregister (&grub_hfs_fs); -+ if (!grub_is_lockdown()) -+ grub_fs_unregister (&grub_hfs_fs); - } --- -2.14.2 - diff --git a/boot/grub2/0107-fs-sfs-Fix-over-read-of-root-object-name.patch b/boot/grub2/0107-fs-sfs-Fix-over-read-of-root-object-name.patch deleted file mode 100644 index 840bfc247af..00000000000 --- a/boot/grub2/0107-fs-sfs-Fix-over-read-of-root-object-name.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 8d3ae59dee2930d640add3bba983006e1f5dd1b6 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Mon, 18 Jan 2021 14:34:58 +1100 -Subject: [PATCH] fs/sfs: Fix over-read of root object name - -There's a read of the name of the root object that assumes that the name -is nul-terminated within the root block. This isn't guaranteed - it seems -SFS would require you to read multiple blocks to get a full name in general, -but maybe that doesn't apply to the root object. - -Either way, figure out how much space is left in the root block and don't -over-read it. This fixes some OOB reads. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/fs/sfs.c | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/grub-core/fs/sfs.c b/grub-core/fs/sfs.c -index de2b107..983e880 100644 ---- a/grub-core/fs/sfs.c -+++ b/grub-core/fs/sfs.c -@@ -373,6 +373,7 @@ grub_sfs_mount (grub_disk_t disk) - struct grub_sfs_objc *rootobjc; - char *rootobjc_data = 0; - grub_uint32_t blk; -+ unsigned int max_len; - - data = grub_malloc (sizeof (*data)); - if (!data) -@@ -421,7 +422,13 @@ grub_sfs_mount (grub_disk_t disk) - data->diropen.data = data; - data->diropen.cache = 0; - data->disk = disk; -- data->label = grub_strdup ((char *) (rootobjc->objects[0].filename)); -+ -+ /* We only read 1 block of data, so truncate the name if needed. */ -+ max_len = ((GRUB_DISK_SECTOR_SIZE << data->log_blocksize) -+ - 24 /* offsetof (struct grub_sfs_objc, objects) */ -+ - 25); /* offsetof (struct grub_sfs_obj, filename) */ -+ data->label = grub_zalloc (max_len + 1); -+ grub_strncpy (data->label, (char *) rootobjc->objects[0].filename, max_len); - - grub_free (rootobjc_data); - return data; --- -2.14.2 - diff --git a/boot/grub2/0108-fs-jfs-Do-not-move-to-leaf-level-if-name-length-is-n.patch b/boot/grub2/0108-fs-jfs-Do-not-move-to-leaf-level-if-name-length-is-n.patch deleted file mode 100644 index dc629ba890f..00000000000 --- a/boot/grub2/0108-fs-jfs-Do-not-move-to-leaf-level-if-name-length-is-n.patch +++ /dev/null @@ -1,34 +0,0 @@ -From ffd5a46f68710e2781899d0be4d701429a5a817d Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Mon, 18 Jan 2021 14:51:11 +1100 -Subject: [PATCH] fs/jfs: Do not move to leaf level if name length is negative - -Fuzzing JFS revealed crashes where a negative number would be passed -to le_to_cpu16_copy(). There it would be cast to a large positive number -and the copy would read and write off the end of the respective buffers. - -Catch this at the top as well as the bottom of the loop. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/fs/jfs.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/grub-core/fs/jfs.c b/grub-core/fs/jfs.c -index d5a6d65..e5bbda6 100644 ---- a/grub-core/fs/jfs.c -+++ b/grub-core/fs/jfs.c -@@ -567,7 +567,7 @@ grub_jfs_getent (struct grub_jfs_diropen *diro) - - /* Move down to the leaf level. */ - nextent = leaf->next; -- if (leaf->next != 255) -+ if (leaf->next != 255 && len > 0) - do - { - next_leaf = &diro->next_leaf[nextent]; --- -2.14.2 - diff --git a/boot/grub2/0109-fs-jfs-Limit-the-extents-that-getblk-can-consider.patch b/boot/grub2/0109-fs-jfs-Limit-the-extents-that-getblk-can-consider.patch deleted file mode 100644 index 9c8ecd2c626..00000000000 --- a/boot/grub2/0109-fs-jfs-Limit-the-extents-that-getblk-can-consider.patch +++ /dev/null @@ -1,62 +0,0 @@ -From bd0cf8148ccf721f6e39ffbd70f8abad0c8897f0 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Mon, 18 Jan 2021 14:57:17 +1100 -Subject: [PATCH] fs/jfs: Limit the extents that getblk() can consider - -getblk() implicitly trusts that treehead->count is an accurate count of -the number of extents. However, that value is read from disk and is not -trustworthy, leading to OOB reads and crashes. I am not sure to what -extent the data read from OOB can influence subsequent program execution. - -Require callers to pass in the maximum number of extents for which -they have storage. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/fs/jfs.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/grub-core/fs/jfs.c b/grub-core/fs/jfs.c -index e5bbda6..804c42d 100644 ---- a/grub-core/fs/jfs.c -+++ b/grub-core/fs/jfs.c -@@ -261,13 +261,15 @@ static grub_err_t grub_jfs_lookup_symlink (struct grub_jfs_data *data, grub_uint - static grub_int64_t - getblk (struct grub_jfs_treehead *treehead, - struct grub_jfs_tree_extent *extents, -+ int max_extents, - struct grub_jfs_data *data, - grub_uint64_t blk) - { - int found = -1; - int i; - -- for (i = 0; i < grub_le_to_cpu16 (treehead->count) - 2; i++) -+ for (i = 0; i < grub_le_to_cpu16 (treehead->count) - 2 && -+ i < max_extents; i++) - { - if (treehead->flags & GRUB_JFS_TREE_LEAF) - { -@@ -302,7 +304,7 @@ getblk (struct grub_jfs_treehead *treehead, - << (grub_le_to_cpu16 (data->sblock.log2_blksz) - - GRUB_DISK_SECTOR_BITS), 0, - sizeof (*tree), (char *) tree)) -- ret = getblk (&tree->treehead, &tree->extents[0], data, blk); -+ ret = getblk (&tree->treehead, &tree->extents[0], 254, data, blk); - grub_free (tree); - return ret; - } -@@ -316,7 +318,7 @@ static grub_int64_t - grub_jfs_blkno (struct grub_jfs_data *data, struct grub_jfs_inode *inode, - grub_uint64_t blk) - { -- return getblk (&inode->file.tree, &inode->file.extents[0], data, blk); -+ return getblk (&inode->file.tree, &inode->file.extents[0], 16, data, blk); - } - - --- -2.14.2 - diff --git a/boot/grub2/0110-fs-jfs-Catch-infinite-recursion.patch b/boot/grub2/0110-fs-jfs-Catch-infinite-recursion.patch deleted file mode 100644 index 98866599c62..00000000000 --- a/boot/grub2/0110-fs-jfs-Catch-infinite-recursion.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 223120dd83745126cb232a0248c9a8901d7e350d Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Mon, 18 Jan 2021 15:47:24 +1100 -Subject: [PATCH] fs/jfs: Catch infinite recursion - -It's possible with a fuzzed filesystem for JFS to keep getblk()-ing -the same data over and over again, leading to stack exhaustion. - -Check if we'd be calling the function with exactly the same data as -was passed in, and if so abort. - -I'm not sure what the performance impact of this is and am open to -better ideas. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/fs/jfs.c | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - -diff --git a/grub-core/fs/jfs.c b/grub-core/fs/jfs.c -index 804c42d..6f7c439 100644 ---- a/grub-core/fs/jfs.c -+++ b/grub-core/fs/jfs.c -@@ -304,7 +304,16 @@ getblk (struct grub_jfs_treehead *treehead, - << (grub_le_to_cpu16 (data->sblock.log2_blksz) - - GRUB_DISK_SECTOR_BITS), 0, - sizeof (*tree), (char *) tree)) -- ret = getblk (&tree->treehead, &tree->extents[0], 254, data, blk); -+ { -+ if (grub_memcmp (&tree->treehead, treehead, sizeof (struct grub_jfs_treehead)) || -+ grub_memcmp (&tree->extents, extents, 254 * sizeof (struct grub_jfs_tree_extent))) -+ ret = getblk (&tree->treehead, &tree->extents[0], 254, data, blk); -+ else -+ { -+ grub_error (GRUB_ERR_BAD_FS, "jfs: infinite recursion detected"); -+ ret = -1; -+ } -+ } - grub_free (tree); - return ret; - } --- -2.14.2 - diff --git a/boot/grub2/0111-fs-nilfs2-Reject-too-large-keys.patch b/boot/grub2/0111-fs-nilfs2-Reject-too-large-keys.patch deleted file mode 100644 index d442f3cee20..00000000000 --- a/boot/grub2/0111-fs-nilfs2-Reject-too-large-keys.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 20ab8cb44bc140a1dedda82a3fccdd45e9bc6929 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Mon, 18 Jan 2021 16:49:09 +1100 -Subject: [PATCH] fs/nilfs2: Reject too-large keys - -NILFS2 has up to 7 keys, per the data structure. Do not permit array -indices in excess of that. - -This catches some OOB reads. I don't know how controllable the invalidly -read data is or if that could be used later in the program. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/fs/nilfs2.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/grub-core/fs/nilfs2.c b/grub-core/fs/nilfs2.c -index 7ed148d..fee2242 100644 ---- a/grub-core/fs/nilfs2.c -+++ b/grub-core/fs/nilfs2.c -@@ -569,6 +569,11 @@ grub_nilfs2_btree_lookup (struct grub_nilfs2_data *data, - static inline grub_uint64_t - grub_nilfs2_direct_lookup (struct grub_nilfs2_inode *inode, grub_uint64_t key) - { -+ if (1 + key > 6) -+ { -+ grub_error (GRUB_ERR_BAD_FS, "key is too large"); -+ return 0xffffffffffffffff; -+ } - return grub_le_to_cpu64 (inode->i_bmap[1 + key]); - } - -@@ -584,7 +589,7 @@ grub_nilfs2_bmap_lookup (struct grub_nilfs2_data *data, - { - grub_uint64_t ptr; - ptr = grub_nilfs2_direct_lookup (inode, key); -- if (need_translate) -+ if (ptr != ((grub_uint64_t) 0xffffffffffffffff) && need_translate) - ptr = grub_nilfs2_dat_translate (data, ptr); - return ptr; - } --- -2.14.2 - diff --git a/boot/grub2/0112-fs-nilfs2-Don-t-search-children-if-provided-number-i.patch b/boot/grub2/0112-fs-nilfs2-Don-t-search-children-if-provided-number-i.patch deleted file mode 100644 index 426aceebe76..00000000000 --- a/boot/grub2/0112-fs-nilfs2-Don-t-search-children-if-provided-number-i.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 37c0eb05cdcc64c28d31c4ebd300f14d5239d05e Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Mon, 18 Jan 2021 16:49:44 +1100 -Subject: [PATCH] fs/nilfs2: Don't search children if provided number is too - large - -NILFS2 reads the number of children a node has from the node. Unfortunately, -that's not trustworthy. Check if it's beyond what the filesystem permits and -reject it if so. - -This blocks some OOB reads. I'm not sure how controllable the read is and what -could be done with invalidly read data later on. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/fs/nilfs2.c | 38 +++++++++++++++++++++++--------------- - 1 file changed, 23 insertions(+), 15 deletions(-) - -diff --git a/grub-core/fs/nilfs2.c b/grub-core/fs/nilfs2.c -index fee2242..43ac1ad 100644 ---- a/grub-core/fs/nilfs2.c -+++ b/grub-core/fs/nilfs2.c -@@ -416,14 +416,34 @@ grub_nilfs2_btree_node_get_key (struct grub_nilfs2_btree_node *node, - } - - static inline int --grub_nilfs2_btree_node_lookup (struct grub_nilfs2_btree_node *node, -+grub_nilfs2_btree_node_nchildren_max (struct grub_nilfs2_data *data, -+ struct grub_nilfs2_btree_node *node) -+{ -+ int node_children_max = ((NILFS2_BLOCK_SIZE (data) - -+ sizeof (struct grub_nilfs2_btree_node) - -+ NILFS_BTREE_NODE_EXTRA_PAD_SIZE) / -+ (sizeof (grub_uint64_t) + sizeof (grub_uint64_t))); -+ -+ return (node->bn_flags & NILFS_BTREE_NODE_ROOT) ? 3 : node_children_max; -+} -+ -+static inline int -+grub_nilfs2_btree_node_lookup (struct grub_nilfs2_data *data, -+ struct grub_nilfs2_btree_node *node, - grub_uint64_t key, int *indexp) - { - grub_uint64_t nkey; - int index, low, high, s; - - low = 0; -+ - high = grub_le_to_cpu16 (node->bn_nchildren) - 1; -+ if (high >= grub_nilfs2_btree_node_nchildren_max (data, node)) -+ { -+ grub_error (GRUB_ERR_BAD_FS, "too many children"); -+ return 0; -+ } -+ - index = 0; - s = 0; - while (low <= high) -@@ -459,18 +479,6 @@ grub_nilfs2_btree_node_lookup (struct grub_nilfs2_btree_node *node, - return s == 0; - } - --static inline int --grub_nilfs2_btree_node_nchildren_max (struct grub_nilfs2_data *data, -- struct grub_nilfs2_btree_node *node) --{ -- int node_children_max = ((NILFS2_BLOCK_SIZE (data) - -- sizeof (struct grub_nilfs2_btree_node) - -- NILFS_BTREE_NODE_EXTRA_PAD_SIZE) / -- (sizeof (grub_uint64_t) + sizeof (grub_uint64_t))); -- -- return (node->bn_flags & NILFS_BTREE_NODE_ROOT) ? 3 : node_children_max; --} -- - static inline grub_uint64_t * - grub_nilfs2_btree_node_dptrs (struct grub_nilfs2_data *data, - struct grub_nilfs2_btree_node *node) -@@ -517,7 +525,7 @@ grub_nilfs2_btree_lookup (struct grub_nilfs2_data *data, - node = grub_nilfs2_btree_get_root (inode); - level = grub_nilfs2_btree_get_level (node); - -- found = grub_nilfs2_btree_node_lookup (node, key, &index); -+ found = grub_nilfs2_btree_node_lookup (data, node, key, &index); - ptr = grub_nilfs2_btree_node_get_ptr (data, node, index); - if (need_translate) - ptr = grub_nilfs2_dat_translate (data, ptr); -@@ -538,7 +546,7 @@ grub_nilfs2_btree_lookup (struct grub_nilfs2_data *data, - } - - if (!found) -- found = grub_nilfs2_btree_node_lookup (node, key, &index); -+ found = grub_nilfs2_btree_node_lookup (data, node, key, &index); - else - index = 0; - --- -2.14.2 - diff --git a/boot/grub2/0113-fs-nilfs2-Properly-bail-on-errors-in-grub_nilfs2_btr.patch b/boot/grub2/0113-fs-nilfs2-Properly-bail-on-errors-in-grub_nilfs2_btr.patch deleted file mode 100644 index 85cb82d1ee1..00000000000 --- a/boot/grub2/0113-fs-nilfs2-Properly-bail-on-errors-in-grub_nilfs2_btr.patch +++ /dev/null @@ -1,68 +0,0 @@ -From ca5d9ac206043b1fb4cb06259272fb1c5946bb6d Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Mon, 18 Jan 2021 17:06:19 +1100 -Subject: [PATCH] fs/nilfs2: Properly bail on errors in - grub_nilfs2_btree_node_lookup() - -We just introduced an error return in grub_nilfs2_btree_node_lookup(). -Make sure the callers catch it. - -At the same time, make sure that grub_nilfs2_btree_node_lookup() always -inits the index pointer passed to it. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/fs/nilfs2.c | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - -diff --git a/grub-core/fs/nilfs2.c b/grub-core/fs/nilfs2.c -index 43ac1ad..aaba002 100644 ---- a/grub-core/fs/nilfs2.c -+++ b/grub-core/fs/nilfs2.c -@@ -433,7 +433,7 @@ grub_nilfs2_btree_node_lookup (struct grub_nilfs2_data *data, - grub_uint64_t key, int *indexp) - { - grub_uint64_t nkey; -- int index, low, high, s; -+ int index = 0, low, high, s; - - low = 0; - -@@ -441,10 +441,10 @@ grub_nilfs2_btree_node_lookup (struct grub_nilfs2_data *data, - if (high >= grub_nilfs2_btree_node_nchildren_max (data, node)) - { - grub_error (GRUB_ERR_BAD_FS, "too many children"); -+ *indexp = index; - return 0; - } - -- index = 0; - s = 0; - while (low <= high) - { -@@ -526,6 +526,10 @@ grub_nilfs2_btree_lookup (struct grub_nilfs2_data *data, - level = grub_nilfs2_btree_get_level (node); - - found = grub_nilfs2_btree_node_lookup (data, node, key, &index); -+ -+ if (grub_errno != GRUB_ERR_NONE) -+ goto fail; -+ - ptr = grub_nilfs2_btree_node_get_ptr (data, node, index); - if (need_translate) - ptr = grub_nilfs2_dat_translate (data, ptr); -@@ -550,7 +554,8 @@ grub_nilfs2_btree_lookup (struct grub_nilfs2_data *data, - else - index = 0; - -- if (index < grub_nilfs2_btree_node_nchildren_max (data, node)) -+ if (index < grub_nilfs2_btree_node_nchildren_max (data, node) && -+ grub_errno == GRUB_ERR_NONE) - { - ptr = grub_nilfs2_btree_node_get_ptr (data, node, index); - if (need_translate) --- -2.14.2 - diff --git a/boot/grub2/0114-io-gzio-Bail-if-gzio-tl-td-is-NULL.patch b/boot/grub2/0114-io-gzio-Bail-if-gzio-tl-td-is-NULL.patch deleted file mode 100644 index cf6b778401d..00000000000 --- a/boot/grub2/0114-io-gzio-Bail-if-gzio-tl-td-is-NULL.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 3334a5e6c86f10e715cca3bf66ce0fc2f164b61b Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Wed, 13 Jan 2021 20:59:09 +1100 -Subject: [PATCH] io/gzio: Bail if gzio->tl/td is NULL - -This is an ugly fix that doesn't address why gzio->tl comes to be NULL. -However, it seems to be sufficient to patch up a bunch of NULL derefs. - -It would be good to revisit this in future and see if we can have -a cleaner solution that addresses some of the causes of the unexpected -NULL pointers. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/io/gzio.c | 20 ++++++++++++++++++++ - 1 file changed, 20 insertions(+) - -diff --git a/grub-core/io/gzio.c b/grub-core/io/gzio.c -index 43d98a7..4a8eaea 100644 ---- a/grub-core/io/gzio.c -+++ b/grub-core/io/gzio.c -@@ -669,6 +669,13 @@ inflate_codes_in_window (grub_gzio_t gzio) - { - if (! gzio->code_state) - { -+ -+ if (gzio->tl == NULL) -+ { -+ grub_error (GRUB_ERR_BAD_COMPRESSED_DATA, "NULL gzio->tl"); -+ return 1; -+ } -+ - NEEDBITS ((unsigned) gzio->bl); - if ((e = (t = gzio->tl + ((unsigned) b & ml))->e) > 16) - do -@@ -707,6 +714,12 @@ inflate_codes_in_window (grub_gzio_t gzio) - n = t->v.n + ((unsigned) b & mask_bits[e]); - DUMPBITS (e); - -+ if (gzio->td == NULL) -+ { -+ grub_error (GRUB_ERR_BAD_COMPRESSED_DATA, "NULL gzio->td"); -+ return 1; -+ } -+ - /* decode distance of block to copy */ - NEEDBITS ((unsigned) gzio->bd); - if ((e = (t = gzio->td + ((unsigned) b & md))->e) > 16) -@@ -917,6 +930,13 @@ init_dynamic_block (grub_gzio_t gzio) - n = nl + nd; - m = mask_bits[gzio->bl]; - i = l = 0; -+ -+ if (gzio->tl == NULL) -+ { -+ grub_error (GRUB_ERR_BAD_COMPRESSED_DATA, "NULL gzio->tl"); -+ return; -+ } -+ - while ((unsigned) i < n) - { - NEEDBITS ((unsigned) gzio->bl); --- -2.14.2 - diff --git a/boot/grub2/0115-io-gzio-Add-init_dynamic_block-clean-up-if-unpacking.patch b/boot/grub2/0115-io-gzio-Add-init_dynamic_block-clean-up-if-unpacking.patch deleted file mode 100644 index 25b270aeebf..00000000000 --- a/boot/grub2/0115-io-gzio-Add-init_dynamic_block-clean-up-if-unpacking.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 18490336d91da2b532277cba56473bfed1376fc4 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Thu, 21 Jan 2021 00:05:58 +1100 -Subject: [PATCH] io/gzio: Add init_dynamic_block() clean up if unpacking codes - fails - -init_dynamic_block() didn't clean up gzio->tl and td in some error -paths. This left td pointing to part of tl. Then in grub_gzio_close(), -when tl was freed the storage for td would also be freed. The code then -attempts to free td explicitly, performing a UAF and then a double free. - -Explicitly clean up tl and td in the error paths. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/io/gzio.c | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) - -diff --git a/grub-core/io/gzio.c b/grub-core/io/gzio.c -index 4a8eaea..4236f0f 100644 ---- a/grub-core/io/gzio.c -+++ b/grub-core/io/gzio.c -@@ -953,7 +953,7 @@ init_dynamic_block (grub_gzio_t gzio) - if ((unsigned) i + j > n) - { - grub_error (GRUB_ERR_BAD_COMPRESSED_DATA, "too many codes found"); -- return; -+ goto fail; - } - while (j--) - ll[i++] = l; -@@ -966,7 +966,7 @@ init_dynamic_block (grub_gzio_t gzio) - if ((unsigned) i + j > n) - { - grub_error (GRUB_ERR_BAD_COMPRESSED_DATA, "too many codes found"); -- return; -+ goto fail; - } - while (j--) - ll[i++] = 0; -@@ -981,7 +981,7 @@ init_dynamic_block (grub_gzio_t gzio) - if ((unsigned) i + j > n) - { - grub_error (GRUB_ERR_BAD_COMPRESSED_DATA, "too many codes found"); -- return; -+ goto fail; - } - while (j--) - ll[i++] = 0; -@@ -1019,6 +1019,12 @@ init_dynamic_block (grub_gzio_t gzio) - /* indicate we're now working on a block */ - gzio->code_state = 0; - gzio->block_len++; -+ return; -+ -+ fail: -+ huft_free (gzio->tl); -+ gzio->td = NULL; -+ gzio->tl = NULL; - } - - --- -2.14.2 - diff --git a/boot/grub2/0116-io-gzio-Catch-missing-values-in-huft_build-and-bail.patch b/boot/grub2/0116-io-gzio-Catch-missing-values-in-huft_build-and-bail.patch deleted file mode 100644 index 3ee520c141e..00000000000 --- a/boot/grub2/0116-io-gzio-Catch-missing-values-in-huft_build-and-bail.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 4e76b08f7171a8603d74fcafb27409a91f578647 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Thu, 21 Jan 2021 12:20:49 +1100 -Subject: [PATCH] io/gzio: Catch missing values in huft_build() and bail - -In huft_build(), "v" is a table of values in order of bit length. -The code later (when setting up table entries in "r") assumes that all -elements of this array corresponding to a code are initialized and less -than N_MAX. However, it doesn't enforce this. - -With sufficiently manipulated inputs (e.g. from fuzzing), there can be -elements of "v" that are not filled. Therefore a lookup into "e" or "d" -will use an uninitialized value. This can lead to an invalid/OOB read on -those values, often leading to a crash. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/io/gzio.c | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/grub-core/io/gzio.c b/grub-core/io/gzio.c -index 4236f0f..19adebe 100644 ---- a/grub-core/io/gzio.c -+++ b/grub-core/io/gzio.c -@@ -507,6 +507,7 @@ huft_build (unsigned *b, /* code lengths in bits (all assumed <= BMAX) */ - } - - /* Make a table of values in order of bit lengths */ -+ grub_memset (v, N_MAX, ARRAY_SIZE (v)); - p = b; - i = 0; - do -@@ -588,11 +589,18 @@ huft_build (unsigned *b, /* code lengths in bits (all assumed <= BMAX) */ - r.v.n = (ush) (*p); /* simple code is just the value */ - p++; /* one compiler does not like *p++ */ - } -- else -+ else if (*p < N_MAX) - { - r.e = (uch) e[*p - s]; /* non-simple--look up in lists */ - r.v.n = d[*p++ - s]; - } -+ else -+ { -+ /* Detected an uninitialised value, abort. */ -+ if (h) -+ huft_free (u[0]); -+ return 2; -+ } - - /* fill code-like entries with r */ - f = 1 << (k - w); --- -2.14.2 - diff --git a/boot/grub2/0117-io-gzio-Zero-gzio-tl-td-in-init_dynamic_block-if-huf.patch b/boot/grub2/0117-io-gzio-Zero-gzio-tl-td-in-init_dynamic_block-if-huf.patch deleted file mode 100644 index a7ae3fb9ed3..00000000000 --- a/boot/grub2/0117-io-gzio-Zero-gzio-tl-td-in-init_dynamic_block-if-huf.patch +++ /dev/null @@ -1,42 +0,0 @@ -From b5a2b59cc5b8f5ee7ba3b951e7693e402d5b3a6f Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Thu, 21 Jan 2021 12:22:28 +1100 -Subject: [PATCH] io/gzio: Zero gzio->tl/td in init_dynamic_block() if - huft_build() fails - -If huft_build() fails, gzio->tl or gzio->td could contain pointers that -are no longer valid. Zero them out. - -This prevents a double free when grub_gzio_close() comes through and -attempts to free them again. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/io/gzio.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/grub-core/io/gzio.c b/grub-core/io/gzio.c -index 19adebe..aea86a0 100644 ---- a/grub-core/io/gzio.c -+++ b/grub-core/io/gzio.c -@@ -1010,6 +1010,7 @@ init_dynamic_block (grub_gzio_t gzio) - gzio->bl = lbits; - if (huft_build (ll, nl, 257, cplens, cplext, &gzio->tl, &gzio->bl) != 0) - { -+ gzio->tl = 0; - grub_error (GRUB_ERR_BAD_COMPRESSED_DATA, - "failed in building a Huffman code table"); - return; -@@ -1019,6 +1020,7 @@ init_dynamic_block (grub_gzio_t gzio) - { - huft_free (gzio->tl); - gzio->tl = 0; -+ gzio->td = 0; - grub_error (GRUB_ERR_BAD_COMPRESSED_DATA, - "failed in building a Huffman code table"); - return; --- -2.14.2 - diff --git a/boot/grub2/0118-disk-lvm-Don-t-go-beyond-the-end-of-the-data-we-read.patch b/boot/grub2/0118-disk-lvm-Don-t-go-beyond-the-end-of-the-data-we-read.patch deleted file mode 100644 index 31c99fbce7c..00000000000 --- a/boot/grub2/0118-disk-lvm-Don-t-go-beyond-the-end-of-the-data-we-read.patch +++ /dev/null @@ -1,49 +0,0 @@ -From a8cc95de74ccc3ad090e8062ac335c844f13c9f4 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Thu, 21 Jan 2021 17:59:14 +1100 -Subject: [PATCH] disk/lvm: Don't go beyond the end of the data we read from - disk - -We unconditionally trusted offset_xl from the LVM label header, even if -it told us that the PV header/disk locations were way off past the end -of the data we read from disk. - -Require that the offset be sane, fixing an OOB read and crash. - -Fixes: CID 314367, CID 314371 - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/disk/lvm.c | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -diff --git a/grub-core/disk/lvm.c b/grub-core/disk/lvm.c -index 139fafd..8136122 100644 ---- a/grub-core/disk/lvm.c -+++ b/grub-core/disk/lvm.c -@@ -141,6 +141,20 @@ grub_lvm_detect (grub_disk_t disk, - goto fail; - } - -+ /* -+ * We read a grub_lvm_pv_header and then 2 grub_lvm_disk_locns that -+ * immediately follow the PV header. Make sure we have space for both. -+ */ -+ if (grub_le_to_cpu32 (lh->offset_xl) >= -+ GRUB_LVM_LABEL_SIZE - sizeof (struct grub_lvm_pv_header) - -+ 2 * sizeof (struct grub_lvm_disk_locn)) -+ { -+#ifdef GRUB_UTIL -+ grub_util_info ("LVM PV header/disk locations are beyond the end of the block"); -+#endif -+ goto fail; -+ } -+ - pvh = (struct grub_lvm_pv_header *) (buf + grub_le_to_cpu32(lh->offset_xl)); - - for (i = 0, j = 0; i < GRUB_LVM_ID_LEN; i++) --- -2.14.2 - diff --git a/boot/grub2/0119-disk-lvm-Don-t-blast-past-the-end-of-the-circular-me.patch b/boot/grub2/0119-disk-lvm-Don-t-blast-past-the-end-of-the-circular-me.patch deleted file mode 100644 index 4f083847c2b..00000000000 --- a/boot/grub2/0119-disk-lvm-Don-t-blast-past-the-end-of-the-circular-me.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 27a79bf38e6d050e497eb96a3fdddce43af25577 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Thu, 21 Jan 2021 18:19:51 +1100 -Subject: [PATCH] disk/lvm: Don't blast past the end of the circular metadata - buffer - -This catches at least some OOB reads, and it's possible I suppose that -if 2 * mda_size is less than GRUB_LVM_MDA_HEADER_SIZE it might catch some -OOB writes too (although that hasn't showed up as a crash in fuzzing yet). - -It's a bit ugly and I'd appreciate better suggestions. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/disk/lvm.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/grub-core/disk/lvm.c b/grub-core/disk/lvm.c -index 8136122..36da575 100644 ---- a/grub-core/disk/lvm.c -+++ b/grub-core/disk/lvm.c -@@ -214,6 +214,16 @@ grub_lvm_detect (grub_disk_t disk, - if (grub_le_to_cpu64 (rlocn->offset) + grub_le_to_cpu64 (rlocn->size) > - grub_le_to_cpu64 (mdah->size)) - { -+ if (2 * mda_size < GRUB_LVM_MDA_HEADER_SIZE || -+ (grub_le_to_cpu64 (rlocn->offset) + grub_le_to_cpu64 (rlocn->size) - -+ grub_le_to_cpu64 (mdah->size) > mda_size - GRUB_LVM_MDA_HEADER_SIZE)) -+ { -+#ifdef GRUB_UTIL -+ grub_util_info ("cannot copy metadata wrap in circular buffer"); -+#endif -+ goto fail2; -+ } -+ - /* Metadata is circular. Copy the wrap in place. */ - grub_memcpy (metadatabuf + mda_size, - metadatabuf + GRUB_LVM_MDA_HEADER_SIZE, --- -2.14.2 - diff --git a/boot/grub2/0120-disk-lvm-Bail-on-missing-PV-list.patch b/boot/grub2/0120-disk-lvm-Bail-on-missing-PV-list.patch deleted file mode 100644 index f23740655c7..00000000000 --- a/boot/grub2/0120-disk-lvm-Bail-on-missing-PV-list.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 2958695c4cdc785de6ed708709af071a2d20afef Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Thu, 21 Jan 2021 18:54:29 +1100 -Subject: [PATCH] disk/lvm: Bail on missing PV list - -There's an if block for the presence of "physical_volumes {", but if -that block is absent, then p remains NULL and a NULL-deref will result -when looking for logical volumes. - -It doesn't seem like LVM makes sense without physical volumes, so error -out rather than crashing. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/disk/lvm.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/grub-core/disk/lvm.c b/grub-core/disk/lvm.c -index 36da575..8e560f3 100644 ---- a/grub-core/disk/lvm.c -+++ b/grub-core/disk/lvm.c -@@ -370,6 +370,8 @@ grub_lvm_detect (grub_disk_t disk, - goto fail4; - } - } -+ else -+ goto fail4; - - p = grub_strstr (p, "logical_volumes {"); - if (p) --- -2.14.2 - diff --git a/boot/grub2/0121-disk-lvm-Do-not-crash-if-an-expected-string-is-not-f.patch b/boot/grub2/0121-disk-lvm-Do-not-crash-if-an-expected-string-is-not-f.patch deleted file mode 100644 index 720e5a21844..00000000000 --- a/boot/grub2/0121-disk-lvm-Do-not-crash-if-an-expected-string-is-not-f.patch +++ /dev/null @@ -1,83 +0,0 @@ -From db29073fc7aec71a40dabfc722a96ea9f3280907 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Thu, 21 Jan 2021 18:35:22 +1100 -Subject: [PATCH] disk/lvm: Do not crash if an expected string is not found - -Clean up a bunch of cases where we could have strstr() fail and lead to -us dereferencing NULL. - -We'll still leak memory in some cases (loops don't clean up allocations -from earlier iterations if a later iteration fails) but at least we're -not crashing. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/disk/lvm.c | 22 +++++++++++++++++----- - 1 file changed, 17 insertions(+), 5 deletions(-) - -diff --git a/grub-core/disk/lvm.c b/grub-core/disk/lvm.c -index 8e560f3..bd5ae87 100644 ---- a/grub-core/disk/lvm.c -+++ b/grub-core/disk/lvm.c -@@ -539,7 +539,16 @@ grub_lvm_detect (grub_disk_t disk, - } - - if (seg->node_count != 1) -- seg->stripe_size = grub_lvm_getvalue (&p, "stripe_size = "); -+ { -+ seg->stripe_size = grub_lvm_getvalue (&p, "stripe_size = "); -+ if (p == NULL) -+ { -+#ifdef GRUB_UTIL -+ grub_util_info ("unknown stripe_size"); -+#endif -+ goto lvs_segment_fail; -+ } -+ } - - seg->nodes = grub_calloc (seg->node_count, - sizeof (*stripe)); -@@ -559,7 +568,7 @@ grub_lvm_detect (grub_disk_t disk, - { - p = grub_strchr (p, '"'); - if (p == NULL) -- continue; -+ goto lvs_segment_fail2; - q = ++p; - while (*q != '"') - q++; -@@ -578,7 +587,10 @@ grub_lvm_detect (grub_disk_t disk, - stripe->start = grub_lvm_getvalue (&p, ",") - * vg->extent_size; - if (p == NULL) -- continue; -+ { -+ grub_free (stripe->name); -+ goto lvs_segment_fail2; -+ } - - stripe++; - } -@@ -615,7 +627,7 @@ grub_lvm_detect (grub_disk_t disk, - - p = grub_strchr (p, '"'); - if (p == NULL) -- continue; -+ goto lvs_segment_fail2; - q = ++p; - while (*q != '"') - q++; -@@ -703,7 +715,7 @@ grub_lvm_detect (grub_disk_t disk, - p = p ? grub_strchr (p + 1, '"') : 0; - p = p ? grub_strchr (p + 1, '"') : 0; - if (p == NULL) -- continue; -+ goto lvs_segment_fail2; - q = ++p; - while (*q != '"') - q++; --- -2.14.2 - diff --git a/boot/grub2/0122-disk-lvm-Do-not-overread-metadata.patch b/boot/grub2/0122-disk-lvm-Do-not-overread-metadata.patch deleted file mode 100644 index 1aeb61ca591..00000000000 --- a/boot/grub2/0122-disk-lvm-Do-not-overread-metadata.patch +++ /dev/null @@ -1,111 +0,0 @@ -From 1155d7dffd3337942cb7583706b429d567d4db86 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Thu, 21 Jan 2021 18:35:22 +1100 -Subject: [PATCH] disk/lvm: Do not overread metadata - -We could reach the end of valid metadata and not realize, leading to -some buffer overreads. Check if we have reached the end and bail. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/disk/lvm.c | 31 +++++++++++++++++++++++++------ - 1 file changed, 25 insertions(+), 6 deletions(-) - -diff --git a/grub-core/disk/lvm.c b/grub-core/disk/lvm.c -index bd5ae87..742ecd6 100644 ---- a/grub-core/disk/lvm.c -+++ b/grub-core/disk/lvm.c -@@ -313,17 +313,23 @@ grub_lvm_detect (grub_disk_t disk, - while (1) - { - grub_ssize_t s; -- while (grub_isspace (*p)) -+ while (grub_isspace (*p) && p < mda_end) - p++; - -+ if (p == mda_end) -+ goto fail4; -+ - if (*p == '}') - break; - - pv = grub_zalloc (sizeof (*pv)); - q = p; -- while (*q != ' ') -+ while (*q != ' ' && q < mda_end) - q++; - -+ if (q == mda_end) -+ goto pvs_fail_noname; -+ - s = q - p; - pv->name = grub_malloc (s + 1); - grub_memcpy (pv->name, p, s); -@@ -366,6 +372,7 @@ grub_lvm_detect (grub_disk_t disk, - continue; - pvs_fail: - grub_free (pv->name); -+ pvs_fail_noname: - grub_free (pv); - goto fail4; - } -@@ -387,18 +394,24 @@ grub_lvm_detect (grub_disk_t disk, - struct grub_diskfilter_segment *seg; - int is_pvmove; - -- while (grub_isspace (*p)) -+ while (grub_isspace (*p) && p < mda_end) - p++; - -+ if (p == mda_end) -+ goto fail4; -+ - if (*p == '}') - break; - - lv = grub_zalloc (sizeof (*lv)); - - q = p; -- while (*q != ' ') -+ while (*q != ' ' && q < mda_end) - q++; - -+ if (q == mda_end) -+ goto lvs_fail; -+ - s = q - p; - lv->name = grub_strndup (p, s); - if (!lv->name) -@@ -570,9 +583,12 @@ grub_lvm_detect (grub_disk_t disk, - if (p == NULL) - goto lvs_segment_fail2; - q = ++p; -- while (*q != '"') -+ while (q < mda_end && *q != '"') - q++; - -+ if (q == mda_end) -+ goto lvs_segment_fail2; -+ - s = q - p; - - stripe->name = grub_malloc (s + 1); -@@ -629,9 +645,12 @@ grub_lvm_detect (grub_disk_t disk, - if (p == NULL) - goto lvs_segment_fail2; - q = ++p; -- while (*q != '"') -+ while (q < mda_end && *q != '"') - q++; - -+ if (q == mda_end) -+ goto lvs_segment_fail2; -+ - s = q - p; - - lvname = grub_malloc (s + 1); --- -2.14.2 - diff --git a/boot/grub2/0123-disk-lvm-Sanitize-rlocn-offset-to-prevent-wild-read.patch b/boot/grub2/0123-disk-lvm-Sanitize-rlocn-offset-to-prevent-wild-read.patch deleted file mode 100644 index 449e2634fc6..00000000000 --- a/boot/grub2/0123-disk-lvm-Sanitize-rlocn-offset-to-prevent-wild-read.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 701293684742d00133b39bf957d3642c81dc83f4 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Fri, 22 Jan 2021 14:43:58 +1100 -Subject: [PATCH] disk/lvm: Sanitize rlocn->offset to prevent wild read - -rlocn->offset is read directly from disk and added to the metadatabuf -pointer to create a pointer to a block of metadata. It's a 64-bit -quantity so as long as you don't overflow you can set subsequent -pointers to point anywhere in memory. - -Require that rlocn->offset fits within the metadata buffer size. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/disk/lvm.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/grub-core/disk/lvm.c b/grub-core/disk/lvm.c -index 742ecd6..ed0712f 100644 ---- a/grub-core/disk/lvm.c -+++ b/grub-core/disk/lvm.c -@@ -211,6 +211,14 @@ grub_lvm_detect (grub_disk_t disk, - } - - rlocn = mdah->raw_locns; -+ if (grub_le_to_cpu64 (rlocn->offset) >= grub_le_to_cpu64 (mda_size)) -+ { -+#ifdef GRUB_UTIL -+ grub_util_info ("metadata offset is beyond end of metadata area"); -+#endif -+ goto fail2; -+ } -+ - if (grub_le_to_cpu64 (rlocn->offset) + grub_le_to_cpu64 (rlocn->size) > - grub_le_to_cpu64 (mdah->size)) - { --- -2.14.2 - diff --git a/boot/grub2/0124-disk-lvm-Do-not-allow-a-LV-to-be-it-s-own-segment-s-.patch b/boot/grub2/0124-disk-lvm-Do-not-allow-a-LV-to-be-it-s-own-segment-s-.patch deleted file mode 100644 index 183b1fff666..00000000000 --- a/boot/grub2/0124-disk-lvm-Do-not-allow-a-LV-to-be-it-s-own-segment-s-.patch +++ /dev/null @@ -1,39 +0,0 @@ -From e18a00073890021362b4a48097672f1d4b340d3c Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Fri, 22 Jan 2021 14:42:21 +1100 -Subject: [PATCH] disk/lvm: Do not allow a LV to be it's own segment's node's - LV - -This prevents infinite recursion in the diskfilter verification code. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/disk/lvm.c | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -diff --git a/grub-core/disk/lvm.c b/grub-core/disk/lvm.c -index ed0712f..81dc375 100644 ---- a/grub-core/disk/lvm.c -+++ b/grub-core/disk/lvm.c -@@ -838,9 +838,13 @@ grub_lvm_detect (grub_disk_t disk, - } - if (lv1->segments[i].nodes[j].pv == NULL) - for (lv2 = vg->lvs; lv2; lv2 = lv2->next) -- if (grub_strcmp (lv2->name, -- lv1->segments[i].nodes[j].name) == 0) -- lv1->segments[i].nodes[j].lv = lv2; -+ { -+ if (lv1 == lv2) -+ continue; -+ if (grub_strcmp (lv2->name, -+ lv1->segments[i].nodes[j].name) == 0) -+ lv1->segments[i].nodes[j].lv = lv2; -+ } - } - - } --- -2.14.2 - diff --git a/boot/grub2/0125-fs-btrfs-Validate-the-number-of-stripes-parities-in-.patch b/boot/grub2/0125-fs-btrfs-Validate-the-number-of-stripes-parities-in-.patch deleted file mode 100644 index 2caa1b038bf..00000000000 --- a/boot/grub2/0125-fs-btrfs-Validate-the-number-of-stripes-parities-in-.patch +++ /dev/null @@ -1,33 +0,0 @@ -From b88a82e78cdd0ab8e0339c1c3f9564c4d8c0c969 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Mon, 18 Jan 2021 17:17:16 +1100 -Subject: [PATCH] fs/btrfs: Validate the number of stripes/parities in RAID5/6 - -This prevents a divide by zero if nstripes == nparities, and -also prevents propagation of invalid values if nstripes ends up -less than nparities. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/fs/btrfs.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c -index 2b65bd5..e4e87ba 100644 ---- a/grub-core/fs/btrfs.c -+++ b/grub-core/fs/btrfs.c -@@ -1076,6 +1076,9 @@ grub_btrfs_read_logical (struct grub_btrfs_data *data, grub_disk_addr_t addr, - * stripen is computed without the parities - * (0 for A0, A1, A2, 1 for B0, B1, B2, etc.). - */ -+ if (nparities >= nstripes) -+ return grub_error (GRUB_ERR_BAD_FS, -+ "invalid RAID5/6: nparities >= nstripes"); - high = grub_divmod64 (stripe_nr, nstripes - nparities, &stripen); - - /* --- -2.14.2 - diff --git a/boot/grub2/0126-fs-btrfs-Squash-some-uninitialized-reads.patch b/boot/grub2/0126-fs-btrfs-Squash-some-uninitialized-reads.patch deleted file mode 100644 index 32381f09b4c..00000000000 --- a/boot/grub2/0126-fs-btrfs-Squash-some-uninitialized-reads.patch +++ /dev/null @@ -1,43 +0,0 @@ -From b911884dd707ba1e6f641eb17857df3155013a45 Mon Sep 17 00:00:00 2001 -From: Daniel Axtens -Date: Mon, 18 Jan 2021 17:27:18 +1100 -Subject: [PATCH] fs/btrfs: Squash some uninitialized reads - -We need to check errors before calling into a function that uses the result. - -Signed-off-by: Daniel Axtens -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/fs/btrfs.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c -index e4e87ba..d489cb0 100644 ---- a/grub-core/fs/btrfs.c -+++ b/grub-core/fs/btrfs.c -@@ -381,9 +381,9 @@ next (struct grub_btrfs_data *data, - - err = grub_btrfs_read_logical (data, grub_le_to_cpu64 (node.addr), - &head, sizeof (head), 0); -- check_btrfs_header (data, &head, grub_le_to_cpu64 (node.addr)); - if (err) - return -err; -+ check_btrfs_header (data, &head, grub_le_to_cpu64 (node.addr)); - - save_ref (desc, grub_le_to_cpu64 (node.addr), 0, - grub_le_to_cpu32 (head.nitems), !head.level); -@@ -443,9 +443,9 @@ lower_bound (struct grub_btrfs_data *data, - /* FIXME: preread few nodes into buffer. */ - err = grub_btrfs_read_logical (data, addr, &head, sizeof (head), - recursion_depth + 1); -- check_btrfs_header (data, &head, addr); - if (err) - return err; -+ check_btrfs_header (data, &head, addr); - addr += sizeof (head); - if (head.level) - { --- -2.14.2 - diff --git a/boot/grub2/0127-kern-parser-Fix-a-memory-leak.patch b/boot/grub2/0127-kern-parser-Fix-a-memory-leak.patch deleted file mode 100644 index 77b1cac291b..00000000000 --- a/boot/grub2/0127-kern-parser-Fix-a-memory-leak.patch +++ /dev/null @@ -1,77 +0,0 @@ -From c6c426e5ab6ea715153b72584de6bd8c82f698ec Mon Sep 17 00:00:00 2001 -From: Chris Coulson -Date: Wed, 18 Nov 2020 00:59:24 +0000 -Subject: [PATCH] kern/parser: Fix a memory leak - -The getline() function supplied to grub_parser_split_cmdline() returns -a newly allocated buffer and can be called multiple times, but the -returned buffer is never freed. - -Signed-off-by: Chris Coulson -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/kern/parser.c | 20 ++++++++++++++++---- - 1 file changed, 16 insertions(+), 4 deletions(-) - -diff --git a/grub-core/kern/parser.c b/grub-core/kern/parser.c -index d1cf061..39e4df6 100644 ---- a/grub-core/kern/parser.c -+++ b/grub-core/kern/parser.c -@@ -140,6 +140,7 @@ grub_parser_split_cmdline (const char *cmdline, - char buffer[1024]; - char *bp = buffer; - char *rd = (char *) cmdline; -+ char *rp = rd; - char varname[200]; - char *vp = varname; - char *args; -@@ -149,10 +150,18 @@ grub_parser_split_cmdline (const char *cmdline, - *argv = NULL; - do - { -- if (!rd || !*rd) -+ if (rp == NULL || *rp == '\0') - { -+ if (rd != cmdline) -+ { -+ grub_free (rd); -+ rd = rp = NULL; -+ } - if (getline) -- getline (&rd, 1, getline_data); -+ { -+ getline (&rd, 1, getline_data); -+ rp = rd; -+ } - else - break; - } -@@ -160,12 +169,12 @@ grub_parser_split_cmdline (const char *cmdline, - if (!rd) - break; - -- for (; *rd; rd++) -+ for (; *rp != '\0'; rp++) - { - grub_parser_state_t newstate; - char use; - -- newstate = grub_parser_cmdline_state (state, *rd, &use); -+ newstate = grub_parser_cmdline_state (state, *rp, &use); - - /* If a variable was being processed and this character does - not describe the variable anymore, write the variable to -@@ -198,6 +207,9 @@ grub_parser_split_cmdline (const char *cmdline, - } - while (state != GRUB_PARSER_STATE_TEXT && !check_varstate (state)); - -+ if (rd != cmdline) -+ grub_free (rd); -+ - /* A special case for when the last character was part of a - variable. */ - add_var (varname, &bp, &vp, state, GRUB_PARSER_STATE_TEXT); --- -2.14.2 - diff --git a/boot/grub2/0128-kern-parser-Introduce-process_char-helper.patch b/boot/grub2/0128-kern-parser-Introduce-process_char-helper.patch deleted file mode 100644 index f771748b08a..00000000000 --- a/boot/grub2/0128-kern-parser-Introduce-process_char-helper.patch +++ /dev/null @@ -1,120 +0,0 @@ -From b1c9e9e889e4273fb15712051c887e6078511448 Mon Sep 17 00:00:00 2001 -From: Chris Coulson -Date: Tue, 5 Jan 2021 22:17:28 +0000 -Subject: [PATCH] kern/parser: Introduce process_char() helper - -grub_parser_split_cmdline() iterates over each command line character. -In order to add error checking and to simplify the subsequent error -handling, split the character processing in to a separate function. - -Signed-off-by: Chris Coulson -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/kern/parser.c | 74 ++++++++++++++++++++++++++++++------------------- - 1 file changed, 46 insertions(+), 28 deletions(-) - -diff --git a/grub-core/kern/parser.c b/grub-core/kern/parser.c -index 39e4df6..0d3582b 100644 ---- a/grub-core/kern/parser.c -+++ b/grub-core/kern/parser.c -@@ -1,7 +1,7 @@ - /* parser.c - the part of the parser that can return partial tokens */ - /* - * GRUB -- GRand Unified Bootloader -- * Copyright (C) 2005,2007,2009 Free Software Foundation, Inc. -+ * Copyright (C) 2005,2007,2009,2021 Free Software Foundation, Inc. - * - * GRUB is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -129,6 +129,46 @@ add_var (char *varname, char **bp, char **vp, - *((*bp)++) = *val; - } - -+static grub_err_t -+process_char (char c, char *buffer, char **bp, char *varname, char **vp, -+ grub_parser_state_t state, int *argc, -+ grub_parser_state_t *newstate) -+{ -+ char use; -+ -+ *newstate = grub_parser_cmdline_state (state, c, &use); -+ -+ /* -+ * If a variable was being processed and this character does -+ * not describe the variable anymore, write the variable to -+ * the buffer. -+ */ -+ add_var (varname, bp, vp, state, *newstate); -+ -+ if (check_varstate (*newstate)) -+ { -+ if (use) -+ *((*vp)++) = use; -+ } -+ else if (*newstate == GRUB_PARSER_STATE_TEXT && -+ state != GRUB_PARSER_STATE_ESC && grub_isspace (use)) -+ { -+ /* -+ * Don't add more than one argument if multiple -+ * spaces are used. -+ */ -+ if (*bp != buffer && *((*bp) - 1) != '\0') -+ { -+ *((*bp)++) = '\0'; -+ (*argc)++; -+ } -+ } -+ else if (use) -+ *((*bp)++) = use; -+ -+ return GRUB_ERR_NONE; -+} -+ - grub_err_t - grub_parser_split_cmdline (const char *cmdline, - grub_reader_getline_t getline, void *getline_data, -@@ -172,35 +212,13 @@ grub_parser_split_cmdline (const char *cmdline, - for (; *rp != '\0'; rp++) - { - grub_parser_state_t newstate; -- char use; -- -- newstate = grub_parser_cmdline_state (state, *rp, &use); - -- /* If a variable was being processed and this character does -- not describe the variable anymore, write the variable to -- the buffer. */ -- add_var (varname, &bp, &vp, state, newstate); -- -- if (check_varstate (newstate)) -- { -- if (use) -- *(vp++) = use; -- } -- else -+ if (process_char (*rp, buffer, &bp, varname, &vp, state, argc, -+ &newstate) != GRUB_ERR_NONE) - { -- if (newstate == GRUB_PARSER_STATE_TEXT -- && state != GRUB_PARSER_STATE_ESC && grub_isspace (use)) -- { -- /* Don't add more than one argument if multiple -- spaces are used. */ -- if (bp != buffer && *(bp - 1)) -- { -- *(bp++) = '\0'; -- (*argc)++; -- } -- } -- else if (use) -- *(bp++) = use; -+ if (rd != cmdline) -+ grub_free (rd); -+ return grub_errno; - } - state = newstate; - } --- -2.14.2 - diff --git a/boot/grub2/0129-kern-parser-Introduce-terminate_arg-helper.patch b/boot/grub2/0129-kern-parser-Introduce-terminate_arg-helper.patch deleted file mode 100644 index 7ed9f987a55..00000000000 --- a/boot/grub2/0129-kern-parser-Introduce-terminate_arg-helper.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 3d157bbd06506b170fde5ec23980c4bf9f7660e2 Mon Sep 17 00:00:00 2001 -From: Chris Coulson -Date: Thu, 7 Jan 2021 19:53:55 +0000 -Subject: [PATCH] kern/parser: Introduce terminate_arg() helper - -process_char() and grub_parser_split_cmdline() use similar code for -terminating the most recent argument. Add a helper function for this. - -Signed-off-by: Chris Coulson -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/kern/parser.c | 23 +++++++++++++---------- - 1 file changed, 13 insertions(+), 10 deletions(-) - -diff --git a/grub-core/kern/parser.c b/grub-core/kern/parser.c -index 0d3582b..572c670 100644 ---- a/grub-core/kern/parser.c -+++ b/grub-core/kern/parser.c -@@ -129,6 +129,16 @@ add_var (char *varname, char **bp, char **vp, - *((*bp)++) = *val; - } - -+static void -+terminate_arg (char *buffer, char **bp, int *argc) -+{ -+ if (*bp != buffer && *((*bp) - 1) != '\0') -+ { -+ *((*bp)++) = '\0'; -+ (*argc)++; -+ } -+} -+ - static grub_err_t - process_char (char c, char *buffer, char **bp, char *varname, char **vp, - grub_parser_state_t state, int *argc, -@@ -157,11 +167,7 @@ process_char (char c, char *buffer, char **bp, char *varname, char **vp, - * Don't add more than one argument if multiple - * spaces are used. - */ -- if (*bp != buffer && *((*bp) - 1) != '\0') -- { -- *((*bp)++) = '\0'; -- (*argc)++; -- } -+ terminate_arg (buffer, bp, argc); - } - else if (use) - *((*bp)++) = use; -@@ -232,11 +238,8 @@ grub_parser_split_cmdline (const char *cmdline, - variable. */ - add_var (varname, &bp, &vp, state, GRUB_PARSER_STATE_TEXT); - -- if (bp != buffer && *(bp - 1)) -- { -- *(bp++) = '\0'; -- (*argc)++; -- } -+ /* Ensure that the last argument is terminated. */ -+ terminate_arg (buffer, &bp, argc); - - /* If there are no args, then we're done. */ - if (!*argc) --- -2.14.2 - diff --git a/boot/grub2/0130-kern-parser-Refactor-grub_parser_split_cmdline-clean.patch b/boot/grub2/0130-kern-parser-Refactor-grub_parser_split_cmdline-clean.patch deleted file mode 100644 index e1e955ff2aa..00000000000 --- a/boot/grub2/0130-kern-parser-Refactor-grub_parser_split_cmdline-clean.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 8bc817014ce3d7a498db44eae33c8b90e2430926 Mon Sep 17 00:00:00 2001 -From: Chris Coulson -Date: Wed, 6 Jan 2021 13:54:26 +0000 -Subject: [PATCH] kern/parser: Refactor grub_parser_split_cmdline() cleanup - -Introduce a common function epilogue used for cleaning up on all -return paths, which will simplify additional error handling to be -introduced in a subsequent commit. - -Signed-off-by: Chris Coulson -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/kern/parser.c | 35 ++++++++++++++++++++--------------- - 1 file changed, 20 insertions(+), 15 deletions(-) - -diff --git a/grub-core/kern/parser.c b/grub-core/kern/parser.c -index 572c670..e010eaa 100644 ---- a/grub-core/kern/parser.c -+++ b/grub-core/kern/parser.c -@@ -221,19 +221,13 @@ grub_parser_split_cmdline (const char *cmdline, - - if (process_char (*rp, buffer, &bp, varname, &vp, state, argc, - &newstate) != GRUB_ERR_NONE) -- { -- if (rd != cmdline) -- grub_free (rd); -- return grub_errno; -- } -+ goto fail; -+ - state = newstate; - } - } - while (state != GRUB_PARSER_STATE_TEXT && !check_varstate (state)); - -- if (rd != cmdline) -- grub_free (rd); -- - /* A special case for when the last character was part of a - variable. */ - add_var (varname, &bp, &vp, state, GRUB_PARSER_STATE_TEXT); -@@ -243,20 +237,20 @@ grub_parser_split_cmdline (const char *cmdline, - - /* If there are no args, then we're done. */ - if (!*argc) -- return 0; -+ { -+ grub_errno = GRUB_ERR_NONE; -+ goto out; -+ } - - /* Reserve memory for the return values. */ - args = grub_malloc (bp - buffer); - if (!args) -- return grub_errno; -+ goto fail; - grub_memcpy (args, buffer, bp - buffer); - - *argv = grub_calloc (*argc + 1, sizeof (char *)); - if (!*argv) -- { -- grub_free (args); -- return grub_errno; -- } -+ goto fail; - - /* The arguments are separated with 0's, setup argv so it points to - the right values. */ -@@ -269,7 +263,18 @@ grub_parser_split_cmdline (const char *cmdline, - bp++; - } - -- return 0; -+ grub_errno = GRUB_ERR_NONE; -+ -+ out: -+ if (rd != cmdline) -+ grub_free (rd); -+ -+ return grub_errno; -+ -+ fail: -+ grub_free (*argv); -+ grub_free (args); -+ goto out; - } - - /* Helper for grub_parser_execute. */ --- -2.14.2 - diff --git a/boot/grub2/0131-kern-buffer-Add-variable-sized-heap-buffer.patch b/boot/grub2/0131-kern-buffer-Add-variable-sized-heap-buffer.patch deleted file mode 100644 index 1731011ca63..00000000000 --- a/boot/grub2/0131-kern-buffer-Add-variable-sized-heap-buffer.patch +++ /dev/null @@ -1,1237 +0,0 @@ -From 030fb6c4fa354cdbd6a8d6903dfed5d36eaf3cb2 Mon Sep 17 00:00:00 2001 -From: Chris Coulson -Date: Thu, 7 Jan 2021 15:15:43 +0000 -Subject: [PATCH] kern/buffer: Add variable sized heap buffer - -Add a new variable sized heap buffer type (grub_buffer_t) with simple -operations for appending data, accessing the data and maintaining -a read cursor. - -Signed-off-by: Chris Coulson -Reviewed-by: Daniel Kiper -[Add changes to generated files] -Signed-off-by: Stefan Sørensen ---- - grub-core/Makefile.core.am | 46 +++--- - grub-core/Makefile.core.def | 1 + - grub-core/Makefile.in | 341 +++++++++++++++++++++++++------------------- - grub-core/kern/buffer.c | 117 +++++++++++++++ - include/grub/buffer.h | 144 +++++++++++++++++++ - po/POTFILES.in | 2 + - 6 files changed, 485 insertions(+), 166 deletions(-) - create mode 100644 grub-core/kern/buffer.c - create mode 100644 include/grub/buffer.h - -diff --git a/grub-core/Makefile.core.am b/grub-core/Makefile.core.am -index fbfb627..2fa9a8e 100644 ---- a/grub-core/Makefile.core.am -+++ b/grub-core/Makefile.core.am -@@ -22334,7 +22334,7 @@ gcry_whirlpool.marker: $(gcry_whirlpool_module_SOURCES) $(nodist_gcry_whirlpool_ - if COND_emu - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = --kernel_exec_SOURCES += disk/host.c kern/emu/cache_s.S kern/emu/hostdisk.c osdep/unix/hostdisk.c osdep/exec.c osdep/devmapper/hostdisk.c osdep/hostdisk.c kern/emu/hostfs.c kern/emu/main.c kern/emu/argp_common.c kern/emu/misc.c kern/emu/mm.c kern/emu/time.c kern/emu/cache.c osdep/emuconsole.c osdep/dl.c osdep/sleep.c osdep/init.c osdep/emunet.c osdep/cputime.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += disk/host.c kern/emu/cache_s.S kern/emu/hostdisk.c osdep/unix/hostdisk.c osdep/exec.c osdep/devmapper/hostdisk.c osdep/hostdisk.c kern/emu/hostfs.c kern/emu/main.c kern/emu/argp_common.c kern/emu/misc.c kern/emu/mm.c kern/emu/time.c kern/emu/cache.c osdep/emuconsole.c osdep/dl.c osdep/sleep.c osdep/init.c osdep/emunet.c osdep/cputime.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/buffer.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) $(CFLAGS_GNULIB) -@@ -22356,7 +22356,7 @@ endif - if COND_i386_pc - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/i386/pc/startup.S --kernel_exec_SOURCES += kern/i386/pc/init.c kern/i386/pc/mmap.c term/i386/pc/console.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += kern/i386/pc/init.c kern/i386/pc/mmap.c term/i386/pc/console.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/buffer.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22378,7 +22378,7 @@ endif - if COND_i386_efi - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/i386/efi/startup.S --kernel_exec_SOURCES += kern/i386/efi/tsc.c kern/i386/tsc_pmtimer.c kern/i386/efi/init.c bus/pci.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/lockdown.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += kern/i386/efi/tsc.c kern/i386/tsc_pmtimer.c kern/i386/efi/init.c bus/pci.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/lockdown.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/buffer.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22400,7 +22400,7 @@ endif - if COND_i386_qemu - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/i386/qemu/startup.S --kernel_exec_SOURCES += kern/i386/qemu/init.c bus/pci.c kern/vga_init.c kern/i386/qemu/mmap.c term/i386/pc/vga_text.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += kern/i386/qemu/init.c bus/pci.c kern/vga_init.c kern/i386/qemu/mmap.c term/i386/pc/vga_text.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/buffer.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22422,7 +22422,7 @@ endif - if COND_i386_coreboot - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/i386/coreboot/startup.S --kernel_exec_SOURCES += kern/i386/coreboot/init.c kern/i386/pc/acpi.c kern/acpi.c kern/i386/tsc_pmtimer.c kern/i386/coreboot/cbtable.c video/coreboot/cbfb.c kern/coreboot/mmap.c kern/coreboot/cbtable.c term/gfxterm.c font/font.c font/font_cmd.c io/bufio.c video/fb/fbblit.c video/fb/fbfill.c video/fb/fbutil.c video/fb/video_fb.c video/video.c term/i386/pc/vga_text.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += kern/i386/coreboot/init.c kern/i386/pc/acpi.c kern/acpi.c kern/i386/tsc_pmtimer.c kern/i386/coreboot/cbtable.c video/coreboot/cbfb.c kern/coreboot/mmap.c kern/coreboot/cbtable.c term/gfxterm.c font/font.c font/font_cmd.c io/bufio.c video/fb/fbblit.c video/fb/fbfill.c video/fb/fbutil.c video/fb/video_fb.c video/video.c term/i386/pc/vga_text.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/buffer.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22444,7 +22444,7 @@ endif - if COND_i386_multiboot - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/i386/coreboot/startup.S --kernel_exec_SOURCES += kern/i386/coreboot/init.c kern/i386/pc/acpi.c kern/acpi.c kern/i386/multiboot_mmap.c term/i386/pc/vga_text.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += kern/i386/coreboot/init.c kern/i386/pc/acpi.c kern/acpi.c kern/i386/multiboot_mmap.c term/i386/pc/vga_text.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/buffer.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22466,7 +22466,7 @@ endif - if COND_i386_ieee1275 - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/i386/ieee1275/startup.S --kernel_exec_SOURCES += disk/ieee1275/ofdisk.c kern/ieee1275/cmain.c kern/ieee1275/ieee1275.c kern/ieee1275/mmap.c kern/ieee1275/openfw.c term/ieee1275/console.c kern/ieee1275/init.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += disk/ieee1275/ofdisk.c kern/ieee1275/cmain.c kern/ieee1275/ieee1275.c kern/ieee1275/mmap.c kern/ieee1275/openfw.c term/ieee1275/console.c kern/ieee1275/init.c kern/i386/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/buffer.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22488,7 +22488,7 @@ endif - if COND_x86_64_efi - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/x86_64/efi/startup.S --kernel_exec_SOURCES += kern/i386/efi/tsc.c kern/i386/tsc_pmtimer.c kern/x86_64/efi/callwrap.S kern/i386/efi/init.c bus/pci.c kern/x86_64/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/lockdown.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += kern/i386/efi/tsc.c kern/i386/tsc_pmtimer.c kern/x86_64/efi/callwrap.S kern/i386/efi/init.c bus/pci.c kern/x86_64/dl.c kern/i386/tsc.c kern/i386/tsc_pit.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/lockdown.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/buffer.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22510,7 +22510,7 @@ endif - if COND_i386_xen - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/i386/xen/startup.S --kernel_exec_SOURCES += kern/i386/dl.c kern/i386/xen/hypercall.S kern/i386/tsc.c kern/i386/xen/tsc.c kern/xen/init.c term/xen/console.c disk/xen/xendisk.c commands/boot.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += kern/i386/dl.c kern/i386/xen/hypercall.S kern/i386/tsc.c kern/i386/xen/tsc.c kern/xen/init.c term/xen/console.c disk/xen/xendisk.c commands/boot.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/buffer.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22532,7 +22532,7 @@ endif - if COND_x86_64_xen - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/x86_64/xen/startup.S --kernel_exec_SOURCES += kern/x86_64/dl.c kern/x86_64/xen/hypercall.S kern/i386/tsc.c kern/i386/xen/tsc.c kern/xen/init.c term/xen/console.c disk/xen/xendisk.c commands/boot.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += kern/x86_64/dl.c kern/x86_64/xen/hypercall.S kern/i386/tsc.c kern/i386/xen/tsc.c kern/xen/init.c term/xen/console.c disk/xen/xendisk.c commands/boot.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/buffer.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22554,7 +22554,7 @@ endif - if COND_i386_xen_pvh - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/i386/xen/startup_pvh.S --kernel_exec_SOURCES += kern/i386/dl.c commands/boot.c disk/xen/xendisk.c kern/i386/tsc.c kern/i386/xen/tsc.c kern/i386/xen/pvh.c kern/xen/init.c term/xen/console.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += kern/i386/dl.c commands/boot.c disk/xen/xendisk.c kern/i386/tsc.c kern/i386/xen/tsc.c kern/i386/xen/pvh.c kern/xen/init.c term/xen/console.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/buffer.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22576,7 +22576,7 @@ endif - if COND_mips_loongson - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/mips/startup.S --kernel_exec_SOURCES += term/ns8250.c bus/bonito.c bus/cs5536.c bus/pci.c kern/mips/loongson/init.c term/at_keyboard.c term/ps2.c commands/boot.c term/serial.c video/sm712.c video/sis315pro.c video/radeon_fuloong2e.c video/radeon_yeeloong3a.c commands/keylayouts.c term/gfxterm.c font/font.c font/font_cmd.c io/bufio.c video/fb/fbblit.c video/fb/fbfill.c video/fb/fbutil.c video/fb/video_fb.c video/video.c kern/generic/rtc_get_time_ms.c kern/mips/cache.S kern/mips/dl.c kern/mips/init.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += term/ns8250.c bus/bonito.c bus/cs5536.c bus/pci.c kern/mips/loongson/init.c term/at_keyboard.c term/ps2.c commands/boot.c term/serial.c video/sm712.c video/sis315pro.c video/radeon_fuloong2e.c video/radeon_yeeloong3a.c commands/keylayouts.c term/gfxterm.c font/font.c font/font_cmd.c io/bufio.c video/fb/fbblit.c video/fb/fbfill.c video/fb/fbutil.c video/fb/video_fb.c video/video.c kern/generic/rtc_get_time_ms.c kern/mips/cache.S kern/mips/dl.c kern/mips/init.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/buffer.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22598,7 +22598,7 @@ endif - if COND_sparc64_ieee1275 - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/sparc64/ieee1275/crt0.S --kernel_exec_SOURCES += kern/sparc64/cache.S kern/sparc64/dl.c kern/sparc64/ieee1275/ieee1275.c disk/ieee1275/obdisk.c disk/ieee1275/ofdisk.c kern/ieee1275/cmain.c kern/ieee1275/ieee1275.c kern/ieee1275/mmap.c kern/ieee1275/openfw.c term/ieee1275/console.c kern/ieee1275/init.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += kern/sparc64/cache.S kern/sparc64/dl.c kern/sparc64/ieee1275/ieee1275.c disk/ieee1275/obdisk.c disk/ieee1275/ofdisk.c kern/ieee1275/cmain.c kern/ieee1275/ieee1275.c kern/ieee1275/mmap.c kern/ieee1275/openfw.c term/ieee1275/console.c kern/ieee1275/init.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/buffer.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22620,7 +22620,7 @@ endif - if COND_powerpc_ieee1275 - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/powerpc/ieee1275/startup.S --kernel_exec_SOURCES += kern/powerpc/cache.S kern/powerpc/dl.c kern/powerpc/compiler-rt.S disk/ieee1275/ofdisk.c kern/ieee1275/cmain.c kern/ieee1275/ieee1275.c kern/ieee1275/mmap.c kern/ieee1275/openfw.c term/ieee1275/console.c kern/ieee1275/init.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += kern/powerpc/cache.S kern/powerpc/dl.c kern/powerpc/compiler-rt.S disk/ieee1275/ofdisk.c kern/ieee1275/cmain.c kern/ieee1275/ieee1275.c kern/ieee1275/mmap.c kern/ieee1275/openfw.c term/ieee1275/console.c kern/ieee1275/init.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/buffer.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22642,7 +22642,7 @@ endif - if COND_mips_arc - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/mips/startup.S --kernel_exec_SOURCES += kern/mips/arc/init.c term/arc/console.c disk/arc/arcdisk.c kern/generic/rtc_get_time_ms.c kern/mips/cache.S kern/mips/dl.c kern/mips/init.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += kern/mips/arc/init.c term/arc/console.c disk/arc/arcdisk.c kern/generic/rtc_get_time_ms.c kern/mips/cache.S kern/mips/dl.c kern/mips/init.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/buffer.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22664,7 +22664,7 @@ endif - if COND_ia64_efi - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = --kernel_exec_SOURCES += kern/ia64/efi/startup.S kern/ia64/efi/init.c kern/ia64/dl.c kern/ia64/dl_helper.c kern/ia64/cache.c lib/division.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/lockdown.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += kern/ia64/efi/startup.S kern/ia64/efi/init.c kern/ia64/dl.c kern/ia64/dl_helper.c kern/ia64/cache.c lib/division.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/lockdown.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/buffer.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -fno-builtin -fpic -minline-int-divide-max-throughput -@@ -22686,7 +22686,7 @@ endif - if COND_mips_qemu_mips - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/mips/startup.S --kernel_exec_SOURCES += kern/mips/qemu_mips/init.c term/ns8250.c term/serial.c term/at_keyboard.c term/ps2.c commands/boot.c commands/keylayouts.c term/i386/pc/vga_text.c kern/vga_init.c kern/generic/rtc_get_time_ms.c kern/mips/cache.S kern/mips/dl.c kern/mips/init.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += kern/mips/qemu_mips/init.c term/ns8250.c term/serial.c term/at_keyboard.c term/ps2.c commands/boot.c commands/keylayouts.c term/i386/pc/vga_text.c kern/vga_init.c kern/generic/rtc_get_time_ms.c kern/mips/cache.S kern/mips/dl.c kern/mips/init.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/buffer.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22708,7 +22708,7 @@ endif - if COND_arm_uboot - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/arm/startup.S --kernel_exec_SOURCES += kern/arm/uboot/init.c kern/arm/uboot/uboot.S disk/uboot/ubootdisk.c kern/uboot/uboot.c kern/uboot/init.c kern/uboot/hw.c term/uboot/console.c kern/arm/dl.c kern/arm/dl_helper.c kern/arm/cache_armv6.S kern/arm/cache_armv7.S kern/arm/cache.c kern/arm/compiler-rt.S lib/division.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += kern/arm/uboot/init.c kern/arm/uboot/uboot.S disk/uboot/ubootdisk.c kern/uboot/uboot.c kern/uboot/init.c kern/uboot/hw.c term/uboot/console.c kern/arm/dl.c kern/arm/dl_helper.c kern/arm/cache_armv6.S kern/arm/cache_armv7.S kern/arm/cache.c kern/arm/compiler-rt.S lib/division.c term/terminfo.c term/tparm.c commands/extcmd.c lib/arg.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/buffer.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22730,7 +22730,7 @@ endif - if COND_arm_efi - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/arm/efi/startup.S --kernel_exec_SOURCES += kern/arm/efi/init.c kern/efi/fdt.c kern/arm/dl.c kern/arm/dl_helper.c kern/arm/cache_armv6.S kern/arm/cache_armv7.S kern/arm/cache.c kern/arm/compiler-rt.S lib/division.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/lockdown.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += kern/arm/efi/init.c kern/efi/fdt.c kern/arm/dl.c kern/arm/dl_helper.c kern/arm/cache_armv6.S kern/arm/cache_armv7.S kern/arm/cache.c kern/arm/compiler-rt.S lib/division.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/lockdown.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/buffer.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22752,7 +22752,7 @@ endif - if COND_arm64_efi - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/arm64/efi/startup.S --kernel_exec_SOURCES += kern/arm64/efi/init.c kern/efi/fdt.c kern/arm64/cache.c kern/arm64/cache_flush.S kern/arm64/dl.c kern/arm64/dl_helper.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/lockdown.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += kern/arm64/efi/init.c kern/efi/fdt.c kern/arm64/cache.c kern/arm64/cache_flush.S kern/arm64/dl.c kern/arm64/dl_helper.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/lockdown.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/buffer.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22774,7 +22774,7 @@ endif - if COND_arm_coreboot - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/arm/startup.S --kernel_exec_SOURCES += kern/arm/coreboot/init.c kern/arm/coreboot/timer.c kern/arm/coreboot/coreboot.S lib/fdt.c bus/fdt.c term/ps2.c term/arm/pl050.c term/arm/cros.c term/arm/cros_ec.c bus/spi/rk3288_spi.c commands/keylayouts.c kern/arm/coreboot/dma.c kern/arm/coreboot/cbtable.c video/coreboot/cbfb.c kern/coreboot/mmap.c kern/coreboot/cbtable.c term/gfxterm.c font/font.c font/font_cmd.c io/bufio.c video/fb/fbblit.c video/fb/fbfill.c video/fb/fbutil.c video/fb/video_fb.c video/video.c kern/arm/dl.c kern/arm/dl_helper.c kern/arm/cache_armv6.S kern/arm/cache_armv7.S kern/arm/cache.c kern/arm/compiler-rt.S lib/division.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += kern/arm/coreboot/init.c kern/arm/coreboot/timer.c kern/arm/coreboot/coreboot.S lib/fdt.c bus/fdt.c term/ps2.c term/arm/pl050.c term/arm/cros.c term/arm/cros_ec.c bus/spi/rk3288_spi.c commands/keylayouts.c kern/arm/coreboot/dma.c kern/arm/coreboot/cbtable.c video/coreboot/cbfb.c kern/coreboot/mmap.c kern/coreboot/cbtable.c term/gfxterm.c font/font.c font/font_cmd.c io/bufio.c video/fb/fbblit.c video/fb/fbfill.c video/fb/fbutil.c video/fb/video_fb.c video/video.c kern/arm/dl.c kern/arm/dl_helper.c kern/arm/cache_armv6.S kern/arm/cache_armv7.S kern/arm/cache.c kern/arm/compiler-rt.S lib/division.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/buffer.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22796,7 +22796,7 @@ endif - if COND_riscv32_efi - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/riscv/efi/startup.S --kernel_exec_SOURCES += kern/riscv/efi/init.c kern/efi/fdt.c kern/riscv/cache.c kern/riscv/cache_flush.S kern/riscv/dl.c lib/division.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/lockdown.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += kern/riscv/efi/init.c kern/efi/fdt.c kern/riscv/cache.c kern/riscv/cache_flush.S kern/riscv/dl.c lib/division.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/lockdown.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/buffer.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -@@ -22818,7 +22818,7 @@ endif - if COND_riscv64_efi - platform_PROGRAMS += kernel.exec - kernel_exec_SOURCES = kern/riscv/efi/startup.S --kernel_exec_SOURCES += kern/riscv/efi/init.c kern/efi/fdt.c kern/riscv/cache.c kern/riscv/cache_flush.S kern/riscv/dl.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/lockdown.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c -+kernel_exec_SOURCES += kern/riscv/efi/init.c kern/efi/fdt.c kern/riscv/cache.c kern/riscv/cache_flush.S kern/riscv/dl.c disk/efi/efidisk.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c kern/efi/acpi.c kern/efi/sb.c kern/lockdown.c kern/compiler-rt.c kern/mm.c kern/time.c kern/generic/millisleep.c kern/buffer.c kern/command.c kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c kern/parser.c kern/partition.c kern/rescue_parser.c kern/rescue_reader.c kern/term.c kern/verifiers.c - nodist_kernel_exec_SOURCES = symlist.c ## platform nodist sources - kernel_exec_LDADD = - kernel_exec_CFLAGS = $(AM_CFLAGS) $(CFLAGS_KERNEL) -diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index ee8dc55..291b58a 100644 ---- a/grub-core/Makefile.core.def -+++ b/grub-core/Makefile.core.def -@@ -123,6 +123,7 @@ kernel = { - riscv32_efi_startup = kern/riscv/efi/startup.S; - riscv64_efi_startup = kern/riscv/efi/startup.S; - -+ common = kern/buffer.c; - common = kern/command.c; - common = kern/corecmd.c; - common = kern/device.c; -diff --git a/grub-core/Makefile.in b/grub-core/Makefile.in -index ac400ea..1f8133b 100644 ---- a/grub-core/Makefile.in -+++ b/grub-core/Makefile.in -@@ -10459,12 +10459,12 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - kern/efi/init.c kern/efi/mm.c term/efi/console.c kern/acpi.c \ - kern/efi/acpi.c kern/efi/sb.c kern/lockdown.c \ - kern/compiler-rt.c kern/mm.c kern/time.c \ -- kern/generic/millisleep.c kern/command.c kern/corecmd.c \ -- kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c \ -- kern/file.c kern/fs.c kern/list.c kern/main.c kern/misc.c \ -- kern/parser.c kern/partition.c kern/rescue_parser.c \ -- kern/rescue_reader.c kern/term.c kern/verifiers.c \ -- kern/arm/startup.S kern/arm/coreboot/init.c \ -+ kern/generic/millisleep.c kern/buffer.c kern/command.c \ -+ kern/corecmd.c kern/device.c kern/disk.c kern/dl.c kern/env.c \ -+ kern/err.c kern/file.c kern/fs.c kern/list.c kern/main.c \ -+ kern/misc.c kern/parser.c kern/partition.c \ -+ kern/rescue_parser.c kern/rescue_reader.c kern/term.c \ -+ kern/verifiers.c kern/arm/startup.S kern/arm/coreboot/init.c \ - kern/arm/coreboot/timer.c kern/arm/coreboot/coreboot.S \ - lib/fdt.c bus/fdt.c term/ps2.c term/arm/pl050.c \ - term/arm/cros.c term/arm/cros_ec.c bus/spi/rk3288_spi.c \ -@@ -10538,6 +10538,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_TRUE@ kern/generic/kernel_exec-millisleep.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_TRUE@ kern/kernel_exec-buffer.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_TRUE@ kern/kernel_exec-command.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_TRUE@ kern/kernel_exec-corecmd.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_FALSE@@COND_x86_64_xen_TRUE@ kern/kernel_exec-device.$(OBJEXT) \ -@@ -10578,6 +10579,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/generic/kernel_exec-millisleep.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/kernel_exec-buffer.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/kernel_exec-command.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/kernel_exec-corecmd.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_FALSE@@COND_x86_64_efi_TRUE@ kern/kernel_exec-device.$(OBJEXT) \ -@@ -10616,6 +10618,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_TRUE@ kern/generic/kernel_exec-millisleep.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_TRUE@ kern/kernel_exec-buffer.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_TRUE@ kern/kernel_exec-command.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_TRUE@ kern/kernel_exec-corecmd.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_FALSE@@COND_sparc64_ieee1275_TRUE@ kern/kernel_exec-device.$(OBJEXT) \ -@@ -10653,6 +10656,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/generic/kernel_exec-millisleep.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/kernel_exec-buffer.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/kernel_exec-command.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/kernel_exec-corecmd.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_FALSE@@COND_riscv64_efi_TRUE@ kern/kernel_exec-device.$(OBJEXT) \ -@@ -10691,6 +10695,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/generic/kernel_exec-millisleep.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/kernel_exec-buffer.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/kernel_exec-command.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/kernel_exec-corecmd.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_FALSE@@COND_riscv32_efi_TRUE@ kern/kernel_exec-device.$(OBJEXT) \ -@@ -10728,6 +10733,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_TRUE@ kern/generic/kernel_exec-millisleep.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_TRUE@ kern/kernel_exec-buffer.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_TRUE@ kern/kernel_exec-command.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_TRUE@ kern/kernel_exec-corecmd.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_FALSE@@COND_powerpc_ieee1275_TRUE@ kern/kernel_exec-device.$(OBJEXT) \ -@@ -10768,6 +10774,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_TRUE@ kern/generic/kernel_exec-millisleep.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_TRUE@ kern/kernel_exec-buffer.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_TRUE@ kern/kernel_exec-command.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_TRUE@ kern/kernel_exec-corecmd.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_FALSE@@COND_mips_qemu_mips_TRUE@ kern/kernel_exec-device.$(OBJEXT) \ -@@ -10822,6 +10829,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_TRUE@ kern/generic/kernel_exec-millisleep.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_TRUE@ kern/kernel_exec-buffer.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_TRUE@ kern/kernel_exec-command.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_TRUE@ kern/kernel_exec-corecmd.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_FALSE@@COND_mips_loongson_TRUE@ kern/kernel_exec-device.$(OBJEXT) \ -@@ -10856,6 +10864,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_TRUE@ kern/generic/kernel_exec-millisleep.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_TRUE@ kern/kernel_exec-buffer.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_TRUE@ kern/kernel_exec-command.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_TRUE@ kern/kernel_exec-corecmd.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_FALSE@@COND_mips_arc_TRUE@ kern/kernel_exec-device.$(OBJEXT) \ -@@ -10893,6 +10902,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/generic/kernel_exec-millisleep.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/kernel_exec-buffer.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/kernel_exec-command.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/kernel_exec-corecmd.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_FALSE@@COND_ia64_efi_TRUE@ kern/kernel_exec-device.$(OBJEXT) \ -@@ -10928,6 +10938,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_TRUE@ kern/generic/kernel_exec-millisleep.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_TRUE@ kern/kernel_exec-buffer.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_TRUE@ kern/kernel_exec-command.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_TRUE@ kern/kernel_exec-corecmd.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_FALSE@@COND_i386_xen_pvh_TRUE@ kern/kernel_exec-device.$(OBJEXT) \ -@@ -10963,6 +10974,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_TRUE@ kern/generic/kernel_exec-millisleep.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_TRUE@ kern/kernel_exec-buffer.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_TRUE@ kern/kernel_exec-command.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_TRUE@ kern/kernel_exec-corecmd.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_FALSE@@COND_i386_xen_TRUE@ kern/kernel_exec-device.$(OBJEXT) \ -@@ -10994,6 +11006,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_TRUE@ kern/generic/kernel_exec-millisleep.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_TRUE@ kern/kernel_exec-buffer.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_TRUE@ kern/kernel_exec-command.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_TRUE@ kern/kernel_exec-corecmd.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_FALSE@@COND_i386_qemu_TRUE@ kern/kernel_exec-device.$(OBJEXT) \ -@@ -11023,6 +11036,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_TRUE@ kern/generic/kernel_exec-millisleep.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_TRUE@ kern/kernel_exec-buffer.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_TRUE@ kern/kernel_exec-command.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_TRUE@ kern/kernel_exec-corecmd.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_FALSE@@COND_i386_pc_TRUE@ kern/kernel_exec-device.$(OBJEXT) \ -@@ -11054,6 +11068,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_TRUE@ kern/generic/kernel_exec-millisleep.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_TRUE@ kern/kernel_exec-buffer.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_TRUE@ kern/kernel_exec-command.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_TRUE@ kern/kernel_exec-corecmd.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_FALSE@@COND_i386_multiboot_TRUE@ kern/kernel_exec-device.$(OBJEXT) \ -@@ -11091,6 +11106,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_TRUE@ kern/generic/kernel_exec-millisleep.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_TRUE@ kern/kernel_exec-buffer.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_TRUE@ kern/kernel_exec-command.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_TRUE@ kern/kernel_exec-corecmd.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_FALSE@@COND_i386_ieee1275_TRUE@ kern/kernel_exec-device.$(OBJEXT) \ -@@ -11130,6 +11146,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/generic/kernel_exec-millisleep.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/kernel_exec-buffer.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/kernel_exec-command.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/kernel_exec-corecmd.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_FALSE@@COND_i386_efi_TRUE@ kern/kernel_exec-device.$(OBJEXT) \ -@@ -11174,6 +11191,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_TRUE@ kern/generic/kernel_exec-millisleep.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_TRUE@ kern/kernel_exec-buffer.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_TRUE@ kern/kernel_exec-command.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_TRUE@ kern/kernel_exec-corecmd.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_FALSE@@COND_i386_coreboot_TRUE@ kern/kernel_exec-device.$(OBJEXT) \ -@@ -11216,6 +11234,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_TRUE@ term/kernel_exec-tparm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_TRUE@ commands/kernel_exec-extcmd.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_TRUE@ lib/kernel_exec-arg.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_TRUE@ kern/kernel_exec-buffer.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_TRUE@ kern/kernel_exec-command.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_TRUE@ kern/kernel_exec-corecmd.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_FALSE@@COND_emu_TRUE@ kern/kernel_exec-device.$(OBJEXT) \ -@@ -11257,6 +11276,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_TRUE@ kern/generic/kernel_exec-millisleep.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_TRUE@ kern/kernel_exec-buffer.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_TRUE@ kern/kernel_exec-command.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_TRUE@ kern/kernel_exec-corecmd.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_FALSE@@COND_arm_uboot_TRUE@ kern/kernel_exec-device.$(OBJEXT) \ -@@ -11298,6 +11318,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/generic/kernel_exec-millisleep.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/kernel_exec-buffer.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/kernel_exec-command.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/kernel_exec-corecmd.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_FALSE@@COND_arm_efi_TRUE@ kern/kernel_exec-device.$(OBJEXT) \ -@@ -11353,6 +11374,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_TRUE@ kern/generic/kernel_exec-millisleep.$(OBJEXT) \ -+@COND_arm64_efi_FALSE@@COND_arm_coreboot_TRUE@ kern/kernel_exec-buffer.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_TRUE@ kern/kernel_exec-command.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_TRUE@ kern/kernel_exec-corecmd.$(OBJEXT) \ - @COND_arm64_efi_FALSE@@COND_arm_coreboot_TRUE@ kern/kernel_exec-device.$(OBJEXT) \ -@@ -11391,6 +11413,7 @@ am__kernel_exec_SOURCES_DIST = kern/arm64/efi/startup.S \ - @COND_arm64_efi_TRUE@ kern/kernel_exec-mm.$(OBJEXT) \ - @COND_arm64_efi_TRUE@ kern/kernel_exec-time.$(OBJEXT) \ - @COND_arm64_efi_TRUE@ kern/generic/kernel_exec-millisleep.$(OBJEXT) \ -+@COND_arm64_efi_TRUE@ kern/kernel_exec-buffer.$(OBJEXT) \ - @COND_arm64_efi_TRUE@ kern/kernel_exec-command.$(OBJEXT) \ - @COND_arm64_efi_TRUE@ kern/kernel_exec-corecmd.$(OBJEXT) \ - @COND_arm64_efi_TRUE@ kern/kernel_exec-device.$(OBJEXT) \ -@@ -25607,11 +25630,12 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_arm64_efi_TRUE@ kern/acpi.c kern/efi/acpi.c kern/efi/sb.c \ - @COND_arm64_efi_TRUE@ kern/lockdown.c kern/compiler-rt.c \ - @COND_arm64_efi_TRUE@ kern/mm.c kern/time.c \ --@COND_arm64_efi_TRUE@ kern/generic/millisleep.c kern/command.c \ --@COND_arm64_efi_TRUE@ kern/corecmd.c kern/device.c kern/disk.c \ --@COND_arm64_efi_TRUE@ kern/dl.c kern/env.c kern/err.c \ --@COND_arm64_efi_TRUE@ kern/file.c kern/fs.c kern/list.c \ --@COND_arm64_efi_TRUE@ kern/main.c kern/misc.c kern/parser.c \ -+@COND_arm64_efi_TRUE@ kern/generic/millisleep.c kern/buffer.c \ -+@COND_arm64_efi_TRUE@ kern/command.c kern/corecmd.c \ -+@COND_arm64_efi_TRUE@ kern/device.c kern/disk.c kern/dl.c \ -+@COND_arm64_efi_TRUE@ kern/env.c kern/err.c kern/file.c \ -+@COND_arm64_efi_TRUE@ kern/fs.c kern/list.c kern/main.c \ -+@COND_arm64_efi_TRUE@ kern/misc.c kern/parser.c \ - @COND_arm64_efi_TRUE@ kern/partition.c kern/rescue_parser.c \ - @COND_arm64_efi_TRUE@ kern/rescue_reader.c kern/term.c \ - @COND_arm64_efi_TRUE@ kern/verifiers.c -@@ -25639,12 +25663,13 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_arm_coreboot_TRUE@ kern/arm/compiler-rt.S lib/division.c \ - @COND_arm_coreboot_TRUE@ kern/compiler-rt.c kern/mm.c \ - @COND_arm_coreboot_TRUE@ kern/time.c kern/generic/millisleep.c \ --@COND_arm_coreboot_TRUE@ kern/command.c kern/corecmd.c \ --@COND_arm_coreboot_TRUE@ kern/device.c kern/disk.c kern/dl.c \ --@COND_arm_coreboot_TRUE@ kern/env.c kern/err.c kern/file.c \ --@COND_arm_coreboot_TRUE@ kern/fs.c kern/list.c kern/main.c \ --@COND_arm_coreboot_TRUE@ kern/misc.c kern/parser.c \ --@COND_arm_coreboot_TRUE@ kern/partition.c kern/rescue_parser.c \ -+@COND_arm_coreboot_TRUE@ kern/buffer.c kern/command.c \ -+@COND_arm_coreboot_TRUE@ kern/corecmd.c kern/device.c \ -+@COND_arm_coreboot_TRUE@ kern/disk.c kern/dl.c kern/env.c \ -+@COND_arm_coreboot_TRUE@ kern/err.c kern/file.c kern/fs.c \ -+@COND_arm_coreboot_TRUE@ kern/list.c kern/main.c kern/misc.c \ -+@COND_arm_coreboot_TRUE@ kern/parser.c kern/partition.c \ -+@COND_arm_coreboot_TRUE@ kern/rescue_parser.c \ - @COND_arm_coreboot_TRUE@ kern/rescue_reader.c kern/term.c \ - @COND_arm_coreboot_TRUE@ kern/verifiers.c - @COND_arm_efi_TRUE@kernel_exec_SOURCES = kern/arm/efi/startup.S \ -@@ -25659,13 +25684,14 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_arm_efi_TRUE@ kern/efi/acpi.c kern/efi/sb.c \ - @COND_arm_efi_TRUE@ kern/lockdown.c kern/compiler-rt.c \ - @COND_arm_efi_TRUE@ kern/mm.c kern/time.c \ --@COND_arm_efi_TRUE@ kern/generic/millisleep.c kern/command.c \ --@COND_arm_efi_TRUE@ kern/corecmd.c kern/device.c kern/disk.c \ --@COND_arm_efi_TRUE@ kern/dl.c kern/env.c kern/err.c kern/file.c \ --@COND_arm_efi_TRUE@ kern/fs.c kern/list.c kern/main.c \ --@COND_arm_efi_TRUE@ kern/misc.c kern/parser.c kern/partition.c \ --@COND_arm_efi_TRUE@ kern/rescue_parser.c kern/rescue_reader.c \ --@COND_arm_efi_TRUE@ kern/term.c kern/verifiers.c -+@COND_arm_efi_TRUE@ kern/generic/millisleep.c kern/buffer.c \ -+@COND_arm_efi_TRUE@ kern/command.c kern/corecmd.c kern/device.c \ -+@COND_arm_efi_TRUE@ kern/disk.c kern/dl.c kern/env.c kern/err.c \ -+@COND_arm_efi_TRUE@ kern/file.c kern/fs.c kern/list.c \ -+@COND_arm_efi_TRUE@ kern/main.c kern/misc.c kern/parser.c \ -+@COND_arm_efi_TRUE@ kern/partition.c kern/rescue_parser.c \ -+@COND_arm_efi_TRUE@ kern/rescue_reader.c kern/term.c \ -+@COND_arm_efi_TRUE@ kern/verifiers.c - @COND_arm_uboot_TRUE@kernel_exec_SOURCES = kern/arm/startup.S \ - @COND_arm_uboot_TRUE@ kern/arm/uboot/init.c \ - @COND_arm_uboot_TRUE@ kern/arm/uboot/uboot.S \ -@@ -25679,11 +25705,12 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_arm_uboot_TRUE@ term/terminfo.c term/tparm.c \ - @COND_arm_uboot_TRUE@ commands/extcmd.c lib/arg.c \ - @COND_arm_uboot_TRUE@ kern/compiler-rt.c kern/mm.c kern/time.c \ --@COND_arm_uboot_TRUE@ kern/generic/millisleep.c kern/command.c \ --@COND_arm_uboot_TRUE@ kern/corecmd.c kern/device.c kern/disk.c \ --@COND_arm_uboot_TRUE@ kern/dl.c kern/env.c kern/err.c \ --@COND_arm_uboot_TRUE@ kern/file.c kern/fs.c kern/list.c \ --@COND_arm_uboot_TRUE@ kern/main.c kern/misc.c kern/parser.c \ -+@COND_arm_uboot_TRUE@ kern/generic/millisleep.c kern/buffer.c \ -+@COND_arm_uboot_TRUE@ kern/command.c kern/corecmd.c \ -+@COND_arm_uboot_TRUE@ kern/device.c kern/disk.c kern/dl.c \ -+@COND_arm_uboot_TRUE@ kern/env.c kern/err.c kern/file.c \ -+@COND_arm_uboot_TRUE@ kern/fs.c kern/list.c kern/main.c \ -+@COND_arm_uboot_TRUE@ kern/misc.c kern/parser.c \ - @COND_arm_uboot_TRUE@ kern/partition.c kern/rescue_parser.c \ - @COND_arm_uboot_TRUE@ kern/rescue_reader.c kern/term.c \ - @COND_arm_uboot_TRUE@ kern/verifiers.c -@@ -25696,11 +25723,11 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_emu_TRUE@ kern/emu/cache.c osdep/emuconsole.c osdep/dl.c \ - @COND_emu_TRUE@ osdep/sleep.c osdep/init.c osdep/emunet.c \ - @COND_emu_TRUE@ osdep/cputime.c term/terminfo.c term/tparm.c \ --@COND_emu_TRUE@ commands/extcmd.c lib/arg.c kern/command.c \ --@COND_emu_TRUE@ kern/corecmd.c kern/device.c kern/disk.c \ --@COND_emu_TRUE@ kern/dl.c kern/env.c kern/err.c kern/file.c \ --@COND_emu_TRUE@ kern/fs.c kern/list.c kern/main.c kern/misc.c \ --@COND_emu_TRUE@ kern/parser.c kern/partition.c \ -+@COND_emu_TRUE@ commands/extcmd.c lib/arg.c kern/buffer.c \ -+@COND_emu_TRUE@ kern/command.c kern/corecmd.c kern/device.c \ -+@COND_emu_TRUE@ kern/disk.c kern/dl.c kern/env.c kern/err.c \ -+@COND_emu_TRUE@ kern/file.c kern/fs.c kern/list.c kern/main.c \ -+@COND_emu_TRUE@ kern/misc.c kern/parser.c kern/partition.c \ - @COND_emu_TRUE@ kern/rescue_parser.c kern/rescue_reader.c \ - @COND_emu_TRUE@ kern/term.c kern/verifiers.c - @COND_i386_coreboot_TRUE@kernel_exec_SOURCES = \ -@@ -25721,12 +25748,13 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_i386_coreboot_TRUE@ kern/i386/tsc_pit.c \ - @COND_i386_coreboot_TRUE@ kern/compiler-rt.c kern/mm.c \ - @COND_i386_coreboot_TRUE@ kern/time.c kern/generic/millisleep.c \ --@COND_i386_coreboot_TRUE@ kern/command.c kern/corecmd.c \ --@COND_i386_coreboot_TRUE@ kern/device.c kern/disk.c kern/dl.c \ --@COND_i386_coreboot_TRUE@ kern/env.c kern/err.c kern/file.c \ --@COND_i386_coreboot_TRUE@ kern/fs.c kern/list.c kern/main.c \ --@COND_i386_coreboot_TRUE@ kern/misc.c kern/parser.c \ --@COND_i386_coreboot_TRUE@ kern/partition.c kern/rescue_parser.c \ -+@COND_i386_coreboot_TRUE@ kern/buffer.c kern/command.c \ -+@COND_i386_coreboot_TRUE@ kern/corecmd.c kern/device.c \ -+@COND_i386_coreboot_TRUE@ kern/disk.c kern/dl.c kern/env.c \ -+@COND_i386_coreboot_TRUE@ kern/err.c kern/file.c kern/fs.c \ -+@COND_i386_coreboot_TRUE@ kern/list.c kern/main.c kern/misc.c \ -+@COND_i386_coreboot_TRUE@ kern/parser.c kern/partition.c \ -+@COND_i386_coreboot_TRUE@ kern/rescue_parser.c \ - @COND_i386_coreboot_TRUE@ kern/rescue_reader.c kern/term.c \ - @COND_i386_coreboot_TRUE@ kern/verifiers.c - @COND_i386_efi_TRUE@kernel_exec_SOURCES = kern/i386/efi/startup.S \ -@@ -25740,14 +25768,14 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_i386_efi_TRUE@ kern/acpi.c kern/efi/acpi.c kern/efi/sb.c \ - @COND_i386_efi_TRUE@ kern/lockdown.c kern/compiler-rt.c \ - @COND_i386_efi_TRUE@ kern/mm.c kern/time.c \ --@COND_i386_efi_TRUE@ kern/generic/millisleep.c kern/command.c \ --@COND_i386_efi_TRUE@ kern/corecmd.c kern/device.c kern/disk.c \ --@COND_i386_efi_TRUE@ kern/dl.c kern/env.c kern/err.c \ --@COND_i386_efi_TRUE@ kern/file.c kern/fs.c kern/list.c \ --@COND_i386_efi_TRUE@ kern/main.c kern/misc.c kern/parser.c \ --@COND_i386_efi_TRUE@ kern/partition.c kern/rescue_parser.c \ --@COND_i386_efi_TRUE@ kern/rescue_reader.c kern/term.c \ --@COND_i386_efi_TRUE@ kern/verifiers.c -+@COND_i386_efi_TRUE@ kern/generic/millisleep.c kern/buffer.c \ -+@COND_i386_efi_TRUE@ kern/command.c kern/corecmd.c \ -+@COND_i386_efi_TRUE@ kern/device.c kern/disk.c kern/dl.c \ -+@COND_i386_efi_TRUE@ kern/env.c kern/err.c kern/file.c \ -+@COND_i386_efi_TRUE@ kern/fs.c kern/list.c kern/main.c \ -+@COND_i386_efi_TRUE@ kern/misc.c kern/parser.c kern/partition.c \ -+@COND_i386_efi_TRUE@ kern/rescue_parser.c kern/rescue_reader.c \ -+@COND_i386_efi_TRUE@ kern/term.c kern/verifiers.c - @COND_i386_ieee1275_TRUE@kernel_exec_SOURCES = \ - @COND_i386_ieee1275_TRUE@ kern/i386/ieee1275/startup.S \ - @COND_i386_ieee1275_TRUE@ disk/ieee1275/ofdisk.c \ -@@ -25762,12 +25790,13 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_i386_ieee1275_TRUE@ commands/extcmd.c lib/arg.c \ - @COND_i386_ieee1275_TRUE@ kern/compiler-rt.c kern/mm.c \ - @COND_i386_ieee1275_TRUE@ kern/time.c kern/generic/millisleep.c \ --@COND_i386_ieee1275_TRUE@ kern/command.c kern/corecmd.c \ --@COND_i386_ieee1275_TRUE@ kern/device.c kern/disk.c kern/dl.c \ --@COND_i386_ieee1275_TRUE@ kern/env.c kern/err.c kern/file.c \ --@COND_i386_ieee1275_TRUE@ kern/fs.c kern/list.c kern/main.c \ --@COND_i386_ieee1275_TRUE@ kern/misc.c kern/parser.c \ --@COND_i386_ieee1275_TRUE@ kern/partition.c kern/rescue_parser.c \ -+@COND_i386_ieee1275_TRUE@ kern/buffer.c kern/command.c \ -+@COND_i386_ieee1275_TRUE@ kern/corecmd.c kern/device.c \ -+@COND_i386_ieee1275_TRUE@ kern/disk.c kern/dl.c kern/env.c \ -+@COND_i386_ieee1275_TRUE@ kern/err.c kern/file.c kern/fs.c \ -+@COND_i386_ieee1275_TRUE@ kern/list.c kern/main.c kern/misc.c \ -+@COND_i386_ieee1275_TRUE@ kern/parser.c kern/partition.c \ -+@COND_i386_ieee1275_TRUE@ kern/rescue_parser.c \ - @COND_i386_ieee1275_TRUE@ kern/rescue_reader.c kern/term.c \ - @COND_i386_ieee1275_TRUE@ kern/verifiers.c - @COND_i386_multiboot_TRUE@kernel_exec_SOURCES = \ -@@ -25781,12 +25810,12 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_i386_multiboot_TRUE@ kern/compiler-rt.c kern/mm.c \ - @COND_i386_multiboot_TRUE@ kern/time.c \ - @COND_i386_multiboot_TRUE@ kern/generic/millisleep.c \ --@COND_i386_multiboot_TRUE@ kern/command.c kern/corecmd.c \ --@COND_i386_multiboot_TRUE@ kern/device.c kern/disk.c kern/dl.c \ --@COND_i386_multiboot_TRUE@ kern/env.c kern/err.c kern/file.c \ --@COND_i386_multiboot_TRUE@ kern/fs.c kern/list.c kern/main.c \ --@COND_i386_multiboot_TRUE@ kern/misc.c kern/parser.c \ --@COND_i386_multiboot_TRUE@ kern/partition.c \ -+@COND_i386_multiboot_TRUE@ kern/buffer.c kern/command.c \ -+@COND_i386_multiboot_TRUE@ kern/corecmd.c kern/device.c \ -+@COND_i386_multiboot_TRUE@ kern/disk.c kern/dl.c kern/env.c \ -+@COND_i386_multiboot_TRUE@ kern/err.c kern/file.c kern/fs.c \ -+@COND_i386_multiboot_TRUE@ kern/list.c kern/main.c kern/misc.c \ -+@COND_i386_multiboot_TRUE@ kern/parser.c kern/partition.c \ - @COND_i386_multiboot_TRUE@ kern/rescue_parser.c \ - @COND_i386_multiboot_TRUE@ kern/rescue_reader.c kern/term.c \ - @COND_i386_multiboot_TRUE@ kern/verifiers.c -@@ -25795,24 +25824,26 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_i386_pc_TRUE@ term/i386/pc/console.c kern/i386/dl.c \ - @COND_i386_pc_TRUE@ kern/i386/tsc.c kern/i386/tsc_pit.c \ - @COND_i386_pc_TRUE@ kern/compiler-rt.c kern/mm.c kern/time.c \ --@COND_i386_pc_TRUE@ kern/generic/millisleep.c kern/command.c \ --@COND_i386_pc_TRUE@ kern/corecmd.c kern/device.c kern/disk.c \ --@COND_i386_pc_TRUE@ kern/dl.c kern/env.c kern/err.c kern/file.c \ --@COND_i386_pc_TRUE@ kern/fs.c kern/list.c kern/main.c \ --@COND_i386_pc_TRUE@ kern/misc.c kern/parser.c kern/partition.c \ --@COND_i386_pc_TRUE@ kern/rescue_parser.c kern/rescue_reader.c \ --@COND_i386_pc_TRUE@ kern/term.c kern/verifiers.c -+@COND_i386_pc_TRUE@ kern/generic/millisleep.c kern/buffer.c \ -+@COND_i386_pc_TRUE@ kern/command.c kern/corecmd.c kern/device.c \ -+@COND_i386_pc_TRUE@ kern/disk.c kern/dl.c kern/env.c kern/err.c \ -+@COND_i386_pc_TRUE@ kern/file.c kern/fs.c kern/list.c \ -+@COND_i386_pc_TRUE@ kern/main.c kern/misc.c kern/parser.c \ -+@COND_i386_pc_TRUE@ kern/partition.c kern/rescue_parser.c \ -+@COND_i386_pc_TRUE@ kern/rescue_reader.c kern/term.c \ -+@COND_i386_pc_TRUE@ kern/verifiers.c - @COND_i386_qemu_TRUE@kernel_exec_SOURCES = kern/i386/qemu/startup.S \ - @COND_i386_qemu_TRUE@ kern/i386/qemu/init.c bus/pci.c \ - @COND_i386_qemu_TRUE@ kern/vga_init.c kern/i386/qemu/mmap.c \ - @COND_i386_qemu_TRUE@ term/i386/pc/vga_text.c kern/i386/dl.c \ - @COND_i386_qemu_TRUE@ kern/i386/tsc.c kern/i386/tsc_pit.c \ - @COND_i386_qemu_TRUE@ kern/compiler-rt.c kern/mm.c kern/time.c \ --@COND_i386_qemu_TRUE@ kern/generic/millisleep.c kern/command.c \ --@COND_i386_qemu_TRUE@ kern/corecmd.c kern/device.c kern/disk.c \ --@COND_i386_qemu_TRUE@ kern/dl.c kern/env.c kern/err.c \ --@COND_i386_qemu_TRUE@ kern/file.c kern/fs.c kern/list.c \ --@COND_i386_qemu_TRUE@ kern/main.c kern/misc.c kern/parser.c \ -+@COND_i386_qemu_TRUE@ kern/generic/millisleep.c kern/buffer.c \ -+@COND_i386_qemu_TRUE@ kern/command.c kern/corecmd.c \ -+@COND_i386_qemu_TRUE@ kern/device.c kern/disk.c kern/dl.c \ -+@COND_i386_qemu_TRUE@ kern/env.c kern/err.c kern/file.c \ -+@COND_i386_qemu_TRUE@ kern/fs.c kern/list.c kern/main.c \ -+@COND_i386_qemu_TRUE@ kern/misc.c kern/parser.c \ - @COND_i386_qemu_TRUE@ kern/partition.c kern/rescue_parser.c \ - @COND_i386_qemu_TRUE@ kern/rescue_reader.c kern/term.c \ - @COND_i386_qemu_TRUE@ kern/verifiers.c -@@ -25824,14 +25855,14 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_i386_xen_TRUE@ term/terminfo.c term/tparm.c \ - @COND_i386_xen_TRUE@ commands/extcmd.c lib/arg.c \ - @COND_i386_xen_TRUE@ kern/compiler-rt.c kern/mm.c kern/time.c \ --@COND_i386_xen_TRUE@ kern/generic/millisleep.c kern/command.c \ --@COND_i386_xen_TRUE@ kern/corecmd.c kern/device.c kern/disk.c \ --@COND_i386_xen_TRUE@ kern/dl.c kern/env.c kern/err.c \ --@COND_i386_xen_TRUE@ kern/file.c kern/fs.c kern/list.c \ --@COND_i386_xen_TRUE@ kern/main.c kern/misc.c kern/parser.c \ --@COND_i386_xen_TRUE@ kern/partition.c kern/rescue_parser.c \ --@COND_i386_xen_TRUE@ kern/rescue_reader.c kern/term.c \ --@COND_i386_xen_TRUE@ kern/verifiers.c -+@COND_i386_xen_TRUE@ kern/generic/millisleep.c kern/buffer.c \ -+@COND_i386_xen_TRUE@ kern/command.c kern/corecmd.c \ -+@COND_i386_xen_TRUE@ kern/device.c kern/disk.c kern/dl.c \ -+@COND_i386_xen_TRUE@ kern/env.c kern/err.c kern/file.c \ -+@COND_i386_xen_TRUE@ kern/fs.c kern/list.c kern/main.c \ -+@COND_i386_xen_TRUE@ kern/misc.c kern/parser.c kern/partition.c \ -+@COND_i386_xen_TRUE@ kern/rescue_parser.c kern/rescue_reader.c \ -+@COND_i386_xen_TRUE@ kern/term.c kern/verifiers.c - @COND_i386_xen_pvh_TRUE@kernel_exec_SOURCES = \ - @COND_i386_xen_pvh_TRUE@ kern/i386/xen/startup_pvh.S \ - @COND_i386_xen_pvh_TRUE@ kern/i386/dl.c commands/boot.c \ -@@ -25842,12 +25873,13 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_i386_xen_pvh_TRUE@ term/tparm.c commands/extcmd.c \ - @COND_i386_xen_pvh_TRUE@ lib/arg.c kern/compiler-rt.c kern/mm.c \ - @COND_i386_xen_pvh_TRUE@ kern/time.c kern/generic/millisleep.c \ --@COND_i386_xen_pvh_TRUE@ kern/command.c kern/corecmd.c \ --@COND_i386_xen_pvh_TRUE@ kern/device.c kern/disk.c kern/dl.c \ --@COND_i386_xen_pvh_TRUE@ kern/env.c kern/err.c kern/file.c \ --@COND_i386_xen_pvh_TRUE@ kern/fs.c kern/list.c kern/main.c \ --@COND_i386_xen_pvh_TRUE@ kern/misc.c kern/parser.c \ --@COND_i386_xen_pvh_TRUE@ kern/partition.c kern/rescue_parser.c \ -+@COND_i386_xen_pvh_TRUE@ kern/buffer.c kern/command.c \ -+@COND_i386_xen_pvh_TRUE@ kern/corecmd.c kern/device.c \ -+@COND_i386_xen_pvh_TRUE@ kern/disk.c kern/dl.c kern/env.c \ -+@COND_i386_xen_pvh_TRUE@ kern/err.c kern/file.c kern/fs.c \ -+@COND_i386_xen_pvh_TRUE@ kern/list.c kern/main.c kern/misc.c \ -+@COND_i386_xen_pvh_TRUE@ kern/parser.c kern/partition.c \ -+@COND_i386_xen_pvh_TRUE@ kern/rescue_parser.c \ - @COND_i386_xen_pvh_TRUE@ kern/rescue_reader.c kern/term.c \ - @COND_i386_xen_pvh_TRUE@ kern/verifiers.c - @COND_ia64_efi_TRUE@kernel_exec_SOURCES = kern/ia64/efi/startup.S \ -@@ -25859,14 +25891,14 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_ia64_efi_TRUE@ kern/acpi.c kern/efi/acpi.c kern/efi/sb.c \ - @COND_ia64_efi_TRUE@ kern/lockdown.c kern/compiler-rt.c \ - @COND_ia64_efi_TRUE@ kern/mm.c kern/time.c \ --@COND_ia64_efi_TRUE@ kern/generic/millisleep.c kern/command.c \ --@COND_ia64_efi_TRUE@ kern/corecmd.c kern/device.c kern/disk.c \ --@COND_ia64_efi_TRUE@ kern/dl.c kern/env.c kern/err.c \ --@COND_ia64_efi_TRUE@ kern/file.c kern/fs.c kern/list.c \ --@COND_ia64_efi_TRUE@ kern/main.c kern/misc.c kern/parser.c \ --@COND_ia64_efi_TRUE@ kern/partition.c kern/rescue_parser.c \ --@COND_ia64_efi_TRUE@ kern/rescue_reader.c kern/term.c \ --@COND_ia64_efi_TRUE@ kern/verifiers.c -+@COND_ia64_efi_TRUE@ kern/generic/millisleep.c kern/buffer.c \ -+@COND_ia64_efi_TRUE@ kern/command.c kern/corecmd.c \ -+@COND_ia64_efi_TRUE@ kern/device.c kern/disk.c kern/dl.c \ -+@COND_ia64_efi_TRUE@ kern/env.c kern/err.c kern/file.c \ -+@COND_ia64_efi_TRUE@ kern/fs.c kern/list.c kern/main.c \ -+@COND_ia64_efi_TRUE@ kern/misc.c kern/parser.c kern/partition.c \ -+@COND_ia64_efi_TRUE@ kern/rescue_parser.c kern/rescue_reader.c \ -+@COND_ia64_efi_TRUE@ kern/term.c kern/verifiers.c - @COND_mips_arc_TRUE@kernel_exec_SOURCES = kern/mips/startup.S \ - @COND_mips_arc_TRUE@ kern/mips/arc/init.c term/arc/console.c \ - @COND_mips_arc_TRUE@ disk/arc/arcdisk.c \ -@@ -25875,14 +25907,14 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_mips_arc_TRUE@ kern/mips/init.c term/terminfo.c \ - @COND_mips_arc_TRUE@ term/tparm.c commands/extcmd.c lib/arg.c \ - @COND_mips_arc_TRUE@ kern/compiler-rt.c kern/mm.c kern/time.c \ --@COND_mips_arc_TRUE@ kern/generic/millisleep.c kern/command.c \ --@COND_mips_arc_TRUE@ kern/corecmd.c kern/device.c kern/disk.c \ --@COND_mips_arc_TRUE@ kern/dl.c kern/env.c kern/err.c \ --@COND_mips_arc_TRUE@ kern/file.c kern/fs.c kern/list.c \ --@COND_mips_arc_TRUE@ kern/main.c kern/misc.c kern/parser.c \ --@COND_mips_arc_TRUE@ kern/partition.c kern/rescue_parser.c \ --@COND_mips_arc_TRUE@ kern/rescue_reader.c kern/term.c \ --@COND_mips_arc_TRUE@ kern/verifiers.c -+@COND_mips_arc_TRUE@ kern/generic/millisleep.c kern/buffer.c \ -+@COND_mips_arc_TRUE@ kern/command.c kern/corecmd.c \ -+@COND_mips_arc_TRUE@ kern/device.c kern/disk.c kern/dl.c \ -+@COND_mips_arc_TRUE@ kern/env.c kern/err.c kern/file.c \ -+@COND_mips_arc_TRUE@ kern/fs.c kern/list.c kern/main.c \ -+@COND_mips_arc_TRUE@ kern/misc.c kern/parser.c kern/partition.c \ -+@COND_mips_arc_TRUE@ kern/rescue_parser.c kern/rescue_reader.c \ -+@COND_mips_arc_TRUE@ kern/term.c kern/verifiers.c - @COND_mips_loongson_TRUE@kernel_exec_SOURCES = kern/mips/startup.S \ - @COND_mips_loongson_TRUE@ term/ns8250.c bus/bonito.c \ - @COND_mips_loongson_TRUE@ bus/cs5536.c bus/pci.c \ -@@ -25904,12 +25936,13 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_mips_loongson_TRUE@ lib/arg.c kern/compiler-rt.c \ - @COND_mips_loongson_TRUE@ kern/mm.c kern/time.c \ - @COND_mips_loongson_TRUE@ kern/generic/millisleep.c \ --@COND_mips_loongson_TRUE@ kern/command.c kern/corecmd.c \ --@COND_mips_loongson_TRUE@ kern/device.c kern/disk.c kern/dl.c \ --@COND_mips_loongson_TRUE@ kern/env.c kern/err.c kern/file.c \ --@COND_mips_loongson_TRUE@ kern/fs.c kern/list.c kern/main.c \ --@COND_mips_loongson_TRUE@ kern/misc.c kern/parser.c \ --@COND_mips_loongson_TRUE@ kern/partition.c kern/rescue_parser.c \ -+@COND_mips_loongson_TRUE@ kern/buffer.c kern/command.c \ -+@COND_mips_loongson_TRUE@ kern/corecmd.c kern/device.c \ -+@COND_mips_loongson_TRUE@ kern/disk.c kern/dl.c kern/env.c \ -+@COND_mips_loongson_TRUE@ kern/err.c kern/file.c kern/fs.c \ -+@COND_mips_loongson_TRUE@ kern/list.c kern/main.c kern/misc.c \ -+@COND_mips_loongson_TRUE@ kern/parser.c kern/partition.c \ -+@COND_mips_loongson_TRUE@ kern/rescue_parser.c \ - @COND_mips_loongson_TRUE@ kern/rescue_reader.c kern/term.c \ - @COND_mips_loongson_TRUE@ kern/verifiers.c - @COND_mips_qemu_mips_TRUE@kernel_exec_SOURCES = kern/mips/startup.S \ -@@ -25927,12 +25960,12 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_mips_qemu_mips_TRUE@ lib/arg.c kern/compiler-rt.c \ - @COND_mips_qemu_mips_TRUE@ kern/mm.c kern/time.c \ - @COND_mips_qemu_mips_TRUE@ kern/generic/millisleep.c \ --@COND_mips_qemu_mips_TRUE@ kern/command.c kern/corecmd.c \ --@COND_mips_qemu_mips_TRUE@ kern/device.c kern/disk.c kern/dl.c \ --@COND_mips_qemu_mips_TRUE@ kern/env.c kern/err.c kern/file.c \ --@COND_mips_qemu_mips_TRUE@ kern/fs.c kern/list.c kern/main.c \ --@COND_mips_qemu_mips_TRUE@ kern/misc.c kern/parser.c \ --@COND_mips_qemu_mips_TRUE@ kern/partition.c \ -+@COND_mips_qemu_mips_TRUE@ kern/buffer.c kern/command.c \ -+@COND_mips_qemu_mips_TRUE@ kern/corecmd.c kern/device.c \ -+@COND_mips_qemu_mips_TRUE@ kern/disk.c kern/dl.c kern/env.c \ -+@COND_mips_qemu_mips_TRUE@ kern/err.c kern/file.c kern/fs.c \ -+@COND_mips_qemu_mips_TRUE@ kern/list.c kern/main.c kern/misc.c \ -+@COND_mips_qemu_mips_TRUE@ kern/parser.c kern/partition.c \ - @COND_mips_qemu_mips_TRUE@ kern/rescue_parser.c \ - @COND_mips_qemu_mips_TRUE@ kern/rescue_reader.c kern/term.c \ - @COND_mips_qemu_mips_TRUE@ kern/verifiers.c -@@ -25953,12 +25986,13 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_powerpc_ieee1275_TRUE@ kern/compiler-rt.c kern/mm.c \ - @COND_powerpc_ieee1275_TRUE@ kern/time.c \ - @COND_powerpc_ieee1275_TRUE@ kern/generic/millisleep.c \ --@COND_powerpc_ieee1275_TRUE@ kern/command.c kern/corecmd.c \ --@COND_powerpc_ieee1275_TRUE@ kern/device.c kern/disk.c \ --@COND_powerpc_ieee1275_TRUE@ kern/dl.c kern/env.c kern/err.c \ --@COND_powerpc_ieee1275_TRUE@ kern/file.c kern/fs.c kern/list.c \ --@COND_powerpc_ieee1275_TRUE@ kern/main.c kern/misc.c \ --@COND_powerpc_ieee1275_TRUE@ kern/parser.c kern/partition.c \ -+@COND_powerpc_ieee1275_TRUE@ kern/buffer.c kern/command.c \ -+@COND_powerpc_ieee1275_TRUE@ kern/corecmd.c kern/device.c \ -+@COND_powerpc_ieee1275_TRUE@ kern/disk.c kern/dl.c kern/env.c \ -+@COND_powerpc_ieee1275_TRUE@ kern/err.c kern/file.c kern/fs.c \ -+@COND_powerpc_ieee1275_TRUE@ kern/list.c kern/main.c \ -+@COND_powerpc_ieee1275_TRUE@ kern/misc.c kern/parser.c \ -+@COND_powerpc_ieee1275_TRUE@ kern/partition.c \ - @COND_powerpc_ieee1275_TRUE@ kern/rescue_parser.c \ - @COND_powerpc_ieee1275_TRUE@ kern/rescue_reader.c kern/term.c \ - @COND_powerpc_ieee1275_TRUE@ kern/verifiers.c -@@ -25973,7 +26007,7 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_riscv32_efi_TRUE@ kern/efi/acpi.c kern/efi/sb.c \ - @COND_riscv32_efi_TRUE@ kern/lockdown.c kern/compiler-rt.c \ - @COND_riscv32_efi_TRUE@ kern/mm.c kern/time.c \ --@COND_riscv32_efi_TRUE@ kern/generic/millisleep.c \ -+@COND_riscv32_efi_TRUE@ kern/generic/millisleep.c kern/buffer.c \ - @COND_riscv32_efi_TRUE@ kern/command.c kern/corecmd.c \ - @COND_riscv32_efi_TRUE@ kern/device.c kern/disk.c kern/dl.c \ - @COND_riscv32_efi_TRUE@ kern/env.c kern/err.c kern/file.c \ -@@ -25993,12 +26027,13 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_riscv64_efi_TRUE@ kern/efi/sb.c kern/lockdown.c \ - @COND_riscv64_efi_TRUE@ kern/compiler-rt.c kern/mm.c \ - @COND_riscv64_efi_TRUE@ kern/time.c kern/generic/millisleep.c \ --@COND_riscv64_efi_TRUE@ kern/command.c kern/corecmd.c \ --@COND_riscv64_efi_TRUE@ kern/device.c kern/disk.c kern/dl.c \ --@COND_riscv64_efi_TRUE@ kern/env.c kern/err.c kern/file.c \ --@COND_riscv64_efi_TRUE@ kern/fs.c kern/list.c kern/main.c \ --@COND_riscv64_efi_TRUE@ kern/misc.c kern/parser.c \ --@COND_riscv64_efi_TRUE@ kern/partition.c kern/rescue_parser.c \ -+@COND_riscv64_efi_TRUE@ kern/buffer.c kern/command.c \ -+@COND_riscv64_efi_TRUE@ kern/corecmd.c kern/device.c \ -+@COND_riscv64_efi_TRUE@ kern/disk.c kern/dl.c kern/env.c \ -+@COND_riscv64_efi_TRUE@ kern/err.c kern/file.c kern/fs.c \ -+@COND_riscv64_efi_TRUE@ kern/list.c kern/main.c kern/misc.c \ -+@COND_riscv64_efi_TRUE@ kern/parser.c kern/partition.c \ -+@COND_riscv64_efi_TRUE@ kern/rescue_parser.c \ - @COND_riscv64_efi_TRUE@ kern/rescue_reader.c kern/term.c \ - @COND_riscv64_efi_TRUE@ kern/verifiers.c - @COND_sparc64_ieee1275_TRUE@kernel_exec_SOURCES = \ -@@ -26019,12 +26054,13 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_sparc64_ieee1275_TRUE@ kern/compiler-rt.c kern/mm.c \ - @COND_sparc64_ieee1275_TRUE@ kern/time.c \ - @COND_sparc64_ieee1275_TRUE@ kern/generic/millisleep.c \ --@COND_sparc64_ieee1275_TRUE@ kern/command.c kern/corecmd.c \ --@COND_sparc64_ieee1275_TRUE@ kern/device.c kern/disk.c \ --@COND_sparc64_ieee1275_TRUE@ kern/dl.c kern/env.c kern/err.c \ --@COND_sparc64_ieee1275_TRUE@ kern/file.c kern/fs.c kern/list.c \ --@COND_sparc64_ieee1275_TRUE@ kern/main.c kern/misc.c \ --@COND_sparc64_ieee1275_TRUE@ kern/parser.c kern/partition.c \ -+@COND_sparc64_ieee1275_TRUE@ kern/buffer.c kern/command.c \ -+@COND_sparc64_ieee1275_TRUE@ kern/corecmd.c kern/device.c \ -+@COND_sparc64_ieee1275_TRUE@ kern/disk.c kern/dl.c kern/env.c \ -+@COND_sparc64_ieee1275_TRUE@ kern/err.c kern/file.c kern/fs.c \ -+@COND_sparc64_ieee1275_TRUE@ kern/list.c kern/main.c \ -+@COND_sparc64_ieee1275_TRUE@ kern/misc.c kern/parser.c \ -+@COND_sparc64_ieee1275_TRUE@ kern/partition.c \ - @COND_sparc64_ieee1275_TRUE@ kern/rescue_parser.c \ - @COND_sparc64_ieee1275_TRUE@ kern/rescue_reader.c kern/term.c \ - @COND_sparc64_ieee1275_TRUE@ kern/verifiers.c -@@ -26040,11 +26076,12 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_x86_64_efi_TRUE@ kern/acpi.c kern/efi/acpi.c \ - @COND_x86_64_efi_TRUE@ kern/efi/sb.c kern/lockdown.c \ - @COND_x86_64_efi_TRUE@ kern/compiler-rt.c kern/mm.c kern/time.c \ --@COND_x86_64_efi_TRUE@ kern/generic/millisleep.c kern/command.c \ --@COND_x86_64_efi_TRUE@ kern/corecmd.c kern/device.c kern/disk.c \ --@COND_x86_64_efi_TRUE@ kern/dl.c kern/env.c kern/err.c \ --@COND_x86_64_efi_TRUE@ kern/file.c kern/fs.c kern/list.c \ --@COND_x86_64_efi_TRUE@ kern/main.c kern/misc.c kern/parser.c \ -+@COND_x86_64_efi_TRUE@ kern/generic/millisleep.c kern/buffer.c \ -+@COND_x86_64_efi_TRUE@ kern/command.c kern/corecmd.c \ -+@COND_x86_64_efi_TRUE@ kern/device.c kern/disk.c kern/dl.c \ -+@COND_x86_64_efi_TRUE@ kern/env.c kern/err.c kern/file.c \ -+@COND_x86_64_efi_TRUE@ kern/fs.c kern/list.c kern/main.c \ -+@COND_x86_64_efi_TRUE@ kern/misc.c kern/parser.c \ - @COND_x86_64_efi_TRUE@ kern/partition.c kern/rescue_parser.c \ - @COND_x86_64_efi_TRUE@ kern/rescue_reader.c kern/term.c \ - @COND_x86_64_efi_TRUE@ kern/verifiers.c -@@ -26057,11 +26094,12 @@ gcry_whirlpool_module_DEPENDENCIES = $(TARGET_OBJ2ELF) - @COND_x86_64_xen_TRUE@ term/terminfo.c term/tparm.c \ - @COND_x86_64_xen_TRUE@ commands/extcmd.c lib/arg.c \ - @COND_x86_64_xen_TRUE@ kern/compiler-rt.c kern/mm.c kern/time.c \ --@COND_x86_64_xen_TRUE@ kern/generic/millisleep.c kern/command.c \ --@COND_x86_64_xen_TRUE@ kern/corecmd.c kern/device.c kern/disk.c \ --@COND_x86_64_xen_TRUE@ kern/dl.c kern/env.c kern/err.c \ --@COND_x86_64_xen_TRUE@ kern/file.c kern/fs.c kern/list.c \ --@COND_x86_64_xen_TRUE@ kern/main.c kern/misc.c kern/parser.c \ -+@COND_x86_64_xen_TRUE@ kern/generic/millisleep.c kern/buffer.c \ -+@COND_x86_64_xen_TRUE@ kern/command.c kern/corecmd.c \ -+@COND_x86_64_xen_TRUE@ kern/device.c kern/disk.c kern/dl.c \ -+@COND_x86_64_xen_TRUE@ kern/env.c kern/err.c kern/file.c \ -+@COND_x86_64_xen_TRUE@ kern/fs.c kern/list.c kern/main.c \ -+@COND_x86_64_xen_TRUE@ kern/misc.c kern/parser.c \ - @COND_x86_64_xen_TRUE@ kern/partition.c kern/rescue_parser.c \ - @COND_x86_64_xen_TRUE@ kern/rescue_reader.c kern/term.c \ - @COND_x86_64_xen_TRUE@ kern/verifiers.c -@@ -28027,6 +28065,8 @@ kern/generic/$(DEPDIR)/$(am__dirstamp): - kern/generic/kernel_exec-millisleep.$(OBJEXT): \ - kern/generic/$(am__dirstamp) \ - kern/generic/$(DEPDIR)/$(am__dirstamp) -+kern/kernel_exec-buffer.$(OBJEXT): kern/$(am__dirstamp) \ -+ kern/$(DEPDIR)/$(am__dirstamp) - kern/kernel_exec-command.$(OBJEXT): kern/$(am__dirstamp) \ - kern/$(DEPDIR)/$(am__dirstamp) - kern/kernel_exec-corecmd.$(OBJEXT): kern/$(am__dirstamp) \ -@@ -30952,6 +30992,7 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@kern/$(DEPDIR)/acpi_module-acpi.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@kern/$(DEPDIR)/elf_module-elf.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@kern/$(DEPDIR)/kernel_exec-acpi.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@kern/$(DEPDIR)/kernel_exec-buffer.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@kern/$(DEPDIR)/kernel_exec-command.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@kern/$(DEPDIR)/kernel_exec-compiler-rt.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@kern/$(DEPDIR)/kernel_exec-corecmd.Po@am__quote@ -@@ -35382,6 +35423,20 @@ kern/generic/kernel_exec-millisleep.obj: kern/generic/millisleep.c - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kernel_exec_CPPFLAGS) $(CPPFLAGS) $(kernel_exec_CFLAGS) $(CFLAGS) -c -o kern/generic/kernel_exec-millisleep.obj `if test -f 'kern/generic/millisleep.c'; then $(CYGPATH_W) 'kern/generic/millisleep.c'; else $(CYGPATH_W) '$(srcdir)/kern/generic/millisleep.c'; fi` - -+kern/kernel_exec-buffer.o: kern/buffer.c -+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kernel_exec_CPPFLAGS) $(CPPFLAGS) $(kernel_exec_CFLAGS) $(CFLAGS) -MT kern/kernel_exec-buffer.o -MD -MP -MF kern/$(DEPDIR)/kernel_exec-buffer.Tpo -c -o kern/kernel_exec-buffer.o `test -f 'kern/buffer.c' || echo '$(srcdir)/'`kern/buffer.c -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) kern/$(DEPDIR)/kernel_exec-buffer.Tpo kern/$(DEPDIR)/kernel_exec-buffer.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='kern/buffer.c' object='kern/kernel_exec-buffer.o' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kernel_exec_CPPFLAGS) $(CPPFLAGS) $(kernel_exec_CFLAGS) $(CFLAGS) -c -o kern/kernel_exec-buffer.o `test -f 'kern/buffer.c' || echo '$(srcdir)/'`kern/buffer.c -+ -+kern/kernel_exec-buffer.obj: kern/buffer.c -+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kernel_exec_CPPFLAGS) $(CPPFLAGS) $(kernel_exec_CFLAGS) $(CFLAGS) -MT kern/kernel_exec-buffer.obj -MD -MP -MF kern/$(DEPDIR)/kernel_exec-buffer.Tpo -c -o kern/kernel_exec-buffer.obj `if test -f 'kern/buffer.c'; then $(CYGPATH_W) 'kern/buffer.c'; else $(CYGPATH_W) '$(srcdir)/kern/buffer.c'; fi` -+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) kern/$(DEPDIR)/kernel_exec-buffer.Tpo kern/$(DEPDIR)/kernel_exec-buffer.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='kern/buffer.c' object='kern/kernel_exec-buffer.obj' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kernel_exec_CPPFLAGS) $(CPPFLAGS) $(kernel_exec_CFLAGS) $(CFLAGS) -c -o kern/kernel_exec-buffer.obj `if test -f 'kern/buffer.c'; then $(CYGPATH_W) 'kern/buffer.c'; else $(CYGPATH_W) '$(srcdir)/kern/buffer.c'; fi` -+ - kern/kernel_exec-command.o: kern/command.c - @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(kernel_exec_CPPFLAGS) $(CPPFLAGS) $(kernel_exec_CFLAGS) $(CFLAGS) -MT kern/kernel_exec-command.o -MD -MP -MF kern/$(DEPDIR)/kernel_exec-command.Tpo -c -o kern/kernel_exec-command.o `test -f 'kern/command.c' || echo '$(srcdir)/'`kern/command.c - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) kern/$(DEPDIR)/kernel_exec-command.Tpo kern/$(DEPDIR)/kernel_exec-command.Po -diff --git a/grub-core/kern/buffer.c b/grub-core/kern/buffer.c -new file mode 100644 -index 0000000..9f5f8b8 ---- /dev/null -+++ b/grub-core/kern/buffer.c -@@ -0,0 +1,117 @@ -+/* -+ * GRUB -- GRand Unified Bootloader -+ * Copyright (C) 2021 Free Software Foundation, Inc. -+ * -+ * GRUB 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 of the License, or -+ * (at your option) any later version. -+ * -+ * GRUB 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 GRUB. If not, see . -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+ -+grub_buffer_t -+grub_buffer_new (grub_size_t sz) -+{ -+ struct grub_buffer *ret; -+ -+ ret = (struct grub_buffer *) grub_malloc (sizeof (*ret)); -+ if (ret == NULL) -+ return NULL; -+ -+ ret->data = (grub_uint8_t *) grub_malloc (sz); -+ if (ret->data == NULL) -+ { -+ grub_free (ret); -+ return NULL; -+ } -+ -+ ret->sz = sz; -+ ret->pos = 0; -+ ret->used = 0; -+ -+ return ret; -+} -+ -+void -+grub_buffer_free (grub_buffer_t buf) -+{ -+ grub_free (buf->data); -+ grub_free (buf); -+} -+ -+grub_err_t -+grub_buffer_ensure_space (grub_buffer_t buf, grub_size_t req) -+{ -+ grub_uint8_t *d; -+ grub_size_t newsz = 1; -+ -+ /* Is the current buffer size adequate? */ -+ if (buf->sz >= req) -+ return GRUB_ERR_NONE; -+ -+ /* Find the smallest power-of-2 size that satisfies the request. */ -+ while (newsz < req) -+ { -+ if (newsz == 0) -+ return grub_error (GRUB_ERR_OUT_OF_RANGE, -+ N_("requested buffer size is too large")); -+ newsz <<= 1; -+ } -+ -+ d = (grub_uint8_t *) grub_realloc (buf->data, newsz); -+ if (d == NULL) -+ return grub_errno; -+ -+ buf->data = d; -+ buf->sz = newsz; -+ -+ return GRUB_ERR_NONE; -+} -+ -+void * -+grub_buffer_take_data (grub_buffer_t buf) -+{ -+ void *data = buf->data; -+ -+ buf->data = NULL; -+ buf->sz = buf->pos = buf->used = 0; -+ -+ return data; -+} -+ -+void -+grub_buffer_reset (grub_buffer_t buf) -+{ -+ buf->pos = buf->used = 0; -+} -+ -+grub_err_t -+grub_buffer_advance_read_pos (grub_buffer_t buf, grub_size_t n) -+{ -+ grub_size_t newpos; -+ -+ if (grub_add (buf->pos, n, &newpos)) -+ return grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow is detected")); -+ -+ if (newpos > buf->used) -+ return grub_error (GRUB_ERR_OUT_OF_RANGE, -+ N_("new read is position beyond the end of the written data")); -+ -+ buf->pos = newpos; -+ -+ return GRUB_ERR_NONE; -+} -diff --git a/include/grub/buffer.h b/include/grub/buffer.h -new file mode 100644 -index 0000000..f4b10cf ---- /dev/null -+++ b/include/grub/buffer.h -@@ -0,0 +1,144 @@ -+/* -+ * GRUB -- GRand Unified Bootloader -+ * Copyright (C) 2021 Free Software Foundation, Inc. -+ * -+ * GRUB 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 of the License, or -+ * (at your option) any later version. -+ * -+ * GRUB 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 GRUB. If not, see . -+ */ -+ -+#ifndef GRUB_BUFFER_H -+#define GRUB_BUFFER_H 1 -+ -+#include -+#include -+#include -+#include -+#include -+ -+struct grub_buffer -+{ -+ grub_uint8_t *data; -+ grub_size_t sz; -+ grub_size_t pos; -+ grub_size_t used; -+}; -+ -+/* -+ * grub_buffer_t represents a simple variable sized byte buffer with -+ * read and write cursors. It currently only implements -+ * functionality required by the only user in GRUB (append byte[s], -+ * peeking data at a specified position and updating the read cursor. -+ * Some things that this doesn't do yet are: -+ * - Reading a portion of the buffer by copying data from the current -+ * read position in to a caller supplied destination buffer and then -+ * automatically updating the read cursor. -+ * - Dropping the read part at the start of the buffer when an append -+ * requires more space. -+ */ -+typedef struct grub_buffer *grub_buffer_t; -+ -+/* Allocate a new buffer with the specified initial size. */ -+extern grub_buffer_t grub_buffer_new (grub_size_t sz); -+ -+/* Free the buffer and its resources. */ -+extern void grub_buffer_free (grub_buffer_t buf); -+ -+/* Return the number of unread bytes in this buffer. */ -+static inline grub_size_t -+grub_buffer_get_unread_bytes (grub_buffer_t buf) -+{ -+ return buf->used - buf->pos; -+} -+ -+/* -+ * Ensure that the buffer size is at least the requested -+ * number of bytes. -+ */ -+extern grub_err_t grub_buffer_ensure_space (grub_buffer_t buf, grub_size_t req); -+ -+/* -+ * Append the specified number of bytes from the supplied -+ * data to the buffer. -+ */ -+static inline grub_err_t -+grub_buffer_append_data (grub_buffer_t buf, const void *data, grub_size_t len) -+{ -+ grub_size_t req; -+ -+ if (grub_add (buf->used, len, &req)) -+ return grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow is detected")); -+ -+ if (grub_buffer_ensure_space (buf, req) != GRUB_ERR_NONE) -+ return grub_errno; -+ -+ grub_memcpy (&buf->data[buf->used], data, len); -+ buf->used = req; -+ -+ return GRUB_ERR_NONE; -+} -+ -+/* Append the supplied character to the buffer. */ -+static inline grub_err_t -+grub_buffer_append_char (grub_buffer_t buf, char c) -+{ -+ return grub_buffer_append_data (buf, &c, 1); -+} -+ -+/* -+ * Forget and return the underlying data buffer. The caller -+ * becomes the owner of this buffer, and must free it when it -+ * is no longer required. -+ */ -+extern void *grub_buffer_take_data (grub_buffer_t buf); -+ -+/* Reset this buffer. Note that this does not deallocate any resources. */ -+void grub_buffer_reset (grub_buffer_t buf); -+ -+/* -+ * Return a pointer to the underlying data buffer at the specified -+ * offset from the current read position. Note that this pointer may -+ * become invalid if the buffer is mutated further. -+ */ -+static inline void * -+grub_buffer_peek_data_at (grub_buffer_t buf, grub_size_t off) -+{ -+ if (grub_add (buf->pos, off, &off)) -+ { -+ grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow is detected.")); -+ return NULL; -+ } -+ -+ if (off >= buf->used) -+ { -+ grub_error (GRUB_ERR_OUT_OF_RANGE, N_("peek out of range")); -+ return NULL; -+ } -+ -+ return &buf->data[off]; -+} -+ -+/* -+ * Return a pointer to the underlying data buffer at the current -+ * read position. Note that this pointer may become invalid if the -+ * buffer is mutated further. -+ */ -+static inline void * -+grub_buffer_peek_data (grub_buffer_t buf) -+{ -+ return grub_buffer_peek_data_at (buf, 0); -+} -+ -+/* Advance the read position by the specified number of bytes. */ -+extern grub_err_t grub_buffer_advance_read_pos (grub_buffer_t buf, grub_size_t n); -+ -+#endif /* GRUB_BUFFER_H */ -diff --git a/po/POTFILES.in b/po/POTFILES.in -index 5e26845..7753ab4 100644 ---- a/po/POTFILES.in -+++ b/po/POTFILES.in -@@ -250,6 +250,7 @@ - ./grub-core/kern/arm64/dl.c - ./grub-core/kern/arm64/dl_helper.c - ./grub-core/kern/arm64/efi/init.c -+./grub-core/kern/buffer.c - ./grub-core/kern/command.c - ./grub-core/kern/compiler-rt.c - ./grub-core/kern/coreboot/cbtable.c -@@ -1021,6 +1022,7 @@ - ./include/grub/boottime.h - ./include/grub/bsdlabel.h - ./include/grub/btrfs.h -+./include/grub/buffer.h - ./include/grub/bufio.h - ./include/grub/cache.h - ./include/grub/cbfs_core.h --- -2.14.2 - diff --git a/boot/grub2/0132-kern-parser-Fix-a-stack-buffer-overflow.patch b/boot/grub2/0132-kern-parser-Fix-a-stack-buffer-overflow.patch deleted file mode 100644 index b017c1e5f92..00000000000 --- a/boot/grub2/0132-kern-parser-Fix-a-stack-buffer-overflow.patch +++ /dev/null @@ -1,248 +0,0 @@ -From 4ea7bae51f97e49c84dc67ea30b466ca8633b9f6 Mon Sep 17 00:00:00 2001 -From: Chris Coulson -Date: Thu, 7 Jan 2021 19:21:03 +0000 -Subject: [PATCH] kern/parser: Fix a stack buffer overflow - -grub_parser_split_cmdline() expands variable names present in the supplied -command line in to their corresponding variable contents and uses a 1 kiB -stack buffer for temporary storage without sufficient bounds checking. If -the function is called with a command line that references a variable with -a sufficiently large payload, it is possible to overflow the stack -buffer via tab completion, corrupt the stack frame and potentially -control execution. - -Fixes: CVE-2020-27749 - -Reported-by: Chris Coulson -Signed-off-by: Chris Coulson -Signed-off-by: Darren Kenny -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/kern/parser.c | 110 +++++++++++++++++++++++++++++------------------- - 1 file changed, 67 insertions(+), 43 deletions(-) - -diff --git a/grub-core/kern/parser.c b/grub-core/kern/parser.c -index e010eaa..6ab7aa4 100644 ---- a/grub-core/kern/parser.c -+++ b/grub-core/kern/parser.c -@@ -18,6 +18,7 @@ - */ - - #include -+#include - #include - #include - #include -@@ -107,8 +108,8 @@ check_varstate (grub_parser_state_t s) - } - - --static void --add_var (char *varname, char **bp, char **vp, -+static grub_err_t -+add_var (grub_buffer_t varname, grub_buffer_t buf, - grub_parser_state_t state, grub_parser_state_t newstate) - { - const char *val; -@@ -116,31 +117,41 @@ add_var (char *varname, char **bp, char **vp, - /* Check if a variable was being read in and the end of the name - was reached. */ - if (!(check_varstate (state) && !check_varstate (newstate))) -- return; -+ return GRUB_ERR_NONE; -+ -+ if (grub_buffer_append_char (varname, '\0') != GRUB_ERR_NONE) -+ return grub_errno; - -- *((*vp)++) = '\0'; -- val = grub_env_get (varname); -- *vp = varname; -+ val = grub_env_get ((const char *) grub_buffer_peek_data (varname)); -+ grub_buffer_reset (varname); - if (!val) -- return; -+ return GRUB_ERR_NONE; - - /* Insert the contents of the variable in the buffer. */ -- for (; *val; val++) -- *((*bp)++) = *val; -+ return grub_buffer_append_data (buf, val, grub_strlen (val)); - } - --static void --terminate_arg (char *buffer, char **bp, int *argc) -+static grub_err_t -+terminate_arg (grub_buffer_t buffer, int *argc) - { -- if (*bp != buffer && *((*bp) - 1) != '\0') -- { -- *((*bp)++) = '\0'; -- (*argc)++; -- } -+ grub_size_t unread = grub_buffer_get_unread_bytes (buffer); -+ -+ if (unread == 0) -+ return GRUB_ERR_NONE; -+ -+ if (*(const char *) grub_buffer_peek_data_at (buffer, unread - 1) == '\0') -+ return GRUB_ERR_NONE; -+ -+ if (grub_buffer_append_char (buffer, '\0') != GRUB_ERR_NONE) -+ return grub_errno; -+ -+ (*argc)++; -+ -+ return GRUB_ERR_NONE; - } - - static grub_err_t --process_char (char c, char *buffer, char **bp, char *varname, char **vp, -+process_char (char c, grub_buffer_t buffer, grub_buffer_t varname, - grub_parser_state_t state, int *argc, - grub_parser_state_t *newstate) - { -@@ -153,12 +164,13 @@ process_char (char c, char *buffer, char **bp, char *varname, char **vp, - * not describe the variable anymore, write the variable to - * the buffer. - */ -- add_var (varname, bp, vp, state, *newstate); -+ if (add_var (varname, buffer, state, *newstate) != GRUB_ERR_NONE) -+ return grub_errno; - - if (check_varstate (*newstate)) - { - if (use) -- *((*vp)++) = use; -+ return grub_buffer_append_char (varname, use); - } - else if (*newstate == GRUB_PARSER_STATE_TEXT && - state != GRUB_PARSER_STATE_ESC && grub_isspace (use)) -@@ -167,10 +179,10 @@ process_char (char c, char *buffer, char **bp, char *varname, char **vp, - * Don't add more than one argument if multiple - * spaces are used. - */ -- terminate_arg (buffer, bp, argc); -+ return terminate_arg (buffer, argc); - } - else if (use) -- *((*bp)++) = use; -+ return grub_buffer_append_char (buffer, use); - - return GRUB_ERR_NONE; - } -@@ -181,19 +193,22 @@ grub_parser_split_cmdline (const char *cmdline, - int *argc, char ***argv) - { - grub_parser_state_t state = GRUB_PARSER_STATE_TEXT; -- /* XXX: Fixed size buffer, perhaps this buffer should be dynamically -- allocated. */ -- char buffer[1024]; -- char *bp = buffer; -+ grub_buffer_t buffer, varname; - char *rd = (char *) cmdline; - char *rp = rd; -- char varname[200]; -- char *vp = varname; -- char *args; - int i; - - *argc = 0; - *argv = NULL; -+ -+ buffer = grub_buffer_new (1024); -+ if (buffer == NULL) -+ return grub_errno; -+ -+ varname = grub_buffer_new (200); -+ if (varname == NULL) -+ goto fail; -+ - do - { - if (rp == NULL || *rp == '\0') -@@ -219,7 +234,7 @@ grub_parser_split_cmdline (const char *cmdline, - { - grub_parser_state_t newstate; - -- if (process_char (*rp, buffer, &bp, varname, &vp, state, argc, -+ if (process_char (*rp, buffer, varname, state, argc, - &newstate) != GRUB_ERR_NONE) - goto fail; - -@@ -230,10 +245,12 @@ grub_parser_split_cmdline (const char *cmdline, - - /* A special case for when the last character was part of a - variable. */ -- add_var (varname, &bp, &vp, state, GRUB_PARSER_STATE_TEXT); -+ if (add_var (varname, buffer, state, GRUB_PARSER_STATE_TEXT) != GRUB_ERR_NONE) -+ goto fail; - - /* Ensure that the last argument is terminated. */ -- terminate_arg (buffer, &bp, argc); -+ if (terminate_arg (buffer, argc) != GRUB_ERR_NONE) -+ goto fail; - - /* If there are no args, then we're done. */ - if (!*argc) -@@ -242,38 +259,45 @@ grub_parser_split_cmdline (const char *cmdline, - goto out; - } - -- /* Reserve memory for the return values. */ -- args = grub_malloc (bp - buffer); -- if (!args) -- goto fail; -- grub_memcpy (args, buffer, bp - buffer); -- - *argv = grub_calloc (*argc + 1, sizeof (char *)); - if (!*argv) - goto fail; - - /* The arguments are separated with 0's, setup argv so it points to - the right values. */ -- bp = args; - for (i = 0; i < *argc; i++) - { -- (*argv)[i] = bp; -- while (*bp) -- bp++; -- bp++; -+ char *arg; -+ -+ if (i > 0) -+ { -+ if (grub_buffer_advance_read_pos (buffer, 1) != GRUB_ERR_NONE) -+ goto fail; -+ } -+ -+ arg = (char *) grub_buffer_peek_data (buffer); -+ if (arg == NULL || -+ grub_buffer_advance_read_pos (buffer, grub_strlen (arg)) != GRUB_ERR_NONE) -+ goto fail; -+ -+ (*argv)[i] = arg; - } - -+ /* Keep memory for the return values. */ -+ grub_buffer_take_data (buffer); -+ - grub_errno = GRUB_ERR_NONE; - - out: - if (rd != cmdline) - grub_free (rd); -+ grub_buffer_free (buffer); -+ grub_buffer_free (varname); - - return grub_errno; - - fail: - grub_free (*argv); -- grub_free (args); - goto out; - } - --- -2.14.2 - diff --git a/boot/grub2/0133-kern-efi-Add-initial-stack-protector-implementation.patch b/boot/grub2/0133-kern-efi-Add-initial-stack-protector-implementation.patch deleted file mode 100644 index c0b6bf6a835..00000000000 --- a/boot/grub2/0133-kern-efi-Add-initial-stack-protector-implementation.patch +++ /dev/null @@ -1,466 +0,0 @@ -From 133d73079c5771bbf3d8311281b6772846357ec1 Mon Sep 17 00:00:00 2001 -From: Chris Coulson -Date: Tue, 1 Dec 2020 23:03:39 +0000 -Subject: [PATCH] kern/efi: Add initial stack protector implementation - -It works only on UEFI platforms but can be quite easily extended to -others architectures and platforms if needed. - -Signed-off-by: Chris Coulson -Signed-off-by: Daniel Kiper -Reviewed-by: Marco A Benatto -Reviewed-by: Javier Martinez Canillas -Signed-off-by: Stefan Sørensen ---- - acinclude.m4 | 38 ++++++++++++++++- - configure | 97 +++++++++++++++++++++++++++++++++++++++--- - configure.ac | 44 ++++++++++++++++--- - grub-core/Makefile.am | 1 + - grub-core/Makefile.in | 1 + - grub-core/kern/efi/init.c | 54 +++++++++++++++++++++++ - include/grub/efi/api.h | 19 +++++++++ - include/grub/stack_protector.h | 30 +++++++++++++ - po/POTFILES.in | 1 + - 9 files changed, 272 insertions(+), 13 deletions(-) - create mode 100644 include/grub/stack_protector.h - -diff --git a/acinclude.m4 b/acinclude.m4 -index 78cdf6e..6e14bb5 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -305,9 +305,9 @@ fi - ]) - - --dnl Check if the C compiler supports `-fstack-protector'. -+dnl Check if the C compiler supports the stack protector - AC_DEFUN([grub_CHECK_STACK_PROTECTOR],[ --[# Smashing stack protector. -+[# Stack smashing protector. - ssp_possible=yes] - AC_MSG_CHECKING([whether `$CC' accepts `-fstack-protector']) - # Is this a reliable test case? -@@ -324,6 +324,40 @@ else - ssp_possible=no] - AC_MSG_RESULT([no]) - [fi] -+[# Strong stack smashing protector. -+ssp_strong_possible=yes] -+AC_MSG_CHECKING([whether `$CC' accepts `-fstack-protector-strong']) -+# Is this a reliable test case? -+AC_LANG_CONFTEST([AC_LANG_SOURCE([[ -+void foo (void) { volatile char a[8]; a[3]; } -+]])]) -+[# `$CC -c -o ...' might not be portable. But, oh, well... Is calling -+# `ac_compile' like this correct, after all? -+if eval "$ac_compile -S -fstack-protector-strong -o conftest.s" 2> /dev/null; then] -+ AC_MSG_RESULT([yes]) -+ [# Should we clear up other files as well, having called `AC_LANG_CONFTEST'? -+ rm -f conftest.s -+else -+ ssp_strong_possible=no] -+ AC_MSG_RESULT([no]) -+[fi] -+[# Global stack smashing protector. -+ssp_global_possible=yes] -+AC_MSG_CHECKING([whether `$CC' accepts `-mstack-protector-guard=global']) -+# Is this a reliable test case? -+AC_LANG_CONFTEST([AC_LANG_SOURCE([[ -+void foo (void) { volatile char a[8]; a[3]; } -+]])]) -+[# `$CC -c -o ...' might not be portable. But, oh, well... Is calling -+# `ac_compile' like this correct, after all? -+if eval "$ac_compile -S -fstack-protector -mstack-protector-guard=global -o conftest.s" 2> /dev/null; then] -+ AC_MSG_RESULT([yes]) -+ [# Should we clear up other files as well, having called `AC_LANG_CONFTEST'? -+ rm -f conftest.s -+else -+ ssp_global_possible=no] -+ AC_MSG_RESULT([no]) -+[fi] - ]) - - dnl Check if the C compiler supports `-mstack-arg-probe' (Cygwin). -diff --git a/configure b/configure -index 9290ae8..973f702 100755 ---- a/configure -+++ b/configure -@@ -1778,6 +1778,7 @@ with_libintl_prefix - with_libpth_prefix - with_included_regex - enable_efiemu -+enable_stack_protector - enable_mm_debug - enable_cache_stats - enable_boot_time -@@ -2459,6 +2460,8 @@ Optional Features: - --disable-rpath do not hardcode runtime library paths - --enable-efiemu build and install the efiemu runtimes - (default=guessed) -+ --enable-stack-protector -+ enable the stack protector - --enable-mm-debug include memory manager debugging - --enable-cache-stats enable disk cache statistics collection - --enable-boot-time enable boot time statistics collection -@@ -32348,9 +32351,9 @@ fi - - CFLAGS="$TARGET_CFLAGS" - --# Smashing stack protector. -+# Stack smashing protector. - --# Smashing stack protector. -+# Stack smashing protector. - ssp_possible=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`$CC' accepts \`-fstack-protector'" >&5 - $as_echo_n "checking whether \`$CC' accepts \`-fstack-protector'... " >&6; } -@@ -32373,11 +32376,88 @@ else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi -+# Strong stack smashing protector. -+ssp_strong_possible=yes -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`$CC' accepts \`-fstack-protector-strong'" >&5 -+$as_echo_n "checking whether \`$CC' accepts \`-fstack-protector-strong'... " >&6; } -+# Is this a reliable test case? -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ - --# Need that, because some distributions ship compilers that include --# `-fstack-protector' in the default specs. --if test "x$ssp_possible" = xyes; then -- TARGET_CFLAGS="$TARGET_CFLAGS -fno-stack-protector" -+void foo (void) { volatile char a[8]; a[3]; } -+ -+_ACEOF -+# `$CC -c -o ...' might not be portable. But, oh, well... Is calling -+# `ac_compile' like this correct, after all? -+if eval "$ac_compile -S -fstack-protector-strong -o conftest.s" 2> /dev/null; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } -+ # Should we clear up other files as well, having called `AC_LANG_CONFTEST'? -+ rm -f conftest.s -+else -+ ssp_strong_possible=no -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+# Global stack smashing protector. -+ssp_global_possible=yes -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`$CC' accepts \`-mstack-protector-guard=global'" >&5 -+$as_echo_n "checking whether \`$CC' accepts \`-mstack-protector-guard=global'... " >&6; } -+# Is this a reliable test case? -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+void foo (void) { volatile char a[8]; a[3]; } -+ -+_ACEOF -+# `$CC -c -o ...' might not be portable. But, oh, well... Is calling -+# `ac_compile' like this correct, after all? -+if eval "$ac_compile -S -fstack-protector -mstack-protector-guard=global -o conftest.s" 2> /dev/null; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } -+ # Should we clear up other files as well, having called `AC_LANG_CONFTEST'? -+ rm -f conftest.s -+else -+ ssp_global_possible=no -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+# Check whether --enable-stack-protector was given. -+if test "${enable_stack_protector+set}" = set; then : -+ enableval=$enable_stack_protector; -+else -+ enable_stack_protector=no -+fi -+ -+if test "x$enable_stack_protector" = xno; then -+ if test "x$ssp_possible" = xyes; then -+ # Need that, because some distributions ship compilers that include -+ # `-fstack-protector' in the default specs. -+ TARGET_CFLAGS="$TARGET_CFLAGS -fno-stack-protector" -+ fi -+elif test "x$platform" != xefi; then -+ as_fn_error $? "--enable-stack-protector is only supported on EFI platforms" "$LINENO" 5 -+elif test "x$ssp_global_possible" != xyes; then -+ as_fn_error $? "--enable-stack-protector is not supported (compiler doesn't support -mstack-protector-guard=global)" "$LINENO" 5 -+else -+ TARGET_CFLAGS="$TARGET_CFLAGS -mstack-protector-guard=global" -+ if test "x$enable_stack_protector" = xyes; then -+ if test "x$ssp_possible" != xyes; then -+ as_fn_error $? "--enable-stack-protector is not supported (compiler doesn't support -fstack-protector)" "$LINENO" 5 -+ fi -+ TARGET_CFLAGS="$TARGET_CFLAGS -fstack-protector" -+ elif test "x$enable_stack_protector" = xstrong; then -+ if test "x$ssp_strong_possible" != xyes; then -+ as_fn_error $? "--enable-stack-protector=strong is not supported (compiler doesn't support -fstack-protector-strong)" "$LINENO" 5 -+ fi -+ TARGET_CFLAGS="$TARGET_CFLAGS -fstack-protector-strong" -+ else -+ # Note, -fstack-protector-all requires that the protector is disabled for -+ # functions that appear in the call stack when the canary is initialized. -+ as_fn_error $? "invalid value $enable_stack_protector for --enable-stack-protector" "$LINENO" 5 -+ fi -+ TARGET_CPPFLAGS="$TARGET_CPPFLAGS -DGRUB_STACK_PROTECTOR=1" - fi - - CFLAGS="$TARGET_CFLAGS" -@@ -37054,5 +37134,10 @@ echo "Without liblzma (no support for XZ-compressed mips images) ($liblzma_excus - else - echo "With liblzma from $LIBLZMA (support for XZ-compressed mips images)" - fi -+if test "x$enable_stack_protector" != xno; then -+echo "With stack smashing protector: Yes" -+else -+echo "With stack smashing protector: No" -+fi - echo "*******************************************************" - -diff --git a/configure.ac b/configure.ac -index 7656f24..bb6b02a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1285,12 +1285,41 @@ fi] - - CFLAGS="$TARGET_CFLAGS" - --# Smashing stack protector. -+# Stack smashing protector. - grub_CHECK_STACK_PROTECTOR --# Need that, because some distributions ship compilers that include --# `-fstack-protector' in the default specs. --if test "x$ssp_possible" = xyes; then -- TARGET_CFLAGS="$TARGET_CFLAGS -fno-stack-protector" -+AC_ARG_ENABLE([stack-protector], -+ AS_HELP_STRING([--enable-stack-protector], -+ [enable the stack protector]), -+ [], -+ [enable_stack_protector=no]) -+if test "x$enable_stack_protector" = xno; then -+ if test "x$ssp_possible" = xyes; then -+ # Need that, because some distributions ship compilers that include -+ # `-fstack-protector' in the default specs. -+ TARGET_CFLAGS="$TARGET_CFLAGS -fno-stack-protector" -+ fi -+elif test "x$platform" != xefi; then -+ AC_MSG_ERROR([--enable-stack-protector is only supported on EFI platforms]) -+elif test "x$ssp_global_possible" != xyes; then -+ AC_MSG_ERROR([--enable-stack-protector is not supported (compiler doesn't support -mstack-protector-guard=global)]) -+else -+ TARGET_CFLAGS="$TARGET_CFLAGS -mstack-protector-guard=global" -+ if test "x$enable_stack_protector" = xyes; then -+ if test "x$ssp_possible" != xyes; then -+ AC_MSG_ERROR([--enable-stack-protector is not supported (compiler doesn't support -fstack-protector)]) -+ fi -+ TARGET_CFLAGS="$TARGET_CFLAGS -fstack-protector" -+ elif test "x$enable_stack_protector" = xstrong; then -+ if test "x$ssp_strong_possible" != xyes; then -+ AC_MSG_ERROR([--enable-stack-protector=strong is not supported (compiler doesn't support -fstack-protector-strong)]) -+ fi -+ TARGET_CFLAGS="$TARGET_CFLAGS -fstack-protector-strong" -+ else -+ # Note, -fstack-protector-all requires that the protector is disabled for -+ # functions that appear in the call stack when the canary is initialized. -+ AC_MSG_ERROR([invalid value $enable_stack_protector for --enable-stack-protector]) -+ fi -+ TARGET_CPPFLAGS="$TARGET_CPPFLAGS -DGRUB_STACK_PROTECTOR=1" - fi - - CFLAGS="$TARGET_CFLAGS" -@@ -2103,5 +2132,10 @@ echo "Without liblzma (no support for XZ-compressed mips images) ($liblzma_excus - else - echo "With liblzma from $LIBLZMA (support for XZ-compressed mips images)" - fi -+if test "x$enable_stack_protector" != xno; then -+echo "With stack smashing protector: Yes" -+else -+echo "With stack smashing protector: No" -+fi - echo "*******************************************************" - ] -diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am -index 30e23ad..ee88e44 100644 ---- a/grub-core/Makefile.am -+++ b/grub-core/Makefile.am -@@ -90,6 +90,7 @@ endif - KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/mm.h - KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/parser.h - KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/partition.h -+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/stack_protector.h - KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/term.h - KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/time.h - KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/verify.h -diff --git a/grub-core/Makefile.in b/grub-core/Makefile.in -index 1f8133b..50c70b5 100644 ---- a/grub-core/Makefile.in -+++ b/grub-core/Makefile.in -@@ -16425,6 +16425,7 @@ KERNEL_HEADER_FILES = $(top_srcdir)/include/grub/cache.h \ - $(am__append_5795) $(top_srcdir)/include/grub/mm.h \ - $(top_srcdir)/include/grub/parser.h \ - $(top_srcdir)/include/grub/partition.h \ -+ $(top_srcdir)/include/grub/stack_protector.h \ - $(top_srcdir)/include/grub/term.h \ - $(top_srcdir)/include/grub/time.h \ - $(top_srcdir)/include/grub/verify.h \ -diff --git a/grub-core/kern/efi/init.c b/grub-core/kern/efi/init.c -index 1333465..7facacf 100644 ---- a/grub-core/kern/efi/init.c -+++ b/grub-core/kern/efi/init.c -@@ -27,6 +27,58 @@ - #include - #include - #include -+#include -+ -+#ifdef GRUB_STACK_PROTECTOR -+ -+static grub_efi_guid_t rng_protocol_guid = GRUB_EFI_RNG_PROTOCOL_GUID; -+ -+/* -+ * Don't put this on grub_efi_init()'s local stack to avoid it -+ * getting a stack check. -+ */ -+static grub_efi_uint8_t stack_chk_guard_buf[32]; -+ -+grub_addr_t __stack_chk_guard; -+ -+void __attribute__ ((noreturn)) -+__stack_chk_fail (void) -+{ -+ /* -+ * Assume it's not safe to call into EFI Boot Services. Sorry, that -+ * means no console message here. -+ */ -+ do -+ { -+ /* Do not optimize out the loop. */ -+ asm volatile (""); -+ } -+ while (1); -+} -+ -+static void -+stack_protector_init (void) -+{ -+ grub_efi_rng_protocol_t *rng; -+ -+ /* Set up the stack canary. Make errors here non-fatal for now. */ -+ rng = grub_efi_locate_protocol (&rng_protocol_guid, NULL); -+ if (rng != NULL) -+ { -+ grub_efi_status_t status; -+ -+ status = efi_call_4 (rng->get_rng, rng, NULL, sizeof (stack_chk_guard_buf), -+ stack_chk_guard_buf); -+ if (status == GRUB_EFI_SUCCESS) -+ grub_memcpy (&__stack_chk_guard, stack_chk_guard_buf, sizeof (__stack_chk_guard)); -+ } -+} -+#else -+static void -+stack_protector_init (void) -+{ -+} -+#endif - - grub_addr_t grub_modbase; - -@@ -38,6 +90,8 @@ grub_efi_init (void) - messages. */ - grub_console_init (); - -+ stack_protector_init (); -+ - /* Initialize the memory management system. */ - grub_efi_mm_init (); - -diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h -index 13e5715..5517f7e 100644 ---- a/include/grub/efi/api.h -+++ b/include/grub/efi/api.h -@@ -339,6 +339,11 @@ - { 0xab, 0xb6, 0x3d, 0xd8, 0x10, 0xdd, 0x8b, 0x23 } \ - } - -+#define GRUB_EFI_RNG_PROTOCOL_GUID \ -+ { 0x3152bca5, 0xeade, 0x433d, \ -+ { 0x86, 0x2e, 0xc0, 0x1c, 0xdc, 0x29, 0x1f, 0x44 } \ -+ } -+ - struct grub_efi_sal_system_table - { - grub_uint32_t signature; -@@ -1700,6 +1705,20 @@ struct grub_efi_shim_lock_protocol - }; - typedef struct grub_efi_shim_lock_protocol grub_efi_shim_lock_protocol_t; - -+typedef grub_efi_guid_t grub_efi_rng_algorithm_t; -+ -+struct grub_efi_rng_protocol -+{ -+ grub_efi_status_t (*get_info) (struct grub_efi_rng_protocol *this, -+ grub_efi_uintn_t *rng_algorithm_list_size, -+ grub_efi_rng_algorithm_t *rng_algorithm_list); -+ grub_efi_status_t (*get_rng) (struct grub_efi_rng_protocol *this, -+ grub_efi_rng_algorithm_t *rng_algorithm, -+ grub_efi_uintn_t rng_value_length, -+ grub_efi_uint8_t *rng_value); -+}; -+typedef struct grub_efi_rng_protocol grub_efi_rng_protocol_t; -+ - #if (GRUB_TARGET_SIZEOF_VOID_P == 4) || defined (__ia64__) \ - || defined (__aarch64__) || defined (__MINGW64__) || defined (__CYGWIN__) \ - || defined(__riscv) -diff --git a/include/grub/stack_protector.h b/include/grub/stack_protector.h -new file mode 100644 -index 0000000..c88dc00 ---- /dev/null -+++ b/include/grub/stack_protector.h -@@ -0,0 +1,30 @@ -+/* -+ * GRUB -- GRand Unified Bootloader -+ * Copyright (C) 2021 Free Software Foundation, Inc. -+ * -+ * GRUB 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 of the License, or -+ * (at your option) any later version. -+ * -+ * GRUB 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 GRUB. If not, see . -+ */ -+ -+#ifndef GRUB_STACK_PROTECTOR_H -+#define GRUB_STACK_PROTECTOR_H 1 -+ -+#include -+#include -+ -+#ifdef GRUB_STACK_PROTECTOR -+extern grub_addr_t EXPORT_VAR (__stack_chk_guard); -+extern void __attribute__ ((noreturn)) EXPORT_FUNC (__stack_chk_fail) (void); -+#endif -+ -+#endif /* GRUB_STACK_PROTECTOR_H */ -diff --git a/po/POTFILES.in b/po/POTFILES.in -index 7753ab4..ef42c7d 100644 ---- a/po/POTFILES.in -+++ b/po/POTFILES.in -@@ -1319,6 +1319,7 @@ - ./include/grub/sparc64/time.h - ./include/grub/sparc64/types.h - ./include/grub/speaker.h -+./include/grub/stack_protector.h - ./include/grub/symbol.h - ./include/grub/syslinux_parse.h - ./include/grub/term.h --- -2.14.2 - diff --git a/boot/grub2/0134-util-mkimage-Remove-unused-code-to-add-BSS-section.patch b/boot/grub2/0134-util-mkimage-Remove-unused-code-to-add-BSS-section.patch deleted file mode 100644 index a3eb78ebc75..00000000000 --- a/boot/grub2/0134-util-mkimage-Remove-unused-code-to-add-BSS-section.patch +++ /dev/null @@ -1,61 +0,0 @@ -From d52f78def1b9c4f435fdbf6b24fd899208580c76 Mon Sep 17 00:00:00 2001 -From: Javier Martinez Canillas -Date: Thu, 11 Feb 2021 17:06:49 +0100 -Subject: [PATCH] util/mkimage: Remove unused code to add BSS section - -The code is compiled out so there is no reason to keep it. - -Additionally, don't set bss_size field since we do not add a BSS section. - -Signed-off-by: Javier Martinez Canillas -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - util/mkimage.c | 17 ----------------- - 1 file changed, 17 deletions(-) - -diff --git a/util/mkimage.c b/util/mkimage.c -index 37d6249..32bb8ea 100644 ---- a/util/mkimage.c -+++ b/util/mkimage.c -@@ -1304,7 +1304,6 @@ grub_install_generate_image (const char *dir, const char *prefix, - o->code_size = grub_host_to_target32 (layout.exec_size); - o->data_size = grub_cpu_to_le32 (reloc_addr - layout.exec_size - - header_size); -- o->bss_size = grub_cpu_to_le32 (layout.bss_size); - o->entry_addr = grub_cpu_to_le32 (layout.start_address); - o->code_base = grub_cpu_to_le32 (header_size); - -@@ -1342,7 +1341,6 @@ grub_install_generate_image (const char *dir, const char *prefix, - o->code_size = grub_host_to_target32 (layout.exec_size); - o->data_size = grub_cpu_to_le32 (reloc_addr - layout.exec_size - - header_size); -- o->bss_size = grub_cpu_to_le32 (layout.bss_size); - o->entry_addr = grub_cpu_to_le32 (layout.start_address); - o->code_base = grub_cpu_to_le32 (header_size); - o->image_base = 0; -@@ -1387,21 +1385,6 @@ grub_install_generate_image (const char *dir, const char *prefix, - = grub_cpu_to_le32_compile_time (GRUB_PE32_SCN_CNT_INITIALIZED_DATA - | GRUB_PE32_SCN_MEM_READ - | GRUB_PE32_SCN_MEM_WRITE); -- --#if 0 -- bss_section = data_section + 1; -- strcpy (bss_section->name, ".bss"); -- bss_section->virtual_size = grub_cpu_to_le32 (layout.bss_size); -- bss_section->virtual_address = grub_cpu_to_le32 (header_size + layout.kernel_size); -- bss_section->raw_data_size = 0; -- bss_section->raw_data_offset = 0; -- bss_section->characteristics -- = grub_cpu_to_le32_compile_time (GRUB_PE32_SCN_MEM_READ -- | GRUB_PE32_SCN_MEM_WRITE -- | GRUB_PE32_SCN_ALIGN_64BYTES -- | GRUB_PE32_SCN_CNT_INITIALIZED_DATA -- | 0x80); --#endif - - mods_section = data_section + 1; - strcpy (mods_section->name, "mods"); --- -2.14.2 - diff --git a/boot/grub2/0135-util-mkimage-Use-grub_host_to_target32-instead-of-gr.patch b/boot/grub2/0135-util-mkimage-Use-grub_host_to_target32-instead-of-gr.patch deleted file mode 100644 index 778065ce5f7..00000000000 --- a/boot/grub2/0135-util-mkimage-Use-grub_host_to_target32-instead-of-gr.patch +++ /dev/null @@ -1,113 +0,0 @@ -From 1710452aca05ccdd21e74390ec08c63fdf0ee10a Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Mon, 15 Feb 2021 13:59:21 +0100 -Subject: [PATCH] util/mkimage: Use grub_host_to_target32() instead of - grub_cpu_to_le32() - -The latter doesn't take into account the target image endianness. There is -a grub_cpu_to_le32_compile_time() but no compile time variant for function -grub_host_to_target32(). So, let's keep using the other one for this case. - -Signed-off-by: Peter Jones -Signed-off-by: Javier Martinez Canillas -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - util/mkimage.c | 44 ++++++++++++++++++++++---------------------- - 1 file changed, 22 insertions(+), 22 deletions(-) - -diff --git a/util/mkimage.c b/util/mkimage.c -index 32bb8ea..02944f2 100644 ---- a/util/mkimage.c -+++ b/util/mkimage.c -@@ -1302,10 +1302,10 @@ grub_install_generate_image (const char *dir, const char *prefix, - + sizeof (struct grub_pe32_coff_header)); - o->magic = grub_host_to_target16 (GRUB_PE32_PE32_MAGIC); - o->code_size = grub_host_to_target32 (layout.exec_size); -- o->data_size = grub_cpu_to_le32 (reloc_addr - layout.exec_size -+ o->data_size = grub_host_to_target32 (reloc_addr - layout.exec_size - - header_size); -- o->entry_addr = grub_cpu_to_le32 (layout.start_address); -- o->code_base = grub_cpu_to_le32 (header_size); -+ o->entry_addr = grub_host_to_target32 (layout.start_address); -+ o->code_base = grub_host_to_target32 (header_size); - - o->data_base = grub_host_to_target32 (header_size + layout.exec_size); - -@@ -1339,10 +1339,10 @@ grub_install_generate_image (const char *dir, const char *prefix, - + sizeof (struct grub_pe32_coff_header)); - o->magic = grub_host_to_target16 (GRUB_PE32_PE64_MAGIC); - o->code_size = grub_host_to_target32 (layout.exec_size); -- o->data_size = grub_cpu_to_le32 (reloc_addr - layout.exec_size -+ o->data_size = grub_host_to_target32 (reloc_addr - layout.exec_size - - header_size); -- o->entry_addr = grub_cpu_to_le32 (layout.start_address); -- o->code_base = grub_cpu_to_le32 (header_size); -+ o->entry_addr = grub_host_to_target32 (layout.start_address); -+ o->code_base = grub_host_to_target32 (header_size); - o->image_base = 0; - o->section_alignment = grub_host_to_target32 (image_target->section_align); - o->file_alignment = grub_host_to_target32 (GRUB_PE32_FILE_ALIGNMENT); -@@ -1366,10 +1366,10 @@ grub_install_generate_image (const char *dir, const char *prefix, - /* The sections. */ - text_section = sections; - strcpy (text_section->name, ".text"); -- text_section->virtual_size = grub_cpu_to_le32 (layout.exec_size); -- text_section->virtual_address = grub_cpu_to_le32 (header_size); -- text_section->raw_data_size = grub_cpu_to_le32 (layout.exec_size); -- text_section->raw_data_offset = grub_cpu_to_le32 (header_size); -+ text_section->virtual_size = grub_host_to_target32 (layout.exec_size); -+ text_section->virtual_address = grub_host_to_target32 (header_size); -+ text_section->raw_data_size = grub_host_to_target32 (layout.exec_size); -+ text_section->raw_data_offset = grub_host_to_target32 (header_size); - text_section->characteristics = grub_cpu_to_le32_compile_time ( - GRUB_PE32_SCN_CNT_CODE - | GRUB_PE32_SCN_MEM_EXECUTE -@@ -1377,10 +1377,10 @@ grub_install_generate_image (const char *dir, const char *prefix, - - data_section = text_section + 1; - strcpy (data_section->name, ".data"); -- data_section->virtual_size = grub_cpu_to_le32 (layout.kernel_size - layout.exec_size); -- data_section->virtual_address = grub_cpu_to_le32 (header_size + layout.exec_size); -- data_section->raw_data_size = grub_cpu_to_le32 (layout.kernel_size - layout.exec_size); -- data_section->raw_data_offset = grub_cpu_to_le32 (header_size + layout.exec_size); -+ data_section->virtual_size = grub_host_to_target32 (layout.kernel_size - layout.exec_size); -+ data_section->virtual_address = grub_host_to_target32 (header_size + layout.exec_size); -+ data_section->raw_data_size = grub_host_to_target32 (layout.kernel_size - layout.exec_size); -+ data_section->raw_data_offset = grub_host_to_target32 (header_size + layout.exec_size); - data_section->characteristics - = grub_cpu_to_le32_compile_time (GRUB_PE32_SCN_CNT_INITIALIZED_DATA - | GRUB_PE32_SCN_MEM_READ -@@ -1388,10 +1388,10 @@ grub_install_generate_image (const char *dir, const char *prefix, - - mods_section = data_section + 1; - strcpy (mods_section->name, "mods"); -- mods_section->virtual_size = grub_cpu_to_le32 (reloc_addr - layout.kernel_size - header_size); -- mods_section->virtual_address = grub_cpu_to_le32 (header_size + layout.kernel_size + layout.bss_size); -- mods_section->raw_data_size = grub_cpu_to_le32 (reloc_addr - layout.kernel_size - header_size); -- mods_section->raw_data_offset = grub_cpu_to_le32 (header_size + layout.kernel_size); -+ mods_section->virtual_size = grub_host_to_target32 (reloc_addr - layout.kernel_size - header_size); -+ mods_section->virtual_address = grub_host_to_target32 (header_size + layout.kernel_size + layout.bss_size); -+ mods_section->raw_data_size = grub_host_to_target32 (reloc_addr - layout.kernel_size - header_size); -+ mods_section->raw_data_offset = grub_host_to_target32 (header_size + layout.kernel_size); - mods_section->characteristics - = grub_cpu_to_le32_compile_time (GRUB_PE32_SCN_CNT_INITIALIZED_DATA - | GRUB_PE32_SCN_MEM_READ -@@ -1399,10 +1399,10 @@ grub_install_generate_image (const char *dir, const char *prefix, - - reloc_section = mods_section + 1; - strcpy (reloc_section->name, ".reloc"); -- reloc_section->virtual_size = grub_cpu_to_le32 (layout.reloc_size); -- reloc_section->virtual_address = grub_cpu_to_le32 (reloc_addr + layout.bss_size); -- reloc_section->raw_data_size = grub_cpu_to_le32 (layout.reloc_size); -- reloc_section->raw_data_offset = grub_cpu_to_le32 (reloc_addr); -+ reloc_section->virtual_size = grub_host_to_target32 (layout.reloc_size); -+ reloc_section->virtual_address = grub_host_to_target32 (reloc_addr + layout.bss_size); -+ reloc_section->raw_data_size = grub_host_to_target32 (layout.reloc_size); -+ reloc_section->raw_data_offset = grub_host_to_target32 (reloc_addr); - reloc_section->characteristics - = grub_cpu_to_le32_compile_time (GRUB_PE32_SCN_CNT_INITIALIZED_DATA - | GRUB_PE32_SCN_MEM_DISCARDABLE --- -2.14.2 - diff --git a/boot/grub2/0136-util-mkimage-Always-use-grub_host_to_target32-to-ini.patch b/boot/grub2/0136-util-mkimage-Always-use-grub_host_to_target32-to-ini.patch deleted file mode 100644 index 81d7d01f9bb..00000000000 --- a/boot/grub2/0136-util-mkimage-Always-use-grub_host_to_target32-to-ini.patch +++ /dev/null @@ -1,39 +0,0 @@ -From ae8936f9c375e1a38129e85a1b5d573fb451f288 Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Mon, 15 Feb 2021 14:14:24 +0100 -Subject: [PATCH] util/mkimage: Always use grub_host_to_target32() to - initialize PE stack and heap stuff - -This change does not impact final result of initialization itself. -However, it eases PE code unification in subsequent patches. - -Signed-off-by: Peter Jones -Signed-off-by: Javier Martinez Canillas -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - util/mkimage.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/util/mkimage.c b/util/mkimage.c -index 02944f2..b94bfb7 100644 ---- a/util/mkimage.c -+++ b/util/mkimage.c -@@ -1351,10 +1351,10 @@ grub_install_generate_image (const char *dir, const char *prefix, - o->subsystem = grub_host_to_target16 (GRUB_PE32_SUBSYSTEM_EFI_APPLICATION); - - /* Do these really matter? */ -- o->stack_reserve_size = grub_host_to_target64 (0x10000); -- o->stack_commit_size = grub_host_to_target64 (0x10000); -- o->heap_reserve_size = grub_host_to_target64 (0x10000); -- o->heap_commit_size = grub_host_to_target64 (0x10000); -+ o->stack_reserve_size = grub_host_to_target32 (0x10000); -+ o->stack_commit_size = grub_host_to_target32 (0x10000); -+ o->heap_reserve_size = grub_host_to_target32 (0x10000); -+ o->heap_commit_size = grub_host_to_target32 (0x10000); - - o->num_data_directories - = grub_host_to_target32 (GRUB_PE32_NUM_DATA_DIRECTORIES); --- -2.14.2 - diff --git a/boot/grub2/0137-util-mkimage-Unify-more-of-the-PE32-and-PE32-header-.patch b/boot/grub2/0137-util-mkimage-Unify-more-of-the-PE32-and-PE32-header-.patch deleted file mode 100644 index 1f8cb8e2fdc..00000000000 --- a/boot/grub2/0137-util-mkimage-Unify-more-of-the-PE32-and-PE32-header-.patch +++ /dev/null @@ -1,169 +0,0 @@ -From a4e8936f010a8e928e973b80390c8f83ad6b8000 Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Mon, 15 Feb 2021 14:19:31 +0100 -Subject: [PATCH] util/mkimage: Unify more of the PE32 and PE32+ header set-up - -There's quite a bit of code duplication in the code that sets the optional -header for PE32 and PE32+. The two are very similar with the exception of -a few fields that have type grub_uint64_t instead of grub_uint32_t. - -Factor out the common code and add a PE_OHDR() macro that simplifies the -set-up and make the code more readable. - -Signed-off-by: Peter Jones -Signed-off-by: Javier Martinez Canillas -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - util/mkimage.c | 111 ++++++++++++++++++++++++++------------------------------- - 1 file changed, 51 insertions(+), 60 deletions(-) - -diff --git a/util/mkimage.c b/util/mkimage.c -index b94bfb7..a039039 100644 ---- a/util/mkimage.c -+++ b/util/mkimage.c -@@ -816,6 +816,21 @@ grub_install_get_image_targets_string (void) - return formats; - } - -+/* -+ * tmp_ is just here so the compiler knows we'll never derefernce a NULL. -+ * It should get fully optimized away. -+ */ -+#define PE_OHDR(o32, o64, field) (*( \ -+{ \ -+ __typeof__((o64)->field) tmp_; \ -+ __typeof__((o64)->field) *ret_ = &tmp_; \ -+ if (o32) \ -+ ret_ = (void *)(&((o32)->field)); \ -+ else if (o64) \ -+ ret_ = (void *)(&((o64)->field)); \ -+ ret_; \ -+})) -+ - void - grub_install_generate_image (const char *dir, const char *prefix, - FILE *out, const char *outname, char *mods[], -@@ -1252,6 +1267,8 @@ grub_install_generate_image (const char *dir, const char *prefix, - static const grub_uint8_t stub[] = GRUB_PE32_MSDOS_STUB; - int header_size; - int reloc_addr; -+ struct grub_pe32_optional_header *o32 = NULL; -+ struct grub_pe64_optional_header *o64 = NULL; - - if (image_target->voidp_sizeof == 4) - header_size = EFI32_HEADER_SIZE; -@@ -1293,76 +1310,50 @@ grub_install_generate_image (const char *dir, const char *prefix, - /* The PE Optional header. */ - if (image_target->voidp_sizeof == 4) - { -- struct grub_pe32_optional_header *o; -- - c->optional_header_size = grub_host_to_target16 (sizeof (struct grub_pe32_optional_header)); - -- o = (struct grub_pe32_optional_header *) -- (header + GRUB_PE32_MSDOS_STUB_SIZE + GRUB_PE32_SIGNATURE_SIZE -- + sizeof (struct grub_pe32_coff_header)); -- o->magic = grub_host_to_target16 (GRUB_PE32_PE32_MAGIC); -- o->code_size = grub_host_to_target32 (layout.exec_size); -- o->data_size = grub_host_to_target32 (reloc_addr - layout.exec_size -- - header_size); -- o->entry_addr = grub_host_to_target32 (layout.start_address); -- o->code_base = grub_host_to_target32 (header_size); -- -- o->data_base = grub_host_to_target32 (header_size + layout.exec_size); -- -- o->image_base = 0; -- o->section_alignment = grub_host_to_target32 (image_target->section_align); -- o->file_alignment = grub_host_to_target32 (GRUB_PE32_FILE_ALIGNMENT); -- o->image_size = grub_host_to_target32 (pe_size); -- o->header_size = grub_host_to_target32 (header_size); -- o->subsystem = grub_host_to_target16 (GRUB_PE32_SUBSYSTEM_EFI_APPLICATION); -- -- /* Do these really matter? */ -- o->stack_reserve_size = grub_host_to_target32 (0x10000); -- o->stack_commit_size = grub_host_to_target32 (0x10000); -- o->heap_reserve_size = grub_host_to_target32 (0x10000); -- o->heap_commit_size = grub_host_to_target32 (0x10000); -- -- o->num_data_directories = grub_host_to_target32 (GRUB_PE32_NUM_DATA_DIRECTORIES); -+ o32 = (struct grub_pe32_optional_header *) -+ (header + GRUB_PE32_MSDOS_STUB_SIZE + GRUB_PE32_SIGNATURE_SIZE + -+ sizeof (struct grub_pe32_coff_header)); -+ o32->magic = grub_host_to_target16 (GRUB_PE32_PE32_MAGIC); -+ o32->data_base = grub_host_to_target32 (header_size + layout.exec_size); - -- o->base_relocation_table.rva = grub_host_to_target32 (reloc_addr); -- o->base_relocation_table.size = grub_host_to_target32 (layout.reloc_size); -- sections = o + 1; -+ sections = o32 + 1; - } - else - { -- struct grub_pe64_optional_header *o; -- - c->optional_header_size = grub_host_to_target16 (sizeof (struct grub_pe64_optional_header)); - -- o = (struct grub_pe64_optional_header *) -- (header + GRUB_PE32_MSDOS_STUB_SIZE + GRUB_PE32_SIGNATURE_SIZE -- + sizeof (struct grub_pe32_coff_header)); -- o->magic = grub_host_to_target16 (GRUB_PE32_PE64_MAGIC); -- o->code_size = grub_host_to_target32 (layout.exec_size); -- o->data_size = grub_host_to_target32 (reloc_addr - layout.exec_size -- - header_size); -- o->entry_addr = grub_host_to_target32 (layout.start_address); -- o->code_base = grub_host_to_target32 (header_size); -- o->image_base = 0; -- o->section_alignment = grub_host_to_target32 (image_target->section_align); -- o->file_alignment = grub_host_to_target32 (GRUB_PE32_FILE_ALIGNMENT); -- o->image_size = grub_host_to_target32 (pe_size); -- o->header_size = grub_host_to_target32 (header_size); -- o->subsystem = grub_host_to_target16 (GRUB_PE32_SUBSYSTEM_EFI_APPLICATION); -- -- /* Do these really matter? */ -- o->stack_reserve_size = grub_host_to_target32 (0x10000); -- o->stack_commit_size = grub_host_to_target32 (0x10000); -- o->heap_reserve_size = grub_host_to_target32 (0x10000); -- o->heap_commit_size = grub_host_to_target32 (0x10000); -- -- o->num_data_directories -- = grub_host_to_target32 (GRUB_PE32_NUM_DATA_DIRECTORIES); -+ o64 = (struct grub_pe64_optional_header *) -+ (header + GRUB_PE32_MSDOS_STUB_SIZE + GRUB_PE32_SIGNATURE_SIZE + -+ sizeof (struct grub_pe32_coff_header)); -+ o64->magic = grub_host_to_target16 (GRUB_PE32_PE64_MAGIC); - -- o->base_relocation_table.rva = grub_host_to_target32 (reloc_addr); -- o->base_relocation_table.size = grub_host_to_target32 (layout.reloc_size); -- sections = o + 1; -+ sections = o64 + 1; - } -+ -+ PE_OHDR (o32, o64, code_size) = grub_host_to_target32 (layout.exec_size); -+ PE_OHDR (o32, o64, data_size) = grub_host_to_target32 (reloc_addr - layout.exec_size - header_size); -+ PE_OHDR (o32, o64, entry_addr) = grub_host_to_target32 (layout.start_address); -+ PE_OHDR (o32, o64, code_base) = grub_host_to_target32 (header_size); -+ -+ PE_OHDR (o32, o64, image_base) = 0; -+ PE_OHDR (o32, o64, section_alignment) = grub_host_to_target32 (image_target->section_align); -+ PE_OHDR (o32, o64, file_alignment) = grub_host_to_target32 (GRUB_PE32_FILE_ALIGNMENT); -+ PE_OHDR (o32, o64, image_size) = grub_host_to_target32 (pe_size); -+ PE_OHDR (o32, o64, header_size) = grub_host_to_target32 (header_size); -+ PE_OHDR (o32, o64, subsystem) = grub_host_to_target16 (GRUB_PE32_SUBSYSTEM_EFI_APPLICATION); -+ -+ /* Do these really matter? */ -+ PE_OHDR (o32, o64, stack_reserve_size) = grub_host_to_target32 (0x10000); -+ PE_OHDR (o32, o64, stack_commit_size) = grub_host_to_target32 (0x10000); -+ PE_OHDR (o32, o64, heap_reserve_size) = grub_host_to_target32 (0x10000); -+ PE_OHDR (o32, o64, heap_commit_size) = grub_host_to_target32 (0x10000); -+ -+ PE_OHDR (o32, o64, num_data_directories) = grub_host_to_target32 (GRUB_PE32_NUM_DATA_DIRECTORIES); -+ PE_OHDR (o32, o64, base_relocation_table.rva) = grub_host_to_target32 (reloc_addr); -+ PE_OHDR (o32, o64, base_relocation_table.size) = grub_host_to_target32 (layout.reloc_size); -+ - /* The sections. */ - text_section = sections; - strcpy (text_section->name, ".text"); --- -2.14.2 - diff --git a/boot/grub2/0138-util-mkimage-Reorder-PE-optional-header-fields-set-u.patch b/boot/grub2/0138-util-mkimage-Reorder-PE-optional-header-fields-set-u.patch deleted file mode 100644 index cb65f964059..00000000000 --- a/boot/grub2/0138-util-mkimage-Reorder-PE-optional-header-fields-set-u.patch +++ /dev/null @@ -1,73 +0,0 @@ -From ba44c87e56a8bccde235ebb7d41d5aa54604d241 Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Mon, 15 Feb 2021 14:21:48 +0100 -Subject: [PATCH] util/mkimage: Reorder PE optional header fields set-up - -This makes the PE32 and PE32+ header fields set-up easier to follow by -setting them closer to the initialization of their related sections. - -Signed-off-by: Peter Jones -Signed-off-by: Javier Martinez Canillas -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - util/mkimage.c | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - -diff --git a/util/mkimage.c b/util/mkimage.c -index a039039..deaef56 100644 ---- a/util/mkimage.c -+++ b/util/mkimage.c -@@ -1332,16 +1332,12 @@ grub_install_generate_image (const char *dir, const char *prefix, - sections = o64 + 1; - } - -- PE_OHDR (o32, o64, code_size) = grub_host_to_target32 (layout.exec_size); -- PE_OHDR (o32, o64, data_size) = grub_host_to_target32 (reloc_addr - layout.exec_size - header_size); -+ PE_OHDR (o32, o64, header_size) = grub_host_to_target32 (header_size); - PE_OHDR (o32, o64, entry_addr) = grub_host_to_target32 (layout.start_address); -- PE_OHDR (o32, o64, code_base) = grub_host_to_target32 (header_size); -- - PE_OHDR (o32, o64, image_base) = 0; -+ PE_OHDR (o32, o64, image_size) = grub_host_to_target32 (pe_size); - PE_OHDR (o32, o64, section_alignment) = grub_host_to_target32 (image_target->section_align); - PE_OHDR (o32, o64, file_alignment) = grub_host_to_target32 (GRUB_PE32_FILE_ALIGNMENT); -- PE_OHDR (o32, o64, image_size) = grub_host_to_target32 (pe_size); -- PE_OHDR (o32, o64, header_size) = grub_host_to_target32 (header_size); - PE_OHDR (o32, o64, subsystem) = grub_host_to_target16 (GRUB_PE32_SUBSYSTEM_EFI_APPLICATION); - - /* Do these really matter? */ -@@ -1351,10 +1347,10 @@ grub_install_generate_image (const char *dir, const char *prefix, - PE_OHDR (o32, o64, heap_commit_size) = grub_host_to_target32 (0x10000); - - PE_OHDR (o32, o64, num_data_directories) = grub_host_to_target32 (GRUB_PE32_NUM_DATA_DIRECTORIES); -- PE_OHDR (o32, o64, base_relocation_table.rva) = grub_host_to_target32 (reloc_addr); -- PE_OHDR (o32, o64, base_relocation_table.size) = grub_host_to_target32 (layout.reloc_size); - - /* The sections. */ -+ PE_OHDR (o32, o64, code_base) = grub_host_to_target32 (header_size); -+ PE_OHDR (o32, o64, code_size) = grub_host_to_target32 (layout.exec_size); - text_section = sections; - strcpy (text_section->name, ".text"); - text_section->virtual_size = grub_host_to_target32 (layout.exec_size); -@@ -1366,6 +1362,8 @@ grub_install_generate_image (const char *dir, const char *prefix, - | GRUB_PE32_SCN_MEM_EXECUTE - | GRUB_PE32_SCN_MEM_READ); - -+ PE_OHDR (o32, o64, data_size) = grub_host_to_target32 (reloc_addr - layout.exec_size - header_size); -+ - data_section = text_section + 1; - strcpy (data_section->name, ".data"); - data_section->virtual_size = grub_host_to_target32 (layout.kernel_size - layout.exec_size); -@@ -1388,6 +1386,8 @@ grub_install_generate_image (const char *dir, const char *prefix, - | GRUB_PE32_SCN_MEM_READ - | GRUB_PE32_SCN_MEM_WRITE); - -+ PE_OHDR (o32, o64, base_relocation_table.rva) = grub_host_to_target32 (reloc_addr); -+ PE_OHDR (o32, o64, base_relocation_table.size) = grub_host_to_target32 (layout.reloc_size); - reloc_section = mods_section + 1; - strcpy (reloc_section->name, ".reloc"); - reloc_section->virtual_size = grub_host_to_target32 (layout.reloc_size); --- -2.14.2 - diff --git a/boot/grub2/0139-util-mkimage-Improve-data_size-value-calculation.patch b/boot/grub2/0139-util-mkimage-Improve-data_size-value-calculation.patch deleted file mode 100644 index cc25519a1b3..00000000000 --- a/boot/grub2/0139-util-mkimage-Improve-data_size-value-calculation.patch +++ /dev/null @@ -1,50 +0,0 @@ -From ff406eff25465932b97a2857ee5a75fd0957e9b9 Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Thu, 11 Feb 2021 17:07:33 +0100 -Subject: [PATCH] util/mkimage: Improve data_size value calculation - -According to "Microsoft Portable Executable and Common Object File Format -Specification", the Optional Header SizeOfInitializedData field contains: - - Size of the initialized data section, or the sum of all such sections if - there are multiple data sections. - -Make this explicit by adding the GRUB kernel data size to the sum of all -the modules sizes. The ALIGN_UP() is not required by the PE spec but do -it to avoid alignment issues. - -Signed-off-by: Peter Jones -Signed-off-by: Javier Martinez Canillas -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - util/mkimage.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/util/mkimage.c b/util/mkimage.c -index deaef56..853a521 100644 ---- a/util/mkimage.c -+++ b/util/mkimage.c -@@ -1260,6 +1260,7 @@ grub_install_generate_image (const char *dir, const char *prefix, - void *pe_img; - grub_uint8_t *header; - void *sections; -+ size_t scn_size; - size_t pe_size; - struct grub_pe32_coff_header *c; - struct grub_pe32_section_table *text_section, *data_section; -@@ -1362,7 +1363,10 @@ grub_install_generate_image (const char *dir, const char *prefix, - | GRUB_PE32_SCN_MEM_EXECUTE - | GRUB_PE32_SCN_MEM_READ); - -- PE_OHDR (o32, o64, data_size) = grub_host_to_target32 (reloc_addr - layout.exec_size - header_size); -+ scn_size = ALIGN_UP (layout.kernel_size - layout.exec_size, GRUB_PE32_FILE_ALIGNMENT); -+ PE_OHDR (o32, o64, data_size) = grub_host_to_target32 (scn_size + -+ ALIGN_UP (total_module_size, -+ GRUB_PE32_FILE_ALIGNMENT)); - - data_section = text_section + 1; - strcpy (data_section->name, ".data"); --- -2.14.2 - diff --git a/boot/grub2/0140-util-mkimage-Refactor-section-setup-to-use-a-helper.patch b/boot/grub2/0140-util-mkimage-Refactor-section-setup-to-use-a-helper.patch deleted file mode 100644 index cc0270edb73..00000000000 --- a/boot/grub2/0140-util-mkimage-Refactor-section-setup-to-use-a-helper.patch +++ /dev/null @@ -1,221 +0,0 @@ -From f60ba9e5945892e835e53f0619406d96002f7f70 Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Mon, 15 Feb 2021 14:58:06 +0100 -Subject: [PATCH] util/mkimage: Refactor section setup to use a helper - -Add a init_pe_section() helper function to setup PE sections. This makes -the code simpler and easier to read. - -Signed-off-by: Peter Jones -Signed-off-by: Javier Martinez Canillas -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - util/mkimage.c | 143 +++++++++++++++++++++++++++++++-------------------------- - 1 file changed, 77 insertions(+), 66 deletions(-) - -diff --git a/util/mkimage.c b/util/mkimage.c -index 853a521..8b475a6 100644 ---- a/util/mkimage.c -+++ b/util/mkimage.c -@@ -816,6 +816,38 @@ grub_install_get_image_targets_string (void) - return formats; - } - -+/* -+ * The image_target parameter is used by the grub_host_to_target32() macro. -+ */ -+static struct grub_pe32_section_table * -+init_pe_section(const struct grub_install_image_target_desc *image_target, -+ struct grub_pe32_section_table *section, -+ const char * const name, -+ grub_uint32_t *vma, grub_uint32_t vsz, grub_uint32_t valign, -+ grub_uint32_t *rda, grub_uint32_t rsz, -+ grub_uint32_t characteristics) -+{ -+ size_t len = strlen (name); -+ -+ if (len > sizeof (section->name)) -+ grub_util_error (_("section name %s length is bigger than %lu"), -+ name, (unsigned long) sizeof (section->name)); -+ -+ memcpy (section->name, name, len); -+ -+ section->virtual_address = grub_host_to_target32 (*vma); -+ section->virtual_size = grub_host_to_target32 (vsz); -+ (*vma) = ALIGN_UP (*vma + vsz, valign); -+ -+ section->raw_data_offset = grub_host_to_target32 (*rda); -+ section->raw_data_size = grub_host_to_target32 (rsz); -+ (*rda) = ALIGN_UP (*rda + rsz, GRUB_PE32_FILE_ALIGNMENT); -+ -+ section->characteristics = grub_host_to_target32 (characteristics); -+ -+ return section + 1; -+} -+ - /* - * tmp_ is just here so the compiler knows we'll never derefernce a NULL. - * It should get fully optimized away. -@@ -1257,17 +1289,13 @@ grub_install_generate_image (const char *dir, const char *prefix, - break; - case IMAGE_EFI: - { -- void *pe_img; -- grub_uint8_t *header; -- void *sections; -+ char *pe_img, *header; -+ struct grub_pe32_section_table *section; - size_t scn_size; -- size_t pe_size; -+ grub_uint32_t vma, raw_data; -+ size_t pe_size, header_size; - struct grub_pe32_coff_header *c; -- struct grub_pe32_section_table *text_section, *data_section; -- struct grub_pe32_section_table *mods_section, *reloc_section; - static const grub_uint8_t stub[] = GRUB_PE32_MSDOS_STUB; -- int header_size; -- int reloc_addr; - struct grub_pe32_optional_header *o32 = NULL; - struct grub_pe64_optional_header *o64 = NULL; - -@@ -1276,17 +1304,12 @@ grub_install_generate_image (const char *dir, const char *prefix, - else - header_size = EFI64_HEADER_SIZE; - -- reloc_addr = ALIGN_UP (header_size + core_size, -- GRUB_PE32_FILE_ALIGNMENT); -+ vma = raw_data = header_size; -+ pe_size = ALIGN_UP (header_size + core_size, GRUB_PE32_FILE_ALIGNMENT) + -+ ALIGN_UP (layout.reloc_size, GRUB_PE32_FILE_ALIGNMENT); -+ header = pe_img = xcalloc (1, pe_size); - -- pe_size = ALIGN_UP (reloc_addr + layout.reloc_size, -- GRUB_PE32_FILE_ALIGNMENT); -- pe_img = xmalloc (reloc_addr + layout.reloc_size); -- memset (pe_img, 0, header_size); -- memcpy ((char *) pe_img + header_size, core_img, core_size); -- memset ((char *) pe_img + header_size + core_size, 0, reloc_addr - (header_size + core_size)); -- memcpy ((char *) pe_img + reloc_addr, layout.reloc_section, layout.reloc_size); -- header = pe_img; -+ memcpy (pe_img + raw_data, core_img, core_size); - - /* The magic. */ - memcpy (header, stub, GRUB_PE32_MSDOS_STUB_SIZE); -@@ -1319,18 +1342,17 @@ grub_install_generate_image (const char *dir, const char *prefix, - o32->magic = grub_host_to_target16 (GRUB_PE32_PE32_MAGIC); - o32->data_base = grub_host_to_target32 (header_size + layout.exec_size); - -- sections = o32 + 1; -+ section = (struct grub_pe32_section_table *)(o32 + 1); - } - else - { - c->optional_header_size = grub_host_to_target16 (sizeof (struct grub_pe64_optional_header)); -- - o64 = (struct grub_pe64_optional_header *) - (header + GRUB_PE32_MSDOS_STUB_SIZE + GRUB_PE32_SIGNATURE_SIZE + - sizeof (struct grub_pe32_coff_header)); - o64->magic = grub_host_to_target16 (GRUB_PE32_PE64_MAGIC); - -- sections = o64 + 1; -+ section = (struct grub_pe32_section_table *)(o64 + 1); - } - - PE_OHDR (o32, o64, header_size) = grub_host_to_target32 (header_size); -@@ -1350,58 +1372,47 @@ grub_install_generate_image (const char *dir, const char *prefix, - PE_OHDR (o32, o64, num_data_directories) = grub_host_to_target32 (GRUB_PE32_NUM_DATA_DIRECTORIES); - - /* The sections. */ -- PE_OHDR (o32, o64, code_base) = grub_host_to_target32 (header_size); -+ PE_OHDR (o32, o64, code_base) = grub_host_to_target32 (vma); - PE_OHDR (o32, o64, code_size) = grub_host_to_target32 (layout.exec_size); -- text_section = sections; -- strcpy (text_section->name, ".text"); -- text_section->virtual_size = grub_host_to_target32 (layout.exec_size); -- text_section->virtual_address = grub_host_to_target32 (header_size); -- text_section->raw_data_size = grub_host_to_target32 (layout.exec_size); -- text_section->raw_data_offset = grub_host_to_target32 (header_size); -- text_section->characteristics = grub_cpu_to_le32_compile_time ( -- GRUB_PE32_SCN_CNT_CODE -- | GRUB_PE32_SCN_MEM_EXECUTE -- | GRUB_PE32_SCN_MEM_READ); -+ section = init_pe_section (image_target, section, ".text", -+ &vma, layout.exec_size, -+ image_target->section_align, -+ &raw_data, layout.exec_size, -+ GRUB_PE32_SCN_CNT_CODE | -+ GRUB_PE32_SCN_MEM_EXECUTE | -+ GRUB_PE32_SCN_MEM_READ); - - scn_size = ALIGN_UP (layout.kernel_size - layout.exec_size, GRUB_PE32_FILE_ALIGNMENT); - PE_OHDR (o32, o64, data_size) = grub_host_to_target32 (scn_size + - ALIGN_UP (total_module_size, - GRUB_PE32_FILE_ALIGNMENT)); - -- data_section = text_section + 1; -- strcpy (data_section->name, ".data"); -- data_section->virtual_size = grub_host_to_target32 (layout.kernel_size - layout.exec_size); -- data_section->virtual_address = grub_host_to_target32 (header_size + layout.exec_size); -- data_section->raw_data_size = grub_host_to_target32 (layout.kernel_size - layout.exec_size); -- data_section->raw_data_offset = grub_host_to_target32 (header_size + layout.exec_size); -- data_section->characteristics -- = grub_cpu_to_le32_compile_time (GRUB_PE32_SCN_CNT_INITIALIZED_DATA -- | GRUB_PE32_SCN_MEM_READ -- | GRUB_PE32_SCN_MEM_WRITE); -- -- mods_section = data_section + 1; -- strcpy (mods_section->name, "mods"); -- mods_section->virtual_size = grub_host_to_target32 (reloc_addr - layout.kernel_size - header_size); -- mods_section->virtual_address = grub_host_to_target32 (header_size + layout.kernel_size + layout.bss_size); -- mods_section->raw_data_size = grub_host_to_target32 (reloc_addr - layout.kernel_size - header_size); -- mods_section->raw_data_offset = grub_host_to_target32 (header_size + layout.kernel_size); -- mods_section->characteristics -- = grub_cpu_to_le32_compile_time (GRUB_PE32_SCN_CNT_INITIALIZED_DATA -- | GRUB_PE32_SCN_MEM_READ -- | GRUB_PE32_SCN_MEM_WRITE); -- -- PE_OHDR (o32, o64, base_relocation_table.rva) = grub_host_to_target32 (reloc_addr); -- PE_OHDR (o32, o64, base_relocation_table.size) = grub_host_to_target32 (layout.reloc_size); -- reloc_section = mods_section + 1; -- strcpy (reloc_section->name, ".reloc"); -- reloc_section->virtual_size = grub_host_to_target32 (layout.reloc_size); -- reloc_section->virtual_address = grub_host_to_target32 (reloc_addr + layout.bss_size); -- reloc_section->raw_data_size = grub_host_to_target32 (layout.reloc_size); -- reloc_section->raw_data_offset = grub_host_to_target32 (reloc_addr); -- reloc_section->characteristics -- = grub_cpu_to_le32_compile_time (GRUB_PE32_SCN_CNT_INITIALIZED_DATA -- | GRUB_PE32_SCN_MEM_DISCARDABLE -- | GRUB_PE32_SCN_MEM_READ); -+ section = init_pe_section (image_target, section, ".data", -+ &vma, scn_size, image_target->section_align, -+ &raw_data, scn_size, -+ GRUB_PE32_SCN_CNT_INITIALIZED_DATA | -+ GRUB_PE32_SCN_MEM_READ | -+ GRUB_PE32_SCN_MEM_WRITE); -+ -+ scn_size = pe_size - layout.reloc_size - raw_data; -+ section = init_pe_section (image_target, section, "mods", -+ &vma, scn_size, image_target->section_align, -+ &raw_data, scn_size, -+ GRUB_PE32_SCN_CNT_INITIALIZED_DATA | -+ GRUB_PE32_SCN_MEM_READ | -+ GRUB_PE32_SCN_MEM_WRITE); -+ -+ scn_size = layout.reloc_size; -+ PE_OHDR (o32, o64, base_relocation_table.rva) = grub_host_to_target32 (vma); -+ PE_OHDR (o32, o64, base_relocation_table.size) = grub_host_to_target32 (scn_size); -+ memcpy (pe_img + raw_data, layout.reloc_section, scn_size); -+ init_pe_section (image_target, section, ".reloc", -+ &vma, scn_size, image_target->section_align, -+ &raw_data, scn_size, -+ GRUB_PE32_SCN_CNT_INITIALIZED_DATA | -+ GRUB_PE32_SCN_MEM_DISCARDABLE | -+ GRUB_PE32_SCN_MEM_READ); -+ - free (core_img); - core_img = pe_img; - core_size = pe_size; --- -2.14.2 - diff --git a/boot/grub2/0141-util-mkimage-Add-an-option-to-import-SBAT-metadata-i.patch b/boot/grub2/0141-util-mkimage-Add-an-option-to-import-SBAT-metadata-i.patch deleted file mode 100644 index 3cc6b498c02..00000000000 --- a/boot/grub2/0141-util-mkimage-Add-an-option-to-import-SBAT-metadata-i.patch +++ /dev/null @@ -1,264 +0,0 @@ -From b11547137703bbc642114a816233a5b6fed61b06 Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Mon, 15 Feb 2021 17:07:00 +0100 -Subject: [PATCH] util/mkimage: Add an option to import SBAT metadata into a - .sbat section - -Add a --sbat option to the grub-mkimage tool which allows us to import -an SBAT metadata formatted as a CSV file into a .sbat section of the -EFI binary. - -Signed-off-by: Peter Jones -Signed-off-by: Javier Martinez Canillas -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - docs/grub.texi | 19 +++++++++++++++++++ - include/grub/util/install.h | 3 ++- - include/grub/util/mkimage.h | 1 + - util/grub-install-common.c | 2 +- - util/grub-mkimage.c | 15 ++++++++++++++- - util/mkimage.c | 43 ++++++++++++++++++++++++++++++++++++------- - 6 files changed, 73 insertions(+), 10 deletions(-) - -diff --git a/docs/grub.texi b/docs/grub.texi -index 8518cc0..bff6dfc 100644 ---- a/docs/grub.texi -+++ b/docs/grub.texi -@@ -5616,6 +5616,7 @@ environment variables and commands are listed in the same order. - * Authentication and authorisation:: Users and access control - * Using digital signatures:: Booting digitally signed code - * UEFI secure boot and shim:: Booting digitally signed PE files -+* Secure Boot Advanced Targeting:: Embedded information for generation number based revocation - * Measured Boot:: Measuring boot components - * Lockdown:: Lockdown when booting on a secure setup - @end menu -@@ -5795,6 +5796,24 @@ and @command{memrw} will not be available when the UEFI secure boot is enabled. - This is done for security reasons and are enforced by the GRUB Lockdown mechanism - (@pxref{Lockdown}). - -+@node Secure Boot Advanced Targeting -+@section Embedded information for generation number based revocation -+ -+The Secure Boot Advanced Targeting (SBAT) is a mechanism to allow the revocation -+of components in the boot path by using generation numbers embedded into the EFI -+binaries. The SBAT metadata is located in an .sbat data section that has set of -+UTF-8 strings as comma-separated values (CSV). See -+@uref{https://github.com/rhboot/shim/blob/main/SBAT.md} for more details. -+ -+To add a data section containing the SBAT information into the binary, the -+@option{--sbat} option of @command{grub-mkimage} command should be used. The content -+of a CSV file, encoded with UTF-8, is copied as is to the .sbat data section into -+the generated EFI binary. The CSV file can be stored anywhere on the file system. -+ -+@example -+grub-mkimage -O x86_64-efi -o grubx64.efi -p '(tftp)/grub' --sbat sbat.csv efinet tftp -+@end example -+ - @node Measured Boot - @section Measuring boot components - -diff --git a/include/grub/util/install.h b/include/grub/util/install.h -index 2631b10..c03befd 100644 ---- a/include/grub/util/install.h -+++ b/include/grub/util/install.h -@@ -183,7 +183,8 @@ grub_install_generate_image (const char *dir, const char *prefix, - char *config_path, - const struct grub_install_image_target_desc *image_target, - int note, -- grub_compression_t comp, const char *dtb_file); -+ grub_compression_t comp, const char *dtb_file, -+ const char *sbat_path); - - const struct grub_install_image_target_desc * - grub_install_get_image_target (const char *arg); -diff --git a/include/grub/util/mkimage.h b/include/grub/util/mkimage.h -index ba9f568..3819a67 100644 ---- a/include/grub/util/mkimage.h -+++ b/include/grub/util/mkimage.h -@@ -24,6 +24,7 @@ struct grub_mkimage_layout - size_t exec_size; - size_t kernel_size; - size_t bss_size; -+ size_t sbat_size; - grub_uint64_t start_address; - void *reloc_section; - size_t reloc_size; -diff --git a/util/grub-install-common.c b/util/grub-install-common.c -index 0295d40..5d43ed1 100644 ---- a/util/grub-install-common.c -+++ b/util/grub-install-common.c -@@ -511,7 +511,7 @@ grub_install_make_image_wrap_file (const char *dir, const char *prefix, - grub_install_generate_image (dir, prefix, fp, outname, - modules.entries, memdisk_path, - pubkeys, npubkeys, config_path, tgt, -- note, compression, dtb); -+ note, compression, dtb, NULL); - while (dc--) - grub_install_pop_module (); - } -diff --git a/util/grub-mkimage.c b/util/grub-mkimage.c -index 912564e..75b8847 100644 ---- a/util/grub-mkimage.c -+++ b/util/grub-mkimage.c -@@ -81,6 +81,7 @@ static struct argp_option options[] = { - {"output", 'o', N_("FILE"), 0, N_("output a generated image to FILE [default=stdout]"), 0}, - {"format", 'O', N_("FORMAT"), 0, 0, 0}, - {"compression", 'C', "(xz|none|auto)", 0, N_("choose the compression to use for core image"), 0}, -+ {"sbat", 's', N_("FILE"), 0, N_("SBAT metadata"), 0}, - {"verbose", 'v', 0, 0, N_("print verbose messages."), 0}, - { 0, 0, 0, 0, 0, 0 } - }; -@@ -123,6 +124,7 @@ struct arguments - size_t npubkeys; - char *font; - char *config; -+ char *sbat; - int note; - const struct grub_install_image_target_desc *image_target; - grub_compression_t comp; -@@ -224,6 +226,13 @@ argp_parser (int key, char *arg, struct argp_state *state) - arguments->prefix = xstrdup (arg); - break; - -+ case 's': -+ if (arguments->sbat) -+ free (arguments->sbat); -+ -+ arguments->sbat = xstrdup (arg); -+ break; -+ - case 'v': - verbosity++; - break; -@@ -309,7 +318,8 @@ main (int argc, char *argv[]) - arguments.memdisk, arguments.pubkeys, - arguments.npubkeys, arguments.config, - arguments.image_target, arguments.note, -- arguments.comp, arguments.dtb); -+ arguments.comp, arguments.dtb, -+ arguments.sbat); - - if (grub_util_file_sync (fp) < 0) - grub_util_error (_("cannot sync `%s': %s"), arguments.output ? : "stdout", -@@ -328,5 +338,8 @@ main (int argc, char *argv[]) - if (arguments.output) - free (arguments.output); - -+ if (arguments.sbat) -+ free (arguments.sbat); -+ - return 0; - } -diff --git a/util/mkimage.c b/util/mkimage.c -index 8b475a6..b354ec1 100644 ---- a/util/mkimage.c -+++ b/util/mkimage.c -@@ -869,12 +869,13 @@ grub_install_generate_image (const char *dir, const char *prefix, - char *memdisk_path, char **pubkey_paths, - size_t npubkeys, char *config_path, - const struct grub_install_image_target_desc *image_target, -- int note, grub_compression_t comp, const char *dtb_path) -+ int note, grub_compression_t comp, const char *dtb_path, -+ const char *sbat_path) - { - char *kernel_img, *core_img; - size_t total_module_size, core_size; - size_t memdisk_size = 0, config_size = 0; -- size_t prefix_size = 0, dtb_size = 0; -+ size_t prefix_size = 0, dtb_size = 0, sbat_size = 0; - char *kernel_path; - size_t offset; - struct grub_util_path_list *path_list, *p; -@@ -925,6 +926,9 @@ grub_install_generate_image (const char *dir, const char *prefix, - total_module_size += dtb_size + sizeof (struct grub_module_header); - } - -+ if (sbat_path != NULL && image_target->id != IMAGE_EFI) -+ grub_util_error (_(".sbat section can be embedded into EFI images only")); -+ - if (config_path) - { - config_size = ALIGN_ADDR (grub_util_get_image_size (config_path) + 1); -@@ -1289,8 +1293,9 @@ grub_install_generate_image (const char *dir, const char *prefix, - break; - case IMAGE_EFI: - { -- char *pe_img, *header; -+ char *pe_img, *pe_sbat, *header; - struct grub_pe32_section_table *section; -+ size_t n_sections = 4; - size_t scn_size; - grub_uint32_t vma, raw_data; - size_t pe_size, header_size; -@@ -1305,8 +1310,15 @@ grub_install_generate_image (const char *dir, const char *prefix, - header_size = EFI64_HEADER_SIZE; - - vma = raw_data = header_size; -+ -+ if (sbat_path != NULL) -+ { -+ sbat_size = ALIGN_ADDR (grub_util_get_image_size (sbat_path)); -+ sbat_size = ALIGN_UP (sbat_size, GRUB_PE32_FILE_ALIGNMENT); -+ } -+ - pe_size = ALIGN_UP (header_size + core_size, GRUB_PE32_FILE_ALIGNMENT) + -- ALIGN_UP (layout.reloc_size, GRUB_PE32_FILE_ALIGNMENT); -+ ALIGN_UP (layout.reloc_size, GRUB_PE32_FILE_ALIGNMENT) + sbat_size; - header = pe_img = xcalloc (1, pe_size); - - memcpy (pe_img + raw_data, core_img, core_size); -@@ -1321,7 +1333,10 @@ grub_install_generate_image (const char *dir, const char *prefix, - + GRUB_PE32_SIGNATURE_SIZE); - c->machine = grub_host_to_target16 (image_target->pe_target); - -- c->num_sections = grub_host_to_target16 (4); -+ if (sbat_path != NULL) -+ n_sections++; -+ -+ c->num_sections = grub_host_to_target16 (n_sections); - c->time = grub_host_to_target32 (STABLE_EMBEDDING_TIMESTAMP); - c->characteristics = grub_host_to_target16 (GRUB_PE32_EXECUTABLE_IMAGE - | GRUB_PE32_LINE_NUMS_STRIPPED -@@ -1383,7 +1398,8 @@ grub_install_generate_image (const char *dir, const char *prefix, - GRUB_PE32_SCN_MEM_READ); - - scn_size = ALIGN_UP (layout.kernel_size - layout.exec_size, GRUB_PE32_FILE_ALIGNMENT); -- PE_OHDR (o32, o64, data_size) = grub_host_to_target32 (scn_size + -+ /* ALIGN_UP (sbat_size, GRUB_PE32_FILE_ALIGNMENT) is done earlier. */ -+ PE_OHDR (o32, o64, data_size) = grub_host_to_target32 (scn_size + sbat_size + - ALIGN_UP (total_module_size, - GRUB_PE32_FILE_ALIGNMENT)); - -@@ -1394,7 +1410,7 @@ grub_install_generate_image (const char *dir, const char *prefix, - GRUB_PE32_SCN_MEM_READ | - GRUB_PE32_SCN_MEM_WRITE); - -- scn_size = pe_size - layout.reloc_size - raw_data; -+ scn_size = pe_size - layout.reloc_size - sbat_size - raw_data; - section = init_pe_section (image_target, section, "mods", - &vma, scn_size, image_target->section_align, - &raw_data, scn_size, -@@ -1402,6 +1418,19 @@ grub_install_generate_image (const char *dir, const char *prefix, - GRUB_PE32_SCN_MEM_READ | - GRUB_PE32_SCN_MEM_WRITE); - -+ if (sbat_path != NULL) -+ { -+ pe_sbat = pe_img + raw_data; -+ grub_util_load_image (sbat_path, pe_sbat); -+ -+ section = init_pe_section (image_target, section, ".sbat", -+ &vma, sbat_size, -+ image_target->section_align, -+ &raw_data, sbat_size, -+ GRUB_PE32_SCN_CNT_INITIALIZED_DATA | -+ GRUB_PE32_SCN_MEM_READ); -+ } -+ - scn_size = layout.reloc_size; - PE_OHDR (o32, o64, base_relocation_table.rva) = grub_host_to_target32 (vma); - PE_OHDR (o32, o64, base_relocation_table.size) = grub_host_to_target32 (scn_size); --- -2.14.2 - diff --git a/boot/grub2/0142-grub-install-common-Add-sbat-option.patch b/boot/grub2/0142-grub-install-common-Add-sbat-option.patch deleted file mode 100644 index 13f71ff84f4..00000000000 --- a/boot/grub2/0142-grub-install-common-Add-sbat-option.patch +++ /dev/null @@ -1,85 +0,0 @@ -From bb51ee2b49fbda0f66c1fa580a33442ff578f110 Mon Sep 17 00:00:00 2001 -From: Dimitri John Ledkov -Date: Mon, 22 Feb 2021 17:05:25 +0000 -Subject: [PATCH] grub-install-common: Add --sbat option - -Signed-off-by: Dimitri John Ledkov -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - include/grub/util/install.h | 5 ++++- - util/grub-install-common.c | 12 ++++++++++-- - 2 files changed, 14 insertions(+), 3 deletions(-) - -diff --git a/include/grub/util/install.h b/include/grub/util/install.h -index c03befd..8cb5056 100644 ---- a/include/grub/util/install.h -+++ b/include/grub/util/install.h -@@ -63,6 +63,8 @@ - /* TRANSLATORS: "embed" is a verb (command description). "*/ \ - { "pubkey", 'k', N_("FILE"), 0, \ - N_("embed FILE as public key for signature checking"), 0}, \ -+ { "sbat", GRUB_INSTALL_OPTIONS_SBAT, N_("FILE"), 0, \ -+ N_("SBAT metadata"), 0 }, \ - { "verbose", 'v', 0, 0, \ - N_("print verbose messages."), 1 } - -@@ -122,7 +124,8 @@ enum grub_install_options { - GRUB_INSTALL_OPTIONS_THEMES_DIRECTORY, - GRUB_INSTALL_OPTIONS_GRUB_MKIMAGE, - GRUB_INSTALL_OPTIONS_INSTALL_CORE_COMPRESS, -- GRUB_INSTALL_OPTIONS_DTB -+ GRUB_INSTALL_OPTIONS_DTB, -+ GRUB_INSTALL_OPTIONS_SBAT - }; - - extern char *grub_install_source_directory; -diff --git a/util/grub-install-common.c b/util/grub-install-common.c -index 5d43ed1..1fcccd2 100644 ---- a/util/grub-install-common.c -+++ b/util/grub-install-common.c -@@ -307,6 +307,7 @@ handle_install_list (struct install_list *il, const char *val, - - static char **pubkeys; - static size_t npubkeys; -+static char *sbat; - static grub_compression_t compression; - - int -@@ -337,6 +338,12 @@ grub_install_parse (int key, char *arg) - * (npubkeys + 1)); - pubkeys[npubkeys++] = xstrdup (arg); - return 1; -+ case GRUB_INSTALL_OPTIONS_SBAT: -+ if (sbat) -+ free (sbat); -+ -+ sbat = xstrdup (arg); -+ return 1; - - case GRUB_INSTALL_OPTIONS_VERBOSITY: - verbosity++; -@@ -498,9 +505,10 @@ grub_install_make_image_wrap_file (const char *dir, const char *prefix, - grub_util_info ("grub-mkimage --directory '%s' --prefix '%s'" - " --output '%s' " - " --dtb '%s' " -+ "--sbat '%s' " - "--format '%s' --compression '%s' %s %s\n", - dir, prefix, -- outname, dtb ? : "", mkimage_target, -+ outname, dtb ? : "", sbat ? : "", mkimage_target, - compnames[compression], note ? "--note" : "", s); - free (s); - -@@ -511,7 +519,7 @@ grub_install_make_image_wrap_file (const char *dir, const char *prefix, - grub_install_generate_image (dir, prefix, fp, outname, - modules.entries, memdisk_path, - pubkeys, npubkeys, config_path, tgt, -- note, compression, dtb, NULL); -+ note, compression, dtb, sbat); - while (dc--) - grub_install_pop_module (); - } --- -2.14.2 - diff --git a/boot/grub2/0143-shim_lock-Only-skip-loading-shim_lock-verifier-with-.patch b/boot/grub2/0143-shim_lock-Only-skip-loading-shim_lock-verifier-with-.patch deleted file mode 100644 index ef20639ca4c..00000000000 --- a/boot/grub2/0143-shim_lock-Only-skip-loading-shim_lock-verifier-with-.patch +++ /dev/null @@ -1,270 +0,0 @@ -From 968de8c23c1cba0f18230f778ebcf6c412ec8ec5 Mon Sep 17 00:00:00 2001 -From: Dimitri John Ledkov -Date: Sat, 20 Feb 2021 17:10:34 +0000 -Subject: [PATCH] shim_lock: Only skip loading shim_lock verifier with explicit - consent - -Commit 32ddc42c (efi: Only register shim_lock verifier if shim_lock -protocol is found and SB enabled) reintroduced CVE-2020-15705 which -previously only existed in the out-of-tree linuxefi patches and was -fixed as part of the BootHole patch series. - -Under Secure Boot enforce loading shim_lock verifier. Allow skipping -shim_lock verifier if SecureBoot/MokSBState EFI variables indicate -skipping validations, or if GRUB image is built with --disable-shim-lock. - -Fixes: 132ddc42c (efi: Only register shim_lock verifier if shim_lock - protocol is found and SB enabled) -Fixes: CVE-2020-15705 -Fixes: CVE-2021-3418 - -Reported-by: Dimitri John Ledkov -Signed-off-by: Dimitri John Ledkov -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - docs/grub.texi | 5 ++++- - grub-core/kern/efi/sb.c | 17 ++++++++++++++++- - include/grub/kernel.h | 3 ++- - include/grub/util/install.h | 7 +++++-- - util/grub-install-common.c | 12 +++++++++--- - util/grub-mkimage.c | 8 +++++++- - util/mkimage.c | 15 ++++++++++++++- - 7 files changed, 57 insertions(+), 10 deletions(-) - -diff --git a/docs/grub.texi b/docs/grub.texi -index bff6dfc..e302797 100644 ---- a/docs/grub.texi -+++ b/docs/grub.texi -@@ -5787,7 +5787,10 @@ secure boot chain. - The GRUB, except the @command{chainloader} command, works with the UEFI secure - boot and the shim. This functionality is provided by the shim_lock verifier. It - is built into the @file{core.img} and is registered if the UEFI secure boot is --enabled. -+enabled. The @samp{shim_lock} variable is set to @samp{y} when shim_lock verifier -+is registered. If it is desired to use UEFI secure boot without shim, one can -+disable shim_lock by disabling shim verification with MokSbState UEFI variable -+or by building grub image with @samp{--disable-shim-lock} option. - - All GRUB modules not stored in the @file{core.img}, OS kernels, ACPI tables, - Device Trees, etc. have to be signed, e.g, using PGP. Additionally, the commands -diff --git a/grub-core/kern/efi/sb.c b/grub-core/kern/efi/sb.c -index 5d7210a..41dadcd 100644 ---- a/grub-core/kern/efi/sb.c -+++ b/grub-core/kern/efi/sb.c -@@ -21,9 +21,11 @@ - #include - #include - #include -+#include - #include - #include - #include -+#include - #include - #include - #include -@@ -160,14 +162,27 @@ struct grub_file_verifier shim_lock_verifier = - void - grub_shim_lock_verifier_setup (void) - { -+ struct grub_module_header *header; - grub_efi_shim_lock_protocol_t *sl = - grub_efi_locate_protocol (&shim_lock_guid, 0); - -+ /* shim_lock is missing, check if GRUB image is built with --disable-shim-lock. */ - if (!sl) -- return; -+ { -+ FOR_MODULES (header) -+ { -+ if (header->type == OBJ_TYPE_DISABLE_SHIM_LOCK) -+ return; -+ } -+ } - -+ /* Secure Boot is off. Do not load shim_lock. */ - if (grub_efi_get_secureboot () != GRUB_EFI_SECUREBOOT_MODE_ENABLED) - return; - -+ /* Enforce shim_lock_verifier. */ - grub_verifier_register (&shim_lock_verifier); -+ -+ grub_env_set ("shim_lock", "y"); -+ grub_env_export ("shim_lock"); - } -diff --git a/include/grub/kernel.h b/include/grub/kernel.h -index 133a37c..abbca5e 100644 ---- a/include/grub/kernel.h -+++ b/include/grub/kernel.h -@@ -29,7 +29,8 @@ enum - OBJ_TYPE_CONFIG, - OBJ_TYPE_PREFIX, - OBJ_TYPE_PUBKEY, -- OBJ_TYPE_DTB -+ OBJ_TYPE_DTB, -+ OBJ_TYPE_DISABLE_SHIM_LOCK - }; - - /* The module header. */ -diff --git a/include/grub/util/install.h b/include/grub/util/install.h -index 8cb5056..11a8df8 100644 ---- a/include/grub/util/install.h -+++ b/include/grub/util/install.h -@@ -65,6 +65,8 @@ - N_("embed FILE as public key for signature checking"), 0}, \ - { "sbat", GRUB_INSTALL_OPTIONS_SBAT, N_("FILE"), 0, \ - N_("SBAT metadata"), 0 }, \ -+ { "disable-shim-lock", GRUB_INSTALL_OPTIONS_DISABLE_SHIM_LOCK, 0, 0, \ -+ N_("disable shim_lock verifier"), 0 }, \ - { "verbose", 'v', 0, 0, \ - N_("print verbose messages."), 1 } - -@@ -125,7 +127,8 @@ enum grub_install_options { - GRUB_INSTALL_OPTIONS_GRUB_MKIMAGE, - GRUB_INSTALL_OPTIONS_INSTALL_CORE_COMPRESS, - GRUB_INSTALL_OPTIONS_DTB, -- GRUB_INSTALL_OPTIONS_SBAT -+ GRUB_INSTALL_OPTIONS_SBAT, -+ GRUB_INSTALL_OPTIONS_DISABLE_SHIM_LOCK - }; - - extern char *grub_install_source_directory; -@@ -187,7 +190,7 @@ grub_install_generate_image (const char *dir, const char *prefix, - const struct grub_install_image_target_desc *image_target, - int note, - grub_compression_t comp, const char *dtb_file, -- const char *sbat_path); -+ const char *sbat_path, const int disable_shim_lock); - - const struct grub_install_image_target_desc * - grub_install_get_image_target (const char *arg); -diff --git a/util/grub-install-common.c b/util/grub-install-common.c -index 1fcccd2..13d9fe9 100644 ---- a/util/grub-install-common.c -+++ b/util/grub-install-common.c -@@ -308,6 +308,7 @@ handle_install_list (struct install_list *il, const char *val, - static char **pubkeys; - static size_t npubkeys; - static char *sbat; -+static int disable_shim_lock; - static grub_compression_t compression; - - int -@@ -344,6 +345,9 @@ grub_install_parse (int key, char *arg) - - sbat = xstrdup (arg); - return 1; -+ case GRUB_INSTALL_OPTIONS_DISABLE_SHIM_LOCK: -+ disable_shim_lock = 1; -+ return 1; - - case GRUB_INSTALL_OPTIONS_VERBOSITY: - verbosity++; -@@ -506,10 +510,11 @@ grub_install_make_image_wrap_file (const char *dir, const char *prefix, - " --output '%s' " - " --dtb '%s' " - "--sbat '%s' " -- "--format '%s' --compression '%s' %s %s\n", -+ "--format '%s' --compression '%s' %s %s %s\n", - dir, prefix, - outname, dtb ? : "", sbat ? : "", mkimage_target, -- compnames[compression], note ? "--note" : "", s); -+ compnames[compression], note ? "--note" : "", -+ disable_shim_lock ? "--disable-shim-lock" : "", s); - free (s); - - tgt = grub_install_get_image_target (mkimage_target); -@@ -519,7 +524,8 @@ grub_install_make_image_wrap_file (const char *dir, const char *prefix, - grub_install_generate_image (dir, prefix, fp, outname, - modules.entries, memdisk_path, - pubkeys, npubkeys, config_path, tgt, -- note, compression, dtb, sbat); -+ note, compression, dtb, sbat, -+ disable_shim_lock); - while (dc--) - grub_install_pop_module (); - } -diff --git a/util/grub-mkimage.c b/util/grub-mkimage.c -index 75b8847..c0d5599 100644 ---- a/util/grub-mkimage.c -+++ b/util/grub-mkimage.c -@@ -82,6 +82,7 @@ static struct argp_option options[] = { - {"format", 'O', N_("FORMAT"), 0, 0, 0}, - {"compression", 'C', "(xz|none|auto)", 0, N_("choose the compression to use for core image"), 0}, - {"sbat", 's', N_("FILE"), 0, N_("SBAT metadata"), 0}, -+ {"disable-shim-lock", GRUB_INSTALL_OPTIONS_DISABLE_SHIM_LOCK, 0, 0, N_("disable shim_lock verifier"), 0}, - {"verbose", 'v', 0, 0, N_("print verbose messages."), 0}, - { 0, 0, 0, 0, 0, 0 } - }; -@@ -126,6 +127,7 @@ struct arguments - char *config; - char *sbat; - int note; -+ int disable_shim_lock; - const struct grub_install_image_target_desc *image_target; - grub_compression_t comp; - }; -@@ -233,6 +235,10 @@ argp_parser (int key, char *arg, struct argp_state *state) - arguments->sbat = xstrdup (arg); - break; - -+ case GRUB_INSTALL_OPTIONS_DISABLE_SHIM_LOCK: -+ arguments->disable_shim_lock = 1; -+ break; -+ - case 'v': - verbosity++; - break; -@@ -319,7 +325,7 @@ main (int argc, char *argv[]) - arguments.npubkeys, arguments.config, - arguments.image_target, arguments.note, - arguments.comp, arguments.dtb, -- arguments.sbat); -+ arguments.sbat, arguments.disable_shim_lock); - - if (grub_util_file_sync (fp) < 0) - grub_util_error (_("cannot sync `%s': %s"), arguments.output ? : "stdout", -diff --git a/util/mkimage.c b/util/mkimage.c -index b354ec1..a26cf76 100644 ---- a/util/mkimage.c -+++ b/util/mkimage.c -@@ -870,7 +870,7 @@ grub_install_generate_image (const char *dir, const char *prefix, - size_t npubkeys, char *config_path, - const struct grub_install_image_target_desc *image_target, - int note, grub_compression_t comp, const char *dtb_path, -- const char *sbat_path) -+ const char *sbat_path, int disable_shim_lock) - { - char *kernel_img, *core_img; - size_t total_module_size, core_size; -@@ -929,6 +929,9 @@ grub_install_generate_image (const char *dir, const char *prefix, - if (sbat_path != NULL && image_target->id != IMAGE_EFI) - grub_util_error (_(".sbat section can be embedded into EFI images only")); - -+ if (disable_shim_lock) -+ total_module_size += sizeof (struct grub_module_header); -+ - if (config_path) - { - config_size = ALIGN_ADDR (grub_util_get_image_size (config_path) + 1); -@@ -1065,6 +1068,16 @@ grub_install_generate_image (const char *dir, const char *prefix, - offset += dtb_size; - } - -+ if (disable_shim_lock) -+ { -+ struct grub_module_header *header; -+ -+ header = (struct grub_module_header *) (kernel_img + offset); -+ header->type = grub_host_to_target32 (OBJ_TYPE_DISABLE_SHIM_LOCK); -+ header->size = grub_host_to_target32 (sizeof (*header)); -+ offset += sizeof (*header); -+ } -+ - if (config_path) - { - struct grub_module_header *header; --- -2.14.2 - diff --git a/boot/grub2/0144-kern-misc-Split-parse_printf_args-into-format-parsin.patch b/boot/grub2/0144-kern-misc-Split-parse_printf_args-into-format-parsin.patch deleted file mode 100644 index 74fdc1dbe64..00000000000 --- a/boot/grub2/0144-kern-misc-Split-parse_printf_args-into-format-parsin.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 7f11bde3143b21b40d8225ea1d641e0f83b5a01e Mon Sep 17 00:00:00 2001 -From: Thomas Frauendorfer | Miray Software -Date: Mon, 15 Feb 2021 13:40:16 +0100 -Subject: [PATCH] kern/misc: Split parse_printf_args() into format parsing and - va_list handling - -This patch is preparing for a follow up patch which will use -the format parsing part to compare the arguments in a printf() -format from an external source against a printf() format with -expected arguments. - -Signed-off-by: Thomas Frauendorfer | Miray Software -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/kern/misc.c | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c -index b02693b..50bf3ee 100644 ---- a/grub-core/kern/misc.c -+++ b/grub-core/kern/misc.c -@@ -632,8 +632,7 @@ grub_lltoa (char *str, int c, unsigned long long n) - } - - static void --parse_printf_args (const char *fmt0, struct printf_args *args, -- va_list args_in) -+parse_printf_arg_fmt (const char *fmt0, struct printf_args *args) - { - const char *fmt; - char c; -@@ -789,6 +788,14 @@ parse_printf_args (const char *fmt0, struct printf_args *args, - break; - } - } -+} -+ -+static void -+parse_printf_args (const char *fmt0, struct printf_args *args, va_list args_in) -+{ -+ grub_size_t n; -+ -+ parse_printf_arg_fmt (fmt0, args); - - for (n = 0; n < args->count; n++) - switch (args->ptr[n].type) --- -2.14.2 - diff --git a/boot/grub2/0145-kern-misc-Add-STRING-type-for-internal-printf-format.patch b/boot/grub2/0145-kern-misc-Add-STRING-type-for-internal-printf-format.patch deleted file mode 100644 index 56463b0846a..00000000000 --- a/boot/grub2/0145-kern-misc-Add-STRING-type-for-internal-printf-format.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 1a2a5aff71e8edba436398492279de434abfe7a3 Mon Sep 17 00:00:00 2001 -From: Thomas Frauendorfer | Miray Software -Date: Mon, 15 Feb 2021 14:04:26 +0100 -Subject: [PATCH] kern/misc: Add STRING type for internal printf() format - handling - -Set printf() argument type for "%s" to new type STRING. This is in -preparation for a follow up patch to compare a printf() format string -against an expected printf() format string. - -For "%s" the corresponding printf() argument is dereferenced as pointer -while all other argument types are defined as integer value. However, -when validating a printf() format it is necessary to differentiate "%s" -from "%p" and other integers. So, let's do that. - -Signed-off-by: Thomas Frauendorfer | Miray Software -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/kern/misc.c | 13 +++++++++++-- - 1 file changed, 11 insertions(+), 2 deletions(-) - -diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c -index 50bf3ee..22417f7 100644 ---- a/grub-core/kern/misc.c -+++ b/grub-core/kern/misc.c -@@ -33,7 +33,8 @@ union printf_arg - enum - { - INT, LONG, LONGLONG, -- UNSIGNED_INT = 3, UNSIGNED_LONG, UNSIGNED_LONGLONG -+ UNSIGNED_INT = 3, UNSIGNED_LONG, UNSIGNED_LONGLONG, -+ STRING - } type; - long long ll; - }; -@@ -776,12 +777,14 @@ parse_printf_arg_fmt (const char *fmt0, struct printf_args *args) - args->ptr[curn].type = INT + longfmt; - break; - case 'p': -- case 's': - if (sizeof (void *) == sizeof (long long)) - args->ptr[curn].type = UNSIGNED_LONGLONG; - else - args->ptr[curn].type = UNSIGNED_INT; - break; -+ case 's': -+ args->ptr[curn].type = STRING; -+ break; - case 'C': - case 'c': - args->ptr[curn].type = INT; -@@ -816,6 +819,12 @@ parse_printf_args (const char *fmt0, struct printf_args *args, va_list args_in) - case UNSIGNED_LONGLONG: - args->ptr[n].ll = va_arg (args_in, long long); - break; -+ case STRING: -+ if (sizeof (void *) == sizeof (long long)) -+ args->ptr[n].ll = va_arg (args_in, long long); -+ else -+ args->ptr[n].ll = va_arg (args_in, unsigned int); -+ break; - } - } - --- -2.14.2 - diff --git a/boot/grub2/0146-kern-misc-Add-function-to-check-printf-format-agains.patch b/boot/grub2/0146-kern-misc-Add-function-to-check-printf-format-agains.patch deleted file mode 100644 index 1b0d6738afa..00000000000 --- a/boot/grub2/0146-kern-misc-Add-function-to-check-printf-format-agains.patch +++ /dev/null @@ -1,219 +0,0 @@ -From 83603bea6ce8fdff5ab3fbc4c9e592a8c71a8706 Mon Sep 17 00:00:00 2001 -From: Thomas Frauendorfer | Miray Software -Date: Thu, 4 Feb 2021 19:02:33 +0100 -Subject: [PATCH] kern/misc: Add function to check printf() format against - expected format - -The grub_printf_fmt_check() function parses the arguments of an untrusted -printf() format and an expected printf() format and then compares the -arguments counts and arguments types. The arguments count in the untrusted -format string must be less or equal to the arguments count in the expected -format string and both arguments types must match. - -To do this the parse_printf_arg_fmt() helper function is extended in the -following way: - - 1. Add a return value to report errors to the grub_printf_fmt_check(). - - 2. Add the fmt_check argument to enable stricter format verification: - - the function expects that arguments definitions are always - terminated by a supported conversion specifier. - - positional parameters, "$", are not allowed, as they cannot be - validated correctly with the current implementation. For example - "%s%1$d" would assign the first args entry twice while leaving the - second one unchanged. - - Return an error if preallocated space in args is too small and - allocation fails for the needed size. The grub_printf_fmt_check() - should verify all arguments. So, if validation is not possible for - any reason it should return an error. - This also adds a case entry to handle "%%", which is the escape - sequence to print "%" character. - - 3. Add the max_args argument to check for the maximum allowed arguments - count in a printf() string. This should be set to the arguments count - of the expected format. Then the parse_printf_arg_fmt() function will - return an error if the arguments count is exceeded. - -The two additional arguments allow us to use parse_printf_arg_fmt() in -printf() and grub_printf_fmt_check() calls. - -When parse_printf_arg_fmt() is used by grub_printf_fmt_check() the -function parse user provided untrusted format string too. So, in -that case it is better to be too strict than too lenient. - -Signed-off-by: Thomas Frauendorfer | Miray Software -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/kern/misc.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++++--- - include/grub/misc.h | 16 ++++++++++ - 2 files changed, 94 insertions(+), 4 deletions(-) - -diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c -index 22417f7..90317b6 100644 ---- a/grub-core/kern/misc.c -+++ b/grub-core/kern/misc.c -@@ -632,8 +632,26 @@ grub_lltoa (char *str, int c, unsigned long long n) - return p; - } - --static void --parse_printf_arg_fmt (const char *fmt0, struct printf_args *args) -+/* -+ * Parse printf() fmt0 string into args arguments. -+ * -+ * The parsed arguments are either used by a printf() function to format the fmt0 -+ * string or they are used to compare a format string from an untrusted source -+ * against a format string with expected arguments. -+ * -+ * When the fmt_check is set to !0, e.g. 1, then this function is executed in -+ * printf() format check mode. This enforces stricter rules for parsing the -+ * fmt0 to limit exposure to possible errors in printf() handling. It also -+ * disables positional parameters, "$", because some formats, e.g "%s%1$d", -+ * cannot be validated with the current implementation. -+ * -+ * The max_args allows to set a maximum number of accepted arguments. If the fmt0 -+ * string defines more arguments than the max_args then the parse_printf_arg_fmt() -+ * function returns an error. This is currently used for format check only. -+ */ -+static grub_err_t -+parse_printf_arg_fmt (const char *fmt0, struct printf_args *args, -+ int fmt_check, grub_size_t max_args) - { - const char *fmt; - char c; -@@ -660,7 +678,12 @@ parse_printf_arg_fmt (const char *fmt0, struct printf_args *args) - fmt++; - - if (*fmt == '$') -- fmt++; -+ { -+ if (fmt_check) -+ return grub_error (GRUB_ERR_BAD_ARGUMENT, -+ "positional arguments are not supported"); -+ fmt++; -+ } - - if (*fmt =='-') - fmt++; -@@ -691,9 +714,19 @@ parse_printf_arg_fmt (const char *fmt0, struct printf_args *args) - case 's': - args->count++; - break; -+ case '%': -+ /* "%%" is the escape sequence to output "%". */ -+ break; -+ default: -+ if (fmt_check) -+ return grub_error (GRUB_ERR_BAD_ARGUMENT, "unexpected format"); -+ break; - } - } - -+ if (fmt_check && args->count > max_args) -+ return grub_error (GRUB_ERR_BAD_ARGUMENT, "too many arguments"); -+ - if (args->count <= ARRAY_SIZE (args->prealloc)) - args->ptr = args->prealloc; - else -@@ -701,6 +734,9 @@ parse_printf_arg_fmt (const char *fmt0, struct printf_args *args) - args->ptr = grub_calloc (args->count, sizeof (args->ptr[0])); - if (!args->ptr) - { -+ if (fmt_check) -+ return grub_errno; -+ - grub_errno = GRUB_ERR_NONE; - args->ptr = args->prealloc; - args->count = ARRAY_SIZE (args->prealloc); -@@ -791,6 +827,8 @@ parse_printf_arg_fmt (const char *fmt0, struct printf_args *args) - break; - } - } -+ -+ return GRUB_ERR_NONE; - } - - static void -@@ -798,7 +836,7 @@ parse_printf_args (const char *fmt0, struct printf_args *args, va_list args_in) - { - grub_size_t n; - -- parse_printf_arg_fmt (fmt0, args); -+ parse_printf_arg_fmt (fmt0, args, 0, 0); - - for (n = 0; n < args->count; n++) - switch (args->ptr[n].type) -@@ -1105,6 +1143,42 @@ grub_xasprintf (const char *fmt, ...) - return ret; - } - -+grub_err_t -+grub_printf_fmt_check (const char *fmt, const char *fmt_expected) -+{ -+ struct printf_args args_expected, args_fmt; -+ grub_err_t ret; -+ grub_size_t n; -+ -+ if (fmt == NULL || fmt_expected == NULL) -+ return grub_error (GRUB_ERR_BAD_ARGUMENT, "invalid format"); -+ -+ ret = parse_printf_arg_fmt (fmt_expected, &args_expected, 1, GRUB_SIZE_MAX); -+ if (ret != GRUB_ERR_NONE) -+ return ret; -+ -+ /* Limit parsing to the number of expected arguments. */ -+ ret = parse_printf_arg_fmt (fmt, &args_fmt, 1, args_expected.count); -+ if (ret != GRUB_ERR_NONE) -+ { -+ free_printf_args (&args_expected); -+ return ret; -+ } -+ -+ for (n = 0; n < args_fmt.count; n++) -+ if (args_fmt.ptr[n].type != args_expected.ptr[n].type) -+ { -+ ret = grub_error (GRUB_ERR_BAD_ARGUMENT, "arguments types do not match"); -+ break; -+ } -+ -+ free_printf_args (&args_expected); -+ free_printf_args (&args_fmt); -+ -+ return ret; -+} -+ -+ - /* Abort GRUB. This function does not return. */ - static void __attribute__ ((noreturn)) - grub_abort (void) -diff --git a/include/grub/misc.h b/include/grub/misc.h -index ee48eb7..d1c5709 100644 ---- a/include/grub/misc.h -+++ b/include/grub/misc.h -@@ -440,6 +440,22 @@ grub_error_load (const struct grub_error_saved *save) - grub_errno = save->grub_errno; - } - -+/* -+ * grub_printf_fmt_checks() a fmt string for printf() against an expected -+ * format. It is intended for cases where the fmt string could come from -+ * an outside source and cannot be trusted. -+ * -+ * While expected fmt accepts a printf() format string it should be kept -+ * as simple as possible. The printf() format strings with positional -+ * parameters are NOT accepted, neither for fmt nor for fmt_expected. -+ * -+ * The fmt is accepted if it has equal or less arguments than fmt_expected -+ * and if the type of all arguments match. -+ * -+ * Returns GRUB_ERR_NONE if fmt is acceptable. -+ */ -+grub_err_t EXPORT_FUNC (grub_printf_fmt_check) (const char *fmt, const char *fmt_expected); -+ - #if BOOT_TIME_STATS - struct grub_boot_time - { --- -2.14.2 - diff --git a/boot/grub2/0147-gfxmenu-gui-Check-printf-format-in-the-gui_progress_.patch b/boot/grub2/0147-gfxmenu-gui-Check-printf-format-in-the-gui_progress_.patch deleted file mode 100644 index e0acb07c8c6..00000000000 --- a/boot/grub2/0147-gfxmenu-gui-Check-printf-format-in-the-gui_progress_.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 42facd577231cf5ffe4c7128fed15b7e7d99cbca Mon Sep 17 00:00:00 2001 -From: Thomas Frauendorfer | Miray Software -Date: Tue, 4 Aug 2020 13:49:51 +0200 -Subject: [PATCH] gfxmenu/gui: Check printf() format in the gui_progress_bar - and gui_label - -The gui_progress_bar and gui_label components can display the timeout -value. The format string can be set through a theme file. This patch -adds a validation step to the format string. - -If a user loads a theme file into the GRUB without this patch then -a GUI label with the following settings - - + label { - ... - id = "__timeout__" - text = "%s" - } - -will interpret the current timeout value as string pointer and print the -memory at that position on the screen. It is not desired behavior. - -Signed-off-by: Thomas Frauendorfer | Miray Software -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/gfxmenu/gui_label.c | 4 ++++ - grub-core/gfxmenu/gui_progress_bar.c | 3 +++ - 2 files changed, 7 insertions(+) - -diff --git a/grub-core/gfxmenu/gui_label.c b/grub-core/gfxmenu/gui_label.c -index a4c8178..1c19054 100644 ---- a/grub-core/gfxmenu/gui_label.c -+++ b/grub-core/gfxmenu/gui_label.c -@@ -193,6 +193,10 @@ label_set_property (void *vself, const char *name, const char *value) - else if (grub_strcmp (value, "@KEYMAP_SHORT@") == 0) - value = _("enter: boot, `e': options, `c': cmd-line"); - /* FIXME: Add more templates here if needed. */ -+ -+ if (grub_printf_fmt_check(value, "%d") != GRUB_ERR_NONE) -+ value = ""; /* Unsupported format. */ -+ - self->template = grub_strdup (value); - self->text = grub_xasprintf (value, self->value); - } -diff --git a/grub-core/gfxmenu/gui_progress_bar.c b/grub-core/gfxmenu/gui_progress_bar.c -index b128f08..ace85a1 100644 ---- a/grub-core/gfxmenu/gui_progress_bar.c -+++ b/grub-core/gfxmenu/gui_progress_bar.c -@@ -348,6 +348,9 @@ progress_bar_set_property (void *vself, const char *name, const char *value) - Please use the shortest form available in you language. */ - value = _("%ds"); - -+ if (grub_printf_fmt_check(value, "%d") != GRUB_ERR_NONE) -+ value = ""; /* Unsupported format. */ -+ - self->template = grub_strdup (value); - } - else if (grub_strcmp (name, "font") == 0) --- -2.14.2 - diff --git a/boot/grub2/0148-templates-Disable-the-os-prober-by-default.patch b/boot/grub2/0148-templates-Disable-the-os-prober-by-default.patch deleted file mode 100644 index 7cc89c2d0f3..00000000000 --- a/boot/grub2/0148-templates-Disable-the-os-prober-by-default.patch +++ /dev/null @@ -1,87 +0,0 @@ -From e346414725a70e5c74ee87ca14e580c66f517666 Mon Sep 17 00:00:00 2001 -From: Alex Burmashev -Date: Tue, 16 Feb 2021 11:12:12 +0100 -Subject: [PATCH] templates: Disable the os-prober by default - -The os-prober is enabled by default what may lead to potentially -dangerous use cases and borderline opening attack vectors. This -patch disables the os-prober, adds warning messages and updates -GRUB_DISABLE_OS_PROBER configuration option documentation. This -way we make it clear that the os-prober usage is not recommended. - -Simplistic nature of this change allows downstream vendors, who -really want os-prober to be enabled out of the box in their -relevant products, easily revert to it's old behavior. - -Reported-by: NyankoSec (, https://twitter.com/NyankoSec), - working with SSD Secure Disclosure -Signed-off-by: Alex Burmashev -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - docs/grub.texi | 18 ++++++++++-------- - util/grub.d/30_os-prober.in | 5 ++++- - 2 files changed, 14 insertions(+), 9 deletions(-) - -diff --git a/docs/grub.texi b/docs/grub.texi -index e302797..45a9f80 100644 ---- a/docs/grub.texi -+++ b/docs/grub.texi -@@ -1481,10 +1481,13 @@ boot sequence. If you have problems, set this option to @samp{text} and - GRUB will tell Linux to boot in normal text mode. - - @item GRUB_DISABLE_OS_PROBER --Normally, @command{grub-mkconfig} will try to use the external --@command{os-prober} program, if installed, to discover other operating --systems installed on the same system and generate appropriate menu entries --for them. Set this option to @samp{true} to disable this. -+The @command{grub-mkconfig} has a feature to use the external -+@command{os-prober} program to discover other operating systems installed on -+the same machine and generate appropriate menu entries for them. It is disabled -+by default since automatic and silent execution of @command{os-prober}, and -+creating boot entries based on that data, is a potential attack vector. Set -+this option to @samp{false} to enable this feature in the -+@command{grub-mkconfig} command. - - @item GRUB_OS_PROBER_SKIP_LIST - List of space-separated FS UUIDs of filesystems to be ignored from os-prober -@@ -1812,10 +1815,9 @@ than zero; otherwise 0. - @section Multi-boot manual config - - Currently autogenerating config files for multi-boot environments depends on --os-prober and has several shortcomings. While fixing it is scheduled for the --next release, meanwhile you can make use of the power of GRUB syntax and do it --yourself. A possible configuration is detailed here, feel free to adjust to your --needs. -+os-prober and has several shortcomings. Due to that it is disabled by default. -+It is advised to use the power of GRUB syntax and do it yourself. A possible -+configuration is detailed here, feel free to adjust to your needs. - - First create a separate GRUB partition, big enough to hold GRUB. Some of the - following entries show how to load OS installer images from this same partition, -diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in -index 515a68c..99de043 100644 ---- a/util/grub.d/30_os-prober.in -+++ b/util/grub.d/30_os-prober.in -@@ -26,7 +26,8 @@ export TEXTDOMAINDIR="@localedir@" - - . "$pkgdatadir/grub-mkconfig_lib" - --if [ "x${GRUB_DISABLE_OS_PROBER}" = "xtrue" ]; then -+if [ "x${GRUB_DISABLE_OS_PROBER}" = "xfalse" ]; then -+ gettext_printf "os-prober will not be executed to detect other bootable partitions.\nSystems on them will not be added to the GRUB boot configuration.\nCheck GRUB_DISABLE_OS_PROBER documentation entry.\n" - exit 0 - fi - -@@ -39,6 +40,8 @@ OSPROBED="`os-prober | tr ' ' '^' | paste -s -d ' '`" - if [ -z "${OSPROBED}" ] ; then - # empty os-prober output, nothing doing - exit 0 -+else -+ grub_warn "$(gettext_printf "os-prober was executed to detect other bootable partitions.\nIt's output will be used to detect bootable binaries on them and create new boot entries.")" - fi - - osx_entry() { --- -2.14.2 - diff --git a/boot/grub2/0149-kern-mm-Fix-grub_debug_calloc-compilation-error.patch b/boot/grub2/0149-kern-mm-Fix-grub_debug_calloc-compilation-error.patch deleted file mode 100644 index bda0507307e..00000000000 --- a/boot/grub2/0149-kern-mm-Fix-grub_debug_calloc-compilation-error.patch +++ /dev/null @@ -1,33 +0,0 @@ -From a9d8de960834f376087856f9d60a214b47c76f61 Mon Sep 17 00:00:00 2001 -From: Marco A Benatto -Date: Tue, 9 Feb 2021 12:33:06 -0300 -Subject: [PATCH] kern/mm: Fix grub_debug_calloc() compilation error - -Fix compilation error due to missing parameter to -grub_printf() when MM_DEBUG is defined. - -Fixes: 64e26162e (calloc: Make sure we always have an overflow-checking calloc() available) - -Signed-off-by: Marco A Benatto -Reviewed-by: Daniel Kiper -Signed-off-by: Stefan Sørensen ---- - grub-core/kern/mm.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/grub-core/kern/mm.c b/grub-core/kern/mm.c -index f2822a8..c070afc 100644 ---- a/grub-core/kern/mm.c -+++ b/grub-core/kern/mm.c -@@ -594,7 +594,7 @@ grub_debug_calloc (const char *file, int line, grub_size_t nmemb, grub_size_t si - - if (grub_mm_debug) - grub_printf ("%s:%d: calloc (0x%" PRIxGRUB_SIZE ", 0x%" PRIxGRUB_SIZE ") = ", -- file, line, size); -+ file, line, nmemb, size); - ptr = grub_calloc (nmemb, size); - if (grub_mm_debug) - grub_printf ("%p\n", ptr); --- -2.14.2 - diff --git a/boot/grub2/0150-Makefile-Make-libgrub.pp-depend-on-config-util.h.patch b/boot/grub2/0150-Makefile-Make-libgrub.pp-depend-on-config-util.h.patch deleted file mode 100644 index 97c315406b1..00000000000 --- a/boot/grub2/0150-Makefile-Make-libgrub.pp-depend-on-config-util.h.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 42f4054faf3c7f2cd2cab5b43e63f9d97d81f7a1 Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Wed, 4 Mar 2020 12:58:42 +0100 -Subject: [PATCH] Makefile: Make libgrub.pp depend on config-util.h - -If you build with "make -j48" a lot, sometimes you see: - -gcc -E -DHAVE_CONFIG_H -I. -I.. -Wall -W -DGRUB_UTIL=1 -D_FILE_OFFSET_BITS=64 -I./include -DGRUB_FILE=\"grub_script.tab.h\" -I. -I.. -I. -I.. -I../include -I./include -I../grub-core/lib/libgcrypt-grub/src/ -I../grub-core/lib/minilzo -I../grub-core/lib/xzembed -DMINILZO_HAVE_CONFIG_H -Wall -W -DGRUB_UTIL=1 -D_FILE_OFFSET_BITS=64 -I./include -DGRUB_FILE=\"grub_script.tab.h\" -I. -I.. -I. -I.. -I../include -I./include -I../grub-core/lib/libgcrypt-grub/src/ -I./grub-core/gnulib -I../grub-core/gnulib -I/builddir/build/BUILD/grub-2.02/grub-aarch64-efi-2.02 -D_FILE_OFFSET_BITS=64 \ - -D'GRUB_MOD_INIT(x)=@MARKER@x@' grub_script.tab.h grub_script.yy.h ../grub-core/commands/blocklist.c ../grub-core/commands/macbless.c ../grub-core/commands/xnu_uuid.c ../grub-core/commands/testload.c ../grub-core/commands/ls.c ../grub-core/disk/dmraid_nvidia.c ../grub-core/disk/loopback.c ../grub-core/disk/lvm.c ../grub-core/disk/mdraid_linux.c ../grub-core/disk/mdraid_linux_be.c ../grub-core/disk/mdraid1x_linux.c ../grub-core/disk/raid5_recover.c ../grub-core/disk/raid6_recover.c ../grub-core/font/font.c ../grub-core/gfxmenu/font.c ../grub-core/normal/charset.c ../grub-core/video/fb/fbblit.c ../grub-core/video/fb/fbutil.c ../grub-core/video/fb/fbfill.c ../grub-core/video/fb/video_fb.c ../grub-core/video/video.c ../grub-core/video/capture.c ../grub-core/video/colors.c ../grub-core/unidata.c ../grub-core/io/bufio.c ../grub-core/fs/affs.c ../grub-core/fs/afs.c ../grub-core/fs/bfs.c ../grub-core/fs/btrfs.c ../grub-core/fs/cbfs.c ../grub-core/fs/cpio.c ../grub-core/fs/cpio_be.c ../grub-core/fs/odc.c ../grub-core/fs/newc.c ../grub-core/fs/ext2.c ../grub-core/fs/fat.c ../grub-core/fs/exfat.c ../grub-core/fs/fshelp.c ../grub-core/fs/hfs.c ../grub-core/fs/hfsplus.c ../grub-core/fs/hfspluscomp.c ../grub-core/fs/iso9660.c ../grub-core/fs/jfs.c ../grub-core/fs/minix.c ../grub-core/fs/minix2.c ../grub-core/fs/minix3.c ../grub-core/fs/minix_be.c ../grub-core/fs/minix2_be.c ../grub-core/fs/minix3_be.c ../grub-core/fs/nilfs2.c ../grub-core/fs/ntfs.c ../grub-core/fs/ntfscomp.c ../grub-core/fs/reiserfs.c ../grub-core/fs/romfs.c ../grub-core/fs/sfs.c ../grub-core/fs/squash4.c ../grub-core/fs/tar.c ../grub-core/fs/udf.c ../grub-core/fs/ufs2.c ../grub-core/fs/ufs.c ../grub-core/fs/ufs_be.c ../grub-core/fs/xfs.c ../grub-core/fs/zfs/zfscrypt.c ../grub-core/fs/zfs/zfs.c ../grub-core/fs/zfs/zfsinfo.c ../grub-core/fs/zfs/zfs_lzjb.c ../grub-core/fs/zfs/zfs_lz4.c ../grub-core/fs/zfs/zfs_sha256.c ../grub-core/fs/zfs/zfs_fletcher.c ../grub-core/lib/envblk.c ../grub-core/lib/hexdump.c ../grub-core/lib/LzFind.c ../grub-core/lib/LzmaEnc.c ../grub-core/lib/crc.c ../grub-core/lib/adler32.c ../grub-core/lib/crc64.c ../grub-core/normal/datetime.c ../grub-core/normal/misc.c ../grub-core/partmap/acorn.c ../grub-core/partmap/amiga.c ../grub-core/partmap/apple.c ../grub-core/partmap/sun.c ../grub-core/partmap/plan.c ../grub-core/partmap/dvh.c ../grub-core/partmap/sunpc.c ../grub-core/partmap/bsdlabel.c ../grub-core/partmap/dfly.c ../grub-core/script/function.c ../grub-core/script/lexer.c ../grub-core/script/main.c ../grub-core/script/script.c ../grub-core/script/argv.c ../grub-core/io/gzio.c ../grub-core/io/xzio.c ../grub-core/io/lzopio.c ../grub-core/kern/ia64/dl_helper.c ../grub-core/kern/arm/dl_helper.c ../grub-core/kern/arm64/dl_helper.c ../grub-core/lib/minilzo/minilzo.c ../grub-core/lib/xzembed/xz_dec_bcj.c ../grub-core/lib/xzembed/xz_dec_lzma2.c ../grub-core/lib/xzembed/xz_dec_stream.c ../util/misc.c ../grub-core/kern/command.c ../grub-core/kern/device.c ../grub-core/kern/disk.c ../grub-core/lib/disk.c ../util/getroot.c ../grub-core/osdep/unix/getroot.c ../grub-core/osdep/getroot.c ../grub-core/osdep/devmapper/getroot.c ../grub-core/osdep/relpath.c ../grub-core/kern/emu/hostdisk.c ../grub-core/osdep/devmapper/hostdisk.c ../grub-core/osdep/hostdisk.c ../grub-core/osdep/unix/hostdisk.c ../grub-core/osdep/exec.c ../grub-core/osdep/sleep.c ../grub-core/osdep/password.c ../grub-core/kern/emu/misc.c ../grub-core/kern/emu/mm.c ../grub-core/kern/env.c ../grub-core/kern/err.c ../grub-core/kern/file.c ../grub-core/kern/fs.c ../grub-core/kern/list.c ../grub-core/kern/misc.c ../grub-core/kern/partition.c ../grub-core/lib/crypto.c ../grub-core/disk/luks.c ../grub-core/disk/geli.c ../grub-core/disk/cryptodisk.c ../grub-core/disk/AFSplitter.c ../grub-core/lib/pbkdf2.c ../grub-core/commands/extcmd.c ../grub-core/lib/arg.c ../grub-core/disk/ldm.c ../grub-core/disk/diskfilter.c ../grub-core/partmap/gpt.c ../grub-core/partmap/msdos.c ../grub-core/fs/proc.c ../grub-core/fs/archelp.c > libgrub.pp || (rm -f libgrub.pp; exit 1) -rm -f stamp-h1 -touch ../config-util.h.in -cd . && /bin/sh ./config.status config-util.h -config.status: creating config-util.h -In file included from ../include/grub/mm.h:25:0, - from ../include/grub/disk.h:29, - from ../include/grub/file.h:26, - from ../grub-core/fs/btrfs.c:21: -./config.h:38:10: fatal error: ./config-util.h: No such file or directory - #include - ^~~~~~~~~~~~~~~ -compilation terminated. -make: *** [Makefile:13098: libgrub.pp] Error 1 - -This is because libgrub.pp is built with -DGRUB_UTIL=1, which means -it'll try to include config-util.h, but a parallel make is actually -building that file. I think. - -Signed-off-by: Peter Jones -Signed-off-by: Javier Martinez Canillas -Reviewed-by: Daniel Kiper ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 1f4bb9b8c..bf9c1ba64 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -37,7 +37,7 @@ grub_script.yy.c: grub_script.yy.h - CLEANFILES += grub_script.yy.c grub_script.yy.h - - # For libgrub.a --libgrub.pp: grub_script.tab.h grub_script.yy.h $(libgrubmods_a_SOURCES) $(libgrubkern_a_SOURCES) -+libgrub.pp: config-util.h grub_script.tab.h grub_script.yy.h $(libgrubmods_a_SOURCES) $(libgrubkern_a_SOURCES) - $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgrubmods_a_CPPFLAGS) $(libgrubkern_a_CPPFLAGS) $(CPPFLAGS) \ - -D'GRUB_MOD_INIT(x)=@MARKER@x@' $^ > $@ || (rm -f $@; exit 1) - CLEANFILES += libgrub.pp --- -2.25.1 - -diff --git a/Makefile.in b/Makefile.in -index 1f4bb9b8c..bf9c1ba64 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -37,7 +37,7 @@ grub_script.yy.c: grub_script.yy.h - CLEANFILES += grub_script.yy.c grub_script.yy.h - - # For libgrub.a --libgrub.pp: grub_script.tab.h grub_script.yy.h $(libgrubmods_a_SOURCES) $(libgrubkern_a_SOURCES) -+libgrub.pp: config-util.h grub_script.tab.h grub_script.yy.h $(libgrubmods_a_SOURCES) $(libgrubkern_a_SOURCES) - $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgrubmods_a_CPPFLAGS) $(libgrubkern_a_CPPFLAGS) $(CPPFLAGS) \ - -D'GRUB_MOD_INIT(x)=@MARKER@x@' $^ > $@ || (rm -f $@; exit 1) - CLEANFILES += libgrub.pp --- -2.25.1 - diff --git a/boot/grub2/grub2.hash b/boot/grub2/grub2.hash index 338fe59724f..5d9db423d47 100644 --- a/boot/grub2/grub2.hash +++ b/boot/grub2/grub2.hash @@ -1,3 +1,5 @@ +# Locally calculated after checking signature +# https://ftp.gnu.org/gnu/grub/grub-2.06.tar.xz.sig +sha256 b79ea44af91b93d17cd3fe80bdae6ed43770678a9a5ae192ccea803ebb657ee1 grub-2.06.tar.xz # Locally computed: -sha256 e5292496995ad42dabe843a0192cf2a2c502e7ffcc7479398232b10a472df77d grub-2.04.tar.xz -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/boot/grub2/grub2.mk b/boot/grub2/grub2.mk index d93e383422b..6c3a861fb64 100644 --- a/boot/grub2/grub2.mk +++ b/boot/grub2/grub2.mk @@ -4,7 +4,7 @@ # ################################################################################ -GRUB2_VERSION = 2.04 +GRUB2_VERSION = 2.06 GRUB2_SITE = http://ftp.gnu.org/gnu/grub GRUB2_SOURCE = grub-$(GRUB2_VERSION).tar.xz GRUB2_LICENSE = GPL-3.0+ @@ -13,32 +13,13 @@ GRUB2_DEPENDENCIES = host-bison host-flex host-grub2 HOST_GRUB2_DEPENDENCIES = host-bison host-flex GRUB2_INSTALL_IMAGES = YES -# 0001-build-Fix-GRUB-i386-pc-build-with-Ubuntu-gcc.patch and 2021/03/02 -# security fixes (patches 0029-0149) +# 0001-Makefile-Make-grub_fstest.pp-depend-on-config-util.h.patch define GRUB2_AVOID_AUTORECONF - $(Q)touch $(@D)/Makefile.util.am - $(Q)touch $(@D)/aclocal.m4 $(Q)touch $(@D)/Makefile.in - $(Q)touch $(@D)/configure endef GRUB2_POST_PATCH_HOOKS += GRUB2_AVOID_AUTORECONF HOST_GRUB2_POST_PATCH_HOOKS += GRUB2_AVOID_AUTORECONF -# 0002-yylex-Make-lexer-fatal-errors-actually-be-fatal.patch -GRUB2_IGNORE_CVES += CVE-2020-10713 -# 0005-calloc-Use-calloc-at-most-places.patch -GRUB2_IGNORE_CVES += CVE-2020-14308 -# 0006-malloc-Use-overflow-checking-primitives-where-we-do-.patch -GRUB2_IGNORE_CVES += CVE-2020-14309 CVE-2020-14310 CVE-2020-14311 -# 0019-script-Avoid-a-use-after-free-when-redefining-a-func.patch -GRUB2_IGNORE_CVES += CVE-2020-15706 -# 0028-linux-Fix-integer-overflows-in-initrd-size-handling.patch -GRUB2_IGNORE_CVES += CVE-2020-15707 -# 2021/03/02 security fixes - patches 0029-0149 -GRUB2_IGNORE_CVES += CVE-2020-25632 CVE-2020-25647 CVE-2020-27749 \ - CVE-2020-27779 CVE-2021-3418 CVE-2021-20225 CVE-2021-20233 -# 0039-acpi-Don-t-register-the-acpi-command-when-locked-dow.patch -GRUB2_IGNORE_CVES += CVE-2020-14372 # CVE-2019-14865 is about a flaw in the grub2-set-bootflag tool, which # doesn't exist upstream, but is added by the Redhat/Fedora # packaging. Not applicable to Buildroot. @@ -49,6 +30,29 @@ GRUB2_IGNORE_CVES += CVE-2019-14865 # grub_linuxefi_secure_validate() is not implemented in the grub2 # version available in Buildroot. GRUB2_IGNORE_CVES += CVE-2020-15705 +# 0002-grub-mkconfig-Restore-umask-for-the-grub.cfg.patch +GRUB2_IGNORE_CVES += CVE-2021-3981 +# vulnerability is specific to the SUSE distribution +GRUB2_IGNORE_CVES += CVE-2021-46705 +# 0005-loader-efi-chainloader-Use-grub_loader_set_ex.patch +GRUB2_IGNORE_CVES += CVE-2022-28736 +# 0006-kern-efi-sb-Reject-non-kernel-files-in-the-shim_lock.patch +GRUB2_IGNORE_CVES += CVE-2022-28735 +# 0010-video-readers-png-Drop-greyscale-support-to-fix-heap.patch +GRUB2_IGNORE_CVES += CVE-2021-3695 +# 0011-video-readers-png-Avoid-heap-OOB-R-W-inserting-huff-.patch +GRUB2_IGNORE_CVES += CVE-2021-3696 +# 0012-video-readers-jpeg-Block-int-underflow-wild-pointer-.patch +GRUB2_IGNORE_CVES += CVE-2021-3697 +# 0013-net-ip-Do-IP-fragment-maths-safely.patch +GRUB2_IGNORE_CVES += CVE-2022-28733 +# 0014-net-http-Fix-OOB-write-for-split-http-headers.patch +# 0015-net-http-Error-out-on-headers-with-LF-without-CR.patch +GRUB2_IGNORE_CVES += CVE-2022-28734 +# 0017-font-Fix-several-integer-overflows-in-grub_font_cons.patch +GRUB2_IGNORE_CVES += CVE-2022-2601 +# 0018-font-Fix-an-integer-underflow-in-blit_comb.patch +GRUB2_IGNORE_CVES += CVE-2022-3775 ifeq ($(BR2_TARGET_GRUB2_INSTALL_TOOLS),y) GRUB2_INSTALL_TARGET = YES @@ -183,7 +187,7 @@ define GRUB2_INSTALL_IMAGES_CMDS $(foreach tuple, $(GRUB2_TUPLES-y), \ @$(call MESSAGE,Installing $(tuple) to images directory) mkdir -p $(dir $(GRUB2_IMAGE_$(tuple))) - $(HOST_DIR)/usr/bin/grub-mkimage \ + $(HOST_DIR)/bin/grub-mkimage \ -d $(@D)/build-$(tuple)/grub-core/ \ -O $(tuple) \ -o $(GRUB2_IMAGE_$(tuple)) \ diff --git a/boot/grub2/readme.txt b/boot/grub2/readme.txt index 0282fbdd130..5d59fb4e221 100644 --- a/boot/grub2/readme.txt +++ b/boot/grub2/readme.txt @@ -86,17 +86,14 @@ Notes on using Grub2 for x86/x86_64 EFI-based platforms To test your i386/x86-64 EFI image in Qemu ------------------------------------------ -1. Download the EFI BIOS for Qemu - Version IA32 or X64 depending on the chosen Grub2 - platform (i386-efi vs. x86-64-efi) - https://www.kraxel.org/repos/jenkins/edk2/ - (or use one provided by your distribution as OVMF) -2. Extract, and rename OVMF.fd to bios.bin and - CirrusLogic5446.rom to vgabios-cirrus.bin. -3. qemu-system-{i386,x86-64} -L ovmf-dir/ -hda disk.img -4. Make sure to pass pci=nocrs to the kernel command line, - to workaround a bug in the EFI BIOS regarding the - EFI framebuffer. +1. Download/install the EFI BIOS for Qemu + You can get it using the edk2 package in Buildroot (installed + in BINARIES_DIR), grab prebuilt images from the unofficial nightly + builds [0], or use one provided by your distribution as OVMF. + + [0] https://github.com/retrage/edk2-nightly + +2. qemu-system-{i386,x86-64} -bios -hda disk.img Notes on using Grub2 for ARM u-boot-based platforms =================================================== @@ -177,8 +174,13 @@ using qemu and EFI firmware built for qemu. 2. make 3. Download the EFI firmware for qemu aarch64 - https://www.kraxel.org/repos/jenkins/edk2/ - (or use one provided by your distribution as OVMF-aarch64 or AAVMF) + + You can get it using the edk2 package in Buildroot (installed + in BINARIES_DIR), grab prebuilt images from the unofficial nightly + builds [1], or use one provided by your distribution as OVMF-aarch64 + or AAVMF. + + [1] https://github.com/retrage/edk2-nightly 4. Run qemu with: diff --git a/boot/gummiboot/0001-Allow-building-with-newer-glibc-versions.patch b/boot/gummiboot/0001-Allow-building-with-newer-glibc-versions.patch deleted file mode 100644 index b35cd499bce..00000000000 --- a/boot/gummiboot/0001-Allow-building-with-newer-glibc-versions.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 40ab4167b5a45c772304a879c71b47d54de3b0e3 Mon Sep 17 00:00:00 2001 -From: Esben Haabendal -Date: Wed, 20 Mar 2019 14:19:40 +0100 -Subject: [PATCH] Allow building with newer glibc versions - -Newer glibc versions does not include sys/sysmacros.h from sys/types.h -anymore. Including it unconditionally should be safe. - -See https://sourceware.org/ml/libc-alpha/2015-11/msg00253.html for why -this was done. - -Signed-off-by: Esben Haabendal ---- - src/setup/setup.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/setup/setup.c b/src/setup/setup.c -index 6a4275a2ae36..53429375a146 100644 ---- a/src/setup/setup.c -+++ b/src/setup/setup.c -@@ -37,6 +37,7 @@ - #include - #include - #include -+#include - - #include "efivars.h" - --- -2.21.0 - diff --git a/boot/gummiboot/0002-Fix-linking-for-non-host-compatible-targets.patch b/boot/gummiboot/0002-Fix-linking-for-non-host-compatible-targets.patch deleted file mode 100644 index 7104a581e2f..00000000000 --- a/boot/gummiboot/0002-Fix-linking-for-non-host-compatible-targets.patch +++ /dev/null @@ -1,54 +0,0 @@ -From fc05ced797b87286b8ec7303fe32bf200a072972 Mon Sep 17 00:00:00 2001 -From: Esben Haabendal -Date: Mon, 18 Mar 2019 11:14:31 +0100 -Subject: [PATCH] Fix linking for non-host compatible targets - -Without this, gummiboot build system will use host 'ld' when linking -target binary, which is obviously not a good idea. - -Signed-off-by: Esben Haabendal ---- - Makefile.am | 4 ++-- - configure.ac | 4 ++++ - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 6568a355ed74..9051dd44edd9 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -142,7 +142,7 @@ $(top_builddir)/src/efi/%.o: $(top_srcdir)/src/efi/%.c $(addprefix $(top_srcdir) - $(AM_V_CC)$(EFI_CC) $(efi_cppflags) $(efi_cflags) -c $< -o $@ - - $(gummiboot_solib): $(gummiboot_objects) -- $(AM_V_CCLD)$(LD) $(efi_ldflags) $(gummiboot_objects) \ -+ $(AM_V_CCLD)$(EFI_LD) $(efi_ldflags) $(gummiboot_objects) \ - -o $@ -lefi -lgnuefi $(shell $(CC) -print-libgcc-file-name); \ - nm -D -u $@ | grep ' U ' && exit 1 || : - .DELETE_ON_ERROR: $(gummboot_solib) -@@ -177,7 +177,7 @@ $(top_builddir)/src/efi/%.o: $(top_srcdir)/src/efi/%.c $(addprefix $(top_srcdir) - $(AM_V_CC)$(EFI_CC) $(efi_cppflags) $(efi_cflags) -c $< -o $@ - - $(stub_solib): $(stub_objects) -- $(AM_V_CCLD)$(LD) $(efi_ldflags) $(stub_objects) \ -+ $(AM_V_CCLD)$(EFI_LD) $(efi_ldflags) $(stub_objects) \ - -o $@ -lefi -lgnuefi $(shell $(CC) -print-libgcc-file-name); \ - nm -D -u $@ | grep ' U ' && exit 1 || : - .DELETE_ON_ERROR: $(gummboot_solib) -diff --git a/configure.ac b/configure.ac -index 27bbe1d73396..b948696c220b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -40,6 +40,10 @@ dnl Don't try to use things like -std=c99 for efi compilation - EFI_CC=$CC - AC_SUBST([EFI_CC]) - -+dnl Allow specifying linker compatible with the compiler -+EFI_LD=$LD -+AC_SUBST([EFI_LD]) -+ - AC_PROG_CC_C99 - AM_PROG_CC_C_O - AC_PROG_GCC_TRADITIONAL --- -2.21.0 - diff --git a/boot/gummiboot/Config.in b/boot/gummiboot/Config.in deleted file mode 100644 index 1b5c4279f71..00000000000 --- a/boot/gummiboot/Config.in +++ /dev/null @@ -1,24 +0,0 @@ -config BR2_TARGET_GUMMIBOOT - bool "gummiboot" - depends on BR2_i386 || BR2_x86_64 - depends on BR2_PACKAGE_GNU_EFI_ARCH_SUPPORTS - select BR2_PACKAGE_GNU_EFI - select BR2_PACKAGE_UTIL_LINUX - select BR2_PACKAGE_UTIL_LINUX_LIBBLKID - help - gummiboot is a simple UEFI boot manager which executes - configured EFI images. The default entry is selected by a - configured pattern (glob) or an on-screen menu. - - gummiboot operates on the EFI System Partition (ESP) - only. Configuration file fragments, kernels, initrds, other - EFI images need to reside on the ESP. Linux kernels need to - be built with CONFIG_EFI_STUB to be able to be directly - executed as an EFI image. - - See the Grub2 help text for details on preparing an EFI - capable disk image using Gummiboot: the instructions are - exactly the same, except that the Gummiboot configuration - files will be located in /loader/ inside the EFI partition. - - http://freedesktop.org/wiki/Software/gummiboot/ diff --git a/boot/gummiboot/buildroot.conf b/boot/gummiboot/buildroot.conf deleted file mode 100644 index 8a6f02e56af..00000000000 --- a/boot/gummiboot/buildroot.conf +++ /dev/null @@ -1,4 +0,0 @@ -title Buildroot -version 1 -linux /bzImage -options console=ttyS0 root=/dev/sda2 diff --git a/boot/gummiboot/gummiboot.mk b/boot/gummiboot/gummiboot.mk deleted file mode 100644 index eb1f3da78ca..00000000000 --- a/boot/gummiboot/gummiboot.mk +++ /dev/null @@ -1,41 +0,0 @@ -################################################################################ -# -# gummiboot -# -################################################################################ - -GUMMIBOOT_SITE = https://gitlab.freedesktop.org/archived-projects/gummiboot.git -GUMMIBOOT_SITE_METHOD = git -GUMMIBOOT_VERSION = 2bcd919c681c952eb867ef1bdb458f1bc49c2d55 -GUMMIBOOT_LICENSE = LGPL-2.1+ -GUMMIBOOT_LICENSE_FILES = LICENSE - -# The git archive does not have the autoconf/automake stuff generated. -GUMMIBOOT_AUTORECONF = YES -GUMMIBOOT_DEPENDENCIES = gnu-efi host-pkgconf util-linux -GUMMIBOOT_INSTALL_TARGET = NO -GUMMIBOOT_INSTALL_IMAGES = YES - -ifeq ($(BR2_i386),y) -GUMMIBOOT_IMGARCH = ia32 -else ifeq ($(BR2_x86_64),y) -GUMMIBOOT_IMGARCH = x64 -endif - -GUMMIBOOT_CONF_OPTS = \ - --host=$(BR2_ARCH) \ - --with-efi-libdir=$(STAGING_DIR)/usr/lib \ - --with-efi-ldsdir=$(STAGING_DIR)/usr/lib \ - --with-efi-includedir=$(STAGING_DIR)/usr/include \ - --disable-manpages - -define GUMMIBOOT_INSTALL_IMAGES_CMDS - $(INSTALL) -D -m 0644 $(@D)/gummiboot$(GUMMIBOOT_IMGARCH).efi \ - $(BINARIES_DIR)/efi-part/EFI/BOOT/boot$(GUMMIBOOT_IMGARCH).efi - $(INSTALL) -D -m 0644 boot/gummiboot/loader.conf \ - $(BINARIES_DIR)/efi-part/loader/loader.conf - $(INSTALL) -D -m 0644 boot/gummiboot/buildroot.conf \ - $(BINARIES_DIR)/efi-part/loader/entries/buildroot.conf -endef - -$(eval $(autotools-package)) diff --git a/boot/gummiboot/loader.conf b/boot/gummiboot/loader.conf deleted file mode 100644 index 93b77b8f93a..00000000000 --- a/boot/gummiboot/loader.conf +++ /dev/null @@ -1,2 +0,0 @@ -timeout 3 -default buildroot diff --git a/boot/mv-ddr-marvell/0001-Allow-access-to-low-addresses-with-gcc-12.patch b/boot/mv-ddr-marvell/0001-Allow-access-to-low-addresses-with-gcc-12.patch new file mode 100644 index 00000000000..5a623f28f95 --- /dev/null +++ b/boot/mv-ddr-marvell/0001-Allow-access-to-low-addresses-with-gcc-12.patch @@ -0,0 +1,49 @@ +From 4796a1eacc6a5ccb623e7d2e46a5196f8335e496 Mon Sep 17 00:00:00 2001 +From: Baruch Siach +Date: Fri, 11 Aug 2023 11:19:49 +0300 +Subject: [PATCH] Allow access to low addresses with gcc 12 + +gcc 12 added a warning that triggers on access to low addresses. Add a +compile option that allows access to lower addresses. + +Add the 'cc_option' macro to avoid the compile option when the compiler +does not support it. + +This fixes build with TF-A. TF-A added a similar fix in commit +dea23e245fb89. + +See some more details in +https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105523 + +Upstream: https://github.com/MarvellEmbeddedProcessors/mv-ddr-marvell/pull/42 +Signed-off-by: Baruch Siach +--- + Makefile | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/Makefile b/Makefile +index 3f0dd89a7381..045284c30cbc 100644 +--- a/Makefile ++++ b/Makefile +@@ -108,6 +108,10 @@ MV_DDR_VER_CSRC = mv_ddr_build_message.c + # create mv_ddr build message and version string source file + $(shell $(MV_DDR_ROOT)/scripts/localversion.sh $(MV_DDR_ROOT) $(MV_DDR_VER_CSRC) 2> /dev/null) + ++define cc_option ++ $(shell if $(CC) $(1) -c -x c /dev/null -o /dev/null >/dev/null 2>&1; then echo $(1); fi ) ++endef ++ + # ****************** + # U-BOOT SPL SUPPORT + # ****************** +@@ -331,6 +335,7 @@ OBJ_DIR ?= $(MV_DDR_ROOT) + CFLAGS = -DMV_DDR_ATF -DCONFIG_DDR4 + CFLAGS += -Wall -Werror -Os -ffreestanding -mlittle-endian -g -gdwarf-2 -nostdinc + CFLAGS += -march=armv8-a -fpie ++CFLAGS += $(call cc_option, --param=min-pagesize=0) + + # PLATFORM is set in ble/ble.mk + ifneq ($(findstring a80x0,$(PLATFORM)),) +-- +2.40.1 + diff --git a/boot/mv-ddr-marvell/0002-Makefile-disable-stack-protection.patch b/boot/mv-ddr-marvell/0002-Makefile-disable-stack-protection.patch new file mode 100644 index 00000000000..626279eb471 --- /dev/null +++ b/boot/mv-ddr-marvell/0002-Makefile-disable-stack-protection.patch @@ -0,0 +1,33 @@ +From 53e34e3bff26fcbb7cc14178fa9fc80e7a73d556 Mon Sep 17 00:00:00 2001 +From: Baruch Siach +Date: Tue, 11 Oct 2022 16:34:44 +0300 +Subject: [PATCH] Makefile: disable stack protection + +The Buildroot toolchain might enable stack protection by default. That +breaks linking because ATF does not provide the required __stack_chk +routines. + +The mv-ddr-marvell Makefile provides no way to add custom CFLAGS. Patch +Makefile to disable stack protection. + +Upstream: not applicable; Buildroot specific +Signed-off-by: Baruch Siach +--- + Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile b/Makefile +index 045284c30cbc..9641354bcf86 100644 +--- a/Makefile ++++ b/Makefile +@@ -336,6 +336,7 @@ CFLAGS = -DMV_DDR_ATF -DCONFIG_DDR4 + CFLAGS += -Wall -Werror -Os -ffreestanding -mlittle-endian -g -gdwarf-2 -nostdinc + CFLAGS += -march=armv8-a -fpie + CFLAGS += $(call cc_option, --param=min-pagesize=0) ++CFLAGS += -fno-stack-protector + + # PLATFORM is set in ble/ble.mk + ifneq ($(findstring a80x0,$(PLATFORM)),) +-- +2.40.1 + diff --git a/boot/mv-ddr-marvell/mv-ddr-marvell.hash b/boot/mv-ddr-marvell/mv-ddr-marvell.hash index 5bfae8af457..75e87d833df 100644 --- a/boot/mv-ddr-marvell/mv-ddr-marvell.hash +++ b/boot/mv-ddr-marvell/mv-ddr-marvell.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 bfab74a625d65238c569b9df282b55c0fc9a1e2d3decedcf194d44774df2ede4 mv-ddr-marvell-305d923e6bc4236cd3b902f6679b0aef9e5fa52d.tar.gz -sha256 48bb930b6fbc3f5db72e29c849b096df3868e4a6d2bdc0e2dd3365c768241cd5 ddr3_init.c +sha256 16f02232e21a15979b3d9971e28f7e59562484a5c1f99c2b28c248a3b76a63fa mv-ddr-marvell-d5acc10c287e40cc2feeb28710b92e45c93c702c.tar.gz +sha256 907a03943ca940790e97620aca8d46b5b04c653dcf2ab6c66a25238b60cf5635 ddr3_init.c diff --git a/boot/mv-ddr-marvell/mv-ddr-marvell.mk b/boot/mv-ddr-marvell/mv-ddr-marvell.mk index 442b6aed535..e05192fe9b8 100644 --- a/boot/mv-ddr-marvell/mv-ddr-marvell.mk +++ b/boot/mv-ddr-marvell/mv-ddr-marvell.mk @@ -4,8 +4,8 @@ # ################################################################################ -# This is the latest commit on mv-ddr-devel as of 20201207 -MV_DDR_MARVELL_VERSION = 305d923e6bc4236cd3b902f6679b0aef9e5fa52d +# This is the latest commit on mv-ddr-devel as of 20220529 +MV_DDR_MARVELL_VERSION = d5acc10c287e40cc2feeb28710b92e45c93c702c MV_DDR_MARVELL_SITE = $(call github,MarvellEmbeddedProcessors,mv-ddr-marvell,$(MV_DDR_MARVELL_VERSION)) MV_DDR_MARVELL_LICENSE = GPL-2.0+ or LGPL-2.1 with freertos-exception-2.0, BSD-3-Clause, Marvell Commercial MV_DDR_MARVELL_LICENSE_FILES = ddr3_init.c diff --git a/boot/mxs-bootlets/Config.in b/boot/mxs-bootlets/Config.in index b3e392afa86..8f9334b610b 100644 --- a/boot/mxs-bootlets/Config.in +++ b/boot/mxs-bootlets/Config.in @@ -1,6 +1,8 @@ config BR2_TARGET_MXS_BOOTLETS bool "mxs-bootlets" depends on BR2_arm + depends on BR2_TARGET_BAREBOX || BR2_LINUX_KERNEL || \ + BR2_TARGET_UBOOT help Stage1 bootloaders for Freescale iMX23/iMX28 SoCs diff --git a/boot/opensbi/Config.in b/boot/opensbi/Config.in index f1443498d9c..86f848f1771 100644 --- a/boot/opensbi/Config.in +++ b/boot/opensbi/Config.in @@ -119,4 +119,10 @@ config BR2_TARGET_OPENSBI_FW_FDT_PATH must be set in the U-Boot configuration for this file to be produced. +config BR2_TARGET_OPENSBI_ADDITIONAL_VARIABLES + string "Additional build variables" + help + Additional parameters for the build, which will be passed on + the make command line. E.g: BUILD_INFO=1. + endif diff --git a/boot/opensbi/opensbi.mk b/boot/opensbi/opensbi.mk index 8e055633a82..dd113a0bf87 100644 --- a/boot/opensbi/opensbi.mk +++ b/boot/opensbi/opensbi.mk @@ -6,7 +6,7 @@ OPENSBI_VERSION = $(call qstrip,$(BR2_TARGET_OPENSBI_VERSION)) -ifeq ($(OPENSBI_VERSION),custom) +ifeq ($(BR2_TARGET_OPENSBI_CUSTOM_TARBALL),y) # Handle custom OpenSBI tarballs as specified by the configuration OPENSBI_TARBALL = $(call qstrip,$(BR2_TARGET_OPENSBI_CUSTOM_TARBALL_LOCATION)) OPENSBI_SITE = $(patsubst %/,%,$(dir $(OPENSBI_TARBALL))) @@ -31,7 +31,8 @@ BR_NO_CHECK_HASH_FOR += $(OPENSBI_SOURCE) endif OPENSBI_MAKE_ENV = \ - CROSS_COMPILE=$(TARGET_CROSS) + CROSS_COMPILE=$(TARGET_CROSS) \ + $(call qstrip,$(BR2_TARGET_OPENSBI_ADDITIONAL_VARIABLES)) OPENSBI_PLAT = $(call qstrip,$(BR2_TARGET_OPENSBI_PLAT)) ifneq ($(OPENSBI_PLAT),) @@ -70,6 +71,7 @@ OPENSBI_INSTALL_IMAGES = YES OPENSBI_FW_IMAGES += payload endif +ifneq ($(OPENSBI_PLAT),) define OPENSBI_INSTALL_IMAGES_CMDS $(foreach f,$(OPENSBI_FW_IMAGES),\ $(INSTALL) -m 0644 -D $(@D)/build/platform/$(OPENSBI_PLAT)/firmware/fw_$(f).bin \ @@ -78,6 +80,7 @@ define OPENSBI_INSTALL_IMAGES_CMDS $(BINARIES_DIR)/fw_$(f).elf ) endef +endif # libsbi.a is not a library meant to be linked in user-space code, but # with bare metal code, which is why we don't install it in diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in index 09745784842..a3cb8390b47 100644 --- a/boot/optee-os/Config.in +++ b/boot/optee-os/Config.in @@ -13,16 +13,29 @@ if BR2_TARGET_OPTEE_OS choice prompt "OP-TEE OS version" - default BR2_TARGET_OPTEE_OS_LATEST + default BR2_TARGET_OPTEE_OS_LATEST if BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS help Select the version of OP-TEE OS you want to use config BR2_TARGET_OPTEE_OS_LATEST - bool "3.15.0" + bool "3.19.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_TARBALL + bool "Custom tarball" + help + This option allows to specify a URL pointing to an OP-TEE OS + source tarball. This URL can use any protocol recognized by + Buildroot, like http://, ftp://, file:// or scp://. + + When pointing to a local tarball using file://, you may want + to use a make variable like $(TOPDIR) to reference the root of + the Buildroot tree. + config BR2_TARGET_OPTEE_OS_CUSTOM_GIT bool "Custom Git repository" help @@ -30,6 +43,13 @@ config BR2_TARGET_OPTEE_OS_CUSTOM_GIT endchoice +if BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL + +config BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL_LOCATION + string "URL of custom OP-TEE OS tarball" + +endif + if BR2_TARGET_OPTEE_OS_CUSTOM_GIT config BR2_TARGET_OPTEE_OS_CUSTOM_REPO_URL @@ -50,10 +70,27 @@ endif config BR2_TARGET_OPTEE_OS_VERSION string - default "3.15.0" if BR2_TARGET_OPTEE_OS_LATEST + default "3.19.0" if BR2_TARGET_OPTEE_OS_LATEST + default "custom" if BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL default BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION \ if BR2_TARGET_OPTEE_OS_CUSTOM_GIT +config BR2_TARGET_OPTEE_OS_NEEDS_DTC + bool "OP-TEE OS needs dtc" + select BR2_PACKAGE_HOST_DTC + help + Select this option if your OP-TEE OS platform configuration + requires the Device Tree compiler to be available. + +config BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY + bool "OP-TEE OS needs host-python-cryptography" + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS + help + OP-TEE OS version below 3.16 used python-pycryptodomex + package in python scripts. Newer version uses + python-cryptography. Select this option if optee-os needs + python-cryptography to be built. + config BR2_TARGET_OPTEE_OS_CORE bool "Build core" default y @@ -93,6 +130,18 @@ config BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR Value for the optional PLATFORM_FLAVOR build directive provided to OP-TEE OS. +config BR2_TARGET_OPTEE_OS_CUSTOM_DTS_PATH + string "Device Tree Source file paths" + help + Space-separated list of paths to device tree source files + that will be copied to core/arch/arm/dts/ before starting + the build. + + To use this device tree source file, the OP-TEE OS + configuration must refer to it with the + CFG_EMBED_DTB_SOURCE_FILE option and no platform flavor + needs to be specified. + config BR2_TARGET_OPTEE_OS_ADDITIONAL_VARIABLES string "Additional build variables" help diff --git a/boot/optee-os/optee-os.hash b/boot/optee-os/optee-os.hash index 3c32e25b366..a87f21a9bfb 100644 --- a/boot/optee-os/optee-os.hash +++ b/boot/optee-os/optee-os.hash @@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_os/archive/3.15.0/optee-os-3.15.0.tar.gz -sha256 e5bb3d9eedaf7785af091602addac5b52118f4cdc108af9cd6f6c96b21503ab8 optee-os-3.15.0.tar.gz +# From https://github.com/OP-TEE/optee_os/archive/3.19.0/optee-os-3.19.0.tar.gz +sha256 5e0c03bbc4d106f262a6bd33333c002c3380205ae6b82334aa7b644721ff7868 optee-os-3.19.0.tar.gz # Locally computed -sha256 1247ee90858f4037b6cac63cbffddfed435d0d73c631b37d78c1e6e6ab3e5d1a LICENSE +sha256 1247ee90858f4037b6cac63cbffddfed435d0d73c631b37d78c1e6e6ab3e5d1a LICENSE diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk index 166b5e693c4..33b4e2e1ab4 100644 --- a/boot/optee-os/optee-os.mk +++ b/boot/optee-os/optee-os.mk @@ -13,15 +13,32 @@ endif OPTEE_OS_INSTALL_STAGING = YES OPTEE_OS_INSTALL_IMAGES = YES -ifeq ($(BR2_TARGET_OPTEE_OS_CUSTOM_GIT),y) +ifeq ($(BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL),y) +OPTEE_OS_TARBALL = $(call qstrip,$(BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL_LOCATION)) +OPTEE_OS_SITE = $(patsubst %/,%,$(dir $(OPTEE_OS_TARBALL))) +OPTEE_OS_SOURCE = $(notdir $(OPTEE_OS_TARBALL)) +else ifeq ($(BR2_TARGET_OPTEE_OS_CUSTOM_GIT),y) OPTEE_OS_SITE = $(call qstrip,$(BR2_TARGET_OPTEE_OS_CUSTOM_REPO_URL)) OPTEE_OS_SITE_METHOD = git -BR_NO_CHECK_HASH_FOR += $(OPTEE_OS_SOURCE) else OPTEE_OS_SITE = $(call github,OP-TEE,optee_os,$(OPTEE_OS_VERSION)) endif -OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pycryptodomex host-python-pyelftools +ifeq ($(BR2_TARGET_OPTEE_OS):$(BR2_TARGET_OPTEE_OS_LATEST),y:) +BR_NO_CHECK_HASH_FOR += $(OPTEE_OS_SOURCE) +endif + +OPTEE_OS_DEPENDENCIES = host-openssl host-python3 host-python-pyelftools + +ifeq ($(BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY),y) +OPTEE_OS_DEPENDENCIES += host-python-cryptography +else +OPTEE_OS_DEPENDENCIES += host-python-pycryptodomex +endif + +ifeq ($(BR2_TARGET_OPTEE_OS_NEEDS_DTC),y) +OPTEE_OS_DEPENDENCIES += host-dtc +endif # On 64bit targets, OP-TEE OS can be built in 32bit mode, or # can be built in 64bit mode and support 32bit and 64bit @@ -67,6 +84,8 @@ endif OPTEE_OS_IMAGE_FILES = $(call qstrip,$(BR2_TARGET_OPTEE_OS_CORE_IMAGES)) +OPTEE_OS_CUSTOM_DTS_PATH = $(call qstrip,$(BR2_TARGET_OPTEE_OS_CUSTOM_DTS_PATH)) + ifeq ($(BR2_TARGET_OPTEE_OS_CORE),y) define OPTEE_OS_BUILD_CORE $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) O=$(OPTEE_OS_BUILDDIR_OUT) \ @@ -103,6 +122,9 @@ endef endif # BR2_TARGET_OPTEE_OS_SDK define OPTEE_OS_BUILD_CMDS + $(if $(OPTEE_OS_CUSTOM_DTS_PATH), + cp -f $(OPTEE_OS_CUSTOM_DTS_PATH) $(@D)/core/arch/arm/dts/ + ) $(OPTEE_OS_BUILD_CORE) $(OPTEE_OS_BUILD_SDK) endef @@ -116,6 +138,19 @@ ifeq ($(BR2_TARGET_OPTEE_OS)$(BR_BUILDING),yy) ifeq ($(call qstrip,$(BR2_TARGET_OPTEE_OS_PLATFORM)),) $(error No OP-TEE OS platform set. Check your BR2_TARGET_OPTEE_OS_PLATFORM setting) endif + +ifeq ($(BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL),y) +ifeq ($(call qstrip,$(BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL_LOCATION)),) +$(error No tarball location specified. Please check BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL_LOCATION) +endif +endif + +ifeq ($(BR2_TARGET_OPTEE_OS_CUSTOM_GIT),y) +ifeq ($(call qstrip,$(BR2_TARGET_OPTEE_OS_CUSTOM_REPO_URL)),) +$(error No repository specified. Please check BR2_TARGET_OPTEE_OS_CUSTOM_REPO_URL) +endif +endif + endif # BR2_TARGET_OPTEE_OS && BR2_BUILDING $(eval $(generic-package)) diff --git a/boot/s500-bootloader/s500-bootloader.hash b/boot/s500-bootloader/s500-bootloader.hash index d538f23b2a6..2ebd933e523 100644 --- a/boot/s500-bootloader/s500-bootloader.hash +++ b/boot/s500-bootloader/s500-bootloader.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 b183024ac69f51ea7befd28d03b2ec35a7280e270405600fb4f37aa91d9c9571 s500-bootloader-a8d7fa1d9a7f353ec4613febf30f4ca99a10a106.tar.gz +sha256 b183024ac69f51ea7befd28d03b2ec35a7280e270405600fb4f37aa91d9c9571 s500-bootloader-a8d7fa1d9a7f353ec4613febf30f4ca99a10a106.tar.gz diff --git a/boot/shim/Config.in b/boot/shim/Config.in index 2f74d6f3326..462ef12d626 100644 --- a/boot/shim/Config.in +++ b/boot/shim/Config.in @@ -1,7 +1,15 @@ -config BR2_TARGET_SHIM - bool "shim" +config BR2_PACKAGE_SHIM_ARCH_SUPPORTS + bool + default y if BR2_aarch64 + default y if BR2_arm + default y if BR2_i386 + default y if BR2_x86_64 # it includes gnu-efi depends on BR2_PACKAGE_GNU_EFI_ARCH_SUPPORTS + +config BR2_TARGET_SHIM + bool "shim" + depends on BR2_PACKAGE_SHIM_ARCH_SUPPORTS help Boot loader to chain-load signed boot loaders under Secure Boot. diff --git a/boot/shim/shim.hash b/boot/shim/shim.hash index 15c763abca1..a0a9f06f35d 100644 --- a/boot/shim/shim.hash +++ b/boot/shim/shim.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 8344473dd10569588b8238a4656b8fab226714eea9f5363f8c410aa8a5090297 shim-15.4.tar.bz2 -sha256 15edf527919ddcb2f514ab9d16ad07ef219e4bb490e0b79560be510f0c159cc2 COPYRIGHT +sha256 8344473dd10569588b8238a4656b8fab226714eea9f5363f8c410aa8a5090297 shim-15.4.tar.bz2 +sha256 15edf527919ddcb2f514ab9d16ad07ef219e4bb490e0b79560be510f0c159cc2 COPYRIGHT diff --git a/boot/sun20i-d1-spl/Config.in b/boot/sun20i-d1-spl/Config.in deleted file mode 100644 index 9d94d87b1cf..00000000000 --- a/boot/sun20i-d1-spl/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_TARGET_SUN20I_D1_SPL - bool "sun20-d1-spl" - depends on BR2_RISCV_64 - help - Allwinner D1 boot0 code with modifications to use as U-Boot - SPL. - - https://github.com/smaeul/sun20i_d1_spl diff --git a/boot/sun20i-d1-spl/sun20i-d1-spl.hash b/boot/sun20i-d1-spl/sun20i-d1-spl.hash deleted file mode 100644 index 6ca60e52780..00000000000 --- a/boot/sun20i-d1-spl/sun20i-d1-spl.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 69063601239a7254fb72e486b138d88a6f2b5c645b24cdfe9792123f975d4a8f sun20i-d1-spl-771192d0b3737798d7feca87263c8fa74a449787.tar.gz diff --git a/boot/sun20i-d1-spl/sun20i-d1-spl.mk b/boot/sun20i-d1-spl/sun20i-d1-spl.mk deleted file mode 100644 index 2462ce23222..00000000000 --- a/boot/sun20i-d1-spl/sun20i-d1-spl.mk +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# -# sun20i-d1-spl -# -################################################################################ - -# Commit on the 'mainline' branch -SUN20I_D1_SPL_VERSION = 771192d0b3737798d7feca87263c8fa74a449787 -SUN20I_D1_SPL_SITE = $(call github,smaeul,sun20i_d1_spl,$(SUN20I_D1_SPL_VERSION)) -SUN20I_D1_SPL_INSTALL_TARGET = NO -SUN20I_D1_SPL_INSTALL_IMAGES = YES -SUN20I_D1_SPL_LICENSE = GPL-2.0+ - -define SUN20I_D1_SPL_BUILD_CMDS - $(MAKE) -C $(@D) CROSS_COMPILE="$(TARGET_CROSS)" p=sun20iw1p1 mmc -endef - -define SUN20I_D1_SPL_INSTALL_IMAGES_CMDS - $(INSTALL) -D -m 0644 $(@D)/nboot/boot0_sdcard_sun20iw1p1.bin \ - $(BINARIES_DIR)/boot0_sdcard_sun20iw1p1.bin -endef - -$(eval $(generic-package)) diff --git a/boot/syslinux/syslinux.mk b/boot/syslinux/syslinux.mk index 2df415fcfd4..cc52c49aeec 100644 --- a/boot/syslinux/syslinux.mk +++ b/boot/syslinux/syslinux.mk @@ -58,6 +58,8 @@ SYSLINUX_POST_PATCH_HOOKS += SYSLINUX_CLEANUP # be used. define SYSLINUX_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE1) \ + ASCIIDOC_OK=-1 \ + A2X_XML_OK=-1 \ CC="$(TARGET_CC)" \ LD="$(TARGET_LD)" \ OBJCOPY="$(TARGET_OBJCOPY)" \ diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3-r5-loader/Config.in new file mode 100644 index 00000000000..10602c8df32 --- /dev/null +++ b/boot/ti-k3-r5-loader/Config.in @@ -0,0 +1,35 @@ +config BR2_TARGET_TI_K3_R5_LOADER + bool "ti-k3-r5-loader" + depends on BR2_aarch64 + help + Separate U-Boot build for R5 cores on TI's k3 boards. + Usually used to build tiboot3.bin with k3-image-gen. + +if BR2_TARGET_TI_K3_R5_LOADER + +choice + prompt "Configuration" + default BR2_TARGET_TI_K3_R5_LOADER_USE_DEFCONFIG + +config BR2_TARGET_TI_K3_R5_LOADER_USE_DEFCONFIG + bool "Using an in-tree board defconfig file" + +config BR2_TARGET_TI_K3_R5_LOADER_USE_CUSTOM_CONFIG + bool "Using a custom board (def)config file" + +endchoice + +config BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG + string "Board defconfig" + depends on BR2_TARGET_TI_K3_R5_LOADER_USE_DEFCONFIG + help + Name of the board for which TI K3 R5 Loader should be + built, without the _defconfig suffix. + +config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_CONFIG_FILE + string "Configuration file path" + depends on BR2_TARGET_TI_K3_R5_LOADER_USE_CUSTOM_CONFIG + help + Path to the TI K3 R5 Loader configuration file. + +endif diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash b/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash new file mode 100644 index 00000000000..c5d1cb8e09f --- /dev/null +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 50b4482a505bc281ba8470c399a3c26e145e29b23500bc35c50debd7fa46bdf8 u-boot-2022.10.tar.bz2 +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Licenses/gpl-2.0.txt diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk new file mode 100644 index 00000000000..afa309aa980 --- /dev/null +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk @@ -0,0 +1,48 @@ +################################################################################ +# +# ti-k3-r5-loader +# +################################################################################ + +TI_K3_R5_LOADER_VERSION = 2022.10 +TI_K3_R5_LOADER_SITE = https://ftp.denx.de/pub/u-boot +TI_K3_R5_LOADER_SOURCE = u-boot-$(TI_K3_R5_LOADER_VERSION).tar.bz2 +TI_K3_R5_LOADER_LICENSE = GPL-2.0+ +TI_K3_R5_LOADER_LICENSE_FILES = Licenses/gpl-2.0.txt +TI_K3_R5_LOADER_CPE_ID_VENDOR = denx +TI_K3_R5_LOADER_CPE_ID_PRODUCT = u-boot +TI_K3_R5_LOADER_INSTALL_IMAGES = YES +TI_K3_R5_LOADER_DEPENDENCIES = \ + host-pkgconf \ + $(BR2_MAKE_HOST_DEPENDENCY) \ + host-arm-gnu-toolchain \ + host-openssl + +TI_K3_R5_LOADER_MAKE = $(BR2_MAKE) +TI_K3_R5_LOADER_MAKE_ENV = $(TARGET_MAKE_ENV) +TI_K3_R5_LOADER_KCONFIG_DEPENDENCIES = \ + host-arm-gnu-toolchain \ + $(BR2_MAKE_HOST_DEPENDENCY) \ + $(BR2_BISON_HOST_DEPENDENCY) \ + $(BR2_FLEX_HOST_DEPENDENCY) + +ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_DEFCONFIG),y) +TI_K3_R5_LOADER_KCONFIG_DEFCONFIG = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG))_defconfig +else ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_CUSTOM_CONFIG),y) +TI_K3_R5_LOADER_KCONFIG_FILE = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_CONFIG_FILE)) +endif # BR2_TARGET_TI_K3_R5_LOADER_USE_DEFCONFIG +TI_K3_R5_LOADER_MAKE_OPTS = \ + CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ + ARCH=arm \ + HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem /,$(HOST_CFLAGS)))" \ + HOSTLDFLAGS="$(HOST_LDFLAGS)" + +define TI_K3_R5_LOADER_BUILD_CMDS + $(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS) +endef + +define TI_K3_R5_LOADER_INSTALL_IMAGES_CMDS + cp $(@D)/spl/u-boot-spl.bin $(BINARIES_DIR)/r5-u-boot-spl.bin +endef + +$(eval $(kconfig-package)) diff --git a/boot/uboot/2015.07/0001-Revert-arch-Make-board-selection-choices-optional.patch b/boot/uboot/2015.07/0001-Revert-arch-Make-board-selection-choices-optional.patch deleted file mode 100644 index 8b814f2d69c..00000000000 --- a/boot/uboot/2015.07/0001-Revert-arch-Make-board-selection-choices-optional.patch +++ /dev/null @@ -1,742 +0,0 @@ -From ee11fed43e2bd029f71af1e72ab9bb5652f5fc54 Mon Sep 17 00:00:00 2001 -From: Alexey Brodkin -Date: Wed, 29 Jul 2015 20:32:59 +0300 -Subject: [PATCH] Revert "arch: Make board selection choices optional" - -This reverts commit a26cd04920dc069fd6e91abb785426cf6c29f45f. - -Reverted commit caused an issue with "make oldconfig" - default prompt -for target selection was set as No that lead to missing platform -selection by automated scripts like that: ------------------->8------------------ -"yes "" | make oldconfig" on defconfig ------------------->8------------------ - -And that lead to build failure: ------------------->8------------------ -$ make -scripts/kconfig/conf --silentoldconfig Kconfig - CHK include/config.h - UPD include/config.h - GEN include/autoconf.mk -In file included from ./include/common.h:18:0: -include/config.h:5:22: fatal error: configs/.h: No such file or directory - #include - ^ -compilation terminated. -scripts/Makefile.autoconf:72: recipe for target 'include/autoconf.mk' failed -make[1]: *** [include/autoconf.mk] Error 1 ------------------->8------------------ - -Signed-off-by: Alexey Brodkin ---- - arch/arc/Kconfig | 1 - - arch/arm/Kconfig | 1 - - arch/arm/cpu/armv7/exynos/Kconfig | 1 - - arch/arm/cpu/armv7/mx5/Kconfig | 1 - - arch/arm/cpu/armv7/mx6/Kconfig | 1 - - arch/arm/cpu/armv7/omap3/Kconfig | 1 - - arch/arm/cpu/armv7/omap4/Kconfig | 1 - - arch/arm/cpu/armv7/omap5/Kconfig | 1 - - arch/arm/cpu/armv7/rmobile/Kconfig | 1 - - arch/arm/cpu/armv7/s5pc1xx/Kconfig | 1 - - arch/arm/mach-at91/Kconfig | 1 - - arch/arm/mach-bcm283x/Kconfig | 1 - - arch/arm/mach-davinci/Kconfig | 1 - - arch/arm/mach-integrator/Kconfig | 2 -- - arch/arm/mach-keystone/Kconfig | 1 - - arch/arm/mach-kirkwood/Kconfig | 1 - - arch/arm/mach-nomadik/Kconfig | 1 - - arch/arm/mach-orion5x/Kconfig | 1 - - arch/arm/mach-socfpga/Kconfig | 1 - - arch/arm/mach-tegra/Kconfig | 1 - - arch/arm/mach-tegra/tegra114/Kconfig | 1 - - arch/arm/mach-tegra/tegra124/Kconfig | 1 - - arch/arm/mach-tegra/tegra20/Kconfig | 1 - - arch/arm/mach-tegra/tegra30/Kconfig | 1 - - arch/arm/mach-zynq/Kconfig | 1 - - arch/avr32/Kconfig | 1 - - arch/blackfin/Kconfig | 1 - - arch/m68k/Kconfig | 1 - - arch/microblaze/Kconfig | 1 - - arch/mips/Kconfig | 1 - - arch/nds32/Kconfig | 1 - - arch/nios2/Kconfig | 1 - - arch/openrisc/Kconfig | 1 - - arch/powerpc/Kconfig | 1 - - arch/powerpc/cpu/mpc512x/Kconfig | 1 - - arch/powerpc/cpu/mpc5xx/Kconfig | 1 - - arch/powerpc/cpu/mpc5xxx/Kconfig | 1 - - arch/powerpc/cpu/mpc8260/Kconfig | 1 - - arch/powerpc/cpu/mpc83xx/Kconfig | 1 - - arch/powerpc/cpu/mpc85xx/Kconfig | 1 - - arch/powerpc/cpu/mpc86xx/Kconfig | 1 - - arch/powerpc/cpu/mpc8xx/Kconfig | 1 - - arch/powerpc/cpu/ppc4xx/Kconfig | 1 - - arch/sh/Kconfig | 1 - - arch/sparc/Kconfig | 1 - - board/amcc/canyonlands/Kconfig | 1 - - board/coreboot/Kconfig | 1 - - board/dbau1x00/Kconfig | 1 - - board/google/Kconfig | 1 - - board/intel/Kconfig | 1 - - board/micronas/vct/Kconfig | 1 - - board/seco/Kconfig | 2 -- - board/sunxi/Kconfig | 1 - - 53 files changed, 55 deletions(-) - -diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig -index 925e312..640cda8 100644 ---- a/arch/arc/Kconfig -+++ b/arch/arc/Kconfig -@@ -129,7 +129,6 @@ config ARC_CACHE_LINE_SHIFT - - choice - prompt "Target select" -- optional - - config TARGET_TB100 - bool "Support tb100" -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 9908b43..8eeb46c 100644 ---- a/arch/arm/Kconfig -+++ b/arch/arm/Kconfig -@@ -64,7 +64,6 @@ config SEMIHOSTING - - choice - prompt "Target select" -- optional - - config ARCH_AT91 - bool "Atmel AT91" -diff --git a/arch/arm/cpu/armv7/exynos/Kconfig b/arch/arm/cpu/armv7/exynos/Kconfig -index 4a7d82f..f2fe748 100644 ---- a/arch/arm/cpu/armv7/exynos/Kconfig -+++ b/arch/arm/cpu/armv7/exynos/Kconfig -@@ -2,7 +2,6 @@ if ARCH_EXYNOS - - choice - prompt "EXYNOS board select" -- optional - - config TARGET_SMDKV310 - select SUPPORT_SPL -diff --git a/arch/arm/cpu/armv7/mx5/Kconfig b/arch/arm/cpu/armv7/mx5/Kconfig -index 9f250c6..2d6c0ce 100644 ---- a/arch/arm/cpu/armv7/mx5/Kconfig -+++ b/arch/arm/cpu/armv7/mx5/Kconfig -@@ -12,7 +12,6 @@ config MX53 - - choice - prompt "MX5 board select" -- optional - - config TARGET_USBARMORY - bool "Support USB armory" -diff --git a/arch/arm/cpu/armv7/mx6/Kconfig b/arch/arm/cpu/armv7/mx6/Kconfig -index 10908c4..662596f 100644 ---- a/arch/arm/cpu/armv7/mx6/Kconfig -+++ b/arch/arm/cpu/armv7/mx6/Kconfig -@@ -27,7 +27,6 @@ config MX6SX - - choice - prompt "MX6 board select" -- optional - - config TARGET_SECOMX6 - bool "Support secomx6 boards" -diff --git a/arch/arm/cpu/armv7/omap3/Kconfig b/arch/arm/cpu/armv7/omap3/Kconfig -index b32a6b0..cc82c50 100644 ---- a/arch/arm/cpu/armv7/omap3/Kconfig -+++ b/arch/arm/cpu/armv7/omap3/Kconfig -@@ -2,7 +2,6 @@ if OMAP34XX - - choice - prompt "OMAP3 board select" -- optional - - config TARGET_AM3517_EVM - bool "AM3517 EVM" -diff --git a/arch/arm/cpu/armv7/omap4/Kconfig b/arch/arm/cpu/armv7/omap4/Kconfig -index df27ea1..eccf897 100644 ---- a/arch/arm/cpu/armv7/omap4/Kconfig -+++ b/arch/arm/cpu/armv7/omap4/Kconfig -@@ -2,7 +2,6 @@ if OMAP44XX - - choice - prompt "OMAP4 board select" -- optional - - config TARGET_DUOVERO - bool "OMAP4430 Gumstix Duovero" -diff --git a/arch/arm/cpu/armv7/omap5/Kconfig b/arch/arm/cpu/armv7/omap5/Kconfig -index 20c3bd9..aca862d 100644 ---- a/arch/arm/cpu/armv7/omap5/Kconfig -+++ b/arch/arm/cpu/armv7/omap5/Kconfig -@@ -2,7 +2,6 @@ if OMAP54XX - - choice - prompt "OMAP5 board select" -- optional - - config TARGET_CM_T54 - bool "CompuLab CM-T54" -diff --git a/arch/arm/cpu/armv7/rmobile/Kconfig b/arch/arm/cpu/armv7/rmobile/Kconfig -index ef56286..638b63d 100644 ---- a/arch/arm/cpu/armv7/rmobile/Kconfig -+++ b/arch/arm/cpu/armv7/rmobile/Kconfig -@@ -2,7 +2,6 @@ if RMOBILE - - choice - prompt "Renesus ARM SoCs board select" -- optional - - config TARGET_ARMADILLO_800EVA - bool "armadillo 800 eva board" -diff --git a/arch/arm/cpu/armv7/s5pc1xx/Kconfig b/arch/arm/cpu/armv7/s5pc1xx/Kconfig -index 792ef59..65cc9eb 100644 ---- a/arch/arm/cpu/armv7/s5pc1xx/Kconfig -+++ b/arch/arm/cpu/armv7/s5pc1xx/Kconfig -@@ -2,7 +2,6 @@ if ARCH_S5PC1XX - - choice - prompt "S5PC1XX board select" -- optional - - config TARGET_S5P_GONI - bool "S5P Goni board" -diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig -index bbf4228..5dc2cb2 100644 ---- a/arch/arm/mach-at91/Kconfig -+++ b/arch/arm/mach-at91/Kconfig -@@ -2,7 +2,6 @@ if ARCH_AT91 - - choice - prompt "Atmel AT91 board select" -- optional - - config TARGET_AT91RM9200EK - bool "Atmel AT91RM9200 evaluation kit" -diff --git a/arch/arm/mach-bcm283x/Kconfig b/arch/arm/mach-bcm283x/Kconfig -index 2315a13..d40f505 100644 ---- a/arch/arm/mach-bcm283x/Kconfig -+++ b/arch/arm/mach-bcm283x/Kconfig -@@ -3,7 +3,6 @@ menu "Broadcom BCM283X family" - - choice - prompt "Broadcom BCM283X board select" -- optional - - config TARGET_RPI - bool "Raspberry Pi" -diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig -index e6cb390..3ef55d3 100644 ---- a/arch/arm/mach-davinci/Kconfig -+++ b/arch/arm/mach-davinci/Kconfig -@@ -2,7 +2,6 @@ if ARCH_DAVINCI - - choice - prompt "DaVinci board select" -- optional - - config TARGET_ENBW_CMC - bool "EnBW CMC board" -diff --git a/arch/arm/mach-integrator/Kconfig b/arch/arm/mach-integrator/Kconfig -index c54d69d..8ffc544 100644 ---- a/arch/arm/mach-integrator/Kconfig -+++ b/arch/arm/mach-integrator/Kconfig -@@ -3,7 +3,6 @@ menu "Integrator Options" - - choice - prompt "Integrator platform select" -- optional - - config ARCH_INTEGRATOR_AP - bool "Support Integrator/AP platform" -@@ -19,7 +18,6 @@ config ARCH_CINTEGRATOR - - choice - prompt "Integrator core module select" -- optional - - config CM720T - bool "Core Module for ARM720T" -diff --git a/arch/arm/mach-keystone/Kconfig b/arch/arm/mach-keystone/Kconfig -index 67f1a33..134ae87 100644 ---- a/arch/arm/mach-keystone/Kconfig -+++ b/arch/arm/mach-keystone/Kconfig -@@ -2,7 +2,6 @@ if ARCH_KEYSTONE - - choice - prompt "TI Keystone board select" -- optional - - config TARGET_K2HK_EVM - bool "TI Keystone 2 Kepler/Hawking EVM" -diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig -index 1261885..45c6687 100644 ---- a/arch/arm/mach-kirkwood/Kconfig -+++ b/arch/arm/mach-kirkwood/Kconfig -@@ -2,7 +2,6 @@ if KIRKWOOD - - choice - prompt "Marvell Kirkwood board select" -- optional - - config TARGET_OPENRD - bool "Marvell OpenRD Board" -diff --git a/arch/arm/mach-nomadik/Kconfig b/arch/arm/mach-nomadik/Kconfig -index ba72a41..265f336 100644 ---- a/arch/arm/mach-nomadik/Kconfig -+++ b/arch/arm/mach-nomadik/Kconfig -@@ -2,7 +2,6 @@ if ARCH_NOMADIK - - choice - prompt "Nomadik board select" -- optional - - config NOMADIK_NHK8815 - bool "ST 8815 Nomadik Hardware Kit" -diff --git a/arch/arm/mach-orion5x/Kconfig b/arch/arm/mach-orion5x/Kconfig -index 7644b8d..291c511 100644 ---- a/arch/arm/mach-orion5x/Kconfig -+++ b/arch/arm/mach-orion5x/Kconfig -@@ -2,7 +2,6 @@ if ORION5X - - choice - prompt "Marvell Orion board select" -- optional - - config TARGET_EDMINIV2 - bool "LaCie Ethernet Disk mini V2" -diff --git a/arch/arm/mach-socfpga/Kconfig b/arch/arm/mach-socfpga/Kconfig -index e46c348..204efca 100644 ---- a/arch/arm/mach-socfpga/Kconfig -+++ b/arch/arm/mach-socfpga/Kconfig -@@ -2,7 +2,6 @@ if ARCH_SOCFPGA - - choice - prompt "Altera SOCFPGA board select" -- optional - - config TARGET_SOCFPGA_ARRIA5 - bool "Altera SOCFPGA Arria V" -diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig -index 54bd648..ef77c84 100644 ---- a/arch/arm/mach-tegra/Kconfig -+++ b/arch/arm/mach-tegra/Kconfig -@@ -2,7 +2,6 @@ if TEGRA - - choice - prompt "Tegra SoC select" -- optional - - config TEGRA20 - bool "Tegra20 family" -diff --git a/arch/arm/mach-tegra/tegra114/Kconfig b/arch/arm/mach-tegra/tegra114/Kconfig -index 1047b92..31012bc 100644 ---- a/arch/arm/mach-tegra/tegra114/Kconfig -+++ b/arch/arm/mach-tegra/tegra114/Kconfig -@@ -2,7 +2,6 @@ if TEGRA114 - - choice - prompt "Tegra114 board select" -- optional - - config TARGET_DALMORE - bool "NVIDIA Tegra114 Dalmore evaluation board" -diff --git a/arch/arm/mach-tegra/tegra124/Kconfig b/arch/arm/mach-tegra/tegra124/Kconfig -index f3324ff..86c1301 100644 ---- a/arch/arm/mach-tegra/tegra124/Kconfig -+++ b/arch/arm/mach-tegra/tegra124/Kconfig -@@ -2,7 +2,6 @@ if TEGRA124 - - choice - prompt "Tegra124 board select" -- optional - - config TARGET_JETSON_TK1 - bool "NVIDIA Tegra124 Jetson TK1 board" -diff --git a/arch/arm/mach-tegra/tegra20/Kconfig b/arch/arm/mach-tegra/tegra20/Kconfig -index 1bb8dff..7f09f81 100644 ---- a/arch/arm/mach-tegra/tegra20/Kconfig -+++ b/arch/arm/mach-tegra/tegra20/Kconfig -@@ -2,7 +2,6 @@ if TEGRA20 - - choice - prompt "Tegra20 board select" -- optional - - config TARGET_HARMONY - bool "NVIDIA Tegra20 Harmony evaluation board" -diff --git a/arch/arm/mach-tegra/tegra30/Kconfig b/arch/arm/mach-tegra/tegra30/Kconfig -index e78331e..3abdc7b 100644 ---- a/arch/arm/mach-tegra/tegra30/Kconfig -+++ b/arch/arm/mach-tegra/tegra30/Kconfig -@@ -2,7 +2,6 @@ if TEGRA30 - - choice - prompt "Tegra30 board select" -- optional - - config TARGET_APALIS_T30 - bool "Toradex Apalis T30 board" -diff --git a/arch/arm/mach-zynq/Kconfig b/arch/arm/mach-zynq/Kconfig -index 1de5b07..6b0e295 100644 ---- a/arch/arm/mach-zynq/Kconfig -+++ b/arch/arm/mach-zynq/Kconfig -@@ -10,7 +10,6 @@ config ZYNQ_CUSTOM_INIT - - choice - prompt "Xilinx Zynq board select" -- optional - - config TARGET_ZYNQ_ZED - bool "Zynq ZedBoard" -diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig -index eb33774..801b9cc 100644 ---- a/arch/avr32/Kconfig -+++ b/arch/avr32/Kconfig -@@ -6,7 +6,6 @@ config SYS_ARCH - - choice - prompt "Target select" -- optional - - config TARGET_ATNGW100 - bool "Support atngw100" -diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig -index 0a2fb4d..31913fe 100644 ---- a/arch/blackfin/Kconfig -+++ b/arch/blackfin/Kconfig -@@ -6,7 +6,6 @@ config SYS_ARCH - - choice - prompt "Target select" -- optional - - config TARGET_BCT_BRETTL2 - bool "Support bct-brettl2" -diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig -index 26509b7..69cb0f7 100644 ---- a/arch/m68k/Kconfig -+++ b/arch/m68k/Kconfig -@@ -114,7 +114,6 @@ config M548x - - choice - prompt "Target select" -- optional - - config TARGET_M52277EVB - bool "Support M52277EVB" -diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig -index 077b2a7..6f419f0 100644 ---- a/arch/microblaze/Kconfig -+++ b/arch/microblaze/Kconfig -@@ -6,7 +6,6 @@ config SYS_ARCH - - choice - prompt "Target select" -- optional - - config TARGET_MICROBLAZE_GENERIC - bool "Support microblaze-generic" -diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig -index 7f7e258..87b94ac 100644 ---- a/arch/mips/Kconfig -+++ b/arch/mips/Kconfig -@@ -10,7 +10,6 @@ config SYS_CPU - - choice - prompt "Target select" -- optional - - config TARGET_QEMU_MIPS - bool "Support qemu-mips" -diff --git a/arch/nds32/Kconfig b/arch/nds32/Kconfig -index 98b0282..81b0a01 100644 ---- a/arch/nds32/Kconfig -+++ b/arch/nds32/Kconfig -@@ -6,7 +6,6 @@ config SYS_ARCH - - choice - prompt "Target select" -- optional - - config TARGET_ADP_AG101 - bool "Support adp-ag101" -diff --git a/arch/nios2/Kconfig b/arch/nios2/Kconfig -index 8ae7f6e..b3be7b5 100644 ---- a/arch/nios2/Kconfig -+++ b/arch/nios2/Kconfig -@@ -6,7 +6,6 @@ config SYS_ARCH - - choice - prompt "Target select" -- optional - - config TARGET_NIOS2_GENERIC - bool "Support nios2-generic" -diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig -index 11014d1..4d62b4c 100644 ---- a/arch/openrisc/Kconfig -+++ b/arch/openrisc/Kconfig -@@ -6,7 +6,6 @@ config SYS_ARCH - - choice - prompt "Target select" -- optional - - config TARGET_OPENRISC_GENERIC - bool "Support openrisc-generic" -diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig -index 3b3f446..8e5a3e2 100644 ---- a/arch/powerpc/Kconfig -+++ b/arch/powerpc/Kconfig -@@ -6,7 +6,6 @@ config SYS_ARCH - - choice - prompt "CPU select" -- optional - - config MPC512X - bool "MPC512X" -diff --git a/arch/powerpc/cpu/mpc512x/Kconfig b/arch/powerpc/cpu/mpc512x/Kconfig -index 53450ae..a0f0ede 100644 ---- a/arch/powerpc/cpu/mpc512x/Kconfig -+++ b/arch/powerpc/cpu/mpc512x/Kconfig -@@ -6,7 +6,6 @@ config SYS_CPU - - choice - prompt "Target select" -- optional - - config TARGET_PDM360NG - bool "Support pdm360ng" -diff --git a/arch/powerpc/cpu/mpc5xx/Kconfig b/arch/powerpc/cpu/mpc5xx/Kconfig -index 5275447..aad4a7c 100644 ---- a/arch/powerpc/cpu/mpc5xx/Kconfig -+++ b/arch/powerpc/cpu/mpc5xx/Kconfig -@@ -6,7 +6,6 @@ config SYS_CPU - - choice - prompt "Target select" -- optional - - config TARGET_CMI_MPC5XX - bool "Support cmi_mpc5xx" -diff --git a/arch/powerpc/cpu/mpc5xxx/Kconfig b/arch/powerpc/cpu/mpc5xxx/Kconfig -index 5d49228..eec9d7d 100644 ---- a/arch/powerpc/cpu/mpc5xxx/Kconfig -+++ b/arch/powerpc/cpu/mpc5xxx/Kconfig -@@ -6,7 +6,6 @@ config SYS_CPU - - choice - prompt "Target select" -- optional - - config TARGET_A3M071 - bool "Support a3m071" -diff --git a/arch/powerpc/cpu/mpc8260/Kconfig b/arch/powerpc/cpu/mpc8260/Kconfig -index e93732d..55941c8 100644 ---- a/arch/powerpc/cpu/mpc8260/Kconfig -+++ b/arch/powerpc/cpu/mpc8260/Kconfig -@@ -6,7 +6,6 @@ config SYS_CPU - - choice - prompt "Target select" -- optional - - config TARGET_KM82XX - bool "Support km82xx" -diff --git a/arch/powerpc/cpu/mpc83xx/Kconfig b/arch/powerpc/cpu/mpc83xx/Kconfig -index 3fb901f..88a3bd6 100644 ---- a/arch/powerpc/cpu/mpc83xx/Kconfig -+++ b/arch/powerpc/cpu/mpc83xx/Kconfig -@@ -6,7 +6,6 @@ config SYS_CPU - - choice - prompt "Target select" -- optional - - config TARGET_MPC8308_P1M - bool "Support mpc8308_p1m" -diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig -index 3e8d0b1..aff5fdb 100644 ---- a/arch/powerpc/cpu/mpc85xx/Kconfig -+++ b/arch/powerpc/cpu/mpc85xx/Kconfig -@@ -6,7 +6,6 @@ config SYS_CPU - - choice - prompt "Target select" -- optional - - config TARGET_SBC8548 - bool "Support sbc8548" -diff --git a/arch/powerpc/cpu/mpc86xx/Kconfig b/arch/powerpc/cpu/mpc86xx/Kconfig -index fe1859d..14e8b1a 100644 ---- a/arch/powerpc/cpu/mpc86xx/Kconfig -+++ b/arch/powerpc/cpu/mpc86xx/Kconfig -@@ -6,7 +6,6 @@ config SYS_CPU - - choice - prompt "Target select" -- optional - - config TARGET_SBC8641D - bool "Support sbc8641d" -diff --git a/arch/powerpc/cpu/mpc8xx/Kconfig b/arch/powerpc/cpu/mpc8xx/Kconfig -index 79cee35..e8bcbe9 100644 ---- a/arch/powerpc/cpu/mpc8xx/Kconfig -+++ b/arch/powerpc/cpu/mpc8xx/Kconfig -@@ -6,7 +6,6 @@ config SYS_CPU - - choice - prompt "Target select" -- optional - - config TARGET_TQM823L - bool "Support TQM823L" -diff --git a/arch/powerpc/cpu/ppc4xx/Kconfig b/arch/powerpc/cpu/ppc4xx/Kconfig -index 10b86e0..4d5954a 100644 ---- a/arch/powerpc/cpu/ppc4xx/Kconfig -+++ b/arch/powerpc/cpu/ppc4xx/Kconfig -@@ -6,7 +6,6 @@ config SYS_CPU - - choice - prompt "Target select" -- optional - - config TARGET_CSB272 - bool "Support csb272" -diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig -index 6ac22af..ff8f5b5 100644 ---- a/arch/sh/Kconfig -+++ b/arch/sh/Kconfig -@@ -29,7 +29,6 @@ config SH_32BIT - - choice - prompt "Target select" -- optional - - config TARGET_RSK7203 - bool "RSK+ 7203" -diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig -index 04dc08f..2df09b2 100644 ---- a/arch/sparc/Kconfig -+++ b/arch/sparc/Kconfig -@@ -14,7 +14,6 @@ config LEON3 - - choice - prompt "Board select" -- optional - - config TARGET_GRSIM_LEON2 - bool "GRSIM simulating a LEON2 board" -diff --git a/board/amcc/canyonlands/Kconfig b/board/amcc/canyonlands/Kconfig -index a655dbc..ef66ad4 100644 ---- a/board/amcc/canyonlands/Kconfig -+++ b/board/amcc/canyonlands/Kconfig -@@ -11,7 +11,6 @@ config SYS_CONFIG_NAME - - choice BOARD_TYPE - prompt "Select which board to build for" -- optional - - config CANYONLANDS - bool "Glacier" -diff --git a/board/coreboot/Kconfig b/board/coreboot/Kconfig -index ede6065..dc9b70f 100644 ---- a/board/coreboot/Kconfig -+++ b/board/coreboot/Kconfig -@@ -8,7 +8,6 @@ if VENDOR_COREBOOT - - choice - prompt "Mainboard model" -- optional - - config TARGET_COREBOOT - bool "coreboot" -diff --git a/board/dbau1x00/Kconfig b/board/dbau1x00/Kconfig -index b813adb..1286e45 100644 ---- a/board/dbau1x00/Kconfig -+++ b/board/dbau1x00/Kconfig -@@ -13,7 +13,6 @@ menu "dbau1x00 board options" - - choice - prompt "Select au1x00 SoC type" -- optional - - config DBAU1100 - bool "Select AU1100" -diff --git a/board/google/Kconfig b/board/google/Kconfig -index e9559c9..302f68e 100644 ---- a/board/google/Kconfig -+++ b/board/google/Kconfig -@@ -8,7 +8,6 @@ if VENDOR_GOOGLE - - choice - prompt "Mainboard model" -- optional - - config TARGET_CHROMEBOOK_LINK - bool "Chromebook link" -diff --git a/board/intel/Kconfig b/board/intel/Kconfig -index 3d9ecf0..7fe21b9 100644 ---- a/board/intel/Kconfig -+++ b/board/intel/Kconfig -@@ -8,7 +8,6 @@ if VENDOR_INTEL - - choice - prompt "Mainboard model" -- optional - - config TARGET_CROWNBAY - bool "Crown Bay" -diff --git a/board/micronas/vct/Kconfig b/board/micronas/vct/Kconfig -index c518079..288a1ae 100644 ---- a/board/micronas/vct/Kconfig -+++ b/board/micronas/vct/Kconfig -@@ -13,7 +13,6 @@ menu "vct board options" - - choice - prompt "Board variant" -- optional - - config VCT_PLATINUM - bool "Enable VCT_PLATINUM" -diff --git a/board/seco/Kconfig b/board/seco/Kconfig -index af16697..dcb1ac8 100644 ---- a/board/seco/Kconfig -+++ b/board/seco/Kconfig -@@ -2,7 +2,6 @@ if TARGET_SECOMX6 - - choice - prompt "SECO i.MX6 Board variant" -- optional - - config SECOMX6_Q7 - bool "Q7" -@@ -17,7 +16,6 @@ endchoice - - choice - prompt "SECO i.MX6 SoC variant" -- optional - - config SECOMX6Q - bool "i.MX6Q" -diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig -index 2a1cd3c..808de26 100644 ---- a/board/sunxi/Kconfig -+++ b/board/sunxi/Kconfig -@@ -18,7 +18,6 @@ config SUNXI_GEN_SUN6I - - choice - prompt "Sunxi SoC Variant" -- optional - - config MACH_SUN4I - bool "sun4i (Allwinner A10)" --- -2.4.3 - diff --git a/boot/uboot/2016.07/0001-arc-Use-mcpu-XXX-instead-of-obsolete-marcXXX.patch b/boot/uboot/2016.07/0001-arc-Use-mcpu-XXX-instead-of-obsolete-marcXXX.patch deleted file mode 100644 index eded9a31285..00000000000 --- a/boot/uboot/2016.07/0001-arc-Use-mcpu-XXX-instead-of-obsolete-marcXXX.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 7c8d81605302e7d7fdd3e7d8eb69302bddc64a2c Mon Sep 17 00:00:00 2001 -From: Alexey Brodkin -Date: Fri, 16 Sep 2016 12:12:26 +0300 -Subject: [PATCH] arc: Use -mcpu=XXX instead of obsolete -marcXXX - -With newer ARC tools old way of CPU specification gets obsolete, -so we're switching to newer and more common way of setting "-mcpu". - -Signed-off-by: Alexey Brodkin ---- - arch/arc/config.mk | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/arch/arc/config.mk b/arch/arc/config.mk -index 7c974f0..13676bd 100644 ---- a/arch/arc/config.mk -+++ b/arch/arc/config.mk -@@ -31,15 +31,15 @@ CONFIG_MMU = 1 - endif - - ifdef CONFIG_CPU_ARC750D --PLATFORM_CPPFLAGS += -marc700 -+PLATFORM_CPPFLAGS += -mcpu=arc700 - endif - - ifdef CONFIG_CPU_ARC770D --PLATFORM_CPPFLAGS += -marc700 -mlock -mswape -+PLATFORM_CPPFLAGS += -mcpu=arc700 -mlock -mswape - endif - - ifdef CONFIG_CPU_ARCEM6 --PLATFORM_CPPFLAGS += -marcem -+PLATFORM_CPPFLAGS += -mcpu=arcem - endif - - ifdef CONFIG_CPU_ARCHS34 --- -2.7.4 - diff --git a/boot/uboot/2016.09.01/0001-arc-Use-mcpu-XXX-instead-of-obsolete-marcXXX.patch b/boot/uboot/2016.09.01/0001-arc-Use-mcpu-XXX-instead-of-obsolete-marcXXX.patch deleted file mode 100644 index eded9a31285..00000000000 --- a/boot/uboot/2016.09.01/0001-arc-Use-mcpu-XXX-instead-of-obsolete-marcXXX.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 7c8d81605302e7d7fdd3e7d8eb69302bddc64a2c Mon Sep 17 00:00:00 2001 -From: Alexey Brodkin -Date: Fri, 16 Sep 2016 12:12:26 +0300 -Subject: [PATCH] arc: Use -mcpu=XXX instead of obsolete -marcXXX - -With newer ARC tools old way of CPU specification gets obsolete, -so we're switching to newer and more common way of setting "-mcpu". - -Signed-off-by: Alexey Brodkin ---- - arch/arc/config.mk | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/arch/arc/config.mk b/arch/arc/config.mk -index 7c974f0..13676bd 100644 ---- a/arch/arc/config.mk -+++ b/arch/arc/config.mk -@@ -31,15 +31,15 @@ CONFIG_MMU = 1 - endif - - ifdef CONFIG_CPU_ARC750D --PLATFORM_CPPFLAGS += -marc700 -+PLATFORM_CPPFLAGS += -mcpu=arc700 - endif - - ifdef CONFIG_CPU_ARC770D --PLATFORM_CPPFLAGS += -marc700 -mlock -mswape -+PLATFORM_CPPFLAGS += -mcpu=arc700 -mlock -mswape - endif - - ifdef CONFIG_CPU_ARCEM6 --PLATFORM_CPPFLAGS += -marcem -+PLATFORM_CPPFLAGS += -mcpu=arcem - endif - - ifdef CONFIG_CPU_ARCHS34 --- -2.7.4 - diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index 953c36135e4..085397d03d0 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -41,7 +41,7 @@ choice Select the specific U-Boot version you want to use config BR2_TARGET_UBOOT_LATEST_VERSION - bool "2022.01" + bool "2022.04" config BR2_TARGET_UBOOT_CUSTOM_VERSION bool "Custom version" @@ -85,7 +85,7 @@ endif config BR2_TARGET_UBOOT_VERSION string - default "2022.01" if BR2_TARGET_UBOOT_LATEST_VERSION + default "2022.04" 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 @@ -182,6 +182,30 @@ config BR2_TARGET_UBOOT_NEEDS_LZOP the case when the board configuration has CONFIG_SPL_LZO enabled. +config BR2_TARGET_UBOOT_NEEDS_GNUTLS + bool "U-Boot needs gnutls" + help + Select this option if your U-Boot board configuration + requires gnutls to be available on the host. This is + typically the case when the board configuration has + CONFIG_TOOLS_MKEFICAPSULE enabled. + +config BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX + bool "U-Boot needs util-linux" + help + Select this option if your U-Boot board configuration + requires util-linux (-luuid) to be available on the host. + This is typically the case when the board configuration + has CONFIG_TOOLS_MKEFICAPSULE enabled. + +config BR2_TARGET_UBOOT_NEEDS_XXD + bool "U-Boot needs xxd" + help + Select this option if your U-Boot board configuration + requires xxd to be available on the host. This is + typically the case when the board configuration has + CONFIG_USE_DEFAULT_ENV_FILE enabled. + config BR2_TARGET_UBOOT_NEEDS_ATF_BL31 bool "U-Boot needs ATF BL31" depends on BR2_TARGET_ARM_TRUSTED_FIRMWARE @@ -261,7 +285,19 @@ config BR2_TARGET_UBOOT_FORMAT_NAND_BIN bool "u-boot-nand.bin" config BR2_TARGET_UBOOT_FORMAT_ELF + bool "u-boot" + help + Install the u-boot image, which is directly the ELF binary + for the main U-Boot, potentially with debugging symbols. + +config BR2_TARGET_UBOOT_FORMAT_REMAKE_ELF bool "u-boot.elf" + help + Install the u-boot.elf image, which is produced when + CONFIG_REMAKE_ELF=y. It is an ELF image (u-boot.elf) + produced from the raw U-Boot binary (u-boot.bin), which may + already have been statically relocated and may already have + a device-tree appended to it. config BR2_TARGET_UBOOT_FORMAT_IMG bool "u-boot.img" @@ -414,7 +450,6 @@ endif config BR2_TARGET_UBOOT_SPL bool "Install U-Boot SPL binary image" - depends on !BR2_TARGET_XLOADER help Install the U-Boot SPL binary image to the images directory. @@ -457,6 +492,8 @@ config BR2_TARGET_UBOOT_ZYNQMP_PMUFW (e.g. http://...), and it will be downloaded and used from the download directory. + The PMU firmware binary can be either in ELF or BIN format. + If empty, the generated boot.bin will not contain a PMU firmware. diff --git a/boot/uboot/uboot.hash b/boot/uboot/uboot.hash index 9171a794a16..a8bd817900c 100644 --- a/boot/uboot/uboot.hash +++ b/boot/uboot/uboot.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 81b4543227db228c03f8a1bf5ddbc813b0bb8f6555ce46064ef721a6fc680413 u-boot-2022.01.tar.bz2 +sha256 68e065413926778e276ec3abd28bb32fa82abaa4a6898d570c1f48fbdb08bcd0 u-boot-2022.04.tar.bz2 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Licenses/gpl-2.0.txt diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index cb26fc8d3e3..c3e3829362d 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -20,7 +20,7 @@ UBOOT_INSTALL_IMAGES = YES UBOOT_DEPENDENCIES = host-pkgconf $(BR2_MAKE_HOST_DEPENDENCY) UBOOT_MAKE = $(BR2_MAKE) -ifeq ($(UBOOT_VERSION),custom) +ifeq ($(BR2_TARGET_UBOOT_CUSTOM_TARBALL),y) # Handle custom U-Boot tarballs as specified by the configuration UBOOT_TARBALL = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION)) UBOOT_SITE = $(patsubst %/,%,$(dir $(UBOOT_TARBALL))) @@ -60,6 +60,10 @@ UBOOT_MAKE_TARGET += mdbtrick endif endif +ifeq ($(BR2_TARGET_UBOOT_FORMAT_REMAKE_ELF),y) +UBOOT_BINS += u-boot.elf +endif + # Call 'make all' unconditionally UBOOT_MAKE_TARGET += all @@ -205,6 +209,7 @@ endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_DTC),y) UBOOT_DEPENDENCIES += host-dtc +UBOOT_MAKE_OPTS += DTC=$(HOST_DIR)/bin/dtc endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON3),y) @@ -212,7 +217,7 @@ UBOOT_DEPENDENCIES += host-python3 host-python-setuptools endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYLIBFDT),y) -UBOOT_DEPENDENCIES += host-swig +UBOOT_DEPENDENCIES += host-python-pylibfdt endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS),y) @@ -227,6 +232,18 @@ ifeq ($(BR2_TARGET_UBOOT_NEEDS_LZOP),y) UBOOT_DEPENDENCIES += host-lzop endif +ifeq ($(BR2_TARGET_UBOOT_NEEDS_GNUTLS),y) +UBOOT_DEPENDENCIES += host-gnutls +endif + +ifeq ($(BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX),y) +UBOOT_DEPENDENCIES += host-util-linux +endif + +ifeq ($(BR2_TARGET_UBOOT_NEEDS_XXD),y) +UBOOT_DEPENDENCIES += host-vim +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 @@ -383,9 +400,13 @@ UBOOT_ZYNQMP_PMUFW_PATH = $(UBOOT_DL_DIR)/$(notdir $(UBOOT_ZYNQMP_PMUFW)) else ifneq ($(UBOOT_ZYNQMP_PMUFW),) UBOOT_ZYNQMP_PMUFW_PATH = $(shell readlink -f $(UBOOT_ZYNQMP_PMUFW)) endif +UBOOT_ZYNQMP_PMUFW_BASENAME = $(basename $(UBOOT_ZYNQMP_PMUFW_PATH)) define UBOOT_ZYNQMP_KCONFIG_PMUFW - $(call KCONFIG_SET_OPT,CONFIG_PMUFW_INIT_FILE,"$(UBOOT_ZYNQMP_PMUFW_PATH)") + $(if $(filter %.elf,$(UBOOT_ZYNQMP_PMUFW_PATH)), + objcopy -O binary -I elf32-little $(UBOOT_ZYNQMP_PMUFW_BASENAME).elf $(UBOOT_ZYNQMP_PMUFW_BASENAME).bin + $(call KCONFIG_SET_OPT,CONFIG_PMUFW_INIT_FILE,"$(UBOOT_ZYNQMP_PMUFW_BASENAME).bin"), + $(call KCONFIG_SET_OPT,CONFIG_PMUFW_INIT_FILE,"$(UBOOT_ZYNQMP_PMUFW_PATH)")) endef UBOOT_ZYNQMP_PM_CFG = $(call qstrip,$(BR2_TARGET_UBOOT_ZYNQMP_PM_CFG)) diff --git a/configs/aarch64_efi_defconfig b/configs/aarch64_efi_defconfig index 1bd06c51f37..443113e47b9 100644 --- a/configs/aarch64_efi_defconfig +++ b/configs/aarch64_efi_defconfig @@ -1,9 +1,6 @@ # Architecture BR2_aarch64=y -# Toolchain, required for eudev and grub -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y - # System BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y diff --git a/configs/acmesystems_acqua_a5_256mb_defconfig b/configs/acmesystems_acqua_a5_256mb_defconfig index f8129f37809..5a5b9559d6d 100644 --- a/configs/acmesystems_acqua_a5_256mb_defconfig +++ b/configs/acmesystems_acqua_a5_256mb_defconfig @@ -2,13 +2,13 @@ BR2_arm=y BR2_cortex_a5=y BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_SYSTEM_DHCP="eth0" 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="5.4.107" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.90" 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" diff --git a/configs/acmesystems_acqua_a5_512mb_defconfig b/configs/acmesystems_acqua_a5_512mb_defconfig index e399d4a9ffe..bb5bb1964e0 100644 --- a/configs/acmesystems_acqua_a5_512mb_defconfig +++ b/configs/acmesystems_acqua_a5_512mb_defconfig @@ -2,13 +2,13 @@ BR2_arm=y BR2_cortex_a5=y BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_SYSTEM_DHCP="eth0" 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="5.4.107" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.90" 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" diff --git a/configs/amarula_a64_relic_defconfig b/configs/amarula_a64_relic_defconfig deleted file mode 100644 index 304a3ef824f..00000000000 --- a/configs/amarula_a64_relic_defconfig +++ /dev/null @@ -1,63 +0,0 @@ -BR2_aarch64=y -BR2_cortex_a53=y -BR2_ARM_FPU_VFPV4=y - -# Linux headers same as kernel, a 4.17 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_17=y - -# Firmware -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.07" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="amarula_a64_relic" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31=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="spl/sunxi-spl.bin" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,amarula,linux-amarula,v1.0a)/linux-amarula_v1.0a.tar.gz" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-a64-amarula-relic" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_ISSUE="Welcome to Amarula A64-Relic" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_PACKAGE_HOST_ANDROID_TOOLS=y -BR2_PACKAGE_HOST_ANDROID_TOOLS_FASTBOOT=y -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/amarula/a64-relic/genimage.cfg" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/amarula/a64-relic/post-build.sh" -BR2_ROOTFS_OVERLAY="board/amarula/a64-relic/rootfs_overlay" - -# wireless firmware -BR2_PACKAGE_LINUX_FIRMWARE=y -BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XX=y - -# wireless tools -BR2_PACKAGE_IW=y -BR2_PACKAGE_WPA_SUPPLICANT=y -BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y -BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y -BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y diff --git a/configs/amarula_vyasa_rk3288_defconfig b/configs/amarula_vyasa_rk3288_defconfig index ff96019e1ee..79765372254 100644 --- a/configs/amarula_vyasa_rk3288_defconfig +++ b/configs/amarula_vyasa_rk3288_defconfig @@ -3,14 +3,14 @@ BR2_arm=y BR2_cortex_a17=y BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, a 5.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Bootloader 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="2022.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="vyasa-rk3288" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y @@ -23,7 +23,7 @@ BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin tpl/u-boot-tpl.bin" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.2" BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x02000000" diff --git a/configs/andes_ae350_45_defconfig b/configs/andes_ae350_45_defconfig new file mode 100644 index 00000000000..998276635be --- /dev/null +++ b/configs/andes_ae350_45_defconfig @@ -0,0 +1,44 @@ +BR2_riscv=y +BR2_riscv_custom=y +BR2_RISCV_ISA_CUSTOM_RVM=y +BR2_RISCV_ISA_CUSTOM_RVF=y +BR2_RISCV_ISA_CUSTOM_RVD=y +BR2_RISCV_ISA_CUSTOM_RVC=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0=y +BR2_GLOBAL_PATCH_DIR="board/andes/ae350/patches" +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" +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_DEFCONFIG="ae350_ax45mp" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="andes/ae350_ax45mp" +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_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_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_OPENSBI=y +# BR2_TARGET_UBOOT_FORMAT_BIN is not set +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="ARCH_FLAGS=-march=rv64imafdc" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/andes_ae3xx_defconfig b/configs/andes_ae3xx_defconfig deleted file mode 100644 index 52634caa50f..00000000000 --- a/configs/andes_ae3xx_defconfig +++ /dev/null @@ -1,10 +0,0 @@ -BR2_nds32=y -BR2_GLOBAL_PATCH_DIR="board/andes/patches/" -BR2_TOOLCHAIN_EXTERNAL=y -BR2_TOOLCHAIN_EXTERNAL_ANDES_NDS32=y -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/andes/ae3xx/ae3xx.fragment" -BR2_TARGET_ROOTFS_INITRAMFS=y diff --git a/configs/arcturus_ucls1012a_defconfig b/configs/arcturus_ucls1012a_defconfig index fd33ebf1f60..124cc3ff94d 100644 --- a/configs/arcturus_ucls1012a_defconfig +++ b/configs/arcturus_ucls1012a_defconfig @@ -1,22 +1,22 @@ # Architecture BR2_aarch64=y -# Linux headers same as kernel, a 4.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +# Linux headers same as kernel, a 5.4 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y # System settings BR2_TARGET_GENERIC_HOSTNAME="ucls1012a" BR2_TARGET_GENERIC_ISSUE="Welcome to uCLS1012A-SOM" BR2_SYSTEM_DHCP="eth0" -BR2_ROOTFS_OVERLAY="board/arcturus/aarch64-ucls1012a/rootfs_overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="board/arcturus/aarch64-ucls1012a/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/arcturus/aarch64-ucls1012a/post-image.sh" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-kernel,v.20.31)/linux-v.20.31.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-kernel,v.22.06)/linux-v.22.06.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="ucls1012a" +BR2_LINUX_KERNEL_IMAGEGZ=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="arcturus/arc-ucls1012a" @@ -28,7 +28,7 @@ BR2_TARGET_ROOTFS_CPIO_GZIP=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,ArcturusNetworks,uCLS1012A-uboot,v.20.31)/uboot-v.20.31.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,ArcturusNetworks,uCLS1012A-uboot,v.22.06)/uboot-v.22.06.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="UCLS1012A_QSPI128" # Tools diff --git a/configs/arm_foundationv8_defconfig b/configs/arm_foundationv8_defconfig index 363f288b876..3c63f5dc76a 100644 --- a/configs/arm_foundationv8_defconfig +++ b/configs/arm_foundationv8_defconfig @@ -1,10 +1,10 @@ BR2_aarch64=y -# Linux headers same as kernel, a 5.9 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_9=y +# Linux headers same as kernel, a 5.16 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.9.11" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16.20" 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" diff --git a/configs/arm_juno_defconfig b/configs/arm_juno_defconfig deleted file mode 100644 index 58329867795..00000000000 --- a/configs/arm_juno_defconfig +++ /dev/null @@ -1,23 +0,0 @@ -BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_6=y -BR2_TARGET_GENERIC_HOSTNAME="juno-buildroot" -BR2_TARGET_GENERIC_ISSUE="Welcome to SNPS Juno by Buildroot" -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.6" -BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/arm/juno/linux-juno-defconfig" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="arm/juno arm/juno-r1 arm/juno-r2" -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.4" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="juno" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BOARDNAME="vexpress_aemv8a_juno" -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.03" -BR2_TARGET_VEXPRESS_FIRMWARE=y diff --git a/configs/aspeed_ast2500evb_defconfig b/configs/aspeed_ast2500evb_defconfig new file mode 100644 index 00000000000..8db5a39a135 --- /dev/null +++ b/configs/aspeed_ast2500evb_defconfig @@ -0,0 +1,44 @@ +# Architecture +BR2_arm=y + +# System +BR2_TARGET_GENERIC_HOSTNAME="aspeed-evb" +BR2_TARGET_GENERIC_ISSUE="Aspeed EVB" +BR2_SYSTEM_DHCP="eth0" + +# Filesystem +BR2_TARGET_ROOTFS_CPIO=y +BR2_TARGET_ROOTFS_CPIO_XZ=y + +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/aspeed/common/post-image.sh" + +# Linux headers same as kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" +BR2_LINUX_KERNEL_DEFCONFIG="aspeed_g5" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/aspeed/ast2500-evb/linux.fragment" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="aspeed-ast2500-evb" +BR2_LINUX_KERNEL_XZ=y + +# Boot +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_BOARD_DEFCONFIG="evb-ast2500" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=ast2500-evb" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/aspeed/ast2500-evb/uboot.fragment" +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y +BR2_PACKAGE_HOST_GENIMAGE=y + +# Target tools +BR2_PACKAGE_MTD=y diff --git a/configs/aspeed_ast2600evb_defconfig b/configs/aspeed_ast2600evb_defconfig new file mode 100644 index 00000000000..04239566c83 --- /dev/null +++ b/configs/aspeed_ast2600evb_defconfig @@ -0,0 +1,44 @@ +# Architecture +BR2_arm=y +BR2_cortex_a7=y +BR2_ARM_FPU_VFPV4D16=y + +# System +BR2_TARGET_GENERIC_HOSTNAME="aspeed-evb" +BR2_TARGET_GENERIC_ISSUE="Aspeed EVB" +BR2_SYSTEM_DHCP="eth0" + +# Filesystem +BR2_TARGET_ROOTFS_CPIO=y +BR2_TARGET_ROOTFS_CPIO_XZ=y + +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/aspeed/common/post-image.sh" + +# Linux headers same as kernel +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" +BR2_LINUX_KERNEL_DEFCONFIG="aspeed_g5" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="aspeed-ast2600-evb" + +# Boot +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_BOARD_DEFCONFIG="evb-ast2600" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=ast2600a1-evb" + +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y +BR2_PACKAGE_HOST_GENIMAGE=y + +# Target tools +BR2_PACKAGE_MTD=y diff --git a/configs/asus_tinker_rk3288_defconfig b/configs/asus_tinker_rk3288_defconfig index 6963fa939ff..40f4125880e 100644 --- a/configs/asus_tinker_rk3288_defconfig +++ b/configs/asus_tinker_rk3288_defconfig @@ -3,28 +3,27 @@ BR2_arm=y BR2_cortex_a17=y BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, a 5.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Bootloader 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="2022.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="tinker-rk3288" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y -BR2_TARGET_UBOOT_FORMAT_DTB_BIN=y BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin" +BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin tpl/u-boot-tpl.bin" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.2" BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x02000000" diff --git a/configs/at91sam9x5ek_dev_defconfig b/configs/at91sam9x5ek_dev_defconfig index bfa8e95941c..824aa8b1f7f 100644 --- a/configs/at91sam9x5ek_dev_defconfig +++ b/configs/at91sam9x5ek_dev_defconfig @@ -5,10 +5,6 @@ BR2_arm926t=y # Toolchain BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Needed for some packages -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y -# Needed for gdb -BR2_PTHREAD_DEBUG=y -# Needed for some packages BR2_TOOLCHAIN_BUILDROOT_CXX=y # System Configuration @@ -47,6 +43,7 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y +BR2_PACKAGE_WILC3000_FIRMWARE=y BR2_PACKAGE_EVTEST=y BR2_PACKAGE_I2C_TOOLS=y BR2_PACKAGE_SETSERIAL=y diff --git a/configs/at91sam9x5ek_mmc_dev_defconfig b/configs/at91sam9x5ek_mmc_dev_defconfig index 2e1a5c7f595..3b2016b9704 100644 --- a/configs/at91sam9x5ek_mmc_dev_defconfig +++ b/configs/at91sam9x5ek_mmc_dev_defconfig @@ -5,10 +5,6 @@ BR2_arm926t=y # Toolchain BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y # Needed for some packages -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y -# Needed for gdb -BR2_PTHREAD_DEBUG=y -# Needed for some packages BR2_TOOLCHAIN_BUILDROOT_CXX=y # System Configuration @@ -50,6 +46,7 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y +BR2_PACKAGE_WILC3000_FIRMWARE=y BR2_PACKAGE_EVTEST=y BR2_PACKAGE_I2C_TOOLS=y BR2_PACKAGE_SETSERIAL=y diff --git a/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig b/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig index ba2fa46790d..85ff29771a8 100644 --- a/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig +++ b/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig @@ -4,8 +4,6 @@ BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y -BR2_PTHREAD_DEBUG=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" @@ -39,6 +37,7 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y +BR2_PACKAGE_WILC3000_FIRMWARE=y BR2_PACKAGE_EVTEST=y BR2_PACKAGE_I2C_TOOLS=y BR2_PACKAGE_RNG_TOOLS=y diff --git a/configs/atmel_sama5d2_xplained_mmc_dev_defconfig b/configs/atmel_sama5d2_xplained_mmc_dev_defconfig index a8b68ca0a2d..4ee7fca35f9 100644 --- a/configs/atmel_sama5d2_xplained_mmc_dev_defconfig +++ b/configs/atmel_sama5d2_xplained_mmc_dev_defconfig @@ -8,10 +8,6 @@ BR2_ARM_INSTRUCTIONS_THUMB2=y # Toolchain BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Needed for some packages -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y -# Needed for gdb -BR2_PTHREAD_DEBUG=y -# Needed for some packages BR2_TOOLCHAIN_BUILDROOT_CXX=y # System Configuration @@ -53,6 +49,7 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y +BR2_PACKAGE_WILC3000_FIRMWARE=y BR2_PACKAGE_EVTEST=y BR2_PACKAGE_I2C_TOOLS=y BR2_PACKAGE_SETSERIAL=y diff --git a/configs/atmel_sama5d3_xplained_dev_defconfig b/configs/atmel_sama5d3_xplained_dev_defconfig index cdfd9de17e6..ef09df3fce8 100644 --- a/configs/atmel_sama5d3_xplained_dev_defconfig +++ b/configs/atmel_sama5d3_xplained_dev_defconfig @@ -7,10 +7,6 @@ BR2_ARM_INSTRUCTIONS_THUMB2=y # Toolchain BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Needed for some packages -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y -# Needed for gdb -BR2_PTHREAD_DEBUG=y -# Needed for some packages BR2_TOOLCHAIN_BUILDROOT_CXX=y # System Configuration @@ -49,6 +45,7 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y +BR2_PACKAGE_WILC3000_FIRMWARE=y BR2_PACKAGE_EVTEST=y BR2_PACKAGE_I2C_TOOLS=y BR2_PACKAGE_SETSERIAL=y diff --git a/configs/atmel_sama5d3_xplained_mmc_dev_defconfig b/configs/atmel_sama5d3_xplained_mmc_dev_defconfig index a2205aeefa6..f5aa3e382fe 100644 --- a/configs/atmel_sama5d3_xplained_mmc_dev_defconfig +++ b/configs/atmel_sama5d3_xplained_mmc_dev_defconfig @@ -7,10 +7,6 @@ BR2_ARM_INSTRUCTIONS_THUMB2=y # Toolchain BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Needed for some packages -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y -# Needed for gdb -BR2_PTHREAD_DEBUG=y -# Needed for some packages BR2_TOOLCHAIN_BUILDROOT_CXX=y # System Configuration @@ -52,6 +48,7 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y +BR2_PACKAGE_WILC3000_FIRMWARE=y BR2_PACKAGE_EVTEST=y BR2_PACKAGE_I2C_TOOLS=y BR2_PACKAGE_SETSERIAL=y diff --git a/configs/atmel_sama5d4_xplained_dev_defconfig b/configs/atmel_sama5d4_xplained_dev_defconfig index f8783f56524..ca51ef5b5f5 100644 --- a/configs/atmel_sama5d4_xplained_dev_defconfig +++ b/configs/atmel_sama5d4_xplained_dev_defconfig @@ -8,10 +8,6 @@ BR2_ARM_INSTRUCTIONS_THUMB2=y # Toolchain BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Needed for some packages -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y -# Needed for gdb -BR2_PTHREAD_DEBUG=y -# Needed for some packages BR2_TOOLCHAIN_BUILDROOT_CXX=y # System Configuration @@ -50,6 +46,7 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y +BR2_PACKAGE_WILC3000_FIRMWARE=y BR2_PACKAGE_EVTEST=y BR2_PACKAGE_I2C_TOOLS=y BR2_PACKAGE_SETSERIAL=y diff --git a/configs/atmel_sama5d4_xplained_mmc_dev_defconfig b/configs/atmel_sama5d4_xplained_mmc_dev_defconfig index b4e99f658a0..e8d126c7b0e 100644 --- a/configs/atmel_sama5d4_xplained_mmc_dev_defconfig +++ b/configs/atmel_sama5d4_xplained_mmc_dev_defconfig @@ -8,10 +8,6 @@ BR2_ARM_INSTRUCTIONS_THUMB2=y # Toolchain BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # Needed for some packages -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y -# Needed for gdb -BR2_PTHREAD_DEBUG=y -# Needed for some packages BR2_TOOLCHAIN_BUILDROOT_CXX=y # System Configuration @@ -53,6 +49,7 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y +BR2_PACKAGE_WILC3000_FIRMWARE=y BR2_PACKAGE_EVTEST=y BR2_PACKAGE_I2C_TOOLS=y BR2_PACKAGE_SETSERIAL=y diff --git a/configs/bananapi_m1_defconfig b/configs/bananapi_m1_defconfig deleted file mode 100644 index 2d948ec223c..00000000000 --- a/configs/bananapi_m1_defconfig +++ /dev/null @@ -1,30 +0,0 @@ -BR2_arm=y -BR2_cortex_a7=y -BR2_ARM_FPU_NEON_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_18=y -BR2_TARGET_GENERIC_ISSUE="Welcome to Bananapi M1" -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/bananapi/bananapi-m1/genimage.cfg" -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.18.12" -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-bananapi" -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="2018.07" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Bananapi" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/bananapi/bananapi-m1/boot.cmd" -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/bananapi_m1_plus_defconfig b/configs/bananapi_m1_plus_defconfig deleted file mode 100644 index 271124f79a2..00000000000 --- a/configs/bananapi_m1_plus_defconfig +++ /dev/null @@ -1,45 +0,0 @@ -BR2_arm=y -BR2_cortex_a7=y -BR2_ARM_FPU_NEON_VFPV4=y -BR2_GLOBAL_PATCH_DIR="board/sinovoip/m1-plus/patches" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y -BR2_TARGET_GENERIC_HOSTNAME="bananapi" -BR2_TARGET_GENERIC_ISSUE="Welcome to Banana Pi!" -BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" -BR2_ROOTFS_OVERLAY="board/sinovoip/m1-plus/rootfs_overlay" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/sinovoip/m1-plus/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/sinovoip/m1-plus/genimage.cfg" -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.3" -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/sinovoip/m1-plus/linux-wifi.fragment" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-bananapi-m1-plus" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y -BR2_PACKAGE_LINUX_FIRMWARE=y -BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX=y -BR2_PACKAGE_IW=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_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="2019.10" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="bananapi_m1_plus" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=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/sinovoip/m1-plus/boot.cmd" diff --git a/configs/bananapi_m2_plus_defconfig b/configs/bananapi_m2_plus_defconfig deleted file mode 100644 index 77a403ce811..00000000000 --- a/configs/bananapi_m2_plus_defconfig +++ /dev/null @@ -1,30 +0,0 @@ -BR2_arm=y -BR2_cortex_a7=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y -BR2_TARGET_GENERIC_ISSUE="Welcome to Bananapi M2 Plus" -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/sinovoip/m2-plus/genimage.cfg" -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-bananapi-m2-plus" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=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="2019.01" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Sinovoip_BPI_M2_Plus" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/sinovoip/m2-plus/boot.cmd" -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/bananapi_m64_defconfig b/configs/bananapi_m64_defconfig deleted file mode 100644 index b93332ed21e..00000000000 --- a/configs/bananapi_m64_defconfig +++ /dev/null @@ -1,50 +0,0 @@ -BR2_aarch64=y -BR2_cortex_a53=y -BR2_ARM_FPU_VFPV4=y - -# Linux headers same as kernel, a 5.0 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y - -# Firmware -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="bananapi_m64" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31=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="spl/sunxi-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/bananapi/bananapi-m64/boot.cmd" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-a64-bananapi-m64" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_ISSUE="Welcome to Bananapi M64" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/bananapi/bananapi-m64/genimage.cfg" diff --git a/configs/bananapro_defconfig b/configs/bananapro_defconfig index e87d9ba6336..dbebdf3e371 100644 --- a/configs/bananapro_defconfig +++ b/configs/bananapro_defconfig @@ -8,9 +8,6 @@ BR2_ARM_FPU_NEON_VFPV4=y # Linux headers same as kernel, a 5.4 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y -# Toolchain -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y - # System configuration BR2_TARGET_GENERIC_HOSTNAME="bananapro" BR2_TARGET_GENERIC_ISSUE="Welcome to Banana Pro!" @@ -41,10 +38,11 @@ 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="2019.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Bananapro" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_BIN=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig index 06154d98b73..d0aa5ad8603 100644 --- a/configs/beaglebone_defconfig +++ b/configs/beaglebone_defconfig @@ -20,10 +20,10 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beaglebone/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,5.10.30-ti-r3)/linux-5.10.30-ti-r3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,5.10.162-ti-r56)/linux-5.10.162-ti-r56.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk am335x-boneblue am335x-boneblack-wireless" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk am335x-boneblue am335x-boneblack-wireless am335x-bonegreen-wireless" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y # Filesystem @@ -34,7 +34,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="2021.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am335x_evm" BR2_TARGET_UBOOT_NEEDS_DTC=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set diff --git a/configs/beaglebone_qt5_defconfig b/configs/beaglebone_qt5_defconfig index ff03a05a8eb..0038acfcfdb 100644 --- a/configs/beaglebone_qt5_defconfig +++ b/configs/beaglebone_qt5_defconfig @@ -15,7 +15,7 @@ BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,4.19.7 BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/beaglebone/linux-sgx.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk am335x-boneblue am335x-boneblack-wireless" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk am335x-boneblue am335x-boneblack-wireless am335x-bonegreen-wireless" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_FBV=y BR2_PACKAGE_QT5=y diff --git a/configs/broadcom_northstar_defconfig b/configs/broadcom_northstar_defconfig new file mode 100644 index 00000000000..1008de168f3 --- /dev/null +++ b/configs/broadcom_northstar_defconfig @@ -0,0 +1,14 @@ +BR2_arm=y +BR2_cortex_a9=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/broadcom/northstar/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/broadcom/northstar/linux.config" +BR2_LINUX_KERNEL_APPENDED_ZIMAGE=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm4708-smartrg-sr400ac bcm47094-luxul-xwr-3150-v1" +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ROOTFS_UBI=y +BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048 +BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f000 +BR2_PACKAGE_HOST_FIRMWARE_UTILS=y +BR2_PACKAGE_HOST_LZMA_ALONE=y diff --git a/configs/canaan_kd233_defconfig b/configs/canaan_kd233_defconfig new file mode 100644 index 00000000000..77b8abf531b --- /dev/null +++ b/configs/canaan_kd233_defconfig @@ -0,0 +1,39 @@ +# Architecture +BR2_riscv=y +BR2_RISCV_64=y +BR2_riscv_custom=y +BR2_RISCV_ISA_CUSTOM_RVM=y +BR2_RISCV_ISA_CUSTOM_RVA=y +BR2_RISCV_ISA_CUSTOM_RVF=y +BR2_RISCV_ISA_CUSTOM_RVD=y +BR2_RISCV_ISA_CUSTOM_RVC=y +# BR2_RISCV_USE_MMU is not set +BR2_RISCV_ABI_LP64D=y + +# Linux headers same as kernel, a 5.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19=y + +# Binary format +BR2_BINFMT_FLAT=y +BR2_BINFMT_FLAT_ONE=y +# BR2_TARGET_ENABLE_ROOT_LOGIN is not set + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +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" + +# Packages +BR2_PACKAGE_HOST_PYTHON_KFLASH=y +BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" +BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/busybox-tiny.config" +# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set + +# Filesystem +BR2_INIT_NONE=y +BR2_TARGET_ROOTFS_INITRAMFS=y +BR2_ROOTFS_OVERLAY="board/canaan/k210-soc/rootfs_overlay" diff --git a/configs/ci20_defconfig b/configs/ci20_defconfig index 09eddc4e68a..7e119376e15 100644 --- a/configs/ci20_defconfig +++ b/configs/ci20_defconfig @@ -15,7 +15,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ci20/genimage.cfg" # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.254" BR2_LINUX_KERNEL_DEFCONFIG="ci20" BR2_LINUX_KERNEL_INSTALL_TARGET=y diff --git a/configs/csky_gx6605s_defconfig b/configs/csky_gx6605s_defconfig deleted file mode 100644 index f1f9579dca3..00000000000 --- a/configs/csky_gx6605s_defconfig +++ /dev/null @@ -1,19 +0,0 @@ -# Architecture -BR2_csky=y -BR2_ck610=y - -# System -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" - -# Linux headers same as kernel, a 5.0 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0.12" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/csky/linux-ck610.config.fragment" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/csky/gx6605s/gx6605s.dts" diff --git a/configs/engicam_imx6qdl_icore_qt5_defconfig b/configs/engicam_imx6qdl_icore_qt5_defconfig index 2d213e4ab98..6d3a344bdd5 100644 --- a/configs/engicam_imx6qdl_icore_qt5_defconfig +++ b/configs/engicam_imx6qdl_icore_qt5_defconfig @@ -47,7 +47,6 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/engicam/icorem6/genimage.cfg" BR2_ROOTFS_OVERLAY="board/engicam/icorem6/rootfs_overlay" # qt5 dependencies -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y BR2_TOOLCHAIN_BUILDROOT_CXX=y # qt5 diff --git a/configs/freescale_imx6dlsabreauto_defconfig b/configs/freescale_imx6dlsabreauto_defconfig index 8fe10f6275a..4081fa74a2d 100644 --- a/configs/freescale_imx6dlsabreauto_defconfig +++ b/configs/freescale_imx6dlsabreauto_defconfig @@ -16,9 +16,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" # kernel BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-1.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-sabreauto" @@ -38,7 +37,6 @@ BR2_PACKAGE_HOST_MTOOLS=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6dlsabreauto" BR2_TARGET_UBOOT_FORMAT_IMX=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_UBOOT_NEEDS_DTC=y diff --git a/configs/freescale_imx6dlsabresd_defconfig b/configs/freescale_imx6dlsabresd_defconfig index 74debbfd460..976c180d6c5 100644 --- a/configs/freescale_imx6dlsabresd_defconfig +++ b/configs/freescale_imx6dlsabresd_defconfig @@ -16,9 +16,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" # kernel BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-1.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-sabresd" @@ -37,7 +36,6 @@ BR2_PACKAGE_HOST_MTOOLS=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6dlsabresd" BR2_TARGET_UBOOT_FORMAT_IMX=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_UBOOT_NEEDS_DTC=y diff --git a/configs/freescale_imx6qsabreauto_defconfig b/configs/freescale_imx6qsabreauto_defconfig index 58b4a5f92d1..72696ab1ad6 100644 --- a/configs/freescale_imx6qsabreauto_defconfig +++ b/configs/freescale_imx6qsabreauto_defconfig @@ -16,9 +16,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" # kernel BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-1.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabreauto" @@ -38,7 +37,6 @@ BR2_PACKAGE_HOST_MTOOLS=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6qsabreauto" BR2_TARGET_UBOOT_FORMAT_IMX=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_UBOOT_NEEDS_DTC=y diff --git a/configs/freescale_imx6qsabresd_defconfig b/configs/freescale_imx6qsabresd_defconfig index f2ac993da0e..dddfaf5228d 100644 --- a/configs/freescale_imx6qsabresd_defconfig +++ b/configs/freescale_imx6qsabresd_defconfig @@ -16,9 +16,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" # kernel BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-1.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd" @@ -38,7 +37,6 @@ BR2_PACKAGE_HOST_MTOOLS=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6qsabresd" BR2_TARGET_UBOOT_FORMAT_IMX=y -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_UBOOT_NEEDS_DTC=y diff --git a/configs/freescale_imx6sxsabresd_defconfig b/configs/freescale_imx6sxsabresd_defconfig index 9f48ef2da5f..0c585c97f0e 100644 --- a/configs/freescale_imx6sxsabresd_defconfig +++ b/configs/freescale_imx6sxsabresd_defconfig @@ -16,9 +16,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" # kernel BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-1.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6sx-sdb" @@ -36,8 +35,7 @@ BR2_PACKAGE_HOST_MTOOLS=y # bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6sxsabresd" -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_NEEDS_DTC=y diff --git a/configs/freescale_imx6ullevk_defconfig b/configs/freescale_imx6ullevk_defconfig index 4c5c3b25246..7a8965be18e 100644 --- a/configs/freescale_imx6ullevk_defconfig +++ b/configs/freescale_imx6ullevk_defconfig @@ -4,9 +4,8 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=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_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-1.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ull-14x14-evk" @@ -15,9 +14,8 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6ull_14x14_evk" -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_PACKAGE_HOST_DOSFSTOOLS=y diff --git a/configs/freescale_imx7dsabresd_defconfig b/configs/freescale_imx7dsabresd_defconfig index 5a9cff488d1..d3378658318 100644 --- a/configs/freescale_imx7dsabresd_defconfig +++ b/configs/freescale_imx7dsabresd_defconfig @@ -10,9 +10,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" # Kernel BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-1.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7d-sdb" @@ -25,9 +24,8 @@ BR2_TARGET_ROOTFS_EXT2_4=y # bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx7dsabresd" -BR2_TARGET_UBOOT_CUSTOM_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_TARGET_UBOOT_NEEDS_DTC=y diff --git a/configs/freescale_imx8mmevk_defconfig b/configs/freescale_imx8mmevk_defconfig index ae82f291587..dcb4b42540c 100644 --- a/configs/freescale_imx8mmevk_defconfig +++ b/configs/freescale_imx8mmevk_defconfig @@ -5,9 +5,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" 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/imx8mm-evk.dtb" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-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" @@ -19,16 +18,14 @@ 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_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-5.10.y-1.0.0)/imx-atf-lf-5.10.y-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_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mm_evk" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y diff --git a/configs/freescale_imx8mnevk_defconfig b/configs/freescale_imx8mnevk_defconfig index b24eb1566b9..0653978d916 100644 --- a/configs/freescale_imx8mnevk_defconfig +++ b/configs/freescale_imx8mnevk_defconfig @@ -5,9 +5,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" 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/imx8mn-ddr4-evk.dtb" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-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" @@ -20,16 +19,14 @@ 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_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-5.10.y-1.0.0)/imx-atf-lf-5.10.y-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_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mn_ddr4_evk" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y diff --git a/configs/freescale_imx8mpevk_defconfig b/configs/freescale_imx8mpevk_defconfig index 8d0e6e0f3ed..5a72406b675 100644 --- a/configs/freescale_imx8mpevk_defconfig +++ b/configs/freescale_imx8mpevk_defconfig @@ -5,9 +5,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" 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/imx8mp-evk.dtb" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-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" @@ -19,16 +18,14 @@ 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_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-5.10.y-1.0.0)/imx-atf-lf-5.10.y-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_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mp_evk" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y diff --git a/configs/freescale_imx8mqevk_defconfig b/configs/freescale_imx8mqevk_defconfig index 7f5dd87b5fa..e3f88dc44c9 100644 --- a/configs/freescale_imx8mqevk_defconfig +++ b/configs/freescale_imx8mqevk_defconfig @@ -5,9 +5,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" 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/imx8mq-evk.dtb" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-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" @@ -19,16 +18,14 @@ 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_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-5.10.y-1.0.0)/imx-atf-lf-5.10.y-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_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mq_evk" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y diff --git a/configs/freescale_imx8qmmek_defconfig b/configs/freescale_imx8qmmek_defconfig index 8a0e866cee4..75777646dfb 100644 --- a/configs/freescale_imx8qmmek_defconfig +++ b/configs/freescale_imx8qmmek_defconfig @@ -4,9 +4,8 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=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_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-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" @@ -20,16 +19,14 @@ 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_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-5.10.y-1.0.0)/imx-atf-lf-5.10.y-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_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8qm_mek" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_PACKAGE_HOST_DOSFSTOOLS=y diff --git a/configs/freescale_imx8qxpmek_defconfig b/configs/freescale_imx8qxpmek_defconfig index 1ffbd123e08..ce8f6b7c84f 100644 --- a/configs/freescale_imx8qxpmek_defconfig +++ b/configs/freescale_imx8qxpmek_defconfig @@ -6,9 +6,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyLP0" 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-imx8qxp-mek.dtb" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-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" @@ -22,16 +21,14 @@ 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_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-5.10.y-1.0.0)/imx-atf-lf-5.10.y-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_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="lf-5.10.y-1.0.0" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8qxp_mek" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_PACKAGE_HOST_DOSFSTOOLS=y diff --git a/configs/friendlyarm_nanopc_t4_defconfig b/configs/friendlyarm_nanopc_t4_defconfig deleted file mode 100644 index 2f7c53904e5..00000000000 --- a/configs/friendlyarm_nanopc_t4_defconfig +++ /dev/null @@ -1,53 +0,0 @@ -# Architecture -BR2_aarch64=y -BR2_cortex_a72_a53=y - -# Linux headers same as kernel, a 5.8 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y - -# Firmware -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="11a0a46a899fcc3b1fdb214b382f3d7495d88eca" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3399" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="" - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.07" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopc-t4-rk3399" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=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" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.2" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3399-nanopc-t4" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_HOSTNAME="nanopc-t4" -BR2_TARGET_GENERIC_ISSUE="Welcome to NanoPC-T4" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopc-t4/genimage.cfg" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopc-t4/post-build.sh" diff --git a/configs/friendlyarm_nanopi_a64_defconfig b/configs/friendlyarm_nanopi_a64_defconfig deleted file mode 100644 index 4df22b2a2f7..00000000000 --- a/configs/friendlyarm_nanopi_a64_defconfig +++ /dev/null @@ -1,50 +0,0 @@ -BR2_aarch64=y -BR2_cortex_a53=y -BR2_ARM_FPU_VFPV4=y - -# Linux headers same as kernel, a 5.0 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y - -# Firmware -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_a64" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31=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="spl/sunxi-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/friendlyarm/nanopi-a64/boot.cmd" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-a64-nanopi-a64" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_ISSUE="Welcome to FriendlyARM Nanopi A64" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-a64/genimage.cfg" diff --git a/configs/friendlyarm_nanopi_m1_defconfig b/configs/friendlyarm_nanopi_m1_defconfig deleted file mode 100644 index 18cfcb261e0..00000000000 --- a/configs/friendlyarm_nanopi_m1_defconfig +++ /dev/null @@ -1,45 +0,0 @@ -# Architecture -BR2_arm=y -BR2_cortex_a7=y -BR2_ARM_FPU_VFPV4=y - -# Linux headers same as kernel, a 5.0 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y - -# System configuration -BR2_TARGET_GENERIC_HOSTNAME="nanopi-m1" -BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the NanoPi M1" - -# Bootloaders -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_m1" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/friendlyarm/nanopi-m1/boot.cmd" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-nanopi-m1" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-m1/genimage.cfg" -# BR2_TARGET_ROOTFS_TAR is not set - -# Additional tools -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/friendlyarm_nanopi_m1_plus_defconfig b/configs/friendlyarm_nanopi_m1_plus_defconfig deleted file mode 100644 index 06adc54b155..00000000000 --- a/configs/friendlyarm_nanopi_m1_plus_defconfig +++ /dev/null @@ -1,45 +0,0 @@ -# Architecture -BR2_arm=y -BR2_cortex_a7=y -BR2_ARM_FPU_VFPV4=y - -# Linux headers same as kernel, a 5.0 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y - -# System configuration -BR2_TARGET_GENERIC_HOSTNAME="nanopi-m1-plus" -BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the NanoPi M1 Plus" - -# Bootloaders -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_m1_plus" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/friendlyarm/nanopi-m1-plus/boot.cmd" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-nanopi-m1-plus" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-m1-plus/genimage.cfg" -# BR2_TARGET_ROOTFS_TAR is not set - -# Additional tools -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/friendlyarm_nanopi_m4_defconfig b/configs/friendlyarm_nanopi_m4_defconfig deleted file mode 100644 index 9c3f58f200e..00000000000 --- a/configs/friendlyarm_nanopi_m4_defconfig +++ /dev/null @@ -1,53 +0,0 @@ -# Architecture -BR2_aarch64=y -BR2_cortex_a72_a53=y - -# Linux headers same as kernel, a 5.8 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y - -# Firmware -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="11a0a46a899fcc3b1fdb214b382f3d7495d88eca" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3399" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="" - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.07" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi-m4-rk3399" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=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" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.2" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3399-nanopi-m4" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_HOSTNAME="nanopi-m4" -BR2_TARGET_GENERIC_ISSUE="Welcome to NANOPI-M4" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-m4/genimage.cfg" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-m4/post-build.sh" diff --git a/configs/friendlyarm_nanopi_neo2_defconfig b/configs/friendlyarm_nanopi_neo2_defconfig deleted file mode 100644 index 9262737b880..00000000000 --- a/configs/friendlyarm_nanopi_neo2_defconfig +++ /dev/null @@ -1,50 +0,0 @@ -BR2_aarch64=y -BR2_cortex_a53=y -BR2_ARM_FPU_VFPV4=y - -# Linux headers same as kernel, a 5.0 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y - -# Firmware -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f" -R2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_neo2" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31=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="spl/sunxi-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/friendlyarm/nanopi-neo2/boot.cmd" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-nanopi-neo2" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_ISSUE="Welcome to FriendlyARM Nanopi NEO2" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-neo2/genimage.cfg" diff --git a/configs/friendlyarm_nanopi_neo4_defconfig b/configs/friendlyarm_nanopi_neo4_defconfig deleted file mode 100644 index a11872ef2a3..00000000000 --- a/configs/friendlyarm_nanopi_neo4_defconfig +++ /dev/null @@ -1,55 +0,0 @@ -# Architecture -BR2_aarch64=y -BR2_cortex_a72_a53=y - -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y - -# Firmware -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="11a0a46a899fcc3b1fdb214b382f3d7495d88eca" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3399" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="" - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi-neo4-rk3399" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=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" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.18" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3399-nanopi-neo4" -BR2_LINUX_KERNEL_INSTALL_TARGET=y -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_HOSTNAME="NanoPi Neo4" -BR2_TARGET_GENERIC_ISSUE="Welcome to NanoPi Neo4!" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="70M" -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-neo4/genimage.cfg" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-neo4/post-build.sh" diff --git a/configs/friendlyarm_nanopi_neo_defconfig b/configs/friendlyarm_nanopi_neo_defconfig deleted file mode 100644 index 1519d828d68..00000000000 --- a/configs/friendlyarm_nanopi_neo_defconfig +++ /dev/null @@ -1,43 +0,0 @@ -BR2_arm=y -BR2_cortex_a7=y -BR2_ARM_FPU_VFPV4=y - -BR2_TARGET_GENERIC_HOSTNAME="nanopi-neo" -BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the NanoPi NEO" - -# Linux headers same as kernel, a 5.3 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y - -# Use a -rc kernel to get the DTS -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.3.13" -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-nanopi-neo" - -# Use an -rc tag because the defconfig is very recent -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_neo" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/friendlyarm/nanopi-neo/boot.cmd" - -# Build an sdcard image -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-neo/genimage.cfg" -# BR2_TARGET_ROOTFS_TAR is not set - -# Additional tools -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/friendlyarm_nanopi_neo_plus2_defconfig b/configs/friendlyarm_nanopi_neo_plus2_defconfig deleted file mode 100644 index 461e468cb63..00000000000 --- a/configs/friendlyarm_nanopi_neo_plus2_defconfig +++ /dev/null @@ -1,62 +0,0 @@ -BR2_aarch64=y -BR2_cortex_a53=y -BR2_ARM_FPU_VFPV4=y - -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y -BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y -BR2_ROOTFS_OVERLAY="board/friendlyarm/nanopi-neo-plus2/rootfs_overlay" - -# Firmware -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f" -R2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_neo_plus2" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31=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="spl/sunxi-spl.bin" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.3.4" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-nanopi-neo-plus2" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/friendlyarm/nanopi-neo-plus2/linux-extras.config" - -# Filesystem -BR2_TARGET_GENERIC_ISSUE="Welcome to FriendlyARM Nanopi NEO Plus2" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-neo-plus2/genimage.cfg" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-neo-plus2/post-build.sh" - -# wireless firmware -BR2_PACKAGE_LINUX_FIRMWARE=y -BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX=y - -# wireless tools -BR2_PACKAGE_IW=y -BR2_PACKAGE_WIRELESS_TOOLS=y -BR2_PACKAGE_WIRELESS_TOOLS_LIB=y -BR2_PACKAGE_WPA_SUPPLICANT=y -BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y -BR2_PACKAGE_WPA_SUPPLICANT_CLI=y diff --git a/configs/friendlyarm_nanopi_r1_defconfig b/configs/friendlyarm_nanopi_r1_defconfig deleted file mode 100644 index 8b03f6dd00c..00000000000 --- a/configs/friendlyarm_nanopi_r1_defconfig +++ /dev/null @@ -1,49 +0,0 @@ -# Architecture -BR2_arm=y -BR2_cortex_a7=y -BR2_ARM_FPU_VFPV4=y - -# Linux headers same as kernel, a 5.0 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y - -# System configuration -BR2_TARGET_GENERIC_HOSTNAME="nanopi-r1" -BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the NanoPi R1" - -# Bootloaders -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_CUSTOM_DTS_PATH="board/friendlyarm/nanopi-r1/uboot/sun8i-h3-nanopi-r1.dts" -BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" -BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y -BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="board/friendlyarm/nanopi-r1/uboot/nanopi_r1_defconfig" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/friendlyarm/nanopi-r1/boot.cmd" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/friendlyarm/nanopi-r1/kernel/linux-extras.config" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/friendlyarm/nanopi-r1/kernel/sun8i-h3-nanopi-r1.dts" -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-nanopi-r1" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-r1/genimage.cfg" -# BR2_TARGET_ROOTFS_TAR is not set - -# Additional tools -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/friendlyarm_nanopi_r2s_defconfig b/configs/friendlyarm_nanopi_r2s_defconfig index ce252a5d76c..284b28ec317 100644 --- a/configs/friendlyarm_nanopi_r2s_defconfig +++ b/configs/friendlyarm_nanopi_r2s_defconfig @@ -1,6 +1,7 @@ BR2_aarch64=y BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=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" diff --git a/configs/galileo_defconfig b/configs/galileo_defconfig index a8fd0a6dcc1..29110677bb2 100644 --- a/configs/galileo_defconfig +++ b/configs/galileo_defconfig @@ -1,7 +1,5 @@ BR2_x86_x1000=y -BR2_GLOBAL_PATCH_DIR=board/intel/galileo/patches -# Needed for TARGET_GRUB2 -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y +BR2_GLOBAL_PATCH_DIR="board/intel/galileo/patches" # Linux headers same as kernel, a 3.14 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_14=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y diff --git a/configs/grinn_chiliboard_defconfig b/configs/grinn_chiliboard_defconfig index 80f3077b763..a5a8f7a65f2 100644 --- a/configs/grinn_chiliboard_defconfig +++ b/configs/grinn_chiliboard_defconfig @@ -1,12 +1,12 @@ BR2_arm=y BR2_cortex_a8=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=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="5.14.14" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.4" BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-chiliboard" @@ -16,8 +16,9 @@ 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="2020.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="chiliboard" +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="spl/u-boot-spl.bin" diff --git a/configs/grinn_liteboard_defconfig b/configs/grinn_liteboard_defconfig index 9cad66e15a7..3ae4a2a0b59 100644 --- a/configs/grinn_liteboard_defconfig +++ b/configs/grinn_liteboard_defconfig @@ -1,12 +1,12 @@ BR2_arm=y BR2_cortex_a7=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=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="5.14.14" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.4" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-liteboard" @@ -16,7 +16,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="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="liteboard" BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMG=y diff --git a/configs/hifive_unleashed_defconfig b/configs/hifive_unleashed_defconfig index 0b87f2588f7..2b6ee6c08e5 100644 --- a/configs/hifive_unleashed_defconfig +++ b/configs/hifive_unleashed_defconfig @@ -37,6 +37,8 @@ BR2_LINUX_KERNEL_INSTALL_TARGET=y # Bootloader BR2_TARGET_OPENSBI=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="0.9" BR2_TARGET_OPENSBI_PLAT="generic" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y diff --git a/configs/imx6-sabresd_defconfig b/configs/imx6-sabresd_defconfig index 19986f2cbb5..c237c2dc7c5 100644 --- a/configs/imx6-sabresd_defconfig +++ b/configs/imx6-sabresd_defconfig @@ -24,7 +24,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6sabresd" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.04" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" @@ -33,7 +33,7 @@ BR2_TARGET_UBOOT_NEEDS_OPENSSL=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.12" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.41" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd imx6dl-sabresd imx6qp-sabresd" diff --git a/configs/imx6-sabresd_qt5_defconfig b/configs/imx6-sabresd_qt5_defconfig index 38a86131dda..e385e86b81b 100644 --- a/configs/imx6-sabresd_qt5_defconfig +++ b/configs/imx6-sabresd_qt5_defconfig @@ -8,7 +8,6 @@ BR2_ARM_FPU_VFPV3=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Additional features needed for packages -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y BR2_TOOLCHAIN_BUILDROOT_CXX=y # System @@ -30,7 +29,7 @@ BR2_ROOTFS_OVERLAY="board/freescale/imx6-sabresd/rootfs_overlay" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6sabresd" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.04" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" @@ -39,7 +38,7 @@ BR2_TARGET_UBOOT_NEEDS_OPENSSL=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.12" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.41" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd imx6dl-sabresd imx6qp-sabresd" diff --git a/configs/imx8mmpico_defconfig b/configs/imx8mmpico_defconfig index f04946a8d13..8c34c40fef6 100644 --- a/configs/imx8mmpico_defconfig +++ b/configs/imx8mmpico_defconfig @@ -1,13 +1,14 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=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/imx8mm-pico-pi.dtb" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,TechNexion,linux,9146d4dcb2dda0c7614f74f824cfb20d29bd85f8)/linux-9146d4dcb2dda0c7614f74f824cfb20d29bd85f8.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,TechNexion,linux-tn-imx,tn-hardknott_5.10.72-2.2.0_20220207)/linux-tn-im-tn-hardknott_5.10.72-2.2.0_20220207.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="tn_imx8" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-pico-pi freescale/imx8mm-pico-pi-ili9881c freescale/imx8mm-pico-pi-sn65dsi84-hj070na" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mm-pico-pi freescale/imx8mm-pico-pi-ili9881c" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_FREESCALE_IMX=y BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y BR2_PACKAGE_FIRMWARE_IMX=y @@ -16,15 +17,14 @@ 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_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="rel_imx_4.14.98_2.0.0_ga" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-5.10.72-2.2.0)/imx-atf-lf-5.10.72-2.2.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,TechNexion,u-boot-edm,9a070a5b4460124054bc459edfc9d1b43e5403bb)/u-boot-edm-9a070a5b4460124054bc459edfc9d1b43e5403bb.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,TechNexion,u-boot-tn-imx,tn-hardknott_5.10.72-2.2.0_20220207)/u-boot-tn-imx-tn-hardknott_5.10.72-2.2.0_20220207.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="pico-imx8mm" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y diff --git a/configs/imx8mn_bsh_smm_s2_defconfig b/configs/imx8mn_bsh_smm_s2_defconfig new file mode 100644 index 00000000000..9b8ac8bfe2d --- /dev/null +++ b/configs/imx8mn_bsh_smm_s2_defconfig @@ -0,0 +1,41 @@ +BR2_aarch64=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_GLOBAL_PATCH_DIR="board/bsh/imx8mn-bsh-smm-s2/patches" +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.1.6" +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 +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mn-bsh-smm-s2" +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=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_DDR3=y +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.5" +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="2022.07" +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_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_UUU=y diff --git a/configs/imx8mn_bsh_smm_s2_pro_defconfig b/configs/imx8mn_bsh_smm_s2_pro_defconfig new file mode 100644 index 00000000000..ebef4e5932c --- /dev/null +++ b/configs/imx8mn_bsh_smm_s2_pro_defconfig @@ -0,0 +1,42 @@ +BR2_aarch64=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3" +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.1.6" +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 +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mn-bsh-smm-s2pro" +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_DDR3=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_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" +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="2022.07" +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_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_UUU=y diff --git a/configs/imx8mpico_defconfig b/configs/imx8mpico_defconfig index 5478f267fc8..1df8c104ecb 100644 --- a/configs/imx8mpico_defconfig +++ b/configs/imx8mpico_defconfig @@ -1,13 +1,14 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=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/imx8mq-pico-pi.dtb" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,TechNexion,linux,9146d4dcb2dda0c7614f74f824cfb20d29bd85f8)/linux-9146d4dcb2dda0c7614f74f824cfb20d29bd85f8.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,TechNexion,linux-tn-imx,tn-hardknott_5.10.72-2.2.0_20220207)/linux-tn-im-tn-hardknott_5.10.72-2.2.0_20220207.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="tn_imx8" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mq-pico-pi freescale/imx8mq-pico-pi-dcss-ili9881c" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_FREESCALE_IMX=y BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y BR2_PACKAGE_FIRMWARE_IMX=y @@ -16,15 +17,14 @@ 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_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="rel_imx_4.14.98_2.0.0_ga" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-5.10.72-2.2.0)/imx-atf-lf-5.10.72-2.2.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,TechNexion,u-boot-edm,9a070a5b4460124054bc459edfc9d1b43e5403bb)/u-boot-edm-9a070a5b4460124054bc459edfc9d1b43e5403bb.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,TechNexion,u-boot-tn-imx,tn-hardknott_5.10.72-2.2.0_20220207)/u-boot-tn-imx-tn-hardknott_5.10.72-2.2.0_20220207.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="pico-imx8mq" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y diff --git a/configs/imx8mqevk_defconfig b/configs/imx8mqevk_defconfig index 73f3f3dcc5b..943a4799326 100644 --- a/configs/imx8mqevk_defconfig +++ b/configs/imx8mqevk_defconfig @@ -18,16 +18,14 @@ 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_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,rel_imx_5.4.24_2.1.0)/imx-atf-rel_imx_5.4.24_2.1.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_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_5.4.24_2.1.0" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,rel_imx_5.4.24_2.1.0)/uboot-imx-rel_imx_5.4.24_2.1.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8mq_evk" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y diff --git a/configs/kontron_bl_imx8mm_defconfig b/configs/kontron_bl_imx8mm_defconfig index 2b7e121e252..240cb522455 100644 --- a/configs/kontron_bl_imx8mm_defconfig +++ b/configs/kontron_bl_imx8mm_defconfig @@ -3,8 +3,6 @@ BR2_aarch64=y BR2_cortex_a53=y BR2_ARM_FPU_VFPV3=y -BR2_GLOBAL_PATCH_DIR="board/kontron/bl-imx8mm/patches" - # System BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2" @@ -40,15 +38,17 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30880 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="2022.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="kontron-sl-mx8mm" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=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_NEEDS_ATF_BL31_BIN=y BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y +BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" BR2_TARGET_UBOOT_SPL=y diff --git a/configs/kontron_pitx_imx8m_defconfig b/configs/kontron_pitx_imx8m_defconfig index 8f756f52461..460f1a97e9b 100644 --- a/configs/kontron_pitx_imx8m_defconfig +++ b/configs/kontron_pitx_imx8m_defconfig @@ -3,14 +3,15 @@ BR2_aarch64=y # System BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/kontron/pitx-imx8m/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/kontron/pitx-imx8m/post-image.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/pitx-imx8mq.dtb" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/kontron/pitx-imx8m/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" +BR2_GLOBAL_PATCH_DIR="board/kontron/pitx-imx8m/patches" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16.1" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mq-kontron-pitx-imx8m" @@ -18,7 +19,7 @@ BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y BR2_PACKAGE_FREESCALE_IMX=y BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y @@ -37,12 +38,20 @@ 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="https://gitlab.kontron.com/imx/u-boot-imx/-/archive/PITX-IMX8M-R12/u-boot-imx-PITX-IMX8M-R12.tar.gz" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="pitx-imx8m" +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.04" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="kontron_pitx_imx8m" +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_BIN=y +BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y +BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin" BR2_TARGET_UBOOT_SPL=y # Required host tools to create the SD/eMMC image diff --git a/configs/kontron_smarc_sal28_defconfig b/configs/kontron_smarc_sal28_defconfig index 37e415cf32d..f8515f5b769 100644 --- a/configs/kontron_smarc_sal28_defconfig +++ b/configs/kontron_smarc_sal28_defconfig @@ -1,7 +1,6 @@ BR2_aarch64=y BR2_cortex_a72=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_ROOTFS_OVERLAY="board/kontron/smarc-sal28/rootfs_overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="board/kontron/smarc-sal28/post-build.sh" @@ -23,11 +22,14 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="128M" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="kontron_sl28" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=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.rom" diff --git a/configs/lego_ev3_defconfig b/configs/lego_ev3_defconfig index 555a63e36c7..1ce2817d424 100644 --- a/configs/lego_ev3_defconfig +++ b/configs/lego_ev3_defconfig @@ -2,9 +2,6 @@ BR2_arm=y BR2_arm926t=y -# Toolchain -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y - # system BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS1" diff --git a/configs/licheepi_zero_defconfig b/configs/licheepi_zero_defconfig index 2e1a4139888..0d3115a996f 100644 --- a/configs/licheepi_zero_defconfig +++ b/configs/licheepi_zero_defconfig @@ -36,10 +36,11 @@ 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="2019.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" 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_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" BR2_PACKAGE_HOST_UBOOT_TOOLS=y diff --git a/configs/linksprite_pcduino_defconfig b/configs/linksprite_pcduino_defconfig index b58f970493e..806c4f06976 100644 --- a/configs/linksprite_pcduino_defconfig +++ b/configs/linksprite_pcduino_defconfig @@ -11,24 +11,26 @@ BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" # SD image scripts -BR2_ROOTFS_POST_BUILD_SCRIPT="board/linksprite/pcduino/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/linksprite/pcduino/post-image.sh" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" # For kernel modules autoloading BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y # Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.10" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16.1" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun4i-a10-pcduino" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/linksprite/pcduino/linux-extras.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y # Filesystem BR2_TARGET_ROOTFS_EXT2=y @@ -38,21 +40,17 @@ 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="2020.10" -BR2_TARGET_UBOOT_USE_DEFCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Linksprite_pcDuino" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y -BR2_TARGET_UBOOT_FORMAT_BIN=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" # Host packages -BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y # Target packages: wireless support for pcduino-lite-wifi BR2_PACKAGE_IW=y diff --git a/configs/ls1028ardb_defconfig b/configs/ls1028ardb_defconfig new file mode 100644 index 00000000000..a46b94511a6 --- /dev/null +++ b/configs/ls1028ardb_defconfig @@ -0,0 +1,57 @@ +# Architecture +BR2_aarch64=y +BR2_cortex_a72=y + +# Toolchain +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y + +# System configuration +BR2_TARGET_GENERIC_HOSTNAME="ls1028a" +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_SYSTEM_DHCP="eno0" +BR2_ROOTFS_OVERLAY="board/freescale/ls1028ardb/rootfs_overlay" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/freescale/ls1028ardb/genimage.cfg" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-qoriq,linux,LSDK-21.08)/linux-LSDK-21.08.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" +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 + +# Target package +BR2_PACKAGE_QORIQ_CADENCE_DP_FIRMWARE=y + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +# BR2_TARGET_ROOTFS_TAR is not set + +# Bootloaders +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,LSDK-21.08)/atf-LSDK-21.08.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="ls1028ardb" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_RCW=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=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,LSDK-21.08)/u-boot-LSDK-21.08.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="ls1028ardb_tfa" +BR2_TARGET_UBOOT_NEEDS_DTC=y + +# Host utilities +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/mender_x86_64_efi_defconfig b/configs/mender_x86_64_efi_defconfig new file mode 100644 index 00000000000..25a463abb3e --- /dev/null +++ b/configs/mender_x86_64_efi_defconfig @@ -0,0 +1,79 @@ +# Architecture +BR2_x86_64=y + +# Toolchain +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_18=y + +# System +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y + +# Required as vda4 doesn't mount on first boot with busybox +BR2_INIT_SYSV=y + +# Required tools to create bootable media +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_MTOOLS=y + +# Bootloader +BR2_TARGET_GRUB2=y +BR2_TARGET_GRUB2_X86_64_EFI=y +# Add mandatory modules from MENDER_GRUBENV_MANDATORY_MODULES +BR2_TARGET_GRUB2_BUILTIN_MODULES_EFI="boot linux ext2 fat squash4 part_msdos part_gpt normal efi_gop loadenv hashsum echo halt gcry_sha256 test regexp sleep" +BR2_TARGET_GRUB2_INSTALL_TOOLS=y + +# Required tools to create a mender image +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MENDER_ARTIFACT=y + +# Filesystem / image +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_ROOTFS_OVERLAY="board/mender/x86_64/overlay" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/mender/x86_64/post-build.sh" +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" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.18.14" +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 +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y + +# Firmware +BR2_PACKAGE_LINUX_FIRMWARE=y +BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9170=y +BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9271=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3168=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_5000=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_6000G2A=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_6000G2B=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7260=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7265D=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8000C=y +BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8265=y +BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y +BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y +BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169=y +BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y +BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y +BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y + +# Packages +# +# Use connman so that networking setup is simpler, via connmanctl tool +# acpid is for seamless power button support +BR2_PACKAGE_ACPID=y +BR2_PACKAGE_CONNMAN=y +BR2_PACKAGE_CONNMAN_CLIENT=y +BR2_PACKAGE_CONNMAN_WIFI=y +BR2_PACKAGE_MENDER=y +BR2_PACKAGE_MENDER_GRUBENV=y +BR2_PACKAGE_MENDER_GRUBENV_DEFINES="board/mender/x86_64/mender_grubenv_defines" diff --git a/configs/microchip_sam9x60ek_mmc_dev_defconfig b/configs/microchip_sam9x60ek_mmc_dev_defconfig index 06e03967c45..4c842f2bb04 100644 --- a/configs/microchip_sam9x60ek_mmc_dev_defconfig +++ b/configs/microchip_sam9x60ek_mmc_dev_defconfig @@ -1,7 +1,5 @@ BR2_arm=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y -BR2_PTHREAD_DEBUG=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_TARGET_GENERIC_HOSTNAME="sam9x60ek" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y @@ -36,6 +34,7 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y +BR2_PACKAGE_WILC3000_FIRMWARE=y BR2_PACKAGE_EVTEST=y BR2_PACKAGE_I2C_TOOLS=y BR2_PACKAGE_SETSERIAL=y @@ -46,7 +45,6 @@ BR2_PACKAGE_LIBDRM=y BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y BR2_PACKAGE_DTC=y BR2_PACKAGE_DTC_PROGRAMS=y -BR2_PACKAGE_ARGP_STANDALONE=y BR2_PACKAGE_BLUEZ5_UTILS=y BR2_PACKAGE_BRIDGE_UTILS=y BR2_PACKAGE_CAN_UTILS=y diff --git a/configs/microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig b/configs/microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig index 3bcd5f0200d..5f6eba482c1 100644 --- a/configs/microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig +++ b/configs/microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig @@ -4,8 +4,6 @@ BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y -BR2_PTHREAD_DEBUG=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" @@ -39,6 +37,7 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y +BR2_PACKAGE_WILC3000_FIRMWARE=y BR2_PACKAGE_EVTEST=y BR2_PACKAGE_I2C_TOOLS=y BR2_PACKAGE_SETSERIAL=y @@ -49,7 +48,6 @@ BR2_PACKAGE_LIBDRM=y BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y BR2_PACKAGE_DTC=y BR2_PACKAGE_DTC_PROGRAMS=y -BR2_PACKAGE_ARGP_STANDALONE=y BR2_PACKAGE_BLUEZ5_UTILS=y BR2_PACKAGE_BRIDGE_UTILS=y BR2_PACKAGE_CAN_UTILS=y diff --git a/configs/microchip_sama5d2_icp_mmc_dev_defconfig b/configs/microchip_sama5d2_icp_mmc_dev_defconfig index 27d1d3409d9..64df7b4d130 100644 --- a/configs/microchip_sama5d2_icp_mmc_dev_defconfig +++ b/configs/microchip_sama5d2_icp_mmc_dev_defconfig @@ -4,8 +4,6 @@ BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_INSTRUCTIONS_THUMB2=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y -BR2_PTHREAD_DEBUG=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" @@ -32,6 +30,7 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y +BR2_PACKAGE_WILC3000_FIRMWARE=y BR2_PACKAGE_EVTEST=y BR2_PACKAGE_SETSERIAL=y BR2_PACKAGE_SPI_TOOLS=y @@ -41,7 +40,6 @@ BR2_PACKAGE_LIBDRM=y BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y BR2_PACKAGE_DTC=y BR2_PACKAGE_DTC_PROGRAMS=y -BR2_PACKAGE_ARGP_STANDALONE=y BR2_PACKAGE_BLUEZ5_UTILS=y BR2_PACKAGE_BRIDGE_UTILS=y BR2_PACKAGE_CAN_UTILS=y diff --git a/configs/microchip_sama7g5ek_mmc_dev_defconfig b/configs/microchip_sama7g5ek_mmc_dev_defconfig index 6eb6c282e03..2fca9873a60 100644 --- a/configs/microchip_sama7g5ek_mmc_dev_defconfig +++ b/configs/microchip_sama7g5ek_mmc_dev_defconfig @@ -2,8 +2,6 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y -BR2_PTHREAD_DEBUG=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" @@ -30,6 +28,7 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y BR2_PACKAGE_MMC_UTILS=y BR2_PACKAGE_MTD=y BR2_PACKAGE_WILC1000_FIRMWARE=y +BR2_PACKAGE_WILC3000_FIRMWARE=y BR2_PACKAGE_EVTEST=y BR2_PACKAGE_RNG_TOOLS=y # BR2_PACKAGE_RNG_TOOLS_JITTERENTROPY_LIBRARY is not set @@ -41,7 +40,6 @@ BR2_PACKAGE_LIBDRM=y BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y BR2_PACKAGE_DTC=y BR2_PACKAGE_DTC_PROGRAMS=y -BR2_PACKAGE_ARGP_STANDALONE=y BR2_PACKAGE_BLUEZ5_UTILS=y BR2_PACKAGE_BRIDGE_UTILS=y BR2_PACKAGE_CAN_UTILS=y diff --git a/configs/minnowboard_max-graphical_defconfig b/configs/minnowboard_max-graphical_defconfig deleted file mode 100644 index 051c7584dc2..00000000000 --- a/configs/minnowboard_max-graphical_defconfig +++ /dev/null @@ -1,75 +0,0 @@ -# Architecture -BR2_x86_64=y -BR2_x86_silvermont=y - -# Toolchain -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y -BR2_TOOLCHAIN_BUILDROOT_LOCALE=y -BR2_TOOLCHAIN_BUILDROOT_CXX=y -# needed for TARGET_GRUB2 -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y - -# System configuration -BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y -BR2_ROOTFS_OVERLAY="board/minnowboard/fs-overlay-graphical" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/minnowboard/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/minnowboard/genimage.cfg" - -# Host packages -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y - -# Linux -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.11" -BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/minnowboard/linux.config" - -# Bootloader -BR2_TARGET_GRUB2=y -BR2_TARGET_GRUB2_X86_64_EFI=y - -# ALSA -BR2_PACKAGE_ALSA_UTILS=y -BR2_PACKAGE_ALSA_UTILS_APLAY=y - -# OpenGL -BR2_PACKAGE_GLMARK2=y -BR2_PACKAGE_MESA3D_DEMOS=y -BR2_PACKAGE_MESA3D=y -BR2_PACKAGE_MESA3D_DRI_DRIVER_I965=y -BR2_PACKAGE_MESA3D_OPENGL_GLX=y - -# Framebuffer (just for testing purposes) -BR2_PACKAGE_FB_TEST_APP=y - -# X -BR2_PACKAGE_XORG7=y -BR2_PACKAGE_XSERVER_XORG_SERVER=y -BR2_PACKAGE_XAPP_XRANDR=y -BR2_PACKAGE_XDRIVER_XF86_INPUT_EVDEV=y -BR2_PACKAGE_XDRIVER_XF86_INPUT_KEYBOARD=y -BR2_PACKAGE_XDRIVER_XF86_INPUT_MOUSE=y -BR2_PACKAGE_XDRIVER_XF86_VIDEO_INTEL=y -BR2_PACKAGE_NODM=y -BR2_PACKAGE_XTERM=y -BR2_PACKAGE_OPENBOX=y - -# Firmware -BR2_PACKAGE_LINUX_FIRMWARE=y -BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169=y - -# Libraries -BR2_PACKAGE_IMLIB2=y -BR2_PACKAGE_IMLIB2_JPEG=y -BR2_PACKAGE_IMLIB2_PNG=y -BR2_PACKAGE_STARTUP_NOTIFICATION=y - -# Filesystem image -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="120M" -# BR2_TARGET_ROOTFS_TAR is not set diff --git a/configs/minnowboard_max_defconfig b/configs/minnowboard_max_defconfig index 1270f23953a..83a970f601f 100644 --- a/configs/minnowboard_max_defconfig +++ b/configs/minnowboard_max_defconfig @@ -10,8 +10,6 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/minnowboard/genimage.cfg" # Linux headers same as kernel, a 5.10 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y -# Needed for grub2 -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/mx6cubox_defconfig b/configs/mx6cubox_defconfig index 6ea4f6e416f..cbd9378064a 100644 --- a/configs/mx6cubox_defconfig +++ b/configs/mx6cubox_defconfig @@ -17,7 +17,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.71" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-cubox-i imx6dl-cubox-i-emmc-som-v15 imx6dl-cubox-i-som-v15 imx6dl-hummingboard imx6dl-hummingboard-emmc-som-v15 imx6dl-hummingboard-som-v15 imx6q-cubox-i imx6q-cubox-i-emmc-som-v15 imx6q-cubox-i-som-v15 imx6q-hummingboard imx6q-hummingboard-emmc-som-v15 imx6q-hummingboard-som-v15" @@ -32,7 +32,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="2022.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="mx6cuboxi" BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y diff --git a/configs/nezha_defconfig b/configs/nezha_defconfig index 2d66d6cb4a8..dd947079051 100644 --- a/configs/nezha_defconfig +++ b/configs/nezha_defconfig @@ -1,12 +1,12 @@ BR2_riscv=y -BR2_GLOBAL_PATCH_DIR="board/nezha/patches" -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_OVERLAY="board/nezha/overlay" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/nezha/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,smaeul,linux,012f5a3d01be6d44e32c74bb3637ec281790b297)/linux-012f5a3d01be6d44e32c74bb3637ec281790b297.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,smaeul,linux,ca67838d84af4c9f85d06311c9e98e1adf46308f)/linux-ca67838d84af4c9f85d06311c9e98e1adf46308f.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="nezha" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun20i-d1-nezha" @@ -15,22 +15,20 @@ 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,smaeul,opensbi,b9125c6f8909d1cc0417795737fc13cb6297ff11)/opensbi-b9125c6f8909d1cc0417795737fc13cb6297ff11.tar.gz" +BR2_TARGET_OPENSBI_CUSTOM_VERSION=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.2" BR2_TARGET_OPENSBI_PLAT="generic" # BR2_TARGET_OPENSBI_INSTALL_JUMP_IMG is not set -BR2_TARGET_SUN20I_D1_SPL=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,smaeul,u-boot,62392d3b8a624a80646c1876533336f90140088d)/uboot-62392d3b8a624a80646c1876533336f90140088d.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,smaeul,u-boot,528ae9bc6c55edd3ffe642734b4132a8246ea777)/uboot-528ae9bc6c55edd3ffe642734b4132a8246ea777.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nezha" BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_OPENSBI=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.toc1" +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/nitrogen6sx_defconfig b/configs/nitrogen6sx_defconfig index 3c2fe0cc7b0..2b12b169a09 100644 --- a/configs/nitrogen6sx_defconfig +++ b/configs/nitrogen6sx_defconfig @@ -17,17 +17,18 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel, a 5.15 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_v2020.10 -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/f2c92d83.tar.gz" +# Latest revision of branch boundary-v2022.04 +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/c2042594.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen6sx" BR2_TARGET_UBOOT_FORMAT_IMX=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/boundarydevices/common/boot.cmd" @@ -35,8 +36,8 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/boundarydevices/common/bo # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_5.10.x_2.0.0 -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/950d5f1b.tar.gz" +# Latest revision of branch boundary-imx_5.15.y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/97cc67c4.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="boundary" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_DTS_SUPPORT=y diff --git a/configs/nitrogen6x_defconfig b/configs/nitrogen6x_defconfig index 9e1d3ae1bc1..903d0abd9f6 100644 --- a/configs/nitrogen6x_defconfig +++ b/configs/nitrogen6x_defconfig @@ -16,17 +16,18 @@ BR2_PACKAGE_HOST_GENIMAGE=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel, a 5.15 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_v2020.10 -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/f2c92d83.tar.gz" +# Latest revision of branch boundary-v2022.04 +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/c2042594.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen6q" BR2_TARGET_UBOOT_FORMAT_IMX=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/boundarydevices/common/boot.cmd" @@ -34,8 +35,8 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/boundarydevices/common/bo # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_5.10.x_2.0.0 -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/950d5f1b.tar.gz" +# Latest revision of branch boundary-imx_5.15.y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/97cc67c4.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="boundary" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_DTS_SUPPORT=y diff --git a/configs/nitrogen7_defconfig b/configs/nitrogen7_defconfig index 0dbced86e91..718d203319f 100644 --- a/configs/nitrogen7_defconfig +++ b/configs/nitrogen7_defconfig @@ -16,17 +16,18 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel, a 5.15 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_v2020.10 -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/f2c92d83.tar.gz" +# Latest revision of branch boundary-v2022.04 +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/c2042594.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen7" BR2_TARGET_UBOOT_FORMAT_IMX=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/boundarydevices/common/boot.cmd" @@ -34,8 +35,8 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/boundarydevices/common/bo # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_5.10.x_2.0.0 -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/950d5f1b.tar.gz" +# Latest revision of branch boundary-imx_5.15.y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/97cc67c4.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="boundary" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_DTS_SUPPORT=y diff --git a/configs/nitrogen8m_defconfig b/configs/nitrogen8m_defconfig index a41e5f04d8b..4ae3f45ff11 100644 --- a/configs/nitrogen8m_defconfig +++ b/configs/nitrogen8m_defconfig @@ -16,9 +16,10 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y # Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel, a 5.15 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # DDR training binaries BR2_PACKAGE_FREESCALE_IMX=y @@ -28,8 +29,8 @@ BR2_PACKAGE_FIRMWARE_IMX=y # ARM Trusted Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_5.4.70_2.3.0 -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/9f6114fd.tar.gz" +# Latest revision of branch boundary-lf-5.15.52-2.1.0 +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/697a8319.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mq" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y @@ -38,19 +39,20 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen8m" BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_v2020.10 -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/f2c92d83.tar.gz" +# Latest revision of branch boundary-v2022.04 +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/c2042594.tar.gz" BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_5.10.x_2.0.0 -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/950d5f1b.tar.gz" +# Latest revision of branch boundary-imx_5.15.y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/97cc67c4.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="boundary" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INSTALL_TARGET=y diff --git a/configs/nitrogen8mm_defconfig b/configs/nitrogen8mm_defconfig index a635f8012be..0d0482458ba 100644 --- a/configs/nitrogen8mm_defconfig +++ b/configs/nitrogen8mm_defconfig @@ -16,9 +16,10 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y # Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel, a 5.15 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # DDR training binaries BR2_PACKAGE_FREESCALE_IMX=y @@ -28,8 +29,8 @@ BR2_PACKAGE_FIRMWARE_IMX=y # ARM Trusted Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_5.4.70_2.3.0 -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/9f6114fd.tar.gz" +# Latest revision of branch boundary-lf-5.15.52-2.1.0 +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/697a8319.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y @@ -38,19 +39,20 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen8mm_2g" BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_v2020.10 -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/f2c92d83.tar.gz" +# Latest revision of branch boundary-v2022.04 +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/c2042594.tar.gz" BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_5.10.x_2.0.0 -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/950d5f1b.tar.gz" +# Latest revision of branch boundary-imx_5.15.y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/97cc67c4.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="boundary" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INSTALL_TARGET=y diff --git a/configs/nitrogen8mn_defconfig b/configs/nitrogen8mn_defconfig index 5c2101441d6..ae53f5ce04e 100644 --- a/configs/nitrogen8mn_defconfig +++ b/configs/nitrogen8mn_defconfig @@ -16,9 +16,10 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y # Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel, a 5.15 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # DDR training binaries BR2_PACKAGE_FREESCALE_IMX=y @@ -28,8 +29,8 @@ BR2_PACKAGE_FIRMWARE_IMX=y # ARM Trusted Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_5.4.70_2.3.0 -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/9f6114fd.tar.gz" +# Latest revision of branch boundary-lf-5.15.52-2.1.0 +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/697a8319.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mn" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y @@ -38,19 +39,20 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen8_nano_8mn1gr0" BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_v2020.10 -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/f2c92d83.tar.gz" +# Latest revision of branch boundary-v2022.04 +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/c2042594.tar.gz" BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_5.10.x_2.0.0 -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/950d5f1b.tar.gz" +# Latest revision of branch boundary-imx_5.15.y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/97cc67c4.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="boundary" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INSTALL_TARGET=y diff --git a/configs/nitrogen8mp_defconfig b/configs/nitrogen8mp_defconfig index dc7427c856e..105d572a7fc 100644 --- a/configs/nitrogen8mp_defconfig +++ b/configs/nitrogen8mp_defconfig @@ -16,9 +16,10 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y # Filesystem BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" -# Linux headers same as kernel, a 5.10 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +# Linux headers same as kernel, a 5.15 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # DDR training binaries BR2_PACKAGE_FREESCALE_IMX=y @@ -28,8 +29,8 @@ BR2_PACKAGE_FIRMWARE_IMX=y # ARM Trusted Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_5.4.70_2.3.0 -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/9f6114fd.tar.gz" +# Latest revision of branch boundary-lf-5.15.52-2.1.0 +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/697a8319.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y @@ -38,19 +39,20 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen8mp_2gr0" BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_v2020.10 -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/f2c92d83.tar.gz" +# Latest revision of branch boundary-v2022.04 +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/c2042594.tar.gz" BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -# Latest revision of branch boundary-imx_5.10.x_2.0.0 -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/950d5f1b.tar.gz" +# Latest revision of branch boundary-imx_5.15.y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/97cc67c4.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="boundary" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INSTALL_TARGET=y diff --git a/configs/octavo_osd32mp1_brk_defconfig b/configs/octavo_osd32mp1_brk_defconfig new file mode 100644 index 00000000000..9a8ec8aa011 --- /dev/null +++ b/configs/octavo_osd32mp1_brk_defconfig @@ -0,0 +1,64 @@ +# architecture +BR2_arm=y +BR2_cortex_a7=y + +# global patch directory +BR2_GLOBAL_PATCH_DIR="board/octavo/osd32mp1-brk/patches" + +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y + +# rootfs overlay +BR2_ROOTFS_OVERLAY="board/octavo/osd32mp1-brk/overlay/" + +# image generation +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/octavo/osd32mp1-brk/genimage.cfg" + +# Kernel, use CUSTOM_DTS_PATH associated with INTREE_DTS_NAME to build the right +# device-tree +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/STMicroelectronics/linux.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.10-stm32mp-r2.1" +BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(LINUX_DIR)/arch/arm/configs/fragment-01-multiv7_cleanup.config $(LINUX_DIR)/arch/arm/configs/fragment-02-multiv7_addons.config" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32mp157c-osd32mp1-brk" +BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/octavo/osd32mp1-brk/linux-dts/*" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set + +# TF-A +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/STMicroelectronics/arm-trusted-firmware.git" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v2.4-stm32mp-r1" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="stm32mp1" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_DTS_PATH="board/octavo/osd32mp1-brk/tfa-dts/*" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=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 AARCH32_SP=sp_min DTB_FILE_NAME=stm32mp157c-osd32mp1-brk.dtb STM32MP_USB_PROGRAMMER=1 BL33_CFG=$(BINARIES_DIR)/u-boot.dtb" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="*.stm32 fip.bin" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y + +# U-Boot +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/STMicroelectronics/u-boot.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2020.10-stm32mp-r2.1" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="osd32mp1_brk_trusted" +# 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=stm32mp157c-osd32mp1-brk" + +# Package needed to generate the image +BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/octavo_osd32mp1_red_defconfig b/configs/octavo_osd32mp1_red_defconfig new file mode 100644 index 00000000000..2d0b3405803 --- /dev/null +++ b/configs/octavo_osd32mp1_red_defconfig @@ -0,0 +1,64 @@ +# architecture +BR2_arm=y +BR2_cortex_a7=y + +# global patch directory +BR2_GLOBAL_PATCH_DIR="board/octavo/osd32mp1-red/patches" + +# Linux headers same as kernel, a 5.10 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y + +# rootfs overlay +BR2_ROOTFS_OVERLAY="board/octavo/osd32mp1-red/overlay/" + +# image generation +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/octavo/osd32mp1-red/genimage.cfg" + +# Kernel, use CUSTOM_DTS_PATH associated with INTREE_DTS_NAME to build the right +# device-tree +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/STMicroelectronics/linux.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.10-stm32mp-r2.1" +BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(LINUX_DIR)/arch/arm/configs/fragment-01-multiv7_cleanup.config $(LINUX_DIR)/arch/arm/configs/fragment-02-multiv7_addons.config" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32mp157c-osd32mp1-red" +BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/octavo/osd32mp1-red/linux-dts/*" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +# BR2_TARGET_ROOTFS_TAR is not set + +# TF-A +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/STMicroelectronics/arm-trusted-firmware.git" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v2.4-stm32mp-r1" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="stm32mp1" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_DTS_PATH="board/octavo/osd32mp1-red/tfa-dts/*" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=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 AARCH32_SP=sp_min DTB_FILE_NAME=stm32mp157c-osd32mp1-red.dtb STM32MP_USB_PROGRAMMER=1 BL33_CFG=$(BINARIES_DIR)/u-boot.dtb" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="*.stm32 fip.bin" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y + +# U-Boot +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/STMicroelectronics/u-boot.git" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2020.10-stm32mp-r2.1" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32mp15_trusted" +# 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=stm32mp157c-osd32mp1-red" + +# Package needed to generate the image +BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/olimex_a10_olinuxino_lime_defconfig b/configs/olimex_a10_olinuxino_lime_defconfig index d0e00301f72..9c454b19153 100644 --- a/configs/olimex_a10_olinuxino_lime_defconfig +++ b/configs/olimex_a10_olinuxino_lime_defconfig @@ -2,8 +2,8 @@ BR2_arm=y BR2_cortex_a8=y -# Linux headers same as kernel, a 5.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # System configuration BR2_TARGET_GENERIC_HOSTNAME="a10-olinuxino" @@ -17,7 +17,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a10_olinuxino/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.9" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -33,7 +33,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="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A10-OLinuXino-Lime" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y diff --git a/configs/olimex_a13_olinuxino_defconfig b/configs/olimex_a13_olinuxino_defconfig index 6d25d7d0a1a..8469ce1fd0d 100644 --- a/configs/olimex_a13_olinuxino_defconfig +++ b/configs/olimex_a13_olinuxino_defconfig @@ -2,8 +2,8 @@ BR2_arm=y BR2_cortex_a8=y -# Linux headers same as kernel, a 5.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # System configuration BR2_TARGET_GENERIC_HOSTNAME="a13-olinuxino" @@ -15,7 +15,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" 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="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A13-OLinuXino" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y @@ -28,7 +28,7 @@ BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.9" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y diff --git a/configs/olimex_a20_olinuxino_lime2_defconfig b/configs/olimex_a20_olinuxino_lime2_defconfig index b46cf374330..a38f3a1c5ee 100644 --- a/configs/olimex_a20_olinuxino_lime2_defconfig +++ b/configs/olimex_a20_olinuxino_lime2_defconfig @@ -2,10 +2,9 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_EABIHF=y -BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, a 5.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +# Linux headers same as kernel, a 6.1 LTS series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Toolchain # glibc is needed for sunxi-mali-utgard package. @@ -16,6 +15,7 @@ BR2_TARGET_GENERIC_HOSTNAME="a20-olinuxino" BR2_TARGET_GENERIC_ISSUE="Welcome to OLinuXino!" BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_OVERLAY="board/olimex/a20_olinuxino/rootfs_overlay" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" @@ -23,7 +23,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.22" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/a20_olinuxino/linux-disable-lima.fragment" @@ -45,7 +45,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="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime2" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y diff --git a/configs/olimex_a20_olinuxino_lime_defconfig b/configs/olimex_a20_olinuxino_lime_defconfig index 698137e46cc..74b6a764cd3 100644 --- a/configs/olimex_a20_olinuxino_lime_defconfig +++ b/configs/olimex_a20_olinuxino_lime_defconfig @@ -2,10 +2,9 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_EABIHF=y -BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, a 5.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +# Linux headers same as kernel, a 6.1 LTS series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Toolchain # glibc is needed for sunxi-mali-utgard package. @@ -16,6 +15,7 @@ BR2_TARGET_GENERIC_HOSTNAME="a20-olinuxino" BR2_TARGET_GENERIC_ISSUE="Welcome to OLinuXino!" BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_OVERLAY="board/olimex/a20_olinuxino/rootfs_overlay" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" @@ -23,7 +23,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.22" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/a20_olinuxino/linux-disable-lima.fragment" @@ -45,7 +45,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="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y diff --git a/configs/olimex_a20_olinuxino_micro_defconfig b/configs/olimex_a20_olinuxino_micro_defconfig index 1394c0b8b85..a7a6eb51a01 100644 --- a/configs/olimex_a20_olinuxino_micro_defconfig +++ b/configs/olimex_a20_olinuxino_micro_defconfig @@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, a 5.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # System configuration BR2_TARGET_GENERIC_HOSTNAME="a20-olinuxino" @@ -18,7 +18,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.9" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-olinuxino-micro" @@ -33,7 +33,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="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino_MICRO" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y diff --git a/configs/olimex_a33_olinuxino_defconfig b/configs/olimex_a33_olinuxino_defconfig index 27924b9e929..35398ac6da5 100644 --- a/configs/olimex_a33_olinuxino_defconfig +++ b/configs/olimex_a33_olinuxino_defconfig @@ -1,10 +1,9 @@ # Architecture BR2_arm=y BR2_cortex_a7=y -BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, a 5.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # System configuration BR2_TARGET_GENERIC_HOSTNAME="A33-olinuxino" @@ -16,7 +15,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" 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="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A33-OLinuXino" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y @@ -32,7 +31,7 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/olimex/a33_olinuxino/boot # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.9" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y diff --git a/configs/olimex_a64_olinuxino_defconfig b/configs/olimex_a64_olinuxino_defconfig index 53e8c2ece54..dd445e8ce0e 100644 --- a/configs/olimex_a64_olinuxino_defconfig +++ b/configs/olimex_a64_olinuxino_defconfig @@ -2,13 +2,13 @@ BR2_aarch64=y BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y -# Linux headers same as kernel, a 5.15 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Firmware 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.8" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y @@ -16,7 +16,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=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="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="a64-olinuxino" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y @@ -33,7 +33,7 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/olimex/a64-olinuxino/boot # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.7" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.9" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-a64-olinuxino" @@ -43,6 +43,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_GENERIC_ISSUE="Welcome to Olimex A64-OLinuXino" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/olimex_stmp157_olinuxino_lime_defconfig b/configs/olimex_stmp157_olinuxino_lime_defconfig index 74e7f9ba67a..60c34d7fa13 100644 --- a/configs/olimex_stmp157_olinuxino_lime_defconfig +++ b/configs/olimex_stmp157_olinuxino_lime_defconfig @@ -8,6 +8,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y # System configuration BR2_TARGET_GENERIC_HOSTNAME="stmp1-olinuxino" BR2_TARGET_GENERIC_ISSUE="Welcome to OLinuXino!" +BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_OVERLAY="board/olimex/stmp1_olinuxino/rootfs_overlay" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/stmp1_olinuxino/genimage.cfg" @@ -16,8 +17,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" -# branch release-20210821-v5.10.60 -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="081be4c4c634cf9345b8bf59fe141a0236383ae4" +# branch release-20221011-v5.10.105 +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="1b955f3ee7ef3234f290f65dbea108063996aea0" 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 @@ -34,8 +35,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" -# release-20211130, based on 2021.04 -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="1c29714bc643c299e2ed4ba870be8d4538124144" +# release-20220927, based on 2021.04 +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="98ab5ecb0a16eeb426f34b2a1a28e56658c1a59c" 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/orangepi_one_defconfig b/configs/orangepi_one_defconfig index 1a2772a307b..ba128424a0b 100644 --- a/configs/orangepi_one_defconfig +++ b/configs/orangepi_one_defconfig @@ -12,6 +12,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-one" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set @@ -25,11 +26,7 @@ BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-one/boot.cmd" -BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-one/genimage.cfg" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" diff --git a/configs/orangepi_pc2_defconfig b/configs/orangepi_pc2_defconfig deleted file mode 100644 index c7e17c8eb13..00000000000 --- a/configs/orangepi_pc2_defconfig +++ /dev/null @@ -1,50 +0,0 @@ -BR2_aarch64=y -BR2_cortex_a53=y -BR2_ARM_FPU_VFPV4=y - -# Linux headers same as kernel, a 5.0 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y - -# Firmware -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_pc2" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31=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="spl/sunxi-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-pc2/boot.cmd" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-orangepi-pc2" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi PC2" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-pc2/genimage.cfg" diff --git a/configs/orangepi_pc_defconfig b/configs/orangepi_pc_defconfig index 44ea9b95c46..fd0f64e0e69 100644 --- a/configs/orangepi_pc_defconfig +++ b/configs/orangepi_pc_defconfig @@ -5,8 +5,9 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_PC" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi PC" BR2_SYSTEM_DHCP="eth0" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-pc/genimage.cfg" +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="5.10.9" @@ -14,6 +15,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-pc/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-pc" +BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set @@ -27,9 +29,4 @@ BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-pc/boot.cmd" -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/orangepi_pc_plus_defconfig b/configs/orangepi_pc_plus_defconfig index c3ff8bc4170..ba946e5285f 100644 --- a/configs/orangepi_pc_plus_defconfig +++ b/configs/orangepi_pc_plus_defconfig @@ -14,6 +14,7 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-pc-plus" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-pc-plus/linux-extras.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set @@ -27,14 +28,10 @@ BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-pc-plus/boot.cmd" -BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-pc-plus/genimage.cfg" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" # wireless driver and firmware BR2_PACKAGE_RTL8189FS=y diff --git a/configs/orangepi_plus_defconfig b/configs/orangepi_plus_defconfig deleted file mode 100644 index 11d74864863..00000000000 --- a/configs/orangepi_plus_defconfig +++ /dev/null @@ -1,44 +0,0 @@ -# Architecture -BR2_arm=y -BR2_cortex_a7=y -BR2_ARM_FPU_VFPV4=y - -# Linux headers same as kernel, a 5.0 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y - -# System configuration -BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Plus" -BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Plus" - -# Bootloaders -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_plus" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-plus/boot.cmd" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" -BR2_LINUX_KERNEL_DEFCONFIG="sunxi" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-plus" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-plus/genimage.cfg" - -# Additional tools -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y diff --git a/configs/orangepi_prime_defconfig b/configs/orangepi_prime_defconfig deleted file mode 100644 index f8f958c67b2..00000000000 --- a/configs/orangepi_prime_defconfig +++ /dev/null @@ -1,50 +0,0 @@ -BR2_aarch64=y -BR2_cortex_a53=y -BR2_ARM_FPU_VFPV4=y - -# Linux headers same as kernel, a 5.0 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y - -# Firmware -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_prime" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31=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="spl/sunxi-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-prime/boot.cmd" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-orangepi-prime" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi Prime" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-prime/genimage.cfg" diff --git a/configs/orangepi_rk3399_defconfig b/configs/orangepi_rk3399_defconfig deleted file mode 100644 index bcce35febd6..00000000000 --- a/configs/orangepi_rk3399_defconfig +++ /dev/null @@ -1,53 +0,0 @@ -# Architecture -BR2_aarch64=y -BR2_cortex_a72_a53=y - -# Linux headers same as kernel, a 5.8 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y - -# Firmware -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="11a0a46a899fcc3b1fdb214b382f3d7495d88eca" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3399" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="" - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.07" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi-rk3399" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=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" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.2" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3399-orangepi" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_HOSTNAME="orangepi-rk3399" -BR2_TARGET_GENERIC_ISSUE="Welcome to ORANGEPI-RK3399" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-rk3399/genimage.cfg" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/orangepi-rk3399/post-build.sh" diff --git a/configs/orangepi_win_defconfig b/configs/orangepi_win_defconfig deleted file mode 100644 index 715ff3b7114..00000000000 --- a/configs/orangepi_win_defconfig +++ /dev/null @@ -1,48 +0,0 @@ -BR2_aarch64=y -BR2_cortex_a53=y -BR2_ARM_FPU_VFPV4=y - -# Linux headers same as kernel, a 4.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y - -# Firmware -BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_win" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_ATF_BL31=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="spl/sunxi-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-win/boot.cmd" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-a64-orangepi-win" - -# Filesystem -BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi Win/Win Plus" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-win/genimage.cfg" diff --git a/configs/orangepi_zero_plus2_defconfig b/configs/orangepi_zero_plus2_defconfig index 9d88b37ac94..ef171c3ad30 100644 --- a/configs/orangepi_zero_plus2_defconfig +++ b/configs/orangepi_zero_plus2_defconfig @@ -27,9 +27,6 @@ BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero-plus2/boot.cmd" # Kernel BR2_LINUX_KERNEL=y @@ -40,6 +37,8 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-orangepi-zero-plus2" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero-plus2/linux-extras.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y # wireless firmware BR2_PACKAGE_LINUX_FIRMWARE=y @@ -58,8 +57,11 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi Zero Plus2" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" -BR2_PACKAGE_HOST_DOSFSTOOLS=y + +# host tools BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y + +# image scripts +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-zero-plus2/genimage.cfg" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" diff --git a/configs/orangepi_zero_plus_defconfig b/configs/orangepi_zero_plus_defconfig index cf82f8b3cca..26a25bd9f89 100644 --- a/configs/orangepi_zero_plus_defconfig +++ b/configs/orangepi_zero_plus_defconfig @@ -2,51 +2,53 @@ BR2_aarch64=y BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_7=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_SYSTEM_DHCP="eth0" # Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y # Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero_plus" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=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="spl/sunxi-spl.bin" -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero-plus/boot.cmd" +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.7.19" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.4" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-orangepi-zero-plus" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y # Filesystem BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi Zero Plus" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" + +# host tools BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y + +# image scripts +BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/common/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-zero-plus/genimage.cfg" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" diff --git a/configs/pc_x86_64_bios_defconfig b/configs/pc_x86_64_bios_defconfig index df5988d75e2..ec34a41667f 100644 --- a/configs/pc_x86_64_bios_defconfig +++ b/configs/pc_x86_64_bios_defconfig @@ -1,9 +1,6 @@ # Architecture BR2_x86_64=y -# Toolchain, required for eudev (to autoload drivers) -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y - # System BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y diff --git a/configs/pc_x86_64_efi_defconfig b/configs/pc_x86_64_efi_defconfig index 18d2c477d5b..da05471e28c 100644 --- a/configs/pc_x86_64_efi_defconfig +++ b/configs/pc_x86_64_efi_defconfig @@ -1,9 +1,6 @@ # Architecture BR2_x86_64=y -# Toolchain, required for eudev (to autoload drivers) -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y - # System BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y diff --git a/configs/pine64_defconfig b/configs/pine64_defconfig index 2bdb6f6ae1e..c454114d2ad 100644 --- a/configs/pine64_defconfig +++ b/configs/pine64_defconfig @@ -7,10 +7,9 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y # Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.7" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y # Bootloader diff --git a/configs/pine64_sopine_defconfig b/configs/pine64_sopine_defconfig index 6fa511477c7..f59f2387ebf 100644 --- a/configs/pine64_sopine_defconfig +++ b/configs/pine64_sopine_defconfig @@ -7,10 +7,9 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y # Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.7" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y # Bootloader diff --git a/configs/qemu_aarch64_ebbr_defconfig b/configs/qemu_aarch64_ebbr_defconfig new file mode 100644 index 00000000000..d293ad0e608 --- /dev/null +++ b/configs/qemu_aarch64_ebbr_defconfig @@ -0,0 +1,54 @@ +# Architecture +BR2_aarch64=y + +# Image +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" + +# Linux headers +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.0.6" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +# Packages +BR2_PACKAGE_OPTEE_CLIENT=y + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="200M" +# BR2_TARGET_ROOTFS_TAR is not set + +# Firmware and bootloader +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.7" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="qemu" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y +BR2_TARGET_GRUB2=y +BR2_TARGET_OPTEE_OS=y +BR2_TARGET_OPTEE_OS_NEEDS_DTC=y +BR2_TARGET_OPTEE_OS_PLATFORM="vexpress-qemu_armv8a" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="qemu_arm64" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/qemu/aarch64-ebbr/u-boot.config" +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y + +# Host tools +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/configs/qemu_aarch64_sbsa_defconfig b/configs/qemu_aarch64_sbsa_defconfig index 2d6134e78cb..609444e787f 100644 --- a/configs/qemu_aarch64_sbsa_defconfig +++ b/configs/qemu_aarch64_sbsa_defconfig @@ -2,9 +2,6 @@ BR2_aarch64=y BR2_cortex_a57=y -# Toolchain -BR2_TOOLCHAIN_BUILDROOT_WCHAR=y - # System BR2_SYSTEM_DHCP="eth0" BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" @@ -39,7 +36,7 @@ BR2_TARGET_GRUB2_ARM64_EFI=y BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v2.4" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v2.7" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="qemu_sbsa" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y diff --git a/configs/qemu_arm_ebbr_defconfig b/configs/qemu_arm_ebbr_defconfig new file mode 100644 index 00000000000..f3e2d42a54b --- /dev/null +++ b/configs/qemu_arm_ebbr_defconfig @@ -0,0 +1,57 @@ +# Architecture +BR2_arm=y +BR2_cortex_a15=y + +# Image +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" + +# Linux headers +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.0.9" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-ebbr/linux.fragment" + +# Packages +BR2_PACKAGE_OPTEE_CLIENT=y + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="200M" +# BR2_TARGET_ROOTFS_TAR is not set + +# Firmware and bootloader +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.7" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="qemu" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="BL32_RAM_LOCATION=tdram" +BR2_TARGET_GRUB2=y +BR2_TARGET_GRUB2_ARM_EFI=y +BR2_TARGET_OPTEE_OS=y +BR2_TARGET_OPTEE_OS_NEEDS_DTC=y +BR2_TARGET_OPTEE_OS_PLATFORM="vexpress-qemu_virt" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="qemu_arm" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/qemu/arm-ebbr/u-boot.fragment" +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y + +# Host tools +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/configs/qemu_arm_versatile_nommu_defconfig b/configs/qemu_arm_versatile_nommu_defconfig deleted file mode 100644 index 0c49d1b67d7..00000000000 --- a/configs/qemu_arm_versatile_nommu_defconfig +++ /dev/null @@ -1,42 +0,0 @@ -# Architecture -BR2_arm=y -BR2_arm926t=y - -# Toolchain -BR2_PACKAGE_HOST_ELF2FLT=y -# BR2_USE_MMU is not set - -# Patches -BR2_GLOBAL_PATCH_DIR="board/qemu/arm-versatile/patches" - -# Busybox with hush -BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" - -# System -BR2_SYSTEM_DHCP="eth0" -BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" - -# Filesystem -# BR2_TARGET_ROOTFS_EXT2 is not set -# BR2_TARGET_ROOTFS_TAR is not set -BR2_TARGET_ROOTFS_INITRAMFS=y - -# Image -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" - -# Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" -BR2_LINUX_KERNEL_DEFCONFIG="versatile" -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-versatile/linux-nommu.fragment" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="versatile-pb" - -# host-qemu for gitlab testing -BR2_PACKAGE_HOST_QEMU=y -BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/configs/qemu_arm_vexpress_tz_defconfig b/configs/qemu_arm_vexpress_tz_defconfig index def11721ae2..576c4411549 100644 --- a/configs/qemu_arm_vexpress_tz_defconfig +++ b/configs/qemu_arm_vexpress_tz_defconfig @@ -29,7 +29,7 @@ BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-vexpress-tz/linux.fragmen # TF-A for booting OP-TEE secure and uboot/linux non secure BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.4" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.7" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="qemu" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y @@ -38,6 +38,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="BL32_RAM_LOCATION=tdram" # OP-TEE components BR2_TARGET_OPTEE_OS=y +BR2_TARGET_OPTEE_OS_NEEDS_DTC=y BR2_TARGET_OPTEE_OS_PLATFORM="vexpress-qemu_virt" BR2_PACKAGE_OPTEE_BENCHMARK=y BR2_PACKAGE_OPTEE_EXAMPLES=y @@ -55,7 +56,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="qemu_arm" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/qemu/arm-vexpress-tz/u-boot.config" diff --git a/configs/qemu_ppc64_e5500_defconfig b/configs/qemu_ppc64_e5500_defconfig index 072240c99c3..6ad03c4c871 100644 --- a/configs/qemu_ppc64_e5500_defconfig +++ b/configs/qemu_ppc64_e5500_defconfig @@ -3,6 +3,7 @@ BR2_powerpc64=y BR2_powerpc_e5500=y # System +BR2_BINUTILS_VERSION_2_38_X=y BR2_SYSTEM_DHCP="eth0" BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" @@ -11,12 +12,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as the kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" 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 ad523ec2efe..50844dc93b0 100644 --- a/configs/qemu_ppc64_pseries_defconfig +++ b/configs/qemu_ppc64_pseries_defconfig @@ -3,6 +3,7 @@ BR2_powerpc64=y BR2_powerpc_power7=y # System +BR2_BINUTILS_VERSION_2_38_X=y BR2_SYSTEM_DHCP="eth0" BR2_TARGET_GENERIC_GETTY_PORT="hvc0" @@ -15,12 +16,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" BR2_LINUX_KERNEL_DEFCONFIG="pseries" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc64le_powernv8_defconfig b/configs/qemu_ppc64le_powernv8_defconfig index a784695ddf0..f6a5c3d409f 100644 --- a/configs/qemu_ppc64le_powernv8_defconfig +++ b/configs/qemu_ppc64le_powernv8_defconfig @@ -3,6 +3,7 @@ BR2_powerpc64le=y BR2_powerpc_power8=y # System +BR2_BINUTILS_VERSION_2_38_X=y BR2_TARGET_GENERIC_GETTY_PORT="hvc0" BR2_SYSTEM_DHCP="eth0" @@ -15,12 +16,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" BR2_LINUX_KERNEL_DEFCONFIG="powernv" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc64le_pseries_defconfig b/configs/qemu_ppc64le_pseries_defconfig index f10b0fdf408..7ce5a9d3103 100644 --- a/configs/qemu_ppc64le_pseries_defconfig +++ b/configs/qemu_ppc64le_pseries_defconfig @@ -3,6 +3,7 @@ BR2_powerpc64le=y BR2_powerpc_power8=y # System +BR2_BINUTILS_VERSION_2_38_X=y BR2_TARGET_GENERIC_GETTY_PORT="hvc0" BR2_SYSTEM_DHCP="eth0" @@ -15,12 +16,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" BR2_LINUX_KERNEL_DEFCONFIG="pseries_le" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_bamboo_defconfig b/configs/qemu_ppc_bamboo_defconfig index 6129c4a6633..f4cc5589e7b 100644 --- a/configs/qemu_ppc_bamboo_defconfig +++ b/configs/qemu_ppc_bamboo_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" 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 1853e538bb3..0a1877c44b4 100644 --- a/configs/qemu_ppc_e500mc_defconfig +++ b/configs/qemu_ppc_e500mc_defconfig @@ -11,12 +11,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as the kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" 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 9bbebede1b9..1c11bcf77d0 100644 --- a/configs/qemu_ppc_g3beige_defconfig +++ b/configs/qemu_ppc_g3beige_defconfig @@ -14,12 +14,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" 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 e9629ff2330..2331041c2a8 100644 --- a/configs/qemu_ppc_mac99_defconfig +++ b/configs/qemu_ppc_mac99_defconfig @@ -6,12 +6,12 @@ BR2_powerpc_7400=y BR2_SYSTEM_DHCP="eth0" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" 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 2b51573da9b..b9a0812d525 100644 --- a/configs/qemu_ppc_mpc8544ds_defconfig +++ b/configs/qemu_ppc_mpc8544ds_defconfig @@ -15,12 +15,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.17.7" 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_virt_defconfig b/configs/qemu_riscv32_virt_defconfig index dff87ef342f..f354e303e5c 100644 --- a/configs/qemu_riscv32_virt_defconfig +++ b/configs/qemu_riscv32_virt_defconfig @@ -19,12 +19,14 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.43" BR2_LINUX_KERNEL_DEFCONFIG="rv32" BR2_LINUX_KERNEL_IMAGE=y # Bootloader BR2_TARGET_OPENSBI=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.2" BR2_TARGET_OPENSBI_PLAT="generic" # host-qemu for gitlab testing diff --git a/configs/qemu_riscv64_nommu_virt_defconfig b/configs/qemu_riscv64_nommu_virt_defconfig new file mode 100644 index 00000000000..ee70beb2088 --- /dev/null +++ b/configs/qemu_riscv64_nommu_virt_defconfig @@ -0,0 +1,34 @@ +# Architecture +BR2_riscv=y +BR2_RISCV_64=y +# BR2_RISCV_USE_MMU is not set + +# Linux headers same as kernel, a 5.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19=y + +# Busybox with hush +BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" + +# System +BR2_TARGET_GENERIC_GETTY=y + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y + +# Image +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.19" +BR2_LINUX_KERNEL_DEFCONFIG="nommu_virt" +BR2_LINUX_KERNEL_IMAGE=y + +# Disable network scripts +# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set + +# host-qemu for gitlab testing +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y diff --git a/configs/qemu_riscv64_virt_defconfig b/configs/qemu_riscv64_virt_defconfig index d67d070185a..b3174a152c1 100644 --- a/configs/qemu_riscv64_virt_defconfig +++ b/configs/qemu_riscv64_virt_defconfig @@ -19,12 +19,14 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.43" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_IMAGE=y # Bootloader BR2_TARGET_OPENSBI=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.2" BR2_TARGET_OPENSBI_PLAT="generic" # host-qemu for gitlab testing diff --git a/configs/qemu_s390x_defconfig b/configs/qemu_s390x_defconfig index 346df04adab..591e6e33693 100644 --- a/configs/qemu_s390x_defconfig +++ b/configs/qemu_s390x_defconfig @@ -9,15 +9,16 @@ BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set # Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.4" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y diff --git a/configs/qemu_xtensa_lx60_nommu_defconfig b/configs/qemu_xtensa_lx60_nommu_defconfig index c4473fb32a7..4be1b66edc5 100644 --- a/configs/qemu_xtensa_lx60_nommu_defconfig +++ b/configs/qemu_xtensa_lx60_nommu_defconfig @@ -2,10 +2,10 @@ 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 -# Toolchain -BR2_PACKAGE_HOST_ELF2FLT=y -# BR2_USE_MMU is not set +# Use minimal busybox with hush and networking tools +BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" # System BR2_SYSTEM_DHCP="eth0" diff --git a/configs/roc_pc_rk3399_defconfig b/configs/roc_pc_rk3399_defconfig deleted file mode 100644 index ae7cf19a804..00000000000 --- a/configs/roc_pc_rk3399_defconfig +++ /dev/null @@ -1,55 +0,0 @@ -# Architecture -BR2_aarch64=y -BR2_cortex_a72_a53=y - -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y - -# Firmware -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="11a0a46a899fcc3b1fdb214b382f3d7495d88eca" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3399" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="" - -# Bootloader -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.01" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="roc-pc-rk3399" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=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" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.18" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3399-roc-pc" -BR2_LINUX_KERNEL_INSTALL_TARGET=y -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_HOSTNAME="roc-rk3399-pc" -BR2_TARGET_GENERIC_ISSUE="Welcome to ROC-RK3399-PC!" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="120M" -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/firefly/roc-rk3399-pc/genimage.cfg" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/firefly/roc-rk3399-pc/post-build.sh" diff --git a/configs/rock_pi_4_defconfig b/configs/rock_pi_4_defconfig deleted file mode 100644 index 401a59bac4d..00000000000 --- a/configs/rock_pi_4_defconfig +++ /dev/null @@ -1,55 +0,0 @@ -# Architecture -BR2_aarch64=y -BR2_cortex_a72_a53=y - -# Linux headers same as kernel, a 5.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y - -# Firmware -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="11a0a46a899fcc3b1fdb214b382f3d7495d88eca" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3399" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="" - -# Bootloader -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/amarula/u-boot-amarula.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="cf2747360fdd1eb0d51dd01a984c7c62c7f714fe" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rock-pi-4-rk3399" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=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" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.46" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3399-rock-pi-4" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_HOSTNAME="rockpi4" -BR2_TARGET_GENERIC_ISSUE="Welcome to ROCK_PI_4" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="96M" -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/radxa/rockpi-4/genimage.cfg" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/radxa/rockpi-4/post-build.sh" diff --git a/configs/rock_pi_n10_defconfig b/configs/rock_pi_n10_defconfig deleted file mode 100644 index c622839c899..00000000000 --- a/configs/rock_pi_n10_defconfig +++ /dev/null @@ -1,55 +0,0 @@ -# Architecture -BR2_aarch64=y -BR2_cortex_a72_a53=y - -# Linux headers same as kernel, a 5.7 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_7=y - -# Firmware -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="11a0a46a899fcc3b1fdb214b382f3d7495d88eca" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3399" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="" - -# Bootloader -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/amarula/u-boot-amarula.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="cf2747360fdd1eb0d51dd01a984c7c62c7f714fe" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rock-pi-n10-rk3399pro" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=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" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.7.2" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3399pro-rock-pi-n10" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_HOSTNAME="rockpi-n10" -BR2_TARGET_GENERIC_ISSUE="Welcome to ROCKPI-N10" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="160M" -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/radxa/rockpi-n10/genimage.cfg" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/radxa/rockpi-n10/post-build.sh" diff --git a/configs/rockpro64_defconfig b/configs/rockpro64_defconfig index 5086320cbc4..d39640f855b 100644 --- a/configs/rockpro64_defconfig +++ b/configs/rockpro64_defconfig @@ -7,9 +7,8 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y # Firmware 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="11a0a46a899fcc3b1fdb214b382f3d7495d88eca" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.7" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3399" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y diff --git a/configs/sipeed_lichee_rv_defconfig b/configs/sipeed_lichee_rv_defconfig new file mode 100644 index 00000000000..750d2d6e3b0 --- /dev/null +++ b/configs/sipeed_lichee_rv_defconfig @@ -0,0 +1,33 @@ +BR2_riscv=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_ROOTFS_OVERLAY="board/sipeed/lichee_rv/overlay" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/sipeed/lichee_rv/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,smaeul,linux,ca67838d84af4c9f85d06311c9e98e1adf46308f)/linux-ca67838d84af4c9f85d06311c9e98e1adf46308f.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="nezha" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun20i-d1-lichee-rv" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +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_VERSION=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.2" +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,smaeul,u-boot,528ae9bc6c55edd3ffe642734b4132a8246ea777)/uboot-528ae9bc6c55edd3ffe642734b4132a8246ea777.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="lichee_rv_dock" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y +# BR2_TARGET_UBOOT_FORMAT_BIN is not set +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" +BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/sipeed_lichee_rv_dock_defconfig b/configs/sipeed_lichee_rv_dock_defconfig new file mode 100644 index 00000000000..a228cd8cb77 --- /dev/null +++ b/configs/sipeed_lichee_rv_dock_defconfig @@ -0,0 +1,41 @@ +BR2_riscv=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y +BR2_ROOTFS_OVERLAY="board/sipeed/lichee_rv/overlay board/sipeed/lichee_rv_dock/overlay" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/sipeed/lichee_rv_dock/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,smaeul,linux,ca67838d84af4c9f85d06311c9e98e1adf46308f)/linux-ca67838d84af4c9f85d06311c9e98e1adf46308f.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="nezha" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun20i-d1-lichee-rv-dock" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/sipeed/lichee_rv_dock/linux.fragment" +BR2_LINUX_KERNEL_INSTALL_TARGET=y +BR2_PACKAGE_RTL8723DS=y +BR2_PACKAGE_RTL8723DS_BT=y +BR2_PACKAGE_BLUEZ5_UTILS=y +BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y +BR2_PACKAGE_WPA_SUPPLICANT=y +BR2_PACKAGE_WPA_SUPPLICANT_AUTOSCAN=y +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_VERSION=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.2" +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,smaeul,u-boot,528ae9bc6c55edd3ffe642734b4132a8246ea777)/uboot-528ae9bc6c55edd3ffe642734b4132a8246ea777.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="lichee_rv_dock" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y +# BR2_TARGET_UBOOT_FORMAT_BIN is not set +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" +BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/sipeed_maix_bit_defconfig b/configs/sipeed_maix_bit_defconfig new file mode 100644 index 00000000000..d73ba0266ab --- /dev/null +++ b/configs/sipeed_maix_bit_defconfig @@ -0,0 +1,39 @@ +# Architecture +BR2_riscv=y +BR2_RISCV_64=y +BR2_riscv_custom=y +BR2_RISCV_ISA_CUSTOM_RVM=y +BR2_RISCV_ISA_CUSTOM_RVA=y +BR2_RISCV_ISA_CUSTOM_RVF=y +BR2_RISCV_ISA_CUSTOM_RVD=y +BR2_RISCV_ISA_CUSTOM_RVC=y +# BR2_RISCV_USE_MMU is not set +BR2_RISCV_ABI_LP64D=y + +# Linux headers same as kernel, a 5.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19=y + +# Binary format +BR2_BINFMT_FLAT=y +BR2_BINFMT_FLAT_ONE=y +# BR2_TARGET_ENABLE_ROOT_LOGIN is not set + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +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" + +# Packages +BR2_PACKAGE_HOST_PYTHON_KFLASH=y +BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" +BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/busybox-tiny.config" +# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set + +# Filesystem +BR2_INIT_NONE=y +BR2_TARGET_ROOTFS_INITRAMFS=y +BR2_ROOTFS_OVERLAY="board/canaan/k210-soc/rootfs_overlay" diff --git a/configs/sipeed_maix_bit_sdcard_defconfig b/configs/sipeed_maix_bit_sdcard_defconfig new file mode 100644 index 00000000000..34769eeca84 --- /dev/null +++ b/configs/sipeed_maix_bit_sdcard_defconfig @@ -0,0 +1,58 @@ +# Architecture +BR2_riscv=y +BR2_RISCV_64=y +BR2_riscv_custom=y +BR2_RISCV_ISA_CUSTOM_RVM=y +BR2_RISCV_ISA_CUSTOM_RVA=y +BR2_RISCV_ISA_CUSTOM_RVF=y +BR2_RISCV_ISA_CUSTOM_RVD=y +BR2_RISCV_ISA_CUSTOM_RVC=y +# BR2_RISCV_USE_MMU is not set +BR2_RISCV_ABI_LP64D=y + +# Linux headers same as kernel, a 5.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19=y + +# System +BR2_BINFMT_FLAT=y +BR2_BINFMT_FLAT_ONE=y +# BR2_TARGET_ENABLE_ROOT_LOGIN is not set + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +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_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="canaan/sipeed_maix_bit" + +# Packages +BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" +# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set + +# Filesystem +BR2_INIT_NONE=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_SIZE="64M" +BR2_ROOTFS_OVERLAY="board/canaan/k210-soc/rootfs_overlay" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/canaan/k210-soc/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/canaan/k210-soc/genimage.cfg" + +# Bootloader and related host tools +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.04" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/uboot.config" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sipeed_maix_bitm" +BR2_TARGET_UBOOT_FORMAT_BIN=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_PYTHON_KFLASH=y diff --git a/configs/sipeed_maix_dock_defconfig b/configs/sipeed_maix_dock_defconfig new file mode 100644 index 00000000000..ccb563310eb --- /dev/null +++ b/configs/sipeed_maix_dock_defconfig @@ -0,0 +1,39 @@ +# Architecture +BR2_riscv=y +BR2_RISCV_64=y +BR2_riscv_custom=y +BR2_RISCV_ISA_CUSTOM_RVM=y +BR2_RISCV_ISA_CUSTOM_RVA=y +BR2_RISCV_ISA_CUSTOM_RVF=y +BR2_RISCV_ISA_CUSTOM_RVD=y +BR2_RISCV_ISA_CUSTOM_RVC=y +# BR2_RISCV_USE_MMU is not set +BR2_RISCV_ABI_LP64D=y + +# Linux headers same as kernel, a 5.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19=y + +# Binary format +BR2_BINFMT_FLAT=y +BR2_BINFMT_FLAT_ONE=y +# BR2_TARGET_ENABLE_ROOT_LOGIN is not set + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +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" + +# Packages +BR2_PACKAGE_HOST_PYTHON_KFLASH=y +BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" +BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/busybox-tiny.config" +# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set + +# Filesystem +BR2_INIT_NONE=y +BR2_TARGET_ROOTFS_INITRAMFS=y +BR2_ROOTFS_OVERLAY="board/canaan/k210-soc/rootfs_overlay" diff --git a/configs/sipeed_maix_dock_sdcard_defconfig b/configs/sipeed_maix_dock_sdcard_defconfig new file mode 100644 index 00000000000..62f6a0e0b84 --- /dev/null +++ b/configs/sipeed_maix_dock_sdcard_defconfig @@ -0,0 +1,58 @@ +# Architecture +BR2_riscv=y +BR2_RISCV_64=y +BR2_riscv_custom=y +BR2_RISCV_ISA_CUSTOM_RVM=y +BR2_RISCV_ISA_CUSTOM_RVA=y +BR2_RISCV_ISA_CUSTOM_RVF=y +BR2_RISCV_ISA_CUSTOM_RVD=y +BR2_RISCV_ISA_CUSTOM_RVC=y +# BR2_RISCV_USE_MMU is not set +BR2_RISCV_ABI_LP64D=y + +# Linux headers same as kernel, a 5.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19=y + +# System +BR2_BINFMT_FLAT=y +BR2_BINFMT_FLAT_ONE=y +# BR2_TARGET_ENABLE_ROOT_LOGIN is not set + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +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_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="canaan/sipeed_maix_dock" + +# Packages +BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" +# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set + +# Filesystem +BR2_INIT_NONE=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_SIZE="64M" +BR2_ROOTFS_OVERLAY="board/canaan/k210-soc/rootfs_overlay" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/canaan/k210-soc/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/canaan/k210-soc/genimage.cfg" + +# Bootloader and related host tools +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.04" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/uboot.config" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sipeed_maix_bitm" +BR2_TARGET_UBOOT_FORMAT_BIN=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_PYTHON_KFLASH=y diff --git a/configs/sipeed_maix_go_defconfig b/configs/sipeed_maix_go_defconfig new file mode 100644 index 00000000000..c3bcf98f812 --- /dev/null +++ b/configs/sipeed_maix_go_defconfig @@ -0,0 +1,39 @@ +# Architecture +BR2_riscv=y +BR2_RISCV_64=y +BR2_riscv_custom=y +BR2_RISCV_ISA_CUSTOM_RVM=y +BR2_RISCV_ISA_CUSTOM_RVA=y +BR2_RISCV_ISA_CUSTOM_RVF=y +BR2_RISCV_ISA_CUSTOM_RVD=y +BR2_RISCV_ISA_CUSTOM_RVC=y +# BR2_RISCV_USE_MMU is not set +BR2_RISCV_ABI_LP64D=y + +# Linux headers same as kernel, a 5.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19=y + +# Binary format +BR2_BINFMT_FLAT=y +BR2_BINFMT_FLAT_ONE=y +# BR2_TARGET_ENABLE_ROOT_LOGIN is not set + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +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" + +# Packages +BR2_PACKAGE_HOST_PYTHON_KFLASH=y +BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" +BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/busybox-tiny.config" +# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set + +# Filesystem +BR2_INIT_NONE=y +BR2_TARGET_ROOTFS_INITRAMFS=y +BR2_ROOTFS_OVERLAY="board/canaan/k210-soc/rootfs_overlay" diff --git a/configs/sipeed_maix_go_sdcard_defconfig b/configs/sipeed_maix_go_sdcard_defconfig new file mode 100644 index 00000000000..6c61e3aaafe --- /dev/null +++ b/configs/sipeed_maix_go_sdcard_defconfig @@ -0,0 +1,58 @@ +# Architecture +BR2_riscv=y +BR2_RISCV_64=y +BR2_riscv_custom=y +BR2_RISCV_ISA_CUSTOM_RVM=y +BR2_RISCV_ISA_CUSTOM_RVA=y +BR2_RISCV_ISA_CUSTOM_RVF=y +BR2_RISCV_ISA_CUSTOM_RVD=y +BR2_RISCV_ISA_CUSTOM_RVC=y +# BR2_RISCV_USE_MMU is not set +BR2_RISCV_ABI_LP64D=y + +# Linux headers same as kernel, a 5.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19=y + +# System +BR2_BINFMT_FLAT=y +BR2_BINFMT_FLAT_ONE=y +# BR2_TARGET_ENABLE_ROOT_LOGIN is not set + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +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_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="canaan/sipeed_maix_go" + +# Packages +BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" +# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set + +# Filesystem +BR2_INIT_NONE=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_SIZE="64M" +BR2_ROOTFS_OVERLAY="board/canaan/k210-soc/rootfs_overlay" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/canaan/k210-soc/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/canaan/k210-soc/genimage.cfg" + +# Bootloader and related host tools +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.04" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/uboot.config" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sipeed_maix_bitm" +BR2_TARGET_UBOOT_FORMAT_BIN=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_PYTHON_KFLASH=y diff --git a/configs/sipeed_maixduino_defconfig b/configs/sipeed_maixduino_defconfig new file mode 100644 index 00000000000..a30596af921 --- /dev/null +++ b/configs/sipeed_maixduino_defconfig @@ -0,0 +1,39 @@ +# Architecture +BR2_riscv=y +BR2_RISCV_64=y +BR2_riscv_custom=y +BR2_RISCV_ISA_CUSTOM_RVM=y +BR2_RISCV_ISA_CUSTOM_RVA=y +BR2_RISCV_ISA_CUSTOM_RVF=y +BR2_RISCV_ISA_CUSTOM_RVD=y +BR2_RISCV_ISA_CUSTOM_RVC=y +# BR2_RISCV_USE_MMU is not set +BR2_RISCV_ABI_LP64D=y + +# Linux headers same as kernel, a 5.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19=y + +# Binary format +BR2_BINFMT_FLAT=y +BR2_BINFMT_FLAT_ONE=y +# BR2_TARGET_ENABLE_ROOT_LOGIN is not set + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +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" + +# Packages +BR2_PACKAGE_HOST_PYTHON_KFLASH=y +BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" +BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/busybox-tiny.config" +# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set + +# Filesystem +BR2_INIT_NONE=y +BR2_TARGET_ROOTFS_INITRAMFS=y +BR2_ROOTFS_OVERLAY="board/canaan/k210-soc/rootfs_overlay" diff --git a/configs/sipeed_maixduino_sdcard_defconfig b/configs/sipeed_maixduino_sdcard_defconfig new file mode 100644 index 00000000000..da8cbe45f9f --- /dev/null +++ b/configs/sipeed_maixduino_sdcard_defconfig @@ -0,0 +1,58 @@ +# Architecture +BR2_riscv=y +BR2_RISCV_64=y +BR2_riscv_custom=y +BR2_RISCV_ISA_CUSTOM_RVM=y +BR2_RISCV_ISA_CUSTOM_RVA=y +BR2_RISCV_ISA_CUSTOM_RVF=y +BR2_RISCV_ISA_CUSTOM_RVD=y +BR2_RISCV_ISA_CUSTOM_RVC=y +# BR2_RISCV_USE_MMU is not set +BR2_RISCV_ABI_LP64D=y + +# Linux headers same as kernel, a 5.19 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19=y + +# System +BR2_BINFMT_FLAT=y +BR2_BINFMT_FLAT_ONE=y +# BR2_TARGET_ENABLE_ROOT_LOGIN is not set + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +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_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="canaan/sipeed_maixduino" + +# Packages +BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" +# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set + +# Filesystem +BR2_INIT_NONE=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_SIZE="64M" +BR2_ROOTFS_OVERLAY="board/canaan/k210-soc/rootfs_overlay" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/canaan/k210-soc/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/canaan/k210-soc/genimage.cfg" + +# Bootloader and related host tools +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.04" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/canaan/k210-soc/uboot.config" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sipeed_maix_bitm" +BR2_TARGET_UBOOT_FORMAT_BIN=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_PYTHON_KFLASH=y diff --git a/configs/solidrun_clearfog_gt_8k_defconfig b/configs/solidrun_clearfog_gt_8k_defconfig index bec4a7daccc..30b1e17925d 100644 --- a/configs/solidrun_clearfog_gt_8k_defconfig +++ b/configs/solidrun_clearfog_gt_8k_defconfig @@ -12,6 +12,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_TARGETS="mrvl_flash" BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="USE_COHERENT_MEM=0" +# BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP is not set BR2_TARGET_BINARIES_MARVELL=y BR2_TARGET_MV_DDR_MARVELL=y diff --git a/configs/solidrun_macchiatobin_defconfig b/configs/solidrun_macchiatobin_defconfig index 7d06313b03d..f388e37163a 100644 --- a/configs/solidrun_macchiatobin_defconfig +++ b/configs/solidrun_macchiatobin_defconfig @@ -12,6 +12,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_TARGETS="mrvl_flash" BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="USE_COHERENT_MEM=0" +# BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP is not set BR2_TARGET_BINARIES_MARVELL=y BR2_TARGET_MV_DDR_MARVELL=y diff --git a/configs/spike_riscv64_defconfig b/configs/spike_riscv64_defconfig index cc145bcd8e3..e23f1ce32cd 100644 --- a/configs/spike_riscv64_defconfig +++ b/configs/spike_riscv64_defconfig @@ -2,12 +2,14 @@ BR2_riscv=y BR2_RISCV_64=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.86" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=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.2" 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 01b54c02cc8..5640d9dc4d3 100644 --- a/configs/stm32f429_disco_xip_defconfig +++ b/configs/stm32f429_disco_xip_defconfig @@ -1,12 +1,12 @@ BR2_arm=y BR2_cortex_m4=y -BR2_KERNEL_HEADERS_5_15=y +BR2_KERNEL_HEADERS_6_1=y # BR2_UCLIBC_INSTALL_UTILS is not set -BR2_GCC_ENABLE_LTO=y +BR2_ENABLE_LTO=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" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.27" 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 @@ -14,6 +14,7 @@ BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="xipImage" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32f429-disco" BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" +# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_TARGET_ROOTFS_INITRAMFS=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_AFBOOT_STM32=y diff --git a/configs/stm32f469_disco_sd_defconfig b/configs/stm32f469_disco_sd_defconfig index ea1361efc02..24791178f46 100644 --- a/configs/stm32f469_disco_sd_defconfig +++ b/configs/stm32f469_disco_sd_defconfig @@ -14,10 +14,14 @@ BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="zImage" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32f469-disco" BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" +# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_SIZE="32M" # 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="2021.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32f469-discovery" BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_PACKAGE_HOST_DOSFSTOOLS=y diff --git a/configs/stm32f469_disco_xip_defconfig b/configs/stm32f469_disco_xip_defconfig index d95b7759f31..ae2780556ad 100644 --- a/configs/stm32f469_disco_xip_defconfig +++ b/configs/stm32f469_disco_xip_defconfig @@ -2,7 +2,7 @@ BR2_arm=y BR2_cortex_m4=y BR2_KERNEL_HEADERS_5_15=y # BR2_UCLIBC_INSTALL_UTILS is not set -BR2_GCC_ENABLE_LTO=y +BR2_ENABLE_LTO=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/stmicroelectronics/common/stm32f4xx/stm32-post-build.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y @@ -14,6 +14,7 @@ BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="xipImage" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32f469-disco" BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" +# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_TARGET_ROOTFS_INITRAMFS=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_AFBOOT_STM32=y diff --git a/configs/ts7680_defconfig b/configs/ts7680_defconfig index 7eb57ab1c57..9e058b1d78f 100644 --- a/configs/ts7680_defconfig +++ b/configs/ts7680_defconfig @@ -4,7 +4,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/technologic/ts7680/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,embeddedarm,linux-4.9.y,d03d426e6abd95a973bc669315206295713c17e8)/linux-d03d426e6abd95a973bc669315206295713c17e8.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,embeddedTS,linux-4.9.y,v4.9.311-ts)/linux-v4.9.311-ts.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="ts_imx28" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x40008000" diff --git a/configs/versal_vck190_defconfig b/configs/versal_vck190_defconfig new file mode 100644 index 00000000000..a393b681c86 --- /dev/null +++ b/configs/versal_vck190_defconfig @@ -0,0 +1,41 @@ +BR2_aarch64=y +BR2_cortex_a72=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=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 vck190" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v5.15_LTS_2022.2)/xlnx_rebase_v5.15_LTS_2022.2.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="xilinx_versal" +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_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.6_2022.2)/xlnx_rebase_v2.6_2022.2.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="versal" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=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_v2022.01_2022.2)/xlnx_rebase_v2022.01_2022.2.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_versal_virt" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/versal/uboot.fragment" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=versal-vck190-rev1.1" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_REMAKE_ELF=y +BR2_TARGET_UBOOT_FORMAT_DTB=y +BR2_PACKAGE_VERSAL_FIRMWARE=y +BR2_PACKAGE_VERSAL_FIRMWARE_VERSION="2022.2_br_1" +BR2_PACKAGE_VERSAL_FIRMWARE_BOARD="vck190" +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_BOOTGEN=y diff --git a/configs/visionfive2_defconfig b/configs/visionfive2_defconfig new file mode 100644 index 00000000000..5b07a8efbc3 --- /dev/null +++ b/configs/visionfive2_defconfig @@ -0,0 +1,18 @@ +BR2_riscv=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_SYSTEM_DHCP="eth0" +BR2_ROOTFS_OVERLAY="board/visionfive2/overlay" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/visionfive/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,starfive-tech,linux,7b7b4eddd8d5ae55f6e0ee09b93e16e23ab4f97b)/linux-7b7b4eddd8d5ae55f6e0ee09b93e16e23ab4f97b.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="starfive_visionfive2" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="starfive/jh7110-visionfive-v2" +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_TAR is not set +BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/visionfive_defconfig b/configs/visionfive_defconfig new file mode 100644 index 00000000000..0d9325078a2 --- /dev/null +++ b/configs/visionfive_defconfig @@ -0,0 +1,18 @@ +BR2_riscv=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0=y +BR2_SYSTEM_DHCP="eth0" +BR2_ROOTFS_OVERLAY="board/visionfive/overlay" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/visionfive/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,starfive-tech,linux,cfcb617265422c0af0ae5bc9688dceba2d10b27a)/linux-cfcb617265422c0af0ae5bc9688dceba2d10b27a.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="visionfive" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="starfive/jh7100-starfive-visionfive-v1" +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_TAR is not set +BR2_PACKAGE_HOST_GENIMAGE=y diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig index 1bb11fee7ee..459a3a40bc0 100644 --- a/configs/zynq_microzed_defconfig +++ b/configs/zynq_microzed_defconfig @@ -2,26 +2,26 @@ BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyPS0" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=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,xilinx-v2017.3)/linux-xilinx-v2017.3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v5.15_LTS_2022.2)/xlnx_rebase_v5.15_LTS_2022.2.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="zynq-zed" -BR2_TARGET_ROOTFS_CPIO=y -BR2_TARGET_ROOTFS_CPIO_GZIP=y -BR2_TARGET_ROOTFS_CPIO_UIMAGE=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="zynq-microzed" +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_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/Xilinx/u-boot-xlnx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xilinx-v2018.2" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="zynq_microzed" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2022.01_2022.2)/xlnx_rebase_v2022.01_2022.2.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynq_virt" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynq-microzed" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMG=y diff --git a/configs/zynq_qmtech_defconfig b/configs/zynq_qmtech_defconfig index 4db3f68b1f2..f536b80f57b 100644 --- a/configs/zynq_qmtech_defconfig +++ b/configs/zynq_qmtech_defconfig @@ -5,6 +5,7 @@ BR2_ARM_ENABLE_VFP=y BR2_GLOBAL_PATCH_DIR="board/qmtech/zynq/patches" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_TARGET_GENERIC_GETTY_PORT="ttyPS0" +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 @@ -14,9 +15,9 @@ BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="zynq-qmtech" -BR2_TARGET_ROOTFS_CPIO=y -BR2_TARGET_ROOTFS_CPIO_GZIP=y -BR2_TARGET_ROOTFS_CPIO_UIMAGE=y +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_TARBALL=y diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig index e8019177d2b..3ad8cbafe39 100644 --- a/configs/zynq_zc706_defconfig +++ b/configs/zynq_zc706_defconfig @@ -2,26 +2,26 @@ BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyPS0" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=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,xilinx-v2017.3)/linux-xilinx-v2017.3.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v5.15_LTS_2022.2)/xlnx_rebase_v5.15_LTS_2022.2.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="zynq-zc706" -BR2_TARGET_ROOTFS_CPIO=y -BR2_TARGET_ROOTFS_CPIO_GZIP=y -BR2_TARGET_ROOTFS_CPIO_UIMAGE=y +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_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/Xilinx/u-boot-xlnx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xilinx-v2018.2" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="zynq_zc706" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2022.01_2022.2)/xlnx_rebase_v2022.01_2022.2.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynq_virt" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynq-zc706" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMG=y diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig index a215695b541..a39911b757b 100644 --- a/configs/zynq_zed_defconfig +++ b/configs/zynq_zed_defconfig @@ -2,26 +2,26 @@ BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyPS0" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=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_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v5.15_LTS_2022.2)/xlnx_rebase_v5.15_LTS_2022.2.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="zynq-zed" -BR2_TARGET_ROOTFS_CPIO=y -BR2_TARGET_ROOTFS_CPIO_GZIP=y -BR2_TARGET_ROOTFS_CPIO_UIMAGE=y +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_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/Xilinx/u-boot-xlnx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xilinx-v2018.2" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="zynq_zed" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2022.01_2022.2)/xlnx_rebase_v2022.01_2022.2.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynq_virt" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynq-zed" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMG=y diff --git a/configs/zynqmp_kria_kv260_defconfig b/configs/zynqmp_kria_kv260_defconfig new file mode 100644 index 00000000000..e180d5e7e77 --- /dev/null +++ b/configs/zynqmp_kria_kv260_defconfig @@ -0,0 +1,41 @@ +BR2_aarch64=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh board/zynqmp/kria/kv260/kv260.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS1,115200 mmcblk1p2 ${UBOOT_DIR}" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v5.15_LTS_2022.2)/xlnx_rebase_v5.15_LTS_2022.2.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" +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_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.6_2022.2)/xlnx_rebase_v2.6_2022.2.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="ZYNQMP_CONSOLE=cadence1" +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_v2022.01_2022.2)/xlnx_rebase_v2022.01_2022.2.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/kria/uboot.fragment" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-smk-k26-revA" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" +BR2_TARGET_UBOOT_ZYNQMP=y +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/ubuntu-firmware/raw/2022.2_br_1/kv260/kv260_pmufw.elf" +BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/kria/kv260/pm_cfg_obj.c" +BR2_TARGET_UBOOT_FORMAT_ITB=y +BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_GLOBAL_PATCH_DIR="board/zynqmp/kria/patches" diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig index 4e964891792..00b33261b60 100644 --- a/configs/zynqmp_zcu102_defconfig +++ b/configs/zynqmp_zcu102_defconfig @@ -2,10 +2,10 @@ BR2_aarch64=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y 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="ttyPS0,115200 mmcblk0p2" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.15-930-g966124532656bc95d781abf57531e4cd4f962237" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v5.15_LTS_2022.2)/xlnx_rebase_v5.15_LTS_2022.2.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0" @@ -14,24 +14,22 @@ 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_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v2.6-33-ge678d5ddc475f34dea8f5004fb6ebde118621784" +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.6_2022.2)/xlnx_rebase_v2.6_2022.2.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_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2022.01-165-g667001319cbe511ce6353195fb4910ae5cb041ce" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2022.01_2022.2)/xlnx_rebase_v2022.01_2022.2.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" -BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/zcu102/uboot.fragment" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-zcu102-rev1.0" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/v2021.2/bin/pmufw-v2021.2.bin" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/ubuntu-firmware/raw/2022.2_br_1/zcu102/zcu102_pmufw.elf" BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/zcu102/pm_cfg_obj.c" BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index 0a97975aa05..88295571af9 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -2,10 +2,10 @@ BR2_aarch64=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y 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="ttyPS0,115200 mmcblk0p2" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_GIT=y -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/Xilinx/linux-xlnx.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v5.15-930-g966124532656bc95d781abf57531e4cd4f962237" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v5.15_LTS_2022.2)/xlnx_rebase_v5.15_LTS_2022.2.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynqmp" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" @@ -14,24 +14,22 @@ 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_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/Xilinx/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v2.6-33-ge678d5ddc475f34dea8f5004fb6ebde118621784" +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.6_2022.2)/xlnx_rebase_v2.6_2022.2.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_GIT=y -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2022.01-165-g667001319cbe511ce6353195fb4910ae5cb041ce" +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2022.01_2022.2)/xlnx_rebase_v2022.01_2022.2.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" -BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/zcu106/uboot.fragment" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-zcu106-revA" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/lucaceresoli/zynqmp-pmufw-binaries/raw/v2021.2/bin/pmufw-v2021.2.bin" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/ubuntu-firmware/raw/2022.2_br_1/zcu106/zcu106_pmufw.elf" BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/zcu106/pm_cfg_obj.c" BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y diff --git a/docs/manual/adding-board-support.txt b/docs/manual/adding-board-support.txt index cd90a5871fa..ef6dbd3c2b9 100644 --- a/docs/manual/adding-board-support.txt +++ b/docs/manual/adding-board-support.txt @@ -49,8 +49,25 @@ Buildroot configuration. Refer to xref:customize[] for more details. Before submitting patches for new boards it is recommended to test it by building it using latest gitlab-CI docker container. To do this use -utils/docker-run script and inside it issue these commands: ++utils/docker-run+ script and inside it issue these commands: + -------------------- - $ make +_defconfig+ + $ make _defconfig $ make -------------------- + +By default, Buildroot developers use the official image hosted on the +https://gitlab.com/buildroot.org/buildroot/container_registry/2395076[gitlab.com +registry] and it should be convenient for most usage. If you still want +to build your own docker image, you can base it off the official image +as the +FROM+ directive of your own _Dockerfile_: + +---- +FROM registry.gitlab.com/buildroot.org/buildroot/base:YYYYMMDD.HHMM +RUN ... +COPY ... +---- + +The current version _YYYYMMDD.HHMM_ can be found in the +.gitlab-ci.yml+ +file at the top of the Buildroot source tree; all past versions are +listed in the aforementioned registry as well. diff --git a/docs/manual/adding-packages-directory.txt b/docs/manual/adding-packages-directory.txt index 749e2d43b9d..04f5241d053 100644 --- a/docs/manual/adding-packages-directory.txt +++ b/docs/manual/adding-packages-directory.txt @@ -429,8 +429,8 @@ different way, using different infrastructures: and xref:cmake-package-reference[reference]. * *Makefiles for Python modules*: We have a dedicated infrastructure - for Python modules that use either the +distutils+ or the - +setuptools+ mechanism. We cover them through a + for Python modules that use the +distutils+, +flit+, +pep517+ or + +setuptools+ mechanisms. We cover them through a xref:python-package-tutorial[tutorial] and a xref:python-package-reference[reference]. diff --git a/docs/manual/adding-packages-hooks.txt b/docs/manual/adding-packages-hooks.txt index 0ce79f8907f..741b71ca296 100644 --- a/docs/manual/adding-packages-hooks.txt +++ b/docs/manual/adding-packages-hooks.txt @@ -46,6 +46,8 @@ The following hook points are available: * +LIBFOO_PRE_LEGAL_INFO_HOOKS+ * +LIBFOO_POST_LEGAL_INFO_HOOKS+ +* +LIBFOO_TARGET_FINALIZE_HOOKS+ + These variables are 'lists' of variable names containing actions to be performed at this hook point. This allows several hooks to be registered at a given hook point. Here is an example: diff --git a/docs/manual/adding-packages-python.txt b/docs/manual/adding-packages-python.txt index 0141fea85b7..500967f235a 100644 --- a/docs/manual/adding-packages-python.txt +++ b/docs/manual/adding-packages-python.txt @@ -4,8 +4,9 @@ === Infrastructure for Python packages This infrastructure applies to Python packages that use the standard -Python setuptools mechanism as their build system, generally -recognizable by the usage of a +setup.py+ script. +Python setuptools or pep517 mechanisms as their build system, generally +recognizable by the usage of a +setup.py+ script or +pyproject.toml+ +file. [[python-package-tutorial]] @@ -50,8 +51,8 @@ On line 13, we declare our dependencies, so that they are built before the build process of our package starts. On line 14, we declare the specific Python build system being used. In -this case the +distutils+ Python build system is used. The two -supported ones are +distutils+ and +setuptools+. +this case the +distutils+ Python build system is used. The four +supported ones are +distutils+, +flit+, +pep517+ and +setuptools+. Finally, on line 16, we invoke the +python-package+ macro that generates all the Makefile rules that actually allow the package to be @@ -97,11 +98,13 @@ Note that: One variable specific to the Python infrastructure is mandatory: * +PYTHON_FOO_SETUP_TYPE+, to define which Python build system is used - by the package. The two supported values are +distutils+ and - +setuptools+. If you don't know which one is used in your package, - look at the +setup.py+ file in your package source code, and see - whether it imports things from the +distutils+ module or the - +setuptools+ module. + by the package. The four supported values are +distutils+, +flit+, + +pep517+ and +setuptools+. If you don't know which one is used in + your package, look at the +setup.py+ or +pyproject.toml+ file in your + package source code, and see whether it imports things from the + +distutils+, +flit+ module or the +setuptools+ module. If the package + is using a +pyproject.toml+ file without any build-system requires + and with a local in-tree backend-path one should use +pep517+. A few additional variables, specific to the Python infrastructure, can optionally be defined, depending on the package's needs. Many of them @@ -109,37 +112,48 @@ are only useful in very specific cases, typical packages will therefore only use a few of them, or none. * +PYTHON_FOO_SUBDIR+ may contain the name of a subdirectory inside the - package that contains the main +setup.py+ file. This is useful, - if for example, the main +setup.py+ file is not at the root of - the tree extracted by the tarball. If +HOST_PYTHON_FOO_SUBDIR+ is not - specified, it defaults to +PYTHON_FOO_SUBDIR+. + package that contains the main +setup.py+ or +pyproject.toml+ file. + This is useful, if for example, the main +setup.py+ or +pyproject.toml+ + file is not at the root of the tree extracted by the tarball. If + +HOST_PYTHON_FOO_SUBDIR+ is not specified, it defaults to + +PYTHON_FOO_SUBDIR+. * +PYTHON_FOO_ENV+, to specify additional environment variables to - pass to the Python +setup.py+ script (for both the build and install - steps). Note that the infrastructure is automatically passing - several standard variables, defined in +PKG_PYTHON_DISTUTILS_ENV+ - (for distutils target packages), +HOST_PKG_PYTHON_DISTUTILS_ENV+ - (for distutils host packages), +PKG_PYTHON_SETUPTOOLS_ENV+ (for - setuptools target packages) and +HOST_PKG_PYTHON_SETUPTOOLS_ENV+ - (for setuptools host packages). + pass to the Python +setup.py+ script (for distutils/setuptools + packages) or the +support/scripts/pyinstaller.py+ script (for + flit/pep517 packages) for both the build and install steps. Note + that the infrastructure is automatically passing several standard + variables, defined in +PKG_PYTHON_DISTUTILS_ENV+ (for distutils + target packages), +HOST_PKG_PYTHON_DISTUTILS_ENV+ (for distutils + host packages), +PKG_PYTHON_SETUPTOOLS_ENV+ (for setuptools target + packages), +HOST_PKG_PYTHON_SETUPTOOLS_ENV+ (for setuptools host + packages), +PKG_PYTHON_PEP517_ENV+ (for flit/pep517 target 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. For target distutils - packages, the +PKG_PYTHON_DISTUTILS_BUILD_OPTS+ options are already - passed automatically by the infrastructure. + Python +setup.py+ script during the build step, this generally only + makes sense to use for distutils/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+. + For target distutils packages, the +PKG_PYTHON_DISTUTILS_BUILD_OPTS+ + options are already passed automatically by the infrastructure. * +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 during the target installation step, - the staging installation step or the host installation, - respectively. Note that the infrastructure is automatically passing - some options, defined in +PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS+ - or +PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS+ (for target distutils + to the Python +setup.py+ script (for distutils/setuptools packages) + or +support/scripts/pyinstaller.py+ (for flit/pep517 packages) during + the target installation step, the staging installation step or the + host installation, respectively. Note that the infrastructure is + automatically passing some options, defined in + +PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS+ or + +PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS+ (for target distutils packages), +HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS+ (for host distutils packages), +PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS+ or +PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS+ (for target setuptools - packages) and +HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS+ (for host - setuptools packages). + packages), +HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS+ (for host + setuptools packages) and +PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS+ or + +PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS+ (for target flit/pep517 + packages). With the Python infrastructure, all the steps required to build and install the packages are already defined, and they generally work well diff --git a/docs/manual/ccache-support.txt b/docs/manual/ccache-support.txt index f6746ad7d83..ab4f10be23c 100644 --- a/docs/manual/ccache-support.txt +++ b/docs/manual/ccache-support.txt @@ -15,10 +15,12 @@ speed up the build process. +Enable compiler cache+ in +Build options+. This will automatically build +ccache+ and use it for every host and target compilation. -The cache is located in +$HOME/.buildroot-ccache+. It is stored -outside of Buildroot output directory so that it can be shared by -separate Buildroot builds. If you want to get rid of the cache, simply -remove this directory. +The cache is located in the directory defined by the +BR2_CCACHE_DIR+ +configuration option, which defaults to ++$HOME/.buildroot-ccache+. This default location is outside of +Buildroot output directory so that it can be shared by separate +Buildroot builds. If you want to get rid of the cache, simply remove +this directory. You can get statistics on the cache (its size, number of hits, misses, etc.) by running +make ccache-stats+. @@ -53,3 +55,15 @@ first. See https://ccache.samba.org/manual.html#_compiling_in_different_directories[the ccache manual's section on "Compiling in different directories"] for more details about this rewriting of absolute paths. + +When +ccache+ is enabled in Buildroot using the +BR2_CCACHE=y+ option: + +* +ccache+ is used during the Buildroot build itself + +* +ccache+ is not used when building outside of Buildroot, for example + when directly calling the cross-compiler or using the SDK + +One can override this behavior using the +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. diff --git a/docs/manual/common-usage.txt b/docs/manual/common-usage.txt index 9ba87a83399..bc78f4a8716 100644 --- a/docs/manual/common-usage.txt +++ b/docs/manual/common-usage.txt @@ -30,13 +30,13 @@ the Linux kernel. To use it, add +O=+ to the make command line: -------------------- - $ make O=/tmp/build + $ make O=/tmp/build menuconfig -------------------- Or: -------------------- - $ cd /tmp/build; make O=$PWD -C path/to/buildroot + $ cd /tmp/build; make O=$PWD -C path/to/buildroot menuconfig -------------------- All the output files will be located under +/tmp/build+. If the +O+ @@ -417,6 +417,4 @@ effects: be empty and it's only at the very end of the build that they will be populated. -include::eclipse-integration.txt[] - include::advanced.txt[] diff --git a/docs/manual/contribute.txt b/docs/manual/contribute.txt index bf2aed6b51a..15fe36aef03 100644 --- a/docs/manual/contribute.txt +++ b/docs/manual/contribute.txt @@ -247,6 +247,23 @@ which have the upstream license), and that you are allowed to do so. See http://developercertificate.org/[the Developer Certificate of Origin] for details. +To give credits to who sponsored the creation of a patch or the process of +upstreaming it, you may use +https://datatracker.ietf.org/doc/html/rfc5233[email subaddressing] for +your git identity (i.e. what is used as commit author and email +From:+ +field, as well as your Signed-off-by tag); add suffix to the local part, +separated from it by a plus `+` sign. E.g.: + +* for a company which sponsored the submitted work, use the company name + as the detail (suffix) part: ++ +`Your-Name Your-Surname ` + +* for an individual who sponsored who sponsored the submitted work, use + their name and surname: ++ +`Your-Name Your-Surname ` + When adding new packages, you should submit every package in a separate patch. This patch should have the update to +package/Config.in+, the package +Config.in+ file, the +.mk+ file, the @@ -294,6 +311,12 @@ $ 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: @@ -418,7 +441,8 @@ editing the commit message. Below the +Signed-off-by+ section, add +---+ and your changelog. Although the changelog will be visible for the reviewers in the mail -thread, as well as in http://patchwork.buildroot.org[patchwork], +git+ +thread, as well as in +https://patchwork.ozlabs.org/project/buildroot/list/[patchwork], +git+ will automatically ignores lines below +---+ when the patch will be merged. This is the intended behavior: the changelog is not meant to be preserved forever in the +git+ history of the project. @@ -470,19 +494,22 @@ $ git format-patch -v4 -M -s -o outgoing origin/master --------------------- When you provide a new version of a patch, please mark the old one as -superseded in http://patchwork.buildroot.org[patchwork]. You need to -create an account on http://patchwork.buildroot.org[patchwork] to be +superseded in +https://patchwork.ozlabs.org/project/buildroot/list/[patchwork]. You +need to create an account on +https://patchwork.ozlabs.org/project/buildroot/list/[patchwork] to be able to modify the status of your patches. Note that you can only change the status of patches you submitted yourself, which means the email -address you register in http://patchwork.buildroot.org[patchwork] should +address you register in +https://patchwork.ozlabs.org/project/buildroot/list/[patchwork] should match the one you use for sending patches to the mailing list. You can also add the +--in-reply-to + option when submitting a patch to the mailing list. The id of the mail to reply to can be found under the "Message Id" tag on -http://patchwork.buildroot.org[patchwork]. The advantage of -*in-reply-to* is that patchwork will automatically mark the previous -version of the patch as superseded. +https://patchwork.ozlabs.org/project/buildroot/list/[patchwork]. The +advantage of *in-reply-to* is that patchwork will automatically mark +the previous version of the patch as superseded. [[reporting-bugs]] === Reporting issues/bugs or getting help diff --git a/docs/manual/customize-configuration.txt b/docs/manual/customize-configuration.txt index ae6cebe6c44..fa8f454674d 100644 --- a/docs/manual/customize-configuration.txt +++ b/docs/manual/customize-configuration.txt @@ -15,8 +15,8 @@ make with +make savedefconfig BR2_DEFCONFIG=+. The recommended place to store this defconfig is +configs/_defconfig+. If you follow this recommendation, the -configuration will be listed in +make help+ and can be set again by -running +make _defconfig+. +configuration will be listed in +make list-defconfigs+ and can be set +again by running +make _defconfig+. Alternatively, you can copy the file to any other place and rebuild with +make defconfig BR2_DEFCONFIG=+. diff --git a/docs/manual/customize-directory-structure.txt b/docs/manual/customize-directory-structure.txt index a3a7ad4cb9e..1249421da2f 100644 --- a/docs/manual/customize-directory-structure.txt +++ b/docs/manual/customize-directory-structure.txt @@ -27,10 +27,10 @@ to you. | +-- post_image.sh | +-- rootfs_overlay/ | | +-- etc/ -| | +-- +| | +-- | +-- patches/ | +-- foo/ -| | +-- +| | +-- | +-- libbar/ | +-- | diff --git a/docs/manual/developers.txt b/docs/manual/developers.txt index 7058d57b200..29846b5650d 100644 --- a/docs/manual/developers.txt +++ b/docs/manual/developers.txt @@ -45,5 +45,6 @@ the +DEVELOPERS+ file for various tasks: list the ones that are not handled by any developer. The purpose of this option is to help completing the +DEVELOPERS+ file. -- When using without any arguments, it validates the integrity of the - DEVELOPERS file and will note WARNINGS for items that don't match. +- When using the +-v+ command line option, it validates the integrity + of the DEVELOPERS file and will note WARNINGS for items that don't + match. diff --git a/docs/manual/eclipse-integration.txt b/docs/manual/eclipse-integration.txt deleted file mode 100644 index 1f726d82405..00000000000 --- a/docs/manual/eclipse-integration.txt +++ /dev/null @@ -1,30 +0,0 @@ -// -*- mode:doc; -*- -// vim: set syntax=asciidoc: - -=== Integration with Eclipse - -While a part of the embedded Linux developers like classical text -editors like Vim or Emacs, and command-line based interfaces, a number -of other embedded Linux developers like richer graphical interfaces to -do their development work. Eclipse being one of the most popular -Integrated Development Environment, Buildroot integrates with Eclipse -in order to ease the development work of Eclipse users. - -Our integration with Eclipse simplifies the compilation, remote -execution and remote debugging of applications and libraries that are -built on top of a Buildroot system. It does not integrate the -Buildroot configuration and build processes themselves with -Eclipse. Therefore, the typical usage model of our Eclipse integration -would be: - -* Configure your Buildroot system with +make menuconfig+, +make - xconfig+ or any other configuration interface provided with - Buildroot. -* Build your Buildroot system by running +make+. -* Start Eclipse to develop, execute and debug your own custom - applications and libraries, that will rely on the libraries built - and installed by Buildroot. - -The Buildroot Eclipse integration installation process and usage is -described in detail at -https://github.com/mbats/eclipse-buildroot-bundle/wiki. diff --git a/docs/manual/faq-troubleshooting.txt b/docs/manual/faq-troubleshooting.txt index 5adf3fa6ce6..b08bf9bc4ae 100644 --- a/docs/manual/faq-troubleshooting.txt +++ b/docs/manual/faq-troubleshooting.txt @@ -45,7 +45,7 @@ distribution_ and you should opt for something like: * http://www.openembedded.org[openembedded] * https://www.yoctoproject.org[yocto] -* http://www.emdebian.org[emdebian] +* https://www.debian.org/ports/[Debian] * https://fedoraproject.org/wiki/Architectures[Fedora] * http://en.opensuse.org/Portal:ARM[openSUSE ARM] * http://archlinuxarm.org[Arch Linux ARM] diff --git a/docs/manual/integration-selinux-support.txt b/docs/manual/integration-selinux-support.txt new file mode 100644 index 00000000000..1f6bcf47ebd --- /dev/null +++ b/docs/manual/integration-selinux-support.txt @@ -0,0 +1,74 @@ +// -*- mode:doc; -*- +// vim: set syntax=asciidoc: + +[[selinux]] +=== Using SELinux in Buildroot + +https://selinuxproject.org[SELinux] is a Linux kernel security module +enforcing access control policies. In addition to the traditional file +permissions and access control lists, +SELinux+ allows to write rules +for users or processes to access specific functions of resources +(files, sockets...). + +_SELinux_ has three modes of operation: + +* _Disabled_: the policy is not applied +* _Permissive_: the policy is applied, and non-authorized actions are + simply logged. This mode is often used for troubleshooting SELinux + issues. +* _Enforcing_: the policy is applied, and non-authorized actions are + denied + +In Buildroot the mode of operation is controlled by the ++BR2_PACKAGE_REFPOLICY_POLICY_STATE_*+ configuration options. The +Linux kernel also has various configuration options that affect how ++SELinux+ is enabled (see +security/selinux/Kconfig+ in the Linux +kernel sources). + +By default in Buildroot the +SELinux+ policy is provided by the +upstream https://github.com/SELinuxProject/refpolicy[refpolicy] +project, enabled with +BR2_PACKAGE_REFPOLICY+. + +[[enabling-selinux]] +==== Enabling SELinux support + +To have proper support for +SELinux+ in a Buildroot generated system, +the following configuration options must be enabled: + +* +BR2_PACKAGE_LIBSELINUX+ +* +BR2_PACKAGE_REFPOLICY+ + +In addition, your filesystem image format must support extended +attributes. + +[[selinux-policy-tweaking]] +==== SELinux policy tweaking + +The +SELinux refpolicy+ contains modules that can be enabled or +disabled when being built. Each module provide a number of +SELinux+ +rules. In Buildroot the non-base modules are disabled by default and +several ways to enable such modules are provided: + +- Packages can enable a list of +SELinux+ modules within the +refpolicy+ using + the +_SELINUX_MODULES+ variable. +- Packages can provide additional +SELinux+ modules by putting them (.fc, .if + and .te files) in +package//selinux/+. +- Extra +SELinux+ modules can be added in directories pointed by the + +BR2_REFPOLICY_EXTRA_MODULES_DIRS+ configuration option. +- Additional modules in the +refpolicy+ can be enabled if listed in the + +BR2_REFPOLICY_EXTRA_MODULES_DEPENDENCIES+ configuration option. + +Buildroot also allows to completely override the +refpolicy+. This +allows to provide a full custom policy designed specifically for a +given system. When going this way, all of the above mechanisms are +disabled: no extra +SElinux+ module is added to the policy, and all +the available modules within the custom policy are enabled and built +into the final binary policy. The custom policy must be a fork of the +official https://github.com/SELinuxProject/refpolicy[refpolicy]. + +In order to fully override the +refpolicy+ the following configuration +variables have to be set: + +- +BR2_PACKAGE_REFPOLICY_CUSTOM_GIT+ +- +BR2_PACKAGE_REFPOLICY_CUSTOM_REPO_URL+ +- +BR2_PACKAGE_REFPOLICY_CUSTOM_REPO_VERSION+ diff --git a/docs/manual/integration-systemd.txt b/docs/manual/integration-systemd.txt new file mode 100644 index 00000000000..44248b43ff8 --- /dev/null +++ b/docs/manual/integration-systemd.txt @@ -0,0 +1,27 @@ +// -*- mode:doc; -*- +// vim: set syntax=asciidoc: + +[[integration-systemd]] +=== Systemd + +This chapter describes the decisions taken in Buildroot's integration of +systemd, and how various use cases can be implemented. + +==== DBus daemon + +Systemd requires a DBus daemon. There are two options for it: traditional dbus +(+BR2_PACKAGE_DBUS+) and bus1 dbus-broker (+BR2_PACKAGE_DBUS_BROKER+). At +least one of them must be chosen. If both are included in the configuration, +dbus-broker will be used as system bus, but the traditional dbus-daemon is +still installed as well and can be used as session bus. Also its tools (e.g. ++dbus-send+) can be used (systemd itself has +busctl+ as an alternative). In +addition, the traditional dbus package is the only one that provides +libdbus+, +which is used by many packages as dbus integration library. + +Both in the dbus and in the dbus-broker case, the daemon runs as user +dbus+. +The DBus configuration files are also identical for both. + +To make sure that only one of the two daemons is started as system bus, the +systemd activation files of the dbus package (+dbus.socket+ and the ++dbus.service+ symlink in +multi-user.target.wants+) are removed when +dbus-broker is selected. diff --git a/docs/manual/integration.txt b/docs/manual/integration.txt new file mode 100644 index 00000000000..be56bf65671 --- /dev/null +++ b/docs/manual/integration.txt @@ -0,0 +1,14 @@ +// -*- mode:doc; -*- +// vim: set syntax=asciidoc: + +[[integration]] +== Integration topics + +This chapter discusses how various things are integrated at system +level. Buildroot is highly configurable, almost everything discussed +here can be changed or overridden by xref:rootfs-custom[rootfs overlay +or custom skeleton] configuration. + +include::integration-systemd.txt[] + +include::integration-selinux-support.txt[] diff --git a/docs/manual/known-issues.txt b/docs/manual/known-issues.txt index 616430b91cf..743b794e878 100644 --- a/docs/manual/known-issues.txt +++ b/docs/manual/known-issues.txt @@ -7,7 +7,7 @@ if such options contain a +$+ sign. For example, the following is known to break: +BR2_TARGET_LDFLAGS="-Wl,-rpath=\'$ORIGIN/../lib'"+ -* The +libffi+ package is not supported on the SuperH 2, nds32, and ARMv7-M +* The +libffi+ package is not supported on the SuperH 2 and ARMv7-M architectures. * The +prboom+ package triggers a compiler failure with the SuperH 4 diff --git a/docs/manual/makeusers-syntax.txt b/docs/manual/makeusers-syntax.txt index 3d1013f447a..0a955970b3a 100644 --- a/docs/manual/makeusers-syntax.txt +++ b/docs/manual/makeusers-syntax.txt @@ -90,3 +90,16 @@ This will create this user: - +shell+ is: +/bin/sh+ - +test+ is not a member of any additional +groups+ - +comment+ is: +Test user+ + + +=== Caveat with automatic UIDs and GIDs + +When updating buildroot or when packages are added or removed to/from +the configuration, it is possible that the automatic UIDs and GIDs are +changed. This can be a problem if persistent files were created with +that user or group: after upgrade, they will suddenly have a different +owner. + +Therefore, it is advisable to perpetuate the automatic IDs. This can be +done by adding a users table with the generated IDs. It is only needed +to do this for UIDs that actually create persistent files, e.g. database. diff --git a/docs/manual/manual.txt b/docs/manual/manual.txt index b5cc044805b..d6534ca2957 100644 --- a/docs/manual/manual.txt +++ b/docs/manual/manual.txt @@ -12,7 +12,7 @@ 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] file in the Buildroot sources for the full text of this license. -Copyright (C) 2004-2020 The Buildroot developers +Copyright (C) The Buildroot developers image::logo.png[] @@ -38,7 +38,7 @@ include::common-usage.txt[] include::customize.txt[] -include::selinux-support.txt[] +include::integration.txt[] include::faq-troubleshooting.txt[] diff --git a/docs/manual/patch-policy.txt b/docs/manual/patch-policy.txt index e704a0d3f3d..dc35132ecfd 100644 --- a/docs/manual/patch-policy.txt +++ b/docs/manual/patch-policy.txt @@ -44,6 +44,11 @@ These patch files should be named +-.patch+. - The field ++ in the patch file name refers to the 'apply order', and shall start at 1; It is preferred to pad the number with zeros up to 4 digits, like 'git-format-patch' does. E.g.: +0001-foobar-the-buz.patch+ +- The patch email subject prefix shall not be numbered. Patches shall + be generated with the +git format-patch -N+ command, since this + numbering is automatically added for series. For example, the patch + subject line should look like +Subject: [PATCH] foobar the buz+ rather + than +Subject: [PATCH n/m] foobar the buz+. - Previously, it was mandatory for patches to be prefixed with the name of the package, like +--.patch+, but that is no longer the case. Existing packages will be fixed as time passes. 'Do @@ -139,24 +144,37 @@ AC_PROG_MAKE_SET +AM_CONDITIONAL([CXX_WORKS], [test "x$rw_cv_prog_cxx_works" = "xyes"]) --------------- -=== Integrating patches found on the Web +=== Additional patch documentation -When integrating a patch of which you are not the author, you have to -add a few things in the header of the patch itself. +Ideally, all patches should document an upstream patch or patch submission, when +applicable, via the +Upstream+ trailer. -Depending on whether the patch has been obtained from the project -repository itself, or from somewhere on the web, add one of the -following tags: +When backporting an upstream patch that has been accepted into mainline, it is +preferred that the URL to the commit is referenced: --------------- -Backported from: +Upstream: --------------- -or +If a new issue is identified in Buildroot and upstream is generally affected by +the issue (it's not a Buildroot specific issue), users should submit the patch +upstream and provide a link to that submission when possible: --------------- -Fetch from: +Upstream: --------------- -It is also sensible to add a few words about any changes to the patch -that may have been necessary. +Patches that have been submitted but were denied upstream should note that and +include comments about why the patch is being used despite the upstream status. + +Note: in any of the above scenarios, it is also sensible to add a few words +about any changes to the patch that may have been necessary. + +If a patch does not apply upstream then this should be noted with a comment: + +--------------- +Upstream: N/A +--------------- + +Adding this documentation helps streamline the patch review process during +package version updates. \ No newline at end of file diff --git a/docs/manual/prerequisite.txt b/docs/manual/prerequisite.txt index 40071491f83..48be489f90d 100644 --- a/docs/manual/prerequisite.txt +++ b/docs/manual/prerequisite.txt @@ -23,6 +23,7 @@ between distributions). ** +make+ (version 3.81 or any later) ** +binutils+ ** +build-essential+ (only for Debian based systems) +** +diffutils+ ** +gcc+ (version 4.8 or any later) ** `g++` (version 4.8 or any later) ** +bash+ @@ -36,6 +37,7 @@ between distributions). ** +rsync+ ** +file+ (must be in +/usr/bin/file+) ** +bc+ +** +findutils+ * Source fetching tools: ** +wget+ diff --git a/docs/manual/resources.txt b/docs/manual/resources.txt index e90a49b2ab9..68b7eb9062a 100644 --- a/docs/manual/resources.txt +++ b/docs/manual/resources.txt @@ -68,4 +68,4 @@ review comments in a clean and concise web interface, it can be useful for all Buildroot developers. + The Buildroot patch management interface is available at -http://patchwork.buildroot.org[]. +https://patchwork.ozlabs.org/project/buildroot/list/[]. diff --git a/docs/manual/selinux-support.txt b/docs/manual/selinux-support.txt deleted file mode 100644 index 21137ae6c30..00000000000 --- a/docs/manual/selinux-support.txt +++ /dev/null @@ -1,74 +0,0 @@ -// -*- mode:doc; -*- -// vim: set syntax=asciidoc: - -[[selinux]] -== Using SELinux in Buildroot - -https://selinuxproject.org[SELinux] is a Linux kernel security module -enforcing access control policies. In addition to the traditional file -permissions and access control lists, +SELinux+ allows to write rules -for users or processes to access specific functions of resources -(files, sockets...). - -_SELinux_ has three modes of operation: - -* _Disabled_: the policy is not applied -* _Permissive_: the policy is applied, and non-authorized actions are - simply logged. This mode is often used for troubleshooting SELinux - issues. -* _Enforcing_: the policy is applied, and non-authorized actions are - denied - -In Buildroot the mode of operation is controlled by the -+BR2_PACKAGE_REFPOLICY_POLICY_STATE_*+ configuration options. The -Linux kernel also has various configuration options that affect how -+SELinux+ is enabled (see +security/selinux/Kconfig+ in the Linux -kernel sources). - -By default in Buildroot the +SELinux+ policy is provided by the -upstream https://github.com/SELinuxProject/refpolicy[refpolicy] -project, enabled with +BR2_PACKAGE_REFPOLICY+. - -[[enabling-selinux]] -=== Enabling SELinux support - -To have proper support for +SELinux+ in a Buildroot generated system, -the following configuration options must be enabled: - -* +BR2_PACKAGE_LIBSELINUX+ -* +BR2_PACKAGE_REFPOLICY+ - -In addition, your filesystem image format must support extended -attributes. - -[[selinux-policy-tweaking]] -=== SELinux policy tweaking - -The +SELinux refpolicy+ contains modules that can be enabled or -disabled when being built. Each module provide a number of +SELinux+ -rules. In Buildroot the non-base modules are disabled by default and -several ways to enable such modules are provided: - -- Packages can enable a list of +SELinux+ modules within the +refpolicy+ using - the +_SELINUX_MODULES+ variable. -- Packages can provide additional +SELinux+ modules by putting them (.fc, .if - and .te files) in +package//selinux/+. -- Extra +SELinux+ modules can be added in directories pointed by the - +BR2_REFPOLICY_EXTRA_MODULES_DIRS+ configuration option. -- Additional modules in the +refpolicy+ can be enabled if listed in the - +BR2_REFPOLICY_EXTRA_MODULES_DEPENDENCIES+ configuration option. - -Buildroot also allows to completely override the +refpolicy+. This -allows to provide a full custom policy designed specifically for a -given system. When going this way, all of the above mechanisms are -disabled: no extra +SElinux+ module is added to the policy, and all -the available modules within the custom policy are enabled and built -into the final binary policy. The custom policy must be a fork of the -official https://github.com/SELinuxProject/refpolicy[refpolicy]. - -In order to fully override the +refpolicy+ the following configuration -variables have to be set: - -- +BR2_PACKAGE_REFPOLICY_CUSTOM_GIT+ -- +BR2_PACKAGE_REFPOLICY_CUSTOM_REPO_URL+ -- +BR2_PACKAGE_REFPOLICY_CUSTOM_REPO_VERSION+ diff --git a/docs/manual/writing-rules.txt b/docs/manual/writing-rules.txt index 84d8f764311..13b7fd5bea6 100644 --- a/docs/manual/writing-rules.txt +++ b/docs/manual/writing-rules.txt @@ -78,7 +78,7 @@ Do not align the +=+ signs. + --------------------- define LIBFOO_REMOVE_DOC - $(RM) -fr $(TARGET_DIR)/usr/share/libfoo/doc \ + $(RM) -r $(TARGET_DIR)/usr/share/libfoo/doc \ $(TARGET_DIR)/usr/share/man/man3/libfoo* endef --------------------- @@ -118,7 +118,7 @@ YES: --------------------- ifneq ($(BR2_LIBFOO_INSTALL_DATA),y) define LIBFOO_REMOVE_DATA - $(RM) -fr $(TARGET_DIR)/usr/share/libfoo/data + $(RM) -r $(TARGET_DIR)/usr/share/libfoo/data endef LIBFOO_POST_INSTALL_TARGET_HOOKS += LIBFOO_REMOVE_DATA endif @@ -128,7 +128,7 @@ NO: + --------------------- define LIBFOO_REMOVE_DATA - $(RM) -fr $(TARGET_DIR)/usr/share/libfoo/data + $(RM) -r $(TARGET_DIR)/usr/share/libfoo/data endef ifneq ($(BR2_LIBFOO_INSTALL_DATA),y) @@ -198,6 +198,18 @@ image sdimage.img { chance, the byte count. In comments instead use +GB+, +MB+, +KB+ (not +kb+) in place of +G+, +M+, +K+. +* For GPT partitions, the +partition-type-uuid+ value must be +U+ for + the EFI System Partition (expanded to + +c12a7328-f81f-11d2-ba4b-00a0c93ec93b+ by _genimage_), +F+ for a FAT + partition (expanded to +ebd0a0a2-b9e5-4433-87c0-68b6b72699c7+ by + _genimage_) or +L+ for the root filesystem or other filesystems + (expanded to +0fc63daf-8483-4772-8e79-3d69d8477de4+ by + _genimage_). Even though +L+ is the default value of _genimage_, we + prefer to have it explicitly specified in our +genimage.cfg+ + files. Finally, these shortcuts should be used without double + quotes, e.g +partition-type-uuid = U+. If an explicit GUID is + specified, lower-case letters should be used. + The +genimage.cfg+ files are the input for the genimage tool used in Buildroot to generate the final image file(i.e. sdcard.img). For further details about the _genimage_ language, refer to diff --git a/docs/website/copyright.txt b/docs/website/copyright.txt index b15ac5f9191..3fe19bab8b6 100644 --- a/docs/website/copyright.txt +++ b/docs/website/copyright.txt @@ -1,7 +1,7 @@ The code and graphics on this website (and it's mirror sites, if any) are -Copyright (c) 1999-2005 by Erik Andersen, 2006-2020 The Buildroot -developers. All rights reserved. +Copyright (C) The Buildroot developers . All +rights reserved. Documents on this Web site including their graphical elements, design, and layout are protected by trade dress and other laws and MAY BE COPIED OR diff --git a/docs/website/download.html b/docs/website/download.html index 18a9254cbf9..5afc507c524 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -8,105 +8,105 @@
Download
-

Latest stable / long term support release: 2022.02

+

Latest stable / long term support release: 2023.02

- +
- +
-

buildroot-2022.02.tar.gz

-

PGP signature

+

buildroot-2023.02.tar.gz

+

PGP signature

- +
- +
-

buildroot-2022.02.tar.xz

-

PGP signature

+

buildroot-2023.02.tar.xz

+

PGP signature

diff --git a/docs/website/images/armadeus-systems-logo.png b/docs/website/images/armadeus-systems-logo.png new file mode 100644 index 00000000000..9b6080fb134 Binary files /dev/null and b/docs/website/images/armadeus-systems-logo.png differ diff --git a/docs/website/js/buildroot.js b/docs/website/js/buildroot.js index bf80f11d7ac..b2975fb6093 100644 --- a/docs/website/js/buildroot.js +++ b/docs/website/js/buildroot.js @@ -1,39 +1,52 @@ -function load_activity(feedurl, divid) { - let container = document.getElementById(divid); +function display_activity(result, activity) { + let loaded = 0; + let nb_display = 8; + let container; + if (result==null) return; + for (let i = 0; i < result.feed.entry.length; i++) { + let entry = result.feed.entry[i]; + if (activity==="commit" && entry.title.toString().indexOf("git commit") !== -1) { + container = document.getElementById("commit-activity"); + } else if (activity==="mailing-list" && entry.title.toString().indexOf("git commit") === -1) { + container = document.getElementById("mailing-list-activity"); + } else { + continue; + } + loaded += 1 + if (loaded > nb_display) + break; + let div = document.createElement("p"); + let link = document.createElement("a"); + let d = new Date(entry.updated); + let data = '[' + d.toLocaleDateString() + '] ' + entry.title; + data = data.replace("Re: ",""); + data = data.replace("[Buildroot] ",""); + let text = document.createTextNode(data); + link.appendChild(text); + link.title = entry.title; + link.href = entry.link._href; + div.appendChild(link); + container.appendChild(div); + } + for (let i = 0; i < (nb_display - loaded); i++) { + container.appendChild(document.createElement("p")); + } +} + +function load_activity(feedurl) { $.ajax({ - url: "https://cors-anywhere.herokuapp.com/" + feedurl + url: feedurl }) .done(function(data){ let x2js = new X2JS(); let result = x2js.xml_str2json(data.documentElement.outerHTML); - let loaded = 0; - let nb_display = 8; - if (result==null) return; - for (let i = 0; i < result.feed.entry.length; i++) { - let entry = result.feed.entry[i]; - if (entry.title.indexOf("git commit") !== -1) - continue; - loaded += 1; - if (loaded > nb_display) - break; - let div = document.createElement("p"); - let link = document.createElement("a"); - let d = new Date(entry.published); - let data = '[' + d.toLocaleDateString() + '] ' + entry.title; - let text = document.createTextNode(data); - link.appendChild(text); - link.title = entry.title; - link.href = entry.link._href; - div.appendChild(link); - container.appendChild(div); - } - let empty = nb_display - loaded; - for (let i = 0; i < empty; i++) { - container.appendChild(document.createElement("p")); - } + display_activity(result, "commit"); + display_activity(result, "mailing-list"); }); } + + function google_analytics() { let _gaq = _gaq || []; _gaq.push(['_setAccount', 'UA-21761074-1']); @@ -86,8 +99,7 @@ jQuery(document).ready(function($) { url = url.split(/[\\/]/).pop(); $('.nav a[href="/' + url + '"]').parent().addClass('active'); - load_activity("http://buildroot-busybox.2317881.n4.nabble.com/Buildroot-busybox-ft2.xml", "mailing-list-activity"); - load_activity("http://git.buildroot.org/buildroot/atom/?h=master", "commit-activity"); + load_activity("/new.atom"); $('#slides').html('') }); diff --git a/docs/website/news.html b/docs/website/news.html index de80a5f23d2..9fbbe5b0b7f 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,702 @@

News

    +
  • +
    +
    +
    +

    2023.02 released

    +

    12 March 2023

    +
    +
    +

    The stable 2023.02 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 + 2023.02 release.

    + +

    Notice that this is a long term support release which will be + supported with security and other important fixes until March 2024.

    +
    +
    +
    • + +
  • +
    +
    +
    +

    2023.02-rc3 released

    +

    8 March 2023

    +
    +
    +

    2023.02-rc3 has been released with more cleanups and build fixes. See the + CHANGES + file for details.

    + +

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

    +
    +
    +
    • + +
  • +
    +
    +
    +

    2022.02.10 released

    +

    18 January 2023

    +
    +
    +

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

    +
    +
    +
    • + +
  • +
    +
    +
    +

    2022.11.2 released

    +

    1 March 2023

    +
    +
    +

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

    +
    +
    +
    • + +
  • +
    +
    +
    +

    2023.02-rc2 released

    +

    27 February 2023

    +
    +
    +

    2023.02-rc2 has been released with more cleanups and build fixes. See the + CHANGES + file for details.

    + +

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

    +
    +
    +
    • + +
  • +
    +
    +
    +

    2023.02-rc1 released

    +

    20 February 2023

    +
    +
    +

    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 + 2023.02-rc1 + release, and report any problems found to the + mailing list or + bug tracker.

    +
    +
    +
    • + +
  • +
    +
    +
    +

    2022.02.9 released

    +

    18 January 2023

    +
    +
    +

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

    +
    +
    +
    • + +
  • +
    +
    +
    +

    2022.11.1 released

    +

    18 January 2023

    +
    +
    +

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

    +
    +
    +
    • + +
  • +
    +
    +
    +

    2022.02.8 released

    +

    10 December 2022

    +
    +
    +

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

    +
    +
    +
    • + +
  • +
    +
    +
    +

    2022.08.3 released

    +

    10 December 2022

    +
    +
    +

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

    +
    +
    +
    • + +
  • +
    +
    +
    +

    2022.11 released

    +

    5 December 2022

    +
    +
    +

    The stable 2022.11 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 + 2022.11 release.

    +
    +
    +
    • + +
  • +
    +
    +
    +

    2022.11-rc3 released

    +

    24 November 2022

    +
    +
    +

    2022.11-rc3 has been released with more cleanups and build fixes. See the + CHANGES + file for details.

    + +

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

    +
    +
    +
    • + +
  • +
    +
    +
    +

    2022.02.7 released

    +

    17 November 2022

    +
    +
    +

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

    +
    +
    +
    • + +
  • +
    +
    +
    +

    2022.08.2 released

    +

    16 November 2022

    +
    +
    +

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

    +
    +
    +
    • + +
  • +
    +
    +
    +

    2022.11-rc2 released

    +

    16 November 2022

    +
    +
    +

    2022.11-rc2 has been released with more cleanups and build fixes. See the + CHANGES + file for details.

    + +

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

    +
    +
    +
    • + +
  • +
    +
    +
    +

    2022.11-rc1 released

    +

    3 November 2022

    +
    +
    +

    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 + 2022.11-rc1 + release, and report any problems found to the + mailing list or + bug tracker.

    +
    +
    +
    • + +
  • +
    +
    +
    +

    2022.08.1 released

    +

    3 October 2022

    +
    +
    +

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

    +
    +
    +
    • + +
  • +
    +
    +
    +

    2022.02.6 released

    +

    2 October 2022

    +
    +
    +

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

    +
    +
    +
    • + +
  • +
    +
    +
    +

    2022.05.3 released

    +

    2 October 2022

    +
    +
    +

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

    + +

    Notice that the 2022.05.x series is now end of life. Please migrate to + the 2022.08 series instead which will be supported until December 2022.

    +
    +
    +
    • + +
  • +
    +
    +
    +

    2022.08 released

    +

    10 September 2022

    +
    +
    +

    The stable 2022.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 + 2022.08 release.

    +
    +
    +
    • + +
  • +
    +
    +
    +

    2022.08-rc2 released

    +

    1 September 2022

    +
    +
    +

    2022.08-rc2 has been released with more cleanups and build fixes. See the + CHANGES + file for details.

    + +

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

    +
    +
    +
    • + +
  • +
    +
    +
    +

    2022.02.5 released

    +

    31 August 2022

    +
    +
    +

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

    +
    +
    +
    • + +
  • +
    +
    +
    +

    2022.05.2 released

    +

    31 August 2022

    +
    +
    +

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

    +
    +
    +
    • + +
  • +
    +
    +
    +

    2022.08-rc1 released

    +

    12 August 2022

    +
    +
    +

    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 + 2022.08-rc1 + release, and report any problems found to the + mailing list or + bug tracker.

    +
    +
    +
    • + +
  • +
    +
    +
    +

    2022.02.4 released

    +

    28 July 2022

    +
    +
    +

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

    +
    +
    +
    • + +
  • +
    +
    +
    +

    2022.05.1 released

    +

    24 July 2022

    +
    +
    +

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

    +
    +
    +
    • + +
  • +
    +
    +
    +

    2022.02.3 released

    +

    19 June 2022

    +
    +
    +

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

    +
    +
    +
    • + +
  • +
    +
    +
    +

    2022.05 released

    +

    6 June 2022

    +
    +
    +

    The stable 2022.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 + 2022.05 release.

    +
    +
    +
    • + +
  • +
    +
    +
    +

    2022.05-rc2 released

    +

    30 May 2022

    +
    +
    +

    2022.05-rc2 has been released with more cleanups and build fixes. See the + CHANGES + file for details.

    + +

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

    +
    +
    +
    • + +
  • +
    +
    +
    +

    2022.02.2 released

    +

    29 May 2022

    +
    +
    +

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

    +
    +
    +
    • + +
  • +
    +
    +
    +

    2022.05-rc1 released

    +

    18 May 2022

    +
    +
    +

    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 + 2022.05-rc1 + release, and report any problems found to the + mailing list or + bug tracker.

    +
    +
    +
    • + +
  • +
    +
    +
    +

    2022.02.1 released

    +

    11 April 2022

    +
    +
    +

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

    +
    +
    +
    • + +
  • +
    +
    +
    +

    2021.02.12 released, 2021.02.x series EOL

    +

    6 April 2022

    +
    +
    +

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

    + +

    Notice that the 2021.02.x series is now end of life. Please migrate to + the 2022.02 series instead which will be supported until April 2023.

    +
    +
    +
    • + +
  • +
    +
    +
    +

    2021.02.11 released

    +

    25 March 2022

    +
    +
    +

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

    +
    +
    +
    • + +
  • +
    +
    +
    +

    2021.11.3 released, 2021.11.x series EOL

    +

    24 March 2022

    +
    +
    +

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

    + +

    Notice that the 2021.11.x series is now end of life. Please migrate to + the 2022.02 series instead which will be supported until April 2023.

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

    2022.02 released

    The stable 2022.02 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 2022.02 release.

    diff --git a/docs/website/sponsors.html b/docs/website/sponsors.html index 2f3f6309ae5..9c17bed0c71 100644 --- a/docs/website/sponsors.html +++ b/docs/website/sponsors.html @@ -9,18 +9,40 @@
    +
    - - + +
    - Tap2Open - financially sponsored the Buildroot Association - in 2020.
    + Smile sponsored the + Buildroot project by hosting + the Buildroot + Developers Meeting of February 2023 in Brussels, + after the FOSDEM + conference. +
    +
    +
    +
    + +
    +
    +
    +
    + + + +
    +
    + Armadeus + Systems financially sponsored + the Buildroot + Association in 2022.
    @@ -36,7 +58,7 @@
    Logilin financially sponsored the Buildroot Association - in 2020.
    + in 2022.
@@ -44,23 +66,6 @@ -
-
Sponsor of the Buildroot.org domain
-
-
-

The Buildroot community would like to thank - Zillabit for - donating the buildroot.org domain name and sponsoring - the registration fees 2009 - 2019.

-
-
- - - -
-
-
-
Past sponsors
@@ -343,6 +348,24 @@
+
+
+
+
+
+ + + +
+
+ Tap2Open + financially sponsored the Buildroot Association + in 2020.
+
+
+
+
+ diff --git a/fs/common.mk b/fs/common.mk index 45beb5ae7b7..37eafac4f7a 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -186,7 +186,8 @@ $$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME): $$(ROOTFS_$(2)_DEPENDENCIES) $$(foreach hook,$$(ROOTFS_$(2)_PRE_GEN_HOOKS),\ $$(call PRINTF,$$($$(hook))) >> $$(FAKEROOT_SCRIPT)$$(sep)) - echo "rm -rf $$(TARGET_DIR)/run/* $$(TARGET_DIR)/run/.[^.]* $$(TARGET_DIR)/tmp/* $$(TARGET_DIR)/tmp/.[^.]*" >> $$(FAKEROOT_SCRIPT) + echo "find $$(TARGET_DIR)/run/ -mindepth 1 -prune -print0 | xargs -0r rm -rf --" >> $$(FAKEROOT_SCRIPT) + echo "find $$(TARGET_DIR)/tmp/ -mindepth 1 -prune -print0 | xargs -0r rm -rf --" >> $$(FAKEROOT_SCRIPT) $$(call PRINTF,$$(ROOTFS_REPRODUCIBLE)) >> $$(FAKEROOT_SCRIPT) $$(call PRINTF,$$(ROOTFS_SELINUX)) >> $$(FAKEROOT_SCRIPT) $$(call PRINTF,$$(ROOTFS_$(2)_CMD)) >> $$(FAKEROOT_SCRIPT) diff --git a/fs/cpio/Config.in b/fs/cpio/Config.in index c1151a2881d..4d38276c880 100644 --- a/fs/cpio/Config.in +++ b/fs/cpio/Config.in @@ -7,6 +7,48 @@ config BR2_TARGET_ROOTFS_CPIO if BR2_TARGET_ROOTFS_CPIO +choice + prompt "cpio type" + default BR2_TARGET_ROOTFS_CPIO_FULL + +config BR2_TARGET_ROOTFS_CPIO_FULL + bool "cpio the whole root filesystem" + help + Build a cpio archive containing the whole root filesystem. + +config BR2_TARGET_ROOTFS_CPIO_DRACUT + bool "Invoke dracut to make a partial initramfs" + select BR2_PACKAGE_HOST_DRACUT + help + Build an additional initramfs using dracut. This only contains + a subset of the rootfs, as determined by the configuration + file. + This can be useful to create a recovery system, for instance. + +endchoice + +if BR2_TARGET_ROOTFS_CPIO_DRACUT + +config BR2_TARGET_ROOTFS_CPIO_DRACUT_MODULES + string "extra dracut modules" + help + Space-separated list of directories containing dracut modules. + +config BR2_TARGET_ROOTFS_CPIO_DRACUT_CONF_FILES + string "dracut configuration files" + default "fs/cpio/dracut.conf" + help + Space-separated list of Dracut configuration files. They + determine which parts of the rootfs get included in the + cpio image. See: + dracut.conf(5) + https://github.com/dracutdevs/dracut/blob/master/man/dracut.conf.5.asc + + The default configuration file is suitable for busybox init. + It doesn't, however, pivot_root into a full rootfs. + +endif + choice prompt "Compression method" default BR2_TARGET_ROOTFS_CPIO_NONE diff --git a/fs/cpio/cpio.mk b/fs/cpio/cpio.mk index 81f8c393d18..00ab6a8f826 100644 --- a/fs/cpio/cpio.mk +++ b/fs/cpio/cpio.mk @@ -36,6 +36,8 @@ ROOTFS_CPIO_DEPENDENCIES += host-cpio ROOTFS_CPIO_OPTS += --reproducible endif +ifeq ($(BR2_TARGET_ROOTFS_CPIO_FULL),y) + define ROOTFS_CPIO_CMD cd $(TARGET_DIR) && \ find . \ @@ -44,6 +46,57 @@ define ROOTFS_CPIO_CMD > $@ endef +else ifeq ($(BR2_TARGET_ROOTFS_CPIO_DRACUT),y) + +ROOTFS_CPIO_DEPENDENCIES += host-dracut + +ROOTFS_CPIO_DRACUT_MODULES = $(call qstrip,$(BR2_TARGET_ROOTFS_CPIO_DRACUT_MODULES)) +ifeq ($(BR_BUILDING),y) +ifneq ($(words $(ROOTFS_CPIO_DRACUT_MODULES)),$(words $(sort $(notdir $(ROOTFS_CPIO_DRACUT_MODULES))))) +$(error No two dracut modules can have the same basename, check your BR2_TARGET_ROOTFS_CPIO_DRACUT_MODULES setting) +endif +endif + +ROOTFS_CPIO_DRACUT_CONF_FILES = $(call qstrip,$(BR2_TARGET_ROOTFS_CPIO_DRACUT_CONF_FILES)) +ifeq ($(BR_BUILDING),y) +ifeq ($(ROOTFS_CPIO_DRACUT_CONF_FILES),) +$(error No dracut config file name specified, check your BR2_TARGET_ROOTFS_CPIO_DRACUT_CONF_FILES setting) +endif +ifneq ($(words $(ROOTFS_CPIO_DRACUT_CONF_FILES)),$(words $(sort $(notdir $(ROOTFS_CPIO_DRACUT_CONF_FILES))))) +$(error No two dracut config files can have the same basename, check your BR2_TARGET_ROOTFS_CPIO_DRACUT_CONF_FILES setting) +endif +endif + +ifeq ($(BR2_LINUX_KERNEL),y) +ROOTFS_CPIO_DEPENDENCIES += linux +ROOTFS_CPIO_OPTS += --kver $(LINUX_VERSION_PROBED) +else +ROOTFS_CPIO_OPTS += --no-kernel +endif + +define ROOTFS_CPIO_CMD + mkdir -p $(ROOTFS_CPIO_DIR)/tmp $(ROOTFS_CPIO_DIR)/confdir $(HOST_DIR)/lib/dracut/modules.d + touch $(ROOTFS_CPIO_DIR)/empty-config + $(foreach cfg,$(ROOTFS_CPIO_DRACUT_CONF_FILES), \ + cp $(cfg) $(ROOTFS_CPIO_DIR)/confdir/$(notdir $(cfg)) + ) + $(foreach m,$(ROOTFS_CPIO_DRACUT_MODULES), \ + cp -a $(m)/* $(HOST_DIR)/lib/dracut/modules.d/ + ) + $(HOST_DIR)/bin/dracut \ + $(ROOTFS_CPIO_OPTS) \ + -c $(ROOTFS_CPIO_DIR)/empty-config \ + --confdir $(ROOTFS_CPIO_DIR)/confdir \ + --sysroot $(TARGET_DIR) \ + --tmpdir $(ROOTFS_CPIO_DIR)/tmp \ + -M \ + --force \ + --no-compress \ + $@ +endef + +endif #BR2_TARGET_ROOTFS_CPIO_DRACUT + ifeq ($(BR2_TARGET_ROOTFS_CPIO_UIMAGE),y) ROOTFS_CPIO_DEPENDENCIES += host-uboot-tools define ROOTFS_CPIO_UBOOT_MKIMAGE diff --git a/fs/cpio/dracut.conf b/fs/cpio/dracut.conf new file mode 100644 index 00000000000..2337736c4e8 --- /dev/null +++ b/fs/cpio/dracut.conf @@ -0,0 +1,92 @@ +#Simple dracut config for a system without systemd + +#Dracut configuration + +show_modules=yes +i18n_install_all=no +lvmconf=no +mdadmconf=no +early_microcode=no +hostonly=no +hostonly_cmdline=no +use_fstab=no +kernel_cmdline="rd.break=initqueue" +do_strip=no + +# Dracut modules needed +add_dracutmodules+=" \ +busybox-init +" + +# Modules to ignore +omit_dracutmodules+=" \ +bash \ +biosdevname \ +btrfs \ +bluetooth \ +busybox \ +caps \ +cifs \ +crypt \ +crypt-gpg \ +dash \ +dbus-broker \ +dbus-daemon \ +dm \ +dmraid \ +dmsquash-live-ntfs \ +dracut-systemd \ +fcoe \ +fcoe-uefi \ +fs-lib \ +iscsi \ +i18n \ +lvmmerge \ +lvm \ +lunmask \ +mdraid \ +memstrack \ +mksh \ +modsign \ +mount-root \ +multipath \ +nbd \ +network-legacy \ +network-wicked \ +nfs \ +nvdimm \ +nvmf \ +parse-lunmask \ +qemu \ +qemu-net \ +resume \ +rootfs-block \ +rngd \ +systemd \ +systemd-udevd \ +systemd-coredump \ +systemd-ask-password \ +systemd-timedated \ +systemd-rfkill \ +systemd-resolved \ +systemd-hostnamed \ +systemd-initrd \ +systemd-journald \ +systemd-ldconfig \ +systemd-networkd \ +systemd-timesyncd \ +systemd-veritysetup \ +systemd-modules-load \ +systemd-sysctl \ +systemd-repart \ +systemd-sysext \ +systemd-sysusers \ +systemd-tmpfiles \ +squash \ +ssh-client \ +stratis \ +tpm2-tss \ +udev-rules \ +url-lib \ +usrmount \ +" diff --git a/fs/erofs/erofs.mk b/fs/erofs/erofs.mk index 0e9d4401a93..e43d74927b5 100644 --- a/fs/erofs/erofs.mk +++ b/fs/erofs/erofs.mk @@ -10,6 +10,12 @@ ifeq ($(BR2_TARGET_ROOTFS_EROFS_LZ4HC),y) ROOTFS_EROFS_ARGS += -zlz4hc endif +ifeq ($(BR2_REPRODUCIBLE),y) +ROOTFS_EROFS_ARGS += \ + -T $(SOURCE_DATE_EPOCH) \ + -U 00000000-0000-0000-0000-000000000000 +endif + ifneq ($(BR2_TARGET_ROOTFS_EROFS_PCLUSTERSIZE),0) ROOTFS_EROFS_ARGS += -C$(strip $(BR2_TARGET_ROOTFS_EROFS_PCLUSTERSIZE)) endif diff --git a/fs/ext2/Config.in b/fs/ext2/Config.in index 333ead95fe7..4451d0797f1 100644 --- a/fs/ext2/Config.in +++ b/fs/ext2/Config.in @@ -60,6 +60,19 @@ config BR2_TARGET_ROOTFS_EXT2_INODES int "exact number of inodes (leave at 0 for auto calculation)" default 0 +config BR2_TARGET_ROOTFS_EXT2_INODE_SIZE + int "inode size" + default 256 + help + Set the size of inodes, in bytes, as a power of 2 larger or + equal to 128. + + Set to 0 to let the filesystem generator decide based on the + file system size. If unsure, keep the default, 256. + + Note: 128-byte inodes suffer of the Y2K38 problem, and can't + store timestamps beyond 2038-01-19 03:14:07Z. + config BR2_TARGET_ROOTFS_EXT2_RESBLKS int "reserved blocks percentage" default 5 @@ -131,6 +144,11 @@ config BR2_TARGET_ROOTFS_EXT2_XZ help Do compress the ext2 filesystem with xz. +config BR2_TARGET_ROOTFS_EXT2_ZSTD + bool "zstd" + help + Do compress the ext2 filesystem with zstd. + endchoice endif # BR2_TARGET_ROOTFS_EXT2 diff --git a/fs/ext2/ext2.mk b/fs/ext2/ext2.mk index 5b5393f0923..e69e79cd2e6 100644 --- a/fs/ext2/ext2.mk +++ b/fs/ext2/ext2.mk @@ -22,6 +22,7 @@ ROOTFS_EXT2_OPTS = \ -N $(BR2_TARGET_ROOTFS_EXT2_INODES) \ -m $(BR2_TARGET_ROOTFS_EXT2_RESBLKS) \ -L "$(ROOTFS_EXT2_LABEL)" \ + -I $(BR2_TARGET_ROOTFS_EXT2_INODE_SIZE) \ $(ROOTFS_EXT2_MKFS_OPTS) ROOTFS_EXT2_DEPENDENCIES = host-e2fsprogs diff --git a/fs/oci/Config.in b/fs/oci/Config.in index 176785810a9..5e7aff282fd 100644 --- a/fs/oci/Config.in +++ b/fs/oci/Config.in @@ -1,5 +1,6 @@ config BR2_TARGET_ROOTFS_OCI bool "oci image" + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS help Build an OCI (Open Container Initiative) image. @@ -41,10 +42,26 @@ config BR2_TARGET_ROOTFS_OCI_ENTRYPOINT help Command to execute when the container starts. -config BR2_TARGET_ROOTFS_OCI_ENTRYPOINT_ARGS - string "entrypoint arguments" + Spaces must be quoted or escaped, like for a shell string: + /usr/bin/env sh -c + /bin/my-init --some-option "1 2 3 4" some\ arg -- + + See the Docker documentation on how entrypoint and command + interact together: + https://docs.docker.com/engine/reference/builder/#understand-how-cmd-and-entrypoint-interact + +config BR2_TARGET_ROOTFS_OCI_CMD + string "command (or entrypoint arguments)" help - Default arguments to the entrypoint of the container. + Default command, or entrypoint arguments, of the container. + + Spaces must be quoted or escaped, like for a shell string: + "your shell scriptlet" + /usr/bin/env sh + + See the Docker documentation on how entrypoint and command + interact together: + https://docs.docker.com/engine/reference/builder/#understand-how-cmd-and-entrypoint-interact config BR2_TARGET_ROOTFS_OCI_WORKDIR string "working directory" diff --git a/fs/oci/oci.mk b/fs/oci/oci.mk index aa81920d361..4458cf8ef94 100644 --- a/fs/oci/oci.mk +++ b/fs/oci/oci.mk @@ -12,17 +12,23 @@ OCI_SLOCI_IMAGE_OPTS = --arch $(GO_GOARCH) # architecture variant (typically used only for arm) OCI_SLOCI_IMAGE_OPTS += $(and $(GO_GOARM),--arch-variant v$(GO_GOARM)) -# entrypoint -OCI_ENTRYPOINT = $(call qstrip,$(BR2_TARGET_ROOTFS_OCI_ENTRYPOINT)) -ifneq ($(OCI_ENTRYPOINT),) -OCI_SLOCI_IMAGE_OPTS += --entrypoint "$(OCI_ENTRYPOINT)" -endif - -# entrypoint arguments -OCI_ENTRYPOINT_ARGS = $(call qstrip,$(BR2_TARGET_ROOTFS_OCI_ENTRYPOINT_ARGS)) -ifneq ($(OCI_ENTRYPOINT_ARGS),) -OCI_SLOCI_IMAGE_OPTS += --cmd "$(OCI_ENTRYPOINT_ARGS)" -endif +# entrypoint and command +# Special treatment: both the entrypoint and arguments (aka command) are +# a double-quoted, space-separated, escaped-double-quoted string, like: +# "foo \"1 2 3 4\" ' a b c d ' bar\ buz" +# which should be interpreted as a 4-item list (using single quotes to +# delimit them and see leading/trailing spaces): +# 'foo' +# '1 2 3 4' +# ' a b c d ' +# 'bar buz' +# +# We use some trickery to have the shell properly expand this into a list +# where each item is single-quoted and prefixed with the appropriate +# option string: +OCI_SLOCI_IMAGE_OPTS += \ + $(shell eval printf -- "--entrypoint\ \'%s\'\ " $(BR2_TARGET_ROOTFS_OCI_ENTRYPOINT)) \ + $(shell eval printf -- "--cmd\ \'%s\'\ " $(BR2_TARGET_ROOTFS_OCI_CMD)) # author OCI_AUTHOR = $(call qstrip,$(BR2_TARGET_ROOTFS_OCI_AUTHOR)) diff --git a/fs/squashfs/Config.in b/fs/squashfs/Config.in index 70d4a20cf05..21322a22468 100644 --- a/fs/squashfs/Config.in +++ b/fs/squashfs/Config.in @@ -5,6 +5,56 @@ config BR2_TARGET_ROOTFS_SQUASHFS if BR2_TARGET_ROOTFS_SQUASHFS +choice + prompt "block size" + default BR2_TARGET_ROOTFS_SQUASHFS_BS_128K + help + Data block size. Bigger values can improve + compression ratio. + + If unsure, leave at 128k (default). + +config BR2_TARGET_ROOTFS_SQUASHFS_BS_4K + bool "4k" + +config BR2_TARGET_ROOTFS_SQUASHFS_BS_8K + bool "8k" + +config BR2_TARGET_ROOTFS_SQUASHFS_BS_16K + bool "16k" + +config BR2_TARGET_ROOTFS_SQUASHFS_BS_32K + bool "32k" + +config BR2_TARGET_ROOTFS_SQUASHFS_BS_64K + bool "64k" + +config BR2_TARGET_ROOTFS_SQUASHFS_BS_128K + bool "128k" + +config BR2_TARGET_ROOTFS_SQUASHFS_BS_256K + bool "256k" + +config BR2_TARGET_ROOTFS_SQUASHFS_BS_512K + bool "512k" + +config BR2_TARGET_ROOTFS_SQUASHFS_BS_1024K + bool "1024k" + +endchoice + +config BR2_TARGET_ROOTFS_SQUASHFS_BS + string + default "4K" if BR2_TARGET_ROOTFS_SQUASHFS_BS_4K + default "8K" if BR2_TARGET_ROOTFS_SQUASHFS_BS_8K + default "16K" if BR2_TARGET_ROOTFS_SQUASHFS_BS_16K + default "32K" if BR2_TARGET_ROOTFS_SQUASHFS_BS_32K + default "64K" if BR2_TARGET_ROOTFS_SQUASHFS_BS_64K + default "128K" if BR2_TARGET_ROOTFS_SQUASHFS_BS_128K + default "256K" if BR2_TARGET_ROOTFS_SQUASHFS_BS_256K + default "512K" if BR2_TARGET_ROOTFS_SQUASHFS_BS_512K + default "1024K" if BR2_TARGET_ROOTFS_SQUASHFS_BS_1024K + config BR2_TARGET_ROOTFS_SQUASHFS_PAD bool "pad to a 4K boundary" default y # legacy was always ON @@ -39,4 +89,30 @@ config BR2_TARGET_ROOTFS_SQUASHFS4_ZSTD endchoice +config BR2_TARGET_ROOTFS_SQUASHFS_EXTREME_COMP + bool "extreme compression when available" + default y if BR2_TARGET_ROOTFS_SQUASHFS4_LZ4 # legacy + help + Use options to increase compression ration as much as + possible, like using architecture-specific options, at + the cost of time when assembling the filesystem image. + + For example: + - with gzip and lzo, use -Xcompression-level 9 + - with xz use arch-specific bcj (branch-call-jump) filters + - with zstd use -Xcompression-level 22 + - and more + +config BR2_TARGET_ROOTFS_SQUASHFS_COMP_OPTS + string + 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 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) + default "-Xcompression-level 22" if BR2_TARGET_ROOTFS_SQUASHFS4_ZSTD + depends on BR2_TARGET_ROOTFS_SQUASHFS_EXTREME_COMP + endif diff --git a/fs/squashfs/squashfs.mk b/fs/squashfs/squashfs.mk index 7a5e3e313ee..cf083663c16 100644 --- a/fs/squashfs/squashfs.mk +++ b/fs/squashfs/squashfs.mk @@ -6,14 +6,18 @@ ROOTFS_SQUASHFS_DEPENDENCIES = host-squashfs -ROOTFS_SQUASHFS_ARGS = -noappend -processors $(PARALLEL_JOBS) +ROOTFS_SQUASHFS_ARGS = \ + -noappend \ + -processors $(PARALLEL_JOBS) \ + -b $(call qstrip,$(BR2_TARGET_ROOTFS_SQUASHFS_BS)) \ + $(call qstrip,$(BR2_TARGET_ROOTFS_SQUASHFS_COMP_OPTS)) ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS_PAD),) ROOTFS_SQUASHFS_ARGS += -nopad endif ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4_LZ4),y) -ROOTFS_SQUASHFS_ARGS += -comp lz4 -Xhc +ROOTFS_SQUASHFS_ARGS += -comp lz4 else ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4_LZO),y) ROOTFS_SQUASHFS_ARGS += -comp lzo else ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4_LZMA),y) diff --git a/fs/tar/Config.in b/fs/tar/Config.in index a4e375c68b6..e88a5bb91ec 100644 --- a/fs/tar/Config.in +++ b/fs/tar/Config.in @@ -46,6 +46,11 @@ config BR2_TARGET_ROOTFS_TAR_XZ help Do compress the tarball with xz. +config BR2_TARGET_ROOTFS_TAR_ZSTD + bool "zstd" + help + Do compress the tarball with zstd. + endchoice config BR2_TARGET_ROOTFS_TAR_OPTIONS diff --git a/linux/5.10.162-cip24-rt10/0001-arch-microblaze-mm-init.c-fix-build.patch b/linux/5.10.162-cip24-rt10/0001-arch-microblaze-mm-init.c-fix-build.patch new file mode 100644 index 00000000000..4760d9e4fb0 --- /dev/null +++ b/linux/5.10.162-cip24-rt10/0001-arch-microblaze-mm-init.c-fix-build.patch @@ -0,0 +1,37 @@ +From 1fc03e1fdc8bb606d1c95e9fa557a9e5f6df17ec Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 25 Feb 2023 17:26:56 +0100 +Subject: [PATCH] arch/microblaze/mm/init.c: fix build + +Fix the following build failure on microblaze raised since +https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/commit/arch/microblaze/mm/init.c?h=v5.10.168-cip27-rt11&id=32ac92b5a39e2ef91308929bf5ed0804094b4183: + +arch/microblaze/mm/init.c:71:2: error: #endif without #if + 71 | #endif /* CONFIG_HIGHMEM */ + | ^~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/27291870cf7539d26e45c45f34322d24a6dbca33 + +Signed-off-by: Fabrice Fontaine +[Upstream status: sent to +Sebastian Andrzej Siewior ] +--- + arch/microblaze/mm/init.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c +index 1f4b5b34e600..a444778e59de 100644 +--- a/arch/microblaze/mm/init.c ++++ b/arch/microblaze/mm/init.c +@@ -49,6 +49,7 @@ unsigned long lowmem_size; + EXPORT_SYMBOL(min_low_pfn); + EXPORT_SYMBOL(max_low_pfn); + ++#ifdef CONFIG_HIGHMEM + static void __init highmem_init(void) + { + pr_debug("%x\n", (u32)PKMAP_BASE); +-- +2.39.1 + diff --git a/linux/Config.ext.in b/linux/Config.ext.in index 734a52a5330..3cbf42d3447 100644 --- a/linux/Config.ext.in +++ b/linux/Config.ext.in @@ -48,6 +48,9 @@ comment "xenomai needs a uClibc or glibc toolchain w/ threads" # RTAI config BR2_LINUX_KERNEL_EXT_RTAI bool "RTAI Real-time patch" + depends on !BR2_LINUX_KERNEL_LATEST_VERSION + depends on !BR2_LINUX_KERNEL_LATEST_CIP_VERSION + depends on !BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION select BR2_PACKAGE_RTAI help RTAI Kernel part. @@ -145,4 +148,7 @@ config BR2_LINUX_KERNEL_EXT_AUFS_VERSION endif # aufs +# kernel extensions from br2-external trees, if any +source "$BR2_BASE_DIR/.br2-external.in.linux" + endmenu diff --git a/linux/Config.in b/linux/Config.in index 36744c53374..1d9d69603a1 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -28,10 +28,12 @@ choice prompt "Kernel version" config BR2_LINUX_KERNEL_LATEST_VERSION - bool "Latest version (5.15)" + bool "Latest version (6.1)" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 if BR2_KERNEL_HEADERS_AS_KERNEL config BR2_LINUX_KERNEL_LATEST_CIP_VERSION - bool "Latest CIP SLTS version (5.10.100-cip2)" + bool "Latest CIP SLTS version (5.10.162-cip24)" + 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 organizations in industries such as power generation and @@ -50,7 +52,8 @@ config BR2_LINUX_KERNEL_LATEST_CIP_VERSION https://www.cip-project.org config BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION - bool "Latest CIP RT SLTS version (5.10.100-cip2-rt2)" + bool "Latest CIP RT SLTS version (5.10.162-cip24-rt10)" + 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 variant. @@ -125,9 +128,9 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "5.15.26" if BR2_LINUX_KERNEL_LATEST_VERSION - default "5.10.100-cip2" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION - default "5.10.100-cip2-rt2" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION + default "6.1.51" 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 \ if BR2_LINUX_KERNEL_CUSTOM_VERSION default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL @@ -261,11 +264,11 @@ config BR2_LINUX_KERNEL_SIMPLEIMAGE config BR2_LINUX_KERNEL_IMAGE bool "Image" - depends on BR2_aarch64 || BR2_riscv + depends on BR2_aarch64 || BR2_aarch64_be || BR2_riscv config BR2_LINUX_KERNEL_IMAGEGZ bool "Image.gz" - depends on BR2_aarch64 || BR2_riscv + depends on BR2_aarch64 || BR2_aarch64_be || BR2_riscv config BR2_LINUX_KERNEL_LINUX_BIN bool "linux.bin" diff --git a/linux/linux.hash b/linux/linux.hash index 758fdbf8560..1468eb5f213 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,16 +1,15 @@ +# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 58b0446d8ea4bc0b26a35e2e3509bd53efcdeb295c9e4f48d33a23b1cdaa103b linux-6.1.51.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 bb5a1df15a10a715807a44872ff4fe775337aae445285181f1d1ba0c78b1d7f2 linux-5.16.12.tar.xz -sha256 58122134f2613fcbb200bb2399ef2117852166a8e11eed4b632a86b20b6bbe3a linux-5.15.26.tar.xz -sha256 4fb8ad55e6430342e4fbc94d54e594e9be8eb6a8bea1d71eccf835948d08580a linux-5.10.103.tar.xz -sha256 b2f1201f64f010e9e3c85d6f303a559a7944a80a0244a86b8f5035bd23f1f40d linux-5.4.182.tar.xz +sha256 ab464e4107329ff5262f1c585c40fc29dc68f17687a9a918f3e90faba5303d62 linux-5.15.130.tar.xz +sha256 240d5e47bb378c6813ecd07704fb887651ea7617159d2771071fd70bf33cd995 linux-5.10.194.tar.xz +sha256 c7a4086ba23507b8539d18534565de0d6591138bfa2e449e93964fd5132e353a linux-5.4.256.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 35017bb40b604e0b577fc2b87e727632b46608a2ba3a4f5858b9177f58f376b3 linux-4.4.302.tar.xz -sha256 295e4bb3ba3244a9f4c48139ad13f78145f3e6402e11aa25b20aadb9ae9f2b25 linux-4.9.304.tar.xz -sha256 03a65f405c3acae4dd8cd952444b7cd931f972c01a42e20a471319a2f6c018d2 linux-4.14.269.tar.xz -sha256 4fcfe814780d63dc56e907bf41596ff162e9601978bdc1a60eab64cc3903a22c linux-4.19.232.tar.xz +sha256 ccadbde939a788934436125a1ecd4464175b68ebe6c18072fbc90c8596eea00f linux-4.19.294.tar.xz +sha256 5b69e182ced5190a1fca117682cf7967c5bab24c4cf1364733ee14055b0df784 linux-4.14.325.tar.xz # Locally computed -sha256 e90e8100bf44cdd6714bca3b9b1f78694c99bfa9bdff761de06b192dfb230831 linux-cip-5.10.100-cip2.tar.gz -sha256 945b63f280c5bd9aad66016ef6fbed57612864192bc0f54f6800562f56cfd518 linux-cip-5.10.100-cip2-rt2.tar.gz +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 diff --git a/linux/linux.mk b/linux/linux.mk index f8290989ac3..b571a4125e4 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -70,9 +70,14 @@ LINUX_MAKE_ENV = \ BR_BINARIES_DIR=$(BINARIES_DIR) LINUX_INSTALL_IMAGES = YES -LINUX_DEPENDENCIES = host-kmod \ +LINUX_DEPENDENCIES = host-kmod + +# The kernel CONFIG_EXTRA_FIRMWARE feature requires firmware files at build +# time. Make sure they are available before the kernel builds. +LINUX_DEPENDENCIES += \ $(if $(BR2_PACKAGE_INTEL_MICROCODE),intel-microcode) \ $(if $(BR2_PACKAGE_LINUX_FIRMWARE),linux-firmware) \ + $(if $(BR2_PACKAGE_FIRMWARE_IMX),firmware-imx) \ $(if $(BR2_PACKAGE_WIRELESS_REGDB),wireless-regdb) # Starting with 4.16, the generated kconfig paser code is no longer @@ -142,11 +147,15 @@ endif # We don't want to run depmod after installing the kernel. It's done in a # target-finalize hook, to encompass modules installed by packages. +# Disable building host tools with -Werror: newer gcc versions can be +# extra picky about some code (https://bugs.busybox.net/show_bug.cgi?id=14826) LINUX_MAKE_FLAGS = \ - HOSTCC="$(HOSTCC) $(HOST_CFLAGS) $(HOST_LDFLAGS)" \ + HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem /,$(HOST_CFLAGS))) $(HOST_LDFLAGS)" \ ARCH=$(KERNEL_ARCH) \ INSTALL_MOD_PATH=$(TARGET_DIR) \ CROSS_COMPILE="$(TARGET_CROSS)" \ + WERROR=0 \ + REGENERATE_PARSERS=1 \ DEPMOD=$(HOST_DIR)/sbin/depmod ifeq ($(BR2_REPRODUCIBLE),y) @@ -154,7 +163,7 @@ LINUX_MAKE_ENV += \ KBUILD_BUILD_VERSION=1 \ KBUILD_BUILD_USER=buildroot \ KBUILD_BUILD_HOST=buildroot \ - KBUILD_BUILD_TIMESTAMP="$(shell LC_ALL=C date -d @$(SOURCE_DATE_EPOCH))" + KBUILD_BUILD_TIMESTAMP="$(shell LC_ALL=C TZ='UTC' date -d @$(SOURCE_DATE_EPOCH))" endif # gcc-8 started warning about function aliases that have a @@ -278,6 +287,19 @@ define LINUX_DROP_YYLLOC endef LINUX_POST_PATCH_HOOKS += LINUX_DROP_YYLLOC +# Kernel version < 5.6 breaks if host-gcc version is >= 10 and +# 'yylloc' symbol is removed in previous hook, due to missing +# '%locations' bison directive in dtc-parser.y. See: +# https://bugs.busybox.net/show_bug.cgi?id=14971 +define LINUX_ADD_DTC_LOCATIONS + $(Q)DTC_PARSER=$(@D)/scripts/dtc/dtc-parser.y; \ + if test -e "$${DTC_PARSER}" \ + && ! grep -Eq '^%locations$$' "$${DTC_PARSER}" ; then \ + $(SED) '/^%{$$/i %locations' "$${DTC_PARSER}"; \ + fi +endef +LINUX_POST_PATCH_HOOKS += LINUX_ADD_DTC_LOCATIONS + # Older linux kernels use deprecated perl constructs in timeconst.pl # that were removed for perl 5.22+ so it breaks on newer distributions # Try a dry-run patch to see if this applies, if it does go ahead @@ -302,7 +324,11 @@ endif ifeq ($(BR2_LINUX_KERNEL_USE_DEFCONFIG),y) 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 LINUX_KCONFIG_DEFCONFIG = defconfig +endif else ifeq ($(BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG),y) LINUX_KCONFIG_FILE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE)) endif @@ -362,6 +388,14 @@ define LINUX_KCONFIG_FIXUP_CMDS $(call KCONFIG_DISABLE_OPT,CONFIG_ARC_PAGE_SIZE_4K) $(call KCONFIG_DISABLE_OPT,CONFIG_ARC_PAGE_SIZE_8K) $(call KCONFIG_ENABLE_OPT,CONFIG_ARC_PAGE_SIZE_16K)) + $(if $(BR2_ARM64_PAGE_SIZE_4K), + $(call KCONFIG_ENABLE_OPT,CONFIG_ARM64_4K_PAGES) + $(call KCONFIG_DISABLE_OPT,CONFIG_ARM64_16K_PAGES) + $(call KCONFIG_DISABLE_OPT,CONFIG_ARM64_64K_PAGES)) + $(if $(BR2_ARM64_PAGE_SIZE_64K), + $(call KCONFIG_DISABLE_OPT,CONFIG_ARM64_4K_PAGES) + $(call KCONFIG_DISABLE_OPT,CONFIG_ARM64_16K_PAGES) + $(call KCONFIG_ENABLE_OPT,CONFIG_ARM64_64K_PAGES)) $(if $(BR2_TARGET_ROOTFS_CPIO), $(call KCONFIG_ENABLE_OPT,CONFIG_BLK_DEV_INITRD)) # As the kernel gets compiled before root filesystems are @@ -566,6 +600,12 @@ endif ifeq ($(BR_BUILDING),y) +ifeq ($(BR2_LINUX_KERNEL_CUSTOM_VERSION),y) +ifeq ($(LINUX_VERSION),) +$(error No custom kernel version set. Check your BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE setting) +endif +endif + ifeq ($(BR2_LINUX_KERNEL_USE_DEFCONFIG),y) # We must use the user-supplied kconfig value, because # LINUX_KCONFIG_DEFCONFIG will at least contain the diff --git a/package/4th/4th.hash b/package/4th/4th.hash index ae08a6bf5ec..8a312634796 100644 --- a/package/4th/4th.hash +++ b/package/4th/4th.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 c0905e92316c151224858fcfff21c143c85efa4f9f1b2ade3c64cfd988e0a6a8 4th-3.64.0-unix.tar.gz +sha256 f96ea74cdb2aadfdc3bebf8d6d2cf7b8976b5d56c1237387479bffaecede9fe3 4th-3.64.1-unix.tar.gz sha256 8c6111b645a02219579ea66e84aa8e78a0ed4f4dd80857ffb91bcda5528717d4 COPYING diff --git a/package/4th/4th.mk b/package/4th/4th.mk index d031c0e4b4b..276423b2554 100644 --- a/package/4th/4th.mk +++ b/package/4th/4th.mk @@ -4,7 +4,7 @@ # ################################################################################ -4TH_VERSION = 3.64.0 +4TH_VERSION = 3.64.1 4TH_SOURCE = 4th-$(4TH_VERSION)-unix.tar.gz 4TH_SITE = http://downloads.sourceforge.net/project/forth-4th/4th-$(4TH_VERSION) 4TH_LICENSE = GPL-3.0+, LGPL-3.0+ diff --git a/package/Config.in b/package/Config.in index e20a66bf185..1a57ab805f2 100644 --- a/package/Config.in +++ b/package/Config.in @@ -47,9 +47,13 @@ menu "Audio and video applications" source "package/omxplayer/Config.in" source "package/on2-8170-libs/Config.in" source "package/opus-tools/Config.in" + source "package/pipewire/Config.in" + source "package/pipewire-media-session/Config.in" source "package/pulseaudio/Config.in" source "package/sox/Config.in" + source "package/speechd/Config.in" source "package/squeezelite/Config.in" + source "package/tinycompress/Config.in" source "package/tovid/Config.in" source "package/tstools/Config.in" source "package/twolame/Config.in" @@ -89,6 +93,7 @@ menu "Debugging, profiling and benchmark" source "package/bpftool/Config.in" source "package/cache-calibrator/Config.in" source "package/clinfo/Config.in" + source "package/clpeak/Config.in" source "package/coremark/Config.in" source "package/coremark-pro/Config.in" source "package/dacapo/Config.in" @@ -104,10 +109,11 @@ menu "Debugging, profiling and benchmark" source "package/fwts/Config.in" source "package/gdb/Config.in" source "package/google-breakpad/Config.in" + source "package/hyperfine/Config.in" source "package/iozone/Config.in" source "package/kexec/Config.in" source "package/kexec-lite/Config.in" - source "package/ktap/Config.in" + source "package/kmemd/Config.in" source "package/kvm-unit-tests/Config.in" source "package/kyua/Config.in" source "package/latencytop/Config.in" @@ -119,6 +125,7 @@ menu "Debugging, profiling and benchmark" source "package/lttng-babeltrace/Config.in" source "package/lttng-modules/Config.in" source "package/lttng-tools/Config.in" + source "package/mbw/Config.in" source "package/mcelog/Config.in" source "package/memstat/Config.in" source "package/netperf/Config.in" @@ -127,6 +134,7 @@ menu "Debugging, profiling and benchmark" source "package/oprofile/Config.in" source "package/pax-utils/Config.in" source "package/pcm-tools/Config.in" + source "package/perftest/Config.in" source "package/piglit/Config.in" source "package/ply/Config.in" source "package/poke/Config.in" @@ -138,6 +146,7 @@ menu "Debugging, profiling and benchmark" source "package/rt-tests/Config.in" source "package/rwmem/Config.in" source "package/sentry-native/Config.in" + source "package/signal-estimator/Config.in" source "package/spidev_test/Config.in" source "package/strace/Config.in" source "package/stress/Config.in" @@ -156,6 +165,7 @@ menu "Debugging, profiling and benchmark" endmenu menu "Development tools" + source "package/avocado/Config.in" source "package/bats-core/Config.in" source "package/binutils/Config.in" source "package/bitwise/Config.in" @@ -207,6 +217,7 @@ menu "Filesystem and flash utilities" source "package/curlftpfs/Config.in" source "package/davfs2/Config.in" source "package/dosfstools/Config.in" + source "package/dust/Config.in" source "package/e2fsprogs/Config.in" source "package/e2tools/Config.in" source "package/ecryptfs-utils/Config.in" @@ -238,6 +249,7 @@ menu "Filesystem and flash utilities" source "package/udftools/Config.in" source "package/unionfs/Config.in" source "package/xfsprogs/Config.in" + source "package/zerofree/Config.in" source "package/zfs/Config.in" endmenu @@ -316,6 +328,7 @@ comment "Graphic applications" source "package/qt5cinex/Config.in" source "package/rrdtool/Config.in" source "package/stellarium/Config.in" + source "package/sway/Config.in" source "package/tesseract-ocr/Config.in" source "package/tinifier/Config.in" @@ -370,6 +383,7 @@ comment "QT libraries and helper libraries" source "package/qwt/Config.in" source "package/simple-mail/Config.in" endif + source "package/qt6/Config.in" source "package/tekui/Config.in" source "package/weston/Config.in" source "package/x11r7/Config.in" @@ -432,7 +446,8 @@ menu "Firmware" source "package/sunxi-boards/Config.in" source "package/ts4900-fpga/Config.in" source "package/ux500-firmware/Config.in" - source "package/wilc1000-firmware/Config.in" + source "package/versal-firmware/Config.in" + source "package/wilc-firmware/Config.in" source "package/wilink-bt-firmware/Config.in" source "package/zd1211-firmware/Config.in" endmenu @@ -454,12 +469,14 @@ endmenu source "package/cc-tool/Config.in" source "package/cdrkit/Config.in" source "package/cpuburn-arm/Config.in" + source "package/crucible/Config.in" source "package/cryptsetup/Config.in" source "package/cwiid/Config.in" source "package/dahdi-linux/Config.in" source "package/dahdi-tools/Config.in" source "package/davinci-bootcount/Config.in" source "package/dbus/Config.in" + source "package/dbus-broker/Config.in" source "package/dbus-cpp/Config.in" source "package/dbus-cxx/Config.in" source "package/dbus-glib/Config.in" @@ -475,6 +492,7 @@ endmenu source "package/dvb-apps/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/eudev/Config.in" source "package/ev3dev-linux-drivers/Config.in" @@ -494,6 +512,7 @@ endmenu source "package/gpsd/Config.in" source "package/gptfdisk/Config.in" source "package/gvfs/Config.in" + source "package/hddtemp/Config.in" source "package/hdparm/Config.in" source "package/hwdata/Config.in" source "package/hwloc/Config.in" @@ -508,6 +527,7 @@ endmenu source "package/kbd/Config.in" source "package/lcdproc/Config.in" source "package/libiec61850/Config.in" + source "package/libmanette/Config.in" source "package/libubootenv/Config.in" source "package/libuio/Config.in" source "package/linux-backports/Config.in" @@ -525,6 +545,7 @@ endmenu source "package/mbpfan/Config.in" source "package/mdadm/Config.in" source "package/mdevd/Config.in" + source "package/mdio-tools/Config.in" source "package/memtest86/Config.in" source "package/memtester/Config.in" source "package/memtool/Config.in" @@ -536,6 +557,7 @@ endmenu source "package/nvidia-modprobe/Config.in" source "package/nvme/Config.in" source "package/ofono/Config.in" + source "package/ola/Config.in" source "package/on2-8170-modules/Config.in" source "package/open2300/Config.in" source "package/openfpgaloader/Config.in" @@ -555,6 +577,7 @@ endmenu source "package/pulseview/Config.in" source "package/qoriq-cadence-dp-firmware/Config.in" source "package/raspi-gpio/Config.in" + source "package/rdma-core/Config.in" source "package/read-edid/Config.in" source "package/rng-tools/Config.in" source "package/rockchip-mali/Config.in" @@ -564,10 +587,13 @@ endmenu source "package/rtl8188eu/Config.in" source "package/rtl8189es/Config.in" source "package/rtl8189fs/Config.in" - source "package/rtl8723bs/Config.in" + source "package/rtl8192eu/Config.in" source "package/rtl8723bu/Config.in" + source "package/rtl8723ds/Config.in" + source "package/rtl8723ds-bt/Config.in" source "package/rtl8812au-aircrack-ng/Config.in" source "package/rtl8821au/Config.in" + source "package/rtl8821cu/Config.in" source "package/sane-backends/Config.in" source "package/sdparm/Config.in" source "package/sedutil/Config.in" @@ -596,7 +622,6 @@ endmenu source "package/triggerhappy/Config.in" source "package/uboot-tools/Config.in" source "package/ubus/Config.in" - source "package/uccp420wlan/Config.in" source "package/udev/Config.in" source "package/udev-gentoo-scripts/Config.in" source "package/udisks/Config.in" @@ -610,6 +635,7 @@ endmenu 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" source "package/xorriso/Config.in" source "package/xr819-xradio/Config.in" @@ -705,6 +731,7 @@ menu "Lua libraries/modules" source "package/lua-lyaml/Config.in" source "package/lua-markdown/Config.in" source "package/lua-messagepack/Config.in" + source "package/lua-mqtt/Config.in" source "package/lua-msgpack-native/Config.in" source "package/lua-periphery/Config.in" source "package/lua-resty-http/Config.in" @@ -757,6 +784,7 @@ menu "Mono libraries/modules" endmenu endif source "package/nodejs/Config.in" + source "package/octave/Config.in" source "package/openjdk/Config.in" source "package/perl/Config.in" if BR2_PACKAGE_PERL @@ -769,6 +797,7 @@ menu "Perl libraries/modules" source "package/perl-class-method-modifiers/Config.in" source "package/perl-class-std/Config.in" source "package/perl-class-std-fast/Config.in" + source "package/perl-clone/Config.in" source "package/perl-convert-asn1/Config.in" source "package/perl-cookie-baker/Config.in" source "package/perl-crypt-blowfish/Config.in" @@ -815,6 +844,7 @@ menu "Perl libraries/modules" source "package/perl-http-multipartparser/Config.in" source "package/perl-http-negotiate/Config.in" source "package/perl-i18n/Config.in" + source "package/perl-image-exiftool/Config.in" source "package/perl-io-html/Config.in" source "package/perl-io-interface/Config.in" source "package/perl-io-socket-multicast/Config.in" @@ -927,14 +957,19 @@ menu "External python modules" source "package/python-aiorwlock/Config.in" source "package/python-aiosignal/Config.in" source "package/python-aiozipkin/Config.in" + source "package/python-alembic/Config.in" source "package/python-alsaaudio/Config.in" source "package/python-ansicolors/Config.in" + source "package/python-apispec/Config.in" + source "package/python-appdirs/Config.in" source "package/python-argh/Config.in" source "package/python-argon2-cffi/Config.in" source "package/python-argon2-cffi-bindings/Config.in" source "package/python-arrow/Config.in" source "package/python-asgiref/Config.in" source "package/python-asn1crypto/Config.in" + source "package/python-asttokens/Config.in" + source "package/python-async-generator/Config.in" source "package/python-async-lru/Config.in" source "package/python-async-timeout/Config.in" source "package/python-attrs/Config.in" @@ -955,7 +990,6 @@ menu "External python modules" source "package/python-bottle/Config.in" source "package/python-brotli/Config.in" source "package/python-bsdiff4/Config.in" - source "package/python-bunch/Config.in" source "package/python-cached-property/Config.in" source "package/python-can/Config.in" source "package/python-canopen/Config.in" @@ -978,6 +1012,7 @@ menu "External python modules" source "package/python-colorzero/Config.in" source "package/python-configshell-fb/Config.in" source "package/python-constantly/Config.in" + source "package/python-construct/Config.in" source "package/python-couchdb/Config.in" source "package/python-crayons/Config.in" source "package/python-crc16/Config.in" @@ -994,11 +1029,13 @@ menu "External python modules" source "package/python-daphne/Config.in" source "package/python-dataproperty/Config.in" source "package/python-dateutil/Config.in" + source "package/python-dbus-fast/Config.in" source "package/python-dbus-next/Config.in" source "package/python-decorator/Config.in" source "package/python-defusedxml/Config.in" source "package/python-dialog3/Config.in" source "package/python-dicttoxml/Config.in" + source "package/python-dicttoxml2/Config.in" source "package/python-distro/Config.in" source "package/python-django/Config.in" source "package/python-django-enumfields/Config.in" @@ -1010,10 +1047,12 @@ menu "External python modules" source "package/python-docutils/Config.in" source "package/python-dominate/Config.in" source "package/python-dpkt/Config.in" + source "package/python-dtschema/Config.in" source "package/python-ecdsa/Config.in" source "package/python-engineio/Config.in" source "package/python-entrypoints/Config.in" source "package/python-esptool/Config.in" + source "package/python-executing/Config.in" source "package/python-falcon/Config.in" source "package/python-filelock/Config.in" source "package/python-fire/Config.in" @@ -1023,6 +1062,7 @@ menu "External python modules" 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-smorest/Config.in" source "package/python-flask-sqlalchemy/Config.in" source "package/python-flask-wtf/Config.in" source "package/python-flatbuffers/Config.in" @@ -1037,8 +1077,10 @@ menu "External python modules" source "package/python-gpiozero/Config.in" source "package/python-greenlet/Config.in" source "package/python-gunicorn/Config.in" + source "package/python-h11/Config.in" source "package/python-h2/Config.in" source "package/python-hiredis/Config.in" + source "package/python-hkdf/Config.in" source "package/python-hpack/Config.in" source "package/python-html5lib/Config.in" source "package/python-httplib2/Config.in" @@ -1075,7 +1117,9 @@ menu "External python modules" source "package/python-jsonschema/Config.in" source "package/python-keyring/Config.in" source "package/python-kiwisolver/Config.in" + source "package/python-lark/Config.in" source "package/python-libconfig/Config.in" + source "package/python-libevdev/Config.in" source "package/python-libusb1/Config.in" source "package/python-lmdb/Config.in" source "package/python-lockfile/Config.in" @@ -1083,15 +1127,20 @@ menu "External python modules" source "package/python-logstash/Config.in" source "package/python-lxml/Config.in" source "package/python-m2crypto/Config.in" - source "package/python-m2r/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" source "package/python-mako/Config.in" source "package/python-markdown/Config.in" source "package/python-markdown2/Config.in" source "package/python-markupsafe/Config.in" + source "package/python-marshmallow/Config.in" + source "package/python-marshmallow-sqlalchemy/Config.in" source "package/python-matplotlib/Config.in" source "package/python-mbstrdecoder/Config.in" source "package/python-memory-profiler/Config.in" source "package/python-mimeparse/Config.in" + source "package/python-minimalmodbus/Config.in" source "package/python-mistune/Config.in" source "package/python-modbus-tk/Config.in" source "package/python-more-itertools/Config.in" @@ -1099,10 +1148,12 @@ menu "External python modules" source "package/python-msgfy/Config.in" source "package/python-msgpack/Config.in" source "package/python-multidict/Config.in" + source "package/python-munch/Config.in" source "package/python-mutagen/Config.in" source "package/python-mwclient/Config.in" source "package/python-mwscrape/Config.in" source "package/python-mwscrape2slob/Config.in" + source "package/python-mypy-extensions/Config.in" source "package/python-nested-dict/Config.in" source "package/python-netaddr/Config.in" source "package/python-netifaces/Config.in" @@ -1111,6 +1162,8 @@ menu "External python modules" source "package/python-numpy/Config.in" source "package/python-oauthlib/Config.in" source "package/python-opcua-asyncio/Config.in" + source "package/python-orjson/Config.in" + source "package/python-outcome/Config.in" source "package/python-packaging/Config.in" source "package/python-paho-mqtt/Config.in" source "package/python-paramiko/Config.in" @@ -1137,6 +1190,7 @@ menu "External python modules" source "package/python-psycopg2/Config.in" source "package/python-ptyprocess/Config.in" source "package/python-pudb/Config.in" + source "package/python-pure-eval/Config.in" source "package/python-py/Config.in" source "package/python-pyaes/Config.in" source "package/python-pyalsa/Config.in" @@ -1146,10 +1200,12 @@ menu "External python modules" source "package/python-pycairo/Config.in" source "package/python-pycares/Config.in" source "package/python-pycparser/Config.in" + source "package/python-pycrate/Config.in" source "package/python-pycryptodomex/Config.in" source "package/python-pycups/Config.in" source "package/python-pydal/Config.in" source "package/python-pydantic/Config.in" + source "package/python-pydevmem/Config.in" source "package/python-pydyf/Config.in" source "package/python-pyelftools/Config.in" source "package/python-pyftpdlib/Config.in" @@ -1160,6 +1216,7 @@ menu "External python modules" source "package/python-pyicu/Config.in" source "package/python-pyinotify/Config.in" source "package/python-pyjwt/Config.in" + source "package/python-pylibfdt/Config.in" source "package/python-pylibftdi/Config.in" source "package/python-pylru/Config.in" source "package/python-pymodbus/Config.in" @@ -1175,6 +1232,7 @@ menu "External python modules" source "package/python-pyqt5/Config.in" source "package/python-pyratemp/Config.in" source "package/python-pyroute2/Config.in" + source "package/python-pyrsistent/Config.in" source "package/python-pysendfile/Config.in" source "package/python-pysftp/Config.in" source "package/python-pysmb/Config.in" @@ -1182,6 +1240,7 @@ menu "External python modules" source "package/python-pysnmp/Config.in" source "package/python-pysnmp-mibs/Config.in" source "package/python-pysocks/Config.in" + source "package/python-pyspnego/Config.in" source "package/python-pytablereader/Config.in" source "package/python-pytablewriter/Config.in" source "package/python-pytest/Config.in" @@ -1193,8 +1252,10 @@ menu "External python modules" source "package/python-pyxb/Config.in" source "package/python-pyyaml/Config.in" source "package/python-pyzmq/Config.in" + source "package/python-qrcode/Config.in" source "package/python-raven/Config.in" source "package/python-redis/Config.in" + source "package/python-reedsolo/Config.in" source "package/python-reentry/Config.in" source "package/python-regex/Config.in" source "package/python-remi/Config.in" @@ -1202,17 +1263,22 @@ menu "External python modules" source "package/python-requests/Config.in" source "package/python-requests-oauthlib/Config.in" source "package/python-requests-toolbelt/Config.in" + source "package/python-rfc3987/Config.in" source "package/python-rpi-gpio/Config.in" source "package/python-rpi-ws281x/Config.in" source "package/python-rsa/Config.in" + source "package/python-rtoml/Config.in" source "package/python-rtslib-fb/Config.in" + source "package/python-ruamel-yaml/Config.in" source "package/python-s3transfer/Config.in" source "package/python-scandir/Config.in" source "package/python-scapy/Config.in" source "package/python-schedule/Config.in" + source "package/python-scipy/Config.in" source "package/python-sdnotify/Config.in" source "package/python-secretstorage/Config.in" source "package/python-see/Config.in" + source "package/python-selenium/Config.in" source "package/python-semver/Config.in" source "package/python-sentry-sdk/Config.in" source "package/python-serial/Config.in" @@ -1230,17 +1296,21 @@ menu "External python modules" source "package/python-sip/Config.in" source "package/python-six/Config.in" source "package/python-slob/Config.in" + source "package/python-smbprotocol/Config.in" source "package/python-smbus-cffi/Config.in" source "package/python-smmap2/Config.in" source "package/python-snappy/Config.in" + source "package/python-sniffio/Config.in" source "package/python-socketio/Config.in" source "package/python-sockjs/Config.in" source "package/python-sortedcontainers/Config.in" source "package/python-soupsieve/Config.in" + source "package/python-spake2/Config.in" source "package/python-spidev/Config.in" source "package/python-sqlalchemy/Config.in" source "package/python-sqliteschema/Config.in" source "package/python-sqlparse/Config.in" + source "package/python-stack-data/Config.in" source "package/python-systemd/Config.in" source "package/python-tabledata/Config.in" source "package/python-tempora/Config.in" @@ -1257,14 +1327,19 @@ menu "External python modules" source "package/python-tqdm/Config.in" source "package/python-traitlets/Config.in" source "package/python-treq/Config.in" + source "package/python-trio/Config.in" + source "package/python-trio-websocket/Config.in" source "package/python-twisted/Config.in" source "package/python-txaio/Config.in" source "package/python-txdbus/Config.in" source "package/python-txtorcon/Config.in" + source "package/python-typeguard/Config.in" source "package/python-typepy/Config.in" source "package/python-typing-extensions/Config.in" + source "package/python-typing-inspect/Config.in" source "package/python-u-msgpack/Config.in" source "package/python-ubjson/Config.in" + source "package/python-uhid/Config.in" source "package/python-ujson/Config.in" source "package/python-unittest-xml-reporting/Config.in" source "package/python-urllib3/Config.in" @@ -1277,6 +1352,7 @@ menu "External python modules" source "package/python-wcwidth/Config.in" source "package/python-weasyprint/Config.in" source "package/python-web2py/Config.in" + source "package/python-webargs/Config.in" source "package/python-webencodings/Config.in" source "package/python-webob/Config.in" source "package/python-webpy/Config.in" @@ -1287,6 +1363,7 @@ menu "External python modules" source "package/python-wrapt/Config.in" source "package/python-ws4py/Config.in" source "package/python-wsaccel/Config.in" + source "package/python-wsproto/Config.in" source "package/python-wtforms/Config.in" source "package/python-xlib/Config.in" source "package/python-xlrd/Config.in" @@ -1300,6 +1377,7 @@ menu "External python modules" source "package/python-yatl/Config.in" source "package/python-zc-lockfile/Config.in" source "package/python-zeroconf/Config.in" + source "package/python-zlmdb/Config.in" source "package/python-zope-interface/Config.in" source "package/python-zopfli/Config.in" endmenu @@ -1375,12 +1453,14 @@ endmenu menu "Compression and decompression" source "package/libarchive/Config.in" + source "package/libdeflate/Config.in" source "package/libmspack/Config.in" source "package/libsquish/Config.in" source "package/libzip/Config.in" source "package/lz4/Config.in" source "package/lzo/Config.in" source "package/minizip/Config.in" + source "package/minizip-zlib/Config.in" source "package/snappy/Config.in" source "package/szip/Config.in" source "package/zchunk/Config.in" @@ -1399,6 +1479,7 @@ menu "Crypto" source "package/gnutls/Config.in" source "package/libargon2/Config.in" source "package/libassuan/Config.in" + source "package/libb2/Config.in" source "package/libgcrypt/Config.in" source "package/libgpg-error/Config.in" source "package/libgpgme/Config.in" @@ -1429,6 +1510,7 @@ menu "Crypto" source "package/trousers/Config.in" source "package/ustream-ssl/Config.in" source "package/wolfssl/Config.in" + source "package/wolftpm/Config.in" endmenu menu "Database" @@ -1481,10 +1563,12 @@ menu "Graphics" source "package/at-spi2-core/Config.in" source "package/atk/Config.in" source "package/atkmm/Config.in" + source "package/atkmm2_28/Config.in" source "package/bayer2rgb-neon/Config.in" source "package/bullet/Config.in" source "package/cairo/Config.in" source "package/cairomm/Config.in" + source "package/cairomm1_14/Config.in" source "package/chipmunk/Config.in" source "package/exempi/Config.in" source "package/exiv2/Config.in" @@ -1534,6 +1618,7 @@ menu "Graphics" source "package/libgta/Config.in" source "package/libgtk2/Config.in" source "package/libgtk3/Config.in" + source "package/libjxl/Config.in" source "package/libmediaart/Config.in" source "package/libmng/Config.in" source "package/libpng/Config.in" @@ -1549,17 +1634,19 @@ menu "Graphics" source "package/libvips/Config.in" source "package/libwpe/Config.in" source "package/menu-cache/Config.in" + source "package/opencl-clhpp/Config.in" source "package/opencv3/Config.in" source "package/opencv4/Config.in" + source "package/opencv4-contrib/Config.in" source "package/opengl/Config.in" source "package/openjpeg/Config.in" source "package/pango/Config.in" source "package/pangomm/Config.in" - source "package/pipewire/Config.in" - source "package/pipewire-media-session/Config.in" + source "package/pangomm2_46/Config.in" source "package/pixman/Config.in" source "package/poppler/Config.in" source "package/powervr/Config.in" + source "package/stb/Config.in" source "package/tiff/Config.in" source "package/unclutter-xfixes/Config.in" source "package/waffle/Config.in" @@ -1632,6 +1719,7 @@ menu "Hardware handling" source "package/mtdev/Config.in" source "package/ne10/Config.in" source "package/neardal/Config.in" + source "package/opensc/Config.in" source "package/owfs/Config.in" source "package/pcsc-lite/Config.in" source "package/rpi-rgb-led-matrix/Config.in" @@ -1656,6 +1744,7 @@ endif source "package/duktape/Config.in" source "package/explorercanvas/Config.in" source "package/flot/Config.in" + source "package/forge/Config.in" source "package/jquery/Config.in" if BR2_PACKAGE_JQUERY menu "External jQuery plugins" @@ -1674,6 +1763,7 @@ endif source "package/jszip/Config.in" source "package/openlayers/Config.in" source "package/popperjs/Config.in" + source "package/vis-network/Config.in" source "package/vuejs/Config.in" if BR2_PACKAGE_VUEJS comment "External Vue.js plugins" @@ -1721,6 +1811,7 @@ endmenu menu "Logging" source "package/glog/Config.in" + source "package/hawktracer/Config.in" source "package/liblog4c-localtime/Config.in" source "package/liblogging/Config.in" source "package/log4cplus/Config.in" @@ -1744,7 +1835,6 @@ menu "Multimedia" source "package/libbluray/Config.in" source "package/libcamera/Config.in" source "package/libcamera-apps/Config.in" - source "package/libdcadec/Config.in" source "package/libdvbcsa/Config.in" source "package/libdvbpsi/Config.in" source "package/libdvbsi/Config.in" @@ -1780,12 +1870,14 @@ menu "Networking" source "package/bluez5_utils-headers/Config.in" source "package/c-ares/Config.in" source "package/cgic/Config.in" + source "package/cni-plugins/Config.in" source "package/cppzmq/Config.in" source "package/curlpp/Config.in" source "package/czmq/Config.in" source "package/daq/Config.in" source "package/daq3/Config.in" source "package/davici/Config.in" + source "package/dht/Config.in" source "package/enet/Config.in" source "package/filemq/Config.in" source "package/flickcurl/Config.in" @@ -1868,6 +1960,7 @@ menu "Networking" source "package/libupnp/Config.in" source "package/libupnpp/Config.in" source "package/liburiparser/Config.in" + source "package/libutp/Config.in" source "package/libuwsc/Config.in" source "package/libvncserver/Config.in" source "package/libwebsock/Config.in" @@ -1885,6 +1978,7 @@ menu "Networking" source "package/nss-myhostname/Config.in" source "package/nss-pam-ldapd/Config.in" source "package/omniorb/Config.in" + source "package/open-isns/Config.in" source "package/open62541/Config.in" source "package/openldap/Config.in" source "package/openmpi/Config.in" @@ -1902,8 +1996,10 @@ menu "Networking" source "package/rtmpdump/Config.in" source "package/siproxd/Config.in" source "package/slirp/Config.in" + source "package/slirp4netns/Config.in" source "package/snmppp/Config.in" source "package/sofia-sip/Config.in" + source "package/sscep/Config.in" source "package/sysrepo/Config.in" source "package/thrift/Config.in" source "package/usbredir/Config.in" @@ -1928,31 +2024,40 @@ menu "Other" source "package/boost/Config.in" source "package/c-capnproto/Config.in" source "package/capnproto/Config.in" + source "package/catch2/Config.in" source "package/cctz/Config.in" source "package/cereal/Config.in" source "package/clang/Config.in" source "package/cmocka/Config.in" + source "package/compiler-rt/Config.in" source "package/cppcms/Config.in" source "package/cracklib/Config.in" source "package/dawgdic/Config.in" source "package/ding-libs/Config.in" + source "package/dotconf/Config.in" + source "package/double-conversion/Config.in" source "package/eigen/Config.in" source "package/elfutils/Config.in" source "package/ell/Config.in" + source "package/falcosecurity-libs/Config.in" source "package/fftw/Config.in" source "package/flann/Config.in" source "package/flatbuffers/Config.in" source "package/flatcc/Config.in" + source "package/fxdiv/Config.in" source "package/gconf/Config.in" + source "package/gdal/Config.in" source "package/gflags/Config.in" source "package/gli/Config.in" source "package/glibmm/Config.in" + source "package/glibmm2_66/Config.in" source "package/glm/Config.in" source "package/gmp/Config.in" source "package/gobject-introspection/Config.in" source "package/gsl/Config.in" source "package/gtest/Config.in" source "package/gumbo-parser/Config.in" + source "package/highway/Config.in" source "package/jemalloc/Config.in" source "package/lapack/Config.in" source "package/libabseil-cpp/Config.in" @@ -1972,6 +2077,7 @@ menu "Other" source "package/libcrossguid/Config.in" source "package/libcsv/Config.in" source "package/libdaemon/Config.in" + source "package/libdill/Config.in" source "package/libeastl/Config.in" source "package/libee/Config.in" source "package/libev/Config.in" @@ -2003,7 +2109,9 @@ menu "Other" source "package/libseccomp/Config.in" source "package/libshdata/Config.in" source "package/libsigc/Config.in" + source "package/libsigc2/Config.in" source "package/libsigsegv/Config.in" + source "package/libsolv/Config.in" source "package/libspatialindex/Config.in" source "package/libtalloc/Config.in" source "package/libtasn1/Config.in" @@ -2034,6 +2142,7 @@ endif source "package/msgpack/Config.in" source "package/musl-compat-headers/Config.in" source "package/musl-fts/Config.in" + source "package/neon-2-sse/Config.in" source "package/openblas/Config.in" source "package/orc/Config.in" source "package/p11-kit/Config.in" @@ -2043,15 +2152,19 @@ endif source "package/protozero/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/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/tinycbor/Config.in" + source "package/tl-expected/Config.in" source "package/tz/Config.in" source "package/tzdata/Config.in" source "package/uvw/Config.in" + source "package/volk/Config.in" source "package/xapian/Config.in" endmenu @@ -2066,6 +2179,8 @@ endmenu menu "Text and terminal handling" source "package/augeas/Config.in" + source "package/cli11/Config.in" + source "package/docopt-cpp/Config.in" source "package/enchant/Config.in" source "package/fmt/Config.in" source "package/fstrcmp/Config.in" @@ -2077,6 +2192,7 @@ menu "Text and terminal handling" source "package/libestr/Config.in" source "package/libfribidi/Config.in" source "package/libiconv/Config.in" + source "package/libunibreak/Config.in" source "package/libunistring/Config.in" source "package/linenoise/Config.in" source "package/ncurses/Config.in" @@ -2089,6 +2205,7 @@ menu "Text and terminal handling" source "package/readline/Config.in" source "package/slang/Config.in" source "package/tclap/Config.in" + source "package/termcolor/Config.in" source "package/utf8proc/Config.in" endmenu @@ -2114,6 +2231,7 @@ menu "Miscellaneous" source "package/collectl/Config.in" source "package/domoticz/Config.in" source "package/empty/Config.in" + source "package/gitlab-runner/Config.in" source "package/gnuradio/Config.in" source "package/volk/Config.in" source "package/googlefontdirectory/Config.in" @@ -2134,6 +2252,7 @@ menu "Miscellaneous" source "package/wine/Config.in" source "package/xmrig/Config.in" source "package/xutil_util-macros/Config.in" + source "package/z3/Config.in" endmenu menu "Networking applications" @@ -2205,6 +2324,7 @@ endif source "package/flannel/Config.in" source "package/fmc/Config.in" source "package/fping/Config.in" + source "package/freeradius-server/Config.in" source "package/freeswitch/Config.in" source "package/freeswitch-mod-bcg729/Config.in" source "package/frr/Config.in" @@ -2309,10 +2429,12 @@ endif source "package/nmap/Config.in" source "package/noip/Config.in" source "package/ntp/Config.in" + source "package/ntpsec/Config.in" source "package/nuttcp/Config.in" source "package/odhcp6c/Config.in" source "package/odhcploc/Config.in" source "package/olsr/Config.in" + source "package/open-iscsi/Config.in" source "package/open-lldp/Config.in" source "package/open-plc-utils/Config.in" source "package/openntpd/Config.in" @@ -2339,7 +2461,6 @@ endif source "package/pure-ftpd/Config.in" source "package/putty/Config.in" source "package/quagga/Config.in" - source "package/rabbitmq-server/Config.in" source "package/radvd/Config.in" source "package/reaver/Config.in" source "package/redir/Config.in" @@ -2422,6 +2543,7 @@ endif source "package/xl2tp/Config.in" source "package/xtables-addons/Config.in" source "package/zabbix/Config.in" + source "package/zeek/Config.in" source "package/znc/Config.in" endmenu @@ -2476,6 +2598,7 @@ comment "Utilities" source "package/apg/Config.in" source "package/at/Config.in" source "package/bash-completion/Config.in" + source "package/catatonit/Config.in" source "package/ccrypt/Config.in" source "package/crudini/Config.in" source "package/dialog/Config.in" @@ -2496,6 +2619,7 @@ comment "Utilities" source "package/rtty/Config.in" source "package/screen/Config.in" source "package/screenfetch/Config.in" + source "package/sexpect/Config.in" source "package/sudo/Config.in" source "package/terminology/Config.in" source "package/time/Config.in" @@ -2503,6 +2627,7 @@ comment "Utilities" source "package/tmux/Config.in" source "package/ttyd/Config.in" source "package/which/Config.in" + source "package/wtfutil/Config.in" source "package/xmlstarlet/Config.in" source "package/xxhash/Config.in" source "package/ytree/Config.in" @@ -2520,7 +2645,9 @@ menu "System tools" source "package/circus/Config.in" source "package/containerd/Config.in" source "package/coreutils/Config.in" + source "package/cpulimit/Config.in" source "package/cpuload/Config.in" + source "package/crun/Config.in" source "package/daemon/Config.in" source "package/dc3dd/Config.in" source "package/dcron/Config.in" @@ -2529,12 +2656,12 @@ menu "System tools" source "package/docker-cli/Config.in" source "package/docker-compose/Config.in" source "package/docker-engine/Config.in" - source "package/docker-proxy/Config.in" source "package/earlyoom/Config.in" source "package/efibootmgr/Config.in" source "package/efivar/Config.in" source "package/embiggen-disk/Config.in" source "package/emlog/Config.in" + source "package/fluent-bit/Config.in" source "package/ftop/Config.in" source "package/getent/Config.in" source "package/gkrellm/Config.in" @@ -2553,12 +2680,14 @@ menu "System tools" source "package/lxc/Config.in" source "package/makedumpfile/Config.in" source "package/mender/Config.in" + source "package/mender-connect/Config.in" source "package/mender-grubenv/Config.in" source "package/mfoc/Config.in" source "package/moby-buildkit/Config.in" source "package/monit/Config.in" source "package/multipath-tools/Config.in" source "package/ncdu/Config.in" + source "package/nerdctl/Config.in" source "package/netifrc/Config.in" source "package/numactl/Config.in" source "package/nut/Config.in" @@ -2597,6 +2726,7 @@ menu "System tools" source "package/systemd-bootchart/Config.in" source "package/sysvinit/Config.in" source "package/tar/Config.in" + source "package/tealdeer/Config.in" source "package/thermald/Config.in" source "package/tpm-tools/Config.in" source "package/tpm2-abrmd/Config.in" diff --git a/package/Config.in.host b/package/Config.in.host index 095c7ce713b..ee680f00a4b 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -2,16 +2,19 @@ menu "Host utilities" source "package/abootimg/Config.in.host" source "package/aespipe/Config.in.host" + source "package/agent-proxy/Config.in.host" source "package/android-tools/Config.in.host" source "package/asn1c/Config.in.host" source "package/babeltrace2/Config.in.host" source "package/bmap-tools/Config.in.host" + source "package/bootgen/Config.in.host" source "package/btrfs-progs/Config.in.host" source "package/cbootimage/Config.in.host" source "package/checkpolicy/Config.in.host" source "package/checksec/Config.in.host" source "package/cmake/Config.in.host" source "package/cramfs/Config.in.host" + source "package/crudini/Config.in.host" source "package/cryptsetup/Config.in.host" source "package/dbus-python/Config.in.host" source "package/delve/Config.in.host" @@ -20,6 +23,7 @@ menu "Host utilities" source "package/dosfstools/Config.in.host" source "package/doxygen/Config.in.host" source "package/dropbear/Config.in.host" + source "package/dracut/Config.in.host" source "package/dtc/Config.in.host" source "package/e2fsprogs/Config.in.host" source "package/e2tools/Config.in.host" @@ -51,10 +55,13 @@ menu "Host utilities" source "package/lld/Config.in.host" source "package/lpc3250loader/Config.in.host" source "package/lttng-babeltrace/Config.in.host" + source "package/lzma-alone/Config.in.host" source "package/mender-artifact/Config.in.host" source "package/meson-tools/Config.in.host" source "package/mfgtools/Config.in.host" source "package/mkpasswd/Config.in.host" + source "package/moby-buildkit/Config.in.host" + source "package/mosquitto/Config.in.host" source "package/mtd/Config.in.host" source "package/mtools/Config.in.host" source "package/mxsldr/Config.in.host" @@ -72,7 +79,10 @@ menu "Host utilities" source "package/pwgen/Config.in.host" source "package/python-cython/Config.in.host" source "package/python-greenlet/Config.in.host" + source "package/python-iniparse/Config.in.host" + source "package/python-kflash/Config.in.host" source "package/python-lxml/Config.in.host" + source "package/python-pyyaml/Config.in.host" source "package/python-six/Config.in.host" source "package/python-xlrd/Config.in.host" source "package/python3/Config.in.host" @@ -81,6 +91,7 @@ menu "Host utilities" source "package/raspberrypi-usbboot/Config.in.host" source "package/rauc/Config.in.host" source "package/riscv-isa-sim/Config.in.host" + source "package/runc/Config.in.host" source "package/rustc/Config.in.host" source "package/s6-rc/Config.in.host" source "package/sam-ba/Config.in.host" @@ -96,6 +107,7 @@ menu "Host utilities" source "package/uboot-tools/Config.in.host" source "package/util-linux/Config.in.host" source "package/utp_com/Config.in.host" + source "package/uuu/Config.in.host" source "package/vboot-utils/Config.in.host" source "package/xorriso/Config.in.host" source "package/zip/Config.in.host" diff --git a/package/Makefile.in b/package/Makefile.in index 508ea7c3665..d70aded82ba 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -51,8 +51,12 @@ ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) LIBC = uclibc else ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) LIBC = musl -else +else ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),y) LIBC = gnu +else ifeq ($(BR_BUILDING),y) +# This happens if there is a bug in Buildroot that allows an +# architecture configuration that isn't supported by any library. +$(error No C library enabled, this is not possible.) endif # The ABI suffix is a bit special on ARM, as it needs to be @@ -71,15 +75,6 @@ ABI := $(ABI)hf endif endif -# For C-SKY abiv1 & abiv2 -ifeq ($(BR2_csky),y) -ifeq ($(BR2_ck610),y) -ABI = abiv1 -else -ABI = abiv2 -endif -endif - # For FSL PowerPC there's SPE ifeq ($(BR2_powerpc_SPE),y) ABI = spe @@ -165,6 +160,8 @@ ifeq ($(BR2_FORTIFY_SOURCE_1),y) TARGET_HARDENED += -D_FORTIFY_SOURCE=1 else ifeq ($(BR2_FORTIFY_SOURCE_2),y) TARGET_HARDENED += -D_FORTIFY_SOURCE=2 +else ifeq ($(BR2_FORTIFY_SOURCE_3),y) +TARGET_HARDENED += -D_FORTIFY_SOURCE=3 endif TARGET_CPPFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 @@ -429,9 +426,8 @@ else ifeq ($(BR2_SHARED_STATIC_LIBS),y) SHARED_STATIC_LIBS_OPTS = --enable-static --enable-shared endif -ifeq ($(BR2_COMPILER_PARANOID_UNSAFE_PATH),y) +# Used by our binutils patches. export BR_COMPILER_PARANOID_UNSAFE_PATH=enabled -endif include package/pkg-download.mk include package/pkg-autotools.mk diff --git a/package/abootimg/abootimg.hash b/package/abootimg/abootimg.hash index 141db268607..33e74b893e9 100644 --- a/package/abootimg/abootimg.hash +++ b/package/abootimg/abootimg.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f377da42a57d982cfc22fa75c5a69febdc3e4c1ef43cd0ceaec42e14067e2f37 abootimg-1ebeb393252ab5aeed62e34bc439b6728444f06e-br1.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE +sha256 f377da42a57d982cfc22fa75c5a69febdc3e4c1ef43cd0ceaec42e14067e2f37 abootimg-1ebeb393252ab5aeed62e34bc439b6728444f06e-br1.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/abootimg/abootimg.mk b/package/abootimg/abootimg.mk index a07100df5a7..ca09e94f16e 100644 --- a/package/abootimg/abootimg.mk +++ b/package/abootimg/abootimg.mk @@ -27,7 +27,7 @@ define HOST_ABOOTIMG_BUILD_CMDS endef define HOST_ABOOTIMG_INSTALL_CMDS - $(INSTALL) -m 0755 $(@D)/abootimg $(HOST_DIR)/usr/bin/abootimg + $(INSTALL) -m 0755 $(@D)/abootimg $(HOST_DIR)/bin/abootimg endef $(eval $(generic-package)) diff --git a/package/ace/0001-ACE-ace-SSL-SSL_Asynch_BIO.cpp-fix-build-with-libres.patch b/package/ace/0001-ACE-ace-SSL-SSL_Asynch_BIO.cpp-fix-build-with-libres.patch new file mode 100644 index 00000000000..ad82c101723 --- /dev/null +++ b/package/ace/0001-ACE-ace-SSL-SSL_Asynch_BIO.cpp-fix-build-with-libres.patch @@ -0,0 +1,52 @@ +From e06cadc3b95a577e6a8bbc94f93dd063710c73a1 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 3 Apr 2022 15:25:49 +0200 +Subject: [PATCH] ACE/ace/SSL/SSL_Asynch_BIO.cpp: fix build with libressl + +Fix the following build failure with libressl: + +/home/autobuild/autobuild/instance-10/output-1/build/ace-7.0.6/ace/SSL/SSL_Asynch_BIO.cpp:174:7: error: 'BIO_get_init' was not declared in this scope; did you mean 'BIO_set_init'? + 174 | if (BIO_get_init(pBIO) == 0 || p_stream == 0 || buf == 0 || len <= 0) + | ^~~~~~~~~~~~ + | BIO_set_init + +Fixes: + - http://autobuild.buildroot.org/results/386afa88ac9e5e3bb65dddeabf610bb1e9bc4285 + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/DOCGroup/ACE_TAO/commit/e06cadc3b95a577e6a8bbc94f93dd063710c73a1] +--- + ACE/ace/SSL/SSL_Asynch_BIO.cpp | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/ace/SSL/SSL_Asynch_BIO.cpp b/ace/SSL/SSL_Asynch_BIO.cpp +index a657d8a14e6f7..64aa14c6ab9a7 100644 +--- a/ace/SSL/SSL_Asynch_BIO.cpp ++++ b/ace/SSL/SSL_Asynch_BIO.cpp +@@ -41,7 +41,7 @@ extern "C" + + #define BIO_TYPE_ACE ( 21 | BIO_TYPE_SOURCE_SINK ) + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + static BIO_METHOD methods_ACE = + { + BIO_TYPE_ACE, // BIO_TYPE_PROXY_SERVER, +@@ -68,14 +68,14 @@ static BIO_METHOD methods_ACE = + #else + static BIO_METHOD* methods_ACE; + # define BIO_set_num(b, val) +-#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ ++#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) */ + + ACE_BEGIN_VERSIONED_NAMESPACE_DECL + + BIO * + ACE_SSL_make_BIO (void * ssl_asynch_stream) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + BIO * const pBIO = BIO_new (&methods_ACE); + #else + if (!methods_ACE) diff --git a/package/ace/0002-ACE-ace-SSL-SSL_Asynch_BIO.cpp-fix-build-with-libres.patch b/package/ace/0002-ACE-ace-SSL-SSL_Asynch_BIO.cpp-fix-build-with-libres.patch new file mode 100644 index 00000000000..4f9fde55790 --- /dev/null +++ b/package/ace/0002-ACE-ace-SSL-SSL_Asynch_BIO.cpp-fix-build-with-libres.patch @@ -0,0 +1,56 @@ +From 82b139f921ddb549c1bd236030bbc86e314852b3 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 21 Feb 2023 14:20:11 +0100 +Subject: [PATCH] ACE/ace/SSL/SSL_Asynch_BIO.cpp: fix build with libressl >= + 3.5.0 + +Fix the following build failure with libressl >= 3.5.0: + +/tmp/instance-17/output-1/build/ace-7.0.6/ace/SSL/SSL_Asynch_BIO.cpp:45:19: error: variable 'BIO_METHOD methods_ACE' has initializer but incomplete type + 45 | static BIO_METHOD methods_ACE = + | ^~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/7f40d6dde03134238151c248fbbd66e4713546cb + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/DOCGroup/ACE_TAO/pull/2053] +--- + ACE/ace/SSL/SSL_Asynch_BIO.cpp | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/ace/SSL/SSL_Asynch_BIO.cpp b/ace/SSL/SSL_Asynch_BIO.cpp +index 0faa775fc0..5543598873 100644 +--- a/ace/SSL/SSL_Asynch_BIO.cpp ++++ b/ace/SSL/SSL_Asynch_BIO.cpp +@@ -41,7 +41,8 @@ extern "C" + + #define BIO_TYPE_ACE ( 21 | BIO_TYPE_SOURCE_SINK ) + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) + static BIO_METHOD methods_ACE = + { + BIO_TYPE_ACE, // BIO_TYPE_PROXY_SERVER, +@@ -68,14 +69,15 @@ static BIO_METHOD methods_ACE = + #else + static BIO_METHOD* methods_ACE; + # define BIO_set_num(b, val) +-#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) */ ++#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) */ + + ACE_BEGIN_VERSIONED_NAMESPACE_DECL + + BIO * + ACE_SSL_make_BIO (void * ssl_asynch_stream) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) + BIO * const pBIO = BIO_new (&methods_ACE); + #else + if (!methods_ACE) +-- +2.39.0 + diff --git a/package/ace/ace.hash b/package/ace/ace.hash index 92fd42e1315..23879278797 100644 --- a/package/ace/ace.hash +++ b/package/ace/ace.hash @@ -1,3 +1,6 @@ +# From https://download.dre.vanderbilt.edu/previous_versions/ACE-7.0.6.tar.bz2.md5: +md5 d1656851619aff15365270ccf2d56c6e ACE-7.0.6.tar.bz2 + # Locally Computed: -sha256 a28339750620c70cd29a8a7088a4bc6ebaf1ff7ba667498a0279ac97f0e32e01 ACE-7.0.1.tar.gz +sha256 4a0cd7da4851f769fddfcf33f663eba4afad824efeff9f59f134c4640ee80216 ACE-7.0.6.tar.bz2 sha256 687bf9d16119e0caf6fb5c18214928fd6ea0da10df91e906255b7613af8061d8 COPYING diff --git a/package/ace/ace.mk b/package/ace/ace.mk index 8df89d8c6f0..29555eea743 100644 --- a/package/ace/ace.mk +++ b/package/ace/ace.mk @@ -4,8 +4,8 @@ # ################################################################################ -ACE_VERSION = 7.0.1 -ACE_SOURCE = ACE-$(ACE_VERSION).tar.gz +ACE_VERSION = 7.0.6 +ACE_SOURCE = ACE-$(ACE_VERSION).tar.bz2 ACE_SITE = http://download.dre.vanderbilt.edu/previous_versions ACE_LICENSE = DOC ACE_LICENSE_FILES = COPYING @@ -15,14 +15,23 @@ ACE_CPE_ID_PRODUCT = adaptive_communication_environment # Note: We are excluding examples, apps and tests # Only compiling ACE libraries (no TAO) -ACE_LIBARIES = ace ACEXML Kokyu netsvcs protocols/ace +ACE_LIBRARIES = ace ACEXML Kokyu netsvcs protocols/ace +ACE_CPPFLAGS = $(TARGET_CPPFLAGS) -std=c++11 + +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_101915),y) +ACE_CPPFLAGS += -O0 +endif + +# ACE uses DEFFLAGS as C++ pre-processor flags, and CCFLAGS as the C++ flags. +# Ace passes the pre-processor flags after the C++ flags, so we pass our +# C++ flags as pre-processor flags, via DEFFLAGS. ACE_MAKE_OPTS = \ ACE_ROOT="$(@D)" \ - DEFFLAGS="$(TARGET_CPPFLAGS) -std=c++11" + DEFFLAGS="$(ACE_CPPFLAGS)" ifeq ($(BR2_PACKAGE_OPENSSL),y) -ACE_LIBARIES += ace/SSL +ACE_LIBRARIES += ace/SSL ACE_DEPENDENCIES += openssl define ACE_CONFIGURE_SSL echo "ssl = 1" >> $(@D)/include/makeinclude/platform_macros.GNU @@ -42,25 +51,25 @@ define ACE_CONFIGURE_CMDS endef define ACE_BUILD_CMDS - $(foreach lib,$(ACE_LIBARIES), \ + $(foreach lib,$(ACE_LIBRARIES), \ $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/$(lib) \ $(ACE_MAKE_OPTS) all ) endef -define ACE_LIBARIES_INSTALL +define ACE_LIBRARIES_INSTALL mkdir -p $(1)/usr/share/ace - $(foreach lib,$(ACE_LIBARIES), \ + $(foreach lib,$(ACE_LIBRARIES), \ $(MAKE) -C $(@D)/$(lib) $(ACE_MAKE_OPTS) DESTDIR=$(1) install ) endef define ACE_INSTALL_TARGET_CMDS - $(call ACE_LIBARIES_INSTALL,$(TARGET_DIR)) + $(call ACE_LIBRARIES_INSTALL,$(TARGET_DIR)) endef define ACE_INSTALL_STAGING_CMDS - $(call ACE_LIBARIES_INSTALL,$(STAGING_DIR)) + $(call ACE_LIBRARIES_INSTALL,$(STAGING_DIR)) endef $(eval $(generic-package)) diff --git a/package/acpica/acpica.hash b/package/acpica/acpica.hash index a2fdfe602e0..564e393cb4b 100644 --- a/package/acpica/acpica.hash +++ b/package/acpica/acpica.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 8a49904744a8159b7f325ed941b56968ba37a0371c634036628064f97538de4b acpica-unix2-20200717.tar.gz -sha256 cb17c679d3291eba1a70a1336062fb07eec2e839b0821b443b24f41de18c5218 source/include/acpi.h +sha256 1ccda5c6a08a90b145777df635eb09f995b3472b3128f375009c5a6b01a04c7a acpica-unix2-20220331.tar.gz +sha256 40d8e351f8dfdf5340ec76ac28f0c201b825077d7060bb3686ca1112cb26985d source/include/acpi.h diff --git a/package/acpica/acpica.mk b/package/acpica/acpica.mk index 21ecc155be2..9901c1ed489 100644 --- a/package/acpica/acpica.mk +++ b/package/acpica/acpica.mk @@ -4,7 +4,7 @@ # ################################################################################ -ACPICA_VERSION = 20200717 +ACPICA_VERSION = 20220331 ACPICA_SOURCE = acpica-unix2-$(ACPICA_VERSION).tar.gz ACPICA_SITE = https://acpica.org/sites/acpica/files ACPICA_LICENSE = BSD-3-Clause or GPL-2.0 diff --git a/package/acpid/0002-add-missing-defines.patch b/package/acpid/0002-add-missing-defines.patch deleted file mode 100644 index a85315911f3..00000000000 --- a/package/acpid/0002-add-missing-defines.patch +++ /dev/null @@ -1,40 +0,0 @@ -Add missing MSG_CMSG_CLOEXEC - -Unpatched uClibc toolchains, even using the latest 0.9.33.2, do not -have the MSG_CMSG_CLOEXEC definition. Even though the Buildroot -internal toolchain backend has a uClibc patch to provide it, it -doesn't apply to external toolchains. This patch provides the -definition of MSG_CMSG_CLOEXEC. - -Signed-off-by: Thomas Petazzoni - -Index: b/libnetlink.h -=================================================================== ---- a/libnetlink.h -+++ b/libnetlink.h -@@ -7,6 +7,10 @@ - #include - #include - -+#ifndef MSG_CMSG_CLOEXEC -+#define MSG_CMSG_CLOEXEC 0x40000000 -+#endif -+ - struct rtnl_handle - { - int fd; -Index: b/kacpimon/libnetlink.h -=================================================================== ---- a/kacpimon/libnetlink.h -+++ b/kacpimon/libnetlink.h -@@ -7,6 +7,10 @@ - #include - #include - -+#ifndef MSG_CMSG_CLOEXEC -+#define MSG_CMSG_CLOEXEC 0x40000000 -+#endif -+ - struct rtnl_handle - { - int fd; diff --git a/package/acpid/acpid.hash b/package/acpid/acpid.hash index d5e5bcc14b0..8da01012642 100644 --- a/package/acpid/acpid.hash +++ b/package/acpid/acpid.hash @@ -1,7 +1,7 @@ # From https://sourceforge.net/projects/acpid2/files/ -md5 b2f2ca633b30ae893c47981fa4d3b258 acpid-2.0.33.tar.xz -sha1 b3e06c3f2213db8ee1a9024cf372fb30e2fab637 acpid-2.0.33.tar.xz +md5 988c2e3fd5ba0ea4492d3ba7273af295 acpid-2.0.34.tar.xz +sha1 9322112027e4aa5a8d1b97ec64ef1d150ff0f4fc acpid-2.0.34.tar.xz # Locally computed -sha256 0856f71b3eb34a1b663d0a8e6363dfcbc519e63d847330498898658e2972dbe8 acpid-2.0.33.tar.xz +sha256 2d095c8cfcbc847caec746d62cdc8d0bff1ec1bc72ef7c674c721e04da6ab333 acpid-2.0.34.tar.xz sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING diff --git a/package/acpid/acpid.mk b/package/acpid/acpid.mk index 5d5138baa39..4bd93068ad4 100644 --- a/package/acpid/acpid.mk +++ b/package/acpid/acpid.mk @@ -4,7 +4,7 @@ # ################################################################################ -ACPID_VERSION = 2.0.33 +ACPID_VERSION = 2.0.34 ACPID_SOURCE = acpid-$(ACPID_VERSION).tar.xz ACPID_SITE = http://downloads.sourceforge.net/project/acpid2 ACPID_LICENSE = GPL-2.0+ diff --git a/package/acpitool/acpitool.hash b/package/acpitool/acpitool.hash index b43bc374cad..764c1bc6892 100644 --- a/package/acpitool/acpitool.hash +++ b/package/acpitool/acpitool.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 004fb6cd43102918b6302cf537a2db7ceadda04aef2e0906ddf230f820dad34f acpitool-0.5.1.tar.bz2 -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING +sha256 004fb6cd43102918b6302cf537a2db7ceadda04aef2e0906ddf230f820dad34f acpitool-0.5.1.tar.bz2 +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/acsccid/Config.in b/package/acsccid/Config.in index a926be6e163..2d644ea567f 100644 --- a/package/acsccid/Config.in +++ b/package/acsccid/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_ACSCCID bool "acsccid" depends on BR2_TOOLCHAIN_HAS_THREADS # pcsc-lite, libusb - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb, pcsc-lite depends on BR2_USE_MMU # pcsc-lite depends on !BR2_STATIC_LIBS # pcsc-lite select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE diff --git a/package/adwaita-icon-theme/Config.in b/package/adwaita-icon-theme/Config.in index d200570e765..71b839d996d 100644 --- a/package/adwaita-icon-theme/Config.in +++ b/package/adwaita-icon-theme/Config.in @@ -1,5 +1,10 @@ config BR2_PACKAGE_ADWAITA_ICON_THEME bool "adwaita icon theme" depends on BR2_PACKAGE_LIBGTK2 || BR2_PACKAGE_LIBGTK3 + # host-libgtk3 -> host-librsvg -> host-pango -> host-harfbuzz + depends on BR2_HOST_GCC_AT_LEAST_4_9 help Adwaita icon theme + +comment "adwaita icon theme needs host gcc >= 4.9" + depends on !BR2_HOST_GCC_AT_LEAST_4_9 diff --git a/package/adwaita-icon-theme/adwaita-icon-theme.hash b/package/adwaita-icon-theme/adwaita-icon-theme.hash index ce6acb8d9ae..ae28a7a1529 100644 --- a/package/adwaita-icon-theme/adwaita-icon-theme.hash +++ b/package/adwaita-icon-theme/adwaita-icon-theme.hash @@ -1,4 +1,4 @@ -# From http://ftp.gnome.org/pub/gnome/sources/adwaita-icon-theme/3.22/adwaita-icon-theme-3.22.0.sha256sum +# From https://download.gnome.org/sources/adwaita-icon-theme/3.27/adwaita-icon-theme-3.27.2.sha256sum sha256 a594e7440971f860cc61b1b8291be15ffc1b8dd06a9f11485a5a7faf189bcf6b adwaita-icon-theme-3.37.2.tar.xz # locally computed sha256 51f83b2b4e9ed2beebc9b8eed2ecad29314a58ed8c5184b22ad8f9df703d3ce5 COPYING diff --git a/package/adwaita-icon-theme/adwaita-icon-theme.mk b/package/adwaita-icon-theme/adwaita-icon-theme.mk index 3950cfa6364..6b71c41d522 100644 --- a/package/adwaita-icon-theme/adwaita-icon-theme.mk +++ b/package/adwaita-icon-theme/adwaita-icon-theme.mk @@ -6,7 +6,7 @@ ADWAITA_ICON_THEME_VERSION_MAJOR = 3.37 ADWAITA_ICON_THEME_VERSION = $(ADWAITA_ICON_THEME_VERSION_MAJOR).2 -ADWAITA_ICON_THEME_SITE = http://ftp.gnome.org/pub/gnome/sources/adwaita-icon-theme/$(ADWAITA_ICON_THEME_VERSION_MAJOR) +ADWAITA_ICON_THEME_SITE = https://download.gnome.org/sources/adwaita-icon-theme/$(ADWAITA_ICON_THEME_VERSION_MAJOR) ADWAITA_ICON_THEME_SOURCE = adwaita-icon-theme-$(ADWAITA_ICON_THEME_VERSION).tar.xz ADWAITA_ICON_THEME_INSTALL_STAGING = YES ADWAITA_ICON_THEME_LICENSE = LGPL-3.0 or CC-BY-SA-3.0 diff --git a/package/aer-inject/aer-inject.mk b/package/aer-inject/aer-inject.mk index 72495bbea26..6bc9cb44da7 100644 --- a/package/aer-inject/aer-inject.mk +++ b/package/aer-inject/aer-inject.mk @@ -5,7 +5,8 @@ ################################################################################ AER_INJECT_VERSION = 9bd5e2c7886fca72f139cd8402488a2235957d41 -AER_INJECT_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/gong.chen/aer-inject.git +AER_INJECT_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/gong.chen/aer-inject.git +AER_INJECT_SITE_METHOD = git AER_INJECT_LICENSE = GPL-2.0 AER_INJECT_LICENSE_FILES = README AER_INJECT_DEPENDENCIES = host-flex host-bison diff --git a/package/aespipe/aespipe.hash b/package/aespipe/aespipe.hash index 134a16df486..f7491278e0e 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.4f/ -sha1 2c23e1a6be298cf4f173f06b1123e4ecd5e9a202 aespipe-v2.4f.tar.bz2 -md5 ed05c62c1954110f009bedda4bc1562f aespipe-v2.4f.tar.bz2 +sha1 2c23e1a6be298cf4f173f06b1123e4ecd5e9a202 aespipe-v2.4f.tar.bz2 +md5 ed05c62c1954110f009bedda4bc1562f aespipe-v2.4f.tar.bz2 # Locally computed: -sha256 b135e1659f58dc9be5e3c88923cd03d2a936096ab8cd7f2b3af4cb7a844cef96 aespipe-v2.4f.tar.bz2 +sha256 b135e1659f58dc9be5e3c88923cd03d2a936096ab8cd7f2b3af4cb7a844cef96 aespipe-v2.4f.tar.bz2 diff --git a/package/agent-proxy/Config.in.host b/package/agent-proxy/Config.in.host new file mode 100644 index 00000000000..80328790ad7 --- /dev/null +++ b/package/agent-proxy/Config.in.host @@ -0,0 +1,11 @@ +config BR2_PACKAGE_HOST_AGENT_PROXY + bool "host agent-proxy" + help + This is a simple, small proxy which was intended for use + with kgdb, or gdbserver type connections where you want to + share a text console and a debug session. + + The idea is that you use the agent-proxy to connect to a + serial port directly or to a remote terminal server. + + git://git.kernel.org/pub/scm/utils/kernel/kgdb/agent-proxy.git diff --git a/package/agent-proxy/agent-proxy.hash b/package/agent-proxy/agent-proxy.hash new file mode 100644 index 00000000000..685dd4fbafe --- /dev/null +++ b/package/agent-proxy/agent-proxy.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 b1667b36074c10ebd6dd1f89eda75d5877bc8e06ecf2919f18e75a7a5a9de19b agent-proxy-1.97.tar.gz +sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/package/agent-proxy/agent-proxy.mk b/package/agent-proxy/agent-proxy.mk new file mode 100644 index 00000000000..c8844ccbf1e --- /dev/null +++ b/package/agent-proxy/agent-proxy.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# agent-proxy +# +################################################################################ + +AGENT_PROXY_VERSION = 1.97 +AGENT_PROXY_SITE = https://git.kernel.org/pub/scm/utils/kernel/kgdb/agent-proxy.git/snapshot +AGENT_PROXY_LICENSE = GPL-2.0 +AGENT_PROXY_LICENSE_FILES = COPYING + +define HOST_AGENT_PROXY_BUILD_CMDS + $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) +endef + +define HOST_AGENT_PROXY_INSTALL_CMDS + $(INSTALL) -D -m 0755 $(@D)/agent-proxy $(HOST_DIR)/bin/agent-proxy +endef + +$(eval $(host-generic-package)) diff --git a/package/agentpp/0001-Fix-build-when-SNMPv3-is-disabled.patch b/package/agentpp/0001-Fix-build-when-SNMPv3-is-disabled.patch deleted file mode 100644 index f16c2b4b772..00000000000 --- a/package/agentpp/0001-Fix-build-when-SNMPv3-is-disabled.patch +++ /dev/null @@ -1,102 +0,0 @@ -From 2a0fe384eec254643ca2176ccfcbbd036a5aad06 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Tue, 14 Jul 2020 10:30:10 +0200 -Subject: [PATCH] Fix build when SNMPv3 is disabled - -agentpp has ifdefs to disable v3 code when SNMPv3 is disabled. However it -is missing one and it has a few ones in excess. Fix them. - -Upstream is aware, says "will fix in later version", but thinks to make v3 -mandatory. See discussion at -https://forum.snmp.app/t/agent-compile-fails-if-snmp-has-disable-snmpv3/326 - -Upstream status: none, upstream is not welcoming contributions. - -Signed-off-by: Luca Ceresoli ---- - include/agent_pp/notification_log_mib.h | 4 ++-- - include/agent_pp/notification_originator.h | 2 ++ - include/agent_pp/snmp_community_mib.h | 4 ++-- - src/notification_originator.cpp | 2 ++ - 4 files changed, 8 insertions(+), 4 deletions(-) - -diff --git a/include/agent_pp/notification_log_mib.h b/include/agent_pp/notification_log_mib.h -index ddac05e515d9..8fd8cfec32ca 100644 ---- a/include/agent_pp/notification_log_mib.h -+++ b/include/agent_pp/notification_log_mib.h -@@ -22,7 +22,7 @@ - - //--AgentGen BEGIN=_BEGIN - #include --#ifdef _SNMPv3 -+// #ifdef _SNMPv3 // This file deos not look SNMPv3-specific - #include - //--AgentGen END - -@@ -688,6 +688,6 @@ protected: - */ - - --#endif -+// #endif // _SNMPv3 - - -diff --git a/include/agent_pp/notification_originator.h b/include/agent_pp/notification_originator.h -index 95e8b4e1836d..6f50cd52625b 100644 ---- a/include/agent_pp/notification_originator.h -+++ b/include/agent_pp/notification_originator.h -@@ -307,7 +307,9 @@ class AGENTPP_DECL NotificationOriginator: public NotificationSender { - */ - virtual nlmLogEntry* get_nlm_log_entry(); - -+#ifdef _SNMPv3 - virtual v3MP* get_v3mp(); -+#endif - - protected: - -diff --git a/include/agent_pp/snmp_community_mib.h b/include/agent_pp/snmp_community_mib.h -index 7d5c4558f36d..d9eb2b4a87ec 100644 ---- a/include/agent_pp/snmp_community_mib.h -+++ b/include/agent_pp/snmp_community_mib.h -@@ -49,7 +49,7 @@ namespace Agentpp { - #define oidSnmpTrapAddress "1.3.6.1.6.3.18.1.3.0" - #define oidSnmpTrapCommunity "1.3.6.1.6.3.18.1.4.0" - --#ifdef _SNMPv3 -+// #ifdef _SNMPv3 // This file deos not look SNMPv3-specific - - /** - * snmpCommunityName -@@ -346,7 +346,7 @@ class AGENTPP_DECL snmp_community_mib: public MibGroup - static void add_public(); - static void add_public(Mib* mib); - }; --#endif -+// #endif // _SNMPv3 - - #ifdef AGENTPP_NAMESPACE - } -diff --git a/src/notification_originator.cpp b/src/notification_originator.cpp -index d7d566869998..39ddbe08cdeb 100644 ---- a/src/notification_originator.cpp -+++ b/src/notification_originator.cpp -@@ -237,6 +237,7 @@ nlmLogEntry* NotificationOriginator::get_nlm_log_entry() { - return nlmLogEntry::instance; - } - -+#ifdef _SNMPv3 - v3MP* NotificationOriginator::get_v3mp() { - if (mib) { - return mib->get_request_list()->get_v3mp(); -@@ -244,6 +245,7 @@ v3MP* NotificationOriginator::get_v3mp() { - return v3MP::I; - } - } -+#endif - - - bool NotificationOriginator::check_access(ListCursor& cur, --- -2.27.0 - diff --git a/package/agentpp/0001-Snmpx-fix-const-nonconst-type-mismatch.patch b/package/agentpp/0001-Snmpx-fix-const-nonconst-type-mismatch.patch new file mode 100644 index 00000000000..07981eff3e8 --- /dev/null +++ b/package/agentpp/0001-Snmpx-fix-const-nonconst-type-mismatch.patch @@ -0,0 +1,51 @@ +From 7e541e6dba8d4976bbb490838a09b569f38b047d Mon Sep 17 00:00:00 2001 +From: Luca Ceresoli +Date: Mon, 26 Jun 2023 17:45:00 +0200 +Subject: [PATCH] Snmpx: fix const/nonconst type mismatch + +Fixes build failure: + + snmp_pp_ext.cpp:1176:28: error: binding reference of type 'Snmp_pp::Pdu&' to 'const Snmp_pp::Pdu' discards qualifiers + 1176 | status = snmpmsg.load( pdu, community, version); + | ^~~ + +Fixes: + http://autobuild.buildroot.net/results/e8abd6bdc62a028955915706b03d72239786c703/ + http://autobuild.buildroot.net/results/24441fb679fbf5f913c9b6431c98aec596ead587/ + +Signed-off-by: Luca Ceresoli +Upstream: sent to katz.agentpp.com@magenta.de and support@agentpp.com +--- + include/agent_pp/snmp_pp_ext.h | 2 +- + src/snmp_pp_ext.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/agent_pp/snmp_pp_ext.h b/include/agent_pp/snmp_pp_ext.h +index 7c5a6783ee70..d8a46060db98 100644 +--- a/include/agent_pp/snmp_pp_ext.h ++++ b/include/agent_pp/snmp_pp_ext.h +@@ -807,7 +807,7 @@ public: + * SNMP_CLASS_SUCCESS on success and SNMP_CLASS_ERROR, + * SNMP_CLASS_TL_FAILED on failure. + */ +- int send (Pdux const &, NS_SNMP UdpAddress const &, NS_SNMP snmp_version, NS_SNMP OctetStr const &); ++ int send (Pdux &, NS_SNMP UdpAddress const &, NS_SNMP snmp_version, NS_SNMP OctetStr const &); + #endif + + /** +diff --git a/src/snmp_pp_ext.cpp b/src/snmp_pp_ext.cpp +index 54a29ec8ea28..b61cbf056246 100644 +--- a/src/snmp_pp_ext.cpp ++++ b/src/snmp_pp_ext.cpp +@@ -1203,7 +1203,7 @@ int Snmpx::send (Pdux &pdu, SnmpTarget* target) + + #else // _SNMPv3 is not defined + +-int Snmpx::send (Pdux const &pdu, ++int Snmpx::send (Pdux &pdu, + UdpAddress const &udp_address, + snmp_version version, + OctetStr const &community) +-- +2.34.1 + diff --git a/package/agentpp/Config.in b/package/agentpp/Config.in index 8c6b11d644e..cc7537519ab 100644 --- a/package/agentpp/Config.in +++ b/package/agentpp/Config.in @@ -16,7 +16,7 @@ config BR2_PACKAGE_AGENTPP SNMPv3 support is enabled if SNMP++ enables it. - http://www.agentpp.com/agentpp3_5/agentpp3_5.html + https://www.agentpp.com/api/cpp/agent_pp.html comment "agent++ needs a toolchain w/ threads, C++, dynamic library" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ diff --git a/package/agentpp/agentpp.hash b/package/agentpp/agentpp.hash index 11b23c8ee2e..527414eed54 100644 --- a/package/agentpp/agentpp.hash +++ b/package/agentpp/agentpp.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 9b45123df45e803198a1181540b37a4ccd0e63c68df6e826702e2ba49167edac agent++-4.3.1.tar.gz +sha256 e09dc2d40277d468c18f1539ad18f43e0c3a95b10fad8a02184e9ace8bac0d67 agent++-4.6.0.tar.gz sha256 1eb85fc97224598dad1852b5d6483bbcf0aa8608790dcc657a5a2a761ae9c8c6 LICENSE-2_0.txt diff --git a/package/agentpp/agentpp.mk b/package/agentpp/agentpp.mk index 8982d9e564b..7616d3eb0c4 100644 --- a/package/agentpp/agentpp.mk +++ b/package/agentpp/agentpp.mk @@ -4,13 +4,14 @@ # ################################################################################ -AGENTPP_VERSION = 4.3.1 +AGENTPP_VERSION = 4.6.0 AGENTPP_SOURCE = agent++-$(AGENTPP_VERSION).tar.gz AGENTPP_SITE = http://www.agentpp.com/download AGENTPP_LICENSE = Apache-2.0 AGENTPP_LICENSE_FILES = LICENSE-2_0.txt AGENTPP_INSTALL_STAGING = YES AGENTPP_DEPENDENCIES = host-pkgconf snmppp +AGENTPP_CONF_ENV = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" AGENTPP_CONF_OPTS += \ --disable-proxy \ --disable-forwarder \ diff --git a/package/aircrack-ng/0001-Expand-packed-definition.patch b/package/aircrack-ng/0001-Expand-packed-definition.patch deleted file mode 100644 index f0c033a1aa9..00000000000 --- a/package/aircrack-ng/0001-Expand-packed-definition.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d4496006ac1e0c99908108b998ae39afb0658733 Mon Sep 17 00:00:00 2001 -From: Joseph Benden -Date: Tue, 7 Jul 2020 11:42:40 -0700 -Subject: [PATCH] Expand __packed definition. - -Signed-off-by: Joseph Benden -[Retrieved from: -https://github.com/aircrack-ng/aircrack-ng/commit/d4496006ac1e0c99908108b998ae39afb0658733] -Signed-off-by: Fabrice Fontaine ---- - lib/radiotap/radiotap.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/radiotap/radiotap.h b/lib/radiotap/radiotap.h -index 57f784b8d..bb5a41dfc 100644 ---- a/lib/radiotap/radiotap.h -+++ b/lib/radiotap/radiotap.h -@@ -56,7 +56,7 @@ struct ieee80211_radiotap_header { - * @it_present: (first) present word - */ - uint32_t it_present; --} __packed; -+} __attribute__((__packed__)); - - /* version is always 0 */ - #define PKTHDR_RADIOTAP_VERSION 0 diff --git a/package/aircrack-ng/0002-Fix-duplicated-symbols.patch b/package/aircrack-ng/0002-Fix-duplicated-symbols.patch deleted file mode 100644 index f1815808088..00000000000 --- a/package/aircrack-ng/0002-Fix-duplicated-symbols.patch +++ /dev/null @@ -1,74 +0,0 @@ -From f6f1396807607f5649d20631db517cfca3a1f5c4 Mon Sep 17 00:00:00 2001 -From: Joseph Benden -Date: Tue, 7 Jul 2020 11:44:40 -0700 -Subject: [PATCH] Fix duplicated symbols. - -Signed-off-by: Joseph Benden -[Retrieved from: -https://github.com/aircrack-ng/aircrack-ng/commit/f6f1396807607f5649d20631db517cfca3a1f5c4] -Signed-off-by: Fabrice Fontaine ---- - src/airodump-ng/airodump-ng.c | 2 -- - src/airventriloquist-ng/airventriloquist-ng.c | 6 +++--- - src/tkiptun-ng/tkiptun-ng.c | 4 ++-- - 3 files changed, 5 insertions(+), 7 deletions(-) - -diff --git a/src/airodump-ng/airodump-ng.c b/src/airodump-ng/airodump-ng.c -index 3ae6994dd..e72bc88e2 100644 ---- a/src/airodump-ng/airodump-ng.c -+++ b/src/airodump-ng/airodump-ng.c -@@ -92,8 +92,6 @@ - #include "radiotap/radiotap_iter.h" - - struct devices dev; --uint8_t h80211[4096] __attribute__((aligned(16))); --uint8_t tmpbuf[4096] __attribute__((aligned(16))); - - static const unsigned char llcnull[] = {0, 0, 0, 0}; - -diff --git a/src/airventriloquist-ng/airventriloquist-ng.c b/src/airventriloquist-ng/airventriloquist-ng.c -index ac6b7647e..267d95540 100644 ---- a/src/airventriloquist-ng/airventriloquist-ng.c -+++ b/src/airventriloquist-ng/airventriloquist-ng.c -@@ -173,7 +173,7 @@ static struct local_options - } lopt; - - struct devices dev; --struct wif *_wi_in, *_wi_out; -+extern struct wif *_wi_in, *_wi_out; - - struct ARP_req - { -@@ -195,8 +195,8 @@ struct APt - }; - - unsigned long nb_pkt_sent; --u_int8_t h80211[4096]; --static u_int8_t tmpbuf[4096]; -+extern u_int8_t h80211[4096]; -+extern u_int8_t tmpbuf[4096]; - - static int tcp_test(const char * ip_str, const short port) - { -diff --git a/src/tkiptun-ng/tkiptun-ng.c b/src/tkiptun-ng/tkiptun-ng.c -index dc67f5d58..43db0bc23 100644 ---- a/src/tkiptun-ng/tkiptun-ng.c -+++ b/src/tkiptun-ng/tkiptun-ng.c -@@ -267,7 +267,7 @@ static struct local_options - - // unused, but needed for link - struct devices dev; --struct wif *_wi_in, *_wi_out; -+extern struct wif *_wi_in, *_wi_out; - - struct ARP_req - { -@@ -289,7 +289,7 @@ struct APt - }; - - unsigned long nb_pkt_sent; --unsigned char h80211[4096]; -+extern unsigned char h80211[4096]; - static unsigned char srcbuf[4096]; - static char strbuf[512]; - static int alarmed; diff --git a/package/aircrack-ng/aircrack-ng.hash b/package/aircrack-ng/aircrack-ng.hash index 990c3ef5631..3fb6de986b4 100644 --- a/package/aircrack-ng/aircrack-ng.hash +++ b/package/aircrack-ng/aircrack-ng.hash @@ -1,6 +1,6 @@ # From http://www.aircrack-ng.org/downloads.html -sha1 ffeb4816476e7b329dc0c154f1aa4a30ad171beb aircrack-ng-1.6.tar.gz -md5 22ddc85549b51ed0da0931d01ef215e5 aircrack-ng-1.6.tar.gz +sha1 bd43a35281c9c81d958b95aa76b4404c29f904ff aircrack-ng-1.7.tar.gz +md5 a918ea7146f91d8c799fb770c38f4bec aircrack-ng-1.7.tar.gz # Hash for license file: -sha256 fc51fd3a97223f2fd47b057202d4a6b0daaedf23b5a1f5ff8723c192fc1e021d LICENSE +sha256 fc51fd3a97223f2fd47b057202d4a6b0daaedf23b5a1f5ff8723c192fc1e021d LICENSE diff --git a/package/aircrack-ng/aircrack-ng.mk b/package/aircrack-ng/aircrack-ng.mk index ff87766d6fb..6ce738bbab4 100644 --- a/package/aircrack-ng/aircrack-ng.mk +++ b/package/aircrack-ng/aircrack-ng.mk @@ -4,7 +4,7 @@ # ################################################################################ -AIRCRACK_NG_VERSION = 1.6 +AIRCRACK_NG_VERSION = 1.7 AIRCRACK_NG_SITE = http://download.aircrack-ng.org AIRCRACK_NG_LICENSE = GPL-2.0+ AIRCRACK_NG_LICENSE_FILES = LICENSE @@ -69,7 +69,7 @@ endif ifeq ($(BR2_PACKAGE_SQLITE),y) AIRCRACK_NG_DEPENDENCIES += sqlite -AIRCRACK_NG_CONF_OPTS += --with-sqlite3 +AIRCRACK_NG_CONF_OPTS += --with-sqlite3=$(STAGING_DIR)/usr else AIRCRACK_NG_CONF_OPTS += --without-sqlite3 endif diff --git a/package/alchemy/alchemy.mk b/package/alchemy/alchemy.mk index 18cdd0a645f..10d1068ac44 100644 --- a/package/alchemy/alchemy.mk +++ b/package/alchemy/alchemy.mk @@ -8,7 +8,7 @@ ALCHEMY_VERSION = d95b3c38cd37814a1b98d0bbf813de7adaaecfbc ALCHEMY_SITE = $(call github,Parrot-Developers,alchemy,$(ALCHEMY_VERSION)) ALCHEMY_LICENSE = BSD-3-Clause (Alchemy), GPL-2.0 (kconfig) ALCHEMY_LICENSE_FILES = COPYING README -HOST_ALCHEMY_DEPENDENCIES = host-python3 +HOST_ALCHEMY_DEPENDENCIES = host-pkgconf host-python3 ALCHEMY_HOME = $(HOST_DIR)/opt/alchemy ALCHEMY_SDK_BASEDIR = $(STAGING_DIR)/usr/lib/alchemy/sdk @@ -35,6 +35,7 @@ ALCHEMY_TARGET_ENV = \ ALCHEMY_HOME=$(ALCHEMY_HOME) \ ALCHEMY_WORKSPACE_DIR="$(@D)" \ ALCHEMY_TARGET_OUT=alchemy-out \ + PKGCONFIG_BIN=$(PKG_CONFIG_HOST_BINARY) \ TARGET_OS=linux \ TARGET_OS_FLAVOUR=buildroot \ TARGET_CROSS="$(TARGET_CROSS)" \ diff --git a/package/alfred/alfred.hash b/package/alfred/alfred.hash index 2da7eb31c84..2153d17e909 100644 --- a/package/alfred/alfred.hash +++ b/package/alfred/alfred.hash @@ -1,5 +1,5 @@ -# From https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2022.0.tar.gz.sha1 -sha1 8e00789d3e1e5c959dd985809861ff624d372694 alfred-2022.0.tar.gz +# From https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2022.1.tar.gz.sha1 +sha1 14e916bda706ccff510f2ea00bb3143c582c9ff2 alfred-2022.1.tar.gz # Locally computed -sha256 abba1dac61eccfcd6329e7331d0555fecc937760fb36c6cf55ce6c1d751cfd98 alfred-2022.0.tar.gz +sha256 3a0ac2bb26e0cb3f2732d4873669a0a22e9825e8f9a8e7abac986363f275097f alfred-2022.1.tar.gz sha256 cecbf53d1148e13256ac29f8b900655b7fc8dc12d59939a95bc2323ea1747025 LICENSES/preferred/GPL-2.0 diff --git a/package/alfred/alfred.mk b/package/alfred/alfred.mk index 24b9956b110..9af11931c14 100644 --- a/package/alfred/alfred.mk +++ b/package/alfred/alfred.mk @@ -4,7 +4,7 @@ # ################################################################################ -ALFRED_VERSION = 2022.0 +ALFRED_VERSION = 2022.1 ALFRED_SITE = https://downloads.open-mesh.org/batman/stable/sources/alfred ALFRED_LICENSE = GPL-2.0 ALFRED_LICENSE_FILES = LICENSES/preferred/GPL-2.0 diff --git a/package/alsa-lib/0001-Don-t-use-fork-on-noMMU-platforms.patch b/package/alsa-lib/0001-Don-t-use-fork-on-noMMU-platforms.patch index 17b57d1f3da..0d2b479534a 100644 --- a/package/alsa-lib/0001-Don-t-use-fork-on-noMMU-platforms.patch +++ b/package/alsa-lib/0001-Don-t-use-fork-on-noMMU-platforms.patch @@ -10,7 +10,7 @@ Signed-off-by: Thomas Petazzoni [Jörg: update patch for 1.1.6] Signed-off-by: Jörg Krause Upstream: http://mailman.alsa-project.org/pipermail/alsa-devel/2018-November/141376.html -[Bernd: update patch for 1.2.4] +[Bernd: update patch for 1.2.4 & 1.2.7] Signed-off-by: Bernd Kuhls --- configure.ac | 2 ++ @@ -21,9 +21,9 @@ diff --git a/configure.ac b/configure.ac index cce195ae..0c852434 100644 --- a/configure.ac +++ b/configure.ac -@@ -51,6 +51,8 @@ dnl Checks for library functions. - AC_PROG_GCC_TRADITIONAL +@@ -52,6 +52,8 @@ dnl Checks for library functions. AC_CHECK_FUNCS([uselocale]) + AC_CHECK_FUNCS([eaccess]) +AC_CHECK_FUNC([fork]) + diff --git a/package/alsa-lib/0002-fix-PyTuple_SET_ITEM-usage-no-return-value.patch b/package/alsa-lib/0002-fix-PyTuple_SET_ITEM-usage-no-return-value.patch deleted file mode 100644 index a1c9f3b80d5..00000000000 --- a/package/alsa-lib/0002-fix-PyTuple_SET_ITEM-usage-no-return-value.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 1da2ede2d8b01a8851648e774a4c3c5779c0bafa Mon Sep 17 00:00:00 2001 -From: Adam Duskett -Date: Tue, 7 Dec 2021 13:55:54 -0800 -Subject: [PATCH] Fix PyTuple_SET_ITEM() usage - no return value - -As noted in bpo-30459 (link bellow) the PyTuple_SET_ITEM() macro -has not a return value. Make the code compatible with python 3.10. - -Link: https://bugs.python.org/issue30459 -Signed-off-by: Adam Duskett ---- - modules/mixer/simple/python.c | 20 ++++++++++---------- - 1 file changed, 10 insertions(+), 10 deletions(-) - -diff --git a/modules/mixer/simple/python.c b/modules/mixer/simple/python.c -index 8a7264d..c7c1ce7 100644 ---- a/modules/mixer/simple/python.c -+++ b/modules/mixer/simple/python.c -@@ -775,8 +775,8 @@ pymixer_melement_new(struct pymixer *pymixer, PyObject *args) - obj = PyDict_GetItemString(pymixer->mdict, class); - if (obj) { - obj1 = PyTuple_New(4); -- if (PyTuple_SET_ITEM(obj1, 0, (PyObject *)pymixer)) -- Py_INCREF((PyObject *)pymixer); -+ PyTuple_SET_ITEM(obj1, 0, (PyObject *)pymixer); -+ Py_INCREF((PyObject *)pymixer); - PyTuple_SET_ITEM(obj1, 1, PyUnicode_FromString(name)); - PyTuple_SET_ITEM(obj1, 2, PyInt_FromLong(index)); - PyTuple_SET_ITEM(obj1, 3, PyInt_FromLong(weight)); -@@ -920,8 +920,8 @@ static PyObject *new_helem(struct python_priv *priv, snd_hctl_elem_t *helem) - obj = PyDict_GetItemString(priv->py_mdict, "HElement"); - if (obj) { - obj1 = PyTuple_New(3); -- if (PyTuple_SET_ITEM(obj1, 0, py_hctl)) -- Py_INCREF(py_hctl); -+ PyTuple_SET_ITEM(obj1, 0, py_hctl); -+ Py_INCREF(py_hctl); - PyTuple_SET_ITEM(obj1, 1, PyFloat_FromDouble(1)); - PyTuple_SET_ITEM(obj1, 2, PyInt_FromLong((long)helem)); - obj2 = PyObject_CallObject(obj, obj1); -@@ -995,11 +995,11 @@ int alsa_mixer_simple_event(snd_mixer_class_t *class, unsigned int mask, - } - if (o == NULL) - return 0; -- if (PyTuple_SET_ITEM(t, 1, o)) -- Py_INCREF(o); -+ PyTuple_SET_ITEM(t, 1, o); -+ Py_INCREF(o); - o = melem ? find_melem(priv, melem) : Py_None; -- if (PyTuple_SET_ITEM(t, 2, o)) -- Py_INCREF(o); -+ PyTuple_SET_ITEM(t, 2, o); -+ Py_INCREF(o); - r = PyObject_CallObject(priv->py_event_func, t); - Py_DECREF(t); - if (r) { -@@ -1066,8 +1066,8 @@ static int alsa_mixer_simple_pyinit(struct python_priv *priv, - obj1 = PyTuple_New(3); - PyTuple_SET_ITEM(obj1, 0, PyInt_FromLong((long)class)); - PyTuple_SET_ITEM(obj1, 1, PyInt_FromLong((long)mixer)); -- if (PyTuple_SET_ITEM(obj1, 2, mdict)) -- Py_INCREF(mdict); -+ PyTuple_SET_ITEM(obj1, 2, mdict); -+ Py_INCREF(mdict); - obj2 = PyObject_CallObject(obj, obj1); - Py_XDECREF(obj1); - PyDict_SetItemString(mdict, "mixer", obj2); --- -2.33.1 - diff --git a/package/alsa-lib/0003-src-topology-parser.c-drop-duplicate-safe_strtol_bas.patch b/package/alsa-lib/0003-src-topology-parser.c-drop-duplicate-safe_strtol_bas.patch deleted file mode 100644 index a3741c42c0e..00000000000 --- a/package/alsa-lib/0003-src-topology-parser.c-drop-duplicate-safe_strtol_bas.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 47252054b4a2d5c8382cb1342f5d4eb89dabf95f Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 1 Jan 2022 17:20:47 +0100 -Subject: [PATCH] src/topology/parser.c: drop duplicate safe_strtol_base - -The safe_strtol_base() function is defined twice since - f547b2e3 ("conf: introduce safe_strtol_base()") and - 5fab157a ("topology: do not call strtol directly") -resulting in the following build failure when alsa-utils is built -statically because safe_strtol_base is defined twice. - -Fixes: http://autobuild.buildroot.org/results/08d028004090b2a8292f03910cb9bf80a73ac804 -Fixes: https://github.com/alsa-project/alsa-lib/pull/207 -Signed-off-by: Fabrice Fontaine -Signed-off-by: Jaroslav Kysela -[Retrieved from: -https://github.com/alsa-project/alsa-lib/commit/47252054b4a2d5c8382cb1342f5d4eb89dabf95f] ---- - src/topology/parser.c | 19 ------------------- - 1 file changed, 19 deletions(-) - -diff --git a/src/topology/parser.c b/src/topology/parser.c -index 01c95afa..e70173f6 100644 ---- a/src/topology/parser.c -+++ b/src/topology/parser.c -@@ -21,25 +21,6 @@ - #include "list.h" - #include "tplg_local.h" - --/* -- * Safe strtol call -- */ --int safe_strtol_base(const char *str, long *val, int base) --{ -- char *end; -- long v; -- if (!*str) -- return -EINVAL; -- errno = 0; -- v = strtol(str, &end, base); -- if (errno) -- return -errno; -- if (*end) -- return -EINVAL; -- *val = v; -- return 0; --} -- - /* - * Get integer value - */ diff --git a/package/alsa-lib/0004-conf-fix-the-export-of-safe_strto-functions-from-libasound.patch b/package/alsa-lib/0004-conf-fix-the-export-of-safe_strto-functions-from-libasound.patch deleted file mode 100644 index 3dfcb78b5c5..00000000000 --- a/package/alsa-lib/0004-conf-fix-the-export-of-safe_strto-functions-from-libasound.patch +++ /dev/null @@ -1,88 +0,0 @@ -From c687c482107f746332dd18f7407f6c6efbffccb2 Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Sat, 1 Jan 2022 19:18:25 +0100 -Subject: [PATCH] conf: fix the export of safe_strto* functions from libasound - -Only one library should define the safe_strto function. Export it -correctly and add _snd_ prefix to avoid possible clashes with the other -application code. - -Fixes: 47252054 ("src/topology/parser.c: drop duplicate safe_strtol_base") -Fixes: https://github.com/alsa-project/alsa-lib/pull/208 -Signed-off-by: Jaroslav Kysela - -[Retrieved from: -https://github.com/alsa-project/alsa-lib/commit/c687c482107f746332dd18f7407f6c6efbffccb2] -Signed-off-by: Fabrice Fontaine ---- - include/local.h | 8 ++++++-- - src/Versions.in | 6 ++++++ - src/conf.c | 6 +++--- - 3 files changed, 15 insertions(+), 5 deletions(-) - -diff --git a/include/local.h b/include/local.h -index ebc9350c..f64fe9d8 100644 ---- a/include/local.h -+++ b/include/local.h -@@ -232,10 +232,14 @@ size_t page_align(size_t size); - size_t page_size(void); - size_t page_ptr(size_t object_offset, size_t object_size, size_t *offset, size_t *mmap_offset); - --int safe_strtoll_base(const char *str, long long *val, int base); -+#define safe_strtoll_base _snd_safe_strtoll_base -+int _snd_safe_strtoll_base(const char *str, long long *val, int base); - static inline int safe_strtoll(const char *str, long long *val) { return safe_strtoll_base(str, val, 0); } --int safe_strtol_base(const char *str, long *val, int base); -+#define safe_strtol_base _snd_safe_strtol_base -+int _snd_safe_strtol_base(const char *str, long *val, int base); - static inline int safe_strtol(const char *str, long *val) { return safe_strtol_base(str, val, 0); } -+#define safe_strtod _snd_safe_strtod -+int _snd_safe_strtod(const char *str, double *val); - - int snd_send_fd(int sock, void *data, size_t len, int fd); - int snd_receive_fd(int sock, void *data, size_t len, int *fd); -diff --git a/src/Versions.in b/src/Versions.in -index 5daccbd4..85031b38 100644 ---- a/src/Versions.in -+++ b/src/Versions.in -@@ -134,3 +134,9 @@ ALSA_1.1.6 { - - @SYMBOL_PREFIX@snd_dlopen; - } ALSA_0.9.7; -+ -+ALSA_1.2.6 { -+ global: -+ -+ @SYMBOL_PREFIX@_snd_safe_strto*; -+} ALSA_1.1.6; -diff --git a/src/conf.c b/src/conf.c -index d3597cbc..098ebd63 100644 ---- a/src/conf.c -+++ b/src/conf.c -@@ -663,7 +663,7 @@ static int input_stdio_open(snd_input_t **inputp, const char *file, - return err; - } - --int safe_strtoll_base(const char *str, long long *val, int base) -+int _snd_safe_strtoll_base(const char *str, long long *val, int base) - { - char *end; - long v; -@@ -679,7 +679,7 @@ int safe_strtoll_base(const char *str, long long *val, int base) - return 0; - } - --int safe_strtol_base(const char *str, long *val, int base) -+int _snd_safe_strtol_base(const char *str, long *val, int base) - { - char *end; - long v; -@@ -695,7 +695,7 @@ int safe_strtol_base(const char *str, long *val, int base) - return 0; - } - --static int safe_strtod(const char *str, double *val) -+int _snd_safe_strtod(const char *str, double *val) - { - char *end; - double v; diff --git a/package/alsa-lib/Config.in b/package/alsa-lib/Config.in index af3de984d96..447916a29fa 100644 --- a/package/alsa-lib/Config.in +++ b/package/alsa-lib/Config.in @@ -80,4 +80,9 @@ config BR2_PACKAGE_ALSA_LIB_OLD_SYMBOLS bool "old-symbols" default y +config BR2_PACKAGE_ALSA_LIB_TOPOLOGY + bool "topology" + default y + depends on !BR2_STATIC_LIBS + endif diff --git a/package/alsa-lib/alsa-lib.hash b/package/alsa-lib/alsa-lib.hash index 97bcd87141f..898cbcd60df 100644 --- a/package/alsa-lib/alsa-lib.hash +++ b/package/alsa-lib/alsa-lib.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 7fe3057894ec319118abfd042ef84632a1dcd911806ec9fff6daaa68d15a8c52 alsa-lib-1.2.6.tar.bz2 +sha256 1ab01b74e33425ca99c2e36c0844fd6888273193bd898240fe8f93accbcbf347 alsa-lib-1.2.8.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 5d12f5e6d8b..a0a9617514c 100644 --- a/package/alsa-lib/alsa-lib.mk +++ b/package/alsa-lib/alsa-lib.mk @@ -4,7 +4,7 @@ # ################################################################################ -ALSA_LIB_VERSION = 1.2.6 +ALSA_LIB_VERSION = 1.2.8 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) @@ -58,6 +58,9 @@ endif ifneq ($(BR2_PACKAGE_ALSA_LIB_OLD_SYMBOLS),y) ALSA_LIB_CONF_OPTS += --disable-old-symbols endif +ifneq ($(BR2_PACKAGE_ALSA_LIB_TOPOLOGY),y) +ALSA_LIB_CONF_OPTS += --disable-topology +endif ifeq ($(BR2_PACKAGE_ALSA_LIB_PYTHON),y) ALSA_LIB_CONF_OPTS += \ diff --git a/package/alsa-plugins/alsa-plugins.hash b/package/alsa-plugins/alsa-plugins.hash index 8ecbd199654..5d190e4d7ba 100644 --- a/package/alsa-plugins/alsa-plugins.hash +++ b/package/alsa-plugins/alsa-plugins.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 42eef98433d2c8d11f1deeeb459643619215a75aa5a5bbdd06a794e4c413df20 alsa-plugins-1.2.5.tar.bz2 +sha256 8c337814954bb7c167456733a6046142a2931f12eccba3ec2a4ae618a3432511 alsa-plugins-1.2.7.1.tar.bz2 sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING.GPL diff --git a/package/alsa-plugins/alsa-plugins.mk b/package/alsa-plugins/alsa-plugins.mk index 396f47adafd..d23a81c5eed 100644 --- a/package/alsa-plugins/alsa-plugins.mk +++ b/package/alsa-plugins/alsa-plugins.mk @@ -4,7 +4,7 @@ # ################################################################################ -ALSA_PLUGINS_VERSION = 1.2.5 +ALSA_PLUGINS_VERSION = 1.2.7.1 ALSA_PLUGINS_SOURCE = alsa-plugins-$(ALSA_PLUGINS_VERSION).tar.bz2 ALSA_PLUGINS_SITE = https://www.alsa-project.org/files/pub/plugins ALSA_PLUGINS_LICENSE = LGPL-2.1+ @@ -20,6 +20,10 @@ ALSA_PLUGINS_CONF_OPTS = \ --disable-maemo-resource-manager \ --with-speex=no +ifeq ($(BR2_PACKAGE_ALSA_UTILS),y) +ALSA_PLUGINS_DEPENDENCIES += alsa-utils +endif + ifeq ($(BR2_PACKAGE_LIBSAMPLERATE),y) ALSA_PLUGINS_CONF_OPTS += --enable-samplerate ALSA_PLUGINS_DEPENDENCIES += libsamplerate diff --git a/package/alsa-utils/0001-alsactl-info.c-fix-conditionals-on-__ALSA_PCM_H-and-.patch b/package/alsa-utils/0001-alsactl-info.c-fix-conditionals-on-__ALSA_PCM_H-and-.patch new file mode 100644 index 00000000000..97c4729bf9b --- /dev/null +++ b/package/alsa-utils/0001-alsactl-info.c-fix-conditionals-on-__ALSA_PCM_H-and-.patch @@ -0,0 +1,108 @@ +From 4bfd1f15114550e1be7e43ae37a61906e1bff809 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sun, 17 Jul 2022 18:59:48 +0200 +Subject: [PATCH] alsactl/info.c: fix conditionals on __ALSA_PCM_H and + __ALSA_RAWMIDI_H + +Commit bbc74a61ac7c35e506c3d7f76ecf943cb55736a6 ("alsactl: implement +'info' command") implemented an alsactl info command. In this +implementation, there was an attempt to properly address optional +features from alsa-lib by using conditions on __ALSA_PCM_H, +__ALSA_RAWMIDI_H. + +Unfortunately, this attempt does not work entirely: only the code +inside pcm_device_list(), rawmidi_device_list() was conditionally +compiled, but their very prototype also use type definitions provided +in pcm.h and rawmidi.h. So really, it's the entire function that needs +to be conditionally implemented. + +Also, snd_rawmidi_stream_name() was not handled properly, for the same +reason. + +This commit implements pcm_device_list() only if __ALSA_PCM_H is +defined, and implements snd_rawmidi_stream_name() and +rawmidi_device_list() only if __ALSA_RAWMIDI_H is defined. + +general_card_info() is modified to not call the PCM or raw MIDI +functions when support is not available. + +Signed-off-by: Thomas Petazzoni +Upstream: https://mailman.alsa-project.org/pipermail/alsa-devel/2022-July/203846.html +--- + alsactl/info.c | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +diff --git a/alsactl/info.c b/alsactl/info.c +index 253539d..9bd72af 100644 +--- a/alsactl/info.c ++++ b/alsactl/info.c +@@ -22,9 +22,9 @@ + #include "aconfig.h" + #include "alsactl.h" + ++#ifdef __ALSA_PCM_H + static int pcm_device_list(snd_ctl_t *ctl, snd_pcm_stream_t stream, bool *first) + { +-#ifdef __ALSA_PCM_H + int err, dev, idx; + unsigned int count; + snd_pcm_info_t *pcminfo; +@@ -76,10 +76,12 @@ static int pcm_device_list(snd_ctl_t *ctl, snd_pcm_stream_t stream, bool *first) + idx, snd_pcm_info_get_subdevice_name(pcminfo)); + } + } +-#endif ++ + return 0; + } ++#endif + ++#ifdef __ALSA_RAWMIDI_H + static const char *snd_rawmidi_stream_name(snd_rawmidi_stream_t stream) + { + if (stream == SND_RAWMIDI_STREAM_INPUT) +@@ -91,7 +93,6 @@ static const char *snd_rawmidi_stream_name(snd_rawmidi_stream_t stream) + + static int rawmidi_device_list(snd_ctl_t *ctl, snd_rawmidi_stream_t stream, bool *first) + { +-#ifdef __ALSA_RAWMIDI_H + int err, dev, idx; + unsigned int count; + snd_rawmidi_info_t *info; +@@ -143,9 +144,10 @@ static int rawmidi_device_list(snd_ctl_t *ctl, snd_rawmidi_stream_t stream, bool + idx, snd_rawmidi_info_get_subdevice_name(info)); + } + } +-#endif ++ + return 0; + } ++#endif + + static int hwdep_device_list(snd_ctl_t *ctl) + { +@@ -227,17 +229,21 @@ int general_card_info(int cardno) + } + err = card_info(ctl); + ++#ifdef __ALSA_PCM_H + first = true; + if (err >= 0) + err = pcm_device_list(ctl, SND_PCM_STREAM_PLAYBACK, &first); + if (err >= 0) + err = pcm_device_list(ctl, SND_PCM_STREAM_CAPTURE, &first); ++#endif + ++#ifdef __ALSA_RAWMIDI_H + first = true; + if (err >= 0) + err = rawmidi_device_list(ctl, SND_PCM_STREAM_PLAYBACK, &first); + if (err >= 0) + err = rawmidi_device_list(ctl, SND_PCM_STREAM_CAPTURE, &first); ++#endif + + if (err >= 0) + err = hwdep_device_list(ctl); +-- +2.36.1 + diff --git a/package/alsa-utils/Config.in b/package/alsa-utils/Config.in index 2d7062b0ca8..3429d0b4065 100644 --- a/package/alsa-utils/Config.in +++ b/package/alsa-utils/Config.in @@ -45,6 +45,11 @@ config BR2_PACKAGE_ALSA_UTILS_ALSAUCM config BR2_PACKAGE_ALSA_UTILS_ALSATPLG bool "alsatplg" + depends on !BR2_STATIC_LIBS # dlfcn.h + select BR2_PACKAGE_ALSA_LIB_TOPOLOGY + +comment "alsatplg needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS config BR2_PACKAGE_ALSA_UTILS_AMIDI bool "amidi" diff --git a/package/alsa-utils/alsa-utils.hash b/package/alsa-utils/alsa-utils.hash index c2d3ee9bb5c..66c04d261f5 100644 --- a/package/alsa-utils/alsa-utils.hash +++ b/package/alsa-utils/alsa-utils.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6a1efd8a1f1d9d38e489633eaec1fffa5c315663b316cab804be486887e6145d alsa-utils-1.2.6.tar.bz2 +sha256 e140fa604c351f36bd72167c8860c69d81b964ae6ab53992d6434dde38e9333c alsa-utils-1.2.8.tar.bz2 sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/package/alsa-utils/alsa-utils.mk b/package/alsa-utils/alsa-utils.mk index c1478bf847f..8c43f58b76f 100644 --- a/package/alsa-utils/alsa-utils.mk +++ b/package/alsa-utils/alsa-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -ALSA_UTILS_VERSION = 1.2.6 +ALSA_UTILS_VERSION = 1.2.8 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 diff --git a/package/alsamixergui/alsamixergui.hash b/package/alsamixergui/alsamixergui.hash index 85c9ffe75ed..32dfea284c1 100644 --- a/package/alsamixergui/alsamixergui.hash +++ b/package/alsamixergui/alsamixergui.hash @@ -1,4 +1,4 @@ # From http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/a/alsamixergui/alsamixergui_0.9.0rc2-1-9.dsc -md5 af942a41b81ba27e2e4d0a1e1ab0decb alsamixergui_0.9.0rc2-1.orig.tar.gz +md5 af942a41b81ba27e2e4d0a1e1ab0decb alsamixergui_0.9.0rc2-1.orig.tar.gz # locally computed sha256 ea617b76dcd0df74576686ca34c281f43bb9d844015cea91e3debc91538d2b1d debian/copyright diff --git a/package/alure/alure.hash b/package/alure/alure.hash index d84af0a35e4..0d4c36c4ae7 100644 --- a/package/alure/alure.hash +++ b/package/alure/alure.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 9b808e5b5a54d156348221dc86704c7831115047d5238691e6088f8c4814b2ca alure-14beed2a86d5a36030e907b21c46614d505f07cd.tar.gz -sha256 7331ddc67daaf1a283c81e8dc17bac8dc40f54ed3fab3d3964616f4bd502a0a3 LICENSE +sha256 9b808e5b5a54d156348221dc86704c7831115047d5238691e6088f8c4814b2ca alure-14beed2a86d5a36030e907b21c46614d505f07cd.tar.gz +sha256 7331ddc67daaf1a283c81e8dc17bac8dc40f54ed3fab3d3964616f4bd502a0a3 LICENSE diff --git a/package/android-tools/android-tools.hash b/package/android-tools/android-tools.hash index 27602fb2f75..d9a186b62c5 100644 --- a/package/android-tools/android-tools.hash +++ b/package/android-tools/android-tools.hash @@ -1,4 +1,4 @@ # locally computed -sha256 9bfba987e1351b12aa983787b9ae4424ab752e9e646d8e93771538dc1e5d932f android-tools_4.2.2+git20130218.orig.tar.xz -sha256 73c3078de3e44d8a3cadf7a360863c63155d9d558c2f0933cf38ad901a3f5998 android-tools_4.2.2+git20130218-3ubuntu41.debian.tar.gz +sha256 9bfba987e1351b12aa983787b9ae4424ab752e9e646d8e93771538dc1e5d932f android-tools_4.2.2+git20130218.orig.tar.xz +sha256 73c3078de3e44d8a3cadf7a360863c63155d9d558c2f0933cf38ad901a3f5998 android-tools_4.2.2+git20130218-3ubuntu41.debian.tar.gz sha256 170c5939bf8c8eed1db8f66f2d6155e8c1a3e799e390b55e7aad253195b1ebf5 debian/copyright diff --git a/package/angular-websocket/angular-websocket.hash b/package/angular-websocket/angular-websocket.hash index f589abe5e88..3aa5b5e7e1f 100644 --- a/package/angular-websocket/angular-websocket.hash +++ b/package/angular-websocket/angular-websocket.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 69d752896bc17c08750a2fda24b5eb3c6d653afc6f406dd90a6b7c920b22a14a angular-websocket-2.0.0.tar.gz -sha256 3013a57f2c8df37775804b8be5b107665a2ca209607bb92c618bcc084feb00a7 LICENSE +sha256 69d752896bc17c08750a2fda24b5eb3c6d653afc6f406dd90a6b7c920b22a14a angular-websocket-2.0.0.tar.gz +sha256 3013a57f2c8df37775804b8be5b107665a2ca209607bb92c618bcc084feb00a7 LICENSE diff --git a/package/aoetools/aoetools.hash b/package/aoetools/aoetools.hash index 76c305624d5..4629019bab7 100644 --- a/package/aoetools/aoetools.hash +++ b/package/aoetools/aoetools.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 477e796f5c18e8c0e61b5d88e1759c68249e8e0210c2f3de2b98680e2cc63e32 aoetools-37.tar.gz +sha256 477e796f5c18e8c0e61b5d88e1759c68249e8e0210c2f3de2b98680e2cc63e32 aoetools-37.tar.gz # Hash for license files: -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/apache/Config.in b/package/apache/Config.in index 8b6a5bf7ea4..270296bce4e 100644 --- a/package/apache/Config.in +++ b/package/apache/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_APACHE depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # apr select BR2_PACKAGE_APR_UTIL - select BR2_PACKAGE_PCRE + select BR2_PACKAGE_PCRE2 help The Apache HTTP Server Project is an effort to develop and maintain an open-source HTTP server for modern operating diff --git a/package/apache/apache.hash b/package/apache/apache.hash index 014d920772a..1f0020f65a2 100644 --- a/package/apache/apache.hash +++ b/package/apache/apache.hash @@ -1,5 +1,5 @@ -# From https://downloads.apache.org/httpd/httpd-2.4.52.tar.bz2.{sha256,sha512} -sha256 0127f7dc497e9983e9c51474bed75e45607f2f870a7675a86dc90af6d572f5c9 httpd-2.4.52.tar.bz2 -sha512 97c021c576022a9d32f4a390f62e07b5f550973aef2f299fd52defce1a9fa5d27bd4a676e7bf214373ba46063d34aecce42de62fdd93678a4e925cfcbb2afdf6 httpd-2.4.52.tar.bz2 +# From https://archive.apache.org/dist/httpd/httpd-2.4.57.tar.bz2.{sha256,sha512} +sha256 dbccb84aee95e095edfbb81e5eb926ccd24e6ada55dcd83caecb262e5cf94d2a httpd-2.4.57.tar.bz2 +sha512 4d1e0a274ee90bdfb5f38d4a7d73a7367ed1c6388e26280e640014e49abc0df03683705b88dcfe2ec2da313dda4c7b4a3b86daffa1911f58e224eba89d82d155 httpd-2.4.57.tar.bz2 # Locally computed sha256 47b8c2b6c3309282a99d4a3001575c790fead690cc14734628c4667d2bbffc43 LICENSE diff --git a/package/apache/apache.mk b/package/apache/apache.mk index b280d4dc3a6..320a6ad20ed 100644 --- a/package/apache/apache.mk +++ b/package/apache/apache.mk @@ -4,7 +4,7 @@ # ################################################################################ -APACHE_VERSION = 2.4.52 +APACHE_VERSION = 2.4.57 APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2 APACHE_SITE = https://downloads.apache.org/httpd APACHE_LICENSE = Apache-2.0 @@ -17,11 +17,11 @@ APACHE_INSTALL_STAGING = YES # We have a patch touching configure.in and Makefile.in, # so we need to autoreconf: APACHE_AUTORECONF = YES -APACHE_DEPENDENCIES = apr apr-util pcre +APACHE_DEPENDENCIES = apr apr-util pcre2 APACHE_CONF_ENV= \ ap_cv_void_ptr_lt_long=no \ - PCRE_CONFIG=$(STAGING_DIR)/usr/bin/pcre-config + PCRE_CONFIG=$(STAGING_DIR)/usr/bin/pcre2-config ifeq ($(BR2_PACKAGE_APACHE_MPM_EVENT),y) APACHE_MPM = event @@ -35,7 +35,7 @@ APACHE_CONF_OPTS = \ --sysconfdir=/etc/apache2 \ --with-apr=$(STAGING_DIR)/usr \ --with-apr-util=$(STAGING_DIR)/usr \ - --with-pcre=$(STAGING_DIR)/usr/bin/pcre-config \ + --with-pcre=$(STAGING_DIR)/usr/bin/pcre2-config \ --enable-http \ --enable-dbd \ --enable-proxy \ @@ -45,6 +45,13 @@ APACHE_CONF_OPTS = \ --with-mpm=$(APACHE_MPM) \ --disable-luajit +ifeq ($(BR2_PACKAGE_BROTLI),y) +APACHE_CONF_OPTS += --enable-brotli +APACHE_DEPENDENCIES += brotli +else +APACHE_CONF_OPTS += --disable-brotli +endif + ifeq ($(BR2_PACKAGE_LIBXML2),y) APACHE_DEPENDENCIES += libxml2 # Apache wants the path to the header file, where it can find diff --git a/package/apg/apg.mk b/package/apg/apg.mk index ac4dce77f94..16661f4b8dc 100644 --- a/package/apg/apg.mk +++ b/package/apg/apg.mk @@ -10,8 +10,7 @@ APG_LICENSE = BSD-3-Clause APG_LICENSE_FILES = COPYING define APG_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) CFLAGS="$(APG_CFLAGS)" \ - -C $(@D) + $(MAKE) $(TARGET_CONFIGURE_OPTS) FLAGS="$(TARGET_CFLAGS)" -C $(@D) endef define APG_INSTALL_TARGET_CMDS diff --git a/package/apparmor/apparmor.hash b/package/apparmor/apparmor.hash index 88280cbfcf2..22037e3e116 100644 --- a/package/apparmor/apparmor.hash +++ b/package/apparmor/apparmor.hash @@ -1,5 +1,5 @@ -# From: https://gitlab.com/apparmor/apparmor/-/wikis/home#userspace -sha256 153db05d8f491e0596022663c19fb1166806cb473b3c6f0a7279feda2ec25a59 apparmor-3.0.3.tar.gz +# From https://gitlab.com/apparmor/apparmor/-/wikis/Release_Notes_3.1.2 +sha256 7cbd0b2f6393abf57acaf25dc2b32b2ae197c0b5b0d661e14be46127df93a5eb apparmor-3.1.2.tar.gz # locally computed sha256 a7e0cdcbea5c14927cedfc600d46526bdcbb1eb0a4d951e2ea53c2a6de159cb4 LICENSE diff --git a/package/apparmor/apparmor.mk b/package/apparmor/apparmor.mk index 43bfa053088..eeedd805e6a 100644 --- a/package/apparmor/apparmor.mk +++ b/package/apparmor/apparmor.mk @@ -5,8 +5,8 @@ ################################################################################ # When updating the version here, please also update the libapparmor package -APPARMOR_VERSION_MAJOR = 3.0 -APPARMOR_VERSION = $(APPARMOR_VERSION_MAJOR).3 +APPARMOR_VERSION_MAJOR = 3.1 +APPARMOR_VERSION = $(APPARMOR_VERSION_MAJOR).2 APPARMOR_SITE = https://launchpad.net/apparmor/$(APPARMOR_VERSION_MAJOR)/$(APPARMOR_VERSION)/+download APPARMOR_DL_SUBDIR = libapparmor APPARMOR_LICENSE = GPL-2.0 diff --git a/package/apr-util/Config.in b/package/apr-util/Config.in index 6c5e3bbdf59..c1a967bdecf 100644 --- a/package/apr-util/Config.in +++ b/package/apr-util/Config.in @@ -8,7 +8,7 @@ config BR2_PACKAGE_APR_UTIL help The utility library for the apache runtime project - http://apr.apache.org/ + https://apr.apache.org comment "apr-util needs a toolchain w/ dynamic library" depends on BR2_USE_MMU diff --git a/package/apr-util/apr-util.hash b/package/apr-util/apr-util.hash index 82ad475619e..7e2793cd77c 100644 --- a/package/apr-util/apr-util.hash +++ b/package/apr-util/apr-util.hash @@ -1,4 +1,4 @@ -# From http://www.apache.org/dist/apr/apr-util-1.6.1.tar.bz2.sha256 -sha256 d3e12f7b6ad12687572a3a39475545a072608f4ba03a6ce8a3778f607dd0035b apr-util-1.6.1.tar.bz2 +# From http://www.apache.org/dist/apr/apr-util-1.6.3.tar.bz2.sha256 +sha256 a41076e3710746326c3945042994ad9a4fcac0ce0277dd8fea076fec3c9772b5 apr-util-1.6.3.tar.bz2 # Locally calculated -sha256 ef5609d18601645ad6fe22c6c122094be40e976725c1d0490778abacc836e7a2 LICENSE +sha256 ef5609d18601645ad6fe22c6c122094be40e976725c1d0490778abacc836e7a2 LICENSE diff --git a/package/apr-util/apr-util.mk b/package/apr-util/apr-util.mk index cf8407ced04..02b6d5e2771 100644 --- a/package/apr-util/apr-util.mk +++ b/package/apr-util/apr-util.mk @@ -4,9 +4,9 @@ # ################################################################################ -APR_UTIL_VERSION = 1.6.1 +APR_UTIL_VERSION = 1.6.3 APR_UTIL_SOURCE = apr-util-$(APR_UTIL_VERSION).tar.bz2 -APR_UTIL_SITE = http://archive.apache.org/dist/apr +APR_UTIL_SITE = https://archive.apache.org/dist/apr APR_UTIL_LICENSE = Apache-2.0 APR_UTIL_LICENSE_FILES = LICENSE APR_UTIL_CPE_ID_VENDOR = apache diff --git a/package/apr/0001-cross-compile.patch b/package/apr/0001-cross-compile.patch deleted file mode 100644 index 559ebb74ba4..00000000000 --- a/package/apr/0001-cross-compile.patch +++ /dev/null @@ -1,58 +0,0 @@ -Fix cross-compilation - -Patch was backported from Apache httpd: -http://svn.apache.org/viewvc?view=revision&revision=1327907 -http://svn.apache.org/viewvc?view=revision&revision=1328390 -http://svn.apache.org/viewvc?view=revision&revision=1328714 - -Patch submitted upstream: -https://issues.apache.org/bugzilla/show_bug.cgi?id=57058 - -Signed-off-by: Bernd Kuhls - -diff -uNr apr-1.5.1.org/configure.in apr-1.5.1/configure.in ---- apr-1.5.1.org/configure.in 2014-01-25 16:17:29.000000000 +0100 -+++ apr-1.5.1/configure.in 2014-10-05 11:20:40.080746760 +0200 -@@ -118,6 +118,16 @@ - echo "Configuring APR library" - echo "Platform: $host" - -+dnl In case of cross compilation we set CC_FOR_BUILD to cc unless -+dnl we got already CC_FOR_BUILD from environment. -+if test "x${build_alias}" != "x${host_alias}"; then -+ if test "x${CC_FOR_BUILD}" = "x"; then -+ CC_FOR_BUILD=cc -+ fi -+fi -+AC_SUBST(CC_FOR_BUILD) -+AC_SUBST(CFLAGS_FOR_BUILD) -+ - dnl Some initial steps for configuration. We setup the default directory - dnl and which files are to be configured. - -diff -uNr apr-1.5.1.org/Makefile.in apr-1.5.1/Makefile.in ---- apr-1.5.1.org/Makefile.in 2014-03-17 16:10:26.000000000 +0100 -+++ apr-1.5.1/Makefile.in 2014-10-05 11:22:53.031070519 +0200 -@@ -8,6 +8,8 @@ - # APR (Apache Portable Runtime) library Makefile. - # - CPP = @CPP@ -+CC_FOR_BUILD = @CC_FOR_BUILD@ -+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ - - # get substituted into some targets - APR_MAJOR_VERSION=@APR_MAJOR_VERSION@ -@@ -134,8 +134,13 @@ - $(APR_MKDIR) tools - $(LT_COMPILE) - -+ifdef CC_FOR_BUILD -+tools/gen_test_char@EXEEXT@: tools/gen_test_char.c $(LOCAL_LIBS) -+ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -DCROSS_COMPILE -o $@ $< -+else - tools/gen_test_char@EXEEXT@: $(OBJECTS_gen_test_char) - $(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS) -+endif - - include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@ - $(APR_MKDIR) include/private diff --git a/package/apr/0002-sys-param-h.patch b/package/apr/0001-sys-param-h.patch similarity index 100% rename from package/apr/0002-sys-param-h.patch rename to package/apr/0001-sys-param-h.patch diff --git a/package/apr/0002-Revert-Backport-r1872164.-Fix-the-name-of-libtool-wh.patch b/package/apr/0002-Revert-Backport-r1872164.-Fix-the-name-of-libtool-wh.patch new file mode 100644 index 00000000000..f80db1cb6b3 --- /dev/null +++ b/package/apr/0002-Revert-Backport-r1872164.-Fix-the-name-of-libtool-wh.patch @@ -0,0 +1,30 @@ +From 0aa7e33372b479a26e5f04dfc4801e24573a8737 Mon Sep 17 00:00:00 2001 +From: Graham Leggett +Date: Wed, 1 Jan 2020 10:43:39 +0000 +Subject: [PATCH] Revert: Backport r1872164. Fix the name of libtool when + cross compiling. + +git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x@1872165 13f79535-47bb-0310-9956-ffa450edef68 + +[Revert upstream commit https://github.com/apache/apr/commit/f82374627b3a6500a7a6cb11e48bcac59bcbb6a1] +Signed-off-by: Peter Seiderer +--- + apr-config.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/apr-config.in b/apr-config.in +index bed47ca..4873fc0 100644 +--- a/apr-config.in ++++ b/apr-config.in +@@ -246,7 +246,7 @@ while test $# -gt 0; do + if test "$location" = "installed"; then + echo "${installbuilddir}/libtool" + elif test "$location" = "crosscompile"; then +- echo "$APR_TARGET_DIR/${installbuilddir}/libtool" ++ echo "$APR_TARGET_DIR/${installbuilddir}/build" + else + echo "$APR_BUILD_DIR/libtool" + fi +-- +2.39.2 + diff --git a/package/apr/0003-Merge-r1887279-from-trunk.patch b/package/apr/0003-Merge-r1887279-from-trunk.patch deleted file mode 100644 index 444b9d2b068..00000000000 --- a/package/apr/0003-Merge-r1887279-from-trunk.patch +++ /dev/null @@ -1,69 +0,0 @@ -From a15958a37a06f71c42c690278f9c958b93b7ee20 Mon Sep 17 00:00:00 2001 -From: Yann Ylavic -Date: Thu, 11 Mar 2021 14:10:21 +0000 -Subject: [PATCH] Merge r1887279 from trunk: - -build/apr_common.m4: avoid explicit inclusion of "confdefs.h" - -The failure is observed on `autoconf-2.69d` (soon to be released -as `autoconf-2.70`). There `int64_t` detection fails as: - -$ autoreconf && ./configure -checking whether int64_t and int use fmt %d... no -checking whether int64_t and long use fmt %ld... no -checking whether int64_t and long long use fmt %lld... no -configure: error: could not determine the string function for int64_t -``` - -This happens because `./configure` always stumbles on warning: - -configure:3350: gcc -c -g -O2 -Werror conftest.c >&5 -In file included from conftest.c:31: -confdefs.h:22: error: "__STDC_WANT_IEC_60559_ATTRIBS_EXT__" redefined [-Werror] - 22 | #define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1 - | - -It's triggered by double inclusion of `"confdefs.h"` contents: -explicitly in `APR_TRY_COMPILE_NO_WARNING` macro and implicitly -via `AC_LANG_SOURCE` use. - -To fix it and avoid having to define `main()` declaration the change -uses `AC_LANG_PROGRAM` instead. - -Tested on both `autoconf-2.69` and `autoconf-2.69d`. - - -Github: closes #25 -Submitted by: Sergei Trofimovich -Reviewed by: ylavic - - -git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x@1887485 13f79535-47bb-0310-9956-ffa450edef68 - -[Retrieved from: -https://github.com/apache/apr/commit/0a763c5e500f4304b7c534fae0fad430d64982e8] -Signed-off-by: Fabrice Fontaine ---- - build/apr_common.m4 | 8 ++------ - 1 file changed, 2 insertions(+), 6 deletions(-) - -diff --git a/build/apr_common.m4 b/build/apr_common.m4 -index 297dd32cf75..b67a8608abe 100644 ---- a/build/apr_common.m4 -+++ b/build/apr_common.m4 -@@ -467,13 +467,9 @@ AC_DEFUN([APR_TRY_COMPILE_NO_WARNING], - CFLAGS="$CFLAGS -Werror" - fi - AC_COMPILE_IFELSE( -- [AC_LANG_SOURCE( -- [#include "confdefs.h" -- ] -- [[$1]] -- [int main(int argc, const char *const *argv) {] -+ [AC_LANG_PROGRAM( -+ [[$1]], - [[$2]] -- [ return 0; }] - )], [CFLAGS=$apr_save_CFLAGS - $3], [CFLAGS=$apr_save_CFLAGS - $4]) 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 new file mode 100644 index 00000000000..ad250d44279 --- /dev/null +++ b/package/apr/0003-Revert-Add-the-ability-to-cross-compile-APR.patch @@ -0,0 +1,112 @@ +From ed1daed074fba0dabff825e63525d751b6bb7b8d 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. + +git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x@1872147 13f79535-47bb-0310-9956-ffa450edef68 + +[Revert upstream commit https://github.com/apache/apr/commit/b6dbbc77da35a7b46754c99f465827f2a583e23c] +Signed-off-by: Peter Seiderer +--- + CHANGES | 2 -- + apr-config.in | 22 ---------------------- + 2 files changed, 24 deletions(-) + +diff --git a/CHANGES b/CHANGES +index 71b2f0e..e751c90 100644 +--- a/CHANGES ++++ b/CHANGES +@@ -56,8 +56,6 @@ Changes for APR 1.7.1 + *) Don't try to use PROC_PTHREAD by default when cross compiling. + [Yann Ylavic] + +- *) Add the ability to cross compile APR. [Graham Leggett] +- + *) While cross-compiling, the tools/gen_test_char could not + 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 +--- 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@ + +-# 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 + + if test "$location" = "installed"; then + LA_FILE="$libdir/lib${APR_LIBNAME}.la" +-elif test "$location" = "crosscompile"; then +- LA_FILE="$APR_TARGET_DIR/$libdir/lib${APR_LIBNAME}.la" + else + LA_FILE="$APR_BUILD_DIR/lib${APR_LIBNAME}.la" + fi +@@ -132,8 +122,6 @@ while test $# -gt 0; do + --includedir) + if test "$location" = "installed"; then + flags="$includedir" +- elif test "$location" = "crosscompile"; then +- flags="$APR_TARGET_DIR/$includedir" + elif test "$location" = "source"; then + flags="$APR_SOURCE_DIR/include" + else +@@ -166,8 +154,6 @@ while test $# -gt 0; do + --includes) + if test "$location" = "installed"; then + flags="$flags -I$includedir $EXTRA_INCLUDES" +- elif test "$location" = "crosscompile"; then +- flags="$flags -I$APR_TARGET_DIR/$includedir $EXTRA_INCLUDES" + elif test "$location" = "source"; then + flags="$flags -I$APR_SOURCE_DIR/include $EXTRA_INCLUDES" + else +@@ -182,8 +168,6 @@ while test $# -gt 0; do + --installbuilddir) + if test "$location" = "installed"; then + echo "${installbuilddir}" +- elif test "$location" = "crosscompile"; then +- echo "$APR_TARGET_DIR/${installbuilddir}" + elif test "$location" = "source"; then + echo "$APR_SOURCE_DIR/build" + else +@@ -200,8 +184,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}" +- elif test "$location" = "crosscompile"; then +- flags="$flags -L$APR_TARGET_DIR/$libdir -l${APR_LIBNAME}" + 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 + # 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}" +- elif test "$location" = "crosscompile"; then +- flags="$flags -L${APR_TARGET_DIR}/$libdir -l${APR_LIBNAME}" + else + flags="$flags $LA_FILE" + fi +@@ -245,8 +225,6 @@ while test $# -gt 0; do + --apr-libtool) + if test "$location" = "installed"; then + echo "${installbuilddir}/libtool" +- elif test "$location" = "crosscompile"; then +- echo "$APR_TARGET_DIR/${installbuilddir}/build" + else + echo "$APR_BUILD_DIR/libtool" + fi +-- +2.39.2 + diff --git a/package/apr/Config.in b/package/apr/Config.in index 67de925474e..4606fc5378d 100644 --- a/package/apr/Config.in +++ b/package/apr/Config.in @@ -9,7 +9,7 @@ config BR2_PACKAGE_APR predictable and consistent interface to underlying platform-specific implementations - http://apr.apache.org/ + https://apr.apache.org comment "apr needs a toolchain w/ dynamic library" depends on BR2_USE_MMU diff --git a/package/apr/apr.hash b/package/apr/apr.hash index 0a3f5c85278..96f43d37100 100644 --- a/package/apr/apr.hash +++ b/package/apr/apr.hash @@ -1,4 +1,4 @@ -# From http://archive.apache.org/dist/apr/apr-1.7.0.tar.bz2.sha256 -sha256 e2e148f0b2e99b8e5c6caa09f6d4fb4dd3e83f744aa72a952f94f5a14436f7ea apr-1.7.0.tar.bz2 +# From https://archive.apache.org/dist/apr/apr-1.7.2.tar.bz2.sha256 +sha256 75e77cc86776c030c0a5c408dfbd0bf2a0b75eed5351e52d5439fa1e5509a43e apr-1.7.2.tar.bz2 # Locally calculated -sha256 f854aeef66ecd55a126226e82b3f26793fc3b1c584647f6a0edc5639974c38ad LICENSE +sha256 f854aeef66ecd55a126226e82b3f26793fc3b1c584647f6a0edc5639974c38ad LICENSE diff --git a/package/apr/apr.mk b/package/apr/apr.mk index c45829aacc4..bdc5e915c62 100644 --- a/package/apr/apr.mk +++ b/package/apr/apr.mk @@ -4,9 +4,9 @@ # ################################################################################ -APR_VERSION = 1.7.0 +APR_VERSION = 1.7.2 APR_SOURCE = apr-$(APR_VERSION).tar.bz2 -APR_SITE = http://archive.apache.org/dist/apr +APR_SITE = https://archive.apache.org/dist/apr APR_LICENSE = Apache-2.0 APR_LICENSE_FILES = LICENSE APR_CPE_ID_VENDOR = apache @@ -16,6 +16,8 @@ APR_INSTALL_STAGING = YES # so we need to autoreconf: APR_AUTORECONF = YES +APR_CONF_OPTS = --disable-sctp + # avoid apr_hints.m4 by setting apr_preload_done=yes and set # the needed CFLAGS on our own (avoids '-D_REENTRANT' in case # not supported by toolchain and subsequent configure failure) @@ -29,6 +31,7 @@ APR_CONF_ENV = \ CFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \ CFLAGS="$(APR_CFLAGS)" \ ac_cv_file__dev_zero=yes \ + ac_cv_mmap__dev_zero=yes \ ac_cv_func_setpgrp_void=yes \ apr_cv_process_shared_works=yes \ apr_cv_mutex_robust_shared=no \ @@ -36,6 +39,7 @@ APR_CONF_ENV = \ ac_cv_sizeof_struct_iovec=8 \ ac_cv_sizeof_pid_t=4 \ ac_cv_struct_rlimit=yes \ + ac_cv_strerror_r_rc_int=no \ ac_cv_o_nonblock_inherited=no \ apr_cv_mutex_recursive=yes \ apr_cv_epoll=yes \ diff --git a/package/argp-standalone/0001-throw-in-funcdef.patch b/package/argp-standalone/0001-throw-in-funcdef.patch deleted file mode 100644 index 4a90751e1e6..00000000000 --- a/package/argp-standalone/0001-throw-in-funcdef.patch +++ /dev/null @@ -1,79 +0,0 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# T2 SDE: package/.../rng-tools/throw-in-funcdef.patch.argp-standalone -# Copyright (C) 2006 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or 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. -# --- T2-COPYRIGHT-NOTE-END --- - - -No __THROW in function implementation. - --jsaw - ---- argp-standalone-1.4-test2/argp.h.orig 2006-01-06 02:29:59.000000000 +0100 -+++ argp-standalone-1.4-test2/argp.h 2006-01-06 02:41:10.000000000 +0100 -@@ -560,17 +560,17 @@ - # endif - - # ifndef ARGP_EI --# define ARGP_EI extern __inline__ -+# define ARGP_EI extern inline - # endif - - ARGP_EI void --__argp_usage (__const struct argp_state *__state) __THROW -+__argp_usage (__const struct argp_state *__state) - { - __argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE); - } - - ARGP_EI int --__option_is_short (__const struct argp_option *__opt) __THROW -+__option_is_short (__const struct argp_option *__opt) - { - if (__opt->flags & OPTION_DOC) - return 0; -@@ -582,7 +582,7 @@ - } - - ARGP_EI int --__option_is_end (__const struct argp_option *__opt) __THROW -+__option_is_end (__const struct argp_option *__opt) - { - return !__opt->key && !__opt->name && !__opt->doc && !__opt->group; - } ---- argp-standalone-1.4-test2/argp-parse.c.orig 2006-01-06 02:47:48.000000000 +0100 -+++ argp-standalone-1.4-test2/argp-parse.c 2006-01-06 02:48:16.000000000 +0100 -@@ -1290,13 +1290,13 @@ - /* Defined here, in case a user is not inlining the definitions in - * argp.h */ - void --__argp_usage (__const struct argp_state *__state) __THROW -+__argp_usage (__const struct argp_state *__state) - { - __argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE); - } - - int --__option_is_short (__const struct argp_option *__opt) __THROW -+__option_is_short (__const struct argp_option *__opt) - { - if (__opt->flags & OPTION_DOC) - return 0; -@@ -1310,7 +1310,7 @@ - } - - int --__option_is_end (__const struct argp_option *__opt) __THROW -+__option_is_end (__const struct argp_option *__opt) - { - return !__opt->key && !__opt->name && !__opt->doc && !__opt->group; - } diff --git a/package/argp-standalone/0002-isprint.patch b/package/argp-standalone/0002-isprint.patch deleted file mode 100644 index 9c08366f686..00000000000 --- a/package/argp-standalone/0002-isprint.patch +++ /dev/null @@ -1,45 +0,0 @@ -Subject: restrict value range passed to isprint function - -According to C standards isprint argument shall be representable as an -unsigned char or be equal to EOF, otherwise the behaviour is undefined. - -Passing arbitrary ints leads to segfault in nm program from elfutils. - -Restrict isprint argument range to values representable by unsigned char. - -Signed-off-by: Max Filippov ---- -Index: b/argp.h -=================================================================== ---- a/argp.h -+++ b/argp.h -@@ -23,6 +23,7 @@ - - #include - #include -+#include - - #define __need_error_t - #include -@@ -577,7 +578,7 @@ - else - { - int __key = __opt->key; -- return __key > 0 && isprint (__key); -+ return __key > 0 && __key <= UCHAR_MAX && isprint (__key); - } - } - -Index: b/argp-parse.c -=================================================================== ---- a/argp-parse.c -+++ b/argp-parse.c -@@ -1292,7 +1292,7 @@ - int __key = __opt->key; - /* FIXME: whether or not a particular key implies a short option - * ought not to be locale dependent. */ -- return __key > 0 && isprint (__key); -+ return __key > 0 && __key <= UCHAR_MAX && isprint (__key); - } - } - diff --git a/package/argp-standalone/0003-fix_build_with_c99_compilers.patch b/package/argp-standalone/0003-fix_build_with_c99_compilers.patch deleted file mode 100644 index 56b753b6074..00000000000 --- a/package/argp-standalone/0003-fix_build_with_c99_compilers.patch +++ /dev/null @@ -1,68 +0,0 @@ -From b2dfa011a3fdcb7d22764d143517d0fbd1c2a201 Mon Sep 17 00:00:00 2001 -From: Emmanuel Dreyfus -Date: Wed, 22 Jan 2014 14:47:23 +0100 -Subject: [PATCH] Fix build with c99 compilers - -BUG: 764655 -Change-Id: If5dfdc9c7427bd3d39d8da8f79e33ae2da6a3137 -Signed-off-by: Emmanuel Dreyfus -Reviewed-on: http://review.gluster.org/6034 -Reviewed-by: Harshavardhana -Tested-by: Gluster Build System ---- - -diff --git a/argp-fmtstream.c b/argp-fmtstream.c -index 7f79285..494b6b3 100644 ---- a/argp-fmtstream.c -+++ b/argp-fmtstream.c -@@ -389,6 +389,7 @@ - weak_alias (__argp_fmtstream_printf, argp_fmtstream_printf) - #endif - -+#if __STDC_VERSION__ - 199900L < 1 - /* Duplicate the inline definitions in argp-fmtstream.h, for compilers - * that don't do inlining. */ - size_t -@@ -471,5 +472,6 @@ - __argp_fmtstream_update (__fs); - return __fs->point_col >= 0 ? __fs->point_col : 0; - } -+#endif /* __STDC_VERSION__ - 199900L < 1 */ - - #endif /* !ARGP_FMTSTREAM_USE_LINEWRAP */ -diff --git a/argp-fmtstream.h b/argp-fmtstream.h -index e797b11..828f435 100644 ---- a/argp-fmtstream.h -+++ b/argp-fmtstream.h -@@ -153,6 +153,7 @@ - __const char *__fmt, ...) - PRINTF_STYLE(2,3); - -+#if __STDC_VERSION__ - 199900L < 1 - extern int __argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch); - extern int argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch); - -@@ -163,6 +164,7 @@ - __const char *__str, size_t __len); - extern size_t argp_fmtstream_write (argp_fmtstream_t __fs, - __const char *__str, size_t __len); -+#endif /* __STDC_VERSION__ - 199900L < 1 */ - - /* Access macros for various bits of state. */ - #define argp_fmtstream_lmargin(__fs) ((__fs)->lmargin) -@@ -172,6 +174,7 @@ - #define __argp_fmtstream_rmargin argp_fmtstream_rmargin - #define __argp_fmtstream_wmargin argp_fmtstream_wmargin - -+#if __STDC_VERSION__ - 199900L < 1 - /* Set __FS's left margin to LMARGIN and return the old value. */ - extern size_t argp_fmtstream_set_lmargin (argp_fmtstream_t __fs, - size_t __lmargin); -@@ -193,6 +196,7 @@ - /* Return the column number of the current output point in __FS. */ - extern size_t argp_fmtstream_point (argp_fmtstream_t __fs); - extern size_t __argp_fmtstream_point (argp_fmtstream_t __fs); -+#endif /* __STDC_VERSION__ - 199900L < 1 */ - - /* Internal routines. */ - extern void _argp_fmtstream_update (argp_fmtstream_t __fs); diff --git a/package/argp-standalone/Config.in b/package/argp-standalone/Config.in index 3319dd945ce..891d4aedaa0 100644 --- a/package/argp-standalone/Config.in +++ b/package/argp-standalone/Config.in @@ -5,4 +5,4 @@ config BR2_PACKAGE_ARGP_STANDALONE help Glibc hierarchical argument parsing standalone library. - http://www.lysator.liu.se/~nisse/misc/ + https://github.com/ericonr/argp-standalone/ diff --git a/package/argp-standalone/argp-standalone.hash b/package/argp-standalone/argp-standalone.hash index c780f9e53f4..1e56c663d44 100644 --- a/package/argp-standalone/argp-standalone.hash +++ b/package/argp-standalone/argp-standalone.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 dec79694da1319acd2238ce95df57f3680fea2482096e483323fddf3d818d8be argp-standalone-1.3.tar.gz +sha256 879d76374424dce051b812f16f43c6d16de8dbaddd76002f83fd1b6e57d39e0b argp-standalone-1.4.1.tar.gz # License file -sha256 bbb8919aa520069b0234faf5e83a94052d278419ffe97ca8e843ecc9b212d1ab argp.h +sha256 b5db0353a5b1902fc8a2e055d8899dd0c189ce73a31e67af9a0ffc24711b63f0 README.md diff --git a/package/argp-standalone/argp-standalone.mk b/package/argp-standalone/argp-standalone.mk index 651bc400f43..269239fa5b6 100644 --- a/package/argp-standalone/argp-standalone.mk +++ b/package/argp-standalone/argp-standalone.mk @@ -4,14 +4,19 @@ # ################################################################################ -ARGP_STANDALONE_VERSION = 1.3 -ARGP_STANDALONE_SITE = http://www.lysator.liu.se/~nisse/archive +ARGP_STANDALONE_VERSION = 1.4.1 +ARGP_STANDALONE_SITE = \ + $(call github,ericonr,argp-standalone,$(ARGP_STANDALONE_VERSION)) ARGP_STANDALONE_INSTALL_STAGING = YES -ARGP_STANDALONE_LICENSE = LGPL-2.0+ -ARGP_STANDALONE_LICENSE_FILES = argp.h +ARGP_STANDALONE_LICENSE = LGPL-2.1+ +ARGP_STANDALONE_LICENSE_FILES = README.md +# From git +ARGP_STANDALONE_AUTORECONF = YES +ARGP_STANDALONE_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) ARGP_STANDALONE_CONF_ENV = \ - CFLAGS="$(TARGET_CFLAGS) -fPIC -fgnu89-inline" + CFLAGS="$(TARGET_CFLAGS) -fPIC -fgnu89-inline" \ + LIBS=$(TARGET_NLS_LIBS) define ARGP_STANDALONE_INSTALL_STAGING_CMDS $(INSTALL) -D $(@D)/libargp.a $(STAGING_DIR)/usr/lib/libargp.a diff --git a/package/argparse/argparse.hash b/package/argparse/argparse.hash index fd7c48eab33..c573ba57962 100644 --- a/package/argparse/argparse.hash +++ b/package/argparse/argparse.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 ea30d0643586a20aeb6349ca8cb7db63aefc21d9aa007c7b7168a7c564817879 argparse-0.7.1-1.src.rock -sha256 9a918f21485b2a4529c901491d9101392f03586d65ad5b024a4445ebc1dc37b4 argparse-0.7.1/LICENSE +sha256 ea30d0643586a20aeb6349ca8cb7db63aefc21d9aa007c7b7168a7c564817879 argparse-0.7.1-1.src.rock +sha256 9a918f21485b2a4529c901491d9101392f03586d65ad5b024a4445ebc1dc37b4 argparse-0.7.1/LICENSE diff --git a/package/argus/argus.hash b/package/argus/argus.hash index b3196cce7da..26355c5976c 100644 --- a/package/argus/argus.hash +++ b/package/argus/argus.hash @@ -1,6 +1,6 @@ # From http://qosient.com/argus/src/argus-3.0.8.2.tar.gz.md5 -md5 eaf5f5ec66569e556392802a70ef9ca5 argus-3.0.8.2.tar.gz +md5 eaf5f5ec66569e556392802a70ef9ca5 argus-3.0.8.2.tar.gz # Locally computed -sha256 ca4e3bd5b9d4a8ff7c01cc96d1bffd46dbd6321237ec94c52f8badd51032eeff argus-3.0.8.2.tar.gz -sha256 c68221f7207486bfce863fada4ba9b2aaf4adc9e1c672f965ae98e88143e5f16 README +sha256 ca4e3bd5b9d4a8ff7c01cc96d1bffd46dbd6321237ec94c52f8badd51032eeff argus-3.0.8.2.tar.gz +sha256 c68221f7207486bfce863fada4ba9b2aaf4adc9e1c672f965ae98e88143e5f16 README diff --git a/package/arm-gnu-a-toolchain/arm-gnu-a-toolchain.hash b/package/arm-gnu-a-toolchain/arm-gnu-a-toolchain.hash deleted file mode 100644 index 73c2708feae..00000000000 --- a/package/arm-gnu-a-toolchain/arm-gnu-a-toolchain.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 45225813f74e0c3f76af2715d30d1fbebb873c1abe7098f9c694e5567cc2279c gcc-arm-10.3-2021.07-x86_64-arm-none-eabi.tar.xz diff --git a/package/arm-gnu-a-toolchain/arm-gnu-a-toolchain.mk b/package/arm-gnu-a-toolchain/arm-gnu-a-toolchain.mk deleted file mode 100644 index 97ab89c9eb7..00000000000 --- a/package/arm-gnu-a-toolchain/arm-gnu-a-toolchain.mk +++ /dev/null @@ -1,26 +0,0 @@ -################################################################################ -# -# arm-gnu-a-toolchain -# -################################################################################ - -ARM_GNU_A_TOOLCHAIN_VERSION = 10.3-2021.07 -ARM_GNU_A_TOOLCHAIN_SITE = https://developer.arm.com/-/media/Files/downloads/gnu-a/$(ARM_GNU_A_TOOLCHAIN_VERSION)/binrel -ARM_GNU_A_TOOLCHAIN_SOURCE = gcc-arm-$(ARM_GNU_A_TOOLCHAIN_VERSION)-x86_64-arm-none-eabi.tar.xz -ARM_GNU_A_TOOLCHAIN_LICENSE = GPL-3.0+ - -HOST_ARM_GNU_A_TOOLCHAIN_INSTALL_DIR = $(HOST_DIR)/opt/gcc-arm-none-eabi - -define HOST_ARM_GNU_A_TOOLCHAIN_INSTALL_CMDS - rm -rf $(HOST_ARM_GNU_A_TOOLCHAIN_INSTALL_DIR) - mkdir -p $(HOST_ARM_GNU_A_TOOLCHAIN_INSTALL_DIR) - cp -rf $(@D)/* $(HOST_ARM_GNU_A_TOOLCHAIN_INSTALL_DIR)/ - - mkdir -p $(HOST_DIR)/bin - cd $(HOST_DIR)/bin && \ - for i in ../opt/gcc-arm-none-eabi/bin/*; do \ - ln -sf $$i; \ - done -endef - -$(eval $(host-generic-package)) diff --git a/package/arm-gnu-toolchain/arm-gnu-toolchain.hash b/package/arm-gnu-toolchain/arm-gnu-toolchain.hash new file mode 100644 index 00000000000..dec23f7ba53 --- /dev/null +++ b/package/arm-gnu-toolchain/arm-gnu-toolchain.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 97dbb4f019ad1650b732faffcc881689cedc14e2b7ee863d390e0a41ef16c9a3 gcc-arm-none-eabi-10.3-2021.10-x86_64-linux.tar.bz2 diff --git a/package/arm-gnu-toolchain/arm-gnu-toolchain.mk b/package/arm-gnu-toolchain/arm-gnu-toolchain.mk new file mode 100644 index 00000000000..87e12874ea4 --- /dev/null +++ b/package/arm-gnu-toolchain/arm-gnu-toolchain.mk @@ -0,0 +1,26 @@ +################################################################################ +# +# arm-gnu-toolchain +# +################################################################################ + +ARM_GNU_TOOLCHAIN_VERSION = 10.3-2021.10 +ARM_GNU_TOOLCHAIN_SITE = https://developer.arm.com/-/media/Files/downloads/gnu-rm/$(ARM_GNU_TOOLCHAIN_VERSION) +ARM_GNU_TOOLCHAIN_SOURCE = gcc-arm-none-eabi-$(ARM_GNU_TOOLCHAIN_VERSION)-x86_64-linux.tar.bz2 +ARM_GNU_TOOLCHAIN_LICENSE = GPL-3.0+ + +HOST_ARM_GNU_TOOLCHAIN_INSTALL_DIR = $(HOST_DIR)/opt/gcc-arm-none-eabi + +define HOST_ARM_GNU_TOOLCHAIN_INSTALL_CMDS + rm -rf $(HOST_ARM_GNU_TOOLCHAIN_INSTALL_DIR) + mkdir -p $(HOST_ARM_GNU_TOOLCHAIN_INSTALL_DIR) + cp -rf $(@D)/* $(HOST_ARM_GNU_TOOLCHAIN_INSTALL_DIR)/ + + mkdir -p $(HOST_DIR)/bin + cd $(HOST_DIR)/bin && \ + for i in ../opt/gcc-arm-none-eabi/bin/*; do \ + ln -sf $$i; \ + done +endef + +$(eval $(host-generic-package)) diff --git a/package/arp-scan/arp-scan.hash b/package/arp-scan/arp-scan.hash index 562deb8ff06..3a2977f906a 100644 --- a/package/arp-scan/arp-scan.hash +++ b/package/arp-scan/arp-scan.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e03c36e4933c655bd0e4a841272554a347cd0136faf42c4a6564059e0761c039 arp-scan-1.9.7.tar.gz -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 a078fe8711ecbb8b99121c3d8be26ae7e7f339f11010ef61318be4f33394d012 arp-scan-1.10.0.tar.gz +sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING diff --git a/package/arp-scan/arp-scan.mk b/package/arp-scan/arp-scan.mk index 3fdbd463c2d..89644be9d3e 100644 --- a/package/arp-scan/arp-scan.mk +++ b/package/arp-scan/arp-scan.mk @@ -4,12 +4,11 @@ # ################################################################################ -ARP_SCAN_VERSION = 1.9.7 -ARP_SCAN_SITE = $(call github,royhills,arp-scan,$(ARP_SCAN_VERSION)) +ARP_SCAN_VERSION = 1.10.0 +ARP_SCAN_SITE = https://github.com/royhills/arp-scan/releases/download/$(ARP_SCAN_VERSION) ARP_SCAN_LICENSE = GPL-3.0+ ARP_SCAN_LICENSE_FILES = COPYING ARP_SCAN_DEPENDENCIES = libpcap -ARP_SCAN_AUTORECONF = YES ifeq ($(BR2_STATIC_LIBS),y) ARP_SCAN_CONF_OPTS += LIBS="`$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs`" @@ -17,4 +16,11 @@ endif ARP_SCAN_CONF_ENV = pgac_cv_snprintf_long_long_int_format='%lld' +ifeq ($(BR2_PACKAGE_LIBCAP),y) +ARP_SCAN_DEPENDENCIES += libcap +ARP_SCAN_CONF_OPTS += --with-libcap +else +ARP_SCAN_CONF_OPTS += --without-libcap +endif + $(eval $(autotools-package)) diff --git a/package/arptables/0002-libarptc-libarptc_incl.c-fix-build-with-O0.patch b/package/arptables/0002-libarptc-libarptc_incl.c-fix-build-with-O0.patch new file mode 100644 index 00000000000..29f2d714e2c --- /dev/null +++ b/package/arptables/0002-libarptc-libarptc_incl.c-fix-build-with-O0.patch @@ -0,0 +1,49 @@ +From 7d8285ae92253017a15282dd25f76d76eed49518 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 21 Apr 2022 13:43:23 +0200 +Subject: [PATCH] libarptc/libarptc_incl.c: fix build with -O0 + +Fix the following build failure with -O0: + +libarptc/libarptc.c:48:21: error: redefinition of 'arpt_get_target' + 48 | #define GET_TARGET arpt_get_target + | ^~~~~~~~~~~~~~~ +libarptc/libarptc_incl.c:16:1: note: in expansion of macro 'GET_TARGET' + 16 | GET_TARGET(STRUCT_ENTRY *e) + | ^~~~~~~~~~ +In file included from .//include/libarptc/libarptc.h:7, + from libarptc/libarptc.c:26: +.//include/linux/netfilter_arp/arp_tables.h:196:43: note: previous definition of 'arpt_get_target' was here + 196 | static __inline__ struct xt_entry_target *arpt_get_target(struct arpt_entry *e) + | ^~~~~~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/730dce4101e7afcee233067e2870603cd64b8a48 + +Signed-off-by: Fabrice Fontaine +--- + libarptc/libarptc_incl.c | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/libarptc/libarptc_incl.c b/libarptc/libarptc_incl.c +index c4d5de3..441f2de 100644 +--- a/libarptc/libarptc_incl.c ++++ b/libarptc/libarptc_incl.c +@@ -11,14 +11,6 @@ + /* (C)1999 Paul ``Rusty'' Russell - Placed under the GNU GPL (See + COPYING for details). */ + +-#ifndef __OPTIMIZE__ +-STRUCT_ENTRY_TARGET * +-GET_TARGET(STRUCT_ENTRY *e) +-{ +- return (void *)e + e->target_offset; +-} +-#endif +- + static int sockfd = -1; + static void *arptc_fn = NULL; + +-- +2.35.1 + diff --git a/package/arptables/arptables.hash b/package/arptables/arptables.hash index 8366cea412f..8bc0f7fc2ce 100644 --- a/package/arptables/arptables.hash +++ b/package/arptables/arptables.hash @@ -1,5 +1,5 @@ # From http://ftp.netfilter.org/pub/arptables/arptables-0.0.5.tar.gz.sha256sum -sha256 4f9a0656ce5c90868f551cd4deeb2d04f33899667e1fb2818b64e432fe8f629c arptables-0.0.5.tar.gz +sha256 4f9a0656ce5c90868f551cd4deeb2d04f33899667e1fb2818b64e432fe8f629c arptables-0.0.5.tar.gz # Hash for license file -sha256 ebdb8ae564c952792017ec680e2edd30443642216eb9f8a3d8fa166c0cb628c1 COPYING +sha256 ebdb8ae564c952792017ec680e2edd30443642216eb9f8a3d8fa166c0cb628c1 COPYING diff --git a/package/ascii-invaders/ascii-invaders.hash b/package/ascii-invaders/ascii-invaders.hash index f08fc2a7daf..a95544a79cb 100644 --- a/package/ascii-invaders/ascii-invaders.hash +++ b/package/ascii-invaders/ascii-invaders.hash @@ -1,5 +1,5 @@ # Locally calculated -sha512 326708ffc2c277e04575920c58f6a267e0bf46f8d2a3dbca9b5c317fb01006d4f673ab35f92f292549cc52dbee4400a84c85478eb81b9bd7703689a705547bc7 ascii-invaders-1.0.1.tar.gz +sha512 326708ffc2c277e04575920c58f6a267e0bf46f8d2a3dbca9b5c317fb01006d4f673ab35f92f292549cc52dbee4400a84c85478eb81b9bd7703689a705547bc7 ascii-invaders-1.0.1.tar.gz # Hash for license file -sha512 1e455684996d7733b2f1ccd4606d034694d16ceff6ede6125d7f1537d20dabe05976cca4cef5cbf6c31352cbd62a515fd8e34a2ffb54dae1181c1116b24c6cf7 LICENSE +sha512 1e455684996d7733b2f1ccd4606d034694d16ceff6ede6125d7f1537d20dabe05976cca4cef5cbf6c31352cbd62a515fd8e34a2ffb54dae1181c1116b24c6cf7 LICENSE diff --git a/package/assimp/0001-code-disable-Werror.patch b/package/assimp/0001-code-disable-Werror.patch deleted file mode 100644 index 33867e61c3f..00000000000 --- a/package/assimp/0001-code-disable-Werror.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 5146e1c4d58174e302dbdcf2a85c2023be1cffc6 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Fri, 10 Dec 2021 15:15:30 +0100 -Subject: [PATCH] code: disable -Werror -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes: - - .../build/assimp-5.1.3/code/PostProcessing/TriangulateProcess.cpp:285:50: error: argument 1 value ‘4294967294’ exceeds maximum object size 2147483647 [-Werror=alloc-size-larger-than=] - 285 | std::unique_ptr done(new bool[max_out]); - | ^ - [...] - .../host/opt/ext-toolchain/powerpc-buildroot-linux-uclibc/include/c++/9.3.0/new:127:26: note: in a call to allocation function ‘void* operator new [](std::size_t)’ declared here - 127 | _GLIBCXX_NODISCARD void* operator new[](std::size_t) _GLIBCXX_THROW (std::bad_alloc) - | ^~~~~~~~ - -Signed-off-by: Peter Seiderer ---- - code/CMakeLists.txt | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt -index e45bf8a2a..f71b6583d 100644 ---- a/code/CMakeLists.txt -+++ b/code/CMakeLists.txt -@@ -1167,8 +1167,6 @@ TARGET_USE_COMMON_OUTPUT_DIRECTORY(assimp) - # enable warnings as errors ######################################## - IF (MSVC) - TARGET_COMPILE_OPTIONS(assimp PRIVATE /WX) --ELSE() -- TARGET_COMPILE_OPTIONS(assimp PRIVATE -Werror) - ENDIF() - - # adds C_FLAGS required to compile zip.c on old GCC 4.x compiler --- -2.34.1 - diff --git a/package/assimp/Config.in b/package/assimp/Config.in index 833e559a6fd..4bddb3598d8 100644 --- a/package/assimp/Config.in +++ b/package/assimp/Config.in @@ -2,8 +2,9 @@ config BR2_PACKAGE_ASSIMP bool "assimp" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR - depends on BR2_PACKAGE_LIBZLIB - depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 + select BR2_PACKAGE_ZLIB + select BR2_PACKAGE_ZLIB_FORCE_LIBZLIB help Open Asset Import Library (assimp) is a portable Open Source library to import various well-known 3D model formats in a @@ -13,12 +14,6 @@ config BR2_PACKAGE_ASSIMP http://www.assimp.org -comment "assimp needs a toolchain w/ C++, wchar" - depends on BR2_PACKAGE_LIBZLIB - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR - -comment "assimp needs libzlib" - depends on !BR2_PACKAGE_LIBZLIB - -comment "assimp needs exception_ptr" - depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 +comment "assimp needs a toolchain w/ C++, wchar, gcc >= 7" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 diff --git a/package/assimp/assimp.hash b/package/assimp/assimp.hash index 50f0b3e6d6f..86a90927edc 100644 --- a/package/assimp/assimp.hash +++ b/package/assimp/assimp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 52ad3a3776ce320c8add531dbcb2d3b93f2e1f10fcff5ac30178b09ba934d084 assimp-5.1.6.tar.gz +sha256 b5219e63ae31d895d60d98001ee5bb809fb2c7b2de1e7f78ceeb600063641e1a assimp-5.2.5.tar.gz sha256 147874443d242b4e2bae97036e26ec9d6b37f706174c1bd5ecfcc8c1294cef51 LICENSE diff --git a/package/assimp/assimp.mk b/package/assimp/assimp.mk index 766b2c9b5a3..0b6034fb8e8 100644 --- a/package/assimp/assimp.mk +++ b/package/assimp/assimp.mk @@ -4,10 +4,11 @@ # ################################################################################ -ASSIMP_VERSION = 5.1.6 +ASSIMP_VERSION = 5.2.5 ASSIMP_SITE = $(call github,assimp,assimp,v$(ASSIMP_VERSION)) ASSIMP_LICENSE = BSD-3-Clause ASSIMP_LICENSE_FILES = LICENSE +ASSIMP_CPE_ID_VENDOR = assimp ASSIMP_DEPENDENCIES = zlib ASSIMP_INSTALL_STAGING = YES @@ -38,6 +39,7 @@ ASSIMP_CXXFLAGS += -O0 endif ASSIMP_CONF_OPTS += -DASSIMP_BUILD_TESTS=OFF \ + -DASSIMP_WARNINGS_AS_ERRORS=OFF \ -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) $(ASSIMP_CXXFLAGS)" $(eval $(cmake-package)) diff --git a/package/asterisk/0006-main-iostream.c-fix-build-with-libressl.patch b/package/asterisk/0006-main-iostream.c-fix-build-with-libressl.patch new file mode 100644 index 00000000000..cdd3aa8cfb7 --- /dev/null +++ b/package/asterisk/0006-main-iostream.c-fix-build-with-libressl.patch @@ -0,0 +1,38 @@ +From 9569fa20fec49f530170a3042afb99556cf66a2e Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 17 Apr 2022 10:52:42 +0200 +Subject: [PATCH] main/iostream.c: fix build with libressl + +Fix the following build failure with libressl by using SSL_is_server +which is available since version 2.7.0 and +https://github.com/libressl-portable/openbsd/commit/d7ec516916c5eaac29b02d7a8ac6570f63b458f7: + +iostream.c: In function 'ast_iostream_close': +iostream.c:559:41: error: invalid use of incomplete typedef 'SSL' {aka 'struct ssl_st'} + 559 | if (!stream->ssl->server) { + | ^~ + +Fixes: + - http://autobuild.buildroot.org/results/ce4d62d00bb77ba5b303cacf6be7e350581a62f9 + +Signed-off-by: Fabrice Fontaine +--- + main/iostream.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/main/iostream.c b/main/iostream.c +index d060b6d6d4..b8ab80ec91 100644 +--- a/main/iostream.c ++++ b/main/iostream.c +@@ -553,7 +553,7 @@ int ast_iostream_close(struct ast_iostream *stream) + ERR_error_string(sslerr, err), ssl_error_to_string(sslerr, res)); + } + +-#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100000L) ++#if !(defined(LIBRESSL_VERSION_NUMBER) && (LIBRESSL_VERSION_NUMBER < 0x2070000L)) && (OPENSSL_VERSION_NUMBER >= 0x10100000L) + if (!SSL_is_server(stream->ssl)) { + #else + if (!stream->ssl->server) { +-- +2.35.1 + diff --git a/package/asterisk/asterisk.hash b/package/asterisk/asterisk.hash index eabe11e052b..41e1da29628 100644 --- a/package/asterisk/asterisk.hash +++ b/package/asterisk/asterisk.hash @@ -1,15 +1,15 @@ # Locally computed -sha256 1ba86666072b903e24b5cfef3d6d607d0d090c0fd232429ed410496e8f93ac40 asterisk-16.21.1.tar.gz +sha256 ef1ddc07dc02bb0c5f5ba58a5e42e42bcb63e55ac94199be8e3b5d3910f43736 asterisk-16.30.1.tar.gz # sha1 from: http://downloads.asterisk.org/pub/telephony/sounds/releases # sha256 locally computed -sha1 721c512feaea102700d5bdce952fdc0bb29dc640 asterisk-core-sounds-en-gsm-1.6.1.tar.gz +sha1 721c512feaea102700d5bdce952fdc0bb29dc640 asterisk-core-sounds-en-gsm-1.6.1.tar.gz sha256 d79c3d2044d41da8f363c447dfccc140be86b4fcc41b1ca5a60a80da52f24f2d asterisk-core-sounds-en-gsm-1.6.1.tar.gz -sha1 f40fd6ea03dfe8d72ada2540b2288bfdc006381d asterisk-moh-opsound-wav-2.03.tar.gz +sha1 f40fd6ea03dfe8d72ada2540b2288bfdc006381d asterisk-moh-opsound-wav-2.03.tar.gz sha256 449fb810d16502c3052fedf02f7e77b36206ac5a145f3dacf4177843a2fcb538 asterisk-moh-opsound-wav-2.03.tar.gz # License files, locally computed sha256 82af40ed7f49c08685360811993d9396320842f021df828801d733e8fdc0312f COPYING -sha256 ac5571f00e558e3b7c9b3f13f421b874cc12cf4250c4f70094c71544cf486312 main/sha1.c +sha256 3ce4755b8da872a0de93ecdbbe2f940763cc95c9027bbf3c4a2e914fcd8bf4c6 main/sha1.c sha256 6215e3ed73c3982a5c6701127d681ec0b9f1121ac78a28805bd93f93c3eb84c0 codecs/speex/speex_resampler.h sha256 ea69cc96ab8a779c180a362377caeada71926897d1b55b980f04d74ba5aaa388 utils/db1-ast/include/db.h diff --git a/package/asterisk/asterisk.mk b/package/asterisk/asterisk.mk index 0a26fb38ea6..4f1a80ba8be 100644 --- a/package/asterisk/asterisk.mk +++ b/package/asterisk/asterisk.mk @@ -4,7 +4,7 @@ # ################################################################################ -ASTERISK_VERSION = 16.21.1 +ASTERISK_VERSION = 16.30.1 # 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)) @@ -31,6 +31,7 @@ ASTERISK_AUTORECONF_OPTS = -Iautoconf -Ithird-party -Ithird-party/pjproject -Ith ASTERISK_DEPENDENCIES = \ host-asterisk \ + host-pkgconf \ jansson \ libcurl \ libedit \ @@ -115,8 +116,7 @@ ASTERISK_CONF_OPTS += --without-avcodec ASTERISK_CONF_OPTS += --without-spandsp ASTERISK_CONF_ENV = \ - ac_cv_file_bridges_bridge_softmix_include_hrirs_h=true \ - ac_cv_path_CONFIG_LIBXML2=$(STAGING_DIR)/usr/bin/xml2-config + ac_cv_file_bridges_bridge_softmix_include_hrirs_h=true # Uses __atomic_fetch_add_4 ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) @@ -247,7 +247,7 @@ ASTERISK_CONF_OPTS += --without-speex --without-speexdsp endif # asterisk needs an openssl-enabled libsrtp -ifeq ($(BR2_PACKAGE_LIBSRTP)$(BR2_PACKAGE_OPENSSL)x$(BR2_STATIC_LIBS),yyx) +ifeq ($(BR2_PACKAGE_LIBSRTP)$(BR2_PACKAGE_OPENSSL),yy) ASTERISK_DEPENDENCIES += libsrtp ASTERISK_CONF_OPTS += --with-srtp else @@ -314,8 +314,6 @@ HOST_ASTERISK_LICENSE_FILES = COPYING # so do not inherit the target setup. HOST_ASTERISK_AUTORECONF = NO -HOST_ASTERISK_CONF_ENV = CONFIG_LIBXML2=$(HOST_DIR)/bin/xml2-config - HOST_ASTERISK_CONF_OPTS = \ --without-newt \ --without-curses \ diff --git a/package/at-spi2-core/at-spi2-core.hash b/package/at-spi2-core/at-spi2-core.hash index e2cc403e71c..764e4c3661c 100644 --- a/package/at-spi2-core/at-spi2-core.hash +++ b/package/at-spi2-core/at-spi2-core.hash @@ -1,4 +1,4 @@ -# From http://ftp.acc.umu.se/pub/gnome/sources/at-spi2-core/2.36/at-spi2-core-2.36.0.sha256sum +# From https://download.gnome.org/sources/at-spi2-core/2.36/at-spi2-core-2.36.0.sha256sum sha256 88da57de0a7e3c60bc341a974a80fdba091612db3547c410d6deab039ca5c05a at-spi2-core-2.36.0.tar.xz # locally calculated diff --git a/package/at-spi2-core/at-spi2-core.mk b/package/at-spi2-core/at-spi2-core.mk index cf7fdd297c7..f0b019c0eda 100644 --- a/package/at-spi2-core/at-spi2-core.mk +++ b/package/at-spi2-core/at-spi2-core.mk @@ -7,7 +7,7 @@ AT_SPI2_CORE_VERSION_MAJOR = 2.36 AT_SPI2_CORE_VERSION = $(AT_SPI2_CORE_VERSION_MAJOR).0 AT_SPI2_CORE_SOURCE = at-spi2-core-$(AT_SPI2_CORE_VERSION).tar.xz -AT_SPI2_CORE_SITE = http://ftp.gnome.org/pub/gnome/sources/at-spi2-core/$(AT_SPI2_CORE_VERSION_MAJOR) +AT_SPI2_CORE_SITE = https://download.gnome.org/sources/at-spi2-core/$(AT_SPI2_CORE_VERSION_MAJOR) AT_SPI2_CORE_LICENSE = LGPL-2.1+ AT_SPI2_CORE_LICENSE_FILES = COPYING AT_SPI2_CORE_INSTALL_STAGING = YES diff --git a/package/at/at.hash b/package/at/at.hash index d4ad9aa436a..be3e82f9f0c 100644 --- a/package/at/at.hash +++ b/package/at/at.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 76990cbb6f4b9bfedb926637904fdcc0d4fa20b6596b9c932117a49a0624c684 at_3.2.4.orig.tar.gz +sha256 bb066b389d7c9bb9d84a35738032b85c30cba7d949f758192adc72c9477fd3b8 at_3.2.5.orig.tar.gz sha256 01dccc0975aa9ba1a9f83e7c5e04f16077353d3c72a0a759b8846ee7a5b2b616 Copyright sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 COPYING diff --git a/package/at/at.mk b/package/at/at.mk index 26c44f52877..ed38def337f 100644 --- a/package/at/at.mk +++ b/package/at/at.mk @@ -4,7 +4,7 @@ # ################################################################################ -AT_VERSION = 3.2.4 +AT_VERSION = 3.2.5 AT_SOURCE = at_$(AT_VERSION).orig.tar.gz AT_SITE = http://software.calhariz.com/at AT_DEPENDENCIES = $(if $(BR2_PACKAGE_FLEX),flex) host-bison host-flex diff --git a/package/atest/atest.hash b/package/atest/atest.hash index 8384f317912..e411a934e5b 100644 --- a/package/atest/atest.hash +++ b/package/atest/atest.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 91da5a6d4d0b0a8d4bae156a40e91a6dccf62863bfa7acae948efbbd2b4154ca atest-895b0183a89c15f5e2305a6795bb1667753cd3f0.tar.gz -sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING +sha256 91da5a6d4d0b0a8d4bae156a40e91a6dccf62863bfa7acae948efbbd2b4154ca atest-895b0183a89c15f5e2305a6795bb1667753cd3f0.tar.gz +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/atf/atf.hash b/package/atf/atf.hash index 49c235a6366..5b4bbeb8e22 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 2a15172ddf6386297734c9800c899e6e8dc16c5a03931dcf95a9ab321a24cfe4 COPYING +sha256 92bc64180135eea8fe84c91c9f894e678767764f6dbc8482021d4dde09857505 atf-0.21.tar.gz +sha256 2a15172ddf6386297734c9800c899e6e8dc16c5a03931dcf95a9ab321a24cfe4 COPYING diff --git a/package/atftp/atftp.hash b/package/atftp/atftp.hash index 6b0d9a5879c..b335456f339 100644 --- a/package/atftp/atftp.hash +++ b/package/atftp/atftp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 93c87a4fb18218414e008e01c995dadd231ba4c752d0f894b34416d1e6d3038a atftp-0.7.5.tar.gz +sha256 df2aa089c7670f9eab40e5598e5d2cb6a582dc5182926ea50b4d690e4e37f316 atftp-0.8.0.tar.gz sha256 86dc744860e6dfacfeba2f33fea908db03fe67c7e37a878285b7aae8e4596735 LICENSE diff --git a/package/atftp/atftp.mk b/package/atftp/atftp.mk index 70ef4c0faec..288501bc112 100644 --- a/package/atftp/atftp.mk +++ b/package/atftp/atftp.mk @@ -4,12 +4,14 @@ # ################################################################################ -ATFTP_VERSION = 0.7.5 +ATFTP_VERSION = 0.8.0 ATFTP_SITE = http://sourceforge.net/projects/atftp/files ATFTP_LICENSE = GPL-2.0+ ATFTP_LICENSE_FILES = LICENSE ATFTP_CPE_ID_VENDOR = atftp_project ATFTP_SELINUX_MODULES = tftp +# No configure in tarball +ATFTP_AUTORECONF = YES ATFTP_CONF_OPTS = --disable-libwrap --disable-mtftp # For static we need to explicitly link against libpthread ATFTP_LIBS = -lpthread @@ -27,8 +29,8 @@ else ATFTP_CONF_OPTS += --disable-libreadline endif -ifeq ($(BR2_PACKAGE_PCRE),y) -ATFTP_DEPENDENCIES += pcre +ifeq ($(BR2_PACKAGE_PCRE2),y) +ATFTP_DEPENDENCIES += pcre2 ATFTP_CONF_OPTS += --enable-libpcre else ATFTP_CONF_OPTS += --disable-libpcre diff --git a/package/atk/atk.hash b/package/atk/atk.hash index 2e7c3b5fec5..d8cd69ff1fc 100644 --- a/package/atk/atk.hash +++ b/package/atk/atk.hash @@ -1,5 +1,5 @@ -# From http://ftp.gnome.org/pub/gnome/sources/atk/2.36/atk-2.36.0.sha256sum -sha256 fb76247e369402be23f1f5c65d38a9639c1164d934e40f6a9cf3c9e96b652788 atk-2.36.0.tar.xz +# From http://ftp.gnome.org/pub/gnome/sources/atk/2.38/atk-2.38.0.sha256sum +sha256 ac4de2a4ef4bd5665052952fe169657e65e895c5057dffb3c2a810f6191a0c36 atk-2.38.0.tar.xz # Hash for license file sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING diff --git a/package/atk/atk.mk b/package/atk/atk.mk index dfeb4de8b2a..2820fb486df 100644 --- a/package/atk/atk.mk +++ b/package/atk/atk.mk @@ -4,7 +4,7 @@ # ################################################################################ -ATK_VERSION_MAJOR = 2.36 +ATK_VERSION_MAJOR = 2.38 ATK_VERSION = $(ATK_VERSION_MAJOR).0 ATK_SOURCE = atk-$(ATK_VERSION).tar.xz ATK_SITE = http://ftp.gnome.org/pub/gnome/sources/atk/$(ATK_VERSION_MAJOR) diff --git a/package/atkmm/Config.in b/package/atkmm/Config.in index aa58f8d593e..1f370356ea7 100644 --- a/package/atkmm/Config.in +++ b/package/atkmm/Config.in @@ -1,5 +1,5 @@ config BR2_PACKAGE_ATKMM - bool "atkmm" + bool "atkmm (latest)" depends on BR2_INSTALL_LIBSTDCPP # glibmm depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # libsigc depends on BR2_TOOLCHAIN_HAS_THREADS # atk/glibmm -> libglib2 diff --git a/package/atkmm/atkmm.hash b/package/atkmm/atkmm.hash index f965ad29cbd..08cf86b3df9 100644 --- a/package/atkmm/atkmm.hash +++ b/package/atkmm/atkmm.hash @@ -1,5 +1,5 @@ -# From http://ftp.gnome.org/pub/gnome/sources/atkmm/2.36/atkmm-2.36.1.sha256sum -sha256 e11324bfed1b6e330a02db25cecc145dca03fb0dff47f0710c85e317687da458 atkmm-2.36.1.tar.xz +# From https://download.gnome.org/sources/atkmm/2.36/atkmm-2.36.2.sha256sum +sha256 6f62dd99f746985e573605937577ccfc944368f606a71ca46342d70e1cdae079 atkmm-2.36.2.tar.xz # locally computed sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING.tools diff --git a/package/atkmm/atkmm.mk b/package/atkmm/atkmm.mk index 3bcb941c9fc..8afd0586437 100644 --- a/package/atkmm/atkmm.mk +++ b/package/atkmm/atkmm.mk @@ -5,9 +5,9 @@ ################################################################################ ATKMM_VERSION_MAJOR = 2.36 -ATKMM_VERSION = $(ATKMM_VERSION_MAJOR).1 +ATKMM_VERSION = $(ATKMM_VERSION_MAJOR).2 ATKMM_SOURCE = atkmm-$(ATKMM_VERSION).tar.xz -ATKMM_SITE = http://ftp.gnome.org/pub/gnome/sources/atkmm/$(ATKMM_VERSION_MAJOR) +ATKMM_SITE = https://download.gnome.org/sources/atkmm/$(ATKMM_VERSION_MAJOR) ATKMM_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) ATKMM_LICENSE_FILES = COPYING COPYING.tools ATKMM_INSTALL_STAGING = YES diff --git a/package/atkmm2_28/Config.in b/package/atkmm2_28/Config.in new file mode 100644 index 00000000000..2340465b203 --- /dev/null +++ b/package/atkmm2_28/Config.in @@ -0,0 +1,23 @@ +config BR2_PACKAGE_ATKMM2_28 + bool "atkmm (2.28.x)" + depends on BR2_INSTALL_LIBSTDCPP # glibmm + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 + depends on BR2_TOOLCHAIN_HAS_THREADS # atk/glibmm -> libglib2 + depends on BR2_USE_MMU # atk/glibmm -> libglib2 + depends on BR2_USE_WCHAR # atk/glibmm -> libglib2 + select BR2_PACKAGE_ATK + select BR2_PACKAGE_GLIBMM2_66 + select BR2_PACKAGE_LIBSIGC2 + + help + The atkmm package is a set of C++ bindings for Atk. + + This is the last version before the API and ABI change + introduced in 2.36.0 which requires C++17. + + http://www.gtkmm.org/ + +comment "atkmm (2.28.x) needs a toolchain w/ C++, wchar, threads, gcc >= 4.9" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_USE_WCHAR \ + || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/atkmm2_28/atkmm2_28.hash b/package/atkmm2_28/atkmm2_28.hash new file mode 100644 index 00000000000..776c9851b82 --- /dev/null +++ b/package/atkmm2_28/atkmm2_28.hash @@ -0,0 +1,5 @@ +# From https://download.gnome.org/sources/atkmm/2.28/atkmm-2.28.3.sha256sum +sha256 7c2088b486a909be8da2b18304e56c5f90884d1343c8da7367ea5cd3258b9969 atkmm-2.28.3.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 new file mode 100644 index 00000000000..dc57363cf53 --- /dev/null +++ b/package/atkmm2_28/atkmm2_28.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# atkmm2_28 +# +################################################################################ + +ATKMM2_28_VERSION_MAJOR = 2.28 +ATKMM2_28_VERSION = $(ATKMM2_28_VERSION_MAJOR).3 +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) +ATKMM2_28_LICENSE_FILES = COPYING COPYING.tools +ATKMM2_28_INSTALL_STAGING = YES +ATKMM2_28_DEPENDENCIES = atk glibmm2_66 libsigc2 host-pkgconf + +$(eval $(meson-package)) diff --git a/package/atop/atop.hash b/package/atop/atop.hash index 18ba42340c0..e42354739ab 100644 --- a/package/atop/atop.hash +++ b/package/atop/atop.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 ca48d2f17e071deead5e6e9cc9e388bf6a3270d695e61976b3794d4d927b5c4e atop-2.7.1.tar.gz +sha256 3b002cb9774a7d6b3e820451773ae5e909b5e725738c6f375f14d1c1976d9fba atop-2.8.0.tar.gz # Hash for license file: sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/atop/atop.mk b/package/atop/atop.mk index 8a0fcda33b1..04a554b474a 100644 --- a/package/atop/atop.mk +++ b/package/atop/atop.mk @@ -4,7 +4,7 @@ # ################################################################################ -ATOP_VERSION = 2.7.1 +ATOP_VERSION = 2.8.0 ATOP_SITE = http://www.atoptool.nl/download ATOP_LICENSE = GPL-2.0+ ATOP_LICENSE_FILES = COPYING diff --git a/package/aubio/aubio.hash b/package/aubio/aubio.hash index f484776c1bd..61957883273 100644 --- a/package/aubio/aubio.hash +++ b/package/aubio/aubio.hash @@ -1,5 +1,5 @@ # From https://aubio.org/pub/aubio-0.4.9.tar.bz2.sha256 -sha256 d48282ae4dab83b3dc94c16cf011bcb63835c1c02b515490e1883049c3d1f3da aubio-0.4.9.tar.bz2 +sha256 d48282ae4dab83b3dc94c16cf011bcb63835c1c02b515490e1883049c3d1f3da aubio-0.4.9.tar.bz2 # Hash for license file: -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/aubio/aubio.mk b/package/aubio/aubio.mk index b79beccd979..bfc627fa919 100644 --- a/package/aubio/aubio.mk +++ b/package/aubio/aubio.mk @@ -9,12 +9,19 @@ AUBIO_SITE = https://aubio.org/pub AUBIO_SOURCE = aubio-$(AUBIO_VERSION).tar.bz2 AUBIO_LICENSE = GPL-3.0+ AUBIO_LICENSE_FILES = COPYING +AUBIO_CPE_ID_VENDOR = aubio AUBIO_INSTALL_STAGING = YES +AUBIO_DEPENDENCIES = host-pkgconf AUBIO_CONF_OPTS = \ --disable-docs \ --disable-atlas +# The waf script bundled in aubio 0.4.9 is too old for python3.11 +# Similar issue with Jack: +# https://github.com/jackaudio/jack2/issues/898 +AUBIO_NEEDS_EXTERNAL_WAF = YES + # Add --notests for each build step to avoid running unit tests on the # build machine. AUBIO_WAF_OPTS = --notests diff --git a/package/audit/audit.mk b/package/audit/audit.mk index aa8ef515e68..77e7c240001 100644 --- a/package/audit/audit.mk +++ b/package/audit/audit.mk @@ -15,6 +15,13 @@ AUDIT_INSTALL_STAGING = YES AUDIT_CONF_OPTS = --without-python --without-python3 --disable-zos-remote +# src/libev has some assembly function that is not present in Thumb mode: +# Error: selected processor does not support `mcr p15,0,r3,c7,c10,5' in Thumb mode +# so, we desactivate Thumb mode +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +AUDIT_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" +endif + ifeq ($(BR2_PACKAGE_LIBCAP_NG),y) AUDIT_DEPENDENCIES += libcap-ng AUDIT_CONF_OPTS += --with-libcap-ng=yes diff --git a/package/autoconf-archive/autoconf-archive.hash b/package/autoconf-archive/autoconf-archive.hash index 79ee5ff68a7..ff7710dc2b6 100644 --- a/package/autoconf-archive/autoconf-archive.hash +++ b/package/autoconf-archive/autoconf-archive.hash @@ -1,4 +1,4 @@ # Computed locally -sha256 e8a6eb9d28ddcba8ffef3fa211653239e9bf239aba6a01a6b7cfc7ceaec69cbd autoconf-archive-2021.02.19.tar.xz +sha256 e07454f00d8cae7907bed42d0747798927809947684d94c37207a4d63a32f423 autoconf-archive-2022.09.03.tar.xz sha256 e6037104443f9a7829b2aa7c5370d0789a7bda3ca65a0b904cdc0c2e285d9195 COPYING sha256 23ed0b84fa023bfa33433b498192cd08a3bfb1f4864a8ed791a84f3eb48b2dd2 COPYING.EXCEPTION diff --git a/package/autoconf-archive/autoconf-archive.mk b/package/autoconf-archive/autoconf-archive.mk index bd4a09d96df..0ffdf61ddff 100644 --- a/package/autoconf-archive/autoconf-archive.mk +++ b/package/autoconf-archive/autoconf-archive.mk @@ -4,7 +4,7 @@ # ################################################################################ -AUTOCONF_ARCHIVE_VERSION = 2021.02.19 +AUTOCONF_ARCHIVE_VERSION = 2022.09.03 AUTOCONF_ARCHIVE_SOURCE = autoconf-archive-$(AUTOCONF_ARCHIVE_VERSION).tar.xz AUTOCONF_ARCHIVE_SITE = $(BR2_GNU_MIRROR)/autoconf-archive AUTOCONF_ARCHIVE_LICENSE = GPL-3.0+ with exception diff --git a/package/autossh/autossh.hash b/package/autossh/autossh.hash index 226003f89ea..aaed9681dd4 100644 --- a/package/autossh/autossh.hash +++ b/package/autossh/autossh.hash @@ -1,6 +1,6 @@ # From http://www.harding.motd.ca/autossh/autossh-1.4g.cksums -sha256 5fc3cee3361ca1615af862364c480593171d0c54ec156de79fc421e31ae21277 autossh-1.4g.tgz -sha1 bd88da0e296b8d85722ee9e7c314e9319e5b2db8 autossh-1.4g.tgz -md5 2b804bc1bf6d2f2afaa526d02df7c0a2 autossh-1.4g.tgz +sha256 5fc3cee3361ca1615af862364c480593171d0c54ec156de79fc421e31ae21277 autossh-1.4g.tgz +sha1 bd88da0e296b8d85722ee9e7c314e9319e5b2db8 autossh-1.4g.tgz +md5 2b804bc1bf6d2f2afaa526d02df7c0a2 autossh-1.4g.tgz # Locally computed -sha256 014ec5a85a8899d4ea0e0a886bb3fc4c72b4bbec6414093ba1fdac5b178c25b4 autossh.c +sha256 014ec5a85a8899d4ea0e0a886bb3fc4c72b4bbec6414093ba1fdac5b178c25b4 autossh.c diff --git a/package/avahi/S05avahi-setup.sh b/package/avahi/S05avahi-setup.sh index 90ccbceacc0..2f53a192e49 100644 --- a/package/avahi/S05avahi-setup.sh +++ b/package/avahi/S05avahi-setup.sh @@ -5,7 +5,7 @@ case "$1" in if [ ! -d /tmp/avahi-autoipd ]; then rm -rf /tmp/avahi-autoipd mkdir /tmp/avahi-autoipd - chown avahi.avahi /tmp/avahi-autoipd + chown avahi:avahi /tmp/avahi-autoipd fi ;; stop) ;; diff --git a/package/avahi/avahi.hash b/package/avahi/avahi.hash index cfc7ba020d9..3bf22f831dc 100644 --- a/package/avahi/avahi.hash +++ b/package/avahi/avahi.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 060309d7a333d38d951bc27598c677af1796934dbd98e1024e7ad8de798fedda avahi-0.8.tar.gz -sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 LICENSE +sha256 060309d7a333d38d951bc27598c677af1796934dbd98e1024e7ad8de798fedda avahi-0.8.tar.gz +sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 LICENSE diff --git a/package/avocado/Config.in b/package/avocado/Config.in new file mode 100644 index 00000000000..cd438350a4a --- /dev/null +++ b/package/avocado/Config.in @@ -0,0 +1,21 @@ +config BR2_PACKAGE_AVOCADO + bool "avocado" + depends on BR2_USE_WCHAR # python3 + depends on BR2_USE_MMU # python3 + depends on BR2_TOOLCHAIN_HAS_THREADS # python3 + depends on !BR2_STATIC_LIBS # python3 + select BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_BZIP2 + select BR2_PACKAGE_PYTHON3_PYEXPAT + select BR2_PACKAGE_PYTHON3_SQLITE + select BR2_PACKAGE_PYTHON3_XZ + select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime, pkg_resources + help + Avocado is an automated testing suite containing + tests for various subsystems. + + https://avocado-framework.readthedocs.io/ + +comment "avocado needs a toolchain w/ wchar, threads, dynamic library" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/avocado/avocado.hash b/package/avocado/avocado.hash new file mode 100644 index 00000000000..117d708611a --- /dev/null +++ b/package/avocado/avocado.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 bec1bfab821030f04306a93d2b2061a4a28db538873702f746d5bc050d92685b avocado-98.0.tar.gz +sha256 680ce56e9c4043826f0f1420935d2453ea3ddacd1582cb6f1cef26c1077fcc93 LICENSE diff --git a/package/avocado/avocado.mk b/package/avocado/avocado.mk new file mode 100644 index 00000000000..b308a37b376 --- /dev/null +++ b/package/avocado/avocado.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# avocado +# +################################################################################ + +AVOCADO_VERSION = 98.0 +AVOCADO_SITE = $(call github,avocado-framework,avocado,$(AVOCADO_VERSION)) +AVOCADO_SETUP_TYPE = setuptools +AVOCADO_LICENSE = GPL-2.0 +AVOCADO_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/package/avrdude/Config.in b/package/avrdude/Config.in index 89558a5ff5c..cbbd0766675 100644 --- a/package/avrdude/Config.in +++ b/package/avrdude/Config.in @@ -20,10 +20,10 @@ if BR2_PACKAGE_AVRDUDE config BR2_PACKAGE_AVRDUDE_SPI bool "SPI support" default y # Backward compatibility - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_6 + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8 -comment "SPI support needs a toolchain w/ linux headers >= 4.6" - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_6 +comment "SPI support needs a toolchain w/ linux headers >= 4.8" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8 endif diff --git a/package/avro-c/0001-cmake-Build-failure-without-a-C-compiler-again.patch b/package/avro-c/0001-cmake-Build-failure-without-a-C-compiler-again.patch deleted file mode 100644 index 8f7e59cf62e..00000000000 --- a/package/avro-c/0001-cmake-Build-failure-without-a-C-compiler-again.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 8f5633a29b083a84876c00b88fba6d3e8dbbf1a8 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 19 Jul 2020 09:35:09 +0200 -Subject: [PATCH] cmake: Build failure without a C++ compiler (again) - -avro-c fails to build (again) without a C++ compiler because commit -664c2fc7fba19709c1f974055f9cf4c8a799e108 reverted the change made by -commit 414a51fdc1856083bb16851f09a4c61a48796132 - -Fixes: - - http://autobuild.buildroot.org/results/cfa91db53cf5502cbb6f902d1e7ad6397c8d70fd - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://issues.apache.org/jira/browse/AVRO-2898] ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6c8d7aaf..aa923e18 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -17,7 +17,7 @@ - # under the License. - # - cmake_minimum_required(VERSION 3.1) --project(AvroC) -+project(AvroC C) - enable_testing() - - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}) --- -2.27.0 - diff --git a/package/avro-c/avro-c.hash b/package/avro-c/avro-c.hash index c4fd7d3f57b..b52a787ed55 100644 --- a/package/avro-c/avro-c.hash +++ b/package/avro-c/avro-c.hash @@ -1,5 +1,5 @@ -# From https://downloads.apache.org/avro/avro-1.10.0/c/avro-c-1.10.0.tar.gz.sha512 -sha512 2e64926b214fd996abf0553572ec6f46b312cf84df17149d1a7e89f4033b63cc34fabef62b98d727799a8a5d452ac9254e275bdea4bf894e9e1e4588bc5dfc9b avro-c-1.10.0.tar.gz +# From https://downloads.apache.org/avro/avro-1.11.1/c/avro-c-1.11.1.tar.gz.sha512 +sha512 e72e8c245a8b86326bc18a5d5127e9beeaceaf805e8a62760fd88d627e29954c750346485bb43822df408c8a172d910c27ddf7e3815bddbdb04d16c54d859323 avro-c-1.11.1.tar.gz # License files sha256 d62488d6ba17132e92c23c03c80bfedc848267f96ab36489fec860f76cf6819a LICENSE diff --git a/package/avro-c/avro-c.mk b/package/avro-c/avro-c.mk index ee6e864161e..f217c1d7ed7 100644 --- a/package/avro-c/avro-c.mk +++ b/package/avro-c/avro-c.mk @@ -4,7 +4,8 @@ # ################################################################################ -AVRO_C_VERSION = 1.10.0 +# When updating the version, please also update python-avro +AVRO_C_VERSION = 1.11.1 AVRO_C_SITE = https://www-eu.apache.org/dist/avro/avro-$(AVRO_C_VERSION)/c AVRO_C_LICENSE = Apache-2.0 AVRO_C_LICENSE_FILES = LICENSE diff --git a/package/azure-iot-sdk-c/0001-hmac-c-fix-mismatching-function-prototype.patch b/package/azure-iot-sdk-c/0001-hmac-c-fix-mismatching-function-prototype.patch deleted file mode 100644 index 0c262e6c465..00000000000 --- a/package/azure-iot-sdk-c/0001-hmac-c-fix-mismatching-function-prototype.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 3a7997af72e7a4f70109d1639e6725b39046443e Mon Sep 17 00:00:00 2001 -From: Francesco Giancane <30423178+fgiancane8@users.noreply.github.com> -Date: Fri, 2 Jul 2021 20:47:38 +0200 -Subject: [PATCH] hmac.c: fix mismatching function prototype (#537) - -The reported function raises a warning when compilers assert the flag -`-Warray-parameter=`, signaling that an array-type argument was promoted -to a pointer-type argument. - -While in practice in most C implementations this is correct, fixing the -warning (and, in this case, indicating the maximum size for the array) -would represent a best-practice for finding out-of-bound accesses or -identifying wrongly-sized arrays passed in the function. - -Signed-off-by: Francesco Giancane -[Retrieved from: -https://github.com/Azure/azure-c-shared-utility/commit/3a7997af72e7a4f70109d1639e6725b39046443e] -Signed-off-by: Fabrice Fontaine ---- - src/hmac.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/hmac.c b/src/hmac.c -index 53f2411f8..160af9d2f 100644 ---- a/c-utility/src/hmac.c -+++ b/c-utility/src/hmac.c -@@ -208,7 +208,7 @@ int hmacFinalBits(HMACContext *ctx, - * sha Error Code. - * - */ --int hmacResult(HMACContext *ctx, uint8_t *digest) -+int hmacResult(HMACContext *ctx, uint8_t digest[USHAMaxHashSize]) - { - if (!ctx) return shaNull; - 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 72fa99c44d8..187b90a35ac 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 987b469aa76d6c81e5dbcd62e81f4ece0620770930cf65722754c76aedd6049f azure-iot-sdk-c-LTS_01_2021_Ref01-br1.tar.gz +sha256 7c23506e5acd6f400982f6f7a053d494c83b8a709c449bb9ded07aff9cfada78 azure-iot-sdk-c-LTS_07_2022_Ref01-br1.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 e6de8c851b2..42fdd56b488 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_01_2021_Ref01 +AZURE_IOT_SDK_C_VERSION = LTS_07_2022_Ref01 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.hash b/package/b43-firmware/b43-firmware.hash index efc1a6cf0f7..0e61b6b5abd 100644 --- a/package/b43-firmware/b43-firmware.hash +++ b/package/b43-firmware/b43-firmware.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 f1e7067aac5b62b67b8b6e4c517990277804339ac16065eb13c731ff909ae46f broadcom-wl-5.100.138.tar.bz2 -sha256 26a8c370f48fc129d0731cfd751c36cae1419b0bc8ca35781126744e60eae009 broadcom-wl-5.10.56.27.3_mipsel.tar.bz2 +sha256 f1e7067aac5b62b67b8b6e4c517990277804339ac16065eb13c731ff909ae46f broadcom-wl-5.100.138.tar.bz2 +sha256 26a8c370f48fc129d0731cfd751c36cae1419b0bc8ca35781126744e60eae009 broadcom-wl-5.10.56.27.3_mipsel.tar.bz2 diff --git a/package/b43-fwcutter/b43-fwcutter.hash b/package/b43-fwcutter/b43-fwcutter.hash index e83a49711a6..9d125daa6cf 100644 --- a/package/b43-fwcutter/b43-fwcutter.hash +++ b/package/b43-fwcutter/b43-fwcutter.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 d6ea85310df6ae08e7f7e46d8b975e17fc867145ee249307413cfbe15d7121ce b43-fwcutter-019.tar.bz2 +sha256 d6ea85310df6ae08e7f7e46d8b975e17fc867145ee249307413cfbe15d7121ce b43-fwcutter-019.tar.bz2 # Hash for license file -sha256 6af9fc424d57f29b7e59b35e52d4a91aca80304506275f2c0c076317fc6eb583 COPYING +sha256 6af9fc424d57f29b7e59b35e52d4a91aca80304506275f2c0c076317fc6eb583 COPYING diff --git a/package/babeltrace2/babeltrace2.mk b/package/babeltrace2/babeltrace2.mk index eedfc72b8cf..2b2ab7db407 100644 --- a/package/babeltrace2/babeltrace2.mk +++ b/package/babeltrace2/babeltrace2.mk @@ -17,7 +17,7 @@ BABELTRACE2_DEPENDENCIES = libglib2 host-pkgconf # options for host packages, just build support for it # unconditionally. HOST_BABELTRACE2_DEPENDENCIES = host-libglib2 host-pkgconf host-elfutils -HOST_BABELTRACE2_CONF_OPTS += --enable-debug-info +HOST_BABELTRACE2_CONF_OPTS += --disable-man-pages --enable-debug-info ifeq ($(BR2_PACKAGE_ELFUTILS),y) BABELTRACE2_DEPENDENCIES += elfutils diff --git a/package/balena-engine/Config.in b/package/balena-engine/Config.in index f48f361dc2f..02f694515ec 100644 --- a/package/balena-engine/Config.in +++ b/package/balena-engine/Config.in @@ -6,7 +6,6 @@ config BR2_PACKAGE_BALENA_ENGINE depends on BR2_USE_MMU # util-linux select BR2_PACKAGE_CGROUPFS_MOUNT if !BR2_PACKAGE_SYSTEMD # runtime select BR2_PACKAGE_IPTABLES # runtime - select BR2_PACKAGE_SQLITE # runtime select BR2_PACKAGE_UTIL_LINUX # runtime select BR2_PACKAGE_UTIL_LINUX_BINARIES # runtime select BR2_PACKAGE_UTIL_LINUX_MOUNT # runtime diff --git a/package/balena-engine/balena-engine.hash b/package/balena-engine/balena-engine.hash index 3f632ef381a..6a92a40cc88 100644 --- a/package/balena-engine/balena-engine.hash +++ b/package/balena-engine/balena-engine.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 389282706562118608b6ac580e7beacd6a43f0bb3481c69fb1856bed9ac49b85 balena-engine-19.03.14.tar.gz +sha256 1482b64e35d5406be719e362647ed7d0599cf4eead7770247ebd972c4c85ede5 balena-engine-20.10.26.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/balena-engine/balena-engine.mk b/package/balena-engine/balena-engine.mk index b3eb2ca75b3..49d526a4653 100644 --- a/package/balena-engine/balena-engine.mk +++ b/package/balena-engine/balena-engine.mk @@ -4,52 +4,52 @@ # ################################################################################ -BALENA_ENGINE_VERSION = 19.03.14 +BALENA_ENGINE_VERSION = 20.10.26 BALENA_ENGINE_SITE = $(call github,balena-os,balena-engine,v$(BALENA_ENGINE_VERSION)) BALENA_ENGINE_LICENSE = Apache-2.0 BALENA_ENGINE_LICENSE_FILES = LICENSE -BALENA_ENGINE_DEPENDENCIES = host-pkgconf BALENA_ENGINE_GOMOD = github.com/docker/docker BALENA_ENGINE_LDFLAGS = \ - -X github.com/docker/cli/cli/version.Version=N/A \ - -X github.com/docker/cli/cli/version.GitCommit= \ - -X github.com/docker/cli/cli/version.BuildTime= \ + -X $(BALENA_ENGINE_GOMOD)/dockerversion.GitCommit= \ + -X $(BALENA_ENGINE_GOMOD)/dockerversion.Version=$(BALENA_ENGINE_VERSION) \ -X github.com/containerd/containerd/version.Version=N/A \ + -X github.com/docker/cli/cli/version.BuildTime= \ + -X github.com/docker/cli/cli/version.GitCommit= \ + -X github.com/docker/cli/cli/version.Version=N/A \ -X github.com/opencontainers/runc.version=N/A BALENA_ENGINE_TAGS = \ cgo \ - exclude_graphdriver_zfs \ - autogen \ - no_buildkit \ no_btrfs \ no_cri \ no_devmapper \ no_zfs \ exclude_disk_quota \ exclude_graphdriver_btrfs \ - exclude_graphdriver_devicemapper + exclude_graphdriver_devicemapper \ + exclude_graphdriver_zfs BALENA_ENGINE_BUILD_TARGETS = cmd/balena-engine +# create the go.mod file with language version go1.19 +# remove the conflicting vendor/modules.txt +# remove the conflicting vendor/archive (not allowed in go1.20) +# https://github.com/moby/moby/issues/44618#issuecomment-1343565705 +define BALENA_ENGINE_FIX_VENDORING + printf "module $(BALENA_ENGINE_GOMOD)\n\ngo 1.19\n" > $(@D)/go.mod + rm -f $(@D)/vendor/modules.txt + rm -rf $(@D)/vendor/archive +endef +BALENA_ENGINE_POST_EXTRACT_HOOKS += BALENA_ENGINE_FIX_VENDORING + ifeq ($(BR2_INIT_SYSTEMD),y) BALENA_ENGINE_DEPENDENCIES += systemd BALENA_ENGINE_TAGS += journald endif -define BALENA_ENGINE_RUN_AUTOGEN - cd $(@D) && \ - VERSION=$(BALENA_ENGINE_VERSION) \ - PKG_CONFIG=$(PKG_CONFIG_HOST_BINARY) \ - $(TARGET_MAKE_ENV) \ - $(SHELL) hack/make/.go-autogen -endef - -BALENA_ENGINE_POST_CONFIGURE_HOOKS += BALENA_ENGINE_RUN_AUTOGEN - define BALENA_ENGINE_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 644 $(@D)/contrib/init/systemd/balena-engine.service \ $(TARGET_DIR)/usr/lib/systemd/system/balena-engine.service @@ -64,35 +64,20 @@ endef define BALENA_ENGINE_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_POSIX_MQUEUE) $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUPS) - $(call KCONFIG_ENABLE_OPT,CONFIG_MEMCG) - $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_SCHED) - $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_FREEZER) - $(call KCONFIG_ENABLE_OPT,CONFIG_CPUSETS) - $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_DEVICE) - $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_CPUACCT) $(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_NET_NS) $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER) - $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_ADVANCED) - $(call KCONFIG_ENABLE_OPT,CONFIG_BRIDGE_NETFILTER) $(call KCONFIG_ENABLE_OPT,CONFIG_NF_CONNTRACK) $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XT_MATCH_ADDRTYPE) $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XT_MATCH_CONNTRACK) - $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XT_MATCH_IPVS) $(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_DUMMY) - $(call KCONFIG_ENABLE_OPT,CONFIG_MACVLAN) - $(call KCONFIG_ENABLE_OPT,CONFIG_VXLAN) $(call KCONFIG_ENABLE_OPT,CONFIG_VETH) - $(call KCONFIG_ENABLE_OPT,CONFIG_OVERLAY_FS) - $(call KCONFIG_ENABLE_OPT,CONFIG_KEYS) endef define BALENA_ENGINE_INSTALL_SYMLINK diff --git a/package/bandwidthd/Config.in b/package/bandwidthd/Config.in index 5a3529e0c43..e2a6f1acb11 100644 --- a/package/bandwidthd/Config.in +++ b/package/bandwidthd/Config.in @@ -36,6 +36,7 @@ config BR2_PACKAGE_BANDWIDTHD_POSTGRESQL bool "enable postgresql log target support" depends on !BR2_STATIC_LIBS depends on BR2_USE_WCHAR # postgresql + depends on !BR2_OPTIMIZE_FAST # postgresql select BR2_PACKAGE_POSTGRESQL help Enable support for logging the bandwidthd data to a remote @@ -46,6 +47,9 @@ config BR2_PACKAGE_BANDWIDTHD_POSTGRESQL comment "postgresql support needs a toolchain w/ dynamic library, wchar" depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR +comment "postgresql support can't be built with Optimize for fast" + depends on BR2_OPTIMIZE_FAST + config BR2_PACKAGE_BANDWIDTHD_SQLITE3 bool "enable sqlite3 log storage" select BR2_PACKAGE_SQLITE diff --git a/package/bash/0002-locale-fix-typo-local_shiftstates-vs.-locale_shiftst.patch b/package/bash/0002-locale-fix-typo-local_shiftstates-vs.-locale_shiftst.patch deleted file mode 100644 index 1636c180363..00000000000 --- a/package/bash/0002-locale-fix-typo-local_shiftstates-vs.-locale_shiftst.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 3d6b9e18506ad9daf4ec7b7d406b38d58ec88009 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 11 Mar 2021 20:48:36 +0100 -Subject: [PATCH] locale: fix typo local_shiftstates vs. locale_shiftstates -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes: - - locale.c:94:3: error: ‘local_shiftstates’ undeclared (first use in this function); did you mean ‘locale_shiftstates’? - 94 | local_shiftstates = 0; - | ^~~~~~~~~~~~~~~~~ - | locale_shiftstates - -Signed-off-by: Peter Seiderer ---- - locale.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/locale.c b/locale.c -index 17ccc58..d6dd95a 100644 ---- a/locale.c -+++ b/locale.c -@@ -91,7 +91,7 @@ set_default_locale () - #if defined (HANDLE_MULTIBYTE) - locale_shiftstates = mblen ((char *)NULL, 0); - #else -- local_shiftstates = 0; -+ locale_shiftstates = 0; - #endif - } - -@@ -117,7 +117,7 @@ set_default_locale_vars () - # if defined (HANDLE_MULTIBYTE) - locale_shiftstates = mblen ((char *)NULL, 0); - # else -- local_shiftstates = 0; -+ locale_shiftstates = 0; - # endif - - u32reset (); -@@ -226,7 +226,7 @@ set_locale_var (var, value) - # if defined (HANDLE_MULTIBYTE) - locale_shiftstates = mblen ((char *)NULL, 0); - # else -- local_shiftstates = 0; -+ locale_shiftstates = 0; - # endif - u32reset (); - return r; -@@ -250,7 +250,7 @@ set_locale_var (var, value) - #if defined (HANDLE_MULTIBYTE) - locale_shiftstates = mblen ((char *)NULL, 0); - #else -- local_shiftstates = 0; -+ locale_shiftstates = 0; - #endif - u32reset (); - } -@@ -391,7 +391,7 @@ reset_locale_vars () - # if defined (HANDLE_MULTIBYTE) - locale_shiftstates = mblen ((char *)NULL, 0); - # else -- local_shiftstates = 0; -+ locale_shiftstates = 0; - # endif - u32reset (); - #endif --- -2.30.1 - 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 new file mode 100644 index 00000000000..d330de5cd42 --- /dev/null +++ b/package/bash/0002-parse.y-fix-compilation-for-non-multibyte-builds.patch @@ -0,0 +1,63 @@ +From 0217fc2816e47ee296472df71d1011f0eb2937e6 Mon Sep 17 00:00:00 2001 +From: Vincent Fazio +Date: Fri, 27 Jan 2023 14:37:26 -0600 +Subject: [PATCH] parse.y: fix compilation for non-multibyte builds + +Builds configured with --disable-multibyte or when the toolchain does +not have WCHAR support would encounter a compile error due to an +undeclared reference to shell_input_line_property in shell_getc. + +Add a HANDLE_MULTIBYTE guard to conditionally compile the block that +references shell_input_line_property in shell_getc as it's only declared +when HANDLE_MULTIBYTE is defined. + +Signed-off-by: Vincent Fazio +[Upstream status: https://savannah.gnu.org/patch/index.php?10309] +--- + parse.y | 2 ++ + y.tab.c | 2 ++ + 2 files changed, 4 insertions(+) + +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: + 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. */ ++#if defined (HANDLE_MULTIBYTE) + if (shell_input_line_index == shell_input_line_len && last_shell_getc_is_singlebyte == 0) + { + #if 0 +@@ -2638,6 +2639,7 @@ next_alias_char: + shell_input_line_property[shell_input_line_index - 1] = 1; + #endif + } ++#endif /* HANDLE_MULTIBYTE */ + return ' '; /* END_ALIAS */ + } + #endif +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: + 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. */ ++#if defined (HANDLE_MULTIBYTE) + if (shell_input_line_index == shell_input_line_len && last_shell_getc_is_singlebyte == 0) + { + #if 0 +@@ -4949,6 +4950,7 @@ next_alias_char: + shell_input_line_property[shell_input_line_index - 1] = 1; + #endif + } ++#endif /* HANDLE_MULTIBYTE */ + return ' '; /* END_ALIAS */ + } + #endif +-- +2.25.1 + diff --git a/package/bash/0003-configure-invert-condition-for-strtoimax-builtin.patch b/package/bash/0003-configure-invert-condition-for-strtoimax-builtin.patch new file mode 100644 index 00000000000..c412dcfce26 --- /dev/null +++ b/package/bash/0003-configure-invert-condition-for-strtoimax-builtin.patch @@ -0,0 +1,62 @@ +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/0003-glob-fix-dequote_pathname-vs.-udequote_pathname.patch b/package/bash/0003-glob-fix-dequote_pathname-vs.-udequote_pathname.patch deleted file mode 100644 index a801f68236c..00000000000 --- a/package/bash/0003-glob-fix-dequote_pathname-vs.-udequote_pathname.patch +++ /dev/null @@ -1,40 +0,0 @@ -From a60ab1e5e88863acf9b0e9bcaa7919bbf093da05 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 11 Mar 2021 20:55:52 +0100 -Subject: [PATCH] glob: fix dequote_pathname vs. udequote_pathname -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes: - - glob.c:123:28: error: static declaration of ‘udequote_pathname’ follows non-static declaration - 123 | # define dequote_pathname udequote_pathname - | ^~~~~~~~~~~~~~~~~ - glob.c:125:13: note: in expansion of macro ‘dequote_pathname’ - 125 | static void dequote_pathname PARAMS((char *)); - | ^~~~~~~~~~~~~~~~ - glob.c:118:6: note: previous declaration of ‘udequote_pathname’ was here - 118 | void udequote_pathname PARAMS((char *)); - | ^~~~~~~~~~~~~~~~~ - -Signed-off-by: Peter Seiderer ---- - lib/glob/glob.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/lib/glob/glob.c b/lib/glob/glob.c -index eb6277f..c903b15 100644 ---- a/lib/glob/glob.c -+++ b/lib/glob/glob.c -@@ -117,6 +117,5 @@ static int mbskipname PARAMS((char *, char *, int)); - #else - # define dequote_pathname udequote_pathname - #endif --static void dequote_pathname PARAMS((char *)); - static int glob_testdir PARAMS((char *, int)); - static char **glob_dir_to_array PARAMS((char *, char **, int)); - --- -2.30.1 - diff --git a/package/bash/bash.hash b/package/bash/bash.hash index 4660e9d38a9..e0a1ebac916 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.1.16.tar.gz.sig -sha256 5bac17218d3911834520dad13cd1f85ab944e1c09ae1aba55906be1f8192f558 bash-5.1.16.tar.gz +# https://ftp.gnu.org/gnu/bash/bash-5.2.15.tar.gz.sig +sha256 13720965b5f4fc3a0d4b61dd37e7565c741da9a5be24edc2ae00182fc1b3588c bash-5.2.15.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/bash/bash.mk b/package/bash/bash.mk index 3aca22898e7..9a73ed8c367 100644 --- a/package/bash/bash.mk +++ b/package/bash/bash.mk @@ -4,7 +4,7 @@ # ################################################################################ -BASH_VERSION = 5.1.16 +BASH_VERSION = 5.2.15 BASH_SITE = $(BR2_GNU_MIRROR)/bash BASH_DEPENDENCIES = ncurses readline host-bison BASH_LICENSE = GPL-3.0+ @@ -62,10 +62,10 @@ endif # Add /bin/bash to /etc/shells otherwise some login tools like dropbear # can reject the user connection. See man shells. -define BASH_ADD_MKSH_TO_SHELLS +define BASH_ADD_BASH_TO_SHELLS grep -qsE '^/bin/bash$$' $(TARGET_DIR)/etc/shells \ || echo "/bin/bash" >> $(TARGET_DIR)/etc/shells endef -BASH_TARGET_FINALIZE_HOOKS += BASH_ADD_MKSH_TO_SHELLS +BASH_TARGET_FINALIZE_HOOKS += BASH_ADD_BASH_TO_SHELLS $(eval $(autotools-package)) diff --git a/package/batman-adv/Config.in b/package/batman-adv/Config.in index eae94fd1308..b1fe5b3f284 100644 --- a/package/batman-adv/Config.in +++ b/package/batman-adv/Config.in @@ -27,11 +27,10 @@ config BR2_PACKAGE_BATMAN_ADV_NC 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 (experimental)" + bool "enable B.A.T.M.A.N. V protocol" + default y help Enables B.A.T.M.A.N. V network protocol. - This is the next-gen protocol and is experimental at this - time. https://www.open-mesh.org/projects/batman-adv/wiki/BATMAN_V diff --git a/package/batman-adv/batman-adv.hash b/package/batman-adv/batman-adv.hash index c0986637393..14a92c231ae 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/releases/batman-adv-2021.4/batman-adv-2021.4.tar.gz.sha1 -sha1 80a3e4d763b6bf35db6e561ed9d6775dc874d7c6 batman-adv-2021.4.tar.gz +# From https://downloads.open-mesh.org/batman/releases/batman-adv-2022.2/batman-adv-2022.2.tar.gz.sha1 +sha1 e1829e10fc37ea674a20cb9ba1d6c1483042fbfa batman-adv-2022.2.tar.gz # Hash for license files -sha256 cff7a2f160045fd0dbf1f1cd7e35e93bf489e81cb8b9501b3756daa391f3eb1b batman-adv-2021.4.tar.gz +sha256 218ffb534fead1c9b5b0d90ec1b2fba688209cdf00e861bece1cbf469fe69953 batman-adv-2022.3.tar.gz sha256 cecbf53d1148e13256ac29f8b900655b7fc8dc12d59939a95bc2323ea1747025 LICENSES/preferred/GPL-2.0 sha256 323c587d0ccf10e376f8bf9a7f31fb4ca6078105194b42e0b1e0ee2bc9bde71f LICENSES/preferred/MIT diff --git a/package/batman-adv/batman-adv.mk b/package/batman-adv/batman-adv.mk index 838f9b1851d..75b8292ee1b 100644 --- a/package/batman-adv/batman-adv.mk +++ b/package/batman-adv/batman-adv.mk @@ -4,7 +4,7 @@ # ################################################################################ -BATMAN_ADV_VERSION = 2021.4 +BATMAN_ADV_VERSION = 2022.3 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 @@ -35,6 +35,7 @@ define BATMAN_ADV_CONFIGURE_CMDS endef define BATMAN_ADV_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_CRC16) $(call KCONFIG_ENABLE_OPT,CONFIG_LIBCRC32C) endef diff --git a/package/bats-core/bats-core.hash b/package/bats-core/bats-core.hash index 369cc703d49..81c0229af4a 100644 --- a/package/bats-core/bats-core.hash +++ b/package/bats-core/bats-core.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 bff517da043ae24440ec8272039f396c2a7907076ac67693c0f18d4a17c08f7d bats-core-1.4.1.tar.gz +sha256 0f2df311a536e625a72bff64c838e67c7b5032e6ea9edcdf32758303062b2f3b bats-core-1.8.2.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 181d4eb0331..e172445930c 100644 --- a/package/bats-core/bats-core.mk +++ b/package/bats-core/bats-core.mk @@ -4,7 +4,7 @@ # ################################################################################ -BATS_CORE_VERSION = 1.4.1 +BATS_CORE_VERSION = 1.8.2 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/bayer2rgb-neon/0001-add-some-_always_inline_-annotations.patch b/package/bayer2rgb-neon/0001-add-some-_always_inline_-annotations.patch new file mode 100644 index 00000000000..281f90c8752 --- /dev/null +++ b/package/bayer2rgb-neon/0001-add-some-_always_inline_-annotations.patch @@ -0,0 +1,75 @@ +From 4e5d8be1b0d18453b76fca2c5139222a071dd207 Mon Sep 17 00:00:00 2001 +From: Enrico Scholz +Date: Mon, 4 Jul 2022 12:05:30 +0200 +Subject: [PATCH] add some _always_inline_ annotations + +enforce inlining to fix build errors with '-Og' + +fixes #1 + +Signed-off-by: Enrico Scholz +[Retrieved from: +https://gitlab-ext.sigma-chemnitz.de/ensc/bayer2rgb/-/commit/4e5d8be1b0d18453b76fca2c5139222a071dd207] +Signed-off-by: Fabrice Fontaine +--- + src/convert.c | 5 +++-- + src/main.c | 5 +++-- + 2 files changed, 6 insertions(+), 4 deletions(-) + +diff --git a/src/convert.c b/src/convert.c +index c852a14..ec77040 100644 +--- a/src/convert.c ++++ b/src/convert.c +@@ -17,8 +17,9 @@ + #include + #include + #include "bayer2rgb.h" ++#include "compiler.h" + +-static bool have_neon() ++inline static _always_inline_ bool have_neon() + { + #ifdef HAVE_NEON + return true; +@@ -27,7 +28,7 @@ static bool have_neon() + #endif + } + +-static bool have_cplusplus() ++inline static _always_inline_ bool have_cplusplus() + { + #ifdef HAVE_CPLUSPLUS + return true; +diff --git a/src/main.c b/src/main.c +index 841a142..087e8e5 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -33,6 +33,7 @@ + + #include "src/bayer2rgb.h" + #include "src/bayer2rgb-cmdline.h" ++#include "src/compiler.h" + + #define BPP_TO_BYTE(_bpp) (((_bpp) + 7) / 8) + +@@ -68,7 +69,7 @@ struct x_image_out { + size_t total_size; + }; + +-inline static bool have_neon(void) ++inline static _always_inline_ bool have_neon(void) + { + #ifdef HAVE_NEON + return true; +@@ -77,7 +78,7 @@ inline static bool have_neon(void) + #endif + } + +-static bool have_cplusplus() ++inline static _always_inline_ bool have_cplusplus() + { + #ifdef HAVE_CPLUSPLUS + return true; +-- +GitLab + diff --git a/package/bc/bc.hash b/package/bc/bc.hash index 6feca831d26..a2565a2b5fd 100644 --- a/package/bc/bc.hash +++ b/package/bc/bc.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 62adfca89b0a1c0164c2cdca59ca210c1d44c3ffc46daf9931cf4942664cb02a bc-1.07.1.tar.gz -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING -sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING.LIB +sha256 62adfca89b0a1c0164c2cdca59ca210c1d44c3ffc46daf9931cf4942664cb02a bc-1.07.1.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING.LIB diff --git a/package/bcache-tools/bcache-tools.hash b/package/bcache-tools/bcache-tools.hash index d80ec44a736..7548c4aabcc 100644 --- a/package/bcache-tools/bcache-tools.hash +++ b/package/bcache-tools/bcache-tools.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d56923936f37287efc57a46315679102ef2c86cd0be5874590320acd48c1201c bcache-tools-1.0.8.tar.gz -sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING +sha256 d56923936f37287efc57a46315679102ef2c86cd0be5874590320acd48c1201c bcache-tools-1.0.8.tar.gz +sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/package/bcg729/bcg729.hash b/package/bcg729/bcg729.hash index 4dbfbbbbb2c..2eb80a0407b 100644 --- a/package/bcg729/bcg729.hash +++ b/package/bcg729/bcg729.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 94b3542a06cbd96306efc19f959f9febae62806a22599063f82a8c33e989d48b bcg729-1.0.4.tar.gz -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING +sha256 68599a850535d1b182932b3f86558ac8a76d4b899a548183b062956c5fdc916d bcg729-1.1.1.tar.gz +sha256 1b3782ccad7b8614100cda30d3faf42fc39f2e97932908c543005053b654ca68 LICENSE.txt diff --git a/package/bcg729/bcg729.mk b/package/bcg729/bcg729.mk index 426cfd90af3..f89e5355462 100644 --- a/package/bcg729/bcg729.mk +++ b/package/bcg729/bcg729.mk @@ -4,10 +4,10 @@ # ################################################################################ -BCG729_VERSION = 1.0.4 +BCG729_VERSION = 1.1.1 BCG729_SITE = $(call github,BelledonneCommunications,bcg729,$(BCG729_VERSION)) -BCG729_LICENSE = GPL-2.0+ -BCG729_LICENSE_FILES = COPYING +BCG729_LICENSE = GPL-3.0+ +BCG729_LICENSE_FILES = LICENSE.txt BCG729_INSTALL_STAGING = YES ifeq ($(BR2_STATIC_LIBS),y) diff --git a/package/bcusdk/bcusdk.mk b/package/bcusdk/bcusdk.mk index ff5becd84ba..f14b23c7cc9 100644 --- a/package/bcusdk/bcusdk.mk +++ b/package/bcusdk/bcusdk.mk @@ -21,9 +21,12 @@ BCUSDK_CONF_OPTS = \ --without-pth-test \ --with-pth=$(STAGING_DIR)/usr -BCUSDK_DEPENDENCIES = \ - libpthsem \ - $(if $(BR2_PACKAGE_ARGP_STANDALONE),argp-standalone) +BCUSDK_DEPENDENCIES = libpthsem + +ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y) +BCUSDK_DEPENDENCIES += argp-standalone $(TARGET_NLS_DEPENDENCIES) +BCUSDK_CONF_ENV += LIBS=$(TARGET_NLS_LIBS) +endif define BCUSDK_REMOVE_EXAMPLES $(RM) -rf $(TARGET_DIR)/usr/share/bcusdk diff --git a/package/bdwgc/Config.in b/package/bdwgc/Config.in index aad2bc9ef2e..1124ab0f601 100644 --- a/package/bdwgc/Config.in +++ b/package/bdwgc/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_BDWGC bool "bdwgc" + depends on BR2_USE_MMU # madvise() depends on BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS select BR2_PACKAGE_LIBATOMIC_OPS help diff --git a/package/bdwgc/bdwgc.hash b/package/bdwgc/bdwgc.hash index d0459969b58..917089da088 100644 --- a/package/bdwgc/bdwgc.hash +++ b/package/bdwgc/bdwgc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 3b4914abc9fa76593596773e4da671d7ed4d5390e3d46fbf2e5f155e121bea11 gc-8.0.6.tar.gz -sha256 0aab7a56a92ed878c4a5464cf282d65f38bcdee64fe9cf213e26254bddb3f340 README.QUICK +sha256 f30107bcb062e0920a790ffffa56d9512348546859364c23a14be264b38836a0 gc-8.2.2.tar.gz +sha256 a9b077aeb4e9e1aaf9742119d8023ef26f52f445cdc3f60d390bf59e1647f54a README.QUICK diff --git a/package/bdwgc/bdwgc.mk b/package/bdwgc/bdwgc.mk index d1c9d4dfdc0..e776fb74583 100644 --- a/package/bdwgc/bdwgc.mk +++ b/package/bdwgc/bdwgc.mk @@ -4,7 +4,7 @@ # ################################################################################ -BDWGC_VERSION = 8.0.6 +BDWGC_VERSION = 8.2.2 BDWGC_SOURCE = gc-$(BDWGC_VERSION).tar.gz BDWGC_SITE = https://github.com/ivmai/bdwgc/releases/download/v$(BDWGC_VERSION) BDWGC_INSTALL_STAGING = YES @@ -21,6 +21,9 @@ endif ifeq ($(BR2_STATIC_LIBS),y) BDWGC_CFLAGS_EXTRA += -DGC_NO_DLOPEN endif +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS_NPTL),) +BDWGC_CFLAGS_EXTRA += -DNO_PTHREAD_GETATTR_NP +endif # Ensure we use the system libatomic_ops, and not the internal one. BDWGC_CONF_OPTS += --with-libatomic-ops=yes diff --git a/package/bearssl/0001-Fix-missing-objdir-dependency.patch b/package/bearssl/0001-Fix-missing-objdir-dependency.patch new file mode 100644 index 00000000000..4d4d9ee7052 --- /dev/null +++ b/package/bearssl/0001-Fix-missing-objdir-dependency.patch @@ -0,0 +1,1252 @@ +From 6fddb4056e0b8f72c2602ef82dcd973704354962 Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Mon, 12 Dec 2022 10:12:58 -0700 +Subject: [PATCH] Fix missing objdir dependency. + +Make targets within $(OBJDIR) must depend on the $(OBJDIR) +target. + +Fixes: +Assembler messages: +Fatal error: can't create build/obj/x509_minimal_full.o: No such file or directory +make[2]: *** [mk/Rules.mk:1190: build/obj/x509_minimal_full.o] Error 1 shuffle=reverse + +Signed-off-by: James Hilliard +Cc: Thomas Pornin +Cc: Thomas Pornin +[Upstream status: emailed patch to maintainer] +--- + mk/Rules.mk | 594 +++++++++++++++++++++++++------------------------- + mk/mkrules.sh | 8 +- + 2 files changed, 301 insertions(+), 301 deletions(-) + +diff --git a/mk/Rules.mk b/mk/Rules.mk +index b480bd6..a868977 100644 +--- a/mk/Rules.mk ++++ b/mk/Rules.mk +@@ -358,893 +358,893 @@ $(TESTSPEED): $(BEARSSLLIB) $(OBJTESTSPEED) + $(TESTX509): $(BEARSSLLIB) $(OBJTESTX509) + $(LD) $(LDFLAGS) $(LDOUT)$(TESTX509) $(OBJTESTX509) $(BEARSSLLIB) + +-$(OBJDIR)$Psettings$O: src$Psettings.c $(HEADERSPRIV) ++$(OBJDIR)$Psettings$O: $(OBJDIR) src$Psettings.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Psettings$O src$Psettings.c + +-$(OBJDIR)$Pccm$O: src$Paead$Pccm.c $(HEADERSPRIV) ++$(OBJDIR)$Pccm$O: $(OBJDIR) src$Paead$Pccm.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pccm$O src$Paead$Pccm.c + +-$(OBJDIR)$Peax$O: src$Paead$Peax.c $(HEADERSPRIV) ++$(OBJDIR)$Peax$O: $(OBJDIR) src$Paead$Peax.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Peax$O src$Paead$Peax.c + +-$(OBJDIR)$Pgcm$O: src$Paead$Pgcm.c $(HEADERSPRIV) ++$(OBJDIR)$Pgcm$O: $(OBJDIR) src$Paead$Pgcm.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pgcm$O src$Paead$Pgcm.c + +-$(OBJDIR)$Pccopy$O: src$Pcodec$Pccopy.c $(HEADERSPRIV) ++$(OBJDIR)$Pccopy$O: $(OBJDIR) src$Pcodec$Pccopy.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pccopy$O src$Pcodec$Pccopy.c + +-$(OBJDIR)$Pdec16be$O: src$Pcodec$Pdec16be.c $(HEADERSPRIV) ++$(OBJDIR)$Pdec16be$O: $(OBJDIR) src$Pcodec$Pdec16be.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdec16be$O src$Pcodec$Pdec16be.c + +-$(OBJDIR)$Pdec16le$O: src$Pcodec$Pdec16le.c $(HEADERSPRIV) ++$(OBJDIR)$Pdec16le$O: $(OBJDIR) src$Pcodec$Pdec16le.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdec16le$O src$Pcodec$Pdec16le.c + +-$(OBJDIR)$Pdec32be$O: src$Pcodec$Pdec32be.c $(HEADERSPRIV) ++$(OBJDIR)$Pdec32be$O: $(OBJDIR) src$Pcodec$Pdec32be.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdec32be$O src$Pcodec$Pdec32be.c + +-$(OBJDIR)$Pdec32le$O: src$Pcodec$Pdec32le.c $(HEADERSPRIV) ++$(OBJDIR)$Pdec32le$O: $(OBJDIR) src$Pcodec$Pdec32le.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdec32le$O src$Pcodec$Pdec32le.c + +-$(OBJDIR)$Pdec64be$O: src$Pcodec$Pdec64be.c $(HEADERSPRIV) ++$(OBJDIR)$Pdec64be$O: $(OBJDIR) src$Pcodec$Pdec64be.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdec64be$O src$Pcodec$Pdec64be.c + +-$(OBJDIR)$Pdec64le$O: src$Pcodec$Pdec64le.c $(HEADERSPRIV) ++$(OBJDIR)$Pdec64le$O: $(OBJDIR) src$Pcodec$Pdec64le.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdec64le$O src$Pcodec$Pdec64le.c + +-$(OBJDIR)$Penc16be$O: src$Pcodec$Penc16be.c $(HEADERSPRIV) ++$(OBJDIR)$Penc16be$O: $(OBJDIR) src$Pcodec$Penc16be.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Penc16be$O src$Pcodec$Penc16be.c + +-$(OBJDIR)$Penc16le$O: src$Pcodec$Penc16le.c $(HEADERSPRIV) ++$(OBJDIR)$Penc16le$O: $(OBJDIR) src$Pcodec$Penc16le.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Penc16le$O src$Pcodec$Penc16le.c + +-$(OBJDIR)$Penc32be$O: src$Pcodec$Penc32be.c $(HEADERSPRIV) ++$(OBJDIR)$Penc32be$O: $(OBJDIR) src$Pcodec$Penc32be.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Penc32be$O src$Pcodec$Penc32be.c + +-$(OBJDIR)$Penc32le$O: src$Pcodec$Penc32le.c $(HEADERSPRIV) ++$(OBJDIR)$Penc32le$O: $(OBJDIR) src$Pcodec$Penc32le.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Penc32le$O src$Pcodec$Penc32le.c + +-$(OBJDIR)$Penc64be$O: src$Pcodec$Penc64be.c $(HEADERSPRIV) ++$(OBJDIR)$Penc64be$O: $(OBJDIR) src$Pcodec$Penc64be.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Penc64be$O src$Pcodec$Penc64be.c + +-$(OBJDIR)$Penc64le$O: src$Pcodec$Penc64le.c $(HEADERSPRIV) ++$(OBJDIR)$Penc64le$O: $(OBJDIR) src$Pcodec$Penc64le.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Penc64le$O src$Pcodec$Penc64le.c + +-$(OBJDIR)$Ppemdec$O: src$Pcodec$Ppemdec.c $(HEADERSPRIV) ++$(OBJDIR)$Ppemdec$O: $(OBJDIR) src$Pcodec$Ppemdec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Ppemdec$O src$Pcodec$Ppemdec.c + +-$(OBJDIR)$Ppemenc$O: src$Pcodec$Ppemenc.c $(HEADERSPRIV) ++$(OBJDIR)$Ppemenc$O: $(OBJDIR) src$Pcodec$Ppemenc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Ppemenc$O src$Pcodec$Ppemenc.c + +-$(OBJDIR)$Pec_all_m15$O: src$Pec$Pec_all_m15.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_all_m15$O: $(OBJDIR) src$Pec$Pec_all_m15.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_all_m15$O src$Pec$Pec_all_m15.c + +-$(OBJDIR)$Pec_all_m31$O: src$Pec$Pec_all_m31.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_all_m31$O: $(OBJDIR) src$Pec$Pec_all_m31.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_all_m31$O src$Pec$Pec_all_m31.c + +-$(OBJDIR)$Pec_c25519_i15$O: src$Pec$Pec_c25519_i15.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_c25519_i15$O: $(OBJDIR) src$Pec$Pec_c25519_i15.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_c25519_i15$O src$Pec$Pec_c25519_i15.c + +-$(OBJDIR)$Pec_c25519_i31$O: src$Pec$Pec_c25519_i31.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_c25519_i31$O: $(OBJDIR) src$Pec$Pec_c25519_i31.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_c25519_i31$O src$Pec$Pec_c25519_i31.c + +-$(OBJDIR)$Pec_c25519_m15$O: src$Pec$Pec_c25519_m15.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_c25519_m15$O: $(OBJDIR) src$Pec$Pec_c25519_m15.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_c25519_m15$O src$Pec$Pec_c25519_m15.c + +-$(OBJDIR)$Pec_c25519_m31$O: src$Pec$Pec_c25519_m31.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_c25519_m31$O: $(OBJDIR) src$Pec$Pec_c25519_m31.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_c25519_m31$O src$Pec$Pec_c25519_m31.c + +-$(OBJDIR)$Pec_curve25519$O: src$Pec$Pec_curve25519.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_curve25519$O: $(OBJDIR) src$Pec$Pec_curve25519.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_curve25519$O src$Pec$Pec_curve25519.c + +-$(OBJDIR)$Pec_default$O: src$Pec$Pec_default.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_default$O: $(OBJDIR) src$Pec$Pec_default.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_default$O src$Pec$Pec_default.c + +-$(OBJDIR)$Pec_keygen$O: src$Pec$Pec_keygen.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_keygen$O: $(OBJDIR) src$Pec$Pec_keygen.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_keygen$O src$Pec$Pec_keygen.c + +-$(OBJDIR)$Pec_p256_m15$O: src$Pec$Pec_p256_m15.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_p256_m15$O: $(OBJDIR) src$Pec$Pec_p256_m15.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_p256_m15$O src$Pec$Pec_p256_m15.c + +-$(OBJDIR)$Pec_p256_m31$O: src$Pec$Pec_p256_m31.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_p256_m31$O: $(OBJDIR) src$Pec$Pec_p256_m31.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_p256_m31$O src$Pec$Pec_p256_m31.c + +-$(OBJDIR)$Pec_prime_i15$O: src$Pec$Pec_prime_i15.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_prime_i15$O: $(OBJDIR) src$Pec$Pec_prime_i15.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_prime_i15$O src$Pec$Pec_prime_i15.c + +-$(OBJDIR)$Pec_prime_i31$O: src$Pec$Pec_prime_i31.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_prime_i31$O: $(OBJDIR) src$Pec$Pec_prime_i31.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_prime_i31$O src$Pec$Pec_prime_i31.c + +-$(OBJDIR)$Pec_pubkey$O: src$Pec$Pec_pubkey.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_pubkey$O: $(OBJDIR) src$Pec$Pec_pubkey.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_pubkey$O src$Pec$Pec_pubkey.c + +-$(OBJDIR)$Pec_secp256r1$O: src$Pec$Pec_secp256r1.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_secp256r1$O: $(OBJDIR) src$Pec$Pec_secp256r1.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_secp256r1$O src$Pec$Pec_secp256r1.c + +-$(OBJDIR)$Pec_secp384r1$O: src$Pec$Pec_secp384r1.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_secp384r1$O: $(OBJDIR) src$Pec$Pec_secp384r1.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_secp384r1$O src$Pec$Pec_secp384r1.c + +-$(OBJDIR)$Pec_secp521r1$O: src$Pec$Pec_secp521r1.c $(HEADERSPRIV) ++$(OBJDIR)$Pec_secp521r1$O: $(OBJDIR) src$Pec$Pec_secp521r1.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pec_secp521r1$O src$Pec$Pec_secp521r1.c + +-$(OBJDIR)$Pecdsa_atr$O: src$Pec$Pecdsa_atr.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_atr$O: $(OBJDIR) src$Pec$Pecdsa_atr.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_atr$O src$Pec$Pecdsa_atr.c + +-$(OBJDIR)$Pecdsa_default_sign_asn1$O: src$Pec$Pecdsa_default_sign_asn1.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_default_sign_asn1$O: $(OBJDIR) src$Pec$Pecdsa_default_sign_asn1.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_default_sign_asn1$O src$Pec$Pecdsa_default_sign_asn1.c + +-$(OBJDIR)$Pecdsa_default_sign_raw$O: src$Pec$Pecdsa_default_sign_raw.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_default_sign_raw$O: $(OBJDIR) src$Pec$Pecdsa_default_sign_raw.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_default_sign_raw$O src$Pec$Pecdsa_default_sign_raw.c + +-$(OBJDIR)$Pecdsa_default_vrfy_asn1$O: src$Pec$Pecdsa_default_vrfy_asn1.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_default_vrfy_asn1$O: $(OBJDIR) src$Pec$Pecdsa_default_vrfy_asn1.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_default_vrfy_asn1$O src$Pec$Pecdsa_default_vrfy_asn1.c + +-$(OBJDIR)$Pecdsa_default_vrfy_raw$O: src$Pec$Pecdsa_default_vrfy_raw.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_default_vrfy_raw$O: $(OBJDIR) src$Pec$Pecdsa_default_vrfy_raw.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_default_vrfy_raw$O src$Pec$Pecdsa_default_vrfy_raw.c + +-$(OBJDIR)$Pecdsa_i15_bits$O: src$Pec$Pecdsa_i15_bits.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_i15_bits$O: $(OBJDIR) src$Pec$Pecdsa_i15_bits.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_i15_bits$O src$Pec$Pecdsa_i15_bits.c + +-$(OBJDIR)$Pecdsa_i15_sign_asn1$O: src$Pec$Pecdsa_i15_sign_asn1.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_i15_sign_asn1$O: $(OBJDIR) src$Pec$Pecdsa_i15_sign_asn1.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_i15_sign_asn1$O src$Pec$Pecdsa_i15_sign_asn1.c + +-$(OBJDIR)$Pecdsa_i15_sign_raw$O: src$Pec$Pecdsa_i15_sign_raw.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_i15_sign_raw$O: $(OBJDIR) src$Pec$Pecdsa_i15_sign_raw.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_i15_sign_raw$O src$Pec$Pecdsa_i15_sign_raw.c + +-$(OBJDIR)$Pecdsa_i15_vrfy_asn1$O: src$Pec$Pecdsa_i15_vrfy_asn1.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_i15_vrfy_asn1$O: $(OBJDIR) src$Pec$Pecdsa_i15_vrfy_asn1.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_i15_vrfy_asn1$O src$Pec$Pecdsa_i15_vrfy_asn1.c + +-$(OBJDIR)$Pecdsa_i15_vrfy_raw$O: src$Pec$Pecdsa_i15_vrfy_raw.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_i15_vrfy_raw$O: $(OBJDIR) src$Pec$Pecdsa_i15_vrfy_raw.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_i15_vrfy_raw$O src$Pec$Pecdsa_i15_vrfy_raw.c + +-$(OBJDIR)$Pecdsa_i31_bits$O: src$Pec$Pecdsa_i31_bits.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_i31_bits$O: $(OBJDIR) src$Pec$Pecdsa_i31_bits.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_i31_bits$O src$Pec$Pecdsa_i31_bits.c + +-$(OBJDIR)$Pecdsa_i31_sign_asn1$O: src$Pec$Pecdsa_i31_sign_asn1.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_i31_sign_asn1$O: $(OBJDIR) src$Pec$Pecdsa_i31_sign_asn1.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_i31_sign_asn1$O src$Pec$Pecdsa_i31_sign_asn1.c + +-$(OBJDIR)$Pecdsa_i31_sign_raw$O: src$Pec$Pecdsa_i31_sign_raw.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_i31_sign_raw$O: $(OBJDIR) src$Pec$Pecdsa_i31_sign_raw.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_i31_sign_raw$O src$Pec$Pecdsa_i31_sign_raw.c + +-$(OBJDIR)$Pecdsa_i31_vrfy_asn1$O: src$Pec$Pecdsa_i31_vrfy_asn1.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_i31_vrfy_asn1$O: $(OBJDIR) src$Pec$Pecdsa_i31_vrfy_asn1.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_i31_vrfy_asn1$O src$Pec$Pecdsa_i31_vrfy_asn1.c + +-$(OBJDIR)$Pecdsa_i31_vrfy_raw$O: src$Pec$Pecdsa_i31_vrfy_raw.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_i31_vrfy_raw$O: $(OBJDIR) src$Pec$Pecdsa_i31_vrfy_raw.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_i31_vrfy_raw$O src$Pec$Pecdsa_i31_vrfy_raw.c + +-$(OBJDIR)$Pecdsa_rta$O: src$Pec$Pecdsa_rta.c $(HEADERSPRIV) ++$(OBJDIR)$Pecdsa_rta$O: $(OBJDIR) src$Pec$Pecdsa_rta.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pecdsa_rta$O src$Pec$Pecdsa_rta.c + +-$(OBJDIR)$Pdig_oid$O: src$Phash$Pdig_oid.c $(HEADERSPRIV) ++$(OBJDIR)$Pdig_oid$O: $(OBJDIR) src$Phash$Pdig_oid.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdig_oid$O src$Phash$Pdig_oid.c + +-$(OBJDIR)$Pdig_size$O: src$Phash$Pdig_size.c $(HEADERSPRIV) ++$(OBJDIR)$Pdig_size$O: $(OBJDIR) src$Phash$Pdig_size.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdig_size$O src$Phash$Pdig_size.c + +-$(OBJDIR)$Pghash_ctmul$O: src$Phash$Pghash_ctmul.c $(HEADERSPRIV) ++$(OBJDIR)$Pghash_ctmul$O: $(OBJDIR) src$Phash$Pghash_ctmul.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pghash_ctmul$O src$Phash$Pghash_ctmul.c + +-$(OBJDIR)$Pghash_ctmul32$O: src$Phash$Pghash_ctmul32.c $(HEADERSPRIV) ++$(OBJDIR)$Pghash_ctmul32$O: $(OBJDIR) src$Phash$Pghash_ctmul32.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pghash_ctmul32$O src$Phash$Pghash_ctmul32.c + +-$(OBJDIR)$Pghash_ctmul64$O: src$Phash$Pghash_ctmul64.c $(HEADERSPRIV) ++$(OBJDIR)$Pghash_ctmul64$O: $(OBJDIR) src$Phash$Pghash_ctmul64.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pghash_ctmul64$O src$Phash$Pghash_ctmul64.c + +-$(OBJDIR)$Pghash_pclmul$O: src$Phash$Pghash_pclmul.c $(HEADERSPRIV) ++$(OBJDIR)$Pghash_pclmul$O: $(OBJDIR) src$Phash$Pghash_pclmul.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pghash_pclmul$O src$Phash$Pghash_pclmul.c + +-$(OBJDIR)$Pghash_pwr8$O: src$Phash$Pghash_pwr8.c $(HEADERSPRIV) ++$(OBJDIR)$Pghash_pwr8$O: $(OBJDIR) src$Phash$Pghash_pwr8.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pghash_pwr8$O src$Phash$Pghash_pwr8.c + +-$(OBJDIR)$Pmd5$O: src$Phash$Pmd5.c $(HEADERSPRIV) ++$(OBJDIR)$Pmd5$O: $(OBJDIR) src$Phash$Pmd5.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pmd5$O src$Phash$Pmd5.c + +-$(OBJDIR)$Pmd5sha1$O: src$Phash$Pmd5sha1.c $(HEADERSPRIV) ++$(OBJDIR)$Pmd5sha1$O: $(OBJDIR) src$Phash$Pmd5sha1.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pmd5sha1$O src$Phash$Pmd5sha1.c + +-$(OBJDIR)$Pmgf1$O: src$Phash$Pmgf1.c $(HEADERSPRIV) ++$(OBJDIR)$Pmgf1$O: $(OBJDIR) src$Phash$Pmgf1.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pmgf1$O src$Phash$Pmgf1.c + +-$(OBJDIR)$Pmultihash$O: src$Phash$Pmultihash.c $(HEADERSPRIV) ++$(OBJDIR)$Pmultihash$O: $(OBJDIR) src$Phash$Pmultihash.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pmultihash$O src$Phash$Pmultihash.c + +-$(OBJDIR)$Psha1$O: src$Phash$Psha1.c $(HEADERSPRIV) ++$(OBJDIR)$Psha1$O: $(OBJDIR) src$Phash$Psha1.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Psha1$O src$Phash$Psha1.c + +-$(OBJDIR)$Psha2big$O: src$Phash$Psha2big.c $(HEADERSPRIV) ++$(OBJDIR)$Psha2big$O: $(OBJDIR) src$Phash$Psha2big.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Psha2big$O src$Phash$Psha2big.c + +-$(OBJDIR)$Psha2small$O: src$Phash$Psha2small.c $(HEADERSPRIV) ++$(OBJDIR)$Psha2small$O: $(OBJDIR) src$Phash$Psha2small.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Psha2small$O src$Phash$Psha2small.c + +-$(OBJDIR)$Pi15_add$O: src$Pint$Pi15_add.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_add$O: $(OBJDIR) src$Pint$Pi15_add.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_add$O src$Pint$Pi15_add.c + +-$(OBJDIR)$Pi15_bitlen$O: src$Pint$Pi15_bitlen.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_bitlen$O: $(OBJDIR) src$Pint$Pi15_bitlen.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_bitlen$O src$Pint$Pi15_bitlen.c + +-$(OBJDIR)$Pi15_decmod$O: src$Pint$Pi15_decmod.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_decmod$O: $(OBJDIR) src$Pint$Pi15_decmod.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_decmod$O src$Pint$Pi15_decmod.c + +-$(OBJDIR)$Pi15_decode$O: src$Pint$Pi15_decode.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_decode$O: $(OBJDIR) src$Pint$Pi15_decode.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_decode$O src$Pint$Pi15_decode.c + +-$(OBJDIR)$Pi15_decred$O: src$Pint$Pi15_decred.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_decred$O: $(OBJDIR) src$Pint$Pi15_decred.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_decred$O src$Pint$Pi15_decred.c + +-$(OBJDIR)$Pi15_encode$O: src$Pint$Pi15_encode.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_encode$O: $(OBJDIR) src$Pint$Pi15_encode.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_encode$O src$Pint$Pi15_encode.c + +-$(OBJDIR)$Pi15_fmont$O: src$Pint$Pi15_fmont.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_fmont$O: $(OBJDIR) src$Pint$Pi15_fmont.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_fmont$O src$Pint$Pi15_fmont.c + +-$(OBJDIR)$Pi15_iszero$O: src$Pint$Pi15_iszero.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_iszero$O: $(OBJDIR) src$Pint$Pi15_iszero.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_iszero$O src$Pint$Pi15_iszero.c + +-$(OBJDIR)$Pi15_moddiv$O: src$Pint$Pi15_moddiv.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_moddiv$O: $(OBJDIR) src$Pint$Pi15_moddiv.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_moddiv$O src$Pint$Pi15_moddiv.c + +-$(OBJDIR)$Pi15_modpow$O: src$Pint$Pi15_modpow.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_modpow$O: $(OBJDIR) src$Pint$Pi15_modpow.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_modpow$O src$Pint$Pi15_modpow.c + +-$(OBJDIR)$Pi15_modpow2$O: src$Pint$Pi15_modpow2.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_modpow2$O: $(OBJDIR) src$Pint$Pi15_modpow2.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_modpow2$O src$Pint$Pi15_modpow2.c + +-$(OBJDIR)$Pi15_montmul$O: src$Pint$Pi15_montmul.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_montmul$O: $(OBJDIR) src$Pint$Pi15_montmul.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_montmul$O src$Pint$Pi15_montmul.c + +-$(OBJDIR)$Pi15_mulacc$O: src$Pint$Pi15_mulacc.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_mulacc$O: $(OBJDIR) src$Pint$Pi15_mulacc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_mulacc$O src$Pint$Pi15_mulacc.c + +-$(OBJDIR)$Pi15_muladd$O: src$Pint$Pi15_muladd.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_muladd$O: $(OBJDIR) src$Pint$Pi15_muladd.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_muladd$O src$Pint$Pi15_muladd.c + +-$(OBJDIR)$Pi15_ninv15$O: src$Pint$Pi15_ninv15.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_ninv15$O: $(OBJDIR) src$Pint$Pi15_ninv15.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_ninv15$O src$Pint$Pi15_ninv15.c + +-$(OBJDIR)$Pi15_reduce$O: src$Pint$Pi15_reduce.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_reduce$O: $(OBJDIR) src$Pint$Pi15_reduce.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_reduce$O src$Pint$Pi15_reduce.c + +-$(OBJDIR)$Pi15_rshift$O: src$Pint$Pi15_rshift.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_rshift$O: $(OBJDIR) src$Pint$Pi15_rshift.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_rshift$O src$Pint$Pi15_rshift.c + +-$(OBJDIR)$Pi15_sub$O: src$Pint$Pi15_sub.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_sub$O: $(OBJDIR) src$Pint$Pi15_sub.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_sub$O src$Pint$Pi15_sub.c + +-$(OBJDIR)$Pi15_tmont$O: src$Pint$Pi15_tmont.c $(HEADERSPRIV) ++$(OBJDIR)$Pi15_tmont$O: $(OBJDIR) src$Pint$Pi15_tmont.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi15_tmont$O src$Pint$Pi15_tmont.c + +-$(OBJDIR)$Pi31_add$O: src$Pint$Pi31_add.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_add$O: $(OBJDIR) src$Pint$Pi31_add.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_add$O src$Pint$Pi31_add.c + +-$(OBJDIR)$Pi31_bitlen$O: src$Pint$Pi31_bitlen.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_bitlen$O: $(OBJDIR) src$Pint$Pi31_bitlen.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_bitlen$O src$Pint$Pi31_bitlen.c + +-$(OBJDIR)$Pi31_decmod$O: src$Pint$Pi31_decmod.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_decmod$O: $(OBJDIR) src$Pint$Pi31_decmod.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_decmod$O src$Pint$Pi31_decmod.c + +-$(OBJDIR)$Pi31_decode$O: src$Pint$Pi31_decode.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_decode$O: $(OBJDIR) src$Pint$Pi31_decode.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_decode$O src$Pint$Pi31_decode.c + +-$(OBJDIR)$Pi31_decred$O: src$Pint$Pi31_decred.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_decred$O: $(OBJDIR) src$Pint$Pi31_decred.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_decred$O src$Pint$Pi31_decred.c + +-$(OBJDIR)$Pi31_encode$O: src$Pint$Pi31_encode.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_encode$O: $(OBJDIR) src$Pint$Pi31_encode.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_encode$O src$Pint$Pi31_encode.c + +-$(OBJDIR)$Pi31_fmont$O: src$Pint$Pi31_fmont.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_fmont$O: $(OBJDIR) src$Pint$Pi31_fmont.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_fmont$O src$Pint$Pi31_fmont.c + +-$(OBJDIR)$Pi31_iszero$O: src$Pint$Pi31_iszero.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_iszero$O: $(OBJDIR) src$Pint$Pi31_iszero.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_iszero$O src$Pint$Pi31_iszero.c + +-$(OBJDIR)$Pi31_moddiv$O: src$Pint$Pi31_moddiv.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_moddiv$O: $(OBJDIR) src$Pint$Pi31_moddiv.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_moddiv$O src$Pint$Pi31_moddiv.c + +-$(OBJDIR)$Pi31_modpow$O: src$Pint$Pi31_modpow.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_modpow$O: $(OBJDIR) src$Pint$Pi31_modpow.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_modpow$O src$Pint$Pi31_modpow.c + +-$(OBJDIR)$Pi31_modpow2$O: src$Pint$Pi31_modpow2.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_modpow2$O: $(OBJDIR) src$Pint$Pi31_modpow2.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_modpow2$O src$Pint$Pi31_modpow2.c + +-$(OBJDIR)$Pi31_montmul$O: src$Pint$Pi31_montmul.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_montmul$O: $(OBJDIR) src$Pint$Pi31_montmul.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_montmul$O src$Pint$Pi31_montmul.c + +-$(OBJDIR)$Pi31_mulacc$O: src$Pint$Pi31_mulacc.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_mulacc$O: $(OBJDIR) src$Pint$Pi31_mulacc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_mulacc$O src$Pint$Pi31_mulacc.c + +-$(OBJDIR)$Pi31_muladd$O: src$Pint$Pi31_muladd.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_muladd$O: $(OBJDIR) src$Pint$Pi31_muladd.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_muladd$O src$Pint$Pi31_muladd.c + +-$(OBJDIR)$Pi31_ninv31$O: src$Pint$Pi31_ninv31.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_ninv31$O: $(OBJDIR) src$Pint$Pi31_ninv31.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_ninv31$O src$Pint$Pi31_ninv31.c + +-$(OBJDIR)$Pi31_reduce$O: src$Pint$Pi31_reduce.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_reduce$O: $(OBJDIR) src$Pint$Pi31_reduce.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_reduce$O src$Pint$Pi31_reduce.c + +-$(OBJDIR)$Pi31_rshift$O: src$Pint$Pi31_rshift.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_rshift$O: $(OBJDIR) src$Pint$Pi31_rshift.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_rshift$O src$Pint$Pi31_rshift.c + +-$(OBJDIR)$Pi31_sub$O: src$Pint$Pi31_sub.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_sub$O: $(OBJDIR) src$Pint$Pi31_sub.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_sub$O src$Pint$Pi31_sub.c + +-$(OBJDIR)$Pi31_tmont$O: src$Pint$Pi31_tmont.c $(HEADERSPRIV) ++$(OBJDIR)$Pi31_tmont$O: $(OBJDIR) src$Pint$Pi31_tmont.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi31_tmont$O src$Pint$Pi31_tmont.c + +-$(OBJDIR)$Pi32_add$O: src$Pint$Pi32_add.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_add$O: $(OBJDIR) src$Pint$Pi32_add.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_add$O src$Pint$Pi32_add.c + +-$(OBJDIR)$Pi32_bitlen$O: src$Pint$Pi32_bitlen.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_bitlen$O: $(OBJDIR) src$Pint$Pi32_bitlen.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_bitlen$O src$Pint$Pi32_bitlen.c + +-$(OBJDIR)$Pi32_decmod$O: src$Pint$Pi32_decmod.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_decmod$O: $(OBJDIR) src$Pint$Pi32_decmod.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_decmod$O src$Pint$Pi32_decmod.c + +-$(OBJDIR)$Pi32_decode$O: src$Pint$Pi32_decode.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_decode$O: $(OBJDIR) src$Pint$Pi32_decode.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_decode$O src$Pint$Pi32_decode.c + +-$(OBJDIR)$Pi32_decred$O: src$Pint$Pi32_decred.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_decred$O: $(OBJDIR) src$Pint$Pi32_decred.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_decred$O src$Pint$Pi32_decred.c + +-$(OBJDIR)$Pi32_div32$O: src$Pint$Pi32_div32.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_div32$O: $(OBJDIR) src$Pint$Pi32_div32.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_div32$O src$Pint$Pi32_div32.c + +-$(OBJDIR)$Pi32_encode$O: src$Pint$Pi32_encode.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_encode$O: $(OBJDIR) src$Pint$Pi32_encode.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_encode$O src$Pint$Pi32_encode.c + +-$(OBJDIR)$Pi32_fmont$O: src$Pint$Pi32_fmont.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_fmont$O: $(OBJDIR) src$Pint$Pi32_fmont.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_fmont$O src$Pint$Pi32_fmont.c + +-$(OBJDIR)$Pi32_iszero$O: src$Pint$Pi32_iszero.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_iszero$O: $(OBJDIR) src$Pint$Pi32_iszero.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_iszero$O src$Pint$Pi32_iszero.c + +-$(OBJDIR)$Pi32_modpow$O: src$Pint$Pi32_modpow.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_modpow$O: $(OBJDIR) src$Pint$Pi32_modpow.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_modpow$O src$Pint$Pi32_modpow.c + +-$(OBJDIR)$Pi32_montmul$O: src$Pint$Pi32_montmul.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_montmul$O: $(OBJDIR) src$Pint$Pi32_montmul.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_montmul$O src$Pint$Pi32_montmul.c + +-$(OBJDIR)$Pi32_mulacc$O: src$Pint$Pi32_mulacc.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_mulacc$O: $(OBJDIR) src$Pint$Pi32_mulacc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_mulacc$O src$Pint$Pi32_mulacc.c + +-$(OBJDIR)$Pi32_muladd$O: src$Pint$Pi32_muladd.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_muladd$O: $(OBJDIR) src$Pint$Pi32_muladd.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_muladd$O src$Pint$Pi32_muladd.c + +-$(OBJDIR)$Pi32_ninv32$O: src$Pint$Pi32_ninv32.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_ninv32$O: $(OBJDIR) src$Pint$Pi32_ninv32.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_ninv32$O src$Pint$Pi32_ninv32.c + +-$(OBJDIR)$Pi32_reduce$O: src$Pint$Pi32_reduce.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_reduce$O: $(OBJDIR) src$Pint$Pi32_reduce.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_reduce$O src$Pint$Pi32_reduce.c + +-$(OBJDIR)$Pi32_sub$O: src$Pint$Pi32_sub.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_sub$O: $(OBJDIR) src$Pint$Pi32_sub.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_sub$O src$Pint$Pi32_sub.c + +-$(OBJDIR)$Pi32_tmont$O: src$Pint$Pi32_tmont.c $(HEADERSPRIV) ++$(OBJDIR)$Pi32_tmont$O: $(OBJDIR) src$Pint$Pi32_tmont.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi32_tmont$O src$Pint$Pi32_tmont.c + +-$(OBJDIR)$Pi62_modpow2$O: src$Pint$Pi62_modpow2.c $(HEADERSPRIV) ++$(OBJDIR)$Pi62_modpow2$O: $(OBJDIR) src$Pint$Pi62_modpow2.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pi62_modpow2$O src$Pint$Pi62_modpow2.c + +-$(OBJDIR)$Phkdf$O: src$Pkdf$Phkdf.c $(HEADERSPRIV) ++$(OBJDIR)$Phkdf$O: $(OBJDIR) src$Pkdf$Phkdf.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Phkdf$O src$Pkdf$Phkdf.c + +-$(OBJDIR)$Phmac$O: src$Pmac$Phmac.c $(HEADERSPRIV) ++$(OBJDIR)$Phmac$O: $(OBJDIR) src$Pmac$Phmac.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Phmac$O src$Pmac$Phmac.c + +-$(OBJDIR)$Phmac_ct$O: src$Pmac$Phmac_ct.c $(HEADERSPRIV) ++$(OBJDIR)$Phmac_ct$O: $(OBJDIR) src$Pmac$Phmac_ct.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Phmac_ct$O src$Pmac$Phmac_ct.c + +-$(OBJDIR)$Paesctr_drbg$O: src$Prand$Paesctr_drbg.c $(HEADERSPRIV) ++$(OBJDIR)$Paesctr_drbg$O: $(OBJDIR) src$Prand$Paesctr_drbg.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paesctr_drbg$O src$Prand$Paesctr_drbg.c + +-$(OBJDIR)$Phmac_drbg$O: src$Prand$Phmac_drbg.c $(HEADERSPRIV) ++$(OBJDIR)$Phmac_drbg$O: $(OBJDIR) src$Prand$Phmac_drbg.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Phmac_drbg$O src$Prand$Phmac_drbg.c + +-$(OBJDIR)$Psysrng$O: src$Prand$Psysrng.c $(HEADERSPRIV) ++$(OBJDIR)$Psysrng$O: $(OBJDIR) src$Prand$Psysrng.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Psysrng$O src$Prand$Psysrng.c + +-$(OBJDIR)$Prsa_default_keygen$O: src$Prsa$Prsa_default_keygen.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_default_keygen$O: $(OBJDIR) src$Prsa$Prsa_default_keygen.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_default_keygen$O src$Prsa$Prsa_default_keygen.c + +-$(OBJDIR)$Prsa_default_modulus$O: src$Prsa$Prsa_default_modulus.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_default_modulus$O: $(OBJDIR) src$Prsa$Prsa_default_modulus.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_default_modulus$O src$Prsa$Prsa_default_modulus.c + +-$(OBJDIR)$Prsa_default_oaep_decrypt$O: src$Prsa$Prsa_default_oaep_decrypt.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_default_oaep_decrypt$O: $(OBJDIR) src$Prsa$Prsa_default_oaep_decrypt.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_default_oaep_decrypt$O src$Prsa$Prsa_default_oaep_decrypt.c + +-$(OBJDIR)$Prsa_default_oaep_encrypt$O: src$Prsa$Prsa_default_oaep_encrypt.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_default_oaep_encrypt$O: $(OBJDIR) src$Prsa$Prsa_default_oaep_encrypt.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_default_oaep_encrypt$O src$Prsa$Prsa_default_oaep_encrypt.c + +-$(OBJDIR)$Prsa_default_pkcs1_sign$O: src$Prsa$Prsa_default_pkcs1_sign.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_default_pkcs1_sign$O: $(OBJDIR) src$Prsa$Prsa_default_pkcs1_sign.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_default_pkcs1_sign$O src$Prsa$Prsa_default_pkcs1_sign.c + +-$(OBJDIR)$Prsa_default_pkcs1_vrfy$O: src$Prsa$Prsa_default_pkcs1_vrfy.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_default_pkcs1_vrfy$O: $(OBJDIR) src$Prsa$Prsa_default_pkcs1_vrfy.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_default_pkcs1_vrfy$O src$Prsa$Prsa_default_pkcs1_vrfy.c + +-$(OBJDIR)$Prsa_default_priv$O: src$Prsa$Prsa_default_priv.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_default_priv$O: $(OBJDIR) src$Prsa$Prsa_default_priv.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_default_priv$O src$Prsa$Prsa_default_priv.c + +-$(OBJDIR)$Prsa_default_privexp$O: src$Prsa$Prsa_default_privexp.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_default_privexp$O: $(OBJDIR) src$Prsa$Prsa_default_privexp.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_default_privexp$O src$Prsa$Prsa_default_privexp.c + +-$(OBJDIR)$Prsa_default_pub$O: src$Prsa$Prsa_default_pub.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_default_pub$O: $(OBJDIR) src$Prsa$Prsa_default_pub.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_default_pub$O src$Prsa$Prsa_default_pub.c + +-$(OBJDIR)$Prsa_default_pubexp$O: src$Prsa$Prsa_default_pubexp.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_default_pubexp$O: $(OBJDIR) src$Prsa$Prsa_default_pubexp.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_default_pubexp$O src$Prsa$Prsa_default_pubexp.c + +-$(OBJDIR)$Prsa_i15_keygen$O: src$Prsa$Prsa_i15_keygen.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i15_keygen$O: $(OBJDIR) src$Prsa$Prsa_i15_keygen.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i15_keygen$O src$Prsa$Prsa_i15_keygen.c + +-$(OBJDIR)$Prsa_i15_modulus$O: src$Prsa$Prsa_i15_modulus.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i15_modulus$O: $(OBJDIR) src$Prsa$Prsa_i15_modulus.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i15_modulus$O src$Prsa$Prsa_i15_modulus.c + +-$(OBJDIR)$Prsa_i15_oaep_decrypt$O: src$Prsa$Prsa_i15_oaep_decrypt.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i15_oaep_decrypt$O: $(OBJDIR) src$Prsa$Prsa_i15_oaep_decrypt.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i15_oaep_decrypt$O src$Prsa$Prsa_i15_oaep_decrypt.c + +-$(OBJDIR)$Prsa_i15_oaep_encrypt$O: src$Prsa$Prsa_i15_oaep_encrypt.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i15_oaep_encrypt$O: $(OBJDIR) src$Prsa$Prsa_i15_oaep_encrypt.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i15_oaep_encrypt$O src$Prsa$Prsa_i15_oaep_encrypt.c + +-$(OBJDIR)$Prsa_i15_pkcs1_sign$O: src$Prsa$Prsa_i15_pkcs1_sign.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i15_pkcs1_sign$O: $(OBJDIR) src$Prsa$Prsa_i15_pkcs1_sign.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i15_pkcs1_sign$O src$Prsa$Prsa_i15_pkcs1_sign.c + +-$(OBJDIR)$Prsa_i15_pkcs1_vrfy$O: src$Prsa$Prsa_i15_pkcs1_vrfy.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i15_pkcs1_vrfy$O: $(OBJDIR) src$Prsa$Prsa_i15_pkcs1_vrfy.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i15_pkcs1_vrfy$O src$Prsa$Prsa_i15_pkcs1_vrfy.c + +-$(OBJDIR)$Prsa_i15_priv$O: src$Prsa$Prsa_i15_priv.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i15_priv$O: $(OBJDIR) src$Prsa$Prsa_i15_priv.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i15_priv$O src$Prsa$Prsa_i15_priv.c + +-$(OBJDIR)$Prsa_i15_privexp$O: src$Prsa$Prsa_i15_privexp.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i15_privexp$O: $(OBJDIR) src$Prsa$Prsa_i15_privexp.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i15_privexp$O src$Prsa$Prsa_i15_privexp.c + +-$(OBJDIR)$Prsa_i15_pub$O: src$Prsa$Prsa_i15_pub.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i15_pub$O: $(OBJDIR) src$Prsa$Prsa_i15_pub.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i15_pub$O src$Prsa$Prsa_i15_pub.c + +-$(OBJDIR)$Prsa_i15_pubexp$O: src$Prsa$Prsa_i15_pubexp.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i15_pubexp$O: $(OBJDIR) src$Prsa$Prsa_i15_pubexp.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i15_pubexp$O src$Prsa$Prsa_i15_pubexp.c + +-$(OBJDIR)$Prsa_i31_keygen$O: src$Prsa$Prsa_i31_keygen.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i31_keygen$O: $(OBJDIR) src$Prsa$Prsa_i31_keygen.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i31_keygen$O src$Prsa$Prsa_i31_keygen.c + +-$(OBJDIR)$Prsa_i31_keygen_inner$O: src$Prsa$Prsa_i31_keygen_inner.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i31_keygen_inner$O: $(OBJDIR) src$Prsa$Prsa_i31_keygen_inner.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i31_keygen_inner$O src$Prsa$Prsa_i31_keygen_inner.c + +-$(OBJDIR)$Prsa_i31_modulus$O: src$Prsa$Prsa_i31_modulus.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i31_modulus$O: $(OBJDIR) src$Prsa$Prsa_i31_modulus.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i31_modulus$O src$Prsa$Prsa_i31_modulus.c + +-$(OBJDIR)$Prsa_i31_oaep_decrypt$O: src$Prsa$Prsa_i31_oaep_decrypt.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i31_oaep_decrypt$O: $(OBJDIR) src$Prsa$Prsa_i31_oaep_decrypt.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i31_oaep_decrypt$O src$Prsa$Prsa_i31_oaep_decrypt.c + +-$(OBJDIR)$Prsa_i31_oaep_encrypt$O: src$Prsa$Prsa_i31_oaep_encrypt.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i31_oaep_encrypt$O: $(OBJDIR) src$Prsa$Prsa_i31_oaep_encrypt.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i31_oaep_encrypt$O src$Prsa$Prsa_i31_oaep_encrypt.c + +-$(OBJDIR)$Prsa_i31_pkcs1_sign$O: src$Prsa$Prsa_i31_pkcs1_sign.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i31_pkcs1_sign$O: $(OBJDIR) src$Prsa$Prsa_i31_pkcs1_sign.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i31_pkcs1_sign$O src$Prsa$Prsa_i31_pkcs1_sign.c + +-$(OBJDIR)$Prsa_i31_pkcs1_vrfy$O: src$Prsa$Prsa_i31_pkcs1_vrfy.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i31_pkcs1_vrfy$O: $(OBJDIR) src$Prsa$Prsa_i31_pkcs1_vrfy.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i31_pkcs1_vrfy$O src$Prsa$Prsa_i31_pkcs1_vrfy.c + +-$(OBJDIR)$Prsa_i31_priv$O: src$Prsa$Prsa_i31_priv.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i31_priv$O: $(OBJDIR) src$Prsa$Prsa_i31_priv.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i31_priv$O src$Prsa$Prsa_i31_priv.c + +-$(OBJDIR)$Prsa_i31_privexp$O: src$Prsa$Prsa_i31_privexp.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i31_privexp$O: $(OBJDIR) src$Prsa$Prsa_i31_privexp.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i31_privexp$O src$Prsa$Prsa_i31_privexp.c + +-$(OBJDIR)$Prsa_i31_pub$O: src$Prsa$Prsa_i31_pub.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i31_pub$O: $(OBJDIR) src$Prsa$Prsa_i31_pub.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i31_pub$O src$Prsa$Prsa_i31_pub.c + +-$(OBJDIR)$Prsa_i31_pubexp$O: src$Prsa$Prsa_i31_pubexp.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i31_pubexp$O: $(OBJDIR) src$Prsa$Prsa_i31_pubexp.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i31_pubexp$O src$Prsa$Prsa_i31_pubexp.c + +-$(OBJDIR)$Prsa_i32_oaep_decrypt$O: src$Prsa$Prsa_i32_oaep_decrypt.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i32_oaep_decrypt$O: $(OBJDIR) src$Prsa$Prsa_i32_oaep_decrypt.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i32_oaep_decrypt$O src$Prsa$Prsa_i32_oaep_decrypt.c + +-$(OBJDIR)$Prsa_i32_oaep_encrypt$O: src$Prsa$Prsa_i32_oaep_encrypt.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i32_oaep_encrypt$O: $(OBJDIR) src$Prsa$Prsa_i32_oaep_encrypt.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i32_oaep_encrypt$O src$Prsa$Prsa_i32_oaep_encrypt.c + +-$(OBJDIR)$Prsa_i32_pkcs1_sign$O: src$Prsa$Prsa_i32_pkcs1_sign.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i32_pkcs1_sign$O: $(OBJDIR) src$Prsa$Prsa_i32_pkcs1_sign.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i32_pkcs1_sign$O src$Prsa$Prsa_i32_pkcs1_sign.c + +-$(OBJDIR)$Prsa_i32_pkcs1_vrfy$O: src$Prsa$Prsa_i32_pkcs1_vrfy.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i32_pkcs1_vrfy$O: $(OBJDIR) src$Prsa$Prsa_i32_pkcs1_vrfy.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i32_pkcs1_vrfy$O src$Prsa$Prsa_i32_pkcs1_vrfy.c + +-$(OBJDIR)$Prsa_i32_priv$O: src$Prsa$Prsa_i32_priv.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i32_priv$O: $(OBJDIR) src$Prsa$Prsa_i32_priv.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i32_priv$O src$Prsa$Prsa_i32_priv.c + +-$(OBJDIR)$Prsa_i32_pub$O: src$Prsa$Prsa_i32_pub.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i32_pub$O: $(OBJDIR) src$Prsa$Prsa_i32_pub.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i32_pub$O src$Prsa$Prsa_i32_pub.c + +-$(OBJDIR)$Prsa_i62_keygen$O: src$Prsa$Prsa_i62_keygen.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i62_keygen$O: $(OBJDIR) src$Prsa$Prsa_i62_keygen.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i62_keygen$O src$Prsa$Prsa_i62_keygen.c + +-$(OBJDIR)$Prsa_i62_oaep_decrypt$O: src$Prsa$Prsa_i62_oaep_decrypt.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i62_oaep_decrypt$O: $(OBJDIR) src$Prsa$Prsa_i62_oaep_decrypt.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i62_oaep_decrypt$O src$Prsa$Prsa_i62_oaep_decrypt.c + +-$(OBJDIR)$Prsa_i62_oaep_encrypt$O: src$Prsa$Prsa_i62_oaep_encrypt.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i62_oaep_encrypt$O: $(OBJDIR) src$Prsa$Prsa_i62_oaep_encrypt.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i62_oaep_encrypt$O src$Prsa$Prsa_i62_oaep_encrypt.c + +-$(OBJDIR)$Prsa_i62_pkcs1_sign$O: src$Prsa$Prsa_i62_pkcs1_sign.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i62_pkcs1_sign$O: $(OBJDIR) src$Prsa$Prsa_i62_pkcs1_sign.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i62_pkcs1_sign$O src$Prsa$Prsa_i62_pkcs1_sign.c + +-$(OBJDIR)$Prsa_i62_pkcs1_vrfy$O: src$Prsa$Prsa_i62_pkcs1_vrfy.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i62_pkcs1_vrfy$O: $(OBJDIR) src$Prsa$Prsa_i62_pkcs1_vrfy.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i62_pkcs1_vrfy$O src$Prsa$Prsa_i62_pkcs1_vrfy.c + +-$(OBJDIR)$Prsa_i62_priv$O: src$Prsa$Prsa_i62_priv.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i62_priv$O: $(OBJDIR) src$Prsa$Prsa_i62_priv.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i62_priv$O src$Prsa$Prsa_i62_priv.c + +-$(OBJDIR)$Prsa_i62_pub$O: src$Prsa$Prsa_i62_pub.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_i62_pub$O: $(OBJDIR) src$Prsa$Prsa_i62_pub.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_i62_pub$O src$Prsa$Prsa_i62_pub.c + +-$(OBJDIR)$Prsa_oaep_pad$O: src$Prsa$Prsa_oaep_pad.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_oaep_pad$O: $(OBJDIR) src$Prsa$Prsa_oaep_pad.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_oaep_pad$O src$Prsa$Prsa_oaep_pad.c + +-$(OBJDIR)$Prsa_oaep_unpad$O: src$Prsa$Prsa_oaep_unpad.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_oaep_unpad$O: $(OBJDIR) src$Prsa$Prsa_oaep_unpad.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_oaep_unpad$O src$Prsa$Prsa_oaep_unpad.c + +-$(OBJDIR)$Prsa_pkcs1_sig_pad$O: src$Prsa$Prsa_pkcs1_sig_pad.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_pkcs1_sig_pad$O: $(OBJDIR) src$Prsa$Prsa_pkcs1_sig_pad.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_pkcs1_sig_pad$O src$Prsa$Prsa_pkcs1_sig_pad.c + +-$(OBJDIR)$Prsa_pkcs1_sig_unpad$O: src$Prsa$Prsa_pkcs1_sig_unpad.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_pkcs1_sig_unpad$O: $(OBJDIR) src$Prsa$Prsa_pkcs1_sig_unpad.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_pkcs1_sig_unpad$O src$Prsa$Prsa_pkcs1_sig_unpad.c + +-$(OBJDIR)$Prsa_ssl_decrypt$O: src$Prsa$Prsa_ssl_decrypt.c $(HEADERSPRIV) ++$(OBJDIR)$Prsa_ssl_decrypt$O: $(OBJDIR) src$Prsa$Prsa_ssl_decrypt.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Prsa_ssl_decrypt$O src$Prsa$Prsa_ssl_decrypt.c + +-$(OBJDIR)$Pprf$O: src$Pssl$Pprf.c $(HEADERSPRIV) ++$(OBJDIR)$Pprf$O: $(OBJDIR) src$Pssl$Pprf.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pprf$O src$Pssl$Pprf.c + +-$(OBJDIR)$Pprf_md5sha1$O: src$Pssl$Pprf_md5sha1.c $(HEADERSPRIV) ++$(OBJDIR)$Pprf_md5sha1$O: $(OBJDIR) src$Pssl$Pprf_md5sha1.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pprf_md5sha1$O src$Pssl$Pprf_md5sha1.c + +-$(OBJDIR)$Pprf_sha256$O: src$Pssl$Pprf_sha256.c $(HEADERSPRIV) ++$(OBJDIR)$Pprf_sha256$O: $(OBJDIR) src$Pssl$Pprf_sha256.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pprf_sha256$O src$Pssl$Pprf_sha256.c + +-$(OBJDIR)$Pprf_sha384$O: src$Pssl$Pprf_sha384.c $(HEADERSPRIV) ++$(OBJDIR)$Pprf_sha384$O: $(OBJDIR) src$Pssl$Pprf_sha384.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pprf_sha384$O src$Pssl$Pprf_sha384.c + +-$(OBJDIR)$Pssl_ccert_single_ec$O: src$Pssl$Pssl_ccert_single_ec.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_ccert_single_ec$O: $(OBJDIR) src$Pssl$Pssl_ccert_single_ec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_ccert_single_ec$O src$Pssl$Pssl_ccert_single_ec.c + +-$(OBJDIR)$Pssl_ccert_single_rsa$O: src$Pssl$Pssl_ccert_single_rsa.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_ccert_single_rsa$O: $(OBJDIR) src$Pssl$Pssl_ccert_single_rsa.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_ccert_single_rsa$O src$Pssl$Pssl_ccert_single_rsa.c + +-$(OBJDIR)$Pssl_client$O: src$Pssl$Pssl_client.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_client$O: $(OBJDIR) src$Pssl$Pssl_client.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_client$O src$Pssl$Pssl_client.c + +-$(OBJDIR)$Pssl_client_default_rsapub$O: src$Pssl$Pssl_client_default_rsapub.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_client_default_rsapub$O: $(OBJDIR) src$Pssl$Pssl_client_default_rsapub.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_client_default_rsapub$O src$Pssl$Pssl_client_default_rsapub.c + +-$(OBJDIR)$Pssl_client_full$O: src$Pssl$Pssl_client_full.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_client_full$O: $(OBJDIR) src$Pssl$Pssl_client_full.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_client_full$O src$Pssl$Pssl_client_full.c + +-$(OBJDIR)$Pssl_engine$O: src$Pssl$Pssl_engine.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_engine$O: $(OBJDIR) src$Pssl$Pssl_engine.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_engine$O src$Pssl$Pssl_engine.c + +-$(OBJDIR)$Pssl_engine_default_aescbc$O: src$Pssl$Pssl_engine_default_aescbc.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_engine_default_aescbc$O: $(OBJDIR) src$Pssl$Pssl_engine_default_aescbc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_engine_default_aescbc$O src$Pssl$Pssl_engine_default_aescbc.c + +-$(OBJDIR)$Pssl_engine_default_aesccm$O: src$Pssl$Pssl_engine_default_aesccm.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_engine_default_aesccm$O: $(OBJDIR) src$Pssl$Pssl_engine_default_aesccm.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_engine_default_aesccm$O src$Pssl$Pssl_engine_default_aesccm.c + +-$(OBJDIR)$Pssl_engine_default_aesgcm$O: src$Pssl$Pssl_engine_default_aesgcm.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_engine_default_aesgcm$O: $(OBJDIR) src$Pssl$Pssl_engine_default_aesgcm.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_engine_default_aesgcm$O src$Pssl$Pssl_engine_default_aesgcm.c + +-$(OBJDIR)$Pssl_engine_default_chapol$O: src$Pssl$Pssl_engine_default_chapol.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_engine_default_chapol$O: $(OBJDIR) src$Pssl$Pssl_engine_default_chapol.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_engine_default_chapol$O src$Pssl$Pssl_engine_default_chapol.c + +-$(OBJDIR)$Pssl_engine_default_descbc$O: src$Pssl$Pssl_engine_default_descbc.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_engine_default_descbc$O: $(OBJDIR) src$Pssl$Pssl_engine_default_descbc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_engine_default_descbc$O src$Pssl$Pssl_engine_default_descbc.c + +-$(OBJDIR)$Pssl_engine_default_ec$O: src$Pssl$Pssl_engine_default_ec.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_engine_default_ec$O: $(OBJDIR) src$Pssl$Pssl_engine_default_ec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_engine_default_ec$O src$Pssl$Pssl_engine_default_ec.c + +-$(OBJDIR)$Pssl_engine_default_ecdsa$O: src$Pssl$Pssl_engine_default_ecdsa.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_engine_default_ecdsa$O: $(OBJDIR) src$Pssl$Pssl_engine_default_ecdsa.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_engine_default_ecdsa$O src$Pssl$Pssl_engine_default_ecdsa.c + +-$(OBJDIR)$Pssl_engine_default_rsavrfy$O: src$Pssl$Pssl_engine_default_rsavrfy.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_engine_default_rsavrfy$O: $(OBJDIR) src$Pssl$Pssl_engine_default_rsavrfy.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_engine_default_rsavrfy$O src$Pssl$Pssl_engine_default_rsavrfy.c + +-$(OBJDIR)$Pssl_hashes$O: src$Pssl$Pssl_hashes.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_hashes$O: $(OBJDIR) src$Pssl$Pssl_hashes.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_hashes$O src$Pssl$Pssl_hashes.c + +-$(OBJDIR)$Pssl_hs_client$O: src$Pssl$Pssl_hs_client.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_hs_client$O: $(OBJDIR) src$Pssl$Pssl_hs_client.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_hs_client$O src$Pssl$Pssl_hs_client.c + +-$(OBJDIR)$Pssl_hs_server$O: src$Pssl$Pssl_hs_server.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_hs_server$O: $(OBJDIR) src$Pssl$Pssl_hs_server.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_hs_server$O src$Pssl$Pssl_hs_server.c + +-$(OBJDIR)$Pssl_io$O: src$Pssl$Pssl_io.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_io$O: $(OBJDIR) src$Pssl$Pssl_io.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_io$O src$Pssl$Pssl_io.c + +-$(OBJDIR)$Pssl_keyexport$O: src$Pssl$Pssl_keyexport.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_keyexport$O: $(OBJDIR) src$Pssl$Pssl_keyexport.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_keyexport$O src$Pssl$Pssl_keyexport.c + +-$(OBJDIR)$Pssl_lru$O: src$Pssl$Pssl_lru.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_lru$O: $(OBJDIR) src$Pssl$Pssl_lru.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_lru$O src$Pssl$Pssl_lru.c + +-$(OBJDIR)$Pssl_rec_cbc$O: src$Pssl$Pssl_rec_cbc.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_rec_cbc$O: $(OBJDIR) src$Pssl$Pssl_rec_cbc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_rec_cbc$O src$Pssl$Pssl_rec_cbc.c + +-$(OBJDIR)$Pssl_rec_ccm$O: src$Pssl$Pssl_rec_ccm.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_rec_ccm$O: $(OBJDIR) src$Pssl$Pssl_rec_ccm.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_rec_ccm$O src$Pssl$Pssl_rec_ccm.c + +-$(OBJDIR)$Pssl_rec_chapol$O: src$Pssl$Pssl_rec_chapol.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_rec_chapol$O: $(OBJDIR) src$Pssl$Pssl_rec_chapol.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_rec_chapol$O src$Pssl$Pssl_rec_chapol.c + +-$(OBJDIR)$Pssl_rec_gcm$O: src$Pssl$Pssl_rec_gcm.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_rec_gcm$O: $(OBJDIR) src$Pssl$Pssl_rec_gcm.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_rec_gcm$O src$Pssl$Pssl_rec_gcm.c + +-$(OBJDIR)$Pssl_scert_single_ec$O: src$Pssl$Pssl_scert_single_ec.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_scert_single_ec$O: $(OBJDIR) src$Pssl$Pssl_scert_single_ec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_scert_single_ec$O src$Pssl$Pssl_scert_single_ec.c + +-$(OBJDIR)$Pssl_scert_single_rsa$O: src$Pssl$Pssl_scert_single_rsa.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_scert_single_rsa$O: $(OBJDIR) src$Pssl$Pssl_scert_single_rsa.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_scert_single_rsa$O src$Pssl$Pssl_scert_single_rsa.c + +-$(OBJDIR)$Pssl_server$O: src$Pssl$Pssl_server.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_server$O: $(OBJDIR) src$Pssl$Pssl_server.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_server$O src$Pssl$Pssl_server.c + +-$(OBJDIR)$Pssl_server_full_ec$O: src$Pssl$Pssl_server_full_ec.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_server_full_ec$O: $(OBJDIR) src$Pssl$Pssl_server_full_ec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_server_full_ec$O src$Pssl$Pssl_server_full_ec.c + +-$(OBJDIR)$Pssl_server_full_rsa$O: src$Pssl$Pssl_server_full_rsa.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_server_full_rsa$O: $(OBJDIR) src$Pssl$Pssl_server_full_rsa.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_server_full_rsa$O src$Pssl$Pssl_server_full_rsa.c + +-$(OBJDIR)$Pssl_server_mine2c$O: src$Pssl$Pssl_server_mine2c.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_server_mine2c$O: $(OBJDIR) src$Pssl$Pssl_server_mine2c.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_server_mine2c$O src$Pssl$Pssl_server_mine2c.c + +-$(OBJDIR)$Pssl_server_mine2g$O: src$Pssl$Pssl_server_mine2g.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_server_mine2g$O: $(OBJDIR) src$Pssl$Pssl_server_mine2g.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_server_mine2g$O src$Pssl$Pssl_server_mine2g.c + +-$(OBJDIR)$Pssl_server_minf2c$O: src$Pssl$Pssl_server_minf2c.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_server_minf2c$O: $(OBJDIR) src$Pssl$Pssl_server_minf2c.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_server_minf2c$O src$Pssl$Pssl_server_minf2c.c + +-$(OBJDIR)$Pssl_server_minf2g$O: src$Pssl$Pssl_server_minf2g.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_server_minf2g$O: $(OBJDIR) src$Pssl$Pssl_server_minf2g.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_server_minf2g$O src$Pssl$Pssl_server_minf2g.c + +-$(OBJDIR)$Pssl_server_minr2g$O: src$Pssl$Pssl_server_minr2g.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_server_minr2g$O: $(OBJDIR) src$Pssl$Pssl_server_minr2g.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_server_minr2g$O src$Pssl$Pssl_server_minr2g.c + +-$(OBJDIR)$Pssl_server_minu2g$O: src$Pssl$Pssl_server_minu2g.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_server_minu2g$O: $(OBJDIR) src$Pssl$Pssl_server_minu2g.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_server_minu2g$O src$Pssl$Pssl_server_minu2g.c + +-$(OBJDIR)$Pssl_server_minv2g$O: src$Pssl$Pssl_server_minv2g.c $(HEADERSPRIV) ++$(OBJDIR)$Pssl_server_minv2g$O: $(OBJDIR) src$Pssl$Pssl_server_minv2g.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pssl_server_minv2g$O src$Pssl$Pssl_server_minv2g.c + +-$(OBJDIR)$Paes_big_cbcdec$O: src$Psymcipher$Paes_big_cbcdec.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_big_cbcdec$O: $(OBJDIR) src$Psymcipher$Paes_big_cbcdec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_big_cbcdec$O src$Psymcipher$Paes_big_cbcdec.c + +-$(OBJDIR)$Paes_big_cbcenc$O: src$Psymcipher$Paes_big_cbcenc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_big_cbcenc$O: $(OBJDIR) src$Psymcipher$Paes_big_cbcenc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_big_cbcenc$O src$Psymcipher$Paes_big_cbcenc.c + +-$(OBJDIR)$Paes_big_ctr$O: src$Psymcipher$Paes_big_ctr.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_big_ctr$O: $(OBJDIR) src$Psymcipher$Paes_big_ctr.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_big_ctr$O src$Psymcipher$Paes_big_ctr.c + +-$(OBJDIR)$Paes_big_ctrcbc$O: src$Psymcipher$Paes_big_ctrcbc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_big_ctrcbc$O: $(OBJDIR) src$Psymcipher$Paes_big_ctrcbc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_big_ctrcbc$O src$Psymcipher$Paes_big_ctrcbc.c + +-$(OBJDIR)$Paes_big_dec$O: src$Psymcipher$Paes_big_dec.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_big_dec$O: $(OBJDIR) src$Psymcipher$Paes_big_dec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_big_dec$O src$Psymcipher$Paes_big_dec.c + +-$(OBJDIR)$Paes_big_enc$O: src$Psymcipher$Paes_big_enc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_big_enc$O: $(OBJDIR) src$Psymcipher$Paes_big_enc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_big_enc$O src$Psymcipher$Paes_big_enc.c + +-$(OBJDIR)$Paes_common$O: src$Psymcipher$Paes_common.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_common$O: $(OBJDIR) src$Psymcipher$Paes_common.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_common$O src$Psymcipher$Paes_common.c + +-$(OBJDIR)$Paes_ct$O: src$Psymcipher$Paes_ct.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_ct$O: $(OBJDIR) src$Psymcipher$Paes_ct.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_ct$O src$Psymcipher$Paes_ct.c + +-$(OBJDIR)$Paes_ct64$O: src$Psymcipher$Paes_ct64.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_ct64$O: $(OBJDIR) src$Psymcipher$Paes_ct64.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_ct64$O src$Psymcipher$Paes_ct64.c + +-$(OBJDIR)$Paes_ct64_cbcdec$O: src$Psymcipher$Paes_ct64_cbcdec.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_ct64_cbcdec$O: $(OBJDIR) src$Psymcipher$Paes_ct64_cbcdec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_ct64_cbcdec$O src$Psymcipher$Paes_ct64_cbcdec.c + +-$(OBJDIR)$Paes_ct64_cbcenc$O: src$Psymcipher$Paes_ct64_cbcenc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_ct64_cbcenc$O: $(OBJDIR) src$Psymcipher$Paes_ct64_cbcenc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_ct64_cbcenc$O src$Psymcipher$Paes_ct64_cbcenc.c + +-$(OBJDIR)$Paes_ct64_ctr$O: src$Psymcipher$Paes_ct64_ctr.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_ct64_ctr$O: $(OBJDIR) src$Psymcipher$Paes_ct64_ctr.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_ct64_ctr$O src$Psymcipher$Paes_ct64_ctr.c + +-$(OBJDIR)$Paes_ct64_ctrcbc$O: src$Psymcipher$Paes_ct64_ctrcbc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_ct64_ctrcbc$O: $(OBJDIR) src$Psymcipher$Paes_ct64_ctrcbc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_ct64_ctrcbc$O src$Psymcipher$Paes_ct64_ctrcbc.c + +-$(OBJDIR)$Paes_ct64_dec$O: src$Psymcipher$Paes_ct64_dec.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_ct64_dec$O: $(OBJDIR) src$Psymcipher$Paes_ct64_dec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_ct64_dec$O src$Psymcipher$Paes_ct64_dec.c + +-$(OBJDIR)$Paes_ct64_enc$O: src$Psymcipher$Paes_ct64_enc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_ct64_enc$O: $(OBJDIR) src$Psymcipher$Paes_ct64_enc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_ct64_enc$O src$Psymcipher$Paes_ct64_enc.c + +-$(OBJDIR)$Paes_ct_cbcdec$O: src$Psymcipher$Paes_ct_cbcdec.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_ct_cbcdec$O: $(OBJDIR) src$Psymcipher$Paes_ct_cbcdec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_ct_cbcdec$O src$Psymcipher$Paes_ct_cbcdec.c + +-$(OBJDIR)$Paes_ct_cbcenc$O: src$Psymcipher$Paes_ct_cbcenc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_ct_cbcenc$O: $(OBJDIR) src$Psymcipher$Paes_ct_cbcenc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_ct_cbcenc$O src$Psymcipher$Paes_ct_cbcenc.c + +-$(OBJDIR)$Paes_ct_ctr$O: src$Psymcipher$Paes_ct_ctr.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_ct_ctr$O: $(OBJDIR) src$Psymcipher$Paes_ct_ctr.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_ct_ctr$O src$Psymcipher$Paes_ct_ctr.c + +-$(OBJDIR)$Paes_ct_ctrcbc$O: src$Psymcipher$Paes_ct_ctrcbc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_ct_ctrcbc$O: $(OBJDIR) src$Psymcipher$Paes_ct_ctrcbc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_ct_ctrcbc$O src$Psymcipher$Paes_ct_ctrcbc.c + +-$(OBJDIR)$Paes_ct_dec$O: src$Psymcipher$Paes_ct_dec.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_ct_dec$O: $(OBJDIR) src$Psymcipher$Paes_ct_dec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_ct_dec$O src$Psymcipher$Paes_ct_dec.c + +-$(OBJDIR)$Paes_ct_enc$O: src$Psymcipher$Paes_ct_enc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_ct_enc$O: $(OBJDIR) src$Psymcipher$Paes_ct_enc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_ct_enc$O src$Psymcipher$Paes_ct_enc.c + +-$(OBJDIR)$Paes_pwr8$O: src$Psymcipher$Paes_pwr8.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_pwr8$O: $(OBJDIR) src$Psymcipher$Paes_pwr8.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_pwr8$O src$Psymcipher$Paes_pwr8.c + +-$(OBJDIR)$Paes_pwr8_cbcdec$O: src$Psymcipher$Paes_pwr8_cbcdec.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_pwr8_cbcdec$O: $(OBJDIR) src$Psymcipher$Paes_pwr8_cbcdec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_pwr8_cbcdec$O src$Psymcipher$Paes_pwr8_cbcdec.c + +-$(OBJDIR)$Paes_pwr8_cbcenc$O: src$Psymcipher$Paes_pwr8_cbcenc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_pwr8_cbcenc$O: $(OBJDIR) src$Psymcipher$Paes_pwr8_cbcenc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_pwr8_cbcenc$O src$Psymcipher$Paes_pwr8_cbcenc.c + +-$(OBJDIR)$Paes_pwr8_ctr$O: src$Psymcipher$Paes_pwr8_ctr.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_pwr8_ctr$O: $(OBJDIR) src$Psymcipher$Paes_pwr8_ctr.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_pwr8_ctr$O src$Psymcipher$Paes_pwr8_ctr.c + +-$(OBJDIR)$Paes_pwr8_ctrcbc$O: src$Psymcipher$Paes_pwr8_ctrcbc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_pwr8_ctrcbc$O: $(OBJDIR) src$Psymcipher$Paes_pwr8_ctrcbc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_pwr8_ctrcbc$O src$Psymcipher$Paes_pwr8_ctrcbc.c + +-$(OBJDIR)$Paes_small_cbcdec$O: src$Psymcipher$Paes_small_cbcdec.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_small_cbcdec$O: $(OBJDIR) src$Psymcipher$Paes_small_cbcdec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_small_cbcdec$O src$Psymcipher$Paes_small_cbcdec.c + +-$(OBJDIR)$Paes_small_cbcenc$O: src$Psymcipher$Paes_small_cbcenc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_small_cbcenc$O: $(OBJDIR) src$Psymcipher$Paes_small_cbcenc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_small_cbcenc$O src$Psymcipher$Paes_small_cbcenc.c + +-$(OBJDIR)$Paes_small_ctr$O: src$Psymcipher$Paes_small_ctr.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_small_ctr$O: $(OBJDIR) src$Psymcipher$Paes_small_ctr.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_small_ctr$O src$Psymcipher$Paes_small_ctr.c + +-$(OBJDIR)$Paes_small_ctrcbc$O: src$Psymcipher$Paes_small_ctrcbc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_small_ctrcbc$O: $(OBJDIR) src$Psymcipher$Paes_small_ctrcbc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_small_ctrcbc$O src$Psymcipher$Paes_small_ctrcbc.c + +-$(OBJDIR)$Paes_small_dec$O: src$Psymcipher$Paes_small_dec.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_small_dec$O: $(OBJDIR) src$Psymcipher$Paes_small_dec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_small_dec$O src$Psymcipher$Paes_small_dec.c + +-$(OBJDIR)$Paes_small_enc$O: src$Psymcipher$Paes_small_enc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_small_enc$O: $(OBJDIR) src$Psymcipher$Paes_small_enc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_small_enc$O src$Psymcipher$Paes_small_enc.c + +-$(OBJDIR)$Paes_x86ni$O: src$Psymcipher$Paes_x86ni.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_x86ni$O: $(OBJDIR) src$Psymcipher$Paes_x86ni.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_x86ni$O src$Psymcipher$Paes_x86ni.c + +-$(OBJDIR)$Paes_x86ni_cbcdec$O: src$Psymcipher$Paes_x86ni_cbcdec.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_x86ni_cbcdec$O: $(OBJDIR) src$Psymcipher$Paes_x86ni_cbcdec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_x86ni_cbcdec$O src$Psymcipher$Paes_x86ni_cbcdec.c + +-$(OBJDIR)$Paes_x86ni_cbcenc$O: src$Psymcipher$Paes_x86ni_cbcenc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_x86ni_cbcenc$O: $(OBJDIR) src$Psymcipher$Paes_x86ni_cbcenc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_x86ni_cbcenc$O src$Psymcipher$Paes_x86ni_cbcenc.c + +-$(OBJDIR)$Paes_x86ni_ctr$O: src$Psymcipher$Paes_x86ni_ctr.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_x86ni_ctr$O: $(OBJDIR) src$Psymcipher$Paes_x86ni_ctr.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_x86ni_ctr$O src$Psymcipher$Paes_x86ni_ctr.c + +-$(OBJDIR)$Paes_x86ni_ctrcbc$O: src$Psymcipher$Paes_x86ni_ctrcbc.c $(HEADERSPRIV) ++$(OBJDIR)$Paes_x86ni_ctrcbc$O: $(OBJDIR) src$Psymcipher$Paes_x86ni_ctrcbc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Paes_x86ni_ctrcbc$O src$Psymcipher$Paes_x86ni_ctrcbc.c + +-$(OBJDIR)$Pchacha20_ct$O: src$Psymcipher$Pchacha20_ct.c $(HEADERSPRIV) ++$(OBJDIR)$Pchacha20_ct$O: $(OBJDIR) src$Psymcipher$Pchacha20_ct.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pchacha20_ct$O src$Psymcipher$Pchacha20_ct.c + +-$(OBJDIR)$Pchacha20_sse2$O: src$Psymcipher$Pchacha20_sse2.c $(HEADERSPRIV) ++$(OBJDIR)$Pchacha20_sse2$O: $(OBJDIR) src$Psymcipher$Pchacha20_sse2.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pchacha20_sse2$O src$Psymcipher$Pchacha20_sse2.c + +-$(OBJDIR)$Pdes_ct$O: src$Psymcipher$Pdes_ct.c $(HEADERSPRIV) ++$(OBJDIR)$Pdes_ct$O: $(OBJDIR) src$Psymcipher$Pdes_ct.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdes_ct$O src$Psymcipher$Pdes_ct.c + +-$(OBJDIR)$Pdes_ct_cbcdec$O: src$Psymcipher$Pdes_ct_cbcdec.c $(HEADERSPRIV) ++$(OBJDIR)$Pdes_ct_cbcdec$O: $(OBJDIR) src$Psymcipher$Pdes_ct_cbcdec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdes_ct_cbcdec$O src$Psymcipher$Pdes_ct_cbcdec.c + +-$(OBJDIR)$Pdes_ct_cbcenc$O: src$Psymcipher$Pdes_ct_cbcenc.c $(HEADERSPRIV) ++$(OBJDIR)$Pdes_ct_cbcenc$O: $(OBJDIR) src$Psymcipher$Pdes_ct_cbcenc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdes_ct_cbcenc$O src$Psymcipher$Pdes_ct_cbcenc.c + +-$(OBJDIR)$Pdes_support$O: src$Psymcipher$Pdes_support.c $(HEADERSPRIV) ++$(OBJDIR)$Pdes_support$O: $(OBJDIR) src$Psymcipher$Pdes_support.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdes_support$O src$Psymcipher$Pdes_support.c + +-$(OBJDIR)$Pdes_tab$O: src$Psymcipher$Pdes_tab.c $(HEADERSPRIV) ++$(OBJDIR)$Pdes_tab$O: $(OBJDIR) src$Psymcipher$Pdes_tab.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdes_tab$O src$Psymcipher$Pdes_tab.c + +-$(OBJDIR)$Pdes_tab_cbcdec$O: src$Psymcipher$Pdes_tab_cbcdec.c $(HEADERSPRIV) ++$(OBJDIR)$Pdes_tab_cbcdec$O: $(OBJDIR) src$Psymcipher$Pdes_tab_cbcdec.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdes_tab_cbcdec$O src$Psymcipher$Pdes_tab_cbcdec.c + +-$(OBJDIR)$Pdes_tab_cbcenc$O: src$Psymcipher$Pdes_tab_cbcenc.c $(HEADERSPRIV) ++$(OBJDIR)$Pdes_tab_cbcenc$O: $(OBJDIR) src$Psymcipher$Pdes_tab_cbcenc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pdes_tab_cbcenc$O src$Psymcipher$Pdes_tab_cbcenc.c + +-$(OBJDIR)$Ppoly1305_ctmul$O: src$Psymcipher$Ppoly1305_ctmul.c $(HEADERSPRIV) ++$(OBJDIR)$Ppoly1305_ctmul$O: $(OBJDIR) src$Psymcipher$Ppoly1305_ctmul.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Ppoly1305_ctmul$O src$Psymcipher$Ppoly1305_ctmul.c + +-$(OBJDIR)$Ppoly1305_ctmul32$O: src$Psymcipher$Ppoly1305_ctmul32.c $(HEADERSPRIV) ++$(OBJDIR)$Ppoly1305_ctmul32$O: $(OBJDIR) src$Psymcipher$Ppoly1305_ctmul32.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Ppoly1305_ctmul32$O src$Psymcipher$Ppoly1305_ctmul32.c + +-$(OBJDIR)$Ppoly1305_ctmulq$O: src$Psymcipher$Ppoly1305_ctmulq.c $(HEADERSPRIV) ++$(OBJDIR)$Ppoly1305_ctmulq$O: $(OBJDIR) src$Psymcipher$Ppoly1305_ctmulq.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Ppoly1305_ctmulq$O src$Psymcipher$Ppoly1305_ctmulq.c + +-$(OBJDIR)$Ppoly1305_i15$O: src$Psymcipher$Ppoly1305_i15.c $(HEADERSPRIV) ++$(OBJDIR)$Ppoly1305_i15$O: $(OBJDIR) src$Psymcipher$Ppoly1305_i15.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Ppoly1305_i15$O src$Psymcipher$Ppoly1305_i15.c + +-$(OBJDIR)$Pasn1enc$O: src$Px509$Pasn1enc.c $(HEADERSPRIV) ++$(OBJDIR)$Pasn1enc$O: $(OBJDIR) src$Px509$Pasn1enc.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pasn1enc$O src$Px509$Pasn1enc.c + +-$(OBJDIR)$Pencode_ec_pk8der$O: src$Px509$Pencode_ec_pk8der.c $(HEADERSPRIV) ++$(OBJDIR)$Pencode_ec_pk8der$O: $(OBJDIR) src$Px509$Pencode_ec_pk8der.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pencode_ec_pk8der$O src$Px509$Pencode_ec_pk8der.c + +-$(OBJDIR)$Pencode_ec_rawder$O: src$Px509$Pencode_ec_rawder.c $(HEADERSPRIV) ++$(OBJDIR)$Pencode_ec_rawder$O: $(OBJDIR) src$Px509$Pencode_ec_rawder.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pencode_ec_rawder$O src$Px509$Pencode_ec_rawder.c + +-$(OBJDIR)$Pencode_rsa_pk8der$O: src$Px509$Pencode_rsa_pk8der.c $(HEADERSPRIV) ++$(OBJDIR)$Pencode_rsa_pk8der$O: $(OBJDIR) src$Px509$Pencode_rsa_pk8der.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pencode_rsa_pk8der$O src$Px509$Pencode_rsa_pk8der.c + +-$(OBJDIR)$Pencode_rsa_rawder$O: src$Px509$Pencode_rsa_rawder.c $(HEADERSPRIV) ++$(OBJDIR)$Pencode_rsa_rawder$O: $(OBJDIR) src$Px509$Pencode_rsa_rawder.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pencode_rsa_rawder$O src$Px509$Pencode_rsa_rawder.c + +-$(OBJDIR)$Pskey_decoder$O: src$Px509$Pskey_decoder.c $(HEADERSPRIV) ++$(OBJDIR)$Pskey_decoder$O: $(OBJDIR) src$Px509$Pskey_decoder.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pskey_decoder$O src$Px509$Pskey_decoder.c + +-$(OBJDIR)$Px509_decoder$O: src$Px509$Px509_decoder.c $(HEADERSPRIV) ++$(OBJDIR)$Px509_decoder$O: $(OBJDIR) src$Px509$Px509_decoder.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Px509_decoder$O src$Px509$Px509_decoder.c + +-$(OBJDIR)$Px509_knownkey$O: src$Px509$Px509_knownkey.c $(HEADERSPRIV) ++$(OBJDIR)$Px509_knownkey$O: $(OBJDIR) src$Px509$Px509_knownkey.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Px509_knownkey$O src$Px509$Px509_knownkey.c + +-$(OBJDIR)$Px509_minimal$O: src$Px509$Px509_minimal.c $(HEADERSPRIV) ++$(OBJDIR)$Px509_minimal$O: $(OBJDIR) src$Px509$Px509_minimal.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Px509_minimal$O src$Px509$Px509_minimal.c + +-$(OBJDIR)$Px509_minimal_full$O: src$Px509$Px509_minimal_full.c $(HEADERSPRIV) ++$(OBJDIR)$Px509_minimal_full$O: $(OBJDIR) src$Px509$Px509_minimal_full.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Px509_minimal_full$O src$Px509$Px509_minimal_full.c + +-$(OBJDIR)$Pbrssl$O: tools$Pbrssl.c $(HEADERSTOOLS) ++$(OBJDIR)$Pbrssl$O: $(OBJDIR) tools$Pbrssl.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pbrssl$O tools$Pbrssl.c + +-$(OBJDIR)$Pcerts$O: tools$Pcerts.c $(HEADERSTOOLS) ++$(OBJDIR)$Pcerts$O: $(OBJDIR) tools$Pcerts.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pcerts$O tools$Pcerts.c + +-$(OBJDIR)$Pchain$O: tools$Pchain.c $(HEADERSTOOLS) ++$(OBJDIR)$Pchain$O: $(OBJDIR) tools$Pchain.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pchain$O tools$Pchain.c + +-$(OBJDIR)$Pclient$O: tools$Pclient.c $(HEADERSTOOLS) ++$(OBJDIR)$Pclient$O: $(OBJDIR) tools$Pclient.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pclient$O tools$Pclient.c + +-$(OBJDIR)$Perrors$O: tools$Perrors.c $(HEADERSTOOLS) ++$(OBJDIR)$Perrors$O: $(OBJDIR) tools$Perrors.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Perrors$O tools$Perrors.c + +-$(OBJDIR)$Pfiles$O: tools$Pfiles.c $(HEADERSTOOLS) ++$(OBJDIR)$Pfiles$O: $(OBJDIR) tools$Pfiles.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pfiles$O tools$Pfiles.c + +-$(OBJDIR)$Pimpl$O: tools$Pimpl.c $(HEADERSTOOLS) ++$(OBJDIR)$Pimpl$O: $(OBJDIR) tools$Pimpl.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pimpl$O tools$Pimpl.c + +-$(OBJDIR)$Pkeys$O: tools$Pkeys.c $(HEADERSTOOLS) ++$(OBJDIR)$Pkeys$O: $(OBJDIR) tools$Pkeys.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pkeys$O tools$Pkeys.c + +-$(OBJDIR)$Pnames$O: tools$Pnames.c $(HEADERSTOOLS) ++$(OBJDIR)$Pnames$O: $(OBJDIR) tools$Pnames.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pnames$O tools$Pnames.c + +-$(OBJDIR)$Pserver$O: tools$Pserver.c $(HEADERSTOOLS) ++$(OBJDIR)$Pserver$O: $(OBJDIR) tools$Pserver.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pserver$O tools$Pserver.c + +-$(OBJDIR)$Pskey$O: tools$Pskey.c $(HEADERSTOOLS) ++$(OBJDIR)$Pskey$O: $(OBJDIR) tools$Pskey.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pskey$O tools$Pskey.c + +-$(OBJDIR)$Psslio$O: tools$Psslio.c $(HEADERSTOOLS) ++$(OBJDIR)$Psslio$O: $(OBJDIR) tools$Psslio.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Psslio$O tools$Psslio.c + +-$(OBJDIR)$Pta$O: tools$Pta.c $(HEADERSTOOLS) ++$(OBJDIR)$Pta$O: $(OBJDIR) tools$Pta.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pta$O tools$Pta.c + +-$(OBJDIR)$Ptwrch$O: tools$Ptwrch.c $(HEADERSTOOLS) ++$(OBJDIR)$Ptwrch$O: $(OBJDIR) tools$Ptwrch.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Ptwrch$O tools$Ptwrch.c + +-$(OBJDIR)$Pvector$O: tools$Pvector.c $(HEADERSTOOLS) ++$(OBJDIR)$Pvector$O: $(OBJDIR) tools$Pvector.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pvector$O tools$Pvector.c + +-$(OBJDIR)$Pverify$O: tools$Pverify.c $(HEADERSTOOLS) ++$(OBJDIR)$Pverify$O: $(OBJDIR) tools$Pverify.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pverify$O tools$Pverify.c + +-$(OBJDIR)$Pxmem$O: tools$Pxmem.c $(HEADERSTOOLS) ++$(OBJDIR)$Pxmem$O: $(OBJDIR) tools$Pxmem.c $(HEADERSTOOLS) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Pxmem$O tools$Pxmem.c + +-$(OBJDIR)$Ptest_crypto$O: test$Ptest_crypto.c $(HEADERSPRIV) ++$(OBJDIR)$Ptest_crypto$O: $(OBJDIR) test$Ptest_crypto.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Ptest_crypto$O test$Ptest_crypto.c + +-$(OBJDIR)$Ptest_speed$O: test$Ptest_speed.c $(HEADERSPRIV) ++$(OBJDIR)$Ptest_speed$O: $(OBJDIR) test$Ptest_speed.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$Ptest_speed$O test$Ptest_speed.c + +-$(OBJDIR)$Ptest_x509$O: test$Ptest_x509.c $(HEADERSPRIV) ++$(OBJDIR)$Ptest_x509$O: $(OBJDIR) test$Ptest_x509.c $(HEADERSPRIV) + $(CC) $(CFLAGS) $(INCFLAGS) -DSRCDIRNAME=".." $(CCOUT)$(OBJDIR)$Ptest_x509$O test$Ptest_x509.c +diff --git a/mk/mkrules.sh b/mk/mkrules.sh +index eea159b..cce7564 100755 +--- a/mk/mkrules.sh ++++ b/mk/mkrules.sh +@@ -531,23 +531,23 @@ EOF + (for f in $coresrc ; do + b="$(basename "$f" .c)\$O" + g="$(escsep "$f")" +- printf '\n$(OBJDIR)$P%s: %s $(HEADERSPRIV)\n\t$(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$P%s %s\n' "$b" "$g" "$b" "$g" ++ printf '\n$(OBJDIR)$P%s: $(OBJDIR) %s $(HEADERSPRIV)\n\t$(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$P%s %s\n' "$b" "$g" "$b" "$g" + done + + for f in $toolssrc ; do + b="$(basename "$f" .c)\$O" + g="$(escsep "$f")" +- printf '\n$(OBJDIR)$P%s: %s $(HEADERSTOOLS)\n\t$(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$P%s %s\n' "$b" "$g" "$b" "$g" ++ printf '\n$(OBJDIR)$P%s: $(OBJDIR) %s $(HEADERSTOOLS)\n\t$(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$P%s %s\n' "$b" "$g" "$b" "$g" + done + + for f in $testcryptosrc $testspeedsrc ; do + b="$(basename "$f" .c)\$O" + g="$(escsep "$f")" +- printf '\n$(OBJDIR)$P%s: %s $(HEADERSPRIV)\n\t$(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$P%s %s\n' "$b" "$g" "$b" "$g" ++ printf '\n$(OBJDIR)$P%s: $(OBJDIR) %s $(HEADERSPRIV)\n\t$(CC) $(CFLAGS) $(INCFLAGS) $(CCOUT)$(OBJDIR)$P%s %s\n' "$b" "$g" "$b" "$g" + done + + for f in $testx509src ; do + b="$(basename "$f" .c)\$O" + g="$(escsep "$f")" +- printf '\n$(OBJDIR)$P%s: %s $(HEADERSPRIV)\n\t$(CC) $(CFLAGS) $(INCFLAGS) -DSRCDIRNAME=".." $(CCOUT)$(OBJDIR)$P%s %s\n' "$b" "$g" "$b" "$g" ++ printf '\n$(OBJDIR)$P%s: $(OBJDIR) %s $(HEADERSPRIV)\n\t$(CC) $(CFLAGS) $(INCFLAGS) -DSRCDIRNAME=".." $(CCOUT)$(OBJDIR)$P%s %s\n' "$b" "$g" "$b" "$g" + done) >> Rules.mk +-- +2.34.1 + diff --git a/package/belle-sip/belle-sip.mk b/package/belle-sip/belle-sip.mk index 11b96f3fd98..c9bcc3f55d6 100644 --- a/package/belle-sip/belle-sip.mk +++ b/package/belle-sip/belle-sip.mk @@ -35,7 +35,7 @@ endif BELLE_SIP_CFLAGS = $(TARGET_CFLAGS) -ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_99140),y) +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_99410),y) BELLE_SIP_CFLAGS += -O0 endif diff --git a/package/belr/belr.mk b/package/belr/belr.mk index f243830a853..26b949734f0 100644 --- a/package/belr/belr.mk +++ b/package/belr/belr.mk @@ -17,9 +17,8 @@ BELR_CONF_OPTS = \ ifeq ($(BR2_STATIC_LIBS),y) BELR_CONF_OPTS += -DENABLE_SHARED=OFF -DENABLE_STATIC=ON -else ifeq ($(BR2_SHARED_STATIC_LIBS),y) -BELR_CONF_OPTS += -DENABLE_SHARED=ON -DENABLE_STATIC=ON -else ifeq ($(BR2_SHARED_LIBS),y) +else +# cannot build static and shared together BELR_CONF_OPTS += -DENABLE_SHARED=ON -DENABLE_STATIC=OFF endif diff --git a/package/berkeleydb/Config.in b/package/berkeleydb/Config.in index f32d13ab170..f8fbb5cc093 100644 --- a/package/berkeleydb/Config.in +++ b/package/berkeleydb/Config.in @@ -13,6 +13,11 @@ config BR2_PACKAGE_BERKELEYDB_COMPAT185 help Build and install DB 1.85 compatibility API. +config BR2_PACKAGE_BERKELEYDB_DBM + bool "historic dbm interface" + help + Enable the historic dbm interface. + config BR2_PACKAGE_BERKELEYDB_TOOLS bool "install tools" help diff --git a/package/berkeleydb/berkeleydb.hash b/package/berkeleydb/berkeleydb.hash index 75293297486..7fbf9492f3d 100644 --- a/package/berkeleydb/berkeleydb.hash +++ b/package/berkeleydb/berkeleydb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 76a25560d9e52a198d37a31440fd07632b5f1f8f9f2b6d5438f4bc3e7c9013ef db-5.3.28.NC.tar.gz -sha256 b78815181a53241f9347c6b47d1031fd669946f863e1edc807a291354cec024b LICENSE +sha256 76a25560d9e52a198d37a31440fd07632b5f1f8f9f2b6d5438f4bc3e7c9013ef db-5.3.28.NC.tar.gz +sha256 b78815181a53241f9347c6b47d1031fd669946f863e1edc807a291354cec024b LICENSE diff --git a/package/berkeleydb/berkeleydb.mk b/package/berkeleydb/berkeleydb.mk index 36b1894f340..1c121370db2 100644 --- a/package/berkeleydb/berkeleydb.mk +++ b/package/berkeleydb/berkeleydb.mk @@ -39,6 +39,7 @@ define BERKELEYDB_CONFIGURE_CMDS --disable-java \ --disable-tcl \ $(if $(BR2_PACKAGE_BERKELEYDB_COMPAT185),--enable-compat185,--disable-compat185) \ + $(if $(BR2_PACKAGE_BERKELEYDB_DBM),--enable-dbm,--disable-dbm) \ $(SHARED_STATIC_LIBS_OPTS) \ --with-pic \ --enable-o_direct \ diff --git a/package/bind/Config.in b/package/bind/Config.in index db10ceb3047..63ccd57db7c 100644 --- a/package/bind/Config.in +++ b/package/bind/Config.in @@ -1,6 +1,11 @@ config BR2_PACKAGE_BIND bool "bind" - depends on BR2_USE_MMU # fork() + depends on BR2_USE_MMU # fork(), libuv + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv + depends on !BR2_STATIC_LIBS # libuv + select BR2_PACKAGE_LIBUV + select BR2_PACKAGE_OPENSSL help BIND (Berkeley Internet Name Domain) is an implementation of the Domain Name System (DNS) protocols @@ -37,3 +42,8 @@ config BR2_PACKAGE_BIND_TOOLS Install tools (dig, host, nslookup, nsupdate) endif + +comment "bind needs a toolchain w/ NPTL, dynamic library" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS diff --git a/package/bind/bind.hash b/package/bind/bind.hash index 70299f1677a..a8c15f2a12e 100644 --- a/package/bind/bind.hash +++ b/package/bind/bind.hash @@ -1,4 +1,4 @@ -# Verified from https://ftp.isc.org/isc/bind9/9.11.36/bind-9.11.36.tar.gz.asc +# Verified from https://ftp.isc.org/isc/bind9/9.16.42/bind-9.16.42.tar.xz.asc # with key AADBBA5074F1402F7B69D56BC5B4EE931A9F9DFD -sha256 c953fcb6703b395aaa53e65ff8b2869b69a5303dd60507cba2201305e1811681 bind-9.11.36.tar.gz -sha256 cad49daa42654bc241762cd998630168a2542c8fd6fad3881e2eac1510bb6fcd COPYRIGHT +sha256 a8b51c6bfdf3ab6885102f764c2418e037897b7ea46a09f8f07876fa11a6c0b3 bind-9.16.42.tar.xz +sha256 13491a682dc0f5ee2273cebd3949e2be62f9470fe659419a03a308d4f444773b COPYRIGHT diff --git a/package/bind/bind.mk b/package/bind/bind.mk index e329c803a36..618b5b9278e 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -4,18 +4,16 @@ # ################################################################################ -BIND_VERSION = 9.11.36 +BIND_VERSION = 9.16.42 +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_CONFIG_SCRIPTS = bind9-config isc-config.sh BIND_LICENSE = MPL-2.0 BIND_LICENSE_FILES = COPYRIGHT BIND_CPE_ID_VENDOR = isc BIND_SELINUX_MODULES = bind -# Only applies to RHEL6.x with DNSSEC validation on -BIND_IGNORE_CVES = CVE-2017-3139 # Library CVE and not used by bind but used by ISC DHCP BIND_IGNORE_CVES += CVE-2019-6470 BIND_TARGET_SERVER_SBIN = arpaname ddns-confgen dnssec-checkds dnssec-coverage @@ -28,23 +26,38 @@ BIND_TARGET_SERVER_SBIN += dnssec-keyfromlabel dnssec-signzone tsig-keygen BIND_TARGET_TOOLS_BIN = dig host nslookup nsupdate BIND_CONF_ENV = \ BUILD_CC="$(TARGET_CC)" \ - BUILD_CFLAGS="$(TARGET_CFLAGS)" + LIBS=`$(PKG_CONFIG_HOST_BINARY) --libs openssl` BIND_CONF_OPTS = \ - $(if $(BR2_TOOLCHAIN_HAS_THREADS),--enable-threads,--disable-threads) \ + --without-cmocka \ --without-lmdb \ - --with-libjson=no \ - --with-randomdev=/dev/urandom \ --enable-epoll \ - --enable-filter-aaaa \ - --disable-backtrace + --disable-backtrace \ + --with-openssl=$(STAGING_DIR)/usr + +BIND_DEPENDENCIES = host-pkgconf libuv openssl + +BIND_CFLAGS = $(TARGET_CFLAGS) + +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_101737),y) +BIND_CFLAGS += -O0 +endif + +BIND_CONF_OPTS += CFLAGS="$(BIND_CFLAGS)" ifeq ($(BR2_PACKAGE_ZLIB),y) -BIND_CONF_OPTS += --with-zlib=$(STAGING_DIR)/usr +BIND_CONF_OPTS += --with-zlib BIND_DEPENDENCIES += zlib else BIND_CONF_OPTS += --without-zlib endif +ifeq ($(BR2_PACKAGE_JSON_C),y) +BIND_CONF_OPTS += --with-json-c +BIND_DEPENDENCIES += json-c +else +BIND_CONF_OPTS += --without-json-c +endif + ifeq ($(BR2_PACKAGE_LIBCAP),y) BIND_CONF_OPTS += --enable-linux-caps BIND_DEPENDENCIES += libcap @@ -52,6 +65,13 @@ else BIND_CONF_OPTS += --disable-linux-caps endif +ifeq ($(BR2_PACKAGE_LIBIDN2),y) +BIND_CONF_OPTS += --with-libidn2 +BIND_DEPENDENCIES += libidn2 +else +BIND_CONF_OPTS += --without-libidn2 +endif + ifeq ($(BR2_PACKAGE_LIBKRB5),y) BIND_CONF_OPTS += --with-gssapi=$(STAGING_DIR)/usr/bin/krb5-config BIND_DEPENDENCIES += libkrb5 @@ -59,35 +79,24 @@ else BIND_CONF_OPTS += --with-gssapi=no endif -ifeq ($(BR2_PACKAGE_LIBXML2),y) -BIND_CONF_OPTS += --with-libxml2=$(STAGING_DIR)/usr -BIND_DEPENDENCIES += libxml2 +ifeq ($(BR2_PACKAGE_LIBMAXMINDDB),y) +BIND_CONF_OPTS += --enable-geoip --with-maxminddb +BIND_DEPENDENCIES += libmaxminddb else -BIND_CONF_OPTS += --with-libxml2=no +BIND_CONF_OPTS += --disable-geoip endif -ifeq ($(BR2_PACKAGE_OPENSSL),y) -BIND_DEPENDENCIES += host-pkgconf openssl -BIND_CONF_OPTS += \ - --with-openssl=$(STAGING_DIR)/usr \ - --with-ecdsa=yes \ - --with-eddsa=no \ - --with-aes=yes -BIND_CONF_ENV += LIBS=`$(PKG_CONFIG_HOST_BINARY) --libs openssl` -# GOST cipher support requires openssl extra engines -ifeq ($(BR2_PACKAGE_OPENSSL_ENGINES),y) -BIND_CONF_OPTS += --with-gost=yes -else -BIND_CONF_OPTS += --with-gost=no -endif +ifeq ($(BR2_PACKAGE_LIBXML2),y) +BIND_CONF_OPTS += --with-libxml2 +BIND_DEPENDENCIES += libxml2 else -BIND_CONF_OPTS += --with-openssl=no +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)/usr/bin/python +BIND_CONF_OPTS += --with-python=$(HOST_DIR)/bin/python else BIND_CONF_OPTS += --with-python=no endif diff --git a/package/binutils/2.32/0001-sh-conf.patch b/package/binutils/2.32/0001-sh-conf.patch deleted file mode 100644 index fff91ae35cf..00000000000 --- a/package/binutils/2.32/0001-sh-conf.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 98b2acf2bd3a527d114a9f8931083c2617a2daa9 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). - -[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 37476459612..66fbc19f9ff 100755 ---- a/configure -+++ b/configure -@@ -3861,7 +3861,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 46501c28826..6c731930884 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1158,7 +1158,7 @@ case "${target}" in - nvptx*-*-*) - noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" - ;; -- sh-*-*) -+ sh*-*-*) - case "${target}" in - sh*-*-elf) - ;; --- -2.14.5 - diff --git a/package/binutils/2.32/0002-poison-system-directories.patch b/package/binutils/2.32/0002-poison-system-directories.patch deleted file mode 100644 index 98f41e87f3a..00000000000 --- a/package/binutils/2.32/0002-poison-system-directories.patch +++ /dev/null @@ -1,306 +0,0 @@ -From f559402ea868d370ddf25089c68cda2600db3bfa 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. - -[Romain: rebase on top of 2.32] -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] - -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 d93c9b08300..5da2742beac 100644 ---- a/ld/config.in -+++ b/ld/config.in -@@ -31,6 +31,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 18ada7808f5..7e7d2f97809 100755 ---- a/ld/configure -+++ b/ld/configure -@@ -822,6 +822,7 @@ with_lib_path - enable_targets - enable_64_bit_bfd - with_sysroot -+enable_poison_system_directories - enable_gold - enable_got - enable_compressed_debug_sections -@@ -1486,6 +1487,8 @@ Optional Features: - --disable-largefile omit support for large files - --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) -@@ -15803,7 +15806,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 d335f210917..7f692d93873 100644 ---- a/ld/configure.ac -+++ b/ld/configure.ac -@@ -94,6 +94,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 b97d977f37b..f3bbd2d55d4 100644 ---- a/ld/ld.h -+++ b/ld/ld.h -@@ -180,6 +180,14 @@ typedef struct - in the linker script. */ - bfd_boolean force_group_allocation; - -+ /* If TRUE (the default) warn for uses of system directories when -+ cross linking. */ -+ bfd_boolean poison_system_directories; -+ -+ /* If TRUE (default FALSE) give an error for uses of system -+ directories when cross linking instead of a warning. */ -+ bfd_boolean 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 5179af3e0e1..f78bf746822 100644 ---- a/ld/ld.texi -+++ b/ld/ld.texi -@@ -2524,6 +2524,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. - @end table - - @c man end -diff --git a/ld/ldfile.c b/ld/ldfile.c -index fcadc08c73f..63e295ce8ae 100644 ---- a/ld/ldfile.c -+++ b/ld/ldfile.c -@@ -116,6 +116,23 @@ ldfile_add_library_path (const char *name, bfd_boolean 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 -+ - } - - /* Try to open a BFD for a lang_input_statement. */ -diff --git a/ld/ldlex.h b/ld/ldlex.h -index 32853debe45..8135361c498 100644 ---- a/ld/ldlex.h -+++ b/ld/ldlex.h -@@ -148,6 +148,8 @@ enum option_values - OPTION_REQUIRE_DEFINED_SYMBOL, - OPTION_ORPHAN_HANDLING, - OPTION_FORCE_GROUP_ALLOCATION, -+ OPTION_NO_POISON_SYSTEM_DIRECTORIES, -+ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, - }; - - /* The initial parser states. */ -diff --git a/ld/ldmain.c b/ld/ldmain.c -index 77cdbd0dd29..725512f1260 100644 ---- a/ld/ldmain.c -+++ b/ld/ldmain.c -@@ -269,6 +269,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 88e85c73f49..be4cd492d14 100644 ---- a/ld/lexsup.c -+++ b/ld/lexsup.c -@@ -543,6 +543,14 @@ static const struct ld_option ld_options[] = - { {"orphan-handling", required_argument, NULL, OPTION_ORPHAN_HANDLING}, - '\0', N_("=MODE"), N_("Control how orphan sections are handled."), - 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) -@@ -555,6 +563,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; -@@ -1543,6 +1552,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), -@@ -1586,6 +1603,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) - { - lang_leave_group (); --- -2.14.5 - diff --git a/package/binutils/2.32/0003-bfd-xtensa-fix-shrink_dynamic_reloc_sections-for-exp.patch b/package/binutils/2.32/0003-bfd-xtensa-fix-shrink_dynamic_reloc_sections-for-exp.patch deleted file mode 100644 index b80e1fa7ce0..00000000000 --- a/package/binutils/2.32/0003-bfd-xtensa-fix-shrink_dynamic_reloc_sections-for-exp.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 278989f23735aa501be1052e085540c75c126dbb Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Thu, 28 Mar 2019 17:03:57 -0700 -Subject: [PATCH] bfd: xtensa: fix shrink_dynamic_reloc_sections for - export-dynamic - -shrink_dynamic_reloc_sections must remove PLT entry that was created for -an undefined weak symbol in the presence of --export-dynamic option when -relaxation coalesces literals pointing to that symbol. This fixes the -following assertion: - - ld: BFD (GNU Binutils) 2.31.1 internal error, aborting at - elf32-xtensa.c:3292 in elf_xtensa_finish_dynamic_sections - -2019-03-28 Max Filippov -bfd/ - * elf32-xtensa.c (shrink_dynamic_reloc_sections): Add - info->export_dynamic to the conditional. - -Signed-off-by: Max Filippov ---- - bfd/elf32-xtensa.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c -index c3df3d6db756..37ea200eea74 100644 ---- a/bfd/elf32-xtensa.c -+++ b/bfd/elf32-xtensa.c -@@ -10083,7 +10083,8 @@ shrink_dynamic_reloc_sections (struct bfd_link_info *info, - && (input_section->flags & SEC_ALLOC) != 0 - && (dynamic_symbol || bfd_link_pic (info)) - && (!h || h->root.type != bfd_link_hash_undefweak -- || (dynamic_symbol && bfd_link_dll (info)))) -+ || (dynamic_symbol -+ && (bfd_link_dll (info) || info->export_dynamic)))) - { - asection *srel; - bfd_boolean is_plt = FALSE; --- -2.11.0 - diff --git a/package/binutils/2.32/0004-gas-use-literals-const16-for-xtensa-loop-relaxation.patch b/package/binutils/2.32/0004-gas-use-literals-const16-for-xtensa-loop-relaxation.patch deleted file mode 100644 index ed617bcaf75..00000000000 --- a/package/binutils/2.32/0004-gas-use-literals-const16-for-xtensa-loop-relaxation.patch +++ /dev/null @@ -1,294 +0,0 @@ -From 0dbdfb7918d0b0cfcb8883b24c1291574bf5bb7c Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Tue, 2 Apr 2019 14:32:42 -0700 -Subject: [PATCH] gas: use literals/const16 for xtensa loop relaxation - -Loop opcode relaxation that uses addi/addmi doesn't work well with other -relaxations that may cause code movement. Instead of encoding fixed loop -end offset in the relaxed sequence use l32r or a pair of const16 to load -loop end address. This way the address of the loop end gets a relocation -record and it gets updated appropriately. - -gas/ -2019-04-02 Max Filippov - - * config/tc-xtensa.c (convert_frag_immed): Drop - convert_frag_immed_finish_loop invocation. - (convert_frag_immed_finish_loop): Drop declaration and - definition. - * config/xtensa-relax.c (widen_spec_list): Replace loop - widening that uses addi/addmi with widening that uses l32r - and const16. - -Signed-off-by: Max Filippov ---- - gas/config/tc-xtensa.c | 120 ---------------------------------------------- - gas/config/xtensa-relax.c | 77 ++++++++++++++++++++--------- - 2 files changed, 55 insertions(+), 142 deletions(-) - -diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c -index 3bdbbc931cfc..0cc06361cf6f 100644 ---- a/gas/config/tc-xtensa.c -+++ b/gas/config/tc-xtensa.c -@@ -10668,7 +10668,6 @@ convert_frag_fill_nop (fragS *fragP) - static fixS *fix_new_exp_in_seg - (segT, subsegT, fragS *, int, int, expressionS *, int, - bfd_reloc_code_real_type); --static void convert_frag_immed_finish_loop (segT, fragS *, TInsn *); - - static void - convert_frag_immed (segT segP, -@@ -10910,9 +10909,6 @@ convert_frag_immed (segT segP, - } - } - -- if (expanded && xtensa_opcode_is_loop (isa, orig_tinsn.opcode) == 1) -- convert_frag_immed_finish_loop (segP, fragP, &orig_tinsn); -- - if (expanded && is_direct_call_opcode (orig_tinsn.opcode)) - { - /* Add an expansion note on the expanded instruction. */ -@@ -10949,122 +10945,6 @@ fix_new_exp_in_seg (segT new_seg, - } - - --/* Relax a loop instruction so that it can span loop >256 bytes. -- -- loop as, .L1 -- .L0: -- rsr as, LEND -- wsr as, LBEG -- addi as, as, lo8 (label-.L1) -- addmi as, as, mid8 (label-.L1) -- wsr as, LEND -- isync -- rsr as, LCOUNT -- addi as, as, 1 -- .L1: -- <> -- label: --*/ -- --static void --convert_frag_immed_finish_loop (segT segP, fragS *fragP, TInsn *tinsn) --{ -- TInsn loop_insn; -- TInsn addi_insn; -- TInsn addmi_insn; -- unsigned long target; -- static xtensa_insnbuf insnbuf = NULL; -- unsigned int loop_length, loop_length_hi, loop_length_lo; -- xtensa_isa isa = xtensa_default_isa; -- addressT loop_offset; -- addressT addi_offset = 9; -- addressT addmi_offset = 12; -- fragS *next_fragP; -- int target_count; -- -- if (!insnbuf) -- insnbuf = xtensa_insnbuf_alloc (isa); -- -- /* Get the loop offset. */ -- loop_offset = get_expanded_loop_offset (tinsn->opcode); -- -- /* Validate that there really is a LOOP at the loop_offset. Because -- loops are not bundleable, we can assume that the instruction will be -- in slot 0. */ -- tinsn_from_chars (&loop_insn, fragP->fr_opcode + loop_offset, 0); -- tinsn_immed_from_frag (&loop_insn, fragP, 0); -- -- gas_assert (xtensa_opcode_is_loop (isa, loop_insn.opcode) == 1); -- addi_offset += loop_offset; -- addmi_offset += loop_offset; -- -- gas_assert (tinsn->ntok == 2); -- if (tinsn->tok[1].X_op == O_constant) -- target = tinsn->tok[1].X_add_number; -- else if (tinsn->tok[1].X_op == O_symbol) -- { -- /* Find the fragment. */ -- symbolS *sym = tinsn->tok[1].X_add_symbol; -- gas_assert (S_GET_SEGMENT (sym) == segP -- || S_GET_SEGMENT (sym) == absolute_section); -- target = (S_GET_VALUE (sym) + tinsn->tok[1].X_add_number); -- } -- else -- { -- as_bad (_("invalid expression evaluation type %d"), tinsn->tok[1].X_op); -- target = 0; -- } -- -- loop_length = target - (fragP->fr_address + fragP->fr_fix); -- loop_length_hi = loop_length & ~0x0ff; -- loop_length_lo = loop_length & 0x0ff; -- if (loop_length_lo >= 128) -- { -- loop_length_lo -= 256; -- loop_length_hi += 256; -- } -- -- /* Because addmi sign-extends the immediate, 'loop_length_hi' can be at most -- 32512. If the loop is larger than that, then we just fail. */ -- if (loop_length_hi > 32512) -- as_bad_where (fragP->fr_file, fragP->fr_line, -- _("loop too long for LOOP instruction")); -- -- tinsn_from_chars (&addi_insn, fragP->fr_opcode + addi_offset, 0); -- gas_assert (addi_insn.opcode == xtensa_addi_opcode); -- -- tinsn_from_chars (&addmi_insn, fragP->fr_opcode + addmi_offset, 0); -- gas_assert (addmi_insn.opcode == xtensa_addmi_opcode); -- -- set_expr_const (&addi_insn.tok[2], loop_length_lo); -- tinsn_to_insnbuf (&addi_insn, insnbuf); -- -- fragP->tc_frag_data.is_insn = TRUE; -- xtensa_insnbuf_to_chars -- (isa, insnbuf, (unsigned char *) fragP->fr_opcode + addi_offset, 0); -- -- set_expr_const (&addmi_insn.tok[2], loop_length_hi); -- tinsn_to_insnbuf (&addmi_insn, insnbuf); -- xtensa_insnbuf_to_chars -- (isa, insnbuf, (unsigned char *) fragP->fr_opcode + addmi_offset, 0); -- -- /* Walk through all of the frags from here to the loop end -- and mark them as no_transform to keep them from being modified -- by the linker. If we ever have a relocation for the -- addi/addmi of the difference of two symbols we can remove this. */ -- -- target_count = 0; -- for (next_fragP = fragP; next_fragP != NULL; -- next_fragP = next_fragP->fr_next) -- { -- next_fragP->tc_frag_data.is_no_transform = TRUE; -- if (next_fragP->tc_frag_data.is_loop_target) -- target_count++; -- if (target_count == 2) -- break; -- } --} -- - - /* A map that keeps information on a per-subsegment basis. This is - maintained during initial assembly, but is invalid once the -diff --git a/gas/config/xtensa-relax.c b/gas/config/xtensa-relax.c -index cb296ed85ed2..daf15d52c259 100644 ---- a/gas/config/xtensa-relax.c -+++ b/gas/config/xtensa-relax.c -@@ -87,13 +87,7 @@ - when the first and second operands are not the same as specified - by the "| %at!=%as" precondition clause. - {"l32i %at,%as,%imm | %at!=%as", -- "LITERAL %imm; l32r %at,%LITERAL; add %at,%at,%as; l32i %at,%at,0"} -- -- There is special case for loop instructions here, but because we do -- not currently have the ability to represent the difference of two -- symbols, the conversion requires special code in the assembler to -- write the operands of the addi/addmi pair representing the -- difference of the old and new loop end label. */ -+ "LITERAL %imm; l32r %at,%LITERAL; add %at,%at,%as; l32i %at,%at,0"} */ - - #include "as.h" - #include "xtensa-isa.h" -@@ -306,44 +300,83 @@ static string_pattern_pair widen_spec_list[] = - {"l32i %at,%as,%imm | %at!=%as ? IsaUseConst16", - "const16 %at,HI16U(%imm); const16 %at,LOW16U(%imm); add %at,%at,%as; l32i %at,%at,0"}, - -- /* This is only PART of the loop instruction. In addition, -- hardcoded into its use is a modification of the final operand in -- the instruction in bytes 9 and 12. */ -- {"loop %as,%label | %as!=1 ? IsaUseLoops", -+ /* Widening loops with literals. */ -+ {"loop %as,%label | %as!=1 ? IsaUseLoops ? IsaUseL32R", -+ "loop %as,%LABEL;" -+ "rsr.lend %as;" /* LEND */ -+ "wsr.lbeg %as;" /* LBEG */ -+ "LITERAL %label;" -+ "l32r %as, %LITERAL;" -+ "nop;" -+ "wsr.lend %as;" -+ "isync;" -+ "rsr.lcount %as;" /* LCOUNT */ -+ "addi %as, %as, 1;" -+ "LABEL"}, -+ {"loopgtz %as,%label | %as!=1 ? IsaUseLoops ? IsaUseL32R", -+ "beqz %as,%label;" -+ "bltz %as,%label;" -+ "loopgtz %as,%LABEL;" -+ "rsr.lend %as;" /* LEND */ -+ "wsr.lbeg %as;" /* LBEG */ -+ "LITERAL %label;" -+ "l32r %as, %LITERAL;" -+ "nop;" -+ "wsr.lend %as;" -+ "isync;" -+ "rsr.lcount %as;" /* LCOUNT */ -+ "addi %as, %as, 1;" -+ "LABEL"}, -+ {"loopnez %as,%label | %as!=1 ? IsaUseLoops ? IsaUseL32R", -+ "beqz %as,%label;" -+ "loopnez %as,%LABEL;" -+ "rsr.lend %as;" /* LEND */ -+ "wsr.lbeg %as;" /* LBEG */ -+ "LITERAL %label;" -+ "l32r %as, %LITERAL;" -+ "nop;" -+ "wsr.lend %as;" -+ "isync;" -+ "rsr.lcount %as;" /* LCOUNT */ -+ "addi %as, %as, 1;" -+ "LABEL"}, -+ -+ /* Widening loops with const16. */ -+ {"loop %as,%label | %as!=1 ? IsaUseLoops ? IsaUseConst16", - "loop %as,%LABEL;" - "rsr.lend %as;" /* LEND */ - "wsr.lbeg %as;" /* LBEG */ -- "addi %as, %as, 0;" /* lo8(%label-%LABEL1) */ -- "addmi %as, %as, 0;" /* mid8(%label-%LABEL1) */ -+ "const16 %as,HI16U(%label);" -+ "const16 %as,LOW16U(%label);" - "wsr.lend %as;" - "isync;" - "rsr.lcount %as;" /* LCOUNT */ -- "addi %as, %as, 1;" /* density -> addi.n %as, %as, 1 */ -+ "addi %as, %as, 1;" - "LABEL"}, -- {"loopgtz %as,%label | %as!=1 ? IsaUseLoops", -+ {"loopgtz %as,%label | %as!=1 ? IsaUseLoops ? IsaUseConst16", - "beqz %as,%label;" - "bltz %as,%label;" - "loopgtz %as,%LABEL;" - "rsr.lend %as;" /* LEND */ - "wsr.lbeg %as;" /* LBEG */ -- "addi %as, %as, 0;" /* lo8(%label-%LABEL1) */ -- "addmi %as, %as, 0;" /* mid8(%label-%LABEL1) */ -+ "const16 %as,HI16U(%label);" -+ "const16 %as,LOW16U(%label);" - "wsr.lend %as;" - "isync;" - "rsr.lcount %as;" /* LCOUNT */ -- "addi %as, %as, 1;" /* density -> addi.n %as, %as, 1 */ -+ "addi %as, %as, 1;" - "LABEL"}, -- {"loopnez %as,%label | %as!=1 ? IsaUseLoops", -+ {"loopnez %as,%label | %as!=1 ? IsaUseLoops ? IsaUseConst16", - "beqz %as,%label;" - "loopnez %as,%LABEL;" - "rsr.lend %as;" /* LEND */ - "wsr.lbeg %as;" /* LBEG */ -- "addi %as, %as, 0;" /* lo8(%label-%LABEL1) */ -- "addmi %as, %as, 0;" /* mid8(%label-%LABEL1) */ -+ "const16 %as,HI16U(%label);" -+ "const16 %as,LOW16U(%label);" - "wsr.lend %as;" - "isync;" - "rsr.lcount %as;" /* LCOUNT */ -- "addi %as, %as, 1;" /* density -> addi.n %as, %as, 1 */ -+ "addi %as, %as, 1;" - "LABEL"}, - - /* Relaxing to wide branches. Order is important here. With wide --- -2.11.0 - diff --git a/package/binutils/2.32/0005-xtensa-gas-put-.literal_position-at-section-start.patch b/package/binutils/2.32/0005-xtensa-gas-put-.literal_position-at-section-start.patch deleted file mode 100644 index b4bbc27b374..00000000000 --- a/package/binutils/2.32/0005-xtensa-gas-put-.literal_position-at-section-start.patch +++ /dev/null @@ -1,96 +0,0 @@ -From 471702ac4a57878a06e8167f063274cf413e548d Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Mon, 8 Apr 2019 13:47:18 -0700 -Subject: [PATCH] xtensa: gas: put .literal_position at section start - -Provide literal position at the beginning of each section for literal -space reserved by relaxations when text-section-literals or -auto-litpools options are used. Remove code that adds fill frag to the -literal section for every .literal_position directive to avoid creation -of empty literal sections. - -Fix auto-litpools tests that got literal pool address changes. - -gas/ -2019-04-11 Max Filippov - - * config/tc-xtensa.c (xtensa_is_init_fini): Add declaration. - (xtensa_mark_literal_pool_location): Don't add fill frag to literal - section that records literal pool location. - (md_begin): Call xtensa_mark_literal_pool_location when text - section literals or auto litpools are used. - (xtensa_elf_section_change_hook): Call - xtensa_mark_literal_pool_location when text section literals or - auto litpools are used, there's no literal pool location defined - for the current section and it's not .init or .fini. - -Signed-off-by: Max Filippov ---- - gas/config/tc-xtensa.c | 22 +++++++++------------- - 1 file changed, 9 insertions(+), 13 deletions(-) - -diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c -index 0cc06361cf6f..6a80e76fed8c 100644 ---- a/gas/config/tc-xtensa.c -+++ b/gas/config/tc-xtensa.c -@@ -497,6 +497,7 @@ static fixS *xg_append_jump (fragS *fragP, symbolS *sym, offsetT offset); - static void xtensa_maybe_create_literal_pool_frag (bfd_boolean, bfd_boolean); - static bfd_boolean auto_litpools = FALSE; - static int auto_litpool_limit = 0; -+static bfd_boolean xtensa_is_init_fini (segT seg); - - /* Alignment Functions. */ - -@@ -4797,7 +4798,6 @@ xtensa_mark_literal_pool_location (void) - { - /* Any labels pointing to the current location need - to be adjusted to after the literal pool. */ -- emit_state s; - fragS *pool_location; - - if (use_literal_section) -@@ -4818,19 +4818,7 @@ xtensa_mark_literal_pool_location (void) - RELAX_LITERAL_POOL_END, NULL, 0, NULL); - xtensa_set_frag_assembly_state (frag_now); - -- /* Now put a frag into the literal pool that points to this location. */ - set_literal_pool_location (now_seg, pool_location); -- xtensa_switch_to_non_abs_literal_fragment (&s); -- frag_align (2, 0, 0); -- record_alignment (now_seg, 2); -- -- /* Close whatever frag is there. */ -- frag_variant (rs_fill, 0, 0, 0, NULL, 0, NULL); -- xtensa_set_frag_assembly_state (frag_now); -- frag_now->tc_frag_data.literal_frag = pool_location; -- frag_variant (rs_fill, 0, 0, 0, NULL, 0, NULL); -- xtensa_restore_emit_state (&s); -- xtensa_set_frag_assembly_state (frag_now); - } - - -@@ -5334,6 +5322,9 @@ md_begin (void) - /* Set up the assembly state. */ - if (!frag_now->tc_frag_data.is_assembly_state_set) - xtensa_set_frag_assembly_state (frag_now); -+ -+ if (!use_literal_section) -+ xtensa_mark_literal_pool_location (); - } - - -@@ -5933,6 +5924,11 @@ xtensa_elf_section_change_hook (void) - /* Set up the assembly state. */ - if (!frag_now->tc_frag_data.is_assembly_state_set) - xtensa_set_frag_assembly_state (frag_now); -+ -+ if (!use_literal_section -+ && seg_info (now_seg)->tc_segment_info_data.literal_pool_loc == NULL -+ && !xtensa_is_init_fini (now_seg)) -+ xtensa_mark_literal_pool_location (); - } - - --- -2.11.0 - diff --git a/package/binutils/2.32/0006-or1k-Fix-incorrect-value-in-PLT-GOT-entries-causing-.patch b/package/binutils/2.32/0006-or1k-Fix-incorrect-value-in-PLT-GOT-entries-causing-.patch deleted file mode 100644 index 8527b667339..00000000000 --- a/package/binutils/2.32/0006-or1k-Fix-incorrect-value-in-PLT-GOT-entries-causing-.patch +++ /dev/null @@ -1,46 +0,0 @@ -From b17678f639f953d687d96cd52690e7cbfae50f91 Mon Sep 17 00:00:00 2001 -From: Stafford Horne -Date: Fri, 23 Aug 2019 22:25:55 +0900 -Subject: [PATCH] or1k: Fix incorrect value in PLT GOT entries, causing - infinite loop - -The PLT GOT entry should point to the first PLT entry which contains the -runtime linker function. It was pointing back to the symbol PLT entry -causing an infinite loop. - -I found this when testing the OpenRISC glibc port which uses the runtime -dynamic linker. It seems other libc's we use so far have not been -making use of the initial PLT GOT entries. - -bfd/ChangeLog: - - * elf32-or1k.c (or1k_elf_finish_dynamic_symbol): Use correct value for - PLT GOT entries. - -(cherry picked from commit 09f7b0de537d465fc8ed9f9433e348c1bc78aab2) -Signed-off-by: Romain Naour ---- - bfd/elf32-or1k.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c -index 2f200b197b8..32839cfa7b6 100644 ---- a/bfd/elf32-or1k.c -+++ b/bfd/elf32-or1k.c -@@ -2379,8 +2379,11 @@ or1k_elf_finish_dynamic_symbol (bfd *output_bfd, - or1k_write_plt_entry (output_bfd, splt->contents + h->plt.offset, - plt0, plt1, plt2, OR1K_JR(12)); - -- /* Fill in the entry in the global offset table. */ -- bfd_put_32 (output_bfd, plt_addr, sgot->contents + got_offset); -+ /* Fill in the entry in the global offset table. We initialize it to -+ point to the top of the plt. This is done to lazy lookup the actual -+ symbol as the first plt entry will be setup by libc to call the -+ runtime dynamic linker. */ -+ bfd_put_32 (output_bfd, plt_base_addr, sgot->contents + got_offset); - - /* Fill in the entry in the .rela.plt section. */ - rela.r_offset = got_addr; --- -2.23.0 - diff --git a/package/binutils/2.32/0007-bfd-xtensa-fix-PR-ld-25630.patch b/package/binutils/2.32/0007-bfd-xtensa-fix-PR-ld-25630.patch deleted file mode 100644 index f499426b708..00000000000 --- a/package/binutils/2.32/0007-bfd-xtensa-fix-PR-ld-25630.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 85dcca5997cf3822d6456a5c9c59c46b56adfbb8 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Wed, 4 Mar 2020 14:54:27 -0800 -Subject: [PATCH] bfd: xtensa: fix PR ld/25630 - -bfd/ -2020-03-05 Max Filippov - - * elf32-xtensa.c (shrink_dynamic_reloc_sections): Shrink dynamic - relocation sections for any removed reference to a dynamic symbol. - -Signed-off-by: Max Filippov ---- - bfd/elf32-xtensa.c | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c -index 12ff9f772aaf..65e14d87940c 100644 ---- a/bfd/elf32-xtensa.c -+++ b/bfd/elf32-xtensa.c -@@ -10148,10 +10148,9 @@ shrink_dynamic_reloc_sections (struct bfd_link_info *info, - - if ((r_type == R_XTENSA_32 || r_type == R_XTENSA_PLT) - && (input_section->flags & SEC_ALLOC) != 0 -- && (dynamic_symbol || bfd_link_pic (info)) -- && (!h || h->root.type != bfd_link_hash_undefweak -- || (dynamic_symbol -- && (bfd_link_dll (info) || info->export_dynamic)))) -+ && (dynamic_symbol -+ || (bfd_link_pic (info) -+ && (!h || h->root.type != bfd_link_hash_undefweak)))) - { - asection *srel; - bfd_boolean is_plt = FALSE; --- -2.20.1 - diff --git a/package/binutils/2.32/0008-xtensa-fix-PR-ld-25861.patch b/package/binutils/2.32/0008-xtensa-fix-PR-ld-25861.patch deleted file mode 100644 index 2df46c65267..00000000000 --- a/package/binutils/2.32/0008-xtensa-fix-PR-ld-25861.patch +++ /dev/null @@ -1,432 +0,0 @@ -From c7a1d1f656c717394937a92cb970f0f4cecce128 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Sun, 19 Apr 2020 19:04:41 -0700 -Subject: [PATCH] xtensa: fix PR ld/25861 - -Introduce new relaxations XTENSA_PDIFF{8,16,32} for positive differences -(subtracted symbol precedes diminished symbol) and XTENSA_NDIFF{8,16,32} -for negative differences (subtracted symbol follows diminished symbol). -Don't generate XTENSA_DIFF relocations in the assembler, generate -XTENSA_PDIFF or XTENSA_NDIFF based on relative symbol position. - -Handle XTENSA_DIFF in BFD for compatibility with old object files. -Handle XTENSA_PDIFF and XTENSA_NDIFF in BFD, treating difference value -as unsigned. - -2020-04-22 Max Filippov -bfd/ - * bfd-in2.h: Regenerated. - * elf32-xtensa.c (elf_howto_table): New entries for - R_XTENSA_PDIFF{8,16,32} and R_XTENSA_NDIFF{8,16,32}. - (elf_xtensa_reloc_type_lookup, elf_xtensa_do_reloc) - (relax_section): Add cases for R_XTENSA_PDIFF{8,16,32} and - R_XTENSA_NDIFF{8,16,32}. - * libbfd.h (bfd_reloc_code_real_names): Add names for - BFD_RELOC_XTENSA_PDIFF{8,16,32} and - BFD_RELOC_XTENSA_NDIFF{8,16,32}. - * reloc.c: Add documentation for BFD_RELOC_XTENSA_PDIFF{8,16,32} - and BFD_RELOC_XTENSA_NDIFF{8,16,32}. - -binutils/ - * readelf.c (is_none_reloc): Recognize - BFD_RELOC_XTENSA_PDIFF{8,16,32} and - BFD_RELOC_XTENSA_NDIFF{8,16,32}. - -gas/ - * config/tc-xtensa.c (md_apply_fix): Replace - BFD_RELOC_XTENSA_DIFF{8,16,32} generation with - BFD_RELOC_XTENSA_PDIFF{8,16,32} and - BFD_RELOC_XTENSA_NDIFF{8,16,32} generation. - * testsuite/gas/xtensa/loc.d: Replace BFD_RELOC_XTENSA_DIFF16 - with BFD_RELOC_XTENSA_PDIFF16 in the expected output. - -include/ - * elf/xtensa.h (elf_xtensa_reloc_type): New entries for - R_XTENSA_PDIFF{8,16,32} and R_XTENSA_NDIFF{8,16,32}. - -ld/ - * testsuite/ld-xtensa/relax-loc.d: New test definition. - * testsuite/ld-xtensa/relax-loc.s: New test source. - * testsuite/ld-xtensa/xtensa.exp (relax-loc): New test. - -Signed-off-by: Max Filippov ---- -Backported from: 30ce8e47fad9b057b6d7af9e1d43061126d34d20 - - bfd/bfd-in2.h | 20 ++++++- - bfd/elf32-xtensa.c | 89 +++++++++++++++++++++++++++++- - bfd/libbfd.h | 6 ++ - bfd/reloc.c | 24 ++++++++ - binutils/readelf.c | 8 ++- - gas/config/tc-xtensa.c | 12 +++- - gas/testsuite/gas/xtensa/loc.d | 2 +- - include/elf/xtensa.h | 6 ++ - ld/testsuite/ld-xtensa/relax-loc.d | 7 +++ - ld/testsuite/ld-xtensa/relax-loc.s | 15 +++++ - ld/testsuite/ld-xtensa/xtensa.exp | 1 + - 11 files changed, 183 insertions(+), 7 deletions(-) - create mode 100644 ld/testsuite/ld-xtensa/relax-loc.d - create mode 100644 ld/testsuite/ld-xtensa/relax-loc.s - -diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h -index 37114607b515..be6a30f57955 100644 ---- a/bfd/bfd-in2.h -+++ b/bfd/bfd-in2.h -@@ -5217,7 +5217,9 @@ to one of its own internal functions or data structures. */ - PLT entries. Otherwise, this is just a generic 32-bit relocation. */ - BFD_RELOC_XTENSA_PLT, - --/* Xtensa relocations to mark the difference of two local symbols. -+/* Xtensa relocations for backward compatibility. These have been replaced -+by BFD_RELOC_XTENSA_PDIFF and BFD_RELOC_XTENSA_NDIFF. -+Xtensa relocations to mark the difference of two local symbols. - These are only needed to support linker relaxation and can be ignored - when not relaxing. The field is set to the value of the difference - assuming no relaxation. The relocation encodes the position of the -@@ -5291,6 +5293,22 @@ BFD_RELOC_XTENSA_ASM_EXPAND. */ - BFD_RELOC_XTENSA_TLS_ARG, - BFD_RELOC_XTENSA_TLS_CALL, - -+/* Xtensa relocations to mark the difference of two local symbols. -+These are only needed to support linker relaxation and can be ignored -+when not relaxing. The field is set to the value of the difference -+assuming no relaxation. The relocation encodes the position of the -+subtracted symbol so the linker can determine whether to adjust the field -+value. PDIFF relocations are used for positive differences, NDIFF -+relocations are used for negative differences. The difference value -+is treated as unsigned with these relocation types, giving full -+8/16 value ranges. */ -+ BFD_RELOC_XTENSA_PDIFF8, -+ BFD_RELOC_XTENSA_PDIFF16, -+ BFD_RELOC_XTENSA_PDIFF32, -+ BFD_RELOC_XTENSA_NDIFF8, -+ BFD_RELOC_XTENSA_NDIFF16, -+ BFD_RELOC_XTENSA_NDIFF32, -+ - /* 8 bit signed offset in (ix+d) or (iy+d). */ - BFD_RELOC_Z80_DISP8, - -diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c -index 473a9d76f289..fded42d52a9a 100644 ---- a/bfd/elf32-xtensa.c -+++ b/bfd/elf32-xtensa.c -@@ -325,6 +325,20 @@ static reloc_howto_type elf_howto_table[] = - HOWTO (R_XTENSA_TLS_CALL, 0, 0, 0, FALSE, 0, complain_overflow_dont, - bfd_elf_xtensa_reloc, "R_XTENSA_TLS_CALL", - FALSE, 0, 0, FALSE), -+ -+ HOWTO (R_XTENSA_PDIFF8, 0, 0, 8, FALSE, 0, complain_overflow_bitfield, -+ bfd_elf_xtensa_reloc, "R_XTENSA_PDIFF8", FALSE, 0, 0xff, FALSE), -+ HOWTO (R_XTENSA_PDIFF16, 0, 1, 16, FALSE, 0, complain_overflow_bitfield, -+ bfd_elf_xtensa_reloc, "R_XTENSA_PDIFF16", FALSE, 0, 0xffff, FALSE), -+ HOWTO (R_XTENSA_PDIFF32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield, -+ bfd_elf_xtensa_reloc, "R_XTENSA_PDIFF32", FALSE, 0, 0xffffffff, FALSE), -+ -+ HOWTO (R_XTENSA_NDIFF8, 0, 0, 8, FALSE, 0, complain_overflow_bitfield, -+ bfd_elf_xtensa_reloc, "R_XTENSA_NDIFF8", FALSE, 0, 0xff, FALSE), -+ HOWTO (R_XTENSA_NDIFF16, 0, 1, 16, FALSE, 0, complain_overflow_bitfield, -+ bfd_elf_xtensa_reloc, "R_XTENSA_NDIFF16", FALSE, 0, 0xffff, FALSE), -+ HOWTO (R_XTENSA_NDIFF32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield, -+ bfd_elf_xtensa_reloc, "R_XTENSA_NDIFF32", FALSE, 0, 0xffffffff, FALSE), - }; - - #if DEBUG_GEN_RELOC -@@ -364,6 +378,30 @@ elf_xtensa_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED, - TRACE ("BFD_RELOC_XTENSA_DIFF32"); - return &elf_howto_table[(unsigned) R_XTENSA_DIFF32 ]; - -+ case BFD_RELOC_XTENSA_PDIFF8: -+ TRACE ("BFD_RELOC_XTENSA_PDIFF8"); -+ return &elf_howto_table[(unsigned) R_XTENSA_PDIFF8 ]; -+ -+ case BFD_RELOC_XTENSA_PDIFF16: -+ TRACE ("BFD_RELOC_XTENSA_PDIFF16"); -+ return &elf_howto_table[(unsigned) R_XTENSA_PDIFF16 ]; -+ -+ case BFD_RELOC_XTENSA_PDIFF32: -+ TRACE ("BFD_RELOC_XTENSA_PDIFF32"); -+ return &elf_howto_table[(unsigned) R_XTENSA_PDIFF32 ]; -+ -+ case BFD_RELOC_XTENSA_NDIFF8: -+ TRACE ("BFD_RELOC_XTENSA_NDIFF8"); -+ return &elf_howto_table[(unsigned) R_XTENSA_NDIFF8 ]; -+ -+ case BFD_RELOC_XTENSA_NDIFF16: -+ TRACE ("BFD_RELOC_XTENSA_NDIFF16"); -+ return &elf_howto_table[(unsigned) R_XTENSA_NDIFF16 ]; -+ -+ case BFD_RELOC_XTENSA_NDIFF32: -+ TRACE ("BFD_RELOC_XTENSA_NDIFF32"); -+ return &elf_howto_table[(unsigned) R_XTENSA_NDIFF32 ]; -+ - case BFD_RELOC_XTENSA_RTLD: - TRACE ("BFD_RELOC_XTENSA_RTLD"); - return &elf_howto_table[(unsigned) R_XTENSA_RTLD ]; -@@ -1851,6 +1889,12 @@ elf_xtensa_do_reloc (reloc_howto_type *howto, - case R_XTENSA_DIFF8: - case R_XTENSA_DIFF16: - case R_XTENSA_DIFF32: -+ case R_XTENSA_PDIFF8: -+ case R_XTENSA_PDIFF16: -+ case R_XTENSA_PDIFF32: -+ case R_XTENSA_NDIFF8: -+ case R_XTENSA_NDIFF16: -+ case R_XTENSA_NDIFF32: - case R_XTENSA_TLS_FUNC: - case R_XTENSA_TLS_ARG: - case R_XTENSA_TLS_CALL: -@@ -9604,7 +9648,13 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info) - - if (r_type == R_XTENSA_DIFF8 - || r_type == R_XTENSA_DIFF16 -- || r_type == R_XTENSA_DIFF32) -+ || r_type == R_XTENSA_DIFF32 -+ || r_type == R_XTENSA_PDIFF8 -+ || r_type == R_XTENSA_PDIFF16 -+ || r_type == R_XTENSA_PDIFF32 -+ || r_type == R_XTENSA_NDIFF8 -+ || r_type == R_XTENSA_NDIFF16 -+ || r_type == R_XTENSA_NDIFF32) - { - bfd_signed_vma diff_value = 0; - bfd_vma new_end_offset, diff_mask = 0; -@@ -9631,8 +9681,27 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info) - diff_value = - bfd_get_signed_32 (abfd, &contents[old_source_offset]); - break; -+ case R_XTENSA_PDIFF8: -+ case R_XTENSA_NDIFF8: -+ diff_value = -+ bfd_get_8 (abfd, &contents[old_source_offset]); -+ break; -+ case R_XTENSA_PDIFF16: -+ case R_XTENSA_NDIFF16: -+ diff_value = -+ bfd_get_16 (abfd, &contents[old_source_offset]); -+ break; -+ case R_XTENSA_PDIFF32: -+ case R_XTENSA_NDIFF32: -+ diff_value = -+ bfd_get_32 (abfd, &contents[old_source_offset]); -+ break; - } - -+ if (r_type >= R_XTENSA_NDIFF8 -+ && r_type <= R_XTENSA_NDIFF32) -+ diff_value = -diff_value; -+ - new_end_offset = offset_with_removed_text_map - (&target_relax_info->action_list, - r_rel.target_offset + diff_value); -@@ -9655,6 +9724,24 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info) - bfd_put_signed_32 (abfd, diff_value, - &contents[old_source_offset]); - break; -+ case R_XTENSA_PDIFF8: -+ case R_XTENSA_NDIFF8: -+ diff_mask = 0xff; -+ bfd_put_8 (abfd, diff_value, -+ &contents[old_source_offset]); -+ break; -+ case R_XTENSA_PDIFF16: -+ case R_XTENSA_NDIFF16: -+ diff_mask = 0xffff; -+ bfd_put_16 (abfd, diff_value, -+ &contents[old_source_offset]); -+ break; -+ case R_XTENSA_PDIFF32: -+ case R_XTENSA_NDIFF32: -+ diff_mask = 0xffffffff; -+ bfd_put_32 (abfd, diff_value, -+ &contents[old_source_offset]); -+ break; - } - - /* Check for overflow. Sign bits must be all zeroes or all ones */ -diff --git a/bfd/libbfd.h b/bfd/libbfd.h -index 3c184fcadadf..989f4bc0b595 100644 ---- a/bfd/libbfd.h -+++ b/bfd/libbfd.h -@@ -2919,6 +2919,12 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@", - "BFD_RELOC_XTENSA_TLS_FUNC", - "BFD_RELOC_XTENSA_TLS_ARG", - "BFD_RELOC_XTENSA_TLS_CALL", -+ "BFD_RELOC_XTENSA_PDIFF8", -+ "BFD_RELOC_XTENSA_PDIFF16", -+ "BFD_RELOC_XTENSA_PDIFF32", -+ "BFD_RELOC_XTENSA_NDIFF8", -+ "BFD_RELOC_XTENSA_NDIFF16", -+ "BFD_RELOC_XTENSA_NDIFF32", - "BFD_RELOC_Z80_DISP8", - "BFD_RELOC_Z80_BYTE0", - "BFD_RELOC_Z80_BYTE1", -diff --git a/bfd/reloc.c b/bfd/reloc.c -index c4dec86d1d46..f5df8e2ab3eb 100644 ---- a/bfd/reloc.c -+++ b/bfd/reloc.c -@@ -6556,6 +6556,8 @@ ENUMX - ENUMX - BFD_RELOC_XTENSA_DIFF32 - ENUMDOC -+ Xtensa relocations for backward compatibility. These have been replaced -+ by BFD_RELOC_XTENSA_PDIFF and BFD_RELOC_XTENSA_NDIFF. - Xtensa relocations to mark the difference of two local symbols. - These are only needed to support linker relaxation and can be ignored - when not relaxing. The field is set to the value of the difference -@@ -6668,6 +6670,28 @@ ENUMX - BFD_RELOC_XTENSA_TLS_CALL - ENUMDOC - Xtensa TLS relocations. -+ENUM -+ BFD_RELOC_XTENSA_PDIFF8 -+ENUMX -+ BFD_RELOC_XTENSA_PDIFF16 -+ENUMX -+ BFD_RELOC_XTENSA_PDIFF32 -+ENUMX -+ BFD_RELOC_XTENSA_NDIFF8 -+ENUMX -+ BFD_RELOC_XTENSA_NDIFF16 -+ENUMX -+ BFD_RELOC_XTENSA_NDIFF32 -+ENUMDOC -+ Xtensa relocations to mark the difference of two local symbols. -+ These are only needed to support linker relaxation and can be ignored -+ when not relaxing. The field is set to the value of the difference -+ assuming no relaxation. The relocation encodes the position of the -+ subtracted symbol so the linker can determine whether to adjust the field -+ value. PDIFF relocations are used for positive differences, NDIFF -+ relocations are used for negative differences. The difference value -+ is treated as unsigned with these relocation types, giving full -+ 8/16 value ranges. - - ENUM - BFD_RELOC_Z80_DISP8 -diff --git a/binutils/readelf.c b/binutils/readelf.c -index d4756c93b345..800918f901c8 100644 ---- a/binutils/readelf.c -+++ b/binutils/readelf.c -@@ -13262,7 +13262,13 @@ is_none_reloc (Filedata * filedata, unsigned int reloc_type) - return (reloc_type == 0 /* R_XTENSA_NONE. */ - || reloc_type == 17 /* R_XTENSA_DIFF8. */ - || reloc_type == 18 /* R_XTENSA_DIFF16. */ -- || reloc_type == 19 /* R_XTENSA_DIFF32. */); -+ || reloc_type == 19 /* R_XTENSA_DIFF32. */ -+ || reloc_type == 57 /* R_XTENSA_PDIFF8. */ -+ || reloc_type == 58 /* R_XTENSA_PDIFF16. */ -+ || reloc_type == 59 /* R_XTENSA_PDIFF32. */ -+ || reloc_type == 60 /* R_XTENSA_NDIFF8. */ -+ || reloc_type == 61 /* R_XTENSA_NDIFF16. */ -+ || reloc_type == 62 /* R_XTENSA_NDIFF32. */); - } - return FALSE; - } -diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c -index 71d4d94a8d7d..ee75c13548ff 100644 ---- a/gas/config/tc-xtensa.c -+++ b/gas/config/tc-xtensa.c -@@ -5974,18 +5974,24 @@ md_apply_fix (fixS *fixP, valueT *valP, segT seg) - case BFD_RELOC_8: - if (fixP->fx_subsy) - { -+ bfd_boolean neg = S_GET_VALUE (fixP->fx_addsy) + fixP->fx_offset -+ < S_GET_VALUE (fixP->fx_subsy); -+ - switch (fixP->fx_r_type) - { - case BFD_RELOC_8: -- fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF8; -+ fixP->fx_r_type = neg -+ ? BFD_RELOC_XTENSA_NDIFF8 : BFD_RELOC_XTENSA_PDIFF8; - fixP->fx_signed = 0; - break; - case BFD_RELOC_16: -- fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF16; -+ fixP->fx_r_type = neg -+ ? BFD_RELOC_XTENSA_NDIFF16 : BFD_RELOC_XTENSA_PDIFF16; - fixP->fx_signed = 0; - break; - case BFD_RELOC_32: -- fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF32; -+ fixP->fx_r_type = neg -+ ? BFD_RELOC_XTENSA_NDIFF32 : BFD_RELOC_XTENSA_PDIFF32; - fixP->fx_signed = 0; - break; - default: -diff --git a/gas/testsuite/gas/xtensa/loc.d b/gas/testsuite/gas/xtensa/loc.d -index 71983cc90055..8fb3425999d5 100644 ---- a/gas/testsuite/gas/xtensa/loc.d -+++ b/gas/testsuite/gas/xtensa/loc.d -@@ -6,5 +6,5 @@ - - RELOCATION RECORDS FOR \[\.debug_line\]: - #... --.*R_XTENSA_DIFF16.*\.text\+0x00009c42 -+.*R_XTENSA_PDIFF16.*\.text\+0x00009c42 - #... -diff --git a/include/elf/xtensa.h b/include/elf/xtensa.h -index 2eb5e4e52941..bd5c80d13777 100644 ---- a/include/elf/xtensa.h -+++ b/include/elf/xtensa.h -@@ -87,6 +87,12 @@ START_RELOC_NUMBERS (elf_xtensa_reloc_type) - RELOC_NUMBER (R_XTENSA_TLS_FUNC, 54) - RELOC_NUMBER (R_XTENSA_TLS_ARG, 55) - RELOC_NUMBER (R_XTENSA_TLS_CALL, 56) -+ RELOC_NUMBER (R_XTENSA_PDIFF8, 57) -+ RELOC_NUMBER (R_XTENSA_PDIFF16, 58) -+ RELOC_NUMBER (R_XTENSA_PDIFF32, 59) -+ RELOC_NUMBER (R_XTENSA_NDIFF8, 60) -+ RELOC_NUMBER (R_XTENSA_NDIFF16, 61) -+ RELOC_NUMBER (R_XTENSA_NDIFF32, 62) - END_RELOC_NUMBERS (R_XTENSA_max) - - /* Processor-specific flags for the ELF header e_flags field. */ -diff --git a/ld/testsuite/ld-xtensa/relax-loc.d b/ld/testsuite/ld-xtensa/relax-loc.d -new file mode 100644 -index 000000000000..3c8d673732ff ---- /dev/null -+++ b/ld/testsuite/ld-xtensa/relax-loc.d -@@ -0,0 +1,7 @@ -+#as: --text-section-literals -+#ld: -+#objdump: --dwarf=decodedline -+#... -+relax-loc.s[ ]+1[ ]+0x400054[ ]+.* -+relax-loc.s[ ]+2[ ]+0x40005c[ ]+.* -+#... -diff --git a/ld/testsuite/ld-xtensa/relax-loc.s b/ld/testsuite/ld-xtensa/relax-loc.s -new file mode 100644 -index 000000000000..d768470e287a ---- /dev/null -+++ b/ld/testsuite/ld-xtensa/relax-loc.s -@@ -0,0 +1,15 @@ -+ .file 1 "relax-loc.s" -+ .globl _start -+ .globl _ResetVector -+ .text -+_ResetVector: -+_start: -+ .loc 1 1 -+ j 1f -+ .literal_position -+1: -+ .loc 1 2 -+ -+ .rep 10000 -+ movi a2, 0x12345678 -+ .endr -diff --git a/ld/testsuite/ld-xtensa/xtensa.exp b/ld/testsuite/ld-xtensa/xtensa.exp -index 9b2235b2151b..de39887936ad 100644 ---- a/ld/testsuite/ld-xtensa/xtensa.exp -+++ b/ld/testsuite/ld-xtensa/xtensa.exp -@@ -27,6 +27,7 @@ run_dump_test "call_overflow" - run_dump_test "coalesce" - run_dump_test "diff_overflow" - run_dump_test "lcall" -+run_dump_test "relax-loc" - - run_dump_test "relax-static-pie" - run_dump_test "relax-static-local-pie" --- -2.20.1 - diff --git a/package/binutils/2.32/0009-xtensa-fix-XTENSA_NDIFF-handling-for-PR-ld-25861.patch b/package/binutils/2.32/0009-xtensa-fix-XTENSA_NDIFF-handling-for-PR-ld-25861.patch deleted file mode 100644 index 28f17d7c561..00000000000 --- a/package/binutils/2.32/0009-xtensa-fix-XTENSA_NDIFF-handling-for-PR-ld-25861.patch +++ /dev/null @@ -1,128 +0,0 @@ -From 735321812435ae278d3766a3371f55937dc776d6 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Sat, 25 Apr 2020 00:40:25 -0700 -Subject: [PATCH] xtensa: fix XTENSA_NDIFF handling for PR ld/25861 - -Fields marked with XTENSA_NDIFF relocations are not negated, they only -have sign bits removed. Don't negate their values when relaxation is -performed. Don't add sign bits when the value is zero. Report overflow -when the result has negative sign but all significant bits are zero. - -2020-04-29 Max Filippov -bfd/ - * elf32-xtensa.c (relax_section): Don't negate diff_value for - XTENSA_NDIFF relocations. Don't add sign bits whe diff_value - equals 0. Report overflow when the result has negative sign but - all significant bits are zero. - -Signed-off-by: Max Filippov -Backported from: d548f47df4d2e3d117d504a4c9977982c78a0556 ---- - - bfd/elf32-xtensa.c | 26 +++++++++++++++----------- - 1 file changed, 15 insertions(+), 11 deletions(-) - -diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c -index fded42d52a9a..4327b027911f 100644 ---- a/bfd/elf32-xtensa.c -+++ b/bfd/elf32-xtensa.c -@@ -9670,37 +9670,44 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info) - switch (r_type) - { - case R_XTENSA_DIFF8: -+ diff_mask = 0x7f; - diff_value = - bfd_get_signed_8 (abfd, &contents[old_source_offset]); - break; - case R_XTENSA_DIFF16: -+ diff_mask = 0x7fff; - diff_value = - bfd_get_signed_16 (abfd, &contents[old_source_offset]); - break; - case R_XTENSA_DIFF32: -+ diff_mask = 0x7fffffff; - diff_value = - bfd_get_signed_32 (abfd, &contents[old_source_offset]); - break; - case R_XTENSA_PDIFF8: - case R_XTENSA_NDIFF8: -+ diff_mask = 0xff; - diff_value = - bfd_get_8 (abfd, &contents[old_source_offset]); - break; - case R_XTENSA_PDIFF16: - case R_XTENSA_NDIFF16: -+ diff_mask = 0xffff; - diff_value = - bfd_get_16 (abfd, &contents[old_source_offset]); - break; - case R_XTENSA_PDIFF32: - case R_XTENSA_NDIFF32: -+ diff_mask = 0xffffffff; - diff_value = - bfd_get_32 (abfd, &contents[old_source_offset]); - break; - } - - if (r_type >= R_XTENSA_NDIFF8 -- && r_type <= R_XTENSA_NDIFF32) -- diff_value = -diff_value; -+ && r_type <= R_XTENSA_NDIFF32 -+ && diff_value) -+ diff_value |= ~diff_mask; - - new_end_offset = offset_with_removed_text_map - (&target_relax_info->action_list, -@@ -9710,43 +9717,40 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info) - switch (r_type) - { - case R_XTENSA_DIFF8: -- diff_mask = 0x7f; - bfd_put_signed_8 (abfd, diff_value, - &contents[old_source_offset]); - break; - case R_XTENSA_DIFF16: -- diff_mask = 0x7fff; - bfd_put_signed_16 (abfd, diff_value, - &contents[old_source_offset]); - break; - case R_XTENSA_DIFF32: -- diff_mask = 0x7fffffff; - bfd_put_signed_32 (abfd, diff_value, - &contents[old_source_offset]); - break; - case R_XTENSA_PDIFF8: - case R_XTENSA_NDIFF8: -- diff_mask = 0xff; - bfd_put_8 (abfd, diff_value, - &contents[old_source_offset]); - break; - case R_XTENSA_PDIFF16: - case R_XTENSA_NDIFF16: -- diff_mask = 0xffff; - bfd_put_16 (abfd, diff_value, - &contents[old_source_offset]); - break; - case R_XTENSA_PDIFF32: - case R_XTENSA_NDIFF32: -- diff_mask = 0xffffffff; - bfd_put_32 (abfd, diff_value, - &contents[old_source_offset]); - break; - } - -- /* Check for overflow. Sign bits must be all zeroes or all ones */ -- if ((diff_value & ~diff_mask) != 0 && -- (diff_value & ~diff_mask) != (-1 & ~diff_mask)) -+ /* Check for overflow. Sign bits must be all zeroes or -+ all ones. When sign bits are all ones diff_value -+ may not be zero. */ -+ if (((diff_value & ~diff_mask) != 0 -+ && (diff_value & ~diff_mask) != ~diff_mask) -+ || (diff_value && (bfd_vma) diff_value == ~diff_mask)) - { - (*link_info->callbacks->reloc_dangerous) - (link_info, _("overflow after relaxation"), --- -2.20.1 - diff --git a/package/binutils/2.32/0010-or1k-Fix-issue-with-plt-link-failure-for-local-calls.patch b/package/binutils/2.32/0010-or1k-Fix-issue-with-plt-link-failure-for-local-calls.patch deleted file mode 100644 index a67d12789e9..00000000000 --- a/package/binutils/2.32/0010-or1k-Fix-issue-with-plt-link-failure-for-local-calls.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 788cda9f9447e0fe67e582e8fb5adafd678d08b2 Mon Sep 17 00:00:00 2001 -From: Stafford Horne -Date: Sun, 2 May 2021 06:02:14 +0900 -Subject: [PATCH] or1k: Fix issue with plt link failure for local calls - -When building protobuf we were seeing the assert failure: - - /home/giuliobenetti/git/upstream/or1k-binutils-2.36.1/host/lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: - BFD (GNU Binutils) 2.36.1 assertion fail elf32-or1k.c:2377 - /home/giuliobenetti/git/upstream/or1k-binutils-2.36.1/host/lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: - BFD (GNU Binutils) 2.36.1 assertion fail elf32-or1k.c:2377 - /home/giuliobenetti/git/upstream/or1k-binutils-2.36.1/host/lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: - BFD (GNU Binutils) 2.36.1 assertion fail elf32-or1k.c:2377 - collect2: error: ld returned 1 exit status - -This failure happens while writing out PLT entries, there is a check -"BFD_ASSERT (h->dynindx != -1)" to confirm all plt entries have dynamic -symbol attributes. This was failing for symbols that were -"forced_local" in previous linking code. - -The fix adds logic to or1k_elf_adjust_dynamic_symbol to identify -"forced_local" symbols and exclude them from the the PLT. - -bfd/ChangeLog: - - PR 27624 - * elf32-or1k.c (or1k_elf_adjust_dynamic_symbol): Change - condition used to cleanup plt entries to cleanup forced local - entries. - -Cc: Giulio Benetti -Signed-off-by: Giulio Benetti ---- - bfd/elf32-or1k.c | 9 ++++----- - 1 file changed, 4 insertions(+), 5 deletions(-) - -diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c -index 2f200b197b8..1f2c88b0b3a 100644 ---- a/bfd/elf32-or1k.c -+++ b/bfd/elf32-or1k.c -@@ -2535,11 +2535,10 @@ or1k_elf_adjust_dynamic_symbol (struct bfd_link_info *info, - if (h->type == STT_FUNC - || h->needs_plt) - { -- if (! bfd_link_pic (info) -- && !h->def_dynamic -- && !h->ref_dynamic -- && h->root.type != bfd_link_hash_undefweak -- && h->root.type != bfd_link_hash_undefined) -+ if (h->plt.refcount <= 0 -+ || (SYMBOL_CALLS_LOCAL (info, h) -+ || (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT -+ && h->root.type == bfd_link_hash_undefweak))) - { - /* This case can occur if we saw a PLT reloc in an input - file, but the symbol was never referred to by a dynamic --- -2.25.1 - diff --git a/package/binutils/2.32/0011-or1k-Implement-relocation-R_OR1K_GOT_AHI16-for-gotha.patch b/package/binutils/2.32/0011-or1k-Implement-relocation-R_OR1K_GOT_AHI16-for-gotha.patch deleted file mode 100644 index 5a2b91fe8e6..00000000000 --- a/package/binutils/2.32/0011-or1k-Implement-relocation-R_OR1K_GOT_AHI16-for-gotha.patch +++ /dev/null @@ -1,256 +0,0 @@ -From b10e6230dea0015bf3b7748580b82c551f9a3a4a Mon Sep 17 00:00:00 2001 -From: Stafford Horne -Date: Sun, 2 May 2021 06:02:15 +0900 -Subject: [PATCH] or1k: Implement relocation R_OR1K_GOT_AHI16 for gotha() - -The gotha() relocation mnemonic will be outputted by OpenRISC GCC when -using the -mcmodel=large option. This relocation is used along with -got() to generate 32-bit GOT offsets. This increases the previous GOT -offset limit from the previous 16-bit (64K) limit. - -This is needed on large binaries where the GOT grows larger than 64k. - -bfd/ChangeLog: - - PR 21464 - * bfd-in2.h: Add BFD_RELOC_OR1K_GOT_AHI16 relocation. - * elf32-or1k.c (or1k_elf_howto_table, or1k_reloc_map): Likewise. - (or1k_final_link_relocate, or1k_elf_relocate_section, - or1k_elf_check_relocs): Likewise. - * libbfd.h (bfd_reloc_code_real_names): Likewise. - * reloc.c: Likewise. - -cpu/ChangeLog: - - PR 21464 - * or1k.opc (or1k_imm16_relocs, parse_reloc): Define parse logic - for gotha() relocation. - -include/ChangeLog: - - PR 21464 - * elf/or1k.h (elf_or1k_reloc_type): Define R_OR1K_GOT_AHI16 number. - -opcodes/ChangeLog: - - PR 21464 - * or1k-asm.c: Regenerate. - -gas/ChangeLog: - - PR 21464 - * testsuite/gas/or1k/reloc-1.s: Add test for new relocation. - * testsuite/gas/or1k/reloc-1.d: Add test result for new - relocation. - -Cc: Giulio Benetti - -fixup reloc, add tests - -Signed-off-by: Giulio Benetti ---- - bfd/bfd-in2.h | 1 + - bfd/elf32-or1k.c | 21 ++++++++++++++++++++- - bfd/libbfd.h | 1 + - bfd/reloc.c | 2 ++ - cpu/or1k.opc | 7 ++++++- - gas/testsuite/gas/or1k/reloc-1.d | 4 +++- - gas/testsuite/gas/or1k/reloc-1.s | 4 ++++ - include/elf/or1k.h | 1 + - opcodes/or1k-asm.c | 7 ++++++- - 9 files changed, 44 insertions(+), 4 deletions(-) - -diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h -index e25da50aafb..530a41fca43 100644 ---- a/bfd/bfd-in2.h -+++ b/bfd/bfd-in2.h -@@ -5517,6 +5517,7 @@ then it may be truncated to 8 bits. */ - BFD_RELOC_OR1K_TLS_TPOFF, - BFD_RELOC_OR1K_TLS_DTPOFF, - BFD_RELOC_OR1K_TLS_DTPMOD, -+ BFD_RELOC_OR1K_GOT_AHI16, - - /* H8 elf Relocations. */ - BFD_RELOC_H8_DIR16A8, -diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c -index 1f2c88b0b3a..a4a64f73b7c 100644 ---- a/bfd/elf32-or1k.c -+++ b/bfd/elf32-or1k.c -@@ -808,6 +808,20 @@ static reloc_howto_type or1k_elf_howto_table[] = - 0, /* Source Mask. */ - 0x03ffffff, /* Dest Mask. */ - TRUE), /* PC relative offset? */ -+ -+ HOWTO (R_OR1K_GOT_AHI16, /* type */ -+ 16, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_signed, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_OR1K_GOT_AHI16", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ - }; - - /* Map BFD reloc types to Or1k ELF reloc types. */ -@@ -871,6 +885,7 @@ static const struct or1k_reloc_map or1k_reloc_map[] = - { BFD_RELOC_OR1K_TLS_IE_LO13, R_OR1K_TLS_IE_LO13 }, - { BFD_RELOC_OR1K_SLO13, R_OR1K_SLO13 }, - { BFD_RELOC_OR1K_PLTA26, R_OR1K_PLTA26 }, -+ { BFD_RELOC_OR1K_GOT_AHI16, R_OR1K_GOT_AHI16 }, - }; - - #define TLS_UNKNOWN 0 -@@ -1080,6 +1095,7 @@ or1k_final_link_relocate (reloc_howto_type *howto, bfd *input_bfd, - switch (howto->type) - { - case R_OR1K_AHI16: -+ case R_OR1K_GOT_AHI16: - case R_OR1K_GOTOFF_AHI16: - case R_OR1K_TLS_IE_AHI16: - case R_OR1K_TLS_LE_AHI16: -@@ -1344,6 +1360,7 @@ or1k_elf_relocate_section (bfd *output_bfd, - } - break; - -+ case R_OR1K_GOT_AHI16: - case R_OR1K_GOT16: - case R_OR1K_GOT_PG21: - case R_OR1K_GOT_LO13: -@@ -1435,7 +1452,8 @@ or1k_elf_relocate_section (bfd *output_bfd, - /* The GOT_PG21 and GOT_LO13 relocs are pc-relative, - while the GOT16 reloc is GOT relative. */ - relocation = got_base + off; -- if (r_type == R_OR1K_GOT16) -+ if (r_type == R_OR1K_GOT16 -+ || r_type == R_OR1K_GOT_AHI16) - relocation -= got_sym_value; - - /* Addend should be zero. */ -@@ -1945,6 +1963,7 @@ or1k_elf_check_relocs (bfd *abfd, - } - break; - -+ case R_OR1K_GOT_AHI16: - case R_OR1K_GOT16: - case R_OR1K_GOT_PG21: - case R_OR1K_GOT_LO13: -diff --git a/bfd/libbfd.h b/bfd/libbfd.h -index 36284d71a9b..6e9e3190bb8 100644 ---- a/bfd/libbfd.h -+++ b/bfd/libbfd.h -@@ -2702,6 +2702,7 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@", - "BFD_RELOC_OR1K_TLS_TPOFF", - "BFD_RELOC_OR1K_TLS_DTPOFF", - "BFD_RELOC_OR1K_TLS_DTPMOD", -+ "BFD_RELOC_OR1K_GOT_AHI16", - "BFD_RELOC_H8_DIR16A8", - "BFD_RELOC_H8_DIR16R8", - "BFD_RELOC_H8_DIR24A8", -diff --git a/bfd/reloc.c b/bfd/reloc.c -index e6446a78098..b0003ab1175 100644 ---- a/bfd/reloc.c -+++ b/bfd/reloc.c -@@ -6164,6 +6164,8 @@ ENUMX - BFD_RELOC_OR1K_GOTPC_HI16 - ENUMX - BFD_RELOC_OR1K_GOTPC_LO16 -+ENUMX -+ BFD_RELOC_OR1K_GOT_AHI16 - ENUMX - BFD_RELOC_OR1K_GOT16 - ENUMX -diff --git a/cpu/or1k.opc b/cpu/or1k.opc -index 5082a30cee1..85163fc96c9 100644 ---- a/cpu/or1k.opc -+++ b/cpu/or1k.opc -@@ -173,7 +173,7 @@ static const bfd_reloc_code_real_type or1k_imm16_relocs[][6] = { - BFD_RELOC_OR1K_GOT_LO13, - BFD_RELOC_UNUSED, - BFD_RELOC_UNUSED, -- BFD_RELOC_UNUSED }, -+ BFD_RELOC_OR1K_GOT_AHI16 }, - { BFD_RELOC_OR1K_GOTPC_LO16, - BFD_RELOC_UNUSED, - BFD_RELOC_UNUSED, -@@ -276,6 +276,11 @@ parse_reloc (const char **strp) - str += 5; - cls = RCLASS_TPOFF; - } -+ else if (strncasecmp (str, "got", 3) == 0) -+ { -+ str += 3; -+ cls = RCLASS_GOT; -+ } - - if (strncasecmp (str, "hi(", 3) == 0) - { -diff --git a/gas/testsuite/gas/or1k/reloc-1.d b/gas/testsuite/gas/or1k/reloc-1.d -index d1bcf5608bb..3a001c4ed99 100644 ---- a/gas/testsuite/gas/or1k/reloc-1.d -+++ b/gas/testsuite/gas/or1k/reloc-1.d -@@ -68,5 +68,7 @@ OFFSET TYPE VALUE - 000000ec R_OR1K_LO13 x - 000000f0 R_OR1K_GOT_LO13 x - 000000f4 R_OR1K_SLO13 x -- -+000000f8 R_OR1K_GOT_AHI16 x -+000000fc R_OR1K_GOT_AHI16 x -+00000100 R_OR1K_GOT_AHI16 x - -diff --git a/gas/testsuite/gas/or1k/reloc-1.s b/gas/testsuite/gas/or1k/reloc-1.s -index e76abef6532..562609aa869 100644 ---- a/gas/testsuite/gas/or1k/reloc-1.s -+++ b/gas/testsuite/gas/or1k/reloc-1.s -@@ -74,3 +74,7 @@ - l.lbz r5,po(x)(r3) - l.lbz r5,gotpo(x)(r3) - l.sb po(x)(r3),r6 -+ -+ l.movhi r4,gotha(x) -+ l.ori r3,r4,gotha(x) -+ l.addi r3,r4,gotha(x) -diff --git a/include/elf/or1k.h b/include/elf/or1k.h -index 0abef046202..7db3cad18eb 100644 ---- a/include/elf/or1k.h -+++ b/include/elf/or1k.h -@@ -77,6 +77,7 @@ START_RELOC_NUMBERS (elf_or1k_reloc_type) - RELOC_NUMBER (R_OR1K_TLS_IE_LO13, 51) - RELOC_NUMBER (R_OR1K_SLO13, 52) - RELOC_NUMBER (R_OR1K_PLTA26, 53) -+ RELOC_NUMBER (R_OR1K_GOT_AHI16, 54) - END_RELOC_NUMBERS (R_OR1K_max) - - #define EF_OR1K_NODELAY (1UL << 0) -diff --git a/opcodes/or1k-asm.c b/opcodes/or1k-asm.c -index 7d058d03f5f..332f4b7a9b5 100644 ---- a/opcodes/or1k-asm.c -+++ b/opcodes/or1k-asm.c -@@ -177,7 +177,7 @@ static const bfd_reloc_code_real_type or1k_imm16_relocs[][6] = { - BFD_RELOC_OR1K_GOT_LO13, - BFD_RELOC_UNUSED, - BFD_RELOC_UNUSED, -- BFD_RELOC_UNUSED }, -+ BFD_RELOC_OR1K_GOT_AHI16 }, - { BFD_RELOC_OR1K_GOTPC_LO16, - BFD_RELOC_UNUSED, - BFD_RELOC_UNUSED, -@@ -280,6 +280,11 @@ parse_reloc (const char **strp) - str += 5; - cls = RCLASS_TPOFF; - } -+ else if (strncasecmp (str, "got", 3) == 0) -+ { -+ str += 3; -+ cls = RCLASS_GOT; -+ } - - if (strncasecmp (str, "hi(", 3) == 0) - { --- -2.25.1 - diff --git a/package/binutils/2.32/0012-or1k-Avoid-R_OR1K_GOT16-overflow-failures-in-presenc.patch b/package/binutils/2.32/0012-or1k-Avoid-R_OR1K_GOT16-overflow-failures-in-presenc.patch deleted file mode 100644 index adc6f5f8b91..00000000000 --- a/package/binutils/2.32/0012-or1k-Avoid-R_OR1K_GOT16-overflow-failures-in-presenc.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 0f61f76454a9420f158f626cb09a4fbc08c3709e Mon Sep 17 00:00:00 2001 -From: Stafford Horne -Date: Sun, 2 May 2021 06:02:16 +0900 -Subject: [PATCH] or1k: Avoid R_OR1K_GOT16 overflow failures in presence - of R_OR1K_GOT_AHI16 - -Now that we support R_OR1K_GOT_AHI16 we can relax the R_OR1K_GOT16 -overflow validation check if the section has R_OR1K_GOT_AHI16. - -We cannot simple disable R_OR1K_GOT16 overflow validation as there will -still be binaries that will have only R_OR1K_GOT16. The -R_OR1K_GOT_AHI16 relocation will only be added by GCC when building with -the option -mcmodel=large. - -This assumes that R_OR1K_GOT_AHI16 will come before R_OR1K_GOT16, which -is the code pattern that will be emitted by GCC. - -bfd/ChangeLog: - - PR 21464 - * elf32-or1k.c (or1k_elf_relocate_section): Relax R_OR1K_GOT16 - overflow check if we have R_OR1K_GOT_AHI16 followed by - R_OR1K_GOT16. - -Signed-off-by: Giulio Benetti ---- - bfd/elf32-or1k.c | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c -index a4a64f73b7c..07fff3602a3 100644 ---- a/bfd/elf32-or1k.c -+++ b/bfd/elf32-or1k.c -@@ -1248,6 +1248,7 @@ or1k_elf_relocate_section (bfd *output_bfd, - asection *sgot, *splt; - bfd_vma plt_base, got_base, got_sym_value; - bfd_boolean ret_val = TRUE; -+ bfd_boolean saw_gotha = FALSE; - - if (htab == NULL) - return FALSE; -@@ -1456,6 +1457,16 @@ or1k_elf_relocate_section (bfd *output_bfd, - || r_type == R_OR1K_GOT_AHI16) - relocation -= got_sym_value; - -+ if (r_type == R_OR1K_GOT_AHI16) -+ saw_gotha = TRUE; -+ -+ /* If we have a R_OR1K_GOT16 followed by a R_OR1K_GOT_AHI16 -+ relocation we assume the code is doing the right thing to avoid -+ overflows. Here we mask the lower 16-bit of the relocation to -+ avoid overflow validation failures. */ -+ if (r_type == R_OR1K_GOT16 && saw_gotha) -+ relocation &= 0xffff; -+ - /* Addend should be zero. */ - if (rel->r_addend != 0) - { --- -2.25.1 - diff --git a/package/binutils/2.32/0013-or1k-Support-large-plt_relocs-when-generating-plt-en.patch b/package/binutils/2.32/0013-or1k-Support-large-plt_relocs-when-generating-plt-en.patch deleted file mode 100644 index dc0431e0afb..00000000000 --- a/package/binutils/2.32/0013-or1k-Support-large-plt_relocs-when-generating-plt-en.patch +++ /dev/null @@ -1,500 +0,0 @@ -From 36c7de7ef77ab0c30cb33e2c7ea7a6f4e3052c73 Mon Sep 17 00:00:00 2001 -From: Stafford Horne -Date: Sun, 2 May 2021 06:02:17 +0900 -Subject: [PATCH] or1k: Support large plt_relocs when generating plt - entries - -The current PLT generation code will generate invalid code when the PLT -relocation offset exceeds 64k. This fixes the issue by detecting large -plt_reloc offsets and generare code sequences to create larger plt -relocations. - -The "large" plt code needs 2 extra instructions to create 32-bit offsets. - -bfd/ChangeLog: - - PR 27746 - * elf32-or1k.c (PLT_ENTRY_SIZE_LARGE, PLT_MAX_INSN_COUNT, - OR1K_ADD, OR1K_ORI): New macros to help with plt creation. - (elf_or1k_link_hash_table): New field plt_count. - (elf_or1k_link_hash_entry): New field plt_index. - (elf_or1k_plt_entry_size): New function. - (or1k_write_plt_entry): Update to support variable size PLTs. - (or1k_elf_finish_dynamic_sections): Use new or1k_write_plt_entry - API. - (or1k_elf_finish_dynamic_symbol): Update to write large PLTs - when needed. - (allocate_dynrelocs): Use elf_or1k_plt_entry_size to account for - PLT size. - -ld/ChangeLog: - - PR 27746 - testsuite/ld-or1k/or1k.exp (or1kplttests): Add tests for linking - along with gotha() relocations. - testsuite/ld-or1k/gotha1.dd: New file. - testsuite/ld-or1k/gotha1.s: New file. - testsuite/ld-or1k/gotha2.dd: New file. - testsuite/ld-or1k/gotha2.s: New file - testsuite/ld-or1k/pltlib.s (x): Define size to avoid link - failure. - -Signed-off-by: Giulio Benetti ---- - bfd/elf32-or1k.c | 149 ++++++++++++++++++++++++--------- - ld/testsuite/ld-or1k/gotha1.dd | 34 ++++++++ - ld/testsuite/ld-or1k/gotha1.s | 24 ++++++ - ld/testsuite/ld-or1k/gotha2.dd | 21 +++++ - ld/testsuite/ld-or1k/gotha2.s | 22 +++++ - ld/testsuite/ld-or1k/or1k.exp | 8 ++ - ld/testsuite/ld-or1k/pltlib.s | 1 + - 7 files changed, 220 insertions(+), 39 deletions(-) - create mode 100644 ld/testsuite/ld-or1k/gotha1.dd - create mode 100644 ld/testsuite/ld-or1k/gotha1.s - create mode 100644 ld/testsuite/ld-or1k/gotha2.dd - create mode 100644 ld/testsuite/ld-or1k/gotha2.s - -diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c -index 07fff3602a3..fcebbe5f23a 100644 ---- a/bfd/elf32-or1k.c -+++ b/bfd/elf32-or1k.c -@@ -30,10 +30,14 @@ - #define N_ONES(X) (((bfd_vma)2 << (X)) - 1) - - #define PLT_ENTRY_SIZE 16 -+#define PLT_ENTRY_SIZE_LARGE (6*4) -+#define PLT_MAX_INSN_COUNT 6 - - #define OR1K_MOVHI(D) (0x18000000 | (D << 21)) - #define OR1K_ADRP(D) (0x08000000 | (D << 21)) - #define OR1K_LWZ(D,A) (0x84000000 | (D << 21) | (A << 16)) -+#define OR1K_ADD(D,A,B) (0xE0000000 | (D << 21) | (A << 16) | (B << 11)) -+#define OR1K_ORI(D,A) (0xA8000000 | (D << 21) | (A << 16)) - #define OR1K_ORI0(D) (0xA8000000 | (D << 21)) - #define OR1K_JR(B) (0x44000000 | (B << 11)) - #define OR1K_NOP 0x15000000 -@@ -903,6 +907,8 @@ struct elf_or1k_link_hash_entry - /* Track dynamic relocs copied for this symbol. */ - struct elf_dyn_relocs *dyn_relocs; - -+ /* For calculating PLT size. */ -+ bfd_vma plt_index; - /* Track type of TLS access. */ - unsigned char tls_type; - }; -@@ -930,9 +936,20 @@ struct elf_or1k_link_hash_table - /* Small local sym to section mapping cache. */ - struct sym_cache sym_sec; - -+ bfd_vma plt_count; - bfd_boolean saw_plta; - }; - -+static size_t -+elf_or1k_plt_entry_size (bfd_vma plt_index) -+{ -+ bfd_vma plt_reloc; -+ -+ plt_reloc = plt_index * sizeof (Elf32_External_Rela); -+ -+ return (plt_reloc > 0xffff) ? PLT_ENTRY_SIZE_LARGE : PLT_ENTRY_SIZE; -+} -+ - /* Get the ELF linker hash table from a link_info structure. */ - #define or1k_elf_hash_table(p) \ - (elf_hash_table_id ((struct elf_link_hash_table *) ((p)->hash)) \ -@@ -2176,33 +2193,46 @@ or1k_elf_check_relocs (bfd *abfd, - } - - static void --or1k_write_plt_entry (bfd *output_bfd, bfd_byte *contents, unsigned insn1, -- unsigned insn2, unsigned insn3, unsigned insnj) -+or1k_write_plt_entry (bfd *output_bfd, bfd_byte *contents, unsigned insnj, -+ unsigned insns[], size_t insn_count) - { - unsigned nodelay = elf_elfheader (output_bfd)->e_flags & EF_OR1K_NODELAY; -- unsigned insn4; -+ unsigned output_insns[PLT_MAX_INSN_COUNT]; -+ -+ /* Copy instructions into the output buffer. */ -+ for (size_t i = 0; i < insn_count; i++) -+ output_insns[i] = insns[i]; - - /* Honor the no-delay-slot setting. */ -- if (insn3 == OR1K_NOP) -+ if (insns[insn_count-1] == OR1K_NOP) - { -- insn4 = insn3; -+ unsigned slot1, slot2; -+ - if (nodelay) -- insn3 = insnj; -+ slot1 = insns[insn_count-2], slot2 = insnj; - else -- insn3 = insn2, insn2 = insnj; -+ slot1 = insnj, slot2 = insns[insn_count-2]; -+ -+ output_insns[insn_count-2] = slot1; -+ output_insns[insn_count-1] = slot2; -+ output_insns[insn_count] = OR1K_NOP; - } - else - { -+ unsigned slot1, slot2; -+ - if (nodelay) -- insn4 = insnj; -+ slot1 = insns[insn_count-1], slot2 = insnj; - else -- insn4 = insn3, insn3 = insnj; -+ slot1 = insnj, slot2 = insns[insn_count-1]; -+ -+ output_insns[insn_count-1] = slot1; -+ output_insns[insn_count] = slot2; - } - -- bfd_put_32 (output_bfd, insn1, contents); -- bfd_put_32 (output_bfd, insn2, contents + 4); -- bfd_put_32 (output_bfd, insn3, contents + 8); -- bfd_put_32 (output_bfd, insn4, contents + 12); -+ /* Write out the output buffer. */ -+ for (size_t i = 0; i < (insn_count+1); i++) -+ bfd_put_32 (output_bfd, output_insns[i], contents + (i*4)); - } - - /* Finish up the dynamic sections. */ -@@ -2269,7 +2299,8 @@ or1k_elf_finish_dynamic_sections (bfd *output_bfd, - splt = htab->root.splt; - if (splt && splt->size > 0) - { -- unsigned plt0, plt1, plt2; -+ unsigned plt[PLT_MAX_INSN_COUNT]; -+ size_t plt_insn_count = 3; - bfd_vma got_addr = sgot->output_section->vma + sgot->output_offset; - - /* Note we force 16 byte alignment on the .got, so that -@@ -2280,27 +2311,27 @@ or1k_elf_finish_dynamic_sections (bfd *output_bfd, - bfd_vma pc = splt->output_section->vma + splt->output_offset; - unsigned pa = ((got_addr >> 13) - (pc >> 13)) & 0x1fffff; - unsigned po = got_addr & 0x1fff; -- plt0 = OR1K_ADRP(12) | pa; -- plt1 = OR1K_LWZ(15,12) | (po + 8); -- plt2 = OR1K_LWZ(12,12) | (po + 4); -+ plt[0] = OR1K_ADRP(12) | pa; -+ plt[1] = OR1K_LWZ(15,12) | (po + 8); -+ plt[2] = OR1K_LWZ(12,12) | (po + 4); - } - else if (bfd_link_pic (info)) - { -- plt0 = OR1K_LWZ(15, 16) | 8; /* .got+8 */ -- plt1 = OR1K_LWZ(12, 16) | 4; /* .got+4 */ -- plt2 = OR1K_NOP; -+ plt[0] = OR1K_LWZ(15, 16) | 8; /* .got+8 */ -+ plt[1] = OR1K_LWZ(12, 16) | 4; /* .got+4 */ -+ plt[2] = OR1K_NOP; - } - else - { - unsigned ha = ((got_addr + 0x8000) >> 16) & 0xffff; - unsigned lo = got_addr & 0xffff; -- plt0 = OR1K_MOVHI(12) | ha; -- plt1 = OR1K_LWZ(15,12) | (lo + 8); -- plt2 = OR1K_LWZ(12,12) | (lo + 4); -+ plt[0] = OR1K_MOVHI(12) | ha; -+ plt[1] = OR1K_LWZ(15,12) | (lo + 8); -+ plt[2] = OR1K_LWZ(12,12) | (lo + 4); - } - -- or1k_write_plt_entry (output_bfd, splt->contents, -- plt0, plt1, plt2, OR1K_JR(15)); -+ or1k_write_plt_entry (output_bfd, splt->contents, OR1K_JR(15), -+ plt, plt_insn_count); - - elf_section_data (splt->output_section)->this_hdr.sh_entsize = 4; - } -@@ -2343,7 +2374,8 @@ or1k_elf_finish_dynamic_symbol (bfd *output_bfd, - - if (h->plt.offset != (bfd_vma) -1) - { -- unsigned int plt0, plt1, plt2; -+ unsigned int plt[PLT_MAX_INSN_COUNT]; -+ size_t plt_insn_count = 3; - asection *splt; - asection *sgot; - asection *srela; -@@ -2355,6 +2387,7 @@ or1k_elf_finish_dynamic_symbol (bfd *output_bfd, - bfd_vma got_offset; - bfd_vma got_addr; - Elf_Internal_Rela rela; -+ bfd_boolean large_plt_entry; - - /* This symbol has an entry in the procedure linkage table. Set - it up. */ -@@ -2372,10 +2405,13 @@ or1k_elf_finish_dynamic_symbol (bfd *output_bfd, - corresponds to this symbol. This is the index of this symbol - in all the symbols for which we are making plt entries. The - first entry in the procedure linkage table is reserved. */ -- plt_index = h->plt.offset / PLT_ENTRY_SIZE - 1; -+ plt_index = ((struct elf_or1k_link_hash_entry *) h)->plt_index; - plt_addr = plt_base_addr + h->plt.offset; - plt_reloc = plt_index * sizeof (Elf32_External_Rela); - -+ large_plt_entry = (elf_or1k_plt_entry_size (plt_index) -+ == PLT_ENTRY_SIZE_LARGE); -+ - /* Get the offset into the .got table of the entry that - corresponds to this function. Each .got entry is 4 bytes. - The first three are reserved. */ -@@ -2387,27 +2423,57 @@ or1k_elf_finish_dynamic_symbol (bfd *output_bfd, - { - unsigned pa = ((got_addr >> 13) - (plt_addr >> 13)) & 0x1fffff; - unsigned po = (got_addr & 0x1fff); -- plt0 = OR1K_ADRP(12) | pa; -- plt1 = OR1K_LWZ(12,12) | po; -- plt2 = OR1K_ORI0(11) | plt_reloc; -+ plt[0] = OR1K_ADRP(12) | pa; -+ plt[1] = OR1K_LWZ(12,12) | po; -+ plt[2] = OR1K_ORI0(11) | plt_reloc; - } - else if (bfd_link_pic (info)) - { -- plt0 = OR1K_LWZ(12,16) | got_offset; -- plt1 = OR1K_ORI0(11) | plt_reloc; -- plt2 = OR1K_NOP; -+ if (large_plt_entry) -+ { -+ unsigned gotha = ((got_offset + 0x8000) >> 16) & 0xffff; -+ unsigned got = got_offset & 0xffff; -+ unsigned pltrelhi = (plt_reloc >> 16) & 0xffff; -+ unsigned pltrello = plt_reloc & 0xffff; -+ -+ plt[0] = OR1K_MOVHI(12) | gotha; -+ plt[1] = OR1K_ADD(12,12,16); -+ plt[2] = OR1K_LWZ(12,12) | got; -+ plt[3] = OR1K_MOVHI(11) | pltrelhi; -+ plt[4] = OR1K_ORI(11,11) | pltrello; -+ plt_insn_count = 5; -+ } -+ else -+ { -+ plt[0] = OR1K_LWZ(12,16) | got_offset; -+ plt[1] = OR1K_ORI0(11) | plt_reloc; -+ plt[2] = OR1K_NOP; -+ } - } - else - { - unsigned ha = ((got_addr + 0x8000) >> 16) & 0xffff; - unsigned lo = got_addr & 0xffff; -- plt0 = OR1K_MOVHI(12) | ha; -- plt1 = OR1K_LWZ(12,12) | lo; -- plt2 = OR1K_ORI0(11) | plt_reloc; -+ plt[0] = OR1K_MOVHI(12) | ha; -+ plt[1] = OR1K_LWZ(12,12) | lo; -+ plt[2] = OR1K_ORI0(11) | plt_reloc; -+ } -+ -+ /* For large code model we fixup the non-PIC PLT relocation instructions -+ here. */ -+ if (large_plt_entry && !bfd_link_pic (info)) -+ { -+ unsigned pltrelhi = (plt_reloc >> 16) & 0xffff; -+ unsigned pltrello = plt_reloc & 0xffff; -+ -+ plt[2] = OR1K_MOVHI(11) | pltrelhi; -+ plt[3] = OR1K_ORI(11,11) | pltrello; -+ plt[4] = OR1K_NOP; -+ plt_insn_count = 5; - } - - or1k_write_plt_entry (output_bfd, splt->contents + h->plt.offset, -- plt0, plt1, plt2, OR1K_JR(12)); -+ OR1K_JR(12), plt, plt_insn_count); - - /* Fill in the entry in the global offset table. */ - bfd_put_32 (output_bfd, plt_addr, sgot->contents + got_offset); -@@ -2699,11 +2765,16 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf) - if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, bfd_link_pic (info), h)) - { - asection *s = htab->root.splt; -+ bfd_vma plt_index; -+ -+ /* Track the index of our plt entry for use in calculating size. */ -+ plt_index = htab->plt_count++; -+ ((struct elf_or1k_link_hash_entry *) h)->plt_index = plt_index; - - /* If this is the first .plt entry, make room for the special - first entry. */ - if (s->size == 0) -- s->size = PLT_ENTRY_SIZE; -+ s->size = elf_or1k_plt_entry_size (plt_index); - - h->plt.offset = s->size; - -@@ -2720,7 +2791,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf) - } - - /* Make room for this entry. */ -- s->size += PLT_ENTRY_SIZE; -+ s->size += elf_or1k_plt_entry_size (plt_index); - - /* We also need to make an entry in the .got.plt section, which - will be placed in the .got section by the linker script. */ -diff --git a/ld/testsuite/ld-or1k/gotha1.dd b/ld/testsuite/ld-or1k/gotha1.dd -new file mode 100644 -index 00000000000..0ad1f8f5399 ---- /dev/null -+++ b/ld/testsuite/ld-or1k/gotha1.dd -@@ -0,0 +1,34 @@ -+ -+.*\.x: file format elf32-or1k -+ -+ -+Disassembly of section \.plt: -+ -+[0-9a-f]+ <\.plt>: -+ +[0-9a-f]+: 19 80 00 00 l\.movhi r12,0x0 -+ +[0-9a-f]+: 85 ec [0-9a-f]+ [0-9a-f]+ l\.lwz r15,[0-9]+\(r12\) -+ +[0-9a-f]+: 44 00 78 00 l\.jr r15 -+ +[0-9a-f]+: 85 8c [0-9a-f]+ [0-9a-f]+ l\.lwz r12,[0-9]+\(r12\) -+ +[0-9a-f]+: 19 80 00 00 l\.movhi r12,0x0 -+ +[0-9a-f]+: 85 8c [0-9a-f]+ [0-9a-f]+ l\.lwz r12,[0-9]+\(r12\) -+ +[0-9a-f]+: 44 00 60 00 l\.jr r12 -+ +[0-9a-f]+: a9 60 00 00 l\.ori r11,r0,0x0 -+ -+Disassembly of section \.text: -+ -+[0-9a-f]+ <_start>: -+ +[0-9a-f]+: 9c 21 ff fc l\.addi r1,r1,-4 -+ +[0-9a-f]+: d4 01 48 00 l\.sw 0\(r1\),r9 -+ +[0-9a-f]+: 04 00 00 02 l\.jal [0-9a-f]+ <_start\+0x10> -+ +[0-9a-f]+: 1a 60 00 00 l\.movhi r19,0x0 -+ +[0-9a-f]+: aa 73 [0-9a-f]+ [0-9a-f]+ l\.ori r19,r19,0x[0-9a-f]+ -+ +[0-9a-f]+: e2 73 48 00 l\.add r19,r19,r9 -+ +[0-9a-f]+: 1a 20 00 00 l\.movhi r17,0x0 -+ +[0-9a-f]+: e2 31 98 00 l\.add r17,r17,r19 -+ +[0-9a-f]+: 86 31 00 10 l\.lwz r17,16\(r17\) -+ +[0-9a-f]+: 84 71 00 00 l\.lwz r3,0\(r17\) -+ +[0-9a-f]+: 07 ff ff f2 l\.jal [0-9a-f]+ <\.plt\+0x10> -+ +[0-9a-f]+: 15 00 00 00 l\.nop 0x0 -+ +[0-9a-f]+: 85 21 00 00 l\.lwz r9,0\(r1\) -+ +[0-9a-f]+: 44 00 48 00 l\.jr r9 -+ +[0-9a-f]+: 9c 21 00 04 l\.addi r1,r1,4 -diff --git a/ld/testsuite/ld-or1k/gotha1.s b/ld/testsuite/ld-or1k/gotha1.s -new file mode 100644 -index 00000000000..42b16db425c ---- /dev/null -+++ b/ld/testsuite/ld-or1k/gotha1.s -@@ -0,0 +1,24 @@ -+ .data -+ .p2align 16 -+ -+ .text -+ .globl _start -+_start: -+ l.addi r1, r1, -4 -+ l.sw 0(r1), r9 -+ -+ l.jal 8 -+ l.movhi r19, gotpchi(_GLOBAL_OFFSET_TABLE_-4) -+ l.ori r19, r19, gotpclo(_GLOBAL_OFFSET_TABLE_+0) -+ l.add r19, r19, r9 -+ -+ l.movhi r17, gotha(x) -+ l.add r17, r17, r19 -+ l.lwz r17, got(x)(r17) -+ l.lwz r3, 0(r17) -+ -+ l.jal plt(func) -+ l.nop -+ l.lwz r9, 0(r1) -+ l.jr r9 -+ l.addi r1, r1, 4 -diff --git a/ld/testsuite/ld-or1k/gotha2.dd b/ld/testsuite/ld-or1k/gotha2.dd -new file mode 100644 -index 00000000000..fe09da5466b ---- /dev/null -+++ b/ld/testsuite/ld-or1k/gotha2.dd -@@ -0,0 +1,21 @@ -+ -+.*\.x: file format elf32-or1k -+ -+ -+Disassembly of section \.text: -+ -+[0-9a-f]+ : -+ +[0-9a-f]+: 9c 21 ff f8 l\.addi r1,r1,-8 -+ +[0-9a-f]+: d4 01 80 00 l\.sw 0\(r1\),r16 -+ +[0-9a-f]+: d4 01 48 04 l\.sw 4\(r1\),r9 -+ +[0-9a-f]+: 04 00 [0-9a-f]+ [0-9a-f]+ l\.jal [0-9a-f]+ -+ +[0-9a-f]+: 1a 00 00 00 l\.movhi r16,0x0 -+ +[0-9a-f]+: aa 10 [0-9a-f]+ [0-9a-f]+ l\.ori r16,r16,0x[0-9a-f]+ -+ +[0-9a-f]+: e2 10 48 00 l\.add r16,r16,r9 -+ +[0-9a-f]+: 1a 20 00 00 l\.movhi r17,0x0 -+ +[0-9a-f]+: e2 31 80 00 l\.add r17,r17,r16 -+ +[0-9a-f]+: 86 31 00 0c l\.lwz r17,12\(r17\) -+ +[0-9a-f]+: 85 21 00 04 l\.lwz r9,4\(r1\) -+ +[0-9a-f]+: 86 01 00 00 l\.lwz r16,0\(r1\) -+ +[0-9a-f]+: 44 00 48 00 l\.jr r9 -+ +[0-9a-f]+: 9c 21 00 08 l\.addi r1,r1,8 -diff --git a/ld/testsuite/ld-or1k/gotha2.s b/ld/testsuite/ld-or1k/gotha2.s -new file mode 100644 -index 00000000000..164b282f2dd ---- /dev/null -+++ b/ld/testsuite/ld-or1k/gotha2.s -@@ -0,0 +1,22 @@ -+ .section .text -+ .align 4 -+ .global test -+ .type test, @function -+test: -+ l.addi r1, r1, -8 -+ l.sw 0(r1), r16 -+ l.sw 4(r1), r9 -+ -+ l.jal 8 -+ l.movhi r16, gotpchi(_GLOBAL_OFFSET_TABLE_-4) -+ l.ori r16, r16, gotpclo(_GLOBAL_OFFSET_TABLE_+0) -+ l.add r16, r16, r9 -+ -+ l.movhi r17, gotha(i) -+ l.add r17, r17, r16 -+ l.lwz r17, got(i)(r17) -+ -+ l.lwz r9, 4(r1) -+ l.lwz r16, 0(r1) -+ l.jr r9 -+ l.addi r1, r1, 8 -diff --git a/ld/testsuite/ld-or1k/or1k.exp b/ld/testsuite/ld-or1k/or1k.exp -index 24cdbe5fbf3..9cebc49b946 100644 ---- a/ld/testsuite/ld-or1k/or1k.exp -+++ b/ld/testsuite/ld-or1k/or1k.exp -@@ -53,6 +53,14 @@ set or1kplttests { - "" {plt1.s} - {{objdump -dr plt1.x.dd}} - "plt1.x"} -+ {"gotha exec plt" "tmpdir/libpltlib.so" "" -+ "" {gotha1.s} -+ {{objdump -dr gotha1.dd}} -+ "gotha1.x"} -+ {"gotha -fpic -shared" "-fpic -shared" "" -+ "" {gotha2.s} -+ {{objdump -dr gotha2.dd}} -+ "gotha2.x"} - } - - # Not implemented yet -diff --git a/ld/testsuite/ld-or1k/pltlib.s b/ld/testsuite/ld-or1k/pltlib.s -index baf76ca1af7..8b4d7ba48fd 100644 ---- a/ld/testsuite/ld-or1k/pltlib.s -+++ b/ld/testsuite/ld-or1k/pltlib.s -@@ -1,5 +1,6 @@ - .section .data - .globl x, y -+ .size x, 4 - x: .long 33 - y: .long 44 - --- -2.25.1 - diff --git a/package/binutils/2.32/0014-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch b/package/binutils/2.32/0014-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch deleted file mode 100644 index c3978e22fa8..00000000000 --- a/package/binutils/2.32/0014-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch +++ /dev/null @@ -1,50 +0,0 @@ -From c3003947e4bad18faea4337fd2073feeb30ee078 Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Wed, 9 Jun 2021 17:28:27 +0200 -Subject: [PATCH] bfd/elf32-or1k: fix building with gcc version < 5 - -Gcc version >= 5 has standard C mode not set to -std=gnu11, so if we use -an old compiler(i.e. gcc 4.9) build fails on: -``` -elf32-or1k.c:2251:3: error: 'for' loop initial declarations are only allowed in -C99 or C11 mode - for (size_t i = 0; i < insn_count; i++) - ^ -``` - -So let's declare `size_t i` at the top of the function instead of inside -for loop. - -Signed-off-by: Giulio Benetti ---- - bfd/elf32-or1k.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c -index 4ae7f324d33..32063ab0289 100644 ---- a/bfd/elf32-or1k.c -+++ b/bfd/elf32-or1k.c -@@ -2244,9 +2244,10 @@ or1k_write_plt_entry (bfd *output_bfd, bfd_byte *contents, unsigned insnj, - { - unsigned nodelay = elf_elfheader (output_bfd)->e_flags & EF_OR1K_NODELAY; - unsigned output_insns[PLT_MAX_INSN_COUNT]; -+ size_t i; - - /* Copy instructions into the output buffer. */ -- for (size_t i = 0; i < insn_count; i++) -+ for (i = 0; i < insn_count; i++) - output_insns[i] = insns[i]; - - /* Honor the no-delay-slot setting. */ -@@ -2277,7 +2278,7 @@ or1k_write_plt_entry (bfd *output_bfd, bfd_byte *contents, unsigned insnj, - } - - /* Write out the output buffer. */ -- for (size_t i = 0; i < (insn_count+1); i++) -+ for (i = 0; i < (insn_count+1); i++) - bfd_put_32 (output_bfd, output_insns[i], contents + (i*4)); - } - --- -2.25.1 - diff --git a/package/binutils/2.32/0015-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch b/package/binutils/2.32/0015-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch deleted file mode 100644 index 585b97b2af1..00000000000 --- a/package/binutils/2.32/0015-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 9af93e143a7fbdb75aa1ed37277f9250eb111628 Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Sat, 10 Jul 2021 17:57:34 +0200 -Subject: [PATCH] or1k: fix pc-relative relocation against dynamic on PC - relative 26 bit relocation - -When building openal we were seeing the assert failure: - -/home/buildroot/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: CMakeFiles/OpenAL.dir/al/source.cpp.o: -pc-relative relocation against dynamic symbol alSourcePausev -/home/buildroot/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: CMakeFiles/OpenAL.dir/al/source.cpp.o: -pc-relative relocation against dynamic symbol alSourceStopv -/home/buildroot/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: CMakeFiles/OpenAL.dir/al/source.cpp.o: -pc-relative relocation against dynamic symbol alSourceRewindv -/home/buildroot/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: CMakeFiles/OpenAL.dir/al/source.cpp.o: -pc-relative relocation against dynamic symbol alSourcePlayv -collect2: error: ld returned 1 exit status - -This happens because in R_OR1K_INSN_REL_26 case we can't reference local -symbol as previously done but we need to make sure that calls to actual -symbol always call the version of current object. - -bfd/Changelog: - - * elf32-or1k.c (or1k_elf_relocate_section): use a separate entry - in switch case R_OR1K_INSN_REL_26 where we need to check for - !SYMBOL_CALLS_LOCAL() instead of !SYMBOL_REFERENCES_LOCAL(). - -Signed-off-by: Giulio Benetti ---- - bfd/elf32-or1k.c | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c -index 4ae7f324d33..4f9092539f5 100644 ---- a/bfd/elf32-or1k.c -+++ b/bfd/elf32-or1k.c -@@ -1543,6 +1543,18 @@ or1k_elf_relocate_section (bfd *output_bfd, - break; - - case R_OR1K_INSN_REL_26: -+ /* For a non-shared link, these will reference plt or call the -+ version of actual object. */ -+ if (bfd_link_pic (info) && !SYMBOL_CALLS_LOCAL (info, h)) -+ { -+ _bfd_error_handler -+ (_("%pB: pc-relative relocation against dynamic symbol %s"), -+ input_bfd, name); -+ ret_val = FALSE; -+ bfd_set_error (bfd_error_bad_value); -+ } -+ break; -+ - case R_OR1K_PCREL_PG21: - case R_OR1K_LO13: - case R_OR1K_SLO13: --- -2.25.1 - diff --git a/package/binutils/2.32/0016-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch b/package/binutils/2.32/0016-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch deleted file mode 100644 index 7e92e2bfd81..00000000000 --- a/package/binutils/2.32/0016-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 51def3dc6a168d03d28e0d4e2935d9ddb2929192 Mon Sep 17 00:00:00 2001 -From: Stafford Horne -Date: Sun, 2 Jan 2022 09:03:28 +0900 -Subject: [PATCH] or1k: Avoid R_OR1K_GOT16 signed overflow by using special - howto - -Previously when fixing PR 21464 we masked out upper bits of the -relocation value in order to avoid overflow complaints when acceptable. -It turns out this does not work when the relocation value ends up being -signed. - -To fix this this patch introduces a special howto with -complain_on_overflow set to complain_overflow_dont. This is used in -place of the normal R_OR1K_GOT16 howto when we detect R_OR1K_GOT_AHI16 -relocations. - -bfd/ChangeLog: - - PR 28735 - * elf32-or1k.c (or1k_elf_got16_no_overflow_howto): Define. - (or1k_elf_relocate_section): Use new howto instead of trying to - mask out relocation bits. - -Signed-off-by: Giulio Benetti ---- - bfd/elf32-or1k.c | 24 ++++++++++++++++++++---- - 1 file changed, 20 insertions(+), 4 deletions(-) - -diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c -index cfa292f0032..ecb70753b6a 100644 ---- a/bfd/elf32-or1k.c -+++ b/bfd/elf32-or1k.c -@@ -828,6 +828,23 @@ static reloc_howto_type or1k_elf_howto_table[] = - FALSE), /* pcrel_offset */ - }; - -+/* A copy of the R_OR1K_GOT16 used in the presense of R_OR1K_GOT_AHI16 -+ relocations when we know we can ignore overflows. */ -+static reloc_howto_type or1k_elf_got16_no_overflow_howto = -+ HOWTO (R_OR1K_GOT16, /* type */ -+ 0, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_dont, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_OR1K_GOT16", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE); /* pcrel_offset */ -+ - /* Map BFD reloc types to Or1k ELF reloc types. */ - - struct or1k_reloc_map -@@ -1477,12 +1494,11 @@ or1k_elf_relocate_section (bfd *output_bfd, - if (r_type == R_OR1K_GOT_AHI16) - saw_gotha = TRUE; - -- /* If we have a R_OR1K_GOT16 followed by a R_OR1K_GOT_AHI16 -+ /* If we have a R_OR1K_GOT16 following a R_OR1K_GOT_AHI16 - relocation we assume the code is doing the right thing to avoid -- overflows. Here we mask the lower 16-bit of the relocation to -- avoid overflow validation failures. */ -+ overflows. */ - if (r_type == R_OR1K_GOT16 && saw_gotha) -- relocation &= 0xffff; -+ howto = &or1k_elf_got16_no_overflow_howto; - - /* Addend should be zero. */ - if (rel->r_addend != 0) --- -2.25.1 - diff --git a/package/binutils/2.35.2/0001-sh-conf.patch b/package/binutils/2.35.2/0001-sh-conf.patch deleted file mode 100644 index 44d5f4e89a7..00000000000 --- a/package/binutils/2.35.2/0001-sh-conf.patch +++ /dev/null @@ -1,48 +0,0 @@ -From ae50e875f4292c99b859cded1d036e401b6ddaec 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). - -[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 54d0339ab9e..c2f51ffcebb 100755 ---- a/configure -+++ b/configure -@@ -3937,7 +3937,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 a910c4fd6ba..a93d93c81c3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1178,7 +1178,7 @@ case "${target}" in - nvptx*-*-*) - noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" - ;; -- sh-*-*) -+ sh*-*-*) - case "${target}" in - sh*-*-elf) - ;; --- -2.25.4 - diff --git a/package/binutils/2.35.2/0002-poison-system-directories.patch b/package/binutils/2.35.2/0002-poison-system-directories.patch deleted file mode 100644 index b77a5e1a668..00000000000 --- a/package/binutils/2.35.2/0002-poison-system-directories.patch +++ /dev/null @@ -1,306 +0,0 @@ -From db405d1bc5607892ddb25433354b46d78e23b343 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. - -[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] - -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 2f4e5ea33e3..8fbb29682b2 100644 ---- a/ld/config.in -+++ b/ld/config.in -@@ -40,6 +40,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 6be5280621f..d62e7b12382 100755 ---- a/ld/configure -+++ b/ld/configure -@@ -826,6 +826,7 @@ with_lib_path - enable_targets - enable_64_bit_bfd - with_sysroot -+enable_poison_system_directories - enable_gold - enable_got - enable_compressed_debug_sections -@@ -1493,6 +1494,8 @@ Optional Features: - --disable-largefile omit support for large files - --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) -@@ -15814,7 +15817,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 172398ff847..b77f8510ca6 100644 ---- a/ld/configure.ac -+++ b/ld/configure.ac -@@ -94,6 +94,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 1790dc81a66..73f832eb169 100644 ---- a/ld/ld.h -+++ b/ld/ld.h -@@ -166,6 +166,14 @@ typedef struct - in the linker script. */ - bfd_boolean force_group_allocation; - -+ /* If TRUE (the default) warn for uses of system directories when -+ cross linking. */ -+ bfd_boolean poison_system_directories; -+ -+ /* If TRUE (default FALSE) give an error for uses of system -+ directories when cross linking instead of a warning. */ -+ bfd_boolean 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 2a93e9456ac..3eeb70607fd 100644 ---- a/ld/ld.texi -+++ b/ld/ld.texi -@@ -2655,6 +2655,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. - @end table - - @c man end -diff --git a/ld/ldfile.c b/ld/ldfile.c -index e39170b5d94..fadc248a140 100644 ---- a/ld/ldfile.c -+++ b/ld/ldfile.c -@@ -117,6 +117,23 @@ ldfile_add_library_path (const char *name, bfd_boolean 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 -+ - } - - /* Try to open a BFD for a lang_input_statement. */ -diff --git a/ld/ldlex.h b/ld/ldlex.h -index 5ea083ebeb3..417f9b858ce 100644 ---- a/ld/ldlex.h -+++ b/ld/ldlex.h -@@ -155,6 +155,8 @@ enum option_values - OPTION_NON_CONTIGUOUS_REGIONS, - OPTION_NON_CONTIGUOUS_REGIONS_WARNINGS, - OPTION_DEPENDENCY_FILE, -+ OPTION_NO_POISON_SYSTEM_DIRECTORIES, -+ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, - }; - - /* The initial parser states. */ -diff --git a/ld/ldmain.c b/ld/ldmain.c -index 08be9030cb5..92dc16399eb 100644 ---- a/ld/ldmain.c -+++ b/ld/ldmain.c -@@ -321,6 +321,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 6cab41cf5df..c497f36b148 100644 ---- a/ld/lexsup.c -+++ b/ld/lexsup.c -@@ -572,6 +572,14 @@ static const struct ld_option ld_options[] = - { {"no-print-map-discarded", no_argument, NULL, OPTION_NO_PRINT_MAP_DISCARDED}, - '\0', NULL, N_("Do not show discarded sections in map file output"), - 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) -@@ -584,6 +592,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; -@@ -1591,6 +1600,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), -@@ -1681,6 +1698,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.25.4 - diff --git a/package/binutils/2.35.2/0003-or1k-Fix-issue-with-plt-link-failure-for-local-calls.patch b/package/binutils/2.35.2/0003-or1k-Fix-issue-with-plt-link-failure-for-local-calls.patch deleted file mode 100644 index 81fb6b85182..00000000000 --- a/package/binutils/2.35.2/0003-or1k-Fix-issue-with-plt-link-failure-for-local-calls.patch +++ /dev/null @@ -1,59 +0,0 @@ -From baf313f84b106a5a29f01796afd857e69abf8b08 Mon Sep 17 00:00:00 2001 -From: Stafford Horne -Date: Sun, 2 May 2021 06:02:14 +0900 -Subject: [PATCH] or1k: Fix issue with plt link failure for local calls - -When building protobuf we were seeing the assert failure: - - /home/giuliobenetti/git/upstream/or1k-binutils-2.36.1/host/lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: - BFD (GNU Binutils) 2.36.1 assertion fail elf32-or1k.c:2377 - /home/giuliobenetti/git/upstream/or1k-binutils-2.36.1/host/lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: - BFD (GNU Binutils) 2.36.1 assertion fail elf32-or1k.c:2377 - /home/giuliobenetti/git/upstream/or1k-binutils-2.36.1/host/lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: - BFD (GNU Binutils) 2.36.1 assertion fail elf32-or1k.c:2377 - collect2: error: ld returned 1 exit status - -This failure happens while writing out PLT entries, there is a check -"BFD_ASSERT (h->dynindx != -1)" to confirm all plt entries have dynamic -symbol attributes. This was failing for symbols that were -"forced_local" in previous linking code. - -The fix adds logic to or1k_elf_adjust_dynamic_symbol to identify -"forced_local" symbols and exclude them from the the PLT. - -bfd/ChangeLog: - - PR 27624 - * elf32-or1k.c (or1k_elf_adjust_dynamic_symbol): Change - condition used to cleanup plt entries to cleanup forced local - entries. - -Cc: Giulio Benetti -Signed-off-by: Giulio Benetti ---- - bfd/elf32-or1k.c | 9 ++++----- - 1 file changed, 4 insertions(+), 5 deletions(-) - -diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c -index 7c02d004cc7..bbfa2bfe614 100644 ---- a/bfd/elf32-or1k.c -+++ b/bfd/elf32-or1k.c -@@ -2568,11 +2568,10 @@ or1k_elf_adjust_dynamic_symbol (struct bfd_link_info *info, - if (h->type == STT_FUNC - || h->needs_plt) - { -- if (! bfd_link_pic (info) -- && !h->def_dynamic -- && !h->ref_dynamic -- && h->root.type != bfd_link_hash_undefweak -- && h->root.type != bfd_link_hash_undefined) -+ if (h->plt.refcount <= 0 -+ || (SYMBOL_CALLS_LOCAL (info, h) -+ || (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT -+ && h->root.type == bfd_link_hash_undefweak))) - { - /* This case can occur if we saw a PLT reloc in an input - file, but the symbol was never referred to by a dynamic --- -2.25.1 - diff --git a/package/binutils/2.35.2/0004-or1k-Implement-relocation-R_OR1K_GOT_AHI16-for-gotha.patch b/package/binutils/2.35.2/0004-or1k-Implement-relocation-R_OR1K_GOT_AHI16-for-gotha.patch deleted file mode 100644 index a4af57d546e..00000000000 --- a/package/binutils/2.35.2/0004-or1k-Implement-relocation-R_OR1K_GOT_AHI16-for-gotha.patch +++ /dev/null @@ -1,256 +0,0 @@ -From c67656e248d6dadaa2729975a17c8dd03afe48d0 Mon Sep 17 00:00:00 2001 -From: Stafford Horne -Date: Sun, 2 May 2021 06:02:15 +0900 -Subject: [PATCH] or1k: Implement relocation R_OR1K_GOT_AHI16 for gotha() - -The gotha() relocation mnemonic will be outputted by OpenRISC GCC when -using the -mcmodel=large option. This relocation is used along with -got() to generate 32-bit GOT offsets. This increases the previous GOT -offset limit from the previous 16-bit (64K) limit. - -This is needed on large binaries where the GOT grows larger than 64k. - -bfd/ChangeLog: - - PR 21464 - * bfd-in2.h: Add BFD_RELOC_OR1K_GOT_AHI16 relocation. - * elf32-or1k.c (or1k_elf_howto_table, or1k_reloc_map): Likewise. - (or1k_final_link_relocate, or1k_elf_relocate_section, - or1k_elf_check_relocs): Likewise. - * libbfd.h (bfd_reloc_code_real_names): Likewise. - * reloc.c: Likewise. - -cpu/ChangeLog: - - PR 21464 - * or1k.opc (or1k_imm16_relocs, parse_reloc): Define parse logic - for gotha() relocation. - -include/ChangeLog: - - PR 21464 - * elf/or1k.h (elf_or1k_reloc_type): Define R_OR1K_GOT_AHI16 number. - -opcodes/ChangeLog: - - PR 21464 - * or1k-asm.c: Regenerate. - -gas/ChangeLog: - - PR 21464 - * testsuite/gas/or1k/reloc-1.s: Add test for new relocation. - * testsuite/gas/or1k/reloc-1.d: Add test result for new - relocation. - -Cc: Giulio Benetti - -fixup reloc, add tests - -Signed-off-by: Giulio Benetti ---- - bfd/bfd-in2.h | 1 + - bfd/elf32-or1k.c | 21 ++++++++++++++++++++- - bfd/libbfd.h | 1 + - bfd/reloc.c | 2 ++ - cpu/or1k.opc | 7 ++++++- - gas/testsuite/gas/or1k/reloc-1.d | 4 +++- - gas/testsuite/gas/or1k/reloc-1.s | 4 ++++ - include/elf/or1k.h | 1 + - opcodes/or1k-asm.c | 7 ++++++- - 9 files changed, 44 insertions(+), 4 deletions(-) - -diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h -index df6f9f45673..ab861395e93 100644 ---- a/bfd/bfd-in2.h -+++ b/bfd/bfd-in2.h -@@ -5041,6 +5041,7 @@ then it may be truncated to 8 bits. */ - BFD_RELOC_OR1K_TLS_TPOFF, - BFD_RELOC_OR1K_TLS_DTPOFF, - BFD_RELOC_OR1K_TLS_DTPMOD, -+ BFD_RELOC_OR1K_GOT_AHI16, - - /* H8 elf Relocations. */ - BFD_RELOC_H8_DIR16A8, -diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c -index bbfa2bfe614..8e395827123 100644 ---- a/bfd/elf32-or1k.c -+++ b/bfd/elf32-or1k.c -@@ -808,6 +808,20 @@ static reloc_howto_type or1k_elf_howto_table[] = - 0, /* Source Mask. */ - 0x03ffffff, /* Dest Mask. */ - TRUE), /* PC relative offset? */ -+ -+ HOWTO (R_OR1K_GOT_AHI16, /* type */ -+ 16, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_signed, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_OR1K_GOT_AHI16", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ - }; - - /* Map BFD reloc types to Or1k ELF reloc types. */ -@@ -871,6 +885,7 @@ static const struct or1k_reloc_map or1k_reloc_map[] = - { BFD_RELOC_OR1K_TLS_IE_LO13, R_OR1K_TLS_IE_LO13 }, - { BFD_RELOC_OR1K_SLO13, R_OR1K_SLO13 }, - { BFD_RELOC_OR1K_PLTA26, R_OR1K_PLTA26 }, -+ { BFD_RELOC_OR1K_GOT_AHI16, R_OR1K_GOT_AHI16 }, - }; - - /* tls_type is a mask used to track how each symbol is accessed, -@@ -1113,6 +1128,7 @@ or1k_final_link_relocate (reloc_howto_type *howto, bfd *input_bfd, - switch (howto->type) - { - case R_OR1K_AHI16: -+ case R_OR1K_GOT_AHI16: - case R_OR1K_GOTOFF_AHI16: - case R_OR1K_TLS_IE_AHI16: - case R_OR1K_TLS_LE_AHI16: -@@ -1375,6 +1391,7 @@ or1k_elf_relocate_section (bfd *output_bfd, - } - break; - -+ case R_OR1K_GOT_AHI16: - case R_OR1K_GOT16: - case R_OR1K_GOT_PG21: - case R_OR1K_GOT_LO13: -@@ -1466,7 +1483,8 @@ or1k_elf_relocate_section (bfd *output_bfd, - /* The GOT_PG21 and GOT_LO13 relocs are pc-relative, - while the GOT16 reloc is GOT relative. */ - relocation = got_base + off; -- if (r_type == R_OR1K_GOT16) -+ if (r_type == R_OR1K_GOT16 -+ || r_type == R_OR1K_GOT_AHI16) - relocation -= got_sym_value; - - /* Addend should be zero. */ -@@ -1992,6 +2010,7 @@ or1k_elf_check_relocs (bfd *abfd, - } - break; - -+ case R_OR1K_GOT_AHI16: - case R_OR1K_GOT16: - case R_OR1K_GOT_PG21: - case R_OR1K_GOT_LO13: -diff --git a/bfd/libbfd.h b/bfd/libbfd.h -index b97534fc9fe..795c9b9d27f 100644 ---- a/bfd/libbfd.h -+++ b/bfd/libbfd.h -@@ -2755,6 +2755,7 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@", - "BFD_RELOC_OR1K_TLS_TPOFF", - "BFD_RELOC_OR1K_TLS_DTPOFF", - "BFD_RELOC_OR1K_TLS_DTPMOD", -+ "BFD_RELOC_OR1K_GOT_AHI16", - "BFD_RELOC_H8_DIR16A8", - "BFD_RELOC_H8_DIR16R8", - "BFD_RELOC_H8_DIR24A8", -diff --git a/bfd/reloc.c b/bfd/reloc.c -index 9aba84ca81e..1e021febef2 100644 ---- a/bfd/reloc.c -+++ b/bfd/reloc.c -@@ -6175,6 +6175,8 @@ ENUMX - BFD_RELOC_OR1K_GOTPC_HI16 - ENUMX - BFD_RELOC_OR1K_GOTPC_LO16 -+ENUMX -+ BFD_RELOC_OR1K_GOT_AHI16 - ENUMX - BFD_RELOC_OR1K_GOT16 - ENUMX -diff --git a/cpu/or1k.opc b/cpu/or1k.opc -index f0adcbb00a5..5d20a1f33a7 100644 ---- a/cpu/or1k.opc -+++ b/cpu/or1k.opc -@@ -193,7 +193,7 @@ static const bfd_reloc_code_real_type or1k_imm16_relocs[][6] = { - BFD_RELOC_OR1K_GOT_LO13, - BFD_RELOC_UNUSED, - BFD_RELOC_UNUSED, -- BFD_RELOC_UNUSED }, -+ BFD_RELOC_OR1K_GOT_AHI16 }, - { BFD_RELOC_OR1K_GOTPC_LO16, - BFD_RELOC_UNUSED, - BFD_RELOC_UNUSED, -@@ -296,6 +296,11 @@ parse_reloc (const char **strp) - str += 5; - cls = RCLASS_TPOFF; - } -+ else if (strncasecmp (str, "got", 3) == 0) -+ { -+ str += 3; -+ cls = RCLASS_GOT; -+ } - - if (strncasecmp (str, "hi(", 3) == 0) - { -diff --git a/gas/testsuite/gas/or1k/reloc-1.d b/gas/testsuite/gas/or1k/reloc-1.d -index d1bcf5608bb..3a001c4ed99 100644 ---- a/gas/testsuite/gas/or1k/reloc-1.d -+++ b/gas/testsuite/gas/or1k/reloc-1.d -@@ -68,5 +68,7 @@ OFFSET TYPE VALUE - 000000ec R_OR1K_LO13 x - 000000f0 R_OR1K_GOT_LO13 x - 000000f4 R_OR1K_SLO13 x -- -+000000f8 R_OR1K_GOT_AHI16 x -+000000fc R_OR1K_GOT_AHI16 x -+00000100 R_OR1K_GOT_AHI16 x - -diff --git a/gas/testsuite/gas/or1k/reloc-1.s b/gas/testsuite/gas/or1k/reloc-1.s -index e76abef6532..562609aa869 100644 ---- a/gas/testsuite/gas/or1k/reloc-1.s -+++ b/gas/testsuite/gas/or1k/reloc-1.s -@@ -74,3 +74,7 @@ - l.lbz r5,po(x)(r3) - l.lbz r5,gotpo(x)(r3) - l.sb po(x)(r3),r6 -+ -+ l.movhi r4,gotha(x) -+ l.ori r3,r4,gotha(x) -+ l.addi r3,r4,gotha(x) -diff --git a/include/elf/or1k.h b/include/elf/or1k.h -index a215ef5c17e..dff37d875f2 100644 ---- a/include/elf/or1k.h -+++ b/include/elf/or1k.h -@@ -77,6 +77,7 @@ START_RELOC_NUMBERS (elf_or1k_reloc_type) - RELOC_NUMBER (R_OR1K_TLS_IE_LO13, 51) - RELOC_NUMBER (R_OR1K_SLO13, 52) - RELOC_NUMBER (R_OR1K_PLTA26, 53) -+ RELOC_NUMBER (R_OR1K_GOT_AHI16, 54) - END_RELOC_NUMBERS (R_OR1K_max) - - #define EF_OR1K_NODELAY (1UL << 0) -diff --git a/opcodes/or1k-asm.c b/opcodes/or1k-asm.c -index 5f3c6c74b12..e0c49b3b8cd 100644 ---- a/opcodes/or1k-asm.c -+++ b/opcodes/or1k-asm.c -@@ -177,7 +177,7 @@ static const bfd_reloc_code_real_type or1k_imm16_relocs[][6] = { - BFD_RELOC_OR1K_GOT_LO13, - BFD_RELOC_UNUSED, - BFD_RELOC_UNUSED, -- BFD_RELOC_UNUSED }, -+ BFD_RELOC_OR1K_GOT_AHI16 }, - { BFD_RELOC_OR1K_GOTPC_LO16, - BFD_RELOC_UNUSED, - BFD_RELOC_UNUSED, -@@ -280,6 +280,11 @@ parse_reloc (const char **strp) - str += 5; - cls = RCLASS_TPOFF; - } -+ else if (strncasecmp (str, "got", 3) == 0) -+ { -+ str += 3; -+ cls = RCLASS_GOT; -+ } - - if (strncasecmp (str, "hi(", 3) == 0) - { --- -2.25.1 - diff --git a/package/binutils/2.35.2/0005-or1k-Avoid-R_OR1K_GOT16-overflow-failures-in-presenc.patch b/package/binutils/2.35.2/0005-or1k-Avoid-R_OR1K_GOT16-overflow-failures-in-presenc.patch deleted file mode 100644 index 82198dd3734..00000000000 --- a/package/binutils/2.35.2/0005-or1k-Avoid-R_OR1K_GOT16-overflow-failures-in-presenc.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 097b83a1c9c694a14e6081cee034bf24f16875c1 Mon Sep 17 00:00:00 2001 -From: Stafford Horne -Date: Sun, 2 May 2021 06:02:16 +0900 -Subject: [PATCH] or1k: Avoid R_OR1K_GOT16 overflow failures in presence of - R_OR1K_GOT_AHI16 - -Now that we support R_OR1K_GOT_AHI16 we can relax the R_OR1K_GOT16 -overflow validation check if the section has R_OR1K_GOT_AHI16. - -We cannot simple disable R_OR1K_GOT16 overflow validation as there will -still be binaries that will have only R_OR1K_GOT16. The -R_OR1K_GOT_AHI16 relocation will only be added by GCC when building with -the option -mcmodel=large. - -This assumes that R_OR1K_GOT_AHI16 will come before R_OR1K_GOT16, which -is the code pattern that will be emitted by GCC. - -bfd/ChangeLog: - - PR 21464 - * elf32-or1k.c (or1k_elf_relocate_section): Relax R_OR1K_GOT16 - overflow check if we have R_OR1K_GOT_AHI16 followed by - R_OR1K_GOT16. - -Signed-off-by: Giulio Benetti ---- - bfd/elf32-or1k.c | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c -index 8e395827123..9f315bfda99 100644 ---- a/bfd/elf32-or1k.c -+++ b/bfd/elf32-or1k.c -@@ -1280,6 +1280,7 @@ or1k_elf_relocate_section (bfd *output_bfd, - asection *sgot, *splt; - bfd_vma plt_base, got_base, got_sym_value; - bfd_boolean ret_val = TRUE; -+ bfd_boolean saw_gotha = FALSE; - - if (htab == NULL) - return FALSE; -@@ -1487,6 +1488,16 @@ or1k_elf_relocate_section (bfd *output_bfd, - || r_type == R_OR1K_GOT_AHI16) - relocation -= got_sym_value; - -+ if (r_type == R_OR1K_GOT_AHI16) -+ saw_gotha = TRUE; -+ -+ /* If we have a R_OR1K_GOT16 followed by a R_OR1K_GOT_AHI16 -+ relocation we assume the code is doing the right thing to avoid -+ overflows. Here we mask the lower 16-bit of the relocation to -+ avoid overflow validation failures. */ -+ if (r_type == R_OR1K_GOT16 && saw_gotha) -+ relocation &= 0xffff; -+ - /* Addend should be zero. */ - if (rel->r_addend != 0) - { --- -2.25.1 - diff --git a/package/binutils/2.35.2/0006-or1k-Support-large-plt_relocs-when-generating-plt-en.patch b/package/binutils/2.35.2/0006-or1k-Support-large-plt_relocs-when-generating-plt-en.patch deleted file mode 100644 index c884ab874d9..00000000000 --- a/package/binutils/2.35.2/0006-or1k-Support-large-plt_relocs-when-generating-plt-en.patch +++ /dev/null @@ -1,500 +0,0 @@ -From c87692eb894b4b86eced7b7ba205f9bf27c2c213 Mon Sep 17 00:00:00 2001 -From: Stafford Horne -Date: Sun, 2 May 2021 06:02:17 +0900 -Subject: [PATCH] or1k: Support large plt_relocs when generating plt - entries - -The current PLT generation code will generate invalid code when the PLT -relocation offset exceeds 64k. This fixes the issue by detecting large -plt_reloc offsets and generare code sequences to create larger plt -relocations. - -The "large" plt code needs 2 extra instructions to create 32-bit offsets. - -bfd/ChangeLog: - - PR 27746 - * elf32-or1k.c (PLT_ENTRY_SIZE_LARGE, PLT_MAX_INSN_COUNT, - OR1K_ADD, OR1K_ORI): New macros to help with plt creation. - (elf_or1k_link_hash_table): New field plt_count. - (elf_or1k_link_hash_entry): New field plt_index. - (elf_or1k_plt_entry_size): New function. - (or1k_write_plt_entry): Update to support variable size PLTs. - (or1k_elf_finish_dynamic_sections): Use new or1k_write_plt_entry - API. - (or1k_elf_finish_dynamic_symbol): Update to write large PLTs - when needed. - (allocate_dynrelocs): Use elf_or1k_plt_entry_size to account for - PLT size. - -ld/ChangeLog: - - PR 27746 - testsuite/ld-or1k/or1k.exp (or1kplttests): Add tests for linking - along with gotha() relocations. - testsuite/ld-or1k/gotha1.dd: New file. - testsuite/ld-or1k/gotha1.s: New file. - testsuite/ld-or1k/gotha2.dd: New file. - testsuite/ld-or1k/gotha2.s: New file - testsuite/ld-or1k/pltlib.s (x): Define size to avoid link - failure. - -Signed-off-by: Giulio Benetti ---- - bfd/elf32-or1k.c | 149 ++++++++++++++++++++++++--------- - ld/testsuite/ld-or1k/gotha1.dd | 34 ++++++++ - ld/testsuite/ld-or1k/gotha1.s | 24 ++++++ - ld/testsuite/ld-or1k/gotha2.dd | 21 +++++ - ld/testsuite/ld-or1k/gotha2.s | 22 +++++ - ld/testsuite/ld-or1k/or1k.exp | 8 ++ - ld/testsuite/ld-or1k/pltlib.s | 1 + - 7 files changed, 220 insertions(+), 39 deletions(-) - create mode 100644 ld/testsuite/ld-or1k/gotha1.dd - create mode 100644 ld/testsuite/ld-or1k/gotha1.s - create mode 100644 ld/testsuite/ld-or1k/gotha2.dd - create mode 100644 ld/testsuite/ld-or1k/gotha2.s - -diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c -index 9f315bfda99..7a14eaa3a46 100644 ---- a/bfd/elf32-or1k.c -+++ b/bfd/elf32-or1k.c -@@ -30,10 +30,14 @@ - #define N_ONES(X) (((bfd_vma)2 << (X)) - 1) - - #define PLT_ENTRY_SIZE 16 -+#define PLT_ENTRY_SIZE_LARGE (6*4) -+#define PLT_MAX_INSN_COUNT 6 - - #define OR1K_MOVHI(D) (0x18000000 | (D << 21)) - #define OR1K_ADRP(D) (0x08000000 | (D << 21)) - #define OR1K_LWZ(D,A) (0x84000000 | (D << 21) | (A << 16)) -+#define OR1K_ADD(D,A,B) (0xE0000000 | (D << 21) | (A << 16) | (B << 11)) -+#define OR1K_ORI(D,A) (0xA8000000 | (D << 21) | (A << 16)) - #define OR1K_ORI0(D) (0xA8000000 | (D << 21)) - #define OR1K_JR(B) (0x44000000 | (B << 11)) - #define OR1K_NOP 0x15000000 -@@ -907,6 +911,8 @@ struct elf_or1k_link_hash_entry - { - struct elf_link_hash_entry root; - -+ /* For calculating PLT size. */ -+ bfd_vma plt_index; - /* Track type of TLS access. */ - unsigned char tls_type; - }; -@@ -934,9 +940,20 @@ struct elf_or1k_link_hash_table - /* Small local sym to section mapping cache. */ - struct sym_cache sym_sec; - -+ bfd_vma plt_count; - bfd_boolean saw_plta; - }; - -+static size_t -+elf_or1k_plt_entry_size (bfd_vma plt_index) -+{ -+ bfd_vma plt_reloc; -+ -+ plt_reloc = plt_index * sizeof (Elf32_External_Rela); -+ -+ return (plt_reloc > 0xffff) ? PLT_ENTRY_SIZE_LARGE : PLT_ENTRY_SIZE; -+} -+ - /* Get the ELF linker hash table from a link_info structure. */ - #define or1k_elf_hash_table(p) \ - (elf_hash_table_id ((struct elf_link_hash_table *) ((p)->hash)) \ -@@ -2224,33 +2241,46 @@ or1k_elf_check_relocs (bfd *abfd, - } - - static void --or1k_write_plt_entry (bfd *output_bfd, bfd_byte *contents, unsigned insn1, -- unsigned insn2, unsigned insn3, unsigned insnj) -+or1k_write_plt_entry (bfd *output_bfd, bfd_byte *contents, unsigned insnj, -+ unsigned insns[], size_t insn_count) - { - unsigned nodelay = elf_elfheader (output_bfd)->e_flags & EF_OR1K_NODELAY; -- unsigned insn4; -+ unsigned output_insns[PLT_MAX_INSN_COUNT]; -+ -+ /* Copy instructions into the output buffer. */ -+ for (size_t i = 0; i < insn_count; i++) -+ output_insns[i] = insns[i]; - - /* Honor the no-delay-slot setting. */ -- if (insn3 == OR1K_NOP) -+ if (insns[insn_count-1] == OR1K_NOP) - { -- insn4 = insn3; -+ unsigned slot1, slot2; -+ - if (nodelay) -- insn3 = insnj; -+ slot1 = insns[insn_count-2], slot2 = insnj; - else -- insn3 = insn2, insn2 = insnj; -+ slot1 = insnj, slot2 = insns[insn_count-2]; -+ -+ output_insns[insn_count-2] = slot1; -+ output_insns[insn_count-1] = slot2; -+ output_insns[insn_count] = OR1K_NOP; - } - else - { -+ unsigned slot1, slot2; -+ - if (nodelay) -- insn4 = insnj; -+ slot1 = insns[insn_count-1], slot2 = insnj; - else -- insn4 = insn3, insn3 = insnj; -+ slot1 = insnj, slot2 = insns[insn_count-1]; -+ -+ output_insns[insn_count-1] = slot1; -+ output_insns[insn_count] = slot2; - } - -- bfd_put_32 (output_bfd, insn1, contents); -- bfd_put_32 (output_bfd, insn2, contents + 4); -- bfd_put_32 (output_bfd, insn3, contents + 8); -- bfd_put_32 (output_bfd, insn4, contents + 12); -+ /* Write out the output buffer. */ -+ for (size_t i = 0; i < (insn_count+1); i++) -+ bfd_put_32 (output_bfd, output_insns[i], contents + (i*4)); - } - - /* Finish up the dynamic sections. */ -@@ -2317,7 +2347,8 @@ or1k_elf_finish_dynamic_sections (bfd *output_bfd, - splt = htab->root.splt; - if (splt && splt->size > 0) - { -- unsigned plt0, plt1, plt2; -+ unsigned plt[PLT_MAX_INSN_COUNT]; -+ size_t plt_insn_count = 3; - bfd_vma got_addr = sgot->output_section->vma + sgot->output_offset; - - /* Note we force 16 byte alignment on the .got, so that -@@ -2328,27 +2359,27 @@ or1k_elf_finish_dynamic_sections (bfd *output_bfd, - bfd_vma pc = splt->output_section->vma + splt->output_offset; - unsigned pa = ((got_addr >> 13) - (pc >> 13)) & 0x1fffff; - unsigned po = got_addr & 0x1fff; -- plt0 = OR1K_ADRP(12) | pa; -- plt1 = OR1K_LWZ(15,12) | (po + 8); -- plt2 = OR1K_LWZ(12,12) | (po + 4); -+ plt[0] = OR1K_ADRP(12) | pa; -+ plt[1] = OR1K_LWZ(15,12) | (po + 8); -+ plt[2] = OR1K_LWZ(12,12) | (po + 4); - } - else if (bfd_link_pic (info)) - { -- plt0 = OR1K_LWZ(15, 16) | 8; /* .got+8 */ -- plt1 = OR1K_LWZ(12, 16) | 4; /* .got+4 */ -- plt2 = OR1K_NOP; -+ plt[0] = OR1K_LWZ(15, 16) | 8; /* .got+8 */ -+ plt[1] = OR1K_LWZ(12, 16) | 4; /* .got+4 */ -+ plt[2] = OR1K_NOP; - } - else - { - unsigned ha = ((got_addr + 0x8000) >> 16) & 0xffff; - unsigned lo = got_addr & 0xffff; -- plt0 = OR1K_MOVHI(12) | ha; -- plt1 = OR1K_LWZ(15,12) | (lo + 8); -- plt2 = OR1K_LWZ(12,12) | (lo + 4); -+ plt[0] = OR1K_MOVHI(12) | ha; -+ plt[1] = OR1K_LWZ(15,12) | (lo + 8); -+ plt[2] = OR1K_LWZ(12,12) | (lo + 4); - } - -- or1k_write_plt_entry (output_bfd, splt->contents, -- plt0, plt1, plt2, OR1K_JR(15)); -+ or1k_write_plt_entry (output_bfd, splt->contents, OR1K_JR(15), -+ plt, plt_insn_count); - - elf_section_data (splt->output_section)->this_hdr.sh_entsize = 4; - } -@@ -2391,7 +2422,8 @@ or1k_elf_finish_dynamic_symbol (bfd *output_bfd, - - if (h->plt.offset != (bfd_vma) -1) - { -- unsigned int plt0, plt1, plt2; -+ unsigned int plt[PLT_MAX_INSN_COUNT]; -+ size_t plt_insn_count = 3; - asection *splt; - asection *sgot; - asection *srela; -@@ -2403,6 +2435,7 @@ or1k_elf_finish_dynamic_symbol (bfd *output_bfd, - bfd_vma got_offset; - bfd_vma got_addr; - Elf_Internal_Rela rela; -+ bfd_boolean large_plt_entry; - - /* This symbol has an entry in the procedure linkage table. Set - it up. */ -@@ -2420,10 +2453,13 @@ or1k_elf_finish_dynamic_symbol (bfd *output_bfd, - corresponds to this symbol. This is the index of this symbol - in all the symbols for which we are making plt entries. The - first entry in the procedure linkage table is reserved. */ -- plt_index = h->plt.offset / PLT_ENTRY_SIZE - 1; -+ plt_index = ((struct elf_or1k_link_hash_entry *) h)->plt_index; - plt_addr = plt_base_addr + h->plt.offset; - plt_reloc = plt_index * sizeof (Elf32_External_Rela); - -+ large_plt_entry = (elf_or1k_plt_entry_size (plt_index) -+ == PLT_ENTRY_SIZE_LARGE); -+ - /* Get the offset into the .got table of the entry that - corresponds to this function. Each .got entry is 4 bytes. - The first three are reserved. */ -@@ -2435,27 +2471,57 @@ or1k_elf_finish_dynamic_symbol (bfd *output_bfd, - { - unsigned pa = ((got_addr >> 13) - (plt_addr >> 13)) & 0x1fffff; - unsigned po = (got_addr & 0x1fff); -- plt0 = OR1K_ADRP(12) | pa; -- plt1 = OR1K_LWZ(12,12) | po; -- plt2 = OR1K_ORI0(11) | plt_reloc; -+ plt[0] = OR1K_ADRP(12) | pa; -+ plt[1] = OR1K_LWZ(12,12) | po; -+ plt[2] = OR1K_ORI0(11) | plt_reloc; - } - else if (bfd_link_pic (info)) - { -- plt0 = OR1K_LWZ(12,16) | got_offset; -- plt1 = OR1K_ORI0(11) | plt_reloc; -- plt2 = OR1K_NOP; -+ if (large_plt_entry) -+ { -+ unsigned gotha = ((got_offset + 0x8000) >> 16) & 0xffff; -+ unsigned got = got_offset & 0xffff; -+ unsigned pltrelhi = (plt_reloc >> 16) & 0xffff; -+ unsigned pltrello = plt_reloc & 0xffff; -+ -+ plt[0] = OR1K_MOVHI(12) | gotha; -+ plt[1] = OR1K_ADD(12,12,16); -+ plt[2] = OR1K_LWZ(12,12) | got; -+ plt[3] = OR1K_MOVHI(11) | pltrelhi; -+ plt[4] = OR1K_ORI(11,11) | pltrello; -+ plt_insn_count = 5; -+ } -+ else -+ { -+ plt[0] = OR1K_LWZ(12,16) | got_offset; -+ plt[1] = OR1K_ORI0(11) | plt_reloc; -+ plt[2] = OR1K_NOP; -+ } - } - else - { - unsigned ha = ((got_addr + 0x8000) >> 16) & 0xffff; - unsigned lo = got_addr & 0xffff; -- plt0 = OR1K_MOVHI(12) | ha; -- plt1 = OR1K_LWZ(12,12) | lo; -- plt2 = OR1K_ORI0(11) | plt_reloc; -+ plt[0] = OR1K_MOVHI(12) | ha; -+ plt[1] = OR1K_LWZ(12,12) | lo; -+ plt[2] = OR1K_ORI0(11) | plt_reloc; -+ } -+ -+ /* For large code model we fixup the non-PIC PLT relocation instructions -+ here. */ -+ if (large_plt_entry && !bfd_link_pic (info)) -+ { -+ unsigned pltrelhi = (plt_reloc >> 16) & 0xffff; -+ unsigned pltrello = plt_reloc & 0xffff; -+ -+ plt[2] = OR1K_MOVHI(11) | pltrelhi; -+ plt[3] = OR1K_ORI(11,11) | pltrello; -+ plt[4] = OR1K_NOP; -+ plt_insn_count = 5; - } - - or1k_write_plt_entry (output_bfd, splt->contents + h->plt.offset, -- plt0, plt1, plt2, OR1K_JR(12)); -+ OR1K_JR(12), plt, plt_insn_count); - - /* Fill in the entry in the global offset table. We initialize it to - point to the top of the plt. This is done to lazy lookup the actual -@@ -2779,11 +2845,16 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf) - if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, bfd_link_pic (info), h)) - { - asection *splt = htab->root.splt; -+ bfd_vma plt_index; -+ -+ /* Track the index of our plt entry for use in calculating size. */ -+ plt_index = htab->plt_count++; -+ ((struct elf_or1k_link_hash_entry *) h)->plt_index = plt_index; - - /* If this is the first .plt entry, make room for the special - first entry. */ - if (splt->size == 0) -- splt->size = PLT_ENTRY_SIZE; -+ splt->size = elf_or1k_plt_entry_size (plt_index); - - h->plt.offset = splt->size; - -@@ -2800,7 +2871,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf) - } - - /* Make room for this entry. */ -- splt->size += PLT_ENTRY_SIZE; -+ splt->size += elf_or1k_plt_entry_size (plt_index); - - /* We also need to make an entry in the .got.plt section, which - will be placed in the .got section by the linker script. */ -diff --git a/ld/testsuite/ld-or1k/gotha1.dd b/ld/testsuite/ld-or1k/gotha1.dd -new file mode 100644 -index 00000000000..0ad1f8f5399 ---- /dev/null -+++ b/ld/testsuite/ld-or1k/gotha1.dd -@@ -0,0 +1,34 @@ -+ -+.*\.x: file format elf32-or1k -+ -+ -+Disassembly of section \.plt: -+ -+[0-9a-f]+ <\.plt>: -+ +[0-9a-f]+: 19 80 00 00 l\.movhi r12,0x0 -+ +[0-9a-f]+: 85 ec [0-9a-f]+ [0-9a-f]+ l\.lwz r15,[0-9]+\(r12\) -+ +[0-9a-f]+: 44 00 78 00 l\.jr r15 -+ +[0-9a-f]+: 85 8c [0-9a-f]+ [0-9a-f]+ l\.lwz r12,[0-9]+\(r12\) -+ +[0-9a-f]+: 19 80 00 00 l\.movhi r12,0x0 -+ +[0-9a-f]+: 85 8c [0-9a-f]+ [0-9a-f]+ l\.lwz r12,[0-9]+\(r12\) -+ +[0-9a-f]+: 44 00 60 00 l\.jr r12 -+ +[0-9a-f]+: a9 60 00 00 l\.ori r11,r0,0x0 -+ -+Disassembly of section \.text: -+ -+[0-9a-f]+ <_start>: -+ +[0-9a-f]+: 9c 21 ff fc l\.addi r1,r1,-4 -+ +[0-9a-f]+: d4 01 48 00 l\.sw 0\(r1\),r9 -+ +[0-9a-f]+: 04 00 00 02 l\.jal [0-9a-f]+ <_start\+0x10> -+ +[0-9a-f]+: 1a 60 00 00 l\.movhi r19,0x0 -+ +[0-9a-f]+: aa 73 [0-9a-f]+ [0-9a-f]+ l\.ori r19,r19,0x[0-9a-f]+ -+ +[0-9a-f]+: e2 73 48 00 l\.add r19,r19,r9 -+ +[0-9a-f]+: 1a 20 00 00 l\.movhi r17,0x0 -+ +[0-9a-f]+: e2 31 98 00 l\.add r17,r17,r19 -+ +[0-9a-f]+: 86 31 00 10 l\.lwz r17,16\(r17\) -+ +[0-9a-f]+: 84 71 00 00 l\.lwz r3,0\(r17\) -+ +[0-9a-f]+: 07 ff ff f2 l\.jal [0-9a-f]+ <\.plt\+0x10> -+ +[0-9a-f]+: 15 00 00 00 l\.nop 0x0 -+ +[0-9a-f]+: 85 21 00 00 l\.lwz r9,0\(r1\) -+ +[0-9a-f]+: 44 00 48 00 l\.jr r9 -+ +[0-9a-f]+: 9c 21 00 04 l\.addi r1,r1,4 -diff --git a/ld/testsuite/ld-or1k/gotha1.s b/ld/testsuite/ld-or1k/gotha1.s -new file mode 100644 -index 00000000000..42b16db425c ---- /dev/null -+++ b/ld/testsuite/ld-or1k/gotha1.s -@@ -0,0 +1,24 @@ -+ .data -+ .p2align 16 -+ -+ .text -+ .globl _start -+_start: -+ l.addi r1, r1, -4 -+ l.sw 0(r1), r9 -+ -+ l.jal 8 -+ l.movhi r19, gotpchi(_GLOBAL_OFFSET_TABLE_-4) -+ l.ori r19, r19, gotpclo(_GLOBAL_OFFSET_TABLE_+0) -+ l.add r19, r19, r9 -+ -+ l.movhi r17, gotha(x) -+ l.add r17, r17, r19 -+ l.lwz r17, got(x)(r17) -+ l.lwz r3, 0(r17) -+ -+ l.jal plt(func) -+ l.nop -+ l.lwz r9, 0(r1) -+ l.jr r9 -+ l.addi r1, r1, 4 -diff --git a/ld/testsuite/ld-or1k/gotha2.dd b/ld/testsuite/ld-or1k/gotha2.dd -new file mode 100644 -index 00000000000..fe09da5466b ---- /dev/null -+++ b/ld/testsuite/ld-or1k/gotha2.dd -@@ -0,0 +1,21 @@ -+ -+.*\.x: file format elf32-or1k -+ -+ -+Disassembly of section \.text: -+ -+[0-9a-f]+ : -+ +[0-9a-f]+: 9c 21 ff f8 l\.addi r1,r1,-8 -+ +[0-9a-f]+: d4 01 80 00 l\.sw 0\(r1\),r16 -+ +[0-9a-f]+: d4 01 48 04 l\.sw 4\(r1\),r9 -+ +[0-9a-f]+: 04 00 [0-9a-f]+ [0-9a-f]+ l\.jal [0-9a-f]+ -+ +[0-9a-f]+: 1a 00 00 00 l\.movhi r16,0x0 -+ +[0-9a-f]+: aa 10 [0-9a-f]+ [0-9a-f]+ l\.ori r16,r16,0x[0-9a-f]+ -+ +[0-9a-f]+: e2 10 48 00 l\.add r16,r16,r9 -+ +[0-9a-f]+: 1a 20 00 00 l\.movhi r17,0x0 -+ +[0-9a-f]+: e2 31 80 00 l\.add r17,r17,r16 -+ +[0-9a-f]+: 86 31 00 0c l\.lwz r17,12\(r17\) -+ +[0-9a-f]+: 85 21 00 04 l\.lwz r9,4\(r1\) -+ +[0-9a-f]+: 86 01 00 00 l\.lwz r16,0\(r1\) -+ +[0-9a-f]+: 44 00 48 00 l\.jr r9 -+ +[0-9a-f]+: 9c 21 00 08 l\.addi r1,r1,8 -diff --git a/ld/testsuite/ld-or1k/gotha2.s b/ld/testsuite/ld-or1k/gotha2.s -new file mode 100644 -index 00000000000..164b282f2dd ---- /dev/null -+++ b/ld/testsuite/ld-or1k/gotha2.s -@@ -0,0 +1,22 @@ -+ .section .text -+ .align 4 -+ .global test -+ .type test, @function -+test: -+ l.addi r1, r1, -8 -+ l.sw 0(r1), r16 -+ l.sw 4(r1), r9 -+ -+ l.jal 8 -+ l.movhi r16, gotpchi(_GLOBAL_OFFSET_TABLE_-4) -+ l.ori r16, r16, gotpclo(_GLOBAL_OFFSET_TABLE_+0) -+ l.add r16, r16, r9 -+ -+ l.movhi r17, gotha(i) -+ l.add r17, r17, r16 -+ l.lwz r17, got(i)(r17) -+ -+ l.lwz r9, 4(r1) -+ l.lwz r16, 0(r1) -+ l.jr r9 -+ l.addi r1, r1, 8 -diff --git a/ld/testsuite/ld-or1k/or1k.exp b/ld/testsuite/ld-or1k/or1k.exp -index 7592e8307c1..8e19ec6c31a 100644 ---- a/ld/testsuite/ld-or1k/or1k.exp -+++ b/ld/testsuite/ld-or1k/or1k.exp -@@ -53,6 +53,14 @@ set or1kplttests { - "" {plt1.s} - {{objdump -dr plt1.x.dd}} - "plt1.x"} -+ {"gotha exec plt" "tmpdir/libpltlib.so" "" -+ "" {gotha1.s} -+ {{objdump -dr gotha1.dd}} -+ "gotha1.x"} -+ {"gotha -fpic -shared" "-fpic -shared" "" -+ "" {gotha2.s} -+ {{objdump -dr gotha2.dd}} -+ "gotha2.x"} - } - - # Not implemented yet -diff --git a/ld/testsuite/ld-or1k/pltlib.s b/ld/testsuite/ld-or1k/pltlib.s -index baf76ca1af7..8b4d7ba48fd 100644 ---- a/ld/testsuite/ld-or1k/pltlib.s -+++ b/ld/testsuite/ld-or1k/pltlib.s -@@ -1,5 +1,6 @@ - .section .data - .globl x, y -+ .size x, 4 - x: .long 33 - y: .long 44 - --- -2.25.1 - diff --git a/package/binutils/2.35.2/0007-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch b/package/binutils/2.35.2/0007-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch deleted file mode 100644 index c3978e22fa8..00000000000 --- a/package/binutils/2.35.2/0007-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch +++ /dev/null @@ -1,50 +0,0 @@ -From c3003947e4bad18faea4337fd2073feeb30ee078 Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Wed, 9 Jun 2021 17:28:27 +0200 -Subject: [PATCH] bfd/elf32-or1k: fix building with gcc version < 5 - -Gcc version >= 5 has standard C mode not set to -std=gnu11, so if we use -an old compiler(i.e. gcc 4.9) build fails on: -``` -elf32-or1k.c:2251:3: error: 'for' loop initial declarations are only allowed in -C99 or C11 mode - for (size_t i = 0; i < insn_count; i++) - ^ -``` - -So let's declare `size_t i` at the top of the function instead of inside -for loop. - -Signed-off-by: Giulio Benetti ---- - bfd/elf32-or1k.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c -index 4ae7f324d33..32063ab0289 100644 ---- a/bfd/elf32-or1k.c -+++ b/bfd/elf32-or1k.c -@@ -2244,9 +2244,10 @@ or1k_write_plt_entry (bfd *output_bfd, bfd_byte *contents, unsigned insnj, - { - unsigned nodelay = elf_elfheader (output_bfd)->e_flags & EF_OR1K_NODELAY; - unsigned output_insns[PLT_MAX_INSN_COUNT]; -+ size_t i; - - /* Copy instructions into the output buffer. */ -- for (size_t i = 0; i < insn_count; i++) -+ for (i = 0; i < insn_count; i++) - output_insns[i] = insns[i]; - - /* Honor the no-delay-slot setting. */ -@@ -2277,7 +2278,7 @@ or1k_write_plt_entry (bfd *output_bfd, bfd_byte *contents, unsigned insnj, - } - - /* Write out the output buffer. */ -- for (size_t i = 0; i < (insn_count+1); i++) -+ for (i = 0; i < (insn_count+1); i++) - bfd_put_32 (output_bfd, output_insns[i], contents + (i*4)); - } - --- -2.25.1 - diff --git a/package/binutils/2.35.2/0008-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch b/package/binutils/2.35.2/0008-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch deleted file mode 100644 index 585b97b2af1..00000000000 --- a/package/binutils/2.35.2/0008-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 9af93e143a7fbdb75aa1ed37277f9250eb111628 Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Sat, 10 Jul 2021 17:57:34 +0200 -Subject: [PATCH] or1k: fix pc-relative relocation against dynamic on PC - relative 26 bit relocation - -When building openal we were seeing the assert failure: - -/home/buildroot/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: CMakeFiles/OpenAL.dir/al/source.cpp.o: -pc-relative relocation against dynamic symbol alSourcePausev -/home/buildroot/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: CMakeFiles/OpenAL.dir/al/source.cpp.o: -pc-relative relocation against dynamic symbol alSourceStopv -/home/buildroot/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: CMakeFiles/OpenAL.dir/al/source.cpp.o: -pc-relative relocation against dynamic symbol alSourceRewindv -/home/buildroot/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: CMakeFiles/OpenAL.dir/al/source.cpp.o: -pc-relative relocation against dynamic symbol alSourcePlayv -collect2: error: ld returned 1 exit status - -This happens because in R_OR1K_INSN_REL_26 case we can't reference local -symbol as previously done but we need to make sure that calls to actual -symbol always call the version of current object. - -bfd/Changelog: - - * elf32-or1k.c (or1k_elf_relocate_section): use a separate entry - in switch case R_OR1K_INSN_REL_26 where we need to check for - !SYMBOL_CALLS_LOCAL() instead of !SYMBOL_REFERENCES_LOCAL(). - -Signed-off-by: Giulio Benetti ---- - bfd/elf32-or1k.c | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c -index 4ae7f324d33..4f9092539f5 100644 ---- a/bfd/elf32-or1k.c -+++ b/bfd/elf32-or1k.c -@@ -1543,6 +1543,18 @@ or1k_elf_relocate_section (bfd *output_bfd, - break; - - case R_OR1K_INSN_REL_26: -+ /* For a non-shared link, these will reference plt or call the -+ version of actual object. */ -+ if (bfd_link_pic (info) && !SYMBOL_CALLS_LOCAL (info, h)) -+ { -+ _bfd_error_handler -+ (_("%pB: pc-relative relocation against dynamic symbol %s"), -+ input_bfd, name); -+ ret_val = FALSE; -+ bfd_set_error (bfd_error_bad_value); -+ } -+ break; -+ - case R_OR1K_PCREL_PG21: - case R_OR1K_LO13: - case R_OR1K_SLO13: --- -2.25.1 - diff --git a/package/binutils/2.35.2/0009-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch b/package/binutils/2.35.2/0009-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch deleted file mode 100644 index e96d49122a3..00000000000 --- a/package/binutils/2.35.2/0009-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch +++ /dev/null @@ -1,75 +0,0 @@ -From fbab8933bca6b7dba2aa19190a71f799a370c3d4 Mon Sep 17 00:00:00 2001 -From: Stafford Horne -Date: Sun, 2 Jan 2022 09:03:28 +0900 -Subject: [PATCH] or1k: Avoid R_OR1K_GOT16 signed overflow by using special - howto - -Previously when fixing PR 21464 we masked out upper bits of the -relocation value in order to avoid overflow complaints when acceptable. -It turns out this does not work when the relocation value ends up being -signed. - -To fix this this patch introduces a special howto with -complain_on_overflow set to complain_overflow_dont. This is used in -place of the normal R_OR1K_GOT16 howto when we detect R_OR1K_GOT_AHI16 -relocations. - -bfd/ChangeLog: - - PR 28735 - * elf32-or1k.c (or1k_elf_got16_no_overflow_howto): Define. - (or1k_elf_relocate_section): Use new howto instead of trying to - mask out relocation bits. - -Signed-off-by: Giulio Benetti ---- - bfd/elf32-or1k.c | 24 ++++++++++++++++++++---- - 1 file changed, 20 insertions(+), 4 deletions(-) - -diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c -index 2ff998066a8..3df31172fcb 100644 ---- a/bfd/elf32-or1k.c -+++ b/bfd/elf32-or1k.c -@@ -828,6 +828,23 @@ static reloc_howto_type or1k_elf_howto_table[] = - FALSE), /* pcrel_offset */ - }; - -+/* A copy of the R_OR1K_GOT16 used in the presense of R_OR1K_GOT_AHI16 -+ relocations when we know we can ignore overflows. */ -+static reloc_howto_type or1k_elf_got16_no_overflow_howto = -+ HOWTO (R_OR1K_GOT16, /* type */ -+ 0, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_dont, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_OR1K_GOT16", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE); /* pcrel_offset */ -+ - /* Map BFD reloc types to Or1k ELF reloc types. */ - - struct or1k_reloc_map -@@ -1508,12 +1525,11 @@ or1k_elf_relocate_section (bfd *output_bfd, - if (r_type == R_OR1K_GOT_AHI16) - saw_gotha = TRUE; - -- /* If we have a R_OR1K_GOT16 followed by a R_OR1K_GOT_AHI16 -+ /* If we have a R_OR1K_GOT16 following a R_OR1K_GOT_AHI16 - relocation we assume the code is doing the right thing to avoid -- overflows. Here we mask the lower 16-bit of the relocation to -- avoid overflow validation failures. */ -+ overflows. */ - if (r_type == R_OR1K_GOT16 && saw_gotha) -- relocation &= 0xffff; -+ howto = &or1k_elf_got16_no_overflow_howto; - - /* Addend should be zero. */ - if (rel->r_addend != 0) --- -2.25.1 - diff --git a/package/binutils/2.35.2/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch b/package/binutils/2.35.2/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch deleted file mode 100644 index e95eb1e7c52..00000000000 --- a/package/binutils/2.35.2/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 30a954525f4e53a9cd50a1a8a6f201c7cf6595c7 Mon Sep 17 00:00:00 2001 -From: "H.J. Lu" -Date: Mon, 7 Feb 2022 15:22:19 -0800 -Subject: [PATCH] i386: Allow GOT32 relocations against ABS symbols - -GOT32 relocations are allowed since absolute value + addend is stored in -the GOT slot. - -Tested on glibc 2.35 build with GCC 11.2 and -Os. - -bfd/ - - PR ld/28870 - * elfxx-x86.c (_bfd_elf_x86_valid_reloc_p): Also allow GOT32 - relocations. - -Signed-off-by: Waldemar Brodkorb - -diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c -index 7ac2411fc80..d00dc45677b 100644 ---- a/bfd/elfxx-x86.c -+++ b/bfd/elfxx-x86.c -@@ -1942,9 +1942,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section, - irel = *rel; - - /* Only allow relocations against absolute symbol, which can be -- resolved as absolute value + addend. GOTPCREL relocations -- are allowed since absolute value + addend is stored in the -- GOT slot. */ -+ resolved as absolute value + addend. GOTPCREL and GOT32 -+ relocations are allowed since absolute value + addend is -+ stored in the GOT slot. */ - if (bed->target_id == X86_64_ELF_DATA) - { - r_type &= ~R_X86_64_converted_reloc_bit; -@@ -1965,7 +1965,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section, - else - valid_p = (r_type == R_386_32 - || r_type == R_386_16 -- || r_type == R_386_8); -+ || r_type == R_386_8 -+ || r_type == R_386_GOT32 -+ || r_type == R_386_GOT32X); - - if (valid_p) - *no_dynreloc_p = true; diff --git a/package/binutils/2.36.1/0001-sh-conf.patch b/package/binutils/2.36.1/0001-sh-conf.patch deleted file mode 100644 index 0070e582fa5..00000000000 --- a/package/binutils/2.36.1/0001-sh-conf.patch +++ /dev/null @@ -1,48 +0,0 @@ -From f88f4c77266b9669b285ab64386cf39e183661bb 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). - -[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 68779feb42b..8b4333b2c15 100755 ---- a/configure -+++ b/configure -@@ -3887,7 +3887,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 d16a2757689..035854759ed 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1177,7 +1177,7 @@ case "${target}" in - nvptx*-*-*) - noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" - ;; -- sh-*-*) -+ sh*-*-*) - case "${target}" in - sh*-*-elf) - ;; --- -2.29.2 - diff --git a/package/binutils/2.36.1/0002-poison-system-directories.patch b/package/binutils/2.36.1/0002-poison-system-directories.patch deleted file mode 100644 index 071b67ac7de..00000000000 --- a/package/binutils/2.36.1/0002-poison-system-directories.patch +++ /dev/null @@ -1,306 +0,0 @@ -From a9652a60af6254d07066f08377415f05e3a9462e 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. - -[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] - -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 7b60d778587..37b8e9b6f6c 100644 ---- a/ld/config.in -+++ b/ld/config.in -@@ -40,6 +40,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 a8d248eab58..f52e1f3c18f 100755 ---- a/ld/configure -+++ b/ld/configure -@@ -828,6 +828,7 @@ with_lib_path - enable_targets - enable_64_bit_bfd - with_sysroot -+enable_poison_system_directories - enable_gold - enable_got - enable_compressed_debug_sections -@@ -1496,6 +1497,8 @@ Optional Features: - --disable-largefile omit support for large files - --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) -@@ -15841,7 +15844,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 c9c69ab9245..59dab0a6ac4 100644 ---- a/ld/configure.ac -+++ b/ld/configure.ac -@@ -94,6 +94,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 93f5af92c7d..ff7f71a7b66 100644 ---- a/ld/ld.h -+++ b/ld/ld.h -@@ -166,6 +166,14 @@ typedef struct - in the linker script. */ - bfd_boolean force_group_allocation; - -+ /* If TRUE (the default) warn for uses of system directories when -+ cross linking. */ -+ bfd_boolean poison_system_directories; -+ -+ /* If TRUE (default FALSE) give an error for uses of system -+ directories when cross linking instead of a warning. */ -+ bfd_boolean 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 7a602b9c6ab..cccbfbab3bb 100644 ---- a/ld/ld.texi -+++ b/ld/ld.texi -@@ -2810,6 +2810,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. - @end table - - @c man end -diff --git a/ld/ldfile.c b/ld/ldfile.c -index 81cb86d51e2..cd5c2752679 100644 ---- a/ld/ldfile.c -+++ b/ld/ldfile.c -@@ -117,6 +117,23 @@ ldfile_add_library_path (const char *name, bfd_boolean 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 -+ - } - - /* Try to open a BFD for a lang_input_statement. */ -diff --git a/ld/ldlex.h b/ld/ldlex.h -index b0101028321..77f5accb5d9 100644 ---- a/ld/ldlex.h -+++ b/ld/ldlex.h -@@ -161,6 +161,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, - }; - - /* The initial parser states. */ -diff --git a/ld/ldmain.c b/ld/ldmain.c -index 863df0293ea..f06f2546ef5 100644 ---- a/ld/ldmain.c -+++ b/ld/ldmain.c -@@ -323,6 +323,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 f005a58a045..eb383d3755b 100644 ---- a/ld/lexsup.c -+++ b/ld/lexsup.c -@@ -591,6 +591,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) -@@ -603,6 +611,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; -@@ -1633,6 +1642,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), -@@ -1778,6 +1795,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.29.2 - diff --git a/package/binutils/2.36.1/0003-or1k-Fix-issue-with-plt-link-failure-for-local-calls.patch b/package/binutils/2.36.1/0003-or1k-Fix-issue-with-plt-link-failure-for-local-calls.patch deleted file mode 100644 index 85931ff661c..00000000000 --- a/package/binutils/2.36.1/0003-or1k-Fix-issue-with-plt-link-failure-for-local-calls.patch +++ /dev/null @@ -1,59 +0,0 @@ -From b5fdaa85790dff45fd2c3fd15405c16dbc50a074 Mon Sep 17 00:00:00 2001 -From: Stafford Horne -Date: Sun, 2 May 2021 06:02:14 +0900 -Subject: [PATCH] or1k: Fix issue with plt link failure for local calls - -When building protobuf we were seeing the assert failure: - - /home/giuliobenetti/git/upstream/or1k-binutils-2.36.1/host/lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: - BFD (GNU Binutils) 2.36.1 assertion fail elf32-or1k.c:2377 - /home/giuliobenetti/git/upstream/or1k-binutils-2.36.1/host/lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: - BFD (GNU Binutils) 2.36.1 assertion fail elf32-or1k.c:2377 - /home/giuliobenetti/git/upstream/or1k-binutils-2.36.1/host/lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: - BFD (GNU Binutils) 2.36.1 assertion fail elf32-or1k.c:2377 - collect2: error: ld returned 1 exit status - -This failure happens while writing out PLT entries, there is a check -"BFD_ASSERT (h->dynindx != -1)" to confirm all plt entries have dynamic -symbol attributes. This was failing for symbols that were -"forced_local" in previous linking code. - -The fix adds logic to or1k_elf_adjust_dynamic_symbol to identify -"forced_local" symbols and exclude them from the the PLT. - -bfd/ChangeLog: - - PR 27624 - * elf32-or1k.c (or1k_elf_adjust_dynamic_symbol): Change - condition used to cleanup plt entries to cleanup forced local - entries. - -Cc: Giulio Benetti -Signed-off-by: Giulio Benetti ---- - bfd/elf32-or1k.c | 9 ++++----- - 1 file changed, 4 insertions(+), 5 deletions(-) - -diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c -index 65938e51378..4f82cc4c667 100644 ---- a/bfd/elf32-or1k.c -+++ b/bfd/elf32-or1k.c -@@ -2566,11 +2566,10 @@ or1k_elf_adjust_dynamic_symbol (struct bfd_link_info *info, - if (h->type == STT_FUNC - || h->needs_plt) - { -- if (! bfd_link_pic (info) -- && !h->def_dynamic -- && !h->ref_dynamic -- && h->root.type != bfd_link_hash_undefweak -- && h->root.type != bfd_link_hash_undefined) -+ if (h->plt.refcount <= 0 -+ || (SYMBOL_CALLS_LOCAL (info, h) -+ || (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT -+ && h->root.type == bfd_link_hash_undefweak))) - { - /* This case can occur if we saw a PLT reloc in an input - file, but the symbol was never referred to by a dynamic --- -2.25.1 - diff --git a/package/binutils/2.36.1/0004-or1k-Implement-relocation-R_OR1K_GOT_AHI16-for-gotha.patch b/package/binutils/2.36.1/0004-or1k-Implement-relocation-R_OR1K_GOT_AHI16-for-gotha.patch deleted file mode 100644 index 08c23d2760b..00000000000 --- a/package/binutils/2.36.1/0004-or1k-Implement-relocation-R_OR1K_GOT_AHI16-for-gotha.patch +++ /dev/null @@ -1,256 +0,0 @@ -From 141dee7402871c7b3994838c3eddf64a92d67be7 Mon Sep 17 00:00:00 2001 -From: Stafford Horne -Date: Sun, 2 May 2021 06:02:15 +0900 -Subject: [PATCH] or1k: Implement relocation R_OR1K_GOT_AHI16 for gotha() - -The gotha() relocation mnemonic will be outputted by OpenRISC GCC when -using the -mcmodel=large option. This relocation is used along with -got() to generate 32-bit GOT offsets. This increases the previous GOT -offset limit from the previous 16-bit (64K) limit. - -This is needed on large binaries where the GOT grows larger than 64k. - -bfd/ChangeLog: - - PR 21464 - * bfd-in2.h: Add BFD_RELOC_OR1K_GOT_AHI16 relocation. - * elf32-or1k.c (or1k_elf_howto_table, or1k_reloc_map): Likewise. - (or1k_final_link_relocate, or1k_elf_relocate_section, - or1k_elf_check_relocs): Likewise. - * libbfd.h (bfd_reloc_code_real_names): Likewise. - * reloc.c: Likewise. - -cpu/ChangeLog: - - PR 21464 - * or1k.opc (or1k_imm16_relocs, parse_reloc): Define parse logic - for gotha() relocation. - -include/ChangeLog: - - PR 21464 - * elf/or1k.h (elf_or1k_reloc_type): Define R_OR1K_GOT_AHI16 number. - -opcodes/ChangeLog: - - PR 21464 - * or1k-asm.c: Regenerate. - -gas/ChangeLog: - - PR 21464 - * testsuite/gas/or1k/reloc-1.s: Add test for new relocation. - * testsuite/gas/or1k/reloc-1.d: Add test result for new - relocation. - -Cc: Giulio Benetti - -fixup reloc, add tests - -Signed-off-by: Giulio Benetti ---- - bfd/bfd-in2.h | 1 + - bfd/elf32-or1k.c | 21 ++++++++++++++++++++- - bfd/libbfd.h | 1 + - bfd/reloc.c | 2 ++ - cpu/or1k.opc | 7 ++++++- - gas/testsuite/gas/or1k/reloc-1.d | 4 +++- - gas/testsuite/gas/or1k/reloc-1.s | 4 ++++ - include/elf/or1k.h | 1 + - opcodes/or1k-asm.c | 7 ++++++- - 9 files changed, 44 insertions(+), 4 deletions(-) - -diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h -index 7eff85b7eaa..e76b9e7a319 100644 ---- a/bfd/bfd-in2.h -+++ b/bfd/bfd-in2.h -@@ -5048,6 +5048,7 @@ then it may be truncated to 8 bits. */ - BFD_RELOC_OR1K_TLS_TPOFF, - BFD_RELOC_OR1K_TLS_DTPOFF, - BFD_RELOC_OR1K_TLS_DTPMOD, -+ BFD_RELOC_OR1K_GOT_AHI16, - - /* H8 elf Relocations. */ - BFD_RELOC_H8_DIR16A8, -diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c -index 4f82cc4c667..48461854a96 100644 ---- a/bfd/elf32-or1k.c -+++ b/bfd/elf32-or1k.c -@@ -808,6 +808,20 @@ static reloc_howto_type or1k_elf_howto_table[] = - 0, /* Source Mask. */ - 0x03ffffff, /* Dest Mask. */ - TRUE), /* PC relative offset? */ -+ -+ HOWTO (R_OR1K_GOT_AHI16, /* type */ -+ 16, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_signed, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_OR1K_GOT_AHI16", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ - }; - - /* Map BFD reloc types to Or1k ELF reloc types. */ -@@ -871,6 +885,7 @@ static const struct or1k_reloc_map or1k_reloc_map[] = - { BFD_RELOC_OR1K_TLS_IE_LO13, R_OR1K_TLS_IE_LO13 }, - { BFD_RELOC_OR1K_SLO13, R_OR1K_SLO13 }, - { BFD_RELOC_OR1K_PLTA26, R_OR1K_PLTA26 }, -+ { BFD_RELOC_OR1K_GOT_AHI16, R_OR1K_GOT_AHI16 }, - }; - - /* tls_type is a mask used to track how each symbol is accessed, -@@ -1111,6 +1126,7 @@ or1k_final_link_relocate (reloc_howto_type *howto, bfd *input_bfd, - switch (howto->type) - { - case R_OR1K_AHI16: -+ case R_OR1K_GOT_AHI16: - case R_OR1K_GOTOFF_AHI16: - case R_OR1K_TLS_IE_AHI16: - case R_OR1K_TLS_LE_AHI16: -@@ -1373,6 +1389,7 @@ or1k_elf_relocate_section (bfd *output_bfd, - } - break; - -+ case R_OR1K_GOT_AHI16: - case R_OR1K_GOT16: - case R_OR1K_GOT_PG21: - case R_OR1K_GOT_LO13: -@@ -1464,7 +1481,8 @@ or1k_elf_relocate_section (bfd *output_bfd, - /* The GOT_PG21 and GOT_LO13 relocs are pc-relative, - while the GOT16 reloc is GOT relative. */ - relocation = got_base + off; -- if (r_type == R_OR1K_GOT16) -+ if (r_type == R_OR1K_GOT16 -+ || r_type == R_OR1K_GOT_AHI16) - relocation -= got_sym_value; - - /* Addend should be zero. */ -@@ -1990,6 +2008,7 @@ or1k_elf_check_relocs (bfd *abfd, - } - break; - -+ case R_OR1K_GOT_AHI16: - case R_OR1K_GOT16: - case R_OR1K_GOT_PG21: - case R_OR1K_GOT_LO13: -diff --git a/bfd/libbfd.h b/bfd/libbfd.h -index 7271a2ad5a1..e0ee2dafc07 100644 ---- a/bfd/libbfd.h -+++ b/bfd/libbfd.h -@@ -2757,6 +2757,7 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@", - "BFD_RELOC_OR1K_TLS_TPOFF", - "BFD_RELOC_OR1K_TLS_DTPOFF", - "BFD_RELOC_OR1K_TLS_DTPMOD", -+ "BFD_RELOC_OR1K_GOT_AHI16", - "BFD_RELOC_H8_DIR16A8", - "BFD_RELOC_H8_DIR16R8", - "BFD_RELOC_H8_DIR24A8", -diff --git a/bfd/reloc.c b/bfd/reloc.c -index 4f4b95a0b7f..fe94e0d8f91 100644 ---- a/bfd/reloc.c -+++ b/bfd/reloc.c -@@ -6204,6 +6204,8 @@ ENUMX - BFD_RELOC_OR1K_GOTPC_HI16 - ENUMX - BFD_RELOC_OR1K_GOTPC_LO16 -+ENUMX -+ BFD_RELOC_OR1K_GOT_AHI16 - ENUMX - BFD_RELOC_OR1K_GOT16 - ENUMX -diff --git a/cpu/or1k.opc b/cpu/or1k.opc -index f0adcbb00a5..5d20a1f33a7 100644 ---- a/cpu/or1k.opc -+++ b/cpu/or1k.opc -@@ -193,7 +193,7 @@ static const bfd_reloc_code_real_type or1k_imm16_relocs[][6] = { - BFD_RELOC_OR1K_GOT_LO13, - BFD_RELOC_UNUSED, - BFD_RELOC_UNUSED, -- BFD_RELOC_UNUSED }, -+ BFD_RELOC_OR1K_GOT_AHI16 }, - { BFD_RELOC_OR1K_GOTPC_LO16, - BFD_RELOC_UNUSED, - BFD_RELOC_UNUSED, -@@ -296,6 +296,11 @@ parse_reloc (const char **strp) - str += 5; - cls = RCLASS_TPOFF; - } -+ else if (strncasecmp (str, "got", 3) == 0) -+ { -+ str += 3; -+ cls = RCLASS_GOT; -+ } - - if (strncasecmp (str, "hi(", 3) == 0) - { -diff --git a/gas/testsuite/gas/or1k/reloc-1.d b/gas/testsuite/gas/or1k/reloc-1.d -index d1bcf5608bb..3a001c4ed99 100644 ---- a/gas/testsuite/gas/or1k/reloc-1.d -+++ b/gas/testsuite/gas/or1k/reloc-1.d -@@ -68,5 +68,7 @@ OFFSET TYPE VALUE - 000000ec R_OR1K_LO13 x - 000000f0 R_OR1K_GOT_LO13 x - 000000f4 R_OR1K_SLO13 x -- -+000000f8 R_OR1K_GOT_AHI16 x -+000000fc R_OR1K_GOT_AHI16 x -+00000100 R_OR1K_GOT_AHI16 x - -diff --git a/gas/testsuite/gas/or1k/reloc-1.s b/gas/testsuite/gas/or1k/reloc-1.s -index e76abef6532..562609aa869 100644 ---- a/gas/testsuite/gas/or1k/reloc-1.s -+++ b/gas/testsuite/gas/or1k/reloc-1.s -@@ -74,3 +74,7 @@ - l.lbz r5,po(x)(r3) - l.lbz r5,gotpo(x)(r3) - l.sb po(x)(r3),r6 -+ -+ l.movhi r4,gotha(x) -+ l.ori r3,r4,gotha(x) -+ l.addi r3,r4,gotha(x) -diff --git a/include/elf/or1k.h b/include/elf/or1k.h -index 7f281481061..69ab90584a2 100644 ---- a/include/elf/or1k.h -+++ b/include/elf/or1k.h -@@ -77,6 +77,7 @@ START_RELOC_NUMBERS (elf_or1k_reloc_type) - RELOC_NUMBER (R_OR1K_TLS_IE_LO13, 51) - RELOC_NUMBER (R_OR1K_SLO13, 52) - RELOC_NUMBER (R_OR1K_PLTA26, 53) -+ RELOC_NUMBER (R_OR1K_GOT_AHI16, 54) - END_RELOC_NUMBERS (R_OR1K_max) - - #define EF_OR1K_NODELAY (1UL << 0) -diff --git a/opcodes/or1k-asm.c b/opcodes/or1k-asm.c -index 045ab6230b6..fdccf67f9e1 100644 ---- a/opcodes/or1k-asm.c -+++ b/opcodes/or1k-asm.c -@@ -177,7 +177,7 @@ static const bfd_reloc_code_real_type or1k_imm16_relocs[][6] = { - BFD_RELOC_OR1K_GOT_LO13, - BFD_RELOC_UNUSED, - BFD_RELOC_UNUSED, -- BFD_RELOC_UNUSED }, -+ BFD_RELOC_OR1K_GOT_AHI16 }, - { BFD_RELOC_OR1K_GOTPC_LO16, - BFD_RELOC_UNUSED, - BFD_RELOC_UNUSED, -@@ -280,6 +280,11 @@ parse_reloc (const char **strp) - str += 5; - cls = RCLASS_TPOFF; - } -+ else if (strncasecmp (str, "got", 3) == 0) -+ { -+ str += 3; -+ cls = RCLASS_GOT; -+ } - - if (strncasecmp (str, "hi(", 3) == 0) - { --- -2.25.1 - diff --git a/package/binutils/2.36.1/0005-or1k-Avoid-R_OR1K_GOT16-overflow-failures-in-presenc.patch b/package/binutils/2.36.1/0005-or1k-Avoid-R_OR1K_GOT16-overflow-failures-in-presenc.patch deleted file mode 100644 index 618072fb10d..00000000000 --- a/package/binutils/2.36.1/0005-or1k-Avoid-R_OR1K_GOT16-overflow-failures-in-presenc.patch +++ /dev/null @@ -1,61 +0,0 @@ -From de914df5f2ba23a9f6f1fbf6efdc22e1b045901c Mon Sep 17 00:00:00 2001 -From: Stafford Horne -Date: Sun, 2 May 2021 06:02:16 +0900 -Subject: [PATCH] or1k: Avoid R_OR1K_GOT16 overflow failures in presence of - R_OR1K_GOT_AHI16 - -Now that we support R_OR1K_GOT_AHI16 we can relax the R_OR1K_GOT16 -overflow validation check if the section has R_OR1K_GOT_AHI16. - -We cannot simple disable R_OR1K_GOT16 overflow validation as there will -still be binaries that will have only R_OR1K_GOT16. The -R_OR1K_GOT_AHI16 relocation will only be added by GCC when building with -the option -mcmodel=large. - -This assumes that R_OR1K_GOT_AHI16 will come before R_OR1K_GOT16, which -is the code pattern that will be emitted by GCC. - -bfd/ChangeLog: - - PR 21464 - * elf32-or1k.c (or1k_elf_relocate_section): Relax R_OR1K_GOT16 - overflow check if we have R_OR1K_GOT_AHI16 followed by - R_OR1K_GOT16. - -Signed-off-by: Giulio Benetti ---- - bfd/elf32-or1k.c | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c -index 48461854a96..44e67f2b84b 100644 ---- a/bfd/elf32-or1k.c -+++ b/bfd/elf32-or1k.c -@@ -1278,6 +1278,7 @@ or1k_elf_relocate_section (bfd *output_bfd, - asection *sgot, *splt; - bfd_vma plt_base, got_base, got_sym_value; - bfd_boolean ret_val = TRUE; -+ bfd_boolean saw_gotha = FALSE; - - if (htab == NULL) - return FALSE; -@@ -1485,6 +1486,16 @@ or1k_elf_relocate_section (bfd *output_bfd, - || r_type == R_OR1K_GOT_AHI16) - relocation -= got_sym_value; - -+ if (r_type == R_OR1K_GOT_AHI16) -+ saw_gotha = TRUE; -+ -+ /* If we have a R_OR1K_GOT16 followed by a R_OR1K_GOT_AHI16 -+ relocation we assume the code is doing the right thing to avoid -+ overflows. Here we mask the lower 16-bit of the relocation to -+ avoid overflow validation failures. */ -+ if (r_type == R_OR1K_GOT16 && saw_gotha) -+ relocation &= 0xffff; -+ - /* Addend should be zero. */ - if (rel->r_addend != 0) - { --- -2.25.1 - diff --git a/package/binutils/2.36.1/0006-or1k-Support-large-plt_relocs-when-generating-plt-en.patch b/package/binutils/2.36.1/0006-or1k-Support-large-plt_relocs-when-generating-plt-en.patch deleted file mode 100644 index 6d50852fe94..00000000000 --- a/package/binutils/2.36.1/0006-or1k-Support-large-plt_relocs-when-generating-plt-en.patch +++ /dev/null @@ -1,500 +0,0 @@ -From 4a7b357d0c802685bee7706bafb9702c821286e1 Mon Sep 17 00:00:00 2001 -From: Stafford Horne -Date: Sun, 2 May 2021 06:02:17 +0900 -Subject: [PATCH] or1k: Support large plt_relocs when generating plt - entries - -The current PLT generation code will generate invalid code when the PLT -relocation offset exceeds 64k. This fixes the issue by detecting large -plt_reloc offsets and generare code sequences to create larger plt -relocations. - -The "large" plt code needs 2 extra instructions to create 32-bit offsets. - -bfd/ChangeLog: - - PR 27746 - * elf32-or1k.c (PLT_ENTRY_SIZE_LARGE, PLT_MAX_INSN_COUNT, - OR1K_ADD, OR1K_ORI): New macros to help with plt creation. - (elf_or1k_link_hash_table): New field plt_count. - (elf_or1k_link_hash_entry): New field plt_index. - (elf_or1k_plt_entry_size): New function. - (or1k_write_plt_entry): Update to support variable size PLTs. - (or1k_elf_finish_dynamic_sections): Use new or1k_write_plt_entry - API. - (or1k_elf_finish_dynamic_symbol): Update to write large PLTs - when needed. - (allocate_dynrelocs): Use elf_or1k_plt_entry_size to account for - PLT size. - -ld/ChangeLog: - - PR 27746 - testsuite/ld-or1k/or1k.exp (or1kplttests): Add tests for linking - along with gotha() relocations. - testsuite/ld-or1k/gotha1.dd: New file. - testsuite/ld-or1k/gotha1.s: New file. - testsuite/ld-or1k/gotha2.dd: New file. - testsuite/ld-or1k/gotha2.s: New file - testsuite/ld-or1k/pltlib.s (x): Define size to avoid link - failure. - -Signed-off-by: Giulio Benetti ---- - bfd/elf32-or1k.c | 149 ++++++++++++++++++++++++--------- - ld/testsuite/ld-or1k/gotha1.dd | 34 ++++++++ - ld/testsuite/ld-or1k/gotha1.s | 24 ++++++ - ld/testsuite/ld-or1k/gotha2.dd | 21 +++++ - ld/testsuite/ld-or1k/gotha2.s | 22 +++++ - ld/testsuite/ld-or1k/or1k.exp | 8 ++ - ld/testsuite/ld-or1k/pltlib.s | 1 + - 7 files changed, 220 insertions(+), 39 deletions(-) - create mode 100644 ld/testsuite/ld-or1k/gotha1.dd - create mode 100644 ld/testsuite/ld-or1k/gotha1.s - create mode 100644 ld/testsuite/ld-or1k/gotha2.dd - create mode 100644 ld/testsuite/ld-or1k/gotha2.s - -diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c -index 44e67f2b84b..3da68e52425 100644 ---- a/bfd/elf32-or1k.c -+++ b/bfd/elf32-or1k.c -@@ -30,10 +30,14 @@ - #define N_ONES(X) (((bfd_vma)2 << (X)) - 1) - - #define PLT_ENTRY_SIZE 16 -+#define PLT_ENTRY_SIZE_LARGE (6*4) -+#define PLT_MAX_INSN_COUNT 6 - - #define OR1K_MOVHI(D) (0x18000000 | (D << 21)) - #define OR1K_ADRP(D) (0x08000000 | (D << 21)) - #define OR1K_LWZ(D,A) (0x84000000 | (D << 21) | (A << 16)) -+#define OR1K_ADD(D,A,B) (0xE0000000 | (D << 21) | (A << 16) | (B << 11)) -+#define OR1K_ORI(D,A) (0xA8000000 | (D << 21) | (A << 16)) - #define OR1K_ORI0(D) (0xA8000000 | (D << 21)) - #define OR1K_JR(B) (0x44000000 | (B << 11)) - #define OR1K_NOP 0x15000000 -@@ -907,6 +911,8 @@ struct elf_or1k_link_hash_entry - { - struct elf_link_hash_entry root; - -+ /* For calculating PLT size. */ -+ bfd_vma plt_index; - /* Track type of TLS access. */ - unsigned char tls_type; - }; -@@ -931,9 +937,20 @@ struct elf_or1k_link_hash_table - { - struct elf_link_hash_table root; - -+ bfd_vma plt_count; - bfd_boolean saw_plta; - }; - -+static size_t -+elf_or1k_plt_entry_size (bfd_vma plt_index) -+{ -+ bfd_vma plt_reloc; -+ -+ plt_reloc = plt_index * sizeof (Elf32_External_Rela); -+ -+ return (plt_reloc > 0xffff) ? PLT_ENTRY_SIZE_LARGE : PLT_ENTRY_SIZE; -+} -+ - /* Get the ELF linker hash table from a link_info structure. */ - #define or1k_elf_hash_table(p) \ - ((is_elf_hash_table ((p)->hash) \ -@@ -2222,33 +2239,46 @@ or1k_elf_check_relocs (bfd *abfd, - } - - static void --or1k_write_plt_entry (bfd *output_bfd, bfd_byte *contents, unsigned insn1, -- unsigned insn2, unsigned insn3, unsigned insnj) -+or1k_write_plt_entry (bfd *output_bfd, bfd_byte *contents, unsigned insnj, -+ unsigned insns[], size_t insn_count) - { - unsigned nodelay = elf_elfheader (output_bfd)->e_flags & EF_OR1K_NODELAY; -- unsigned insn4; -+ unsigned output_insns[PLT_MAX_INSN_COUNT]; -+ -+ /* Copy instructions into the output buffer. */ -+ for (size_t i = 0; i < insn_count; i++) -+ output_insns[i] = insns[i]; - - /* Honor the no-delay-slot setting. */ -- if (insn3 == OR1K_NOP) -+ if (insns[insn_count-1] == OR1K_NOP) - { -- insn4 = insn3; -+ unsigned slot1, slot2; -+ - if (nodelay) -- insn3 = insnj; -+ slot1 = insns[insn_count-2], slot2 = insnj; - else -- insn3 = insn2, insn2 = insnj; -+ slot1 = insnj, slot2 = insns[insn_count-2]; -+ -+ output_insns[insn_count-2] = slot1; -+ output_insns[insn_count-1] = slot2; -+ output_insns[insn_count] = OR1K_NOP; - } - else - { -+ unsigned slot1, slot2; -+ - if (nodelay) -- insn4 = insnj; -+ slot1 = insns[insn_count-1], slot2 = insnj; - else -- insn4 = insn3, insn3 = insnj; -+ slot1 = insnj, slot2 = insns[insn_count-1]; -+ -+ output_insns[insn_count-1] = slot1; -+ output_insns[insn_count] = slot2; - } - -- bfd_put_32 (output_bfd, insn1, contents); -- bfd_put_32 (output_bfd, insn2, contents + 4); -- bfd_put_32 (output_bfd, insn3, contents + 8); -- bfd_put_32 (output_bfd, insn4, contents + 12); -+ /* Write out the output buffer. */ -+ for (size_t i = 0; i < (insn_count+1); i++) -+ bfd_put_32 (output_bfd, output_insns[i], contents + (i*4)); - } - - /* Finish up the dynamic sections. */ -@@ -2315,7 +2345,8 @@ or1k_elf_finish_dynamic_sections (bfd *output_bfd, - splt = htab->root.splt; - if (splt && splt->size > 0) - { -- unsigned plt0, plt1, plt2; -+ unsigned plt[PLT_MAX_INSN_COUNT]; -+ size_t plt_insn_count = 3; - bfd_vma got_addr = sgot->output_section->vma + sgot->output_offset; - - /* Note we force 16 byte alignment on the .got, so that -@@ -2326,27 +2357,27 @@ or1k_elf_finish_dynamic_sections (bfd *output_bfd, - bfd_vma pc = splt->output_section->vma + splt->output_offset; - unsigned pa = ((got_addr >> 13) - (pc >> 13)) & 0x1fffff; - unsigned po = got_addr & 0x1fff; -- plt0 = OR1K_ADRP(12) | pa; -- plt1 = OR1K_LWZ(15,12) | (po + 8); -- plt2 = OR1K_LWZ(12,12) | (po + 4); -+ plt[0] = OR1K_ADRP(12) | pa; -+ plt[1] = OR1K_LWZ(15,12) | (po + 8); -+ plt[2] = OR1K_LWZ(12,12) | (po + 4); - } - else if (bfd_link_pic (info)) - { -- plt0 = OR1K_LWZ(15, 16) | 8; /* .got+8 */ -- plt1 = OR1K_LWZ(12, 16) | 4; /* .got+4 */ -- plt2 = OR1K_NOP; -+ plt[0] = OR1K_LWZ(15, 16) | 8; /* .got+8 */ -+ plt[1] = OR1K_LWZ(12, 16) | 4; /* .got+4 */ -+ plt[2] = OR1K_NOP; - } - else - { - unsigned ha = ((got_addr + 0x8000) >> 16) & 0xffff; - unsigned lo = got_addr & 0xffff; -- plt0 = OR1K_MOVHI(12) | ha; -- plt1 = OR1K_LWZ(15,12) | (lo + 8); -- plt2 = OR1K_LWZ(12,12) | (lo + 4); -+ plt[0] = OR1K_MOVHI(12) | ha; -+ plt[1] = OR1K_LWZ(15,12) | (lo + 8); -+ plt[2] = OR1K_LWZ(12,12) | (lo + 4); - } - -- or1k_write_plt_entry (output_bfd, splt->contents, -- plt0, plt1, plt2, OR1K_JR(15)); -+ or1k_write_plt_entry (output_bfd, splt->contents, OR1K_JR(15), -+ plt, plt_insn_count); - - elf_section_data (splt->output_section)->this_hdr.sh_entsize = 4; - } -@@ -2389,7 +2420,8 @@ or1k_elf_finish_dynamic_symbol (bfd *output_bfd, - - if (h->plt.offset != (bfd_vma) -1) - { -- unsigned int plt0, plt1, plt2; -+ unsigned int plt[PLT_MAX_INSN_COUNT]; -+ size_t plt_insn_count = 3; - asection *splt; - asection *sgot; - asection *srela; -@@ -2401,6 +2433,7 @@ or1k_elf_finish_dynamic_symbol (bfd *output_bfd, - bfd_vma got_offset; - bfd_vma got_addr; - Elf_Internal_Rela rela; -+ bfd_boolean large_plt_entry; - - /* This symbol has an entry in the procedure linkage table. Set - it up. */ -@@ -2418,10 +2451,13 @@ or1k_elf_finish_dynamic_symbol (bfd *output_bfd, - corresponds to this symbol. This is the index of this symbol - in all the symbols for which we are making plt entries. The - first entry in the procedure linkage table is reserved. */ -- plt_index = h->plt.offset / PLT_ENTRY_SIZE - 1; -+ plt_index = ((struct elf_or1k_link_hash_entry *) h)->plt_index; - plt_addr = plt_base_addr + h->plt.offset; - plt_reloc = plt_index * sizeof (Elf32_External_Rela); - -+ large_plt_entry = (elf_or1k_plt_entry_size (plt_index) -+ == PLT_ENTRY_SIZE_LARGE); -+ - /* Get the offset into the .got table of the entry that - corresponds to this function. Each .got entry is 4 bytes. - The first three are reserved. */ -@@ -2433,27 +2469,57 @@ or1k_elf_finish_dynamic_symbol (bfd *output_bfd, - { - unsigned pa = ((got_addr >> 13) - (plt_addr >> 13)) & 0x1fffff; - unsigned po = (got_addr & 0x1fff); -- plt0 = OR1K_ADRP(12) | pa; -- plt1 = OR1K_LWZ(12,12) | po; -- plt2 = OR1K_ORI0(11) | plt_reloc; -+ plt[0] = OR1K_ADRP(12) | pa; -+ plt[1] = OR1K_LWZ(12,12) | po; -+ plt[2] = OR1K_ORI0(11) | plt_reloc; - } - else if (bfd_link_pic (info)) - { -- plt0 = OR1K_LWZ(12,16) | got_offset; -- plt1 = OR1K_ORI0(11) | plt_reloc; -- plt2 = OR1K_NOP; -+ if (large_plt_entry) -+ { -+ unsigned gotha = ((got_offset + 0x8000) >> 16) & 0xffff; -+ unsigned got = got_offset & 0xffff; -+ unsigned pltrelhi = (plt_reloc >> 16) & 0xffff; -+ unsigned pltrello = plt_reloc & 0xffff; -+ -+ plt[0] = OR1K_MOVHI(12) | gotha; -+ plt[1] = OR1K_ADD(12,12,16); -+ plt[2] = OR1K_LWZ(12,12) | got; -+ plt[3] = OR1K_MOVHI(11) | pltrelhi; -+ plt[4] = OR1K_ORI(11,11) | pltrello; -+ plt_insn_count = 5; -+ } -+ else -+ { -+ plt[0] = OR1K_LWZ(12,16) | got_offset; -+ plt[1] = OR1K_ORI0(11) | plt_reloc; -+ plt[2] = OR1K_NOP; -+ } - } - else - { - unsigned ha = ((got_addr + 0x8000) >> 16) & 0xffff; - unsigned lo = got_addr & 0xffff; -- plt0 = OR1K_MOVHI(12) | ha; -- plt1 = OR1K_LWZ(12,12) | lo; -- plt2 = OR1K_ORI0(11) | plt_reloc; -+ plt[0] = OR1K_MOVHI(12) | ha; -+ plt[1] = OR1K_LWZ(12,12) | lo; -+ plt[2] = OR1K_ORI0(11) | plt_reloc; -+ } -+ -+ /* For large code model we fixup the non-PIC PLT relocation instructions -+ here. */ -+ if (large_plt_entry && !bfd_link_pic (info)) -+ { -+ unsigned pltrelhi = (plt_reloc >> 16) & 0xffff; -+ unsigned pltrello = plt_reloc & 0xffff; -+ -+ plt[2] = OR1K_MOVHI(11) | pltrelhi; -+ plt[3] = OR1K_ORI(11,11) | pltrello; -+ plt[4] = OR1K_NOP; -+ plt_insn_count = 5; - } - - or1k_write_plt_entry (output_bfd, splt->contents + h->plt.offset, -- plt0, plt1, plt2, OR1K_JR(12)); -+ OR1K_JR(12), plt, plt_insn_count); - - /* Fill in the entry in the global offset table. We initialize it to - point to the top of the plt. This is done to lazy lookup the actual -@@ -2777,11 +2843,16 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf) - if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, bfd_link_pic (info), h)) - { - asection *splt = htab->root.splt; -+ bfd_vma plt_index; -+ -+ /* Track the index of our plt entry for use in calculating size. */ -+ plt_index = htab->plt_count++; -+ ((struct elf_or1k_link_hash_entry *) h)->plt_index = plt_index; - - /* If this is the first .plt entry, make room for the special - first entry. */ - if (splt->size == 0) -- splt->size = PLT_ENTRY_SIZE; -+ splt->size = elf_or1k_plt_entry_size (plt_index); - - h->plt.offset = splt->size; - -@@ -2798,7 +2869,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf) - } - - /* Make room for this entry. */ -- splt->size += PLT_ENTRY_SIZE; -+ splt->size += elf_or1k_plt_entry_size (plt_index); - - /* We also need to make an entry in the .got.plt section, which - will be placed in the .got section by the linker script. */ -diff --git a/ld/testsuite/ld-or1k/gotha1.dd b/ld/testsuite/ld-or1k/gotha1.dd -new file mode 100644 -index 00000000000..0ad1f8f5399 ---- /dev/null -+++ b/ld/testsuite/ld-or1k/gotha1.dd -@@ -0,0 +1,34 @@ -+ -+.*\.x: file format elf32-or1k -+ -+ -+Disassembly of section \.plt: -+ -+[0-9a-f]+ <\.plt>: -+ +[0-9a-f]+: 19 80 00 00 l\.movhi r12,0x0 -+ +[0-9a-f]+: 85 ec [0-9a-f]+ [0-9a-f]+ l\.lwz r15,[0-9]+\(r12\) -+ +[0-9a-f]+: 44 00 78 00 l\.jr r15 -+ +[0-9a-f]+: 85 8c [0-9a-f]+ [0-9a-f]+ l\.lwz r12,[0-9]+\(r12\) -+ +[0-9a-f]+: 19 80 00 00 l\.movhi r12,0x0 -+ +[0-9a-f]+: 85 8c [0-9a-f]+ [0-9a-f]+ l\.lwz r12,[0-9]+\(r12\) -+ +[0-9a-f]+: 44 00 60 00 l\.jr r12 -+ +[0-9a-f]+: a9 60 00 00 l\.ori r11,r0,0x0 -+ -+Disassembly of section \.text: -+ -+[0-9a-f]+ <_start>: -+ +[0-9a-f]+: 9c 21 ff fc l\.addi r1,r1,-4 -+ +[0-9a-f]+: d4 01 48 00 l\.sw 0\(r1\),r9 -+ +[0-9a-f]+: 04 00 00 02 l\.jal [0-9a-f]+ <_start\+0x10> -+ +[0-9a-f]+: 1a 60 00 00 l\.movhi r19,0x0 -+ +[0-9a-f]+: aa 73 [0-9a-f]+ [0-9a-f]+ l\.ori r19,r19,0x[0-9a-f]+ -+ +[0-9a-f]+: e2 73 48 00 l\.add r19,r19,r9 -+ +[0-9a-f]+: 1a 20 00 00 l\.movhi r17,0x0 -+ +[0-9a-f]+: e2 31 98 00 l\.add r17,r17,r19 -+ +[0-9a-f]+: 86 31 00 10 l\.lwz r17,16\(r17\) -+ +[0-9a-f]+: 84 71 00 00 l\.lwz r3,0\(r17\) -+ +[0-9a-f]+: 07 ff ff f2 l\.jal [0-9a-f]+ <\.plt\+0x10> -+ +[0-9a-f]+: 15 00 00 00 l\.nop 0x0 -+ +[0-9a-f]+: 85 21 00 00 l\.lwz r9,0\(r1\) -+ +[0-9a-f]+: 44 00 48 00 l\.jr r9 -+ +[0-9a-f]+: 9c 21 00 04 l\.addi r1,r1,4 -diff --git a/ld/testsuite/ld-or1k/gotha1.s b/ld/testsuite/ld-or1k/gotha1.s -new file mode 100644 -index 00000000000..42b16db425c ---- /dev/null -+++ b/ld/testsuite/ld-or1k/gotha1.s -@@ -0,0 +1,24 @@ -+ .data -+ .p2align 16 -+ -+ .text -+ .globl _start -+_start: -+ l.addi r1, r1, -4 -+ l.sw 0(r1), r9 -+ -+ l.jal 8 -+ l.movhi r19, gotpchi(_GLOBAL_OFFSET_TABLE_-4) -+ l.ori r19, r19, gotpclo(_GLOBAL_OFFSET_TABLE_+0) -+ l.add r19, r19, r9 -+ -+ l.movhi r17, gotha(x) -+ l.add r17, r17, r19 -+ l.lwz r17, got(x)(r17) -+ l.lwz r3, 0(r17) -+ -+ l.jal plt(func) -+ l.nop -+ l.lwz r9, 0(r1) -+ l.jr r9 -+ l.addi r1, r1, 4 -diff --git a/ld/testsuite/ld-or1k/gotha2.dd b/ld/testsuite/ld-or1k/gotha2.dd -new file mode 100644 -index 00000000000..fe09da5466b ---- /dev/null -+++ b/ld/testsuite/ld-or1k/gotha2.dd -@@ -0,0 +1,21 @@ -+ -+.*\.x: file format elf32-or1k -+ -+ -+Disassembly of section \.text: -+ -+[0-9a-f]+ : -+ +[0-9a-f]+: 9c 21 ff f8 l\.addi r1,r1,-8 -+ +[0-9a-f]+: d4 01 80 00 l\.sw 0\(r1\),r16 -+ +[0-9a-f]+: d4 01 48 04 l\.sw 4\(r1\),r9 -+ +[0-9a-f]+: 04 00 [0-9a-f]+ [0-9a-f]+ l\.jal [0-9a-f]+ -+ +[0-9a-f]+: 1a 00 00 00 l\.movhi r16,0x0 -+ +[0-9a-f]+: aa 10 [0-9a-f]+ [0-9a-f]+ l\.ori r16,r16,0x[0-9a-f]+ -+ +[0-9a-f]+: e2 10 48 00 l\.add r16,r16,r9 -+ +[0-9a-f]+: 1a 20 00 00 l\.movhi r17,0x0 -+ +[0-9a-f]+: e2 31 80 00 l\.add r17,r17,r16 -+ +[0-9a-f]+: 86 31 00 0c l\.lwz r17,12\(r17\) -+ +[0-9a-f]+: 85 21 00 04 l\.lwz r9,4\(r1\) -+ +[0-9a-f]+: 86 01 00 00 l\.lwz r16,0\(r1\) -+ +[0-9a-f]+: 44 00 48 00 l\.jr r9 -+ +[0-9a-f]+: 9c 21 00 08 l\.addi r1,r1,8 -diff --git a/ld/testsuite/ld-or1k/gotha2.s b/ld/testsuite/ld-or1k/gotha2.s -new file mode 100644 -index 00000000000..164b282f2dd ---- /dev/null -+++ b/ld/testsuite/ld-or1k/gotha2.s -@@ -0,0 +1,22 @@ -+ .section .text -+ .align 4 -+ .global test -+ .type test, @function -+test: -+ l.addi r1, r1, -8 -+ l.sw 0(r1), r16 -+ l.sw 4(r1), r9 -+ -+ l.jal 8 -+ l.movhi r16, gotpchi(_GLOBAL_OFFSET_TABLE_-4) -+ l.ori r16, r16, gotpclo(_GLOBAL_OFFSET_TABLE_+0) -+ l.add r16, r16, r9 -+ -+ l.movhi r17, gotha(i) -+ l.add r17, r17, r16 -+ l.lwz r17, got(i)(r17) -+ -+ l.lwz r9, 4(r1) -+ l.lwz r16, 0(r1) -+ l.jr r9 -+ l.addi r1, r1, 8 -diff --git a/ld/testsuite/ld-or1k/or1k.exp b/ld/testsuite/ld-or1k/or1k.exp -index 8bb943aacc9..f10949e89aa 100644 ---- a/ld/testsuite/ld-or1k/or1k.exp -+++ b/ld/testsuite/ld-or1k/or1k.exp -@@ -53,6 +53,14 @@ set or1kplttests { - "" {plt1.s} - {{objdump -dr plt1.x.dd}} - "plt1.x"} -+ {"gotha exec plt" "tmpdir/libpltlib.so" "" -+ "" {gotha1.s} -+ {{objdump -dr gotha1.dd}} -+ "gotha1.x"} -+ {"gotha -fpic -shared" "-fpic -shared" "" -+ "" {gotha2.s} -+ {{objdump -dr gotha2.dd}} -+ "gotha2.x"} - } - - # Not implemented yet -diff --git a/ld/testsuite/ld-or1k/pltlib.s b/ld/testsuite/ld-or1k/pltlib.s -index baf76ca1af7..8b4d7ba48fd 100644 ---- a/ld/testsuite/ld-or1k/pltlib.s -+++ b/ld/testsuite/ld-or1k/pltlib.s -@@ -1,5 +1,6 @@ - .section .data - .globl x, y -+ .size x, 4 - x: .long 33 - y: .long 44 - --- -2.25.1 - diff --git a/package/binutils/2.36.1/0007-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch b/package/binutils/2.36.1/0007-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch deleted file mode 100644 index c3978e22fa8..00000000000 --- a/package/binutils/2.36.1/0007-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch +++ /dev/null @@ -1,50 +0,0 @@ -From c3003947e4bad18faea4337fd2073feeb30ee078 Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Wed, 9 Jun 2021 17:28:27 +0200 -Subject: [PATCH] bfd/elf32-or1k: fix building with gcc version < 5 - -Gcc version >= 5 has standard C mode not set to -std=gnu11, so if we use -an old compiler(i.e. gcc 4.9) build fails on: -``` -elf32-or1k.c:2251:3: error: 'for' loop initial declarations are only allowed in -C99 or C11 mode - for (size_t i = 0; i < insn_count; i++) - ^ -``` - -So let's declare `size_t i` at the top of the function instead of inside -for loop. - -Signed-off-by: Giulio Benetti ---- - bfd/elf32-or1k.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c -index 4ae7f324d33..32063ab0289 100644 ---- a/bfd/elf32-or1k.c -+++ b/bfd/elf32-or1k.c -@@ -2244,9 +2244,10 @@ or1k_write_plt_entry (bfd *output_bfd, bfd_byte *contents, unsigned insnj, - { - unsigned nodelay = elf_elfheader (output_bfd)->e_flags & EF_OR1K_NODELAY; - unsigned output_insns[PLT_MAX_INSN_COUNT]; -+ size_t i; - - /* Copy instructions into the output buffer. */ -- for (size_t i = 0; i < insn_count; i++) -+ for (i = 0; i < insn_count; i++) - output_insns[i] = insns[i]; - - /* Honor the no-delay-slot setting. */ -@@ -2277,7 +2278,7 @@ or1k_write_plt_entry (bfd *output_bfd, bfd_byte *contents, unsigned insnj, - } - - /* Write out the output buffer. */ -- for (size_t i = 0; i < (insn_count+1); i++) -+ for (i = 0; i < (insn_count+1); i++) - bfd_put_32 (output_bfd, output_insns[i], contents + (i*4)); - } - --- -2.25.1 - diff --git a/package/binutils/2.36.1/0008-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch b/package/binutils/2.36.1/0008-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch deleted file mode 100644 index 585b97b2af1..00000000000 --- a/package/binutils/2.36.1/0008-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 9af93e143a7fbdb75aa1ed37277f9250eb111628 Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Sat, 10 Jul 2021 17:57:34 +0200 -Subject: [PATCH] or1k: fix pc-relative relocation against dynamic on PC - relative 26 bit relocation - -When building openal we were seeing the assert failure: - -/home/buildroot/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: CMakeFiles/OpenAL.dir/al/source.cpp.o: -pc-relative relocation against dynamic symbol alSourcePausev -/home/buildroot/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: CMakeFiles/OpenAL.dir/al/source.cpp.o: -pc-relative relocation against dynamic symbol alSourceStopv -/home/buildroot/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: CMakeFiles/OpenAL.dir/al/source.cpp.o: -pc-relative relocation against dynamic symbol alSourceRewindv -/home/buildroot/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/or1k-buildroot-linux-uclibc/9.3.0/../../../../or1k-buildroot-linux-uclibc/bin/ld: CMakeFiles/OpenAL.dir/al/source.cpp.o: -pc-relative relocation against dynamic symbol alSourcePlayv -collect2: error: ld returned 1 exit status - -This happens because in R_OR1K_INSN_REL_26 case we can't reference local -symbol as previously done but we need to make sure that calls to actual -symbol always call the version of current object. - -bfd/Changelog: - - * elf32-or1k.c (or1k_elf_relocate_section): use a separate entry - in switch case R_OR1K_INSN_REL_26 where we need to check for - !SYMBOL_CALLS_LOCAL() instead of !SYMBOL_REFERENCES_LOCAL(). - -Signed-off-by: Giulio Benetti ---- - bfd/elf32-or1k.c | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c -index 4ae7f324d33..4f9092539f5 100644 ---- a/bfd/elf32-or1k.c -+++ b/bfd/elf32-or1k.c -@@ -1543,6 +1543,18 @@ or1k_elf_relocate_section (bfd *output_bfd, - break; - - case R_OR1K_INSN_REL_26: -+ /* For a non-shared link, these will reference plt or call the -+ version of actual object. */ -+ if (bfd_link_pic (info) && !SYMBOL_CALLS_LOCAL (info, h)) -+ { -+ _bfd_error_handler -+ (_("%pB: pc-relative relocation against dynamic symbol %s"), -+ input_bfd, name); -+ ret_val = FALSE; -+ bfd_set_error (bfd_error_bad_value); -+ } -+ break; -+ - case R_OR1K_PCREL_PG21: - case R_OR1K_LO13: - case R_OR1K_SLO13: --- -2.25.1 - diff --git a/package/binutils/2.36.1/0009-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch b/package/binutils/2.36.1/0009-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch deleted file mode 100644 index c4fedb719af..00000000000 --- a/package/binutils/2.36.1/0009-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 190091f9c1ec4cb80f8106e45ab4125eefa4114b Mon Sep 17 00:00:00 2001 -From: Stafford Horne -Date: Sun, 2 Jan 2022 09:03:28 +0900 -Subject: [PATCH] or1k: Avoid R_OR1K_GOT16 signed overflow by using special - howto - -Previously when fixing PR 21464 we masked out upper bits of the -relocation value in order to avoid overflow complaints when acceptable. -It turns out this does not work when the relocation value ends up being -signed. - -To fix this this patch introduces a special howto with -complain_on_overflow set to complain_overflow_dont. This is used in -place of the normal R_OR1K_GOT16 howto when we detect R_OR1K_GOT_AHI16 -relocations. - -bfd/ChangeLog: - - PR 28735 - * elf32-or1k.c (or1k_elf_got16_no_overflow_howto): Define. - (or1k_elf_relocate_section): Use new howto instead of trying to - mask out relocation bits. - -Signed-off-by: Giulio Benetti ---- - bfd/elf32-or1k.c | 24 ++++++++++++++++++++---- - 1 file changed, 20 insertions(+), 4 deletions(-) - -diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c -index 431a8ee479f..ea26cdf1033 100644 ---- a/bfd/elf32-or1k.c -+++ b/bfd/elf32-or1k.c -@@ -828,6 +828,23 @@ static reloc_howto_type or1k_elf_howto_table[] = - FALSE), /* pcrel_offset */ - }; - -+/* A copy of the R_OR1K_GOT16 used in the presense of R_OR1K_GOT_AHI16 -+ relocations when we know we can ignore overflows. */ -+static reloc_howto_type or1k_elf_got16_no_overflow_howto = -+ HOWTO (R_OR1K_GOT16, /* type */ -+ 0, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_dont, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_OR1K_GOT16", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE); /* pcrel_offset */ -+ - /* Map BFD reloc types to Or1k ELF reloc types. */ - - struct or1k_reloc_map -@@ -1506,12 +1523,11 @@ or1k_elf_relocate_section (bfd *output_bfd, - if (r_type == R_OR1K_GOT_AHI16) - saw_gotha = TRUE; - -- /* If we have a R_OR1K_GOT16 followed by a R_OR1K_GOT_AHI16 -+ /* If we have a R_OR1K_GOT16 following a R_OR1K_GOT_AHI16 - relocation we assume the code is doing the right thing to avoid -- overflows. Here we mask the lower 16-bit of the relocation to -- avoid overflow validation failures. */ -+ overflows. */ - if (r_type == R_OR1K_GOT16 && saw_gotha) -- relocation &= 0xffff; -+ howto = &or1k_elf_got16_no_overflow_howto; - - /* Addend should be zero. */ - if (rel->r_addend != 0) --- -2.25.1 - diff --git a/package/binutils/2.36.1/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch b/package/binutils/2.36.1/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch deleted file mode 100644 index af96f1a0f03..00000000000 --- a/package/binutils/2.36.1/0010-i386-Allow-GOT32-relocations-against-ABS-symbols.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 30a954525f4e53a9cd50a1a8a6f201c7cf6595c7 Mon Sep 17 00:00:00 2001 -From: "H.J. Lu" -Date: Mon, 7 Feb 2022 15:22:19 -0800 -Subject: [PATCH] i386: Allow GOT32 relocations against ABS symbols - -GOT32 relocations are allowed since absolute value + addend is stored in -the GOT slot. - -Tested on glibc 2.35 build with GCC 11.2 and -Os. - -bfd/ - - PR ld/28870 - * elfxx-x86.c (_bfd_elf_x86_valid_reloc_p): Also allow GOT32 - relocations. - -ld/ - - PR ld/28870 - * testsuite/ld-i386/i386.exp: Run pr28870. - * testsuite/ld-i386/pr28870.d: New file. - * testsuite/ld-i386/pr28870.s: Likewise. - -Signed-off-by: Waldemar Brodkorb - -diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c -index 7ac2411fc80..d00dc45677b 100644 ---- a/bfd/elfxx-x86.c -+++ b/bfd/elfxx-x86.c -@@ -1942,9 +1942,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section, - irel = *rel; - - /* Only allow relocations against absolute symbol, which can be -- resolved as absolute value + addend. GOTPCREL relocations -- are allowed since absolute value + addend is stored in the -- GOT slot. */ -+ resolved as absolute value + addend. GOTPCREL and GOT32 -+ relocations are allowed since absolute value + addend is -+ stored in the GOT slot. */ - if (bed->target_id == X86_64_ELF_DATA) - { - r_type &= ~R_X86_64_converted_reloc_bit; -@@ -1965,7 +1965,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section, - else - valid_p = (r_type == R_386_32 - || r_type == R_386_16 -- || r_type == R_386_8); -+ || r_type == R_386_8 -+ || r_type == R_386_GOT32 -+ || r_type == R_386_GOT32X); - - if (valid_p) - *no_dynreloc_p = true; diff --git a/package/binutils/2.38/0001-sh-conf.patch b/package/binutils/2.38/0001-sh-conf.patch new file mode 100644 index 00000000000..fcc597e4d94 --- /dev/null +++ b/package/binutils/2.38/0001-sh-conf.patch @@ -0,0 +1,48 @@ +From 33f3c1f804efc2e4f97849081589efb70cda31e5 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). + +[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 3dd206525a7..6881ce632f5 100755 +--- a/configure ++++ b/configure +@@ -3892,7 +3892,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 797a624621e..1f9256bbf18 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1175,7 +1175,7 @@ case "${target}" in + nvptx*-*-*) + noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" + ;; +- sh-*-*) ++ sh*-*-*) + case "${target}" in + sh*-*-elf) + ;; +-- +2.31.1 + diff --git a/package/binutils/2.38/0002-poison-system-directories.patch b/package/binutils/2.38/0002-poison-system-directories.patch new file mode 100644 index 00000000000..1a5fe465752 --- /dev/null +++ b/package/binutils/2.38/0002-poison-system-directories.patch @@ -0,0 +1,306 @@ +From 4d8705ddb55897e8a74b617ab95736d520d9e1ea 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. + +[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] + +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 26d55a00d47..ffad464783c 100644 +--- a/ld/config.in ++++ b/ld/config.in +@@ -43,6 +43,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 c197aaef3cb..882263aa43f 100755 +--- a/ld/configure ++++ b/ld/configure +@@ -829,6 +829,7 @@ with_lib_path + enable_targets + enable_64_bit_bfd + with_sysroot ++enable_poison_system_directories + enable_gold + enable_got + enable_compressed_debug_sections +@@ -1498,6 +1499,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) +@@ -15236,7 +15239,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 8ea97c43cd4..0f246db67d8 100644 +--- a/ld/configure.ac ++++ b/ld/configure.ac +@@ -106,6 +106,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 35fafebfaed..74e66405de6 100644 +--- a/ld/ld.h ++++ b/ld/ld.h +@@ -162,6 +162,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 dd8f571d4e4..3ab210b41b9 100644 +--- a/ld/ld.texi ++++ b/ld/ld.texi +@@ -2863,6 +2863,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. + @end table + + @c man end +diff --git a/ld/ldfile.c b/ld/ldfile.c +index 9d0af06f1f6..7cdd3b1c1b1 100644 +--- a/ld/ldfile.c ++++ b/ld/ldfile.c +@@ -117,6 +117,23 @@ 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 ++ + } + + /* Try to open a BFD for a lang_input_statement. */ +diff --git a/ld/ldlex.h b/ld/ldlex.h +index 9e8bf5fb835..2f0fadfe0a3 100644 +--- a/ld/ldlex.h ++++ b/ld/ldlex.h +@@ -163,6 +163,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, + }; + + /* The initial parser states. */ +diff --git a/ld/ldmain.c b/ld/ldmain.c +index 42660eb9a3c..1aef9387f93 100644 +--- a/ld/ldmain.c ++++ b/ld/ldmain.c +@@ -321,6 +321,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 00274c500d0..4f23b3a2da2 100644 +--- a/ld/lexsup.c ++++ b/ld/lexsup.c +@@ -595,6 +595,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) +@@ -607,6 +615,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; +@@ -1643,6 +1652,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), +@@ -1788,6 +1805,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.31.1 + diff --git a/package/binutils/2.38/0003-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch b/package/binutils/2.38/0003-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch new file mode 100644 index 00000000000..bfd531b8185 --- /dev/null +++ b/package/binutils/2.38/0003-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch @@ -0,0 +1,50 @@ +From ef4ba1da823e8366ea4f126f50885a44ebf4dcf0 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Wed, 9 Jun 2021 17:28:27 +0200 +Subject: [PATCH] bfd/elf32-or1k: fix building with gcc version < 5 + +Gcc version >= 5 has standard C mode not set to -std=gnu11, so if we use +an old compiler(i.e. gcc 4.9) build fails on: +``` +elf32-or1k.c:2251:3: error: 'for' loop initial declarations are only allowed in +C99 or C11 mode + for (size_t i = 0; i < insn_count; i++) + ^ +``` + +So let's declare `size_t i` at the top of the function instead of inside +for loop. + +Signed-off-by: Giulio Benetti +--- + bfd/elf32-or1k.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c +index 4ae7f324d33..32063ab0289 100644 +--- a/bfd/elf32-or1k.c ++++ b/bfd/elf32-or1k.c +@@ -2244,9 +2244,10 @@ or1k_write_plt_entry (bfd *output_bfd, bfd_byte *contents, unsigned insnj, + { + unsigned nodelay = elf_elfheader (output_bfd)->e_flags & EF_OR1K_NODELAY; + unsigned output_insns[PLT_MAX_INSN_COUNT]; ++ size_t i; + + /* Copy instructions into the output buffer. */ +- for (size_t i = 0; i < insn_count; i++) ++ for (i = 0; i < insn_count; i++) + output_insns[i] = insns[i]; + + /* Honor the no-delay-slot setting. */ +@@ -2277,7 +2278,7 @@ or1k_write_plt_entry (bfd *output_bfd, bfd_byte *contents, unsigned insnj, + } + + /* Write out the output buffer. */ +- for (size_t i = 0; i < (insn_count+1); i++) ++ for (i = 0; i < (insn_count+1); i++) + bfd_put_32 (output_bfd, output_insns[i], contents + (i*4)); + } + +-- +2.31.1 + diff --git a/package/binutils/2.38/0004-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch b/package/binutils/2.38/0004-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch new file mode 100644 index 00000000000..8609db95b7a --- /dev/null +++ b/package/binutils/2.38/0004-or1k-Avoid-R_OR1K_GOT16-signed-overflow-by-using-spe.patch @@ -0,0 +1,75 @@ +From 362a20108782b87cd780a989c0dbd014fc2def8b Mon Sep 17 00:00:00 2001 +From: Stafford Horne +Date: Sun, 2 Jan 2022 09:03:28 +0900 +Subject: [PATCH] or1k: Avoid R_OR1K_GOT16 signed overflow by using special + howto + +Previously when fixing PR 21464 we masked out upper bits of the +relocation value in order to avoid overflow complaints when acceptable. +It turns out this does not work when the relocation value ends up being +signed. + +To fix this this patch introduces a special howto with +complain_on_overflow set to complain_overflow_dont. This is used in +place of the normal R_OR1K_GOT16 howto when we detect R_OR1K_GOT_AHI16 +relocations. + +bfd/ChangeLog: + + PR 28735 + * elf32-or1k.c (or1k_elf_got16_no_overflow_howto): Define. + (or1k_elf_relocate_section): Use new howto instead of trying to + mask out relocation bits. + +Signed-off-by: Giulio Benetti +--- + bfd/elf32-or1k.c | 24 ++++++++++++++++++++---- + 1 file changed, 20 insertions(+), 4 deletions(-) + +diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c +index 4ae7f324d33..7fd88d72442 100644 +--- a/bfd/elf32-or1k.c ++++ b/bfd/elf32-or1k.c +@@ -828,6 +828,23 @@ static reloc_howto_type or1k_elf_howto_table[] = + false), /* pcrel_offset */ + }; + ++/* A copy of the R_OR1K_GOT16 used in the presense of R_OR1K_GOT_AHI16 ++ relocations when we know we can ignore overflows. */ ++static reloc_howto_type or1k_elf_got16_no_overflow_howto = ++ HOWTO (R_OR1K_GOT16, /* type */ ++ 0, /* rightshift */ ++ 2, /* size (0 = byte, 1 = short, 2 = long) */ ++ 16, /* bitsize */ ++ false, /* pc_relative */ ++ 0, /* bitpos */ ++ complain_overflow_dont, /* complain_on_overflow */ ++ bfd_elf_generic_reloc, /* special_function */ ++ "R_OR1K_GOT16", /* name */ ++ false, /* partial_inplace */ ++ 0, /* src_mask */ ++ 0xffff, /* dst_mask */ ++ false); /* pcrel_offset */ ++ + /* Map BFD reloc types to Or1k ELF reloc types. */ + + struct or1k_reloc_map +@@ -1506,12 +1523,11 @@ or1k_elf_relocate_section (bfd *output_bfd, + if (r_type == R_OR1K_GOT_AHI16) + saw_gotha = true; + +- /* If we have a R_OR1K_GOT16 followed by a R_OR1K_GOT_AHI16 ++ /* If we have a R_OR1K_GOT16 following a R_OR1K_GOT_AHI16 + relocation we assume the code is doing the right thing to avoid +- overflows. Here we mask the lower 16-bit of the relocation to +- avoid overflow validation failures. */ ++ overflows. */ + if (r_type == R_OR1K_GOT16 && saw_gotha) +- relocation &= 0xffff; ++ howto = &or1k_elf_got16_no_overflow_howto; + + /* Addend should be zero. */ + if (rel->r_addend != 0) +-- +2.25.1 + diff --git a/package/binutils/2.38/0005-binutils-2.38-vs.-ppc32-linux-kernel.patch b/package/binutils/2.38/0005-binutils-2.38-vs.-ppc32-linux-kernel.patch new file mode 100644 index 00000000000..c62652c95f3 --- /dev/null +++ b/package/binutils/2.38/0005-binutils-2.38-vs.-ppc32-linux-kernel.patch @@ -0,0 +1,55 @@ +From ed9b2e40ebffec835d63473367da8dd8f80d7d5b Mon Sep 17 00:00:00 2001 +From: Alan Modra +Date: Mon, 21 Feb 2022 10:58:57 +1030 +Subject: [PATCH] binutils 2.38 vs. ppc32 linux kernel + +Commit b25f942e18d6 made .machine more strict. Weaken it again. + + * config/tc-ppc.c (ppc_machine): Treat an early .machine specially, + keeping sticky options to work around gcc bugs. + +(cherry picked from commit cebc89b9328eab994f6b0314c263f94e7949a553) +Signed-off-by: Waldemar Brodkorb +--- + gas/config/tc-ppc.c | 25 ++++++++++++++++++++++++- + 1 file changed, 24 insertions(+), 1 deletion(-) + +diff --git a/gas/config/tc-ppc.c b/gas/config/tc-ppc.c +index 054f9c72161..89bc7d3f9b9 100644 +--- a/gas/config/tc-ppc.c ++++ b/gas/config/tc-ppc.c +@@ -5965,7 +5965,30 @@ ppc_machine (int ignore ATTRIBUTE_UNUSED) + options do not count as a new machine, instead they add + to currently selected opcodes. */ + ppc_cpu_t machine_sticky = 0; +- new_cpu = ppc_parse_cpu (ppc_cpu, &machine_sticky, cpu_string); ++ /* Unfortunately, some versions of gcc emit a .machine ++ directive very near the start of the compiler's assembly ++ output file. This is bad because it overrides user -Wa ++ cpu selection. Worse, there are versions of gcc that ++ emit the *wrong* cpu, not even respecting the -mcpu given ++ to gcc. See gcc pr101393. And to compound the problem, ++ as of 20220222 gcc doesn't pass the correct cpu option to ++ gas on the command line. See gcc pr59828. Hack around ++ this by keeping sticky options for an early .machine. */ ++ asection *sec; ++ for (sec = stdoutput->sections; sec != NULL; sec = sec->next) ++ { ++ segment_info_type *info = seg_info (sec); ++ /* Are the frags for this section perturbed from their ++ initial state? Even .align will count here. */ ++ if (info != NULL ++ && (info->frchainP->frch_root != info->frchainP->frch_last ++ || info->frchainP->frch_root->fr_type != rs_fill ++ || info->frchainP->frch_root->fr_fix != 0)) ++ break; ++ } ++ new_cpu = ppc_parse_cpu (ppc_cpu, ++ sec == NULL ? &sticky : &machine_sticky, ++ cpu_string); + if (new_cpu != 0) + ppc_cpu = new_cpu; + else +-- +2.30.2 + diff --git a/package/binutils/2.39/0001-sh-conf.patch b/package/binutils/2.39/0001-sh-conf.patch new file mode 100644 index 00000000000..fcc597e4d94 --- /dev/null +++ b/package/binutils/2.39/0001-sh-conf.patch @@ -0,0 +1,48 @@ +From 33f3c1f804efc2e4f97849081589efb70cda31e5 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). + +[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 3dd206525a7..6881ce632f5 100755 +--- a/configure ++++ b/configure +@@ -3892,7 +3892,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 797a624621e..1f9256bbf18 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1175,7 +1175,7 @@ case "${target}" in + nvptx*-*-*) + noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" + ;; +- sh-*-*) ++ sh*-*-*) + case "${target}" in + sh*-*-elf) + ;; +-- +2.31.1 + diff --git a/package/binutils/2.39/0002-poison-system-directories.patch b/package/binutils/2.39/0002-poison-system-directories.patch new file mode 100644 index 00000000000..1d9447b5c26 --- /dev/null +++ b/package/binutils/2.39/0002-poison-system-directories.patch @@ -0,0 +1,298 @@ +From 4d8705ddb55897e8a74b617ab95736d520d9e1ea 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.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] + +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 -Nur binutils-2.39.orig/ld/config.in binutils-2.39/ld/config.in +--- binutils-2.39.orig/ld/config.in 2022-08-05 11:56:56.000000000 +0200 ++++ binutils-2.39/ld/config.in 2022-08-11 13:00:55.310472243 +0200 +@@ -55,6 +55,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 -Nur binutils-2.39.orig/ld/configure binutils-2.39/ld/configure +--- binutils-2.39.orig/ld/configure 2022-08-05 11:56:54.000000000 +0200 ++++ binutils-2.39/ld/configure 2022-08-11 13:00:55.370470806 +0200 +@@ -836,6 +836,7 @@ + enable_targets + enable_64_bit_bfd + with_sysroot ++enable_poison_system_directories + enable_gold + enable_got + enable_compressed_debug_sections +@@ -1514,6 +1515,8 @@ + --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) +@@ -15370,7 +15373,18 @@ + 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 -Nur binutils-2.39.orig/ld/configure.ac binutils-2.39/ld/configure.ac +--- binutils-2.39.orig/ld/configure.ac 2022-07-08 11:46:48.000000000 +0200 ++++ binutils-2.39/ld/configure.ac 2022-08-11 13:00:55.370470806 +0200 +@@ -102,6 +102,16 @@ + 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 -Nur binutils-2.39.orig/ld/ldfile.c binutils-2.39/ld/ldfile.c +--- binutils-2.39.orig/ld/ldfile.c 2022-07-08 11:46:48.000000000 +0200 ++++ binutils-2.39/ld/ldfile.c 2022-08-11 13:00:55.394470231 +0200 +@@ -117,6 +117,23 @@ + 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 ++ + } + + /* Try to open a BFD for a lang_input_statement. */ +diff -Nur binutils-2.39.orig/ld/ld.h binutils-2.39/ld/ld.h +--- binutils-2.39.orig/ld/ld.h 2022-07-08 11:46:48.000000000 +0200 ++++ binutils-2.39/ld/ld.h 2022-08-11 13:00:55.382470519 +0200 +@@ -162,6 +162,14 @@ + 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 -Nur binutils-2.39.orig/ld/ldlex.h binutils-2.39/ld/ldlex.h +--- binutils-2.39.orig/ld/ldlex.h 2022-07-08 11:46:48.000000000 +0200 ++++ binutils-2.39/ld/ldlex.h 2022-08-11 13:03:35.462636396 +0200 +@@ -164,6 +164,8 @@ + OPTION_CTF_VARIABLES, + OPTION_NO_CTF_VARIABLES, + OPTION_CTF_SHARE_TYPES, ++ OPTION_NO_POISON_SYSTEM_DIRECTORIES, ++ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, + OPTION_WARN_EXECSTACK, + OPTION_NO_WARN_EXECSTACK, + OPTION_WARN_RWX_SEGMENTS, +diff -Nur binutils-2.39.orig/ld/ldmain.c binutils-2.39/ld/ldmain.c +--- binutils-2.39.orig/ld/ldmain.c 2022-07-08 11:46:48.000000000 +0200 ++++ binutils-2.39/ld/ldmain.c 2022-08-11 13:00:55.402470040 +0200 +@@ -321,6 +321,8 @@ + 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 -Nur binutils-2.39.orig/ld/ld.texi binutils-2.39/ld/ld.texi +--- binutils-2.39.orig/ld/ld.texi 2022-07-08 11:46:48.000000000 +0200 ++++ binutils-2.39/ld/ld.texi 2022-08-11 13:02:44.627853889 +0200 +@@ -2936,6 +2936,18 @@ + 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 -Nur binutils-2.39.orig/ld/lexsup.c binutils-2.39/ld/lexsup.c +--- binutils-2.39.orig/ld/lexsup.c 2022-07-08 11:46:48.000000000 +0200 ++++ binutils-2.39/ld/lexsup.c 2022-08-11 13:00:55.434469274 +0200 +@@ -608,6 +608,14 @@ + " 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) +@@ -620,6 +628,7 @@ + int ingroup = 0; + char *default_dirlist = NULL; + char *shortopts; ++ char *BR_paranoid_env; + struct option *longopts; + struct option *really_longopts; + int last_optind; +@@ -1679,6 +1688,14 @@ + } + 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), +@@ -1824,6 +1841,10 @@ + 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.31.1 diff --git a/package/binutils/2.39/0003-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch b/package/binutils/2.39/0003-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch new file mode 100644 index 00000000000..bfd531b8185 --- /dev/null +++ b/package/binutils/2.39/0003-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch @@ -0,0 +1,50 @@ +From ef4ba1da823e8366ea4f126f50885a44ebf4dcf0 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Wed, 9 Jun 2021 17:28:27 +0200 +Subject: [PATCH] bfd/elf32-or1k: fix building with gcc version < 5 + +Gcc version >= 5 has standard C mode not set to -std=gnu11, so if we use +an old compiler(i.e. gcc 4.9) build fails on: +``` +elf32-or1k.c:2251:3: error: 'for' loop initial declarations are only allowed in +C99 or C11 mode + for (size_t i = 0; i < insn_count; i++) + ^ +``` + +So let's declare `size_t i` at the top of the function instead of inside +for loop. + +Signed-off-by: Giulio Benetti +--- + bfd/elf32-or1k.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c +index 4ae7f324d33..32063ab0289 100644 +--- a/bfd/elf32-or1k.c ++++ b/bfd/elf32-or1k.c +@@ -2244,9 +2244,10 @@ or1k_write_plt_entry (bfd *output_bfd, bfd_byte *contents, unsigned insnj, + { + unsigned nodelay = elf_elfheader (output_bfd)->e_flags & EF_OR1K_NODELAY; + unsigned output_insns[PLT_MAX_INSN_COUNT]; ++ size_t i; + + /* Copy instructions into the output buffer. */ +- for (size_t i = 0; i < insn_count; i++) ++ for (i = 0; i < insn_count; i++) + output_insns[i] = insns[i]; + + /* Honor the no-delay-slot setting. */ +@@ -2277,7 +2278,7 @@ or1k_write_plt_entry (bfd *output_bfd, bfd_byte *contents, unsigned insnj, + } + + /* Write out the output buffer. */ +- for (size_t i = 0; i < (insn_count+1); i++) ++ for (i = 0; i < (insn_count+1); i++) + bfd_put_32 (output_bfd, output_insns[i], contents + (i*4)); + } + +-- +2.31.1 + diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index ea1f0209893..5dd2af2f9ca 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -7,34 +7,22 @@ config BR2_PACKAGE_HOST_BINUTILS_SUPPORTS_CFI choice prompt "Binutils Version" - default BR2_BINUTILS_VERSION_2_36_X if !BR2_arc && !BR2_csky + default BR2_BINUTILS_VERSION_2_38_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_32_X - bool "binutils 2.32" - depends on !BR2_csky - -config BR2_BINUTILS_VERSION_2_35_X - bool "binutils 2.35.2" - depends on !BR2_csky - # https://github.com/uclinux-dev/elf2flt/pull/16 - # https://github.com/uclinux-dev/elf2flt/issues/12 - depends on !BR2_BINFMT_FLAT - -config BR2_BINUTILS_VERSION_2_36_X - bool "binutils 2.36.1" - depends on !BR2_csky - # https://github.com/uclinux-dev/elf2flt/pull/16 - # https://github.com/uclinux-dev/elf2flt/issues/12 - depends on !BR2_BINFMT_FLAT - config BR2_BINUTILS_VERSION_2_37_X bool "binutils 2.37" - # https://github.com/uclinux-dev/elf2flt/pull/16 - # https://github.com/uclinux-dev/elf2flt/issues/12 - depends on !BR2_BINFMT_FLAT + # AVX512FP16 instructions were not supported before binutils + # 2.38 + depends on !BR2_X86_CPU_HAS_AVX512 + +config BR2_BINUTILS_VERSION_2_38_X + bool "binutils 2.38" + +config BR2_BINUTILS_VERSION_2_39_X + bool "binutils 2.39" config BR2_BINUTILS_VERSION_ARC bool "binutils arc (2.34.50)" @@ -45,13 +33,15 @@ endchoice config BR2_BINUTILS_VERSION string default "arc-2020.09-release" if BR2_BINUTILS_VERSION_ARC - default "2.32" if BR2_BINUTILS_VERSION_2_32_X - default "2.35.2" if BR2_BINUTILS_VERSION_2_35_X - default "2.36.1" if BR2_BINUTILS_VERSION_2_36_X default "2.37" if BR2_BINUTILS_VERSION_2_37_X + default "2.38" if BR2_BINUTILS_VERSION_2_38_X + default "2.39" if BR2_BINUTILS_VERSION_2_39_X -config BR2_BINUTILS_ENABLE_LTO - bool +config BR2_BINUTILS_GPROFNG + bool "gprofng support" + depends on BR2_BINUTILS_VERSION_2_39_X + help + This option enables support for gprofng, a new profiler. config BR2_BINUTILS_EXTRA_CONFIG_OPTIONS string "Additional binutils options" diff --git a/package/binutils/binutils.hash b/package/binutils/binutils.hash index d1be6cbce8c..5d45813b5ac 100644 --- a/package/binutils/binutils.hash +++ b/package/binutils/binutils.hash @@ -1,8 +1,7 @@ -# From ftp://gcc.gnu.org/pub/binutils/releases/sha512.sum -sha512 d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724afa1e43bd0db45cfc9916b41519b67dfce03232aa4978704492a6994a binutils-2.32.tar.xz -sha512 9974ede5978d32e0d68fef23da48fa00bd06b0bff7ec45b00ca075c126d6bbe0cf2defc03ecc3f17bc6cc85b64271a13009c4049d7ba17de26e84e3a6e2c0348 binutils-2.35.2.tar.xz -sha512 cc24590bcead10b90763386b6f96bb027d7594c659c2d95174a6352e8b98465a50ec3e4088d0da038428abe059bbc4ae5f37b269f31a40fc048072c8a234f4e9 binutils-2.36.1.tar.xz +# From https://gcc.gnu.org/pub/binutils/releases/sha512.sum sha512 5c11aeef6935860a6819ed3a3c93371f052e52b4bdc5033da36037c1544d013b7f12cb8d561ec954fe7469a68f1b66f1a3cd53d5a3af7293635a90d69edd15e7 binutils-2.37.tar.xz +sha512 8bf0b0d193c9c010e0518ee2b2e5a830898af206510992483b427477ed178396cd210235e85fd7bd99a96fc6d5eedbeccbd48317a10f752b7336ada8b2bb826d binutils-2.38.tar.xz +sha512 68e038f339a8c21faa19a57bbc447a51c817f47c2e06d740847c6e9cc3396c025d35d5369fa8c3f8b70414757c89f0e577939ddc0d70f283182504920f53b0a3 binutils-2.39.tar.xz # Locally calculated (fetched from Github) sha512 76a8227a19218435319c660e4983ea17985194b7f496f163e97543e7f6fd3e9249241fdc05a16ba512fba96a1d846c1f7b080983404d821d6215f10e7f11e238 binutils-gdb-arc-2020.09-release.tar.gz diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index 8c4a1371ca8..1ef7ee57d2f 100644 --- a/package/binutils/binutils.mk +++ b/package/binutils/binutils.mk @@ -11,7 +11,7 @@ ifeq ($(BINUTILS_VERSION),) ifeq ($(BR2_arc),y) BINUTILS_VERSION = arc-2020.09-release else -BINUTILS_VERSION = 2.36.1 +BINUTILS_VERSION = 2.38 endif endif # BINUTILS_VERSION @@ -52,6 +52,7 @@ BINUTILS_CONF_OPTS = \ --enable-install-libiberty \ --enable-build-warnings=no \ --with-system-zlib \ + --disable-gprofng \ $(BINUTILS_DISABLE_GDB_CONF_OPTS) \ $(BINUTILS_EXTRA_CONFIG_OPTIONS) @@ -86,9 +87,18 @@ HOST_BINUTILS_CONF_OPTS = \ --with-sysroot=$(STAGING_DIR) \ --enable-poison-system-directories \ --without-debuginfod \ + --enable-plugins \ + --enable-lto \ $(BINUTILS_DISABLE_GDB_CONF_OPTS) \ $(BINUTILS_EXTRA_CONFIG_OPTIONS) +ifeq ($(BR2_BINUTILS_GPROFNG),y) +HOST_BINUTILS_DEPENDENCIES += host-bison +HOST_BINUTILS_CONF_OPTS += --enable-gprofng +else +HOST_BINUTILS_CONF_OPTS += --disable-gprofng +endif + # binutils run configure script of subdirs at make time, so ensure # our TARGET_CONFIGURE_ARGS are taken into consideration for those BINUTILS_MAKE_ENV = $(TARGET_CONFIGURE_ARGS) @@ -120,10 +130,6 @@ HOST_BINUTILS_POST_EXTRACT_HOOKS += BINUTILS_XTENSA_OVERLAY_EXTRACT HOST_BINUTILS_EXTRA_DOWNLOADS += $(ARCH_XTENSA_OVERLAY_URL) endif -ifeq ($(BR2_BINUTILS_ENABLE_LTO),y) -HOST_BINUTILS_CONF_OPTS += --enable-plugins --enable-lto -endif - # Hardlinks between binaries in different directories cause a problem # with rpath fixup, so we de-hardlink those binaries, and replace them # with copies instead. diff --git a/package/biosdevname/biosdevname.hash b/package/biosdevname/biosdevname.hash index f4470c32dd7..8dc16b1e9ec 100644 --- a/package/biosdevname/biosdevname.hash +++ b/package/biosdevname/biosdevname.hash @@ -1,3 +1,3 @@ # Locally computed hashes, not provided by upstream -sha256 3a67fee0c315996bbba586c1c077e57625382d38dc48fb3c9e84d56a7a5effad biosdevname-0.7.3.tar.gz -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING +sha256 3a67fee0c315996bbba586c1c077e57625382d38dc48fb3c9e84d56a7a5effad biosdevname-0.7.3.tar.gz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/bird/0001-configure.ac-fix-build-with-autoconf-2.70.patch b/package/bird/0001-configure.ac-fix-build-with-autoconf-2.70.patch new file mode 100644 index 00000000000..c1adf484241 --- /dev/null +++ b/package/bird/0001-configure.ac-fix-build-with-autoconf-2.70.patch @@ -0,0 +1,33 @@ +From aa5bc6d2e59c5257d777a45ee4a0e0a784c44244 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 5 Nov 2021 20:58:41 +0100 +Subject: [PATCH] configure.ac: properly evaluate ac_test_CFLAGS + +Since autoconf 2.69 and +https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=76754e04fce5f6a7701bec57b057020585df2ae3 +ac_test_CFLAGS is set to ${CFLAGS+y} instead of ${CFLAGS+set}. + +Just test that ac_test_CFLAGS is not empty, to support both cases. + +Signed-off-by: Fabrice Fontaine +Signed-off-by: Arnout Vandecappelle (Essensium/Mind) +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 64181d29..b4b3fcfb 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -114,7 +114,7 @@ AC_SEARCH_LIBS([clock_gettime], [rt posix4], + AC_CANONICAL_HOST + + # Store this value because ac_test_CFLAGS is overwritten by AC_PROG_CC +-if test "$ac_test_CFLAGS" != set ; then ++if ! test "$ac_test_CFLAGS" ; then + bird_cflags_default=yes + fi + +-- +2.33.0 + diff --git a/package/bird/bird.hash b/package/bird/bird.hash index 2d20491dd60..a62fbba630e 100644 --- a/package/bird/bird.hash +++ b/package/bird/bird.hash @@ -1,2 +1,2 @@ -sha256 19d2de83ee25a307b9e5b9e58797dd68766d439bcee33e3ac617ed502370e7f6 bird-2.0.8.tar.gz +sha256 3ec462a237d06d1f4455d6ec00a42f0b1686061fc988e5c89a841d01dd753b53 bird-2.0.12.tar.gz sha256 94c53c84320078920ac1f0d49c81a4e9004512f534521a58bdf145acbcbc2cd2 README diff --git a/package/bird/bird.mk b/package/bird/bird.mk index 7d7002d5f21..f1b2ee6c5ea 100644 --- a/package/bird/bird.mk +++ b/package/bird/bird.mk @@ -4,13 +4,15 @@ # ################################################################################ -BIRD_VERSION = 2.0.8 -BIRD_SITE = ftp://bird.network.cz/pub/bird +BIRD_VERSION = 2.0.12 +BIRD_SITE = https://bird.network.cz/download BIRD_LICENSE = GPL-2.0+ BIRD_LICENSE_FILES = README BIRD_CPE_ID_VENDOR = nic BIRD_SELINUX_MODULES = bird BIRD_DEPENDENCIES = host-flex host-bison + +# 0001-configure.ac-fix-build-with-autoconf-2.70.patch BIRD_AUTORECONF = YES ifeq ($(BR2_PACKAGE_BIRD_CLIENT),y) diff --git a/package/bitstream-vera/bitstream-vera.hash b/package/bitstream-vera/bitstream-vera.hash index bb31b17a4af..54deb2661cb 100644 --- a/package/bitstream-vera/bitstream-vera.hash +++ b/package/bitstream-vera/bitstream-vera.hash @@ -1,4 +1,4 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-1.10.tar.bz2.sha256sum +# From https://download.gnome.org/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-1.10.tar.bz2.sha256sum sha256 db5b27df7bbb318036ebdb75acd3e98f1bd6eb6608fb70a67d478cd243d178dc ttf-bitstream-vera-1.10.tar.bz2 # locally computed sha256 3361d054759a2fc686a2c058be82deaf9c2e6fe549be9004d7935a6c1736315d COPYRIGHT.TXT diff --git a/package/bitstream-vera/bitstream-vera.mk b/package/bitstream-vera/bitstream-vera.mk index f487d637c27..2c9dc1a5cb0 100644 --- a/package/bitstream-vera/bitstream-vera.mk +++ b/package/bitstream-vera/bitstream-vera.mk @@ -5,7 +5,7 @@ ################################################################################ BITSTREAM_VERA_VERSION = 1.10 -BITSTREAM_VERA_SITE = http://ftp.gnome.org/pub/GNOME/sources/ttf-bitstream-vera/$(BITSTREAM_VERA_VERSION) +BITSTREAM_VERA_SITE = https://download.gnome.org/sources/ttf-bitstream-vera/$(BITSTREAM_VERA_VERSION) BITSTREAM_VERA_SOURCE = ttf-bitstream-vera-$(BITSTREAM_VERA_VERSION).tar.bz2 BITSTREAM_VERA_TARGET_DIR = $(TARGET_DIR)/usr/share/fonts/ttf-bitstream-vera BITSTREAM_VERA_LICENSE = BitstreamVera diff --git a/package/bitstream/bitstream.hash b/package/bitstream/bitstream.hash index 0d2e5a1f1a2..bdaf90c0125 100644 --- a/package/bitstream/bitstream.hash +++ b/package/bitstream/bitstream.hash @@ -1,6 +1,6 @@ # From https://get.videolan.org/bitstream/1.5/bitstream-1.5.tar.bz2.md5 -md5 34630d13332fd1575bcc8531b0a596be bitstream-1.5.tar.bz2 +md5 34630d13332fd1575bcc8531b0a596be bitstream-1.5.tar.bz2 # From https://get.videolan.org/bitstream/1.5/bitstream-1.5.tar.bz2.sha256 -sha256 45fc5a5a6e4537a69fa8440821e87b76252135180a3070c631b0b36ce0a3b90a bitstream-1.5.tar.bz2 +sha256 45fc5a5a6e4537a69fa8440821e87b76252135180a3070c631b0b36ce0a3b90a bitstream-1.5.tar.bz2 # Locally computed -sha256 9644a812f9a8377a59acb7092a36ce8882a39743425d9171a8fb84637e2f6e04 COPYING +sha256 9644a812f9a8377a59acb7092a36ce8882a39743425d9171a8fb84637e2f6e04 COPYING diff --git a/package/bluez-alsa/Config.in b/package/bluez-alsa/Config.in index 42bb9133bfd..73ae3d5333b 100644 --- a/package/bluez-alsa/Config.in +++ b/package/bluez-alsa/Config.in @@ -8,6 +8,7 @@ config BR2_PACKAGE_BLUEZ_ALSA depends on BR2_USE_MMU # bluez5 -> dbus depends on BR2_USE_WCHAR # libglib2 select BR2_PACKAGE_ALSA_LIB + select BR2_PACKAGE_ALSA_LIB_MIXER select BR2_PACKAGE_BLUEZ5_UTILS select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO select BR2_PACKAGE_LIBGLIB2 diff --git a/package/bluez-alsa/bluez-alsa.hash b/package/bluez-alsa/bluez-alsa.hash index f6e7294681b..ad7fe627085 100644 --- a/package/bluez-alsa/bluez-alsa.hash +++ b/package/bluez-alsa/bluez-alsa.hash @@ -1,3 +1,3 @@ # Locally calculated: -sha256 d9a878d9fd7f18842c9c8ed83bc96cab684753c90f2751d575a3cdd776ec78a5 bluez-alsa-3.1.0.tar.gz -sha256 60253922a459245128c34eb379cbda7c76936636d4c10edc576663a0f560dd4d LICENSE +sha256 ce5e060e61669d61d44f5f9bad34a7b88378376e9d49d31482406a68127a6b29 bluez-alsa-4.0.0.tar.gz +sha256 aaebd0cca73b0f361cb7f1bffa40418b2485fc10bfae7a47c193679c7e26d2e3 LICENSE diff --git a/package/bluez-alsa/bluez-alsa.mk b/package/bluez-alsa/bluez-alsa.mk index f5e3aa12454..649810b0ad4 100644 --- a/package/bluez-alsa/bluez-alsa.mk +++ b/package/bluez-alsa/bluez-alsa.mk @@ -4,7 +4,7 @@ # ################################################################################ -BLUEZ_ALSA_VERSION = 3.1.0 +BLUEZ_ALSA_VERSION = 4.0.0 BLUEZ_ALSA_SITE = $(call github,Arkq,bluez-alsa,v$(BLUEZ_ALSA_VERSION)) BLUEZ_ALSA_LICENSE = MIT BLUEZ_ALSA_LICENSE_FILES = LICENSE @@ -20,6 +20,10 @@ BLUEZ_ALSA_CONF_OPTS = \ --with-alsaplugindir=/usr/lib/alsa-lib \ --with-alsaconfdir=/etc/alsa/conf.d +ifeq ($(BR2_PACKAGE_ALSA_PLUGINS),y) +BLUEZ_ALSA_DEPENDENCIES += alsa-plugins +endif + ifeq ($(BR2_PACKAGE_FDK_AAC),y) BLUEZ_ALSA_DEPENDENCIES += fdk-aac BLUEZ_ALSA_CONF_OPTS += --enable-aac diff --git a/package/bluez5_utils-headers/bluez5_utils-headers.mk b/package/bluez5_utils-headers/bluez5_utils-headers.mk index 5bfc652355d..565511120fe 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.63 +BLUEZ5_UTILS_HEADERS_VERSION = 5.65 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-tools-mesh-cfgtest-include-limits.h.patch b/package/bluez5_utils/0001-tools-mesh-cfgtest-include-limits.h.patch deleted file mode 100644 index 7f1197357fd..00000000000 --- a/package/bluez5_utils/0001-tools-mesh-cfgtest-include-limits.h.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 5158827fded7cb4daf550a5956aff0c74f6c38fc Mon Sep 17 00:00:00 2001 -From: Michael Nosthoff -Date: Thu, 22 Jul 2021 21:36:13 +0200 -Subject: [PATCH] tools/mesh-cfgtest: include limits.h - -mesh-cfgtest.c uses PATH_MAX so it should include limits.h. - -fixes compilation error when enabling mesh support with musl-based -toolchains observed in buildroot autobuilders. - -http://autobuild.buildroot.net/results/20cc47f54de0b0d4bdf108c3715c590ae8ab476f/ -http://autobuild.buildroot.net/results/003968b25906579dbcf5a95d1e43fec0ab504ef5/ - -Signed-off-by: Michael Nosthoff ---- - tools/mesh-cfgtest.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tools/mesh-cfgtest.c b/tools/mesh-cfgtest.c -index fa0474faa..116ab7f16 100644 ---- a/tools/mesh-cfgtest.c -+++ b/tools/mesh-cfgtest.c -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - #include - #include - #include --- -2.32.0 - diff --git a/package/bluez5_utils/0002-shared-util-Rename-btd_malloc-to-util_malloc.patch b/package/bluez5_utils/0002-shared-util-Rename-btd_malloc-to-util_malloc.patch deleted file mode 100644 index f8d74528d84..00000000000 --- a/package/bluez5_utils/0002-shared-util-Rename-btd_malloc-to-util_malloc.patch +++ /dev/null @@ -1,67 +0,0 @@ -From f3263fed28bf510a1225661fe2b5f598300c11cd Mon Sep 17 00:00:00 2001 -From: Luiz Augusto von Dentz -Date: Wed, 5 Jan 2022 15:53:35 -0800 -Subject: [PATCH] shared/util: Rename btd_malloc to util_malloc - -util functions are not limited to daemon only which is normally the case -when using btd prefix. - -(cherry picked from commit 710220f861b100856711a0a4d4a852874228a57a) -Signed-off-by: Thomas Devoogdt ---- - profiles/audio/avdtp.c | 2 +- - src/shared/util.c | 2 +- - src/shared/util.h | 4 ++-- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/profiles/audio/avdtp.c b/profiles/audio/avdtp.c -index d3dfbf96d..f2b461330 100644 ---- a/profiles/audio/avdtp.c -+++ b/profiles/audio/avdtp.c -@@ -1333,7 +1333,7 @@ static GSList *caps_to_list(uint8_t *data, size_t size, - break; - } - -- cpy = btd_malloc(sizeof(*cpy) + cap->length); -+ cpy = util_malloc(sizeof(*cpy) + cap->length); - memcpy(cpy, cap, sizeof(*cap) + cap->length); - - size -= sizeof(*cap) + cap->length; -diff --git a/src/shared/util.c b/src/shared/util.c -index 81b20d86f..93110047b 100644 ---- a/src/shared/util.c -+++ b/src/shared/util.c -@@ -25,7 +25,7 @@ - - #include "src/shared/util.h" - --void *btd_malloc(size_t size) -+void *util_malloc(size_t size) - { - if (__builtin_expect(!!size, 1)) { - void *ptr; -diff --git a/src/shared/util.h b/src/shared/util.h -index ac70117ca..11d09979d 100644 ---- a/src/shared/util.h -+++ b/src/shared/util.h -@@ -75,7 +75,7 @@ do { \ - size_t __n = (size_t) (count); \ - size_t __s = sizeof(type); \ - void *__p; \ -- __p = btd_malloc(__n * __s); \ -+ __p = util_malloc(__n * __s); \ - memset(__p, 0, __n * __s); \ - __p; \ - })) -@@ -86,7 +86,7 @@ do { \ - char *strdelimit(char *str, char *del, char c); - int strsuffix(const char *str, const char *suffix); - --void *btd_malloc(size_t size); -+void *util_malloc(size_t size); - - typedef void (*util_debug_func_t)(const char *str, void *user_data); - --- -2.17.1 - diff --git a/package/bluez5_utils/0003-shared-util-Add-util_memdup.patch b/package/bluez5_utils/0003-shared-util-Add-util_memdup.patch deleted file mode 100644 index d5c31a2614c..00000000000 --- a/package/bluez5_utils/0003-shared-util-Add-util_memdup.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 28f1c140374d1ecda65e3d59cca72352c3a07774 Mon Sep 17 00:00:00 2001 -From: Luiz Augusto von Dentz -Date: Thu, 6 Jan 2022 11:45:12 -0800 -Subject: [PATCH] shared/util: Add util_memdup - -This adds util_memdup which is intended to replace g_memdup since -replacing that with g_memdup2 requires bumping the glib version. - -(cherry picked from commit 9f09e69ecb077082301dafb745856e1f3731aaa7) -Signed-off-by: Thomas Devoogdt ---- - src/shared/util.c | 16 ++++++++++++++++ - src/shared/util.h | 1 + - 2 files changed, 17 insertions(+) - -diff --git a/src/shared/util.c b/src/shared/util.c -index 93110047b..6e1c83057 100644 ---- a/src/shared/util.c -+++ b/src/shared/util.c -@@ -41,6 +41,22 @@ void *util_malloc(size_t size) - return NULL; - } - -+void *util_memdup(const void *src, size_t size) -+{ -+ void *cpy; -+ -+ if (!src || !size) -+ return NULL; -+ -+ cpy = util_malloc(size); -+ if (!cpy) -+ return NULL; -+ -+ memcpy(cpy, src, size); -+ -+ return cpy; -+} -+ - void util_debug_va(util_debug_func_t function, void *user_data, - const char *format, va_list va) - { -diff --git a/src/shared/util.h b/src/shared/util.h -index 11d09979d..8ef6132c4 100644 ---- a/src/shared/util.h -+++ b/src/shared/util.h -@@ -87,6 +87,7 @@ char *strdelimit(char *str, char *del, char c); - int strsuffix(const char *str, const char *suffix); - - void *util_malloc(size_t size); -+void *util_memdup(const void *src, size_t size); - - typedef void (*util_debug_func_t)(const char *str, void *user_data); - --- -2.17.1 - diff --git a/package/bluez5_utils/0004-build-Replace-use-of-g_memdup-with-util_memdup.patch b/package/bluez5_utils/0004-build-Replace-use-of-g_memdup-with-util_memdup.patch deleted file mode 100644 index 9e1047c9578..00000000000 --- a/package/bluez5_utils/0004-build-Replace-use-of-g_memdup-with-util_memdup.patch +++ /dev/null @@ -1,1411 +0,0 @@ -From 7eb74180cf6fd6cebc61bb719d458cbf5d7f4ca7 Mon Sep 17 00:00:00 2001 -From: Luiz Augusto von Dentz -Date: Thu, 6 Jan 2022 12:50:33 -0800 -Subject: [PATCH] build: Replace use of g_memdup with util_memdup -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This replaces the uses of g_memdup with util_memdup since the former has -been deprecated: - - warning: ‘g_memdup’ is deprecated: Use 'g_memdup2' instead - [-Wdeprecated-declarations] - -g_memdup2 requires bumping glib version which would likely have its -own problems thus why util_memdup was introduced. - -(cherry picked from commit cfab569484b18407fc117bb96634525cc76ea1f5) -Signed-off-by: Thomas Devoogdt ---- - Makefile.am | 10 ++--- - Makefile.obexd | 1 + - Makefile.tools | 11 ++++-- - android/a2dp.c | 9 +++-- - android/avctp.c | 5 ++- - android/avrcp-lib.c | 2 +- - android/gatt.c | 5 ++- - android/hidhost.c | 3 +- - android/tester-main.c | 77 +++++++++++++++++++++----------------- - attrib/gatt.c | 12 +++--- - client/gatt.c | 2 +- - gobex/gobex-header.c | 7 ++-- - gobex/gobex-packet.c | 5 ++- - obexd/src/obex.c | 5 ++- - plugins/neard.c | 9 +++-- - plugins/policy.c | 7 ++-- - profiles/audio/avctp.c | 9 +++-- - profiles/audio/avrcp.c | 10 ++--- - profiles/battery/bas.c | 4 +- - profiles/battery/battery.c | 4 +- - profiles/deviceinfo/dis.c | 4 +- - profiles/input/hog-lib.c | 12 +++--- - profiles/scanparam/scpp.c | 4 +- - src/eir.c | 8 ++-- - tools/gatt-service.c | 15 ++++---- - tools/mesh-gatt/gatt.c | 5 ++- - unit/test-avctp.c | 4 +- - unit/test-avdtp.c | 6 +-- - unit/test-avrcp.c | 10 ++--- - unit/test-gatt.c | 4 +- - unit/test-hfp.c | 11 +++--- - unit/test-hog.c | 26 ++++++------- - unit/test-sdp.c | 10 +++-- - unit/test-uhid.c | 2 +- - 34 files changed, 172 insertions(+), 146 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 308f13c50..9b5e140b8 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -508,23 +508,23 @@ unit_tests += unit/test-gobex-header unit/test-gobex-packet unit/test-gobex \ - - unit_test_gobex_SOURCES = $(gobex_sources) unit/util.c unit/util.h \ - unit/test-gobex.c --unit_test_gobex_LDADD = $(GLIB_LIBS) -+unit_test_gobex_LDADD = src/libshared-glib.la $(GLIB_LIBS) - - unit_test_gobex_packet_SOURCES = $(gobex_sources) unit/util.c unit/util.h \ - unit/test-gobex-packet.c --unit_test_gobex_packet_LDADD = $(GLIB_LIBS) -+unit_test_gobex_packet_LDADD = src/libshared-glib.la $(GLIB_LIBS) - - unit_test_gobex_header_SOURCES = $(gobex_sources) unit/util.c unit/util.h \ - unit/test-gobex-header.c --unit_test_gobex_header_LDADD = $(GLIB_LIBS) -+unit_test_gobex_header_LDADD = src/libshared-glib.la $(GLIB_LIBS) - - unit_test_gobex_transfer_SOURCES = $(gobex_sources) unit/util.c unit/util.h \ - unit/test-gobex-transfer.c --unit_test_gobex_transfer_LDADD = $(GLIB_LIBS) -+unit_test_gobex_transfer_LDADD = src/libshared-glib.la $(GLIB_LIBS) - - unit_test_gobex_apparam_SOURCES = $(gobex_sources) unit/util.c unit/util.h \ - unit/test-gobex-apparam.c --unit_test_gobex_apparam_LDADD = $(GLIB_LIBS) -+unit_test_gobex_apparam_LDADD = src/libshared-glib.la $(GLIB_LIBS) - endif - - unit_tests += unit/test-lib -diff --git a/Makefile.obexd b/Makefile.obexd -index 37a133455..5d1a4ff65 100644 ---- a/Makefile.obexd -+++ b/Makefile.obexd -@@ -82,6 +82,7 @@ obexd_src_obexd_SOURCES = $(btio_sources) $(gobex_sources) \ - obexd/src/map_ap.h - obexd_src_obexd_LDADD = lib/libbluetooth-internal.la \ - gdbus/libgdbus-internal.la \ -+ src/libshared-glib.la \ - $(ICAL_LIBS) $(DBUS_LIBS) $(LIBEBOOK_LIBS) \ - $(LIBEDATASERVER_LIBS) $(GLIB_LIBS) -ldl - -diff --git a/Makefile.tools b/Makefile.tools -index c7bdff83f..35b0021ea 100644 ---- a/Makefile.tools -+++ b/Makefile.tools -@@ -302,7 +302,8 @@ tools_mpris_proxy_SOURCES = tools/mpris-proxy.c - tools_mpris_proxy_LDADD = gdbus/libgdbus-internal.la $(GLIB_LIBS) $(DBUS_LIBS) - - tools_gatt_service_SOURCES = tools/gatt-service.c --tools_gatt_service_LDADD = $(GLIB_LIBS) $(DBUS_LIBS) gdbus/libgdbus-internal.la -+tools_gatt_service_LDADD = gdbus/libgdbus-internal.la \ -+ src/libshared-mainloop.la $(GLIB_LIBS) $(DBUS_LIBS) - - profiles_iap_iapd_SOURCES = profiles/iap/main.c - profiles_iap_iapd_LDADD = gdbus/libgdbus-internal.la $(GLIB_LIBS) $(DBUS_LIBS) -@@ -448,11 +449,12 @@ noinst_PROGRAMS += tools/btmgmt tools/obex-client-tool tools/obex-server-tool \ - tools_obex_client_tool_SOURCES = $(gobex_sources) $(btio_sources) \ - tools/obex-client-tool.c - tools_obex_client_tool_LDADD = lib/libbluetooth-internal.la \ -- $(GLIB_LIBS) -lreadline -+ src/libshared-glib.la $(GLIB_LIBS) -lreadline - - tools_obex_server_tool_SOURCES = $(gobex_sources) $(btio_sources) \ - tools/obex-server-tool.c --tools_obex_server_tool_LDADD = lib/libbluetooth-internal.la $(GLIB_LIBS) -+tools_obex_server_tool_LDADD = lib/libbluetooth-internal.la \ -+ src/libshared-glib.la $(GLIB_LIBS) - - tools_bluetooth_player_SOURCES = tools/bluetooth-player.c - tools_bluetooth_player_LDADD = gdbus/libgdbus-internal.la \ -@@ -461,7 +463,8 @@ tools_bluetooth_player_LDADD = gdbus/libgdbus-internal.la \ - - tools_obexctl_SOURCES = tools/obexctl.c - tools_obexctl_LDADD = gdbus/libgdbus-internal.la src/libshared-glib.la \ -- $(GLIB_LIBS) $(DBUS_LIBS) -lreadline -+ src/libshared-glib.la $(GLIB_LIBS) $(DBUS_LIBS) \ -+ -lreadline - - tools_btmgmt_SOURCES = tools/btmgmt.c src/uuid-helper.c client/display.c - tools_btmgmt_LDADD = lib/libbluetooth-internal.la src/libshared-mainloop.la \ -diff --git a/android/a2dp.c b/android/a2dp.c -index 029107cf5..ee607a32d 100644 ---- a/android/a2dp.c -+++ b/android/a2dp.c -@@ -26,6 +26,7 @@ - #include "lib/sdp_lib.h" - #include "profiles/audio/a2dp-codecs.h" - #include "src/shared/queue.h" -+#include "src/shared/util.h" - #include "src/log.h" - #include "hal-msg.h" - #include "ipc-common.h" -@@ -428,7 +429,7 @@ static struct a2dp_preset *sbc_select_range(void *caps, uint8_t caps_len, - - p = g_new0(struct a2dp_preset, 1); - p->len = conf_len; -- p->data = g_memdup(conf, p->len); -+ p->data = util_memdup(conf, p->len); - - return p; - } -@@ -448,7 +449,7 @@ static struct a2dp_preset *aac_select_range(void *caps, uint8_t caps_len, - - p = g_new0(struct a2dp_preset, 1); - p->len = conf_len; -- p->data = g_memdup(conf, p->len); -+ p->data = util_memdup(conf, p->len); - - return p; - } -@@ -1036,7 +1037,7 @@ static gboolean sep_setconf_ind(struct avdtp *session, - - preset = g_new0(struct a2dp_preset, 1); - preset->len = cap->length - sizeof(*codec); -- preset->data = g_memdup(codec->data, preset->len); -+ preset->data = util_memdup(codec->data, preset->len); - - if (check_config(endpoint, preset) < 0) { - preset_free(preset); -@@ -1365,7 +1366,7 @@ static GSList *parse_presets(const struct audio_preset *p, uint8_t count, - - preset = g_new0(struct a2dp_preset, 1); - preset->len = p->len; -- preset->data = g_memdup(p->data, preset->len); -+ preset->data = util_memdup(p->data, preset->len); - l = g_slist_append(l, preset); - - len -= preset->len; -diff --git a/android/avctp.c b/android/avctp.c -index 14ebbc391..37b4cec4f 100644 ---- a/android/avctp.c -+++ b/android/avctp.c -@@ -31,6 +31,7 @@ - #include - - #include "lib/sdp.h" -+#include "src/shared/util.h" - #include "src/log.h" - #include "avctp.h" - -@@ -1177,7 +1178,7 @@ static int avctp_send_req(struct avctp *session, uint8_t code, uint8_t subunit, - - for (i = 0; i < iov_cnt; i++) { - pdu[i].iov_len = iov[i].iov_len; -- pdu[i].iov_base = g_memdup(iov[i].iov_base, iov[i].iov_len); -+ pdu[i].iov_base = util_memdup(iov[i].iov_base, iov[i].iov_len); - } - - req = g_new0(struct avctp_control_req, 1); -@@ -1218,7 +1219,7 @@ int avctp_send_browsing_req(struct avctp *session, - - for (i = 0; i < iov_cnt; i++) { - pdu[i].iov_len = iov[i].iov_len; -- pdu[i].iov_base = g_memdup(iov[i].iov_base, iov[i].iov_len); -+ pdu[i].iov_base = util_memdup(iov[i].iov_base, iov[i].iov_len); - } - - req = g_new0(struct avctp_browsing_req, 1); -diff --git a/android/avrcp-lib.c b/android/avrcp-lib.c -index 2007d09d2..b342692cb 100644 ---- a/android/avrcp-lib.c -+++ b/android/avrcp-lib.c -@@ -2620,7 +2620,7 @@ static char *parse_folder_list(uint8_t *params, uint16_t params_len, - return NULL; - } - -- folders[count] = g_memdup(¶ms[i], len); -+ folders[count] = util_memdup(¶ms[i], len); - i += len; - } - -diff --git a/android/gatt.c b/android/gatt.c -index a8a0c488b..e8ba5aabb 100644 ---- a/android/gatt.c -+++ b/android/gatt.c -@@ -1338,7 +1338,8 @@ static void discover_primary_cb(uint8_t status, GSList *services, - } - - bt_uuid_to_uuid128(&uuid, &u128); -- new_uuid = g_memdup(&u128.value.u128, sizeof(u128.value.u128)); -+ new_uuid = util_memdup(&u128.value.u128, -+ sizeof(u128.value.u128)); - - uuids = g_slist_prepend(uuids, new_uuid); - } -@@ -6633,7 +6634,7 @@ static uint8_t write_prep_request(const uint8_t *cmd, uint16_t cmd_len, - - queue_push_tail(dev->pending_requests, data); - -- data->value = g_memdup(value, vlen); -+ data->value = util_memdup(value, vlen); - data->length = vlen; - - if (!gatt_db_attribute_write(attrib, offset, value, vlen, cmd[0], -diff --git a/android/hidhost.c b/android/hidhost.c -index 016382e17..b4e5c527f 100644 ---- a/android/hidhost.c -+++ b/android/hidhost.c -@@ -689,7 +689,8 @@ static void hid_sdp_search_cb(sdp_list_t *recs, int err, gpointer data) - goto fail; - - dev->rd_size = data->unitSize; -- dev->rd_data = g_memdup(data->val.str, data->unitSize); -+ dev->rd_data = util_memdup(data->val.str, -+ data->unitSize); - } - } - -diff --git a/android/tester-main.c b/android/tester-main.c -index ff5ecdf83..317c1de06 100644 ---- a/android/tester-main.c -+++ b/android/tester-main.c -@@ -1253,7 +1253,8 @@ static bt_property_t *copy_properties(int num_properties, - for (i = 0; i < num_properties; i++) { - props[i].type = properties[i].type; - props[i].len = properties[i].len; -- props[i].val = g_memdup(properties[i].val, properties[i].len); -+ props[i].val = util_memdup(properties[i].val, -+ properties[i].len); - } - - return props; -@@ -1268,7 +1269,8 @@ static bt_property_t *repack_properties(int num_properties, - for (i = 0; i < num_properties; i++) { - props[i].type = properties[i]->type; - props[i].len = properties[i]->len; -- props[i].val = g_memdup(properties[i]->val, properties[i]->len); -+ props[i].val = util_memdup(properties[i]->val, -+ properties[i]->len); - } - - return props; -@@ -1281,7 +1283,7 @@ static bt_property_t *create_property(bt_property_type_t type, void *val, - - prop->type = type; - prop->len = len; -- prop->val = g_memdup(val, len); -+ prop->val = util_memdup(val, len); - - return prop; - } -@@ -1615,7 +1617,7 @@ static void gattc_search_result_cb(int conn_id, btgatt_srvc_id_t *srvc_id) - - step->callback = CB_GATTC_SEARCH_RESULT; - step->callback_result.conn_id = conn_id; -- step->callback_result.service = g_memdup(srvc_id, sizeof(*srvc_id)); -+ step->callback_result.service = util_memdup(srvc_id, sizeof(*srvc_id)); - - schedule_callback_verification(step); - } -@@ -1639,8 +1641,8 @@ static void gattc_get_characteristic_cb(int conn_id, int status, - step->callback = CB_GATTC_GET_CHARACTERISTIC; - step->callback_result.status = status; - step->callback_result.conn_id = conn_id; -- step->callback_result.service = g_memdup(srvc_id, sizeof(*srvc_id)); -- step->callback_result.characteristic = g_memdup(char_id, -+ step->callback_result.service = util_memdup(srvc_id, sizeof(*srvc_id)); -+ step->callback_result.characteristic = util_memdup(char_id, - sizeof(*char_id)); - step->callback_result.char_prop = char_prop; - -@@ -1656,10 +1658,10 @@ static void gattc_get_descriptor_cb(int conn_id, int status, - step->callback = CB_GATTC_GET_DESCRIPTOR; - step->callback_result.status = status; - step->callback_result.conn_id = conn_id; -- step->callback_result.service = g_memdup(srvc_id, sizeof(*srvc_id)); -- step->callback_result.characteristic = g_memdup(char_id, -+ step->callback_result.service = util_memdup(srvc_id, sizeof(*srvc_id)); -+ step->callback_result.characteristic = util_memdup(char_id, - sizeof(*char_id)); -- step->callback_result.descriptor = g_memdup(descr_id, -+ step->callback_result.descriptor = util_memdup(descr_id, - sizeof(*descr_id)); - - schedule_callback_verification(step); -@@ -1673,8 +1675,8 @@ static void gattc_get_included_service_cb(int conn_id, int status, - step->callback = CB_GATTC_GET_INCLUDED_SERVICE; - step->callback_result.status = status; - step->callback_result.conn_id = conn_id; -- step->callback_result.service = g_memdup(srvc_id, sizeof(*srvc_id)); -- step->callback_result.included = g_memdup(incl_srvc_id, -+ step->callback_result.service = util_memdup(srvc_id, sizeof(*srvc_id)); -+ step->callback_result.included = util_memdup(incl_srvc_id, - sizeof(*srvc_id)); - - schedule_callback_verification(step); -@@ -1688,7 +1690,8 @@ static void gattc_read_characteristic_cb(int conn_id, int status, - step->callback = CB_GATTC_READ_CHARACTERISTIC; - step->callback_result.status = status; - step->callback_result.conn_id = conn_id; -- step->callback_result.read_params = g_memdup(p_data, sizeof(*p_data)); -+ step->callback_result.read_params = util_memdup(p_data, -+ sizeof(*p_data)); - - schedule_callback_verification(step); - } -@@ -1701,7 +1704,8 @@ static void gattc_read_descriptor_cb(int conn_id, int status, - step->callback = CB_GATTC_READ_DESCRIPTOR; - step->callback_result.status = status; - step->callback_result.conn_id = conn_id; -- step->callback_result.read_params = g_memdup(p_data, sizeof(*p_data)); -+ step->callback_result.read_params = util_memdup(p_data, -+ sizeof(*p_data)); - - schedule_callback_verification(step); - } -@@ -1714,7 +1718,8 @@ static void gattc_write_characteristic_cb(int conn_id, int status, - step->callback = CB_GATTC_WRITE_CHARACTERISTIC; - step->callback_result.status = status; - step->callback_result.conn_id = conn_id; -- step->callback_result.write_params = g_memdup(p_data, sizeof(*p_data)); -+ step->callback_result.write_params = util_memdup(p_data, -+ sizeof(*p_data)); - - schedule_callback_verification(step); - } -@@ -1727,7 +1732,8 @@ static void gattc_write_descriptor_cb(int conn_id, int status, - step->callback = CB_GATTC_WRITE_DESCRIPTOR; - step->callback_result.status = status; - step->callback_result.conn_id = conn_id; -- step->callback_result.write_params = g_memdup(p_data, sizeof(*p_data)); -+ step->callback_result.write_params = util_memdup(p_data, -+ sizeof(*p_data)); - - schedule_callback_verification(step); - } -@@ -1742,8 +1748,8 @@ static void gattc_register_for_notification_cb(int conn_id, int registered, - step->callback = CB_GATTC_REGISTER_FOR_NOTIFICATION; - step->callback_result.status = status; - step->callback_result.conn_id = conn_id; -- step->callback_result.service = g_memdup(srvc_id, sizeof(*srvc_id)); -- step->callback_result.characteristic = g_memdup(char_id, -+ step->callback_result.service = util_memdup(srvc_id, sizeof(*srvc_id)); -+ step->callback_result.characteristic = util_memdup(char_id, - sizeof(*char_id)); - step->callback_result.notification_registered = registered; - -@@ -1756,7 +1762,8 @@ static void gattc_notif_cb(int conn_id, btgatt_notify_params_t *p_data) - - step->callback = CB_GATTC_NOTIFY; - step->callback_result.conn_id = conn_id; -- step->callback_result.notify_params = g_memdup(p_data, sizeof(*p_data)); -+ step->callback_result.notify_params = util_memdup(p_data, -+ sizeof(*p_data)); - - schedule_callback_verification(step); - } -@@ -1827,8 +1834,8 @@ static void gatts_service_added_cb(int status, int server_if, - - step->callback_result.status = status; - step->callback_result.gatt_app_id = server_if; -- step->callback_result.service = g_memdup(srvc_id, sizeof(*srvc_id)); -- step->callback_result.srvc_handle = g_memdup(&srvc_handle, -+ step->callback_result.service = util_memdup(srvc_id, sizeof(*srvc_id)); -+ step->callback_result.srvc_handle = util_memdup(&srvc_handle, - sizeof(srvc_handle)); - - schedule_callback_verification(step); -@@ -1844,9 +1851,9 @@ static void gatts_included_service_added_cb(int status, int server_if, - - step->callback_result.status = status; - step->callback_result.gatt_app_id = server_if; -- step->callback_result.srvc_handle = g_memdup(&srvc_handle, -+ step->callback_result.srvc_handle = util_memdup(&srvc_handle, - sizeof(srvc_handle)); -- step->callback_result.inc_srvc_handle = g_memdup(&inc_srvc_handle, -+ step->callback_result.inc_srvc_handle = util_memdup(&inc_srvc_handle, - sizeof(inc_srvc_handle)); - - schedule_callback_verification(step); -@@ -1863,10 +1870,10 @@ static void gatts_characteristic_added_cb(int status, int server_if, - - step->callback_result.status = status; - step->callback_result.gatt_app_id = server_if; -- step->callback_result.srvc_handle = g_memdup(&srvc_handle, -+ step->callback_result.srvc_handle = util_memdup(&srvc_handle, - sizeof(srvc_handle)); -- step->callback_result.uuid = g_memdup(uuid, sizeof(*uuid)); -- step->callback_result.char_handle = g_memdup(&char_handle, -+ step->callback_result.uuid = util_memdup(uuid, sizeof(*uuid)); -+ step->callback_result.char_handle = util_memdup(&char_handle, - sizeof(char_handle)); - - schedule_callback_verification(step); -@@ -1883,10 +1890,10 @@ static void gatts_descriptor_added_cb(int status, int server_if, - - step->callback_result.status = status; - step->callback_result.gatt_app_id = server_if; -- step->callback_result.srvc_handle = g_memdup(&srvc_handle, -+ step->callback_result.srvc_handle = util_memdup(&srvc_handle, - sizeof(srvc_handle)); -- step->callback_result.uuid = g_memdup(uuid, sizeof(*uuid)); -- step->callback_result.desc_handle = g_memdup(&desc_handle, -+ step->callback_result.uuid = util_memdup(uuid, sizeof(*uuid)); -+ step->callback_result.desc_handle = util_memdup(&desc_handle, - sizeof(desc_handle)); - - schedule_callback_verification(step); -@@ -1900,7 +1907,7 @@ static void gatts_service_started_cb(int status, int server_if, int srvc_handle) - - step->callback_result.status = status; - step->callback_result.gatt_app_id = server_if; -- step->callback_result.srvc_handle = g_memdup(&srvc_handle, -+ step->callback_result.srvc_handle = util_memdup(&srvc_handle, - sizeof(srvc_handle)); - - schedule_callback_verification(step); -@@ -1914,7 +1921,7 @@ static void gatts_service_stopped_cb(int status, int server_if, int srvc_handle) - - step->callback_result.status = status; - step->callback_result.gatt_app_id = server_if; -- step->callback_result.srvc_handle = g_memdup(&srvc_handle, -+ step->callback_result.srvc_handle = util_memdup(&srvc_handle, - sizeof(srvc_handle)); - - schedule_callback_verification(step); -@@ -1928,7 +1935,7 @@ static void gatts_service_deleted_cb(int status, int server_if, int srvc_handle) - - step->callback_result.status = status; - step->callback_result.gatt_app_id = server_if; -- step->callback_result.srvc_handle = g_memdup(&srvc_handle, -+ step->callback_result.srvc_handle = util_memdup(&srvc_handle, - sizeof(srvc_handle)); - - schedule_callback_verification(step); -@@ -1945,7 +1952,7 @@ static void gatts_request_read_cb(int conn_id, int trans_id, bt_bdaddr_t *bda, - - step->callback_result.conn_id = conn_id; - step->callback_result.trans_id = trans_id; -- step->callback_result.attr_handle = g_memdup(&attr_handle, -+ step->callback_result.attr_handle = util_memdup(&attr_handle, - sizeof(attr_handle)); - step->callback_result.offset = offset; - step->callback_result.is_long = is_long; -@@ -1974,13 +1981,13 @@ static void gatts_request_write_cb(int conn_id, int trans_id, bt_bdaddr_t *bda, - - step->callback_result.conn_id = conn_id; - step->callback_result.trans_id = trans_id; -- step->callback_result.attr_handle = g_memdup(&attr_handle, -+ step->callback_result.attr_handle = util_memdup(&attr_handle, - sizeof(attr_handle)); - step->callback_result.offset = offset; - step->callback_result.length = length; - step->callback_result.need_rsp = need_rsp; - step->callback_result.is_prep = is_prep; -- step->callback_result.value = g_memdup(&value, length); -+ step->callback_result.value = util_memdup(&value, length); - - /* Utilize property verification mechanism for bdaddr */ - props[0] = create_property(BT_PROPERTY_BDADDR, bda, sizeof(*bda)); -@@ -2169,7 +2176,7 @@ static btmce_mas_instance_t *copy_mas_instances(int num_instances, - inst[i].id = instances[i].id; - inst[i].scn = instances[i].scn; - inst[i].msg_types = instances[i].msg_types; -- inst[i].p_name = g_memdup(instances[i].p_name, -+ inst[i].p_name = util_memdup(instances[i].p_name, - strlen(instances[i].p_name)); - } - -diff --git a/attrib/gatt.c b/attrib/gatt.c -index 46b2ca381..b496dd1eb 100644 ---- a/attrib/gatt.c -+++ b/attrib/gatt.c -@@ -135,7 +135,7 @@ static void discover_char_unref(void *data) - - g_slist_free_full(dc->characteristics, g_free); - g_attrib_unref(dc->attrib); -- g_free(dc->uuid); -+ free(dc->uuid); - g_free(dc); - } - -@@ -157,7 +157,7 @@ static void discover_desc_unref(void *data) - - g_slist_free_full(dd->descriptors, g_free); - g_attrib_unref(dd->attrib); -- g_free(dd->uuid); -+ free(dd->uuid); - g_free(dd); - } - -@@ -696,7 +696,7 @@ guint gatt_discover_char(GAttrib *attrib, uint16_t start, uint16_t end, - dc->user_data = user_data; - dc->end = end; - dc->start = start; -- dc->uuid = g_memdup(uuid, sizeof(bt_uuid_t)); -+ dc->uuid = util_memdup(uuid, sizeof(bt_uuid_t)); - - dc->id = g_attrib_send(attrib, 0, buf, plen, char_discovered_cb, - discover_char_ref(dc), discover_char_unref); -@@ -905,7 +905,7 @@ static void prepare_write_cb(guint8 status, const guint8 *rpdu, guint16 rlen, - if (long_write->offset == long_write->vlen) { - execute_write(long_write->attrib, ATT_WRITE_ALL_PREP_WRITES, - long_write->func, long_write->user_data); -- g_free(long_write->value); -+ free(long_write->value); - g_free(long_write); - - return; -@@ -964,7 +964,7 @@ guint gatt_write_char(GAttrib *attrib, uint16_t handle, const uint8_t *value, - long_write->func = func; - long_write->user_data = user_data; - long_write->handle = handle; -- long_write->value = g_memdup(value, vlen); -+ long_write->value = util_memdup(value, vlen); - long_write->vlen = vlen; - - return prepare_write(long_write); -@@ -1130,7 +1130,7 @@ guint gatt_discover_desc(GAttrib *attrib, uint16_t start, uint16_t end, - dd->user_data = user_data; - dd->start = start; - dd->end = end; -- dd->uuid = g_memdup(uuid, sizeof(bt_uuid_t)); -+ dd->uuid = util_memdup(uuid, sizeof(bt_uuid_t)); - - dd->id = g_attrib_send(attrib, 0, buf, plen, desc_discovered_cb, - discover_desc_ref(dd), discover_desc_unref); -diff --git a/client/gatt.c b/client/gatt.c -index 11f70dc4f..13872c794 100644 ---- a/client/gatt.c -+++ b/client/gatt.c -@@ -811,7 +811,7 @@ static uint8_t *str2bytearray(char *arg, size_t *val_len) - - *val_len = i; - -- return g_memdup(value, i); -+ return util_memdup(value, i); - } - - void gatt_write_attribute(GDBusProxy *proxy, int argc, char *argv[]) -diff --git a/gobex/gobex-header.c b/gobex/gobex-header.c -index 011d33d1a..002ba8861 100644 ---- a/gobex/gobex-header.c -+++ b/gobex/gobex-header.c -@@ -15,6 +15,7 @@ - - #include "gobex-header.h" - #include "gobex-debug.h" -+#include "src/shared/util.h" - - /* Header types */ - #define G_OBEX_HDR_ENC_UNICODE (0 << 6) -@@ -222,7 +223,7 @@ GObexHeader *g_obex_header_decode(const void *data, gsize len, - - switch (data_policy) { - case G_OBEX_DATA_COPY: -- header->v.data = g_memdup(ptr, header->vlen); -+ header->v.data = util_memdup(ptr, header->vlen); - break; - case G_OBEX_DATA_REF: - header->extdata = TRUE; -@@ -282,7 +283,7 @@ void g_obex_header_free(GObexHeader *header) - break; - case G_OBEX_HDR_ENC_BYTES: - if (!header->extdata) -- g_free(header->v.data); -+ free(header->v.data); - break; - case G_OBEX_HDR_ENC_UINT8: - case G_OBEX_HDR_ENC_UINT32: -@@ -410,7 +411,7 @@ GObexHeader *g_obex_header_new_bytes(guint8 id, const void *data, gsize len) - header->id = id; - header->vlen = len; - header->hlen = len + 3; -- header->v.data = g_memdup(data, len); -+ header->v.data = util_memdup(data, len); - - return header; - } -diff --git a/gobex/gobex-packet.c b/gobex/gobex-packet.c -index 11937a5a5..8ae78b0f6 100644 ---- a/gobex/gobex-packet.c -+++ b/gobex/gobex-packet.c -@@ -17,6 +17,7 @@ - #include "gobex-defs.h" - #include "gobex-packet.h" - #include "gobex-debug.h" -+#include "src/shared/util.h" - - #define FINAL_BIT 0x80 - -@@ -201,7 +202,7 @@ gboolean g_obex_packet_set_data(GObexPacket *pkt, const void *data, gsize len, - - switch (data_policy) { - case G_OBEX_DATA_COPY: -- pkt->data.buf = g_memdup(data, len); -+ pkt->data.buf = util_memdup(data, len); - break; - case G_OBEX_DATA_REF: - pkt->data.buf_ref = data; -@@ -259,7 +260,7 @@ void g_obex_packet_free(GObexPacket *pkt) - switch (pkt->data_policy) { - case G_OBEX_DATA_INHERIT: - case G_OBEX_DATA_COPY: -- g_free(pkt->data.buf); -+ free(pkt->data.buf); - break; - case G_OBEX_DATA_REF: - break; -diff --git a/obexd/src/obex.c b/obexd/src/obex.c -index 9f992ec18..3a68fd66c 100644 ---- a/obexd/src/obex.c -+++ b/obexd/src/obex.c -@@ -40,6 +40,7 @@ - #include "mimetype.h" - #include "service.h" - #include "transport.h" -+#include "src/shared/util.h" - - typedef struct { - uint8_t version; -@@ -145,7 +146,7 @@ static void os_reset_session(struct obex_session *os) - os->path = NULL; - } - if (os->apparam) { -- g_free(os->apparam); -+ free(os->apparam); - os->apparam = NULL; - os->apparam_len = 0; - } -@@ -594,7 +595,7 @@ static void parse_apparam(struct obex_session *os, GObexPacket *req) - if (!g_obex_header_get_bytes(hdr, &apparam, &len)) - return; - -- os->apparam = g_memdup(apparam, len); -+ os->apparam = util_memdup(apparam, len); - os->apparam_len = len; - DBG("APPARAM"); - } -diff --git a/plugins/neard.c b/plugins/neard.c -index e07b51106..a75527148 100644 ---- a/plugins/neard.c -+++ b/plugins/neard.c -@@ -30,6 +30,7 @@ - #include "src/eir.h" - #include "src/agent.h" - #include "src/btd.h" -+#include "src/shared/util.h" - - #define NEARD_NAME "org.neard" - #define NEARD_PATH "/" -@@ -71,7 +72,7 @@ static void free_oob_params(struct oob_params *params) - g_free(params->name); - g_free(params->hash); - g_free(params->randomizer); -- g_free(params->pin); -+ free(params->pin); - } - - static DBusMessage *error_reply(DBusMessage *msg, int error) -@@ -407,10 +408,10 @@ static int process_nokia_long (void *data, size_t size, uint8_t marker, - remote->name = g_strndup((char *)n->name, n->name_len); - - if (marker == 0x01) { -- remote->pin = g_memdup(n->authentication, 4); -+ remote->pin = util_memdup(n->authentication, 4); - remote->pin_len = 4; - } else if (marker == 0x02) { -- remote->pin = g_memdup(n->authentication, 16); -+ remote->pin = util_memdup(n->authentication, 16); - remote->pin_len = 16; - } - -@@ -439,7 +440,7 @@ static int process_nokia_short (void *data, size_t size, - if (n->name_len > 0) - remote->name = g_strndup((char *)n->name, n->name_len); - -- remote->pin = g_memdup(n->authentication, 4); -+ remote->pin = util_memdup(n->authentication, 4); - remote->pin_len = 4; - - return 0; -diff --git a/plugins/policy.c b/plugins/policy.c -index 051db82e1..48f5db7d3 100644 ---- a/plugins/policy.c -+++ b/plugins/policy.c -@@ -32,6 +32,7 @@ - #include "src/profile.h" - #include "src/btd.h" - #include "src/shared/timeout.h" -+#include "src/shared/util.h" - - #define CONTROL_CONNECT_TIMEOUT 2 - #define SOURCE_RETRY_TIMEOUT 2 -@@ -855,7 +856,7 @@ static int policy_init(void) - reconnect_attempts = default_attempts; - reconnect_intervals_len = sizeof(default_intervals) / - sizeof(*reconnect_intervals); -- reconnect_intervals = g_memdup(default_intervals, -+ reconnect_intervals = util_memdup(default_intervals, - sizeof(default_intervals)); - goto done; - } -@@ -886,7 +887,7 @@ static int policy_init(void) - g_clear_error(&gerr); - reconnect_intervals_len = sizeof(default_intervals) / - sizeof(*reconnect_intervals); -- reconnect_intervals = g_memdup(default_intervals, -+ reconnect_intervals = util_memdup(default_intervals, - sizeof(default_intervals)); - } - -@@ -919,7 +920,7 @@ static void policy_exit(void) - if (reconnect_uuids) - g_strfreev(reconnect_uuids); - -- g_free(reconnect_intervals); -+ free(reconnect_intervals); - - g_slist_free_full(reconnects, reconnect_destroy); - -diff --git a/profiles/audio/avctp.c b/profiles/audio/avctp.c -index 64d1a8504..6f64f162b 100644 ---- a/profiles/audio/avctp.c -+++ b/profiles/audio/avctp.c -@@ -40,6 +40,7 @@ - #include "src/log.h" - #include "src/error.h" - #include "src/shared/timeout.h" -+#include "src/shared/util.h" - - #include "avctp.h" - #include "avrcp.h" -@@ -760,7 +761,7 @@ static void control_req_destroy(void *data) - NULL, 0, req->user_data); - - done: -- g_free(req->operands); -+ free(req->operands); - g_free(req); - } - -@@ -776,7 +777,7 @@ static void browsing_req_destroy(void *data) - req->func(session, NULL, 0, req->user_data); - - done: -- g_free(req->operands); -+ free(req->operands); - g_free(req); - } - -@@ -1727,7 +1728,7 @@ static int avctp_send_req(struct avctp *session, uint8_t code, - req->subunit = subunit; - req->op = opcode; - req->func = func; -- req->operands = g_memdup(operands, operand_count); -+ req->operands = util_memdup(operands, operand_count); - req->operand_count = operand_count; - req->user_data = user_data; - -@@ -1765,7 +1766,7 @@ int avctp_send_browsing_req(struct avctp *session, - - req = g_new0(struct avctp_browsing_req, 1); - req->func = func; -- req->operands = g_memdup(operands, operand_count); -+ req->operands = util_memdup(operands, operand_count); - req->operand_count = operand_count; - req->user_data = user_data; - -diff --git a/profiles/audio/avrcp.c b/profiles/audio/avrcp.c -index 7c280203c..d4e19ffc0 100644 ---- a/profiles/audio/avrcp.c -+++ b/profiles/audio/avrcp.c -@@ -1298,7 +1298,7 @@ static uint8_t avrcp_handle_get_current_player_value(struct avrcp *session, - * Save a copy of requested settings because we can override them - * while responding - */ -- settings = g_memdup(&pdu->params[1], pdu->params[0]); -+ settings = util_memdup(&pdu->params[1], pdu->params[0]); - len = 0; - - /* -@@ -1323,7 +1323,7 @@ static uint8_t avrcp_handle_get_current_player_value(struct avrcp *session, - pdu->params[++len] = val; - } - -- g_free(settings); -+ free(settings); - - if (len) { - pdu->params[0] = len / 2; -@@ -2801,7 +2801,7 @@ static gboolean avrcp_set_browsed_player_rsp(struct avctp *conn, - break; - } - -- folders[count] = g_memdup(&pdu->params[i], len); -+ folders[count] = util_memdup(&pdu->params[i], len); - i += len; - } - -@@ -2888,7 +2888,7 @@ static void avrcp_player_parse_features(struct avrcp_player *player, - { - struct media_player *mp = player->user_data; - -- player->features = g_memdup(features, 16); -+ player->features = util_memdup(features, 16); - - if (features[7] & 0x08) { - media_player_set_browsable(mp, true); -@@ -3622,7 +3622,7 @@ static void player_destroy(gpointer data) - g_slist_free(player->sessions); - g_free(player->path); - g_free(player->change_path); -- g_free(player->features); -+ free(player->features); - g_free(player); - } - -diff --git a/profiles/battery/bas.c b/profiles/battery/bas.c -index 3c6173b61..16ff22e19 100644 ---- a/profiles/battery/bas.c -+++ b/profiles/battery/bas.c -@@ -62,7 +62,7 @@ static void bas_free(struct bt_bas *bas) - { - bt_bas_detach(bas); - -- g_free(bas->primary); -+ free(bas->primary); - queue_destroy(bas->gatt_op, (void *) destroy_gatt_req); - free(bas); - } -@@ -75,7 +75,7 @@ struct bt_bas *bt_bas_new(void *primary) - bas->gatt_op = queue_new(); - - if (primary) -- bas->primary = g_memdup(primary, sizeof(*bas->primary)); -+ bas->primary = util_memdup(primary, sizeof(*bas->primary)); - - return bt_bas_ref(bas); - } -diff --git a/profiles/battery/battery.c b/profiles/battery/battery.c -index 176d127f6..02d024d92 100644 ---- a/profiles/battery/battery.c -+++ b/profiles/battery/battery.c -@@ -66,7 +66,7 @@ static void batt_free(struct batt *batt) - gatt_db_unref(batt->db); - bt_gatt_client_unref(batt->client); - btd_device_unref(batt->device); -- g_free (batt->initial_value); -+ free(batt->initial_value); - if (batt->battery) - btd_battery_unregister(batt->battery); - g_free(batt); -@@ -159,7 +159,7 @@ static void read_initial_battery_level_cb(bool success, - if (!length) - return; - -- batt->initial_value = g_memdup(value, length); -+ batt->initial_value = util_memdup(value, length); - - /* request notify */ - batt->batt_level_cb_id = -diff --git a/profiles/deviceinfo/dis.c b/profiles/deviceinfo/dis.c -index 87fa63306..f660179ed 100644 ---- a/profiles/deviceinfo/dis.c -+++ b/profiles/deviceinfo/dis.c -@@ -72,7 +72,7 @@ static void dis_free(struct bt_dis *dis) - { - bt_dis_detach(dis); - -- g_free(dis->primary); -+ free(dis->primary); - queue_destroy(dis->gatt_op, (void *) destroy_gatt_req); - g_free(dis); - } -@@ -143,7 +143,7 @@ struct bt_dis *bt_dis_new_primary(void *primary) - dis->gatt_op = queue_new(); - - if (primary) -- dis->primary = g_memdup(primary, sizeof(*dis->primary)); -+ dis->primary = util_memdup(primary, sizeof(*dis->primary)); - - return bt_dis_ref(dis); - } -diff --git a/profiles/input/hog-lib.c b/profiles/input/hog-lib.c -index 3bbe42370..d37caa1f1 100644 ---- a/profiles/input/hog-lib.c -+++ b/profiles/input/hog-lib.c -@@ -527,9 +527,9 @@ static void report_read_cb(guint8 status, const guint8 *pdu, guint16 len, - } - - if (report->value) -- g_free(report->value); -+ free(report->value); - -- report->value = g_memdup(pdu, len); -+ report->value = util_memdup(pdu, len); - report->len = len; - } - -@@ -1217,7 +1217,7 @@ static void report_free(void *data) - { - struct report *report = data; - -- g_free(report->value); -+ free(report->value); - g_free(report); - } - -@@ -1241,7 +1241,7 @@ static void hog_free(void *data) - bt_uhid_unref(hog->uhid); - g_slist_free_full(hog->reports, report_free); - g_free(hog->name); -- g_free(hog->primary); -+ free(hog->primary); - queue_destroy(hog->gatt_op, (void *) destroy_gatt_req); - if (hog->gatt_db) - gatt_db_unref(hog->gatt_db); -@@ -1609,7 +1609,7 @@ static void hog_attach_hog(struct bt_hog *hog, struct gatt_primary *primary) - struct bt_hog *instance; - - if (!hog->primary) { -- hog->primary = g_memdup(primary, sizeof(*primary)); -+ hog->primary = util_memdup(primary, sizeof(*primary)); - discover_char(hog, hog->attrib, primary->range.start, - primary->range.end, NULL, - char_discovered_cb, hog); -@@ -1623,7 +1623,7 @@ static void hog_attach_hog(struct bt_hog *hog, struct gatt_primary *primary) - if (!instance) - return; - -- instance->primary = g_memdup(primary, sizeof(*primary)); -+ instance->primary = util_memdup(primary, sizeof(*primary)); - find_included(instance, hog->attrib, primary->range.start, - primary->range.end, find_included_cb, instance); - -diff --git a/profiles/scanparam/scpp.c b/profiles/scanparam/scpp.c -index da38a6aaa..4be8b26cc 100644 ---- a/profiles/scanparam/scpp.c -+++ b/profiles/scanparam/scpp.c -@@ -91,7 +91,7 @@ static void scpp_free(struct bt_scpp *scan) - { - bt_scpp_detach(scan); - -- g_free(scan->primary); -+ free(scan->primary); - queue_destroy(scan->gatt_op, NULL); /* cleared in bt_scpp_detach */ - g_free(scan); - } -@@ -110,7 +110,7 @@ struct bt_scpp *bt_scpp_new(void *primary) - scan->gatt_op = queue_new(); - - if (primary) -- scan->primary = g_memdup(primary, sizeof(*scan->primary)); -+ scan->primary = util_memdup(primary, sizeof(*scan->primary)); - - return bt_scpp_ref(scan); - } -diff --git a/src/eir.c b/src/eir.c -index 0f5d14fcd..2f9ee036f 100644 ---- a/src/eir.c -+++ b/src/eir.c -@@ -53,9 +53,9 @@ void eir_data_free(struct eir_data *eir) - eir->services = NULL; - g_free(eir->name); - eir->name = NULL; -- g_free(eir->hash); -+ free(eir->hash); - eir->hash = NULL; -- g_free(eir->randomizer); -+ free(eir->randomizer); - eir->randomizer = NULL; - g_slist_free_full(eir->msd_list, g_free); - eir->msd_list = NULL; -@@ -323,13 +323,13 @@ void eir_parse(struct eir_data *eir, const uint8_t *eir_data, uint8_t eir_len) - case EIR_SSP_HASH: - if (data_len < 16) - break; -- eir->hash = g_memdup(data, 16); -+ eir->hash = util_memdup(data, 16); - break; - - case EIR_SSP_RANDOMIZER: - if (data_len < 16) - break; -- eir->randomizer = g_memdup(data, 16); -+ eir->randomizer = util_memdup(data, 16); - break; - - case EIR_DEVICE_ID: -diff --git a/tools/gatt-service.c b/tools/gatt-service.c -index 631c4f249..ed6b06f1e 100644 ---- a/tools/gatt-service.c -+++ b/tools/gatt-service.c -@@ -26,6 +26,7 @@ - #include "gdbus/gdbus.h" - - #include "src/error.h" -+#include "src/shared/util.h" - - #define GATT_MGR_IFACE "org.bluez.GattManager1" - #define GATT_SERVICE_IFACE "org.bluez.GattService1" -@@ -126,8 +127,8 @@ static gboolean desc_get_value(const GDBusPropertyTable *property, - - static void desc_write(struct descriptor *desc, const uint8_t *value, int len) - { -- g_free(desc->value); -- desc->value = g_memdup(value, len); -+ free(desc->value); -+ desc->value = util_memdup(value, len); - desc->vlen = len; - - g_dbus_emit_property_changed(connection, desc->path, -@@ -264,8 +265,8 @@ static gboolean chr_get_props(const GDBusPropertyTable *property, - - static void chr_write(struct characteristic *chr, const uint8_t *value, int len) - { -- g_free(chr->value); -- chr->value = g_memdup(value, len); -+ free(chr->value); -+ chr->value = util_memdup(value, len); - chr->vlen = len; - - g_dbus_emit_property_changed(connection, chr->path, GATT_CHR_IFACE, -@@ -388,7 +389,7 @@ static void chr_iface_destroy(gpointer user_data) - - g_free(chr->uuid); - g_free(chr->service); -- g_free(chr->value); -+ free(chr->value); - g_free(chr->path); - g_free(chr); - } -@@ -398,7 +399,7 @@ static void desc_iface_destroy(gpointer user_data) - struct descriptor *desc = user_data; - - g_free(desc->uuid); -- g_free(desc->value); -+ free(desc->value); - g_free(desc->path); - g_free(desc); - } -@@ -592,7 +593,7 @@ static gboolean register_characteristic(const char *chr_uuid, - - chr = g_new0(struct characteristic, 1); - chr->uuid = g_strdup(chr_uuid); -- chr->value = g_memdup(value, vlen); -+ chr->value = util_memdup(value, vlen); - chr->vlen = vlen; - chr->props = props; - chr->service = g_strdup(service_path); -diff --git a/tools/mesh-gatt/gatt.c b/tools/mesh-gatt/gatt.c -index c8a8123fb..ab9743cd1 100644 ---- a/tools/mesh-gatt/gatt.c -+++ b/tools/mesh-gatt/gatt.c -@@ -24,6 +24,7 @@ - - #include "src/shared/io.h" - #include "src/shared/shell.h" -+#include "src/shared/util.h" - #include "gdbus/gdbus.h" - #include "lib/bluetooth.h" - #include "lib/uuid.h" -@@ -86,7 +87,7 @@ static void write_data_free(void *user_data) - { - struct write_data *data = user_data; - -- g_free(data->gatt_data); -+ free(data->gatt_data); - free(data); - } - -@@ -338,7 +339,7 @@ bool mesh_gatt_write(GDBusProxy *proxy, uint8_t *buf, uint16_t len, - /* TODO: should keep in queue in case we need to cancel write? */ - - data->gatt_len = len; -- data->gatt_data = g_memdup(buf, len); -+ data->gatt_data = util_memdup(buf, len); - data->gatt_data[0] &= GATT_TYPE_MASK; - data->iov.iov_base = data->gatt_data; - data->iov.iov_len = len; -diff --git a/unit/test-avctp.c b/unit/test-avctp.c -index fa7db59c8..25fd3abc2 100644 ---- a/unit/test-avctp.c -+++ b/unit/test-avctp.c -@@ -53,7 +53,7 @@ struct context { - #define raw_pdu(args...) \ - { \ - .valid = true, \ -- .data = g_memdup(data(args), sizeof(data(args))), \ -+ .data = util_memdup(data(args), sizeof(data(args))), \ - .size = sizeof(data(args)), \ - } - -@@ -64,7 +64,7 @@ struct context { - }; \ - static struct test_data data; \ - data.test_name = g_strdup(name); \ -- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ -+ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ - tester_add(name, &data, NULL, function, NULL); \ - } while (0) - -diff --git a/unit/test-avdtp.c b/unit/test-avdtp.c -index 4e8a68c6b..2e49def43 100644 ---- a/unit/test-avdtp.c -+++ b/unit/test-avdtp.c -@@ -48,7 +48,7 @@ struct test_data { - #define raw_pdu(args...) \ - { \ - .valid = true, \ -- .data = g_memdup(data(args), sizeof(data(args))), \ -+ .data = util_memdup(data(args), sizeof(data(args))), \ - .size = sizeof(data(args)), \ - } - -@@ -56,7 +56,7 @@ struct test_data { - { \ - .valid = true, \ - .fragmented = true, \ -- .data = g_memdup(data(args), sizeof(data(args))), \ -+ .data = util_memdup(data(args), sizeof(data(args))), \ - .size = sizeof(data(args)), \ - } - -@@ -67,7 +67,7 @@ struct test_data { - }; \ - static struct test_data data; \ - data.test_name = g_strdup(name); \ -- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ -+ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ - tester_add(name, &data, NULL, function, NULL); \ - } while (0) - -diff --git a/unit/test-avrcp.c b/unit/test-avrcp.c -index 34a70377d..b637a8a1b 100644 ---- a/unit/test-avrcp.c -+++ b/unit/test-avrcp.c -@@ -61,7 +61,7 @@ struct context { - #define raw_pdu(args...) \ - { \ - .valid = true, \ -- .data = g_memdup(data(args), sizeof(data(args))), \ -+ .data = util_memdup(data(args), sizeof(data(args))), \ - .size = sizeof(data(args)), \ - } - -@@ -69,7 +69,7 @@ struct context { - { \ - .valid = true, \ - .browse = true, \ -- .data = g_memdup(data(args), sizeof(data(args))), \ -+ .data = util_memdup(data(args), sizeof(data(args))), \ - .size = sizeof(data(args)), \ - } - -@@ -77,7 +77,7 @@ struct context { - { \ - .valid = true, \ - .fragmented = true, \ -- .data = g_memdup(data(args), sizeof(data(args))), \ -+ .data = util_memdup(data(args), sizeof(data(args))), \ - .size = sizeof(data(args)), \ - } - -@@ -85,7 +85,7 @@ struct context { - { \ - .valid = true, \ - .continuing = true, \ -- .data = g_memdup(data(args), sizeof(data(args))), \ -+ .data = util_memdup(data(args), sizeof(data(args))), \ - .size = sizeof(data(args)), \ - } - -@@ -96,7 +96,7 @@ struct context { - }; \ - static struct test_data data; \ - data.test_name = g_strdup(name); \ -- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ -+ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ - tester_add(name, &data, NULL, function, NULL); \ - } while (0) - -diff --git a/unit/test-gatt.c b/unit/test-gatt.c -index 6a47268e6..f92d860c4 100644 ---- a/unit/test-gatt.c -+++ b/unit/test-gatt.c -@@ -73,7 +73,7 @@ struct context { - #define raw_pdu(args...) \ - { \ - .valid = true, \ -- .data = g_memdup(data(args), sizeof(data(args))), \ -+ .data = util_memdup(data(args), sizeof(data(args))), \ - .size = sizeof(data(args)), \ - } - -@@ -94,7 +94,7 @@ struct context { - data.uuid = bt_uuid; \ - data.step = test_step; \ - data.source_db = db; \ -- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ -+ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ - tester_add(name, &data, NULL, function, NULL); \ - } while (0) - -diff --git a/unit/test-hfp.c b/unit/test-hfp.c -index f504724d7..b4af99d53 100644 ---- a/unit/test-hfp.c -+++ b/unit/test-hfp.c -@@ -17,6 +17,7 @@ - #include - #include "src/shared/hfp.h" - #include "src/shared/tester.h" -+#include "src/shared/util.h" - - struct context { - guint watch_id; -@@ -50,7 +51,7 @@ struct test_data { - #define raw_pdu(args...) \ - { \ - .valid = true, \ -- .data = g_memdup(data(args), sizeof(data(args))), \ -+ .data = util_memdup(data(args), sizeof(data(args))), \ - .size = sizeof(data(args)), \ - } - -@@ -62,7 +63,7 @@ struct test_data { - #define type_pdu(cmd_type, args...) \ - { \ - .valid = true, \ -- .data = g_memdup(data(args), sizeof(data(args))), \ -+ .data = util_memdup(data(args), sizeof(data(args))), \ - .size = sizeof(data(args)), \ - .type = cmd_type, \ - } -@@ -70,7 +71,7 @@ struct test_data { - #define frg_pdu(args...) \ - { \ - .valid = true, \ -- .data = g_memdup(data(args), sizeof(data(args))), \ -+ .data = util_memdup(data(args), sizeof(data(args))), \ - .size = sizeof(data(args)), \ - .fragmented = true, \ - } -@@ -82,7 +83,7 @@ struct test_data { - }; \ - static struct test_data data; \ - data.test_name = g_strdup(name); \ -- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ -+ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ - data.result_func = result_function; \ - tester_add(name, &data, NULL, function, NULL); \ - data.test_handler = test_handler; \ -@@ -96,7 +97,7 @@ struct test_data { - }; \ - static struct test_data data; \ - data.test_name = g_strdup(name); \ -- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ -+ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ - data.hf_result_func = result_func; \ - data.response_func = response_function; \ - tester_add(name, &data, NULL, function, NULL); \ -diff --git a/unit/test-hog.c b/unit/test-hog.c -index 116a5cb07..067497de4 100644 ---- a/unit/test-hog.c -+++ b/unit/test-hog.c -@@ -59,24 +59,24 @@ struct context { - #define raw_pdu(args...) \ - { \ - .valid = true, \ -- .data = g_memdup(data(args), sizeof(data(args))), \ -+ .data = util_memdup(data(args), sizeof(data(args))), \ - .size = sizeof(data(args)), \ - } - --#define false_pdu() \ --{ \ -- .valid = false, \ -+#define false_pdu() \ -+{ \ -+ .valid = false, \ - } - --#define define_test(name, function, args...) \ -- do { \ -- const struct test_pdu pdus[] = { \ -- args, { } \ -- }; \ -- static struct test_data data; \ -- data.test_name = g_strdup(name); \ -- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ -- tester_add(name, &data, NULL, function, NULL); \ -+#define define_test(name, function, args...) \ -+ do { \ -+ const struct test_pdu pdus[] = { \ -+ args, { } \ -+ }; \ -+ static struct test_data data; \ -+ data.test_name = g_strdup(name); \ -+ data.pdu_list = util_memdup(pdus, sizeof(pdus));\ -+ tester_add(name, &data, NULL, function, NULL); \ - } while (0) - - static gboolean context_quit(gpointer user_data) -diff --git a/unit/test-sdp.c b/unit/test-sdp.c -index 8f95fcb71..5c04a71eb 100644 ---- a/unit/test-sdp.c -+++ b/unit/test-sdp.c -@@ -47,14 +47,16 @@ struct test_data { - #define raw_pdu(args...) \ - { \ - .valid = true, \ -- .raw_data = g_memdup(raw_data(args), sizeof(raw_data(args))), \ -+ .raw_data = util_memdup(raw_data(args), \ -+ sizeof(raw_data(args))), \ - .raw_size = sizeof(raw_data(args)), \ - } - - #define raw_pdu_cont(cont, args...) \ - { \ - .valid = true, \ -- .raw_data = g_memdup(raw_data(args), sizeof(raw_data(args))), \ -+ .raw_data = util_memdup(raw_data(args), \ -+ sizeof(raw_data(args))), \ - .raw_size = sizeof(raw_data(args)), \ - .cont_len = cont, \ - } -@@ -66,7 +68,7 @@ struct test_data { - }; \ - static struct test_data data; \ - data.mtu = _mtu; \ -- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ -+ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ - tester_add(name, &data, NULL, test_sdp, NULL); \ - } while (0) - -@@ -92,7 +94,7 @@ struct test_data_de { - #define define_test_de_attr(name, input, exp) \ - do { \ - static struct test_data_de data; \ -- data.input_data = g_memdup(input, sizeof(input)); \ -+ data.input_data = util_memdup(input, sizeof(input)); \ - data.input_size = sizeof(input); \ - data.expected = exp; \ - tester_add("/sdp/DE/ATTR/" name, &data, NULL, \ -diff --git a/unit/test-uhid.c b/unit/test-uhid.c -index 001d39a3d..8a8eef855 100644 ---- a/unit/test-uhid.c -+++ b/unit/test-uhid.c -@@ -61,7 +61,7 @@ struct context { - }; \ - static struct test_data data; \ - data.test_name = g_strdup(name); \ -- data.pdu_list = g_memdup(pdus, sizeof(pdus)); \ -+ data.pdu_list = util_memdup(pdus, sizeof(pdus)); \ - tester_add(name, &data, NULL, function, NULL); \ - } while (0) - --- -2.17.1 - diff --git a/package/bluez5_utils/0005-build-Fix-errors-with-glibc-2-25.patch b/package/bluez5_utils/0005-build-Fix-errors-with-glibc-2-25.patch deleted file mode 100644 index 13033da7b2d..00000000000 --- a/package/bluez5_utils/0005-build-Fix-errors-with-glibc-2-25.patch +++ /dev/null @@ -1,312 +0,0 @@ -From fb57ad9b9d107856e5f1c8135da04ffa2f7a11ac Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 14 Feb 2022 21:17:39 +0100 -Subject: build: Fix errors with glibc < 2.25 - -getrandom and sys/random.h are only available since glibc 2.25: -https://www.gnu.org/software/gnulib/manual/html_node/sys_002frandom_002eh.html -resulting in the following build failures since version 5.63 and -https://git.kernel.org/pub/scm/bluetooth/bluez.git/log/?qt=grep&q=getrandom: - -plugins/autopair.c:20:24: fatal error: sys/random.h: No such file or directory - #include - ^ - -To fix this build failure, add util_getrandom and a fallback (borrowed -from pipewire and licensed under MIT): -https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/master/src/pipewire/utils.c - -Fixes: - - http://autobuild.buildroot.org/results/6b8870d12e0804d6154230a7322c49416c1dc0e2 - -[Retrieved from: -https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=fb57ad9b9d107856e5f1c8135da04ffa2f7a11ac] -Signed-off-by: Fabrice Fontaine ---- - configure.ac | 4 +++- - emulator/le.c | 3 +-- - emulator/phy.c | 3 +-- - peripheral/main.c | 4 ++-- - plugins/autopair.c | 4 ++-- - profiles/health/hdp.c | 4 ++-- - profiles/health/mcap.c | 6 +++--- - src/shared/util.c | 25 +++++++++++++++++++++++++ - src/shared/util.h | 2 ++ - tools/btgatt-server.c | 3 +-- - 10 files changed, 42 insertions(+), 16 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 07d068a4d..441bd5f29 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -54,6 +54,8 @@ AC_ARG_ENABLE(threads, AS_HELP_STRING([--enable-threads], - - AC_CHECK_FUNCS(explicit_bzero) - -+AC_CHECK_FUNCS(getrandom) -+ - AC_CHECK_FUNCS(rawmemchr) - - AC_CHECK_FUNC(signalfd, dummy=yes, -@@ -68,7 +70,7 @@ AC_CHECK_LIB(pthread, pthread_create, dummy=yes, - AC_CHECK_LIB(dl, dlopen, dummy=yes, - AC_MSG_ERROR(dynamic linking loader is required)) - --AC_CHECK_HEADERS(linux/types.h linux/if_alg.h linux/uinput.h linux/uhid.h) -+AC_CHECK_HEADERS(linux/types.h linux/if_alg.h linux/uinput.h linux/uhid.h sys/random.h) - - PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.28, dummy=yes, - AC_MSG_ERROR(GLib >= 2.28 is required)) -diff --git a/emulator/le.c b/emulator/le.c -index f8f313f2c..7656a657c 100644 ---- a/emulator/le.c -+++ b/emulator/le.c -@@ -20,7 +20,6 @@ - #include - #include - #include --#include - #include - - #include "lib/bluetooth.h" -@@ -509,7 +508,7 @@ static unsigned int get_adv_delay(void) - /* The advertising delay is a pseudo-random value with a range - * of 0 ms to 10 ms generated for each advertising event. - */ -- if (getrandom(&val, sizeof(val), 0) < 0) { -+ if (util_getrandom(&val, sizeof(val), 0) < 0) { - /* If it fails to get the random number, use a static value */ - val = 5; - } -diff --git a/emulator/phy.c b/emulator/phy.c -index 44cace438..7de85fb05 100644 ---- a/emulator/phy.c -+++ b/emulator/phy.c -@@ -19,7 +19,6 @@ - #include - #include - #include --#include - #include - #include - #include -@@ -174,7 +173,7 @@ struct bt_phy *bt_phy_new(void) - mainloop_add_fd(phy->rx_fd, EPOLLIN, phy_rx_callback, phy, NULL); - - if (!get_random_bytes(&phy->id, sizeof(phy->id))) { -- if (getrandom(&phy->id, sizeof(phy->id), 0) < 0) { -+ if (util_getrandom(&phy->id, sizeof(phy->id), 0) < 0) { - mainloop_remove_fd(phy->rx_fd); - close(phy->tx_fd); - close(phy->rx_fd); -diff --git a/peripheral/main.c b/peripheral/main.c -index 91adb45fc..b82d7caf6 100644 ---- a/peripheral/main.c -+++ b/peripheral/main.c -@@ -25,13 +25,13 @@ - #include - #include - #include --#include - - #ifndef WAIT_ANY - #define WAIT_ANY (-1) - #endif - - #include "src/shared/mainloop.h" -+#include "src/shared/util.h" - #include "peripheral/efivars.h" - #include "peripheral/attach.h" - #include "peripheral/gap.h" -@@ -192,7 +192,7 @@ int main(int argc, char *argv[]) - addr, 6) < 0) { - printf("Generating new persistent static address\n"); - -- if (getrandom(addr, sizeof(addr), 0) < 0) { -+ if (util_getrandom(addr, sizeof(addr), 0) < 0) { - perror("Failed to get random static address"); - return EXIT_FAILURE; - } -diff --git a/plugins/autopair.c b/plugins/autopair.c -index a75ecebe4..0b09e893f 100644 ---- a/plugins/autopair.c -+++ b/plugins/autopair.c -@@ -17,7 +17,6 @@ - #include - #include - #include --#include - - #include - -@@ -29,6 +28,7 @@ - #include "src/device.h" - #include "src/log.h" - #include "src/storage.h" -+#include "src/shared/util.h" - - /* - * Plugin to handle automatic pairing of devices with reduced user -@@ -131,7 +131,7 @@ static ssize_t autopair_pincb(struct btd_adapter *adapter, - if (attempt >= 4) - return 0; - -- if (getrandom(&val, sizeof(val), 0) < 0) { -+ if (util_getrandom(&val, sizeof(val), 0) < 0) { - error("Failed to get a random pincode"); - return 0; - } -diff --git a/profiles/health/hdp.c b/profiles/health/hdp.c -index 9d9d1e824..b6590cd3a 100644 ---- a/profiles/health/hdp.c -+++ b/profiles/health/hdp.c -@@ -16,7 +16,6 @@ - #include - #include - #include --#include - - #include - -@@ -33,6 +32,7 @@ - #include "src/device.h" - #include "src/sdpd.h" - #include "src/shared/timeout.h" -+#include "src/shared/util.h" - #include "btio/btio.h" - - #include "hdp_types.h" -@@ -1490,7 +1490,7 @@ static void *generate_echo_packet(void) - if (!buf) - return NULL; - -- if (getrandom(buf, HDP_ECHO_LEN, 0) < 0) { -+ if (util_getrandom(buf, HDP_ECHO_LEN, 0) < 0) { - g_free(buf); - return NULL; - } -diff --git a/profiles/health/mcap.c b/profiles/health/mcap.c -index aad0a08a3..5d2bac3d9 100644 ---- a/profiles/health/mcap.c -+++ b/profiles/health/mcap.c -@@ -19,7 +19,6 @@ - #include - #include - #include --#include - - #include - -@@ -28,6 +27,7 @@ - #include "btio/btio.h" - #include "src/log.h" - #include "src/shared/timeout.h" -+#include "src/shared/util.h" - - #include "mcap.h" - -@@ -1905,7 +1905,7 @@ gboolean mcap_create_mcl(struct mcap_instance *mi, - mcl->state = MCL_IDLE; - bacpy(&mcl->addr, addr); - set_default_cb(mcl); -- if (getrandom(&val, sizeof(val), 0) < 0) { -+ if (util_getrandom(&val, sizeof(val), 0) < 0) { - mcap_instance_unref(mcl->mi); - g_free(mcl); - return FALSE; -@@ -2049,7 +2049,7 @@ static void connect_mcl_event_cb(GIOChannel *chan, GError *gerr, - mcl->mi = mcap_instance_ref(mi); - bacpy(&mcl->addr, &dst); - set_default_cb(mcl); -- if (getrandom(&val, sizeof(val), 0) < 0) { -+ if (util_getrandom(&val, sizeof(val), 0) < 0) { - mcap_instance_unref(mcl->mi); - g_free(mcl); - goto drop; -diff --git a/src/shared/util.c b/src/shared/util.c -index 6e1c83057..33196bf8b 100644 ---- a/src/shared/util.c -+++ b/src/shared/util.c -@@ -13,6 +13,7 @@ - #endif - - #define _GNU_SOURCE -+#include - #include - #include - #include -@@ -23,6 +24,10 @@ - #include - #include - -+#ifdef HAVE_SYS_RANDOM_H -+#include -+#endif -+ - #include "src/shared/util.h" - - void *util_malloc(size_t size) -@@ -138,6 +143,26 @@ unsigned char util_get_dt(const char *parent, const char *name) - return DT_UNKNOWN; - } - -+/* Helper for getting a random in case getrandom unavailable (glibc < 2.25) */ -+ssize_t util_getrandom(void *buf, size_t buflen, unsigned int flags) -+{ -+#ifdef HAVE_GETRANDOM -+ return getrandom(buf, buflen, flags); -+#else -+ int fd; -+ ssize_t bytes; -+ -+ fd = open("/dev/urandom", O_CLOEXEC); -+ if (fd < 0) -+ return -1; -+ -+ bytes = read(fd, buf, buflen); -+ close(fd); -+ -+ return bytes; -+#endif -+} -+ - /* Helpers for bitfield operations */ - - /* Find unique id in range from 1 to max but no bigger than 64. */ -diff --git a/src/shared/util.h b/src/shared/util.h -index 8ef6132c4..c01eccf8a 100644 ---- a/src/shared/util.h -+++ b/src/shared/util.h -@@ -103,6 +103,8 @@ void util_hexdump(const char dir, const unsigned char *buf, size_t len, - - unsigned char util_get_dt(const char *parent, const char *name); - -+ssize_t util_getrandom(void *buf, size_t buflen, unsigned int flags); -+ - uint8_t util_get_uid(uint64_t *bitmap, uint8_t max); - void util_clear_uid(uint64_t *bitmap, uint8_t id); - -diff --git a/tools/btgatt-server.c b/tools/btgatt-server.c -index 15d49a464..4a5d2b720 100644 ---- a/tools/btgatt-server.c -+++ b/tools/btgatt-server.c -@@ -20,7 +20,6 @@ - #include - #include - #include --#include - - #include "lib/bluetooth.h" - #include "lib/hci.h" -@@ -287,7 +286,7 @@ static bool hr_msrmt_cb(void *user_data) - uint32_t cur_ee; - uint32_t val; - -- if (getrandom(&val, sizeof(val), 0) < 0) -+ if (util_getrandom(&val, sizeof(val), 0) < 0) - return false; - - pdu[0] = 0x06; --- -cgit - diff --git a/package/bluez5_utils/Config.in b/package/bluez5_utils/Config.in index 2eea8c7ced6..49bb7191025 100644 --- a/package/bluez5_utils/Config.in +++ b/package/bluez5_utils/Config.in @@ -79,15 +79,23 @@ config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HEALTH config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID bool "build hid plugin" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HOG help Build plugin for HID (input) profiles. +comment "hid plugin needs a toolchain w/ headers >= 3.18" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 + config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HOG bool "build hog plugin" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 help Build plugin for HoG (input) profiles. +comment "hog plugin needs a toolchain w/ headers >= 3.18" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 + config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_MESH bool "build mesh plugin" depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 # ell @@ -126,11 +134,15 @@ config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SAP config BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_SIXAXIS bool "build sixaxis plugin" depends on BR2_PACKAGE_HAS_UDEV + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # hid plugin select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID # runtime help Build sixaxis plugin (support Sony Dualshock controller) +comment "sixaxis plugin needs a toolchain w/ headers >= 3.18" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 + comment "sixaxis plugin needs udev /dev management" depends on !BR2_PACKAGE_HAS_UDEV @@ -142,11 +154,15 @@ config BR2_PACKAGE_BLUEZ5_UTILS_TEST config BR2_PACKAGE_BLUEZ5_UTILS_TOOLS_HID2HCI bool "build hid2hci tool" depends on BR2_PACKAGE_HAS_UDEV + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # hid plugin select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID # runtime select BR2_PACKAGE_BLUEZ5_UTILS_TOOLS help Build hid2hci tool +comment "hid2hci tool needs a toolchain w/ headers >= 3.18" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 + comment "hid2hci tool needs udev /dev management" depends on !BR2_PACKAGE_HAS_UDEV diff --git a/package/bluez5_utils/S40bluetooth b/package/bluez5_utils/S40bluetoothd old mode 100755 new mode 100644 similarity index 100% rename from package/bluez5_utils/S40bluetooth rename to package/bluez5_utils/S40bluetoothd diff --git a/package/bluez5_utils/bluez5_utils.hash b/package/bluez5_utils/bluez5_utils.hash index a8f5399fa60..e0c9f3cdb93 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 9349e11e8160bb3d720835d271250d8a7424d3690f5289e6db6fe07cc66c6d76 bluez-5.63.tar.xz +sha256 2565a4d48354b576e6ad92e25b54ed66808296581c8abb80587051f9993d96d4 bluez-5.65.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 3d76cfb7dc6..f6344ce2cd2 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.63 +BLUEZ5_UTILS_VERSION = 5.65 BLUEZ5_UTILS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz BLUEZ5_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth BLUEZ5_UTILS_INSTALL_STAGING = YES @@ -13,8 +13,6 @@ 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 -# We're patching Makefile.am and configure.ac -BLUEZ5_UTILS_AUTORECONF = YES BLUEZ5_UTILS_DEPENDENCIES = \ $(if $(BR2_PACKAGE_BLUEZ5_UTILS_HEADERS),bluez5_utils-headers) \ @@ -186,8 +184,8 @@ BLUEZ5_UTILS_CONF_OPTS += --disable-systemd endif define BLUEZ5_UTILS_INSTALL_INIT_SYSV - $(INSTALL) -m 0755 -D package/bluez5_utils/S40bluetooth \ - $(TARGET_DIR)/etc/init.d/S40bluetooth + $(INSTALL) -m 0755 -D package/bluez5_utils/S40bluetoothd \ + $(TARGET_DIR)/etc/init.d/S40bluetoothd endef $(eval $(autotools-package)) diff --git a/package/boinc/boinc.hash b/package/boinc/boinc.hash index 35e59ce4153..3955cffb319 100644 --- a/package/boinc/boinc.hash +++ b/package/boinc/boinc.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 274388d9c49e488b6c8502ffc6eb605d5ceae391fb0c2fc56dbb0254d0ceb27e boinc-7.18.1.tar.gz +sha256 e577072b06f590d3230c25c94b221dba528b0938681e645bbd870778f8958077 boinc-7.20.2.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING.LESSER diff --git a/package/boinc/boinc.mk b/package/boinc/boinc.mk index 7f78c427ea9..6b76e5f5306 100644 --- a/package/boinc/boinc.mk +++ b/package/boinc/boinc.mk @@ -4,8 +4,8 @@ # ################################################################################ -BOINC_VERSION_MAJOR = 7.18 -BOINC_VERSION = $(BOINC_VERSION_MAJOR).1 +BOINC_VERSION_MAJOR = 7.20 +BOINC_VERSION = $(BOINC_VERSION_MAJOR).2 BOINC_SITE = \ $(call github,BOINC,boinc,client_release/$(BOINC_VERSION_MAJOR)/$(BOINC_VERSION)) BOINC_LICENSE = LGPL-3.0+ @@ -26,6 +26,7 @@ BOINC_CONF_ENV = \ BOINC_CONF_OPTS = \ --disable-apps \ --disable-boinczip \ + --disable-fcgi \ --disable-manager \ --disable-server \ --enable-client \ @@ -38,14 +39,12 @@ ifeq ($(BR2_PACKAGE_FREETYPE),y) BOINC_DEPENDENCIES += freetype endif -ifeq ($(BR2_PACKAGE_LIBFCGI),y) -BOINC_DEPENDENCIES += libfcgi -BOINC_CONF_OPTS += --enable-fcgi -else -BOINC_CONF_OPTS += --disable-fcgi +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +BOINC_DEPENDENCIES += libexecinfo +BOINC_MAKE_OPTS += LIBS="-lexecinfo" endif -BOINC_MAKE_OPTS = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" +BOINC_MAKE_OPTS += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" # Remove boinc-client because it is incompatible with buildroot define BOINC_REMOVE_UNNEEDED_FILE diff --git a/package/bonnie/bonnie.hash b/package/bonnie/bonnie.hash index c8118e9d625..969167a5fd9 100644 --- a/package/bonnie/bonnie.hash +++ b/package/bonnie/bonnie.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 cb3866116634bf65760b6806be4afa7e24a1cad6f145c876df8721f01ba2e2cb bonnie++-1.03e.tgz +sha256 cb3866116634bf65760b6806be4afa7e24a1cad6f145c876df8721f01ba2e2cb bonnie++-1.03e.tgz sha256 bdfeef85436885bc317fdbae3732b17a39e7910eb855553a83b4d2cf9032e773 copyright.txt diff --git a/package/boost/0001-Fix-missing-sys-stat-h-include-on-musl-based-systems.patch b/package/boost/0001-Fix-missing-sys-stat-h-include-on-musl-based-systems.patch deleted file mode 100644 index 9b86b816bff..00000000000 --- a/package/boost/0001-Fix-missing-sys-stat-h-include-on-musl-based-systems.patch +++ /dev/null @@ -1,31 +0,0 @@ -From de657e01635306085488290ea83de541ec393f8b Mon Sep 17 00:00:00 2001 -From: Leonardo Neumann -Date: Mon, 13 Dec 2021 01:07:20 -0300 -Subject: [PATCH] Fix missing sys/stat.h include on musl-based systems - -Boost 1.78.0 fails to build on musl-based systems because musl does -not include sys/stat.h by default. - -Fixes #161 ("Boost compiler error") - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/boostorg/interprocess/pull/162] ---- - include/boost/interprocess/permissions.hpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/boost/interprocess/permissions.hpp b/boost/interprocess/permissions.hpp -index ab55411e..0b21a685 100644 ---- a/boost/interprocess/permissions.hpp -+++ b/boost/interprocess/permissions.hpp -@@ -29,6 +29,10 @@ - - #include - -+#else -+ -+#include -+ - #endif - - #endif //#ifndef BOOST_INTERPROCESS_DOXYGEN_INVOKED diff --git a/package/boost/0001-Improve-modfunc-performance.patch b/package/boost/0001-Improve-modfunc-performance.patch new file mode 100644 index 00000000000..a34d6bb4d54 --- /dev/null +++ b/package/boost/0001-Improve-modfunc-performance.patch @@ -0,0 +1,551 @@ +From 825aedad557b7e3bb27614335b6ced16887103de Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ion=20Gazta=C3=B1aga?= +Date: Mon, 7 Nov 2022 00:16:44 +0100 +Subject: [PATCH] Improve "modfunc" performance Fixes #79 + ("boost/intrusive/hashtable.hpp: build failure (undeclared indentifier)") + +Backport from Boost development branch to fix issues with some architectures +(64-bit with 128-bit processing, where size_t != unsigned long). In this case, +code is enabled that causes a build failure. + +Upstream: https://github.com/boostorg/intrusive/commit/825aedad557b7e3bb27614335b6ced16887103de +Issue: https://github.com/boostorg/intrusive/issues/79 +Fixes: http://autobuild.buildroot.net/results/6cb/6cbc0672f3c5046405793d8cdc8f961d2ffb1d3e + +Signed-off-by: Andreas Ziegler +--- + include/boost/intrusive/hashtable.hpp | 235 ++++++++++++++++---------- + 1 file changed, 145 insertions(+), 90 deletions(-) + +diff --git a/include/boost/intrusive/hashtable.hpp b/include/boost/intrusive/hashtable.hpp +index b8bc877..688fb9b 100644 +--- a/boost/intrusive/hashtable.hpp ++++ b/boost/intrusive/hashtable.hpp +@@ -2,6 +2,7 @@ + // + // (C) Copyright Ion Gaztanaga 2006-2022 + // (C) Copyright 2022 Joaquin M Lopez Munoz. ++// (C) Copyright 2022 Christian Mazakas + // + // Distributed under the Boost Software License, Version 1.0. + // (See accompanying file LICENSE_1_0.txt or copy at +@@ -84,11 +85,6 @@ namespace intrusive { + + /// @cond + +-#if !defined(BOOST_NO_INT64_T)&&\ +- (defined(BOOST_HAS_INT128) || (defined(_MSC_VER) && defined(_WIN64))) +-#define BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT +-#endif +- + //We only support LLP64(Win64) or LP64(most Unix) data models + #ifdef _WIN64 //In 64 bit windows sizeof(size_t) == sizeof(unsigned long long) + # define BOOST_INTRUSIVE_SIZE_C(NUMBER) NUMBER##ULL +@@ -98,7 +94,6 @@ namespace intrusive { + # define BOOST_INTRUSIVE_64_BIT_SIZE_T (((((ULONG_MAX>>16)>>16)>>16)>>15) != 0) + #endif + +- + template + struct prime_list_holder + { +@@ -167,11 +162,11 @@ struct prime_list_holder + { return prime_list[std::ptrdiff_t(n)]; } + + template +- BOOST_INTRUSIVE_FORCEINLINE static std::size_t modfunc(std::size_t hash) { return hash % prime_list[SizeIndex]; } ++ BOOST_INTRUSIVE_FORCEINLINE static std::size_t modfunc(std::size_t hash) { return hash % SizeIndex; } + + static std::size_t(*const positions[])(std::size_t); + +- #if defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) ++ #if BOOST_INTRUSIVE_64_BIT_SIZE_T + static const uint64_t inv_sizes32[]; + static const std::size_t inv_sizes32_size; + #endif +@@ -185,17 +180,20 @@ struct prime_list_holder + BOOST_INTRUSIVE_FORCEINLINE static std::size_t size(std::size_t size_index) + { return prime_list_holder<>::size_from_index(size_index); } + +- #if defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) ++ #if BOOST_INTRUSIVE_64_BIT_SIZE_T + // https://github.com/lemire/fastmod + +- + BOOST_INTRUSIVE_FORCEINLINE static uint64_t mul128_u32(uint64_t lowbits, uint32_t d) + { + #if defined(_MSC_VER) +- return __umulh(lowbits, d); ++ return __umulh(lowbits, d); ++ #elif defined(BOOST_HAS_INT128) ++ return static_cast((uint128_type(lowbits) * d) >> 64); + #else +- __extension__ typedef unsigned __int128 ext_uint128_t; +- return (ext_uint128_t(lowbits) * d) >> 64; ++ uint64_t r1 = (lowbits & UINT32_MAX) * d; ++ uint64_t r2 = (lowbits >> 32) * d; ++ r2 += r1 >> 32; ++ return r2 >> 32; + #endif + } + +@@ -204,51 +202,67 @@ struct prime_list_holder + uint64_t lowbits = M * a; + return (uint32_t)(mul128_u32(lowbits, d)); + } +- #endif // defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) ++ #endif // BOOST_INTRUSIVE_64_BIT_SIZE_T + + BOOST_INTRUSIVE_FORCEINLINE static std::size_t position(std::size_t hash,std::size_t size_index) + { +- #if defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) && BOOST_INTRUSIVE_64_BIT_SIZE_T +- const std::size_t sizes_under_32bit = sizeof(inv_sizes32)/sizeof(inv_sizes32[0]); ++ #if BOOST_INTRUSIVE_64_BIT_SIZE_T ++ BOOST_CONSTEXPR_OR_CONST std::size_t sizes_under_32bit = sizeof(inv_sizes32)/sizeof(inv_sizes32[0]); + if(BOOST_LIKELY(size_index < sizes_under_32bit)){ + return fastmod_u32( uint32_t(hash)+uint32_t(hash>>32) + , inv_sizes32[size_index] + , uint32_t(prime_list[size_index]) ); + } + else{ +- return positions[size_index-sizes_under_32bit](hash); ++ return positions[size_index](hash); + } +- #elif defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) +- return fastmod_u32(hash, inv_sizes32[size_index], uint32_t(sizes[size_index])); + #else + return positions[size_index](hash); +- #endif // defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) ++ #endif // BOOST_INTRUSIVE_64_BIT_SIZE_T + } + }; + + template + std::size_t(* const prime_list_holder::positions[])(std::size_t) = + { +- #if !defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) +- modfunc< 0>,modfunc< 1>,modfunc< 2>,modfunc< 3>,modfunc< 4>, +- modfunc< 5>,modfunc< 6>,modfunc< 7>,modfunc< 8>,modfunc< 9>, +- modfunc<10>,modfunc<11>,modfunc<12>,modfunc<13>,modfunc<14>, +- modfunc<15>,modfunc<16>,modfunc<17>,modfunc<18>,modfunc<19>, +- modfunc<20>,modfunc<21>,modfunc<22>,modfunc<23>,modfunc<24>, +- modfunc<25>,modfunc<26>,modfunc<27>,modfunc<28>,modfunc<29>, +- modfunc<30>, +- #endif +- # if BOOST_INTRUSIVE_64_BIT_SIZE_T +- modfunc<31>,modfunc<32>,modfunc<33>,modfunc<34>, +- modfunc<35>,modfunc<36>,modfunc<37>,modfunc<38>,modfunc<39>, +- modfunc<40>,modfunc<41>,modfunc<42>,modfunc<43>,modfunc<44>, +- modfunc<45>,modfunc<46>,modfunc<47>,modfunc<48>,modfunc<49>, +- modfunc<50>,modfunc<51>,modfunc<52>,modfunc<53>,modfunc<54>, +- modfunc<55>,modfunc<56>,modfunc<57>,modfunc<58>,modfunc<59>, +- modfunc<60>,modfunc<61>,modfunc<62>,modfunc<63> +- # else +- modfunc<31> +- # endif ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, //0-30 indexes ++#if BOOST_INTRUSIVE_64_BIT_SIZE_T ++ //Taken from Boost.MultiIndex code, thanks to Joaquin M. Lopez Munoz. ++ modfunc, //<- 32 bit values stop here (index 31) ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc, ++ modfunc, modfunc //(index 63) ++#else ++ modfunc //<- 32 bit stops here (index 31) as ptrdiff_t is signed ++#endif + }; + + template +@@ -298,7 +312,7 @@ const std::size_t prime_list_holder::prime_list_size + = sizeof(prime_list) / sizeof(std::size_t); + + +-#if defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) ++#if BOOST_INTRUSIVE_64_BIT_SIZE_T + + template + const uint64_t prime_list_holder::inv_sizes32[] = { +@@ -340,7 +354,7 @@ template + const std::size_t prime_list_holder::inv_sizes32_size + = sizeof(inv_sizes32) / sizeof(uint64_t); + +-#endif // defined(BOOST_INTRUSIVE_FCA_FASTMOD_SUPPORT) ++#endif // BOOST_INTRUSIVE_64_BIT_SIZE_T + + struct prime_fmod_size : prime_list_holder<> + { +@@ -785,9 +799,9 @@ BOOST_INTRUSIVE_FORCEINLINE std::size_t hash_to_bucket_split(std::size_t hash_va + } + + template //fastmod_buckets +-BOOST_INTRUSIVE_FORCEINLINE std::size_t hash_to_bucket_split(std::size_t hash_value, std::size_t bucket_cnt, std::size_t split, detail::true_) ++BOOST_INTRUSIVE_FORCEINLINE std::size_t hash_to_bucket_split(std::size_t hash_value, std::size_t , std::size_t split, detail::true_) + { +- return prime_fmod_size::position(hash_value, split); (void)bucket_cnt; ++ return prime_fmod_size::position(hash_value, split); + } + + //!This metafunction will obtain the type of a bucket +@@ -1473,6 +1487,10 @@ struct bucket_hash_t + , bucket_plus_vtraits_t(BOOST_MOVE_BASE(bucket_plus_vtraits_t, other)) + {} + ++ template ++ BOOST_INTRUSIVE_FORCEINLINE std::size_t priv_hash(const K &k) const ++ { return this->base_t::operator()(k); } ++ + BOOST_INTRUSIVE_FORCEINLINE const hasher &priv_hasher() const + { return this->base_t::get(); } + +@@ -1747,8 +1765,17 @@ struct hashtable_size_wrapper + typedef const size_traits & size_traits_const_t; + typedef size_traits & size_traits_t; + +- BOOST_INTRUSIVE_FORCEINLINE size_traits_const_t priv_size_traits() const +- { return size_traits_; } ++ BOOST_INTRUSIVE_FORCEINLINE SizeType get_hashtable_size_wrapper_size() const ++ { return size_traits_.get_size(); } ++ ++ BOOST_INTRUSIVE_FORCEINLINE void set_hashtable_size_wrapper_size(SizeType s) ++ { size_traits_.set_size(s); } ++ ++ BOOST_INTRUSIVE_FORCEINLINE void inc_hashtable_size_wrapper_size() ++ { size_traits_.increment(); } ++ ++ BOOST_INTRUSIVE_FORCEINLINE void dec_hashtable_size_wrapper_size() ++ { size_traits_.decrement(); } + + BOOST_INTRUSIVE_FORCEINLINE size_traits_t priv_size_traits() + { return size_traits_; } +@@ -1780,7 +1807,19 @@ struct hashtable_size_wrapper + typedef size_traits size_traits_const_t; + typedef size_traits size_traits_t; + +- BOOST_INTRUSIVE_FORCEINLINE size_traits priv_size_traits() const ++ BOOST_INTRUSIVE_FORCEINLINE SizeType get_hashtable_size_wrapper_size() const ++ { return 0u; } ++ ++ BOOST_INTRUSIVE_FORCEINLINE void set_hashtable_size_wrapper_size(SizeType) ++ {} ++ ++ BOOST_INTRUSIVE_FORCEINLINE void inc_hashtable_size_wrapper_size() ++ {} ++ ++ BOOST_INTRUSIVE_FORCEINLINE void dec_hashtable_size_wrapper_size() ++ {} ++ ++ BOOST_INTRUSIVE_FORCEINLINE size_traits priv_size_traits() + { return size_traits(); } + }; + +@@ -1815,14 +1854,14 @@ struct hashdata_internal + public: + static const bool linear_buckets = 0 != (BoolFlags & hash_bool_flags::linear_buckets_pos); + typedef typename get_hashtable_size_wrapper_bucket +- ::type internal_type; +- +- typedef typename internal_type::key_equal key_equal; +- typedef typename internal_type::hasher hasher; ++ ::type split_bucket_hash_equal_t; ++ ++ typedef typename split_bucket_hash_equal_t::key_equal key_equal; ++ typedef typename split_bucket_hash_equal_t::hasher hasher; + typedef bucket_plus_vtraits + bucket_plus_vtraits_t; + typedef SizeType size_type; +- typedef typename internal_type::size_traits split_traits; ++ typedef typename split_bucket_hash_equal_t::size_traits split_traits; + typedef typename bucket_plus_vtraits_t::bucket_ptr bucket_ptr; + typedef typename bucket_plus_vtraits_t::const_value_traits_ptr const_value_traits_ptr; + typedef typename bucket_plus_vtraits_t::siterator siterator; +@@ -1866,23 +1905,20 @@ struct hashdata_internal + + hashdata_internal( const ValueTraits &val_traits, const bucket_traits &b_traits + , const hasher & h, const key_equal &e) +- : internal_type(val_traits, b_traits, h, e) ++ : split_bucket_hash_equal_t(val_traits, b_traits, h, e) + {} + + BOOST_INTRUSIVE_FORCEINLINE hashdata_internal(BOOST_RV_REF(hashdata_internal) other) +- : internal_type(BOOST_MOVE_BASE(internal_type, other)) ++ : split_bucket_hash_equal_t(BOOST_MOVE_BASE(split_bucket_hash_equal_t, other)) + {} + +- BOOST_INTRUSIVE_FORCEINLINE typename internal_type::size_traits_t priv_split_traits() +- { return this->priv_size_traits(); } +- +- BOOST_INTRUSIVE_FORCEINLINE typename internal_type::size_traits_const_t priv_split_traits() const ++ BOOST_INTRUSIVE_FORCEINLINE typename split_bucket_hash_equal_t::size_traits_t priv_split_traits() + { return this->priv_size_traits(); } + + ~hashdata_internal() + { this->priv_clear_buckets(); } + +- using internal_type::priv_clear_buckets; ++ using split_bucket_hash_equal_t::priv_clear_buckets; + + void priv_clear_buckets() + { +@@ -1907,7 +1943,17 @@ struct hashdata_internal + + //public functions + BOOST_INTRUSIVE_FORCEINLINE SizeType split_count() const BOOST_NOEXCEPT +- { return this->priv_split_traits().get_size(); } ++ { return this->split_bucket_hash_equal_t::get_hashtable_size_wrapper_size(); } ++ ++ BOOST_INTRUSIVE_FORCEINLINE void split_count(SizeType s) BOOST_NOEXCEPT ++ { this->split_bucket_hash_equal_t::set_hashtable_size_wrapper_size(s); } ++ ++ //public functions ++ BOOST_INTRUSIVE_FORCEINLINE void inc_split_count() BOOST_NOEXCEPT ++ { this->split_bucket_hash_equal_t::inc_hashtable_size_wrapper_size(); } ++ ++ BOOST_INTRUSIVE_FORCEINLINE void dec_split_count() BOOST_NOEXCEPT ++ { this->split_bucket_hash_equal_t::dec_hashtable_size_wrapper_size(); } + + BOOST_INTRUSIVE_FORCEINLINE static SizeType initial_split_from_bucket_count(SizeType bc) BOOST_NOEXCEPT + { +@@ -1983,10 +2029,7 @@ struct hashdata_internal + { return (priv_hash_to_nbucket)(hash_value, fastmod_buckets_t()); } + + BOOST_INTRUSIVE_FORCEINLINE size_type priv_hash_to_nbucket(std::size_t hash_value, detail::true_) const //fastmod_buckets_t +- { +- return static_cast(hash_to_bucket_split +- (hash_value, this->priv_usable_bucket_count(), this->split_count(), detail::true_())); +- } ++ { return static_cast(prime_fmod_size::position(hash_value, this->split_count())); } + + BOOST_INTRUSIVE_FORCEINLINE size_type priv_hash_to_nbucket(std::size_t hash_value, detail::false_) const //!fastmod_buckets_t + { +@@ -1994,7 +2037,6 @@ struct hashdata_internal + (hash_value, this->priv_usable_bucket_count(), this->split_count(), detail::false_())); + } + +- + BOOST_INTRUSIVE_FORCEINLINE iterator iterator_to(reference value, detail::false_) BOOST_NOEXCEPT + { + return iterator( siterator(this->priv_value_to_node_ptr(value)) +@@ -2083,8 +2125,8 @@ struct hashdata_internal + , this->priv_value_traits_ptr()); + } + +- using internal_type::end; +- using internal_type::cend; ++ using split_bucket_hash_equal_t::end; ++ using split_bucket_hash_equal_t::cend; + + local_iterator end(size_type n) BOOST_NOEXCEPT + { return local_iterator(this->priv_bucket_lend(n), this->priv_value_traits_ptr()); } +@@ -2322,19 +2364,32 @@ class hashtable_impl + public: + typedef insert_commit_data_impl insert_commit_data; + ++ private: + void default_init_actions() + { + this->priv_set_sentinel_bucket(); + this->priv_init_buckets_and_cache(); +- this->priv_size_traits().set_size(size_type(0)); ++ this->priv_size_count(size_type(0)); + size_type bucket_sz = this->bucket_count(); + BOOST_INTRUSIVE_INVARIANT_ASSERT(bucket_sz != 0); + //Check power of two bucket array if the option is activated + BOOST_INTRUSIVE_INVARIANT_ASSERT + (!power_2_buckets || (0 == (bucket_sz & (bucket_sz - 1)))); +- this->priv_split_traits().set_size(this->initial_split_from_bucket_count(bucket_sz)); ++ this->split_count(this->initial_split_from_bucket_count(bucket_sz)); + } + ++ BOOST_INTRUSIVE_FORCEINLINE SizeType priv_size_count() const BOOST_NOEXCEPT ++ { return this->internal_type::get_hashtable_size_wrapper_size(); } ++ ++ BOOST_INTRUSIVE_FORCEINLINE void priv_size_count(SizeType s) BOOST_NOEXCEPT ++ { this->internal_type::set_hashtable_size_wrapper_size(s); } ++ ++ BOOST_INTRUSIVE_FORCEINLINE void priv_size_inc() BOOST_NOEXCEPT ++ { this->internal_type::inc_hashtable_size_wrapper_size(); } ++ ++ BOOST_INTRUSIVE_FORCEINLINE void priv_size_dec() BOOST_NOEXCEPT ++ { this->internal_type::dec_hashtable_size_wrapper_size(); } ++ + public: + + //! Requires: buckets must not be being used by any other resource. +@@ -2403,10 +2458,10 @@ class hashtable_impl + { + this->priv_swap_cache(x); + x.priv_init_cache(); +- this->priv_size_traits().set_size(x.priv_size_traits().get_size()); +- x.priv_size_traits().set_size(size_type(0)); +- this->priv_split_traits().set_size(x.split_count()); +- x.priv_split_traits().set_size(size_type(0)); ++ this->priv_size_count(x.priv_size_count()); ++ x.priv_size_count(size_type(0)); ++ this->split_count(x.split_count()); ++ x.split_count(size_type(0)); + } + + //! Effects: Equivalent to swap. +@@ -2524,7 +2579,7 @@ class hashtable_impl + size_type size() const BOOST_NOEXCEPT + { + BOOST_IF_CONSTEXPR(constant_time_size) +- return this->priv_size_traits().get_size(); ++ return this->priv_size_count(); + else{ + std::size_t len = 0; + std::size_t bucket_cnt = this->bucket_count(); +@@ -2798,7 +2853,7 @@ class hashtable_impl + //! After a successful rehashing insert_commit_data remains valid. + iterator insert_unique_commit(reference value, const insert_commit_data &commit_data) BOOST_NOEXCEPT + { +- this->priv_size_traits().increment(); ++ this->priv_size_inc(); + node_ptr const n = this->priv_value_to_node_ptr(value); + BOOST_INTRUSIVE_SAFE_HOOK_DEFAULT_ASSERT(!safemode_or_autounlink || slist_node_algorithms::unique(n)); + node_functions_t::store_hash(n, commit_data.get_hash(), store_hash_t()); +@@ -2890,7 +2945,7 @@ class hashtable_impl + //Get the bucket number and local iterator for both iterators + const bucket_ptr bp = this->priv_get_bucket_ptr(i); + this->priv_erase_node(*bp, i.slist_it(), this->make_node_disposer(disposer), optimize_multikey_t()); +- this->priv_size_traits().decrement(); ++ this->priv_size_dec(); + this->priv_erasure_update_cache(bp); + } + +@@ -2931,7 +2986,7 @@ class hashtable_impl + size_type const num_erased = (size_type)this->priv_erase_node_range + ( before_first_local_it, first_bucket_num, last_local_it, last_bucket_num + , this->make_node_disposer(disposer), optimize_multikey_t()); +- this->priv_size_traits().set_size(size_type(this->priv_size_traits().get_size()-num_erased)); ++ this->priv_size_count(size_type(this->priv_size_count()-num_erased)); + this->priv_erasure_update_cache_range(first_bucket_num, last_bucket_num); + } + } +@@ -3001,7 +3056,7 @@ class hashtable_impl + (this->priv_value_from_siterator(it), h, key, equal_func, compare_hash_t())); + slist_node_algorithms::unlink_after_and_dispose(prev.pointed_node(), it.pointed_node(), this->make_node_disposer(disposer)); + } +- this->priv_size_traits().set_size(size_type(this->priv_size_traits().get_size()-cnt)); ++ this->priv_size_count(size_type(this->priv_size_count()-cnt)); + this->priv_erasure_update_cache(); + } + +@@ -3020,7 +3075,7 @@ class hashtable_impl + void clear() BOOST_NOEXCEPT + { + this->priv_clear_buckets_and_cache(); +- this->priv_size_traits().set_size(size_type(0)); ++ this->priv_size_count(size_type(0)); + } + + //! Requires: Disposer::operator()(pointer) shouldn't throw. +@@ -3045,7 +3100,7 @@ class hashtable_impl + --num_buckets; + slist_node_algorithms::detach_and_dispose(b->get_node_ptr(), d); + } +- this->priv_size_traits().set_size(size_type(0)); ++ this->priv_size_count(size_type(0)); + } + this->priv_init_cache(); + } +@@ -3339,7 +3394,7 @@ class hashtable_impl + //! + //! Note: the return value is in the range [0, this->bucket_count()). + BOOST_INTRUSIVE_FORCEINLINE size_type bucket(const key_type& k) const +- { return this->bucket(k, this->priv_hasher()); } ++ { return this->priv_hash_to_nbucket(this->priv_hash(k)); } + + //! Requires: "hash_func" must be a hash function that induces + //! the same hash values as the stored hasher. The difference is that +@@ -3520,7 +3575,7 @@ class hashtable_impl + if((ret = split_idx < bucket_cnt)){ + const std::size_t bucket_to_rehash = split_idx - bucket_cnt/2u; + bucket_type &old_bucket = this->priv_bucket(bucket_to_rehash); +- this->priv_split_traits().increment(); ++ this->inc_split_count(); + + //Anti-exception stuff: if an exception is thrown while + //moving elements from old_bucket to the target bucket, all moved +@@ -3553,7 +3608,7 @@ class hashtable_impl + bucket_type &target_bucket = this->priv_bucket(target_bucket_num); + bucket_type &source_bucket = this->priv_bucket(split_idx-1u); + slist_node_algorithms::transfer_after(target_bucket.get_node_ptr(), source_bucket.get_node_ptr()); +- this->priv_split_traits().decrement(); ++ this->dec_split_count(); + this->priv_insertion_update_cache(target_bucket_num); + } + return ret; +@@ -3763,8 +3818,8 @@ class hashtable_impl + ArrayDisposer rollback2(old_buckets[0], nd, old_bucket_count); + + //Put size in a safe value for rollback exception +- size_type const size_backup = this->priv_size_traits().get_size(); +- this->priv_size_traits().set_size(0); ++ size_type const size_backup = this->priv_size_count(); ++ this->priv_size_count(0); + //Put cache to safe position + this->priv_init_cache(); + this->priv_unset_sentinel_bucket(); +@@ -3826,8 +3881,8 @@ class hashtable_impl + } + } + +- this->priv_size_traits().set_size(size_backup); +- this->priv_split_traits().set_size(split); ++ this->priv_size_count(size_backup); ++ this->split_count(split); + if(&new_bucket_traits != &this->priv_bucket_traits()) + this->priv_bucket_traits() = new_bucket_traits; + this->priv_set_sentinel_bucket(); +@@ -3927,8 +3982,8 @@ class hashtable_impl + this->priv_hasher() = src.priv_hasher(); + this->priv_equal() = src.priv_equal(); + rollback.release(); +- this->priv_size_traits().set_size(src.priv_size_traits().get_size()); +- this->priv_split_traits().set_size(dst_bucket_count); ++ this->priv_size_count(src.priv_size_count()); ++ this->split_count(dst_bucket_count); + this->priv_set_cache_bucket_num(0u); + this->priv_erasure_update_cache(); + } +@@ -3946,7 +4001,7 @@ class hashtable_impl + , n, optimize_multikey_t()); + //Update cache and increment size if needed + this->priv_insertion_update_cache(bucket_num); +- this->priv_size_traits().increment(); ++ this->priv_size_inc(); + slist_node_algorithms::link_after(prev.pointed_node(), n); + return this->build_iterator(siterator(n), this->priv_bucket_ptr(bucket_num)); + } +-- +2.34.1 + diff --git a/package/boost/Config.in b/package/boost/Config.in index 33a5337096a..b99b01f22eb 100644 --- a/package/boost/Config.in +++ b/package/boost/Config.in @@ -16,40 +16,6 @@ config BR2_PACKAGE_BOOST if BR2_PACKAGE_BOOST -choice - prompt "Layout" - default BR2_PACKAGE_BOOST_LAYOUT_SYSTEM - help - Selects the layout of Boost binary names - -config BR2_PACKAGE_BOOST_LAYOUT_SYSTEM - bool "system" - help - Boost binary names do not include the Boost version number - or the name and version number of the compiler. - -config BR2_PACKAGE_BOOST_LAYOUT_TAGGED - bool "tagged" - help - Boost binary names include the encoded build properties such - as variant and threading, but do not include compiler name - and version, or Boost version. This option is useful if you - build several variants of Boost, using the same compiler. - -config BR2_PACKAGE_BOOST_LAYOUT_VERSIONED - bool "versioned" - help - Boost binary names include the Boost version number, name - and version of the compiler and encoded build properties. - -endchoice - -config BR2_PACKAGE_BOOST_LAYOUT - string - default "system" if BR2_PACKAGE_BOOST_LAYOUT_SYSTEM - default "tagged" if BR2_PACKAGE_BOOST_LAYOUT_TAGGED - default "versioned" if BR2_PACKAGE_BOOST_LAYOUT_VERSIONED - config BR2_PACKAGE_BOOST_ATOMIC bool "boost-atomic" depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS diff --git a/package/boost/boost.hash b/package/boost/boost.hash index a174e414ee4..ab54a4b2fc0 100644 --- a/package/boost/boost.hash +++ b/package/boost/boost.hash @@ -1,5 +1,5 @@ -# From https://www.boost.org/users/history/version_1_78_0.html -sha256 8681f175d4bdb26c52222665793eef08490d7758529330f98d3b29dd0735bccc boost_1_78_0.tar.bz2 +# From https://www.boost.org/users/history/version_1_80_0.html +sha256 1e19565d82e43bc59209a168f5ac899d3ba471d55c7610c677d4ccf2c9c500c0 boost_1_80_0.tar.bz2 # Locally computed sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE_1_0.txt diff --git a/package/boost/boost.mk b/package/boost/boost.mk index 032ba5c8205..bd1d3299825 100644 --- a/package/boost/boost.mk +++ b/package/boost/boost.mk @@ -4,7 +4,7 @@ # ################################################################################ -BOOST_VERSION = 1.78.0 +BOOST_VERSION = 1.80.0 BOOST_SOURCE = boost_$(subst .,_,$(BOOST_VERSION)).tar.bz2 BOOST_SITE = https://boostorg.jfrog.io/artifactory/main/release/$(BOOST_VERSION)/source BOOST_INSTALL_STAGING = YES @@ -76,7 +76,9 @@ BOOST_DEPENDENCIES += python3 endif HOST_BOOST_OPTS += --no-cmake-config toolset=gcc threading=multi \ - variant=release link=shared runtime-link=shared + variant=release link=shared runtime-link=shared -j$(PARALLEL_JOBS) -q \ + --ignore-site-config --layout=system --prefix=$(HOST_DIR) \ + --user-config=$(@D)/user-config.jam ifeq ($(BR2_MIPS_OABI32),y) BOOST_ABI = o32 @@ -90,7 +92,12 @@ BOOST_OPTS += --no-cmake-config \ toolset=gcc \ threading=multi \ abi=$(BOOST_ABI) \ - variant=$(if $(BR2_ENABLE_RUNTIME_DEBUG),debug,release) + variant=$(if $(BR2_ENABLE_RUNTIME_DEBUG),debug,release) \ + -j$(PARALLEL_JOBS) \ + -q \ + --ignore-site-config \ + --layout=system \ + --user-config=$(@D)/user-config.jam ifeq ($(BR2_sparc64),y) BOOST_OPTS += architecture=sparc instruction-set=ultrasparc @@ -119,43 +126,29 @@ endif BOOST_WITHOUT_FLAGS_COMMASEPARATED += $(subst $(space),$(comma),$(strip $(BOOST_WITHOUT_FLAGS))) BOOST_FLAGS += $(if $(BOOST_WITHOUT_FLAGS_COMMASEPARATED), --without-libraries=$(BOOST_WITHOUT_FLAGS_COMMASEPARATED)) -BOOST_LAYOUT = $(call qstrip, $(BR2_PACKAGE_BOOST_LAYOUT)) # how verbose should the build be? -BOOST_OPTS += $(if $(QUIET),-d,-d+1) -HOST_BOOST_OPTS += $(if $(QUIET),-d,-d+1) +BOOST_OPTS += $(if $(QUIET),-d0,-d+1) +HOST_BOOST_OPTS += $(if $(QUIET),-d0,-d+1) define BOOST_CONFIGURE_CMDS - (cd $(@D) && ./bootstrap.sh $(BOOST_FLAGS)) + cd $(@D) && ./bootstrap.sh $(BOOST_FLAGS) echo "using gcc : `$(TARGET_CC) -dumpversion` : $(TARGET_CXX) : \"$(BOOST_TARGET_CXXFLAGS)\" \"$(TARGET_LDFLAGS)\" ;" > $(@D)/user-config.jam - echo "" >> $(@D)/user-config.jam sed -i "s/: -O.* ;/: $(TARGET_OPTIMIZATION) ;/" $(@D)/tools/build/src/tools/gcc.jam endef define BOOST_BUILD_CMDS - (cd $(@D) && $(TARGET_MAKE_ENV) ./tools/build/src/engine/bjam -j$(PARALLEL_JOBS) -q \ - --user-config=$(@D)/user-config.jam \ - $(BOOST_OPTS) \ - --ignore-site-config \ - --layout=$(BOOST_LAYOUT)) + cd $(@D) && $(TARGET_MAKE_ENV) ./b2 $(BOOST_OPTS) endef define BOOST_INSTALL_TARGET_CMDS - (cd $(@D) && $(TARGET_MAKE_ENV) ./b2 -j$(PARALLEL_JOBS) -q \ - --user-config=$(@D)/user-config.jam \ - $(BOOST_OPTS) \ - --prefix=$(TARGET_DIR)/usr \ - --ignore-site-config \ - --layout=$(BOOST_LAYOUT) install ) + cd $(@D) && $(TARGET_MAKE_ENV) ./b2 $(BOOST_OPTS) \ + --prefix=$(TARGET_DIR)/usr install endef define BOOST_INSTALL_STAGING_CMDS - (cd $(@D) && $(TARGET_MAKE_ENV) ./tools/build/src/engine/bjam -j$(PARALLEL_JOBS) -q \ - --user-config=$(@D)/user-config.jam \ - $(BOOST_OPTS) \ - --prefix=$(STAGING_DIR)/usr \ - --ignore-site-config \ - --layout=$(BOOST_LAYOUT) install) + cd $(@D) && $(TARGET_MAKE_ENV) ./b2 $(BOOST_OPTS) \ + --prefix=$(STAGING_DIR)/usr install endef # These hooks will help us to detect missing select in Config.in @@ -177,26 +170,16 @@ endef BOOST_POST_INSTALL_TARGET_HOOKS += BOOST_CHECK_TARGET_LIBRARIES define HOST_BOOST_CONFIGURE_CMDS - (cd $(@D) && ./bootstrap.sh $(HOST_BOOST_FLAGS)) + cd $(@D) && ./bootstrap.sh $(HOST_BOOST_FLAGS) echo "using gcc : `$(HOST_CC) -dumpversion` : $(HOSTCXX) : \"$(HOST_CXXFLAGS)\" \"$(HOST_LDFLAGS)\" ;" > $(@D)/user-config.jam - echo "" >> $(@D)/user-config.jam endef define HOST_BOOST_BUILD_CMDS - (cd $(@D) && ./b2 -j$(PARALLEL_JOBS) -q \ - --user-config=$(@D)/user-config.jam \ - $(HOST_BOOST_OPTS) \ - --ignore-site-config \ - --prefix=$(HOST_DIR) ) + cd $(@D) && ./b2 $(HOST_BOOST_OPTS) endef define HOST_BOOST_INSTALL_CMDS - (cd $(@D) && ./b2 -j$(PARALLEL_JOBS) -q \ - --user-config=$(@D)/user-config.jam \ - $(HOST_BOOST_OPTS) \ - --prefix=$(HOST_DIR) \ - --ignore-site-config \ - --layout=$(BOOST_LAYOUT) install ) + cd $(@D) && ./b2 $(HOST_BOOST_OPTS) install endef $(eval $(generic-package)) diff --git a/package/bootgen/0001-Fix-build-on-machines-with-modern-flex.patch b/package/bootgen/0001-Fix-build-on-machines-with-modern-flex.patch new file mode 100644 index 00000000000..ea82f5e70cd --- /dev/null +++ b/package/bootgen/0001-Fix-build-on-machines-with-modern-flex.patch @@ -0,0 +1,133 @@ +From 7251dce3dc974c7372e7024ade3e8a455266cfd2 Mon Sep 17 00:00:00 2001 +From: Peter Korsgaard +Date: Fri, 18 Mar 2022 09:02:31 +0100 +Subject: [PATCH] Fix build on machines with modern flex + +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//"FlexLexer.h"/g' * + +Signed-off-by: Peter Korsgaard +[Submitted upstream: https://github.com/Xilinx/bootgen/pull/20] +--- + FlexLexer.h | 6 +++--- + bif.yy.cpp | 2 +- + bifscanner.h | 2 +- + cmdoptions.yy.cpp | 2 +- + cmdoptionsscanner.h | 2 +- + reginit.yy.cpp | 2 +- + reginitscanner.h | 2 +- + 7 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/FlexLexer.h b/FlexLexer.h +index b115b5d..1c0386f 100755 +--- a/FlexLexer.h ++++ b/FlexLexer.h +@@ -33,15 +33,15 @@ + // + // If you want to create multiple lexer classes, you use the -P flag + // to rename each yyFlexLexer to some other xxFlexLexer. You then +-// include in your other sources once per lexer class: ++// include "FlexLexer.h" in your other sources once per lexer class: + // + // #undef yyFlexLexer + // #define yyFlexLexer xxFlexLexer +-// #include ++// #include "FlexLexer.h" + // + // #undef yyFlexLexer + // #define yyFlexLexer zzFlexLexer +-// #include ++// #include "FlexLexer.h" + // ... + + #ifndef __FLEX_LEXER_H +diff --git a/bif.yy.cpp b/bif.yy.cpp +index 7dd0841..9e09267 100644 +--- a/bif.yy.cpp ++++ b/bif.yy.cpp +@@ -379,7 +379,7 @@ typedef unsigned char YY_CHAR; + + #define yytext_ptr yytext + +-#include ++#include "FlexLexer.h" + + int yyFlexLexer::yywrap() { return 1; } + int yyFlexLexer::yylex() +diff --git a/bifscanner.h b/bifscanner.h +index a6ec9e4..ded78da 100755 +--- a/bifscanner.h ++++ b/bifscanner.h +@@ -28,7 +28,7 @@ + #if ! defined(yyFlexLexerOnce) + #undef yyFlexLexer + #define yyFlexLexer bifFlexLexer +-#include ++#include "FlexLexer.h" + #endif + + // Override the interface for yylex since we namespaced it +diff --git a/cmdoptions.yy.cpp b/cmdoptions.yy.cpp +index 6ee80de..1acfcce 100644 +--- a/cmdoptions.yy.cpp ++++ b/cmdoptions.yy.cpp +@@ -379,7 +379,7 @@ typedef unsigned char YY_CHAR; + + #define yytext_ptr yytext + +-#include ++#include "FlexLexer.h" + + int yyFlexLexer::yywrap() { return 1; } + int yyFlexLexer::yylex() +diff --git a/cmdoptionsscanner.h b/cmdoptionsscanner.h +index a48af09..e02c1f1 100755 +--- a/cmdoptionsscanner.h ++++ b/cmdoptionsscanner.h +@@ -29,7 +29,7 @@ + + #undef yyFlexLexer + #define yyFlexLexer reginitFlexLexer +-#include ++#include "FlexLexer.h" + #endif + + // Override the interface for yylex since we namespaced it +diff --git a/reginit.yy.cpp b/reginit.yy.cpp +index 8422867..ff088f9 100644 +--- a/reginit.yy.cpp ++++ b/reginit.yy.cpp +@@ -379,7 +379,7 @@ typedef unsigned char YY_CHAR; + + #define yytext_ptr yytext + +-#include ++#include "FlexLexer.h" + + int yyFlexLexer::yywrap() { return 1; } + int yyFlexLexer::yylex() +diff --git a/reginitscanner.h b/reginitscanner.h +index 4e78af9..23177be 100755 +--- a/reginitscanner.h ++++ b/reginitscanner.h +@@ -29,7 +29,7 @@ + + #undef yyFlexLexer + #define yyFlexLexer reginitFlexLexer +-#include ++#include "FlexLexer.h" + #endif + + // Override the interface for yylex since we namespaced it +-- +2.30.2 + diff --git a/package/bootgen/Config.in.host b/package/bootgen/Config.in.host new file mode 100644 index 00000000000..0acb58dee0a --- /dev/null +++ b/package/bootgen/Config.in.host @@ -0,0 +1,10 @@ +config BR2_PACKAGE_HOST_BOOTGEN + bool "host bootgen" + help + bootgen is a tool to generate a boot.bin firmware + for Xilinx versal, zynqmp and zynq product families. + + Additional secure boot features are supported beyond + what is included with u-boot mkimage. + + https://github.com/Xilinx/bootgen diff --git a/package/bootgen/bootgen.hash b/package/bootgen/bootgen.hash new file mode 100644 index 00000000000..5d77c164f3e --- /dev/null +++ b/package/bootgen/bootgen.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 7e07c75aa3e3965c8e33faefde037877f78130451cebc2056b096db9c66acbb3 bootgen-xilinx_v2022.2.tar.gz +sha256 4da5f5eff0592e5d275f1871faf9e9a4fc0f6346027bfb777fa59d0aa6a59aa3 LICENSE diff --git a/package/bootgen/bootgen.mk b/package/bootgen/bootgen.mk new file mode 100644 index 00000000000..88bc73b604f --- /dev/null +++ b/package/bootgen/bootgen.mk @@ -0,0 +1,25 @@ +################################################################################ +# +# bootgen +# +################################################################################ + +BOOTGEN_VERSION = xilinx_v2022.2 +BOOTGEN_SITE = $(call github,Xilinx,bootgen,$(BOOTGEN_VERSION)) +HOST_BOOTGEN_DEPENDENCIES = host-openssl host-pkgconf +BOOTGEN_LICENSE = Apache-2.0 +BOOTGEN_LICENSE_FILES = LICENSE + +define HOST_BOOTGEN_BUILD_CMDS + $(MAKE) $(HOST_CONFIGURE_OPTS) \ + LIBS="`$(HOST_MAKE_ENV) $(PKG_CONFIG_HOST_BINARY) --libs libssl libcrypto`" \ + INCLUDE_USER="`$(HOST_MAKE_ENV) $(PKG_CONFIG_HOST_BINARY) --cflags libssl libcrypto`" \ + CXXFLAGS="$(HOST_CXXFLAGS) -std=c++0x" \ + -C $(@D) +endef + +define HOST_BOOTGEN_INSTALL_CMDS + $(INSTALL) -m 0755 -D $(@D)/bootgen $(HOST_DIR)/bin/bootgen +endef + +$(eval $(host-generic-package)) diff --git a/package/botan/0001-Add-superh-alias-needed-by-Debian.patch b/package/botan/0001-Add-superh-alias-needed-by-Debian.patch new file mode 100644 index 00000000000..c6236849e93 --- /dev/null +++ b/package/botan/0001-Add-superh-alias-needed-by-Debian.patch @@ -0,0 +1,22 @@ +From 454c7c04385a47d511cf8999ccff2746afbab06b Mon Sep 17 00:00:00 2001 +From: Jack Lloyd +Date: Sat, 21 Nov 2020 12:37:06 -0500 +Subject: [PATCH] Add superh alias needed by Debian + +[Retrieved from: +https://github.com/randombit/botan/commit/454c7c04385a47d511cf8999ccff2746afbab06b] +Signed-off-by: Fabrice Fontaine +--- + src/build-data/arch/superh.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/build-data/arch/superh.txt b/src/build-data/arch/superh.txt +index 6af6dbe682..8e2833a914 100644 +--- a/src/build-data/arch/superh.txt ++++ b/src/build-data/arch/superh.txt +@@ -1,4 +1,5 @@ + + + sh4 ++sh4a + diff --git a/package/botan/0001-Revert-workaround-a-miscompilation-issue-in-clang-12.patch b/package/botan/0001-Revert-workaround-a-miscompilation-issue-in-clang-12.patch deleted file mode 100644 index b43aeafe13f..00000000000 --- a/package/botan/0001-Revert-workaround-a-miscompilation-issue-in-clang-12.patch +++ /dev/null @@ -1,144 +0,0 @@ -From 372bdf0348fb86d671e73baab19daa34bd0cf73d Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 9 Nov 2021 19:01:20 +0100 -Subject: [PATCH] Revert "workaround a miscompilation issue in clang 12 - (XCode 13)" - -This reverts commit 219329f8e777af54d785ae7259f8be32a714b751. - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/randombit/botan/issues/2845] ---- - src/lib/hash/sha3/sha3.cpp | 46 ++++++----------------- - src/lib/hash/sha3/sha3_bmi2/sha3_bmi2.cpp | 46 ++++++----------------- - 2 files changed, 22 insertions(+), 70 deletions(-) - -diff --git a/src/lib/hash/sha3/sha3.cpp b/src/lib/hash/sha3/sha3.cpp -index 289e451ff..690c2b264 100644 ---- a/src/lib/hash/sha3/sha3.cpp -+++ b/src/lib/hash/sha3/sha3.cpp -@@ -11,47 +11,23 @@ - #include - #include - --#include -- - namespace Botan { - - namespace { - --// This is a workaround for a suspected bug in clang 12 (and XCode 13) --// that caused a miscompile of the SHA3 implementation for optimization --// level -O2 and higher. --// --// For details, see: https://github.com/randombit/botan/issues/2802 --#if defined(__clang__) && \ -- (( defined(__apple_build_version__) && __clang_major__ == 13) || \ -- (!defined(__apple_build_version__) && __clang_major__ == 12)) --#define BOTAN_WORKAROUND_MAYBE_INLINE __attribute__((noinline)) --#else --#define BOTAN_WORKAROUND_MAYBE_INLINE inline --#endif -- --BOTAN_WORKAROUND_MAYBE_INLINE std::tuple -- xor_CNs(const uint64_t A[25]) -- { -- return { -- A[0] ^ A[5] ^ A[10] ^ A[15] ^ A[20], -- A[1] ^ A[6] ^ A[11] ^ A[16] ^ A[21], -- A[2] ^ A[7] ^ A[12] ^ A[17] ^ A[22], -- A[3] ^ A[8] ^ A[13] ^ A[18] ^ A[23], -- A[4] ^ A[9] ^ A[14] ^ A[19] ^ A[24]}; -- } -- --#undef BOTAN_WORKAROUND_MAYBE_INLINE -- - inline void SHA3_round(uint64_t T[25], const uint64_t A[25], uint64_t RC) - { -- const auto Cs = xor_CNs(A); -- -- const uint64_t D0 = rotl<1>(std::get<0>(Cs)) ^ std::get<3>(Cs); -- const uint64_t D1 = rotl<1>(std::get<1>(Cs)) ^ std::get<4>(Cs); -- const uint64_t D2 = rotl<1>(std::get<2>(Cs)) ^ std::get<0>(Cs); -- const uint64_t D3 = rotl<1>(std::get<3>(Cs)) ^ std::get<1>(Cs); -- const uint64_t D4 = rotl<1>(std::get<4>(Cs)) ^ std::get<2>(Cs); -+ const uint64_t C0 = A[0] ^ A[5] ^ A[10] ^ A[15] ^ A[20]; -+ const uint64_t C1 = A[1] ^ A[6] ^ A[11] ^ A[16] ^ A[21]; -+ const uint64_t C2 = A[2] ^ A[7] ^ A[12] ^ A[17] ^ A[22]; -+ const uint64_t C3 = A[3] ^ A[8] ^ A[13] ^ A[18] ^ A[23]; -+ const uint64_t C4 = A[4] ^ A[9] ^ A[14] ^ A[19] ^ A[24]; -+ -+ const uint64_t D0 = rotl<1>(C0) ^ C3; -+ const uint64_t D1 = rotl<1>(C1) ^ C4; -+ const uint64_t D2 = rotl<1>(C2) ^ C0; -+ const uint64_t D3 = rotl<1>(C3) ^ C1; -+ const uint64_t D4 = rotl<1>(C4) ^ C2; - - const uint64_t B00 = A[ 0] ^ D1; - const uint64_t B01 = rotl<44>(A[ 6] ^ D2); -diff --git a/src/lib/hash/sha3/sha3_bmi2/sha3_bmi2.cpp b/src/lib/hash/sha3/sha3_bmi2/sha3_bmi2.cpp -index c7f1914a3..a9650ad9d 100644 ---- a/src/lib/hash/sha3/sha3_bmi2/sha3_bmi2.cpp -+++ b/src/lib/hash/sha3/sha3_bmi2/sha3_bmi2.cpp -@@ -8,47 +8,23 @@ - #include - #include - --#include -- - namespace Botan { - - namespace { - --// This is a workaround for a suspected bug in clang 12 (and XCode 13) --// that caused a miscompile of the SHA3 implementation for optimization --// level -O2 and higher. --// --// For details, see: https://github.com/randombit/botan/issues/2802 --#if defined(__clang__) && \ -- (( defined(__apple_build_version__) && __clang_major__ == 13) || \ -- (!defined(__apple_build_version__) && __clang_major__ == 12)) --#define BOTAN_WORKAROUND_MAYBE_INLINE __attribute__((noinline)) --#else --#define BOTAN_WORKAROUND_MAYBE_INLINE inline --#endif -- --BOTAN_WORKAROUND_MAYBE_INLINE std::tuple -- xor_CNs(const uint64_t A[25]) -- { -- return { -- A[0] ^ A[5] ^ A[10] ^ A[15] ^ A[20], -- A[1] ^ A[6] ^ A[11] ^ A[16] ^ A[21], -- A[2] ^ A[7] ^ A[12] ^ A[17] ^ A[22], -- A[3] ^ A[8] ^ A[13] ^ A[18] ^ A[23], -- A[4] ^ A[9] ^ A[14] ^ A[19] ^ A[24]}; -- } -- --#undef BOTAN_WORKAROUND_MAYBE_INLINE -- - inline void SHA3_BMI2_round(uint64_t T[25], const uint64_t A[25], uint64_t RC) - { -- const auto Cs = xor_CNs(A); -- -- const uint64_t D0 = rotl<1>(std::get<0>(Cs)) ^ std::get<3>(Cs); -- const uint64_t D1 = rotl<1>(std::get<1>(Cs)) ^ std::get<4>(Cs); -- const uint64_t D2 = rotl<1>(std::get<2>(Cs)) ^ std::get<0>(Cs); -- const uint64_t D3 = rotl<1>(std::get<3>(Cs)) ^ std::get<1>(Cs); -- const uint64_t D4 = rotl<1>(std::get<4>(Cs)) ^ std::get<2>(Cs); -+ const uint64_t C0 = A[0] ^ A[5] ^ A[10] ^ A[15] ^ A[20]; -+ const uint64_t C1 = A[1] ^ A[6] ^ A[11] ^ A[16] ^ A[21]; -+ const uint64_t C2 = A[2] ^ A[7] ^ A[12] ^ A[17] ^ A[22]; -+ const uint64_t C3 = A[3] ^ A[8] ^ A[13] ^ A[18] ^ A[23]; -+ const uint64_t C4 = A[4] ^ A[9] ^ A[14] ^ A[19] ^ A[24]; -+ -+ const uint64_t D0 = rotl<1>(C0) ^ C3; -+ const uint64_t D1 = rotl<1>(C1) ^ C4; -+ const uint64_t D2 = rotl<1>(C2) ^ C0; -+ const uint64_t D3 = rotl<1>(C3) ^ C1; -+ const uint64_t D4 = rotl<1>(C4) ^ C2; - - const uint64_t B00 = A[ 0] ^ D1; - const uint64_t B01 = rotl<44>(A[ 6] ^ D2); --- -2.33.0 - diff --git a/package/botan/0002-src-build-data-arch-superh.txt-add-sh4-eb-aeb.patch b/package/botan/0002-src-build-data-arch-superh.txt-add-sh4-eb-aeb.patch new file mode 100644 index 00000000000..aa9f3ad5bab --- /dev/null +++ b/package/botan/0002-src-build-data-arch-superh.txt-add-sh4-eb-aeb.patch @@ -0,0 +1,30 @@ +From c88897ebaf173b97068811b520a4741039f09dcd Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 20 Aug 2022 15:16:22 +0200 +Subject: [PATCH] src/build-data/arch/superh.txt: add sh4{eb,aeb} + +Fix the following build failure with sh4{eb,aeb}: + + ERROR: Unknown or unidentifiable processor "sh4aeb" + +Fixes: + - http://autobuild.buildroot.org/results/d7750b734736a66e10bc5a8ee06708041b36443a + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/randombit/botan/commit/c88897ebaf173b97068811b520a4741039f09dcd] +--- + src/build-data/arch/superh.txt | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/build-data/arch/superh.txt b/src/build-data/arch/superh.txt +index 8e2833a914..e17edb097a 100644 +--- a/src/build-data/arch/superh.txt ++++ b/src/build-data/arch/superh.txt +@@ -2,4 +2,6 @@ + + sh4 + sh4a ++sh4eb ++sh4aeb + diff --git a/package/botan/Config.in b/package/botan/Config.in index 635fe1836d3..8f7f3f5c7aa 100644 --- a/package/botan/Config.in +++ b/package/botan/Config.in @@ -20,8 +20,6 @@ config BR2_PACKAGE_BOTAN depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::future select BR2_PACKAGE_BOOST_FILESYSTEM if BR2_PACKAGE_BOOST && BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS select BR2_PACKAGE_BOOST_SYSTEM if BR2_PACKAGE_BOOST && BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS - select BR2_PACKAGE_LIBOPENSSL_ENABLE_RC4 if BR2_PACKAGE_LIBOPENSSL - select BR2_PACKAGE_LIBOPENSSL_ENABLE_RMD160 if BR2_PACKAGE_LIBOPENSSL help Botan is a crypto library for C++ diff --git a/package/botan/botan.hash b/package/botan/botan.hash index 91e1bf741a9..64da04415e8 100644 --- a/package/botan/botan.hash +++ b/package/botan/botan.hash @@ -1,4 +1,4 @@ # From https://botan.randombit.net/releases/sha256sums.txt -sha256 541a3b13f1b9d30f977c6c1ae4c7bfdfda763cda6e44de807369dce79f42307e Botan-2.18.2.tar.xz +sha256 dae047f399c5a47f087db5d3d9d9e8f11ae4985d14c928d71da1aff801802d55 Botan-2.19.3.tar.xz # Locally computed -sha256 fb7f0322d36fba55ca17d77bc203a9f09a40daa8a249b75cf8887aba36cec9d0 license.txt +sha256 472faf6d2231130382779f96de506be19296473750356449fc426ddc9cb03b50 license.txt diff --git a/package/botan/botan.mk b/package/botan/botan.mk index ebff1343b17..59fbc950b01 100644 --- a/package/botan/botan.mk +++ b/package/botan/botan.mk @@ -4,7 +4,7 @@ # ################################################################################ -BOTAN_VERSION = 2.18.2 +BOTAN_VERSION = 2.19.3 BOTAN_SOURCE = Botan-$(BOTAN_VERSION).tar.xz BOTAN_SITE = http://botan.randombit.net/releases BOTAN_LICENSE = BSD-2-Clause @@ -13,8 +13,10 @@ BOTAN_CPE_ID_VENDOR = botan_project BOTAN_INSTALL_STAGING = YES +BOTAN_DEPENDENCIES = host-python3 BOTAN_CONF_OPTS = \ --cpu=$(BR2_ARCH) \ + --disable-cc-tests \ --os=linux \ --cc=gcc \ --cc-bin="$(TARGET_CXX)" \ @@ -60,11 +62,6 @@ BOTAN_DEPENDENCIES += bzip2 BOTAN_CONF_OPTS += --with-bzip2 endif -ifeq ($(BR2_PACKAGE_OPENSSL),y) -BOTAN_DEPENDENCIES += openssl -BOTAN_CONF_OPTS += --with-openssl -endif - ifeq ($(BR2_PACKAGE_SQLITE),y) BOTAN_DEPENDENCIES += sqlite BOTAN_CONF_OPTS += --with-sqlite diff --git a/package/bpftool/Config.in b/package/bpftool/Config.in index e81d874343c..461be9e5b4f 100644 --- a/package/bpftool/Config.in +++ b/package/bpftool/Config.in @@ -1,5 +1,16 @@ +config BR2_PACKAGE_BPFTOOL_ARCH_SUPPORTS + bool + # see libbpf/src/bpf.c + default y if BR2_arc + default y if BR2_aarch64 || BR2_aarch64_be + default y if BR2_i386 || BR2_x86_64 + default y if BR2_sparc || BR2_sparc64 + default y if BR2_s390x + 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 @@ -13,6 +24,8 @@ config BR2_PACKAGE_BPFTOOL of eBPF programs and maps. comment "bpftool needs a uClibc or glibc 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 \ diff --git a/package/bpftool/bpftool.hash b/package/bpftool/bpftool.hash index 2e414b8eb80..cfd3c545158 100644 --- a/package/bpftool/bpftool.hash +++ b/package/bpftool/bpftool.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 e4ce219d3b87dd70d8dbfb8f02bd356f70c010f739f17baca1c8912199a8a72b bpftool-v6.7.0-br1.tar.gz +sha256 35ff149cab4a3ab209b0c04cab2707243ab7ee753de5f4b5678296c975cf7fe0 bpftool-v7.1.0-br1.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 87429172534..cd68d897991 100644 --- a/package/bpftool/bpftool.mk +++ b/package/bpftool/bpftool.mk @@ -4,7 +4,7 @@ # ################################################################################ -BPFTOOL_VERSION = v6.7.0 +BPFTOOL_VERSION = v7.1.0 BPFTOOL_SITE = https://github.com/libbpf/bpftool BPFTOOL_SITE_METHOD = git BPFTOOL_GIT_SUBMODULES = YES @@ -33,12 +33,12 @@ endef define BPFTOOL_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) \ - -C $(@D)/src install DESTDIR="$(TARGET_DIR)" prefix=/usr + -C $(@D)/src install-bin DESTDIR="$(TARGET_DIR)" prefix=/usr endef define HOST_BPFTOOL_INSTALL_CMDS $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \ - -C $(@D)/src install DESTDIR="$(HOST_DIR)" prefix=/usr + -C $(@D)/src install-bin DESTDIR="$(HOST_DIR)" prefix= endef $(eval $(generic-package)) diff --git a/package/brcmfmac_sdio-firmware-rpi/Config.in b/package/brcmfmac_sdio-firmware-rpi/Config.in index 73f400a2b72..cf415649720 100644 --- a/package/brcmfmac_sdio-firmware-rpi/Config.in +++ b/package/brcmfmac_sdio-firmware-rpi/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI bool "brcmfmac-sdio-firmware-rpi" - depends on BR2_arm || BR2_aarch64 help Raspberry Broadcom Bluetooth and Wifi firmware. diff --git a/package/bridge-utils/Config.in b/package/bridge-utils/Config.in index de5883f063f..2d886e2cb05 100644 --- a/package/bridge-utils/Config.in +++ b/package/bridge-utils/Config.in @@ -8,4 +8,4 @@ config BR2_PACKAGE_BRIDGE_UTILS added. Instead use the bridge command from the iproute2 package which supports more features. - https://git.kernel.org/cgit/linux/kernel/git/shemminger/bridge-utils.git/ + https://wiki.linuxfoundation.org/networking/bridge diff --git a/package/brltty/0002-shell-prologue-runProgramTerminationCommands-used-a-.patch b/package/brltty/0002-shell-prologue-runProgramTerminationCommands-used-a-.patch new file mode 100644 index 00000000000..0f81254e086 --- /dev/null +++ b/package/brltty/0002-shell-prologue-runProgramTerminationCommands-used-a-.patch @@ -0,0 +1,29 @@ +From 4503c2cbd3981ba1b50ec7ce287ab48c772b3a7f Mon Sep 17 00:00:00 2001 +From: Dave Mielke +Date: Sat, 15 Oct 2022 15:20:38 -0400 +Subject: [PATCH] shell prologue: runProgramTerminationCommands used a bash + command. (dm) + +Signed-off-by: James Hilliard +[james.hilliard1@gmail.com: backport from upstream commit +4503c2cbd3981ba1b50ec7ce287ab48c772b3a7f] +--- + brltty-prologue.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/brltty-prologue.sh b/brltty-prologue.sh +index 05b817742..6d1faf983 100644 +--- a/brltty-prologue.sh ++++ b/brltty-prologue.sh +@@ -102,7 +102,7 @@ runProgramTerminationCommands() { + while [ "${programTerminationCommandCount}" -gt 0 ] + do + set -- $(getVariable "programTerminationCommand${programTerminationCommandCount}") +- let "programTerminationCommandCount -= 1" ++ programTerminationCommandCount=$((programTerminationCommandCount - 1)) + + local process="${1}" + local directory="${2}" +-- +2.34.1 + diff --git a/package/brltty/Config.in b/package/brltty/Config.in index c728cb7e203..3527df61613 100644 --- a/package/brltty/Config.in +++ b/package/brltty/Config.in @@ -4,7 +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_BLUEZ5_UTILS_PLUGINS_HID if BR2_PACKAGE_BLUEZ5_UTILS # runtime + 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 person using a refreshable braille display. diff --git a/package/brltty/brltty.hash b/package/brltty/brltty.hash index cec074d8ce6..9fc63714bc2 100644 --- a/package/brltty/brltty.hash +++ b/package/brltty/brltty.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 bc7573b0d0ab865c36607945b64c209312405571788f3b409397726f6143eaa6 brltty-6.4.tar.xz +sha256 2f173535291ba39b5a9fc8d80c349234333d92042d95d6dd88796c98a02f316b brltty-6.5.tar.xz sha256 d80c9d084ebfb50ea1ed91bfbc2410d6ce542097a32c43b00781b83adcb8c77f LICENSE-LGPL -sha256 429be921e6bf783303a1f94cbb7f29dc4f0839e47efe38150b808f886028f4df README +sha256 c00c876cb4581a6b54fcc176f7e694896e5b52c4b015615566a787e8bc89fe69 README diff --git a/package/brltty/brltty.mk b/package/brltty/brltty.mk index 600bf596df7..dc5a38cddb1 100644 --- a/package/brltty/brltty.mk +++ b/package/brltty/brltty.mk @@ -4,7 +4,7 @@ # ################################################################################ -BRLTTY_VERSION = 6.4 +BRLTTY_VERSION = 6.5 BRLTTY_SOURCE = brltty-$(BRLTTY_VERSION).tar.xz BRLTTY_SITE = http://brltty.com/archive BRLTTY_INSTALL_STAGING_OPTS = INSTALL_ROOT=$(STAGING_DIR) install diff --git a/package/brotli/brotli.mk b/package/brotli/brotli.mk index 43c8524c0b3..ac49fe664f7 100644 --- a/package/brotli/brotli.mk +++ b/package/brotli/brotli.mk @@ -21,6 +21,12 @@ ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_68485),y) BROTLI_CFLAGS += -O0 endif +# Workaround "Error: value -1234 out of range" assembler issues +# when building with optimizations. +ifeq ($(BR2_m68k),y) +BROTLI_CFLAGS += -Os +endif + BROTLI_CONF_OPTS += -DCMAKE_C_FLAGS="$(BROTLI_CFLAGS)" $(eval $(cmake-package)) diff --git a/package/bsdiff/bsdiff.hash b/package/bsdiff/bsdiff.hash index 2c6d02f4e31..102086b9fc0 100644 --- a/package/bsdiff/bsdiff.hash +++ b/package/bsdiff/bsdiff.hash @@ -1,4 +1,4 @@ # From http://www.daemonology.net/bsdiff/: -md5 e6d812394f0e0ecc8d5df255aa1db22a bsdiff-4.3.tar.gz +md5 e6d812394f0e0ecc8d5df255aa1db22a bsdiff-4.3.tar.gz # locally computed sha256 fc0a6e634ef77dcf14bf36c7b6d1e57ba1ac5c4809073dfaacb3b5f7ab277eb7 bsdiff.c diff --git a/package/btrfs-progs/0001-btrfs-progs-include-linux-const-h-to-fix-build-with-5-12-headers.patch b/package/btrfs-progs/0001-btrfs-progs-include-linux-const-h-to-fix-build-with-5-12-headers.patch deleted file mode 100644 index b6c1a424565..00000000000 --- a/package/btrfs-progs/0001-btrfs-progs-include-linux-const-h-to-fix-build-with-5-12-headers.patch +++ /dev/null @@ -1,43 +0,0 @@ -From b28f7bd9bba6f65258da48955154794f466b4104 Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield -Date: Thu, 30 Dec 2021 15:23:59 +0200 -Subject: [PATCH] btrfs-progs: include linux/const.h to fix build with 5.12+ - headers - -btrfs-tools compile fails with mips, musl and 5.12+ headers. - -The definition of __ALIGN_KERNEL has moved in 5.12+ kernels, so we -add an explicit include of const.h to pickup the macro: - - | make: *** [Makefile:595: mkfs.btrfs] Error 1 - | make: *** Waiting for unfinished jobs.... - | libbtrfs.a(volumes.o): in function `dev_extent_search_start': - | /usr/src/debug/btrfs-tools/5.12.1-r0/git/kernel-shared/volumes.c:464: undefined reference to `__ALIGN_KERNEL' - | collect2: error: ld returned 1 exit status - -This is safe for older kernel's as well, since the header still -exists, and is valid to include. - -Signed-off-by: Bruce Ashfield -[remove invalid OE Upstream-status] -Signed-off-by: Stijn Tintel -Signed-off-by: David Sterba -[Retrieved from: -https://github.com/kdave/btrfs-progs/commit/b28f7bd9bba6f65258da48955154794f466b4104] -Signed-off-by: Fabrice Fontaine ---- - kerncompat.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/kerncompat.h b/kerncompat.h -index df167fe6c..2503d1afa 100644 ---- a/kerncompat.h -+++ b/kerncompat.h -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - #include - - #include diff --git a/package/btrfs-progs/0002-btrfs-progs-include-sys-sysinfo-h-conditionally-on-musl.patch b/package/btrfs-progs/0002-btrfs-progs-include-sys-sysinfo-h-conditionally-on-musl.patch deleted file mode 100644 index 7473fe67cbd..00000000000 --- a/package/btrfs-progs/0002-btrfs-progs-include-sys-sysinfo-h-conditionally-on-musl.patch +++ /dev/null @@ -1,49 +0,0 @@ -From a2511aaa85c8d95d12805dfdcbb5667fa3e30ba5 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 8 Jan 2022 22:44:44 +0100 -Subject: [PATCH] btrfs-progs: include sys/sysinfo.h conditionally on musl - -Make inclusion of sys/sysinfo.h conditional to avoid the following build -failure on musl: - -In file included from .../i586-buildroot-linux-musl/sysroot/usr/include/linux/kernel.h:4, - from ./kerncompat.h:31, - from common/utils.c:42: -.../i586-buildroot-linux-musl/sysroot/usr/include/linux/sysinfo.h:7:8: error: redefinition of 'struct sysinfo' - 7 | struct sysinfo { - | ^~~~~~~ -In file included from common/utils.c:27: -.../i586-buildroot-linux-musl/sysroot/usr/include/sys/sysinfo.h:10:8: note: originally defined here - 10 | struct sysinfo { - | ^~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/16f44fb9dea72a7079e8e5517e760dd79d2724cc - -The 'struct sysinfo' is defined in linux/sysinfo.h and sys/sysinfo.h, -while both must not be included at the same time. Stop including -linux/kernel.h that sometimes unconditionally includes sys/sysinfo.h and -causes the double definition for some reason. As we now include -linux/const.h directly, there's no other effective change. - -Pull-request: #433 -Signed-off-by: Fabrice Fontaine -Signed-off-by: David Sterba -[Retrieved from: -https://github.com/kdave/btrfs-progs/commit/a2511aaa85c8d95d12805dfdcbb5667fa3e30ba5] ---- - kerncompat.h | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/kerncompat.h b/kerncompat.h -index 2503d1afa..6ca1526e2 100644 ---- a/kerncompat.h -+++ b/kerncompat.h -@@ -28,7 +28,6 @@ - #include - #include - #include --#include - #include - #include - diff --git a/package/btrfs-progs/0003-btrfs-progs-kerncompat-add-local-definition-for-alignment-macros.patch b/package/btrfs-progs/0003-btrfs-progs-kerncompat-add-local-definition-for-alignment-macros.patch deleted file mode 100644 index 86c63edc307..00000000000 --- a/package/btrfs-progs/0003-btrfs-progs-kerncompat-add-local-definition-for-alignment-macros.patch +++ /dev/null @@ -1,46 +0,0 @@ -From b0cfe12c4d4b8b4ef335cdf4ddefcbdcd1b70d58 Mon Sep 17 00:00:00 2001 -From: David Sterba -Date: Thu, 13 Jan 2022 14:47:08 +0100 -Subject: [PATCH] btrfs-progs: kerncompat: add local definition for alignment - macros - -There's still problem left with compilation on musl and kernel < 5.11, -because __ALIGN_KERNEL is not defined anymore: - -../bin/ld: kernel-shared/volumes.o: in function `create_chunk': -volumes.c:(.text+0x17f8): undefined reference to `__ALIGN_KERNEL' - -Due to the entangled includes and unconditional definition of -__ALIGN_KERNEL, we can't use #ifdef in kerncompat.h to define it -eventually (as kerncompat.h is the first include). Instead add local -definitions of the macros and rename them to avoid name clashes. - -Pull-request: #433 -Signed-off-by: David Sterba -[Retrieved from: -https://github.com/kdave/btrfs-progs/commit/b0cfe12c4d4b8b4ef335cdf4ddefcbdcd1b70d58] -Signed-off-by: Fabrice Fontaine ---- - kerncompat.h | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/kerncompat.h b/kerncompat.h -index 6ca1526e2..f0a6e196e 100644 ---- a/kerncompat.h -+++ b/kerncompat.h -@@ -359,7 +359,14 @@ do { \ - - /* Alignment check */ - #define IS_ALIGNED(x, a) (((x) & ((typeof(x))(a) - 1)) == 0) --#define ALIGN(x, a) __ALIGN_KERNEL((x), (a)) -+ -+/* -+ * Alignment, copied and renamed from /usr/include/linux/const.h to work around -+ * issues caused by moving the definition in 5.12 -+ */ -+#define __ALIGN_KERNEL__(x, a) __ALIGN_KERNEL_MASK__(x, (typeof(x))(a) - 1) -+#define __ALIGN_KERNEL_MASK__(x, mask) (((x) + (mask)) & ~(mask)) -+#define ALIGN(x, a) __ALIGN_KERNEL__((x), (a)) - - static inline int is_power_of_2(unsigned long n) - { diff --git a/package/btrfs-progs/btrfs-progs.hash b/package/btrfs-progs/btrfs-progs.hash index 339eab02aa9..14eeb1ca075 100644 --- a/package/btrfs-progs/btrfs-progs.hash +++ b/package/btrfs-progs/btrfs-progs.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/sha256sums.asc -sha256 6230f8f33961bd62633d601b0d049a3c6b833c1a1a7a2f2782d0c5796e7ab920 btrfs-progs-v5.15.1.tar.xz +sha256 9e9b303a1d0fd9ceaaf204ee74c1c8fa1fd55794e223d9fe2bc62875ecbd53d2 btrfs-progs-v5.16.2.tar.xz # Locally computed sha256 0d5bf346df9e635a29dcdddf832dc5b002ca6cdc1c5c9c6c567d2a61bb0c5c15 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 libbtrfsutil/COPYING diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk index 54922df8390..9bf50ccfda7 100644 --- a/package/btrfs-progs/btrfs-progs.mk +++ b/package/btrfs-progs/btrfs-progs.mk @@ -4,7 +4,7 @@ # ################################################################################ -BTRFS_PROGS_VERSION = 5.15.1 +BTRFS_PROGS_VERSION = 5.16.2 BTRFS_PROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/kdave/btrfs-progs BTRFS_PROGS_SOURCE = btrfs-progs-v$(BTRFS_PROGS_VERSION).tar.xz BTRFS_PROGS_DEPENDENCIES = host-pkgconf lzo util-linux zlib diff --git a/package/bubblewrap/bubblewrap.hash b/package/bubblewrap/bubblewrap.hash index 88aba150cdc..0475f8882a9 100644 --- a/package/bubblewrap/bubblewrap.hash +++ b/package/bubblewrap/bubblewrap.hash @@ -1,5 +1,5 @@ -# From https://github.com/containers/bubblewrap/releases/tag/v0.5.0 -sha256 16fdaf33799d63104e347e0133f909196fe90d0c50515d010bcb422eb5a00818 bubblewrap-0.5.0.tar.xz +# From https://github.com/containers/bubblewrap/releases/tag/v0.7.0 +sha256 764ab7100bd037ea53d440d362e099d7a425966bc62d1f00ab26b8fbb882a9dc bubblewrap-0.7.0.tar.xz # Hash for license files: sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/bubblewrap/bubblewrap.mk b/package/bubblewrap/bubblewrap.mk index 5f3d95e826c..658e6e113c8 100644 --- a/package/bubblewrap/bubblewrap.mk +++ b/package/bubblewrap/bubblewrap.mk @@ -4,7 +4,7 @@ # ################################################################################ -BUBBLEWRAP_VERSION = 0.5.0 +BUBBLEWRAP_VERSION = 0.7.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 @@ -14,22 +14,25 @@ BUBBLEWRAP_LICENSE_FILES = COPYING BUBBLEWRAP_CPE_ID_VENDOR = projectatomic BUBBLEWRAP_CONF_OPTS = \ - --enable-require-userns=no \ - --disable-man \ - --disable-sudo \ - --with-priv-mode=none + -Dzsh_completion=disabled \ + -Dman=disabled \ + -Dpython=$(HOST_DIR)/bin/python \ + -Drequire_userns=false \ + -Dtests=false ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y) -BUBBLEWRAP_CONF_OPTS += --with-bash-completion-dir=/usr/share/bash-completion/completions +BUBBLEWRAP_CONF_OPTS += \ + -Dbash_completion=enabled \ + -Dbash_completion_dir=/usr/share/bash-completion/completions else -BUBBLEWRAP_CONF_OPTS += --without-bash-completion-dir +BUBBLEWRAP_CONF_OPTS += -Dbash_completion=disabled endif ifeq ($(BR2_PACKAGE_LIBSELINUX),y) -BUBBLEWRAP_CONF_OPTS += --enable-selinux +BUBBLEWRAP_CONF_OPTS += -Dselinux=enabled BUBBLEWRAP_DEPENDENCIES += libselinux else -BUBBLEWRAP_CONF_OPTS += --disable-selinux +BUBBLEWRAP_CONF_OPTS += -Dselinux=disabled endif # We need to mark bwrap as setuid, in case the kernel @@ -38,4 +41,4 @@ define BUBBLEWRAP_PERMISSIONS /usr/bin/bwrap f 1755 0 0 - - - - - endef -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/package/bustle/0001-Makefile-fix-pcap-config-call.patch b/package/bustle/0001-Makefile-fix-pcap-config-call.patch new file mode 100644 index 00000000000..b02bea641b0 --- /dev/null +++ b/package/bustle/0001-Makefile-fix-pcap-config-call.patch @@ -0,0 +1,45 @@ +From 77e2de892cd359f779c84739682431a66eb8cf31 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 8 Jan 2023 11:03:52 +0100 +Subject: [PATCH] Makefile: fix pcap-config call + +Fix the following build failure raised since libpcap version 1.10.2 and +https://github.com/the-tcpdump-group/libpcap/commit/d0cba780dc2b2bb4f3ca9427d1a0f03479f45707: + +pcap-config: Invalid command-line option pcap-config specified +Usage: pcap-config [ --help ] [ --static | --static-pcap-only ] [ --libs | --additional-libs ] +perl -nle 'm/^Version:\s+(.*)$/ and print $1' \ + bustle.cabal > dist/build/autogen/version.txt +echo '#define BUSTLE_VERSION "'`cat dist/build/autogen/version.txt`'"' > dist/build/autogen/version.h +/home/buildroot/autobuild/run/instance-2/output-1/host/bin/arm-linux-gcc -Idist/build/autogen -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 \ + -o dist/build/bustle-pcap c-sources/pcap-reader.c c-sources/pcap-monitor.c c-sources/bustle-pcap.c \ + -I/home/buildroot/autobuild/run/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/glib-2.0 -I/home/buildroot/autobuild/run/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/glib-2.0/include -I/home/buildroot/autobuild/run/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/libmount -I/home/buildroot/autobuild/run/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/blkid -I/home/buildroot/autobuild/run/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/gio-unix-2.0 -pthread -L/home/buildroot/autobuild/run/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib -lgio-2.0 -lgobject-2.0 -lglib-2.0 +/home/buildroot/autobuild/run/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /tmp/cc5SQkTV.o: in function `bustle_pcap_reader_finalize': +pcap-reader.c:(.text+0x254): undefined reference to `pcap_close' + +Fixes: + - http://autobuild.buildroot.org/results/f3dcb617488e4172e639e3bd51a93bc9822ea186 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://gitlab.freedesktop.org/bustle/bustle/-/merge_requests/21] +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 8865819..721e714 100644 +--- a/Makefile ++++ b/Makefile +@@ -2,7 +2,7 @@ CFLAGS = -g -O2 -Wall -Wunused -Waddress + DBUS_FLAGS = $(shell pkg-config --cflags --libs dbus-1) + GIO_FLAGS := $(shell pkg-config --cflags --libs 'glib-2.0 >= 2.26' gio-2.0 gio-unix-2.0) + PCAP_CONFIG ?= pcap-config +-PCAP_FLAGS := $(shell $(PCAP_CONFIG) --cflags pcap-config --libs) ++PCAP_FLAGS := $(shell $(PCAP_CONFIG) --cflags --libs) + DESTDIR = + PREFIX = /usr/local + BINDIR = $(DESTDIR)$(PREFIX)/bin +-- +2.39.0 + diff --git a/package/busybox/0003-libbb-sockaddr2str-ensure-only-printable-characters-.patch b/package/busybox/0003-libbb-sockaddr2str-ensure-only-printable-characters-.patch new file mode 100644 index 00000000000..623b2597a20 --- /dev/null +++ b/package/busybox/0003-libbb-sockaddr2str-ensure-only-printable-characters-.patch @@ -0,0 +1,42 @@ +From 9d825e854ef53ebbe0aea2f1a69f52b763104daf 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 + returned for the hostname part + +CVE: CVE-2022-28391 +Signed-off-by: Ariadne Conill +Tested-by: Radoslav Kolev +Backport from ML: http://lists.busybox.net/pipermail/busybox/2022-July/089796.html +Signed-off-by: Quentin Schulz +--- + libbb/xconnect.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/libbb/xconnect.c b/libbb/xconnect.c +index 0e0b247b8..02c061e67 100644 +--- a/libbb/xconnect.c ++++ b/libbb/xconnect.c +@@ -497,8 +497,9 @@ static char* FAST_FUNC sockaddr2str(const struct sockaddr *sa, int flags) + ); + if (rc) + return NULL; ++ /* ensure host contains only printable characters */ + if (flags & IGNORE_PORT) +- return xstrdup(host); ++ return xstrdup(printable_string(host)); + #if ENABLE_FEATURE_IPV6 + if (sa->sa_family == AF_INET6) { + if (strchr(host, ':')) /* heh, it's not a resolved hostname */ +@@ -509,7 +510,7 @@ static char* FAST_FUNC sockaddr2str(const struct sockaddr *sa, int flags) + #endif + /* For now we don't support anything else, so it has to be INET */ + /*if (sa->sa_family == AF_INET)*/ +- return xasprintf("%s:%s", host, serv); ++ return xasprintf("%s:%s", printable_string(host), serv); + /*return xstrdup(host);*/ + } + +-- +2.37.3 + 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 new file mode 100644 index 00000000000..bfa58465e73 --- /dev/null +++ b/package/busybox/0004-nslookup-sanitize-all-printed-strings-with-printable.patch @@ -0,0 +1,69 @@ +From bd463a5564a2c0618317448c3f965d389534c3df 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 + +Otherwise, terminal sequences can be injected, which enables various terminal injection +attacks from DNS results. + +CVE: CVE-2022-28391 +Signed-off-by: Ariadne Conill +Tested-by: Radoslav Kolev +Backport from ML: http://lists.busybox.net/pipermail/busybox/2022-July/089795.html +Signed-off-by: Quentin Schulz +--- + networking/nslookup.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/networking/nslookup.c b/networking/nslookup.c +index 6da97baf4..4bdcde1b8 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) + //printf("Unable to uncompress domain: %s\n", strerror(errno)); + return -1; + } +- printf(format, ns_rr_name(rr), dname); ++ printf(format, ns_rr_name(rr), printable_string(dname)); + break; + + case ns_t_mx: +@@ -422,7 +422,7 @@ static NOINLINE int parse_reply(const unsigned char *msg, size_t len) + //printf("Cannot uncompress MX domain: %s\n", strerror(errno)); + return -1; + } +- printf("%s\tmail exchanger = %d %s\n", ns_rr_name(rr), n, dname); ++ printf("%s\tmail exchanger = %d %s\n", ns_rr_name(rr), n, printable_string(dname)); + break; + + case ns_t_txt: +@@ -434,7 +434,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); +- printf("%s\ttext = \"%s\"\n", ns_rr_name(rr), dname); ++ printf("%s\ttext = \"%s\"\n", ns_rr_name(rr), printable_string(dname)); + } + break; + +@@ -454,7 +454,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), +- ns_get16(cp), ns_get16(cp + 2), ns_get16(cp + 4), dname); ++ ns_get16(cp), ns_get16(cp + 2), ns_get16(cp + 4), printable_string(dname)); + break; + + case ns_t_soa: +@@ -483,7 +483,7 @@ static NOINLINE int parse_reply(const unsigned char *msg, size_t len) + return -1; + } + +- printf("\tmail addr = %s\n", dname); ++ printf("\tmail addr = %s\n", printable_string(dname)); + cp += n; + + printf("\tserial = %lu\n", ns_get32(cp)); +-- +2.37.3 + 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 new file mode 100644 index 00000000000..4a194612b46 --- /dev/null +++ b/package/busybox/0005-seedrng-fix-for-glibc-2.24-not-providing-getrandom.patch @@ -0,0 +1,39 @@ +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/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 new file mode 100644 index 00000000000..d7298848056 --- /dev/null +++ b/package/busybox/0006-seedrng-fix-for-glibc-2.24-not-providing-random-head.patch @@ -0,0 +1,60 @@ +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/0007-seedrng-fix-getrandom-detection-for-non-glibc-libc.patch b/package/busybox/0007-seedrng-fix-getrandom-detection-for-non-glibc-libc.patch new file mode 100644 index 00000000000..140b27cae67 --- /dev/null +++ b/package/busybox/0007-seedrng-fix-getrandom-detection-for-non-glibc-libc.patch @@ -0,0 +1,124 @@ +From b2d26d449ec855602b9a88f58c2eb675de0224f2 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 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +glibc <= 2.24 does not provide getrandom(). A check for it has been +added in 200a9669fbf6f06894e4243cccc9fc11a1a6073a and fixed in +cb57abb46f06f4ede8d9ccbdaac67377fdf416cf. + +However, building with a libc other than glibc can lead to the same +problem as not every other libc has getrandom() either: + +- uClibc provides it from v1.0.2 onwards, but requires to define +_GNU_SOURCE (all versions - we already define it by default), and +stddef to be included first (when using uClibc < 1.0.35 - we already +include it through libbb.h). + +- musl libc has getrandom(), but only from version 1.1.20 onwards. As +musl does not provide __MUSL__ or version information, it's not +possible to check for it like we did for glibc. + +All of this makes it difficult (or impossible in case of musl) to +check what we need to do to have getrandom() based on each libc +versions. + +On top of that, getrandom() is also not available on older kernels. As +an example, when using a 3.10 kernel with uClibc 1.0.26, getrandom() +is declared so compiling works, but it fails at link time because +getrandom() is not defined. + +To make it easier, take a similar approach to what was done for the +crypt library: try to build a sample program to see if we have +getrandom(). To keep it compatible with different versions of +make (for reference see [1]), a variable for '#' is also introduced. + +Based on the new Makefile variable, we now either use the +libc-provided getrandom() when it's available, or use our own +implementation when it's not (like it was the case already for glibc < +2.25). + +This should fix compiling with many libc/kernel combinations. + +[1]: https://git.savannah.gnu.org/cgit/make.git/commit/?id=c6966b323811c37acedff05b576b907b06aea5f4 + +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 +--- a/Makefile.flags ++++ b/Makefile.flags +@@ -161,6 +161,18 @@ ifeq ($(RT_AVAILABLE),y) + LDLIBS += rt + endif + ++# GNU Make version 4.2.1 and earlier require number signs ('#') ++# inside function invocations to be escaped, while versions 4.3+ ++# require them to be unescaped. Use a variable for it so that it works ++# for both versions: ++C := \# ++# Not all libc versions have getrandom, so check for it: ++HAVE_GETRANDOM := $(shell printf '$Cdefine _GNU_SOURCE\n$Cinclude \n$Cinclude \nint main(void){char buf[256];\ngetrandom(buf,sizeof(buf),0);}' >bb_libtest.c; $(CC) $(CFLAGS) $(CFLAGS_busybox) -o /dev/null bb_libtest.c >/dev/null 2>&1 && echo "y"; rm bb_libtest.c) ++ ++ifeq ($(HAVE_GETRANDOM),y) ++CFLAGS += -DHAVE_GETRANDOM ++endif ++ + # libpam may use libpthread, libdl and/or libaudit. + # 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 +--- a/miscutils/seedrng.c ++++ b/miscutils/seedrng.c +@@ -44,8 +44,10 @@ + #include + #include + +-/* Fix up glibc <= 2.24 not having getrandom() */ +-#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ <= 24 ++/* Fix up some libc (e.g. glibc <= 2.24) not having getrandom() */ ++#if defined HAVE_GETRANDOM ++#include ++#else /* No getrandom */ + #include + static ssize_t getrandom(void *buffer, size_t length, unsigned flags) + { +@@ -56,8 +58,6 @@ static ssize_t getrandom(void *buffer, size_t length, unsigned flags) + return -1; + # endif + } +-#else +-#include + #endif + + /* Apparently some headers don't ship with this yet. */ +-- +2.39.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 new file mode 100644 index 00000000000..8ebb487ec6d --- /dev/null +++ b/package/busybox/0008-shell-fix-SIGWINCH-and-SIGCHLD-in-hush-interrupting-.patch @@ -0,0 +1,103 @@ +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/busybox-minimal.config b/package/busybox/busybox-minimal.config index 9eae0f51f4f..1e7ad1d357e 100644 --- a/package/busybox/busybox-minimal.config +++ b/package/busybox/busybox-minimal.config @@ -53,7 +53,7 @@ CONFIG_EXTRA_CFLAGS="" CONFIG_EXTRA_LDFLAGS="" CONFIG_EXTRA_LDLIBS="" # CONFIG_USE_PORTABLE_CODE is not set -CONFIG_STACK_OPTIMIZATION_386=y +# CONFIG_STACK_OPTIMIZATION_386 is not set CONFIG_STATIC_LIBGCC=y # @@ -1018,7 +1018,7 @@ CONFIG_UDHCP_DEBUG=9 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 # CONFIG_FEATURE_UDHCP_RFC3397 is not set # CONFIG_FEATURE_UDHCP_8021Q is not set -CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-b -R" +CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R" # # Print Utilities diff --git a/package/busybox/busybox.config b/package/busybox/busybox.config index 52cb8ffcd8e..6e8bd2799d1 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.35.0 -# Thu Jan 27 10:16:54 2022 +# Busybox version: 1.36.0 +# Tue Feb 7 12:34:02 2023 # CONFIG_HAVE_DOT_CONFIG=y @@ -53,7 +53,7 @@ CONFIG_EXTRA_CFLAGS="" CONFIG_EXTRA_LDFLAGS="" CONFIG_EXTRA_LDLIBS="" # CONFIG_USE_PORTABLE_CODE is not set -CONFIG_STACK_OPTIMIZATION_386=y +# CONFIG_STACK_OPTIMIZATION_386 is not set CONFIG_STATIC_LIBGCC=y # @@ -93,6 +93,9 @@ CONFIG_FEATURE_BUFFERS_USE_MALLOC=y # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set CONFIG_PASSWORD_MINLEN=6 CONFIG_MD5_SMALL=1 +CONFIG_SHA1_SMALL=3 +CONFIG_SHA1_HWACCEL=y +CONFIG_SHA256_HWACCEL=y CONFIG_SHA3_SMALL=1 CONFIG_FEATURE_NON_POSIX_CP=y # CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set @@ -123,6 +126,9 @@ CONFIG_LAST_SUPPORTED_WCHAR=0 # CONFIG_UNICODE_BIDI_SUPPORT is not set # CONFIG_UNICODE_NEUTRAL_TABLE is not set # CONFIG_UNICODE_PRESERVE_BROKEN is not set +# CONFIG_LOOP_CONFIGURE is not set +# CONFIG_NO_LOOP_CONFIGURE is not set +CONFIG_TRY_LOOP_CONFIGURE=y # # Applets @@ -338,6 +344,7 @@ CONFIG_FEATURE_TR_CLASSES=y CONFIG_FEATURE_TR_EQUIV=y CONFIG_TRUE=y CONFIG_TRUNCATE=y +CONFIG_TSORT=y CONFIG_TTY=y CONFIG_UNAME=y CONFIG_UNAME_OSNAME="GNU/Linux" @@ -520,7 +527,7 @@ CONFIG_FEATURE_SHADOWPASSWDS=y # CONFIG_USE_BB_PWD_GRP is not set # CONFIG_USE_BB_SHADOW is not set CONFIG_USE_BB_CRYPT=y -# CONFIG_USE_BB_CRYPT_SHA is not set +CONFIG_USE_BB_CRYPT_SHA=y # CONFIG_ADD_SHELL is not set # CONFIG_REMOVE_SHELL is not set CONFIG_ADDGROUP=y @@ -811,10 +818,10 @@ CONFIG_FEATURE_LESS_TRUNCATE=y CONFIG_FEATURE_LESS_REGEXP=y # CONFIG_FEATURE_LESS_WINCH is not set # CONFIG_FEATURE_LESS_ASK_TERMINAL is not set -# CONFIG_FEATURE_LESS_DASHCMD is not set +CONFIG_FEATURE_LESS_DASHCMD=y # CONFIG_FEATURE_LESS_LINENUMS is not set -# CONFIG_FEATURE_LESS_RAW is not set -# CONFIG_FEATURE_LESS_ENV is not set +CONFIG_FEATURE_LESS_RAW=y +CONFIG_FEATURE_LESS_ENV=y CONFIG_LSSCSI=y CONFIG_MAKEDEVS=y # CONFIG_FEATURE_MAKEDEVS_LEAF is not set @@ -831,10 +838,12 @@ CONFIG_PARTPROBE=y # CONFIG_RFKILL is not set CONFIG_RUNLEVEL=y # CONFIG_RX is not set +CONFIG_SEEDRNG=y CONFIG_SETFATTR=y CONFIG_SETSERIAL=y CONFIG_STRINGS=y CONFIG_TIME=y +CONFIG_TREE=y CONFIG_TS=y # CONFIG_TTYSIZE is not set # CONFIG_UBIATTACH is not set @@ -1007,6 +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="/usr/share/udhcpc/default.script" # CONFIG_UDHCPC6 is not set # CONFIG_FEATURE_UDHCPC6_RFC3646 is not set # CONFIG_FEATURE_UDHCPC6_RFC4704 is not set @@ -1022,7 +1032,7 @@ CONFIG_UDHCP_DEBUG=0 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 CONFIG_FEATURE_UDHCP_RFC3397=y CONFIG_FEATURE_UDHCP_8021Q=y -CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-b -R -O search" +CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-t1 -A3 -b -R -O search -O staticroutes" # # Print Utilities @@ -1141,6 +1151,7 @@ CONFIG_ASH_IDLE_TIMEOUT=y CONFIG_ASH_ECHO=y CONFIG_ASH_PRINTF=y CONFIG_ASH_TEST=y +CONFIG_ASH_SLEEP=y CONFIG_ASH_HELP=y CONFIG_ASH_GETOPTS=y CONFIG_ASH_CMDCMD=y diff --git a/package/busybox/busybox.hash b/package/busybox/busybox.hash index 2091cdaf659..6eba365ecc7 100644 --- a/package/busybox/busybox.hash +++ b/package/busybox/busybox.hash @@ -1,5 +1,5 @@ -# From https://busybox.net/downloads/busybox-1.35.0.tar.bz2.sha256 -sha256 faeeb244c35a348a334f4a59e44626ee870fb07b6884d68c10ae8bc19f83a694 busybox-1.35.0.tar.bz2 +# From https://busybox.net/downloads/busybox-1.36.1.tar.bz2.sha256 +sha256 b8cc24c9574d809e7279c3be349795c5d5ceb6fdf19ca709f80cde50e47de314 busybox-1.36.1.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 3e49de0a848..eb5e7ad9222 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -4,13 +4,17 @@ # ################################################################################ -BUSYBOX_VERSION = 1.35.0 +BUSYBOX_VERSION = 1.36.1 BUSYBOX_SITE = https://www.busybox.net/downloads BUSYBOX_SOURCE = busybox-$(BUSYBOX_VERSION).tar.bz2 BUSYBOX_LICENSE = GPL-2.0, bzip2-1.0.4 BUSYBOX_LICENSE_FILES = LICENSE archival/libarchive/bz/LICENSE BUSYBOX_CPE_ID_VENDOR = busybox +# 0003-libbb-sockaddr2str-ensure-only-printable-characters-.patch +# 0004-nslookup-sanitize-all-printed-strings-with-printable.patch +BUSYBOX_IGNORE_CVES += CVE-2022-28391 + BUSYBOX_CFLAGS = \ $(TARGET_CFLAGS) @@ -48,7 +52,7 @@ BUSYBOX_DEPENDENCIES = \ $(if $(BR2_PACKAGE_MTD),mtd) \ $(if $(BR2_PACKAGE_NET_TOOLS),net-tools) \ $(if $(BR2_PACKAGE_NETCAT),netcat) \ - $(if $(BR2_PACKAGE_NETCAT_OPENSBSD),netcat-openbsd) \ + $(if $(BR2_PACKAGE_NETCAT_OPENBSD),netcat-openbsd) \ $(if $(BR2_PACKAGE_NMAP),nmap) \ $(if $(BR2_PACKAGE_NTP),ntp) \ $(if $(BR2_PACKAGE_PCIUTILS),pciutils) \ @@ -102,6 +106,9 @@ BUSYBOX_MAKE_OPTS = \ CONFIG_PREFIX="$(TARGET_DIR)" \ SKIP_STRIP=y +# specifying BUSYBOX_CONFIG_FILE on the command-line overrides the .config +# setting. +# check-package disable Ifdef ifndef BUSYBOX_CONFIG_FILE BUSYBOX_CONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_BUSYBOX_CONFIG)) endif @@ -269,6 +276,15 @@ define BUSYBOX_INSTALL_INDIVIDUAL_BINARIES endef endif +# Disable SHA1 and SHA256 HWACCEL to avoid segfault in init +# with some x86 toolchains (mostly musl?). +ifeq ($(BR2_i386),y) +define BUSYBOX_MUSL_DISABLE_SHA_HWACCEL + $(call KCONFIG_DISABLE_OPT,CONFIG_SHA1_HWACCEL) + $(call KCONFIG_DISABLE_OPT,CONFIG_SHA256_HWACCEL) +endef +endif + # Only install our logging scripts if no other package does it. ifeq ($(BR2_PACKAGE_SYSKLOGD)$(BR2_PACKAGE_RSYSLOG)$(BR2_PACKAGE_SYSLOG_NG),) define BUSYBOX_INSTALL_LOGGING_SCRIPT @@ -357,6 +373,7 @@ endef BUSYBOX_TARGET_FINALIZE_HOOKS += BUSYBOX_INSTALL_ADD_TO_SHELLS define BUSYBOX_KCONFIG_FIXUP_CMDS + $(BUSYBOX_MUSL_DISABLE_SHA_HWACCEL) $(BUSYBOX_SET_MMU) $(BUSYBOX_PREFER_STATIC) $(BUSYBOX_SET_MDEV) diff --git a/package/bwm-ng/bwm-ng.mk b/package/bwm-ng/bwm-ng.mk index de09eafae5f..bf3ed74afcf 100644 --- a/package/bwm-ng/bwm-ng.mk +++ b/package/bwm-ng/bwm-ng.mk @@ -9,6 +9,7 @@ BWM_NG_SITE = $(call github,vgropp,bwm-ng,v$(BWM_NG_VERSION)) BWM_NG_CONF_OPTS = --with-procnetdev --with-diskstats BWM_NG_LICENSE = GPL-2.0+ BWM_NG_LICENSE_FILES = COPYING +BWM_NG_CPE_ID_VENDOR = bwm-ng_project BWM_NG_AUTORECONF = YES ifeq ($(BR2_PACKAGE_NCURSES),y) diff --git a/package/bzip2/bzip2.hash b/package/bzip2/bzip2.hash index cf66c402fc3..a451166d282 100644 --- a/package/bzip2/bzip2.hash +++ b/package/bzip2/bzip2.hash @@ -1,4 +1,4 @@ # From https://sourceware.org/pub/bzip2/sha512.sum -sha512 083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3 bzip2-1.0.8.tar.gz +sha512 083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3 bzip2-1.0.8.tar.gz # Locally calculated -sha256 c6dbbf828498be844a89eaa3b84adbab3199e342eb5cb2ed2f0d4ba7ec0f38a3 LICENSE +sha256 c6dbbf828498be844a89eaa3b84adbab3199e342eb5cb2ed2f0d4ba7ec0f38a3 LICENSE diff --git a/package/c-ares/c-ares.hash b/package/c-ares/c-ares.hash index af1f076aab0..3e1573f2cfe 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 1a7d52a8a84a9fbffb1be9133c0f6e17217d91ea5a6fa61f6b4729cda78ebbcf c-ares-1.18.1.tar.gz +sha256 321700399b72ed0e037d0074c629e7741f6b2ec2dda92956abe3e9671d3e268e c-ares-1.19.1.tar.gz # Hash for license file sha256 db4eb63fe09daebdf57d3f79b091bb5ee5070c0d761040e83264e648d307af4c LICENSE.md diff --git a/package/c-ares/c-ares.mk b/package/c-ares/c-ares.mk index 0152759ebcc..46b8acd6736 100644 --- a/package/c-ares/c-ares.mk +++ b/package/c-ares/c-ares.mk @@ -4,7 +4,7 @@ # ################################################################################ -C_ARES_VERSION = 1.18.1 +C_ARES_VERSION = 1.19.1 C_ARES_SITE = http://c-ares.haxx.se/download C_ARES_INSTALL_STAGING = YES C_ARES_CONF_OPTS = --with-random=/dev/urandom diff --git a/package/c-capnproto/Config.in b/package/c-capnproto/Config.in index 41a59d7a22e..c472128c3ff 100644 --- a/package/c-capnproto/Config.in +++ b/package/c-capnproto/Config.in @@ -18,7 +18,7 @@ config BR2_PACKAGE_C_CAPNPROTO comment "c-capnproto needs host and target gcc >= 5 w/ C++14, threads, atomic, ucontext and not gcc bug 64735" depends on BR2_USE_MMU - depends on!BR2_HOST_GCC_AT_LEAST_5 || \ + depends on !BR2_HOST_GCC_AT_LEAST_5 || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || \ !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_HAS_THREADS || \ diff --git a/package/c-icap-modules/c-icap-modules.hash b/package/c-icap-modules/c-icap-modules.hash index cc7949a0928..110ffd4de32 100644 --- a/package/c-icap-modules/c-icap-modules.hash +++ b/package/c-icap-modules/c-icap-modules.hash @@ -1,7 +1,7 @@ # From http://sourceforge.net/projects/c-icap/files/c-icap-modules/0.5.x/ -md5 2f8c174f7a5414616f5a0a976ac4a221 c_icap_modules-0.5.4.tar.gz -sha1 ec7bb138d7775895cd8b2e12adc41dbf48eba1b7 c_icap_modules-0.5.4.tar.gz +md5 ca6d5d124a4668d63affcaa5ab083e57 c_icap_modules-0.5.5.tar.gz +sha1 67be484a93fe662a7735ee06e1d34d82b54469a8 c_icap_modules-0.5.5.tar.gz # Locally calculated -sha256 87409920c66027204e9cca5f20e137b63cd12daf6dfcd85c1fa62ab2bd1c57cc c_icap_modules-0.5.4.tar.gz +sha256 6a42f1fdd8c35ad38d29f7d3c10f925471977f217086352e146cf95e45f2b5b5 c_icap_modules-0.5.5.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/c-icap-modules/c-icap-modules.mk b/package/c-icap-modules/c-icap-modules.mk index 2eaa141afe0..e9bbbdb2842 100644 --- a/package/c-icap-modules/c-icap-modules.mk +++ b/package/c-icap-modules/c-icap-modules.mk @@ -4,7 +4,7 @@ # ################################################################################ -C_ICAP_MODULES_VERSION = 0.5.4 +C_ICAP_MODULES_VERSION = 0.5.5 C_ICAP_MODULES_SOURCE = c_icap_modules-$(C_ICAP_MODULES_VERSION).tar.gz C_ICAP_MODULES_SITE = http://downloads.sourceforge.net/c-icap C_ICAP_MODULES_LICENSE = GPL-2.0+ diff --git a/package/c-icap/c-icap.hash b/package/c-icap/c-icap.hash index 6aa81c26412..9a596cf375c 100644 --- a/package/c-icap/c-icap.hash +++ b/package/c-icap/c-icap.hash @@ -1,6 +1,6 @@ # Retrieved from https://sourceforge.net/projects/c-icap/files/c-icap/0.5.x/ -md5 82fd2fba1a08a8a0cf3567fe24aa035d c_icap-0.5.7.tar.gz -sha1 3b2470e00abd1418bec3a440d3073d7a6231c4c1 c_icap-0.5.7.tar.gz +md5 c8329684588a906d10a687e84ba4a478 c_icap-0.5.10.tar.gz +sha1 2901aa19c8c4b09b700164290942290c34132076 c_icap-0.5.10.tar.gz # Locally calculated -sha256 01ef17d7999d3476fe705abc56d0da562c2f180aafe08fc1269f419cad8521a9 c_icap-0.5.7.tar.gz +sha256 541d503354907f06d1d72fa90fffd031002f0f4346150fb7b2203ad5825ae49d c_icap-0.5.10.tar.gz sha256 36b6d3fa47916943fd5fec313c584784946047ec1337a78b440e5992cb595f89 COPYING diff --git a/package/c-icap/c-icap.mk b/package/c-icap/c-icap.mk index fb66c75e61d..707069870df 100644 --- a/package/c-icap/c-icap.mk +++ b/package/c-icap/c-icap.mk @@ -4,7 +4,7 @@ # ################################################################################ -C_ICAP_VERSION = 0.5.7 +C_ICAP_VERSION = 0.5.10 C_ICAP_SOURCE = c_icap-$(C_ICAP_VERSION).tar.gz C_ICAP_SITE = http://downloads.sourceforge.net/c-icap C_ICAP_LICENSE = LGPL-2.1+ diff --git a/package/ca-certificates/0001-mozilla-certdata2pem.py-make-cryptography-module-opt.patch b/package/ca-certificates/0001-mozilla-certdata2pem.py-make-cryptography-module-opt.patch index b76c1bfd7f5..ed90c217eca 100644 --- a/package/ca-certificates/0001-mozilla-certdata2pem.py-make-cryptography-module-opt.patch +++ b/package/ca-certificates/0001-mozilla-certdata2pem.py-make-cryptography-module-opt.patch @@ -1,4 +1,4 @@ -From bf18b564122e8f976681a2398862fde1eafd84ba Mon Sep 17 00:00:00 2001 +From a4e468a2a0afa80df174831c2f422184820bb0fa Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 6 Jan 2022 23:15:00 +0100 Subject: [PATCH] mozilla/certdata2pem.py: make cryptography module optional @@ -14,38 +14,39 @@ cryptography Python module is there, we perform the check, otherwise the check is skipped. Signed-off-by: Thomas Petazzoni +[Steve: refreshed to apply on ca-certificates version 20230311] +Signed-off-by: Steve Hay --- - mozilla/certdata2pem.py | 18 ++++++++++-------- - 1 file changed, 10 insertions(+), 8 deletions(-) + mozilla/certdata2pem.py | 17 ++++++++++------- + 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/mozilla/certdata2pem.py b/mozilla/certdata2pem.py -index ede23d4..a6261f8 100644 +index 4df86a2..3a6d7dc 100644 --- a/mozilla/certdata2pem.py +++ b/mozilla/certdata2pem.py -@@ -28,9 +28,6 @@ import sys +@@ -28,8 +28,6 @@ import sys import textwrap import io -from cryptography import x509 - -- + objects = [] - # Dirty file parser. -@@ -122,11 +119,16 @@ for obj in objects: +@@ -122,11 +120,16 @@ for obj in objects: if not obj['CKA_LABEL'] in trust or not trust[obj['CKA_LABEL']]: continue -- cert = x509.load_der_x509_certificate(obj['CKA_VALUE']) -- if cert.not_valid_after < datetime.datetime.now(): +- cert = x509.load_der_x509_certificate(bytes(obj['CKA_VALUE'])) +- if cert.not_valid_after < datetime.datetime.utcnow(): - print('!'*74) - print('Trusted but expired certificate found: %s' % obj['CKA_LABEL']) - print('!'*74) + try: + from cryptography import x509 + -+ cert = x509.load_der_x509_certificate(obj['CKA_VALUE']) -+ if cert.not_valid_after < datetime.datetime.now(): ++ cert = x509.load_der_x509_certificate(bytes(obj['CKA_VALUE'])) ++ if cert.not_valid_after < datetime.datetime.utcnow(): + print('!'*74) + print('Trusted but expired certificate found: %s' % obj['CKA_LABEL']) + print('!'*74) @@ -55,5 +56,5 @@ index ede23d4..a6261f8 100644 bname = obj['CKA_LABEL'][1:-1].replace('/', '_')\ .replace(' ', '_')\ -- -2.33.1 +2.30.2 diff --git a/package/ca-certificates/ca-certificates.hash b/package/ca-certificates/ca-certificates.hash index a1675b999e7..8a5b48dd791 100644 --- a/package/ca-certificates/ca-certificates.hash +++ b/package/ca-certificates/ca-certificates.hash @@ -1,6 +1,4 @@ # hashes from: $(CA_CERTIFICATES_SITE)/ca-certificates_$(CA_CERTIFICATES_VERSION).dsc : -sha1 bce5a8fac45456dbebf256f3a812c6cd0a853e3e ca-certificates_20211016.tar.xz -sha256 2ae9b6dc5f40c25d6d7fe55e07b54f12a8967d1955d3b7b2f42ee46266eeef88 ca-certificates_20211016.tar.xz - +sha256 83de934afa186e279d1ed08ea0d73f5cf43a6fbfb5f00874b6db3711c64576f3 ca-certificates_20230311.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 0b6962ab7b8..202d0b92ac5 100644 --- a/package/ca-certificates/ca-certificates.mk +++ b/package/ca-certificates/ca-certificates.mk @@ -4,9 +4,9 @@ # ################################################################################ -CA_CERTIFICATES_VERSION = 20211016 +CA_CERTIFICATES_VERSION = 20230311 CA_CERTIFICATES_SOURCE = ca-certificates_$(CA_CERTIFICATES_VERSION).tar.xz -CA_CERTIFICATES_SITE = https://snapshot.debian.org/archive/debian/20211022T144903Z/pool/main/c/ca-certificates +CA_CERTIFICATES_SITE = https://snapshot.debian.org/archive/debian/20230317T205011Z/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/cache-calibrator/cache-calibrator.hash b/package/cache-calibrator/cache-calibrator.hash index a4b4b70cf73..cd6c63d0117 100644 --- a/package/cache-calibrator/cache-calibrator.hash +++ b/package/cache-calibrator/cache-calibrator.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2018ed8fa733155d44ceb1c0066c5cf8df7771cdf7cfca0a07b8dd9bebd9c221 calibrator.c -sha256 a853663f5b4fb3ad77bf2790ab53146f456b8d9b9ddf83b99fe28c0bdec42514 calibrator.c.license +sha256 2018ed8fa733155d44ceb1c0066c5cf8df7771cdf7cfca0a07b8dd9bebd9c221 calibrator.c +sha256 a853663f5b4fb3ad77bf2790ab53146f456b8d9b9ddf83b99fe28c0bdec42514 calibrator.c.license diff --git a/package/cage/0001-Upgrade-to-wlroots-0.15.patch b/package/cage/0001-Upgrade-to-wlroots-0.15.patch new file mode 100644 index 00000000000..a5716ede439 --- /dev/null +++ b/package/cage/0001-Upgrade-to-wlroots-0.15.patch @@ -0,0 +1,312 @@ +From e51bef3fdad649d453276717294cc6177666cf5a Mon Sep 17 00:00:00 2001 +From: Simon Ser +Date: Wed, 11 Aug 2021 11:31:14 +0200 +Subject: [PATCH] Upgrade to wlroots 0.15 + +- Update wlr_box includes to util/box.h: the wlroots header has + been moved upstream. +- Subsurface fields have been moved +- Create renderer and allocator, stop using wlr_backend_get_renderer +- Initalize output rendering + +Signed-off-by: Adrian Perez de Castro +Upstream status: https://github.com/Hjdskes/cage/commit/395189fb051ed722c7b10b6cb11caa8f6904079c +--- + cage.c | 21 +++++++++++++++++---- + meson.build | 2 +- + output.c | 5 +++++ + render.c | 26 ++++++++------------------ + server.h | 2 ++ + util.c | 2 -- + util.h | 2 +- + view.c | 5 ++--- + view.h | 2 +- + xdg_shell.c | 1 - + xwayland.c | 1 - + 11 files changed, 37 insertions(+), 32 deletions(-) + +diff --git a/cage.c b/cage.c +index 5392535..f9db7a9 100644 +--- a/cage.c ++++ b/cage.c +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -261,7 +262,6 @@ main(int argc, char *argv[]) + struct wl_event_source *sigint_source = NULL; + struct wl_event_source *sigterm_source = NULL; + struct wl_event_source *sigchld_source = NULL; +- struct wlr_renderer *renderer = NULL; + struct wlr_compositor *compositor = NULL; + struct wlr_data_device_manager *data_device_manager = NULL; + struct wlr_server_decoration_manager *server_decoration_manager = NULL; +@@ -316,8 +316,21 @@ main(int argc, char *argv[]) + goto end; + } + +- renderer = wlr_backend_get_renderer(server.backend); +- wlr_renderer_init_wl_display(renderer, server.wl_display); ++ server.renderer = wlr_renderer_autocreate(server.backend); ++ if (!server.renderer) { ++ wlr_log(WLR_ERROR, "Unable to create the wlroots renderer"); ++ ret = 1; ++ goto end; ++ } ++ ++ server.allocator = wlr_allocator_autocreate(server.backend, server.renderer); ++ if (!server.allocator) { ++ wlr_log(WLR_ERROR, "Unable to create the wlroots allocator"); ++ ret = 1; ++ goto end; ++ } ++ ++ wlr_renderer_init_wl_display(server.renderer, server.wl_display); + + wl_list_init(&server.views); + wl_list_init(&server.outputs); +@@ -329,7 +342,7 @@ main(int argc, char *argv[]) + goto end; + } + +- compositor = wlr_compositor_create(server.wl_display, renderer); ++ compositor = wlr_compositor_create(server.wl_display, server.renderer); + if (!compositor) { + wlr_log(WLR_ERROR, "Unable to create the wlroots compositor"); + ret = 1; +diff --git a/meson.build b/meson.build +index 3a84794..f2e5428 100644 +--- a/meson.build ++++ b/meson.build +@@ -34,7 +34,7 @@ if is_freebsd + ) + endif + +-wlroots = dependency('wlroots', version: '>= 0.14.0') ++wlroots = dependency('wlroots', version: '>= 0.15.0') + wayland_protos = dependency('wayland-protocols', version: '>=1.14') + wayland_server = dependency('wayland-server') + pixman = dependency('pixman-1') +diff --git a/output.c b/output.c +index d8da3b9..e8b3a22 100644 +--- a/output.c ++++ b/output.c +@@ -442,6 +442,11 @@ handle_new_output(struct wl_listener *listener, void *data) + struct cg_server *server = wl_container_of(listener, server, new_output); + struct wlr_output *wlr_output = data; + ++ if (!wlr_output_init_render(wlr_output, server->allocator, server->renderer)) { ++ wlr_log(WLR_ERROR, "Failed to initialize output rendering"); ++ return; ++ } ++ + struct cg_output *output = calloc(1, sizeof(struct cg_output)); + if (!output) { + wlr_log(WLR_ERROR, "Failed to allocate output"); +diff --git a/render.c b/render.c +index 166a088..ffa960f 100644 +--- a/render.c ++++ b/render.c +@@ -10,11 +10,11 @@ + #include + #include + #include +-#include + #include + #include + #include + #include ++#include + #include + #include + +@@ -27,8 +27,6 @@ + static void + scissor_output(struct wlr_output *output, pixman_box32_t *rect) + { +- struct wlr_renderer *renderer = wlr_backend_get_renderer(output->backend); +- + struct wlr_box box = { + .x = rect->x1, + .y = rect->y1, +@@ -41,7 +39,7 @@ scissor_output(struct wlr_output *output, pixman_box32_t *rect) + enum wl_output_transform transform = wlr_output_transform_invert(output->transform); + wlr_box_transform(&box, &box, transform, output_width, output_height); + +- wlr_renderer_scissor(renderer, &box); ++ wlr_renderer_scissor(output->renderer, &box); + } + + struct render_data { +@@ -52,8 +50,6 @@ static void + render_texture(struct wlr_output *wlr_output, pixman_region32_t *output_damage, struct wlr_texture *texture, + const struct wlr_box *box, const float matrix[static 9]) + { +- struct wlr_renderer *renderer = wlr_backend_get_renderer(wlr_output->backend); +- + pixman_region32_t damage; + pixman_region32_init(&damage); + pixman_region32_union_rect(&damage, &damage, box->x, box->y, box->width, box->height); +@@ -66,7 +62,7 @@ render_texture(struct wlr_output *wlr_output, pixman_region32_t *output_damage, + pixman_box32_t *rects = pixman_region32_rectangles(&damage, &nrects); + for (int i = 0; i < nrects; i++) { + scissor_output(wlr_output, &rects[i]); +- wlr_render_texture_with_matrix(renderer, texture, matrix, 1.0f); ++ wlr_render_texture_with_matrix(wlr_output->renderer, texture, matrix, 1.0f); + } + + damage_finish: +@@ -134,13 +130,7 @@ output_render(struct cg_output *output, pixman_region32_t *damage) + struct cg_server *server = output->server; + struct wlr_output *wlr_output = output->wlr_output; + +- struct wlr_renderer *renderer = wlr_backend_get_renderer(wlr_output->backend); +- if (!renderer) { +- wlr_log(WLR_DEBUG, "Expected the output backend to have a renderer"); +- return; +- } +- +- wlr_renderer_begin(renderer, wlr_output->width, wlr_output->height); ++ wlr_renderer_begin(server->renderer, wlr_output->width, wlr_output->height); + + if (!pixman_region32_not_empty(damage)) { + wlr_log(WLR_DEBUG, "Output isn't damaged but needs a buffer swap"); +@@ -149,7 +139,7 @@ output_render(struct cg_output *output, pixman_region32_t *damage) + + #ifdef DEBUG + if (server->debug_damage_tracking) { +- wlr_renderer_clear(renderer, (float[]){1.0f, 0.0f, 0.0f, 1.0f}); ++ wlr_renderer_clear(server->renderer, (float[]){1.0f, 0.0f, 0.0f, 1.0f}); + } + #endif + +@@ -158,7 +148,7 @@ output_render(struct cg_output *output, pixman_region32_t *damage) + pixman_box32_t *rects = pixman_region32_rectangles(damage, &nrects); + for (int i = 0; i < nrects; i++) { + scissor_output(wlr_output, &rects[i]); +- wlr_renderer_clear(renderer, color); ++ wlr_renderer_clear(server->renderer, color); + } + + // TODO: render only top view, possibly use focused view for this, see #35. +@@ -178,8 +168,8 @@ renderer_end: + /* Draw software cursor in case hardware cursors aren't + available. This is a no-op when they are. */ + wlr_output_render_software_cursors(wlr_output, damage); +- wlr_renderer_scissor(renderer, NULL); +- wlr_renderer_end(renderer); ++ wlr_renderer_scissor(server->renderer, NULL); ++ wlr_renderer_end(server->renderer); + + int output_width, output_height; + wlr_output_transformed_resolution(wlr_output, &output_width, &output_height); +diff --git a/server.h b/server.h +index 817637b..74970c5 100644 +--- a/server.h ++++ b/server.h +@@ -25,6 +25,8 @@ struct cg_server { + struct wl_display *wl_display; + struct wl_list views; + struct wlr_backend *backend; ++ struct wlr_renderer *renderer; ++ struct wlr_allocator *allocator; + + struct cg_seat *seat; + struct wlr_idle *idle; +diff --git a/util.c b/util.c +index 95de499..714c7e3 100644 +--- a/util.c ++++ b/util.c +@@ -6,8 +6,6 @@ + * See the LICENSE file accompanying this file. + */ + +-#include +- + #include "util.h" + + int +diff --git a/util.h b/util.h +index db6bc7d..b6281f3 100644 +--- a/util.h ++++ b/util.h +@@ -1,7 +1,7 @@ + #ifndef CG_UTIL_H + #define CG_UTIL_H + +-#include ++#include + + /** Apply scale to a width or height. */ + int scale_length(int length, int offset, float scale); +diff --git a/view.c b/view.c +index 3f3b0ed..33b59b4 100644 +--- a/view.c ++++ b/view.c +@@ -12,7 +12,6 @@ + #include + #include + #include +-#include + #include + #include + +@@ -235,10 +234,10 @@ view_map(struct cg_view *view, struct wlr_surface *surface) + view->wlr_surface = surface; + + struct wlr_subsurface *subsurface; +- wl_list_for_each (subsurface, &view->wlr_surface->subsurfaces_below, parent_link) { ++ wl_list_for_each (subsurface, &view->wlr_surface->current.subsurfaces_below, current.link) { + subsurface_create(view, subsurface); + } +- wl_list_for_each (subsurface, &view->wlr_surface->subsurfaces_above, parent_link) { ++ wl_list_for_each (subsurface, &view->wlr_surface->current.subsurfaces_above, current.link) { + subsurface_create(view, subsurface); + } + +diff --git a/view.h b/view.h +index cd16e42..87477d0 100644 +--- a/view.h ++++ b/view.h +@@ -5,9 +5,9 @@ + + #include + #include +-#include + #include + #include ++#include + #if CAGE_HAS_XWAYLAND + #include + #endif +diff --git a/xdg_shell.c b/xdg_shell.c +index 2e42347..d676552 100644 +--- a/xdg_shell.c ++++ b/xdg_shell.c +@@ -9,7 +9,6 @@ + #include + #include + #include +-#include + #include + #include + +diff --git a/xwayland.c b/xwayland.c +index 2aae0f9..ebd8e54 100644 +--- a/xwayland.c ++++ b/xwayland.c +@@ -9,7 +9,6 @@ + #include + #include + #include +-#include + #include + #include + +-- +2.36.0 + diff --git a/package/cage/cage.hash b/package/cage/cage.hash index 31ae25bacca..57a1c12638a 100644 --- a/package/cage/cage.hash +++ b/package/cage/cage.hash @@ -1,5 +1,5 @@ # Generated locally after checking GPG signature -sha256 dfe27fb0c7d43db72d6c82f01e2736580a0791a23ba69d7b56285d08af98ad90 cage-0.1.4.tar.gz +sha256 dfe27fb0c7d43db72d6c82f01e2736580a0791a23ba69d7b56285d08af98ad90 cage-0.1.4.tar.gz # Hashes for license files: -sha256 e117104073335dbaf78596fb1bedf89dda63c71f60f0b665947b2d369c77ecee LICENSE +sha256 e117104073335dbaf78596fb1bedf89dda63c71f60f0b665947b2d369c77ecee LICENSE diff --git a/package/cairo/0003-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch b/package/cairo/0003-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch new file mode 100644 index 00000000000..078e90fa423 --- /dev/null +++ b/package/cairo/0003-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch @@ -0,0 +1,39 @@ +From ab2c5ee21e5f3d3ee4b3f67cfcd5811a4f99c3a0 Mon Sep 17 00:00:00 2001 +From: Heiko Lewin +Date: Sun, 1 Aug 2021 11:16:03 +0000 +Subject: [PATCH] _arc_max_angle_for_tolerance_normalized: fix infinite loop + +[Retrieved from: +https://gitlab.freedesktop.org/cairo/cairo/-/commit/ab2c5ee21e5f3d3ee4b3f67cfcd5811a4f99c3a0] +Signed-off-by: Quentin Schulz +--- + src/cairo-arc.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/cairo-arc.c b/src/cairo-arc.c +index 390397bae..1c891d1a0 100644 +--- a/src/cairo-arc.c ++++ b/src/cairo-arc.c +@@ -90,16 +90,18 @@ _arc_max_angle_for_tolerance_normalized (double tolerance) + { M_PI / 11.0, 9.81410988043554039085e-09 }, + }; + int table_size = ARRAY_LENGTH (table); ++ const int max_segments = 1000; /* this value is chosen arbitrarily. this gives an error of about 1.74909e-20 */ + + for (i = 0; i < table_size; i++) + if (table[i].error < tolerance) + return table[i].angle; + + ++i; ++ + do { + angle = M_PI / i++; + error = _arc_error_normalized (angle); +- } while (error > tolerance); ++ } while (error > tolerance && i < max_segments); + + return angle; + } +-- +2.38.1 + diff --git a/package/cairo/0004-Fix-mask-usage-in-image-compositor.patch b/package/cairo/0004-Fix-mask-usage-in-image-compositor.patch new file mode 100644 index 00000000000..54a95593c5f --- /dev/null +++ b/package/cairo/0004-Fix-mask-usage-in-image-compositor.patch @@ -0,0 +1,56 @@ +From 03a820b173ed1fdef6ff14b4468f5dbc02ff59be Mon Sep 17 00:00:00 2001 +From: Heiko Lewin +Date: Tue, 15 Dec 2020 16:48:19 +0100 +Subject: [PATCH] Fix mask usage in image-compositor + +[Retrieved from +https://gitlab.freedesktop.org/cairo/cairo/-/commit/03a820b173ed1fdef6ff14b4468f5dbc02ff59be] +[Removed changes in test/ directory to remove binary diff so that the +patch can be applied by `patch` tool] +Signed-off-by: Quentin Schulz +--- + src/cairo-image-compositor.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/cairo-image-compositor.c b/src/cairo-image-compositor.c +index bbf4cf228..2352c478e 100644 +--- a/src/cairo-image-compositor.c ++++ b/src/cairo-image-compositor.c +@@ -2601,14 +2601,14 @@ _inplace_src_spans (void *abstract_renderer, int y, int h, + unsigned num_spans) + { + cairo_image_span_renderer_t *r = abstract_renderer; +- uint8_t *m; ++ uint8_t *m, *base = (uint8_t*)pixman_image_get_data(r->mask); + int x0; + + if (num_spans == 0) + return CAIRO_STATUS_SUCCESS; + + x0 = spans[0].x; +- m = r->_buf; ++ m = base; + do { + int len = spans[1].x - spans[0].x; + if (len >= r->u.composite.run_length && spans[0].coverage == 0xff) { +@@ -2646,7 +2646,7 @@ _inplace_src_spans (void *abstract_renderer, int y, int h, + spans[0].x, y, + spans[1].x - spans[0].x, h); + +- m = r->_buf; ++ m = base; + x0 = spans[1].x; + } else if (spans[0].coverage == 0x0) { + if (spans[0].x != x0) { +@@ -2675,7 +2675,7 @@ _inplace_src_spans (void *abstract_renderer, int y, int h, + #endif + } + +- m = r->_buf; ++ m = base; + x0 = spans[1].x; + } else { + *m++ = spans[0].coverage; +-- +2.38.1 + diff --git a/package/cairo/cairo.hash b/package/cairo/cairo.hash index 949ed3ffeed..3b93e24a228 100644 --- a/package/cairo/cairo.hash +++ b/package/cairo/cairo.hash @@ -1,9 +1,9 @@ # From https://www.cairographics.org/releases/cairo-1.16.0.tar.xz.sha1 -sha1 00e81842ae5e81bb0343108884eb5205be0eac14 cairo-1.16.0.tar.xz +sha1 00e81842ae5e81bb0343108884eb5205be0eac14 cairo-1.16.0.tar.xz # Calculated based on the hash above -sha256 5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331 cairo-1.16.0.tar.xz +sha256 5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331 cairo-1.16.0.tar.xz # Hash for license files: -sha256 67228a9f7c5f9b67c58f556f1be178f62da4d9e2e6285318d8c74d567255abdf COPYING -sha256 9e9e8608c4cdda51a78cc3a385f4ec9a2e4c96d5ecad74ac8bca5fca3e563b7d COPYING-LGPL-2.1 -sha256 53692a2ed6c6a2c6ec9b32dd0b820dfae91e0a1fcdf625ca9ed0bdf8705fcc4f COPYING-MPL-1.1 +sha256 67228a9f7c5f9b67c58f556f1be178f62da4d9e2e6285318d8c74d567255abdf COPYING +sha256 9e9e8608c4cdda51a78cc3a385f4ec9a2e4c96d5ecad74ac8bca5fca3e563b7d COPYING-LGPL-2.1 +sha256 53692a2ed6c6a2c6ec9b32dd0b820dfae91e0a1fcdf625ca9ed0bdf8705fcc4f COPYING-MPL-1.1 diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk index 98f270442a9..7bc8f92debe 100644 --- a/package/cairo/cairo.mk +++ b/package/cairo/cairo.mk @@ -14,20 +14,26 @@ CAIRO_INSTALL_STAGING = YES # 0002-ft-Use-FT_Done_MM_Var-instead-of-free-when-available-in-cairo_ft_apply_variation.patch CAIRO_IGNORE_CVES += CVE-2018-19876 +# 0003-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch +CAIRO_IGNORE_CVES += CVE-2019-6462 +# 0004-Fix-mask-usage-in-image-compositor.patch +CAIRO_IGNORE_CVES += CVE-2020-35492 + +CAIRO_CONF_ENV = LIBS="$(CAIRO_LIBS)" # relocation truncated to fit: R_68K_GOT16O ifeq ($(BR2_m68k_cf),y) CAIRO_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -mxgot" endif -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS_NPTL),) CAIRO_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -DCAIRO_NO_MUTEX=1" endif # cairo can use C++11 atomics when available, so we need to link with # libatomic for the architectures who need libatomic. ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -CAIRO_CONF_ENV += LIBS="-latomic" +CAIRO_LIBS += -latomic endif CAIRO_CONF_OPTS = \ @@ -81,6 +87,11 @@ else CAIRO_CONF_OPTS += --disable-ft endif +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +CAIRO_DEPENDENCIES += libexecinfo +CAIRO_LIBS += -lexecinfo +endif + ifeq ($(BR2_PACKAGE_LIBGLIB2),y) CAIRO_CONF_OPTS += --enable-gobject CAIRO_DEPENDENCIES += libglib2 diff --git a/package/cairomm/Config.in b/package/cairomm/Config.in index dae52f01f73..174f3967abd 100644 --- a/package/cairomm/Config.in +++ b/package/cairomm/Config.in @@ -1,5 +1,5 @@ config BR2_PACKAGE_CAIROMM - bool "cairomm" + bool "cairomm (latest)" depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # libsigc depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_USE_WCHAR # libglib2 @@ -11,7 +11,7 @@ config BR2_PACKAGE_CAIROMM help The cairomm package is a set of C++ bindings for Cairo. - http://www.gtkmm.org/ + https://www.cairographics.org/cairomm/ comment "cairomm needs a toolchain w/ C++, wchar, threads, gcc >= 7" depends on BR2_USE_MMU diff --git a/package/cairomm/cairomm.hash b/package/cairomm/cairomm.hash index d14a65c2d6f..254413af090 100644 --- a/package/cairomm/cairomm.hash +++ b/package/cairomm/cairomm.hash @@ -1,3 +1,6 @@ +# From https://www.cairographics.org/releases/cairomm-1.16.2.tar.xz.sha1 +sha1 c24339d5962e2bcbbea85b2fc66347e71fd3db8c cairomm-1.16.2.tar.xz + # Locally computed -sha256 bb86d855041bd46d31b03e43ea355d233de44034b39d4200725b1e0947e63e67 cairomm-1.16.1.tar.gz +sha256 6a63bf98a97dda2b0f55e34d1b5f3fb909ef8b70f9b8d382cb1ff3978e7dc13f cairomm-1.16.2.tar.xz sha256 bfe4a52dc4645385f356a8e83cc54216a293e3b6f1cb4f79f5fc0277abf937fd COPYING diff --git a/package/cairomm/cairomm.mk b/package/cairomm/cairomm.mk index 856c9d67fc2..571512878e2 100644 --- a/package/cairomm/cairomm.mk +++ b/package/cairomm/cairomm.mk @@ -4,10 +4,11 @@ # ################################################################################ -CAIROMM_VERSION = 1.16.1 +CAIROMM_VERSION = 1.16.2 CAIROMM_LICENSE = LGPL-2.0+ CAIROMM_LICENSE_FILES = COPYING -CAIROMM_SITE = https://gitlab.freedesktop.org/cairo/cairomm/-/archive/$(CAIROMM_VERSION) +CAIROMM_SOURCE = cairomm-$(CAIROMM_VERSION).tar.xz +CAIROMM_SITE = https://cairographics.org/releases CAIROMM_INSTALL_STAGING = YES CAIROMM_DEPENDENCIES = cairo libglib2 libsigc host-pkgconf CAIROMM_CONF_OPTS = -Dbuild-examples=false -Dbuild-tests=false diff --git a/package/cairomm1_14/Config.in b/package/cairomm1_14/Config.in new file mode 100644 index 00000000000..e369aa6f4ad --- /dev/null +++ b/package/cairomm1_14/Config.in @@ -0,0 +1,22 @@ +config BR2_PACKAGE_CAIROMM1_14 + bool "cairomm (1.14.x)" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + depends on BR2_USE_WCHAR # libglib2 + depends on BR2_USE_MMU # libglib2 + depends on BR2_INSTALL_LIBSTDCPP + select BR2_PACKAGE_CAIRO + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_LIBSIGC2 + help + The cairomm package is a set of C++ bindings for Cairo. + + This is the last version before the API and ABI change + introduced in 1.16.0 which requires C++17. + + https://www.cairographics.org/cairomm/ + +comment "cairomm (1.14.x) needs a toolchain w/ C++, wchar, threads, gcc >= 4.9" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_USE_WCHAR \ + || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP diff --git a/package/cairomm1_14/cairomm1_14.hash b/package/cairomm1_14/cairomm1_14.hash new file mode 100644 index 00000000000..6d58de360ab --- /dev/null +++ b/package/cairomm1_14/cairomm1_14.hash @@ -0,0 +1,6 @@ +# From https://www.cairographics.org/releases/cairomm-1.14.4.tar.xz.sha1 +sha1 a58419bb9792a2c998631704ce5671c38e0c82a1 cairomm-1.14.4.tar.xz + +# Locally computed +sha256 4749d25a2b2ef67cc0c014caaf5c87fa46792fc4b3ede186fb0fc932d2055158 cairomm-1.14.4.tar.xz +sha256 bfe4a52dc4645385f356a8e83cc54216a293e3b6f1cb4f79f5fc0277abf937fd COPYING diff --git a/package/cairomm1_14/cairomm1_14.mk b/package/cairomm1_14/cairomm1_14.mk new file mode 100644 index 00000000000..6502d34c5a4 --- /dev/null +++ b/package/cairomm1_14/cairomm1_14.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# cairomm1_14 +# +################################################################################ + +CAIROMM1_14_VERSION = 1.14.4 +CAIROMM1_14_LICENSE = LGPL-2.0+ +CAIROMM1_14_LICENSE_FILES = COPYING +CAIROMM1_14_SOURCE = cairomm-$(CAIROMM1_14_VERSION).tar.xz +CAIROMM1_14_SITE = https://cairographics.org/releases +CAIROMM1_14_INSTALL_STAGING = YES +CAIROMM1_14_DEPENDENCIES = cairo libglib2 libsigc2 host-pkgconf +CAIROMM1_14_CONF_OPTS = -Dbuild-examples=false -Dbuild-tests=false + +$(eval $(meson-package)) diff --git a/package/cantarell/cantarell.hash b/package/cantarell/cantarell.hash index 49b46340634..18e0fc2cfaa 100644 --- a/package/cantarell/cantarell.hash +++ b/package/cantarell/cantarell.hash @@ -1,4 +1,4 @@ -# From http://ftp.acc.umu.se/pub/gnome/sources/cantarell-fonts/0.0/cantarell-fonts-0.0.25.sha256sum +# From https://download.gnome.org/sources/cantarell-fonts/0.0/cantarell-fonts-0.0.25.sha256sum sha256 14a228aa0b516dfc367b434a850f955a00c57fc549cbb05348e2b150196a737f cantarell-fonts-0.0.25.tar.xz # locally computed sha256 79a9d6198c0d9192c1b0bf55bcbc404a39390bd0d8c650cf20d652c2eaa284d8 COPYING diff --git a/package/cantarell/cantarell.mk b/package/cantarell/cantarell.mk index 2769b35c1f6..59e65b25c1d 100644 --- a/package/cantarell/cantarell.mk +++ b/package/cantarell/cantarell.mk @@ -6,7 +6,7 @@ CANTARELL_VERSION_MAJOR = 0.0 CANTARELL_VERSION = $(CANTARELL_VERSION_MAJOR).25 -CANTARELL_SITE = http://ftp.gnome.org/pub/gnome/sources/cantarell-fonts/$(CANTARELL_VERSION_MAJOR) +CANTARELL_SITE = https://download.gnome.org/sources/cantarell-fonts/$(CANTARELL_VERSION_MAJOR) CANTARELL_SOURCE = cantarell-fonts-$(CANTARELL_VERSION).tar.xz CANTARELL_DEPENDENCIES = host-pkgconf CANTARELL_LICENSE = OFL-1.1 diff --git a/package/capnproto/capnproto.hash b/package/capnproto/capnproto.hash index 7fd0e6158b1..0faf69d069e 100644 --- a/package/capnproto/capnproto.hash +++ b/package/capnproto/capnproto.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 daf49f794560f715e2f4651c842aaece2d065d4216834c5c3d3254962e35b535 capnproto-0.9.1.tar.gz +sha256 e07446f56043c983e009038e69d18ff86a2924909f0b518ccf47eccf5ac03919 capnproto-0.10.3.tar.gz sha256 9564998c8d7f270a61a8b89869a8d17a9d5e3783b64027788b5e339ec8479e10 LICENSE diff --git a/package/capnproto/capnproto.mk b/package/capnproto/capnproto.mk index 7fc07043fbd..84acf5fc655 100644 --- a/package/capnproto/capnproto.mk +++ b/package/capnproto/capnproto.mk @@ -4,7 +4,7 @@ # ################################################################################ -CAPNPROTO_VERSION = 0.9.1 +CAPNPROTO_VERSION = 0.10.3 CAPNPROTO_SITE = $(call github,capnproto,capnproto,v$(CAPNPROTO_VERSION)) CAPNPROTO_LICENSE = MIT CAPNPROTO_LICENSE_FILES = LICENSE diff --git a/package/caps/caps.hash b/package/caps/caps.hash index 958f4b68be0..ed18095e839 100644 --- a/package/caps/caps.hash +++ b/package/caps/caps.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e7496c5bce05abebe3dcb635926153bbb58a9337a6e423f048d3b61d8a4f98c9 caps_0.9.26.tar.bz2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 e7496c5bce05abebe3dcb635926153bbb58a9337a6e423f048d3b61d8a4f98c9 caps_0.9.26.tar.bz2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/casync/0001-castore-fix-build-without-lzma-or-xz.patch b/package/casync/0001-castore-fix-build-without-lzma-or-xz.patch deleted file mode 100644 index a528b1244c5..00000000000 --- a/package/casync/0001-castore-fix-build-without-lzma-or-xz.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 06b667de02df34e3efa1864b4031853bd4ee010d Mon Sep 17 00:00:00 2001 -From: Yair Ben-Avraham -Date: Sun, 10 Jan 2021 06:34:58 +0100 -Subject: [PATCH] castore: fix build without lzma or xz - -castore.c unconditioanlly includes lzma.h, but lzma support if optional. -Furthermore, castore.c does not need anything from lzma.h. - -Drop the include altogether. - -Signed-off-by: Yair Ben-Avraham -[yann.morin.1998@free.fr: - - lzma.h is not needed at all - - rewrite commit log accordingly -] -Signed-off-by: Yann E. MORIN ---- - src/castore.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/castore.c b/src/castore.c -index c290dfd..b2e5320 100644 ---- a/src/castore.c -+++ b/src/castore.c -@@ -2,7 +2,6 @@ - - #include - #include --#include - #include - #include - --- -2.25.1 - diff --git a/package/casync/0002-build-don-t-install-udev-rules-without-udev-support.patch b/package/casync/0002-build-don-t-install-udev-rules-without-udev-support.patch deleted file mode 100644 index 838b065571d..00000000000 --- a/package/casync/0002-build-don-t-install-udev-rules-without-udev-support.patch +++ /dev/null @@ -1,53 +0,0 @@ -From e3f683dc3013d14bddb9f9ec5bdc31367dc51a1c Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Sun, 10 Jan 2021 10:44:39 +0100 -Subject: [PATCH] build: don't install udev rules without udev support - -Signed-off-by: Yann E. MORIN ---- - meson.build | 15 ++++++++------- - 1 file changed, 8 insertions(+), 7 deletions(-) - -diff --git a/meson.build b/meson.build -index aac7727..92be1ea 100644 ---- a/meson.build -+++ b/meson.build -@@ -151,6 +151,11 @@ conf.set10('HAVE_SELINUX', get_option('selinux')) - - if get_option('udev') - libudev = dependency('libudev') -+ udevrulesdir = get_option('udevrulesdir') -+ if udevrulesdir == '' -+ udev = dependency('udev', required : false) -+ udevrulesdir = join_paths(udev.get_pkgconfig_variable('udevdir'), 'rules.d') -+ endif - else - libudev = [] - endif -@@ -175,12 +180,6 @@ subdir('test') - - includes = include_directories('src') - --udevrulesdir = get_option('udevrulesdir') --if udevrulesdir == '' -- udev = dependency('udev', required : false) -- udevrulesdir = join_paths(udev.get_pkgconfig_variable('udevdir'), 'rules.d') --endif -- - subdir('shell-completion/bash') - subdir('doc') - -@@ -318,7 +317,9 @@ udev_rule = configure_file( - input : 'src/75-casync.rules.in', - configuration : substs) - --install_data(udev_rule, install_dir : udevrulesdir) -+if get_option('udev') -+ install_data(udev_rule, install_dir : udevrulesdir) -+endif - - ############################################################ - --- -2.25.1 - diff --git a/package/casync/casync.hash b/package/casync/casync.hash index dbb85520de4..469beb5b6c6 100644 --- a/package/casync/casync.hash +++ b/package/casync/casync.hash @@ -1,3 +1,3 @@ # sha256 locally computed -sha256 d07f43e70e3c466152033da4c55c065f815d3025234a046c2bce1cfe4ac7d273 casync-4ad9bcb94bc83ff36cfc65515107ea06a88c2dfc.tar.gz +sha256 5d58def4c5ca902b35a97178d4619b9298a35b27d5748a2cc346bd36c2e38e9c casync-0efa7abffe5fffbde8c457d3c8fafbdde0bb6e4f.tar.gz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 diff --git a/package/casync/casync.mk b/package/casync/casync.mk index bb9bd8ccac1..af010a7ece7 100644 --- a/package/casync/casync.mk +++ b/package/casync/casync.mk @@ -4,7 +4,7 @@ # ################################################################################ -CASYNC_VERSION = 4ad9bcb94bc83ff36cfc65515107ea06a88c2dfc +CASYNC_VERSION = 0efa7abffe5fffbde8c457d3c8fafbdde0bb6e4f CASYNC_SITE = $(call github,systemd,casync,$(CASYNC_VERSION)) CASYNC_LICENSE = LGPL-2.1+ CASYNC_LICENSE_FILES = LICENSE.LGPL2.1 diff --git a/package/catatonit/0001-configure.ac-call-AM_INIT_AUTOMAKE-only-once.patch b/package/catatonit/0001-configure.ac-call-AM_INIT_AUTOMAKE-only-once.patch new file mode 100644 index 00000000000..b978a827a1d --- /dev/null +++ b/package/catatonit/0001-configure.ac-call-AM_INIT_AUTOMAKE-only-once.patch @@ -0,0 +1,41 @@ +From 99bb9048f532257f3a2c3856cfa19fe957ab6cec Mon Sep 17 00:00:00 2001 +From: Antonio Terceiro +Date: Thu, 4 Nov 2021 07:37:13 -0300 +Subject: [PATCH] configure.ac: call AM_INIT_AUTOMAKE only once + +That second call seems to be there since the beginning, and autoconf +2.69 was fine with it. autoconf 2.71 doesn't allow it anymore: + + $ ./autogen.sh + autoreconf: export WARNINGS= + autoreconf: Entering directory '.' + autoreconf: configure.ac: not using Gettext + autoreconf: running: aclocal --force + configure.ac:34: error: AM_INIT_AUTOMAKE expanded multiple times + /usr/share/aclocal-1.16/init.m4:29: AM_INIT_AUTOMAKE is expanded from... + configure.ac:19: the top level + /usr/share/aclocal-1.16/init.m4:29: AM_INIT_AUTOMAKE is expanded from... + configure.ac:34: the top level + autom4te: error: /usr/bin/m4 failed with exit status: 1 + aclocal: error: /usr/bin/autom4te failed with exit status: 1 + autoreconf: error: aclocal failed with exit status: 1 + +Signed-off-by: Antonio Terceiro +Upstream: https://github.com/openSUSE/catatonit/commit/99bb9048f532257f3a2c3856cfa19fe957ab6cec +Signed-off-by: Christian Stewart +--- + configure.ac | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 12c9186..94c5c84 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -31,4 +31,3 @@ AC_FUNC_FORK + + AC_CONFIG_FILES([Makefile config.h]) + AC_OUTPUT +-AM_INIT_AUTOMAKE +-- +2.37.2 + diff --git a/package/catatonit/0002-fix-build-with-kernel-5.9.patch b/package/catatonit/0002-fix-build-with-kernel-5.9.patch new file mode 100644 index 00000000000..a4c66389dbc --- /dev/null +++ b/package/catatonit/0002-fix-build-with-kernel-5.9.patch @@ -0,0 +1,52 @@ +From 1fefcbffe4ade02d625bf058a7c07aeaf9fa7a2f Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 1 Nov 2022 14:16:01 +0100 +Subject: [PATCH] fix build with kernel < 5.9 + +linux/close_range.h is only available since kernel 5.9 and +https://github.com/torvalds/linux/commit/60997c3d45d9a67daf01c56d805ae4fec37e0bd8 +resulting in the following build failure: + +catatonit.c:39:11: fatal error: linux/close_range.h: No such file or directory + 39 | # include + | ^~~~~~~~~~~~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/ed9a847905083175c7fcb2f2df28f9ac5b9c3313 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/openSUSE/catatonit/pull/24] +--- + catatonit.c | 2 +- + configure.ac | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/catatonit.c b/catatonit.c +index a38263a..474c525 100644 +--- a/catatonit.c ++++ b/catatonit.c +@@ -35,7 +35,7 @@ + #include + #include + +-#ifdef HAVE_CLOSE_RANGE ++#ifdef HAVE_LINUX_CLOSE_RANGE_H + # include + #else + # include +diff --git a/configure.ac b/configure.ac +index 94c5c84..a746ea1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -22,7 +22,7 @@ LT_PREREQ([2.4.2]) + LT_INIT([disable-shared]) + + AC_CHECK_HEADERS([errno.h fcntl.h signal.h stdarg.h stdio.h stdlib.h unistd.h]) +-AC_CHECK_HEADERS([sys/prctl.h sys/signalfd.h sys/stat.h sys/types.h sys/wait.h]) ++AC_CHECK_HEADERS([linux/close_range.h sys/prctl.h sys/signalfd.h sys/stat.h sys/types.h sys/wait.h]) + + AC_CHECK_FUNCS([close_range]) + +-- +2.35.1 + diff --git a/package/catatonit/Config.in b/package/catatonit/Config.in new file mode 100644 index 00000000000..2bd3ab67172 --- /dev/null +++ b/package/catatonit/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_CATATONIT + bool "catatonit" + depends on BR2_USE_MMU + help + catatonit is a simple but valid init binary to act as + PID 1 for containers. + + https://github.com/openSUSE/catatonit diff --git a/package/catatonit/catatonit.hash b/package/catatonit/catatonit.hash new file mode 100644 index 00000000000..9b7420cdb77 --- /dev/null +++ b/package/catatonit/catatonit.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 e22bc72ebc23762dad8f5d2ed9d5ab1aaad567bdd54422f1d1da775277a93296 catatonit-0.1.7.tar.gz +sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING diff --git a/package/catatonit/catatonit.mk b/package/catatonit/catatonit.mk new file mode 100644 index 00000000000..3dd58eff1d4 --- /dev/null +++ b/package/catatonit/catatonit.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# catatonit +# +################################################################################ + +CATATONIT_VERSION = 0.1.7 +CATATONIT_SITE = $(call github,openSUSE,catatonit,v$(CATATONIT_VERSION)) +CATATONIT_LICENSE = GPL-3.0+ +CATATONIT_LICENSE_FILES = COPYING + +CATATONIT_AUTORECONF = YES + +$(eval $(autotools-package)) diff --git a/package/catch2/Config.in b/package/catch2/Config.in new file mode 100644 index 00000000000..40d2d12434d --- /dev/null +++ b/package/catch2/Config.in @@ -0,0 +1,28 @@ +config BR2_PACKAGE_CATCH2 + bool "catch2" + 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_USE_MMU # fork() + help + Catch2 is mainly a unit testing framework for C++, but it + also provides basic micro-benchmarking features, and simple + BDD macros. + + Catch2's main advantage is that using it is both simple and + natural. Tests autoregister themselves and do not have to + be named with valid identifiers, assertions look like + normal C++ code, and sections provide a nice way to share + set-up and tear-down code in tests. + + This package allows running testsuites on the target which + might be advantageous in certain cases. + + https://github.com/catchorg/Catch2 + +comment "catch2 needs a toolchain w/ C++, wchar, threads, gcc >= 5" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 diff --git a/package/catch2/catch2.hash b/package/catch2/catch2.hash new file mode 100644 index 00000000000..b533792f8f9 --- /dev/null +++ b/package/catch2/catch2.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 d90351cdc55421f640c553cfc0875a8c834428679444e8062e9187d05b18aace catch2-3.3.1.tar.gz +sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE.txt diff --git a/package/catch2/catch2.mk b/package/catch2/catch2.mk new file mode 100644 index 00000000000..6e4af3d670a --- /dev/null +++ b/package/catch2/catch2.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# catch2 +# +################################################################################ + +CATCH2_VERSION = 3.3.1 +CATCH2_SITE = $(call github,catchorg,Catch2,v$(CATCH2_VERSION)) +CATCH2_INSTALL_STAGING = YES +CATCH2_INSTALL_TARGET = NO +CATCH2_LICENSE = BSL-1.0 +CATCH2_LICENSE_FILES = LICENSE.txt +CATCH2_SUPPORTS_IN_SOURCE_BUILD = NO + +# We force building a static library only as building a dynamic +# library is not really supported officially: +# https://github.com/catchorg/Catch2/blob/devel/docs/faq.md#can-i-compile-catch2-into-a-dynamic-library +CATCH2_CONF_OPTS = \ + -DCATCH_INSTALL_DOCS=OFF \ + -DBUILD_SHARED_LIBS=OFF + +$(eval $(cmake-package)) diff --git a/package/cbootimage/cbootimage.hash b/package/cbootimage/cbootimage.hash index 7113f84f1b5..03d2f0a33de 100644 --- a/package/cbootimage/cbootimage.hash +++ b/package/cbootimage/cbootimage.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 46cce01f07df977668de9e1d49884d8ed539169994215606a9719d17b9db8804 cbootimage-1.8.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 46cce01f07df977668de9e1d49884d8ed539169994215606a9719d17b9db8804 cbootimage-1.8.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/ccid/Config.in b/package/ccid/Config.in index aae5a7181c1..c12733375b1 100644 --- a/package/ccid/Config.in +++ b/package/ccid/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_CCID bool "ccid" depends on BR2_TOOLCHAIN_HAS_THREADS # libusb - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb, pcsc-lite depends on BR2_USE_MMU # pcsc-lite depends on !BR2_STATIC_LIBS # pcsc-lite select BR2_PACKAGE_PCSC_LITE diff --git a/package/ccid/ccid.hash b/package/ccid/ccid.hash index 4ef7aff3d46..d42d0778f17 100644 --- a/package/ccid/ccid.hash +++ b/package/ccid/ccid.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e6f7645b59a9a2844eb4b1a7eff512960d7f04a4654af02f7fd2f8aded5db40a ccid-1.4.34.tar.bz2 +sha256 81549b3422469d503996d03a3aed2ef1375b359167f10d66be9e3844e729322e ccid-1.5.0.tar.bz2 sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING diff --git a/package/ccid/ccid.mk b/package/ccid/ccid.mk index 3cb599d5668..c05e28a5d27 100644 --- a/package/ccid/ccid.mk +++ b/package/ccid/ccid.mk @@ -4,7 +4,7 @@ # ################################################################################ -CCID_VERSION = 1.4.34 +CCID_VERSION = 1.5.0 CCID_SOURCE = ccid-$(CCID_VERSION).tar.bz2 CCID_SITE = https://ccid.apdu.fr/files CCID_LICENSE = LGPL-2.1+ diff --git a/package/cctz/cctz.hash b/package/cctz/cctz.hash index fe8897c501f..b3a83207909 100644 --- a/package/cctz/cctz.hash +++ b/package/cctz/cctz.hash @@ -1,3 +1,3 @@ # locally computed -sha256 8615b20d4e33e02a271c3b93a3b208e3d7d5d66880f5f6208b03426e448f32db cctz-2.3.tar.gz -sha256 c79a7fea0e3cac04cd43f20e7b648e5a0ff8fa5344e644b0ee09ca1162b62747 LICENSE.txt +sha256 8615b20d4e33e02a271c3b93a3b208e3d7d5d66880f5f6208b03426e448f32db cctz-2.3.tar.gz +sha256 c79a7fea0e3cac04cd43f20e7b648e5a0ff8fa5344e644b0ee09ca1162b62747 LICENSE.txt diff --git a/package/cereal/cereal.hash b/package/cereal/cereal.hash index 18889b4d422..1ddb504a725 100644 --- a/package/cereal/cereal.hash +++ b/package/cereal/cereal.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 65ea6ddda98f4274f5c10fb3e07b2269ccdd1e5cbb227be6a2fd78b8f382c976 cereal-1.3.1.tar.gz +sha256 16a7ad9b31ba5880dac55d62b5d6f243c3ebc8d46a3514149e56b5e7ea81f85f cereal-1.3.2.tar.gz sha256 58604a126af6a671ea390ee3d5b3e42228aa59b2858fb7af1d5b20b31739ccbb LICENSE sha256 d9e523e8736ac0c68064c7ad312a222f285e82bf6c96a1b1c2cadaffff9fc64f include/cereal/external/base64.hpp sha256 7fb69c707f0ed3a8b59b8f949f0928a9cc06d67bc15d599094693703ff70ea26 include/cereal/external/rapidjson/rapidjson.h diff --git a/package/cereal/cereal.mk b/package/cereal/cereal.mk index a44f09c7436..6da7df93606 100644 --- a/package/cereal/cereal.mk +++ b/package/cereal/cereal.mk @@ -4,7 +4,7 @@ # ################################################################################ -CEREAL_VERSION = 1.3.1 +CEREAL_VERSION = 1.3.2 CEREAL_SITE = $(call github,USCiLab,cereal,v$(CEREAL_VERSION)) # For licensing, see also: https://github.com/USCiLab/cereal/issues/609 CEREAL_LICENSE = BSD-3-Clause (cereal), Zlib (base64.hpp), MIT (rapidjson), BSL-1.0 or MIT (rapidxml) @@ -13,6 +13,7 @@ CEREAL_CPE_ID_VENDOR = usc CEREAL_INSTALL_STAGING = YES CEREAL_INSTALL_TARGET = NO CEREAL_CONF_OPTS = \ + -DBUILD_SANDBOX=OFF \ -DTHREAD_SAFE=ON \ -DJUST_INSTALL_CEREAL=ON diff --git a/package/cgic/cgic.hash b/package/cgic/cgic.hash index d3f082e8881..2c680671286 100644 --- a/package/cgic/cgic.hash +++ b/package/cgic/cgic.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1e8834642a4b89528bb7bde2f287e133c6b07e210e68681a34137c436d59d320 cgic207.tar.gz -sha256 6a7de92593d64dbf7630d8f66f97e04a899769bef1e055f2434bc06b87b9de62 license.txt +sha256 1e8834642a4b89528bb7bde2f287e133c6b07e210e68681a34137c436d59d320 cgic207.tar.gz +sha256 6a7de92593d64dbf7630d8f66f97e04a899769bef1e055f2434bc06b87b9de62 license.txt diff --git a/package/cgilua/cgilua.hash b/package/cgilua/cgilua.hash index 385382b9d5c..9675a098b44 100644 --- a/package/cgilua/cgilua.hash +++ b/package/cgilua/cgilua.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 7bfb88c483136bca9b814316d7f9ff581a805d68d144c1eebdfda3e8dfb5eb3a cgilua-6.0.2-0.src.rock -sha256 b82f9b13f9b1a1387f53203a625612914630b520377731b0aab7ce93ad2b18c4 cgilua/doc/us/license.html +sha256 7bfb88c483136bca9b814316d7f9ff581a805d68d144c1eebdfda3e8dfb5eb3a cgilua-6.0.2-0.src.rock +sha256 b82f9b13f9b1a1387f53203a625612914630b520377731b0aab7ce93ad2b18c4 cgilua/doc/us/license.html diff --git a/package/chartjs/chartjs.hash b/package/chartjs/chartjs.hash index de4d6d4ebfa..3f8da927154 100644 --- a/package/chartjs/chartjs.hash +++ b/package/chartjs/chartjs.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 9ef3697e279a585c79730f35dba16ad4e24ddeed49a150adb341c31f191fb78e chartjs-2.9.4.tar.gz -sha256 7b43caae91f31b18dc81fae6e0f7aa1acbecaa6d84e3249905cbe15308307d67 LICENSE.md +sha256 111e0751796f087a51e94dfed910ccfb1278fd30e584a6e48514dba9ae7e72c6 chart.js-3.9.1.tgz +sha256 5a0877ad6d818529be4f33009d0942cdf7e2ed7656156f4aba7308459a546030 package/LICENSE.md diff --git a/package/chartjs/chartjs.mk b/package/chartjs/chartjs.mk index 2748a94d36a..5ed4b3d9c33 100644 --- a/package/chartjs/chartjs.mk +++ b/package/chartjs/chartjs.mk @@ -4,20 +4,17 @@ # ################################################################################ -CHARTJS_VERSION = 2.9.4 -CHARTJS_SITE = $(call github,chartjs,Chart.js,v$(CHARTJS_VERSION)) +CHARTJS_VERSION = 3.9.1 +CHARTJS_SITE = https://registry.npmjs.org/chart.js/- +CHARTJS_SOURCE = chart.js-$(CHARTJS_VERSION).tgz CHARTJS_LICENSE = MIT CHARTJS_LICENSE_FILES = LICENSE.md CHARTJS_CPE_ID_VENDOR = chartjs CHARTJS_CPE_ID_PRODUCT = chart.js define CHARTJS_INSTALL_TARGET_CMDS - $(INSTALL) -m 0644 -D $(@D)/dist/Chart.min.css \ - $(TARGET_DIR)/var/www/chartjs/css/Chart.css - $(INSTALL) -m 0644 -D $(@D)/dist/Chart.min.js \ + $(INSTALL) -m 0644 -D $(@D)/dist/chart.min.js \ $(TARGET_DIR)/var/www/chartjs/js/Chart.js - $(INSTALL) -m 0644 -D $(@D)/dist/Chart.bundle.min.js \ - $(TARGET_DIR)/var/www/chartjs/js/Chart.bundle.js endef $(eval $(generic-package)) diff --git a/package/check/check.mk b/package/check/check.mk index be825394698..d3977154df2 100644 --- a/package/check/check.mk +++ b/package/check/check.mk @@ -10,11 +10,6 @@ CHECK_INSTALL_STAGING = YES CHECK_DEPENDENCIES = host-pkgconf CHECK_LICENSE = LGPL-2.1+ CHECK_LICENSE_FILES = COPYING.LESSER +CHECK_CONF_OPTS = -DBUILD_TESTING=OFF -DINSTALL_CHECKMK=OFF -# Having checkmk in the target makes no sense -define CHECK_REMOVE_CHECKMK - rm -f $(TARGET_DIR)/usr/bin/checkmk -endef -CHECK_POST_INSTALL_TARGET_HOOKS += CHECK_REMOVE_CHECKMK - -$(eval $(autotools-package)) +$(eval $(cmake-package)) diff --git a/package/checkpolicy/checkpolicy.mk b/package/checkpolicy/checkpolicy.mk index af9a58cee89..baf16fb8029 100644 --- a/package/checkpolicy/checkpolicy.mk +++ b/package/checkpolicy/checkpolicy.mk @@ -20,11 +20,6 @@ define CHECKPOLICY_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(CHECKPOLICY_MAKE_OPTS) DESTDIR=$(STAGING_DIR) endef -define CHECKPOLICY_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(CHECKPOLICY_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install - -endef - define CHECKPOLICY_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(CHECKPOLICY_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install endef diff --git a/package/checksec/checksec.hash b/package/checksec/checksec.hash index 41aae8188c7..a29866ba078 100644 --- a/package/checksec/checksec.hash +++ b/package/checksec/checksec.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1034459d7cd2b0ee515c2b6b003375fec566fb59c838fc5e1961e1fcf76b54fa checksec-2.5.0.tar.gz -sha256 7888fee828bf56d547fc1f634e40638984148b4fc41373b7626eb465060640de LICENSE.txt +sha256 39d4158f96bdc7533ad6595703375c0046951fe4f6367b831ef92d9c66c1a307 checksec-2.6.0.tar.gz +sha256 55154b4be6dfcb3ff29d1e3648d0d07b3943a5fcc3af7c2e0e799b074734f722 LICENSE.txt diff --git a/package/checksec/checksec.mk b/package/checksec/checksec.mk index 61ef110f900..ed9846ac2df 100644 --- a/package/checksec/checksec.mk +++ b/package/checksec/checksec.mk @@ -4,7 +4,7 @@ # ################################################################################ -CHECKSEC_VERSION = 2.5.0 +CHECKSEC_VERSION = 2.6.0 CHECKSEC_SITE = $(call github,slimm609,checksec.sh,$(CHECKSEC_VERSION)) CHECKSEC_LICENSE = BSD-3-Clause CHECKSEC_LICENSE_FILES = LICENSE.txt diff --git a/package/chipmunk/chipmunk.hash b/package/chipmunk/chipmunk.hash index fc34639aa09..0fb8e15b6de 100644 --- a/package/chipmunk/chipmunk.hash +++ b/package/chipmunk/chipmunk.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 1e6f093812d6130e45bdf4cb80280cb3c93d1e1833d8cf989d554d7963b7899a Chipmunk-7.0.3.tar.gz +sha256 1e6f093812d6130e45bdf4cb80280cb3c93d1e1833d8cf989d554d7963b7899a Chipmunk-7.0.3.tar.gz # Hash for license file: -sha256 109cedb0301cba4e05fa99241f162bdad015c9541ae84b420b0148ac1ea588e2 LICENSE.txt +sha256 109cedb0301cba4e05fa99241f162bdad015c9541ae84b420b0148ac1ea588e2 LICENSE.txt diff --git a/package/chocolate-doom/chocolate-doom.mk b/package/chocolate-doom/chocolate-doom.mk index 8318c123bd9..581b2c51c23 100644 --- a/package/chocolate-doom/chocolate-doom.mk +++ b/package/chocolate-doom/chocolate-doom.mk @@ -8,6 +8,8 @@ CHOCOLATE_DOOM_VERSION = 3.0.1 CHOCOLATE_DOOM_SITE = http://www.chocolate-doom.org/downloads/$(CHOCOLATE_DOOM_VERSION) CHOCOLATE_DOOM_LICENSE = GPL-2.0+ CHOCOLATE_DOOM_LICENSE_FILES = COPYING +CHOCOLATE_DOOM_CPE_ID_VENDOR = chocolate-doom +CHOCOLATE_DOOM_CPE_ID_PRODUCT = chocolate_doom CHOCOLATE_DOOM_DEPENDENCIES = host-pkgconf sdl2 sdl2_mixer sdl2_net # Avoid installing desktop entries, icons, etc. diff --git a/package/chrony/Config.in b/package/chrony/Config.in index 158dc205307..c22b756c113 100644 --- a/package/chrony/Config.in +++ b/package/chrony/Config.in @@ -1,16 +1,20 @@ config BR2_PACKAGE_CHRONY bool "chrony" depends on BR2_USE_MMU # fork() + 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/ +if BR2_PACKAGE_CHRONY + config BR2_PACKAGE_CHRONY_DEBUG_LOGGING bool "enable debug logging support" - depends on BR2_PACKAGE_CHRONY help Enable support for debug logging output from Chrony when enabled at runtime. If disabled, code for debug logging will not be compiled in. + +endif diff --git a/package/chrony/chrony.hash b/package/chrony/chrony.hash index f8dd1438bc7..9c0e11757ba 100644 --- a/package/chrony/chrony.hash +++ b/package/chrony/chrony.hash @@ -1,4 +1,5 @@ -# From https://listengine.tuxfamily.org/chrony.tuxfamily.org/chrony-announce/2021/05/msg00000.html -sha256 ed76f2d3f9347ac6221a91ad4bd553dd0565ac188cd7490d0801d08f7171164c chrony-4.1.tar.gz +# Locally calculated after checking pgp signature +# https://download.tuxfamily.org/chrony/chrony-4.3-tar-gz-asc.txt +sha256 9d0da889a865f089a5a21610ffb6713e3c9438ce303a63b49c2fb6eaff5b8804 chrony-4.3.tar.gz # Locally calculated sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/chrony/chrony.mk b/package/chrony/chrony.mk index 5a34f70e1e9..86f23d90605 100644 --- a/package/chrony/chrony.mk +++ b/package/chrony/chrony.mk @@ -4,26 +4,25 @@ # ################################################################################ -CHRONY_VERSION = 4.1 +CHRONY_VERSION = 4.3 CHRONY_SITE = http://download.tuxfamily.org/chrony CHRONY_LICENSE = GPL-2.0 CHRONY_LICENSE_FILES = COPYING CHRONY_CPE_ID_VENDOR = tuxfamily CHRONY_SELINUX_MODULES = chronyd -CHRONY_DEPENDENCIES = host-pkgconf +CHRONY_DEPENDENCIES = host-pkgconf libcap CHRONY_CONF_OPTS = \ --host-system=Linux \ --host-machine=$(BR2_ARCH) \ --prefix=/usr \ --without-tomcrypt \ + --with-user=chrony \ $(if $(BR2_PACKAGE_CHRONY_DEBUG_LOGGING),--enable-debug,--disable-debug) -ifeq ($(BR2_PACKAGE_LIBCAP),y) -CHRONY_DEPENDENCIES += libcap -else -CHRONY_CONF_OPTS += --without-libcap -endif +define CHRONY_USERS + chrony -1 chrony -1 * /run/chrony - - Time daemon +endef ifeq ($(BR2_PACKAGE_LIBNSS),y) CHRONY_DEPENDENCIES += libnss diff --git a/package/cifs-utils/cifs-utils.hash b/package/cifs-utils/cifs-utils.hash index 566a5c4bf4d..ec6ea55961f 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 43d8786c8613caccfa84913081c1d62bc2409575854cf895b05b48af0863d056 cifs-utils-6.13.tar.bz2 +sha256 a7b6940e93250c1676a6fa66b6ead91b78cd43a5fee99cc462459c8b9cf1e6f4 cifs-utils-6.15.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 b29557cbe87..edf08d4b4d4 100644 --- a/package/cifs-utils/cifs-utils.mk +++ b/package/cifs-utils/cifs-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -CIFS_UTILS_VERSION = 6.13 +CIFS_UTILS_VERSION = 6.15 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+ diff --git a/package/cjson/Config.in b/package/cjson/Config.in index ee18fced5cc..55262a09901 100644 --- a/package/cjson/Config.in +++ b/package/cjson/Config.in @@ -5,3 +5,14 @@ config BR2_PACKAGE_CJSON ANSI-C compliant JSON parser, under MIT license. https://github.com/DaveGamble/cJSON + +if BR2_PACKAGE_CJSON + +config BR2_PACKAGE_CJSON_UTILS + bool "cJSON utils" + help + Supplementary library with support for JSON Pointer + (RFC-6901), JSON Patch (RFC-6902), JSON Merge Patch + (RFC-7386), and more. + +endif diff --git a/package/cjson/cjson.mk b/package/cjson/cjson.mk index ac8db5701f2..ad9d76a4bab 100644 --- a/package/cjson/cjson.mk +++ b/package/cjson/cjson.mk @@ -25,4 +25,10 @@ else CJSON_CONF_OPTS += -DBUILD_SHARED_AND_STATIC_LIBS=OFF endif +ifeq ($(BR2_PACKAGE_CJSON_UTILS),y) +CJSON_CONF_OPTS += -DENABLE_CJSON_UTILS=ON +else +CJSON_CONF_OPTS += -DENABLE_CJSON_UTILS=OFF +endif + $(eval $(cmake-package)) diff --git a/package/clamav/Config.in b/package/clamav/Config.in index 990a818b5c6..2857f9cbf43 100644 --- a/package/clamav/Config.in +++ b/package/clamav/Config.in @@ -10,6 +10,7 @@ config BR2_PACKAGE_CLAMAV select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_ZLIB + select BR2_PACKAGE_ZLIB_FORCE_LIBZLIB help ClamAV is an open source antivirus engine for detecting trojans, viruses, malware & other malicious threats. diff --git a/package/clamav/clamav.hash b/package/clamav/clamav.hash index 73f4ff88f1e..235b1e90480 100644 --- a/package/clamav/clamav.hash +++ b/package/clamav/clamav.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 1e74b1e1d2a8a9056449c313f48a6983b9d5ba0d6fb5ef0b2be6ad3c841a5426 clamav-0.103.5.tar.gz +sha256 9a2608971efee6092c009babf71d3b891ec6cf902bafa1dd6616f5308549a640 clamav-0.103.10.tar.gz sha256 0c4fd2fa9733fc9122503797648710851e4ee6d9e4969dd33fcbd8c63cd2f584 COPYING sha256 d72a145c90918184a05ef65a04c9e6f7466faa59bc1b82c8f6a8ddc7ddcb9bed COPYING.bzip2 sha256 dfb818a0d41411c6fb1c193c68b73018ceadd1994bda41ad541cbff292894bc6 COPYING.file diff --git a/package/clamav/clamav.mk b/package/clamav/clamav.mk index cd2d06e6b36..5f8eebbe9aa 100644 --- a/package/clamav/clamav.mk +++ b/package/clamav/clamav.mk @@ -4,7 +4,7 @@ # ################################################################################ -CLAMAV_VERSION = 0.103.5 +CLAMAV_VERSION = 0.103.10 CLAMAV_SITE = https://www.clamav.net/downloads/production CLAMAV_LICENSE = GPL-2.0 CLAMAV_LICENSE_FILES = COPYING COPYING.bzip2 COPYING.file COPYING.getopt \ @@ -12,6 +12,8 @@ CLAMAV_LICENSE_FILES = COPYING COPYING.bzip2 COPYING.file COPYING.getopt \ COPYING.unrar COPYING.zlib CLAMAV_CPE_ID_VENDOR = clamav CLAMAV_SELINUX_MODULES = clamav +# affects only Cisco devices +CLAMAV_IGNORE_CVES += CVE-2016-1405 CLAMAV_DEPENDENCIES = \ host-pkgconf \ libcurl \ @@ -69,6 +71,7 @@ CLAMAV_CONF_OPTS += --without-libjson endif ifeq ($(BR2_PACKAGE_LIBXML2),y) +CLAMAV_CONF_ENV += ac_cv_path_xmlconfig=$(STAGING_DIR)/usr/bin/xml2-config CLAMAV_CONF_OPTS += --with-xml=$(STAGING_DIR)/usr CLAMAV_DEPENDENCIES += libxml2 else diff --git a/package/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch b/package/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch new file mode 100644 index 00000000000..08371154d5c --- /dev/null +++ b/package/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch @@ -0,0 +1,78 @@ +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(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/clang/Config.in b/package/clang/Config.in index a67e7631a84..e4d455781e4 100644 --- a/package/clang/Config.in +++ b/package/clang/Config.in @@ -1,12 +1,13 @@ config BR2_PACKAGE_CLANG bool "clang" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::shared_future depends on !BR2_STATIC_LIBS depends on BR2_USE_WCHAR # std::wstring + depends on BR2_HOST_GCC_AT_LEAST_5 select BR2_PACKAGE_LLVM help Clang is a C/C++, Objective C/C++ and OpenCL C front-end @@ -14,11 +15,12 @@ config BR2_PACKAGE_CLANG http://clang.llvm.org -comment "clang needs a toolchain w/ wchar, threads, C++, gcc >= 4.8, dynamic library" +comment "clang needs a toolchain w/ wchar, threads, C++, gcc >= 5, dynamic library, host gcc >= 5" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \ - || BR2_STATIC_LIBS || !BR2_USE_WCHAR + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 \ + || BR2_STATIC_LIBS || !BR2_USE_WCHAR \ + || !BR2_HOST_GCC_AT_LEAST_5 comment "clang needs a toolchain not affected by GCC bug 64735" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS diff --git a/package/clang/clang.hash b/package/clang/clang.hash index 067a2c0470b..0136b806641 100644 --- a/package/clang/clang.hash +++ b/package/clang/clang.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 5778512b2e065c204010f88777d44b95250671103e434f9dc7363ab2e3804253 clang-9.0.1.src.tar.xz -sha256 ebcd9bbf783a73d05c53ba4d586b8d5813dcdf3bbec50265860ccc885e606f47 LICENSE.TXT +sha256 0a8288f065d1f57cb6d96da4d2965cbea32edc572aa972e466e954d17148558b clang-11.1.0.src.tar.xz +sha256 ebcd9bbf783a73d05c53ba4d586b8d5813dcdf3bbec50265860ccc885e606f47 LICENSE.TXT diff --git a/package/clang/clang.mk b/package/clang/clang.mk index 939f000cbdb..3c75f8d6b1c 100644 --- a/package/clang/clang.mk +++ b/package/clang/clang.mk @@ -5,7 +5,8 @@ ################################################################################ # LLVM, Clang and lld should be version bumped together -CLANG_VERSION = 9.0.1 +CLANG_VERSION_MAJOR = 11 +CLANG_VERSION = $(CLANG_VERSION_MAJOR).1.0 CLANG_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(CLANG_VERSION) CLANG_SOURCE = clang-$(CLANG_VERSION).src.tar.xz CLANG_LICENSE = Apache-2.0 with exceptions @@ -104,5 +105,40 @@ CLANG_CONF_OPTS += -DLLVM_LINK_LLVM_DYLIB=ON HOST_CLANG_CONF_OPTS += -DLLVM_DYLIB_COMPONENTS=all CLANG_CONF_OPTS += -DLLVM_DYLIB_COMPONENTS=all +# Help host-clang to find our external toolchain, use a relative path from the clang +# 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)` +endif + +define HOST_CLANG_INSTALL_WRAPPER_AND_SIMPLE_SYMLINKS + $(Q)cd $(HOST_DIR)/bin; \ + rm -f clang-$(CLANG_VERSION_MAJOR).br_real; \ + mv clang-$(CLANG_VERSION_MAJOR) clang-$(CLANG_VERSION_MAJOR).br_real; \ + ln -sf toolchain-wrapper-clang clang-$(CLANG_VERSION_MAJOR); \ + for i in clang clang++ clang-cl clang-cpp; do \ + ln -snf toolchain-wrapper-clang $$i; \ + ln -snf clang-$(CLANG_VERSION_MAJOR).br_real $$i.br_real; \ + done +endef + +define HOST_CLANG_TOOLCHAIN_WRAPPER_BUILD + $(HOSTCC) $(HOST_CFLAGS) $(TOOLCHAIN_WRAPPER_ARGS) \ + -s -Wl,--hash-style=$(TOOLCHAIN_WRAPPER_HASH_STYLE) \ + toolchain/toolchain-wrapper.c \ + -o $(@D)/toolchain-wrapper-clang +endef + +define HOST_CLANG_TOOLCHAIN_WRAPPER_INSTALL + $(INSTALL) -D -m 0755 $(@D)/toolchain-wrapper-clang \ + $(HOST_DIR)/bin/toolchain-wrapper-clang +endef + +HOST_CLANG_TOOLCHAIN_WRAPPER_ARGS += -DBR_CROSS_PATH_SUFFIX='".br_real"' +HOST_CLANG_POST_BUILD_HOOKS += HOST_CLANG_TOOLCHAIN_WRAPPER_BUILD +HOST_CLANG_POST_INSTALL_HOOKS += HOST_CLANG_TOOLCHAIN_WRAPPER_INSTALL +HOST_CLANG_POST_INSTALL_HOOKS += HOST_CLANG_INSTALL_WRAPPER_AND_SIMPLE_SYMLINKS + $(eval $(cmake-package)) $(eval $(host-cmake-package)) diff --git a/package/cli11/Config.in b/package/cli11/Config.in new file mode 100644 index 00000000000..87db9ac8f77 --- /dev/null +++ b/package/cli11/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_CLI11 + bool "cli11" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + help + CLI11 is a command line parser for C++11 and beyond that + provides a rich feature set with a simple and intuitive + interface. + + https://github.com/CLIUtils/CLI11 + +comment "cli11 needs a toolchain w/ C++, gcc >= 4.8" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/package/cli11/cli11.hash b/package/cli11/cli11.hash new file mode 100644 index 00000000000..12e5b4fb55e --- /dev/null +++ b/package/cli11/cli11.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 378da73d2d1d9a7b82ad6ed2b5bda3e7bc7093c4034a1d680a2e009eb067e7b2 cli11-2.3.1.tar.gz +sha256 89022151dbf5827a22430557ef2f8a75808dd25fa1e9a12709ef5421d363e66d LICENSE diff --git a/package/cli11/cli11.mk b/package/cli11/cli11.mk new file mode 100644 index 00000000000..b02bd4478ff --- /dev/null +++ b/package/cli11/cli11.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# cli11 +# +################################################################################ + +CLI11_VERSION = 2.3.1 +CLI11_SITE = $(call github,CLIUtils,CLI11,v$(CLI11_VERSION)) +CLI11_LICENSE = BSD-3-Clause +CLI11_LICENSE_FILES = LICENSE +CLI11_INSTALL_STAGING = YES +CLI11_INSTALL_TARGET = NO +CLI11_CONF_OPTS = -DCLI11_BUILD_DOCS=OFF -DCLI11_BUILD_EXAMPLES=OFF + +$(eval $(cmake-package)) diff --git a/package/cloop/cloop.mk b/package/cloop/cloop.mk index f3c4954ead4..6f6d5fe6a8f 100644 --- a/package/cloop/cloop.mk +++ b/package/cloop/cloop.mk @@ -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" + CFLAGS="$(HOST_CFLAGS) -D_GNU_SOURCE" CPPFLAGS="-std=c++14" endef define HOST_CLOOP_INSTALL_CMDS diff --git a/package/clpeak/Config.in b/package/clpeak/Config.in new file mode 100644 index 00000000000..c83297549c4 --- /dev/null +++ b/package/clpeak/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_CLPEAK + bool "clpeak" + depends on BR2_PACKAGE_HAS_LIBOPENCL + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + select BR2_PACKAGE_OPENCL_CLHPP + help + clpeak is a tool that profiles OpenCL devices + to find their peak capacities + + https://github.com/krrishnarraj/clpeak + +comment "clpeak needs an OpenCL provider, a toolchain w/ C++, gcc >= 4.8" + depends on !BR2_PACKAGE_HAS_LIBOPENCL \ + || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/package/clpeak/clpeak.hash b/package/clpeak/clpeak.hash new file mode 100644 index 00000000000..3db2a2ca6b9 --- /dev/null +++ b/package/clpeak/clpeak.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 7bc7beba6b3307290650abc4f13fe9389b271c1a64601fa333461516950d745b clpeak-1.1.2.tar.gz +sha256 88d9b4eb60579c191ec391ca04c16130572d7eedc4a86daa58bf28c6e14c9bcd LICENSE diff --git a/package/clpeak/clpeak.mk b/package/clpeak/clpeak.mk new file mode 100644 index 00000000000..616a02c0b40 --- /dev/null +++ b/package/clpeak/clpeak.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# clpeak +# +################################################################################ + +CLPEAK_VERSION = 1.1.2 +CLPEAK_SITE = $(call github,krrishnarraj,clpeak,$(CLPEAK_VERSION)) +CLPEAK_LICENSE = Unlicense +CLPEAK_LICENSE_FILES = LICENSE +CLPEAK_DEPENDENCIES = libopencl opencl-clhpp + +$(eval $(cmake-package)) diff --git a/package/cmake/Config.in b/package/cmake/Config.in index 3c47fdcb497..4ef5612b577 100644 --- a/package/cmake/Config.in +++ b/package/cmake/Config.in @@ -6,7 +6,7 @@ config BR2_PACKAGE_CMAKE_ARCH_SUPPORTS BR2_mipsel || BR2_mips64el || BR2_powerpc || \ BR2_powerpc64 || BR2_powerpc64le || BR2_sparc || \ BR2_i386 || BR2_x86_64 || BR2_xtensa || \ - BR2_s390x + BR2_s390x || BR2_riscv config BR2_PACKAGE_CMAKE bool diff --git a/package/cmake/Config.in.host b/package/cmake/Config.in.host index b2e210ee2cb..5de076537bc 100644 --- a/package/cmake/Config.in.host +++ b/package/cmake/Config.in.host @@ -9,3 +9,30 @@ config BR2_PACKAGE_HOST_CMAKE the compiler environment of your choice. http://www.cmake.org/ + +# The minimum system cmake version we expect if 3.18 as provided by +# Debian bullseye, that we use in our reference build docker image. +config BR2_HOST_CMAKE_AT_LEAST_3_19 + bool + +config BR2_HOST_CMAKE_AT_LEAST_3_20 + bool + select BR2_HOST_CMAKE_AT_LEAST_3_19 + +config BR2_HOST_CMAKE_AT_LEAST_3_21 + bool + select BR2_HOST_CMAKE_AT_LEAST_3_20 + +config BR2_HOST_CMAKE_AT_LEAST_3_22 + bool + select BR2_HOST_CMAKE_AT_LEAST_3_21 + +# 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.22" if BR2_HOST_CMAKE_AT_LEAST_3_22 + default "3.21" if BR2_HOST_CMAKE_AT_LEAST_3_21 + default "3.20" if BR2_HOST_CMAKE_AT_LEAST_3_20 + default "3.19" if BR2_HOST_CMAKE_AT_LEAST_3_19 + default "3.18" diff --git a/package/cmake/cmake.hash b/package/cmake/cmake.hash index 97e83a274cd..43b5efb0f05 100644 --- a/package/cmake/cmake.hash +++ b/package/cmake/cmake.hash @@ -1,5 +1,5 @@ -# From https://cmake.org/files/v3.16/cmake-3.16.9-SHA-256.txt -sha256 1708361827a5a0de37d55f5c9698004c035abb1de6120a376d5d59a81630191f cmake-3.16.9.tar.gz +# From https://cmake.org/files/v3.22/cmake-3.22.3-SHA-256.txt +sha256 9f8469166f94553b6978a16ee29227ec49a2eb5ceb608275dec40d8ae0d1b5a0 cmake-3.22.3.tar.gz # Locally calculated -sha256 dc628fb936a5d229296d42083f9a8218aa32204c016919e784404c9ec58776e9 Copyright.txt +sha256 f1a4326266aada65b307dac05161a9d02d3dba4fb08b50cb26e3c24cc8a86e97 Copyright.txt diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk index b1b214982e8..56c92e53e9a 100644 --- a/package/cmake/cmake.mk +++ b/package/cmake/cmake.mk @@ -4,8 +4,9 @@ # ################################################################################ -CMAKE_VERSION_MAJOR = 3.16 -CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).9 +# When updating the version, please also update BR2_HOST_CMAKE_AT_LEAST_X_Y +CMAKE_VERSION_MAJOR = 3.22 +CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).3 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 007dd7a7fcf..74d67d6ecb6 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 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING +sha256 f0ccd8242d55e2fd74b16ba518359151f6f8383ff8aef4976e48393f77bba8b6 cmocka-1.1.5.tar.xz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/package/cmocka/cmocka.mk b/package/cmocka/cmocka.mk index eafb4898e1e..297f95f4650 100644 --- a/package/cmocka/cmocka.mk +++ b/package/cmocka/cmocka.mk @@ -21,4 +21,9 @@ ifeq ($(BR2_SHARED_STATIC_LIBS),y) CMOCKA_CONF_OPTS += -DWITH_STATIC_LIB=ON endif +# gcc for ARM Thumb1 doesn't implement -fstack-clash-protection +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +CMOCKA_CONF_OPTS += -DWITH_STACK_CLASH_PROTECTION=OFF +endif + $(eval $(cmake-package)) diff --git a/package/cni-plugins/Config.in b/package/cni-plugins/Config.in new file mode 100644 index 00000000000..25e6ff534df --- /dev/null +++ b/package/cni-plugins/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_CNI_PLUGINS + bool "cni-plugins" + 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_USES_UCLIBC # no fexecve + depends on BR2_USE_MMU + help + Container Networking Interface plugins. + + https://github.com/containernetworking/plugins + +comment "cni-plugins needs a glibc or musl toolchain w/ threads" + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS && \ + BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_UCLIBC diff --git a/package/cni-plugins/cni-plugins.hash b/package/cni-plugins/cni-plugins.hash new file mode 100644 index 00000000000..0c3e07c91c3 --- /dev/null +++ b/package/cni-plugins/cni-plugins.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 f3496ddda9c7770a0b695b67ae7ee80a4ee331ac2745af4830054b81627f79b7 cni-plugins-1.2.0.tar.gz +sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE diff --git a/package/cni-plugins/cni-plugins.mk b/package/cni-plugins/cni-plugins.mk new file mode 100644 index 00000000000..be02c2ff45d --- /dev/null +++ b/package/cni-plugins/cni-plugins.mk @@ -0,0 +1,52 @@ +################################################################################ +# +# cni-plugins +# +################################################################################ + +CNI_PLUGINS_VERSION = 1.2.0 +CNI_PLUGINS_SITE = $(call github,containernetworking,plugins,v$(CNI_PLUGINS_VERSION)) +CNI_PLUGINS_LICENSE = Apache-2.0 +CNI_PLUGINS_LICENSE_FILES = LICENSE + +CNI_PLUGINS_BUILD_TARGETS = \ + plugins/ipam/dhcp \ + plugins/main/bridge \ + plugins/main/dummy \ + plugins/main/host-device \ + plugins/main/ipvlan \ + plugins/main/loopback \ + plugins/main/macvlan \ + plugins/main/ptp \ + plugins/main/vlan \ + plugins/meta/bandwidth \ + plugins/meta/firewall \ + plugins/meta/portmap \ + plugins/meta/tuning \ + plugins/meta/vrf +CNI_PLUGINS_INSTALL_BINS = $(CNI_PLUGINS_BUILD_TARGETS) + +ifeq ($(BR2_PACKAGE_LIBAPPARMOR),y) +CNI_PLUGINS_DEPENDENCIES += libapparmor +CNI_PLUGINS_TAGS += apparmor +endif + +ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) +CNI_PLUGINS_TAGS += seccomp +CNI_PLUGINS_DEPENDENCIES += libseccomp host-pkgconf +endif + +ifeq ($(BR2_PACKAGE_LIBSELINUX),y) +CNI_PLUGINS_TAGS += selinux +CNI_PLUGINS_DEPENDENCIES += libselinux +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 + ) +endef + +$(eval $(golang-package)) diff --git a/package/cog/Config.in b/package/cog/Config.in index d4238750f9f..d2a910f9b89 100644 --- a/package/cog/Config.in +++ b/package/cog/Config.in @@ -39,7 +39,10 @@ config BR2_PACKAGE_COG_PLATFORM_FDO config BR2_PACKAGE_COG_PLATFORM_DRM bool "DRM backend" depends on BR2_PACKAGE_HAS_UDEV # libinput - depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # gbm + depends on BR2_PACKAGE_HAS_LIBEGL + depends on BR2_PACKAGE_HAS_LIBGBM + depends on BR2_PACKAGE_LIBGBM_HAS_FEATURE_DMA_BUF + depends on BR2_PACKAGE_LIBGBM_HAS_FEATURE_FORMAT_MODIFIER_PLANE_COUNT select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_LIBINPUT help @@ -52,7 +55,11 @@ config BR2_PACKAGE_COG_USE_SYSTEM_DBUS help Expose remote control interface on system bus -comment "DRM platform needs mesa3d w/ EGL driver and GBM" - depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL +comment "DRM platform needs EGL and GBM" + depends on \ + !BR2_PACKAGE_HAS_LIBEGL || \ + !BR2_PACKAGE_HAS_LIBGBM || \ + !BR2_PACKAGE_LIBGBM_HAS_FEATURE_DMA_BUF || \ + !BR2_PACKAGE_LIBGBM_HAS_FEATURE_FORMAT_MODIFIER_PLANE_COUNT endif diff --git a/package/cog/cog.hash b/package/cog/cog.hash index 839b12e6193..2ea3ddee080 100644 --- a/package/cog/cog.hash +++ b/package/cog/cog.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/cog-0.12.1.tar.xz.sums -md5 25a80a5a8a52b8873933a128151b8928 cog-0.12.1.tar.xz -sha1 3b9f67bc23cd9e3db2221366d6cde4ca0b06b811 cog-0.12.1.tar.xz -sha256 23caaafa2ef5c2f6a97d467fcce908ea71087ad03b72deb9280225c0dd561c91 cog-0.12.1.tar.xz +# From https://wpewebkit.org/releases/cog-0.16.1.tar.xz.sums +md5 1489740db6b4ea568578035c30b8b2f4 cog-0.16.1.tar.xz +sha1 1235203085e7ccd8fc76eab6bdfcdb2e3ae38ea9 cog-0.16.1.tar.xz +sha256 37c5f14123b8dcf077839f6c60f0d721d2a91bb37829e796f420126e6b0d38b5 cog-0.16.1.tar.xz # Hashes for license files: sha256 e6c42d93c68b292bcccf6d2ec3e13da85df90b718ba27c2c2a01053a9d009252 COPYING diff --git a/package/cog/cog.mk b/package/cog/cog.mk index 2f6ef402fb1..da4bfc7ac60 100644 --- a/package/cog/cog.mk +++ b/package/cog/cog.mk @@ -4,7 +4,7 @@ # ################################################################################ -COG_VERSION = 0.12.1 +COG_VERSION = 0.16.1 COG_SITE = https://wpewebkit.org/releases COG_SOURCE = cog-$(COG_VERSION).tar.xz COG_INSTALL_STAGING = YES @@ -12,31 +12,40 @@ COG_DEPENDENCIES = dbus wpewebkit wpebackend-fdo wayland COG_LICENSE = MIT COG_LICENSE_FILES = COPYING COG_CONF_OPTS = \ - -DCOG_BUILD_PROGRAMS=ON \ - -DCOG_PLATFORM_HEADLESS=ON \ - -DCOG_WESTON_DIRECT_DISPLAY=OFF \ - -DINSTALL_MAN_PAGES=OFF \ - -DCOG_HOME_URI='$(call qstrip,$(BR2_PACKAGE_COG_PROGRAMS_HOME_URI))' \ - -DUSE_SOUP2=ON + -Ddocumentation=false \ + -Dmanpages=false \ + -Dprograms=true \ + -Dsoup2=enabled \ + -Dcog_home_uri='$(call qstrip,$(BR2_PACKAGE_COG_PROGRAMS_HOME_URI))' \ + -Dplatforms='$(subst $(space),$(comma),$(strip $(COG_PLATFORMS_LIST)))' + +COG_PLATFORMS_LIST = headless + +ifeq ($(BR2_PACKAGE_WESTON),y) +COG_CONF_OPTS += -Dwayland_weston_direct_display=true +COG_DEPENDENCIES += weston +else +COG_CONF_OPTS += -Dwayland_weston_direct_display=false +endif ifeq ($(BR2_PACKAGE_COG_PLATFORM_FDO),y) -COG_CONF_OPTS += -DCOG_PLATFORM_WL=ON +COG_PLATFORMS_LIST += wayland COG_DEPENDENCIES += libxkbcommon wayland-protocols -else -COG_CONF_OPTS += -DCOG_PLATFORM_WL=OFF endif ifeq ($(BR2_PACKAGE_COG_PLATFORM_DRM),y) -COG_CONF_OPTS += -DCOG_PLATFORM_DRM=ON -COG_DEPENDENCIES += libdrm libinput -else -COG_CONF_OPTS += -DCOG_PLATFORM_DRM=OFF +COG_PLATFORMS_LIST += drm +COG_DEPENDENCIES += libdrm libinput libgbm libegl udev endif ifeq ($(BR2_PACKAGE_COG_USE_SYSTEM_DBUS),y) -COG_CONF_OPTS += -DCOG_DBUS_SYSTEM_BUS=ON +COG_CONF_OPTS += -Dcog_dbus_control=system else -COG_CONF_OPTS += -DCOG_DBUS_SYSTEM_BUS=OFF +COG_CONF_OPTS += -Dcog_dbus_control=user +endif + +ifeq ($(BR2_PACKAGE_LIBMANETTE),y) +COG_DEPENDENCIES += libmanette endif -$(eval $(cmake-package)) +$(eval $(meson-package)) diff --git a/package/collectd/Config.in b/package/collectd/Config.in index 67413ffde0d..a431da79f13 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -475,6 +475,7 @@ config BR2_PACKAGE_COLLECTD_PING config BR2_PACKAGE_COLLECTD_POSTGRESQL bool "postgresql" depends on BR2_USE_WCHAR # postgresql + depends on !BR2_OPTIMIZE_FAST # postgresql select BR2_PACKAGE_POSTGRESQL help Connects to and executes SQL statements on a PostgreSQL @@ -485,6 +486,9 @@ config BR2_PACKAGE_COLLECTD_POSTGRESQL comment "postgresql support needs a toolchain w/ wchar" depends on !BR2_USE_WCHAR +comment "postgresql support can't be built with Optimize for fast" + depends on BR2_OPTIMIZE_FAST + config BR2_PACKAGE_COLLECTD_PROCESSES bool "processes" help @@ -679,16 +683,15 @@ config BR2_PACKAGE_COLLECTD_GRPC depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC # grpc depends on BR2_INSTALL_LIBSTDCPP # grpc -> protobuf depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # grpc -> protobuf - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # grpc -> libabseil-cpp + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # grpc -> libabseil-cpp depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS # grpc select BR2_PACKAGE_GRPC help Send/receive values using the gRPC protocol. -comment "grpc needs a toolchain w/ C++, gcc >= 4.9, host gcc >= 4.9" +comment "grpc needs a toolchain w/ C++, gcc >= 5" depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 \ - || !BR2_HOST_GCC_AT_LEAST_4_9 + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS # grpc @@ -721,11 +724,20 @@ config BR2_PACKAGE_COLLECTD_RRDTOOL comment "rrdtool support needs a toolchain w/ wchar" depends on !BR2_USE_WCHAR +if BR2_PACKAGE_COLLECTD_RRDTOOL + +config BR2_PACKAGE_COLLECTD_RRDCACHED + bool "rrdcached" + help + Use the RRDtool caching daemon. + +endif + config BR2_PACKAGE_COLLECTD_RIEMANN bool "riemann" # riemann-c-client -> protobuf-c depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" + depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS select BR2_PACKAGE_RIEMANN_C_CLIENT select BR2_PACKAGE_LIBTOOL help @@ -759,7 +771,7 @@ config BR2_PACKAGE_COLLECTD_WRITELOG config BR2_PACKAGE_COLLECTD_WRITEPROMETHEUS bool "write_prometheus" depends on BR2_INSTALL_LIBSTDCPP # protobuf-c - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" # protobuf-c + depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS # protobuf-c select BR2_PACKAGE_LIBMICROHTTPD select BR2_PACKAGE_PROTOBUF_C help @@ -768,7 +780,7 @@ config BR2_PACKAGE_COLLECTD_WRITEPROMETHEUS comment "write_prometheus needs a toolchain w/ C++" depends on !BR2_INSTALL_LIBSTDCPP - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" + depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS config BR2_PACKAGE_COLLECTD_WRITEREDIS bool "write_redis" diff --git a/package/collectd/collectd.hash b/package/collectd/collectd.hash index 394904a1900..674f09f5a9b 100644 --- a/package/collectd/collectd.hash +++ b/package/collectd/collectd.hash @@ -1,5 +1,5 @@ # Locally computed checksums -sha512 7a15e4c0ae587db4987d673a790a4f3bea1cab29ce24a506fb21fa7bd2f60bfec70867eaa1c1395cb5b0e0ae81a024fb6109b064da0ef50e7c146d2198871c70 collectd-5.12.0.tar.bz2 -sha256 5bae043042c19c31f77eb8464e56a01a5454e0b39fa07cf7ad0f1bfc9c3a09d6 collectd-5.12.0.tar.bz2 -sha1 af36fe83e2995270b5632fc21e5a001e6702cdce collectd-5.12.0.tar.bz2 -sha256 ed0409b2b1c30566dab5fcdaf46ee70e140c99788e22f0267645a9357b476ae4 COPYING +sha512 7a15e4c0ae587db4987d673a790a4f3bea1cab29ce24a506fb21fa7bd2f60bfec70867eaa1c1395cb5b0e0ae81a024fb6109b064da0ef50e7c146d2198871c70 collectd-5.12.0.tar.bz2 +sha256 5bae043042c19c31f77eb8464e56a01a5454e0b39fa07cf7ad0f1bfc9c3a09d6 collectd-5.12.0.tar.bz2 +sha1 af36fe83e2995270b5632fc21e5a001e6702cdce collectd-5.12.0.tar.bz2 +sha256 ed0409b2b1c30566dab5fcdaf46ee70e140c99788e22f0267645a9357b476ae4 COPYING diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk index 57517570408..6c993827c4a 100644 --- a/package/collectd/collectd.mk +++ b/package/collectd/collectd.mk @@ -21,12 +21,20 @@ COLLECTD_PLUGINS_DISABLE = \ gmond hddtemp intel_rdt java lpar \ madwifi mbmon mic multimeter netapp notify_desktop numa \ oracle perl pf pinba powerdns python routeros \ - rrdcached sigrok tape target_v5upgrade teamspeak2 ted \ + sigrok tape target_v5upgrade teamspeak2 ted \ tokyotyrant turbostat uuid varnish vserver write_kafka \ write_mongodb xencpu xmms zfs_arc zone COLLECTD_CONF_ENV += LIBS="-lm" +COLLECTD_CFLAGS = $(TARGET_CFLAGS) + +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_68485),y) +COLLECTD_CFLAGS += -O0 +endif + +COLLECTD_CONF_ENV += CFLAGS="$(COLLECTD_CFLAGS)" + # # NOTE: There's also a third availible setting "intswap", which might # be needed on some old ARM hardware (see [2]), but is not being @@ -126,6 +134,7 @@ COLLECTD_CONF_OPTS += \ $(if $(BR2_PACKAGE_COLLECTD_REGEX),--enable-match_regex,--disable-match-regex) \ $(if $(BR2_PACKAGE_COLLECTD_REPLACE),--enable-target_replace,--disable-target_replace) \ $(if $(BR2_PACKAGE_COLLECTD_RIEMANN),--enable-write_riemann,--disable-write_riemann) \ + $(if $(BR2_PACKAGE_COLLECTD_RRDCACHED),--enable-rrdcached,--disable-rrdcached) \ $(if $(BR2_PACKAGE_COLLECTD_RRDTOOL),--enable-rrdtool,--disable-rrdtool) \ $(if $(BR2_PACKAGE_COLLECTD_SCALE),--enable-target_scale,--disable-target_scale) \ $(if $(BR2_PACKAGE_COLLECTD_SENSORS),--enable-sensors,--disable-sensors) \ diff --git a/package/comix-cursors/comix-cursors.hash b/package/comix-cursors/comix-cursors.hash index e03808c3f84..b66a61423b9 100644 --- a/package/comix-cursors/comix-cursors.hash +++ b/package/comix-cursors/comix-cursors.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 9e68ea8ff230dcc793528aa5da9a38b9bf61c478cd6868b4e4f5da659746a019 ComixCursors-0.9.1.tar.bz2 +sha256 9e68ea8ff230dcc793528aa5da9a38b9bf61c478cd6868b4e4f5da659746a019 ComixCursors-0.9.1.tar.bz2 diff --git a/package/compiler-rt/Config.in b/package/compiler-rt/Config.in new file mode 100644 index 00000000000..02169b66c08 --- /dev/null +++ b/package/compiler-rt/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_COMPILER_RT + bool "compiler-rt" + depends on BR2_PACKAGE_LLVM + depends on BR2_TOOLCHAIN_USES_GLIBC # asan lib requires + depends on BR2_HOST_GCC_AT_LEAST_5 # host-clang + help + A collection of runtime libraries primarily used by clang and + llvm to provide builtins, sanitizer runtimes, and profiling + at runtime. + + https://compiler-rt.llvm.org/ + +comment "compiler-rt requires llvm to be enabled, a glibc toolchain, host gcc >= 5" + depends on !BR2_PACKAGE_LLVM + depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_HOST_GCC_AT_LEAST_5 diff --git a/package/compiler-rt/compiler-rt.hash b/package/compiler-rt/compiler-rt.hash new file mode 100644 index 00000000000..8ee010ac5ad --- /dev/null +++ b/package/compiler-rt/compiler-rt.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 def1fc00c764cd3abbba925c712ac38860a756a43b696b291f46fee09e453274 compiler-rt-11.1.0.src.tar.xz +sha256 1a8f1058753f1ba890de984e48f0242a3a5c29a6a8f2ed9fd813f36985387e8d LICENSE.TXT diff --git a/package/compiler-rt/compiler-rt.mk b/package/compiler-rt/compiler-rt.mk new file mode 100644 index 00000000000..fbf4707bfc3 --- /dev/null +++ b/package/compiler-rt/compiler-rt.mk @@ -0,0 +1,38 @@ +################################################################################ +# +# compiler-rt +# +################################################################################ + +# Compiler-RT should be bumped together with LLVM and Clang as the run-time is +# tied to the version of those tools +COMPILER_RT_VERSION = 11.1.0 +COMPILER_RT_SOURCE = compiler-rt-$(COMPILER_RT_VERSION).src.tar.xz +COMPILER_RT_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(COMPILER_RT_VERSION) +COMPILER_RT_LICENSE = NCSA MIT +COMPILER_RT_LICENSE_FILES = LICENSE.TXT +COMPILER_RT_DEPENDENCIES = host-clang llvm +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 \ + -DCOMPILER_RT_STANDALONE_BUILD=ON \ + -DCOMPILER_RT_DEFAULT_TARGET_TRIPLE=$(GNU_TARGET_NAME) \ + -DLLVM_CONFIG_PATH=$(HOST_DIR)/bin/llvm-config + +# The installation of the target runtime libraries defaults to DESTDIR, however +# host-clang resources directory needs a link so Clang can find the runtime +# libraries in the same location they would be if built as part of the Clang +# build. The "resources" directory is loosely documented and seems to be +# 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 +endef +COMPILER_RT_POST_INSTALL_STAGING_HOOKS += COMPILER_RT_SETUP_RUNTIME_LIBS + +$(eval $(cmake-package)) diff --git a/package/connman-gtk/connman-gtk.hash b/package/connman-gtk/connman-gtk.hash index fbc4acb14c6..72e2fcaaa5f 100644 --- a/package/connman-gtk/connman-gtk.hash +++ b/package/connman-gtk/connman-gtk.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 49bdc4769a7c508b0130e4705eef21aec9df1ea4f5c29fee48a0cae8db828fca connman-gtk-1.1.1.tar.bz2 -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 49bdc4769a7c508b0130e4705eef21aec9df1ea4f5c29fee48a0cae8db828fca connman-gtk-1.1.1.tar.bz2 +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/connman/Config.in b/package/connman/Config.in index 72b76bf19d7..af3e1f69f6a 100644 --- a/package/connman/Config.in +++ b/package/connman/Config.in @@ -94,6 +94,14 @@ comment "ofono support needs a toolchain w/ headers >= 4.12" config BR2_PACKAGE_CONNMAN_DEBUG bool "enable compiling with debugging information" +config BR2_PACKAGE_CONNMAN_STATS + bool "enable statistics round robin file generation" + help + Enable generation of statistics in a round robin file. + + This is enabled by default upstream but is marked as + experimental. + config BR2_PACKAGE_CONNMAN_CLIENT bool "enable command line client" select BR2_PACKAGE_READLINE diff --git a/package/connman/connman.hash b/package/connman/connman.hash index 6fc5edf29a2..ea87f1ea17d 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 79fb40f4fdd5530c45aa8e592fb16ba23d3674f3a98cf10b89a6576f198de589 connman-1.41.tar.xz +sha256 a3e6bae46fc081ef2e9dae3caa4f7649de892c3de622c20283ac0ca81423c2aa connman-1.42.tar.xz # Locally computed sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING diff --git a/package/connman/connman.mk b/package/connman/connman.mk index 1b6fd611f5a..142a6583ad3 100644 --- a/package/connman/connman.mk +++ b/package/connman/connman.mk @@ -4,7 +4,7 @@ # ################################################################################ -CONNMAN_VERSION = 1.41 +CONNMAN_VERSION = 1.42 CONNMAN_SOURCE = connman-$(CONNMAN_VERSION).tar.xz CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman CONNMAN_DEPENDENCIES = libglib2 dbus @@ -65,6 +65,12 @@ else CONNMAN_CONF_OPTS += --disable-ofono endif +ifeq ($(BR2_PACKAGE_CONNMAN_STATS),y) +CONNMAN_CONF_OPTS += --enable-stats +else +CONNMAN_CONF_OPTS += --disable-stats +endif + ifeq ($(BR2_PACKAGE_CONNMAN_WIFI),y) CONNMAN_CONF_OPTS += --enable-wifi else diff --git a/package/conntrack-tools/conntrack-tools.hash b/package/conntrack-tools/conntrack-tools.hash index ae9af25e8fd..371ede34325 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 590859cc848245dbfd9c6487761dd303b3a1771e007f4f42213063ca56205d5f conntrack-tools-1.4.6.tar.bz2 +sha256 099debcf57e81690ced57f516b493588a73518f48c14d656f823b29b4fc24b5d conntrack-tools-1.4.7.tar.bz2 # Locally calculated -sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING +sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING diff --git a/package/conntrack-tools/conntrack-tools.mk b/package/conntrack-tools/conntrack-tools.mk index 55ea4079246..ec633f0d54d 100644 --- a/package/conntrack-tools/conntrack-tools.mk +++ b/package/conntrack-tools/conntrack-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -CONNTRACK_TOOLS_VERSION = 1.4.6 +CONNTRACK_TOOLS_VERSION = 1.4.7 CONNTRACK_TOOLS_SOURCE = conntrack-tools-$(CONNTRACK_TOOLS_VERSION).tar.bz2 CONNTRACK_TOOLS_SITE = http://www.netfilter.org/projects/conntrack-tools/files CONNTRACK_TOOLS_DEPENDENCIES = host-pkgconf \ diff --git a/package/containerd/Config.in b/package/containerd/Config.in index 0e3a55ef394..e69dd6768ad 100644 --- a/package/containerd/Config.in +++ b/package/containerd/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_CONTAINERD depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_TOOLCHAIN_USES_UCLIBC # runc depends on BR2_USE_MMU # util-linux - select BR2_PACKAGE_RUNC # runtime dependency + select BR2_PACKAGE_RUNC if !BR2_PACKAGE_CRUN # runtime dependency select BR2_PACKAGE_UTIL_LINUX # runtime dependency select BR2_PACKAGE_UTIL_LINUX_BINARIES select BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT diff --git a/package/containerd/containerd.hash b/package/containerd/containerd.hash index d5aafe2e706..8404675e306 100644 --- a/package/containerd/containerd.hash +++ b/package/containerd/containerd.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 40c9767af3e87f2c36adf2f563f0a8374e80b30bd2b7aa80058c85912406cef4 containerd-1.5.9.tar.gz +sha256 b109aceacc814d7a637ed94ba5ade829cd2642841d03e06971ef124fa3b86899 containerd-1.6.22.tar.gz sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk index 8976e12f1a2..c4a6d854c31 100644 --- a/package/containerd/containerd.mk +++ b/package/containerd/containerd.mk @@ -4,7 +4,7 @@ # ################################################################################ -CONTAINERD_VERSION = 1.5.9 +CONTAINERD_VERSION = 1.6.22 CONTAINERD_SITE = $(call github,containerd,containerd,v$(CONTAINERD_VERSION)) CONTAINERD_LICENSE = Apache-2.0 CONTAINERD_LICENSE_FILES = LICENSE @@ -41,4 +41,10 @@ else CONTAINERD_TAGS += no_btrfs endif +define CONTAINERD_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 0644 $(@D)/containerd.service \ + $(TARGET_DIR)/usr/lib/systemd/system/containerd.service + $(SED) 's,/usr/local/bin,/usr/bin,g' $(TARGET_DIR)/usr/lib/systemd/system/containerd.service +endef + $(eval $(golang-package)) diff --git a/package/copas/copas.hash b/package/copas/copas.hash index 4e9e787842f..d53990d0b6c 100644 --- a/package/copas/copas.hash +++ b/package/copas/copas.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 efeded4f4633bc71551175b239199304640ef918ae8ea9dc9c5047359ae07107 copas-2.0.2-1.src.rock -sha256 3f59cccf38e9397f6fb34dcff983a24d336df982edb5b0cde549d0c32c28c9c0 copas-2_0_2/LICENSE +sha256 efeded4f4633bc71551175b239199304640ef918ae8ea9dc9c5047359ae07107 copas-2.0.2-1.src.rock +sha256 3f59cccf38e9397f6fb34dcff983a24d336df982edb5b0cde549d0c32c28c9c0 copas-2_0_2/LICENSE diff --git a/package/coremark/coremark.mk b/package/coremark/coremark.mk index 418fd5c8d39..9ea8693e718 100644 --- a/package/coremark/coremark.mk +++ b/package/coremark/coremark.mk @@ -11,6 +11,7 @@ COREMARK_LICENSE_FILES = LICENSE.md define COREMARK_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" -C $(@D) \ + PORT_CFLAGS="$(TARGET_CFLAGS)" \ PORT_DIR=linux$(if $(BR2_ARCH_IS_64),64) EXE= link endef diff --git a/package/coreutils/0001-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch b/package/coreutils/0001-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch deleted file mode 100644 index 88390a11241..00000000000 --- a/package/coreutils/0001-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch +++ /dev/null @@ -1,46 +0,0 @@ -From a0594387565e1e6b4a8a8ba04ad13b135cc1f0b5 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 1 Apr 2021 07:49:46 +0200 -Subject: [PATCH] lib/getrandom.c: fix build with uclibc < 1.0.35 - -Fix the following build failure with uclibc < 1.0.35 which is raised -since the addition of getrandom module in -https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=682cc4e678aceff32dea2a84b6e5147bdf5a20a7: - -In file included from ./sys/random.h:40, - from getrandom.c:22: -/home/fabrice/buildroot/output/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) - | ^~~~~~ -/home/fabrice/buildroot/output/host/x86_64-buildroot-linux-uclibc/sysroot/usr/include/sys/random.h:8:1: note: 'size_t' is defined in header ''; did you forget to '#include '? - 7 | #include - +++ |+#include - 8 | - -This patch is not upstreamable as it is only a workaround for -uclibc < 1.0.35, upstream uclibc has been patched with -https://github.com/wbx-github/uclibc-ng/commit/00972c02c2b6e0a95d5def4a71bdfb188e091782 - -Fixes: - - http://autobuild.buildroot.org/results/c69f5c8b8e53ed3de753f0c6d2cdd99497504b49 - -Signed-off-by: Fabrice Fontaine ---- - lib/getrandom.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/getrandom.c b/lib/getrandom.c -index 41212fb32..0ad3f9648 100644 ---- a/lib/getrandom.c -+++ b/lib/getrandom.c -@@ -19,6 +19,7 @@ - - #include - -+#include - #include - - #include --- -2.30.2 - diff --git a/package/coreutils/coreutils.hash b/package/coreutils/coreutils.hash index 758a6341a38..eb9a5744c65 100644 --- a/package/coreutils/coreutils.hash +++ b/package/coreutils/coreutils.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 ce30acdf4a41bc5bb30dd955e9eaa75fa216b4e3deb08889ed32433c7b3b97ce coreutils-9.0.tar.xz +sha256 61a1f410d78ba7e7f37a5a4f50e6d1320aca33375484a3255eddf17a38580423 coreutils-9.1.tar.xz # Locally computed -sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING +sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk index 438b7910ebf..931859b0aca 100644 --- a/package/coreutils/coreutils.mk +++ b/package/coreutils/coreutils.mk @@ -4,7 +4,7 @@ # ################################################################################ -COREUTILS_VERSION = 9.0 +COREUTILS_VERSION = 9.1 COREUTILS_SITE = $(BR2_GNU_MIRROR)/coreutils COREUTILS_SOURCE = coreutils-$(COREUTILS_VERSION).tar.xz COREUTILS_LICENSE = GPL-3.0+ diff --git a/package/coxpcall/coxpcall.hash b/package/coxpcall/coxpcall.hash index 953005e9223..807596a436f 100644 --- a/package/coxpcall/coxpcall.hash +++ b/package/coxpcall/coxpcall.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 11feb07f08927c39b0b93e8c0bbaf15433f86155cba4820a31a09f4754ab3258 coxpcall-1.17.0-1.src.rock -sha256 11f0f03dda1a28eca658d5e3361c15fd4d048371364aacc5f6870d77a66866c8 coxpcall/doc/license.html +sha256 11feb07f08927c39b0b93e8c0bbaf15433f86155cba4820a31a09f4754ab3258 coxpcall-1.17.0-1.src.rock +sha256 11f0f03dda1a28eca658d5e3361c15fd4d048371364aacc5f6870d77a66866c8 coxpcall/doc/license.html diff --git a/package/cpio/cpio.hash b/package/cpio/cpio.hash index a3a0d4b3f97..b03114635cc 100644 --- a/package/cpio/cpio.hash +++ b/package/cpio/cpio.hash @@ -1,7 +1,7 @@ # From https://lists.gnu.org/archive/html/info-gnu/2019-11/msg00002.html -md5 f3438e672e3fa273a7dc26339dd1eed6 cpio-2.13.tar.bz2 -sha1 4dcefc0e1bc36b11506a354768d82b15e3fe6bb8 cpio-2.13.tar.bz2 +md5 f3438e672e3fa273a7dc26339dd1eed6 cpio-2.13.tar.bz2 +sha1 4dcefc0e1bc36b11506a354768d82b15e3fe6bb8 cpio-2.13.tar.bz2 # Locally calculated after checking pgp signature -sha256 eab5bdc5ae1df285c59f2a4f140a98fc33678a0bf61bdba67d9436ae26b46f6d cpio-2.13.tar.bz2 +sha256 eab5bdc5ae1df285c59f2a4f140a98fc33678a0bf61bdba67d9436ae26b46f6d cpio-2.13.tar.bz2 # Locally calculated -sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING +sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING diff --git a/package/cppcms/Config.in b/package/cppcms/Config.in index 1d7635a83e9..6c0bff934cb 100644 --- a/package/cppcms/Config.in +++ b/package/cppcms/Config.in @@ -1,13 +1,10 @@ config BR2_PACKAGE_CPPCMS bool "cppcms" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on !BR2_STATIC_LIBS # dlopen() depends on BR2_USE_WCHAR - select BR2_PACKAGE_ZLIB select BR2_PACKAGE_PCRE - select BR2_PACKAGE_LIBGCRYPT help CppCMS is a Free High Performance Web Development Framework (not a CMS) aimed for Rapid Web Application Development. It diff --git a/package/cppcms/cppcms.hash b/package/cppcms/cppcms.hash index 86f86d94afa..a8d04ff36f5 100644 --- a/package/cppcms/cppcms.hash +++ b/package/cppcms/cppcms.hash @@ -1,8 +1,8 @@ -# From http://sourceforge.net/projects/cppcms/files/cppcms/1.2.1/ -sha1 9cb25cc5d507d2f4235326ba3815eba252b4ac77 cppcms-1.2.1.tar.bz2 -md5 2bb259fefb86532e404207c71c094a0c cppcms-1.2.1.tar.bz2 +# From http://sourceforge.net/projects/cppcms/files/cppcms/2.0.0-beta2/ +sha1 746cc5e3f58565d91d9ded6e2616399d60e9d01d cppcms-2.0.0.beta2.tar.bz2 +md5 ef561d13ee92d2053151cab073feba10 cppcms-2.0.0.beta2.tar.bz2 # Locally computed: -sha256 10fec7710409c949a229b9019ea065e25ff5687103037551b6f05716bf6cac52 cppcms-1.2.1.tar.bz2 -sha256 fb7c15ddf590037d4cd18ebd61148a2304b9243369d238a64f599182377e32db COPYING.TXT -sha256 3e4012cc5950e05bedfdd2f00ceffe1ef71c46ac8c79f07e237ecb23c773f65f MIT.TXT -sha256 d6ce062e5cf4f7e3c536d7d2fee84c882c45245f1848ed3162401f2b29fa2b4b THIRD_PARTY_SOFTWARE.TXT +sha256 697031c7d141fdd215c6be5090b66e2106a63bb3e52f09ee8120e8efc6c08a21 cppcms-2.0.0.beta2.tar.bz2 +sha256 fb7c15ddf590037d4cd18ebd61148a2304b9243369d238a64f599182377e32db COPYING.TXT +sha256 3e4012cc5950e05bedfdd2f00ceffe1ef71c46ac8c79f07e237ecb23c773f65f MIT.TXT +sha256 d6ce062e5cf4f7e3c536d7d2fee84c882c45245f1848ed3162401f2b29fa2b4b THIRD_PARTY_SOFTWARE.TXT diff --git a/package/cppcms/cppcms.mk b/package/cppcms/cppcms.mk index b289617bbc9..8a59990a8d2 100644 --- a/package/cppcms/cppcms.mk +++ b/package/cppcms/cppcms.mk @@ -4,8 +4,8 @@ # ################################################################################ -CPPCMS_VERSION = 1.2.1 -CPPCMS_SOURCE = cppcms-$(CPPCMS_VERSION).tar.bz2 +CPPCMS_VERSION = 2.0.0-beta2 +CPPCMS_SOURCE = cppcms-$(subst -,.,$(CPPCMS_VERSION)).tar.bz2 CPPCMS_LICENSE = MIT, BSL-1.0 (boost), Public Domain (json2.js), Zlib (md5) CPPCMS_LICENSE_FILES = COPYING.TXT MIT.TXT THIRD_PARTY_SOFTWARE.TXT CPPCMS_SITE = http://downloads.sourceforge.net/project/cppcms/cppcms/$(CPPCMS_VERSION) @@ -18,7 +18,7 @@ CPPCMS_CONF_OPTS = \ -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_CXX_FLAGS="$(CPPCMS_CXXFLAGS)" -CPPCMS_DEPENDENCIES = zlib pcre libgcrypt +CPPCMS_DEPENDENCIES = host-python3 pcre ifeq ($(BR2_PACKAGE_CPPCMS_ICU),y) CPPCMS_CONF_OPTS += -DDISABLE_ICU_LOCALE=OFF @@ -28,6 +28,27 @@ else CPPCMS_CONF_OPTS += -DDISABLE_ICU_LOCALE=ON endif +ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) +CPPCMS_CONF_OPTS += -DDISABLE_GCRYPT=OFF +CPPCMS_DEPENDENCIES += libgcrypt +else +CPPCMS_CONF_OPTS += -DDISABLE_GCRYPT=ON +endif + +ifeq ($(BR2_PACKAGE_OPENSSL),y) +CPPCMS_CONF_OPTS += -DDISABLE_OPENSSL=OFF +CPPCMS_DEPENDENCIES += openssl +else +CPPCMS_CONF_OPTS += -DDISABLE_OPENSSL=ON +endif + +ifeq ($(BR2_PACKAGE_ZLIB),y) +CPPCMS_CONF_OPTS += -DDISABLE_GZIP=OFF +CPPCMS_DEPENDENCIES += zlib +else +CPPCMS_CONF_OPTS += -DDISABLE_GZIP=ON +endif + ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) # posix backend needs monetary.h which isn't available on uClibc CPPCMS_CONF_OPTS += -DDISABLE_POSIX_LOCALE=on diff --git a/package/cppdb/cppdb.hash b/package/cppdb/cppdb.hash index 6423ef289e3..bca9f559598 100644 --- a/package/cppdb/cppdb.hash +++ b/package/cppdb/cppdb.hash @@ -1,6 +1,6 @@ # From http://sourceforge.net/projects/cppcms/files/cppdb/0.3.1/ -md5 129f1d75f46114b79160b93807d5223f cppdb-0.3.1.tar.bz2 -sha1 c0410dcc482d71696ac9206044b3a3ac03d31f96 cppdb-0.3.1.tar.bz2 +md5 129f1d75f46114b79160b93807d5223f cppdb-0.3.1.tar.bz2 +sha1 c0410dcc482d71696ac9206044b3a3ac03d31f96 cppdb-0.3.1.tar.bz2 # locally computed sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE_1_0.txt sha256 503ed52ef942d44bb26bd47dd5c6765927b198624e4f375e32cc660dfc2a0981 MIT.txt diff --git a/package/cppunit/cppunit.hash b/package/cppunit/cppunit.hash index 47577f2a0b0..50e33135e8e 100644 --- a/package/cppunit/cppunit.hash +++ b/package/cppunit/cppunit.hash @@ -1,6 +1,6 @@ # hash from: http://www.freedesktop.org/wiki/Software/cppunit/: -md5 9dc669e6145cadd9674873e24943e6dd cppunit-1.15.1.tar.gz -sha256 89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7 cppunit-1.15.1.tar.gz +md5 9dc669e6145cadd9674873e24943e6dd cppunit-1.15.1.tar.gz +sha256 89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7 cppunit-1.15.1.tar.gz # Locally calculated: -sha256 badf14d0aa3eaf1a7ae5f19a47a8ef2fc71a96802c4bc3d354535693c389f4e5 COPYING +sha256 badf14d0aa3eaf1a7ae5f19a47a8ef2fc71a96802c4bc3d354535693c389f4e5 COPYING diff --git a/package/cppzmq/cppzmq.hash b/package/cppzmq/cppzmq.hash index 31b93275df5..3fbee7af28b 100644 --- a/package/cppzmq/cppzmq.hash +++ b/package/cppzmq/cppzmq.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7a23639a45f3a0049e11a188e29aaedd10b2f4845f0000cf3e22d6774ebde0af cppzmq-4.8.1.tar.gz +sha256 3fdf5b100206953f674c94d40599bdb3ea255244dcc42fab0d75855ee3645581 cppzmq-4.9.0.tar.gz sha256 7e6db90e2e805c72b3daa77849d1cb5f1f92da0e69750c8a4aa1d86d70704748 LICENSE diff --git a/package/cppzmq/cppzmq.mk b/package/cppzmq/cppzmq.mk index 570ad4e3a3d..d702cc174e2 100644 --- a/package/cppzmq/cppzmq.mk +++ b/package/cppzmq/cppzmq.mk @@ -4,7 +4,7 @@ # ################################################################################ -CPPZMQ_VERSION = 4.8.1 +CPPZMQ_VERSION = 4.9.0 CPPZMQ_SITE = $(call github,zeromq,cppzmq,v$(CPPZMQ_VERSION)) CPPZMQ_INSTALL_STAGING = YES CPPZMQ_DEPENDENCIES = host-pkgconf zeromq diff --git a/package/cpuburn-arm/cpuburn-arm.hash b/package/cpuburn-arm/cpuburn-arm.hash index 55f34f87f8e..78f9ab93fc3 100644 --- a/package/cpuburn-arm/cpuburn-arm.hash +++ b/package/cpuburn-arm/cpuburn-arm.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 354381ec8c352e6c84875ac034004df44b0ed0ac097c400b8d2e47652815c3a2 cpuburn-arm-ad7e646700d14b81413297bda02fb7fe96613c3f.tar.gz -sha256 47f10095a04d16c8d8d52598371fa01b6a6e87134083b9ec3c43d83ff8576f55 cpuburn-a7.S +sha256 354381ec8c352e6c84875ac034004df44b0ed0ac097c400b8d2e47652815c3a2 cpuburn-arm-ad7e646700d14b81413297bda02fb7fe96613c3f.tar.gz +sha256 47f10095a04d16c8d8d52598371fa01b6a6e87134083b9ec3c43d83ff8576f55 cpuburn-a7.S diff --git a/package/cpulimit/0001-Fix-crash-and-compiler-warnings.patch b/package/cpulimit/0001-Fix-crash-and-compiler-warnings.patch new file mode 100644 index 00000000000..cb170b440b8 --- /dev/null +++ b/package/cpulimit/0001-Fix-crash-and-compiler-warnings.patch @@ -0,0 +1,57 @@ +From d1f42082590bed42cbf6ef1bf37e936df1afbf6b Mon Sep 17 00:00:00 2001 +From: Tobias Tangemann +Date: Thu, 9 Jul 2015 23:51:07 +0200 +Subject: [PATCH] Fix crash (and compiler warnings) + +[Upstream: https://github.com/opsengine/cpulimit/pull/48] +Signed-off-by: Florian Fainelli +--- + src/cpulimit.c | 2 +- + src/process_group.c | 4 ++++ + tests/process_iterator_test.c | 2 +- + 3 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/src/cpulimit.c b/src/cpulimit.c +index 50eabeacf214..42d7ca280738 100644 +--- a/src/cpulimit.c ++++ b/src/cpulimit.c +@@ -43,7 +43,7 @@ + #include + #include + +-#ifdef __APPLE__ || __FREEBSD__ ++#if defined(__APPLE__) || defined(__FREEBSD__) + #include + #endif + +diff --git a/src/process_group.c b/src/process_group.c +index 06d73a6f3541..c9e148cd1b60 100644 +--- a/src/process_group.c ++++ b/src/process_group.c +@@ -25,6 +25,10 @@ + #include + #include + ++#if defined(__APPLE__) || defined(__FREEBSD__) ++#include ++#endif ++ + #include + + #include "process_iterator.h" +diff --git a/tests/process_iterator_test.c b/tests/process_iterator_test.c +index 16151967eb24..1bfc167ba895 100644 +--- a/tests/process_iterator_test.c ++++ b/tests/process_iterator_test.c +@@ -28,7 +28,7 @@ + #include + #include + +-#ifdef __APPLE__ || __FREEBSD__ ++#if defined(__APPLE__) || defined(__FREEBSD__) + #include + #endif + +-- +2.25.1 + diff --git a/package/cpulimit/0002-Remove-sys-sysctl.h-and-add-missing-libgen.h-include.patch b/package/cpulimit/0002-Remove-sys-sysctl.h-and-add-missing-libgen.h-include.patch new file mode 100644 index 00000000000..fa32e3ede22 --- /dev/null +++ b/package/cpulimit/0002-Remove-sys-sysctl.h-and-add-missing-libgen.h-include.patch @@ -0,0 +1,42 @@ +From 4c1e021037550c437c7da3a276b95b5bf79e967e Mon Sep 17 00:00:00 2001 +From: Portia +Date: Sun, 1 May 2022 12:43:35 +1000 +Subject: [PATCH] Remove sys/sysctl.h and add missing libgen.h include + +- sys/sysctl.h has been deprecated and should be removed +- Adds missing libgen.h include when calling basename() + +Signed-off-by: Florian Fainelli +[Upstream: https://github.com/opsengine/cpulimit/pull/109] +--- + src/cpulimit.c | 1 - + src/process_group.c | 1 + + 2 files changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/cpulimit.c b/src/cpulimit.c +index 50eabeacf214..5b0ec4978f02 100644 +--- a/src/cpulimit.c ++++ b/src/cpulimit.c +@@ -38,7 +38,6 @@ + #include + #include + #include +-#include + #include + #include + #include +diff --git a/src/process_group.c b/src/process_group.c +index 06d73a6f3541..d4f6fab3385c 100644 +--- a/src/process_group.c ++++ b/src/process_group.c +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + + #include + +-- +2.25.1 + diff --git a/package/cpulimit/0003-Fix-an-infrequent-crash.patch b/package/cpulimit/0003-Fix-an-infrequent-crash.patch new file mode 100644 index 00000000000..a19fb6e304d --- /dev/null +++ b/package/cpulimit/0003-Fix-an-infrequent-crash.patch @@ -0,0 +1,26 @@ +From 512998f967a9dab5e98010e1043985fc855d9f4e Mon Sep 17 00:00:00 2001 +From: Pavel Timofeev +Date: Thu, 14 Jul 2016 13:50:35 +0300 +Subject: [PATCH] Fix an infrequent crash + +Signed-off-by: Florian Fainelli +[Upstream: https://github.com/opsengine/cpulimit/pull/61] +--- + src/process_iterator_linux.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/process_iterator_linux.c b/src/process_iterator_linux.c +index c8cdd07adcbe..93b44bab1755 100644 +--- a/src/process_iterator_linux.c ++++ b/src/process_iterator_linux.c +@@ -98,6 +98,7 @@ static int read_process_info(pid_t pid, struct process *p) + //read command line + sprintf(exefile,"/proc/%d/cmdline", p->pid); + fd = fopen(exefile, "r"); ++ if (fd==NULL) return -1; + if (fgets(buffer, sizeof(buffer), fd)==NULL) { + fclose(fd); + return -1; +-- +2.25.1 + diff --git a/package/cpulimit/0004-Remove-procfs.h-inclusion.patch b/package/cpulimit/0004-Remove-procfs.h-inclusion.patch new file mode 100644 index 00000000000..771c2fe12c7 --- /dev/null +++ b/package/cpulimit/0004-Remove-procfs.h-inclusion.patch @@ -0,0 +1,30 @@ +From 48a88c033c5704d37645051ca51799a8b5a7e059 Mon Sep 17 00:00:00 2001 +From: Florian Fainelli +Date: Thu, 19 May 2022 14:22:40 -0700 +Subject: [PATCH] Remove procfs.h inclusion + +We do not use anything from this header + +Signed-off-by: Florian Fainelli +[Upstream: https://github.com/opsengine/cpulimit/pull/110] +--- + src/process_iterator.c | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/src/process_iterator.c b/src/process_iterator.c +index 8b4019d237f2..5b6c651bc5d0 100644 +--- a/src/process_iterator.c ++++ b/src/process_iterator.c +@@ -22,9 +22,6 @@ + #include + #include + #include +-#ifndef __APPLE__ +-#include +-#endif + #include + #include "process_iterator.h" + +-- +2.25.1 + diff --git a/package/cpulimit/Config.in b/package/cpulimit/Config.in new file mode 100644 index 00000000000..11a4f1da01e --- /dev/null +++ b/package/cpulimit/Config.in @@ -0,0 +1,13 @@ +comment "cpulimit needs a toolchain w/ threads" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS + +config BR2_PACKAGE_CPULIMIT + bool "cpulimit" + depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_HAS_THREADS + help + Cpulimit is a tool which limits the CPU usage of a process + (expressed in percentage, not in CPU time) + + https://github.com/opsengine/cpulimit diff --git a/package/cpulimit/cpulimit.hash b/package/cpulimit/cpulimit.hash new file mode 100644 index 00000000000..c6ef4b2e69d --- /dev/null +++ b/package/cpulimit/cpulimit.hash @@ -0,0 +1,3 @@ +# sha256sum locally computed: +sha256 64312f9ac569ddcadb615593cd002c94b76e93a0d4625d3ce1abb49e08e2c2da cpulimit-0.2.tar.gz +sha256 920489ca9da706d842870701155e70a101315ba0783cff39765d7e15e0916a4a LICENSE diff --git a/package/cpulimit/cpulimit.mk b/package/cpulimit/cpulimit.mk new file mode 100644 index 00000000000..a864685a846 --- /dev/null +++ b/package/cpulimit/cpulimit.mk @@ -0,0 +1,23 @@ +################################################################################ +# +# cpulimit +# +################################################################################ + +CPULIMIT_VERSION = 0.2 +CPULIMIT_SITE = $(call github,opsengine,cpulimit,v$(CPULIMIT_VERSION)) +CPULIMIT_LICENSE = GPL-2.0+ +CPULIMIT_LICENSE_FILES = LICENSE + +define CPULIMIT_BUILD_CMDS + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ + CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" \ + LDLIBS="$(TARGET_LDFLAGS)" +endef + +define CPULIMIT_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/src/cpulimit \ + $(TARGET_DIR)/usr/bin/cpulimit +endef + +$(eval $(generic-package)) diff --git a/package/cpuload/cpuload.hash b/package/cpuload/cpuload.hash index b80879ca7d6..c3150d75938 100644 --- a/package/cpuload/cpuload.hash +++ b/package/cpuload/cpuload.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1d61f4776dc3e2746343d68b2ea2faf138e54666b630a6060df4f3945badbcae cpuload-0.3.tar.gz -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING +sha256 1d61f4776dc3e2746343d68b2ea2faf138e54666b630a6060df4f3945badbcae cpuload-0.3.tar.gz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/cracklib/0001-Force-grep-to-treat-the-input-as-text-when-formattin.patch b/package/cracklib/0001-Force-grep-to-treat-the-input-as-text-when-formattin.patch deleted file mode 100644 index b05a69caa2a..00000000000 --- a/package/cracklib/0001-Force-grep-to-treat-the-input-as-text-when-formattin.patch +++ /dev/null @@ -1,30 +0,0 @@ -From d27062fe7a520d5791f7a56d175a5cb6a39bae61 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Stefan=20S=C3=B8rensen?= -Date: Tue, 18 Apr 2017 12:00:39 +0200 -Subject: [PATCH] Force grep to treat the input as text when formatting word - files. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Stefan Sørensen ---- - util/cracklib-format | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/util/cracklib-format b/util/cracklib-format -index 1d7be5b..b1de8e8 100644 ---- a/util/cracklib-format -+++ b/util/cracklib-format -@@ -4,7 +4,7 @@ - # into cracklib-packer - # - gzip -cdf "$@" | -- grep -v '^\(#\|$\)' | -+ grep -a -v '^\(#\|$\)' | - tr '[A-Z]' '[a-z]' | - tr -cd '\012[a-z][0-9]' | - env LC_ALL=C sort -u --- -2.9.3 - diff --git a/package/cracklib/cracklib.hash b/package/cracklib/cracklib.hash index 9bc8e3d28ae..ff527d517a6 100644 --- a/package/cracklib/cracklib.hash +++ b/package/cracklib/cracklib.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 8b6fd202f3f1d8fa395d3b7a5d821227cfd8bb4a9a584a7ae30cf62cea6287dd cracklib-2.9.7.tar.gz -sha256 7f0c45faf84a2494f15d1e2720394aca4a379163a70c4acad948186c0047d389 cracklib-words-2.9.7.gz -sha256 f18a0811fa0e220ccbc42f661545e77f0388631e209585ed582a1c693029c6aa COPYING.LIB +sha256 1f9d34385ea3aa7cd7c07fa388dc25810aea9d3c33e260c713a3a5873d70e386 cracklib-2.9.8.tar.bz2 +sha256 ec25ac4a474588c58d901715512d8902b276542b27b8dd197e9c2ad373739ec4 cracklib-words-2.9.8.bz2 +sha256 f18a0811fa0e220ccbc42f661545e77f0388631e209585ed582a1c693029c6aa COPYING.LIB diff --git a/package/cracklib/cracklib.mk b/package/cracklib/cracklib.mk index 46917b7926a..bb7c18d5bed 100644 --- a/package/cracklib/cracklib.mk +++ b/package/cracklib/cracklib.mk @@ -4,7 +4,8 @@ # ################################################################################ -CRACKLIB_VERSION = 2.9.7 +CRACKLIB_VERSION = 2.9.8 +CRACKLIB_SOURCE = cracklib-$(CRACKLIB_VERSION).tar.bz2 CRACKLIB_SITE = https://github.com/cracklib/cracklib/releases/download/v$(CRACKLIB_VERSION) CRACKLIB_LICENSE = LGPL-2.1 CRACKLIB_LICENSE_FILES = COPYING.LIB @@ -33,8 +34,8 @@ endif HOST_CRACKLIB_CONF_OPTS += --without-python --without-zlib ifeq ($(BR2_PACKAGE_CRACKLIB_FULL_DICT),y) -CRACKLIB_EXTRA_DOWNLOADS = cracklib-words-$(CRACKLIB_VERSION).gz -CRACKLIB_DICT_SOURCE = $(CRACKLIB_DL_DIR)/cracklib-words-$(CRACKLIB_VERSION).gz +CRACKLIB_EXTRA_DOWNLOADS = cracklib-words-$(CRACKLIB_VERSION).bz2 +CRACKLIB_DICT_SOURCE = $(CRACKLIB_DL_DIR)/cracklib-words-$(CRACKLIB_VERSION).bz2 else CRACKLIB_DICT_SOURCE = $(@D)/dicts/cracklib-small endif diff --git a/package/crda/0002-drop-ldconfig-call.patch b/package/crda/0002-drop-ldconfig-call.patch index f09e258adb9..567840c07e3 100644 --- a/package/crda/0002-drop-ldconfig-call.patch +++ b/package/crda/0002-drop-ldconfig-call.patch @@ -1,6 +1,8 @@ Drop ldconfig call, it's useless for cross-compiling. Signed-off-by: Gustavo Zacarias +[Fabrice: update for 4.15] +Signed-off-by: Fabrice Fontaine diff -Nura crda-3.18.orig/Makefile crda-3.18/Makefile --- crda-3.18.orig/Makefile 2015-02-18 10:34:23.841259401 -0300 @@ -8,7 +10,7 @@ diff -Nura crda-3.18.orig/Makefile crda-3.18/Makefile @@ -127,7 +127,6 @@ $(NQ) ' INSTALL libreg' $(Q)mkdir -p $(DESTDIR)/$(LIBDIR) - $(Q)cp $(LIBREG) $(DESTDIR)/$(LIBDIR)/ + $(Q)$(INSTALL) -m 644 $(LIBREG) $(DESTDIR)/$(LIBDIR)/ - $(Q)ldconfig %.o: %.c regdb.h $(LIBREG) diff --git a/package/crda/crda.hash b/package/crda/crda.hash index 2a263d172a2..3b0610994ed 100644 --- a/package/crda/crda.hash +++ b/package/crda/crda.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5a8f35bb8b27474f466b0e75d451ba917433d8aab1889678a64d9c4e72a8b8c2 crda-4.14.tar.gz +sha256 99eb58f774f6016c380def0d80fffd573d2be0ad5f117b678c1968ed5657af82 crda-4.15.tar.gz sha256 c16224b376128b589eea69a8fdd1f09818b8cb995e10d1e37f72dff22233d7b0 LICENSE diff --git a/package/crda/crda.mk b/package/crda/crda.mk index 31a64d004b6..a73c9aa26da 100644 --- a/package/crda/crda.mk +++ b/package/crda/crda.mk @@ -4,7 +4,7 @@ # ################################################################################ -CRDA_VERSION = 4.14 +CRDA_VERSION = 4.15 CRDA_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/crda.git/snapshot CRDA_DEPENDENCIES = host-pkgconf host-python-pycryptodomex libnl libgcrypt CRDA_LICENSE = ISC diff --git a/package/crucible/Config.in b/package/crucible/Config.in new file mode 100644 index 00000000000..b27eb31ae5d --- /dev/null +++ b/package/crucible/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_CRUCIBLE + bool "crucible" + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + help + Crucible is a One-Time-Programmable (OTP) fusing tool for the + i.MX family. + + https://github.com/usbarmory/crucible diff --git a/package/crucible/crucible.hash b/package/crucible/crucible.hash new file mode 100644 index 00000000000..d0a2a63fab2 --- /dev/null +++ b/package/crucible/crucible.hash @@ -0,0 +1,2 @@ +sha256 1229c7d1587a97e9f3d456392e06c7be288bacf6ffb68c940d497bf55edab20b crucible-2022.05.25.tar.gz +sha256 d88514630470aec9fa7abdc990a1e0a8751a752321bffa868188c49009d64d59 LICENSE diff --git a/package/crucible/crucible.mk b/package/crucible/crucible.mk new file mode 100644 index 00000000000..fdad709dded --- /dev/null +++ b/package/crucible/crucible.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# crucible +# +################################################################################ + +CRUCIBLE_VERSION = 2022.05.25 +CRUCIBLE_SITE = $(call github,usbarmory,crucible,v$(CRUCIBLE_VERSION)) +CRUCIBLE_LICENSE = GPL-3.0 +CRUCIBLE_LICENSE_FILES = LICENSE +CRUCIBLE_GOMOD = ./cmd/crucible + +$(eval $(golang-package)) diff --git a/package/crudini/0001-prefer-shlex-over-pipes.patch b/package/crudini/0001-prefer-shlex-over-pipes.patch new file mode 100644 index 00000000000..16296f619fa --- /dev/null +++ b/package/crudini/0001-prefer-shlex-over-pipes.patch @@ -0,0 +1,41 @@ +From d81b703f3e8e29c1547386135c7e9ca539c1f054 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?P=C3=A1draig=20Brady?= +Date: Tue, 2 Aug 2022 14:40:37 +0100 +Subject: [PATCH] prefer shlex over pipes + +pipes is deprecated since python 3.10 +and slated for removal in python 3.13 + +[Romain backport to 0.9.3] +Upstream: https://github.com/pixelb/crudini/commit/e1650941054822faad4cda788bff6fe364eb4ca3 +Signed-off-by: Romain Naour +--- + crudini | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/crudini b/crudini +index 669596b..a136241 100755 +--- a/crudini ++++ b/crudini +@@ -17,15 +17,17 @@ import getopt + import hashlib + import iniparse + import os +-import pipes ++import re + import shutil + import string + import tempfile + + if sys.version_info[0] >= 3: ++ import shlex as pipes + from io import StringIO + import configparser + else: ++ import pipes + from cStringIO import StringIO + import ConfigParser as configparser + +-- +2.34.3 + diff --git a/package/crudini/Config.in.host b/package/crudini/Config.in.host new file mode 100644 index 00000000000..4e770956272 --- /dev/null +++ b/package/crudini/Config.in.host @@ -0,0 +1,9 @@ +config BR2_PACKAGE_HOST_CRUDINI + bool "host crudini" + select BR2_PACKAGE_HOST_PYTHON3 + select BR2_PACKAGE_HOST_PYTHON_INIPARSE # runtime + help + A utility for handling ini files from the command line and + shell scripts + + https://pypi.python.org/pypi/crudini diff --git a/package/crudini/crudini.mk b/package/crudini/crudini.mk index 7141e2b2a0b..48e0ebde8ff 100644 --- a/package/crudini/crudini.mk +++ b/package/crudini/crudini.mk @@ -9,5 +9,9 @@ CRUDINI_SITE = $(call github,pixelb,crudini,$(CRUDINI_VERSION)) CRUDINI_SETUP_TYPE = setuptools CRUDINI_LICENSE = GPL-2.0 CRUDINI_LICENSE_FILES = COPYING +# This is a runtime dependency, but we don't have the concept of +# runtime dependencies for host packages. +HOST_CRUDINI_DEPENDENCIES = host-python-iniparse $(eval $(python-package)) +$(eval $(host-python-package)) diff --git a/package/crun/0001-src-crun.c-fix-build-without-dlfcn.h.patch b/package/crun/0001-src-crun.c-fix-build-without-dlfcn.h.patch new file mode 100644 index 00000000000..104c19a40ff --- /dev/null +++ b/package/crun/0001-src-crun.c-fix-build-without-dlfcn.h.patch @@ -0,0 +1,39 @@ +From 278b9b447bec3fb81bf252eb2fe2c856892ec802 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 30 Dec 2022 18:40:15 +0100 +Subject: [PATCH] src/crun.c: fix build without dlfcn.h + +Fix the following build failure without dlfcn.h raised since version 1.7 +and +https://github.com/containers/crun/commit/5837234e9840cd067edd9f6cd2ed9cae9a0e6570: + +src/crun.c:26:10: fatal error: dlfcn.h: No such file or directory + 26 | #include + | ^~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/a5f52a7ee757c92c9571261c0ed884d05caeaf2f + +[fontaine.fabrice@gmail.com: backport upstream commit] +Signed-off-by: Fabrice Fontaine +--- + src/crun.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/crun.c b/src/crun.c +index cbfe900..af0cc97 100644 +--- a/src/crun.c ++++ b/src/crun.c +@@ -23,7 +23,9 @@ + #include + #include + ++#ifdef HAVE_DLOPEN + #include ++#endif + + #include "crun.h" + #include "libcrun/utils.h" +-- +2.25.1 + diff --git a/package/crun/Config.in b/package/crun/Config.in new file mode 100644 index 00000000000..45c86f0655a --- /dev/null +++ b/package/crun/Config.in @@ -0,0 +1,14 @@ +config BR2_PACKAGE_CRUN + bool "crun" + depends on !BR2_TOOLCHAIN_USES_UCLIBC # no fexecve + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C11/stdatomic.h + select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_MUSL + select BR2_PACKAGE_YAJL # libocispec + help + crun is a fast and low-memory OCI Container Runtime in C. + + https://github.com/containers/crun + +comment "crun needs a glibc or musl toolchain, gcc >= 4.9" + depends on BR2_TOOLCHAIN_USES_UCLIBC || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/crun/crun.hash b/package/crun/crun.hash new file mode 100644 index 00000000000..2b21800f022 --- /dev/null +++ b/package/crun/crun.hash @@ -0,0 +1,4 @@ +# Locally computed +sha256 f669ecd3d1895dcaa8425eabb707c06eb3bdb5ae5201a50a423c3cace36c4a05 crun-1.7.2.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.libcrun diff --git a/package/crun/crun.mk b/package/crun/crun.mk new file mode 100644 index 00000000000..ddb96a0b336 --- /dev/null +++ b/package/crun/crun.mk @@ -0,0 +1,54 @@ +################################################################################ +# +# crun +# +################################################################################ + +CRUN_VERSION = 1.7.2 +CRUN_SITE = https://github.com/containers/crun/releases/download/$(CRUN_VERSION) +CRUN_DEPENDENCIES = host-pkgconf yajl + +CRUN_LICENSE = GPL-2.0+ (crun binary), LGPL-2.1+ (libcrun) +CRUN_LICENSE_FILES = COPYING COPYING.libcrun +CRUN_CPE_ID_VENDOR = crun_project + +CRUN_AUTORECONF = YES +CRUN_CONF_OPTS = --disable-embedded-yajl + +ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y) +CRUN_DEPENDENCIES += argp-standalone +endif + +ifeq ($(BR2_PACKAGE_LIBCAP),y) +CRUN_DEPENDENCIES += libcap +CRUN_CONF_OPTS += --enable-caps +else +CRUN_CONF_OPTS += --disable-caps +endif + +ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) +CRUN_DEPENDENCIES += libgcrypt +endif + +ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) +CRUN_DEPENDENCIES += libseccomp +CRUN_CONF_OPTS += --enable-seccomp +else +CRUN_CONF_OPTS += --disable-seccomp +endif + +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +CRUN_CONF_OPTS += --enable-systemd +CRUN_DEPENDENCIES += systemd host-pkgconf +else +CRUN_CONF_OPTS += --disable-systemd +endif + +ifeq ($(BR2_PACKAGE_RUNC),) +define CRUN_CREATE_SYMLINK + ln -sf crun $(TARGET_DIR)/usr/bin/runc +endef +CRUN_POST_INSTALL_TARGET_HOOKS += CRUN_CREATE_SYMLINK +endif + +$(eval $(autotools-package)) diff --git a/package/cryptodev-linux/cryptodev-linux.mk b/package/cryptodev-linux/cryptodev-linux.mk index f9026053c83..d0c3bc5218e 100644 --- a/package/cryptodev-linux/cryptodev-linux.mk +++ b/package/cryptodev-linux/cryptodev-linux.mk @@ -23,5 +23,10 @@ define CRYPTODEV_LINUX_INSTALL_STAGING_CMDS $(STAGING_DIR)/usr/include/crypto/cryptodev.h endef +define CRYPTODEV_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_CRYPTO) + $(call KCONFIG_ENABLE_OPT,CONFIG_CRYPTO_USER_API_AEAD) +endef + $(eval $(kernel-module)) $(eval $(generic-package)) diff --git a/package/cryptsetup/0001-Add-check-program-for-symver-attribute.patch b/package/cryptsetup/0001-Add-check-program-for-symver-attribute.patch deleted file mode 100644 index 04f59a20506..00000000000 --- a/package/cryptsetup/0001-Add-check-program-for-symver-attribute.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 7c6ec620de3f99d4212f4a54aa576df1b97020ab Mon Sep 17 00:00:00 2001 -From: Ondrej Kozina -Date: Wed, 2 Feb 2022 11:34:57 +0100 -Subject: [PATCH] Add check program for symver attribute. - -Fixes: #709. -Signed-off-by: Giulio Benetti ---- - configure.ac | 11 +++++++++++ - lib/libcryptsetup_symver.h | 8 +++----- - 2 files changed, 14 insertions(+), 5 deletions(-) - -diff --git a/configure.ac b/configure.ac -index a0e5990d..b052f8cf 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -554,6 +554,17 @@ if test "x$enable_static_cryptsetup" = "xyes"; then - PKG_CONFIG=$saved_PKG_CONFIG - fi - -+dnl Check compiler support for symver function attribute -+saved_CFLAGS=$CFLAGS -+CFLAGS="-O0 -Werror" -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -+ void _test_sym(void); -+ __attribute__((__symver__("sym@VERSION_4.2"))) void _test_sym(void) {} -+]], -+[[ _test_sym() ]] -+)],[ AC_DEFINE([HAVE_ATTRIBUTE_SYMVER], 1, [Define to 1 to use __attribute__((symver))])]) -+CFLAGS=$saved_CFLAGS -+ - AC_MSG_CHECKING([for systemd tmpfiles config directory]) - PKG_CHECK_VAR([systemd_tmpfilesdir], [systemd], [tmpfilesdir], [], [systemd_tmpfilesdir=no]) - AC_MSG_RESULT([$systemd_tmpfilesdir]) -diff --git a/lib/libcryptsetup_symver.h b/lib/libcryptsetup_symver.h -index 2a804b6a..3558310d 100644 ---- a/lib/libcryptsetup_symver.h -+++ b/lib/libcryptsetup_symver.h -@@ -67,11 +67,9 @@ - * under CRYPT_SYMBOL_EXPORT_OLD(int, crypt_func_X, ...) macro - */ - --#ifdef __has_attribute --# if __has_attribute(symver) --# define _CRYPT_SYMVER(_local_sym, _public_sym, _ver_str, _maj, _min) \ -- __attribute__((__symver__(#_public_sym _ver_str #_maj "." #_min))) --# endif -+#if HAVE_ATTRIBUTE_SYMVER -+# define _CRYPT_SYMVER(_local_sym, _public_sym, _ver_str, _maj, _min) \ -+ __attribute__((__symver__(#_public_sym _ver_str #_maj "." #_min))) - #endif - - #if !defined(_CRYPT_SYMVER) && defined(__GNUC__) --- -2.25.1 - diff --git a/package/cryptsetup/cryptsetup.hash b/package/cryptsetup/cryptsetup.hash index dce2686d315..87cdf840c3d 100644 --- a/package/cryptsetup/cryptsetup.hash +++ b/package/cryptsetup/cryptsetup.hash @@ -1,4 +1,4 @@ -# From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.4/sha256sums.asc -sha256 fc0df945188172264ec5bf1d0bda08264fadc8a3f856d47eba91f31fe354b507 cryptsetup-2.4.3.tar.xz +# From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.6/sha256sums.asc +sha256 410ded65a1072ab9c8e41added37b9729c087fef4d2db02bb4ef529ad6da4693 cryptsetup-2.6.1.tar.xz sha256 45670cce8b6a0ddd66c8016cd8ccef6cd71f35717cbacc7f1e895b3855207b33 COPYING sha256 8c33cc37871654ec7ed87e6fbb896c8cf33ef5ef05b1611a5aed857596ffafa5 COPYING.LGPL diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index bd8681d5fff..3f3034475f5 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -4,8 +4,8 @@ # ################################################################################ -CRYPTSETUP_VERSION_MAJOR = 2.4 -CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).3 +CRYPTSETUP_VERSION_MAJOR = 2.6 +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 = \ @@ -18,21 +18,24 @@ CRYPTSETUP_LICENSE_FILES = COPYING COPYING.LGPL CRYPTSETUP_CPE_ID_VENDOR = cryptsetup_project CRYPTSETUP_INSTALL_STAGING = YES -# 0001-Add-check-program-for-symver-attribute.patch -CRYPTSETUP_AUTORECONF = YES - CRYPTSETUP_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)" -CRYPTSETUP_CONF_OPTS += --enable-blkid --enable-libargon2 +CRYPTSETUP_CONF_OPTS += --enable-blkid --enable-libargon2 --disable-asciidoc -# cryptsetup uses libgcrypt by default, but can be configured to use OpenSSL -# or kernel crypto modules instead -ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) +# cryptsetup uses OpenSSL by default, but can be configured to use libgcrypt, +# nettle, libnss or kernel crypto modules instead +ifeq ($(BR2_PACKAGE_OPENSSL),y) +CRYPTSETUP_DEPENDENCIES += openssl +CRYPTSETUP_CONF_OPTS += --with-crypto_backend=openssl +else ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) CRYPTSETUP_DEPENDENCIES += libgcrypt CRYPTSETUP_CONF_ENV += LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config CRYPTSETUP_CONF_OPTS += --with-crypto_backend=gcrypt -else ifeq ($(BR2_PACKAGE_OPENSSL),y) -CRYPTSETUP_DEPENDENCIES += openssl -CRYPTSETUP_CONF_OPTS += --with-crypto_backend=openssl +else ifeq ($(BR2_PACKAGE_NETTLE),y) +CRYPTSETUP_DEPENDENCIES += nettle +CRYPTSETUP_CONF_OPTS += --with-crypto_backend=nettle +else ifeq ($(BR2_PACKAGE_LIBNSS),y) +CRYPTSETUP_DEPENDENCIES += libnss +CRYPTSETUP_CONF_OPTS += --with-crypto_backend=nss else CRYPTSETUP_CONF_OPTS += --with-crypto_backend=kernel endif @@ -62,7 +65,8 @@ HOST_CRYPTSETUP_CONF_OPTS = --with-crypto_backend=openssl \ --disable-kernel_crypto \ --disable-ssh-token \ --enable-blkid \ - --with-tmpfilesdir=no + --with-tmpfilesdir=no \ + --disable-asciidoc $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/package/ctorrent/ctorrent.hash b/package/ctorrent/ctorrent.hash index 3e829026280..1b1d2fceb91 100644 --- a/package/ctorrent/ctorrent.hash +++ b/package/ctorrent/ctorrent.hash @@ -1,5 +1,5 @@ # From http://sourceforge.net/projects/dtorrent/files/dtorrent/3.3.2/ -sha1 d4e221f0292268f80e2430ce9d451dd64cf1ffaa ctorrent-dnh3.3.2.tar.gz +sha1 d4e221f0292268f80e2430ce9d451dd64cf1ffaa ctorrent-dnh3.3.2.tar.gz # locally calculated sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/cukinia/cukinia.hash b/package/cukinia/cukinia.hash index e6ae6020110..6e76a6ab88a 100644 --- a/package/cukinia/cukinia.hash +++ b/package/cukinia/cukinia.hash @@ -1,4 +1,4 @@ # locally computed -sha256 b867ec63e448e7fa0a9276f6844a8b3a8f92d99e63e8518fe24e9debd32679b5 cukinia-0.5.1.tar.gz +sha256 79dc77c7b9f2784e7d22d961dd2c4ad9c78deebbc6e8f39df4fa214118682b40 cukinia-0.6.0.tar.gz sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPLv3 diff --git a/package/cukinia/cukinia.mk b/package/cukinia/cukinia.mk index 84d4e60ea82..798c199b678 100644 --- a/package/cukinia/cukinia.mk +++ b/package/cukinia/cukinia.mk @@ -4,7 +4,7 @@ # ################################################################################ -CUKINIA_VERSION = 0.5.1 +CUKINIA_VERSION = 0.6.0 CUKINIA_SITE = $(call github,savoirfairelinux,cukinia,v$(CUKINIA_VERSION)) CUKINIA_LICENSE = Apache-2.0 or GPL-3.0 CUKINIA_LICENSE_FILES = LICENSE LICENSE.GPLv3 diff --git a/package/cunit/cunit.hash b/package/cunit/cunit.hash index bbd43a78ca0..93a8c4208be 100644 --- a/package/cunit/cunit.hash +++ b/package/cunit/cunit.hash @@ -1,3 +1,3 @@ # Locally calculated: -sha256 f5b29137f845bb08b77ec60584fdb728b4e58f1023e6f249a464efa49a40f214 CUnit-2.1-3.tar.bz2 -sha256 5d9d73d41a57dd2f34487ef3978a2c13cdb97294baeeb81fcd274796399eb15f COPYING +sha256 f5b29137f845bb08b77ec60584fdb728b4e58f1023e6f249a464efa49a40f214 CUnit-2.1-3.tar.bz2 +sha256 5d9d73d41a57dd2f34487ef3978a2c13cdb97294baeeb81fcd274796399eb15f COPYING diff --git a/package/cups-filters/cups-filters.hash b/package/cups-filters/cups-filters.hash index aefb67f651a..b910cdce134 100644 --- a/package/cups-filters/cups-filters.hash +++ b/package/cups-filters/cups-filters.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 8cb40355287d65ea03e90dfa7e2d34f0d46752957c8a6d4e96ab6fe6c581e5d2 cups-filters-1.28.10.tar.gz -sha256 38192ffdaca98b718f78b2d4abc38bb087f0bbcc9a16d212c98b903b985f900f COPYING +sha256 0ca77bb820719a040ff003ecb478d0c2ceffc94e8bd1cd03ddb5a199444127ba cups-filters-1.28.16.tar.gz +sha256 38192ffdaca98b718f78b2d4abc38bb087f0bbcc9a16d212c98b903b985f900f COPYING diff --git a/package/cups-filters/cups-filters.mk b/package/cups-filters/cups-filters.mk index c8f2dd0aaeb..3250649e076 100644 --- a/package/cups-filters/cups-filters.mk +++ b/package/cups-filters/cups-filters.mk @@ -4,7 +4,7 @@ # ################################################################################ -CUPS_FILTERS_VERSION = 1.28.10 +CUPS_FILTERS_VERSION = 1.28.16 CUPS_FILTERS_SITE = http://openprinting.org/download/cups-filters CUPS_FILTERS_LICENSE = GPL-2.0, GPL-2.0+, GPL-3.0, GPL-3.0+, LGPL-2, LGPL-2.1+, MIT, BSD-4-Clause CUPS_FILTERS_LICENSE_FILES = COPYING @@ -73,6 +73,13 @@ else CUPS_FILTERS_CONF_OPTS += --disable-poppler endif +ifeq ($(BR2_PACKAGE_LIBEXIF),y) +CUPS_FILTERS_CONF_OPTS += --enable-exif +CUPS_FILTERS_DEPENDENCIES += libexif +else +CUPS_FILTERS_CONF_OPTS += --disable-exif +endif + define CUPS_FILTERS_INSTALL_INIT_SYSV $(INSTALL) -D -m 0755 package/cups-filters/S82cups-browsed \ $(TARGET_DIR)/etc/init.d/S82cups-browsed diff --git a/package/cups-pk-helper/Config.in b/package/cups-pk-helper/Config.in index 113f433795a..756ac49cfa2 100644 --- a/package/cups-pk-helper/Config.in +++ b/package/cups-pk-helper/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_CUPS_PK_HELPER depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2, polkit depends on BR2_USE_WCHAR # libglib2 depends on !BR2_STATIC_LIBS # polkit -> duktape + depends on !BR2_OPTIMIZE_FAST # polkit -> duktape depends on BR2_PACKAGE_CUPS select BR2_PACKAGE_POLKIT help @@ -17,3 +18,6 @@ comment "cups-pk-helper support needs a toolchain with threads, wchar, dynamic l depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + +comment "cups-pk-helper can't be built with Optimize for fast" + depends on BR2_OPTIMIZE_FAST diff --git a/package/cups-pk-helper/cups-pk-helper.hash b/package/cups-pk-helper/cups-pk-helper.hash index 18fe789389a..75c5a5ffdaf 100644 --- a/package/cups-pk-helper/cups-pk-helper.hash +++ b/package/cups-pk-helper/cups-pk-helper.hash @@ -1,3 +1,4 @@ +# From https://www.freedesktop.org/software/cups-pk-helper/releases/cups-pk-helper-0.2.7.tar.xz.sha256sum +sha256 66070ddb448fe9fcee76aa26be2ede5a80f85563e3a4afd59d2bfd79fbe2e831 cups-pk-helper-0.2.7.tar.xz # Locally computed: -sha256 959af8f2f5a2761e7e498b61c9caf25ae963335031eae9972d999e9a0d97a228 cups-pk-helper-0.2.6.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/cups-pk-helper/cups-pk-helper.mk b/package/cups-pk-helper/cups-pk-helper.mk index c688743160a..2bd00c69126 100644 --- a/package/cups-pk-helper/cups-pk-helper.mk +++ b/package/cups-pk-helper/cups-pk-helper.mk @@ -4,7 +4,7 @@ # ################################################################################ -CUPS_PK_HELPER_VERSION = 0.2.6 +CUPS_PK_HELPER_VERSION = 0.2.7 CUPS_PK_HELPER_SITE = https://www.freedesktop.org/software/cups-pk-helper/releases CUPS_PK_HELPER_SOURCE = cups-pk-helper-$(CUPS_PK_HELPER_VERSION).tar.xz CUPS_PK_HELPER_LICENSE = GPL-2.0+ @@ -12,4 +12,4 @@ CUPS_PK_HELPER_LICENSE_FILES = COPYING CUPS_PK_HELPER_CPE_ID_VENDOR = cups-pk-helper_project CUPS_PK_HELPER_DEPENDENCIES = cups libglib2 polkit -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/package/cups/Config.in b/package/cups/Config.in index e23f069a8a5..51cf10b073b 100644 --- a/package/cups/Config.in +++ b/package/cups/Config.in @@ -9,7 +9,7 @@ config BR2_PACKAGE_CUPS help The Common Unix Printing System - http://www.cups.org + https://openprinting.github.io/cups comment "cups needs a toolchain w/ C++, threads" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/cups/cups.hash b/package/cups/cups.hash index b0e3654b3de..501d8c12a62 100644 --- a/package/cups/cups.hash +++ b/package/cups/cups.hash @@ -1,4 +1,4 @@ # Locally calculated: -sha256 9abecec128ca6847c5bb2d3e3d30c87b782c0697b9acf284d16fa38f80a3a6de cups-2.4.0-source.tar.gz +sha256 58e970cf1955e1cc87d0847c32526d9c2ccee335e5f0e3882b283138ba0e7262 cups-2.4.6-source.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE -sha256 a2a46d024e4d78dd2475d89f2f3d905578edfeca7dcb041e1d0ba079d9a87b48 NOTICE +sha256 5320b6e3c252423e4153eb2dd63e57e3b630afb21139f44e43b02d85fe33e279 NOTICE diff --git a/package/cups/cups.mk b/package/cups/cups.mk index e406d3bc643..a3bb2f8dfc4 100644 --- a/package/cups/cups.mk +++ b/package/cups/cups.mk @@ -4,12 +4,12 @@ # ################################################################################ -CUPS_VERSION = 2.4.0 +CUPS_VERSION = 2.4.6 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 CUPS_LICENSE_FILES = LICENSE NOTICE -CUPS_CPE_ID_VENDOR = cups +CUPS_CPE_ID_VENDOR = openprinting CUPS_SELINUX_MODULES = cups CUPS_INSTALL_STAGING = YES @@ -27,6 +27,7 @@ CUPS_CONF_OPTS = \ --with-cups-user=lp \ --with-cups-group=lp \ --with-system-groups="lpadmin sys root" \ + --disable-libpaper \ --without-rcdir CUPS_CONFIG_SCRIPTS = cups-config CUPS_DEPENDENCIES = \ @@ -63,13 +64,6 @@ else CUPS_CONF_OPTS += --disable-libusb endif -ifeq ($(BR2_PACKAGE_LIBPAPER),y) -CUPS_CONF_OPTS += --enable-libpaper -CUPS_DEPENDENCIES += libpaper -else -CUPS_CONF_OPTS += --disable-libpaper -endif - ifeq ($(BR2_PACKAGE_AVAHI),y) CUPS_DEPENDENCIES += avahi CUPS_CONF_OPTS += --enable-avahi diff --git a/package/curlpp/curlpp.hash b/package/curlpp/curlpp.hash index 2b14a235ee7..e413995669c 100644 --- a/package/curlpp/curlpp.hash +++ b/package/curlpp/curlpp.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 97e3819bdcffc3e4047b6ac57ca14e04af85380bd93afe314bee9dd5c7f46a0a v0.8.1.tar.gz +sha256 97e3819bdcffc3e4047b6ac57ca14e04af85380bd93afe314bee9dd5c7f46a0a v0.8.1.tar.gz # Hash for license files: -sha256 8b9e3afd4d06ad3c169e788e5187a3e9f4f35671e9a7322f7e74bea9643b5b5a doc/LICENSE +sha256 8b9e3afd4d06ad3c169e788e5187a3e9f4f35671e9a7322f7e74bea9643b5b5a doc/LICENSE diff --git a/package/cwiid/Config.in b/package/cwiid/Config.in index 6ae2ac94050..44148eb1885 100644 --- a/package/cwiid/Config.in +++ b/package/cwiid/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_CWIID depends on BR2_USE_WCHAR # bluez5_utils -> libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # bluez5_utils -> dbus, alsa-lib, libglib2 depends on BR2_USE_MMU # bluez5_utils -> dbus, libglib2 - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # bluez5_utils + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # bluez5_utils hid plugin depends on BR2_TOOLCHAIN_HAS_SYNC_4 # bluez5_utils select BR2_PACKAGE_BLUEZ5_UTILS select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID # runtime @@ -28,9 +28,9 @@ config BR2_PACKAGE_CWIID_WMGUI select BR2_PACKAGE_LIBGTK2 endif -comment "cwiid needs a toolchain w/ dynamic lib, threads, wchar, headers >= 3.4" +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 || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 - depends on !BR2_USE_MMU + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 + depends on BR2_USE_MMU diff --git a/package/cwiid/cwiid.hash b/package/cwiid/cwiid.hash index 6446b8022da..92b4b215dc7 100644 --- a/package/cwiid/cwiid.hash +++ b/package/cwiid/cwiid.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 3adf3bf018721dee3c47e12ba4dd71810a239918dce925aa4079cb2a98bca5fe cwiid-fadf11e89b579bcc0336a0692ac15c93785f3f82.tar.gz +sha256 3adf3bf018721dee3c47e12ba4dd71810a239918dce925aa4079cb2a98bca5fe cwiid-fadf11e89b579bcc0336a0692ac15c93785f3f82.tar.gz # License files, locally calculated -sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING +sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/package/cxxtest/cxxtest.hash b/package/cxxtest/cxxtest.hash index be2cbd3227f..c24e258fa8d 100644 --- a/package/cxxtest/cxxtest.hash +++ b/package/cxxtest/cxxtest.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 1c154fef91c65dbf1cd4519af7ade70a61d85a923b6e0c0b007dc7f4895cf7d8 cxxtest-4.4.tar.gz +sha256 1c154fef91c65dbf1cd4519af7ade70a61d85a923b6e0c0b007dc7f4895cf7d8 cxxtest-4.4.tar.gz # Hash for license file: -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING diff --git a/package/czmq/czmq.hash b/package/czmq/czmq.hash index 19e2053a0a2..c2577c6719e 100644 --- a/package/czmq/czmq.hash +++ b/package/czmq/czmq.hash @@ -1,6 +1,6 @@ # From https://github.com/zeromq/czmq/releases -md5 471e9ec120fc66a2fe2aae14359e3cfa czmq-4.2.1.tar.gz -sha1 75ced09c143f93fae65238375e3a799c40eaed4c czmq-4.2.1.tar.gz +md5 471e9ec120fc66a2fe2aae14359e3cfa czmq-4.2.1.tar.gz +sha1 75ced09c143f93fae65238375e3a799c40eaed4c czmq-4.2.1.tar.gz # Locally calculated -sha256 5d720a204c2a58645d6f7643af15d563a712dad98c9d32c1ed913377daa6ac39 czmq-4.2.1.tar.gz -sha256 1f256ecad192880510e84ad60474eab7589218784b9a50bc7ceee34c2b91f1d5 LICENSE +sha256 5d720a204c2a58645d6f7643af15d563a712dad98c9d32c1ed913377daa6ac39 czmq-4.2.1.tar.gz +sha256 1f256ecad192880510e84ad60474eab7589218784b9a50bc7ceee34c2b91f1d5 LICENSE diff --git a/package/dacapo/dacapo.hash b/package/dacapo/dacapo.hash index ca7ad463834..ba099b72cfd 100644 --- a/package/dacapo/dacapo.hash +++ b/package/dacapo/dacapo.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 be3db084adcb2867760e1197b3ccf541c3213d918daa19386d8e236648d24be8 dacapo-9.12-MR1-bach.jar -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE +sha256 be3db084adcb2867760e1197b3ccf541c3213d918daa19386d8e236648d24be8 dacapo-9.12-MR1-bach.jar +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/dado/dado.hash b/package/dado/dado.hash index a57f52b8884..6bd62c59849 100644 --- a/package/dado/dado.hash +++ b/package/dado/dado.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 5a10ed7ff7be34ac004d10d6ea62ee8efc2b594c50ffc93e840e7fb7a2e6b4d0 dado-1.8.3-1.src.rock -sha256 141953aa7714e3145a6adfd71d6acbbe377e07ab920bc8ec4039394774da8a6e dado-1.8.3/doc/license.html +sha256 5a10ed7ff7be34ac004d10d6ea62ee8efc2b594c50ffc93e840e7fb7a2e6b4d0 dado-1.8.3-1.src.rock +sha256 141953aa7714e3145a6adfd71d6acbbe377e07ab920bc8ec4039394774da8a6e dado-1.8.3/doc/license.html diff --git a/package/dahdi-linux/0003-Fixed-compilation-issues-on-linux-kernel-5-18-0.patch b/package/dahdi-linux/0003-Fixed-compilation-issues-on-linux-kernel-5-18-0.patch new file mode 100644 index 00000000000..a896def3759 --- /dev/null +++ b/package/dahdi-linux/0003-Fixed-compilation-issues-on-linux-kernel-5-18-0.patch @@ -0,0 +1,58 @@ +From dbb43101c2a9205b67223b006bf75c29ebadced9 Mon Sep 17 00:00:00 2001 +From: Pushkar Singh +Date: Tue, 2 Aug 2022 19:40:00 +0530 +Subject: [PATCH] Fixed compilation issues on linux kernel >= 5.18.0 + +With kernel 5.18 and higher +PCI: Remove the deprecated "pci-dma-compat.h" API + +The commit will make sure to impplement pci dma related api's +[Retrieved from: +https://github.com/asterisk/dahdi-linux/commit/dbb43101c2a9205b67223b006bf75c29ebadced9] +Signed-off-by: Fabrice Fontaine +--- + include/dahdi/kernel.h | 31 +++++++++++++++++++++++++++++++ + 1 file changed, 31 insertions(+) + +diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h +index ed81e9e3..35e93bc4 100644 +--- a/include/dahdi/kernel.h ++++ b/include/dahdi/kernel.h +@@ -58,6 +58,37 @@ + + #include + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0) ++#include ++#include ++ ++static inline void *pci_alloc_consistent(struct pci_dev *hwdev, size_t size, dma_addr_t *dma_handle) ++{ ++ return dma_alloc_coherent(hwdev == NULL ? NULL : &hwdev->dev, size, dma_handle, GFP_ATOMIC); ++} ++ ++static inline void pci_free_consistent(struct pci_dev *hwdev, size_t size, void *vaddr, dma_addr_t dma_handle) ++{ ++ dma_free_coherent(hwdev == NULL ? NULL : &hwdev->dev, size, vaddr, dma_handle); ++} ++ ++static inline dma_addr_t pci_map_single(struct pci_dev *hwdev, void *ptr, size_t size, int direction) ++{ ++ return dma_map_single(&hwdev->dev, ptr, size, (enum dma_data_direction)direction); ++} ++ ++static inline void pci_unmap_single(struct pci_dev *hwdev, dma_addr_t dma_addr, size_t size, int direction) ++{ ++ dma_unmap_single(&hwdev->dev, dma_addr, size, (enum dma_data_direction)direction); ++} ++ ++static inline int pci_set_dma_mask(struct pci_dev *dev, u64 mask) ++{ ++ return dma_set_mask(&dev->dev, mask); ++} ++ ++#endif ++ + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) + #define HAVE_NET_DEVICE_OPS + #endif diff --git a/package/dahdi-linux/0004-next-fix-kernel-6-1-build.patch b/package/dahdi-linux/0004-next-fix-kernel-6-1-build.patch new file mode 100644 index 00000000000..b910c4b775c --- /dev/null +++ b/package/dahdi-linux/0004-next-fix-kernel-6-1-build.patch @@ -0,0 +1,32 @@ +From a759a578277bde98eba7ef4bf86bdf819a900de9 Mon Sep 17 00:00:00 2001 +From: John Thomson +Date: Sun, 23 Oct 2022 13:42:52 +1000 +Subject: [PATCH] fix kernel 6.1 build + +kernel 6.1 includes b48b89f9c189 ("net: drop the weight argument from netif_napi_add") [0] + +[0]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=b48b89f9c189d24eb5e2b4a0ac067da5a24ee86d + +Signed-off-by: John Thomson +[Retrieved from: +https://github.com/asterisk/dahdi-linux/pull/14/commits/a759a578277bde98eba7ef4bf86bdf819a900de9] +Signed-off-by: Fabrice Fontaine +--- + include/dahdi/kernel.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h +index 35e93bc4..fd64a15e 100644 +--- a/include/dahdi/kernel.h ++++ b/include/dahdi/kernel.h +@@ -58,6 +58,10 @@ + + #include + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) ++#define netif_napi_add netif_napi_add_weight ++#endif ++ + #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0) + #include + #include diff --git a/package/dahdi-linux/Config.in b/package/dahdi-linux/Config.in index 7b6ce794227..b6086fdc6c9 100644 --- a/package/dahdi-linux/Config.in +++ b/package/dahdi-linux/Config.in @@ -9,7 +9,7 @@ config BR2_PACKAGE_DAHDI_LINUX DAHDI Linux is the open source device driver framework used to interface Asterisk with telephony hardware. - http://www.asterisk.org/downloads/dahdi + https://github.com/asterisk/dahdi-linux comment "dahdi-linux needs a Linux kernel to be built" depends on !BR2_LINUX_KERNEL diff --git a/package/dahdi-linux/dahdi-linux.hash b/package/dahdi-linux/dahdi-linux.hash index 7a4c6880618..2d3f3367776 100644 --- a/package/dahdi-linux/dahdi-linux.hash +++ b/package/dahdi-linux/dahdi-linux.hash @@ -1,5 +1,5 @@ -# Locally computed -sha256 3faf127ee3f1fad0195c56d00b7bf2708ec8a54bf3c31edd827fd9beb47e0a51 dahdi-linux-5c840cf43838e0690873e73409491c392333b3b8-br1.tar.gz +# From http://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/dahdi-linux-3.2.0.sha256 +sha256 e2ef9b3f6769f60f432cfa09c39c9a0d7ab5bddff59229f385056915c65f9f13 dahdi-linux-3.2.0.tar.gz # Firmware files have no upstream hash, so sha56 locally computed sha256 3ff26cf80555fd7470b43a87c51d03c1db2a75abcd4561d79f69b6c48298e4a1 dahdi-fwload-vpmadt032-1.25.0.tar.gz diff --git a/package/dahdi-linux/dahdi-linux.mk b/package/dahdi-linux/dahdi-linux.mk index b9d59119534..88519b51069 100644 --- a/package/dahdi-linux/dahdi-linux.mk +++ b/package/dahdi-linux/dahdi-linux.mk @@ -4,8 +4,9 @@ # ################################################################################ -DAHDI_LINUX_VERSION = 5c840cf43838e0690873e73409491c392333b3b8 -DAHDI_LINUX_SITE = git://git.asterisk.org/dahdi/linux.git +DAHDI_LINUX_VERSION = 3.2.0 +DAHDI_LINUX_SITE = \ + http://downloads.asterisk.org/pub/telephony/dahdi-linux/releases # We need to download all those firmware blobs ourselves, otherwise # dahdi-linux will try to download them at install time. diff --git a/package/dahdi-tools/dahdi-tools.hash b/package/dahdi-tools/dahdi-tools.hash index 72fa995c842..c119ff4ee1e 100644 --- a/package/dahdi-tools/dahdi-tools.hash +++ b/package/dahdi-tools/dahdi-tools.hash @@ -1,7 +1,5 @@ -# sha1 from http://downloads.asterisk.org/pub/telephony/dahdi-tools/releases -# sha256 locally computed -sha1 fff6c8fdc72a66f81768e4f50bf55156f7cebbc4 dahdi-tools-3.1.0.tar.gz -sha256 ea852ebd274ee1cc90ff5e4ac84261b0b787b1a74e8b76ad659bc9ec4f77e67e dahdi-tools-3.1.0.tar.gz +# From http://downloads.asterisk.org/pub/telephony/dahdi-tools/releases/dahdi-tools-3.2.0.sha256 +sha256 2bc269887fcd42d2486572611934d713e603734cc658b3b517fc9f3bdea7262f dahdi-tools-3.2.0.tar.gz # License files, locally computed sha256 fa5fc1d1eec39532ea517518eeefd7b6e3c14341a55e5880a0e2a49eee47a5b7 LICENSE diff --git a/package/dahdi-tools/dahdi-tools.mk b/package/dahdi-tools/dahdi-tools.mk index fc0c591ca84..7d4de645a26 100644 --- a/package/dahdi-tools/dahdi-tools.mk +++ b/package/dahdi-tools/dahdi-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -DAHDI_TOOLS_VERSION = 3.1.0 +DAHDI_TOOLS_VERSION = 3.2.0 DAHDI_TOOLS_SITE = http://downloads.asterisk.org/pub/telephony/dahdi-tools/releases DAHDI_TOOLS_LICENSE = GPLv2, LGPLv2.1 diff --git a/package/daq3/daq3.hash b/package/daq3/daq3.hash index a97f81833b5..4a24f98173b 100644 --- a/package/daq3/daq3.hash +++ b/package/daq3/daq3.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 4281464c5502037669e69d314b628df863420f590c4999c5b567c8016cd1e658 daq3-3.0.5.tar.gz +sha256 c0e8535533720a6df05ab884b7c8f5fb4222f3aac12bdc11829e08c79716d338 daq3-3.0.9.tar.gz # Hash for license files: sha256 64601289158eddad72cb4de72652f9e64dc886942c910b38ddee93ba13b0db26 COPYING diff --git a/package/daq3/daq3.mk b/package/daq3/daq3.mk index ed97615e617..bab957e0524 100644 --- a/package/daq3/daq3.mk +++ b/package/daq3/daq3.mk @@ -4,7 +4,7 @@ # ################################################################################ -DAQ3_VERSION = 3.0.5 +DAQ3_VERSION = 3.0.9 DAQ3_SITE = $(call github,snort3,libdaq,v$(DAQ3_VERSION)) DAQ3_LICENSE = GPL-2.0 DAQ3_LICENSE_FILES = COPYING LICENSE @@ -13,6 +13,12 @@ DAQ3_DEPENDENCIES = host-pkgconf # From git DAQ3_AUTORECONF = YES +ifeq ($(BR2_INSTALL_LIBSTDCPP),y) +DAQ3_CONF_OPTS += --enable-gwlb-module +else +DAQ3_CONF_OPTS += --disable-gwlb-module +endif + ifeq ($(BR2_PACKAGE_LIBNETFILTER_QUEUE),y) DAQ3_DEPENDENCIES += libnetfilter_queue DAQ3_CONF_OPTS += --enable-nfq-module diff --git a/package/darkhttpd/0001-Declare-vars-outside-of-for-loop-for-std-c90.patch b/package/darkhttpd/0001-Declare-vars-outside-of-for-loop-for-std-c90.patch deleted file mode 100644 index 7584bff98e9..00000000000 --- a/package/darkhttpd/0001-Declare-vars-outside-of-for-loop-for-std-c90.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 81b491e60affd67f4ec2feccbee1cdf98dc57b81 Mon Sep 17 00:00:00 2001 -From: Emil Mikulic -Date: Sun, 21 Mar 2021 15:03:14 +1100 -Subject: [PATCH] Declare vars outside of for() loop for -std=c90. - -Fixes #2. - -[Retrieved from: -https://github.com/emikulic/darkhttpd/commit/81b491e60affd67f4ec2feccbee1cdf98dc57b81] -Signed-off-by: Fabrice Fontaine ---- - darkhttpd.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/darkhttpd.c b/darkhttpd.c -index 219a8a3..268628a 100644 ---- a/darkhttpd.c -+++ b/darkhttpd.c -@@ -966,8 +966,9 @@ static char *base64_encode(char *str) { - char *encoded_data = malloc(output_length+1); - if (encoded_data == NULL) return NULL; - -- for (int i = 0, j = 0; i < input_length;) { -- -+ int i; -+ int j; -+ for (i = 0, j = 0; i < input_length;) { - uint32_t octet_a = i < input_length ? (unsigned char)str[i++] : 0; - uint32_t octet_b = i < input_length ? (unsigned char)str[i++] : 0; - uint32_t octet_c = i < input_length ? (unsigned char)str[i++] : 0; -@@ -981,7 +982,7 @@ static char *base64_encode(char *str) { - } - - const int mod_table[] = {0, 2, 1}; -- for (int i = 0; i < mod_table[input_length % 3]; i++) -+ for (i = 0; i < mod_table[input_length % 3]; i++) - encoded_data[output_length - 1 - i] = '='; - encoded_data[output_length] = '\0'; - diff --git a/package/darkhttpd/darkhttpd.hash b/package/darkhttpd/darkhttpd.hash index af5a2bf8c9c..188afff767a 100644 --- a/package/darkhttpd/darkhttpd.hash +++ b/package/darkhttpd/darkhttpd.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 1d88c395ac79ca9365aa5af71afe4ad136a4ed45099ca398168d4a2014dc0fc2 darkhttpd-1.13.tar.gz -sha256 44e784df460954c7760e2eeae69aecb12a3d23ca1c0a4f6047c3c6452b2e2f49 darkhttpd.c +sha256 e063de9efa5635260c8def00a4d41ec6145226a492d53fa1dac436967670d195 darkhttpd-1.14.tar.gz +sha256 f002944c9a8516e3346002d39c3e13681306833358c0f3c7781dff1fdb639710 darkhttpd.c diff --git a/package/darkhttpd/darkhttpd.mk b/package/darkhttpd/darkhttpd.mk index 56e5a6ecd65..bda08899b85 100644 --- a/package/darkhttpd/darkhttpd.mk +++ b/package/darkhttpd/darkhttpd.mk @@ -4,10 +4,11 @@ # ################################################################################ -DARKHTTPD_VERSION = 1.13 +DARKHTTPD_VERSION = 1.14 DARKHTTPD_SITE = $(call github,emikulic,darkhttpd,v$(DARKHTTPD_VERSION)) DARKHTTPD_LICENSE = MIT DARKHTTPD_LICENSE_FILES = darkhttpd.c +DARKHTTPD_CPE_ID_VENDOR = darkhttpd_project define DARKHTTPD_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) diff --git a/package/dash/dash.mk b/package/dash/dash.mk index fed3a995511..6efc71e5684 100644 --- a/package/dash/dash.mk +++ b/package/dash/dash.mk @@ -27,6 +27,10 @@ else DASH_CONF_OPTS += --without-libedit endif +ifeq ($(BR2_STATIC_LIBS),) +DASH_CONF_OPTS += --disable-static +endif + define DASH_INSTALL_TARGET_CMDS $(INSTALL) -m 0755 -D $(@D)/src/dash $(TARGET_DIR)/bin/dash endef diff --git a/package/datatables-buttons/datatables-buttons.hash b/package/datatables-buttons/datatables-buttons.hash index eda8df34b29..fdbbe5faf0b 100644 --- a/package/datatables-buttons/datatables-buttons.hash +++ b/package/datatables-buttons/datatables-buttons.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 427632c0245f488328edab83b53294545744c8de621a5eaa9dd3d257d7ed7775 Buttons-1.6.1.zip -sha256 21fa7cbc3c00bcad1e0f3417d465e702bd470d7dc446a6deff80c8fc5eda9148 License.txt +sha256 427632c0245f488328edab83b53294545744c8de621a5eaa9dd3d257d7ed7775 Buttons-1.6.1.zip +sha256 21fa7cbc3c00bcad1e0f3417d465e702bd470d7dc446a6deff80c8fc5eda9148 License.txt diff --git a/package/datatables-fixedcolumns/datatables-fixedcolumns.hash b/package/datatables-fixedcolumns/datatables-fixedcolumns.hash index dc946202089..7bd5697dbe6 100644 --- a/package/datatables-fixedcolumns/datatables-fixedcolumns.hash +++ b/package/datatables-fixedcolumns/datatables-fixedcolumns.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 53a7b20ea9dbb6498137cb7260bde8605989ec578e4b71787f5ebc4ef9910bd9 FixedColumns-3.3.0.zip -sha256 e8e92f97216f9ea00cb2735b933a91ec8e3869bed37b6d63a90f76f41508f2de License.txt +sha256 53a7b20ea9dbb6498137cb7260bde8605989ec578e4b71787f5ebc4ef9910bd9 FixedColumns-3.3.0.zip +sha256 e8e92f97216f9ea00cb2735b933a91ec8e3869bed37b6d63a90f76f41508f2de License.txt diff --git a/package/datatables-responsive/datatables-responsive.hash b/package/datatables-responsive/datatables-responsive.hash index d10313f368f..df133f040c5 100644 --- a/package/datatables-responsive/datatables-responsive.hash +++ b/package/datatables-responsive/datatables-responsive.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 47caf3b753dd2c537b8834816eaf38c4df214cb4e6a97144e0de4cf82ad24d02 Responsive-2.2.3.zip -sha256 da4e1020ae97c095a14d7830c1a8a793e080c062e22d749ecd3fc3c075673dbf License.txt +sha256 47caf3b753dd2c537b8834816eaf38c4df214cb4e6a97144e0de4cf82ad24d02 Responsive-2.2.3.zip +sha256 da4e1020ae97c095a14d7830c1a8a793e080c062e22d749ecd3fc3c075673dbf License.txt diff --git a/package/datatables/datatables.hash b/package/datatables/datatables.hash index d6eeadfb379..bb31fcac3d8 100644 --- a/package/datatables/datatables.hash +++ b/package/datatables/datatables.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 e2c79dd9d02caa04130ce888061bc922e18561e72e842ba0cb657d1812d9f1bf DataTables-1.10.20.zip -sha256 c6a873f21550ed804f76013c36e14225704c1aa551fdb870e0c626eb91c19247 license.txt +sha256 e2c79dd9d02caa04130ce888061bc922e18561e72e842ba0cb657d1812d9f1bf DataTables-1.10.20.zip +sha256 c6a873f21550ed804f76013c36e14225704c1aa551fdb870e0c626eb91c19247 license.txt diff --git a/package/dav1d/dav1d.hash b/package/dav1d/dav1d.hash index b0f163bae77..68757060bfe 100644 --- a/package/dav1d/dav1d.hash +++ b/package/dav1d/dav1d.hash @@ -1,3 +1,4 @@ +# From https://download.videolan.org/pub/videolan/dav1d/1.2.1/dav1d-1.2.1.tar.xz.sha256 +sha256 4e33eb61ec54c768a16da0cf8fa0928b4c4593f5f804a3c887d4a21c318340b2 dav1d-1.2.1.tar.xz # Locally computed -sha256 0d198c4fe63fe7f0395b1b17de75b21c8c4508cd3204996229355759efa30ef8 dav1d-0.9.2.tar.bz2 sha256 b327887de263238deaa80c34cdd2ff3e0ba1d35db585ce14a37ce3e74ee389e9 COPYING diff --git a/package/dav1d/dav1d.mk b/package/dav1d/dav1d.mk index d7224625c8f..e90f53dc1a1 100644 --- a/package/dav1d/dav1d.mk +++ b/package/dav1d/dav1d.mk @@ -4,11 +4,12 @@ # ################################################################################ -DAV1D_VERSION = 0.9.2 -DAV1D_SOURCE = dav1d-$(DAV1D_VERSION).tar.bz2 -DAV1D_SITE = https://code.videolan.org/videolan/dav1d/-/archive/$(DAV1D_VERSION) +DAV1D_VERSION = 1.2.1 +DAV1D_SOURCE = dav1d-$(DAV1D_VERSION).tar.xz +DAV1D_SITE = https://download.videolan.org/pub/videolan/dav1d/$(DAV1D_VERSION) DAV1D_LICENSE = BSD-2-Clause DAV1D_LICENSE_FILES = COPYING +DAV1D_CPE_ID_VENDOR = videolan DAV1D_INSTALL_STAGING = YES DAV1D_CONF_OPTS = \ -Denable_tests=false \ diff --git a/package/davfs2/Config.in b/package/davfs2/Config.in index 162753be3e4..31a680563c5 100644 --- a/package/davfs2/Config.in +++ b/package/davfs2/Config.in @@ -1,10 +1,10 @@ -comment "davfs2 needs a glibc or uClibc toolchain" +comment "davfs2 needs a glibc toolchain" depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_USES_MUSL + depends on !BR2_TOOLCHAIN_USES_GLIBC config BR2_PACKAGE_DAVFS2 bool "davfs2" - depends on !BR2_TOOLCHAIN_USES_MUSL # error.h + depends on BR2_TOOLCHAIN_USES_GLIBC # fstab.h depends on BR2_USE_MMU # fork() select BR2_PACKAGE_NEON select BR2_PACKAGE_NEON_XML diff --git a/package/davfs2/davfs2.hash b/package/davfs2/davfs2.hash index a555779dbc7..1cbacc388f1 100644 --- a/package/davfs2/davfs2.hash +++ b/package/davfs2/davfs2.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 ce3eb948ece582a51c934ccb0cc70e659839172717caff173f69a5e2af90c5c0 davfs2-1.6.1.tar.gz +sha256 251db75a27380cca1330b1b971700c5e5dcc0c90e5a47622285f0140edfe3a2f davfs2-1.7.0.tar.gz # License file, locally calculated sha256 0ae0485a5bd37a63e63603596417e4eb0e653334fa6c7f932ca3a0e85d4af227 COPYING diff --git a/package/davfs2/davfs2.mk b/package/davfs2/davfs2.mk index 42192faa59f..a67c5062506 100644 --- a/package/davfs2/davfs2.mk +++ b/package/davfs2/davfs2.mk @@ -4,7 +4,7 @@ # ################################################################################ -DAVFS2_VERSION = 1.6.1 +DAVFS2_VERSION = 1.7.0 DAVFS2_SITE = http://download.savannah.nongnu.org/releases/davfs2 DAVFS2_LICENSE = GPL-3.0+ DAVFS2_LICENSE_FILES = COPYING diff --git a/package/davinci-bootcount/davinci-bootcount.hash b/package/davinci-bootcount/davinci-bootcount.hash index ef4bca2b7df..53435b1d1d6 100644 --- a/package/davinci-bootcount/davinci-bootcount.hash +++ b/package/davinci-bootcount/davinci-bootcount.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 de7843cf1245a739b6d18d4db478893e50c2de0ee19bbce96dc323065d28c3e4 davinci-bootcount-0973689c7556a953d2b468e4d8d46758c6d467b4.tar.gz +sha256 12b5aa83736efb2fefd22cd4d9f305a25c68dfaa10401d5efb17e55a5163934e davinci-bootcount-2.0.0.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/davinci-bootcount/davinci-bootcount.mk b/package/davinci-bootcount/davinci-bootcount.mk index 385d96d5a2c..695d39688ac 100644 --- a/package/davinci-bootcount/davinci-bootcount.mk +++ b/package/davinci-bootcount/davinci-bootcount.mk @@ -4,8 +4,8 @@ # ################################################################################ -DAVINCI_BOOTCOUNT_VERSION = 0973689c7556a953d2b468e4d8d46758c6d467b4 -DAVINCI_BOOTCOUNT_SITE = $(call github,VoltServer,uboot-davinci-bootcount,$(DAVINCI_BOOTCOUNT_VERSION)) +DAVINCI_BOOTCOUNT_VERSION = 2.0.0 +DAVINCI_BOOTCOUNT_SITE = $(call github,VoltServer,uboot-davinci-bootcount,v$(DAVINCI_BOOTCOUNT_VERSION)) DAVINCI_BOOTCOUNT_LICENSE = GPL-3.0 DAVINCI_BOOTCOUNT_LICENSE_FILES = COPYING diff --git a/package/dbus-broker/Config.in b/package/dbus-broker/Config.in new file mode 100644 index 00000000000..aa6584c392c --- /dev/null +++ b/package/dbus-broker/Config.in @@ -0,0 +1,24 @@ +config BR2_PACKAGE_DBUS_BROKER + bool "dbus-broker" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_17 + depends on BR2_PACKAGE_SYSTEMD + select BR2_PACKAGE_EXPAT + select BR2_PACKAGE_LIBCAP_NG if BR2_PACKAGE_AUDIT + help + Linux D-Bus Message Broker. + + The dbus-broker project is an implementation of a message bus + as defined by the D-Bus specification. Its aim is to provide + high performance and reliability, while keeping compatibility + to the D-Bus reference implementation. + + It is exclusively written for Linux systems, and makes use of + many modern features provided by recent linux kernel releases. + + https://github.com/bus1/dbus-broker/wiki + +comment "dbusbroker needs systemd and a toolchain w/ threads" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_SYSTEMD diff --git a/package/dbus-broker/dbus-broker.hash b/package/dbus-broker/dbus-broker.hash new file mode 100644 index 00000000000..f6c2cbe1602 --- /dev/null +++ b/package/dbus-broker/dbus-broker.hash @@ -0,0 +1,17 @@ +# Locally calculated +sha256 bea7f653e7251063c5f427e9e3f93562d38a0d8667ae6d49fb56f113605985de dbus-broker-32.tar.xz +sha256 3cda3630283eda0eab825abe5ac84d191248c6b3fe1c232a118124959b96c6a4 LICENSE +sha256 20ea1f96abc15553695c6725bb3dcabff4b43b85b7ca7d675a2b8860e3b01f87 subprojects/libcdvar-1/AUTHORS +sha256 8153c478102dc209b30dd4627cf5bb3596263f99692bf3eec174b1e17bbf8a3b subprojects/libcdvar-1/README.md +sha256 6d63b1fb794d4c02622595ad30357c90398aa883864e5a275479139c8f03208f subprojects/libcini-1/AUTHORS +sha256 fc92d49d69aa9aa91919bac79242abee3eda27a567b4573ed3690b5cef0cf2fd subprojects/libcini-1/README.md +sha256 a30deb6dde90366bfaf054bc689a209b974f80c1cceac950c4378c14abaa243a subprojects/libclist-3/AUTHORS +sha256 75f4c76441ac69ba9474bb7ad0958389ca0f1f2fc90c5f7b033be3461652f5a6 subprojects/libclist-3/README.md +sha256 23f24eeaaded5fedd6e7840b6f7b73838f9a4e2112ad6a12fe1ef958f73d0214 subprojects/libcrbtree-3/AUTHORS +sha256 05113a24aca4c537819dd0d91b95b13edb85bea4b6a77a6d9269becb397ed374 subprojects/libcrbtree-3/README.md +sha256 6d63b1fb794d4c02622595ad30357c90398aa883864e5a275479139c8f03208f subprojects/libcshquote-1/AUTHORS +sha256 cad109dd33062518a437ebee145ba863fe0e047d4e3db9c28b0bf3c6148f10c2 subprojects/libcshquote-1/README.md +sha256 32913ba08dc041f3f4ca361fc0d68014120e1c612772aabbcc901556df499ce5 subprojects/libcstdaux-1/AUTHORS +sha256 7c4b6c325b0bc02150089112f65132ee999b0f44500b73d1fc06d96c93161037 subprojects/libcstdaux-1/README.md +sha256 7e660796fea0400a1a9a539226c345b3c656a745a334e323e33258de7864e985 subprojects/libcutf8-1/AUTHORS +sha256 106099cc1c488cbf8911f56da7977a955f6b27a7bb5b815985e59d9fae0e6fe7 subprojects/libcutf8-1/README.md diff --git a/package/dbus-broker/dbus-broker.mk b/package/dbus-broker/dbus-broker.mk new file mode 100644 index 00000000000..e82b79220da --- /dev/null +++ b/package/dbus-broker/dbus-broker.mk @@ -0,0 +1,69 @@ +################################################################################ +# +# dbus-broker +# +################################################################################ + +DBUS_BROKER_VERSION = 32 +DBUS_BROKER_SOURCE = dbus-broker-$(DBUS_BROKER_VERSION).tar.xz +DBUS_BROKER_SITE = https://github.com/bus1/dbus-broker/releases/download/v$(DBUS_BROKER_VERSION) + +DBUS_BROKER_LICENSE = \ + Apache-2.0, \ + Apache-2.0 and/or LGPL-2.1+ (c-dvar, c-ini, c-list, c-rbtree, c-shquote, c-stdaux, c-utf8) +# For the third-party code, the licensing legal-info is inconsistent between +# the AUTHORS and README, so keep both +DBUS_BROKER_LICENSE_FILES = \ + LICENSE \ + subprojects/libcdvar-1/AUTHORS subprojects/libcdvar-1/README.md \ + subprojects/libcini-1/AUTHORS subprojects/libcini-1/README.md \ + subprojects/libclist-3/AUTHORS subprojects/libclist-3/README.md \ + subprojects/libcrbtree-3/AUTHORS subprojects/libcrbtree-3/README.md \ + subprojects/libcshquote-1/AUTHORS subprojects/libcshquote-1/README.md \ + subprojects/libcstdaux-1/AUTHORS subprojects/libcstdaux-1/README.md \ + subprojects/libcutf8-1/AUTHORS subprojects/libcutf8-1/README.md + +DBUS_BROKER_CPE_ID_VENDOR = dbus-broker_project +DBUS_BROKER_DEPENDENCIES = expat systemd +DBUS_BROKER_CONF_OPTS = -Dlauncher=true + +ifeq ($(BR2_PACKAGE_AUDIT),y) +# libcap-ng selected from Config.in +DBUS_BROKER_DEPENDENCIES += audit libcap-ng +DBUS_BROKER_CONF_OPTS += -Daudit=true +else +DBUS_BROKER_CONF_OPTS += -Daudit=false +endif + +ifeq ($(BR2_PACKAGE_LIBSELINUX),y) +DBUS_BROKER_DEPENDENCIES += libselinux +DBUS_BROKER_CONF_OPTS += -Dselinux=true +else +DBUS_BROKER_CONF_OPTS += -Dselinux=false +endif + +# We must be using the same user as the original dbus, so we can share +# the home directory and create a socket there. As a consequence, the +# username and groupname must be dbus:dbus, and they both need to have +# the same home. +define DBUS_BROKER_USERS + dbus -1 dbus -1 * /run/dbus - dbus DBus messagebus user +endef + +# We overwrite some files from dbus, so add a dependency. +ifeq ($(BR2_PACKAGE_DBUS),y) +DBUS_BROKER_DEPENDENCIES += dbus +endif + +define DBUS_BROKER_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 0644 $(DBUS_BROKER_PKGDIR)/session.conf \ + $(TARGET_DIR)/usr/share/dbus-1/session.conf + $(INSTALL) -D -m 0644 $(DBUS_BROKER_PKGDIR)/system.conf \ + $(TARGET_DIR)/usr/share/dbus-1/system.conf + $(INSTALL) -D -m 0644 $(DBUS_BROKER_PKGDIR)/dbus.socket \ + $(TARGET_DIR)/usr/lib/systemd/system/dbus.socket + $(HOST_MAKE_ENV) ln -sf ../dbus.socket \ + $(TARGET_DIR)/usr/lib/systemd/system/sockets.target.wants/dbus.socket +endef + +$(eval $(meson-package)) diff --git a/package/dbus-broker/dbus.socket b/package/dbus-broker/dbus.socket new file mode 100644 index 00000000000..5c373cf4503 --- /dev/null +++ b/package/dbus-broker/dbus.socket @@ -0,0 +1,5 @@ +[Unit] +Description=D-Bus System Message Bus Socket + +[Socket] +ListenStream=/run/dbus/system_bus_socket diff --git a/package/dbus-broker/session.conf b/package/dbus-broker/session.conf new file mode 100644 index 00000000000..e4758fa2186 --- /dev/null +++ b/package/dbus-broker/session.conf @@ -0,0 +1,65 @@ + + + + + + session + + + + + + + + + + + + + + + + + session.d + + /etc/dbus-1/session.d + + + /etc/dbus-1/session-local.conf + + contexts/dbus_contexts + + + + + 1000000000 + 250000000 + 1000000000 + 250000000 + 1000000000 + + 120000 + 240000 + 150000 + 100000 + 10000 + 100000 + 10000 + 50000 + 50000 + 50000 + + diff --git a/package/dbus-broker/system.conf b/package/dbus-broker/system.conf new file mode 100644 index 00000000000..4b17fbd90ec --- /dev/null +++ b/package/dbus-broker/system.conf @@ -0,0 +1,123 @@ + + + + + + + + + system + + + + + + dbus + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + system.d + + /etc/dbus-1/system.d + + + /etc/dbus-1/system-local.conf + + contexts/dbus_contexts + + diff --git a/package/dbus-cxx/0001-gcc11-include-typeinfo.patch b/package/dbus-cxx/0001-gcc11-include-typeinfo.patch deleted file mode 100644 index b4b7d83de2c..00000000000 --- a/package/dbus-cxx/0001-gcc11-include-typeinfo.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0a4c5db225d8d213916655593471e303ba71e0ea Mon Sep 17 00:00:00 2001 -From: Oleksandr Kravchuk -Date: Mon, 13 Dec 2021 03:42:44 +0100 -Subject: [PATCH] Include typeinfo for typeid() (#83) - -Otherwise fails with: - error: must '#include ' before using 'typeid' - -Fetch from: https://github.com/dbus-cxx/dbus-cxx/pull/83 -Upstream-Status: Accepted -Signed-off-by: Daniel Lang - ---- - dbus-cxx/demangle.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/dbus-cxx/demangle.h b/dbus-cxx/demangle.h -index b71bcb9..9a4e99b 100644 ---- a/dbus-cxx/demangle.h -+++ b/dbus-cxx/demangle.h -@@ -21,6 +21,7 @@ - #define DBUSCXX_DEMANGLE_H - - #include -+#include - #include - - #if DBUS_CXX_HAS_CXXABI_H - diff --git a/package/dbus-cxx/0002-cmake-improve-include-paths.patch b/package/dbus-cxx/0002-cmake-improve-include-paths.patch deleted file mode 100644 index 1f6a36a2c08..00000000000 --- a/package/dbus-cxx/0002-cmake-improve-include-paths.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 5a0ebbf55515a928acf9926d3fcd789115e347d3 Mon Sep 17 00:00:00 2001 -From: Lang Daniel -Date: Mon, 17 Jan 2022 13:57:55 +0100 -Subject: [PATCH] cmake: improve include paths - -Adding the dbus-cxx subfolders as an include path might override system -headers (signal.h for gcc 10). -By removing the subfolders, includes can happen via #include "..." or -via #include . - -Fetch from: https://github.com/dbus-cxx/dbus-cxx/pull/86 -Upstream-Status: Accepted -Signed-off-by: Daniel Lang - ---- - CMakeLists.txt | 4 +--- - dbus-cxx/matchrule.h | 2 +- - dbus-cxx/sasl.h | 2 +- - dbus-cxx/sendmsgtransport.cpp | 2 +- - dbus-cxx/simpletransport.cpp | 2 +- - 5 files changed, 5 insertions(+), 7 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5b6d28c..e76cd61 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -207,9 +207,7 @@ set( DBUS_CXX_HEADERS - - set( DBUS_CXX_INCLUDE_DIRECTORIES - ${PROJECT_SOURCE_DIR} -- ${PROJECT_SOURCE_DIR}/dbus-cxx -- ${PROJECT_BINARY_DIR} -- ${PROJECT_BINARY_DIR}/dbus-cxx ) -+ ${PROJECT_BINARY_DIR} ) - include_directories( ${DBUS_CXX_INCLUDE_DIRECTORIES} - ${dbus_INCLUDE_DIRS} - ${sigc_INCLUDE_DIRS} ) -diff --git a/dbus-cxx/matchrule.h b/dbus-cxx/matchrule.h -index 69fdab7..18c9e81 100644 ---- a/dbus-cxx/matchrule.h -+++ b/dbus-cxx/matchrule.h -@@ -20,7 +20,7 @@ - #define DBUSCXX_MATCH_RULE_H - - #include --#include "dbus-cxx-config.h" -+#include - - namespace DBus { - -diff --git a/dbus-cxx/sasl.h b/dbus-cxx/sasl.h -index d7429a3..44edd6e 100644 ---- a/dbus-cxx/sasl.h -+++ b/dbus-cxx/sasl.h -@@ -19,7 +19,7 @@ - #ifndef DBUSCXX_SASL_H - #define DBUSCXX_SASL_H - --#include -+#include - - #include - #include -diff --git a/dbus-cxx/sendmsgtransport.cpp b/dbus-cxx/sendmsgtransport.cpp -index ae053ff..a10ae66 100644 ---- a/dbus-cxx/sendmsgtransport.cpp -+++ b/dbus-cxx/sendmsgtransport.cpp -@@ -21,8 +21,8 @@ - #include "dbus-cxx-private.h" - #include "utility.h" - #include "validator.h" -+#include "message.h" - --#include - #include - #include - #include -diff --git a/dbus-cxx/simpletransport.cpp b/dbus-cxx/simpletransport.cpp -index f291d9f..fed4364 100644 ---- a/dbus-cxx/simpletransport.cpp -+++ b/dbus-cxx/simpletransport.cpp -@@ -18,7 +18,7 @@ - ***************************************************************************/ - #include "simpletransport.h" - --#include -+#include "dbus-cxx-private.h" - #include "demarshaling.h" - #include "message.h" - #include "utility.h" - diff --git a/package/dbus-cxx/0003-sasl-use-uid_t.patch b/package/dbus-cxx/0003-sasl-use-uid_t.patch deleted file mode 100644 index f08769b6c51..00000000000 --- a/package/dbus-cxx/0003-sasl-use-uid_t.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 9db9673c0c2407e18e215844adadbd4a397e6f78 Mon Sep 17 00:00:00 2001 -From: Lang Daniel -Date: Fri, 28 Jan 2022 07:53:13 +0100 -Subject: [PATCH] use uid_t instead of __uid_t - -uclibc and glibc define getuid() as -extern __uid_t getuid (void) __THROW; -https://elixir.bootlin.com/glibc/glibc-2.34/source/posix/unistd.h#L698 -which is a typedef for unsigned int. - -musl uses uid_t as return type -uid_t getuid(void); -https://elixir.bootlin.com/musl/v1.2.2/source/include/unistd.h#L108 -which is a typedef to unsigned. - -glibc and uclibc include typedefs from __uid_t to uid_t, -which means one should be able to use uid_t as a replacement -for __uid_t and make compiling with all three c standard libraries -possible. - -Fetch from: https://github.com/dbus-cxx/dbus-cxx/pull/87 -Signed-off-by: Daniel Lang - ---- - dbus-cxx/sasl.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dbus-cxx/sasl.cpp b/dbus-cxx/sasl.cpp -index e8a6060..7a76af6 100644 ---- a/dbus-cxx/sasl.cpp -+++ b/dbus-cxx/sasl.cpp -@@ -70,7 +70,7 @@ std::tuple> SASL::authenticate() { - bool success = false; - bool negotiatedFD = false; - std::vector serverGUID; -- __uid_t uid = getuid(); -+ uid_t uid = getuid(); - std::string line; - std::smatch regex_match; - - diff --git a/package/dbus-cxx/dbus-cxx.hash b/package/dbus-cxx/dbus-cxx.hash index 907de1866f6..6a7a634cedb 100644 --- a/package/dbus-cxx/dbus-cxx.hash +++ b/package/dbus-cxx/dbus-cxx.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 05c4f4750261f09819564bb8ee93b5d7f56fd05bbcd755858860fa6697d09c2a dbus-cxx-2.1.0.tar.gz -sha256 e85e018c8ee7d4f439b097289bf4371f6fcfec24e89f3e77c422944501bc383d COPYING +sha256 88d4bd1d9af8563bda03f24b26ffe4efbc555ca82ac664ced572b053928f739a dbus-cxx-2.3.1.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 3e89fc9db75..554acaa67d9 100644 --- a/package/dbus-cxx/dbus-cxx.mk +++ b/package/dbus-cxx/dbus-cxx.mk @@ -4,9 +4,9 @@ # ################################################################################ -DBUS_CXX_VERSION = 2.1.0 +DBUS_CXX_VERSION = 2.3.1 DBUS_CXX_SITE = $(call github,dbus-cxx,dbus-cxx,$(DBUS_CXX_VERSION)) -DBUS_CXX_LICENSE = GPL-3.0, Boost license (cmake-modules), Apache 2.0 (libcppgenerate) +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 DBUS_CXX_INSTALL_STAGING = YES DBUS_CXX_DEPENDENCIES = libsigc diff --git a/package/dbus-python/dbus-python.mk b/package/dbus-python/dbus-python.mk index d9bb30ed67b..16b22d48210 100644 --- a/package/dbus-python/dbus-python.mk +++ b/package/dbus-python/dbus-python.mk @@ -20,9 +20,9 @@ DBUS_PYTHON_CONF_ENV = \ HOST_DBUS_PYTHON_CONF_ENV = \ PYTHON=$(HOST_DIR)/bin/python3 \ - PYTHON_INCLUDES="`$(HOST_DIR)/usr/bin/python3-config --includes`" \ - PYTHON_LIBS="`$(HOST_DIR)/usr/bin/python3-config --ldflags`" \ - PYTHON_EXTRA_LIBS="`$(HOST_DIR)/usr/bin/python3-config --libs --embed`" + PYTHON_INCLUDES="`$(HOST_DIR)/bin/python3-config --includes`" \ + PYTHON_LIBS="`$(HOST_DIR)/bin/python3-config --ldflags`" \ + PYTHON_EXTRA_LIBS="`$(HOST_DIR)/bin/python3-config --libs --embed`" $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/package/dbus/dbus.hash b/package/dbus/dbus.hash index 176396fe2fc..0e48d4dafde 100644 --- a/package/dbus/dbus.hash +++ b/package/dbus/dbus.hash @@ -1,7 +1,7 @@ # Locally calculated after checking pgp signature -# https://dbus.freedesktop.org/releases/dbus/dbus-1.12.22.tar.gz.asc +# https://dbus.freedesktop.org/releases/dbus/dbus-1.12.28.tar.gz.asc # using key 36EC5A6448A4F5EF79BEFE98E05AE1478F814C4F -sha256 8d25785c798ec4f892e6f9d177fb0ceeb8b29867b119798f9d5228561d3ad474 dbus-1.12.22.tar.gz +sha256 9da1e3f2b73f75eec0a9e4509d64be43909d1f2853fe809528a0a53984d76420 dbus-1.12.28.tar.gz # Locally calculated sha256 0e46f54efb12d04ab5c33713bacd0e140c9a35b57ae29e03c853203266e8f3a1 COPYING diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index de447d86801..99d2c4301c6 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -4,7 +4,9 @@ # ################################################################################ -DBUS_VERSION = 1.12.22 +# When updating dbus, check if there are changes in session.conf and +# system.conf, and update the versions in the dbus-broker package accordingly. +DBUS_VERSION = 1.12.28 DBUS_SITE = https://dbus.freedesktop.org/releases/dbus DBUS_LICENSE = AFL-2.1 or GPL-2.0+ (library, tools), GPL-2.0+ (tools) DBUS_LICENSE_FILES = COPYING @@ -97,6 +99,20 @@ define DBUS_INSTALL_INIT_SYSV ln -sf /tmp/dbus $(TARGET_DIR)/var/lib/dbus endef +# If dbus-broker is installed, don't install the activation links for +# dbus itself, not the configuration files. They will be overwritten +# by dbus-broker +ifeq ($(BR2_PACKAGE_DBUS_BROKER),y) +define DBUS_REMOVE_SYSTEMD_ACTIVATION_LINKS + rm -f $(TARGET_DIR)/usr/lib/systemd/system/multi-user.target.wants/dbus.service + rm -f $(TARGET_DIR)/usr/lib/systemd/system/sockets.target.wants/dbus.socket + rm -f $(TARGET_DIR)/usr/lib/systemd/system/dbus.socket + rm -f $(TARGET_DIR)/usr/share/dbus-1/session.conf + rm -f $(TARGET_DIR)/usr/share/dbus-1/system.conf +endef +DBUS_POST_INSTALL_TARGET_HOOKS += DBUS_REMOVE_SYSTEMD_ACTIVATION_LINKS +endif + define DBUS_INSTALL_INIT_SYSTEMD mkdir -p $(TARGET_DIR)/var/lib/dbus ln -sf /etc/machine-id $(TARGET_DIR)/var/lib/dbus/machine-id diff --git a/package/dc3dd/dc3dd.hash b/package/dc3dd/dc3dd.hash index 670bffa7a72..5f01e6f91bf 100644 --- a/package/dc3dd/dc3dd.hash +++ b/package/dc3dd/dc3dd.hash @@ -1,5 +1,5 @@ # From https://sourceforge.net/projects/dc3dd/files/dc3dd/7.2/ -sha1 1bfe81a921a8473a6ecb46f328ecaab761afb55d dc3dd-7.2.641.tar.xz +sha1 1bfe81a921a8473a6ecb46f328ecaab761afb55d dc3dd-7.2.641.tar.xz # Locally computed sha256 7f50aadc38649845ab11014d11013928411c9d2128c941e9630939d4c28cae6d dc3dd-7.2.641.tar.xz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/dcron/0002-system-crontab.patch b/package/dcron/0002-system-crontab.patch new file mode 100644 index 00000000000..ac293687275 --- /dev/null +++ b/package/dcron/0002-system-crontab.patch @@ -0,0 +1,28 @@ +From 1fd99b71b063b1573beaf9f6b801ec5be2fbe24f Mon Sep 17 00:00:00 2001 +From: Mario Haustein +Date: Fri, 2 Sep 2022 23:20:14 +0200 +Subject: [PATCH] Make @hourly, @daily, ... work again + +closes #15 + +Signed-off-by: Mario Haustein +Upstream: https://github.com/dubiousjim/dcron/pull/35 +--- + database.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/database.c b/database.c +index 37cf17a..6ec720e 100644 +--- a/database.c ++++ b/database.c +@@ -455,6 +455,8 @@ SynchronizeFile(const char *dpath, const char *fileName, const char *userName) + line.cl_Days[j] = 1; + for (j=0; j<12; ++j) + line.cl_Mons[j] = 1; ++ for (j=0; j<7; ++j) ++ line.cl_Dow[j] = ALL_DOW; + } + + while (*ptr == ' ' || *ptr == '\t') +-- +2.35.1 diff --git a/package/debianutils/debianutils.hash b/package/debianutils/debianutils.hash index 16a45d4ea15..449e93eeff7 100644 --- a/package/debianutils/debianutils.hash +++ b/package/debianutils/debianutils.hash @@ -1,4 +1,4 @@ # From http://snapshot.debian.org/archive/debian/20200525T145753Z/pool/main/d/debianutils/debianutils_4.11.dsc -sha256 bb5ce6290696b0d623377521ed217f484aa98f7346c5f7c48f9ae3e1acfb7151 debianutils_4.11.tar.xz +sha256 bb5ce6290696b0d623377521ed217f484aa98f7346c5f7c48f9ae3e1acfb7151 debianutils_4.11.tar.xz # Locally calculated -sha256 3c8b5112cb8f74ba959233291908d73f527afa6f1d96f93649aeb912b5884567 debian/copyright +sha256 3c8b5112cb8f74ba959233291908d73f527afa6f1d96f93649aeb912b5884567 debian/copyright diff --git a/package/dehydrated/dehydrated.hash b/package/dehydrated/dehydrated.hash index 04526452565..711e5a6cea1 100644 --- a/package/dehydrated/dehydrated.hash +++ b/package/dehydrated/dehydrated.hash @@ -1,6 +1,6 @@ # Locally computed after verifying -# https://github.com/dehydrated-io/dehydrated/releases/download/v0.7.0/dehydrated-0.7.0.tar.gz.asc +# https://github.com/dehydrated-io/dehydrated/releases/download/v0.7.1/dehydrated-0.7.1.tar.gz.asc # with key 3C2F2605E078A1E18F4793909C4DBE6CF438F333 from https://keybase.io/lukas2511 -sha256 1c5f12c2e57e64b1762803f82f0f7e767a72e65a6ce68e4d1ec197e61b9dc4f9 dehydrated-0.7.0.tar.gz +sha256 4d28a0598230b276b316070ce16be7d9ab984f3bdef482acf0bc24fcdcc0d0b0 dehydrated-0.7.1.tar.gz # License, locally computed -sha256 b4583b7dd07e3e2a08906de38e7e329d41f921ed9dcb6310b3886e013a6b8723 LICENSE +sha256 f25ab9c5f13abf15ab097180423ef6b82a89c552e92d49ae627762ee9c04a3a8 LICENSE diff --git a/package/dehydrated/dehydrated.mk b/package/dehydrated/dehydrated.mk index 28fb5a49122..f8909d8abe0 100644 --- a/package/dehydrated/dehydrated.mk +++ b/package/dehydrated/dehydrated.mk @@ -4,7 +4,7 @@ # ################################################################################ -DEHYDRATED_VERSION = 0.7.0 +DEHYDRATED_VERSION = 0.7.1 DEHYDRATED_SITE = https://github.com/dehydrated-io/dehydrated/releases/download/v$(DEHYDRATED_VERSION) DEHYDRATED_LICENSE = MIT diff --git a/package/delve/delve.hash b/package/delve/delve.hash index 04ea4954cca..105249f7f9e 100644 --- a/package/delve/delve.hash +++ b/package/delve/delve.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 086106a4776fa155bf20c37d27b9caed55255be6359c7f0bda1893d3adbb614e delve-1.8.0.tar.gz +sha256 58ad7a7fb42ae2ddd33e7d52dad688b249ca8a358eb73b9e48f91eda79e862a8 delve-1.20.2.tar.gz sha256 778864b990007e8cef6633f8c372dd05bac1fada6cf67b008afb1483f83b38f5 LICENSE diff --git a/package/delve/delve.mk b/package/delve/delve.mk index 4ca1786ffc6..f261d240b22 100644 --- a/package/delve/delve.mk +++ b/package/delve/delve.mk @@ -4,7 +4,7 @@ # ################################################################################ -DELVE_VERSION = 1.8.0 +DELVE_VERSION = 1.20.2 DELVE_SITE = $(call github,go-delve,delve,v$(DELVE_VERSION)) DELVE_LICENSE = MIT DELVE_LICENSE_FILES = LICENSE diff --git a/package/dhcp/0001-WIP-Resolve-ISC-DHCP-does-not-build-with-gcc10.patch b/package/dhcp/0001-WIP-Resolve-ISC-DHCP-does-not-build-with-gcc10.patch deleted file mode 100644 index ad244267fed..00000000000 --- a/package/dhcp/0001-WIP-Resolve-ISC-DHCP-does-not-build-with-gcc10.patch +++ /dev/null @@ -1,121 +0,0 @@ -From 129b7e402bd6e7278854e5a8935fce460552b5f4 Mon Sep 17 00:00:00 2001 -From: Thomas Markwalder -Date: Thu, 30 Jul 2020 10:01:36 -0400 -Subject: [PATCH] [#117] Fixed gcc 10 compilation issues - -client/dhclient.c -relay/dhcrelay.c - extern'ed local_port,remote_port - -common/discover.c - init local_port,remote_port to 0 - -server/mdb.c - extern'ed dhcp_type_host - -server/mdb6.c - create_prefix6() - eliminated memcpy string overflow error - -[Retrieved from: -https://gitlab.isc.org/isc-projects/dhcp/-/merge_requests/60/diffs?commit_id=129b7e402bd6e7278854e5a8935fce460552b5f4] -Signed-off-by: Fabrice Fontaine ---- - RELNOTES | 5 +++++ - client/dhclient.c | 5 +++-- - common/discover.c | 4 ++-- - relay/dhcrelay.c | 4 ++-- - server/mdb.c | 2 +- - server/mdb6.c | 2 +- - 6 files changed, 14 insertions(+), 8 deletions(-) - -diff --git a/RELNOTES b/RELNOTES -index 9d0a0414..6919dba7 100644 ---- a/RELNOTES -+++ b/RELNOTES -@@ -103,6 +103,11 @@ ISC DHCP is open source software maintained by Internet Systems - Consortium. This product includes cryptographic software written - by Eric Young (eay@cryptsoft.com). - -+ Changes since 4.4.2 (Bug Fixes) -+ -+- Minor corrections to allow compilation under gcc 10. -+ [Gitlab #117] -+ - Changes since 4.4.2b1 (Bug Fixes) - - - Added a clarification on DHCPINFORMs and server authority to -diff --git a/client/dhclient.c b/client/dhclient.c -index 189e5270..7a7837cb 100644 ---- a/client/dhclient.c -+++ b/client/dhclient.c -@@ -83,8 +83,9 @@ static const char message [] = "Internet Systems Consortium DHCP Client"; - static const char url [] = "For info, please visit https://www.isc.org/software/dhcp/"; - #endif /* UNIT_TEST */ - --u_int16_t local_port = 0; --u_int16_t remote_port = 0; -+extern u_int16_t local_port; -+extern u_int16_t remote_port; -+ - #if defined(DHCPv6) && defined(DHCP4o6) - int dhcp4o6_state = -1; /* -1 = stopped, 0 = polling, 1 = started */ - #endif -diff --git a/common/discover.c b/common/discover.c -index ca4f4d55..22f09767 100644 ---- a/common/discover.c -+++ b/common/discover.c -@@ -45,8 +45,8 @@ struct interface_info *fallback_interface = 0; - - int interfaces_invalidated; - int quiet_interface_discovery; --u_int16_t local_port; --u_int16_t remote_port; -+u_int16_t local_port = 0; -+u_int16_t remote_port = 0; - u_int16_t relay_port = 0; - int dhcpv4_over_dhcpv6 = 0; - int (*dhcp_interface_setup_hook) (struct interface_info *, struct iaddr *); -diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c -index 883d5058..7211e3bb 100644 ---- a/relay/dhcrelay.c -+++ b/relay/dhcrelay.c -@@ -95,8 +95,8 @@ enum { forward_and_append, /* Forward and append our own relay option. */ - forward_untouched, /* Forward without changes. */ - discard } agent_relay_mode = forward_and_replace; - --u_int16_t local_port; --u_int16_t remote_port; -+extern u_int16_t local_port; -+extern u_int16_t remote_port; - - /* Relay agent server list. */ - struct server_list { -diff --git a/server/mdb.c b/server/mdb.c -index ff8a707f..8266d764 100644 ---- a/server/mdb.c -+++ b/server/mdb.c -@@ -67,7 +67,7 @@ static host_id_info_t *host_id_info = NULL; - - int numclasseswritten; - --omapi_object_type_t *dhcp_type_host; -+extern omapi_object_type_t *dhcp_type_host; - - isc_result_t enter_class(cd, dynamicp, commit) - struct class *cd; -diff --git a/server/mdb6.c b/server/mdb6.c -index da7baf6e..ebe01e56 100644 ---- a/server/mdb6.c -+++ b/server/mdb6.c -@@ -1945,7 +1945,7 @@ create_prefix6(struct ipv6_pool *pool, struct iasubopt **pref, - } - new_ds.data = new_ds.buffer->data; - memcpy(new_ds.buffer->data, ds.data, ds.len); -- memcpy(new_ds.buffer->data + ds.len, &tmp, sizeof(tmp)); -+ memcpy(&new_ds.buffer->data[0] + ds.len, &tmp, sizeof(tmp)); - data_string_forget(&ds, MDL); - data_string_copy(&ds, &new_ds, MDL); - data_string_forget(&new_ds, MDL); --- -GitLab - diff --git a/package/dhcp/Config.in b/package/dhcp/Config.in index 515040c612e..adc19dec073 100644 --- a/package/dhcp/Config.in +++ b/package/dhcp/Config.in @@ -3,7 +3,6 @@ config BR2_PACKAGE_DHCP # fork() depends on BR2_USE_MMU depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - select BR2_PACKAGE_BIND help DHCP relay agent from the ISC DHCP distribution. @@ -26,6 +25,14 @@ config BR2_PACKAGE_DHCP_SERVER_DELAYED_ACK help Enable delayed ACK feature in the ISC DHCP server. +config BR2_PACKAGE_DHCP_SERVER_ENABLE_PARANOIA + bool "Enable paranoia options" + depends on BR2_PACKAGE_DHCP_SERVER + help + Add option --enable-paranoia to configure script. This + activates additional server options (-user, -group and + -chroot) to make dhcp server more secure. + config BR2_PACKAGE_DHCP_RELAY bool "dhcp relay" help diff --git a/package/dhcp/dhcp.hash b/package/dhcp/dhcp.hash index ec7c4fe58da..7dd80a7acc0 100644 --- a/package/dhcp/dhcp.hash +++ b/package/dhcp/dhcp.hash @@ -1,4 +1,4 @@ -# Verified from https://ftp.isc.org/isc/dhcp/4.4.2-P1/dhcp-4.4.2-P1.tar.gz.sha256.asc -sha256 b05e04337539545a8faa0d6ac518defc61a07e5aec66a857f455e7f218c85a1a dhcp-4.4.2-P1.tar.gz +# Verified from https://ftp.isc.org/isc/dhcp/4.4.3-P1/dhcp-4.4.3-P1.tar.gz.sha256.asc +sha256 0ac416bb55997ca8632174fd10737fd61cdb8dba2752160a335775bc21dc73c7 dhcp-4.4.3-P1.tar.gz # Locally calculated -sha256 9961fce0d83a6229b9084cdadedfa723a53274c63af610c9adb61b607e0f5a76 LICENSE +sha256 45a39c430be0920cb9570f34b32d2378fe6048c034f2f3265b9326d64ada73df LICENSE diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk index 18765a36399..7be40191c81 100644 --- a/package/dhcp/dhcp.mk +++ b/package/dhcp/dhcp.mk @@ -4,13 +4,22 @@ # ################################################################################ -DHCP_VERSION = 4.4.2-P1 +DHCP_VERSION = 4.4.3-P1 DHCP_SITE = https://ftp.isc.org/isc/dhcp/$(DHCP_VERSION) DHCP_INSTALL_STAGING = YES DHCP_LICENSE = MPL-2.0 DHCP_LICENSE_FILES = LICENSE -DHCP_DEPENDENCIES = bind host-gawk +DHCP_DEPENDENCIES = host-gawk DHCP_CPE_ID_VENDOR = isc +# internal bind does not support parallel builds. +DHCP_MAKE = $(MAKE1) + +# untar internal bind so libtool patches will be applied on bind's libtool +define DHCP_UNTAR_INTERNAL_BIND + $(TAR) xf $(@D)/bind/bind.tar.gz -C $(@D)/bind/ +endef + +DHCP_POST_EXTRACT_HOOKS = DHCP_UNTAR_INTERNAL_BIND # use libtool-enabled configure.ac define DHCP_LIBTOOL_AUTORECONF @@ -22,10 +31,18 @@ DHCP_CONF_ENV = \ -D_PATH_DHCLIENT_CONF=\"/etc/dhcp/dhclient.conf\"' \ CFLAGS='$(TARGET_CFLAGS) -DISC_CHECK_NONE=1' +DHCP_BIND_EXTRA_CONFIG = \ + BUILD_CC='$(HOSTCC)' \ + BUILD_CFLAGS='$(HOST_CFLAGS)' \ + BUILD_CPPFLAGS='$(HOST_CPPFLAGS)' \ + BUILD_LDFLAGS='$(HOST_LDFLAGS)' \ + RANLIB='$(TARGET_RANLIB)' \ + --disable-backtrace + DHCP_CONF_ENV += ac_cv_prog_AWK=$(HOST_DIR)/bin/gawk DHCP_CONF_OPTS = \ - --with-libbind=$(STAGING_DIR)/usr \ + --with-bind-extra-config="$(DHCP_BIND_EXTRA_CONFIG)" \ --with-randomdev=/dev/random \ --with-srv-lease-file=/var/lib/dhcp/dhcpd.leases \ --with-srv6-lease-file=/var/lib/dhcp/dhcpd6.leases \ @@ -38,8 +55,23 @@ DHCP_CONF_OPTS = \ --with-relay-pid-file=/var/run/dhcrelay.pid \ --with-relay6-pid-file=/var/run/dhcrelay6.pid +ifeq ($(BR2_PACKAGE_ZLIB),y) +DHCP_BIND_EXTRA_CONFIG += --with-zlib=$(STAGING_DIR)/usr +DHCP_DEPENDENCIES += zlib +else +DHCP_BIND_EXTRA_CONFIG += --without-zlib +endif + +ifeq ($(BR2_TOOLCHAIN_HAS_ATOMIC),y) +DHCP_BIND_EXTRA_CONFIG += --enable-atomic +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +DHCP_CONF_ENV += LIBS=-latomic +endif +else +DHCP_BIND_EXTRA_CONFIG += --disable-atomic +endif + ifeq ($(BR2_STATIC_LIBS),y) -DHCP_CONF_ENV += LIBS="`$(STAGING_DIR)/usr/bin/bind9-config --libs bind9`" DHCP_CONF_OPTS += --disable-libtool else DHCP_POST_EXTRACT_HOOKS += DHCP_LIBTOOL_AUTORECONF @@ -49,9 +81,18 @@ endif ifeq ($(BR2_PACKAGE_DHCP_SERVER_DELAYED_ACK),y) DHCP_CONF_OPTS += --enable-delayed-ack +else +DHCP_CONF_OPTS += --disable-delayed-ack +endif + +ifeq ($(BR2_PACKAGE_DHCP_SERVER_ENABLE_PARANOIA),y) +DHCP_CONF_OPTS += --enable-paranoia +else +DHCP_CONF_OPTS += --disable-paranoia endif define DHCP_INSTALL_LIBS + $(MAKE) -C $(@D)/bind install-bind DESTDIR=$(TARGET_DIR) $(MAKE) -C $(@D)/common install-exec DESTDIR=$(TARGET_DIR) $(MAKE) -C $(@D)/omapip install-exec DESTDIR=$(TARGET_DIR) endef diff --git a/package/dhcpcd/Config.in b/package/dhcpcd/Config.in index 3ebacb3ba2d..8612d4ba813 100644 --- a/package/dhcpcd/Config.in +++ b/package/dhcpcd/Config.in @@ -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_nds32 || BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_2 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 diff --git a/package/dhcpcd/S41dhcpcd b/package/dhcpcd/S41dhcpcd index 3e5c22f715b..55794f40758 100644 --- a/package/dhcpcd/S41dhcpcd +++ b/package/dhcpcd/S41dhcpcd @@ -5,7 +5,7 @@ DAEMON=/sbin/dhcpcd CONFIG=/etc/dhcpcd.conf -PIDFILE=/var/run/dhcpcd.pid +PIDFILE=/var/run/dhcpcd/pid [ -f $CONFIG ] || exit 0 diff --git a/package/dhcpcd/dhcpcd.service b/package/dhcpcd/dhcpcd.service index e648092c9b3..4da49818a74 100644 --- a/package/dhcpcd/dhcpcd.service +++ b/package/dhcpcd/dhcpcd.service @@ -5,7 +5,7 @@ After=network.target [Service] Type=forking EnvironmentFile=-/etc/default/dhcpcd -PIDFile=/run/dhcpcd.pid +PIDFile=/run/dhcpcd/pid ExecStart=/sbin/dhcpcd $DAEMON_ARGS Restart=always diff --git a/package/dhcpdump/dhcpdump.hash b/package/dhcpdump/dhcpdump.hash index 358a6f01d2b..a24db5b275c 100644 --- a/package/dhcpdump/dhcpdump.hash +++ b/package/dhcpdump/dhcpdump.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6d5eb9418162fb738bc56e4c1682ce7f7392dd96e568cc996e44c28de7f77190 dhcpdump-1.8.tar.gz -sha256 bab6ca76b7e93885396513689b1248dfb0e8fd662695b8bd1b26784ef71a0192 LICENSE +sha256 6d5eb9418162fb738bc56e4c1682ce7f7392dd96e568cc996e44c28de7f77190 dhcpdump-1.8.tar.gz +sha256 bab6ca76b7e93885396513689b1248dfb0e8fd662695b8bd1b26784ef71a0192 LICENSE diff --git a/package/dhrystone/dhrystone.hash b/package/dhrystone/dhrystone.hash index 9ea22a360ae..e6f4773da92 100644 --- a/package/dhrystone/dhrystone.hash +++ b/package/dhrystone/dhrystone.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 038a7e9169787125c3451a6c941f3aca5db2d2f3863871afcdce154ef17f4e3e dhry-c +sha256 038a7e9169787125c3451a6c941f3aca5db2d2f3863871afcdce154ef17f4e3e dhry-c diff --git a/package/dht/0001-cmake.patch b/package/dht/0001-cmake.patch new file mode 100644 index 00000000000..bbac6390445 --- /dev/null +++ b/package/dht/0001-cmake.patch @@ -0,0 +1,67 @@ +From 25e12bb39eea3d433602de6390796fec8a8f3620 Mon Sep 17 00:00:00 2001 +From: Mike Gelfand +Date: Sun, 1 Jan 2017 16:23:21 +0300 +Subject: [PATCH] Remove Makefile, add Makefile.am and CMakeLists.txt + +Downloaded from transmission repo: +https://github.com/transmission/dht/commit/25e12bb39eea3d433602de6390796fec8a8f3620 + +Upstream status: rejected (https://github.com/jech/dht/pull/19) + +Signed-off-by: Bernd Kuhls +--- + CMakeLists.txt | 9 +++++++++ + Makefile | 9 --------- + Makefile.am | 11 +++++++++++ + 3 files changed, 20 insertions(+), 9 deletions(-) + create mode 100644 CMakeLists.txt + delete mode 100644 Makefile + create mode 100644 Makefile.am + +diff --git a/CMakeLists.txt b/CMakeLists.txt +new file mode 100644 +index 0000000..6d4aa99 +--- /dev/null ++++ b/CMakeLists.txt +@@ -0,0 +1,9 @@ ++cmake_minimum_required(VERSION 2.8) ++project(dht C) ++ ++add_library(${PROJECT_NAME} STATIC ++ dht.c ++) ++ ++install(TARGETS ${PROJECT_NAME} DESTINATION lib) ++install(FILES dht.h DESTINATION include/dht) +diff --git a/Makefile b/Makefile +deleted file mode 100644 +index e012945..0000000 +--- a/Makefile ++++ /dev/null +@@ -1,9 +0,0 @@ +-CFLAGS = -g -Wall +-LDLIBS = -lcrypt +- +-dht-example: dht-example.o dht.o +- +-all: dht-example +- +-clean: +- -rm -f dht-example dht-example.o dht-example.id dht.o *~ core +diff --git a/Makefile.am b/Makefile.am +new file mode 100644 +index 0000000..2dba648 +--- /dev/null ++++ b/Makefile.am +@@ -0,0 +1,11 @@ ++AM_CFLAGS = @PTHREAD_CFLAGS@ ++ ++noinst_LIBRARIES = libdht.a ++libdht_a_SOURCES = dht.c ++libdht_a_DEPENDENCIES = $(builddir)/include/dht ++noinst_HEADERS = dht.h ++EXTRA_DIST = CHANGES CMakeLists.txt dht-example.c LICENCE README ++ ++$(builddir)/include/dht: ++ $(MKDIR_P) $(builddir)/include ++ (cd $(builddir)/include && $(LN_S) $(abs_srcdir) dht) diff --git a/package/dht/Config.in b/package/dht/Config.in new file mode 100644 index 00000000000..7660295c8d5 --- /dev/null +++ b/package/dht/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_DHT + bool "dht" + help + BitTorrent DHT library + + https://www.irif.fr/~jch/software/bittorrent diff --git a/package/dht/dht.hash b/package/dht/dht.hash new file mode 100644 index 00000000000..2b641b9dcb3 --- /dev/null +++ b/package/dht/dht.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 caba469a784a5c359c084099fdc025cfe09b1faec2ba9ba257b7384351c43c0a dht-0.27.tar.gz +sha256 06ce07293caf8c8ddfaf47797ad1fb18d1c040a8375231d8f8a6105cef51a8e6 LICENCE diff --git a/package/dht/dht.mk b/package/dht/dht.mk new file mode 100644 index 00000000000..4f78f027c72 --- /dev/null +++ b/package/dht/dht.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# dht +# +################################################################################ + +DHT_VERSION = 0.27 +DHT_SITE = $(call github,jech,dht,dht-$(DHT_VERSION)) +DHT_LICENSE = MIT +DHT_LICENSE_FILES = LICENCE +DHT_INSTALL_STAGING = YES + +$(eval $(cmake-package)) diff --git a/package/dialog/dialog.hash b/package/dialog/dialog.hash index 2286590b669..3136d18b2b6 100644 --- a/package/dialog/dialog.hash +++ b/package/dialog/dialog.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 466163e8b97c2b7709d00389199add3156bd813f60ccb0335d0a30f2d4a17f99 dialog-1.3-20200327.tgz +sha256 754cb6bf7dc6a9ac5c1f80c13caa4d976e30a5a6e8b46f17b3bb9b080c31041f dialog-1.3-20220117.tgz # Locally computed sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/dialog/dialog.mk b/package/dialog/dialog.mk index 1c98d354e33..681f8ec9fee 100644 --- a/package/dialog/dialog.mk +++ b/package/dialog/dialog.mk @@ -4,7 +4,7 @@ # ################################################################################ -DIALOG_VERSION = 1.3-20200327 +DIALOG_VERSION = 1.3-20220117 DIALOG_SOURCE = dialog-$(DIALOG_VERSION).tgz DIALOG_SITE = https://invisible-mirror.net/archives/dialog DIALOG_CONF_OPTS = --with-ncurses --with-curses-dir=$(STAGING_DIR)/usr \ diff --git a/package/dieharder/0001-Do-not-use-includedir-as-include-search-path-for-bui.patch b/package/dieharder/0001-Do-not-use-includedir-as-include-search-path-for-bui.patch deleted file mode 100644 index b475e5c470d..00000000000 --- a/package/dieharder/0001-Do-not-use-includedir-as-include-search-path-for-bui.patch +++ /dev/null @@ -1,62 +0,0 @@ -From fbc9b7c3b83a99ac996c0a268487d1f800630328 Mon Sep 17 00:00:00 2001 -From: Julien Viard de Galbert -Date: Wed, 8 Feb 2017 21:26:58 +0100 -Subject: [PATCH] Do not use includedir as include search path for build - ---includedir is not used to specify where a program should -look for headers of libraries, but to tell where it should -install its own headers. - -Signed-off-by: Julien Viard de Galbert ---- - configure.ac | 6 +++--- - dieharder/Makefile.am | 2 +- - libdieharder/Makefile.am | 2 +- - 3 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/configure.ac b/configure.ac -index b336115..91f7c64 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -96,9 +96,9 @@ AC_TYPE_SIZE_T - AC_C_VOLATILE - AC_C_INLINE - --DIEHARDER_CFLAGS="-I$includedir" --dieharder_CFLAGS="-std=c99 -Wall -pedantic -I$includedir" --libdieharder_lo_CFLAGS="-Wall -pedantic -I$includedir" -+DIEHARDER_CFLAGS="" -+dieharder_CFLAGS="-std=c99 -Wall -pedantic" -+libdieharder_lo_CFLAGS="-Wall -pedantic" - DIEHARDER_LIBS="-L$libdir -ldieharder" - ACLOCAL_AMFLAGS="-I m4" - -diff --git a/dieharder/Makefile.am b/dieharder/Makefile.am -index e6fbff2..7bdac5c 100644 ---- a/dieharder/Makefile.am -+++ b/dieharder/Makefile.am -@@ -64,7 +64,7 @@ DEFINES = -DVERSION=$(VERSION) - # CC = gcc - - # Compile flags (use fairly standard -O3 as default) --AM_CPPFLAGS = -I ${top_srcdir}/include $(DEFINES) -I ${includedir} -+AM_CPPFLAGS = -I ${top_srcdir}/include $(DEFINES) - AM_CFLAGS = -O3 - - # Load flags (optional) -diff --git a/libdieharder/Makefile.am b/libdieharder/Makefile.am -index 5fd3396..0873f9c 100644 ---- a/libdieharder/Makefile.am -+++ b/libdieharder/Makefile.am -@@ -114,7 +114,7 @@ DEFINES = -DVERSION=$(VERSION) -DLITTLE_ENDIAN=$(LITTLE_ENDIAN) - # CC = gcc - - # Compile flags (use fairly standard -O3 as default) --AM_CPPFLAGS = $(DEFINES) -I ${top_srcdir}/include -I ${includedir} -+AM_CPPFLAGS = $(DEFINES) -I ${top_srcdir}/include - AM_CFLAGS = -O3 -Wall -pedantic -Wno-unused-variable - - #======================================================================== --- -2.1.4 - diff --git a/package/dieharder/0002-Fix-missing-type-intptr_t.patch b/package/dieharder/0002-Fix-missing-type-intptr_t.patch deleted file mode 100644 index 12ea5e7fa01..00000000000 --- a/package/dieharder/0002-Fix-missing-type-intptr_t.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 6f550841943f19612af064b3d3a1db134078e03c Mon Sep 17 00:00:00 2001 -From: Julien Viard de Galbert -Date: Sat, 14 Jan 2017 14:18:10 +0100 -Subject: [PATCH] Fix missing type intptr_t - -With glibc-2.23 unistd.h need intptr_t when __USE_MISC is defined. - -Signed-off-by: Julien Viard de Galbert ---- - include/dieharder/libdieharder.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/dieharder/libdieharder.h b/include/dieharder/libdieharder.h -index 2138ebf..d98b758 100644 ---- a/include/dieharder/libdieharder.h -+++ b/include/dieharder/libdieharder.h -@@ -17,6 +17,7 @@ - - /* This turns on uint macro in c99 */ - #define __USE_MISC 1 -+#include - #include - #include - #include --- -2.1.4 - diff --git a/package/dieharder/0003-Add-_GNU_SOURCE-for-uint-and-M_PI-with-musl-libc.patch b/package/dieharder/0003-Add-_GNU_SOURCE-for-uint-and-M_PI-with-musl-libc.patch deleted file mode 100644 index d71cd574450..00000000000 --- a/package/dieharder/0003-Add-_GNU_SOURCE-for-uint-and-M_PI-with-musl-libc.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 526510a27ef47a16699dd34a2373ad9b6bb5e8f3 Mon Sep 17 00:00:00 2001 -From: Julien Viard de Galbert -Date: Sat, 14 Jan 2017 14:19:47 +0100 -Subject: [PATCH] Add _GNU_SOURCE for uint and M_PI with musl libc - -When building with musl libc _GNU_SOURCE need to be defined -to provide uint type and M_PI macro - -Signed-off-by: Julien Viard de Galbert ---- - include/dieharder/libdieharder.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/dieharder/libdieharder.h b/include/dieharder/libdieharder.h -index d98b758..c1a5023 100644 ---- a/include/dieharder/libdieharder.h -+++ b/include/dieharder/libdieharder.h -@@ -17,6 +17,7 @@ - - /* This turns on uint macro in c99 */ - #define __USE_MISC 1 -+#define _GNU_SOURCE 1 - #include - #include - #include --- -2.1.4 - diff --git a/package/dieharder/0004-Add-static-to-inline-functions.patch b/package/dieharder/0004-Add-static-to-inline-functions.patch deleted file mode 100644 index 64cde1d21d3..00000000000 --- a/package/dieharder/0004-Add-static-to-inline-functions.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 9c71a211dcf20f53f747326f5bc3fee9fabe3f52 Mon Sep 17 00:00:00 2001 -From: Julien Viard de Galbert -Date: Tue, 27 Jun 2017 00:16:11 +0200 -Subject: [PATCH] Add static to inline functions - -This is needed to avoid a link error where the inline functions appear -missing at link time. -From c99 standard inline function should either be declared static or -have an extern instance in a c file for linking. -This fix is necessary to build with gcc 7; for some reason it was not -trigerred before. - -Signed-off-by: Julien Viard de Galbert ---- - libdieharder/dab_filltree.c | 4 ++-- - libdieharder/dab_filltree2.c | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/libdieharder/dab_filltree.c b/libdieharder/dab_filltree.c -index 9cc5ce7..a377c3d 100644 ---- a/libdieharder/dab_filltree.c -+++ b/libdieharder/dab_filltree.c -@@ -34,7 +34,7 @@ static double targetData[] = { - 0.0, 0.0, 0.0, 0.0, 0.13333333, 0.20000000, 0.20634921, 0.17857143, 0.13007085, 0.08183633, 0.04338395, 0.01851828, 0.00617270, 0.00151193, 0.00023520, 0.00001680, 0.00000000, 0.00000000, 0.00000000, 0.00000000 - }; - --inline int insert(double x, double *array, unsigned int startVal); -+static inline int insert(double x, double *array, unsigned int startVal); - - int dab_filltree(Test **test,int irun) { - int size = (ntuple == 0) ? 32 : ntuple; -@@ -105,7 +105,7 @@ int dab_filltree(Test **test,int irun) { - } - - --inline int insert(double x, double *array, unsigned int startVal) { -+static inline int insert(double x, double *array, unsigned int startVal) { - uint d = (startVal + 1) / 2; - uint i = startVal; - while (d > 0) { -diff --git a/libdieharder/dab_filltree2.c b/libdieharder/dab_filltree2.c -index 1e33af2..59cbd52 100644 ---- a/libdieharder/dab_filltree2.c -+++ b/libdieharder/dab_filltree2.c -@@ -92,7 +92,7 @@ static double targetData[128] = { // size=128, generated from 6e9 samples - 0.00000000000e+00,0.00000000000e+00,0.00000000000e+00,0.00000000000e+00, - }; - --inline int insertBit(uint x, uchar *array, uint *i, uint *d); -+static inline int insertBit(uint x, uchar *array, uint *i, uint *d); - - int dab_filltree2(Test **test, int irun) { - int size = (ntuple == 0) ? 128 : ntuple; -@@ -181,7 +181,7 @@ int dab_filltree2(Test **test, int irun) { - * The function returns >= 0 if the path went too deep; the - * returned value is the last position of the path. - */ --inline int insertBit(uint x, uchar *array, uint *i, uint *d) { -+static inline int insertBit(uint x, uchar *array, uint *i, uint *d) { - if (x != 0) { - *i += *d; - } else { --- -2.13.2 - diff --git a/package/dieharder/dieharder.hash b/package/dieharder/dieharder.hash index 55932ce6af7..3d285d03ccf 100644 --- a/package/dieharder/dieharder.hash +++ b/package/dieharder/dieharder.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 6cff0ff8394c553549ac7433359ccfc955fb26794260314620dfa5e4cd4b727f dieharder-3.31.1.tgz -sha256 c475bcd1afa6fc15a65174e31c599c0d23706a34e4b9f2fcb03a4dad5438d53f COPYING +sha256 0fdd8a66a077e86652a47641589aa4667ae13d322a7214bb555ab37f082002dd dieharder-3.31.1.4.tar.gz +sha256 c475bcd1afa6fc15a65174e31c599c0d23706a34e4b9f2fcb03a4dad5438d53f COPYING diff --git a/package/dieharder/dieharder.mk b/package/dieharder/dieharder.mk index cbf28922fd6..6fe5b1f743d 100644 --- a/package/dieharder/dieharder.mk +++ b/package/dieharder/dieharder.mk @@ -4,28 +4,14 @@ # ################################################################################ -DIEHARDER_VERSION = 3.31.1 -DIEHARDER_SITE = http://www.phy.duke.edu/~rgb/General/dieharder -DIEHARDER_SOURCE = dieharder-$(DIEHARDER_VERSION).tgz -DIEHARDER_STRIP_COMPONENTS = 2 +DIEHARDER_VERSION = 3.31.1.4 +DIEHARDER_SITE = $(call github,eddelbuettel,dieharder,$(DIEHARDER_VERSION)) DIEHARDER_LICENSE = GPL-2.0 with beverage clause DIEHARDER_LICENSE_FILES = COPYING DIEHARDER_DEPENDENCIES = gsl - -# The original configure does not use variables provided in the -# environment so _CONF_ENV does not work. (_CONF_OPTS does). -# -# Finally, we patch configure.ac and some Makefile.am so we need to -# autoreconf anyway +# configure retrieved from git is outdated DIEHARDER_AUTORECONF = YES -# The m4/*.m4 files are symlinks to /usr/share, which clearly doesn't -# work, and doing an autoreconf does not replace them. -define DIEHARDER_M4_CLEAN - rm -f $(@D)/m4/*.m4 -endef -DIEHARDER_POST_PATCH_HOOKS += DIEHARDER_M4_CLEAN - # fix endianness detection ifeq ($(BR2_ENDIAN),"BIG") DIEHARDER_CONF_ENV = ac_cv_c_endian=big @@ -36,9 +22,4 @@ endif # parallel build fail, disable it DIEHARDER_MAKE = $(MAKE1) -# Too many fixes needed to build with -fno-common which is default since gcc 10 -ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_10),y) -DIEHARDER_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -fcommon" -endif - $(eval $(autotools-package)) diff --git a/package/diffutils/0004-sigsegv-Fix-compilation-error-on-arceb-CPUs.patch b/package/diffutils/0004-sigsegv-Fix-compilation-error-on-arceb-CPUs.patch new file mode 100644 index 00000000000..20db798f3ab --- /dev/null +++ b/package/diffutils/0004-sigsegv-Fix-compilation-error-on-arceb-CPUs.patch @@ -0,0 +1,41 @@ +From 1957bb5113a2bf02c7ecf0815125eec04b9476d2 Mon Sep 17 00:00:00 2001 +From: Bruno Haible +Date: Sat, 16 Apr 2022 03:01:51 +0200 +Subject: sigsegv: Fix compilation error on arceb CPUs. + +Reported by Fabrice Fontaine in +. + +* m4/stack-direction.m4 (SV_STACK_DIRECTION): Treat the 'arc' variants +like 'arc'. + +[Retrieved (and backported) from: +https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=1957bb5113a2bf02c7ecf0815125eec04b9476d2] +Signed-off-by: Fabrice Fontaine +--- + ChangeLog | 8 ++++++++ + m4/stack-direction.m4 | 4 ++-- + 2 files changed, 10 insertions(+), 2 deletions(-) + +diff --git a/m4/stack-direction.m4 b/m4/stack-direction.m4 +index 1df823e..924c5de 100644 +--- a/m4/stack-direction.m4 ++++ b/m4/stack-direction.m4 +@@ -1,4 +1,4 @@ +-# stack-direction.m4 serial 7 ++# stack-direction.m4 serial 11 + dnl Copyright (C) 2002-2021 Free Software Foundation, Inc. + dnl This file is free software, distributed under the terms of the GNU + dnl General Public License. As a special exception to the GNU General +@@ -18,7 +18,7 @@ AC_DEFUN([SV_STACK_DIRECTION], + a29k | \ + aarch64* | \ + alpha* | \ +- arc | \ ++ arc | arceb | arc32 | arc64 | \ + arm* | strongarm* | xscale* | \ + avr | avr32 | \ + bfin | \ +-- +cgit v1.1 + diff --git a/package/diffutils/0005-sigsegv-Add-support-for-Linux-PowerPC-32-bit-with-mu.patch b/package/diffutils/0005-sigsegv-Add-support-for-Linux-PowerPC-32-bit-with-mu.patch new file mode 100644 index 00000000000..16e0941f6c2 --- /dev/null +++ b/package/diffutils/0005-sigsegv-Add-support-for-Linux-PowerPC-32-bit-with-mu.patch @@ -0,0 +1,58 @@ +From 6f2f006185cdeeda997d19d651379bfc6887e394 Mon Sep 17 00:00:00 2001 +From: Joel Stanley +Date: Mon, 6 Jun 2022 17:14:12 +0930 +Subject: [PATCH] sigsegv: Add support for Linux/PowerPC (32-bit) with musl + libc. Reported by Khem Raj in + . + +* src/sigsegv.c (SIGSEGV_FAULT_STACKPOINTER): In the Linux/PowerPC +32-bit case, handle musl libc differently. +* modules/sigsegv (Files): Add m4/musl.m4. +(configure.ac): Invoke gl_MUSL_LIBC. + +Backported from http://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=2d830e4a792fcd9f614ed08a7f18584b8b21d23b +Signed-off-by: Joel Stanley +--- + lib/sigsegv.c | 25 +++++++++++++++++++++---- + 1 file changed, 21 insertions(+), 4 deletions(-) + +diff --git a/lib/sigsegv.c b/lib/sigsegv.c +index da70ffa5fda1..da64d7d0b617 100644 +--- a/lib/sigsegv.c ++++ b/lib/sigsegv.c +@@ -227,11 +227,28 @@ int libsigsegv_version = LIBSIGSEGV_VERSION; + # if defined __powerpc64__ || defined __powerpc64_elfv2__ /* 64-bit */ + # define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.gp_regs[1] + # else /* 32-bit */ +-/* both should be equivalent */ +-# if 0 +-# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.regs->gpr[1] ++# if MUSL_LIBC ++/* musl libc has a different structure of ucontext_t in ++ musl/arch/powerpc/bits/signal.h. */ ++/* The glibc comments say: ++ "Different versions of the kernel have stored the registers on signal ++ delivery at different offsets from the ucontext struct. Programs should ++ thus use the uc_mcontext.uc_regs pointer to find where the registers are ++ actually stored." */ ++# if 0 ++# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.gregs[1] ++# else ++# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_regs->gregs[1] ++# endif + # else +-# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.uc_regs->gregs[1] ++/* Assume the structure of ucontext_t in ++ glibc/sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h. */ ++/* Because of the union, both definitions should be equivalent. */ ++# if 0 ++# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.regs->gpr[1] ++# else ++# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.uc_regs->gregs[1] ++# endif + # endif + # endif + +-- +2.35.1 + diff --git a/package/diffutils/diffutils.mk b/package/diffutils/diffutils.mk index 3d865412955..510f3725bf6 100644 --- a/package/diffutils/diffutils.mk +++ b/package/diffutils/diffutils.mk @@ -10,6 +10,7 @@ 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 # We're patching m4/stack-direction.m4 DIFFUTILS_AUTORECONF = YES @@ -20,4 +21,3 @@ DIFFUTILS_CONF_ENV += gl_cv_func_getopt_gnu=yes endif $(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package/ding-libs/Config.in b/package/ding-libs/Config.in index 152dca0426c..dc87a01bf22 100644 --- a/package/ding-libs/Config.in +++ b/package/ding-libs/Config.in @@ -13,4 +13,4 @@ config BR2_PACKAGE_DING_LIBS initialization format (INI) into a library collection data structure (libini_config). - https://pagure.io/SSSD/ding-libs + https://github.com/SSSD/ding-libs diff --git a/package/ding-libs/ding-libs.hash b/package/ding-libs/ding-libs.hash index 2ac5bd8eeef..d5d87faccdf 100644 --- a/package/ding-libs/ding-libs.hash +++ b/package/ding-libs/ding-libs.hash @@ -1,4 +1,6 @@ +# From https://github.com/SSSD/ding-libs/releases/download/0.6.2/ding-libs-0.6.2.tar.gz.sha256sum +sha256 e5f07f34f5921bcb5ccccfe3751c28497879a6451cd7b395e99e24d9b5728e8d ding-libs-0.6.2.tar.gz + # Locally computed -sha256 ad3c573641701f67d4b6bd8a5a71f0b65d45fd39fe961495ef5f5d3c57fc0963 ding-libs-ding_libs-0_6_1.tar.gz -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING -sha256 6c57f43c939054fd4b831f271a14c97a488c38f98cdda5e887c5d396e3b3bc58 COPYING.LESSER +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 6c57f43c939054fd4b831f271a14c97a488c38f98cdda5e887c5d396e3b3bc58 COPYING.LESSER diff --git a/package/ding-libs/ding-libs.mk b/package/ding-libs/ding-libs.mk index 1e8fa59d699..a4ee7351b54 100644 --- a/package/ding-libs/ding-libs.mk +++ b/package/ding-libs/ding-libs.mk @@ -4,10 +4,9 @@ # ################################################################################ -DING_LIBS_VERSION = 0.6.1 -DING_LIBS_SOURCE = ding-libs-ding_libs-$(subst .,_,$(DING_LIBS_VERSION)).tar.gz +DING_LIBS_VERSION = 0.6.2 DING_LIBS_SITE = \ - https://pagure.io/SSSD/ding-libs/archive/ding_libs-$(subst .,_,$(DING_LIBS_VERSION)) + https://github.com/SSSD/ding-libs/releases/download/$(DING_LIBS_VERSION) DING_LIBS_DEPENDENCIES = host-pkgconf \ $(TARGET_NLS_DEPENDENCIES) \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk index 56a396ab996..094e87e7e79 100644 --- a/package/directfb/directfb.mk +++ b/package/directfb/directfb.mk @@ -67,7 +67,6 @@ endif DIRECTFB_GFX = \ $(if $(BR2_PACKAGE_DIRECTFB_ATI128),ati128) \ - $(if $(BR2_PACKAGE_DIRECTFB_CYBER5K),cyber5k) \ $(if $(BR2_PACKAGE_DIRECTFB_MATROX),matrox) \ $(if $(BR2_PACKAGE_DIRECTFB_PXA3XX),pxa3xx) \ $(if $(BR2_PACKAGE_DIRECTFB_I830),i830) \ diff --git a/package/dmalloc/0001-configure-fix-build-on-mips.patch b/package/dmalloc/0001-configure-fix-build-on-mips.patch new file mode 100644 index 00000000000..9b1525d0d1a --- /dev/null +++ b/package/dmalloc/0001-configure-fix-build-on-mips.patch @@ -0,0 +1,90 @@ +From af6adb3f5f05be4faa88a5aa83296c388c8085e7 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Wed, 8 Feb 2023 12:30:10 +0100 +Subject: [PATCH] configure: fix build on mips + +This patch is a historical baggage that Buildroot has carried for ages +(since 2006), and the reason for it are notentirely clear. + +Since dmalloc is pretty tricky, and as this patch has not been +identified as causing issues, we keep it; we just add the configure.ac +patchlet to match the one in configure. + +As for the title, the original patch was named dmalloc-mips.patch, so +presumably it fixes some mips issue; let's title the commit that way. + +[Fabrice: Updated for 5.6.5] +Signed-off-by: Fabrice Fontaine +[yann.morin.1998@free.fr: make it a git-formatted patch] +Signed-off-by: Yann E. MORIN +--- + configure | 4 ++-- + configure.ac | 2 +- + return.h | 16 +++------------- + 3 files changed, 6 insertions(+), 16 deletions(-) + +diff --git a/configure b/configure +index d52a1e8..c18dfb2 100755 +--- a/configure ++++ b/configure +@@ -5413,8 +5413,8 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking return.h macros work" >&5 + $as_echo_n "checking return.h macros work... " >&6; } + if test "$cross_compiling" = yes; then : +- $as_echo "#define RETURN_MACROS_WORK 0" >>confdefs.h +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++ $as_echo "#define RETURN_MACROS_WORK 1" >>confdefs.h ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: assume yes (cross-compiling)" >&5 + $as_echo "no" >&6; } + + else +diff --git a/configure.ac b/configure.ac +index a5295f1..9740fdc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -705,7 +705,7 @@ int main() + ])], + [ AC_DEFINE(RETURN_MACROS_WORK, 1) AC_MSG_RESULT([yes]) ], + [ AC_DEFINE(RETURN_MACROS_WORK, 0) AC_MSG_RESULT([no]) ], +-[ AC_DEFINE(RETURN_MACROS_WORK, 0) AC_MSG_RESULT([no]) ] ++[ AC_DEFINE(RETURN_MACROS_WORK, 1) AC_MSG_RESULT([assume yes (cross-compiling)]) ] + ) + + ############################################################################## +diff --git a/return.h b/return.h +index 9d3f5f1..d916c7a 100644 +--- a/return.h ++++ b/return.h +@@ -117,26 +117,16 @@ + /*************************************/ + + /* +- * For DEC Mips machines running Ultrix ++ * For Mips machines running Linux + */ + #if __mips + +-/* +- * I have no idea how to get inline assembly with the default cc. +- * Anyone know how? +- */ +- +-#if 0 +- + /* + * NOTE: we assume here that file is global. + * +- * $31 is the frame pointer. $2 looks to be the return address but maybe +- * not consistently. ++ * $31 is the return address. + */ +-#define GET_RET_ADDR(file) asm("sw $2, file") +- +-#endif ++#define GET_RET_ADDR(file) asm("sw $31, %0" : "=m" (file)) + + #endif /* __mips */ + +-- +2.25.1 + diff --git a/package/dmalloc/0001-mips.patch b/package/dmalloc/0001-mips.patch deleted file mode 100644 index 3150d030ec5..00000000000 --- a/package/dmalloc/0001-mips.patch +++ /dev/null @@ -1,45 +0,0 @@ -[Fabrice: Updated for 5.6.5] -Signed-off-by: Fabrice Fontaine ---- a/configure -+++ b/configure -@@ -7107,7 +7107,7 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking return.h macros work" >&5 - $as_echo_n "checking return.h macros work... " >&6; } - if test "$cross_compiling" = yes; then : -- $as_echo "#define RETURN_MACROS_WORK 0" >>confdefs.h -+ $as_echo "#define RETURN_MACROS_WORK 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - ---- a/return.h -+++ b/return.h -@@ -106,26 +106,16 @@ - /*************************************/ - - /* -- * For DEC Mips machines running Ultrix -+ * For Mips machines running Linux - */ - #if __mips - - /* -- * I have no idea how to get inline assembly with the default cc. -- * Anyone know how? -- */ -- --#if 0 -- --/* - * NOTE: we assume here that file is global. - * -- * $31 is the frame pointer. $2 looks to be the return address but maybe -- * not consistently. -+ * $31 is the return address. - */ --#define GET_RET_ADDR(file) asm("sw $2, file") -- --#endif -+#define GET_RET_ADDR(file) asm("sw $31, %0" : "=m" (file)) - - #endif /* __mips */ - diff --git a/package/dmalloc/0002-return-Fix-PowerPC-assembly.patch b/package/dmalloc/0002-return-Fix-PowerPC-assembly.patch new file mode 100644 index 00000000000..e6aa8116441 --- /dev/null +++ b/package/dmalloc/0002-return-Fix-PowerPC-assembly.patch @@ -0,0 +1,54 @@ +From 6d87fc890c3de81ee33baf25d7c3c86532f26060 Mon Sep 17 00:00:00 2001 +From: Joel Stanley +Date: Mon, 9 May 2022 20:27:58 +0930 +Subject: [PATCH] return: Fix PowerPC assembly + +The original assembly used suspicious syntax. However, due to the +!defined(__OPTIMIZE__) guard this code was rarely built. + +There nothing to stop the compiler using r0 between the two asm blocks, +which may have been the cause of the note mentioning it failed when +build with optimisation enabled. + +Write a single asm statement that places the result in the given +location. + +This builds for powerpc64le and passes tests. + +Signed-off-by: Joel Stanley +Upstream: https://github.com/j256/dmalloc/pull/113 +--- + return.h | 13 +++---------- + 1 file changed, 3 insertions(+), 10 deletions(-) + +diff --git a/return.h b/return.h +index 55b9369fe12d..fafbe3754f0f 100644 +--- a/return.h ++++ b/return.h +@@ -260,20 +260,13 @@ asm void ASM_GET_RET_ADDR(file) + /*************************************/ + + /* +- * For Powerpc 603 based system running LynxOS 2.3.1 using gcc/gas. +- */ +-#if defined(__powerpc__) && defined(__GNUC__) && !defined(__OPTIMIZE__) +- +-/* +- * This won't compile if "-O2" is used, but it seems to work fine with +- * "-O0". I'm no assembler expert; I was happy enough to come up with +- * something that works at all... :-) ++ * For PowerPC using gcc/gas. + */ ++#if defined(__powerpc__) && defined(__GNUC__) + + #define GET_RET_ADDR(file) \ + do { \ +- asm("mflr 0"); \ +- asm("stw 0,%0" : "=g" (file)); \ ++ asm("mflr %0" : "=r" (file)); \ + } while(0) + + #endif /* __powerpc__ && __GNUC__ && !__OPTIMIZE__ */ +-- +2.35.1 + diff --git a/package/dmalloc/0003-configure-allow-overriding-some-tests.patch b/package/dmalloc/0003-configure-allow-overriding-some-tests.patch new file mode 100644 index 00000000000..3003e8cbe4e --- /dev/null +++ b/package/dmalloc/0003-configure-allow-overriding-some-tests.patch @@ -0,0 +1,80 @@ +From 9d57d4353c82110c609f36f91986277343d4ee45 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Wed, 8 Feb 2023 13:26:56 +0100 +Subject: [PATCH] configure: allow overriding some tests + +Some tests use AC_RUN_IFELSE, so they do not work for cross-compilation. + +Allow the user to provide these results from the environment. + +Signed-off-by: Yann E. MORIN +--- + configure | 6 +++--- + configure.ac | 6 +++--- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/configure b/configure +index c18dfb2..d165962 100755 +--- a/configure ++++ b/configure +@@ -4540,7 +4540,7 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking strdup macro" >&5 + $as_echo_n "checking strdup macro... " >&6; } + if test "$cross_compiling" = yes; then : +- ac_cv_strdup_macro=no ++ ac_cv_strdup_macro="${ac_cv_strdup_macro-no}" + + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -4578,7 +4578,7 @@ $as_echo "$ac_cv_strdup_macro" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking strndup macro" >&5 + $as_echo_n "checking strndup macro... " >&6; } + if test "$cross_compiling" = yes; then : +- ac_cv_strndup_macro=no ++ ac_cv_strndup_macro="${ac_cv_strndup_macro-no}" + + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -4753,7 +4753,7 @@ done + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking basic-block size" >&5 + $as_echo_n "checking basic-block size... " >&6; } +-ac_cv_page_size=0 ++ac_cv_page_size="${ac_cv_page_size-0}" + if test $ac_cv_page_size = 0; then + if test "$cross_compiling" = yes; then : + ac_cv_page_size=0 +diff --git a/configure.ac b/configure.ac +index 9740fdc..51bdf4d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -292,7 +292,7 @@ int main() { return 1; } + ]])], + [ac_cv_strdup_macro=yes], + [ac_cv_strdup_macro=no], +-[ac_cv_strdup_macro=no] ++[ac_cv_strdup_macro="${ac_cv_strdup_macro-no}"] + ) + AC_MSG_RESULT([$ac_cv_strdup_macro]) + +@@ -316,7 +316,7 @@ int main() { return 1; } + ]])], + [ac_cv_strndup_macro=yes], + [ac_cv_strndup_macro=no], +-[ac_cv_strndup_macro=no] ++[ac_cv_strndup_macro="${ac_cv_strndup_macro-no}"] + ) + AC_MSG_RESULT([$ac_cv_strndup_macro]) + +@@ -390,7 +390,7 @@ AC_MSG_RESULT([$ac_cv_use_mmap]) + # + AC_CHECK_FUNCS(getpagesize) + AC_MSG_CHECKING([basic-block size]) +-ac_cv_page_size=0 ++ac_cv_page_size="${ac_cv_page_size-0}" + if test $ac_cv_page_size = 0; then + AC_RUN_IFELSE([AC_LANG_SOURCE([ + #if HAVE_UNISTD_H +-- +2.25.1 + diff --git a/package/dmalloc/0004-Makefile-use-the-configure-detected-or-user-supplied.patch b/package/dmalloc/0004-Makefile-use-the-configure-detected-or-user-supplied.patch new file mode 100644 index 00000000000..394e7ca34eb --- /dev/null +++ b/package/dmalloc/0004-Makefile-use-the-configure-detected-or-user-supplied.patch @@ -0,0 +1,50 @@ +From c958fd5cd7d5ff03c0a023608b53b74997c514b3 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Wed, 8 Feb 2023 13:43:55 +0100 +Subject: [PATCH] Makefile: use the configure-detected or user-supplied ar + program + +Signed-off-by: Yann E. MORIN +--- + Makefile.in | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 86d3cca..089ac99 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -303,11 +303,11 @@ $(LIB_SL) : $(LIBRARY) + mv $@.t $@ + + $(LIBRARY) : $(OBJS) $(NORMAL_OBJS) +- ar cr $@ $? ++ $(AR) cr $@ $? + @RANLIB@ $@ + + $(LIB_TH) : $(OBJS) $(THREAD_OBJS) +- ar cr $@ $? ++ $(AR) cr $@ $? + @RANLIB@ $@ + + $(LIB_TH_SL) : $(LIB_TH) +@@ -316,7 +316,7 @@ $(LIB_TH_SL) : $(LIB_TH) + mv $@.t $@ + + $(LIB_CXX) : $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS) +- ar cr $@ $? ++ $(AR) cr $@ $? + @RANLIB@ $@ + + $(LIB_CXX_SL) : $(LIB_CXX) +@@ -325,7 +325,7 @@ $(LIB_CXX_SL) : $(LIB_CXX) + mv $@.t $@ + + $(LIB_TH_CXX) : $(OBJS) $(THREAD_OBJS) $(CXX_OBJS) +- ar cr $@ $? ++ $(AR) cr $@ $? + @RANLIB@ $@ + + $(LIB_TH_CXX_SL) : $(LIB_TH_CXX) +-- +2.25.1 + diff --git a/package/dmalloc/0005-configure-use-LD-instead-of-hard-coding-ld.patch b/package/dmalloc/0005-configure-use-LD-instead-of-hard-coding-ld.patch new file mode 100644 index 00000000000..3ba6ee3dc79 --- /dev/null +++ b/package/dmalloc/0005-configure-use-LD-instead-of-hard-coding-ld.patch @@ -0,0 +1,67 @@ +From d77e5f3d45b0cbae850e3a6e23d52edc137be803 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Wed, 8 Feb 2023 13:52:05 +0100 +Subject: [PATCH] configure: use ${LD} instead of hard-coding 'ld' + +When doing cross-compilation, we do not want to use the native tools to +test, but the target tools. + +Note that the weird quoting is inherited from a legacy patch in +Buildroot, which dates back ages (at least 2006), and as it has not been +identified as breaking things, we keep it as-is... Meh... + +Signed-off-by: Yann E. MORIN +--- + configure | 12 ++++++------ + configure.ac | 12 ++++++------ + 2 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/configure b/configure +index 810636e..30a7ea3 100755 +--- a/configure ++++ b/configure +@@ -4377,12 +4377,12 @@ if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_shared_link_args='# Could not configure shlib linking' + enable_shlib=no + fi +- elif (ld -shared --whole-archive -soname conftest.so -o conftest.so.t conftest.a) 2>&5; then +- ac_cv_shared_link_args='ld -shared --whole-archive -soname $@ -o $@.t' +- elif (ld -shared -o conftest.so.t -all -soname conftest.so.t -none -lc -all conftest.a) 2>&5; then +- ac_cv_shared_link_args='ld -shared -o $@.t -all -soname $@ -none -lc -all' +- elif (ld -G -o conftest.so.t conftest.a) 2>&5; then +- ac_cv_shared_link_args='ld -G -o $@.t' ++ elif (${LD-ld} -shared --whole-archive -soname conftest.so -o conftest.so.t conftest.a) 2>&5; then ++ ac_cv_shared_link_args="${LD-ld}"' -shared --whole-archive -soname $@ -o $@.t' ++ elif (${LD-ld} -shared -o conftest.so.t -all -soname conftest.so.t -none -lc -all conftest.a) 2>&5; then ++ ac_cv_shared_link_args="${LD-ld}"' -shared -o $@.t -all -soname $@ -none -lc -all' ++ elif (${LD-ld} -G -o conftest.so.t conftest.a) 2>&5; then ++ ac_cv_shared_link_args="${LD-ld}"' -G -o $@.t' + else + # oh well, toss an error + ac_cv_shared_link_args='# Could not configure shlib linking' +diff --git a/configure.ac b/configure.ac +index 51bdf4d..0d80a78 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -169,12 +169,12 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([ int foo(int val) { return val + 1; } ])],[ + ac_cv_shared_link_args='# Could not configure shlib linking' + enable_shlib=no + fi +- elif (ld -shared --whole-archive -soname conftest.so -o conftest.so.t conftest.a) 2>&5; then +- ac_cv_shared_link_args='ld -shared --whole-archive -soname $@ -o $@.t' +- elif (ld -shared -o conftest.so.t -all -soname conftest.so.t -none -lc -all conftest.a) 2>&5; then +- ac_cv_shared_link_args='ld -shared -o $@.t -all -soname $@ -none -lc -all' +- elif (ld -G -o conftest.so.t conftest.a) 2>&5; then +- ac_cv_shared_link_args='ld -G -o $@.t' ++ elif (${LD-ld} -shared --whole-archive -soname conftest.so -o conftest.so.t conftest.a) 2>&5; then ++ ac_cv_shared_link_args="${LD-ld}"' -shared --whole-archive -soname $@ -o $@.t' ++ elif (${LD-ld} -shared -o conftest.so.t -all -soname conftest.so.t -none -lc -all conftest.a) 2>&5; then ++ ac_cv_shared_link_args="${LD-ld}"' -shared -o $@.t -all -soname $@ -none -lc -all' ++ elif (${LD-ld} -G -o conftest.so.t conftest.a) 2>&5; then ++ ac_cv_shared_link_args="${LD-ld}"' -G -o $@.t' + else + # oh well, toss an error + ac_cv_shared_link_args='# Could not configure shlib linking' +-- +2.25.1 + diff --git a/package/dmalloc/dmalloc.mk b/package/dmalloc/dmalloc.mk index 93dc45c15de..5bd6691725a 100644 --- a/package/dmalloc/dmalloc.mk +++ b/package/dmalloc/dmalloc.mk @@ -14,6 +14,13 @@ DMALLOC_LICENSE_FILES = LICENSE.txt DMALLOC_INSTALL_STAGING = YES DMALLOC_CFLAGS = $(TARGET_CFLAGS) +# dmalloc uses $(LD) to link, and thus misses the object files or libs that +# are needed to provide the __stack_chk_fail_local and co. symbols. Changing +# to use $(CC) is really more complex that we'd like. Since dmalloc is +# involved in debugging memory allocation, it is not expected to be a +# production library, so we do not care that much that it has SSP. +DMALLOC_CFLAGS += -fno-stack-protector + ifeq ($(BR2_STATIC_LIBS),y) DMALLOC_CONF_OPTS += --disable-shlib else @@ -44,17 +51,11 @@ ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_63261),y) DMALLOC_CFLAGS += -O0 endif -DMALLOC_CONF_ENV = CFLAGS="$(DMALLOC_CFLAGS)" - -define DMALLOC_POST_PATCH - $(SED) 's/^ac_cv_page_size=0$$/ac_cv_page_size=12/' $(@D)/configure - $(SED) 's/ac_cv_strdup_macro=no$$/ac_cv_strdup_macro=yes/' $(@D)/configure - $(SED) 's/(ld -/($${LD-ld} -/' $(@D)/configure - $(SED) 's/'\''ld -/"$${LD-ld}"'\'' -/' $(@D)/configure - $(SED) 's/ar cr/$$(AR) cr/' $(@D)/Makefile.in -endef - -DMALLOC_POST_PATCH_HOOKS += DMALLOC_POST_PATCH +DMALLOC_CONF_ENV = \ + CFLAGS="$(DMALLOC_CFLAGS)" \ + ac_cv_page_size=12 \ + ac_cv_strdup_macro=yes \ + ac_cv_strndup_macro=yes # both DESTDIR and PREFIX are ignored.. define DMALLOC_INSTALL_STAGING_CMDS diff --git a/package/dmidecode/dmidecode.hash b/package/dmidecode/dmidecode.hash index ba72295caed..654c4cc537c 100644 --- a/package/dmidecode/dmidecode.hash +++ b/package/dmidecode/dmidecode.hash @@ -1,3 +1,4 @@ -# Locally computed -sha256 82c737a780614c38a783e8055340d295e332fb12c7f418b5d21a0797d3fb1455 dmidecode-3.3.tar.xz +# Locally computed after checking pgp signature from: +# https://download.savannah.gnu.org/releases/dmidecode/dmidecode-3.5.tar.xz.sig +sha256 79d76735ee8e25196e2a722964cf9683f5a09581503537884b256b01389cc073 dmidecode-3.5.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/dmidecode/dmidecode.mk b/package/dmidecode/dmidecode.mk index 3f09cc956df..353978daa94 100644 --- a/package/dmidecode/dmidecode.mk +++ b/package/dmidecode/dmidecode.mk @@ -4,7 +4,7 @@ # ################################################################################ -DMIDECODE_VERSION = 3.3 +DMIDECODE_VERSION = 3.5 DMIDECODE_SOURCE = dmidecode-$(DMIDECODE_VERSION).tar.xz DMIDECODE_SITE = http://download.savannah.gnu.org/releases/dmidecode DMIDECODE_LICENSE = GPL-2.0+ diff --git a/package/dmraid/dmraid.hash b/package/dmraid/dmraid.hash index af84732f93c..7c1bb9a56b0 100644 --- a/package/dmraid/dmraid.hash +++ b/package/dmraid/dmraid.hash @@ -1,5 +1,5 @@ # From http://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 +md5 819338fcef98e8e25819f0516722beeb dmraid-1.0.0.rc16-3.tar.bz2 # locally computed sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 1.0.0.rc16-3/dmraid/LICENSE_GPL sha256 4bc391fcf852e03c3a7564cb146af6e47717562eed296b28bce123ee1b0396b8 1.0.0.rc16-3/dmraid/LICENSE diff --git a/package/dnsmasq/0001-set-default-maximum-dns-udp-package-size.patch b/package/dnsmasq/0001-set-default-maximum-dns-udp-package-size.patch new file mode 100644 index 00000000000..4dd17ec069b --- /dev/null +++ b/package/dnsmasq/0001-set-default-maximum-dns-udp-package-size.patch @@ -0,0 +1,64 @@ +From eb92fb32b746f2104b0f370b5b295bb8dd4bd5e5 Mon Sep 17 00:00:00 2001 +From: Simon Kelley +Date: Tue, 7 Mar 2023 22:07:46 +0000 +Subject: [PATCH] Set the default maximum DNS UDP packet size to 1232. +Upstream: https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=eb92fb32b746f2104b0f370b5b295bb8dd4bd5e5 + +http://www.dnsflagday.net/2020/ refers. + +Thanks to Xiang Li for the prompt. + +[dalang@gmx.at: backport from upstream] +Signed-off-by: Daniel Lang +--- + CHANGELOG | 9 ++++++++ + man/dnsmasq.8 | 3 ++- + src/config.h | 2 +- + 3 files changed, 12 insertions(+), 2 deletions(-) + +diff --git a/CHANGELOG b/CHANGELOG +index 3af20cf..52d8678 100644 +--- a/CHANGELOG ++++ b/CHANGELOG +@@ -1,3 +1,12 @@ version 2.90 ++version 2.90 ++ Set the default maximum DNS UDP packet sice to 1232. This ++ has been the recommended value since 2020 because it's the ++ largest value that avoid fragmentation, and fragmentation ++ is just not reliable on the modern internet, especially ++ for IPv6. It's still possible to override this with ++ --edns-packet-max for special circumstances. ++ ++ + version 2.89 + Fix bug introduced in 2.88 (commit fe91134b) which can result + in corruption of the DNS cache internal data structures and +diff --git a/man/dnsmasq.8 b/man/dnsmasq.8 +index 41e2e04..5acb935 100644 +--- a/man/dnsmasq.8 ++++ b/man/dnsmasq.8 +@@ -183,7 +183,8 @@ to zero completely disables DNS function, leaving only DHCP and/or TFTP. + .TP + .B \-P, --edns-packet-max= + Specify the largest EDNS.0 UDP packet which is supported by the DNS +-forwarder. Defaults to 4096, which is the RFC5625-recommended size. ++forwarder. Defaults to 1232, which is the recommended size following the ++DNS flag day in 2020. Only increase if you know what you are doing. + .TP + .B \-Q, --query-port= + Send outbound DNS queries from, and listen for their replies on, the +diff --git a/src/config.h b/src/config.h +index 1e7b30f..37b374e 100644 +--- a/src/config.h ++++ b/src/config.h +@@ -19,7 +19,7 @@ + #define CHILD_LIFETIME 150 /* secs 'till terminated (RFC1035 suggests > 120s) */ + #define TCP_MAX_QUERIES 100 /* Maximum number of queries per incoming TCP connection */ + #define TCP_BACKLOG 32 /* kernel backlog limit for TCP connections */ +-#define EDNS_PKTSZ 4096 /* default max EDNS.0 UDP packet from RFC5625 */ ++#define EDNS_PKTSZ 1232 /* default max EDNS.0 UDP packet from from /dnsflagday.net/2020 */ + #define SAFE_PKTSZ 1232 /* "go anywhere" UDP packet size, see https://dnsflagday.net/2020/ */ + #define KEYBLOCK_LEN 40 /* choose to minimise fragmentation when storing DNSSEC keys */ + #define DNSSEC_WORK 50 /* Max number of queries to validate one question */ +-- +2.20.1 diff --git a/package/dnsmasq/0001-src-option.c-fix-build-with-gcc-4.8.patch b/package/dnsmasq/0001-src-option.c-fix-build-with-gcc-4.8.patch deleted file mode 100644 index 50ecf2f18a6..00000000000 --- a/package/dnsmasq/0001-src-option.c-fix-build-with-gcc-4.8.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 46312909d9080ff8743133fbd52427b4b2213171 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 31 Dec 2021 17:29:44 +0100 -Subject: [PATCH] src/option.c: fix build with gcc 4.8 - -Fix the following build failure with gcc 4.8 raised since version 2.86: - -option.c: In function 'one_opt': -option.c:2445:11: error: 'for' loop initial declarations are only allowed in C99 mode - for (char *p = arg; *p; p++) { - ^ -option.c:2445:11: note: use option -std=c99 or -std=gnu99 to compile your code -option.c:2453:11: error: 'for' loop initial declarations are only allowed in C99 mode - for (u8 i = 0; i < sizeof(daemon->umbrella_device); i++, arg+=2) { - ^ - -Fixes: - - http://autobuild.buildroot.org/results/39b34a4e69fc10f4bd9d4ddb0ed8c0aae5741c84 - -Signed-off-by: Fabrice Fontaine -[Upstream commit 46312909d9080ff8743133fbd52427b4b2213171] ---- - src/option.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/option.c b/src/option.c -index ff54def..c57f6d8 100644 ---- a/src/option.c -+++ b/src/option.c -@@ -2525,7 +2525,8 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma - arg += 9; - if (strlen(arg) != 16) - ret_err(gen_err); -- for (char *p = arg; *p; p++) { -+ char *p; -+ for (*p = arg; *p; p++) { - if (!isxdigit((int)*p)) - ret_err(gen_err); - } -@@ -2533,7 +2534,8 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma - - u8 *u = daemon->umbrella_device; - char word[3]; -- for (u8 i = 0; i < sizeof(daemon->umbrella_device); i++, arg+=2) { -+ u8 i; -+ for (i = 0; i < sizeof(daemon->umbrella_device); i++, arg+=2) { - memcpy(word, &(arg[0]), 2); - *u++ = strtoul(word, NULL, 16); - } --- -2.33.0 - diff --git a/package/dnsmasq/0002-Fix-46312909d9080ff8743133fbd52427b4b2213171-typo.patch b/package/dnsmasq/0002-Fix-46312909d9080ff8743133fbd52427b4b2213171-typo.patch deleted file mode 100644 index 8cdf5b3f1b7..00000000000 --- a/package/dnsmasq/0002-Fix-46312909d9080ff8743133fbd52427b4b2213171-typo.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 2748fb81e23b71e2c44956e99321816aca91905d Mon Sep 17 00:00:00 2001 -From: Simon Kelley -Date: Sat, 1 Jan 2022 23:03:26 +0000 -Subject: [PATCH] Fix 46312909d9080ff8743133fbd52427b4b2213171 typo. - -[Upstream commit 2748fb81e23b71e2c44956e99321816aca91905d] -Signed-off-by: Fabrice Fontaine ---- - src/option.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/option.c b/src/option.c -index c57f6d8..6f56ce8 100644 ---- a/src/option.c -+++ b/src/option.c -@@ -357,7 +357,7 @@ static const struct myoption opts[] = - { "dhcp-ignore-clid", 0, 0, LOPT_IGNORE_CLID }, - { "dynamic-host", 1, 0, LOPT_DYNHOST }, - { "log-debug", 0, 0, LOPT_LOG_DEBUG }, -- { "umbrella", 2, 0, LOPT_UMBRELLA }, -+ { "umbrella", 2, 0, LOPT_UMBRELLA }, - { "quiet-tftp", 0, 0, LOPT_QUIET_TFTP }, - { NULL, 0, 0, 0 } - }; -@@ -2526,7 +2526,7 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma - if (strlen(arg) != 16) - ret_err(gen_err); - char *p; -- for (*p = arg; *p; p++) { -+ for (p = arg; *p; p++) { - if (!isxdigit((int)*p)) - ret_err(gen_err); - } --- -2.33.0 - diff --git a/package/dnsmasq/0003-Fix-FTBFS-when-CONNTRACK-and-UBUS-but-not-DNSSEC-compile-options-selected.patch b/package/dnsmasq/0003-Fix-FTBFS-when-CONNTRACK-and-UBUS-but-not-DNSSEC-compile-options-selected.patch deleted file mode 100644 index 9c98af2be53..00000000000 --- a/package/dnsmasq/0003-Fix-FTBFS-when-CONNTRACK-and-UBUS-but-not-DNSSEC-compile-options-selected.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 2c60441239e1c10c4987cb586653b1ea08f703c0 Mon Sep 17 00:00:00 2001 -From: Simon Kelley -Date: Tue, 28 Sep 2021 23:42:15 +0100 -Subject: [PATCH] Fix FTBFS when CONNTRACK and UBUS but not DNSSEC compile - options selected. - -[Retrieved from: -https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=2c60441239e1c10c4987cb586653b1ea08f703c0] -Signed-off-by: Fabrice Fontaine ---- - src/dnsmasq.h | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/dnsmasq.h b/src/dnsmasq.h -index c8a918a..3fdc1b0 100644 ---- a/src/dnsmasq.h -+++ b/src/dnsmasq.h -@@ -1173,9 +1173,12 @@ extern struct daemon { - char *packet; /* packet buffer */ - int packet_buff_sz; /* size of above */ - char *namebuff; /* MAXDNAME size buffer */ -+#if (defined(HAVE_CONNTRACK) && defined(HAVE_UBUS)) || defined(HAVE_DNSSEC) -+ /* CONNTRACK UBUS code uses this buffer, as well as DNSSEC code. */ -+ char *workspacename; -+#endif - #ifdef HAVE_DNSSEC - char *keyname; /* MAXDNAME size buffer */ -- char *workspacename; /* ditto */ - unsigned long *rr_status; /* ceiling in TTL from DNSSEC or zero for insecure */ - int rr_status_sz; - int dnssec_no_time_check; --- -2.20.1 - diff --git a/package/dnsmasq/0004-src-pattern.c-fix-build-with-gcc-4.8.patch b/package/dnsmasq/0004-src-pattern.c-fix-build-with-gcc-4.8.patch deleted file mode 100644 index 90bb02b23a3..00000000000 --- a/package/dnsmasq/0004-src-pattern.c-fix-build-with-gcc-4.8.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 0c89dd2fa0fe50b00bca638dbbacfbd361526e0a Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 2 Jan 2022 21:57:52 +0100 -Subject: [PATCH] src/pattern.c: fix build with gcc 4.8 - -Fix the following build failure: - -pattern.c: In function 'is_valid_dns_name': -pattern.c:134:3: error: 'for' loop initial declarations are only allowed in C99 mode - for (const char *c = value;; c++) - ^ -pattern.c:134:3: note: use option -std=c99 or -std=gnu99 to compile your code -pattern.c: In function 'is_valid_dns_name_pattern': -pattern.c:249:3: error: 'for' loop initial declarations are only allowed in C99 mode - for (const char *c = value;; c++) - ^ - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=b2690415bfa1bc105e61b75f642fb5c1aaf0fae8] ---- - src/pattern.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/pattern.c b/src/pattern.c -index 03e23b9..928d259 100644 ---- a/src/pattern.c -+++ b/src/pattern.c -@@ -129,9 +129,9 @@ int is_valid_dns_name(const char *value) - - size_t num_bytes = 0; - size_t num_labels = 0; -- const char *label = NULL; -+ const char *c, *label = NULL; - int is_label_numeric = 1; -- for (const char *c = value;; c++) -+ for (c = value;; c++) - { - if (*c && - *c != '-' && *c != '.' && -@@ -242,11 +242,11 @@ int is_valid_dns_name_pattern(const char *value) - - size_t num_bytes = 0; - size_t num_labels = 0; -- const char *label = NULL; -+ const char *c, *label = NULL; - int is_label_numeric = 1; - size_t num_wildcards = 0; - int previous_label_has_wildcard = 1; -- for (const char *c = value;; c++) -+ for (c = value;; c++) - { - if (*c && - *c != '*' && /* Wildcard. */ --- -2.20.1 - diff --git a/package/dnsmasq/dnsmasq.hash b/package/dnsmasq/dnsmasq.hash index 804012821e0..02ffb2656bf 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.86.tar.xz.asc -sha256 28d52cfc9e2004ac4f85274f52b32e1647b4dbc9761b82e7de1e41c49907eb08 dnsmasq-2.86.tar.xz +# https://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.89.tar.xz.asc +sha256 02bd230346cf0b9d5909f5e151df168b2707103785eb616b56685855adebb609 dnsmasq-2.89.tar.xz # Locally calculated -sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING-v3 diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk index 0569475fc4b..9c05857f224 100644 --- a/package/dnsmasq/dnsmasq.mk +++ b/package/dnsmasq/dnsmasq.mk @@ -4,7 +4,7 @@ # ################################################################################ -DNSMASQ_VERSION = 2.86 +DNSMASQ_VERSION = 2.89 DNSMASQ_SOURCE = dnsmasq-$(DNSMASQ_VERSION).tar.xz DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)" @@ -17,6 +17,9 @@ 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) @@ -26,9 +29,6 @@ endif ifeq ($(BR2_PACKAGE_DNSMASQ_DNSSEC),y) DNSMASQ_DEPENDENCIES += gmp nettle DNSMASQ_COPTS += -DHAVE_DNSSEC -ifeq ($(BR2_STATIC_LIBS),y) -DNSMASQ_COPTS += -DHAVE_DNSSEC_STATIC -endif endif ifneq ($(BR2_PACKAGE_DNSMASQ_TFTP),y) diff --git a/package/docker-cli/docker-cli.hash b/package/docker-cli/docker-cli.hash index f2fe316540f..e9e9a18cb1c 100644 --- a/package/docker-cli/docker-cli.hash +++ b/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d86e3e6e10669634ee02b5e071e5ee504457a9d03941bbc5b7f2bd3683ebdb19 docker-cli-20.10.12.tar.gz +sha256 2d6599783d447ac56d4caa482e9d8f09ad9e6f91ba2be6707bc107be04f89ddd docker-cli-23.0.5.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk index d5cca34efca..522971ac987 100644 --- a/package/docker-cli/docker-cli.mk +++ b/package/docker-cli/docker-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = 20.10.12 +DOCKER_CLI_VERSION = 23.0.5 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) DOCKER_CLI_LICENSE = Apache-2.0 @@ -29,6 +29,15 @@ DOCKER_CLI_TAGS += osusergo netgo DOCKER_CLI_GO_ENV = CGO_ENABLED=no endif +# create the go.mod file with language version go1.19 +# remove the conflicting vendor/modules.txt +# https://github.com/moby/moby/issues/44618#issuecomment-1343565705 +define DOCKER_CLI_FIX_VENDORING + printf "module $(DOCKER_CLI_GOMOD)\n\ngo 1.19\n" > $(@D)/go.mod + rm -f $(@D)/vendor/modules.txt +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/0001-Strip-up-generic-versions-and-bump-requests.patch b/package/docker-compose/0001-Strip-up-generic-versions-and-bump-requests.patch deleted file mode 100644 index 536a9590dd0..00000000000 --- a/package/docker-compose/0001-Strip-up-generic-versions-and-bump-requests.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 2bb1a267aba3ca5fe414d0f79192def668c18bab Mon Sep 17 00:00:00 2001 -From: Ulysses Souza -Date: Tue, 2 Jul 2019 15:49:07 +0200 -Subject: [PATCH] Strip up generic versions and bump requests - -Replaces generic limitations with a next major value -Bump the minimal `requests` to 2.20.0 - -Signed-off-by: Ulysses Souza -(cherry picked from commit ce5451c5b4a3b449ce703168d2a568b0a4d25ee6) -Signed-off-by: Peter Korsgaard ---- - setup.py | 24 ++++++++++++------------ - 1 file changed, 12 insertions(+), 12 deletions(-) - -diff --git a/setup.py b/setup.py -index 8371cc75..61447801 100644 ---- a/setup.py -+++ b/setup.py -@@ -31,31 +31,31 @@ def find_version(*file_paths): - - install_requires = [ - 'cached-property >= 1.2.0, < 2', -- 'docopt >= 0.6.1, < 0.7', -- 'PyYAML >= 3.10, < 4.3', -- 'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0, < 2.21', -- 'texttable >= 0.9.0, < 0.10', -- 'websocket-client >= 0.32.0, < 1.0', -- 'docker[ssh] >= 3.7.0, < 4.0', -- 'dockerpty >= 0.4.1, < 0.5', -+ 'docopt >= 0.6.1, < 1', -+ 'PyYAML >= 3.10, < 5', -+ 'requests >= 2.20.0, < 3', -+ 'texttable >= 0.9.0, < 1', -+ 'websocket-client >= 0.32.0, < 1', -+ 'docker[ssh] >= 3.7.0, < 5', -+ 'dockerpty >= 0.4.1, < 1', - 'six >= 1.3.0, < 2', - 'jsonschema >= 2.5.1, < 3', - ] - - - tests_require = [ -- 'pytest', -+ 'pytest < 6', - ] - - - if sys.version_info[:2] < (3, 4): -- tests_require.append('mock >= 1.0.1') -+ tests_require.append('mock >= 1.0.1, < 2') - - extras_require = { - ':python_version < "3.4"': ['enum34 >= 1.0.4, < 2'], -- ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'], -- ':python_version < "3.3"': ['ipaddress >= 1.0.16'], -- ':sys_platform == "win32"': ['colorama >= 0.4, < 0.5'], -+ ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5, < 4'], -+ ':python_version < "3.3"': ['ipaddress >= 1.0.16, < 2'], -+ ':sys_platform == "win32"': ['colorama >= 0.4, < 1'], - 'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'], - } - --- -2.20.1 - diff --git a/package/docker-compose/0002-Bump-texttable-from-0.9.1-to-1.6.2.patch b/package/docker-compose/0002-Bump-texttable-from-0.9.1-to-1.6.2.patch deleted file mode 100644 index 92c2e1f133c..00000000000 --- a/package/docker-compose/0002-Bump-texttable-from-0.9.1-to-1.6.2.patch +++ /dev/null @@ -1,41 +0,0 @@ -From e55dd65ba42a17ba4b017b42f14f7ee647efe64f Mon Sep 17 00:00:00 2001 -From: Ulysses Souza -Date: Mon, 8 Jul 2019 14:52:30 +0200 -Subject: [PATCH] Bump texttable from 0.9.1 to 1.6.2 - -Signed-off-by: Ulysses Souza -(cherry picked from commit 0bfa1c34f054d86674434770d4d6340e02508e52) -Signed-off-by: Peter Korsgaard ---- - requirements.txt | 2 +- - setup.py | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/requirements.txt b/requirements.txt -index 6007ee3f..d868fdeb 100644 ---- a/requirements.txt -+++ b/requirements.txt -@@ -19,6 +19,6 @@ PySocks==1.6.7 - PyYAML==4.2b1 - requests==2.20.0 - six==1.10.0 --texttable==0.9.1 -+texttable==1.6.2 - urllib3==1.21.1; python_version == '3.3' - websocket-client==0.56.0 -diff --git a/setup.py b/setup.py -index 61447801..c9e4729d 100644 ---- a/setup.py -+++ b/setup.py -@@ -34,7 +34,7 @@ install_requires = [ - 'docopt >= 0.6.1, < 1', - 'PyYAML >= 3.10, < 5', - 'requests >= 2.20.0, < 3', -- 'texttable >= 0.9.0, < 1', -+ 'texttable >= 0.9.0, < 2', - 'websocket-client >= 0.32.0, < 1', - 'docker[ssh] >= 3.7.0, < 5', - 'dockerpty >= 0.4.1, < 1', --- -2.20.1 - diff --git a/package/docker-compose/0003-support-PyYAML-up-to-5.1-version.patch b/package/docker-compose/0003-support-PyYAML-up-to-5.1-version.patch deleted file mode 100644 index ecbd197a512..00000000000 --- a/package/docker-compose/0003-support-PyYAML-up-to-5.1-version.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 3be619b814c16c02a02499e7a157dabd065926dd Mon Sep 17 00:00:00 2001 -From: Sergey Fursov -Date: Sun, 31 Mar 2019 12:45:50 +0700 -Subject: [PATCH] support PyYAML up to 5.1 version - -Signed-off-by: Sergey Fursov -[Upstream: https://github.com/docker/compose/pull/6623] -(cherry picked from commit d2ca096f46a56cd4db494c593ed84e5c255dc15d) -[Peter: allow all 5.x] -Signed-off-by: Peter Korsgaard ---- - requirements.txt | 2 +- - setup.py | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/requirements.txt b/requirements.txt -index d868fdeb..e3dbc807 100644 ---- a/requirements.txt -+++ b/requirements.txt -@@ -16,7 +16,7 @@ paramiko==2.4.2 - pypiwin32==219; sys_platform == 'win32' and python_version < '3.6' - pypiwin32==223; sys_platform == 'win32' and python_version >= '3.6' - PySocks==1.6.7 --PyYAML==4.2b1 -+PyYAML==5.1 - requests==2.20.0 - six==1.10.0 - texttable==1.6.2 -diff --git a/setup.py b/setup.py -index c9e4729d..17ab678e 100644 ---- a/setup.py -+++ b/setup.py -@@ -32,7 +32,7 @@ def find_version(*file_paths): - install_requires = [ - 'cached-property >= 1.2.0, < 2', - 'docopt >= 0.6.1, < 1', -- 'PyYAML >= 3.10, < 5', -+ 'PyYAML >= 3.10, < 6', - 'requests >= 2.20.0, < 3', - 'texttable >= 0.9.0, < 2', - 'websocket-client >= 0.32.0, < 1', --- -2.20.1 - diff --git a/package/docker-compose/Config.in b/package/docker-compose/Config.in index f82a0c4bc2a..59128f7a199 100644 --- a/package/docker-compose/Config.in +++ b/package/docker-compose/Config.in @@ -1,30 +1,15 @@ config BR2_PACKAGE_DOCKER_COMPOSE bool "docker-compose" - depends on BR2_USE_MMU # python3 - depends on BR2_USE_WCHAR # python3 - depends on BR2_TOOLCHAIN_HAS_THREADS # python3 - depends on !BR2_STATIC_LIBS # python3 - # python-paramiko -> python-cryptography - depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS - select BR2_PACKAGE_PYTHON3 - select BR2_PACKAGE_PYTHON_CACHED_PROPERTY # runtime - select BR2_PACKAGE_PYTHON_DOCOPT # runtime - select BR2_PACKAGE_PYTHON_PARAMIKO # runtime - select BR2_PACKAGE_PYTHON_PYYAML # runtime - select BR2_PACKAGE_PYTHON_REQUESTS # runtime - select BR2_PACKAGE_PYTHON_TEXTTABLE # runtime - select BR2_PACKAGE_PYTHON_WEBSOCKET_CLIENT # runtime - select BR2_PACKAGE_PYTHON_DOCKER # runtime - select BR2_PACKAGE_PYTHON_DOCKERPTY # runtime - select BR2_PACKAGE_PYTHON_SIX # runtime - select BR2_PACKAGE_PYTHON_JSONSCHEMA # runtime + 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_PACKAGE_DOCKER_CLI help - Multi-container orchestration for Docker. + Multi-container applications with the Docker CLI. - https://www.docker.com/ + https://github.com/docker/compose -comment "docker-compose needs a toolchain w/ wchar, threads, dynamic library" - depends on BR2_USE_MMU - depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS +comment "docker-compose needs docker-cli and a toolchain w/ threads" + 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 || !BR2_PACKAGE_DOCKER_CLI diff --git a/package/docker-compose/docker-compose.hash b/package/docker-compose/docker-compose.hash index aa29a6d6cb0..2c924d5080a 100644 --- a/package/docker-compose/docker-compose.hash +++ b/package/docker-compose/docker-compose.hash @@ -1,5 +1,3 @@ -# from https://pypi.python.org/pypi/docker-compose/json -sha256 a5d58e974fd717e24b0dda6669a46bc03548d9023ef38d965acdc32d4d5fa753 docker-compose-1.24.1.tar.gz - -# locally computed -sha256 552a739c3b25792263f731542238b92f6f8d07e9a488eae27e6c4690038a8243 LICENSE +# Locally computed +sha256 346571ca487bf3f4b3dc9caeadc88a645354b0e098fa60f350249ec35ab3f240 docker-compose-2.15.1.tar.gz +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd LICENSE diff --git a/package/docker-compose/docker-compose.mk b/package/docker-compose/docker-compose.mk index ec24157c568..3bced8bb7b3 100644 --- a/package/docker-compose/docker-compose.mk +++ b/package/docker-compose/docker-compose.mk @@ -4,10 +4,19 @@ # ################################################################################ -DOCKER_COMPOSE_VERSION = 1.24.1 -DOCKER_COMPOSE_SITE = https://files.pythonhosted.org/packages/b6/a4/59c39df6a23144a6252ad33170dfbf781af5953651e4587e8ea5f995f95e -DOCKER_COMPOSE_SETUP_TYPE = setuptools +DOCKER_COMPOSE_VERSION = 2.15.1 +DOCKER_COMPOSE_SITE = $(call github,docker,compose,v$(DOCKER_COMPOSE_VERSION)) DOCKER_COMPOSE_LICENSE = Apache-2.0 DOCKER_COMPOSE_LICENSE_FILES = LICENSE -$(eval $(python-package)) +DOCKER_COMPOSE_BUILD_TARGETS = cmd +DOCKER_COMPOSE_GOMOD = github.com/docker/compose/v2 +DOCKER_COMPOSE_LDFLAGS = \ + -X github.com/docker/compose/v2/internal.Version=$(DOCKER_COMPOSE_VERSION) + +define DOCKER_COMPOSE_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 755 $(@D)/bin/cmd \ + $(TARGET_DIR)/usr/lib/docker/cli-plugins/docker-compose +endef + +$(eval $(golang-package)) diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in index 1f0efb8fcc0..570b2ff6816 100644 --- a/package/docker-engine/Config.in +++ b/package/docker-engine/Config.in @@ -5,10 +5,12 @@ config BR2_PACKAGE_DOCKER_ENGINE depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_TOOLCHAIN_USES_UCLIBC # containerd -> runc depends on BR2_USE_MMU # containerd + 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_CONTAINERD # runtime dependency - select BR2_PACKAGE_DOCKER_PROXY # runtime dependency select BR2_PACKAGE_IPTABLES # runtime dependency + select BR2_PACKAGE_LIBSECCOMP help Docker is a platform to build, ship, and run applications as lightweight containers. @@ -49,8 +51,11 @@ config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_VFS endif -comment "docker-engine needs a glibc or musl toolchain w/ threads" +comment "docker-engine needs a glibc or musl toolchain w/ threads, headers >= 3.17" 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 || BR2_TOOLCHAIN_USES_UCLIBC + depends on BR2_PACKAGE_LIBSECCOMP_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_TOOLCHAIN_USES_UCLIBC || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 depends on BR2_USE_MMU diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index ec3a2426291..092ec989cf5 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a8ee80d31c7b74f687a837cd2a8570578f118179fba0844c5ee88f90fe180155 docker-engine-20.10.12.tar.gz +sha256 f502eba135828ae52cefb12f1c74092c8865e39cb94f5daed0f3f6717a8d50a3 docker-engine-23.0.5.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 2a1239b6769..f904793aa2f 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,13 +4,13 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 20.10.12 +DOCKER_ENGINE_VERSION = 23.0.5 DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 DOCKER_ENGINE_LICENSE_FILES = LICENSE -DOCKER_ENGINE_DEPENDENCIES = host-pkgconf +DOCKER_ENGINE_DEPENDENCIES = host-pkgconf libseccomp DOCKER_ENGINE_GOMOD = github.com/docker/docker DOCKER_ENGINE_CPE_ID_VENDOR = docker @@ -24,16 +24,10 @@ DOCKER_ENGINE_LDFLAGS = \ -X $(DOCKER_ENGINE_GOMOD)/dockerversion.Version="$(DOCKER_ENGINE_VERSION)" DOCKER_ENGINE_TAGS = cgo exclude_graphdriver_zfs -DOCKER_ENGINE_BUILD_TARGETS = cmd/dockerd +DOCKER_ENGINE_BUILD_TARGETS = cmd/dockerd cmd/docker-proxy ifeq ($(BR2_PACKAGE_LIBAPPARMOR),y) DOCKER_ENGINE_DEPENDENCIES += libapparmor -DOCKER_ENGINE_TAGS += apparmor -endif - -ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) -DOCKER_ENGINE_TAGS += seccomp -DOCKER_ENGINE_DEPENDENCIES += libseccomp endif ifeq ($(BR2_INIT_SYSTEMD),y) @@ -62,6 +56,15 @@ else DOCKER_ENGINE_TAGS += exclude_graphdriver_vfs endif +# create the go.mod file with language version go1.19 +# remove the conflicting vendor/modules.txt +# https://github.com/moby/moby/issues/44618#issuecomment-1343565705 +define DOCKER_ENGINE_FIX_VENDORING + printf "module $(DOCKER_ENGINE_GOMOD)\n\ngo 1.19\n" > $(@D)/go.mod + rm -f $(@D)/vendor/modules.txt +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 @@ -124,10 +127,6 @@ define DOCKER_ENGINE_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_TARGET_MASQUERADE) $(call KCONFIG_ENABLE_OPT,CONFIG_BRIDGE) $(call KCONFIG_ENABLE_OPT,CONFIG_NET_CORE) - $(call KCONFIG_ENABLE_OPT,CONFIG_DUMMY) - $(call KCONFIG_ENABLE_OPT,CONFIG_MACVLAN) - $(call KCONFIG_ENABLE_OPT,CONFIG_IPVLAN) - $(call KCONFIG_ENABLE_OPT,CONFIG_VXLAN) $(call KCONFIG_ENABLE_OPT,CONFIG_VETH) $(call KCONFIG_ENABLE_OPT,CONFIG_OVERLAY_FS) $(call KCONFIG_ENABLE_OPT,CONFIG_KEYS) diff --git a/package/docker-proxy/Config.in b/package/docker-proxy/Config.in deleted file mode 100644 index 7e405365375..00000000000 --- a/package/docker-proxy/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config BR2_PACKAGE_DOCKER_PROXY - bool "docker-proxy" - 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 - help - Libnetwork is a Container Network Model that provides a - consistent programming interface and the required network - abstractions for applications. - - This package provides docker-proxy, a run-time dependency of - Docker. - - https://github.com/docker/libnetwork - -comment "docker-proxy needs a toolchain w/ threads" - 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 diff --git a/package/docker-proxy/docker-proxy.hash b/package/docker-proxy/docker-proxy.hash deleted file mode 100644 index 58de697929b..00000000000 --- a/package/docker-proxy/docker-proxy.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 866c8d196b9396a383b437b0d775476459ed7c11f527c4f6bbf1fd08524b461d docker-proxy-55685ba49593e67f5e1c8180539379b16736c25e.tar.gz -sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSE diff --git a/package/docker-proxy/docker-proxy.mk b/package/docker-proxy/docker-proxy.mk deleted file mode 100644 index 6600b24ed9e..00000000000 --- a/package/docker-proxy/docker-proxy.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# docker-proxy -# -################################################################################ - -DOCKER_PROXY_VERSION = 55685ba49593e67f5e1c8180539379b16736c25e -DOCKER_PROXY_SITE = $(call github,docker,libnetwork,$(DOCKER_PROXY_VERSION)) - -DOCKER_PROXY_LICENSE = Apache-2.0 -DOCKER_PROXY_LICENSE_FILES = LICENSE - -DOCKER_PROXY_DEPENDENCIES = host-pkgconf - -DOCKER_PROXY_BUILD_TARGETS = cmd/proxy - -define DOCKER_PROXY_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/bin/proxy $(TARGET_DIR)/usr/bin/docker-proxy -endef - -$(eval $(golang-package)) diff --git a/package/docopt-cpp/0001-only-build-one-target-use-BUILD_SHARED_LIBS-where-appropriate.patch b/package/docopt-cpp/0001-only-build-one-target-use-BUILD_SHARED_LIBS-where-appropriate.patch new file mode 100644 index 00000000000..77206d52082 --- /dev/null +++ b/package/docopt-cpp/0001-only-build-one-target-use-BUILD_SHARED_LIBS-where-appropriate.patch @@ -0,0 +1,87 @@ +From 6d3b803d2b0e4bf8703bbfa51a67f378d6bd59f6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Th=C3=A9o=20DELRIEU?= +Date: Tue, 19 Nov 2019 14:58:59 +0100 +Subject: [PATCH] only build one target, use BUILD_SHARED_LIBS where + appropriate + +[Retrieved from: +https://github.com/docopt/docopt.cpp/commit/6d3b803d2b0e4bf8703bbfa51a67f378d6bd59f6] +Signed-off-by: Fabrice Fontaine +--- + CMakeLists.txt | 39 ++++++--------------------------------- + 1 file changed, 6 insertions(+), 33 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index feff32e..14c3420 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -34,33 +34,15 @@ set(docopt_HEADERS + #============================================================================ + # Compile targets + #============================================================================ +-if(MSVC OR XCODE) +- # MSVC requires __declspec() attributes, which are achieved via the +- # DOCOPT_DLL and DOCOPT_EXPORTS macros below. Since those macros are only +- # defined when building a shared library, we must build the shared and +- # static libraries completely separately. +- # Xcode does not support libraries with only object files as sources. +- # See https://cmake.org/cmake/help/v3.0/command/add_library.html?highlight=add_library +- add_library(docopt SHARED ${docopt_SOURCES} ${docopt_HEADERS}) +- add_library(docopt_s STATIC ${docopt_SOURCES} ${docopt_HEADERS}) +-else() +- # If not using MSVC or Xcode, we will create an intermediate object target +- # to avoid compiling the source code twice. +- add_library(docopt_o OBJECT ${docopt_SOURCES} ${docopt_HEADERS}) +- set_target_properties(docopt_o PROPERTIES POSITION_INDEPENDENT_CODE TRUE) +- +- add_library(docopt SHARED $) +- set_target_properties(docopt PROPERTIES +- VERSION ${PROJECT_VERSION} +- SOVERSION ${PROJECT_VERSION_MAJOR} +- ) +- add_library(docopt_s STATIC $) +-endif() ++add_library(docopt ${docopt_SOURCES} ${docopt_HEADERS}) ++set_target_properties(docopt PROPERTIES ++ VERSION ${PROJECT_VERSION} ++ SOVERSION ${PROJECT_VERSION_MAJOR} ++) + + target_include_directories(docopt PUBLIC $ $) +-target_include_directories(docopt_s PUBLIC $ $) + +-if(MSVC) ++if(MSVC AND BUILD_SHARED_LIBS) + # DOCOPT_DLL: Must be specified when building *and* when using the DLL. + # That's what the "PUBLIC" means. + # DOCOPT_EXPORTS: Must use __declspec(dllexport) when building the DLL. +@@ -69,11 +51,6 @@ if(MSVC) + PRIVATE DOCOPT_EXPORTS) + endif() + +-if(NOT MSVC) +- set_target_properties(docopt PROPERTIES OUTPUT_NAME docopt) +- set_target_properties(docopt_s PROPERTIES OUTPUT_NAME docopt) +-endif() +- + if(USE_BOOST_REGEX) + add_definitions("-DDOCTOPT_USE_BOOST_REGEX") + # This is needed on Linux, where linking a static library into docopt.so +@@ -82,9 +59,6 @@ if(USE_BOOST_REGEX) + find_package(Boost 1.53 REQUIRED COMPONENTS regex) + include_directories(${Boost_INCLUDE_DIRS}) + target_link_libraries(docopt ${Boost_LIBRARIES}) +- if(WITH_STATIC) +- target_link_libraries(docopt_s ${Boost_LIBRARIES}) +- endif() + endif() + + #============================================================================ +@@ -120,7 +94,6 @@ set(export_name "docopt-targets") + install(TARGETS docopt EXPORT ${export_name} DESTINATION ${CMAKE_INSTALL_LIBDIR}) + + # Development package +-install(TARGETS docopt_s EXPORT ${export_name} DESTINATION ${CMAKE_INSTALL_LIBDIR}) + install(FILES ${docopt_HEADERS} DESTINATION include/docopt) + + # CMake Package diff --git a/package/docopt-cpp/Config.in b/package/docopt-cpp/Config.in new file mode 100644 index 00000000000..ac85442732b --- /dev/null +++ b/package/docopt-cpp/Config.in @@ -0,0 +1,21 @@ +config BR2_PACKAGE_DOCOPT_CPP + bool "docopt-cpp" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11 + help + docopt is a library that lets you define a command line + interface with the utility argument syntax that has been + used by command line utilities for decades (POSIX.1-2017). + From the description, docopt automatically generates a parser + for the command line arguments. + + docopt Command-line interface description language + http://docopt.org/ + + docopt.cpp is a C++ port of docopt. + + https://github.com/docopt/docopt.cpp + +comment "docopt-cpp needs a toolchain w/ C++, gcc >= 4.7" + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 diff --git a/package/docopt-cpp/docopt-cpp.hash b/package/docopt-cpp/docopt-cpp.hash new file mode 100644 index 00000000000..c5359147535 --- /dev/null +++ b/package/docopt-cpp/docopt-cpp.hash @@ -0,0 +1,6 @@ +# Locally computed: +sha256 28af5a0c482c6d508d22b14d588a3b0bd9ff97135f99c2814a5aa3cbff1d6632 docopt-cpp-0.6.3.tar.gz + +# Hash for license files: +sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE-Boost-1.0 +sha256 b2959a980bc25f5d5e020d7a31777b7184aace6eb160acc80619f85edf646f19 LICENSE-MIT diff --git a/package/docopt-cpp/docopt-cpp.mk b/package/docopt-cpp/docopt-cpp.mk new file mode 100644 index 00000000000..897b9078220 --- /dev/null +++ b/package/docopt-cpp/docopt-cpp.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# docopt-cpp +# +################################################################################ + +DOCOPT_CPP_VERSION = 0.6.3 +DOCOPT_CPP_SITE = $(call github,docopt,docopt.cpp,v$(DOCOPT_CPP_VERSION)) +DOCOPT_CPP_INSTALL_STAGING = YES +DOCOPT_CPP_LICENSE = BSL-1.0 or MIT +DOCOPT_CPP_LICENSE_FILES = LICENSE-Boost-1.0 LICENSE-MIT + +$(eval $(cmake-package)) diff --git a/package/domoticz/0001-hardware-EnOceanRawValue.h-include-stdarg.h.patch b/package/domoticz/0001-hardware-EnOceanRawValue.h-include-stdarg.h.patch new file mode 100644 index 00000000000..bc3e60023d5 --- /dev/null +++ b/package/domoticz/0001-hardware-EnOceanRawValue.h-include-stdarg.h.patch @@ -0,0 +1,33 @@ +From 6296d7112089a0f3bfb3056f6d9637e13ce4ce83 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 18 Dec 2022 12:27:38 +0100 +Subject: [PATCH] hardware/EnOceanRawValue.h: include stdarg.h + +Include stdarg.h to avoid the following build failure on uclibc: + +In file included from /home/fabrice/buildroot/output/build/domoticz-2022.2/hardware/EnOceanRawValue.cpp:2: +/home/fabrice/buildroot/output/build/domoticz-2022.2/hardware/EnOceanRawValue.h:109:83: error: 'va_list' has not been declared + 109 | uint32_t SetRawValuesNb(uint8_t * data, T_DATAFIELD * OffsetDes, int NbParameter, va_list value); + | ^~~~~~~ + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/domoticz/domoticz/pull/5472] +--- + hardware/EnOceanRawValue.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/hardware/EnOceanRawValue.h b/hardware/EnOceanRawValue.h +index 84f38d17a..df858f27d 100644 +--- a/hardware/EnOceanRawValue.h ++++ b/hardware/EnOceanRawValue.h +@@ -1,6 +1,7 @@ + #ifndef _SetGetRawValue + #define _SetGetRawValue + ++#include + #include + #include + #include +-- +2.35.1 + diff --git a/package/domoticz/Config.in b/package/domoticz/Config.in index 4324d13cee2..85361eecf0a 100644 --- a/package/domoticz/Config.in +++ b/package/domoticz/Config.in @@ -19,6 +19,7 @@ config BR2_PACKAGE_DOMOTICZ select BR2_PACKAGE_FMT select BR2_PACKAGE_JSONCPP select BR2_PACKAGE_LIBCURL + select BR2_PACKAGE_MINIZIP_ZLIB select BR2_PACKAGE_MOSQUITTO select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_SQLITE diff --git a/package/domoticz/domoticz.hash b/package/domoticz/domoticz.hash index 18bf57b7e0e..c4392388001 100644 --- a/package/domoticz/domoticz.hash +++ b/package/domoticz/domoticz.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 b7faf959c4f1dbfec3b0c17ab495f29b3d1437bc2251579c5252be82247e7ff9 domoticz-2022.1-br1.tar.gz +sha256 8f84098bb64bec12ff7aac5f1fb6b6230a88c5781c2b75bc89861caea73cbccf domoticz-2022.2.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 License.txt diff --git a/package/domoticz/domoticz.mk b/package/domoticz/domoticz.mk index 5edc10e8d8b..451021150b1 100644 --- a/package/domoticz/domoticz.mk +++ b/package/domoticz/domoticz.mk @@ -4,10 +4,8 @@ # ################################################################################ -DOMOTICZ_VERSION = 2022.1 -DOMOTICZ_SITE = https://github.com/domoticz/domoticz -DOMOTICZ_SITE_METHOD = git -DOMOTICZ_GIT_SUBMODULES = YES +DOMOTICZ_VERSION = 2022.2 +DOMOTICZ_SITE = $(call github,domoticz,domoticz,$(DOMOTICZ_VERSION)) DOMOTICZ_LICENSE = GPL-3.0 DOMOTICZ_LICENSE_FILES = License.txt DOMOTICZ_CPE_ID_VENDOR = domoticz @@ -19,6 +17,7 @@ DOMOTICZ_DEPENDENCIES = \ jsoncpp \ libcurl \ lua \ + minizip-zlib \ mosquitto \ openssl \ sqlite \ @@ -34,10 +33,11 @@ DOMOTICZ_CONF_OPTS += \ -DUSE_OPENSSL_STATIC=OFF # Do not use any built-in libraries which are enabled by default for -# jsoncpp, fmt, sqlite and mqtt +# jsoncpp, fmt, minizip, sqlite and mqtt DOMOTICZ_CONF_OPTS += \ -DUSE_BUILTIN_JSONCPP=OFF \ -DUSE_BUILTIN_LIBFMT=OFF \ + -DUSE_BUILTIN_MINIZIP=OFF \ -DUSE_BUILTIN_SQLITE=OFF \ -DUSE_BUILTIN_MQTT=OFF diff --git a/package/doom-wad/doom-wad.hash b/package/doom-wad/doom-wad.hash index fa069c1b772..80136fa08ee 100644 --- a/package/doom-wad/doom-wad.hash +++ b/package/doom-wad/doom-wad.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 cacf0142b31ca1af00796b4a0339e07992ac5f21bc3f81e7532fe1b5e1b486e6 doom19s.zip +sha256 cacf0142b31ca1af00796b4a0339e07992ac5f21bc3f81e7532fe1b5e1b486e6 doom19s.zip diff --git a/package/dos2unix/dos2unix.hash b/package/dos2unix/dos2unix.hash index 493011fce43..a16c1aecacb 100644 --- a/package/dos2unix/dos2unix.hash +++ b/package/dos2unix/dos2unix.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://waterlan.home.xs4all.nl/dos2unix/dos2unix-7.4.2.tar.gz.asc -sha256 6035c58df6ea2832e868b599dfa0d60ad41ca3ecc8aa27822c4b7a9789d3ae01 dos2unix-7.4.2.tar.gz -sha256 db8888b7d1454348aca0c6ca851327245ef60e57afa8a6555761c8b95d24af77 COPYING.txt +# https://waterlan.home.xs4all.nl/dos2unix/dos2unix-7.4.3.tar.gz.asc +sha256 b68db41956daf933828423aa30510e00c12d29ef5916e715e8d4e694fe66ca72 dos2unix-7.4.3.tar.gz +sha256 275ce1371734904b275e83bf760e3e6d2a520614545a3850c9568d1892b940fd COPYING.txt diff --git a/package/dos2unix/dos2unix.mk b/package/dos2unix/dos2unix.mk index 1f3e79ec4e0..f16a527f2ee 100644 --- a/package/dos2unix/dos2unix.mk +++ b/package/dos2unix/dos2unix.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOS2UNIX_VERSION = 7.4.2 +DOS2UNIX_VERSION = 7.4.3 DOS2UNIX_SITE = http://waterlan.home.xs4all.nl/dos2unix DOS2UNIX_LICENSE = BSD-2-Clause DOS2UNIX_LICENSE_FILES = COPYING.txt diff --git a/package/dotconf/Config.in b/package/dotconf/Config.in new file mode 100644 index 00000000000..21a74fa065f --- /dev/null +++ b/package/dotconf/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_DOTCONF + bool "dotconf" + help + Configuration file parser. + + https://github.com/williamh/dotconf diff --git a/package/dotconf/dotconf.hash b/package/dotconf/dotconf.hash new file mode 100644 index 00000000000..3233ea62c85 --- /dev/null +++ b/package/dotconf/dotconf.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 7f1ecf40de1ad002a065a321582ed34f8c14242309c3547ad59710ae3c805653 dotconf-1.3.tar.gz +sha256 a50cc98d5044a7bbddabe61fc0ec42aa671c73bf414d0c6b50da83ea8ae041c6 COPYING diff --git a/package/dotconf/dotconf.mk b/package/dotconf/dotconf.mk new file mode 100644 index 00000000000..26e78b3c7aa --- /dev/null +++ b/package/dotconf/dotconf.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# dotconf +# +################################################################################ + +DOTCONF_VERSION = 1.3 +DOTCONF_SITE = $(call github,williamh,dotconf,v$(DOTCONF_VERSION)) +DOTCONF_LICENSE = LGPL-2.1 +DOTCONF_LICENSE_FILES = COPYING +DOTCONF_INSTALL_STAGING = YES +# dotconf source code is released without configure script +DOTCONF_AUTORECONF = YES + +$(eval $(autotools-package)) diff --git a/package/double-conversion/Config.in b/package/double-conversion/Config.in new file mode 100644 index 00000000000..b858b56c273 --- /dev/null +++ b/package/double-conversion/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_DOUBLE_CONVERSION + bool "double-conversion" + depends on BR2_INSTALL_LIBSTDCPP + help + Provides binary-decimal and decimal-binary routines for + IEEE doubles. + + https://github.com/google/double-conversion + +comment "double-conversion needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/double-conversion/double-conversion.hash b/package/double-conversion/double-conversion.hash new file mode 100644 index 00000000000..a2ecd4422cc --- /dev/null +++ b/package/double-conversion/double-conversion.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 e40d236343cad807e83d192265f139481c51fc83a1c49e406ac6ce0a0ba7cd35 double-conversion-3.2.1.tar.gz +sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca COPYING diff --git a/package/double-conversion/double-conversion.mk b/package/double-conversion/double-conversion.mk new file mode 100644 index 00000000000..af1fbab0782 --- /dev/null +++ b/package/double-conversion/double-conversion.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# double-conversion +# +################################################################################ + +DOUBLE_CONVERSION_VERSION = 3.2.1 +DOUBLE_CONVERSION_SITE = $(call github,google,double-conversion,v$(DOUBLE_CONVERSION_VERSION)) +DOUBLE_CONVERSION_LICENSE = BSD-3-Clause +DOUBLE_CONVERSION_LICENSE_FILES = COPYING +DOUBLE_CONVERSION_INSTALL_STAGING = YES + +$(eval $(cmake-package)) +$(eval $(host-cmake-package)) diff --git a/package/dovecot-pigeonhole/dovecot-pigeonhole.hash b/package/dovecot-pigeonhole/dovecot-pigeonhole.hash index f3a5890151c..5c7ba322b27 100644 --- a/package/dovecot-pigeonhole/dovecot-pigeonhole.hash +++ b/package/dovecot-pigeonhole/dovecot-pigeonhole.hash @@ -1,3 +1,3 @@ # Locally computed after checking signature -sha256 a6d828f8d6f2decba5105343ece5c7a65245bd94e46a8ae4432a6d97543108a5 dovecot-2.3-pigeonhole-0.5.18.tar.gz +sha256 ae32bd4870ea2c1328ae09ba206e9ec12128046d6afca52fbbc9ef7f75617c98 dovecot-2.3-pigeonhole-0.5.20.tar.gz sha256 fc9e9522216f2a9a28b31300e3c73c1df56acc27dfae951bf516e7995366b51a COPYING diff --git a/package/dovecot-pigeonhole/dovecot-pigeonhole.mk b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk index 62d9909cf58..0b64cb0d6f6 100644 --- a/package/dovecot-pigeonhole/dovecot-pigeonhole.mk +++ b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOVECOT_PIGEONHOLE_VERSION = 0.5.18 +DOVECOT_PIGEONHOLE_VERSION = 0.5.20 DOVECOT_PIGEONHOLE_SOURCE = dovecot-2.3-pigeonhole-$(DOVECOT_PIGEONHOLE_VERSION).tar.gz DOVECOT_PIGEONHOLE_SITE = https://pigeonhole.dovecot.org/releases/2.3 DOVECOT_PIGEONHOLE_LICENSE = LGPL-2.1 diff --git a/package/dovecot/0001-auth-Fix-handling-passdbs-with-identical-driver-args.patch b/package/dovecot/0001-auth-Fix-handling-passdbs-with-identical-driver-args.patch new file mode 100644 index 00000000000..04b8f5392a1 --- /dev/null +++ b/package/dovecot/0001-auth-Fix-handling-passdbs-with-identical-driver-args.patch @@ -0,0 +1,136 @@ +From 7bad6a24160e34bce8f10e73dbbf9e5fbbcd1904 Mon Sep 17 00:00:00 2001 +From: Timo Sirainen +Date: Mon, 9 May 2022 15:23:33 +0300 +Subject: [PATCH] auth: Fix handling passdbs with identical driver/args but + different mechanisms/username_filter + +The passdb was wrongly deduplicated in this situation, causing wrong +mechanisms or username_filter setting to be used. This would be a rather +unlikely configuration though. + +Fixed by moving mechanisms and username_filter from struct passdb_module +to struct auth_passdb, which is where they should have been in the first +place. + +Signed-off-by: Peter Korsgaard +--- + src/auth/auth-request.c | 6 +++--- + src/auth/auth.c | 18 ++++++++++++++++++ + src/auth/auth.h | 5 +++++ + src/auth/passdb.c | 15 ++------------- + src/auth/passdb.h | 4 ---- + 5 files changed, 28 insertions(+), 20 deletions(-) + +diff --git a/src/auth/auth-request.c b/src/auth/auth-request.c +index cd08b1fa02..0ca29f3674 100644 +--- a/src/auth/auth-request.c ++++ b/src/auth/auth-request.c +@@ -534,8 +534,8 @@ auth_request_want_skip_passdb(struct auth_request *request, + struct auth_passdb *passdb) + { + /* if mechanism is not supported, skip */ +- const char *const *mechs = passdb->passdb->mechanisms; +- const char *const *username_filter = passdb->passdb->username_filter; ++ const char *const *mechs = passdb->mechanisms; ++ const char *const *username_filter = passdb->username_filter; + const char *username; + + username = request->fields.user; +@@ -548,7 +548,7 @@ auth_request_want_skip_passdb(struct auth_request *request, + return TRUE; + } + +- if (passdb->passdb->username_filter != NULL && ++ if (passdb->username_filter != NULL && + !auth_request_username_accepted(username_filter, username)) { + auth_request_log_debug(request, + request->mech != NULL ? AUTH_SUBSYS_MECH +diff --git a/src/auth/auth.c b/src/auth/auth.c +index f2f3fda20c..9f6c4ba60c 100644 +--- a/src/auth/auth.c ++++ b/src/auth/auth.c +@@ -99,6 +99,24 @@ auth_passdb_preinit(struct auth *auth, const struct auth_passdb_settings *set, + auth_passdb->override_fields_tmpl = + passdb_template_build(auth->pool, set->override_fields); + ++ if (*set->mechanisms == '\0') { ++ auth_passdb->mechanisms = NULL; ++ } else if (strcasecmp(set->mechanisms, "none") == 0) { ++ auth_passdb->mechanisms = (const char *const[]){ NULL }; ++ } else { ++ auth_passdb->mechanisms = ++ (const char *const *)p_strsplit_spaces(auth->pool, ++ set->mechanisms, " ,"); ++ } ++ ++ if (*set->username_filter == '\0') { ++ auth_passdb->username_filter = NULL; ++ } else { ++ auth_passdb->username_filter = ++ (const char *const *)p_strsplit_spaces(auth->pool, ++ set->username_filter, " ,"); ++ } ++ + /* for backwards compatibility: */ + if (set->pass) + auth_passdb->result_success = AUTH_DB_RULE_CONTINUE; +diff --git a/src/auth/auth.h b/src/auth/auth.h +index f700e29d5c..460a179765 100644 +--- a/src/auth/auth.h ++++ b/src/auth/auth.h +@@ -41,6 +41,11 @@ struct auth_passdb { + struct passdb_template *default_fields_tmpl; + struct passdb_template *override_fields_tmpl; + ++ /* Supported authentication mechanisms, NULL is all, {NULL} is none */ ++ const char *const *mechanisms; ++ /* Username filter, NULL is no filter */ ++ const char *const *username_filter; ++ + enum auth_passdb_skip skip; + enum auth_db_rule result_success; + enum auth_db_rule result_failure; +diff --git a/src/auth/passdb.c b/src/auth/passdb.c +index eb4ac8ae82..f5eed1af4f 100644 +--- a/src/auth/passdb.c ++++ b/src/auth/passdb.c +@@ -224,19 +224,8 @@ passdb_preinit(pool_t pool, const struct auth_passdb_settings *set) + passdb->id = ++auth_passdb_id; + passdb->iface = *iface; + passdb->args = p_strdup(pool, set->args); +- if (*set->mechanisms == '\0') { +- passdb->mechanisms = NULL; +- } else if (strcasecmp(set->mechanisms, "none") == 0) { +- passdb->mechanisms = (const char *const[]){NULL}; +- } else { +- passdb->mechanisms = (const char* const*)p_strsplit_spaces(pool, set->mechanisms, " ,"); +- } +- +- if (*set->username_filter == '\0') { +- passdb->username_filter = NULL; +- } else { +- passdb->username_filter = (const char* const*)p_strsplit_spaces(pool, set->username_filter, " ,"); +- } ++ /* NOTE: if anything else than driver & args are added here, ++ passdb_find() also needs to be updated. */ + array_push_back(&passdb_modules, &passdb); + return passdb; + } +diff --git a/src/auth/passdb.h b/src/auth/passdb.h +index 2e95328e5c..e466a9fdb6 100644 +--- a/src/auth/passdb.h ++++ b/src/auth/passdb.h +@@ -63,10 +63,6 @@ struct passdb_module { + /* Default password scheme for this module. + If default_cache_key is set, must not be NULL. */ + const char *default_pass_scheme; +- /* Supported authentication mechanisms, NULL is all, [NULL] is none*/ +- const char *const *mechanisms; +- /* Username filter, NULL is no filter */ +- const char *const *username_filter; + + /* If blocking is set to TRUE, use child processes to access + this passdb. */ +-- +2.30.2 + diff --git a/package/dovecot/dovecot.hash b/package/dovecot/dovecot.hash index 0363b6e922e..7036df57a8f 100644 --- a/package/dovecot/dovecot.hash +++ b/package/dovecot/dovecot.hash @@ -1,5 +1,5 @@ # Locally computed after checking signature -sha256 1c67ccccdc81a75007c01dedc02ad608c4d856c60a6b89b9cd246e79f72aa2b8 dovecot-2.3.17.1.tar.gz +sha256 caa832eb968148abdf35ee9d0f534b779fa732c0ce4a913d9ab8c3469b218552 dovecot-2.3.20.tar.gz sha256 319a9830aab406109cd67cb45496587566a8123203d66d037b209ca3e13de02a COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL sha256 52b8c95fabb19575281874b661ef7968ea47e8f5d74ba0dd40ce512e52b3fc97 COPYING.MIT diff --git a/package/dovecot/dovecot.mk b/package/dovecot/dovecot.mk index fb299a8e451..4b17784f93c 100644 --- a/package/dovecot/dovecot.mk +++ b/package/dovecot/dovecot.mk @@ -5,7 +5,7 @@ ################################################################################ DOVECOT_VERSION_MAJOR = 2.3 -DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).17.1 +DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).20 DOVECOT_SITE = https://dovecot.org/releases/$(DOVECOT_VERSION_MAJOR) DOVECOT_INSTALL_STAGING = YES DOVECOT_LICENSE = LGPL-2.1, MIT, Public Domain, BSD-3-Clause, Unicode-DFS-2015 @@ -21,6 +21,9 @@ DOVECOT_DEPENDENCIES = \ # is part of the Red Hat packaging and not part of upstream dovecot DOVECOT_IGNORE_CVES += CVE-2016-4983 +# 0001-auth-Fix-handling-passdbs-with-identical-driver-args.patch +DOVECOT_IGNORE_CVES += CVE-2022-30550 + DOVECOT_CONF_ENV = \ RPCGEN=__disable_RPCGEN_rquota \ i_cv_epoll_works=yes \ diff --git a/package/dracut/0001-dracut.sh-don-t-unset-LD_PRELOAD.patch b/package/dracut/0001-dracut.sh-don-t-unset-LD_PRELOAD.patch new file mode 100644 index 00000000000..394917eeb0e --- /dev/null +++ b/package/dracut/0001-dracut.sh-don-t-unset-LD_PRELOAD.patch @@ -0,0 +1,31 @@ +From bb12f15856911d8532b569116da7dab4cbf107be Mon Sep 17 00:00:00 2001 +From: Thierry Bultel +Date: Mon, 10 Jan 2022 09:09:43 +0100 +Subject: [PATCH] dracut.sh: don't unset LD_PRELOAD + +LD_PRELOAD and LD_LIBRARY_PATH are needed to run under fakeroot. + +Signed-off-by: Thierry Bultel +Signed-off-by: Arnout Vandecappelle (Essensium/Mind) +[yann.morin.1998@free.fr: commit log also mentions LD_LIBRARY_PATH] +Signed-off-by: Yann E. MORIN +--- + dracut.sh | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/dracut.sh b/dracut.sh +index 60ac46f4..37f25b38 100755 +--- a/dracut.sh ++++ b/dracut.sh +@@ -868,8 +868,6 @@ export LC_ALL=C + export LANG=C + unset LC_MESSAGES + unset LC_CTYPE +-unset LD_LIBRARY_PATH +-unset LD_PRELOAD + unset GREP_OPTIONS + + export DRACUT_LOG_LEVEL=warning +-- +2.37.1 + diff --git a/package/dracut/Config.in.host b/package/dracut/Config.in.host new file mode 100644 index 00000000000..18f562b3106 --- /dev/null +++ b/package/dracut/Config.in.host @@ -0,0 +1,9 @@ +config BR2_PACKAGE_HOST_DRACUT + bool + select BR2_PACKAGE_HOST_KMOD + help + dracut is used to create an initramfs image by + copying tools and files from an installed system + and combining it with the dracut framework. + + https://dracut.wiki.kernel.org diff --git a/package/dracut/busybox-init-module-setup.sh b/package/dracut/busybox-init-module-setup.sh new file mode 100644 index 00000000000..d6ea94350f1 --- /dev/null +++ b/package/dracut/busybox-init-module-setup.sh @@ -0,0 +1,59 @@ +#!/bin/bash + +check() { + require_binaries busybox || return 1 + return 0 +} + +depends() { + return 0 +} + +install_busybox_links() { + dir="${1}" + linkname="${2}" + + (cd "${dracutsysrootdir?}${dir}" && + for x in *; do + if [ "$(readlink "${x}")" = "${linkname}" ]; then + ln -sf "${linkname}" "${initdir?}/${dir}/${x}" + fi + done + ) +} + +install() { + inst_multiple /bin/busybox + + # wrapper script for early console; will launch /sbin/init + # after having mounted devtmpfs + inst_multiple /init + + if [ -e "${dracutsysrootdir?}/lib64" ]; then + ln -sf lib "${initdir?}/lib64" + ln -sf lib "${initdir?}/usr/lib64" + fi + + if [ -e "${dracutsysrootdir?}/lib32" ]; then + ln -sf lib "${initdir?}/lib32" + ln -sf lib "${initdir?}/usr/lib32" + fi + + install_busybox_links "/bin" "busybox" + install_busybox_links "/sbin" "../bin/busybox" + if [ ! -L "${dracutsysrootdir?}/bin" ]; then + install_busybox_links "/usr/bin" "../../bin/busybox" + install_busybox_links "/usr/sbin" "../../bin/busybox" + fi + + inst_multiple \ + /etc/inittab \ + /etc/init.d/rcS \ + /etc/init.d/rcK \ + /etc/issue \ + /etc/fstab \ + /etc/group \ + /etc/passwd \ + /etc/shadow \ + /etc/hostname +} diff --git a/package/dracut/dracut.hash b/package/dracut/dracut.hash new file mode 100644 index 00000000000..34db6af23bc --- /dev/null +++ b/package/dracut/dracut.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 24f149d683d188c0d25756529b7d1e5cd6be8028e0c1043110f303d0d706757d dracut-057.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/dracut/dracut.mk b/package/dracut/dracut.mk new file mode 100644 index 00000000000..3eb9bcc4746 --- /dev/null +++ b/package/dracut/dracut.mk @@ -0,0 +1,50 @@ +################################################################################ +# +# dracut +# +################################################################################ + +DRACUT_VERSION = 057 +DRACUT_SITE = $(call github,dracutdevs,dracut,$(DRACUT_VERSION)) +DRACUT_LICENSE = GPL-2.0 +DRACUT_LICENSE_FILES = COPYING +DRACUT_CPE_ID_VENDOR = dracut_project + +HOST_DRACUT_DEPENDENCIES = host-pkgconf host-kmod host-prelink-cross + +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 +endef +HOST_DRACUT_POST_INSTALL_HOOKS += HOST_DRACUT_POST_INSTALL_WRAPPER_SCRIPT + +# When using uClibc or musl, there must be "ld-uClibc.so.1" or +# "ld-musl-x.so" symlinks, respectively - else the init process cannot +# start +define HOST_DRACUT_POST_INSTALL_LIBC_LINKS_MODULE + $(INSTALL) -D -m 0755 package/dracut/merged-usr-module-setup.sh \ + $(HOST_DIR)/lib/dracut/modules.d/0000-merged-usr/module-setup.sh + $(INSTALL) -D -m 0755 package/dracut/libc-links-module-setup.sh \ + $(HOST_DIR)/lib/dracut/modules.d/05libc-links/module-setup.sh +endef +HOST_DRACUT_POST_INSTALL_HOOKS += HOST_DRACUT_POST_INSTALL_LIBC_LINKS_MODULE + +ifeq ($(BR2_INIT_BUSYBOX),y) +# Dracut does not support busybox init (systemd init is assumed to work +# out of the box, though). It provides a busybox module, that does not +# use the same paths as buildroot, and is not meant to be used as an init +# system. +# So it is simpler for users to disable the standard 'busybox' module in +# the configuration file, and enable the "busybox-init' module instead. +# Note that setting the script as executable (0755) is not mandatory, +# but this is what dracut does on all its modules, so lets just conform +# to it. +define HOST_DRACUT_POST_INSTALL_BUSYBOX_INIT_MODULE + $(INSTALL) -D -m 0755 package/dracut/busybox-init-module-setup.sh \ + $(HOST_DIR)/lib/dracut/modules.d/05busybox-init/module-setup.sh +endef +HOST_DRACUT_POST_INSTALL_HOOKS += HOST_DRACUT_POST_INSTALL_BUSYBOX_INIT_MODULE +endif + +$(eval $(host-autotools-package)) diff --git a/package/dracut/dracut_wrapper b/package/dracut/dracut_wrapper new file mode 100644 index 00000000000..0464db17fed --- /dev/null +++ b/package/dracut/dracut_wrapper @@ -0,0 +1,38 @@ +#!/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}")")")" +export DRACUT_LDD="${topdir}/sbin/prelink-rtld --root='${sysroot}'" +export DRACUT_INSTALL="${topdir}/lib/dracut/dracut-install" +export DRACUT_LDCONFIG=/bin/true +export dracutbasedir="${topdir}/lib/dracut" +exec "${topdir}/bin/dracut.real" "${@}" diff --git a/package/dracut/libc-links-module-setup.sh b/package/dracut/libc-links-module-setup.sh new file mode 100755 index 00000000000..26ebc5bc841 --- /dev/null +++ b/package/dracut/libc-links-module-setup.sh @@ -0,0 +1,27 @@ +#!/bin/bash + +# Adds the missing links for uClibc or musl, if needed + +check() { + return 0 +} + +depends() { + return 0 +} + +install() { + # Despite of the fact that the listed dependency (reported by readelf -d) + # is purely /lib/libc.so, the musl symlink is needed anyway. + musl_link="$(find "${dracutsysrootdir?}/lib/" -name "ld-musl-*.so*")" + if [ -n "${musl_link}" ] ; then + ln -s libc.so "${initdir?}/lib/${musl_link##*/}" + fi + + # Same for uClibc, the listed dependency + # is ld-uClibc.so.1, the loader needs the ld-uClibc.so.0, too + uclibc_link="$(find "${dracutsysrootdir?}/lib/" -name "ld-uClibc-*.so*")" + if [ -n "$uclibc_link" ] ; then + ln -s ld-uClibc.so.1 "${initdir?}/lib/ld-uClibc.so.0" + fi +} diff --git a/package/dracut/merged-usr-module-setup.sh b/package/dracut/merged-usr-module-setup.sh new file mode 100644 index 00000000000..6dc0e7ca7bf --- /dev/null +++ b/package/dracut/merged-usr-module-setup.sh @@ -0,0 +1,26 @@ +#!/bin/bash + +check() { + [ -L "${dracutsysrootdir?}/lib" ] +} + +depends() { + return 0 +} + +install() { + # dracut pre-installs a set of files before calling any of + # the modules, and dracut also messes up host vs. target + # system, so on a non-merged-usr host, it will prepare a + # non-merged-usr initramfs, even though the current config + # is for a merged-usr system. + # So undo its borkage. + for dir in lib bin sbin; do + mkdir -p "${initdir?}/usr/${dir}" + if [ -d "${initdir?}/${dir}" ]; then + mv "${initdir?}/${dir}/"* "${initdir?}/usr/${dir}" + rm -rf "${initdir?}/${dir}" + ln -s "usr/${dir}" "${initdir?}/${dir}" + fi + done +} diff --git a/package/drbd-utils/drbd-utils.hash b/package/drbd-utils/drbd-utils.hash index 58d282714e1..9bdfd69538b 100644 --- a/package/drbd-utils/drbd-utils.hash +++ b/package/drbd-utils/drbd-utils.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3827bfed6630f8784ec558a8ac3de68175d544876d897c0810ad141a61487cad drbd-utils-9.19.0.tar.gz +sha256 730d68b9ee48df7b2e3ddff38bf54a5bc405651bac0ece180b4f22a468e543b3 drbd-utils-9.21.4.tar.gz sha256 1ca3e8f71b7de618968e7ea9fe47822d9e704dc476aef8544033abedec355225 COPYING diff --git a/package/drbd-utils/drbd-utils.mk b/package/drbd-utils/drbd-utils.mk index 2082810a375..c1035191f1d 100644 --- a/package/drbd-utils/drbd-utils.mk +++ b/package/drbd-utils/drbd-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -DRBD_UTILS_VERSION = 9.19.0 +DRBD_UTILS_VERSION = 9.21.4 DRBD_UTILS_SITE = http://pkg.linbit.com/downloads/drbd/utils DRBD_UTILS_LICENSE = GPL-2.0+ DRBD_UTILS_LICENSE_FILES = COPYING @@ -20,6 +20,12 @@ else DRBD_UTILS_CONF_OPTS += --with-initscripttype=sysv endif +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +DRBD_UTILS_CONF_OPTS += --with-drbdmon +else +DRBD_UTILS_CONF_OPTS += --without-drbdmon +endif + ifeq ($(BR2_PACKAGE_HAS_UDEV),y) DRBD_UTILS_CONF_OPTS += --with-udev=yes DRBD_UTILS_DEPENDENCIES += udev diff --git a/package/dropbear/dropbear.hash b/package/dropbear/dropbear.hash index 82ff454f0a5..8f6c49c62b8 100644 --- a/package/dropbear/dropbear.hash +++ b/package/dropbear/dropbear.hash @@ -1,5 +1,5 @@ # From https://matt.ucc.asn.au/dropbear/releases/SHA256SUM.asc -sha256 48235d10b37775dbda59341ac0c4b239b82ad6318c31568b985730c788aac53b dropbear-2020.81.tar.bz2 +sha256 bc5a121ffbc94b5171ad5ebe01be42746d50aa797c9549a4639894a16749443b dropbear-2022.83.tar.bz2 # License file, locally computed sha256 a99ce657d790b761c132ee7e0de18edb437ae6361e536d991c6a12f36e770445 LICENSE diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk index 66141e828fc..61051c314f0 100644 --- a/package/dropbear/dropbear.mk +++ b/package/dropbear/dropbear.mk @@ -4,7 +4,7 @@ # ################################################################################ -DROPBEAR_VERSION = 2020.81 +DROPBEAR_VERSION = 2022.83 DROPBEAR_SITE = https://matt.ucc.asn.au/dropbear/releases DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.bz2 DROPBEAR_LICENSE = MIT, BSD-2-Clause, Public domain @@ -63,14 +63,10 @@ define DROPBEAR_ENABLE_LEGACY_CRYPTO echo '#define DROPBEAR_3DES 1' >> $(@D)/localoptions.h echo '#define DROPBEAR_ENABLE_CBC_MODE 1' >> $(@D)/localoptions.h echo '#define DROPBEAR_SHA1_96_HMAC 1' >> $(@D)/localoptions.h + echo '#define DROPBEAR_DH_GROUP1 1' >> $(@D)/localoptions.h + echo '#define DROPBEAR_DSS 1' >> $(@D)/localoptions.h endef DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_ENABLE_LEGACY_CRYPTO -else -define DROPBEAR_DISABLE_LEGACY_CRYPTO - echo '#define DROPBEAR_DSS 0' >> $(@D)/localoptions.h - echo '#define DROPBEAR_DH_GROUP1 0' >> $(@D)/localoptions.h -endef -DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_DISABLE_LEGACY_CRYPTO endif ifeq ($(BR2_PACKAGE_DROPBEAR_DISABLE_REVERSEDNS),) @@ -87,8 +83,6 @@ DROPBEAR_CONF_OPTS += --disable-zlib --enable-bundled-libtom else define DROPBEAR_BUILD_FEATURED echo '#define DROPBEAR_SMALL_CODE 0' >> $(@D)/localoptions.h - echo '#define DROPBEAR_TWOFISH128 1' >> $(@D)/localoptions.h - echo '#define DROPBEAR_TWOFISH256 1' >> $(@D)/localoptions.h endef DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_BUILD_FEATURED DROPBEAR_DEPENDENCIES += zlib libtomcrypt diff --git a/package/dropwatch/dropwatch.hash b/package/dropwatch/dropwatch.hash index 867a7f12fb5..24fc03097ba 100644 --- a/package/dropwatch/dropwatch.hash +++ b/package/dropwatch/dropwatch.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b748b66a816c1f94531446c0451da5461a4a31b0949244bb867d741c6ac0148b dropwatch-1.5.3.tar.gz +sha256 8c43d0c15d0cb9ce179fa1fb0610611723689a6f551b23c70a7ddc1cf068e8d2 dropwatch-1.5.4.tar.gz sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/package/dropwatch/dropwatch.mk b/package/dropwatch/dropwatch.mk index 36608ad8b36..33775f6c024 100644 --- a/package/dropwatch/dropwatch.mk +++ b/package/dropwatch/dropwatch.mk @@ -4,7 +4,7 @@ # ################################################################################ -DROPWATCH_VERSION = 1.5.3 +DROPWATCH_VERSION = 1.5.4 DROPWATCH_SITE = $(call github,nhorman,dropwatch,v$(DROPWATCH_VERSION)) DROPWATCH_DEPENDENCIES = libnl readline libpcap host-pkgconf $(TARGET_NLS_DEPENDENCIES) DROPWATCH_LICENSE = GPL-2.0+ diff --git a/package/dt/Config.in b/package/dt/Config.in index 826a66ebd5d..af20cc9bcad 100644 --- a/package/dt/Config.in +++ b/package/dt/Config.in @@ -18,4 +18,4 @@ config BR2_PACKAGE_DT before exiting. Since verification of data is performed, dt can be thought of as a generic diagnostic tool. - http://www.scsifaq.org/RMiller_Tools/dt.html + https://github.com/RobinTMiller/dt diff --git a/package/dt/dt.hash b/package/dt/dt.hash index 9c1102579db..e0cc0caea6c 100644 --- a/package/dt/dt.hash +++ b/package/dt/dt.hash @@ -1,7 +1,7 @@ # From http://pkgs.fedoraproject.org/repo/pkgs/dt/dt-source-v18.32.tar.gz # (directory name is md5 hash) -md5 3054aeaaba047a1dbe90c2132a382ee2 dt-source-v18.32.tar.gz +md5 3054aeaaba047a1dbe90c2132a382ee2 dt-source-v18.32.tar.gz # Locally calculated -sha256 10d164676e918a4d07f233bcd11e4cb6bfd1052c996182cd1827ccd0c063fcc6 dt-source-v18.32.tar.gz -sha256 49f47f20de4b44dc3505ed0cc55bfbfe0fc3e41956ab546f1eeedcf554def54c LICENSE +sha256 10d164676e918a4d07f233bcd11e4cb6bfd1052c996182cd1827ccd0c063fcc6 dt-source-v18.32.tar.gz +sha256 49f47f20de4b44dc3505ed0cc55bfbfe0fc3e41956ab546f1eeedcf554def54c LICENSE diff --git a/package/dtv-scan-tables/dtv-scan-tables.hash b/package/dtv-scan-tables/dtv-scan-tables.hash index 8d4290fc537..e53a168832d 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 186a6fe1755d83d583590de3f83013c2e4df47b258c88180dffd1afb0d36d4d6 dtv-scan-tables-25ee9e0ce4bbacdb278d4cff306ceb6528c4f548-br1.tar.gz +sha256 b77c6bcbbc20f6b6bdbf735fb75cf9bec8634e1e6d3a32e6db2573deeb7a2212 dtv-scan-tables-57ed2982275045ea5e92ef2a40b9fa58255852e5-br1.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 4150abd1a0a..45264a41c5a 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 = 25ee9e0ce4bbacdb278d4cff306ceb6528c4f548 +DTV_SCAN_TABLES_VERSION = 57ed2982275045ea5e92ef2a40b9fa58255852e5 DTV_SCAN_TABLES_SITE = https://git.linuxtv.org/dtv-scan-tables.git DTV_SCAN_TABLES_SITE_METHOD = git diff --git a/package/duktape/Config.in b/package/duktape/Config.in index 5dad5c3e7c7..38f2c48cc01 100644 --- a/package/duktape/Config.in +++ b/package/duktape/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_DUKTAPE bool "duktape" depends on !BR2_STATIC_LIBS + depends on !BR2_OPTIMIZE_FAST help Duktape is an embeddable Javascript engine, with a focus on portability and compact footprint. @@ -14,3 +15,6 @@ config BR2_PACKAGE_DUKTAPE comment "duktape needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS + +comment "duktape can't be built with Optimize for fast" + depends on BR2_OPTIMIZE_FAST diff --git a/package/duktape/duktape.hash b/package/duktape/duktape.hash index 4c55e398886..ef6f55aa9d4 100644 --- a/package/duktape/duktape.hash +++ b/package/duktape/duktape.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 96f4a05a6c84590e53b18c59bb776aaba80a205afbbd92b82be609ba7fe75fa7 duktape-2.6.0.tar.xz -sha256 5b42d02dbd084fd6d7e61d93f52e02b596f25400e54e0f86d5780045e5b754c8 LICENSE.txt +sha256 90f8d2fa8b5567c6899830ddef2c03f3c27960b11aca222fa17aa7ac613c2890 duktape-2.7.0.tar.xz +sha256 c6b6659630ca6cb837afe982ecc79511bfca878b56296d628b02eb6f18789c29 LICENSE.txt diff --git a/package/duktape/duktape.mk b/package/duktape/duktape.mk index 89a6e451f59..674c5e93237 100644 --- a/package/duktape/duktape.mk +++ b/package/duktape/duktape.mk @@ -4,7 +4,7 @@ # ################################################################################ -DUKTAPE_VERSION = 2.6.0 +DUKTAPE_VERSION = 2.7.0 DUKTAPE_SOURCE = duktape-$(DUKTAPE_VERSION).tar.xz DUKTAPE_SITE = \ https://github.com/svaarala/duktape/releases/download/v$(DUKTAPE_VERSION) diff --git a/package/dump1090/0001-dump1090.h-fix-build-with-gcc-10.patch b/package/dump1090/0001-dump1090.h-fix-build-with-gcc-10.patch deleted file mode 100644 index eeda03bcf06..00000000000 --- a/package/dump1090/0001-dump1090.h-fix-build-with-gcc-10.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 02153cb0b2d1083dcd587798d9ef7ce963739622 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 19 Aug 2020 18:46:17 +0200 -Subject: [PATCH] dump1090.h: fix build with gcc 10 - -Fix the following build failures on gcc 10 (where -fno-common is enabled -by default): - -/home/test/autobuild/run/instance-0/output-1/per-package/dump1090/host/bin/../lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: interactive.o:/home/test/autobuild/run/instance-0/output-1/build/dump1090-bff92c4ad772a0a8d433f788d39dae97e00e4dbe/dump1090.h:373: multiple definition of `Modes'; /home/test/autobuild/run/instance-0/output-1/per-package/dump1090/host/bin/../lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: interactive.o:/home/test/autobuild/run/instance-0/output-1/build/dump1090-bff92c4ad772a0a8d433f788d39dae97e00e4dbe/dump1090.h:373: multiple definition of `Modes'; dump1090.o:/home/test/autobuild/run/instance-0/output-1/build/dump1090-bff92c4ad772a0a8d433f788d39dae97e00e4dbe/dump1090.h:373: first defined here - -/home/test/autobuild/run/instance-0/output-1/per-package/dump1090/host/bin/../lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: interactive.o:/home/test/autobuild/run/instance-0/output-1/build/dump1090-bff92c4ad772a0a8d433f788d39dae97e00e4dbe/dump1090.h:238: multiple definition of `tDF'; dump1090.o:/home/test/autobuild/run/instance-0/output-1/build/dump1090-bff92c4ad772a0a8d433f788d39dae97e00e4dbe/dump1090.h:238: first defined here -/home/test/autobuild/run/instance-0/output-1/per-package/dump1090/host/bin/../lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: view1090.o:/home/test/autobuild/run/instance-0/output-1/build/dump1090-bff92c4ad772a0a8d433f788d39dae97e00e4dbe/dump1090.h:373: first defined here - -Fixes: - - http://autobuild.buildroot.org/results/88dc97fcaa649014edb3b54a5dd4bd8ec4715bbd - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/MalcolmRobb/dump1090/pull/96] ---- - dump1090.c | 3 +++ - dump1090.h | 4 ++-- - view1090.c | 3 +++ - 3 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/dump1090.c b/dump1090.c -index 60882fc..1482224 100644 ---- a/dump1090.c -+++ b/dump1090.c -@@ -29,6 +29,9 @@ - // - #include "coaa.h" - #include "dump1090.h" -+ -+struct modes Modes; -+ - // - // ============================= Utility functions ========================== - // -diff --git a/dump1090.h b/dump1090.h -index 9ad4de0..283e760 100644 ---- a/dump1090.h -+++ b/dump1090.h -@@ -235,10 +235,10 @@ struct stDF { - uint64_t llTimestamp; // Timestamp at which the this packet was received - uint32_t addr; // Timestamp at which the this packet was received - unsigned char msg[MODES_LONG_MSG_BYTES]; // the binary --} tDF; -+}; - - // Program global state --struct { // Internal state -+extern struct modes { // Internal state - pthread_t reader_thread; - - pthread_mutex_t data_mutex; // Mutex to synchronize buffer access -diff --git a/view1090.c b/view1090.c -index 0b9b8b9..cc072fc 100644 ---- a/view1090.c -+++ b/view1090.c -@@ -29,6 +29,9 @@ - // - #include "coaa.h" - #include "view1090.h" -+ -+struct modes Modes; -+ - // - // ============================= Utility functions ========================== - // --- -2.27.0 - diff --git a/package/dump1090/Config.in b/package/dump1090/Config.in index 8f17929235c..ca3165dc74e 100644 --- a/package/dump1090/Config.in +++ b/package/dump1090/Config.in @@ -1,12 +1,12 @@ config BR2_PACKAGE_DUMP1090 bool "dump1090" - depends on BR2_TOOLCHAIN_HAS_THREADS # librtlsdr - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # librtlsdr -> libusb - select BR2_PACKAGE_LIBRTLSDR + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C11/stdatomic.h + select BR2_PACKAGE_NCURSES help Dump1090 is a simple Mode S decoder for RTLSDR devices - https://github.com/MalcolmRobb/dump1090 + https://github.com/flightaware/dump1090 comment "dump1090 needs a toolchain w/ threads, gcc >= 4.9" depends on !BR2_TOOLCHAIN_HAS_THREADS || \ diff --git a/package/dump1090/dump1090.hash b/package/dump1090/dump1090.hash index fbbf21a0152..8a4c3a4818e 100644 --- a/package/dump1090/dump1090.hash +++ b/package/dump1090/dump1090.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 72c1a94f3e6788af1e72b8cac13bb53e0989fe02cd13e191133f5519d2a2fefb dump1090-bff92c4ad772a0a8d433f788d39dae97e00e4dbe.tar.gz -sha256 29046ef7ee0b7b127bcc64faf135035820906dea2b379b2efcfc119131a39f7a anet.h +sha256 1ab8a5acd891bdbba586e2e9f2d9b056210940bd47b5c1a19d133eb091f31555 dump1090-8.2.tar.gz +sha256 804f68c803eb5c127c53ad17c4f4e5033ef158e514bb76950dc7b1773f9ce4b0 LICENSE diff --git a/package/dump1090/dump1090.mk b/package/dump1090/dump1090.mk index 69fd67948cb..60ef4a9bcb4 100644 --- a/package/dump1090/dump1090.mk +++ b/package/dump1090/dump1090.mk @@ -4,15 +4,30 @@ # ################################################################################ -DUMP1090_VERSION = bff92c4ad772a0a8d433f788d39dae97e00e4dbe -DUMP1090_SITE = $(call github,MalcolmRobb,dump1090,$(DUMP1090_VERSION)) -DUMP1090_LICENSE = BSD-3-Clause -# no real license file -DUMP1090_LICENSE_FILES = anet.h -DUMP1090_DEPENDENCIES = host-pkgconf librtlsdr +DUMP1090_VERSION = 8.2 +DUMP1090_SITE = $(call github,flightaware,dump1090,v$(DUMP1090_VERSION)) +DUMP1090_LICENSE = GPL-2.0+ +DUMP1090_LICENSE_FILES = LICENSE +DUMP1090_DEPENDENCIES = host-pkgconf ncurses +DUMP1090_MAKE_OPTS = BLADERF=no CPUFEATURES=no LIMESDR=no + +ifeq ($(BR2_PACKAGE_HACKRF),y) +DUMP1090_DEPENDENCIES += hackrf +DUMP1090_MAKE_OPTS += HACKRF=yes +else +DUMP1090_MAKE_OPTS += HACKRF=no +endif + +ifeq ($(BR2_PACKAGE_LIBRTLSDR),y) +DUMP1090_DEPENDENCIES += librtlsdr +DUMP1090_MAKE_OPTS += RTLSDR=yes +else +DUMP1090_MAKE_OPTS += RTLSDR=no +endif define DUMP1090_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) PREFIX=/usr -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) PREFIX=/usr \ + -C $(@D) $(DUMP1090_MAKE_OPTS) endef define DUMP1090_INSTALL_TARGET_CMDS diff --git a/package/dust/Config.in b/package/dust/Config.in new file mode 100644 index 00000000000..7b6e9304bc8 --- /dev/null +++ b/package/dust/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_DUST + bool "dust" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_RUSTC + help + dust is an alternative written in Rust of the command "du" + from the Linux kernel. It aims to be more intuitive and visual + in order to give the user a better view of his system's + current storage capacity. + + https://github.com/bootandy/dust.git diff --git a/package/dust/dust.hash b/package/dust/dust.hash new file mode 100644 index 00000000000..d4f6bff4e42 --- /dev/null +++ b/package/dust/dust.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 271cc0f1978049b2dbfece633b85d4dd0184df346bd93720062c13e4332f2549 dust-0.8.1.tar.gz +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/dust/dust.mk b/package/dust/dust.mk new file mode 100644 index 00000000000..2cffc336a9b --- /dev/null +++ b/package/dust/dust.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# dust +# +################################################################################ + +DUST_VERSION = 0.8.1 +DUST_SITE = $(call github,bootandy,dust,v$(DUST_VERSION)) +DUST_LICENSE = APACHE-2.0 +DUST_LICENSE_FILES = LICENSE + +$(eval $(cargo-package)) diff --git a/package/dvblast/dvblast.hash b/package/dvblast/dvblast.hash index b32668fa417..1b75d779d92 100644 --- a/package/dvblast/dvblast.hash +++ b/package/dvblast/dvblast.hash @@ -1,7 +1,7 @@ # From https://get.videolan.org/dvblast/3.4/dvblast-3.4.tar.bz2.md5 -md5 148a26e1207e111f905461cfb1cd106a dvblast-3.4.tar.bz2 +md5 148a26e1207e111f905461cfb1cd106a dvblast-3.4.tar.bz2 # From https://get.videolan.org/dvblast/3.4/dvblast-3.4.tar.bz2.sha256 -sha256 7abd45aff738544017350af87ec7ebad00fcfb4e4effd04f35023d504d9b6f44 dvblast-3.4.tar.bz2 +sha256 7abd45aff738544017350af87ec7ebad00fcfb4e4effd04f35023d504d9b6f44 dvblast-3.4.tar.bz2 # Locally computed -sha256 94f68aec169fb6c9937eade757251714d38a56812be5dbfc3973914a71ad8d2d COPYING -sha256 2c1bea2f338d46ee6f2712f2c2bf05b874327ca0bec5eb0b7b4fbe208a23677f COPYING.WTFPL +sha256 94f68aec169fb6c9937eade757251714d38a56812be5dbfc3973914a71ad8d2d COPYING +sha256 2c1bea2f338d46ee6f2712f2c2bf05b874327ca0bec5eb0b7b4fbe208a23677f COPYING.WTFPL diff --git a/package/dvdauthor/dvdauthor.hash b/package/dvdauthor/dvdauthor.hash index 833884aa9a3..c0ff3e0fba9 100644 --- a/package/dvdauthor/dvdauthor.hash +++ b/package/dvdauthor/dvdauthor.hash @@ -1,6 +1,6 @@ # From https://sourceforge.net/projects/dvdauthor/files -md5 1173dcb8d40e74fc90c0f3a25dbd642d dvdauthor-0.7.2.tar.gz -sha1 0e605642140576bfb3e963414d77630d1c073a51 dvdauthor-0.7.2.tar.gz +md5 1173dcb8d40e74fc90c0f3a25dbd642d dvdauthor-0.7.2.tar.gz +sha1 0e605642140576bfb3e963414d77630d1c073a51 dvdauthor-0.7.2.tar.gz # Locally computed sha256 3020a92de9f78eb36f48b6f22d5a001c47107826634a785a62dfcd080f612eb7 dvdauthor-0.7.2.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/e2fsprogs/0001-libext2fs-add-sanity-check-to-extent-manipulation.patch b/package/e2fsprogs/0001-libext2fs-add-sanity-check-to-extent-manipulation.patch new file mode 100644 index 00000000000..b5299a2a78e --- /dev/null +++ b/package/e2fsprogs/0001-libext2fs-add-sanity-check-to-extent-manipulation.patch @@ -0,0 +1,59 @@ +From ab51d587bb9b229b1fade1afd02e1574c1ba5c76 Mon Sep 17 00:00:00 2001 +From: Lukas Czerner +Date: Thu, 21 Apr 2022 19:31:48 +0200 +Subject: libext2fs: add sanity check to extent manipulation + +It is possible to have a corrupted extent tree in such a way that a leaf +node contains zero extents in it. Currently if that happens and we try +to traverse the tree we can end up accessing wrong data, or possibly +even uninitialized memory. Make sure we don't do that. + +Additionally make sure that we have a sane number of bytes passed to +memmove() in ext2fs_extent_delete(). + +Note that e2fsck is currently unable to spot and fix such corruption in +pass1. + +Signed-off-by: Lukas Czerner +Reported-by: Nils Bars +Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=2068113 +Addresses: CVE-2022-1304 +Addresses-Debian-Bug: #1010263 +Signed-off-by: Theodore Ts'o + +[Retrieved from: +https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/commit/?h=maint&id=ab51d587bb9b229b1fade1afd02e1574c1ba5c76] +Signed-off-by: Fabrice Fontaine +--- + lib/ext2fs/extent.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/lib/ext2fs/extent.c b/lib/ext2fs/extent.c +index b324c7b0..1a206a16 100644 +--- a/lib/ext2fs/extent.c ++++ b/lib/ext2fs/extent.c +@@ -495,6 +495,10 @@ retry: + ext2fs_le16_to_cpu(eh->eh_entries); + newpath->max_entries = ext2fs_le16_to_cpu(eh->eh_max); + ++ /* Make sure there is at least one extent present */ ++ if (newpath->left <= 0) ++ return EXT2_ET_EXTENT_NO_DOWN; ++ + if (path->left > 0) { + ix++; + newpath->end_blk = ext2fs_le32_to_cpu(ix->ei_block); +@@ -1630,6 +1634,10 @@ errcode_t ext2fs_extent_delete(ext2_extent_handle_t handle, int flags) + + cp = path->curr; + ++ /* Sanity check before memmove() */ ++ if (path->left < 0) ++ return EXT2_ET_EXTENT_LEAF_BAD; ++ + if (path->left) { + memmove(cp, cp + sizeof(struct ext3_extent_idx), + path->left * sizeof(struct ext3_extent_idx)); +-- +cgit + diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk index cd70e3a034b..39c9e076447 100644 --- a/package/e2fsprogs/e2fsprogs.mk +++ b/package/e2fsprogs/e2fsprogs.mk @@ -12,6 +12,9 @@ E2FSPROGS_LICENSE_FILES = NOTICE lib/ss/mit-sipb-copyright.h lib/et/internal.h E2FSPROGS_CPE_ID_VENDOR = e2fsprogs_project E2FSPROGS_INSTALL_STAGING = YES +# 0001-libext2fs-add-sanity-check-to-extent-manipulation.patch +E2FSPROGS_IGNORE_CVES += CVE-2022-1304 + # Use libblkid and libuuid from util-linux for host and target packages. # This prevents overriding them with e2fsprogs' ones, which may cause # problems for other packages. diff --git a/package/e2tools/e2tools.hash b/package/e2tools/e2tools.hash index a109ff1bda8..14be7dbd960 100644 --- a/package/e2tools/e2tools.hash +++ b/package/e2tools/e2tools.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1d06ca71f01483ad6d9a514e31466e7d2357b3465de2813d667a8b2f9638544e e2tools-0.0.16.4.tar.gz -sha256 0e79fd282723e1eb3f7381d41233a83ed20cf3e8c83aa53e6847bf7ffe781583 COPYING +sha256 1d06ca71f01483ad6d9a514e31466e7d2357b3465de2813d667a8b2f9638544e e2tools-0.0.16.4.tar.gz +sha256 0e79fd282723e1eb3f7381d41233a83ed20cf3e8c83aa53e6847bf7ffe781583 COPYING diff --git a/package/earlyoom/0001-main.c-fix-build-with-kernel-4.3.patch b/package/earlyoom/0001-main.c-fix-build-with-kernel-4.3.patch new file mode 100644 index 00000000000..8233800cd6d --- /dev/null +++ b/package/earlyoom/0001-main.c-fix-build-with-kernel-4.3.patch @@ -0,0 +1,45 @@ +From 499e81bfcdd9379bf4619a7c3ad85ed7f2b1dca5 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 28 Jul 2022 10:05:18 +0200 +Subject: [PATCH] main.c: fix build with kernel < 4.3 + +PR_CAP_AMBIENT is only available since kernel 4.3 and +https://github.com/torvalds/linux/commit/58319057b7847667f0c9585b9de0e8932b0fdb08 +resulting in the following build failure since version 1.7 and +https://github.com/rfjakob/earlyoom/commit/9edc5cfc9ad794ed59baec5e6ee8d1060456a315: + +main.c: In function 'main': +main.c:119:11: error: 'PR_CAP_AMBIENT' undeclared (first use in this function) + prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_CLEAR_ALL, 0, 0, 0); + ^ + +Fixes: + - http://autobuild.buildroot.org/results/5a0ad7e1f6de3c37e40c37d8f583fc699a457753 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/rfjakob/earlyoom/pull/276] +--- + main.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/main.c b/main.c +index c068c7c..99ca9e2 100644 +--- a/main.c ++++ b/main.c +@@ -115,11 +115,13 @@ int main(int argc, char* argv[]) + fatal(4, "Could not cd to /proc: %s", strerror(errno)); + } + ++#ifdef PR_CAP_AMBIENT + // When systemd starts a daemon with capabilities, it uses ambient + // capabilities to do so. If not dropped, the capabilities can spread + // to any child process. This is usually not necessary and its a good + // idea to drop them if not needed. + prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_CLEAR_ALL, 0, 0, 0); ++#endif + + meminfo_t m = parse_meminfo(); + +-- +2.35.1 + diff --git a/package/earlyoom/S02earlyoom b/package/earlyoom/S02earlyoom index c02495af90e..ac1734109ef 100644 --- a/package/earlyoom/S02earlyoom +++ b/package/earlyoom/S02earlyoom @@ -8,8 +8,8 @@ EARLYOOM_ARGS="" [ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" start() { - printf() 'Starting %s: ' "$DAEMON" - start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/bin/$DAEMON" \ + printf 'Starting %s: ' "$DAEMON" + start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ -- $EARLYOOM_ARGS status=$? if [ "$status" -eq 0 ]; then diff --git a/package/earlyoom/earlyoom.hash b/package/earlyoom/earlyoom.hash index ab91383ee47..207f0e15ff9 100644 --- a/package/earlyoom/earlyoom.hash +++ b/package/earlyoom/earlyoom.hash @@ -1,4 +1,4 @@ # locally calculated -sha256 227234cf9e77831c21c748bd361e1a7c415e158b96034eacd59e70586779bb6c earlyoom-1.6.2.tar.gz +sha256 ebda1279a813d9b0f7860ce5029ccf5ea9f8868be070f2eaf40f90f2e64b6414 earlyoom-1.7.tar.gz # License files, locally calculated sha256 e730b3ec729de46d987ae73f30ed337e4cbe832f09205330acfa71848c6e0087 LICENSE diff --git a/package/earlyoom/earlyoom.mk b/package/earlyoom/earlyoom.mk index d1cf9d4de1c..808b9c49fa3 100644 --- a/package/earlyoom/earlyoom.mk +++ b/package/earlyoom/earlyoom.mk @@ -4,14 +4,14 @@ # ################################################################################ -EARLYOOM_VERSION = 1.6.2 +EARLYOOM_VERSION = 1.7 EARLYOOM_SITE = $(call github,rfjakob,earlyoom,v$(EARLYOOM_VERSION)) EARLYOOM_LICENSE = MIT EARLYOOM_LICENSE_FILES = LICENSE EARLYOOM_BUILD_TARGETS = earlyoom.service earlyoom EARLYOOM_INSTALL_TARGETS = install-default install-bin -EARLYOOM_CFLAGS = '$(TARGET_CFLAGS) -std=gnu99 -DVERSION=\"1.6\"' +EARLYOOM_CFLAGS = '$(TARGET_CFLAGS) -std=gnu99 -DVERSION=\"$(EARLYOOM_VERSION)\"' EARLYOOM_MAKE_OPTS = \ $(TARGET_CONFIGURE_OPTS) \ diff --git a/package/easy-rsa/easy-rsa.hash b/package/easy-rsa/easy-rsa.hash index e363e570dfc..5be651bde04 100644 --- a/package/easy-rsa/easy-rsa.hash +++ b/package/easy-rsa/easy-rsa.hash @@ -1,6 +1,6 @@ # Locally computed: (after verifying gpg sig) -sha512 fd2cde4725cffd60c6af1b6aeaff0dbf15f31f0f322c9df75c22838e2297ba9dc3bba610d956464c8227bd74b3e63840e2a3da41fbc5ee1c79c1e7f5350adc94 EasyRSA-3.0.8.tgz +sha512 8c8d1f4baf90475d4cce334d116b7f12b82687157796b25560600b5098769226ae2f60f02982c75266b625d66b465360ffa815260ad44850923e3fbc9ba8540a EasyRSA-3.1.1.tgz # Hash for license files sha256 7c4a4fc71745d93a87278801f1bca555562ca23f21e18293add64b9e6f6b7bf1 COPYING.md -sha256 640d90f6ee401241ff62834d0d1b33f83049e99b8bfdfa04ed1b0a1635dde3e7 gpl-2.0.txt +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 gpl-2.0.txt diff --git a/package/easy-rsa/easy-rsa.mk b/package/easy-rsa/easy-rsa.mk index 4ec011e179c..4ea45506dd2 100644 --- a/package/easy-rsa/easy-rsa.mk +++ b/package/easy-rsa/easy-rsa.mk @@ -4,7 +4,7 @@ # ################################################################################ -EASY_RSA_VERSION = 3.0.8 +EASY_RSA_VERSION = 3.1.1 EASY_RSA_SOURCE = EasyRSA-$(EASY_RSA_VERSION).tgz EASY_RSA_SITE = https://github.com/OpenVPN/easy-rsa/releases/download/v$(EASY_RSA_VERSION) EASY_RSA_LICENSE = GPL-2.0 diff --git a/package/ecryptfs-utils/ecryptfs-utils.hash b/package/ecryptfs-utils/ecryptfs-utils.hash index 8a0b111e5c4..7d83e744474 100644 --- a/package/ecryptfs-utils/ecryptfs-utils.hash +++ b/package/ecryptfs-utils/ecryptfs-utils.hash @@ -1,5 +1,5 @@ # From https://launchpad.net/ecryptfs/trunk/111/+download/ecryptfs-utils_111.orig.tar.gz/+md5 -md5 83513228984f671930752c3518cac6fd ecryptfs-utils_111.orig.tar.gz +md5 83513228984f671930752c3518cac6fd ecryptfs-utils_111.orig.tar.gz # Locally computed -sha256 112cb3e37e81a1ecd8e39516725dec0ce55c5f3df6284e0f4cc0f118750a987f ecryptfs-utils_111.orig.tar.gz -sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING +sha256 112cb3e37e81a1ecd8e39516725dec0ce55c5f3df6284e0f4cc0f118750a987f ecryptfs-utils_111.orig.tar.gz +sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING diff --git a/package/ecryptfs-utils/ecryptfs-utils.mk b/package/ecryptfs-utils/ecryptfs-utils.mk index f087e81a424..6eb3add98b8 100644 --- a/package/ecryptfs-utils/ecryptfs-utils.mk +++ b/package/ecryptfs-utils/ecryptfs-utils.mk @@ -11,14 +11,19 @@ ECRYPTFS_UTILS_LICENSE = GPL-2.0+ ECRYPTFS_UTILS_LICENSE_FILES = COPYING ECRYPTFS_UTILS_CPE_ID_VENDOR = ecryptfs -ECRYPTFS_UTILS_DEPENDENCIES = keyutils libnss host-intltool +ECRYPTFS_UTILS_DEPENDENCIES = host-pkgconf keyutils libnss host-intltool ECRYPTFS_UTILS_CONF_OPTS = --disable-pywrap -#Needed for build system to find pk11func.h and libnss3.so -ECRYPTFS_UTILS_CONF_ENV = \ - ac_cv_path_POD2MAN=true \ - NSS_CFLAGS="-I$(STAGING_DIR)/usr/include/nss -I$(STAGING_DIR)/usr/include/nspr" \ - NSS_LIBS="-lnss3" +ECRYPTFS_UTILS_CONF_ENV = ac_cv_path_POD2MAN=true + +ifeq ($(BR2_PACKAGE_LIBGPGME),y) +ECRYPTFS_UTILS_CONF_OPTS += \ + --enable-gpg \ + --with-gpgme-prefix=$(STAGING_DIR)/usr +ECRYPTFS_UTILS_DEPENDENCIES += libgpgme +else +ECRYPTFS_UTILS_CONF_OPTS += --disable-gpg +endif ifeq ($(BR2_PACKAGE_LINUX_PAM),y) ECRYPTFS_UTILS_CONF_OPTS += --enable-pam @@ -30,6 +35,14 @@ endif ifeq ($(BR2_PACKAGE_OPENSSL),y) ECRYPTFS_UTILS_CONF_OPTS += --enable-openssl ECRYPTFS_UTILS_DEPENDENCIES += openssl + +ifeq ($(BR2_PACKAGE_PKCS11_HELPER),y) +ECRYPTFS_UTILS_CONF_OPTS += --enable-pkcs11-helper +ECRYPTFS_UTILS_DEPENDENCIES += pkcs11-helper +else +ECRYPTFS_UTILS_CONF_OPTS += --disable-pkcs11-helper +endif + else ECRYPTFS_UTILS_CONF_OPTS += --disable-openssl endif diff --git a/package/ed/ed.hash b/package/ed/ed.hash index 90d467d1f3f..36f9b9c1e4c 100644 --- a/package/ed/ed.hash +++ b/package/ed/ed.hash @@ -1,4 +1,4 @@ -# From https://lists.gnu.org/archive/html/bug-ed/2021-01/msg00000.html -sha256 71de39883c25b6fab44add80635382a10c9bf154515b94729f4a6529ddcc5e54 ed-1.17.tar.lz +# From https://lists.gnu.org/archive/html/bug-ed/2022-02/msg00000.html +sha256 aca8efad9800c587724a20b97aa8fc47e6b5a47df81606feaba831b074462b4f ed-1.18.tar.lz # Locally calculated -sha256 f03a12bef9dfb7281864a0dd965166d4f4ec7a66633df2bc72fa4363e57de02c COPYING +sha256 3d77c1a58fbde5ddba612d1fe09965e20a3804953eca12e8c1892298bb8a5eef COPYING diff --git a/package/ed/ed.mk b/package/ed/ed.mk index 975cf3be104..645cfb76968 100644 --- a/package/ed/ed.mk +++ b/package/ed/ed.mk @@ -4,10 +4,10 @@ # ################################################################################ -ED_VERSION = 1.17 +ED_VERSION = 1.18 ED_SITE = $(BR2_GNU_MIRROR)/ed ED_SOURCE = ed-$(ED_VERSION).tar.lz -ED_LICENSE = GPL-3.0+ +ED_LICENSE = GPL-2.0+ ED_LICENSE_FILES = COPYING ED_CPE_ID_VENDOR = gnu diff --git a/package/edid-decode/Config.in b/package/edid-decode/Config.in index ddf1942c68a..5ebecd73304 100644 --- a/package/edid-decode/Config.in +++ b/package/edid-decode/Config.in @@ -8,5 +8,5 @@ config BR2_PACKAGE_EDID_DECODE https://git.linuxtv.org/edid-decode.git/ comment "edid-decode needs a toolchain w/ C++, gcc >= 4.7" - depends on !!BR2_INSTALL_LIBSTDCPP || \ + depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 diff --git a/package/edid-decode/edid-decode.mk b/package/edid-decode/edid-decode.mk index 7e463c02b1f..f2fcde6e342 100644 --- a/package/edid-decode/edid-decode.mk +++ b/package/edid-decode/edid-decode.mk @@ -5,7 +5,8 @@ ################################################################################ EDID_DECODE_VERSION = 188950472c19492547e298b27f9da0d72cf826df -EDID_DECODE_SITE = git://linuxtv.org/edid-decode.git +EDID_DECODE_SITE = https://git.linuxtv.org/edid-decode.git +EDID_DECODE_SITE_METHOD = git EDID_DECODE_LICENSE = MIT EDID_DECODE_LICENSE_FILES = LICENSE diff --git a/package/edk2-non-osi/Config.in b/package/edk2-non-osi/Config.in new file mode 100644 index 00000000000..6c540c8a408 --- /dev/null +++ b/package/edk2-non-osi/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_EDK2_NON_OSI + bool + help + EDK2 description files for additional platforms, not + compatible with the normal licensing requirements. + The main EDK2 bootloader package will depend on these + description files while building firmware for some platforms. + + Only the Marvell Armada files are copied at this point. + + https://github.com/tianocore/edk2-non-osi diff --git a/package/edk2-non-osi/edk2-non-osi.hash b/package/edk2-non-osi/edk2-non-osi.hash new file mode 100644 index 00000000000..7941df1f2fc --- /dev/null +++ b/package/edk2-non-osi/edk2-non-osi.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 7d27b1e6d90a26f3585ab58a2e051da69eae1b97754d3e2d80a5372879ae2501 edk2-non-osi-61662e8596dd9a64e3372f9a3ba6622d2628607c.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 new file mode 100644 index 00000000000..0abb3770c7d --- /dev/null +++ b/package/edk2-non-osi/edk2-non-osi.mk @@ -0,0 +1,27 @@ +################################################################################ +# +# edk2-non-osi +# +################################################################################ + +# Keep in sync with latest commit as of the release date for boot/edk2 +EDK2_NON_OSI_VERSION = 61662e8596dd9a64e3372f9a3ba6622d2628607c +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 + +# Copy Marvell Armada files +EDK2_NON_OSI_LICENSE += BSD-2-Clause-Patent (Marvell Armada) +EDK2_NON_OSI_LICENSE_FILES += Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0McBin.inf +EDK2_NON_OSI_DIRS += Silicon/Marvell/Armada7k8k/DeviceTree + +# There is nothing to build for edk2-non-osi. All we need to do is to copy +# the selected description files to staging, for other packages to build with. +define EDK2_NON_OSI_INSTALL_STAGING_CMDS + $(foreach d,$(EDK2_NON_OSI_DIRS),\ + mkdir -p $(STAGING_DIR)/usr/share/edk2-non-osi/$(d) && \ + cp -rf $(@D)/$(d)/* $(STAGING_DIR)/usr/share/edk2-non-osi/$(d)/ + ) +endef + +$(eval $(generic-package)) diff --git a/package/edk2-platforms/edk2-platforms.hash b/package/edk2-platforms/edk2-platforms.hash index 30ae235078d..405a09241cd 100644 --- a/package/edk2-platforms/edk2-platforms.hash +++ b/package/edk2-platforms/edk2-platforms.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 dfdc34fea86e5037a3a6cbd2a83b1f655f16b4c9ab4f5ff9da91e45a358c9a14 edk2-platforms-db922e1253cb6f1fc456805bc42fb7d401eed5c2.tar.gz +sha256 1ed3f369a2743cc5a5fa4804d0af154e37b578f4e68c2e7f69734701a9b874db edk2-platforms-3c3b1168017073c2bb2d97336c5929ebae805be1.tar.gz sha256 50ce20c9cfdb0e19ee34fe0a51fc0afe961f743697b068359ab2f862b494df80 License.txt diff --git a/package/edk2-platforms/edk2-platforms.mk b/package/edk2-platforms/edk2-platforms.mk index 430791ae3e0..20a058baff7 100644 --- a/package/edk2-platforms/edk2-platforms.mk +++ b/package/edk2-platforms/edk2-platforms.mk @@ -5,10 +5,10 @@ ################################################################################ # Keep in sync with latest commit as of the release date for boot/edk2 -EDK2_PLATFORMS_VERSION = db922e1253cb6f1fc456805bc42fb7d401eed5c2 +EDK2_PLATFORMS_VERSION = 3c3b1168017073c2bb2d97336c5929ebae805be1 EDK2_PLATFORMS_SITE = $(call github,tianocore,edk2-platforms,$(EDK2_PLATFORMS_VERSION)) -EDK2_PLATFORMS_LICENSE = BSD-2-Clause -EDK2_PLATFORMS_LICENSE_FILE = License.txt +EDK2_PLATFORMS_LICENSE = BSD-2-Clause-Patent +EDK2_PLATFORMS_LICENSE_FILES = License.txt EDK2_PLATFORMS_INSTALL_TARGET = NO EDK2_PLATFORMS_INSTALL_STAGING = YES diff --git a/package/efibootmgr/0001-Allow-build-with-uClibc.patch b/package/efibootmgr/0001-Allow-build-with-uClibc.patch deleted file mode 100644 index fd29233dc3c..00000000000 --- a/package/efibootmgr/0001-Allow-build-with-uClibc.patch +++ /dev/null @@ -1,40 +0,0 @@ -From bbfcc60497c326576bb23cb01d90115ef3cf6947 Mon Sep 17 00:00:00 2001 -From: Andy Shevchenko -Date: Fri, 25 Nov 2016 20:26:52 +0200 -Subject: [PATCH] Remove unneeded include - -This fixes the build with uClibc. - -Signed-off-by: Andy Shevchenko ---- - src/efibootdump.c | 1 - - src/eficonman.c | 1 - - 2 files changed, 2 deletions(-) - -diff --git a/src/efibootdump.c b/src/efibootdump.c -index 6ff8360..7c5a1c5 100644 ---- a/src/efibootdump.c -+++ b/src/efibootdump.c -@@ -19,7 +19,6 @@ - #include - #include - #include --#include - #include - - #include "error.h" -diff --git a/src/eficonman.c b/src/eficonman.c -index 2c2be38..9bfae79 100644 ---- a/src/eficonman.c -+++ b/src/eficonman.c -@@ -17,7 +17,6 @@ - #include - #include - #include --#include - #include - - #define _(String) gettext (String) --- -2.10.2 - diff --git a/package/efibootmgr/0002-remove-extra-decl.patch b/package/efibootmgr/0002-remove-extra-decl.patch deleted file mode 100644 index f838d50a201..00000000000 --- a/package/efibootmgr/0002-remove-extra-decl.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 99b578501643377e0b1994b2a068b790d189d5ad Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Wed, 13 Jun 2018 09:41:01 -0400 -Subject: [PATCH] remove extra decl - -Downloaded from upstream commit -https://github.com/rhboot/efibootmgr/commit/99b578501643377e0b1994b2a068b790d189d5ad - -Signed-off-by: Peter Jones -Signed-off-by: Bernd Kuhls ---- - src/efibootmgr.c | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/src/efibootmgr.c b/src/efibootmgr.c -index de38f01..4e1a680 100644 ---- a/src/efibootmgr.c -+++ b/src/efibootmgr.c -@@ -1536,9 +1536,6 @@ parse_opts(int argc, char **argv) - "invalid numeric value %s\n", - optarg); - } -- /* XXX efivar-36 accidentally doesn't have a public -- * header for this */ -- extern int efi_set_verbose(int verbosity, FILE *errlog); - efi_set_verbose(opts.verbose - 2, stderr); - break; - case 'V': diff --git a/package/efibootmgr/Config.in b/package/efibootmgr/Config.in index 98ff71c9966..5800e6c1431 100644 --- a/package/efibootmgr/Config.in +++ b/package/efibootmgr/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_EFIBOOTMGR bool "efibootmgr" depends on BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS # efivar depends on !BR2_STATIC_LIBS # efivar + 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 @@ -15,9 +16,9 @@ config BR2_PACKAGE_EFIBOOTMGR https://github.com/rhboot/efibootmgr -comment "efibootmgr needs a toolchain w/ dynamic library, headers >= 3.12, gcc >= 4.9" +comment "efibootmgr needs a toolchain w/ dynamic library, threads, headers >= 3.12, gcc >= 4.9" depends on BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS - depends on BR2_STATIC_LIBS || \ + 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/efibootmgr/efibootmgr.hash b/package/efibootmgr/efibootmgr.hash index fdbc9a2732a..71a98263312 100644 --- a/package/efibootmgr/efibootmgr.hash +++ b/package/efibootmgr/efibootmgr.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 22a95ebe0d5c9fb2915b3a100450f8f37484d1dbb8b296f55b343cc84f10397d efibootmgr-17.tar.gz +sha256 442867d12f8525034a404fc8af3036dba8e1fc970998af2486c3b940dfad0874 efibootmgr-18.tar.gz sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING diff --git a/package/efibootmgr/efibootmgr.mk b/package/efibootmgr/efibootmgr.mk index 7e09b5f6591..672a93c2821 100644 --- a/package/efibootmgr/efibootmgr.mk +++ b/package/efibootmgr/efibootmgr.mk @@ -4,7 +4,7 @@ # ################################################################################ -EFIBOOTMGR_VERSION = 17 +EFIBOOTMGR_VERSION = 18 EFIBOOTMGR_SITE = $(call github,rhboot,efibootmgr,$(EFIBOOTMGR_VERSION)) EFIBOOTMGR_LICENSE = GPL-2.0+ EFIBOOTMGR_LICENSE_FILES = COPYING diff --git a/package/efivar/0001-Allow-build-with-uClibc.patch b/package/efivar/0001-Allow-build-with-uClibc.patch index 0db99557602..0da80f26d2e 100644 --- a/package/efivar/0001-Allow-build-with-uClibc.patch +++ b/package/efivar/0001-Allow-build-with-uClibc.patch @@ -1,4 +1,4 @@ -From f1f24eb486c4376066884bae3c31f1c455a79836 Mon Sep 17 00:00:00 2001 +From bfd9cd9e603ef0d0e593d4432048bffc2acfeb7c Mon Sep 17 00:00:00 2001 From: Andy Shevchenko Date: Fri, 25 Nov 2016 19:42:27 +0200 Subject: [PATCH] Allow build with uClibc @@ -6,15 +6,17 @@ Subject: [PATCH] Allow build with uClibc Basically this replaces type definitions in . Signed-off-by: Andy Shevchenko +[Erico: rebase to 38] +Signed-off-by: Erico Nunes --- src/export.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/export.c b/src/export.c -index 8321bd3..ef36add 100644 +index db5e637..21c5617 100644 --- a/src/export.c +++ b/src/export.c -@@ -23,10 +23,16 @@ +@@ -9,10 +9,16 @@ #include #include #include @@ -29,9 +31,9 @@ index 8321bd3..ef36add 100644 +#include +#endif + - #define EFIVAR_MAGIC 0xf3df1597 + #define EFIVAR_MAGIC 0xf3df1597u #define ATTRS_UNSET 0xa5a5a5a5a5a5a5a5 -- -2.20.1 +2.37.3 diff --git a/package/efivar/0002-dp.h-make-format_guid-handle-misaligned-guid-pointer.patch b/package/efivar/0002-dp.h-make-format_guid-handle-misaligned-guid-pointer.patch deleted file mode 100644 index 37fd39a127f..00000000000 --- a/package/efivar/0002-dp.h-make-format_guid-handle-misaligned-guid-pointer.patch +++ /dev/null @@ -1,62 +0,0 @@ -From b98ba8921010d03f46704a476c69861515deb1ca Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Mon, 7 Jan 2019 10:30:59 -0500 -Subject: [PATCH] dp.h: make format_guid() handle misaligned guid pointers - safely. - -GCC 9 adds -Werror=address-of-packed-member, which causes us to see the -build error reported at - https://bugzilla.opensuse.org/show_bug.cgi?id=1120862 . - -That bug report shows us the following: - -In file included from dp.c:26: -dp.h: In function 'format_vendor_helper': -dp.h:120:37: error: taking address of packed member of 'struct ' may result in an unaligned pointer value [-Werror=address-of-packed-member] - 120 | format_guid(buf, size, off, label, &dp->hw_vendor.vendor_guid); - | ^~~~~~~~~~~~~~~~~~~~~~~~~~ -dp.h:74:25: note: in definition of macro 'format_guid' - 74 | _rc = efi_guid_to_str(guid, &_guidstr); \ - | ^~~~ -cc1: all warnings being treated as errors - -This patch makes format_guid() use a local variable as a bounce buffer -in the case that the guid we're passed is aligned as chaotic neutral. - -Note that this only fixes this instance and there may be others that bz -didn't show because it exited too soon, and I don't have a gcc 9 build -in front of me right now. - -Signed-off-by: Peter Jones -[james.hilliard1@gmail.com: backport from upstream commit -b98ba8921010d03f46704a476c69861515deb1ca] -Signed-off-by: James Hilliard ---- - src/dp.h | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/src/dp.h b/src/dp.h -index aa4e390..20cb608 100644 ---- a/src/dp.h -+++ b/src/dp.h -@@ -70,8 +70,15 @@ - #define format_guid(buf, size, off, dp_type, guid) ({ \ - int _rc; \ - char *_guidstr = NULL; \ -- \ -- _rc = efi_guid_to_str(guid, &_guidstr); \ -+ efi_guid_t _guid; \ -+ const efi_guid_t * const _guid_p = \ -+ likely(__alignof__(guid) == sizeof(guid)) \ -+ ? guid \ -+ : &_guid; \ -+ \ -+ if (unlikely(__alignof__(guid) == sizeof(guid))) \ -+ memmove(&_guid, guid, sizeof(_guid)); \ -+ _rc = efi_guid_to_str(_guid_p, &_guidstr); \ - if (_rc < 0) { \ - efi_error("could not build %s GUID DP string", \ - dp_type); \ --- -2.20.1 - diff --git a/package/efivar/0002-gcc.specs-drop-Werror.patch b/package/efivar/0002-gcc.specs-drop-Werror.patch new file mode 100644 index 00000000000..a25b8449065 --- /dev/null +++ b/package/efivar/0002-gcc.specs-drop-Werror.patch @@ -0,0 +1,46 @@ +From a1d469753528a98aec971377a526619da5054b20 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 22 Mar 2021 07:52:34 +0100 +Subject: [PATCH] gcc.specs: drop -Werror + +Build with -Werror raises the following build failure with gcc 10: + +/home/buildroot/autobuild/run/instance-1/output-1/host/bin/aarch64-none-linux-gnu-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O2 -I/home/buildroot/autobuild/run/instance-1/output-1/build/efivar-37/src/include/ -specs=/home/buildroot/autobuild/run/instance-1/output-1/build/efivar-37/gcc.specs -L. -fPIC -Wl,-z,muldefs -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -o efivar efivar.c -lefivar -ldl +In file included from efivar.h:28, + from efivar.c:40: +In function 'text_to_guid', + inlined from 'parse_name.constprop' at efivar.c:157:8: +guid.h:106:2: error: 'strncpy' output may be truncated copying 8 bytes from a string of length 38 [-Werror=stringop-truncation] + 106 | strncpy(eightbytes, text, 8); + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ +cc1: all warnings being treated as errors + +Fixes: + - http://autobuild.buildroot.org/results/fcba72d359f4128515560e9105384cd4deff5043 + +Signed-off-by: Fabrice Fontaine +[Upstream status: not upstreamable as Makefiles were reworked and a new +ERRORS parameter was added: +https://github.com/rhboot/efivar/commit/998f617cec92d526e1fadb745673ceef63fa1483] +[Erico: rebase to 38] +Signed-off-by: Erico Nunes +--- + src/include/defaults.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/include/defaults.mk b/src/include/defaults.mk +index 632b155..2a9537a 100644 +--- a/src/include/defaults.mk ++++ b/src/include/defaults.mk +@@ -29,7 +29,7 @@ WARNINGS_GCC ?= + WARNINGS_CCC_ANALYZER ?= $(WARNINGS_GCC) + WARNINGS ?= -Wall -Wextra $(call family,WARNINGS) + ERRORS_GCC ?= +-ERRORS ?= -Werror $(call family,ERRORS) ++ERRORS ?= $(call family,ERRORS) + CPPFLAGS ?= + override _CPPFLAGS := $(CPPFLAGS) + override CPPFLAGS = $(_CPPFLAGS) -DLIBEFIVAR_VERSION=$(VERSION) \ +-- +2.37.3 + diff --git a/package/efivar/0003-Fix-all-the-places-Werror-address-of-packed-member-c.patch b/package/efivar/0003-Fix-all-the-places-Werror-address-of-packed-member-c.patch deleted file mode 100644 index 52db443b7e6..00000000000 --- a/package/efivar/0003-Fix-all-the-places-Werror-address-of-packed-member-c.patch +++ /dev/null @@ -1,174 +0,0 @@ -From c3c553db85ff10890209d0fe48fb4856ad68e4e0 Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Thu, 21 Feb 2019 15:20:12 -0500 -Subject: [PATCH] Fix all the places -Werror=address-of-packed-member catches. - -This gets rid of all the places GCC 9's -Werror=address-of-packed-member -flags as problematic. - -Fixes github issue #123 - -Signed-off-by: Peter Jones -[james.hilliard1@gmail.com: backport from upstream commit -c3c553db85ff10890209d0fe48fb4856ad68e4e0] -Signed-off-by: James Hilliard ---- - src/dp-message.c | 6 ++++-- - src/dp.h | 12 ++++-------- - src/guid.c | 2 +- - src/include/efivar/efivar.h | 2 +- - src/ucs2.h | 27 +++++++++++++++++++-------- - 5 files changed, 29 insertions(+), 20 deletions(-) - -diff --git a/src/dp-message.c b/src/dp-message.c -index 3724e5f..9f96466 100644 ---- a/src/dp-message.c -+++ b/src/dp-message.c -@@ -620,11 +620,13 @@ _format_message_dn(char *buf, size_t size, const_efidp dp) - ) / sizeof(efi_ip_addr_t); - format(buf, size, off, "Dns", "Dns("); - for (int i=0; i < end; i++) { -- const efi_ip_addr_t *addr = &dp->dns.addrs[i]; -+ efi_ip_addr_t addr; -+ -+ memcpy(&addr, &dp->dns.addrs[i], sizeof(addr)); - if (i != 0) - format(buf, size, off, "Dns", ","); - format_ip_addr(buf, size, off, "Dns", -- dp->dns.is_ipv6, addr); -+ dp->dns.is_ipv6, &addr); - } - format(buf, size, off, "Dns", ")"); - break; -diff --git a/src/dp.h b/src/dp.h -index 20cb608..1f921d5 100644 ---- a/src/dp.h -+++ b/src/dp.h -@@ -71,13 +71,9 @@ - int _rc; \ - char *_guidstr = NULL; \ - efi_guid_t _guid; \ -- const efi_guid_t * const _guid_p = \ -- likely(__alignof__(guid) == sizeof(guid)) \ -- ? guid \ -- : &_guid; \ -- \ -- if (unlikely(__alignof__(guid) == sizeof(guid))) \ -- memmove(&_guid, guid, sizeof(_guid)); \ -+ const efi_guid_t * const _guid_p = &_guid; \ -+ \ -+ memmove(&_guid, guid, sizeof(_guid)); \ - _rc = efi_guid_to_str(_guid_p, &_guidstr); \ - if (_rc < 0) { \ - efi_error("could not build %s GUID DP string", \ -@@ -86,7 +82,7 @@ - _guidstr = onstack(_guidstr, \ - strlen(_guidstr)+1); \ - _rc = format(buf, size, off, dp_type, "%s", \ -- _guidstr); \ -+ _guidstr); \ - } \ - _rc; \ - }) -diff --git a/src/guid.c b/src/guid.c -index 306c9ff..3156b3b 100644 ---- a/src/guid.c -+++ b/src/guid.c -@@ -31,7 +31,7 @@ - extern const efi_guid_t efi_guid_zero; - - int NONNULL(1, 2) PUBLIC --efi_guid_cmp(const efi_guid_t *a, const efi_guid_t *b) -+efi_guid_cmp(const void * const a, const void * const b) - { - return memcmp(a, b, sizeof (efi_guid_t)); - } -diff --git a/src/include/efivar/efivar.h b/src/include/efivar/efivar.h -index 316891c..ad6449d 100644 ---- a/src/include/efivar/efivar.h -+++ b/src/include/efivar/efivar.h -@@ -128,7 +128,7 @@ extern int efi_symbol_to_guid(const char *symbol, efi_guid_t *guid) - - extern int efi_guid_is_zero(const efi_guid_t *guid); - extern int efi_guid_is_empty(const efi_guid_t *guid); --extern int efi_guid_cmp(const efi_guid_t *a, const efi_guid_t *b); -+extern int efi_guid_cmp(const void * const a, const void * const b); - - /* import / export functions */ - typedef struct efi_variable efi_variable_t; -diff --git a/src/ucs2.h b/src/ucs2.h -index dbb5900..edd8367 100644 ---- a/src/ucs2.h -+++ b/src/ucs2.h -@@ -23,16 +23,21 @@ - (((val) & ((mask) << (shift))) >> (shift)) - - static inline size_t UNUSED --ucs2len(const uint16_t * const s, ssize_t limit) -+ucs2len(const void *vs, ssize_t limit) - { - ssize_t i; -- for (i = 0; i < (limit >= 0 ? limit : i+1) && s[i] != (uint16_t)0; i++) -+ const uint16_t *s = vs; -+ const uint8_t *s8 = vs; -+ -+ for (i = 0; -+ i < (limit >= 0 ? limit : i+1) && s8[0] != 0 && s8[1] != 0; -+ i++, s8 += 2, s++) - ; - return i; - } - - static inline size_t UNUSED --ucs2size(const uint16_t * const s, ssize_t limit) -+ucs2size(const void *s, ssize_t limit) - { - size_t rc = ucs2len(s, limit); - rc *= sizeof (uint16_t); -@@ -69,10 +74,11 @@ utf8size(uint8_t *s, ssize_t limit) - } - - static inline unsigned char * UNUSED --ucs2_to_utf8(const uint16_t * const chars, ssize_t limit) -+ucs2_to_utf8(const void * const voidchars, ssize_t limit) - { - ssize_t i, j; - unsigned char *ret; -+ const uint16_t * const chars = voidchars; - - if (limit < 0) - limit = ucs2len(chars, -1); -@@ -124,10 +130,12 @@ ucs2_to_utf8(const uint16_t * const chars, ssize_t limit) - } - - static inline ssize_t UNUSED NONNULL(4) --utf8_to_ucs2(uint16_t *ucs2, ssize_t size, int terminate, uint8_t *utf8) -+utf8_to_ucs2(void *ucs2void, ssize_t size, int terminate, uint8_t *utf8) - { - ssize_t req; - ssize_t i, j; -+ uint16_t *ucs2 = ucs2void; -+ uint16_t val16; - - if (!ucs2 && size > 0) { - errno = EINVAL; -@@ -162,10 +170,13 @@ utf8_to_ucs2(uint16_t *ucs2, ssize_t size, int terminate, uint8_t *utf8) - val = utf8[i] & 0x7f; - i += 1; - } -- ucs2[j] = val; -+ val16 = val; -+ ucs2[j] = val16; -+ } -+ if (terminate) { -+ val16 = 0; -+ ucs2[j++] = val16; - } -- if (terminate) -- ucs2[j++] = (uint16_t)0; - return j; - }; - --- -2.20.1 - diff --git a/package/efivar/0003-efivar-isolate-makeguids-host-tool-build.patch b/package/efivar/0003-efivar-isolate-makeguids-host-tool-build.patch new file mode 100644 index 00000000000..f136bf2cd3a --- /dev/null +++ b/package/efivar/0003-efivar-isolate-makeguids-host-tool-build.patch @@ -0,0 +1,48 @@ +From b069a48abd62a669851b9c3b501d579748dab0fd Mon Sep 17 00:00:00 2001 +From: Erico Nunes +Date: Mon, 3 Oct 2022 18:16:55 +0200 +Subject: [PATCH] efivar: isolate makeguids host tool build + +efivar build includes a 'makeguids' host tool which is normally built by +distributions during the package build step. This is unfortunately not +written with cross-compilation in mind, since it needs to build for the +host architecture, including the build of object files which it then +assumes can be linked into the target library. +To make the packaging process simpler for a cross-compilation system +like Buildroot, separate the 'makeguids' tool build to an explicit make +target and remove target build dependencies from it. +This way, Buildroot can build the tool separately in a host build step +and the target build step can then be straightforward. + +Signed-off-by: Erico Nunes +--- + src/Makefile | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/src/Makefile b/src/Makefile +index 0e423c4..82c59c2 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -68,7 +68,6 @@ makeguids : LDFLAGS=$(HOST_LDFLAGS) + makeguids : CCLDFLAGS=$(HOST_CCLDFLAGS) + makeguids : $(MAKEGUIDS_OBJECTS) + +-$(MAKEGUIDS_OUTPUT) : makeguids + $(MAKEGUIDS_OUTPUT) : guids.txt + @set -e ; \ + missing=no ; \ +@@ -81,9 +80,9 @@ $(MAKEGUIDS_OUTPUT) : guids.txt + if [ "$${missing}" != "no" ]; then \ + exit 1 ; \ + fi +- ./makeguids $(LD_DASH_T) guids.txt guid-symbols.c include/efivar/efivar-guids.h guids.lds ++ makeguids $(LD_DASH_T) guids.txt guid-symbols.c include/efivar/efivar-guids.h guids.lds + +-prep : makeguids $(GENERATED_SOURCES) ++prep : $(GENERATED_SOURCES) + + $(LIBEFIVAR_OBJECTS) $(LIBEFIBOOT_OBJECTS) : prep + +-- +2.37.3 + diff --git a/package/efivar/0004-Fix-another-error-of-Werror-address-of-packed-member.patch b/package/efivar/0004-Fix-another-error-of-Werror-address-of-packed-member.patch deleted file mode 100644 index b103e975a3b..00000000000 --- a/package/efivar/0004-Fix-another-error-of-Werror-address-of-packed-member.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 0dad6d78a7fb5f6c5fb4a1d646040539db6cf865 Mon Sep 17 00:00:00 2001 -From: Chih-Wei Huang -Date: Tue, 26 Feb 2019 18:42:20 +0800 -Subject: [PATCH] Fix another error of -Werror=address-of-packed-member - -Android 9 clang complains: - -external/efivar/src/dp-message.c:367:24: error: taking address of packed member '' of class or structure 'efidp_infiniband' may result in an unaligned pointer value [-Werror,-Waddress-of-packed-member] - (efi_guid_t *)&dp->infiniband.ioc_guid); - ^~~~~~~~~~~~~~~~~~~~~~~ -external/efivar/src/dp.h:76:19: note: expanded from macro 'format_guid' - memmove(&_guid, guid, sizeof(_guid)); \ - ^~~~ -1 error generated. - -Since commit c3c553d the fifth parameter of format_guid() is treated as -a const void *. The casting is unnecessary. - -Signed-off-by: Chih-Wei Huang -[james.hilliard1@gmail.com: backport from upstream commit -0dad6d78a7fb5f6c5fb4a1d646040539db6cf865] -Signed-off-by: James Hilliard ---- - src/dp-media.c | 3 +-- - src/dp-message.c | 2 +- - 2 files changed, 2 insertions(+), 3 deletions(-) - -diff --git a/src/dp-media.c b/src/dp-media.c -index 96a576f..be691c4 100644 ---- a/src/dp-media.c -+++ b/src/dp-media.c -@@ -46,8 +46,7 @@ _format_media_dn(char *buf, size_t size, const_efidp dp) - break; - case EFIDP_HD_SIGNATURE_GUID: - format(buf, size, off, "HD", "GPT,"); -- format_guid(buf, size, off, "HD", -- (efi_guid_t *)dp->hd.signature); -+ format_guid(buf, size, off, "HD", dp->hd.signature); - format(buf, size, off, "HD", - ",0x%"PRIx64",0x%"PRIx64")", - dp->hd.start, dp->hd.size); -diff --git a/src/dp-message.c b/src/dp-message.c -index 9f96466..6b8e907 100644 ---- a/src/dp-message.c -+++ b/src/dp-message.c -@@ -364,7 +364,7 @@ _format_message_dn(char *buf, size_t size, const_efidp dp) - dp->infiniband.port_gid[1], - dp->infiniband.port_gid[0]); - format_guid(buf, size, off, "Infiniband", -- (efi_guid_t *)&dp->infiniband.ioc_guid); -+ &dp->infiniband.ioc_guid); - format(buf, size, off, "Infiniband", - ",%"PRIu64",%"PRIu64")", - dp->infiniband.target_port_id, --- -2.20.1 - diff --git a/package/efivar/0004-efisecdb-fix-build-with-musl-libc.patch b/package/efivar/0004-efisecdb-fix-build-with-musl-libc.patch new file mode 100644 index 00000000000..9815a9d0cfb --- /dev/null +++ b/package/efivar/0004-efisecdb-fix-build-with-musl-libc.patch @@ -0,0 +1,185 @@ +From cece3ffd5be2f8641eb694513f2b73e5eb97ffd3 Mon Sep 17 00:00:00 2001 +From: Natanael Copa +Date: Fri, 28 Jan 2022 12:13:30 +0100 +Subject: [PATCH] efisecdb: fix build with musl libc + +Refactor code to use POSIX atexit(3) instead of the GNU specific +on_exit(3). + +Resolves: #197 +Resolves: #202 +Signed-off-by: Natanael Copa +[Erico: backport from upstream commit +cece3ffd5be2f8641eb694513f2b73e5eb97ffd3] +Signed-off-by: Erico Nunes +--- + src/compiler.h | 2 -- + src/efisecdb.c | 68 +++++++++++++++++++------------------------------- + 2 files changed, 26 insertions(+), 44 deletions(-) + +diff --git a/src/compiler.h b/src/compiler.h +index e2f18f0..d95fb01 100644 +--- a/src/compiler.h ++++ b/src/compiler.h +@@ -7,8 +7,6 @@ + #ifndef COMPILER_H_ + #define COMPILER_H_ + +-#include +- + /* GCC version checking borrowed from glibc. */ + #if defined(__GNUC__) && defined(__GNUC_MINOR__) + # define GNUC_PREREQ(maj,min) \ +diff --git a/src/efisecdb.c b/src/efisecdb.c +index f882373..6bd5ad9 100644 +--- a/src/efisecdb.c ++++ b/src/efisecdb.c +@@ -25,6 +25,10 @@ + extern char *optarg; + extern int optind, opterr, optopt; + ++static efi_secdb_t *secdb = NULL; ++static list_t infiles; ++static list_t actions; ++ + struct hash_param { + char *name; + efi_secdb_type_t algorithm; +@@ -187,12 +191,11 @@ add_action(list_t *list, action_type_t action_type, const efi_guid_t *owner, + } + + static void +-free_actions(int status UNUSED, void *actionsp) ++free_actions(void) + { +- list_t *actions = (list_t *)actionsp; + list_t *pos, *tmp; + +- for_each_action_safe(pos, tmp, actions) { ++ for_each_action_safe(pos, tmp, &actions) { + action_t *action = list_entry(pos, action_t, list); + + list_del(&action->list); +@@ -202,12 +205,11 @@ free_actions(int status UNUSED, void *actionsp) + } + + static void +-free_infiles(int status UNUSED, void *infilesp) ++free_infiles(void) + { +- list_t *infiles = (list_t *)infilesp; + list_t *pos, *tmp; + +- for_each_ptr_safe(pos, tmp, infiles) { ++ for_each_ptr_safe(pos, tmp, &infiles) { + ptrlist_t *entry = list_entry(pos, ptrlist_t, list); + + list_del(&entry->list); +@@ -216,27 +218,12 @@ free_infiles(int status UNUSED, void *infilesp) + } + + static void +-maybe_free_secdb(int status UNUSED, void *voidp) ++maybe_free_secdb(void) + { +- efi_secdb_t **secdbp = (efi_secdb_t **)voidp; +- +- if (secdbp == NULL || *secdbp == NULL) ++ if (secdb == NULL) + return; + +- efi_secdb_free(*secdbp); +-} +- +-static void +-maybe_do_unlink(int status, void *filep) +-{ +- char **file = (char **)filep; +- +- if (status == 0) +- return; +- if (file == NULL || *file == NULL) +- return; +- +- unlink(*file); ++ efi_secdb_free(secdb); + } + + static void +@@ -323,15 +310,6 @@ parse_input_files(list_t *infiles, char **outfile, efi_secdb_t **secdb, + return status; + } + +-/* +- * These need to be static globals so that they're not on main's stack when +- * on_exit() fires. +- */ +-static efi_secdb_t *secdb = NULL; +-static list_t infiles; +-static list_t actions; +-static char *outfile = NULL; +- + int + main(int argc, char *argv[]) + { +@@ -351,6 +329,7 @@ main(int argc, char *argv[]) + bool do_sort_data = false; + bool sort_descending = false; + int status = 0; ++ char *outfile = NULL; + + const char sopts[] = ":aAc:dfg:h:i:Lo:rs:t:v?"; + const struct option lopts[] = { +@@ -376,10 +355,9 @@ main(int argc, char *argv[]) + INIT_LIST_HEAD(&infiles); + INIT_LIST_HEAD(&actions); + +- on_exit(free_actions, &actions); +- on_exit(free_infiles, &infiles); +- on_exit(maybe_free_secdb, &secdb); +- on_exit(maybe_do_unlink, &outfile); ++ atexit(free_actions); ++ atexit(free_infiles); ++ atexit(maybe_free_secdb); + + /* + * parse the command line. +@@ -587,24 +565,30 @@ sort_err: + outfd = open(outfile, flags, 0600); + if (outfd < 0) { + char *tmpoutfile = outfile; +- if (errno == EEXIST) +- outfile = NULL; ++ if (errno != EEXIST) ++ unlink(outfile); + err(1, "could not open \"%s\"", tmpoutfile); + } + + rc = ftruncate(outfd, 0); +- if (rc < 0) ++ if (rc < 0) { ++ unlink(outfile); + err(1, "could not truncate output file \"%s\"", outfile); ++ } + + void *output; + size_t size = 0; + rc = efi_secdb_realize(secdb, &output, &size); +- if (rc < 0) ++ if (rc < 0) { ++ unlink(outfile); + secdb_err(1, "could not realize signature list"); ++ } + + rc = write(outfd, output, size); +- if (rc < 0) ++ if (rc < 0) { ++ unlink(outfile); + err(1, "could not write signature list"); ++ } + + close(outfd); + xfree(output); +-- +2.37.3 + diff --git a/package/efivar/0005-ucs2.h-remove-unused-variable.patch b/package/efivar/0005-ucs2.h-remove-unused-variable.patch deleted file mode 100644 index a814043ce81..00000000000 --- a/package/efivar/0005-ucs2.h-remove-unused-variable.patch +++ /dev/null @@ -1,35 +0,0 @@ -From fdb803402fb32fa6d020bac57a40c7efe4aabb7d Mon Sep 17 00:00:00 2001 -From: Javier Martinez Canillas -Date: Tue, 5 Mar 2019 17:23:24 +0100 -Subject: [PATCH] ucs2.h: remove unused variable - -The const uint16_t pointer is not used since now the two bytes of the -UCS-2 chars are checked to know if is the termination of the string. - -Signed-off-by: Javier Martinez Canillas -Signed-off-by: Peter Korsgaard ---- - src/ucs2.h | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/src/ucs2.h b/src/ucs2.h -index edd8367..e0390c3 100644 ---- a/src/ucs2.h -+++ b/src/ucs2.h -@@ -26,12 +26,11 @@ static inline size_t UNUSED - ucs2len(const void *vs, ssize_t limit) - { - ssize_t i; -- const uint16_t *s = vs; - const uint8_t *s8 = vs; - - for (i = 0; - i < (limit >= 0 ? limit : i+1) && s8[0] != 0 && s8[1] != 0; -- i++, s8 += 2, s++) -+ i++, s8 += 2) - ; - return i; - } --- -2.20.1 - diff --git a/package/efivar/0006-ucs2.h-fix-logic-that-checks-for-UCS-2-string-termin.patch b/package/efivar/0006-ucs2.h-fix-logic-that-checks-for-UCS-2-string-termin.patch deleted file mode 100644 index 00b20332ef6..00000000000 --- a/package/efivar/0006-ucs2.h-fix-logic-that-checks-for-UCS-2-string-termin.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 4e04afc2df9bbc26e5ab524b53a6f4f1e61d7c9e Mon Sep 17 00:00:00 2001 -From: Javier Martinez Canillas -Date: Tue, 5 Mar 2019 17:23:32 +0100 -Subject: [PATCH] ucs2.h: fix logic that checks for UCS-2 string termination - -Currently the loop to count the lenght of the UCS-2 string ends if either -of the two bytes are 0, but 0 is a valid value for UCS-2 character codes. - -So only break the loop when 0 is the value for both UCS-2 char bytes. - -Signed-off-by: Javier Martinez Canillas -Signed-off-by: Peter Korsgaard ---- - src/ucs2.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/ucs2.h b/src/ucs2.h -index e0390c3..fd8b056 100644 ---- a/src/ucs2.h -+++ b/src/ucs2.h -@@ -29,7 +29,7 @@ ucs2len(const void *vs, ssize_t limit) - const uint8_t *s8 = vs; - - for (i = 0; -- i < (limit >= 0 ? limit : i+1) && s8[0] != 0 && s8[1] != 0; -+ i < (limit >= 0 ? limit : i+1) && !(s8[0] == 0 && s8[1] == 0); - i++, s8 += 2) - ; - return i; --- -2.20.1 - diff --git a/package/efivar/0007-gcc.specs-drop-Werror.patch b/package/efivar/0007-gcc.specs-drop-Werror.patch deleted file mode 100644 index aa717fedafa..00000000000 --- a/package/efivar/0007-gcc.specs-drop-Werror.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 8d5cf3347cce9d644f670ffd1d48e71d74635481 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 22 Mar 2021 07:52:34 +0100 -Subject: [PATCH] gcc.specs: drop -Werror - -Build with -Werror raises the following build failure with gcc 10: - -/home/buildroot/autobuild/run/instance-1/output-1/host/bin/aarch64-none-linux-gnu-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O2 -I/home/buildroot/autobuild/run/instance-1/output-1/build/efivar-37/src/include/ -specs=/home/buildroot/autobuild/run/instance-1/output-1/build/efivar-37/gcc.specs -L. -fPIC -Wl,-z,muldefs -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -o efivar efivar.c -lefivar -ldl -In file included from efivar.h:28, - from efivar.c:40: -In function 'text_to_guid', - inlined from 'parse_name.constprop' at efivar.c:157:8: -guid.h:106:2: error: 'strncpy' output may be truncated copying 8 bytes from a string of length 38 [-Werror=stringop-truncation] - 106 | strncpy(eightbytes, text, 8); - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ -cc1: all warnings being treated as errors - -Fixes: - - http://autobuild.buildroot.org/results/fcba72d359f4128515560e9105384cd4deff5043 - -Signed-off-by: Fabrice Fontaine -[Upstream status: not upstreamable as Makefiles were reworked and a new -ERRORS parameter was added: -https://github.com/rhboot/efivar/commit/998f617cec92d526e1fadb745673ceef63fa1483] ---- - gcc.specs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gcc.specs b/gcc.specs -index 45d43d1..1baf11a 100644 ---- a/gcc.specs -+++ b/gcc.specs -@@ -2,7 +2,7 @@ - + -D_GNU_SOURCE - - *efivar_cpp_options: -- -Werror -Wall -std=gnu11 -Wextra -+ -Wall -std=gnu11 -Wextra - - *cpp_options: - + %(efivar_cpp_options) --- -2.30.1 - diff --git a/package/efivar/Config.in b/package/efivar/Config.in index 74f2bb5abb9..d4402dbcf76 100644 --- a/package/efivar/Config.in +++ b/package/efivar/Config.in @@ -9,6 +9,7 @@ config BR2_PACKAGE_EFIVAR depends on BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS depends on !BR2_STATIC_LIBS # dlfcn.h depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 # linux/nvme.h + depends on BR2_TOOLCHAIN_HAS_THREADS # linux/nvme.h has been renamed to linux/nvme_ioctl.h since 4.4, # and the efivar source handles that situation. However, some # Sourcery CodeBench toolchains use 4.4 kernel headers but they @@ -22,9 +23,9 @@ config BR2_PACKAGE_EFIVAR https://github.com/rhboot/efivar -comment "efivar needs a toolchain w/ dynamic library, headers >= 3.12, gcc >= 4.9" +comment "efivar needs a toolchain w/ dynamic library, threads, headers >= 3.12, gcc >= 4.9" depends on BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS - depends on BR2_STATIC_LIBS || \ + 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/efivar.hash b/package/efivar/efivar.hash index b521e08a535..827b46baa4f 100644 --- a/package/efivar/efivar.hash +++ b/package/efivar/efivar.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 74c52b4f479120fb6639e753e71163ba3f557a7a67c0be225593f9f05b253f36 efivar-37.tar.gz -sha256 91df770634adc2755e78cae33a0d01e702ce2f69046408ae93d0d934ff29691b COPYING +sha256 e3bbde37238bd47af1fcf270dc0ef1f4be030d86364c917b93669222ec52bbea efivar-38.tar.gz +sha256 91df770634adc2755e78cae33a0d01e702ce2f69046408ae93d0d934ff29691b COPYING diff --git a/package/efivar/efivar.mk b/package/efivar/efivar.mk index 8708057b18e..ee6d7302df4 100644 --- a/package/efivar/efivar.mk +++ b/package/efivar/efivar.mk @@ -4,31 +4,44 @@ # ################################################################################ -EFIVAR_VERSION = 37 +EFIVAR_VERSION = 38 EFIVAR_SITE = $(call github,rhboot,efivar,$(EFIVAR_VERSION)) EFIVAR_LICENSE = LGPL-2.1 EFIVAR_LICENSE_FILES = COPYING EFIVAR_INSTALL_STAGING = YES +EFIVAR_DEPENDENCIES = host-efivar # -fPIC is needed at least on MIPS, otherwise fails to build shared # -library. +# SUBDIRS is redefined so it skips building docs. +# LD_DASH_T is redefined as the linker detection does not seem to +# work properly for cross-compilation. EFIVAR_MAKE_OPTS = \ libdir=/usr/lib \ - LDFLAGS="$(TARGET_LDFLAGS) -fPIC" + LDFLAGS="$(TARGET_LDFLAGS) -fPIC" \ + TOPDIR=$(@D) \ + SUBDIRS=src \ + LD_DASH_T=-T -define EFIVAR_BUILD_CMDS +define HOST_EFIVAR_BUILD_CMDS # makeguids is an internal host tool and must be built separately with # $(HOST_CC), otherwise it gets cross-built. $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) \ CFLAGS="$(HOST_CFLAGS) -std=gnu99" \ - $(MAKE) -C $(@D)/src gcc_cflags= makeguids + TOPDIR=$(@D) CFLAGS_GCC= \ + $(MAKE) -C $(@D)/src makeguids +endef +define EFIVAR_BUILD_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE1) -C $(@D) \ - AR=$(TARGET_AR) NM=$(TARGET_NM) RANLIB=$(TARGET_RANLIB) \ $(EFIVAR_MAKE_OPTS) \ all endef +define HOST_EFIVAR_INSTALL_CMDS + $(INSTALL) -D -m 0755 $(@D)/src/makeguids $(HOST_DIR)/bin/makeguids +endef + define EFIVAR_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE1) -C $(@D) \ $(EFIVAR_MAKE_OPTS) \ @@ -44,3 +57,4 @@ define EFIVAR_INSTALL_TARGET_CMDS endef $(eval $(generic-package)) +$(eval $(host-generic-package)) diff --git a/package/efl/Config.in b/package/efl/Config.in index eb9c7aebd94..c4f82b92e3d 100644 --- a/package/efl/Config.in +++ b/package/efl/Config.in @@ -85,6 +85,19 @@ config BR2_PACKAGE_EFL_LIBFRIBIDI so you may also trigger code paths with bugs that are never normally used. +config BR2_PACKAGE_EFL_ELPUT + bool "Enable elput support (recommended)" + default y + depends on BR2_PACKAGE_HAS_UDEV # libinput, efl-eeze + select BR2_PACKAGE_EFL_EEZE + select BR2_PACKAGE_LIBINPUT + select BR2_PACKAGE_LIBXKBCOMMON + help + Eplut is used to support gesture recognition. + +comment "elput needs udev /dev management" + depends on !BR2_PACKAGE_HAS_UDEV + config BR2_PACKAGE_EFL_LIBSNDFILE bool "Enable libsndfile support (recommended)" default y @@ -115,7 +128,8 @@ config BR2_PACKAGE_EFL_PULSEAUDIO config BR2_PACKAGE_EFL_UTIL_LINUX_LIBMOUNT bool "Enable libmount support (recommended)" default y - depends on BR2_PACKAGE_EFL_EEZE + depends on BR2_PACKAGE_HAS_UDEV # efl-eeze + select BR2_PACKAGE_EFL_EEZE select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT # libblkid is part of required tools, see EFL's README. @@ -125,8 +139,8 @@ config BR2_PACKAGE_EFL_UTIL_LINUX_LIBMOUNT devices etc... and disabling this will hurt support for Enlightenment and its filemanager. -comment "efl's libmount support needs udev /dev management (eeze)" - depends on !BR2_PACKAGE_EFL_EEZE +comment "efl's libmount support needs udev /dev management " + depends on !BR2_PACKAGE_HAS_UDEV config BR2_PACKAGE_EFL_HAS_RECOMMENDED_CONFIG bool @@ -173,16 +187,16 @@ config BR2_PACKAGE_EFL_WAYLAND depends on BR2_PACKAGE_WAYLAND depends on BR2_TOOLCHAIN_HAS_THREADS # Evas DRM Engine -> libdrm depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # Evas DRM Engine - depends on BR2_PACKAGE_EFL_EEZE # efl drm + depends on BR2_PACKAGE_HAS_UDEV # efl drm, efl-eeze depends on BR2_PACKAGE_EFL_OPENGLES # OpenGL ES with EGL support only depends on BR2_ENABLE_LOCALE # efl-drm <- efl-elput <- linput select BR2_PACKAGE_EFL_DRM select BR2_PACKAGE_WAYLAND_PROTOCOLS -comment "Wayland support needs udev /dev management (eeze), OpenGL ES w/ EGL, threads, locales" +comment "Wayland support needs udev /dev management, OpenGL ES w/ EGL, threads, locales" depends on BR2_PACKAGE_WAYLAND depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_MESA3D_OPENGL_EGL \ - || !BR2_PACKAGE_EFL_OPENGLES || !BR2_PACKAGE_EFL_EEZE \ + || !BR2_PACKAGE_EFL_OPENGLES || !BR2_PACKAGE_HAS_UDEV \ || !BR2_ENABLE_LOCALE choice @@ -215,12 +229,11 @@ endchoice # OpenGL support config BR2_PACKAGE_EFL_DRM bool "Evas DRM Engine" - depends on BR2_PACKAGE_EFL_EEZE + depends on BR2_PACKAGE_HAS_UDEV # efl-elput, efl-eeze depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # require libgbm from mesa3d + select BR2_PACKAGE_EFL_ELPUT select BR2_PACKAGE_LIBDRM - select BR2_PACKAGE_LIBINPUT # For elput - select BR2_PACKAGE_LIBXKBCOMMON help This option enable building support for the Evas DRM Engine. @@ -230,9 +243,9 @@ config BR2_PACKAGE_EFL_DRM etc) to handle interfacing with libinput without having to duplicate the code in each subsystem. -comment "Evas DRM Engine needs udev /dev management (eeze), mesa3d w/ EGL support, threads" +comment "Evas DRM Engine needs udev /dev management, mesa3d w/ EGL support, threads" depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_MESA3D_OPENGL_EGL \ - || !BR2_PACKAGE_EFL_EEZE + || !BR2_PACKAGE_HAS_UDEV comment "libevas loaders" diff --git a/package/efl/efl.mk b/package/efl/efl.mk index 43a2dc4fcbd..d4a16475e58 100644 --- a/package/efl/efl.mk +++ b/package/efl/efl.mk @@ -67,6 +67,13 @@ else EFL_CONF_OPTS += -Deeze=false endif +ifeq ($(BR2_PACKAGE_EFL_ELPUT),y) +EFL_DEPENDENCIES += libinput libxkbcommon +EFL_CONF_OPTS += -Dinput=true +else +EFL_CONF_OPTS += -Dinput=false +endif + ifeq ($(BR2_PACKAGE_EFL_UTIL_LINUX_LIBMOUNT),y) EFL_DEPENDENCIES += util-linux EFL_CONF_OPTS += -Dlibmount=true @@ -192,7 +199,7 @@ endif ifeq ($(BR2_PACKAGE_EFL_DRM),y) EFL_CONF_OPTS += -Ddrm=true -EFL_DEPENDENCIES += libdrm libegl libinput mesa3d +EFL_DEPENDENCIES += libdrm libegl mesa3d else EFL_CONF_OPTS += -Ddrm=false endif @@ -204,8 +211,6 @@ else EFL_CONF_OPTS += -Dwl=false endif -EFL_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBXKBCOMMON),libxkbcommon) - # json evas loader is disabled by default by upstream. # Disable libspectre (ps). # Keep all other evas loader enabled or handled below. diff --git a/package/eigen/0001-Adds-new-CMake-Options-for-controlling-build-components.patch b/package/eigen/0001-Adds-new-CMake-Options-for-controlling-build-components.patch new file mode 100644 index 00000000000..693e610d0a8 --- /dev/null +++ b/package/eigen/0001-Adds-new-CMake-Options-for-controlling-build-components.patch @@ -0,0 +1,85 @@ +From cf82186416d04ea5df2a397d8fe09dc78d40ca65 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Antonio=20S=C3=A1nchez?= +Date: Sat, 5 Mar 2022 05:49:45 +0000 +Subject: [PATCH] Adds new CMake Options for controlling build components. + +[Retrieved from: +https://gitlab.com/libeigen/eigen/-/commit/cf82186416d04ea5df2a397d8fe09dc78d40ca65] +Signed-off-by: Fabrice Fontaine +--- + CMakeLists.txt | 6 ++++++ + blas/CMakeLists.txt | 3 ++- + lapack/CMakeLists.txt | 5 +++++ + 3 files changed, 13 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index de1c23e91..0af36a53a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -477,6 +477,9 @@ if(EIGEN_BUILD_TESTING) + add_subdirectory(failtest) + endif() + ++include(CMakeDetermineFortranCompiler) ++option(EIGEN_BUILD_BLAS "Toggles the building of the Eigen Blas library" ${CMAKE_Fortran_COMPILER}) ++option(EIGEN_BUILD_LAPACK "Toggles the building of the included Eigen LAPACK library" ${CMAKE_Fortran_COMPILER}) + if(EIGEN_LEAVE_TEST_IN_ALL_TARGET) + add_subdirectory(blas) + add_subdirectory(lapack) +@@ -611,6 +614,8 @@ set_target_properties (eigen PROPERTIES EXPORT_NAME Eigen) + + install (TARGETS eigen EXPORT Eigen3Targets) + ++option(EIGEN_BUILD_CMAKE_PACKAGE "Enables the creation of EigenConfig.cmake and related files" ON) ++if(EIGEN_BUILD_CMAKE_PACKAGE) + configure_package_config_file ( + ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Eigen3Config.cmake.in + ${CMAKE_CURRENT_BINARY_DIR}/Eigen3Config.cmake +@@ -655,6 +660,7 @@ install (FILES ${CMAKE_CURRENT_BINARY_DIR}/Eigen3Config.cmake + # Add uninstall target + add_custom_target ( uninstall + COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/EigenUninstall.cmake) ++endif() + + if (EIGEN_SPLIT_TESTSUITE) + ei_split_testsuite("${EIGEN_SPLIT_TESTSUITE}") +diff --git a/blas/CMakeLists.txt b/blas/CMakeLists.txt +index 8d3cb86dc..c530957fb 100644 +--- a/blas/CMakeLists.txt ++++ b/blas/CMakeLists.txt +@@ -1,6 +1,7 @@ + + project(EigenBlas CXX) + ++if(EIGEN_BUILD_BLAS) + include(CheckLanguage) + check_language(Fortran) + if(CMAKE_Fortran_COMPILER) +@@ -59,4 +60,4 @@ if(EIGEN_BUILD_TESTING) + endif() + + endif() +- ++endif() +diff --git a/lapack/CMakeLists.txt b/lapack/CMakeLists.txt +index c8ca64001..8d6d75401 100644 +--- a/lapack/CMakeLists.txt ++++ b/lapack/CMakeLists.txt +@@ -1,5 +1,7 @@ + project(EigenLapack CXX) + ++if(EIGEN_BUILD_LAPACK AND EIGEN_BUILD_BLAS) ++ + include(CheckLanguage) + check_language(Fortran) + if(CMAKE_Fortran_COMPILER) +@@ -457,3 +459,6 @@ if(EXISTS ${eigen_full_path_to_testing_lapack}) + + endif() + ++elseif(EIGEN_BUILD_LAPACK AND NOT EIGEN_BUILD_BLAS) ++ message(FATAL_ERROR "EIGEN_BUILD_LAPACK requires EIGEN_BUILD_BLAS") ++endif() #EIGEN_BUILD_LAPACK +-- +GitLab + diff --git a/package/eigen/eigen.hash b/package/eigen/eigen.hash index 5ec561ad108..ad7d6da9dc0 100644 --- a/package/eigen/eigen.hash +++ b/package/eigen/eigen.hash @@ -1,6 +1,6 @@ # Locally computed -sha256 685adf14bd8e9c015b78097c1dc22f2f01343756f196acdc76a678e1ae352e11 eigen-3.3.7.tar.bz2 -sha256 4f877e5ae4672568ef82cfd0023e2cef4a7cf55d867ab249efc9569a7eb9e5b1 COPYING.BSD +sha256 b4c198460eba6f28d34894e3a5710998818515104d6e74e5cc331ce31e46e626 eigen-3.4.0.tar.bz2 +sha256 51928dce36213c5333ba3172e847d735d4c6e9b7ff2722a326c49067155b82eb COPYING.BSD sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.GPL sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL sha256 f5b330efdad110cdd84d585ec61220b0650461fa599e36b13e1726c9346dcfb9 COPYING.MINPACK diff --git a/package/eigen/eigen.mk b/package/eigen/eigen.mk index 98e6c61e38f..7fe3fbdac6a 100644 --- a/package/eigen/eigen.mk +++ b/package/eigen/eigen.mk @@ -4,7 +4,7 @@ # ################################################################################ -EIGEN_VERSION = 3.3.7 +EIGEN_VERSION = 3.4.0 EIGEN_SOURCE = eigen-$(EIGEN_VERSION).tar.bz2 EIGEN_SITE = $(call gitlab,libeigen,eigen,$(EIGEN_VERSION)) EIGEN_LICENSE = MPL2, BSD-3-Clause, LGPL-2.1 @@ -15,7 +15,17 @@ EIGEN_SUPPORTS_IN_SOURCE_BUILD = NO # Default Eigen CMake installs .pc file in /usr/share/pkgconfig # change it to /usr/lib/pkgconfig, to be consistent with other packages. -EIGEN_CONF_OPTS = -DPKGCONFIG_INSTALL_DIR=/usr/lib/pkgconfig \ - -DCMAKE_Fortran_COMPILER=$(TARGET_FC) +EIGEN_CONF_OPTS = -DPKGCONFIG_INSTALL_DIR=/usr/lib/pkgconfig + +ifeq ($(BR2_TOOLCHAIN_HAS_FORTRAN),y) +EIGEN_CONF_OPTS += \ + -DCMAKE_Fortran_COMPILER=$(TARGET_FC) \ + -DEIGEN_BUILD_BLAS=ON \ + -DEIGEN_BUILD_LAPACK=ON +else +EIGEN_CONF_OPTS += \ + -DEIGEN_BUILD_BLAS=OFF \ + -DEIGEN_BUILD_LAPACK=OFF +endif $(eval $(cmake-package)) diff --git a/package/ejabberd/0001-Makefile.in-do-not-download-or-compile-dependencies.patch b/package/ejabberd/0001-Makefile.in-do-not-download-or-compile-dependencies.patch index ffacb6dafdf..58213ed2e60 100644 --- a/package/ejabberd/0001-Makefile.in-do-not-download-or-compile-dependencies.patch +++ b/package/ejabberd/0001-Makefile.in-do-not-download-or-compile-dependencies.patch @@ -1,6 +1,6 @@ -From cb583beba1acba55112fbb4636c1c73d9ae691a0 Mon Sep 17 00:00:00 2001 +From bf3571da4a68a6a857ab7ad8256f8276b3687a38 Mon Sep 17 00:00:00 2001 From: Johan Oudinet -Date: Fri, 20 Nov 2020 00:33:30 +0100 +Date: Fri, 13 May 2022 14:22:37 +0200 Subject: [PATCH] Makefile.in: do not download or compile dependencies Signed-off-by: Johan Oudinet @@ -9,27 +9,27 @@ Signed-off-by: Johan Oudinet 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in -index abd64835..06f876bb 100644 +index ab0e9d967..6e54168a7 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -97,7 +97,7 @@ ifneq ($(INSTALLGROUP),) - G_USER=-g $(INSTALLGROUP) +@@ -139,7 +139,7 @@ else + endif endif -all: deps src +all: src - deps: deps/.got + deps: $(DEPSDIR)/.got -@@ -111,7 +111,7 @@ deps/.built: deps/.got - $(REBAR) configure-deps - $(REBAR) compile && :> deps/.built +@@ -153,7 +153,7 @@ $(DEPSDIR)/.built: $(DEPSDIR)/.got + $(CONFIGURE_DEPS) + $(REBAR) compile && :> $(DEPSDIR)/.built --src: deps/.built +-src: $(DEPSDIR)/.built +src: - $(REBAR) skip_deps=true compile + $(REBAR) $(SKIPDEPS) compile update: -- -2.29.2 +2.34.1 diff --git a/package/ejabberd/0003-correct-includes.patch b/package/ejabberd/0003-correct-includes.patch new file mode 100644 index 00000000000..4ff02b5741a --- /dev/null +++ b/package/ejabberd/0003-correct-includes.patch @@ -0,0 +1,1749 @@ +From 6d6b6441774b00a6903c79d9e9d14047969d40ae Mon Sep 17 00:00:00 2001 +From: Philipp Huebner +Date: Tue, 31 May 2022 10:30:52 +0200 +Subject: [PATCH] correct includes + +Many parts of ejabberd code were moved into their own projects and are +packaged separately by me. To make the build process work, several +includes must be adjusted for the corresponding libraries to be found. + +Author: Philipp Huebner +Original: https://salsa.debian.org/ejabberd-packaging-team/ejabberd/-/blob/master/debian/patches/src.includes.patch +Signed-off-by: Johan Oudinet +--- + src/ejabberd_auth.erl | 2 +- + src/ejabberd_auth_anonymous.erl | 2 +- + src/ejabberd_auth_jwt.erl | 2 +- + src/ejabberd_auth_mnesia.erl | 2 +- + src/ejabberd_auth_sql.erl | 2 +- + src/ejabberd_bosh.erl | 2 +- + src/ejabberd_c2s.erl | 2 +- + src/ejabberd_captcha.erl | 2 +- + src/ejabberd_http.erl | 2 +- + src/ejabberd_http_ws.erl | 2 +- + src/ejabberd_iq.erl | 2 +- + src/ejabberd_local.erl | 2 +- + src/ejabberd_oauth.erl | 2 +- + src/ejabberd_oauth_rest.erl | 2 +- + src/ejabberd_oauth_sql.erl | 2 +- + src/ejabberd_piefxis.erl | 4 ++-- + src/ejabberd_router.erl | 2 +- + src/ejabberd_router_multicast.erl | 2 +- + src/ejabberd_s2s.erl | 2 +- + src/ejabberd_s2s_in.erl | 2 +- + src/ejabberd_s2s_out.erl | 2 +- + src/ejabberd_service.erl | 2 +- + src/ejabberd_sm.erl | 2 +- + src/ejabberd_web.erl | 2 +- + src/ejabberd_web_admin.erl | 2 +- + src/ejabberd_websocket.erl | 2 +- + src/ejabberd_xmlrpc.erl | 2 +- + src/gen_iq_handler.erl | 2 +- + src/gen_pubsub_node.erl | 2 +- + src/gen_pubsub_nodetree.erl | 2 +- + src/jd2ejd.erl | 2 +- + src/misc.erl | 2 +- + src/mod_adhoc.erl | 2 +- + src/mod_admin_extra.erl | 2 +- + src/mod_admin_update_sql.erl | 2 +- + src/mod_announce.erl | 2 +- + src/mod_announce_mnesia.erl | 2 +- + src/mod_announce_sql.erl | 2 +- + src/mod_avatar.erl | 2 +- + src/mod_block_strangers.erl | 2 +- + src/mod_blocking.erl | 2 +- + src/mod_bosh.erl | 2 +- + src/mod_caps.erl | 2 +- + src/mod_carboncopy.erl | 2 +- + src/mod_client_state.erl | 2 +- + src/mod_configure.erl | 2 +- + src/mod_conversejs.erl | 2 +- + src/mod_delegation.erl | 2 +- + src/mod_disco.erl | 2 +- + src/mod_fail2ban.erl | 2 +- + src/mod_http_api.erl | 2 +- + src/mod_http_upload.erl | 2 +- + src/mod_http_upload_quota.erl | 2 +- + src/mod_jidprep.erl | 2 +- + src/mod_last.erl | 2 +- + src/mod_legacy_auth.erl | 2 +- + src/mod_mam.erl | 2 +- + src/mod_mam_mnesia.erl | 2 +- + src/mod_mam_sql.erl | 2 +- + src/mod_metrics.erl | 2 +- + src/mod_mix.erl | 2 +- + src/mod_mix_pam.erl | 2 +- + src/mod_mqtt_session.erl | 2 +- + src/mod_mqtt_ws.erl | 2 +- + src/mod_muc.erl | 2 +- + src/mod_muc_admin.erl | 2 +- + src/mod_muc_log.erl | 2 +- + src/mod_muc_mnesia.erl | 2 +- + src/mod_muc_room.erl | 2 +- + src/mod_muc_sql.erl | 2 +- + src/mod_multicast.erl | 2 +- + src/mod_offline.erl | 2 +- + src/mod_offline_mnesia.erl | 2 +- + src/mod_offline_sql.erl | 2 +- + src/mod_ping.erl | 2 +- + src/mod_pres_counter.erl | 2 +- + src/mod_privacy.erl | 2 +- + src/mod_privacy_mnesia.erl | 2 +- + src/mod_privacy_sql.erl | 2 +- + src/mod_private.erl | 2 +- + src/mod_private_mnesia.erl | 2 +- + src/mod_private_sql.erl | 2 +- + src/mod_privilege.erl | 2 +- + src/mod_proxy65_service.erl | 2 +- + src/mod_pubsub.erl | 2 +- + src/mod_push.erl | 2 +- + src/mod_push_keepalive.erl | 2 +- + src/mod_push_mnesia.erl | 2 +- + src/mod_push_sql.erl | 2 +- + src/mod_register.erl | 2 +- + src/mod_register_web.erl | 2 +- + src/mod_roster.erl | 2 +- + src/mod_roster_mnesia.erl | 2 +- + src/mod_roster_sql.erl | 2 +- + src/mod_s2s_dialback.erl | 2 +- + src/mod_service_log.erl | 2 +- + src/mod_shared_roster.erl | 2 +- + src/mod_shared_roster_ldap.erl | 2 +- + src/mod_shared_roster_mnesia.erl | 2 +- + src/mod_shared_roster_sql.erl | 2 +- + src/mod_sic.erl | 2 +- + src/mod_sip.erl | 2 +- + src/mod_sip_proxy.erl | 2 +- + src/mod_sip_registrar.erl | 2 +- + src/mod_stats.erl | 2 +- + src/mod_stream_mgmt.erl | 2 +- + src/mod_stun_disco.erl | 2 +- + src/mod_time.erl | 2 +- + src/mod_vcard.erl | 2 +- + src/mod_vcard_ldap.erl | 2 +- + src/mod_vcard_mnesia.erl | 2 +- + src/mod_vcard_sql.erl | 2 +- + src/mod_vcard_xupdate.erl | 2 +- + src/mod_version.erl | 2 +- + src/node_flat.erl | 2 +- + src/node_flat_sql.erl | 2 +- + src/nodetree_tree.erl | 2 +- + src/nodetree_tree_sql.erl | 2 +- + src/prosody2ejabberd.erl | 4 ++-- + src/pubsub_subscription.erl | 2 +- + src/pubsub_subscription_sql.erl | 2 +- + test/suite.hrl | 8 ++++---- + tools/xml_compress_gen.erl | 2 +- + 123 files changed, 128 insertions(+), 128 deletions(-) + +diff --git a/src/ejabberd_auth.erl b/src/ejabberd_auth.erl +index 35e4921b7..7e3e05a4e 100644 +--- a/src/ejabberd_auth.erl ++++ b/src/ejabberd_auth.erl +@@ -48,7 +48,7 @@ + + -export([auth_modules/1, convert_to_scram/1]). + +--include_lib("xmpp/include/scram.hrl"). ++-include_lib("p1_xmpp/include/scram.hrl"). + -include("logger.hrl"). + + -define(SALT_LENGTH, 16). +diff --git a/src/ejabberd_auth_anonymous.erl b/src/ejabberd_auth_anonymous.erl +index dd7ff28eb..ee56ec5b0 100644 +--- a/src/ejabberd_auth_anonymous.erl ++++ b/src/ejabberd_auth_anonymous.erl +@@ -45,7 +45,7 @@ + plain_password_required/1]). + + -include("logger.hrl"). +--include_lib("xmpp/include/jid.hrl"). ++-include_lib("p1_xmpp/include/jid.hrl"). + + start(Host) -> + ejabberd_hooks:add(sm_register_connection_hook, Host, +diff --git a/src/ejabberd_auth_jwt.erl b/src/ejabberd_auth_jwt.erl +index 6df742305..a8024d587 100644 +--- a/src/ejabberd_auth_jwt.erl ++++ b/src/ejabberd_auth_jwt.erl +@@ -36,7 +36,7 @@ + %% 'ejabberd_hooks' callback: + -export([check_decoded_jwt/5]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("logger.hrl"). + + %%%---------------------------------------------------------------------- +diff --git a/src/ejabberd_auth_mnesia.erl b/src/ejabberd_auth_mnesia.erl +index 168ee76f5..5e75ddae2 100644 +--- a/src/ejabberd_auth_mnesia.erl ++++ b/src/ejabberd_auth_mnesia.erl +@@ -37,7 +37,7 @@ + -export([need_transform/1, transform/1]). + + -include("logger.hrl"). +--include_lib("xmpp/include/scram.hrl"). ++-include_lib("p1_xmpp/include/scram.hrl"). + -include("ejabberd_auth.hrl"). + + -record(reg_users_counter, {vhost = <<"">> :: binary(), +diff --git a/src/ejabberd_auth_sql.erl b/src/ejabberd_auth_sql.erl +index 50cc1902e..29de0cd7c 100644 +--- a/src/ejabberd_auth_sql.erl ++++ b/src/ejabberd_auth_sql.erl +@@ -35,7 +35,7 @@ + remove_user/2, store_type/1, plain_password_required/1, + export/1, which_users_exists/2]). + +--include_lib("xmpp/include/scram.hrl"). ++-include_lib("p1_xmpp/include/scram.hrl"). + -include("logger.hrl"). + -include("ejabberd_sql_pt.hrl"). + -include("ejabberd_auth.hrl"). +diff --git a/src/ejabberd_bosh.erl b/src/ejabberd_bosh.erl +index e9d2f0c0a..0bcc9dac0 100644 +--- a/src/ejabberd_bosh.erl ++++ b/src/ejabberd_bosh.erl +@@ -43,7 +43,7 @@ + code_change/4]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("ejabberd_http.hrl"). + -include("bosh.hrl"). + +diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl +index 3218cce51..d09f3a9b5 100644 +--- a/src/ejabberd_c2s.erl ++++ b/src/ejabberd_c2s.erl +@@ -47,7 +47,7 @@ + reply/2, copy_state/2, set_timeout/2, route/2, format_reason/2, + host_up/1, host_down/1, send_ws_ping/1, bounce_message_queue/2]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("logger.hrl"). + -include("mod_roster.hrl"). + -include("translate.hrl"). +diff --git a/src/ejabberd_captcha.erl b/src/ejabberd_captcha.erl +index 343a8e54e..f3efd5026 100644 +--- a/src/ejabberd_captcha.erl ++++ b/src/ejabberd_captcha.erl +@@ -42,7 +42,7 @@ + host_up/1, host_down/1, + config_reloaded/0, process_iq/1]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("logger.hrl"). + -include("ejabberd_http.hrl"). + -include("translate.hrl"). +diff --git a/src/ejabberd_http.erl b/src/ejabberd_http.erl +index d577a10d5..bc8e15620 100644 +--- a/src/ejabberd_http.erl ++++ b/src/ejabberd_http.erl +@@ -37,7 +37,7 @@ + -export([init/3]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("ejabberd_http.hrl"). + -include_lib("kernel/include/file.hrl"). + +diff --git a/src/ejabberd_http_ws.erl b/src/ejabberd_http_ws.erl +index eb2100a42..632eaa5c9 100644 +--- a/src/ejabberd_http_ws.erl ++++ b/src/ejabberd_http_ws.erl +@@ -36,7 +36,7 @@ + + -include("logger.hrl"). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -include("ejabberd_http.hrl"). + +diff --git a/src/ejabberd_iq.erl b/src/ejabberd_iq.erl +index 249c53294..2a0e1dce2 100644 +--- a/src/ejabberd_iq.erl ++++ b/src/ejabberd_iq.erl +@@ -34,7 +34,7 @@ + -export([init/1, handle_call/3, handle_cast/2, handle_info/2, + terminate/2, code_change/3]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("logger.hrl"). + -include("ejabberd_stacktrace.hrl"). + +diff --git a/src/ejabberd_local.erl b/src/ejabberd_local.erl +index 6dfef9d01..80f1fdbda 100644 +--- a/src/ejabberd_local.erl ++++ b/src/ejabberd_local.erl +@@ -47,7 +47,7 @@ + + -include("logger.hrl"). + -include_lib("stdlib/include/ms_transform.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("ejabberd_stacktrace.hrl"). + -include("translate.hrl"). + +diff --git a/src/ejabberd_oauth.erl b/src/ejabberd_oauth.erl +index 9b2c517de..0197333ef 100644 +--- a/src/ejabberd_oauth.erl ++++ b/src/ejabberd_oauth.erl +@@ -54,7 +54,7 @@ + oauth_add_client_implicit/3, + oauth_remove_client/1]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("logger.hrl"). + -include("ejabberd_http.hrl"). + -include("ejabberd_web_admin.hrl"). +diff --git a/src/ejabberd_oauth_rest.erl b/src/ejabberd_oauth_rest.erl +index b968c9263..47d13f05e 100644 +--- a/src/ejabberd_oauth_rest.erl ++++ b/src/ejabberd_oauth_rest.erl +@@ -36,7 +36,7 @@ + + -include("ejabberd_oauth.hrl"). + -include("logger.hrl"). +--include_lib("xmpp/include/jid.hrl"). ++-include_lib("p1_xmpp/include/jid.hrl"). + + init() -> + rest:start(ejabberd_config:get_myname()), +diff --git a/src/ejabberd_oauth_sql.erl b/src/ejabberd_oauth_sql.erl +index 25be737f0..11d4483a5 100644 +--- a/src/ejabberd_oauth_sql.erl ++++ b/src/ejabberd_oauth_sql.erl +@@ -37,7 +37,7 @@ + + -include("ejabberd_oauth.hrl"). + -include("ejabberd_sql_pt.hrl"). +--include_lib("xmpp/include/jid.hrl"). ++-include_lib("p1_xmpp/include/jid.hrl"). + -include("logger.hrl"). + + init() -> +diff --git a/src/ejabberd_piefxis.erl b/src/ejabberd_piefxis.erl +index d62efb300..fba76f62a 100644 +--- a/src/ejabberd_piefxis.erl ++++ b/src/ejabberd_piefxis.erl +@@ -38,9 +38,9 @@ + + -define(CHUNK_SIZE, 1024*20). %20k + +--include_lib("xmpp/include/scram.hrl"). ++-include_lib("p1_xmpp/include/scram.hrl"). + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_privacy.hrl"). + -include("mod_roster.hrl"). + +diff --git a/src/ejabberd_router.erl b/src/ejabberd_router.erl +index 492beb6d3..ee2ddcba9 100644 +--- a/src/ejabberd_router.erl ++++ b/src/ejabberd_router.erl +@@ -69,7 +69,7 @@ + + -include("logger.hrl"). + -include("ejabberd_router.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("ejabberd_stacktrace.hrl"). + + -callback init() -> any(). +diff --git a/src/ejabberd_router_multicast.erl b/src/ejabberd_router_multicast.erl +index e97ccb837..7ef026fa1 100644 +--- a/src/ejabberd_router_multicast.erl ++++ b/src/ejabberd_router_multicast.erl +@@ -42,7 +42,7 @@ + terminate/2, code_change/3, update_to_in_wrapped/2]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -record(route_multicast, {domain = <<"">> :: binary() | '_', + pid = self() :: pid()}). +diff --git a/src/ejabberd_s2s.erl b/src/ejabberd_s2s.erl +index 04490071c..0d345e947 100644 +--- a/src/ejabberd_s2s.erl ++++ b/src/ejabberd_s2s.erl +@@ -52,7 +52,7 @@ + -export([get_info_s2s_connections/1]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("ejabberd_commands.hrl"). + -include_lib("stdlib/include/ms_transform.hrl"). + -include("ejabberd_stacktrace.hrl"). +diff --git a/src/ejabberd_s2s_in.erl b/src/ejabberd_s2s_in.erl +index 8177a7333..fcffcb7b0 100644 +--- a/src/ejabberd_s2s_in.erl ++++ b/src/ejabberd_s2s_in.erl +@@ -41,7 +41,7 @@ + -export([stop_async/1, close/1, close/2, send/2, update_state/2, establish/1, + host_up/1, host_down/1]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("logger.hrl"). + + -type state() :: xmpp_stream_in:state(). +diff --git a/src/ejabberd_s2s_out.erl b/src/ejabberd_s2s_out.erl +index f057705ed..4139b0fe7 100644 +--- a/src/ejabberd_s2s_out.erl ++++ b/src/ejabberd_s2s_out.erl +@@ -39,7 +39,7 @@ + -export([start/3, start_link/3, connect/1, close/1, close/2, stop_async/1, send/2, + route/2, establish/1, update_state/2, host_up/1, host_down/1]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("logger.hrl"). + -include("translate.hrl"). + +diff --git a/src/ejabberd_service.erl b/src/ejabberd_service.erl +index b854bcb2b..3cc939679 100644 +--- a/src/ejabberd_service.erl ++++ b/src/ejabberd_service.erl +@@ -35,7 +35,7 @@ + %% API + -export([send/2, close/1, close/2, stop_async/1]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("logger.hrl"). + -include("translate.hrl"). + +diff --git a/src/ejabberd_sm.erl b/src/ejabberd_sm.erl +index afb95c10b..e5011ed23 100644 +--- a/src/ejabberd_sm.erl ++++ b/src/ejabberd_sm.erl +@@ -85,7 +85,7 @@ + handle_info/2, terminate/2, code_change/3]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("ejabberd_commands.hrl"). + -include("ejabberd_sm.hrl"). + -include("ejabberd_stacktrace.hrl"). +diff --git a/src/ejabberd_web.erl b/src/ejabberd_web.erl +index 5cfbb93aa..8a6b0fcd4 100644 +--- a/src/ejabberd_web.erl ++++ b/src/ejabberd_web.erl +@@ -33,7 +33,7 @@ + + -include("logger.hrl"). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -include("ejabberd_http.hrl"). + +diff --git a/src/ejabberd_web_admin.erl b/src/ejabberd_web_admin.erl +index ee50a0031..f97357f2f 100644 +--- a/src/ejabberd_web_admin.erl ++++ b/src/ejabberd_web_admin.erl +@@ -35,7 +35,7 @@ + + -include("logger.hrl"). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -include("ejabberd_http.hrl"). + +diff --git a/src/ejabberd_websocket.erl b/src/ejabberd_websocket.erl +index 5f9d284a6..db7c53768 100644 +--- a/src/ejabberd_websocket.erl ++++ b/src/ejabberd_websocket.erl +@@ -45,7 +45,7 @@ + + -include("logger.hrl"). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -include("ejabberd_http.hrl"). + +diff --git a/src/ejabberd_xmlrpc.erl b/src/ejabberd_xmlrpc.erl +index 1a1ec63f4..a76216963 100644 +--- a/src/ejabberd_xmlrpc.erl ++++ b/src/ejabberd_xmlrpc.erl +@@ -39,7 +39,7 @@ + -include("ejabberd_http.hrl"). + -include("mod_roster.hrl"). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -record(state, + {auth = noauth :: noauth | map(), +diff --git a/src/gen_iq_handler.erl b/src/gen_iq_handler.erl +index 29057435d..4fee8caf7 100644 +--- a/src/gen_iq_handler.erl ++++ b/src/gen_iq_handler.erl +@@ -35,7 +35,7 @@ + -deprecated([{add_iq_handler, 6}, {handle, 5}, {iqdisc, 1}]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("translate.hrl"). + -include("ejabberd_stacktrace.hrl"). + +diff --git a/src/gen_pubsub_node.erl b/src/gen_pubsub_node.erl +index 3f83fe48f..5545d51de 100644 +--- a/src/gen_pubsub_node.erl ++++ b/src/gen_pubsub_node.erl +@@ -25,7 +25,7 @@ + + -module(gen_pubsub_node). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -type(host() :: mod_pubsub:host()). + -type(nodeId() :: mod_pubsub:nodeId()). +diff --git a/src/gen_pubsub_nodetree.erl b/src/gen_pubsub_nodetree.erl +index b6b73b8cb..8c2a2a4fa 100644 +--- a/src/gen_pubsub_nodetree.erl ++++ b/src/gen_pubsub_nodetree.erl +@@ -36,7 +36,7 @@ + ServerHost :: binary(), + Opts :: [any()]) -> atom(). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -callback terminate(Host :: host(), ServerHost :: binary()) -> atom(). + +diff --git a/src/jd2ejd.erl b/src/jd2ejd.erl +index 279dd6e0d..ec0b2f083 100644 +--- a/src/jd2ejd.erl ++++ b/src/jd2ejd.erl +@@ -31,7 +31,7 @@ + -export([import_file/1, import_dir/1]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + %%%---------------------------------------------------------------------- + %%% API +diff --git a/src/misc.erl b/src/misc.erl +index 474fad615..489052bd1 100644 +--- a/src/misc.erl ++++ b/src/misc.erl +@@ -50,7 +50,7 @@ + {encode_base64, 1}]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include_lib("kernel/include/file.hrl"). + + -type distance_cache() :: #{{string(), string()} => non_neg_integer()}. +diff --git a/src/mod_adhoc.erl b/src/mod_adhoc.erl +index 73c7d82af..6cbc99aec 100644 +--- a/src/mod_adhoc.erl ++++ b/src/mod_adhoc.erl +@@ -39,7 +39,7 @@ + mod_options/1, mod_doc/0]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("translate.hrl"). + + start(Host, _Opts) -> +diff --git a/src/mod_admin_extra.erl b/src/mod_admin_extra.erl +index 9834acf01..e199f7d30 100644 +--- a/src/mod_admin_extra.erl ++++ b/src/mod_admin_extra.erl +@@ -85,7 +85,7 @@ + -include("mod_roster.hrl"). + -include("mod_privacy.hrl"). + -include("ejabberd_sm.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + %%% + %%% gen_mod +diff --git a/src/mod_admin_update_sql.erl b/src/mod_admin_update_sql.erl +index 02beb4bf8..9225d2bf0 100644 +--- a/src/mod_admin_update_sql.erl ++++ b/src/mod_admin_update_sql.erl +@@ -37,7 +37,7 @@ + + -include("logger.hrl"). + -include("ejabberd_commands.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("ejabberd_sql_pt.hrl"). + -include("translate.hrl"). + +diff --git a/src/mod_announce.erl b/src/mod_announce.erl +index 21213615c..d5fb38596 100644 +--- a/src/mod_announce.erl ++++ b/src/mod_announce.erl +@@ -51,7 +51,7 @@ + announce_all_hosts_motd_delete/1]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_announce.hrl"). + -include("translate.hrl"). + +diff --git a/src/mod_announce_mnesia.erl b/src/mod_announce_mnesia.erl +index 068406e01..074bebc90 100644 +--- a/src/mod_announce_mnesia.erl ++++ b/src/mod_announce_mnesia.erl +@@ -31,7 +31,7 @@ + get_motd/1, is_motd_user/2, set_motd_user/2, import/3]). + -export([need_transform/1, transform/1]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_announce.hrl"). + -include("logger.hrl"). + +diff --git a/src/mod_announce_sql.erl b/src/mod_announce_sql.erl +index bc79fc77a..4c3052f16 100644 +--- a/src/mod_announce_sql.erl ++++ b/src/mod_announce_sql.erl +@@ -32,7 +32,7 @@ + get_motd/1, is_motd_user/2, set_motd_user/2, import/3, + export/1]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_announce.hrl"). + -include("ejabberd_sql_pt.hrl"). + -include("logger.hrl"). +diff --git a/src/mod_avatar.erl b/src/mod_avatar.erl +index 09329853d..9f5e54e22 100644 +--- a/src/mod_avatar.erl ++++ b/src/mod_avatar.erl +@@ -31,7 +31,7 @@ + -export([pubsub_publish_item/6, vcard_iq_convert/1, vcard_iq_publish/1, + get_sm_features/5]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("logger.hrl"). + -include("pubsub.hrl"). + -include("translate.hrl"). +diff --git a/src/mod_block_strangers.erl b/src/mod_block_strangers.erl +index 92f52236d..59cd8cce5 100644 +--- a/src/mod_block_strangers.erl ++++ b/src/mod_block_strangers.erl +@@ -34,7 +34,7 @@ + + -export([filter_packet/1, filter_offline_msg/1, filter_subscription/2]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("logger.hrl"). + -include("translate.hrl"). + +diff --git a/src/mod_blocking.erl b/src/mod_blocking.erl +index 7d4b1bff5..853d40fe4 100644 +--- a/src/mod_blocking.erl ++++ b/src/mod_blocking.erl +@@ -33,7 +33,7 @@ + disco_features/5, mod_options/1, mod_doc/0]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_privacy.hrl"). + -include("translate.hrl"). + +diff --git a/src/mod_bosh.erl b/src/mod_bosh.erl +index 37a7fa809..ce57faac2 100644 +--- a/src/mod_bosh.erl ++++ b/src/mod_bosh.erl +@@ -40,7 +40,7 @@ + + -include("logger.hrl"). + -include_lib("stdlib/include/ms_transform.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("ejabberd_http.hrl"). + -include("bosh.hrl"). + -include("translate.hrl"). +diff --git a/src/mod_caps.erl b/src/mod_caps.erl +index bc48dac6f..fd3b3a1ad 100644 +--- a/src/mod_caps.erl ++++ b/src/mod_caps.erl +@@ -54,7 +54,7 @@ + + -include("logger.hrl"). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_caps.hrl"). + -include("translate.hrl"). + +diff --git a/src/mod_carboncopy.erl b/src/mod_carboncopy.erl +index a4e3a7999..e53b573c8 100644 +--- a/src/mod_carboncopy.erl ++++ b/src/mod_carboncopy.erl +@@ -42,7 +42,7 @@ + -export([list/2]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("translate.hrl"). + + -type direction() :: sent | received. +diff --git a/src/mod_client_state.erl b/src/mod_client_state.erl +index 3585ec3a4..5ac4ad845 100644 +--- a/src/mod_client_state.erl ++++ b/src/mod_client_state.erl +@@ -42,7 +42,7 @@ + c2s_copy_session/2, c2s_session_resumed/1]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("translate.hrl"). + + -define(CSI_QUEUE_MAX, 100). +diff --git a/src/mod_configure.erl b/src/mod_configure.erl +index 32c7ebb31..b6ab8cdfe 100644 +--- a/src/mod_configure.erl ++++ b/src/mod_configure.erl +@@ -39,7 +39,7 @@ + depends/2, mod_doc/0]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("ejabberd_sm.hrl"). + -include("translate.hrl"). + -include_lib("stdlib/include/ms_transform.hrl"). +diff --git a/src/mod_conversejs.erl b/src/mod_conversejs.erl +index 8683d60ab..2d3dfb63b 100644 +--- a/src/mod_conversejs.erl ++++ b/src/mod_conversejs.erl +@@ -32,7 +32,7 @@ + -export([start/2, stop/1, reload/3, process/2, depends/2, + mod_opt_type/1, mod_options/1, mod_doc/0]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("logger.hrl"). + -include("ejabberd_http.hrl"). + -include("translate.hrl"). +diff --git a/src/mod_delegation.erl b/src/mod_delegation.erl +index 3ae3b8a51..93c1e78d6 100644 +--- a/src/mod_delegation.erl ++++ b/src/mod_delegation.erl +@@ -42,7 +42,7 @@ + disco_local_identity/5, disco_sm_identity/5]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("translate.hrl"). + + -type route_type() :: ejabberd_sm | ejabberd_local. +diff --git a/src/mod_disco.erl b/src/mod_disco.erl +index deb9d15a2..c8788a77c 100644 +--- a/src/mod_disco.erl ++++ b/src/mod_disco.erl +@@ -42,7 +42,7 @@ + + -include("logger.hrl"). + -include("translate.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include_lib("stdlib/include/ms_transform.hrl"). + -include("mod_roster.hrl"). + +diff --git a/src/mod_fail2ban.erl b/src/mod_fail2ban.erl +index 8751653d8..901f71fc2 100644 +--- a/src/mod_fail2ban.erl ++++ b/src/mod_fail2ban.erl +@@ -42,7 +42,7 @@ + -include_lib("stdlib/include/ms_transform.hrl"). + -include("ejabberd_commands.hrl"). + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("translate.hrl"). + + -define(CLEAN_INTERVAL, timer:minutes(10)). +diff --git a/src/mod_http_api.erl b/src/mod_http_api.erl +index 427833584..6ee1fcb72 100644 +--- a/src/mod_http_api.erl ++++ b/src/mod_http_api.erl +@@ -32,7 +32,7 @@ + -export([start/2, stop/1, reload/3, process/2, depends/2, + mod_options/1, mod_doc/0]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("logger.hrl"). + -include("ejabberd_http.hrl"). + -include("ejabberd_stacktrace.hrl"). +diff --git a/src/mod_http_upload.erl b/src/mod_http_upload.erl +index 1ff94eb4a..ce1a667e2 100644 +--- a/src/mod_http_upload.erl ++++ b/src/mod_http_upload.erl +@@ -87,7 +87,7 @@ + expand_host/2]). + + -include("ejabberd_http.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("logger.hrl"). + -include("translate.hrl"). + +diff --git a/src/mod_http_upload_quota.erl b/src/mod_http_upload_quota.erl +index 5ed7fcefb..4fc591ca5 100644 +--- a/src/mod_http_upload_quota.erl ++++ b/src/mod_http_upload_quota.erl +@@ -51,7 +51,7 @@ + %% ejabberd_hooks callback. + -export([handle_slot_request/6]). + +--include_lib("xmpp/include/jid.hrl"). ++-include_lib("p1_xmpp/include/jid.hrl"). + -include("logger.hrl"). + -include("translate.hrl"). + -include_lib("kernel/include/file.hrl"). +diff --git a/src/mod_jidprep.erl b/src/mod_jidprep.erl +index c666f8544..b533a2f4f 100644 +--- a/src/mod_jidprep.erl ++++ b/src/mod_jidprep.erl +@@ -41,7 +41,7 @@ + + -include("logger.hrl"). + -include("translate.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + %%-------------------------------------------------------------------- + %% gen_mod callbacks. +diff --git a/src/mod_last.erl b/src/mod_last.erl +index a7d36c791..649a94698 100644 +--- a/src/mod_last.erl ++++ b/src/mod_last.erl +@@ -38,7 +38,7 @@ + register_user/2, depends/2, privacy_check_packet/4]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_privacy.hrl"). + -include("mod_last.hrl"). + -include("translate.hrl"). +diff --git a/src/mod_legacy_auth.erl b/src/mod_legacy_auth.erl +index 2b29b4cd2..ba13a24a8 100644 +--- a/src/mod_legacy_auth.erl ++++ b/src/mod_legacy_auth.erl +@@ -29,7 +29,7 @@ + %% hooks + -export([c2s_unauthenticated_packet/2, c2s_stream_features/2]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("translate.hrl"). + + -type c2s_state() :: ejabberd_c2s:state(). +diff --git a/src/mod_mam.erl b/src/mod_mam.erl +index 9bf154f58..444655727 100644 +--- a/src/mod_mam.erl ++++ b/src/mod_mam.erl +@@ -45,7 +45,7 @@ + is_empty_for_user/2, is_empty_for_room/3, check_create_room/4, + process_iq/3, store_mam_message/7, make_id/0, wrap_as_mucsub/2, select/7]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("logger.hrl"). + -include("mod_muc_room.hrl"). + -include("ejabberd_commands.hrl"). +diff --git a/src/mod_mam_mnesia.erl b/src/mod_mam_mnesia.erl +index d21d0e6ce..9dfc6d9e0 100644 +--- a/src/mod_mam_mnesia.erl ++++ b/src/mod_mam_mnesia.erl +@@ -32,7 +32,7 @@ + is_empty_for_user/2, is_empty_for_room/3]). + + -include_lib("stdlib/include/ms_transform.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("logger.hrl"). + -include("mod_mam.hrl"). + +diff --git a/src/mod_mam_sql.erl b/src/mod_mam_sql.erl +index 269b4c963..b81da5b0c 100644 +--- a/src/mod_mam_sql.erl ++++ b/src/mod_mam_sql.erl +@@ -33,7 +33,7 @@ + is_empty_for_user/2, is_empty_for_room/3, select_with_mucsub/6]). + + -include_lib("stdlib/include/ms_transform.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_mam.hrl"). + -include("logger.hrl"). + -include("ejabberd_sql_pt.hrl"). +diff --git a/src/mod_metrics.erl b/src/mod_metrics.erl +index d42f79112..de32aebef 100644 +--- a/src/mod_metrics.erl ++++ b/src/mod_metrics.erl +@@ -29,7 +29,7 @@ + -behaviour(gen_mod). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("translate.hrl"). + + -export([start/2, stop/1, mod_opt_type/1, mod_options/1, depends/2, reload/3]). +diff --git a/src/mod_mix.erl b/src/mod_mix.erl +index 002ef5696..57de16a7a 100644 +--- a/src/mod_mix.erl ++++ b/src/mod_mix.erl +@@ -41,7 +41,7 @@ + process_mam_query/1, + process_pubsub_query/1]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("logger.hrl"). + -include("translate.hrl"). + -include("ejabberd_stacktrace.hrl"). +diff --git a/src/mod_mix_pam.erl b/src/mod_mix_pam.erl +index 1fa5c1861..e27578028 100644 +--- a/src/mod_mix_pam.erl ++++ b/src/mod_mix_pam.erl +@@ -33,7 +33,7 @@ + remove_user/2, + process_iq/1]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("logger.hrl"). + -include("translate.hrl"). + +diff --git a/src/mod_mqtt_session.erl b/src/mod_mqtt_session.erl +index ca025e3d2..a541e1fb0 100644 +--- a/src/mod_mqtt_session.erl ++++ b/src/mod_mqtt_session.erl +@@ -28,7 +28,7 @@ + + -include("logger.hrl"). + -include("mqtt.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -record(state, {vsn = ?VSN :: integer(), + version :: undefined | mqtt_version(), +diff --git a/src/mod_mqtt_ws.erl b/src/mod_mqtt_ws.erl +index 01f182d30..b0a2ecdbd 100644 +--- a/src/mod_mqtt_ws.erl ++++ b/src/mod_mqtt_ws.erl +@@ -29,7 +29,7 @@ + -export([init/1, handle_call/3, handle_cast/2, handle_info/2, + terminate/2, code_change/3, format_status/2]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("ejabberd_http.hrl"). + -include("logger.hrl"). + +diff --git a/src/mod_muc.erl b/src/mod_muc.erl +index b2ebc5c61..59c856466 100644 +--- a/src/mod_muc.erl ++++ b/src/mod_muc.erl +@@ -77,7 +77,7 @@ + mod_opt_type/1, mod_options/1, depends/2]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_muc.hrl"). + -include("mod_muc_room.hrl"). + -include("translate.hrl"). +diff --git a/src/mod_muc_admin.erl b/src/mod_muc_admin.erl +index ce4665d7e..ef3f5dcc3 100644 +--- a/src/mod_muc_admin.erl ++++ b/src/mod_muc_admin.erl +@@ -44,7 +44,7 @@ + web_page_host/3, mod_options/1, get_commands_spec/0, find_hosts/1]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_muc.hrl"). + -include("mod_muc_room.hrl"). + -include("ejabberd_http.hrl"). +diff --git a/src/mod_muc_log.erl b/src/mod_muc_log.erl +index 8bcbc8bc0..36d9a5206 100644 +--- a/src/mod_muc_log.erl ++++ b/src/mod_muc_log.erl +@@ -42,7 +42,7 @@ + mod_opt_type/1, mod_options/1, depends/2, mod_doc/0]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_muc_room.hrl"). + -include("translate.hrl"). + +diff --git a/src/mod_muc_mnesia.erl b/src/mod_muc_mnesia.erl +index c822acc68..3847add23 100644 +--- a/src/mod_muc_mnesia.erl ++++ b/src/mod_muc_mnesia.erl +@@ -44,7 +44,7 @@ + + -include("mod_muc.hrl"). + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include_lib("stdlib/include/ms_transform.hrl"). + + -record(state, {}). +diff --git a/src/mod_muc_room.erl b/src/mod_muc_room.erl +index e8b0d1bce..7b1f5ff4c 100644 +--- a/src/mod_muc_room.erl ++++ b/src/mod_muc_room.erl +@@ -68,7 +68,7 @@ + code_change/4]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("translate.hrl"). + -include("mod_muc_room.hrl"). + -include("ejabberd_stacktrace.hrl"). +diff --git a/src/mod_muc_sql.erl b/src/mod_muc_sql.erl +index 1310cde7b..2c8b87d7e 100644 +--- a/src/mod_muc_sql.erl ++++ b/src/mod_muc_sql.erl +@@ -42,7 +42,7 @@ + -export([set_affiliation/6, set_affiliations/4, get_affiliation/5, + get_affiliations/3, search_affiliation/4]). + +--include_lib("xmpp/include/jid.hrl"). ++-include_lib("p1_xmpp/include/jid.hrl"). + -include("mod_muc.hrl"). + -include("logger.hrl"). + -include("ejabberd_sql_pt.hrl"). +diff --git a/src/mod_multicast.erl b/src/mod_multicast.erl +index fa076da70..b9ea7ce32 100644 +--- a/src/mod_multicast.erl ++++ b/src/mod_multicast.erl +@@ -45,7 +45,7 @@ + + -include("logger.hrl"). + -include("translate.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -record(multicastc, {rserver :: binary(), + response, +diff --git a/src/mod_offline.erl b/src/mod_offline.erl +index 1d367eb72..2a7a623e2 100644 +--- a/src/mod_offline.erl ++++ b/src/mod_offline.erl +@@ -69,7 +69,7 @@ + + -include("logger.hrl"). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -include("ejabberd_http.hrl"). + +diff --git a/src/mod_offline_mnesia.erl b/src/mod_offline_mnesia.erl +index a3c902fb3..4cb328d2a 100644 +--- a/src/mod_offline_mnesia.erl ++++ b/src/mod_offline_mnesia.erl +@@ -32,7 +32,7 @@ + remove_all_messages/2, count_messages/2, import/1]). + -export([need_transform/1, transform/1]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_offline.hrl"). + -include("logger.hrl"). + +diff --git a/src/mod_offline_sql.erl b/src/mod_offline_sql.erl +index 4e8441b7f..9d4170725 100644 +--- a/src/mod_offline_sql.erl ++++ b/src/mod_offline_sql.erl +@@ -32,7 +32,7 @@ + read_message/3, remove_message/3, read_all_messages/2, + remove_all_messages/2, count_messages/2, import/1, export/1]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_offline.hrl"). + -include("logger.hrl"). + -include("ejabberd_sql_pt.hrl"). +diff --git a/src/mod_ping.erl b/src/mod_ping.erl +index f233b2ae8..b528040d1 100644 +--- a/src/mod_ping.erl ++++ b/src/mod_ping.erl +@@ -35,7 +35,7 @@ + + -include("logger.hrl"). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -include("translate.hrl"). + +diff --git a/src/mod_pres_counter.erl b/src/mod_pres_counter.erl +index 77f42961f..066e5ce4f 100644 +--- a/src/mod_pres_counter.erl ++++ b/src/mod_pres_counter.erl +@@ -32,7 +32,7 @@ + + -include("logger.hrl"). + -include("translate.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -record(pres_counter, + {dir, start, count, logged = false}). +diff --git a/src/mod_privacy.erl b/src/mod_privacy.erl +index 5ac26c2f5..e8971af65 100644 +--- a/src/mod_privacy.erl ++++ b/src/mod_privacy.erl +@@ -41,7 +41,7 @@ + mod_opt_type/1, mod_options/1, depends/2]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_privacy.hrl"). + -include("translate.hrl"). + +diff --git a/src/mod_privacy_mnesia.erl b/src/mod_privacy_mnesia.erl +index 2f9cb0027..d90f30eb8 100644 +--- a/src/mod_privacy_mnesia.erl ++++ b/src/mod_privacy_mnesia.erl +@@ -32,7 +32,7 @@ + remove_list/3, use_cache/1, import/1]). + -export([need_transform/1, transform/1]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_privacy.hrl"). + -include("logger.hrl"). + +diff --git a/src/mod_privacy_sql.erl b/src/mod_privacy_sql.erl +index b27442724..234e59061 100644 +--- a/src/mod_privacy_sql.erl ++++ b/src/mod_privacy_sql.erl +@@ -34,7 +34,7 @@ + + -export([item_to_raw/1, raw_to_item/1]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_privacy.hrl"). + -include("logger.hrl"). + -include("ejabberd_sql_pt.hrl"). +diff --git a/src/mod_private.erl b/src/mod_private.erl +index 436aae222..56bfd4b07 100644 +--- a/src/mod_private.erl ++++ b/src/mod_private.erl +@@ -40,7 +40,7 @@ + -export([get_commands_spec/0, bookmarks_to_pep/2]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_private.hrl"). + -include("ejabberd_commands.hrl"). + -include("translate.hrl"). +diff --git a/src/mod_private_mnesia.erl b/src/mod_private_mnesia.erl +index b5617d96e..fd4ba657b 100644 +--- a/src/mod_private_mnesia.erl ++++ b/src/mod_private_mnesia.erl +@@ -31,7 +31,7 @@ + use_cache/1, import/3]). + -export([need_transform/1, transform/1]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_private.hrl"). + -include("logger.hrl"). + +diff --git a/src/mod_private_sql.erl b/src/mod_private_sql.erl +index 08a13e8a4..511cd5c63 100644 +--- a/src/mod_private_sql.erl ++++ b/src/mod_private_sql.erl +@@ -29,7 +29,7 @@ + -export([init/2, set_data/3, get_data/3, get_all_data/2, del_data/2, + import/3, export/1]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_private.hrl"). + -include("ejabberd_sql_pt.hrl"). + -include("logger.hrl"). +diff --git a/src/mod_privilege.erl b/src/mod_privilege.erl +index 353a8da27..50be843ac 100644 +--- a/src/mod_privilege.erl ++++ b/src/mod_privilege.erl +@@ -41,7 +41,7 @@ + process_presence_out/1, process_presence_in/1]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("translate.hrl"). + + -type roster_permission() :: both | get | set. +diff --git a/src/mod_proxy65_service.erl b/src/mod_proxy65_service.erl +index 78a8d85d2..98d9987db 100644 +--- a/src/mod_proxy65_service.erl ++++ b/src/mod_proxy65_service.erl +@@ -38,7 +38,7 @@ + delete_listener/1, route/1]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("translate.hrl"). + -include("ejabberd_stacktrace.hrl"). + +diff --git a/src/mod_pubsub.erl b/src/mod_pubsub.erl +index 76092f1c6..0b55cd7fc 100644 +--- a/src/mod_pubsub.erl ++++ b/src/mod_pubsub.erl +@@ -40,7 +40,7 @@ + -protocol({xep, 248, '0.2'}). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("pubsub.hrl"). + -include("mod_roster.hrl"). + -include("translate.hrl"). +diff --git a/src/mod_push.erl b/src/mod_push.erl +index 5477c5792..eab812226 100644 +--- a/src/mod_push.erl ++++ b/src/mod_push.erl +@@ -51,7 +51,7 @@ + + -include("ejabberd_commands.hrl"). + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("translate.hrl"). + + -define(PUSH_CACHE, push_cache). +diff --git a/src/mod_push_keepalive.erl b/src/mod_push_keepalive.erl +index e0e83f1e1..c57f2404a 100644 +--- a/src/mod_push_keepalive.erl ++++ b/src/mod_push_keepalive.erl +@@ -36,7 +36,7 @@ + c2s_handle_cast/2, c2s_handle_info/2, c2s_stanza/3]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("translate.hrl"). + + -define(PUSH_BEFORE_TIMEOUT_PERIOD, 120000). % 2 minutes. +diff --git a/src/mod_push_mnesia.erl b/src/mod_push_mnesia.erl +index 665ab48f2..0e17d11f2 100644 +--- a/src/mod_push_mnesia.erl ++++ b/src/mod_push_mnesia.erl +@@ -35,7 +35,7 @@ + + -include_lib("stdlib/include/ms_transform.hrl"). + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_push.hrl"). + + %%%------------------------------------------------------------------- +diff --git a/src/mod_push_sql.erl b/src/mod_push_sql.erl +index c024a12d1..a87f33f47 100644 +--- a/src/mod_push_sql.erl ++++ b/src/mod_push_sql.erl +@@ -31,7 +31,7 @@ + lookup_sessions/3, lookup_sessions/2, lookup_sessions/1, + delete_session/3, delete_old_sessions/2, export/1]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("logger.hrl"). + -include("ejabberd_sql_pt.hrl"). + -include("mod_push.hrl"). +diff --git a/src/mod_register.erl b/src/mod_register.erl +index b85efd57c..890852821 100644 +--- a/src/mod_register.erl ++++ b/src/mod_register.erl +@@ -40,7 +40,7 @@ + -deprecated({try_register, 4}). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("translate.hrl"). + + start(Host, _Opts) -> +diff --git a/src/mod_register_web.erl b/src/mod_register_web.erl +index 0cf4bcff8..43a123ead 100644 +--- a/src/mod_register_web.erl ++++ b/src/mod_register_web.erl +@@ -34,7 +34,7 @@ + + -include("logger.hrl"). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -include("ejabberd_http.hrl"). + +diff --git a/src/mod_roster.erl b/src/mod_roster.erl +index 94cae4950..8c9206e4b 100644 +--- a/src/mod_roster.erl ++++ b/src/mod_roster.erl +@@ -54,7 +54,7 @@ + depends/2, set_item_and_notify_clients/3]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_roster.hrl"). + -include("ejabberd_http.hrl"). + -include("ejabberd_web_admin.hrl"). +diff --git a/src/mod_roster_mnesia.erl b/src/mod_roster_mnesia.erl +index fa1d52f7c..ced28ce60 100644 +--- a/src/mod_roster_mnesia.erl ++++ b/src/mod_roster_mnesia.erl +@@ -37,7 +37,7 @@ + + -include("mod_roster.hrl"). + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + %%%=================================================================== + %%% API +diff --git a/src/mod_roster_sql.erl b/src/mod_roster_sql.erl +index ebfcde463..3510b4624 100644 +--- a/src/mod_roster_sql.erl ++++ b/src/mod_roster_sql.erl +@@ -38,7 +38,7 @@ + -include("mod_roster.hrl"). + -include("ejabberd_sql_pt.hrl"). + -include("logger.hrl"). +--include_lib("xmpp/include/jid.hrl"). ++-include_lib("p1_xmpp/include/jid.hrl"). + + %%%=================================================================== + %%% API +diff --git a/src/mod_s2s_dialback.erl b/src/mod_s2s_dialback.erl +index 05747e3bc..e2bdc847e 100644 +--- a/src/mod_s2s_dialback.erl ++++ b/src/mod_s2s_dialback.erl +@@ -33,7 +33,7 @@ + s2s_in_features/2, s2s_out_init/2, s2s_out_closed/2, + s2s_out_tls_verify/2]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("logger.hrl"). + -include("translate.hrl"). + +diff --git a/src/mod_service_log.erl b/src/mod_service_log.erl +index f5f23eeb0..e8beaac9a 100644 +--- a/src/mod_service_log.erl ++++ b/src/mod_service_log.erl +@@ -34,7 +34,7 @@ + + -include("logger.hrl"). + -include("translate.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + start(Host, _Opts) -> + ejabberd_hooks:add(user_send_packet, Host, ?MODULE, +diff --git a/src/mod_shared_roster.erl b/src/mod_shared_roster.erl +index 13ff90466..46fbbd535 100644 +--- a/src/mod_shared_roster.erl ++++ b/src/mod_shared_roster.erl +@@ -43,7 +43,7 @@ + + -include("logger.hrl"). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -include("mod_roster.hrl"). + +diff --git a/src/mod_shared_roster_ldap.erl b/src/mod_shared_roster_ldap.erl +index 08fbe8793..8f6cff118 100644 +--- a/src/mod_shared_roster_ldap.erl ++++ b/src/mod_shared_roster_ldap.erl +@@ -43,7 +43,7 @@ + depends/2, mod_doc/0]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_roster.hrl"). + -include("eldap.hrl"). + -include("translate.hrl"). +diff --git a/src/mod_shared_roster_mnesia.erl b/src/mod_shared_roster_mnesia.erl +index 484df0cd5..60a45941a 100644 +--- a/src/mod_shared_roster_mnesia.erl ++++ b/src/mod_shared_roster_mnesia.erl +@@ -37,7 +37,7 @@ + -include("mod_roster.hrl"). + -include("mod_shared_roster.hrl"). + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + %%%=================================================================== + %%% API +diff --git a/src/mod_shared_roster_sql.erl b/src/mod_shared_roster_sql.erl +index 0d44dce69..0aacf03e8 100644 +--- a/src/mod_shared_roster_sql.erl ++++ b/src/mod_shared_roster_sql.erl +@@ -35,7 +35,7 @@ + add_user_to_group/3, remove_user_from_group/3, import/3, + export/1]). + +--include_lib("xmpp/include/jid.hrl"). ++-include_lib("p1_xmpp/include/jid.hrl"). + -include("mod_roster.hrl"). + -include("mod_shared_roster.hrl"). + -include("ejabberd_sql_pt.hrl"). +diff --git a/src/mod_sic.erl b/src/mod_sic.erl +index 4eeb8fd08..2ad4ce5a6 100644 +--- a/src/mod_sic.erl ++++ b/src/mod_sic.erl +@@ -35,7 +35,7 @@ + process_sm_iq/1, mod_options/1, depends/2, mod_doc/0]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("translate.hrl"). + + start(Host, _Opts) -> +diff --git a/src/mod_sip.erl b/src/mod_sip.erl +index 6ea2a408f..3bc901035 100644 +--- a/src/mod_sip.erl ++++ b/src/mod_sip.erl +@@ -55,7 +55,7 @@ mod_doc() -> + locate/1, mod_opt_type/1, mod_options/1, depends/2, + mod_doc/0]). + +--include_lib("esip/include/esip.hrl"). ++-include_lib("p1_sip/include/esip.hrl"). + + %%%=================================================================== + %%% API +diff --git a/src/mod_sip_proxy.erl b/src/mod_sip_proxy.erl +index ddfefb1ad..e1c8a734f 100644 +--- a/src/mod_sip_proxy.erl ++++ b/src/mod_sip_proxy.erl +@@ -39,7 +39,7 @@ + code_change/4]). + + -include("logger.hrl"). +--include_lib("esip/include/esip.hrl"). ++-include_lib("p1_sip/include/esip.hrl"). + + -define(SIGN_LIFETIME, 300). %% in seconds. + +diff --git a/src/mod_sip_registrar.erl b/src/mod_sip_registrar.erl +index 5079aebf0..73a5a5168 100644 +--- a/src/mod_sip_registrar.erl ++++ b/src/mod_sip_registrar.erl +@@ -41,7 +41,7 @@ + terminate/2, code_change/3]). + + -include("logger.hrl"). +--include_lib("esip/include/esip.hrl"). ++-include_lib("p1_sip/include/esip.hrl"). + + -define(CALL_TIMEOUT, timer:seconds(30)). + -define(DEFAULT_EXPIRES, 3600). +diff --git a/src/mod_stats.erl b/src/mod_stats.erl +index c61fe6175..b73227582 100644 +--- a/src/mod_stats.erl ++++ b/src/mod_stats.erl +@@ -35,7 +35,7 @@ + mod_options/1, depends/2, mod_doc/0]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("translate.hrl"). + + start(Host, _Opts) -> +diff --git a/src/mod_stream_mgmt.erl b/src/mod_stream_mgmt.erl +index f60f6722b..b5d2def60 100644 +--- a/src/mod_stream_mgmt.erl ++++ b/src/mod_stream_mgmt.erl +@@ -37,7 +37,7 @@ + %% adjust pending session timeout / access queue + -export([get_resume_timeout/1, set_resume_timeout/2, queue_find/2]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("logger.hrl"). + -include_lib("p1_utils/include/p1_queue.hrl"). + -include("translate.hrl"). +diff --git a/src/mod_stun_disco.erl b/src/mod_stun_disco.erl +index 6e7592453..203ac735e 100644 +--- a/src/mod_stun_disco.erl ++++ b/src/mod_stun_disco.erl +@@ -55,7 +55,7 @@ + + -include("logger.hrl"). + -include("translate.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -define(STUN_MODULE, ejabberd_stun). + +diff --git a/src/mod_time.erl b/src/mod_time.erl +index 4ec3cd64e..9b2072ad5 100644 +--- a/src/mod_time.erl ++++ b/src/mod_time.erl +@@ -36,7 +36,7 @@ + mod_options/1, depends/2, mod_doc/0]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("translate.hrl"). + + start(Host, _Opts) -> +diff --git a/src/mod_vcard.erl b/src/mod_vcard.erl +index 8e0d32a4a..e4687c61e 100644 +--- a/src/mod_vcard.erl ++++ b/src/mod_vcard.erl +@@ -44,7 +44,7 @@ + -export([route/1]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_vcard.hrl"). + -include("translate.hrl"). + -include("ejabberd_stacktrace.hrl"). +diff --git a/src/mod_vcard_ldap.erl b/src/mod_vcard_ldap.erl +index bc6e7ebca..955489475 100644 +--- a/src/mod_vcard_ldap.erl ++++ b/src/mod_vcard_ldap.erl +@@ -40,7 +40,7 @@ + + -include("logger.hrl"). + -include("eldap.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("translate.hrl"). + + -define(PROCNAME, ejabberd_mod_vcard_ldap). +diff --git a/src/mod_vcard_mnesia.erl b/src/mod_vcard_mnesia.erl +index ad4be701c..d0dafc10d 100644 +--- a/src/mod_vcard_mnesia.erl ++++ b/src/mod_vcard_mnesia.erl +@@ -33,7 +33,7 @@ + -export([need_transform/1, transform/1]). + -export([mod_opt_type/1, mod_options/1, mod_doc/0]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_vcard.hrl"). + -include("logger.hrl"). + -include("translate.hrl"). +diff --git a/src/mod_vcard_sql.erl b/src/mod_vcard_sql.erl +index 620c1b4b5..8e8ea10ff 100644 +--- a/src/mod_vcard_sql.erl ++++ b/src/mod_vcard_sql.erl +@@ -32,7 +32,7 @@ + search_fields/1, search_reported/1, import/3, export/1]). + -export([is_search_supported/1]). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("mod_vcard.hrl"). + -include("logger.hrl"). + -include("ejabberd_sql_pt.hrl"). +diff --git a/src/mod_vcard_xupdate.erl b/src/mod_vcard_xupdate.erl +index 59ebc7f71..fd75decd4 100644 +--- a/src/mod_vcard_xupdate.erl ++++ b/src/mod_vcard_xupdate.erl +@@ -37,7 +37,7 @@ + -export([compute_hash/1]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("translate.hrl"). + + -define(VCARD_XUPDATE_CACHE, vcard_xupdate_cache). +diff --git a/src/mod_version.erl b/src/mod_version.erl +index 9aa93829d..aa89e8253 100644 +--- a/src/mod_version.erl ++++ b/src/mod_version.erl +@@ -35,7 +35,7 @@ + mod_opt_type/1, mod_options/1, depends/2, mod_doc/0]). + + -include("logger.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("translate.hrl"). + + start(Host, _Opts) -> +diff --git a/src/node_flat.erl b/src/node_flat.erl +index 55dea0d8d..0dada8e22 100644 +--- a/src/node_flat.erl ++++ b/src/node_flat.erl +@@ -34,7 +34,7 @@ + -author('christophe.romain@process-one.net'). + + -include("pubsub.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + -export([init/3, terminate/2, options/0, features/0, + create_node_permission/6, create_node/2, delete_node/1, +diff --git a/src/node_flat_sql.erl b/src/node_flat_sql.erl +index f9c8a209d..9d33f0376 100644 +--- a/src/node_flat_sql.erl ++++ b/src/node_flat_sql.erl +@@ -35,7 +35,7 @@ + + + -include("pubsub.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("ejabberd_sql_pt.hrl"). + -include("translate.hrl"). + +diff --git a/src/nodetree_tree.erl b/src/nodetree_tree.erl +index 853c1fb93..28ad2520d 100644 +--- a/src/nodetree_tree.erl ++++ b/src/nodetree_tree.erl +@@ -41,7 +41,7 @@ + -include_lib("stdlib/include/ms_transform.hrl"). + + -include("pubsub.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("translate.hrl"). + + -export([init/3, terminate/2, options/0, set_node/1, +diff --git a/src/nodetree_tree_sql.erl b/src/nodetree_tree_sql.erl +index 402c50901..d5f82c88c 100644 +--- a/src/nodetree_tree_sql.erl ++++ b/src/nodetree_tree_sql.erl +@@ -39,7 +39,7 @@ + + + -include("pubsub.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("ejabberd_sql_pt.hrl"). + -include("translate.hrl"). + +diff --git a/src/prosody2ejabberd.erl b/src/prosody2ejabberd.erl +index 3992a4034..d0d186015 100644 +--- a/src/prosody2ejabberd.erl ++++ b/src/prosody2ejabberd.erl +@@ -27,8 +27,8 @@ + %% API + -export([from_dir/1]). + +--include_lib("xmpp/include/scram.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/scram.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("logger.hrl"). + -include("mod_roster.hrl"). + -include("mod_offline.hrl"). +diff --git a/src/pubsub_subscription.erl b/src/pubsub_subscription.erl +index 92d6d314d..716a29962 100644 +--- a/src/pubsub_subscription.erl ++++ b/src/pubsub_subscription.erl +@@ -38,7 +38,7 @@ + read_subscription/3, write_subscription/4]). + + -include("pubsub.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("translate.hrl"). + + -define(PUBSUB_DELIVER, <<"pubsub#deliver">>). +diff --git a/src/pubsub_subscription_sql.erl b/src/pubsub_subscription_sql.erl +index c36934f50..8eb6f4db1 100644 +--- a/src/pubsub_subscription_sql.erl ++++ b/src/pubsub_subscription_sql.erl +@@ -34,7 +34,7 @@ + get_options_xform/2, parse_options_xform/1]). + + -include("pubsub.hrl"). +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + -include("translate.hrl"). + + -define(PUBSUB_DELIVER, <<"pubsub#deliver">>). +diff --git a/test/suite.hrl b/test/suite.hrl +index d8ea3e23b..9c6bc3f42 100644 +--- a/test/suite.hrl ++++ b/test/suite.hrl +@@ -1,8 +1,8 @@ + -include_lib("common_test/include/ct.hrl"). +--include_lib("fast_xml/include/fxml.hrl"). +--include_lib("xmpp/include/jid.hrl"). +--include_lib("xmpp/include/ns.hrl"). +--include_lib("xmpp/include/xmpp_codec.hrl"). ++-include_lib("p1_xml/include/fxml.hrl"). ++-include_lib("p1_xmpp/include/jid.hrl"). ++-include_lib("p1_xmpp/include/ns.hrl"). ++-include_lib("p1_xmpp/include/xmpp_codec.hrl"). + -include("mod_proxy65.hrl"). + + -define(STREAM_TRAILER, <<"">>). +diff --git a/tools/xml_compress_gen.erl b/tools/xml_compress_gen.erl +index 5b43c5925..087a6c13b 100644 +--- a/tools/xml_compress_gen.erl ++++ b/tools/xml_compress_gen.erl +@@ -24,7 +24,7 @@ + -module(xml_compress_gen). + -author("pawel@process-one.net"). + +--include_lib("xmpp/include/xmpp.hrl"). ++-include_lib("p1_xmpp/include/xmpp.hrl"). + + %% API + -export([archive_analyze/3, process_stats/1, gen_code/3]). +-- +2.35.3 + diff --git a/package/ejabberd/ejabberd.hash b/package/ejabberd/ejabberd.hash index 0d57ada5bb9..53a7402f77c 100644 --- a/package/ejabberd/ejabberd.hash +++ b/package/ejabberd/ejabberd.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 9e922b938458ae9d72d4e5fdd2d08a1fbad651aae47c9a9d15b79d0bbd1e11f8 ejabberd-20.07.tgz +sha256 b6e6739947d3678525b14ee280cedb1a04280c83ea17a4741795aac99fbdad47 ejabberd-21.12.tgz sha256 469bb8cfa3ef22c102875ff31932450c075e6908ff3f7d36893485c0c30898eb COPYING diff --git a/package/ejabberd/ejabberd.mk b/package/ejabberd/ejabberd.mk index 2b23701ddf1..5b8ed3edd03 100644 --- a/package/ejabberd/ejabberd.mk +++ b/package/ejabberd/ejabberd.mk @@ -4,7 +4,7 @@ # ################################################################################ -EJABBERD_VERSION = 20.07 +EJABBERD_VERSION = 21.12 EJABBERD_SOURCE = ejabberd-$(EJABBERD_VERSION).tgz EJABBERD_SITE = https://static.process-one.net/ejabberd/downloads/$(EJABBERD_VERSION) EJABBERD_LICENSE = GPL-2.0+ with OpenSSL exception @@ -16,7 +16,8 @@ EJABBERD_DEPENDENCIES = getent openssl erlang-eimp host-erlang-lager \ erlang-p1-utils erlang-p1-xml erlang-p1-xmpp erlang-p1-yaml \ erlang-p1-zlib host-erlang-p1-utils host-erlang-p1-xmpp -# 0001-remove-make-targets-for-deps.patch updates Makefile.in +# 0001-Makefile.in-do-not-download-or-compile-dependencies.patch +# updates Makefile.in EJABBERD_USE_AUTOCONF = YES EJABBERD_AUTORECONF = YES diff --git a/package/elf2flt/0001-elf2flt-handle-binutils-2.34.patch b/package/elf2flt/0001-elf2flt-handle-binutils-2.34.patch new file mode 100644 index 00000000000..4aa473c244d --- /dev/null +++ b/package/elf2flt/0001-elf2flt-handle-binutils-2.34.patch @@ -0,0 +1,377 @@ +From d78acba6510527aaa01a41eaf4c931f7a57e5f44 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Wed, 5 Feb 2020 10:31:32 +0100 +Subject: [PATCH] elf2flt: handle binutils >= 2.34 + +The latest Binutils release (2.34) is not compatible with elf2flt due +to a change in bfd_section_* macros [1]. The issue has been reported +to the Binutils mailing list but Alan Modra recommend to bundle +libbfd library sources into each projects using it [2]. That's +because the API is not stable over the time without any backward +compatibility guaranties. + +On the other hand, the elf2flt tools needs to support modified +version of binutils for specific arch/target [3]. + +Add two tests in the configure script to detect this API change +in order to support binutils < 2.34 and binutils >= 2.34. + +Upstream status: [4] + +[1] https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=fd3619828e94a24a92cddec42cbc0ab33352eeb4 +[2] https://sourceware.org/ml/binutils/2020-02/msg00044.html +[3] https://github.com/uclinux-dev/elf2flt/issues/14 +[4] https://github.com/uclinux-dev/elf2flt/pull/15 + +Signed-off-by: Romain Naour +--- + configure.ac | 16 +++++++++++ + elf2flt.c | 81 +++++++++++++++++++++++++++++----------------------- + 2 files changed, 61 insertions(+), 36 deletions(-) + +diff --git a/configure.ac b/configure.ac +index b7db2cb..fdc0876 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -229,6 +229,22 @@ AC_CHECK_FUNCS([ \ + strsignal \ + ]) + ++dnl Various bfd section macros and functions like bfd_section_size() have been ++dnl modified starting with binutils >= 2.34. ++dnl Check if the prototypes take a bfd argument. ++if test "$binutils_build_dir" != "NONE"; then ++ CFLAGS="-I$binutils_include_dir -I$bfd_include_dir $CFLAGS" ++fi ++ ++AC_TRY_COMPILE([#include ], ++ [const asection *sec; bfd_section_size(sec);], ++ bfd_section_api_takes_bfd=no, ++ bfd_section_api_takes_bfd=yes) ++if test "$bfd_section_api_takes_bfd" = "yes" ; then ++ AC_DEFINE(HAVE_BFD_SECTION_API_TAKES_BFD, 1, ++ [define to 1 for binutils < 2.34]) ++fi ++ + if test "$GCC" = yes ; then + CFLAGS="-Wall $CFLAGS" + if test "$werror" = 1 ; then +diff --git a/elf2flt.c b/elf2flt.c +index 7ac0617..ea6b5a1 100644 +--- a/elf2flt.c ++++ b/elf2flt.c +@@ -149,6 +149,17 @@ const char *elf2flt_progname; + #define O_BINARY 0 + #endif + ++/* ++ * The bfd parameter isn't actually used by any of the bfd_section funcs and ++ * have been removed since binutils 2.34. ++ */ ++#ifdef HAVE_BFD_SECTION_API_TAKES_BFD ++#define elf2flt_bfd_section_size(s) bfd_section_size(NULL, s) ++#define elf2flt_bfd_section_vma(s) bfd_section_vma(NULL, s) ++#else ++#define elf2flt_bfd_section_size(s) bfd_section_size(s) ++#define elf2flt_bfd_section_vma(s) bfd_section_vma(s) ++#endif + + /* Extra output when running. */ + static int verbose = 0; +@@ -323,10 +334,8 @@ compare_relocs (const void *pa, const void *pb) + else if (!rb->sym_ptr_ptr || !*rb->sym_ptr_ptr) + return 1; + +- a_vma = bfd_section_vma(compare_relocs_bfd, +- (*(ra->sym_ptr_ptr))->section); +- b_vma = bfd_section_vma(compare_relocs_bfd, +- (*(rb->sym_ptr_ptr))->section); ++ a_vma = elf2flt_bfd_section_vma((*(ra->sym_ptr_ptr))->section); ++ b_vma = elf2flt_bfd_section_vma((*(rb->sym_ptr_ptr))->section); + va = (*(ra->sym_ptr_ptr))->value + a_vma + ra->addend; + vb = (*(rb->sym_ptr_ptr))->value + b_vma + rb->addend; + return va - vb; +@@ -403,7 +412,7 @@ output_relocs ( + } + + for (a = abs_bfd->sections; (a != (asection *) NULL); a = a->next) { +- section_vma = bfd_section_vma(abs_bfd, a); ++ section_vma = elf2flt_bfd_section_vma(a); + + if (verbose) + printf("SECTION: %s [%p]: flags=0x%x vma=0x%"PRIx32"\n", +@@ -443,7 +452,7 @@ output_relocs ( + continue; + if (verbose) + printf(" RELOCS: %s [%p]: flags=0x%x vma=0x%"BFD_VMA_FMT"x\n", +- r->name, r, r->flags, bfd_section_vma(abs_bfd, r)); ++ r->name, r, r->flags, elf2flt_bfd_section_vma(r)); + if ((r->flags & SEC_RELOC) == 0) + continue; + relsize = bfd_get_reloc_upper_bound(rel_bfd, r); +@@ -695,7 +704,7 @@ output_relocs ( + case R_BFIN_RIMM16: + case R_BFIN_LUIMM16: + case R_BFIN_HUIMM16: +- sym_vma = bfd_section_vma(abs_bfd, sym_section); ++ sym_vma = elf2flt_bfd_section_vma(sym_section); + sym_addr += sym_vma + q->addend; + + if (weak_und_symbol(sym_section->name, (*(q->sym_ptr_ptr)))) +@@ -728,7 +737,7 @@ output_relocs ( + break; + + case R_BFIN_BYTE4_DATA: +- sym_vma = bfd_section_vma(abs_bfd, sym_section); ++ sym_vma = elf2flt_bfd_section_vma(sym_section); + sym_addr += sym_vma + q->addend; + + if (weak_und_symbol (sym_section->name, (*(q->sym_ptr_ptr)))) +@@ -886,7 +895,7 @@ output_relocs ( + #if defined(TARGET_m68k) + case R_68K_32: + relocation_needed = 1; +- sym_vma = bfd_section_vma(abs_bfd, sym_section); ++ sym_vma = elf2flt_bfd_section_vma(sym_section); + sym_addr += sym_vma + q->addend; + break; + case R_68K_PC16: +@@ -911,7 +920,7 @@ output_relocs ( + q->address, sym_addr, + (*p)->howto->rightshift, + *(uint32_t *)r_mem); +- sym_vma = bfd_section_vma(abs_bfd, sym_section); ++ sym_vma = elf2flt_bfd_section_vma(sym_section); + sym_addr += sym_vma + q->addend; + break; + case R_ARM_GOT32: +@@ -939,7 +948,7 @@ output_relocs ( + #ifdef TARGET_v850 + case R_V850_ABS32: + relocation_needed = 1; +- sym_vma = bfd_section_vma(abs_bfd, sym_section); ++ sym_vma = elf2flt_bfd_section_vma(sym_section); + sym_addr += sym_vma + q->addend; + break; + case R_V850_ZDA_16_16_OFFSET: +@@ -961,7 +970,7 @@ output_relocs ( + sym_addr = (*(q->sym_ptr_ptr))->value; + q->address -= 1; + r_mem -= 1; /* tracks q->address */ +- sym_vma = bfd_section_vma(abs_bfd, sym_section); ++ sym_vma = elf2flt_bfd_section_vma(sym_section); + sym_addr += sym_vma + q->addend; + sym_addr |= (*(unsigned char *)r_mem<<24); + break; +@@ -974,7 +983,7 @@ output_relocs ( + /* Absolute symbol done not relocation */ + relocation_needed = !bfd_is_abs_section(sym_section); + sym_addr = (*(q->sym_ptr_ptr))->value; +- sym_vma = bfd_section_vma(abs_bfd, sym_section); ++ sym_vma = elf2flt_bfd_section_vma(sym_section); + sym_addr += sym_vma + q->addend; + break; + case R_H8_DIR32: +@@ -987,7 +996,7 @@ output_relocs ( + } + relocation_needed = 1; + sym_addr = (*(q->sym_ptr_ptr))->value; +- sym_vma = bfd_section_vma(abs_bfd, sym_section); ++ sym_vma = elf2flt_bfd_section_vma(sym_section); + sym_addr += sym_vma + q->addend; + break; + case R_H8_PCREL16: +@@ -1013,7 +1022,7 @@ output_relocs ( + #ifdef TARGET_microblaze + case R_MICROBLAZE_64: + /* work out the relocation */ +- sym_vma = bfd_section_vma(abs_bfd, sym_section); ++ sym_vma = elf2flt_bfd_section_vma(sym_section); + sym_addr += sym_vma + q->addend; + /* Write relocated pointer back */ + r_mem[2] = (sym_addr >> 24) & 0xff; +@@ -1027,7 +1036,7 @@ output_relocs ( + pflags = 0x80000000; + break; + case R_MICROBLAZE_32: +- sym_vma = bfd_section_vma(abs_bfd, sym_section); ++ sym_vma = elf2flt_bfd_section_vma(sym_section); + sym_addr += sym_vma + q->addend; + relocation_needed = 1; + break; +@@ -1059,7 +1068,7 @@ output_relocs ( + case R_NIOS2_BFD_RELOC_32: + relocation_needed = 1; + pflags = (FLAT_NIOS2_R_32 << 28); +- sym_vma = bfd_section_vma(abs_bfd, sym_section); ++ sym_vma = elf2flt_bfd_section_vma(sym_section); + sym_addr += sym_vma + q->addend; + /* modify target, in target order */ + *(unsigned long *)r_mem = htoniosl(sym_addr); +@@ -1069,7 +1078,7 @@ output_relocs ( + unsigned long exist_val; + relocation_needed = 1; + pflags = (FLAT_NIOS2_R_CALL26 << 28); +- sym_vma = bfd_section_vma(abs_bfd, sym_section); ++ sym_vma = elf2flt_bfd_section_vma(sym_section); + sym_addr += sym_vma + q->addend; + + /* modify target, in target order */ +@@ -1100,7 +1109,7 @@ output_relocs ( + ? FLAT_NIOS2_R_HIADJ_LO : FLAT_NIOS2_R_HI_LO; + pflags <<= 28; + +- sym_vma = bfd_section_vma(abs_bfd, sym_section); ++ sym_vma = elf2flt_bfd_section_vma(abs_bfd, sym_section); + sym_addr += sym_vma + q->addend; + + /* modify high 16 bits, in target order */ +@@ -1133,7 +1142,7 @@ output_relocs ( + goto NIOS2_RELOC_ERR; + } + /* _gp holds a absolute value, otherwise the ld cannot generate correct code */ +- sym_vma = bfd_section_vma(abs_bfd, sym_section); ++ sym_vma = elf2flt_bfd_section_vma(sym_section); + //printf("sym=%x, %d, _gp=%x, %d\n", sym_addr+sym_vma, sym_addr+sym_vma, gp, gp); + sym_addr += sym_vma + q->addend; + sym_addr -= gp; +@@ -1214,7 +1223,7 @@ NIOS2_RELOC_ERR: + case R_SPARC_32: + case R_SPARC_UA32: + relocation_needed = 1; +- sym_vma = bfd_section_vma(abs_bfd, sym_section); ++ sym_vma = elf2flt_bfd_section_vma(sym_section); + sym_addr += sym_vma + q->addend; + break; + case R_SPARC_PC22: +@@ -1233,7 +1242,7 @@ NIOS2_RELOC_ERR: + case R_SPARC_HI22: + relocation_needed = 1; + pflags = 0x80000000; +- sym_vma = bfd_section_vma(abs_bfd, sym_section); ++ sym_vma = elf2flt_bfd_section_vma(sym_section); + sym_addr += sym_vma + q->addend; + sym_addr |= ( + htonl(*(uint32_t *)r_mem) +@@ -1243,7 +1252,7 @@ NIOS2_RELOC_ERR: + case R_SPARC_LO10: + relocation_needed = 1; + pflags = 0x40000000; +- sym_vma = bfd_section_vma(abs_bfd, sym_section); ++ sym_vma = elf2flt_bfd_section_vma(sym_section); + sym_addr += sym_vma + q->addend; + sym_addr &= 0x000003ff; + sym_addr |= ( +@@ -1257,7 +1266,7 @@ NIOS2_RELOC_ERR: + #ifdef TARGET_sh + case R_SH_DIR32: + relocation_needed = 1; +- sym_vma = bfd_section_vma(abs_bfd, sym_section); ++ sym_vma = elf2flt_bfd_section_vma(sym_section); + sym_addr += sym_vma + q->addend; + break; + case R_SH_REL32: +@@ -1289,7 +1298,7 @@ NIOS2_RELOC_ERR: + case R_E1_CONST31: + relocation_needed = 1; + DBG_E1("Handling Reloc \n"); +- sec_vma = bfd_section_vma(abs_bfd, sym_section); ++ sec_vma = elf2flt_bfd_section_vma(sym_section); + DBG_E1("sec_vma : [0x%x], sym_addr : [0x%x], q->address : [0x%x]\n", + sec_vma, sym_addr, q->address); + sym_addr = sec_vma + sym_addr; +@@ -1304,7 +1313,7 @@ NIOS2_RELOC_ERR: + relocation_needed = 0; + DBG_E1("Handling Reloc \n"); + DBG_E1("DONT RELOCATE AT LOADING\n"); +- sec_vma = bfd_section_vma(abs_bfd, sym_section); ++ sec_vma = elf2flt_bfd_section_vma(sym_section); + DBG_E1("sec_vma : [0x%x], sym_addr : [0x%x], q->address : [0x%x]\n", + sec_vma, sym_addr, q->address); + sym_addr = sec_vma + sym_addr; +@@ -1331,7 +1340,7 @@ NIOS2_RELOC_ERR: + relocation_needed = 0; + DBG_E1("Handling Reloc \n"); + DBG_E1("DONT RELOCATE AT LOADING\n"); +- sec_vma = bfd_section_vma(abs_bfd, sym_section); ++ sec_vma = elf2flt_bfd_section_vma(sym_section); + DBG_E1("sec_vma : [0x%x], sym_addr : [0x%x], q->address : [0x%x]\n", + sec_vma, sym_addr, q->address); + sym_addr = sec_vma + sym_addr; +@@ -1364,7 +1373,7 @@ NIOS2_RELOC_ERR: + DBG_E1("Handling Reloc \n"); + DIS29_RELOCATION: + relocation_needed = 1; +- sec_vma = bfd_section_vma(abs_bfd, sym_section); ++ sec_vma = elf2flt_bfd_section_vma(sym_section); + DBG_E1("sec_vma : [0x%x], sym_addr : [0x%08x]\n", + sec_vma, sym_addr); + sym_addr = sec_vma + sym_addr; +@@ -1381,7 +1390,7 @@ DIS29_RELOCATION: + relocation_needed = 0; + DBG_E1("Handling Reloc \n"); + DBG_E1("DONT RELOCATE AT LOADING\n"); +- sec_vma = bfd_section_vma(abs_bfd, sym_section); ++ sec_vma = elf2flt_bfd_section_vma(sym_section); + DBG_E1("sec_vma : [0x%x], sym_addr : [0x%x]\n", + sec_vma, sym_addr); + sym_addr = sec_vma + sym_addr; +@@ -1407,7 +1416,7 @@ DIS29_RELOCATION: + case R_E1_IMM32: + relocation_needed = 1; + DBG_E1("Handling Reloc \n"); +- sec_vma = bfd_section_vma(abs_bfd, sym_section); ++ sec_vma = elf2flt_bfd_section_vma(sym_section); + DBG_E1("sec_vma : [0x%x], sym_addr : [0x%x]\n", + sec_vma, sym_addr); + sym_addr = sec_vma + sym_addr; +@@ -1423,7 +1432,7 @@ DIS29_RELOCATION: + case R_E1_WORD: + relocation_needed = 1; + DBG_E1("Handling Reloc \n"); +- sec_vma = bfd_section_vma(abs_bfd, sym_section); ++ sec_vma = elf2flt_bfd_section_vma(sym_section); + DBG_E1("sec_vma : [0x%x], sym_addr : [0x%x]\n", + sec_vma, sym_addr); + sym_addr = sec_vma + sym_addr; +@@ -1450,7 +1459,7 @@ DIS29_RELOCATION: + } + + sprintf(&addstr[0], "+0x%lx", sym_addr - (*(q->sym_ptr_ptr))->value - +- bfd_section_vma(abs_bfd, sym_section)); ++ elf2flt_bfd_section_vma(sym_section)); + + + /* +@@ -1890,8 +1899,8 @@ int main(int argc, char *argv[]) + } else + continue; + +- sec_size = bfd_section_size(abs_bfd, s); +- sec_vma = bfd_section_vma(abs_bfd, s); ++ sec_size = elf2flt_bfd_section_size(s); ++ sec_vma = elf2flt_bfd_section_vma(s); + + if (sec_vma < *vma) { + if (*len > 0) +@@ -1920,7 +1929,7 @@ int main(int argc, char *argv[]) + (SEC_DATA | SEC_READONLY | SEC_RELOC))) + if (!bfd_get_section_contents(abs_bfd, s, + text + (s->vma - text_vma), 0, +- bfd_section_size(abs_bfd, s))) ++ elf2flt_bfd_section_size(s))) + { + fatal("read error section %s", s->name); + } +@@ -1950,7 +1959,7 @@ int main(int argc, char *argv[]) + (SEC_READONLY | SEC_RELOC))) + if (!bfd_get_section_contents(abs_bfd, s, + data + (s->vma - data_vma), 0, +- bfd_section_size(abs_bfd, s))) ++ elf2flt_bfd_section_size(s))) + { + fatal("read error section %s", s->name); + } +-- +2.35.1 + diff --git a/package/elf2flt/0001-ld-elf2flt-behave-properly-when-called-with-a-name-d.patch b/package/elf2flt/0001-ld-elf2flt-behave-properly-when-called-with-a-name-d.patch deleted file mode 100644 index a27c4913fbf..00000000000 --- a/package/elf2flt/0001-ld-elf2flt-behave-properly-when-called-with-a-name-d.patch +++ /dev/null @@ -1,79 +0,0 @@ -From b31e9b1bff6832063816b972395179859d1d4619 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sun, 13 Aug 2017 16:03:20 +0200 -Subject: [PATCH] ld-elf2flt: behave properly when called with a name different - from TARGET_ALIAS - -ld-elf2flt currently handles two cases: - - 1 It is called as the wrapper for -ld, generally - installed in the bin/ directory of a toolchain. - - 2 It is called as the wrapper for "ld", generally installed in the - TARGET_ALIAS/bin/ directory of a toolchain. - -Unfortunately, if for some reason it gets called using a FOOBAR-ld -name that is different from -ld, it assumes it is in -case (2), while it really is in case (1). Due to this, the path -mangling logic doesn't work, and it doesn't find ld.real. - -This happens for example when the binary program in bin/ is named -arm-buildroot-uclinux-uclibcgnueabi-ld, but also has a simpler symlink -named arm-linux-ld. In this case, -arm-buildroot-uclinux-uclibcgnueabi-ld is recognized by ld-elf2flt as -containing TARGET_ALIAS, and therefore the proper logic to find -ld.real is applied. However, when arm-linux-ld is used, ld-elf2flt -doesn't find TARGET_ALIAS, and therefore assumes we're being called as -TARGET_ALIAS/bin/ld.. and searches for a program called ld.real in -bin/, which doesn't exist. - -See: - -$ ./output/host/bin/arm-buildroot-uclinux-uclibcgnueabi-ld -/home/thomas/buildroot/buildroot/output/host/bin/../arm-buildroot-uclinux-uclibcgnueabi/bin/ld.real: no input files - -$ ./output/host/bin/arm-linux-ld -arm-linux-ld (ld-elf2flt): error trying to exec '/home/thomas/buildroot/buildroot/output/host/bin/ld.real': execvp: No such file or directory - -$ ./output/host/arm-buildroot-uclinux-uclibcgnueabi/bin/ld -/home/thomas/buildroot/buildroot/output/host/arm-buildroot-uclinux-uclibcgnueabi/bin/ld.real: no input files - -This commit fixes that by inverting the logic: if we're being called -as just "ld", then we assume it's the program in -TARGET_ALIAS/bin/. Otherwise, we're called through some variant of -TARGET-ld. - -Signed-off-by: Thomas Petazzoni -Submitted-upstream: https://github.com/uclinux-dev/elf2flt/pull/8 ---- - ld-elf2flt.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/ld-elf2flt.c b/ld-elf2flt.c -index de39fe0..c187c2e 100644 ---- a/ld-elf2flt.c -+++ b/ld-elf2flt.c -@@ -506,15 +506,15 @@ int main(int argc, char *argv[]) - the host while those in /lib are for the target. - Make bindir point to the bin dir for bin/-foo. - Make tooldir point to the bin dir for /bin/foo. */ -- if (streqn(elf2flt_progname, TARGET_ALIAS)) { -- tmp = concat(argv0_dir, "../" TARGET_ALIAS "/bin", NULL); -+ if (streqn(elf2flt_progname, "ld")) { -+ tmp = concat(argv0_dir, "../../bin", NULL); - if (stat(tmp, &buf) == 0 && S_ISDIR(buf.st_mode)) { -- tooldir = concat(tmp, "/", NULL); -+ bindir = concat(tmp, "/", NULL); - } - } else { -- tmp = concat(argv0_dir, "../../bin", NULL); -+ tmp = concat(argv0_dir, "../" TARGET_ALIAS "/bin", NULL); - if (stat(tmp, &buf) == 0 && S_ISDIR(buf.st_mode)) { -- bindir = concat(tmp, "/", NULL); -+ tooldir = concat(tmp, "/", NULL); - } - } - --- -2.9.4 - diff --git a/package/elf2flt/0002-elf2flt.c-add-new-relocation-types-for-xtensa.patch b/package/elf2flt/0002-elf2flt.c-add-new-relocation-types-for-xtensa.patch deleted file mode 100644 index 953bd79ccf9..00000000000 --- a/package/elf2flt/0002-elf2flt.c-add-new-relocation-types-for-xtensa.patch +++ /dev/null @@ -1,188 +0,0 @@ -From d7eb73163bcea31168c438fc132a0967ac172e3d Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Thu, 7 May 2020 21:11:43 -0700 -Subject: [PATCH] elf2flt.c: add new relocation types for xtensa - -Xtensa have added new relocation types R_XTENSA_[NP]DIFF{8,16,32} with -the same properties as the existing types R_XTENSA_DIFF{8,16,32}. -Add them to the list of ignored relocation types. - -This fixes the following error when invoking elf2flt on xtensa binaries -built with the recent binutils: - - ERROR: reloc type R_XTENSA_PDIFF32 unsupported in this context - -Reported-by: Romain Naour -Signed-off-by: Max Filippov -Backported from: d7eb73163bcea31168c438fc132a0967ac172e3d ---- - Makefile.in | 3 ++- - configure | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - configure.ac | 14 ++++++++++++ - elf2flt.c | 8 +++++++ - 4 files changed, 88 insertions(+), 1 deletion(-) - -diff --git a/Makefile.in b/Makefile.in -index 52b3347d7f43..0529c7f0a25a 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -30,7 +30,8 @@ DEFS = @DEFS@ \ - -DNO_GOT_CHECK=@got_check@ \ - -DUSE_EMIT_RELOCS=@emit_relocs@ \ - -DEMIT_CTOR_DTOR=@emit_ctor_dtor@ \ -- -DALWAYS_RELOC_TEXT=@always_reloc_text@ -+ -DALWAYS_RELOC_TEXT=@always_reloc_text@ \ -+ -DHAVE_BFD_XTENSA_PDIFF_RELOCS=@HAVE_BFD_XTENSA_PDIFF_RELOCS@ - EXEEXT = @EXEEXT@ - OBJEXT = @OBJEXT@ - -diff --git a/configure b/configure -index bb8e33f9cb28..bca38c34247e 100755 ---- a/configure -+++ b/configure -@@ -621,6 +621,7 @@ ac_includes_default="\ - - ac_subst_vars='LTLIBOBJS - LIBOBJS -+HAVE_BFD_XTENSA_PDIFF_RELOCS - SYMBOL_PREFIX - always_reloc_text - emit_ctor_dtor -@@ -1729,6 +1730,52 @@ fi - - } # ac_fn_c_try_link - -+# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES -+# --------------------------------------------- -+# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR -+# accordingly. -+ac_fn_c_check_decl () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ as_decl_name=`echo $2|sed 's/ *(.*//'` -+ as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 -+$as_echo_n "checking whether $as_decl_name is declared... " >&6; } -+if eval \${$3+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+int -+main () -+{ -+#ifndef $as_decl_name -+#ifdef __cplusplus -+ (void) $as_decl_use; -+#else -+ (void) $as_decl_name; -+#endif -+#endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ eval "$3=yes" -+else -+ eval "$3=no" -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+eval ac_res=\$$3 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ -+} # ac_fn_c_check_decl -+ - # ac_fn_c_check_func LINENO FUNC VAR - # ---------------------------------- - # Tests whether FUNC exists, setting the cache variable VAR accordingly -@@ -4272,6 +4319,22 @@ $as_echo "#define const /**/" >>confdefs.h - fi - - -+HAVE_BFD_XTENSA_PDIFF_RELOCS=0 -+case $target in -+ xtensa*) -+ OLD_CPPFLAGS=$CPPFLAGS -+ CPPFLAGS="-I$bfd_include_dir -I$binutils_include_dir $CPPFLAGS" -+ ac_fn_c_check_decl "$LINENO" "R_XTENSA_PDIFF8" "ac_cv_have_decl_R_XTENSA_PDIFF8" "#include \"bfd.h\" -+ #include \"elf/xtensa.h\" -+" -+if test "x$ac_cv_have_decl_R_XTENSA_PDIFF8" = xyes; then : -+ HAVE_BFD_XTENSA_PDIFF_RELOCS=1 -+fi -+ -+ CPPFLAGS=$OLD_CPPFLAGS -+ ;; -+esac -+ - for ac_func in vprintf - do : - ac_fn_c_check_func "$LINENO" "vprintf" "ac_cv_func_vprintf" -@@ -4333,6 +4396,7 @@ fi - - - -+ - ac_config_files="$ac_config_files ld-elf2flt.sh:ld-elf2flt.in Makefile elf2flt.ld" - - cat >confcache <<\_ACEOF -diff --git a/configure.ac b/configure.ac -index d6b4119eb18a..19969b1045f6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -202,6 +202,19 @@ AC_CHECK_HEADERS(fcntl.h unistd.h bfd.h) - dnl Checks for typedefs, structures, and compiler characteristics. - AC_C_CONST - -+HAVE_BFD_XTENSA_PDIFF_RELOCS=0 -+case $target in -+ xtensa*) -+ AS_VAR_COPY([OLD_CPPFLAGS], [CPPFLAGS]) -+ AS_VAR_SET([CPPFLAGS], ["-I$bfd_include_dir -I$binutils_include_dir $CPPFLAGS"]) -+ AC_CHECK_DECL([R_XTENSA_PDIFF8], -+ [HAVE_BFD_XTENSA_PDIFF_RELOCS=1],, -+ [#include "bfd.h" -+ #include "elf/xtensa.h"]) -+ AS_VAR_COPY([CPPFLAGS], [OLD_CPPFLAGS]) -+ ;; -+esac -+ - dnl Checks for library functions. - AC_FUNC_VPRINTF - -@@ -235,6 +248,7 @@ AC_SUBST(emit_relocs) - AC_SUBST(emit_ctor_dtor) - AC_SUBST(always_reloc_text) - AC_SUBST(SYMBOL_PREFIX) -+AC_SUBST(HAVE_BFD_XTENSA_PDIFF_RELOCS) - - AC_OUTPUT(ld-elf2flt.sh:ld-elf2flt.in Makefile elf2flt.ld) - -diff --git a/elf2flt.c b/elf2flt.c -index b7c4a490df02..961534973f56 100644 ---- a/elf2flt.c -+++ b/elf2flt.c -@@ -776,6 +776,14 @@ output_relocs ( - case R_XTENSA_DIFF8: - case R_XTENSA_DIFF16: - case R_XTENSA_DIFF32: -+#if HAVE_BFD_XTENSA_PDIFF_RELOCS -+ case R_XTENSA_PDIFF8: -+ case R_XTENSA_PDIFF16: -+ case R_XTENSA_PDIFF32: -+ case R_XTENSA_NDIFF8: -+ case R_XTENSA_NDIFF16: -+ case R_XTENSA_NDIFF32: -+#endif - case R_XTENSA_32_PCREL: - continue; - case R_XTENSA_32: --- -2.20.1 - diff --git a/package/elf2flt/0002-elf2flt.ld-reinstate-32-byte-alignment-for-.data-sec.patch b/package/elf2flt/0002-elf2flt.ld-reinstate-32-byte-alignment-for-.data-sec.patch new file mode 100644 index 00000000000..4df3ea5929f --- /dev/null +++ b/package/elf2flt/0002-elf2flt.ld-reinstate-32-byte-alignment-for-.data-sec.patch @@ -0,0 +1,81 @@ +From 85ba5664eb368eb1cbd2c30b7cd574acd75edd4c Mon Sep 17 00:00:00 2001 +From: Niklas Cassel +Date: Mon, 4 Apr 2022 15:30:24 +0200 +Subject: [PATCH] elf2flt.ld: reinstate 32 byte alignment for .data section + +Commit 8a3e74446fe7 ("allow to build arm flat binaries") moved the +following commands: + . = ALIGN(0x20) ; + @SYMBOL_PREFIX@_etext = . ; +from the .text section to the top level in the SECTIONS node. + +The .text output section is being directed to a memory region using the +"> flatmem :text" output section attribute. Commands in the top level in +the SECTIONS node are not. + +This means that the ALIGN() command is no longer being appended to the +flatmem memory region, it will simply update the Location Counter. + +The heuristic for placing an output section is described here: +https://sourceware.org/binutils/docs-2.38/ld.html#Output-Section-Address + +"If an output memory region is set for the section then it is added to this +region and its address will be the next free address in that region." + +Since the .data section is being directed to the same memory region as the +.text section, this means that the Location Counter is not used when +assigning an address to the .data output section, it will simply use the +next free address. + +No longer directing these commands to the flatmem memory region means that +the .data output section is no longer aligned to a 32 byte boundary. + +Before commit 8a3e74446fe7 ("allow to build arm flat binaries"): +$ readelf -S busybox_unstripped.gdb | grep data + [ 3] .data PROGBITS 0000000000035ac0 00036ac0 +$ readelf -s busybox_unstripped.gdb | grep _etext + 19286: 0000000000035ac0 0 NOTYPE GLOBAL DEFAULT 1 _etext + +After commit 8a3e74446fe7 ("allow to build arm flat binaries"): +$ readelf -S busybox_unstripped.gdb | grep data + [ 3] .data PROGBITS 0000000000035ab0 00036ab0 +$ readelf -s busybox_unstripped.gdb | grep _etext + 19287: 0000000000035ac0 0 NOTYPE GLOBAL DEFAULT 3 _etext + +The .data output section has to be aligned to a 32 byte boundary, see the +FLAT_DATA_ALIGN 0x20 macro and its usage in fs/binfmt_flat.c: +https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/fs/binfmt_flat.c?h=v5.17#n59 + +Readd an explicit ALIGN attribute on the .data section itself, since the +linker will obey this attribute regardless if being directed to a memory +region or not. Also remove the ALIGN() command before the .data section, +since this misleads the reader to think that the Location Counter is used +when assigning an address to the .data section, when it actually is not. + +Fixes: 8a3e74446fe7 ("allow to build arm flat binaries") +Signed-off-by: Niklas Cassel +--- + elf2flt.ld.in | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/elf2flt.ld.in b/elf2flt.ld.in +index 0df999d..e5aea14 100644 +--- a/elf2flt.ld.in ++++ b/elf2flt.ld.in +@@ -94,12 +94,9 @@ W_RODAT: *(.gnu.linkonce.r*) + *(.ARM.exidx* .gnu.linkonce.armexidx.*) + } > flatmem + @SYMBOL_PREFIX@__exidx_end = .; +- +- . = ALIGN(0x20) ; + @SYMBOL_PREFIX@_etext = . ; + +- .data : { +- . = ALIGN(0x4) ; ++ .data ALIGN(0x20): { + @SYMBOL_PREFIX@_sdata = . ; + @SYMBOL_PREFIX@__data_start = . ; + @SYMBOL_PREFIX@data_start = . ; +-- +2.35.1 + diff --git a/package/elf2flt/0003-elf2flt-add-riscv-64-bits-support.patch b/package/elf2flt/0003-elf2flt-add-riscv-64-bits-support.patch new file mode 100644 index 00000000000..15c191c83db --- /dev/null +++ b/package/elf2flt/0003-elf2flt-add-riscv-64-bits-support.patch @@ -0,0 +1,103 @@ +From 3f1f323feb5cf25d8c80861991d0360784f4d2e6 Mon Sep 17 00:00:00 2001 +From: Damien Le Moal +Date: Wed, 9 Sep 2020 17:31:33 +0900 +Subject: [PATCH] elf2flt: add riscv 64-bits support + +Add support for riscv 64bits ISA by defining the relocation types +R_RISCV_32_PCREL, R_RISCV_ADD32, R_RISCV_SUB32, R_RISCV_32 and +R_RISCV_64. riscv64 support also needs the __global_pointer$ symbol to +be defined right after the relocation tables in the data section. To +define this symbol, the "RISCV_GP" line prefix is added. The "RISCV_GP" +string is removed if the target CPU type is riscv64 and the definition +line is dropped for other CPU types. + +With these changes, buildroot and busybox build and run on riscv NOMMU +systems with Linux kernel including patch 6045ab5fea4c +("binfmt_flat: do not stop relocating GOT entries prematurely on riscv") +fixing the binfmt_flat loader. Tested on QEMU and Canaan Kendryte K210 +boards. + +This patch is based on earlier work by Christoph Hellwig . + +Signed-off-by: Damien Le Moal +--- + elf2flt.c | 16 ++++++++++++++++ + elf2flt.ld.in | 1 + + ld-elf2flt.c | 8 ++++++++ + 3 files changed, 25 insertions(+) + +diff --git a/elf2flt.c b/elf2flt.c +index da25e93..a03ea3a 100644 +--- a/elf2flt.c ++++ b/elf2flt.c +@@ -81,6 +81,8 @@ const char *elf2flt_progname; + #include + #elif defined(TARGET_xtensa) + #include ++#elif defined(TARGET_riscv64) ++#include + #endif + + #if defined(__MINGW32__) +@@ -123,6 +125,8 @@ const char *elf2flt_progname; + #define ARCH "nios2" + #elif defined(TARGET_xtensa) + #define ARCH "xtensa" ++#elif defined(TARGET_riscv64) ++#define ARCH "riscv64" + #else + #error "Don't know how to support your CPU architecture??" + #endif +@@ -812,6 +816,18 @@ output_relocs ( + goto good_32bit_resolved_reloc; + default: + goto bad_resolved_reloc; ++#elif defined(TARGET_riscv64) ++ case R_RISCV_32_PCREL: ++ case R_RISCV_ADD32: ++ case R_RISCV_ADD64: ++ case R_RISCV_SUB32: ++ case R_RISCV_SUB64: ++ continue; ++ case R_RISCV_32: ++ case R_RISCV_64: ++ goto good_32bit_resolved_reloc; ++ default: ++ goto bad_resolved_reloc; + #else + default: + /* The default is to assume that the +diff --git a/elf2flt.ld.in b/elf2flt.ld.in +index e5aea14..950849e 100644 +--- a/elf2flt.ld.in ++++ b/elf2flt.ld.in +@@ -106,6 +106,7 @@ W_RODAT: *(.gnu.linkonce.r*) + . = ALIGN(0x20) ; + LONG(-1) + . = ALIGN(0x20) ; ++RISCV_GP: __global_pointer$ = . + 0x800 ; + R_RODAT: *(.rodata) + R_RODAT: *(.rodata1) + R_RODAT: *(.rodata.*) +diff --git a/ld-elf2flt.c b/ld-elf2flt.c +index 7cb02d5..75ee1bb 100644 +--- a/ld-elf2flt.c ++++ b/ld-elf2flt.c +@@ -324,6 +324,14 @@ static int do_final_link(void) + append_option(&other_options, concat(got_offset, "=", buf, NULL)); + } + ++ /* riscv adds a global pointer symbol to the linker file with the ++ "RISCV_GP:" prefix. Remove the prefix for riscv64 architecture and ++ the entire line for other architectures. */ ++ if (streq(TARGET_CPU, "riscv64")) ++ append_sed(&sed, "^RISCV_GP:", ""); ++ else ++ append_sed(&sed, "^RISCV_GP:", NULL); ++ + /* Locate the default linker script, if we don't have one provided. */ + if (!linker_script) + linker_script = concat(ldscriptpath, "/elf2flt.ld", NULL); +-- +2.36.1 + diff --git a/package/elf2flt/0003-elf2flt-handle-binutils-2.34.patch b/package/elf2flt/0003-elf2flt-handle-binutils-2.34.patch deleted file mode 100644 index 16d56333856..00000000000 --- a/package/elf2flt/0003-elf2flt-handle-binutils-2.34.patch +++ /dev/null @@ -1,377 +0,0 @@ -From 26165906f85d82f0a4456f34b5c60fcaaef48535 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Wed, 5 Feb 2020 10:31:32 +0100 -Subject: [PATCH] elf2flt: handle binutils >= 2.34 - -The latest Binutils release (2.34) is not compatible with elf2flt due -to a change in bfd_section_* macros [1]. The issue has been reported -to the Binutils mailing list but Alan Modra recommend to bundle -libbfd library sources into each projects using it [2]. That's -because the API is not stable over the time without any backward -compatibility guaranties. - -On the other hand, the elf2flt tools needs to support modified -version of binutils for specific arch/target [3]. - -Add two tests in the configure script to detect this API change -in order to support binutils < 2.34 and binutils >= 2.34. - -Upstream status: [4] - -[1] https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=fd3619828e94a24a92cddec42cbc0ab33352eeb4 -[2] https://sourceware.org/ml/binutils/2020-02/msg00044.html -[3] https://github.com/uclinux-dev/elf2flt/issues/14 -[4] https://github.com/uclinux-dev/elf2flt/pull/15 - -Signed-off-by: Romain Naour ---- - configure.ac | 16 +++++++++++ - elf2flt.c | 81 +++++++++++++++++++++++++++++----------------------- - 2 files changed, 61 insertions(+), 36 deletions(-) - -diff --git a/configure.ac b/configure.ac -index e82eb1d..cf7dea8 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -229,6 +229,22 @@ AC_CHECK_FUNCS([ \ - strsignal \ - ]) - -+dnl Various bfd section macros and functions like bfd_section_size() have been -+dnl modified starting with binutils >= 2.34. -+dnl Check if the prototypes take a bfd argument. -+if test "$binutils_build_dir" != "NONE"; then -+ CFLAGS="-I$binutils_include_dir -I$bfd_include_dir $CFLAGS" -+fi -+ -+AC_TRY_COMPILE([#include ], -+ [const asection *sec; bfd_section_size(sec);], -+ bfd_section_api_takes_bfd=no, -+ bfd_section_api_takes_bfd=yes) -+if test "$bfd_section_api_takes_bfd" = "yes" ; then -+ AC_DEFINE(HAVE_BFD_SECTION_API_TAKES_BFD, 1, -+ [define to 1 for binutils < 2.34]) -+fi -+ - if test "$GCC" = yes ; then - CFLAGS="-Wall $CFLAGS" - if test "$werror" = 1 ; then -diff --git a/elf2flt.c b/elf2flt.c -index b93aecd..3bcf4fe 100644 ---- a/elf2flt.c -+++ b/elf2flt.c -@@ -149,6 +149,17 @@ const char *elf2flt_progname; - #define O_BINARY 0 - #endif - -+/* -+ * The bfd parameter isn't actually used by any of the bfd_section funcs and -+ * have been removed since binutils 2.34. -+ */ -+#ifdef HAVE_BFD_SECTION_API_TAKES_BFD -+#define elf2flt_bfd_section_size(s) bfd_section_size(NULL, s) -+#define elf2flt_bfd_section_vma(s) bfd_section_vma(NULL, s) -+#else -+#define elf2flt_bfd_section_size(s) bfd_section_size(s) -+#define elf2flt_bfd_section_vma(s) bfd_section_vma(s) -+#endif - - /* Extra output when running. */ - static int verbose = 0; -@@ -323,10 +334,8 @@ compare_relocs (const void *pa, const void *pb) - else if (!rb->sym_ptr_ptr || !*rb->sym_ptr_ptr) - return 1; - -- a_vma = bfd_section_vma(compare_relocs_bfd, -- (*(ra->sym_ptr_ptr))->section); -- b_vma = bfd_section_vma(compare_relocs_bfd, -- (*(rb->sym_ptr_ptr))->section); -+ a_vma = elf2flt_bfd_section_vma((*(ra->sym_ptr_ptr))->section); -+ b_vma = elf2flt_bfd_section_vma((*(rb->sym_ptr_ptr))->section); - va = (*(ra->sym_ptr_ptr))->value + a_vma + ra->addend; - vb = (*(rb->sym_ptr_ptr))->value + b_vma + rb->addend; - return va - vb; -@@ -403,7 +412,7 @@ output_relocs ( - } - - for (a = abs_bfd->sections; (a != (asection *) NULL); a = a->next) { -- section_vma = bfd_section_vma(abs_bfd, a); -+ section_vma = elf2flt_bfd_section_vma(a); - - if (verbose) - printf("SECTION: %s [%p]: flags=0x%x vma=0x%"PRIx32"\n", -@@ -442,7 +451,7 @@ output_relocs ( - continue; - if (verbose) - printf(" RELOCS: %s [%p]: flags=0x%x vma=0x%"BFD_VMA_FMT"x\n", -- r->name, r, r->flags, bfd_section_vma(abs_bfd, r)); -+ r->name, r, r->flags, elf2flt_bfd_section_vma(r)); - if ((r->flags & SEC_RELOC) == 0) - continue; - relsize = bfd_get_reloc_upper_bound(rel_bfd, r); -@@ -694,7 +703,7 @@ output_relocs ( - case R_BFIN_RIMM16: - case R_BFIN_LUIMM16: - case R_BFIN_HUIMM16: -- sym_vma = bfd_section_vma(abs_bfd, sym_section); -+ sym_vma = elf2flt_bfd_section_vma(sym_section); - sym_addr += sym_vma + q->addend; - - if (weak_und_symbol(sym_section->name, (*(q->sym_ptr_ptr)))) -@@ -727,7 +736,7 @@ output_relocs ( - break; - - case R_BFIN_BYTE4_DATA: -- sym_vma = bfd_section_vma(abs_bfd, sym_section); -+ sym_vma = elf2flt_bfd_section_vma(sym_section); - sym_addr += sym_vma + q->addend; - - if (weak_und_symbol (sym_section->name, (*(q->sym_ptr_ptr)))) -@@ -885,7 +894,7 @@ output_relocs ( - #if defined(TARGET_m68k) - case R_68K_32: - relocation_needed = 1; -- sym_vma = bfd_section_vma(abs_bfd, sym_section); -+ sym_vma = elf2flt_bfd_section_vma(sym_section); - sym_addr += sym_vma + q->addend; - break; - case R_68K_PC16: -@@ -910,7 +919,7 @@ output_relocs ( - q->address, sym_addr, - (*p)->howto->rightshift, - *(uint32_t *)r_mem); -- sym_vma = bfd_section_vma(abs_bfd, sym_section); -+ sym_vma = elf2flt_bfd_section_vma(sym_section); - sym_addr += sym_vma + q->addend; - break; - case R_ARM_GOT32: -@@ -938,7 +947,7 @@ output_relocs ( - #ifdef TARGET_v850 - case R_V850_ABS32: - relocation_needed = 1; -- sym_vma = bfd_section_vma(abs_bfd, sym_section); -+ sym_vma = elf2flt_bfd_section_vma(sym_section); - sym_addr += sym_vma + q->addend; - break; - case R_V850_ZDA_16_16_OFFSET: -@@ -960,7 +969,7 @@ output_relocs ( - sym_addr = (*(q->sym_ptr_ptr))->value; - q->address -= 1; - r_mem -= 1; /* tracks q->address */ -- sym_vma = bfd_section_vma(abs_bfd, sym_section); -+ sym_vma = elf2flt_bfd_section_vma(sym_section); - sym_addr += sym_vma + q->addend; - sym_addr |= (*(unsigned char *)r_mem<<24); - break; -@@ -973,7 +982,7 @@ output_relocs ( - /* Absolute symbol done not relocation */ - relocation_needed = !bfd_is_abs_section(sym_section); - sym_addr = (*(q->sym_ptr_ptr))->value; -- sym_vma = bfd_section_vma(abs_bfd, sym_section); -+ sym_vma = elf2flt_bfd_section_vma(sym_section); - sym_addr += sym_vma + q->addend; - break; - case R_H8_DIR32: -@@ -986,7 +995,7 @@ output_relocs ( - } - relocation_needed = 1; - sym_addr = (*(q->sym_ptr_ptr))->value; -- sym_vma = bfd_section_vma(abs_bfd, sym_section); -+ sym_vma = elf2flt_bfd_section_vma(sym_section); - sym_addr += sym_vma + q->addend; - break; - case R_H8_PCREL16: -@@ -1012,7 +1021,7 @@ output_relocs ( - #ifdef TARGET_microblaze - case R_MICROBLAZE_64: - /* work out the relocation */ -- sym_vma = bfd_section_vma(abs_bfd, sym_section); -+ sym_vma = elf2flt_bfd_section_vma(sym_section); - sym_addr += sym_vma + q->addend; - /* Write relocated pointer back */ - r_mem[2] = (sym_addr >> 24) & 0xff; -@@ -1026,7 +1035,7 @@ output_relocs ( - pflags = 0x80000000; - break; - case R_MICROBLAZE_32: -- sym_vma = bfd_section_vma(abs_bfd, sym_section); -+ sym_vma = elf2flt_bfd_section_vma(sym_section); - sym_addr += sym_vma + q->addend; - relocation_needed = 1; - break; -@@ -1058,7 +1067,7 @@ output_relocs ( - case R_NIOS2_BFD_RELOC_32: - relocation_needed = 1; - pflags = (FLAT_NIOS2_R_32 << 28); -- sym_vma = bfd_section_vma(abs_bfd, sym_section); -+ sym_vma = elf2flt_bfd_section_vma(sym_section); - sym_addr += sym_vma + q->addend; - /* modify target, in target order */ - *(unsigned long *)r_mem = htoniosl(sym_addr); -@@ -1068,7 +1077,7 @@ output_relocs ( - unsigned long exist_val; - relocation_needed = 1; - pflags = (FLAT_NIOS2_R_CALL26 << 28); -- sym_vma = bfd_section_vma(abs_bfd, sym_section); -+ sym_vma = elf2flt_bfd_section_vma(sym_section); - sym_addr += sym_vma + q->addend; - - /* modify target, in target order */ -@@ -1099,7 +1108,7 @@ output_relocs ( - ? FLAT_NIOS2_R_HIADJ_LO : FLAT_NIOS2_R_HI_LO; - pflags <<= 28; - -- sym_vma = bfd_section_vma(abs_bfd, sym_section); -+ sym_vma = elf2flt_bfd_section_vma(sym_section); - sym_addr += sym_vma + q->addend; - - /* modify high 16 bits, in target order */ -@@ -1132,7 +1141,7 @@ output_relocs ( - goto NIOS2_RELOC_ERR; - } - /* _gp holds a absolute value, otherwise the ld cannot generate correct code */ -- sym_vma = bfd_section_vma(abs_bfd, sym_section); -+ sym_vma = elf2flt_bfd_section_vma(sym_section); - //printf("sym=%x, %d, _gp=%x, %d\n", sym_addr+sym_vma, sym_addr+sym_vma, gp, gp); - sym_addr += sym_vma + q->addend; - sym_addr -= gp; -@@ -1213,7 +1222,7 @@ NIOS2_RELOC_ERR: - case R_SPARC_32: - case R_SPARC_UA32: - relocation_needed = 1; -- sym_vma = bfd_section_vma(abs_bfd, sym_section); -+ sym_vma = elf2flt_bfd_section_vma(sym_section); - sym_addr += sym_vma + q->addend; - break; - case R_SPARC_PC22: -@@ -1232,7 +1241,7 @@ NIOS2_RELOC_ERR: - case R_SPARC_HI22: - relocation_needed = 1; - pflags = 0x80000000; -- sym_vma = bfd_section_vma(abs_bfd, sym_section); -+ sym_vma = elf2flt_bfd_section_vma(sym_section); - sym_addr += sym_vma + q->addend; - sym_addr |= ( - htonl(*(uint32_t *)r_mem) -@@ -1242,7 +1251,7 @@ NIOS2_RELOC_ERR: - case R_SPARC_LO10: - relocation_needed = 1; - pflags = 0x40000000; -- sym_vma = bfd_section_vma(abs_bfd, sym_section); -+ sym_vma = elf2flt_bfd_section_vma(sym_section); - sym_addr += sym_vma + q->addend; - sym_addr &= 0x000003ff; - sym_addr |= ( -@@ -1256,7 +1265,7 @@ NIOS2_RELOC_ERR: - #ifdef TARGET_sh - case R_SH_DIR32: - relocation_needed = 1; -- sym_vma = bfd_section_vma(abs_bfd, sym_section); -+ sym_vma = elf2flt_bfd_section_vma(sym_section); - sym_addr += sym_vma + q->addend; - break; - case R_SH_REL32: -@@ -1288,7 +1297,7 @@ NIOS2_RELOC_ERR: - case R_E1_CONST31: - relocation_needed = 1; - DBG_E1("Handling Reloc \n"); -- sec_vma = bfd_section_vma(abs_bfd, sym_section); -+ sec_vma = elf2flt_bfd_section_vma(sym_section); - DBG_E1("sec_vma : [0x%x], sym_addr : [0x%x], q->address : [0x%x]\n", - sec_vma, sym_addr, q->address); - sym_addr = sec_vma + sym_addr; -@@ -1303,7 +1312,7 @@ NIOS2_RELOC_ERR: - relocation_needed = 0; - DBG_E1("Handling Reloc \n"); - DBG_E1("DONT RELOCATE AT LOADING\n"); -- sec_vma = bfd_section_vma(abs_bfd, sym_section); -+ sec_vma = elf2flt_bfd_section_vma(sym_section); - DBG_E1("sec_vma : [0x%x], sym_addr : [0x%x], q->address : [0x%x]\n", - sec_vma, sym_addr, q->address); - sym_addr = sec_vma + sym_addr; -@@ -1330,7 +1339,7 @@ NIOS2_RELOC_ERR: - relocation_needed = 0; - DBG_E1("Handling Reloc \n"); - DBG_E1("DONT RELOCATE AT LOADING\n"); -- sec_vma = bfd_section_vma(abs_bfd, sym_section); -+ sec_vma = elf2flt_bfd_section_vma(sym_section); - DBG_E1("sec_vma : [0x%x], sym_addr : [0x%x], q->address : [0x%x]\n", - sec_vma, sym_addr, q->address); - sym_addr = sec_vma + sym_addr; -@@ -1363,7 +1372,7 @@ NIOS2_RELOC_ERR: - DBG_E1("Handling Reloc \n"); - DIS29_RELOCATION: - relocation_needed = 1; -- sec_vma = bfd_section_vma(abs_bfd, sym_section); -+ sec_vma = elf2flt_bfd_section_vma(sym_section); - DBG_E1("sec_vma : [0x%x], sym_addr : [0x%08x]\n", - sec_vma, sym_addr); - sym_addr = sec_vma + sym_addr; -@@ -1380,7 +1389,7 @@ DIS29_RELOCATION: - relocation_needed = 0; - DBG_E1("Handling Reloc \n"); - DBG_E1("DONT RELOCATE AT LOADING\n"); -- sec_vma = bfd_section_vma(abs_bfd, sym_section); -+ sec_vma = elf2flt_bfd_section_vma(sym_section); - DBG_E1("sec_vma : [0x%x], sym_addr : [0x%x]\n", - sec_vma, sym_addr); - sym_addr = sec_vma + sym_addr; -@@ -1406,7 +1415,7 @@ DIS29_RELOCATION: - case R_E1_IMM32: - relocation_needed = 1; - DBG_E1("Handling Reloc \n"); -- sec_vma = bfd_section_vma(abs_bfd, sym_section); -+ sec_vma = elf2flt_bfd_section_vma(sym_section); - DBG_E1("sec_vma : [0x%x], sym_addr : [0x%x]\n", - sec_vma, sym_addr); - sym_addr = sec_vma + sym_addr; -@@ -1422,7 +1431,7 @@ DIS29_RELOCATION: - case R_E1_WORD: - relocation_needed = 1; - DBG_E1("Handling Reloc \n"); -- sec_vma = bfd_section_vma(abs_bfd, sym_section); -+ sec_vma = elf2flt_bfd_section_vma(sym_section); - DBG_E1("sec_vma : [0x%x], sym_addr : [0x%x]\n", - sec_vma, sym_addr); - sym_addr = sec_vma + sym_addr; -@@ -1449,7 +1458,7 @@ DIS29_RELOCATION: - } - - sprintf(&addstr[0], "+0x%lx", sym_addr - (*(q->sym_ptr_ptr))->value - -- bfd_section_vma(abs_bfd, sym_section)); -+ elf2flt_bfd_section_vma(sym_section)); - - - /* -@@ -1887,8 +1896,8 @@ int main(int argc, char *argv[]) - } else - continue; - -- sec_size = bfd_section_size(abs_bfd, s); -- sec_vma = bfd_section_vma(abs_bfd, s); -+ sec_size = elf2flt_bfd_section_size(s); -+ sec_vma = elf2flt_bfd_section_vma(s); - - if (sec_vma < *vma) { - if (*len > 0) -@@ -1913,7 +1922,7 @@ int main(int argc, char *argv[]) - if (s->flags & SEC_CODE) - if (!bfd_get_section_contents(abs_bfd, s, - text + (s->vma - text_vma), 0, -- bfd_section_size(abs_bfd, s))) -+ elf2flt_bfd_section_size(s))) - { - fatal("read error section %s", s->name); - } -@@ -1939,7 +1948,7 @@ int main(int argc, char *argv[]) - if (s->flags & SEC_DATA) - if (!bfd_get_section_contents(abs_bfd, s, - data + (s->vma - data_vma), 0, -- bfd_section_size(abs_bfd, s))) -+ elf2flt_bfd_section_size(s))) - { - fatal("read error section %s", s->name); - } --- -2.25.4 - diff --git a/package/elf2flt/0004-elf2flt-add-riscv-64-bits-support.patch b/package/elf2flt/0004-elf2flt-add-riscv-64-bits-support.patch deleted file mode 100644 index 4b007584460..00000000000 --- a/package/elf2flt/0004-elf2flt-add-riscv-64-bits-support.patch +++ /dev/null @@ -1,137 +0,0 @@ -From 1dea576eac4289602adc4a37f48c80330bf82e63 Mon Sep 17 00:00:00 2001 -From: Damien Le Moal -Date: Wed, 9 Sep 2020 17:31:33 +0900 -Subject: [PATCH] elf2flt: add riscv 64-bits support - -Add support for riscv 64bits ISA by defining the relocation types -R_RISCV_32_PCREL, R_RISCV_ADD32, R_RISCV_SUB32, R_RISCV_32 and -R_RISCV_64. riscv64 support also needs the __global_pointer$ symbol to -be defined right after the relocation tables in the data section. -Furthermore, the .got and .got.plt sections must be reversed. These 2 -requirements are handled with runtime modifications of the default -linker script using the append_sed() function. -(1) For the .got.plt and .got sections order swap, append_sed() is used -to rename "(.got.plt)" to "(.got.tmp)" and to rename "(.got)" to -"(.got.plt)". A last call finalize the name swap by replacing -"(.got.tmp)" with "(.got)" -(2) For the global pointer synbol, a definition line starting with -"RISCV_GP" is added. The "RISCV_GP" string is removed if the target CPU -type is riscv64. The definition line is dropped for other CPU types. - -With these changes, buildroot/busybox builds and run on NOMMU -systems with kernel 5.13. Tested on Canaan Kendryte K210 boards. - -This patch is based on earlier work by Christoph Hellwig . - -Signed-off-by: Damien Le Moal ---- - elf2flt.c | 23 +++++++++++++++++++++++ - elf2flt.ld.in | 9 +++++---- - ld-elf2flt.c | 16 ++++++++++++++++ - 3 files changed, 44 insertions(+), 4 deletions(-) - -diff --git a/elf2flt.c b/elf2flt.c -index f87f1fc..dbce467 100644 ---- a/elf2flt.c -+++ b/elf2flt.c -@@ -80,6 +80,8 @@ const char *elf2flt_progname; - #include - #elif defined(TARGET_xtensa) - #include -+#elif defined(TARGET_riscv64) -+#include - #endif - - #if defined(__MINGW32__) -@@ -122,6 +124,8 @@ const char *elf2flt_progname; - #define ARCH "nios2" - #elif defined(TARGET_xtensa) - #define ARCH "xtensa" -+#elif defined(TARGET_riscv64) -+#define ARCH "riscv64" - #else - #error "Don't know how to support your CPU architecture??" - #endif -@@ -797,6 +801,16 @@ output_relocs ( - goto good_32bit_resolved_reloc; - default: - goto bad_resolved_reloc; -+#elif defined(TARGET_riscv64) -+ case R_RISCV_32_PCREL: -+ case R_RISCV_ADD32: -+ case R_RISCV_SUB32: -+ continue; -+ case R_RISCV_32: -+ case R_RISCV_64: -+ goto good_32bit_resolved_reloc; -+ default: -+ goto bad_resolved_reloc; - #else - default: - /* The default is to assume that the -@@ -1806,6 +1820,15 @@ int main(int argc, char *argv[]) - if (!load_to_ram && !pfile) - load_to_ram = 1; - -+#if defined(TARGET_riscv64) -+ /* -+ * riscv only supports loading text and data contiguously. -+ * So fail if load_to_ram is false. -+ */ -+ if (!load_to_ram) -+ fatal("Loading to RAM ('-r' option) is required"); -+#endif -+ - fname = argv[argc-1]; - - if (pfile) { -diff --git a/elf2flt.ld.in b/elf2flt.ld.in -index ec1fe6f..c0c44b8 100644 ---- a/elf2flt.ld.in -+++ b/elf2flt.ld.in -@@ -70,10 +70,11 @@ W_RODAT *(.gnu.linkonce.r*) - . = ALIGN(0x20) ; - LONG(-1) - . = ALIGN(0x20) ; --R_RODAT *(.rodata) --R_RODAT *(.rodata1) --R_RODAT *(.rodata.*) --R_RODAT *(.gnu.linkonce.r*) -+RISCV_GP: __global_pointer$ = . + 0x800 ; -+R_RODAT *(.rodata) -+R_RODAT *(.rodata1) -+R_RODAT *(.rodata.*) -+R_RODAT *(.gnu.linkonce.r*) - *(.data) - *(.data1) - *(.data.*) -diff --git a/ld-elf2flt.c b/ld-elf2flt.c -index e5de506..31b565f 100644 ---- a/ld-elf2flt.c -+++ b/ld-elf2flt.c -@@ -324,6 +324,22 @@ static int do_final_link(void) - append_option(&other_options, concat(got_offset, "=", buf, NULL)); - } - -+ if (streq(TARGET_CPU, "riscv64")) { -+ /* -+ * The .got section must come before the .got.plt section -+ * (gcc/ld bug ?). -+ */ -+ append_sed(&sed, "(.got.plt)", "(.got.tmp)"); -+ append_sed(&sed, "(.got.plt)", "(.got)"); -+ append_sed(&sed, "(.got.tmp)", "(.got.plt)"); -+ -+ /* The global pointer symbol is defined after the GOT. */ -+ append_sed(&sed, "^RISCV_GP:", ""); -+ } else { -+ /* Get rid of the global pointer definition. */ -+ append_sed(&sed, "^RISCV_GP:", NULL); -+ } -+ - /* Locate the default linker script, if we don't have one provided. */ - if (!linker_script) - linker_script = concat(ldscriptpath, "/elf2flt.ld", NULL); --- -2.31.1 - diff --git a/package/elf2flt/0004-elf2flt-create-a-common-helper-function.patch b/package/elf2flt/0004-elf2flt-create-a-common-helper-function.patch new file mode 100644 index 00000000000..6fee99d45a1 --- /dev/null +++ b/package/elf2flt/0004-elf2flt-create-a-common-helper-function.patch @@ -0,0 +1,76 @@ +From 37e1e0ace8ccebf54ec2f5522bfc1f9db86946ad Mon Sep 17 00:00:00 2001 +From: Niklas Cassel +Date: Tue, 9 Aug 2022 12:13:50 +0200 +Subject: [PATCH] elf2flt: create a common helper function + +In order to make the code more maintainable, +move duplicated code to a common helper function. + +No functional change intended. + +Signed-off-by: Niklas Cassel +--- + elf2flt.c | 19 +++++++++++-------- + 1 file changed, 11 insertions(+), 8 deletions(-) + +diff --git a/elf2flt.c b/elf2flt.c +index 669591e..9c32f9a 100644 +--- a/elf2flt.c ++++ b/elf2flt.c +@@ -337,6 +337,13 @@ compare_relocs (const void *pa, const void *pb) + } + #endif + ++static bool ++ro_reloc_data_section_should_be_in_text(asection *s) ++{ ++ return (s->flags & (SEC_DATA | SEC_READONLY | SEC_RELOC)) == ++ (SEC_DATA | SEC_READONLY | SEC_RELOC); ++} ++ + static uint32_t * + output_relocs ( + bfd *abs_bfd, +@@ -428,8 +435,7 @@ output_relocs ( + */ + if ((!pic_with_got || ALWAYS_RELOC_TEXT) && + ((a->flags & SEC_CODE) || +- ((a->flags & (SEC_DATA | SEC_READONLY | SEC_RELOC)) == +- (SEC_DATA | SEC_READONLY | SEC_RELOC)))) ++ ro_reloc_data_section_should_be_in_text(a))) + sectionp = text + (a->vma - text_vma); + else if (a->flags & SEC_DATA) + sectionp = data + (a->vma - data_vma); +@@ -1893,8 +1899,7 @@ int main(int argc, char *argv[]) + bfd_vma sec_vma; + + if ((s->flags & SEC_CODE) || +- ((s->flags & (SEC_DATA | SEC_READONLY | SEC_RELOC)) == +- (SEC_DATA | SEC_READONLY | SEC_RELOC))) { ++ ro_reloc_data_section_should_be_in_text(s)) { + vma = &text_vma; + len = &text_len; + } else if (s->flags & SEC_DATA) { +@@ -1932,8 +1937,7 @@ int main(int argc, char *argv[]) + * data sections.*/ + for (s = abs_bfd->sections; s != NULL; s = s->next) + if ((s->flags & SEC_CODE) || +- ((s->flags & (SEC_DATA | SEC_READONLY | SEC_RELOC)) == +- (SEC_DATA | SEC_READONLY | SEC_RELOC))) ++ ro_reloc_data_section_should_be_in_text(s)) + if (!bfd_get_section_contents(abs_bfd, s, + text + (s->vma - text_vma), 0, + bfd_section_size(abs_bfd, s))) +@@ -1962,8 +1966,7 @@ int main(int argc, char *argv[]) + * data sections already included in the text output section.*/ + for (s = abs_bfd->sections; s != NULL; s = s->next) + if ((s->flags & SEC_DATA) && +- ((s->flags & (SEC_READONLY | SEC_RELOC)) != +- (SEC_READONLY | SEC_RELOC))) ++ !ro_reloc_data_section_should_be_in_text(s)) + if (!bfd_get_section_contents(abs_bfd, s, + data + (s->vma - data_vma), 0, + bfd_section_size(abs_bfd, s))) +-- +2.37.1 + diff --git a/package/elf2flt/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch b/package/elf2flt/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch new file mode 100644 index 00000000000..616bbc891fc --- /dev/null +++ b/package/elf2flt/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch @@ -0,0 +1,74 @@ +From a8c9f650b82109abf7aa730f298ea5182ed62613 Mon Sep 17 00:00:00 2001 +From: Niklas Cassel +Date: Tue, 9 Aug 2022 21:06:05 +0200 +Subject: [PATCH] elf2flt: fix fatal error regression on m68k, xtensa, riscv64 + +Commit ba379d08bb78 ("elf2flt: fix for segfault on some ARM ELFs") +changed the condition of which input sections that should be included +in the .text output section from: +((a->flags & (SEC_DATA | SEC_READONLY)) == (SEC_DATA | SEC_READONLY)) +to: +((a->flags & (SEC_DATA | SEC_READONLY | SEC_RELOC)) == +(SEC_DATA | SEC_READONLY | SEC_RELOC)) + +On ARM, the .eh_frame input section does not have the SEC_RELOC flag set, +so on ARM, this change caused .eh_frame to move from .text to .data. + +However, on e.g. m68k, xtensa and riscv64, the .eh_frame input section +does have the SEC_RELOC flag set, which means that the change in +commit ba379d08bb78 ("elf2flt: fix for segfault on some ARM ELFs") +caused .eh_frame to move in an opposite way, i.e. from .data to .text. + +This resulted in a fatal error on m68k, xtensa and riscv64: +ERROR: text=0x3bab8 overlaps data=0x33f60 ? + +This is because elf2flt cannot append to .text after .data has been +appended to. + +Note that the binutils maintainer says that the correct thing is +to put read-only relocation data sections in .text: +https://sourceware.org/legacy-ml/binutils/2019-10/msg00132.html + +So the proper fix is probably to rewrite elf2flt so that it can append +to .text after .data has been appended to (which will require elf2flt +to move/relocate everything that has already been appended to .data, +since the virtual addresses are contiguous). + +However, for now, add an exception for input sections which have all +three flags SEC_DATA, SEC_READONLY, and SEC_RELOC set, and which have a +name equal to a problematic input section (.eh_frame, .gcc_except_table). +That way, we get the same behavior as older elf2flt releases for m68k, +xtensa and riscv64, where we put read-only relocation data in .data, +which was working perfectly fine. + +This exception will not change any behavior on ARM, as the .eh_frame +input section does not have flag SEC_RELOC set. + +Signed-off-by: Niklas Cassel +--- + elf2flt.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/elf2flt.c b/elf2flt.c +index e0d7891..39d035f 100644 +--- a/elf2flt.c ++++ b/elf2flt.c +@@ -341,8 +341,13 @@ compare_relocs (const void *pa, const void *pb) + static bool + ro_reloc_data_section_should_be_in_text(asection *s) + { +- return (s->flags & (SEC_DATA | SEC_READONLY | SEC_RELOC)) == +- (SEC_DATA | SEC_READONLY | SEC_RELOC); ++ if ((s->flags & (SEC_DATA | SEC_READONLY | SEC_RELOC)) == ++ (SEC_DATA | SEC_READONLY | SEC_RELOC)) { ++ if (!strcmp(".eh_frame", s->name) || !strcmp(".gcc_except_table", s->name)) ++ return false; ++ return true; ++ } ++ return false; + } + + static uint32_t * +-- +2.39.0 + diff --git a/package/elf2flt/0006-elf2flt-xtensa-fix-text-relocations.patch b/package/elf2flt/0006-elf2flt-xtensa-fix-text-relocations.patch new file mode 100644 index 00000000000..3664775906e --- /dev/null +++ b/package/elf2flt/0006-elf2flt-xtensa-fix-text-relocations.patch @@ -0,0 +1,51 @@ +From e248d9774506fdd8698b14a7edead113f19ecdb0 Mon Sep 17 00:00:00 2001 +From: Max Filippov +Date: Tue, 29 Nov 2022 17:47:54 -0800 +Subject: [PATCH] xtensa: fix text relocations + +The commit 5e08f1968316 ("Don't always update text in !pic_with_got case") +changed good_32bit_resolved_reloc to not do endianness swapping for +relocated entries in the text segment. This broke little-endian xtensa +FLAT images which after this change fail to start with the following +message: + + binfmt_flat: reloc outside program 0x24c80100 (0 - 0x6e430/0x56a20) + +Fix it by preserving 'update_text' when building for xtensa. + +Fixes: 5e08f1968316 ("Don't always update text in !pic_with_got case") +Reported-by: Niklas Cassel +Signed-off-by: Max Filippov +--- + elf2flt.c | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) + +diff --git a/elf2flt.c b/elf2flt.c +index b93aecdaced3..cec3f4a22239 100644 +--- a/elf2flt.c ++++ b/elf2flt.c +@@ -808,7 +808,20 @@ output_relocs ( + continue; + case R_XTENSA_32: + case R_XTENSA_PLT: +- goto good_32bit_resolved_reloc; ++ if (bfd_big_endian (abs_bfd)) ++ sym_addr = ++ (r_mem[0] << 24) ++ + (r_mem[1] << 16) ++ + (r_mem[2] << 8) ++ + r_mem[3]; ++ else ++ sym_addr = ++ r_mem[0] ++ + (r_mem[1] << 8) ++ + (r_mem[2] << 16) ++ + (r_mem[3] << 24); ++ relocation_needed = 1; ++ break; + default: + goto bad_resolved_reloc; + #else +-- +2.30.2 + diff --git a/package/elf2flt/Config.in.host b/package/elf2flt/Config.in.host deleted file mode 100644 index 2bab0095c22..00000000000 --- a/package/elf2flt/Config.in.host +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_HOST_ELF2FLT - bool "Enable elf2flt support?" - depends on BR2_arm || BR2_sh || BR2_sparc || BR2_xtensa || BR2_RISCV_64 - depends on !BR2_USE_MMU - help - uCLinux uses a Binary Flat format commonly known as BFLT. It - is a relatively simple and lightweight executable format - based on the original a.out format. - - This option compiles the required tools and makes the required - modifications on your toolchain (linker). - - https://github.com/uclinux-dev/elf2flt diff --git a/package/elf2flt/elf2flt.hash b/package/elf2flt/elf2flt.hash index c4b0697fcd3..c576f65cdb0 100644 --- a/package/elf2flt/elf2flt.hash +++ b/package/elf2flt/elf2flt.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d63baae6fe0d7fcc50a635be151a6f9e1e83dba30568046a869a395c15bf6284 elf2flt-7e33f28df198c46764021ed14408bd262751e148.tar.gz +sha256 6637432ed58dee2d42d09e3b9a902a0dd3b9975acba0c0b24ef9e4e9253159a9 elf2flt-2021.08.tar.gz sha256 f20bc5007904094e3a4e9fbcc3526cdd40893f91d458c3139b308e5c4c0899c6 LICENSE.TXT diff --git a/package/elf2flt/elf2flt.mk b/package/elf2flt/elf2flt.mk index 3239af1b9a1..6cd0786c3d4 100644 --- a/package/elf2flt/elf2flt.mk +++ b/package/elf2flt/elf2flt.mk @@ -4,14 +4,14 @@ # ################################################################################ -ELF2FLT_VERSION = 7e33f28df198c46764021ed14408bd262751e148 -ELF2FLT_SITE = $(call github,uclinux-dev,elf2flt,$(ELF2FLT_VERSION)) +ELF2FLT_VERSION = 2021.08 +ELF2FLT_SITE = $(call github,uclinux-dev,elf2flt,v$(ELF2FLT_VERSION)) ELF2FLT_LICENSE = GPL-2.0+ ELF2FLT_LICENSE_FILES = LICENSE.TXT HOST_ELF2FLT_DEPENDENCIES = host-binutils host-zlib -# 0003-elf2flt-handle-binutils-2.34.patch +# 0001-elf2flt-handle-binutils-2.34.patch HOST_ELF2FLT_AUTORECONF = YES # It is not exactly a host variant, but more a cross variant, which is @@ -24,11 +24,7 @@ HOST_ELF2FLT_CONF_OPTS = \ --target=$(GNU_TARGET_NAME) \ --disable-werror -HOST_ELF2FLT_LIBS = -lz - -ifeq ($(BR2_GCC_ENABLE_LTO),y) -HOST_ELF2FLT_LIBS += -ldl -endif +HOST_ELF2FLT_LIBS = -lz -ldl HOST_ELF2FLT_CONF_ENV = LIBS="$(HOST_ELF2FLT_LIBS)" diff --git a/package/elftosb/elftosb.hash b/package/elftosb/elftosb.hash index 83f5ce664e6..fbdd6c4c0fe 100644 --- a/package/elftosb/elftosb.hash +++ b/package/elftosb/elftosb.hash @@ -1,4 +1,4 @@ # From http://repository.timesys.com/buildsources/e/elftosb/elftosb-10.12.01/elftosb-10.12.01.tar.gz.md5sum -md5 e8005d606c1e0bb3507c82f6eceb3056 elftosb-10.12.01.tar.gz +md5 e8005d606c1e0bb3507c82f6eceb3056 elftosb-10.12.01.tar.gz # locally computed sha256 c861c25936b7bc0cf180023d540f2b0d0f5892edd27fd00efef4b6234c1df27a COPYING diff --git a/package/elixir/elixir.hash b/package/elixir/elixir.hash deleted file mode 100644 index b4d2f8b6b0c..00000000000 --- a/package/elixir/elixir.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Computed locally -sha256 f3465d8a8e386f3e74831bf9594ee39e6dfde6aa430fe9260844cfe46aa10139 elixir-1.9.4.tar.gz -sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 LICENSE diff --git a/package/elixir/elixir.mk b/package/elixir/elixir.mk deleted file mode 100644 index 6d935516f49..00000000000 --- a/package/elixir/elixir.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# elixir -# -################################################################################ - -ELIXIR_VERSION = 1.9.4 -ELIXIR_SITE = $(call github,elixir-lang,elixir,v$(ELIXIR_VERSION)) -ELIXIR_LICENSE = Apache-2.0 -ELIXIR_LICENSE_FILES = LICENSE -HOST_ELIXIR_DEPENDENCIES = host-erlang - -define HOST_ELIXIR_BUILD_CMDS - $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) compile -endef - -define HOST_ELIXIR_INSTALL_CMDS - $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) PREFIX="$(HOST_DIR)" -C $(@D) install -endef - -$(eval $(host-generic-package)) diff --git a/package/ell/ell.hash b/package/ell/ell.hash index cd724eae2db..c0f1731676b 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 4901a0baac4eb24163ceafb44fd448430361d25d8f17d89ff29f8b0b162b3eb9 ell-0.47.tar.xz +sha256 58eb8b2b64087f7479d5db6a830a0656c536d93e5f11d4c9a4443ce8760a1b63 ell-0.56.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/ell/ell.mk b/package/ell/ell.mk index 3ce64b6f2f9..994b0e19f01 100644 --- a/package/ell/ell.mk +++ b/package/ell/ell.mk @@ -4,7 +4,7 @@ # ################################################################################ -ELL_VERSION = 0.47 +ELL_VERSION = 0.56 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/emlog.hash b/package/emlog/emlog.hash index ddc61a88e81..6acd70b3f25 100644 --- a/package/emlog/emlog.hash +++ b/package/emlog/emlog.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 76082cf981b0865c8a1b300d4641c790a6556461901bbb63700df38300277271 emlog-0.70.tar.gz -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING +sha256 76082cf981b0865c8a1b300d4641c790a6556461901bbb63700df38300277271 emlog-0.70.tar.gz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/empty/empty.hash b/package/empty/empty.hash index c5fbc2b4ac7..cc74254a7a4 100644 --- a/package/empty/empty.hash +++ b/package/empty/empty.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 2fccd0faa1b3deaec1add679cbde3f34250e45872ad5df463badd4bb4edeb797 empty-0.6.21b.tgz -sha256 f01dbe3c624084900b9df1393d9062518b2bc0487acd6a3300ebd6e71352d112 COPYRIGHT +sha256 f581d560e1fa857f5304586e3c2107b5838bcf11dedcccec4a7191fa9e261b69 empty-0.6.22b.tgz +sha256 db6b65f5eaf782a92715887ac107f3477d64016301a66194a92312b13ff89be1 COPYRIGHT diff --git a/package/empty/empty.mk b/package/empty/empty.mk index a9b8080a8ee..91d94764457 100644 --- a/package/empty/empty.mk +++ b/package/empty/empty.mk @@ -4,12 +4,11 @@ # ################################################################################ -EMPTY_VERSION = 0.6.21b +EMPTY_VERSION = 0.6.22b EMPTY_SOURCE = empty-$(EMPTY_VERSION).tgz EMPTY_SITE = http://downloads.sourceforge.net/project/empty/empty/empty-$(EMPTY_VERSION) EMPTY_LICENSE = BSD-3-Clause EMPTY_LICENSE_FILES = COPYRIGHT -EMPTY_STRIP_COMPONENTS = 0 define EMPTY_BUILD_CMDS $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) all diff --git a/package/enchant/enchant.hash b/package/enchant/enchant.hash index 9df5316aac1..36ac4e07bdf 100644 --- a/package/enchant/enchant.hash +++ b/package/enchant/enchant.hash @@ -1,3 +1,3 @@ # locally computed -sha256 ce9ba47fd4d34031bd69445598a698a6611602b2b0e91d705e91a6f5099ead6e enchant-2.3.2.tar.gz +sha256 3da12103f11cf49c3cf2fd2ce3017575c5321a489e5b9bfa81dd91ec413f3891 enchant-2.3.3.tar.gz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/enchant/enchant.mk b/package/enchant/enchant.mk index e00fcb25e11..ee6f061956b 100644 --- a/package/enchant/enchant.mk +++ b/package/enchant/enchant.mk @@ -4,7 +4,7 @@ # ################################################################################ -ENCHANT_VERSION = 2.3.2 +ENCHANT_VERSION = 2.3.3 ENCHANT_SITE = \ https://github.com/AbiWord/enchant/releases/download/v$(ENCHANT_VERSION) ENCHANT_INSTALL_STAGING = YES diff --git a/package/enscript/enscript.hash b/package/enscript/enscript.hash index 4c50a165ac7..c4706c623bc 100644 --- a/package/enscript/enscript.hash +++ b/package/enscript/enscript.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 6d56bada6934d055b34b6c90399aa85975e66457ac5bf513427ae7fc77f5c0bb enscript-1.6.6.tar.gz +sha256 6d56bada6934d055b34b6c90399aa85975e66457ac5bf513427ae7fc77f5c0bb enscript-1.6.6.tar.gz # Locally computed -sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING +sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING diff --git a/package/erlang-base64url/erlang-base64url.hash b/package/erlang-base64url/erlang-base64url.hash index becbe5db61d..f3272966b79 100644 --- a/package/erlang-base64url/erlang-base64url.hash +++ b/package/erlang-base64url/erlang-base64url.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7ef7210effd25ac1f82f190fcfaef53e49d7bc40bb94112c4aa07266c32a851b erlang-base64url-1.0.1.tar.gz -sha256 d59dff2fa4c39f05188ee533fbf06479eef1b47f8cad6353f8ab3726cc6923bc LICENSE.txt +sha256 7ef7210effd25ac1f82f190fcfaef53e49d7bc40bb94112c4aa07266c32a851b erlang-base64url-1.0.1.tar.gz +sha256 d59dff2fa4c39f05188ee533fbf06479eef1b47f8cad6353f8ab3726cc6923bc LICENSE.txt diff --git a/package/erlang-eimp/erlang-eimp.hash b/package/erlang-eimp/erlang-eimp.hash index 28d22be16d7..5845815c606 100644 --- a/package/erlang-eimp/erlang-eimp.hash +++ b/package/erlang-eimp/erlang-eimp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1a529fa6e8264d3cad43861db417a1e841b28c0601aa847857fa0d6a81935922 erlang-eimp-1.0.17.tar.gz +sha256 25e4e1178280d6fb98ee5e582ade393f7c5404c546638bcde86a6ebcb6757d90 erlang-eimp-1.0.21.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/erlang-eimp/erlang-eimp.mk b/package/erlang-eimp/erlang-eimp.mk index d066961cd30..27bb2203c23 100644 --- a/package/erlang-eimp/erlang-eimp.mk +++ b/package/erlang-eimp/erlang-eimp.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_EIMP_VERSION = 1.0.17 +ERLANG_EIMP_VERSION = 1.0.21 ERLANG_EIMP_SITE = $(call github,processone,eimp,$(ERLANG_EIMP_VERSION)) ERLANG_EIMP_LICENSE = Apache-2.0 ERLANG_EIMP_LICENSE_FILES = LICENSE.txt diff --git a/package/erlang-goldrush/erlang-goldrush.hash b/package/erlang-goldrush/erlang-goldrush.hash index 1e206073344..237bc8810c5 100644 --- a/package/erlang-goldrush/erlang-goldrush.hash +++ b/package/erlang-goldrush/erlang-goldrush.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6fb8ac6345d940396ecf89d4ce6b9b809039f336d85d7a54239e85106a807612 erlang-goldrush-0.1.9.tar.gz -sha256 335dd315c1bf12bd9bde777666c45e92652c9fe633101b12fc6f927b88433b6f LICENSE +sha256 6fb8ac6345d940396ecf89d4ce6b9b809039f336d85d7a54239e85106a807612 erlang-goldrush-0.1.9.tar.gz +sha256 335dd315c1bf12bd9bde777666c45e92652c9fe633101b12fc6f927b88433b6f LICENSE diff --git a/package/erlang-idna/erlang-idna.hash b/package/erlang-idna/erlang-idna.hash index 2200bbad8d3..7ee4807195e 100644 --- a/package/erlang-idna/erlang-idna.hash +++ b/package/erlang-idna/erlang-idna.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d57e20ee88018ff0431e0275e91ada5915782870c9981fc798bcd05589031d6f erlang-idna-6.0.0.tar.gz -sha256 95f5c9410a95332b0833c4606028ee00008cd8c497336e230df3144d1a720bda LICENSE +sha256 916b092cb8d35ca6e63ec183a674a28ff2f745ce05fd0c9c06da34875f6fe8d8 erlang-idna-230a917.tar.gz +sha256 95f5c9410a95332b0833c4606028ee00008cd8c497336e230df3144d1a720bda LICENSE diff --git a/package/erlang-idna/erlang-idna.mk b/package/erlang-idna/erlang-idna.mk index 27a32fb06d9..4ef34e82bf8 100644 --- a/package/erlang-idna/erlang-idna.mk +++ b/package/erlang-idna/erlang-idna.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_IDNA_VERSION = 6.0.0 +ERLANG_IDNA_VERSION = 230a917 ERLANG_IDNA_SITE = $(call github,benoitc,erlang-idna,$(ERLANG_IDNA_VERSION)) ERLANG_IDNA_LICENSE = MIT ERLANG_IDNA_LICENSE_FILES = LICENSE diff --git a/package/erlang-jiffy/erlang-jiffy.hash b/package/erlang-jiffy/erlang-jiffy.hash index 93c5e1f8c82..f172d1476ef 100644 --- a/package/erlang-jiffy/erlang-jiffy.hash +++ b/package/erlang-jiffy/erlang-jiffy.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 45c224afe0ea2d3ece39e227f01f5585ad53b8b91d2d6924f9f50548874ae879 erlang-jiffy-1.0.9.tar.gz +sha256 a999351d956d3ed10c33a6dd7e9435e674e519b5b82a46d60361afdb83062fd8 erlang-jiffy-1.1.1.tar.gz sha256 0fa8afad2f02c08850a16e36fe55376ee19732b3a116a0207f2a73c857777a49 LICENSE diff --git a/package/erlang-jiffy/erlang-jiffy.mk b/package/erlang-jiffy/erlang-jiffy.mk index cd946329628..de2e4749fb4 100644 --- a/package/erlang-jiffy/erlang-jiffy.mk +++ b/package/erlang-jiffy/erlang-jiffy.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_JIFFY_VERSION = 1.0.9 +ERLANG_JIFFY_VERSION = 1.1.1 ERLANG_JIFFY_SITE = $(call github,davisp,jiffy,$(ERLANG_JIFFY_VERSION)) ERLANG_JIFFY_LICENSE = MIT (core), \ BSD-3-Clause (Google double conversion library), \ diff --git a/package/erlang-jose/erlang-jose.hash b/package/erlang-jose/erlang-jose.hash index 71a1543d929..75e6f0a0417 100644 --- a/package/erlang-jose/erlang-jose.hash +++ b/package/erlang-jose/erlang-jose.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d55a9d3a1697833fed555a21f1aeb2727af88193995cb6ffa945d4b6749d0e8d erlang-jose-1.9.0.tar.gz -sha256 6397e2bd9a35a64c1bb798b937071fbe49d90667f717e65c74a0d0fe93d5c1be LICENSE.md +sha256 87cdcb9df6f943c97772e5d90bed87555a72c8957ce2cb901df259050e18e7bb erlang-jose-1.11.1.tar.gz +sha256 6397e2bd9a35a64c1bb798b937071fbe49d90667f717e65c74a0d0fe93d5c1be LICENSE.md diff --git a/package/erlang-jose/erlang-jose.mk b/package/erlang-jose/erlang-jose.mk index 43ed22a9f7e..b31a60aa3e3 100644 --- a/package/erlang-jose/erlang-jose.mk +++ b/package/erlang-jose/erlang-jose.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_JOSE_VERSION = 1.9.0 +ERLANG_JOSE_VERSION = 1.11.1 ERLANG_JOSE_SITE = $(call github,potatosalad,erlang-jose,$(ERLANG_JOSE_VERSION)) ERLANG_JOSE_LICENSE = MIT ERLANG_JOSE_LICENSE_FILES = LICENSE.md diff --git a/package/erlang-lager/erlang-lager.hash b/package/erlang-lager/erlang-lager.hash index 40291af392c..282d112d3bb 100644 --- a/package/erlang-lager/erlang-lager.hash +++ b/package/erlang-lager/erlang-lager.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c5bb4ba6f918e90d2e6671c3996d72c61f2a589b65c151b3df8011d046362981 erlang-lager-3.6.10.tar.gz -sha256 809fa1ed21450f59827d1e9aec720bbc4b687434fa22283c6cb5dd82a47ab9c0 LICENSE +sha256 13316ba3006b174cf6b085ad13ed19ec0f618f10b83fc3530a072cdf4b50668b erlang-lager-3.9.1.tar.gz +sha256 809fa1ed21450f59827d1e9aec720bbc4b687434fa22283c6cb5dd82a47ab9c0 LICENSE diff --git a/package/erlang-lager/erlang-lager.mk b/package/erlang-lager/erlang-lager.mk index a698bce8d54..7ff27ec0f29 100644 --- a/package/erlang-lager/erlang-lager.mk +++ b/package/erlang-lager/erlang-lager.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_LAGER_VERSION = 3.6.10 +ERLANG_LAGER_VERSION = 3.9.1 ERLANG_LAGER_SITE = $(call github,erlang-lager,lager,$(ERLANG_LAGER_VERSION)) ERLANG_LAGER_LICENSE = Apache-2.0 ERLANG_LAGER_LICENSE_FILES = LICENSE diff --git a/package/erlang-p1-acme/0001-rebar.config.script-remove-extra-dependency-to-base6.patch b/package/erlang-p1-acme/0001-rebar.config.script-remove-extra-dependency-to-base6.patch deleted file mode 100644 index a27730e23ce..00000000000 --- a/package/erlang-p1-acme/0001-rebar.config.script-remove-extra-dependency-to-base6.patch +++ /dev/null @@ -1,26 +0,0 @@ -From a2422fdf4097d1f5f8c8f88bbe08b9a0f3c35fe6 Mon Sep 17 00:00:00 2001 -From: Johan Oudinet -Date: Wed, 25 Nov 2020 22:38:22 +0100 -Subject: [PATCH] rebar.config.script: remove extra dependency to base64url - -Signed-off-by: Johan Oudinet ---- - rebar.config.script | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/rebar.config.script b/rebar.config.script -index a63895e..41b2970 100644 ---- a/rebar.config.script -+++ b/rebar.config.script -@@ -62,7 +62,7 @@ Cfg2 = case IsRebar3 of - [{plugin_dir, filename:join([filename:dirname(SCRIPT),"plugins"])}, - {plugins, [override_deps_versions]}] ++ - ModCfg(CONFIG, [deps], fun(V) -> -- V ++ [{base64url, ".*", {git, "git://github.com/dvv/base64url.git", {tag, "v1.0"}}}] -+ V - end, []) - end, - --- -2.29.2 - diff --git a/package/erlang-p1-acme/erlang-p1-acme.hash b/package/erlang-p1-acme/erlang-p1-acme.hash index af13e88b1a4..7cecb6dfc01 100644 --- a/package/erlang-p1-acme/erlang-p1-acme.hash +++ b/package/erlang-p1-acme/erlang-p1-acme.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e17ba49f45b72200470bc2f176b315bec1028d07a4817859052f98c0a7259632 erlang-p1-acme-1.0.9.tar.gz +sha256 58d4b7e97e677bd5a8aa3c1e52514a37cfa0985cad8b5f45cd05889843c4fdd9 erlang-p1-acme-1.0.16.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/erlang-p1-acme/erlang-p1-acme.mk b/package/erlang-p1-acme/erlang-p1-acme.mk index 21c155e206d..c9cd1c4f331 100644 --- a/package/erlang-p1-acme/erlang-p1-acme.mk +++ b/package/erlang-p1-acme/erlang-p1-acme.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_ACME_VERSION = 1.0.9 +ERLANG_P1_ACME_VERSION = 1.0.16 ERLANG_P1_ACME_SITE = $(call github,processone,p1_acme,$(ERLANG_P1_ACME_VERSION)) ERLANG_P1_ACME_LICENSE = Apache-2.0 ERLANG_P1_ACME_LICENSE_FILES = LICENSE.txt diff --git a/package/erlang-p1-cache-tab/erlang-p1-cache-tab.hash b/package/erlang-p1-cache-tab/erlang-p1-cache-tab.hash index 85a92cf0b2d..9f03bdbfae0 100644 --- a/package/erlang-p1-cache-tab/erlang-p1-cache-tab.hash +++ b/package/erlang-p1-cache-tab/erlang-p1-cache-tab.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 32cb3a3017f53e66bd1c2b75f60a2c4a14f00f375582a3c511ea39266b2385b9 erlang-p1-cache-tab-1.0.25.tar.gz +sha256 b11299eebafab6f1f5670650c48b10d9fa607ab092b4be8a976982e3f2b37526 erlang-p1-cache-tab-1.0.29.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/erlang-p1-cache-tab/erlang-p1-cache-tab.mk b/package/erlang-p1-cache-tab/erlang-p1-cache-tab.mk index f3253d1cd7d..046235f24c4 100644 --- a/package/erlang-p1-cache-tab/erlang-p1-cache-tab.mk +++ b/package/erlang-p1-cache-tab/erlang-p1-cache-tab.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_CACHE_TAB_VERSION = 1.0.25 +ERLANG_P1_CACHE_TAB_VERSION = 1.0.29 ERLANG_P1_CACHE_TAB_SITE = $(call github,processone,cache_tab,$(ERLANG_P1_CACHE_TAB_VERSION)) ERLANG_P1_CACHE_TAB_LICENSE = Apache-2.0 ERLANG_P1_CACHE_TAB_LICENSE_FILES = LICENSE.txt diff --git a/package/erlang-p1-mqtree/erlang-p1-mqtree.hash b/package/erlang-p1-mqtree/erlang-p1-mqtree.hash index cf1a880cb87..b91a0cdaa0f 100644 --- a/package/erlang-p1-mqtree/erlang-p1-mqtree.hash +++ b/package/erlang-p1-mqtree/erlang-p1-mqtree.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4f86e272a97152d3f5166dad583dc1b5bda9582f6777f6294fb8328def8b2189 erlang-p1-mqtree-1.0.10.tar.gz +sha256 b0b5506f43fd2ef8f72b3d5f42ece4dd22d872f9be2a9120affb7c6ae047597f erlang-p1-mqtree-1.0.14.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/erlang-p1-mqtree/erlang-p1-mqtree.mk b/package/erlang-p1-mqtree/erlang-p1-mqtree.mk index 19e31ef1b28..9e66bebbaa6 100644 --- a/package/erlang-p1-mqtree/erlang-p1-mqtree.mk +++ b/package/erlang-p1-mqtree/erlang-p1-mqtree.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_MQTREE_VERSION = 1.0.10 +ERLANG_P1_MQTREE_VERSION = 1.0.14 ERLANG_P1_MQTREE_SITE = $(call github,processone,mqtree,$(ERLANG_P1_MQTREE_VERSION)) ERLANG_P1_MQTREE_LICENSE = Apache-2.0 ERLANG_P1_MQTREE_LICENSE_FILES = LICENSE diff --git a/package/erlang-p1-oauth2/erlang-p1-oauth2.hash b/package/erlang-p1-oauth2/erlang-p1-oauth2.hash index a6d00aa96e9..7a0304e86a6 100644 --- a/package/erlang-p1-oauth2/erlang-p1-oauth2.hash +++ b/package/erlang-p1-oauth2/erlang-p1-oauth2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c5cf0d2a9f5874c289cc6044945f4771a79007bda812e5269dea3a4c92fc8811 erlang-p1-oauth2-0.6.7.tar.gz +sha256 625e6d96a212cc2cf8a63c36ee698072791d85acbaae18e5820ba144cdaca869 erlang-p1-oauth2-0.6.10.tar.gz sha256 0ecddd0a5e35b7fcdab451f54c5bb688fac8365cdf6b0da0ac64b7895a0770f3 LICENSE diff --git a/package/erlang-p1-oauth2/erlang-p1-oauth2.mk b/package/erlang-p1-oauth2/erlang-p1-oauth2.mk index d7dd45b252a..50ac9fbda53 100644 --- a/package/erlang-p1-oauth2/erlang-p1-oauth2.mk +++ b/package/erlang-p1-oauth2/erlang-p1-oauth2.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_OAUTH2_VERSION = 0.6.7 +ERLANG_P1_OAUTH2_VERSION = 0.6.10 ERLANG_P1_OAUTH2_SITE = $(call github,processone,p1_oauth2,$(ERLANG_P1_OAUTH2_VERSION)) ERLANG_P1_OAUTH2_LICENSE = MIT ERLANG_P1_OAUTH2_LICENSE_FILES = LICENSE diff --git a/package/erlang-p1-pkix/erlang-p1-pkix.hash b/package/erlang-p1-pkix/erlang-p1-pkix.hash index b0ee7d58bad..c58dc5c2c5c 100644 --- a/package/erlang-p1-pkix/erlang-p1-pkix.hash +++ b/package/erlang-p1-pkix/erlang-p1-pkix.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3a39c4ca74f93efa0e4de4c37f9e4d073b1aeb142ad669f12588ad2b3c39724e erlang-p1-pkix-1.0.6.tar.gz +sha256 257171bec3fe495cd390c3a987131893a0a1a0b22e5973ac3cba9c354cb72324 erlang-p1-pkix-1.0.8.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/erlang-p1-pkix/erlang-p1-pkix.mk b/package/erlang-p1-pkix/erlang-p1-pkix.mk index 12ae0421381..a7ecb08ad9b 100644 --- a/package/erlang-p1-pkix/erlang-p1-pkix.mk +++ b/package/erlang-p1-pkix/erlang-p1-pkix.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_PKIX_VERSION = 1.0.6 +ERLANG_P1_PKIX_VERSION = 1.0.8 ERLANG_P1_PKIX_SITE = $(call github,processone,pkix,$(ERLANG_P1_PKIX_VERSION)) ERLANG_P1_PKIX_LICENSE = Apache-2.0 ERLANG_P1_PKIX_LICENSE_FILES = LICENSE diff --git a/package/erlang-p1-sip/erlang-p1-sip.hash b/package/erlang-p1-sip/erlang-p1-sip.hash index e52371e404a..b20df002804 100644 --- a/package/erlang-p1-sip/erlang-p1-sip.hash +++ b/package/erlang-p1-sip/erlang-p1-sip.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b46349a7077d8e5f36a216ada4a5c0b51ef3d66005606beb0ea3962069f215a7 erlang-p1-sip-1.0.38.tar.gz -sha256 6cd4871db940d055cf272c12c10e0c08febdc94362e404390758fde34b4ce01a LICENSE.txt +sha256 1de406bc59c30e2697b8b29cc0ad0e370e6f5a5d777d37e022d195586b80643d erlang-p1-sip-1.0.47.tar.gz +sha256 c835791cd41a32f8ef40e2255d141ab7faec2f28fab68bbd685c6110fb83be4e LICENSE.txt diff --git a/package/erlang-p1-sip/erlang-p1-sip.mk b/package/erlang-p1-sip/erlang-p1-sip.mk index 2d2f0110c37..f0e999ec54b 100644 --- a/package/erlang-p1-sip/erlang-p1-sip.mk +++ b/package/erlang-p1-sip/erlang-p1-sip.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_SIP_VERSION = 1.0.38 +ERLANG_P1_SIP_VERSION = 1.0.47 ERLANG_P1_SIP_SITE = $(call github,processone,esip,$(ERLANG_P1_SIP_VERSION)) ERLANG_P1_SIP_LICENSE = Apache-2.0 ERLANG_P1_SIP_LICENSE_FILES = LICENSE.txt diff --git a/package/erlang-p1-stringprep/erlang-p1-stringprep.hash b/package/erlang-p1-stringprep/erlang-p1-stringprep.hash index e23cc4f38b2..eec611829a3 100644 --- a/package/erlang-p1-stringprep/erlang-p1-stringprep.hash +++ b/package/erlang-p1-stringprep/erlang-p1-stringprep.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 47f9f8ee901f47b7f62c5140ea09f113efe7fedd5e8ffb92d50f51c5e11fb67f erlang-p1-stringprep-1.0.23.tar.gz +sha256 cdc2ffa6ba2171f55b78e69cfce5dab6099cbb6bc6955d88c5c53b0cf24d13af erlang-p1-stringprep-1.0.27.tar.gz sha256 f44415631770cb818de6d92f3961fdfe6e407a5154f84b87cc06ac27323e919c LICENSE.ALL sha256 42aef2a1337ef1f45ae2832aa5aa268c79b2560fb1f3ebab519629372cb24ffe LICENSE.TCL sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/erlang-p1-stringprep/erlang-p1-stringprep.mk b/package/erlang-p1-stringprep/erlang-p1-stringprep.mk index 580f4a9aa96..233be52c58d 100644 --- a/package/erlang-p1-stringprep/erlang-p1-stringprep.mk +++ b/package/erlang-p1-stringprep/erlang-p1-stringprep.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_STRINGPREP_VERSION = 1.0.23 +ERLANG_P1_STRINGPREP_VERSION = 1.0.27 ERLANG_P1_STRINGPREP_SITE = $(call github,processone,stringprep,$(ERLANG_P1_STRINGPREP_VERSION)) ERLANG_P1_STRINGPREP_LICENSE = TCL (tools/*.tcl), Apache-2.0 (rest) ERLANG_P1_STRINGPREP_LICENSE_FILES = LICENSE.ALL LICENSE.TCL LICENSE.txt diff --git a/package/erlang-p1-stun/erlang-p1-stun.hash b/package/erlang-p1-stun/erlang-p1-stun.hash index fb56b8f4e68..aef122b4a65 100644 --- a/package/erlang-p1-stun/erlang-p1-stun.hash +++ b/package/erlang-p1-stun/erlang-p1-stun.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 05d2f31f172883d2301a93cd141e6b930dfdd01e10b6aacf806becc3674973d8 erlang-p1-stun-1.0.39.tar.gz +sha256 f9b82949b54778a4b766dca5509eef4475e1dbc165a449974dbd0cc54c6f84a2 erlang-p1-stun-1.0.47.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/erlang-p1-stun/erlang-p1-stun.mk b/package/erlang-p1-stun/erlang-p1-stun.mk index f762e7f45cb..ce117e20b5c 100644 --- a/package/erlang-p1-stun/erlang-p1-stun.mk +++ b/package/erlang-p1-stun/erlang-p1-stun.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_STUN_VERSION = 1.0.39 +ERLANG_P1_STUN_VERSION = 1.0.47 ERLANG_P1_STUN_SITE = $(call github,processone,stun,$(ERLANG_P1_STUN_VERSION)) ERLANG_P1_STUN_LICENSE = Apache-2.0 ERLANG_P1_STUN_LICENSE_FILES = LICENSE.txt diff --git a/package/erlang-p1-tls/erlang-p1-tls.hash b/package/erlang-p1-tls/erlang-p1-tls.hash index 475223b9865..32d90ef7a09 100644 --- a/package/erlang-p1-tls/erlang-p1-tls.hash +++ b/package/erlang-p1-tls/erlang-p1-tls.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 97fd0a398751fc63b28df016e92a08ea98d083f7d5e3f32380a92de1ee86ca0e erlang-p1-tls-1.1.9.tar.gz -sha256 6cd4871db940d055cf272c12c10e0c08febdc94362e404390758fde34b4ce01a LICENSE.txt +sha256 5377671fed74a61518a742bc52d73941039d6e3c6e192133c7feaf5a83e1275b erlang-p1-tls-1.1.13.tar.gz +sha256 a401e98a7eef1c741b3e8b1a46a21730b4a1bc7020e4ec1a8c2a44dbd7f0ba5d LICENSE.txt diff --git a/package/erlang-p1-tls/erlang-p1-tls.mk b/package/erlang-p1-tls/erlang-p1-tls.mk index 9e7d4c7c73e..1f79bf90c1c 100644 --- a/package/erlang-p1-tls/erlang-p1-tls.mk +++ b/package/erlang-p1-tls/erlang-p1-tls.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_TLS_VERSION = 1.1.9 +ERLANG_P1_TLS_VERSION = 1.1.13 ERLANG_P1_TLS_SITE = $(call github,processone,fast_tls,$(ERLANG_P1_TLS_VERSION)) ERLANG_P1_TLS_LICENSE = Apache-2.0 ERLANG_P1_TLS_LICENSE_FILES = LICENSE.txt diff --git a/package/erlang-p1-utils/erlang-p1-utils.hash b/package/erlang-p1-utils/erlang-p1-utils.hash index dec7c260392..082622098ea 100644 --- a/package/erlang-p1-utils/erlang-p1-utils.hash +++ b/package/erlang-p1-utils/erlang-p1-utils.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 234b88227f61ef03a6177d97ed062c62a22760b6fd189a5a24d2fd1599d95ac9 erlang-p1-utils-1.0.20.tar.gz +sha256 05f29bc55a51840c84f4055b89d4cc312078badc5571a5962f15348fa5d87015 erlang-p1-utils-1.0.23.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/erlang-p1-utils/erlang-p1-utils.mk b/package/erlang-p1-utils/erlang-p1-utils.mk index 084382cd2b6..5804c2531d0 100644 --- a/package/erlang-p1-utils/erlang-p1-utils.mk +++ b/package/erlang-p1-utils/erlang-p1-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_UTILS_VERSION = 1.0.20 +ERLANG_P1_UTILS_VERSION = 1.0.23 ERLANG_P1_UTILS_SITE = $(call github,processone,p1_utils,$(ERLANG_P1_UTILS_VERSION)) ERLANG_P1_UTILS_LICENSE = Apache-2.0 ERLANG_P1_UTILS_LICENSE_FILES = LICENSE.txt diff --git a/package/erlang-p1-xml/erlang-p1-xml.hash b/package/erlang-p1-xml/erlang-p1-xml.hash index f2a4ab83e06..379ca7ef882 100644 --- a/package/erlang-p1-xml/erlang-p1-xml.hash +++ b/package/erlang-p1-xml/erlang-p1-xml.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 739f37a161a570071469ab1f3d8fc232f004ea616700fe7e46b6d8afa9d03a60 erlang-p1-xml-1.1.44.tar.gz +sha256 02bcdb0a4350080a10b52de85c11de982e5f7cf2150f5b1b888f7a95ccb31265 erlang-p1-xml-1.1.49.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/erlang-p1-xml/erlang-p1-xml.mk b/package/erlang-p1-xml/erlang-p1-xml.mk index 5730181ac6b..eee2c74c03a 100644 --- a/package/erlang-p1-xml/erlang-p1-xml.mk +++ b/package/erlang-p1-xml/erlang-p1-xml.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_XML_VERSION = 1.1.44 +ERLANG_P1_XML_VERSION = 1.1.49 ERLANG_P1_XML_SITE = $(call github,processone,fast_xml,$(ERLANG_P1_XML_VERSION)) ERLANG_P1_XML_LICENSE = Apache-2.0 ERLANG_P1_XML_LICENSE_FILES = LICENSE.txt diff --git a/package/erlang-p1-xmpp/Config.in b/package/erlang-p1-xmpp/Config.in index 6e40fed10af..c67dc832b7a 100644 --- a/package/erlang-p1-xmpp/Config.in +++ b/package/erlang-p1-xmpp/Config.in @@ -4,6 +4,7 @@ comment "erlang-p1-xmpp needs a toolchain w/ C++" config BR2_PACKAGE_ERLANG_P1_XMPP bool "erlang-p1-xmpp" depends on BR2_INSTALL_LIBSTDCPP # erlang-p1-stringprep + select BR2_PACKAGE_ERLANG_IDNA select BR2_PACKAGE_ERLANG_P1_XML select BR2_PACKAGE_ERLANG_P1_STRINGPREP select BR2_PACKAGE_ERLANG_P1_TLS diff --git a/package/erlang-p1-xmpp/erlang-p1-xmpp.hash b/package/erlang-p1-xmpp/erlang-p1-xmpp.hash index d0a761fcac1..fce23c09c6b 100644 --- a/package/erlang-p1-xmpp/erlang-p1-xmpp.hash +++ b/package/erlang-p1-xmpp/erlang-p1-xmpp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 65c73ffaf8faab5d6fc7d42ada0b5a380f20f3e46056ad98614d81922322d9a2 erlang-p1-xmpp-1.4.10.tar.gz +sha256 bde03ad371aad3e171ebe94a5b3b84daa4b8dd7ee37e9979ff373cd65370e725 erlang-p1-xmpp-1.5.6.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/erlang-p1-xmpp/erlang-p1-xmpp.mk b/package/erlang-p1-xmpp/erlang-p1-xmpp.mk index f903cb945dc..fc63b5ffc23 100644 --- a/package/erlang-p1-xmpp/erlang-p1-xmpp.mk +++ b/package/erlang-p1-xmpp/erlang-p1-xmpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_XMPP_VERSION = 1.4.10 +ERLANG_P1_XMPP_VERSION = 1.5.6 ERLANG_P1_XMPP_SITE = $(call github,processone,xmpp,$(ERLANG_P1_XMPP_VERSION)) ERLANG_P1_XMPP_LICENSE = Apache-2.0 ERLANG_P1_XMPP_LICENSE_FILES = LICENSE.txt diff --git a/package/erlang-p1-yaml/erlang-p1-yaml.hash b/package/erlang-p1-yaml/erlang-p1-yaml.hash index 955a0009300..89123dfd83d 100644 --- a/package/erlang-p1-yaml/erlang-p1-yaml.hash +++ b/package/erlang-p1-yaml/erlang-p1-yaml.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8f53308438e4d1613562acb586b4c4540569d8305097508c40e6f261fe4216cd erlang-p1-yaml-1.0.28.tar.gz +sha256 6d5c823dd895b736b98325d88893a63c054964d7bde9a8e150fc4df5f4165065 erlang-p1-yaml-1.0.32.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/erlang-p1-yaml/erlang-p1-yaml.mk b/package/erlang-p1-yaml/erlang-p1-yaml.mk index e42ff5fe38e..6acb6fe059a 100644 --- a/package/erlang-p1-yaml/erlang-p1-yaml.mk +++ b/package/erlang-p1-yaml/erlang-p1-yaml.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_YAML_VERSION = 1.0.28 +ERLANG_P1_YAML_VERSION = 1.0.32 ERLANG_P1_YAML_SITE = $(call github,processone,fast_yaml,$(ERLANG_P1_YAML_VERSION)) ERLANG_P1_YAML_LICENSE = Apache-2.0 ERLANG_P1_YAML_LICENSE_FILES = LICENSE.txt diff --git a/package/erlang-p1-yconf/erlang-p1-yconf.hash b/package/erlang-p1-yconf/erlang-p1-yconf.hash index 97e71f85cd4..990f08dce94 100644 --- a/package/erlang-p1-yconf/erlang-p1-yconf.hash +++ b/package/erlang-p1-yconf/erlang-p1-yconf.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ab0f7462b8d03d18be1587fa9cfb227923055f765fca4459b4bb42ccef971329 erlang-p1-yconf-1.0.8.tar.gz +sha256 e88f74c3950630e0ca7be41cbe2332d3ca600241f37779a862bdcc46f9031877 erlang-p1-yconf-1.0.12.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/erlang-p1-yconf/erlang-p1-yconf.mk b/package/erlang-p1-yconf/erlang-p1-yconf.mk index 3e3a10ae15f..682ca08ff22 100644 --- a/package/erlang-p1-yconf/erlang-p1-yconf.mk +++ b/package/erlang-p1-yconf/erlang-p1-yconf.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_YCONF_VERSION = 1.0.8 +ERLANG_P1_YCONF_VERSION = 1.0.12 ERLANG_P1_YCONF_SITE = $(call github,processone,yconf,$(ERLANG_P1_YCONF_VERSION)) ERLANG_P1_YCONF_LICENSE = Apache-2.0 ERLANG_P1_YCONF_LICENSE_FILES = LICENSE diff --git a/package/erlang-p1-zlib/erlang-p1-zlib.hash b/package/erlang-p1-zlib/erlang-p1-zlib.hash index 7ce58762f82..f48aba90ea0 100644 --- a/package/erlang-p1-zlib/erlang-p1-zlib.hash +++ b/package/erlang-p1-zlib/erlang-p1-zlib.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f0ac60336b2ddf55ac4f58934580cb8f02dba440d68feb607be312dd35d91269 erlang-p1-zlib-1.0.9.tar.gz -sha256 6cd4871db940d055cf272c12c10e0c08febdc94362e404390758fde34b4ce01a LICENSE.txt +sha256 cef52f8f28229bf7229b53d225a6a9865acf5bdeaf16a40f81bbeb226615be99 erlang-p1-zlib-1.0.10.tar.gz +sha256 a401e98a7eef1c741b3e8b1a46a21730b4a1bc7020e4ec1a8c2a44dbd7f0ba5d LICENSE.txt diff --git a/package/erlang-p1-zlib/erlang-p1-zlib.mk b/package/erlang-p1-zlib/erlang-p1-zlib.mk index 0e6ee298efe..fdffb6ed3e6 100644 --- a/package/erlang-p1-zlib/erlang-p1-zlib.mk +++ b/package/erlang-p1-zlib/erlang-p1-zlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_P1_ZLIB_VERSION = 1.0.9 +ERLANG_P1_ZLIB_VERSION = 1.0.10 ERLANG_P1_ZLIB_SITE = $(call github,processone,ezlib,$(ERLANG_P1_ZLIB_VERSION)) ERLANG_P1_ZLIB_LICENSE = Apache-2.0 ERLANG_P1_ZLIB_LICENSE_FILES = LICENSE.txt diff --git a/package/erlang-rebar/erlang-rebar.hash b/package/erlang-rebar/erlang-rebar.hash index b0529800959..bc463a96195 100644 --- a/package/erlang-rebar/erlang-rebar.hash +++ b/package/erlang-rebar/erlang-rebar.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 577246bafa2eb2b2c3f1d0c157408650446884555bf87901508ce71d5cc0bd07 erlang-rebar-2.6.4.tar.gz -sha256 809fa1ed21450f59827d1e9aec720bbc4b687434fa22283c6cb5dd82a47ab9c0 LICENSE +sha256 577246bafa2eb2b2c3f1d0c157408650446884555bf87901508ce71d5cc0bd07 erlang-rebar-2.6.4.tar.gz +sha256 809fa1ed21450f59827d1e9aec720bbc4b687434fa22283c6cb5dd82a47ab9c0 LICENSE diff --git a/package/erlang/0003-crypto-Fixes-for-LibreSSL-3-5-0.patch b/package/erlang/0003-crypto-Fixes-for-LibreSSL-3-5-0.patch new file mode 100644 index 00000000000..84c75fef830 --- /dev/null +++ b/package/erlang/0003-crypto-Fixes-for-LibreSSL-3-5-0.patch @@ -0,0 +1,30 @@ +From 8e5170d79e387d7e898d948a78e0c70407a4030c Mon Sep 17 00:00:00 2001 +From: Hans Nilsson +Date: Mon, 14 Feb 2022 15:51:35 +0100 +Subject: [PATCH] crypto: Fixes for LibreSSL 3.5.0 + +[Retrieved (and backported) from: +https://github.com/erlang/otp/commit/8e5170d79e387d7e898d948a78e0c70407a4030c] +Signed-off-by: Fabrice Fontaine +--- + lib/crypto/c_src/openssl_config.h | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/lib/crypto/c_src/openssl_config.h b/lib/crypto/c_src/openssl_config.h +index 6fdd049fb30a..39e4b2d9d7c0 100644 +--- a/lib/crypto/c_src/openssl_config.h ++++ b/lib/crypto/c_src/openssl_config.h +@@ -122,7 +122,14 @@ + # endif + #endif + ++#ifdef HAS_LIBRESSL ++# if LIBRESSL_VERSION_NUMBER >= 0x3050000fL ++# define HAS_EVP_PKEY_CTX ++# define HAVE_EVP_CIPHER_CTX_COPY ++# endif ++#endif ++ + #ifndef HAS_LIBRESSL + # if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(1,0,0) + # define HAS_EVP_PKEY_CTX diff --git a/package/erofs-utils/0001-erofs-utils-manpage-only-install-erofsfuse.1-with-th.patch b/package/erofs-utils/0001-erofs-utils-manpage-only-install-erofsfuse.1-with-th.patch deleted file mode 100644 index 0aa99d5324d..00000000000 --- a/package/erofs-utils/0001-erofs-utils-manpage-only-install-erofsfuse.1-with-th.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 7ab34000c672adca90388a8fcb1f70a7d391d35c Mon Sep 17 00:00:00 2001 -From: David Michael -Date: Thu, 3 Jun 2021 16:18:57 -0400 -Subject: [PATCH] erofs-utils: manpage: only install erofsfuse.1 with the - command - -Link: https://lore.kernel.org/r/87lf7q3dn2.fsf@gmail.com -Reviewed-by: Gao Xiang -Signed-off-by: David Michael -Signed-off-by: Gao Xiang ---- - man/Makefile.am | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/man/Makefile.am b/man/Makefile.am -index ffcf6f81c255..0df947b6fbf7 100644 ---- a/man/Makefile.am -+++ b/man/Makefile.am -@@ -1,5 +1,9 @@ - # SPDX-License-Identifier: GPL-2.0+ - # Makefile.am - --dist_man_MANS = mkfs.erofs.1 erofsfuse.1 -+dist_man_MANS = mkfs.erofs.1 - -+EXTRA_DIST = erofsfuse.1 -+if ENABLE_FUSE -+man_MANS = erofsfuse.1 -+endif --- -2.20.1 - diff --git a/package/erofs-utils/erofs-utils.hash b/package/erofs-utils/erofs-utils.hash index 8bbb0885689..a03a0d5a7da 100644 --- a/package/erofs-utils/erofs-utils.hash +++ b/package/erofs-utils/erofs-utils.hash @@ -1,3 +1,5 @@ # Locally computed -sha256 132635740039bbe76d743aea72378bfae30dbf034e123929f5d794198d4c0b12 erofs-utils-1.3.tar.gz -sha256 feee3b3157dcdf78d4f50edefbd5dd7adf8b6d52c11bfaaa746a85a373256713 COPYING +sha256 2310fa4377b566bf943e8eef992db3990f759528d5973e700efe3e4cb115ec23 erofs-utils-1.5.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 e35470b02ed..df4c652d304 100644 --- a/package/erofs-utils/erofs-utils.mk +++ b/package/erofs-utils/erofs-utils.mk @@ -4,10 +4,10 @@ # ################################################################################ -EROFS_UTILS_VERSION = 1.3 +EROFS_UTILS_VERSION = 1.5 EROFS_UTILS_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot -EROFS_UTILS_LICENSE = GPL-2.0+ -EROFS_UTILS_LICENSE_FILES = COPYING +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 # From a git tree: no generated autotools files EROFS_UTILS_AUTORECONF = YES diff --git a/package/espeak/espeak.mk b/package/espeak/espeak.mk index d592673ac5c..44893ac9be3 100644 --- a/package/espeak/espeak.mk +++ b/package/espeak/espeak.mk @@ -37,7 +37,8 @@ define ESPEAK_BUILD_CMDS endef define ESPEAK_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/src DESTDIR="$(TARGET_DIR)" install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/src $(TARGET_CONFIGURE_OPTS) \ + AUDIO="$(ESPEAK_AUDIO_BACKEND)" DESTDIR="$(TARGET_DIR)" install endef $(eval $(generic-package)) diff --git a/package/ethtool/0001-uapi-Bring-in-if.h.patch b/package/ethtool/0001-uapi-Bring-in-if.h.patch new file mode 100644 index 00000000000..faf264f61f1 --- /dev/null +++ b/package/ethtool/0001-uapi-Bring-in-if.h.patch @@ -0,0 +1,483 @@ +From fd02caa75918401f2cb75af1f2a181c1959e070d Mon Sep 17 00:00:00 2001 +From: Florian Fainelli +Date: Sat, 14 Jan 2023 08:34:09 -0800 +Subject: [PATCH] uapi: Bring in if.h + +Bring in if.h from commit eec517cdb481 ("net: Add IF_OPER_TESTING") as +well as uapi/linux/hdlc/ioctl.h. Ensure that we define all of the +necessary guards to provide updated definitions of ifmap, ifreq and +IFNAMSIZ. This resolves build issues with kernel headers < 4.11 which +lacked 2618be7dccf8739b89e1906b64bd8d551af351e6 ("uapi: fix linux/if.h +userspace compilation errors"). + +Fixes: 1fa60003a8b8 ("misc: header includes cleanup") +Reported-by: Markus Mayer +Signed-off-by: Florian Fainelli +Message-Id: <20230114163411.3290201-2-f.fainelli@gmail.com> + +[Upstream: https://patchwork.kernel.org/project/netdevbpf/patch/20230114163411.3290201-2-f.fainelli@gmail.com/] +[vfazio@gmail.com: fix whitespace issues] +Signed-off-by: Vincent Fazio +--- + Makefile.am | 6 +- + internal.h | 7 +- + uapi/linux/hdlc/ioctl.h | 94 +++++++++++++ + uapi/linux/if.h | 296 ++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 397 insertions(+), 6 deletions(-) + create mode 100644 uapi/linux/hdlc/ioctl.h + create mode 100644 uapi/linux/if.h + +diff --git a/Makefile.am b/Makefile.am +index 663f40a..691a20e 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -7,7 +7,8 @@ EXTRA_DIST = LICENSE ethtool.8 ethtool.spec.in aclocal.m4 ChangeLog autogen.sh + + sbin_PROGRAMS = ethtool + ethtool_SOURCES = ethtool.c uapi/linux/ethtool.h internal.h \ +- uapi/linux/net_tstamp.h rxclass.c common.c common.h \ ++ uapi/linux/net_tstamp.h uapi/linux/if.h uapi/linux/hdlc/ioctl.h \ ++ rxclass.c common.c common.h \ + json_writer.c json_writer.h json_print.c json_print.h \ + list.h + if ETHTOOL_ENABLE_PRETTY_DUMP +@@ -43,7 +44,8 @@ ethtool_SOURCES += \ + netlink/desc-rtnl.c netlink/cable_test.c netlink/tunnels.c \ + uapi/linux/ethtool_netlink.h \ + uapi/linux/netlink.h uapi/linux/genetlink.h \ +- uapi/linux/rtnetlink.h uapi/linux/if_link.h ++ uapi/linux/rtnetlink.h uapi/linux/if_link.h \ ++ uapi/linux/if.h uapi/linux/hdlc/ioctl.h + AM_CPPFLAGS += @MNL_CFLAGS@ + LDADD += @MNL_LIBS@ + endif +diff --git a/internal.h b/internal.h +index b80f77a..3923719 100644 +--- a/internal.h ++++ b/internal.h +@@ -21,6 +21,9 @@ + #include + #include + #include ++#define __UAPI_DEF_IF_IFNAMSIZ 1 ++#define __UAPI_DEF_IF_IFMAP 1 ++#define __UAPI_DEF_IF_IFREQ 1 + #include + + #include "json_writer.h" +@@ -52,10 +55,6 @@ typedef int32_t s32; + #define __KERNEL_DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d)) + #endif + +-#ifndef ALTIFNAMSIZ +-#define ALTIFNAMSIZ 128 +-#endif +- + #include + #include + +diff --git a/uapi/linux/hdlc/ioctl.h b/uapi/linux/hdlc/ioctl.h +new file mode 100644 +index 0000000..b06341a +--- /dev/null ++++ b/uapi/linux/hdlc/ioctl.h +@@ -0,0 +1,94 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ ++#ifndef __HDLC_IOCTL_H__ ++#define __HDLC_IOCTL_H__ ++ ++ ++#define GENERIC_HDLC_VERSION 4 /* For synchronization with sethdlc utility */ ++ ++#define CLOCK_DEFAULT 0 /* Default setting */ ++#define CLOCK_EXT 1 /* External TX and RX clock - DTE */ ++#define CLOCK_INT 2 /* Internal TX and RX clock - DCE */ ++#define CLOCK_TXINT 3 /* Internal TX and external RX clock */ ++#define CLOCK_TXFROMRX 4 /* TX clock derived from external RX clock */ ++ ++ ++#define ENCODING_DEFAULT 0 /* Default setting */ ++#define ENCODING_NRZ 1 ++#define ENCODING_NRZI 2 ++#define ENCODING_FM_MARK 3 ++#define ENCODING_FM_SPACE 4 ++#define ENCODING_MANCHESTER 5 ++ ++ ++#define PARITY_DEFAULT 0 /* Default setting */ ++#define PARITY_NONE 1 /* No parity */ ++#define PARITY_CRC16_PR0 2 /* CRC16, initial value 0x0000 */ ++#define PARITY_CRC16_PR1 3 /* CRC16, initial value 0xFFFF */ ++#define PARITY_CRC16_PR0_CCITT 4 /* CRC16, initial 0x0000, ITU-T version */ ++#define PARITY_CRC16_PR1_CCITT 5 /* CRC16, initial 0xFFFF, ITU-T version */ ++#define PARITY_CRC32_PR0_CCITT 6 /* CRC32, initial value 0x00000000 */ ++#define PARITY_CRC32_PR1_CCITT 7 /* CRC32, initial value 0xFFFFFFFF */ ++ ++#define LMI_DEFAULT 0 /* Default setting */ ++#define LMI_NONE 1 /* No LMI, all PVCs are static */ ++#define LMI_ANSI 2 /* ANSI Annex D */ ++#define LMI_CCITT 3 /* ITU-T Annex A */ ++#define LMI_CISCO 4 /* The "original" LMI, aka Gang of Four */ ++ ++#ifndef __ASSEMBLY__ ++ ++typedef struct { ++ unsigned int clock_rate; /* bits per second */ ++ unsigned int clock_type; /* internal, external, TX-internal etc. */ ++ unsigned short loopback; ++} sync_serial_settings; /* V.35, V.24, X.21 */ ++ ++typedef struct { ++ unsigned int clock_rate; /* bits per second */ ++ unsigned int clock_type; /* internal, external, TX-internal etc. */ ++ unsigned short loopback; ++ unsigned int slot_map; ++} te1_settings; /* T1, E1 */ ++ ++typedef struct { ++ unsigned short encoding; ++ unsigned short parity; ++} raw_hdlc_proto; ++ ++typedef struct { ++ unsigned int t391; ++ unsigned int t392; ++ unsigned int n391; ++ unsigned int n392; ++ unsigned int n393; ++ unsigned short lmi; ++ unsigned short dce; /* 1 for DCE (network side) operation */ ++} fr_proto; ++ ++typedef struct { ++ unsigned int dlci; ++} fr_proto_pvc; /* for creating/deleting FR PVCs */ ++ ++typedef struct { ++ unsigned int dlci; ++ char master[IFNAMSIZ]; /* Name of master FRAD device */ ++}fr_proto_pvc_info; /* for returning PVC information only */ ++ ++typedef struct { ++ unsigned int interval; ++ unsigned int timeout; ++} cisco_proto; ++ ++typedef struct { ++ unsigned short dce; /* 1 for DCE (network side) operation */ ++ unsigned int modulo; /* modulo (8 = basic / 128 = extended) */ ++ unsigned int window; /* frame window size */ ++ unsigned int t1; /* timeout t1 */ ++ unsigned int t2; /* timeout t2 */ ++ unsigned int n2; /* frame retry counter */ ++} x25_hdlc_proto; ++ ++/* PPP doesn't need any info now - supply length = 0 to ioctl */ ++ ++#endif /* __ASSEMBLY__ */ ++#endif /* __HDLC_IOCTL_H__ */ +diff --git a/uapi/linux/if.h b/uapi/linux/if.h +new file mode 100644 +index 0000000..75ee7f4 +--- /dev/null ++++ b/uapi/linux/if.h +@@ -0,0 +1,296 @@ ++/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */ ++/* ++ * INET An implementation of the TCP/IP protocol suite for the LINUX ++ * operating system. INET is implemented using the BSD Socket ++ * interface as the means of communication with the user level. ++ * ++ * Global definitions for the INET interface module. ++ * ++ * Version: @(#)if.h 1.0.2 04/18/93 ++ * ++ * Authors: Original taken from Berkeley UNIX 4.3, (c) UCB 1982-1988 ++ * Ross Biro ++ * Fred N. van Kempen, ++ * ++ * 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. ++ */ ++#ifndef _LINUX_IF_H ++#define _LINUX_IF_H ++ ++#include /* for compatibility with glibc */ ++#include /* for "__kernel_caddr_t" et al */ ++#include /* for "struct sockaddr" et al */ ++ /* for "__user" et al */ ++ ++#include /* for struct sockaddr. */ ++ ++#if __UAPI_DEF_IF_IFNAMSIZ ++#define IFNAMSIZ 16 ++#endif /* __UAPI_DEF_IF_IFNAMSIZ */ ++#define IFALIASZ 256 ++#define ALTIFNAMSIZ 128 ++#include ++ ++/* For glibc compatibility. An empty enum does not compile. */ ++#if __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO != 0 || \ ++ __UAPI_DEF_IF_NET_DEVICE_FLAGS != 0 ++/** ++ * enum net_device_flags - &struct net_device flags ++ * ++ * These are the &struct net_device flags, they can be set by drivers, the ++ * kernel and some can be triggered by userspace. Userspace can query and ++ * set these flags using userspace utilities but there is also a sysfs ++ * entry available for all dev flags which can be queried and set. These flags ++ * are shared for all types of net_devices. The sysfs entries are available ++ * via /sys/class/net//flags. Flags which can be toggled through sysfs ++ * are annotated below, note that only a few flags can be toggled and some ++ * other flags are always preserved from the original net_device flags ++ * even if you try to set them via sysfs. Flags which are always preserved ++ * are kept under the flag grouping @IFF_VOLATILE. Flags which are __volatile__ ++ * are annotated below as such. ++ * ++ * You should have a pretty good reason to be extending these flags. ++ * ++ * @IFF_UP: interface is up. Can be toggled through sysfs. ++ * @IFF_BROADCAST: broadcast address valid. Volatile. ++ * @IFF_DEBUG: turn on debugging. Can be toggled through sysfs. ++ * @IFF_LOOPBACK: is a loopback net. Volatile. ++ * @IFF_POINTOPOINT: interface is has p-p link. Volatile. ++ * @IFF_NOTRAILERS: avoid use of trailers. Can be toggled through sysfs. ++ * Volatile. ++ * @IFF_RUNNING: interface RFC2863 OPER_UP. Volatile. ++ * @IFF_NOARP: no ARP protocol. Can be toggled through sysfs. Volatile. ++ * @IFF_PROMISC: receive all packets. Can be toggled through sysfs. ++ * @IFF_ALLMULTI: receive all multicast packets. Can be toggled through ++ * sysfs. ++ * @IFF_MASTER: master of a load balancer. Volatile. ++ * @IFF_SLAVE: slave of a load balancer. Volatile. ++ * @IFF_MULTICAST: Supports multicast. Can be toggled through sysfs. ++ * @IFF_PORTSEL: can set media type. Can be toggled through sysfs. ++ * @IFF_AUTOMEDIA: auto media select active. Can be toggled through sysfs. ++ * @IFF_DYNAMIC: dialup device with changing addresses. Can be toggled ++ * through sysfs. ++ * @IFF_LOWER_UP: driver signals L1 up. Volatile. ++ * @IFF_DORMANT: driver signals dormant. Volatile. ++ * @IFF_ECHO: echo sent packets. Volatile. ++ */ ++enum net_device_flags { ++/* for compatibility with glibc net/if.h */ ++#if __UAPI_DEF_IF_NET_DEVICE_FLAGS ++ IFF_UP = 1<<0, /* sysfs */ ++ IFF_BROADCAST = 1<<1, /* __volatile__ */ ++ IFF_DEBUG = 1<<2, /* sysfs */ ++ IFF_LOOPBACK = 1<<3, /* __volatile__ */ ++ IFF_POINTOPOINT = 1<<4, /* __volatile__ */ ++ IFF_NOTRAILERS = 1<<5, /* sysfs */ ++ IFF_RUNNING = 1<<6, /* __volatile__ */ ++ IFF_NOARP = 1<<7, /* sysfs */ ++ IFF_PROMISC = 1<<8, /* sysfs */ ++ IFF_ALLMULTI = 1<<9, /* sysfs */ ++ IFF_MASTER = 1<<10, /* __volatile__ */ ++ IFF_SLAVE = 1<<11, /* __volatile__ */ ++ IFF_MULTICAST = 1<<12, /* sysfs */ ++ IFF_PORTSEL = 1<<13, /* sysfs */ ++ IFF_AUTOMEDIA = 1<<14, /* sysfs */ ++ IFF_DYNAMIC = 1<<15, /* sysfs */ ++#endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS */ ++#if __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO ++ IFF_LOWER_UP = 1<<16, /* __volatile__ */ ++ IFF_DORMANT = 1<<17, /* __volatile__ */ ++ IFF_ECHO = 1<<18, /* __volatile__ */ ++#endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */ ++}; ++#endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO != 0 || __UAPI_DEF_IF_NET_DEVICE_FLAGS != 0 */ ++ ++/* for compatibility with glibc net/if.h */ ++#if __UAPI_DEF_IF_NET_DEVICE_FLAGS ++#define IFF_UP IFF_UP ++#define IFF_BROADCAST IFF_BROADCAST ++#define IFF_DEBUG IFF_DEBUG ++#define IFF_LOOPBACK IFF_LOOPBACK ++#define IFF_POINTOPOINT IFF_POINTOPOINT ++#define IFF_NOTRAILERS IFF_NOTRAILERS ++#define IFF_RUNNING IFF_RUNNING ++#define IFF_NOARP IFF_NOARP ++#define IFF_PROMISC IFF_PROMISC ++#define IFF_ALLMULTI IFF_ALLMULTI ++#define IFF_MASTER IFF_MASTER ++#define IFF_SLAVE IFF_SLAVE ++#define IFF_MULTICAST IFF_MULTICAST ++#define IFF_PORTSEL IFF_PORTSEL ++#define IFF_AUTOMEDIA IFF_AUTOMEDIA ++#define IFF_DYNAMIC IFF_DYNAMIC ++#endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS */ ++ ++#if __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO ++#define IFF_LOWER_UP IFF_LOWER_UP ++#define IFF_DORMANT IFF_DORMANT ++#define IFF_ECHO IFF_ECHO ++#endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */ ++ ++#define IFF_VOLATILE (IFF_LOOPBACK|IFF_POINTOPOINT|IFF_BROADCAST|IFF_ECHO|\ ++ IFF_MASTER|IFF_SLAVE|IFF_RUNNING|IFF_LOWER_UP|IFF_DORMANT) ++ ++#define IF_GET_IFACE 0x0001 /* for querying only */ ++#define IF_GET_PROTO 0x0002 ++ ++/* For definitions see hdlc.h */ ++#define IF_IFACE_V35 0x1000 /* V.35 serial interface */ ++#define IF_IFACE_V24 0x1001 /* V.24 serial interface */ ++#define IF_IFACE_X21 0x1002 /* X.21 serial interface */ ++#define IF_IFACE_T1 0x1003 /* T1 telco serial interface */ ++#define IF_IFACE_E1 0x1004 /* E1 telco serial interface */ ++#define IF_IFACE_SYNC_SERIAL 0x1005 /* can't be set by software */ ++#define IF_IFACE_X21D 0x1006 /* X.21 Dual Clocking (FarSite) */ ++ ++/* For definitions see hdlc.h */ ++#define IF_PROTO_HDLC 0x2000 /* raw HDLC protocol */ ++#define IF_PROTO_PPP 0x2001 /* PPP protocol */ ++#define IF_PROTO_CISCO 0x2002 /* Cisco HDLC protocol */ ++#define IF_PROTO_FR 0x2003 /* Frame Relay protocol */ ++#define IF_PROTO_FR_ADD_PVC 0x2004 /* Create FR PVC */ ++#define IF_PROTO_FR_DEL_PVC 0x2005 /* Delete FR PVC */ ++#define IF_PROTO_X25 0x2006 /* X.25 */ ++#define IF_PROTO_HDLC_ETH 0x2007 /* raw HDLC, Ethernet emulation */ ++#define IF_PROTO_FR_ADD_ETH_PVC 0x2008 /* Create FR Ethernet-bridged PVC */ ++#define IF_PROTO_FR_DEL_ETH_PVC 0x2009 /* Delete FR Ethernet-bridged PVC */ ++#define IF_PROTO_FR_PVC 0x200A /* for reading PVC status */ ++#define IF_PROTO_FR_ETH_PVC 0x200B ++#define IF_PROTO_RAW 0x200C /* RAW Socket */ ++ ++/* RFC 2863 operational status */ ++enum { ++ IF_OPER_UNKNOWN, ++ IF_OPER_NOTPRESENT, ++ IF_OPER_DOWN, ++ IF_OPER_LOWERLAYERDOWN, ++ IF_OPER_TESTING, ++ IF_OPER_DORMANT, ++ IF_OPER_UP, ++}; ++ ++/* link modes */ ++enum { ++ IF_LINK_MODE_DEFAULT, ++ IF_LINK_MODE_DORMANT, /* limit upward transition to dormant */ ++ IF_LINK_MODE_TESTING, /* limit upward transition to testing */ ++}; ++ ++/* ++ * Device mapping structure. I'd just gone off and designed a ++ * beautiful scheme using only loadable modules with arguments ++ * for driver options and along come the PCMCIA people 8) ++ * ++ * Ah well. The get() side of this is good for WDSETUP, and it'll ++ * be handy for debugging things. The set side is fine for now and ++ * being very small might be worth keeping for clean configuration. ++ */ ++ ++/* for compatibility with glibc net/if.h */ ++#if __UAPI_DEF_IF_IFMAP ++struct ifmap { ++ unsigned long mem_start; ++ unsigned long mem_end; ++ unsigned short base_addr; ++ unsigned char irq; ++ unsigned char dma; ++ unsigned char port; ++ /* 3 bytes spare */ ++}; ++#endif /* __UAPI_DEF_IF_IFMAP */ ++ ++struct if_settings { ++ unsigned int type; /* Type of physical device or protocol */ ++ unsigned int size; /* Size of the data allocated by the caller */ ++ union { ++ /* {atm/eth/dsl}_settings anyone ? */ ++ raw_hdlc_proto *raw_hdlc; ++ cisco_proto *cisco; ++ fr_proto *fr; ++ fr_proto_pvc *fr_pvc; ++ fr_proto_pvc_info *fr_pvc_info; ++ x25_hdlc_proto *x25; ++ ++ /* interface settings */ ++ sync_serial_settings *sync; ++ te1_settings *te1; ++ } ifs_ifsu; ++}; ++ ++/* ++ * Interface request structure used for socket ++ * ioctl's. All interface ioctl's must have parameter ++ * definitions which begin with ifr_name. The ++ * remainder may be interface specific. ++ */ ++ ++/* for compatibility with glibc net/if.h */ ++#if __UAPI_DEF_IF_IFREQ ++struct ifreq { ++#define IFHWADDRLEN 6 ++ union ++ { ++ char ifrn_name[IFNAMSIZ]; /* if name, e.g. "en0" */ ++ } ifr_ifrn; ++ ++ union { ++ struct sockaddr ifru_addr; ++ struct sockaddr ifru_dstaddr; ++ struct sockaddr ifru_broadaddr; ++ struct sockaddr ifru_netmask; ++ struct sockaddr ifru_hwaddr; ++ short ifru_flags; ++ int ifru_ivalue; ++ int ifru_mtu; ++ struct ifmap ifru_map; ++ char ifru_slave[IFNAMSIZ]; /* Just fits the size */ ++ char ifru_newname[IFNAMSIZ]; ++ void * ifru_data; ++ struct if_settings ifru_settings; ++ } ifr_ifru; ++}; ++#endif /* __UAPI_DEF_IF_IFREQ */ ++ ++#define ifr_name ifr_ifrn.ifrn_name /* interface name */ ++#define ifr_hwaddr ifr_ifru.ifru_hwaddr /* MAC address */ ++#define ifr_addr ifr_ifru.ifru_addr /* address */ ++#define ifr_dstaddr ifr_ifru.ifru_dstaddr /* other end of p-p lnk */ ++#define ifr_broadaddr ifr_ifru.ifru_broadaddr /* broadcast address */ ++#define ifr_netmask ifr_ifru.ifru_netmask /* interface net mask */ ++#define ifr_flags ifr_ifru.ifru_flags /* flags */ ++#define ifr_metric ifr_ifru.ifru_ivalue /* metric */ ++#define ifr_mtu ifr_ifru.ifru_mtu /* mtu */ ++#define ifr_map ifr_ifru.ifru_map /* device map */ ++#define ifr_slave ifr_ifru.ifru_slave /* slave device */ ++#define ifr_data ifr_ifru.ifru_data /* for use by interface */ ++#define ifr_ifindex ifr_ifru.ifru_ivalue /* interface index */ ++#define ifr_bandwidth ifr_ifru.ifru_ivalue /* link bandwidth */ ++#define ifr_qlen ifr_ifru.ifru_ivalue /* Queue length */ ++#define ifr_newname ifr_ifru.ifru_newname /* New name */ ++#define ifr_settings ifr_ifru.ifru_settings /* Device/proto settings*/ ++ ++/* ++ * Structure used in SIOCGIFCONF request. ++ * Used to retrieve interface configuration ++ * for machine (useful for programs which ++ * must know all networks accessible). ++ */ ++ ++/* for compatibility with glibc net/if.h */ ++#if __UAPI_DEF_IF_IFCONF ++struct ifconf { ++ int ifc_len; /* size of buffer */ ++ union { ++ char *ifcu_buf; ++ struct ifreq *ifcu_req; ++ } ifc_ifcu; ++}; ++#endif /* __UAPI_DEF_IF_IFCONF */ ++ ++#define ifc_buf ifc_ifcu.ifcu_buf /* buffer address */ ++#define ifc_req ifc_ifcu.ifcu_req /* array of structures */ ++ ++#endif /* _LINUX_IF_H */ +-- +2.25.1 + diff --git a/package/ethtool/0002-marvell.c-Fix-build-with-musl-libc.patch b/package/ethtool/0002-marvell.c-Fix-build-with-musl-libc.patch new file mode 100644 index 00000000000..f13edbbe506 --- /dev/null +++ b/package/ethtool/0002-marvell.c-Fix-build-with-musl-libc.patch @@ -0,0 +1,71 @@ +From a26296eea68aa6c16b253f34825c9b9007269672 Mon Sep 17 00:00:00 2001 +From: Florian Fainelli +Date: Sat, 14 Jan 2023 08:34:11 -0800 +Subject: [PATCH] marvell.c: Fix build with musl-libc + +After commit 1fa60003a8b8 ("misc: header includes cleanup") we stopped +including net/if.h which resolved the proper defines to pull in +sys/types.h and provide a definition for u_int32_t. With musl-libc we +would need to define _GNU_SOURCE to ensure that sys/types.h does provide a +definition for u_int32_t. + +Rather, just replace u_uint{16,32}_t with the more standard +uint{16,32}_t types from stdint.h + +Fixes: 1fa60003a8b8 ("misc: header includes cleanup") +Signed-off-by: Florian Fainelli + +[Upstream: https://patchwork.kernel.org/project/netdevbpf/patch/20230114163411.3290201-4-f.fainelli@gmail.com/] +Signed-off-by: Vincent Fazio +--- + marvell.c | 34 +++++++++++++++++----------------- + 1 file changed, 17 insertions(+), 17 deletions(-) + +diff --git a/marvell.c b/marvell.c +index d3d570e..3f3aed8 100644 +--- a/marvell.c ++++ b/marvell.c +@@ -31,23 +31,23 @@ static void dump_timer(const char *name, const void *p) + static void dump_queue(const char *name, const void *a, int rx) + { + struct desc { +- u_int32_t ctl; +- u_int32_t next; +- u_int32_t data_lo; +- u_int32_t data_hi; +- u_int32_t status; +- u_int32_t timestamp; +- u_int16_t csum2; +- u_int16_t csum1; +- u_int16_t csum2_start; +- u_int16_t csum1_start; +- u_int32_t addr_lo; +- u_int32_t addr_hi; +- u_int32_t count_lo; +- u_int32_t count_hi; +- u_int32_t byte_count; +- u_int32_t csr; +- u_int32_t flag; ++ uint32_t ctl; ++ uint32_t next; ++ uint32_t data_lo; ++ uint32_t data_hi; ++ uint32_t status; ++ uint32_t timestamp; ++ uint16_t csum2; ++ uint16_t csum1; ++ uint16_t csum2_start; ++ uint16_t csum1_start; ++ uint32_t addr_lo; ++ uint32_t addr_hi; ++ uint32_t count_lo; ++ uint32_t count_hi; ++ uint32_t byte_count; ++ uint32_t csr; ++ uint32_t flag; + }; + const struct desc *d = a; + +-- +2.25.1 + diff --git a/package/ethtool/ethtool.hash b/package/ethtool/ethtool.hash index 59c657e8682..609085aa5e5 100644 --- a/package/ethtool/ethtool.hash +++ b/package/ethtool/ethtool.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/software/network/ethtool/sha256sums.asc -sha256 686fd6110389d49c2a120f00c3cd5dfe43debada8e021e4270d74bbe452a116d ethtool-5.15.tar.xz +sha256 c41fc881ffa5a40432d2dd829eb44c64a49dee482e716baacf9262c64daa8f90 ethtool-6.1.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 5d632934396f90c82dfebe3c9512648bbb6333b406113d0cd331b0e0aa2d34a1 LICENSE diff --git a/package/ethtool/ethtool.mk b/package/ethtool/ethtool.mk index c4bb9bdd903..3381344e0a5 100644 --- a/package/ethtool/ethtool.mk +++ b/package/ethtool/ethtool.mk @@ -4,7 +4,7 @@ # ################################################################################ -ETHTOOL_VERSION = 5.15 +ETHTOOL_VERSION = 6.1 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/0002-Fix-compile-time-issue-on-very-old-kernels.patch b/package/eudev/0002-Fix-compile-time-issue-on-very-old-kernels.patch new file mode 100644 index 00000000000..46961cc9d10 --- /dev/null +++ b/package/eudev/0002-Fix-compile-time-issue-on-very-old-kernels.patch @@ -0,0 +1,44 @@ +From 09b536e0b9d0964674936901ab9d2954f935c8b4 Mon Sep 17 00:00:00 2001 +From: Stefan Ott +Date: Wed, 5 Apr 2023 18:20:37 +0200 +Subject: [PATCH] Fix compile-time issue on very old kernels + +Kernel versions prior to 3.4 did not have V4L2_CAP_DEVICE_CAPS and +compiling against such a kernel will fail. + +This patch introduces a version check and makes eudev fall back to +v2cap.capabilities on these kernels. + +Upstream: https://github.com/eudev-project/eudev/commit/09b536e0b9d0964674936901ab9d2954f935c8b4 +Signed-off-by: Stefan Ott +--- + src/v4l_id/v4l_id.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/v4l_id/v4l_id.c b/src/v4l_id/v4l_id.c +index 6bf45effe..702d5b687 100644 +--- a/src/v4l_id/v4l_id.c ++++ b/src/v4l_id/v4l_id.c +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + #include + + #include "util.h" +@@ -71,9 +72,11 @@ int main(int argc, char *argv[]) { + printf("ID_V4L_VERSION=2\n"); + printf("ID_V4L_PRODUCT=%s\n", v2cap.card); + printf("ID_V4L_CAPABILITIES=:"); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0) + if (v2cap.capabilities & V4L2_CAP_DEVICE_CAPS) + capabilities = v2cap.device_caps; + else ++#endif + capabilities = v2cap.capabilities; + if ((capabilities & V4L2_CAP_VIDEO_CAPTURE) > 0 || + (capabilities & V4L2_CAP_VIDEO_CAPTURE_MPLANE) > 0) +-- +2.40.0 + diff --git a/package/eudev/eudev.mk b/package/eudev/eudev.mk index 705370689d9..feb55052893 100644 --- a/package/eudev/eudev.mk +++ b/package/eudev/eudev.mk @@ -57,13 +57,12 @@ endef HOST_EUDEV_DEPENDENCIES = host-gperf host-pkgconf -HOST_EUDEV_SYSCONFDIR = $(if $(BR2_PACKAGE_SYSTEMD),/usr/lib,/etc) HOST_EUDEV_CONF_OPTS = \ --prefix=/usr \ --sbindir=/sbin \ --libexecdir=/lib \ --with-rootlibdir=/lib \ - --sysconfdir=$(HOST_EUDEV_SYSCONFDIR) \ + --sysconfdir=/etc \ --disable-blkid \ --disable-introspection \ --disable-kmod \ @@ -82,13 +81,5 @@ define HOST_EUDEV_BUILD_HWDB endef HOST_EUDEV_TARGET_FINALIZE_HOOKS += HOST_EUDEV_BUILD_HWDB -# Note: this will run in the filesystem context, so will use a copy -# of tharget/, not the real one, so the files are still available on -# re-builds (foo-rebuild, etc...) -define HOST_EUDEV_RM_HWDB_SRC - rm -rf $(TARGET_DIR)/$(HOST_EUDEV_SYSCONFDIR)/udev/hwdb.d/ -endef -HOST_EUDEV_ROOTFS_PRE_CMD_HOOKS += HOST_EUDEV_RM_HWDB_SRC - $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/package/evtest/0001-Add-missing-limits.h-include.patch b/package/evtest/0001-Add-missing-limits.h-include.patch deleted file mode 100644 index 6c7fc90482b..00000000000 --- a/package/evtest/0001-Add-missing-limits.h-include.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 7d7c5a81b0e2f3321d269b7acc450d1eec7a910b Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Sun, 18 Aug 2019 09:57:23 +0300 -Subject: [PATCH] Add missing limits.h include -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes build with musl libc that does not include limits.h indirectly via -other headers. - -evtest.c: In function ‘scan_devices’: -evtest.c:886:14: error: ‘PATH_MAX’ undeclared (first use in this function); did you mean INT8_MAX’? - char fname[PATH_MAX]; - ^~~~~~~~ - -Signed-off-by: Baruch Siach ---- -Upstream status: sent to input-tools@lists.freedesktop.org (moderated) - - evtest.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/evtest.c b/evtest.c -index 37d4f8540333..548c203564d3 100644 ---- a/evtest.c -+++ b/evtest.c -@@ -56,6 +56,7 @@ - #include - #include - #include -+#include - #include - #include - #include --- -2.23.0.rc1 - diff --git a/package/evtest/0002-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/package/evtest/0002-Fix-build-on-32bit-arches-with-64bit-time_t.patch deleted file mode 100644 index e39ccb641f8..00000000000 --- a/package/evtest/0002-Fix-build-on-32bit-arches-with-64bit-time_t.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 70c5dd9e858ed577a4bbe7ec8920934c89df08fc Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 30 Nov 2019 11:58:58 -0800 -Subject: [PATCH] Fix build on 32bit arches with 64bit time_t - -time element is deprecated on new input_event structure in kernel's -input.h [1] - -[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f - -Signed-off-by: Khem Raj -Signed-off-by: Baruch Siach ---- -Upstream status: commit 648f5c1a9e0 - - evtest.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/evtest.c b/evtest.c -index 548c203564d3..8d592f42bdca 100644 ---- a/evtest.c -+++ b/evtest.c -@@ -61,6 +61,11 @@ - #include - #include - -+#ifndef input_event_sec -+#define input_event_sec time.tv_sec -+#define input_event_usec time.tv_usec -+#endif -+ - #define BITS_PER_LONG (sizeof(long) * 8) - #define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1) - #define OFF(x) ((x)%BITS_PER_LONG) -@@ -1140,7 +1145,7 @@ static int print_events(int fd) - type = ev[i].type; - code = ev[i].code; - -- printf("Event: time %ld.%06ld, ", ev[i].time.tv_sec, ev[i].time.tv_usec); -+ printf("Event: time %ld.%06ld, ", ev[i].input_event_sec, ev[i].input_event_usec); - - if (type == EV_SYN) { - if (code == SYN_MT_REPORT) --- -2.25.1 - diff --git a/package/evtest/evtest.hash b/package/evtest/evtest.hash index b1ee24371eb..0ed51df4e4d 100644 --- a/package/evtest/evtest.hash +++ b/package/evtest/evtest.hash @@ -1,5 +1,5 @@ # locally computed -sha256 0e7a2eeff380af796e5e9b21b6f48fd706c58c931162c151c2c1074bdfeb85c6 evtest-evtest-1.34.tar.gz +sha256 06dfe6b9760b78f3f73aca2120cbcb79339b33e59d5c79a49b4bd5d34844b054 evtest-evtest-1.35.tar.gz # License files -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/evtest/evtest.mk b/package/evtest/evtest.mk index 8b8667e0453..65897a41e60 100644 --- a/package/evtest/evtest.mk +++ b/package/evtest/evtest.mk @@ -4,12 +4,11 @@ # ################################################################################ -EVTEST_VERSION = 1.34 +EVTEST_VERSION = 1.35 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+ EVTEST_LICENSE_FILES = COPYING -EVTEST_DEPENDENCIES = host-pkgconf # needed because source package contains no generated files EVTEST_AUTORECONF = YES diff --git a/package/execline/execline.hash b/package/execline/execline.hash index 706b131afd2..1d72e2cb49f 100644 --- a/package/execline/execline.hash +++ b/package/execline/execline.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 a373f497d2335905d750e2f3be2ba47a028c11c4a7d5595dca9965c161e53aed execline-2.8.0.1.tar.gz -sha256 adecb8bedfaae27fcfe65ecb3ef0e2e71aa2a2b49dc21886a200bc677d93e6ec COPYING +sha256 01260fcaf80ffbca2a94aa55ea474dfb9e39b3033b55c8af88126791879531f6 execline-2.9.0.1.tar.gz +sha256 35126cb8f2ff2a6e359f7bfec46c49004ead6304d8248ba67dcdebcc7d377754 COPYING diff --git a/package/execline/execline.mk b/package/execline/execline.mk index c348d924b75..38f4570ba47 100644 --- a/package/execline/execline.mk +++ b/package/execline/execline.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXECLINE_VERSION = 2.8.0.1 +EXECLINE_VERSION = 2.9.0.1 EXECLINE_SITE = http://skarnet.org/software/execline EXECLINE_LICENSE = ISC EXECLINE_LICENSE_FILES = COPYING diff --git a/package/exempi/exempi.hash b/package/exempi/exempi.hash index 5df610de175..772d9130d4e 100644 --- a/package/exempi/exempi.hash +++ b/package/exempi/exempi.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 072451ac1e0dc97ed69a2e5bfc235fd94fe093d837f65584d0e3581af5db18cd exempi-2.6.1.tar.bz2 +sha256 80b3aa0b7f54978c6a49cc5f5f1d3b6e9524b59de74ef92b3bf0abeba4c28fb1 exempi-2.6.3.tar.xz sha256 3d3c3593c15e0d35bdae0df7c642106250f6be3adc61477419413900f23ae607 COPYING diff --git a/package/exempi/exempi.mk b/package/exempi/exempi.mk index 56fbe203792..f808afd53cb 100644 --- a/package/exempi/exempi.mk +++ b/package/exempi/exempi.mk @@ -4,11 +4,11 @@ # ################################################################################ -EXEMPI_VERSION = 2.6.1 -EXEMPI_SOURCE = exempi-$(EXEMPI_VERSION).tar.bz2 +EXEMPI_VERSION = 2.6.3 +EXEMPI_SOURCE = exempi-$(EXEMPI_VERSION).tar.xz EXEMPI_SITE = https://libopenraw.freedesktop.org/download EXEMPI_INSTALL_STAGING = YES -EXEMPI_CONF_OPTS = --disable-unittest +EXEMPI_CONF_OPTS = --disable-samples --disable-unittest EXEMPI_DEPENDENCIES = host-pkgconf expat zlib \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) EXEMPI_LICENSE = BSD-3-Clause diff --git a/package/exfat-utils/exfat-utils.hash b/package/exfat-utils/exfat-utils.hash index 53155d41bab..b4ed8bc5684 100644 --- a/package/exfat-utils/exfat-utils.hash +++ b/package/exfat-utils/exfat-utils.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 dfebd07a7b907e2d603d3a9626e6440bd43ec6c4e8c07ccfc57ce9502b724835 exfat-utils-1.3.0.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 241575fa93104406a47e79e53e4d907bae69886f11621f70a45276c62b75bf69 exfat-utils-1.4.0.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/exfat-utils/exfat-utils.mk b/package/exfat-utils/exfat-utils.mk index d13ec6bab83..c02cefb0c58 100644 --- a/package/exfat-utils/exfat-utils.mk +++ b/package/exfat-utils/exfat-utils.mk @@ -4,10 +4,12 @@ # ################################################################################ -EXFAT_UTILS_VERSION = 1.3.0 +EXFAT_UTILS_VERSION = 1.4.0 EXFAT_UTILS_SITE = https://github.com/relan/exfat/releases/download/v$(EXFAT_UTILS_VERSION) EXFAT_UTILS_LICENSE = GPL-2.0+ EXFAT_UTILS_LICENSE_FILES = COPYING +EXFAT_UTILS_CPE_ID_VENDOR = exfat_project +EXFAT_UTILS_CPE_ID_PRODUCT = exfat EXFAT_UTILS_CONF_OPTS += --exec-prefix=/ diff --git a/package/exfat/Config.in b/package/exfat/Config.in index c0b4eabe111..c0ed2570d9b 100644 --- a/package/exfat/Config.in +++ b/package/exfat/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_EXFAT depends on BR2_USE_MMU # libfuse depends on BR2_USE_WCHAR depends on !BR2_STATIC_LIBS # libfuse - select BR2_PACKAGE_LIBFUSE + select BR2_PACKAGE_LIBFUSE3 if !BR2_PACKAGE_LIBFUSE help A full-featured exFAT file system implementation for GNU/Linux and other Unix-like systems as a FUSE module. diff --git a/package/exfat/exfat.hash b/package/exfat/exfat.hash index 4b8ce901902..c6082a403a4 100644 --- a/package/exfat/exfat.hash +++ b/package/exfat/exfat.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 07652136064da5e4d32df5555f88c138ffa4835a23b88a5bae2015f21006e0d3 fuse-exfat-1.3.0.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 a1cfedc55e0e7a12c184605aa0f0bf44b24a3fb272449b20b2c8bbe6edb3001e fuse-exfat-1.4.0.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/exfat/exfat.mk b/package/exfat/exfat.mk index 282a30aa5e3..a8efe5b0ba0 100644 --- a/package/exfat/exfat.mk +++ b/package/exfat/exfat.mk @@ -4,14 +4,15 @@ # ################################################################################ -EXFAT_VERSION = 1.3.0 +EXFAT_VERSION = 1.4.0 EXFAT_SITE = https://github.com/relan/exfat/releases/download/v$(EXFAT_VERSION) EXFAT_SOURCE = fuse-exfat-$(EXFAT_VERSION).tar.gz -EXFAT_DEPENDENCIES = libfuse host-pkgconf +EXFAT_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_LIBFUSE3),libfuse3,libfuse) \ + host-pkgconf EXFAT_LICENSE = GPL-2.0+ EXFAT_LICENSE_FILES = COPYING EXFAT_CPE_ID_VENDOR = exfat_project -EXFAT_CFLAGS = $(TARGET_CFLAGS) -std=c99 EXFAT_CONF_OPTS += --exec-prefix=/ diff --git a/package/exfatprogs/exfatprogs.hash b/package/exfatprogs/exfatprogs.hash index 99f57c9deb4..49135b1da7e 100644 --- a/package/exfatprogs/exfatprogs.hash +++ b/package/exfatprogs/exfatprogs.hash @@ -1,5 +1,5 @@ -# From https://github.com/exfatprogs/exfatprogs/releases/download/1.1.3/exfatprogs-1.1.3.tar.xz.sha256 -sha256 3dbd74b60eec18d2c68d57be4a872d7baa4f7d848e669e31159452ef5245b809 exfatprogs-1.1.3.tar.xz +# From https://github.com/exfatprogs/exfatprogs/releases/download/1.2.0/exfatprogs-1.2.0.tar.xz.sha256 +sha256 56d9a49465deafc367d428afc71c8098705a30ee19a3cdf3c5320650b8880742 exfatprogs-1.2.0.tar.xz # Hash for license file sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/exfatprogs/exfatprogs.mk b/package/exfatprogs/exfatprogs.mk index 2911d21f4f4..d755c7a2145 100644 --- a/package/exfatprogs/exfatprogs.mk +++ b/package/exfatprogs/exfatprogs.mk @@ -4,13 +4,11 @@ # ################################################################################ -EXFATPROGS_VERSION = 1.1.3 +EXFATPROGS_VERSION = 1.2.0 EXFATPROGS_SOURCE = exfatprogs-$(EXFATPROGS_VERSION).tar.xz EXFATPROGS_SITE = https://github.com/exfatprogs/exfatprogs/releases/download/$(EXFATPROGS_VERSION) EXFATPROGS_LICENSE = GPL-2.0+ EXFATPROGS_LICENSE_FILES = COPYING -EXFATPROGS_DEPENDENCIES = host-pkgconf -HOST_EXFATPROGS_DEPENDENCIES = host-pkgconf $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/package/exim/0004-Fix-uClibc-build.patch b/package/exim/0004-Fix-uClibc-build.patch deleted file mode 100644 index 9d5452bb56d..00000000000 --- a/package/exim/0004-Fix-uClibc-build.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 68ea4fc7ca53bf010e5ec738ad078452f0eaa639 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Tue, 23 Jul 2019 18:48:06 +0200 -Subject: [PATCH] Fix uClibc build -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -structs.h:757:18: error: ‘NS_MAXMSG’ undeclared here (not in a function); did you mean ‘N_MASC’? - uschar answer[NS_MAXMSG]; /* the answer itself */ - -Patch sent upstream: https://github.com/Exim/exim/pull/70 - -Signed-off-by: Bernd Kuhls ---- - OS/os.h-Linux | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/OS/os.h-Linux b/OS/os.h-Linux -index 63cf9babd..1d82e9bad 100644 ---- a/OS/os.h-Linux -+++ b/OS/os.h-Linux -@@ -87,5 +87,9 @@ then change the 0 to 1 in the next block. */ - # define TCPI_OPT_SYN_DATA 32 - #endif - -+/* Needed for uClibc */ -+#ifndef NS_MAXMSG -+# define NS_MAXMSG 65535 -+#endif - - /* End */ --- -2.20.1 - diff --git a/package/exim/0005-exim_lock-fix-lstat-related-build-errors.patch b/package/exim/0004-exim_lock-fix-lstat-related-build-errors.patch similarity index 100% rename from package/exim/0005-exim_lock-fix-lstat-related-build-errors.patch rename to package/exim/0004-exim_lock-fix-lstat-related-build-errors.patch diff --git a/package/exim/0006-sieve-fix-build-errors.patch b/package/exim/0005-sieve-fix-build-errors.patch similarity index 100% rename from package/exim/0006-sieve-fix-build-errors.patch rename to package/exim/0005-sieve-fix-build-errors.patch diff --git a/package/exim/0006-Fix-regex-n-use-after-free.-Bug-2915.patch b/package/exim/0006-Fix-regex-n-use-after-free.-Bug-2915.patch new file mode 100644 index 00000000000..57fa189b043 --- /dev/null +++ b/package/exim/0006-Fix-regex-n-use-after-free.-Bug-2915.patch @@ -0,0 +1,173 @@ +From 4e9ed49f8f12eb331b29bd5b6dc3693c520fddc2 Mon Sep 17 00:00:00 2001 +From: Jeremy Harris +Date: Wed, 31 Aug 2022 15:37:40 +0100 +Subject: [PATCH] Fix $regex use-after-free. Bug 2915 + +[Upstream: https://sources.debian.org/data/main/e/exim4/4.96-9/debian/patches/75_08-Fix-regex-n-use-after-free.-Bug-2915.patch] +[Peter: drop Changelog hunk] +Signed-off-by: Peter Korsgaard +--- + src/exim.c | 4 +--- + src/expand.c | 2 +- + src/functions.h | 1 + + src/globals.c | 2 +- + src/regex.c | 29 ++++++++++++++++++----------- + src/smtp_in.c | 2 ++ + test/confs/4002 | 10 ++++++++++ + test/mail/4002.userx | 7 +++++++ + test/scripts/4000-scanning/4002 | 7 +++++++ + 9 files changed, 53 insertions(+), 17 deletions(-) + +--- a/src/exim.c ++++ b/src/exim.c +@@ -1999,12 +1999,10 @@ + + regex_whitelisted_macro = + regex_must_compile(US"^[A-Za-z0-9_/.-]*$", FALSE, TRUE); + #endif + +-for (i = 0; i < REGEX_VARS; i++) regex_vars[i] = NULL; +- + /* If the program is called as "mailq" treat it as equivalent to "exim -bp"; + this seems to be a generally accepted convention, since one finds symbolic + links called "mailq" in standard OS configurations. */ + + if ((namelen == 5 && Ustrcmp(argv[0], "mailq") == 0) || +@@ -6082,11 +6080,11 @@ + callout_address = NULL; + sending_ip_address = NULL; + deliver_localpart_data = deliver_domain_data = + recipient_data = sender_data = NULL; + acl_var_m = NULL; +- for(int i = 0; i < REGEX_VARS; i++) regex_vars[i] = NULL; ++ regex_vars_clear(); + + store_reset(reset_point); + } + + exim_exit(EXIT_SUCCESS); /* Never returns */ +--- a/src/expand.c ++++ b/src/expand.c +@@ -1871,11 +1871,11 @@ + { + tree_node * node = tree_search(router_var, name + 2); + return node ? node->data.ptr : strict_acl_vars ? NULL : US""; + } + +-/* Handle $auth variables. */ ++/* Handle $auth, $regex variables. */ + + if (Ustrncmp(name, "auth", 4) == 0) + { + uschar *endptr; + int n = Ustrtoul(name + 4, &endptr, 10); +--- a/src/functions.h ++++ b/src/functions.h +@@ -436,10 +436,11 @@ + extern int regex(const uschar **); + #endif + extern BOOL regex_match(const pcre2_code *, const uschar *, int, uschar **); + extern BOOL regex_match_and_setup(const pcre2_code *, const uschar *, int, int); + extern const pcre2_code *regex_must_compile(const uschar *, BOOL, BOOL); ++extern void regex_vars_clear(void); + extern void retry_add_item(address_item *, uschar *, int); + extern BOOL retry_check_address(const uschar *, host_item *, uschar *, BOOL, + uschar **, uschar **); + extern retry_config *retry_find_config(const uschar *, const uschar *, int, int); + extern BOOL retry_ultimate_address_timeout(uschar *, const uschar *, +--- a/src/globals.c ++++ b/src/globals.c +@@ -1313,11 +1313,11 @@ + #ifndef DISABLE_PIPE_CONNECT + const pcre2_code *regex_EARLY_PIPE = NULL; + #endif + const pcre2_code *regex_ismsgid = NULL; + const pcre2_code *regex_smtp_code = NULL; +-const uschar *regex_vars[REGEX_VARS]; ++const uschar *regex_vars[REGEX_VARS] = { 0 };; + #ifdef WHITELIST_D_MACROS + const pcre2_code *regex_whitelisted_macro = NULL; + #endif + #ifdef WITH_CONTENT_SCAN + uschar *regex_match_string = NULL; +--- a/src/regex.c ++++ b/src/regex.c +@@ -94,22 +94,32 @@ + } + pcre2_match_data_free(md); + return FAIL; + } + ++ ++/* reset expansion variables */ ++void ++regex_vars_clear(void) ++{ ++regex_match_string = NULL; ++for (int i = 0; i < REGEX_VARS; i++) regex_vars[i] = NULL; ++} ++ ++ ++ + int +-regex(const uschar **listptr) ++regex(const uschar ** listptr) + { + unsigned long mbox_size; +-FILE *mbox_file; +-pcre_list *re_list_head; +-uschar *linebuffer; ++FILE * mbox_file; ++pcre_list * re_list_head; ++uschar * linebuffer; + long f_pos = 0; + int ret = FAIL; + +-/* reset expansion variable */ +-regex_match_string = NULL; ++regex_vars_clear(); + + if (!mime_stream) /* We are in the DATA ACL */ + { + if (!(mbox_file = spool_mbox(&mbox_size, NULL, NULL))) + { /* error while spooling */ +@@ -167,18 +177,17 @@ + + + int + mime_regex(const uschar **listptr) + { +-pcre_list *re_list_head = NULL; +-FILE *f; +-uschar *mime_subject = NULL; ++pcre_list * re_list_head = NULL; ++FILE * f; ++uschar * mime_subject = NULL; + int mime_subject_len = 0; + int ret; + +-/* reset expansion variable */ +-regex_match_string = NULL; ++regex_vars_clear(); + + /* precompile our regexes */ + if (!(re_list_head = compile(*listptr))) + return FAIL; /* no regexes -> nothing to do */ + +--- a/src/smtp_in.c ++++ b/src/smtp_in.c +@@ -2155,12 +2155,14 @@ + prdr_requested = FALSE; + #endif + #ifdef SUPPORT_I18N + message_smtputf8 = FALSE; + #endif ++regex_vars_clear(); + body_linecount = body_zerocount = 0; + ++lookup_value = NULL; /* Can be set by ACL */ + sender_rate = sender_rate_limit = sender_rate_period = NULL; + ratelimiters_mail = NULL; /* Updated by ratelimit ACL condition */ + /* Note that ratelimiters_conn persists across resets. */ + + /* Reset message ACL variables */ diff --git a/package/exim/0007-Fix-non-WITH_CONTENT_SCAN-build.patch b/package/exim/0007-Fix-non-WITH_CONTENT_SCAN-build.patch new file mode 100644 index 00000000000..9f87f18e00f --- /dev/null +++ b/package/exim/0007-Fix-non-WITH_CONTENT_SCAN-build.patch @@ -0,0 +1,61 @@ +From d8ecc7bf97934a1e2244788c610c958cacd740bd Mon Sep 17 00:00:00 2001 +From: Jeremy Harris +Date: Wed, 31 Aug 2022 17:03:37 +0100 +Subject: [PATCH] Fix non-WITH_CONTENT_SCAN build. + +Broken-by: 4e9ed49f8f + +[Upstream: https://sources.debian.org/data/main/e/exim4/4.96-9/debian/patches/75_09-Fix-non-WITH_CONTENT_SCAN-build.patch] +Signed-off-by: Peter Korsgaard +--- + src/exim.c | 11 +++++++++++ + src/regex.c | 10 ---------- + 2 files changed, 11 insertions(+), 10 deletions(-) + +--- a/src/exim.c ++++ b/src/exim.c +@@ -1677,10 +1677,21 @@ + if ((s = expand_string(big_buffer))) printf("%s\n", CS s); + else printf("Failed: %s\n", expand_string_message); + } + + ++/* reset regex expansion variables */ ++void ++regex_vars_clear(void) ++{ ++regex_match_string = NULL; ++for (int i = 0; i < REGEX_VARS; i++) regex_vars[i] = NULL; ++} ++ ++ ++ ++ + + /************************************************* + * Entry point and high-level code * + *************************************************/ + +--- a/src/regex.c ++++ b/src/regex.c +@@ -95,20 +95,10 @@ + pcre2_match_data_free(md); + return FAIL; + } + + +-/* reset expansion variables */ +-void +-regex_vars_clear(void) +-{ +-regex_match_string = NULL; +-for (int i = 0; i < REGEX_VARS; i++) regex_vars[i] = NULL; +-} +- +- +- + int + regex(const uschar ** listptr) + { + unsigned long mbox_size; + FILE * mbox_file; diff --git a/package/exim/0008-Fix-non-WITH_CONTENT_SCAN-build-2.patch b/package/exim/0008-Fix-non-WITH_CONTENT_SCAN-build-2.patch new file mode 100644 index 00000000000..43cc1d79a92 --- /dev/null +++ b/package/exim/0008-Fix-non-WITH_CONTENT_SCAN-build-2.patch @@ -0,0 +1,139 @@ +From 158dff9936e36a2d31d037d3988b9353458d6471 Mon Sep 17 00:00:00 2001 +From: Jeremy Harris +Date: Wed, 31 Aug 2022 17:17:59 +0100 +Subject: [PATCH] Fix non-WITH_CONTENT_SCAN build (2) + +Broken-by: d8ecc7bf97 + +[Upstream: https://sources.debian.org/data/main/e/exim4/4.96-9/debian/patches/75_10-Fix-non-WITH_CONTENT_SCAN-build-2.patch] +[Peter: drop Changelog hunk] +Signed-off-by: Peter Korsgaard +--- + src/exim.c | 13 +------------ + src/functions.h | 2 +- + src/globals.h | 2 +- + src/regex.c | 10 ++++++++++ + src/smtp_in.c | 2 ++ + 5 files changed, 15 insertions(+), 14 deletions(-) + +--- a/src/exim.c ++++ b/src/exim.c +@@ -1677,21 +1677,10 @@ + if ((s = expand_string(big_buffer))) printf("%s\n", CS s); + else printf("Failed: %s\n", expand_string_message); + } + + +-/* reset regex expansion variables */ +-void +-regex_vars_clear(void) +-{ +-regex_match_string = NULL; +-for (int i = 0; i < REGEX_VARS; i++) regex_vars[i] = NULL; +-} +- +- +- +- + + /************************************************* + * Entry point and high-level code * + *************************************************/ + +@@ -6085,17 +6074,17 @@ + deliver_domain_orig = NULL; + deliver_host = deliver_host_address = NULL; + dnslist_domain = dnslist_matched = NULL; + #ifdef WITH_CONTENT_SCAN + malware_name = NULL; ++ regex_vars_clear(); + #endif + callout_address = NULL; + sending_ip_address = NULL; + deliver_localpart_data = deliver_domain_data = + recipient_data = sender_data = NULL; + acl_var_m = NULL; +- regex_vars_clear(); + + store_reset(reset_point); + } + + exim_exit(EXIT_SUCCESS); /* Never returns */ +--- a/src/functions.h ++++ b/src/functions.h +@@ -432,15 +432,15 @@ + extern BOOL receive_msg(BOOL); + extern int_eximarith_t receive_statvfs(BOOL, int *); + extern void receive_swallow_smtp(void); + #ifdef WITH_CONTENT_SCAN + extern int regex(const uschar **); ++extern void regex_vars_clear(void); + #endif + extern BOOL regex_match(const pcre2_code *, const uschar *, int, uschar **); + extern BOOL regex_match_and_setup(const pcre2_code *, const uschar *, int, int); + extern const pcre2_code *regex_must_compile(const uschar *, BOOL, BOOL); +-extern void regex_vars_clear(void); + extern void retry_add_item(address_item *, uschar *, int); + extern BOOL retry_check_address(const uschar *, host_item *, uschar *, BOOL, + uschar **, uschar **); + extern retry_config *retry_find_config(const uschar *, const uschar *, int, int); + extern BOOL retry_ultimate_address_timeout(uschar *, const uschar *, +--- a/src/globals.h ++++ b/src/globals.h +@@ -895,16 +895,16 @@ + #ifndef DISABLE_PIPE_CONNECT + extern const pcre2_code *regex_EARLY_PIPE; /* For recognizing PIPE_CONNCT */ + #endif + extern const pcre2_code *regex_ismsgid; /* Compiled r.e. for message ID */ + extern const pcre2_code *regex_smtp_code; /* For recognizing SMTP codes */ +-extern const uschar *regex_vars[]; /* $regexN variables */ + #ifdef WHITELIST_D_MACROS + extern const pcre2_code *regex_whitelisted_macro; /* For -D macro values */ + #endif + #ifdef WITH_CONTENT_SCAN + extern uschar *regex_match_string; /* regex that matched a line (regex ACL condition) */ ++extern const uschar *regex_vars[]; + #endif + extern int remote_delivery_count; /* Number of remote addresses */ + extern int remote_max_parallel; /* Maximum parallel delivery */ + extern uschar *remote_sort_domains; /* Remote domain sorting order */ + extern retry_config *retries; /* Chain of retry config information */ +--- a/src/regex.c ++++ b/src/regex.c +@@ -95,10 +95,20 @@ + pcre2_match_data_free(md); + return FAIL; + } + + ++/* reset expansion variables */ ++void ++regex_vars_clear(void) ++{ ++regex_match_string = NULL; ++for (int i = 0; i < REGEX_VARS; i++) regex_vars[i] = NULL; ++} ++ ++ ++ + int + regex(const uschar ** listptr) + { + unsigned long mbox_size; + FILE * mbox_file; +--- a/src/smtp_in.c ++++ b/src/smtp_in.c +@@ -2155,11 +2155,13 @@ + prdr_requested = FALSE; + #endif + #ifdef SUPPORT_I18N + message_smtputf8 = FALSE; + #endif ++#ifdef WITH_CONTENT_SCAN + regex_vars_clear(); ++#endif + body_linecount = body_zerocount = 0; + + lookup_value = NULL; /* Can be set by ACL */ + sender_rate = sender_rate_limit = sender_rate_period = NULL; + ratelimiters_mail = NULL; /* Updated by ratelimit ACL condition */ diff --git a/package/exim/0009-Fix-non-WITH_CONTENT_SCAN-build-3.patch b/package/exim/0009-Fix-non-WITH_CONTENT_SCAN-build-3.patch new file mode 100644 index 00000000000..f9675c80d35 --- /dev/null +++ b/package/exim/0009-Fix-non-WITH_CONTENT_SCAN-build-3.patch @@ -0,0 +1,49 @@ +From 32da6327e434e986a18b75a84f2d8c687ba14619 Mon Sep 17 00:00:00 2001 +From: Jeremy Harris +Date: Thu, 1 Sep 2022 15:54:35 +0100 +Subject: [PATCH] Fix non-WITH_CONTENT_SCAN build (3) + +Broken-by: d8ecc7bf97 + +[Upstream: https://sources.debian.org/data/main/e/exim4/4.96-9/debian/patches/75_11-Fix-non-WITH_CONTENT_SCAN-build-3.patch] +[Peter: drop Changelog hunk] +Signed-off-by: Peter Korsgaard +--- + src/expand.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/expand.c b/src/expand.c +index 89de56255..831ca2b75 100644 +--- a/src/expand.c ++++ b/src/expand.c +@@ -1869,6 +1869,7 @@ if (Ustrncmp(name, "auth", 4) == 0) + if (!*endptr && n != 0 && n <= AUTH_VARS) + return auth_vars[n-1] ? auth_vars[n-1] : US""; + } ++#ifdef WITH_CONTENT_SCAN + else if (Ustrncmp(name, "regex", 5) == 0) + { + uschar *endptr; +@@ -1876,6 +1877,7 @@ else if (Ustrncmp(name, "regex", 5) == 0) + if (!*endptr && n != 0 && n <= REGEX_VARS) + return regex_vars[n-1] ? regex_vars[n-1] : US""; + } ++#endif + + /* For all other variables, search the table */ + +@@ -8715,9 +8717,11 @@ assert_variable_notin() treats as const, so deconst is safe. */ + for (int i = 0; i < AUTH_VARS; i++) if (auth_vars[i]) + assert_variable_notin(US"auth", US auth_vars[i], &e); + ++#ifdef WITH_CONTENT_SCAN + /* check regex variables. assert_variable_notin() treats as const. */ + for (int i = 0; i < REGEX_VARS; i++) if (regex_vars[i]) + assert_variable_notin(US"regex", US regex_vars[i], &e); ++#endif + + /* check known-name variables */ + for (var_entry * v = var_table; v < var_table + var_table_size; v++) +-- +2.35.1 + diff --git a/package/exim/Config.in b/package/exim/Config.in index aa50a86736d..2557251fd1d 100644 --- a/package/exim/Config.in +++ b/package/exim/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_EXIM bool "exim" depends on BR2_USE_MMU # fork() depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_PCRE + select BR2_PACKAGE_PCRE2 select BR2_PACKAGE_BERKELEYDB help Exim is a message transfer agent (MTA) developed at the diff --git a/package/exim/exim.hash b/package/exim/exim.hash index 5cbad08a4be..2336aaa5c66 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 cc9cb653fff2ea947c3702680b59c99ac0bd1bbf19976d37e22a463cd804f167 exim-4.95.tar.xz +sha256 299a56927b2eb3477daafd3c5bda02bc67e5c4e5898a7aeaf2740875278cf1a3 exim-4.96.tar.xz # From https://ftp.exim.org/pub/exim/exim4/00-sha512sums.txt -sha512 93d09c20d99f27da5edbe3e6dc7d25aa4548faa2b67ca26f2cc0b4aeaf58398dd468e0263714fcf0df97531f05d16fcd3f1f0e9d0656ead7858a66b248a44a65 exim-4.95.tar.xz +sha512 6b863661465a0b9897c1b71875c5196a1903cf560dd85de45b08242b9731edb2bc10eb56945d62e477e5d15cc7a8d493915bff2ca81689673a8091c66f62c89e exim-4.96.tar.xz # Locally calculated sha256 49240db527b7e55b312a46fc59794fde5dd006422e422257f4f057bfd27b3c8f LICENCE diff --git a/package/exim/exim.mk b/package/exim/exim.mk index b45458b21b7..b84a51d6de9 100644 --- a/package/exim/exim.mk +++ b/package/exim/exim.mk @@ -4,14 +4,20 @@ # ################################################################################ -EXIM_VERSION = 4.95 +EXIM_VERSION = 4.96 EXIM_SOURCE = exim-$(EXIM_VERSION).tar.xz EXIM_SITE = https://ftp.exim.org/pub/exim/exim4 EXIM_LICENSE = GPL-2.0+ EXIM_LICENSE_FILES = LICENCE EXIM_CPE_ID_VENDOR = exim EXIM_SELINUX_MODULES = exim mta -EXIM_DEPENDENCIES = host-berkeleydb host-pcre pcre berkeleydb host-pkgconf +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. @@ -20,7 +26,7 @@ define exim-config-change # variable-name, variable-value $(@D)/Local/Makefile endef -# Comment-out a variable. Has no effect if it does not exits. +# Comment-out a variable. Has no effect if it does not exist. define exim-config-unset # variable-name $(SED) 's,^\([[:space:]]*$1[[:space:]]*=.*$$\),# \1,' \ $(@D)/Local/Makefile @@ -46,8 +52,8 @@ define EXIM_USE_DEFAULT_CONFIG_FILE $(call exim-config-change,EXIM_USER,ref:exim) $(call exim-config-change,EXIM_GROUP,mail) $(call exim-config-change,TRANSPORT_LMTP,yes) - $(call exim-config-change,PCRE_LIBS,-lpcre) - $(call exim-config-change,PCRE_CONFIG,no) + $(call exim-config-change,PCRE_LIBS,-lpcre2-8) + $(call exim-config-change,PCRE2_CONFIG,no) $(call exim-config-change,HAVE_ICONV,no) $(call exim-config-unset,EXIM_MONITOR) $(call exim-config-change,AUTH_PLAINTEXT,yes) diff --git a/package/expat/expat.hash b/package/expat/expat.hash index 26f1098b7a7..c6c25aa3e0b 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/expat/files/expat/2.4.7/ -md5 75a1f475e30281a00cb6f083ea481159 expat-2.4.7.tar.xz -sha1 032ceaa11cd791d4bc622bbf0d835b8766207796 expat-2.4.7.tar.xz +# From https://sourceforge.net/projects/expat/files/expat/2.5.0/ +md5 ac6677b6d1b95d209ab697ce8b688704 expat-2.5.0.tar.xz +sha1 5178e13c1e34f4643d5118d5758babfe0e836fe2 expat-2.5.0.tar.xz # Locally calculated -sha256 9875621085300591f1e64c18fd3da3a0eeca4a74f884b9abac2758ad1bd07a7d expat-2.4.7.tar.xz -sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec COPYING +sha256 ef2420f0232c087801abf705e89ae65f6257df6b7931d37846a193ef2e8cdcbe expat-2.5.0.tar.xz +sha256 122f2c27000472a201d337b9b31f7eb2b52d091b02857061a8880371612d9534 COPYING diff --git a/package/expat/expat.mk b/package/expat/expat.mk index b29b0e1d260..6f22024cc0f 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,19 +4,18 @@ # ################################################################################ -EXPAT_VERSION = 2.4.7 +EXPAT_VERSION = 2.5.0 EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz EXPAT_INSTALL_STAGING = YES -EXPAT_DEPENDENCIES = host-pkgconf -HOST_EXPAT_DEPENDENCIES = host-pkgconf EXPAT_LICENSE = MIT EXPAT_LICENSE_FILES = COPYING EXPAT_CPE_ID_VENDOR = libexpat_project EXPAT_CPE_ID_PRODUCT = libexpat -EXPAT_CONF_OPTS = --without-docbook -HOST_EXPAT_CONF_OPTS = --without-docbook +EXPAT_CONF_OPTS = \ + --without-docbook --without-examples --without-tests --without-xmlwf +HOST_EXPAT_CONF_OPTS = --without-docbook --without-examples --without-tests $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/package/expect/Config.in b/package/expect/Config.in index 5557f4aee65..67dfe643b2d 100644 --- a/package/expect/Config.in +++ b/package/expect/Config.in @@ -4,4 +4,4 @@ config BR2_PACKAGE_EXPECT Expect is a tool for automating interactive applications such as telnet, ftp, passwd, fsck, rlogin, ssh, tip, etc. - http://expect.sourceforge.net/ + https://core.tcl.tk/expect/ diff --git a/package/f2fs-tools/0001-configure-ac-fix-cross-compilation.patch b/package/f2fs-tools/0001-configure-ac-fix-cross-compilation.patch new file mode 100644 index 00000000000..0e3d4da1911 --- /dev/null +++ b/package/f2fs-tools/0001-configure-ac-fix-cross-compilation.patch @@ -0,0 +1,88 @@ +From 32e7d272344024c216f155c3463dd2d548f3fafd Mon Sep 17 00:00:00 2001 +From: Nick Hainke +Date: Mon, 4 Jul 2022 11:29:19 +0200 +Subject: configure.ac: fix cross compilation + +AC_CHECK_LIB seems to not work correctly with OpenWrt. Add possibility +to disable lz4 and lzo2 manually. + +Fixes errors in the form of: + Package f2fsck is missing dependencies for the following libraries: + liblz4.so.1 + liblzo2.so.2 + +Signed-off-by: Nick Hainke +Signed-off-by: Jaegeuk Kim +[Retrieved from: +https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/commit/?id=32e7d272344024c216f155c3463dd2d548f3fafd] +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 44 ++++++++++++++++++++++++++++++++++---------- + 1 file changed, 34 insertions(+), 10 deletions(-) + +diff --git a/configure.ac b/configure.ac +index ea39461..dbe9ad3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -50,6 +50,18 @@ AC_ARG_WITH([blkid], + [], + [with_blkid=check]) + ++AC_ARG_WITH([lzo2], ++ [AS_HELP_STRING([--without-lzo2], ++ [Ignore presence of liblzo2 and disable lzo2 support])], ++ [], ++ [with_lzo2=check]) ++ ++AC_ARG_WITH([lz4], ++ [AS_HELP_STRING([--without-lz4], ++ [Ignore presence of liblz4 and disable lz4 support])], ++ [], ++ [with_lz4=check]) ++ + # Checks for programs. + AC_PROG_CC + AM_PROG_AR +@@ -71,17 +83,29 @@ AS_IF([test "x$with_blkid" != xno], + fi + ], -lblkid)]) + +-AC_CHECK_LIB([lzo2], [main], +- [AC_SUBST([liblzo2_LIBS], ["-llzo2"]) +- AC_DEFINE([HAVE_LIBLZO2], [1], +- [Define if you have liblzo2]) +- ], [], []) ++AS_IF([test "x$with_lzo2" != xno], ++ [AC_CHECK_LIB([lzo2], [main], ++ [AC_SUBST([liblzo2_LIBS], ["-llzo2"]) ++ AC_DEFINE([HAVE_LIBLZO2], [1], ++ [Define if you have liblzo2]) ++ ], ++ [if test "x$with_lzo2" != xcheck; then ++ AC_MSG_FAILURE( ++ [--with-lzo2 was given, but test for lzo2 failed]) ++ fi ++ ], -llzo2)]) + +-AC_CHECK_LIB([lz4], [main], +- [AC_SUBST([liblz4_LIBS], ["-llz4"]) +- AC_DEFINE([HAVE_LIBLZ4], [1], +- [Define if you have liblz4]) +- ], [], []) ++AS_IF([test "x$with_lz4" != xno], ++ [AC_CHECK_LIB([lz4], [main], ++ [AC_SUBST([liblz4_LIBS], ["-llz4"]) ++ AC_DEFINE([HAVE_LIBLZ4], [1], ++ [Define if you have liblz4]) ++ ], ++ [if test "x$with_lz4" != xcheck; then ++ AC_MSG_FAILURE( ++ [--with-lz4 was given, but test for lz4 failed]) ++ fi ++ ], -llz4)]) + + AS_IF([test "x$with_selinux" != xno], + [AC_CHECK_LIB([selinux], [getcon], +-- +cgit + diff --git a/package/f2fs-tools/0002-f2fs-tools-fix-build-error-on-lz4-1-9-4.patch b/package/f2fs-tools/0002-f2fs-tools-fix-build-error-on-lz4-1-9-4.patch new file mode 100644 index 00000000000..b43def6bb7e --- /dev/null +++ b/package/f2fs-tools/0002-f2fs-tools-fix-build-error-on-lz4-1-9-4.patch @@ -0,0 +1,34 @@ +From 19f77c6f6277a274434d6d8883f50e7955c6a8db Mon Sep 17 00:00:00 2001 +From: Jaegeuk Kim +Date: Mon, 29 Aug 2022 11:03:35 -0700 +Subject: f2fs-tools: fix build error on lz4-1.9.4 + +LZ4_STREAMSIZE_U64 is undefined in new lz4 lib. + +Signed-off-by: Jaegeuk Kim +[Retrieved from: +https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/commit/?id=19f77c6f6277a274434d6d8883f50e7955c6a8db] +Signed-off-by: Fabrice Fontaine +--- + fsck/compress.c | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/fsck/compress.c b/fsck/compress.c +index b413492..b15f0a4 100644 +--- a/fsck/compress.c ++++ b/fsck/compress.c +@@ -32,10 +32,7 @@ + #ifdef HAVE_LIBLZ4 + #define LZ4_MEMORY_USAGE 14 + #define LZ4_MAX_INPUT_SIZE 0x7E000000 /* 2 113 929 216 bytes */ +-#ifndef LZ4_STREAMSIZE +-#define LZ4_STREAMSIZE (LZ4_STREAMSIZE_U64 * sizeof(long long)) +-#endif +-#define LZ4_MEM_COMPRESS LZ4_STREAMSIZE ++#define LZ4_MEM_COMPRESS sizeof(LZ4_stream_t) + #define LZ4_ACCELERATION_DEFAULT 1 + #define LZ4_WORK_SIZE ALIGN_UP(LZ4_MEM_COMPRESS, 8) + #endif +-- +cgit + diff --git a/package/f2fs-tools/f2fs-tools.hash b/package/f2fs-tools/f2fs-tools.hash index dedd884957d..8d5ff31f0d5 100644 --- a/package/f2fs-tools/f2fs-tools.hash +++ b/package/f2fs-tools/f2fs-tools.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 619263d4e2022152a1472c1d912eaae104f20bd227ce0bb9d41d1d6608094bd1 f2fs-tools-1.14.0.tar.gz -sha256 662abb3a8a80b36ae7036c289dd1e03b361ee5dd2e6fd5211d0d8d029146449f COPYING +sha256 147d471040b44900283ce2c935f1d35d13d7f40008e7cb8fab2b69f54da01a4f f2fs-tools-1.15.0.tar.gz +sha256 662abb3a8a80b36ae7036c289dd1e03b361ee5dd2e6fd5211d0d8d029146449f COPYING diff --git a/package/f2fs-tools/f2fs-tools.mk b/package/f2fs-tools/f2fs-tools.mk index ced283d25d2..f94244f2ad4 100644 --- a/package/f2fs-tools/f2fs-tools.mk +++ b/package/f2fs-tools/f2fs-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -F2FS_TOOLS_VERSION = 1.14.0 +F2FS_TOOLS_VERSION = 1.15.0 F2FS_TOOLS_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot F2FS_TOOLS_CONF_ENV = ac_cv_file__git=no F2FS_TOOLS_DEPENDENCIES = host-pkgconf util-linux @@ -14,6 +14,7 @@ F2FS_TOOLS_AUTORECONF = YES F2FS_TOOLS_INSTALL_STAGING = YES F2FS_TOOLS_LICENSE = GPL-2.0 F2FS_TOOLS_LICENSE_FILES = COPYING +F2FS_TOOLS_CPE_ID_VENDOR = f2fs-tools_project ifeq ($(BR2_PACKAGE_LIBSELINUX),y) F2FS_TOOLS_CONF_OPTS += --with-selinux @@ -22,6 +23,20 @@ else F2FS_TOOLS_CONF_OPTS += --without-selinux endif +ifeq ($(BR2_PACKAGE_LZ4),y) +F2FS_TOOLS_CONF_OPTS += --with-lz4 +F2FS_TOOLS_DEPENDENCIES += lz4 +else +F2FS_TOOLS_CONF_OPTS += --without-lz4 +endif + +ifeq ($(BR2_PACKAGE_LZO),y) +F2FS_TOOLS_CONF_OPTS += --with-lzo2 +F2FS_TOOLS_DEPENDENCIES += lzo +else +F2FS_TOOLS_CONF_OPTS += --without-lzo2 +endif + ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBBLKID),y) # util-linux is a dependency already, no need to list it again F2FS_TOOLS_CONF_OPTS += --with-blkid @@ -34,7 +49,9 @@ endif # blkid support even if we have host-util-linux HOST_F2FS_TOOLS_CONF_OPTS = \ --without-selinux \ - --without-blkid + --without-blkid \ + --without-lz4 \ + --without-lzo2 $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/package/faad2/faad2.hash b/package/faad2/faad2.hash index 2eb11d73aab..3a9c36df006 100644 --- a/package/faad2/faad2.hash +++ b/package/faad2/faad2.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 0c6d9636c96f95c7d736f097d418829ced8ec6dbd899cc6cc82b728480a84bfb faad2-2.10.0.tar.gz +sha256 4c16c71295ca0cbf7c3dfe98eb11d8fa8d0ac3042e41604cfd6cc11a408cf264 faad2-2.10.1.tar.gz sha256 d3baf3a54943cf12a994c85867a18dec84f810901b2f2878ddfd77efcc3c150f COPYING diff --git a/package/faad2/faad2.mk b/package/faad2/faad2.mk index d085c814bda..eecab35af87 100644 --- a/package/faad2/faad2.mk +++ b/package/faad2/faad2.mk @@ -4,8 +4,8 @@ # ################################################################################ -FAAD2_VERSION = 2.10.0 -FAAD2_SITE = $(call github,knik0,faad2,$(subst .,_,$(FAAD2_VERSION))) +FAAD2_VERSION = 2.10.1 +FAAD2_SITE = $(call github,knik0,faad2,$(FAAD2_VERSION)) FAAD2_LICENSE = GPL-2.0 FAAD2_LICENSE_FILES = COPYING FAAD2_CPE_ID_VENDOR = audiocoding diff --git a/package/fail2ban/0001-fixed-possible-RCE-vulnerability-unset-escape-variable.patch b/package/fail2ban/0001-fixed-possible-RCE-vulnerability-unset-escape-variable.patch deleted file mode 100644 index 6d44f41d857..00000000000 --- a/package/fail2ban/0001-fixed-possible-RCE-vulnerability-unset-escape-variable.patch +++ /dev/null @@ -1,158 +0,0 @@ -From 410a6ce5c80dd981c22752da034f2529b5eee844 Mon Sep 17 00:00:00 2001 -From: sebres -Date: Mon, 21 Jun 2021 17:12:53 +0200 -Subject: [PATCH] fixed possible RCE vulnerability, unset escape variable - (default tilde) stops consider "~" char after new-line as composing escape - sequence - -[Retrieved from: -https://github.com/fail2ban/fail2ban/commit/410a6ce5c80dd981c22752da034f2529b5eee844] -Signed-off-by: Fabrice Fontaine ---- - config/action.d/complain.conf | 2 +- - config/action.d/dshield.conf | 2 +- - config/action.d/mail-buffered.conf | 8 ++++---- - config/action.d/mail-whois-lines.conf | 2 +- - config/action.d/mail-whois.conf | 6 +++--- - config/action.d/mail.conf | 6 +++--- - 6 files changed, 13 insertions(+), 13 deletions(-) - -diff --git a/config/action.d/complain.conf b/config/action.d/complain.conf -index 3a5f882c9f..4d73b05859 100644 ---- a/config/action.d/complain.conf -+++ b/config/action.d/complain.conf -@@ -102,7 +102,7 @@ logpath = /dev/null - # Notes.: Your system mail command. Is passed 2 args: subject and recipient - # Values: CMD - # --mailcmd = mail -s -+mailcmd = mail -E 'set escape' -s - - # Option: mailargs - # Notes.: Additional arguments to mail command. e.g. for standard Unix mail: -diff --git a/config/action.d/dshield.conf b/config/action.d/dshield.conf -index c128bef348..3d5a7a53a9 100644 ---- a/config/action.d/dshield.conf -+++ b/config/action.d/dshield.conf -@@ -179,7 +179,7 @@ tcpflags = - # Notes.: Your system mail command. Is passed 2 args: subject and recipient - # Values: CMD - # --mailcmd = mail -s -+mailcmd = mail -E 'set escape' -s - - # Option: mailargs - # Notes.: Additional arguments to mail command. e.g. for standard Unix mail: -diff --git a/config/action.d/mail-buffered.conf b/config/action.d/mail-buffered.conf -index 325f185b2f..79b841049c 100644 ---- a/config/action.d/mail-buffered.conf -+++ b/config/action.d/mail-buffered.conf -@@ -17,7 +17,7 @@ actionstart = printf %%b "Hi,\n - The jail has been started successfully.\n - Output will be buffered until lines are available.\n - Regards,\n -- Fail2Ban"|mail -s "[Fail2Ban] : started on " -+ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] : started on " - - # Option: actionstop - # Notes.: command executed at the stop of jail (or at the end of Fail2Ban) -@@ -28,13 +28,13 @@ actionstop = if [ -f ]; then - These hosts have been banned by Fail2Ban.\n - `cat ` - Regards,\n -- Fail2Ban"|mail -s "[Fail2Ban] : Summary from " -+ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] : Summary from " - rm - fi - printf %%b "Hi,\n - The jail has been stopped.\n - Regards,\n -- Fail2Ban"|mail -s "[Fail2Ban] : stopped on " -+ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] : stopped on " - - # Option: actioncheck - # Notes.: command executed once before each actionban command -@@ -55,7 +55,7 @@ actionban = printf %%b "`date`: ( failures)\n" >> - These hosts have been banned by Fail2Ban.\n - `cat ` - \nRegards,\n -- Fail2Ban"|mail -s "[Fail2Ban] : Summary" -+ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] : Summary" - rm - fi - -diff --git a/config/action.d/mail-whois-lines.conf b/config/action.d/mail-whois-lines.conf -index 3a3e56b2c7..d2818cb9b9 100644 ---- a/config/action.d/mail-whois-lines.conf -+++ b/config/action.d/mail-whois-lines.conf -@@ -72,7 +72,7 @@ actionunban = - # Notes.: Your system mail command. Is passed 2 args: subject and recipient - # Values: CMD - # --mailcmd = mail -s -+mailcmd = mail -E 'set escape' -s - - # Default name of the chain - # -diff --git a/config/action.d/mail-whois.conf b/config/action.d/mail-whois.conf -index 7fea34c40d..ab33b616dc 100644 ---- a/config/action.d/mail-whois.conf -+++ b/config/action.d/mail-whois.conf -@@ -20,7 +20,7 @@ norestored = 1 - actionstart = printf %%b "Hi,\n - The jail has been started successfully.\n - Regards,\n -- Fail2Ban"|mail -s "[Fail2Ban] : started on " -+ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] : started on " - - # Option: actionstop - # Notes.: command executed at the stop of jail (or at the end of Fail2Ban) -@@ -29,7 +29,7 @@ actionstart = printf %%b "Hi,\n - actionstop = printf %%b "Hi,\n - The jail has been stopped.\n - Regards,\n -- Fail2Ban"|mail -s "[Fail2Ban] : stopped on " -+ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] : stopped on " - - # Option: actioncheck - # Notes.: command executed once before each actionban command -@@ -49,7 +49,7 @@ actionban = printf %%b "Hi,\n - Here is more information about :\n - `%(_whois_command)s`\n - Regards,\n -- Fail2Ban"|mail -s "[Fail2Ban] : banned from " -+ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] : banned from " - - # Option: actionunban - # Notes.: command executed when unbanning an IP. Take care that the -diff --git a/config/action.d/mail.conf b/config/action.d/mail.conf -index 5d8c0e154c..f4838ddcb6 100644 ---- a/config/action.d/mail.conf -+++ b/config/action.d/mail.conf -@@ -16,7 +16,7 @@ norestored = 1 - actionstart = printf %%b "Hi,\n - The jail has been started successfully.\n - Regards,\n -- Fail2Ban"|mail -s "[Fail2Ban] : started on " -+ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] : started on " - - # Option: actionstop - # Notes.: command executed at the stop of jail (or at the end of Fail2Ban) -@@ -25,7 +25,7 @@ actionstart = printf %%b "Hi,\n - actionstop = printf %%b "Hi,\n - The jail has been stopped.\n - Regards,\n -- Fail2Ban"|mail -s "[Fail2Ban] : stopped on " -+ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] : stopped on " - - # Option: actioncheck - # Notes.: command executed once before each actionban command -@@ -43,7 +43,7 @@ actionban = printf %%b "Hi,\n - The IP has just been banned by Fail2Ban after - attempts against .\n - Regards,\n -- Fail2Ban"|mail -s "[Fail2Ban] : banned from " -+ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] : banned from " - - # Option: actionunban - # Notes.: command executed when unbanning an IP. Take care that the diff --git a/package/fail2ban/0002-fix-gh-3098-build-fails-with-error-in-fail2ban-setup-command.patch b/package/fail2ban/0002-fix-gh-3098-build-fails-with-error-in-fail2ban-setup-command.patch deleted file mode 100644 index 8cb097dc389..00000000000 --- a/package/fail2ban/0002-fix-gh-3098-build-fails-with-error-in-fail2ban-setup-command.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 5ac303df8a171f748330d4c645ccbf1c2c7f3497 Mon Sep 17 00:00:00 2001 -From: sebres -Date: Sun, 19 Sep 2021 18:49:18 +0200 -Subject: [PATCH] fix gh-3098: build fails with error in fail2ban setup - command: use_2to3 is invalid (setuptools 58+) - -[Retrieved from: -https://github.com/fail2ban/fail2ban/commit/5ac303df8a171f748330d4c645ccbf1c2c7f3497] -Signed-off-by: Fabrice Fontaine ---- - setup.py | 16 +--------------- - 1 file changed, 1 insertion(+), 15 deletions(-) - -diff --git a/setup.py b/setup.py -index f4c2550f6..98413273c 100755 ---- a/setup.py -+++ b/setup.py -@@ -48,7 +48,7 @@ - from glob import glob - - from fail2ban.setup import updatePyExec -- -+from fail2ban.version import version - - source_dir = os.path.realpath(os.path.dirname( - # __file__ seems to be overwritten sometimes on some python versions (e.g. bug of 2.6 by running under cProfile, etc.): -@@ -112,22 +112,12 @@ def update_scripts(self, dry_run=False): - # Wrapper to specify fail2ban own options: - class install_command_f2b(install): - user_options = install.user_options + [ -- ('disable-2to3', None, 'Specify to deactivate 2to3, e.g. if the install runs from fail2ban test-cases.'), - ('without-tests', None, 'without tests files installation'), - ] - def initialize_options(self): -- self.disable_2to3 = None - self.without_tests = not with_tests - install.initialize_options(self) - def finalize_options(self): -- global _2to3 -- ## in the test cases 2to3 should be already done (fail2ban-2to3): -- if self.disable_2to3: -- _2to3 = False -- if _2to3: -- cmdclass = self.distribution.cmdclass -- cmdclass['build_py'] = build_py_2to3 -- cmdclass['build_scripts'] = build_scripts_2to3 - if self.without_tests: - self.distribution.scripts.remove('bin/fail2ban-testcases') - -@@ -178,7 +168,6 @@ def run(self): - if setuptools: - setup_extra = { - 'test_suite': "fail2ban.tests.utils.gatherTests", -- 'use_2to3': True, - } - else: - setup_extra = {} -@@ -202,9 +191,6 @@ def run(self): - ('/usr/share/doc/fail2ban', doc_files) - ) - --# Get version number, avoiding importing fail2ban. --# This is due to tests not functioning for python3 as 2to3 takes place later --exec(open(join("fail2ban", "version.py")).read()) - - setup( - name = "fail2ban", diff --git a/package/fail2ban/fail2ban.hash b/package/fail2ban/fail2ban.hash index 072f0ef9616..b40922e70a6 100644 --- a/package/fail2ban/fail2ban.hash +++ b/package/fail2ban/fail2ban.hash @@ -1,3 +1,3 @@ # sha256 locally computed -sha256 383108e5f8644cefb288537950923b7520f642e7e114efb843f6e7ea9268b1e0 fail2ban-0.11.2.tar.gz +sha256 ae8b0b41f27a7be12d40488789d6c258029b23a01168e3c0d347ee80b325ac23 fail2ban-1.0.2.tar.gz sha256 a75fec0260742fe6275d63ff6a5d97b924b28766558306b3fa4069763096929b COPYING diff --git a/package/fail2ban/fail2ban.mk b/package/fail2ban/fail2ban.mk index 4a08981a971..34f2341d330 100644 --- a/package/fail2ban/fail2ban.mk +++ b/package/fail2ban/fail2ban.mk @@ -4,7 +4,7 @@ # ################################################################################ -FAIL2BAN_VERSION = 0.11.2 +FAIL2BAN_VERSION = 1.0.2 FAIL2BAN_SITE = $(call github,fail2ban,fail2ban,$(FAIL2BAN_VERSION)) FAIL2BAN_LICENSE = GPL-2.0+ FAIL2BAN_LICENSE_FILES = COPYING @@ -12,9 +12,6 @@ FAIL2BAN_CPE_ID_VENDOR = fail2ban FAIL2BAN_SELINUX_MODULES = fail2ban FAIL2BAN_SETUP_TYPE = distutils -# 0001-fixed-possible-RCE-vulnerability-unset-escape-variable.patch -FAIL2BAN_IGNORE_CVES += CVE-2021-32749 - define FAIL2BAN_PYTHON_2TO3 $(HOST_DIR)/bin/2to3 --write --nobackups --no-diffs $(@D)/bin/* $(@D)/fail2ban endef diff --git a/package/fakeroot/fakeroot.hash b/package/fakeroot/fakeroot.hash index 3d53eeb0970..5c50c83e13e 100644 --- a/package/fakeroot/fakeroot.hash +++ b/package/fakeroot/fakeroot.hash @@ -1,4 +1,4 @@ -# From http://deb.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.26-1.dsc -sha256 480a578ffdc5592e73df4c086950d321b4adc78dbdaec56c82e4fe1fb68de8e9 fakeroot_1.26.orig.tar.gz +# From https://deb.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.30.1-1.dsc +sha256 32ebb1f421aca0db7141c32a8c104eb95d2b45c393058b9435fbf903dd2b6a75 fakeroot_1.30.1.orig.tar.gz # License files, locally calculated sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING diff --git a/package/fakeroot/fakeroot.mk b/package/fakeroot/fakeroot.mk index 3fadf1c0f08..20c75d69660 100644 --- a/package/fakeroot/fakeroot.mk +++ b/package/fakeroot/fakeroot.mk @@ -4,9 +4,9 @@ # ################################################################################ -FAKEROOT_VERSION = 1.26 +FAKEROOT_VERSION = 1.30.1 FAKEROOT_SOURCE = fakeroot_$(FAKEROOT_VERSION).orig.tar.gz -FAKEROOT_SITE = https://snapshot.debian.org/archive/debian/20210907T092512Z/pool/main/f/fakeroot +FAKEROOT_SITE = https://snapshot.debian.org/archive/debian/20221120T030258Z/pool/main/f/fakeroot HOST_FAKEROOT_DEPENDENCIES = host-acl # Force capabilities detection off @@ -18,9 +18,4 @@ HOST_FAKEROOT_CONF_ENV = \ FAKEROOT_LICENSE = GPL-3.0+ FAKEROOT_LICENSE_FILES = COPYING -define HOST_FAKEROOT_BUILD_AUX - mkdir -p $(@D)/build-aux -endef -HOST_FAKEROOT_POST_PATCH_HOOKS += HOST_FAKEROOT_BUILD_AUX - $(eval $(host-autotools-package)) diff --git a/package/faketime/faketime.hash b/package/faketime/faketime.hash index 0628ff9ae65..a7d8d62dba0 100644 --- a/package/faketime/faketime.hash +++ b/package/faketime/faketime.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 57d0181150361c0a9b5c8eef05b11392f6134ada2c2d998e92e63daed639647c faketime-0.9.9.tar.gz +sha256 729ad33b9c750a50d9c68e97b90499680a74afd1568d859c574c0fe56fe7947f faketime-0.9.10.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/faketime/faketime.mk b/package/faketime/faketime.mk index 355477ba3b9..6fc684f8529 100644 --- a/package/faketime/faketime.mk +++ b/package/faketime/faketime.mk @@ -4,7 +4,7 @@ # ################################################################################ -FAKETIME_VERSION = 0.9.9 +FAKETIME_VERSION = 0.9.10 FAKETIME_SITE = $(call github,wolfcw,libfaketime,v$(FAKETIME_VERSION)) FAKETIME_LICENSE = GPL-2.0 FAKETIME_LICENSE_FILES = COPYING diff --git a/package/falcosecurity-libs/0001-cmake-Permit-setting-GRPC_CPP_PLUGIN.patch b/package/falcosecurity-libs/0001-cmake-Permit-setting-GRPC_CPP_PLUGIN.patch new file mode 100644 index 00000000000..6141d8ef72f --- /dev/null +++ b/package/falcosecurity-libs/0001-cmake-Permit-setting-GRPC_CPP_PLUGIN.patch @@ -0,0 +1,34 @@ +From 2e8a50cd4975df3ab60ee07c9675831cd5ad397f Mon Sep 17 00:00:00 2001 +From: Francis Laniel +Date: Tue, 12 Apr 2022 19:54:11 +0100 +Subject: [PATCH] cmake: Permit setting GRPC_CPP_PLUGIN. + +This patch enables users to set GRPC_CPP_PLUGIN while calling cmake with: +cmake -DGRPC_CPP_PLUGIN=/path + +Signed-off-by: Francis Laniel +--- + cmake/modules/grpc.cmake | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/cmake/modules/grpc.cmake b/cmake/modules/grpc.cmake +index e5fd16b8..9d8f5934 100644 +--- a/cmake/modules/grpc.cmake ++++ b/cmake/modules/grpc.cmake +@@ -12,9 +12,11 @@ elseif(NOT USE_BUNDLED_GRPC) + set(GRPCPP_LIB gRPC::grpc++) + + # gRPC C++ plugin +- get_target_property(GRPC_CPP_PLUGIN gRPC::grpc_cpp_plugin LOCATION) + if(NOT GRPC_CPP_PLUGIN) +- message(FATAL_ERROR "System grpc_cpp_plugin not found") ++ get_target_property(GRPC_CPP_PLUGIN gRPC::grpc_cpp_plugin LOCATION) ++ if(NOT GRPC_CPP_PLUGIN) ++ message(FATAL_ERROR "System grpc_cpp_plugin not found") ++ endif() + endif() + + # gRPC include dir + properly handle grpc{++,pp} +-- +2.25.1 + diff --git a/package/falcosecurity-libs/Config.in b/package/falcosecurity-libs/Config.in new file mode 100644 index 00000000000..f101883384c --- /dev/null +++ b/package/falcosecurity-libs/Config.in @@ -0,0 +1,32 @@ +config BR2_PACKAGE_FALCOSECURITY_LIBS + bool + depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS # grpc + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf + depends on BR2_LINUX_KERNEL + depends on BR2_INSTALL_LIBSTDCPP # jsoncpp, protobuf, tbb + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # grpc, gtest + depends on BR2_TOOLCHAIN_HAS_THREADS # jq, protobuf, tbb + depends on !BR2_STATIC_LIBS # protobuf, tbb + depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC # grpc + depends on BR2_TOOLCHAIN_USES_GLIBC # tbb + depends on BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1 + select BR2_PACKAGE_C_ARES + select BR2_PACKAGE_ELFUTILS + select BR2_PACKAGE_GRPC + select BR2_PACKAGE_GTEST + select BR2_PACKAGE_HOST_GRPC + select BR2_PACKAGE_HOST_PROTOBUF + select BR2_PACKAGE_JQ + select BR2_PACKAGE_JSONCPP + select BR2_PACKAGE_LIBB64 + select BR2_PACKAGE_LIBCURL + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_PROTOBUF + select BR2_PACKAGE_TBB + select BR2_PACKAGE_VALIJSON + select BR2_PACKAGE_ZLIB + help + falcosecurity/libs provides libsinsp, libscap, the kernel + module driver and the eBPF driver sources. + + https://github.com/falcosecurity/libs diff --git a/package/falcosecurity-libs/falcosecurity-libs.hash b/package/falcosecurity-libs/falcosecurity-libs.hash new file mode 100644 index 00000000000..2e239ca2fef --- /dev/null +++ b/package/falcosecurity-libs/falcosecurity-libs.hash @@ -0,0 +1,5 @@ +# sha256 locally computed +sha256 80903bc57b7f9c5f24298ecf1531cf66ef571681b4bd1e05f6e4db704ffb380b falcosecurity-libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a.tar.gz +sha256 21ec9433a87459b3477faf542bacec419dc03af841309eac35edeffe481cf10b COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 driver/GPL2.txt +sha256 f17d3f2c2d565a74a7d5bf96f880c43701e141897e8dff0c8aa13e5d07aaf226 driver/MIT.txt diff --git a/package/falcosecurity-libs/falcosecurity-libs.mk b/package/falcosecurity-libs/falcosecurity-libs.mk new file mode 100644 index 00000000000..92d5c618326 --- /dev/null +++ b/package/falcosecurity-libs/falcosecurity-libs.mk @@ -0,0 +1,83 @@ +################################################################################ +# +# falcosecurity-libs +# +################################################################################ + +FALCOSECURITY_LIBS_VERSION = e5c53d648f3c4694385bbe488e7d47eaa36c229a +FALCOSECURITY_LIBS_SITE = $(call github,falcosecurity,libs,$(FALCOSECURITY_LIBS_VERSION)) +FALCOSECURITY_LIBS_LICENSE = Apache-2.0 (userspace), MIT or GPL-2.0 (driver) +FALCOSECURITY_LIBS_LICENSE_FILES = COPYING driver/MIT.txt driver/GPL2.txt +FALCOSECURITY_LIBS_CPE_ID_VENDOR = falco + +FALCOSECURITY_LIBS_DEPENDENCIES = \ + c-ares \ + elfutils \ + grpc \ + gtest \ + host-grpc \ + host-protobuf \ + jq \ + jsoncpp \ + libb64 \ + libcurl \ + luainterpreter \ + openssl \ + protobuf \ + tbb \ + valijson \ + zlib + +FALCOSECURITY_LIBS_DRIVER_NAME = scap +FALCOSECURITY_LIBS_MODULE_SUBDIRS = driver +FALCOSECURITY_LIBS_MODULE_MAKE_OPTS = KERNELDIR=$(LINUX_DIR) + +# falcosecurity-libs module needs these two kernel options to be set: +# CONFIG_TRACEPOINTS +# CONFIG_HAVE_SYSCALL_TRACEPOINTS +# https://github.com/draios/sysdig/wiki/How-to-Install-Sysdig-from-the-Source-Code#linux-and-osx +# CONFIG_FTRACE and CONFIG_SCHED_TRACER selects CONFIG_GENERIC_TRACER which in +# turns select CONFIG_TRACING which in turns select CONFIG_TRACEPOINTS +define FALCOSECURITY_LIBS_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_FTRACE) + $(call KCONFIG_ENABLE_OPT,CONFIG_SCHED_TRACER) + $(call KCONFIG_ENABLE_OPT,CONFIG_HAVE_SYSCALL_TRACEPOINTS) +endef + +# falcosecurity-libs creates the module Makefile from a template, which contains +# a single place-holder, KBUILD_FLAGS, wich is only replaced with debug flags, +# which we don't care about here. +# So, just replace the place-holder with the only meaningful value: nothing. +# For the DRIVER_NAME, we set it to FALCOSECURITY_LIBS_DRIVER_NAME. +# So, when sysdig will be run, it will automatically load +# FALCOSECURITY_LIBS_DRIVER_NAME.ko. +# We also need to do the same process for driver_config.h.in. +# PPM_API_CURRENT_VERSION_* were take from driver/API_VERSION and +# PPM_SCHEMA_CURRENT_VERSION_* from driver/SCHEMA_VERSION. +# For the others, it was taken by inspecting +# falcosecurity-libs/*/CMakeLists.txt, which normally creates these +# files, but doesn't work well with the kernel-module infrastructure. +define FALCOSECURITY_LIBS_MODULE_GEN_MAKEFILE + $(INSTALL) -m 0644 $(@D)/driver/Makefile.in $(@D)/driver/Makefile + $(SED) 's/@KBUILD_FLAGS@//;' $(@D)/driver/Makefile + $(SED) 's/@DRIVER_NAME@/$(FALCOSECURITY_LIBS_DRIVER_NAME)/;' $(@D)/driver/Makefile + + $(INSTALL) -m 0644 $(@D)/driver/driver_config.h.in $(@D)/driver/driver_config.h + $(SED) 's/\$${PPM_API_CURRENT_VERSION_MAJOR}/1/;' $(@D)/driver/driver_config.h + $(SED) 's/\$${PPM_API_CURRENT_VERSION_MINOR}/0/;' $(@D)/driver/driver_config.h + $(SED) 's/\$${PPM_API_CURRENT_VERSION_PATCH}/0/;' $(@D)/driver/driver_config.h + $(SED) 's/\$${PPM_SCHEMA_CURRENT_VERSION_MAJOR}/1/;' $(@D)/driver/driver_config.h + $(SED) 's/\$${PPM_SCHEMA_CURRENT_VERSION_MINOR}/0/;' $(@D)/driver/driver_config.h + $(SED) 's/\$${PPM_SCHEMA_CURRENT_VERSION_PATCH}/0/;' $(@D)/driver/driver_config.h + $(SED) 's/\$${DRIVER_VERSION}//;' $(@D)/driver/driver_config.h + $(SED) 's/\$${DRIVER_NAME}/$(FALCOSECURITY_LIBS_DRIVER_NAME)/;' $(@D)/driver/driver_config.h + $(SED) 's/\$${DRIVER_DEVICE_NAME}/$(FALCOSECURITY_LIBS_DRIVER_NAME)/;' $(@D)/driver/driver_config.h + $(SED) 's/\$${GIT_COMMIT}/0.1.1dev/;' $(@D)/driver/driver_config.h +endef +FALCOSECURITY_LIBS_POST_PATCH_HOOKS += FALCOSECURITY_LIBS_MODULE_GEN_MAKEFILE + +# Userspace components are not built and installed, because it this +# package is intended to be included as source in another build. + +$(eval $(kernel-module)) +$(eval $(generic-package)) diff --git a/package/fan-ctrl/fan-ctrl.hash b/package/fan-ctrl/fan-ctrl.hash index 0bd5d60977c..4f26696785a 100644 --- a/package/fan-ctrl/fan-ctrl.hash +++ b/package/fan-ctrl/fan-ctrl.hash @@ -1,2 +1,2 @@ # Locally computed -sha1 d8ba5bac15e90c36a4e908ca1c98fac83bf702ea fan-ctrl.c?revision=1.3 +sha1 d8ba5bac15e90c36a4e908ca1c98fac83bf702ea fan-ctrl.c?revision=1.3 diff --git a/package/fastd/fastd.mk b/package/fastd/fastd.mk index 5cd6a909c38..6c496cf9ef1 100644 --- a/package/fastd/fastd.mk +++ b/package/fastd/fastd.mk @@ -46,7 +46,7 @@ else FASTD_CONF_OPTS += -Dsystemd=disabled endif -ifeq ($(BR2_GCC_ENABLE_LTO),y) +ifeq ($(BR2_ENABLE_LTO),y) FASTD_CONF_OPTS += -Db_lto=true else FASTD_CONF_OPTS += -Db_lto=false diff --git a/package/fbdump/fbdump.hash b/package/fbdump/fbdump.hash index 8bc8b7c564d..51506b83a91 100644 --- a/package/fbdump/fbdump.hash +++ b/package/fbdump/fbdump.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c4d521a86229b3106cf69786008ad94f899da5288a19a067deae84951880722d fbdump-0.4.2.tar.gz -sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING +sha256 c4d521a86229b3106cf69786008ad94f899da5288a19a067deae84951880722d fbdump-0.4.2.tar.gz +sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/package/fbterm/fbterm.hash b/package/fbterm/fbterm.hash index 37c32df7a4f..ee703614285 100644 --- a/package/fbterm/fbterm.hash +++ b/package/fbterm/fbterm.hash @@ -1,4 +1,4 @@ # From http://code.google.com/p/fbterm/downloads/detail?name=fbterm-1.7.0.tar.gz&can=2&q= -sha1 dc7b7ff29212c1551f35bf7a50967454d3b8c67c fbterm-1.7.0.tar.gz +sha1 dc7b7ff29212c1551f35bf7a50967454d3b8c67c fbterm-1.7.0.tar.gz # locally computed sha256 b2b961f07e97c4fb78074276da304ea36b85dc299aae5efb79080cedaea3d5ac COPYING diff --git a/package/fbv/0002-cross.patch b/package/fbv/0001-cross.patch similarity index 100% rename from package/fbv/0002-cross.patch rename to package/fbv/0001-cross.patch diff --git a/package/fbv/0003-fix-24bpp-support-on-big-endian.patch b/package/fbv/0002-fix-24bpp-support-on-big-endian.patch similarity index 100% rename from package/fbv/0003-fix-24bpp-support-on-big-endian.patch rename to package/fbv/0002-fix-24bpp-support-on-big-endian.patch diff --git a/package/fbv/0004-fix-bgr555.patch b/package/fbv/0003-fix-bgr555.patch similarity index 100% rename from package/fbv/0004-fix-bgr555.patch rename to package/fbv/0003-fix-bgr555.patch diff --git a/package/fbv/0005-giflib.patch b/package/fbv/0004-giflib.patch similarity index 100% rename from package/fbv/0005-giflib.patch rename to package/fbv/0004-giflib.patch diff --git a/package/fbv/0006-include.patch b/package/fbv/0005-include.patch similarity index 100% rename from package/fbv/0006-include.patch rename to package/fbv/0005-include.patch diff --git a/package/fbv/0007-libpng15.patch b/package/fbv/0006-libpng15.patch similarity index 100% rename from package/fbv/0007-libpng15.patch rename to package/fbv/0006-libpng15.patch diff --git a/package/fbv/0007-gif.c-fic-build-with-gcc-10.patch b/package/fbv/0007-gif.c-fic-build-with-gcc-10.patch new file mode 100644 index 00000000000..57d5777b61b --- /dev/null +++ b/package/fbv/0007-gif.c-fic-build-with-gcc-10.patch @@ -0,0 +1,36 @@ +From 8877207b290da1c3bc100f2705c30e6bdafcd985 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 26 May 2022 23:59:46 +0200 +Subject: [PATCH] gif.c: fic build with gcc >= 10 + +Fix the following build failure with gcc >= 10:: + +/nvmedata/autobuild/instance-30/output-1/per-package/fbv/host/bin/../lib/gcc/powerpc-buildroot-linux-uclibc/11.3.0/../../../../powerpc-buildroot-linux-uclibc/bin/ld: gif.o: in function `fh_gif_load': +gif.c:(.text+0x338): undefined reference to `m_rend_gif_decodecolormap' + +Fixes: + - http://autobuild.buildroot.org/results/dca603a61b1fd0558992b4a40152d23b5b9c0049 + +Signed-off-by: Fabrice Fontaine +[Upstream status: not upstreamable (most active fork dropped gif +support: https://github.com/godspeed1989/fbv/pull/17)] +--- + gif.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gif.c b/gif.c +index 689e549..5560f25 100644 +--- a/gif.c ++++ b/gif.c +@@ -48,7 +48,7 @@ int fh_gif_id(char *name) + return(0); + } + +-inline void m_rend_gif_decodecolormap(unsigned char *cmb,unsigned char *rgbb,ColorMapObject *cm,int s,int l, int transparency) ++static inline void m_rend_gif_decodecolormap(unsigned char *cmb,unsigned char *rgbb,ColorMapObject *cm,int s,int l, int transparency) + { + GifColorType *cmentry; + int i; +-- +2.35.1 + diff --git a/package/feh/feh.hash b/package/feh/feh.hash index 07c0dd9403a..f74b8fa335a 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 57ab1ca61f57c96595878069f550d36f518530f88fa31b74cc39cd739f9258b6 feh-3.7.1.tar.bz2 +sha256 2c3a31327dc3cc3331aa6e759d378e4f66d0ece7174a0d5aa137f3cba4bf0509 COPYING diff --git a/package/fetchmail/Config.in b/package/fetchmail/Config.in index a4bf5a7c203..1017df34b20 100644 --- a/package/fetchmail/Config.in +++ b/package/fetchmail/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_FETCHMAIL depends on BR2_USE_MMU # fork() select BR2_PACKAGE_CA_CERTIFICATES select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL help Fetchmail - the mail-retrieval daemon Client daemon to move mail from POP and IMAP to your local diff --git a/package/fetchmail/fetchmail.hash b/package/fetchmail/fetchmail.hash index 3d4c3da3dc0..bb03dcf94a0 100644 --- a/package/fetchmail/fetchmail.hash +++ b/package/fetchmail/fetchmail.hash @@ -1,4 +1,4 @@ -# From https://sourceforge.net/p/fetchmail/mailman/message/37388106/ -sha256 9c961df25cd922f539218b0b56a77e7a47778e49ed907edaa5b4941ad3b253cf fetchmail-6.4.24.tar.xz +# From https://sourceforge.net/p/fetchmail/mailman/message/37756758/ +sha256 7b0b56cbc0fca854504f167795fab532d5a54d5a7d3b6e3e36a33f34a0960a01 fetchmail-6.4.35.tar.xz # Locally computed: -sha256 001d1b8d111a83e3bab8b4d511ea4767d37d3bd0583560fccece630df1ba8f3c COPYING +sha256 6d87443b61041067a5eddb2cabf8aebff15b8b40771ad6b5e4754e607ec21b39 COPYING diff --git a/package/fetchmail/fetchmail.mk b/package/fetchmail/fetchmail.mk index 7d6be719541..d6053508a51 100644 --- a/package/fetchmail/fetchmail.mk +++ b/package/fetchmail/fetchmail.mk @@ -5,9 +5,9 @@ ################################################################################ FETCHMAIL_VERSION_MAJOR = 6.4 -FETCHMAIL_VERSION = $(FETCHMAIL_VERSION_MAJOR).24 +FETCHMAIL_VERSION = $(FETCHMAIL_VERSION_MAJOR).35 FETCHMAIL_SOURCE = fetchmail-$(FETCHMAIL_VERSION).tar.xz -FETCHMAIL_SITE = http://downloads.sourceforge.net/project/fetchmail/branch_$(FETCHMAIL_VERSION_MAJOR) +FETCHMAIL_SITE = https://downloads.sourceforge.net/project/fetchmail/branch_$(FETCHMAIL_VERSION_MAJOR) FETCHMAIL_LICENSE = GPL-2.0; some exceptions are mentioned in COPYING FETCHMAIL_LICENSE_FILES = COPYING FETCHMAIL_CPE_ID_VENDOR = fetchmail diff --git a/package/ffmpeg/0001-swscale-x86-yuv2rgb-Fix-build-without-SSSE3.patch b/package/ffmpeg/0001-swscale-x86-yuv2rgb-Fix-build-without-SSSE3.patch index 951ce4186d6..9c1baaa651d 100644 --- a/package/ffmpeg/0001-swscale-x86-yuv2rgb-Fix-build-without-SSSE3.patch +++ b/package/ffmpeg/0001-swscale-x86-yuv2rgb-Fix-build-without-SSSE3.patch @@ -22,7 +22,7 @@ diff --git a/libswscale/x86/yuv2rgb.c b/libswscale/x86/yuv2rgb.c index c12e88cbb5..4791e5b93a 100644 --- a/libswscale/x86/yuv2rgb.c +++ b/libswscale/x86/yuv2rgb.c -@@ -83,6 +83,7 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c) +@@ -71,6 +71,7 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c) #if HAVE_X86ASM int cpu_flags = av_get_cpu_flags(); @@ -30,7 +30,7 @@ index c12e88cbb5..4791e5b93a 100644 if (EXTERNAL_SSSE3(cpu_flags)) { switch (c->dstFormat) { case AV_PIX_FMT_RGB32: -@@ -111,6 +112,7 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c) +@@ -99,6 +100,7 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c) return yuv420_rgb15_ssse3; } } diff --git a/package/ffmpeg/0003-libavutil-Fix-mips-build.patch b/package/ffmpeg/0003-libavutil-Fix-mips-build.patch index 8b81e66981b..8dd689f5d0d 100644 --- a/package/ffmpeg/0003-libavutil-Fix-mips-build.patch +++ b/package/ffmpeg/0003-libavutil-Fix-mips-build.patch @@ -20,7 +20,7 @@ diff --git a/configure b/configure index 6bfd98b384..773a7d516c 100755 --- a/configure +++ b/configure -@@ -2161,6 +2161,7 @@ HEADERS_LIST=" +@@ -2135,6 +2135,7 @@ HEADERS_LIST=" opencv2_core_core_c_h OpenGL_gl3_h poll_h @@ -28,7 +28,7 @@ index 6bfd98b384..773a7d516c 100755 sys_param_h sys_resource_h sys_select_h -@@ -6218,6 +6219,7 @@ check_func_headers VideoToolbox/VTCompressionSession.h VTCompressionSessionPrepa +@@ -6182,6 +6183,7 @@ check_func_headers VideoToolbox/VTCompressionSession.h VTCompressionSessionPrepa check_headers windows.h check_headers X11/extensions/XvMClib.h check_headers asm/types.h diff --git a/package/ffmpeg/0004-configure-add-extralibs-to-extralibs_xxx.patch b/package/ffmpeg/0004-configure-add-extralibs-to-extralibs_xxx.patch index dbc19c1cecb..3247ab08fe4 100644 --- a/package/ffmpeg/0004-configure-add-extralibs-to-extralibs_xxx.patch +++ b/package/ffmpeg/0004-configure-add-extralibs-to-extralibs_xxx.patch @@ -17,7 +17,7 @@ diff --git a/configure b/configure index 0bb3a7cf2b..3bda99e415 100755 --- a/configure +++ b/configure -@@ -7602,15 +7602,15 @@ rpath=$(enabled rpath && echo "-Wl,-rpath,\${libdir}") +@@ -7715,15 +7715,15 @@ rpath=$(enabled rpath && echo "-Wl,-rpath,\${libdir}") source_path=${source_path} LIBPREF=${LIBPREF} LIBSUF=${LIBSUF} diff --git a/package/ffmpeg/Config.in b/package/ffmpeg/Config.in index 2efef7dd86e..52029c2adeb 100644 --- a/package/ffmpeg/Config.in +++ b/package/ffmpeg/Config.in @@ -22,7 +22,7 @@ menuconfig BR2_PACKAGE_FFMPEG FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video. - http://www.ffmpeg.org + https://www.ffmpeg.org if BR2_PACKAGE_FFMPEG diff --git a/package/ffmpeg/ffmpeg.hash b/package/ffmpeg/ffmpeg.hash index abb397f8721..b18218cb48f 100644 --- a/package/ffmpeg/ffmpeg.hash +++ b/package/ffmpeg/ffmpeg.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 eadbad9e9ab30b25f5520fbfde99fae4a92a1ae3c0257a8d68569a4651e30e02 ffmpeg-4.4.1.tar.xz +sha256 e80b380d595c809060f66f96a5d849511ef4a76a26b76eacf5778b94c3570309 ffmpeg-4.4.4.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 5a79faed47d..ce285bcc60f 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -4,9 +4,9 @@ # ################################################################################ -FFMPEG_VERSION = 4.4.1 +FFMPEG_VERSION = 4.4.4 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz -FFMPEG_SITE = http://ffmpeg.org/releases +FFMPEG_SITE = https://ffmpeg.org/releases FFMPEG_INSTALL_STAGING = YES FFMPEG_LICENSE = LGPL-2.1+, libjpeg license @@ -282,9 +282,14 @@ FFMPEG_CONF_OPTS += --disable-vdpau endif ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) -FFMPEG_CONF_OPTS += --enable-mmal --enable-omx --enable-omx-rpi \ +FFMPEG_CONF_OPTS += --enable-omx --enable-omx-rpi \ --extra-cflags=-I$(STAGING_DIR)/usr/include/IL FFMPEG_DEPENDENCIES += rpi-userland +ifeq ($(BR2_arm),y) +FFMPEG_CONF_OPTS += --enable-mmal +else +FFMPEG_CONF_OPTS += --disable-mmal +endif else FFMPEG_CONF_OPTS += --disable-mmal --disable-omx --disable-omx-rpi endif @@ -511,7 +516,11 @@ endif FFMPEG_CONF_OPTS += --disable-asm endif # MIPS -ifeq ($(BR2_POWERPC_CPU_HAS_ALTIVEC),y) +ifeq ($(BR2_POWERPC_CPU_HAS_ALTIVEC):$(BR2_powerpc64le),y:) +FFMPEG_CONF_OPTS += --enable-altivec +else ifeq ($(BR2_POWERPC_CPU_HAS_VSX):$(BR2_powerpc64le),y:y) +# On LE, ffmpeg AltiVec support needs VSX intrinsics, and VSX +# is an extension to AltiVec. FFMPEG_CONF_OPTS += --enable-altivec else FFMPEG_CONF_OPTS += --disable-altivec @@ -545,6 +554,10 @@ FFMPEG_CONF_OPTS += --disable-optimizations FFMPEG_CFLAGS += -O0 endif +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +FFMPEG_CFLAGS += -marm +endif + FFMPEG_CONF_ENV += CFLAGS="$(FFMPEG_CFLAGS)" FFMPEG_CONF_OPTS += $(call qstrip,$(BR2_PACKAGE_FFMPEG_EXTRACONF)) diff --git a/package/fftw/fftw.hash b/package/fftw/fftw.hash index 1c4a17d8c45..9e7364d76c7 100644 --- a/package/fftw/fftw.hash +++ b/package/fftw/fftw.hash @@ -1,5 +1,5 @@ -# From http://www.fftw.org/fftw-3.3.8.tar.gz.md5sum -md5 8aac833c943d8e90d51b697b27d4384d fftw-3.3.8.tar.gz +# From http://fftw.org/fftw-3.3.10.tar.gz.md5sum +md5 8ccbf6a5ea78a16dbc3e1306e234cc5c fftw-3.3.10.tar.gz # Locally computed -sha256 6113262f6e92c5bd474f2875fa1b01054c4ad5040f6b0da7c03c98821d9ae303 fftw-3.3.7.tar.gz -sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING +sha256 56c932549852cddcfafdab3820b0200c7742675be92179e59e6215b340e26467 fftw-3.3.10.tar.gz +sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/package/fftw/fftw.mk b/package/fftw/fftw.mk index 279244a5dce..1bb537aeb80 100644 --- a/package/fftw/fftw.mk +++ b/package/fftw/fftw.mk @@ -4,7 +4,7 @@ # ################################################################################ -FFTW_VERSION = 3.3.8 +FFTW_VERSION = 3.3.10 FFTW_SITE = http://www.fftw.org FFTW_INSTALL_STAGING = YES FFTW_LICENSE = GPL-2.0+ diff --git a/package/ficl/0002-Makefile.linux-pass-LDFLAGS.patch b/package/ficl/0002-Makefile.linux-pass-LDFLAGS.patch new file mode 100644 index 00000000000..2138089b0e9 --- /dev/null +++ b/package/ficl/0002-Makefile.linux-pass-LDFLAGS.patch @@ -0,0 +1,35 @@ +From 33b16f2c4f996a98c3bbbec9af542d020ac276fa Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 9 Aug 2022 23:53:06 +0200 +Subject: [PATCH] Makefile.linux: pass LDFLAGS + +Pass LDFLAGS to avoid the following musl static build failure: + +/home/autobuild/autobuild/instance-5/output-1/host/lib/gcc/sh4eb-buildroot-linux-musl/11.3.0/../../../../sh4eb-buildroot-linux-musl/bin/ld: /home/autobuild/autobuild/instance-5/output-1/host/lib/gcc/sh4eb-buildroot-linux-musl/11.3.0/libgcc.a(unwind-dw2.o): in function `size_of_encoded_value': +/home/autobuild/autobuild/instance-5/output-1/build/host-gcc-final-11.3.0/build/sh4eb-buildroot-linux-musl/libgcc/../../../libgcc/unwind-pe.h:89: undefined reference to `abort' + +Fixes: + - http://autobuild.buildroot.org/results/bf041723ed813746c61892262630a3ac2bc43b14 + +Signed-off-by: Fabrice Fontaine +[Upstream status: upstream is dead] +--- + Makefile.linux | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.linux b/Makefile.linux +index 5f1a41f..df887e6 100644 +--- a/Makefile.linux ++++ b/Makefile.linux +@@ -14,7 +14,7 @@ MAJOR = 4 + MINOR = 0.31 + + ficl: main.o $(HEADERS) libficl.a +- $(CC) main.o -o ficl -L. -lficl -lm ++ $(CC) $(LDFLAGS) main.o -o ficl -L. -lficl -lm + + lib: libficl.so.$(MAJOR).$(MINOR) + +-- +2.35.1 + diff --git a/package/file/0001-src-file.c-fix-build-without-wide-support.patch b/package/file/0001-src-file.c-fix-build-without-wide-support.patch new file mode 100644 index 00000000000..29be9fa2cd1 --- /dev/null +++ b/package/file/0001-src-file.c-fix-build-without-wide-support.patch @@ -0,0 +1,39 @@ +From f2ab09d0e1388657f6b7e62bacc383ebea91f5b9 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 26 Oct 2022 00:23:32 +0200 +Subject: [PATCH] src/file.c: fix build without wide support + +Fix the following build failure without wide support (e.g. on uclibc) +raised since version 5.43 and +https://github.com/file/file/commit/c80065fe6900be5e794941e29b32440e9969b1c3: + +file.c: In function 'fname_print': +file.c:605:10: error: macro "putc" requires 2 arguments, but only 1 given + 605 | putc(c); + | ^ + +Fixes: + - http://autobuild.buildroot.org/results/7ff1dd9f79408d2e6286c005302b6f3c505ab259 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://bugs.astron.com/view.php?id=398] +--- + src/file.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/file.c b/src/file.c +index f5f46524..1c23defc 100644 +--- a/src/file.c ++++ b/src/file.c +@@ -615,7 +615,7 @@ fname_print(const char *inname) + for (i = 0; i < n; i++) { + unsigned char c = CAST(unsigned char, inname[i]); + if (isprint(c)) { +- putc(c); ++ putc(c, stdout); + continue; + } + file_octal(c); +-- +2.35.1 + diff --git a/package/file/file.hash b/package/file/file.hash index 33875776ebe..49fa9e1e1ba 100644 --- a/package/file/file.hash +++ b/package/file/file.hash @@ -1,7 +1,7 @@ # Locally calculated after verifying signature -# ftp://ftp.astron.com/pub/file/file-5.41.tar.gz.asc +# ftp://ftp.astron.com/pub/file/file-5.43.tar.gz.asc # using key BE04995BA8F90ED0C0C176C471112AB16CB33B3A -sha256 13e532c7b364f7d57e23dfeea3147103150cb90593a57af86c10e4f6e411603f file-5.41.tar.gz +sha256 8c8015e91ae0e8d0321d94c78239892ef9dbc70c4ade0008c0e95894abfb1991 file-5.43.tar.gz sha256 0bfa856a9930bddadbef95d1be1cf4e163c0be618e76ea3275caaf255283e274 COPYING sha256 4ccb60d623884ef637af4a5bc16b2cb350163e2135e967655837336019a64462 src/mygetopt.h -sha256 c4fa92d6504b88484a12140fe3e24b9b29b0112717f94b1ff4205d54828b1c70 src/vasprintf.c +sha256 cc3d8704489d08eaefcaee8c639cc6436c6f0f6b2b03986d3ba7521a1a1d2fc9 src/vasprintf.c diff --git a/package/file/file.mk b/package/file/file.mk index c06975460f6..9b751e26960 100644 --- a/package/file/file.mk +++ b/package/file/file.mk @@ -4,7 +4,7 @@ # ################################################################################ -FILE_VERSION = 5.41 +FILE_VERSION = 5.43 FILE_SITE = ftp://ftp.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 diff --git a/package/fio/fio.mk b/package/fio/fio.mk index 13818b60fd7..b46ece77028 100644 --- a/package/fio/fio.mk +++ b/package/fio/fio.mk @@ -26,7 +26,8 @@ FIO_DEPENDENCIES += zlib endif define FIO_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) ./configure --cc="$(TARGET_CC)" --extra-cflags="$(TARGET_CFLAGS)") + (cd $(@D); $(TARGET_MAKE_ENV) ./configure --disable-native \ + --cc="$(TARGET_CC)" --extra-cflags="$(TARGET_CFLAGS)") endef define FIO_BUILD_CMDS diff --git a/package/firmware-utils/firmware-utils.mk b/package/firmware-utils/firmware-utils.mk index 151a01882d7..d5b079e4f5a 100644 --- a/package/firmware-utils/firmware-utils.mk +++ b/package/firmware-utils/firmware-utils.mk @@ -5,7 +5,8 @@ ################################################################################ FIRMWARE_UTILS_VERSION = 86739f2b3ae9502368b89ef37fa6f31c42aad6f4 -FIRMWARE_UTILS_SITE = git://git.openwrt.org/project/firmware-utils.git +FIRMWARE_UTILS_SITE = https://git.openwrt.org/project/firmware-utils.git +FIRMWARE_UTILS_SITE_METHOD = git FIRMWARE_UTILS_LICENSE = \ BSD-2-Clause (tplink-safeloader), \ BSD-3-Clause (seama), \ diff --git a/package/flac/0001-Fix-uclibc-build.patch b/package/flac/0001-Fix-uclibc-build.patch deleted file mode 100644 index fcba670fae2..00000000000 --- a/package/flac/0001-Fix-uclibc-build.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 4c62082f64132bfcbcb6569aa914c5ec283303f9 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 21 Feb 2022 18:21:11 +0100 -Subject: [PATCH] Fix uclibc build - -Commit 4fbb6d4f2ecf2a96c17ea9880108409f852c08a9 reverted commit -44036c9a9b45d03373fe90e9c112852bfc054c51 and so broke again the build on -uclibc - -So put back the sys/auxv.h check as well as a getauxval check in a way -that doesn't break iOS - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/xiph/flac/pull/292] ---- - configure.ac | 5 ++++- - src/libFLAC/cpu.c | 9 ++++----- - 2 files changed, 8 insertions(+), 6 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 4d7dc2e4..6f32fa45 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -69,7 +69,7 @@ AC_C_INLINE - AC_C_VARARRAYS - AC_C_TYPEOF - --AC_CHECK_HEADERS([stdint.h inttypes.h byteswap.h sys/param.h sys/ioctl.h termios.h x86intrin.h cpuid.h]) -+AC_CHECK_HEADERS([stdint.h inttypes.h byteswap.h sys/auxv.h sys/param.h sys/ioctl.h termios.h x86intrin.h cpuid.h]) - - XIPH_C_BSWAP32 - XIPH_C_BSWAP16 -@@ -101,6 +101,9 @@ fi - # For the XMMS plugin. - AC_CHECK_TYPES(socklen_t, [], []) - -+dnl check for getauxval in standard library -+AC_CHECK_FUNCS(getauxval) -+ - dnl check for getopt in standard library - dnl AC_CHECK_FUNCS(getopt_long , , [LIBOBJS="$LIBOBJS getopt.o getopt1.o"] ) - AC_CHECK_FUNCS(getopt_long, [], []) -diff --git a/src/libFLAC/cpu.c b/src/libFLAC/cpu.c -index 8b92f4c7..64c6acad 100644 ---- a/src/libFLAC/cpu.c -+++ b/src/libFLAC/cpu.c -@@ -53,11 +53,9 @@ - #define dfprintf(file, format, ...) - #endif - --#if defined FLAC__CPU_PPC --#if defined(__linux__) || (defined(__FreeBSD__) && (__FreeBSD__ >= 12)) -+#if defined(HAVE_SYS_AUXV_H) - #include - #endif --#endif - - #if (defined FLAC__CPU_IA32 || defined FLAC__CPU_X86_64) && (defined FLAC__HAS_NASM || FLAC__HAS_X86INTRIN) && !defined FLAC__NO_ASM - -@@ -247,7 +245,7 @@ ppc_cpu_info (FLAC__CPUInfo *info) - #define PPC_FEATURE2_ARCH_2_07 0x80000000 - #endif - --#ifdef __linux__ -+#if defined (__linux__) && defined(HAVE_GETAUXVAL) - if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_3_00) { - info->ppc.arch_3_00 = true; - } else if (getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07) { -@@ -267,7 +265,8 @@ ppc_cpu_info (FLAC__CPUInfo *info) - info->ppc.arch_2_07 = false; - info->ppc.arch_3_00 = false; - #else --#error Unsupported platform! Please add support for reading ppc hwcaps. -+ info->ppc.arch_2_07 = false; -+ info->ppc.arch_3_00 = false; - #endif - - #else --- -2.34.1 - diff --git a/package/flac/Config.in b/package/flac/Config.in index 267acb7f34f..62aca290fec 100644 --- a/package/flac/Config.in +++ b/package/flac/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_FLAC help FLAC is an Open Source lossless audio codec. - http://flac.sourceforge.net/ + https://xiph.org/flac/ comment "flac needs a toolchain w/ wchar" depends on !BR2_USE_WCHAR diff --git a/package/flac/flac.hash b/package/flac/flac.hash index 2444535e0f5..b993ebd759d 100644 --- a/package/flac/flac.hash +++ b/package/flac/flac.hash @@ -1,8 +1,6 @@ -# From https://ftp.osuosl.org/pub/xiph/releases/flac/SHA1SUMS -sha1 99c28482a8b2d81deaf740639e4cb55658427420 flac-1.3.4.tar.xz -# From http://downloads.xiph.org/releases/flac/SHA256SUMS.txt -sha256 8ff0607e75a322dd7cd6ec48f4f225471404ae2730d0ea945127b1355155e737 flac-1.3.4.tar.xz +# From https://ftp.osuosl.org/pub/xiph/releases/flac/SHA256SUMS.txt +sha256 e322d58a1f48d23d9dd38f432672865f6f79e73a6f9cc5a5f57fcaa83eb5a8e4 flac-1.4.2.tar.xz # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LGPL -sha256 fa27cb11f13f97b0c5f3ff363b1e2610c6efe87ed175779cb2a78e44eb19d34c COPYING.Xiph +sha256 6e58d3036f05e2a0d58af854c12a505ddbe75011d71a598a2170987f3b15408d COPYING.Xiph diff --git a/package/flac/flac.mk b/package/flac/flac.mk index 2ff048b6e61..595c2379b02 100644 --- a/package/flac/flac.mk +++ b/package/flac/flac.mk @@ -4,8 +4,8 @@ # ################################################################################ -FLAC_VERSION = 1.3.4 -FLAC_SITE = http://downloads.xiph.org/releases/flac +FLAC_VERSION = 1.4.2 +FLAC_SITE = https://ftp.osuosl.org/pub/xiph/releases/flac FLAC_SOURCE = flac-$(FLAC_VERSION).tar.xz FLAC_INSTALL_STAGING = YES FLAC_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv) @@ -13,13 +13,10 @@ FLAC_LICENSE = Xiph BSD-like (libFLAC), GPL-2.0+ (tools), LGPL-2.1+ (other libra FLAC_LICENSE_FILES = COPYING.Xiph COPYING.GPL COPYING.LGPL FLAC_CPE_ID_VENDOR = flac_project -# patch touching configure.ac -FLAC_AUTORECONF = YES - FLAC_CONF_OPTS = \ + $(if $(BR2_POWERPC_CPU_HAS_ALTIVEC),--enable-altivec,--disable-altivec) \ $(if $(BR2_INSTALL_LIBSTDCPP),--enable-cpplibs,--disable-cpplibs) \ - --disable-xmms-plugin \ - --disable-altivec \ + $(if $(BR2_POWERPC_CPU_HAS_VSX),--enable-vsx,--disable-vsx) \ --disable-stack-smash-protection ifeq ($(BR2_PACKAGE_LIBOGG),y) @@ -29,11 +26,4 @@ else FLAC_CONF_OPTS += --disable-ogg endif -ifeq ($(BR2_X86_CPU_HAS_SSE),y) -FLAC_DEPENDENCIES += host-nasm -FLAC_CONF_OPTS += --enable-sse -else -FLAC_CONF_OPTS += --disable-sse -endif - $(eval $(autotools-package)) diff --git a/package/flann/0001-src-cpp-fix-cmake-3.11-build.patch b/package/flann/0001-src-cpp-fix-cmake-3.11-build.patch deleted file mode 100644 index b37bedcf6d5..00000000000 --- a/package/flann/0001-src-cpp-fix-cmake-3.11-build.patch +++ /dev/null @@ -1,80 +0,0 @@ -From fa5ec96a94646492a3f908e12905b3e48a8e800b Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Wed, 18 Apr 2018 20:24:13 +0200 -Subject: [PATCH] src/cpp: fix cmake >= 3.11 build - -CMake < 3.11 doesn't support add_library() without any source file -(i.e add_library(foo SHARED)). But flann CMake use a trick that use -an empty string "" as source list (i.e add_library(foo SHARED "")). -This look like a bug in CMake < 3.11. - -With CMake >= 3.11, the new behaviour of add_library() break the -existing flann CMake code. - -From CMake Changelog [1]: -"add_library() and add_executable() commands can now be called without - any sources and will not complain as long as sources are added later - via the target_sources() command." - -Note: flann CMake code doesn't use target_sources() since no source file -are provided intentionally since the flann shared library is created by -linking with the flann_cpp_s static library with this line: - -target_link_libraries(flann_cpp -Wl,-whole-archive flann_cpp_s -Wl,-no-whole-archive) - -If you try to use "add_library(flann_cpp SHARED ${CPP_SOURCES})" (as it should -be normally done), the link fail due to already defined symbol. - -They are building the shared version using the static library "to speedup the -build time" [3] - -This issue is already reported upstream [2] with a proposed solution. - -Upstream status: Pending - -Fixes: -http://autobuild.buildroot.net/results/b2f/b2febfaf8c44ce477b3e4a5b9b976fd25e8d7454 - -[1] https://cmake.org/cmake/help/v3.11/release/3.11.html -[2] https://github.com/mariusmuja/flann/issues/369 -[3] https://github.com/mariusmuja/flann/commit/0fd62b43be2fbb0b8d791ee36290791224dc030c - -Signed-off-by: Romain Naour ---- - src/cpp/CMakeLists.txt | 4 ++-- - src/cpp/empty.cpp | 1 + - 2 files changed, 3 insertions(+), 2 deletions(-) - create mode 100644 src/cpp/empty.cpp - -diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt -index b44a735..a816863 100644 ---- a/src/cpp/CMakeLists.txt -+++ b/src/cpp/CMakeLists.txt -@@ -29,7 +29,7 @@ if (BUILD_CUDA_LIB) - endif() - - if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_COMPILER_IS_GNUCC) -- add_library(flann_cpp SHARED "") -+ add_library(flann_cpp SHARED "empty.cpp") - set_target_properties(flann_cpp PROPERTIES LINKER_LANGUAGE CXX) - target_link_libraries(flann_cpp -Wl,-whole-archive flann_cpp_s -Wl,-no-whole-archive) - -@@ -85,7 +85,7 @@ if (BUILD_C_BINDINGS) - set_property(TARGET flann_s PROPERTY COMPILE_DEFINITIONS FLANN_STATIC) - - if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_COMPILER_IS_GNUCC) -- add_library(flann SHARED "") -+ add_library(flann SHARED "empty.cpp") - set_target_properties(flann PROPERTIES LINKER_LANGUAGE CXX) - target_link_libraries(flann -Wl,-whole-archive flann_s -Wl,-no-whole-archive) - else() -diff --git a/src/cpp/empty.cpp b/src/cpp/empty.cpp -new file mode 100644 -index 0000000..40a8c17 ---- /dev/null -+++ b/src/cpp/empty.cpp -@@ -0,0 +1 @@ -+/* empty */ --- -2.14.3 - diff --git a/package/flann/Config.in b/package/flann/Config.in index 3725fc784ff..8b32e9077c8 100644 --- a/package/flann/Config.in +++ b/package/flann/Config.in @@ -2,6 +2,8 @@ config BR2_PACKAGE_FLANN bool "flann" depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11 + select BR2_PACKAGE_LZ4 help FLANN is a library for performing fast approximate nearest neighbor searches in high dimensional spaces. It contains a @@ -21,5 +23,6 @@ config BR2_PACKAGE_FLANN_EXAMPLES endif -comment "flann needs a toolchain w/ C++, dynamic library" - depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS +comment "flann needs a toolchain w/ C++, dynamic library, gcc >= 4.7" + depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 diff --git a/package/flann/flann.hash b/package/flann/flann.hash index 543e4b483d6..6eaa48c403a 100644 --- a/package/flann/flann.hash +++ b/package/flann/flann.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b23b5f4e71139faa3bcb39e6bbcc76967fbaf308c4ee9d4f5bfbeceaa76cc5d3 flann-1.9.1.tar.gz +sha256 e26829bb0017f317d9cc45ab83ddcb8b16d75ada1ae07157006c1e7d601c8824 flann-1.9.2.tar.gz sha256 3993f339cc56506c62aa1eb2fb76f240ee93b738d857832899c1e207b1dc069a COPYING diff --git a/package/flann/flann.mk b/package/flann/flann.mk index 6c2e6a9e789..dc75b977afa 100644 --- a/package/flann/flann.mk +++ b/package/flann/flann.mk @@ -4,21 +4,21 @@ # ################################################################################ -FLANN_VERSION = 1.9.1 +FLANN_VERSION = 1.9.2 FLANN_SITE = $(call github,mariusmuja,flann,$(FLANN_VERSION)) FLANN_INSTALL_STAGING = YES FLANN_LICENSE = BSD-3-Clause FLANN_LICENSE_FILES = COPYING +FLANN_DEPENDENCIES = host-pkgconf lz4 FLANN_CONF_OPTS = \ -DBUILD_C_BINDINGS=ON \ -DBUILD_PYTHON_BINDINGS=OFF \ -DBUILD_MATLAB_BINDINGS=OFF \ -DBUILD_EXAMPLES=$(if $(BR2_PACKAGE_FLANN_EXAMPLES),ON,OFF) \ -DUSE_OPENMP=$(if $(BR2_TOOLCHAIN_HAS_OPENMP),ON,OFF) \ - -DPYTHON_EXECUTABLE=OFF \ -DCMAKE_DISABLE_FIND_PACKAGE_HDF5=TRUE -FLANN_CXXFLAGS = $(TARGET_CXXFLAGS) +FLANN_CXXFLAGS = $(TARGET_CXXFLAGS) -std=c++11 ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_68485),y) FLANN_CXXFLAGS += -O0 diff --git a/package/flannel/flannel.hash b/package/flannel/flannel.hash index 0d0f75e6b46..bafc453097a 100644 --- a/package/flannel/flannel.hash +++ b/package/flannel/flannel.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 e17164db3b158d13ce5e40bb7b233790cb186762d929fa4f626baf586d4d63ca v0.14.0.tar.gz -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE +sha256 e17164db3b158d13ce5e40bb7b233790cb186762d929fa4f626baf586d4d63ca flannel-0.14.0.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/flannel/flannel.mk b/package/flannel/flannel.mk index 231cf90dfd6..b4e2b2f777b 100644 --- a/package/flannel/flannel.mk +++ b/package/flannel/flannel.mk @@ -5,8 +5,7 @@ ################################################################################ FLANNEL_VERSION = 0.14.0 -FLANNEL_SITE = https://github.com/flannel-io/flannel/archive -FLANNEL_SOURCE = v$(FLANNEL_VERSION).tar.gz +FLANNEL_SITE = $(call github,flannel-io,flannel,v$(FLANNEL_VERSION)) FLANNEL_LICENSE = Apache-2.0 FLANNEL_LICENSE_FILES = LICENSE diff --git a/package/flare-engine/Config.in b/package/flare-engine/Config.in index 9c997c2b9a9..136cae707e8 100644 --- a/package/flare-engine/Config.in +++ b/package/flare-engine/Config.in @@ -15,7 +15,7 @@ config BR2_PACKAGE_FLARE_ENGINE Flare is not a reimplementation of an existing game or engine. It is a tribute to and exploration of the action RPG genre. - http://flarerpg.org + https://flarerpg.org comment "flare-engine needs a toolchain w/ C++, dynamic library" depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS diff --git a/package/flare-engine/flare-engine.hash b/package/flare-engine/flare-engine.hash index 7f6169381cb..2e1f87b237c 100644 --- a/package/flare-engine/flare-engine.hash +++ b/package/flare-engine/flare-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 287a08532972fa3ac56ce7cb213d21be8be35b529339f61d4eeadbd501c78a8e flare-engine-1.12.tar.gz +sha256 2c1bafeaa5ac26c10449bfcb7151b06e8a22547aa7364d2a39bbcb135aa50a09 flare-engine-1.14.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/flare-engine/flare-engine.mk b/package/flare-engine/flare-engine.mk index cbb7add4bb8..e5fa947272d 100644 --- a/package/flare-engine/flare-engine.mk +++ b/package/flare-engine/flare-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLARE_ENGINE_VERSION = 1.12 +FLARE_ENGINE_VERSION = 1.14 FLARE_ENGINE_SITE = $(call github,flareteam,flare-engine,v$(FLARE_ENGINE_VERSION)) FLARE_ENGINE_LICENSE = GPL-3.0+ FLARE_ENGINE_LICENSE_FILES = COPYING diff --git a/package/flare-game/Config.in b/package/flare-game/Config.in index ca68d19a69f..535a9b18a29 100644 --- a/package/flare-game/Config.in +++ b/package/flare-game/Config.in @@ -10,4 +10,4 @@ config BR2_PACKAGE_FLARE_GAME game engine itself is part of a separate package, flame-engine. - http://flarerpg.org + https://flarerpg.org diff --git a/package/flare-game/flare-game.hash b/package/flare-game/flare-game.hash index 3d6d678c94f..9ae88c6daa5 100644 --- a/package/flare-game/flare-game.hash +++ b/package/flare-game/flare-game.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 19a909f2c6e0868baae823bb491e8840d5fb3e0454f00201de8da119772e5160 flare-game-1.12.tar.gz +sha256 65758462070aa88842084f8ee69083d8226e93cfbf83481663276d8307494b8e flare-game-1.14.tar.gz sha256 3f941b3b89cf7b8370ceb83cc76d2120d471b58735d8ca60238a751a48d7f72f LICENSE.txt diff --git a/package/flare-game/flare-game.mk b/package/flare-game/flare-game.mk index 41f02bec933..a1a0a5944ad 100644 --- a/package/flare-game/flare-game.mk +++ b/package/flare-game/flare-game.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLARE_GAME_VERSION = 1.12 +FLARE_GAME_VERSION = 1.14 FLARE_GAME_SITE = $(call github,flareteam,flare-game,v$(FLARE_GAME_VERSION)) FLARE_GAME_LICENSE = CC-BY-SA-3.0 (data files), GPL-2.0 (GNU Unifont), \ OFL-1.1 (Liberation Sans) diff --git a/package/flashbench/flashbench.mk b/package/flashbench/flashbench.mk index e89a250aa31..f5791c3e95b 100644 --- a/package/flashbench/flashbench.mk +++ b/package/flashbench/flashbench.mk @@ -5,7 +5,8 @@ ################################################################################ FLASHBENCH_VERSION = 2e30b1968a66147412f21002ea844122a0d5e2f0 -FLASHBENCH_SITE = git://git.linaro.org/people/arnd/flashbench.git +FLASHBENCH_SITE = https://git.linaro.org/people/arnd/flashbench.git +FLASHBENCH_SITE_METHOD = git FLASHBENCH_LICENSE = GPL-2.0 FLASHBENCH_LICENSE_FILES = COPYING diff --git a/package/flashrom/0001-Makefile-Fix-building-on-AArch64-NixOS.patch b/package/flashrom/0001-Makefile-Fix-building-on-AArch64-NixOS.patch deleted file mode 100644 index f835172e61f..00000000000 --- a/package/flashrom/0001-Makefile-Fix-building-on-AArch64-NixOS.patch +++ /dev/null @@ -1,95 +0,0 @@ -From da6b3b70cb852dd8e9f9e21aef95fa83e7f7ab0d Mon Sep 17 00:00:00 2001 -From: Pyry Kontio -Date: Mon, 6 Jul 2020 12:57:35 +0900 -Subject: [PATCH] Makefile: Fix building on AArch64 NixOS - -The parsing of the output of archtest.c produced an unexpected -value on AArch64 NixOS. For example, the make variable ARCH was set to: - -``` -bit outside of fd_set selected -arm -``` - -This made the arch and OS checks fail. - -This commit simplifies the parsing, making it more robust. - -The C files archtest.c, endiantest.c and os.h used to set the -TARGET_OS, ARCH and ENDIAN variables, respectively, output -the result of the test as the final line, so just extracting -the final line and removing double quoting is enough. - -This commit also fixes a bug with debug_shell lacking escaping -single quotes, which prevented using the single quote in the -debug_shell calls. It used to work by accident before this fix; -the line in the call happened to contain a balanced pair of double -quotes and lacked other characters that needed escaping, which -didn't break the debug_shell, but this was accidental and very -brittle. - -Signed-off-by: Pyry Kontio -Change-Id: Iaa4477a71e758cf9ecad2c22f3b77bc6508a3510 -Reviewed-on: https://review.coreboot.org/c/flashrom/+/43140 -Tested-by: build bot (Jenkins) -Reviewed-by: Angel Pons - -[Retrieved from: -https://github.com/flashrom/flashrom/commit/da6b3b70cb852dd8e9f9e21aef95fa83e7f7ab0d] -Signed-off-by: Fabrice Fontaine ---- - Makefile | 16 ++++++++++------ - 1 file changed, 10 insertions(+), 6 deletions(-) - -diff --git a/Makefile b/Makefile -index f3f7717e2..e475cbdbd 100644 ---- a/Makefile -+++ b/Makefile -@@ -83,7 +83,8 @@ dummy_for_make_3_80:=$(shell printf "Build started on %s\n\n" "$$(date)" >$(BUIL - - # Provide an easy way to execute a command, print its output to stdout and capture any error message on stderr - # in the build details file together with the original stdout output. --debug_shell = $(shell export LC_ALL=C ; { echo 'exec: export LC_ALL=C ; { $(1) ; }' >&2; { $(1) ; } | tee -a $(BUILD_DETAILS_FILE) ; echo >&2 ; } 2>>$(BUILD_DETAILS_FILE)) -+debug_shell = $(shell export LC_ALL=C ; { echo 'exec: export LC_ALL=C ; { $(subst ','\'',$(1)) ; }' >&2; \ -+ { $(1) ; } | tee -a $(BUILD_DETAILS_FILE) ; echo >&2 ; } 2>>$(BUILD_DETAILS_FILE)) - - ############################################################################### - # General OS-specific settings. -@@ -106,7 +107,8 @@ endif - # IMPORTANT: The following line must be placed before TARGET_OS is ever used - # (of course), but should come after any lines setting CC because the line - # below uses CC itself. --override TARGET_OS := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E os.h 2>/dev/null | grep -v '^\#' | grep '"' | cut -f 2 -d'"')) -+override TARGET_OS := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E os.h 2>/dev/null \ -+ | tail -1 | cut -f 2 -d'"')) - - ifeq ($(TARGET_OS), Darwin) - override CPPFLAGS += -I/opt/local/include -I/usr/local/include -@@ -490,8 +492,10 @@ endif - # IMPORTANT: The following line must be placed before ARCH is ever used - # (of course), but should come after any lines setting CC because the line - # below uses CC itself. --override ARCH := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E archtest.c 2>/dev/null | grep -v '^\#' | grep '"' | cut -f 2 -d'"')) --override ENDIAN := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E endiantest.c 2>/dev/null | grep -v '^\#')) -+override ARCH := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E archtest.c 2>/dev/null \ -+ | tail -1 | cut -f 2 -d'"')) -+override ENDIAN := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E endiantest.c 2>/dev/null \ -+ | tail -1)) - - # Disable the internal programmer on unsupported architectures (everything but x86 and mipsel) - ifneq ($(ARCH)-little, $(filter $(ARCH),x86 mips)-$(ENDIAN)) -@@ -1299,12 +1303,12 @@ compiler: featuresavailable - @printf "Target arch is " - @# FreeBSD wc will output extraneous whitespace. - @echo $(ARCH)|wc -w|grep -q '^[[:blank:]]*1[[:blank:]]*$$' || \ -- ( echo "unknown. Aborting."; exit 1) -+ ( echo "unknown (\"$(ARCH)\"). Aborting."; exit 1) - @printf "%s\n" '$(ARCH)' - @printf "Target OS is " - @# FreeBSD wc will output extraneous whitespace. - @echo $(TARGET_OS)|wc -w|grep -q '^[[:blank:]]*1[[:blank:]]*$$' || \ -- ( echo "unknown. Aborting."; exit 1) -+ ( echo "unknown (\"$(TARGET_OS)\"). Aborting."; exit 1) - @printf "%s\n" '$(TARGET_OS)' - ifeq ($(TARGET_OS), libpayload) - @$(CC) --version 2>&1 | grep -q coreboot || \ diff --git a/package/flashrom/flashrom.hash b/package/flashrom/flashrom.hash index 97df4fe9a40..2ab463d93ae 100644 --- a/package/flashrom/flashrom.hash +++ b/package/flashrom/flashrom.hash @@ -1,4 +1,4 @@ # Locally computed after checking pgp signature -# https://download.flashrom.org/releases/flashrom-v1.2.tar.bz2.asc -sha256 e1f8d95881f5a4365dfe58776ce821dfcee0f138f75d0f44f8a3cd032d9ea42b flashrom-v1.2.tar.bz2 +# https://download.flashrom.org/releases/flashrom-v1.2.1.tar.bz2.asc +sha256 89a7ff5beb08c89b8795bbd253a51b9453547a864c31793302296b56bbc56d65 flashrom-v1.2.1.tar.bz2 sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/flashrom/flashrom.mk b/package/flashrom/flashrom.mk index 5554082bca6..dd505987ed0 100644 --- a/package/flashrom/flashrom.mk +++ b/package/flashrom/flashrom.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLASHROM_VERSION = 1.2 +FLASHROM_VERSION = 1.2.1 FLASHROM_SOURCE = flashrom-v$(FLASHROM_VERSION).tar.bz2 FLASHROM_SITE = https://download.flashrom.org/releases FLASHROM_LICENSE = GPL-2.0+ diff --git a/package/flatbuffers/0001-include-flatbuffers-base.h-fix-build-on-musl.patch b/package/flatbuffers/0001-include-flatbuffers-base.h-fix-build-on-musl.patch index b4bc0e12de8..82feca3e391 100644 --- a/package/flatbuffers/0001-include-flatbuffers-base.h-fix-build-on-musl.patch +++ b/package/flatbuffers/0001-include-flatbuffers-base.h-fix-build-on-musl.patch @@ -28,7 +28,10 @@ Fixes: - http://autobuild.buildroot.org/results/68045b83e94f8caa337b1af7ed5f493ac1a55c47 Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/google/flatbuffers/pull/6773] +[Upstream status: Rejected: + https://github.com/google/flatbuffers/pull/6773] +Signed-off-by: Bernd Kuhls +(rebased and added fix for uClibc-build) --- include/flatbuffers/base.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -37,15 +40,16 @@ diff --git a/include/flatbuffers/base.h b/include/flatbuffers/base.h index de7898dc..101c7598 100644 --- a/include/flatbuffers/base.h +++ b/include/flatbuffers/base.h -@@ -266,7 +266,7 @@ namespace flatbuffers { - #ifndef FLATBUFFERS_LOCALE_INDEPENDENT - // Enable locale independent functions {strtof_l, strtod_l,strtoll_l, strtoull_l}. - #if ((defined(_MSC_VER) && _MSC_VER >= 1800) || \ -- (defined(_XOPEN_VERSION) && (_XOPEN_VERSION>=700)) && (!defined(__ANDROID_API__) || (defined(__ANDROID_API__) && (__ANDROID_API__>=21)))) -+ (defined(__GLIBC__) && defined(_XOPEN_VERSION) && (_XOPEN_VERSION>=700)) && (!defined(__ANDROID_API__) || (defined(__ANDROID_API__) && (__ANDROID_API__>=21)))) +@@ -264,7 +264,8 @@ namespace flatbuffers { + // strtoull_l}. + #if (defined(_MSC_VER) && _MSC_VER >= 1800) || \ + (defined(__ANDROID_API__) && __ANDROID_API__>= 21) || \ +- (defined(_XOPEN_VERSION) && (_XOPEN_VERSION >= 700)) && \ ++ (defined(_XOPEN_VERSION) && (_XOPEN_VERSION >= 700) && \ ++ defined(__GLIBC__) && !defined(__UCLIBC__)) && \ + (!defined(__Fuchsia__) && !defined(__ANDROID_API__)) #define FLATBUFFERS_LOCALE_INDEPENDENT 1 #else - #define FLATBUFFERS_LOCALE_INDEPENDENT 0 -- 2.30.2 diff --git a/package/flatbuffers/flatbuffers.hash b/package/flatbuffers/flatbuffers.hash index b05b9e7b4ba..6382b86f1b6 100644 --- a/package/flatbuffers/flatbuffers.hash +++ b/package/flatbuffers/flatbuffers.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 9ddb9031798f4f8754d00fca2f1a68ecf9d0f83dfac7239af1311e4fd9a565c4 flatbuffers-2.0.0.tar.gz +sha256 f97965a727d26386afaefff950badef2db3ab6af9afe23ed6d94bfb65f95f37e flatbuffers-2.0.8.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/flatbuffers/flatbuffers.mk b/package/flatbuffers/flatbuffers.mk index 280834c2d46..487d85ee1f1 100644 --- a/package/flatbuffers/flatbuffers.mk +++ b/package/flatbuffers/flatbuffers.mk @@ -4,16 +4,19 @@ # ################################################################################ -FLATBUFFERS_VERSION = 2.0.0 +FLATBUFFERS_VERSION = 2.0.8 FLATBUFFERS_SITE = $(call github,google,flatbuffers,v$(FLATBUFFERS_VERSION)) FLATBUFFERS_LICENSE = Apache-2.0 FLATBUFFERS_LICENSE_FILES = LICENSE.txt FLATBUFFERS_CPE_ID_VENDOR = google FLATBUFFERS_INSTALL_STAGING = YES +FLATBUFFERS_DEPENDENCIES = host-flatbuffers FLATBUFFERS_CONF_OPTS += \ -DCMAKE_CXX_FLAGS="-std=c++11" \ - -DFLATBUFFERS_BUILD_TESTS=OFF + -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ + -DFLATBUFFERS_BUILD_TESTS=OFF \ + -DFLATBUFFERS_FLATC_EXECUTABLE=$(HOST_DIR)/bin/flatc ifeq ($(BR2_STATIC_LIBS),y) FLATBUFFERS_CONF_OPTS += -DFLATBUFFERS_BUILD_SHAREDLIB=OFF diff --git a/package/flatcc/flatcc.hash b/package/flatcc/flatcc.hash index 11d9d9803a3..4c6b2fc8dbb 100644 --- a/package/flatcc/flatcc.hash +++ b/package/flatcc/flatcc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a92da3566d11e19bb807a83554b1a2c644a5bd91c9d9b088514456bb56e1c666 flatcc-0.6.0.tar.gz -sha256 c8f0d9c1f92c658d87ebd854ee7447a3d3912d2c3a5c78c117787be5d5da8af3 LICENSE +sha256 2533c2f1061498499f15acc7e0937dcf35bc68e685d237325124ae0d6c600c2b flatcc-0.6.1.tar.gz +sha256 c8f0d9c1f92c658d87ebd854ee7447a3d3912d2c3a5c78c117787be5d5da8af3 LICENSE diff --git a/package/flatcc/flatcc.mk b/package/flatcc/flatcc.mk index fcace691c07..06be1a1338c 100644 --- a/package/flatcc/flatcc.mk +++ b/package/flatcc/flatcc.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLATCC_VERSION = 0.6.0 +FLATCC_VERSION = 0.6.1 FLATCC_SITE = $(call github,dvidelabs,flatcc,v$(FLATCC_VERSION)) FLATCC_LICENSE = Apache-2.0 FLATCC_LICENSE_FILES = LICENSE diff --git a/package/flex/flex.hash b/package/flex/flex.hash index ee905739020..3bfb04d672a 100644 --- a/package/flex/flex.hash +++ b/package/flex/flex.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995 flex-2.6.4.tar.gz +sha256 e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995 flex-2.6.4.tar.gz # License files, locally calculated -sha256 97fd685958d93be7f8dab939bb8161dbd6afb0718c63bfc337c24321aea44273 COPYING +sha256 97fd685958d93be7f8dab939bb8161dbd6afb0718c63bfc337c24321aea44273 COPYING diff --git a/package/flickcurl/flickcurl.hash b/package/flickcurl/flickcurl.hash index 92ba68361ef..8c3ea1682a5 100644 --- a/package/flickcurl/flickcurl.hash +++ b/package/flickcurl/flickcurl.hash @@ -1,7 +1,7 @@ # Locally calculated after checking pgp signature -sha256 ff42a36c7c1c7d368246f6bc9b7d792ed298348e5f0f5d432e49f6803562f5a3 flickcurl-1.26.tar.gz +sha256 ff42a36c7c1c7d368246f6bc9b7d792ed298348e5f0f5d432e49f6803562f5a3 flickcurl-1.26.tar.gz # Locally computed -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING -sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE-2.0.txt -sha256 3590f30b0fb9446a1f0a7ea5bcbb5786fa66fa362800f53d2575875d74b91909 LICENSE.html +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING +sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE-2.0.txt +sha256 3590f30b0fb9446a1f0a7ea5bcbb5786fa66fa362800f53d2575875d74b91909 LICENSE.html diff --git a/package/flite/flite.mk b/package/flite/flite.mk index 79b2288fe35..bee4c7394f8 100644 --- a/package/flite/flite.mk +++ b/package/flite/flite.mk @@ -8,6 +8,7 @@ FLITE_VERSION = 2.2 FLITE_SITE = $(call github,festvox,flite,v$(FLITE_VERSION)) FLITE_LICENSE = BSD-4-Clause FLITE_LICENSE_FILES = COPYING +FLITE_CPE_ID_VENDOR = cmu FLITE_INSTALL_STAGING = YES # Patching configure.in diff --git a/package/flot/flot.hash b/package/flot/flot.hash index c8272fc0b17..fb7a331975c 100644 --- a/package/flot/flot.hash +++ b/package/flot/flot.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ef9a873befe3ff5ea42ebf1c3657887265a1717744ca8ed0c2bd3dd736d16b21 flot-0.8.3.tar.gz -sha256 52cb566b16d84314b92b91361ed072eaaf166e8d3dfa3d0fd3577613925f205c LICENSE.txt +sha256 ef9a873befe3ff5ea42ebf1c3657887265a1717744ca8ed0c2bd3dd736d16b21 flot-0.8.3.tar.gz +sha256 52cb566b16d84314b92b91361ed072eaaf166e8d3dfa3d0fd3577613925f205c LICENSE.txt diff --git a/package/fluent-bit/0001-lib-cfl-fixup-static_assert.patch b/package/fluent-bit/0001-lib-cfl-fixup-static_assert.patch new file mode 100644 index 00000000000..19dab7cac6a --- /dev/null +++ b/package/fluent-bit/0001-lib-cfl-fixup-static_assert.patch @@ -0,0 +1,33 @@ +From e4f825dd9e952f4a056bf89342049e67102ae6bb Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Wed, 1 Feb 2023 11:38:15 +0100 +Subject: [PATCH] lib: cfl: fixup static_assert + +"undefined reference to 'static_assert'" + +Not defined when using uClibc or if not C++ >= 11. + +upstream: https://github.com/Cyan4973/xxHash/commit/6189ecd3d44a693460f86280ccf49d33cb4b18e1 + +Signed-off-by: Thomas Devoogdt +--- + lib/cfl/lib/xxhash/xxhash.h | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/lib/cfl/lib/xxhash/xxhash.h b/lib/cfl/lib/xxhash/xxhash.h +index 08ab79457..511c4d12b 100644 +--- a/lib/cfl/lib/xxhash/xxhash.h ++++ b/lib/cfl/lib/xxhash/xxhash.h +@@ -1546,8 +1546,7 @@ static void* XXH_memcpy(void* dest, const void* src, size_t size) + /* note: use after variable declarations */ + #ifndef XXH_STATIC_ASSERT + # if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) /* C11 */ +-# include +-# define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { static_assert((c),m); } while(0) ++# define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { _Static_assert((c),m); } while(0) + # elif defined(__cplusplus) && (__cplusplus >= 201103L) /* C++11 */ + # define XXH_STATIC_ASSERT_WITH_MESSAGE(c,m) do { static_assert((c),m); } while(0) + # else +-- +2.34.1 + diff --git a/package/fluent-bit/0002-lib-c-ares-fixup-static_assert.patch b/package/fluent-bit/0002-lib-c-ares-fixup-static_assert.patch new file mode 100644 index 00000000000..d9b918ea8a2 --- /dev/null +++ b/package/fluent-bit/0002-lib-c-ares-fixup-static_assert.patch @@ -0,0 +1,56 @@ +From f55f9bf6d9201169d2e5d3782068b03ff17dec90 Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Wed, 1 Feb 2023 11:26:56 +0100 +Subject: [PATCH] lib: c-ares: fixup static_assert + +"undefined reference to 'static_assert'" + +Not defined when using uClibc or if not C++ >= 11. + +upstream: https://github.com/c-ares/c-ares/issues/504 + +Signed-off-by: Thomas Devoogdt +--- + lib/c-ares-1.19.0/configure | 4 ++++ + lib/c-ares-1.19.0/m4/ax_cxx_compile_stdcxx_11.m4 | 3 +++ + 2 files changed, 7 insertions(+) + +diff --git a/lib/c-ares-1.19.0/configure b/lib/c-ares-1.19.0/configure +index 4c5e1a966..58712ec34 100755 +--- a/lib/c-ares-1.19.0/configure ++++ b/lib/c-ares-1.19.0/configure +@@ -6317,6 +6317,8 @@ else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + ++#define static_assert _Static_assert ++ + template + struct check + { +@@ -6394,6 +6396,8 @@ else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + ++#define static_assert _Static_assert ++ + template + struct check + { +diff --git a/lib/c-ares-1.19.0/m4/ax_cxx_compile_stdcxx_11.m4 b/lib/c-ares-1.19.0/m4/ax_cxx_compile_stdcxx_11.m4 +index 229de3091..fe4a11c67 100644 +--- a/lib/c-ares-1.19.0/m4/ax_cxx_compile_stdcxx_11.m4 ++++ b/lib/c-ares-1.19.0/m4/ax_cxx_compile_stdcxx_11.m4 +@@ -37,6 +37,9 @@ + #serial 9 + + m4_define([_AX_CXX_COMPILE_STDCXX_11_testbody], [[ ++ ++#define static_assert _Static_assert ++ + template + struct check + { +-- +2.34.1 + diff --git a/package/fluent-bit/0003-fix-build-without-C.patch b/package/fluent-bit/0003-fix-build-without-C.patch new file mode 100644 index 00000000000..0f0b239216a --- /dev/null +++ b/package/fluent-bit/0003-fix-build-without-C.patch @@ -0,0 +1,131 @@ +From f2aeca6fcc37bf22dd7307cab8fc9db6b53dd652 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 21 Feb 2023 00:09:57 +0100 +Subject: [PATCH] fix build without C++ + +Fix the following build failure without C++: + +-- Check for working CXX compiler: /usr/bin/c++ - broken +CMake Error at /home/autobuild/autobuild/instance-15/output-1/per-package/fluent-bit/host/share/cmake-3.22/Modules/CMakeTestCXXCompiler.cmake:62 (message): + The C++ compiler + + "/usr/bin/c++" + + is not able to compile a simple test program. + + It fails with the following output: + + Change Dir: /home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp + + Run Build Command(s):/home/autobuild/make/make -f Makefile cmTC_bfb29/fast && make[1]: Entering directory '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' + /home/autobuild/make/make -f CMakeFiles/cmTC_bfb29.dir/build.make CMakeFiles/cmTC_bfb29.dir/build + make[2]: Entering directory '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' + Building CXX object CMakeFiles/cmTC_bfb29.dir/testCXXCompiler.cxx.o + /usr/bin/c++ --sysroot=/home/autobuild/autobuild/instance-15/output-1/per-package/fluent-bit/host/xtensa-buildroot-linux-uclibc/sysroot -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -mlongcalls -mauto-litpools -O2 -g0 -fcommon -U_FILE_OFFSET_BITS -g -fPIE -o CMakeFiles/cmTC_bfb29.dir/testCXXCompiler.cxx.o -c /home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp/testCXXCompiler.cxx + c++: error: unrecognized command-line option '-mlongcalls' + c++: error: unrecognized command-line option '-mauto-litpools' + make[2]: *** [CMakeFiles/cmTC_bfb29.dir/build.make:78: CMakeFiles/cmTC_bfb29.dir/testCXXCompiler.cxx.o] Error 1 + make[2]: Leaving directory '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' + make[1]: *** [Makefile:127: cmTC_bfb29/fast] Error 2 + make[1]: Leaving directory '/home/autobuild/autobuild/instance-15/output-1/build/fluent-bit-2.0.9/CMakeFiles/CMakeTmp' + + CMake will not be able to correctly generate this project. +Call Stack (most recent call first): + lib/msgpack-c/CMakeLists.txt:2 (project) + +Fixes: + - http://autobuild.buildroot.org/results/4b0f90d79d6dbbf976acf1da839260b0ee94ddda + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/fluent/fluent-bit/pull/6893] +--- + lib/chunkio/CMakeLists.txt | 2 +- + lib/lwrb/CMakeLists.txt | 2 +- + lib/msgpack-c/CMakeLists.txt | 2 +- + lib/onigmo/CMakeLists.txt | 2 +- + lib/snappy-fef67ac/CMakeLists.txt | 2 +- + lib/tutf8e/CMakeLists.txt | 2 +- + src/stream_processor/CMakeLists.txt | 2 +- + 7 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/lib/chunkio/CMakeLists.txt b/lib/chunkio/CMakeLists.txt +index 233bce35c..8bfe5199d 100644 +--- a/lib/chunkio/CMakeLists.txt ++++ b/lib/chunkio/CMakeLists.txt +@@ -1,5 +1,5 @@ + cmake_minimum_required(VERSION 3.0) +-project(chunk-io) ++project(chunk-io C) + + set(CIO_VERSION_MAJOR 1) + set(CIO_VERSION_MINOR 4) +diff --git a/lib/lwrb/CMakeLists.txt b/lib/lwrb/CMakeLists.txt +index 2fabd6319..031cbc1dd 100644 +--- a/lib/lwrb/CMakeLists.txt ++++ b/lib/lwrb/CMakeLists.txt +@@ -1,7 +1,7 @@ + cmake_minimum_required(VERSION 3.0) + + # Setup project +-project(LwLibPROJECT) ++project(LwLibPROJECT C) + + # ------------------------------------------------- + # This CMakeLists.txt is used only if it is a top-level file. +diff --git a/lib/msgpack-c/CMakeLists.txt b/lib/msgpack-c/CMakeLists.txt +index 810ad609a..ffbbc5ddb 100644 +--- a/lib/msgpack-c/CMakeLists.txt ++++ b/lib/msgpack-c/CMakeLists.txt +@@ -1,5 +1,5 @@ + cmake_minimum_required(VERSION 2.8) +-project(msgpack-c) ++project(msgpack-c C) + + set(src + src/objectc.c +diff --git a/lib/onigmo/CMakeLists.txt b/lib/onigmo/CMakeLists.txt +index 4a3b30d7d..66865130a 100644 +--- a/lib/onigmo/CMakeLists.txt ++++ b/lib/onigmo/CMakeLists.txt +@@ -1,5 +1,5 @@ + cmake_minimum_required(VERSION 3.4) +-project(onigmo) ++project(onigmo C) + + # Onigmo Version + set(ONIGMO_VERSION_MAJOR 6) +diff --git a/lib/snappy-fef67ac/CMakeLists.txt b/lib/snappy-fef67ac/CMakeLists.txt +index 8bb1e9598..ae9225c49 100644 +--- a/lib/snappy-fef67ac/CMakeLists.txt ++++ b/lib/snappy-fef67ac/CMakeLists.txt +@@ -1,5 +1,5 @@ + cmake_minimum_required(VERSION 2.8) +-project(snappy-c) ++project(snappy-c C) + + set(CMAKE_POSITION_INDEPENDENT_CODE ON) + +diff --git a/lib/tutf8e/CMakeLists.txt b/lib/tutf8e/CMakeLists.txt +index 35cbe01ad..a056ef83c 100644 +--- a/lib/tutf8e/CMakeLists.txt ++++ b/lib/tutf8e/CMakeLists.txt +@@ -1,5 +1,5 @@ + cmake_minimum_required(VERSION 2.8) +-project(tutf8e) ++project(tutf8e C) + + # Not supported: -std=c90 (lacks support for inline) + # Supported: -std=gnu90, -std=c99 or -std=gnu99 +diff --git a/src/stream_processor/CMakeLists.txt b/src/stream_processor/CMakeLists.txt +index 8c5d70d13..de2c2fe38 100644 +--- a/src/stream_processor/CMakeLists.txt ++++ b/src/stream_processor/CMakeLists.txt +@@ -1,4 +1,4 @@ +-project(stream-processor) ++project(stream-processor C) + + include_directories(${CMAKE_CURRENT_SOURCE_DIR}) + +-- +2.39.1 + diff --git a/package/fluent-bit/Config.in b/package/fluent-bit/Config.in new file mode 100644 index 00000000000..bfdea895b06 --- /dev/null +++ b/package/fluent-bit/Config.in @@ -0,0 +1,41 @@ +config BR2_PACKAGE_FLUENT_BIT + bool "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_LIBYAML + help + Fast and Lightweight Logs and Metrics processor. + + https://github.com/fluent/fluent-bit + +if BR2_PACKAGE_FLUENT_BIT + +config BR2_PACKAGE_FLUENT_BIT_WASM_ARCH_SUPPORTS + bool + # see lib/wasm-micro-runtime-WAMR-1.1.1/README.md#supported-architectures-and-platforms + default y if BR2_arc + default y if BR2_arm || BR2_armeb + default y if BR2_aarch64 || BR2_aarch64_be + default y if BR2_i386 || BR2_x86_64 + default y if BR2_RISCV_64 + default y if BR2_xtensa + +config BR2_PACKAGE_FLUENT_BIT_WASM + bool "wasm runtime support" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_PACKAGE_FLUENT_BIT_WASM_ARCH_SUPPORTS + help + Support for WASM-based plugins. + +comment "wasm runtime support needs a toolchain w/ C++" + depends on BR2_PACKAGE_FLUENT_BIT_WASM_ARCH_SUPPORTS + depends on !BR2_INSTALL_LIBSTDCPP + +endif + +comment "fluent-bit needs a toolchain w/ threads, dynamic library" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/fluent-bit/S99fluent-bit b/package/fluent-bit/S99fluent-bit new file mode 100644 index 00000000000..f4ba0e4448b --- /dev/null +++ b/package/fluent-bit/S99fluent-bit @@ -0,0 +1,72 @@ +#!/bin/sh + +DAEMON="fluent-bit" +PID_FILE="/var/run/$DAEMON.pid" +CONF_FILE="/etc/$DAEMON/$DAEMON.conf" + +FLUENT_BIT_ARGS="" + +# shellcheck source=/dev/null +[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" + +start() { + printf 'Starting %s: ' "$DAEMON" + # shellcheck disable=SC2086 # we need the word splitting + start-stop-daemon -S -q -b -m -p "$PID_FILE" --exec "/usr/bin/$DAEMON" \ + -- -c "$CONF_FILE" $FLUENT_BIT_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 "$PID_FILE" + status=$? + + if [ -f "$PID_FILE" ]; then + pid=$(cat "$PID_FILE") + rm -f "$PID_FILE" + + # https://docs.fluentbit.io/manual/administration/configuring-fluent-bit/yaml/configuration-file#config_section + # The default grace time is set to 5 seconds, so use 6 seconds to have some margin. + timeout=6 + while kill -0 "$pid" 2>/dev/null; do + [ $timeout -eq 0 ] && status=1 && break + timeout=$((timeout - 1)) + sleep 1 + done + fi + + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +restart() { + stop + start +} + +case "$1" in +start) + start + ;; +stop) + stop + ;; +restart | reload) + restart + ;; +*) + echo "Usage: $0 {start|stop|restart}" + exit 1 + ;; +esac diff --git a/package/fluent-bit/fluent-bit.hash b/package/fluent-bit/fluent-bit.hash new file mode 100644 index 00000000000..d60531438a4 --- /dev/null +++ b/package/fluent-bit/fluent-bit.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 aad5176cb4dcadacacd379ca43160074c6690012d37c4749536ac3b977d50495 fluent-bit-2.0.10.tar.gz +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk new file mode 100644 index 00000000000..319815f0565 --- /dev/null +++ b/package/fluent-bit/fluent-bit.mk @@ -0,0 +1,84 @@ +################################################################################ +# +# fluent-bit +# +################################################################################ + +FLUENT_BIT_VERSION = 2.0.10 +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_CFLAGS = $(TARGET_CFLAGS) +FLUENT_BIT_CXXFLAGS = $(TARGET_CXXFLAGS) + +FLUENT_BIT_CONF_OPTS += \ + -DFLB_DEBUG=No \ + -DFLB_RELEASE=Yes \ + -DFLB_EXAMPLES=No \ + -DFLB_CHUNK_TRACE=No \ + -DFLB_BACKTRACE=No + +ifeq ($(BR2_PACKAGE_FLUENT_BIT_WASM),y) +FLUENT_BIT_CONF_OPTS += -DFLB_WASM=Yes +else +FLUENT_BIT_CONF_OPTS += -DFLB_WASM=No +endif + +ifeq ($(BR2_PACKAGE_LUAJIT),y) +FLUENT_BIT_CONF_OPTS += -DFLB_LUAJIT=Yes +FLUENT_BIT_DEPENDENCIES += luajit +else +FLUENT_BIT_CONF_OPTS += -DFLB_LUAJIT=No +endif + +# Force bundled miniz to be linked statically. +# https://github.com/fluent/fluent-bit/issues/6711 +FLUENT_BIT_CONF_OPTS += \ + -DBUILD_SHARED_LIBS=OFF + +# Move the config files from /usr/etc/ to /etc/. +# https://github.com/fluent/fluent-bit/issues/6619 +FLUENT_BIT_CONF_OPTS += \ + -DCMAKE_INSTALL_SYSCONFDIR="/etc/" + +# Fix multiple definition of `mk_tls_*'. +# https://github.com/fluent/fluent-bit/issues/5537 +FLUENT_BIT_CFLAGS += -fcommon +FLUENT_BIT_CXXFLAGS += -fcommon + +# Undefining _FILE_OFFSET_BITS here because of a "bug" with glibc fts.h +# large file support. +# https://bugzilla.redhat.com/show_bug.cgi?id=574992 +FLUENT_BIT_CFLAGS += -U_FILE_OFFSET_BITS +FLUENT_BIT_CXXFLAGS += -U_FILE_OFFSET_BITS + +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +FLUENT_BIT_DEPENDENCIES += libexecinfo +FLUENT_BIT_LDFLAGS += -lexecinfo +endif + +ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),) +FLUENT_BIT_DEPENDENCIES += musl-fts +FLUENT_BIT_LDFLAGS += -lfts +endif + +# Uses __atomic_compare_exchange_8 +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +FLUENT_BIT_LDFLAGS += -latomic +endif + +FLUENT_BIT_CONF_OPTS += \ + -DCMAKE_EXE_LINKER_FLAGS="$(FLUENT_BIT_LDFLAGS)" \ + -DCMAKE_C_FLAGS="$(FLUENT_BIT_CFLAGS)" \ + -DCMAKE_CXX_FLAGS="$(FLUENT_BIT_CXXFLAGS)" + +define FLUENT_BIT_INSTALL_INIT_SYSV + $(INSTALL) -D -m 0755 package/fluent-bit/S99fluent-bit \ + $(TARGET_DIR)/etc/init.d/S99fluent-bit +endef + +$(eval $(cmake-package)) diff --git a/package/fluid-soundfont/fluid-soundfont.hash b/package/fluid-soundfont/fluid-soundfont.hash index 7aaac60084c..ecc57a1e00b 100644 --- a/package/fluid-soundfont/fluid-soundfont.hash +++ b/package/fluid-soundfont/fluid-soundfont.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2621acaa1c78e4abdb24bdd163230cc577e61276936d6aa6e3180582142f0343 fluid-soundfont_3.1.orig.tar.gz -sha256 8ef830b65c97a976b86e34bb5fde08d99dfb1db13c4149b5b20bc837ac6c4568 COPYING +sha256 2621acaa1c78e4abdb24bdd163230cc577e61276936d6aa6e3180582142f0343 fluid-soundfont_3.1.orig.tar.gz +sha256 8ef830b65c97a976b86e34bb5fde08d99dfb1db13c4149b5b20bc837ac6c4568 COPYING diff --git a/package/fluidsynth/Config.in b/package/fluidsynth/Config.in index 5726e235e4f..376419ce8f1 100644 --- a/package/fluidsynth/Config.in +++ b/package/fluidsynth/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_FLUIDSYNTH # the .pc file installed by fluidsynth does not mention its # indirect dependencies in Libs.private. depends on !BR2_STATIC_LIBS + depends on BR2_INSTALL_LIBSTDCPP select BR2_PACKAGE_LIBGLIB2 help FluidSynth is a real-time software synthesizer based on the @@ -128,7 +129,7 @@ config BR2_PACKAGE_FLUIDSYNTH_READLINE endif # BR2_PACKAGE_FLUIDSYNTH -comment "fluidsynth needs a toolchain w/ threads, wchar, dynamic library" +comment "fluidsynth needs a toolchain w/ threads, wchar, dynamic library, C++" depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS + BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP diff --git a/package/fluidsynth/fluidsynth.hash b/package/fluidsynth/fluidsynth.hash index 0d41c16d8d2..382a54abadf 100644 --- a/package/fluidsynth/fluidsynth.hash +++ b/package/fluidsynth/fluidsynth.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 9037e703617f91c4c36039a5059e0f624164799d856af715bcd8a23c07ba03b8 fluidsynth-2.2.5.tar.gz +sha256 321f7d3f72206b2522f30a1cb8ad1936fd4533ffc4d29dd335b1953c9fb371e6 fluidsynth-2.3.3.tar.gz sha256 9b872a8a070b8ad329c4bd380fb1bf0000f564c75023ec8e1e6803f15364b9e9 LICENSE diff --git a/package/fluidsynth/fluidsynth.mk b/package/fluidsynth/fluidsynth.mk index b500944c167..52f8ec489fe 100644 --- a/package/fluidsynth/fluidsynth.mk +++ b/package/fluidsynth/fluidsynth.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUIDSYNTH_VERSION = 2.2.5 +FLUIDSYNTH_VERSION = 2.3.3 FLUIDSYNTH_SITE = $(call github,FluidSynth,fluidsynth,v$(FLUIDSYNTH_VERSION)) FLUIDSYNTH_LICENSE = LGPL-2.1+ FLUIDSYNTH_LICENSE_FILES = LICENSE diff --git a/package/fmc/Config.in b/package/fmc/Config.in index 4399aa2caba..c89a87c99e6 100644 --- a/package/fmc/Config.in +++ b/package/fmc/Config.in @@ -21,5 +21,7 @@ config BR2_PACKAGE_FMC packets flow into hardware configuration. The tool provides an abstraction layer between the end customer's vision of the PCD task definition and real hardware implementation. + See application note: + https://www.nxp.com/docs/en/application-note/AN4760.pdf - http://cache.freescale.com/files/32bit/doc/app_note/AN4760.pdf + https://github.com/nxp-qoriq/fmc diff --git a/package/fmc/fmc.hash b/package/fmc/fmc.hash index fed33091cdd..961ce18ac71 100644 --- a/package/fmc/fmc.hash +++ b/package/fmc/fmc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 cb896ec1fac2fe9a3a9bb8be2221b79acf5f9b75841609a681db0d9e7bec02a0 fmc-fsl-sdk-v2.0-br1.tar.gz +sha256 a58514816108a16d07307f924ebceb67c7d61709e4449978763fc44ed6e1fc44 fmc-LSDK-21.08.tar.gz sha256 f92862ceb95db5492f50a59d7c799c9395b714db88db92d11891dc0233e2ac42 COPYING diff --git a/package/fmc/fmc.mk b/package/fmc/fmc.mk index b3857301385..4f25545ffd8 100644 --- a/package/fmc/fmc.mk +++ b/package/fmc/fmc.mk @@ -4,9 +4,8 @@ # ################################################################################ -FMC_VERSION = fsl-sdk-v2.0 -FMC_SITE = https://source.codeaurora.org/external/qoriq/qoriq-yocto-sdk/fmc -FMC_SITE_METHOD = git +FMC_VERSION = LSDK-21.08 +FMC_SITE = $(call github,nxp-qoriq,fmc,$(FMC_VERSION)) FMC_LICENSE = MIT FMC_LICENSE_FILES = COPYING FMC_DEPENDENCIES = libxml2 tclap fmlib @@ -27,7 +26,7 @@ endif FMC_PLATFORM = $(call qstrip,$(BR2_PACKAGE_FMLIB_PLATFORM)) define FMC_BUILD_CMDS - $(SED) "s:P4080:$(FMC_PLATFORM):g" $(@D)/source/Makefile + $(SED) "s:LS1043:$(FMC_PLATFORM):g" $(@D)/source/Makefile # The linking step has dependency issues so using MAKE1 $(TARGET_MAKE_ENV) $(MAKE1) $(FMC_MAKE_OPTS) -C $(@D)/source endef diff --git a/package/fmlib/Config.in b/package/fmlib/Config.in index df4ae440eac..97d55d1250b 100644 --- a/package/fmlib/Config.in +++ b/package/fmlib/Config.in @@ -13,7 +13,7 @@ config BR2_PACKAGE_FMLIB configure driver parameters and PCD (parse - classify - distribute) rules. - http://git.freescale.com/git/cgit.cgi/ppc/sdk/fmlib.git/tree/README + https://github.com/nxp-qoriq/fmlib if BR2_PACKAGE_FMLIB choice @@ -37,7 +37,7 @@ endchoice config BR2_PACKAGE_FMLIB_ARCHTYPE string - default "e500mc" if BR2_powerpc_e500mc + default "ppce500mc" if BR2_powerpc_e500mc default "ppc64e6500" if BR2_powerpc_e6500 && BR2_powerpc64 default "ppc32e6500" if BR2_powerpc_e6500 && BR2_powerpc diff --git a/package/fmlib/fmlib.hash b/package/fmlib/fmlib.hash index 47460d091cb..f81b017869c 100644 --- a/package/fmlib/fmlib.hash +++ b/package/fmlib/fmlib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 59415d346af1d22f510f2785be4c7e3606dc3181476a666e832270550f7d44a6 fmlib-fsl-sdk-v2.0-br1.tar.gz -sha256 837559e20d83910a005e7883b876cc5c42805fe4abcf7e5c5b3c8d036b7f61c8 COPYING +sha256 64dc76c0adc3aa58bce6aba470dee7dee001d4964ccb1958e899a59d9917b21d fmlib-LSDK-21.08.tar.gz +sha256 5d7770fa9f70f0c6f0b4784bbca8401811259a4b1e03455dbd863ffd0d34d2ca COPYING diff --git a/package/fmlib/fmlib.mk b/package/fmlib/fmlib.mk index 8cb779201d4..3d185979d51 100644 --- a/package/fmlib/fmlib.mk +++ b/package/fmlib/fmlib.mk @@ -4,10 +4,9 @@ # ################################################################################ -FMLIB_VERSION = fsl-sdk-v2.0 -FMLIB_SITE = https://source.codeaurora.org/external/qoriq/qoriq-yocto-sdk/fmlib -FMLIB_SITE_METHOD = git -FMLIB_LICENSE = BSD-3-Clause, GPL-2.0+ +FMLIB_VERSION = LSDK-21.08 +FMLIB_SITE = $(call github,nxp-qoriq,fmlib,$(FMLIB_VERSION)) +FMLIB_LICENSE = BSD-3-Clause FMLIB_LICENSE_FILES = COPYING FMLIB_DEPENDENCIES = linux FMLIB_INSTALL_STAGING = YES diff --git a/package/fmt/fmt.hash b/package/fmt/fmt.hash index 79956c251bf..65eeaa4ebe1 100644 --- a/package/fmt/fmt.hash +++ b/package/fmt/fmt.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 23778bad8edba12d76e4075da06db591f3b0e3c6c04928ced4a7282ca3400e5d fmt-8.1.1.zip +sha256 cceb4cb9366e18a5742128cb3524ce5f50e88b476f1e54737a47ffdf4df4c996 fmt-9.1.0.zip sha256 825c9324e70f8c839c8ba910543dd4a7daee243b86ef960594c11381a19980b8 LICENSE.rst diff --git a/package/fmt/fmt.mk b/package/fmt/fmt.mk index be7ffb022bd..ed0703cbc93 100644 --- a/package/fmt/fmt.mk +++ b/package/fmt/fmt.mk @@ -4,7 +4,7 @@ # ################################################################################ -FMT_VERSION = 8.1.1 +FMT_VERSION = 9.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/font-awesome/font-awesome.hash b/package/font-awesome/font-awesome.hash index 2ea11d5fe4d..89bc411f663 100644 --- a/package/font-awesome/font-awesome.hash +++ b/package/font-awesome/font-awesome.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 de512ba0e1dead382bbfce372cde74b3f18971d876fffb635ee9333f0db05d43 font-awesome-4.7.0.tar.gz +sha256 de512ba0e1dead382bbfce372cde74b3f18971d876fffb635ee9333f0db05d43 font-awesome-4.7.0.tar.gz diff --git a/package/fontconfig/fontconfig.hash b/package/fontconfig/fontconfig.hash index 153f00c3d83..844ee426d4f 100644 --- a/package/fontconfig/fontconfig.hash +++ b/package/fontconfig/fontconfig.hash @@ -1,5 +1,5 @@ # From https://lists.freedesktop.org/archives/fontconfig/2018-August/006324.html -sha256 f655dd2a986d7aa97e052261b36aa67b0a64989496361eca8d604e6414006741 fontconfig-2.13.1.tar.bz2 +sha256 f655dd2a986d7aa97e052261b36aa67b0a64989496361eca8d604e6414006741 fontconfig-2.13.1.tar.bz2 # Locally calculated -sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 COPYING +sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 COPYING diff --git a/package/forge/Config.in b/package/forge/Config.in new file mode 100644 index 00000000000..86d48321011 --- /dev/null +++ b/package/forge/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_FORGE + bool "forge" + help + A native implementation of TLS (and various other + cryptographic tools) in JavaScript. + + https://github.com/digitalbazaar/forge diff --git a/package/forge/forge.hash b/package/forge/forge.hash new file mode 100644 index 00000000000..36e92be743f --- /dev/null +++ b/package/forge/forge.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 77de03720cd00fafdbcda47e3e995a1f548f2e9028d11a98b0d9bef37ec2ad85 node-forge-1.3.1.tgz +sha256 f63ff0e4e239244aa79280da2dd4811a0469e5e201caf5cbc0d97c3a1dff8e82 LICENSE diff --git a/package/forge/forge.mk b/package/forge/forge.mk new file mode 100644 index 00000000000..0b81295a15d --- /dev/null +++ b/package/forge/forge.mk @@ -0,0 +1,24 @@ +################################################################################ +# +# forge +# +################################################################################ + +FORGE_VERSION = 1.3.1 +FORGE_SITE = https://registry.npmjs.org/node-forge/- +FORGE_SOURCE = node-forge-$(FORGE_VERSION).tgz +FORGE_LICENSE = BSD-3-Clause, GPL-2.0, vendored dependencies licenses probably not listed +FORGE_LICENSE_FILES = LICENSE +FORGE_CPE_ID_VENDOR = digitalbazaar + +# Install .min.js as .js +define FORGE_INSTALL_TARGET_CMDS + $(INSTALL) -m 644 -D $(@D)/dist/forge.all.min.js \ + $(TARGET_DIR)/var/www/forge.all.js + $(INSTALL) -m 644 -D $(@D)/dist/forge.min.js \ + $(TARGET_DIR)/var/www/forge.js + $(INSTALL) -m 644 -D $(@D)/dist/prime.worker.min.js \ + $(TARGET_DIR)/var/www/prime.worker.js +endef + +$(eval $(generic-package)) diff --git a/package/freeipmi/0001-add-disable-doc.patch b/package/freeipmi/0001-add-disable-doc.patch new file mode 100644 index 00000000000..e410d2b52f7 --- /dev/null +++ b/package/freeipmi/0001-add-disable-doc.patch @@ -0,0 +1,72 @@ +From 5324c88632c021a87251370b03067d857e9a9892 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 2 Nov 2022 19:02:42 +0100 +Subject: [PATCH] add --disable-doc + +Allow the user to disable documentation through --disable-doc to avoid +the following build failure without makeinfo: + +/home/buildroot/autobuild/instance-0/output-1/build/freeipmi-1.6.10/config/missing: line 81: makeinfo: command not found +WARNING: 'makeinfo' is missing on your system. + You should only need it if you modified a '.texi' file, or + any other file indirectly affecting the aspect of the manual. + You might want to install the Texinfo package: + + The spurious makeinfo call might also be the consequence of + using a buggy 'make' (AIX, DU, IRIX), in which case you might + want to install GNU make: + +Makefile:442: recipe for target 'freeipmi-faq.info' failed + +Fixes: + - http://autobuild.buildroot.org/results/ac6ff1c746a354f885fc1674d10e7bff9e536134 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/chu11/freeipmi-mirror/pull/61] +--- + Makefile.am | 6 +++++- + configure.ac | 4 ++++ + 2 files changed, 9 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index cf757f634..d74952e30 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -3,7 +3,6 @@ + ACLOCAL_AMFLAGS = -I config + + SUBDIRS = \ +- doc \ + etc \ + common \ + libfreeipmi \ +@@ -33,6 +32,11 @@ SUBDIRS = \ + rmcpping \ + contrib + ++if ENABLE_DOC ++SUBDIRS += \ ++ doc ++endif ++ + PACKAGE = @PACKAGE@ + VERSION = @VERSION@ + +diff --git a/configure.ac b/configure.ac +index 54fdf6367..7a94b958b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -341,6 +341,10 @@ else + fi + AC_SUBST(WITH_DEBUG) + ++AC_ARG_ENABLE(doc, ++ AC_HELP_STRING([--disable-doc], [turn off documentation])) ++AM_CONDITIONAL(ENABLE_DOC, test "$enable_doc" != "no") ++ + dnl Allow advanced developers to compile with raw dumping + AC_ARG_ENABLE(rawdumps, + AC_HELP_STRING([--enable-rawdumps], [output raw packet dumps when debugging])) +-- +2.35.1 + diff --git a/package/freeipmi/0001-libfreeipmi-rename-md2-and-md5-functions-macros.patch b/package/freeipmi/0001-libfreeipmi-rename-md2-and-md5-functions-macros.patch deleted file mode 100644 index 0de5b29c9c6..00000000000 --- a/package/freeipmi/0001-libfreeipmi-rename-md2-and-md5-functions-macros.patch +++ /dev/null @@ -1,695 +0,0 @@ -From 50eeda7f14c4eaa56aa86ba570a47557456544f2 Mon Sep 17 00:00:00 2001 -From: Albert Chu -Date: Wed, 19 Jan 2022 11:55:55 -0800 -Subject: [PATCH] libfreeipmi: rename md2 and md5 functions / macros - -Static compilation with libfreeipmi can lead to problems if -other software has similarly named md2/md5 functions -(such as md5_init()). Prefix all macros and functions with -'ipmi_' as needed. Update all callers accordingly. - -[Retrieved from: -https://github.com/chu11/freeipmi-mirror/commit/50eeda7f14c4eaa56aa86ba570a47557456544f2] -Signed-off-by: Fabrice Fontaine ---- - ChangeLog | 11 ++ - libfreeipmi/interface/ipmi-lan-interface.c | 48 +++---- - .../interface/ipmi-rmcpplus-interface.c | 2 +- - libfreeipmi/libcommon/ipmi-md2.c | 72 +++++------ - libfreeipmi/libcommon/ipmi-md2.h | 30 ++--- - libfreeipmi/libcommon/ipmi-md5.c | 64 +++++----- - libfreeipmi/libcommon/ipmi-md5.h | 18 +-- - libfreeipmi/util/ipmi-lan-util.c | 120 +++++++++--------- - 8 files changed, 188 insertions(+), 177 deletions(-) - -diff --git a/ChangeLog b/ChangeLog -index 883a195cf..60bf8c323 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,3 +1,14 @@ -+2021-01-19 Albert Chu -+ -+ * libfreeipmi/libcommon/ipmi-md2.h, -+ libfreeipmi/libcommon/ipmi-md2.c, -+ libfreeipmi/libcommon/ipmi-md5.h, -+ libfreeipmi/libcommon/ipmi-md5.c: Static compilation with -+ libfreeipmi can lead to problems if other software has similarly -+ named md2/md5 functions (such as md5_init()). Prefix all macros -+ and functions with 'ipmi_' as needed. Update all callers -+ accordingly. -+ - 2022-01-18 Fabrice Fontaine - - * configure.ac: use pkg-config to find gcrypt -diff --git a/libfreeipmi/interface/ipmi-lan-interface.c b/libfreeipmi/interface/ipmi-lan-interface.c -index 20099d770..658be53e1 100644 ---- a/libfreeipmi/interface/ipmi-lan-interface.c -+++ b/libfreeipmi/interface/ipmi-lan-interface.c -@@ -533,37 +533,37 @@ assemble_ipmi_lan_pkt (fiid_obj_t obj_rmcp_hdr, - - if (authentication_type == IPMI_AUTHENTICATION_TYPE_MD2) - { -- md2_t ctx; -- uint8_t digest[MD2_DIGEST_LENGTH]; -+ ipmi_md2_t ctx; -+ uint8_t digest[IPMI_MD2_DIGEST_LENGTH]; - -- assert (IPMI_1_5_MAX_PASSWORD_LENGTH == MD2_DIGEST_LENGTH); -+ assert (IPMI_1_5_MAX_PASSWORD_LENGTH == IPMI_MD2_DIGEST_LENGTH); - -- md2_init (&ctx); -- md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); -- md2_update_data (&ctx, session_id_buf, session_id_len); -- md2_update_data (&ctx, msg_data_ptr, msg_data_count); -- md2_update_data (&ctx, session_sequence_number_buf, session_sequence_number_len); -- md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); -- md2_finish (&ctx, digest, MD2_DIGEST_LENGTH); -- md2_init (&ctx); -+ ipmi_md2_init (&ctx); -+ ipmi_md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); -+ ipmi_md2_update_data (&ctx, session_id_buf, session_id_len); -+ ipmi_md2_update_data (&ctx, msg_data_ptr, msg_data_count); -+ ipmi_md2_update_data (&ctx, session_sequence_number_buf, session_sequence_number_len); -+ ipmi_md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); -+ ipmi_md2_finish (&ctx, digest, IPMI_MD2_DIGEST_LENGTH); -+ ipmi_md2_init (&ctx); - - memcpy (authentication_code_field_ptr, digest, IPMI_1_5_MAX_PASSWORD_LENGTH); - } - else if (authentication_type == IPMI_AUTHENTICATION_TYPE_MD5) - { -- md5_t ctx; -- uint8_t digest[MD5_DIGEST_LENGTH]; -- -- assert (IPMI_1_5_MAX_PASSWORD_LENGTH == MD5_DIGEST_LENGTH); -- -- md5_init (&ctx); -- md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); -- md5_update_data (&ctx, session_id_buf, session_id_len); -- md5_update_data (&ctx, msg_data_ptr, msg_data_count); -- md5_update_data (&ctx, session_sequence_number_buf, session_sequence_number_len); -- md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); -- md5_finish (&ctx, digest, MD5_DIGEST_LENGTH); -- md5_init (&ctx); -+ ipmi_md5_t ctx; -+ uint8_t digest[IPMI_MD5_DIGEST_LENGTH]; -+ -+ assert (IPMI_1_5_MAX_PASSWORD_LENGTH == IPMI_MD5_DIGEST_LENGTH); -+ -+ ipmi_md5_init (&ctx); -+ ipmi_md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); -+ ipmi_md5_update_data (&ctx, session_id_buf, session_id_len); -+ ipmi_md5_update_data (&ctx, msg_data_ptr, msg_data_count); -+ ipmi_md5_update_data (&ctx, session_sequence_number_buf, session_sequence_number_len); -+ ipmi_md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); -+ ipmi_md5_finish (&ctx, digest, IPMI_MD5_DIGEST_LENGTH); -+ ipmi_md5_init (&ctx); - - memcpy (authentication_code_field_ptr, digest, IPMI_1_5_MAX_PASSWORD_LENGTH); - } -diff --git a/libfreeipmi/interface/ipmi-rmcpplus-interface.c b/libfreeipmi/interface/ipmi-rmcpplus-interface.c -index 1f462da7e..d1fd0753a 100644 ---- a/libfreeipmi/interface/ipmi-rmcpplus-interface.c -+++ b/libfreeipmi/interface/ipmi-rmcpplus-interface.c -@@ -1134,7 +1134,7 @@ _construct_session_trlr_authentication_code (uint8_t integrity_algorithm, - { - hash_algorithm = IPMI_CRYPT_HASH_MD5; - hash_flags = 0; -- expected_digest_len = MD5_DIGEST_LENGTH; -+ expected_digest_len = IPMI_MD5_DIGEST_LENGTH; - copy_digest_len = IPMI_MD5_128_AUTHENTICATION_CODE_LENGTH; - } - else /* IPMI_INTEGRITY_ALGORITHM_HMAC_SHA256_128 */ -diff --git a/libfreeipmi/libcommon/ipmi-md2.c b/libfreeipmi/libcommon/ipmi-md2.c -index 6e9386be7..076b555bd 100644 ---- a/libfreeipmi/libcommon/ipmi-md2.c -+++ b/libfreeipmi/libcommon/ipmi-md2.c -@@ -101,15 +101,15 @@ static unsigned char S[256] = - 0xDB, 0x99, 0x8D, 0x33, 0x9F, 0x11, 0x83, 0x14 - }; - --#define L ctx->l --#define X ctx->x --#define C ctx->c --#define M ctx->m --#define Mlen ctx->mlen --#define MD2_MAGIC 0xf00fd00d -+#define L ctx->l -+#define X ctx->x -+#define C ctx->c -+#define M ctx->m -+#define Mlen ctx->mlen -+#define IPMI_MD2_MAGIC 0xf00fd00d - - int --md2_init (md2_t *ctx) -+ipmi_md2_init (ipmi_md2_t *ctx) - { - - if (ctx == NULL) -@@ -118,26 +118,26 @@ md2_init (md2_t *ctx) - return (-1); - } - -- ctx->magic = MD2_MAGIC; -+ ctx->magic = IPMI_MD2_MAGIC; - - L = 0; - Mlen = 0; -- memset (X, '\0', MD2_BUFFER_LENGTH); -- memset (C, '\0', MD2_CHKSUM_LENGTH); -- memset (M, '\0', MD2_BLOCK_LENGTH); -+ memset (X, '\0', IPMI_MD2_BUFFER_LENGTH); -+ memset (C, '\0', IPMI_MD2_CHKSUM_LENGTH); -+ memset (M, '\0', IPMI_MD2_BLOCK_LENGTH); - - return (0); - } - - static void --_md2_update_digest_and_checksum (md2_t *ctx) -+_ipmi_md2_update_digest_and_checksum (ipmi_md2_t *ctx) - { - unsigned int j, k; - uint8_t c, t; - - /* Update X */ - -- for (j = 0; j < MD2_BLOCK_LENGTH; j++) -+ for (j = 0; j < IPMI_MD2_BLOCK_LENGTH; j++) - { - X[16+j] = M[j]; - X[32+j] = (X[16+j] ^ X[j]); -@@ -145,9 +145,9 @@ _md2_update_digest_and_checksum (md2_t *ctx) - - t = 0; - -- for (j = 0; j < MD2_ROUNDS_LENGTH; j++) -+ for (j = 0; j < IPMI_MD2_ROUNDS_LENGTH; j++) - { -- for (k = 0; k < MD2_BUFFER_LENGTH; k++) -+ for (k = 0; k < IPMI_MD2_BUFFER_LENGTH; k++) - { - t = X[k] = (X[k] ^ S[t]); - } -@@ -166,7 +166,7 @@ _md2_update_digest_and_checksum (md2_t *ctx) - * Set C[j] to C[j] xor S[c xor L]. - */ - -- for (j = 0; j < MD2_BLOCK_LENGTH; j++) -+ for (j = 0; j < IPMI_MD2_BLOCK_LENGTH; j++) - { - c = M[j]; - C[j] = C[j] ^ S[c ^ L]; -@@ -175,10 +175,10 @@ _md2_update_digest_and_checksum (md2_t *ctx) - } - - int --md2_update_data (md2_t *ctx, const void *buf, unsigned int buflen) -+ipmi_md2_update_data (ipmi_md2_t *ctx, const void *buf, unsigned int buflen) - { - -- if (ctx == NULL || ctx->magic != MD2_MAGIC || buf == NULL) -+ if (ctx == NULL || ctx->magic != IPMI_MD2_MAGIC || buf == NULL) - { - errno = EINVAL; - return (-1); -@@ -187,19 +187,19 @@ md2_update_data (md2_t *ctx, const void *buf, unsigned int buflen) - if (buflen == 0) - return (0); - -- if ((Mlen + buflen) >= MD2_BLOCK_LENGTH) -+ if ((Mlen + buflen) >= IPMI_MD2_BLOCK_LENGTH) - { - unsigned int bufcount; - -- bufcount = (MD2_BLOCK_LENGTH - Mlen); -+ bufcount = (IPMI_MD2_BLOCK_LENGTH - Mlen); - memcpy (M + Mlen, buf, bufcount); -- _md2_update_digest_and_checksum (ctx); -+ _ipmi_md2_update_digest_and_checksum (ctx); - -- while ((buflen - bufcount) >= MD2_BLOCK_LENGTH) -+ while ((buflen - bufcount) >= IPMI_MD2_BLOCK_LENGTH) - { -- memcpy (M, buf + bufcount, MD2_BLOCK_LENGTH); -- bufcount += MD2_BLOCK_LENGTH; -- _md2_update_digest_and_checksum (ctx); -+ memcpy (M, buf + bufcount, IPMI_MD2_BLOCK_LENGTH); -+ bufcount += IPMI_MD2_BLOCK_LENGTH; -+ _ipmi_md2_update_digest_and_checksum (ctx); - } - - Mlen = buflen - bufcount; -@@ -217,33 +217,33 @@ md2_update_data (md2_t *ctx, const void *buf, unsigned int buflen) - } - - static void --_md2_append_padding_and_checksum (md2_t *ctx) -+_ipmi_md2_append_padding_and_checksum (ipmi_md2_t *ctx) - { - unsigned int padlen; - int padindex; - -- padlen = MD2_PADDING_LENGTH - Mlen; -+ padlen = IPMI_MD2_PADDING_LENGTH - Mlen; - padindex = padlen - 1; - -- md2_update_data (ctx, padding[padindex], padlen); -+ ipmi_md2_update_data (ctx, padding[padindex], padlen); - -- md2_update_data (ctx, C, MD2_CHKSUM_LENGTH); -+ ipmi_md2_update_data (ctx, C, IPMI_MD2_CHKSUM_LENGTH); - } - - int --md2_finish (md2_t *ctx, void *digest, unsigned int digestlen) -+ipmi_md2_finish (ipmi_md2_t *ctx, void *digest, unsigned int digestlen) - { -- if (ctx == NULL || ctx->magic != MD2_MAGIC -- || digest == NULL || digestlen < MD2_DIGEST_LENGTH) -+ if (ctx == NULL || ctx->magic != IPMI_MD2_MAGIC -+ || digest == NULL || digestlen < IPMI_MD2_DIGEST_LENGTH) - { - errno = EINVAL; - return (-1); - } - -- _md2_append_padding_and_checksum (ctx); -- memcpy (digest, X, MD2_DIGEST_LENGTH); -+ _ipmi_md2_append_padding_and_checksum (ctx); -+ memcpy (digest, X, IPMI_MD2_DIGEST_LENGTH); - -- ctx->magic = ~MD2_MAGIC; -- return (MD2_DIGEST_LENGTH); -+ ctx->magic = ~IPMI_MD2_MAGIC; -+ return (IPMI_MD2_DIGEST_LENGTH); - } - -diff --git a/libfreeipmi/libcommon/ipmi-md2.h b/libfreeipmi/libcommon/ipmi-md2.h -index c102fce2c..05328e85e 100644 ---- a/libfreeipmi/libcommon/ipmi-md2.h -+++ b/libfreeipmi/libcommon/ipmi-md2.h -@@ -34,26 +34,26 @@ - - #include - --#define MD2_BLOCK_LENGTH 16 --#define MD2_BUFFER_LENGTH 48 --#define MD2_CHKSUM_LENGTH 16 --#define MD2_DIGEST_LENGTH 16 --#define MD2_PADDING_LENGTH 16 --#define MD2_ROUNDS_LENGTH 18 -- --typedef struct __md2 { -+#define IPMI_MD2_BLOCK_LENGTH 16 -+#define IPMI_MD2_BUFFER_LENGTH 48 -+#define IPMI_MD2_CHKSUM_LENGTH 16 -+#define IPMI_MD2_DIGEST_LENGTH 16 -+#define IPMI_MD2_PADDING_LENGTH 16 -+#define IPMI_MD2_ROUNDS_LENGTH 18 -+ -+typedef struct __ipmi_md2 { - uint32_t magic; - uint8_t l; - unsigned int mlen; -- uint8_t x[MD2_BUFFER_LENGTH]; -- uint8_t c[MD2_CHKSUM_LENGTH]; -- uint8_t m[MD2_BLOCK_LENGTH]; --} md2_t; -+ uint8_t x[IPMI_MD2_BUFFER_LENGTH]; -+ uint8_t c[IPMI_MD2_CHKSUM_LENGTH]; -+ uint8_t m[IPMI_MD2_BLOCK_LENGTH]; -+} ipmi_md2_t; - --int md2_init (md2_t *ctx); -+int ipmi_md2_init (ipmi_md2_t *ctx); - --int md2_update_data (md2_t *ctx, const void *buf, unsigned int buflen); -+int ipmi_md2_update_data (ipmi_md2_t *ctx, const void *buf, unsigned int buflen); - --int md2_finish (md2_t *ctx, void *digest, unsigned int digestlen); -+int ipmi_md2_finish (ipmi_md2_t *ctx, void *digest, unsigned int digestlen); - - #endif /* IPMI_MD2_H */ -diff --git a/libfreeipmi/libcommon/ipmi-md5.c b/libfreeipmi/libcommon/ipmi-md5.c -index 17073b85f..c84e350a6 100644 ---- a/libfreeipmi/libcommon/ipmi-md5.c -+++ b/libfreeipmi/libcommon/ipmi-md5.c -@@ -92,7 +92,7 @@ static uint32_t T[64] = - #define D ctx->d - #define M ctx->m - #define Mlen ctx->mlen --#define MD5_MAGIC 0xfb0fdb0d -+#define IPMI_MD5_MAGIC 0xfb0fdb0d - - #define F(x,y,z) (((x) & (y)) | ((~(x)) & (z))) - #define G(x,y,z) (((x) & (z)) | ((y) & (~(z)))) -@@ -126,7 +126,7 @@ static uint32_t T[64] = - } while (0) - - int --md5_init (md5_t *ctx) -+ipmi_md5_init (ipmi_md5_t *ctx) - { - if (ctx == NULL) - { -@@ -134,13 +134,13 @@ md5_init (md5_t *ctx) - return (-1); - } - -- ctx->magic = MD5_MAGIC; -+ ctx->magic = IPMI_MD5_MAGIC; - - Mlen = 0; - ctx->bytes_mod_64 = 0; - ctx->bit_count[0] = 0; - ctx->bit_count[1] = 0; -- memset (M, '\0', MD5_BLOCK_LENGTH); -+ memset (M, '\0', IPMI_MD5_BLOCK_LENGTH); - - /* initial values are listed low-order byte first */ - A = 0x67452301; -@@ -152,16 +152,16 @@ md5_init (md5_t *ctx) - } - - static void --_md5_update_digest (md5_t *ctx) -+_ipmi_md5_update_digest (ipmi_md5_t *ctx) - { - uint32_t AA, BB, CC, DD; -- uint32_t X[MD5_BLOCK_WORDS_LENGTH]; -+ uint32_t X[IPMI_MD5_BLOCK_WORDS_LENGTH]; - unsigned int j; - - /* Note there are no endian issues here, compiler is required to - * handle shifts correctly - */ -- for (j = 0; j < MD5_BLOCK_WORDS_LENGTH; j++) -+ for (j = 0; j < IPMI_MD5_BLOCK_WORDS_LENGTH; j++) - X[j] = ((uint32_t)M[j*4] - | ((uint32_t)M[j*4+1] << 8) - | ((uint32_t)M[j*4+2] << 16) -@@ -251,7 +251,7 @@ _md5_update_digest (md5_t *ctx) - } - - static void --_md5_update_count (md5_t *ctx, unsigned int buflen) -+_ipmi_md5_update_count (ipmi_md5_t *ctx, unsigned int buflen) - { - - /* Use two uint32_t integers to hold our 64 bit count. -@@ -272,10 +272,10 @@ _md5_update_count (md5_t *ctx, unsigned int buflen) - } - - int --md5_update_data (md5_t *ctx, const void *buf, unsigned int buflen) -+ipmi_md5_update_data (ipmi_md5_t *ctx, const void *buf, unsigned int buflen) - { - -- if (ctx == NULL || ctx->magic != MD5_MAGIC || buf == NULL) -+ if (ctx == NULL || ctx->magic != IPMI_MD5_MAGIC || buf == NULL) - { - errno = EINVAL; - return (-1); -@@ -284,28 +284,28 @@ md5_update_data (md5_t *ctx, const void *buf, unsigned int buflen) - if (buflen == 0) - return (0); - -- if ((Mlen + buflen) >= MD5_BLOCK_LENGTH) -+ if ((Mlen + buflen) >= IPMI_MD5_BLOCK_LENGTH) - { - unsigned int bufcount; - -- bufcount = (MD5_BLOCK_LENGTH - Mlen); -+ bufcount = (IPMI_MD5_BLOCK_LENGTH - Mlen); - memcpy (M + Mlen, buf, bufcount); -- _md5_update_digest (ctx); -- _md5_update_count (ctx, bufcount); -+ _ipmi_md5_update_digest (ctx); -+ _ipmi_md5_update_count (ctx, bufcount); - -- while ((buflen - bufcount) >= MD5_BLOCK_LENGTH) -+ while ((buflen - bufcount) >= IPMI_MD5_BLOCK_LENGTH) - { -- memcpy (M, buf + bufcount, MD5_BLOCK_LENGTH); -- bufcount += MD5_BLOCK_LENGTH; -- _md5_update_digest (ctx); -- _md5_update_count (ctx, MD5_BLOCK_LENGTH); -+ memcpy (M, buf + bufcount, IPMI_MD5_BLOCK_LENGTH); -+ bufcount += IPMI_MD5_BLOCK_LENGTH; -+ _ipmi_md5_update_digest (ctx); -+ _ipmi_md5_update_count (ctx, IPMI_MD5_BLOCK_LENGTH); - } - - Mlen = buflen - bufcount; - if (Mlen > 0) - { - memcpy (M, buf + bufcount, Mlen); -- _md5_update_count (ctx, Mlen); -+ _ipmi_md5_update_count (ctx, Mlen); - } - } - else -@@ -313,14 +313,14 @@ md5_update_data (md5_t *ctx, const void *buf, unsigned int buflen) - /* Not enough data to update digest, just copy in data */ - memcpy (M + Mlen, buf, buflen); - Mlen += buflen; -- _md5_update_count (ctx, buflen); -+ _ipmi_md5_update_count (ctx, buflen); - } - - return (buflen); - } - - static void --_md5_append_padding_and_length (md5_t *ctx) -+_ipmi_md5_append_padding_and_length (ipmi_md5_t *ctx) - { - unsigned int padlen; - char length[8]; -@@ -348,23 +348,23 @@ _md5_append_padding_and_length (md5_t *ctx) - length[6] = (ctx->bit_count[0] & 0x00ff0000) >> 16; - length[7] = (ctx->bit_count[0] & 0xff000000) >> 24; - -- md5_update_data (ctx, padding, padlen); -- md5_update_data (ctx, length, 8); -+ ipmi_md5_update_data (ctx, padding, padlen); -+ ipmi_md5_update_data (ctx, length, 8); - } - - int --md5_finish (md5_t *ctx, void *digest, unsigned int digestlen) -+ipmi_md5_finish (ipmi_md5_t *ctx, void *digest, unsigned int digestlen) - { -- uint8_t buf[MD5_DIGEST_LENGTH]; -+ uint8_t buf[IPMI_MD5_DIGEST_LENGTH]; - -- if (ctx == NULL || ctx->magic != MD5_MAGIC -- || digest == NULL || digestlen < MD5_DIGEST_LENGTH) -+ if (ctx == NULL || ctx->magic != IPMI_MD5_MAGIC -+ || digest == NULL || digestlen < IPMI_MD5_DIGEST_LENGTH) - { - errno = EINVAL; - return (-1); - } - -- _md5_append_padding_and_length (ctx); -+ _ipmi_md5_append_padding_and_length (ctx); - - /* Note there are no endian issues here, compiler is required to - * handle bitmasks and shifts correctly -@@ -387,7 +387,7 @@ md5_finish (md5_t *ctx, void *digest, unsigned int digestlen) - buf[14] = (D & 0x00ff0000) >> 16; - buf[15] = (D & 0xff000000) >> 24; - -- memcpy (digest, buf, MD5_DIGEST_LENGTH); -- ctx->magic = ~MD5_MAGIC; -- return (MD5_DIGEST_LENGTH); -+ memcpy (digest, buf, IPMI_MD5_DIGEST_LENGTH); -+ ctx->magic = ~IPMI_MD5_MAGIC; -+ return (IPMI_MD5_DIGEST_LENGTH); - } -diff --git a/libfreeipmi/libcommon/ipmi-md5.h b/libfreeipmi/libcommon/ipmi-md5.h -index 0f86f1754..6b863ef36 100644 ---- a/libfreeipmi/libcommon/ipmi-md5.h -+++ b/libfreeipmi/libcommon/ipmi-md5.h -@@ -34,11 +34,11 @@ - - #include - --#define MD5_BLOCK_LENGTH 64 --#define MD5_BLOCK_WORDS_LENGTH (MD5_BLOCK_LENGTH/4) --#define MD5_DIGEST_LENGTH 16 -+#define IPMI_MD5_BLOCK_LENGTH 64 -+#define IPMI_MD5_BLOCK_WORDS_LENGTH (IPMI_MD5_BLOCK_LENGTH/4) -+#define IPMI_MD5_DIGEST_LENGTH 16 - --typedef struct __md5 { -+typedef struct __ipmi_md5 { - uint32_t magic; - unsigned int mlen; - unsigned int bytes_mod_64; -@@ -47,13 +47,13 @@ typedef struct __md5 { - uint32_t b; - uint32_t c; - uint32_t d; -- uint8_t m[MD5_BLOCK_LENGTH]; --} md5_t; -+ uint8_t m[IPMI_MD5_BLOCK_LENGTH]; -+} ipmi_md5_t; - --int md5_init (md5_t *ctx); -+int ipmi_md5_init (ipmi_md5_t *ctx); - --int md5_update_data (md5_t *ctx, const void *buf, unsigned int buflen); -+int ipmi_md5_update_data (ipmi_md5_t *ctx, const void *buf, unsigned int buflen); - --int md5_finish (md5_t *ctx, void *digest, unsigned int digestlen); -+int ipmi_md5_finish (ipmi_md5_t *ctx, void *digest, unsigned int digestlen); - - #endif /* IPMI_MD5_H */ -diff --git a/libfreeipmi/util/ipmi-lan-util.c b/libfreeipmi/util/ipmi-lan-util.c -index cd269fcb9..a374acc8d 100644 ---- a/libfreeipmi/util/ipmi-lan-util.c -+++ b/libfreeipmi/util/ipmi-lan-util.c -@@ -281,33 +281,33 @@ ipmi_lan_check_session_authentication_code (fiid_obj_t obj_lan_session_hdr_rs, - - if (authentication_type == IPMI_AUTHENTICATION_TYPE_MD2) - { -- md2_t ctx; -- -- assert (IPMI_1_5_MAX_PASSWORD_LENGTH == MD2_DIGEST_LENGTH); -- -- md2_init (&ctx); -- md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); -- md2_update_data (&ctx, session_id_buf, session_id_len); -- md2_update_data (&ctx, buf, len); -- md2_update_data (&ctx, session_sequence_number_buf, session_sequence_number_len); -- md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); -- md2_finish (&ctx, authentication_code_calc, IPMI_1_5_MAX_PASSWORD_LENGTH); -- md2_init (&ctx); -+ ipmi_md2_t ctx; -+ -+ assert (IPMI_1_5_MAX_PASSWORD_LENGTH == IPMI_MD2_DIGEST_LENGTH); -+ -+ ipmi_md2_init (&ctx); -+ ipmi_md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); -+ ipmi_md2_update_data (&ctx, session_id_buf, session_id_len); -+ ipmi_md2_update_data (&ctx, buf, len); -+ ipmi_md2_update_data (&ctx, session_sequence_number_buf, session_sequence_number_len); -+ ipmi_md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); -+ ipmi_md2_finish (&ctx, authentication_code_calc, IPMI_1_5_MAX_PASSWORD_LENGTH); -+ ipmi_md2_init (&ctx); - } - else if (authentication_type == IPMI_AUTHENTICATION_TYPE_MD5) - { -- md5_t ctx; -- -- assert (IPMI_1_5_MAX_PASSWORD_LENGTH == MD5_DIGEST_LENGTH); -- -- md5_init (&ctx); -- md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); -- md5_update_data (&ctx, session_id_buf, session_id_len); -- md5_update_data (&ctx, buf, len); -- md5_update_data (&ctx, session_sequence_number_buf, session_sequence_number_len); -- md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); -- md5_finish (&ctx, authentication_code_calc, IPMI_1_5_MAX_PASSWORD_LENGTH); -- md5_init (&ctx); -+ ipmi_md5_t ctx; -+ -+ assert (IPMI_1_5_MAX_PASSWORD_LENGTH == IPMI_MD5_DIGEST_LENGTH); -+ -+ ipmi_md5_init (&ctx); -+ ipmi_md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); -+ ipmi_md5_update_data (&ctx, session_id_buf, session_id_len); -+ ipmi_md5_update_data (&ctx, buf, len); -+ ipmi_md5_update_data (&ctx, session_sequence_number_buf, session_sequence_number_len); -+ ipmi_md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); -+ ipmi_md5_finish (&ctx, authentication_code_calc, IPMI_1_5_MAX_PASSWORD_LENGTH); -+ ipmi_md5_init (&ctx); - } - } - -@@ -451,45 +451,45 @@ ipmi_lan_check_packet_session_authentication_code (const void *pkt, - memcpy (pwbuf, authentication_code_data, authentication_code_data_len); - if (authentication_type == IPMI_AUTHENTICATION_TYPE_MD2) - { -- md2_t ctx; -- -- assert (IPMI_1_5_MAX_PASSWORD_LENGTH == MD2_DIGEST_LENGTH); -- -- md2_init (&ctx); -- md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); -- md2_update_data (&ctx, -- pkt + session_id_offset, -- session_id_len); -- md2_update_data (&ctx, -- pkt + data_offset, -- pkt_len - data_offset); -- md2_update_data (&ctx, -- pkt + session_sequence_number_offset, -- session_sequence_number_len); -- md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); -- md2_finish (&ctx, authentication_code_buf, IPMI_1_5_MAX_PASSWORD_LENGTH); -- md2_init (&ctx); -+ ipmi_md2_t ctx; -+ -+ assert (IPMI_1_5_MAX_PASSWORD_LENGTH == IPMI_MD2_DIGEST_LENGTH); -+ -+ ipmi_md2_init (&ctx); -+ ipmi_md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); -+ ipmi_md2_update_data (&ctx, -+ pkt + session_id_offset, -+ session_id_len); -+ ipmi_md2_update_data (&ctx, -+ pkt + data_offset, -+ pkt_len - data_offset); -+ ipmi_md2_update_data (&ctx, -+ pkt + session_sequence_number_offset, -+ session_sequence_number_len); -+ ipmi_md2_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); -+ ipmi_md2_finish (&ctx, authentication_code_buf, IPMI_1_5_MAX_PASSWORD_LENGTH); -+ ipmi_md2_init (&ctx); - } - else if (authentication_type == IPMI_AUTHENTICATION_TYPE_MD5) - { -- md5_t ctx; -- -- assert (IPMI_1_5_MAX_PASSWORD_LENGTH == MD5_DIGEST_LENGTH); -- -- md5_init (&ctx); -- md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); -- md5_update_data (&ctx, -- pkt + session_id_offset, -- session_id_len); -- md5_update_data (&ctx, -- pkt + data_offset, -- pkt_len - data_offset); -- md5_update_data (&ctx, -- pkt + session_sequence_number_offset, -- session_sequence_number_len); -- md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); -- md5_finish (&ctx, authentication_code_buf, IPMI_1_5_MAX_PASSWORD_LENGTH); -- md5_init (&ctx); -+ ipmi_md5_t ctx; -+ -+ assert (IPMI_1_5_MAX_PASSWORD_LENGTH == IPMI_MD5_DIGEST_LENGTH); -+ -+ ipmi_md5_init (&ctx); -+ ipmi_md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); -+ ipmi_md5_update_data (&ctx, -+ pkt + session_id_offset, -+ session_id_len); -+ ipmi_md5_update_data (&ctx, -+ pkt + data_offset, -+ pkt_len - data_offset); -+ ipmi_md5_update_data (&ctx, -+ pkt + session_sequence_number_offset, -+ session_sequence_number_len); -+ ipmi_md5_update_data (&ctx, pwbuf, IPMI_1_5_MAX_PASSWORD_LENGTH); -+ ipmi_md5_finish (&ctx, authentication_code_buf, IPMI_1_5_MAX_PASSWORD_LENGTH); -+ ipmi_md5_init (&ctx); - } - } - else /* authentication_type == IPMI_AUTHENTICATION_TYPE_STRAIGHT_PASSWORD_KEY diff --git a/package/freeipmi/freeipmi.hash b/package/freeipmi/freeipmi.hash index 05fb50bd4c7..bc22d2ff6b2 100644 --- a/package/freeipmi/freeipmi.hash +++ b/package/freeipmi/freeipmi.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 f25e1c35f3d0f1b5a99cc31ecc2353ca83ed46a15163842fba870127dc9c8206 freeipmi-1.6.9.tar.gz +sha256 fce4a1e401b6189c103d2b1203261d0bfbf45985c6f3fa44c51b186b13fe7a7d freeipmi-1.6.10.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 9fb59245b90..3e0ac0ffa95 100644 --- a/package/freeipmi/freeipmi.mk +++ b/package/freeipmi/freeipmi.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREEIPMI_VERSION = 1.6.9 +FREEIPMI_VERSION = 1.6.10 FREEIPMI_SITE = https://ftp.gnu.org/gnu/freeipmi FREEIPMI_LICENSE = GPL-3.0+, BSD-like (sunbmc) FREEIPMI_LICENSE_FILES = \ @@ -12,6 +12,8 @@ FREEIPMI_LICENSE_FILES = \ COPYING.ipmidetect COPYING.ipmi-fru COPYING.ipmimonitoring \ COPYING.ipmiping COPYING.ipmipower COPYING.ipmiseld COPYING.pstdout \ COPYING.sunbmc COPYING.ZRESEARCH +# We're patching configure.ac +FREEIPMI_AUTORECONF = YES FREEIPMI_DEPENDENCIES = host-pkgconf FREEIPMI_INSTALL_STAGING = YES # Disable checking for /dev/urandom and /dev/random through AC_CHECK_FILE @@ -20,7 +22,8 @@ FREEIPMI_CONF_OPTS = --without-random-device # Work around for uClibc or musl toolchains which lack argp_*() # functions. ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y) -FREEIPMI_DEPENDENCIES += argp-standalone +FREEIPMI_DEPENDENCIES += argp-standalone $(TARGET_NLS_DEPENDENCIES) +FREEIPMI_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) endif ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) diff --git a/package/freeradius-server/0001-jlibtool-cross-with-host-CC.patch b/package/freeradius-server/0001-jlibtool-cross-with-host-CC.patch new file mode 100644 index 00000000000..398f88e4ad9 --- /dev/null +++ b/package/freeradius-server/0001-jlibtool-cross-with-host-CC.patch @@ -0,0 +1,33 @@ +From 8a8506320acf3ea18940a6e3a447d7d394a3bd8e Mon Sep 17 00:00:00 2001 +From: David Gouarin +Date: Mon, 12 Apr 2021 11:05:54 -0500 +Subject: [PATCH] jlibtool cross with host CC + +jlibtool.c: while cross compiling, use host CC instead of target CC to build jlibtool + +Upstream: Not applicable + +Signed-off-by: David Gouarin +Signed-off-by: Matt Weber +--- + scripts/libtool.mk | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/scripts/libtool.mk b/scripts/libtool.mk +index 57915e1053..c28260dd7e 100644 +--- a/scripts/libtool.mk ++++ b/scripts/libtool.mk +@@ -43,8 +43,8 @@ ifeq "${LIBTOOL}" "JLIBTOOL" + # binary! + ${JLIBTOOL}: ${top_makedir}/jlibtool.c + $(Q)mkdir -p $(dir $@) +- $(Q)echo CC jlibtool.c +- $(Q)${CC} $< -o $@ ++ $(Q)echo HOSTCC jlibtool.c ++ $(Q)${HOSTCC} $< -o $@ + + clean: jlibtool_clean + +-- +2.17.1 + diff --git a/package/freeradius-server/0002-configure.ac-add-option-for-libcap.patch b/package/freeradius-server/0002-configure.ac-add-option-for-libcap.patch new file mode 100644 index 00000000000..77ef3d180fe --- /dev/null +++ b/package/freeradius-server/0002-configure.ac-add-option-for-libcap.patch @@ -0,0 +1,75 @@ +From 404f18da62e3708c9b290ee4eaf8461911df5475 Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Thu, 22 Aug 2019 10:50:21 +0800 +Subject: [PATCH] configure.ac: add option for libcap + +Upstream-Status: Pending + +Signed-off-by: Jackie Huang +Signed-off-by: Changqing Li + +Fetch from: http://cgit.openembedded.org/meta-openembedded/tree/meta-networking/recipes-connectivity/freeradius/files +Signed-off-by: David Gouarin +Signed-off-by: Matt Weber +Upstream: https://github.com/FreeRADIUS/freeradius-server/pull/4632 +--- + configure.ac | 36 +++++++++++++++++++++++++++--------- + 1 file changed, 27 insertions(+), 9 deletions(-) + +diff --git a/configure.ac b/configure.ac +index c72511ab39..de016b28e5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -941,6 +941,22 @@ fi + dnl Set by FR_SMART_CHECKLIB + LIBS="${old_LIBS}" + ++dnl # ++dnl # extra argument: --with-libcap ++dnl # ++WITH_LIBCAP=yes ++AC_ARG_WITH(libcap, ++[ --with-licap use licap for debugger checks. (default=yes)], ++[ case "$withval" in ++ no) ++ WITH_LIBCAP=no ++ ;; ++ *) ++ WITH_LIBCAP=yes ++ ;; ++ esac ] ++) ++ + dnl Check for cap + dnl extra argument: --with-cap-lib-dir=DIR + cap_lib_dir= +@@ -974,15 +990,17 @@ AC_ARG_WITH(cap-include-dir, + ;; + esac]) + +-smart_try_dir="$cap_lib_dir" +-FR_SMART_CHECK_LIB(cap, cap_get_proc) +-if test "x$ac_cv_lib_cap_cap_get_proc" != "xyes"; then +- AC_MSG_WARN([cap library not found, debugger checks will not be enabled. Use --with-cap-lib-dir=.]) +-else +- AC_DEFINE(HAVE_LIBCAP, 1, +- [Define to 1 if you have the `cap' library (-lcap).] +- ) +- HAVE_LIBCAP=1 ++if test "x$WITH_LIBCAP" = xyes; then ++ smart_try_dir="$cap_lib_dir" ++ FR_SMART_CHECK_LIB(cap, cap_get_proc) ++ if test "x$ac_cv_lib_cap_cap_get_proc" != "xyes"; then ++ AC_MSG_WARN([cap library not found, debugger checks will not be enabled. Use --with-cap-lib-dir=.]) ++ else ++ AC_DEFINE(HAVE_LIBCAP, 1, ++ [Define to 1 if you have the `cap' library (-lcap).] ++ ) ++ HAVE_LIBCAP=1 ++ fi + fi + + dnl # +-- +2.17.1 + diff --git a/package/freeradius-server/0003-configure.ac-allow-cross-compilation.patch b/package/freeradius-server/0003-configure.ac-allow-cross-compilation.patch new file mode 100644 index 00000000000..d6d1bcfc78a --- /dev/null +++ b/package/freeradius-server/0003-configure.ac-allow-cross-compilation.patch @@ -0,0 +1,42 @@ +From d6c1da041da77902a06d10bf03ef454468921801 Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Tue, 24 Jul 2018 15:03:39 +0800 +Subject: [PATCH] configure.ac: allow cross-compilation + +The checking OpenSSL library and header version consistency will +always fail in cross compiling, skip the check and give a warning +instead for cross compiling. + +Upstream-Status: Inappropriate[embedded specific] + +Signed-off-by: Jackie Huang +Signed-off-by: Yi Zhao + +update to new version 3.0.17 to fix patch warning +Signed-off-by: Changqing Li + +Fetch from: http://cgit.openembedded.org/meta-openembedded/tree/meta-networking/recipes-connectivity/freeradius/files +Signed-off-by: David Gouarin +Signed-off-by: Matt Weber +Upstream: https://github.com/FreeRADIUS/freeradius-server/pull/4632 +--- + src/modules/rlm_krb5/configure.ac | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/modules/rlm_krb5/configure.ac b/src/modules/rlm_krb5/configure.ac +index efc9f29d7f..98a97e438a 100644 +--- a/src/modules/rlm_krb5/configure.ac ++++ b/src/modules/rlm_krb5/configure.ac +@@ -137,7 +137,8 @@ if test x$with_[]modname != xno; then + FR_SMART_CHECK_LIB(krb5, krb5_is_thread_safe) + if test "x$ac_cv_lib_krb5_krb5_is_thread_safe" = xyes; then + AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include ]], [[return krb5_is_thread_safe() ? 0 : 1]])], +- [krb5threadsafe="-DKRB5_IS_THREAD_SAFE"], [AC_MSG_WARN([[libkrb5 is not threadsafe]])]) ++ [krb5threadsafe="-DKRB5_IS_THREAD_SAFE"], [AC_MSG_WARN([[libkrb5 is not threadsafe]])], ++ [AC_MSG_WARN(cross compiling: not checking)]) + fi + else + krb5threadsafe="" +-- +2.17.1 + diff --git a/package/freeradius-server/0004-fix-error-for-expansion-of-macro-in-thread.h.patch b/package/freeradius-server/0004-fix-error-for-expansion-of-macro-in-thread.h.patch new file mode 100644 index 00000000000..00eb63c0f2c --- /dev/null +++ b/package/freeradius-server/0004-fix-error-for-expansion-of-macro-in-thread.h.patch @@ -0,0 +1,66 @@ +From dae3b7c53171dfeacce91e0da1c8bd4e4166352e Mon Sep 17 00:00:00 2001 +From: Yi Zhao +Date: Wed, 18 Jan 2017 14:59:39 +0800 +Subject: [PATCH] fix error for expansion of macro in thread.h + +The parameter declaration is missing in expansion of macro +which cause the build error: +| In file included from src/freeradius-devel/libradius.h:80:0, +| from src/lib/log.c:26: +| src/lib/log.c: In function '__fr_thread_local_destroy_fr_strerror_buffer': +| src/lib/log.c:37:31: error: 'fr_strerror_buffer' undeclared (first use in this function) +| fr_thread_local_setup(char *, fr_strerror_buffer) /* macro */ +| ^ + +Add the missing declaration in macro. + +Upstream-Status: Pending + +Signed-off-by: Yi Zhao + +Fetch from: http://cgit.openembedded.org/meta-openembedded/tree/meta-networking/recipes-connectivity/freeradius/files +Signed-off-by: David Gouarin +Signed-off-by: Matt Weber +Upstream: N/A, code has changed +--- + src/include/threads.h | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/include/threads.h b/src/include/threads.h +index e36d81dac0..2bcb6aadcb 100644 +--- a/src/include/threads.h ++++ b/src/include/threads.h +@@ -89,7 +89,7 @@ static _t __fr_thread_local_init_##_n(pthread_destructor_t func)\ + # define fr_thread_local_get(_n) _n + #elif defined(HAVE_PTHREAD_H) + # include +-# define fr_thread_local_setup(_t, _n) \ ++# define fr_thread_local_setup(_t, _n) static __thread _t _n;\ + static pthread_key_t __fr_thread_local_key_##_n;\ + static pthread_once_t __fr_thread_local_once_##_n = PTHREAD_ONCE_INIT;\ + static pthread_destructor_t __fr_thread_local_destructor_##_n = NULL;\ +@@ -100,17 +100,17 @@ static void __fr_thread_local_destroy_##_n(UNUSED void *unused)\ + static void __fr_thread_local_key_init_##_n(void)\ + {\ + (void) pthread_key_create(&__fr_thread_local_key_##_n, __fr_thread_local_destroy_##_n);\ +- (void) pthread_setspecific(__fr_thread_local_key_##_n, &(_n));\ + }\ + static _t __fr_thread_local_init_##_n(pthread_destructor_t func)\ + {\ + __fr_thread_local_destructor_##_n = func;\ + if (_n) return _n; \ + (void) pthread_once(&__fr_thread_local_once_##_n, __fr_thread_local_key_init_##_n);\ ++ (void) pthread_setspecific(__fr_thread_local_key_##_n, &(_n));\ + return _n;\ + } +-# define fr_thread_local_init(_n, _f) __fr_thread_local_init_##_n(_f) +-# define fr_thread_local_set(_n, _v) __fr_thread_local_set_##_n(_v) +-# define fr_thread_local_get(_n) __fr_thread_local_get_##_n() ++# define fr_thread_local_init(_n, _f) __fr_thread_local_init_##_n(_f) ++# define fr_thread_local_set(_n, _v) ((int)!((_n = _v) || 1)) ++# define fr_thread_local_get(_n) _n + #endif + #endif +-- +2.17.1 + diff --git a/package/freeradius-server/0005-modules-rlm_sql-remove-mysql_version.h.patch b/package/freeradius-server/0005-modules-rlm_sql-remove-mysql_version.h.patch new file mode 100644 index 00000000000..42e8c2088c7 --- /dev/null +++ b/package/freeradius-server/0005-modules-rlm_sql-remove-mysql_version.h.patch @@ -0,0 +1,37 @@ +From 77b8c75f9904897768f87e20fef5d7739ddcd3c7 Mon Sep 17 00:00:00 2001 +From: Jared Bents +Date: Tue, 4 Feb 2020 08:22:11 -0600 +Subject: [PATCH] modules/rlm_sql: remove mysql_version.h + +remove mysql_version.h as mysql.h is included and mysql_version.h +should not be included by per the header file warning + +Upstream: http://lists.freeradius.org/pipermail/freeradius-devel/2021-April/014218.html + +Signed-off-by: Jared Bents +Signed-off-by: Matt Weber +[Applied upstream as https://github.com/FreeRADIUS/freeradius-server/commit/f20e80fce5f1b0589dccdf441b5d835188c0dfa2] +--- + src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c b/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c +index a7992647cd..ea44d0cc7a 100644 +--- a/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c ++++ b/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c +@@ -34,12 +34,10 @@ RCSID("$Id$") + #include "config.h" + + #ifdef HAVE_MYSQL_MYSQL_H +-# include + # include + # include + # include + #elif defined(HAVE_MYSQL_H) +-# include + # include + # include + # include +-- +2.17.1 + diff --git a/package/freeradius-server/0006-configure.ac-add-option-for-pcap.patch b/package/freeradius-server/0006-configure.ac-add-option-for-pcap.patch new file mode 100644 index 00000000000..266023dd79f --- /dev/null +++ b/package/freeradius-server/0006-configure.ac-add-option-for-pcap.patch @@ -0,0 +1,80 @@ +From 35494386a99a4e46be3a99849d2f48651e6ca268 Mon Sep 17 00:00:00 2001 +From: "Arnout Vandecappelle (Essensium/Mind)" +Date: Tue, 26 Jul 2022 18:01:48 +0200 +Subject: [PATCH] configure.ac: add option for pcap + +Signed-off-by: Arnout Vandecappelle (Essensium/Mind) +Upstream: https://github.com/FreeRADIUS/freeradius-server/pull/4632 +--- + configure.ac | 46 +++++++++++++++++++++++++++++++--------------- + 1 file changed, 31 insertions(+), 15 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 45d8e619e2..f760a5b236 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1004,6 +1004,20 @@ AC_CHECK_LIB(ws2_32, htonl) + dnl # + dnl # Check the pcap library for the RADIUS sniffer. + dnl # ++dnl extra argument: --with-pcap=yes/no ++WITH_PCAP=yes ++AC_ARG_WITH(pcap, ++[ --with-pcap use pcap library for the RADIUS sniffer. (default=yes)], ++[ case "$withval" in ++ no) ++ WITH_PCAP=no ++ ;; ++ *) ++ WITH_PCAP=yes ++ ;; ++ esac ] ++) ++ + dnl extra argument: --with-pcap-lib-dir=DIR + pcap_lib_dir= + AC_ARG_WITH(pcap-lib-dir, +@@ -1036,23 +1050,25 @@ AC_ARG_WITH(pcap-include-dir, + ;; + esac]) + +-smart_try_dir="$pcap_lib_dir" +-FR_SMART_CHECK_LIB(pcap, pcap_open_live) +-if test "x$ac_cv_lib_pcap_pcap_open_live" != "xyes"; then +- AC_MSG_WARN([pcap library not found, silently disabling the RADIUS sniffer, and ARP listener. Use --with-pcap-lib-dir=.]) +-else +- AC_CHECK_FUNCS(\ +- pcap_fopen_offline \ +- pcap_dump_fopen \ +- pcap_create \ +- pcap_activate +- ) ++if test "x$WITH_PCAP" = xyes; then ++ smart_try_dir="$pcap_lib_dir" ++ FR_SMART_CHECK_LIB(pcap, pcap_open_live) ++ if test "x$ac_cv_lib_pcap_pcap_open_live" != "xyes"; then ++ AC_MSG_WARN([pcap library not found, silently disabling the RADIUS sniffer, and ARP listener. Use --with-pcap-lib-dir=.]) ++ else ++ AC_CHECK_FUNCS(\ ++ pcap_fopen_offline \ ++ pcap_dump_fopen \ ++ pcap_create \ ++ pcap_activate ++ ) + +- PCAP_LIBS="${smart_lib}" +- PCAP_LDFLAGS="${smart_ldflags}" ++ PCAP_LIBS="${smart_lib}" ++ PCAP_LDFLAGS="${smart_ldflags}" ++ fi ++ dnl Set by FR_SMART_CHECK_LIB ++ LIBS="${old_LIBS}" + fi +-dnl Set by FR_SMART_CHECK_LIB +-LIBS="${old_LIBS}" + + dnl Check for collectdclient + dnl extra argument: --with-collectdclient-lib-dir=DIR +-- +2.35.3 + diff --git a/package/freeradius-server/0007-configure.ac-add-option-for-collectdclient.patch b/package/freeradius-server/0007-configure.ac-add-option-for-collectdclient.patch new file mode 100644 index 00000000000..67a19321845 --- /dev/null +++ b/package/freeradius-server/0007-configure.ac-add-option-for-collectdclient.patch @@ -0,0 +1,67 @@ +From b8c75df6e252a1c0648448d6d561826ee9c464dd Mon Sep 17 00:00:00 2001 +From: "Arnout Vandecappelle (Essensium/Mind)" +Date: Tue, 26 Jul 2022 18:02:21 +0200 +Subject: [PATCH] configure.ac: add option for collectdclient + +Signed-off-by: Arnout Vandecappelle (Essensium/Mind) +Upstream: https://github.com/FreeRADIUS/freeradius-server/pull/4632 +--- + configure.ac | 34 +++++++++++++++++++++++++--------- + 1 file changed, 25 insertions(+), 9 deletions(-) + +diff --git a/configure.ac b/configure.ac +index f760a5b236..f431da6db5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1070,6 +1070,20 @@ if test "x$WITH_PCAP" = xyes; then + LIBS="${old_LIBS}" + fi + ++dnl extra argument: --with-collectdclient=yes/no ++WITH_COLLECTDCLIENT=yes ++AC_ARG_WITH(collectdclient, ++[ --with-collectdclient use collectd client. (default=yes)], ++[ case "$withval" in ++ no) ++ WITH_COLLECTDCLIENT=no ++ ;; ++ *) ++ WITH_COLLECTDCLIENT=yes ++ ;; ++ esac ] ++) ++ + dnl Check for collectdclient + dnl extra argument: --with-collectdclient-lib-dir=DIR + collectdclient_lib_dir= +@@ -1103,16 +1117,18 @@ AC_ARG_WITH(collectdclient-include-dir, + ;; + esac]) + +-smart_try_dir="$collectdclient_lib_dir" +-FR_SMART_CHECK_LIB(collectdclient, lcc_connect) +-if test "x$ac_cv_lib_collectdclient_lcc_connect" != "xyes"; then +- AC_MSG_WARN([collectdclient library not found. Use --with-collectdclient-lib-dir=.]) +-else +- COLLECTDC_LIBS="${smart_lib}" +- COLLECTDC_LDFLAGS="${smart_ldflags}" ++if test "x$WITH_COLLECTDCLIENT" = xyes; then ++ smart_try_dir="$collectdclient_lib_dir" ++ FR_SMART_CHECK_LIB(collectdclient, lcc_connect) ++ if test "x$ac_cv_lib_collectdclient_lcc_connect" != "xyes"; then ++ AC_MSG_WARN([collectdclient library not found. Use --with-collectdclient-lib-dir=.]) ++ else ++ COLLECTDC_LIBS="${smart_lib}" ++ COLLECTDC_LDFLAGS="${smart_ldflags}" ++ fi ++ dnl Set by FR_SMART_CHECKLIB ++ LIBS="${old_LIBS}" + fi +-dnl Set by FR_SMART_CHECKLIB +-LIBS="${old_LIBS}" + + dnl # + dnl # extra argument: --with-libcap +-- +2.35.3 + diff --git a/package/freeradius-server/0008-configure.ac-try-execinfo-in-libc-before-searching-l.patch b/package/freeradius-server/0008-configure.ac-try-execinfo-in-libc-before-searching-l.patch new file mode 100644 index 00000000000..b4cbc61a89e --- /dev/null +++ b/package/freeradius-server/0008-configure.ac-try-execinfo-in-libc-before-searching-l.patch @@ -0,0 +1,71 @@ +From ba41a28cd526bccde4ec3db0998e1b00d3afc0e2 Mon Sep 17 00:00:00 2001 +From: "Arnout Vandecappelle (Essensium/Mind)" +Date: Tue, 26 Jul 2022 18:31:14 +0200 +Subject: [PATCH] configure.ac: try execinfo in libc before searching + libexecinfo + +execinfo is provided by glibc, so the usual case is that it is part of +libc. Do this before starting a redundant search for libexecinfo. + +This is especially relevant for cross-compilation, where +FR_SMART_CHECK_LIB can find an incompatible library. + +Signed-off-by: Arnout Vandecappelle (Essensium/Mind) +Upstream: https://github.com/FreeRADIUS/freeradius-server/pull/4632 +--- + configure.ac | 38 +++++++++++++++++++------------------- + 1 file changed, 19 insertions(+), 19 deletions(-) + +diff --git a/configure.ac b/configure.ac +index f431da6db5..faa7cfc2b4 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2165,26 +2165,26 @@ dnl # + smart_try_dir=$execinfo_include_dir + FR_SMART_CHECK_INCLUDE(execinfo.h) + if test "x$ac_cv_header_execinfo_h" = "xyes"; then +- smart_try_dir=$execinfo_lib_dir +- FR_SMART_CHECK_LIB(execinfo, backtrace_symbols) ++ dnl # Might be provided as part of libc ++ AC_MSG_CHECKING([if execinfo provided as part of libc]) ++ AC_TRY_LINK( ++ [ ++ #include ++ ], ++ [ ++ void *sym[1]; ++ backtrace_symbols(&sym, sizeof(sym)) ], ++ [ ++ AC_MSG_RESULT(yes) ++ ac_cv_lib_execinfo_backtrace_symbols="yes" ++ ], ++ [ ++ AC_MSG_RESULT(no) ++ ] ++ ) + if test "x$ac_cv_lib_execinfo_backtrace_symbols" != "xyes"; then +- dnl # Might be provided as part of libc +- AC_MSG_CHECKING([if execinfo provided as part of libc]) +- AC_TRY_LINK( +- [ +- #include +- ], +- [ +- void *sym[1]; +- backtrace_symbols(&sym, sizeof(sym)) ], +- [ +- AC_MSG_RESULT(yes) +- ac_cv_lib_execinfo_backtrace_symbols="yes" +- ], +- [ +- AC_MSG_RESULT(no) +- ] +- ) ++ smart_try_dir=$execinfo_lib_dir ++ FR_SMART_CHECK_LIB(execinfo, backtrace_symbols) + fi + + if test "x$ac_cv_lib_execinfo_backtrace_symbols" = "xyes"; then +-- +2.35.3 + diff --git a/package/freeradius-server/Config.in b/package/freeradius-server/Config.in new file mode 100644 index 00000000000..d51d92714d3 --- /dev/null +++ b/package/freeradius-server/Config.in @@ -0,0 +1,19 @@ +config BR2_PACKAGE_FREERADIUS_SERVER + bool "freeradius-server" + depends on BR2_USE_MMU # fork() + depends on !BR2_STATIC_LIBS # libtalloc + 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_LIBTALLOC + help + FreeRADIUS is an open source server which implements + a protocol for remote user Authorization, Authentication + and Accounting. + + http://wiki.freeradius.org/ + +comment "freeradius-server needs a glibc toolchain w/ threads" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_USES_GLIBC diff --git a/package/freeradius-server/freeradius-server.hash b/package/freeradius-server/freeradius-server.hash new file mode 100644 index 00000000000..33ec09e7b0b --- /dev/null +++ b/package/freeradius-server/freeradius-server.hash @@ -0,0 +1,4 @@ +# Locally computed, after checking +# ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-3.2.0.tar.bz2.sig +sha256 a3071cd78ffcb4706217561d822ee4c760daeb277a63f36a9f11d412c3c39e56 freeradius-server-3.2.0.tar.bz2 +sha256 0a0e46014fc2efd5144a30359c0e6e1ea9fa3dd407d3318204150efd7b4caf6a COPYRIGHT diff --git a/package/freeradius-server/freeradius-server.mk b/package/freeradius-server/freeradius-server.mk new file mode 100644 index 00000000000..af3320eb444 --- /dev/null +++ b/package/freeradius-server/freeradius-server.mk @@ -0,0 +1,227 @@ +################################################################################ +# +# freeradius-server +# +################################################################################ + +FREERADIUS_SERVER_VERSION = 3.2.0 +FREERADIUS_SERVER_SOURCE = \ + freeradius-server-$(FREERADIUS_SERVER_VERSION).tar.bz2 +FREERADIUS_SERVER_SITE = ftp://ftp.freeradius.org/pub/freeradius +FREERADIUS_SERVER_LICENSE = GPL-2.0 +FREERADIUS_SERVER_LICENSE_FILES = COPYRIGHT +FREERADIUS_SERVER_CPE_ID_VENDOR = freeradius +FREERADIUS_SERVER_CPE_ID_PRODUCT = freeradius +FREERADIUS_SERVER_DEPENDENCIES = libtalloc +FREERADIUS_SERVER_AUTORECONF = YES + +# We're patching src/modules/rlm_krb5/configure.ac +define FREERADIUS_SERVER_RUN_KRB5_AUTOCONF + cd $(@D)/src/modules/rlm_krb5; $(AUTOCONF) -I$(@D) +endef +FREERADIUS_SERVER_PRE_CONFIGURE_HOOKS += FREERADIUS_SERVER_RUN_KRB5_AUTOCONF + +# some compiler checks are not supported while cross compiling. +# instead of removing those checks, we cache the answers +FREERADIUS_SERVER_CONF_OPTS += \ + ax_cv_cc_bounded_attribute=no \ + ax_cv_cc_builtin_bswap64=no \ + ax_cv_cc_builtin_choose_expr=no \ + ax_cv_cc_builtin_types_compatible_p=no + +# Some paths are looked up in $PATH but used on the target. +# Set them explicitly so they are still valid if it's in some other +# place on the host. Note that some of those don't necessarily exist +# on the target - in that case, the script will simply fail to work. +# Note that some paths are actually used during the build, those +# shouldn't be set explicitly here! +FREERADIUS_SERVER_CONF_OPTS += \ + ac_cv_path_RUSERS=/usr/bin/rusers \ + ac_cv_path_SNMPGET=/usr/bin/snmpget \ + ac_cv_path_SNMPWALK=/usr/bin/snmpwalk + +# Modules for which we don't have the dependencies must be disabled +# explicitly, to avoid that they're searched on the host. +FREERADIUS_SERVER_CONF_OPTS += \ + --without-rlm_eap_ike \ + --without-rlm_eap_tnc \ + --without-rlm_mschap \ + --without-rlm_perl \ + --without-rlm_realm \ + --without-rlm_sql_iodbc \ + --without-rlm_sql_oracle \ + --without-rlm_sql_freetds \ + --without-rlm_yubikey + +ifeq ($(BR2_PACKAGE_COLLECTD),y) +FREERADIUS_SERVER_CONF_OPTS += --with-collectdclient +FREERADIUS_SERVER_DEPENDENCIES += collectd +else +FREERADIUS_SERVER_CONF_OPTS += --without-collectdclient +endif + +ifeq ($(BR2_PACKAGE_GDBM),y) +FREERADIUS_SERVER_CONF_OPTS += \ + --with-rlm_counter \ + --with-rlm_ippool +FREERADIUS_SERVER_DEPENDENCIES += gdbm +else +FREERADIUS_SERVER_CONF_OPTS += \ + --without-rlm_counter \ + --without-rlm_ippool +endif + +ifeq ($(BR2_PACKAGE_JSON_C)$(BR2_PACKAGE_LIBCURL),yy) +FREERADIUS_SERVER_CONF_OPTS += --with-rlm_rest +FREERADIUS_SERVER_DEPENDENCIES += json-c libcurl +else +FREERADIUS_SERVER_CONF_OPTS += --without-rlm_rest +endif + +ifeq ($(BR2_PACKAGE_LIBCAP),y) +FREERADIUS_SERVER_CONF_OPTS += --with-libcap +FREERADIUS_SERVER_DEPENDENCIES += libcap +else +FREERADIUS_SERVER_CONF_OPTS += --without-libcap +endif + +ifeq ($(BR2_PACKAGE_LIBKRB5),y) +FREERADIUS_SERVER_CONF_OPTS += \ + ac_cv_path_krb5_config=$(STAGING_DIR)/usr/bin/krb5-config \ + --with-rlm_krb5 +FREERADIUS_SERVER_DEPENDENCIES += libkrb5 +else +FREERADIUS_SERVER_CONF_OPTS += --without-rlm_krb5 +endif + +ifeq ($(BR2_PACKAGE_LIBPCAP),y) +FREERADIUS_SERVER_CONF_OPTS += --with-pcap +FREERADIUS_SERVER_DEPENDENCIES += libpcap +else +FREERADIUS_SERVER_CONF_OPTS += --without-pcap +endif + +ifeq ($(BR2_PACKAGE_LINUX_PAM),y) +FREERADIUS_SERVER_CONF_OPTS += --with-rlm_pam +FREERADIUS_SERVER_DEPENDENCIES += linux-pam +else +FREERADIUS_SERVER_CONF_OPTS += --without-rlm_pam +endif + +ifeq ($(BR2_PACKAGE_OPENLDAP),y) +FREERADIUS_SERVER_CONF_OPTS += --with-rlm_ldap +FREERADIUS_SERVER_DEPENDENCIES += openldap +else +FREERADIUS_SERVER_CONF_OPTS += --without-rlm_ldap +endif + +ifeq ($(BR2_PACKAGE_MEMCACHED),y) +FREERADIUS_SERVER_CONF_OPTS += --with-rlm_cache_memcached +FREERADIUS_SERVER_DEPENDENCIES += memcached +else +FREERADIUS_SERVER_CONF_OPTS += --without-rlm_cache_memcached +endif + +ifeq ($(BR2_PACKAGE_MYSQL),y) +FREERADIUS_SERVER_CONF_OPTS += --with-rlm_sql_mysql +FREERADIUS_SERVER_DEPENDENCIES += mysql +else +FREERADIUS_SERVER_CONF_OPTS += --without-rlm_sql_mysql +endif + +ifeq ($(BR2_PACKAGE_PCRE),y) +FREERADIUS_SERVER_CONF_OPTS += --with-pcre +FREERADIUS_SERVER_DEPENDENCIES += pcre +else +FREERADIUS_SERVER_CONF_OPTS += --without-pcre +endif + +ifeq ($(BR2_PACKAGE_PYTHON3),y) +FREERADIUS_SERVER_CONF_OPTS += --with-rlm_python +FREERADIUS_SERVER_DEPENDENCIES += python3 +else +FREERADIUS_SERVER_CONF_OPTS += --without-rlm_python +endif + +ifeq ($(BR2_PACKAGE_READLINE),y) +FREERADIUS_SERVER_CONF_OPTS += --with-readline +FREERADIUS_SERVER_DEPENDENCIES += readline +else +FREERADIUS_SERVER_CONF_OPTS += --without-readline +endif + +ifeq ($(BR2_PACKAGE_REDIS),y) +FREERADIUS_SERVER_CONF_OPTS += --with-rlm_redis --with-rlm_rediswho +FREERADIUS_SERVER_DEPENDENCIES += redis +else +FREERADIUS_SERVER_CONF_OPTS += --without-rlm_redis --without-rlm_rediswho +endif + +ifeq ($(BR2_PACKAGE_SQLITE),y) +FREERADIUS_SERVER_CONF_OPTS += --with-rlm_sql_sqlite +FREERADIUS_SERVER_DEPENDENCIES += sqlite +else +FREERADIUS_SERVER_CONF_OPTS += --without-rlm_sql_sqlite +endif + +ifeq ($(BR2_PACKAGE_UNIXODBC),y) +FREERADIUS_SERVER_CONF_OPTS += --with-rlm_sql_unixodbc +FREERADIUS_SERVER_DEPENDENCIES += unixodbc +else +FREERADIUS_SERVER_CONF_OPTS += --without-rlm_sql_unixodbc +endif + +ifeq ($(BR2_PACKAGE_POSTGRESQL),y) +FREERADIUS_SERVER_CONF_OPTS += --with-rlm_sql_postgresql +FREERADIUS_SERVER_DEPENDENCIES += postgresql +else +FREERADIUS_SERVER_CONF_OPTS += --without-rlm_sql_postgresql +endif + +ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) +FREERADIUS_SERVER_DEPENDENCIES += openssl +FREERADIUS_SERVER_CONF_OPTS += \ + --with-openssl \ + --with-rlm_eap \ + --with-rlm_eap_pwd +else +FREERADIUS_SERVER_CONF_OPTS += \ + --without-openssl \ + --without-rlm_eap \ + --without-rlm_eap_pwd +endif + +ifeq ($(BR2_PACKAGE_PCRE),y) +FREERADIUS_SERVER_CONF_OPTS += --with-pcre +FREERADIUS_SERVER_DEPENDENCIES += pcre +else +FREERADIUS_SERVER_CONF_OPTS += --without-pcre +endif + +ifeq ($(BR2_PACKAGE_RUBY),y) +FREERADIUS_SERVER_CONF_OPTS += --with-rlm_ruby +FREERADIUS_SERVER_DEPENDENCIES += ruby +else +FREERADIUS_SERVER_CONF_OPTS += --without-rlm_ruby +endif + +ifeq ($(BR2_INIT_SYSTEMD),y) +FREERADIUS_SERVER_CONF_OPTS += --with-systemd +FREERADIUS_SERVER_DEPENDENCIES += systemd +else +FREERADIUS_SERVER_CONF_OPTS += --without-systemd +endif + +# TARGET_DIR is set to empty to avoid creation of symlinks in hardcoded host directories +# freeradius Makefile does not support an alternate DESTDIR, instead it uses the magic $(R) variable +FREERADIUS_SERVER_MAKE_ENV = R=$(TARGET_DIR) TARGET_DIR="" + +# use MAKE1 because make install does not support parallel build +FREERADIUS_SERVER_MAKE = $(MAKE1) + +define FREERADIUS_SERVER_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 644 package/freeradius-server/radiusd.service \ + $(TARGET_DIR)/usr/lib/systemd/system/radiusd.service +endef + +$(eval $(autotools-package)) diff --git a/package/freeradius-server/radiusd.service b/package/freeradius-server/radiusd.service new file mode 100644 index 00000000000..1f29db09117 --- /dev/null +++ b/package/freeradius-server/radiusd.service @@ -0,0 +1,38 @@ +# Reference from: freeradius-server/redhat/radiusd.service + +[Unit] +Description=FreeRADIUS multi-protocol policy server +After=network-online.target +Documentation=man:radiusd(8) man:radiusd.conf(5) http://wiki.freeradius.org/ http://networkradius.com/doc/ + +[Service] +Type=notify +WatchdogSec=60 +NotifyAccess=all +EnvironmentFile=-/etc/default/radiusd + +# FreeRADIUS can do static evaluation of policy language rules based +# on environmental variables which is very useful for doing per-host +# customization. +# Unfortunately systemd does not allow variable substitutions such +# as %H or $(hostname) in the EnvironmentFile. +# We provide HOSTNAME here for convenience. +Environment=HOSTNAME=%H + +# Limit memory to 2G this is fine for %99.99 of deployments. FreeRADIUS +# is not memory hungry, if it's using more than this, then there's probably +# a leak somewhere. +MemoryLimit=2G + +ExecStartPre=/usr/sbin/radiusd $FREERADIUS_OPTIONS -Cx -lstdout +ExecStart=/usr/sbin/radiusd -f $FREERADIUS_OPTIONS +Restart=on-failure +RestartSec=5 +ExecReload=/usr/sbin/radiusd $FREERADIUS_OPTIONS -Cxm -lstdout +ExecReload=/bin/kill -HUP $MAINPID + +# Only allow native system calls +SystemCallArchitectures=native + +[Install] +WantedBy=multi-user.target diff --git a/package/freerdp/freerdp.hash b/package/freerdp/freerdp.hash index 28e733aa2f5..02268f55eaa 100644 --- a/package/freerdp/freerdp.hash +++ b/package/freerdp/freerdp.hash @@ -1,5 +1,5 @@ -# From https://pub.freerdp.com/releases/freerdp-2.6.1.tar.gz.sha256 -sha256 e4b3b93d102bc03164f592d26d7a06d6de648bf78b1e3dcbd8d62941431c1f28 freerdp-2.6.1.tar.gz +# From https://pub.freerdp.com/releases/freerdp-2.11.0.tar.gz.sha256 +sha256 8d08e638df21e67c3761462b4efb9e596576f58bd6886f902e6021cdd17d396e freerdp-2.11.0.tar.gz # Locally calculated sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk index a1791b27f09..6f71ef796fb 100644 --- a/package/freerdp/freerdp.mk +++ b/package/freerdp/freerdp.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREERDP_VERSION = 2.6.1 +FREERDP_VERSION = 2.11.0 FREERDP_SITE = https://pub.freerdp.com/releases FREERDP_DEPENDENCIES = libglib2 openssl zlib FREERDP_LICENSE = Apache-2.0 diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in index 4a4237fb42a..13d611b696d 100644 --- a/package/freescale-imx/Config.in +++ b/package/freescale-imx/Config.in @@ -115,6 +115,7 @@ source "package/freescale-imx/imx-vpuwrap/Config.in" source "package/freescale-imx/firmware-imx/Config.in" source "package/freescale-imx/imx-sc-firmware/Config.in" source "package/freescale-imx/imx-seco/Config.in" +source "package/freescale-imx/imx-vpu-hantro-daemon/Config.in" source "package/freescale-imx/imx-vpu-hantro-vc/Config.in" if (BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX51 || BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX53) source "package/freescale-imx/gpu-amd-bin-mx51/Config.in" diff --git a/package/freescale-imx/firmware-imx/Config.in b/package/freescale-imx/firmware-imx/Config.in index 06c4d8036c8..0c1913e2273 100644 --- a/package/freescale-imx/firmware-imx/Config.in +++ b/package/freescale-imx/firmware-imx/Config.in @@ -82,6 +82,16 @@ config BR2_PACKAGE_FIRMWARE_IMX_DDR3 endchoice # DDR training FW +config BR2_PACKAGE_FIRMWARE_IMX_DDR_VERSION + string "DDR3/DDR4/LPDDR4 firmware version" + # Needed for backward compatibility, the package used to + # unconditionally use HW version 201810 when DDR3/DDR4 was + # selected + default "201810" if BR2_PACKAGE_FIRMWARE_IMX_DDR3 || BR2_PACKAGE_FIRMWARE_IMX_DDR4 + help + Use a specific version of the imx ddr binaries. Leaving this + field empty will select the default version. + config BR2_PACKAGE_FIRMWARE_IMX_IMEM_LEN hex "(LP)DDR IMEM padding length" default 0x8000 diff --git a/package/freescale-imx/firmware-imx/firmware-imx.hash b/package/freescale-imx/firmware-imx/firmware-imx.hash index 98a0e730484..eb0c387af3c 100644 --- a/package/freescale-imx/firmware-imx/firmware-imx.hash +++ b/package/freescale-imx/firmware-imx/firmware-imx.hash @@ -1,4 +1,5 @@ # Locally calculated -sha256 6b6747bf36ecc53e385234afdce01f69c5775adf0d6685c885281ca6e4e322ef firmware-imx-8.12.bin -sha256 ea58636bf34f589048fcd46e38497c47229fde8498df086ff5fb52f9ef8e15ee COPYING -sha256 50099e283cfd307f84f159aeb1a6f462351320273dbcdb80d7f2c9db0494b71c EULA +sha256 937e196476b8e95b4b7f2501a14c8326d8a0649f8a3f9228b72373770a08deb3 firmware-imx-8.15.bin +sha256 35188e65dbb9c7da4bbcb77c7726e835607f9f41b8b44149806ea51429ca9a31 COPYING +sha256 30f61825583b4c26d29a798ad7e4c8ef2f2f390b1e964af302d2dc40e93cb0a4 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 211a43c4caa..4cceb670193 100644 --- a/package/freescale-imx/firmware-imx/firmware-imx.mk +++ b/package/freescale-imx/firmware-imx/firmware-imx.mk @@ -4,18 +4,22 @@ # ################################################################################ -FIRMWARE_IMX_VERSION = 8.12 +FIRMWARE_IMX_VERSION = 8.15 FIRMWARE_IMX_SITE = $(FREESCALE_IMX_SITE) FIRMWARE_IMX_SOURCE = firmware-imx-$(FIRMWARE_IMX_VERSION).bin FIRMWARE_IMX_LICENSE = NXP Semiconductor Software License Agreement -FIRMWARE_IMX_LICENSE_FILES = EULA COPYING +FIRMWARE_IMX_LICENSE_FILES = EULA COPYING SCR.txt FIRMWARE_IMX_REDISTRIBUTE = NO FIRMWARE_IMX_INSTALL_IMAGES = YES +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE),y) +FIRMWARE_IMX_DEPENDENCIES += linux-firmware +endif + define FIRMWARE_IMX_EXTRACT_CMDS - $(call FREESCALE_IMX_EXTRACT_HELPER,$(FIRMWARE_IMX_DL_DIR)/$(FIRMWARE_IMX_SOURCE)) + $(call NXP_EXTRACT_HELPER,$(FIRMWARE_IMX_DL_DIR)/$(FIRMWARE_IMX_SOURCE)) endef # @@ -36,6 +40,11 @@ define FIRMWARE_IMX_PREPARE_DDR_FW $(FIRMWARE_IMX_DDRFW_DIR)/$(strip $(3)).bin endef +FIRMWARE_IMX_DDR_VERSION = $(call qstrip,$(BR2_PACKAGE_FIRMWARE_IMX_DDR_VERSION)) +ifneq ($(FIRMWARE_IMX_DDR_VERSION),) +FIRMWARE_IMX_DDR_VERSION_SUFFIX = _$(FIRMWARE_IMX_DDR_VERSION) +endif + ifeq ($(BR2_PACKAGE_FIRMWARE_IMX_LPDDR4),y) FIRMWARE_IMX_DDRFW_DIR = $(@D)/firmware/ddr/synopsys @@ -44,9 +53,13 @@ define FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW # lpddr4_pmu_train_fw.bin is needed when generating imx8-boot-sd.bin # which is done in post-image script. $(call FIRMWARE_IMX_PREPARE_DDR_FW, \ - lpddr4_pmu_train_1d_imem,lpddr4_pmu_train_1d_dmem,lpddr4_pmu_train_1d_fw) + lpddr4_pmu_train_1d_imem$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), + lpddr4_pmu_train_1d_dmem$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), + lpddr4_pmu_train_1d_fw) $(call FIRMWARE_IMX_PREPARE_DDR_FW, \ - lpddr4_pmu_train_2d_imem,lpddr4_pmu_train_2d_dmem,lpddr4_pmu_train_2d_fw) + lpddr4_pmu_train_2d_imem$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), + lpddr4_pmu_train_2d_dmem$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), + lpddr4_pmu_train_2d_fw) cat $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4_pmu_train_1d_fw.bin \ $(FIRMWARE_IMX_DDRFW_DIR)/lpddr4_pmu_train_2d_fw.bin > \ $(BINARIES_DIR)/lpddr4_pmu_train_fw.bin @@ -67,13 +80,17 @@ define FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW # ddr4_fw.bin is needed when generating imx8-boot-sd.bin # which is done in post-image script. $(call FIRMWARE_IMX_PREPARE_DDR_FW, \ - ddr4_imem_1d_201810,ddr4_dmem_1d_201810,ddr4_1d_201810_fw) + ddr4_imem_1d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), + ddr4_dmem_1d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), + ddr4_1d_fw) $(call FIRMWARE_IMX_PREPARE_DDR_FW, \ - ddr4_imem_2d_201810,ddr4_dmem_2d_201810,ddr4_2d_201810_fw) - cat $(FIRMWARE_IMX_DDRFW_DIR)/ddr4_1d_201810_fw.bin \ - $(FIRMWARE_IMX_DDRFW_DIR)/ddr4_2d_201810_fw.bin > \ - $(BINARIES_DIR)/ddr4_201810_fw.bin - ln -sf $(BINARIES_DIR)/ddr4_201810_fw.bin $(BINARIES_DIR)/ddr_fw.bin + ddr4_imem_2d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), + ddr4_dmem_2d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), + ddr4_2d_fw) + cat $(FIRMWARE_IMX_DDRFW_DIR)/ddr4_1d_fw.bin \ + $(FIRMWARE_IMX_DDRFW_DIR)/ddr4_2d_fw.bin > \ + $(BINARIES_DIR)/ddr4_fw.bin + ln -sf $(BINARIES_DIR)/ddr4_fw.bin $(BINARIES_DIR)/ddr_fw.bin # U-Boot supports creation of the combined flash.bin image. To make # sure that U-Boot can access all available files copy them to @@ -90,10 +107,12 @@ define FIRMWARE_IMX_INSTALL_IMAGE_DDR_FW # ddr3_fw.bin is needed when generating imx8-boot-sd.bin # which is done in post-image script. $(call FIRMWARE_IMX_PREPARE_DDR_FW, \ - ddr3_imem_1d_201810,ddr3_dmem_1d_201810,ddr3_1d_201810_fw) - cat $(FIRMWARE_IMX_DDRFW_DIR)/ddr3_1d_201810_fw.bin > \ - $(BINARIES_DIR)/ddr3_201810_fw.bin - ln -sf $(BINARIES_DIR)/ddr3_201810_fw.bin $(BINARIES_DIR)/ddr_fw.bin + ddr3_imem_1d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), + ddr3_dmem_1d$(FIRMWARE_IMX_DDR_VERSION_SUFFIX), + ddr3_1d_fw) + cat $(FIRMWARE_IMX_DDRFW_DIR)/ddr3_1d_fw.bin > \ + $(BINARIES_DIR)/ddr3_fw.bin + ln -sf $(BINARIES_DIR)/ddr3_fw.bin $(BINARIES_DIR)/ddr_fw.bin # U-Boot supports creation of the combined flash.bin image. To make # sure that U-Boot can access all available files copy them to diff --git a/package/freescale-imx/freescale-imx.mk b/package/freescale-imx/freescale-imx.mk index 84a1725cc1f..b119d90ec39 100644 --- a/package/freescale-imx/freescale-imx.mk +++ b/package/freescale-imx/freescale-imx.mk @@ -4,31 +4,6 @@ # ################################################################################ -FREESCALE_IMX_SITE = http://www.nxp.com/lgfiles/NMG/MAD/YOCTO - -# Helper for self-extracting binaries distributed by Freescale. -# -# The --force option makes sure it doesn't fail if the source -# directory already exists. The --auto-accept skips the license check, -# as it is not needed in Buildroot because we have legal-info. Since -# there's a EULA in the binary file, we extract it in this macro, and -# it should therefore be added to the LICENSE_FILES variable of -# packages using this macro. Also, remember to set REDISTRIBUTE to -# "NO". Indeed, this is a legal minefield: the EULA specifies that the -# Board Support Package includes software and hardware (sic!) for -# which a separate license is needed... -# -# $(1): full path to the archive file -# -define FREESCALE_IMX_EXTRACT_HELPER - awk 'BEGIN { start = 0; } \ - /^EOEULA/ { start = 0; } \ - { if (start) print; } \ - /< $(@D)/EULA - cd $(@D) && sh $(1) --force --auto-accept - find $(@D)/$(basename $(notdir $(1))) -mindepth 1 -maxdepth 1 -exec mv {} $(@D) \; - rmdir $(@D)/$(basename $(notdir $(1))) -endef +FREESCALE_IMX_SITE = https://www.nxp.com/lgfiles/NMG/MAD/YOCTO include $(sort $(wildcard package/freescale-imx/*/*.mk)) diff --git a/package/freescale-imx/gpu-amd-bin-mx51/gpu-amd-bin-mx51.mk b/package/freescale-imx/gpu-amd-bin-mx51/gpu-amd-bin-mx51.mk index c99c568f73b..895fedc2e1e 100644 --- a/package/freescale-imx/gpu-amd-bin-mx51/gpu-amd-bin-mx51.mk +++ b/package/freescale-imx/gpu-amd-bin-mx51/gpu-amd-bin-mx51.mk @@ -23,7 +23,7 @@ GPU_AMD_BIN_MX51_LICENSE_FILES = EULA GPU_AMD_BIN_MX51_REDISTRIBUTE = NO define GPU_AMD_BIN_MX51_EXTRACT_CMDS - $(call FREESCALE_IMX_EXTRACT_HELPER,$(GPU_AMD_BIN_MX51_DL_DIR)/$(GPU_AMD_BIN_MX51_SOURCE)) + $(call NXP_EXTRACT_HELPER,$(GPU_AMD_BIN_MX51_DL_DIR)/$(GPU_AMD_BIN_MX51_SOURCE)) endef # Upstream headers need to be compiled with -D_LINUX. It is more convenient diff --git a/package/freescale-imx/imx-alsa-plugins/Config.in b/package/freescale-imx/imx-alsa-plugins/Config.in index ec9b5b19cf4..df47edd16d4 100644 --- a/package/freescale-imx/imx-alsa-plugins/Config.in +++ b/package/freescale-imx/imx-alsa-plugins/Config.in @@ -13,6 +13,8 @@ config BR2_PACKAGE_IMX_ALSA_PLUGINS * Rate Converter Plugin Using Freescale ASRC Hardware Resampler (i.MX53 and most i.MX6) + https://github.com/nxp-imx/imx-alsa-plugins + comment "imx-alsa-libs needs an imx-specific Linux kernel to be built" depends on BR2_arm depends on !BR2_LINUX_KERNEL diff --git a/package/freescale-imx/imx-alsa-plugins/imx-alsa-plugins.hash b/package/freescale-imx/imx-alsa-plugins/imx-alsa-plugins.hash index bb7beede9d5..1ca7697f037 100644 --- a/package/freescale-imx/imx-alsa-plugins/imx-alsa-plugins.hash +++ b/package/freescale-imx/imx-alsa-plugins/imx-alsa-plugins.hash @@ -1,3 +1,3 @@ # Locally calculated: -sha256 a9a5ef408a7329c2c5fa2a084ae7824afbfbebed68612bd72509488ccb0b94b3 imx-alsa-plugins-rel_imx_4.9.x_1.0.0_ga-br1.tar.gz +sha256 089bba009f82bf5e4a1e34b77a7d3badce2948619d92bec7a7ad42e766442d4c imx-alsa-plugins-rel_imx_4.9.x_1.0.0_ga.tar.gz sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING.GPL diff --git a/package/freescale-imx/imx-alsa-plugins/imx-alsa-plugins.mk b/package/freescale-imx/imx-alsa-plugins/imx-alsa-plugins.mk index 9c81ff0df00..912cc7c68bc 100644 --- a/package/freescale-imx/imx-alsa-plugins/imx-alsa-plugins.mk +++ b/package/freescale-imx/imx-alsa-plugins/imx-alsa-plugins.mk @@ -5,8 +5,7 @@ ################################################################################ IMX_ALSA_PLUGINS_VERSION = rel_imx_4.9.x_1.0.0_ga -IMX_ALSA_PLUGINS_SITE = https://source.codeaurora.org/external/imx/imx-alsa-plugins -IMX_ALSA_PLUGINS_SITE_METHOD = git +IMX_ALSA_PLUGINS_SITE = $(call github,nxp-imx,imx-alsa-plugins,$(IMX_ALSA_PLUGINS_VERSION)) IMX_ALSA_PLUGINS_LICENSE = GPL-2.0+ IMX_ALSA_PLUGINS_LICENSE_FILES = COPYING.GPL IMX_ALSA_PLUGINS_DEPENDENCIES = host-pkgconf alsa-lib diff --git a/package/freescale-imx/imx-codec/imx-codec.mk b/package/freescale-imx/imx-codec/imx-codec.mk index 1ec701d2f16..2b7c346a6e9 100644 --- a/package/freescale-imx/imx-codec/imx-codec.mk +++ b/package/freescale-imx/imx-codec/imx-codec.mk @@ -26,7 +26,7 @@ IMX_CODEC_CONF_OPTS += --enable-vpu endif define IMX_CODEC_EXTRACT_CMDS - $(call FREESCALE_IMX_EXTRACT_HELPER,$(IMX_CODEC_DL_DIR)/$(IMX_CODEC_SOURCE)) + $(call NXP_EXTRACT_HELPER,$(IMX_CODEC_DL_DIR)/$(IMX_CODEC_SOURCE)) endef # FIXME The Makefile installs both the arm9 and arm11 versions of the diff --git a/package/freescale-imx/imx-gpu-g2d/Config.in b/package/freescale-imx/imx-gpu-g2d/Config.in index aeca087f865..c143b17c47f 100644 --- a/package/freescale-imx/imx-gpu-g2d/Config.in +++ b/package/freescale-imx/imx-gpu-g2d/Config.in @@ -18,12 +18,3 @@ config BR2_PACKAGE_IMX_GPU_G2D This library is provided by NXP as-is and doesn't have an upstream. - -if BR2_PACKAGE_IMX_GPU_G2D - -config BR2_PACKAGE_IMX_GPU_G2D_EXAMPLES - bool "install examples" - help - Copy the Vivante G2D examples to the target. - -endif 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 4d28b037d03..27f6a438d14 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,5 @@ # Locally calculated -sha256 39fe307916e19a0892a514621121086e276a43858af90230372a1344852116a2 imx-gpu-g2d-6.4.3.p2.0-arm.bin -sha256 2642a49e088daae4cf568a150d01e7c095995e8a6ff1883c02c3fa6d26d254b3 imx-gpu-g2d-6.4.3.p2.0-aarch64.bin -sha256 ea58636bf34f589048fcd46e38497c47229fde8498df086ff5fb52f9ef8e15ee COPYING -sha256 50099e283cfd307f84f159aeb1a6f462351320273dbcdb80d7f2c9db0494b71c EULA +sha256 7737a3372bcde34e2d275397df67c307df5033d5b133ac770f75cac4e1ec2580 imx-gpu-g2d-6.4.3.p4.4-arm.bin +sha256 8341d6e2cde3f3ffa035dc95b0487dd04a50531cc80f4cddc5a689ebc4946e02 imx-gpu-g2d-6.4.3.p4.4-aarch64.bin +sha256 5bd7aab9dc380a6f9577443b2e90bd5ca73d9528175fad04b6d17da43a05a48e COPYING +sha256 654f0c4ce6d08f9a6d74e29c58206742cb7469a6a7c25413028a9bdbe647aa13 EULA 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 0e4078a962b..42a1fe70cf1 100644 --- a/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk +++ b/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk @@ -5,9 +5,9 @@ ################################################################################ ifeq ($(BR2_aarch64),y) -IMX_GPU_G2D_VERSION = 6.4.3.p2.0-aarch64 +IMX_GPU_G2D_VERSION = 6.4.3.p4.4-aarch64 else -IMX_GPU_G2D_VERSION = 6.4.3.p2.0-arm +IMX_GPU_G2D_VERSION = 6.4.3.p4.4-arm endif IMX_GPU_G2D_SITE = $(FREESCALE_IMX_SITE) IMX_GPU_G2D_SOURCE = imx-gpu-g2d-$(IMX_GPU_G2D_VERSION).bin @@ -19,22 +19,14 @@ IMX_GPU_G2D_LICENSE_FILES = EULA COPYING IMX_GPU_G2D_REDISTRIBUTE = NO define IMX_GPU_G2D_EXTRACT_CMDS - $(call FREESCALE_IMX_EXTRACT_HELPER,$(IMX_GPU_G2D_DL_DIR)/$(IMX_GPU_G2D_SOURCE)) + $(call NXP_EXTRACT_HELPER,$(IMX_GPU_G2D_DL_DIR)/$(IMX_GPU_G2D_SOURCE)) endef define IMX_GPU_G2D_INSTALL_STAGING_CMDS cp -a $(@D)/g2d/usr/* $(STAGING_DIR)/usr endef -ifeq ($(BR2_PACKAGE_IMX_GPU_G2D_EXAMPLES),y) -define IMX_GPU_G2D_INSTALL_EXAMPLES - mkdir -p $(TARGET_DIR)/usr/share/examples/ - cp -a $(@D)/gpu-demos/opt/* $(TARGET_DIR)/usr/share/examples/ -endef -endif - define IMX_GPU_G2D_INSTALL_TARGET_CMDS - $(IMX_GPU_G2D_INSTALL_EXAMPLES) cp -a $(@D)/g2d/usr/lib $(TARGET_DIR)/usr endef diff --git a/package/freescale-imx/imx-gpu-viv/Config.in b/package/freescale-imx/imx-gpu-viv/Config.in index 9ba3d0428eb..3e095b730cf 100644 --- a/package/freescale-imx/imx-gpu-viv/Config.in +++ b/package/freescale-imx/imx-gpu-viv/Config.in @@ -27,9 +27,9 @@ config BR2_PACKAGE_IMX_GPU_VIV Userspace libraries for Vivante GPU on i.MX platforms It contains libraries and headers for GLES, OpenCL, and - OpenVG. It also contains a DRI plugin for X11. It also - contains a plugin for DirectFB-1.4.0, but that doesn't work - together with buildroot's DirectFB version. + OpenVG. It also contains a plugin for DirectFB-1.4.0, but + that doesn't work together with buildroot's DirectFB + version. This library is provided by Freescale as-is and doesn't have an upstream. @@ -40,22 +40,9 @@ choice prompt "Output option" help There are two versions of this library: one for - direct framebuffer access, one for X11 rendering. + direct framebuffer access, one for wayland rendering. Choose here which version to install. -config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 - bool "X11" - depends on BR2_PACKAGE_XORG7 - # The i.MX8 blob doesn't support X11 output - depends on !BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M - select BR2_PACKAGE_XLIB_LIBXDAMAGE - select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_XLIB_LIBXFIXES - -comment "X11 backend needs Xorg package" - depends on !BR2_PACKAGE_XORG7 - depends on !BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M - config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_FB bool "Framebuffer" # The i.MX8 blob doesn't support FB output @@ -70,7 +57,6 @@ endchoice config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT string - default "x11" if BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 default "fb" if BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_FB default "wayland" if BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL @@ -91,6 +77,14 @@ if BR2_aarch64 config BR2_PACKAGE_PROVIDES_LIBGBM default "imx-gpu-viv" +config BR2_PACKAGE_IMX_GPU_VIV_PLATFORM + string + default "mx8mn" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN + default "mx8mp" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MP + default "mx8mq" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M + default "mx8qm" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8 + default "mx8qxp" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X + endif config BR2_PACKAGE_IMX_GPU_VIV_EXAMPLES 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 312eeb6f82d..a0e6345b7a3 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,5 @@ # Locally calculated -sha256 1324b1aaf190110b80ad9a6f6533f4f50dce9e9ab8d49d8503f59764b151d219 imx-gpu-viv-6.4.3.p2.0-aarch32.bin -sha256 003c30baefb1655790b475c3cdfa5cefbf81ea89ef37c6649b64f151dd23a52e imx-gpu-viv-6.4.3.p2.0-aarch64.bin -sha256 ea58636bf34f589048fcd46e38497c47229fde8498df086ff5fb52f9ef8e15ee COPYING -sha256 50099e283cfd307f84f159aeb1a6f462351320273dbcdb80d7f2c9db0494b71c EULA +sha256 5b9dd02cb2dfa564903872576cd6586fbf4a02abdb8e180978bd84205ab302a7 imx-gpu-viv-6.4.3.p4.4-aarch32.bin +sha256 5c52bd15146c24d449638c6276c07103949c8efbc53d002518541bc37c57e424 imx-gpu-viv-6.4.3.p4.4-aarch64.bin +sha256 5bd7aab9dc380a6f9577443b2e90bd5ca73d9528175fad04b6d17da43a05a48e COPYING +sha256 654f0c4ce6d08f9a6d74e29c58206742cb7469a6a7c25413028a9bdbe647aa13 EULA 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 1d76d79e2b3..f72735e093f 100644 --- a/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk +++ b/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk @@ -5,9 +5,9 @@ ################################################################################ ifeq ($(BR2_aarch64),y) -IMX_GPU_VIV_VERSION = 6.4.3.p2.0-aarch64 +IMX_GPU_VIV_VERSION = 6.4.3.p4.4-aarch64 else -IMX_GPU_VIV_VERSION = 6.4.3.p2.0-aarch32 +IMX_GPU_VIV_VERSION = 6.4.3.p4.4-aarch32 endif IMX_GPU_VIV_SITE = $(FREESCALE_IMX_SITE) IMX_GPU_VIV_SOURCE = imx-gpu-viv-$(IMX_GPU_VIV_VERSION).bin @@ -26,14 +26,6 @@ endif IMX_GPU_VIV_LIB_TARGET = $(call qstrip,$(BR2_PACKAGE_IMX_GPU_VIV_OUTPUT)) -ifeq ($(IMX_GPU_VIV_LIB_TARGET),x11) -# The libGAL.so library provided by imx-gpu-viv uses X functions. Packages -# may want to link against libGAL.so (QT5 Base with OpenGL and X support -# does so). For this to work we need build dependencies to libXdamage, -# libXext and libXfixes so that X functions used in libGAL.so are referenced. -IMX_GPU_VIV_DEPENDENCIES += xlib_libXdamage xlib_libXext xlib_libXfixes -endif - # Libraries are linked against libdrm, except framebuffer output on ARM ifneq ($(IMX_GPU_VIV_LIB_TARGET)$(BR2_arm),fby) IMX_GPU_VIV_DEPENDENCIES += libdrm @@ -44,7 +36,7 @@ IMX_GPU_VIV_DEPENDENCIES += wayland endif define IMX_GPU_VIV_EXTRACT_CMDS - $(call FREESCALE_IMX_EXTRACT_HELPER,$(IMX_GPU_VIV_DL_DIR)/$(IMX_GPU_VIV_SOURCE)) + $(call NXP_EXTRACT_HELPER,$(IMX_GPU_VIV_DL_DIR)/$(IMX_GPU_VIV_SOURCE)) endef ifeq ($(IMX_GPU_VIV_LIB_TARGET),fb) @@ -55,11 +47,12 @@ else ifeq ($(IMX_GPU_VIV_LIB_TARGET),wayland) define IMX_GPU_VIV_FIXUP_PKGCONFIG ln -sf egl_wayland.pc $(@D)/gpu-core/usr/lib/pkgconfig/egl.pc endef -else ifeq ($(IMX_GPU_VIV_LIB_TARGET),x11) -define IMX_GPU_VIV_FIXUP_PKGCONFIG - $(foreach lib,egl gbm glesv1_cm glesv2 vg, \ - ln -sf $(lib)_x11.pc $(@D)/gpu-core/usr/lib/pkgconfig/$(lib).pc - ) +endif + +IMX_GPU_VIV_PLATFORM_DIR = $(call qstrip,$(BR2_PACKAGE_IMX_GPU_VIV_PLATFORM)) +ifneq ($(IMX_GPU_VIV_PLATFORM_DIR),) +define IMX_GPU_VIV_COPY_PLATFORM + cp -dpfr $(@D)/gpu-core/usr/lib/$(IMX_GPU_VIV_PLATFORM_DIR)/* $(@D)/gpu-core/usr/lib/ endef endif @@ -68,9 +61,13 @@ endif # 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/ - $(foreach backend,fb x11 wayland, \ + $(foreach backend,fb wayland, \ $(RM) -r $(@D)/gpu-core/usr/lib/$(backend) ) + $(IMX_GPU_VIV_COPY_PLATFORM) + $(foreach platform,mx8mn mx8mp mx8mq mx8qm mx8qxp mx8ulp, \ + $(RM) -r $(@D)/gpu-core/usr/lib/$(platform) + ) $(IMX_GPU_VIV_FIXUP_PKGCONFIG) endef diff --git a/package/freescale-imx/imx-kobs/Config.in b/package/freescale-imx/imx-kobs/Config.in index 61be9f26d40..a81842b9a5a 100644 --- a/package/freescale-imx/imx-kobs/Config.in +++ b/package/freescale-imx/imx-kobs/Config.in @@ -5,5 +5,4 @@ config BR2_PACKAGE_IMX_KOBS The imx-kobs tool is used for writing images to NAND on i.MX platforms. - This library is provided by Freescale as-is and doesn't have - an upstream. + https://github.com/NXPmicro/imx-kobs diff --git a/package/freescale-imx/imx-kobs/imx-kobs.mk b/package/freescale-imx/imx-kobs/imx-kobs.mk index d6a250cf724..91b39f6fa4a 100644 --- a/package/freescale-imx/imx-kobs/imx-kobs.mk +++ b/package/freescale-imx/imx-kobs/imx-kobs.mk @@ -5,7 +5,7 @@ ################################################################################ IMX_KOBS_VERSION = a0e9adce2fb7fcd57e794d7f9a5deba0f94f521b -IMX_KOBS_SITE = $(call github,codeauroraforum,imx-kobs,$(IMX_KOBS_VERSION)) +IMX_KOBS_SITE = $(call github,NXPmicro,imx-kobs,$(IMX_KOBS_VERSION)) IMX_KOBS_LICENSE = GPL-2.0+ IMX_KOBS_LICENSE_FILES = COPYING diff --git a/package/freescale-imx/imx-lib/Config.in b/package/freescale-imx/imx-lib/Config.in index 746788e4c50..0a89bf140f3 100644 --- a/package/freescale-imx/imx-lib/Config.in +++ b/package/freescale-imx/imx-lib/Config.in @@ -11,5 +11,4 @@ config BR2_PACKAGE_IMX_LIB platform specific drivers. It requires a kernel that includes the i.MX specific headers to be built. - This library is provided by Freescale as-is and doesn't have - an upstream. + https://github.com/nxp-imx/imx-lib diff --git a/package/freescale-imx/imx-lib/imx-lib.mk b/package/freescale-imx/imx-lib/imx-lib.mk index 721c20e5f85..f06453e8a6b 100644 --- a/package/freescale-imx/imx-lib/imx-lib.mk +++ b/package/freescale-imx/imx-lib/imx-lib.mk @@ -5,7 +5,7 @@ ################################################################################ IMX_LIB_VERSION = 3f777974c0c146817e2ff5cb0340ca66a1f99e57 -IMX_LIB_SITE = https://source.codeaurora.org/external/imx/imx-lib +IMX_LIB_SITE = https://github.com/nxp-imx/imx-lib.git IMX_LIB_SITE_METHOD = git IMX_LIB_LICENSE = LGPL-2.1+ IMX_LIB_LICENSE_FILES = COPYING-LGPL-2.1 diff --git a/package/freescale-imx/imx-m4fwloader/Config.in b/package/freescale-imx/imx-m4fwloader/Config.in index 937f82f916a..d75480a7081 100644 --- a/package/freescale-imx/imx-m4fwloader/Config.in +++ b/package/freescale-imx/imx-m4fwloader/Config.in @@ -5,4 +5,4 @@ config BR2_PACKAGE_IMX_M4FWLOADER This package provides a tool to load a firmware to the Cortex-M4 core available in some i.MX processors. - https://github.com/codeauroraforum/imx-m4fwloader + https://github.com/NXPmicro/imx-m4fwloader diff --git a/package/freescale-imx/imx-m4fwloader/imx-m4fwloader.hash b/package/freescale-imx/imx-m4fwloader/imx-m4fwloader.hash index 2bf3f15d0f9..0949a099b2e 100644 --- a/package/freescale-imx/imx-m4fwloader/imx-m4fwloader.hash +++ b/package/freescale-imx/imx-m4fwloader/imx-m4fwloader.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 fb6334900972fe389e808845417dd9045fb0f7eb47952fc22a00f4cdaf94af1a imx-m4fwloader-8cf4d17a09ba23250d43381b49ba00d92406fad9.tar.gz -sha256 c03cea027b4b40e4402fabd08557736727ec3d5bc54ad64ab6472de432198cad LICENSE +sha256 fb6334900972fe389e808845417dd9045fb0f7eb47952fc22a00f4cdaf94af1a imx-m4fwloader-8cf4d17a09ba23250d43381b49ba00d92406fad9.tar.gz +sha256 c03cea027b4b40e4402fabd08557736727ec3d5bc54ad64ab6472de432198cad LICENSE diff --git a/package/freescale-imx/imx-m4fwloader/imx-m4fwloader.mk b/package/freescale-imx/imx-m4fwloader/imx-m4fwloader.mk index cc4849330c2..320d5dc6173 100644 --- a/package/freescale-imx/imx-m4fwloader/imx-m4fwloader.mk +++ b/package/freescale-imx/imx-m4fwloader/imx-m4fwloader.mk @@ -5,7 +5,7 @@ ################################################################################ IMX_M4FWLOADER_VERSION = 8cf4d17a09ba23250d43381b49ba00d92406fad9 -IMX_M4FWLOADER_SITE = $(call github,codeauroraforum,imx-m4fwloader,$(IMX_M4FWLOADER_VERSION)) +IMX_M4FWLOADER_SITE = $(call github,NXPmicro,imx-m4fwloader,$(IMX_M4FWLOADER_VERSION)) IMX_M4FWLOADER_LICENSE = GPL-2.0+ IMX_M4FWLOADER_LICENSE_FILES = LICENSE diff --git a/package/freescale-imx/imx-parser/imx-parser.mk b/package/freescale-imx/imx-parser/imx-parser.mk index fc4376f04ba..dccb8829d29 100644 --- a/package/freescale-imx/imx-parser/imx-parser.mk +++ b/package/freescale-imx/imx-parser/imx-parser.mk @@ -24,7 +24,7 @@ IMX_PARSER_CONF_OPTS += --enable-fsw endif define IMX_PARSER_EXTRACT_CMDS - $(call FREESCALE_IMX_EXTRACT_HELPER,$(IMX_PARSER_DL_DIR)/$(IMX_PARSER_SOURCE)) + $(call NXP_EXTRACT_HELPER,$(IMX_PARSER_DL_DIR)/$(IMX_PARSER_SOURCE)) endef # The Makefile installs several versions of the libraries, but we only 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 bbb73103064..6a304c0c8c3 100644 --- a/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk +++ b/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk @@ -13,7 +13,7 @@ IMX_SC_FIRMWARE_LICENSE_FILES = EULA COPYING IMX_SC_FIRMWARE_REDISTRIBUTE = NO define IMX_SC_FIRMWARE_EXTRACT_CMDS - $(call FREESCALE_IMX_EXTRACT_HELPER,$(IMX_SC_FIRMWARE_DL_DIR)/$(IMX_SC_FIRMWARE_SOURCE)) + $(call NXP_EXTRACT_HELPER,$(IMX_SC_FIRMWARE_DL_DIR)/$(IMX_SC_FIRMWARE_SOURCE)) endef IMX_SC_FIRMWARE_INSTALL_IMAGES = YES diff --git a/package/freescale-imx/imx-seco/imx-seco.mk b/package/freescale-imx/imx-seco/imx-seco.mk index 79c9722c43b..987f24658d4 100644 --- a/package/freescale-imx/imx-seco/imx-seco.mk +++ b/package/freescale-imx/imx-seco/imx-seco.mk @@ -13,7 +13,7 @@ IMX_SECO_LICENSE_FILES = EULA COPYING IMX_SECO_REDISTRIBUTE = NO define IMX_SECO_EXTRACT_CMDS - $(call FREESCALE_IMX_EXTRACT_HELPER,$(IMX_SECO_DL_DIR)/$(IMX_SECO_SOURCE)) + $(call NXP_EXTRACT_HELPER,$(IMX_SECO_DL_DIR)/$(IMX_SECO_SOURCE)) endef IMX_SECO_INSTALL_IMAGES = YES diff --git a/package/freescale-imx/imx-uuc/imx-uuc.hash b/package/freescale-imx/imx-uuc/imx-uuc.hash index 5d95463903f..c41ac57ca41 100644 --- a/package/freescale-imx/imx-uuc/imx-uuc.hash +++ b/package/freescale-imx/imx-uuc/imx-uuc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7f4d4838d4bf489932ef4a242677db30ad8d9ffd76065e07f4ddee3e6c35db82 imx-uuc-d6afb27e55d73d7ad08cd2dd51c784d8ec9694dc.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 7f4d4838d4bf489932ef4a242677db30ad8d9ffd76065e07f4ddee3e6c35db82 imx-uuc-d6afb27e55d73d7ad08cd2dd51c784d8ec9694dc.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/freescale-imx/imx-vpu-hantro-daemon/Config.in b/package/freescale-imx/imx-vpu-hantro-daemon/Config.in new file mode 100644 index 00000000000..663ed4346b0 --- /dev/null +++ b/package/freescale-imx/imx-vpu-hantro-daemon/Config.in @@ -0,0 +1,17 @@ +comment "imx-vpu-hantro-daemon needs an i.MX-specific Linux kernel to be built" + depends on !BR2_LINUX_KERNEL + +comment "imx-vpu-hantro-daemon needs an i.MX platform with Hantro VPU" + depends on BR2_LINUX_KERNEL + depends on !BR2_PACKAGE_FREESCALE_IMX_HAS_VPU_HANTRO + +config BR2_PACKAGE_IMX_VPU_HANTRO_DAEMON + bool "imx-vpu-hantro-daemon" + depends on BR2_LINUX_KERNEL + depends on BR2_PACKAGE_FREESCALE_IMX_HAS_VPU_HANTRO + select BR2_PACKAGE_IMX_VPU_HANTRO + select BR2_PACKAGE_IMX_VPU_HANTRO_VC if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MP + help + i.MX Hantro V4L2 Daemon specific for the NXP i.MX SoC + integrating a Hantro Video Processing Unit (VPU) such as the + i.MX8MQ/i.MX8MM/i.MX8MP. 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 new file mode 100644 index 00000000000..e952491a60a --- /dev/null +++ b/package/freescale-imx/imx-vpu-hantro-daemon/imx-vpu-hantro-daemon.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 83ba2798564702d74ab65f6238f95f59247d983b846de1de4c19bdfaf6dabeb8 imx-vpu-hantro-daemon-1.1.4.tar.gz +sha256 bb645f02b260955f333348100e40af76253e2cd8b116bac047230439dd53ec5a LICENSE.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 new file mode 100644 index 00000000000..4f6f166b604 --- /dev/null +++ b/package/freescale-imx/imx-vpu-hantro-daemon/imx-vpu-hantro-daemon.mk @@ -0,0 +1,34 @@ +################################################################################ +# +# imx-vpu-hantro-daemon +# +################################################################################ + +IMX_VPU_HANTRO_DAEMON_VERSION = 1.1.4 +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_REDISTRIBUTE = NO +IMX_VPU_HANTRO_DAEMON_DEPENDENCIES = imx-vpu-hantro linux +ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MP),y) +IMX_VPU_HANTRO_DAEMON_DEPENDENCIES += imx-vpu-hantro-vc +endif + +IMX_VPU_HANTRO_DAEMON_MAKE_ENV = \ + $(TARGET_MAKE_ENV) \ + CROSS_COMPILE="$(TARGET_CROSS)" \ + SDKTARGETSYSROOT=$(STAGING_DIR) \ + LINUX_KERNEL_ROOT=$(LINUX_DIR) \ + CTRLSW_HDRPATH="$(STAGING_DIR)/usr/include" \ + PLATFORM=$(BR2_PACKAGE_FREESCALE_IMX_PLATFORM) + +define IMX_VPU_HANTRO_DAEMON_BUILD_CMDS + $(MAKE) -C $(@D) $(IMX_VPU_HANTRO_DAEMON_MAKE_ENV) +endef + +define IMX_VPU_HANTRO_DAEMON_INSTALL_TARGET_CMDS + $(IMX_VPU_HANTRO_DAEMON_MAKE_ENV) $(MAKE) -C $(@D) \ + DEST_DIR=$(TARGET_DIR) libdir=/usr/lib install +endef + +$(eval $(generic-package)) 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 aadf5b121ff..bd9bc37c1f7 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,4 @@ # Locally computed: -sha256 d5efae484c4271c098286d007590d6bf40c272d4f35702ff65625f2362715ab3 imx-vpu-hantro-vc-1.4.0.bin -sha256 ea58636bf34f589048fcd46e38497c47229fde8498df086ff5fb52f9ef8e15ee COPYING -sha256 50099e283cfd307f84f159aeb1a6f462351320273dbcdb80d7f2c9db0494b71c EULA +sha256 62b5ba3c4aab21d0d4be3eee9b204a9bb50b83b6140ee1a3b27c648809bdfbaa imx-vpu-hantro-vc-1.9.0.bin +sha256 5bd7aab9dc380a6f9577443b2e90bd5ca73d9528175fad04b6d17da43a05a48e COPYING +sha256 654f0c4ce6d08f9a6d74e29c58206742cb7469a6a7c25413028a9bdbe647aa13 EULA 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 b07e1166744..3d266fb5bd8 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,17 +4,25 @@ # ################################################################################ -IMX_VPU_HANTRO_VC_VERSION = 1.4.0 +IMX_VPU_HANTRO_VC_VERSION = 1.9.0 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_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_REDISTRIBUTE = NO define IMX_VPU_HANTRO_VC_EXTRACT_CMDS - $(call FREESCALE_IMX_EXTRACT_HELPER,$(IMX_VPU_HANTRO_VC_DL_DIR)/$(IMX_VPU_HANTRO_VC_SOURCE)) + $(call NXP_EXTRACT_HELPER,$(IMX_VPU_HANTRO_VC_DL_DIR)/$(IMX_VPU_HANTRO_VC_SOURCE)) +endef + +define IMX_VPU_HANTRO_VC_INSTALL_STAGING_CMDS + mkdir -p $(STAGING_DIR)/usr/include/ + cp -dpfr $(@D)/usr/include/hantro_VC8000E_enc/*.h $(STAGING_DIR)/usr/include/ + $(INSTALL) -D -m 0755 $(@D)/usr/lib/libhantro_vc8000e.so $(STAGING_DIR)/usr/lib/libhantro_vc8000e.so + $(INSTALL) -D -m 0755 $(@D)/usr/lib/libhantro_vc8000e.so.1 $(STAGING_DIR)/usr/lib/libhantro_vc8000e.so.1 endef define IMX_VPU_HANTRO_VC_INSTALL_TARGET_CMDS diff --git a/package/freescale-imx/imx-vpu-hantro/0003-Fix-Linux-kernel-version-header.patch b/package/freescale-imx/imx-vpu-hantro/0003-Fix-Linux-kernel-version-header.patch new file mode 100644 index 00000000000..427ebeb38ad --- /dev/null +++ b/package/freescale-imx/imx-vpu-hantro/0003-Fix-Linux-kernel-version-header.patch @@ -0,0 +1,45 @@ +From 73cd57c18066ff863335a8616d0b348541d26118 Mon Sep 17 00:00:00 2001 +From: Gary Bisson +Date: Tue, 15 Nov 2022 21:43:47 +0100 +Subject: [PATCH] Fix Linux kernel version header + +- Up to kernel 5.10, NXP was using ION for memory management +- Starting with 5.15 kernels, NXP uses DMABUF and the ION header is no + longer in the kernel +- So keep the previous patch for people using kernel <= 5.10 +- Add path to the version.h header as imx-vpu-hantro will only include + ion.h depending on the kernel version + +Signed-off-by: Gary Bisson +--- + Makefile_G1G2 | 1 + + Makefile_H1 | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/Makefile_G1G2 b/Makefile_G1G2 +index 25884fa..8e03e91 100755 +--- a/Makefile_G1G2 ++++ b/Makefile_G1G2 +@@ -11,6 +11,7 @@ INCLUDE_HEADERS = -I./decoder_sw -I$(SOURCE_ROOT)/source/inc -I$(SOURCE_ROOT)/so + INCLUDE_HEADERS += -I$(SOURCE_ROOT)/linux/memalloc + #INCLUDE_HEADERS += -I$(SOURCE_ROOT)/linux/ldriver + INCLUDE_HEADERS += -I$(LINUX_KERNEL_ROOT)/include/uapi -I$(LINUX_KERNEL_ROOT)/include ++INCLUDE_HEADERS += -I$(LINUX_KERNEL_ROOT)/include/generated/uapi + INCLUDE_HEADERS += -I$(LINUX_KERNEL_ROOT)/drivers/staging/android/uapi + + CFLAGS += -DDEC_MODULE_PATH=\"/dev/mxc_hantro\" -DUSE_FAKE_RFC_TABLE -DFIFO_DATATYPE=void* -DNDEBUG -DDOWN_SCALER \ +diff --git a/Makefile_H1 b/Makefile_H1 +index 479940a..7ac6f8d 100755 +--- a/Makefile_H1 ++++ b/Makefile_H1 +@@ -18,6 +18,7 @@ ENV = -DENC_MODULE_PATH=\\\"/dev/mxc_hantro_h1\\\" + ENV += -DEWL_NO_HW_TIMEOUT + ENV += -DUSE_ION + ENV += -I$(LINUX_KERNEL_ROOT)/include/uapi -I$(LINUX_KERNEL_ROOT)/include ++ENV += -I$(LINUX_KERNEL_ROOT)/include/generated/uapi + ENV += -I$(LINUX_KERNEL_ROOT)/drivers/staging/android/uapi + + ifeq ($(CFG_SECURE_DATA_PATH), y) +-- +2.35.1 + 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 dd3b167e3e1..637d7898cf9 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,4 @@ # Locally computed: -sha256 03c61dfb268b31a0d25a4d1387cb3ad0261029ad5de801f72224602e2b37da00 imx-vpu-hantro-1.22.0.bin -sha256 ea58636bf34f589048fcd46e38497c47229fde8498df086ff5fb52f9ef8e15ee COPYING -sha256 50099e283cfd307f84f159aeb1a6f462351320273dbcdb80d7f2c9db0494b71c EULA +sha256 7e9bcdbd067ce66a1247373cbf088945346feb0027deb61af541ebc1256277c3 imx-vpu-hantro-1.27.0.bin +sha256 5bd7aab9dc380a6f9577443b2e90bd5ca73d9528175fad04b6d17da43a05a48e COPYING +sha256 654f0c4ce6d08f9a6d74e29c58206742cb7469a6a7c25413028a9bdbe647aa13 EULA 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 360591b4445..4cfc8f41ff1 100644 --- a/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk +++ b/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMX_VPU_HANTRO_VERSION = 1.22.0 +IMX_VPU_HANTRO_VERSION = 1.27.0 IMX_VPU_HANTRO_SITE = $(FREESCALE_IMX_SITE) IMX_VPU_HANTRO_SOURCE = imx-vpu-hantro-$(IMX_VPU_HANTRO_VERSION).bin IMX_VPU_HANTRO_DEPENDENCIES = linux @@ -23,7 +23,7 @@ IMX_VPU_HANTRO_LICENSE_FILES = EULA COPYING IMX_VPU_HANTRO_REDISTRIBUTE = NO define IMX_VPU_HANTRO_EXTRACT_CMDS - $(call FREESCALE_IMX_EXTRACT_HELPER,$(IMX_VPU_HANTRO_DL_DIR)/$(IMX_VPU_HANTRO_SOURCE)) + $(call NXP_EXTRACT_HELPER,$(IMX_VPU_HANTRO_DL_DIR)/$(IMX_VPU_HANTRO_SOURCE)) endef define IMX_VPU_HANTRO_BUILD_CMDS diff --git a/package/freescale-imx/imx-vpu/imx-vpu.mk b/package/freescale-imx/imx-vpu/imx-vpu.mk index 14a1a7a9f0b..cae3d88b6d5 100644 --- a/package/freescale-imx/imx-vpu/imx-vpu.mk +++ b/package/freescale-imx/imx-vpu/imx-vpu.mk @@ -21,7 +21,7 @@ IMX_VPU_LICENSE_FILES = EULA COPYING IMX_VPU_REDISTRIBUTE = NO define IMX_VPU_EXTRACT_CMDS - $(call FREESCALE_IMX_EXTRACT_HELPER,$(IMX_VPU_DL_DIR)/$(IMX_VPU_SOURCE)) + $(call NXP_EXTRACT_HELPER,$(IMX_VPU_DL_DIR)/$(IMX_VPU_SOURCE)) endef define IMX_VPU_BUILD_CMDS diff --git a/package/freescale-imx/imx-vpuwrap/imx-vpuwrap.mk b/package/freescale-imx/imx-vpuwrap/imx-vpuwrap.mk index 4f89165403d..4bee1cf642c 100644 --- a/package/freescale-imx/imx-vpuwrap/imx-vpuwrap.mk +++ b/package/freescale-imx/imx-vpuwrap/imx-vpuwrap.mk @@ -22,7 +22,7 @@ IMX_VPUWRAP_LICENSE_FILES = EULA COPYING IMX_VPUWRAP_REDISTRIBUTE = NO define IMX_VPUWRAP_EXTRACT_CMDS - $(call FREESCALE_IMX_EXTRACT_HELPER,$(IMX_VPUWRAP_DL_DIR)/$(IMX_VPUWRAP_SOURCE)) + $(call NXP_EXTRACT_HELPER,$(IMX_VPUWRAP_DL_DIR)/$(IMX_VPUWRAP_SOURCE)) endef $(eval $(autotools-package)) diff --git a/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash b/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash index ee105ef82c0..5079de98404 100644 --- a/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash +++ b/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash @@ -1,3 +1,3 @@ # locally computed -sha256 257c6cd8b01cfb6543827cbeb78409e6a2ad4ae321891751dcea1abc47d89379 kernel-module-imx-gpu-viv-ae0f3be0b7240f11cca191a3e2bdd4a445ee46e5.tar.gz -sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING +sha256 0754114b3088a46b9fee9a5bd1c7b9ec94b6ca656ed930c4cad9e04382e8e372 kernel-module-imx-gpu-viv-00fe5a0bedc07337c873f93998da9025083116ed.tar.gz +sha256 0754114b3088a46b9fee9a5bd1c7b9ec94b6ca656ed930c4cad9e04382e8e372 COPYING diff --git a/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk b/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk index 10505fdf175..5c96ba0390a 100644 --- a/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk +++ b/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KERNEL_MODULE_IMX_GPU_VIV_VERSION = ae0f3be0b7240f11cca191a3e2bdd4a445ee46e5 +KERNEL_MODULE_IMX_GPU_VIV_VERSION = 00fe5a0bedc07337c873f93998da9025083116ed KERNEL_MODULE_IMX_GPU_VIV_SITE = \ $(call github,Freescale,kernel-module-imx-gpu-viv,$(KERNEL_MODULE_IMX_GPU_VIV_VERSION)) KERNEL_MODULE_IMX_GPU_VIV_LICENSE = GPL-2.0 diff --git a/package/freescale-imx/libz160/libz160.mk b/package/freescale-imx/libz160/libz160.mk index 5b1feeb441f..a15b5f6b60a 100644 --- a/package/freescale-imx/libz160/libz160.mk +++ b/package/freescale-imx/libz160/libz160.mk @@ -15,7 +15,7 @@ LIBZ160_LICENSE_FILES = EULA LIBZ160_REDISTRIBUTE = NO define LIBZ160_EXTRACT_CMDS - $(call FREESCALE_IMX_EXTRACT_HELPER,$(LIBZ160_DL_DIR)/$(LIBZ160_SOURCE)) + $(call NXP_EXTRACT_HELPER,$(LIBZ160_DL_DIR)/$(LIBZ160_SOURCE)) endef define LIBZ160_INSTALL_STAGING_CMDS diff --git a/package/freeswitch/0001-fix-build-SWITCH_BYTE_ORDER-__BIG_ENDIAN.patch b/package/freeswitch/0001-fix-build-SWITCH_BYTE_ORDER-__BIG_ENDIAN.patch deleted file mode 100644 index 57f6e660c13..00000000000 --- a/package/freeswitch/0001-fix-build-SWITCH_BYTE_ORDER-__BIG_ENDIAN.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 68039d344d8e826e8b403c9cd0284fd07b4495ac Mon Sep 17 00:00:00 2001 -From: Dragos Oancea -Date: Tue, 26 Oct 2021 08:42:58 +0000 -Subject: [PATCH] [core] fix build SWITCH_BYTE_ORDER == __BIG_ENDIAN - -Downloaded from upstream commit: -https://github.com/signalwire/freeswitch/commit/68039d344d8e826e8b403c9cd0284fd07b4495ac - -Signed-off-by: Bernd Kuhls ---- - src/switch_rtp.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/switch_rtp.c b/src/switch_rtp.c -index 1880bbb19c..843ee81381 100644 ---- a/src/switch_rtp.c -+++ b/src/switch_rtp.c -@@ -2155,7 +2155,7 @@ static void switch_send_rtcp_event(switch_rtp_t *rtp_session ,struct switch_rtcp - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, header, value); - snprintf(header, sizeof(header), "Source-Lost"); - #if SWITCH_BYTE_ORDER == __BIG_ENDIAN -- tmpLost = report->lost; /* signed 24bit will extended signess to int32_t automatically */ -+ tmpLost = rtcp_report_block->lost; /* signed 24bit will extended signess to int32_t automatically */ - #else - tmpLost = ntohl(rtcp_report_block->lost)>>8; - tmpLost = tmpLost | ((tmpLost & 0x00800000) ? 0xff000000 : 0x00000000); /* ...and signess compensation */ diff --git a/package/freeswitch/0001-libs-srtp-crypto-hash-hmac_ossl.c-fix-build-with-lib.patch b/package/freeswitch/0001-libs-srtp-crypto-hash-hmac_ossl.c-fix-build-with-lib.patch new file mode 100644 index 00000000000..eb717fc26d8 --- /dev/null +++ b/package/freeswitch/0001-libs-srtp-crypto-hash-hmac_ossl.c-fix-build-with-lib.patch @@ -0,0 +1,59 @@ +From c8cc6f1773ff370bb14bb963e2f632eef6d6a3c2 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 12 May 2022 23:22:42 +0200 +Subject: [PATCH] libs/srtp/crypto/hash/hmac_ossl.c: fix build with libressl >= + 3.5.0 + +Fix the following build failure with libressl >= 3.5.0: + +crypto/hash/hmac_ossl.c: In function 'srtp_hmac_alloc': +crypto/hash/hmac_ossl.c:88:55: error: invalid application of 'sizeof' to incomplete type 'HMAC_CTX' {aka 'struct hmac_ctx_st'} + 88 | pointer = (uint8_t *)srtp_crypto_alloc(sizeof(HMAC_CTX) + + | ^~~~~~~~ +crypto/hash/hmac_ossl.c:97:9: warning: implicit declaration of function 'HMAC_CTX_init'; did you mean 'HMAC_CTX_new'? [-Wimplicit-function-declaration] + 97 | HMAC_CTX_init(new_hmac_ctx); + | ^~~~~~~~~~~~~ + | HMAC_CTX_new +crypto/hash/hmac_ossl.c: In function 'srtp_hmac_dealloc': +crypto/hash/hmac_ossl.c:130:5: warning: implicit declaration of function 'HMAC_CTX_cleanup' [-Wimplicit-function-declaration] + 130 | HMAC_CTX_cleanup(hmac_ctx); + | ^~~~~~~~~~~~~~~~ +crypto/hash/hmac_ossl.c:133:40: error: invalid application of 'sizeof' to incomplete type 'HMAC_CTX' {aka 'struct hmac_ctx_st'} + 133 | octet_string_set_to_zero(a, sizeof(HMAC_CTX) + sizeof(srtp_auth_t)); + | ^~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/e696ead9ffffa5bb80928d75607bfbb9b263d3c6 + +Signed-off-by: Fabrice Fontaine +--- + libs/srtp/crypto/hash/hmac_ossl.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/libs/srtp/crypto/hash/hmac_ossl.c b/libs/srtp/crypto/hash/hmac_ossl.c +index 8146438b05..6730cbb35c 100644 +--- a/libs/srtp/crypto/hash/hmac_ossl.c ++++ b/libs/srtp/crypto/hash/hmac_ossl.c +@@ -79,7 +79,8 @@ static srtp_err_status_t srtp_hmac_alloc(srtp_auth_t **a, + + /* OpenSSL 1.1.0 made HMAC_CTX an opaque structure, which must be allocated + using HMAC_CTX_new. But this function doesn't exist in OpenSSL 1.0.x. */ +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) + { + /* allocate memory for auth and HMAC_CTX structures */ + uint8_t *pointer; +@@ -125,7 +126,8 @@ static srtp_err_status_t srtp_hmac_dealloc(srtp_auth_t *a) + + hmac_ctx = (HMAC_CTX *)a->state; + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) + HMAC_CTX_cleanup(hmac_ctx); + + /* zeroize entire state*/ +-- +2.35.1 + diff --git a/package/freeswitch/0002-core-fix--disable-libyuv.patch b/package/freeswitch/0002-core-fix--disable-libyuv.patch deleted file mode 100644 index 137cb27cf8e..00000000000 --- a/package/freeswitch/0002-core-fix--disable-libyuv.patch +++ /dev/null @@ -1,129 +0,0 @@ -From a2ce46c6fde38d6ac54a8a2ee1a5b391e2ed2071 Mon Sep 17 00:00:00 2001 -From: Sebastian Kemper -Date: Mon, 1 Nov 2021 09:59:09 +0100 -Subject: [PATCH] [core] fix "--disable-libyuv" - -Recent changes made it impossible to compile freeswitch without libyuv -support. - -src/switch_core_video.c: In function 'switch_img_read_from_file': -src/switch_core_video.c:3139:4: error: implicit declaration of function 'RAWToI420' [-Werror=implicit-function-declaration] -RAWToI420(data, width * 3, -^ -src/switch_core_video.c:3148:4: error: implicit declaration of function 'ABGRToARGB' [-Werror=implicit-function-declaration] -ABGRToARGB(data, width * 4, img->planes[SWITCH_PLANE_PACKED], img->stride[SWITCH_PLANE_PACKED], width, height); -^ - -Fix this my adding/moving the checks for "SWITCH_HAVE_YUV". - -Downloaded from upstream commit: -https://github.com/signalwire/freeswitch/commit/a2ce46c6fde38d6ac54a8a2ee1a5b391e2ed2071 - -Signed-off-by: Bernd Kuhls -Signed-off-by: Sebastian Kemper ---- - src/switch_core_video.c | 12 ++++++++++++ - tests/unit/switch_core_video.c | 4 ++++ - 2 files changed, 16 insertions(+) - -diff --git a/src/switch_core_video.c b/src/switch_core_video.c -index 7dbd685d6ee..0d377f9c3e4 100644 ---- a/src/switch_core_video.c -+++ b/src/switch_core_video.c -@@ -3116,6 +3116,7 @@ SWITCH_DECLARE(switch_status_t) switch_img_data_url_png(switch_image_t *img, cha - - SWITCH_DECLARE(switch_image_t *) switch_img_read_from_file(const char* file_name, switch_img_fmt_t img_fmt) - { -+#ifdef SWITCH_HAVE_YUV - int width = 0, height = 0, channels = 0; - int comp = STBI_rgb; - unsigned char *data = NULL; -@@ -3155,12 +3156,16 @@ SWITCH_DECLARE(switch_image_t *) switch_img_read_from_file(const char* file_name - } else if (data) { - stbi_image_free(data); - } -+#endif - - return NULL; - } - - SWITCH_DECLARE(switch_status_t) switch_img_write_to_file(switch_image_t *img, const char* file_name, int quality) - { -+#ifndef SWITCH_HAVE_YUV -+ return SWITCH_STATUS_FALSE; -+#else - int comp = STBI_rgb; - unsigned char *data = NULL; - const char *ext = strrchr(file_name, '.'); -@@ -3217,6 +3222,7 @@ SWITCH_DECLARE(switch_status_t) switch_img_write_to_file(switch_image_t *img, co - free(data); - - return ret ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE; -+#endif - } - - typedef struct data_url_context_s { -@@ -3224,14 +3230,19 @@ typedef struct data_url_context_s { - char **urlP; - } data_url_context_t; - -+#ifdef SWITCH_HAVE_YUV - static void data_url_write_func(void *context, void *data, int size) - { - switch_buffer_t *buffer = (switch_buffer_t *)context; - switch_buffer_write(buffer, data, size); - } -+#endif - - SWITCH_DECLARE(switch_status_t) switch_img_data_url(switch_image_t *img, char **urlP, const char *type, int quality) - { -+#ifndef SWITCH_HAVE_YUV -+ return SWITCH_STATUS_FALSE; -+#else - int comp = STBI_rgb; - unsigned char *data = NULL; - int stride_in_bytes = 0; -@@ -3300,6 +3311,7 @@ SWITCH_DECLARE(switch_status_t) switch_img_data_url(switch_image_t *img, char ** - switch_buffer_destroy(&buffer); - - return ret ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE; -+#endif /* SWITCH_HAVE_YUV */ - } - - -diff --git a/tests/unit/switch_core_video.c b/tests/unit/switch_core_video.c -index 27c96102929..e395db474d5 100644 ---- a/tests/unit/switch_core_video.c -+++ b/tests/unit/switch_core_video.c -@@ -48,6 +48,7 @@ FST_CORE_BEGIN("./conf") - } - FST_TEARDOWN_END() - -+#ifdef SWITCH_HAVE_YUV - FST_TEST_BEGIN(data_url_test) - { - char *data_url = NULL; -@@ -88,6 +89,7 @@ FST_CORE_BEGIN("./conf") - unlink(argb_filename); - } - FST_TEST_END() -+#endif /* SWITCH_HAVE_YUV */ - - FST_TEST_BEGIN(img_patch) - { -@@ -239,6 +241,7 @@ FST_CORE_BEGIN("./conf") - } - FST_TEST_END() - -+#ifdef SWITCH_HAVE_YUV - FST_TEST_BEGIN(stb_data_url) - { - switch_image_t *img = switch_img_alloc(NULL, SWITCH_IMG_FMT_I420, 120, 60, 1); -@@ -321,6 +324,7 @@ FST_CORE_BEGIN("./conf") - unlink(jpg_write_filename); - } - FST_TEST_END() -+#endif /* SWITCH_HAVE_YUV */ - } - FST_SUITE_END() - } diff --git a/package/freeswitch/Config.in b/package/freeswitch/Config.in index bad101486cf..1ab624c33cd 100644 --- a/package/freeswitch/Config.in +++ b/package/freeswitch/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_FREESWITCH depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # apr, included in freeswitch source depends on BR2_USE_WCHAR # uses wchar_t - select BR2_PACKAGE_FFMPEG_AVRESAMPLE if BR2_PACKAGE_FFMPEG select BR2_PACKAGE_FFMPEG_SWSCALE if BR2_PACKAGE_FFMPEG select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_JPEG diff --git a/package/freeswitch/freeswitch.hash b/package/freeswitch/freeswitch.hash index 8066c620c48..504be120900 100644 --- a/package/freeswitch/freeswitch.hash +++ b/package/freeswitch/freeswitch.hash @@ -1,12 +1,10 @@ -# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.7.-release.tar.xz.sha256 -sha256 0919bddc2ea9cab2e4944314e71637bea9dd4f40d510722a74ea032104594c41 freeswitch-1.10.7.-release.tar.xz +# From https://files.freeswitch.org/freeswitch-releases/freeswitch-1.10.10.-release.tar.xz.sha256 +sha256 d2c702c7f4bd6eca539c3981cf859ad5c1846d9283829e24cd75686f2322b9df freeswitch-1.10.10.-release.tar.xz # Locally computed sha256 75c933202f40939cdc3827fce20a1efdaa38291e2b5a65d234eb16e2cffda66a COPYING sha256 c3e3388768dae8bf4edcc4108f95be815b8a05c0b0aef6e4c3d8df81affdfa34 docs/OPENH264_BINARY_LICENSE.txt sha256 e8e26b16da14aa3e6ed5c22c705fdc1f45d6225fca461ea9f7314bcdfdc414c4 libs/apr/LICENSE -sha256 1eefb2ea1db0af7729a9d8a27d7c65d8a37ab185393f935b029aac6828ce315a libs/apr-util/LICENSE sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 libs/libvpx/LICENSE sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f libs/libyuv/LICENSE -sha256 7d72a8aee2c4b1a084200487992a5d86f5df6b535727a14c1874918e99d24600 libs/libzrtp/src/zrtp_legal.c sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae libs/srtp/LICENSE sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 src/mod/codecs/mod_isac/LICENSE diff --git a/package/freeswitch/freeswitch.mk b/package/freeswitch/freeswitch.mk index c576e5f2675..07d436cf0bd 100644 --- a/package/freeswitch/freeswitch.mk +++ b/package/freeswitch/freeswitch.mk @@ -4,20 +4,19 @@ # ################################################################################ -FREESWITCH_VERSION = 1.10.7 +FREESWITCH_VERSION = 1.10.10 FREESWITCH_SOURCE = freeswitch-$(FREESWITCH_VERSION).-release.tar.xz FREESWITCH_SITE = https://files.freeswitch.org/freeswitch-releases # External modules need headers/libs from staging FREESWITCH_INSTALL_STAGING = YES FREESWITCH_LICENSE = MPL-1.1, \ GPL-3.0+ with font exception (fonts), \ - Apache-2.0 (apr, apr-util), \ + Apache-2.0 (apr), \ BSD-3-Clause (libsrtp) FREESWITCH_LICENSE_FILES = \ COPYING \ libs/apr/LICENSE \ - libs/apr-util/LICENSE \ libs/srtp/LICENSE FREESWITCH_CPE_ID_VENDOR = freeswitch @@ -50,6 +49,10 @@ FREESWITCH_CONF_ENV += \ ac_cv_prog_PHP_CONFIG=false \ ac_cv_have_php_config=no +# disable pcap detection, pcap is an optional dependency for unit tests +FREESWITCH_CONF_ENV += \ + ac_cv_prog_HAVE_PCAP_CONFIG=false + # copied from freeswitch/configure.ac, line 258+ FREESWITCH_CONF_ENV += \ ac_cv_file__dev_ptmx=yes \ @@ -78,15 +81,6 @@ FREESWITCH_CONF_OPTS = \ --without-python \ --disable-system-xmlrpc-c -# zrtp supports a limited set of archs, sparc support is also broken due -# to a broken ld call by gcc, see libs/libzrtp/include/zrtp_config.h -ifeq ($(BR2_i386)$(BR2_arm)$(BR2_armeb)$(BR2_aarch64)$(BR2_aarch64_be)$(BR2_mips)$(BR2_mipsel)$(BR2_mips64)$(BR2_mips64el)$(BR2_powerpc)$(BR2_powerpc64)$(BR2_powerpcle)$(BR2_x86_64),y) -FREESWITCH_LICENSE_FILES += libs/libzrtp/src/zrtp_legal.c -FREESWITCH_CONF_OPTS += --enable-zrtp -else -FREESWITCH_CONF_OPTS += --disable-zrtp -endif - # Enable optional modules FREESWITCH_ENABLED_MODULES += \ applications/mod_avmd \ diff --git a/package/freetype/freetype.hash b/package/freetype/freetype.hash index 7abc3d96da5..a558a3e8462 100644 --- a/package/freetype/freetype.hash +++ b/package/freetype/freetype.hash @@ -1,8 +1,8 @@ -# From https://sourceforge.net/projects/freetype/files/freetype2/2.11.1/ -sha1 86bdc98b37efe447cf53420bf2c18402ff905112 freetype-2.11.1.tar.xz +# From https://sourceforge.net/projects/freetype/files/freetype2/2.12.1/ +sha1 5133eed28a7624ffabbf6d00aa3f68b841d62d80 freetype-2.12.1.tar.xz +sha256 4766f20157cc4cf0cd292f80bf917f92d1c439b243ac3018debf6b9140c41a7f freetype-2.12.1.tar.xz # Locally calculated -sha256 3333ae7cfda88429c97a7ae63b7d01ab398076c3b67182e960e5684050f2c5c8 freetype-2.11.1.tar.xz sha256 c85e842b7ff04d95dab7d68e812773de0f8b67940e5449d35b42c66eb0f619fe LICENSE.TXT sha256 08c135755dd589039470f1fdbb400daaabaaa50d0b366d19cebff4d22986baa1 docs/FTL.TXT sha256 c4120c6752c910c299e3bd9cb3a46ff262c268303ca2069b61f92f10a5656c18 docs/GPLv2.TXT diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk index 912e6c4daac..36ef3cb5270 100644 --- a/package/freetype/freetype.mk +++ b/package/freetype/freetype.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREETYPE_VERSION = 2.11.1 +FREETYPE_VERSION = 2.12.1 FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.xz FREETYPE_SITE = http://download.savannah.gnu.org/releases/freetype FREETYPE_INSTALL_STAGING = YES diff --git a/package/frotz/frotz.hash b/package/frotz/frotz.hash index e5024aa2cd0..145aa3800fc 100644 --- a/package/frotz/frotz.hash +++ b/package/frotz/frotz.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8da558828dd74d6d6ee30483bb32276ef918b8b72b7f6e89b4f7cb27e7abf58b frotz-2.53.tar.bz2 +sha256 bdf9131e6de49108c9f032200cea3cb4011e5ca0c9fbdbf5b0c05f7c56c81395 frotz-2.54.tar.bz2 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/frotz/frotz.mk b/package/frotz/frotz.mk index c1362b2ac6e..5af235137cd 100644 --- a/package/frotz/frotz.mk +++ b/package/frotz/frotz.mk @@ -4,7 +4,7 @@ # ################################################################################ -FROTZ_VERSION = 2.53 +FROTZ_VERSION = 2.54 FROTZ_SOURCE = frotz-$(FROTZ_VERSION).tar.bz2 FROTZ_SITE = $(call gitlab,DavidGriffith,frotz,$(FROTZ_VERSION)) FROTZ_DEPENDENCIES = host-pkgconf ncurses diff --git a/package/frr/0001-configure.ac-fix-enable_bmp-typo.patch b/package/frr/0001-configure.ac-fix-enable_bmp-typo.patch deleted file mode 100644 index c8ce500dfca..00000000000 --- a/package/frr/0001-configure.ac-fix-enable_bmp-typo.patch +++ /dev/null @@ -1,29 +0,0 @@ -From bacabf2476553d0e873b827359e1c8a4216c2f8c Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 16 Dec 2021 20:10:26 +0100 -Subject: [PATCH] configure.ac: fix enable_bmp typo - -enable_bmp doesn't exist, use enable_bgp_bmp - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/FRRouting/frr/pull/10236] ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 1bcc42ef8..c7a5f1286 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1806,7 +1806,7 @@ if test "$enable_bgp_vnc" != "no";then - fi - - bgpd_bmp=false --case "${enable_bmp}" in -+case "${enable_bgp_bmp}" in - no) - ;; - yes) --- -2.33.0 - diff --git a/package/frr/0002-lib-fix-elf_py-TLS-section-handling.patch b/package/frr/0002-lib-fix-elf_py-TLS-section-handling.patch deleted file mode 100644 index d491cb1a7d7..00000000000 --- a/package/frr/0002-lib-fix-elf_py-TLS-section-handling.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 3942ee1f7bc754dd0dd9ae79f89d0f2635be334f Mon Sep 17 00:00:00 2001 -From: David Lamparter -Date: Wed, 10 Nov 2021 15:30:07 +0100 -Subject: [PATCH] lib: fix elf_py TLS section handling - -... need to ignore TLS sections, their address is effectively -meaningless but can overlap other sections we actually need to access. - -Signed-off-by: David Lamparter - -[Retrieved from: -https://github.com/FRRouting/frr/commit/3942ee1f7bc754dd0dd9ae79f89d0f2635be334f] -Signed-off-by: Fabrice Fontaine ---- - lib/elf_py.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/lib/elf_py.c b/lib/elf_py.c -index 1c306893ad8..f230add6957 100644 ---- a/lib/elf_py.c -+++ b/lib/elf_py.c -@@ -636,6 +636,9 @@ static Elf_Scn *elf_find_addr(struct elffile *ef, uint64_t addr, size_t *idx) - Elf_Scn *scn = elf_getscn(ef->elf, i); - GElf_Shdr _shdr, *shdr = gelf_getshdr(scn, &_shdr); - -+ /* virtual address is kinda meaningless for TLS sections */ -+ if (shdr->sh_flags & SHF_TLS) -+ continue; - if (addr < shdr->sh_addr || - addr >= shdr->sh_addr + shdr->sh_size) - continue; diff --git a/package/frr/frr.hash b/package/frr/frr.hash index bb6c32b7bba..836f130b93c 100644 --- a/package/frr/frr.hash +++ b/package/frr/frr.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9d82c11b304ab89a30627fcbb4150f51e639f473f8563976e14101e796240599 frr-8.1.tar.gz +sha256 8a6b0e0fa1e89493ba84cf176674e55c7a814821fd02a7188095b76c37c3935f frr-8.4.2.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/frr/frr.mk b/package/frr/frr.mk index 0e6ab7a815e..abae784c40e 100644 --- a/package/frr/frr.mk +++ b/package/frr/frr.mk @@ -4,7 +4,7 @@ # ################################################################################ -FRR_VERSION = 8.1 +FRR_VERSION = 8.4.2 FRR_SITE = $(call github,FRRouting,frr,frr-$(FRR_VERSION)) FRR_LICENSE = GPL-2.0 FRR_LICENSE_FILES = COPYING diff --git a/package/fscryptctl/fscryptctl.hash b/package/fscryptctl/fscryptctl.hash index b06b96c10f2..0dcca6893ed 100644 --- a/package/fscryptctl/fscryptctl.hash +++ b/package/fscryptctl/fscryptctl.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 970a8febbcbf315313711d8a7ee3d954dea593d8087744d3cba65f6cb4bebcc1 fscryptctl-f037dcf4354ce8f25d0f371b58dfe7a7ac27576f.tar.gz -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE +sha256 3828d5ad9b93664b9fec0174fc5d8e96d7b021a7896da74efe18fabe5f01d638 fscryptctl-1.0.0.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/fscryptctl/fscryptctl.mk b/package/fscryptctl/fscryptctl.mk index 4275bf2b836..0546f67a1f2 100644 --- a/package/fscryptctl/fscryptctl.mk +++ b/package/fscryptctl/fscryptctl.mk @@ -4,13 +4,14 @@ # ################################################################################ -FSCRYPTCTL_VERSION = f037dcf4354ce8f25d0f371b58dfe7a7ac27576f -FSCRYPTCTL_SITE = $(call github,google,fscryptctl,$(FSCRYPTCTL_VERSION)) +FSCRYPTCTL_VERSION = 1.0.0 +FSCRYPTCTL_SITE = $(call github,google,fscryptctl,v$(FSCRYPTCTL_VERSION)) FSCRYPTCTL_LICENSE = Apache-2.0 FSCRYPTCTL_LICENSE_FILES = LICENSE define FSCRYPTCTL_BUILD_CMDS - $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) fscryptctl + $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(TARGET_CFLAGS) -std=c99" fscryptctl endef define FSCRYPTCTL_INSTALL_TARGET_CMDS diff --git a/package/fstrcmp/fstrcmp.hash b/package/fstrcmp/fstrcmp.hash index 9a43c59c093..fbc53b1b44a 100644 --- a/package/fstrcmp/fstrcmp.hash +++ b/package/fstrcmp/fstrcmp.hash @@ -1,6 +1,6 @@ # From https://sourceforge.net/projects/fstrcmp/files/fstrcmp/0.7/ -md5 9c440bbdfcad9fd22e38f2388715b0cc fstrcmp-0.7.D001.tar.gz -sha1 bb848118fb157dc624ae9fac0566a64cc85f2ef2 fstrcmp-0.7.D001.tar.gz +md5 9c440bbdfcad9fd22e38f2388715b0cc fstrcmp-0.7.D001.tar.gz +sha1 bb848118fb157dc624ae9fac0566a64cc85f2ef2 fstrcmp-0.7.D001.tar.gz # Locally computed -sha256 e4018e850f80700acee8da296e56e15b1eef711ab15157e542e7d7e1237c3476 fstrcmp-0.7.D001.tar.gz -sha256 5352e426b563eda9252d76be92337b49f7b5cfdd1302a1e8d99389840c0e46be LICENSE +sha256 e4018e850f80700acee8da296e56e15b1eef711ab15157e542e7d7e1237c3476 fstrcmp-0.7.D001.tar.gz +sha256 5352e426b563eda9252d76be92337b49f7b5cfdd1302a1e8d99389840c0e46be LICENSE diff --git a/package/fstrcmp/fstrcmp.mk b/package/fstrcmp/fstrcmp.mk index 9c42159afb0..294104b2840 100644 --- a/package/fstrcmp/fstrcmp.mk +++ b/package/fstrcmp/fstrcmp.mk @@ -15,6 +15,12 @@ FSTRCMP_CONF_ENV = LIBTOOL="$(HOST_DIR)/bin/libtool" FSTRCMP_MAKE_OPTS = all-bin libdir/pkgconfig/fstrcmp.pc +# fstrcmp does not carry and use the usual ltmain.sh wrappers, so it does not +# inherit from our libtool patches to make -static behave like -all-static. +ifeq ($(BR2_STATIC_LIBS),y) +FSTRCMP_MAKE_OPTS += LDFLAGS="$(TARGET_LDFLAGS) -all-static" +endif + # We need to install the package files ourselves due to upstream trying # to install a .lai file which is missing because of rpath removal define FSTRCMP_INSTALL_STAGING_CMDS diff --git a/package/ftop/ftop.hash b/package/ftop/ftop.hash index cf0d99dbe24..b7849d65b52 100644 --- a/package/ftop/ftop.hash +++ b/package/ftop/ftop.hash @@ -1,6 +1,6 @@ # From https://sourceforge.net/projects/ftop/files/ftop/1.0/ -md5 57c68b6e7431f4219d9eddaebcb395da ftop-1.0.tar.bz2 -sha1 d3ef1b74825f50c7c442d299b29d23c2478f199b ftop-1.0.tar.bz2 +md5 57c68b6e7431f4219d9eddaebcb395da ftop-1.0.tar.bz2 +sha1 d3ef1b74825f50c7c442d299b29d23c2478f199b ftop-1.0.tar.bz2 # Locally computed -sha256 3a705f4f291384344cd32c3dd5f5f6a7cd7cea7624c83cb7e923966dbcd47f82 ftop-1.0.tar.bz2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 3a705f4f291384344cd32c3dd5f5f6a7cd7cea7624c83cb7e923966dbcd47f82 ftop-1.0.tar.bz2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/fuse-overlayfs/fuse-overlayfs.hash b/package/fuse-overlayfs/fuse-overlayfs.hash index f9473c154a9..aa5438755e6 100644 --- a/package/fuse-overlayfs/fuse-overlayfs.hash +++ b/package/fuse-overlayfs/fuse-overlayfs.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 6c81b65b71067b303aaa9871f512c2cabc23e2b793f19c6c854d01a492b5a923 fuse-overlayfs-1.5.0.tar.gz +sha256 4351eaed7cf26a5012c14c6e0fc883ef65a7b5dcc95ba129ce485904106c25a9 fuse-overlayfs-1.10.tar.gz # Locally computed sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/fuse-overlayfs/fuse-overlayfs.mk b/package/fuse-overlayfs/fuse-overlayfs.mk index 0ad7dbc51d3..1633d3bd41a 100644 --- a/package/fuse-overlayfs/fuse-overlayfs.mk +++ b/package/fuse-overlayfs/fuse-overlayfs.mk @@ -4,7 +4,7 @@ # ################################################################################ -FUSE_OVERLAYFS_VERSION = 1.5.0 +FUSE_OVERLAYFS_VERSION = 1.10 FUSE_OVERLAYFS_SITE = $(call github,containers,fuse-overlayfs,v$(FUSE_OVERLAYFS_VERSION)) FUSE_OVERLAYFS_LICENSE = GPL-3.0 FUSE_OVERLAYFS_LICENSE_FILES = COPYING diff --git a/package/fwts/0001-build-do-not-use-Werror.patch b/package/fwts/0001-build-do-not-use-Werror.patch index 715c4f63a53..c6a84537ed2 100644 --- a/package/fwts/0001-build-do-not-use-Werror.patch +++ b/package/fwts/0001-build-do-not-use-Werror.patch @@ -1,4 +1,4 @@ -From e481c2f990ffa71f205d4b9daf0823e71269a7f3 Mon Sep 17 00:00:00 2001 +From feb05271b484b158c14611839f968109e9cf3082 Mon Sep 17 00:00:00 2001 From: Erico Nunes Date: Fri, 12 Aug 2016 23:11:56 +0200 Subject: [PATCH] fwts: do not use -Werror @@ -25,7 +25,7 @@ Signed-off-by: Vincent Stehlé 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac -index f40c3678..0ff5025b 100644 +index ca2f54e2..ed584abf 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ @@ -36,25 +36,25 @@ index f40c3678..0ff5025b 100644 AC_CANONICAL_HOST AC_CONFIG_MACRO_DIR([m4]) diff --git a/src/Makefile.am b/src/Makefile.am -index cdabb386..7c2e5730 100644 +index 3bb35e5c..e9fe92fe 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -12,7 +12,7 @@ AM_CPPFLAGS = \ - -I$(top_srcdir)/src/acpica/source/compiler \ +@@ -13,7 +13,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/efi_runtime \ - -pthread `pkg-config --cflags glib-2.0 gio-2.0` \ + -I$(top_srcdir)/smccc_test \ + -pthread \ - -Wall -Werror -Wextra \ -+ -Wall -Wextra \ ++ -Wall -Wextra \ -Wno-address-of-packed-member \ -Wfloat-equal -Wmissing-declarations \ -Wno-long-long -Wredundant-decls -Wshadow \ diff --git a/src/lib/src/Makefile.am b/src/lib/src/Makefile.am -index 55c52b41..50efa97a 100644 +index d5d53dd7..76c48d4d 100644 --- a/src/lib/src/Makefile.am +++ b/src/lib/src/Makefile.am -@@ -25,7 +25,7 @@ AM_CPPFLAGS = \ - `pkg-config --silence-errors --cflags json-c` \ - `pkg-config --cflags glib-2.0 gio-2.0` \ +@@ -22,7 +22,7 @@ AM_CPPFLAGS = \ + -I$(top_srcdir)/src/acpica/source/include \ + -I$(top_srcdir)/src/acpica/source/compiler \ -DDATAROOTDIR=\"$(datarootdir)\" \ - -Wall -Werror -Wextra \ + -Wall -Wextra \ @@ -62,7 +62,7 @@ index 55c52b41..50efa97a 100644 pkglib_LTLIBRARIES = libfwts.la diff --git a/src/utilities/Makefile.am b/src/utilities/Makefile.am -index 1fc0fc02..53614e33 100644 +index de38f070..785975ff 100644 --- a/src/utilities/Makefile.am +++ b/src/utilities/Makefile.am @@ -16,7 +16,7 @@ @@ -75,5 +75,5 @@ index 1fc0fc02..53614e33 100644 bin_PROGRAMS = kernelscan -- -2.30.2 +2.36.1 diff --git a/package/fwts/Config.in b/package/fwts/Config.in index ac9a2e39098..08608d1dd7b 100644 --- a/package/fwts/Config.in +++ b/package/fwts/Config.in @@ -1,6 +1,13 @@ +config BR2_PACKAGE_FWTS_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_FWTS bool "fwts" - depends on BR2_i386 || BR2_x86_64 || BR2_aarch64 + depends on BR2_PACKAGE_FWTS_ARCH_SUPPORTS depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS # libbsd depends on BR2_USE_MMU # libglib2 depends on BR2_USE_WCHAR # libglib2, libbsd @@ -33,7 +40,7 @@ comment "efi_runtime module needs a Linux kernel to be built" endif comment "fwts needs a glibc toolchain w/ wchar, threads, dynamic library" - depends on BR2_i386 || BR2_x86_64 || BR2_aarch64 + depends on BR2_PACKAGE_FWTS_ARCH_SUPPORTS depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS # libbsd depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ diff --git a/package/fwts/fwts.hash b/package/fwts/fwts.hash index 8634980e036..612bc768dd0 100644 --- a/package/fwts/fwts.hash +++ b/package/fwts/fwts.hash @@ -1,5 +1,5 @@ # Hash from: http://fwts.ubuntu.com/release/SHA256SUMS -sha256 17d1f0b9639e0f9b092ed8233be2d63d6c44ea8d2a76be0fb5902cc867961374 fwts-V21.11.00.tar.gz +sha256 fee1c323fb9725c2b99c348c434d63196391cad66566d34b42707e55d14d7f25 fwts-V22.09.00.tar.gz # Hash for license file sha256 fbbea748555635dd8c7e6e2f99cddd778f5ee3f9e3510775183bf9799076e5e5 debian/copyright diff --git a/package/fwts/fwts.mk b/package/fwts/fwts.mk index 6634cdc40e6..3af54a1afdf 100644 --- a/package/fwts/fwts.mk +++ b/package/fwts/fwts.mk @@ -4,7 +4,7 @@ # ################################################################################ -FWTS_VERSION = 21.11.00 +FWTS_VERSION = 22.09.00 FWTS_SOURCE = fwts-V$(FWTS_VERSION).tar.gz FWTS_SITE = http://fwts.ubuntu.com/release FWTS_STRIP_COMPONENTS = 0 @@ -15,7 +15,11 @@ FWTS_DEPENDENCIES = host-bison host-flex host-pkgconf libglib2 libbsd \ $(if $(BR2_PACKAGE_BASH_COMPLETION),bash-completion) \ $(if $(BR2_PACKAGE_DTC),dtc) -ifdef BR2_PACKAGE_FWTS_EFI_RUNTIME_MODULE +ifeq ($(BR2_OPTIMIZE_0),y) +FWTS_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -O1" +endif + +ifeq ($(BR2_PACKAGE_FWTS_EFI_RUNTIME_MODULE),y) FWTS_MODULE_SUBDIRS = efi_runtime $(eval $(kernel-module)) endif diff --git a/package/fwup/fwup.hash b/package/fwup/fwup.hash index 2e5b2b1f6c0..51ec444bcbc 100644 --- a/package/fwup/fwup.hash +++ b/package/fwup/fwup.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 18ae6753145cef2fd5f5fc83e29c2d883e570668d8aa064ee6c94d4c5e44d73d fwup-1.9.0.tar.gz +sha256 9684551647f0ddd043f9ff46f7bec8eacb2da1ac29d6d8d5d775c346173b8e88 fwup-1.9.1.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/fwup/fwup.mk b/package/fwup/fwup.mk index 62016d94e36..a6395d583db 100644 --- a/package/fwup/fwup.mk +++ b/package/fwup/fwup.mk @@ -4,7 +4,7 @@ # ################################################################################ -FWUP_VERSION = 1.9.0 +FWUP_VERSION = 1.9.1 FWUP_SITE = $(call github,fwup-home,fwup,v$(FWUP_VERSION)) FWUP_LICENSE = Apache-2.0 FWUP_LICENSE_FILES = LICENSE diff --git a/package/fxdiv/0001-CMake-don-t-enable-CXX-unless-building-tests-benchma.patch b/package/fxdiv/0001-CMake-don-t-enable-CXX-unless-building-tests-benchma.patch new file mode 100644 index 00000000000..0336f5e1ccd --- /dev/null +++ b/package/fxdiv/0001-CMake-don-t-enable-CXX-unless-building-tests-benchma.patch @@ -0,0 +1,49 @@ +From 8c2d8fc60306a8edd21182a1f5f267a7aca55763 Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Sun, 29 Jan 2023 21:18:28 -0700 +Subject: [PATCH] CMake: don't enable CXX unless building tests/benchmarks + +We only need CXX support when building tests/benchmarks. + +Fixes: +CMake Error at CMakeLists.txt:4 (PROJECT): + No CMAKE_CXX_COMPILER could be found. + + Tell CMake where to find the compiler by setting either the environment + variable "CXX" or the CMake cache entry CMAKE_CXX_COMPILER to the full path + to the compiler, or to the compiler name if it is in the PATH. + +Signed-off-by: James Hilliard +[Upstream status: +https://github.com/Maratyszcza/FXdiv/pull/3] +--- + CMakeLists.txt | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index bcae6b5..c75f558 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,7 +1,7 @@ + CMAKE_MINIMUM_REQUIRED(VERSION 3.5 FATAL_ERROR) + + # ---[ Project +-PROJECT(FXdiv C CXX) ++PROJECT(FXdiv C) + + # ---[ Options. + OPTION(FXDIV_USE_INLINE_ASSEMBLY "Allow use of inline assembly in FXdiv" OFF) +@@ -16,6 +16,10 @@ ENDIF() + # ---[ CMake options + INCLUDE(GNUInstallDirs) + ++IF(FXDIV_BUILD_TESTS OR FXDIV_BUILD_BENCHMARKS) ++ ENABLE_LANGUAGE(CXX) ++ENDIF() ++ + IF(FXDIV_BUILD_TESTS) + ENABLE_TESTING() + ENDIF() +-- +2.34.1 + diff --git a/package/fxdiv/Config.in b/package/fxdiv/Config.in new file mode 100644 index 00000000000..5aa714e44ae --- /dev/null +++ b/package/fxdiv/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_FXDIV + bool "fxdiv" + help + Header-only library for division via fixed-point + multiplication by inverse. + + https://github.com/Maratyszcza/FXdiv diff --git a/package/fxdiv/fxdiv.hash b/package/fxdiv/fxdiv.hash new file mode 100644 index 00000000000..2142d84e090 --- /dev/null +++ b/package/fxdiv/fxdiv.hash @@ -0,0 +1,4 @@ +# Locally calculated +sha256 ec74d882a0a47cfd9c0f95bc4fae9901a4ade802a96a3b76e02671bb7340a4c5 fxdiv-63058eff77e11aa15bf531df5dd34395ec3017c8.tar.gz +# License files, locally calculated +sha256 7cac00006125b1486a27e4801ed66357236e984c540bd323945ab7b66b078ec3 LICENSE diff --git a/package/fxdiv/fxdiv.mk b/package/fxdiv/fxdiv.mk new file mode 100644 index 00000000000..06dbf0648d4 --- /dev/null +++ b/package/fxdiv/fxdiv.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# fxdiv +# +################################################################################ + +FXDIV_VERSION = 63058eff77e11aa15bf531df5dd34395ec3017c8 +FXDIV_SITE = $(call github,Maratyszcza,FXdiv,$(FXDIV_VERSION)) +FXDIV_LICENSE = MIT +FXDIV_LICENSE_FILES = LICENSE +FXDIV_INSTALL_STAGING = YES +# Only installs a header +FXDIV_INSTALL_TARGET = NO + +FXDIV_CONF_OPTS = \ + -DFXDIV_BUILD_TESTS=OFF \ + -DFXDIV_BUILD_BENCHMARKS=OFF + +$(eval $(cmake-package)) diff --git a/package/fxload/0001-fix-static-build.patch b/package/fxload/0001-fix-static-build.patch new file mode 100644 index 00000000000..9ce49baa6e6 --- /dev/null +++ b/package/fxload/0001-fix-static-build.patch @@ -0,0 +1,25 @@ +fix static build + +Fix the following static build failure: + +/home/buildroot/autobuild/instance-3/output-1/host/bin/sh4-buildroot-linux-musl-gcc -o fxload ezusb.o main.o +/home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/sh4-buildroot-linux-musl/10.3.0/../../../../sh4-buildroot-linux-musl/bin/ld: /home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/sh4-buildroot-linux-musl/10.3.0/libgcc.a(unwind-dw2.o): in function `size_of_encoded_value': +/home/buildroot/autobuild/instance-3/output-1/build/host-gcc-final-10.3.0/build/sh4-buildroot-linux-musl/libgcc/../../../libgcc/unwind-pe.h:89: undefined reference to `abort' + +Fixes: + - http://autobuild.buildroot.org/results/bca28d7a6d2b324fb61fe99b8af4b86caa2350ee + +Signed-off-by: Fabrice Fontaine + +diff -Naur fxload-2008_10_13.orig/Makefile fxload-2008_10_13/Makefile +--- fxload-2008_10_13.orig/Makefile 2022-06-11 22:11:02.845916977 +0200 ++++ fxload-2008_10_13/Makefile 2022-06-11 22:12:25.118006070 +0200 +@@ -39,7 +39,7 @@ + + # object files + $(PROG): $(FILES_OBJ) +- $(CC) -o $(PROG) $(FILES_OBJ) ++ $(CC) $(LDFLAGS) -o $(PROG) $(FILES_OBJ) + + %.o: %.c + $(CC) -c $(CFLAGS) $< -o $@ diff --git a/package/gauche/gauche.hash b/package/gauche/gauche.hash index dea23c1e339..65e7da9ee18 100644 --- a/package/gauche/gauche.hash +++ b/package/gauche/gauche.hash @@ -1,6 +1,6 @@ -# From https://sourceforge.net/projects/gauche/files/Gauche/ -sha1 ad5e15021764b733ec913cca8b77c9a53d4ee997 Gauche-0.9.9.tgz -md5 20d8ed835ae0bc97cceed78a71f9857b Gauche-0.9.9.tgz +# Locally calculated after checking signature +# https://github.com/shirok/Gauche/releases/download/release0_9_12/Gauche-0.9.12.tgz.asc +sha256 b4ae64921b07a96661695ebd5aac0dec813d1a68e546a61609113d7843f5b617 Gauche-0.9.12.tgz + # Locally calculated -sha256 4ca9325322a7efadb9680d156eb7b53521321c9ca4955c4cbe738bc2e1d7f7fb Gauche-0.9.9.tgz -sha256 13cb582677dbcdc5b34313c59b4a014e74ef2f5fd80e514a0bd98fd8a4e45bed COPYING +sha256 bc09c643a05e14d7ea8264aa737c5c14d60a20911a0309e7b27da231bbb4525d COPYING diff --git a/package/gauche/gauche.mk b/package/gauche/gauche.mk index fe0a613a9d6..b635c488fe9 100644 --- a/package/gauche/gauche.mk +++ b/package/gauche/gauche.mk @@ -4,15 +4,15 @@ # ################################################################################ -GAUCHE_VERSION = 0.9.9 +GAUCHE_VERSION = 0.9.12 GAUCHE_SOURCE = Gauche-$(GAUCHE_VERSION).tgz -GAUCHE_SITE = http://downloads.sourceforge.net/project/gauche/Gauche +GAUCHE_SITE = https://github.com/shirok/Gauche/releases/download/release$(subst .,_,$(GAUCHE_VERSION)) GAUCHE_LICENSE = BSD-3-Clause, Boehm-gc, SRFI (srfi-11.scm), reload (reload.scm) GAUCHE_LICENSE_FILES = COPYING GAUCHE_DEPENDENCIES = host-gauche HOST_GAUCHE_CONF_OPTS = --without-zlib -GAUCHE_CONF_OPTS = --without-libatomic-ops +GAUCHE_CONF_OPTS = --with-libatomic-ops=none # Enable embedded axTLS GAUCHE_TLS_LIBS = axtls diff --git a/package/gawk/0001-Fix-a-bug-with-Node_elem_new.patch b/package/gawk/0001-Fix-a-bug-with-Node_elem_new.patch new file mode 100644 index 00000000000..8cbe9c6d02d --- /dev/null +++ b/package/gawk/0001-Fix-a-bug-with-Node_elem_new.patch @@ -0,0 +1,29 @@ +From baab183439ff4e0c6b77d62156d447e61fc1dcfb Mon Sep 17 00:00:00 2001 +From: "Arnold D. Robbins" +Date: Wed, 14 Sep 2022 21:08:59 +0300 +Subject: [PATCH] Fix a bug with Node_elem_new. + +Signed-off-by: James Hilliard +[james.hilliard1@gmail.com: backport from upstream commit +baab183439ff4e0c6b77d62156d447e61fc1dcfb] +[yann.morin.1998@free.fr: drop all hunks about tests and changelogs] +Signed-off-by: Yann E. MORIN +--- + interpret.h | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/interpret.h b/interpret.h +index 57d060e6..268655b2 100644 +--- a/interpret.h ++++ b/interpret.h +@@ -238,6 +238,7 @@ uninitialized_scalar: + _("reference to uninitialized argument `%s'") : + _("reference to uninitialized variable `%s'"), + save_symbol->vname); ++ UPREF(m); + PUSH(m); + break; + +-- +2.34.1 + diff --git a/package/gawk/0001-no-versioned.patch b/package/gawk/0001-no-versioned.patch deleted file mode 100644 index c5bbdddeb5e..00000000000 --- a/package/gawk/0001-no-versioned.patch +++ /dev/null @@ -1,16 +0,0 @@ -Disabled versioned installation of binaries to save space. - -Signed-off-by: Gustavo Zacarias -[Gustavo: update for 4.1.2] - -diff -Nura gawk-4.1.2.orig/Makefile.in gawk-4.1.2/Makefile.in ---- gawk-4.1.2.orig/Makefile.in 2015-04-29 16:11:09.367925925 -0300 -+++ gawk-4.1.2/Makefile.in 2015-04-29 16:11:25.308466495 -0300 -@@ -1173,6 +1173,7 @@ - # (This is done universally, which may not always be right, but - # there's no easy way to distinguish GNU from non-GNU systems.) - install-exec-hook: -+foo: - (cd $(DESTDIR)$(bindir); \ - $(LN) gawk$(EXEEXT) gawk-$(VERSION)$(EXEEXT) 2>/dev/null ; \ - if [ ! -f awk$(EXEEXT) ]; \ diff --git a/package/gawk/gawk.hash b/package/gawk/gawk.hash index 894c939c5bf..3ab0cfdbb3c 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.1.1.tar.xz.sig +# https://ftp.gnu.org/gnu/gawk/gawk-5.2.0.tar.xz.sig # Primary key fingerprint: D196 7C63 7887 1317 7D86 1ED7 DF59 7815 937E C0D2 -sha256 d87629386e894bbea11a5e00515fc909dc9b7249529dad9e6a3a2c77085f7ea2 gawk-5.1.1.tar.xz +sha256 e4ddbad1c2ef10e8e815ca80208d0162d4c983e6cca16f925e8418632d639018 gawk-5.2.0.tar.xz # Locally calculated sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/gawk/gawk.mk b/package/gawk/gawk.mk index b55c74d00ac..47f681339d0 100644 --- a/package/gawk/gawk.mk +++ b/package/gawk/gawk.mk @@ -4,7 +4,7 @@ # ################################################################################ -GAWK_VERSION = 5.1.1 +GAWK_VERSION = 5.2.0 GAWK_SOURCE = gawk-$(GAWK_VERSION).tar.xz GAWK_SITE = $(BR2_GNU_MIRROR)/gawk GAWK_DEPENDENCIES = host-gawk @@ -40,7 +40,7 @@ endef GAWK_POST_INSTALL_TARGET_HOOKS += GAWK_CREATE_SYMLINK define HOST_GAWK_CREATE_SYMLINK - ln -sf gawk $(HOST_DIR)/usr/bin/awk + ln -sf gawk $(HOST_DIR)/bin/awk endef HOST_GAWK_POST_INSTALL_HOOKS += HOST_GAWK_CREATE_SYMLINK diff --git a/package/gcc/10.3.0/0004-Remove-cyclades-from-libsanitizer.patch b/package/gcc/10.3.0/0004-Remove-cyclades-from-libsanitizer.patch deleted file mode 100644 index ee6e349a6ca..00000000000 --- a/package/gcc/10.3.0/0004-Remove-cyclades-from-libsanitizer.patch +++ /dev/null @@ -1,125 +0,0 @@ -From 745dae5923aba02982563481d75a21595df22ff8 Mon Sep 17 00:00:00 2001 -From: Tamar Christina -Date: Fri, 21 May 2021 10:30:59 +0100 -Subject: [PATCH] libsanitizer: Remove cyclades from libsanitizer - -The Linux kernel has removed the interface to cyclades from -the latest kernel headers[1] due to them being orphaned for the -past 13 years. - -libsanitizer uses this header when compiling against glibc, but -glibcs itself doesn't seem to have any references to cyclades. - -Further more it seems that the driver is broken in the kernel and -the firmware doesn't seem to be available anymore. - -As such since this is breaking the build of libsanitizer (and so the -GCC bootstrap[2]) I propose to remove this. - -[1] https://lkml.org/lkml/2021/3/2/153 -[2] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100379 - -(cherry picked from commit f7c5351552387bd43f6ca3631016d7f0dfe0f135) - -libsanitizer/ChangeLog: - - PR sanitizer/100379 - * sanitizer_common/sanitizer_common_interceptors_ioctl.inc: Cherry-pick - llvm-project revision f7c5351552387bd43f6ca3631016d7f0dfe0f135. - * sanitizer_common/sanitizer_platform_limits_posix.cpp: Likewise. - * sanitizer_common/sanitizer_platform_limits_posix.h: Likewise. - -Signed-off-by: Maxim Kochetkov ---- - .../sanitizer_common_interceptors_ioctl.inc | 9 --------- - .../sanitizer_platform_limits_posix.cpp | 11 ----------- - .../sanitizer_platform_limits_posix.h | 10 ---------- - 3 files changed, 30 deletions(-) - -diff --git a/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc -index 7f181258eab..b7da6598755 100644 ---- a/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc -+++ b/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc -@@ -370,15 +370,6 @@ static void ioctl_table_fill() { - - #if SANITIZER_GLIBC - // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE -- _(CYGETDEFTHRESH, WRITE, sizeof(int)); -- _(CYGETDEFTIMEOUT, WRITE, sizeof(int)); -- _(CYGETMON, WRITE, struct_cyclades_monitor_sz); -- _(CYGETTHRESH, WRITE, sizeof(int)); -- _(CYGETTIMEOUT, WRITE, sizeof(int)); -- _(CYSETDEFTHRESH, NONE, 0); -- _(CYSETDEFTIMEOUT, NONE, 0); -- _(CYSETTHRESH, NONE, 0); -- _(CYSETTIMEOUT, NONE, 0); - _(EQL_EMANCIPATE, WRITE, struct_ifreq_sz); - _(EQL_ENSLAVE, WRITE, struct_ifreq_sz); - _(EQL_GETMASTRCFG, WRITE, struct_ifreq_sz); -diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp -index 35a690cba5c..6e5c330b98e 100644 ---- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp -+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp -@@ -143,7 +143,6 @@ typedef struct user_fpregs elf_fpregset_t; - # include - #endif - #include --#include - #include - #include - #include -@@ -460,7 +459,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); - - #if SANITIZER_GLIBC - unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct); -- unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor); - #if EV_VERSION > (0x010000) - unsigned struct_input_keymap_entry_sz = sizeof(struct input_keymap_entry); - #else -@@ -824,15 +822,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); - #endif // SANITIZER_LINUX - - #if SANITIZER_LINUX && !SANITIZER_ANDROID -- unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH; -- unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT; -- unsigned IOCTL_CYGETMON = CYGETMON; -- unsigned IOCTL_CYGETTHRESH = CYGETTHRESH; -- unsigned IOCTL_CYGETTIMEOUT = CYGETTIMEOUT; -- unsigned IOCTL_CYSETDEFTHRESH = CYSETDEFTHRESH; -- unsigned IOCTL_CYSETDEFTIMEOUT = CYSETDEFTIMEOUT; -- unsigned IOCTL_CYSETTHRESH = CYSETTHRESH; -- unsigned IOCTL_CYSETTIMEOUT = CYSETTIMEOUT; - unsigned IOCTL_EQL_EMANCIPATE = EQL_EMANCIPATE; - unsigned IOCTL_EQL_ENSLAVE = EQL_ENSLAVE; - unsigned IOCTL_EQL_GETMASTRCFG = EQL_GETMASTRCFG; -diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h -index ad358eef8b7..cba41ba5494 100644 ---- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h -+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h -@@ -983,7 +983,6 @@ extern unsigned struct_vt_mode_sz; - - #if SANITIZER_LINUX && !SANITIZER_ANDROID - extern unsigned struct_ax25_parms_struct_sz; --extern unsigned struct_cyclades_monitor_sz; - extern unsigned struct_input_keymap_entry_sz; - extern unsigned struct_ipx_config_data_sz; - extern unsigned struct_kbdiacrs_sz; -@@ -1328,15 +1327,6 @@ extern unsigned IOCTL_VT_WAITACTIVE; - #endif // SANITIZER_LINUX - - #if SANITIZER_LINUX && !SANITIZER_ANDROID --extern unsigned IOCTL_CYGETDEFTHRESH; --extern unsigned IOCTL_CYGETDEFTIMEOUT; --extern unsigned IOCTL_CYGETMON; --extern unsigned IOCTL_CYGETTHRESH; --extern unsigned IOCTL_CYGETTIMEOUT; --extern unsigned IOCTL_CYSETDEFTHRESH; --extern unsigned IOCTL_CYSETDEFTIMEOUT; --extern unsigned IOCTL_CYSETTHRESH; --extern unsigned IOCTL_CYSETTIMEOUT; - extern unsigned IOCTL_EQL_EMANCIPATE; - extern unsigned IOCTL_EQL_ENSLAVE; - extern unsigned IOCTL_EQL_GETMASTRCFG; --- -2.27.0 - diff --git a/package/gcc/10.3.0/0005-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch b/package/gcc/10.3.0/0005-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch deleted file mode 100644 index 5ac03d7c0c1..00000000000 --- a/package/gcc/10.3.0/0005-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch +++ /dev/null @@ -1,31 +0,0 @@ -From f80e9941739fb3973b61fc6a5abddef5ad2faf73 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Fri, 27 Mar 2020 21:23:53 +0100 -Subject: [PATCH] gcc: define _REENTRANT for OpenRISC when -pthread is passed - -The detection of pthread support fails on OpenRISC unless _REENTRANT -is defined. Added the CPP_SPEC definition to correct this. - -Patch sent upstream: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94372 - -Signed-off-by: Bernd Kuhls ---- - gcc/config/or1k/linux.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/gcc/config/or1k/linux.h b/gcc/config/or1k/linux.h -index cbdc781418f..36303af892c 100644 ---- a/gcc/config/or1k/linux.h -+++ b/gcc/config/or1k/linux.h -@@ -32,6 +32,8 @@ - #undef MUSL_DYNAMIC_LINKER - #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-or1k.so.1" - -+#define CPP_SPEC "%{pthread:-D_REENTRANT}" -+ - #undef LINK_SPEC - #define LINK_SPEC "%{h*} \ - %{static:-Bstatic} \ --- -2.31.1 - diff --git a/package/gcc/10.3.0/0001-Revert-re-PR-target-92095-internal-error-with-O1-mcp.patch b/package/gcc/10.4.0/0001-Revert-re-PR-target-92095-internal-error-with-O1-mcp.patch similarity index 94% rename from package/gcc/10.3.0/0001-Revert-re-PR-target-92095-internal-error-with-O1-mcp.patch rename to package/gcc/10.4.0/0001-Revert-re-PR-target-92095-internal-error-with-O1-mcp.patch index af0d2d7d02d..e8283afadb6 100644 --- a/package/gcc/10.3.0/0001-Revert-re-PR-target-92095-internal-error-with-O1-mcp.patch +++ b/package/gcc/10.4.0/0001-Revert-re-PR-target-92095-internal-error-with-O1-mcp.patch @@ -1,4 +1,4 @@ -From 0824d6819857f306583592bce96315893f91bd84 Mon Sep 17 00:00:00 2001 +From d672b64ae257e789311dfd0aea947972af64b966 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 20 Jan 2021 23:26:29 +0100 Subject: [PATCH] Revert "re PR target/92095 (internal error with -O1 @@ -45,10 +45,10 @@ index 5f9999a669c..37452b06415 100644 extern const char *output_cbranch (rtx, rtx, int, int, int, rtx_insn *); extern const char *output_return (rtx_insn *); diff --git a/gcc/config/sparc/sparc.c b/gcc/config/sparc/sparc.c -index d0843102148..14d112d8ca8 100644 +index 7cfa9f80676..3a721f19eb5 100644 --- a/gcc/config/sparc/sparc.c +++ b/gcc/config/sparc/sparc.c -@@ -4157,6 +4157,13 @@ eligible_for_sibcall_delay (rtx_insn *trial) +@@ -4243,6 +4243,13 @@ eligible_for_sibcall_delay (rtx_insn *trial) static bool sparc_cannot_force_const_mem (machine_mode mode, rtx x) { @@ -62,7 +62,7 @@ index d0843102148..14d112d8ca8 100644 switch (GET_CODE (x)) { case CONST_INT: -@@ -4192,11 +4199,9 @@ sparc_cannot_force_const_mem (machine_mode mode, rtx x) +@@ -4278,11 +4285,9 @@ sparc_cannot_force_const_mem (machine_mode mode, rtx x) } /* Global Offset Table support. */ @@ -76,7 +76,7 @@ index d0843102148..14d112d8ca8 100644 /* Return the SYMBOL_REF for the Global Offset Table. */ -@@ -4209,6 +4214,27 @@ sparc_got (void) +@@ -4295,6 +4300,27 @@ sparc_got (void) return got_symbol_rtx; } @@ -104,7 +104,7 @@ index d0843102148..14d112d8ca8 100644 /* Wrapper around the load_pcrel_sym{si,di} patterns. */ static rtx -@@ -4228,78 +4254,30 @@ gen_load_pcrel_sym (rtx op0, rtx op1, rtx op2) +@@ -4314,78 +4340,30 @@ gen_load_pcrel_sym (rtx op0, rtx op1, rtx op2) return insn; } @@ -189,7 +189,7 @@ index d0843102148..14d112d8ca8 100644 } /* Ensure that we are not using patterns that are not OK with PIC. */ -@@ -5464,7 +5442,7 @@ save_local_or_in_reg_p (unsigned int regno, int leaf_function) +@@ -5550,7 +5528,7 @@ save_local_or_in_reg_p (unsigned int regno, int leaf_function) return true; /* GOT register (%l7) if needed. */ @@ -198,7 +198,7 @@ index d0843102148..14d112d8ca8 100644 return true; /* If the function accesses prior frames, the frame pointer and the return -@@ -12507,9 +12485,10 @@ static void +@@ -12658,9 +12636,10 @@ static void sparc_file_end (void) { /* If we need to emit the special GOT helper function, do so now. */ @@ -210,7 +210,7 @@ index d0843102148..14d112d8ca8 100644 #ifdef DWARF2_UNWIND_INFO bool do_cfi; #endif -@@ -12546,22 +12525,17 @@ sparc_file_end (void) +@@ -12697,22 +12676,17 @@ sparc_file_end (void) #ifdef DWARF2_UNWIND_INFO do_cfi = dwarf2out_do_cfi_asm (); if (do_cfi) @@ -239,7 +239,7 @@ index d0843102148..14d112d8ca8 100644 #endif } -@@ -13056,10 +13030,7 @@ sparc_init_pic_reg (void) +@@ -13207,10 +13181,7 @@ sparc_init_pic_reg (void) edge entry_edge; rtx_insn *seq; @@ -252,10 +252,10 @@ index d0843102148..14d112d8ca8 100644 start_sequence (); diff --git a/gcc/config/sparc/sparc.md b/gcc/config/sparc/sparc.md -index 6e9ccb4ecfd..8fb0fa11aed 100644 +index b242c4b4481..7d08f50705a 100644 --- a/gcc/config/sparc/sparc.md +++ b/gcc/config/sparc/sparc.md -@@ -1601,7 +1601,10 @@ +@@ -1603,7 +1603,10 @@ (clobber (reg:P O7_REG))] "REGNO (operands[0]) == INTVAL (operands[3])" { @@ -324,5 +324,5 @@ index f00283f6e7b..67d4ac38095 100644 #include #include -- -2.30.2 +2.34.3 diff --git a/package/gcc/10.3.0/0002-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch b/package/gcc/10.4.0/0002-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch similarity index 96% rename from package/gcc/10.3.0/0002-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch rename to package/gcc/10.4.0/0002-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch index 73010c21ee7..62eb437c62f 100644 --- a/package/gcc/10.3.0/0002-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch +++ b/package/gcc/10.4.0/0002-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch @@ -1,4 +1,4 @@ -From 1dad3f95ffcd1871ca670a13a06fbedb1c3ce509 Mon Sep 17 00:00:00 2001 +From 8555b8d4f1d873d172c12a540ff97c57ed17f045 Mon Sep 17 00:00:00 2001 From: Stafford Horne Date: Sun, 2 May 2021 06:11:44 +0900 Subject: [PATCH] or1k: Add mcmodel option to handle large GOTs @@ -166,10 +166,10 @@ index 03c9b8d0bba..8e035075f8a 100644 Target RejectNegative Mask(CMOV) Enable generation of conditional move (l.cmov) instructions. By default the diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi -index eabeec944e7..eda350c99ec 100644 +index d7c787af226..848112e5b24 100644 --- a/gcc/doc/invoke.texi +++ b/gcc/doc/invoke.texi -@@ -1102,7 +1102,8 @@ Objective-C and Objective-C++ Dialects}. +@@ -1103,7 +1103,8 @@ Objective-C and Objective-C++ Dialects}. @gccoptlist{-mboard=@var{name} -mnewlib -mhard-mul -mhard-div @gol -msoft-mul -msoft-div @gol -msoft-float -mhard-float -mdouble-float -munordered-float @gol @@ -179,7 +179,7 @@ index eabeec944e7..eda350c99ec 100644 @emph{PDP-11 Options} @gccoptlist{-mfpu -msoft-float -mac0 -mno-ac0 -m40 -m45 -m10 @gol -@@ -25111,6 +25112,15 @@ Enable generation of shift with immediate (@code{l.srai}, @code{l.srli}, +@@ -25142,6 +25143,15 @@ Enable generation of shift with immediate (@code{l.srai}, @code{l.srli}, @code{l.slli}) instructions. By default extra instructions will be generated to store the immediate to a register first. @@ -196,5 +196,5 @@ index eabeec944e7..eda350c99ec 100644 @end table -- -2.25.1 +2.34.3 diff --git a/package/gcc/10.3.0/0003-or1k-Use-cmodel-large-when-building-crtstuff.patch b/package/gcc/10.4.0/0003-or1k-Use-cmodel-large-when-building-crtstuff.patch similarity index 93% rename from package/gcc/10.3.0/0003-or1k-Use-cmodel-large-when-building-crtstuff.patch rename to package/gcc/10.4.0/0003-or1k-Use-cmodel-large-when-building-crtstuff.patch index 7da0e8f7573..30d0c607f5d 100644 --- a/package/gcc/10.3.0/0003-or1k-Use-cmodel-large-when-building-crtstuff.patch +++ b/package/gcc/10.4.0/0003-or1k-Use-cmodel-large-when-building-crtstuff.patch @@ -1,4 +1,4 @@ -From 0354e007a6235df81e208fa89cbf1571a8b56975 Mon Sep 17 00:00:00 2001 +From 3499ecd7c93c4c431cab83312bc5eabbf383c182 Mon Sep 17 00:00:00 2001 From: Stafford Horne Date: Sun, 2 May 2021 06:11:45 +0900 Subject: [PATCH] or1k: Use cmodel=large when building crtstuff @@ -29,10 +29,10 @@ Signed-off-by: Giulio Benetti create mode 100644 libgcc/config/or1k/t-crtstuff diff --git a/libgcc/config.host b/libgcc/config.host -index c529cc40f0c..ddf0033e28c 100644 +index 89f41b56000..1210704d7e8 100644 --- a/libgcc/config.host +++ b/libgcc/config.host -@@ -1127,12 +1127,12 @@ nios2-*-*) +@@ -1137,12 +1137,12 @@ nios2-*-*) extra_parts="$extra_parts crti.o crtn.o" ;; or1k-*-linux*) @@ -56,5 +56,5 @@ index 00000000000..dcae7f3498e +# Compile crtbeginS.o and crtendS.o with -mcmodel=large +CRTSTUFF_T_CFLAGS_S += -mcmodel=large -- -2.25.1 +2.34.3 diff --git a/package/gcc/10.4.0/0004-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch b/package/gcc/10.4.0/0004-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch new file mode 100644 index 00000000000..e3dbbc7eb83 --- /dev/null +++ b/package/gcc/10.4.0/0004-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch @@ -0,0 +1,31 @@ +From d2e4e3e72b5f2f68d595dfd3a77f58744f3f243e Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Fri, 27 Mar 2020 21:23:53 +0100 +Subject: [PATCH] gcc: define _REENTRANT for OpenRISC when -pthread is passed + +The detection of pthread support fails on OpenRISC unless _REENTRANT +is defined. Added the CPP_SPEC definition to correct this. + +Patch sent upstream: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94372 + +Signed-off-by: Bernd Kuhls +--- + gcc/config/or1k/linux.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/gcc/config/or1k/linux.h b/gcc/config/or1k/linux.h +index 21cef067dda..2e1bb5601a9 100644 +--- a/gcc/config/or1k/linux.h ++++ b/gcc/config/or1k/linux.h +@@ -32,6 +32,8 @@ + #undef MUSL_DYNAMIC_LINKER + #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-or1k.so.1" + ++#define CPP_SPEC "%{pthread:-D_REENTRANT}" ++ + #undef LINK_SPEC + #define LINK_SPEC "%{h*} \ + %{static:-Bstatic} \ +-- +2.34.3 + diff --git a/package/gcc/10.4.0/0005-disable-split-stack-for-non-thread-builds.patch b/package/gcc/10.4.0/0005-disable-split-stack-for-non-thread-builds.patch new file mode 100644 index 00000000000..7ba9e0de545 --- /dev/null +++ b/package/gcc/10.4.0/0005-disable-split-stack-for-non-thread-builds.patch @@ -0,0 +1,26 @@ +From 14336d46b35577300dd68147a8f0c8165684850b 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/10.4.0/0006-fixinc-don-t-fix-machine-names-in-__has_include-.-PR.patch b/package/gcc/10.4.0/0006-fixinc-don-t-fix-machine-names-in-__has_include-.-PR.patch new file mode 100644 index 00000000000..8614537794a --- /dev/null +++ b/package/gcc/10.4.0/0006-fixinc-don-t-fix-machine-names-in-__has_include-.-PR.patch @@ -0,0 +1,124 @@ +From a6eedb593ca068d0ad8655dbb97fcd6371cba682 Mon Sep 17 00:00:00 2001 +From: Xi Ruoyao +Date: Mon, 28 Jun 2021 13:54:58 +0800 +Subject: [PATCH] fixinc: don't "fix" machine names in __has_include(...) + [PR91085] + +fixincludes/ + + PR other/91085 + * fixfixes.c (check_has_inc): New static function. + (machine_name_fix): Don't replace header names in + __has_include(...). + * inclhack.def (machine_name): Adjust test. + * tests/base/testing.h: Update. + +Upstream: 6bf383c37e6131a8e247e8a0997d55d65c830b6d +Signed-off-by: Thomas Petazzoni +--- + fixincludes/fixfixes.c | 45 ++++++++++++++++++++++++++++++-- + fixincludes/inclhack.def | 3 ++- + fixincludes/tests/base/testing.h | 2 +- + 3 files changed, 46 insertions(+), 4 deletions(-) + +diff --git a/fixincludes/fixfixes.c b/fixincludes/fixfixes.c +index 034e15d9985..3ff87812036 100644 +--- a/fixincludes/fixfixes.c ++++ b/fixincludes/fixfixes.c +@@ -477,6 +477,39 @@ FIX_PROC_HEAD( char_macro_def_fix ) + fputs (text, stdout); + } + ++/* Check if the pattern at pos is actually in a "__has_include(...)" ++ directive. Return the pointer to the ')' of this ++ "__has_include(...)" if it is, NULL otherwise. */ ++static const char * ++check_has_inc (const char *begin, const char *pos, const char *end) ++{ ++ static const char has_inc[] = "__has_include"; ++ const size_t has_inc_len = sizeof (has_inc) - 1; ++ const char *p; ++ ++ for (p = memmem (begin, pos - begin, has_inc, has_inc_len); ++ p != NULL; ++ p = memmem (p, pos - p, has_inc, has_inc_len)) ++ { ++ p += has_inc_len; ++ while (p < end && ISSPACE (*p)) ++ p++; ++ ++ /* "__has_include" may appear as "defined(__has_include)", ++ search for the next appearance then. */ ++ if (*p != '(') ++ continue; ++ ++ /* To avoid too much complexity, just hope there is never a ++ ')' in a header name. */ ++ p = memchr (p, ')', end - p); ++ if (p == NULL || p > pos) ++ return p; ++ } ++ ++ return NULL; ++} ++ + /* Fix for machine name #ifdefs that are not in the namespace reserved + by the C standard. They won't be defined if compiling with -ansi, + and the headers will break. We go to some trouble to only change +@@ -524,7 +557,7 @@ FIX_PROC_HEAD( machine_name_fix ) + /* If the 'name_pat' matches in between base and limit, we have + a bogon. It is not worth the hassle of excluding comments + because comments on #if/#ifdef lines are rare, and strings on +- such lines are illegal. ++ such lines are only legal in a "__has_include" directive. + + REG_NOTBOL means 'base' is not at the beginning of a line, which + shouldn't matter since the name_re has no ^ anchor, but let's +@@ -544,8 +577,16 @@ FIX_PROC_HEAD( machine_name_fix ) + break; + + p = base + match[0].rm_so; +- base += match[0].rm_eo; + ++ /* Check if the match is in __has_include(...) (PR 91085). */ ++ q = check_has_inc (base, p, limit); ++ if (q) ++ { ++ base = q + 1; ++ goto again; ++ } ++ ++ base += match[0].rm_eo; + /* One more test: if on the same line we have the same string + with the appropriate underscores, then leave it alone. + We want exactly two leading and trailing underscores. */ +diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def +index f58e7771e1c..71bd717c233 100644 +--- a/fixincludes/inclhack.def ++++ b/fixincludes/inclhack.def +@@ -3114,7 +3114,8 @@ fix = { + c_fix = machine_name; + + test_text = "/* MACH_DIFF: */\n" +- "#if defined( i386 ) || defined( sparc ) || defined( vax )" ++ "#if defined( i386 ) || defined( sparc ) || defined( vax ) || " ++ "defined( linux ) || __has_include ( )" + "\n/* no uniform test, so be careful :-) */"; + }; + +diff --git a/fixincludes/tests/base/testing.h b/fixincludes/tests/base/testing.h +index cf95321fb86..8b3accaf04e 100644 +--- a/fixincludes/tests/base/testing.h ++++ b/fixincludes/tests/base/testing.h +@@ -64,7 +64,7 @@ BSD43__IOWR('T', 1) /* Some are multi-line */ + + #if defined( MACHINE_NAME_CHECK ) + /* MACH_DIFF: */ +-#if defined( i386 ) || defined( sparc ) || defined( vax ) ++#if defined( i386 ) || defined( sparc ) || defined( vax ) || defined( linux ) || __has_include ( ) + /* no uniform test, so be careful :-) */ + #endif /* MACHINE_NAME_CHECK */ + +-- +2.37.3 + diff --git a/package/gcc/10.4.0/0007-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch b/package/gcc/10.4.0/0007-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch new file mode 100644 index 00000000000..7e9714e9cbe --- /dev/null +++ b/package/gcc/10.4.0/0007-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch @@ -0,0 +1,49 @@ +From ca01d2526917ec6e54b30472d3aedfd46d4ca585 Mon Sep 17 00:00:00 2001 +From: Stafford Horne +Date: Thu, 29 Sep 2022 15:32:39 +0100 +Subject: [PATCH] or1k: Only define TARGET_HAVE_TLS when HAVE_AS_TLS + +This was found when testing buildroot with linuxthreads enabled. In +this case, the build passes --disable-tls to the toolchain during +configuration. After building the OpenRISC toolchain it was still +generating TLS code sequences and causing linker failures such as: + + ..../or1k-buildroot-linux-uclibc-gcc -o gpsd-3.24/gpsctl .... -lusb-1.0 -lm -lrt -lnsl + ..../ld: ..../sysroot/usr/lib/libusb-1.0.so: undefined reference to `__tls_get_addr' + +This patch fixes this by disabling tls for the OpenRISC target when requested +via --disable-tls. + +gcc/ChangeLog: + + * config/or1k/or1k.c (TARGET_HAVE_TLS): Only define if + HAVE_AS_TLS is defined. + +Tested-by: Yann E. MORIN + +Upstream: https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=ca01d2526917ec6e54b30472d3aedfd46d4ca585 + +[Bernd: backported to 10.4.0] +Signed-off-by: Bernd Kuhls +--- + gcc/config/or1k/or1k.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/gcc/config/or1k/or1k.c b/gcc/config/or1k/or1k.c +index da2f59062ba..0ce7b234417 100644 +--- a/gcc/config/or1k/or1k.c ++++ b/gcc/config/or1k/or1k.c +@@ -2175,8 +2175,10 @@ or1k_output_mi_thunk (FILE *file, tree thunk_fndecl, + #undef TARGET_LEGITIMATE_ADDRESS_P + #define TARGET_LEGITIMATE_ADDRESS_P or1k_legitimate_address_p + ++#ifdef HAVE_AS_TLS + #undef TARGET_HAVE_TLS + #define TARGET_HAVE_TLS true ++#endif + + #undef TARGET_HAVE_SPECULATION_SAFE_VALUE + #define TARGET_HAVE_SPECULATION_SAFE_VALUE speculation_safe_value_not_needed +-- +2.39.3 + diff --git a/package/gcc/11.2.0/0001-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch b/package/gcc/11.4.0/0001-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch similarity index 95% rename from package/gcc/11.2.0/0001-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch rename to package/gcc/11.4.0/0001-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch index 6e32f953a3e..f927cd007d1 100644 --- a/package/gcc/11.2.0/0001-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch +++ b/package/gcc/11.4.0/0001-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch @@ -1,4 +1,4 @@ -From eff8110674ef193481d3657456a262beeb9951ff Mon Sep 17 00:00:00 2001 +From 35c0801efa26bf248d278b5711b77a19e95b2f57 Mon Sep 17 00:00:00 2001 From: Stafford Horne Date: Tue, 6 Apr 2021 05:47:17 +0900 Subject: [PATCH] or1k: Add mcmodel option to handle large GOTs @@ -28,7 +28,11 @@ gcc/ChangeLog: * config/or1k/or1k.opt (mcmodel=): New option. * doc/invoke.texi (OpenRISC Options): Document mcmodel. +Uptream: eff8110674ef193481d3657456a262beeb9951ff + Signed-off-by: Giulio Benetti +[Romain: add Upstream tag] +Signed-off-by: Romain Naour --- gcc/config/or1k/or1k-opts.h | 30 ++++++++++++++++++++++++++++++ gcc/config/or1k/or1k.c | 11 +++++++++-- @@ -166,10 +170,10 @@ index 6bd0f3eee6d..cc23e3b8856 100644 Target RejectNegative Mask(CMOV) Enable generation of conditional move (l.cmov) instructions. By default the diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi -index 57b97a0838c..d8a6b0b60c9 100644 +index f1217812280..90c6186fc14 100644 --- a/gcc/doc/invoke.texi +++ b/gcc/doc/invoke.texi -@@ -1141,7 +1141,8 @@ Objective-C and Objective-C++ Dialects}. +@@ -1136,7 +1136,8 @@ Objective-C and Objective-C++ Dialects}. @gccoptlist{-mboard=@var{name} -mnewlib -mhard-mul -mhard-div @gol -msoft-mul -msoft-div @gol -msoft-float -mhard-float -mdouble-float -munordered-float @gol @@ -179,7 +183,7 @@ index 57b97a0838c..d8a6b0b60c9 100644 @emph{PDP-11 Options} @gccoptlist{-mfpu -msoft-float -mac0 -mno-ac0 -m40 -m45 -m10 @gol -@@ -26684,6 +26685,15 @@ Enable generation of shift with immediate (@code{l.srai}, @code{l.srli}, +@@ -26444,6 +26445,15 @@ Enable generation of shift with immediate (@code{l.srai}, @code{l.srli}, @code{l.slli}) instructions. By default extra instructions will be generated to store the immediate to a register first. @@ -196,5 +200,5 @@ index 57b97a0838c..d8a6b0b60c9 100644 @end table -- -2.25.1 +2.34.3 diff --git a/package/gcc/11.2.0/0002-or1k-Use-cmodel-large-when-building-crtstuff.patch b/package/gcc/11.4.0/0002-or1k-Use-cmodel-large-when-building-crtstuff.patch similarity index 88% rename from package/gcc/11.2.0/0002-or1k-Use-cmodel-large-when-building-crtstuff.patch rename to package/gcc/11.4.0/0002-or1k-Use-cmodel-large-when-building-crtstuff.patch index 00dd5de2a30..eb451751356 100644 --- a/package/gcc/11.2.0/0002-or1k-Use-cmodel-large-when-building-crtstuff.patch +++ b/package/gcc/11.4.0/0002-or1k-Use-cmodel-large-when-building-crtstuff.patch @@ -1,4 +1,4 @@ -From da8a9d695b3c4b9397b5d9a27660bfa48af8d707 Mon Sep 17 00:00:00 2001 +From f75178ccd2f5e4d73e27cccffffada859b87be7d Mon Sep 17 00:00:00 2001 From: Stafford Horne Date: Wed, 21 Apr 2021 05:33:15 +0900 Subject: [PATCH] or1k: Use cmodel=large when building crtstuff @@ -21,7 +21,11 @@ libgcc/ChangeLog: * config.host (or1k-*, tmake_file): Add or1k/t-crtstuff. * config/or1k/t-crtstuff: New file. +Upstream: da8a9d695b3c4b9397b5d9a27660bfa48af8d707 + Signed-off-by: Giulio Benetti +[Romain: add Upstream tag] +Signed-off-by: Romain Naour --- libgcc/config.host | 4 ++-- libgcc/config/or1k/t-crtstuff | 2 ++ @@ -29,10 +33,10 @@ Signed-off-by: Giulio Benetti create mode 100644 libgcc/config/or1k/t-crtstuff diff --git a/libgcc/config.host b/libgcc/config.host -index 50f00062232..8ca7a00082a 100644 +index 45f8e19ada4..5523345abb0 100644 --- a/libgcc/config.host +++ b/libgcc/config.host -@@ -1119,12 +1119,12 @@ nios2-*-*) +@@ -1150,12 +1150,12 @@ nios2-*-*) extra_parts="$extra_parts crti.o crtn.o" ;; or1k-*-linux*) @@ -56,5 +60,5 @@ index 00000000000..dcae7f3498e +# Compile crtbeginS.o and crtendS.o with -mcmodel=large +CRTSTUFF_T_CFLAGS_S += -mcmodel=large -- -2.25.1 +2.34.3 diff --git a/package/gcc/11.2.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch b/package/gcc/11.4.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch similarity index 77% rename from package/gcc/11.2.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch rename to package/gcc/11.4.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch index 5ac03d7c0c1..cb407c78fc1 100644 --- a/package/gcc/11.2.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch +++ b/package/gcc/11.4.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch @@ -1,4 +1,4 @@ -From f80e9941739fb3973b61fc6a5abddef5ad2faf73 Mon Sep 17 00:00:00 2001 +From 48ced46a5f81f49737ea13d11a099e03062cf141 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 27 Mar 2020 21:23:53 +0100 Subject: [PATCH] gcc: define _REENTRANT for OpenRISC when -pthread is passed @@ -8,13 +8,17 @@ is defined. Added the CPP_SPEC definition to correct this. Patch sent upstream: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94372 +Upstream: cac2f69cdad434ad5cb60f5fe931d45cd82ef476 + Signed-off-by: Bernd Kuhls +[Romain: add Upstream tag] +Signed-off-by: Romain Naour --- gcc/config/or1k/linux.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gcc/config/or1k/linux.h b/gcc/config/or1k/linux.h -index cbdc781418f..36303af892c 100644 +index 196f3f3c8f0..0cbdc934af1 100644 --- a/gcc/config/or1k/linux.h +++ b/gcc/config/or1k/linux.h @@ -32,6 +32,8 @@ @@ -27,5 +31,5 @@ index cbdc781418f..36303af892c 100644 #define LINK_SPEC "%{h*} \ %{static:-Bstatic} \ -- -2.31.1 +2.34.3 diff --git a/package/gcc/11.4.0/0004-disable-split-stack-for-non-thread-builds.patch b/package/gcc/11.4.0/0004-disable-split-stack-for-non-thread-builds.patch new file mode 100644 index 00000000000..817997e925e --- /dev/null +++ b/package/gcc/11.4.0/0004-disable-split-stack-for-non-thread-builds.patch @@ -0,0 +1,26 @@ +From 590ef1956786bfd49dae7a5e2fed67509d06f36b 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/11.4.0/0005-fixinc-don-t-fix-machine-names-in-__has_include-.-PR.patch b/package/gcc/11.4.0/0005-fixinc-don-t-fix-machine-names-in-__has_include-.-PR.patch new file mode 100644 index 00000000000..88bc26e0d7e --- /dev/null +++ b/package/gcc/11.4.0/0005-fixinc-don-t-fix-machine-names-in-__has_include-.-PR.patch @@ -0,0 +1,124 @@ +From 3e878f9d1c473f91a1377193d4d8d2616357bed1 Mon Sep 17 00:00:00 2001 +From: Xi Ruoyao +Date: Mon, 28 Jun 2021 13:54:58 +0800 +Subject: [PATCH] fixinc: don't "fix" machine names in __has_include(...) + [PR91085] + +fixincludes/ + + PR other/91085 + * fixfixes.c (check_has_inc): New static function. + (machine_name_fix): Don't replace header names in + __has_include(...). + * inclhack.def (machine_name): Adjust test. + * tests/base/testing.h: Update. + +Upstream: 6bf383c37e6131a8e247e8a0997d55d65c830b6d +Signed-off-by: Thomas Petazzoni +--- + fixincludes/fixfixes.c | 45 ++++++++++++++++++++++++++++++-- + fixincludes/inclhack.def | 3 ++- + fixincludes/tests/base/testing.h | 2 +- + 3 files changed, 46 insertions(+), 4 deletions(-) + +diff --git a/fixincludes/fixfixes.c b/fixincludes/fixfixes.c +index 5b23a8b640d..404b420f302 100644 +--- a/fixincludes/fixfixes.c ++++ b/fixincludes/fixfixes.c +@@ -477,6 +477,39 @@ FIX_PROC_HEAD( char_macro_def_fix ) + fputs (text, stdout); + } + ++/* Check if the pattern at pos is actually in a "__has_include(...)" ++ directive. Return the pointer to the ')' of this ++ "__has_include(...)" if it is, NULL otherwise. */ ++static const char * ++check_has_inc (const char *begin, const char *pos, const char *end) ++{ ++ static const char has_inc[] = "__has_include"; ++ const size_t has_inc_len = sizeof (has_inc) - 1; ++ const char *p; ++ ++ for (p = memmem (begin, pos - begin, has_inc, has_inc_len); ++ p != NULL; ++ p = memmem (p, pos - p, has_inc, has_inc_len)) ++ { ++ p += has_inc_len; ++ while (p < end && ISSPACE (*p)) ++ p++; ++ ++ /* "__has_include" may appear as "defined(__has_include)", ++ search for the next appearance then. */ ++ if (*p != '(') ++ continue; ++ ++ /* To avoid too much complexity, just hope there is never a ++ ')' in a header name. */ ++ p = memchr (p, ')', end - p); ++ if (p == NULL || p > pos) ++ return p; ++ } ++ ++ return NULL; ++} ++ + /* Fix for machine name #ifdefs that are not in the namespace reserved + by the C standard. They won't be defined if compiling with -ansi, + and the headers will break. We go to some trouble to only change +@@ -524,7 +557,7 @@ FIX_PROC_HEAD( machine_name_fix ) + /* If the 'name_pat' matches in between base and limit, we have + a bogon. It is not worth the hassle of excluding comments + because comments on #if/#ifdef lines are rare, and strings on +- such lines are illegal. ++ such lines are only legal in a "__has_include" directive. + + REG_NOTBOL means 'base' is not at the beginning of a line, which + shouldn't matter since the name_re has no ^ anchor, but let's +@@ -544,8 +577,16 @@ FIX_PROC_HEAD( machine_name_fix ) + break; + + p = base + match[0].rm_so; +- base += match[0].rm_eo; + ++ /* Check if the match is in __has_include(...) (PR 91085). */ ++ q = check_has_inc (base, p, limit); ++ if (q) ++ { ++ base = q + 1; ++ goto again; ++ } ++ ++ base += match[0].rm_eo; + /* One more test: if on the same line we have the same string + with the appropriate underscores, then leave it alone. + We want exactly two leading and trailing underscores. */ +diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def +index c2f54d1189a..b2841d384f3 100644 +--- a/fixincludes/inclhack.def ++++ b/fixincludes/inclhack.def +@@ -3201,7 +3201,8 @@ fix = { + c_fix = machine_name; + + test_text = "/* MACH_DIFF: */\n" +- "#if defined( i386 ) || defined( sparc ) || defined( vax )" ++ "#if defined( i386 ) || defined( sparc ) || defined( vax ) || " ++ "defined( linux ) || __has_include ( )" + "\n/* no uniform test, so be careful :-) */"; + }; + +diff --git a/fixincludes/tests/base/testing.h b/fixincludes/tests/base/testing.h +index cf95321fb86..8b3accaf04e 100644 +--- a/fixincludes/tests/base/testing.h ++++ b/fixincludes/tests/base/testing.h +@@ -64,7 +64,7 @@ BSD43__IOWR('T', 1) /* Some are multi-line */ + + #if defined( MACHINE_NAME_CHECK ) + /* MACH_DIFF: */ +-#if defined( i386 ) || defined( sparc ) || defined( vax ) ++#if defined( i386 ) || defined( sparc ) || defined( vax ) || defined( linux ) || __has_include ( ) + /* no uniform test, so be careful :-) */ + #endif /* MACHINE_NAME_CHECK */ + +-- +2.34.3 + diff --git a/package/gcc/11.4.0/0006-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch b/package/gcc/11.4.0/0006-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch new file mode 100644 index 00000000000..025e6cfe32a --- /dev/null +++ b/package/gcc/11.4.0/0006-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch @@ -0,0 +1,49 @@ +From ca01d2526917ec6e54b30472d3aedfd46d4ca585 Mon Sep 17 00:00:00 2001 +From: Stafford Horne +Date: Thu, 29 Sep 2022 15:32:39 +0100 +Subject: [PATCH] or1k: Only define TARGET_HAVE_TLS when HAVE_AS_TLS + +This was found when testing buildroot with linuxthreads enabled. In +this case, the build passes --disable-tls to the toolchain during +configuration. After building the OpenRISC toolchain it was still +generating TLS code sequences and causing linker failures such as: + + ..../or1k-buildroot-linux-uclibc-gcc -o gpsd-3.24/gpsctl .... -lusb-1.0 -lm -lrt -lnsl + ..../ld: ..../sysroot/usr/lib/libusb-1.0.so: undefined reference to `__tls_get_addr' + +This patch fixes this by disabling tls for the OpenRISC target when requested +via --disable-tls. + +gcc/ChangeLog: + + * config/or1k/or1k.c (TARGET_HAVE_TLS): Only define if + HAVE_AS_TLS is defined. + +Tested-by: Yann E. MORIN + +Upstream: https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=ca01d2526917ec6e54b30472d3aedfd46d4ca585 + +[Bernd: backported to 11.4.0] +Signed-off-by: Bernd Kuhls +--- + gcc/config/or1k/or1k.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/gcc/config/or1k/or1k.c b/gcc/config/or1k/or1k.c +index da2f59062ba..0ce7b234417 100644 +--- a/gcc/config/or1k/or1k.c ++++ b/gcc/config/or1k/or1k.c +@@ -2175,8 +2175,10 @@ or1k_output_mi_thunk (FILE *file, tree thunk_fndecl, + #undef TARGET_LEGITIMATE_ADDRESS_P + #define TARGET_LEGITIMATE_ADDRESS_P or1k_legitimate_address_p + ++#ifdef HAVE_AS_TLS + #undef TARGET_HAVE_TLS + #define TARGET_HAVE_TLS true ++#endif + + #undef TARGET_HAVE_SPECULATION_SAFE_VALUE + #define TARGET_HAVE_SPECULATION_SAFE_VALUE speculation_safe_value_not_needed +-- +2.39.3 + diff --git a/package/gcc/12.3.0/0001-disable-split-stack-for-non-thread-builds.patch b/package/gcc/12.3.0/0001-disable-split-stack-for-non-thread-builds.patch new file mode 100644 index 00000000000..e801085dad4 --- /dev/null +++ b/package/gcc/12.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/12.3.0/0002-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch b/package/gcc/12.3.0/0002-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch new file mode 100644 index 00000000000..4bac5972332 --- /dev/null +++ b/package/gcc/12.3.0/0002-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch @@ -0,0 +1,48 @@ +From ca01d2526917ec6e54b30472d3aedfd46d4ca585 Mon Sep 17 00:00:00 2001 +From: Stafford Horne +Date: Thu, 29 Sep 2022 15:32:39 +0100 +Subject: [PATCH] or1k: Only define TARGET_HAVE_TLS when HAVE_AS_TLS + +This was found when testing buildroot with linuxthreads enabled. In +this case, the build passes --disable-tls to the toolchain during +configuration. After building the OpenRISC toolchain it was still +generating TLS code sequences and causing linker failures such as: + + ..../or1k-buildroot-linux-uclibc-gcc -o gpsd-3.24/gpsctl .... -lusb-1.0 -lm -lrt -lnsl + ..../ld: ..../sysroot/usr/lib/libusb-1.0.so: undefined reference to `__tls_get_addr' + +This patch fixes this by disabling tls for the OpenRISC target when requested +via --disable-tls. + +gcc/ChangeLog: + + * config/or1k/or1k.cc (TARGET_HAVE_TLS): Only define if + HAVE_AS_TLS is defined. + +Tested-by: Yann E. MORIN + +Upstream: https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=ca01d2526917ec6e54b30472d3aedfd46d4ca585 + +Signed-off-by: Bernd Kuhls +--- + gcc/config/or1k/or1k.cc | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/gcc/config/or1k/or1k.cc b/gcc/config/or1k/or1k.cc +index da2f59062ba..0ce7b234417 100644 +--- a/gcc/config/or1k/or1k.cc ++++ b/gcc/config/or1k/or1k.cc +@@ -2206,8 +2206,10 @@ or1k_output_mi_thunk (FILE *file, tree thunk_fndecl, + #undef TARGET_LEGITIMATE_ADDRESS_P + #define TARGET_LEGITIMATE_ADDRESS_P or1k_legitimate_address_p + ++#ifdef HAVE_AS_TLS + #undef TARGET_HAVE_TLS + #define TARGET_HAVE_TLS true ++#endif + + #undef TARGET_HAVE_SPECULATION_SAFE_VALUE + #define TARGET_HAVE_SPECULATION_SAFE_VALUE speculation_safe_value_not_needed +-- +2.39.3 + diff --git a/package/gcc/8.4.0/0004-disable-split-stack-for-non-thread-builds.patch b/package/gcc/8.4.0/0004-disable-split-stack-for-non-thread-builds.patch new file mode 100644 index 00000000000..8d99e892931 --- /dev/null +++ b/package/gcc/8.4.0/0004-disable-split-stack-for-non-thread-builds.patch @@ -0,0 +1,26 @@ +From 1ddcb4870533af1b71b6afb75b8f2b271fd88eb4 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/9.4.0/0001-or1k-Fix-issue-with-set_got-clobbering-LR-r9.patch b/package/gcc/9.4.0/0001-or1k-Fix-issue-with-set_got-clobbering-LR-r9.patch deleted file mode 100644 index 185e16c179f..00000000000 --- a/package/gcc/9.4.0/0001-or1k-Fix-issue-with-set_got-clobbering-LR-r9.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 014db5e5febec94e35c13ce89ee6b389328873a1 Mon Sep 17 00:00:00 2001 -From: shorne -Date: Sat, 31 Aug 2019 06:00:56 +0000 -Subject: [PATCH] or1k: Fix issue with set_got clobbering LR (r9) - -When compiling glibc we found that the GOT register was being allocated -r9 when the instruction was still set_got_tmp. That is a problem -because r9 is the Link Register (LR) in OpenRISC which is used/clobbered -in set_got. We cannot use r9 as the GOT register. Also, we cannot -simply say set_got_tmp clobbers r9 as this is the reason for having the -temporary set_got_tmp. - -Fix by using a register class constraint that does not allow r9 during -register allocation. - -gcc/ChangeLog: - - * config/or1k/constraints.md (t): New constraint. - * config/or1k/or1k.h (GOT_REGS): New register class. - * config/or1k/or1k.md (set_got_tmp, set_got): Use t contraint. - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@275242 138bc75d-0d04-0410-961f-82ee72b054a4 -(cherry picked from commit 5b9471ffca25d39635680516ba2ff85295480fc3) -Signed-off-by: Romain Naour ---- - gcc/config/or1k/constraints.md | 4 ++++ - gcc/config/or1k/or1k.h | 3 +++ - gcc/config/or1k/or1k.md | 4 ++-- - 3 files changed, 9 insertions(+), 2 deletions(-) - -diff --git a/gcc/config/or1k/constraints.md b/gcc/config/or1k/constraints.md -index 93da8c058c6..a16b749008f 100644 ---- a/gcc/config/or1k/constraints.md -+++ b/gcc/config/or1k/constraints.md -@@ -24,6 +24,7 @@ - - ; We use: - ; c - sibcall registers -+; t - got address registers (excludes LR (r9) which is clobbered by set_got) - ; I - constant signed 16-bit - ; K - constant unsigned 16-bit - ; M - constant signed 16-bit shifted left 16-bits (l.movhi) -@@ -32,6 +33,9 @@ - (define_register_constraint "c" "SIBCALL_REGS" - "Registers which can hold a sibling call address") - -+(define_register_constraint "t" "GOT_REGS" -+ "Registers which can be used to store the Global Offset Table (GOT) address.") -+ - ;; Immediates - (define_constraint "I" - "A signed 16-bit immediate in the range -32768 to 32767." -diff --git a/gcc/config/or1k/or1k.h b/gcc/config/or1k/or1k.h -index 6dda230f217..feee702d89c 100644 ---- a/gcc/config/or1k/or1k.h -+++ b/gcc/config/or1k/or1k.h -@@ -189,6 +189,7 @@ enum reg_class - { - NO_REGS, - SIBCALL_REGS, -+ GOT_REGS, - GENERAL_REGS, - FLAG_REGS, - ALL_REGS, -@@ -200,6 +201,7 @@ enum reg_class - #define REG_CLASS_NAMES { \ - "NO_REGS", \ - "SIBCALL_REGS", \ -+ "GOT_REGS", \ - "GENERAL_REGS", \ - "FLAG_REGS", \ - "ALL_REGS" } -@@ -212,6 +214,7 @@ enum reg_class - #define REG_CLASS_CONTENTS \ - { { 0x00000000, 0x00000000 }, \ - { SIBCALL_REGS_MASK, 0 }, \ -+ { 0xfffffdff, 0x00000000 }, \ - { 0xffffffff, 0x00000003 }, \ - { 0x00000000, 0x00000004 }, \ - { 0xffffffff, 0x00000007 } \ -diff --git a/gcc/config/or1k/or1k.md b/gcc/config/or1k/or1k.md -index 2dad51cd46b..88f3f02630f 100644 ---- a/gcc/config/or1k/or1k.md -+++ b/gcc/config/or1k/or1k.md -@@ -595,7 +595,7 @@ - ;; set_got pattern below. This works because the set_got_tmp insn is the - ;; first insn in the stream and that it isn't moved during RA. - (define_insn "set_got_tmp" -- [(set (match_operand:SI 0 "register_operand" "=r") -+ [(set (match_operand:SI 0 "register_operand" "=t") - (unspec_volatile:SI [(const_int 0)] UNSPECV_SET_GOT))] - "" - { -@@ -604,7 +604,7 @@ - - ;; The insn to initialize the GOT. - (define_insn "set_got" -- [(set (match_operand:SI 0 "register_operand" "=r") -+ [(set (match_operand:SI 0 "register_operand" "=t") - (unspec:SI [(const_int 0)] UNSPEC_SET_GOT)) - (clobber (reg:SI LR_REGNUM))] - "" --- -2.31.1 - diff --git a/package/gcc/9.4.0/0002-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch b/package/gcc/9.4.0/0002-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch deleted file mode 100644 index 5ac03d7c0c1..00000000000 --- a/package/gcc/9.4.0/0002-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch +++ /dev/null @@ -1,31 +0,0 @@ -From f80e9941739fb3973b61fc6a5abddef5ad2faf73 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Fri, 27 Mar 2020 21:23:53 +0100 -Subject: [PATCH] gcc: define _REENTRANT for OpenRISC when -pthread is passed - -The detection of pthread support fails on OpenRISC unless _REENTRANT -is defined. Added the CPP_SPEC definition to correct this. - -Patch sent upstream: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94372 - -Signed-off-by: Bernd Kuhls ---- - gcc/config/or1k/linux.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/gcc/config/or1k/linux.h b/gcc/config/or1k/linux.h -index cbdc781418f..36303af892c 100644 ---- a/gcc/config/or1k/linux.h -+++ b/gcc/config/or1k/linux.h -@@ -32,6 +32,8 @@ - #undef MUSL_DYNAMIC_LINKER - #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-or1k.so.1" - -+#define CPP_SPEC "%{pthread:-D_REENTRANT}" -+ - #undef LINK_SPEC - #define LINK_SPEC "%{h*} \ - %{static:-Bstatic} \ --- -2.31.1 - diff --git a/package/gcc/9.4.0/0003-Revert-re-PR-target-92095-internal-error-with-O1-mcp.patch b/package/gcc/9.4.0/0003-Revert-re-PR-target-92095-internal-error-with-O1-mcp.patch deleted file mode 100644 index 0c69de93bef..00000000000 --- a/package/gcc/9.4.0/0003-Revert-re-PR-target-92095-internal-error-with-O1-mcp.patch +++ /dev/null @@ -1,325 +0,0 @@ -From 1107ecc3e8af31adc7bbd4e08c0614836bd1cebd Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Wed, 20 Jan 2021 23:22:16 +0100 -Subject: [PATCH] Revert "re PR target/92095 (internal error with -O1 - -mcpu=niagara2 -fPIE)" - -This reverts commit 6bf2990842388101897b6f465524cbc295ee8cf9. - -Building the Buildroot defconfig qemu_sparc_ss10_defconfig using -gcc 8.4, 9.3 and 10 produce a broken rootfs that trigger illegal -instruction messages. - -gcc 8.3, 9.2 are the latest working gcc version. -git bisect between gcc 8.4 and 8.4 allowed to identify -the commit that introcuce the regression. - -Reverting this patch allowed to produce a working rootfs. - -Signed-off-by: Romain Naour -Cc: Eric Botcazou ---- - gcc/config/sparc/sparc-protos.h | 1 - - gcc/config/sparc/sparc.c | 121 +++++++----------- - gcc/config/sparc/sparc.md | 5 +- - .../gcc.c-torture/compile/20191108-1.c | 14 -- - gcc/testsuite/gcc.target/sparc/overflow-3.c | 2 +- - gcc/testsuite/gcc.target/sparc/overflow-4.c | 2 +- - gcc/testsuite/gcc.target/sparc/overflow-5.c | 2 +- - 7 files changed, 53 insertions(+), 94 deletions(-) - delete mode 100644 gcc/testsuite/gcc.c-torture/compile/20191108-1.c - -diff --git a/gcc/config/sparc/sparc-protos.h b/gcc/config/sparc/sparc-protos.h -index f1c120c4860..f4b6f00a7b1 100644 ---- a/gcc/config/sparc/sparc-protos.h -+++ b/gcc/config/sparc/sparc-protos.h -@@ -69,7 +69,6 @@ extern void sparc_split_reg_mem (rtx, rtx, machine_mode); - extern void sparc_split_mem_reg (rtx, rtx, machine_mode); - extern int sparc_split_reg_reg_legitimate (rtx, rtx); - extern void sparc_split_reg_reg (rtx, rtx, machine_mode); --extern const char *output_load_pcrel_sym (rtx *); - extern const char *output_ubranch (rtx, rtx_insn *); - extern const char *output_cbranch (rtx, rtx, int, int, int, rtx_insn *); - extern const char *output_return (rtx_insn *); -diff --git a/gcc/config/sparc/sparc.c b/gcc/config/sparc/sparc.c -index 0553dc501e6..516dcf96d7b 100644 ---- a/gcc/config/sparc/sparc.c -+++ b/gcc/config/sparc/sparc.c -@@ -4170,6 +4170,13 @@ eligible_for_sibcall_delay (rtx_insn *trial) - static bool - sparc_cannot_force_const_mem (machine_mode mode, rtx x) - { -+ /* After IRA has run in PIC mode, it is too late to put anything into the -+ constant pool if the PIC register hasn't already been initialized. */ -+ if ((lra_in_progress || reload_in_progress) -+ && flag_pic -+ && !crtl->uses_pic_offset_table) -+ return true; -+ - switch (GET_CODE (x)) - { - case CONST_INT: -@@ -4205,11 +4212,9 @@ sparc_cannot_force_const_mem (machine_mode mode, rtx x) - } - - /* Global Offset Table support. */ --static GTY(()) rtx got_symbol_rtx = NULL_RTX; --static GTY(()) rtx got_register_rtx = NULL_RTX; - static GTY(()) rtx got_helper_rtx = NULL_RTX; -- --static GTY(()) bool got_helper_needed = false; -+static GTY(()) rtx got_register_rtx = NULL_RTX; -+static GTY(()) rtx got_symbol_rtx = NULL_RTX; - - /* Return the SYMBOL_REF for the Global Offset Table. */ - -@@ -4222,6 +4227,27 @@ sparc_got (void) - return got_symbol_rtx; - } - -+#ifdef HAVE_GAS_HIDDEN -+# define USE_HIDDEN_LINKONCE 1 -+#else -+# define USE_HIDDEN_LINKONCE 0 -+#endif -+ -+static void -+get_pc_thunk_name (char name[32], unsigned int regno) -+{ -+ const char *reg_name = reg_names[regno]; -+ -+ /* Skip the leading '%' as that cannot be used in a -+ symbol name. */ -+ reg_name += 1; -+ -+ if (USE_HIDDEN_LINKONCE) -+ sprintf (name, "__sparc_get_pc_thunk.%s", reg_name); -+ else -+ ASM_GENERATE_INTERNAL_LABEL (name, "LADDPC", regno); -+} -+ - /* Wrapper around the load_pcrel_sym{si,di} patterns. */ - - static rtx -@@ -4241,78 +4267,30 @@ gen_load_pcrel_sym (rtx op0, rtx op1, rtx op2) - return insn; - } - --/* Output the load_pcrel_sym{si,di} patterns. */ -- --const char * --output_load_pcrel_sym (rtx *operands) --{ -- if (flag_delayed_branch) -- { -- output_asm_insn ("sethi\t%%hi(%a1-4), %0", operands); -- output_asm_insn ("call\t%a2", operands); -- output_asm_insn (" add\t%0, %%lo(%a1+4), %0", operands); -- } -- else -- { -- output_asm_insn ("sethi\t%%hi(%a1-8), %0", operands); -- output_asm_insn ("add\t%0, %%lo(%a1-4), %0", operands); -- output_asm_insn ("call\t%a2", operands); -- output_asm_insn (" nop", NULL); -- } -- -- if (operands[2] == got_helper_rtx) -- got_helper_needed = true; -- -- return ""; --} -- --#ifdef HAVE_GAS_HIDDEN --# define USE_HIDDEN_LINKONCE 1 --#else --# define USE_HIDDEN_LINKONCE 0 --#endif -- - /* Emit code to load the GOT register. */ - - void - load_got_register (void) - { -- rtx insn; -+ if (!got_register_rtx) -+ got_register_rtx = gen_rtx_REG (Pmode, GLOBAL_OFFSET_TABLE_REGNUM); - - if (TARGET_VXWORKS_RTP) -- { -- if (!got_register_rtx) -- got_register_rtx = pic_offset_table_rtx; -- -- insn = gen_vxworks_load_got (); -- } -+ emit_insn (gen_vxworks_load_got ()); - else - { -- if (!got_register_rtx) -- got_register_rtx = gen_rtx_REG (Pmode, GLOBAL_OFFSET_TABLE_REGNUM); -- - /* The GOT symbol is subject to a PC-relative relocation so we need a - helper function to add the PC value and thus get the final value. */ - if (!got_helper_rtx) - { - char name[32]; -- -- /* Skip the leading '%' as that cannot be used in a symbol name. */ -- if (USE_HIDDEN_LINKONCE) -- sprintf (name, "__sparc_get_pc_thunk.%s", -- reg_names[REGNO (got_register_rtx)] + 1); -- else -- ASM_GENERATE_INTERNAL_LABEL (name, "LADDPC", -- REGNO (got_register_rtx)); -- -+ get_pc_thunk_name (name, GLOBAL_OFFSET_TABLE_REGNUM); - got_helper_rtx = gen_rtx_SYMBOL_REF (Pmode, ggc_strdup (name)); - } - -- insn -- = gen_load_pcrel_sym (got_register_rtx, sparc_got (), got_helper_rtx); -+ emit_insn (gen_load_pcrel_sym (got_register_rtx, sparc_got (), -+ got_helper_rtx)); - } -- -- emit_insn (insn); - } - - /* Ensure that we are not using patterns that are not OK with PIC. */ -@@ -5477,7 +5455,7 @@ save_local_or_in_reg_p (unsigned int regno, int leaf_function) - return true; - - /* GOT register (%l7) if needed. */ -- if (got_register_rtx && regno == REGNO (got_register_rtx)) -+ if (regno == GLOBAL_OFFSET_TABLE_REGNUM && got_register_rtx) - return true; - - /* If the function accesses prior frames, the frame pointer and the return -@@ -12520,9 +12498,10 @@ static void - sparc_file_end (void) - { - /* If we need to emit the special GOT helper function, do so now. */ -- if (got_helper_needed) -+ if (got_helper_rtx) - { - const char *name = XSTR (got_helper_rtx, 0); -+ const char *reg_name = reg_names[GLOBAL_OFFSET_TABLE_REGNUM]; - #ifdef DWARF2_UNWIND_INFO - bool do_cfi; - #endif -@@ -12559,22 +12538,17 @@ sparc_file_end (void) - #ifdef DWARF2_UNWIND_INFO - do_cfi = dwarf2out_do_cfi_asm (); - if (do_cfi) -- output_asm_insn (".cfi_startproc", NULL); -+ fprintf (asm_out_file, "\t.cfi_startproc\n"); - #endif - if (flag_delayed_branch) -- { -- output_asm_insn ("jmp\t%%o7+8", NULL); -- output_asm_insn (" add\t%%o7, %0, %0", &got_register_rtx); -- } -+ fprintf (asm_out_file, "\tjmp\t%%o7+8\n\t add\t%%o7, %s, %s\n", -+ reg_name, reg_name); - else -- { -- output_asm_insn ("add\t%%o7, %0, %0", &got_register_rtx); -- output_asm_insn ("jmp\t%%o7+8", NULL); -- output_asm_insn (" nop", NULL); -- } -+ fprintf (asm_out_file, "\tadd\t%%o7, %s, %s\n\tjmp\t%%o7+8\n\t nop\n", -+ reg_name, reg_name); - #ifdef DWARF2_UNWIND_INFO - if (do_cfi) -- output_asm_insn (".cfi_endproc", NULL); -+ fprintf (asm_out_file, "\t.cfi_endproc\n"); - #endif - } - -@@ -13080,10 +13054,7 @@ sparc_init_pic_reg (void) - edge entry_edge; - rtx_insn *seq; - -- /* In PIC mode, we need to always initialize the PIC register if optimization -- is enabled, because we are called from IRA and LRA may later force things -- to the constant pool for optimization purposes. */ -- if (!flag_pic || (!crtl->uses_pic_offset_table && !optimize)) -+ if (!crtl->uses_pic_offset_table) - return; - - start_sequence (); -diff --git a/gcc/config/sparc/sparc.md b/gcc/config/sparc/sparc.md -index d9ef79c13cc..6dbd054f1c7 100644 ---- a/gcc/config/sparc/sparc.md -+++ b/gcc/config/sparc/sparc.md -@@ -1601,7 +1601,10 @@ - (clobber (reg:P O7_REG))] - "REGNO (operands[0]) == INTVAL (operands[3])" - { -- return output_load_pcrel_sym (operands); -+ if (flag_delayed_branch) -+ return "sethi\t%%hi(%a1-4), %0\n\tcall\t%a2\n\t add\t%0, %%lo(%a1+4), %0"; -+ else -+ return "sethi\t%%hi(%a1-8), %0\n\tadd\t%0, %%lo(%a1-4), %0\n\tcall\t%a2\n\t nop"; - } - [(set (attr "type") (const_string "multi")) - (set (attr "length") -diff --git a/gcc/testsuite/gcc.c-torture/compile/20191108-1.c b/gcc/testsuite/gcc.c-torture/compile/20191108-1.c -deleted file mode 100644 -index 7929751bb06..00000000000 ---- a/gcc/testsuite/gcc.c-torture/compile/20191108-1.c -+++ /dev/null -@@ -1,14 +0,0 @@ --/* PR target/92095 */ --/* Testcase by Sergei Trofimovich */ -- --typedef union { -- double a; -- int b[2]; --} c; -- --double d(int e) --{ -- c f; -- (&f)->b[0] = 15728640; -- return e ? -(&f)->a : (&f)->a; --} -diff --git a/gcc/testsuite/gcc.target/sparc/overflow-3.c b/gcc/testsuite/gcc.target/sparc/overflow-3.c -index 52d6ab2b688..86dddfb09e6 100644 ---- a/gcc/testsuite/gcc.target/sparc/overflow-3.c -+++ b/gcc/testsuite/gcc.target/sparc/overflow-3.c -@@ -1,6 +1,6 @@ - /* { dg-do compile } */ - /* { dg-require-effective-target lp64 } */ --/* { dg-options "-O -fno-pie" } */ -+/* { dg-options "-O" } */ - - #include - #include -diff --git a/gcc/testsuite/gcc.target/sparc/overflow-4.c b/gcc/testsuite/gcc.target/sparc/overflow-4.c -index c6121b958c3..019feee335c 100644 ---- a/gcc/testsuite/gcc.target/sparc/overflow-4.c -+++ b/gcc/testsuite/gcc.target/sparc/overflow-4.c -@@ -1,6 +1,6 @@ - /* { dg-do compile } */ - /* { dg-require-effective-target lp64 } */ --/* { dg-options "-O -fno-pie -mno-vis3 -mno-vis4" } */ -+/* { dg-options "-O -mno-vis3 -mno-vis4" } */ - - #include - #include -diff --git a/gcc/testsuite/gcc.target/sparc/overflow-5.c b/gcc/testsuite/gcc.target/sparc/overflow-5.c -index f00283f6e7b..67d4ac38095 100644 ---- a/gcc/testsuite/gcc.target/sparc/overflow-5.c -+++ b/gcc/testsuite/gcc.target/sparc/overflow-5.c -@@ -1,6 +1,6 @@ - /* { dg-do compile } */ - /* { dg-require-effective-target lp64 } */ --/* { dg-options "-O -fno-pie -mvis3" } */ -+/* { dg-options "-O -mvis3" } */ - - #include - #include --- -2.31.1 - diff --git a/package/gcc/9.4.0/0004-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch b/package/gcc/9.4.0/0004-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch deleted file mode 100644 index 894411f3940..00000000000 --- a/package/gcc/9.4.0/0004-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch +++ /dev/null @@ -1,201 +0,0 @@ -From 90b202b59fa2bdb68314a23471b32d3e16602bc8 Mon Sep 17 00:00:00 2001 -From: Stafford Horne -Date: Sun, 2 May 2021 06:11:44 +0900 -Subject: [PATCH] or1k: Add mcmodel option to handle large GOTs - -When building libgeos we get an error with: - - linux-uclibc/9.3.0/crtbeginS.o: in function `__do_global_dtors_aux': - crtstuff.c:(.text+0x118): relocation truncated to fit: R_OR1K_GOT16 against symbol `__cxa_finalize' defined in .text section in - /home/shorne/work/openrisc/3eb9f9d0f6d8274b2d19753c006bd83f7d536e3c/output/host/or1k-buildroot-linux-uclibc/sysroot/lib/libc.so. - -This is caused by GOT code having a limit of 64k. In OpenRISC this -looks to be the only relocation code pattern to be limited to 64k. - -This patch allows specifying a new option -mcmodel=large which can be -used to generate 2 more instructions to construct 32-bit addresses for -up to 4G GOTs. - -gcc/ChangeLog: - - PR 99783 - * config/or1k/or1k-opts.h: New file. - * config/or1k/or1k.c (or1k_legitimize_address_1, print_reloc): - Support generating gotha relocations if -mcmodel=large is - specified. - * config/or1k/or1k.h (TARGET_CMODEL_SMALL, TARGET_CMODEL_LARGE): - New macros. - * config/or1k/or1k.opt (mcmodel=): New option. - * doc/invoke.text (OpenRISC Options): Document mcmodel. - -Signed-off-by: Giulio Benetti ---- - gcc/config/or1k/or1k-opts.h | 30 ++++++++++++++++++++++++++++++ - gcc/config/or1k/or1k.c | 11 +++++++++-- - gcc/config/or1k/or1k.h | 7 +++++++ - gcc/config/or1k/or1k.opt | 19 +++++++++++++++++++ - gcc/doc/invoke.texi | 13 ++++++++++++- - 5 files changed, 77 insertions(+), 3 deletions(-) - create mode 100644 gcc/config/or1k/or1k-opts.h - -diff --git a/gcc/config/or1k/or1k-opts.h b/gcc/config/or1k/or1k-opts.h -new file mode 100644 -index 00000000000..f791b894fdd ---- /dev/null -+++ b/gcc/config/or1k/or1k-opts.h -@@ -0,0 +1,30 @@ -+/* Definitions for option handling for OpenRISC. -+ Copyright (C) 2021 Free Software Foundation, Inc. -+ Contributed by Stafford Horne. -+ -+ 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 -+ . */ -+ -+#ifndef GCC_OR1K_OPTS_H -+#define GCC_OR1K_OPTS_H -+ -+/* The OpenRISC code generation models available. */ -+enum or1k_cmodel_type { -+ CMODEL_SMALL, -+ CMODEL_LARGE -+}; -+ -+#endif /* GCC_OR1K_OPTS_H */ -diff --git a/gcc/config/or1k/or1k.c b/gcc/config/or1k/or1k.c -index fc10fcfabde..df67d72b139 100644 ---- a/gcc/config/or1k/or1k.c -+++ b/gcc/config/or1k/or1k.c -@@ -750,7 +750,14 @@ or1k_legitimize_address_1 (rtx x, rtx scratch) - { - base = gen_sym_unspec (base, UNSPEC_GOT); - crtl->uses_pic_offset_table = 1; -- t2 = gen_rtx_LO_SUM (Pmode, pic_offset_table_rtx, base); -+ if (TARGET_CMODEL_LARGE) -+ { -+ emit_insn (gen_rtx_SET (t1, gen_rtx_HIGH (Pmode, base))); -+ emit_insn (gen_add3_insn (t1, t1, pic_offset_table_rtx)); -+ t2 = gen_rtx_LO_SUM (Pmode, t1, base); -+ } -+ else -+ t2 = gen_rtx_LO_SUM (Pmode, pic_offset_table_rtx, base); - t2 = gen_const_mem (Pmode, t2); - emit_insn (gen_rtx_SET (t1, t2)); - base = t1; -@@ -1097,7 +1104,7 @@ print_reloc (FILE *stream, rtx x, HOST_WIDE_INT add, reloc_kind kind) - no special markup. */ - static const char * const relocs[RKIND_MAX][RTYPE_MAX] = { - { "lo", "got", "gotofflo", "tpofflo", "gottpofflo", "tlsgdlo" }, -- { "ha", NULL, "gotoffha", "tpoffha", "gottpoffha", "tlsgdhi" }, -+ { "ha", "gotha", "gotoffha", "tpoffha", "gottpoffha", "tlsgdhi" }, - }; - reloc_type type = RTYPE_DIRECT; - -diff --git a/gcc/config/or1k/or1k.h b/gcc/config/or1k/or1k.h -index feee702d89c..dbaf0d0fe4c 100644 ---- a/gcc/config/or1k/or1k.h -+++ b/gcc/config/or1k/or1k.h -@@ -21,6 +21,8 @@ - #ifndef GCC_OR1K_H - #define GCC_OR1K_H - -+#include "config/or1k/or1k-opts.h" -+ - /* Names to predefine in the preprocessor for this target machine. */ - #define TARGET_CPU_CPP_BUILTINS() \ - do \ -@@ -35,6 +37,11 @@ - } \ - while (0) - -+#define TARGET_CMODEL_SMALL \ -+ (or1k_code_model == CMODEL_SMALL) -+#define TARGET_CMODEL_LARGE \ -+ (or1k_code_model == CMODEL_LARGE) -+ - /* Storage layout. */ - - #define DEFAULT_SIGNED_CHAR 1 -diff --git a/gcc/config/or1k/or1k.opt b/gcc/config/or1k/or1k.opt -index 7bdbd842dd4..116524c3441 100644 ---- a/gcc/config/or1k/or1k.opt -+++ b/gcc/config/or1k/or1k.opt -@@ -23,6 +23,9 @@ - - ; Please try to keep this file in ASCII collating order. - -+HeaderInclude -+config/or1k/or1k-opts.h -+ - mhard-div - Target RejectNegative InverseMask(SOFT_DIV) - Use hardware divide instructions, use -msoft-div for emulation. -@@ -31,6 +34,22 @@ mhard-mul - Target RejectNegative InverseMask(SOFT_MUL). - Use hardware multiply instructions, use -msoft-mul for emulation. - -+mcmodel= -+Target RejectNegative Joined Enum(or1k_cmodel_type) Var(or1k_code_model) Init(CMODEL_SMALL) -+Specify the code model used for accessing memory addresses. Specifying large -+enables generating binaries with large global offset tables. By default the -+value is small. -+ -+Enum -+Name(or1k_cmodel_type) Type(enum or1k_cmodel_type) -+Known code model types (for use with the -mcmodel= option): -+ -+EnumValue -+Enum(or1k_cmodel_type) String(small) Value(CMODEL_SMALL) -+ -+EnumValue -+Enum(or1k_cmodel_type) String(large) Value(CMODEL_LARGE) -+ - mcmov - Target RejectNegative Mask(CMOV) - Allows generation of binaries which use the l.cmov instruction. If your target -diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi -index 7b5f6e03d9f..683c64417af 100644 ---- a/gcc/doc/invoke.texi -+++ b/gcc/doc/invoke.texi -@@ -1032,7 +1032,9 @@ Objective-C and Objective-C++ Dialects}. - @emph{OpenRISC Options} - @gccoptlist{-mboard=@var{name} -mnewlib -mhard-mul -mhard-div @gol - -msoft-mul -msoft-div @gol ---mcmov -mror -msext -msfimm -mshftimm} -+-mcmov -mror -mrori -msext -msfimm -mshftimm @gol -+-mcmodel=@var{code-model}} -+ - - @emph{PDP-11 Options} - @gccoptlist{-mfpu -msoft-float -mac0 -mno-ac0 -m40 -m45 -m10 @gol -@@ -27462,6 +27464,15 @@ MWAITX, SHA, CLZERO, AES, PCL_MUL, CX16, MOVBE, MMX, SSE, SSE2, SSE3, SSE4A, - SSSE3, SSE4.1, SSE4.2, ABM, XSAVEC, XSAVES, CLFLUSHOPT, POPCNT, and 64-bit - instruction set extensions.) - -+@item -mcmodel=small -+@opindex mcmodel=small -+Generate OpenRISC code for the small model: The GOT is limited to 64k. This is -+the default model. -+ -+@item -mcmodel=large -+@opindex mcmodel=large -+Generate OpenRISC code for the large model: The GOT may grow up to 4G in size. -+ - - @item btver1 - CPUs based on AMD Family 14h cores with x86-64 instruction set support. (This --- -2.31.1 - diff --git a/package/gcc/9.4.0/0005-or1k-Use-cmodel-large-when-building-crtstuff.patch b/package/gcc/9.4.0/0005-or1k-Use-cmodel-large-when-building-crtstuff.patch deleted file mode 100644 index 69d143349a9..00000000000 --- a/package/gcc/9.4.0/0005-or1k-Use-cmodel-large-when-building-crtstuff.patch +++ /dev/null @@ -1,60 +0,0 @@ -From d64a757040fe36b0d9dc65d24107c656f66bc8e5 Mon Sep 17 00:00:00 2001 -From: Stafford Horne -Date: Sun, 2 May 2021 06:11:45 +0900 -Subject: [PATCH] or1k: Use cmodel=large when building crtstuff - -When linking gcc runtime objects into large binaries the link may fail -with the below errors. This will happen even if we are building with --mcmodel=large. - - /home/shorne/work/openrisc/output/host/lib/gcc/or1k-buildroot-linux-uclibc/10.3.0/crtbeginS.o: in function `deregister_tm_clones': - crtstuff.c:(.text+0x3c): relocation truncated to fit: R_OR1K_GOT16 against undefined symbol `_ITM_deregisterTMCloneTable' - /home/shorne/work/openrisc/output/host/lib/gcc/or1k-buildroot-linux-uclibc/10.3.0/crtbeginS.o: in function `register_tm_clones': - crtstuff.c:(.text+0xc0): relocation truncated to fit: R_OR1K_GOT16 against undefined symbol `_ITM_registerTMCloneTable' - -This patch builds the gcc crtstuff binaries always with the --mcmodel=large option to ensure they can be linked into large binaries. - -libgcc/ChangeLog: - - PR 99783 - * config.host (or1k-*, tmake_file): Add or1k/t-crtstuff. - * config/or1k/t-crtstuff: New file. - -Signed-off-by: Giulio Benetti ---- - libgcc/config.host | 4 ++-- - libgcc/config/or1k/t-crtstuff | 2 ++ - 2 files changed, 4 insertions(+), 2 deletions(-) - create mode 100644 libgcc/config/or1k/t-crtstuff - -diff --git a/libgcc/config.host b/libgcc/config.host -index bdbf77a3e62..bfb45a90630 100644 ---- a/libgcc/config.host -+++ b/libgcc/config.host -@@ -1061,12 +1061,12 @@ nios2-*-*) - extra_parts="$extra_parts crti.o crtn.o" - ;; - or1k-*-linux*) -- tmake_file="$tmake_file or1k/t-or1k" -+ tmake_file="$tmake_file or1k/t-or1k or1k/t-crtstuff" - tmake_file="$tmake_file t-softfp-sfdf t-softfp" - md_unwind_header=or1k/linux-unwind.h - ;; - or1k-*-*) -- tmake_file="$tmake_file or1k/t-or1k" -+ tmake_file="$tmake_file or1k/t-or1k or1k/t-crtstuff" - tmake_file="$tmake_file t-softfp-sfdf t-softfp" - ;; - pdp11-*-*) -diff --git a/libgcc/config/or1k/t-crtstuff b/libgcc/config/or1k/t-crtstuff -new file mode 100644 -index 00000000000..dcae7f3498e ---- /dev/null -+++ b/libgcc/config/or1k/t-crtstuff -@@ -0,0 +1,2 @@ -+# Compile crtbeginS.o and crtendS.o with -mcmodel=large -+CRTSTUFF_T_CFLAGS_S += -mcmodel=large --- -2.31.1 - diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index a1fe192d3a2..b6adf1f127e 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -2,9 +2,10 @@ comment "GCC Options" choice prompt "GCC compiler Version" + 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_SPE - default BR2_GCC_VERSION_10_X + default BR2_GCC_VERSION_11_X help Select the version of gcc you wish to use. @@ -21,32 +22,19 @@ config BR2_GCC_VERSION_POWERPC_SPE depends on BR2_powerpc_SPE select BR2_TOOLCHAIN_GCC_AT_LEAST_8 -config BR2_GCC_VERSION_9_X - bool "gcc 9.x" - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_10 - # powerpc spe support has been deprecated since gcc 8.x. - # https://gcc.gnu.org/ml/gcc/2018-04/msg00102.html - depends on !BR2_powerpc_SPE - # C-SKY sk610 needs abiv1, which is not supported in - # upstream gcc. C-SKY gcc upstream support not tested - # with upstream binutils and glibc. - depends on !BR2_csky - select BR2_TOOLCHAIN_GCC_AT_LEAST_9 - config BR2_GCC_VERSION_10_X bool "gcc 10.x" depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_11 # powerpc spe support has been deprecated since gcc 8.x. # https://gcc.gnu.org/ml/gcc/2018-04/msg00102.html depends on !BR2_powerpc_SPE - # C-SKY sk610 needs abiv1, which is not supported in - # upstream gcc. C-SKY gcc upstream support not tested - # with upstream binutils and glibc. - depends on !BR2_csky + # ARC HS48 rel 31 only supported by gcc arc fork. + depends on !BR2_archs4x_rel31 select BR2_TOOLCHAIN_GCC_AT_LEAST_10 config BR2_GCC_VERSION_11_X bool "gcc 11.x" + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_12 # powerpc spe support has been deprecated since gcc 8.x. # https://gcc.gnu.org/ml/gcc/2018-04/msg00102.html depends on !BR2_powerpc_SPE @@ -54,8 +42,23 @@ config BR2_GCC_VERSION_11_X # that need to be reverted since gcc 8.4, 9.3 and 10.1. # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=98784 depends on !BR2_sparc + # ARC HS48 rel 31 only supported by gcc arc fork. + depends on !BR2_archs4x_rel31 select BR2_TOOLCHAIN_GCC_AT_LEAST_11 +config BR2_GCC_VERSION_12_X + bool "gcc 12.x" + # powerpc spe support has been deprecated since gcc 8.x. + # https://gcc.gnu.org/ml/gcc/2018-04/msg00102.html + depends on !BR2_powerpc_SPE + # uClibc-ng broken on sparc due to recent gcc changes + # that need to be reverted since gcc 8.4, 9.3 and 10.1. + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=98784 + depends on !BR2_sparc + # ARC HS48 rel 31 only supported by gcc arc fork. + depends on !BR2_archs4x_rel31 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + endchoice # libcilkrts was introduced in gcc 4.9 and removed in gcc 8.x @@ -75,13 +78,17 @@ config BR2_GCC_SUPPORTS_DLANG default y if BR2_riscv && !BR2_RISCV_64 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 depends on BR2_TOOLCHAIN_USES_GLIBC + # "The D front-end is now itself written in D, in order to build GDC, you + # will need a working GDC compiler (GCC version 9.1 or later)." + # https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=5fee5ec362f7a243f459e6378fd49dfc89dc9fb5 + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_12 config BR2_GCC_VERSION string default "8.4.0" if BR2_GCC_VERSION_POWERPC_SPE - default "9.4.0" if BR2_GCC_VERSION_9_X - default "10.3.0" if BR2_GCC_VERSION_10_X - default "11.2.0" if BR2_GCC_VERSION_11_X + default "10.4.0" if BR2_GCC_VERSION_10_X + default "11.4.0" if BR2_GCC_VERSION_11_X + default "12.3.0" if BR2_GCC_VERSION_12_X default "arc-2020.09-release" if BR2_GCC_VERSION_ARC config BR2_EXTRA_GCC_CONFIG_OPTIONS @@ -124,13 +131,6 @@ config BR2_TOOLCHAIN_BUILDROOT_DLANG D language and you want D libraries to be installed on your target system. -config BR2_GCC_ENABLE_LTO - bool "Enable compiler link-time-optimization support" - select BR2_BINUTILS_ENABLE_LTO - help - This option enables link-time optimization (LTO) support in - gcc. - config BR2_GCC_ENABLE_OPENMP bool "Enable compiler OpenMP support" depends on !BR2_PTHREADS_NONE && !BR2_arc && !BR2_microblaze diff --git a/package/gcc/arc-2020.09-release/0003-fixinc-don-t-fix-machine-names-in-__has_include-.-PR.patch b/package/gcc/arc-2020.09-release/0003-fixinc-don-t-fix-machine-names-in-__has_include-.-PR.patch new file mode 100644 index 00000000000..8b6be49e682 --- /dev/null +++ b/package/gcc/arc-2020.09-release/0003-fixinc-don-t-fix-machine-names-in-__has_include-.-PR.patch @@ -0,0 +1,124 @@ +From 65754c50a57e5a891cee75bb744eb93fdb3c443e Mon Sep 17 00:00:00 2001 +From: Xi Ruoyao +Date: Mon, 28 Jun 2021 13:54:58 +0800 +Subject: [PATCH] fixinc: don't "fix" machine names in __has_include(...) + [PR91085] + +fixincludes/ + + PR other/91085 + * fixfixes.c (check_has_inc): New static function. + (machine_name_fix): Don't replace header names in + __has_include(...). + * inclhack.def (machine_name): Adjust test. + * tests/base/testing.h: Update. + +Upstream: 6bf383c37e6131a8e247e8a0997d55d65c830b6d +Signed-off-by: Thomas Petazzoni +--- + fixincludes/fixfixes.c | 45 ++++++++++++++++++++++++++++++-- + fixincludes/inclhack.def | 3 ++- + fixincludes/tests/base/testing.h | 2 +- + 3 files changed, 46 insertions(+), 4 deletions(-) + +diff --git a/fixincludes/fixfixes.c b/fixincludes/fixfixes.c +index 034e15d9985..3ff87812036 100644 +--- a/fixincludes/fixfixes.c ++++ b/fixincludes/fixfixes.c +@@ -477,6 +477,39 @@ FIX_PROC_HEAD( char_macro_def_fix ) + fputs (text, stdout); + } + ++/* Check if the pattern at pos is actually in a "__has_include(...)" ++ directive. Return the pointer to the ')' of this ++ "__has_include(...)" if it is, NULL otherwise. */ ++static const char * ++check_has_inc (const char *begin, const char *pos, const char *end) ++{ ++ static const char has_inc[] = "__has_include"; ++ const size_t has_inc_len = sizeof (has_inc) - 1; ++ const char *p; ++ ++ for (p = memmem (begin, pos - begin, has_inc, has_inc_len); ++ p != NULL; ++ p = memmem (p, pos - p, has_inc, has_inc_len)) ++ { ++ p += has_inc_len; ++ while (p < end && ISSPACE (*p)) ++ p++; ++ ++ /* "__has_include" may appear as "defined(__has_include)", ++ search for the next appearance then. */ ++ if (*p != '(') ++ continue; ++ ++ /* To avoid too much complexity, just hope there is never a ++ ')' in a header name. */ ++ p = memchr (p, ')', end - p); ++ if (p == NULL || p > pos) ++ return p; ++ } ++ ++ return NULL; ++} ++ + /* Fix for machine name #ifdefs that are not in the namespace reserved + by the C standard. They won't be defined if compiling with -ansi, + and the headers will break. We go to some trouble to only change +@@ -524,7 +557,7 @@ FIX_PROC_HEAD( machine_name_fix ) + /* If the 'name_pat' matches in between base and limit, we have + a bogon. It is not worth the hassle of excluding comments + because comments on #if/#ifdef lines are rare, and strings on +- such lines are illegal. ++ such lines are only legal in a "__has_include" directive. + + REG_NOTBOL means 'base' is not at the beginning of a line, which + shouldn't matter since the name_re has no ^ anchor, but let's +@@ -544,8 +577,16 @@ FIX_PROC_HEAD( machine_name_fix ) + break; + + p = base + match[0].rm_so; +- base += match[0].rm_eo; + ++ /* Check if the match is in __has_include(...) (PR 91085). */ ++ q = check_has_inc (base, p, limit); ++ if (q) ++ { ++ base = q + 1; ++ goto again; ++ } ++ ++ base += match[0].rm_eo; + /* One more test: if on the same line we have the same string + with the appropriate underscores, then leave it alone. + We want exactly two leading and trailing underscores. */ +diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def +index f58e7771e1c..71bd717c233 100644 +--- a/fixincludes/inclhack.def ++++ b/fixincludes/inclhack.def +@@ -3114,7 +3114,8 @@ fix = { + c_fix = machine_name; + + test_text = "/* MACH_DIFF: */\n" +- "#if defined( i386 ) || defined( sparc ) || defined( vax )" ++ "#if defined( i386 ) || defined( sparc ) || defined( vax ) || " ++ "defined( linux ) || __has_include ( )" + "\n/* no uniform test, so be careful :-) */"; + }; + +diff --git a/fixincludes/tests/base/testing.h b/fixincludes/tests/base/testing.h +index cf95321fb86..8b3accaf04e 100644 +--- a/fixincludes/tests/base/testing.h ++++ b/fixincludes/tests/base/testing.h +@@ -64,7 +64,7 @@ BSD43__IOWR('T', 1) /* Some are multi-line */ + + #if defined( MACHINE_NAME_CHECK ) + /* MACH_DIFF: */ +-#if defined( i386 ) || defined( sparc ) || defined( vax ) ++#if defined( i386 ) || defined( sparc ) || defined( vax ) || defined( linux ) || __has_include ( ) + /* no uniform test, so be careful :-) */ + #endif /* MACHINE_NAME_CHECK */ + +-- +2.37.3 + diff --git a/package/gcc/gcc-initial/gcc-initial.mk b/package/gcc/gcc-initial/gcc-initial.mk index f5bc6c5b770..a8ac20c5d8d 100644 --- a/package/gcc/gcc-initial/gcc-initial.mk +++ b/package/gcc/gcc-initial/gcc-initial.mk @@ -9,7 +9,7 @@ GCC_INITIAL_SITE = $(GCC_SITE) GCC_INITIAL_SOURCE = $(GCC_SOURCE) # We do not have a 'gcc' package per-se; we only have two incarnations, -# gcc-initial and gcc-final. gcc-initial is just am internal step that +# gcc-initial and gcc-final. gcc-initial is just an internal step that # users should not care about, while gcc-final is the one they shall see. HOST_GCC_INITIAL_DL_SUBDIR = gcc @@ -43,6 +43,13 @@ HOST_GCC_INITIAL_CONF_OPTS = \ HOST_GCC_INITIAL_CONF_ENV = \ $(HOST_GCC_COMMON_CONF_ENV) +# Enable GCC target libs optimizations to optimize out __register_frame +# when needed for some architectures when building with glibc. +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_107728),y) +HOST_GCC_INITIAL_CONF_ENV += CFLAGS_FOR_TARGET="$(GCC_COMMON_TARGET_CFLAGS) -O1" +HOST_GCC_INITIAL_CONF_ENV += CXXFLAGS_FOR_TARGET="$(GCC_COMMON_TARGET_CXXFLAGS) -O1" +endif + HOST_GCC_INITIAL_MAKE_OPTS = $(HOST_GCC_COMMON_MAKE_OPTS) all-gcc all-target-libgcc HOST_GCC_INITIAL_INSTALL_OPTS = install-gcc install-target-libgcc diff --git a/package/gcc/gcc.hash b/package/gcc/gcc.hash index 5655c7a9d76..f478962af84 100644 --- a/package/gcc/gcc.hash +++ b/package/gcc/gcc.hash @@ -1,11 +1,11 @@ -# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-8.4.0/sha512.sum +# From https://gcc.gnu.org/pub/gcc/releases/gcc-8.4.0/sha512.sum sha512 6de904f552a02de33b11ef52312bb664396efd7e1ce3bbe37bfad5ef617f133095b3767b4804bc7fe78df335cb53bc83f1ac055baed40979ce4c2c3e46b70280 gcc-8.4.0.tar.xz -# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-9.4.0/sha512.sum -sha512 dfd3500bf21784b8351a522d53463cf362ede66b0bc302edf350bb44e94418497a8b4b797b6af8ca9b2eeb746b3b115d9c3698381b989546e9151b4496415624 gcc-9.4.0.tar.xz -# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-10.3.0/sha512.sum -sha512 2b2dd7453d48a398c29eaebd1422b70341001b8c90a62aee51e83344e7fdd8a8e45f82a4a9165bd7edc76dada912c932f4b6632c5636760fec4c5d7e402b3f86 gcc-10.3.0.tar.xz -# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-11.2.0/sha512.sum -sha512 d53a0a966230895c54f01aea38696f818817b505f1e2bfa65e508753fcd01b2aedb4a61434f41f3a2ddbbd9f41384b96153c684ded3f0fa97c82758d9de5c7cf gcc-11.2.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-11.4.0/sha512.sum +sha512 a5018bf1f1fa25ddf33f46e720675d261987763db48e7a5fdf4c26d3150a8abcb82fdc413402df1c32f2e6b057d9bae6bdfa026defc4030e10144a8532e60f14 gcc-11.4.0.tar.xz +# From https://gcc.gnu.org/pub/gcc/releases/gcc-12.3.0/sha512.sum +sha512 8fb799dfa2e5de5284edf8f821e3d40c2781e4c570f5adfdb1ca0671fcae3fb7f794ea783e80f01ec7bfbf912ca508e478bd749b2755c2c14e4055648146c204 gcc-12.3.0.tar.xz # Locally calculated (fetched from Github) sha512 b0853e2b1c5998044392023fa653e399e74118c46e616504ac59e1a2cf27620f94434767ce06b6cf4ca3dfb57f81d6eda92752befaf095ea5e564a9181b4659c gcc-arc-2020.09-release.tar.gz diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk index 128cf8421d6..30502291769 100644 --- a/package/gcc/gcc.mk +++ b/package/gcc/gcc.mk @@ -75,6 +75,8 @@ HOST_GCC_COMMON_CONF_OPTS = \ --disable-libssp \ --disable-multilib \ --disable-decimal-float \ + --enable-plugins \ + --enable-lto \ --with-gmp=$(HOST_DIR) \ --with-mpc=$(HOST_DIR) \ --with-mpfr=$(HOST_DIR) \ @@ -82,6 +84,10 @@ HOST_GCC_COMMON_CONF_OPTS = \ --with-bugurl="http://bugs.buildroot.net/" \ --without-zstd +ifeq ($(BR2_REPRODUCIBLE),y) +HOST_GCC_COMMON_CONF_OPTS += --with-debug-prefix-map=$(BASE_DIR)=buildroot +endif + # Don't build documentation. It takes up extra space / build time, # and sometimes needs specific makeinfo versions to work HOST_GCC_COMMON_CONF_ENV = \ @@ -118,7 +124,7 @@ endif # quadmath support requires wchar ifeq ($(BR2_USE_WCHAR)$(BR2_TOOLCHAIN_HAS_LIBQUADMATH),yy) -HOST_GCC_COMMON_CONF_OPTS += --enable-libquadmath +HOST_GCC_COMMON_CONF_OPTS += --enable-libquadmath --enable-libquadmath-support else HOST_GCC_COMMON_CONF_OPTS += --disable-libquadmath --disable-libquadmath-support endif @@ -135,6 +141,27 @@ ifeq ($(BR2_sparc)$(BR2_sparc64),y) HOST_GCC_COMMON_CONF_OPTS += --disable-libsanitizer endif +# libsanitizer is available for mips64{el} since gcc 12 but fail to build +# with n32 ABI due to struct stat64 definition clash due to mixing +# kernel and user headers. +ifeq ($(BR2_mips64)$(BR2_mips64el):$(BR2_MIPS_NABI32),y:y) +HOST_GCC_COMMON_CONF_OPTS += --disable-libsanitizer +endif + +# libsanitizer bundled in gcc 12 fails to build for mips32 due to +# mixing kernel and user struct stat. +ifeq ($(BR2_mips)$(BR2_mipsel):$(BR2_TOOLCHAIN_GCC_AT_LEAST_12),y:y) +HOST_GCC_COMMON_CONF_OPTS += --disable-libsanitizer +endif + +# libsanitizer is broken for Thumb1, sanitizer_linux.cc contains unconditional +# "ldr ip, [sp], #8", which causes: +# ....s: Assembler messages: +# ....s:4190: Error: lo register required -- `ldr ip,[sp],#8' +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +HOST_GCC_COMMON_CONF_OPTS += --disable-libsanitizer +endif + # The logic in libbacktrace/configure.ac to detect if __sync builtins # are available assumes they are as soon as target_subdir is not # empty, i.e when cross-compiling. However, some platforms do not have @@ -152,10 +179,6 @@ else HOST_GCC_COMMON_CONF_OPTS += --enable-tls endif -ifeq ($(BR2_GCC_ENABLE_LTO),y) -HOST_GCC_COMMON_CONF_OPTS += --enable-plugins --enable-lto -endif - ifeq ($(BR2_PTHREADS_NONE),y) HOST_GCC_COMMON_CONF_OPTS += \ --disable-threads \ @@ -202,9 +225,17 @@ endif ifneq ($(GCC_TARGET_FP32_MODE),) HOST_GCC_COMMON_CONF_OPTS += --with-fp-32="$(GCC_TARGET_FP32_MODE)" endif + +# musl/uClibc-ng does not work with biarch powerpc toolchains, we +# need to configure gcc explicitely for 32 Bit for CPU's supporting +# 64 Bit and 32 Bit ifneq ($(GCC_TARGET_CPU),) +ifeq ($(BR2_powerpc),y) +HOST_GCC_COMMON_CONF_OPTS += --with-cpu-32=$(GCC_TARGET_CPU) +else HOST_GCC_COMMON_CONF_OPTS += --with-cpu=$(GCC_TARGET_CPU) endif +endif ifneq ($(GCC_TARGET_FPU),) HOST_GCC_COMMON_CONF_OPTS += --with-fpu=$(GCC_TARGET_FPU) @@ -269,7 +300,7 @@ HOST_GCC_COMMON_MAKE_OPTS = \ gcc_cv_libc_provides_ssp=$(if $(BR2_TOOLCHAIN_HAS_SSP),yes,no) ifeq ($(BR2_CCACHE),y) -HOST_GCC_COMMON_CCACHE_HASH_FILES += $(GCC_DL_DIR)/$(GCC_SOURCE) +HOST_GCC_COMMON_CCACHE_HASH_FILES += $($(PKG)_DL_DIR)/$(GCC_SOURCE) # Cfr. PATCH_BASE_DIRS in .stamp_patched, but we catch both versioned # and unversioned patches unconditionally. Moreover, to facilitate the diff --git a/package/gcnano-binaries/Config.in b/package/gcnano-binaries/Config.in index ade19e21210..89f909f2c30 100644 --- a/package/gcnano-binaries/Config.in +++ b/package/gcnano-binaries/Config.in @@ -22,7 +22,7 @@ config BR2_PACKAGE_GCNANO_BINARIES select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_WAYLAND help - Driver and libaries for stm vivante gcnano gpu. + Driver and libraries for stm vivante gcnano gpu. https://github.com/STMicroelectronics/gcnano-binaries/ if BR2_PACKAGE_GCNANO_BINARIES diff --git a/package/gcnano-binaries/gcnano-binaries.hash b/package/gcnano-binaries/gcnano-binaries.hash index e3efc82fc50..7bb942e6da3 100644 --- a/package/gcnano-binaries/gcnano-binaries.hash +++ b/package/gcnano-binaries/gcnano-binaries.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 afec2ba2f524821452d561b56afd2fc241293ea4a6e8598d1663f58e5d16800f gcnano-binaries-1534c3eaabb5ae545a8f97e95f853531365a13fc.tar.gz -sha256 7d209718473d18f69f75adb7caf9cb5d4b0a31da068756aa011bea617de3dc57 EULA +sha256 b122a0cd7a1bd2cee8c6117b259ef977a765d24e48655f639694cbef471da99b gcnano-binaries-0ac1a89d7a59d040a69745a85f0da7e98644cc4b.tar.gz +sha256 7d209718473d18f69f75adb7caf9cb5d4b0a31da068756aa011bea617de3dc57 EULA diff --git a/package/gcnano-binaries/gcnano-binaries.mk b/package/gcnano-binaries/gcnano-binaries.mk index f6adc36dbd6..83261f3b7c1 100644 --- a/package/gcnano-binaries/gcnano-binaries.mk +++ b/package/gcnano-binaries/gcnano-binaries.mk @@ -4,12 +4,10 @@ # ################################################################################ -GCNANO_BINARIES_LIB_VERSION = 6.4 -GCNANO_BINARIES_LIB_REVISION = 3 -GCNANO_BINARIES_LIB_FULL_VERSION = $(GCNANO_BINARIES_LIB_VERSION).$(GCNANO_BINARIES_LIB_REVISION) -GCNANO_BINARIES_DRIVER_VERSION = $(GCNANO_BINARIES_LIB_FULL_VERSION) -GCNANO_BINARIES_USERLAND_VERSION = $(GCNANO_BINARIES_LIB_FULL_VERSION)-20200902 -GCNANO_BINARIES_VERSION = 1534c3eaabb5ae545a8f97e95f853531365a13fc +GCNANO_BINARIES_LIB_VERSION = 6.4.9 +GCNANO_BINARIES_DRIVER_VERSION = $(GCNANO_BINARIES_LIB_VERSION) +GCNANO_BINARIES_USERLAND_VERSION = $(GCNANO_BINARIES_LIB_VERSION)-20221206 +GCNANO_BINARIES_VERSION = 0ac1a89d7a59d040a69745a85f0da7e98644cc4b GCNANO_BINARIES_SITE = $(call github,STMicroelectronics,gcnano-binaries,$(GCNANO_BINARIES_VERSION)) GCNANO_BINARIES_LICENSE = MIT, Vivante End User Software License Terms @@ -40,30 +38,25 @@ GCNANO_BINARIES_POST_EXTRACT_HOOKS += GCNANO_BINARIES_EXTRACT_HELPER GCNANO_BINARIES_MODULE_MAKE_OPTS = \ KERNEL_DIR=$(LINUX_DIR) \ - SOC_PLATFORM=st-st \ + SOC_PLATFORM=st-mp1 \ AQROOT=$(@D) \ DEBUG=0 -GCNANO_BINARIES_LIBRARIES = \ - libgbm_viv libEGL libGAL libgbm libGLESv1_CM \ - libGLESv2 libGLSLC libOpenVG libVSC - GCNANO_BINARIES_USERLAND_SUBDIR = gcnano-userland-multi-$(GCNANO_BINARIES_USERLAND_VERSION) -GCNANO_BINARIES_PKG_CONFIGS = egl gbm glesv1_cm glesv2 vg - define GCNANO_BINARIES_INSTALL - $(foreach lib,$(GCNANO_BINARIES_LIBRARIES), \ - $(INSTALL) -D -m 0755 $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/usr/lib/$(lib).$(GCNANO_BINARIES_LIB_VERSION).multi.release.so \ - $(1)/usr/lib/$(lib).$(GCNANO_BINARIES_LIB_VERSION).multi.release.so ; \ - cp -a $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/usr/lib/$(lib).so* $(1)/usr/lib - ) + cd $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/release/drivers/ ; \ + find . -type f -exec $(INSTALL) -D -m 0755 {} $(1)/usr/lib/{} \; ; \ + for sharelib in *.so.*; do \ + dev_lib_name=`echo $${sharelib} | awk -F'.so' '{print $$1}'`.so ; \ + link_name=`$(TARGET_OBJDUMP) -x $${sharelib} 2>/dev/null | grep SONAME | sed 's/.* //'` ; \ + ln -sf $${sharelib} $(1)/usr/lib/$${dev_lib_name} ; \ + ln -sf $${sharelib} $(1)/usr/lib/$${link_name} ; \ + done mkdir -p $(1)/usr/include - cp -a $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/usr/include/* $(1)/usr/include/ - $(foreach pkgconfig,$(GCNANO_BINARIES_PKG_CONFIGS), \ - $(INSTALL) -D -m 0644 $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/usr/lib/pkgconfig/$(pkgconfig).pc \ - $(1)/usr/lib/pkgconfig/$(pkgconfig).pc - ) + cp -a $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/release/include/* $(1)/usr/include/ + mkdir -p $(1)/usr/lib/pkgconfig/ + cp -a $(@D)/$(GCNANO_BINARIES_USERLAND_SUBDIR)/pkgconfig/* $(1)/usr/lib/pkgconfig/ endef define GCNANO_BINARIES_INSTALL_TARGET_CMDS diff --git a/package/gconf/gconf.hash b/package/gconf/gconf.hash index 24d0cf9b177..ad0064fa991 100644 --- a/package/gconf/gconf.hash +++ b/package/gconf/gconf.hash @@ -1,4 +1,4 @@ -# http://ftp.acc.umu.se/pub/gnome/sources/GConf/3.2/GConf-3.2.6.sha256sum -sha256 1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c GConf-3.2.6.tar.xz +# From https://download.gnome.org/sources/GConf/3.2/GConf-3.2.6.sha256sum +sha256 1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c GConf-3.2.6.tar.xz # License files, locally calculated -sha256 94b03f1a60a7fd5007149530626a895a6ef5a8b9342abfd56860c5f3956f5d23 COPYING +sha256 94b03f1a60a7fd5007149530626a895a6ef5a8b9342abfd56860c5f3956f5d23 COPYING diff --git a/package/gconf/gconf.mk b/package/gconf/gconf.mk index c468d1433c6..b84fa960825 100644 --- a/package/gconf/gconf.mk +++ b/package/gconf/gconf.mk @@ -6,7 +6,7 @@ GCONF_VERSION = 3.2.6 GCONF_SOURCE = GConf-$(GCONF_VERSION).tar.xz -GCONF_SITE = http://ftp.gnome.org/pub/gnome/sources/GConf/3.2 +GCONF_SITE = https://download.gnome.org/sources/GConf/3.2 GCONF_CONF_OPTS = --disable-orbit GCONF_DEPENDENCIES = dbus dbus-glib libglib2 libxml2 \ host-intltool $(TARGET_NLS_DEPENDENCIES) diff --git a/package/gcr/Config.in b/package/gcr/Config.in index e233fffed07..dbc22cf4786 100644 --- a/package/gcr/Config.in +++ b/package/gcr/Config.in @@ -1,11 +1,12 @@ config BR2_PACKAGE_GCR bool "gcr" - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # gnupg2 + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt -> libgpg-error depends on BR2_USE_WCHAR # libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_USE_MMU # libglib2 depends on !BR2_STATIC_LIBS # p11-kit - select BR2_PACKAGE_GNUPG2 # runtime + select BR2_PACKAGE_GNUPG2 if BR2_PACKAGE_GNUPG2_DEPENDS && !BR2_PACKAGE_GNUPG # runtime + select BR2_PACKAGE_GNUPG if !BR2_PACKAGE_GNUPG2_DEPENDS # runtime select BR2_PACKAGE_LIBGCRYPT select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_P11_KIT @@ -15,6 +16,7 @@ config BR2_PACKAGE_GCR https://developer.gnome.org/gcr/ comment "gcr needs a toolchain w/ wchar, threads, dynamic library" + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ BR2_STATIC_LIBS diff --git a/package/gcr/gcr.hash b/package/gcr/gcr.hash index e6074a99917..f6cc44e97dd 100644 --- a/package/gcr/gcr.hash +++ b/package/gcr/gcr.hash @@ -1,3 +1,3 @@ -# From http://ftp.acc.umu.se/pub/gnome/sources/gcr/3.40/gcr-3.40.0.sha256sum +# From https://download.gnome.org/sources/gcr/3.40/gcr-3.40.0.sha256sum sha256 b9d3645a5fd953a54285cc64d4fc046736463dbd4dcc25caf5c7b59bed3027f5 gcr-3.40.0.tar.xz sha256 94b03f1a60a7fd5007149530626a895a6ef5a8b9342abfd56860c5f3956f5d23 COPYING diff --git a/package/gcr/gcr.mk b/package/gcr/gcr.mk index ef253b4ef97..3a8c01729fd 100644 --- a/package/gcr/gcr.mk +++ b/package/gcr/gcr.mk @@ -6,7 +6,7 @@ GCR_VERSION_MAJOR = 3.40 GCR_VERSION = $(GCR_VERSION_MAJOR).0 -GCR_SITE = http://ftp.acc.umu.se/pub/gnome/sources/gcr/$(GCR_VERSION_MAJOR) +GCR_SITE = https://download.gnome.org/sources/gcr/$(GCR_VERSION_MAJOR) GCR_SOURCE = gcr-$(GCR_VERSION).tar.xz GCR_DEPENDENCIES = \ host-pkgconf \ @@ -15,14 +15,18 @@ GCR_DEPENDENCIES = \ p11-kit \ $(TARGET_NLS_DEPENDENCIES) GCR_INSTALL_STAGING = YES -GCR_CONF_OPTS = \ - -Dgpg_path=/usr/bin/gpg2 \ - -Dgtk_doc=false +GCR_CONF_OPTS = -Dgtk_doc=false # Even though COPYING is v2 the code states v2.1+ GCR_LICENSE = LGPL-2.1+ GCR_LICENSE_FILES = COPYING GCR_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) +ifeq ($(BR2_PACKAGE_GNUPG2),y) +GCR_CONF_OPTS += -Dgpg_path=/usr/bin/gpg2 +else +GCR_CONF_OPTS += -Dgpg_path=/usr/bin/gpg +endif + ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) GCR_DEPENDENCIES += gobject-introspection host-libxslt host-vala GCR_CONF_OPTS += -Dintrospection=true diff --git a/package/gdal/0001-fix-uclibc-build-without-NPTL.patch b/package/gdal/0001-fix-uclibc-build-without-NPTL.patch new file mode 100644 index 00000000000..6ecbfc7f95e --- /dev/null +++ b/package/gdal/0001-fix-uclibc-build-without-NPTL.patch @@ -0,0 +1,102 @@ +From 0d3ee8a7661dcd85a9d7b636124af32de8d1b2f1 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 26 Feb 2023 11:31:23 +0100 +Subject: [PATCH] fix uclibc build without NPTL + +Check for pthread_spin_lock instead of pthread_spin_lock_t to avoid the +following uclibc build failure: + +/tmp/instance-7/output-1/build/gdal-3.5.2/port/cpl_multiproc.cpp: In function 'CPLSpinLock* CPLCreateSpinLock()': +/tmp/instance-7/output-1/build/gdal-3.5.2/port/cpl_multiproc.cpp:2265:9: error: 'pthread_spin_init' was not declared in this scope; did you mean 'pthread_cond_init'? + 2265 | pthread_spin_init(&(psSpin->spin), PTHREAD_PROCESS_PRIVATE) == 0 ) + | ^~~~~~~~~~~~~~~~~ + | pthread_cond_init +/tmp/instance-7/output-1/build/gdal-3.5.2/port/cpl_multiproc.cpp: In function 'int CPLAcquireSpinLock(CPLSpinLock*)': +/tmp/instance-7/output-1/build/gdal-3.5.2/port/cpl_multiproc.cpp:2283:12: error: 'pthread_spin_lock' was not declared in this scope; did you mean 'pthread_spinlock_t'? + 2283 | return pthread_spin_lock( &(psSpin->spin) ) == 0; + | ^~~~~~~~~~~~~~~~~ + | pthread_spinlock_t + +Fixes: + - http://autobuild.buildroot.org/results/aa2a88990a07e551c40efb0c2180768add600c4f + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/OSGeo/gdal/pull/7318] +--- + cmake/helpers/configure.cmake | 4 ++-- + cmake/template/cpl_config.h.in | 4 ++-- + port/cpl_config.h.in | 4 ++-- + port/cpl_multiproc.cpp | 4 ++-- + 4 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/cmake/helpers/configure.cmake b/cmake/helpers/configure.cmake +index 08549df434..62a4f636ba 100644 +--- a/cmake/helpers/configure.cmake ++++ b/cmake/helpers/configure.cmake +@@ -110,9 +110,9 @@ else () + " + #define _GNU_SOURCE + #include +- int main() { pthread_spinlock_t spin; return 1; } ++ int main() { pthread_spinlock_t spin; return pthread_spin_lock(&spin); } + " +- HAVE_PTHREAD_SPINLOCK) ++ HAVE_PTHREAD_SPIN_LOCK) + + check_c_source_compiles( + " +diff --git a/cmake/template/cpl_config.h.in b/cmake/template/cpl_config.h.in +index cfa7da94aa..d1fd80bda9 100644 +--- a/cmake/template/cpl_config.h.in ++++ b/cmake/template/cpl_config.h.in +@@ -61,8 +61,8 @@ + /* Define to 1 if you have the `PTHREAD_MUTEX_ADAPTIVE_NP' constant. */ + #cmakedefine HAVE_PTHREAD_MUTEX_ADAPTIVE_NP 1 + +-/* Define to 1 if you have the `pthread_spinlock_t' type. */ +-#cmakedefine HAVE_PTHREAD_SPINLOCK 1 ++/* Define to 1 if you have the `pthread_spin_lock' function. */ ++#cmakedefine HAVE_PTHREAD_SPIN_LOCK 1 + + /* Define to 1 if you have the `pthread_atfork' function. */ + #cmakedefine HAVE_PTHREAD_ATFORK 1 +diff --git a/port/cpl_config.h.in b/port/cpl_config.h.in +index ea28efb3f0..09a48f242d 100644 +--- a/port/cpl_config.h.in ++++ b/port/cpl_config.h.in +@@ -51,8 +51,8 @@ + /* Define to 1 if you have the `PTHREAD_MUTEX_ADAPTIVE_NP' constant. */ + #undef HAVE_PTHREAD_MUTEX_ADAPTIVE_NP + +-/* Define to 1 if you have the `pthread_spinlock_t' type. */ +-#undef HAVE_PTHREAD_SPINLOCK ++/* Define to 1 if you have the `pthread_spin_lock' function. */ ++#undef HAVE_PTHREAD_SPIN_LOCK + + /* Define to 1 if you have the 5 args `mremap' function. */ + #undef HAVE_5ARGS_MREMAP +diff --git a/port/cpl_multiproc.cpp b/port/cpl_multiproc.cpp +index 7f5bcd9127..474ff5bb29 100644 +--- a/port/cpl_multiproc.cpp ++++ b/port/cpl_multiproc.cpp +@@ -2232,7 +2232,7 @@ void CPLCleanupTLS() + /* CPLCreateSpinLock() */ + /************************************************************************/ + +-#if defined(HAVE_PTHREAD_SPINLOCK) ++#if defined(HAVE_PTHREAD_SPIN_LOCK) + #define HAVE_SPINLOCK_IMPL + + struct _CPLSpinLock +@@ -2310,7 +2310,7 @@ void CPLDestroySpinLock(CPLSpinLock *psSpin) + pthread_spin_destroy(&(psSpin->spin)); + free(psSpin); + } +-#endif // HAVE_PTHREAD_SPINLOCK ++#endif // HAVE_PTHREAD_SPIN_LOCK + + #endif // def CPL_MULTIPROC_PTHREAD + +-- +2.39.1 + diff --git a/package/gdal/Config.in b/package/gdal/Config.in new file mode 100644 index 00000000000..ee7209566a3 --- /dev/null +++ b/package/gdal/Config.in @@ -0,0 +1,32 @@ +config BR2_PACKAGE_GDAL + bool "gdal" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c + depends on BR2_INSTALL_LIBSTDCPP # proj + # configure can't find proj, when linking statically + depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11, proj + depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 + depends on BR2_TOOLCHAIN_HAS_THREADS # proj + depends on BR2_USE_WCHAR # proj + select BR2_PACKAGE_JPEG + select BR2_PACKAGE_JSON_C + select BR2_PACKAGE_LIBGEOTIFF + select BR2_PACKAGE_LIBPNG + select BR2_PACKAGE_PROJ + select BR2_PACKAGE_ZLIB + help + GDAL is a translator library for raster and vector geospatial + data formats. As a library, it presents a single raster + abstract data model and single vector abstract data model to + the calling application for all supported formats. It also + comes with a variety of useful command line utilities for data + translation and processing. + + https://gdal.org/ + +comment "gdal needs a toolchain w/ C++, dynamic library, gcc >= 4.7, not binutils bug 27597, threads, wchar" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \ + BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 || \ + !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR diff --git a/package/gdal/gdal.hash b/package/gdal/gdal.hash new file mode 100644 index 00000000000..ab77d7840da --- /dev/null +++ b/package/gdal/gdal.hash @@ -0,0 +1,6 @@ +# md5 from: https://download.osgeo.org/gdal/3.5.2/gdal-3.5.2.tar.xz.md5, sha256 locally computed: +md5 821b3b0637ebada5d20dbefb2e3ec964 gdal-3.5.2.tar.xz +sha256 0874dfdeb9ac42e53c37be4184b19350be76f0530e1f4fa8004361635b9030c2 gdal-3.5.2.tar.xz + +# Hashes of license files: +sha256 fac0116e799ca4de79b076ee04863b5e2b69541ea3664b9bb108c81a5355f16a LICENSE.TXT diff --git a/package/gdal/gdal.mk b/package/gdal/gdal.mk new file mode 100644 index 00000000000..a3b11c53af9 --- /dev/null +++ b/package/gdal/gdal.mk @@ -0,0 +1,122 @@ +################################################################################ +# +# gdal +# +################################################################################ + +GDAL_VERSION = 3.5.2 +GDAL_SITE = https://download.osgeo.org/gdal/$(GDAL_VERSION) +GDAL_SOURCE = gdal-$(GDAL_VERSION).tar.xz +GDAL_LICENSE = MIT, many others +GDAL_LICENSE_FILES = LICENSE.TXT +GDAL_CPE_ID_VENDOR = osgeo +GDAL_INSTALL_STAGING = YES +GDAL_CONFIG_SCRIPTS = gdal-config +GDAL_SUPPORTS_IN_SOURCE_BUILD = NO + +# Using 'make' with CMake's Makefile generator will not work, as +# 'make' uses GNUmakefile first, but GNUmakefile is provided by +# autotools in gdal. We need to force 'make' to use the Makefile, +# which is generated by CMake. GNUmakefile and autoconf are dropped in +# 3.6 so this can be dropped in future version. +GDAL_MAKE_OPTS += -f Makefile + +# gdal at its core only needs host-pkgconf, libgeotiff, proj and tiff +# but since by default mrf driver support is enabled, it also needs +# jpeg, libpng and zlib. By default there are also many other drivers +# enabled but it seems, in contrast to mrf driver support, that they +# can be implicitly disabled, by configuring gdal without their +# respectively needed dependencies. +GDAL_DEPENDENCIES = host-pkgconf jpeg json-c libgeotiff libpng proj tiff zlib + +# Yes, even though they have -DDGDAL_USE options, a few libraries are +# mandatory. If we don't provide them, bundled versions are used. +GDAL_CONF_OPTS = \ + -DGDAL_USE_GEOTIFF=ON \ + -DGDAL_USE_JPEG=ON \ + -DGDAL_USE_JSONC=ON \ + -DGDAL_USE_ZLIB=ON \ + -DGDAL_USE_PNG=ON \ + -DGDAL_USE_ARMADILLO=OFF \ + -DGDAL_USE_BLOSC=OFF \ + -DGDAL_USE_BRUNSLI=OFF \ + -DGDAL_USE_CFITSIO=OFF \ + -DGDAL_USE_OPENSSL=OFF \ + -DGDAL_USE_CRYPTOPP=OFF \ + -DGDAL_USE_CRNLIB=OFF \ + -DGDAL_USE_CURL=OFF \ + -DGDAL_USE_ECW=OFF \ + -DGDAL_USE_EXPAT=OFF \ + -DGDAL_USE_FILEGDB=OFF \ + -DGDAL_USE_FREEXL=OFF \ + -DGDAL_USE_GEOS=OFF \ + -DGDAL_USE_LIBKML=OFF \ + -DGDAL_USE_LZ4=OFF \ + -DGDAL_USE_GTA=OFF \ + -DGDAL_USE_HDF4=OFF \ + -DGDAL_USE_HDF5=OFF \ + -DGDAL_USE_HDFS=OFF \ + -DGDAL_USE_HEIF=OFF \ + -DGDAL_USE_IDB=OFF \ + -DGDAL_USE_LURATECH=OFF \ + -DGDAL_USE_JPEG12_INTERNAL=OFF \ + -DGDAL_USE_JXL=OFF \ + -DGDAL_USE_KDU=OFF \ + -DGDAL_USE_KEA=OFF \ + -DGDAL_USE_LERC=OFF \ + -DGDAL_USE_GIF=OFF \ + -DGDAL_USE_LIBLZMA=OFF \ + -DGDAL_USE_DEFLATE=OFF \ + -DGDAL_USE_MONGOCXX=OFF \ + -DGDAL_USE_MRSID=OFF \ + -DGDAL_USE_PUBLICDECOMPWT=OFF \ + -DGDAL_USE_MYSQL=OFF \ + -DGDAL_USE_NETCDF=OFF \ + -DGDAL_USE_ORACLE=OFF \ + -DGDAL_USE_ODBC=OFF \ + -DGDAL_USE_OGDI=OFF \ + -DGDAL_USE_OPENCL=OFF \ + -DGDAL_USE_OPENEXR=OFF \ + -DGDAL_USE_OPENJPEG=OFF \ + -DGDAL_USE_PCRE=OFF \ + -DGDAL_USE_PCRE2=OFF \ + -DGDAL_USE_PDFIUM=OFF \ + -DGDAL_USE_PODOFO=OFF \ + -DGDAL_USE_POPPLER=OFF \ + -DGDAL_USE_QHULL=OFF \ + -DGDAL_USE_RASDAMAN=OFF \ + -DGDAL_USE_RASTERLITE2=OFF \ + -DGDAL_USE_RDB=OFF \ + -DGDAL_USE_SFCGAL=OFF \ + -DGDAL_USE_FYBA=OFF \ + -DGDAL_USE_SPATIALITE=OFF \ + -DGDAL_USE_SQLITE3=OFF \ + -DGDAL_USE_TEIGHA=OFF \ + -DGDAL_USE_TILEDB=OFF \ + -DGDAL_USE_WEBP=OFF \ + -DGDAL_USE_XERCESC=OFF \ + -DGDAL_USE_ZSTD=OFF \ + -DGDAL_ENABLE_DRIVER_PCIDSK=OFF \ + -DGDAL_ENABLE_DRIVER_PCRASTER=OFF \ + -DGDAL_ENABLE_DRIVER_NULL=OFF \ + -DGDAL_ENABLE_MACOSX_FRAMEWORK=OFF \ + -DENABLE_GNM=OFF \ + -DENABLE_PAM=OFF \ + -DBUILD_JAVA_BINDINGS=OFF \ + -DBUILD_PYTHON_BINDINGS=OFF + +ifeq ($(BR2_PACKAGE_LIBXML2),y) +GDAL_DEPENDENCIES += libxml2 +GDAL_CONF_OPTS += -DGDAL_USE_LIBXML2=ON +else +GDAL_CONF_OPTS += -DGDAL_USE_LIBXML2=OFF +endif + +ifeq ($(BR2_PACKAGE_POSTGRESQL),y) +GDAL_DEPENDENCIES += postgresql +GDAL_CONF_OPTS += -DGDAL_USE_POSTGRESQL=ON +else +GDAL_CONF_OPTS += -DGDAL_USE_POSTGRESQL=OFF +endif + +$(eval $(cmake-package)) diff --git a/package/gdb/10.2/0009-gdb-Fix-native-build-on-xtensa.patch b/package/gdb/10.2/0009-gdb-Fix-native-build-on-xtensa.patch new file mode 100644 index 00000000000..927bf20de56 --- /dev/null +++ b/package/gdb/10.2/0009-gdb-Fix-native-build-on-xtensa.patch @@ -0,0 +1,57 @@ +From 02d9e6a3bc47dfe138ef4511aaeeae26b7dbd1ba 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 b2b3db182bc..b230e08b69f 100644 +--- a/gdb/xtensa-linux-nat.c ++++ b/gdb/xtensa-linux-nat.c +@@ -36,6 +36,7 @@ + + #include "gregset.h" + #include "xtensa-tdep.h" ++#include "gdbarch.h" + + /* Defines ps_err_e, struct ps_prochandle. */ + #include "gdb_proc_service.h" +-- +2.37.2 + diff --git a/package/gdb/11.2/0009-gdb-Fix-native-build-on-xtensa.patch b/package/gdb/11.2/0009-gdb-Fix-native-build-on-xtensa.patch new file mode 100644 index 00000000000..bf4d617fc1b --- /dev/null +++ b/package/gdb/11.2/0009-gdb-Fix-native-build-on-xtensa.patch @@ -0,0 +1,57 @@ +From d3bb361eb0b6cbf0257f515f9d5e64add89e6bfa 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 ec33f4a10f2..73f35eac683 100644 +--- a/gdb/xtensa-linux-nat.c ++++ b/gdb/xtensa-linux-nat.c +@@ -36,6 +36,7 @@ + + #include "gregset.h" + #include "xtensa-tdep.h" ++#include "gdbarch.h" + + /* Defines ps_err_e, struct ps_prochandle. */ + #include "gdb_proc_service.h" +-- +2.37.2 + diff --git a/package/gdb/12.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/package/gdb/12.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch new file mode 100644 index 00000000000..8821bb497bc --- /dev/null +++ b/package/gdb/12.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch @@ -0,0 +1,55 @@ +From bca7617f325787550e2133fe082dbe4da7716fc6 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 1094f6b0be3..d8588a646c2 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 08824887003..69afbae5359 100644 +--- a/gdbserver/linux-ppc-low.cc ++++ b/gdbserver/linux-ppc-low.cc +@@ -23,7 +23,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.37.1 + diff --git a/package/gdb/12.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch b/package/gdb/12.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch new file mode 100644 index 00000000000..74769b7c572 --- /dev/null +++ b/package/gdb/12.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch @@ -0,0 +1,43 @@ +From a3b84f1777bd75bdc5914f4ce5f52c55e723cd9a 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 966bdeb8ba7..1e3ce53b4d5 100644 +--- a/gdbserver/linux-sh-low.cc ++++ b/gdbserver/linux-sh-low.cc +@@ -76,7 +76,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.37.1 + diff --git a/package/gdb/9.2/0003-use-asm-sgidefs.h.patch b/package/gdb/12.1/0003-use-asm-sgidefs.h.patch similarity index 90% rename from package/gdb/9.2/0003-use-asm-sgidefs.h.patch rename to package/gdb/12.1/0003-use-asm-sgidefs.h.patch index 2909f62c68c..637e4a29ee2 100644 --- a/package/gdb/9.2/0003-use-asm-sgidefs.h.patch +++ b/package/gdb/12.1/0003-use-asm-sgidefs.h.patch @@ -1,4 +1,4 @@ -From 19a0f664809b6858e69aa98188eb739415de044c Mon Sep 17 00:00:00 2001 +From 8c94bf2b40d51c500c364ac03a2da1e9f9a94287 Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Sat, 30 Apr 2016 15:29:06 -0700 Subject: [PATCH] use @@ -23,7 +23,7 @@ Signed-off-by: Vicente Olivert Riera 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c -index e68ed1e4da9..bc42aa59685 100644 +index 20e12b6889e..1e66e98a013 100644 --- a/gdb/mips-linux-nat.c +++ b/gdb/mips-linux-nat.c @@ -31,7 +31,7 @@ @@ -36,5 +36,5 @@ index e68ed1e4da9..bc42aa59685 100644 #include #include "inf-ptrace.h" -- -2.21.0 +2.37.1 diff --git a/package/gdb/9.2/0004-gdbserver-fix-build-for-m68k.patch b/package/gdb/12.1/0004-gdbserver-fix-build-for-m68k.patch similarity index 78% rename from package/gdb/9.2/0004-gdbserver-fix-build-for-m68k.patch rename to package/gdb/12.1/0004-gdbserver-fix-build-for-m68k.patch index d7182938990..435f705382d 100644 --- a/package/gdb/9.2/0004-gdbserver-fix-build-for-m68k.patch +++ b/package/gdb/12.1/0004-gdbserver-fix-build-for-m68k.patch @@ -1,4 +1,4 @@ -From 448e481aab86c823d908530038e20a14213db0a2 Mon Sep 17 00:00:00 2001 +From 48af20f76b468c5d274d286677a2887136c4c7c4 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 @@ -28,14 +28,14 @@ Fix this by moving on top of "linux-low.h". Signed-off-by: Romain Naour --- - gdb/gdbserver/linux-m68k-low.c | 9 +++++---- + gdbserver/linux-m68k-low.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) -diff --git a/gdb/gdbserver/linux-m68k-low.c b/gdb/gdbserver/linux-m68k-low.c -index 16f639d02fc..969d9973737 100644 ---- a/gdb/gdbserver/linux-m68k-low.c -+++ b/gdb/gdbserver/linux-m68k-low.c -@@ -17,16 +17,17 @@ +diff --git a/gdbserver/linux-m68k-low.cc b/gdbserver/linux-m68k-low.cc +index 7a433ffab5e..bb3fbd69bd7 100644 +--- a/gdbserver/linux-m68k-low.cc ++++ b/gdbserver/linux-m68k-low.cc +@@ -17,6 +17,11 @@ along with this program. If not, see . */ #include "server.h" @@ -46,7 +46,8 @@ index 16f639d02fc..969d9973737 100644 + #include "linux-low.h" - /* Defined in auto-generated file reg-m68k.c. */ + /* Linux target op definitions for the m68k architecture. */ +@@ -80,10 +85,6 @@ m68k_target::low_decr_pc_after_break () void init_registers_m68k (void); extern const struct target_desc *tdesc_m68k; @@ -58,5 +59,5 @@ index 16f639d02fc..969d9973737 100644 #define m68k_num_gregs 18 -- -2.21.0 +2.37.1 diff --git a/package/gdb/9.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch b/package/gdb/12.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch similarity index 94% rename from package/gdb/9.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch rename to package/gdb/12.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch index 1df54526823..b1ecc2097c9 100644 --- a/package/gdb/9.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch +++ b/package/gdb/12.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch @@ -1,4 +1,4 @@ -From d84ecfa3a8c8fbade89229ac66c09f2a97ab00fb Mon Sep 17 00:00:00 2001 +From cbcb73a86dea0c0b9917b49b37095463155c5377 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 @@ -37,7 +37,7 @@ Signed-off-by: Romain Naour 1 file changed, 1 insertion(+) diff --git a/gdb/nat/fork-inferior.c b/gdb/nat/fork-inferior.c -index fe9360a5039..626fe7c1fbf 100644 +index 4df9a98047e..9bf0f6059f5 100644 --- a/gdb/nat/fork-inferior.c +++ b/gdb/nat/fork-inferior.c @@ -27,6 +27,7 @@ @@ -49,5 +49,5 @@ index fe9360a5039..626fe7c1fbf 100644 extern char **environ; -- -2.21.0 +2.37.1 diff --git a/package/gdb/12.1/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch b/package/gdb/12.1/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch new file mode 100644 index 00000000000..ab936975e0a --- /dev/null +++ b/package/gdb/12.1/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch @@ -0,0 +1,39 @@ +From 03efe04b5748703234516836cb0186d25b052556 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 41212fb329d..0ad3f9648d2 100644 +--- a/gnulib/import/getrandom.c ++++ b/gnulib/import/getrandom.c +@@ -19,6 +19,7 @@ + + #include + ++#include + #include + + #include +-- +2.37.1 + diff --git a/package/gdb/12.1/0007-fix-musl-build-on-riscv.patch b/package/gdb/12.1/0007-fix-musl-build-on-riscv.patch new file mode 100644 index 00000000000..7b4133341a3 --- /dev/null +++ b/package/gdb/12.1/0007-fix-musl-build-on-riscv.patch @@ -0,0 +1,60 @@ +From f2dd94dce490d8e8301fba9e4684cfb8d7bc7756 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 07b49c0f16e..1ff58cce16f 100644 +--- a/gdb/nat/riscv-linux-tdesc.c ++++ b/gdb/nat/riscv-linux-tdesc.c +@@ -31,6 +31,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 6b2902e422d..ead54db09a8 100644 +--- a/gdbserver/linux-riscv-low.cc ++++ b/gdbserver/linux-riscv-low.cc +@@ -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 ++ + /* Linux target op definitions for the RISC-V architecture. */ + + class riscv_target : public linux_process_target +-- +2.37.1 + diff --git a/package/gdb/12.1/0008-gdbserver-Makefile.in-fix-NLS-build.patch b/package/gdb/12.1/0008-gdbserver-Makefile.in-fix-NLS-build.patch new file mode 100644 index 00000000000..355ac480ee5 --- /dev/null +++ b/package/gdb/12.1/0008-gdbserver-Makefile.in-fix-NLS-build.patch @@ -0,0 +1,38 @@ +From 73487022cb629415c3b0c2d9e125035b6e5c2d32 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 47648b8d962..9d862bcb9c9 100644 +--- a/gdbserver/Makefile.in ++++ b/gdbserver/Makefile.in +@@ -383,7 +383,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.37.1 + diff --git a/package/gdb/12.1/0009-gdb-Fix-native-build-on-xtensa.patch b/package/gdb/12.1/0009-gdb-Fix-native-build-on-xtensa.patch new file mode 100644 index 00000000000..4ff3828f2a0 --- /dev/null +++ b/package/gdb/12.1/0009-gdb-Fix-native-build-on-xtensa.patch @@ -0,0 +1,57 @@ +From 222cb32acf044fe90e8534b064f9168ad0d8c705 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 097d7bd6f96..4e4290fe038 100644 +--- a/gdb/xtensa-linux-nat.c ++++ b/gdb/xtensa-linux-nat.c +@@ -36,6 +36,7 @@ + + #include "gregset.h" + #include "xtensa-tdep.h" ++#include "gdbarch.h" + + /* Defines ps_err_e, struct ps_prochandle. */ + #include "gdb_proc_service.h" +-- +2.37.2 + diff --git a/package/gdb/4ecb98fbc2f94dbe01b69384afbc515107de73df/0001-Fix-Python3.9-related-runtime-problems.patch b/package/gdb/4ecb98fbc2f94dbe01b69384afbc515107de73df/0001-Fix-Python3.9-related-runtime-problems.patch deleted file mode 100644 index 8c2a9d3d5b8..00000000000 --- a/package/gdb/4ecb98fbc2f94dbe01b69384afbc515107de73df/0001-Fix-Python3.9-related-runtime-problems.patch +++ /dev/null @@ -1,193 +0,0 @@ -From 8342feee01e4e8d38affcf35e47ad900567f42e0 Mon Sep 17 00:00:00 2001 -From: Kevin Buettner -Date: Wed, 27 May 2020 20:05:40 -0700 -Subject: [PATCH] Fix Python3.9 related runtime problems - -Python3.9b1 is now available on Rawhide. GDB w/ Python 3.9 support -can be built using the configure switch -with-python=/usr/bin/python3.9. - -Attempting to run gdb/Python3.9 segfaults on startup: - - #0 0x00007ffff7b0582c in PyEval_ReleaseLock () from /lib64/libpython3.9.so.1.0 - #1 0x000000000069ccbf in do_start_initialization () - at worktree-test1/gdb/python/python.c:1789 - #2 _initialize_python () - at worktree-test1/gdb/python/python.c:1877 - #3 0x00000000007afb0a in initialize_all_files () at init.c:237 - ... - -Consulting the the documentation... - -https://docs.python.org/3/c-api/init.html - -...we find that PyEval_ReleaseLock() has been deprecated since version -3.2. It recommends using PyEval_SaveThread or PyEval_ReleaseThread() -instead. In do_start_initialization, in gdb/python/python.c, we -can replace the calls to PyThreadState_Swap() and PyEval_ReleaseLock() -with a single call to PyEval_SaveThread. (Thanks to Keith Seitz -for working this out.) - -With that in place, GDB gets a little bit further. It still dies -on startup, but the backtrace is different: - - #0 0x00007ffff7b04306 in PyOS_InterruptOccurred () - from /lib64/libpython3.9.so.1.0 - #1 0x0000000000576e86 in check_quit_flag () - at worktree-test1/gdb/extension.c:776 - #2 0x0000000000576f8a in set_active_ext_lang (now_active=now_active@entry=0x983c00 ) - at worktree-test1/gdb/extension.c:705 - #3 0x000000000069d399 in gdbpy_enter::gdbpy_enter (this=0x7fffffffd2d0, - gdbarch=0x0, language=0x0) - at worktree-test1/gdb/python/python.c:211 - #4 0x0000000000686e00 in python_new_inferior (inf=0xddeb10) - at worktree-test1/gdb/python/py-inferior.c:251 - #5 0x00000000005d9fb9 in std::function::operator()(inferior*) const (__args#0=, this=0xccad20) - at /usr/include/c++/10/bits/std_function.h:617 - #6 gdb::observers::observable::notify (args#0=0xddeb10, - this=) - at worktree-test1/gdb/../gdbsupport/observable.h:106 - #7 add_inferior_silent (pid=0) - at worktree-test1/gdb/inferior.c:113 - #8 0x00000000005dbcb8 in initialize_inferiors () - at worktree-test1/gdb/inferior.c:947 - ... - -We checked with some Python Developers and were told that we should -acquire the GIL prior to calling any Python C API function. We -definitely don't have the GIL for calls of PyOS_InterruptOccurred(). - -I moved class_gdbpy_gil earlier in the file and use it in -gdbpy_check_quit_flag() to acquire (and automatically release) the -GIL. - -With those changes in place, I was able to run to a GDB prompt. But, -when trying to quit, it segfaulted again due to due to some other -problems with gdbpy_check_quit_flag(): - - Thread 1 "gdb" received signal SIGSEGV, Segmentation fault. - 0x00007ffff7bbab0c in new_threadstate () from /lib64/libpython3.9.so.1.0 - (top-gdb) bt 8 - #0 0x00007ffff7bbab0c in new_threadstate () from /lib64/libpython3.9.so.1.0 - #1 0x00007ffff7afa5ea in PyGILState_Ensure.cold () - from /lib64/libpython3.9.so.1.0 - #2 0x000000000069b58c in gdbpy_gil::gdbpy_gil (this=) - at worktree-test1/gdb/python/python.c:278 - #3 gdbpy_check_quit_flag (extlang=) - at worktree-test1/gdb/python/python.c:278 - #4 0x0000000000576e96 in check_quit_flag () - at worktree-test1/gdb/extension.c:776 - #5 0x000000000057700c in restore_active_ext_lang (previous=0xe9c050) - at worktree-test1/gdb/extension.c:729 - #6 0x000000000088913a in do_my_cleanups ( - pmy_chain=0xc31870 , - old_chain=0xae5720 ) - at worktree-test1/gdbsupport/cleanups.cc:131 - #7 do_final_cleanups () - at worktree-test1/gdbsupport/cleanups.cc:143 - -In this case, we're trying to call a Python C API function after -Py_Finalize() has been called from finalize_python(). I made -finalize_python set gdb_python_initialized to false and then cause -check_quit_flag() to return early when it's false. - -With these changes in place, GDB seems to be working again with -Python3.9b1. I think it likely that there are other problems lurking. -I wouldn't be surprised to find that there are other calls into Python -where we don't first make sure that we have the GIL. Further changes -may well be needed. - -I see no regressions testing on Rawhide using a GDB built with the -default Python version (3.8.3) versus one built using Python 3.9b1. - -I've also tested on Fedora 28, 29, 30, 31, and 32 (all x86_64) using -the default (though updated) system installed versions of Python on -those OSes. This means that I've tested against Python versions -2.7.15, 2.7.17, 2.7.18, 3.7.7, 3.8.2, and 3.8.3. In each case GDB -still builds without problem and shows no regressions after applying -this patch. - -gdb/ChangeLog: - -2020-MM-DD Kevin Buettner - Keith Seitz - - * python/python.c (do_start_initialization): For Python 3.9 and - later, call PyEval_SaveThread instead of PyEval_ReleaseLock. - (class gdbpy_gil): Move to earlier in file. - (finalize_python): Set gdb_python_initialized. - (gdbpy_check_quit_flag): Acquire GIL via gdbpy_gil. Return early - when not initialized. - -[import into Buildroot, removing ChangeLog change to avoid conflict] -Signed-off-by: Thomas De Schampheleire ---- - gdb/python/python.c | 32 ++++++++++++++++++++++++++++++-- - 1 file changed, 30 insertions(+), 2 deletions(-) - -diff --git a/gdb/python/python.c b/gdb/python/python.c -index b00b70be85b..0eee3f0397c 100644 ---- a/gdb/python/python.c -+++ b/gdb/python/python.c -@@ -268,6 +268,30 @@ ensure_python_env (struct gdbarch *gdbarch, - return make_cleanup (restore_python_env, env); - } - -+/* A helper class to save and restore the GIL, but without touching -+ the other globals that are handled by gdbpy_enter. */ -+ -+class gdbpy_gil -+{ -+public: -+ -+ gdbpy_gil () -+ : m_state (PyGILState_Ensure ()) -+ { -+ } -+ -+ ~gdbpy_gil () -+ { -+ PyGILState_Release (m_state); -+ } -+ -+ DISABLE_COPY_AND_ASSIGN (gdbpy_gil); -+ -+private: -+ -+ PyGILState_STATE m_state; -+}; -+ - /* Set the quit flag. */ - - static void -@@ -281,6 +305,10 @@ gdbpy_set_quit_flag (const struct extension_language_defn *extlang) - static int - gdbpy_check_quit_flag (const struct extension_language_defn *extlang) - { -+ if (!gdb_python_initialized) -+ return 0; -+ -+ gdbpy_gil gil; - return PyOS_InterruptOccurred (); - } - -@@ -1620,6 +1648,7 @@ finalize_python (void *ignore) - - Py_Finalize (); - -+ gdb_python_initialized = false; - restore_active_ext_lang (previous_active); - } - #endif -@@ -1854,8 +1883,7 @@ message == an error message without a stack will be printed."), - goto fail; - - /* Release the GIL while gdb runs. */ -- PyThreadState_Swap (NULL); -- PyEval_ReleaseLock (); -+ PyEval_SaveThread (); - - make_final_cleanup (finalize_python, NULL); - --- -2.31.1 - diff --git a/package/gdb/9.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/package/gdb/9.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch deleted file mode 100644 index ab8dc626f0a..00000000000 --- a/package/gdb/9.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 72ee19f54fd35595465b2e35eccf1f3d65fe21c6 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/gdbserver/linux-ppc-low.c | 6 ++++++ - gdb/nat/ppc-linux.h | 6 ++++++ - 2 files changed, 12 insertions(+) - -diff --git a/gdb/gdbserver/linux-ppc-low.c b/gdb/gdbserver/linux-ppc-low.c -index 1b695e53fe9..1978347c02c 100644 ---- a/gdb/gdbserver/linux-ppc-low.c -+++ b/gdb/gdbserver/linux-ppc-low.c -@@ -23,7 +23,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" -diff --git a/gdb/nat/ppc-linux.h b/gdb/nat/ppc-linux.h -index f1561b3b357..40399361c09 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. */ --- -2.21.0 - diff --git a/package/gdb/9.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch b/package/gdb/9.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch deleted file mode 100644 index 9d508fbf1e5..00000000000 --- a/package/gdb/9.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch +++ /dev/null @@ -1,43 +0,0 @@ -From ef630288fdc2d4d22651702672f9d5c9cd767e5b 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 ---- - gdb/gdbserver/linux-sh-low.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/gdb/gdbserver/linux-sh-low.c b/gdb/gdbserver/linux-sh-low.c -index 0953721a190..c331c1382f7 100644 ---- a/gdb/gdbserver/linux-sh-low.c -+++ b/gdb/gdbserver/linux-sh-low.c -@@ -27,7 +27,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.21.0 - diff --git a/package/gdb/9.2/0006-sim-ppc-Fix-linker-error-with-fno-common.patch b/package/gdb/9.2/0006-sim-ppc-Fix-linker-error-with-fno-common.patch deleted file mode 100644 index 813a1054a52..00000000000 --- a/package/gdb/9.2/0006-sim-ppc-Fix-linker-error-with-fno-common.patch +++ /dev/null @@ -1,101 +0,0 @@ -From ad8464f799a4c96c7ab8bdfec3f95846cf54f9b0 Mon Sep 17 00:00:00 2001 -From: Sebastian Huber -Date: Wed, 1 Jul 2020 19:29:55 +0200 -Subject: [PATCH] sim/ppc: Fix linker error with -fno-common - -GCC 10 enables -fno-common by default. This resulted in a multiple -definition linker error since global variables were declared and defined -in a header file: - - ld: ld-insn.o:sim/ppc/ld-insn.h:221: multiple definition of - `max_model_fields_len'; igen.o:sim/ppc/ld-insn.h:221: first defined here - -sim/ppc - - * ld-insn.h (last_model, last_model_data, last_model_function, - last_model_internal, last_model_macro, last_model_static): - Delete. - (max_model_fields_len, model_data, model_functions, - model_internal, model_macros, model_static, models): Declare, but do not - define. - * ld-insn.c (last_model, last_model_data, last_model_function, - last_model_internal, last_model_macro, last_model_static, - max_model_fields_len, model_data, model_functions, - model_internal, model_macros, model_static, models): Define. - -Signed-off-by: Maxim Kochetkov -Fetch from: https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=ad8464f799a4c96c7ab8bdfec3f95846cf54f9b0 ---- - sim/ppc/ld-insn.c | 18 ++++++++++++++++++ - sim/ppc/ld-insn.h | 24 +++++++----------------- - 2 files changed, 25 insertions(+), 17 deletions(-) - -diff --git a/sim/ppc/ld-insn.c b/sim/ppc/ld-insn.c -index e39131ca133..585071a861f 100644 ---- a/sim/ppc/ld-insn.c -+++ b/sim/ppc/ld-insn.c -@@ -28,6 +28,24 @@ - - #include "igen.h" - -+static model *last_model; -+ -+static insn *last_model_macro; -+static insn *last_model_function; -+static insn *last_model_internal; -+static insn *last_model_static; -+static insn *last_model_data; -+ -+model *models; -+ -+insn *model_macros; -+insn *model_functions; -+insn *model_internal; -+insn *model_static; -+insn *model_data; -+ -+int max_model_fields_len; -+ - static void - update_depth(insn_table *entry, - lf *file, -diff --git a/sim/ppc/ld-insn.h b/sim/ppc/ld-insn.h -index 88318ffa2b3..52baeaa2d84 100644 ---- a/sim/ppc/ld-insn.h -+++ b/sim/ppc/ld-insn.h -@@ -200,25 +200,15 @@ extern insn_table *load_insn_table - table_include *includes, - cache_table **cache_rules); - --model *models; --model *last_model; -+extern model *models; - --insn *model_macros; --insn *last_model_macro; -+extern insn *model_macros; -+extern insn *model_functions; -+extern insn *model_internal; -+extern insn *model_static; -+extern insn *model_data; - --insn *model_functions; --insn *last_model_function; -- --insn *model_internal; --insn *last_model_internal; -- --insn *model_static; --insn *last_model_static; -- --insn *model_data; --insn *last_model_data; -- --int max_model_fields_len; -+extern int max_model_fields_len; - - extern void insn_table_insert_insn - (insn_table *table, --- -2.18.4 - diff --git a/package/gdb/9.2/0007-Fix-Python3.9-related-runtime-problems.patch b/package/gdb/9.2/0007-Fix-Python3.9-related-runtime-problems.patch deleted file mode 100644 index 89b0cdc4a04..00000000000 --- a/package/gdb/9.2/0007-Fix-Python3.9-related-runtime-problems.patch +++ /dev/null @@ -1,227 +0,0 @@ -From c47bae859a5af0d95224d90000df0e529f7c5aa0 Mon Sep 17 00:00:00 2001 -From: Kevin Buettner -Date: Wed, 27 May 2020 20:05:40 -0700 -Subject: [PATCH] Fix Python3.9 related runtime problems - -Python3.9b1 is now available on Rawhide. GDB w/ Python 3.9 support -can be built using the configure switch -with-python=/usr/bin/python3.9. - -Attempting to run gdb/Python3.9 segfaults on startup: - - #0 0x00007ffff7b0582c in PyEval_ReleaseLock () from /lib64/libpython3.9.so.1.0 - #1 0x000000000069ccbf in do_start_initialization () - at worktree-test1/gdb/python/python.c:1789 - #2 _initialize_python () - at worktree-test1/gdb/python/python.c:1877 - #3 0x00000000007afb0a in initialize_all_files () at init.c:237 - ... - -Consulting the the documentation... - -https://docs.python.org/3/c-api/init.html - -...we find that PyEval_ReleaseLock() has been deprecated since version -3.2. It recommends using PyEval_SaveThread or PyEval_ReleaseThread() -instead. In do_start_initialization, in gdb/python/python.c, we -can replace the calls to PyThreadState_Swap() and PyEval_ReleaseLock() -with a single call to PyEval_SaveThread. (Thanks to Keith Seitz -for working this out.) - -With that in place, GDB gets a little bit further. It still dies -on startup, but the backtrace is different: - - #0 0x00007ffff7b04306 in PyOS_InterruptOccurred () - from /lib64/libpython3.9.so.1.0 - #1 0x0000000000576e86 in check_quit_flag () - at worktree-test1/gdb/extension.c:776 - #2 0x0000000000576f8a in set_active_ext_lang (now_active=now_active@entry=0x983c00 ) - at worktree-test1/gdb/extension.c:705 - #3 0x000000000069d399 in gdbpy_enter::gdbpy_enter (this=0x7fffffffd2d0, - gdbarch=0x0, language=0x0) - at worktree-test1/gdb/python/python.c:211 - #4 0x0000000000686e00 in python_new_inferior (inf=0xddeb10) - at worktree-test1/gdb/python/py-inferior.c:251 - #5 0x00000000005d9fb9 in std::function::operator()(inferior*) const (__args#0=, this=0xccad20) - at /usr/include/c++/10/bits/std_function.h:617 - #6 gdb::observers::observable::notify (args#0=0xddeb10, - this=) - at worktree-test1/gdb/../gdbsupport/observable.h:106 - #7 add_inferior_silent (pid=0) - at worktree-test1/gdb/inferior.c:113 - #8 0x00000000005dbcb8 in initialize_inferiors () - at worktree-test1/gdb/inferior.c:947 - ... - -We checked with some Python Developers and were told that we should -acquire the GIL prior to calling any Python C API function. We -definitely don't have the GIL for calls of PyOS_InterruptOccurred(). - -I moved class_gdbpy_gil earlier in the file and use it in -gdbpy_check_quit_flag() to acquire (and automatically release) the -GIL. - -With those changes in place, I was able to run to a GDB prompt. But, -when trying to quit, it segfaulted again due to due to some other -problems with gdbpy_check_quit_flag(): - - Thread 1 "gdb" received signal SIGSEGV, Segmentation fault. - 0x00007ffff7bbab0c in new_threadstate () from /lib64/libpython3.9.so.1.0 - (top-gdb) bt 8 - #0 0x00007ffff7bbab0c in new_threadstate () from /lib64/libpython3.9.so.1.0 - #1 0x00007ffff7afa5ea in PyGILState_Ensure.cold () - from /lib64/libpython3.9.so.1.0 - #2 0x000000000069b58c in gdbpy_gil::gdbpy_gil (this=) - at worktree-test1/gdb/python/python.c:278 - #3 gdbpy_check_quit_flag (extlang=) - at worktree-test1/gdb/python/python.c:278 - #4 0x0000000000576e96 in check_quit_flag () - at worktree-test1/gdb/extension.c:776 - #5 0x000000000057700c in restore_active_ext_lang (previous=0xe9c050) - at worktree-test1/gdb/extension.c:729 - #6 0x000000000088913a in do_my_cleanups ( - pmy_chain=0xc31870 , - old_chain=0xae5720 ) - at worktree-test1/gdbsupport/cleanups.cc:131 - #7 do_final_cleanups () - at worktree-test1/gdbsupport/cleanups.cc:143 - -In this case, we're trying to call a Python C API function after -Py_Finalize() has been called from finalize_python(). I made -finalize_python set gdb_python_initialized to false and then cause -check_quit_flag() to return early when it's false. - -With these changes in place, GDB seems to be working again with -Python3.9b1. I think it likely that there are other problems lurking. -I wouldn't be surprised to find that there are other calls into Python -where we don't first make sure that we have the GIL. Further changes -may well be needed. - -I see no regressions testing on Rawhide using a GDB built with the -default Python version (3.8.3) versus one built using Python 3.9b1. - -I've also tested on Fedora 28, 29, 30, 31, and 32 (all x86_64) using -the default (though updated) system installed versions of Python on -those OSes. This means that I've tested against Python versions -2.7.15, 2.7.17, 2.7.18, 3.7.7, 3.8.2, and 3.8.3. In each case GDB -still builds without problem and shows no regressions after applying -this patch. - -gdb/ChangeLog: - -2020-MM-DD Kevin Buettner - Keith Seitz - - * python/python.c (do_start_initialization): For Python 3.9 and - later, call PyEval_SaveThread instead of PyEval_ReleaseLock. - (class gdbpy_gil): Move to earlier in file. - (finalize_python): Set gdb_python_initialized. - (gdbpy_check_quit_flag): Acquire GIL via gdbpy_gil. Return early - when not initialized. - - -[import into Buildroot, removing ChangeLog change to avoid conflict] -Signed-off-by: Thomas De Schampheleire - ---- - gdb/ChangeLog | 10 ++++++++ - gdb/python/python.c | 56 ++++++++++++++++++++++++--------------------- - 2 files changed, 40 insertions(+), 26 deletions(-) - -diff --git a/gdb/python/python.c b/gdb/python/python.c -index 67f362b852d..4bdd2201abc 100644 ---- a/gdb/python/python.c -+++ b/gdb/python/python.c -@@ -238,6 +238,30 @@ gdbpy_enter::~gdbpy_enter () - PyGILState_Release (m_state); - } - -+/* A helper class to save and restore the GIL, but without touching -+ the other globals that are handled by gdbpy_enter. */ -+ -+class gdbpy_gil -+{ -+public: -+ -+ gdbpy_gil () -+ : m_state (PyGILState_Ensure ()) -+ { -+ } -+ -+ ~gdbpy_gil () -+ { -+ PyGILState_Release (m_state); -+ } -+ -+ DISABLE_COPY_AND_ASSIGN (gdbpy_gil); -+ -+private: -+ -+ PyGILState_STATE m_state; -+}; -+ - /* Set the quit flag. */ - - static void -@@ -251,6 +275,10 @@ gdbpy_set_quit_flag (const struct extension_language_defn *extlang) - static int - gdbpy_check_quit_flag (const struct extension_language_defn *extlang) - { -+ if (!gdb_python_initialized) -+ return 0; -+ -+ gdbpy_gil gil; - return PyOS_InterruptOccurred (); - } - -@@ -943,30 +971,6 @@ gdbpy_source_script (const struct extension_language_defn *extlang, - - /* Posting and handling events. */ - --/* A helper class to save and restore the GIL, but without touching -- the other globals that are handled by gdbpy_enter. */ -- --class gdbpy_gil --{ --public: -- -- gdbpy_gil () -- : m_state (PyGILState_Ensure ()) -- { -- } -- -- ~gdbpy_gil () -- { -- PyGILState_Release (m_state); -- } -- -- DISABLE_COPY_AND_ASSIGN (gdbpy_gil); -- --private: -- -- PyGILState_STATE m_state; --}; -- - /* A single event. */ - struct gdbpy_event - { -@@ -1616,6 +1620,7 @@ finalize_python (void *ignore) - - Py_Finalize (); - -+ gdb_python_initialized = false; - restore_active_ext_lang (previous_active); - } - -@@ -1785,8 +1790,7 @@ do_start_initialization () - return false; - - /* Release the GIL while gdb runs. */ -- PyThreadState_Swap (NULL); -- PyEval_ReleaseLock (); -+ PyEval_SaveThread (); - - make_final_cleanup (finalize_python, NULL); - --- -2.26.3 - diff --git a/package/gdb/9.2/0007-gdb-configure.tgt-build-gdbserver-with-m68k-and-ucli.patch b/package/gdb/9.2/0007-gdb-configure.tgt-build-gdbserver-with-m68k-and-ucli.patch deleted file mode 100644 index 5cdafae7a8f..00000000000 --- a/package/gdb/9.2/0007-gdb-configure.tgt-build-gdbserver-with-m68k-and-ucli.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 808601f075fe3dd8ca101e31c9121a4e87f0bfc7 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 6 May 2021 07:45:00 +0200 -Subject: [PATCH] gdb/configure.tgt: build gdbserver with m68k and - uclibc - -Allow to build gdbserver with m68k and uclibc: - -checking whether gdbserver is supported on this host... no -configure: error: Automatic gdbserver build is not supported for this configuration - -Fixes: - - http://autobuild.buildroot.org/results/f4d6d9d8418c0da48a3db4ad5a82e19bd16eae34 - -Signed-off-by: Fabrice Fontaine ---- - gdb/configure.tgt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gdb/configure.tgt b/gdb/configure.tgt -index caa42be1c01..8666bc5d0bf 100644 ---- a/gdb/configure.tgt -+++ b/gdb/configure.tgt -@@ -372,12 +372,12 @@ m68hc11*-*-*|m6811*-*-*) - gdb_sim=../sim/m68hc11/libsim.a - ;; - --m68*-*-aout* | m68*-*-coff* | m68*-*-elf* | m68*-*-rtems* | m68*-*-uclinux* | \ -+m68*-*-aout* | m68*-*-coff* | m68*-*-elf* | m68*-*-rtems* | \ - fido-*-elf*) - # Target: Motorola m68k embedded - gdb_target_obs="m68k-tdep.o" - ;; --m68*-*-linux*) -+m68*-*-*linux*) - # Target: Motorola m68k with a.out and ELF - gdb_target_obs="m68k-tdep.o m68k-linux-tdep.o solib-svr4.o \ - linux-tdep.o glibc-tdep.o symfile-mem.o" --- -2.30.2 - diff --git a/package/gdb/Config.in b/package/gdb/Config.in index daad6c910d6..6986a6441aa 100644 --- a/package/gdb/Config.in +++ b/package/gdb/Config.in @@ -3,8 +3,10 @@ config BR2_PACKAGE_GDB_ARCH_SUPPORTS default y depends on !((BR2_arm || BR2_armeb) && BR2_BINFMT_FLAT) depends on !BR2_microblaze - depends on !BR2_or1k - depends on !BR2_nds32 + +comment "gdb needs a glibc or uclibc toolchain" + depends on BR2_or1k + depends on BR2_TOOLCHAIN_USES_MUSL comment "gdb/gdbserver needs a toolchain w/ threads, threads debug" depends on BR2_PACKAGE_GDB_ARCH_SUPPORTS @@ -19,6 +21,9 @@ config BR2_PACKAGE_GDB depends on BR2_PACKAGE_GDB_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 depends on BR2_INSTALL_LIBSTDCPP + # The or1k musl port is incomplete, elf_gregset_t definition is missing: + # https://git.musl-libc.org/cgit/musl/tree/arch/or1k/bits/user.h?h=v1.2.3 + depends on !BR2_or1k || !BR2_TOOLCHAIN_USES_MUSL # When the external toolchain gdbserver is copied to the # target, we don't allow building a separate gdbserver. The # one from the external toolchain should be used. @@ -53,9 +58,9 @@ config BR2_PACKAGE_GDB_DEBUGGER bool "full debugger" depends on BR2_USE_WCHAR depends on !BR2_sh - depends on !BR2_csky - select BR2_PACKAGE_GMP if BR2_GDB_VERSION_11 + select BR2_PACKAGE_GMP if !BR2_GDB_VERSION_10 && !BR2_arc select BR2_PACKAGE_NCURSES + select BR2_PACKAGE_ZLIB comment "full gdb on target needs a toolchain w/ wchar" depends on !BR2_sh diff --git a/package/gdb/Config.in.host b/package/gdb/Config.in.host index d3dea0b0a74..e8a34e08344 100644 --- a/package/gdb/Config.in.host +++ b/package/gdb/Config.in.host @@ -3,8 +3,6 @@ config BR2_PACKAGE_HOST_GDB_ARCH_SUPPORTS default y depends on !((BR2_arm || BR2_armeb) && BR2_BINFMT_FLAT) depends on !BR2_microblaze - depends on !BR2_or1k - depends on !BR2_nds32 comment "Host GDB Options" depends on !BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY @@ -43,22 +41,23 @@ config BR2_PACKAGE_HOST_GDB_SIM choice prompt "GDB debugger Version" - default BR2_GDB_VERSION_10 + default BR2_GDB_VERSION_11 depends on !BR2_arc - depends on !BR2_csky help Select the version of gdb you wish to use. -config BR2_GDB_VERSION_9_2 - bool "gdb 9.2.x" - # gdbserver support missing - depends on !BR2_riscv - config BR2_GDB_VERSION_10 bool "gdb 10.x" + # gdbserver support missing + depends on !BR2_or1k config BR2_GDB_VERSION_11 bool "gdb 11.x" + # gdbserver support missing + depends on !BR2_or1k + +config BR2_GDB_VERSION_12 + bool "gdb 12.x" endchoice @@ -68,18 +67,7 @@ endif config BR2_GDB_VERSION string default "arc-2020.09-release-gdb" if BR2_arc - default "4ecb98fbc2f94dbe01b69384afbc515107de73df" if BR2_csky - default "9.2" if BR2_GDB_VERSION_9_2 - default "10.2" if BR2_GDB_VERSION_10 || !BR2_PACKAGE_HOST_GDB - default "11.2" if BR2_GDB_VERSION_11 - depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB - -# recent gdb versions (>= 10) have gdbserver moved at the top-level, -# which requires a different build logic. -config BR2_PACKAGE_GDB_TOPLEVEL - bool - default y if BR2_arc - default y if BR2_GDB_VERSION_10 - default y if BR2_GDB_VERSION_11 - default y if !BR2_PACKAGE_HOST_GDB + default "10.2" if BR2_GDB_VERSION_10 + default "11.2" if BR2_GDB_VERSION_11 || (!BR2_PACKAGE_HOST_GDB && !BR2_or1k) + default "12.1" if BR2_GDB_VERSION_12 || (!BR2_PACKAGE_HOST_GDB && BR2_or1k) depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB diff --git a/package/gdb/arc-2020.09-release-gdb/0001-Do-not-define-basic_string_view-to_string.patch b/package/gdb/arc-2020.09-release-gdb/0001-Do-not-define-basic_string_view-to_string.patch new file mode 100644 index 00000000000..210ba6d6096 --- /dev/null +++ b/package/gdb/arc-2020.09-release-gdb/0001-Do-not-define-basic_string_view-to_string.patch @@ -0,0 +1,114 @@ +From 5ac588997c3c2d032d5d5145d9245eb37354c23b Mon Sep 17 00:00:00 2001 +From: Tom Tromey +Date: Tue, 30 Jun 2020 07:53:03 -0600 +Subject: [PATCH] Do not define basic_string_view::to_string + +gdb's copy of basic_string_view includes a to_string method. However, +according to cppreference, this is not a method on the real +std::basic_string_view: + +https://en.cppreference.com/w/cpp/string/basic_string_view + +This difference matters because gdb_string_view.h will use the +standard implementation when built with a C++17 or later. This caused +PR build/26183. + +This patch fixes the problem by changing the method to be a standalone +helper function, and then rewriting the uses. Tested by rebuilding +with a version of GCC that defaults to C++17. + +(Note that the build still is not clean; and also I noticed that the +libstdc++ string_view forbids the use of nullptr ... I wonder if gdb +violates that.) + +gdb/ChangeLog +2020-06-30 Tom Tromey + + PR build/26183: + * ada-lang.c (ada_lookup_name_info::ada_lookup_name_info): Use + gdb::to_string. + +gdbsupport/ChangeLog +2020-06-30 Tom Tromey + + PR build/26183: + * gdb_string_view.h (basic_string_view::to_string): Remove. + (gdb::to_string): New function. + +Upstream: https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=5ac588997c3c2d032d5d5145d9245eb37354c23b +Bug report: https://sourceware.org/bugzilla/show_bug.cgi?id=26183 + +Signed-off-by: Bernd Kuhls +--- + gdb/ChangeLog | 6 ++++++ + gdb/ada-lang.c | 8 ++++---- + gdbsupport/ChangeLog | 6 ++++++ + gdbsupport/gdb_string_view.h | 17 ++++++++++------- + 4 files changed, 26 insertions(+), 11 deletions(-) + +diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c +index 9b0c2efbfe2..98508c168bc 100644 +--- a/gdb/ada-lang.c ++++ b/gdb/ada-lang.c +@@ -13553,10 +13553,10 @@ ada_lookup_name_info::ada_lookup_name_info (const lookup_name_info &lookup_name) + { + if (user_name.back () == '>') + m_encoded_name +- = user_name.substr (1, user_name.size () - 2).to_string (); ++ = gdb::to_string (user_name.substr (1, user_name.size () - 2)); + else + m_encoded_name +- = user_name.substr (1, user_name.size () - 1).to_string (); ++ = gdb::to_string (user_name.substr (1, user_name.size () - 1)); + m_encoded_p = true; + m_verbatim_p = true; + m_wild_match_p = false; +@@ -13575,10 +13575,10 @@ ada_lookup_name_info::ada_lookup_name_info (const lookup_name_info &lookup_name) + if (encoded != NULL) + m_encoded_name = encoded; + else +- m_encoded_name = user_name.to_string (); ++ m_encoded_name = gdb::to_string (user_name); + } + else +- m_encoded_name = user_name.to_string (); ++ m_encoded_name = gdb::to_string (user_name); + + /* Handle the 'package Standard' special case. See description + of m_standard_p. */ +diff --git a/gdbsupport/gdb_string_view.h b/gdbsupport/gdb_string_view.h +index c0ae7a8a2d9..65124e67e54 100644 +--- a/gdbsupport/gdb_string_view.h ++++ b/gdbsupport/gdb_string_view.h +@@ -245,13 +245,6 @@ namespace gdb { + return { this->_M_str, this->_M_len }; + } + +- template> +- std::basic_string<_CharT, _Traits, _Allocator> +- to_string(const _Allocator& __alloc = _Allocator()) const +- { +- return { this->_M_str, this->_M_len, __alloc }; +- } +- + size_type + copy(_CharT* __str, size_type __n, size_type __pos = 0) const + { +@@ -560,4 +553,14 @@ namespace gdb { + + #endif // __cplusplus < 201703L + ++namespace gdb { ++ ++static inline std::string ++to_string(const gdb::string_view &view) ++{ ++ return { view.data (), view.size () }; ++} ++ ++} ++ + #endif /* COMMON_GDB_STRING_VIEW_H */ +-- +2.39.3 + diff --git a/package/gdb/gdb.hash b/package/gdb/gdb.hash index e7933374f12..36e2685a25d 100644 --- a/package/gdb/gdb.hash +++ b/package/gdb/gdb.hash @@ -1,10 +1,7 @@ -# From ftp://gcc.gnu.org/pub/gdb/releases/sha512.sum -sha512 73635f00f343117aa5e2436f1e1597099e2bfb31ef7bb162b273fa1ea282c3fa9b0f52762e70bfc7ad0334addb8d159e9ac7cbe5998ca4f755ea8cf90714d274 gdb-9.2.tar.xz +# From https://gcc.gnu.org/pub/gdb/releases/sha512.sum sha512 3653762ac008e065c37cd641653184c9ff7ce51ee2222ade1122bec9d6cc64dffd4fb74888ef11ac1942064a08910e96b7865112ad37f4602eb0a16bed074caa gdb-10.2.tar.xz sha512 07e9026423438049b11f4f784d57401ece4e940570f613bd6958b3714fe7fbc2c048470bcce3e7d7d9f93331cdf3881d30dcc964cb113a071143a02b28e5b127 gdb-11.2.tar.xz +sha512 425568d2e84672177d0fb87b1ad7daafdde097648d605e30cf0656970f66adc6a82ca2d83375ea4be583e9683a340e5bfdf5819668ddf66728200141ae50ff2d gdb-12.1.tar.xz # Locally calculated (fetched from Github) sha512 5a2acf2fd33ab2ff589e1037ca40abda54328997dcff26b2b49b874bd3be980be5a63342962254f3c3bda98e32ce7a33af704d37353352833dee193135600458 gdb-arc-2020.09-release-gdb.tar.gz - -# Locally calculated (fetched from https://github.com/c-sky/binutils-gdb) -sha512 c421e1f3c0d6cfb3c04544573c0c4b0075c8d8e3d563c6c234fcc1e4c2167ab203d1e57aec3b58abd348dc46f8cf9b47b753d3a43dba3ea970c9c9a6bd78c07b gdb-4ecb98fbc2f94dbe01b69384afbc515107de73df.tar.gz diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk index 9bde2beea13..7de8a09048f 100644 --- a/package/gdb/gdb.mk +++ b/package/gdb/gdb.mk @@ -14,40 +14,25 @@ GDB_SOURCE = gdb-$(GDB_VERSION).tar.gz GDB_FROM_GIT = y endif -ifeq ($(BR2_csky),y) -GDB_SITE = $(call github,c-sky,binutils-gdb,$(GDB_VERSION)) -GDB_SOURCE = gdb-$(GDB_VERSION).tar.gz -GDB_FROM_GIT = y -endif - GDB_LICENSE = GPL-2.0+, LGPL-2.0+, GPL-3.0+, LGPL-3.0+ GDB_LICENSE_FILES = COPYING COPYING.LIB COPYING3 COPYING3.LIB GDB_CPE_ID_VENDOR = gnu -# On gdb < 10, if you want to build only gdbserver, you need to -# configure only gdb/gdbserver. -ifeq ($(BR2_PACKAGE_GDB_DEBUGGER)$(BR2_PACKAGE_GDB_TOPLEVEL),) -GDB_SUBDIR = gdb/gdbserver - -# When we want to build the full gdb, or for very recent versions of -# gdb with gdbserver at the top-level, out of tree build is mandatory, -# so we create a 'build' subdirectory in the gdb sources, and build -# from there. -else +# Out of tree build is mandatory, so we create a 'build' subdirectory +# in the gdb sources, and build from there. GDB_SUBDIR = build define GDB_CONFIGURE_SYMLINK mkdir -p $(@D)/$(GDB_SUBDIR) ln -sf ../configure $(@D)/$(GDB_SUBDIR)/configure endef GDB_PRE_CONFIGURE_HOOKS += GDB_CONFIGURE_SYMLINK -endif # 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_GDB_DEPENDENCIES = host-expat host-libiberty host-ncurses host-zlib # Disable building documentation GDB_MAKE_OPTS += MAKEINFO=true @@ -71,9 +56,9 @@ GDB_DEPENDENCIES += host-flex host-bison HOST_GDB_DEPENDENCIES += host-flex host-bison endif -# When BR2_GDB_VERSION_11=y, we're going to build gdb 11.x for the -# host (if enabled), so we add the necessary gmp dependency. -ifeq ($(BR2_GDB_VERSION_11),y) +# All newer versions of GDB need host-gmp, so it's only for older +# versions that the dependency can be avoided. +ifeq ($(BR2_GDB_VERSION_10)$(BR2_arc),) HOST_GDB_DEPENDENCIES += host-gmp endif @@ -147,25 +132,33 @@ GDB_CONF_OPTS = \ --without-included-gettext \ --disable-werror \ --enable-static \ - --without-mpfr + --without-mpfr \ + --disable-source-highlight ifeq ($(BR2_PACKAGE_GDB_DEBUGGER),y) +GDB_DEPENDENCIES += zlib GDB_CONF_OPTS += \ --enable-gdb \ - --with-curses + --with-curses \ + --with-system-zlib GDB_DEPENDENCIES += ncurses \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) else +# When only building gdbserver, we don't need zlib. But we have no way to +# tell the top-level configure that we don't need zlib: it either wants to +# build the bundled one, or use the system one. +# Since we're going to only install the gdbserver to the target, we don't +# care that the bundled zlib is built, as it is not used. GDB_CONF_OPTS += \ --disable-gdb \ - --without-curses + --without-curses \ + --without-system-zlib endif -# When BR2_GDB_VERSION_11=y (because it's enabled for the host) and -# we're building the full gdb for the target, we need gmp as a -# dependency. For now the default gdb version in Buildroot doesn't -# require gmp. -ifeq ($(BR2_GDB_VERSION_11)$(BR2_PACKAGE_GDB_DEBUGGER),yy) +# Starting from GDB 11.x, gmp is needed as a dependency to build full +# gdb. So we avoid the dependency only for GDB 10.x and the special +# version used on ARC. +ifeq ($(BR2_GDB_VERSION_10)$(BR2_arc):$(BR2_PACKAGE_GDB_DEBUGGER),:y) GDB_CONF_OPTS += \ --with-libgmp-prefix=$(STAGING_DIR)/usr GDB_DEPENDENCIES += gmp @@ -228,13 +221,6 @@ else GDB_CONF_OPTS += --without-lzma endif -ifeq ($(BR2_PACKAGE_ZLIB),y) -GDB_CONF_OPTS += --with-zlib -GDB_DEPENDENCIES += zlib -else -GDB_CONF_OPTS += --without-zlib -endif - ifeq ($(BR2_PACKAGE_GDB_PYTHON),) # This removes some unneeded Python scripts and XML target description # files that are not useful for a normal usage of the debugger. @@ -272,8 +258,10 @@ HOST_GDB_CONF_OPTS = \ --enable-threads \ --disable-werror \ --without-included-gettext \ + --with-system-zlib \ --with-curses \ --without-mpfr \ + --disable-source-highlight \ $(GDB_DISABLE_BINUTILS_CONF_OPTS) ifeq ($(BR2_PACKAGE_HOST_GDB_TUI),y) diff --git a/package/gdbm/gdbm.hash b/package/gdbm/gdbm.hash index 59f9ea62de9..7449d5dc9da 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 0bbd38f12656e4728e2f7c4708aec014 gdbm-1.22.tar.gz -sha1 c45cc0178cbf41828369b07749d41778741703bd gdbm-1.22.tar.gz +md5 8551961e36bf8c70b7500d255d3658ec gdbm-1.23.tar.gz +sha1 50ba1b1d45ce33fd44e4fdaaf3b55a9d8f3dc418 gdbm-1.23.tar.gz # Locally computed -sha256 f366c823a6724af313b6bbe975b2809f9a157e5f6a43612a72949138d161d762 gdbm-1.22.tar.gz +sha256 74b1081d21fff13ae4bd7c16e5d6e504a4c26f7cde1dca0d963a484174bbcacd gdbm-1.23.tar.gz sha256 690d762f2e8e149ab1e2d6a409a3853b6151a2533b2382fae549a176d6bedecf COPYING diff --git a/package/gdbm/gdbm.mk b/package/gdbm/gdbm.mk index 52624f58079..e807a8e1e79 100644 --- a/package/gdbm/gdbm.mk +++ b/package/gdbm/gdbm.mk @@ -4,7 +4,7 @@ # ################################################################################ -GDBM_VERSION = 1.22 +GDBM_VERSION = 1.23 GDBM_SITE = $(BR2_GNU_MIRROR)/gdbm GDBM_LICENSE = GPL-3.0+ GDBM_LICENSE_FILES = COPYING diff --git a/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.hash b/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.hash index e7f74e2b4b5..7298ef50c49 100644 --- a/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.hash +++ b/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.hash @@ -1,4 +1,4 @@ -# From https://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf-xlib/2.40/gdk-pixbuf-xlib-2.40.2.sha256sum +# From https://download.gnome.org/sources/gdk-pixbuf-xlib/2.40/gdk-pixbuf-xlib-2.40.2.sha256sum sha256 8b8e1c270ec16a06f665ea841f8e4e167eaa0118d0cbfeeade43745f09198ff7 gdk-pixbuf-xlib-2.40.2.tar.xz # Hash for license file diff --git a/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.mk b/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.mk index 3e61373b3a8..5af33c6aea7 100644 --- a/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.mk +++ b/package/gdk-pixbuf-xlib/gdk-pixbuf-xlib.mk @@ -7,7 +7,7 @@ GDK_PIXBUF_XLIB_VERSION_MAJOR = 2.40 GDK_PIXBUF_XLIB_VERSION = $(GDK_PIXBUF_XLIB_VERSION_MAJOR).2 GDK_PIXBUF_XLIB_SOURCE = gdk-pixbuf-xlib-$(GDK_PIXBUF_XLIB_VERSION).tar.xz -GDK_PIXBUF_XLIB_SITE = http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf-xlib/$(GDK_PIXBUF_XLIB_VERSION_MAJOR) +GDK_PIXBUF_XLIB_SITE = https://download.gnome.org/sources/gdk-pixbuf-xlib/$(GDK_PIXBUF_XLIB_VERSION_MAJOR) GDK_PIXBUF_XLIB_LICENSE = LGPL-2.1+ GDK_PIXBUF_XLIB_LICENSE_FILES = COPYING GDK_PIXBUF_XLIB_INSTALL_STAGING = YES diff --git a/package/gdk-pixbuf/gdk-pixbuf.hash b/package/gdk-pixbuf/gdk-pixbuf.hash index 5e7dc7e03bf..c3953e15a61 100644 --- a/package/gdk-pixbuf/gdk-pixbuf.hash +++ b/package/gdk-pixbuf/gdk-pixbuf.hash @@ -1,3 +1,3 @@ -# From https://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.4.sha256sum -sha256 fe9c5dd88f486194ea2bc09b8814c1ed895bb6c530f37cbbf259757c4e482e4d gdk-pixbuf-2.42.4.tar.xz +# From https://download.gnome.org/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.10.sha256sum +sha256 ee9b6c75d13ba096907a2e3c6b27b61bcd17f5c7ebeab5a5b439d2f2e39fe44b gdk-pixbuf-2.42.10.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk index b22e9568c9f..e041d2cbde3 100644 --- a/package/gdk-pixbuf/gdk-pixbuf.mk +++ b/package/gdk-pixbuf/gdk-pixbuf.mk @@ -5,9 +5,9 @@ ################################################################################ GDK_PIXBUF_VERSION_MAJOR = 2.42 -GDK_PIXBUF_VERSION = $(GDK_PIXBUF_VERSION_MAJOR).4 +GDK_PIXBUF_VERSION = $(GDK_PIXBUF_VERSION_MAJOR).10 GDK_PIXBUF_SOURCE = gdk-pixbuf-$(GDK_PIXBUF_VERSION).tar.xz -GDK_PIXBUF_SITE = http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/$(GDK_PIXBUF_VERSION_MAJOR) +GDK_PIXBUF_SITE = https://download.gnome.org/sources/gdk-pixbuf/$(GDK_PIXBUF_VERSION_MAJOR) GDK_PIXBUF_LICENSE = LGPL-2.1+ GDK_PIXBUF_LICENSE_FILES = COPYING GDK_PIXBUF_CPE_ID_VENDOR = gnome @@ -19,11 +19,13 @@ HOST_GDK_PIXBUF_DEPENDENCIES = host-libpng host-pkgconf host-libglib2 GDK_PIXBUF_CONF_OPTS = \ -Dgio_sniffing=false \ + -Dtests=false \ -Dinstalled_tests=false \ -Dman=false HOST_GDK_PIXBUF_CONF_OPTS = \ -Dgio_sniffing=false \ + -Dtests=false \ -Dinstalled_tests=false \ -Dintrospection=disabled \ -Drelocatable=true \ @@ -41,43 +43,43 @@ GDK_PIXBUF_CONF_OPTS += -Dintrospection=disabled endif ifeq ($(BR2_PACKAGE_LIBPNG),y) -GDK_PIXBUF_CONF_OPTS += -Dpng=true +GDK_PIXBUF_CONF_OPTS += -Dpng=enabled GDK_PIXBUF_DEPENDENCIES += libpng else -GDK_PIXBUF_CONF_OPTS += -Dpng=false +GDK_PIXBUF_CONF_OPTS += -Dpng=disabled endif ifeq ($(BR2_PACKAGE_JPEG),y) -GDK_PIXBUF_CONF_OPTS += -Djpeg=true -HOST_GDK_PIXBUF_CONF_OPTS += -Djpeg=true +GDK_PIXBUF_CONF_OPTS += -Djpeg=enabled +HOST_GDK_PIXBUF_CONF_OPTS += -Djpeg=enabled GDK_PIXBUF_DEPENDENCIES += jpeg HOST_GDK_PIXBUF_DEPENDENCIES += host-libjpeg else -GDK_PIXBUF_CONF_OPTS += -Djpeg=false -HOST_GDK_PIXBUF_CONF_OPTS += -Djpeg=false +GDK_PIXBUF_CONF_OPTS += -Djpeg=disabled +HOST_GDK_PIXBUF_CONF_OPTS += -Djpeg=disabled endif ifeq ($(BR2_PACKAGE_TIFF),y) -GDK_PIXBUF_CONF_OPTS += -Dtiff=true -HOST_GDK_PIXBUF_CONF_OPTS += -Dtiff=true +GDK_PIXBUF_CONF_OPTS += -Dtiff=enabled +HOST_GDK_PIXBUF_CONF_OPTS += -Dtiff=enabled GDK_PIXBUF_DEPENDENCIES += tiff HOST_GDK_PIXBUF_DEPENDENCIES += host-tiff else -GDK_PIXBUF_CONF_OPTS += -Dtiff=false -HOST_GDK_PIXBUF_CONF_OPTS += -Dtiff=false +GDK_PIXBUF_CONF_OPTS += -Dtiff=disabled +HOST_GDK_PIXBUF_CONF_OPTS += -Dtiff=disabled endif # gdk-pixbuf requires the loaders.cache file populated to work properly # Rather than doing so at runtime, since the fs can be read-only, do so # here after building and installing to target. -# And since the cache file will contain absolute host directory names we -# need to sanitize (strip) them. +# And since the cache file will contain relative host directory names we +# need to prepend them with /usr/. ifeq ($(BR2_STATIC_LIBS),) define GDK_PIXBUF_UPDATE_CACHE GDK_PIXBUF_MODULEDIR=$(HOST_DIR)/lib/gdk-pixbuf-2.0/2.10.0/loaders \ $(HOST_DIR)/bin/gdk-pixbuf-query-loaders \ > $(TARGET_DIR)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache - $(SED) "s,$(HOST_DIR)/lib,/usr/lib,g" \ + $(SED) 's,^"lib,"/usr/lib,g' \ $(TARGET_DIR)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache endef GDK_PIXBUF_POST_INSTALL_TARGET_HOOKS += GDK_PIXBUF_UPDATE_CACHE diff --git a/package/gengetopt/gengetopt.hash b/package/gengetopt/gengetopt.hash index 35c214fce28..707efacd95b 100644 --- a/package/gengetopt/gengetopt.hash +++ b/package/gengetopt/gengetopt.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 b941aec9011864978dd7fdeb052b1943535824169d2aa2b0e7eae9ab807584ac gengetopt-2.23.tar.xz -sha256 afab96ff35204960631dc05506034f9efc01e6d696f0ac93718d6bd43512cda7 COPYING -sha256 72a43351233d6a581f891cdfff78b7b7d5f2a12522523929c5f7e8f674c2f6fc LICENSE +sha256 b941aec9011864978dd7fdeb052b1943535824169d2aa2b0e7eae9ab807584ac gengetopt-2.23.tar.xz +sha256 afab96ff35204960631dc05506034f9efc01e6d696f0ac93718d6bd43512cda7 COPYING +sha256 72a43351233d6a581f891cdfff78b7b7d5f2a12522523929c5f7e8f674c2f6fc LICENSE diff --git a/package/genimage/genimage.hash b/package/genimage/genimage.hash index 80065d53b15..7ea8f99fda0 100644 --- a/package/genimage/genimage.hash +++ b/package/genimage/genimage.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9bca24bf883310b30ee4511cbc3a580e40ad4540826e5ed3992c595ce72d003e genimage-15.tar.xz +sha256 869f9662d3b778c69b1d1fe70df658e1c9e90aeda26abb753f6fe55e8b0c6e73 genimage-16.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/genimage/genimage.mk b/package/genimage/genimage.mk index 44963b48fbd..d1671f335da 100644 --- a/package/genimage/genimage.mk +++ b/package/genimage/genimage.mk @@ -4,7 +4,7 @@ # ################################################################################ -GENIMAGE_VERSION = 15 +GENIMAGE_VERSION = 16 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/genpart/genpart.hash b/package/genpart/genpart.hash index b741dbda14d..e7e67793911 100644 --- a/package/genpart/genpart.hash +++ b/package/genpart/genpart.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 bfb39434f31d10f1b8c7b6bc6ec612309838c2819022561541c4d2d5a424e3f2 genpart-1.0.2.tar.bz2 +sha256 bfb39434f31d10f1b8c7b6bc6ec612309838c2819022561541c4d2d5a424e3f2 genpart-1.0.2.tar.bz2 diff --git a/package/gensio/0001-Fix-missing-EVP_PKEY_ED25519-build-error-on-libressl.patch b/package/gensio/0001-Fix-missing-EVP_PKEY_ED25519-build-error-on-libressl.patch new file mode 100644 index 00000000000..e9087aa3e54 --- /dev/null +++ b/package/gensio/0001-Fix-missing-EVP_PKEY_ED25519-build-error-on-libressl.patch @@ -0,0 +1,105 @@ +From 1e7071684329f23ee3447310d203d193c283979e Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Wed, 5 Oct 2022 15:30:32 -0600 +Subject: [PATCH] Fix missing EVP_PKEY_ED25519 build error on libressl +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes: +gensio_filter_certauth.c: In function ‘v3_certauth_add_challenge_rsp’: +gensio_filter_certauth.c:838:44: error: ‘EVP_PKEY_ED25519’ undeclared (first use in this function); did you mean ‘EVP_PKEY_DSA1’? + 838 | if (EVP_PKEY_base_id(sfilter->pkey) == EVP_PKEY_ED25519) { + | ^~~~~~~~~~~~~~~~ + | EVP_PKEY_DSA1 +gensio_filter_certauth.c:838:44: note: each undeclared identifier is reported only once for each function it appears in +gensio_filter_certauth.c: In function ‘certauth_add_challenge_rsp’: +gensio_filter_certauth.c:901:44: error: ‘EVP_PKEY_ED25519’ undeclared (first use in this function); did you mean ‘EVP_PKEY_DSA1’? + 901 | if (EVP_PKEY_base_id(sfilter->pkey) == EVP_PKEY_ED25519) + | ^~~~~~~~~~~~~~~~ + | EVP_PKEY_DSA1 +gensio_filter_certauth.c: In function ‘certauth_check_challenge’: +gensio_filter_certauth.c:1048:35: error: ‘EVP_PKEY_ED25519’ undeclared (first use in this function); did you mean ‘EVP_PKEY_DSA1’? + 1048 | if (EVP_PKEY_base_id(pkey) == EVP_PKEY_ED25519) + | ^~~~~~~~~~~~~~~~ + | EVP_PKEY_DSA1 + +Signed-off-by: Corey Minyard +[Retrieved from: +https://github.com/cminyard/gensio/commit/1e7071684329f23ee3447310d203d193c283979e] +Signed-off-by: Fabrice Fontaine +--- + lib/gensio_filter_certauth.c | 6 ++++++ + tools/gtlssh-keygen.c | 11 ++++++++++- + 2 files changed, 16 insertions(+), 1 deletion(-) + +diff --git a/lib/gensio_filter_certauth.c b/lib/gensio_filter_certauth.c +index 642379b6..c4552e79 100644 +--- a/lib/gensio_filter_certauth.c ++++ b/lib/gensio_filter_certauth.c +@@ -835,11 +835,13 @@ v3_certauth_add_challenge_rsp(struct certauth_filter *sfilter) + unsigned int lenpos, len; + int rv = 0; + ++#ifdef EVP_PKEY_ED25519 + if (EVP_PKEY_base_id(sfilter->pkey) == EVP_PKEY_ED25519) { + gca_log_err(sfilter, + "Remote end or SSL too old to support ed25519 key"); + return GE_KEYINVALID; + } ++#endif + + certauth_write_byte(sfilter, CERTAUTH_CHALLENGE_RSP); + lenpos = sfilter->write_buf_len; +@@ -898,8 +900,10 @@ certauth_add_challenge_rsp(struct certauth_filter *sfilter) + if (sfilter->version < 4 || sfilter->my_version < 4) + return v3_certauth_add_challenge_rsp(sfilter); + ++#ifdef EVP_PKEY_ED25519 + if (EVP_PKEY_base_id(sfilter->pkey) == EVP_PKEY_ED25519) + digest = NULL; ++#endif + + certauth_write_byte(sfilter, CERTAUTH_CHALLENGE_RSP); + lenpos = sfilter->write_buf_len; +@@ -1045,8 +1049,10 @@ certauth_check_challenge(struct certauth_filter *sfilter) + goto out_nomem; + } + ++#ifdef EVP_PKEY_ED25519 + if (EVP_PKEY_base_id(pkey) == EVP_PKEY_ED25519) + digest = NULL; ++#endif + + if (!EVP_DigestVerifyInit(sign_ctx, NULL, digest, NULL, pkey)) { + gca_logs_err(sfilter, "Digest verify init failed"); +diff --git a/tools/gtlssh-keygen.c b/tools/gtlssh-keygen.c +index c8c28937..0779dd78 100644 +--- a/tools/gtlssh-keygen.c ++++ b/tools/gtlssh-keygen.c +@@ -108,7 +108,12 @@ help(const char *progname) + P(" The default is your username for normal certificates and\n"); + P(" the fully qualified domain name for server certificates.\n"); + P(" --algorithm - Set the algorithm to use for the key,\n"); +- P(" either ed25519, rsa or ec. The default is ed25519.\n"); ++ P(" either ed25519, rsa or ec. "); ++#ifdef EVP_PKEY_ED25519 ++ P("The default is ed25519.\n"); ++#else ++ P("The default is ec.\n"); ++#endif + P(" --force, -f - Don't ask questions, just do the operation. This\n"); + P(" may overwrite data without asking.\n"); + P(" --version - Print the version number and exit.\n"); +@@ -831,7 +836,11 @@ genpkey_ed25519(const char *key) + return rc != 0; + } + ++#ifdef EVP_PKEY_ED25519 + static int (*genpkey)(const char *key) = genpkey_ed25519; ++#else ++static int (*genpkey)(const char *key) = genpkey_ec; ++#endif + + /* + * Create a single key. If name is NULL, it's a server key, otherwise diff --git a/package/gensio/Config.in b/package/gensio/Config.in index f874d1a469f..fd0e4769707 100644 --- a/package/gensio/Config.in +++ b/package/gensio/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_GENSIO bool "gensio" depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_HAS_ATOMIC help A library to abstract stream I/O like serial port, TCP, telnet, UDP, SSL, IPMI SOL, etc. diff --git a/package/gensio/gensio.hash b/package/gensio/gensio.hash index 930a2fff819..84af3fdab11 100644 --- a/package/gensio/gensio.hash +++ b/package/gensio/gensio.hash @@ -1,7 +1,7 @@ # From https://sourceforge.net/projects/ser2net/files/ser2net/ -md5 45cd3a4d9058816e50351b0700a035ad gensio-2.2.9.tar.gz -sha1 4bb34517931f5be4dc5982f6e7a567cf6fdc41b8 gensio-2.2.9.tar.gz +md5 c8d65e1809ed5cd1138fa309e3ab0e94 gensio-2.5.5.tar.gz +sha1 076fc8324dedb658972a88c738131a409968e2ba gensio-2.5.5.tar.gz # Locally computed: -sha256 3609f66e61c98cce181ec1b37508b727b636d7cfffdb6edd4c254d2f6097a000 gensio-2.2.9.tar.gz +sha256 63c5fff536efd080fb7bc7fa084331c19fc64abd42b7f2bec86bd77b4fd10840 gensio-2.5.5.tar.gz sha256 501f3108e6c03e5a0a5585ebaaa369171aead5319cd0a7a4dc1f66211c1f09f1 COPYING sha256 dcac7d447dd81ab96d28dce00a07a6486e623f7ded94e2a2a8e83312405cdf89 COPYING.LIB diff --git a/package/gensio/gensio.mk b/package/gensio/gensio.mk index 266ac137a25..2ba1b950d74 100644 --- a/package/gensio/gensio.mk +++ b/package/gensio/gensio.mk @@ -4,17 +4,49 @@ # ################################################################################ -GENSIO_VERSION = 2.2.9 +GENSIO_VERSION = 2.5.5 GENSIO_SITE = http://downloads.sourceforge.net/project/ser2net/ser2net GENSIO_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) GENSIO_LICENSE_FILES = COPYING.LIB COPYING GENSIO_INSTALL_STAGING = YES -GENSIO_DEPENDENCIES = $(if $(BR2_PACKAGE_AVAHI_LIBAVAHI_CLIENT),avahi) GENSIO_CONF_OPTS = \ - --without-openipmi \ --without-swig \ --without-python +ifeq ($(BR2_INSTALL_LIBSTDCPP),y) +GENSIO_CONF_OPTS += --with-cplusplus +else +GENSIO_CONF_OPTS += --without-cplusplus +endif + +ifeq ($(BR2_PACKAGE_ALSA_LIB_PCM),y) +GENSIO_DEPENDENCIES += alsa-lib +GENSIO_CONF_OPTS += --with-alsa +else +GENSIO_CONF_OPTS += --without-alsa +endif + +ifeq ($(BR2_PACKAGE_AVAHI_LIBAVAHI_CLIENT),y) +GENSIO_DEPENDENCIES += avahi +GENSIO_CONF_OPTS += --with-mdns +else +GENSIO_CONF_OPTS += --without-mdns +endif + +ifeq ($(BR2_PACKAGE_LIBGLIB2),y) +GENSIO_DEPENDENCIES += host-pkgconf libglib2 +GENSIO_CONF_OPTS += --with-glib +else +GENSIO_CONF_OPTS += --without-glib +endif + +ifeq ($(BR2_PACKAGE_OPENIPMI),y) +GENSIO_DEPENDENCIES += openipmi +GENSIO_CONF_OPTS += --with-openipmi +else +GENSIO_CONF_OPTS += --without-openipmi +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) GENSIO_DEPENDENCIES += host-pkgconf openssl GENSIO_CONF_OPTS += --with-openssl diff --git a/package/geoip/geoip.hash b/package/geoip/geoip.hash index c2ddf390e6d..9d0a02d3b12 100644 --- a/package/geoip/geoip.hash +++ b/package/geoip/geoip.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1dfb748003c5e4b7fd56ba8c4cd786633d5d6f409547584f6910398389636f80 GeoIP-1.6.12.tar.gz -sha256 36b6d3fa47916943fd5fec313c584784946047ec1337a78b440e5992cb595f89 COPYING +sha256 1dfb748003c5e4b7fd56ba8c4cd786633d5d6f409547584f6910398389636f80 GeoIP-1.6.12.tar.gz +sha256 36b6d3fa47916943fd5fec313c584784946047ec1337a78b440e5992cb595f89 COPYING diff --git a/package/gerbera/0001-Fix-build-with-fmt-9-0.patch b/package/gerbera/0001-Fix-build-with-fmt-9-0.patch new file mode 100644 index 00000000000..63ae8382a36 --- /dev/null +++ b/package/gerbera/0001-Fix-build-with-fmt-9-0.patch @@ -0,0 +1,36 @@ +From d7b8fafbc94405c20753fed569abd8878cccde89 Mon Sep 17 00:00:00 2001 +From: Felix Yan +Date: Fri, 19 Aug 2022 15:22:10 +0300 +Subject: [PATCH] Fix build with fmt 9.0 + +Fixes #2681 + +[Retrieved from: +https://github.com/gerbera/gerbera/commit/d7b8fafbc94405c20753fed569abd8878cccde89] +Signed-off-by: Fabrice Fontaine +--- + src/database/sql_format.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/database/sql_format.h b/src/database/sql_format.h +index 32dc00efa..e4e1909a8 100644 +--- a/src/database/sql_format.h ++++ b/src/database/sql_format.h +@@ -42,7 +42,7 @@ struct SQLIdentifier { + template <> + struct fmt::formatter : formatter { + template +- auto format(const SQLIdentifier& tn, FormatContext& ctx) -> decltype(ctx.out()) ++ auto format(const SQLIdentifier& tn, FormatContext& ctx) const -> decltype(ctx.out()) + { + return format_to(ctx.out(), "{}{}{}", tn.quote_begin, tn.name, tn.quote_end); + } +@@ -61,7 +61,7 @@ struct ColumnUpdate { + template <> + struct fmt::formatter : formatter { + template +- auto format(const ColumnUpdate& a, FormatContext& ctx) -> decltype(ctx.out()) ++ auto format(const ColumnUpdate& a, FormatContext& ctx) const -> decltype(ctx.out()) + { + return format_to(ctx.out(), "{} = {}", a.column, a.value); + } diff --git a/package/gerbera/0001-Fix-for-fmt-8-0.patch b/package/gerbera/0001-Fix-for-fmt-8-0.patch deleted file mode 100644 index c4419209a5f..00000000000 --- a/package/gerbera/0001-Fix-for-fmt-8-0.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 82d84ac5e62c23e717198fc7b2ef190ff95e70d1 Mon Sep 17 00:00:00 2001 -From: kyak -Date: Wed, 12 Jan 2022 19:41:37 +0300 -Subject: [PATCH] Fix for fmt > 8.0 - -[Retrieved from: -https://github.com/gerbera/gerbera/commit/82d84ac5e62c23e717198fc7b2ef190ff95e70d1] -Signed-off-by: Fabrice Fontaine ---- - src/util/logger.h | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) - -diff --git a/src/util/logger.h b/src/util/logger.h -index 58696e52f..ba64afa79 100644 ---- a/src/util/logger.h -+++ b/src/util/logger.h -@@ -32,7 +32,9 @@ - #ifndef __LOGGER_H__ - #define __LOGGER_H__ - -+#include - #include -+#include - - #define log_debug SPDLOG_DEBUG - #define log_info SPDLOG_INFO -@@ -40,4 +42,17 @@ - #define log_error SPDLOG_ERROR - #define log_js SPDLOG_INFO - -+#if FMT_VERSION >= 80100 -+template -+struct fmt::formatter, char>> -+ : formatter> { -+ template -+ auto format(const T& value, FormatContext& ctx) -> decltype(ctx.out()) -+ { -+ return fmt::formatter>::format( -+ static_cast>(value), ctx); -+ } -+}; -+#endif -+ - #endif // __LOGGER_H__ diff --git a/package/gerbera/config.xml b/package/gerbera/config.xml index 30d70e21f7e..e6261f25d09 100644 --- a/package/gerbera/config.xml +++ b/package/gerbera/config.xml @@ -1,7 +1,7 @@ @@ -11,7 +11,7 @@ Gerbera - uuid:ac20d9b6-5c82-48e6-80de-436965fbe1d7 + uuid:7b156a2a-d79e-4763-983b-ae1d13fe0ff4 /var/lib/gerbera /usr/share/gerbera/web - 1800 + 180 gerbera.db + + + upnp:class derivedfrom "object.item" and last_updated > "@last7" + + + upnp:class derivedfrom "object.item" and last_modified > "@last7" + + * @@ -45,12 +53,15 @@ - - - + + + + + + @@ -98,14 +109,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - @@ -133,3 +172,4 @@ + diff --git a/package/gerbera/gerbera.hash b/package/gerbera/gerbera.hash index 5dcd364c338..89ac9ad55ab 100644 --- a/package/gerbera/gerbera.hash +++ b/package/gerbera/gerbera.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 dee562cc5d22e8442e2fe1620b073bda612c80f9c4a8333311c647db06c1c4cd gerbera-1.9.2.tar.gz +sha256 bd6c7b2c6380e2e265a998bbc0df9eec14b9c6a65bc91e7f2c0ae0b67fd0c9cf gerbera-1.10.0.tar.gz sha256 cae4138373be41fd2be75faf41ce7efbcf49fb17d0e05ad1c51cc01ac335b9b6 LICENSE.md diff --git a/package/gerbera/gerbera.mk b/package/gerbera/gerbera.mk index ab49f661ac6..6acdfb86ac7 100644 --- a/package/gerbera/gerbera.mk +++ b/package/gerbera/gerbera.mk @@ -4,7 +4,7 @@ # ################################################################################ -GERBERA_VERSION = 1.9.2 +GERBERA_VERSION = 1.10.0 GERBERA_SITE = $(call github,gerbera,gerbera,v$(GERBERA_VERSION)) GERBERA_LICENSE = GPL-2.0 GERBERA_LICENSE_FILES = LICENSE.md diff --git a/package/gesftpserver/0001-Change-order-of-v3-attributes-according-to-draft-iet.patch b/package/gesftpserver/0001-Change-order-of-v3-attributes-according-to-draft-iet.patch deleted file mode 100644 index 3697d0e5257..00000000000 --- a/package/gesftpserver/0001-Change-order-of-v3-attributes-according-to-draft-iet.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 4b5c7eb63894bd2b1fedeb2a8e9bd16bf3c8c555 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bernd=20Holzm=C3=BCller?= - -Date: Mon, 11 Feb 2019 23:57:01 +0100 -Subject: [PATCH] Change order of v3-attributes according to - draft-ietf-secsh-filexfer-00/02 - -[yann.morin.1998@free.fr: backport from upstream] -Signed-off-by: "Yann E. MORIN" ---- - v3.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/v3.c b/v3.c -index 57cc31e..1fd86ad 100644 ---- a/v3.c -+++ b/v3.c -@@ -121,8 +121,8 @@ static void v3_sendattrs(struct sftpjob *job, const struct sftpattr *attrs) { - fatal("sending out-of-range mtime"); - if(a != attrs->atime.seconds) - fatal("sending out-of-range mtime"); -- sftp_send_uint32(job->worker, m); - sftp_send_uint32(job->worker, a); -+ sftp_send_uint32(job->worker, m); - } - /* Note that we just discard unknown bits rather than reporting errors. */ - } --- -2.14.1 - diff --git a/package/gesftpserver/gesftpserver.hash b/package/gesftpserver/gesftpserver.hash index 790cbe97c29..6d910a84ddb 100644 --- a/package/gesftpserver/gesftpserver.hash +++ b/package/gesftpserver/gesftpserver.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4963b85787de3485085a5356c671c58b8b33125f528ff1b2fe8b534ed8a0c1bd sftpserver-1.tar.gz +sha256 b18b10405ef2b05c45450aafd6803f69efb4d2138e4e07fd186c1618027ee169 sftpserver-2.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/gesftpserver/gesftpserver.mk b/package/gesftpserver/gesftpserver.mk index 20ad92d25a1..5a3ab0536c6 100644 --- a/package/gesftpserver/gesftpserver.mk +++ b/package/gesftpserver/gesftpserver.mk @@ -4,7 +4,7 @@ # ################################################################################ -GESFTPSERVER_VERSION = 1 +GESFTPSERVER_VERSION = 2 GESFTPSERVER_SOURCE = sftpserver-$(GESFTPSERVER_VERSION).tar.gz GESFTPSERVER_SITE = http://www.greenend.org.uk/rjk/sftpserver GESFTPSERVER_LICENSE = GPL-2.0+ @@ -16,7 +16,9 @@ GESFTPSERVER_CPE_ID_VENDOR = green_end GESFTPSERVER_CPE_ID_PRODUCT = sftpserver # forgets to link against pthread when cross compiling -GESFTPSERVER_CONF_ENV = LIBS=-lpthread +GESFTPSERVER_CONF_ENV = \ + CFLAGS="$(TARGET_CFLAGS) -std=c99" \ + LIBS=-lpthread # overwrite openssh version if enabled GESFTPSERVER_DEPENDENCIES += \ @@ -25,7 +27,7 @@ GESFTPSERVER_DEPENDENCIES += \ # Python on the host is only used for tests, which we don't use in # Buildroot -GESFTPSERVER_CONF_ENV += rjk_cv_python24=false +GESFTPSERVER_CONF_ENV += rjk_cv_python3=false # openssh/dropbear looks here define GESFTPSERVER_ADD_SYMLINK diff --git a/package/gettext-tiny/gettext-tiny.mk b/package/gettext-tiny/gettext-tiny.mk index c297cb1fe5b..e2dc5636675 100644 --- a/package/gettext-tiny/gettext-tiny.mk +++ b/package/gettext-tiny/gettext-tiny.mk @@ -95,7 +95,7 @@ define HOST_GETTEXT_TINY_INSTALL_CMDS $(Q)touch $(HOST_DIR)/share/gettext-tiny/ABOUT-NLS # for gettextize - ln -sf $(HOST_DIR)/usr/share/gettext-tiny $(HOST_DIR)/usr/share/gettext + ln -sf $(HOST_DIR)/share/gettext-tiny $(HOST_DIR)/share/gettext endef # Install simple echo wrapper for gettext tool diff --git a/package/gflags/gflags.hash b/package/gflags/gflags.hash index 1f7fe603320..06aeb85defb 100644 --- a/package/gflags/gflags.hash +++ b/package/gflags/gflags.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 34af2f15cf7367513b352bdcd2493ab14ce43692d2dcd9dfc499492966c64dcf gflags-2.2.2.tar.gz +sha256 34af2f15cf7367513b352bdcd2493ab14ce43692d2dcd9dfc499492966c64dcf gflags-2.2.2.tar.gz # Hash for license file: -sha256 90d1f3701813c3cd65eee2dc736746fe46b465918f3f7d6d31463a2018b33fa5 COPYING.txt +sha256 90d1f3701813c3cd65eee2dc736746fe46b465918f3f7d6d31463a2018b33fa5 COPYING.txt diff --git a/package/ghostscript-fonts/ghostscript-fonts.hash b/package/ghostscript-fonts/ghostscript-fonts.hash index d6df0e745ae..d1563562fea 100644 --- a/package/ghostscript-fonts/ghostscript-fonts.hash +++ b/package/ghostscript-fonts/ghostscript-fonts.hash @@ -1,5 +1,5 @@ # From http://sourceforge.net/projects/gs-fonts/files/gs-fonts/8.11%20%28base%2035%2C%20GPL%29/ -sha1 2a7198e8178b2e7dba87cb5794da515200b568f5 ghostscript-fonts-std-8.11.tar.gz +sha1 2a7198e8178b2e7dba87cb5794da515200b568f5 ghostscript-fonts-std-8.11.tar.gz # Locally computed -sha256 0eb6f356119f2e49b2563210852e17f57f9dcc5755f350a69a46a0d641a0c401 ghostscript-fonts-std-8.11.tar.gz -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING +sha256 0eb6f356119f2e49b2563210852e17f57f9dcc5755f350a69a46a0d641a0c401 ghostscript-fonts-std-8.11.tar.gz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/ghostscript/0001-Bug-704405-Fix-typo-in-non-forked-lcms2-code.patch b/package/ghostscript/0001-Bug-704405-Fix-typo-in-non-forked-lcms2-code.patch deleted file mode 100644 index bb1227f687d..00000000000 --- a/package/ghostscript/0001-Bug-704405-Fix-typo-in-non-forked-lcms2-code.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 830afae5454dea3bff903869d82022306890a96c Mon Sep 17 00:00:00 2001 -From: Robin Watts -Date: Fri, 1 Oct 2021 12:44:44 +0100 -Subject: [PATCH] Bug 704405: Fix typo in non-forked lcms2 code. - -[Retrieved from: -https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=830afae5454dea3bff903869d82022306890a96c] -Signed-off-by: Fabrice Fontaine ---- - base/gsicc_lcms2.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/base/gsicc_lcms2.c b/base/gsicc_lcms2.c -index ccf1d7051..9badb6dee 100644 ---- a/base/gsicc_lcms2.c -+++ b/base/gsicc_lcms2.c -@@ -462,7 +462,7 @@ int - gscms_transform_color(gx_device *dev, gsicc_link_t *icclink, void *inputcolor, - void *outputcolor, int num_bytes) - { -- return gscms_transformm_color_const(dev, icclink, inputcolor, outputcolor, num_bytes); -+ return gscms_transform_color_const(dev, icclink, inputcolor, outputcolor, num_bytes); - } - - int --- -2.25.1 - diff --git a/package/ghostscript/0001-Fix-build-without-BUILD_PDF.patch b/package/ghostscript/0001-Fix-build-without-BUILD_PDF.patch new file mode 100644 index 00000000000..af69cd36707 --- /dev/null +++ b/package/ghostscript/0001-Fix-build-without-BUILD_PDF.patch @@ -0,0 +1,34 @@ +From 088f3cd6e58cff5fa51e072d1829f7691a5f6681 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 20 Sep 2023 13:44:28 +0100 +Subject: [PATCH] Fix build without BUILD_PDF + +The PDFSetParams PostScript extension operator was missing a stub function definition +when the PDF interpreter is not built in. + + Author: Fabrice Fontaine +Upstream: https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=088f3cd6e58cff5fa51e072d1829f7691a5f6681 +Signed-off-by: Fabrice Fontaine +--- + psi/zpdfops.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/psi/zpdfops.c b/psi/zpdfops.c +index e7e0a42ee..271687a18 100644 +--- a/psi/zpdfops.c ++++ b/psi/zpdfops.c +@@ -1507,6 +1507,11 @@ static int zPDFdrawannots(i_ctx_t *i_ctx_p) + return_error(gs_error_undefined); + } + ++static int zPDFSetParams(i_ctx_t *i_ctx_p) ++{ ++ return_error(gs_error_undefined); ++} ++ + static int zPDFInit(i_ctx_t *i_ctx_p) + { + return_error(gs_error_undefined); +-- +2.34.1 + diff --git a/package/ghostscript/ghostscript.hash b/package/ghostscript/ghostscript.hash index 95305a5e060..77c8faccbe1 100644 --- a/package/ghostscript/ghostscript.hash +++ b/package/ghostscript/ghostscript.hash @@ -1,5 +1,5 @@ -# From https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9550/SHA512SUMS -sha512 3646b7981dced443559ba97c74c08463139e86a5479661e4dcd217c51e3f8e766da9cf4d7889a98ba3c079a17e9e5b452cc765b633e0720deab2337e77efdd09 ghostscript-9.55.0.tar.gz +# From https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs10020/SHA512SUMS +sha512 c49344151063e915add55a0a842c2a645d8362a5cbca663bd07638f4bd3699a08cade37a9efe905ad5a41e014353e5e1b1268b7925e43128ad30d5b031396b71 ghostscript-10.02.0.tar.xz # Hash for license file: sha256 8ce064f423b7c24a011b6ebf9431b8bf9861a5255e47c84bfb23fc526d030a8b LICENSE diff --git a/package/ghostscript/ghostscript.mk b/package/ghostscript/ghostscript.mk index 02cb35fcfc2..41d87fa7ee1 100644 --- a/package/ghostscript/ghostscript.mk +++ b/package/ghostscript/ghostscript.mk @@ -4,7 +4,8 @@ # ################################################################################ -GHOSTSCRIPT_VERSION = 9.55.0 +GHOSTSCRIPT_VERSION = 10.02.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 GHOSTSCRIPT_LICENSE_FILES = LICENSE diff --git a/package/giflib/giflib.hash b/package/giflib/giflib.hash index f7db1626df3..445e9c4b3de 100644 --- a/package/giflib/giflib.hash +++ b/package/giflib/giflib.hash @@ -1,5 +1,5 @@ # From http://sourceforge.net/projects/giflib/files -md5 6f03aee4ebe54ac2cc1ab3e4b0a049e5 giflib-5.2.1.tar.gz -sha1 c3f774dcbdf26afded7788979c8081d33c6426dc giflib-5.2.1.tar.gz +md5 6f03aee4ebe54ac2cc1ab3e4b0a049e5 giflib-5.2.1.tar.gz +sha1 c3f774dcbdf26afded7788979c8081d33c6426dc giflib-5.2.1.tar.gz # Locally computed -sha256 0c9b7990ecdca88b676db232c226548ac408b279f550d424d996f0d83591dd8e COPYING +sha256 0c9b7990ecdca88b676db232c226548ac408b279f550d424d996f0d83591dd8e COPYING diff --git a/package/git-crypt/0001-fix-build-with-libressl-3.5.0.patch b/package/git-crypt/0001-fix-build-with-libressl-3.5.0.patch new file mode 100644 index 00000000000..7daaf9c8fcb --- /dev/null +++ b/package/git-crypt/0001-fix-build-with-libressl-3.5.0.patch @@ -0,0 +1,56 @@ +From c21cde9010175e2355df17d4e81fedd6020603f8 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 14 May 2022 00:03:51 +0200 +Subject: [PATCH] fix build with libressl >= 3.5.0 + +Fix the following build failure with libressl >= 3.5.0: + +crypto-openssl-10.cpp:78:18: error: field 'ctx' has incomplete type 'HMAC_CTX' {aka 'hmac_ctx_st'} + 78 | HMAC_CTX ctx; + | ^~~ + +Fixes: + - http://autobuild.buildroot.org/results/98747d470c2ad59280934e160d24bd3fdad1503c + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/AGWA/git-crypt/pull/249] +--- + crypto-openssl-10.cpp | 4 +++- + crypto-openssl-11.cpp | 4 +++- + 2 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/crypto-openssl-10.cpp b/crypto-openssl-10.cpp +index f0f2c53..a7a5d52 100644 +--- a/crypto-openssl-10.cpp ++++ b/crypto-openssl-10.cpp +@@ -29,8 +29,10 @@ + */ + + #include ++#include + +-#if !defined(OPENSSL_API_COMPAT) ++#if !defined(OPENSSL_API_COMPAT) && \ ++ !(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x30500000L) + + #include "crypto.hpp" + #include "key.hpp" +diff --git a/crypto-openssl-11.cpp b/crypto-openssl-11.cpp +index adf03bb..32c2483 100644 +--- a/crypto-openssl-11.cpp ++++ b/crypto-openssl-11.cpp +@@ -29,8 +29,10 @@ + */ + + #include ++#include + +-#if defined(OPENSSL_API_COMPAT) ++#if defined(OPENSSL_API_COMPAT) || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x30500000L) + + #include "crypto.hpp" + #include "key.hpp" +-- +2.35.1 + diff --git a/package/git-crypt/git-crypt.hash b/package/git-crypt/git-crypt.hash index 973432d7d0e..5957a0273d6 100644 --- a/package/git-crypt/git-crypt.hash +++ b/package/git-crypt/git-crypt.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 6d30fcd99442d50f4b3c8d554067ff1d980cdf9f3120ee774131172dba98fd6f git-crypt-0.6.0.tar.gz +sha256 50f100816a636a682404703b6c23a459e4d30248b2886a5cf571b0d52527c7d8 git-crypt-0.7.0.tar.gz # Locally calculated -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING -sha256 506657e7a381165550e6c33e35b3b03bbef3e1feb68ba5529e264bd75ed2dc64 parse_options.hpp +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 506657e7a381165550e6c33e35b3b03bbef3e1feb68ba5529e264bd75ed2dc64 parse_options.hpp diff --git a/package/git-crypt/git-crypt.mk b/package/git-crypt/git-crypt.mk index 37e3d885a94..d562522485c 100644 --- a/package/git-crypt/git-crypt.mk +++ b/package/git-crypt/git-crypt.mk @@ -4,7 +4,7 @@ # ################################################################################ -GIT_CRYPT_VERSION = 0.6.0 +GIT_CRYPT_VERSION = 0.7.0 GIT_CRYPT_SITE = https://www.agwa.name/projects/git-crypt/downloads GIT_CRYPT_DEPENDENCIES = host-pkgconf openssl GIT_CRYPT_LICENSE = GPL-3.0+, MIT diff --git a/package/git/0001-Fix-build-without-threads.patch b/package/git/0001-Fix-build-without-threads.patch deleted file mode 100644 index 7ce85ffaf8d..00000000000 --- a/package/git/0001-Fix-build-without-threads.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 07d66af3b0800764087c4151d4f6562d4f8cce05 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 14 Dec 2020 23:00:33 +0100 -Subject: [PATCH] Fix build without threads - -Build without threads is broken since version 2.29.0 and -https://github.com/git/git/commit/15b52a44e0c92a0658e891194a5b0610d1f53afc: - -In file included from cache.h:4, - from blame.c:1: -git-compat-util.h:1238:20: error: static declaration of 'flockfile' follows non-static declaration - static inline void flockfile(FILE *fh) - ^~~~~~~~~ -In file included from git-compat-util.h:168, - from cache.h:4, - from blame.c:1: -/nvme/rc-buildroot-test/scripts/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/include/stdio.h:806:13: note: previous declaration of 'flockfile' was here - extern void flockfile (FILE *__stream) __THROW; - ^~~~~~~~~ -In file included from cache.h:4, - from blame.c:1: -git-compat-util.h:1242:20: error: static declaration of 'funlockfile' follows non-static declaration - static inline void funlockfile(FILE *fh) - ^~~~~~~~~~~ -In file included from git-compat-util.h:168, - from cache.h:4, - from blame.c:1: -/nvme/rc-buildroot-test/scripts/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/include/stdio.h:813:13: note: previous declaration of 'funlockfile' was here - extern void funlockfile (FILE *__stream) __THROW; - ^~~~~~~~~~~ - -To avoid this build failure, check if flockfile is available before -defining flockfile, funlockfile and getc_unlocked - -Fixes: - - http://autobuild.buildroot.org/results/d41638d1ad8e78dd6f654367c905996b838ee649 - -Signed-off-by: Fabrice Fontaine ---- - Makefile | 5 +++++ - configure.ac | 6 ++++++ - git-compat-util.h | 2 +- - 3 files changed, 12 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 6fb86c5862..58d0893a12 100644 ---- a/Makefile -+++ b/Makefile -@@ -232,6 +232,8 @@ all:: - # Define NO_STRUCT_ITIMERVAL if you don't have struct itimerval - # This also implies NO_SETITIMER - # -+# Define NO_FLOCKFILE if you don't have flockfile() -+# - # Define NO_FAST_WORKING_DIRECTORY if accessing objects in pack files is - # generally faster on your platform than accessing the working directory. - # -@@ -1638,6 +1640,9 @@ endif - ifdef NO_SETITIMER - COMPAT_CFLAGS += -DNO_SETITIMER - endif -+ifdef NO_FLOCKFILE -+ COMPAT_CFLAGS += -DNO_FLOCKFILE -+endif - ifdef NO_PREAD - COMPAT_CFLAGS += -DNO_PREAD - COMPAT_OBJS += compat/pread.o -diff --git a/configure.ac b/configure.ac -index 66aedb9288..d4295b5c69 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1132,6 +1132,12 @@ GIT_CHECK_FUNC(setitimer, - [NO_SETITIMER=YesPlease]) - GIT_CONF_SUBST([NO_SETITIMER]) - # -+# Define NO_FLOCKFILE if you don't have flockfile. -+GIT_CHECK_FUNC(flockfile, -+[NO_FLOCKFILE=], -+[NO_FLOCKFILE=YesPlease]) -+GIT_CONF_SUBST([NO_FLOCKFILE]) -+# - # Define NO_STRCASESTR if you don't have strcasestr. - GIT_CHECK_FUNC(strcasestr, - [NO_STRCASESTR=], -diff --git a/git-compat-util.h b/git-compat-util.h -index 7d509c5022..279cdd941e 100644 ---- a/git-compat-util.h -+++ b/git-compat-util.h -@@ -1236,7 +1236,7 @@ int warn_on_fopen_errors(const char *path); - # define SHELL_PATH "/bin/sh" - #endif - --#ifndef _POSIX_THREAD_SAFE_FUNCTIONS -+#if !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && defined(NO_FLOCKFILE) - static inline void flockfile(FILE *fh) - { - ; /* nothing */ --- -2.29.2 - diff --git a/package/git/git.hash b/package/git/git.hash index 1db29ac4574..d63fb096866 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 9f61417a44d5b954a5012b6f34e526a3336dcf5dd720e2bb7ada92ad8b3d6680 git-2.31.1.tar.xz +sha256 7aa19f7cd54df2edb9b66dd74c1acf9672ebfe1d018e0d88789450d31fdab7eb git-2.39.3.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 90b1acd6a41..b0c70fa9e1b 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -4,7 +4,7 @@ # ################################################################################ -GIT_VERSION = 2.31.1 +GIT_VERSION = 2.39.3 GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git GIT_LICENSE = GPL-2.0, LGPL-2.1+ @@ -12,8 +12,6 @@ GIT_LICENSE_FILES = COPYING LGPL-2.1 GIT_CPE_ID_VENDOR = git-scm GIT_SELINUX_MODULES = apache git xdg GIT_DEPENDENCIES = zlib $(TARGET_NLS_DEPENDENCIES) -# We're patching configure.ac -GIT_AUTORECONF = YES ifeq ($(BR2_PACKAGE_OPENSSL),y) GIT_DEPENDENCIES += host-pkgconf openssl @@ -49,7 +47,8 @@ endif ifeq ($(BR2_PACKAGE_LIBICONV),y) GIT_DEPENDENCIES += libiconv GIT_CONF_ENV_LIBS += -liconv -GIT_CONF_OPTS += --with-iconv=/usr/lib +GIT_CONF_OPTS += --with-iconv=$(STAGING_DIR)/usr +GIT_CONF_ENV += ac_cv_iconv_omits_bom=no else GIT_CONF_OPTS += --without-iconv endif diff --git a/package/gitlab-runner/Config.in b/package/gitlab-runner/Config.in new file mode 100644 index 00000000000..4289613ab9e --- /dev/null +++ b/package/gitlab-runner/Config.in @@ -0,0 +1,31 @@ +config BR2_PACKAGE_GITLAB_RUNNER + bool "gitlab-runner" + 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_USE_MMU # git + depends on BR2_USE_WCHAR # tar + select BR2_PACKAGE_BASH # runtime, shells/bash.go probably want to support bashism. + select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # bash + select BR2_PACKAGE_CA_CERTIFICATES # runtime + select BR2_PACKAGE_GIT # runtime + select BR2_PACKAGE_LIBCURL # runtime + select BR2_PACKAGE_LIBCURL_CURL # runtime + select BR2_PACKAGE_LIBCURL_FORCE_TLS # runtime + select BR2_PACKAGE_OPENSSL # runtime + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL # runtime + select BR2_PACKAGE_LIBOPENSSL_BIN # runtime + select BR2_PACKAGE_TAR # runtime + help + GitLab Runner is the open source project that is used to run + your jobs and send the results back to GitLab. It is used in + conjunction with GitLab CI/CD, the open-source continuous + integration service included with GitLab that coordinates the + jobs. + + https://docs.gitlab.com/runner/ + +comment "gitlab-runner needs a toolchain w/ threads" + 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 diff --git a/package/gitlab-runner/S95gitlab-runner b/package/gitlab-runner/S95gitlab-runner new file mode 100644 index 00000000000..739adf17833 --- /dev/null +++ b/package/gitlab-runner/S95gitlab-runner @@ -0,0 +1,64 @@ +#!/bin/sh + +DAEMON="gitlab-runner" +PIDFILE="/var/run/$DAEMON.pid" + +DAEMON_ARGS="run --syslog --user gitlab-runner -d /var/lib/gitlab-runner -c /etc/gitlab-runner/config.toml" + +# shellcheck source=/dev/null +[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" + +start() { + printf 'Starting %s: ' "$DAEMON" + # shellcheck disable=SC2086 # we need the word splitting + start-stop-daemon -S -q -m -b -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ + -- $DAEMON_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" -u "$DAEMON" + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +restart() { + stop + sleep 1 + start +} + +reload() { + printf 'Reloading %s: ' "$DAEMON" + start-stop-daemon -K -s HUP -q -p "$PIDFILE" -u "$DAEMON" + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +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/gitlab-runner/gitlab-runner.hash b/package/gitlab-runner/gitlab-runner.hash new file mode 100644 index 00000000000..2d39eef39bd --- /dev/null +++ b/package/gitlab-runner/gitlab-runner.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 f7482926d20dbf98434e3d34662d93b601166eb784c6fb4bc56f89c1a4eff19d gitlab-runner-15.5.0.tar.gz +sha256 0ae968b7ddd25da0209c3c6594aac1ac74ddf90385940b02b420463e2e0734de LICENSE diff --git a/package/gitlab-runner/gitlab-runner.mk b/package/gitlab-runner/gitlab-runner.mk new file mode 100644 index 00000000000..ecd109bf6e4 --- /dev/null +++ b/package/gitlab-runner/gitlab-runner.mk @@ -0,0 +1,32 @@ +################################################################################ +# +# gitlab-runner +# +################################################################################ + +GITLAB_RUNNER_VERSION = 15.5.0 +GITLAB_RUNNER_SITE = https://gitlab.com/gitlab-org/gitlab-runner/-/archive/v$(GITLAB_RUNNER_VERSION) +GITLAB_RUNNER_LICENSE = MIT +GITLAB_RUNNER_LICENSE_FILES = LICENSE + +GITLAB_RUNNER_LDFLAGS = \ + -X gitlab.com/gitlab-org/gitlab-runner/common.VERSION=$(GITLAB_RUNNER_VERSION) + +define GITLAB_RUNNER_USERS + gitlab-runner -1 gitlab-runner -1 * /var/lib/gitlab-runner /bin/false - Gitlab Runner +endef + +define GITLAB_RUNNER_INSTALL_INIT_SYSV + $(INSTALL) -m 0755 -D package/gitlab-runner/S95gitlab-runner \ + $(TARGET_DIR)/etc/init.d/S95gitlab-runner +endef + +define GITLAB_RUNNER_INSTALL_INIT_SYSTEMD + mkdir -p $(TARGET_DIR)/var/lib/gitlab-runner + $(INSTALL) -D -m 0644 package/gitlab-runner/gitlab-runner.service \ + $(TARGET_DIR)/usr/lib/systemd/system/gitlab-runner.service +endef + +GITLAB_RUNNER_POST_INSTALL_TARGET_HOOKS += GITLAB_RUNNER_INSTALL_CONFIG + +$(eval $(golang-package)) diff --git a/package/gitlab-runner/gitlab-runner.service b/package/gitlab-runner/gitlab-runner.service new file mode 100644 index 00000000000..cba751a3d6b --- /dev/null +++ b/package/gitlab-runner/gitlab-runner.service @@ -0,0 +1,18 @@ +[Unit] +Description=GitLab Runner +After=network.target +ConditionFileIsExecutable=/usr/bin/gitlab-runner + +[Service] +Environment="DAEMON_ARGS=run --working-directory /var/lib/gitlab-runner --config /etc/gitlab-runner/config.toml --service gitlab-runner --syslog --user gitlab-runner" +EnvironmentFile=-/etc/default/%p +StartLimitInterval=5 +StartLimitBurst=10 +ExecStart=/usr/bin/gitlab-runner $DAEMON_ARGS +ExecReload=/bin/kill -HUP $MAINPID + +Restart=always +RestartSec=120 + +[Install] +WantedBy=multi-user.target diff --git a/package/gkrellm/gkrellm.mk b/package/gkrellm/gkrellm.mk index 2a687226630..27a87be1905 100644 --- a/package/gkrellm/gkrellm.mk +++ b/package/gkrellm/gkrellm.mk @@ -12,7 +12,13 @@ GKRELLM_LICENSE_FILES = COPYING COPYRIGHT GKRELLM_DEPENDENCIES = host-pkgconf libglib2 $(TARGET_NLS_DEPENDENCIES) GKRELLM_BUILD_OPTS = \ STRIP="" \ - SYS_LIBS=$(TARGET_NLS_LIBS) + SYS_LIBS="$(GKRELLM_SYS_LIBS)" + +GKRELLM_SYS_LIBS = $(TARGET_NLS_LIBS) + +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +GKRELLM_SYS_LIBS += -latomic +endif ifeq ($(BR2_PACKAGE_LM_SENSORS),y) GKRELLM_DEPENDENCIES += lm-sensors diff --git a/package/gli/gli.hash b/package/gli/gli.hash index 177358a7584..deef901af9b 100644 --- a/package/gli/gli.hash +++ b/package/gli/gli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9374f3cf6441dac0154f7e5ae9ad9ae99f4c4a36f8eb6de23f54a1996b9f2769 gli-559cbe1ec38878e182507d331e0780fbae5baf15.tar.gz -sha256 e26459f62353e631d18379668c82b85f9fd2fd993f2818277e4fce21e957f87a manual.md +sha256 9374f3cf6441dac0154f7e5ae9ad9ae99f4c4a36f8eb6de23f54a1996b9f2769 gli-559cbe1ec38878e182507d331e0780fbae5baf15.tar.gz +sha256 e26459f62353e631d18379668c82b85f9fd2fd993f2818277e4fce21e957f87a manual.md diff --git a/package/glib-networking/Config.in b/package/glib-networking/Config.in index 38cded5e6bf..9c5d36af16b 100644 --- a/package/glib-networking/Config.in +++ b/package/glib-networking/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_GLIB_NETWORKING depends on !BR2_STATIC_LIBS select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_GNUTLS + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL if !BR2_PACKAGE_GNUTLS select BR2_PACKAGE_P11_KIT if BR2_PACKAGE_GNUTLS help Network-related GIO modules for glib. diff --git a/package/glib-networking/glib-networking.hash b/package/glib-networking/glib-networking.hash index 347ef6777c4..766efd0ced4 100644 --- a/package/glib-networking/glib-networking.hash +++ b/package/glib-networking/glib-networking.hash @@ -1,3 +1,3 @@ -# From http://ftp.gnome.org/pub/gnome/sources/glib-networking/2.70/glib-networking-2.70.1.sha256sum +# From https://download.gnome.org/sources/glib-networking/2.70/glib-networking-2.70.1.sha256sum sha256 2a16bfc2d271ccd3266e3fb462bc8a4103c02e81bbb339aa92d6fb060592d7bc glib-networking-2.70.1.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/glib-networking/glib-networking.mk b/package/glib-networking/glib-networking.mk index f74e520d310..b6d29110ed5 100644 --- a/package/glib-networking/glib-networking.mk +++ b/package/glib-networking/glib-networking.mk @@ -6,7 +6,7 @@ GLIB_NETWORKING_VERSION_MAJOR = 2.70 GLIB_NETWORKING_VERSION = $(GLIB_NETWORKING_VERSION_MAJOR).1 -GLIB_NETWORKING_SITE = http://ftp.gnome.org/pub/gnome/sources/glib-networking/$(GLIB_NETWORKING_VERSION_MAJOR) +GLIB_NETWORKING_SITE = https://download.gnome.org/sources/glib-networking/$(GLIB_NETWORKING_VERSION_MAJOR) GLIB_NETWORKING_SOURCE = glib-networking-$(GLIB_NETWORKING_VERSION).tar.xz GLIB_NETWORKING_INSTALL_STAGING = YES GLIB_NETWORKING_DEPENDENCIES = \ @@ -21,8 +21,6 @@ GLIB_NETWORKING_CONF_OPTS = \ GLIB_NETWORKING_LICENSE = LGPL-2.0+ GLIB_NETWORKING_LICENSE_FILES = COPYING GLIB_NETWORKING_CPE_ID_VENDOR = gnome -GLIB_NETWORKING_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) \ - GIO_MODULE_DIR=/usr/lib/gio/modules install ifeq ($(BR2_PACKAGE_GNUTLS),y) GLIB_NETWORKING_DEPENDENCIES += gnutls @@ -31,7 +29,7 @@ else GLIB_NETWORKING_CONF_OPTS += -Dgnutls=disabled endif -ifeq ($(BR2_PACKAGE_OPENSSL),y) +ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) GLIB_NETWORKING_DEPENDENCIES += openssl GLIB_NETWORKING_CONF_OPTS += -Dopenssl=enabled else diff --git a/package/glibc/0001-Revert-Linux-Implement-a-useful-version-of-_startup_.patch b/package/glibc/0001-Revert-Linux-Implement-a-useful-version-of-_startup_.patch new file mode 100644 index 00000000000..549650aca14 --- /dev/null +++ b/package/glibc/0001-Revert-Linux-Implement-a-useful-version-of-_startup_.patch @@ -0,0 +1,132 @@ +From dfda505870f94a7ac8063eb47f622ddc65665ff1 Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Tue, 14 Jun 2022 19:42:43 -0600 +Subject: [PATCH] Revert "Linux: Implement a useful version of _startup_fatal" + +Fixes: +csu/libc-tls.c:202: undefined reference to `_startup_fatal_not_constant' + +This reverts commit 2d05ba7f8ef979947e910a37ae8115a816eb4d08. + +Signed-off-by: James Hilliard +--- + sysdeps/unix/sysv/linux/i386/startup.h | 23 ++++++++++++--- + sysdeps/unix/sysv/linux/ia64/startup.h | 22 --------------- + sysdeps/unix/sysv/linux/startup.h | 39 -------------------------- + 3 files changed, 19 insertions(+), 65 deletions(-) + delete mode 100644 sysdeps/unix/sysv/linux/ia64/startup.h + delete mode 100644 sysdeps/unix/sysv/linux/startup.h + +diff --git a/sysdeps/unix/sysv/linux/i386/startup.h b/sysdeps/unix/sysv/linux/i386/startup.h +index 213805d7d2..67c9310f3a 100644 +--- a/sysdeps/unix/sysv/linux/i386/startup.h ++++ b/sysdeps/unix/sysv/linux/i386/startup.h +@@ -1,5 +1,5 @@ + /* Linux/i386 definitions of functions used by static libc main startup. +- Copyright (C) 2022 Free Software Foundation, Inc. ++ Copyright (C) 2017-2022 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or +@@ -16,7 +16,22 @@ + License along with the GNU C Library; if not, see + . */ + +-/* Can't use "call *%gs:SYSINFO_OFFSET" during startup. */ +-#define I386_USE_SYSENTER 0 ++#if BUILD_PIE_DEFAULT ++/* Can't use "call *%gs:SYSINFO_OFFSET" during statup in static PIE. */ ++# define I386_USE_SYSENTER 0 + +-#include_next ++# include ++# include ++ ++__attribute__ ((__noreturn__)) ++static inline void ++_startup_fatal (const char *message __attribute__ ((unused))) ++{ ++ /* This is only called very early during startup in static PIE. ++ FIXME: How can it be improved? */ ++ ABORT_INSTRUCTION; ++ __builtin_unreachable (); ++} ++#else ++# include_next ++#endif +diff --git a/sysdeps/unix/sysv/linux/ia64/startup.h b/sysdeps/unix/sysv/linux/ia64/startup.h +deleted file mode 100644 +index 77f29f15a2..0000000000 +--- a/sysdeps/unix/sysv/linux/ia64/startup.h ++++ /dev/null +@@ -1,22 +0,0 @@ +-/* Linux/ia64 definitions of functions used by static libc main startup. +- Copyright (C) 2022 Free Software Foundation, Inc. +- This file is part of the GNU C Library. +- +- The GNU C 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.1 of the License, or (at your option) any later version. +- +- The GNU C 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 the GNU C Library; if not, see +- . */ +- +-/* This code is used before the TCB is set up. */ +-#define IA64_USE_NEW_STUB 0 +- +-#include_next +diff --git a/sysdeps/unix/sysv/linux/startup.h b/sysdeps/unix/sysv/linux/startup.h +deleted file mode 100644 +index 39859b404a..0000000000 +--- a/sysdeps/unix/sysv/linux/startup.h ++++ /dev/null +@@ -1,39 +0,0 @@ +-/* Linux definitions of functions used by static libc main startup. +- Copyright (C) 2017-2022 Free Software Foundation, Inc. +- This file is part of the GNU C Library. +- +- The GNU C 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.1 of the License, or (at your option) any later version. +- +- The GNU C 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 the GNU C Library; if not, see +- . */ +- +-#ifdef SHARED +-# include_next +-#else +-# include +- +-/* Avoid a run-time invocation of strlen. */ +-#define _startup_fatal(message) \ +- do \ +- { \ +- size_t __message_length = __builtin_strlen (message); \ +- if (! __builtin_constant_p (__message_length)) \ +- { \ +- extern void _startup_fatal_not_constant (void); \ +- _startup_fatal_not_constant (); \ +- } \ +- INTERNAL_SYSCALL_CALL (write, STDERR_FILENO, (message), \ +- __message_length); \ +- INTERNAL_SYSCALL_CALL (exit_group, 127); \ +- } \ +- while (0) +-#endif /* !SHARED */ +-- +2.25.1 + diff --git a/package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch b/package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch deleted file mode 100644 index 3597cd6a110..00000000000 --- a/package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-sysdeps-unix-sysv-linux-microblaze-pselect32.c-add-m.patch +++ /dev/null @@ -1,85 +0,0 @@ -From af06fe63f9babb6d0179ae5d7d9245daada6bf56 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sun, 26 Dec 2021 10:30:01 +0100 -Subject: [PATCH] sysdeps/unix/sysv/linux/microblaze/pselect32.c: add missing - implementation when !__ASSUME_TIME64_SYSCALLS - -In commit a92f4e6299fe0e3cb6f77e79de00817aece501ce ("linux: Add time64 -pselect support"), a Microblaze specific implementation of -__pselect32() was added to cover the case of kernels < 3.15 which lack -the pselect6 system call. - -This new file sysdeps/unix/sysv/linux/microblaze/pselect32.c takes -precedence over the default implementation -sysdeps/unix/sysv/linux/pselect32.c. - -However sysdeps/unix/sysv/linux/pselect32.c provides an implementation -of __pselect32() which is needed when __ASSUME_TIME64_SYSCALLS is not -defined. On Microblaze, which is a 32-bit architecture, -__ASSUME_TIME64_SYSCALLS is only true for kernels >= 5.1. - -Due to sysdeps/unix/sysv/linux/microblaze/pselect32.c taking -precedence over sysdeps/unix/sysv/linux/pselect32.c, it means that -when we are with a kernel >= 3.15 but < 5.1, we need a __pselect32() -implementation, but sysdeps/unix/sysv/linux/microblaze/pselect32.c -doesn't provide it, and sysdeps/unix/sysv/linux/pselect32.c which -would provide it is not compiled in. - -This causes the following build failure on Microblaze with for example -Linux kernel headers 4.9: - -/home/thomas/buildroot/buildroot/output/host/lib/gcc/microblazeel-buildroot-linux-gnu/10.3.0/../../../../microblazeel-buildroot-linux-gnu/bin/ld: /home/thomas/buildroot/buildroot/output/build/glibc-2.34-9-g9acab0bba6a5a57323b1f94bf95b21618a9e5aa4/build/libc_pic.os: in function `__pselect64': -(.text+0x120b44): undefined reference to `__pselect32' -collect2: error: ld returned 1 exit status - -To fix this, we take a crude approach: replicate in -sysdeps/unix/sysv/linux/microblaze/pselect32.c the -!__ASSUME_TIME64_SYSCALLS implementation that is already in -sysdeps/unix/sysv/linux/pselect32.c. - -Upstream: https://sourceware.org/pipermail/libc-alpha/2021-December/134635.html -Signed-off-by: Thomas Petazzoni ---- - .../unix/sysv/linux/microblaze/pselect32.c | 22 +++++++++++++++++-- - 1 file changed, 20 insertions(+), 2 deletions(-) - -diff --git a/sysdeps/unix/sysv/linux/microblaze/pselect32.c b/sysdeps/unix/sysv/linux/microblaze/pselect32.c -index 70b7b52a48..6b6b3e8a2e 100644 ---- a/sysdeps/unix/sysv/linux/microblaze/pselect32.c -+++ b/sysdeps/unix/sysv/linux/microblaze/pselect32.c -@@ -22,7 +22,25 @@ - #include - #include - --#ifndef __ASSUME_PSELECT -+#if !defined(__ASSUME_TIME64_SYSCALLS) -+int -+__pselect32 (int nfds, fd_set *readfds, fd_set *writefds, -+ fd_set *exceptfds, const struct __timespec64 *timeout, -+ const sigset_t *sigmask) -+{ -+ struct timespec ts32, *pts32 = NULL; -+ if (timeout != NULL) -+ { -+ ts32 = valid_timespec64_to_timespec (*timeout); -+ pts32 = &ts32; -+ } -+ -+ return SYSCALL_CANCEL (pselect6, nfds, readfds, writefds, exceptfds, -+ pts32, -+ ((__syscall_ulong_t[]){ (uintptr_t) sigmask, -+ __NSIG_BYTES })); -+} -+#elif !defined(__ASSUME_PSELECT) - int - __pselect32 (int nfds, fd_set *readfds, fd_set *writefds, - fd_set *exceptfds, const struct __timespec64 *timeout, -@@ -57,4 +75,4 @@ __pselect32 (int nfds, fd_set *readfds, fd_set *writefds, - - return ret; - } --#endif /* __ASSUME_PSELECT */ -+#endif --- -2.31.1 - diff --git a/package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/glibc.hash b/package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/glibc.hash deleted file mode 100644 index dfd939020f8..00000000000 --- a/package/glibc/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/glibc.hash +++ /dev/null @@ -1,7 +0,0 @@ -# Locally calculated (fetched from Github) -sha256 3c299a21468a80356b848ca341f45551616c4928a6c871e6d45cee942e8b0f24 glibc-2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c.tar.gz - -# Hashes for license files -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB -sha256 b33d0bd9f685b46853548814893a6135e74430d12f6d94ab3eba42fc591f83bc LICENSES diff --git a/package/glibc/Config.in b/package/glibc/Config.in index 8e9ddac7d96..71c50504ac7 100644 --- a/package/glibc/Config.in +++ b/package/glibc/Config.in @@ -1,3 +1,44 @@ +config BR2_PACKAGE_GLIBC_ARCH_SUPPORTS + bool + default y if BR2_arm + default y if BR2_armeb + default y if BR2_aarch64 + default y if BR2_aarch64_be + default y if BR2_i386 + default y if BR2_mips + default y if BR2_mipsel + default y if BR2_mips64 + default y if BR2_mips64el + default y if BR2_or1k + default y if BR2_powerpc + default y if BR2_powerpc64 + default y if BR2_powerpc64le + default y if BR2_riscv + default y if BR2_s390x + default y if BR2_sh + 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 + depends on !BR2_powerpc_SPE + depends on BR2_RISCV_ISA_RVA || !BR2_riscv + depends on BR2_USE_MMU + +config BR2_PACKAGE_GLIBC_SUPPORTS + bool + default y if BR2_PACKAGE_GLIBC_ARCH_SUPPORTS + # Make sure to keep these dependencies in sync with the + # Config.in comments in + # 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_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 + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1 || !BR2_arc + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 || !BR2_or1k + if BR2_TOOLCHAIN_BUILDROOT_GLIBC comment "Glibc Options" @@ -11,7 +52,7 @@ config BR2_PACKAGE_GLIBC https://www.gnu.org/software/libc/ config BR2_PACKAGE_GLIBC_KERNEL_COMPAT - bool "Enable compatibiltiy shims to run on older kernels" + bool "Enable compatibility shims to run on older kernels" help Say 'y' here if you plan on running your system on a kernel older than the version used for the toolchain headers. diff --git a/package/glibc/glibc.hash b/package/glibc/glibc.hash index 5316f03b105..4ce4c6f6d1f 100644 --- a/package/glibc/glibc.hash +++ b/package/glibc/glibc.hash @@ -1,2 +1,7 @@ -# This hash file is not used; instead, update the -# hash files in the per-version sub-directories. +# Locally calculated (fetched from Github) +sha256 666482e657c319f7e139121121a0d97d303c65207b9f9730f42a3ee83c79f686 glibc-2.36-81-g4f4d7a13edfd2fdc57c9d76e1fd6d017fb47550c.tar.gz + +# Hashes for license files +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB +sha256 b33d0bd9f685b46853548814893a6135e74430d12f6d94ab3eba42fc591f83bc LICENSES diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index 2702994c6b5..354f035d335 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -7,7 +7,7 @@ # 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.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c +GLIBC_VERSION = 2.36-81-g4f4d7a13edfd2fdc57c9d76e1fd6d017fb47550c # 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. @@ -110,16 +110,31 @@ endif # # 2. We have to execute the configure script with bash and not sh. # -# Note that as mentionned in -# http://patches.openembedded.org/patch/38849/, glibc must be -# built with -O2, so we pass our own CFLAGS and CXXFLAGS below. +# 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) +GLIBC_CFLAGS += -O1 +endif + +# glibc can't be built with Optimize for fast +ifeq ($(BR2_OPTIMIZE_FAST),y) +GLIBC_CFLAGS += -O2 +endif + define GLIBC_CONFIGURE_CMDS mkdir -p $(@D)/build # Do the configuration (cd $(@D)/build; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="-O2 $(GLIBC_EXTRA_CFLAGS)" CPPFLAGS="" \ - CXXFLAGS="-O2 $(GLIBC_EXTRA_CFLAGS)" \ + CFLAGS="$(GLIBC_CFLAGS) $(GLIBC_EXTRA_CFLAGS)" CPPFLAGS="" \ + CXXFLAGS="$(GLIBC_CFLAGS) $(GLIBC_EXTRA_CFLAGS)" \ $(GLIBC_CONF_ENV) \ $(SHELL) $(@D)/configure \ --target=$(GNU_TARGET_NAME) \ diff --git a/package/glibmm/Config.in b/package/glibmm/Config.in index 2dfc8618172..b7bed195e95 100644 --- a/package/glibmm/Config.in +++ b/package/glibmm/Config.in @@ -1,5 +1,5 @@ config BR2_PACKAGE_GLIBMM - bool "glibmm" + bool "glibmm (latest)" depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # libsigc depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR # libglib2 diff --git a/package/glibmm/glibmm.hash b/package/glibmm/glibmm.hash index f0bc7f4e714..ea256c3addb 100644 --- a/package/glibmm/glibmm.hash +++ b/package/glibmm/glibmm.hash @@ -1,4 +1,4 @@ -# From http://ftp.gnome.org/pub/gnome/sources/glibmm/2.68/glibmm-2.68.2.sha256sum +# From https://download.gnome.org/sources/glibmm/2.68/glibmm-2.68.2.sha256sum sha256 91e0a8618f7b82db4aaf2648932ea2bcfe626ad030068c18fa2d106fd838d8ad glibmm-2.68.2.tar.xz # License files, locally calculated sha256 3ea7fa7c5d9a3a113e950eca9cfb85107f096270d8e4dd99daa9d8abdebc60e7 COPYING diff --git a/package/glibmm/glibmm.mk b/package/glibmm/glibmm.mk index 525da6b618a..7f37da8449d 100644 --- a/package/glibmm/glibmm.mk +++ b/package/glibmm/glibmm.mk @@ -9,7 +9,7 @@ GLIBMM_VERSION = $(GLIBMM_VERSION_MAJOR).2 GLIBMM_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) GLIBMM_LICENSE_FILES = COPYING COPYING.tools GLIBMM_SOURCE = glibmm-$(GLIBMM_VERSION).tar.xz -GLIBMM_SITE = http://ftp.gnome.org/pub/gnome/sources/glibmm/$(GLIBMM_VERSION_MAJOR) +GLIBMM_SITE = https://download.gnome.org/sources/glibmm/$(GLIBMM_VERSION_MAJOR) GLIBMM_INSTALL_STAGING = YES GLIBMM_DEPENDENCIES = libglib2 libsigc host-pkgconf GLIBMM_CONF_OPTS = -Dbuild-examples=false diff --git a/package/glibmm2_66/Config.in b/package/glibmm2_66/Config.in new file mode 100644 index 00000000000..628584cae54 --- /dev/null +++ b/package/glibmm2_66/Config.in @@ -0,0 +1,21 @@ +config BR2_PACKAGE_GLIBMM2_66 + bool "glibmm (2.66.x)" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # regex_replace + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_USE_WCHAR # libglib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + depends on BR2_USE_MMU # libglib2 + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_LIBSIGC2 + help + The GLibmm package is a set of C++ bindings for GLib. + + This is the last version before the API and ABI change + introduced in 2.68.0 which requires C++17. + + http://www.gtkmm.org/ + +comment "glibmm (2.66.x) needs a toolchain w/ C++, wchar, threads, gcc >= 4.9" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_USE_WCHAR \ + || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/glibmm2_66/glibmm2_66.hash b/package/glibmm2_66/glibmm2_66.hash new file mode 100644 index 00000000000..19272d2b907 --- /dev/null +++ b/package/glibmm2_66/glibmm2_66.hash @@ -0,0 +1,5 @@ +# From https://download.gnome.org/sources/glibmm/2.66/glibmm-2.66.6.sha256sum +sha256 5358742598181e5351d7bf8da072bf93e6dd5f178d27640d4e462bc8f14e152f glibmm-2.66.6.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 new file mode 100644 index 00000000000..7f28342c525 --- /dev/null +++ b/package/glibmm2_66/glibmm2_66.mk @@ -0,0 +1,23 @@ +################################################################################ +# +# glibmm2_66 +# +################################################################################ + +GLIBMM2_66_VERSION_MAJOR = 2.66 +GLIBMM2_66_VERSION = $(GLIBMM2_66_VERSION_MAJOR).6 +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 +GLIBMM2_66_SITE = https://download.gnome.org/sources/glibmm/$(GLIBMM2_66_VERSION_MAJOR) +GLIBMM2_66_INSTALL_STAGING = YES +GLIBMM2_66_DEPENDENCIES = libglib2 libsigc2 host-pkgconf +GLIBMM2_66_CONF_OPTS = -Dbuild-examples=false + +GLIBMM2_66_CXXFLAGS = $(TARGET_CXXFLAGS) + +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) +GLIBMM2_66_CXXFLAGS += -O0 +endif + +$(eval $(meson-package)) diff --git a/package/glm/glm.hash b/package/glm/glm.hash index 2073d6bf041..b0c1d92c742 100644 --- a/package/glm/glm.hash +++ b/package/glm/glm.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 5e33b6131cea6a904339734b015110d4342b7dc02d995164fdb86332d28a5aa4 glm-0.9.9.5.tar.gz -sha256 337130631a714eeae017556cad101d5324c2961214120b6214741d3d43667086 manual.md +sha256 5e33b6131cea6a904339734b015110d4342b7dc02d995164fdb86332d28a5aa4 glm-0.9.9.5.tar.gz +sha256 337130631a714eeae017556cad101d5324c2961214120b6214741d3d43667086 manual.md diff --git a/package/glmark2/0002-libmatrix-Add-missing-utility-include.patch b/package/glmark2/0002-libmatrix-Add-missing-utility-include.patch new file mode 100644 index 00000000000..65b6183867f --- /dev/null +++ b/package/glmark2/0002-libmatrix-Add-missing-utility-include.patch @@ -0,0 +1,30 @@ +From d1ca3f53c96dc8a4048b17dc16147a8fac782d4a Mon Sep 17 00:00:00 2001 +From: Alexandros Frantzis +Date: Mon, 14 Feb 2022 13:54:09 +0200 +Subject: [PATCH] libmatrix: Add missing include + +Fixes compilation with GCC 12. + +Fixes #169 +[Paul: backport upstream d1ca3f53c96dc8a4048b17dc16147a8fac782d4a] +Signed-off-by: Paul Cercueil +--- + + src/libmatrix/program.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/libmatrix/program.h b/src/libmatrix/program.h +index f95b470..1c9de08 100644 +--- a/src/libmatrix/program.h ++++ b/src/libmatrix/program.h +@@ -15,6 +15,7 @@ + #include + #include + #include ++#include + #include "mat.h" + + // Simple shader container. Abstracts all of the OpenGL bits, but leaves +-- +2.35.1 + diff --git a/package/glmark2/glmark2.mk b/package/glmark2/glmark2.mk index e8d6f71dad3..bac9d9ff6fc 100644 --- a/package/glmark2/glmark2.mk +++ b/package/glmark2/glmark2.mk @@ -10,6 +10,9 @@ GLMARK2_LICENSE = GPL-3.0+, SGIv1 GLMARK2_LICENSE_FILES = COPYING COPYING.SGI GLMARK2_DEPENDENCIES = host-pkgconf jpeg libegl libpng +# The bundled waf script is too old for >= python3.11 +GLMARK2_NEEDS_EXTERNAL_WAF = YES + ifeq ($(BR2_PACKAGE_GLMARK2_FLAVOR_DRM_GLESV2),y) GLMARK2_DEPENDENCIES += libdrm libgbm libgles udev GLMARK2_FLAVORS += drm-glesv2 diff --git a/package/glog/0001-added-emscripten-support.patch b/package/glog/0001-added-emscripten-support.patch new file mode 100644 index 00000000000..bb601affce5 --- /dev/null +++ b/package/glog/0001-added-emscripten-support.patch @@ -0,0 +1,292 @@ +From 6ed0c9e58b11680779c571996a3007bd972e0853 Mon Sep 17 00:00:00 2001 +From: Sergiu Deitsch +Date: Thu, 4 Aug 2022 22:52:47 +0200 +Subject: [PATCH] added emscripten support (#846) + +[Retrieved from: +https://github.com/google/glog/commit/6ed0c9e58b11680779c571996a3007bd972e0853, +to fix build without threads, a fix that is lost in the middle of a +larger commit adding emscripten support.] +Signed-off-by: Fabrice Fontaine +--- + .github/workflows/emscripten.yml | 60 ++++++++++++++++++++++++++++++++ + CMakeLists.txt | 14 ++++---- + src/config.h.cmake.in | 6 ++-- + src/glog/logging.h.in | 6 ++-- + src/glog/platform.h | 2 ++ + src/logging.cc | 11 ++++-- + src/raw_logging.cc | 9 ++--- + src/stacktrace_unwind-inl.h | 2 +- + src/symbolize.cc | 2 +- + src/utilities.h | 2 +- + 10 files changed, 93 insertions(+), 21 deletions(-) + create mode 100644 .github/workflows/emscripten.yml + +diff --git a/.github/workflows/emscripten.yml b/.github/workflows/emscripten.yml +new file mode 100644 +index 00000000..566c67eb +--- /dev/null ++++ b/.github/workflows/emscripten.yml +@@ -0,0 +1,60 @@ ++name: Emscripten ++ ++on: [push, pull_request] ++ ++jobs: ++ build-linux: ++ defaults: ++ run: ++ shell: bash ++ name: Emscripten-C++${{matrix.std}}-${{matrix.build_type}}-${{matrix.lib}}-${{matrix.extra}} ++ runs-on: ubuntu-latest ++ container: emscripten/emsdk ++ strategy: ++ fail-fast: true ++ matrix: ++ build_type: [Release, Debug] ++ extra: [no-custom-prefix, custom-prefix] ++ lib: [static] ++ std: [98, 11, 14, 17, 20] ++ ++ steps: ++ - uses: actions/checkout@v2 ++ ++ - name: Setup Dependencies ++ run: | ++ apt-get update ++ DEBIAN_FRONTEND=noninteractive sudo apt-get install -y \ ++ cmake \ ++ ninja-build ++ ++ - name: Setup C++98 Environment ++ if: matrix.std == '98' ++ run: | ++ echo 'CXXFLAGS=-Wno-error=variadic-macros -Wno-error=long-long ${{env.CXXFLAGS}}' >> $GITHUB_ENV ++ ++ - name: Configure ++ env: ++ CXXFLAGS: -Wall -Wextra -Wsign-conversion -Wtautological-compare -Wformat-nonliteral -Wundef -Werror -Wno-error=wasm-exception-spec ${{env.CXXFLAGS}} ++ run: | ++ cmake -S . -B build_${{matrix.build_type}} \ ++ -DBUILD_SHARED_LIBS=${{matrix.lib == 'shared'}} \ ++ -DCMAKE_AR=$(which emar) \ ++ -DCMAKE_C_COMPILER=$(which emcc) \ ++ -DCMAKE_CXX_COMPILER=$(which em++) \ ++ -DCMAKE_CXX_STANDARD=${{matrix.std}} \ ++ -DCMAKE_CXX_STANDARD_REQUIRED=ON \ ++ -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \ ++ -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY \ ++ -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ONLY \ ++ -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER \ ++ -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/install \ ++ -DCMAKE_RANLIB=$(which emranlib) \ ++ -DWITH_CUSTOM_PREFIX=${{matrix.extra == 'custom-prefix'}} \ ++ -G Ninja \ ++ -Werror ++ ++ - name: Build ++ run: | ++ cmake --build build_${{matrix.build_type}} \ ++ --config ${{matrix.build_type}} +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 643a8b8a..ce6daa40 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -93,11 +93,11 @@ find_package (Unwind) + if (Unwind_FOUND) + set (HAVE_LIB_UNWIND 1) + else (Unwind_FOUND) +- check_include_file_cxx (unwind.h HAVE_UNWIND_H) + # Check whether linking actually succeeds. ARM toolchains of LLVM unwind + # implementation do not necessarily provide the _Unwind_Backtrace function + # which causes the previous check to succeed but the linking to fail. + check_cxx_symbol_exists (_Unwind_Backtrace unwind.h HAVE__UNWIND_BACKTRACE) ++ check_cxx_symbol_exists (_Unwind_GetIP unwind.h HAVE__UNWIND_GETIP) + endif (Unwind_FOUND) + + check_include_file_cxx (dlfcn.h HAVE_DLFCN_H) +@@ -197,9 +197,10 @@ int main(void) + } + " HAVE___SYNC_VAL_COMPARE_AND_SWAP) + +-cmake_push_check_state (RESET) +-set (CMAKE_REQUIRED_LIBRARIES Threads::Threads) +-check_cxx_source_compiles (" ++if (Threads_FOUND) ++ cmake_push_check_state (RESET) ++ set (CMAKE_REQUIRED_LIBRARIES Threads::Threads) ++ check_cxx_source_compiles (" + #define _XOPEN_SOURCE 500 + #include + int main(void) +@@ -209,8 +210,9 @@ int main(void) + pthread_rwlock_rdlock(&l); + return 0; + } +-" HAVE_RWLOCK) +-cmake_pop_check_state () ++ " HAVE_RWLOCK) ++ cmake_pop_check_state () ++endif (Threads_FOUND) + + check_cxx_source_compiles (" + __declspec(selectany) int a; +diff --git a/src/config.h.cmake.in b/src/config.h.cmake.in +index b67e8a77..20b5f1c4 100644 +--- a/src/config.h.cmake.in ++++ b/src/config.h.cmake.in +@@ -118,12 +118,12 @@ + /* Define to 1 if you have the header file. */ + #cmakedefine HAVE_UNISTD_H ${HAVE_UNISTD_H} + +-/* Define if you have the header file. */ +-#cmakedefine HAVE_UNWIND_H +- + /* Define if you linking to _Unwind_Backtrace is possible. */ + #cmakedefine HAVE__UNWIND_BACKTRACE + ++/* Define if you linking to _Unwind_GetIP is possible. */ ++#cmakedefine HAVE__UNWIND_GETIP ++ + /* define if the compiler supports using expression for operator */ + #cmakedefine HAVE_USING_OPERATOR + +diff --git a/src/glog/logging.h.in b/src/glog/logging.h.in +index c6def152..098e28fe 100644 +--- a/src/glog/logging.h.in ++++ b/src/glog/logging.h.in +@@ -97,7 +97,7 @@ + + @ac_google_start_namespace@ + +-#if @ac_cv_have_uint16_t@ // the C99 format ++#if @ac_cv_have_stdint_h@ // the C99 format + typedef int32_t int32; + typedef uint32_t uint32; + typedef int64_t int64; +@@ -1822,8 +1822,8 @@ GLOG_EXPORT void SetEmailLogging(LogSeverity min_severity, + + // A simple function that sends email. dest is a commma-separated + // list of addressess. Thread-safe. +-GLOG_EXPORT bool SendEmail(const char *dest, +- const char *subject, const char *body); ++GLOG_EXPORT bool SendEmail(const char* dest, const char* subject, ++ const char* body); + + GLOG_EXPORT const std::vector& GetLoggingDirectories(); + +diff --git a/src/glog/platform.h b/src/glog/platform.h +index e6144119..7893c45d 100644 +--- a/src/glog/platform.h ++++ b/src/glog/platform.h +@@ -50,6 +50,8 @@ + #define GLOG_OS_NETBSD + #elif defined(__OpenBSD__) + #define GLOG_OS_OPENBSD ++#elif defined(__EMSCRIPTEN__) ++#define GLOG_OS_EMSCRIPTEN + #else + // TODO(hamaji): Add other platforms. + #error Platform not supported by glog. Please consider to contribute platform information by submitting a pull request on Github. +diff --git a/src/logging.cc b/src/logging.cc +index e65e80e9..1df1034a 100644 +--- a/src/logging.cc ++++ b/src/logging.cc +@@ -2188,6 +2188,7 @@ void SetExitOnDFatal(bool value) { + } // namespace internal + } // namespace base + ++#ifndef GLOG_OS_EMSCRIPTEN + // Shell-escaping as we need to shell out ot /bin/mail. + static const char kDontNeedShellEscapeChars[] = + "ABCDEFGHIJKLMNOPQRSTUVWXYZ" +@@ -2222,14 +2223,14 @@ static string ShellEscape(const string& src) { + } + return result; + } +- ++#endif + + // use_logging controls whether the logging functions LOG/VLOG are used + // to log errors. It should be set to false when the caller holds the + // log_mutex. + static bool SendEmailInternal(const char*dest, const char *subject, + const char*body, bool use_logging) { +-#ifndef __EMSCRIPTEN__ ++#ifndef GLOG_OS_EMSCRIPTEN + if (dest && *dest) { + if ( use_logging ) { + VLOG(1) << "Trying to send TITLE:" << subject +@@ -2275,6 +2276,12 @@ static bool SendEmailInternal(const char*dest, const char *subject, + } + } + } ++#else ++ (void)dest; ++ (void)subject; ++ (void)body; ++ (void)use_logging; ++ LOG(WARNING) << "Email support not available; not sending message"; + #endif + return false; + } +diff --git a/src/raw_logging.cc b/src/raw_logging.cc +index 43159832..befeac89 100644 +--- a/src/raw_logging.cc ++++ b/src/raw_logging.cc +@@ -59,11 +59,12 @@ + # include + #endif + +-#if (defined(HAVE_SYSCALL_H) || defined(HAVE_SYS_SYSCALL_H)) && (!(defined(GLOG_OS_MACOSX))) +-# define safe_write(fd, s, len) syscall(SYS_write, fd, s, len) ++#if (defined(HAVE_SYSCALL_H) || defined(HAVE_SYS_SYSCALL_H)) && \ ++ (!(defined(GLOG_OS_MACOSX))) && !defined(GLOG_OS_EMSCRIPTEN) ++#define safe_write(fd, s, len) syscall(SYS_write, fd, s, len) + #else +- // Not so safe, but what can you do? +-# define safe_write(fd, s, len) write(fd, s, len) ++// Not so safe, but what can you do? ++#define safe_write(fd, s, len) write(fd, s, len) + #endif + + _START_GOOGLE_NAMESPACE_ +diff --git a/src/stacktrace_unwind-inl.h b/src/stacktrace_unwind-inl.h +index fbb5f988..dc1665b4 100644 +--- a/src/stacktrace_unwind-inl.h ++++ b/src/stacktrace_unwind-inl.h +@@ -73,7 +73,7 @@ static _Unwind_Reason_Code GetOneFrame(struct _Unwind_Context *uc, void *opq) { + if (targ->skip_count > 0) { + targ->skip_count--; + } else { +- targ->result[targ->count++] = (void *) _Unwind_GetIP(uc); ++ targ->result[targ->count++] = reinterpret_cast(_Unwind_GetIP(uc)); + } + + if (targ->count == targ->max_depth) { +diff --git a/src/symbolize.cc b/src/symbolize.cc +index 51025018..f56e97c9 100644 +--- a/src/symbolize.cc ++++ b/src/symbolize.cc +@@ -834,7 +834,7 @@ static ATTRIBUTE_NOINLINE bool SymbolizeAndDemangle(void *pc, char *out, + + _END_GOOGLE_NAMESPACE_ + +-#elif defined(GLOG_OS_MACOSX) && defined(HAVE_DLADDR) ++#elif (defined(GLOG_OS_MACOSX) || defined(GLOG_OS_EMSCRIPTEN)) && defined(HAVE_DLADDR) + + #include + #include +diff --git a/src/utilities.h b/src/utilities.h +index bd0ec632..760c142c 100644 +--- a/src/utilities.h ++++ b/src/utilities.h +@@ -88,7 +88,7 @@ + + #if defined(HAVE_LIB_UNWIND) + # define STACKTRACE_H "stacktrace_libunwind-inl.h" +-#elif defined(HAVE__UNWIND_BACKTRACE) ++#elif defined(HAVE__UNWIND_BACKTRACE) && defined(HAVE__UNWIND_GETIP) + # define STACKTRACE_H "stacktrace_unwind-inl.h" + #elif !defined(NO_FRAME_POINTER) + # if defined(__i386__) && __GNUC__ >= 2 diff --git a/package/glog/glog.hash b/package/glog/glog.hash index 3f84472967e..fab77c522be 100644 --- a/package/glog/glog.hash +++ b/package/glog/glog.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 eede71f28371bf39aa69b45de23b329d37214016e2055269b3b5e7cfd40b59f5 glog-0.5.0.tar.gz +sha256 8a83bf982f37bb70825df71a9709fa90ea9f4447fb3c099e1d720a439d88bad6 glog-0.6.0.tar.gz # Hash for License file: sha256 0fc497129c5c69ff6f22da6933c7e4aaef082fde8437fd57680c2780100772a4 COPYING diff --git a/package/glog/glog.mk b/package/glog/glog.mk index 325107fb9e3..ddf71fd15a8 100644 --- a/package/glog/glog.mk +++ b/package/glog/glog.mk @@ -4,7 +4,7 @@ # ################################################################################ -GLOG_VERSION = 0.5.0 +GLOG_VERSION = 0.6.0 GLOG_SITE = $(call github,google,glog,v$(GLOG_VERSION)) GLOG_INSTALL_STAGING = YES GLOG_LICENSE = BSD-3-Clause diff --git a/package/glorytun/0001-Add-support-for-Apple-silicon.patch b/package/glorytun/0001-Add-support-for-Apple-silicon.patch new file mode 100644 index 00000000000..6d4b8273f33 --- /dev/null +++ b/package/glorytun/0001-Add-support-for-Apple-silicon.patch @@ -0,0 +1,51 @@ +From 577ae0352d191fa604f861ea2f0847e7c5eda617 Mon Sep 17 00:00:00 2001 +From: Frank Denis +Date: Wed, 1 Jul 2020 22:51:43 +0200 +Subject: [PATCH] Add support for Apple silicon + +[Retrieved from: +https://github.com/angt/aegis256/commit/577ae0352d191fa604f861ea2f0847e7c5eda617] +Signed-off-by: Fabrice Fontaine +--- + aegis256.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/mud/aegis256/aegis256.c b/mud/aegis256/aegis256.c +index 9a580bf..75a772c 100644 +--- a/mud/aegis256/aegis256.c ++++ b/mud/aegis256/aegis256.c +@@ -36,7 +36,7 @@ typedef __m128i x128; + #define store128(X,Y) _mm_storeu_si128((x128 *)(X), (Y)) + #define set2x64(X,Y) _mm_set_epi64x((long long)(X), (long long)(Y)) + +-#elif defined(__linux__) && (defined(__ARM_NEON_FP) || defined(__aarch64__)) ++#elif (defined(__APPLE__) || defined(__linux__)) && (defined(__ARM_NEON_FP) || defined(__aarch64__)) + + #ifdef __clang__ + #pragma clang attribute push (__attribute__((target("crypto"))),apply_to=function) +@@ -48,7 +48,9 @@ typedef __m128i x128; + #endif + + #ifdef __ARM_FEATURE_CRYPTO ++#ifdef __linux__ + #include ++#endif + #include + + typedef uint8x16_t x128; +@@ -62,11 +64,15 @@ typedef uint8x16_t x128; + int + aegis256_is_available(void) + { ++#ifdef __linux__ + return (getauxval(AT_HWCAP) & HWCAP_AES) + #ifdef HWCAP2_AES + || (getauxval(AT_HWCAP2) & HWCAP2_AES) + #endif + ; ++#else // __APPLE__ ++ return 1; ++#endif + } + + #endif // __ARM_FEATURE_CRYPTO diff --git a/package/glorytun/0002-aegis256.c-fix-aarch64-build-with-uclibc.patch b/package/glorytun/0002-aegis256.c-fix-aarch64-build-with-uclibc.patch new file mode 100644 index 00000000000..37ae8a3301b --- /dev/null +++ b/package/glorytun/0002-aegis256.c-fix-aarch64-build-with-uclibc.patch @@ -0,0 +1,43 @@ +From eb22e270a962d4a2da1972304fd8b1216211c9d1 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 16 Apr 2022 23:32:55 +0200 +Subject: [PATCH] aegis256.c: fix aarch64 build with uclibc + +Fix the following aarch64 build failure with uclibc: + +mud/aegis256/aegis256.c:51:10: fatal error: sys/auxv.h: No such file or directory + 51 | #include + | ^~~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/4e1bbd72b9b7e0f9963f6693c3d7bc9a1d24fab4 + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/angt/aegis256/commit/eb22e270a962d4a2da1972304fd8b1216211c9d1] +--- + aegis256.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/mud/aegis256/aegis256.c b/mud/aegis256/aegis256.c +index 75a772c..4e73fab 100644 +--- a/mud/aegis256/aegis256.c ++++ b/mud/aegis256/aegis256.c +@@ -48,7 +48,7 @@ typedef __m128i x128; + #endif + + #ifdef __ARM_FEATURE_CRYPTO +-#ifdef __linux__ ++#if defined(__linux__) && __has_include("sys/auxv.h") + #include + #endif + #include +@@ -64,7 +64,7 @@ typedef uint8x16_t x128; + int + aegis256_is_available(void) + { +-#ifdef __linux__ ++#if defined(__linux__) && __has_include("sys/auxv.h") + return (getauxval(AT_HWCAP) & HWCAP_AES) + #ifdef HWCAP2_AES + || (getauxval(AT_HWCAP2) & HWCAP2_AES) diff --git a/package/glorytun/glorytun.hash b/package/glorytun/glorytun.hash index 9d1b7977870..39dd12fa4ff 100644 --- a/package/glorytun/glorytun.hash +++ b/package/glorytun/glorytun.hash @@ -1,2 +1,2 @@ -sha256 137d9c525a05bb605163df0465367d36e943715ca773ce43d5ea66f0597600a3 glorytun-0.3.4.tar.gz -sha256 3d9ddddb8807c305287d9dbab58473e5307e9c91651c43c654a0828855d2b373 LICENSE +sha256 137d9c525a05bb605163df0465367d36e943715ca773ce43d5ea66f0597600a3 glorytun-0.3.4.tar.gz +sha256 3d9ddddb8807c305287d9dbab58473e5307e9c91651c43c654a0828855d2b373 LICENSE diff --git a/package/glslsandbox-player/Config.in b/package/glslsandbox-player/Config.in index 317eb628984..530c158fc33 100644 --- a/package/glslsandbox-player/Config.in +++ b/package/glslsandbox-player/Config.in @@ -2,9 +2,6 @@ config BR2_PACKAGE_GLSLSANDBOX_PLAYER bool "glslsandbox-player" depends on BR2_PACKAGE_HAS_LIBEGL depends on BR2_PACKAGE_HAS_LIBGLES - # Doesn't really depend on threads, but this makes sure we have at least - # one native windowing system available, and is good enough in practice. - depends on BR2_TOOLCHAIN_HAS_THREADS help GLSL Sandbox standalone player allow one to run and render (most of) nice shaders available online on the @@ -65,9 +62,15 @@ choice help Select the native windowing system you wish to use. +config BR2_PACKAGE_GLSLSANDBOX_PLAYER_NULL + bool "NullWS" + help + Enable Null Windowing System + config BR2_PACKAGE_GLSLSANDBOX_PLAYER_KMS bool "KMS/DRM/GBM" depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm + depends on BR2_PACKAGE_HAS_LIBGBM select BR2_PACKAGE_LIBDRM config BR2_PACKAGE_GLSLSANDBOX_PLAYER_MALI @@ -108,10 +111,12 @@ endchoice if BR2_PACKAGE_GLSLSANDBOX_PLAYER_WL config BR2_PACKAGE_GLSLSANDBOX_PLAYER_WL_IVI bool "Wayland IVI shell support" -endif +config BR2_PACKAGE_GLSLSANDBOX_PLAYER_WL_XDG + bool "Wayland XDG shell support" + select BR2_PACKAGE_WAYLAND_PROTOCOLS +endif endif -comment "glslsandbox-player needs a toolchain w/ threads and an openGL ES and EGL driver" - depends on !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_PACKAGE_HAS_LIBEGL || !BR2_PACKAGE_HAS_LIBGLES +comment "glslsandbox-player needs openGL ES and EGL driver" + depends on !BR2_PACKAGE_HAS_LIBEGL || !BR2_PACKAGE_HAS_LIBGLES diff --git a/package/glslsandbox-player/glslsandbox-player.mk b/package/glslsandbox-player/glslsandbox-player.mk index c5fbf062b7a..241f3475d2c 100644 --- a/package/glslsandbox-player/glslsandbox-player.mk +++ b/package/glslsandbox-player/glslsandbox-player.mk @@ -12,6 +12,11 @@ GLSLSANDBOX_PLAYER_DEPENDENCIES = libegl libgles host-pkgconf GLSLSANDBOX_PLAYER_LICENSE = BSD-2-Clause GLSLSANDBOX_PLAYER_LICENSE_FILES = LICENSE +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +GLSLSANDBOX_PLAYER_DEPENDENCIES += libexecinfo +GLSLSANDBOX_PLAYER_CONF_ENV += LIBS="-lexecinfo" +endif + ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_PNG),y) GLSLSANDBOX_PLAYER_DEPENDENCIES += libpng GLSLSANDBOX_PLAYER_CONF_OPTS += --with-libpng @@ -36,10 +41,10 @@ else GLSLSANDBOX_PLAYER_CONF_OPTS += --disable-install-scripts endif -ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_KMS),y) -# gbm dependency is not needed, as it is normally packaged with -# libegl/libgles drivers. -GLSLSANDBOX_PLAYER_DEPENDENCIES += libdrm +ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_NULL),y) +GLSLSANDBOX_PLAYER_CONF_OPTS += --with-native-gfx=nullws +else ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_KMS),y) +GLSLSANDBOX_PLAYER_DEPENDENCIES += libdrm libgbm GLSLSANDBOX_PLAYER_CONF_OPTS += --with-native-gfx=kms else ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_MALI),y) GLSLSANDBOX_PLAYER_DEPENDENCIES += sunxi-mali-utgard @@ -67,6 +72,12 @@ GLSLSANDBOX_PLAYER_CONF_OPTS += --enable-ivi else GLSLSANDBOX_PLAYER_CONF_OPTS += --disable-ivi endif +ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_WL_XDG),y) +GLSLSANDBOX_PLAYER_DEPENDENCIES += wayland-protocols +GLSLSANDBOX_PLAYER_CONF_OPTS += --enable-wlxdg +else +GLSLSANDBOX_PLAYER_CONF_OPTS += --disable-wlxdg +endif else ifeq ($(BR2_PACKAGE_GLSLSANDBOX_PLAYER_X11),y) GLSLSANDBOX_PLAYER_DEPENDENCIES += xlib_libX11 GLSLSANDBOX_PLAYER_CONF_OPTS += --with-native-gfx=x11 diff --git a/package/gmp/gmp.mk b/package/gmp/gmp.mk index 9b402767fd8..a077c89d927 100644 --- a/package/gmp/gmp.mk +++ b/package/gmp/gmp.mk @@ -23,6 +23,11 @@ ifeq ($(BR2_m68k_cf)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6)$(BR2_ARM_CP GMP_CONF_OPTS += --disable-assembly endif +# GMP needs M extension for riscv assembly +ifeq ($(BR2_riscv):$(BR2_RISCV_ISA_CUSTOM_RVM),y:) +GMP_CONF_OPTS += --disable-assembly +endif + ifeq ($(BR2_INSTALL_LIBSTDCPP),y) GMP_CONF_OPTS += --enable-cxx else diff --git a/package/gmrender-resurrect/Config.in b/package/gmrender-resurrect/Config.in index db655ad7f43..de52410a73a 100644 --- a/package/gmrender-resurrect/Config.in +++ b/package/gmrender-resurrect/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_GMRENDER_RESURRECT bool "gmrender-resurrect" depends on BR2_USE_WCHAR # gstreamer1 -> libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # gstreamer1 -> libglib2, libupnp + depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # gstreamer1 select BR2_PACKAGE_GSTREAMER1 select BR2_PACKAGE_GST1_PLUGINS_BASE # run-time only diff --git a/package/gmrender-resurrect/gmrender-resurrect.hash b/package/gmrender-resurrect/gmrender-resurrect.hash index 526b2b6c342..f14abffc3b9 100644 --- a/package/gmrender-resurrect/gmrender-resurrect.hash +++ b/package/gmrender-resurrect/gmrender-resurrect.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c3a9c80c7058a9a1f32175da25a564fb3021a7055c2df3941e8da8860a509009 gmrender-resurrect-0.0.9.tar.gz +sha256 550b07bc6a073176ad7de0efd603663c9875311dfb81ae1075263e3fd6974335 gmrender-resurrect-0.1.tar.gz sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 COPYING diff --git a/package/gmrender-resurrect/gmrender-resurrect.mk b/package/gmrender-resurrect/gmrender-resurrect.mk index 4a7efd71ab6..77ac83ca410 100644 --- a/package/gmrender-resurrect/gmrender-resurrect.mk +++ b/package/gmrender-resurrect/gmrender-resurrect.mk @@ -4,7 +4,7 @@ # ################################################################################ -GMRENDER_RESURRECT_VERSION = 0.0.9 +GMRENDER_RESURRECT_VERSION = 0.1 GMRENDER_RESURRECT_SITE = $(call github,hzeller,gmrender-resurrect,v$(GMRENDER_RESURRECT_VERSION)) # Original distribution does not have default configure, # so we need to autoreconf: diff --git a/package/gnu-efi/0001-Make.defaults-don-t-override-ARCH-when-cross-compili.patch b/package/gnu-efi/0001-Make.defaults-don-t-override-ARCH-when-cross-compili.patch index c2565417812..2eb9c5a0628 100644 --- a/package/gnu-efi/0001-Make.defaults-don-t-override-ARCH-when-cross-compili.patch +++ b/package/gnu-efi/0001-Make.defaults-don-t-override-ARCH-when-cross-compili.patch @@ -1,4 +1,4 @@ -From 3452721eafae90749f4af63264c412f398460b15 Mon Sep 17 00:00:00 2001 +From b2dbeec5063265eb0121342c24a900a4888712a7 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 20 Jan 2019 21:07:11 +0100 Subject: [PATCH] Make.defaults: don't override ARCH when cross-compiling @@ -15,18 +15,18 @@ Signed-off-by: Fabrice Fontaine 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Make.defaults b/Make.defaults -index ba743f1..a0e5632 100755 +index 47ed361..7420344 100755 --- a/Make.defaults +++ b/Make.defaults @@ -67,7 +67,7 @@ ARCH ?= $(shell $(HOSTCC) -dumpmachine | cut -f1 -d- | sed -e s,i[345678 # Get ARCH from the compiler if cross compiling ifneq ($(CROSS_COMPILE),) -- override ARCH := $(shell $(CC) -dumpmachine | cut -f1 -d-| sed -e s,i[3456789]86,ia32, -e 's,armv7.*,arm,' ) -+ ARCH := $(shell $(CC) -dumpmachine | cut -f1 -d-| sed -e s,i[3456789]86,ia32, -e 's,armv7.*,arm,' ) +- override ARCH := $(shell $(CC) -dumpmachine | cut -f1 -d-| sed -e s,i[3456789]86,ia32, -e 's,armv[67].*,arm,' ) ++ ARCH := $(shell $(CC) -dumpmachine | cut -f1 -d-| sed -e s,i[3456789]86,ia32, -e 's,armv[67].*,arm,' ) endif # FreeBSD (and possibly others) reports amd64 instead of x86_64 -- -2.14.1 +2.36.1 diff --git a/package/gnu-efi/0002-Revert-efilink-fix-build-with-gcc-4.8.patch b/package/gnu-efi/0002-Revert-efilink-fix-build-with-gcc-4.8.patch deleted file mode 100644 index 5a08c242542..00000000000 --- a/package/gnu-efi/0002-Revert-efilink-fix-build-with-gcc-4.8.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 1f7b2e5bd6603b30202a66b6317a41e2be85742b Mon Sep 17 00:00:00 2001 -From: Esben Haabendal -Date: Tue, 26 Mar 2019 13:37:02 +0100 -Subject: [PATCH] Revert "efilink: fix build with gcc 4.8" - -This reverts commit 6335e5c697c57d8b5854b8202de3733bcb151ca6, as it breaks -gcc builds with '-nostdinc' flag. - -The fix in 1a53d8f88a452847b25f9689f9a08dbcf82c86e4 -(Fix for problem with undeclared intptr_t type), which is also merged -fixes the same problem, without causing breakage. - -Signed-off-by: Esben Haabendal -Signed-off-by: James Hilliard -[Upstream status: -https://sourceforge.net/p/gnu-efi/code/merge-requests/6/] ---- - inc/efilink.h | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/inc/efilink.h b/inc/efilink.h -index b69a6fd..cc5aa2d 100644 ---- a/inc/efilink.h -+++ b/inc/efilink.h -@@ -1,10 +1,6 @@ - #ifndef _EFI_LINK_H - #define _EFI_LINK_H - --#if defined(__GNUC__) --#include --#endif -- - /*++ - - Copyright (c) 1998 Intel Corporation --- -2.20.1 - diff --git a/package/gnu-efi/gnu-efi.hash b/package/gnu-efi/gnu-efi.hash index bf9792b290e..251a99e5d7a 100644 --- a/package/gnu-efi/gnu-efi.hash +++ b/package/gnu-efi/gnu-efi.hash @@ -1,6 +1,6 @@ # From http://sourceforge.net/projects/gnu-efi/files -md5 960a8379b6f95ee73d7778b70bf2a089 gnu-efi-3.0.10.tar.bz2 -sha1 a51b81eda97c0acbf3ac86123f298d3c0e396ce5 gnu-efi-3.0.10.tar.bz2 +md5 192d94e995ddd4ebdce4903adfd06039 gnu-efi-3.0.15.tar.bz2 +sha1 40c8a4715cf8c409a093c8d2ca9f5d5b24d73058 gnu-efi-3.0.15.tar.bz2 # Locally computed -sha256 f12082a3a5f0c3e38c67262a9f34245d139ac2cdfc0a0bdcf03c9b1f56fa4fed gnu-efi-3.0.10.tar.bz2 -sha256 42d352e9c28dd446fd0209cd6f75588c8e41f0934540bb382bbd61c752360265 README.efilib +sha256 931a257b9c5c1ba65ff519f18373c438a26825f2db7866b163e96d1b168f20ea gnu-efi-3.0.15.tar.bz2 +sha256 42d352e9c28dd446fd0209cd6f75588c8e41f0934540bb382bbd61c752360265 README.efilib diff --git a/package/gnu-efi/gnu-efi.mk b/package/gnu-efi/gnu-efi.mk index 06bf2547385..93b58883703 100644 --- a/package/gnu-efi/gnu-efi.mk +++ b/package/gnu-efi/gnu-efi.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNU_EFI_VERSION = 3.0.10 +GNU_EFI_VERSION = 3.0.15 GNU_EFI_SOURCE = gnu-efi-$(GNU_EFI_VERSION).tar.bz2 GNU_EFI_SITE = http://downloads.sourceforge.net/project/gnu-efi GNU_EFI_INSTALL_STAGING = YES diff --git a/package/gnupg/Config.in b/package/gnupg/Config.in index 2db46318f1f..e92fca709d9 100644 --- a/package/gnupg/Config.in +++ b/package/gnupg/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_GNUPG bool "gnupg" - depends on !BR2_PACKAGE_GNUPG2 select BR2_PACKAGE_ZLIB help GnuPG is the GNU project's complete and free implementation diff --git a/package/gnupg2/Config.in b/package/gnupg2/Config.in index ef1817ef02d..043d53554ce 100644 --- a/package/gnupg2/Config.in +++ b/package/gnupg2/Config.in @@ -2,12 +2,22 @@ comment "gnupg2 needs a toolchain w/ threads and dynamic library support" depends on BR2_USE_MMU depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS -config BR2_PACKAGE_GNUPG2 - bool "gnupg2" +# helper to make it easier to select gnupg2 or gnupg; usage: +# select BR2_PACKAGE_GNUPG2 if BR2_PACKAGE_GNUPG2_DEPENDS && !BR2_PACKAGE_GNUPG +# select BR2_PACKAGE_GNUPG if !BR2_PACKAGE_GNUPG2_DEPENDS + +config BR2_PACKAGE_GNUPG2_DEPENDS + bool + default y depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgpg-error depends on BR2_TOOLCHAIN_HAS_THREADS # libnpth depends on BR2_USE_MMU # libassuan, libnpth depends on !BR2_STATIC_LIBS + +config BR2_PACKAGE_GNUPG2 + bool "gnupg2" + depends on BR2_PACKAGE_GNUPG2_DEPENDS + depends on !BR2_PACKAGE_GNUPG select BR2_PACKAGE_ZLIB select BR2_PACKAGE_LIBGPG_ERROR select BR2_PACKAGE_LIBGCRYPT diff --git a/package/gnupg2/gnupg2.hash b/package/gnupg2/gnupg2.hash index caf5dcc8830..aa71881f419 100644 --- a/package/gnupg2/gnupg2.hash +++ b/package/gnupg2/gnupg2.hash @@ -1,7 +1,5 @@ -# From https://lists.gnupg.org/pipermail/gnupg-announce/2021q2/000460.html -sha1 81684626720c91060ae9920936c768df9fc8b2f6 gnupg-2.2.32.tar.bz2 -# Calculated based on the hash above and signature -# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.32.tar.bz2.sig -# using key 6DAA6E64A76D2840571B4902528897B826403ADA -sha256 b2571b35f82c63e7d278aa6a1add0d73453dc14d3f0854be490c844fca7e0614 gnupg-2.2.32.tar.bz2 +# From https://www.gnupg.org/download/integrity_check.html +sha1 3efd495a94dc81fd0ea8788bef6c69d1f13cedd7 gnupg-2.4.2.tar.bz2 +sha256 97eb47df8ae5a3ff744f868005a090da5ab45cb48ee9836dbf5ee739a4e5cf49 gnupg-2.4.2.tar.bz2 +# Locally calculated sha256 bc2d6664f6276fa0a72d57633b3ae68dc7dcb677b71018bf08c8e93e509f1357 COPYING diff --git a/package/gnupg2/gnupg2.mk b/package/gnupg2/gnupg2.mk index 906b79e0abd..760af3b05e3 100644 --- a/package/gnupg2/gnupg2.mk +++ b/package/gnupg2/gnupg2.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUPG2_VERSION = 2.2.32 +GNUPG2_VERSION = 2.4.2 GNUPG2_SOURCE = gnupg-$(GNUPG2_VERSION).tar.bz2 GNUPG2_SITE = https://gnupg.org/ftp/gcrypt/gnupg GNUPG2_LICENSE = GPL-3.0+ @@ -16,13 +16,17 @@ GNUPG2_DEPENDENCIES = zlib libgpg-error libgcrypt libassuan libksba libnpth \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) host-pkgconf GNUPG2_CONF_OPTS = \ - --disable-rpath --disable-regex \ + --disable-rpath \ --with-libgpg-error-prefix=$(STAGING_DIR)/usr \ --with-libgcrypt-prefix=$(STAGING_DIR)/usr \ --with-libassuan-prefix=$(STAGING_DIR)/usr \ --with-ksba-prefix=$(STAGING_DIR)/usr \ --with-npth-prefix=$(STAGING_DIR)/usr +# Force the path to "gpgrt-config" (from the libgpg-error package) to +# avoid using the one on host, if present. +GNUPG2_CONF_ENV += GPGRT_CONFIG=$(STAGING_DIR)/usr/bin/gpgrt-config + ifneq ($(BR2_PACKAGE_GNUPG2_GPGV),y) define GNUPG2_REMOVE_GPGV rm -f $(TARGET_DIR)/usr/bin/gpgv diff --git a/package/gnuplot/gnuplot.hash b/package/gnuplot/gnuplot.hash index 1cc14973d18..de0741d609d 100644 --- a/package/gnuplot/gnuplot.hash +++ b/package/gnuplot/gnuplot.hash @@ -1,6 +1,6 @@ -# From https://sourceforge.net/projects/gnuplot/files/gnuplot/5.4.2/ -md5 9bb03cfa77e38924e08ffbb9eb59d8b1 gnuplot-5.4.3.tar.gz -sha1 c4b60fd7a700b22fa62b14829cbb0e17911627c9 gnuplot-5.4.3.tar.gz +# From https://sourceforge.net/projects/gnuplot/files/gnuplot/5.4.6/ +md5 da719235bb2f46830f9d2101d04b14a5 gnuplot-5.4.6.tar.gz +sha1 31ea0c00af5c156e5d068e3b1cc2fb1847f471ab gnuplot-5.4.6.tar.gz # Locally computed -sha256 51f89bbab90f96d3543f95235368d188eb1e26eda296912256abcd3535bd4d84 gnuplot-5.4.3.tar.gz +sha256 02fc27918200ed64d8f0c3b84fe81b95b59cd47ad99f270939ae497c19f27419 gnuplot-5.4.6.tar.gz sha256 895928ec0735cca1c8cec42656c7e314a065d0242813bb8693c0c1bf61fd4e4d Copyright diff --git a/package/gnuplot/gnuplot.mk b/package/gnuplot/gnuplot.mk index 6cf36a09974..c49fbc497d4 100644 --- a/package/gnuplot/gnuplot.mk +++ b/package/gnuplot/gnuplot.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUPLOT_VERSION = 5.4.3 +GNUPLOT_VERSION = 5.4.6 GNUPLOT_SITE = http://downloads.sourceforge.net/project/gnuplot/gnuplot/$(GNUPLOT_VERSION) GNUPLOT_LICENSE = gnuplot license (open source) GNUPLOT_LICENSE_FILES = Copyright diff --git a/package/gnuradio/0001-blocks-Including-missing-vector-in-blockinterleaver.patch b/package/gnuradio/0001-blocks-Including-missing-vector-in-blockinterleaver.patch new file mode 100644 index 00000000000..39b8c0b51eb --- /dev/null +++ b/package/gnuradio/0001-blocks-Including-missing-vector-in-blockinterleaver.patch @@ -0,0 +1,42 @@ +From 45fe4ac55ad88b6793d225e676205c30388ec138 Mon Sep 17 00:00:00 2001 +From: Ryan Volz +Date: Fri, 16 Sep 2022 21:05:51 -0400 +Subject: [PATCH] blocks: Including missing in blockinterleaver. + +Signed-off-by: Ryan Volz +[Retrieved (and backported) from: +https://github.com/gnuradio/gnuradio/commit/463c3477549b26b32d9b73eef30044e97c4eee64] +Signed-off-by: Gwenhael Goavec-Merou +--- + gr-blocks/include/gnuradio/blocks/blockinterleaving.h | 2 +- + gr-blocks/lib/blockinterleaving.cc | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/gr-blocks/include/gnuradio/blocks/blockinterleaving.h b/gr-blocks/include/gnuradio/blocks/blockinterleaving.h +index 9d4e0f249..df831fe5a 100644 +--- a/gr-blocks/include/gnuradio/blocks/blockinterleaving.h ++++ b/gr-blocks/include/gnuradio/blocks/blockinterleaving.h +@@ -12,7 +12,7 @@ + #define INCLUDED_GR_BLOCKS_BLOCKINTERLEAVING_H + + #include +- ++#include + + namespace gr { + namespace blocks { +diff --git a/gr-blocks/lib/blockinterleaving.cc b/gr-blocks/lib/blockinterleaving.cc +index fc5873e11..768ad9ea7 100644 +--- a/gr-blocks/lib/blockinterleaving.cc ++++ b/gr-blocks/lib/blockinterleaving.cc +@@ -12,6 +12,7 @@ + #include + #include + #include ++#include + + namespace gr { + namespace blocks { +-- +2.35.1 + diff --git a/package/gnuradio/0002-blocks-blockinterleaving.h-add-missing-cstddef-heade.patch b/package/gnuradio/0002-blocks-blockinterleaving.h-add-missing-cstddef-heade.patch new file mode 100644 index 00000000000..f1ad77580f7 --- /dev/null +++ b/package/gnuradio/0002-blocks-blockinterleaving.h-add-missing-cstddef-heade.patch @@ -0,0 +1,33 @@ +From 901c2ad1ac88908a2e6db5615d5af39a218d826d Mon Sep 17 00:00:00 2001 +From: Gwenhael Goavec-Merou +Date: Fri, 23 Sep 2022 08:41:26 +0200 +Subject: [PATCH] blocks/blockinterleaving.h: add missing cstddef header + (required for size_t) + +Fix build failure like: + +gnuradio/gr-blocks/lib/../include/gnuradio/blocks/blockinterleaving.h:25:36: error: ‘size_t’ was not declared in this scope + +This failure is due to the miss of cstddef include + +Signed-off-by: Gwenhael Goavec-Merou +[Upstream status: https://github.com/gnuradio/gnuradio/pull/6188] +--- + gr-blocks/include/gnuradio/blocks/blockinterleaving.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/gr-blocks/include/gnuradio/blocks/blockinterleaving.h b/gr-blocks/include/gnuradio/blocks/blockinterleaving.h +index df831fe5a..33c59e35b 100644 +--- a/gr-blocks/include/gnuradio/blocks/blockinterleaving.h ++++ b/gr-blocks/include/gnuradio/blocks/blockinterleaving.h +@@ -13,6 +13,7 @@ + + #include + #include ++#include + + namespace gr { + namespace blocks { +-- +2.35.1 + diff --git a/package/gnuradio/Config.in b/package/gnuradio/Config.in index 8df738ebb5d..21e87720cc2 100644 --- a/package/gnuradio/Config.in +++ b/package/gnuradio/Config.in @@ -1,11 +1,12 @@ -comment "gnuradio needs a toolchain w/ C++, NPTL, wchar, dynamic library" +comment "gnuradio needs a toolchain w/ C++, NPTL, wchar, dynamic library, gcc >= 8" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS + !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_8 -comment "gnuradio needs a toolchain not affected by GCC bug 64735" - depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 +comment "gnuradio needs a toolchain not affected by GCC bug 43744" + depends on BR2_TOOLCHAIN_HAS_GCC_BUG_43744 config BR2_PACKAGE_GNURADIO bool "gnuradio" @@ -15,20 +16,20 @@ config BR2_PACKAGE_GNURADIO depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_USE_MMU # use fork() depends on BR2_USE_WCHAR # boost - depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-atomic - depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # boost-thread - select BR2_PACKAGE_SPDLOG - select BR2_PACKAGE_BOOST + depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-atomic, boost-thread + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_43744 + select BR2_PACKAGE_BOOST select BR2_PACKAGE_BOOST_ATOMIC select BR2_PACKAGE_BOOST_DATE_TIME - select BR2_PACKAGE_BOOST_FILESYSTEM select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS select BR2_PACKAGE_BOOST_REGEX select BR2_PACKAGE_BOOST_SYSTEM select BR2_PACKAGE_BOOST_THREAD select BR2_PACKAGE_LOG4CPP select BR2_PACKAGE_GMP - select BR2_PACKAGE_VOLK + select BR2_PACKAGE_SPDLOG + select BR2_PACKAGE_VOLK help GNU Radio is a free & open-source software development toolkit that provides signal processing blocks to implement @@ -81,6 +82,7 @@ config BR2_PACKAGE_GNURADIO_PYTHON depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy select BR2_PACKAGE_BOOST_PYTHON select BR2_PACKAGE_PYTHON_NUMPY # runtime + select BR2_PACKAGE_PYTHON_PYBIND select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_PYBIND help @@ -134,6 +136,12 @@ config BR2_PACKAGE_GNURADIO_FILTER help Filter signal processing blocks +config BR2_PACKAGE_GNURADIO_NETWORK + bool "gr-network support" + select BR2_PACKAGE_GNURADIO_BLOCKS + help + TCP and UDP source/sink blocks + config BR2_PACKAGE_GNURADIO_QTGUI bool "gr-qtgui" depends on BR2_PACKAGE_GNURADIO_PYTHON diff --git a/package/gnuradio/gnuradio.hash b/package/gnuradio/gnuradio.hash index 105560d2aa3..efa0bb462b0 100644 --- a/package/gnuradio/gnuradio.hash +++ b/package/gnuradio/gnuradio.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 957108a67ec75d99adaad8f3b10be8ae08760a9cef0b659a5c815a4e33898a75 v3.10.3.0.tar.gz +sha256 c6b9f59447a842559b00b3a67b4ca1186e9adb8db742b25400507fedc747f2bd gnuradio-3.10.4.0.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index 91c89f145a4..064c6d7a165 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -4,34 +4,25 @@ # ################################################################################ -GNURADIO_VERSION = 3.10.3.0 -GNURADIO_SOURCE = v$(GNURADIO_VERSION).tar.gz -GNURADIO_SITE = https://github.com/gnuradio/gnuradio/archive/refs/tags +GNURADIO_VERSION = 3.10.4.0 +GNURADIO_SITE = $(call github,gnuradio,gnuradio,v$(GNURADIO_VERSION)) GNURADIO_LICENSE = GPL-3.0+ GNURADIO_LICENSE_FILES = COPYING -GNURADIO_SUPPORTS_IN_SOURCE_BUILD = NO -# needed to determine site-packages path -GNURADIO_PYVER = $(PYTHON3_VERSION_MAJOR) +GNURADIO_SUPPORTS_IN_SOURCE_BUILD = NO -# host-python-mako and host-python-six are needed for volk to compile GNURADIO_DEPENDENCIES = \ host-python3 \ - python-pip \ - python-pybind \ - host-python-numpy \ - host-python-packaging \ - host-python-mako \ - host-python-six \ boost \ - spdlog \ log4cpp \ gmp \ + spdlog \ volk GNURADIO_CONF_OPTS = \ -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python \ -DENABLE_DEFAULT=OFF \ + -DENABLE_EXAMPLES=OFF \ -DENABLE_GNURADIO_RUNTIME=ON \ -DENABLE_TESTING=OFF \ -DXMLTO_EXECUTABLE=NOTFOUND @@ -44,13 +35,6 @@ ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) GNURADIO_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic endif -ifeq ($(BR2_PACKAGE_ORC),y) -GNURADIO_DEPENDENCIES += orc -GNURADIO_CONF_OPTS += -DENABLE_ORC=ON -else -GNURADIO_CONF_OPTS += -DENABLE_ORC=OFF -endif - ifeq ($(BR2_PACKAGE_GNURADIO_ANALOG),y) GNURADIO_CONF_OPTS += -DENABLE_GR_ANALOG=ON else @@ -71,6 +55,9 @@ endif ifeq ($(BR2_PACKAGE_GNURADIO_BLOCKS),y) GNURADIO_CONF_OPTS += -DENABLE_GR_BLOCKS=ON +ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) +GNURADIO_DEPENDENCIES += libsndfile +endif else GNURADIO_CONF_OPTS += -DENABLE_GR_BLOCKS=OFF endif @@ -119,25 +106,31 @@ else GNURADIO_CONF_OPTS += -DENABLE_GR_FILTER=OFF endif +ifeq ($(BR2_PACKAGE_GNURADIO_NETWORK),y) +GNURADIO_CONF_OPTS += -DENABLE_GR_NETWORK=ON +else +GNURADIO_CONF_OPTS += -DENABLE_GR_NETWORK=OFF +endif + ifeq ($(BR2_PACKAGE_GNURADIO_PYTHON),y) -GNURADIO_DEPENDENCIES += python3 +GNURADIO_DEPENDENCIES += python3 python-pybind \ + host-python-numpy host-python-packaging GNURADIO_CONF_OPTS += -DENABLE_PYTHON=ON +# mandatory to avoid pybind11 to overwrite variables provided +# by gnuradio and buildroot +GNURADIO_CONF_OPTS += -DPYBIND11_PYTHONLIBS_OVERWRITE=OFF +# mandatory to avoid pybind11 to force libraries extensions +# with a name based on host architecture +GNURADIO_CONF_ENV += _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ + PYTHONPATH=$(PYTHON3_PATH) # mandatory to install python modules in site-packages and to use # correct path for python libraries GNURADIO_CONF_OPTS += -DGR_PYTHON_RELATIVE=ON \ - -DGR_PYTHON_DIR=lib/python$(GNURADIO_PYVER)/site-packages \ - -DCMAKE_CXX_FLAGS="${TARGET_CXXFLAGS} -isystem $(STAGING_DIR)/usr/lib/python$(GNURADIO_PYVER)/site-packages/numpy/core/include" - #-Dpybind11_DIR="$(STAGING_DIR)/usr/lib/python$(GNURADIO_PYVER)/site-packages/pybind11/share/cmake/pybind11" + -DGR_PYTHON_DIR=lib/python$(PYTHON3_VERSION_MAJOR)/site-packages else GNURADIO_CONF_OPTS += -DENABLE_PYTHON=OFF endif -ifeq ($(BR2_PACKAGE_GNURADIO_PAGER),y) -GNURADIO_CONF_OPTS += -DENABLE_GR_PAGER=ON -else -GNURADIO_CONF_OPTS += -DENABLE_GR_PAGER=OFF -endif - ifeq ($(BR2_PACKAGE_GNURADIO_QTGUI),y) GNURADIO_DEPENDENCIES += qt5base python-pyqt5 qwt GNURADIO_CONF_OPTS += -DENABLE_GR_QTGUI=ON @@ -174,6 +167,4 @@ else GNURADIO_CONF_OPTS += -DENABLE_GR_ZEROMQ=OFF endif -GNURADIO_TARGET: $(GNURADIO_DEPENDENCIES) - $(eval $(cmake-package)) diff --git a/package/gnutls/Config.in b/package/gnutls/Config.in index d57bb8d1358..59af32bf1ef 100644 --- a/package/gnutls/Config.in +++ b/package/gnutls/Config.in @@ -2,12 +2,10 @@ config BR2_PACKAGE_GNUTLS bool "gnutls" # https://gitlab.com/gnutls/gnutls/issues/203 depends on !BR2_STATIC_LIBS - # gnulib requires a library that implements wctomb(). - # This is noticed only when linking with libgnutls.so. depends on BR2_USE_WCHAR select BR2_PACKAGE_LIBTASN1 + select BR2_PACKAGE_LIBUNISTRING select BR2_PACKAGE_NETTLE - select BR2_PACKAGE_PCRE help GnuTLS is a secure communications library implementing the SSL and TLS protocols and technologies around them. diff --git a/package/gnutls/gnutls.hash b/package/gnutls/gnutls.hash index 2ffc6c1b4e5..303f1351e07 100644 --- a/package/gnutls/gnutls.hash +++ b/package/gnutls/gnutls.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/gnutls-3.7.3.tar.xz.sig -sha256 fc59c43bc31ab20a6977ff083029277a31935b8355ce387b634fa433f8f6c49a gnutls-3.7.3.tar.xz +# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/gnutls-3.7.8.tar.xz.sig +sha256 c58ad39af0670efe6a8aee5e3a8b2331a1200418b64b7c51977fb396d4617114 gnutls-3.7.8.tar.xz # Locally calculated sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b doc/COPYING sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 doc/COPYING.LESSER diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index 7317a3bb1e6..6e2cc501ef2 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -4,19 +4,15 @@ # ################################################################################ +# When bumping, make sure *all* --without-libfoo-prefix options are in GNUTLS_CONF_OPTS GNUTLS_VERSION_MAJOR = 3.7 -GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).3 +GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).8 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 -ifeq ($(BR2_PACKAGE_GNUTLS_OPENSSL),y) -GNUTLS_LICENSE += , GPL-3.0+ (gnutls-openssl library) -GNUTLS_LICENSE_FILES += doc/COPYING -endif - -GNUTLS_DEPENDENCIES = host-pkgconf libtasn1 nettle pcre +GNUTLS_DEPENDENCIES = host-pkgconf libtasn1 libunistring nettle GNUTLS_CPE_ID_VENDOR = gnu GNUTLS_CONF_OPTS = \ --disable-doc \ @@ -24,11 +20,17 @@ GNUTLS_CONF_OPTS = \ --disable-libdane \ --disable-rpath \ --disable-tests \ - --enable-local-libopts \ - --enable-openssl-compatibility \ - --with-librt-prefix=$(STAGING_DIR) \ + --without-included-unistring \ + --without-libcrypto-prefix \ + --without-libdl-prefix \ + --without-libev-prefix \ + --without-libiconv-prefix \ + --without-libintl-prefix \ + --without-libpthread-prefix \ + --without-libseccomp-prefix \ + --without-librt-prefix \ + --without-libz-prefix \ --without-tpm \ - $(if $(BR2_PACKAGE_GNUTLS_OPENSSL),--enable,--disable)-openssl-compatibility \ $(if $(BR2_PACKAGE_GNUTLS_TOOLS),--enable-tools,--disable-tools) \ $(if $(BR2_PACKAGE_GNUTLS_ENABLE_SSL2),--enable,--disable)-ssl2-support \ $(if $(BR2_PACKAGE_GNUTLS_ENABLE_GOST),--enable,--disable)-gost @@ -39,16 +41,45 @@ GNUTLS_CONF_ENV = gl_cv_socket_ipv6=yes \ gl_cv_func_gettimeofday_clobber=no GNUTLS_INSTALL_STAGING = YES -# libpthread autodetection poison the linkpath -GNUTLS_CONF_OPTS += $(if $(BR2_TOOLCHAIN_HAS_THREADS),--with-libpthread-prefix=$(STAGING_DIR)/usr) +HOST_GNUTLS_DEPENDENCIES = host-pkgconf host-libtasn1 host-libunistring host-nettle +HOST_GNUTLS_CONF_OPTS = \ + --disable-doc \ + --disable-guile \ + --disable-libdane \ + --disable-rpath \ + --disable-tests \ + --without-included-unistring \ + --without-libcrypto-prefix \ + --without-libdl-prefix \ + --without-libev-prefix \ + --without-libiconv-prefix \ + --without-libintl-prefix \ + --without-libpthread-prefix \ + --without-libseccomp-prefix \ + --without-librt-prefix \ + --without-libz-prefix \ + --without-tpm \ + --disable-openssl-compatibility \ + --without-libbrotli \ + --without-idn \ + --without-p11-kit \ + --without-zlib \ + --without-libzstd + +ifeq ($(BR2_PACKAGE_GNUTLS_OPENSSL),y) +GNUTLS_LICENSE += , GPL-3.0+ (gnutls-openssl library) +GNUTLS_LICENSE_FILES += doc/COPYING +GNUTLS_CONF_OPTS += --enable-openssl-compatibility +else +GNUTLS_CONF_OPTS += --disable-openssl-compatibility +endif -# gnutls needs libregex, but pcre can be used too -# The check isn't cross-compile friendly -GNUTLS_CONF_ENV += libopts_cv_with_libregex=yes -GNUTLS_CONF_OPTS += \ - --with-regex-header=pcreposix.h \ - --with-libregex-cflags="`$(PKG_CONFIG_HOST_BINARY) libpcreposix --cflags`" \ - --with-libregex-libs="`$(PKG_CONFIG_HOST_BINARY) libpcreposix --libs`" +ifeq ($(BR2_PACKAGE_BROTLI),y) +GNUTLS_CONF_OPTS += --with-libbrotli +GNUTLS_DEPENDENCIES += brotli +else +GNUTLS_CONF_OPTS += --without-libbrotli +endif ifeq ($(BR2_PACKAGE_CRYPTODEV_LINUX),y) GNUTLS_CONF_OPTS += --enable-cryptodev @@ -69,11 +100,18 @@ else GNUTLS_CONF_OPTS += --without-p11-kit endif -ifeq ($(BR2_PACKAGE_LIBUNISTRING),y) -GNUTLS_CONF_OPTS += --with-libunistring-prefix=$(STAGING_DIR)/usr -GNUTLS_DEPENDENCIES += libunistring +ifeq ($(BR2_PACKAGE_ZLIB),y) +GNUTLS_CONF_OPTS += --with-zlib +GNUTLS_DEPENDENCIES += zlib +else +GNUTLS_CONF_OPTS += --without-zlib +endif + +ifeq ($(BR2_PACKAGE_ZSTD),y) +GNUTLS_CONF_OPTS += --with-libzstd +GNUTLS_DEPENDENCIES += zstd else -GNUTLS_CONF_OPTS += --with-included-unistring +GNUTLS_CONF_OPTS += --without-libzstd endif # Provide a default CA cert location @@ -90,3 +128,4 @@ endif GNUTLS_CONF_ENV += LIBS="$(GNUTLS_LIBS)" $(eval $(autotools-package)) +$(eval $(host-autotools-package)) diff --git a/package/go/0001-build.go-explicit-option-for-crosscompilation.patch b/package/go/0001-build.go-explicit-option-for-crosscompilation.patch index f76c5b1d03c..992a83a644d 100644 --- a/package/go/0001-build.go-explicit-option-for-crosscompilation.patch +++ b/package/go/0001-build.go-explicit-option-for-crosscompilation.patch @@ -1,4 +1,4 @@ -From e1382a731a726293e30901038c6870fa77ef6095 Mon Sep 17 00:00:00 2001 +From 6aed475557032a7ff9009e9b4b691b40b561876a Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Tue, 8 May 2018 16:08:44 +0200 Subject: [PATCH] build.go: explicit option for crosscompilation @@ -17,10 +17,10 @@ Signed-off-by: Anisse Astier 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go -index 99d1db5..eb4097f 100644 +index 7c44c4a605..03500920c4 100644 --- a/src/cmd/dist/build.go +++ b/src/cmd/dist/build.go -@@ -252,12 +252,13 @@ func xinit() { +@@ -286,12 +286,13 @@ func xinit() { // $CC_FOR_goos_goarch, if set, applies only to goos/goarch. func compilerEnv(envName, def string) map[string]string { m := map[string]string{"": def} @@ -36,5 +36,5 @@ index 99d1db5..eb4097f 100644 } m[""] = env -- -2.7.4 +2.35.1 diff --git a/package/go/0003-runtime-support-riscv64-SV57-mode.patch b/package/go/0003-runtime-support-riscv64-SV57-mode.patch new file mode 100644 index 00000000000..f51c2ca093f --- /dev/null +++ b/package/go/0003-runtime-support-riscv64-SV57-mode.patch @@ -0,0 +1,65 @@ +From 6618c7af436488fa12018cdcd31eeedb3a698745 Mon Sep 17 00:00:00 2001 +From: Dmitry Vyukov +Date: Fri, 27 May 2022 18:55:35 +0200 +Subject: [PATCH] runtime: support riscv64 SV57 mode + +Riscv64 has SV57 mode when user-space VA is 56 bits. +Linux kernel recently got support for this mode and Go binaries started crashing as: + +runtime: lfstack.push invalid packing: node=0xffffff5908a940 cnt=0x1 +packed=0xffff5908a9400001 -> node=0xffff5908a940 + +Adjust lfstack code to use only 8 top bits of pointers on riscv64. + +For context see: +https://groups.google.com/g/syzkaller-bugs/c/lU0GQTZoNQQ/m/O_c3vmE3AAAJ + +Update #54104 + +Change-Id: Ib5d3d6a79c0c6eddf11618d73fcc8bc1832a9c25 +Signed-off-by: Christian Stewart +--- + +Upstream: https://go-review.googlesource.com/c/go/+/409055/4 +--- + src/runtime/lfstack_64bit.go | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/src/runtime/lfstack_64bit.go b/src/runtime/lfstack_64bit.go +index 154130cf63..39fa647b9e 100644 +--- a/src/runtime/lfstack_64bit.go ++++ b/src/runtime/lfstack_64bit.go +@@ -36,12 +36,21 @@ const ( + // We use one bit to distinguish between the two ranges. + aixAddrBits = 57 + aixCntBits = 64 - aixAddrBits + 3 ++ ++ // Riscv64 SV57 mode gives 56 bits of userspace VA. ++ // lfstack code supports it, but broader support for SV57 mode is incomplete, ++ // and there may be other issues (see #54104). ++ riscv64AddrBits = 56 ++ riscv64CntBits = 64 - riscv64AddrBits + 3 + ) + + func lfstackPack(node *lfnode, cnt uintptr) uint64 { + if GOARCH == "ppc64" && GOOS == "aix" { + return uint64(uintptr(unsafe.Pointer(node)))<<(64-aixAddrBits) | uint64(cnt&(1<> aixCntBits << 3) | 0xa<<56))) + } ++ if GOARCH == "riscv64" { ++ return (*lfnode)(unsafe.Pointer(uintptr(val >> riscv64CntBits << 3))) ++ } + return (*lfnode)(unsafe.Pointer(uintptr(val >> cntBits << 3))) + } +-- +2.35.1 + diff --git a/package/go/Config.in.host b/package/go/Config.in.host index e82ab6e81a1..ded02d3b3ac 100644 --- a/package/go/Config.in.host +++ b/package/go/Config.in.host @@ -5,10 +5,16 @@ config BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_ARCH_SUPPORTS depends on (BR2_arm && BR2_TOOLCHAIN_SUPPORTS_PIE) || BR2_aarch64 \ || BR2_i386 || BR2_x86_64 || BR2_powerpc64le \ - || BR2_mips64 || BR2_mips64el || BR2_s390x + || BR2_mips64 || BR2_mips64el || BR2_riscv || BR2_s390x depends on !BR2_ARM_CPU_ARMV4 # MIPS R6 support in Go has not yet been developed. depends on !BR2_MIPS_CPU_MIPS64R6 + # Go doesn't support Risc-v 32-bit. + depends on !BR2_RISCV_32 + # Go requires the following Risc-v General (G) features: + depends on !BR2_riscv || (BR2_RISCV_ISA_RVI && \ + BR2_RISCV_ISA_RVM && BR2_RISCV_ISA_RVA && \ + BR2_RISCV_ISA_RVF && BR2_RISCV_ISA_RVD) config BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS bool diff --git a/package/go/go.hash b/package/go/go.hash index 85e6adfb8c2..d61663cac9e 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ -# From https://golang.org/dl/ -sha256 2effcd898140da79a061f3784ca4f8d8b13d811fb2abe9dad2404442dabbdf7a go1.17.8.src.tar.gz +# From https://go.dev/dl +sha256 ccf36b53fb0024a017353c3ddb22c1f00bc7a8073c6aac79042da24ee34434d3 go1.19.13.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index 3df16c9a680..ea2a46f36c5 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.17.8 +GO_VERSION = 1.19.13 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz @@ -13,10 +13,10 @@ GO_LICENSE_FILES = LICENSE GO_CPE_ID_VENDOR = golang HOST_GO_DEPENDENCIES = host-go-bootstrap -HOST_GO_GOPATH = $(HOST_DIR)/usr/share/go-path -HOST_GO_HOST_CACHE = $(HOST_DIR)/usr/share/host-go-cache +HOST_GO_GOPATH = $(HOST_DIR)/share/go-path +HOST_GO_HOST_CACHE = $(HOST_DIR)/share/host-go-cache HOST_GO_ROOT = $(HOST_DIR)/lib/go -HOST_GO_TARGET_CACHE = $(HOST_DIR)/usr/share/go-cache +HOST_GO_TARGET_CACHE = $(HOST_DIR)/share/go-cache # We pass an empty GOBIN, otherwise "go install: cannot install # cross-compiled binaries when GOBIN is set" @@ -25,6 +25,8 @@ HOST_GO_COMMON_ENV = \ GOFLAGS=-mod=vendor \ GOROOT="$(HOST_GO_ROOT)" \ GOPATH="$(HOST_GO_GOPATH)" \ + GOCACHE="$(HOST_GO_TARGET_CACHE)" \ + GOMODCACHE="$(HOST_GO_GOPATH)/pkg/mod" \ GOPROXY=off \ PATH=$(BR_PATH) \ GOBIN= \ @@ -63,6 +65,8 @@ else ifeq ($(BR2_mips64),y) GO_GOARCH = mips64 else ifeq ($(BR2_mips64el),y) GO_GOARCH = mips64le +else ifeq ($(BR2_riscv),y) +GO_GOARCH = riscv64 else ifeq ($(BR2_s390x),y) GO_GOARCH = s390x endif @@ -71,8 +75,8 @@ endif HOST_GO_TOOLDIR = $(HOST_GO_ROOT)/pkg/tool/linux_$(GO_GOARCH) HOST_GO_TARGET_ENV = \ $(HOST_GO_COMMON_ENV) \ + GOOS="linux" \ GOARCH=$(GO_GOARCH) \ - GOCACHE="$(HOST_GO_TARGET_CACHE)" \ CC="$(TARGET_CC)" \ CXX="$(TARGET_CXX)" \ CGO_CFLAGS="$(TARGET_CFLAGS)" \ @@ -93,6 +97,7 @@ endif HOST_GO_CROSS_ENV = \ CC_FOR_TARGET="$(TARGET_CC)" \ CXX_FOR_TARGET="$(TARGET_CXX)" \ + GOOS="linux" \ GOARCH=$(GO_GOARCH) \ $(if $(GO_GO386),GO386=$(GO_GO386)) \ $(if $(GO_GOARM),GOARM=$(GO_GOARM)) \ @@ -107,6 +112,7 @@ endif # BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS # For the convenience of host golang packages HOST_GO_HOST_ENV = \ $(HOST_GO_COMMON_ENV) \ + GOOS="" \ GOARCH="" \ GOCACHE="$(HOST_GO_HOST_CACHE)" \ CC="$(HOSTCC_NOCCACHE)" \ diff --git a/package/gob2/gob2.hash b/package/gob2/gob2.hash index 7edf518f342..9cef2ed6121 100644 --- a/package/gob2/gob2.hash +++ b/package/gob2/gob2.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 f7ee84c07ca88ae96e5a60461957cc4dd0aa69d61804433d1c85de3d50be8026 gob2-2.0.20.tar.xz -sha256 b8a2f73f743dc1a51aff23f1aacbca4b868564db52496fa3c0caba755bfd1eaf COPYING -sha256 7222386392eecf784e2f0c406f412f238cb6d25865a8447ae0947b32bb569889 COPYING.generated-code +sha256 f7ee84c07ca88ae96e5a60461957cc4dd0aa69d61804433d1c85de3d50be8026 gob2-2.0.20.tar.xz +sha256 b8a2f73f743dc1a51aff23f1aacbca4b868564db52496fa3c0caba755bfd1eaf COPYING +sha256 7222386392eecf784e2f0c406f412f238cb6d25865a8447ae0947b32bb569889 COPYING.generated-code diff --git a/package/gobject-introspection/0001-disable-tests.patch b/package/gobject-introspection/0001-disable-tests.patch index ed2d9d6fc01..390707c10a1 100644 --- a/package/gobject-introspection/0001-disable-tests.patch +++ b/package/gobject-introspection/0001-disable-tests.patch @@ -16,7 +16,7 @@ diff --git a/meson.build b/meson.build index c2cb577f..65ce7adf 100644 --- a/meson.build +++ b/meson.build -@@ -225,12 +225,6 @@ else +@@ -232,12 +232,6 @@ else endif subdir('docs') diff --git a/package/gobject-introspection/0004-build-Avoid-the-doctemplates-hack.patch b/package/gobject-introspection/0004-build-Avoid-the-doctemplates-hack.patch deleted file mode 100644 index 0b70b5c4c04..00000000000 --- a/package/gobject-introspection/0004-build-Avoid-the-doctemplates-hack.patch +++ /dev/null @@ -1,221 +0,0 @@ -From 0504b26ec2adb13dfdff51679d84ad2f69af5918 Mon Sep 17 00:00:00 2001 -From: Emmanuele Bassi -Date: Tue, 11 Jan 2022 15:51:10 +0000 -Subject: [PATCH] build: Avoid the doctemplates hack -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The hack that copies the doctemplates directory into the build -directory has stopped working with newer versions of Meson; while it's -possible to copy files, custom_target() cannot depend on a directory. -Additionally, the dependency has always been broken. - -Instead, we enumerate the template files—after all, it's not like they -change a lot—and then we list them as dependencies for the test targets. - -Fixes: #414 - -Signed-off-by: James Hilliard -[james.hilliard1@gmail.com: backport from upstream commit -effb1e09dee263cdac4ec593e8caf316e6f01fe2] ---- - giscanner/doctemplates/devdocs/meson.build | 19 +++++++ - giscanner/doctemplates/mallard/meson.build | 63 ++++++++++++++++++++++ - giscanner/meson.build | 14 ++--- - tests/scanner/meson.build | 24 +++++---- - 4 files changed, 98 insertions(+), 22 deletions(-) - create mode 100644 giscanner/doctemplates/devdocs/meson.build - create mode 100644 giscanner/doctemplates/mallard/meson.build - -diff --git a/giscanner/doctemplates/devdocs/meson.build b/giscanner/doctemplates/devdocs/meson.build -new file mode 100644 -index 00000000..2037182a ---- /dev/null -+++ b/giscanner/doctemplates/devdocs/meson.build -@@ -0,0 +1,19 @@ -+doc_templates += files([ -+ 'Gjs/_doc.tmpl', -+ 'Gjs/_index.tmpl', -+ 'Gjs/_method.tmpl', -+ 'Gjs/_methods.tmpl', -+ 'Gjs/_properties.tmpl', -+ 'Gjs/_signals.tmpl', -+ 'Gjs/_staticmethods.tmpl', -+ 'Gjs/_vfuncs.tmpl', -+ 'Gjs/base.tmpl', -+ 'Gjs/callback.tmpl', -+ 'Gjs/class.tmpl', -+ 'Gjs/default.tmpl', -+ 'Gjs/enum.tmpl', -+ 'Gjs/function.tmpl', -+ 'Gjs/interface.tmpl', -+ 'Gjs/method.tmpl', -+ 'Gjs/namespace.tmpl', -+]) -diff --git a/giscanner/doctemplates/mallard/meson.build b/giscanner/doctemplates/mallard/meson.build -new file mode 100644 -index 00000000..5fe4e2af ---- /dev/null -+++ b/giscanner/doctemplates/mallard/meson.build -@@ -0,0 +1,63 @@ -+base_templates = files([ -+ 'base.tmpl', -+ 'class.tmpl', -+ 'namespace.tmpl', -+]) -+ -+c_templates = files([ -+ 'C/callback.tmpl', -+ 'C/class.tmpl', -+ 'C/constructor.tmpl', -+ 'C/default.tmpl', -+ 'C/enum.tmpl', -+ 'C/field.tmpl', -+ 'C/function.tmpl', -+ 'C/interface.tmpl', -+ 'C/method.tmpl', -+ 'C/namespace.tmpl', -+ 'C/property.tmpl', -+ 'C/record.tmpl', -+ 'C/signal.tmpl', -+ 'C/vfunc.tmpl', -+]) -+ -+gjs_templates = files([ -+ 'Gjs/callback.tmpl', -+ 'Gjs/class.tmpl', -+ 'Gjs/constructor.tmpl', -+ 'Gjs/default.tmpl', -+ 'Gjs/enum.tmpl', -+ 'Gjs/field.tmpl', -+ 'Gjs/function.tmpl', -+ 'Gjs/interface.tmpl', -+ 'Gjs/method.tmpl', -+ 'Gjs/namespace.tmpl', -+ 'Gjs/property.tmpl', -+ 'Gjs/record.tmpl', -+ 'Gjs/signal.tmpl', -+ 'Gjs/vfunc.tmpl', -+]) -+ -+py_templates = files([ -+ 'Python/callback.tmpl', -+ 'Python/class.tmpl', -+ 'Python/constructor.tmpl', -+ 'Python/default.tmpl', -+ 'Python/enum.tmpl', -+ 'Python/field.tmpl', -+ 'Python/function.tmpl', -+ 'Python/interface.tmpl', -+ 'Python/method.tmpl', -+ 'Python/namespace.tmpl', -+ 'Python/property.tmpl', -+ 'Python/record.tmpl', -+ 'Python/signal.tmpl', -+ 'Python/vfunc.tmpl', -+]) -+ -+doc_templates += [ -+ base_templates, -+ c_templates, -+ gjs_templates, -+ py_templates, -+] -diff --git a/giscanner/meson.build b/giscanner/meson.build -index 41edcd44..3d7dc678 100644 ---- a/giscanner/meson.build -+++ b/giscanner/meson.build -@@ -53,17 +53,9 @@ configure_file(input : '../girepository/gdump.c', - - install_subdir('doctemplates', install_dir: giscannerdir) - --# XXX: this doesn't track the input, but there is nothing to copy many files --# in meson. --doc_templates = custom_target('copy-templates', -- input : 'doctemplates', -- output : 'doctemplates', -- command : [ -- python, '-c', -- 'import sys, shutil;' + -- 'shutil.rmtree(sys.argv[2], ignore_errors=True);' + -- 'shutil.copytree(sys.argv[1], sys.argv[2])', -- '@INPUT@', '@OUTPUT@']) -+doc_templates = [] -+subdir('doctemplates/devdocs') -+subdir('doctemplates/mallard') - - flex = find_program('flex', 'win_flex') - bison = find_program('bison', 'win_bison') -diff --git a/tests/scanner/meson.build b/tests/scanner/meson.build -index 5176b957..b81b3fd5 100644 ---- a/tests/scanner/meson.build -+++ b/tests/scanner/meson.build -@@ -525,19 +525,26 @@ foreach gir : test_girs - endforeach - - if has_girdoctool and glib_dep.type_name() == 'pkgconfig' -+ doctool_env = environment() -+ doctool_env.set('srcdir', meson.current_source_dir()) -+ doctool_env.set('builddir', meson.current_build_dir()) -+ - foreach language : ['C', 'Python', 'Gjs'] - regress_docs = custom_target( - 'generate-docs-' + language, - input: regress_gir, -- depends: [doc_templates], -+ depend_files: doc_templates, - build_by_default: not cairo_deps_found, -+ env: doctool_env, - output: 'Regress-1.0-' + language, - command: [ - python, girdoctool, - '--add-include-path=' + join_paths(build_root, 'gir'), - '--add-include-path=' + meson.current_build_dir(), - '--language', language, -- '@INPUT@', '-o', '@OUTPUT@'], -+ '--templates-dir=' + join_paths(meson.current_source_dir(), '../../giscanner/doctemplates'), -+ '@INPUT@', '-o', '@OUTPUT@', -+ ], - ) - - if cairo_deps_found -@@ -546,10 +553,7 @@ if has_girdoctool and glib_dep.type_name() == 'pkgconfig' - python, - args: [gi_tester, 'Regress-1.0-' + language], - depends: [regress_docs], -- env: [ -- 'srcdir=' + meson.current_source_dir(), -- 'builddir=' + meson.current_build_dir(), -- ], -+ env: doctool_env, - ) - endif - endforeach -@@ -557,9 +561,10 @@ if has_girdoctool and glib_dep.type_name() == 'pkgconfig' - regress_sections = custom_target( - 'generate-docs-sections', - input: regress_gir, -- depends: [doc_templates], -+ depend_files: [doc_templates], - build_by_default: not cairo_deps_found, - output: 'Regress-1.0-sections.txt', -+ env: doctool_env, - command: [ - python, girdoctool, - '--add-include-path=' + join_paths(build_root, 'gir'), -@@ -574,10 +579,7 @@ if has_girdoctool and glib_dep.type_name() == 'pkgconfig' - python, - args: [gi_tester, 'Regress-1.0-sections.txt'], - depends: [regress_sections], -- env: [ -- 'srcdir=' + meson.current_source_dir(), -- 'builddir=' + meson.current_build_dir(), -- ], -+ env: doctool_env, - ) - endif - endif --- -2.25.1 - diff --git a/package/gobject-introspection/gobject-introspection.hash b/package/gobject-introspection/gobject-introspection.hash index 5b76df6b409..fa3fdfe3064 100644 --- a/package/gobject-introspection/gobject-introspection.hash +++ b/package/gobject-introspection/gobject-introspection.hash @@ -1,5 +1,5 @@ -#From http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/1.70/gobject-introspection-1.70.0.sha256sum -sha256 902b4906e3102d17aa2fcb6dad1c19971c70f2a82a159ddc4a94df73a3cafc4a gobject-introspection-1.70.0.tar.xz -sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING.LGPL -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING.GPL +#From https://download.gnome.org/sources/gobject-introspection/1.72/gobject-introspection-1.72.0.sha256sum +sha256 02fe8e590861d88f83060dd39cda5ccaa60b2da1d21d0f95499301b186beaabc gobject-introspection-1.72.0.tar.xz +sha256 faa2e414bd5f91d2d2c39e85c7cc3f2ccde05c3306f96b404f8ed8cf0266c279 COPYING.LGPL +sha256 4c1cedcbb4a12ea964f1160dbbf36099e5a59b96129a99a1a1a61f2cb09271fb COPYING.GPL sha256 23f82cbc9808cdd8e902df38271434040ce0562ca382ac2a96f5e3bf807b6d31 giscanner/scannerlexer.l diff --git a/package/gobject-introspection/gobject-introspection.mk b/package/gobject-introspection/gobject-introspection.mk index 41d64171a72..37e1b2c64ab 100644 --- a/package/gobject-introspection/gobject-introspection.mk +++ b/package/gobject-introspection/gobject-introspection.mk @@ -4,12 +4,11 @@ # ################################################################################ -GOBJECT_INTROSPECTION_VERSION_MAJOR = 1.70 +GOBJECT_INTROSPECTION_VERSION_MAJOR = 1.72 GOBJECT_INTROSPECTION_VERSION = $(GOBJECT_INTROSPECTION_VERSION_MAJOR).0 -GOBJECT_INTROSPECTION_SITE = http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/$(GOBJECT_INTROSPECTION_VERSION_MAJOR) +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_AUTORECONF = YES GOBJECT_INTROSPECTION_LICENSE = LGPL-2.0+, GPL-2.0+, BSD-2-Clause GOBJECT_INTROSPECTION_LICENSE_FILES = COPYING.LGPL COPYING.GPL giscanner/scannerlexer.l @@ -67,7 +66,7 @@ HOST_GOBJECT_INTROSPECTION_CONF_ENV = \ define GOBJECT_INTROSPECTION_FIX_TOOLS_PYTHON_PATH $(SED) '1s%#!.*%#!$(HOST_DIR)/bin/python3%' $(@D)/tools/g-ir-tool-template.in endef -HOST_GOBJECT_INTROSPECTION_PRE_CONFIGURE_HOOKS += GOBJECT_INTROSPECTION_FIX_TOOLTEMPLATE_PYTHON_PATH +HOST_GOBJECT_INTROSPECTION_PRE_CONFIGURE_HOOKS += GOBJECT_INTROSPECTION_FIX_TOOLS_PYTHON_PATH # Perform the following: # - Just as above, Ensure that g-ir-tool-template.in uses the host python. diff --git a/package/gocryptfs/0001-go.mod-fix-jacobsa-crypto-build-on-riscv64.patch b/package/gocryptfs/0001-go.mod-fix-jacobsa-crypto-build-on-riscv64.patch new file mode 100644 index 00000000000..0074932fbad --- /dev/null +++ b/package/gocryptfs/0001-go.mod-fix-jacobsa-crypto-build-on-riscv64.patch @@ -0,0 +1,186 @@ +From e72d34ef2c87e5c9ffd49c98b651641f48d89c24 Mon Sep 17 00:00:00 2001 +From: Christian Stewart +Date: Sat, 25 Jun 2022 14:57:38 -0700 +Subject: [PATCH] go.mod: fix jacobsa/crypto build on riscv64 + +Replace dependency jacobsa/crypto with a fork with support for riscv64. + +Issue: https://github.com/rfjakob/gocryptfs/issues/666 + +Upstream PR: https://github.com/jacobsa/crypto/issues/13 + +Signed-off-by: Christian Stewart +--- + go.mod | 15 ++++--- + go.sum | 16 +++----- + .../jacobsa/crypto/cmac/hash_generic.go | 40 +++++++++++++++++++ + vendor/modules.txt | 16 ++------ + 4 files changed, 59 insertions(+), 28 deletions(-) + create mode 100644 vendor/github.com/jacobsa/crypto/cmac/hash_generic.go + +diff --git a/go.mod b/go.mod +index 754a667..5103029 100644 +--- a/go.mod ++++ b/go.mod +@@ -2,19 +2,22 @@ module github.com/rfjakob/gocryptfs/v2 + + go 1.16 + ++// Fixes build against risc-v ++// See: https://github.com/jacobsa/crypto/issues/13 ++replace github.com/jacobsa/crypto => github.com/aperturerobotics/jacobsa-crypto v1.0.2-0.20221208222437-85e082e29e93 // buildroot-1 ++ ++// Prevent x/sys version from changing and polluting vendor/ ++// Pin it to the current version in the original go.mod. ++replace golang.org/x/sys => golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 ++ + require ( + github.com/hanwen/go-fuse/v2 v2.1.1-0.20211219085202-934a183ed914 + github.com/jacobsa/crypto v0.0.0-20190317225127-9f44e2d11115 +- github.com/jacobsa/oglematchers v0.0.0-20150720000706-141901ea67cd // indirect +- github.com/jacobsa/oglemock v0.0.0-20150831005832-e94d794d06ff // indirect +- github.com/jacobsa/ogletest v0.0.0-20170503003838-80d50a735a11 // indirect +- github.com/jacobsa/reqtrace v0.0.0-20150505043853-245c9e0234cb // indirect + github.com/pkg/xattr v0.4.3 + github.com/rfjakob/eme v1.1.2 + github.com/sabhiram/go-gitignore v0.0.0-20201211210132-54b8a0bf510f + github.com/spf13/pflag v1.0.5 + golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 +- golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d // indirect +- golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 ++ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a + golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 + ) +diff --git a/go.sum b/go.sum +index 4167388..71826e9 100644 +--- a/go.sum ++++ b/go.sum +@@ -1,9 +1,9 @@ ++github.com/aperturerobotics/jacobsa-crypto v1.0.2-0.20221208222437-85e082e29e93 h1:awSzmXfGWzvmRmrU1oSHqUdpxNcVPRMqv0rytbSA8kA= ++github.com/aperturerobotics/jacobsa-crypto v1.0.2-0.20221208222437-85e082e29e93/go.mod h1:SHG0nzlQikn4UxNIXqEKd2hvJM2tRIrdr1FfOrF+/wY= + github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= + github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= + github.com/hanwen/go-fuse/v2 v2.1.1-0.20211219085202-934a183ed914 h1:hGXMxS1wTE4y+f7iBqFArrJ6X8QozHnEdnVzGZI9Ywc= + github.com/hanwen/go-fuse/v2 v2.1.1-0.20211219085202-934a183ed914/go.mod h1:B1nGE/6RBFyBRC1RRnf23UpwCdyJ31eukw34oAKukAc= +-github.com/jacobsa/crypto v0.0.0-20190317225127-9f44e2d11115 h1:YuDUUFNM21CAbyPOpOP8BicaTD/0klJEKt5p8yuw+uY= +-github.com/jacobsa/crypto v0.0.0-20190317225127-9f44e2d11115/go.mod h1:LadVJg0XuawGk+8L1rYnIED8451UyNxEMdTWCEt5kmU= + github.com/jacobsa/oglematchers v0.0.0-20150720000706-141901ea67cd h1:9GCSedGjMcLZCrusBZuo4tyKLpKUPenUUqi34AkuFmA= + github.com/jacobsa/oglematchers v0.0.0-20150720000706-141901ea67cd/go.mod h1:TlmyIZDpGmwRoTWiakdr+HA1Tukze6C6XbRVidYq02M= + github.com/jacobsa/oglemock v0.0.0-20150831005832-e94d794d06ff h1:2xRHTvkpJ5zJmglXLRqHiZQNjUoOkhUyhTAhEQvPAWw= +@@ -30,21 +30,17 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ + golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ= + golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= + golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +-golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d h1:LO7XpTYMwTqxjLcGWPijK3vRXg1aWdlNOVOHRq45d7c= +-golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= ++golang.org/x/net v0.0.0-20220708220712-1185a9018129 h1:vucSRfWwTsoXro7P+3Cjlr6flUMtzCwzlvkxEQtHHB0= ++golang.org/x/net v0.0.0-20220708220712-1185a9018129/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= + golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +-golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +-golang.org/x/sys v0.0.0-20201101102859-da207088b7d1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= + golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 h1:c8PlLMqBbOHoqtjteWm5/kbe6rNY2pbRfbIMVnepueo= + golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= + golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= ++golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= + golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 h1:Q5284mrmYTpACcm+eAKjKJH48BBwSyfJqmmGDTtT8Vc= + golang.org/x/term v0.0.0-20220722155259-a9ba230a4035/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= + golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= ++golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= + golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= + gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= + gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= +diff --git a/vendor/github.com/jacobsa/crypto/cmac/hash_generic.go b/vendor/github.com/jacobsa/crypto/cmac/hash_generic.go +new file mode 100644 +index 0000000..235e3fc +--- /dev/null ++++ b/vendor/github.com/jacobsa/crypto/cmac/hash_generic.go +@@ -0,0 +1,40 @@ ++// Copyright 2012 Aaron Jacobs. All Rights Reserved. ++// Author: aaronjjacobs@gmail.com (Aaron Jacobs) ++// ++// Licensed under the Apache License, Version 2.0 (the "License"); ++// you may not use this file except in compliance with the License. ++// You may obtain a copy of the License at ++// ++// http://www.apache.org/licenses/LICENSE-2.0 ++// ++// Unless required by applicable law or agreed to in writing, software ++// distributed under the License is distributed on an "AS IS" BASIS, ++// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++// See the License for the specific language governing permissions and ++// limitations under the License. ++ ++// +build riscv64 ++ ++// This code doesn't require that it's safe to perform unaligned word-sized loads, but has a poor performance. ++ ++package cmac ++ ++import ( ++ "unsafe" ++) ++ ++// XOR the blockSize bytes starting at a and b, writing the result over dst. ++func xorBlock( ++ dstPtr unsafe.Pointer, ++ aPtr unsafe.Pointer, ++ bPtr unsafe.Pointer) { ++ // Convert. ++ a := (*[blockSize]byte)(aPtr) ++ b := (*[blockSize]byte)(bPtr) ++ dst := (*[blockSize]byte)(dstPtr) ++ ++ // Compute. ++ for i := 0; i < blockSize; i++ { ++ dst[i] = a[i] ^ b[i] ++ } ++} +diff --git a/vendor/modules.txt b/vendor/modules.txt +index 0e97e42..634c079 100644 +--- a/vendor/modules.txt ++++ b/vendor/modules.txt +@@ -5,19 +5,11 @@ github.com/hanwen/go-fuse/v2/fuse + github.com/hanwen/go-fuse/v2/internal + github.com/hanwen/go-fuse/v2/internal/utimens + github.com/hanwen/go-fuse/v2/splice +-# github.com/jacobsa/crypto v0.0.0-20190317225127-9f44e2d11115 ++# github.com/jacobsa/crypto v0.0.0-20190317225127-9f44e2d11115 => github.com/aperturerobotics/jacobsa-crypto v1.0.2-0.20221208222437-85e082e29e93 + ## explicit + github.com/jacobsa/crypto/cmac + github.com/jacobsa/crypto/common + github.com/jacobsa/crypto/siv +-# github.com/jacobsa/oglematchers v0.0.0-20150720000706-141901ea67cd +-## explicit +-# github.com/jacobsa/oglemock v0.0.0-20150831005832-e94d794d06ff +-## explicit +-# github.com/jacobsa/ogletest v0.0.0-20170503003838-80d50a735a11 +-## explicit +-# github.com/jacobsa/reqtrace v0.0.0-20150505043853-245c9e0234cb +-## explicit + # github.com/pkg/xattr v0.4.3 + ## explicit + github.com/pkg/xattr +@@ -39,9 +31,7 @@ golang.org/x/crypto/internal/subtle + golang.org/x/crypto/pbkdf2 + golang.org/x/crypto/poly1305 + golang.org/x/crypto/scrypt +-# golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d +-## explicit +-# golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 ++# golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a => golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 + ## explicit + golang.org/x/sys/cpu + golang.org/x/sys/internal/unsafeheader +@@ -51,3 +41,5 @@ golang.org/x/sys/windows + # golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 + ## explicit + golang.org/x/term ++# github.com/jacobsa/crypto => github.com/aperturerobotics/jacobsa-crypto v1.0.2-0.20221208222437-85e082e29e93 ++# golang.org/x/sys => golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 +-- +2.38.1 + diff --git a/package/gocryptfs/gocryptfs.hash b/package/gocryptfs/gocryptfs.hash index ae161d1cd8e..28965a06487 100644 --- a/package/gocryptfs/gocryptfs.hash +++ b/package/gocryptfs/gocryptfs.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 88f32bb8e18fa89e4ab666f7c8ad622281a11e423b4093e50ac260f960bc40b6 gocryptfs-2.2.1.tar.gz +sha256 bfc98c18e44a2ca24a0e1472b6d9bb96e6072d7fb5651616515d2e7117b8fed9 gocryptfs-2.3.tar.gz sha256 322a7e3b02cf18e38b7e6b18cafefb773df8676c65634b34e8a2beb931294a4b LICENSE diff --git a/package/gocryptfs/gocryptfs.mk b/package/gocryptfs/gocryptfs.mk index 8f70dba7c3c..077597e7e87 100644 --- a/package/gocryptfs/gocryptfs.mk +++ b/package/gocryptfs/gocryptfs.mk @@ -4,7 +4,7 @@ # ################################################################################ -GOCRYPTFS_VERSION = 2.2.1 +GOCRYPTFS_VERSION = 2.3 GOCRYPTFS_SITE = $(call github,rfjakob,gocryptfs,v$(GOCRYPTFS_VERSION)) GOCRYPTFS_LICENSE = MIT GOCRYPTFS_LICENSE_FILES = LICENSE diff --git a/package/google-breakpad/0001-add-missing-asm-ptrace-include.patch b/package/google-breakpad/0001-add-missing-asm-ptrace-include.patch deleted file mode 100644 index 281c7a042a1..00000000000 --- a/package/google-breakpad/0001-add-missing-asm-ptrace-include.patch +++ /dev/null @@ -1,31 +0,0 @@ -Include to get necessary definitions on AArch64 - -In glibc commit -https://sourceware.org/git/?p=glibc.git;a=commit;h=7d05a8168b45c0580e1f9a79c2dd26c8f0d31fca, -including from on AArch64 has been -removed. So the Google Breakpad code, which used to build fine on -glibc 2.18 (CodeSourcery toolchain for example), no longer builds with -glibc 2.19 (Linaro toolchain for example). - -To fix this, this patch adds the missing include (for -AArch64 only, to be conservative). - -This patch has not been submitted upstream, since more recent versions -of Google Breakpad have completely changed this part of the code. - -Signed-off-by: Thomas Petazzoni - -Index: b/src/client/linux/minidump_writer/linux_dumper.h -=================================================================== ---- a/src/client/linux/minidump_writer/linux_dumper.h -+++ b/src/client/linux/minidump_writer/linux_dumper.h -@@ -43,6 +43,9 @@ - #include - #include - #include -+#if defined(__aarch64__) -+#include -+#endif - - #include "common/memory.h" - #include "google_breakpad/common/minidump_format.h" diff --git a/package/google-breakpad/0002-Replace-remaining-references-to-struct-ucontext-with.patch b/package/google-breakpad/0002-Replace-remaining-references-to-struct-ucontext-with.patch deleted file mode 100644 index e02ae268b93..00000000000 --- a/package/google-breakpad/0002-Replace-remaining-references-to-struct-ucontext-with.patch +++ /dev/null @@ -1,257 +0,0 @@ -From 7975a962e1d6dbad5a46792a54e647abd7caf5f1 Mon Sep 17 00:00:00 2001 -From: Mark Mentovai -Date: Tue, 19 Sep 2017 22:48:30 -0400 -Subject: [PATCH] Replace remaining references to 'struct ucontext' with - 'ucontext_t' - -This relands -https://chromium.googlesource.com/breakpad/breakpad/src/+/e3035bc406cee8a4d765e59ad46eb828705f17f4, -which was accidentally committed to breakpad/breakpad/src, the read-only -mirror of src in breakpad/breakpad. (Well, it should have been -read-only.) See https://crbug.com/766164. - -This fixes issues with glibc-2.26. - -See https://bugs.gentoo.org/show_bug.cgi?id=628782 , -https://sourceware.org/git/?p=glibc.git;h=251287734e89a52da3db682a8241eb6bccc050c9 , and -https://sourceware.org/ml/libc-alpha/2017-08/msg00010.html for context. -Change-Id: Id66f474d636dd2afa450bab925c5514a800fdd6f -Reviewed-on: https://chromium-review.googlesource.com/674304 -Reviewed-by: Mark Mentovai - -(cherry picked from commit bddcc58860f522a0d4cbaa7e9d04058caee0db9d) -[Romain: backport from upstream] -Signed-off-by: Romain Naour ---- - .../linux/dump_writer_common/ucontext_reader.cc | 32 +++++++++++----------- - .../linux/dump_writer_common/ucontext_reader.h | 14 +++++----- - src/client/linux/handler/exception_handler.cc | 10 +++---- - src/client/linux/handler/exception_handler.h | 6 ++-- - .../linux/microdump_writer/microdump_writer.cc | 2 +- - .../linux/minidump_writer/minidump_writer.cc | 2 +- - 6 files changed, 33 insertions(+), 33 deletions(-) - -diff --git a/src/client/linux/dump_writer_common/ucontext_reader.cc b/src/client/linux/dump_writer_common/ucontext_reader.cc -index c80724d..052ce37 100644 ---- a/src/client/linux/dump_writer_common/ucontext_reader.cc -+++ b/src/client/linux/dump_writer_common/ucontext_reader.cc -@@ -36,19 +36,19 @@ namespace google_breakpad { - - // Minidump defines register structures which are different from the raw - // structures which we get from the kernel. These are platform specific --// functions to juggle the ucontext and user structures into minidump format. -+// functions to juggle the ucontext_t and user structures into minidump format. - - #if defined(__i386__) - --uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { - return uc->uc_mcontext.gregs[REG_ESP]; - } - --uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { - return uc->uc_mcontext.gregs[REG_EIP]; - } - --void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, -+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, - const struct _libc_fpstate* fp) { - const greg_t* regs = uc->uc_mcontext.gregs; - -@@ -88,15 +88,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, - - #elif defined(__x86_64) - --uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { - return uc->uc_mcontext.gregs[REG_RSP]; - } - --uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { - return uc->uc_mcontext.gregs[REG_RIP]; - } - --void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, -+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, - const struct _libc_fpstate* fpregs) { - const greg_t* regs = uc->uc_mcontext.gregs; - -@@ -145,15 +145,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, - - #elif defined(__ARM_EABI__) - --uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { - return uc->uc_mcontext.arm_sp; - } - --uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { - return uc->uc_mcontext.arm_pc; - } - --void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) { -+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) { - out->context_flags = MD_CONTEXT_ARM_FULL; - - out->iregs[0] = uc->uc_mcontext.arm_r0; -@@ -184,15 +184,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) { - - #elif defined(__aarch64__) - --uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { - return uc->uc_mcontext.sp; - } - --uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { - return uc->uc_mcontext.pc; - } - --void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, -+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, - const struct fpsimd_context* fpregs) { - out->context_flags = MD_CONTEXT_ARM64_FULL; - -@@ -210,15 +210,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, - - #elif defined(__mips__) - --uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { - return uc->uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]; - } - --uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { - return uc->uc_mcontext.pc; - } - --void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) { -+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) { - #if _MIPS_SIM == _ABI64 - out->context_flags = MD_CONTEXT_MIPS64_FULL; - #elif _MIPS_SIM == _ABIO32 -diff --git a/src/client/linux/dump_writer_common/ucontext_reader.h b/src/client/linux/dump_writer_common/ucontext_reader.h -index b6e77b4..2de80b7 100644 ---- a/src/client/linux/dump_writer_common/ucontext_reader.h -+++ b/src/client/linux/dump_writer_common/ucontext_reader.h -@@ -39,23 +39,23 @@ - - namespace google_breakpad { - --// Wraps platform-dependent implementations of accessors to ucontext structs. -+// Wraps platform-dependent implementations of accessors to ucontext_t structs. - struct UContextReader { -- static uintptr_t GetStackPointer(const struct ucontext* uc); -+ static uintptr_t GetStackPointer(const ucontext_t* uc); - -- static uintptr_t GetInstructionPointer(const struct ucontext* uc); -+ static uintptr_t GetInstructionPointer(const ucontext_t* uc); - -- // Juggle a arch-specific ucontext into a minidump format -+ // Juggle a arch-specific ucontext_t into a minidump format - // out: the minidump structure - // info: the collection of register structures. - #if defined(__i386__) || defined(__x86_64) -- static void FillCPUContext(RawContextCPU *out, const ucontext *uc, -+ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc, - const struct _libc_fpstate* fp); - #elif defined(__aarch64__) -- static void FillCPUContext(RawContextCPU *out, const ucontext *uc, -+ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc, - const struct fpsimd_context* fpregs); - #else -- static void FillCPUContext(RawContextCPU *out, const ucontext *uc); -+ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc); - #endif - }; - -diff --git a/src/client/linux/handler/exception_handler.cc b/src/client/linux/handler/exception_handler.cc -index b63f973..3d809b8 100644 ---- a/src/client/linux/handler/exception_handler.cc -+++ b/src/client/linux/handler/exception_handler.cc -@@ -439,9 +439,9 @@ bool ExceptionHandler::HandleSignal(int sig, siginfo_t* info, void* uc) { - // Fill in all the holes in the struct to make Valgrind happy. - memset(&g_crash_context_, 0, sizeof(g_crash_context_)); - memcpy(&g_crash_context_.siginfo, info, sizeof(siginfo_t)); -- memcpy(&g_crash_context_.context, uc, sizeof(struct ucontext)); -+ memcpy(&g_crash_context_.context, uc, sizeof(ucontext_t)); - #if defined(__aarch64__) -- struct ucontext* uc_ptr = (struct ucontext*)uc; -+ ucontext_t* uc_ptr = (ucontext_t*)uc; - struct fpsimd_context* fp_ptr = - (struct fpsimd_context*)&uc_ptr->uc_mcontext.__reserved; - if (fp_ptr->head.magic == FPSIMD_MAGIC) { -@@ -450,9 +450,9 @@ bool ExceptionHandler::HandleSignal(int sig, siginfo_t* info, void* uc) { - } - #elif !defined(__ARM_EABI__) && !defined(__mips__) - // FP state is not part of user ABI on ARM Linux. -- // In case of MIPS Linux FP state is already part of struct ucontext -+ // In case of MIPS Linux FP state is already part of ucontext_t - // and 'float_state' is not a member of CrashContext. -- struct ucontext* uc_ptr = (struct ucontext*)uc; -+ ucontext_t* uc_ptr = (ucontext_t*)uc; - if (uc_ptr->uc_mcontext.fpregs) { - memcpy(&g_crash_context_.float_state, uc_ptr->uc_mcontext.fpregs, - sizeof(g_crash_context_.float_state)); -@@ -476,7 +476,7 @@ bool ExceptionHandler::SimulateSignalDelivery(int sig) { - // ExceptionHandler::HandleSignal(). - siginfo.si_code = SI_USER; - siginfo.si_pid = getpid(); -- struct ucontext context; -+ ucontext_t context; - getcontext(&context); - return HandleSignal(sig, &siginfo, &context); - } -diff --git a/src/client/linux/handler/exception_handler.h b/src/client/linux/handler/exception_handler.h -index 591c310..42f4055 100644 ---- a/src/client/linux/handler/exception_handler.h -+++ b/src/client/linux/handler/exception_handler.h -@@ -191,11 +191,11 @@ class ExceptionHandler { - struct CrashContext { - siginfo_t siginfo; - pid_t tid; // the crashing thread. -- struct ucontext context; -+ ucontext_t context; - #if !defined(__ARM_EABI__) && !defined(__mips__) - // #ifdef this out because FP state is not part of user ABI for Linux ARM. -- // In case of MIPS Linux FP state is already part of struct -- // ucontext so 'float_state' is not required. -+ // In case of MIPS Linux FP state is already part of ucontext_t so -+ // 'float_state' is not required. - fpstate_t float_state; - #endif - }; -diff --git a/src/client/linux/microdump_writer/microdump_writer.cc b/src/client/linux/microdump_writer/microdump_writer.cc -index 6f5b435..a508667 100644 ---- a/src/client/linux/microdump_writer/microdump_writer.cc -+++ b/src/client/linux/microdump_writer/microdump_writer.cc -@@ -571,7 +571,7 @@ class MicrodumpWriter { - - void* Alloc(unsigned bytes) { return dumper_->allocator()->Alloc(bytes); } - -- const struct ucontext* const ucontext_; -+ const ucontext_t* const ucontext_; - #if !defined(__ARM_EABI__) && !defined(__mips__) - const google_breakpad::fpstate_t* const float_state_; - #endif -diff --git a/src/client/linux/minidump_writer/minidump_writer.cc b/src/client/linux/minidump_writer/minidump_writer.cc -index 86009b9..f2aec73 100644 ---- a/src/client/linux/minidump_writer/minidump_writer.cc -+++ b/src/client/linux/minidump_writer/minidump_writer.cc -@@ -1248,7 +1248,7 @@ class MinidumpWriter { - const int fd_; // File descriptor where the minidum should be written. - const char* path_; // Path to the file where the minidum should be written. - -- const struct ucontext* const ucontext_; // also from the signal handler -+ const ucontext_t* const ucontext_; // also from the signal handler - #if !defined(__ARM_EABI__) && !defined(__mips__) - const google_breakpad::fpstate_t* const float_state_; // ditto - #endif --- -2.9.5 - diff --git a/package/google-breakpad/0003-src-client-linux-handler-exception_handler.cc-rename.patch b/package/google-breakpad/0003-src-client-linux-handler-exception_handler.cc-rename.patch deleted file mode 100644 index 579e7f34574..00000000000 --- a/package/google-breakpad/0003-src-client-linux-handler-exception_handler.cc-rename.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 2fa414c8655c421e7eb0bb1719928babb0ecf7c6 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Thu, 26 Dec 2019 22:21:33 +0100 -Subject: [PATCH] src/client/linux/handler/exception_handler.cc: rename tgkill - to BreakpadTgkill() -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Since glibc 2.30, a tgkill() function was added in the C library, and -its definition obviously conflicts with the internal definition of -google-breakpad, causing build failures: - -src/client/linux/handler/exception_handler.cc:109:12: error: ‘int tgkill(pid_t, pid_t, int)’ was declared ‘extern’ and later ‘static’ [-fpermissive] - 109 | static int tgkill(pid_t tgid, pid_t tid, int sig) { - | ^~~~~~ -In file included from /usr/include/signal.h:374, - from ./src/client/linux/handler/exception_handler.h:33, - from src/client/linux/handler/exception_handler.cc:66: -/usr/include/bits/signal_ext.h:29:12: note: previous declaration of ‘int tgkill(__pid_t, __pid_t, int)’ - 29 | extern int tgkill (__pid_t __tgid, __pid_t __tid, int __signal); - | ^~~~~~ - -Upstream google-breakpad simply dropped the use of the internal -tgkill() in commit -https://chromium.googlesource.com/breakpad/breakpad/+/7e3c165000d44fa153a3270870ed500bc8bbb461. However, -this is not realistic for Buildroot, since we do support old systems -where the system C library will not necessarily provide tgkill(). - -Signed-off-by: Thomas Petazzoni ---- - src/client/linux/handler/exception_handler.cc | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/client/linux/handler/exception_handler.cc b/src/client/linux/handler/exception_handler.cc -index b63f973b..b4c279b8 100644 ---- a/src/client/linux/handler/exception_handler.cc -+++ b/src/client/linux/handler/exception_handler.cc -@@ -106,7 +106,7 @@ - #endif - - // A wrapper for the tgkill syscall: send a signal to a specific thread. --static int tgkill(pid_t tgid, pid_t tid, int sig) { -+static int BreakpadTgkill(pid_t tgid, pid_t tid, int sig) { - return syscall(__NR_tgkill, tgid, tid, sig); - return 0; - } -@@ -387,7 +387,7 @@ void ExceptionHandler::SignalHandler(int sig, siginfo_t* info, void* uc) { - // In order to retrigger it, we have to queue a new signal by calling - // kill() ourselves. The special case (si_pid == 0 && sig == SIGABRT) is - // due to the kernel sending a SIGABRT from a user request via SysRQ. -- if (tgkill(getpid(), syscall(__NR_gettid), sig) < 0) { -+ if (BreakpadTgkill(getpid(), syscall(__NR_gettid), sig) < 0) { - // If we failed to kill ourselves (e.g. because a sandbox disallows us - // to do so), we instead resort to terminating our process. This will - // result in an incorrect exit code. --- -2.24.1 - diff --git a/package/google-breakpad/0004-Fix-for-non-constant-SIGSTKSZ.patch b/package/google-breakpad/0004-Fix-for-non-constant-SIGSTKSZ.patch deleted file mode 100644 index 4291216c61e..00000000000 --- a/package/google-breakpad/0004-Fix-for-non-constant-SIGSTKSZ.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 4a332d01186b09a9d46390b845024d914d9149cb Mon Sep 17 00:00:00 2001 -From: Michel Alexandre Salim -Date: Sun, 21 Mar 2021 13:17:00 -0700 -Subject: [PATCH] Fix for non-constant SIGSTKSZ - -On glibc > 2.33, `SIGSTKSZ` might not be constant (in which case -it expands to a call to `sysconf` which returns a `long int`); see -http://sourceware-org.1504.n7.nabble.com/PATCH-sysconf-Add-SC-MINSIGSTKSZ-SC-SIGSTKSZ-BZ-20305-td650948.html - -Cast the two arguments to `max` to `unsigned`, which is the type of the variable -we're storing the result in anyway, so that it works both with the old-style constant -`SIGSTKSZ` and the new configurable one. - -Signed-off-by: Michel Alexandre Salim -Change-Id: I3d87048561a87c6b9fcdbb14b3d53dd45b0a00f0 - -[Retrieved from: -https://chromium-review.googlesource.com/c/breakpad/breakpad/+/2776379] -Signed-off-by: Fabrice Fontaine ---- - -diff --git a/src/client/linux/handler/exception_handler.cc b/src/client/linux/handler/exception_handler.cc -index ca353c4..3788829 100644 ---- a/src/client/linux/handler/exception_handler.cc -+++ b/src/client/linux/handler/exception_handler.cc -@@ -138,7 +138,7 @@ - // SIGSTKSZ may be too small to prevent the signal handlers from overrunning - // the alternative stack. Ensure that the size of the alternative stack is - // large enough. -- static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); -+ static const unsigned kSigStackSize = std::max((unsigned) 16384, (unsigned) SIGSTKSZ); - - // Only set an alternative stack if there isn't already one, or if the current - // one is too small. diff --git a/package/google-breakpad/Config.in b/package/google-breakpad/Config.in index 07c49996dd9..4320ad64aa4 100644 --- a/package/google-breakpad/Config.in +++ b/package/google-breakpad/Config.in @@ -41,3 +41,13 @@ comment "google-breakpad requires a glibc or uClibc toolchain w/ wchar, thread, !BR2_TOOLCHAIN_HAS_THREADS || \ !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC) || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + +if BR2_PACKAGE_GOOGLE_BREAKPAD + +config BR2_PACKAGE_GOOGLE_BREAKPAD_TOOLS + bool "Build target tools" + help + Build processor and tools for target: dump_syms, + minidump_stackwalk and microdump_stackwalk. + +endif diff --git a/package/google-breakpad/google-breakpad.hash b/package/google-breakpad/google-breakpad.hash index 09f9a0cf91b..03719816b5d 100644 --- a/package/google-breakpad/google-breakpad.hash +++ b/package/google-breakpad/google-breakpad.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3504639ee5d7536e7f7939b80520dfcb98863e9b50673dd577d0ab2a07105acb google-breakpad-7515ab13768c7edc09f0f2ec2354dc6c928239a6-br1.tar.gz -sha256 f9752a0a4ac5215eaa3a4f0ec29cd52563c883de5d7870525cc0bc3a21cb8e15 LICENSE +sha256 52716d140ba528d36b40591ae2c7485b18023f6610414bba0057f0cc13caf256 google-breakpad-c85eb4a59b618f3beaad5445ceb1f865ffa8efdf-br1.tar.gz +sha256 8d5d1311342ed55b486d778a6763f54a26002698ac0cbab64026b98033300dfd LICENSE diff --git a/package/google-breakpad/google-breakpad.mk b/package/google-breakpad/google-breakpad.mk index 8ae5f99bc7b..132323363b6 100644 --- a/package/google-breakpad/google-breakpad.mk +++ b/package/google-breakpad/google-breakpad.mk @@ -4,19 +4,20 @@ # ################################################################################ -GOOGLE_BREAKPAD_VERSION = 7515ab13768c7edc09f0f2ec2354dc6c928239a6 +GOOGLE_BREAKPAD_VERSION = c85eb4a59b618f3beaad5445ceb1f865ffa8efdf GOOGLE_BREAKPAD_SITE = https://chromium.googlesource.com/breakpad/breakpad GOOGLE_BREAKPAD_SITE_METHOD = git -GOOGLE_BREAKPAD_CONF_OPTS = --disable-processor --disable-tools -# Only a static library is installed -GOOGLE_BREAKPAD_INSTALL_TARGET = NO GOOGLE_BREAKPAD_INSTALL_STAGING = YES -GOOGLE_BREAKPAD_LICENSE = BSD-3-Clause +GOOGLE_BREAKPAD_LICENSE = BSD-3-Clause, MIT GOOGLE_BREAKPAD_LICENSE_FILES = LICENSE GOOGLE_BREAKPAD_DEPENDENCIES = host-google-breakpad linux-syscall-support HOST_GOOGLE_BREAKPAD_DEPENDENCIES = host-linux-syscall-support +ifeq ($(BR2_PACKAGE_GOOGLE_BREAKPAD_TOOLS),) +GOOGLE_BREAKPAD_INSTALL_TARGET = NO +endif + # Avoid using depot-tools to download this file. define HOST_GOOGLE_BREAKPAD_LSS $(INSTALL) -D -m 0644 \ diff --git a/package/googlefontdirectory/googlefontdirectory.hash b/package/googlefontdirectory/googlefontdirectory.hash index 2525b6fff61..10f3bf60b1e 100644 --- a/package/googlefontdirectory/googlefontdirectory.hash +++ b/package/googlefontdirectory/googlefontdirectory.hash @@ -1,994 +1,994 @@ # Locally calculated -sha256 ec2ddbeee673cce1b0796e3b20fbff5fd836ce9ba6d88deed8b59154fa255f06 googlefontdirectory-94dff3eaa9301b6640cccc63c56d6ff33d82882c.tar.gz +sha256 ec2ddbeee673cce1b0796e3b20fbff5fd836ce9ba6d88deed8b59154fa255f06 googlefontdirectory-94dff3eaa9301b6640cccc63c56d6ff33d82882c.tar.gz # Locally calculated with # for i in $(find apache/ ofl/ ufl/ -name 'LICENSE.txt' -o -name 'OFL.txt' -o -name 'LICENCE.txt') ; do printf "sha256 %s\n" "$(sha256sum $i)" ; done -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/robotocondensed/LICENSE.txt -sha256 3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5 apache/opensanscondensed/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/walterturncoat/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/fontdinerswanky/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/aclonica/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/sunshiney/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/ultra/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/unkempt/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/slackey/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/satisfy/LICENSE.txt -sha256 3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5 apache/opensans/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/montez/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/kranky/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/arimo/LICENSE.txt -sha256 3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5 apache/opensanshebrew/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/tinos/LICENSE.txt -sha256 3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5 apache/opensanshebrewcondensed/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/justanotherhand/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/robotoslab/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/homemadeapple/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/craftygirls/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/crushed/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/robotomono/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/maidenorange/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/roboto/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/rochester/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/rocksalt/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/creepstercaps/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/nokora/LICENSE.txt -sha256 3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5 apache/mountainsofchristmas/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/cousine/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/syncopate/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/specialelite/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/luckiestguy/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/rancho/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/smokum/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/redressed/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/irishgrover/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/comingsoon/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/cherrycreamsoda/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/schoolbell/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/yellowtail/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/calligraffitti/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/permanentmarker/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/chewy/LICENSE.txt -sha256 0fc8e6675568c02aac6b41dd3cccaf2264fc5969601effe68e09b26635879b2c ofl/ranchers/OFL.txt -sha256 ff72e4d89860e64ee38ccf8a5a7e9dc085d5e36115b096a6c7f8bc988e9bec61 ofl/kumarone/OFL.txt -sha256 643c63caf03855ae29be68035d8888e95eadc767a1d92f163d686da1b0a1cd3c ofl/cantarell/OFL.txt -sha256 1d242ab6fbb2dfbba2e7119b00a6328bc59cb2faf7299b844e9b92a2f12c0d8b ofl/adventpro/OFL.txt -sha256 01af2625d6247ecd2430d1d1603c579f85989d43b2d9129e08e0ac0df8909918 ofl/tienne/OFL.txt -sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/baloobhaina/OFL.txt -sha256 f3bc8767749fc133d9b35e84ca024b82f1ac4d1b38deca0adcf8300892303022 ofl/faustina/OFL.txt -sha256 69c34ca1873308c667ddde663cbf59c0d1cf14cbb945ad010f71d21264249e24 ofl/aubrey/OFL.txt -sha256 4febcc8d6e539db3e0c652da87bc8704f6d48e71e07f8ddb0974094a3de8da81 ofl/flavors/OFL.txt -sha256 d24ff874133ecd133e55d7c4070d2edab14d3933477c2bccb3a0d8d1cc9c33bf ofl/muktavaani/OFL.txt -sha256 ab5499b975c2dc82f533c6f13c5fca589df4d57c7c400db5f6ca8565ad9c2fd3 ofl/butchermancaps/OFL.txt -sha256 6a28d4d5d8b4d1ea89ace5a047ac6e0de182acdb8bfa22897bf7702102094f69 ofl/shadowsintolighttwo/OFL.txt -sha256 7a1d085067cd589026b256dd85af1eaa1087fa0f3d468192724c5138cc14d894 ofl/copse/OFL.txt -sha256 fd17f80dc48ff767d91d0dd9f821eebfd8b73ee82f55537a9052b6b0107622c8 ofl/voces/OFL.txt -sha256 186d750eb496a4c17a76385f82be6aea2ac1cf2de074a811d63786cf374ea73f ofl/barlowsemicondensed/OFL.txt -sha256 4aa1da66597f4c5cfde67790992ee55926ef6aaa87b9a10d529ab35e8b91070c ofl/asapcondensed/OFL.txt -sha256 301f77908df2b00141b4dcea50cc1a586c3afcee78843bd811088e8263623f9d ofl/amaticsc/OFL.txt -sha256 6b6c6721a30480a323cf33acf6a7703dfce46b846827a65f8ee96230060e3c3e ofl/homenaje/OFL.txt -sha256 393d494f9ebb5db6a3552ffa03a4c6f3746c22808b40d011b391681da55ca3f6 ofl/kellyslab/OFL.txt -sha256 ca19ac21c7656f493189093eca52b4239fcc5eacc15ab2e3d67cfbfc0e6e443b ofl/sirinstencil/OFL.txt -sha256 980c2b058d331f3c5ca4a1223e549511b71630e4f4a5533879d436d583cb5665 ofl/arbutus/OFL.txt -sha256 2758cf7a872827f39661cf8cc24188113c030447aefb5ca7145993650076ca8c ofl/ptsans/OFL.txt -sha256 7527e73a61f742a0dd050ab2fc7333de71ac7886023c100bca66a0a93b37498e ofl/headlandone/OFL.txt -sha256 39b26527bf9ed27b4c85b86341eceea0579f3550bcf448cf06345eaadf947ec9 ofl/rugeboogie/OFL.txt -sha256 2ac164969308ac200eefc516151934701044f0db5695ae2acc15df2a8d22e5cb ofl/anaheim/OFL.txt -sha256 88d3abd47414e7912d0d2eb44ca89e0b1bd7c43cc2ebe58a8a75281ad75a0f60 ofl/stardosstencil/OFL.txt -sha256 01003114b77326df223f291c48cdf12e95f6a5937437f164347919f2bbde12d4 ofl/josefinslab/OFL.txt -sha256 83aa5adca2418f091b732a19cc7c30dcb5c00c217051a58f34f5eecb19be0cd3 ofl/average/OFL.txt -sha256 585c6d2da8bcd8ffa651e0016f2e992a6891b625143a46a1dacf00699a817d9a ofl/monoton/OFL.txt -sha256 96e65d9c227a972e38035b849bba1e8b7879eecbb52f278be1e71dd481187f02 ofl/domine/OFL.txt -sha256 d1bf0acea511ad1f4de53e942cffb8ab0e67c03c6203d6f390d71105d52c33f0 ofl/missfajardose/OFL.txt -sha256 131d19126a0e7ddd25540fd6bee219cebbc8aee7e8374882998ee6c2f4ff6cf4 ofl/mergeone/OFL.txt -sha256 042a570b306ab893c6168be7e6e79bbceae46097141357ad0af7ef8bb179ed7b ofl/goblinone/OFL.txt -sha256 91c25c350d3cac39da2736d74f7ba37ef648f5237a4e330a240615bc8d8c4360 ofl/ibmplexserif/OFL.txt -sha256 bc80ea18223ea0db2ed73ab5bfd0cd601906a2b7a163183c6c4ea333be309ce4 ofl/baumans/OFL.txt -sha256 5f5dbf452c1657370d9280b50d647212a53c80acae6d78e0b5e8c2b26dc62b09 ofl/puritan/OFL.txt -sha256 90bd333a5cf0ed09264fc3e559d44979373f6c3d983b0f65cc46e952b4eb61f0 ofl/contrailone/OFL.txt -sha256 1d08c63944e639bbfe8a1b81e3c6a63836806c126b3573b9cda0db83fd27ffe9 ofl/taviraj/OFL.txt -sha256 62fab0ba1d5593782cbf048da193f4b1edc16b817577a99d707827513ad80e9a ofl/overlock/OFL.txt -sha256 75798d56e448ba4d2aec3ef5f3c2d805d9c6fe2ba688cd3d7162b2dd31e9cf48 ofl/textmeone/OFL.txt -sha256 eef925ad6afcbba33f7989f5ad826fd68d50cc1ab4d679c52927c8afd40bddf0 ofl/sedansc/OFL.txt -sha256 466aaa3bbd245e4c91c4e82c0828efe9fcfd913f5b020d75f0918516c2540fa8 ofl/spicyrice/OFL.txt -sha256 88ac81fcd30e64f6e6b91b61b159c9b700bb3dd59012b72ec61629abcfc7fba1 ofl/medulaone/OFL.txt -sha256 1d567f7c5f579d9031ae5edfb0108b4681bdd2e036249b228cc2843d3f052a0f ofl/redactedscript/OFL.txt -sha256 ce78cc8de3f6edd2738e8c02f2079db7086c9a74314baa5854675f83c33954ff ofl/kenia/OFL.txt -sha256 76af3e9e5d8768b17647813a443fcf5df3eb3ced017ee285796625e714d5ea2c ofl/ruslandisplay/OFL.txt -sha256 6e54fc004ebeb61322ecab1d86334ebf69e7051632d48eca489beee505d70762 ofl/hermeneusone/OFL.txt -sha256 8586a7e75681c7297af4cc0641eb2b29e882c5187fe189a1160eceb4e95d4163 ofl/fenix/OFL.txt -sha256 d8eb8611f8c98d20cbf18a28425652d6022dc2a5cca15026b920f1f2bc92a612 ofl/deliusunicase/OFL.txt -sha256 197c3f48cff4df3d768230e0bbdbc4305d8b8b9041ea6fb5e00872af66adc5ae ofl/novamono/OFL.txt -sha256 08fba9df5c9890f3ab00ee63f63e005ad93a23746f7484f5fe9501a1ad32730e ofl/allerta/OFL.txt -sha256 af88d31020bb48a1f78f4384249814d04a44d22feeede2ff4ae79fbb4fcf74da ofl/rammettoone/OFL.txt -sha256 397e83b05703a4240be51e2c3a2be1d0d7693d7a2d8b1ff367c26a2b9afc013e ofl/singleday/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/cedarvillecursive/OFL.txt -sha256 d416bc9437e1d7d8aba0613395ee49c95ce72d680672e910c6205b545cfcbad8 ofl/cherryswash/OFL.txt -sha256 513346ac60af1dde9d4a7bcfad3f39909d5697373a8aa1a6ee4376e6d22d3cdf ofl/niramit/OFL.txt -sha256 0b1bada9befa95a40d55830fe83fc7f8064e245fea33bdf0f96f57848f3866fa ofl/coda/OFL.txt -sha256 2a7b0a41ef401e4e0e955280b07c0a2698932d56aad3181089bdbbaad5760491 ofl/habibi/OFL.txt -sha256 2d62278530348951887211d79d1dba04acebd6ed3b1c413f6154702efea3ea62 ofl/iceberg/OFL.txt -sha256 a20db45220b6c4dc9776f24c77dc9ec7a98977d8b3c65b03aabe66b2d08e0791 ofl/cabincondensed/OFL.txt -sha256 fc1e501d419d84a8f1a800adae092045002d7141241f498237611dbb8ea763d7 ofl/stintultracondensed/OFL.txt -sha256 9a51726e5f247cb1f07bb8f49c163bc3e9ddee5f367bb5a1871d09b854ed1b7c ofl/basic/OFL.txt -sha256 ce0023bc03e1428feb5abfaa939b601d2d827ee5a6c84a2657993a7b16c5290a ofl/diplomatasc/OFL.txt -sha256 e30f893523e50ebbe07acd783ae29c7d604e6208cae7646d993e8528ce13e35a ofl/federo/OFL.txt -sha256 9d96f445b6e9c701428811d0177f894874f8d6f07ecc30d568c506542368f3ff ofl/sharetechmono/OFL.txt -sha256 46239ba6485d28553fd944da4ad32a00d9c403aa1c3e111676b0b96fe458d1d4 ofl/averiasanslibre/OFL.txt -sha256 5951473ab31533bfe1452bbcece47f237a5546c7e7d45ff1aec0289619623294 ofl/fugazone/OFL.txt -sha256 aa5d677391db4e54ad324b6888792e533c5d800de7ab713302a2fc8bff2f4f6e ofl/miltonian/OFL.txt -sha256 e0cde1a4993ed689d463d5e2401f4a60c54cc48a14253ab0f8012d722c417038 ofl/mavenpro/OFL.txt -sha256 c1eed37b6d213df4edf8f92ec7d1e972f751abd68ecd649b4f0b8e5d8e8561f6 ofl/yrsa/OFL.txt -sha256 5bbeae56b9db61a9bf85b64d5ed9a74cfcf9ee3e9b005bc2906859ddecd5eaa1 ofl/esteban/OFL.txt -sha256 7b826efb1b74a50b1c1aef0a1ba4530925b993ceadc3016d1d787c68a61649dd ofl/tenorsans/OFL.txt -sha256 28c6d2887c3dfa42488c5418c6c16ead580d33ff0afe60c05159689201f9ec63 ofl/jollylodger/OFL.txt -sha256 ce0023bc03e1428feb5abfaa939b601d2d827ee5a6c84a2657993a7b16c5290a ofl/diplomata/OFL.txt -sha256 8f2e5a9b52cf355023104413827e17dd7126c5a3656492d45eaa1ceb270aa4f1 ofl/yantramanav/OFL.txt -sha256 fe079cdbbad0f6520eb0a8235bce65b21596dd0c4c5a2694b3325cc87313b618 ofl/shortstack/OFL.txt -sha256 018d17b5e04c0a217a21979fa6b6d77bd5a143a5f06ea2ea102e427abd1ebfa2 ofl/tradewinds/OFL.txt -sha256 31c59bcdd538c113ef5c048f56827439facb12b7e5cfd158b04c83727edc453b ofl/salsa/OFL.txt -sha256 eeacf16032901d0ed0456876ec77b8f0fda6b3fecec7d972f8543eb602e6c30f ofl/nanumpenscript/OFL.txt -sha256 ddf311c28ddf5a5ad9747649837346b67bed9d356789c3072bb27dbce49e514d ofl/ptserifcaption/OFL.txt -sha256 c867d1a613bebc4932cf28c060fefb3bcfba3be56ed498b873c79f4eb786af1d ofl/librebaskerville/OFL.txt -sha256 694282197de3d750a43689dc64a8116cd19578cd516e7b2490c7b5362c064dbe ofl/kameron/OFL.txt -sha256 cb30d3086a8b3ce0b9e3690bf48d6620402b61160bc658076f95180ccd9e9dae ofl/sourcecodepro/OFL.txt -sha256 a40c3a6d0c968d3a10b17a2614606de6f20178deccc2447305f31fb106a57fb0 ofl/fresca/OFL.txt -sha256 5d3457831b42632d958fe1a14a09706d8acb006486a5ca5b2b419cd61cb22e32 ofl/chelaone/OFL.txt -sha256 6b53fb03a50914cc382f4d025ee595c17c43f24ae870f840bc51969d3e316c7e ofl/limelight/OFL.txt -sha256 574430e571a6928624f4bdf044420f7547a26309b7ebf6962296d33294e0a1e0 ofl/combo/OFL.txt -sha256 fd20b82eb12d16ec31a58fc44f7e6c533b14b425b569d83f616a1f7a9a401e75 ofl/gochihand/OFL.txt -sha256 0e74984817cdd51dbfbd8309022aa75f733e80dff0cb1d26ad2157e90446ba97 ofl/enriqueta/OFL.txt -sha256 ddf311c28ddf5a5ad9747649837346b67bed9d356789c3072bb27dbce49e514d ofl/ptserif/OFL.txt -sha256 4e69611ba5017f1fde74c31d342f5c85604814b1b45387b9ab46205996dec38e ofl/astloch/OFL.txt -sha256 013e33b6b2919fd0ffbdde6080a1c0f4521689fdce0f4876a59cf49ff8ae31c0 ofl/geostarfill/OFL.txt -sha256 14b3fbd06078a869cf2ba96e6dacb852d373703c86ca7ad54a4cdd6e20fbab19 ofl/knewave/OFL.txt -sha256 a8103c045a88bf9b28dcd7eb60a6662008f49afc0f3721bc46aaf761fc0409e7 ofl/englebert/OFL.txt -sha256 bd22e766af8f8e58eb520cb4fa73538826d04f7371b45e82295d22d1e32a4e58 ofl/gidugu/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/justmeagaindownhere/OFL.txt -sha256 5fba78215eb4e42aed6cb0b5c5df52e0f71246281a866cd4493dfcfcbcab9518 ofl/playball/OFL.txt -sha256 e75230ee246a04912366cd8d759d081200d80fb0756766c96dd52f73e8b40bed ofl/romanesco/OFL.txt -sha256 39de3de5f1873f89bca4af37823ab22e28e88d0d8f7fe2f07e82e9e6e9bf7b70 ofl/gamjaflower/OFL.txt -sha256 244ca4ef7b106d8c660e9a00cecf5d581b6a222f447d7d59a8f61711b2ad3400 ofl/uncialantiqua/OFL.txt -sha256 36e2f1debc9778bac79fac1a0cb5a5ef51c102f00b58ef7d8a05324144b68166 ofl/didactgothic/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/giveyouglory/OFL.txt -sha256 638774cdf8233b5ddaf9ebee1821e9de1d5d59c335d8ee3ba0b47fb17833b502 ofl/glegoo/OFL.txt -sha256 842b4f4605b32518a1269c4d030d719ea2c4c317d699fc4441d0219658e18893 ofl/seoulnamsan/OFL.txt -sha256 a10a07aaa150c147fa3cb22e845013f38e6c2b45fe5ba32a74ed1be9d4c417ae ofl/odormeanchey/OFL.txt -sha256 a74380bba78a364ec70b3a5fb6a1161b83cb05cc3e75a0910afbd1b5aff4f9c8 ofl/jaldi/OFL.txt -sha256 9b8405bf5f503f92401fc990f372b34d469670ab60041d5298d1015d3d0b45f8 ofl/thabit/OFL.txt -sha256 7c05152b2380228795cb474819744653fb03ddbfe5990b912ec7d9a41387230d ofl/asap/OFL.txt -sha256 ca9fe3a0e10bbb082f83ecdc07f5f04845c4bd689c46456da3e6bae23e11aae2 ofl/inder/OFL.txt -sha256 5b158abb3406e69b7408b562b7199f6ff55a41ea56e260b87176d693b0095e47 ofl/piedra/OFL.txt -sha256 b7eae5e3c3447f70caa14e0c43f5e0d953f54ee59df406f6362863bcee1a0a95 ofl/almendradisplay/OFL.txt -sha256 87b7d831a81fe8b37e7e6c672937493f710ff81883eee3adec7b5423297efd16 ofl/sharetech/OFL.txt -sha256 4ec46c3e4469afa19f0156bac6917472974f9c85c189f9220cf8735d3e810401 ofl/kristi/OFL.txt -sha256 93f60741563b4f51f2fcdb207fde72b2b23292a47022c729aecd998b360d8038 ofl/bilbo/OFL.txt -sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19 ofl/hindcolombo/OFL.txt -sha256 afc1b710d644c1262e1765d2401abcf93a545a4cb051955e2243fbabb8164e25 ofl/carroisgothicsc/OFL.txt -sha256 930fed5b06a415736dc3b4e5f4f01585523b672717564bf677f93966bcd57636 ofl/lustria/OFL.txt -sha256 9a536e5a3b55c2605b0a553eed383cd3efa42ba48dc45cc6f0635b3c53ee791e ofl/warnes/OFL.txt -sha256 879ec56fcc9a961937fd24d542b3b7b3f2b8cb3236b7351e62d16719e25de14c ofl/griffy/OFL.txt -sha256 29cca754098468057880970c604e55c4e2bcb8479742e4130c94f2ddc0363f9c ofl/sixcaps/OFL.txt -sha256 67261c7ceb3e627da5c94d6617dac6da29bf36b910bee304a7680ad62e2c8b46 ofl/changaone/OFL.txt -sha256 327bac41d89cf9f32e0efe353228018e1661cff458a5d4905714958514df7bd5 ofl/lalezar/OFL.txt -sha256 525411e604e7a1d85a4cd42641869f94388f04a6ed77829d6c4edd7fd740ceab ofl/ramaraja/OFL.txt -sha256 3d08baba63f1f2427fd96dee8da30b1ef6c1421b3be0e1f07cc2a78abb27c91d ofl/seaweedscript/OFL.txt -sha256 4c0a1150a363b42bd8681ff4a00315ac49510a944c4c9978237ff8b90a8920a5 ofl/grandhotel/OFL.txt -sha256 bc4c7eb365ea342b1a027fb8417fb0152f5d482a2e31c012fbfa29b668827b04 ofl/cutivemono/OFL.txt -sha256 1818771d183d203703c4b134f028527b535810e2a0666c8fe2785354ddbef686 ofl/battambang/OFL.txt -sha256 b7eae5e3c3447f70caa14e0c43f5e0d953f54ee59df406f6362863bcee1a0a95 ofl/almendra/OFL.txt -sha256 9e0d3db586ba0abf5ca398683809dacdf4c81b2960f592bd085fbf206a67ddb0 ofl/sansitaone/OFL.txt -sha256 fb1dbf3725bbdd389b2c569e0eed5091d8d10eed2833ec7efacfc3542e408615 ofl/scheherazade/OFL.txt -sha256 9134ca6996bd33ea2022e109f13f20e29dee1dcd8b2e8878aad576d2ca334e9f ofl/cormorant/OFL.txt -sha256 156ea6985861158c7dea63ecaac4c78ab0ed737d168ddffc3e34c687985a033b ofl/sansation/OFL.txt -sha256 a9b3e7e1cf5735dc49d802b88b1858a2a50307ba2a877ddf3f0b27d8b1d0abc5 ofl/blackandwhitepicture/OFL.txt -sha256 5fe7f3c9410c29534ddd9dfaf64d3994ed4236096d0d543ae69eacc3b25632b1 ofl/bitter/OFL.txt -sha256 f6f60d5d4cf4f4b1fc4e41353c897a2f5a16e6396c0cd8fa8bdfd2f4586a9a68 ofl/alegreya/OFL.txt -sha256 e88691a5e0a8a3f788f31db959701ec90a1d5e7505f1cc53c5663180a7d23c81 ofl/lohitbengali/OFL.txt -sha256 ac55580be2df22a06d29a47501e2ae11e1d399620f5a779e17a66f016ba6d5ff ofl/portersansblock/OFL.txt -sha256 27d9af34210253e7ca1251fbace86c6f65b40031d6ce1a75493a1b2093631298 ofl/vt323/OFL.txt -sha256 9452ef55386e77bd284ca466587d72802337621d7f10aa700e449753883b3397 ofl/trocchi/OFL.txt -sha256 a9b3e7e1cf5735dc49d802b88b1858a2a50307ba2a877ddf3f0b27d8b1d0abc5 ofl/stylish/OFL.txt -sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19 ofl/hindkochi/OFL.txt -sha256 3173acd82f8c6159b5b1037b539fcbd4edff68e65c2ea8b9412b5a5ca97b08ff ofl/archivoblack/OFL.txt -sha256 c832a4230a713d080aa2f2544d9a298ed911f689b2c48f7f276a0196b16d2b8a ofl/cookie/OFL.txt -sha256 ae28423a5e63cb65e651ccf62c9091b322fff1d2d4e87ad9f98b1096c2e7abb5 ofl/metrophobic/OFL.txt -sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19 ofl/hindsiliguri/OFL.txt -sha256 8c22fb3866eaebd77a2cb8e8ecbb095381ff32300db57758326fef35a26132f5 ofl/ranga/OFL.txt -sha256 d2875ded3e44e9ae53ea2b35e825dafffa19e82c5d14addb9f1150fcd7a3463d ofl/mina/OFL.txt -sha256 8242e7737bce317f7a7f2b887ac87f5bb21305ab96bee92aadc3febac16c35bf ofl/voltaire/OFL.txt -sha256 fca01a37b10879d7685c7d03fc5a04086b15cdb2cb4f870cb687aa5a9a0a1361 ofl/jimnightshade/OFL.txt -sha256 2492bb8645caaf622bdc3e880cdc9b069921e7341346d7b193666c866a1935d0 ofl/condiment/OFL.txt -sha256 e6ac721b16f309c89fb443680afda427ea34968bad190a80edf281d01d65fa99 ofl/andadasc/OFL.txt -sha256 1e5d6660366ddcfca4f2fc10e2acfba9fa4d97d40aec80d7dbfd41d730a420ae ofl/cinzeldecorative/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/coveredbyyourgrace/OFL.txt -sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19 ofl/hindvadodara/OFL.txt -sha256 5c36e7ec460b285185ea23847aa1f508708d9ce15d5c055279defd022972f836 ofl/rakkas/OFL.txt -sha256 0b7eae990329ac175a2e1c329060b3a4d6876e4e0cd7e5235511578352f7b191 ofl/biorhyme/OFL.txt -sha256 c54957d55e7c9e66c28e474cd39de75dc044e8f69056788cae44eb78841ceef1 ofl/montserratsubrayada/OFL.txt -sha256 fccf4916b5f84ef5f88d93fec464421aaf4121d11d4be8d74ee2d032f7661d6c ofl/padauk/OFL.txt -sha256 9ca8b9e5db7184105da255bb110023cf1cce6caa56186341bb7b09ba97b20ba5 ofl/prociono/OFL.txt -sha256 0c3f4763f49c2cd37757a2856ad470aec6a416981ac6d6e3f900c1128be39de7 ofl/elsie/OFL.txt -sha256 0d5fa0cce86012de872273700eef4fd162459e7c24a6a314911380627391071b ofl/bigshotone/OFL.txt -sha256 ca64dee162bf239c7b92d854d388bcd30552edc3ae1ef5e31714acda34c988db ofl/jomhuria/OFL.txt -sha256 bd77eae571de83ba3884c74c7983e8ac5cdf858badc36906179346dcd7e82454 ofl/gentiumbookbasic/OFL.txt -sha256 2ce1c4fcf4ab9c8474d0824434497d4afa4425db4de5629103698b170ac4ee74 ofl/bungeehairline/OFL.txt -sha256 9c56b4e2e4e922cc37e19e1a9e2e1128beaa17a812e1b67c8ac371b0fb57ae03 ofl/kopubbatang/OFL.txt -sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/tillana/OFL.txt -sha256 486c4d5b9baf0d0ba5546ef3c43fcfe22c062299ab6948045a43efffe4b0f74b ofl/italiana/OFL.txt -sha256 4539710406c656519f8ddc789056a7cd6f4fe66b44cc2f52ebca6e251bb26e13 ofl/imprima/OFL.txt -sha256 7f55affd2bce8ed9be13297ba8df1a4a7e9835c2a006126dc2a1eb4ce75a7943 ofl/muli/OFL.txt -sha256 867b506cb023eae20c1accde77b2e0abf7d8a9e2620da8dbebac9f7b1117ca0b ofl/cantoraone/OFL.txt -sha256 aa72b0185d828cb2fafa62a154e84bd3e20c88ada30326089bb20542b6363aaa ofl/manuale/OFL.txt -sha256 4664e83780a263c53dbab95d3590a5a9db914aeb9a3c78f7e7ad451f9151c998 ofl/spacemono/OFL.txt -sha256 fc59ca3cd3bcb47bd4df597519111ec130c25cabcc57a8808dd2d243cdcec6ae ofl/oldenburg/OFL.txt -sha256 43c372f43d145c22e654781860506a75cb85b086dc76028a62a28a446506d253 ofl/italianno/OFL.txt -sha256 a7fe1f3d23034092b015aaeb53d2ecbc9e592be96b10bdfbcf8700ec6a6ffc97 ofl/fascinateinline/OFL.txt -sha256 d13a278247ce39695f5ea6b721103faa668083022c5280b78c6392263e473929 ofl/bonbon/OFL.txt -sha256 f0be7437bbb8b91ad4a4f7a5f3d0020368e494a803d892df03e8886d51f2db3a ofl/candal/OFL.txt -sha256 a68d8ec6bea7f277053ae93bf563d4b97c233f09f8e79f86ffe5db66f31fdddf ofl/prozalibre/OFL.txt -sha256 b00c646b7d04a6da1665a148815b8c589c1e05ed7e1febf7ccbd91758747cb03 ofl/quattrocentosans/OFL.txt -sha256 a3deaae17ab9a15dc3c2778126aa6f80d41d567741853f84b16a9e1318ed799a ofl/koulen/OFL.txt -sha256 50f7b09af5ff677f611a96cdf5eb916307c59b29f2e8144942718cb432a9bf6f ofl/margarine/OFL.txt -sha256 72a22b6dd29b6b0cdcc98de30701b46532c9f7314ee095df3063d10775dd70c3 ofl/trochut/OFL.txt -sha256 325e890b8b26fe0a683c3ba24c506d902bdd7034d9c47bd7fa2bb72b5433b9c9 ofl/shrikhand/OFL.txt -sha256 62fab0ba1d5593782cbf048da193f4b1edc16b817577a99d707827513ad80e9a ofl/overlocksc/OFL.txt -sha256 d941aa56e280b4f204272c4b1add01a8ebc7af3e8e69ba8ba9118aa2a5306dde ofl/berkshireswash/OFL.txt -sha256 9134ca6996bd33ea2022e109f13f20e29dee1dcd8b2e8878aad576d2ca334e9f ofl/cormorantsc/OFL.txt -sha256 36c285c5472c625901d4a13da7e31c5ea6126678d31d56cf95572c49f27c8950 ofl/passionone/OFL.txt -sha256 fbc351e1b5428e4f45834647dc23a5f8aaa3e744e2f4117ca03c44f640b9a3a2 ofl/stintultraexpanded/OFL.txt -sha256 021d5f1df697848da51620394659187be77cbe382ff2f896bc84ffb89c0c2d52 ofl/portlligatsans/OFL.txt -sha256 85b700bfba1250a6f8bdf930cd7113faf3d8e9dc52cd89eb98c3ac8a038a4aa9 ofl/londrinasketch/OFL.txt -sha256 c972795e48b096b6d4e3a947b0bb21c1baf1922a6e07ff9ada587c058f228740 ofl/coustard/OFL.txt -sha256 eb4a7a082fb0e7dde0a8f975d33f02907ccbe40751c8115e790cf3679787d01c ofl/strait/OFL.txt -sha256 9b1cfccef4a7e19f90e2901f808f3aec4335d3cc81f978453ad0c8ded14447a0 ofl/novascript/OFL.txt -sha256 43c89012c2b640187aae7e0c83d5ffa8381a0368c00e8426594358d44d3811e3 ofl/nunitosans/OFL.txt -sha256 fdecdad755f4e5e95bee491c7521f31625dc08283562ea8579543c90430eb269 ofl/karlatamilinclined/OFL.txt -sha256 5e80642a11aff2ead815949a8a929aff3fb7b9b6a24391406068a1b204dcc8ba ofl/abeezee/OFL.txt -sha256 bd77eae571de83ba3884c74c7983e8ac5cdf858badc36906179346dcd7e82454 ofl/gentiumbasic/OFL.txt -sha256 f2fcbde4b8968400d661e7dcc23052b1885815c8e3b45323b26cbb833352f5de ofl/timmana/OFL.txt -sha256 c8af073a60e30b55ef5d0e4f80cea168e06dd65bdee7ec18c1ea8de8f7228780 ofl/strong/OFL.txt -sha256 2ce1c4fcf4ab9c8474d0824434497d4afa4425db4de5629103698b170ac4ee74 ofl/bungeeinline/OFL.txt -sha256 013e33b6b2919fd0ffbdde6080a1c0f4521689fdce0f4876a59cf49ff8ae31c0 ofl/geostar/OFL.txt -sha256 e55c615ed00ce0054bd356041a41e5942b4a8cadceac1e32696ba2ef5f06f748 ofl/andika/OFL.txt -sha256 4705fc9bceb299b2a951d23c321d31f3679871bb99ceadb978907704d211f4f2 ofl/pacifico/OFL.txt -sha256 2887c5bb38abbde9ccc608c4dcc4b0dba0fefc0c74eec011033bcfbd3ffcb235 ofl/jacquesfrancois/OFL.txt -sha256 99d67fff016522688b8f913377f8ae9f6da6ffeae42cf67c0e5e87cfb0928d33 ofl/unna/OFL.txt -sha256 bba4a13f03d0fd5b476cc148feda6895dd8d65f34b2107ba9d010ad9539d6c0a ofl/faunaone/OFL.txt -sha256 842b4f4605b32518a1269c4d030d719ea2c4c317d699fc4441d0219658e18893 ofl/seoulhangang/OFL.txt -sha256 58bbdbe5c48dd1d7cfd658425a455c29811181873d3a46a4932c29e5b0ec16e6 ofl/euphoriascript/OFL.txt -sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/laila/OFL.txt -sha256 17b90cece30db64934b7299fd76b033a3774c8a990e78badc74c59a5be8e0727 ofl/cairo/OFL.txt -sha256 5f8ff4a3f951c104e99245bdb952be08c73369222048bbf19fa3bf7170d10949 ofl/sanchez/OFL.txt -sha256 8eb1c1019fe7fe6d0b6e7d7bbbba1d9cbdd969d8c5f26455708f6cfb8a77284c ofl/nanummyeongjo/OFL.txt -sha256 942d51cf079299e83e9dd7a9a37eb92260524e8d1d576b2f0b3f7ca207c53f8e ofl/newrocker/OFL.txt -sha256 117fa195cff980e3b10fd8e8e21658c6ec954b0886647970a03c9694d3553b69 ofl/galindo/OFL.txt -sha256 1d08c63944e639bbfe8a1b81e3c6a63836806c126b3573b9cda0db83fd27ffe9 ofl/athiti/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/annieuseyourtelescope/OFL.txt -sha256 f2ab7e5c5c750fa03a8d8f64c72a089ed86fbd3dc172440fcc704b27816d5957 ofl/noticiatext/OFL.txt -sha256 9a33b452a3107542c35fc5fcee80e4d8798c82aca071c2f6f58a0f8dc5ad61fe ofl/cevicheone/OFL.txt -sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/balootammudu/OFL.txt -sha256 8f24842e9174beda18a556c2ae7d54f5dc444340c19a3a9ef77e23bca366adbd ofl/firasansextracondensed/OFL.txt -sha256 746b384383888d9325ed2fa9c40d2456b458aa190dd2b8c515ed4f02a1075bb7 ofl/magra/OFL.txt -sha256 8f24842e9174beda18a556c2ae7d54f5dc444340c19a3a9ef77e23bca366adbd ofl/firasanscondensed/OFL.txt -sha256 fe9183a0b7c1ae626b14004cd533c89ec7c192aba017f81ab71ede910256abb2 ofl/abhayalibre/OFL.txt -sha256 876db27db250a9b9c03fc2ef30a5efe1f37c2ed2686d368c3779583bdf746912 ofl/balthazar/OFL.txt -sha256 4342add6f0f2261f8579f31c10a55938930559703eed18be4a33b74eb749d298 ofl/doppioone/OFL.txt -sha256 d8eb8611f8c98d20cbf18a28425652d6022dc2a5cca15026b920f1f2bc92a612 ofl/deliusswashcaps/OFL.txt -sha256 16a8be6ac4b009ba1dd1e17cea48762f4915609ea5dca1303f716cf63998739d ofl/adamina/OFL.txt -sha256 1d567f7c5f579d9031ae5edfb0108b4681bdd2e036249b228cc2843d3f052a0f ofl/redacted/OFL.txt -sha256 866669fde730bf2785f44905ec162f05f2b8d9f6dcf366aca99360fedbfe502c ofl/dancingscript/OFL.txt -sha256 008445a4d53fbd71bff9cf733bdfd841a1b15fb58ef3473f7bab4c456e3b2930 ofl/ovo/OFL.txt -sha256 b7eae5e3c3447f70caa14e0c43f5e0d953f54ee59df406f6362863bcee1a0a95 ofl/almendrasc/OFL.txt -sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfellgreatprimersc/OFL.txt -sha256 95d23e4559ea8c6a36aa04fab56e1dca0780f5d93734072d4501023296543102 ofl/archivo/OFL.txt -sha256 3747fdcbfe4f51d6a2f101c35105bacde3715b3c32b34b6b03e5fb37983f89fc ofl/quando/OFL.txt -sha256 38a83f1f8b6efc3ab354b8b6eed22e8524dc71280844dc24811d95ae27b34952 ofl/khyay/OFL.txt -sha256 b8fb5cd1bafb52e652c733fdb75ee20c763e97acb0398f6b4bbe1d8ada0c07e5 ofl/misssaintdelafield/OFL.txt -sha256 a3b0977c5c25101d45054cf9199b9127b05fddc79d4da7dcf400821824e5a6d0 ofl/radley/OFL.txt -sha256 41f82bb4d24b304f30f7136bc47abdd083782e4265c984160f5649d1e78ea49c ofl/montserratalternates/OFL.txt -sha256 7c05152b2380228795cb474819744653fb03ddbfe5990b912ec7d9a41387230d ofl/asapvfbeta/OFL.txt -sha256 d3909465d5838d9d1c72b975ff1ed4f410a85dccd43801be525bf2b2bde89f92 ofl/snippet/OFL.txt -sha256 2ee5e8e47cd7d08f60bb9555f72b25912c9e81b13f5bc9a0551ddf943da6ca98 ofl/mukta/OFL.txt -sha256 f323edc1e5a6d8fa16120aa15367cdfb15468474cc621f9bda1a2f73c5d08d73 ofl/sedgwickavedisplay/OFL.txt -sha256 eef925ad6afcbba33f7989f5ad826fd68d50cc1ab4d679c52927c8afd40bddf0 ofl/sedan/OFL.txt -sha256 4281c00ab5b8f672fc8d686f48cb886ffbe900c8c9ee22473ca7e72e7cef8fbe ofl/wellfleet/OFL.txt -sha256 8b89f3af5fd02216793ff3dfe9a04dc22dfe5c213422ae21558ff1da6a1e94dd ofl/cabinvfbeta/OFL.txt -sha256 4bf7256c8ee73577ee5e26643d3247ec77017ca04489befd3e0f3412827729c7 ofl/laomuangdon/OFL.txt -sha256 399b33eb38cdfc76b8665defa5f81d52e8193d630ad5858c893db6bc20031bc9 ofl/rye/OFL.txt -sha256 aa5d677391db4e54ad324b6888792e533c5d800de7ab713302a2fc8bff2f4f6e ofl/miltoniantattoo/OFL.txt -sha256 8594350034ab1cb85a1946ef8852e69290255816c311450a66fed6eeda9d6292 ofl/anonymouspro/OFL.txt -sha256 1e5d6660366ddcfca4f2fc10e2acfba9fa4d97d40aec80d7dbfd41d730a420ae ofl/cinzel/OFL.txt -sha256 351740da2d452b48193483f22f64918a6dfd64a7abe225c6187ad3f36e0d9cd8 ofl/postnobillsjaffna/OFL.txt -sha256 64a73da7af818283168543e24bd214aded1bfec06f013bf9cebc20064a8560c5 ofl/elmessiri/OFL.txt -sha256 4fece81b541808b40293b0cd3f5b1990274e1100e1c20455dc2987cd96639d3f ofl/metamorphous/OFL.txt -sha256 8d325681662a30f58f57c92ab656dcbc9679deb78a493e4c0eab75321b2df6c3 ofl/worksans/OFL.txt -sha256 2887c5bb38abbde9ccc608c4dcc4b0dba0fefc0c74eec011033bcfbd3ffcb235 ofl/jacquesfrancoisshadow/OFL.txt -sha256 aac8f0cda6159b7251d1034651bcb42e07611495bc8cd764c89d22f3123032f8 ofl/aladin/OFL.txt -sha256 81d0973236b5b5709a80a217a330db36eabedf57bf4031de46b4660b69901234 ofl/leaguescript/OFL.txt -sha256 5454dc5cf2f46a2005f42f13ee2a998c7d0afd7f556f32fda208c72b266f7adc ofl/cambo/OFL.txt -sha256 b2d4b0c773afce947728ab99fca43b242b7edb0da26fe29f60c7c2d5094ec23e ofl/suwannaphum/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/labelleaurore/OFL.txt -sha256 6939af7114f0a33c7e6142d4c1320d1bbde11aebe6d8f3c48fc5fb3e0f676a7b ofl/jejumyeongjo/OFL.txt -sha256 cbdf9d35f32a9a2f02fb23c8b89c115a5a8e45feaaa2266920c4594c83dd5ed4 ofl/tenaliramakrishna/OFL.txt -sha256 95d23e4559ea8c6a36aa04fab56e1dca0780f5d93734072d4501023296543102 ofl/archivovfbeta/OFL.txt -sha256 967d75b89eef1f8a0ba1f5ee7dfb13427621f9116c6e7878ca04da8c9aa8641b ofl/mrssheppards/OFL.txt -sha256 8af83da84dd4299842f871285a88049352ab301ffa1f233d2595b29506158635 ofl/blackopsone/OFL.txt -sha256 548890e4083028f04e5feba04b6e00554654d840aab81c8664eb66c2216a571b ofl/palanquin/OFL.txt -sha256 c4cd9f38c3246ee6a68c264f017320dc1af09677d386166d8cda806d9a12e0d2 ofl/jockeyone/OFL.txt -sha256 a36ab46c8b1a74a480a1c51d6a5af08b643e870c6d247f233bc97c97c8ad2098 ofl/tuffy/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/nothingyoucoulddo/OFL.txt -sha256 b5c776129b160163c84620b35fd45dea45edf49789cda5a94c2290c230581e0b ofl/scopeone/OFL.txt -sha256 dd028a807788d5e22e9f8cc18f026cda23369954673658f2ecc7d30bdb364b89 ofl/sintony/OFL.txt -sha256 8928e999ff156e35852ab41d7a906598a8285acd3bcd81dff67213a6cd98d43e ofl/mallanna/OFL.txt -sha256 473c5e3123102434d05c66a9fc8b19cf285a3bf71cd8a91a41acef44d1448e62 ofl/sevillana/OFL.txt -sha256 22d1914919d3fe08b179dc31169fc743ca7eede7827b91a5d48c23c8cdc7cb81 ofl/anticslab/OFL.txt -sha256 026610186158060ad351fb20cd1452def5d35b2531634c090ce8cd1d9e9aeaf2 ofl/michroma/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/shadowsintolight/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/architectsdaughter/OFL.txt -sha256 61056041809e0ba18bf8b9d637a375ab1c725025428533d74d668d88b2cb8b89 ofl/simonetta/OFL.txt -sha256 0a852a06f0256a6684662663ccb1d8e08d131abd1f70cf8d972a344cf31aa381 ofl/scada/OFL.txt -sha256 f46c3ea04f38ea73c0731d73dfba3d7361d4b38970feb31a3558bd1b75e0656a ofl/lobstertwo/OFL.txt -sha256 f30a7045e4e21201182b2b9fc4e4b96189aaeaceb2c8e9b68d8bd3dc4e3c5a27 ofl/greatvibes/OFL.txt -sha256 9bc1eb1c679510b32d2e3f5f4f3b47726b1657aa121494aa68ba0b124a3c3a53 ofl/ewert/OFL.txt -sha256 1103d0731f1360eb156b0047a1337b2d62266fadcef1015d06f6263719c0200b ofl/librebarcode39/OFL.txt -sha256 359671bf16c00cae69cb66d041296b2adc7a4becd73a463cb8c5e101d97c7986 ofl/arvo/OFL.txt -sha256 c09e3b81d9cfeec46bc29a3374000e8ad013d694bdf24a288088491dd4cd5c69 ofl/creepster/OFL.txt -sha256 29bd0cfd0fb2a45f9b057c834a057724bae1f63b525a8ac83d3e7525706d9f80 ofl/inconsolata/OFL.txt -sha256 85814924eca98e1fa530901cc5167d0012aaf31122f9570d7e9755443dd9335b ofl/siamreap/OFL.txt -sha256 223fa23e8419ee762c662e0faf912dfcf386fa7093ac9ff690e380ce1993ba55 ofl/asar/OFL.txt -sha256 a0369b1d5f654110f2fe101db56a02d02806f1e609ab233368bc573ec45050e5 ofl/butcherman/OFL.txt -sha256 4f8b437578b20bff261adfe6c02f63bcf7dbb6a45ab37804b3547e5d5f44927b ofl/nosifercaps/OFL.txt -sha256 793891edf1f4f4f35b52fcc9706b03f779c7ea18ab8e9e441242d63ef0279488 ofl/autourone/OFL.txt -sha256 842b4f4605b32518a1269c4d030d719ea2c4c317d699fc4441d0219658e18893 ofl/seoulhangangcondensed/OFL.txt -sha256 1c023b4aca0e441c55c45c86cdff57fa524a96778f291d9a29a4ad777b70e2e3 ofl/arbutusslab/OFL.txt -sha256 de61c87e08286ad3215398340e9403125ab03c91b33bdf29de6d3e8a386d2d28 ofl/dangrek/OFL.txt -sha256 53ad6a474f68ddfc3fe72449de3ede4d3f033b2f24b77833b1d56edf505486d2 ofl/sura/OFL.txt -sha256 247edbf968c0a5b8defd6a9e420080a8bbca6ea002bfb326d12a472a6f95637b ofl/cuprum/OFL.txt -sha256 0623888cc2391c6c9853c04eafa7f687fef1a8328bbb848feab05d9e2a98764d ofl/emilyscandy/OFL.txt -sha256 1c43e70c49ef7a9b35fcb3758fec8ec5969ff1274c4834b4466b9014f3b9f55f ofl/volkhov/OFL.txt -sha256 cc31fe974951d56d542f33782d07b2d5577a4afdddba89744e6bd69bcbf3a853 ofl/karlatamilupright/OFL.txt -sha256 cd354a6084383c50398fae709ebe3a5dd98b947c486c1fe9de5f89caf81f980c ofl/snowburstone/OFL.txt -sha256 8a59454b7f1cc0b1fa29805781769047e5c269aa629e3422c2d7fc04b89e5c1f ofl/rosarivo/OFL.txt -sha256 de71817dafdecfee21268b8c4f106146e1d00988c4fd6546b10445eb26b24cc0 ofl/expletussans/OFL.txt -sha256 d1829ff3455bbf3b9d13dfb0a57758a863107c9108aab48558f26f37f1094180 ofl/firamono/OFL.txt -sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/rajdhani/OFL.txt -sha256 26e4c39c4905bd7f1068b0bab008f5a4a9b945e2d7fda31e52719fc5aa9655bf ofl/vibur/OFL.txt -sha256 49f2a11271968a2ce019a43bf5401d1593652a18f27ea59037ff5e39856d2df7 ofl/changa/OFL.txt -sha256 1d08c63944e639bbfe8a1b81e3c6a63836806c126b3573b9cda0db83fd27ffe9 ofl/maitree/OFL.txt -sha256 2758cf7a872827f39661cf8cc24188113c030447aefb5ca7145993650076ca8c ofl/ptsanscaption/OFL.txt -sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19 ofl/hindmadurai/OFL.txt -sha256 f354ef1e7256644b320c5e1d9a07a819c2e2b930166003c96680894f9fba81be ofl/mrssaintdelafield/OFL.txt -sha256 5c289da4a19f054ace8e31a144a6a254601898cd7faf9eaa301141afda0adbbe ofl/coiny/OFL.txt -sha256 0886960207bb5bcf81a46ce663bab6c52a742dad80ee2cff5cbcda6f1df88568 ofl/rhodiumlibre/OFL.txt -sha256 8f94e5901c371537043e0c762c827ce33963e7bd186fbea0abafc035ef7120a7 ofl/emblemaone/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/gloriahallelujah/OFL.txt -sha256 24af1fb3ab8dfeddc83162b7f3b6c1104149b6c3022f1aa948ef4f8ff7e6bf7c ofl/poetsenone/OFL.txt -sha256 f3ee3eb20a9d565bee2bbc0d616de382a113327d7506565b2f3d3bee5f489375 ofl/bowlbyone/OFL.txt -sha256 70f664de65e7bb62e1ac728f20a9bb28de7fdc18be594186137a9e15ce9dcee5 ofl/niconne/OFL.txt -sha256 e604b133509815768e6ec4738bb04844ce9a23e80099d2b61e5d75ef46acbeb0 ofl/ruluko/OFL.txt -sha256 42ad5a49e171bec80308a1c9e8e66b03e638b3ea65af7fafa6fc0e42f45e7626 ofl/suravaram/OFL.txt -sha256 4fe81901e6f84cfce1145c715e931352a9a12aa7ac75cc193eb523c0cb0e5eb5 ofl/lohitdevanagari/OFL.txt -sha256 2937c7789b0e4fdeda6eafe93164a2ab36e20386704c4cb6f87b1deb620ec0da ofl/leckerlione/OFL.txt -sha256 91c25c350d3cac39da2736d74f7ba37ef648f5237a4e330a240615bc8d8c4360 ofl/ibmplexmono/OFL.txt -sha256 fce9f9e2fb268507a89fceea0b3eccc044f39fc3492968a04fd9e04df5ae95fa ofl/sourcesanspro/OFL.txt -sha256 e12a3e737fa75c0ee072d965b6185710f35e38a4f7a0793ebc66ba14a216109b ofl/meiescript/OFL.txt -sha256 d2f9c74aba2716333b0a3d283083f9fdc93b2e060c5ae094c79e97e8cba9d7e6 ofl/squadaone/OFL.txt -sha256 5d6517d497bea6116ed35079b30374043f6d90b19c8d97fc4e5ec48520d1e08b ofl/zcoolkuaile/OFL.txt -sha256 f8a20490ee8ad3adb2205ea44b279b19099a3a1d6b62849e90b4db20a77deeb8 ofl/brunoace/OFL.txt -sha256 75b2a5f39a53b4cf9286eb3d2cc1f895a8f3442680013c77124121bc347a6448 ofl/lemonada/OFL.txt -sha256 715ba72697e14daa9b29a333545f69bde7c497b9f77d0a2a4c4a5a752d961801 ofl/marcellus/OFL.txt -sha256 1103d0731f1360eb156b0047a1337b2d62266fadcef1015d06f6263719c0200b ofl/librebarcode128text/OFL.txt -sha256 eba176d3ae86af6b41e9b744e4d18fb56e2a6ad671381bddb61fabb86b1d39c1 ofl/croissantone/OFL.txt -sha256 12404fcefccc3cb964cb2406510ba679b30f7d7ae689db08df5b455ae24b3feb ofl/paytoneone/OFL.txt -sha256 e2a176ce310235bf281f1124454e21331390ae1b4c429a2d80ae642d333a5a7f ofl/frankruhllibre/OFL.txt -sha256 2d83a49d05906b5e23285168e72c0d019fc15e3ad110376f640feeeda34c27d1 ofl/hennypenny/OFL.txt -sha256 d7d8074c2dd46804990c184e25849947ab76c5ac7607fbf3966543455769bb73 ofl/yeonsung/OFL.txt -sha256 13831d02389d917d22fcfa6c79f98f8acbf61d230add0e73a4d4dc5f3bfb9e56 ofl/chakrapetch/OFL.txt -sha256 c39e284759a441660d4c4d852c537e271d0fd5c301fe46d065a972b6ee144ba8 ofl/aksarabaligalang/OFL.txt -sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19 ofl/hindmysuru/OFL.txt -sha256 0da6a3e5b24a9fa04085c20a2a1d3101eeb1e0bff56a2291f407187e1b2adcf2 ofl/mrdafoe/OFL.txt -sha256 a815f65bc72d90494b01842d3171f7cb0f9f935e023d9cc260904d221ef1064a ofl/b612/OFL.txt -sha256 e2f2dc7a667954c16a919acff5351e8ea89813d10f5a7504e1f4668fffbfa14b ofl/barrio/OFL.txt -sha256 8c495ddd455def58a45310376a747bb61bf86e4b071cc527b3618bccd3ef00fa ofl/chauphilomeneone/OFL.txt -sha256 b687f920fe20fe48d8f7709421e5deeb4becea295c80ce62aadcffc54132fa1b ofl/stalinone/OFL.txt -sha256 a90a8ebe28f3c2905a44557166010a3d219ffcce1703c3c3280ea8728d5e2ebd ofl/heebo/OFL.txt -sha256 c267a00c9476c78a2336d7b372b536885b8b24173a29ed53496f67a742c14961 ofl/alefhebrew/OFL.txt -sha256 2cd51b11e821dad2fb7acc54d68bd9a139fc7a1207e17c432ba9ce49bba3d493 ofl/fasterone/OFL.txt -sha256 ca424122f42a8d8442bc4cfd902f5f027ea67b5417705f5af1d1235927781720 ofl/amethysta/OFL.txt -sha256 bb8fac04b8535d39fb9851c9d886248d25bc0c82000066c92dd577c3369f512b ofl/chenla/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/lovedbytheking/OFL.txt -sha256 53a9ce47085d9fef613c7ecb3730dc80d25962510bbea231b89564f58240f251 ofl/gaegu/OFL.txt -sha256 9d96f445b6e9c701428811d0177f894874f8d6f07ecc30d568c506542368f3ff ofl/share/OFL.txt -sha256 9465823369fbe1ae0b5a3065021d53ef8c56e113e664229455dc80b237fa6a07 ofl/nobile/OFL.txt -sha256 0dd8e32457e18621737b593ab0fac49905cd948a078ed0e64f4890df714a1dfb ofl/amita/OFL.txt -sha256 791936b10381b512512317572fb5eee91bf503344d52c37335e402fc1cf19992 ofl/reemkufi/OFL.txt -sha256 898a9cf80636e86d6b6009b96795fda29e431ee701c28c36f274a7e8a7d8246b ofl/rubik/OFL.txt -sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/baloothambi/OFL.txt -sha256 382232d1add5623ba5b06394afa071f4eeecccb6d2b2bd02cfecff4a8a45065a ofl/fondamento/OFL.txt -sha256 0c3f4763f49c2cd37757a2856ad470aec6a416981ac6d6e3f900c1128be39de7 ofl/elsieswashcaps/OFL.txt -sha256 d849309d514833fe3d7a610e10f6cd5d99b4f9552bfa304969acbf89c66e4422 ofl/smythe/OFL.txt -sha256 53f9c99fa3d47f7d632a42ee7bab4a834a60a744f6026d676c3a223cef2b2ef3 ofl/vollkorn/OFL.txt -sha256 a1077580b649c7b0e05ea0e9369d48687b4ab1c585573bf86b0dcce7dde177c0 ofl/junge/OFL.txt -sha256 a9b40759b5821a0c2ad07cbd2c2a61dca4b3e222e6370a7d5bfb6b373bf4fb10 ofl/sunflower/OFL.txt -sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19 ofl/hindguntur/OFL.txt -sha256 84b11cc0aac8fdb93af94872bc4b8f015caabf4919db63ab7f916ccff8e52f56 ofl/josefinsans/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/dawningofanewday/OFL.txt -sha256 f27cbf1055db7b9dd80bce5cd12b462f2d9ed7313d84dd8bfef1ddd2b61bdfc5 ofl/chicle/OFL.txt -sha256 aba8997e16b1e3888c6e855ba883c70d96bd4375bff8cb9c7ce0f097200f74b8 ofl/abrilfatface/OFL.txt -sha256 8f24842e9174beda18a556c2ae7d54f5dc444340c19a3a9ef77e23bca366adbd ofl/firasans/OFL.txt -sha256 d484e0dce424a9e360adabb568b6773db5f1566df71ce3e9dcd66a6cc2c38d33 ofl/ericaone/OFL.txt -sha256 1b3b78123c94dcbc9fd4ec174317336c8c93423da62dc946b8852553cb13ddee ofl/economica/OFL.txt -sha256 74584d937293a9cacdcd2eb05851b71aa1527901c18b87961d2f877c77a1b486 ofl/kanit/OFL.txt -sha256 a6a74417db7c37f69495da556a3eb86a22a784ffb0131e3e0a5a47ce8d7fa5fb ofl/shanti/OFL.txt -sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfelldoublepicasc/OFL.txt -sha256 963f283b5410c7df62067a35cd7def0802c583a880e7cd7e326832ec3985ec87 ofl/spectral/OFL.txt -sha256 11bdf9c7abd81f46a88b0b017d78a0e51f451e9dc0c2272813aa9f456ee886ca ofl/kiteone/OFL.txt -sha256 6827fa45930d5847fca5b3d3898b3d87a229fba772a5b6c5bc33bf73ec83478d ofl/khmer/OFL.txt -sha256 5ae0cfa62a70251d9a2c3c5430ed3bafa480005f23e4b9525488f2318e5c10ca ofl/mrbedfort/OFL.txt -sha256 34b8afbcab7508bea23847288332a8c05a507364ca6f0c8756ce560d7d59d506 ofl/mada/OFL.txt -sha256 b67eed9578defb59cc4ff4b58428fb816786e499e84cdeafca54723b055c169e ofl/viga/OFL.txt -sha256 afc1cda4eedcfe27c8cf30fe3e9879587cb43cc2882d4cb91dd3e3fc9eecd0bf ofl/farsan/OFL.txt -sha256 cc8c0c3e81cf543e190f128b83ba7c30959f15865c14dd972fca4917faeceec1 ofl/encodesanscondensed/OFL.txt -sha256 9ca8b9e5db7184105da255bb110023cf1cce6caa56186341bb7b09ba97b20ba5 ofl/lindenhill/OFL.txt -sha256 a89ac8075be60f2beba79bed3fa253415a373dbdc3bb108b23f4854d0dd495b8 ofl/pathwaygothicone/OFL.txt -sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19 ofl/hindjalandhar/OFL.txt -sha256 f22a2beea88d631a620b15683fd03e79f13ad3297ad97fa5e42283c0b1a3a038 ofl/marckscript/OFL.txt -sha256 faf47a1ceab38b07205b9d58fbbf9ac39772ea47cc731aca7816276da7226a22 ofl/terminaldosis/OFL.txt -sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfellgreatprimer/OFL.txt -sha256 d2f87f90d108a947f98c030d9d8e4bf27e761ce83f222453b9a7230c5fb309e1 ofl/novaflat/OFL.txt -sha256 2da0fa5707f1fab1c802969b098fd1b92ca0b3b233a80e27fca416647c064dfc ofl/exo/OFL.txt -sha256 f9e5dfcdb2947c0db70465668706b0617cd052b6f86e582dff8741d9e5cded0a ofl/yinmar/OFL.txt -sha256 bcb0bda74430ccc281a616a81d0a287fed5a423815b00b222e0b7f603f85b26f ofl/caesardressing/OFL.txt -sha256 a94cfd8d1f5c33f9a7506def359b907f3313f7008bb57fc893985963cd342f8f ofl/arsenal/OFL.txt -sha256 52caec7d90533523fa7da64e95faf90ea32a663ce21847a39234b61e18d25044 ofl/bokor/OFL.txt -sha256 ef0bdccd20de76d517fb3939161d05ecd5808382fb8fa82cde5fcdb3adcb8029 ofl/engagement/OFL.txt -sha256 0d75673e4c98de3e11337dbd90b05d0232edfcade5c1c02fbc0118c85aea25da ofl/macondo/OFL.txt -sha256 9cd20277e2c89d47e3997435e3a16539d20173d850fbb42474990f71642e473e ofl/matesc/OFL.txt -sha256 a7ba785ad99b6eae0444ab89910e512d4af9865937fddbcb5c72c4f59f55d6ad ofl/merriweather/OFL.txt -sha256 010cb216e8f3fbb2836fa3f38787a412b749352de546797f57c03c3bcfe46b1f ofl/nunito/OFL.txt -sha256 91c25c350d3cac39da2736d74f7ba37ef648f5237a4e330a240615bc8d8c4360 ofl/ibmplexsans/OFL.txt -sha256 cb8bbf7a86eefa8c146f24ae5be74fffa887ba83719ab3c87036be8e3d0191e2 ofl/montaga/OFL.txt -sha256 1103d0731f1360eb156b0047a1337b2d62266fadcef1015d06f6263719c0200b ofl/librebarcode128/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/overtherainbow/OFL.txt -sha256 3621f156cc7a26e0a9cb413332e0bb35a0e76b36dbfe0b1c885b565a7bf3051e ofl/drsugiyama/OFL.txt -sha256 fbb941b371c6348ee2572ce8c78fb66128a61885f960dec1906c4e44ca4b4d3c ofl/reeniebeanie/OFL.txt -sha256 9e19c0d2e7e7adcbe9dfd0749e34dda41e7e356e0f2cc082d61d2fc9b6e0cef7 ofl/gfsdidot/OFL.txt -sha256 812fc4af0c63d31e0e81cc153af74e397407b0630e918b8b965bcbb192bc0656 ofl/artifika/OFL.txt -sha256 e8ad3f3de5baeff6bac6e711d8c406e0a6b8a61d2944741532d8965d893a2681 ofl/pirataone/OFL.txt -sha256 9134ca6996bd33ea2022e109f13f20e29dee1dcd8b2e8878aad576d2ca334e9f ofl/cormorantupright/OFL.txt -sha256 65f43260cf7e66b57ddca8d148384a6602e2c06edd389a8b3cf388045127b47d ofl/lusitana/OFL.txt -sha256 518962c41d4a5e96b0016bd8d8acc965413ea1a0102467e4955931e702b14a0d ofl/iceland/OFL.txt -sha256 2171558d2482764644a2f793696fa2e48c361730ecc87686b9a29082d6daeb10 ofl/khula/OFL.txt -sha256 d336c098ea798bf14de111cd90dff7d6bc340852405246511345d0f8564fe76e ofl/fingerpaint/OFL.txt -sha256 ea274e87939d38032b31fb741af75bff9fa3f8d4a8b652265f9e0ce1ad7e9f80 ofl/asul/OFL.txt -sha256 eb1992aec1cf892ec94ffc116d79b62c7cb03dc108141b94a57a4195d210b514 ofl/meddon/OFL.txt -sha256 9b584984f9db0ee30347391a76eff9c0a6b03dc450c3c6afe3757a2cb3a4db87 ofl/tajawal/OFL.txt -sha256 1dd84b611f4bed7f9ff9089e76a96337b187e6f283a4ab33bcb987f844f2c4db ofl/parisienne/OFL.txt -sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/hind/OFL.txt -sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfelldwpica/OFL.txt -sha256 de08ff7a460541753999b1208f1254f1d31f16b421312aca4d4b8179d997de38 ofl/aleo/OFL.txt -sha256 7706a84d7e49e2273877106334a1eded8ae89fb5839fb81e0f2bb27c846f667e ofl/lora/OFL.txt -sha256 cc31fe974951d56d542f33782d07b2d5577a4afdddba89744e6bd69bcbf3a853 ofl/karla/OFL.txt -sha256 0409c6582424508453ce41648067efaacf0c790622918493d8f1d934bc5329a0 ofl/bigelowrules/OFL.txt -sha256 9e2d92fb24b4a548ab030c509ba88267e224f2523728ee9bb35cf334811106bd ofl/exo2/OFL.txt -sha256 f480fd19e7018942ecaf460f7a4ab9ccee0aec579abcb07d559dbede913864c6 ofl/alikeangular/OFL.txt -sha256 6ea7a3ef1d07feb592693f3f22c26d0b09321ff81814292b49be99888d0da9d7 ofl/ponnala/OFL.txt -sha256 0b7eae990329ac175a2e1c329060b3a4d6876e4e0cd7e5235511578352f7b191 ofl/biorhymeexpanded/OFL.txt -sha256 21b54eb0d7513524798a00dfbaf99a02c003a0012a728cc5f0e02d24c50482fb ofl/caveat/OFL.txt -sha256 adadb8d5d34fe2218dca0f4a4919a9b6f81dfaebb289e5446ac7b3063d6965e9 ofl/tangerine/OFL.txt -sha256 16741ac498178f645283cfb45b7a487b6d361b5de5730c5ea729f056f414f6b0 ofl/ropasans/OFL.txt -sha256 1e5bf8207a40678bc401e2e5456d0db1f2a183b550a30976b48dcdd6a4e4c46c ofl/caudex/OFL.txt -sha256 6f9e3a1c51f617e7b110862426204ec7a56d8c6d2f731373b5de6b8d069099b6 ofl/ebgaramond/OFL.txt -sha256 c2368518f12463a93cfed44e1460f36085dc60df06f415ee9b0319809987ccce ofl/frijole/OFL.txt -sha256 5f247fad3e8a86b6c0779dff09277047c1ce2b0b7580a1093347a8af755352ba ofl/sawarabigothic/OFL.txt -sha256 6627b9c2c8ff8e0c6ef23f1b0125dd5b293320c10c916d402fef64916c296d0e ofl/kreon/OFL.txt -sha256 723764a50d4e6985dfcbd75fcb40dbd3abab37ba25ae626486d4a32084854487 ofl/kdamthmor/OFL.txt -sha256 846ce83956a732edd57b74d9ba988d58abc8c8e6d0926859559318ce6aed139d ofl/mclaren/OFL.txt -sha256 ba01480319f922ecebbc73f1a523e7f8876e92b16553a32c494bcd3f6f5a27fa ofl/ledger/OFL.txt -sha256 c3bfad2900a83f571d5c984d490d51c56aef14806c28dde38125593e1e71daca ofl/mrdehaviland/OFL.txt -sha256 12af42b715a3901bfa7add1351e45b6ce22f3061555d52db45e963274c349360 ofl/arimamadurai/OFL.txt -sha256 aa8a8196a3e22c3bd985e33cd3245ae9a38accba5e79fc0e3b292612a8d6b337 ofl/miriamlibre/OFL.txt -sha256 3169e7e0e87168908218f11d660a52c0b81b5952fd73918a596e70721d68d3e5 ofl/inika/OFL.txt -sha256 e711c816f7de931244976f51166baa15446fc307e5d0ea04fdca1bc2c04afb1c ofl/nixieone/OFL.txt -sha256 1ba345a91338581e5f8fccc3e37e447ddea5b99ec9caec1b76c7c39492387d2f ofl/signika/OFL.txt -sha256 b01cec9e5e2035b70a6aeb61c673d1f6d5c91539845be07733bd9880fddeb9f0 ofl/kadwa/OFL.txt -sha256 d7577acbab1d70f2e6bd1b21d8f61db189d6aabe6375bc2d96564b8d94031664 ofl/stalemate/OFL.txt -sha256 5946eec3a7d3bda02825930156e4716198e7753641dd3303a3e8c386c8011909 ofl/eatercaps/OFL.txt -sha256 ae6de2f6fc00f76cc7eb0d97c1ae5e0b7ec734f20ad7f58cf4c74738dc822d21 ofl/chelseamarket/OFL.txt -sha256 860cbfdc9dbc3f0e8d35af80c31e8f20945bff393d4f483dfc157469e01d321c ofl/gorditas/OFL.txt -sha256 9a2d8c5a3de0a6e62432322115dce136139948411dba33cd86525c0a02749fb8 ofl/unicaone/OFL.txt -sha256 4fe01b13ffb41faa8f030d84843a95dab32792dfeeca7c072abbfd3f4d6896ad ofl/audiowide/OFL.txt -sha256 173ea2d0bdda981829719623c35699e8c0e4aa508e0af12817ad7ccbfa4c6137 ofl/originalsurfer/OFL.txt -sha256 1d08c63944e639bbfe8a1b81e3c6a63836806c126b3573b9cda0db83fd27ffe9 ofl/trirong/OFL.txt -sha256 58bdc69f4c6177125c6e7cdbc78f710f5f9952f11bba7bd5b17bd7ef169d731f ofl/goudybookletter1911/OFL.txt -sha256 2950994bcfb8e903f0539d28a8ec4af077e0aa1fa7946c33c912d2d6969c2971 ofl/glassantiqua/OFL.txt -sha256 7344b8b8c97c4f88c0ff8bb72bb024bba72f404be1c740b6596a73ed15d28df3 ofl/vampiroone/OFL.txt -sha256 cacad5bf45bf5c81f4b6cbd114261bc8a08f6110b66a4c6fad8bbc16618a3096 ofl/daysone/OFL.txt -sha256 0677891e6a143f297350d260ad766ad33bfc18ed5fa4f213acf648d6b597ec1a ofl/alegreyasanssc/OFL.txt -sha256 c8155eb9337078a9ea9f1e576ac813a03030ca43e2694593e90cd4fee6fce937 ofl/sumana/OFL.txt -sha256 95803fae1b063e592c67b5867f1f36df1df526e5ebf33c6cd4d4afa31a9d5586 ofl/sitara/OFL.txt -sha256 c254ae01c407f4a2bd0ad163e4c1a795d57ddfa8967c21b8a28c250b44d13963 ofl/sawarabimincho/OFL.txt -sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfellfrenchcanon/OFL.txt -sha256 25995bcf8e8ddea1aafa5449870567cbbeae7e26b27ba30aca5642f2c02e9757 ofl/quantico/OFL.txt -sha256 455755e2e7ce9dbac6beb3729c97c57d6f74a638dcb5be548ec953021fbdbfb3 ofl/ntr/OFL.txt -sha256 ad6f73fa3edb7aea340aadbc63c0d7ef7663abed82664432ae09a6b377fa313f ofl/librefranklin/OFL.txt -sha256 581f08727777cb2a1a1ec95c0f981ce64fb1ad4354f78a0ac4f3481afa605577 ofl/moulpali/OFL.txt -sha256 4bf7256c8ee73577ee5e26643d3247ec77017ca04489befd3e0f3412827729c7 ofl/laomuangkhong/OFL.txt -sha256 08fdc7cbd92b9bbc4d41d0945ae7f25450d91c5fc8c66c68df331af3505e4ec3 ofl/rougescript/OFL.txt -sha256 694d5c15c1dac5e26653e18b94394d911e471549ec9b7d6247ade62e486b4915 ofl/asset/OFL.txt -sha256 bddfe669338d0dbc24c15ccd31dbf5c101a213da38049c24baca9ccb7fde45a4 ofl/wallpoet/OFL.txt -sha256 2758cf7a872827f39661cf8cc24188113c030447aefb5ca7145993650076ca8c ofl/ptsansnarrow/OFL.txt -sha256 3cbf579238e4eacd90ad67883d971aa346ce8990d658635f78f98d608a6830a2 ofl/zillaslabhighlight/OFL.txt -sha256 87000f71a897c8c130c7777d058c5868f84316f99a32644b3bf595cd11edeb12 ofl/sancreek/OFL.txt -sha256 08fba9df5c9890f3ab00ee63f63e005ad93a23746f7484f5fe9501a1ad32730e ofl/allertastencil/OFL.txt -sha256 9608d22ae5c586628c9904e773b7c6a6520fc16e1492ebcb5ea55d9523399964 ofl/anton/OFL.txt -sha256 f3758ee70600ecd5450f01ea373204b202e048d0454c9db2d1175c5a5dd1e92f ofl/vesperlibre/OFL.txt -sha256 e43f121c788cca4a14049e58864e28021174b055710ba38e0964e816dbf905af ofl/fruktur/OFL.txt -sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notoserif/OFL.txt -sha256 a1580ba69a8d706bd95e1e72ee0b5cfda0a478fbbab6a4af13b4a9e1b28faac0 ofl/revalia/OFL.txt -sha256 f323edc1e5a6d8fa16120aa15367cdfb15468474cc621f9bda1a2f73c5d08d73 ofl/sedgwickave/OFL.txt -sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfellfrenchcanonsc/OFL.txt -sha256 0836fd874230b17f840efcf7d3bb529f5a7b5befbfeef94478519cfe2d8551c2 ofl/courgette/OFL.txt -sha256 e3ed3ad6cb257e16dc1789900707c5cd1cdef2d60d155389342604991cf693f9 ofl/bahiana/OFL.txt -sha256 391ac3126dacc95b92a8f3408467879edb3245344bc411530a30d5aada52df92 ofl/gugi/OFL.txt -sha256 88dcde7d08e509a3eec64886292a36cbd58ed9bb52f37f91f55656fb9d21ddb8 ofl/supermercadoone/OFL.txt -sha256 41423e9e1d0ea79d0e78bd5fe9e0b27f4c23140706f5dfbfe116839c83aae91c ofl/charm/OFL.txt -sha256 43186c592361336474683e302dcc988831a53857bef188c4466f6b45dc238f84 ofl/fredokaone/OFL.txt -sha256 a21fa252efb7a1ff84de6a36df4386959668aa046f28161b4047829f7d9cd1b5 ofl/damion/OFL.txt -sha256 842b4f4605b32518a1269c4d030d719ea2c4c317d699fc4441d0219658e18893 ofl/seoulnamsancondensed/OFL.txt -sha256 bfc205682f5454b42a732ec857b665293ab8bc6f0ee901a0967219ba7ffdb190 ofl/gfsneohellenic/OFL.txt -sha256 59b91c9912b80714852a43897cbc9414d6457e22072dc99a4cea6e2bb4f3c65c ofl/freehand/OFL.txt -sha256 8b89f3af5fd02216793ff3dfe9a04dc22dfe5c213422ae21558ff1da6a1e94dd ofl/cabin/OFL.txt -sha256 b598b7fddfd578950aa1fe6e0e2607b779abfaa686b83af8ec65c860f646b2cd ofl/rumraisin/OFL.txt -sha256 2bd35914efa381c80f9fb62d6ea7d736d3c0739196a3783c3122593c3408392c ofl/gurajada/OFL.txt -sha256 5625e91bd7c2a45c8b9f59106d587bd025470b462ea901df691defe0099621e1 ofl/taprom/OFL.txt -sha256 37d5360d8d2433689e78302a93cd88e9add8a2294046476625edada2d4328deb ofl/averagesans/OFL.txt -sha256 f8e2b58dd7a8c8e21e5d744b45876bce7e010a647c071c1ed42ff0e618d4ea59 ofl/frederickathegreat/OFL.txt -sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/balootamma/OFL.txt -sha256 09685e225ba9b697b2ccd2d4098cac5ecbed0679960605258a271af60749887b ofl/francoisone/OFL.txt -sha256 39de3de5f1873f89bca4af37823ab22e28e88d0d8f7fe2f07e82e9e6e9bf7b70 ofl/himelody/OFL.txt -sha256 08a12877eda24767239f26b527bfce0c515efaf623c66da6baad92a6d5315e9a ofl/content/OFL.txt -sha256 0e2ccc5da1dd979f08ba82bca2fb61592506a1e58d3cbfc26d904f0db71bd812 ofl/saira/OFL.txt -sha256 d8eb8611f8c98d20cbf18a28425652d6022dc2a5cca15026b920f1f2bc92a612 ofl/delius/OFL.txt -sha256 1d08c63944e639bbfe8a1b81e3c6a63836806c126b3573b9cda0db83fd27ffe9 ofl/pridi/OFL.txt -sha256 c1eed37b6d213df4edf8f92ec7d1e972f751abd68ecd649b4f0b8e5d8e8561f6 ofl/rasa/OFL.txt -sha256 4e66943af352059c059dd658774f25fbc831f1ad478f9f0890c06ecc2dd324c7 ofl/metalmania/OFL.txt -sha256 f5b03ea0b27c7f5afb9702771ee57679ae8ba6b471b6ba9e62d985d3256f1929 ofl/playfairdisplay/OFL.txt -sha256 593f0bc55c75b673772b378eaee314f128283745c4bb1cfdb9b8012a3b6c46fe ofl/skranji/OFL.txt -sha256 46239ba6485d28553fd944da4ad32a00d9c403aa1c3e111676b0b96fe458d1d4 ofl/averiagruesalibre/OFL.txt -sha256 14d28541780d90f6577bb7abcc6f005bf6969614294e75c82abb8758a696ad46 ofl/quicksand/OFL.txt -sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/baloochettan/OFL.txt -sha256 35dca6122235851d236bd861124f4a893d409eba021cd8c6a292a19df0f4640d ofl/codystar/OFL.txt -sha256 ab721b35816e470fb11619ad3705f75d08dccd0864505e3d782e94fd937f6620 ofl/allan/OFL.txt -sha256 d9cdb075679d15a99bab2a8541b9c4fdc71347502111fbe9affd1d462219d96b ofl/indieflower/OFL.txt -sha256 1313ae342eae4e1810304b6cd32f6815dd11b8e45812a2af98e58b6960684fa0 ofl/petrona/OFL.txt -sha256 1e4015251ca58d4f349b4ac930259c6f3d6381ce68f8b4b27d54d53f8f63f972 ofl/angkor/OFL.txt -sha256 46239ba6485d28553fd944da4ad32a00d9c403aa1c3e111676b0b96fe458d1d4 ofl/averialibre/OFL.txt -sha256 8e28b778b6e1a7ff9ca72f4dee2d53120aa2856dc1bfd0be44307e365b0e45bb ofl/cardo/OFL.txt -sha256 a02e8715fcdf3325c474b7209399f50230897bfa828fe4eea2639ced1a1d574b ofl/blackhansans/OFL.txt -sha256 d530c14e9cc263c567b47742ef20df2a41374f00732ba4f290f52adad428b1a2 ofl/meerainimai/OFL.txt -sha256 2e2fe5f1d8916a5160060594a96c1a5116406d26847afdbd09618481e2abd6fc ofl/denkone/OFL.txt -sha256 56c4ff36faaaf336bc5fee659ff6fab2413d67499cc22acc29079b3892d8931b ofl/miniver/OFL.txt -sha256 0d75673e4c98de3e11337dbd90b05d0232edfcade5c1c02fbc0118c85aea25da ofl/macondoswashcaps/OFL.txt -sha256 742a6a4386db47a2987c7c3b4aeedfb5adedfb3356c118de450a664735686535 ofl/graduate/OFL.txt -sha256 9e53298e3629e00ae4c31531cca09051ddaa654a5de4f7b55e596132fff86e1f ofl/dhurjati/OFL.txt -sha256 df9fcd8f62ae79aba7fa5b0563a08dfede1fa0909d668287d70c395d88f5fe02 ofl/fjordone/OFL.txt -sha256 02faa476b17db0044d0c502a3ce12fdc81eeeb9bd618e6a005407c79d6081bbb ofl/monofett/OFL.txt -sha256 1edecf3f971a11dcfd777cbda6f08c0f9a77bf57a0a2a89d8142fb933894ce16 ofl/amiri/OFL.txt -sha256 6e6efa9b0556d100cfe60690cff5d9be7144df77adabfd2c278dbfee451351ea ofl/phetsarath/OFL.txt -sha256 2348c4852e6322105d130aa2addbe24c962e330094ad6dfbfd9fbd2281d76b0b ofl/bellefair/OFL.txt -sha256 3bbcf1617d93d3a949a10da78ae91c58be536fb04567ab4b5b9fd207126f1db5 ofl/buenard/OFL.txt -sha256 faf47a1ceab38b07205b9d58fbbf9ac39772ea47cc731aca7816276da7226a22 ofl/dosis/OFL.txt -sha256 3ac1301549523d9861fedca12871f24e575fbd26d520632fc00ba849b471d275 ofl/russoone/OFL.txt -sha256 44b51296985184d9b27fc2c8e5b317906c5d65d9dc834e81c07902d3e5e1cf1a ofl/brawler/OFL.txt -sha256 afb8c471158619593df0fb501453bd39fda42396e2cc3911e2a0a471c11b863c ofl/sarala/OFL.txt -sha256 de985adf63cff6b1bcb7c5cb55f1c5850fb1d36289d20a0e26d97a281bfcf956 ofl/aldrich/OFL.txt -sha256 194e25172d0144f29aff4b6fb2931ff0be0139448a5cd867db37863c9179330a ofl/stalinistone/OFL.txt -sha256 ae05f8781a5ef38380ef3efe8cad86783610b6a780c6c278d7472f95310fccee ofl/oswald/OFL.txt -sha256 2dab153a33dcb2101bba3f194d27d953c848a0fabf2e336650a81f84a0c33b3f ofl/pragatinarrow/OFL.txt -sha256 9d61931b909f9a738964f8fb311eb8fa40dba1ef9f1688b36039ebb15ee1805e ofl/questrial/OFL.txt -sha256 e315abc82a78710c7242e2f2e6529651fd631d4d50e6ad98ea194f9b54c3d701 ofl/alfaslabone/OFL.txt -sha256 4653c63a4bab99aa50de5190853fa21ea6c0a25d69d49f5a42cd51f0f67665e0 ofl/boogaloo/OFL.txt -sha256 bd8323cd1d2b6bbdfbbf99cb41ec1156d0352ced170de4aa3a96d95e6e20bf5b ofl/amiko/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/sueellenfrancisco/OFL.txt -sha256 ed93e9833f18acc2775380a28139fd88d3ebf82df7cb814042498467be3463bb ofl/lemon/OFL.txt -sha256 1f00d1f970b4ea469b6936e599b599bb217edaab792e586658ef2e71cf438685 ofl/itim/OFL.txt -sha256 fa28ba897eb819768d6bc00c30aa03ef560e80e5f6fb872eaea089c66992f502 ofl/notable/OFL.txt -sha256 96199bf9ff12dd471a66911dee95440737b437e7f5a6fd30e9e950c16d66e8df ofl/unifrakturmaguntia/OFL.txt -sha256 36e2f1debc9778bac79fac1a0cb5a5ef51c102f00b58ef7d8a05324144b68166 ofl/judson/OFL.txt -sha256 ad4f6ede2e8a017255822a6abee8d10717f1d34c20223de80285ff59e28a1cba ofl/bangers/OFL.txt -sha256 f8779e6871bbab04e0a1ddd9997f4d8173b56792a1e7f8b9d691d967a49c7dc3 ofl/andada/OFL.txt -sha256 49b9214f7b40024abec2fc89a32bdda380f2174ba7005d7636e6ea340157c5a6 ofl/jomolhari/OFL.txt -sha256 a815f65bc72d90494b01842d3171f7cb0f9f935e023d9cc260904d221ef1064a ofl/b612mono/OFL.txt -sha256 5eca89cdd576df5e4b7c694e0425b126a9ca839aa067df85fab33904a8187076 ofl/amaranth/OFL.txt -sha256 e0cde1a4993ed689d463d5e2401f4a60c54cc48a14253ab0f8012d722c417038 ofl/mavenprovfbeta/OFL.txt -sha256 eeacf16032901d0ed0456876ec77b8f0fda6b3fecec7d972f8543eb602e6c30f ofl/nanumgothiccoding/OFL.txt -sha256 0fbae33ac3aa455c8c0d598347c87f1abfac0d215483f40f5a0e8dd08076df1b ofl/librebarcode39extended/OFL.txt -sha256 3670ddaf348c62ada22a2f606158dedcd9ca5fd5422a6173d6593204a8f53d4f ofl/varta/OFL.txt -sha256 ab592d1abca19428b89d851706fa7815ec25139c6affb45d366577ca63fb91b7 ofl/yesevaone/OFL.txt -sha256 e8dd8f53b2fa502ace0636debbe7e357c4888d8d02b8b41d6a9a22d3058a63dc ofl/peralta/OFL.txt -sha256 cdf5fc4014abe91588666a9592ec86200e5a4d743b4b6e05d28d47e850bbe5fa ofl/digitalnumbers/OFL.txt -sha256 f8c2225a5fdb50e2e75f98cf6e69f198571f605f1b7f6f7eacc0947e2fcdbe8d ofl/sreekrushnadevaraya/OFL.txt -sha256 a80ee908b60f5bec9c10b135d3da93730e2194107d1f7fd3f61bd8c1a97b3e0c ofl/yesteryear/OFL.txt -sha256 6d216cec166b6e139adaa599053dd49720c053e1f2adb4845de3cc9c3704344d ofl/play/OFL.txt -sha256 46751a31966477e3f038d1e5ff1146a33234a3a523a0e6a21be3221cba082a34 ofl/muktamahee/OFL.txt -sha256 505bb8f3c30f2006b4e02d250fda31ed94b651a35f1124a201ca1c405ce989af ofl/biryani/OFL.txt -sha256 5641212407f956b828bf632afc4bbb3344f461f82255ab56756d9e3e8604c7b1 ofl/martelsans/OFL.txt -sha256 1ed119b01f03187dbe2f5f89c95431b9a4ca46db604fd263164d8b4055189f46 ofl/lateef/OFL.txt -sha256 4938e917ac54665be1dd862f54634d991b39c5d1eef69345d66a5089e401bfb4 ofl/creteround/OFL.txt -sha256 9263f9488a9ed1d5f4218581b642e0f054f9a20d208f1a53c19c9f7dbd27eaf2 ofl/peddana/OFL.txt -sha256 e75ed24435d1711de0bebfaa621c3eb5564798c88cc0c1d1f8d529bbaae703a9 ofl/yanonekaffeesatz/OFL.txt -sha256 708e33bed791c40638926a7577bcef8ff8748f84045f3825277540cbb8d483ba ofl/poiretone/OFL.txt -sha256 f1d1a3536fa4b9c71d04fe4c8d8bbfc0cc5c457d6883f45086b04d0bc07ed12d ofl/vastshadow/OFL.txt -sha256 f9f28345ffcd6cea6e3c6699e4579cd1948053d80fe89a6a5a2ecb269afc95f8 ofl/nikukyu/OFL.txt -sha256 c1bcd16ffc9d095822fd6b7fa1a24c7918b24815ed05711421f804293d2efa62 ofl/actor/OFL.txt -sha256 ae629d13b06d9afc5cf3c07d585f3192b89b7decaffc5c4dfcfa7ce11a2a2b11 ofl/raviprakash/OFL.txt -sha256 bdce62dd98db969b73f93f8e8e2151004c20ad871ceb15ad9bfcbdf2cf939dba ofl/pompiere/OFL.txt -sha256 39de3de5f1873f89bca4af37823ab22e28e88d0d8f7fe2f07e82e9e6e9bf7b70 ofl/poorstory/OFL.txt -sha256 757f49d04406c93c40d1781e7867fd85a1f9fdfbfe03a5ae332900da802fffc6 ofl/harmattan/OFL.txt -sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/khand/OFL.txt -sha256 74ba064d03f1f1c4a952da936c3eb71866c34404916734de3cae73b34357e59e ofl/lato/OFL.txt -sha256 94625b91cba99cf9c8e580febf5e738b2e3c7cde9034a16bcfb7538b672137e5 ofl/zcoolxiaowei/OFL.txt -sha256 3e908f3a95680bdf3c8456bfbf76392605b34cb3fba109e46441056ab966cb35 ofl/modernantiqua/OFL.txt -sha256 6a809aeba8af2115ca4b4c3597b1fbeb836a45f0489070f330f9c2dff870da8d ofl/galada/OFL.txt -sha256 2c3737ea83b48d48624068d1bbd1d9f8049eb7cf2e1f67435e420375c42e0686 ofl/spirax/OFL.txt -sha256 92f750829545386017c3418d890769778b76fd01dfb41c62fcbb0d42ba0303eb ofl/dorsa/OFL.txt -sha256 656a20870fbcb8f559f1c6308c1df90ac93d7cd0279aab49b43a43b5e58534e6 ofl/neucha/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/zeyada/OFL.txt -sha256 4bf7256c8ee73577ee5e26643d3247ec77017ca04489befd3e0f3412827729c7 ofl/laosanspro/OFL.txt -sha256 33e3a83e377c6a41149044bd919f50d9a971d801052d4e0c0a98cb417b42ae38 ofl/risque/OFL.txt -sha256 b4fc1d55ce610f255c5712f8169543f9610536d002deb99bbc99bfbba9f8a560 ofl/pangolin/OFL.txt -sha256 511125dc85198375795fdbc109d088654d3b7f9dbd3ccb7bf93d844aef0b153c ofl/ptmono/OFL.txt -sha256 819e3b25f9b50f12299a3db1638be3813efc6b938f2b86693a218d20ec4e3209 ofl/londrinashadow/OFL.txt -sha256 e3ea566dbf689a9110b2094f9f2e5d16d7ec31720147651efc1005ca20420dd4 ofl/flamenco/OFL.txt -sha256 186d750eb496a4c17a76385f82be6aea2ac1cf2de074a811d63786cf374ea73f ofl/barlowcondensed/OFL.txt -sha256 705960c3281a5765ecc0b59bd4ed7ca59eed165748076bc2fc3e8fdbfeb944b0 ofl/pressstart2p/OFL.txt -sha256 7e896665d0863d2a17a671001dbe2528a5f9302f1dff9222af8b0834e9088d0c ofl/kiranghaerang/OFL.txt -sha256 5f1f5510eff7922864bf326ffa1d4a62f01add5193e9367b542378e5a808b500 ofl/handlee/OFL.txt -sha256 3173acd82f8c6159b5b1037b539fcbd4edff68e65c2ea8b9412b5a5ca97b08ff ofl/archivonarrow/OFL.txt -sha256 82831e8f12ecb6deb2f4d9919a04049895b4619e0301fa6b699c861bd7311c54 ofl/kavoon/OFL.txt -sha256 1a5e3792a425687a523fc7c0f8ab5d01d58bf853149d57f3dec4b4fc6932fcf6 ofl/hanuman/OFL.txt -sha256 7f91d7d8854e5cb4fc630807c0f4d57c07777769dc597173fe0aef5e58f0992c ofl/qwigley/OFL.txt -sha256 354b4be0340cd58e381fdf58793a108897bf944a7f8faf9e877c476ed6c730d1 ofl/convergence/OFL.txt -sha256 1e20933206ca06421c7c378184da5476d195314cf4bcda2bf122cd45d69a956e ofl/oxygenmono/OFL.txt -sha256 a7fe1f3d23034092b015aaeb53d2ecbc9e592be96b10bdfbcf8700ec6a6ffc97 ofl/fascinate/OFL.txt -sha256 4dbbe5c21b46f2647d227dde69b971a1b46de1435e0752a9eda1ce120725a93c ofl/norican/OFL.txt -sha256 1f581506286e960436548dba0701aab278f7e67f2adc6bdae2958923867d1e64 ofl/hanalei/OFL.txt -sha256 56edbe5fff7981dae6f6eff32f61ba04cd54324e5abfa44b1257b2a307ea561c ofl/poly/OFL.txt -sha256 59bda6b53e28d388de5eac7bbb8f3e65889dc8489be3d922f95a525354110c0e ofl/tharlon/OFL.txt -sha256 3fa0ceff4b9a2d28dde43bc63cde3acfb5e6e92d13a53e484ca0e501e18c7e2e ofl/lekton/OFL.txt -sha256 ad9ce814ff266b57d3c4698d3fadca4b41a6f942a0ddd215db5cc66abf92d668 ofl/mako/OFL.txt -sha256 c4afe82f49c05689c40dd4e262803b29c6e611e7b4efd3a0418f574b2be79d9a ofl/carterone/OFL.txt -sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/karma/OFL.txt -sha256 d38acce513eccb51d7ac34ca47be279e1fcfdeca1ed088bdd2d281dc6ca939ee ofl/badscript/OFL.txt -sha256 31eb7046f4c80e0f96944c4b40b0772de68b34783b794fc13aab3f54c2ef6d9b ofl/thasadith/OFL.txt -sha256 06c79c896894160a5810d869a822fa7d02a0e2ccffd97920b8cf3b880380f6e5 ofl/amstelvaralpha/OFL.txt -sha256 4faa2d9e2ce0a4b5b37e62ee6fafe474a539b31578f7214ed97cc3503aeb8ebd ofl/oldstandardtt/OFL.txt -sha256 1e511bb01d29562932157365418c02d954d8faeef794bcd54729177fb2b03db0 ofl/istokweb/OFL.txt -sha256 846e8cc6dc69bf685d2db14cfa758ff3d9d771d54c9e0d3b511f0ecb97ac0e8a ofl/cambay/OFL.txt -sha256 6c181f5a0045e8f414e1c232c35972ab83ea084ac44825f517ba001628d97b21 ofl/kronaone/OFL.txt -sha256 d7f96801a28ea11eaa51bc4a9c87fd91f2133bc298068e6e2847a15ddda23089 ofl/librecaslontext/OFL.txt -sha256 1f00d1f970b4ea469b6936e599b599bb217edaab792e586658ef2e71cf438685 ofl/sriracha/OFL.txt -sha256 22c4588bdc14621220ba14515d52041d1312541e034a15d1f5c2a88fc6075276 ofl/merriweathersans/OFL.txt -sha256 1103d0731f1360eb156b0047a1337b2d62266fadcef1015d06f6263719c0200b ofl/librebarcode39text/OFL.txt -sha256 5b26c88d163b1430561f53fd3d9021d6057f3c67d25534a5d8d232cfbf8ee2a4 ofl/wireone/OFL.txt -sha256 57f8d60cfe9212b971f07253e303746128edd06b21e3a0e4e188308e569f03e5 ofl/orienta/OFL.txt -sha256 c87702d8b70f714fbefb554660e8ca57a43ef62a59089d11cbf0c6bd51d56928 ofl/lohittamil/OFL.txt -sha256 6939af7114f0a33c7e6142d4c1320d1bbde11aebe6d8f3c48fc5fb3e0f676a7b ofl/jejuhallasan/OFL.txt -sha256 9437c26410bcd543607a6775e7d0e359c1df3926d68c92dbaceb26ce79cc0fd3 ofl/bevan/OFL.txt -sha256 50265d2b41f8ad2dd350532d2286509aa694021b4aa0490b06f0068e4ed78c27 ofl/herrvonmuellerhoff/OFL.txt -sha256 9acc45e5ba18b5b38868fad1f51c03df4f5d7a43061d46314843de45c4444233 ofl/ribeyemarrow/OFL.txt -sha256 1fac7a3e4e43b091c2d31aef7a375d2b969c42b2d5fce8e2d40b5f7b1233ddb7 ofl/moul/OFL.txt -sha256 331c71cbd8f1d8a70cd6eec3d55553b64e6261a9bb0982fa12e6e48baca827c5 ofl/philosopher/OFL.txt -sha256 1e20933206ca06421c7c378184da5476d195314cf4bcda2bf122cd45d69a956e ofl/oxygen/OFL.txt -sha256 89418a3c7b5726c3f8828a7b7c3f1cad661cf5b7a1be3d2bd9ea243f8d9890c8 ofl/sniglet/OFL.txt -sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/balooda/OFL.txt -sha256 89d9d01291eeb91074ccf1f7ce07e7a1d9d421ec1191f8e84d440cb50830ed92 ofl/purplepurse/OFL.txt -sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/baloopaaji/OFL.txt -sha256 9acc45e5ba18b5b38868fad1f51c03df4f5d7a43061d46314843de45c4444233 ofl/ribeye/OFL.txt -sha256 f938d4076b66a13cf984ce88d92a07ff9802e8ae5e1f4a28cdc43fad122ae611 ofl/spinnaker/OFL.txt -sha256 89bf0833b785c49b0f271273ab440bdc20c85bf0322537dc901df940bf1579da ofl/amarante/OFL.txt -sha256 377f4f9c19e935228552478eb68cc2ed82910988a60ba60e2ac73b09f32d02d1 ofl/patrickhand/OFL.txt -sha256 684ef102ca4c5ff61cf1c1e5c2c6326f3c26f848446f98b8862dcca716a87601 ofl/quattrocento/OFL.txt -sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/rozhaone/OFL.txt -sha256 61be7c29f4835e2be7243db12213d75d53ff028f29f4b493212a1688b1d3a1ba ofl/titanone/OFL.txt -sha256 9df0700fcd0ef48abd74459a8650d35f59397fbaa00c5b00527e57cc155689c0 ofl/durusans/OFL.txt -sha256 b1958132ff727bd74409aa37ec0abbe4be13b1b379e1210e6fb77fc608c607d5 ofl/kodchasan/OFL.txt -sha256 f1888ed385b528866a472d02f4e06ef0873aca5b3c63ff1f6116cbb150dc9a13 ofl/metal/OFL.txt -sha256 e36d420a3b382b337c386338d8abc3635e10de5dfca7f822fc63ac659a0dcfc3 ofl/amaticasc/OFL.txt -sha256 8fbe530adcbe30c658393c3f2b5a4785d6765afcefdfe47f594730131f3a0abd ofl/oleoscript/OFL.txt -sha256 60ddc0ee6e443b78940b5f92bcbab76c98ec6965e0da9fbdaf267383ab72bba8 ofl/anticdidone/OFL.txt -sha256 afc1b710d644c1262e1765d2401abcf93a545a4cb051955e2243fbabb8164e25 ofl/carroisgothic/OFL.txt -sha256 3184f6a99f589c78740fbff6ddaaabb43b8cc2f3852da36e60aeb024ea8d6f00 ofl/eaglelake/OFL.txt -sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/halant/OFL.txt -sha256 9a9f089005f389717106bb3ba427cda9bd51b8a477078644566543f2a60ca85d ofl/rambla/OFL.txt -sha256 99d2f30e282d6174af8ff68597f58bb53c0dcb2b104a4c1b8d19da49021d00d3 ofl/unifrakturcook/OFL.txt -sha256 2bb0c0200723d923f8e20d08b8bd1c7af7f5cef8bb2d63ce44bd268b54334621 ofl/fjallaone/OFL.txt -sha256 72afba97d1ac9409a9fd3bb91a02a639427ca1988977909dad273e293a508d7e ofl/staatliches/OFL.txt -sha256 88aece7d90f2bb7049719f11619a560af22af3451af141f12aa4f46bb157a99b ofl/lobster/OFL.txt -sha256 955655cafa13f187f45a79dcf451942fd1118a8426abc5a25ffc5dbb00709da6 ofl/juliussansone/OFL.txt -sha256 9e1c955538817c3fab7160cb3110501e73ce109eeb58c4992a14e8323d900849 ofl/pecita/OFL.txt -sha256 96d82a96abc02fb457ddde0227833dbde9d1d02876c91f0a4e27845ca0d692fa ofl/atomicage/OFL.txt -sha256 7729f005b7a087368e2cf61fc4b65cdc85988e47d0e6e38c93a72de345e86b41 ofl/newscycle/OFL.txt -sha256 336fab6956d78eb34b50cd7bc6b16116c44735fbd0bf9f4def769ca4d8e218a9 ofl/sofia/OFL.txt -sha256 b26cae1321380296ba8311b632a397d5eac11b47197f9d0aa0b9310f1531ad60 ofl/sarabun/OFL.txt -sha256 aa8a8196a3e22c3bd985e33cd3245ae9a38accba5e79fc0e3b292612a8d6b337 ofl/suezone/OFL.txt -sha256 d3711c90a7deda6210d30e41b945f16bdaa00662b30ee0b7c36abfee82525bfe ofl/kokoro/OFL.txt -sha256 513b7871a360a6eccd426bab59743fbff36764588f47381423f04ad6b3d821d9 ofl/alexbrush/OFL.txt -sha256 67f64c5509e5151796599e3ad47c3131cbe0c80c4f9430b90236a1249c2eacc9 ofl/roundedmplus1c/OFL.txt -sha256 4a7d2f227b91046ef7a54f8f735668d86e45f4fd4089268de292a6e9de108253 ofl/bentham/OFL.txt -sha256 3c187c861dc291b9f7f96f655656f9ac2d57b33da425bd5962810be728344f57 ofl/brunoacesc/OFL.txt -sha256 869e4c29978c318b33c2e5c7c8f24d2e947f249071bb1471620036a9d1ba87ad ofl/k2d/OFL.txt -sha256 6383249ddffbd87f2bbd7878ceba2dee0f1a2193cd7a4f41c00aaceb8e6d8b5b ofl/meriendaone/OFL.txt -sha256 ed50ebe2fa922554980909192526fe94966556626d6d440a462c8e7eaed74cdc ofl/sortsmillgoudy/OFL.txt -sha256 d64c91b0306b53fabed08762068eea8b918d654fb0721c288f13cefa4aaf088c ofl/butterflykids/OFL.txt -sha256 bc1175730d609233043cde47e48f69831f012e85537c5ec1a2cf4836757c1540 ofl/mali/OFL.txt -sha256 fe5e822667a4b2e083b8fdd7a37546163f26f6481b58742236abffdcfb3e6c71 ofl/baijamjuree/OFL.txt -sha256 b0316f404a7b291e40921c605160181065791a5010a2d2d5691fc7e28cdbdff2 ofl/underdog/OFL.txt -sha256 c026db4c1a557cae47e6930876965f9cbc05758eb1f5d6f59b6b61c8f342a57f ofl/alice/OFL.txt -sha256 aad1e82802172d4c1d22dd015a5b8b4275e5665a49c1df54ed64716fca7ae194 ofl/corben/OFL.txt -sha256 878aec7282ab41d058cedbf90e14512bcb4fbd0658496de8c2dfc592ed1f0cd0 ofl/lilyscriptone/OFL.txt -sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfellenglishsc/OFL.txt -sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/sarpanch/OFL.txt -sha256 aff3cea99bf300b4b29f4dc04867cf9b49d83de8c5ecaf991c446d506b56173e ofl/wendyone/OFL.txt -sha256 b054962de0af1397d5350fddb4d6bb20f5f2e073b543eeeb694c7c3b27144fc5 ofl/chivo/OFL.txt -sha256 19849b33c59d0cffeaad0dbdc38db767e95e03cd36fbbfe6b67a9878aa5758df ofl/fasthand/OFL.txt -sha256 a57810cbca0b4715ae8610dd7a268260cebbdd4fd76d304e371517f828150669 ofl/stoke/OFL.txt -sha256 47a0b7e315bc56ca0326fca46302d87d48a61e3528d4196e966b62f5bf0243f2 ofl/armata/OFL.txt -sha256 eeacf16032901d0ed0456876ec77b8f0fda6b3fecec7d972f8543eb602e6c30f ofl/nanumgothic/OFL.txt -sha256 616e75d879831bedfa7725c078e09bb56f8a17f40b194e16691b12251bb42b3e ofl/majormonodisplay/OFL.txt -sha256 75c7ccf4f537a7a3ebbedd299c1d2542e13d3b27aaf76a0a2d9fa91a2a8fcd3a ofl/felipa/OFL.txt -sha256 ee2c069b30f3e9a5aaf52357117ee3443ee27f17c29a2ec68861db283379905c ofl/dynalight/OFL.txt -sha256 fbe0442a6b1ce162c95e241df76cab5ef2daf6a5ac84ae1a7a6749f32c051098 ofl/breeserif/OFL.txt -sha256 43d530580461a574f6dfed9e15af6a74e95f7c04d9bfa1174a63ff036e8eee07 ofl/rubikmonoone/OFL.txt -sha256 40bd3f35477284c021978816e9d3b8723ff2283fd7065fafaa5bb3004e41b237 ofl/songmyung/OFL.txt -sha256 460966d12f306a007930575c3b8bc336fe0c32f880d622af6d3b745a06ca79a4 ofl/benchnine/OFL.txt -sha256 f6f60d5d4cf4f4b1fc4e41353c897a2f5a16e6396c0cd8fa8bdfd2f4586a9a68 ofl/alegreyasc/OFL.txt -sha256 0c922e2d65050677c26ae8dc501bc9ad3e0059c4b10df2fc9717d7bdacdfeb6d ofl/ramabhadra/OFL.txt -sha256 548890e4083028f04e5feba04b6e00554654d840aab81c8664eb66c2216a571b ofl/palanquindark/OFL.txt -sha256 e39d6ec64a37ed1523a59940695a61ea5e7882d9bbe0e7eb11653fda4b04fc79 ofl/kottaone/OFL.txt -sha256 1bfe7d2aca99042eabf37079152fef8abdda2c36dad454ae89b858a3cb1078c5 ofl/forum/OFL.txt -sha256 5505d1a010ee0f2eeecdf624984d2a6170480adab3091170abbcedd85361f1b9 ofl/novacut/OFL.txt -sha256 715ba72697e14daa9b29a333545f69bde7c497b9f77d0a2a4c4a5a752d961801 ofl/marcellussc/OFL.txt -sha256 0786594992757ea0290ae4a490ab9249728f372adb13959c0c8ae4fec83057ff ofl/quintessential/OFL.txt -sha256 ca13e9cd1faaa6afb9e43dcb534a8984cec3218993fb4b436468a79a1657ee19 ofl/keaniaone/OFL.txt -sha256 760fb433c515570f6b77ebc60299c2c91d5f03848c659452a9d2458b28935768 ofl/numans/OFL.txt -sha256 9134ca6996bd33ea2022e109f13f20e29dee1dcd8b2e8878aad576d2ca334e9f ofl/cormorantunicase/OFL.txt -sha256 1d1b7f3480c8d9b65c26d205e41dcbfa85731588d6ea50bccfa78e91f242d629 ofl/loversquarrel/OFL.txt -sha256 1d08c63944e639bbfe8a1b81e3c6a63836806c126b3573b9cda0db83fd27ffe9 ofl/prompt/OFL.txt -sha256 eb6c70cb6b575ad22df022d454df7a20582915e6e8da19b579c6cbef37a26bb5 ofl/gafata/OFL.txt -sha256 93f60741563b4f51f2fcdb207fde72b2b23292a47022c729aecd998b360d8038 ofl/bilboswashcaps/OFL.txt -sha256 4579982a484a9745864de2cda666fd7b5017f9182b74dbb4cd53d84c1d1b2231 ofl/gruppo/OFL.txt -sha256 cd059851dc2abcd2865ae318e8b949736f958794210acb90316530fd100fc904 ofl/geo/OFL.txt -sha256 af9b97696048d509e3d70f8108b7c4381084f95c8fedd97acaa76b0b287668be ofl/molle/OFL.txt -sha256 6958d8c61b6b223f81bdc2109941e5d0004996dde61e197d628e0293f4f1bc58 ofl/miama/OFL.txt -sha256 7e98b49a12b51240c85b04eb0d9919a6fec7dbd491bef6cbddc22d3f851bd1f1 ofl/marmelad/OFL.txt -sha256 b9d592c3bf421197d9b7e353416b8e2ec81584988824b43d38c86d997a08b868 ofl/myanmarsanspro/OFL.txt -sha256 e414e07f7a4da16ed47ebec80d52dd79f21d3ca42bc92385a755d8078a038814 ofl/playfairdisplaysc/OFL.txt -sha256 0e2ccc5da1dd979f08ba82bca2fb61592506a1e58d3cbfc26d904f0db71bd812 ofl/sairaextracondensed/OFL.txt -sha256 bc85bae0b512b799bbfb2b916e4d0a34cfd963d09778cd783e248b479e67760a ofl/comfortaa/OFL.txt -sha256 caa697668c3cf3e622753fb202c6c2e29648b94a3499dc7b869a14192e38c553 ofl/sourceserifpro/OFL.txt -sha256 81d6c3788a6b641cb9f543389d9d5c0cd3bf94fbb5639be19c102b9274c34291 ofl/mousememoirs/OFL.txt -sha256 dd028a807788d5e22e9f8cc18f026cda23369954673658f2ecc7d30bdb364b89 ofl/arya/OFL.txt -sha256 53f9c99fa3d47f7d632a42ee7bab4a834a60a744f6026d676c3a223cef2b2ef3 ofl/vollkornsc/OFL.txt -sha256 6506b2fa2a14259a8859608a6148a4591d67bbaef4d8e1948b43c4078561b0e5 ofl/tauri/OFL.txt -sha256 6cca1abc09d677cf00a55674ce2775e0eeb6dc5c0137b0401816680b9e500f81 ofl/marvel/OFL.txt -sha256 e98ce988fba1c138f4e7c0c5120809706ab1b24a3c29638ca83ab2ff082e08db ofl/chango/OFL.txt -sha256 0e2ccc5da1dd979f08ba82bca2fb61592506a1e58d3cbfc26d904f0db71bd812 ofl/sairasemicondensed/OFL.txt -sha256 42e7b456fee0d0dc86927579b3d2626d42bb0f4cc9778f3a92ca8ada4e46348e ofl/novaslim/OFL.txt -sha256 1b8eef90c567309fef17962cc969dd9ed1de69176517238e744018bb983e7c1c ofl/mandali/OFL.txt -sha256 9e262d6d7fb789aab6a8ecc53fc9c78387eeb9f935dcd289282d8e751b6bf743 ofl/antonio/OFL.txt -sha256 07dbf75115edfc1fd75580aa19c4c730201a099e8f86a9869887dfbed0547266 ofl/offside/OFL.txt -sha256 f177d98c67b84250ec87a03ca6ad161e84cab15b435e960039b971797a065f4a ofl/martel/OFL.txt -sha256 bb3e8082faf86b1474a6b042125ef0f83669d28110b72f70416a7587b7b9f144 ofl/unlock/OFL.txt -sha256 c4955dfe15a5db10326aa58ef767460c42cd12a3acdb3e698eee2704eb373d94 ofl/electrolize/OFL.txt -sha256 cf6dd07485d67d20f105afb9981dffdb6b180b59af45a228839cf3fb0277c9fb ofl/arapey/OFL.txt -sha256 87e8d9aca71dbe0481ba8611fc90d7e3aebfa3e2546420c403e7078898b0c484 ofl/allura/OFL.txt -sha256 55e13d77a4457aa9c60f10c5b97baea3343d3bac30960d49554a033cb9eaff7c ofl/sail/OFL.txt -sha256 1c5bc055869d5e9151ec7774082727db720ec4293c65be67f91a4bdcaeb02998 ofl/righteous/OFL.txt -sha256 de5ff32211a4340b01477af39ee339d639438955e409f79b666d4b9207f3c92c ofl/dohyeon/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/waitingforthesunrise/OFL.txt -sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfellenglish/OFL.txt -sha256 44a7c6e4c5572392ae122d3b1d8c6ba6fd640a7797e675384585d947f2773e3c ofl/jua/OFL.txt -sha256 1ba345a91338581e5f8fccc3e37e447ddea5b99ec9caec1b76c7c39492387d2f ofl/signikanegative/OFL.txt -sha256 9134ca6996bd33ea2022e109f13f20e29dee1dcd8b2e8878aad576d2ca334e9f ofl/cormorantgaramond/OFL.txt -sha256 9ee6b2ec20a06c599a07412690876eb457bf192c10e886e60d8bdffb80bc21a3 ofl/sahitya/OFL.txt -sha256 dcc832bd71ea62cbf97f06327a1b5442905b49ea446801421d71f7d1362db215 ofl/dokdo/OFL.txt -sha256 8aa063e3a1299c5e1821f386f5ca8bc157ac561bd12c739ffa81c6f0821450c0 ofl/donegalone/OFL.txt -sha256 e588abf45ca2b19c340c4b27349c9b6b6e5e198316fd965128ed9f4422942cbe ofl/raleway/OFL.txt -sha256 9860b97028024085855e503e32c1971bfd603374641cd018c136433ebcf5a338 ofl/gravitasone/OFL.txt -sha256 ee9d043332991eb6bf2bd56fb04db3c558c1ee2f0cb9aa7b18366c77e34fef30 ofl/jura/OFL.txt -sha256 15b1a21c3fa37a475ba6b0c0cfe289c7952548caf6e432068ddaf98d139ce419 ofl/belleza/OFL.txt -sha256 c5a77946a56488790364d060628385d51226da62a18f30d2be0181d82ee62b00 ofl/suranna/OFL.txt -sha256 36e2f1debc9778bac79fac1a0cb5a5ef51c102f00b58ef7d8a05324144b68166 ofl/megrim/OFL.txt -sha256 0fbae33ac3aa455c8c0d598347c87f1abfac0d215483f40f5a0e8dd08076df1b ofl/librebarcode39extendedtext/OFL.txt -sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/teko/OFL.txt -sha256 d324289a26909a519fb16c3d468a56ab909ad6d9070cac5742e5d59ad9bd9815 ofl/gildadisplay/OFL.txt -sha256 c0bcb72e68dd416db0bb9fcec7a7fa62321b0147cde00d8c8f82748e33aefd34 ofl/novasquare/OFL.txt -sha256 794d72ffdd25e8f7ca8e1d68db088c30ddbf2fdb369b6cc8217d4fa5fa6dc62f ofl/adobeblank/OFL.txt -sha256 806cb93632b8091cd36554642a96b2752bab50015da6a2b456d786c1f9aef5a5 ofl/carme/OFL.txt -sha256 0677891e6a143f297350d260ad766ad33bfc18ed5fa4f213acf648d6b597ec1a ofl/alegreyasans/OFL.txt -sha256 08b6f5cceaefcf2881eb009adeb78edd0fabf9c8f0eaf8b88f07a690222227e6 ofl/varelaround/OFL.txt -sha256 3f0f27931c92453994176af3b1e7954f9aac39fe145374d6d08c47c822e82e59 ofl/princesssofia/OFL.txt -sha256 2ce1c4fcf4ab9c8474d0824434497d4afa4425db4de5629103698b170ac4ee74 ofl/bungeeoutline/OFL.txt -sha256 455397ca15d39e9178bbbf4b485a29187751d60f7ceb7829980a521d5ab6848d ofl/sofadione/OFL.txt -sha256 b7574cd4c76770e5e3915d16bd93f09663bd77cb041a4ec09d824c52b540529a ofl/germaniaone/OFL.txt -sha256 39de3de5f1873f89bca4af37823ab22e28e88d0d8f7fe2f07e82e9e6e9bf7b70 ofl/eastseadokdo/OFL.txt -sha256 520a0c239d39b379b61c4de5f8e3b02db20b0dfc137481843eac01f02c41f4a2 ofl/aguafinascript/OFL.txt -sha256 ffaf7bc750bdaa0b95b09eb80e419748bfaf46268c6612860f0a5e19e17abb12 ofl/orbitron/OFL.txt -sha256 c6b9c7322fe0203d4d8a0f98541136d8d76da76b92c79d206b09991b98338cc8 ofl/gemunulibre/OFL.txt -sha256 2f871c2e81de6d0c72c981615002c30bc9f1637003d6d3d4c3f0149886b70569 ofl/mervalescript/OFL.txt -sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/baloobhaijaan/OFL.txt -sha256 842b4f4605b32518a1269c4d030d719ea2c4c317d699fc4441d0219658e18893 ofl/seoulnamsanvertical/OFL.txt -sha256 00a6fe8dfdc48d6206bcc4f10a765515a73433dfba7255eff966963beb26facb ofl/dhyana/OFL.txt -sha256 cd2dea62cd4b0c5fb335cf07ff04fd5c4bacb49b8d6c2bbbef9766c663d79b1c ofl/patuaone/OFL.txt -sha256 c0a8947de199b422d30c16137e4decd5362e3a1d504422880d69c02bd6046dac ofl/cagliostro/OFL.txt -sha256 c267a00c9476c78a2336d7b372b536885b8b24173a29ed53496f67a742c14961 ofl/alef/OFL.txt -sha256 2cc926050c4c6ccd9a0288b7792e2fcf93e5629ee6269e35986f092275e5a1b9 ofl/sarina/OFL.txt -sha256 f1bce31b817dee01c1e4ef8bc45d8ecb95f01f4abbf0a985007cb3cd0fd8123d ofl/zcoolqingkehuangyou/OFL.txt -sha256 9788e3b3e67f22ab5846a0bb867a230e7df2468c3cd20f730a5d9c34e673d090 ofl/rubikone/OFL.txt -sha256 f3bc8767749fc133d9b35e84ca024b82f1ac4d1b38deca0adcf8300892303022 ofl/faustinavfbeta/OFL.txt -sha256 ee81f11dd1970e9749afd2a572256f8eefce65532872762a4d7a3d5daa0812c8 ofl/shojumaru/OFL.txt -sha256 4f4bc3806a1e55789c6ef75ca5fc628297b05292f74966474dc0d40324abc609 ofl/abel/OFL.txt -sha256 064539f87826887d2062b7823b2b97b7625d68b642f6c945c99c0b8dc8084195 ofl/rationale/OFL.txt -sha256 a345b13576140008a697ac66ca8c76cd63b1dd076712bc30a0f5e97dcc53cc83 ofl/markoone/OFL.txt -sha256 203693528d6d2e8dc5e639c6ea42b3e825b59dd6447294e37b306fe734650091 ofl/arizonia/OFL.txt -sha256 9ca8b9e5db7184105da255bb110023cf1cce6caa56186341bb7b09ba97b20ba5 ofl/fanwoodtext/OFL.txt -sha256 3997621a219c7758e31dbafdd3cbd2bcb0b6144a41d1ca068d04dbcc4bafcde6 ofl/milonga/OFL.txt -sha256 2ce1c4fcf4ab9c8474d0824434497d4afa4425db4de5629103698b170ac4ee74 ofl/bungeeshade/OFL.txt -sha256 162a3b5c72cba845280a6f887c11d02984540b924510138c8b1eb473bcdafb6a ofl/concertone/OFL.txt -sha256 21b54eb0d7513524798a00dfbaf99a02c003a0012a728cc5f0e02d24c50482fb ofl/caveatbrush/OFL.txt -sha256 186d750eb496a4c17a76385f82be6aea2ac1cf2de074a811d63786cf374ea73f ofl/barlow/OFL.txt -sha256 9551ade371e7bcb1f6d9959273bbf1fed3bdf398efb5c57cc1fd85d6a13e9e5e ofl/londrinaoutline/OFL.txt -sha256 f15a9a3a9a665c2d17655b8fedad86d9a8f30081d46bb91236beb1bc7294a589 ofl/akronim/OFL.txt -sha256 76a55594c9a18b7d94b8119de838237eb834bae4e8c646d6d363aee587b7b427 ofl/slabo13px/OFL.txt -sha256 0e2ccc5da1dd979f08ba82bca2fb61592506a1e58d3cbfc26d904f0db71bd812 ofl/sairacondensed/OFL.txt -sha256 96b7bc175186cd0153a9682a1c9bb1da7103ab13a83abef8026bc64582ca616f ofl/oregano/OFL.txt -sha256 6fc386ac48a529b85c21f90a6c8d2111c6271b3063f9ddd78e92645db5259510 ofl/tulpenone/OFL.txt -sha256 13e862ac3f67130f58bd4bebb61c588d147b5a555b1ac6959570799c4f648cd0 ofl/capriola/OFL.txt -sha256 d24ff874133ecd133e55d7c4070d2edab14d3933477c2bccb3a0d8d1cc9c33bf ofl/muktamalar/OFL.txt -sha256 85814924eca98e1fa530901cc5167d0012aaf31122f9570d7e9755443dd9335b ofl/siemreap/OFL.txt -sha256 f76c1013cffb3e0de0e7dad19ee5b4b7849c7ab10b67218515e39cfd87e554a7 ofl/julee/OFL.txt -sha256 c264f64bb2b91ca0dfdeab75d71719120271fa6a30035396416af235ef481c1e ofl/merienda/OFL.txt -sha256 d102f22055cfa31a9659228483de3c726010f0b3b416b78e3cbefcb54816e812 ofl/galdeano/OFL.txt -sha256 2db02cb5d05d5f8a003ffefce36a32a16520ad4cab9ed90635ff953b583e4e82 ofl/sigmarone/OFL.txt -sha256 cdcc959c42ab255b4cea4bd82f2db5c24a2da7ecabe615d02d5a5dba3716e446 ofl/racingsansone/OFL.txt -sha256 c88333734ad7cd30540ec6614d12aa829a0395715de30e336d22ddfa3005db42 ofl/catamaran/OFL.txt -sha256 26daffa24723bb188643085cfc5423f9d78d22a395df4a7928380e430545a201 ofl/bubblegumsans/OFL.txt -sha256 de2246895f0ac21fe05b095d586d36cbc9f987ebcaed1e050c61e69667caf1c6 ofl/hannari/OFL.txt -sha256 b54d54664cddcbf05f5b4ea3aec7e89317eb917cf465920969e7b22361e0f4a5 ofl/seymourone/OFL.txt -sha256 46239ba6485d28553fd944da4ad32a00d9c403aa1c3e111676b0b96fe458d1d4 ofl/averiaseriflibre/OFL.txt -sha256 91c25c350d3cac39da2736d74f7ba37ef648f5237a4e330a240615bc8d8c4360 ofl/ibmplexsanscondensed/OFL.txt -sha256 5802c9e3509199c7aa9a13ea410ae27febbc0cdea184bf7d227170fac703bba8 ofl/passeroone/OFL.txt -sha256 2400b30a72d2b1555255b81625576dfb552584a19a9c85ad8d43ff77bceab13b ofl/plaster/OFL.txt -sha256 4bed7eaae70cab1bdf2bcf9b1cb562fcd9cc26d1c3533c4ade0ec70516dfb3a4 ofl/trykker/OFL.txt -sha256 45b1f44d2cb859ea4b7be2f322c57b8ff7be55075c336744e62b5550cd0a97eb ofl/medievalsharp/OFL.txt -sha256 19c6ecf65a6b0687dd324b093ced5f1020a1fcabfc8ddaaeca6906cd05153e23 ofl/overpass/OFL.txt -sha256 ff1f38ac4e694a4ad5bd3d7a5146cd8bd73fd57aae794ced76a24b0d68e41206 ofl/pinyonscript/OFL.txt -sha256 6aa923334ec515d26b1a61bb978a0bb5bd8884de7529add1625beef2f4a53f74 ofl/nicomoji/OFL.txt -sha256 cc8c0c3e81cf543e190f128b83ba7c30959f15865c14dd972fca4917faeceec1 ofl/encodesansexpanded/OFL.txt -sha256 38fab5a643fa935a4e11edae2d7b2bbe9866b4f4828c2be2f41451b3f27cb67a ofl/paprika/OFL.txt -sha256 a5fc033225d145b43fd7391482ae7689825414ce29a01614d651a3012b57c81e ofl/monsieurladoulaise/OFL.txt -sha256 ecc91fac753ad9ba5bb7e7819a5c59ee1e3cf89032133c6b4b0318d63c35933b ofl/alike/OFL.txt -sha256 6939af7114f0a33c7e6142d4c1320d1bbde11aebe6d8f3c48fc5fb3e0f676a7b ofl/jejugothic/OFL.txt -sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfelldoublepica/OFL.txt -sha256 9cd20277e2c89d47e3997435e3a16539d20173d850fbb42474990f71642e473e ofl/mate/OFL.txt -sha256 351740da2d452b48193483f22f64918a6dfd64a7abe225c6187ad3f36e0d9cd8 ofl/postnobillscolombo/OFL.txt -sha256 aa8a8196a3e22c3bd985e33cd3245ae9a38accba5e79fc0e3b292612a8d6b337 ofl/secularone/OFL.txt -sha256 cc8c0c3e81cf543e190f128b83ba7c30959f15865c14dd972fca4917faeceec1 ofl/encodesans/OFL.txt -sha256 136a256d6050ed32bbf96736d70b9099c6359e83dabeb6847cdf6b8ef84319cc ofl/kantumruy/OFL.txt -sha256 72060253bd481a8dc18664bb9117072dc07c0f0270a40617c230654821774850 ofl/pattaya/OFL.txt -sha256 56d9c3529facf93873a2a1626dd038054d244b3af30a1e3ffe0e78bbda1c7622 ofl/preahvihear/OFL.txt -sha256 1a2debd5ad8e656b26bb3b29213caa8f7e557a2f31454b11ebb6c3e3b59aa5d4 ofl/cutefont/OFL.txt -sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/kalam/OFL.txt -sha256 d941c5b788d47aa469ee54e30f4c12d6a43c45a295f10c568bdf9772f2893b7b ofl/oranienbaum/OFL.txt -sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notosans/OFL.txt -sha256 5ae0cfa62a70251d9a2c3c5430ed3bafa480005f23e4b9525488f2318e5c10ca ofl/mrbedford/OFL.txt -sha256 0acef93ca37cf19eeb83a1c6a29b78b08377a211c8d80cd27626e210176828da ofl/kavivanar/OFL.txt -sha256 c0562e066174197902a4a10606673d189f067970ef89c6013943b9cf182aadbc ofl/titilliumweb/OFL.txt -sha256 f8fbefb5b1004615e6d1e84b1c75e68520d91196f600cb1b07620dd2748eff64 ofl/cantataone/OFL.txt -sha256 2e2cb5a98da665f2ab82a9fd01fb18c2337f845761b0c163f690ed65f3b94677 ofl/sacramento/OFL.txt -sha256 251f65282ff48a7e8ef3fb661fc99254d9b3b0c368427c98b1edbfe4ca66e888 ofl/katibeh/OFL.txt -sha256 31bc966c36352bfd33717382786d0458c38ecf540628ab134e0ce35fde801d28 ofl/poppins/OFL.txt -sha256 f016385cb4b360e7698d22a48c6b58c0634b1ed5c9c17df78515d43887511df6 ofl/yaldevicolombo/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/swankyandmoomoo/OFL.txt -sha256 b712dacdda5da76c0213f8478886f893b855665c1153ae438bc3e55a7dc525ef ofl/kurale/OFL.txt -sha256 74584d937293a9cacdcd2eb05851b71aa1527901c18b87961d2f877c77a1b486 ofl/chonburi/OFL.txt -sha256 8f187da1eb4f23e3fe7ba68b1cb2e92881a415dd34c46489698454517e273c4f ofl/krub/OFL.txt -sha256 3336bf5d4e7eedba48ecb831f37bf676e901c39f2e6a422cceadd9d2ffa55be8 ofl/kaushanscript/OFL.txt -sha256 bb655534b6c7bf3e547c1368a68a5b1032d0e96fd08b5cc75f3d7a78528784ef ofl/novaoval/OFL.txt -sha256 04b895d77ccec5034191e953e8e5884637269be15fe0675fc25039014eb46349 ofl/monda/OFL.txt -sha256 d724dea493d89a7a9681186e2fb462b7cd551674960ee4142ae6b325261b5115 ofl/hanna/OFL.txt -sha256 64ecb0c6bf5cd80c3da76035c00671272966afbd32ffbdbcad95a8b56501fb08 ofl/decovaralpha/OFL.txt -sha256 0cf28cdcf1cdfd35054352816b2d8c81bd6d6f73632198b61507f26dd4dcbeea ofl/sansita/OFL.txt -sha256 d69bcd35f4a121b312a64f7e8eb15bed61c9056e9e9cdaa8d513366142c8e005 ofl/rosario/OFL.txt -sha256 b4cff421cb89d1e32036e818f291f8ab0d3294ada70b5883d5bcc6470b869702 ofl/eczar/OFL.txt -sha256 ecb52bab55d8d6185712fe8fd2fd98300f5c8c07fad0d0a97b1e579462b0dd3f ofl/bayon/OFL.txt -sha256 ed95c33f80ccca002e3a360b683c43368f9c5eb024e5b992abb51af3c10b59bc ofl/gothica1/OFL.txt -sha256 66b5c49d384cba754806a891ebd52f2ca08dd05c0eb3c56170192da466a00a20 ofl/londrinasolid/OFL.txt -sha256 284a5a26e6db9a04259a5690ad57d52c56a4c515ca2ece1943d950f99e709dcd ofl/belgrano/OFL.txt -sha256 6cbe0f55c154b5dee71ca4f2418d69e4e916448ef2ab52dc4541197b292efa24 ofl/sonsieone/OFL.txt -sha256 255d5debbb80eb2ea762644311f266a279e8778f00156655a516e2b7781a63e1 ofl/lilitaone/OFL.txt -sha256 490b8f3acbce2331adc9b9d3e75ee6fe07946fb29af429a300c7d066b1250b2d ofl/crimsontext/OFL.txt -sha256 eeacf16032901d0ed0456876ec77b8f0fda6b3fecec7d972f8543eb602e6c30f ofl/nanumbrushscript/OFL.txt -sha256 f2c0dfa02d6f5c444b4babd7bc0b43be77ea85706e8524342516bc41e43c2f01 ofl/fahkwang/OFL.txt -sha256 4398885e6b303830d81eea03444aae6fb08a44f41b6acd193c88a2f8cd17606e ofl/srisakdi/OFL.txt -sha256 c1f8e0feb0babaacf774b971bcfd791e44125b9d61ff074e4c20924e9661556e ofl/antic/OFL.txt -sha256 6a73f9541c2de74158c0e7cf6b0a58ef774f5a780bf191f2d7ec9cc53efe2bf2 ofl/notosanstamil/OFL.txt -sha256 0b1bada9befa95a40d55830fe83fc7f8064e245fea33bdf0f96f57848f3866fa ofl/codacaption/OFL.txt -sha256 b41b99f35b507564e54f6b2f5162ad1c21f94a16837c632da6632b376a341f42 ofl/nosifer/OFL.txt -sha256 e8d0118fa9d640543e7f6848d1d93f47313c7f56b64f73f37291d859cd5932bf ofl/souliyo/OFL.txt -sha256 bff4e5087ece354afccd073621197bbb7dd9349943b5ee6aa12b1adf0b133081 ofl/happymonkey/OFL.txt -sha256 1f581506286e960436548dba0701aab278f7e67f2adc6bdae2958923867d1e64 ofl/hanaleifill/OFL.txt -sha256 03082243ebc53e2090bc59987f693982ccee83b30516457b11f6a2349b78f5f8 ofl/rokkitt/OFL.txt -sha256 1152ca18eaa6159634f1eb209c60df360c1c09a52991e392f8033702036634d4 ofl/assistant/OFL.txt -sha256 012b1870f81b0d97ca756edd9eea315c7fc22657ac2f1cbdfcb6772fed3e20f3 ofl/bhavuka/OFL.txt -sha256 ce1108854c91696a8549bb21459f1dc74e8a1ec11664d712c3868c40042f1a8a ofl/rufina/OFL.txt -sha256 bac36a7fcafc5702d9d928bb81c7de9f8739eaa820e546c3d2cc52730b652af4 ofl/devonshire/OFL.txt -sha256 ac987f9cbc5b18d3239d88adb57a4e134049811d24ddda2f6383faa589fd2727 ofl/holtwoodonesc/OFL.txt -sha256 f3ee3eb20a9d565bee2bbc0d616de382a113327d7506565b2f3d3bee5f489375 ofl/bowlbyonesc/OFL.txt -sha256 965bd2c907f7bb6f36da4f85e83f29aea8b2f720783deebd7ed7b40678e67672 ofl/mysteryquest/OFL.txt -sha256 cc8c0c3e81cf543e190f128b83ba7c30959f15865c14dd972fca4917faeceec1 ofl/encodesanssemiexpanded/OFL.txt -sha256 19e186a088a50835b38b59409a76b8df2d0252ce114a99e79e306231bbe253b7 ofl/dellarespira/OFL.txt -sha256 aa36087ecd7e9085e5a1439b0a6d0ee35966e8cd2ccaa649bebe62cae5815e82 ofl/lifesavers/OFL.txt -sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfelldwpicasc/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/loveyalikeasister/OFL.txt -sha256 a9ef1db03f660130790beeb3b5d91b68536a44a98ec2db3097d02a1c5f91c599 ofl/buda/OFL.txt -sha256 de318dcb99e332a746edb9f83180ee206fc3bce74ff96ad7d1cb219967ec74af ofl/pollerone/OFL.txt -sha256 315a576cbc7ab61c9e347b5725893bc8498fdcb8fc10831793c6864bc2cefba8 ofl/gudea/OFL.txt -sha256 41f82bb4d24b304f30f7136bc47abdd083782e4265c984160f5649d1e78ea49c ofl/montserrat/OFL.txt -sha256 5866fd437bf701cd93f2c41ca2a8b33786975c947bee27882d256b408c9b424a ofl/podkovavfbeta/OFL.txt -sha256 377f4f9c19e935228552478eb68cc2ed82910988a60ba60e2ac73b09f32d02d1 ofl/patrickhandsc/OFL.txt -sha256 ec1d7de447a90e4b6d8f2b4f95c7f89a70e315fdb41969bc716059e4f2461fa4 ofl/clickerscript/OFL.txt -sha256 7039124ec9c84f9d637637da9f80158f0d3681c82d4e6a811053467f7c33d587 ofl/prostoone/OFL.txt -sha256 16f8621a8dda01f044b8a58489334dbaadfad44ef2fa1d5ce0864cc2f309df01 ofl/inknutantiqua/OFL.txt -sha256 ae30055f1e31d12f6235802c25a8872bb7053fca8ed4a604c530f4b2ee83e572 ofl/pontanosans/OFL.txt -sha256 f1ef4c3ef43322403f5c30e4fb46496969cb5c34a2a6e7247b507254b69caa6a ofl/novaround/OFL.txt -sha256 cf5c4103b0ecf3c38e7c26768b5caf05e1b3e16d4d87b32d859b3c19ce7c216c ofl/petitformalscript/OFL.txt -sha256 ed80dd9539708a531313f98fb081aeeaa395ab5726931a433845d667b019c855 ofl/abyssinicasil/OFL.txt -sha256 1404cc9279d4ad713a372a5e1e1d20d7b9b000d2397c8529aeb3df5402446600 ofl/cutive/OFL.txt -sha256 19c6ecf65a6b0687dd324b093ced5f1020a1fcabfc8ddaaeca6906cd05153e23 ofl/overpassmono/OFL.txt -sha256 0878e7d6e842bc3c45154059a1c2812de0d31dca343fe6bc16abc9afdee3e3de ofl/koho/OFL.txt -sha256 636d62f04d7bda9fcf9354f258f6244e7e18288cae036b95122e204f1acbec80 ofl/neuton/OFL.txt -sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/baloo/OFL.txt -sha256 5866fd437bf701cd93f2c41ca2a8b33786975c947bee27882d256b408c9b424a ofl/podkova/OFL.txt -sha256 2ce1c4fcf4ab9c8474d0824434497d4afa4425db4de5629103698b170ac4ee74 ofl/bungee/OFL.txt -sha256 dc35123e99a857674b3e8807e9d7df82220d298423d9fc50ce084fbcdecf602d ofl/jotione/OFL.txt -sha256 76a55594c9a18b7d94b8119de838237eb834bae4e8c646d6d363aee587b7b427 ofl/slabo27px/OFL.txt -sha256 ed50ebe2fa922554980909192526fe94966556626d6d440a462c8e7eaed74cdc ofl/oflsortsmillgoudytt/OFL.txt -sha256 d7b108fc1f23fb016a47bb40c63d6f6e04cc35a1edfb991638d7f03621bf7f33 ofl/terminaldosislight/OFL.txt -sha256 71e5222c549d85a1403b6e709b4328b81d7b51ba021b8bd20df89550da80c087 ofl/yatraone/OFL.txt -sha256 f139d6f43d2a63a8fb3ded48b8ec747d9d59a7fbb13d077d9b96ac88580bc1ad ofl/dekko/OFL.txt -sha256 84b11cc0aac8fdb93af94872bc4b8f015caabf4919db63ab7f916ccff8e52f56 ofl/josefinsansstdlight/OFL.txt -sha256 8fbe530adcbe30c658393c3f2b5a4785d6765afcefdfe47f594730131f3a0abd ofl/oleoscriptswashcaps/OFL.txt -sha256 64dc6a7e2a77aa340c49c3e0829703f540f8d64afa506f44eaa6741580716d0f ofl/gabriela/OFL.txt -sha256 17d7a7f5d9f0139535ecec516988c4c73a2ec0f225987288f3fd6ee2622d4450 ofl/federant/OFL.txt -sha256 c0a7efe98e77cbfcf1a5ca43e874e25cf53d9185c56295bc3b5c407f95dae638 ofl/nats/OFL.txt -sha256 2ee5e8e47cd7d08f60bb9555f72b25912c9e81b13f5bc9a0551ddf943da6ca98 ofl/ekmukta/OFL.txt -sha256 e5ccbfc32e4d7fae98b467a9af310ac8d2efd5d90e684426cd24f3eb36090a2c ofl/acme/OFL.txt -sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/modak/OFL.txt -sha256 75a77451968e55a1ab404bd953bd8778983e21116d507b890fbcf838e58c8e8b ofl/pavanam/OFL.txt -sha256 36931b77dd81fa96fffad91b6acb54931e600845eb81f91ecf1b4459012c621a ofl/vidaloka/OFL.txt -sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/baloobhai/OFL.txt -sha256 1c45059cea5c6798c8591b0a17961a30328747d44214ff9b8f9c62a683bd6598 ofl/ruda/OFL.txt -sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/thegirlnextdoor/OFL.txt -sha256 4dee45deee99672fbe342b2f4b7aa75b0cd12de18a68f9732c77f096bab47e0e ofl/molengo/OFL.txt -sha256 5a5cf278190adf8be3e9905c2b21460241cb376c600bdfd6eb7aceb66036c4bf ofl/telex/OFL.txt -sha256 bb49cbf811dafcb11e0de081efcdc8385e45ccc85a5bfc3231ec4861d444dc42 ofl/ruthie/OFL.txt -sha256 b5c3d12a3085b96011fee65555234bb9d31fa7444cf6f8d5ae6b1f5771394399 ofl/lakkireddy/OFL.txt -sha256 23b896f4937eac954a383340c92dfcac1c6e05ec21cc08ec6de47d30ad8496a3 ofl/charmonman/OFL.txt -sha256 39602407e30d466bf169f46d690aaae4f5f039258e5642f91a80bb132ce6e14a ofl/bubblerone/OFL.txt -sha256 e31de7000a2a13b2e54ad01e788fd29e979fe05ea1fded44d6e71cc06e33bb2b ofl/ralewaydots/OFL.txt -sha256 8218df19bcd9786311bf1126815e8d591027aaf7611ef031af5a31c3fd66e928 ofl/arefruqaa/OFL.txt -sha256 e37fcc467040ecd81bf4cf59c99ef56b20f57918995e82b3de1d5b4e931bc2e6 ofl/portlligatslab/OFL.txt -sha256 60fea3a0da19167a3efb9c3792a3a15dc9235405d01bbec1233fdf3e79c74296 ofl/freckleface/OFL.txt -sha256 da15da6b1496d4de18f97e2ad1b722ef8a1c121149c2c93b2cf7eac6ac27b35c ofl/mplus1p/OFL.txt -sha256 d51f3341fd7b3dfa1114d3ef0bdabbe57f60eef86a1458019e0077d676fa1fcb ofl/lancelot/OFL.txt -sha256 9134ca6996bd33ea2022e109f13f20e29dee1dcd8b2e8878aad576d2ca334e9f ofl/cormorantinfant/OFL.txt -sha256 cc8c0c3e81cf543e190f128b83ba7c30959f15865c14dd972fca4917faeceec1 ofl/encodesanssemicondensed/OFL.txt -sha256 5946eec3a7d3bda02825930156e4716198e7753641dd3303a3e8c386c8011909 ofl/eater/OFL.txt -sha256 b43e2530c7af69fe1800f180d210b6d2745915ed4e0e404495038c861bb6dbf7 ofl/hammersmithone/OFL.txt -sha256 5a8751bef5a4fc867ae015099267905034345260f14060fa276aac4051ddd8b4 ofl/varela/OFL.txt -sha256 f6fc9fbae062e4efc1b0306e27715d43cd64a48b8ffba81c22034b8efee4fce2 ofl/cabinsketch/OFL.txt -sha256 2f0015108d68627bd788d313f529c21ff4da2c2c42a5e1f3883acc83480f9002 ufl/ubuntucondensed/LICENCE.txt -sha256 2f0015108d68627bd788d313f529c21ff4da2c2c42a5e1f3883acc83480f9002 ufl/ubuntumono/LICENCE.txt -sha256 2f0015108d68627bd788d313f529c21ff4da2c2c42a5e1f3883acc83480f9002 ufl/ubuntu/LICENCE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/robotocondensed/LICENSE.txt +sha256 3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5 apache/opensanscondensed/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/walterturncoat/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/fontdinerswanky/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/aclonica/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/sunshiney/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/ultra/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/unkempt/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/slackey/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/satisfy/LICENSE.txt +sha256 3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5 apache/opensans/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/montez/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/kranky/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/arimo/LICENSE.txt +sha256 3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5 apache/opensanshebrew/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/tinos/LICENSE.txt +sha256 3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5 apache/opensanshebrewcondensed/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/justanotherhand/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/robotoslab/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/homemadeapple/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/craftygirls/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/crushed/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/robotomono/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/maidenorange/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/roboto/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/rochester/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/rocksalt/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/creepstercaps/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/nokora/LICENSE.txt +sha256 3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5 apache/mountainsofchristmas/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/cousine/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/syncopate/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/specialelite/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/luckiestguy/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/rancho/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/smokum/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/redressed/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/irishgrover/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/comingsoon/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/cherrycreamsoda/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/schoolbell/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/yellowtail/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/calligraffitti/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/permanentmarker/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache/chewy/LICENSE.txt +sha256 0fc8e6675568c02aac6b41dd3cccaf2264fc5969601effe68e09b26635879b2c ofl/ranchers/OFL.txt +sha256 ff72e4d89860e64ee38ccf8a5a7e9dc085d5e36115b096a6c7f8bc988e9bec61 ofl/kumarone/OFL.txt +sha256 643c63caf03855ae29be68035d8888e95eadc767a1d92f163d686da1b0a1cd3c ofl/cantarell/OFL.txt +sha256 1d242ab6fbb2dfbba2e7119b00a6328bc59cb2faf7299b844e9b92a2f12c0d8b ofl/adventpro/OFL.txt +sha256 01af2625d6247ecd2430d1d1603c579f85989d43b2d9129e08e0ac0df8909918 ofl/tienne/OFL.txt +sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/baloobhaina/OFL.txt +sha256 f3bc8767749fc133d9b35e84ca024b82f1ac4d1b38deca0adcf8300892303022 ofl/faustina/OFL.txt +sha256 69c34ca1873308c667ddde663cbf59c0d1cf14cbb945ad010f71d21264249e24 ofl/aubrey/OFL.txt +sha256 4febcc8d6e539db3e0c652da87bc8704f6d48e71e07f8ddb0974094a3de8da81 ofl/flavors/OFL.txt +sha256 d24ff874133ecd133e55d7c4070d2edab14d3933477c2bccb3a0d8d1cc9c33bf ofl/muktavaani/OFL.txt +sha256 ab5499b975c2dc82f533c6f13c5fca589df4d57c7c400db5f6ca8565ad9c2fd3 ofl/butchermancaps/OFL.txt +sha256 6a28d4d5d8b4d1ea89ace5a047ac6e0de182acdb8bfa22897bf7702102094f69 ofl/shadowsintolighttwo/OFL.txt +sha256 7a1d085067cd589026b256dd85af1eaa1087fa0f3d468192724c5138cc14d894 ofl/copse/OFL.txt +sha256 fd17f80dc48ff767d91d0dd9f821eebfd8b73ee82f55537a9052b6b0107622c8 ofl/voces/OFL.txt +sha256 186d750eb496a4c17a76385f82be6aea2ac1cf2de074a811d63786cf374ea73f ofl/barlowsemicondensed/OFL.txt +sha256 4aa1da66597f4c5cfde67790992ee55926ef6aaa87b9a10d529ab35e8b91070c ofl/asapcondensed/OFL.txt +sha256 301f77908df2b00141b4dcea50cc1a586c3afcee78843bd811088e8263623f9d ofl/amaticsc/OFL.txt +sha256 6b6c6721a30480a323cf33acf6a7703dfce46b846827a65f8ee96230060e3c3e ofl/homenaje/OFL.txt +sha256 393d494f9ebb5db6a3552ffa03a4c6f3746c22808b40d011b391681da55ca3f6 ofl/kellyslab/OFL.txt +sha256 ca19ac21c7656f493189093eca52b4239fcc5eacc15ab2e3d67cfbfc0e6e443b ofl/sirinstencil/OFL.txt +sha256 980c2b058d331f3c5ca4a1223e549511b71630e4f4a5533879d436d583cb5665 ofl/arbutus/OFL.txt +sha256 2758cf7a872827f39661cf8cc24188113c030447aefb5ca7145993650076ca8c ofl/ptsans/OFL.txt +sha256 7527e73a61f742a0dd050ab2fc7333de71ac7886023c100bca66a0a93b37498e ofl/headlandone/OFL.txt +sha256 39b26527bf9ed27b4c85b86341eceea0579f3550bcf448cf06345eaadf947ec9 ofl/rugeboogie/OFL.txt +sha256 2ac164969308ac200eefc516151934701044f0db5695ae2acc15df2a8d22e5cb ofl/anaheim/OFL.txt +sha256 88d3abd47414e7912d0d2eb44ca89e0b1bd7c43cc2ebe58a8a75281ad75a0f60 ofl/stardosstencil/OFL.txt +sha256 01003114b77326df223f291c48cdf12e95f6a5937437f164347919f2bbde12d4 ofl/josefinslab/OFL.txt +sha256 83aa5adca2418f091b732a19cc7c30dcb5c00c217051a58f34f5eecb19be0cd3 ofl/average/OFL.txt +sha256 585c6d2da8bcd8ffa651e0016f2e992a6891b625143a46a1dacf00699a817d9a ofl/monoton/OFL.txt +sha256 96e65d9c227a972e38035b849bba1e8b7879eecbb52f278be1e71dd481187f02 ofl/domine/OFL.txt +sha256 d1bf0acea511ad1f4de53e942cffb8ab0e67c03c6203d6f390d71105d52c33f0 ofl/missfajardose/OFL.txt +sha256 131d19126a0e7ddd25540fd6bee219cebbc8aee7e8374882998ee6c2f4ff6cf4 ofl/mergeone/OFL.txt +sha256 042a570b306ab893c6168be7e6e79bbceae46097141357ad0af7ef8bb179ed7b ofl/goblinone/OFL.txt +sha256 91c25c350d3cac39da2736d74f7ba37ef648f5237a4e330a240615bc8d8c4360 ofl/ibmplexserif/OFL.txt +sha256 bc80ea18223ea0db2ed73ab5bfd0cd601906a2b7a163183c6c4ea333be309ce4 ofl/baumans/OFL.txt +sha256 5f5dbf452c1657370d9280b50d647212a53c80acae6d78e0b5e8c2b26dc62b09 ofl/puritan/OFL.txt +sha256 90bd333a5cf0ed09264fc3e559d44979373f6c3d983b0f65cc46e952b4eb61f0 ofl/contrailone/OFL.txt +sha256 1d08c63944e639bbfe8a1b81e3c6a63836806c126b3573b9cda0db83fd27ffe9 ofl/taviraj/OFL.txt +sha256 62fab0ba1d5593782cbf048da193f4b1edc16b817577a99d707827513ad80e9a ofl/overlock/OFL.txt +sha256 75798d56e448ba4d2aec3ef5f3c2d805d9c6fe2ba688cd3d7162b2dd31e9cf48 ofl/textmeone/OFL.txt +sha256 eef925ad6afcbba33f7989f5ad826fd68d50cc1ab4d679c52927c8afd40bddf0 ofl/sedansc/OFL.txt +sha256 466aaa3bbd245e4c91c4e82c0828efe9fcfd913f5b020d75f0918516c2540fa8 ofl/spicyrice/OFL.txt +sha256 88ac81fcd30e64f6e6b91b61b159c9b700bb3dd59012b72ec61629abcfc7fba1 ofl/medulaone/OFL.txt +sha256 1d567f7c5f579d9031ae5edfb0108b4681bdd2e036249b228cc2843d3f052a0f ofl/redactedscript/OFL.txt +sha256 ce78cc8de3f6edd2738e8c02f2079db7086c9a74314baa5854675f83c33954ff ofl/kenia/OFL.txt +sha256 76af3e9e5d8768b17647813a443fcf5df3eb3ced017ee285796625e714d5ea2c ofl/ruslandisplay/OFL.txt +sha256 6e54fc004ebeb61322ecab1d86334ebf69e7051632d48eca489beee505d70762 ofl/hermeneusone/OFL.txt +sha256 8586a7e75681c7297af4cc0641eb2b29e882c5187fe189a1160eceb4e95d4163 ofl/fenix/OFL.txt +sha256 d8eb8611f8c98d20cbf18a28425652d6022dc2a5cca15026b920f1f2bc92a612 ofl/deliusunicase/OFL.txt +sha256 197c3f48cff4df3d768230e0bbdbc4305d8b8b9041ea6fb5e00872af66adc5ae ofl/novamono/OFL.txt +sha256 08fba9df5c9890f3ab00ee63f63e005ad93a23746f7484f5fe9501a1ad32730e ofl/allerta/OFL.txt +sha256 af88d31020bb48a1f78f4384249814d04a44d22feeede2ff4ae79fbb4fcf74da ofl/rammettoone/OFL.txt +sha256 397e83b05703a4240be51e2c3a2be1d0d7693d7a2d8b1ff367c26a2b9afc013e ofl/singleday/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/cedarvillecursive/OFL.txt +sha256 d416bc9437e1d7d8aba0613395ee49c95ce72d680672e910c6205b545cfcbad8 ofl/cherryswash/OFL.txt +sha256 513346ac60af1dde9d4a7bcfad3f39909d5697373a8aa1a6ee4376e6d22d3cdf ofl/niramit/OFL.txt +sha256 0b1bada9befa95a40d55830fe83fc7f8064e245fea33bdf0f96f57848f3866fa ofl/coda/OFL.txt +sha256 2a7b0a41ef401e4e0e955280b07c0a2698932d56aad3181089bdbbaad5760491 ofl/habibi/OFL.txt +sha256 2d62278530348951887211d79d1dba04acebd6ed3b1c413f6154702efea3ea62 ofl/iceberg/OFL.txt +sha256 a20db45220b6c4dc9776f24c77dc9ec7a98977d8b3c65b03aabe66b2d08e0791 ofl/cabincondensed/OFL.txt +sha256 fc1e501d419d84a8f1a800adae092045002d7141241f498237611dbb8ea763d7 ofl/stintultracondensed/OFL.txt +sha256 9a51726e5f247cb1f07bb8f49c163bc3e9ddee5f367bb5a1871d09b854ed1b7c ofl/basic/OFL.txt +sha256 ce0023bc03e1428feb5abfaa939b601d2d827ee5a6c84a2657993a7b16c5290a ofl/diplomatasc/OFL.txt +sha256 e30f893523e50ebbe07acd783ae29c7d604e6208cae7646d993e8528ce13e35a ofl/federo/OFL.txt +sha256 9d96f445b6e9c701428811d0177f894874f8d6f07ecc30d568c506542368f3ff ofl/sharetechmono/OFL.txt +sha256 46239ba6485d28553fd944da4ad32a00d9c403aa1c3e111676b0b96fe458d1d4 ofl/averiasanslibre/OFL.txt +sha256 5951473ab31533bfe1452bbcece47f237a5546c7e7d45ff1aec0289619623294 ofl/fugazone/OFL.txt +sha256 aa5d677391db4e54ad324b6888792e533c5d800de7ab713302a2fc8bff2f4f6e ofl/miltonian/OFL.txt +sha256 e0cde1a4993ed689d463d5e2401f4a60c54cc48a14253ab0f8012d722c417038 ofl/mavenpro/OFL.txt +sha256 c1eed37b6d213df4edf8f92ec7d1e972f751abd68ecd649b4f0b8e5d8e8561f6 ofl/yrsa/OFL.txt +sha256 5bbeae56b9db61a9bf85b64d5ed9a74cfcf9ee3e9b005bc2906859ddecd5eaa1 ofl/esteban/OFL.txt +sha256 7b826efb1b74a50b1c1aef0a1ba4530925b993ceadc3016d1d787c68a61649dd ofl/tenorsans/OFL.txt +sha256 28c6d2887c3dfa42488c5418c6c16ead580d33ff0afe60c05159689201f9ec63 ofl/jollylodger/OFL.txt +sha256 ce0023bc03e1428feb5abfaa939b601d2d827ee5a6c84a2657993a7b16c5290a ofl/diplomata/OFL.txt +sha256 8f2e5a9b52cf355023104413827e17dd7126c5a3656492d45eaa1ceb270aa4f1 ofl/yantramanav/OFL.txt +sha256 fe079cdbbad0f6520eb0a8235bce65b21596dd0c4c5a2694b3325cc87313b618 ofl/shortstack/OFL.txt +sha256 018d17b5e04c0a217a21979fa6b6d77bd5a143a5f06ea2ea102e427abd1ebfa2 ofl/tradewinds/OFL.txt +sha256 31c59bcdd538c113ef5c048f56827439facb12b7e5cfd158b04c83727edc453b ofl/salsa/OFL.txt +sha256 eeacf16032901d0ed0456876ec77b8f0fda6b3fecec7d972f8543eb602e6c30f ofl/nanumpenscript/OFL.txt +sha256 ddf311c28ddf5a5ad9747649837346b67bed9d356789c3072bb27dbce49e514d ofl/ptserifcaption/OFL.txt +sha256 c867d1a613bebc4932cf28c060fefb3bcfba3be56ed498b873c79f4eb786af1d ofl/librebaskerville/OFL.txt +sha256 694282197de3d750a43689dc64a8116cd19578cd516e7b2490c7b5362c064dbe ofl/kameron/OFL.txt +sha256 cb30d3086a8b3ce0b9e3690bf48d6620402b61160bc658076f95180ccd9e9dae ofl/sourcecodepro/OFL.txt +sha256 a40c3a6d0c968d3a10b17a2614606de6f20178deccc2447305f31fb106a57fb0 ofl/fresca/OFL.txt +sha256 5d3457831b42632d958fe1a14a09706d8acb006486a5ca5b2b419cd61cb22e32 ofl/chelaone/OFL.txt +sha256 6b53fb03a50914cc382f4d025ee595c17c43f24ae870f840bc51969d3e316c7e ofl/limelight/OFL.txt +sha256 574430e571a6928624f4bdf044420f7547a26309b7ebf6962296d33294e0a1e0 ofl/combo/OFL.txt +sha256 fd20b82eb12d16ec31a58fc44f7e6c533b14b425b569d83f616a1f7a9a401e75 ofl/gochihand/OFL.txt +sha256 0e74984817cdd51dbfbd8309022aa75f733e80dff0cb1d26ad2157e90446ba97 ofl/enriqueta/OFL.txt +sha256 ddf311c28ddf5a5ad9747649837346b67bed9d356789c3072bb27dbce49e514d ofl/ptserif/OFL.txt +sha256 4e69611ba5017f1fde74c31d342f5c85604814b1b45387b9ab46205996dec38e ofl/astloch/OFL.txt +sha256 013e33b6b2919fd0ffbdde6080a1c0f4521689fdce0f4876a59cf49ff8ae31c0 ofl/geostarfill/OFL.txt +sha256 14b3fbd06078a869cf2ba96e6dacb852d373703c86ca7ad54a4cdd6e20fbab19 ofl/knewave/OFL.txt +sha256 a8103c045a88bf9b28dcd7eb60a6662008f49afc0f3721bc46aaf761fc0409e7 ofl/englebert/OFL.txt +sha256 bd22e766af8f8e58eb520cb4fa73538826d04f7371b45e82295d22d1e32a4e58 ofl/gidugu/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/justmeagaindownhere/OFL.txt +sha256 5fba78215eb4e42aed6cb0b5c5df52e0f71246281a866cd4493dfcfcbcab9518 ofl/playball/OFL.txt +sha256 e75230ee246a04912366cd8d759d081200d80fb0756766c96dd52f73e8b40bed ofl/romanesco/OFL.txt +sha256 39de3de5f1873f89bca4af37823ab22e28e88d0d8f7fe2f07e82e9e6e9bf7b70 ofl/gamjaflower/OFL.txt +sha256 244ca4ef7b106d8c660e9a00cecf5d581b6a222f447d7d59a8f61711b2ad3400 ofl/uncialantiqua/OFL.txt +sha256 36e2f1debc9778bac79fac1a0cb5a5ef51c102f00b58ef7d8a05324144b68166 ofl/didactgothic/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/giveyouglory/OFL.txt +sha256 638774cdf8233b5ddaf9ebee1821e9de1d5d59c335d8ee3ba0b47fb17833b502 ofl/glegoo/OFL.txt +sha256 842b4f4605b32518a1269c4d030d719ea2c4c317d699fc4441d0219658e18893 ofl/seoulnamsan/OFL.txt +sha256 a10a07aaa150c147fa3cb22e845013f38e6c2b45fe5ba32a74ed1be9d4c417ae ofl/odormeanchey/OFL.txt +sha256 a74380bba78a364ec70b3a5fb6a1161b83cb05cc3e75a0910afbd1b5aff4f9c8 ofl/jaldi/OFL.txt +sha256 9b8405bf5f503f92401fc990f372b34d469670ab60041d5298d1015d3d0b45f8 ofl/thabit/OFL.txt +sha256 7c05152b2380228795cb474819744653fb03ddbfe5990b912ec7d9a41387230d ofl/asap/OFL.txt +sha256 ca9fe3a0e10bbb082f83ecdc07f5f04845c4bd689c46456da3e6bae23e11aae2 ofl/inder/OFL.txt +sha256 5b158abb3406e69b7408b562b7199f6ff55a41ea56e260b87176d693b0095e47 ofl/piedra/OFL.txt +sha256 b7eae5e3c3447f70caa14e0c43f5e0d953f54ee59df406f6362863bcee1a0a95 ofl/almendradisplay/OFL.txt +sha256 87b7d831a81fe8b37e7e6c672937493f710ff81883eee3adec7b5423297efd16 ofl/sharetech/OFL.txt +sha256 4ec46c3e4469afa19f0156bac6917472974f9c85c189f9220cf8735d3e810401 ofl/kristi/OFL.txt +sha256 93f60741563b4f51f2fcdb207fde72b2b23292a47022c729aecd998b360d8038 ofl/bilbo/OFL.txt +sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19 ofl/hindcolombo/OFL.txt +sha256 afc1b710d644c1262e1765d2401abcf93a545a4cb051955e2243fbabb8164e25 ofl/carroisgothicsc/OFL.txt +sha256 930fed5b06a415736dc3b4e5f4f01585523b672717564bf677f93966bcd57636 ofl/lustria/OFL.txt +sha256 9a536e5a3b55c2605b0a553eed383cd3efa42ba48dc45cc6f0635b3c53ee791e ofl/warnes/OFL.txt +sha256 879ec56fcc9a961937fd24d542b3b7b3f2b8cb3236b7351e62d16719e25de14c ofl/griffy/OFL.txt +sha256 29cca754098468057880970c604e55c4e2bcb8479742e4130c94f2ddc0363f9c ofl/sixcaps/OFL.txt +sha256 67261c7ceb3e627da5c94d6617dac6da29bf36b910bee304a7680ad62e2c8b46 ofl/changaone/OFL.txt +sha256 327bac41d89cf9f32e0efe353228018e1661cff458a5d4905714958514df7bd5 ofl/lalezar/OFL.txt +sha256 525411e604e7a1d85a4cd42641869f94388f04a6ed77829d6c4edd7fd740ceab ofl/ramaraja/OFL.txt +sha256 3d08baba63f1f2427fd96dee8da30b1ef6c1421b3be0e1f07cc2a78abb27c91d ofl/seaweedscript/OFL.txt +sha256 4c0a1150a363b42bd8681ff4a00315ac49510a944c4c9978237ff8b90a8920a5 ofl/grandhotel/OFL.txt +sha256 bc4c7eb365ea342b1a027fb8417fb0152f5d482a2e31c012fbfa29b668827b04 ofl/cutivemono/OFL.txt +sha256 1818771d183d203703c4b134f028527b535810e2a0666c8fe2785354ddbef686 ofl/battambang/OFL.txt +sha256 b7eae5e3c3447f70caa14e0c43f5e0d953f54ee59df406f6362863bcee1a0a95 ofl/almendra/OFL.txt +sha256 9e0d3db586ba0abf5ca398683809dacdf4c81b2960f592bd085fbf206a67ddb0 ofl/sansitaone/OFL.txt +sha256 fb1dbf3725bbdd389b2c569e0eed5091d8d10eed2833ec7efacfc3542e408615 ofl/scheherazade/OFL.txt +sha256 9134ca6996bd33ea2022e109f13f20e29dee1dcd8b2e8878aad576d2ca334e9f ofl/cormorant/OFL.txt +sha256 156ea6985861158c7dea63ecaac4c78ab0ed737d168ddffc3e34c687985a033b ofl/sansation/OFL.txt +sha256 a9b3e7e1cf5735dc49d802b88b1858a2a50307ba2a877ddf3f0b27d8b1d0abc5 ofl/blackandwhitepicture/OFL.txt +sha256 5fe7f3c9410c29534ddd9dfaf64d3994ed4236096d0d543ae69eacc3b25632b1 ofl/bitter/OFL.txt +sha256 f6f60d5d4cf4f4b1fc4e41353c897a2f5a16e6396c0cd8fa8bdfd2f4586a9a68 ofl/alegreya/OFL.txt +sha256 e88691a5e0a8a3f788f31db959701ec90a1d5e7505f1cc53c5663180a7d23c81 ofl/lohitbengali/OFL.txt +sha256 ac55580be2df22a06d29a47501e2ae11e1d399620f5a779e17a66f016ba6d5ff ofl/portersansblock/OFL.txt +sha256 27d9af34210253e7ca1251fbace86c6f65b40031d6ce1a75493a1b2093631298 ofl/vt323/OFL.txt +sha256 9452ef55386e77bd284ca466587d72802337621d7f10aa700e449753883b3397 ofl/trocchi/OFL.txt +sha256 a9b3e7e1cf5735dc49d802b88b1858a2a50307ba2a877ddf3f0b27d8b1d0abc5 ofl/stylish/OFL.txt +sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19 ofl/hindkochi/OFL.txt +sha256 3173acd82f8c6159b5b1037b539fcbd4edff68e65c2ea8b9412b5a5ca97b08ff ofl/archivoblack/OFL.txt +sha256 c832a4230a713d080aa2f2544d9a298ed911f689b2c48f7f276a0196b16d2b8a ofl/cookie/OFL.txt +sha256 ae28423a5e63cb65e651ccf62c9091b322fff1d2d4e87ad9f98b1096c2e7abb5 ofl/metrophobic/OFL.txt +sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19 ofl/hindsiliguri/OFL.txt +sha256 8c22fb3866eaebd77a2cb8e8ecbb095381ff32300db57758326fef35a26132f5 ofl/ranga/OFL.txt +sha256 d2875ded3e44e9ae53ea2b35e825dafffa19e82c5d14addb9f1150fcd7a3463d ofl/mina/OFL.txt +sha256 8242e7737bce317f7a7f2b887ac87f5bb21305ab96bee92aadc3febac16c35bf ofl/voltaire/OFL.txt +sha256 fca01a37b10879d7685c7d03fc5a04086b15cdb2cb4f870cb687aa5a9a0a1361 ofl/jimnightshade/OFL.txt +sha256 2492bb8645caaf622bdc3e880cdc9b069921e7341346d7b193666c866a1935d0 ofl/condiment/OFL.txt +sha256 e6ac721b16f309c89fb443680afda427ea34968bad190a80edf281d01d65fa99 ofl/andadasc/OFL.txt +sha256 1e5d6660366ddcfca4f2fc10e2acfba9fa4d97d40aec80d7dbfd41d730a420ae ofl/cinzeldecorative/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/coveredbyyourgrace/OFL.txt +sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19 ofl/hindvadodara/OFL.txt +sha256 5c36e7ec460b285185ea23847aa1f508708d9ce15d5c055279defd022972f836 ofl/rakkas/OFL.txt +sha256 0b7eae990329ac175a2e1c329060b3a4d6876e4e0cd7e5235511578352f7b191 ofl/biorhyme/OFL.txt +sha256 c54957d55e7c9e66c28e474cd39de75dc044e8f69056788cae44eb78841ceef1 ofl/montserratsubrayada/OFL.txt +sha256 fccf4916b5f84ef5f88d93fec464421aaf4121d11d4be8d74ee2d032f7661d6c ofl/padauk/OFL.txt +sha256 9ca8b9e5db7184105da255bb110023cf1cce6caa56186341bb7b09ba97b20ba5 ofl/prociono/OFL.txt +sha256 0c3f4763f49c2cd37757a2856ad470aec6a416981ac6d6e3f900c1128be39de7 ofl/elsie/OFL.txt +sha256 0d5fa0cce86012de872273700eef4fd162459e7c24a6a314911380627391071b ofl/bigshotone/OFL.txt +sha256 ca64dee162bf239c7b92d854d388bcd30552edc3ae1ef5e31714acda34c988db ofl/jomhuria/OFL.txt +sha256 bd77eae571de83ba3884c74c7983e8ac5cdf858badc36906179346dcd7e82454 ofl/gentiumbookbasic/OFL.txt +sha256 2ce1c4fcf4ab9c8474d0824434497d4afa4425db4de5629103698b170ac4ee74 ofl/bungeehairline/OFL.txt +sha256 9c56b4e2e4e922cc37e19e1a9e2e1128beaa17a812e1b67c8ac371b0fb57ae03 ofl/kopubbatang/OFL.txt +sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/tillana/OFL.txt +sha256 486c4d5b9baf0d0ba5546ef3c43fcfe22c062299ab6948045a43efffe4b0f74b ofl/italiana/OFL.txt +sha256 4539710406c656519f8ddc789056a7cd6f4fe66b44cc2f52ebca6e251bb26e13 ofl/imprima/OFL.txt +sha256 7f55affd2bce8ed9be13297ba8df1a4a7e9835c2a006126dc2a1eb4ce75a7943 ofl/muli/OFL.txt +sha256 867b506cb023eae20c1accde77b2e0abf7d8a9e2620da8dbebac9f7b1117ca0b ofl/cantoraone/OFL.txt +sha256 aa72b0185d828cb2fafa62a154e84bd3e20c88ada30326089bb20542b6363aaa ofl/manuale/OFL.txt +sha256 4664e83780a263c53dbab95d3590a5a9db914aeb9a3c78f7e7ad451f9151c998 ofl/spacemono/OFL.txt +sha256 fc59ca3cd3bcb47bd4df597519111ec130c25cabcc57a8808dd2d243cdcec6ae ofl/oldenburg/OFL.txt +sha256 43c372f43d145c22e654781860506a75cb85b086dc76028a62a28a446506d253 ofl/italianno/OFL.txt +sha256 a7fe1f3d23034092b015aaeb53d2ecbc9e592be96b10bdfbcf8700ec6a6ffc97 ofl/fascinateinline/OFL.txt +sha256 d13a278247ce39695f5ea6b721103faa668083022c5280b78c6392263e473929 ofl/bonbon/OFL.txt +sha256 f0be7437bbb8b91ad4a4f7a5f3d0020368e494a803d892df03e8886d51f2db3a ofl/candal/OFL.txt +sha256 a68d8ec6bea7f277053ae93bf563d4b97c233f09f8e79f86ffe5db66f31fdddf ofl/prozalibre/OFL.txt +sha256 b00c646b7d04a6da1665a148815b8c589c1e05ed7e1febf7ccbd91758747cb03 ofl/quattrocentosans/OFL.txt +sha256 a3deaae17ab9a15dc3c2778126aa6f80d41d567741853f84b16a9e1318ed799a ofl/koulen/OFL.txt +sha256 50f7b09af5ff677f611a96cdf5eb916307c59b29f2e8144942718cb432a9bf6f ofl/margarine/OFL.txt +sha256 72a22b6dd29b6b0cdcc98de30701b46532c9f7314ee095df3063d10775dd70c3 ofl/trochut/OFL.txt +sha256 325e890b8b26fe0a683c3ba24c506d902bdd7034d9c47bd7fa2bb72b5433b9c9 ofl/shrikhand/OFL.txt +sha256 62fab0ba1d5593782cbf048da193f4b1edc16b817577a99d707827513ad80e9a ofl/overlocksc/OFL.txt +sha256 d941aa56e280b4f204272c4b1add01a8ebc7af3e8e69ba8ba9118aa2a5306dde ofl/berkshireswash/OFL.txt +sha256 9134ca6996bd33ea2022e109f13f20e29dee1dcd8b2e8878aad576d2ca334e9f ofl/cormorantsc/OFL.txt +sha256 36c285c5472c625901d4a13da7e31c5ea6126678d31d56cf95572c49f27c8950 ofl/passionone/OFL.txt +sha256 fbc351e1b5428e4f45834647dc23a5f8aaa3e744e2f4117ca03c44f640b9a3a2 ofl/stintultraexpanded/OFL.txt +sha256 021d5f1df697848da51620394659187be77cbe382ff2f896bc84ffb89c0c2d52 ofl/portlligatsans/OFL.txt +sha256 85b700bfba1250a6f8bdf930cd7113faf3d8e9dc52cd89eb98c3ac8a038a4aa9 ofl/londrinasketch/OFL.txt +sha256 c972795e48b096b6d4e3a947b0bb21c1baf1922a6e07ff9ada587c058f228740 ofl/coustard/OFL.txt +sha256 eb4a7a082fb0e7dde0a8f975d33f02907ccbe40751c8115e790cf3679787d01c ofl/strait/OFL.txt +sha256 9b1cfccef4a7e19f90e2901f808f3aec4335d3cc81f978453ad0c8ded14447a0 ofl/novascript/OFL.txt +sha256 43c89012c2b640187aae7e0c83d5ffa8381a0368c00e8426594358d44d3811e3 ofl/nunitosans/OFL.txt +sha256 fdecdad755f4e5e95bee491c7521f31625dc08283562ea8579543c90430eb269 ofl/karlatamilinclined/OFL.txt +sha256 5e80642a11aff2ead815949a8a929aff3fb7b9b6a24391406068a1b204dcc8ba ofl/abeezee/OFL.txt +sha256 bd77eae571de83ba3884c74c7983e8ac5cdf858badc36906179346dcd7e82454 ofl/gentiumbasic/OFL.txt +sha256 f2fcbde4b8968400d661e7dcc23052b1885815c8e3b45323b26cbb833352f5de ofl/timmana/OFL.txt +sha256 c8af073a60e30b55ef5d0e4f80cea168e06dd65bdee7ec18c1ea8de8f7228780 ofl/strong/OFL.txt +sha256 2ce1c4fcf4ab9c8474d0824434497d4afa4425db4de5629103698b170ac4ee74 ofl/bungeeinline/OFL.txt +sha256 013e33b6b2919fd0ffbdde6080a1c0f4521689fdce0f4876a59cf49ff8ae31c0 ofl/geostar/OFL.txt +sha256 e55c615ed00ce0054bd356041a41e5942b4a8cadceac1e32696ba2ef5f06f748 ofl/andika/OFL.txt +sha256 4705fc9bceb299b2a951d23c321d31f3679871bb99ceadb978907704d211f4f2 ofl/pacifico/OFL.txt +sha256 2887c5bb38abbde9ccc608c4dcc4b0dba0fefc0c74eec011033bcfbd3ffcb235 ofl/jacquesfrancois/OFL.txt +sha256 99d67fff016522688b8f913377f8ae9f6da6ffeae42cf67c0e5e87cfb0928d33 ofl/unna/OFL.txt +sha256 bba4a13f03d0fd5b476cc148feda6895dd8d65f34b2107ba9d010ad9539d6c0a ofl/faunaone/OFL.txt +sha256 842b4f4605b32518a1269c4d030d719ea2c4c317d699fc4441d0219658e18893 ofl/seoulhangang/OFL.txt +sha256 58bbdbe5c48dd1d7cfd658425a455c29811181873d3a46a4932c29e5b0ec16e6 ofl/euphoriascript/OFL.txt +sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/laila/OFL.txt +sha256 17b90cece30db64934b7299fd76b033a3774c8a990e78badc74c59a5be8e0727 ofl/cairo/OFL.txt +sha256 5f8ff4a3f951c104e99245bdb952be08c73369222048bbf19fa3bf7170d10949 ofl/sanchez/OFL.txt +sha256 8eb1c1019fe7fe6d0b6e7d7bbbba1d9cbdd969d8c5f26455708f6cfb8a77284c ofl/nanummyeongjo/OFL.txt +sha256 942d51cf079299e83e9dd7a9a37eb92260524e8d1d576b2f0b3f7ca207c53f8e ofl/newrocker/OFL.txt +sha256 117fa195cff980e3b10fd8e8e21658c6ec954b0886647970a03c9694d3553b69 ofl/galindo/OFL.txt +sha256 1d08c63944e639bbfe8a1b81e3c6a63836806c126b3573b9cda0db83fd27ffe9 ofl/athiti/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/annieuseyourtelescope/OFL.txt +sha256 f2ab7e5c5c750fa03a8d8f64c72a089ed86fbd3dc172440fcc704b27816d5957 ofl/noticiatext/OFL.txt +sha256 9a33b452a3107542c35fc5fcee80e4d8798c82aca071c2f6f58a0f8dc5ad61fe ofl/cevicheone/OFL.txt +sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/balootammudu/OFL.txt +sha256 8f24842e9174beda18a556c2ae7d54f5dc444340c19a3a9ef77e23bca366adbd ofl/firasansextracondensed/OFL.txt +sha256 746b384383888d9325ed2fa9c40d2456b458aa190dd2b8c515ed4f02a1075bb7 ofl/magra/OFL.txt +sha256 8f24842e9174beda18a556c2ae7d54f5dc444340c19a3a9ef77e23bca366adbd ofl/firasanscondensed/OFL.txt +sha256 fe9183a0b7c1ae626b14004cd533c89ec7c192aba017f81ab71ede910256abb2 ofl/abhayalibre/OFL.txt +sha256 876db27db250a9b9c03fc2ef30a5efe1f37c2ed2686d368c3779583bdf746912 ofl/balthazar/OFL.txt +sha256 4342add6f0f2261f8579f31c10a55938930559703eed18be4a33b74eb749d298 ofl/doppioone/OFL.txt +sha256 d8eb8611f8c98d20cbf18a28425652d6022dc2a5cca15026b920f1f2bc92a612 ofl/deliusswashcaps/OFL.txt +sha256 16a8be6ac4b009ba1dd1e17cea48762f4915609ea5dca1303f716cf63998739d ofl/adamina/OFL.txt +sha256 1d567f7c5f579d9031ae5edfb0108b4681bdd2e036249b228cc2843d3f052a0f ofl/redacted/OFL.txt +sha256 866669fde730bf2785f44905ec162f05f2b8d9f6dcf366aca99360fedbfe502c ofl/dancingscript/OFL.txt +sha256 008445a4d53fbd71bff9cf733bdfd841a1b15fb58ef3473f7bab4c456e3b2930 ofl/ovo/OFL.txt +sha256 b7eae5e3c3447f70caa14e0c43f5e0d953f54ee59df406f6362863bcee1a0a95 ofl/almendrasc/OFL.txt +sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfellgreatprimersc/OFL.txt +sha256 95d23e4559ea8c6a36aa04fab56e1dca0780f5d93734072d4501023296543102 ofl/archivo/OFL.txt +sha256 3747fdcbfe4f51d6a2f101c35105bacde3715b3c32b34b6b03e5fb37983f89fc ofl/quando/OFL.txt +sha256 38a83f1f8b6efc3ab354b8b6eed22e8524dc71280844dc24811d95ae27b34952 ofl/khyay/OFL.txt +sha256 b8fb5cd1bafb52e652c733fdb75ee20c763e97acb0398f6b4bbe1d8ada0c07e5 ofl/misssaintdelafield/OFL.txt +sha256 a3b0977c5c25101d45054cf9199b9127b05fddc79d4da7dcf400821824e5a6d0 ofl/radley/OFL.txt +sha256 41f82bb4d24b304f30f7136bc47abdd083782e4265c984160f5649d1e78ea49c ofl/montserratalternates/OFL.txt +sha256 7c05152b2380228795cb474819744653fb03ddbfe5990b912ec7d9a41387230d ofl/asapvfbeta/OFL.txt +sha256 d3909465d5838d9d1c72b975ff1ed4f410a85dccd43801be525bf2b2bde89f92 ofl/snippet/OFL.txt +sha256 2ee5e8e47cd7d08f60bb9555f72b25912c9e81b13f5bc9a0551ddf943da6ca98 ofl/mukta/OFL.txt +sha256 f323edc1e5a6d8fa16120aa15367cdfb15468474cc621f9bda1a2f73c5d08d73 ofl/sedgwickavedisplay/OFL.txt +sha256 eef925ad6afcbba33f7989f5ad826fd68d50cc1ab4d679c52927c8afd40bddf0 ofl/sedan/OFL.txt +sha256 4281c00ab5b8f672fc8d686f48cb886ffbe900c8c9ee22473ca7e72e7cef8fbe ofl/wellfleet/OFL.txt +sha256 8b89f3af5fd02216793ff3dfe9a04dc22dfe5c213422ae21558ff1da6a1e94dd ofl/cabinvfbeta/OFL.txt +sha256 4bf7256c8ee73577ee5e26643d3247ec77017ca04489befd3e0f3412827729c7 ofl/laomuangdon/OFL.txt +sha256 399b33eb38cdfc76b8665defa5f81d52e8193d630ad5858c893db6bc20031bc9 ofl/rye/OFL.txt +sha256 aa5d677391db4e54ad324b6888792e533c5d800de7ab713302a2fc8bff2f4f6e ofl/miltoniantattoo/OFL.txt +sha256 8594350034ab1cb85a1946ef8852e69290255816c311450a66fed6eeda9d6292 ofl/anonymouspro/OFL.txt +sha256 1e5d6660366ddcfca4f2fc10e2acfba9fa4d97d40aec80d7dbfd41d730a420ae ofl/cinzel/OFL.txt +sha256 351740da2d452b48193483f22f64918a6dfd64a7abe225c6187ad3f36e0d9cd8 ofl/postnobillsjaffna/OFL.txt +sha256 64a73da7af818283168543e24bd214aded1bfec06f013bf9cebc20064a8560c5 ofl/elmessiri/OFL.txt +sha256 4fece81b541808b40293b0cd3f5b1990274e1100e1c20455dc2987cd96639d3f ofl/metamorphous/OFL.txt +sha256 8d325681662a30f58f57c92ab656dcbc9679deb78a493e4c0eab75321b2df6c3 ofl/worksans/OFL.txt +sha256 2887c5bb38abbde9ccc608c4dcc4b0dba0fefc0c74eec011033bcfbd3ffcb235 ofl/jacquesfrancoisshadow/OFL.txt +sha256 aac8f0cda6159b7251d1034651bcb42e07611495bc8cd764c89d22f3123032f8 ofl/aladin/OFL.txt +sha256 81d0973236b5b5709a80a217a330db36eabedf57bf4031de46b4660b69901234 ofl/leaguescript/OFL.txt +sha256 5454dc5cf2f46a2005f42f13ee2a998c7d0afd7f556f32fda208c72b266f7adc ofl/cambo/OFL.txt +sha256 b2d4b0c773afce947728ab99fca43b242b7edb0da26fe29f60c7c2d5094ec23e ofl/suwannaphum/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/labelleaurore/OFL.txt +sha256 6939af7114f0a33c7e6142d4c1320d1bbde11aebe6d8f3c48fc5fb3e0f676a7b ofl/jejumyeongjo/OFL.txt +sha256 cbdf9d35f32a9a2f02fb23c8b89c115a5a8e45feaaa2266920c4594c83dd5ed4 ofl/tenaliramakrishna/OFL.txt +sha256 95d23e4559ea8c6a36aa04fab56e1dca0780f5d93734072d4501023296543102 ofl/archivovfbeta/OFL.txt +sha256 967d75b89eef1f8a0ba1f5ee7dfb13427621f9116c6e7878ca04da8c9aa8641b ofl/mrssheppards/OFL.txt +sha256 8af83da84dd4299842f871285a88049352ab301ffa1f233d2595b29506158635 ofl/blackopsone/OFL.txt +sha256 548890e4083028f04e5feba04b6e00554654d840aab81c8664eb66c2216a571b ofl/palanquin/OFL.txt +sha256 c4cd9f38c3246ee6a68c264f017320dc1af09677d386166d8cda806d9a12e0d2 ofl/jockeyone/OFL.txt +sha256 a36ab46c8b1a74a480a1c51d6a5af08b643e870c6d247f233bc97c97c8ad2098 ofl/tuffy/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/nothingyoucoulddo/OFL.txt +sha256 b5c776129b160163c84620b35fd45dea45edf49789cda5a94c2290c230581e0b ofl/scopeone/OFL.txt +sha256 dd028a807788d5e22e9f8cc18f026cda23369954673658f2ecc7d30bdb364b89 ofl/sintony/OFL.txt +sha256 8928e999ff156e35852ab41d7a906598a8285acd3bcd81dff67213a6cd98d43e ofl/mallanna/OFL.txt +sha256 473c5e3123102434d05c66a9fc8b19cf285a3bf71cd8a91a41acef44d1448e62 ofl/sevillana/OFL.txt +sha256 22d1914919d3fe08b179dc31169fc743ca7eede7827b91a5d48c23c8cdc7cb81 ofl/anticslab/OFL.txt +sha256 026610186158060ad351fb20cd1452def5d35b2531634c090ce8cd1d9e9aeaf2 ofl/michroma/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/shadowsintolight/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/architectsdaughter/OFL.txt +sha256 61056041809e0ba18bf8b9d637a375ab1c725025428533d74d668d88b2cb8b89 ofl/simonetta/OFL.txt +sha256 0a852a06f0256a6684662663ccb1d8e08d131abd1f70cf8d972a344cf31aa381 ofl/scada/OFL.txt +sha256 f46c3ea04f38ea73c0731d73dfba3d7361d4b38970feb31a3558bd1b75e0656a ofl/lobstertwo/OFL.txt +sha256 f30a7045e4e21201182b2b9fc4e4b96189aaeaceb2c8e9b68d8bd3dc4e3c5a27 ofl/greatvibes/OFL.txt +sha256 9bc1eb1c679510b32d2e3f5f4f3b47726b1657aa121494aa68ba0b124a3c3a53 ofl/ewert/OFL.txt +sha256 1103d0731f1360eb156b0047a1337b2d62266fadcef1015d06f6263719c0200b ofl/librebarcode39/OFL.txt +sha256 359671bf16c00cae69cb66d041296b2adc7a4becd73a463cb8c5e101d97c7986 ofl/arvo/OFL.txt +sha256 c09e3b81d9cfeec46bc29a3374000e8ad013d694bdf24a288088491dd4cd5c69 ofl/creepster/OFL.txt +sha256 29bd0cfd0fb2a45f9b057c834a057724bae1f63b525a8ac83d3e7525706d9f80 ofl/inconsolata/OFL.txt +sha256 85814924eca98e1fa530901cc5167d0012aaf31122f9570d7e9755443dd9335b ofl/siamreap/OFL.txt +sha256 223fa23e8419ee762c662e0faf912dfcf386fa7093ac9ff690e380ce1993ba55 ofl/asar/OFL.txt +sha256 a0369b1d5f654110f2fe101db56a02d02806f1e609ab233368bc573ec45050e5 ofl/butcherman/OFL.txt +sha256 4f8b437578b20bff261adfe6c02f63bcf7dbb6a45ab37804b3547e5d5f44927b ofl/nosifercaps/OFL.txt +sha256 793891edf1f4f4f35b52fcc9706b03f779c7ea18ab8e9e441242d63ef0279488 ofl/autourone/OFL.txt +sha256 842b4f4605b32518a1269c4d030d719ea2c4c317d699fc4441d0219658e18893 ofl/seoulhangangcondensed/OFL.txt +sha256 1c023b4aca0e441c55c45c86cdff57fa524a96778f291d9a29a4ad777b70e2e3 ofl/arbutusslab/OFL.txt +sha256 de61c87e08286ad3215398340e9403125ab03c91b33bdf29de6d3e8a386d2d28 ofl/dangrek/OFL.txt +sha256 53ad6a474f68ddfc3fe72449de3ede4d3f033b2f24b77833b1d56edf505486d2 ofl/sura/OFL.txt +sha256 247edbf968c0a5b8defd6a9e420080a8bbca6ea002bfb326d12a472a6f95637b ofl/cuprum/OFL.txt +sha256 0623888cc2391c6c9853c04eafa7f687fef1a8328bbb848feab05d9e2a98764d ofl/emilyscandy/OFL.txt +sha256 1c43e70c49ef7a9b35fcb3758fec8ec5969ff1274c4834b4466b9014f3b9f55f ofl/volkhov/OFL.txt +sha256 cc31fe974951d56d542f33782d07b2d5577a4afdddba89744e6bd69bcbf3a853 ofl/karlatamilupright/OFL.txt +sha256 cd354a6084383c50398fae709ebe3a5dd98b947c486c1fe9de5f89caf81f980c ofl/snowburstone/OFL.txt +sha256 8a59454b7f1cc0b1fa29805781769047e5c269aa629e3422c2d7fc04b89e5c1f ofl/rosarivo/OFL.txt +sha256 de71817dafdecfee21268b8c4f106146e1d00988c4fd6546b10445eb26b24cc0 ofl/expletussans/OFL.txt +sha256 d1829ff3455bbf3b9d13dfb0a57758a863107c9108aab48558f26f37f1094180 ofl/firamono/OFL.txt +sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/rajdhani/OFL.txt +sha256 26e4c39c4905bd7f1068b0bab008f5a4a9b945e2d7fda31e52719fc5aa9655bf ofl/vibur/OFL.txt +sha256 49f2a11271968a2ce019a43bf5401d1593652a18f27ea59037ff5e39856d2df7 ofl/changa/OFL.txt +sha256 1d08c63944e639bbfe8a1b81e3c6a63836806c126b3573b9cda0db83fd27ffe9 ofl/maitree/OFL.txt +sha256 2758cf7a872827f39661cf8cc24188113c030447aefb5ca7145993650076ca8c ofl/ptsanscaption/OFL.txt +sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19 ofl/hindmadurai/OFL.txt +sha256 f354ef1e7256644b320c5e1d9a07a819c2e2b930166003c96680894f9fba81be ofl/mrssaintdelafield/OFL.txt +sha256 5c289da4a19f054ace8e31a144a6a254601898cd7faf9eaa301141afda0adbbe ofl/coiny/OFL.txt +sha256 0886960207bb5bcf81a46ce663bab6c52a742dad80ee2cff5cbcda6f1df88568 ofl/rhodiumlibre/OFL.txt +sha256 8f94e5901c371537043e0c762c827ce33963e7bd186fbea0abafc035ef7120a7 ofl/emblemaone/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/gloriahallelujah/OFL.txt +sha256 24af1fb3ab8dfeddc83162b7f3b6c1104149b6c3022f1aa948ef4f8ff7e6bf7c ofl/poetsenone/OFL.txt +sha256 f3ee3eb20a9d565bee2bbc0d616de382a113327d7506565b2f3d3bee5f489375 ofl/bowlbyone/OFL.txt +sha256 70f664de65e7bb62e1ac728f20a9bb28de7fdc18be594186137a9e15ce9dcee5 ofl/niconne/OFL.txt +sha256 e604b133509815768e6ec4738bb04844ce9a23e80099d2b61e5d75ef46acbeb0 ofl/ruluko/OFL.txt +sha256 42ad5a49e171bec80308a1c9e8e66b03e638b3ea65af7fafa6fc0e42f45e7626 ofl/suravaram/OFL.txt +sha256 4fe81901e6f84cfce1145c715e931352a9a12aa7ac75cc193eb523c0cb0e5eb5 ofl/lohitdevanagari/OFL.txt +sha256 2937c7789b0e4fdeda6eafe93164a2ab36e20386704c4cb6f87b1deb620ec0da ofl/leckerlione/OFL.txt +sha256 91c25c350d3cac39da2736d74f7ba37ef648f5237a4e330a240615bc8d8c4360 ofl/ibmplexmono/OFL.txt +sha256 fce9f9e2fb268507a89fceea0b3eccc044f39fc3492968a04fd9e04df5ae95fa ofl/sourcesanspro/OFL.txt +sha256 e12a3e737fa75c0ee072d965b6185710f35e38a4f7a0793ebc66ba14a216109b ofl/meiescript/OFL.txt +sha256 d2f9c74aba2716333b0a3d283083f9fdc93b2e060c5ae094c79e97e8cba9d7e6 ofl/squadaone/OFL.txt +sha256 5d6517d497bea6116ed35079b30374043f6d90b19c8d97fc4e5ec48520d1e08b ofl/zcoolkuaile/OFL.txt +sha256 f8a20490ee8ad3adb2205ea44b279b19099a3a1d6b62849e90b4db20a77deeb8 ofl/brunoace/OFL.txt +sha256 75b2a5f39a53b4cf9286eb3d2cc1f895a8f3442680013c77124121bc347a6448 ofl/lemonada/OFL.txt +sha256 715ba72697e14daa9b29a333545f69bde7c497b9f77d0a2a4c4a5a752d961801 ofl/marcellus/OFL.txt +sha256 1103d0731f1360eb156b0047a1337b2d62266fadcef1015d06f6263719c0200b ofl/librebarcode128text/OFL.txt +sha256 eba176d3ae86af6b41e9b744e4d18fb56e2a6ad671381bddb61fabb86b1d39c1 ofl/croissantone/OFL.txt +sha256 12404fcefccc3cb964cb2406510ba679b30f7d7ae689db08df5b455ae24b3feb ofl/paytoneone/OFL.txt +sha256 e2a176ce310235bf281f1124454e21331390ae1b4c429a2d80ae642d333a5a7f ofl/frankruhllibre/OFL.txt +sha256 2d83a49d05906b5e23285168e72c0d019fc15e3ad110376f640feeeda34c27d1 ofl/hennypenny/OFL.txt +sha256 d7d8074c2dd46804990c184e25849947ab76c5ac7607fbf3966543455769bb73 ofl/yeonsung/OFL.txt +sha256 13831d02389d917d22fcfa6c79f98f8acbf61d230add0e73a4d4dc5f3bfb9e56 ofl/chakrapetch/OFL.txt +sha256 c39e284759a441660d4c4d852c537e271d0fd5c301fe46d065a972b6ee144ba8 ofl/aksarabaligalang/OFL.txt +sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19 ofl/hindmysuru/OFL.txt +sha256 0da6a3e5b24a9fa04085c20a2a1d3101eeb1e0bff56a2291f407187e1b2adcf2 ofl/mrdafoe/OFL.txt +sha256 a815f65bc72d90494b01842d3171f7cb0f9f935e023d9cc260904d221ef1064a ofl/b612/OFL.txt +sha256 e2f2dc7a667954c16a919acff5351e8ea89813d10f5a7504e1f4668fffbfa14b ofl/barrio/OFL.txt +sha256 8c495ddd455def58a45310376a747bb61bf86e4b071cc527b3618bccd3ef00fa ofl/chauphilomeneone/OFL.txt +sha256 b687f920fe20fe48d8f7709421e5deeb4becea295c80ce62aadcffc54132fa1b ofl/stalinone/OFL.txt +sha256 a90a8ebe28f3c2905a44557166010a3d219ffcce1703c3c3280ea8728d5e2ebd ofl/heebo/OFL.txt +sha256 c267a00c9476c78a2336d7b372b536885b8b24173a29ed53496f67a742c14961 ofl/alefhebrew/OFL.txt +sha256 2cd51b11e821dad2fb7acc54d68bd9a139fc7a1207e17c432ba9ce49bba3d493 ofl/fasterone/OFL.txt +sha256 ca424122f42a8d8442bc4cfd902f5f027ea67b5417705f5af1d1235927781720 ofl/amethysta/OFL.txt +sha256 bb8fac04b8535d39fb9851c9d886248d25bc0c82000066c92dd577c3369f512b ofl/chenla/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/lovedbytheking/OFL.txt +sha256 53a9ce47085d9fef613c7ecb3730dc80d25962510bbea231b89564f58240f251 ofl/gaegu/OFL.txt +sha256 9d96f445b6e9c701428811d0177f894874f8d6f07ecc30d568c506542368f3ff ofl/share/OFL.txt +sha256 9465823369fbe1ae0b5a3065021d53ef8c56e113e664229455dc80b237fa6a07 ofl/nobile/OFL.txt +sha256 0dd8e32457e18621737b593ab0fac49905cd948a078ed0e64f4890df714a1dfb ofl/amita/OFL.txt +sha256 791936b10381b512512317572fb5eee91bf503344d52c37335e402fc1cf19992 ofl/reemkufi/OFL.txt +sha256 898a9cf80636e86d6b6009b96795fda29e431ee701c28c36f274a7e8a7d8246b ofl/rubik/OFL.txt +sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/baloothambi/OFL.txt +sha256 382232d1add5623ba5b06394afa071f4eeecccb6d2b2bd02cfecff4a8a45065a ofl/fondamento/OFL.txt +sha256 0c3f4763f49c2cd37757a2856ad470aec6a416981ac6d6e3f900c1128be39de7 ofl/elsieswashcaps/OFL.txt +sha256 d849309d514833fe3d7a610e10f6cd5d99b4f9552bfa304969acbf89c66e4422 ofl/smythe/OFL.txt +sha256 53f9c99fa3d47f7d632a42ee7bab4a834a60a744f6026d676c3a223cef2b2ef3 ofl/vollkorn/OFL.txt +sha256 a1077580b649c7b0e05ea0e9369d48687b4ab1c585573bf86b0dcce7dde177c0 ofl/junge/OFL.txt +sha256 a9b40759b5821a0c2ad07cbd2c2a61dca4b3e222e6370a7d5bfb6b373bf4fb10 ofl/sunflower/OFL.txt +sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19 ofl/hindguntur/OFL.txt +sha256 84b11cc0aac8fdb93af94872bc4b8f015caabf4919db63ab7f916ccff8e52f56 ofl/josefinsans/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/dawningofanewday/OFL.txt +sha256 f27cbf1055db7b9dd80bce5cd12b462f2d9ed7313d84dd8bfef1ddd2b61bdfc5 ofl/chicle/OFL.txt +sha256 aba8997e16b1e3888c6e855ba883c70d96bd4375bff8cb9c7ce0f097200f74b8 ofl/abrilfatface/OFL.txt +sha256 8f24842e9174beda18a556c2ae7d54f5dc444340c19a3a9ef77e23bca366adbd ofl/firasans/OFL.txt +sha256 d484e0dce424a9e360adabb568b6773db5f1566df71ce3e9dcd66a6cc2c38d33 ofl/ericaone/OFL.txt +sha256 1b3b78123c94dcbc9fd4ec174317336c8c93423da62dc946b8852553cb13ddee ofl/economica/OFL.txt +sha256 74584d937293a9cacdcd2eb05851b71aa1527901c18b87961d2f877c77a1b486 ofl/kanit/OFL.txt +sha256 a6a74417db7c37f69495da556a3eb86a22a784ffb0131e3e0a5a47ce8d7fa5fb ofl/shanti/OFL.txt +sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfelldoublepicasc/OFL.txt +sha256 963f283b5410c7df62067a35cd7def0802c583a880e7cd7e326832ec3985ec87 ofl/spectral/OFL.txt +sha256 11bdf9c7abd81f46a88b0b017d78a0e51f451e9dc0c2272813aa9f456ee886ca ofl/kiteone/OFL.txt +sha256 6827fa45930d5847fca5b3d3898b3d87a229fba772a5b6c5bc33bf73ec83478d ofl/khmer/OFL.txt +sha256 5ae0cfa62a70251d9a2c3c5430ed3bafa480005f23e4b9525488f2318e5c10ca ofl/mrbedfort/OFL.txt +sha256 34b8afbcab7508bea23847288332a8c05a507364ca6f0c8756ce560d7d59d506 ofl/mada/OFL.txt +sha256 b67eed9578defb59cc4ff4b58428fb816786e499e84cdeafca54723b055c169e ofl/viga/OFL.txt +sha256 afc1cda4eedcfe27c8cf30fe3e9879587cb43cc2882d4cb91dd3e3fc9eecd0bf ofl/farsan/OFL.txt +sha256 cc8c0c3e81cf543e190f128b83ba7c30959f15865c14dd972fca4917faeceec1 ofl/encodesanscondensed/OFL.txt +sha256 9ca8b9e5db7184105da255bb110023cf1cce6caa56186341bb7b09ba97b20ba5 ofl/lindenhill/OFL.txt +sha256 a89ac8075be60f2beba79bed3fa253415a373dbdc3bb108b23f4854d0dd495b8 ofl/pathwaygothicone/OFL.txt +sha256 4b255eb44f613a8e426e195f0d0b7e10fcba1af7eb6047d9a7f4f3c449940e19 ofl/hindjalandhar/OFL.txt +sha256 f22a2beea88d631a620b15683fd03e79f13ad3297ad97fa5e42283c0b1a3a038 ofl/marckscript/OFL.txt +sha256 faf47a1ceab38b07205b9d58fbbf9ac39772ea47cc731aca7816276da7226a22 ofl/terminaldosis/OFL.txt +sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfellgreatprimer/OFL.txt +sha256 d2f87f90d108a947f98c030d9d8e4bf27e761ce83f222453b9a7230c5fb309e1 ofl/novaflat/OFL.txt +sha256 2da0fa5707f1fab1c802969b098fd1b92ca0b3b233a80e27fca416647c064dfc ofl/exo/OFL.txt +sha256 f9e5dfcdb2947c0db70465668706b0617cd052b6f86e582dff8741d9e5cded0a ofl/yinmar/OFL.txt +sha256 bcb0bda74430ccc281a616a81d0a287fed5a423815b00b222e0b7f603f85b26f ofl/caesardressing/OFL.txt +sha256 a94cfd8d1f5c33f9a7506def359b907f3313f7008bb57fc893985963cd342f8f ofl/arsenal/OFL.txt +sha256 52caec7d90533523fa7da64e95faf90ea32a663ce21847a39234b61e18d25044 ofl/bokor/OFL.txt +sha256 ef0bdccd20de76d517fb3939161d05ecd5808382fb8fa82cde5fcdb3adcb8029 ofl/engagement/OFL.txt +sha256 0d75673e4c98de3e11337dbd90b05d0232edfcade5c1c02fbc0118c85aea25da ofl/macondo/OFL.txt +sha256 9cd20277e2c89d47e3997435e3a16539d20173d850fbb42474990f71642e473e ofl/matesc/OFL.txt +sha256 a7ba785ad99b6eae0444ab89910e512d4af9865937fddbcb5c72c4f59f55d6ad ofl/merriweather/OFL.txt +sha256 010cb216e8f3fbb2836fa3f38787a412b749352de546797f57c03c3bcfe46b1f ofl/nunito/OFL.txt +sha256 91c25c350d3cac39da2736d74f7ba37ef648f5237a4e330a240615bc8d8c4360 ofl/ibmplexsans/OFL.txt +sha256 cb8bbf7a86eefa8c146f24ae5be74fffa887ba83719ab3c87036be8e3d0191e2 ofl/montaga/OFL.txt +sha256 1103d0731f1360eb156b0047a1337b2d62266fadcef1015d06f6263719c0200b ofl/librebarcode128/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/overtherainbow/OFL.txt +sha256 3621f156cc7a26e0a9cb413332e0bb35a0e76b36dbfe0b1c885b565a7bf3051e ofl/drsugiyama/OFL.txt +sha256 fbb941b371c6348ee2572ce8c78fb66128a61885f960dec1906c4e44ca4b4d3c ofl/reeniebeanie/OFL.txt +sha256 9e19c0d2e7e7adcbe9dfd0749e34dda41e7e356e0f2cc082d61d2fc9b6e0cef7 ofl/gfsdidot/OFL.txt +sha256 812fc4af0c63d31e0e81cc153af74e397407b0630e918b8b965bcbb192bc0656 ofl/artifika/OFL.txt +sha256 e8ad3f3de5baeff6bac6e711d8c406e0a6b8a61d2944741532d8965d893a2681 ofl/pirataone/OFL.txt +sha256 9134ca6996bd33ea2022e109f13f20e29dee1dcd8b2e8878aad576d2ca334e9f ofl/cormorantupright/OFL.txt +sha256 65f43260cf7e66b57ddca8d148384a6602e2c06edd389a8b3cf388045127b47d ofl/lusitana/OFL.txt +sha256 518962c41d4a5e96b0016bd8d8acc965413ea1a0102467e4955931e702b14a0d ofl/iceland/OFL.txt +sha256 2171558d2482764644a2f793696fa2e48c361730ecc87686b9a29082d6daeb10 ofl/khula/OFL.txt +sha256 d336c098ea798bf14de111cd90dff7d6bc340852405246511345d0f8564fe76e ofl/fingerpaint/OFL.txt +sha256 ea274e87939d38032b31fb741af75bff9fa3f8d4a8b652265f9e0ce1ad7e9f80 ofl/asul/OFL.txt +sha256 eb1992aec1cf892ec94ffc116d79b62c7cb03dc108141b94a57a4195d210b514 ofl/meddon/OFL.txt +sha256 9b584984f9db0ee30347391a76eff9c0a6b03dc450c3c6afe3757a2cb3a4db87 ofl/tajawal/OFL.txt +sha256 1dd84b611f4bed7f9ff9089e76a96337b187e6f283a4ab33bcb987f844f2c4db ofl/parisienne/OFL.txt +sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/hind/OFL.txt +sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfelldwpica/OFL.txt +sha256 de08ff7a460541753999b1208f1254f1d31f16b421312aca4d4b8179d997de38 ofl/aleo/OFL.txt +sha256 7706a84d7e49e2273877106334a1eded8ae89fb5839fb81e0f2bb27c846f667e ofl/lora/OFL.txt +sha256 cc31fe974951d56d542f33782d07b2d5577a4afdddba89744e6bd69bcbf3a853 ofl/karla/OFL.txt +sha256 0409c6582424508453ce41648067efaacf0c790622918493d8f1d934bc5329a0 ofl/bigelowrules/OFL.txt +sha256 9e2d92fb24b4a548ab030c509ba88267e224f2523728ee9bb35cf334811106bd ofl/exo2/OFL.txt +sha256 f480fd19e7018942ecaf460f7a4ab9ccee0aec579abcb07d559dbede913864c6 ofl/alikeangular/OFL.txt +sha256 6ea7a3ef1d07feb592693f3f22c26d0b09321ff81814292b49be99888d0da9d7 ofl/ponnala/OFL.txt +sha256 0b7eae990329ac175a2e1c329060b3a4d6876e4e0cd7e5235511578352f7b191 ofl/biorhymeexpanded/OFL.txt +sha256 21b54eb0d7513524798a00dfbaf99a02c003a0012a728cc5f0e02d24c50482fb ofl/caveat/OFL.txt +sha256 adadb8d5d34fe2218dca0f4a4919a9b6f81dfaebb289e5446ac7b3063d6965e9 ofl/tangerine/OFL.txt +sha256 16741ac498178f645283cfb45b7a487b6d361b5de5730c5ea729f056f414f6b0 ofl/ropasans/OFL.txt +sha256 1e5bf8207a40678bc401e2e5456d0db1f2a183b550a30976b48dcdd6a4e4c46c ofl/caudex/OFL.txt +sha256 6f9e3a1c51f617e7b110862426204ec7a56d8c6d2f731373b5de6b8d069099b6 ofl/ebgaramond/OFL.txt +sha256 c2368518f12463a93cfed44e1460f36085dc60df06f415ee9b0319809987ccce ofl/frijole/OFL.txt +sha256 5f247fad3e8a86b6c0779dff09277047c1ce2b0b7580a1093347a8af755352ba ofl/sawarabigothic/OFL.txt +sha256 6627b9c2c8ff8e0c6ef23f1b0125dd5b293320c10c916d402fef64916c296d0e ofl/kreon/OFL.txt +sha256 723764a50d4e6985dfcbd75fcb40dbd3abab37ba25ae626486d4a32084854487 ofl/kdamthmor/OFL.txt +sha256 846ce83956a732edd57b74d9ba988d58abc8c8e6d0926859559318ce6aed139d ofl/mclaren/OFL.txt +sha256 ba01480319f922ecebbc73f1a523e7f8876e92b16553a32c494bcd3f6f5a27fa ofl/ledger/OFL.txt +sha256 c3bfad2900a83f571d5c984d490d51c56aef14806c28dde38125593e1e71daca ofl/mrdehaviland/OFL.txt +sha256 12af42b715a3901bfa7add1351e45b6ce22f3061555d52db45e963274c349360 ofl/arimamadurai/OFL.txt +sha256 aa8a8196a3e22c3bd985e33cd3245ae9a38accba5e79fc0e3b292612a8d6b337 ofl/miriamlibre/OFL.txt +sha256 3169e7e0e87168908218f11d660a52c0b81b5952fd73918a596e70721d68d3e5 ofl/inika/OFL.txt +sha256 e711c816f7de931244976f51166baa15446fc307e5d0ea04fdca1bc2c04afb1c ofl/nixieone/OFL.txt +sha256 1ba345a91338581e5f8fccc3e37e447ddea5b99ec9caec1b76c7c39492387d2f ofl/signika/OFL.txt +sha256 b01cec9e5e2035b70a6aeb61c673d1f6d5c91539845be07733bd9880fddeb9f0 ofl/kadwa/OFL.txt +sha256 d7577acbab1d70f2e6bd1b21d8f61db189d6aabe6375bc2d96564b8d94031664 ofl/stalemate/OFL.txt +sha256 5946eec3a7d3bda02825930156e4716198e7753641dd3303a3e8c386c8011909 ofl/eatercaps/OFL.txt +sha256 ae6de2f6fc00f76cc7eb0d97c1ae5e0b7ec734f20ad7f58cf4c74738dc822d21 ofl/chelseamarket/OFL.txt +sha256 860cbfdc9dbc3f0e8d35af80c31e8f20945bff393d4f483dfc157469e01d321c ofl/gorditas/OFL.txt +sha256 9a2d8c5a3de0a6e62432322115dce136139948411dba33cd86525c0a02749fb8 ofl/unicaone/OFL.txt +sha256 4fe01b13ffb41faa8f030d84843a95dab32792dfeeca7c072abbfd3f4d6896ad ofl/audiowide/OFL.txt +sha256 173ea2d0bdda981829719623c35699e8c0e4aa508e0af12817ad7ccbfa4c6137 ofl/originalsurfer/OFL.txt +sha256 1d08c63944e639bbfe8a1b81e3c6a63836806c126b3573b9cda0db83fd27ffe9 ofl/trirong/OFL.txt +sha256 58bdc69f4c6177125c6e7cdbc78f710f5f9952f11bba7bd5b17bd7ef169d731f ofl/goudybookletter1911/OFL.txt +sha256 2950994bcfb8e903f0539d28a8ec4af077e0aa1fa7946c33c912d2d6969c2971 ofl/glassantiqua/OFL.txt +sha256 7344b8b8c97c4f88c0ff8bb72bb024bba72f404be1c740b6596a73ed15d28df3 ofl/vampiroone/OFL.txt +sha256 cacad5bf45bf5c81f4b6cbd114261bc8a08f6110b66a4c6fad8bbc16618a3096 ofl/daysone/OFL.txt +sha256 0677891e6a143f297350d260ad766ad33bfc18ed5fa4f213acf648d6b597ec1a ofl/alegreyasanssc/OFL.txt +sha256 c8155eb9337078a9ea9f1e576ac813a03030ca43e2694593e90cd4fee6fce937 ofl/sumana/OFL.txt +sha256 95803fae1b063e592c67b5867f1f36df1df526e5ebf33c6cd4d4afa31a9d5586 ofl/sitara/OFL.txt +sha256 c254ae01c407f4a2bd0ad163e4c1a795d57ddfa8967c21b8a28c250b44d13963 ofl/sawarabimincho/OFL.txt +sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfellfrenchcanon/OFL.txt +sha256 25995bcf8e8ddea1aafa5449870567cbbeae7e26b27ba30aca5642f2c02e9757 ofl/quantico/OFL.txt +sha256 455755e2e7ce9dbac6beb3729c97c57d6f74a638dcb5be548ec953021fbdbfb3 ofl/ntr/OFL.txt +sha256 ad6f73fa3edb7aea340aadbc63c0d7ef7663abed82664432ae09a6b377fa313f ofl/librefranklin/OFL.txt +sha256 581f08727777cb2a1a1ec95c0f981ce64fb1ad4354f78a0ac4f3481afa605577 ofl/moulpali/OFL.txt +sha256 4bf7256c8ee73577ee5e26643d3247ec77017ca04489befd3e0f3412827729c7 ofl/laomuangkhong/OFL.txt +sha256 08fdc7cbd92b9bbc4d41d0945ae7f25450d91c5fc8c66c68df331af3505e4ec3 ofl/rougescript/OFL.txt +sha256 694d5c15c1dac5e26653e18b94394d911e471549ec9b7d6247ade62e486b4915 ofl/asset/OFL.txt +sha256 bddfe669338d0dbc24c15ccd31dbf5c101a213da38049c24baca9ccb7fde45a4 ofl/wallpoet/OFL.txt +sha256 2758cf7a872827f39661cf8cc24188113c030447aefb5ca7145993650076ca8c ofl/ptsansnarrow/OFL.txt +sha256 3cbf579238e4eacd90ad67883d971aa346ce8990d658635f78f98d608a6830a2 ofl/zillaslabhighlight/OFL.txt +sha256 87000f71a897c8c130c7777d058c5868f84316f99a32644b3bf595cd11edeb12 ofl/sancreek/OFL.txt +sha256 08fba9df5c9890f3ab00ee63f63e005ad93a23746f7484f5fe9501a1ad32730e ofl/allertastencil/OFL.txt +sha256 9608d22ae5c586628c9904e773b7c6a6520fc16e1492ebcb5ea55d9523399964 ofl/anton/OFL.txt +sha256 f3758ee70600ecd5450f01ea373204b202e048d0454c9db2d1175c5a5dd1e92f ofl/vesperlibre/OFL.txt +sha256 e43f121c788cca4a14049e58864e28021174b055710ba38e0964e816dbf905af ofl/fruktur/OFL.txt +sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notoserif/OFL.txt +sha256 a1580ba69a8d706bd95e1e72ee0b5cfda0a478fbbab6a4af13b4a9e1b28faac0 ofl/revalia/OFL.txt +sha256 f323edc1e5a6d8fa16120aa15367cdfb15468474cc621f9bda1a2f73c5d08d73 ofl/sedgwickave/OFL.txt +sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfellfrenchcanonsc/OFL.txt +sha256 0836fd874230b17f840efcf7d3bb529f5a7b5befbfeef94478519cfe2d8551c2 ofl/courgette/OFL.txt +sha256 e3ed3ad6cb257e16dc1789900707c5cd1cdef2d60d155389342604991cf693f9 ofl/bahiana/OFL.txt +sha256 391ac3126dacc95b92a8f3408467879edb3245344bc411530a30d5aada52df92 ofl/gugi/OFL.txt +sha256 88dcde7d08e509a3eec64886292a36cbd58ed9bb52f37f91f55656fb9d21ddb8 ofl/supermercadoone/OFL.txt +sha256 41423e9e1d0ea79d0e78bd5fe9e0b27f4c23140706f5dfbfe116839c83aae91c ofl/charm/OFL.txt +sha256 43186c592361336474683e302dcc988831a53857bef188c4466f6b45dc238f84 ofl/fredokaone/OFL.txt +sha256 a21fa252efb7a1ff84de6a36df4386959668aa046f28161b4047829f7d9cd1b5 ofl/damion/OFL.txt +sha256 842b4f4605b32518a1269c4d030d719ea2c4c317d699fc4441d0219658e18893 ofl/seoulnamsancondensed/OFL.txt +sha256 bfc205682f5454b42a732ec857b665293ab8bc6f0ee901a0967219ba7ffdb190 ofl/gfsneohellenic/OFL.txt +sha256 59b91c9912b80714852a43897cbc9414d6457e22072dc99a4cea6e2bb4f3c65c ofl/freehand/OFL.txt +sha256 8b89f3af5fd02216793ff3dfe9a04dc22dfe5c213422ae21558ff1da6a1e94dd ofl/cabin/OFL.txt +sha256 b598b7fddfd578950aa1fe6e0e2607b779abfaa686b83af8ec65c860f646b2cd ofl/rumraisin/OFL.txt +sha256 2bd35914efa381c80f9fb62d6ea7d736d3c0739196a3783c3122593c3408392c ofl/gurajada/OFL.txt +sha256 5625e91bd7c2a45c8b9f59106d587bd025470b462ea901df691defe0099621e1 ofl/taprom/OFL.txt +sha256 37d5360d8d2433689e78302a93cd88e9add8a2294046476625edada2d4328deb ofl/averagesans/OFL.txt +sha256 f8e2b58dd7a8c8e21e5d744b45876bce7e010a647c071c1ed42ff0e618d4ea59 ofl/frederickathegreat/OFL.txt +sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/balootamma/OFL.txt +sha256 09685e225ba9b697b2ccd2d4098cac5ecbed0679960605258a271af60749887b ofl/francoisone/OFL.txt +sha256 39de3de5f1873f89bca4af37823ab22e28e88d0d8f7fe2f07e82e9e6e9bf7b70 ofl/himelody/OFL.txt +sha256 08a12877eda24767239f26b527bfce0c515efaf623c66da6baad92a6d5315e9a ofl/content/OFL.txt +sha256 0e2ccc5da1dd979f08ba82bca2fb61592506a1e58d3cbfc26d904f0db71bd812 ofl/saira/OFL.txt +sha256 d8eb8611f8c98d20cbf18a28425652d6022dc2a5cca15026b920f1f2bc92a612 ofl/delius/OFL.txt +sha256 1d08c63944e639bbfe8a1b81e3c6a63836806c126b3573b9cda0db83fd27ffe9 ofl/pridi/OFL.txt +sha256 c1eed37b6d213df4edf8f92ec7d1e972f751abd68ecd649b4f0b8e5d8e8561f6 ofl/rasa/OFL.txt +sha256 4e66943af352059c059dd658774f25fbc831f1ad478f9f0890c06ecc2dd324c7 ofl/metalmania/OFL.txt +sha256 f5b03ea0b27c7f5afb9702771ee57679ae8ba6b471b6ba9e62d985d3256f1929 ofl/playfairdisplay/OFL.txt +sha256 593f0bc55c75b673772b378eaee314f128283745c4bb1cfdb9b8012a3b6c46fe ofl/skranji/OFL.txt +sha256 46239ba6485d28553fd944da4ad32a00d9c403aa1c3e111676b0b96fe458d1d4 ofl/averiagruesalibre/OFL.txt +sha256 14d28541780d90f6577bb7abcc6f005bf6969614294e75c82abb8758a696ad46 ofl/quicksand/OFL.txt +sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/baloochettan/OFL.txt +sha256 35dca6122235851d236bd861124f4a893d409eba021cd8c6a292a19df0f4640d ofl/codystar/OFL.txt +sha256 ab721b35816e470fb11619ad3705f75d08dccd0864505e3d782e94fd937f6620 ofl/allan/OFL.txt +sha256 d9cdb075679d15a99bab2a8541b9c4fdc71347502111fbe9affd1d462219d96b ofl/indieflower/OFL.txt +sha256 1313ae342eae4e1810304b6cd32f6815dd11b8e45812a2af98e58b6960684fa0 ofl/petrona/OFL.txt +sha256 1e4015251ca58d4f349b4ac930259c6f3d6381ce68f8b4b27d54d53f8f63f972 ofl/angkor/OFL.txt +sha256 46239ba6485d28553fd944da4ad32a00d9c403aa1c3e111676b0b96fe458d1d4 ofl/averialibre/OFL.txt +sha256 8e28b778b6e1a7ff9ca72f4dee2d53120aa2856dc1bfd0be44307e365b0e45bb ofl/cardo/OFL.txt +sha256 a02e8715fcdf3325c474b7209399f50230897bfa828fe4eea2639ced1a1d574b ofl/blackhansans/OFL.txt +sha256 d530c14e9cc263c567b47742ef20df2a41374f00732ba4f290f52adad428b1a2 ofl/meerainimai/OFL.txt +sha256 2e2fe5f1d8916a5160060594a96c1a5116406d26847afdbd09618481e2abd6fc ofl/denkone/OFL.txt +sha256 56c4ff36faaaf336bc5fee659ff6fab2413d67499cc22acc29079b3892d8931b ofl/miniver/OFL.txt +sha256 0d75673e4c98de3e11337dbd90b05d0232edfcade5c1c02fbc0118c85aea25da ofl/macondoswashcaps/OFL.txt +sha256 742a6a4386db47a2987c7c3b4aeedfb5adedfb3356c118de450a664735686535 ofl/graduate/OFL.txt +sha256 9e53298e3629e00ae4c31531cca09051ddaa654a5de4f7b55e596132fff86e1f ofl/dhurjati/OFL.txt +sha256 df9fcd8f62ae79aba7fa5b0563a08dfede1fa0909d668287d70c395d88f5fe02 ofl/fjordone/OFL.txt +sha256 02faa476b17db0044d0c502a3ce12fdc81eeeb9bd618e6a005407c79d6081bbb ofl/monofett/OFL.txt +sha256 1edecf3f971a11dcfd777cbda6f08c0f9a77bf57a0a2a89d8142fb933894ce16 ofl/amiri/OFL.txt +sha256 6e6efa9b0556d100cfe60690cff5d9be7144df77adabfd2c278dbfee451351ea ofl/phetsarath/OFL.txt +sha256 2348c4852e6322105d130aa2addbe24c962e330094ad6dfbfd9fbd2281d76b0b ofl/bellefair/OFL.txt +sha256 3bbcf1617d93d3a949a10da78ae91c58be536fb04567ab4b5b9fd207126f1db5 ofl/buenard/OFL.txt +sha256 faf47a1ceab38b07205b9d58fbbf9ac39772ea47cc731aca7816276da7226a22 ofl/dosis/OFL.txt +sha256 3ac1301549523d9861fedca12871f24e575fbd26d520632fc00ba849b471d275 ofl/russoone/OFL.txt +sha256 44b51296985184d9b27fc2c8e5b317906c5d65d9dc834e81c07902d3e5e1cf1a ofl/brawler/OFL.txt +sha256 afb8c471158619593df0fb501453bd39fda42396e2cc3911e2a0a471c11b863c ofl/sarala/OFL.txt +sha256 de985adf63cff6b1bcb7c5cb55f1c5850fb1d36289d20a0e26d97a281bfcf956 ofl/aldrich/OFL.txt +sha256 194e25172d0144f29aff4b6fb2931ff0be0139448a5cd867db37863c9179330a ofl/stalinistone/OFL.txt +sha256 ae05f8781a5ef38380ef3efe8cad86783610b6a780c6c278d7472f95310fccee ofl/oswald/OFL.txt +sha256 2dab153a33dcb2101bba3f194d27d953c848a0fabf2e336650a81f84a0c33b3f ofl/pragatinarrow/OFL.txt +sha256 9d61931b909f9a738964f8fb311eb8fa40dba1ef9f1688b36039ebb15ee1805e ofl/questrial/OFL.txt +sha256 e315abc82a78710c7242e2f2e6529651fd631d4d50e6ad98ea194f9b54c3d701 ofl/alfaslabone/OFL.txt +sha256 4653c63a4bab99aa50de5190853fa21ea6c0a25d69d49f5a42cd51f0f67665e0 ofl/boogaloo/OFL.txt +sha256 bd8323cd1d2b6bbdfbbf99cb41ec1156d0352ced170de4aa3a96d95e6e20bf5b ofl/amiko/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/sueellenfrancisco/OFL.txt +sha256 ed93e9833f18acc2775380a28139fd88d3ebf82df7cb814042498467be3463bb ofl/lemon/OFL.txt +sha256 1f00d1f970b4ea469b6936e599b599bb217edaab792e586658ef2e71cf438685 ofl/itim/OFL.txt +sha256 fa28ba897eb819768d6bc00c30aa03ef560e80e5f6fb872eaea089c66992f502 ofl/notable/OFL.txt +sha256 96199bf9ff12dd471a66911dee95440737b437e7f5a6fd30e9e950c16d66e8df ofl/unifrakturmaguntia/OFL.txt +sha256 36e2f1debc9778bac79fac1a0cb5a5ef51c102f00b58ef7d8a05324144b68166 ofl/judson/OFL.txt +sha256 ad4f6ede2e8a017255822a6abee8d10717f1d34c20223de80285ff59e28a1cba ofl/bangers/OFL.txt +sha256 f8779e6871bbab04e0a1ddd9997f4d8173b56792a1e7f8b9d691d967a49c7dc3 ofl/andada/OFL.txt +sha256 49b9214f7b40024abec2fc89a32bdda380f2174ba7005d7636e6ea340157c5a6 ofl/jomolhari/OFL.txt +sha256 a815f65bc72d90494b01842d3171f7cb0f9f935e023d9cc260904d221ef1064a ofl/b612mono/OFL.txt +sha256 5eca89cdd576df5e4b7c694e0425b126a9ca839aa067df85fab33904a8187076 ofl/amaranth/OFL.txt +sha256 e0cde1a4993ed689d463d5e2401f4a60c54cc48a14253ab0f8012d722c417038 ofl/mavenprovfbeta/OFL.txt +sha256 eeacf16032901d0ed0456876ec77b8f0fda6b3fecec7d972f8543eb602e6c30f ofl/nanumgothiccoding/OFL.txt +sha256 0fbae33ac3aa455c8c0d598347c87f1abfac0d215483f40f5a0e8dd08076df1b ofl/librebarcode39extended/OFL.txt +sha256 3670ddaf348c62ada22a2f606158dedcd9ca5fd5422a6173d6593204a8f53d4f ofl/varta/OFL.txt +sha256 ab592d1abca19428b89d851706fa7815ec25139c6affb45d366577ca63fb91b7 ofl/yesevaone/OFL.txt +sha256 e8dd8f53b2fa502ace0636debbe7e357c4888d8d02b8b41d6a9a22d3058a63dc ofl/peralta/OFL.txt +sha256 cdf5fc4014abe91588666a9592ec86200e5a4d743b4b6e05d28d47e850bbe5fa ofl/digitalnumbers/OFL.txt +sha256 f8c2225a5fdb50e2e75f98cf6e69f198571f605f1b7f6f7eacc0947e2fcdbe8d ofl/sreekrushnadevaraya/OFL.txt +sha256 a80ee908b60f5bec9c10b135d3da93730e2194107d1f7fd3f61bd8c1a97b3e0c ofl/yesteryear/OFL.txt +sha256 6d216cec166b6e139adaa599053dd49720c053e1f2adb4845de3cc9c3704344d ofl/play/OFL.txt +sha256 46751a31966477e3f038d1e5ff1146a33234a3a523a0e6a21be3221cba082a34 ofl/muktamahee/OFL.txt +sha256 505bb8f3c30f2006b4e02d250fda31ed94b651a35f1124a201ca1c405ce989af ofl/biryani/OFL.txt +sha256 5641212407f956b828bf632afc4bbb3344f461f82255ab56756d9e3e8604c7b1 ofl/martelsans/OFL.txt +sha256 1ed119b01f03187dbe2f5f89c95431b9a4ca46db604fd263164d8b4055189f46 ofl/lateef/OFL.txt +sha256 4938e917ac54665be1dd862f54634d991b39c5d1eef69345d66a5089e401bfb4 ofl/creteround/OFL.txt +sha256 9263f9488a9ed1d5f4218581b642e0f054f9a20d208f1a53c19c9f7dbd27eaf2 ofl/peddana/OFL.txt +sha256 e75ed24435d1711de0bebfaa621c3eb5564798c88cc0c1d1f8d529bbaae703a9 ofl/yanonekaffeesatz/OFL.txt +sha256 708e33bed791c40638926a7577bcef8ff8748f84045f3825277540cbb8d483ba ofl/poiretone/OFL.txt +sha256 f1d1a3536fa4b9c71d04fe4c8d8bbfc0cc5c457d6883f45086b04d0bc07ed12d ofl/vastshadow/OFL.txt +sha256 f9f28345ffcd6cea6e3c6699e4579cd1948053d80fe89a6a5a2ecb269afc95f8 ofl/nikukyu/OFL.txt +sha256 c1bcd16ffc9d095822fd6b7fa1a24c7918b24815ed05711421f804293d2efa62 ofl/actor/OFL.txt +sha256 ae629d13b06d9afc5cf3c07d585f3192b89b7decaffc5c4dfcfa7ce11a2a2b11 ofl/raviprakash/OFL.txt +sha256 bdce62dd98db969b73f93f8e8e2151004c20ad871ceb15ad9bfcbdf2cf939dba ofl/pompiere/OFL.txt +sha256 39de3de5f1873f89bca4af37823ab22e28e88d0d8f7fe2f07e82e9e6e9bf7b70 ofl/poorstory/OFL.txt +sha256 757f49d04406c93c40d1781e7867fd85a1f9fdfbfe03a5ae332900da802fffc6 ofl/harmattan/OFL.txt +sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/khand/OFL.txt +sha256 74ba064d03f1f1c4a952da936c3eb71866c34404916734de3cae73b34357e59e ofl/lato/OFL.txt +sha256 94625b91cba99cf9c8e580febf5e738b2e3c7cde9034a16bcfb7538b672137e5 ofl/zcoolxiaowei/OFL.txt +sha256 3e908f3a95680bdf3c8456bfbf76392605b34cb3fba109e46441056ab966cb35 ofl/modernantiqua/OFL.txt +sha256 6a809aeba8af2115ca4b4c3597b1fbeb836a45f0489070f330f9c2dff870da8d ofl/galada/OFL.txt +sha256 2c3737ea83b48d48624068d1bbd1d9f8049eb7cf2e1f67435e420375c42e0686 ofl/spirax/OFL.txt +sha256 92f750829545386017c3418d890769778b76fd01dfb41c62fcbb0d42ba0303eb ofl/dorsa/OFL.txt +sha256 656a20870fbcb8f559f1c6308c1df90ac93d7cd0279aab49b43a43b5e58534e6 ofl/neucha/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/zeyada/OFL.txt +sha256 4bf7256c8ee73577ee5e26643d3247ec77017ca04489befd3e0f3412827729c7 ofl/laosanspro/OFL.txt +sha256 33e3a83e377c6a41149044bd919f50d9a971d801052d4e0c0a98cb417b42ae38 ofl/risque/OFL.txt +sha256 b4fc1d55ce610f255c5712f8169543f9610536d002deb99bbc99bfbba9f8a560 ofl/pangolin/OFL.txt +sha256 511125dc85198375795fdbc109d088654d3b7f9dbd3ccb7bf93d844aef0b153c ofl/ptmono/OFL.txt +sha256 819e3b25f9b50f12299a3db1638be3813efc6b938f2b86693a218d20ec4e3209 ofl/londrinashadow/OFL.txt +sha256 e3ea566dbf689a9110b2094f9f2e5d16d7ec31720147651efc1005ca20420dd4 ofl/flamenco/OFL.txt +sha256 186d750eb496a4c17a76385f82be6aea2ac1cf2de074a811d63786cf374ea73f ofl/barlowcondensed/OFL.txt +sha256 705960c3281a5765ecc0b59bd4ed7ca59eed165748076bc2fc3e8fdbfeb944b0 ofl/pressstart2p/OFL.txt +sha256 7e896665d0863d2a17a671001dbe2528a5f9302f1dff9222af8b0834e9088d0c ofl/kiranghaerang/OFL.txt +sha256 5f1f5510eff7922864bf326ffa1d4a62f01add5193e9367b542378e5a808b500 ofl/handlee/OFL.txt +sha256 3173acd82f8c6159b5b1037b539fcbd4edff68e65c2ea8b9412b5a5ca97b08ff ofl/archivonarrow/OFL.txt +sha256 82831e8f12ecb6deb2f4d9919a04049895b4619e0301fa6b699c861bd7311c54 ofl/kavoon/OFL.txt +sha256 1a5e3792a425687a523fc7c0f8ab5d01d58bf853149d57f3dec4b4fc6932fcf6 ofl/hanuman/OFL.txt +sha256 7f91d7d8854e5cb4fc630807c0f4d57c07777769dc597173fe0aef5e58f0992c ofl/qwigley/OFL.txt +sha256 354b4be0340cd58e381fdf58793a108897bf944a7f8faf9e877c476ed6c730d1 ofl/convergence/OFL.txt +sha256 1e20933206ca06421c7c378184da5476d195314cf4bcda2bf122cd45d69a956e ofl/oxygenmono/OFL.txt +sha256 a7fe1f3d23034092b015aaeb53d2ecbc9e592be96b10bdfbcf8700ec6a6ffc97 ofl/fascinate/OFL.txt +sha256 4dbbe5c21b46f2647d227dde69b971a1b46de1435e0752a9eda1ce120725a93c ofl/norican/OFL.txt +sha256 1f581506286e960436548dba0701aab278f7e67f2adc6bdae2958923867d1e64 ofl/hanalei/OFL.txt +sha256 56edbe5fff7981dae6f6eff32f61ba04cd54324e5abfa44b1257b2a307ea561c ofl/poly/OFL.txt +sha256 59bda6b53e28d388de5eac7bbb8f3e65889dc8489be3d922f95a525354110c0e ofl/tharlon/OFL.txt +sha256 3fa0ceff4b9a2d28dde43bc63cde3acfb5e6e92d13a53e484ca0e501e18c7e2e ofl/lekton/OFL.txt +sha256 ad9ce814ff266b57d3c4698d3fadca4b41a6f942a0ddd215db5cc66abf92d668 ofl/mako/OFL.txt +sha256 c4afe82f49c05689c40dd4e262803b29c6e611e7b4efd3a0418f574b2be79d9a ofl/carterone/OFL.txt +sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/karma/OFL.txt +sha256 d38acce513eccb51d7ac34ca47be279e1fcfdeca1ed088bdd2d281dc6ca939ee ofl/badscript/OFL.txt +sha256 31eb7046f4c80e0f96944c4b40b0772de68b34783b794fc13aab3f54c2ef6d9b ofl/thasadith/OFL.txt +sha256 06c79c896894160a5810d869a822fa7d02a0e2ccffd97920b8cf3b880380f6e5 ofl/amstelvaralpha/OFL.txt +sha256 4faa2d9e2ce0a4b5b37e62ee6fafe474a539b31578f7214ed97cc3503aeb8ebd ofl/oldstandardtt/OFL.txt +sha256 1e511bb01d29562932157365418c02d954d8faeef794bcd54729177fb2b03db0 ofl/istokweb/OFL.txt +sha256 846e8cc6dc69bf685d2db14cfa758ff3d9d771d54c9e0d3b511f0ecb97ac0e8a ofl/cambay/OFL.txt +sha256 6c181f5a0045e8f414e1c232c35972ab83ea084ac44825f517ba001628d97b21 ofl/kronaone/OFL.txt +sha256 d7f96801a28ea11eaa51bc4a9c87fd91f2133bc298068e6e2847a15ddda23089 ofl/librecaslontext/OFL.txt +sha256 1f00d1f970b4ea469b6936e599b599bb217edaab792e586658ef2e71cf438685 ofl/sriracha/OFL.txt +sha256 22c4588bdc14621220ba14515d52041d1312541e034a15d1f5c2a88fc6075276 ofl/merriweathersans/OFL.txt +sha256 1103d0731f1360eb156b0047a1337b2d62266fadcef1015d06f6263719c0200b ofl/librebarcode39text/OFL.txt +sha256 5b26c88d163b1430561f53fd3d9021d6057f3c67d25534a5d8d232cfbf8ee2a4 ofl/wireone/OFL.txt +sha256 57f8d60cfe9212b971f07253e303746128edd06b21e3a0e4e188308e569f03e5 ofl/orienta/OFL.txt +sha256 c87702d8b70f714fbefb554660e8ca57a43ef62a59089d11cbf0c6bd51d56928 ofl/lohittamil/OFL.txt +sha256 6939af7114f0a33c7e6142d4c1320d1bbde11aebe6d8f3c48fc5fb3e0f676a7b ofl/jejuhallasan/OFL.txt +sha256 9437c26410bcd543607a6775e7d0e359c1df3926d68c92dbaceb26ce79cc0fd3 ofl/bevan/OFL.txt +sha256 50265d2b41f8ad2dd350532d2286509aa694021b4aa0490b06f0068e4ed78c27 ofl/herrvonmuellerhoff/OFL.txt +sha256 9acc45e5ba18b5b38868fad1f51c03df4f5d7a43061d46314843de45c4444233 ofl/ribeyemarrow/OFL.txt +sha256 1fac7a3e4e43b091c2d31aef7a375d2b969c42b2d5fce8e2d40b5f7b1233ddb7 ofl/moul/OFL.txt +sha256 331c71cbd8f1d8a70cd6eec3d55553b64e6261a9bb0982fa12e6e48baca827c5 ofl/philosopher/OFL.txt +sha256 1e20933206ca06421c7c378184da5476d195314cf4bcda2bf122cd45d69a956e ofl/oxygen/OFL.txt +sha256 89418a3c7b5726c3f8828a7b7c3f1cad661cf5b7a1be3d2bd9ea243f8d9890c8 ofl/sniglet/OFL.txt +sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/balooda/OFL.txt +sha256 89d9d01291eeb91074ccf1f7ce07e7a1d9d421ec1191f8e84d440cb50830ed92 ofl/purplepurse/OFL.txt +sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/baloopaaji/OFL.txt +sha256 9acc45e5ba18b5b38868fad1f51c03df4f5d7a43061d46314843de45c4444233 ofl/ribeye/OFL.txt +sha256 f938d4076b66a13cf984ce88d92a07ff9802e8ae5e1f4a28cdc43fad122ae611 ofl/spinnaker/OFL.txt +sha256 89bf0833b785c49b0f271273ab440bdc20c85bf0322537dc901df940bf1579da ofl/amarante/OFL.txt +sha256 377f4f9c19e935228552478eb68cc2ed82910988a60ba60e2ac73b09f32d02d1 ofl/patrickhand/OFL.txt +sha256 684ef102ca4c5ff61cf1c1e5c2c6326f3c26f848446f98b8862dcca716a87601 ofl/quattrocento/OFL.txt +sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/rozhaone/OFL.txt +sha256 61be7c29f4835e2be7243db12213d75d53ff028f29f4b493212a1688b1d3a1ba ofl/titanone/OFL.txt +sha256 9df0700fcd0ef48abd74459a8650d35f59397fbaa00c5b00527e57cc155689c0 ofl/durusans/OFL.txt +sha256 b1958132ff727bd74409aa37ec0abbe4be13b1b379e1210e6fb77fc608c607d5 ofl/kodchasan/OFL.txt +sha256 f1888ed385b528866a472d02f4e06ef0873aca5b3c63ff1f6116cbb150dc9a13 ofl/metal/OFL.txt +sha256 e36d420a3b382b337c386338d8abc3635e10de5dfca7f822fc63ac659a0dcfc3 ofl/amaticasc/OFL.txt +sha256 8fbe530adcbe30c658393c3f2b5a4785d6765afcefdfe47f594730131f3a0abd ofl/oleoscript/OFL.txt +sha256 60ddc0ee6e443b78940b5f92bcbab76c98ec6965e0da9fbdaf267383ab72bba8 ofl/anticdidone/OFL.txt +sha256 afc1b710d644c1262e1765d2401abcf93a545a4cb051955e2243fbabb8164e25 ofl/carroisgothic/OFL.txt +sha256 3184f6a99f589c78740fbff6ddaaabb43b8cc2f3852da36e60aeb024ea8d6f00 ofl/eaglelake/OFL.txt +sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/halant/OFL.txt +sha256 9a9f089005f389717106bb3ba427cda9bd51b8a477078644566543f2a60ca85d ofl/rambla/OFL.txt +sha256 99d2f30e282d6174af8ff68597f58bb53c0dcb2b104a4c1b8d19da49021d00d3 ofl/unifrakturcook/OFL.txt +sha256 2bb0c0200723d923f8e20d08b8bd1c7af7f5cef8bb2d63ce44bd268b54334621 ofl/fjallaone/OFL.txt +sha256 72afba97d1ac9409a9fd3bb91a02a639427ca1988977909dad273e293a508d7e ofl/staatliches/OFL.txt +sha256 88aece7d90f2bb7049719f11619a560af22af3451af141f12aa4f46bb157a99b ofl/lobster/OFL.txt +sha256 955655cafa13f187f45a79dcf451942fd1118a8426abc5a25ffc5dbb00709da6 ofl/juliussansone/OFL.txt +sha256 9e1c955538817c3fab7160cb3110501e73ce109eeb58c4992a14e8323d900849 ofl/pecita/OFL.txt +sha256 96d82a96abc02fb457ddde0227833dbde9d1d02876c91f0a4e27845ca0d692fa ofl/atomicage/OFL.txt +sha256 7729f005b7a087368e2cf61fc4b65cdc85988e47d0e6e38c93a72de345e86b41 ofl/newscycle/OFL.txt +sha256 336fab6956d78eb34b50cd7bc6b16116c44735fbd0bf9f4def769ca4d8e218a9 ofl/sofia/OFL.txt +sha256 b26cae1321380296ba8311b632a397d5eac11b47197f9d0aa0b9310f1531ad60 ofl/sarabun/OFL.txt +sha256 aa8a8196a3e22c3bd985e33cd3245ae9a38accba5e79fc0e3b292612a8d6b337 ofl/suezone/OFL.txt +sha256 d3711c90a7deda6210d30e41b945f16bdaa00662b30ee0b7c36abfee82525bfe ofl/kokoro/OFL.txt +sha256 513b7871a360a6eccd426bab59743fbff36764588f47381423f04ad6b3d821d9 ofl/alexbrush/OFL.txt +sha256 67f64c5509e5151796599e3ad47c3131cbe0c80c4f9430b90236a1249c2eacc9 ofl/roundedmplus1c/OFL.txt +sha256 4a7d2f227b91046ef7a54f8f735668d86e45f4fd4089268de292a6e9de108253 ofl/bentham/OFL.txt +sha256 3c187c861dc291b9f7f96f655656f9ac2d57b33da425bd5962810be728344f57 ofl/brunoacesc/OFL.txt +sha256 869e4c29978c318b33c2e5c7c8f24d2e947f249071bb1471620036a9d1ba87ad ofl/k2d/OFL.txt +sha256 6383249ddffbd87f2bbd7878ceba2dee0f1a2193cd7a4f41c00aaceb8e6d8b5b ofl/meriendaone/OFL.txt +sha256 ed50ebe2fa922554980909192526fe94966556626d6d440a462c8e7eaed74cdc ofl/sortsmillgoudy/OFL.txt +sha256 d64c91b0306b53fabed08762068eea8b918d654fb0721c288f13cefa4aaf088c ofl/butterflykids/OFL.txt +sha256 bc1175730d609233043cde47e48f69831f012e85537c5ec1a2cf4836757c1540 ofl/mali/OFL.txt +sha256 fe5e822667a4b2e083b8fdd7a37546163f26f6481b58742236abffdcfb3e6c71 ofl/baijamjuree/OFL.txt +sha256 b0316f404a7b291e40921c605160181065791a5010a2d2d5691fc7e28cdbdff2 ofl/underdog/OFL.txt +sha256 c026db4c1a557cae47e6930876965f9cbc05758eb1f5d6f59b6b61c8f342a57f ofl/alice/OFL.txt +sha256 aad1e82802172d4c1d22dd015a5b8b4275e5665a49c1df54ed64716fca7ae194 ofl/corben/OFL.txt +sha256 878aec7282ab41d058cedbf90e14512bcb4fbd0658496de8c2dfc592ed1f0cd0 ofl/lilyscriptone/OFL.txt +sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfellenglishsc/OFL.txt +sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/sarpanch/OFL.txt +sha256 aff3cea99bf300b4b29f4dc04867cf9b49d83de8c5ecaf991c446d506b56173e ofl/wendyone/OFL.txt +sha256 b054962de0af1397d5350fddb4d6bb20f5f2e073b543eeeb694c7c3b27144fc5 ofl/chivo/OFL.txt +sha256 19849b33c59d0cffeaad0dbdc38db767e95e03cd36fbbfe6b67a9878aa5758df ofl/fasthand/OFL.txt +sha256 a57810cbca0b4715ae8610dd7a268260cebbdd4fd76d304e371517f828150669 ofl/stoke/OFL.txt +sha256 47a0b7e315bc56ca0326fca46302d87d48a61e3528d4196e966b62f5bf0243f2 ofl/armata/OFL.txt +sha256 eeacf16032901d0ed0456876ec77b8f0fda6b3fecec7d972f8543eb602e6c30f ofl/nanumgothic/OFL.txt +sha256 616e75d879831bedfa7725c078e09bb56f8a17f40b194e16691b12251bb42b3e ofl/majormonodisplay/OFL.txt +sha256 75c7ccf4f537a7a3ebbedd299c1d2542e13d3b27aaf76a0a2d9fa91a2a8fcd3a ofl/felipa/OFL.txt +sha256 ee2c069b30f3e9a5aaf52357117ee3443ee27f17c29a2ec68861db283379905c ofl/dynalight/OFL.txt +sha256 fbe0442a6b1ce162c95e241df76cab5ef2daf6a5ac84ae1a7a6749f32c051098 ofl/breeserif/OFL.txt +sha256 43d530580461a574f6dfed9e15af6a74e95f7c04d9bfa1174a63ff036e8eee07 ofl/rubikmonoone/OFL.txt +sha256 40bd3f35477284c021978816e9d3b8723ff2283fd7065fafaa5bb3004e41b237 ofl/songmyung/OFL.txt +sha256 460966d12f306a007930575c3b8bc336fe0c32f880d622af6d3b745a06ca79a4 ofl/benchnine/OFL.txt +sha256 f6f60d5d4cf4f4b1fc4e41353c897a2f5a16e6396c0cd8fa8bdfd2f4586a9a68 ofl/alegreyasc/OFL.txt +sha256 0c922e2d65050677c26ae8dc501bc9ad3e0059c4b10df2fc9717d7bdacdfeb6d ofl/ramabhadra/OFL.txt +sha256 548890e4083028f04e5feba04b6e00554654d840aab81c8664eb66c2216a571b ofl/palanquindark/OFL.txt +sha256 e39d6ec64a37ed1523a59940695a61ea5e7882d9bbe0e7eb11653fda4b04fc79 ofl/kottaone/OFL.txt +sha256 1bfe7d2aca99042eabf37079152fef8abdda2c36dad454ae89b858a3cb1078c5 ofl/forum/OFL.txt +sha256 5505d1a010ee0f2eeecdf624984d2a6170480adab3091170abbcedd85361f1b9 ofl/novacut/OFL.txt +sha256 715ba72697e14daa9b29a333545f69bde7c497b9f77d0a2a4c4a5a752d961801 ofl/marcellussc/OFL.txt +sha256 0786594992757ea0290ae4a490ab9249728f372adb13959c0c8ae4fec83057ff ofl/quintessential/OFL.txt +sha256 ca13e9cd1faaa6afb9e43dcb534a8984cec3218993fb4b436468a79a1657ee19 ofl/keaniaone/OFL.txt +sha256 760fb433c515570f6b77ebc60299c2c91d5f03848c659452a9d2458b28935768 ofl/numans/OFL.txt +sha256 9134ca6996bd33ea2022e109f13f20e29dee1dcd8b2e8878aad576d2ca334e9f ofl/cormorantunicase/OFL.txt +sha256 1d1b7f3480c8d9b65c26d205e41dcbfa85731588d6ea50bccfa78e91f242d629 ofl/loversquarrel/OFL.txt +sha256 1d08c63944e639bbfe8a1b81e3c6a63836806c126b3573b9cda0db83fd27ffe9 ofl/prompt/OFL.txt +sha256 eb6c70cb6b575ad22df022d454df7a20582915e6e8da19b579c6cbef37a26bb5 ofl/gafata/OFL.txt +sha256 93f60741563b4f51f2fcdb207fde72b2b23292a47022c729aecd998b360d8038 ofl/bilboswashcaps/OFL.txt +sha256 4579982a484a9745864de2cda666fd7b5017f9182b74dbb4cd53d84c1d1b2231 ofl/gruppo/OFL.txt +sha256 cd059851dc2abcd2865ae318e8b949736f958794210acb90316530fd100fc904 ofl/geo/OFL.txt +sha256 af9b97696048d509e3d70f8108b7c4381084f95c8fedd97acaa76b0b287668be ofl/molle/OFL.txt +sha256 6958d8c61b6b223f81bdc2109941e5d0004996dde61e197d628e0293f4f1bc58 ofl/miama/OFL.txt +sha256 7e98b49a12b51240c85b04eb0d9919a6fec7dbd491bef6cbddc22d3f851bd1f1 ofl/marmelad/OFL.txt +sha256 b9d592c3bf421197d9b7e353416b8e2ec81584988824b43d38c86d997a08b868 ofl/myanmarsanspro/OFL.txt +sha256 e414e07f7a4da16ed47ebec80d52dd79f21d3ca42bc92385a755d8078a038814 ofl/playfairdisplaysc/OFL.txt +sha256 0e2ccc5da1dd979f08ba82bca2fb61592506a1e58d3cbfc26d904f0db71bd812 ofl/sairaextracondensed/OFL.txt +sha256 bc85bae0b512b799bbfb2b916e4d0a34cfd963d09778cd783e248b479e67760a ofl/comfortaa/OFL.txt +sha256 caa697668c3cf3e622753fb202c6c2e29648b94a3499dc7b869a14192e38c553 ofl/sourceserifpro/OFL.txt +sha256 81d6c3788a6b641cb9f543389d9d5c0cd3bf94fbb5639be19c102b9274c34291 ofl/mousememoirs/OFL.txt +sha256 dd028a807788d5e22e9f8cc18f026cda23369954673658f2ecc7d30bdb364b89 ofl/arya/OFL.txt +sha256 53f9c99fa3d47f7d632a42ee7bab4a834a60a744f6026d676c3a223cef2b2ef3 ofl/vollkornsc/OFL.txt +sha256 6506b2fa2a14259a8859608a6148a4591d67bbaef4d8e1948b43c4078561b0e5 ofl/tauri/OFL.txt +sha256 6cca1abc09d677cf00a55674ce2775e0eeb6dc5c0137b0401816680b9e500f81 ofl/marvel/OFL.txt +sha256 e98ce988fba1c138f4e7c0c5120809706ab1b24a3c29638ca83ab2ff082e08db ofl/chango/OFL.txt +sha256 0e2ccc5da1dd979f08ba82bca2fb61592506a1e58d3cbfc26d904f0db71bd812 ofl/sairasemicondensed/OFL.txt +sha256 42e7b456fee0d0dc86927579b3d2626d42bb0f4cc9778f3a92ca8ada4e46348e ofl/novaslim/OFL.txt +sha256 1b8eef90c567309fef17962cc969dd9ed1de69176517238e744018bb983e7c1c ofl/mandali/OFL.txt +sha256 9e262d6d7fb789aab6a8ecc53fc9c78387eeb9f935dcd289282d8e751b6bf743 ofl/antonio/OFL.txt +sha256 07dbf75115edfc1fd75580aa19c4c730201a099e8f86a9869887dfbed0547266 ofl/offside/OFL.txt +sha256 f177d98c67b84250ec87a03ca6ad161e84cab15b435e960039b971797a065f4a ofl/martel/OFL.txt +sha256 bb3e8082faf86b1474a6b042125ef0f83669d28110b72f70416a7587b7b9f144 ofl/unlock/OFL.txt +sha256 c4955dfe15a5db10326aa58ef767460c42cd12a3acdb3e698eee2704eb373d94 ofl/electrolize/OFL.txt +sha256 cf6dd07485d67d20f105afb9981dffdb6b180b59af45a228839cf3fb0277c9fb ofl/arapey/OFL.txt +sha256 87e8d9aca71dbe0481ba8611fc90d7e3aebfa3e2546420c403e7078898b0c484 ofl/allura/OFL.txt +sha256 55e13d77a4457aa9c60f10c5b97baea3343d3bac30960d49554a033cb9eaff7c ofl/sail/OFL.txt +sha256 1c5bc055869d5e9151ec7774082727db720ec4293c65be67f91a4bdcaeb02998 ofl/righteous/OFL.txt +sha256 de5ff32211a4340b01477af39ee339d639438955e409f79b666d4b9207f3c92c ofl/dohyeon/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/waitingforthesunrise/OFL.txt +sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfellenglish/OFL.txt +sha256 44a7c6e4c5572392ae122d3b1d8c6ba6fd640a7797e675384585d947f2773e3c ofl/jua/OFL.txt +sha256 1ba345a91338581e5f8fccc3e37e447ddea5b99ec9caec1b76c7c39492387d2f ofl/signikanegative/OFL.txt +sha256 9134ca6996bd33ea2022e109f13f20e29dee1dcd8b2e8878aad576d2ca334e9f ofl/cormorantgaramond/OFL.txt +sha256 9ee6b2ec20a06c599a07412690876eb457bf192c10e886e60d8bdffb80bc21a3 ofl/sahitya/OFL.txt +sha256 dcc832bd71ea62cbf97f06327a1b5442905b49ea446801421d71f7d1362db215 ofl/dokdo/OFL.txt +sha256 8aa063e3a1299c5e1821f386f5ca8bc157ac561bd12c739ffa81c6f0821450c0 ofl/donegalone/OFL.txt +sha256 e588abf45ca2b19c340c4b27349c9b6b6e5e198316fd965128ed9f4422942cbe ofl/raleway/OFL.txt +sha256 9860b97028024085855e503e32c1971bfd603374641cd018c136433ebcf5a338 ofl/gravitasone/OFL.txt +sha256 ee9d043332991eb6bf2bd56fb04db3c558c1ee2f0cb9aa7b18366c77e34fef30 ofl/jura/OFL.txt +sha256 15b1a21c3fa37a475ba6b0c0cfe289c7952548caf6e432068ddaf98d139ce419 ofl/belleza/OFL.txt +sha256 c5a77946a56488790364d060628385d51226da62a18f30d2be0181d82ee62b00 ofl/suranna/OFL.txt +sha256 36e2f1debc9778bac79fac1a0cb5a5ef51c102f00b58ef7d8a05324144b68166 ofl/megrim/OFL.txt +sha256 0fbae33ac3aa455c8c0d598347c87f1abfac0d215483f40f5a0e8dd08076df1b ofl/librebarcode39extendedtext/OFL.txt +sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/teko/OFL.txt +sha256 d324289a26909a519fb16c3d468a56ab909ad6d9070cac5742e5d59ad9bd9815 ofl/gildadisplay/OFL.txt +sha256 c0bcb72e68dd416db0bb9fcec7a7fa62321b0147cde00d8c8f82748e33aefd34 ofl/novasquare/OFL.txt +sha256 794d72ffdd25e8f7ca8e1d68db088c30ddbf2fdb369b6cc8217d4fa5fa6dc62f ofl/adobeblank/OFL.txt +sha256 806cb93632b8091cd36554642a96b2752bab50015da6a2b456d786c1f9aef5a5 ofl/carme/OFL.txt +sha256 0677891e6a143f297350d260ad766ad33bfc18ed5fa4f213acf648d6b597ec1a ofl/alegreyasans/OFL.txt +sha256 08b6f5cceaefcf2881eb009adeb78edd0fabf9c8f0eaf8b88f07a690222227e6 ofl/varelaround/OFL.txt +sha256 3f0f27931c92453994176af3b1e7954f9aac39fe145374d6d08c47c822e82e59 ofl/princesssofia/OFL.txt +sha256 2ce1c4fcf4ab9c8474d0824434497d4afa4425db4de5629103698b170ac4ee74 ofl/bungeeoutline/OFL.txt +sha256 455397ca15d39e9178bbbf4b485a29187751d60f7ceb7829980a521d5ab6848d ofl/sofadione/OFL.txt +sha256 b7574cd4c76770e5e3915d16bd93f09663bd77cb041a4ec09d824c52b540529a ofl/germaniaone/OFL.txt +sha256 39de3de5f1873f89bca4af37823ab22e28e88d0d8f7fe2f07e82e9e6e9bf7b70 ofl/eastseadokdo/OFL.txt +sha256 520a0c239d39b379b61c4de5f8e3b02db20b0dfc137481843eac01f02c41f4a2 ofl/aguafinascript/OFL.txt +sha256 ffaf7bc750bdaa0b95b09eb80e419748bfaf46268c6612860f0a5e19e17abb12 ofl/orbitron/OFL.txt +sha256 c6b9c7322fe0203d4d8a0f98541136d8d76da76b92c79d206b09991b98338cc8 ofl/gemunulibre/OFL.txt +sha256 2f871c2e81de6d0c72c981615002c30bc9f1637003d6d3d4c3f0149886b70569 ofl/mervalescript/OFL.txt +sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/baloobhaijaan/OFL.txt +sha256 842b4f4605b32518a1269c4d030d719ea2c4c317d699fc4441d0219658e18893 ofl/seoulnamsanvertical/OFL.txt +sha256 00a6fe8dfdc48d6206bcc4f10a765515a73433dfba7255eff966963beb26facb ofl/dhyana/OFL.txt +sha256 cd2dea62cd4b0c5fb335cf07ff04fd5c4bacb49b8d6c2bbbef9766c663d79b1c ofl/patuaone/OFL.txt +sha256 c0a8947de199b422d30c16137e4decd5362e3a1d504422880d69c02bd6046dac ofl/cagliostro/OFL.txt +sha256 c267a00c9476c78a2336d7b372b536885b8b24173a29ed53496f67a742c14961 ofl/alef/OFL.txt +sha256 2cc926050c4c6ccd9a0288b7792e2fcf93e5629ee6269e35986f092275e5a1b9 ofl/sarina/OFL.txt +sha256 f1bce31b817dee01c1e4ef8bc45d8ecb95f01f4abbf0a985007cb3cd0fd8123d ofl/zcoolqingkehuangyou/OFL.txt +sha256 9788e3b3e67f22ab5846a0bb867a230e7df2468c3cd20f730a5d9c34e673d090 ofl/rubikone/OFL.txt +sha256 f3bc8767749fc133d9b35e84ca024b82f1ac4d1b38deca0adcf8300892303022 ofl/faustinavfbeta/OFL.txt +sha256 ee81f11dd1970e9749afd2a572256f8eefce65532872762a4d7a3d5daa0812c8 ofl/shojumaru/OFL.txt +sha256 4f4bc3806a1e55789c6ef75ca5fc628297b05292f74966474dc0d40324abc609 ofl/abel/OFL.txt +sha256 064539f87826887d2062b7823b2b97b7625d68b642f6c945c99c0b8dc8084195 ofl/rationale/OFL.txt +sha256 a345b13576140008a697ac66ca8c76cd63b1dd076712bc30a0f5e97dcc53cc83 ofl/markoone/OFL.txt +sha256 203693528d6d2e8dc5e639c6ea42b3e825b59dd6447294e37b306fe734650091 ofl/arizonia/OFL.txt +sha256 9ca8b9e5db7184105da255bb110023cf1cce6caa56186341bb7b09ba97b20ba5 ofl/fanwoodtext/OFL.txt +sha256 3997621a219c7758e31dbafdd3cbd2bcb0b6144a41d1ca068d04dbcc4bafcde6 ofl/milonga/OFL.txt +sha256 2ce1c4fcf4ab9c8474d0824434497d4afa4425db4de5629103698b170ac4ee74 ofl/bungeeshade/OFL.txt +sha256 162a3b5c72cba845280a6f887c11d02984540b924510138c8b1eb473bcdafb6a ofl/concertone/OFL.txt +sha256 21b54eb0d7513524798a00dfbaf99a02c003a0012a728cc5f0e02d24c50482fb ofl/caveatbrush/OFL.txt +sha256 186d750eb496a4c17a76385f82be6aea2ac1cf2de074a811d63786cf374ea73f ofl/barlow/OFL.txt +sha256 9551ade371e7bcb1f6d9959273bbf1fed3bdf398efb5c57cc1fd85d6a13e9e5e ofl/londrinaoutline/OFL.txt +sha256 f15a9a3a9a665c2d17655b8fedad86d9a8f30081d46bb91236beb1bc7294a589 ofl/akronim/OFL.txt +sha256 76a55594c9a18b7d94b8119de838237eb834bae4e8c646d6d363aee587b7b427 ofl/slabo13px/OFL.txt +sha256 0e2ccc5da1dd979f08ba82bca2fb61592506a1e58d3cbfc26d904f0db71bd812 ofl/sairacondensed/OFL.txt +sha256 96b7bc175186cd0153a9682a1c9bb1da7103ab13a83abef8026bc64582ca616f ofl/oregano/OFL.txt +sha256 6fc386ac48a529b85c21f90a6c8d2111c6271b3063f9ddd78e92645db5259510 ofl/tulpenone/OFL.txt +sha256 13e862ac3f67130f58bd4bebb61c588d147b5a555b1ac6959570799c4f648cd0 ofl/capriola/OFL.txt +sha256 d24ff874133ecd133e55d7c4070d2edab14d3933477c2bccb3a0d8d1cc9c33bf ofl/muktamalar/OFL.txt +sha256 85814924eca98e1fa530901cc5167d0012aaf31122f9570d7e9755443dd9335b ofl/siemreap/OFL.txt +sha256 f76c1013cffb3e0de0e7dad19ee5b4b7849c7ab10b67218515e39cfd87e554a7 ofl/julee/OFL.txt +sha256 c264f64bb2b91ca0dfdeab75d71719120271fa6a30035396416af235ef481c1e ofl/merienda/OFL.txt +sha256 d102f22055cfa31a9659228483de3c726010f0b3b416b78e3cbefcb54816e812 ofl/galdeano/OFL.txt +sha256 2db02cb5d05d5f8a003ffefce36a32a16520ad4cab9ed90635ff953b583e4e82 ofl/sigmarone/OFL.txt +sha256 cdcc959c42ab255b4cea4bd82f2db5c24a2da7ecabe615d02d5a5dba3716e446 ofl/racingsansone/OFL.txt +sha256 c88333734ad7cd30540ec6614d12aa829a0395715de30e336d22ddfa3005db42 ofl/catamaran/OFL.txt +sha256 26daffa24723bb188643085cfc5423f9d78d22a395df4a7928380e430545a201 ofl/bubblegumsans/OFL.txt +sha256 de2246895f0ac21fe05b095d586d36cbc9f987ebcaed1e050c61e69667caf1c6 ofl/hannari/OFL.txt +sha256 b54d54664cddcbf05f5b4ea3aec7e89317eb917cf465920969e7b22361e0f4a5 ofl/seymourone/OFL.txt +sha256 46239ba6485d28553fd944da4ad32a00d9c403aa1c3e111676b0b96fe458d1d4 ofl/averiaseriflibre/OFL.txt +sha256 91c25c350d3cac39da2736d74f7ba37ef648f5237a4e330a240615bc8d8c4360 ofl/ibmplexsanscondensed/OFL.txt +sha256 5802c9e3509199c7aa9a13ea410ae27febbc0cdea184bf7d227170fac703bba8 ofl/passeroone/OFL.txt +sha256 2400b30a72d2b1555255b81625576dfb552584a19a9c85ad8d43ff77bceab13b ofl/plaster/OFL.txt +sha256 4bed7eaae70cab1bdf2bcf9b1cb562fcd9cc26d1c3533c4ade0ec70516dfb3a4 ofl/trykker/OFL.txt +sha256 45b1f44d2cb859ea4b7be2f322c57b8ff7be55075c336744e62b5550cd0a97eb ofl/medievalsharp/OFL.txt +sha256 19c6ecf65a6b0687dd324b093ced5f1020a1fcabfc8ddaaeca6906cd05153e23 ofl/overpass/OFL.txt +sha256 ff1f38ac4e694a4ad5bd3d7a5146cd8bd73fd57aae794ced76a24b0d68e41206 ofl/pinyonscript/OFL.txt +sha256 6aa923334ec515d26b1a61bb978a0bb5bd8884de7529add1625beef2f4a53f74 ofl/nicomoji/OFL.txt +sha256 cc8c0c3e81cf543e190f128b83ba7c30959f15865c14dd972fca4917faeceec1 ofl/encodesansexpanded/OFL.txt +sha256 38fab5a643fa935a4e11edae2d7b2bbe9866b4f4828c2be2f41451b3f27cb67a ofl/paprika/OFL.txt +sha256 a5fc033225d145b43fd7391482ae7689825414ce29a01614d651a3012b57c81e ofl/monsieurladoulaise/OFL.txt +sha256 ecc91fac753ad9ba5bb7e7819a5c59ee1e3cf89032133c6b4b0318d63c35933b ofl/alike/OFL.txt +sha256 6939af7114f0a33c7e6142d4c1320d1bbde11aebe6d8f3c48fc5fb3e0f676a7b ofl/jejugothic/OFL.txt +sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfelldoublepica/OFL.txt +sha256 9cd20277e2c89d47e3997435e3a16539d20173d850fbb42474990f71642e473e ofl/mate/OFL.txt +sha256 351740da2d452b48193483f22f64918a6dfd64a7abe225c6187ad3f36e0d9cd8 ofl/postnobillscolombo/OFL.txt +sha256 aa8a8196a3e22c3bd985e33cd3245ae9a38accba5e79fc0e3b292612a8d6b337 ofl/secularone/OFL.txt +sha256 cc8c0c3e81cf543e190f128b83ba7c30959f15865c14dd972fca4917faeceec1 ofl/encodesans/OFL.txt +sha256 136a256d6050ed32bbf96736d70b9099c6359e83dabeb6847cdf6b8ef84319cc ofl/kantumruy/OFL.txt +sha256 72060253bd481a8dc18664bb9117072dc07c0f0270a40617c230654821774850 ofl/pattaya/OFL.txt +sha256 56d9c3529facf93873a2a1626dd038054d244b3af30a1e3ffe0e78bbda1c7622 ofl/preahvihear/OFL.txt +sha256 1a2debd5ad8e656b26bb3b29213caa8f7e557a2f31454b11ebb6c3e3b59aa5d4 ofl/cutefont/OFL.txt +sha256 f62ef357d3a1c3d27edd35a6e1ba350e8a8d13499797964eeadefbf0b3b15d1f ofl/kalam/OFL.txt +sha256 d941c5b788d47aa469ee54e30f4c12d6a43c45a295f10c568bdf9772f2893b7b ofl/oranienbaum/OFL.txt +sha256 5e0da210fb04058a8c0087985d2d456b931c2579811a49655721d3cf0c36b6d6 ofl/notosans/OFL.txt +sha256 5ae0cfa62a70251d9a2c3c5430ed3bafa480005f23e4b9525488f2318e5c10ca ofl/mrbedford/OFL.txt +sha256 0acef93ca37cf19eeb83a1c6a29b78b08377a211c8d80cd27626e210176828da ofl/kavivanar/OFL.txt +sha256 c0562e066174197902a4a10606673d189f067970ef89c6013943b9cf182aadbc ofl/titilliumweb/OFL.txt +sha256 f8fbefb5b1004615e6d1e84b1c75e68520d91196f600cb1b07620dd2748eff64 ofl/cantataone/OFL.txt +sha256 2e2cb5a98da665f2ab82a9fd01fb18c2337f845761b0c163f690ed65f3b94677 ofl/sacramento/OFL.txt +sha256 251f65282ff48a7e8ef3fb661fc99254d9b3b0c368427c98b1edbfe4ca66e888 ofl/katibeh/OFL.txt +sha256 31bc966c36352bfd33717382786d0458c38ecf540628ab134e0ce35fde801d28 ofl/poppins/OFL.txt +sha256 f016385cb4b360e7698d22a48c6b58c0634b1ed5c9c17df78515d43887511df6 ofl/yaldevicolombo/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/swankyandmoomoo/OFL.txt +sha256 b712dacdda5da76c0213f8478886f893b855665c1153ae438bc3e55a7dc525ef ofl/kurale/OFL.txt +sha256 74584d937293a9cacdcd2eb05851b71aa1527901c18b87961d2f877c77a1b486 ofl/chonburi/OFL.txt +sha256 8f187da1eb4f23e3fe7ba68b1cb2e92881a415dd34c46489698454517e273c4f ofl/krub/OFL.txt +sha256 3336bf5d4e7eedba48ecb831f37bf676e901c39f2e6a422cceadd9d2ffa55be8 ofl/kaushanscript/OFL.txt +sha256 bb655534b6c7bf3e547c1368a68a5b1032d0e96fd08b5cc75f3d7a78528784ef ofl/novaoval/OFL.txt +sha256 04b895d77ccec5034191e953e8e5884637269be15fe0675fc25039014eb46349 ofl/monda/OFL.txt +sha256 d724dea493d89a7a9681186e2fb462b7cd551674960ee4142ae6b325261b5115 ofl/hanna/OFL.txt +sha256 64ecb0c6bf5cd80c3da76035c00671272966afbd32ffbdbcad95a8b56501fb08 ofl/decovaralpha/OFL.txt +sha256 0cf28cdcf1cdfd35054352816b2d8c81bd6d6f73632198b61507f26dd4dcbeea ofl/sansita/OFL.txt +sha256 d69bcd35f4a121b312a64f7e8eb15bed61c9056e9e9cdaa8d513366142c8e005 ofl/rosario/OFL.txt +sha256 b4cff421cb89d1e32036e818f291f8ab0d3294ada70b5883d5bcc6470b869702 ofl/eczar/OFL.txt +sha256 ecb52bab55d8d6185712fe8fd2fd98300f5c8c07fad0d0a97b1e579462b0dd3f ofl/bayon/OFL.txt +sha256 ed95c33f80ccca002e3a360b683c43368f9c5eb024e5b992abb51af3c10b59bc ofl/gothica1/OFL.txt +sha256 66b5c49d384cba754806a891ebd52f2ca08dd05c0eb3c56170192da466a00a20 ofl/londrinasolid/OFL.txt +sha256 284a5a26e6db9a04259a5690ad57d52c56a4c515ca2ece1943d950f99e709dcd ofl/belgrano/OFL.txt +sha256 6cbe0f55c154b5dee71ca4f2418d69e4e916448ef2ab52dc4541197b292efa24 ofl/sonsieone/OFL.txt +sha256 255d5debbb80eb2ea762644311f266a279e8778f00156655a516e2b7781a63e1 ofl/lilitaone/OFL.txt +sha256 490b8f3acbce2331adc9b9d3e75ee6fe07946fb29af429a300c7d066b1250b2d ofl/crimsontext/OFL.txt +sha256 eeacf16032901d0ed0456876ec77b8f0fda6b3fecec7d972f8543eb602e6c30f ofl/nanumbrushscript/OFL.txt +sha256 f2c0dfa02d6f5c444b4babd7bc0b43be77ea85706e8524342516bc41e43c2f01 ofl/fahkwang/OFL.txt +sha256 4398885e6b303830d81eea03444aae6fb08a44f41b6acd193c88a2f8cd17606e ofl/srisakdi/OFL.txt +sha256 c1f8e0feb0babaacf774b971bcfd791e44125b9d61ff074e4c20924e9661556e ofl/antic/OFL.txt +sha256 6a73f9541c2de74158c0e7cf6b0a58ef774f5a780bf191f2d7ec9cc53efe2bf2 ofl/notosanstamil/OFL.txt +sha256 0b1bada9befa95a40d55830fe83fc7f8064e245fea33bdf0f96f57848f3866fa ofl/codacaption/OFL.txt +sha256 b41b99f35b507564e54f6b2f5162ad1c21f94a16837c632da6632b376a341f42 ofl/nosifer/OFL.txt +sha256 e8d0118fa9d640543e7f6848d1d93f47313c7f56b64f73f37291d859cd5932bf ofl/souliyo/OFL.txt +sha256 bff4e5087ece354afccd073621197bbb7dd9349943b5ee6aa12b1adf0b133081 ofl/happymonkey/OFL.txt +sha256 1f581506286e960436548dba0701aab278f7e67f2adc6bdae2958923867d1e64 ofl/hanaleifill/OFL.txt +sha256 03082243ebc53e2090bc59987f693982ccee83b30516457b11f6a2349b78f5f8 ofl/rokkitt/OFL.txt +sha256 1152ca18eaa6159634f1eb209c60df360c1c09a52991e392f8033702036634d4 ofl/assistant/OFL.txt +sha256 012b1870f81b0d97ca756edd9eea315c7fc22657ac2f1cbdfcb6772fed3e20f3 ofl/bhavuka/OFL.txt +sha256 ce1108854c91696a8549bb21459f1dc74e8a1ec11664d712c3868c40042f1a8a ofl/rufina/OFL.txt +sha256 bac36a7fcafc5702d9d928bb81c7de9f8739eaa820e546c3d2cc52730b652af4 ofl/devonshire/OFL.txt +sha256 ac987f9cbc5b18d3239d88adb57a4e134049811d24ddda2f6383faa589fd2727 ofl/holtwoodonesc/OFL.txt +sha256 f3ee3eb20a9d565bee2bbc0d616de382a113327d7506565b2f3d3bee5f489375 ofl/bowlbyonesc/OFL.txt +sha256 965bd2c907f7bb6f36da4f85e83f29aea8b2f720783deebd7ed7b40678e67672 ofl/mysteryquest/OFL.txt +sha256 cc8c0c3e81cf543e190f128b83ba7c30959f15865c14dd972fca4917faeceec1 ofl/encodesanssemiexpanded/OFL.txt +sha256 19e186a088a50835b38b59409a76b8df2d0252ce114a99e79e306231bbe253b7 ofl/dellarespira/OFL.txt +sha256 aa36087ecd7e9085e5a1439b0a6d0ee35966e8cd2ccaa649bebe62cae5815e82 ofl/lifesavers/OFL.txt +sha256 2a3ca501fc4d5efcad9798531e3e06962b1e20c60e464f6cbd6c17630112c773 ofl/imfelldwpicasc/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/loveyalikeasister/OFL.txt +sha256 a9ef1db03f660130790beeb3b5d91b68536a44a98ec2db3097d02a1c5f91c599 ofl/buda/OFL.txt +sha256 de318dcb99e332a746edb9f83180ee206fc3bce74ff96ad7d1cb219967ec74af ofl/pollerone/OFL.txt +sha256 315a576cbc7ab61c9e347b5725893bc8498fdcb8fc10831793c6864bc2cefba8 ofl/gudea/OFL.txt +sha256 41f82bb4d24b304f30f7136bc47abdd083782e4265c984160f5649d1e78ea49c ofl/montserrat/OFL.txt +sha256 5866fd437bf701cd93f2c41ca2a8b33786975c947bee27882d256b408c9b424a ofl/podkovavfbeta/OFL.txt +sha256 377f4f9c19e935228552478eb68cc2ed82910988a60ba60e2ac73b09f32d02d1 ofl/patrickhandsc/OFL.txt +sha256 ec1d7de447a90e4b6d8f2b4f95c7f89a70e315fdb41969bc716059e4f2461fa4 ofl/clickerscript/OFL.txt +sha256 7039124ec9c84f9d637637da9f80158f0d3681c82d4e6a811053467f7c33d587 ofl/prostoone/OFL.txt +sha256 16f8621a8dda01f044b8a58489334dbaadfad44ef2fa1d5ce0864cc2f309df01 ofl/inknutantiqua/OFL.txt +sha256 ae30055f1e31d12f6235802c25a8872bb7053fca8ed4a604c530f4b2ee83e572 ofl/pontanosans/OFL.txt +sha256 f1ef4c3ef43322403f5c30e4fb46496969cb5c34a2a6e7247b507254b69caa6a ofl/novaround/OFL.txt +sha256 cf5c4103b0ecf3c38e7c26768b5caf05e1b3e16d4d87b32d859b3c19ce7c216c ofl/petitformalscript/OFL.txt +sha256 ed80dd9539708a531313f98fb081aeeaa395ab5726931a433845d667b019c855 ofl/abyssinicasil/OFL.txt +sha256 1404cc9279d4ad713a372a5e1e1d20d7b9b000d2397c8529aeb3df5402446600 ofl/cutive/OFL.txt +sha256 19c6ecf65a6b0687dd324b093ced5f1020a1fcabfc8ddaaeca6906cd05153e23 ofl/overpassmono/OFL.txt +sha256 0878e7d6e842bc3c45154059a1c2812de0d31dca343fe6bc16abc9afdee3e3de ofl/koho/OFL.txt +sha256 636d62f04d7bda9fcf9354f258f6244e7e18288cae036b95122e204f1acbec80 ofl/neuton/OFL.txt +sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/baloo/OFL.txt +sha256 5866fd437bf701cd93f2c41ca2a8b33786975c947bee27882d256b408c9b424a ofl/podkova/OFL.txt +sha256 2ce1c4fcf4ab9c8474d0824434497d4afa4425db4de5629103698b170ac4ee74 ofl/bungee/OFL.txt +sha256 dc35123e99a857674b3e8807e9d7df82220d298423d9fc50ce084fbcdecf602d ofl/jotione/OFL.txt +sha256 76a55594c9a18b7d94b8119de838237eb834bae4e8c646d6d363aee587b7b427 ofl/slabo27px/OFL.txt +sha256 ed50ebe2fa922554980909192526fe94966556626d6d440a462c8e7eaed74cdc ofl/oflsortsmillgoudytt/OFL.txt +sha256 d7b108fc1f23fb016a47bb40c63d6f6e04cc35a1edfb991638d7f03621bf7f33 ofl/terminaldosislight/OFL.txt +sha256 71e5222c549d85a1403b6e709b4328b81d7b51ba021b8bd20df89550da80c087 ofl/yatraone/OFL.txt +sha256 f139d6f43d2a63a8fb3ded48b8ec747d9d59a7fbb13d077d9b96ac88580bc1ad ofl/dekko/OFL.txt +sha256 84b11cc0aac8fdb93af94872bc4b8f015caabf4919db63ab7f916ccff8e52f56 ofl/josefinsansstdlight/OFL.txt +sha256 8fbe530adcbe30c658393c3f2b5a4785d6765afcefdfe47f594730131f3a0abd ofl/oleoscriptswashcaps/OFL.txt +sha256 64dc6a7e2a77aa340c49c3e0829703f540f8d64afa506f44eaa6741580716d0f ofl/gabriela/OFL.txt +sha256 17d7a7f5d9f0139535ecec516988c4c73a2ec0f225987288f3fd6ee2622d4450 ofl/federant/OFL.txt +sha256 c0a7efe98e77cbfcf1a5ca43e874e25cf53d9185c56295bc3b5c407f95dae638 ofl/nats/OFL.txt +sha256 2ee5e8e47cd7d08f60bb9555f72b25912c9e81b13f5bc9a0551ddf943da6ca98 ofl/ekmukta/OFL.txt +sha256 e5ccbfc32e4d7fae98b467a9af310ac8d2efd5d90e684426cd24f3eb36090a2c ofl/acme/OFL.txt +sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/modak/OFL.txt +sha256 75a77451968e55a1ab404bd953bd8778983e21116d507b890fbcf838e58c8e8b ofl/pavanam/OFL.txt +sha256 36931b77dd81fa96fffad91b6acb54931e600845eb81f91ecf1b4459012c621a ofl/vidaloka/OFL.txt +sha256 5fb0694694dc307d1eb0121689395e634b6329ff545acc53f55ad66a716b3cf1 ofl/baloobhai/OFL.txt +sha256 1c45059cea5c6798c8591b0a17961a30328747d44214ff9b8f9c62a683bd6598 ofl/ruda/OFL.txt +sha256 0e441ae9f18ad0c294cc5b6ae3974c2db1614cab220598578b1b58c4cc334485 ofl/thegirlnextdoor/OFL.txt +sha256 4dee45deee99672fbe342b2f4b7aa75b0cd12de18a68f9732c77f096bab47e0e ofl/molengo/OFL.txt +sha256 5a5cf278190adf8be3e9905c2b21460241cb376c600bdfd6eb7aceb66036c4bf ofl/telex/OFL.txt +sha256 bb49cbf811dafcb11e0de081efcdc8385e45ccc85a5bfc3231ec4861d444dc42 ofl/ruthie/OFL.txt +sha256 b5c3d12a3085b96011fee65555234bb9d31fa7444cf6f8d5ae6b1f5771394399 ofl/lakkireddy/OFL.txt +sha256 23b896f4937eac954a383340c92dfcac1c6e05ec21cc08ec6de47d30ad8496a3 ofl/charmonman/OFL.txt +sha256 39602407e30d466bf169f46d690aaae4f5f039258e5642f91a80bb132ce6e14a ofl/bubblerone/OFL.txt +sha256 e31de7000a2a13b2e54ad01e788fd29e979fe05ea1fded44d6e71cc06e33bb2b ofl/ralewaydots/OFL.txt +sha256 8218df19bcd9786311bf1126815e8d591027aaf7611ef031af5a31c3fd66e928 ofl/arefruqaa/OFL.txt +sha256 e37fcc467040ecd81bf4cf59c99ef56b20f57918995e82b3de1d5b4e931bc2e6 ofl/portlligatslab/OFL.txt +sha256 60fea3a0da19167a3efb9c3792a3a15dc9235405d01bbec1233fdf3e79c74296 ofl/freckleface/OFL.txt +sha256 da15da6b1496d4de18f97e2ad1b722ef8a1c121149c2c93b2cf7eac6ac27b35c ofl/mplus1p/OFL.txt +sha256 d51f3341fd7b3dfa1114d3ef0bdabbe57f60eef86a1458019e0077d676fa1fcb ofl/lancelot/OFL.txt +sha256 9134ca6996bd33ea2022e109f13f20e29dee1dcd8b2e8878aad576d2ca334e9f ofl/cormorantinfant/OFL.txt +sha256 cc8c0c3e81cf543e190f128b83ba7c30959f15865c14dd972fca4917faeceec1 ofl/encodesanssemicondensed/OFL.txt +sha256 5946eec3a7d3bda02825930156e4716198e7753641dd3303a3e8c386c8011909 ofl/eater/OFL.txt +sha256 b43e2530c7af69fe1800f180d210b6d2745915ed4e0e404495038c861bb6dbf7 ofl/hammersmithone/OFL.txt +sha256 5a8751bef5a4fc867ae015099267905034345260f14060fa276aac4051ddd8b4 ofl/varela/OFL.txt +sha256 f6fc9fbae062e4efc1b0306e27715d43cd64a48b8ffba81c22034b8efee4fce2 ofl/cabinsketch/OFL.txt +sha256 2f0015108d68627bd788d313f529c21ff4da2c2c42a5e1f3883acc83480f9002 ufl/ubuntucondensed/LICENCE.txt +sha256 2f0015108d68627bd788d313f529c21ff4da2c2c42a5e1f3883acc83480f9002 ufl/ubuntumono/LICENCE.txt +sha256 2f0015108d68627bd788d313f529c21ff4da2c2c42a5e1f3883acc83480f9002 ufl/ubuntu/LICENCE.txt diff --git a/package/gperf/gperf.hash b/package/gperf/gperf.hash index 3d8aafbdcaf..1ea48c454b3 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 # with key 93C08C88471097CD -sha256 588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2 gperf-3.1.tar.gz +sha256 588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2 gperf-3.1.tar.gz # Locally calculated -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/gperf/gperf.mk b/package/gperf/gperf.mk index c2f042c464f..4b928a0ebd0 100644 --- a/package/gperf/gperf.mk +++ b/package/gperf/gperf.mk @@ -8,8 +8,6 @@ GPERF_VERSION = 3.1 GPERF_SITE = $(BR2_GNU_MIRROR)/gperf GPERF_LICENSE = GPL-3.0+ GPERF_LICENSE_FILES = COPYING -GPERF_CPE_ID_VENDOR = gperftools_project -GPERF_CPE_ID_PRODUCT = gperftools $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/package/gpsd/Config.in b/package/gpsd/Config.in index b66d0952dd4..8c28c05efd6 100644 --- a/package/gpsd/Config.in +++ b/package/gpsd/Config.in @@ -31,9 +31,6 @@ comment "Features" config BR2_PACKAGE_GPSD_CLIENT_DEBUG bool "client debugging support" -config BR2_PACKAGE_GPSD_OLDSTYLE - bool "oldstyle (pre-JSON) protocol support" - config BR2_PACKAGE_GPSD_PROFILING bool "profiling support" depends on BR2_TOOLCHAIN_USES_GLIBC @@ -157,22 +154,11 @@ config BR2_PACKAGE_GPSD_ITRAX help iTrax support -config BR2_PACKAGE_GPSD_MTK3301 - bool "MTK-3301" - help - Mediatek MTK-3301 support - config BR2_PACKAGE_GPSD_NAVCOM bool "Navcom" help Navcom binary support -config BR2_PACKAGE_GPSD_NMEA - bool "NMEA" - default y - help - Generic NMEA support - config BR2_PACKAGE_GPSD_NMEA2000 bool "NMEA2000" select BR2_PACKAGE_GPSD_NAVCOM @@ -180,11 +166,6 @@ config BR2_PACKAGE_GPSD_NMEA2000 help NMEA2000/CAN support -config BR2_PACKAGE_GPSD_NTRIP - bool "NTRIP" - help - NTRIP support - config BR2_PACKAGE_GPSD_OCEANSERVER bool "OceanServer" help diff --git a/package/gpsd/br-chrony.conf b/package/gpsd/br-chrony.conf new file mode 100644 index 00000000000..67a79e5f653 --- /dev/null +++ b/package/gpsd/br-chrony.conf @@ -0,0 +1,2 @@ +[Unit] +After=chrony.service diff --git a/package/gpsd/gpsd.hash b/package/gpsd/gpsd.hash index 6d93e7b553b..15e1181ed9a 100644 --- a/package/gpsd/gpsd.hash +++ b/package/gpsd/gpsd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 0b991ce9a46538c4ea450f7a8ee428ff44fb4f8d665fddf2ffe40fe0ae9a6c09 gpsd-3.23.1.tar.gz +sha256 b368b6a305e3f7a6382d23a0cbfc1d78923060b6b7f54cf7987a73c7b4a9afc2 gpsd-3.25.tar.gz sha256 fdf339997bbca9eaf507476b82fbcac608fc39a3d89b86b51e16db4c9f933716 COPYING diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk index 4388b7e24da..d7425513fd1 100644 --- a/package/gpsd/gpsd.mk +++ b/package/gpsd/gpsd.mk @@ -4,7 +4,7 @@ # ################################################################################ -GPSD_VERSION = 3.23.1 +GPSD_VERSION = 3.25 GPSD_SITE = http://download-mirror.savannah.gnu.org/releases/gpsd GPSD_LICENSE = BSD-2-Clause GPSD_LICENSE_FILES = COPYING @@ -115,15 +115,6 @@ endif ifneq ($(BR2_PACKAGE_GPSD_ITRAX),y) GPSD_SCONS_OPTS += itrax=no endif -ifneq ($(BR2_PACKAGE_GPSD_MTK3301),y) -GPSD_SCONS_OPTS += mtk3301=no -endif -ifneq ($(BR2_PACKAGE_GPSD_NMEA),y) -GPSD_SCONS_OPTS += nmea0183=no -endif -ifneq ($(BR2_PACKAGE_GPSD_NTRIP),y) -GPSD_SCONS_OPTS += ntrip=no -endif ifneq ($(BR2_PACKAGE_GPSD_NAVCOM),y) GPSD_SCONS_OPTS += navcom=no endif @@ -168,9 +159,6 @@ endif ifeq ($(BR2_PACKAGE_GPSD_SQUELCH),y) GPSD_SCONS_OPTS += squelch=yes endif -ifneq ($(BR2_PACKAGE_GPSD_OLDSTYLE),y) -GPSD_SCONS_OPTS += oldstyle=no -endif ifeq ($(BR2_PACKAGE_GPSD_PROFILING),y) GPSD_SCONS_OPTS += profiling=yes endif @@ -225,13 +213,13 @@ define GPSD_INSTALL_INIT_SYSV $(SED) 's,^DEVICES=.*,DEVICES=$(BR2_PACKAGE_GPSD_DEVICES),' $(TARGET_DIR)/etc/init.d/S50gpsd endef -# systemd unit files are installed automatically, but need to update the -# /usr/local path references in the provided files to /usr. +# When using chrony, wait for after Buildroot's chrony.service +ifeq ($(BR2_PACKAGE_CHRONY),y) define GPSD_INSTALL_INIT_SYSTEMD - $(SED) 's%/usr/local%/usr%' \ - $(TARGET_DIR)/usr/lib/systemd/system/gpsd.service \ - $(TARGET_DIR)/usr/lib/systemd/system/gpsdctl@.service + $(INSTALL) -D -m 0644 $(GPSD_PKGDIR)/br-chrony.conf \ + $(TARGET_DIR)/usr/lib/systemd/system/gpsd.service.d/br-chrony.conf endef +endif define GPSD_INSTALL_STAGING_CMDS (cd $(@D); \ diff --git a/package/gptfdisk/0002-Fix-failure-crash-of-sgdisk-when-compiled-with-lates.patch b/package/gptfdisk/0002-Fix-failure-crash-of-sgdisk-when-compiled-with-lates.patch new file mode 100644 index 00000000000..bdeedd95cce --- /dev/null +++ b/package/gptfdisk/0002-Fix-failure-crash-of-sgdisk-when-compiled-with-lates.patch @@ -0,0 +1,60 @@ +From 5d5e76d369a412bfb3d2cebb5fc0a7509cef878d Mon Sep 17 00:00:00 2001 +From: Rod Smith +Date: Fri, 15 Apr 2022 18:10:14 -0400 +Subject: [PATCH] Fix failure & crash of sgdisk when compiled with latest + popt (commit 740; presumably eventually release 1.19) + +[Retrieved from: +https://sourceforge.net/p/gptfdisk/code/ci/5d5e76d369a412bfb3d2cebb5fc0a7509cef878d/] +Signed-off-by: Fabrice Fontaine +--- + NEWS | 8 ++++++++ + gptcl.cc | 2 +- + support.h | 2 +- + 3 files changed, 10 insertions(+), 2 deletions(-) + +diff --git a/NEWS b/NEWS +index c7add56..9e153fd 100644 +--- a/NEWS ++++ b/NEWS +@@ -1,3 +1,11 @@ ++1.0.10 (?/??/2022): ++------------------- ++ ++- Fixed problem that caused sgdisk to crash with errors about being unable ++ to read the disk's partition table when compiled with the latest popt ++ (commit 740, which is pre-release as I type; presumably version 1.19 and ++ later once released). ++ + 1.0.9 (4/14/2022): + ------------------ + +diff --git a/gptcl.cc b/gptcl.cc +index 34c9421..0d578eb 100644 +--- a/gptcl.cc ++++ b/gptcl.cc +@@ -155,7 +155,7 @@ int GPTDataCL::DoOptions(int argc, char* argv[]) { + } // while + + // Assume first non-option argument is the device filename.... +- device = (char*) poptGetArg(poptCon); ++ device = strdup((char*) poptGetArg(poptCon)); + poptResetContext(poptCon); + + if (device != NULL) { +diff --git a/support.h b/support.h +index 8ba9ad1..f91f1bc 100644 +--- a/support.h ++++ b/support.h +@@ -8,7 +8,7 @@ + #include + #include + +-#define GPTFDISK_VERSION "1.0.9" ++#define GPTFDISK_VERSION "1.0.9.1" + + #if defined (__FreeBSD__) || defined (__FreeBSD_kernel__) || defined (__APPLE__) + // Darwin (Mac OS) & FreeBSD: disk IOCTLs are different, and there is no lseek64 +-- +2.35.1 + diff --git a/package/gptfdisk/0003-Fix-NULL-dereference-when-duplicating-string-argumen.patch b/package/gptfdisk/0003-Fix-NULL-dereference-when-duplicating-string-argumen.patch new file mode 100644 index 00000000000..250c0715823 --- /dev/null +++ b/package/gptfdisk/0003-Fix-NULL-dereference-when-duplicating-string-argumen.patch @@ -0,0 +1,44 @@ +From f5de3401b974ce103ffd93af8f9d43505a04aaf9 Mon Sep 17 00:00:00 2001 +Message-Id: +From: Damian Kurek +Date: Thu, 7 Jul 2022 03:39:16 +0000 +Subject: [PATCH] Fix NULL dereference when duplicating string argument + +poptGetArg can return NULL if there are no additional arguments, which +makes strdup dereference NULL on strlen + +Signed-off-by: Stefan Agner +Upstream: https://sourceforge.net/p/gptfdisk/code/ci/f5de3401b974ce103ffd93af8f9d43505a04aaf9 +--- + gptcl.cc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/gptcl.cc b/gptcl.cc +index 0d578eb..ab95239 100644 +--- a/gptcl.cc ++++ b/gptcl.cc +@@ -155,10 +155,11 @@ int GPTDataCL::DoOptions(int argc, char* argv[]) { + } // while + + // Assume first non-option argument is the device filename.... +- device = strdup((char*) poptGetArg(poptCon)); +- poptResetContext(poptCon); ++ device = (char*) poptGetArg(poptCon); + + if (device != NULL) { ++ device = strdup(device); ++ poptResetContext(poptCon); + JustLooking(); // reset as necessary + BeQuiet(); // Tell called functions to be less verbose & interactive + if (LoadPartitions((string) device)) { +@@ -498,6 +499,7 @@ int GPTDataCL::DoOptions(int argc, char* argv[]) { + cerr << "Error encountered; not saving changes.\n"; + retval = 4; + } // if ++ free(device); + } // if (device != NULL) + poptFreeContext(poptCon); + return retval; +-- +2.40.0 + diff --git a/package/gptfdisk/gptfdisk.hash b/package/gptfdisk/gptfdisk.hash index caded358eca..0b98677afb8 100644 --- a/package/gptfdisk/gptfdisk.hash +++ b/package/gptfdisk/gptfdisk.hash @@ -1,5 +1,5 @@ -# From http://sourceforge.net/projects/gptfdisk/files/gptfdisk/1.0.8/ -sha1 c8824e779056158fa32887e415f5399a8646c3c5 gptfdisk-1.0.8.tar.gz +# From http://sourceforge.net/projects/gptfdisk/files/gptfdisk/1.0.9/ +sha1 284bd000edaf7874b472bd01719c6a71a8030e13 gptfdisk-1.0.9.tar.gz # Locally computed -sha256 95d19856f004dabc4b8c342b2612e8d0a9eebdd52004297188369f152e9dc6df gptfdisk-1.0.8.tar.gz +sha256 dafead2693faeb8e8b97832b23407f6ed5b3219bc1784f482dd855774e2d50c2 gptfdisk-1.0.9.tar.gz sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/package/gptfdisk/gptfdisk.mk b/package/gptfdisk/gptfdisk.mk index 9869975f51a..f3fc9302025 100644 --- a/package/gptfdisk/gptfdisk.mk +++ b/package/gptfdisk/gptfdisk.mk @@ -4,7 +4,7 @@ # ################################################################################ -GPTFDISK_VERSION = 1.0.8 +GPTFDISK_VERSION = 1.0.9 GPTFDISK_SITE = http://downloads.sourceforge.net/sourceforge/gptfdisk GPTFDISK_LICENSE = GPL-2.0+ GPTFDISK_LICENSE_FILES = COPYING @@ -15,7 +15,8 @@ GPTFDISK_TARGETS_$(BR2_PACKAGE_GPTFDISK_CGDISK) += cgdisk GPTFDISK_DEPENDENCIES += util-linux ifeq ($(BR2_PACKAGE_GPTFDISK_SGDISK),y) -GPTFDISK_DEPENDENCIES += popt +GPTFDISK_DEPENDENCIES += host-pkgconf popt +GPTFDISK_SGDISK_LDLIBS += `$(PKG_CONFIG_HOST_BINARY) --libs popt` endif ifeq ($(BR2_PACKAGE_GPTFDISK_CGDISK),y) GPTFDISK_DEPENDENCIES += ncurses @@ -32,7 +33,8 @@ endif define GPTFDISK_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ - LDLIBS='$(GPTFDISK_LDLIBS)' $(GPTFDISK_TARGETS_y) + LDLIBS='$(GPTFDISK_LDLIBS)' \ + SGDISK_LDLIBS='$(GPTFDISK_SGDISK_LDLIBS)' $(GPTFDISK_TARGETS_y) endef define GPTFDISK_INSTALL_TARGET_CMDS diff --git a/package/gqrx/Config.in b/package/gqrx/Config.in index adcdbb08966..97f0b7de073 100644 --- a/package/gqrx/Config.in +++ b/package/gqrx/Config.in @@ -1,15 +1,16 @@ -comment "gqrx needs a toolchain w/ C++, threads, wchar, dynamic library" +comment "gqrx needs a toolchain w/ C++, threads, wchar, dynamic library, gcc >= 8" depends on BR2_USE_MMU # gnuradio depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_USE_WCHAR || BR2_STATIC_LIBS + !BR2_USE_WCHAR || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_8 comment "gqrx needs qt5" depends on !BR2_PACKAGE_QT5 -comment "gqrx needs a toolchain not affected by GCC bug 43744 and 64735" - depends on BR2_TOOLCHAIN_HAS_GCC_BUG_43744 || BR2_TOOLCHAIN_HAS_GCC_BUG_64735 +comment "gqrx needs a toolchain not affected by GCC bug 43744" + depends on BR2_TOOLCHAIN_HAS_GCC_BUG_43744 config BR2_PACKAGE_GQRX bool "gqrx" @@ -21,8 +22,8 @@ config BR2_PACKAGE_GQRX depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_PACKAGE_QT5 depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # gnuradio -> boost-atomic + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # gnuradio depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_43744 # gnuradio - depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # gnuradio select BR2_PACKAGE_BOOST select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS select BR2_PACKAGE_BOOST_SYSTEM @@ -33,7 +34,9 @@ config BR2_PACKAGE_GQRX select BR2_PACKAGE_GNURADIO_DIGITAL select BR2_PACKAGE_GNURADIO_FFT select BR2_PACKAGE_GNURADIO_FILTER + select BR2_PACKAGE_GNURADIO_NETWORK select BR2_PACKAGE_GR_OSMOSDR + select BR2_PACKAGE_LIBSNDFILE select BR2_PACKAGE_QT5BASE_GUI select BR2_PACKAGE_QT5BASE_WIDGETS select BR2_PACKAGE_QT5SVG diff --git a/package/gqrx/gqrx.hash b/package/gqrx/gqrx.hash index 1991dfea824..567ff947f94 100644 --- a/package/gqrx/gqrx.hash +++ b/package/gqrx/gqrx.hash @@ -1,4 +1,4 @@ # Locally calculated: -sha256 aec35c77ebde9c71a5f973c509eec3d6aa2f18a6e052b180fcd9029d88273e5b gqrx-2.14.4.tar.gz +sha256 4a826b468b2fb38a59cbe1f1b566e62c3114509186a7a25ba27dc92833f3eb44 gqrx-2.15.9.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING sha256 7cc22ce5ee61df62e427ec43b8130de149edee3cafb5af4f18d59b6dc3958faf LICENSE-CTK diff --git a/package/gqrx/gqrx.mk b/package/gqrx/gqrx.mk index 4d464298ca3..d2518213b87 100644 --- a/package/gqrx/gqrx.mk +++ b/package/gqrx/gqrx.mk @@ -4,11 +4,11 @@ # ################################################################################ -GQRX_VERSION = 2.14.4 +GQRX_VERSION = 2.15.9 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 qt5base qt5svg +GQRX_DEPENDENCIES = boost gnuradio gr-osmosdr libsndfile qt5base qt5svg GQRX_CONF_OPTS = -DLINUX_AUDIO_BACKEND=Gr-audio diff --git a/package/gr-osmosdr/Config.in b/package/gr-osmosdr/Config.in index 04fa10be803..d83de75282c 100644 --- a/package/gr-osmosdr/Config.in +++ b/package/gr-osmosdr/Config.in @@ -11,13 +11,6 @@ config BR2_PACKAGE_GR_OSMOSDR if BR2_PACKAGE_GR_OSMOSDR -config BR2_PACKAGE_GR_OSMOSDR_PYTHON - bool "python support" - depends on BR2_PACKAGE_GNURADIO_PYTHON - depends on BR2_PACKAGE_PYTHON3 - help - Enable Python support - config BR2_PACKAGE_GR_OSMOSDR_IQFILE bool "IQ File Source support" help diff --git a/package/gr-osmosdr/gr-osmosdr.hash b/package/gr-osmosdr/gr-osmosdr.hash index 95f1137e384..b5ac50c4ed8 100644 --- a/package/gr-osmosdr/gr-osmosdr.hash +++ b/package/gr-osmosdr/gr-osmosdr.hash @@ -1,3 +1,3 @@ # Locally calculated: -sha256 11b1eb13725ced5ded9121a10aaf7bccf2430c5c69d020791408219968665b71 gr-osmosdr-0.2.3.tar.gz +sha256 28b6f2768aee7b397b227e9e70822e28de3b4c5362a5d14646a0948a48094a63 gr-osmosdr-0.2.4.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/gr-osmosdr/gr-osmosdr.mk b/package/gr-osmosdr/gr-osmosdr.mk index 870db60c55f..6011a675391 100644 --- a/package/gr-osmosdr/gr-osmosdr.mk +++ b/package/gr-osmosdr/gr-osmosdr.mk @@ -4,7 +4,7 @@ # ################################################################################ -GR_OSMOSDR_VERSION = 0.2.3 +GR_OSMOSDR_VERSION = 0.2.4 GR_OSMOSDR_SITE = $(call github,osmocom,gr-osmosdr,v$(GR_OSMOSDR_VERSION)) GR_OSMOSDR_LICENSE = GPL-3.0+ GR_OSMOSDR_LICENSE_FILES = COPYING @@ -22,7 +22,7 @@ GR_OSMOSDR_CONF_OPTS = \ # compile time. GR_OSMOSDR_INSTALL_STAGING = YES -ifeq ($(BR2_PACKAGE_GR_OSMOSDR_PYTHON),y) +ifeq ($(BR2_PACKAGE_GNURADIO_PYTHON),y) GR_OSMOSDR_CONF_OPTS += -DENABLE_PYTHON=ON GR_OSMOSDR_DEPENDENCIES += python3 else diff --git a/package/granite/Config.in b/package/granite/Config.in index 726bde1b2d0..9519e16d45f 100644 --- a/package/granite/Config.in +++ b/package/granite/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_GRANITE depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libgee depends on BR2_PACKAGE_LIBGTK3 select BR2_PACKAGE_LIBGEE select BR2_PACKAGE_LIBGLIB2 @@ -12,7 +13,8 @@ config BR2_PACKAGE_GRANITE https://github.com/elementary/granite -comment "granite needs libgtk3 and a toolchain w/ wchar, threads" +comment "granite needs libgtk3 and a toolchain w/ wchar, threads, gcc >= 4.9" depends on BR2_USE_MMU depends on !BR2_PACKAGE_LIBGTK3 || !BR2_USE_WCHAR \ - || !BR2_TOOLCHAIN_HAS_THREADS + || !BR2_TOOLCHAIN_HAS_THREADS \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/graphicsmagick/graphicsmagick.hash b/package/graphicsmagick/graphicsmagick.hash index cf6d224216d..a894aedf118 100644 --- a/package/graphicsmagick/graphicsmagick.hash +++ b/package/graphicsmagick/graphicsmagick.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 90dc22f1a7bd240e4c9065a940962bf13da43c99bcc36cb111cc3c1a0d7477d4 GraphicsMagick-1.3.37.tar.xz -sha256 8a4d960c5a3e453ee21e459e1794c7a0c85559825d3363a8d3b510b3344fdad4 Copyright.txt +sha256 97dc1a9d4e89c77b25a3b24505e7ff1653b88f9bfe31f189ce10804b8efa7746 GraphicsMagick-1.3.40.tar.xz +sha256 0a20e661de942ebe115a354d0ec6d1d42b93856ea765f813f350a5ce5024cdb7 Copyright.txt diff --git a/package/graphicsmagick/graphicsmagick.mk b/package/graphicsmagick/graphicsmagick.mk index 38743487eb9..76b826ceef5 100644 --- a/package/graphicsmagick/graphicsmagick.mk +++ b/package/graphicsmagick/graphicsmagick.mk @@ -4,7 +4,7 @@ # ################################################################################ -GRAPHICSMAGICK_VERSION = 1.3.37 +GRAPHICSMAGICK_VERSION = 1.3.40 GRAPHICSMAGICK_SOURCE = GraphicsMagick-$(GRAPHICSMAGICK_VERSION).tar.xz GRAPHICSMAGICK_SITE = https://downloads.sourceforge.net/project/graphicsmagick/graphicsmagick/$(GRAPHICSMAGICK_VERSION) GRAPHICSMAGICK_LICENSE = MIT diff --git a/package/grep/0001-sigsegv-fix-build-on-microblazeel.patch b/package/grep/0001-sigsegv-fix-build-on-microblazeel.patch deleted file mode 100644 index 06869b716e7..00000000000 --- a/package/grep/0001-sigsegv-fix-build-on-microblazeel.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 3079cea1b18fe72aa1da6b04e561abfb36f4f443 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 11 Nov 2021 09:57:23 +0100 -Subject: sigsegv: fix build on microblazeel - -Fix the following build failure on microblazeel with diffutils 3.8: -sigsegv.c:979:28: error: 'struct vma_struct' has no member named 'is_near_this' -http://autobuild.buildroot.org/results/5ecd55b7c72f9630a7acc72341ccb60e94ddb574 - -[Retrieved from: -https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=3079cea1b18fe72aa1da6b04e561abfb36f4f443] -Signed-off-by: Fabrice Fontaine ---- - m4/stack-direction.m4 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/m4/stack-direction.m4 b/m4/stack-direction.m4 -index c90d69733..70286c8f5 100644 ---- a/m4/stack-direction.m4 -+++ b/m4/stack-direction.m4 -@@ -37,7 +37,7 @@ AC_DEFUN([SV_STACK_DIRECTION], - m68* | \ - m88k | \ - mcore | \ -- microblaze | \ -+ microblaze* | \ - mips* | \ - mmix | \ - mn10200 | \ --- -cgit v1.2.1 - diff --git a/package/grep/0002-sigsegv-fix-build-on-or1k.patch b/package/grep/0002-sigsegv-fix-build-on-or1k.patch deleted file mode 100644 index 73385fe9f72..00000000000 --- a/package/grep/0002-sigsegv-fix-build-on-or1k.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 496c1740e5475be85b65fdb2b143771f09ed27cb Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 11 Nov 2021 10:06:31 +0100 -Subject: sigsegv: fix build on or1k - -Fix the following build failure on or1k with diffutils 3.8 -https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=e54aa6196947ed22ff66bcd714e4fc7bd0c5c3b4 -sigsegv.c:979:28: error: 'struct vma_struct' has no member named 'is_near_this' -http://autobuild.buildroot.org/results/5427e52489d29ed4f18b4a70b3c36f0f7bb0ddd9 - -[Retrieved from: -https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=496c1740e5475be85b65fdb2b143771f09ed27cb] -Signed-off-by: Fabrice Fontaine ---- - m4/stack-direction.m4 | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/m4/stack-direction.m4 b/m4/stack-direction.m4 -index 70286c8f5..29e398d77 100644 ---- a/m4/stack-direction.m4 -+++ b/m4/stack-direction.m4 -@@ -45,6 +45,7 @@ AC_DEFUN([SV_STACK_DIRECTION], - nios2 | \ - nds32* | \ - ns32k | \ -+ or1k | \ - pdp11 | \ - pj* | \ - powerpc* | rs6000 | \ --- -cgit v1.2.1 - diff --git a/package/grep/grep.hash b/package/grep/grep.hash index 29d9eb1cd60..6f3bca89ad4 100644 --- a/package/grep/grep.hash +++ b/package/grep/grep.hash @@ -1,5 +1,5 @@ # Locally calculated after checking signature -# http://ftp.gnu.org/gnu/grep/grep-3.7.tar.xz.sig +# http://ftp.gnu.org/gnu/grep/grep-3.8.tar.xz.sig # using key 155D3FC500C834486D1EEA677FD9FCCB000BEEEE -sha256 5c10da312460aec721984d5d83246d24520ec438dd48d7ab5a05dbc0d6d6823c grep-3.7.tar.xz +sha256 498d7cc1b4fb081904d87343febb73475cf771e424fb7e6141aff66013abc382 grep-3.8.tar.xz sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING diff --git a/package/grep/grep.mk b/package/grep/grep.mk index a485f23dc7a..318e00940dd 100644 --- a/package/grep/grep.mk +++ b/package/grep/grep.mk @@ -4,14 +4,12 @@ # ################################################################################ -GREP_VERSION = 3.7 +GREP_VERSION = 3.8 GREP_SITE = $(BR2_GNU_MIRROR)/grep GREP_SOURCE = grep-$(GREP_VERSION).tar.xz GREP_LICENSE = GPL-3.0+ GREP_LICENSE_FILES = COPYING GREP_CPE_ID_VENDOR = gnu -# We're patching m4/stack-direction.m4 -GREP_AUTORECONF = YES GREP_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) # install into /bin like busybox grep GREP_CONF_OPTS = --exec-prefix=/ @@ -40,9 +38,9 @@ GREP_DEPENDENCIES += libiconv endif # link with pcre if enabled -ifeq ($(BR2_PACKAGE_PCRE),y) +ifeq ($(BR2_PACKAGE_PCRE2),y) GREP_CONF_OPTS += --enable-perl-regexp -GREP_DEPENDENCIES += pcre +GREP_DEPENDENCIES += pcre2 else GREP_CONF_OPTS += --disable-perl-regexp endif diff --git a/package/grpc/0003-host-grpc-only-cpp-plugin.patch b/package/grpc/0003-host-grpc-only-cpp-plugin.patch new file mode 100644 index 00000000000..c68b096df65 --- /dev/null +++ b/package/grpc/0003-host-grpc-only-cpp-plugin.patch @@ -0,0 +1,206 @@ +From a1922eadfc87da3dd221ff631f94ddd4a8ee7049 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-status: 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 | 43 +++++++++++++++++++++++++++++++++++-------- + 1 file changed, 35 insertions(+), 8 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d3963b074b..51cef83141 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -49,12 +49,16 @@ option(gRPC_BUILD_TESTS "Build tests" OFF) + option(gRPC_BUILD_CODEGEN "Build codegen" ON) + option(gRPC_BUILD_CSHARP_EXT "Build C# extensions" ON) + option(gRPC_BACKWARDS_COMPATIBILITY_MODE "Build libraries that are binary compatible across a larger number of OS and libc versions" OFF) ++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") + +@@ -555,6 +559,8 @@ add_custom_target(plugins + DEPENDS ${_gRPC_PLUGIN_LIST} + ) + ++if (NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) ++ + add_custom_target(tools_c + DEPENDS + ) +@@ -567,6 +573,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 + ) +@@ -1228,6 +1236,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 +@@ -1280,6 +1289,8 @@ if(gRPC_INSTALL) + ) + endif() + ++endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY ++ + if(gRPC_BUILD_TESTS) + + add_library(end2end_tests +@@ -1451,6 +1462,8 @@ endforeach() + + endif() + ++if(NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) ++ + add_library(gpr + src/core/ext/upb-generated/google/protobuf/any.upb.c + src/core/ext/upb-generated/google/rpc/status.upb.c +@@ -2373,6 +2386,8 @@ if(gRPC_INSTALL) + ) + endif() + ++endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY ++ + if(gRPC_BUILD_TESTS) + + add_library(grpc_test_util +@@ -2511,6 +2526,8 @@ endif() + + endif() + ++if(NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) ++ + add_library(grpc_unsecure + src/core/ext/filters/census/grpc_context.cc + src/core/ext/filters/channel_idle/channel_idle_filter.cc +@@ -2916,6 +2933,8 @@ if(gRPC_INSTALL) + ) + endif() + ++endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY ++ + if(gRPC_BUILD_TESTS) + + if(gRPC_BUILD_CODEGEN) +@@ -2987,6 +3006,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 +@@ -3463,6 +3484,7 @@ if(gRPC_INSTALL) + ) + endif() + ++endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY + + if(gRPC_BUILD_CODEGEN) + add_library(grpc++_reflection +@@ -3705,6 +3727,8 @@ target_link_libraries(grpc++_test_util + + endif() + ++if(NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) ++ + add_library(grpc++_unsecure + src/cpp/client/channel_cc.cc + src/cpp/client/client_callback.cc +@@ -4023,6 +4047,7 @@ if(gRPC_INSTALL) + ) + endif() + ++endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY + + add_library(grpc_plugin_support + src/compiler/cpp_generator.cc +@@ -4082,7 +4107,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} +@@ -4166,6 +4191,8 @@ endif() + + endif() + ++if(NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) ++ + add_library(upb + third_party/upb/third_party/utf8_range/naive.c + third_party/upb/third_party/utf8_range/range2-neon.c +@@ -4256,6 +4283,8 @@ target_link_libraries(gen_hpack_tables + gpr + ) + ++endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY ++ + + if(gRPC_BUILD_TESTS) + +@@ -11228,7 +11257,7 @@ target_link_libraries(grpc_cli + + + 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 +@@ -11258,7 +11287,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 gRPCTargets + RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} + BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} +@@ -19803,7 +19832,7 @@ endif() + + + +- ++if (NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) + + if(gRPC_INSTALL) + install(EXPORT gRPCTargets +@@ -19900,3 +19929,5 @@ generate_pkgconfig( + "-lgrpc++_unsecure" + "" + "grpc++_unsecure.pc") ++ ++endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY diff --git a/package/grpc/0004-disable-unconditionally-downloading-api-repos.patch b/package/grpc/0004-disable-unconditionally-downloading-api-repos.patch new file mode 100644 index 00000000000..967bbf6247c --- /dev/null +++ b/package/grpc/0004-disable-unconditionally-downloading-api-repos.patch @@ -0,0 +1,39 @@ +From b0599c3d1b52818c79ea8fa5dfdc40a4ce01e454 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 11e7ae2b67..a9062fa6ef 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -327,6 +327,7 @@ include(cmake/xxhash.cmake) + include(cmake/zlib.cmake) + include(cmake/download_archive.cmake) + ++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) + # Download the archive via HTTP, validate the checksum, and extract to third_party/envoy-api. +@@ -403,6 +404,7 @@ if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/xds) + xds-cb28da3451f158a947dfc45090fe92b07b243bc1 + ) + endif() ++endif() + + if(WIN32) + set(_gRPC_BASELIB_LIBRARIES ws2_32 crypt32) +-- +2.25.1 + diff --git a/package/grpc/0004-host-grpc-only-cpp-plugin.patch b/package/grpc/0004-host-grpc-only-cpp-plugin.patch deleted file mode 100644 index c97d9a9385b..00000000000 --- a/package/grpc/0004-host-grpc-only-cpp-plugin.patch +++ /dev/null @@ -1,215 +0,0 @@ -From a1922eadfc87da3dd221ff631f94ddd4a8ee7049 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-status: not accepted (see https://github.com/grpc/grpc/issues/25322) - -Signed-off-by: Thomas De Schampheleire -Signed-off-by: Fabrice Fontaine ---- - CMakeLists.txt | 43 +++++++++++++++++++++++++++++++++++-------- - 1 file changed, 35 insertions(+), 8 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e8934a3e03..c2df332cc6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -48,12 +48,16 @@ option(gRPC_BUILD_TESTS "Build tests" OFF) - option(gRPC_BUILD_CODEGEN "Build codegen" ON) - option(gRPC_BUILD_CSHARP_EXT "Build C# extensions" ON) - option(gRPC_BACKWARDS_COMPATIBILITY_MODE "Build libraries that are binary compatible across a larger number of OS and libc versions" OFF) -+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") - -@@ -367,6 +371,8 @@ add_custom_target(plugins - DEPENDS ${_gRPC_PLUGIN_LIST} - ) - -+if (NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) -+ - add_custom_target(tools_c - DEPENDS - check_epollexclusive -@@ -382,6 +388,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( - src/proto/grpc/channelz/channelz.proto - ) -@@ -1000,6 +1008,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 -@@ -1051,6 +1060,8 @@ if(gRPC_INSTALL) - ) - endif() - -+endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY -+ - if(gRPC_BUILD_TESTS) - - add_library(end2end_nosec_tests -@@ -1313,6 +1324,8 @@ target_link_libraries(end2end_tests - - endif() - -+if(NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) -+ - add_library(gpr - src/core/lib/gpr/alloc.cc - src/core/lib/gpr/atm.cc -@@ -2106,6 +2119,8 @@ if(gRPC_INSTALL) - ) - endif() - -+endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY -+ - if(gRPC_BUILD_CSHARP_EXT) - - add_library(grpc_csharp_ext SHARED -@@ -2288,6 +2303,8 @@ endif() - - endif() - -+if(NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) -+ - add_library(grpc_unsecure - src/core/ext/filters/census/grpc_context.cc - src/core/ext/filters/client_channel/backend_metric.cc -@@ -2650,6 +2667,8 @@ if(gRPC_INSTALL) - ) - endif() - -+endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY -+ - if(gRPC_BUILD_TESTS) - - if(gRPC_BUILD_CODEGEN) -@@ -2717,6 +2736,8 @@ endif() - - endif() - -+if(NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) -+ - add_library(grpc++ - src/cpp/client/channel_cc.cc - src/cpp/client/client_callback.cc -@@ -3134,6 +3155,7 @@ if(gRPC_INSTALL) - ) - endif() - -+endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY - - if(gRPC_BUILD_CODEGEN) - add_library(grpc++_reflection -@@ -3374,6 +3396,8 @@ target_link_libraries(grpc++_test_util - - endif() - -+if(NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) -+ - add_library(grpc++_unsecure - src/cpp/client/channel_cc.cc - src/cpp/client/client_callback.cc -@@ -3656,6 +3680,7 @@ if(gRPC_INSTALL) - ) - endif() - -+endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY - - add_library(grpc_plugin_support - src/compiler/cpp_generator.cc -@@ -3715,7 +3740,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} - LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} -@@ -3795,6 +3820,8 @@ endif() - - endif() - -+if(NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) -+ - add_library(upb - third_party/upb/upb/decode_fast.c - third_party/upb/upb/decode.c -@@ -3852,8 +3879,6 @@ if(gRPC_INSTALL) - ) - endif() - -- -- - add_executable(check_epollexclusive - test/build/check_epollexclusive.c - ) -@@ -3958,6 +3981,8 @@ target_link_libraries(gen_percent_encoding_tables - ${_gRPC_ALLTARGETS_LIBRARIES} - ) - -+endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY -+ - - if(gRPC_BUILD_TESTS) - -@@ -10722,7 +10747,7 @@ target_link_libraries(grpc_cli - - - 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 -@@ -10752,7 +10777,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 gRPCTargets - RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} - LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} -@@ -15420,7 +15445,7 @@ endif() - - - -- -+if (NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) - - if(gRPC_INSTALL) - install(EXPORT gRPCTargets -@@ -15517,3 +15542,5 @@ generate_pkgconfig( - "-lgrpc++_unsecure -labsl_statusor -labsl_status -labsl_raw_hash_set -labsl_hashtablez_sampler -labsl_synchronization -labsl_time -labsl_time_zone -labsl_civil_time -labsl_graphcycles_internal -labsl_symbolize -labsl_demangle_internal -labsl_malloc_internal -labsl_stacktrace -labsl_debugging_internal -labsl_exponential_biased -labsl_cord -labsl_str_format_internal -labsl_hash -labsl_bad_variant_access -labsl_bad_optional_access -labsl_strings -labsl_strings_internal -labsl_base -labsl_spinlock_wait -labsl_int128 -labsl_city -labsl_throw_delegate -labsl_raw_logging_internal -labsl_log_severity" - "" - "grpc++_unsecure.pc") -+ -+endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY --- -2.26.3 - diff --git a/package/grpc/Config.in b/package/grpc/Config.in index ad3ddbcf191..db6425819b3 100644 --- a/package/grpc/Config.in +++ b/package/grpc/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_GRPC depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS # protobuf, re2 depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # protobuf, re2, libabseil-cpp + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 depends on !BR2_STATIC_LIBS # protobuf, libabseil-cpp depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS @@ -19,9 +19,9 @@ config BR2_PACKAGE_GRPC http://github.com/grpc/grpc -comment "grpc needs a toolchain w/ C++, threads, dynamic library, gcc >= 4.9" +comment "grpc needs a toolchain w/ C++, threads, dynamic library, gcc >= 5" depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ - || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS diff --git a/package/grpc/grpc.hash b/package/grpc/grpc.hash index 3da1d9a323e..e6b76dcb5e8 100644 --- a/package/grpc/grpc.hash +++ b/package/grpc/grpc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 9647220c699cea4dafa92ec0917c25c7812be51a18143af047e20f3fb05adddc grpc-1.43.0.tar.gz -sha256 277adcc1dcef8359b1efb48e628635f88b40be8fbd64e82fd0169930d135d7a5 LICENSE +sha256 b55696fb249669744de3e71acc54a9382bea0dce7cd5ba379b356b12b82d4229 grpc-1.51.1.tar.gz +sha256 590198e3f305f2c347fde64d637c65492bbef554db6c8364e149cd375e3797ee LICENSE diff --git a/package/grpc/grpc.mk b/package/grpc/grpc.mk index 5d8201f12f9..9125b1f9f69 100644 --- a/package/grpc/grpc.mk +++ b/package/grpc/grpc.mk @@ -4,7 +4,7 @@ # ################################################################################ -GRPC_VERSION = 1.43.0 +GRPC_VERSION = 1.51.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 @@ -21,6 +21,7 @@ HOST_GRPC_DEPENDENCIES = host-protobuf # which doesn't do this. These CARES settings trick the gRPC cmake code into # not looking for c-ares at all and yet still linking with the library. GRPC_CONF_OPTS = \ + -DCMAKE_EXE_LINKER_FLAGS="$(GRPC_EXE_LINKER_FLAGS)" \ -DgRPC_ABSL_PROVIDER=package \ -D_gRPC_CARES_LIBRARIES=cares \ -DgRPC_CARES_PROVIDER=none \ @@ -36,10 +37,15 @@ GRPC_CONF_OPTS = \ -DgRPC_BUILD_GRPC_PYTHON_PLUGIN=OFF \ -DgRPC_BUILD_GRPC_RUBY_PLUGIN=OFF +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +GRPC_DEPENDENCIES += libexecinfo +GRPC_EXE_LINKER_FLAGS += -lexecinfo +endif + # grpc can use __atomic builtins, so we need to link with # libatomic when available ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -GRPC_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic +GRPC_EXE_LINKER_FLAGS += -latomic endif GRPC_CFLAGS = $(TARGET_CFLAGS) @@ -57,14 +63,6 @@ GRPC_CFLAGS += -O0 GRPC_CXXFLAGS += -O0 endif -# Toolchains older than gcc5 will fail to compile with -0s due to: -# error: failure memory model cannot be stronger than success memory model for -# '__atomic_compare_exchange', so we use -O2 in these cases -ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_5):$(BR2_OPTIMIZE_S),:y) -GRPC_CFLAGS += -O2 -GRPC_CXXFLAGS += -O2 -endif - GRPC_CONF_OPTS += \ -DCMAKE_C_FLAGS="$(GRPC_CFLAGS)" \ -DCMAKE_CXX_FLAGS="$(GRPC_CXXFLAGS)" diff --git a/package/gsettings-desktop-schemas/gsettings-desktop-schemas.hash b/package/gsettings-desktop-schemas/gsettings-desktop-schemas.hash index d530517cd12..bad8eab91da 100644 --- a/package/gsettings-desktop-schemas/gsettings-desktop-schemas.hash +++ b/package/gsettings-desktop-schemas/gsettings-desktop-schemas.hash @@ -1,4 +1,4 @@ -# From http://ftp.acc.umu.se/pub/gnome/sources/gsettings-desktop-schemas/3.36/gsettings-desktop-schemas-3.36.1.sha256sum +# From https://download.gnome.org/sources/gsettings-desktop-schemas/3.36/gsettings-desktop-schemas-3.36.1.sha256sum sha256 004bdbe43cf8290f2de7d8537e14d8957610ca479a4fa368e34dbd03f03ec9d9 gsettings-desktop-schemas-3.36.1.tar.xz # Hash for license file diff --git a/package/gsettings-desktop-schemas/gsettings-desktop-schemas.mk b/package/gsettings-desktop-schemas/gsettings-desktop-schemas.mk index 8573c75fde3..b77397d5654 100644 --- a/package/gsettings-desktop-schemas/gsettings-desktop-schemas.mk +++ b/package/gsettings-desktop-schemas/gsettings-desktop-schemas.mk @@ -7,7 +7,7 @@ GSETTINGS_DESKTOP_SCHEMAS_VERSION_MAJOR = 3.36 GSETTINGS_DESKTOP_SCHEMAS_VERSION = $(GSETTINGS_DESKTOP_SCHEMAS_VERSION_MAJOR).1 GSETTINGS_DESKTOP_SCHEMAS_SOURCE = gsettings-desktop-schemas-$(GSETTINGS_DESKTOP_SCHEMAS_VERSION).tar.xz -GSETTINGS_DESKTOP_SCHEMAS_SITE = http://ftp.gnome.org/pub/gnome/sources/gsettings-desktop-schemas/$(GSETTINGS_DESKTOP_SCHEMAS_VERSION_MAJOR) +GSETTINGS_DESKTOP_SCHEMAS_SITE = https://download.gnome.org/sources/gsettings-desktop-schemas/$(GSETTINGS_DESKTOP_SCHEMAS_VERSION_MAJOR) GSETTINGS_DESKTOP_SCHEMAS_INSTALL_STAGING = YES GSETTINGS_DESKTOP_SCHEMAS_DEPENDENCIES = host-pkgconf libglib2 GSETTINGS_DESKTOP_SCHEMAS_LICENSE = LGPL-2.1+ diff --git a/package/gsl/0001-configure.ac-fix-build-on-powerpc.patch b/package/gsl/0001-configure.ac-fix-build-on-powerpc.patch new file mode 100644 index 00000000000..13f6da4588c --- /dev/null +++ b/package/gsl/0001-configure.ac-fix-build-on-powerpc.patch @@ -0,0 +1,53 @@ +From 84e62d57b90b41a0c96bb9fb6ec61ecaac76a1ab Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 5 Nov 2022 21:31:36 +0100 +Subject: [PATCH] configure.ac: fix build on powerpc + +Fix the following powerpc build failures on: + - musl raised because fpu_control.h is not available: + +In file included from fp.c:8: +fp-gnuppc.c:21:10: fatal error: fpu_control.h: No such file or directory + 21 | #include + | ^~~~~~~~~~~~~~~ + + - glibc raised because _FPU_RC_NEAREST is undefined if _SOFT_FLOAT is + set: + + In file included from fp.c:8: +fp-gnuppc.c: In function 'gsl_ieee_set_mode': +fp-gnuppc.c:53:15: error: '_FPU_RC_NEAREST' undeclared (first use in this function) + 53 | mode |= _FPU_RC_NEAREST ; + | ^~~~~~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/d73e116c81bf16d2e55fced215d6bd3b382fef10 + - http://autobuild.buildroot.org/results/48403946bb4cda9013e51db59c1b2ffdcf4e2854 + +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/configure.ac b/configure.ac +index bfd9ca30..1ee6dca0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -389,6 +389,14 @@ if test "$ac_cv_c_ieee_interface" = "gnux86" ; then + fi + fi + ++if test "$ac_cv_c_ieee_interface" = "gnuppc" ; then ++ AC_CACHE_CHECK([for _FPU_RC_NEAREST], ac_cv_c__fpu_rc_nearest, ++ [ac_cv_c__fpu_rc_nearest=no ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ++]], [[ unsigned short mode = _FPU_RC_NEAREST ; ]])],[ac_cv_c__fpu_rc_nearest="yes"],[ac_cv_c_ieee_interface=unknown]) ++ ]) ++fi ++ + ac_tr_ieee_interface=HAVE_`echo $ac_cv_c_ieee_interface | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_IEEE_INTERFACE + AC_DEFINE_UNQUOTED($ac_tr_ieee_interface,1,[IEEE Interface Type]) + +-- +2.35.1 + diff --git a/package/gsl/gsl.mk b/package/gsl/gsl.mk index 416955b72c4..3604f9836c8 100644 --- a/package/gsl/gsl.mk +++ b/package/gsl/gsl.mk @@ -10,6 +10,8 @@ GSL_INSTALL_STAGING = YES GSL_LICENSE = GPL-3.0 GSL_LICENSE_FILES = COPYING GSL_CONFIG_SCRIPTS = gsl-config +# We're patching configure.ac +GSL_AUTORECONF = YES # uClibc pretends to have fenv support as it installs , but in # practice, it only implements it for i386. Problem reported upstream diff --git a/package/gssdp/gssdp.hash b/package/gssdp/gssdp.hash index c9bbd66083f..34ccfa80445 100644 --- a/package/gssdp/gssdp.hash +++ b/package/gssdp/gssdp.hash @@ -1,4 +1,4 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gssdp/1.4/gssdp-1.4.0.1.sha256sum: +# Hash from: https://download.gnome.org/sources/gssdp/1.4/gssdp-1.4.0.1.sha256sum: sha256 8676849d57fb822b8728856dbadebf3867f89ee47a0ec47a20045d011f431582 gssdp-1.4.0.1.tar.xz # Hash for license file: diff --git a/package/gssdp/gssdp.mk b/package/gssdp/gssdp.mk index f1fed3713de..f7ebb44acd4 100644 --- a/package/gssdp/gssdp.mk +++ b/package/gssdp/gssdp.mk @@ -7,7 +7,7 @@ GSSDP_VERSION_MAJOR = 1.4 GSSDP_VERSION = $(GSSDP_VERSION_MAJOR).0.1 GSSDP_SOURCE = gssdp-$(GSSDP_VERSION).tar.xz -GSSDP_SITE = http://ftp.gnome.org/pub/gnome/sources/gssdp/$(GSSDP_VERSION_MAJOR) +GSSDP_SITE = https://download.gnome.org/sources/gssdp/$(GSSDP_VERSION_MAJOR) GSSDP_LICENSE = LGPL-2.1+ GSSDP_LICENSE_FILES = COPYING GSSDP_INSTALL_STAGING = YES diff --git a/package/gstreamer1/gst-omx/gst-omx.hash b/package/gstreamer1/gst-omx/gst-omx.hash index 0b95505c5f1..d4a95c631a7 100644 --- a/package/gstreamer1/gst-omx/gst-omx.hash +++ b/package/gstreamer1/gst-omx/gst-omx.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.20.0.tar.xz.sha256sum -sha256 c1e46b70ac379ac7b3646506370c9e1007b56ae293f4d334bc0e724c76c345dd gst-omx-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.22.2.tar.xz.sha256sum +sha256 1b0c57f2cc4ddeec5e7f0c436e502f06665c4e93c73261855b94e04fc94337b2 gst-omx-1.22.2.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst-omx/gst-omx.mk b/package/gstreamer1/gst-omx/gst-omx.mk index f71e1242ff5..87f162f7150 100644 --- a/package/gstreamer1/gst-omx/gst-omx.mk +++ b/package/gstreamer1/gst-omx/gst-omx.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST_OMX_VERSION = 1.20.0 +GST_OMX_VERSION = 1.22.2 GST_OMX_SOURCE = gst-omx-$(GST_OMX_VERSION).tar.xz GST_OMX_SITE = https://gstreamer.freedesktop.org/src/gst-omx diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.hash b/package/gstreamer1/gst1-devtools/gst1-devtools.hash index dd09280a9cd..4abdd6ece4b 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.20.0.tar.xz.sha256sum -sha256 69fc8756ec9d93e5c5258c99088434f203e91fdbc5af28d1f2c583fd819b7a1d gst-devtools-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.22.2.tar.xz.sha256sum +sha256 eb62726d3e27a8782369a24fd6364a8885ed2462b3bbdab091dffc8139ee06d8 gst-devtools-1.22.2.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 f72df9cf71d..7801f9b62c7 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.20.0 +GST1_DEVTOOLS_VERSION = 1.22.2 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-imx/Config.in b/package/gstreamer1/gst1-imx/Config.in index 7b46233b537..bd1f8d41f26 100644 --- a/package/gstreamer1/gst1-imx/Config.in +++ b/package/gstreamer1/gst1-imx/Config.in @@ -81,18 +81,24 @@ comment "imxvpu needs the VPU imxvpuapi library" config BR2_PACKAGE_GST1_IMX_V4L2VIDEOSRC bool "imxv4l2videosrc" + depends on BR2_INSTALL_LIBSTDCPP # gst1-plugins-bad select BR2_PACKAGE_GST1_PLUGINS_BAD help Elements for V4L2 capture +comment "imxv4l2videosrc needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP + config BR2_PACKAGE_GST1_IMX_V4L2VIDEOSINK bool "imxv4l2videosink" depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_2 # V4L2_COLORSPACE_DEFAULT + depends on BR2_INSTALL_LIBSTDCPP # gst1-plugins-bad select BR2_PACKAGE_GST1_PLUGINS_BAD help Elements for V4L2 output -comment "imxv4l2videosink needs a toolchain w/ headers >= 4.2" - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_2 +comment "imxv4l2videosink needs a toolchain w/ headers >= 4.2, C++" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_2 || \ + !BR2_INSTALL_LIBSTDCPP endif diff --git a/package/gstreamer1/gst1-imx/gst1-imx.hash b/package/gstreamer1/gst1-imx/gst1-imx.hash index 0a701a058f4..0c2a99cc5b4 100644 --- a/package/gstreamer1/gst1-imx/gst1-imx.hash +++ b/package/gstreamer1/gst1-imx/gst1-imx.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 21feb24130c18e4a1f8cc4f72d575903d1f9134dd0604e41e91b5e783d81e320 gst1-imx-0.13.1.tar.gz -sha256 94b03f1a60a7fd5007149530626a895a6ef5a8b9342abfd56860c5f3956f5d23 LICENSE +sha256 21feb24130c18e4a1f8cc4f72d575903d1f9134dd0604e41e91b5e783d81e320 gst1-imx-0.13.1.tar.gz +sha256 94b03f1a60a7fd5007149530626a895a6ef5a8b9342abfd56860c5f3956f5d23 LICENSE diff --git a/package/gstreamer1/gst1-libav/gst1-libav.hash b/package/gstreamer1/gst1-libav/gst1-libav.hash index 3204de3c14f..c3e84a17d21 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.20.0.tar.xz.sha256sum -sha256 5eee5ed8d5082a31b500448e41535c722ee30cd5f8224f32982bbaba2eedef17 gst-libav-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.22.2.tar.xz.sha256sum +sha256 fcaaf9878fe8f3bc82317ef13a1558824cb68df1f8968c6797f556c5e33bcffd gst-libav-1.22.2.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gst1-libav/gst1-libav.mk b/package/gstreamer1/gst1-libav/gst1-libav.mk index f07e5061b4c..0306db42c0a 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.20.0 +GST1_LIBAV_VERSION = 1.22.2 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 234d57636b2..d2ef450d749 100644 --- a/package/gstreamer1/gst1-plugins-bad/Config.in +++ b/package/gstreamer1/gst1-plugins-bad/Config.in @@ -1,5 +1,6 @@ menuconfig BR2_PACKAGE_GST1_PLUGINS_BAD bool "gst1-plugins-bad" + depends on BR2_INSTALL_LIBSTDCPP select BR2_PACKAGE_GST1_PLUGINS_BASE help A set of plug-ins for GStreamer that may be of poor quality @@ -480,18 +481,21 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_TTML bool "ttml" depends on BR2_USE_WCHAR # pango -> glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # pango -> glib2 + depends on BR2_USE_MMU # pango -> glib2 depends on BR2_INSTALL_LIBSTDCPP # pango -> freetype depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango -> harfbuzz select BR2_PACKAGE_CAIRO select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_PANGO help Timed Text Markup Language (TTML) subtitle plugin -comment "ttml needs a toolchain w/ wchar, threads, C++" +comment "ttml needs a toolchain w/ wchar, threads, C++, gcc >= 4.9" depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_INSTALL_LIBSTDCPP + !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEG2ENC bool "mpeg2enc" @@ -523,11 +527,11 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENAL depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL - depends on BR2_PAKCAGE_OPENAL_ARCH_SUPPORTS + depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS select BR2_PACKAGE_OPENAL comment "openal plugin needs a toolchain w/ NPTL, C++, gcc >= 4.9" - depends on BR2_PAKCAGE_OPENAL_ARCH_SUPPORTS + depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL \ || !BR2_INSTALL_LIBSTDCPP \ || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 @@ -625,6 +629,17 @@ comment "uvch264 needs a toolchain w/ threads, wchar, gcc >= 4.9" depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VA + bool "va" + depends on !BR2_STATIC_LIBS # libva + depends on BR2_TOOLCHAIN_HAS_THREADS # libva + select BR2_PACKAGE_LIBVA + help + VA-API new plugin + +comment "va needs a toolchain w/ threads, dynamic library" + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VOAACENC bool "voaacenc" select BR2_PACKAGE_VO_AACENC @@ -723,4 +738,18 @@ comment "zbar plugin needs a toolchain w/ threads, C++ and headers >= 3.0" depends on !BR2_TOOLCHAIN_HAS_THREADS \ || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 +config BR2_PACKAGE_GST1_PLUGINS_BAD_ZXING + bool "zxing" + depends on !BR2_STATIC_LIBS # zxing-cpp + depends on BR2_USE_WCHAR # zxing-cpp + depends on BR2_INSTALL_LIBSTDCPP # zxing-cpp + select BR2_PACKAGE_ZXING_CPP + +comment "zxing plugin needs a toolchain w/ C++, wchar, dynamic library" + depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || \ + !BR2_INSTALL_LIBSTDCPP + endif + +comment "gst1-plugins-bad needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash index 72c9624b943..2bbb8af9047 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.20.0.tar.xz.sha256sum -sha256 015b8d4d9a395ebf444d40876867a2034dd3304b3ad48bc3a0dd0c1ee71dc11d gst-plugins-bad-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.22.2.tar.xz.sha256sum +sha256 3d8faf1ce3402c8535ce3a8c4e1a6c960e4b5655dbda6b55943db9ac79022d0f gst-plugins-bad-1.22.2.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 24fd9dd312d..1713f0b4b84 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.20.0 +GST1_PLUGINS_BAD_VERSION = 1.22.2 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 @@ -70,7 +70,6 @@ GST1_PLUGINS_BAD_CONF_OPTS += \ -Dsvthevcenc=disabled \ -Dtranscode=disabled \ -Dwasapi2=disabled \ - -Dzxing=disabled \ -Dmagicleap=disabled \ -Disac=disabled \ -Diqa=disabled \ @@ -745,6 +744,16 @@ else GST1_PLUGINS_BAD_CONF_OPTS += -Duvch264=disabled endif +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_DEPENDENCIES += libdrm +endif +else +GST1_PLUGINS_BAD_CONF_OPTS += -Dva=disabled +endif + ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VOAACENC),y) GST1_PLUGINS_BAD_CONF_OPTS += -Dvoaacenc=enabled GST1_PLUGINS_BAD_DEPENDENCIES += vo-aacenc @@ -802,6 +811,13 @@ else GST1_PLUGINS_BAD_CONF_OPTS += -Dzbar=disabled endif +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_ZXING),y) +GST1_PLUGINS_BAD_CONF_OPTS += -Dzxing=enabled +GST1_PLUGINS_BAD_DEPENDENCIES += zxing-cpp +else +GST1_PLUGINS_BAD_CONF_OPTS += -Dzxing=disabled +endif + # Add GPL license if GPL licensed plugins enabled. ifeq ($(GST1_PLUGINS_BAD_HAS_GPL_LICENSE),y) GST1_PLUGINS_BAD_CONF_OPTS += -Dgpl=enabled diff --git a/package/gstreamer1/gst1-plugins-base/Config.in b/package/gstreamer1/gst1-plugins-base/Config.in index 7ca94d7dc44..df10774ac7c 100644 --- a/package/gstreamer1/gst1-plugins-base/Config.in +++ b/package/gstreamer1/gst1-plugins-base/Config.in @@ -59,10 +59,11 @@ config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ENCODING help various encoding-related elements -config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT - bool "videoconvert" +config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERTSCALE + bool "videoconvertscale (mandatory for video playback)" + default y help - Colorspace conversion + Colorspace conversion, resizes video config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_GIO bool "gio" @@ -123,12 +124,6 @@ config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEORATE help Adjusts video frames -config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE - bool "videoscale (mandatory for video playback)" - default y - help - Resizes video - config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME bool "volume (mandatory for audio playback)" default y @@ -291,6 +286,9 @@ config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_OPUS config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PANGO bool "pango font renderer" + depends on BR2_USE_WCHAR # pango -> glib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # pango -> glib2 + depends on BR2_USE_MMU # pango -> glib2 depends on BR2_INSTALL_LIBSTDCPP # pango -> freetype depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango -> harfbuzz @@ -298,10 +296,11 @@ config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PANGO help Pango-based text rendering and overlay -comment "pango plugin needs a toolchain w/ C++, gcc >= 4.9" - depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 +comment "pango plugin needs a toolchain w/ C++, wchar, threads, gcc >= 4.9" depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on BR2_USE_MMU + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_THEORA bool "theora (*.ogg video)" diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash index ffc3445cdac..173f359afcd 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.20.0.tar.xz.sha256sum -sha256 4cb66fccf730b1037e6533862c2128990912a6db4e5bbd14e0ef914450eb4c7c gst-plugins-base-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.22.2.tar.xz.sha256sum +sha256 eb65120c4ee79b7a153c3c1972d5c0158c2151877cc51ec7725bba5749679d49 gst-plugins-base-1.22.2.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 08aac850cd3..153187f743d 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.20.0 +GST1_PLUGINS_BASE_VERSION = 1.22.2 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 @@ -147,10 +147,10 @@ else GST1_PLUGINS_BASE_CONF_OPTS += -Dencoding=disabled endif -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT),y) -GST1_PLUGINS_BASE_CONF_OPTS += -Dvideoconvert=enabled +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERTSCALE),y) +GST1_PLUGINS_BASE_CONF_OPTS += -Dvideoconvertscale=enabled else -GST1_PLUGINS_BASE_CONF_OPTS += -Dvideoconvert=disabled +GST1_PLUGINS_BASE_CONF_OPTS += -Dvideoconvertscale=disabled endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_GIO),y) @@ -219,12 +219,6 @@ else GST1_PLUGINS_BASE_CONF_OPTS += -Dvideorate=disabled endif -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE),y) -GST1_PLUGINS_BASE_CONF_OPTS += -Dvideoscale=enabled -else -GST1_PLUGINS_BASE_CONF_OPTS += -Dvideoscale=disabled -endif - ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME),y) GST1_PLUGINS_BASE_CONF_OPTS += -Dvolume=enabled else diff --git a/package/gstreamer1/gst1-plugins-good/Config.in b/package/gstreamer1/gst1-plugins-good/Config.in index 67df206eea0..d7ec16e8001 100644 --- a/package/gstreamer1/gst1-plugins-good/Config.in +++ b/package/gstreamer1/gst1-plugins-good/Config.in @@ -246,6 +246,11 @@ config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_WAVPARSE help Parse a .wav file into raw audio +config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_XINGMUX + bool "xingmux" + help + Add XING tags to mpeg audio files + config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_Y4M bool "y4m" help diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash index 9ad1d7bf462..604e74b57d9 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.20.0.tar.xz.sha256sum -sha256 2d119c15ab8c9e79f8cd3c6bf582ff7a050b28ccae52ab4865e1a1464991659c gst-plugins-good-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.22.2.tar.xz.sha256sum +sha256 7c8cc59425f2b232f60ca7d13e56edd615da4f711e73dd01a7cffa46e6bc0cdd gst-plugins-good-1.22.2.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 6298d578eda..bbcd3aecabd 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk @@ -4,12 +4,13 @@ # ################################################################################ -GST1_PLUGINS_GOOD_VERSION = 1.20.0 +GST1_PLUGINS_GOOD_VERSION = 1.22.2 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 GST1_PLUGINS_GOOD_LICENSE = LGPL-2.1+ +GST1_PLUGINS_GOOD_CFLAGS = $(TARGET_CFLAGS) -std=gnu99 GST1_PLUGINS_GOOD_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) GST1_PLUGINS_GOOD_CONF_OPTS = \ @@ -323,6 +324,12 @@ else GST1_PLUGINS_GOOD_CONF_OPTS += -Dwavparse=disabled endif +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_XINGMUX),y) +GST1_PLUGINS_GOOD_CONF_OPTS += -Dxingmux=enabled +else +GST1_PLUGINS_GOOD_CONF_OPTS += -Dxingmux=disabled +endif + ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_Y4M),y) GST1_PLUGINS_GOOD_CONF_OPTS += -Dy4m=enabled else @@ -479,10 +486,6 @@ else GST1_PLUGINS_GOOD_CONF_OPTS += -Dwavpack=disabled endif -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_ZLIB),y) -GST1_PLUGINS_GOOD_DEPENDENCIES += zlib -endif - ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_BZ2),y) GST1_PLUGINS_GOOD_CONF_OPTS += -Dbz2=enabled GST1_PLUGINS_GOOD_DEPENDENCIES += bzip2 diff --git a/package/gstreamer1/gst1-plugins-ugly/Config.in b/package/gstreamer1/gst1-plugins-ugly/Config.in index ba199898921..54766ffa8c5 100644 --- a/package/gstreamer1/gst1-plugins-ugly/Config.in +++ b/package/gstreamer1/gst1-plugins-ugly/Config.in @@ -26,11 +26,6 @@ config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDSUB help DVD subtitle parser and decoder -config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_XINGMUX - bool "xingmux" - help - Add XING tags to mpeg audio files - config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_REALMEDIA bool "realmedia" help diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash index d16134f24bb..ed781df686f 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.20.0.tar.xz.sha256sum -sha256 4e8dcb5d26552f0a4937f6bc6279bd9070f55ca6ae0eaa32d72d264c44001c2e gst-plugins-ugly-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.22.2.tar.xz.sha256sum +sha256 8f30f44db0bd063709bf6fbe55138e3a98af0abcb61c360f35582bbe10e80691 gst-plugins-ugly-1.22.2.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 05b1fab3046..f1566b058e6 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.20.0 +GST1_PLUGINS_UGLY_VERSION = 1.22.2 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 @@ -51,12 +51,6 @@ else GST1_PLUGINS_UGLY_CONF_OPTS += -Ddvdsub=disabled endif -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_XINGMUX),y) -GST1_PLUGINS_UGLY_CONF_OPTS += -Dxingmux=enabled -else -GST1_PLUGINS_UGLY_CONF_OPTS += -Dxingmux=disabled -endif - ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_REALMEDIA),y) GST1_PLUGINS_UGLY_CONF_OPTS += -Drealmedia=enabled else diff --git a/package/gstreamer1/gst1-python/gst1-python.hash b/package/gstreamer1/gst1-python/gst1-python.hash index a2f17583fdb..006d4985efb 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.20.0.tar.xz.sha256sum -sha256 8f67bdc5606ba33606c6bc896e89de7dcd8cf4fca459f71389b1b6fe075b5e54 gst-python-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.22.2.tar.xz.sha256sum +sha256 bef2b3d82ce4be46b775b1bb56305c1003ee01b535a53a82f9fe8924972153ad gst-python-1.22.2.tar.xz sha256 ea3ad127610e5ded2210b3a86a46314f2b3b28e438eccffdae19a4d6fbcdb0c2 COPYING diff --git a/package/gstreamer1/gst1-python/gst1-python.mk b/package/gstreamer1/gst1-python/gst1-python.mk index a9cc32d1d70..527d1017868 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.20.0 +GST1_PYTHON_VERSION = 1.22.2 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 00ff974c6e0..c98d10d79c0 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.20.0.tar.xz.sha256sum -sha256 c209f5ed906da713fdd44a8844e909aa6c8af3dfb630259b092cfb77a7755843 gst-rtsp-server-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.22.2.tar.xz.sha256sum +sha256 2be4aecfb88710100ea7115ed0216403e8094344ebf146094271b8d4d73828bf gst-rtsp-server-1.22.2.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 d22dd5e7cc3..6f5fc4f7aad 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.20.0 +GST1_RTSP_SERVER_VERSION = 1.22.2 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-shark/gst1-shark.hash b/package/gstreamer1/gst1-shark/gst1-shark.hash index be26050715f..cfd72dd2a62 100644 --- a/package/gstreamer1/gst1-shark/gst1-shark.hash +++ b/package/gstreamer1/gst1-shark/gst1-shark.hash @@ -1,5 +1,5 @@ # locally computed hash -sha256 689e60b4e10635a4f3af795b53045c6e90643896fa07b61e164a96158a79bdcf gst1-shark-v0.7.3-br1.tar.gz +sha256 413dbd8b6be1b09751e8d00abf9784de18cb74283c95ac078f6fb7d8750de26a gst1-shark-v0.7.5-br1.tar.gz # Hashes for license files: sha256 6d191b8f1fa03cabced18b8e48fddbf960a19f965bed8491e76ed62238f92f0b COPYING diff --git a/package/gstreamer1/gst1-shark/gst1-shark.mk b/package/gstreamer1/gst1-shark/gst1-shark.mk index 4e7801e9209..17df001cef9 100644 --- a/package/gstreamer1/gst1-shark/gst1-shark.mk +++ b/package/gstreamer1/gst1-shark/gst1-shark.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_SHARK_VERSION = v0.7.3 +GST1_SHARK_VERSION = v0.7.5 GST1_SHARK_SITE = https://github.com/RidgeRun/gst-shark.git GST1_SHARK_SITE_METHOD = git GST1_SHARK_GIT_SUBMODULES = YES diff --git a/package/gstreamer1/gst1-vaapi/Config.in b/package/gstreamer1/gst1-vaapi/Config.in index 91bd4f85ddb..a1062097ed7 100644 --- a/package/gstreamer1/gst1-vaapi/Config.in +++ b/package/gstreamer1/gst1-vaapi/Config.in @@ -2,11 +2,14 @@ config BR2_PACKAGE_GST1_VAAPI bool "gst1-vaapi" depends on !BR2_STATIC_LIBS # dlopen(), libva depends on BR2_TOOLCHAIN_HAS_THREADS # libva, libdrm + depends on BR2_INSTALL_LIBSTDCPP # gst1-plugins-bad depends on BR2_PACKAGE_HAS_UDEV select BR2_PACKAGE_LIBVA select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_GST1_PLUGINS_BASE select BR2_PACKAGE_GST1_PLUGINS_BAD # gstreamer-codecparsers + select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBXRANDR if BR2_PACKAGE_XORG7 help gstreamer-vaapi consists in a collection of VA-API based plugins for GStreamer and helper libraries. @@ -45,6 +48,6 @@ config BR2_PACKAGE_GST1_VAAPI_ENCODERS endif -comment "gst1-vaapi needs udev /dev management and a toolchain w/ threads, dynamic library" +comment "gst1-vaapi needs udev /dev management and a toolchain w/ threads, dynamic library, C++" depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ - !BR2_PACKAGE_HAS_UDEV + !BR2_PACKAGE_HAS_UDEV || !BR2_INSTALL_LIBSTDCPP diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash index b32d91e1e20..2fdec4e83fa 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.20.0.tar.xz.sha256sum -sha256 f79a47346dfd5e585e063e77078e5fc498b06dee895bfcbf47d8863fcac9ea32 gstreamer-vaapi-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.22.2.tar.xz.sha256sum +sha256 d2e642f9745f97d9f73a7f5085e7659a9a31fe209b774e6e45dae041b435df06 gstreamer-vaapi-1.22.2.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 19ee625703a..cae239094a3 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.20.0 +GST1_VAAPI_VERSION = 1.22.2 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+ @@ -18,19 +18,41 @@ GST1_VAAPI_DEPENDENCIES += \ libdrm GST1_VAAPI_CONF_OPTS += \ - -Dwith_drm=yes \ - -Dwith_x11=no \ - -Dwith_glx=no \ - -Dwith_wayland=no \ - -Dwith_egl=no \ + -Ddrm=enabled \ + -Degl=enabled \ -Dexamples=disabled \ -Dtests=disabled \ -Ddoc=disabled ifeq ($(BR2_PACKAGE_GST1_VAAPI_ENCODERS),y) -GST1_VAAPI_CONF_OPTS += -Dwith_encoders=yes +GST1_VAAPI_CONF_OPTS += -Dencoders=enabled else -GST1_VAAPI_CONF_OPTS += -Dwith_encoders=no +GST1_VAAPI_CONF_OPTS += -Dencoders=disabled +endif + +ifeq ($(BR2_PACKAGE_HAS_LIBEGL),y) +GST1_VAAPI_CONF_OPTS += -Degl=enabled +GST1_VAAPI_DEPENDENCIES += libegl +else +GST1_VAAPI_CONF_OPTS += -Degl=disabled +endif + +ifeq ($(BR2_PACKAGE_WAYLAND),y) +GST1_VAAPI_CONF_OPTS += -Dwayland=enabled +else +GST1_VAAPI_CONF_OPTS += -Dwayland=disabled +endif + +ifeq ($(BR2_PACKAGE_XLIB_LIBX11)$(BR2_PACKAGE_XLIB_LIBXRANDR),yy) +GST1_VAAPI_CONF_OPTS += -Dx11=enabled +GST1_VAAPI_DEPENDENCIES += xlib_libX11 xlib_libXrandr +ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) +GST1_VAAPI_CONF_OPTS += -Dglx=enabled +else +GST1_VAAPI_CONF_OPTS += -Dglx=disabled +endif +else +GST1_VAAPI_CONF_OPTS += -Dx11=disabled -Dglx=disabled endif $(eval $(meson-package)) diff --git a/package/gstreamer1/gstd/0004-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch b/package/gstreamer1/gstd/0001-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch similarity index 100% rename from package/gstreamer1/gstd/0004-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch rename to package/gstreamer1/gstd/0001-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch diff --git a/package/gstreamer1/gstd/0001-Fix-gstd_chmod.sh-DESTDIR-path.patch b/package/gstreamer1/gstd/0001-Fix-gstd_chmod.sh-DESTDIR-path.patch deleted file mode 100644 index 79a65ffbdc2..00000000000 --- a/package/gstreamer1/gstd/0001-Fix-gstd_chmod.sh-DESTDIR-path.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f1c953b9077619a83ab21c24dc343c7e21cd220d Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Tue, 14 Sep 2021 01:46:25 -0600 -Subject: [PATCH] Fix gstd_chmod.sh DESTDIR path. - -This should fix the chmod path when cross compiling. - -Signed-off-by: James Hilliard -[Upstream status: -https://github.com/RidgeRun/gstd-1.x/pull/247] ---- - gstd/gstd_chmod.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gstd/gstd_chmod.sh b/gstd/gstd_chmod.sh -index 8e58bce..fa7fa80 100755 ---- a/gstd/gstd_chmod.sh -+++ b/gstd/gstd_chmod.sh -@@ -3,4 +3,4 @@ - # $1 mode - # $2 file - --chmod $1 $2 -+chmod $1 ${DESTDIR}/$2 --- -2.25.1 - diff --git a/package/gstreamer1/gstd/0002-Don-t-require-gstreamer-check-1.0-unless-tests-are-e.patch b/package/gstreamer1/gstd/0002-Don-t-require-gstreamer-check-1.0-unless-tests-are-e.patch deleted file mode 100644 index 495fbfc3fa1..00000000000 --- a/package/gstreamer1/gstd/0002-Don-t-require-gstreamer-check-1.0-unless-tests-are-e.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 586bb97459e72da30bd9991c228b6b8e9251c68b Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Tue, 14 Sep 2021 01:49:49 -0600 -Subject: [PATCH] Don't require gstreamer-check-1.0 unless tests are enabled. - -Signed-off-by: James Hilliard -[Upstream status: -https://github.com/RidgeRun/gstd-1.x/pull/248] ---- - meson.build | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 1d9ce9d..76990a0 100644 ---- a/meson.build -+++ b/meson.build -@@ -22,10 +22,12 @@ gio_unix_dep = dependency('gio-unix-2.0', version : '>=2.44.1') - json_glib_dep = dependency('json-glib-1.0', version : '>=0.16.2') - libd_dep = dependency('libdaemon', version : '>=0.14') - jansson_dep = dependency('jansson', version : '>=2.7') --gst_check_dep = dependency('gstreamer-check-1.0',version : '>=1.0.5') - thread_dep = dependency('threads') - libsoup_dep = dependency('libsoup-2.4', version : '>=2.4') - -+gst_check_required = get_option('enable-tests').enabled() -+gst_check_dep = dependency('gstreamer-check-1.0', required : gst_check_required, version : '>=1.0.5') -+ - systemd_required = get_option('enable-systemd').enabled() - systemd_dep = dependency('systemd', required : systemd_required, version : '>=232') - --- -2.25.1 - diff --git a/package/gstreamer1/gstd/0003-Use-relative-symlink-for-gstd-gst-client-exe.patch b/package/gstreamer1/gstd/0003-Use-relative-symlink-for-gstd-gst-client-exe.patch deleted file mode 100644 index 265ea8d8c32..00000000000 --- a/package/gstreamer1/gstd/0003-Use-relative-symlink-for-gstd-gst-client-exe.patch +++ /dev/null @@ -1,38 +0,0 @@ -From a670beca8dcc76171dcfe3f10970d76c6f0439be Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Tue, 14 Sep 2021 02:49:10 -0600 -Subject: [PATCH] Use relative symlink for gstd/gst-client exe. - -This should fix the symlink path when cross compiling. - -Signed-off-by: James Hilliard -[Upstream status: -https://github.com/RidgeRun/gstd-1.x/pull/249] ---- - gst_client/gst_client_symbolic_link.sh | 2 +- - gstd/gstd_symbolic_link.sh | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gst_client/gst_client_symbolic_link.sh b/gst_client/gst_client_symbolic_link.sh -index d8d7617..b87dd12 100755 ---- a/gst_client/gst_client_symbolic_link.sh -+++ b/gst_client/gst_client_symbolic_link.sh -@@ -4,4 +4,4 @@ - # $1: target - # $2: link name - rm -f ${DESTDIR}${MESON_INSTALL_PREFIX}/$2 --ln -s ${DESTDIR}${MESON_INSTALL_PREFIX}/$1 ${DESTDIR}${MESON_INSTALL_PREFIX}/$2 -+ln -s --relative ${DESTDIR}${MESON_INSTALL_PREFIX}/$1 ${DESTDIR}${MESON_INSTALL_PREFIX}/$2 -diff --git a/gstd/gstd_symbolic_link.sh b/gstd/gstd_symbolic_link.sh -index d8d7617..b87dd12 100755 ---- a/gstd/gstd_symbolic_link.sh -+++ b/gstd/gstd_symbolic_link.sh -@@ -4,4 +4,4 @@ - # $1: target - # $2: link name - rm -f ${DESTDIR}${MESON_INSTALL_PREFIX}/$2 --ln -s ${DESTDIR}${MESON_INSTALL_PREFIX}/$1 ${DESTDIR}${MESON_INSTALL_PREFIX}/$2 -+ln -s --relative ${DESTDIR}${MESON_INSTALL_PREFIX}/$1 ${DESTDIR}${MESON_INSTALL_PREFIX}/$2 --- -2.25.1 - diff --git a/package/gstreamer1/gstd/0005-Use-native-meson-python-module-for-python-install.patch b/package/gstreamer1/gstd/0005-Use-native-meson-python-module-for-python-install.patch deleted file mode 100644 index a27d79a0e94..00000000000 --- a/package/gstreamer1/gstd/0005-Use-native-meson-python-module-for-python-install.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 1067f6138e947d18fd835e4a39f229ae2293f864 Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Tue, 14 Sep 2021 23:37:03 -0600 -Subject: [PATCH] Use native meson python module for python install. - -Signed-off-by: James Hilliard -[upstreeam: https://github.com/RidgeRun/gstd-1.x/pull/253] -Signed-off-by: Yann E. MORIN ---- - libgstc/meson.build | 4 +++- - libgstc/python/meson.build | 26 +++++++++++++++++++++++++- - meson_options.txt | 2 ++ - 3 files changed, 30 insertions(+), 2 deletions(-) - -diff --git a/libgstc/meson.build b/libgstc/meson.build -index e94dcd1..582cbb8 100644 ---- a/libgstc/meson.build -+++ b/libgstc/meson.build -@@ -1,2 +1,4 @@ - subdir('c') --subdir('python') -+if not get_option('enable-python').disabled() -+ subdir('python') -+endif -diff --git a/libgstc/python/meson.build b/libgstc/python/meson.build -index 057114b..24e3242 100644 ---- a/libgstc/python/meson.build -+++ b/libgstc/python/meson.build -@@ -1 +1,25 @@ --run_command('pip3', 'install', '.') -+pymod = import('python') -+python = pymod.find_installation( -+ get_option('with-python-version'), -+ required : get_option('enable-python').enabled(), -+ disabler : true -+) -+ -+pythonver = python.language_version() -+if pythonver.version_compare('<3.7') -+ error('Python @0@ is not supported anymore, please port your code to python3.7 or newer.'.format(python.language_version())) -+endif -+ -+pygstc_src_files = [ -+ 'pygstc/__init__.py', -+ 'pygstc/gstc.py', -+ 'pygstc/gstcerror.py', -+ 'pygstc/logger.py', -+ 'pygstc/tcp.py' -+] -+ -+python.install_sources( -+ pygstc_src_files, -+ subdir : 'pygstc', -+ pure : true -+) -diff --git a/meson_options.txt b/meson_options.txt -index f50e540..25292e6 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -4,6 +4,7 @@ option('enable-examples', type : 'feature', value : 'auto', yield : true, descri - option('enable-gtk-doc', type : 'boolean', value : false, description : 'Use gtk-doc to build documentation') - option('enable-systemd', type : 'feature', value : 'auto', description : 'Enable systemd gstd.service install') - option('enable-initd', type : 'feature', value : 'disabled', description : 'Enable init script install') -+option('enable-python', type : 'feature', value : 'auto', description : 'Install the pygstc library') - - # String options - option('with-gstd-runstatedir', type : 'string', value : '${prefix}/var/run/gstd', description : 'Specify the location of the gstd\'s PID file') -@@ -11,6 +12,7 @@ option('with-gstd-logstatedir', type : 'string', value : '${prefix}/var/log/gstd - option('with-gstd-systemddir', type : 'string', value : 'Systemd default systemduserunitdir', description : 'Specify the location of gstd.service file') - option('with-gstd-initddir', type : 'string', value : '${sysconfdir}/init.d', description : 'Specify the location of gstd init script') - option('with-statedir-owner', type : 'string', value : 'root', description : 'Specify the owner of gstd\'s run and log dirs created by the initd script') -+option('with-python-version', type : 'string', value : 'python3', description : 'Specify the python version for pygstc installation') - - # Common options - option('package-name', type : 'string', yield : true, --- -2.25.1 - diff --git a/package/gstreamer1/gstd/Config.in b/package/gstreamer1/gstd/Config.in index f36d25f11f1..df1d2f59c3c 100644 --- a/package/gstreamer1/gstd/Config.in +++ b/package/gstreamer1/gstd/Config.in @@ -1,12 +1,13 @@ config BR2_PACKAGE_GSTD bool "gstd" - depends on BR2_USE_WCHAR # libglib2 -> gettext, libsoup + depends on BR2_USE_WCHAR # libglib2 -> gettext, libedit, libsoup depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2, libsoup - depends on BR2_USE_MMU # libdaemon, libglib2 + depends on BR2_USE_MMU # libdaemon, libedit, libglib2 select BR2_PACKAGE_GSTREAMER1_GST_DEBUG # gst_debug_bin_to_dot_data select BR2_PACKAGE_JANSSON select BR2_PACKAGE_JSON_GLIB select BR2_PACKAGE_LIBDAEMON + select BR2_PACKAGE_LIBEDIT select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBSOUP select BR2_PACKAGE_READLINE diff --git a/package/gstreamer1/gstd/gstd.hash b/package/gstreamer1/gstd/gstd.hash index 6ec84bd58d2..632f83f8e8d 100644 --- a/package/gstreamer1/gstd/gstd.hash +++ b/package/gstreamer1/gstd/gstd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 94c10c798d3618b63cc68cbe053fabd19335a57f982a47b3d66c27c37d325da3 gstd-0.13.0.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 f4a83765d2cf2948c38abc5107ab07d49a01b4101047f188fed7204f1d4e49c7 gstd-0.15.0.tar.gz +sha256 10162be9f7ddb9e98c22c3edd0f78d62ab88f0ca8b1cc968bd85d5d665489d90 COPYING diff --git a/package/gstreamer1/gstd/gstd.mk b/package/gstreamer1/gstd/gstd.mk index 959e277272d..ccb3b3e1bc0 100644 --- a/package/gstreamer1/gstd/gstd.mk +++ b/package/gstreamer1/gstd/gstd.mk @@ -4,10 +4,10 @@ # ################################################################################ -GSTD_VERSION = 0.13.0 +GSTD_VERSION = 0.15.0 GSTD_SITE = $(call github,RidgeRun,gstd-1.x,v$(GSTD_VERSION)) GSTD_LICENSE_FILES = COPYING -GSTD_LICENSE = GPL-2.0+ +GSTD_LICENSE = LGPL-2.1+ GSTD_DEPENDENCIES = \ $(BR2_COREUTILS_HOST_DEPENDENCY) \ @@ -15,6 +15,7 @@ GSTD_DEPENDENCIES = \ jansson \ json-glib \ libdaemon \ + libedit \ libglib2 \ libsoup \ readline @@ -28,6 +29,8 @@ GSTD_CONF_OPTS = \ -Dwith-gstd-logstatedir=/var/log/gstd \ -Dwith-gstd-systemddir=/usr/lib/systemd/system +GSTD_CFLAGS = $(TARGET_CFLAGS) -std=gnu99 + ifeq ($(BR2_PACKAGE_SYSTEMD),y) GSTD_CONF_OPTS += -Denable-systemd=enabled -Denable-initd=disabled GSTD_DEPENDENCIES += systemd diff --git a/package/gstreamer1/gstreamer1-editing-services/Config.in b/package/gstreamer1/gstreamer1-editing-services/Config.in index 9c41e8142bd..e824781d47a 100644 --- a/package/gstreamer1/gstreamer1-editing-services/Config.in +++ b/package/gstreamer1/gstreamer1-editing-services/Config.in @@ -6,9 +6,8 @@ config BR2_PACKAGE_GSTREAMER1_EDITING_SERVICES select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOCONVERT # runtime select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOMIXER # runtime select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORESAMPLE # runtime - select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT # runtime + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERTSCALE # runtime select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC # runtime - select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE # runtime select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME # runtime select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_IMAGEFREEZE # runtime help diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash index 9662e6b8fb9..0cdb18ea5d1 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash @@ -1,5 +1,5 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.20.0.tar.xz.sha256sum -sha256 f837adcf4073d19a5908984e879cd039f4192ca368e71d39e8ccd8a56b9feedf gst-editing-services-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.22.2.tar.xz.sha256sum +sha256 453b1464fc3857de269a7cb0ebd966afe02171d97bef672a0b8a0a6d43e0cebf gst-editing-services-1.22.2.tar.xz # Hashes for license files: sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk index 5e03c08ae73..9fdc877db04 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.20.0 +GSTREAMER1_EDITING_SERVICES_VERSION = 1.22.2 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 f4a74a61250..f74832ce6a3 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.20.0.tar.xz.sha256sum -sha256 edf4bffff85591d4fff7b21bb9ed7f0feabc123ac4a4eff29e73cbce454f9db7 gstreamer-1.20.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.22.2.tar.xz.sha256sum +sha256 b2afe73603921c608ba48969dbb7d743776744bfe5d8059ece241137b7f88e21 gstreamer-1.22.2.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk index 86df5d6cf64..8584735129e 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.mk +++ b/package/gstreamer1/gstreamer1/gstreamer1.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_VERSION = 1.20.0 +GSTREAMER1_VERSION = 1.22.2 GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz GSTREAMER1_SITE = https://gstreamer.freedesktop.org/src/gstreamer GSTREAMER1_INSTALL_STAGING = YES diff --git a/package/gtest/0001-pkg-config-fix-gtest.pc-gmock.pc-library-names-for-t.patch b/package/gtest/0001-pkg-config-fix-gtest.pc-gmock.pc-library-names-for-t.patch deleted file mode 100644 index c47e8fc8f85..00000000000 --- a/package/gtest/0001-pkg-config-fix-gtest.pc-gmock.pc-library-names-for-t.patch +++ /dev/null @@ -1,62 +0,0 @@ -From cf5a3177159ca832470e7f876cab0a1923fa666f Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Fri, 22 Oct 2021 20:17:36 +0200 -Subject: [PATCH] pkg-config: fix gtest.pc/gmock.pc library names for the debug - build - -In case CMAKE_BUILD_TYPE is set to Debug the gtest library is -name libgtestd.a but the link command returned from gtest.pc is -'-lgtest' (without the debug d) and so the linking of dependent -packages fails (see [1] for a buildroot failure example). - -Enhance the gtest.pc ang gmock.pc generation to honour the debug 'd'. - -[1] http://lists.busybox.net/pipermail/buildroot/2021-October/626382.html - -[Upstream: https://github.com/google/googletest/pull/3625] -Signed-off-by: Peter Seiderer ---- - googlemock/cmake/gmock.pc.in | 2 +- - googletest/cmake/gtest.pc.in | 2 +- - googletest/cmake/internal_utils.cmake | 3 +++ - 3 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/googlemock/cmake/gmock.pc.in b/googlemock/cmake/gmock.pc.in -index 23c67b5c..0f469857 100644 ---- a/googlemock/cmake/gmock.pc.in -+++ b/googlemock/cmake/gmock.pc.in -@@ -6,5 +6,5 @@ Description: GoogleMock (without main() function) - Version: @PROJECT_VERSION@ - URL: https://github.com/google/googletest - Requires: gtest = @PROJECT_VERSION@ --Libs: -L${libdir} -lgmock @CMAKE_THREAD_LIBS_INIT@ -+Libs: -L${libdir} -lgmock@DEBUG_POSTFIX@ @CMAKE_THREAD_LIBS_INIT@ - Cflags: -I${includedir} @GTEST_HAS_PTHREAD_MACRO@ -diff --git a/googletest/cmake/gtest.pc.in b/googletest/cmake/gtest.pc.in -index b4148fae..225bba81 100644 ---- a/googletest/cmake/gtest.pc.in -+++ b/googletest/cmake/gtest.pc.in -@@ -5,5 +5,5 @@ Name: gtest - Description: GoogleTest (without main() function) - Version: @PROJECT_VERSION@ - URL: https://github.com/google/googletest --Libs: -L${libdir} -lgtest @CMAKE_THREAD_LIBS_INIT@ -+Libs: -L${libdir} -lgtest@DEBUG_POSTFIX@ @CMAKE_THREAD_LIBS_INIT@ - Cflags: -I${includedir} @GTEST_HAS_PTHREAD_MACRO@ -diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_utils.cmake -index 58fc9bfb..fd81b825 100644 ---- a/googletest/cmake/internal_utils.cmake -+++ b/googletest/cmake/internal_utils.cmake -@@ -335,6 +335,9 @@ function(install_project) - # Configure and install pkgconfig files. - foreach(t ${ARGN}) - set(configured_pc "${generated_dir}/${t}.pc") -+ if(CMAKE_BUILD_TYPE MATCHES Debug) -+ set(DEBUG_POSTFIX "d") -+ endif() - configure_file("${PROJECT_SOURCE_DIR}/cmake/${t}.pc.in" - "${configured_pc}" @ONLY) - install(FILES "${configured_pc}" --- -2.33.1 - diff --git a/package/gtest/Config.in b/package/gtest/Config.in index d8bcf6343f8..4591cb5e48b 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_4_9 # C++11 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++11 depends on BR2_USE_MMU # fork() help Google's framework for writing C++ tests on a variety of @@ -42,15 +42,9 @@ config BR2_PACKAGE_GTEST_GMOCK * works on Linux, Mac OS X, Windows, Windows Mobile, minGW, and Symbian. - There are both host and target packages. The target one has - include files required to compile the tests and the static - libraries required to link/run them. The host package installs - gmock_gen, a Python script used to generate code mocks. - endif # BR2_PACKAGE_GTEST -comment "gtest needs a toolchain w/ C++, wchar, threads, gcc >= 4.9" +comment "gtest needs a toolchain w/ C++, wchar, threads, gcc >= 5" depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 diff --git a/package/gtest/gtest.hash b/package/gtest/gtest.hash index d21fea71424..a6dd15a8d24 100644 --- a/package/gtest/gtest.hash +++ b/package/gtest/gtest.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 b4870bf121ff7795ba20d20bcdd8627b8e088f2d1dab299a031c1034eddc93d5 gtest-1.11.0.tar.gz +sha256 81964fe578e9bd7c94dfdb09c8e4d6e6759e19967e397dbea48d1c10e45d0df2 gtest-1.12.1.tar.gz sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 LICENSE diff --git a/package/gtest/gtest.mk b/package/gtest/gtest.mk index e7ce89a3f44..a53253228e6 100644 --- a/package/gtest/gtest.mk +++ b/package/gtest/gtest.mk @@ -4,7 +4,7 @@ # ################################################################################ -GTEST_VERSION = 1.11.0 +GTEST_VERSION = 1.12.1 GTEST_SITE = $(call github,google,googletest,release-$(GTEST_VERSION)) GTEST_INSTALL_STAGING = YES GTEST_INSTALL_TARGET = NO @@ -13,14 +13,6 @@ GTEST_LICENSE_FILES = LICENSE GTEST_CPE_ID_VENDOR = google GTEST_CPE_ID_PRODUCT = google_test -ifeq ($(BR2_PACKAGE_GTEST_GMOCK),y) -GTEST_DEPENDENCIES += host-gtest -endif - -HOST_GTEST_LICENSE = Apache-2.0 -HOST_GTEST_LICENSE_FILES = googlemock/scripts/generator/LICENSE -HOST_GTEST_DEPENDENCIES = host-python3 - # While it is possible to build gtest as shared library, using this gtest shared # library requires to set some special configure option in the project using # gtest. @@ -43,14 +35,4 @@ else GTEST_CONF_OPTS += -DBUILD_GMOCK=OFF endif -define HOST_GTEST_POST_INSTALL_PYTHON - $(INSTALL) -D -m 0755 $(@D)/googlemock/scripts/generator/gmock_gen.py \ - $(HOST_DIR)/bin/gmock_gen - cp -rp $(@D)/googlemock/scripts/generator/cpp \ - $(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages -endef - -HOST_GTEST_POST_INSTALL_HOOKS += HOST_GTEST_POST_INSTALL_PYTHON - $(eval $(cmake-package)) -$(eval $(host-cmake-package)) diff --git a/package/gtk2-engines/gtk2-engines.hash b/package/gtk2-engines/gtk2-engines.hash index 20125c706cb..71a0ecd2132 100644 --- a/package/gtk2-engines/gtk2-engines.hash +++ b/package/gtk2-engines/gtk2-engines.hash @@ -1,4 +1,4 @@ -# From http://ftp.gnome.org/pub/gnome/sources/gtk-engines/2.20/gtk-engines-2.20.2.sha256sum +# 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 index 5f145940b24..ea41bccaeaa 100644 --- a/package/gtk2-engines/gtk2-engines.mk +++ b/package/gtk2-engines/gtk2-engines.mk @@ -7,7 +7,7 @@ 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 = http://ftp.gnome.org/pub/GNOME/sources/gtk-engines/$(GTK2_ENGINES_VERSION_MAJOR) +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 diff --git a/package/gtkmm3/Config.in b/package/gtkmm3/Config.in index 3c1c6f36e85..6b924c856b7 100644 --- a/package/gtkmm3/Config.in +++ b/package/gtkmm3/Config.in @@ -1,7 +1,7 @@ -comment "gtkmm3 needs libgtk3 and a toolchain w/ C++, wchar, threads, gcc >= 7" +comment "gtkmm3 needs libgtk3 and a toolchain w/ C++, wchar, threads, gcc >= 4.9" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || !BR2_USE_WCHAR \ + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_USE_WCHAR \ || !BR2_INSTALL_LIBSTDCPP || !BR2_PACKAGE_LIBGTK3 \ || !BR2_TOOLCHAIN_HAS_THREADS @@ -14,16 +14,16 @@ config BR2_PACKAGE_GTKMM3 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_7 # libsigc + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 depends on BR2_TOOLCHAIN_HAS_THREADS # *mm/libgtk3 -> libglib2 depends on BR2_USE_MMU # *mm/libgtk3 -> libglib2 depends on BR2_USE_WCHAR # *mm/libgtk3 -> libglib2 depends on BR2_PACKAGE_LIBGTK3 - select BR2_PACKAGE_ATKMM - select BR2_PACKAGE_CAIROMM - select BR2_PACKAGE_GLIBMM - select BR2_PACKAGE_LIBSIGC - select BR2_PACKAGE_PANGOMM + select BR2_PACKAGE_ATKMM2_28 + select BR2_PACKAGE_CAIROMM1_14 + select BR2_PACKAGE_GLIBMM2_66 + select BR2_PACKAGE_LIBSIGC2 + select BR2_PACKAGE_PANGOMM2_46 help The gtkmm3 package is a set of C++ bindings for GTK 3. diff --git a/package/gtkmm3/gtkmm3.hash b/package/gtkmm3/gtkmm3.hash index 87c59b2cabb..fc7e33339e7 100644 --- a/package/gtkmm3/gtkmm3.hash +++ b/package/gtkmm3/gtkmm3.hash @@ -1,5 +1,5 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/gtkmm/3.22/gtkmm-3.22.0.sha256sum -sha256 05da4d4b628fb20c8384630ddf478a3b5562952b2d6181fe28d58f6cbc0514f5 gtkmm-3.22.0.tar.xz +# From https://download.gnome.org/sources/gtkmm/3.22/gtkmm-3.22.0.sha256sum +sha256 05da4d4b628fb20c8384630ddf478a3b5562952b2d6181fe28d58f6cbc0514f5 gtkmm-3.22.0.tar.xz # Locally computed sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING.tools diff --git a/package/gtkmm3/gtkmm3.mk b/package/gtkmm3/gtkmm3.mk index 009889142ea..8bbcf224e6a 100644 --- a/package/gtkmm3/gtkmm3.mk +++ b/package/gtkmm3/gtkmm3.mk @@ -7,10 +7,10 @@ GTKMM3_VERSION_MAJOR = 3.22 GTKMM3_VERSION = $(GTKMM3_VERSION_MAJOR).0 GTKMM3_SOURCE = gtkmm-$(GTKMM3_VERSION).tar.xz -GTKMM3_SITE = http://ftp.gnome.org/pub/gnome/sources/gtkmm/$(GTKMM3_VERSION_MAJOR) +GTKMM3_SITE = https://download.gnome.org/sources/gtkmm/$(GTKMM3_VERSION_MAJOR) GTKMM3_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) GTKMM3_LICENSE_FILES = COPYING COPYING.tools GTKMM3_INSTALL_STAGING = YES -GTKMM3_DEPENDENCIES = atkmm cairomm glibmm libgtk3 libsigc pangomm host-pkgconf +GTKMM3_DEPENDENCIES = atkmm2_28 cairomm1_14 glibmm2_66 libgtk3 libsigc2 pangomm2_46 host-pkgconf $(eval $(autotools-package)) diff --git a/package/gtksourceview/gtksourceview.hash b/package/gtksourceview/gtksourceview.hash index 3b78b7062b0..7a9cf006551 100644 --- a/package/gtksourceview/gtksourceview.hash +++ b/package/gtksourceview/gtksourceview.hash @@ -1,5 +1,5 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gtksourceview/3.24/gtksourceview-3.24.7.sha256sum: -sha256 a5c20d3a6347533689358f3ea52486409f6dd41d5a69c65eab7570cfaffee8e6 gtksourceview-3.24.7.tar.xz +# Hash from: https://download.gnome.org/sources/gtksourceview/3.24/gtksourceview-3.24.7.sha256sum: +sha256 a5c20d3a6347533689358f3ea52486409f6dd41d5a69c65eab7570cfaffee8e6 gtksourceview-3.24.7.tar.xz # Locally computed: -sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING diff --git a/package/gtksourceview/gtksourceview.mk b/package/gtksourceview/gtksourceview.mk index ae1d3ff2955..3f5aaea4ae9 100644 --- a/package/gtksourceview/gtksourceview.mk +++ b/package/gtksourceview/gtksourceview.mk @@ -8,7 +8,7 @@ GTKSOURCEVIEW_VERSION_MAJOR = 3.24 GTKSOURCEVIEW_VERSION = $(GTKSOURCEVIEW_VERSION_MAJOR).7 GTKSOURCEVIEW_SOURCE = gtksourceview-$(GTKSOURCEVIEW_VERSION).tar.xz GTKSOURCEVIEW_SITE = \ - http://ftp.gnome.org/pub/gnome/sources/gtksourceview/$(GTKSOURCEVIEW_VERSION_MAJOR) + https://download.gnome.org/sources/gtksourceview/$(GTKSOURCEVIEW_VERSION_MAJOR) GTKSOURCEVIEW_LICENSE = LGPL-2.1+ GTKSOURCEVIEW_LICENSE_FILES = COPYING GTKSOURCEVIEW_INSTALL_STAGING = YES diff --git a/package/guile/0003-module-system-base-target.scm-support-riscv32.patch b/package/guile/0003-module-system-base-target.scm-support-riscv32.patch deleted file mode 100644 index a988d2d9959..00000000000 --- a/package/guile/0003-module-system-base-target.scm-support-riscv32.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 6142350d7c0562b0525462abdd41309ae0faa2eb Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 6 Aug 2021 19:49:37 +0200 -Subject: [PATCH] module/system/base/target.scm: support riscv32 - -Fix the following build failure on riscv32: - -system/base/target.scm:132:16: In procedure triplet-pointer-size: -unknown CPU word size "riscv32" - -Fixes: - - http://autobuild.buildroot.org/results/6705630c1484239ec8b73d57ebc2e2570fbfc8f8 - -Signed-off-by: Fabrice Fontaine ---- - module/system/base/target.scm | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/module/system/base/target.scm b/module/system/base/target.scm -index 2088cd866..dba46664d 100644 ---- a/module/system/base/target.scm -+++ b/module/system/base/target.scm -@@ -116,6 +116,7 @@ - - ((string-match "^x86_64-.*-gnux32" triplet) 4) ; x32 - -+ ((string-match "32$" cpu) 4) - ((string-match "64$" cpu) 8) - ((string-match "64_?[lbe][lbe]$" cpu) 8) - ((member cpu '("sparc" "powerpc" "mips" "mipsel" "nios2" "m68k" "sh3" "sh4")) 4) --- -2.30.2 - diff --git a/package/guile/0004-Update-gnulib-to-8f4538a53d64054ae2fc8b86c0f87c418c6176e6.patch b/package/guile/0004-Update-gnulib-to-8f4538a53d64054ae2fc8b86c0f87c418c6176e6.patch deleted file mode 100644 index f471dbc5c03..00000000000 --- a/package/guile/0004-Update-gnulib-to-8f4538a53d64054ae2fc8b86c0f87c418c6176e6.patch +++ /dev/null @@ -1,13930 +0,0 @@ -From b4a80f4239b19fea4d2cc3e9d197f24b809f0624 Mon Sep 17 00:00:00 2001 -From: Daniel Llorens -Date: Mon, 16 Aug 2021 13:23:27 +0200 -Subject: Update gnulib to 8f4538a53d64054ae2fc8b86c0f87c418c6176e6 - -Includes gnulib:0c907f7da13232908f05c415b8cec56024071906 to fix #49930 -https://lists.gnu.org/archive/html/bug-guile/2021-08/msg00003.html. - -[Retrieved from: -https://git.savannah.gnu.org/cgit/guile.git/commit/?id=b4a80f4239b19fea4d2cc3e9d197f24b809f0624] -Signed-off-by: Fabrice Fontaine ---- - build-aux/announce-gen | 49 +- - build-aux/gendocs.sh | 6 +- - build-aux/git-version-gen | 8 +- - build-aux/gnupload | 17 +- - build-aux/useless-if-before-free | 18 +- - lib/Makefile.am | 986 ++++++++++++++++++++------------------- - lib/_Noreturn.h | 2 +- - lib/accept.c | 10 +- - lib/accept4.c | 14 +- - lib/alignof.h | 12 +- - lib/alloca.c | 4 +- - lib/alloca.in.h | 20 +- - lib/arpa_inet.in.h | 12 +- - lib/asnprintf.c | 14 +- - lib/assure.h | 10 +- - lib/attribute.h | 16 +- - lib/basename-lgpl.c | 10 +- - lib/basename-lgpl.h | 26 +- - lib/binary-io.c | 10 +- - lib/binary-io.h | 10 +- - lib/bind.c | 10 +- - lib/btowc.c | 10 +- - lib/byteswap.in.h | 10 +- - lib/c-ctype.c | 18 + - lib/c-ctype.h | 24 +- - lib/c-strcase.h | 12 +- - lib/c-strcasecmp.c | 12 +- - lib/c-strcaseeq.h | 14 +- - lib/c-strncasecmp.c | 12 +- - lib/canonicalize-lgpl.c | 3 +- - lib/cdefs.h | 43 +- - lib/ceil.c | 10 +- - lib/cloexec.c | 14 +- - lib/cloexec.h | 14 +- - lib/close.c | 10 +- - lib/connect.c | 10 +- - lib/copysign.c | 10 +- - lib/dirent.in.h | 111 +++-- - lib/dirfd.c | 10 +- - lib/dirname-lgpl.c | 10 +- - lib/dirname.h | 39 +- - lib/dup2.c | 10 +- - lib/duplocale.c | 10 +- - lib/dynarray.h | 20 +- - lib/errno.in.h | 12 +- - lib/fcntl.c | 10 +- - lib/fcntl.in.h | 10 +- - lib/fd-hook.c | 14 +- - lib/fd-hook.h | 14 +- - lib/float+.h | 12 +- - lib/float.c | 10 +- - lib/float.in.h | 10 +- - lib/floor.c | 10 +- - lib/free.c | 10 +- - lib/frexp.c | 10 +- - lib/fstat.c | 10 +- - lib/fsync.c | 14 +- - lib/full-read.c | 10 +- - lib/full-read.h | 10 +- - lib/full-write.c | 10 +- - lib/full-write.h | 10 +- - lib/gai_strerror.c | 12 +- - lib/getaddrinfo.c | 12 +- - lib/getdtablesize.c | 10 +- - lib/getlogin.c | 10 +- - lib/getpeername.c | 10 +- - lib/getrandom.c | 16 +- - lib/getsockname.c | 10 +- - lib/getsockopt.c | 10 +- - lib/gettext.h | 14 +- - lib/hard-locale.c | 10 +- - lib/hard-locale.h | 10 +- - lib/iconv.c | 14 +- - lib/iconv.in.h | 12 +- - lib/iconv_close.c | 14 +- - lib/iconv_open-aix.gperf | 14 +- - lib/iconv_open-hpux.gperf | 14 +- - lib/iconv_open-irix.gperf | 14 +- - lib/iconv_open-osf.gperf | 14 +- - lib/iconv_open-solaris.gperf | 14 +- - lib/iconv_open-zos.gperf | 14 +- - lib/iconv_open.c | 14 +- - lib/iconveh.h | 10 +- - lib/inet_ntop.c | 12 +- - lib/inet_pton.c | 10 +- - lib/inttypes.in.h | 10 +- - lib/isfinite.c | 14 +- - lib/isinf.c | 14 +- - lib/isnan.c | 10 +- - lib/isnand-nolibm.h | 10 +- - lib/isnand.c | 10 +- - lib/isnanf-nolibm.h | 10 +- - lib/isnanf.c | 10 +- - lib/isnanl-nolibm.h | 10 +- - lib/isnanl.c | 10 +- - lib/itold.c | 10 +- - lib/langinfo.in.h | 12 +- - lib/lc-charset-dispatch.c | 10 +- - lib/lc-charset-dispatch.h | 10 +- - lib/libc-config.h | 20 +- - lib/libunistring.valgrind | 22 +- - lib/limits.in.h | 28 +- - lib/link.c | 12 +- - lib/listen.c | 10 +- - lib/localcharset.c | 14 +- - lib/localcharset.h | 14 +- - lib/locale.in.h | 10 +- - lib/localeconv.c | 10 +- - lib/log.c | 10 +- - lib/log1p.c | 10 +- - lib/lstat.c | 10 +- - lib/malloc.c | 47 +- - lib/malloc/dynarray_at_failure.c | 3 +- - lib/malloca.c | 36 +- - lib/malloca.h | 36 +- - lib/math.c | 18 + - lib/math.in.h | 10 +- - lib/mbrtowc-impl-utf8.h | 10 +- - lib/mbrtowc-impl.h | 10 +- - lib/mbrtowc.c | 10 +- - lib/mbsinit.c | 10 +- - lib/mbtowc-impl.h | 10 +- - lib/mbtowc-lock.c | 10 +- - lib/mbtowc-lock.h | 10 +- - lib/mbtowc.c | 10 +- - lib/memchr.c | 24 +- - lib/memchr.valgrind | 10 +- - lib/mempcpy.c | 12 +- - lib/minmax.h | 12 +- - lib/mkdir.c | 10 +- - lib/mkostemp.c | 10 +- - lib/msvc-inval.c | 14 +- - lib/msvc-inval.h | 14 +- - lib/msvc-nothrow.c | 14 +- - lib/msvc-nothrow.h | 14 +- - lib/netdb.in.h | 12 +- - lib/netinet_in.in.h | 12 +- - lib/nl_langinfo-lock.c | 10 +- - lib/nl_langinfo.c | 10 +- - lib/nproc.c | 12 +- - lib/nproc.h | 12 +- - lib/nstrftime.c | 19 +- - lib/open.c | 10 +- - lib/pathmax.h | 12 +- - lib/pipe.c | 14 +- - lib/pipe2.c | 14 +- - lib/poll.c | 14 +- - lib/poll.in.h | 14 +- - lib/printf-args.c | 14 +- - lib/printf-args.h | 14 +- - lib/printf-parse.c | 25 +- - lib/printf-parse.h | 14 +- - lib/putenv.c | 10 +- - lib/raise.c | 10 +- - lib/rawmemchr.c | 10 +- - lib/rawmemchr.valgrind | 10 +- - lib/read.c | 10 +- - lib/readlink.c | 10 +- - lib/realloc.c | 68 +-- - lib/recv.c | 10 +- - lib/recvfrom.c | 10 +- - lib/regex_internal.c | 9 +- - lib/regexec.c | 12 +- - lib/rename.c | 10 +- - lib/rmdir.c | 10 +- - lib/round.c | 14 +- - lib/safe-read.c | 10 +- - lib/safe-read.h | 10 +- - lib/safe-write.c | 10 +- - lib/safe-write.h | 10 +- - lib/same-inode.h | 10 +- - lib/scratch_buffer.h | 20 +- - lib/select.c | 23 +- - lib/send.c | 10 +- - lib/sendto.c | 10 +- - lib/setenv.c | 10 +- - lib/setlocale-lock.c | 10 +- - lib/setlocale_null.c | 10 +- - lib/setlocale_null.h | 10 +- - lib/setsockopt.c | 10 +- - lib/shutdown.c | 10 +- - lib/signal.in.h | 10 +- - lib/signbitd.c | 10 +- - lib/signbitf.c | 10 +- - lib/signbitl.c | 10 +- - lib/size_max.h | 12 +- - lib/snprintf.c | 14 +- - lib/socket.c | 10 +- - lib/sockets.c | 10 +- - lib/sockets.h | 10 +- - lib/stat-time.c | 18 + - lib/stat-time.h | 10 +- - lib/stat-w32.c | 10 +- - lib/stat-w32.h | 10 +- - lib/stat.c | 10 +- - lib/stdalign.in.h | 12 +- - lib/stdbool.in.h | 12 +- - lib/stddef.in.h | 12 +- - lib/stdint.in.h | 16 +- - lib/stdio.in.h | 126 +++-- - lib/stdlib.in.h | 185 ++++++-- - lib/strdup.c | 14 +- - lib/streq.h | 14 +- - lib/strftime.h | 10 +- - lib/striconveh.c | 10 +- - lib/striconveh.h | 18 +- - lib/string.in.h | 68 ++- - lib/stripslash.c | 10 +- - lib/sys-limits.h | 12 +- - lib/sys_file.in.h | 12 +- - lib/sys_random.in.h | 12 +- - lib/sys_select.in.h | 12 +- - lib/sys_socket.c | 18 + - lib/sys_socket.in.h | 12 +- - lib/sys_stat.in.h | 12 +- - lib/sys_time.in.h | 12 +- - lib/sys_times.in.h | 12 +- - lib/sys_types.in.h | 12 +- - lib/sys_uio.in.h | 12 +- - lib/tempname.h | 10 +- - lib/time-internal.h | 14 +- - lib/time.in.h | 12 +- - lib/time_r.c | 14 +- - lib/time_rz.c | 14 +- - lib/times.c | 12 +- - lib/trunc.c | 10 +- - lib/tzset.c | 12 +- - lib/unistd.c | 18 + - lib/unistd.in.h | 25 +- - lib/unsetenv.c | 10 +- - lib/vasnprintf.c | 50 +- - lib/vasnprintf.h | 14 +- - lib/verify.h | 14 +- - lib/vsnprintf.c | 14 +- - lib/w32sock.h | 10 +- - lib/wchar.in.h | 63 ++- - lib/wcrtomb.c | 10 +- - lib/wctype-h.c | 19 + - lib/wctype.in.h | 22 +- - lib/windows-initguard.h | 12 +- - lib/write.c | 10 +- - lib/xalloc-oversized.h | 47 +- - lib/xsize.c | 18 + - lib/xsize.h | 12 +- - m4/arpa_inet_h.m4 | 31 +- - m4/dirent_h.m4 | 45 +- - m4/environ.m4 | 5 +- - m4/fcntl_h.m4 | 39 +- - m4/flock.m4 | 4 +- - m4/fstat.m4 | 4 +- - m4/getaddrinfo.m4 | 10 +- - m4/gnulib-common.m4 | 140 +++++- - m4/gnulib-comp.m4 | 140 ++++-- - m4/hostent.m4 | 4 +- - m4/iconv_h.m4 | 27 +- - m4/inttypes.m4 | 31 +- - m4/langinfo_h.m4 | 25 +- - m4/largefile.m4 | 28 +- - m4/limits-h.m4 | 3 +- - m4/locale_h.m4 | 37 +- - m4/malloc.m4 | 152 ++++-- - m4/math_h.m4 | 227 ++++----- - m4/memchr.m4 | 4 +- - m4/mempcpy.m4 | 4 +- - m4/mktime.m4 | 4 +- - m4/netdb_h.m4 | 25 +- - m4/poll_h.m4 | 29 +- - m4/printf.m4 | 5 +- - m4/rawmemchr.m4 | 4 +- - m4/realloc.m4 | 47 +- - m4/regex.m4 | 44 +- - m4/select.m4 | 4 +- - m4/servent.m4 | 4 +- - m4/signal_h.m4 | 33 +- - m4/sockpfaf.m4 | 6 +- - m4/stat.m4 | 4 +- - m4/stddef_h.m4 | 23 +- - m4/stdint.m4 | 6 +- - m4/stdio_h.m4 | 168 ++++--- - m4/stdlib_h.m4 | 116 +++-- - m4/strdup.m4 | 6 +- - m4/string_h.m4 | 124 ++--- - m4/sys_file_h.m4 | 29 +- - m4/sys_random_h.m4 | 25 +- - m4/sys_select_h.m4 | 29 +- - m4/sys_socket_h.m4 | 53 ++- - m4/sys_stat_h.m4 | 65 ++- - m4/sys_time_h.m4 | 34 +- - m4/sys_times_h.m4 | 25 +- - m4/sys_types_h.m4 | 16 +- - m4/sys_uio_h.m4 | 23 +- - m4/threadlib.m4 | 64 ++- - m4/time_h.m4 | 62 +-- - m4/time_r.m4 | 2 +- - m4/time_rz.m4 | 2 +- - m4/timegm.m4 | 4 +- - m4/tzset.m4 | 4 +- - m4/unistd_h.m4 | 194 ++++---- - m4/visibility.m4 | 6 +- - m4/wchar_h.m4 | 109 +++-- - m4/wctype_h.m4 | 39 +- - m4/wint_t.m4 | 10 +- - m4/year2038.m4 | 124 +++++ - maint.mk | 3 +- - 304 files changed, 4266 insertions(+), 3005 deletions(-) - create mode 100644 m4/year2038.m4 - -diff --git a/build-aux/announce-gen b/build-aux/announce-gen -index 84d2d63..f3b5461 100755 ---- a/build-aux/announce-gen -+++ b/build-aux/announce-gen -@@ -35,12 +35,14 @@ - eval 'exec perl -wSx "$0" "$@"' - if 0; - --my $VERSION = '2020-05-10 16:13'; # UTC -+my $VERSION = '2021-08-04 09:17'; # UTC - # The definition above must lie within the first 8 lines in order - # for the Emacs time-stamp write hook (at end) to update it. - # If you change this file with Emacs, please let the write hook - # do its job. Otherwise, update this string manually. - -+my $copyright_year = '2021'; -+ - use strict; - use Getopt::Long; - use POSIX qw(strftime); -@@ -49,12 +51,6 @@ use POSIX qw(strftime); - - my %valid_release_types = map {$_ => 1} qw (alpha beta stable); - my @archive_suffixes = qw (tar.gz tar.bz2 tar.lz tar.lzma tar.xz); --my %digest_classes = -- ( -- 'md5' => (eval { require Digest::MD5; } and 'Digest::MD5'), -- 'sha1' => ((eval { require Digest::SHA; } and 'Digest::SHA') -- or (eval { require Digest::SHA1; } and 'Digest::SHA1')) -- ); - my $srcdir = '.'; - - sub usage ($) -@@ -94,7 +90,7 @@ The following are optional: - VERSION is the result of running git describe - in the gnulib source directory. - required if gnulib is in TOOL_LIST. -- --no-print-checksums do not emit MD5 or SHA1 checksums -+ --no-print-checksums do not emit SHA1 or SHA256 checksums - --archive-suffix=SUF add SUF to the list of archive suffixes - --mail-headers=HEADERS a space-separated list of mail headers, e.g., - To: x\@example.com Cc: y-announce\@example.com,... -@@ -161,7 +157,7 @@ sub print_locations ($\@\%@) - - =item C. -+Print the SHA1 and SHA256 signature section for each C<@file>. - - =cut - -@@ -169,23 +165,18 @@ sub print_checksums (@) - { - my (@file) = @_; - -- print "Here are the MD5 and SHA1 checksums:\n"; -+ print "Here are the SHA1 and SHA256 checksums:\n"; - print "\n"; - -- foreach my $meth (qw (md5 sha1)) -+ use Digest::file qw(digest_file_hex digest_file_base64); -+ -+ foreach my $f (@file) - { -- my $class = $digest_classes{$meth} or next; -- foreach my $f (@file) -- { -- open IN, '<', $f -- or die "$ME: $f: cannot open for reading: $!\n"; -- binmode IN; -- my $dig = $class->new->addfile(*IN)->hexdigest; -- close IN; -- print "$dig $f\n"; -- } -+ print digest_file_hex($f, "SHA-1"), " $f\n"; -+ print digest_file_base64($f, "SHA-256"), " $f\n"; - } -- print "\n"; -+ print "\nThe SHA256 checksum is base64 encoded, instead of the\n"; -+ print "hexadecimal encoding that most checksum tools default to.\n\n"; - } - - =item C \@archive_suffixes, - - help => sub { usage 0 }, -- version => sub { print "$ME version $VERSION\n"; exit }, -+ version => -+ sub -+ { -+ print "$ME version $VERSION\n"; -+ print "Copyright (C) $copyright_year Free Software Foundation, Inc.\n"; -+ print "License GPLv3+: GNU GPL version 3 or later .\n" -+ . "This is free software: you are free to change and redistribute it.\n" -+ . "There is NO WARRANTY, to the extent permitted by law.\n"; -+ print "\n"; -+ my $author = "Jim Meyering"; -+ print "Written by $author.\n"; -+ exit -+ }, - ) or usage 1; - - my $fail = 0; -diff --git a/build-aux/gendocs.sh b/build-aux/gendocs.sh -index 1872de9..1241ee3 100755 ---- a/build-aux/gendocs.sh -+++ b/build-aux/gendocs.sh -@@ -2,7 +2,7 @@ - # gendocs.sh -- generate a GNU manual in many formats. This script is - # mentioned in maintain.texi. See the help message below for usage details. - --scriptversion=2021-01-01.00 -+scriptversion=2021-07-19.18 - - # Copyright 2003-2021 Free Software Foundation, Inc. - # -@@ -58,7 +58,7 @@ EMAIL=webmasters@gnu.org # please override with --email - commonarg= # passed to all makeinfo/texi2html invcations. - dirargs= # passed to all tools (-I dir). - dirs= # -I directories. --htmlarg="--css-ref=/software/gnulib/manual.css -c TOP_NODE_UP_URL=/manual" -+htmlarg="--css-ref=https://www.gnu.org/software/gnulib/manual.css -c TOP_NODE_UP_URL=/manual" - default_htmlarg=true - infoarg=--no-split - generate_ascii=true -@@ -202,7 +202,7 @@ base=$PACKAGE - - if $default_htmlarg && test -n "$use_texi2html"; then - # The legacy texi2html doesn't support TOP_NODE_UP_URL -- htmlarg="--css-ref=/software/gnulib/manual.css" -+ htmlarg="--css-ref=https://www.gnu.org/software/gnulib/manual.css" - fi - - if test -n "$srcfile"; then -diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen -index be0fc20..5e42afb 100755 ---- a/build-aux/git-version-gen -+++ b/build-aux/git-version-gen -@@ -75,10 +75,10 @@ me=$0 - year=`expr "$scriptversion" : '\([^-]*\)'` - version="git-version-gen $scriptversion - --Copyright $year Free Software Foundation, Inc. --There is NO warranty. You may redistribute this software --under the terms of the GNU General Public License. --For more information about these matters, see the files named COPYING." -+Copyright (C) ${year} Free Software Foundation, Inc. -+License GPLv3+: GNU GPL version 3 or later . -+This is free software: you are free to change and redistribute it. -+There is NO WARRANTY, to the extent permitted by law." - - usage="\ - Usage: $me [OPTION]... \$srcdir/.tarball-version [TAG-NORMALIZATION-SED-SCRIPT] -diff --git a/build-aux/gnupload b/build-aux/gnupload -index 434741d..e7822ae 100755 ---- a/build-aux/gnupload -+++ b/build-aux/gnupload -@@ -1,13 +1,13 @@ - #!/bin/sh - # Sign files and upload them. - --scriptversion=2018-05-19.18; # UTC -+scriptversion=2021-04-11.09; # UTC - - # Copyright (C) 2004-2021 Free Software Foundation, 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 3, or (at your option) -+# the Free Software Foundation; either version 2, or (at your option) - # any later version. - # - # This program is distributed in the hope that it will be useful, -@@ -27,8 +27,8 @@ set -e - GPG=gpg - # Choose the proper version of gpg, so as to avoid a - # "gpg-agent is not available in this session" error --# when gpg-agent is version 3 but gpg is still version 1. --# FIXME-2020: remove, once all major distros ship gpg version 3 as /usr/bin/gpg -+# when gpg-agent is version 2 but gpg is still version 1. -+# FIXME-2020: remove, once all major distros ship gpg version 2 as /usr/bin/gpg - gpg_agent_version=`(gpg-agent --version) 2>/dev/null | sed -e '2,$d' -e 's/^[^0-9]*//'` - case "$gpg_agent_version" in - 2.*) -@@ -145,6 +145,12 @@ the build-aux/ directory of the gnulib package - - Send patches and bug reports to ." - -+copyright_year=`echo "$scriptversion" | sed -e 's/[^0-9].*//'` -+copyright="Copyright (C) ${copyright_year} Free Software Foundation, Inc. -+License GPLv2+: GNU GPL version 2 or later . -+This is free software: you are free to change and redistribute it. -+There is NO WARRANTY, to the extent permitted by law." -+ - # Read local configuration file - if test -r "$conffile"; then - echo "$0: Reading configuration file $conffile" -@@ -209,7 +215,8 @@ while test -n "$1"; do - ;; - --version) - echo "gnupload $scriptversion" -- exit $? -+ echo "$copyright" -+ exit 0 - ;; - --) - shift -diff --git a/build-aux/useless-if-before-free b/build-aux/useless-if-before-free -index 784d80b..5bbbc44 100755 ---- a/build-aux/useless-if-before-free -+++ b/build-aux/useless-if-before-free -@@ -36,12 +36,14 @@ - eval 'exec perl -wSx "$0" "$@"' - if 0; - --my $VERSION = '2020-04-04 15:07'; # UTC -+my $VERSION = '2021-04-11 10:11'; # UTC - # The definition above must lie within the first 8 lines in order - # for the Emacs time-stamp write hook (at end) to update it. - # If you change this file with Emacs, please let the write hook - # do its job. Otherwise, update this string manually. - -+my $copyright_year = '2021'; -+ - use strict; - use warnings; - use Getopt::Long; -@@ -118,7 +120,19 @@ sub is_NULL ($) - GetOptions - ( - help => sub { usage 0 }, -- version => sub { print "$ME version $VERSION\n"; exit }, -+ version => -+ sub -+ { -+ print "$ME version $VERSION\n"; -+ print "Copyright (C) $copyright_year Free Software Foundation, Inc.\n"; -+ print "License GPLv3+: GNU GPL version 3 or later .\n" -+ . "This is free software: you are free to change and redistribute it.\n" -+ . "There is NO WARRANTY, to the extent permitted by law.\n"; -+ print "\n"; -+ my $author = "Jim Meyering"; -+ print "Written by $author.\n"; -+ exit -+ }, - list => \$list, - 'name=s@' => \@name, - ) or usage 1; -diff --git a/lib/Makefile.am b/lib/Makefile.am -index 02480f6..cb29c31 100644 ---- a/lib/Makefile.am -+++ b/lib/Makefile.am -@@ -288,8 +288,8 @@ arpa/inet.h: arpa_inet.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON - -e 's|@''HAVE_FEATURES_H''@|$(HAVE_FEATURES_H)|g' \ - -e 's|@''NEXT_ARPA_INET_H''@|$(NEXT_ARPA_INET_H)|g' \ - -e 's|@''HAVE_ARPA_INET_H''@|$(HAVE_ARPA_INET_H)|g' \ -- -e 's/@''GNULIB_INET_NTOP''@/$(GNULIB_INET_NTOP)/g' \ -- -e 's/@''GNULIB_INET_PTON''@/$(GNULIB_INET_PTON)/g' \ -+ -e 's/@''GNULIB_INET_NTOP''@/$(GL_GNULIB_INET_NTOP)/g' \ -+ -e 's/@''GNULIB_INET_PTON''@/$(GL_GNULIB_INET_PTON)/g' \ - -e 's|@''HAVE_WS2TCPIP_H''@|$(HAVE_WS2TCPIP_H)|g' \ - -e 's|@''HAVE_DECL_INET_NTOP''@|$(HAVE_DECL_INET_NTOP)|g' \ - -e 's|@''HAVE_DECL_INET_PTON''@|$(HAVE_DECL_INET_PTON)|g' \ -@@ -470,14 +470,14 @@ dirent.h: dirent.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_DIRENT_H''@|$(NEXT_DIRENT_H)|g' \ -- -e 's/@''GNULIB_OPENDIR''@/$(GNULIB_OPENDIR)/g' \ -- -e 's/@''GNULIB_READDIR''@/$(GNULIB_READDIR)/g' \ -- -e 's/@''GNULIB_REWINDDIR''@/$(GNULIB_REWINDDIR)/g' \ -- -e 's/@''GNULIB_CLOSEDIR''@/$(GNULIB_CLOSEDIR)/g' \ -- -e 's/@''GNULIB_DIRFD''@/$(GNULIB_DIRFD)/g' \ -- -e 's/@''GNULIB_FDOPENDIR''@/$(GNULIB_FDOPENDIR)/g' \ -- -e 's/@''GNULIB_SCANDIR''@/$(GNULIB_SCANDIR)/g' \ -- -e 's/@''GNULIB_ALPHASORT''@/$(GNULIB_ALPHASORT)/g' \ -+ -e 's/@''GNULIB_OPENDIR''@/$(GL_GNULIB_OPENDIR)/g' \ -+ -e 's/@''GNULIB_READDIR''@/$(GL_GNULIB_READDIR)/g' \ -+ -e 's/@''GNULIB_REWINDDIR''@/$(GL_GNULIB_REWINDDIR)/g' \ -+ -e 's/@''GNULIB_CLOSEDIR''@/$(GL_GNULIB_CLOSEDIR)/g' \ -+ -e 's/@''GNULIB_DIRFD''@/$(GL_GNULIB_DIRFD)/g' \ -+ -e 's/@''GNULIB_FDOPENDIR''@/$(GL_GNULIB_FDOPENDIR)/g' \ -+ -e 's/@''GNULIB_SCANDIR''@/$(GL_GNULIB_SCANDIR)/g' \ -+ -e 's/@''GNULIB_ALPHASORT''@/$(GL_GNULIB_ALPHASORT)/g' \ - -e 's/@''HAVE_OPENDIR''@/$(HAVE_OPENDIR)/g' \ - -e 's/@''HAVE_READDIR''@/$(HAVE_READDIR)/g' \ - -e 's/@''HAVE_REWINDDIR''@/$(HAVE_REWINDDIR)/g' \ -@@ -543,6 +543,32 @@ EXTRA_libgnu_la_SOURCES += duplocale.c - ## begin gnulib module dynarray - - if gl_GNULIB_ENABLED_dynarray -+BUILT_SOURCES += malloc/dynarray.gl.h malloc/dynarray-skeleton.gl.h -+ -+malloc/dynarray.gl.h: malloc/dynarray.h -+ $(AM_V_at)$(MKDIR_P) malloc -+ $(AM_V_GEN)rm -f $@-t $@ && \ -+ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ -+ sed -e '/libc_hidden_proto/d' < $(srcdir)/malloc/dynarray.h; \ -+ } > $@-t && \ -+ mv $@-t $@ -+MOSTLYCLEANFILES += malloc/dynarray.gl.h malloc/dynarray.gl.h-t -+ -+malloc/dynarray-skeleton.gl.h: malloc/dynarray-skeleton.c -+ $(AM_V_at)$(MKDIR_P) malloc -+ $(AM_V_GEN)rm -f $@-t $@ && \ -+ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ -+ sed -e 's|||g' \ -+ -e 's|__attribute_maybe_unused__|_GL_ATTRIBUTE_MAYBE_UNUSED|g' \ -+ -e 's|__attribute_nonnull__|_GL_ATTRIBUTE_NONNULL|g' \ -+ -e 's|__attribute_warn_unused_result__|_GL_ATTRIBUTE_NODISCARD|g' \ -+ -e 's|__glibc_likely|_GL_LIKELY|g' \ -+ -e 's|__glibc_unlikely|_GL_UNLIKELY|g' \ -+ < $(srcdir)/malloc/dynarray-skeleton.c; \ -+ } > $@-t && \ -+ mv $@-t $@ -+MOSTLYCLEANFILES += malloc/dynarray-skeleton.gl.h malloc/dynarray-skeleton.gl.h-t -+ - libgnu_la_SOURCES += malloc/dynarray_at_failure.c malloc/dynarray_emplace_enlarge.c malloc/dynarray_finalize.c malloc/dynarray_resize.c malloc/dynarray_resize_clear.c - - endif -@@ -620,13 +646,13 @@ fcntl.h: fcntl.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_FCNTL_H''@|$(NEXT_FCNTL_H)|g' \ -- -e 's/@''GNULIB_CREAT''@/$(GNULIB_CREAT)/g' \ -- -e 's/@''GNULIB_FCNTL''@/$(GNULIB_FCNTL)/g' \ -- -e 's/@''GNULIB_NONBLOCKING''@/$(GNULIB_NONBLOCKING)/g' \ -- -e 's/@''GNULIB_OPEN''@/$(GNULIB_OPEN)/g' \ -- -e 's/@''GNULIB_OPENAT''@/$(GNULIB_OPENAT)/g' \ -- -e 's/@''GNULIB_MDA_CREAT''@/$(GNULIB_MDA_CREAT)/g' \ -- -e 's/@''GNULIB_MDA_OPEN''@/$(GNULIB_MDA_OPEN)/g' \ -+ -e 's/@''GNULIB_CREAT''@/$(GL_GNULIB_CREAT)/g' \ -+ -e 's/@''GNULIB_FCNTL''@/$(GL_GNULIB_FCNTL)/g' \ -+ -e 's/@''GNULIB_NONBLOCKING''@/$(GL_GNULIB_NONBLOCKING)/g' \ -+ -e 's/@''GNULIB_OPEN''@/$(GL_GNULIB_OPEN)/g' \ -+ -e 's/@''GNULIB_OPENAT''@/$(GL_GNULIB_OPENAT)/g' \ -+ -e 's/@''GNULIB_MDA_CREAT''@/$(GL_GNULIB_MDA_CREAT)/g' \ -+ -e 's/@''GNULIB_MDA_OPEN''@/$(GL_GNULIB_MDA_OPEN)/g' \ - -e 's|@''HAVE_FCNTL''@|$(HAVE_FCNTL)|g' \ - -e 's|@''HAVE_OPENAT''@|$(HAVE_OPENAT)|g' \ - -e 's|@''REPLACE_CREAT''@|$(REPLACE_CREAT)|g' \ -@@ -930,7 +956,7 @@ iconv.h: iconv.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_ICONV_H''@|$(NEXT_ICONV_H)|g' \ -- -e 's/@''GNULIB_ICONV''@/$(GNULIB_ICONV)/g' \ -+ -e 's/@''GNULIB_ICONV''@/$(GL_GNULIB_ICONV)/g' \ - -e 's|@''ICONV_CONST''@|$(ICONV_CONST)|g' \ - -e 's|@''REPLACE_ICONV''@|$(REPLACE_ICONV)|g' \ - -e 's|@''REPLACE_ICONV_OPEN''@|$(REPLACE_ICONV_OPEN)|g' \ -@@ -984,10 +1010,8 @@ EXTRA_libgnu_la_SOURCES += iconv.c iconv_close.c iconv_open.c - - ## begin gnulib module idx - --if gl_GNULIB_ENABLED_idx - libgnu_la_SOURCES += idx.h - --endif - ## end gnulib module idx - - ## begin gnulib module inet_ntop -@@ -1031,10 +1055,10 @@ inttypes.h: inttypes.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_U - -e 's|@''NEXT_INTTYPES_H''@|$(NEXT_INTTYPES_H)|g' \ - -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \ - -e 's/@''PRIPTR_PREFIX''@/$(PRIPTR_PREFIX)/g' \ -- -e 's/@''GNULIB_IMAXABS''@/$(GNULIB_IMAXABS)/g' \ -- -e 's/@''GNULIB_IMAXDIV''@/$(GNULIB_IMAXDIV)/g' \ -- -e 's/@''GNULIB_STRTOIMAX''@/$(GNULIB_STRTOIMAX)/g' \ -- -e 's/@''GNULIB_STRTOUMAX''@/$(GNULIB_STRTOUMAX)/g' \ -+ -e 's/@''GNULIB_IMAXABS''@/$(GL_GNULIB_IMAXABS)/g' \ -+ -e 's/@''GNULIB_IMAXDIV''@/$(GL_GNULIB_IMAXDIV)/g' \ -+ -e 's/@''GNULIB_STRTOIMAX''@/$(GL_GNULIB_STRTOIMAX)/g' \ -+ -e 's/@''GNULIB_STRTOUMAX''@/$(GL_GNULIB_STRTOUMAX)/g' \ - -e 's/@''HAVE_DECL_IMAXABS''@/$(HAVE_DECL_IMAXABS)/g' \ - -e 's/@''HAVE_DECL_IMAXDIV''@/$(HAVE_DECL_IMAXDIV)/g' \ - -e 's/@''HAVE_DECL_STRTOIMAX''@/$(HAVE_DECL_STRTOIMAX)/g' \ -@@ -1151,7 +1175,7 @@ langinfo.h: langinfo.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_U - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_LANGINFO_H''@|$(NEXT_LANGINFO_H)|g' \ -- -e 's/@''GNULIB_NL_LANGINFO''@/$(GNULIB_NL_LANGINFO)/g' \ -+ -e 's/@''GNULIB_NL_LANGINFO''@/$(GL_GNULIB_NL_LANGINFO)/g' \ - -e 's|@''HAVE_LANGINFO_CODESET''@|$(HAVE_LANGINFO_CODESET)|g' \ - -e 's|@''HAVE_LANGINFO_T_FMT_AMPM''@|$(HAVE_LANGINFO_T_FMT_AMPM)|g' \ - -e 's|@''HAVE_LANGINFO_ALTMON''@|$(HAVE_LANGINFO_ALTMON)|g' \ -@@ -1264,11 +1288,11 @@ locale.h: locale.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_LOCALE_H''@|$(NEXT_LOCALE_H)|g' \ -- -e 's/@''GNULIB_LOCALECONV''@/$(GNULIB_LOCALECONV)/g' \ -- -e 's/@''GNULIB_SETLOCALE''@/$(GNULIB_SETLOCALE)/g' \ -- -e 's/@''GNULIB_SETLOCALE_NULL''@/$(GNULIB_SETLOCALE_NULL)/g' \ -- -e 's/@''GNULIB_DUPLOCALE''@/$(GNULIB_DUPLOCALE)/g' \ -- -e 's/@''GNULIB_LOCALENAME''@/$(GNULIB_LOCALENAME)/g' \ -+ -e 's/@''GNULIB_LOCALECONV''@/$(GL_GNULIB_LOCALECONV)/g' \ -+ -e 's/@''GNULIB_SETLOCALE''@/$(GL_GNULIB_SETLOCALE)/g' \ -+ -e 's/@''GNULIB_SETLOCALE_NULL''@/$(GL_GNULIB_SETLOCALE_NULL)/g' \ -+ -e 's/@''GNULIB_DUPLOCALE''@/$(GL_GNULIB_DUPLOCALE)/g' \ -+ -e 's/@''GNULIB_LOCALENAME''@/$(GL_GNULIB_LOCALENAME)/g' \ - -e 's|@''HAVE_NEWLOCALE''@|$(HAVE_NEWLOCALE)|g' \ - -e 's|@''HAVE_DUPLOCALE''@|$(HAVE_DUPLOCALE)|g' \ - -e 's|@''HAVE_FREELOCALE''@|$(HAVE_FREELOCALE)|g' \ -@@ -1379,108 +1403,108 @@ math.h: math.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $( - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_AS_FIRST_DIRECTIVE_MATH_H''@|$(NEXT_AS_FIRST_DIRECTIVE_MATH_H)|g' \ -- -e 's/@''GNULIB_ACOSF''@/$(GNULIB_ACOSF)/g' \ -- -e 's/@''GNULIB_ACOSL''@/$(GNULIB_ACOSL)/g' \ -- -e 's/@''GNULIB_ASINF''@/$(GNULIB_ASINF)/g' \ -- -e 's/@''GNULIB_ASINL''@/$(GNULIB_ASINL)/g' \ -- -e 's/@''GNULIB_ATANF''@/$(GNULIB_ATANF)/g' \ -- -e 's/@''GNULIB_ATANL''@/$(GNULIB_ATANL)/g' \ -- -e 's/@''GNULIB_ATAN2F''@/$(GNULIB_ATAN2F)/g' \ -- -e 's/@''GNULIB_CBRT''@/$(GNULIB_CBRT)/g' \ -- -e 's/@''GNULIB_CBRTF''@/$(GNULIB_CBRTF)/g' \ -- -e 's/@''GNULIB_CBRTL''@/$(GNULIB_CBRTL)/g' \ -- -e 's/@''GNULIB_CEIL''@/$(GNULIB_CEIL)/g' \ -- -e 's/@''GNULIB_CEILF''@/$(GNULIB_CEILF)/g' \ -- -e 's/@''GNULIB_CEILL''@/$(GNULIB_CEILL)/g' \ -- -e 's/@''GNULIB_COPYSIGN''@/$(GNULIB_COPYSIGN)/g' \ -- -e 's/@''GNULIB_COPYSIGNF''@/$(GNULIB_COPYSIGNF)/g' \ -- -e 's/@''GNULIB_COPYSIGNL''@/$(GNULIB_COPYSIGNL)/g' \ -- -e 's/@''GNULIB_COSF''@/$(GNULIB_COSF)/g' \ -- -e 's/@''GNULIB_COSL''@/$(GNULIB_COSL)/g' \ -- -e 's/@''GNULIB_COSHF''@/$(GNULIB_COSHF)/g' \ -- -e 's/@''GNULIB_EXPF''@/$(GNULIB_EXPF)/g' \ -- -e 's/@''GNULIB_EXPL''@/$(GNULIB_EXPL)/g' \ -- -e 's/@''GNULIB_EXP2''@/$(GNULIB_EXP2)/g' \ -- -e 's/@''GNULIB_EXP2F''@/$(GNULIB_EXP2F)/g' \ -- -e 's/@''GNULIB_EXP2L''@/$(GNULIB_EXP2L)/g' \ -- -e 's/@''GNULIB_EXPM1''@/$(GNULIB_EXPM1)/g' \ -- -e 's/@''GNULIB_EXPM1F''@/$(GNULIB_EXPM1F)/g' \ -- -e 's/@''GNULIB_EXPM1L''@/$(GNULIB_EXPM1L)/g' \ -- -e 's/@''GNULIB_FABSF''@/$(GNULIB_FABSF)/g' \ -- -e 's/@''GNULIB_FABSL''@/$(GNULIB_FABSL)/g' \ -- -e 's/@''GNULIB_FLOOR''@/$(GNULIB_FLOOR)/g' \ -- -e 's/@''GNULIB_FLOORF''@/$(GNULIB_FLOORF)/g' \ -- -e 's/@''GNULIB_FLOORL''@/$(GNULIB_FLOORL)/g' \ -- -e 's/@''GNULIB_FMA''@/$(GNULIB_FMA)/g' \ -- -e 's/@''GNULIB_FMAF''@/$(GNULIB_FMAF)/g' \ -- -e 's/@''GNULIB_FMAL''@/$(GNULIB_FMAL)/g' \ -- -e 's/@''GNULIB_FMOD''@/$(GNULIB_FMOD)/g' \ -- -e 's/@''GNULIB_FMODF''@/$(GNULIB_FMODF)/g' \ -- -e 's/@''GNULIB_FMODL''@/$(GNULIB_FMODL)/g' \ -- -e 's/@''GNULIB_FREXPF''@/$(GNULIB_FREXPF)/g' \ -- -e 's/@''GNULIB_FREXP''@/$(GNULIB_FREXP)/g' \ -- -e 's/@''GNULIB_FREXPL''@/$(GNULIB_FREXPL)/g' \ -- -e 's/@''GNULIB_HYPOT''@/$(GNULIB_HYPOT)/g' \ -- -e 's/@''GNULIB_HYPOTF''@/$(GNULIB_HYPOTF)/g' \ -- -e 's/@''GNULIB_HYPOTL''@/$(GNULIB_HYPOTL)/g' \ -+ -e 's/@''GNULIB_ACOSF''@/$(GL_GNULIB_ACOSF)/g' \ -+ -e 's/@''GNULIB_ACOSL''@/$(GL_GNULIB_ACOSL)/g' \ -+ -e 's/@''GNULIB_ASINF''@/$(GL_GNULIB_ASINF)/g' \ -+ -e 's/@''GNULIB_ASINL''@/$(GL_GNULIB_ASINL)/g' \ -+ -e 's/@''GNULIB_ATANF''@/$(GL_GNULIB_ATANF)/g' \ -+ -e 's/@''GNULIB_ATANL''@/$(GL_GNULIB_ATANL)/g' \ -+ -e 's/@''GNULIB_ATAN2F''@/$(GL_GNULIB_ATAN2F)/g' \ -+ -e 's/@''GNULIB_CBRT''@/$(GL_GNULIB_CBRT)/g' \ -+ -e 's/@''GNULIB_CBRTF''@/$(GL_GNULIB_CBRTF)/g' \ -+ -e 's/@''GNULIB_CBRTL''@/$(GL_GNULIB_CBRTL)/g' \ -+ -e 's/@''GNULIB_CEIL''@/$(GL_GNULIB_CEIL)/g' \ -+ -e 's/@''GNULIB_CEILF''@/$(GL_GNULIB_CEILF)/g' \ -+ -e 's/@''GNULIB_CEILL''@/$(GL_GNULIB_CEILL)/g' \ -+ -e 's/@''GNULIB_COPYSIGN''@/$(GL_GNULIB_COPYSIGN)/g' \ -+ -e 's/@''GNULIB_COPYSIGNF''@/$(GL_GNULIB_COPYSIGNF)/g' \ -+ -e 's/@''GNULIB_COPYSIGNL''@/$(GL_GNULIB_COPYSIGNL)/g' \ -+ -e 's/@''GNULIB_COSF''@/$(GL_GNULIB_COSF)/g' \ -+ -e 's/@''GNULIB_COSL''@/$(GL_GNULIB_COSL)/g' \ -+ -e 's/@''GNULIB_COSHF''@/$(GL_GNULIB_COSHF)/g' \ -+ -e 's/@''GNULIB_EXPF''@/$(GL_GNULIB_EXPF)/g' \ -+ -e 's/@''GNULIB_EXPL''@/$(GL_GNULIB_EXPL)/g' \ -+ -e 's/@''GNULIB_EXP2''@/$(GL_GNULIB_EXP2)/g' \ -+ -e 's/@''GNULIB_EXP2F''@/$(GL_GNULIB_EXP2F)/g' \ -+ -e 's/@''GNULIB_EXP2L''@/$(GL_GNULIB_EXP2L)/g' \ -+ -e 's/@''GNULIB_EXPM1''@/$(GL_GNULIB_EXPM1)/g' \ -+ -e 's/@''GNULIB_EXPM1F''@/$(GL_GNULIB_EXPM1F)/g' \ -+ -e 's/@''GNULIB_EXPM1L''@/$(GL_GNULIB_EXPM1L)/g' \ -+ -e 's/@''GNULIB_FABSF''@/$(GL_GNULIB_FABSF)/g' \ -+ -e 's/@''GNULIB_FABSL''@/$(GL_GNULIB_FABSL)/g' \ -+ -e 's/@''GNULIB_FLOOR''@/$(GL_GNULIB_FLOOR)/g' \ -+ -e 's/@''GNULIB_FLOORF''@/$(GL_GNULIB_FLOORF)/g' \ -+ -e 's/@''GNULIB_FLOORL''@/$(GL_GNULIB_FLOORL)/g' \ -+ -e 's/@''GNULIB_FMA''@/$(GL_GNULIB_FMA)/g' \ -+ -e 's/@''GNULIB_FMAF''@/$(GL_GNULIB_FMAF)/g' \ -+ -e 's/@''GNULIB_FMAL''@/$(GL_GNULIB_FMAL)/g' \ -+ -e 's/@''GNULIB_FMOD''@/$(GL_GNULIB_FMOD)/g' \ -+ -e 's/@''GNULIB_FMODF''@/$(GL_GNULIB_FMODF)/g' \ -+ -e 's/@''GNULIB_FMODL''@/$(GL_GNULIB_FMODL)/g' \ -+ -e 's/@''GNULIB_FREXPF''@/$(GL_GNULIB_FREXPF)/g' \ -+ -e 's/@''GNULIB_FREXP''@/$(GL_GNULIB_FREXP)/g' \ -+ -e 's/@''GNULIB_FREXPL''@/$(GL_GNULIB_FREXPL)/g' \ -+ -e 's/@''GNULIB_HYPOT''@/$(GL_GNULIB_HYPOT)/g' \ -+ -e 's/@''GNULIB_HYPOTF''@/$(GL_GNULIB_HYPOTF)/g' \ -+ -e 's/@''GNULIB_HYPOTL''@/$(GL_GNULIB_HYPOTL)/g' \ - < $(srcdir)/math.in.h | \ -- sed -e 's/@''GNULIB_ILOGB''@/$(GNULIB_ILOGB)/g' \ -- -e 's/@''GNULIB_ILOGBF''@/$(GNULIB_ILOGBF)/g' \ -- -e 's/@''GNULIB_ILOGBL''@/$(GNULIB_ILOGBL)/g' \ -- -e 's/@''GNULIB_ISFINITE''@/$(GNULIB_ISFINITE)/g' \ -- -e 's/@''GNULIB_ISINF''@/$(GNULIB_ISINF)/g' \ -- -e 's/@''GNULIB_ISNAN''@/$(GNULIB_ISNAN)/g' \ -- -e 's/@''GNULIB_ISNANF''@/$(GNULIB_ISNANF)/g' \ -- -e 's/@''GNULIB_ISNAND''@/$(GNULIB_ISNAND)/g' \ -- -e 's/@''GNULIB_ISNANL''@/$(GNULIB_ISNANL)/g' \ -- -e 's/@''GNULIB_LDEXPF''@/$(GNULIB_LDEXPF)/g' \ -- -e 's/@''GNULIB_LDEXPL''@/$(GNULIB_LDEXPL)/g' \ -- -e 's/@''GNULIB_LOG''@/$(GNULIB_LOG)/g' \ -- -e 's/@''GNULIB_LOGF''@/$(GNULIB_LOGF)/g' \ -- -e 's/@''GNULIB_LOGL''@/$(GNULIB_LOGL)/g' \ -- -e 's/@''GNULIB_LOG10''@/$(GNULIB_LOG10)/g' \ -- -e 's/@''GNULIB_LOG10F''@/$(GNULIB_LOG10F)/g' \ -- -e 's/@''GNULIB_LOG10L''@/$(GNULIB_LOG10L)/g' \ -- -e 's/@''GNULIB_LOG1P''@/$(GNULIB_LOG1P)/g' \ -- -e 's/@''GNULIB_LOG1PF''@/$(GNULIB_LOG1PF)/g' \ -- -e 's/@''GNULIB_LOG1PL''@/$(GNULIB_LOG1PL)/g' \ -- -e 's/@''GNULIB_LOG2''@/$(GNULIB_LOG2)/g' \ -- -e 's/@''GNULIB_LOG2F''@/$(GNULIB_LOG2F)/g' \ -- -e 's/@''GNULIB_LOG2L''@/$(GNULIB_LOG2L)/g' \ -- -e 's/@''GNULIB_LOGB''@/$(GNULIB_LOGB)/g' \ -- -e 's/@''GNULIB_LOGBF''@/$(GNULIB_LOGBF)/g' \ -- -e 's/@''GNULIB_LOGBL''@/$(GNULIB_LOGBL)/g' \ -- -e 's/@''GNULIB_MODF''@/$(GNULIB_MODF)/g' \ -- -e 's/@''GNULIB_MODFF''@/$(GNULIB_MODFF)/g' \ -- -e 's/@''GNULIB_MODFL''@/$(GNULIB_MODFL)/g' \ -- -e 's/@''GNULIB_POWF''@/$(GNULIB_POWF)/g' \ -- -e 's/@''GNULIB_REMAINDER''@/$(GNULIB_REMAINDER)/g' \ -- -e 's/@''GNULIB_REMAINDERF''@/$(GNULIB_REMAINDERF)/g' \ -- -e 's/@''GNULIB_REMAINDERL''@/$(GNULIB_REMAINDERL)/g' \ -- -e 's/@''GNULIB_RINT''@/$(GNULIB_RINT)/g' \ -- -e 's/@''GNULIB_RINTF''@/$(GNULIB_RINTF)/g' \ -- -e 's/@''GNULIB_RINTL''@/$(GNULIB_RINTL)/g' \ -- -e 's/@''GNULIB_ROUND''@/$(GNULIB_ROUND)/g' \ -- -e 's/@''GNULIB_ROUNDF''@/$(GNULIB_ROUNDF)/g' \ -- -e 's/@''GNULIB_ROUNDL''@/$(GNULIB_ROUNDL)/g' \ -- -e 's/@''GNULIB_SIGNBIT''@/$(GNULIB_SIGNBIT)/g' \ -- -e 's/@''GNULIB_SINF''@/$(GNULIB_SINF)/g' \ -- -e 's/@''GNULIB_SINL''@/$(GNULIB_SINL)/g' \ -- -e 's/@''GNULIB_SINHF''@/$(GNULIB_SINHF)/g' \ -- -e 's/@''GNULIB_SQRTF''@/$(GNULIB_SQRTF)/g' \ -- -e 's/@''GNULIB_SQRTL''@/$(GNULIB_SQRTL)/g' \ -- -e 's/@''GNULIB_TANF''@/$(GNULIB_TANF)/g' \ -- -e 's/@''GNULIB_TANL''@/$(GNULIB_TANL)/g' \ -- -e 's/@''GNULIB_TANHF''@/$(GNULIB_TANHF)/g' \ -- -e 's/@''GNULIB_TRUNC''@/$(GNULIB_TRUNC)/g' \ -- -e 's/@''GNULIB_TRUNCF''@/$(GNULIB_TRUNCF)/g' \ -- -e 's/@''GNULIB_TRUNCL''@/$(GNULIB_TRUNCL)/g' \ -- -e 's/@''GNULIB_MDA_J0''@/$(GNULIB_MDA_J0)/g' \ -- -e 's/@''GNULIB_MDA_J1''@/$(GNULIB_MDA_J1)/g' \ -- -e 's/@''GNULIB_MDA_JN''@/$(GNULIB_MDA_JN)/g' \ -- -e 's/@''GNULIB_MDA_Y0''@/$(GNULIB_MDA_Y0)/g' \ -- -e 's/@''GNULIB_MDA_Y1''@/$(GNULIB_MDA_Y1)/g' \ -- -e 's/@''GNULIB_MDA_YN''@/$(GNULIB_MDA_YN)/g' \ -+ sed -e 's/@''GNULIB_ILOGB''@/$(GL_GNULIB_ILOGB)/g' \ -+ -e 's/@''GNULIB_ILOGBF''@/$(GL_GNULIB_ILOGBF)/g' \ -+ -e 's/@''GNULIB_ILOGBL''@/$(GL_GNULIB_ILOGBL)/g' \ -+ -e 's/@''GNULIB_ISFINITE''@/$(GL_GNULIB_ISFINITE)/g' \ -+ -e 's/@''GNULIB_ISINF''@/$(GL_GNULIB_ISINF)/g' \ -+ -e 's/@''GNULIB_ISNAN''@/$(GL_GNULIB_ISNAN)/g' \ -+ -e 's/@''GNULIB_ISNANF''@/$(GL_GNULIB_ISNANF)/g' \ -+ -e 's/@''GNULIB_ISNAND''@/$(GL_GNULIB_ISNAND)/g' \ -+ -e 's/@''GNULIB_ISNANL''@/$(GL_GNULIB_ISNANL)/g' \ -+ -e 's/@''GNULIB_LDEXPF''@/$(GL_GNULIB_LDEXPF)/g' \ -+ -e 's/@''GNULIB_LDEXPL''@/$(GL_GNULIB_LDEXPL)/g' \ -+ -e 's/@''GNULIB_LOG''@/$(GL_GNULIB_LOG)/g' \ -+ -e 's/@''GNULIB_LOGF''@/$(GL_GNULIB_LOGF)/g' \ -+ -e 's/@''GNULIB_LOGL''@/$(GL_GNULIB_LOGL)/g' \ -+ -e 's/@''GNULIB_LOG10''@/$(GL_GNULIB_LOG10)/g' \ -+ -e 's/@''GNULIB_LOG10F''@/$(GL_GNULIB_LOG10F)/g' \ -+ -e 's/@''GNULIB_LOG10L''@/$(GL_GNULIB_LOG10L)/g' \ -+ -e 's/@''GNULIB_LOG1P''@/$(GL_GNULIB_LOG1P)/g' \ -+ -e 's/@''GNULIB_LOG1PF''@/$(GL_GNULIB_LOG1PF)/g' \ -+ -e 's/@''GNULIB_LOG1PL''@/$(GL_GNULIB_LOG1PL)/g' \ -+ -e 's/@''GNULIB_LOG2''@/$(GL_GNULIB_LOG2)/g' \ -+ -e 's/@''GNULIB_LOG2F''@/$(GL_GNULIB_LOG2F)/g' \ -+ -e 's/@''GNULIB_LOG2L''@/$(GL_GNULIB_LOG2L)/g' \ -+ -e 's/@''GNULIB_LOGB''@/$(GL_GNULIB_LOGB)/g' \ -+ -e 's/@''GNULIB_LOGBF''@/$(GL_GNULIB_LOGBF)/g' \ -+ -e 's/@''GNULIB_LOGBL''@/$(GL_GNULIB_LOGBL)/g' \ -+ -e 's/@''GNULIB_MODF''@/$(GL_GNULIB_MODF)/g' \ -+ -e 's/@''GNULIB_MODFF''@/$(GL_GNULIB_MODFF)/g' \ -+ -e 's/@''GNULIB_MODFL''@/$(GL_GNULIB_MODFL)/g' \ -+ -e 's/@''GNULIB_POWF''@/$(GL_GNULIB_POWF)/g' \ -+ -e 's/@''GNULIB_REMAINDER''@/$(GL_GNULIB_REMAINDER)/g' \ -+ -e 's/@''GNULIB_REMAINDERF''@/$(GL_GNULIB_REMAINDERF)/g' \ -+ -e 's/@''GNULIB_REMAINDERL''@/$(GL_GNULIB_REMAINDERL)/g' \ -+ -e 's/@''GNULIB_RINT''@/$(GL_GNULIB_RINT)/g' \ -+ -e 's/@''GNULIB_RINTF''@/$(GL_GNULIB_RINTF)/g' \ -+ -e 's/@''GNULIB_RINTL''@/$(GL_GNULIB_RINTL)/g' \ -+ -e 's/@''GNULIB_ROUND''@/$(GL_GNULIB_ROUND)/g' \ -+ -e 's/@''GNULIB_ROUNDF''@/$(GL_GNULIB_ROUNDF)/g' \ -+ -e 's/@''GNULIB_ROUNDL''@/$(GL_GNULIB_ROUNDL)/g' \ -+ -e 's/@''GNULIB_SIGNBIT''@/$(GL_GNULIB_SIGNBIT)/g' \ -+ -e 's/@''GNULIB_SINF''@/$(GL_GNULIB_SINF)/g' \ -+ -e 's/@''GNULIB_SINL''@/$(GL_GNULIB_SINL)/g' \ -+ -e 's/@''GNULIB_SINHF''@/$(GL_GNULIB_SINHF)/g' \ -+ -e 's/@''GNULIB_SQRTF''@/$(GL_GNULIB_SQRTF)/g' \ -+ -e 's/@''GNULIB_SQRTL''@/$(GL_GNULIB_SQRTL)/g' \ -+ -e 's/@''GNULIB_TANF''@/$(GL_GNULIB_TANF)/g' \ -+ -e 's/@''GNULIB_TANL''@/$(GL_GNULIB_TANL)/g' \ -+ -e 's/@''GNULIB_TANHF''@/$(GL_GNULIB_TANHF)/g' \ -+ -e 's/@''GNULIB_TRUNC''@/$(GL_GNULIB_TRUNC)/g' \ -+ -e 's/@''GNULIB_TRUNCF''@/$(GL_GNULIB_TRUNCF)/g' \ -+ -e 's/@''GNULIB_TRUNCL''@/$(GL_GNULIB_TRUNCL)/g' \ -+ -e 's/@''GNULIB_MDA_J0''@/$(GL_GNULIB_MDA_J0)/g' \ -+ -e 's/@''GNULIB_MDA_J1''@/$(GL_GNULIB_MDA_J1)/g' \ -+ -e 's/@''GNULIB_MDA_JN''@/$(GL_GNULIB_MDA_JN)/g' \ -+ -e 's/@''GNULIB_MDA_Y0''@/$(GL_GNULIB_MDA_Y0)/g' \ -+ -e 's/@''GNULIB_MDA_Y1''@/$(GL_GNULIB_MDA_Y1)/g' \ -+ -e 's/@''GNULIB_MDA_YN''@/$(GL_GNULIB_MDA_YN)/g' \ - | \ - sed -e 's|@''HAVE_ACOSF''@|$(HAVE_ACOSF)|g' \ - -e 's|@''HAVE_ACOSL''@|$(HAVE_ACOSL)|g' \ -@@ -1804,7 +1828,7 @@ netdb.h: netdb.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_NETDB_H''@|$(NEXT_NETDB_H)|g' \ - -e 's|@''HAVE_NETDB_H''@|$(HAVE_NETDB_H)|g' \ -- -e 's/@''GNULIB_GETADDRINFO''@/$(GNULIB_GETADDRINFO)/g' \ -+ -e 's/@''GNULIB_GETADDRINFO''@/$(GL_GNULIB_GETADDRINFO)/g' \ - -e 's|@''HAVE_STRUCT_ADDRINFO''@|$(HAVE_STRUCT_ADDRINFO)|g' \ - -e 's|@''HAVE_DECL_FREEADDRINFO''@|$(HAVE_DECL_FREEADDRINFO)|g' \ - -e 's|@''HAVE_DECL_GAI_STRERROR''@|$(HAVE_DECL_GAI_STRERROR)|g' \ -@@ -1937,7 +1961,7 @@ poll.h: poll.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_POLL_H''@|$(NEXT_POLL_H)|g' \ -- -e 's/@''GNULIB_POLL''@/$(GNULIB_POLL)/g' \ -+ -e 's/@''GNULIB_POLL''@/$(GL_GNULIB_POLL)/g' \ - -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \ - -e 's|@''HAVE_POLL''@|$(HAVE_POLL)|g' \ - -e 's|@''REPLACE_POLL''@|$(REPLACE_POLL)|g' \ -@@ -2098,6 +2122,21 @@ EXTRA_DIST += same-inode.h - ## begin gnulib module scratch_buffer - - if gl_GNULIB_ENABLED_scratch_buffer -+BUILT_SOURCES += malloc/scratch_buffer.gl.h -+ -+malloc/scratch_buffer.gl.h: malloc/scratch_buffer.h -+ $(AM_V_at)$(MKDIR_P) malloc -+ $(AM_V_GEN)rm -f $@-t $@ && \ -+ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ -+ sed -e 's|__always_inline|inline _GL_ATTRIBUTE_ALWAYS_INLINE|g' \ -+ -e 's|__glibc_likely|_GL_LIKELY|g' \ -+ -e 's|__glibc_unlikely|_GL_UNLIKELY|g' \ -+ -e '/libc_hidden_proto/d' \ -+ < $(srcdir)/malloc/scratch_buffer.h; \ -+ } > $@-t && \ -+ mv $@-t $@ -+MOSTLYCLEANFILES += malloc/scratch_buffer.gl.h malloc/scratch_buffer.gl.h-t -+ - libgnu_la_SOURCES += malloc/scratch_buffer_dupfree.c malloc/scratch_buffer_grow.c malloc/scratch_buffer_grow_preserve.c malloc/scratch_buffer_set_array_size.c - - endif -@@ -2185,11 +2224,11 @@ signal.h: signal.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_SIGNAL_H''@|$(NEXT_SIGNAL_H)|g' \ -- -e 's/@''GNULIB_PTHREAD_SIGMASK''@/$(GNULIB_PTHREAD_SIGMASK)/g' \ -- -e 's/@''GNULIB_RAISE''@/$(GNULIB_RAISE)/g' \ -- -e 's/@''GNULIB_SIGNAL_H_SIGPIPE''@/$(GNULIB_SIGNAL_H_SIGPIPE)/g' \ -- -e 's/@''GNULIB_SIGPROCMASK''@/$(GNULIB_SIGPROCMASK)/g' \ -- -e 's/@''GNULIB_SIGACTION''@/$(GNULIB_SIGACTION)/g' \ -+ -e 's/@''GNULIB_PTHREAD_SIGMASK''@/$(GL_GNULIB_PTHREAD_SIGMASK)/g' \ -+ -e 's/@''GNULIB_RAISE''@/$(GL_GNULIB_RAISE)/g' \ -+ -e 's/@''GNULIB_SIGNAL_H_SIGPIPE''@/$(GL_GNULIB_SIGNAL_H_SIGPIPE)/g' \ -+ -e 's/@''GNULIB_SIGPROCMASK''@/$(GL_GNULIB_SIGPROCMASK)/g' \ -+ -e 's/@''GNULIB_SIGACTION''@/$(GL_GNULIB_SIGACTION)/g' \ - -e 's|@''HAVE_POSIX_SIGNALBLOCKING''@|$(HAVE_POSIX_SIGNALBLOCKING)|g' \ - -e 's|@''HAVE_PTHREAD_SIGMASK''@|$(HAVE_PTHREAD_SIGMASK)|g' \ - -e 's|@''HAVE_RAISE''@|$(HAVE_RAISE)|g' \ -@@ -2442,7 +2481,7 @@ stdint.h: stdint.in.h $(top_builddir)/config.status - -e 's/@''BITSIZEOF_WINT_T''@/$(BITSIZEOF_WINT_T)/g' \ - -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \ - -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \ -- -e 's/@''GNULIB_OVERRIDES_WINT_T''@/$(GNULIB_OVERRIDES_WINT_T)/g' \ -+ -e 's/@''GNULIBHEADERS_OVERRIDE_WINT_T''@/$(GNULIBHEADERS_OVERRIDE_WINT_T)/g' \ - < $(srcdir)/stdint.in.h; \ - } > $@-t && \ - mv $@-t $@ -@@ -2470,65 +2509,65 @@ stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_STDIO_H''@|$(NEXT_STDIO_H)|g' \ -- -e 's/@''GNULIB_DPRINTF''@/$(GNULIB_DPRINTF)/g' \ -- -e 's/@''GNULIB_FCLOSE''@/$(GNULIB_FCLOSE)/g' \ -- -e 's/@''GNULIB_FDOPEN''@/$(GNULIB_FDOPEN)/g' \ -- -e 's/@''GNULIB_FFLUSH''@/$(GNULIB_FFLUSH)/g' \ -- -e 's/@''GNULIB_FGETC''@/$(GNULIB_FGETC)/g' \ -- -e 's/@''GNULIB_FGETS''@/$(GNULIB_FGETS)/g' \ -- -e 's/@''GNULIB_FOPEN''@/$(GNULIB_FOPEN)/g' \ -- -e 's/@''GNULIB_FPRINTF''@/$(GNULIB_FPRINTF)/g' \ -- -e 's/@''GNULIB_FPRINTF_POSIX''@/$(GNULIB_FPRINTF_POSIX)/g' \ -- -e 's/@''GNULIB_FPURGE''@/$(GNULIB_FPURGE)/g' \ -- -e 's/@''GNULIB_FPUTC''@/$(GNULIB_FPUTC)/g' \ -- -e 's/@''GNULIB_FPUTS''@/$(GNULIB_FPUTS)/g' \ -- -e 's/@''GNULIB_FREAD''@/$(GNULIB_FREAD)/g' \ -- -e 's/@''GNULIB_FREOPEN''@/$(GNULIB_FREOPEN)/g' \ -- -e 's/@''GNULIB_FSCANF''@/$(GNULIB_FSCANF)/g' \ -- -e 's/@''GNULIB_FSEEK''@/$(GNULIB_FSEEK)/g' \ -- -e 's/@''GNULIB_FSEEKO''@/$(GNULIB_FSEEKO)/g' \ -- -e 's/@''GNULIB_FTELL''@/$(GNULIB_FTELL)/g' \ -- -e 's/@''GNULIB_FTELLO''@/$(GNULIB_FTELLO)/g' \ -- -e 's/@''GNULIB_FWRITE''@/$(GNULIB_FWRITE)/g' \ -- -e 's/@''GNULIB_GETC''@/$(GNULIB_GETC)/g' \ -- -e 's/@''GNULIB_GETCHAR''@/$(GNULIB_GETCHAR)/g' \ -- -e 's/@''GNULIB_GETDELIM''@/$(GNULIB_GETDELIM)/g' \ -- -e 's/@''GNULIB_GETLINE''@/$(GNULIB_GETLINE)/g' \ -- -e 's/@''GNULIB_OBSTACK_PRINTF''@/$(GNULIB_OBSTACK_PRINTF)/g' \ -- -e 's/@''GNULIB_OBSTACK_PRINTF_POSIX''@/$(GNULIB_OBSTACK_PRINTF_POSIX)/g' \ -- -e 's/@''GNULIB_PCLOSE''@/$(GNULIB_PCLOSE)/g' \ -- -e 's/@''GNULIB_PERROR''@/$(GNULIB_PERROR)/g' \ -- -e 's/@''GNULIB_POPEN''@/$(GNULIB_POPEN)/g' \ -- -e 's/@''GNULIB_PRINTF''@/$(GNULIB_PRINTF)/g' \ -- -e 's/@''GNULIB_PRINTF_POSIX''@/$(GNULIB_PRINTF_POSIX)/g' \ -- -e 's/@''GNULIB_PUTC''@/$(GNULIB_PUTC)/g' \ -- -e 's/@''GNULIB_PUTCHAR''@/$(GNULIB_PUTCHAR)/g' \ -- -e 's/@''GNULIB_PUTS''@/$(GNULIB_PUTS)/g' \ -- -e 's/@''GNULIB_REMOVE''@/$(GNULIB_REMOVE)/g' \ -- -e 's/@''GNULIB_RENAME''@/$(GNULIB_RENAME)/g' \ -- -e 's/@''GNULIB_RENAMEAT''@/$(GNULIB_RENAMEAT)/g' \ -- -e 's/@''GNULIB_SCANF''@/$(GNULIB_SCANF)/g' \ -- -e 's/@''GNULIB_SNPRINTF''@/$(GNULIB_SNPRINTF)/g' \ -- -e 's/@''GNULIB_SPRINTF_POSIX''@/$(GNULIB_SPRINTF_POSIX)/g' \ -- -e 's/@''GNULIB_STDIO_H_NONBLOCKING''@/$(GNULIB_STDIO_H_NONBLOCKING)/g' \ -- -e 's/@''GNULIB_STDIO_H_SIGPIPE''@/$(GNULIB_STDIO_H_SIGPIPE)/g' \ -- -e 's/@''GNULIB_TMPFILE''@/$(GNULIB_TMPFILE)/g' \ -- -e 's/@''GNULIB_VASPRINTF''@/$(GNULIB_VASPRINTF)/g' \ -- -e 's/@''GNULIB_VDPRINTF''@/$(GNULIB_VDPRINTF)/g' \ -- -e 's/@''GNULIB_VFPRINTF''@/$(GNULIB_VFPRINTF)/g' \ -- -e 's/@''GNULIB_VFPRINTF_POSIX''@/$(GNULIB_VFPRINTF_POSIX)/g' \ -- -e 's/@''GNULIB_VFSCANF''@/$(GNULIB_VFSCANF)/g' \ -- -e 's/@''GNULIB_VSCANF''@/$(GNULIB_VSCANF)/g' \ -- -e 's/@''GNULIB_VPRINTF''@/$(GNULIB_VPRINTF)/g' \ -- -e 's/@''GNULIB_VPRINTF_POSIX''@/$(GNULIB_VPRINTF_POSIX)/g' \ -- -e 's/@''GNULIB_VSNPRINTF''@/$(GNULIB_VSNPRINTF)/g' \ -- -e 's/@''GNULIB_VSPRINTF_POSIX''@/$(GNULIB_VSPRINTF_POSIX)/g' \ -- -e 's/@''GNULIB_MDA_FCLOSEALL''@/$(GNULIB_MDA_FCLOSEALL)/g' \ -- -e 's/@''GNULIB_MDA_FDOPEN''@/$(GNULIB_MDA_FDOPEN)/g' \ -- -e 's/@''GNULIB_MDA_FILENO''@/$(GNULIB_MDA_FILENO)/g' \ -- -e 's/@''GNULIB_MDA_GETW''@/$(GNULIB_MDA_GETW)/g' \ -- -e 's/@''GNULIB_MDA_PUTW''@/$(GNULIB_MDA_PUTW)/g' \ -- -e 's/@''GNULIB_MDA_TEMPNAM''@/$(GNULIB_MDA_TEMPNAM)/g' \ -+ -e 's/@''GNULIB_DPRINTF''@/$(GL_GNULIB_DPRINTF)/g' \ -+ -e 's/@''GNULIB_FCLOSE''@/$(GL_GNULIB_FCLOSE)/g' \ -+ -e 's/@''GNULIB_FDOPEN''@/$(GL_GNULIB_FDOPEN)/g' \ -+ -e 's/@''GNULIB_FFLUSH''@/$(GL_GNULIB_FFLUSH)/g' \ -+ -e 's/@''GNULIB_FGETC''@/$(GL_GNULIB_FGETC)/g' \ -+ -e 's/@''GNULIB_FGETS''@/$(GL_GNULIB_FGETS)/g' \ -+ -e 's/@''GNULIB_FOPEN''@/$(GL_GNULIB_FOPEN)/g' \ -+ -e 's/@''GNULIB_FPRINTF''@/$(GL_GNULIB_FPRINTF)/g' \ -+ -e 's/@''GNULIB_FPRINTF_POSIX''@/$(GL_GNULIB_FPRINTF_POSIX)/g' \ -+ -e 's/@''GNULIB_FPURGE''@/$(GL_GNULIB_FPURGE)/g' \ -+ -e 's/@''GNULIB_FPUTC''@/$(GL_GNULIB_FPUTC)/g' \ -+ -e 's/@''GNULIB_FPUTS''@/$(GL_GNULIB_FPUTS)/g' \ -+ -e 's/@''GNULIB_FREAD''@/$(GL_GNULIB_FREAD)/g' \ -+ -e 's/@''GNULIB_FREOPEN''@/$(GL_GNULIB_FREOPEN)/g' \ -+ -e 's/@''GNULIB_FSCANF''@/$(GL_GNULIB_FSCANF)/g' \ -+ -e 's/@''GNULIB_FSEEK''@/$(GL_GNULIB_FSEEK)/g' \ -+ -e 's/@''GNULIB_FSEEKO''@/$(GL_GNULIB_FSEEKO)/g' \ -+ -e 's/@''GNULIB_FTELL''@/$(GL_GNULIB_FTELL)/g' \ -+ -e 's/@''GNULIB_FTELLO''@/$(GL_GNULIB_FTELLO)/g' \ -+ -e 's/@''GNULIB_FWRITE''@/$(GL_GNULIB_FWRITE)/g' \ -+ -e 's/@''GNULIB_GETC''@/$(GL_GNULIB_GETC)/g' \ -+ -e 's/@''GNULIB_GETCHAR''@/$(GL_GNULIB_GETCHAR)/g' \ -+ -e 's/@''GNULIB_GETDELIM''@/$(GL_GNULIB_GETDELIM)/g' \ -+ -e 's/@''GNULIB_GETLINE''@/$(GL_GNULIB_GETLINE)/g' \ -+ -e 's/@''GNULIB_OBSTACK_PRINTF''@/$(GL_GNULIB_OBSTACK_PRINTF)/g' \ -+ -e 's/@''GNULIB_OBSTACK_PRINTF_POSIX''@/$(GL_GNULIB_OBSTACK_PRINTF_POSIX)/g' \ -+ -e 's/@''GNULIB_PCLOSE''@/$(GL_GNULIB_PCLOSE)/g' \ -+ -e 's/@''GNULIB_PERROR''@/$(GL_GNULIB_PERROR)/g' \ -+ -e 's/@''GNULIB_POPEN''@/$(GL_GNULIB_POPEN)/g' \ -+ -e 's/@''GNULIB_PRINTF''@/$(GL_GNULIB_PRINTF)/g' \ -+ -e 's/@''GNULIB_PRINTF_POSIX''@/$(GL_GNULIB_PRINTF_POSIX)/g' \ -+ -e 's/@''GNULIB_PUTC''@/$(GL_GNULIB_PUTC)/g' \ -+ -e 's/@''GNULIB_PUTCHAR''@/$(GL_GNULIB_PUTCHAR)/g' \ -+ -e 's/@''GNULIB_PUTS''@/$(GL_GNULIB_PUTS)/g' \ -+ -e 's/@''GNULIB_REMOVE''@/$(GL_GNULIB_REMOVE)/g' \ -+ -e 's/@''GNULIB_RENAME''@/$(GL_GNULIB_RENAME)/g' \ -+ -e 's/@''GNULIB_RENAMEAT''@/$(GL_GNULIB_RENAMEAT)/g' \ -+ -e 's/@''GNULIB_SCANF''@/$(GL_GNULIB_SCANF)/g' \ -+ -e 's/@''GNULIB_SNPRINTF''@/$(GL_GNULIB_SNPRINTF)/g' \ -+ -e 's/@''GNULIB_SPRINTF_POSIX''@/$(GL_GNULIB_SPRINTF_POSIX)/g' \ -+ -e 's/@''GNULIB_STDIO_H_NONBLOCKING''@/$(GL_GNULIB_STDIO_H_NONBLOCKING)/g' \ -+ -e 's/@''GNULIB_STDIO_H_SIGPIPE''@/$(GL_GNULIB_STDIO_H_SIGPIPE)/g' \ -+ -e 's/@''GNULIB_TMPFILE''@/$(GL_GNULIB_TMPFILE)/g' \ -+ -e 's/@''GNULIB_VASPRINTF''@/$(GL_GNULIB_VASPRINTF)/g' \ -+ -e 's/@''GNULIB_VDPRINTF''@/$(GL_GNULIB_VDPRINTF)/g' \ -+ -e 's/@''GNULIB_VFPRINTF''@/$(GL_GNULIB_VFPRINTF)/g' \ -+ -e 's/@''GNULIB_VFPRINTF_POSIX''@/$(GL_GNULIB_VFPRINTF_POSIX)/g' \ -+ -e 's/@''GNULIB_VFSCANF''@/$(GL_GNULIB_VFSCANF)/g' \ -+ -e 's/@''GNULIB_VSCANF''@/$(GL_GNULIB_VSCANF)/g' \ -+ -e 's/@''GNULIB_VPRINTF''@/$(GL_GNULIB_VPRINTF)/g' \ -+ -e 's/@''GNULIB_VPRINTF_POSIX''@/$(GL_GNULIB_VPRINTF_POSIX)/g' \ -+ -e 's/@''GNULIB_VSNPRINTF''@/$(GL_GNULIB_VSNPRINTF)/g' \ -+ -e 's/@''GNULIB_VSPRINTF_POSIX''@/$(GL_GNULIB_VSPRINTF_POSIX)/g' \ -+ -e 's/@''GNULIB_MDA_FCLOSEALL''@/$(GL_GNULIB_MDA_FCLOSEALL)/g' \ -+ -e 's/@''GNULIB_MDA_FDOPEN''@/$(GL_GNULIB_MDA_FDOPEN)/g' \ -+ -e 's/@''GNULIB_MDA_FILENO''@/$(GL_GNULIB_MDA_FILENO)/g' \ -+ -e 's/@''GNULIB_MDA_GETW''@/$(GL_GNULIB_MDA_GETW)/g' \ -+ -e 's/@''GNULIB_MDA_PUTW''@/$(GL_GNULIB_MDA_PUTW)/g' \ -+ -e 's/@''GNULIB_MDA_TEMPNAM''@/$(GL_GNULIB_MDA_TEMPNAM)/g' \ - < $(srcdir)/stdio.in.h | \ - sed -e 's|@''HAVE_DECL_FCLOSEALL''@|$(HAVE_DECL_FCLOSEALL)|g' \ - -e 's|@''HAVE_DECL_FPURGE''@|$(HAVE_DECL_FPURGE)|g' \ -@@ -2606,51 +2645,51 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_STDLIB_H''@|$(NEXT_STDLIB_H)|g' \ -- -e 's/@''GNULIB__EXIT''@/$(GNULIB__EXIT)/g' \ -- -e 's/@''GNULIB_ALIGNED_ALLOC''@/$(GNULIB_ALIGNED_ALLOC)/g' \ -- -e 's/@''GNULIB_ATOLL''@/$(GNULIB_ATOLL)/g' \ -- -e 's/@''GNULIB_CALLOC_POSIX''@/$(GNULIB_CALLOC_POSIX)/g' \ -- -e 's/@''GNULIB_CANONICALIZE_FILE_NAME''@/$(GNULIB_CANONICALIZE_FILE_NAME)/g' \ -- -e 's/@''GNULIB_FREE_POSIX''@/$(GNULIB_FREE_POSIX)/g' \ -- -e 's/@''GNULIB_GETLOADAVG''@/$(GNULIB_GETLOADAVG)/g' \ -- -e 's/@''GNULIB_GETSUBOPT''@/$(GNULIB_GETSUBOPT)/g' \ -- -e 's/@''GNULIB_GRANTPT''@/$(GNULIB_GRANTPT)/g' \ -- -e 's/@''GNULIB_MALLOC_POSIX''@/$(GNULIB_MALLOC_POSIX)/g' \ -- -e 's/@''GNULIB_MBTOWC''@/$(GNULIB_MBTOWC)/g' \ -- -e 's/@''GNULIB_MKDTEMP''@/$(GNULIB_MKDTEMP)/g' \ -- -e 's/@''GNULIB_MKOSTEMP''@/$(GNULIB_MKOSTEMP)/g' \ -- -e 's/@''GNULIB_MKOSTEMPS''@/$(GNULIB_MKOSTEMPS)/g' \ -- -e 's/@''GNULIB_MKSTEMP''@/$(GNULIB_MKSTEMP)/g' \ -- -e 's/@''GNULIB_MKSTEMPS''@/$(GNULIB_MKSTEMPS)/g' \ -- -e 's/@''GNULIB_POSIX_MEMALIGN''@/$(GNULIB_POSIX_MEMALIGN)/g' \ -- -e 's/@''GNULIB_POSIX_OPENPT''@/$(GNULIB_POSIX_OPENPT)/g' \ -- -e 's/@''GNULIB_PTSNAME''@/$(GNULIB_PTSNAME)/g' \ -- -e 's/@''GNULIB_PTSNAME_R''@/$(GNULIB_PTSNAME_R)/g' \ -- -e 's/@''GNULIB_PUTENV''@/$(GNULIB_PUTENV)/g' \ -- -e 's/@''GNULIB_QSORT_R''@/$(GNULIB_QSORT_R)/g' \ -- -e 's/@''GNULIB_RANDOM''@/$(GNULIB_RANDOM)/g' \ -- -e 's/@''GNULIB_RANDOM_R''@/$(GNULIB_RANDOM_R)/g' \ -- -e 's/@''GNULIB_REALLOC_POSIX''@/$(GNULIB_REALLOC_POSIX)/g' \ -- -e 's/@''GNULIB_REALLOCARRAY''@/$(GNULIB_REALLOCARRAY)/g' \ -- -e 's/@''GNULIB_REALPATH''@/$(GNULIB_REALPATH)/g' \ -- -e 's/@''GNULIB_RPMATCH''@/$(GNULIB_RPMATCH)/g' \ -- -e 's/@''GNULIB_SECURE_GETENV''@/$(GNULIB_SECURE_GETENV)/g' \ -- -e 's/@''GNULIB_SETENV''@/$(GNULIB_SETENV)/g' \ -- -e 's/@''GNULIB_STRTOD''@/$(GNULIB_STRTOD)/g' \ -- -e 's/@''GNULIB_STRTOL''@/$(GNULIB_STRTOL)/g' \ -- -e 's/@''GNULIB_STRTOLD''@/$(GNULIB_STRTOLD)/g' \ -- -e 's/@''GNULIB_STRTOLL''@/$(GNULIB_STRTOLL)/g' \ -- -e 's/@''GNULIB_STRTOUL''@/$(GNULIB_STRTOUL)/g' \ -- -e 's/@''GNULIB_STRTOULL''@/$(GNULIB_STRTOULL)/g' \ -- -e 's/@''GNULIB_SYSTEM_POSIX''@/$(GNULIB_SYSTEM_POSIX)/g' \ -- -e 's/@''GNULIB_UNLOCKPT''@/$(GNULIB_UNLOCKPT)/g' \ -- -e 's/@''GNULIB_UNSETENV''@/$(GNULIB_UNSETENV)/g' \ -- -e 's/@''GNULIB_WCTOMB''@/$(GNULIB_WCTOMB)/g' \ -- -e 's/@''GNULIB_MDA_ECVT''@/$(GNULIB_MDA_ECVT)/g' \ -- -e 's/@''GNULIB_MDA_FCVT''@/$(GNULIB_MDA_FCVT)/g' \ -- -e 's/@''GNULIB_MDA_GCVT''@/$(GNULIB_MDA_GCVT)/g' \ -- -e 's/@''GNULIB_MDA_MKTEMP''@/$(GNULIB_MDA_MKTEMP)/g' \ -- -e 's/@''GNULIB_MDA_PUTENV''@/$(GNULIB_MDA_PUTENV)/g' \ -+ -e 's/@''GNULIB__EXIT''@/$(GL_GNULIB__EXIT)/g' \ -+ -e 's/@''GNULIB_ALIGNED_ALLOC''@/$(GL_GNULIB_ALIGNED_ALLOC)/g' \ -+ -e 's/@''GNULIB_ATOLL''@/$(GL_GNULIB_ATOLL)/g' \ -+ -e 's/@''GNULIB_CALLOC_POSIX''@/$(GL_GNULIB_CALLOC_POSIX)/g' \ -+ -e 's/@''GNULIB_CANONICALIZE_FILE_NAME''@/$(GL_GNULIB_CANONICALIZE_FILE_NAME)/g' \ -+ -e 's/@''GNULIB_FREE_POSIX''@/$(GL_GNULIB_FREE_POSIX)/g' \ -+ -e 's/@''GNULIB_GETLOADAVG''@/$(GL_GNULIB_GETLOADAVG)/g' \ -+ -e 's/@''GNULIB_GETSUBOPT''@/$(GL_GNULIB_GETSUBOPT)/g' \ -+ -e 's/@''GNULIB_GRANTPT''@/$(GL_GNULIB_GRANTPT)/g' \ -+ -e 's/@''GNULIB_MALLOC_POSIX''@/$(GL_GNULIB_MALLOC_POSIX)/g' \ -+ -e 's/@''GNULIB_MBTOWC''@/$(GL_GNULIB_MBTOWC)/g' \ -+ -e 's/@''GNULIB_MKDTEMP''@/$(GL_GNULIB_MKDTEMP)/g' \ -+ -e 's/@''GNULIB_MKOSTEMP''@/$(GL_GNULIB_MKOSTEMP)/g' \ -+ -e 's/@''GNULIB_MKOSTEMPS''@/$(GL_GNULIB_MKOSTEMPS)/g' \ -+ -e 's/@''GNULIB_MKSTEMP''@/$(GL_GNULIB_MKSTEMP)/g' \ -+ -e 's/@''GNULIB_MKSTEMPS''@/$(GL_GNULIB_MKSTEMPS)/g' \ -+ -e 's/@''GNULIB_POSIX_MEMALIGN''@/$(GL_GNULIB_POSIX_MEMALIGN)/g' \ -+ -e 's/@''GNULIB_POSIX_OPENPT''@/$(GL_GNULIB_POSIX_OPENPT)/g' \ -+ -e 's/@''GNULIB_PTSNAME''@/$(GL_GNULIB_PTSNAME)/g' \ -+ -e 's/@''GNULIB_PTSNAME_R''@/$(GL_GNULIB_PTSNAME_R)/g' \ -+ -e 's/@''GNULIB_PUTENV''@/$(GL_GNULIB_PUTENV)/g' \ -+ -e 's/@''GNULIB_QSORT_R''@/$(GL_GNULIB_QSORT_R)/g' \ -+ -e 's/@''GNULIB_RANDOM''@/$(GL_GNULIB_RANDOM)/g' \ -+ -e 's/@''GNULIB_RANDOM_R''@/$(GL_GNULIB_RANDOM_R)/g' \ -+ -e 's/@''GNULIB_REALLOC_POSIX''@/$(GL_GNULIB_REALLOC_POSIX)/g' \ -+ -e 's/@''GNULIB_REALLOCARRAY''@/$(GL_GNULIB_REALLOCARRAY)/g' \ -+ -e 's/@''GNULIB_REALPATH''@/$(GL_GNULIB_REALPATH)/g' \ -+ -e 's/@''GNULIB_RPMATCH''@/$(GL_GNULIB_RPMATCH)/g' \ -+ -e 's/@''GNULIB_SECURE_GETENV''@/$(GL_GNULIB_SECURE_GETENV)/g' \ -+ -e 's/@''GNULIB_SETENV''@/$(GL_GNULIB_SETENV)/g' \ -+ -e 's/@''GNULIB_STRTOD''@/$(GL_GNULIB_STRTOD)/g' \ -+ -e 's/@''GNULIB_STRTOL''@/$(GL_GNULIB_STRTOL)/g' \ -+ -e 's/@''GNULIB_STRTOLD''@/$(GL_GNULIB_STRTOLD)/g' \ -+ -e 's/@''GNULIB_STRTOLL''@/$(GL_GNULIB_STRTOLL)/g' \ -+ -e 's/@''GNULIB_STRTOUL''@/$(GL_GNULIB_STRTOUL)/g' \ -+ -e 's/@''GNULIB_STRTOULL''@/$(GL_GNULIB_STRTOULL)/g' \ -+ -e 's/@''GNULIB_SYSTEM_POSIX''@/$(GL_GNULIB_SYSTEM_POSIX)/g' \ -+ -e 's/@''GNULIB_UNLOCKPT''@/$(GL_GNULIB_UNLOCKPT)/g' \ -+ -e 's/@''GNULIB_UNSETENV''@/$(GL_GNULIB_UNSETENV)/g' \ -+ -e 's/@''GNULIB_WCTOMB''@/$(GL_GNULIB_WCTOMB)/g' \ -+ -e 's/@''GNULIB_MDA_ECVT''@/$(GL_GNULIB_MDA_ECVT)/g' \ -+ -e 's/@''GNULIB_MDA_FCVT''@/$(GL_GNULIB_MDA_FCVT)/g' \ -+ -e 's/@''GNULIB_MDA_GCVT''@/$(GL_GNULIB_MDA_GCVT)/g' \ -+ -e 's/@''GNULIB_MDA_MKTEMP''@/$(GL_GNULIB_MDA_MKTEMP)/g' \ -+ -e 's/@''GNULIB_MDA_PUTENV''@/$(GL_GNULIB_MDA_PUTENV)/g' \ - < $(srcdir)/stdlib.in.h | \ - sed -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \ - -e 's|@''HAVE_ALIGNED_ALLOC''@|$(HAVE_ALIGNED_ALLOC)|g' \ -@@ -2711,6 +2750,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ - -e 's|@''REPLACE_RANDOM''@|$(REPLACE_RANDOM)|g' \ - -e 's|@''REPLACE_RANDOM_R''@|$(REPLACE_RANDOM_R)|g' \ - -e 's|@''REPLACE_REALLOC''@|$(REPLACE_REALLOC)|g' \ -+ -e 's|@''REPLACE_REALLOCARRAY''@|$(REPLACE_REALLOCARRAY)|g' \ - -e 's|@''REPLACE_REALPATH''@|$(REPLACE_REALPATH)|g' \ - -e 's|@''REPLACE_SETENV''@|$(REPLACE_SETENV)|g' \ - -e 's|@''REPLACE_SETSTATE''@|$(REPLACE_SETSTATE)|g' \ -@@ -2779,49 +2819,49 @@ string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_STRING_H''@|$(NEXT_STRING_H)|g' \ -- -e 's/@''GNULIB_EXPLICIT_BZERO''@/$(GNULIB_EXPLICIT_BZERO)/g' \ -- -e 's/@''GNULIB_FFSL''@/$(GNULIB_FFSL)/g' \ -- -e 's/@''GNULIB_FFSLL''@/$(GNULIB_FFSLL)/g' \ -- -e 's/@''GNULIB_MBSLEN''@/$(GNULIB_MBSLEN)/g' \ -- -e 's/@''GNULIB_MBSNLEN''@/$(GNULIB_MBSNLEN)/g' \ -- -e 's/@''GNULIB_MBSCHR''@/$(GNULIB_MBSCHR)/g' \ -- -e 's/@''GNULIB_MBSRCHR''@/$(GNULIB_MBSRCHR)/g' \ -- -e 's/@''GNULIB_MBSSTR''@/$(GNULIB_MBSSTR)/g' \ -- -e 's/@''GNULIB_MBSCASECMP''@/$(GNULIB_MBSCASECMP)/g' \ -- -e 's/@''GNULIB_MBSNCASECMP''@/$(GNULIB_MBSNCASECMP)/g' \ -- -e 's/@''GNULIB_MBSPCASECMP''@/$(GNULIB_MBSPCASECMP)/g' \ -- -e 's/@''GNULIB_MBSCASESTR''@/$(GNULIB_MBSCASESTR)/g' \ -- -e 's/@''GNULIB_MBSCSPN''@/$(GNULIB_MBSCSPN)/g' \ -- -e 's/@''GNULIB_MBSPBRK''@/$(GNULIB_MBSPBRK)/g' \ -- -e 's/@''GNULIB_MBSSPN''@/$(GNULIB_MBSSPN)/g' \ -- -e 's/@''GNULIB_MBSSEP''@/$(GNULIB_MBSSEP)/g' \ -- -e 's/@''GNULIB_MBSTOK_R''@/$(GNULIB_MBSTOK_R)/g' \ -- -e 's/@''GNULIB_MEMCHR''@/$(GNULIB_MEMCHR)/g' \ -- -e 's/@''GNULIB_MEMMEM''@/$(GNULIB_MEMMEM)/g' \ -- -e 's/@''GNULIB_MEMPCPY''@/$(GNULIB_MEMPCPY)/g' \ -- -e 's/@''GNULIB_MEMRCHR''@/$(GNULIB_MEMRCHR)/g' \ -- -e 's/@''GNULIB_RAWMEMCHR''@/$(GNULIB_RAWMEMCHR)/g' \ -- -e 's/@''GNULIB_STPCPY''@/$(GNULIB_STPCPY)/g' \ -- -e 's/@''GNULIB_STPNCPY''@/$(GNULIB_STPNCPY)/g' \ -- -e 's/@''GNULIB_STRCHRNUL''@/$(GNULIB_STRCHRNUL)/g' \ -- -e 's/@''GNULIB_STRDUP''@/$(GNULIB_STRDUP)/g' \ -- -e 's/@''GNULIB_STRNCAT''@/$(GNULIB_STRNCAT)/g' \ -- -e 's/@''GNULIB_STRNDUP''@/$(GNULIB_STRNDUP)/g' \ -- -e 's/@''GNULIB_STRNLEN''@/$(GNULIB_STRNLEN)/g' \ -- -e 's/@''GNULIB_STRPBRK''@/$(GNULIB_STRPBRK)/g' \ -- -e 's/@''GNULIB_STRSEP''@/$(GNULIB_STRSEP)/g' \ -- -e 's/@''GNULIB_STRSTR''@/$(GNULIB_STRSTR)/g' \ -- -e 's/@''GNULIB_STRCASESTR''@/$(GNULIB_STRCASESTR)/g' \ -- -e 's/@''GNULIB_STRTOK_R''@/$(GNULIB_STRTOK_R)/g' \ -- -e 's/@''GNULIB_STRERROR''@/$(GNULIB_STRERROR)/g' \ -- -e 's/@''GNULIB_STRERROR_R''@/$(GNULIB_STRERROR_R)/g' \ -- -e 's/@''GNULIB_STRERRORNAME_NP''@/$(GNULIB_STRERRORNAME_NP)/g' \ -- -e 's/@''GNULIB_SIGABBREV_NP''@/$(GNULIB_SIGABBREV_NP)/g' \ -- -e 's/@''GNULIB_SIGDESCR_NP''@/$(GNULIB_SIGDESCR_NP)/g' \ -- -e 's/@''GNULIB_STRSIGNAL''@/$(GNULIB_STRSIGNAL)/g' \ -- -e 's/@''GNULIB_STRVERSCMP''@/$(GNULIB_STRVERSCMP)/g' \ -- -e 's/@''GNULIB_MDA_MEMCCPY''@/$(GNULIB_MDA_MEMCCPY)/g' \ -- -e 's/@''GNULIB_MDA_STRDUP''@/$(GNULIB_MDA_STRDUP)/g' \ -+ -e 's/@''GNULIB_EXPLICIT_BZERO''@/$(GL_GNULIB_EXPLICIT_BZERO)/g' \ -+ -e 's/@''GNULIB_FFSL''@/$(GL_GNULIB_FFSL)/g' \ -+ -e 's/@''GNULIB_FFSLL''@/$(GL_GNULIB_FFSLL)/g' \ -+ -e 's/@''GNULIB_MBSLEN''@/$(GL_GNULIB_MBSLEN)/g' \ -+ -e 's/@''GNULIB_MBSNLEN''@/$(GL_GNULIB_MBSNLEN)/g' \ -+ -e 's/@''GNULIB_MBSCHR''@/$(GL_GNULIB_MBSCHR)/g' \ -+ -e 's/@''GNULIB_MBSRCHR''@/$(GL_GNULIB_MBSRCHR)/g' \ -+ -e 's/@''GNULIB_MBSSTR''@/$(GL_GNULIB_MBSSTR)/g' \ -+ -e 's/@''GNULIB_MBSCASECMP''@/$(GL_GNULIB_MBSCASECMP)/g' \ -+ -e 's/@''GNULIB_MBSNCASECMP''@/$(GL_GNULIB_MBSNCASECMP)/g' \ -+ -e 's/@''GNULIB_MBSPCASECMP''@/$(GL_GNULIB_MBSPCASECMP)/g' \ -+ -e 's/@''GNULIB_MBSCASESTR''@/$(GL_GNULIB_MBSCASESTR)/g' \ -+ -e 's/@''GNULIB_MBSCSPN''@/$(GL_GNULIB_MBSCSPN)/g' \ -+ -e 's/@''GNULIB_MBSPBRK''@/$(GL_GNULIB_MBSPBRK)/g' \ -+ -e 's/@''GNULIB_MBSSPN''@/$(GL_GNULIB_MBSSPN)/g' \ -+ -e 's/@''GNULIB_MBSSEP''@/$(GL_GNULIB_MBSSEP)/g' \ -+ -e 's/@''GNULIB_MBSTOK_R''@/$(GL_GNULIB_MBSTOK_R)/g' \ -+ -e 's/@''GNULIB_MEMCHR''@/$(GL_GNULIB_MEMCHR)/g' \ -+ -e 's/@''GNULIB_MEMMEM''@/$(GL_GNULIB_MEMMEM)/g' \ -+ -e 's/@''GNULIB_MEMPCPY''@/$(GL_GNULIB_MEMPCPY)/g' \ -+ -e 's/@''GNULIB_MEMRCHR''@/$(GL_GNULIB_MEMRCHR)/g' \ -+ -e 's/@''GNULIB_RAWMEMCHR''@/$(GL_GNULIB_RAWMEMCHR)/g' \ -+ -e 's/@''GNULIB_STPCPY''@/$(GL_GNULIB_STPCPY)/g' \ -+ -e 's/@''GNULIB_STPNCPY''@/$(GL_GNULIB_STPNCPY)/g' \ -+ -e 's/@''GNULIB_STRCHRNUL''@/$(GL_GNULIB_STRCHRNUL)/g' \ -+ -e 's/@''GNULIB_STRDUP''@/$(GL_GNULIB_STRDUP)/g' \ -+ -e 's/@''GNULIB_STRNCAT''@/$(GL_GNULIB_STRNCAT)/g' \ -+ -e 's/@''GNULIB_STRNDUP''@/$(GL_GNULIB_STRNDUP)/g' \ -+ -e 's/@''GNULIB_STRNLEN''@/$(GL_GNULIB_STRNLEN)/g' \ -+ -e 's/@''GNULIB_STRPBRK''@/$(GL_GNULIB_STRPBRK)/g' \ -+ -e 's/@''GNULIB_STRSEP''@/$(GL_GNULIB_STRSEP)/g' \ -+ -e 's/@''GNULIB_STRSTR''@/$(GL_GNULIB_STRSTR)/g' \ -+ -e 's/@''GNULIB_STRCASESTR''@/$(GL_GNULIB_STRCASESTR)/g' \ -+ -e 's/@''GNULIB_STRTOK_R''@/$(GL_GNULIB_STRTOK_R)/g' \ -+ -e 's/@''GNULIB_STRERROR''@/$(GL_GNULIB_STRERROR)/g' \ -+ -e 's/@''GNULIB_STRERROR_R''@/$(GL_GNULIB_STRERROR_R)/g' \ -+ -e 's/@''GNULIB_STRERRORNAME_NP''@/$(GL_GNULIB_STRERRORNAME_NP)/g' \ -+ -e 's/@''GNULIB_SIGABBREV_NP''@/$(GL_GNULIB_SIGABBREV_NP)/g' \ -+ -e 's/@''GNULIB_SIGDESCR_NP''@/$(GL_GNULIB_SIGDESCR_NP)/g' \ -+ -e 's/@''GNULIB_STRSIGNAL''@/$(GL_GNULIB_STRSIGNAL)/g' \ -+ -e 's/@''GNULIB_STRVERSCMP''@/$(GL_GNULIB_STRVERSCMP)/g' \ -+ -e 's/@''GNULIB_MDA_MEMCCPY''@/$(GL_GNULIB_MDA_MEMCCPY)/g' \ -+ -e 's/@''GNULIB_MDA_STRDUP''@/$(GL_GNULIB_MDA_STRDUP)/g' \ - < $(srcdir)/string.in.h | \ - sed -e 's|@''HAVE_EXPLICIT_BZERO''@|$(HAVE_EXPLICIT_BZERO)|g' \ - -e 's|@''HAVE_FFSL''@|$(HAVE_FFSL)|g' \ -@@ -2893,7 +2933,7 @@ sys/file.h: sys_file.in.h $(top_builddir)/config.status $(WARN_ON_USE_H) - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_SYS_FILE_H''@|$(NEXT_SYS_FILE_H)|g' \ - -e 's/@''HAVE_FLOCK''@/$(HAVE_FLOCK)/g' \ -- -e 's/@''GNULIB_FLOCK''@/$(GNULIB_FLOCK)/g' \ -+ -e 's/@''GNULIB_FLOCK''@/$(GL_GNULIB_FLOCK)/g' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - < $(srcdir)/sys_file.in.h; \ - } > $@-t && \ -@@ -2922,7 +2962,7 @@ sys/random.h: sys_random.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_N - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_SYS_RANDOM_H''@|$(NEXT_SYS_RANDOM_H)|g' \ - -e 's|@''HAVE_SYS_RANDOM_H''@|$(HAVE_SYS_RANDOM_H)|g' \ -- -e 's/@''GNULIB_GETRANDOM''@/$(GNULIB_GETRANDOM)/g' \ -+ -e 's/@''GNULIB_GETRANDOM''@/$(GL_GNULIB_GETRANDOM)/g' \ - -e 's/@''HAVE_GETRANDOM''@/$(HAVE_GETRANDOM)/g' \ - -e 's/@''REPLACE_GETRANDOM''@/$(REPLACE_GETRANDOM)/g' \ - -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ -@@ -2955,8 +2995,8 @@ sys/select.h: sys_select.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_SYS_SELECT_H''@|$(NEXT_SYS_SELECT_H)|g' \ - -e 's|@''HAVE_SYS_SELECT_H''@|$(HAVE_SYS_SELECT_H)|g' \ -- -e 's/@''GNULIB_PSELECT''@/$(GNULIB_PSELECT)/g' \ -- -e 's/@''GNULIB_SELECT''@/$(GNULIB_SELECT)/g' \ -+ -e 's/@''GNULIB_PSELECT''@/$(GL_GNULIB_PSELECT)/g' \ -+ -e 's/@''GNULIB_SELECT''@/$(GL_GNULIB_SELECT)/g' \ - -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \ - -e 's|@''HAVE_PSELECT''@|$(HAVE_PSELECT)|g' \ - -e 's|@''REPLACE_PSELECT''@|$(REPLACE_PSELECT)|g' \ -@@ -2990,22 +3030,22 @@ sys/socket.h: sys_socket.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_SYS_SOCKET_H''@|$(NEXT_SYS_SOCKET_H)|g' \ - -e 's|@''HAVE_SYS_SOCKET_H''@|$(HAVE_SYS_SOCKET_H)|g' \ -- -e 's/@''GNULIB_CLOSE''@/$(GNULIB_CLOSE)/g' \ -- -e 's/@''GNULIB_SOCKET''@/$(GNULIB_SOCKET)/g' \ -- -e 's/@''GNULIB_CONNECT''@/$(GNULIB_CONNECT)/g' \ -- -e 's/@''GNULIB_ACCEPT''@/$(GNULIB_ACCEPT)/g' \ -- -e 's/@''GNULIB_BIND''@/$(GNULIB_BIND)/g' \ -- -e 's/@''GNULIB_GETPEERNAME''@/$(GNULIB_GETPEERNAME)/g' \ -- -e 's/@''GNULIB_GETSOCKNAME''@/$(GNULIB_GETSOCKNAME)/g' \ -- -e 's/@''GNULIB_GETSOCKOPT''@/$(GNULIB_GETSOCKOPT)/g' \ -- -e 's/@''GNULIB_LISTEN''@/$(GNULIB_LISTEN)/g' \ -- -e 's/@''GNULIB_RECV''@/$(GNULIB_RECV)/g' \ -- -e 's/@''GNULIB_SEND''@/$(GNULIB_SEND)/g' \ -- -e 's/@''GNULIB_RECVFROM''@/$(GNULIB_RECVFROM)/g' \ -- -e 's/@''GNULIB_SENDTO''@/$(GNULIB_SENDTO)/g' \ -- -e 's/@''GNULIB_SETSOCKOPT''@/$(GNULIB_SETSOCKOPT)/g' \ -- -e 's/@''GNULIB_SHUTDOWN''@/$(GNULIB_SHUTDOWN)/g' \ -- -e 's/@''GNULIB_ACCEPT4''@/$(GNULIB_ACCEPT4)/g' \ -+ -e 's/@''GNULIB_CLOSE''@/$(GL_GNULIB_CLOSE)/g' \ -+ -e 's/@''GNULIB_SOCKET''@/$(GL_GNULIB_SOCKET)/g' \ -+ -e 's/@''GNULIB_CONNECT''@/$(GL_GNULIB_CONNECT)/g' \ -+ -e 's/@''GNULIB_ACCEPT''@/$(GL_GNULIB_ACCEPT)/g' \ -+ -e 's/@''GNULIB_BIND''@/$(GL_GNULIB_BIND)/g' \ -+ -e 's/@''GNULIB_GETPEERNAME''@/$(GL_GNULIB_GETPEERNAME)/g' \ -+ -e 's/@''GNULIB_GETSOCKNAME''@/$(GL_GNULIB_GETSOCKNAME)/g' \ -+ -e 's/@''GNULIB_GETSOCKOPT''@/$(GL_GNULIB_GETSOCKOPT)/g' \ -+ -e 's/@''GNULIB_LISTEN''@/$(GL_GNULIB_LISTEN)/g' \ -+ -e 's/@''GNULIB_RECV''@/$(GL_GNULIB_RECV)/g' \ -+ -e 's/@''GNULIB_SEND''@/$(GL_GNULIB_SEND)/g' \ -+ -e 's/@''GNULIB_RECVFROM''@/$(GL_GNULIB_RECVFROM)/g' \ -+ -e 's/@''GNULIB_SENDTO''@/$(GL_GNULIB_SENDTO)/g' \ -+ -e 's/@''GNULIB_SETSOCKOPT''@/$(GL_GNULIB_SETSOCKOPT)/g' \ -+ -e 's/@''GNULIB_SHUTDOWN''@/$(GL_GNULIB_SHUTDOWN)/g' \ -+ -e 's/@''GNULIB_ACCEPT4''@/$(GL_GNULIB_ACCEPT4)/g' \ - -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \ - -e 's|@''HAVE_WS2TCPIP_H''@|$(HAVE_WS2TCPIP_H)|g' \ - -e 's|@''HAVE_STRUCT_SOCKADDR_STORAGE''@|$(HAVE_STRUCT_SOCKADDR_STORAGE)|g' \ -@@ -3042,25 +3082,25 @@ sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNU - -e 's|@''NEXT_SYS_STAT_H''@|$(NEXT_SYS_STAT_H)|g' \ - -e 's|@''WINDOWS_64_BIT_ST_SIZE''@|$(WINDOWS_64_BIT_ST_SIZE)|g' \ - -e 's|@''WINDOWS_STAT_TIMESPEC''@|$(WINDOWS_STAT_TIMESPEC)|g' \ -- -e 's/@''GNULIB_FCHMODAT''@/$(GNULIB_FCHMODAT)/g' \ -- -e 's/@''GNULIB_FSTAT''@/$(GNULIB_FSTAT)/g' \ -- -e 's/@''GNULIB_FSTATAT''@/$(GNULIB_FSTATAT)/g' \ -- -e 's/@''GNULIB_FUTIMENS''@/$(GNULIB_FUTIMENS)/g' \ -- -e 's/@''GNULIB_GETUMASK''@/$(GNULIB_GETUMASK)/g' \ -- -e 's/@''GNULIB_LCHMOD''@/$(GNULIB_LCHMOD)/g' \ -- -e 's/@''GNULIB_LSTAT''@/$(GNULIB_LSTAT)/g' \ -- -e 's/@''GNULIB_MKDIR''@/$(GNULIB_MKDIR)/g' \ -- -e 's/@''GNULIB_MKDIRAT''@/$(GNULIB_MKDIRAT)/g' \ -- -e 's/@''GNULIB_MKFIFO''@/$(GNULIB_MKFIFO)/g' \ -- -e 's/@''GNULIB_MKFIFOAT''@/$(GNULIB_MKFIFOAT)/g' \ -- -e 's/@''GNULIB_MKNOD''@/$(GNULIB_MKNOD)/g' \ -- -e 's/@''GNULIB_MKNODAT''@/$(GNULIB_MKNODAT)/g' \ -- -e 's/@''GNULIB_STAT''@/$(GNULIB_STAT)/g' \ -- -e 's/@''GNULIB_UTIMENSAT''@/$(GNULIB_UTIMENSAT)/g' \ -- -e 's/@''GNULIB_OVERRIDES_STRUCT_STAT''@/$(GNULIB_OVERRIDES_STRUCT_STAT)/g' \ -- -e 's/@''GNULIB_MDA_CHMOD''@/$(GNULIB_MDA_CHMOD)/g' \ -- -e 's/@''GNULIB_MDA_MKDIR''@/$(GNULIB_MDA_MKDIR)/g' \ -- -e 's/@''GNULIB_MDA_UMASK''@/$(GNULIB_MDA_UMASK)/g' \ -+ -e 's/@''GNULIB_FCHMODAT''@/$(GL_GNULIB_FCHMODAT)/g' \ -+ -e 's/@''GNULIB_FSTAT''@/$(GL_GNULIB_FSTAT)/g' \ -+ -e 's/@''GNULIB_FSTATAT''@/$(GL_GNULIB_FSTATAT)/g' \ -+ -e 's/@''GNULIB_FUTIMENS''@/$(GL_GNULIB_FUTIMENS)/g' \ -+ -e 's/@''GNULIB_GETUMASK''@/$(GL_GNULIB_GETUMASK)/g' \ -+ -e 's/@''GNULIB_LCHMOD''@/$(GL_GNULIB_LCHMOD)/g' \ -+ -e 's/@''GNULIB_LSTAT''@/$(GL_GNULIB_LSTAT)/g' \ -+ -e 's/@''GNULIB_MKDIR''@/$(GL_GNULIB_MKDIR)/g' \ -+ -e 's/@''GNULIB_MKDIRAT''@/$(GL_GNULIB_MKDIRAT)/g' \ -+ -e 's/@''GNULIB_MKFIFO''@/$(GL_GNULIB_MKFIFO)/g' \ -+ -e 's/@''GNULIB_MKFIFOAT''@/$(GL_GNULIB_MKFIFOAT)/g' \ -+ -e 's/@''GNULIB_MKNOD''@/$(GL_GNULIB_MKNOD)/g' \ -+ -e 's/@''GNULIB_MKNODAT''@/$(GL_GNULIB_MKNODAT)/g' \ -+ -e 's/@''GNULIB_STAT''@/$(GL_GNULIB_STAT)/g' \ -+ -e 's/@''GNULIB_UTIMENSAT''@/$(GL_GNULIB_UTIMENSAT)/g' \ -+ -e 's/@''GNULIB_OVERRIDES_STRUCT_STAT''@/$(GL_GNULIB_OVERRIDES_STRUCT_STAT)/g' \ -+ -e 's/@''GNULIB_MDA_CHMOD''@/$(GL_GNULIB_MDA_CHMOD)/g' \ -+ -e 's/@''GNULIB_MDA_MKDIR''@/$(GL_GNULIB_MDA_MKDIR)/g' \ -+ -e 's/@''GNULIB_MDA_UMASK''@/$(GL_GNULIB_MDA_UMASK)/g' \ - -e 's|@''HAVE_FCHMODAT''@|$(HAVE_FCHMODAT)|g' \ - -e 's|@''HAVE_FSTATAT''@|$(HAVE_FSTATAT)|g' \ - -e 's|@''HAVE_FUTIMENS''@|$(HAVE_FUTIMENS)|g' \ -@@ -3114,7 +3154,7 @@ sys/time.h: sys_time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNU - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_SYS_TIME_H''@|$(NEXT_SYS_TIME_H)|g' \ -- -e 's/@''GNULIB_GETTIMEOFDAY''@/$(GNULIB_GETTIMEOFDAY)/g' \ -+ -e 's/@''GNULIB_GETTIMEOFDAY''@/$(GL_GNULIB_GETTIMEOFDAY)/g' \ - -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \ - -e 's/@''HAVE_GETTIMEOFDAY''@/$(HAVE_GETTIMEOFDAY)/g' \ - -e 's/@''HAVE_STRUCT_TIMEVAL''@/$(HAVE_STRUCT_TIMEVAL)/g' \ -@@ -3148,7 +3188,7 @@ sys/times.h: sys_times.in.h $(top_builddir)/config.status $(WARN_ON_USE_H) $(ARG - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_SYS_TIMES_H''@|$(NEXT_SYS_TIMES_H)|g' \ -- -e 's/@''GNULIB_TIMES''@/$(GNULIB_TIMES)/g' \ -+ -e 's/@''GNULIB_TIMES''@/$(GL_GNULIB_TIMES)/g' \ - -e 's|@''HAVE_STRUCT_TMS''@|$(HAVE_STRUCT_TMS)|g' \ - -e 's|@''HAVE_TIMES''@|$(HAVE_TIMES)|g' \ - -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ -@@ -3239,18 +3279,18 @@ time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $( - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_TIME_H''@|$(NEXT_TIME_H)|g' \ -- -e 's/@''GNULIB_CTIME''@/$(GNULIB_CTIME)/g' \ -- -e 's/@''GNULIB_LOCALTIME''@/$(GNULIB_LOCALTIME)/g' \ -- -e 's/@''GNULIB_MKTIME''@/$(GNULIB_MKTIME)/g' \ -- -e 's/@''GNULIB_NANOSLEEP''@/$(GNULIB_NANOSLEEP)/g' \ -- -e 's/@''GNULIB_STRFTIME''@/$(GNULIB_STRFTIME)/g' \ -- -e 's/@''GNULIB_STRPTIME''@/$(GNULIB_STRPTIME)/g' \ -- -e 's/@''GNULIB_TIMEGM''@/$(GNULIB_TIMEGM)/g' \ -- -e 's/@''GNULIB_TIMESPEC_GET''@/$(GNULIB_TIMESPEC_GET)/g' \ -- -e 's/@''GNULIB_TIME_R''@/$(GNULIB_TIME_R)/g' \ -- -e 's/@''GNULIB_TIME_RZ''@/$(GNULIB_TIME_RZ)/g' \ -- -e 's/@''GNULIB_TZSET''@/$(GNULIB_TZSET)/g' \ -- -e 's/@''GNULIB_MDA_TZSET''@/$(GNULIB_MDA_TZSET)/g' \ -+ -e 's/@''GNULIB_CTIME''@/$(GL_GNULIB_CTIME)/g' \ -+ -e 's/@''GNULIB_LOCALTIME''@/$(GL_GNULIB_LOCALTIME)/g' \ -+ -e 's/@''GNULIB_MKTIME''@/$(GL_GNULIB_MKTIME)/g' \ -+ -e 's/@''GNULIB_NANOSLEEP''@/$(GL_GNULIB_NANOSLEEP)/g' \ -+ -e 's/@''GNULIB_STRFTIME''@/$(GL_GNULIB_STRFTIME)/g' \ -+ -e 's/@''GNULIB_STRPTIME''@/$(GL_GNULIB_STRPTIME)/g' \ -+ -e 's/@''GNULIB_TIMEGM''@/$(GL_GNULIB_TIMEGM)/g' \ -+ -e 's/@''GNULIB_TIMESPEC_GET''@/$(GL_GNULIB_TIMESPEC_GET)/g' \ -+ -e 's/@''GNULIB_TIME_R''@/$(GL_GNULIB_TIME_R)/g' \ -+ -e 's/@''GNULIB_TIME_RZ''@/$(GL_GNULIB_TIME_RZ)/g' \ -+ -e 's/@''GNULIB_TZSET''@/$(GL_GNULIB_TZSET)/g' \ -+ -e 's/@''GNULIB_MDA_TZSET''@/$(GL_GNULIB_MDA_TZSET)/g' \ - -e 's|@''HAVE_DECL_LOCALTIME_R''@|$(HAVE_DECL_LOCALTIME_R)|g' \ - -e 's|@''HAVE_NANOSLEEP''@|$(HAVE_NANOSLEEP)|g' \ - -e 's|@''HAVE_STRPTIME''@|$(HAVE_STRPTIME)|g' \ -@@ -3360,89 +3400,89 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \ - -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \ -- -e 's/@''GNULIB_ACCESS''@/$(GNULIB_ACCESS)/g' \ -- -e 's/@''GNULIB_CHDIR''@/$(GNULIB_CHDIR)/g' \ -- -e 's/@''GNULIB_CHOWN''@/$(GNULIB_CHOWN)/g' \ -- -e 's/@''GNULIB_CLOSE''@/$(GNULIB_CLOSE)/g' \ -- -e 's/@''GNULIB_COPY_FILE_RANGE''@/$(GNULIB_COPY_FILE_RANGE)/g' \ -- -e 's/@''GNULIB_DUP''@/$(GNULIB_DUP)/g' \ -- -e 's/@''GNULIB_DUP2''@/$(GNULIB_DUP2)/g' \ -- -e 's/@''GNULIB_DUP3''@/$(GNULIB_DUP3)/g' \ -- -e 's/@''GNULIB_ENVIRON''@/$(GNULIB_ENVIRON)/g' \ -- -e 's/@''GNULIB_EUIDACCESS''@/$(GNULIB_EUIDACCESS)/g' \ -- -e 's/@''GNULIB_EXECL''@/$(GNULIB_EXECL)/g' \ -- -e 's/@''GNULIB_EXECLE''@/$(GNULIB_EXECLE)/g' \ -- -e 's/@''GNULIB_EXECLP''@/$(GNULIB_EXECLP)/g' \ -- -e 's/@''GNULIB_EXECV''@/$(GNULIB_EXECV)/g' \ -- -e 's/@''GNULIB_EXECVE''@/$(GNULIB_EXECVE)/g' \ -- -e 's/@''GNULIB_EXECVP''@/$(GNULIB_EXECVP)/g' \ -- -e 's/@''GNULIB_EXECVPE''@/$(GNULIB_EXECVPE)/g' \ -- -e 's/@''GNULIB_FACCESSAT''@/$(GNULIB_FACCESSAT)/g' \ -- -e 's/@''GNULIB_FCHDIR''@/$(GNULIB_FCHDIR)/g' \ -- -e 's/@''GNULIB_FCHOWNAT''@/$(GNULIB_FCHOWNAT)/g' \ -- -e 's/@''GNULIB_FDATASYNC''@/$(GNULIB_FDATASYNC)/g' \ -- -e 's/@''GNULIB_FSYNC''@/$(GNULIB_FSYNC)/g' \ -- -e 's/@''GNULIB_FTRUNCATE''@/$(GNULIB_FTRUNCATE)/g' \ -- -e 's/@''GNULIB_GETCWD''@/$(GNULIB_GETCWD)/g' \ -- -e 's/@''GNULIB_GETDOMAINNAME''@/$(GNULIB_GETDOMAINNAME)/g' \ -- -e 's/@''GNULIB_GETDTABLESIZE''@/$(GNULIB_GETDTABLESIZE)/g' \ -- -e 's/@''GNULIB_GETENTROPY''@/$(GNULIB_GETENTROPY)/g' \ -- -e 's/@''GNULIB_GETGROUPS''@/$(GNULIB_GETGROUPS)/g' \ -- -e 's/@''GNULIB_GETHOSTNAME''@/$(GNULIB_GETHOSTNAME)/g' \ -- -e 's/@''GNULIB_GETLOGIN''@/$(GNULIB_GETLOGIN)/g' \ -- -e 's/@''GNULIB_GETLOGIN_R''@/$(GNULIB_GETLOGIN_R)/g' \ -- -e 's/@''GNULIB_GETOPT_POSIX''@/$(GNULIB_GETOPT_POSIX)/g' \ -- -e 's/@''GNULIB_GETPAGESIZE''@/$(GNULIB_GETPAGESIZE)/g' \ -- -e 's/@''GNULIB_GETPASS''@/$(GNULIB_GETPASS)/g' \ -- -e 's/@''GNULIB_GETUSERSHELL''@/$(GNULIB_GETUSERSHELL)/g' \ -- -e 's/@''GNULIB_GROUP_MEMBER''@/$(GNULIB_GROUP_MEMBER)/g' \ -- -e 's/@''GNULIB_ISATTY''@/$(GNULIB_ISATTY)/g' \ -- -e 's/@''GNULIB_LCHOWN''@/$(GNULIB_LCHOWN)/g' \ -- -e 's/@''GNULIB_LINK''@/$(GNULIB_LINK)/g' \ -- -e 's/@''GNULIB_LINKAT''@/$(GNULIB_LINKAT)/g' \ -- -e 's/@''GNULIB_LSEEK''@/$(GNULIB_LSEEK)/g' \ -- -e 's/@''GNULIB_PIPE''@/$(GNULIB_PIPE)/g' \ -- -e 's/@''GNULIB_PIPE2''@/$(GNULIB_PIPE2)/g' \ -- -e 's/@''GNULIB_PREAD''@/$(GNULIB_PREAD)/g' \ -- -e 's/@''GNULIB_PWRITE''@/$(GNULIB_PWRITE)/g' \ -- -e 's/@''GNULIB_READ''@/$(GNULIB_READ)/g' \ -- -e 's/@''GNULIB_READLINK''@/$(GNULIB_READLINK)/g' \ -- -e 's/@''GNULIB_READLINKAT''@/$(GNULIB_READLINKAT)/g' \ -- -e 's/@''GNULIB_RMDIR''@/$(GNULIB_RMDIR)/g' \ -- -e 's/@''GNULIB_SETHOSTNAME''@/$(GNULIB_SETHOSTNAME)/g' \ -- -e 's/@''GNULIB_SLEEP''@/$(GNULIB_SLEEP)/g' \ -- -e 's/@''GNULIB_SYMLINK''@/$(GNULIB_SYMLINK)/g' \ -- -e 's/@''GNULIB_SYMLINKAT''@/$(GNULIB_SYMLINKAT)/g' \ -- -e 's/@''GNULIB_TRUNCATE''@/$(GNULIB_TRUNCATE)/g' \ -- -e 's/@''GNULIB_TTYNAME_R''@/$(GNULIB_TTYNAME_R)/g' \ -- -e 's/@''GNULIB_UNISTD_H_GETOPT''@/0$(GNULIB_GL_UNISTD_H_GETOPT)/g' \ -- -e 's/@''GNULIB_UNISTD_H_NONBLOCKING''@/$(GNULIB_UNISTD_H_NONBLOCKING)/g' \ -- -e 's/@''GNULIB_UNISTD_H_SIGPIPE''@/$(GNULIB_UNISTD_H_SIGPIPE)/g' \ -- -e 's/@''GNULIB_UNLINK''@/$(GNULIB_UNLINK)/g' \ -- -e 's/@''GNULIB_UNLINKAT''@/$(GNULIB_UNLINKAT)/g' \ -- -e 's/@''GNULIB_USLEEP''@/$(GNULIB_USLEEP)/g' \ -- -e 's/@''GNULIB_WRITE''@/$(GNULIB_WRITE)/g' \ -- -e 's/@''GNULIB_MDA_ACCESS''@/$(GNULIB_MDA_ACCESS)/g' \ -- -e 's/@''GNULIB_MDA_CHDIR''@/$(GNULIB_MDA_CHDIR)/g' \ -- -e 's/@''GNULIB_MDA_CLOSE''@/$(GNULIB_MDA_CLOSE)/g' \ -- -e 's/@''GNULIB_MDA_DUP''@/$(GNULIB_MDA_DUP)/g' \ -- -e 's/@''GNULIB_MDA_DUP2''@/$(GNULIB_MDA_DUP2)/g' \ -- -e 's/@''GNULIB_MDA_EXECL''@/$(GNULIB_MDA_EXECL)/g' \ -- -e 's/@''GNULIB_MDA_EXECLE''@/$(GNULIB_MDA_EXECLE)/g' \ -- -e 's/@''GNULIB_MDA_EXECLP''@/$(GNULIB_MDA_EXECLP)/g' \ -- -e 's/@''GNULIB_MDA_EXECV''@/$(GNULIB_MDA_EXECV)/g' \ -- -e 's/@''GNULIB_MDA_EXECVE''@/$(GNULIB_MDA_EXECVE)/g' \ -- -e 's/@''GNULIB_MDA_EXECVP''@/$(GNULIB_MDA_EXECVP)/g' \ -- -e 's/@''GNULIB_MDA_EXECVPE''@/$(GNULIB_MDA_EXECVPE)/g' \ -- -e 's/@''GNULIB_MDA_GETCWD''@/$(GNULIB_MDA_GETCWD)/g' \ -- -e 's/@''GNULIB_MDA_GETPID''@/$(GNULIB_MDA_GETPID)/g' \ -- -e 's/@''GNULIB_MDA_ISATTY''@/$(GNULIB_MDA_ISATTY)/g' \ -- -e 's/@''GNULIB_MDA_LSEEK''@/$(GNULIB_MDA_LSEEK)/g' \ -- -e 's/@''GNULIB_MDA_READ''@/$(GNULIB_MDA_READ)/g' \ -- -e 's/@''GNULIB_MDA_RMDIR''@/$(GNULIB_MDA_RMDIR)/g' \ -- -e 's/@''GNULIB_MDA_SWAB''@/$(GNULIB_MDA_SWAB)/g' \ -- -e 's/@''GNULIB_MDA_UNLINK''@/$(GNULIB_MDA_UNLINK)/g' \ -- -e 's/@''GNULIB_MDA_WRITE''@/$(GNULIB_MDA_WRITE)/g' \ -+ -e 's/@''GNULIB_ACCESS''@/$(GL_GNULIB_ACCESS)/g' \ -+ -e 's/@''GNULIB_CHDIR''@/$(GL_GNULIB_CHDIR)/g' \ -+ -e 's/@''GNULIB_CHOWN''@/$(GL_GNULIB_CHOWN)/g' \ -+ -e 's/@''GNULIB_CLOSE''@/$(GL_GNULIB_CLOSE)/g' \ -+ -e 's/@''GNULIB_COPY_FILE_RANGE''@/$(GL_GNULIB_COPY_FILE_RANGE)/g' \ -+ -e 's/@''GNULIB_DUP''@/$(GL_GNULIB_DUP)/g' \ -+ -e 's/@''GNULIB_DUP2''@/$(GL_GNULIB_DUP2)/g' \ -+ -e 's/@''GNULIB_DUP3''@/$(GL_GNULIB_DUP3)/g' \ -+ -e 's/@''GNULIB_ENVIRON''@/$(GL_GNULIB_ENVIRON)/g' \ -+ -e 's/@''GNULIB_EUIDACCESS''@/$(GL_GNULIB_EUIDACCESS)/g' \ -+ -e 's/@''GNULIB_EXECL''@/$(GL_GNULIB_EXECL)/g' \ -+ -e 's/@''GNULIB_EXECLE''@/$(GL_GNULIB_EXECLE)/g' \ -+ -e 's/@''GNULIB_EXECLP''@/$(GL_GNULIB_EXECLP)/g' \ -+ -e 's/@''GNULIB_EXECV''@/$(GL_GNULIB_EXECV)/g' \ -+ -e 's/@''GNULIB_EXECVE''@/$(GL_GNULIB_EXECVE)/g' \ -+ -e 's/@''GNULIB_EXECVP''@/$(GL_GNULIB_EXECVP)/g' \ -+ -e 's/@''GNULIB_EXECVPE''@/$(GL_GNULIB_EXECVPE)/g' \ -+ -e 's/@''GNULIB_FACCESSAT''@/$(GL_GNULIB_FACCESSAT)/g' \ -+ -e 's/@''GNULIB_FCHDIR''@/$(GL_GNULIB_FCHDIR)/g' \ -+ -e 's/@''GNULIB_FCHOWNAT''@/$(GL_GNULIB_FCHOWNAT)/g' \ -+ -e 's/@''GNULIB_FDATASYNC''@/$(GL_GNULIB_FDATASYNC)/g' \ -+ -e 's/@''GNULIB_FSYNC''@/$(GL_GNULIB_FSYNC)/g' \ -+ -e 's/@''GNULIB_FTRUNCATE''@/$(GL_GNULIB_FTRUNCATE)/g' \ -+ -e 's/@''GNULIB_GETCWD''@/$(GL_GNULIB_GETCWD)/g' \ -+ -e 's/@''GNULIB_GETDOMAINNAME''@/$(GL_GNULIB_GETDOMAINNAME)/g' \ -+ -e 's/@''GNULIB_GETDTABLESIZE''@/$(GL_GNULIB_GETDTABLESIZE)/g' \ -+ -e 's/@''GNULIB_GETENTROPY''@/$(GL_GNULIB_GETENTROPY)/g' \ -+ -e 's/@''GNULIB_GETGROUPS''@/$(GL_GNULIB_GETGROUPS)/g' \ -+ -e 's/@''GNULIB_GETHOSTNAME''@/$(GL_GNULIB_GETHOSTNAME)/g' \ -+ -e 's/@''GNULIB_GETLOGIN''@/$(GL_GNULIB_GETLOGIN)/g' \ -+ -e 's/@''GNULIB_GETLOGIN_R''@/$(GL_GNULIB_GETLOGIN_R)/g' \ -+ -e 's/@''GNULIB_GETOPT_POSIX''@/$(GL_GNULIB_GETOPT_POSIX)/g' \ -+ -e 's/@''GNULIB_GETPAGESIZE''@/$(GL_GNULIB_GETPAGESIZE)/g' \ -+ -e 's/@''GNULIB_GETPASS''@/$(GL_GNULIB_GETPASS)/g' \ -+ -e 's/@''GNULIB_GETUSERSHELL''@/$(GL_GNULIB_GETUSERSHELL)/g' \ -+ -e 's/@''GNULIB_GROUP_MEMBER''@/$(GL_GNULIB_GROUP_MEMBER)/g' \ -+ -e 's/@''GNULIB_ISATTY''@/$(GL_GNULIB_ISATTY)/g' \ -+ -e 's/@''GNULIB_LCHOWN''@/$(GL_GNULIB_LCHOWN)/g' \ -+ -e 's/@''GNULIB_LINK''@/$(GL_GNULIB_LINK)/g' \ -+ -e 's/@''GNULIB_LINKAT''@/$(GL_GNULIB_LINKAT)/g' \ -+ -e 's/@''GNULIB_LSEEK''@/$(GL_GNULIB_LSEEK)/g' \ -+ -e 's/@''GNULIB_PIPE''@/$(GL_GNULIB_PIPE)/g' \ -+ -e 's/@''GNULIB_PIPE2''@/$(GL_GNULIB_PIPE2)/g' \ -+ -e 's/@''GNULIB_PREAD''@/$(GL_GNULIB_PREAD)/g' \ -+ -e 's/@''GNULIB_PWRITE''@/$(GL_GNULIB_PWRITE)/g' \ -+ -e 's/@''GNULIB_READ''@/$(GL_GNULIB_READ)/g' \ -+ -e 's/@''GNULIB_READLINK''@/$(GL_GNULIB_READLINK)/g' \ -+ -e 's/@''GNULIB_READLINKAT''@/$(GL_GNULIB_READLINKAT)/g' \ -+ -e 's/@''GNULIB_RMDIR''@/$(GL_GNULIB_RMDIR)/g' \ -+ -e 's/@''GNULIB_SETHOSTNAME''@/$(GL_GNULIB_SETHOSTNAME)/g' \ -+ -e 's/@''GNULIB_SLEEP''@/$(GL_GNULIB_SLEEP)/g' \ -+ -e 's/@''GNULIB_SYMLINK''@/$(GL_GNULIB_SYMLINK)/g' \ -+ -e 's/@''GNULIB_SYMLINKAT''@/$(GL_GNULIB_SYMLINKAT)/g' \ -+ -e 's/@''GNULIB_TRUNCATE''@/$(GL_GNULIB_TRUNCATE)/g' \ -+ -e 's/@''GNULIB_TTYNAME_R''@/$(GL_GNULIB_TTYNAME_R)/g' \ -+ -e 's/@''GNULIB_UNISTD_H_GETOPT''@/0$(GL_GNULIB_UNISTD_H_GETOPT)/g' \ -+ -e 's/@''GNULIB_UNISTD_H_NONBLOCKING''@/$(GL_GNULIB_UNISTD_H_NONBLOCKING)/g' \ -+ -e 's/@''GNULIB_UNISTD_H_SIGPIPE''@/$(GL_GNULIB_UNISTD_H_SIGPIPE)/g' \ -+ -e 's/@''GNULIB_UNLINK''@/$(GL_GNULIB_UNLINK)/g' \ -+ -e 's/@''GNULIB_UNLINKAT''@/$(GL_GNULIB_UNLINKAT)/g' \ -+ -e 's/@''GNULIB_USLEEP''@/$(GL_GNULIB_USLEEP)/g' \ -+ -e 's/@''GNULIB_WRITE''@/$(GL_GNULIB_WRITE)/g' \ -+ -e 's/@''GNULIB_MDA_ACCESS''@/$(GL_GNULIB_MDA_ACCESS)/g' \ -+ -e 's/@''GNULIB_MDA_CHDIR''@/$(GL_GNULIB_MDA_CHDIR)/g' \ -+ -e 's/@''GNULIB_MDA_CLOSE''@/$(GL_GNULIB_MDA_CLOSE)/g' \ -+ -e 's/@''GNULIB_MDA_DUP''@/$(GL_GNULIB_MDA_DUP)/g' \ -+ -e 's/@''GNULIB_MDA_DUP2''@/$(GL_GNULIB_MDA_DUP2)/g' \ -+ -e 's/@''GNULIB_MDA_EXECL''@/$(GL_GNULIB_MDA_EXECL)/g' \ -+ -e 's/@''GNULIB_MDA_EXECLE''@/$(GL_GNULIB_MDA_EXECLE)/g' \ -+ -e 's/@''GNULIB_MDA_EXECLP''@/$(GL_GNULIB_MDA_EXECLP)/g' \ -+ -e 's/@''GNULIB_MDA_EXECV''@/$(GL_GNULIB_MDA_EXECV)/g' \ -+ -e 's/@''GNULIB_MDA_EXECVE''@/$(GL_GNULIB_MDA_EXECVE)/g' \ -+ -e 's/@''GNULIB_MDA_EXECVP''@/$(GL_GNULIB_MDA_EXECVP)/g' \ -+ -e 's/@''GNULIB_MDA_EXECVPE''@/$(GL_GNULIB_MDA_EXECVPE)/g' \ -+ -e 's/@''GNULIB_MDA_GETCWD''@/$(GL_GNULIB_MDA_GETCWD)/g' \ -+ -e 's/@''GNULIB_MDA_GETPID''@/$(GL_GNULIB_MDA_GETPID)/g' \ -+ -e 's/@''GNULIB_MDA_ISATTY''@/$(GL_GNULIB_MDA_ISATTY)/g' \ -+ -e 's/@''GNULIB_MDA_LSEEK''@/$(GL_GNULIB_MDA_LSEEK)/g' \ -+ -e 's/@''GNULIB_MDA_READ''@/$(GL_GNULIB_MDA_READ)/g' \ -+ -e 's/@''GNULIB_MDA_RMDIR''@/$(GL_GNULIB_MDA_RMDIR)/g' \ -+ -e 's/@''GNULIB_MDA_SWAB''@/$(GL_GNULIB_MDA_SWAB)/g' \ -+ -e 's/@''GNULIB_MDA_UNLINK''@/$(GL_GNULIB_MDA_UNLINK)/g' \ -+ -e 's/@''GNULIB_MDA_WRITE''@/$(GL_GNULIB_MDA_WRITE)/g' \ - < $(srcdir)/unistd.in.h | \ - sed -e 's|@''HAVE_CHOWN''@|$(HAVE_CHOWN)|g' \ - -e 's|@''HAVE_COPY_FILE_RANGE''@|$(HAVE_COPY_FILE_RANGE)|g' \ -@@ -3617,49 +3657,49 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) - -e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \ - -e 's|@''HAVE_WCHAR_H''@|$(HAVE_WCHAR_H)|g' \ - -e 's/@''HAVE_CRTDEFS_H''@/$(HAVE_CRTDEFS_H)/g' \ -- -e 's/@''GNULIB_OVERRIDES_WINT_T''@/$(GNULIB_OVERRIDES_WINT_T)/g' \ -- -e 's/@''GNULIB_BTOWC''@/$(GNULIB_BTOWC)/g' \ -- -e 's/@''GNULIB_WCTOB''@/$(GNULIB_WCTOB)/g' \ -- -e 's/@''GNULIB_MBSINIT''@/$(GNULIB_MBSINIT)/g' \ -- -e 's/@''GNULIB_MBRTOWC''@/$(GNULIB_MBRTOWC)/g' \ -- -e 's/@''GNULIB_MBRLEN''@/$(GNULIB_MBRLEN)/g' \ -- -e 's/@''GNULIB_MBSRTOWCS''@/$(GNULIB_MBSRTOWCS)/g' \ -- -e 's/@''GNULIB_MBSNRTOWCS''@/$(GNULIB_MBSNRTOWCS)/g' \ -- -e 's/@''GNULIB_WCRTOMB''@/$(GNULIB_WCRTOMB)/g' \ -- -e 's/@''GNULIB_WCSRTOMBS''@/$(GNULIB_WCSRTOMBS)/g' \ -- -e 's/@''GNULIB_WCSNRTOMBS''@/$(GNULIB_WCSNRTOMBS)/g' \ -- -e 's/@''GNULIB_WCWIDTH''@/$(GNULIB_WCWIDTH)/g' \ -- -e 's/@''GNULIB_WMEMCHR''@/$(GNULIB_WMEMCHR)/g' \ -- -e 's/@''GNULIB_WMEMCMP''@/$(GNULIB_WMEMCMP)/g' \ -- -e 's/@''GNULIB_WMEMCPY''@/$(GNULIB_WMEMCPY)/g' \ -- -e 's/@''GNULIB_WMEMMOVE''@/$(GNULIB_WMEMMOVE)/g' \ -- -e 's/@''GNULIB_WMEMPCPY''@/$(GNULIB_WMEMPCPY)/g' \ -- -e 's/@''GNULIB_WMEMSET''@/$(GNULIB_WMEMSET)/g' \ -- -e 's/@''GNULIB_WCSLEN''@/$(GNULIB_WCSLEN)/g' \ -- -e 's/@''GNULIB_WCSNLEN''@/$(GNULIB_WCSNLEN)/g' \ -- -e 's/@''GNULIB_WCSCPY''@/$(GNULIB_WCSCPY)/g' \ -- -e 's/@''GNULIB_WCPCPY''@/$(GNULIB_WCPCPY)/g' \ -- -e 's/@''GNULIB_WCSNCPY''@/$(GNULIB_WCSNCPY)/g' \ -- -e 's/@''GNULIB_WCPNCPY''@/$(GNULIB_WCPNCPY)/g' \ -- -e 's/@''GNULIB_WCSCAT''@/$(GNULIB_WCSCAT)/g' \ -- -e 's/@''GNULIB_WCSNCAT''@/$(GNULIB_WCSNCAT)/g' \ -- -e 's/@''GNULIB_WCSCMP''@/$(GNULIB_WCSCMP)/g' \ -- -e 's/@''GNULIB_WCSNCMP''@/$(GNULIB_WCSNCMP)/g' \ -- -e 's/@''GNULIB_WCSCASECMP''@/$(GNULIB_WCSCASECMP)/g' \ -- -e 's/@''GNULIB_WCSNCASECMP''@/$(GNULIB_WCSNCASECMP)/g' \ -- -e 's/@''GNULIB_WCSCOLL''@/$(GNULIB_WCSCOLL)/g' \ -- -e 's/@''GNULIB_WCSXFRM''@/$(GNULIB_WCSXFRM)/g' \ -- -e 's/@''GNULIB_WCSDUP''@/$(GNULIB_WCSDUP)/g' \ -- -e 's/@''GNULIB_WCSCHR''@/$(GNULIB_WCSCHR)/g' \ -- -e 's/@''GNULIB_WCSRCHR''@/$(GNULIB_WCSRCHR)/g' \ -- -e 's/@''GNULIB_WCSCSPN''@/$(GNULIB_WCSCSPN)/g' \ -- -e 's/@''GNULIB_WCSSPN''@/$(GNULIB_WCSSPN)/g' \ -- -e 's/@''GNULIB_WCSPBRK''@/$(GNULIB_WCSPBRK)/g' \ -- -e 's/@''GNULIB_WCSSTR''@/$(GNULIB_WCSSTR)/g' \ -- -e 's/@''GNULIB_WCSTOK''@/$(GNULIB_WCSTOK)/g' \ -- -e 's/@''GNULIB_WCSWIDTH''@/$(GNULIB_WCSWIDTH)/g' \ -- -e 's/@''GNULIB_WCSFTIME''@/$(GNULIB_WCSFTIME)/g' \ -- -e 's/@''GNULIB_MDA_WCSDUP''@/$(GNULIB_MDA_WCSDUP)/g' \ -+ -e 's/@''GNULIBHEADERS_OVERRIDE_WINT_T''@/$(GNULIBHEADERS_OVERRIDE_WINT_T)/g' \ -+ -e 's/@''GNULIB_BTOWC''@/$(GL_GNULIB_BTOWC)/g' \ -+ -e 's/@''GNULIB_WCTOB''@/$(GL_GNULIB_WCTOB)/g' \ -+ -e 's/@''GNULIB_MBSINIT''@/$(GL_GNULIB_MBSINIT)/g' \ -+ -e 's/@''GNULIB_MBRTOWC''@/$(GL_GNULIB_MBRTOWC)/g' \ -+ -e 's/@''GNULIB_MBRLEN''@/$(GL_GNULIB_MBRLEN)/g' \ -+ -e 's/@''GNULIB_MBSRTOWCS''@/$(GL_GNULIB_MBSRTOWCS)/g' \ -+ -e 's/@''GNULIB_MBSNRTOWCS''@/$(GL_GNULIB_MBSNRTOWCS)/g' \ -+ -e 's/@''GNULIB_WCRTOMB''@/$(GL_GNULIB_WCRTOMB)/g' \ -+ -e 's/@''GNULIB_WCSRTOMBS''@/$(GL_GNULIB_WCSRTOMBS)/g' \ -+ -e 's/@''GNULIB_WCSNRTOMBS''@/$(GL_GNULIB_WCSNRTOMBS)/g' \ -+ -e 's/@''GNULIB_WCWIDTH''@/$(GL_GNULIB_WCWIDTH)/g' \ -+ -e 's/@''GNULIB_WMEMCHR''@/$(GL_GNULIB_WMEMCHR)/g' \ -+ -e 's/@''GNULIB_WMEMCMP''@/$(GL_GNULIB_WMEMCMP)/g' \ -+ -e 's/@''GNULIB_WMEMCPY''@/$(GL_GNULIB_WMEMCPY)/g' \ -+ -e 's/@''GNULIB_WMEMMOVE''@/$(GL_GNULIB_WMEMMOVE)/g' \ -+ -e 's/@''GNULIB_WMEMPCPY''@/$(GL_GNULIB_WMEMPCPY)/g' \ -+ -e 's/@''GNULIB_WMEMSET''@/$(GL_GNULIB_WMEMSET)/g' \ -+ -e 's/@''GNULIB_WCSLEN''@/$(GL_GNULIB_WCSLEN)/g' \ -+ -e 's/@''GNULIB_WCSNLEN''@/$(GL_GNULIB_WCSNLEN)/g' \ -+ -e 's/@''GNULIB_WCSCPY''@/$(GL_GNULIB_WCSCPY)/g' \ -+ -e 's/@''GNULIB_WCPCPY''@/$(GL_GNULIB_WCPCPY)/g' \ -+ -e 's/@''GNULIB_WCSNCPY''@/$(GL_GNULIB_WCSNCPY)/g' \ -+ -e 's/@''GNULIB_WCPNCPY''@/$(GL_GNULIB_WCPNCPY)/g' \ -+ -e 's/@''GNULIB_WCSCAT''@/$(GL_GNULIB_WCSCAT)/g' \ -+ -e 's/@''GNULIB_WCSNCAT''@/$(GL_GNULIB_WCSNCAT)/g' \ -+ -e 's/@''GNULIB_WCSCMP''@/$(GL_GNULIB_WCSCMP)/g' \ -+ -e 's/@''GNULIB_WCSNCMP''@/$(GL_GNULIB_WCSNCMP)/g' \ -+ -e 's/@''GNULIB_WCSCASECMP''@/$(GL_GNULIB_WCSCASECMP)/g' \ -+ -e 's/@''GNULIB_WCSNCASECMP''@/$(GL_GNULIB_WCSNCASECMP)/g' \ -+ -e 's/@''GNULIB_WCSCOLL''@/$(GL_GNULIB_WCSCOLL)/g' \ -+ -e 's/@''GNULIB_WCSXFRM''@/$(GL_GNULIB_WCSXFRM)/g' \ -+ -e 's/@''GNULIB_WCSDUP''@/$(GL_GNULIB_WCSDUP)/g' \ -+ -e 's/@''GNULIB_WCSCHR''@/$(GL_GNULIB_WCSCHR)/g' \ -+ -e 's/@''GNULIB_WCSRCHR''@/$(GL_GNULIB_WCSRCHR)/g' \ -+ -e 's/@''GNULIB_WCSCSPN''@/$(GL_GNULIB_WCSCSPN)/g' \ -+ -e 's/@''GNULIB_WCSSPN''@/$(GL_GNULIB_WCSSPN)/g' \ -+ -e 's/@''GNULIB_WCSPBRK''@/$(GL_GNULIB_WCSPBRK)/g' \ -+ -e 's/@''GNULIB_WCSSTR''@/$(GL_GNULIB_WCSSTR)/g' \ -+ -e 's/@''GNULIB_WCSTOK''@/$(GL_GNULIB_WCSTOK)/g' \ -+ -e 's/@''GNULIB_WCSWIDTH''@/$(GL_GNULIB_WCSWIDTH)/g' \ -+ -e 's/@''GNULIB_WCSFTIME''@/$(GL_GNULIB_WCSFTIME)/g' \ -+ -e 's/@''GNULIB_MDA_WCSDUP''@/$(GL_GNULIB_MDA_WCSDUP)/g' \ - < $(srcdir)/wchar.in.h | \ - sed -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \ - -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \ -@@ -3760,14 +3800,14 @@ wctype.h: wctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_WCTYPE_H''@|$(NEXT_WCTYPE_H)|g' \ - -e 's/@''HAVE_CRTDEFS_H''@/$(HAVE_CRTDEFS_H)/g' \ -- -e 's/@''GNULIB_OVERRIDES_WINT_T''@/$(GNULIB_OVERRIDES_WINT_T)/g' \ -- -e 's/@''GNULIB_ISWBLANK''@/$(GNULIB_ISWBLANK)/g' \ -- -e 's/@''GNULIB_ISWDIGIT''@/$(GNULIB_ISWDIGIT)/g' \ -- -e 's/@''GNULIB_ISWXDIGIT''@/$(GNULIB_ISWXDIGIT)/g' \ -- -e 's/@''GNULIB_WCTYPE''@/$(GNULIB_WCTYPE)/g' \ -- -e 's/@''GNULIB_ISWCTYPE''@/$(GNULIB_ISWCTYPE)/g' \ -- -e 's/@''GNULIB_WCTRANS''@/$(GNULIB_WCTRANS)/g' \ -- -e 's/@''GNULIB_TOWCTRANS''@/$(GNULIB_TOWCTRANS)/g' \ -+ -e 's/@''GNULIBHEADERS_OVERRIDE_WINT_T''@/$(GNULIBHEADERS_OVERRIDE_WINT_T)/g' \ -+ -e 's/@''GNULIB_ISWBLANK''@/$(GL_GNULIB_ISWBLANK)/g' \ -+ -e 's/@''GNULIB_ISWDIGIT''@/$(GL_GNULIB_ISWDIGIT)/g' \ -+ -e 's/@''GNULIB_ISWXDIGIT''@/$(GL_GNULIB_ISWXDIGIT)/g' \ -+ -e 's/@''GNULIB_WCTYPE''@/$(GL_GNULIB_WCTYPE)/g' \ -+ -e 's/@''GNULIB_ISWCTYPE''@/$(GL_GNULIB_ISWCTYPE)/g' \ -+ -e 's/@''GNULIB_WCTRANS''@/$(GL_GNULIB_WCTRANS)/g' \ -+ -e 's/@''GNULIB_TOWCTRANS''@/$(GL_GNULIB_TOWCTRANS)/g' \ - -e 's/@''HAVE_ISWBLANK''@/$(HAVE_ISWBLANK)/g' \ - -e 's/@''HAVE_ISWCNTRL''@/$(HAVE_ISWCNTRL)/g' \ - -e 's/@''HAVE_WCTYPE_T''@/$(HAVE_WCTYPE_T)/g' \ -diff --git a/lib/_Noreturn.h b/lib/_Noreturn.h -index cb72f26..6fed3c7 100644 ---- a/lib/_Noreturn.h -+++ b/lib/_Noreturn.h -@@ -29,7 +29,7 @@ - # elif ((!defined __cplusplus || defined __clang__) \ - && (201112 <= (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) \ - || (!defined __STRICT_ANSI__ \ -- && (__4 < __GNUC__ + (7 <= __GNUC_MINOR__) \ -+ && (4 < __GNUC__ + (7 <= __GNUC_MINOR__) \ - || (defined __apple_build_version__ \ - ? 6000000 <= __apple_build_version__ \ - : 3 < __clang_major__ + (5 <= __clang_minor__)))))) -diff --git a/lib/accept.c b/lib/accept.c -index 4ec4f43..71457db 100644 ---- a/lib/accept.c -+++ b/lib/accept.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/accept4.c b/lib/accept4.c -index b444e22..4c2b80e 100644 ---- a/lib/accept4.c -+++ b/lib/accept4.c -@@ -1,18 +1,18 @@ - /* Accept a connection on a socket, with specific opening flags. - Copyright (C) 2009-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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 3 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #include - -diff --git a/lib/alignof.h b/lib/alignof.h -index 6977c3e..e6e7a51 100644 ---- a/lib/alignof.h -+++ b/lib/alignof.h -@@ -1,18 +1,18 @@ - /* Determine alignment of types. - Copyright (C) 2003-2004, 2006, 2009-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ along with this program. If not, see . */ - - #ifndef _ALIGNOF_H - #define _ALIGNOF_H -diff --git a/lib/alloca.c b/lib/alloca.c -index 91b9ec3..4880283 100644 ---- a/lib/alloca.c -+++ b/lib/alloca.c -@@ -1,5 +1,7 @@ - /* alloca.c -- allocate automatically reclaimed memory -- (Mostly) portable public-domain implementation -- D A Gwyn -+ This file is in the public domain. */ -+ -+/* (Mostly) portable implementation -- D A Gwyn - - This implementation of the PWB library alloca function, - which is used to allocate space off the run-time stack so -diff --git a/lib/alloca.in.h b/lib/alloca.in.h -index 9c7ccbb..65c2d4d 100644 ---- a/lib/alloca.in.h -+++ b/lib/alloca.in.h -@@ -3,20 +3,18 @@ - Copyright (C) 1995, 1999, 2001-2004, 2006-2021 Free Software Foundation, - Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -+ 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, see -- . -- */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - /* Avoid using the symbol _ALLOCA_H here, as Bison assumes _ALLOCA_H - means there is a real alloca function. */ -diff --git a/lib/arpa_inet.in.h b/lib/arpa_inet.in.h -index 0ac83ab..9968067 100644 ---- a/lib/arpa_inet.in.h -+++ b/lib/arpa_inet.in.h -@@ -2,18 +2,18 @@ - - Copyright (C) 2005-2006, 2008-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ along with this program. If not, see . */ - - #ifndef _@GUARD_PREFIX@_ARPA_INET_H - -diff --git a/lib/asnprintf.c b/lib/asnprintf.c -index 420440a..c5367b2 100644 ---- a/lib/asnprintf.c -+++ b/lib/asnprintf.c -@@ -1,18 +1,18 @@ - /* Formatted output to strings. - Copyright (C) 1999, 2002, 2006, 2009-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #include - -diff --git a/lib/assure.h b/lib/assure.h -index d95c0c9..49aa82f 100644 ---- a/lib/assure.h -+++ b/lib/assure.h -@@ -2,12 +2,12 @@ - - Copyright (C) 2014-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/attribute.h b/lib/attribute.h -index 27a0fce..80a23f5 100644 ---- a/lib/attribute.h -+++ b/lib/attribute.h -@@ -2,15 +2,15 @@ - - Copyright 2020-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -+ 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, see . */ -@@ -32,7 +32,7 @@ - - - /* This file defines two types of attributes: -- * C2X standard attributes. These have macro names that do not begin with -+ * C2x standard attributes. These have macro names that do not begin with - 'ATTRIBUTE_'. - * Selected GCC attributes; see: - https://gcc.gnu.org/onlinedocs/gcc/Common-Function-Attributes.html -diff --git a/lib/basename-lgpl.c b/lib/basename-lgpl.c -index 405edfa..5dbd157 100644 ---- a/lib/basename-lgpl.c -+++ b/lib/basename-lgpl.c -@@ -3,12 +3,12 @@ - Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2021 Free Software - Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/basename-lgpl.h b/lib/basename-lgpl.h -index 222d21f..d520c09 100644 ---- a/lib/basename-lgpl.h -+++ b/lib/basename-lgpl.h -@@ -1,20 +1,20 @@ --/* Extract the last component (base name) of a file name. -+/* Extract the last component (base name) of a file name. - -- Copyright (C) 1998, 2001, 2003-2006, 2009-2021 Free Software Foundation, -- Inc. -+ Copyright (C) 1998, 2001, 2003-2006, 2009-2021 Free Software Foundation, -+ Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 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. -+ This file 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, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #ifndef _BASENAME_LGPL_H - #define _BASENAME_LGPL_H -diff --git a/lib/binary-io.c b/lib/binary-io.c -index 83a820a..adc0ae2 100644 ---- a/lib/binary-io.c -+++ b/lib/binary-io.c -@@ -1,12 +1,12 @@ - /* Binary mode I/O. - Copyright 2017-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/binary-io.h b/lib/binary-io.h -index 1dfbe5a..0fa8d54 100644 ---- a/lib/binary-io.h -+++ b/lib/binary-io.h -@@ -1,12 +1,12 @@ - /* Binary mode I/O. - Copyright (C) 2001, 2003, 2005, 2008-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/bind.c b/lib/bind.c -index 87fe0ed..0e47254 100644 ---- a/lib/bind.c -+++ b/lib/bind.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/btowc.c b/lib/btowc.c -index e800878..b8239af 100644 ---- a/lib/btowc.c -+++ b/lib/btowc.c -@@ -2,12 +2,12 @@ - Copyright (C) 2008, 2010-2021 Free Software Foundation, Inc. - Written by Bruno Haible , 2008. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/byteswap.in.h b/lib/byteswap.in.h -index c176238..113f878 100644 ---- a/lib/byteswap.in.h -+++ b/lib/byteswap.in.h -@@ -2,12 +2,12 @@ - Copyright (C) 2005, 2007, 2009-2021 Free Software Foundation, Inc. - Written by Oskar Liljeblad , 2005. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/c-ctype.c b/lib/c-ctype.c -index 5d9d4d8..300f97c 100644 ---- a/lib/c-ctype.c -+++ b/lib/c-ctype.c -@@ -1,3 +1,21 @@ -+/* Character handling in C locale. -+ -+ Copyright (C) 2003-2021 Free Software Foundation, Inc. -+ -+ This file 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.1 of the -+ License, or (at your option) any later version. -+ -+ This file 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, see . */ -+ - #include -+ - #define C_CTYPE_INLINE _GL_EXTERN_INLINE - #include "c-ctype.h" -diff --git a/lib/c-ctype.h b/lib/c-ctype.h -index e8403db..3a652ac 100644 ---- a/lib/c-ctype.h -+++ b/lib/c-ctype.h -@@ -7,18 +7,18 @@ - - Copyright (C) 2000-2003, 2006, 2008-2021 Free Software Foundation, Inc. - --This program 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 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, see . */ -+ This file 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.1 of the -+ License, or (at your option) any later version. -+ -+ This file 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, see . */ - - #ifndef C_CTYPE_H - #define C_CTYPE_H -diff --git a/lib/c-strcase.h b/lib/c-strcase.h -index 8240dbc..82f99bb 100644 ---- a/lib/c-strcase.h -+++ b/lib/c-strcase.h -@@ -2,18 +2,18 @@ - Copyright (C) 1995-1996, 2001, 2003, 2005, 2009-2021 Free Software - Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ along with this program. If not, see . */ - - #ifndef C_STRCASE_H - #define C_STRCASE_H -diff --git a/lib/c-strcasecmp.c b/lib/c-strcasecmp.c -index 805dc99..3c22455 100644 ---- a/lib/c-strcasecmp.c -+++ b/lib/c-strcasecmp.c -@@ -1,18 +1,18 @@ - /* c-strcasecmp.c -- case insensitive string comparator in C locale - Copyright (C) 1998-1999, 2005-2006, 2009-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ along with this program. If not, see . */ - - #include - -diff --git a/lib/c-strcaseeq.h b/lib/c-strcaseeq.h -index ed979aa..66b9cf3 100644 ---- a/lib/c-strcaseeq.h -+++ b/lib/c-strcaseeq.h -@@ -1,15 +1,15 @@ - /* Optimized case-insensitive string comparison in C locale. - Copyright (C) 2001-2002, 2007, 2009-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -+ 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, see . */ -diff --git a/lib/c-strncasecmp.c b/lib/c-strncasecmp.c -index c3203fd..f3ca786 100644 ---- a/lib/c-strncasecmp.c -+++ b/lib/c-strncasecmp.c -@@ -1,18 +1,18 @@ - /* c-strncasecmp.c -- case insensitive string comparator in C locale - Copyright (C) 1998-1999, 2005-2006, 2009-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ along with this program. If not, see . */ - - #include - -diff --git a/lib/canonicalize-lgpl.c b/lib/canonicalize-lgpl.c -index c6fef17..92e9639 100644 ---- a/lib/canonicalize-lgpl.c -+++ b/lib/canonicalize-lgpl.c -@@ -74,7 +74,6 @@ - # define __pathconf pathconf - # define __rawmemchr rawmemchr - # define __readlink readlink --# define __stat stat - # if IN_RELOCWRAPPER - /* When building the relocatable program wrapper, use the system's memmove - function, not the gnulib override, otherwise we would get a link error. -@@ -105,7 +104,7 @@ file_accessible (char const *file) - return __faccessat (AT_FDCWD, file, F_OK, AT_EACCESS) == 0; - # else - struct stat st; -- return __stat (file, &st) == 0 || errno == EOVERFLOW; -+ return stat (file, &st) == 0 || errno == EOVERFLOW; - # endif - } - -diff --git a/lib/cdefs.h b/lib/cdefs.h -index 90f9741..4dac9d2 100644 ---- a/lib/cdefs.h -+++ b/lib/cdefs.h -@@ -259,9 +259,7 @@ - # define __attribute_const__ /* Ignore */ - #endif - --#if defined __STDC_VERSION__ && 201710L < __STDC_VERSION__ --# define __attribute_maybe_unused__ [[__maybe_unused__]] --#elif __GNUC_PREREQ (2,7) || __glibc_has_attribute (__unused__) -+#if __GNUC_PREREQ (2,7) || __glibc_has_attribute (__unused__) - # define __attribute_maybe_unused__ __attribute__ ((__unused__)) - #else - # define __attribute_maybe_unused__ /* Ignore */ -@@ -320,7 +318,9 @@ - #endif - - /* The nonnull function attribute marks pointer parameters that -- must not be NULL. */ -+ must not be NULL. This has the name __nonnull in glibc, -+ and __attribute_nonnull__ in files shared with Gnulib to avoid -+ collision with a different __nonnull in DragonFlyBSD 5.9. */ - #ifndef __attribute_nonnull__ - # if __GNUC_PREREQ (3,3) || __glibc_has_attribute (__nonnull__) - # define __attribute_nonnull__(params) __attribute__ ((__nonnull__ params)) -@@ -332,6 +332,16 @@ - # define __nonnull(params) __attribute_nonnull__ (params) - #endif - -+/* The returns_nonnull function attribute marks the return type of the function -+ as always being non-null. */ -+#ifndef __returns_nonnull -+# if __GNUC_PREREQ (4, 9) || __glibc_has_attribute (__returns_nonnull__) -+# define __returns_nonnull __attribute__ ((__returns_nonnull__)) -+# else -+# define __returns_nonnull -+# endif -+#endif -+ - /* If fortification mode, we warn about unused results of certain - function calls which can lead to problems. */ - #if __GNUC_PREREQ (3,4) || __glibc_has_attribute (__warn_unused_result__) -@@ -485,9 +495,9 @@ - [!!sizeof (struct { int __error_if_negative: (expr) ? 2 : -1; })] - #endif - --/* The #ifndef lets Gnulib avoid including these on non-glibc -- platforms, where the includes typically do not exist. */ --#ifndef __WORDSIZE -+/* Gnulib avoids including these, as they don't work on non-glibc or -+ older glibc platforms. */ -+#ifndef __GNULIB_CDEFS - # include - # include - #endif -@@ -594,9 +604,26 @@ _Static_assert (0, "IEEE 128-bits long double requires redirection on this platf - array according to access mode, or at least one element when - size-index is not provided: - access (access-mode, [, ]) */ --#define __attr_access(x) __attribute__ ((__access__ x)) -+# define __attr_access(x) __attribute__ ((__access__ x)) -+# if __GNUC_PREREQ (11, 0) -+# define __attr_access_none(argno) __attribute__ ((__access__ (__none__, argno))) -+# else -+# define __attr_access_none(argno) -+# endif - #else - # define __attr_access(x) -+# define __attr_access_none(argno) -+#endif -+ -+#if __GNUC_PREREQ (11, 0) -+/* Designates dealloc as a function to call to deallocate objects -+ allocated by the declared function. */ -+# define __attr_dealloc(dealloc, argno) \ -+ __attribute__ ((__malloc__ (dealloc, argno))) -+# define __attr_dealloc_free __attr_dealloc (__builtin_free, 1) -+#else -+# define __attr_dealloc(dealloc, argno) -+# define __attr_dealloc_free - #endif - - /* Specify that a function such as setjmp or vfork may return -diff --git a/lib/ceil.c b/lib/ceil.c -index 06e7e5e..fce05d9 100644 ---- a/lib/ceil.c -+++ b/lib/ceil.c -@@ -1,12 +1,12 @@ - /* Round towards positive infinity. - Copyright (C) 2007, 2010-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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 3 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/cloexec.c b/lib/cloexec.c -index 1f58b72..7defa93 100644 ---- a/lib/cloexec.c -+++ b/lib/cloexec.c -@@ -2,20 +2,20 @@ - - Copyright (C) 1991, 2004-2006, 2009-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . -+ along with this program. If not, see . */ - -- The code is taken from glibc/manual/llio.texi */ -+/* The code is taken from glibc/manual/llio.texi */ - - #include - -diff --git a/lib/cloexec.h b/lib/cloexec.h -index 7a71ad4..97a3659 100644 ---- a/lib/cloexec.h -+++ b/lib/cloexec.h -@@ -2,20 +2,18 @@ - - Copyright (C) 2004, 2009-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . -- --*/ -+ along with this program. If not, see . */ - - #include - -diff --git a/lib/close.c b/lib/close.c -index 11e31db..5b9ab6c 100644 ---- a/lib/close.c -+++ b/lib/close.c -@@ -1,12 +1,12 @@ - /* close replacement. - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/connect.c b/lib/connect.c -index fe0de7e..b2b2e93 100644 ---- a/lib/connect.c -+++ b/lib/connect.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/copysign.c b/lib/copysign.c -index ad5b102..fee131b 100644 ---- a/lib/copysign.c -+++ b/lib/copysign.c -@@ -1,12 +1,12 @@ - /* Copy sign into another 'double' number. - Copyright (C) 2011-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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 3 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/dirent.in.h b/lib/dirent.in.h -index a285bde..5775edf 100644 ---- a/lib/dirent.in.h -+++ b/lib/dirent.in.h -@@ -1,12 +1,12 @@ - /* A GNU-like . - Copyright (C) 2006-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -@@ -74,6 +74,30 @@ typedef struct gl_directory DIR; - - /* Declare overridden functions. */ - -+#if @GNULIB_CLOSEDIR@ -+# if @REPLACE_CLOSEDIR@ -+# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -+# undef closedir -+# define closedir rpl_closedir -+# define GNULIB_defined_closedir 1 -+# endif -+_GL_FUNCDECL_RPL (closedir, int, (DIR *dirp) _GL_ARG_NONNULL ((1))); -+_GL_CXXALIAS_RPL (closedir, int, (DIR *dirp)); -+# else -+# if !@HAVE_CLOSEDIR@ -+_GL_FUNCDECL_SYS (closedir, int, (DIR *dirp) _GL_ARG_NONNULL ((1))); -+# endif -+_GL_CXXALIAS_SYS (closedir, int, (DIR *dirp)); -+# endif -+_GL_CXXALIASWARN (closedir); -+#elif defined GNULIB_POSIXCHECK -+# undef closedir -+# if HAVE_RAW_DECL_CLOSEDIR -+_GL_WARN_ON_USE (closedir, "closedir is not portable - " -+ "use gnulib module closedir for portability"); -+# endif -+#endif -+ - #if @GNULIB_OPENDIR@ - # if @REPLACE_OPENDIR@ - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) -@@ -81,20 +105,36 @@ typedef struct gl_directory DIR; - # define opendir rpl_opendir - # define GNULIB_defined_opendir 1 - # endif --_GL_FUNCDECL_RPL (opendir, DIR *, (const char *dir_name) _GL_ARG_NONNULL ((1))); -+_GL_FUNCDECL_RPL (opendir, DIR *, -+ (const char *dir_name) -+ _GL_ARG_NONNULL ((1)) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC (closedir, 1)); - _GL_CXXALIAS_RPL (opendir, DIR *, (const char *dir_name)); - # else --# if !@HAVE_OPENDIR@ --_GL_FUNCDECL_SYS (opendir, DIR *, (const char *dir_name) _GL_ARG_NONNULL ((1))); -+# if !@HAVE_OPENDIR@ || __GNUC__ >= 11 -+_GL_FUNCDECL_SYS (opendir, DIR *, -+ (const char *dir_name) -+ _GL_ARG_NONNULL ((1)) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC (closedir, 1)); - # endif - _GL_CXXALIAS_SYS (opendir, DIR *, (const char *dir_name)); - # endif - _GL_CXXALIASWARN (opendir); --#elif defined GNULIB_POSIXCHECK --# undef opendir --# if HAVE_RAW_DECL_OPENDIR -+#else -+# if @GNULIB_CLOSEDIR@ && __GNUC__ >= 11 && !defined opendir -+/* For -Wmismatched-dealloc: Associate opendir with closedir or -+ rpl_closedir. */ -+_GL_FUNCDECL_SYS (opendir, DIR *, -+ (const char *dir_name) -+ _GL_ARG_NONNULL ((1)) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC (closedir, 1)); -+# endif -+# if defined GNULIB_POSIXCHECK -+# undef opendir -+# if HAVE_RAW_DECL_OPENDIR - _GL_WARN_ON_USE (opendir, "opendir is not portable - " - "use gnulib module opendir for portability"); -+# endif - # endif - #endif - -@@ -126,30 +166,6 @@ _GL_WARN_ON_USE (rewinddir, "rewinddir is not portable - " - # endif - #endif - --#if @GNULIB_CLOSEDIR@ --# if @REPLACE_CLOSEDIR@ --# if !(defined __cplusplus && defined GNULIB_NAMESPACE) --# undef closedir --# define closedir rpl_closedir --# define GNULIB_defined_closedir 1 --# endif --_GL_FUNCDECL_RPL (closedir, int, (DIR *dirp) _GL_ARG_NONNULL ((1))); --_GL_CXXALIAS_RPL (closedir, int, (DIR *dirp)); --# else --# if !@HAVE_CLOSEDIR@ --_GL_FUNCDECL_SYS (closedir, int, (DIR *dirp) _GL_ARG_NONNULL ((1))); --# endif --_GL_CXXALIAS_SYS (closedir, int, (DIR *dirp)); --# endif --_GL_CXXALIASWARN (closedir); --#elif defined GNULIB_POSIXCHECK --# undef closedir --# if HAVE_RAW_DECL_CLOSEDIR --_GL_WARN_ON_USE (closedir, "closedir is not portable - " -- "use gnulib module closedir for portability"); --# endif --#endif -- - #if @GNULIB_DIRFD@ - /* Return the file descriptor associated with the given directory stream, - or -1 if none exists. */ -@@ -200,20 +216,33 @@ _GL_WARN_ON_USE (dirfd, "dirfd is unportable - " - # undef fdopendir - # define fdopendir rpl_fdopendir - # endif --_GL_FUNCDECL_RPL (fdopendir, DIR *, (int fd)); -+_GL_FUNCDECL_RPL (fdopendir, DIR *, -+ (int fd) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC (closedir, 1)); - _GL_CXXALIAS_RPL (fdopendir, DIR *, (int fd)); - # else --# if !@HAVE_FDOPENDIR@ || !@HAVE_DECL_FDOPENDIR@ --_GL_FUNCDECL_SYS (fdopendir, DIR *, (int fd)); -+# if !@HAVE_FDOPENDIR@ || !@HAVE_DECL_FDOPENDIR@ || __GNUC__ >= 11 -+_GL_FUNCDECL_SYS (fdopendir, DIR *, -+ (int fd) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC (closedir, 1)); - # endif - _GL_CXXALIAS_SYS (fdopendir, DIR *, (int fd)); - # endif - _GL_CXXALIASWARN (fdopendir); --#elif defined GNULIB_POSIXCHECK --# undef fdopendir --# if HAVE_RAW_DECL_FDOPENDIR -+#else -+# if @GNULIB_CLOSEDIR@ && __GNUC__ >= 11 && !defined fdopendir -+/* For -Wmismatched-dealloc: Associate fdopendir with closedir or -+ rpl_closedir. */ -+_GL_FUNCDECL_SYS (fdopendir, DIR *, -+ (int fd) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC (closedir, 1)); -+# endif -+# if defined GNULIB_POSIXCHECK -+# undef fdopendir -+# if HAVE_RAW_DECL_FDOPENDIR - _GL_WARN_ON_USE (fdopendir, "fdopendir is unportable - " - "use gnulib module fdopendir for portability"); -+# endif - # endif - #endif - -diff --git a/lib/dirfd.c b/lib/dirfd.c -index 7da640f..640cb4f 100644 ---- a/lib/dirfd.c -+++ b/lib/dirfd.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2001, 2006, 2008-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/dirname-lgpl.c b/lib/dirname-lgpl.c -index 9cc5db7..95f9c99 100644 ---- a/lib/dirname-lgpl.c -+++ b/lib/dirname-lgpl.c -@@ -3,12 +3,12 @@ - Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2021 Free Software - Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/dirname.h b/lib/dirname.h -index dce1859..25abc7b 100644 ---- a/lib/dirname.h -+++ b/lib/dirname.h -@@ -1,26 +1,26 @@ --/* Take file names apart into directory and base names. -+/* Take file names apart into directory and base names. - -- Copyright (C) 1998, 2001, 2003-2006, 2009-2021 Free Software Foundation, -- Inc. -+ Copyright (C) 1998, 2001, 2003-2006, 2009-2021 Free Software Foundation, -+ Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 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. -+ This file 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, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #ifndef DIRNAME_H_ - # define DIRNAME_H_ 1 - - # include --# include -+# include - # include "filename.h" - # include "basename-lgpl.h" - -@@ -33,11 +33,16 @@ extern "C" { - #endif - - # if GNULIB_DIRNAME --char *base_name (char const *file) _GL_ATTRIBUTE_MALLOC; --char *dir_name (char const *file); -+char *base_name (char const *file) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE -+ _GL_ATTRIBUTE_RETURNS_NONNULL; -+char *dir_name (char const *file) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE -+ _GL_ATTRIBUTE_RETURNS_NONNULL; - # endif - --char *mdir_name (char const *file); -+char *mdir_name (char const *file) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE; - size_t dir_len (char const *file) _GL_ATTRIBUTE_PURE; - - bool strip_trailing_slashes (char *file); -diff --git a/lib/dup2.c b/lib/dup2.c -index 653ef89..53e5552 100644 ---- a/lib/dup2.c -+++ b/lib/dup2.c -@@ -2,12 +2,12 @@ - - Copyright (C) 1999, 2004-2007, 2009-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/duplocale.c b/lib/duplocale.c -index 430634d..bc8740d 100644 ---- a/lib/duplocale.c -+++ b/lib/duplocale.c -@@ -1,12 +1,12 @@ - /* Duplicate a locale object. - Copyright (C) 2009-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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 3 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/dynarray.h b/lib/dynarray.h -index 5db6ed9..ec64273 100644 ---- a/lib/dynarray.h -+++ b/lib/dynarray.h -@@ -1,12 +1,12 @@ - /* Type-safe arrays which grow dynamically. - Copyright 2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -@@ -257,18 +257,22 @@ static DYNARRAY_ELEMENT * - - #if defined DYNARRAY_STRUCT || defined DYNARRAY_ELEMENT || defined DYNARRAY_PREFIX - --# include -+# ifndef _GL_LIKELY -+/* Rely on __builtin_expect, as provided by the module 'builtin-expect'. */ -+# define _GL_LIKELY(cond) __builtin_expect ((cond), 1) -+# define _GL_UNLIKELY(cond) __builtin_expect ((cond), 0) -+# endif - - /* Define auxiliary structs and declare auxiliary functions, common to all - instantiations of dynarray. */ --# include -+# include - - /* Define the instantiation, specified through - DYNARRAY_STRUCT - DYNARRAY_ELEMENT - DYNARRAY_PREFIX - etc. */ --# include -+# include - - #else - -diff --git a/lib/errno.in.h b/lib/errno.in.h -index 0ae2ace..3cad9e2 100644 ---- a/lib/errno.in.h -+++ b/lib/errno.in.h -@@ -2,18 +2,18 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ along with this program. If not, see . */ - - #ifndef _@GUARD_PREFIX@_ERRNO_H - -diff --git a/lib/fcntl.c b/lib/fcntl.c -index e6c4b8e..c744eb9 100644 ---- a/lib/fcntl.c -+++ b/lib/fcntl.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2009-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/fcntl.in.h b/lib/fcntl.in.h -index 7254a56..26dedc3 100644 ---- a/lib/fcntl.in.h -+++ b/lib/fcntl.in.h -@@ -2,12 +2,12 @@ - - Copyright (C) 2006-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/fd-hook.c b/lib/fd-hook.c -index f8e2781..75b1626 100644 ---- a/lib/fd-hook.c -+++ b/lib/fd-hook.c -@@ -2,15 +2,15 @@ - Copyright (C) 2009-2021 Free Software Foundation, Inc. - Written by Bruno Haible , 2009. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -+ 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, see . */ -diff --git a/lib/fd-hook.h b/lib/fd-hook.h -index 0005db7..98e2a52 100644 ---- a/lib/fd-hook.h -+++ b/lib/fd-hook.h -@@ -1,15 +1,15 @@ - /* Hook for making file descriptor functions close(), ioctl() extensible. - Copyright (C) 2009-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -+ 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, see . */ -diff --git a/lib/float+.h b/lib/float+.h -index d814bf1..ad891f6 100644 ---- a/lib/float+.h -+++ b/lib/float+.h -@@ -2,18 +2,18 @@ - Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. - Written by Bruno Haible , 2007. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ along with this program. If not, see . */ - - #ifndef _FLOATPLUS_H - #define _FLOATPLUS_H -diff --git a/lib/float.c b/lib/float.c -index 5c16d61..dd1e84a 100644 ---- a/lib/float.c -+++ b/lib/float.c -@@ -2,12 +2,12 @@ - Copyright (C) 2011-2021 Free Software Foundation, Inc. - Written by Bruno Haible , 2011. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/float.in.h b/lib/float.in.h -index 1179df5..f52aba3 100644 ---- a/lib/float.in.h -+++ b/lib/float.in.h -@@ -2,12 +2,12 @@ - - Copyright (C) 2007-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/floor.c b/lib/floor.c -index 9f13d16..1530300 100644 ---- a/lib/floor.c -+++ b/lib/floor.c -@@ -1,12 +1,12 @@ - /* Round towards negative infinity. - Copyright (C) 2007, 2010-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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 3 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/free.c b/lib/free.c -index b221241..780f03d 100644 ---- a/lib/free.c -+++ b/lib/free.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2003, 2006, 2009-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/frexp.c b/lib/frexp.c -index 55340b8..ab5f343 100644 ---- a/lib/frexp.c -+++ b/lib/frexp.c -@@ -1,12 +1,12 @@ - /* Split a double into fraction and mantissa. - Copyright (C) 2007-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/fstat.c b/lib/fstat.c -index 30440d6..512c688 100644 ---- a/lib/fstat.c -+++ b/lib/fstat.c -@@ -1,12 +1,12 @@ - /* fstat() replacement. - Copyright (C) 2011-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/fsync.c b/lib/fsync.c -index 71fcdde..99a932d 100644 ---- a/lib/fsync.c -+++ b/lib/fsync.c -@@ -9,15 +9,15 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- 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.1 of the License, or (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This library is distributed in the hope that it will be useful, -+ This file 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. -+ 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, see . */ -diff --git a/lib/full-read.c b/lib/full-read.c -index 32ff1a5..53be659 100644 ---- a/lib/full-read.c -+++ b/lib/full-read.c -@@ -1,12 +1,12 @@ - /* An interface to read that retries after partial reads and interrupts. - Copyright (C) 2002-2003, 2009-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/full-read.h b/lib/full-read.h -index 450d645..b36f2e1 100644 ---- a/lib/full-read.h -+++ b/lib/full-read.h -@@ -2,12 +2,12 @@ - - Copyright (C) 2002, 2009-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/full-write.c b/lib/full-write.c -index acbfc31..614ca0b 100644 ---- a/lib/full-write.c -+++ b/lib/full-write.c -@@ -2,12 +2,12 @@ - - Copyright (C) 1993-1994, 1997-2006, 2009-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/full-write.h b/lib/full-write.h -index 1220d05..c316224 100644 ---- a/lib/full-write.h -+++ b/lib/full-write.h -@@ -2,12 +2,12 @@ - - Copyright (C) 2002-2003, 2009-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/gai_strerror.c b/lib/gai_strerror.c -index 907e8e6..4874ef5 100644 ---- a/lib/gai_strerror.c -+++ b/lib/gai_strerror.c -@@ -3,18 +3,18 @@ - This file is part of the GNU C Library. - Contributed by Philip Blundell , 1997. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ along with this program. If not, see . */ - - #ifndef _LIBC - # include -diff --git a/lib/getaddrinfo.c b/lib/getaddrinfo.c -index 05fc59e..0c42d1b 100644 ---- a/lib/getaddrinfo.c -+++ b/lib/getaddrinfo.c -@@ -2,18 +2,18 @@ - Copyright (C) 1997, 2001-2002, 2004-2021 Free Software Foundation, Inc. - Contributed by Simon Josefsson . - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ along with this program. If not, see . */ - - /* Don't use __attribute__ __nonnull__ in this compilation unit. Otherwise gcc - optimizes away the sa == NULL test below. */ -diff --git a/lib/getdtablesize.c b/lib/getdtablesize.c -index 918db9d..5006c2d 100644 ---- a/lib/getdtablesize.c -+++ b/lib/getdtablesize.c -@@ -2,12 +2,12 @@ - Copyright (C) 2008-2021 Free Software Foundation, Inc. - Written by Bruno Haible , 2008. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/getlogin.c b/lib/getlogin.c -index 4a70994..7b78c67 100644 ---- a/lib/getlogin.c -+++ b/lib/getlogin.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2010-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/getpeername.c b/lib/getpeername.c -index 5d9cf79..468bb3d 100644 ---- a/lib/getpeername.c -+++ b/lib/getpeername.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/getrandom.c b/lib/getrandom.c -index b467caa..a186c4d 100644 ---- a/lib/getrandom.c -+++ b/lib/getrandom.c -@@ -2,12 +2,12 @@ - - Copyright 2020-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -@@ -178,7 +178,11 @@ getrandom (void *buffer, size_t length, unsigned int flags) - + (flags & GRND_NONBLOCK ? O_NONBLOCK : 0)); - fd = open (randdevice[devrandom], oflags); - if (fd < 0) -- return fd; -+ { -+ if (errno == ENOENT || errno == ENOTDIR) -+ errno = ENOSYS; -+ return -1; -+ } - randfd[devrandom] = fd; - } - -diff --git a/lib/getsockname.c b/lib/getsockname.c -index 83c1b7d..d1f17b3 100644 ---- a/lib/getsockname.c -+++ b/lib/getsockname.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/getsockopt.c b/lib/getsockopt.c -index cec4933..b92d034 100644 ---- a/lib/getsockopt.c -+++ b/lib/getsockopt.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/gettext.h b/lib/gettext.h -index dd05cda..f1c7a24 100644 ---- a/lib/gettext.h -+++ b/lib/gettext.h -@@ -2,18 +2,18 @@ - Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2021 Free Software - Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #ifndef _LIBGETTEXT_H - #define _LIBGETTEXT_H 1 -diff --git a/lib/hard-locale.c b/lib/hard-locale.c -index ab3610d..8b6802d 100644 ---- a/lib/hard-locale.c -+++ b/lib/hard-locale.c -@@ -3,12 +3,12 @@ - Copyright (C) 1997-1999, 2002-2004, 2006-2007, 2009-2021 Free Software - Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/hard-locale.h b/lib/hard-locale.h -index c4449f9..eba6601 100644 ---- a/lib/hard-locale.h -+++ b/lib/hard-locale.h -@@ -2,12 +2,12 @@ - - Copyright (C) 1999, 2003-2004, 2009-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/iconv.c b/lib/iconv.c -index f3480aa..bf51493 100644 ---- a/lib/iconv.c -+++ b/lib/iconv.c -@@ -1,18 +1,18 @@ - /* Character set conversion. - Copyright (C) 1999-2001, 2007, 2009-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #include - -diff --git a/lib/iconv.in.h b/lib/iconv.in.h -index 0fc0fa7..3a2f94e 100644 ---- a/lib/iconv.in.h -+++ b/lib/iconv.in.h -@@ -2,18 +2,18 @@ - - Copyright (C) 2007-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ along with this program. If not, see . */ - - #ifndef _@GUARD_PREFIX@_ICONV_H - -diff --git a/lib/iconv_close.c b/lib/iconv_close.c -index bc40fec..7429b92 100644 ---- a/lib/iconv_close.c -+++ b/lib/iconv_close.c -@@ -1,18 +1,18 @@ - /* Character set conversion. - Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #include - -diff --git a/lib/iconv_open-aix.gperf b/lib/iconv_open-aix.gperf -index 20ce70a..d073759 100644 ---- a/lib/iconv_open-aix.gperf -+++ b/lib/iconv_open-aix.gperf -@@ -1,18 +1,18 @@ - /* Character set conversion. - Copyright (C) 2007, 2020-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - struct mapping { int standard_name; const char vendor_name[10 + 1]; }; - %struct-type -diff --git a/lib/iconv_open-hpux.gperf b/lib/iconv_open-hpux.gperf -index 921c722..f4664d6 100644 ---- a/lib/iconv_open-hpux.gperf -+++ b/lib/iconv_open-hpux.gperf -@@ -1,18 +1,18 @@ - /* Character set conversion. - Copyright (C) 2007, 2020-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - struct mapping { int standard_name; const char vendor_name[9 + 1]; }; - %struct-type -diff --git a/lib/iconv_open-irix.gperf b/lib/iconv_open-irix.gperf -index 6241de6..9885d92 100644 ---- a/lib/iconv_open-irix.gperf -+++ b/lib/iconv_open-irix.gperf -@@ -1,18 +1,18 @@ - /* Character set conversion. - Copyright (C) 2007, 2020-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - struct mapping { int standard_name; const char vendor_name[10 + 1]; }; - %struct-type -diff --git a/lib/iconv_open-osf.gperf b/lib/iconv_open-osf.gperf -index 97d570c..d818d79 100644 ---- a/lib/iconv_open-osf.gperf -+++ b/lib/iconv_open-osf.gperf -@@ -1,18 +1,18 @@ - /* Character set conversion. - Copyright (C) 2007, 2020-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - struct mapping { int standard_name; const char vendor_name[10 + 1]; }; - %struct-type -diff --git a/lib/iconv_open-solaris.gperf b/lib/iconv_open-solaris.gperf -index 0283aba..648dd3a 100644 ---- a/lib/iconv_open-solaris.gperf -+++ b/lib/iconv_open-solaris.gperf -@@ -1,18 +1,18 @@ - /* Character set conversion. - Copyright (C) 2007, 2009, 2020-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - struct mapping { int standard_name; const char vendor_name[10 + 1]; }; - %struct-type -diff --git a/lib/iconv_open-zos.gperf b/lib/iconv_open-zos.gperf -index faf5d65..1c3552e 100644 ---- a/lib/iconv_open-zos.gperf -+++ b/lib/iconv_open-zos.gperf -@@ -1,18 +1,18 @@ - /* Character set conversion. - Copyright (C) 2019-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - struct mapping { int standard_name; const char vendor_name[10 + 1]; }; - %struct-type -diff --git a/lib/iconv_open.c b/lib/iconv_open.c -index 304592e..e573556 100644 ---- a/lib/iconv_open.c -+++ b/lib/iconv_open.c -@@ -1,18 +1,18 @@ - /* Character set conversion. - Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #include - -diff --git a/lib/iconveh.h b/lib/iconveh.h -index b2be8fa..cbf692e 100644 ---- a/lib/iconveh.h -+++ b/lib/iconveh.h -@@ -2,12 +2,12 @@ - Copyright (C) 2001-2007, 2009-2021 Free Software Foundation, Inc. - Written by Bruno Haible. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/inet_ntop.c b/lib/inet_ntop.c -index 5b9ea11..409e88c 100644 ---- a/lib/inet_ntop.c -+++ b/lib/inet_ntop.c -@@ -2,18 +2,18 @@ - - Copyright (C) 2005-2006, 2008-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ along with this program. If not, see . */ - - /* - * Copyright (c) 1996-1999 by Internet Software Consortium. -diff --git a/lib/inet_pton.c b/lib/inet_pton.c -index 57dc7dc..14e8b0a 100644 ---- a/lib/inet_pton.c -+++ b/lib/inet_pton.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2006, 2008-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/inttypes.in.h b/lib/inttypes.in.h -index fe0af82..41cb422 100644 ---- a/lib/inttypes.in.h -+++ b/lib/inttypes.in.h -@@ -2,12 +2,12 @@ - Written by Paul Eggert, Bruno Haible, Derek Price. - This file is part of gnulib. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/isfinite.c b/lib/isfinite.c -index cfd2d33..f1373b9 100644 ---- a/lib/isfinite.c -+++ b/lib/isfinite.c -@@ -1,18 +1,18 @@ - /* Test for finite value (zero, subnormal, or normal, and not infinite or NaN). - Copyright (C) 2007-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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 3 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - /* Written by Ben Pfaff , 2007. */ - -diff --git a/lib/isinf.c b/lib/isinf.c -index 6d4dfc0..62becf2 100644 ---- a/lib/isinf.c -+++ b/lib/isinf.c -@@ -1,18 +1,18 @@ - /* Test for positive or negative infinity. - Copyright (C) 2007-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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 3 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - /* Written by Ben Pfaff , 2008. */ - -diff --git a/lib/isnan.c b/lib/isnan.c -index 2282269..ed3452f 100644 ---- a/lib/isnan.c -+++ b/lib/isnan.c -@@ -1,12 +1,12 @@ - /* Test for NaN that does not need libm. - Copyright (C) 2007-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/isnand-nolibm.h b/lib/isnand-nolibm.h -index fbed474..df64f4e 100644 ---- a/lib/isnand-nolibm.h -+++ b/lib/isnand-nolibm.h -@@ -1,12 +1,12 @@ - /* Test for NaN that does not need libm. - Copyright (C) 2007-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/isnand.c b/lib/isnand.c -index f359130..7c5df90 100644 ---- a/lib/isnand.c -+++ b/lib/isnand.c -@@ -1,12 +1,12 @@ - /* Test for NaN that does not need libm. - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/isnanf-nolibm.h b/lib/isnanf-nolibm.h -index ba609d5..bd85811 100644 ---- a/lib/isnanf-nolibm.h -+++ b/lib/isnanf-nolibm.h -@@ -1,12 +1,12 @@ - /* Test for NaN that does not need libm. - Copyright (C) 2007-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/isnanf.c b/lib/isnanf.c -index 94a32e5..3b60340 100644 ---- a/lib/isnanf.c -+++ b/lib/isnanf.c -@@ -1,12 +1,12 @@ - /* Test for NaN that does not need libm. - Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/isnanl-nolibm.h b/lib/isnanl-nolibm.h -index 797c06b..41fe156 100644 ---- a/lib/isnanl-nolibm.h -+++ b/lib/isnanl-nolibm.h -@@ -1,12 +1,12 @@ - /* Test for NaN that does not need libm. - Copyright (C) 2007-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/isnanl.c b/lib/isnanl.c -index b459560..e8dedf0 100644 ---- a/lib/isnanl.c -+++ b/lib/isnanl.c -@@ -1,12 +1,12 @@ - /* Test for NaN that does not need libm. - Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/itold.c b/lib/itold.c -index f52216a..7984866 100644 ---- a/lib/itold.c -+++ b/lib/itold.c -@@ -2,12 +2,12 @@ - Copyright (C) 2011-2021 Free Software Foundation, Inc. - Written by Bruno Haible , 2011. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/langinfo.in.h b/lib/langinfo.in.h -index e8ac12c..4873899 100644 ---- a/lib/langinfo.in.h -+++ b/lib/langinfo.in.h -@@ -1,18 +1,18 @@ - /* Substitute for and wrapper around . - Copyright (C) 2009-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ along with this program. If not, see . */ - - /* - * POSIX for platforms that lack it or have an incomplete one. -diff --git a/lib/lc-charset-dispatch.c b/lib/lc-charset-dispatch.c -index 98c6e9d..88a0bd3 100644 ---- a/lib/lc-charset-dispatch.c -+++ b/lib/lc-charset-dispatch.c -@@ -1,12 +1,12 @@ - /* Dispatching based on the current locale's character encoding. - Copyright (C) 2018-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/lc-charset-dispatch.h b/lib/lc-charset-dispatch.h -index d9d1ac1..59b485d 100644 ---- a/lib/lc-charset-dispatch.h -+++ b/lib/lc-charset-dispatch.h -@@ -1,12 +1,12 @@ - /* Dispatching based on the current locale's character encoding. - Copyright (C) 2018-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/libc-config.h b/lib/libc-config.h -index f14013f..886c11f 100644 ---- a/lib/libc-config.h -+++ b/lib/libc-config.h -@@ -28,7 +28,10 @@ - - When compiled as part of glibc this is a no-op; when compiled as - part of Gnulib this includes Gnulib's and defines macros -- that glibc library code would normally assume. */ -+ that glibc library code would normally assume. -+ -+ Note: This header file MUST NOT be included by public header files -+ of Gnulib. */ - - #include - -@@ -71,7 +74,7 @@ - # endif - #endif - --#ifndef __attribute_maybe_unused__ -+#ifndef __attribute_nonnull__ - /* either does not exist, or is too old for Gnulib. - Prepare to include , which is Gnulib's version of a - more-recent glibc . */ -@@ -80,13 +83,9 @@ - # ifndef _FEATURES_H - # define _FEATURES_H 1 - # endif --/* Define __WORDSIZE so that does not attempt to include -- nonexistent files. Make it a syntax error, since Gnulib does not -- use __WORDSIZE now, and if Gnulib uses it later the syntax error -- will let us know that __WORDSIZE needs configuring. */ --# ifndef __WORDSIZE --# define __WORDSIZE %%% --# endif -+/* Define __GNULIB_CDEFS so that does not attempt to include -+ nonexistent files. */ -+# define __GNULIB_CDEFS - /* Undef the macros unconditionally defined by our copy of glibc - , so that they do not clash with any system-defined - versions. */ -@@ -118,6 +117,9 @@ - # undef __THROW - # undef __THROWNL - # undef __attr_access -+# undef __attr_access_none -+# undef __attr_dealloc -+# undef __attr_dealloc_free - # undef __attribute__ - # undef __attribute_alloc_size__ - # undef __attribute_artificial__ -diff --git a/lib/libunistring.valgrind b/lib/libunistring.valgrind -index 712c39a..9eee19a 100644 ---- a/lib/libunistring.valgrind -+++ b/lib/libunistring.valgrind -@@ -2,18 +2,26 @@ - - # Copyright (C) 2010-2021 Free Software Foundation, Inc. - # --# This program 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 file is free software. -+# It is dual-licensed under "the GNU LGPLv3+ or the GNU GPLv2+". -+# You can redistribute it and/or modify it under either -+# - the terms of the GNU Lesser General Public License as published -+# by the Free Software Foundation; either version 3, or (at your -+# option) any later version, or -+# - the terms of the GNU General Public License as published by the -+# Free Software Foundation; either version 2, or (at your option) -+# any later version, or -+# - the same dual license "the GNU LGPLv3+ or the GNU GPLv2+". - # - # 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. -+# Lesser General Public License and the GNU 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, see . -+# You should have received a copy of the GNU Lesser General Public -+# License and of the GNU General Public License along with this -+# program. If not, see . - - # Suppress a valgrind message about use of uninitialized memory in freea(). - # This use is OK because it provides only a speedup. -diff --git a/lib/limits.in.h b/lib/limits.in.h -index 4675ba4..2ecafeb 100644 ---- a/lib/limits.in.h -+++ b/lib/limits.in.h -@@ -2,18 +2,18 @@ - - Copyright 2016-2021 Free Software Foundation, Inc. - -- This program 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, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ along with this program. If not, see . */ - - #if __GNUC__ >= 3 - @PRAGMA_SYSTEM_HEADER@ -@@ -99,10 +99,11 @@ - # endif - #endif - --/* Macros specified by ISO/IEC TS 18661-1:2014. */ -+/* Macros specified by C2x and by ISO/IEC TS 18661-1:2014. */ - - #if (! defined ULLONG_WIDTH \ -- && (defined _GNU_SOURCE || defined __STDC_WANT_IEC_60559_BFP_EXT__)) -+ && (defined _GNU_SOURCE || defined __STDC_WANT_IEC_60559_BFP_EXT__ \ -+ || (defined __STDC_VERSION__ && 201710 < __STDC_VERSION__))) - # define CHAR_WIDTH _GL_INTEGER_WIDTH (CHAR_MIN, CHAR_MAX) - # define SCHAR_WIDTH _GL_INTEGER_WIDTH (SCHAR_MIN, SCHAR_MAX) - # define UCHAR_WIDTH _GL_INTEGER_WIDTH (0, UCHAR_MAX) -@@ -114,7 +115,16 @@ - # define ULONG_WIDTH _GL_INTEGER_WIDTH (0, ULONG_MAX) - # define LLONG_WIDTH _GL_INTEGER_WIDTH (LLONG_MIN, LLONG_MAX) - # define ULLONG_WIDTH _GL_INTEGER_WIDTH (0, ULLONG_MAX) --#endif /* !ULLONG_WIDTH && (_GNU_SOURCE || __STDC_WANT_IEC_60559_BFP_EXT__) */ -+#endif -+ -+/* Macros specified by C2x. */ -+ -+#if (! defined BOOL_WIDTH \ -+ && (defined _GNU_SOURCE \ -+ || (defined __STDC_VERSION__ && 201710 < __STDC_VERSION__))) -+# define BOOL_MAX 1 -+# define BOOL_WIDTH 1 -+#endif - - #endif /* _@GUARD_PREFIX@_LIMITS_H */ - #endif /* _@GUARD_PREFIX@_LIMITS_H */ -diff --git a/lib/link.c b/lib/link.c -index 3ba897a..bd4bef9 100644 ---- a/lib/link.c -+++ b/lib/link.c -@@ -2,18 +2,18 @@ - - Copyright (C) 2009-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ along with this program. If not, see . */ - - #include - -diff --git a/lib/listen.c b/lib/listen.c -index ccf881c..a145f82 100644 ---- a/lib/listen.c -+++ b/lib/listen.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/localcharset.c b/lib/localcharset.c -index 87a5979..9c22050 100644 ---- a/lib/localcharset.c -+++ b/lib/localcharset.c -@@ -2,18 +2,18 @@ - - Copyright (C) 2000-2006, 2008-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - /* Written by Bruno Haible . */ - -diff --git a/lib/localcharset.h b/lib/localcharset.h -index c2c1c67..27c3ab6 100644 ---- a/lib/localcharset.h -+++ b/lib/localcharset.h -@@ -2,18 +2,18 @@ - Copyright (C) 2000-2003, 2009-2021 Free Software Foundation, Inc. - This file is part of the GNU CHARSET Library. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #ifndef _LOCALCHARSET_H - #define _LOCALCHARSET_H -diff --git a/lib/locale.in.h b/lib/locale.in.h -index 4eb3c80..1063070 100644 ---- a/lib/locale.in.h -+++ b/lib/locale.in.h -@@ -1,12 +1,12 @@ - /* A POSIX . - Copyright (C) 2007-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/localeconv.c b/lib/localeconv.c -index cdcaf86..25e95a1 100644 ---- a/lib/localeconv.c -+++ b/lib/localeconv.c -@@ -1,12 +1,12 @@ - /* Query locale dependent information for formatting numbers. - Copyright (C) 2012-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/log.c b/lib/log.c -index 03e9ac9..3f142e8 100644 ---- a/lib/log.c -+++ b/lib/log.c -@@ -1,12 +1,12 @@ - /* Logarithm. - Copyright (C) 2012-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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 3 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/log1p.c b/lib/log1p.c -index 0e51498..c45c6ff 100644 ---- a/lib/log1p.c -+++ b/lib/log1p.c -@@ -1,12 +1,12 @@ - /* Natural logarithm of 1 plus argument. - Copyright (C) 2012-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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 3 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/lstat.c b/lib/lstat.c -index d414d3a..7de0bf1 100644 ---- a/lib/lstat.c -+++ b/lib/lstat.c -@@ -2,12 +2,12 @@ - - Copyright (C) 1997-2006, 2008-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/malloc.c b/lib/malloc.c -index 6bbb97d..0d8b359 100644 ---- a/lib/malloc.c -+++ b/lib/malloc.c -@@ -2,61 +2,50 @@ - - Copyright (C) 1997-1998, 2006-2007, 2009-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ along with this program. If not, see . */ - - /* written by Jim Meyering and Bruno Haible */ - - #define _GL_USE_STDLIB_ALLOC 1 - #include --/* Only the AC_FUNC_MALLOC macro defines 'malloc' already in config.h. */ --#ifdef malloc --# define NEED_MALLOC_GNU 1 --# undef malloc --/* Whereas the gnulib module 'malloc-gnu' defines HAVE_MALLOC_GNU. */ --#elif GNULIB_MALLOC_GNU && !HAVE_MALLOC_GNU --# define NEED_MALLOC_GNU 1 --#endif - - #include - --/* A function definition is only needed if NEED_MALLOC_GNU is defined above -- or if the module 'malloc-posix' requests it. */ --#if NEED_MALLOC_GNU || (GNULIB_MALLOC_POSIX && !HAVE_MALLOC_POSIX) -+#include - --# include -+#include "xalloc-oversized.h" - --/* Allocate an N-byte block of memory from the heap. -- If N is zero, allocate a 1-byte block. */ -+/* Allocate an N-byte block of memory from the heap, even if N is 0. */ - - void * - rpl_malloc (size_t n) - { -- void *result; -- --# if NEED_MALLOC_GNU - if (n == 0) - n = 1; --# endif - -- result = malloc (n); -+ if (xalloc_oversized (n, 1)) -+ { -+ errno = ENOMEM; -+ return NULL; -+ } -+ -+ void *result = malloc (n); - --# if !HAVE_MALLOC_POSIX -+#if !HAVE_MALLOC_POSIX - if (result == NULL) - errno = ENOMEM; --# endif -+#endif - - return result; - } -- --#endif -diff --git a/lib/malloc/dynarray_at_failure.c b/lib/malloc/dynarray_at_failure.c -index 4f840db..8dd6850 100644 ---- a/lib/malloc/dynarray_at_failure.c -+++ b/lib/malloc/dynarray_at_failure.c -@@ -18,11 +18,11 @@ - - #ifndef _LIBC - # include -+# include - #endif - - #include - #include --#include - - void - __libc_dynarray_at_failure (size_t size, size_t index) -@@ -32,6 +32,7 @@ __libc_dynarray_at_failure (size_t size, size_t index) - __snprintf (buf, sizeof (buf), "Fatal glibc error: " - "array index %zu not less than array length %zu\n", - index, size); -+ __libc_fatal (buf); - #else - abort (); - #endif -diff --git a/lib/malloca.c b/lib/malloca.c -index a546b30..b488423 100644 ---- a/lib/malloca.c -+++ b/lib/malloca.c -@@ -2,18 +2,18 @@ - Copyright (C) 2003, 2006-2007, 2009-2021 Free Software Foundation, Inc. - Written by Bruno Haible , 2003, 2018. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ along with this program. If not, see . */ - - #define _GL_USE_STDLIB_ALLOC 1 - #include -@@ -21,6 +21,8 @@ - /* Specification. */ - #include "malloca.h" - -+#include "idx.h" -+#include "intprops.h" - #include "verify.h" - - /* The speed critical point in this file is freea() applied to an alloca() -@@ -45,24 +47,30 @@ mmalloca (size_t n) - #if HAVE_ALLOCA - /* Allocate one more word, used to determine the address to pass to freea(), - and room for the alignment ≡ sa_alignment_max mod 2*sa_alignment_max. */ -- size_t nplus = n + sizeof (small_t) + 2 * sa_alignment_max - 1; -- -- if (nplus >= n) -+ uintptr_t alignment2_mask = 2 * sa_alignment_max - 1; -+ int plus = sizeof (small_t) + alignment2_mask; -+ idx_t nplus; -+ if (!INT_ADD_WRAPV (n, plus, &nplus) && !xalloc_oversized (nplus, 1)) - { - char *mem = (char *) malloc (nplus); - - if (mem != NULL) - { -- char *p = -- (char *)((((uintptr_t)mem + sizeof (small_t) + sa_alignment_max - 1) -- & ~(uintptr_t)(2 * sa_alignment_max - 1)) -- + sa_alignment_max); -+ uintptr_t umem = (uintptr_t)mem, umemplus; -+ /* The INT_ADD_WRAPV avoids signed integer overflow on -+ theoretical platforms where UINTPTR_MAX <= INT_MAX. */ -+ INT_ADD_WRAPV (umem, sizeof (small_t) + sa_alignment_max - 1, -+ &umemplus); -+ idx_t offset = ((umemplus & ~alignment2_mask) -+ + sa_alignment_max - umem); -+ void *vp = mem + offset; -+ small_t *p = vp; - /* Here p >= mem + sizeof (small_t), - and p <= mem + sizeof (small_t) + 2 * sa_alignment_max - 1 - hence p + n <= mem + nplus. - So, the memory range [p, p+n) lies in the allocated memory range - [mem, mem + nplus). */ -- ((small_t *) p)[-1] = p - mem; -+ p[-1] = offset; - /* p ≡ sa_alignment_max mod 2*sa_alignment_max. */ - return p; - } -diff --git a/lib/malloca.h b/lib/malloca.h -index 9cf7fbb..7eb63d2 100644 ---- a/lib/malloca.h -+++ b/lib/malloca.h -@@ -2,18 +2,18 @@ - Copyright (C) 2003-2007, 2009-2021 Free Software Foundation, Inc. - Written by Bruno Haible , 2003. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ along with this program. If not, see . */ - - #ifndef _MALLOCA_H - #define _MALLOCA_H -@@ -51,6 +51,13 @@ extern "C" { - # define safe_alloca(N) ((void) (N), NULL) - #endif - -+/* Free a block of memory allocated through malloca(). */ -+#if HAVE_ALLOCA -+extern void freea (void *p); -+#else -+# define freea free -+#endif -+ - /* malloca(N) is a safe variant of alloca(N). It allocates N bytes of - memory allocated on the stack, that must be freed using freea() before - the function returns. Upon failure, it returns NULL. */ -@@ -65,21 +72,16 @@ extern "C" { - # define malloca(N) \ - mmalloca (N) - #endif --extern void * mmalloca (size_t n); -- --/* Free a block of memory allocated through malloca(). */ --#if HAVE_ALLOCA --extern void freea (void *p); --#else --# define freea free --#endif -+extern void *mmalloca (size_t n) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC (freea, 1) -+ _GL_ATTRIBUTE_ALLOC_SIZE ((1)); - - /* nmalloca(N,S) is an overflow-safe variant of malloca (N * S). - It allocates an array of N objects, each with S bytes of memory, -- on the stack. S must be positive and N must be nonnegative. -- Either N or S should be of type ptrdiff_t or size_t or wider. -+ on the stack. N and S should be nonnegative and free of side effects. - The array must be freed using freea() before the function returns. */ --#define nmalloca(n, s) (xalloc_oversized (n, s) ? NULL : malloca ((n) * (s))) -+#define nmalloca(n, s) \ -+ (xalloc_oversized (n, s) ? NULL : malloca ((n) * (size_t) (s))) - - - #ifdef __cplusplus -diff --git a/lib/math.c b/lib/math.c -index ba2a6ab..3ffd1d7 100644 ---- a/lib/math.c -+++ b/lib/math.c -@@ -1,4 +1,22 @@ -+/* Inline functions for . -+ -+ Copyright (C) 2012-2021 Free Software Foundation, Inc. -+ -+ This file 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.1 of the -+ License, or (at your option) any later version. -+ -+ This file 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, see . */ -+ - #include -+ - #define _GL_MATH_INLINE _GL_EXTERN_INLINE - #include "math.h" - typedef int dummy; -diff --git a/lib/math.in.h b/lib/math.in.h -index d80047c..6a055fb 100644 ---- a/lib/math.in.h -+++ b/lib/math.in.h -@@ -2,12 +2,12 @@ - - Copyright (C) 2002-2003, 2007-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/mbrtowc-impl-utf8.h b/lib/mbrtowc-impl-utf8.h -index ea5ef1f..330fb10 100644 ---- a/lib/mbrtowc-impl-utf8.h -+++ b/lib/mbrtowc-impl-utf8.h -@@ -1,12 +1,12 @@ - /* Convert multibyte character to wide character. - Copyright (C) 1999-2002, 2005-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/mbrtowc-impl.h b/lib/mbrtowc-impl.h -index f7e28fc..bc3e688 100644 ---- a/lib/mbrtowc-impl.h -+++ b/lib/mbrtowc-impl.h -@@ -1,12 +1,12 @@ - /* Convert multibyte character to wide character. - Copyright (C) 1999-2002, 2005-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/mbrtowc.c b/lib/mbrtowc.c -index 0db5104..8832f6e 100644 ---- a/lib/mbrtowc.c -+++ b/lib/mbrtowc.c -@@ -2,12 +2,12 @@ - Copyright (C) 1999-2002, 2005-2021 Free Software Foundation, Inc. - Written by Bruno Haible , 2008. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/mbsinit.c b/lib/mbsinit.c -index 7ca8df7..f440155 100644 ---- a/lib/mbsinit.c -+++ b/lib/mbsinit.c -@@ -2,12 +2,12 @@ - Copyright (C) 2008-2021 Free Software Foundation, Inc. - Written by Bruno Haible , 2008. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/mbtowc-impl.h b/lib/mbtowc-impl.h -index 01342af..30d715d 100644 ---- a/lib/mbtowc-impl.h -+++ b/lib/mbtowc-impl.h -@@ -2,12 +2,12 @@ - Copyright (C) 2011-2021 Free Software Foundation, Inc. - Written by Bruno Haible , 2011. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/mbtowc-lock.c b/lib/mbtowc-lock.c -index ce74793..0f7ae6c 100644 ---- a/lib/mbtowc-lock.c -+++ b/lib/mbtowc-lock.c -@@ -1,12 +1,12 @@ - /* Return the internal lock used by mbrtowc and mbrtoc32. - Copyright (C) 2019-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/mbtowc-lock.h b/lib/mbtowc-lock.h -index 0939517..d31b0b6 100644 ---- a/lib/mbtowc-lock.h -+++ b/lib/mbtowc-lock.h -@@ -1,12 +1,12 @@ - /* Use the internal lock used by mbrtowc and mbrtoc32. - Copyright (C) 2019-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/mbtowc.c b/lib/mbtowc.c -index 2711194..47b431a 100644 ---- a/lib/mbtowc.c -+++ b/lib/mbtowc.c -@@ -2,12 +2,12 @@ - Copyright (C) 2011-2021 Free Software Foundation, Inc. - Written by Bruno Haible , 2011. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/memchr.c b/lib/memchr.c -index d8feb19..56fd59d 100644 ---- a/lib/memchr.c -+++ b/lib/memchr.c -@@ -7,21 +7,21 @@ - adaptation to memchr suggested by Dick Karpinski (dick@cca.ucsf.edu), - and implemented by Roland McGrath (roland@ai.mit.edu). - --NOTE: The canonical source of this file is maintained with the GNU C Library. --Bugs can be reported to bug-glibc@prep.ai.mit.edu. -+ NOTE: The canonical source of this file is maintained with the GNU C Library. -+ Bugs can be reported to bug-glibc@prep.ai.mit.edu. - --This program 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 3 of the License, or any --later version. -+ This file 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.1 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. -+ This file 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, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #ifndef _LIBC - # include -diff --git a/lib/memchr.valgrind b/lib/memchr.valgrind -index 034d1ee..4f16481 100644 ---- a/lib/memchr.valgrind -+++ b/lib/memchr.valgrind -@@ -2,12 +2,12 @@ - - # Copyright (C) 2009-2021 Free Software Foundation, Inc. - # --# This program 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 3 of the License, or --# (at your option) any later version. -+# This file 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.1 of the -+# License, or (at your option) any later version. - # --# This program is distributed in the hope that it will be useful, -+# This file 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. -diff --git a/lib/mempcpy.c b/lib/mempcpy.c -index c80e119..cacacdb 100644 ---- a/lib/mempcpy.c -+++ b/lib/mempcpy.c -@@ -1,18 +1,18 @@ - /* Copy memory area and return pointer after last written byte. - Copyright (C) 2003, 2007, 2009-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ along with this program. If not, see . */ - - #include - -diff --git a/lib/minmax.h b/lib/minmax.h -index 7d0b672..a03361b 100644 ---- a/lib/minmax.h -+++ b/lib/minmax.h -@@ -2,18 +2,18 @@ - Copyright (C) 1995, 1998, 2001, 2003, 2005, 2009-2021 Free Software - Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ along with this program. If not, see . */ - - #ifndef _MINMAX_H - #define _MINMAX_H -diff --git a/lib/mkdir.c b/lib/mkdir.c -index 453e428..2766cc7 100644 ---- a/lib/mkdir.c -+++ b/lib/mkdir.c -@@ -3,12 +3,12 @@ - - Copyright (C) 2001, 2003, 2006, 2008-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/mkostemp.c b/lib/mkostemp.c -index cfab635..285f1ba 100644 ---- a/lib/mkostemp.c -+++ b/lib/mkostemp.c -@@ -2,12 +2,12 @@ - Foundation, Inc. - This file is derived from the one in the GNU C Library. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/msvc-inval.c b/lib/msvc-inval.c -index de6ebee..a23dac9 100644 ---- a/lib/msvc-inval.c -+++ b/lib/msvc-inval.c -@@ -1,18 +1,18 @@ - /* Invalid parameter handler for MSVC runtime libraries. - Copyright (C) 2011-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #include - -diff --git a/lib/msvc-inval.h b/lib/msvc-inval.h -index 0d418e1..e115a35 100644 ---- a/lib/msvc-inval.h -+++ b/lib/msvc-inval.h -@@ -1,18 +1,18 @@ - /* Invalid parameter handler for MSVC runtime libraries. - Copyright (C) 2011-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #ifndef _MSVC_INVAL_H - #define _MSVC_INVAL_H -diff --git a/lib/msvc-nothrow.c b/lib/msvc-nothrow.c -index e72dabe..d3c1f54 100644 ---- a/lib/msvc-nothrow.c -+++ b/lib/msvc-nothrow.c -@@ -2,18 +2,18 @@ - with MSVC runtime libraries. - Copyright (C) 2011-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #include - -diff --git a/lib/msvc-nothrow.h b/lib/msvc-nothrow.h -index a56cd4e..057b5dd 100644 ---- a/lib/msvc-nothrow.h -+++ b/lib/msvc-nothrow.h -@@ -2,18 +2,18 @@ - with MSVC runtime libraries. - Copyright (C) 2011-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #ifndef _MSVC_NOTHROW_H - #define _MSVC_NOTHROW_H -diff --git a/lib/netdb.in.h b/lib/netdb.in.h -index 6bcaf1a..eb5c960 100644 ---- a/lib/netdb.in.h -+++ b/lib/netdb.in.h -@@ -2,18 +2,18 @@ - Copyright (C) 2008-2021 Free Software Foundation, Inc. - Written by Simon Josefsson. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ along with this program. If not, see . */ - - /* This file is supposed to be used on platforms that lack . - It is intended to provide definitions and prototypes needed by an -diff --git a/lib/netinet_in.in.h b/lib/netinet_in.in.h -index 3c1cad6..21f3a64 100644 ---- a/lib/netinet_in.in.h -+++ b/lib/netinet_in.in.h -@@ -1,18 +1,18 @@ - /* Substitute for . - Copyright (C) 2007-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ along with this program. If not, see . */ - - #ifndef _@GUARD_PREFIX@_NETINET_IN_H - -diff --git a/lib/nl_langinfo-lock.c b/lib/nl_langinfo-lock.c -index 915c38b..fcdf56d 100644 ---- a/lib/nl_langinfo-lock.c -+++ b/lib/nl_langinfo-lock.c -@@ -1,12 +1,12 @@ - /* Return the internal lock used by nl_langinfo. - Copyright (C) 2019-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/nl_langinfo.c b/lib/nl_langinfo.c -index e8f3cef..b481f20 100644 ---- a/lib/nl_langinfo.c -+++ b/lib/nl_langinfo.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2007-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/nproc.c b/lib/nproc.c -index fef1f8b..e3ddb92 100644 ---- a/lib/nproc.c -+++ b/lib/nproc.c -@@ -2,18 +2,18 @@ - - Copyright (C) 2009-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ along with this program. If not, see . */ - - /* Written by Glen Lenker and Bruno Haible. */ - -diff --git a/lib/nproc.h b/lib/nproc.h -index cd3ed36..d7659a5 100644 ---- a/lib/nproc.h -+++ b/lib/nproc.h -@@ -2,18 +2,18 @@ - - Copyright (C) 2009-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ along with this program. If not, see . */ - - /* Written by Glen Lenker and Bruno Haible. */ - -diff --git a/lib/nstrftime.c b/lib/nstrftime.c -index 7ef7529..7f258e8 100644 ---- a/lib/nstrftime.c -+++ b/lib/nstrftime.c -@@ -1,19 +1,18 @@ - /* Copyright (C) 1991-2021 Free Software Foundation, Inc. - This file is part of the GNU C Library. - -- The GNU C 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.1 of the License, or (at your option) any later version. -+ This file 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 3 of the -+ License, or (at your option) any later version. - -- The GNU C Library is distributed in the hope that it will be useful, -+ This file 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. -+ 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 the GNU C Library; if not, see -- . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #ifdef _LIBC - # define USE_IN_EXTENDED_LOCALE_MODEL 1 -diff --git a/lib/open.c b/lib/open.c -index 5dc117e..372cda8 100644 ---- a/lib/open.c -+++ b/lib/open.c -@@ -1,12 +1,12 @@ - /* Open a descriptor to a file. - Copyright (C) 2007-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/pathmax.h b/lib/pathmax.h -index 4af7802..716f4a9 100644 ---- a/lib/pathmax.h -+++ b/lib/pathmax.h -@@ -2,18 +2,18 @@ - Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2021 Free Software - Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ along with this program. If not, see . */ - - #ifndef _PATHMAX_H - # define _PATHMAX_H -diff --git a/lib/pipe.c b/lib/pipe.c -index 3316ceb..fc978f2 100644 ---- a/lib/pipe.c -+++ b/lib/pipe.c -@@ -1,18 +1,18 @@ - /* Create a pipe. - Copyright (C) 2009-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #include - -diff --git a/lib/pipe2.c b/lib/pipe2.c -index 25bce6f..9ba8c3b 100644 ---- a/lib/pipe2.c -+++ b/lib/pipe2.c -@@ -1,18 +1,18 @@ - /* Create a pipe, with specific opening flags. - Copyright (C) 2009-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #include - -diff --git a/lib/poll.c b/lib/poll.c -index d787676..8d5ba96 100644 ---- a/lib/poll.c -+++ b/lib/poll.c -@@ -5,18 +5,18 @@ - - This file is part of gnulib. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - /* Tell gcc not to warn about the (nfd < 0) tests, below. */ - #if (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) || 4 < __GNUC__ -diff --git a/lib/poll.in.h b/lib/poll.in.h -index 1fe8370..e94cd31 100644 ---- a/lib/poll.in.h -+++ b/lib/poll.in.h -@@ -5,18 +5,18 @@ - - This file is part of gnulib. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #ifndef _@GUARD_PREFIX@_POLL_H - -diff --git a/lib/printf-args.c b/lib/printf-args.c -index 22e44ef..b822682 100644 ---- a/lib/printf-args.c -+++ b/lib/printf-args.c -@@ -2,18 +2,18 @@ - Copyright (C) 1999, 2002-2003, 2005-2007, 2009-2021 Free Software - Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - /* This file can be parametrized with the following macros: - ENABLE_UNISTDIO Set to 1 to enable the unistdio extensions. -diff --git a/lib/printf-args.h b/lib/printf-args.h -index d15b12d..c8d9174 100644 ---- a/lib/printf-args.h -+++ b/lib/printf-args.h -@@ -2,18 +2,18 @@ - Copyright (C) 1999, 2002-2003, 2006-2007, 2011-2021 Free Software - Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #ifndef _PRINTF_ARGS_H - #define _PRINTF_ARGS_H -diff --git a/lib/printf-parse.c b/lib/printf-parse.c -index 9f97995..f21cc17 100644 ---- a/lib/printf-parse.c -+++ b/lib/printf-parse.c -@@ -1,18 +1,18 @@ - /* Formatted output to strings. - Copyright (C) 1999-2000, 2002-2003, 2006-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - /* This file can be parametrized with the following macros: - CHAR_T The element type of the format string. -@@ -48,16 +48,7 @@ - #include - - /* Get intmax_t. */ --#if defined IN_LIBINTL || defined IN_LIBASPRINTF --# if HAVE_STDINT_H_WITH_UINTMAX --# include --# endif --# if HAVE_INTTYPES_H_WITH_UINTMAX --# include --# endif --#else --# include --#endif -+#include - - /* malloc(), realloc(), free(). */ - #include -diff --git a/lib/printf-parse.h b/lib/printf-parse.h -index e05ac8f..77b7409 100644 ---- a/lib/printf-parse.h -+++ b/lib/printf-parse.h -@@ -2,18 +2,18 @@ - Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2021 Free Software - Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #ifndef _PRINTF_PARSE_H - #define _PRINTF_PARSE_H -diff --git a/lib/putenv.c b/lib/putenv.c -index d342b81..435d10f 100644 ---- a/lib/putenv.c -+++ b/lib/putenv.c -@@ -4,12 +4,12 @@ - NOTE: The canonical source of this file is maintained with the GNU C - Library. Bugs can be reported to bug-glibc@prep.ai.mit.edu. - -- This program 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 3 of the License, or any -- later version. -+ This file 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 3 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/raise.c b/lib/raise.c -index eda9126..37c100d 100644 ---- a/lib/raise.c -+++ b/lib/raise.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2002-2003, 2005-2006, 2009-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/rawmemchr.c b/lib/rawmemchr.c -index ef35689..896d435 100644 ---- a/lib/rawmemchr.c -+++ b/lib/rawmemchr.c -@@ -1,12 +1,12 @@ - /* Searching in a string. - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/rawmemchr.valgrind b/lib/rawmemchr.valgrind -index 90ed95e..d489c32 100644 ---- a/lib/rawmemchr.valgrind -+++ b/lib/rawmemchr.valgrind -@@ -2,12 +2,12 @@ - - # Copyright (C) 2008-2021 Free Software Foundation, Inc. - # --# This program 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 3 of the License, or --# (at your option) any later version. -+# This file 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.1 of the -+# License, or (at your option) any later version. - # --# This program is distributed in the hope that it will be useful, -+# This file 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. -diff --git a/lib/read.c b/lib/read.c -index 125e738..840d9ed 100644 ---- a/lib/read.c -+++ b/lib/read.c -@@ -2,12 +2,12 @@ - Copyright (C) 2008-2021 Free Software Foundation, Inc. - Written by Bruno Haible , 2011. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/readlink.c b/lib/readlink.c -index 38d9e0c..d4f4b08 100644 ---- a/lib/readlink.c -+++ b/lib/readlink.c -@@ -1,12 +1,12 @@ - /* Read the contents of a symbolic link. - Copyright (C) 2003-2007, 2009-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/realloc.c b/lib/realloc.c -index 1145514..af03f0c 100644 ---- a/lib/realloc.c -+++ b/lib/realloc.c -@@ -3,12 +3,12 @@ - Copyright (C) 1997, 2003-2004, 2006-2007, 2009-2021 Free Software - Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -@@ -18,68 +18,46 @@ - - /* written by Jim Meyering and Bruno Haible */ - --#define _GL_USE_STDLIB_ALLOC 1 - #include - --/* Only the AC_FUNC_REALLOC macro defines 'realloc' already in config.h. */ --#ifdef realloc --# define NEED_REALLOC_GNU 1 --/* Whereas the gnulib module 'realloc-gnu' defines HAVE_REALLOC_GNU. */ --#elif GNULIB_REALLOC_GNU && !HAVE_REALLOC_GNU --# define NEED_REALLOC_GNU 1 --#endif -- --/* Infer the properties of the system's malloc function. -- The gnulib module 'malloc-gnu' defines HAVE_MALLOC_GNU. */ --#if GNULIB_MALLOC_GNU && HAVE_MALLOC_GNU --# define SYSTEM_MALLOC_GLIBC_COMPATIBLE 1 --#endif -- - #include - --/* A function definition is only needed if NEED_REALLOC_GNU is defined above -- or if the module 'realloc-posix' requests it. */ --#if NEED_REALLOC_GNU || (GNULIB_REALLOC_POSIX && !HAVE_REALLOC_POSIX) -+#include -+ -+#include "xalloc-oversized.h" - --# include -+/* Call the system's realloc below. This file does not define -+ _GL_USE_STDLIB_ALLOC because it needs Gnulib's malloc if present. */ -+#undef realloc - - /* Change the size of an allocated block of memory P to N bytes, -- with error checking. If N is zero, change it to 1. If P is NULL, -- use malloc. */ -+ with error checking. If P is NULL, use malloc. Otherwise if N is zero, -+ free P and return NULL. */ - - void * - rpl_realloc (void *p, size_t n) - { -- void *result; -+ if (p == NULL) -+ return malloc (n); - --# if NEED_REALLOC_GNU - if (n == 0) - { -- n = 1; -- -- /* In theory realloc might fail, so don't rely on it to free. */ - free (p); -- p = NULL; -+ return NULL; - } --# endif - -- if (p == NULL) -+ if (xalloc_oversized (n, 1)) - { --# if GNULIB_REALLOC_GNU && !NEED_REALLOC_GNU && !SYSTEM_MALLOC_GLIBC_COMPATIBLE -- if (n == 0) -- n = 1; --# endif -- result = malloc (n); -+ errno = ENOMEM; -+ return NULL; - } -- else -- result = realloc (p, n); - --# if !HAVE_REALLOC_POSIX -+ void *result = realloc (p, n); -+ -+#if !HAVE_MALLOC_POSIX - if (result == NULL) - errno = ENOMEM; --# endif -+#endif - - return result; - } -- --#endif -diff --git a/lib/recv.c b/lib/recv.c -index f2a342f..3eb2b4d 100644 ---- a/lib/recv.c -+++ b/lib/recv.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/recvfrom.c b/lib/recvfrom.c -index 8abda0c..25231ff 100644 ---- a/lib/recvfrom.c -+++ b/lib/recvfrom.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/regex_internal.c b/lib/regex_internal.c -index 55f6b66..aefcfa2 100644 ---- a/lib/regex_internal.c -+++ b/lib/regex_internal.c -@@ -1211,6 +1211,10 @@ re_node_set_merge (re_node_set *dest, const re_node_set *src) - - if (__glibc_unlikely (dest->nelem == 0)) - { -+ /* Although we already guaranteed above that dest->alloc != 0 and -+ therefore dest->elems != NULL, add a debug assertion to pacify -+ GCC 11.2.1's -fanalyzer. */ -+ DEBUG_ASSERT (dest->elems); - dest->nelem = src->nelem; - memcpy (dest->elems, src->elems, src->nelem * sizeof (Idx)); - return REG_NOERROR; -@@ -1286,7 +1290,10 @@ re_node_set_insert (re_node_set *set, Idx elem) - - if (__glibc_unlikely (set->nelem) == 0) - { -- /* We already guaranteed above that set->alloc != 0. */ -+ /* Although we already guaranteed above that set->alloc != 0 and -+ therefore set->elems != NULL, add a debug assertion to pacify -+ GCC 11.2 -fanalyzer. */ -+ DEBUG_ASSERT (set->elems); - set->elems[0] = elem; - ++set->nelem; - return true; -diff --git a/lib/regexec.c b/lib/regexec.c -index 6309dea..5e4eb49 100644 ---- a/lib/regexec.c -+++ b/lib/regexec.c -@@ -1220,9 +1220,13 @@ proceed_next_node (const re_match_context_t *mctx, Idx nregs, regmatch_t *regs, - { - re_node_set *cur_nodes = &mctx->state_log[*pidx]->nodes; - re_node_set *edests = &dfa->edests[node]; -- bool ok = re_node_set_insert (eps_via_nodes, node); -- if (__glibc_unlikely (! ok)) -- return -2; -+ -+ if (! re_node_set_contains (eps_via_nodes, node)) -+ { -+ bool ok = re_node_set_insert (eps_via_nodes, node); -+ if (__glibc_unlikely (! ok)) -+ return -2; -+ } - - /* Pick a valid destination, or return -1 if none is found. */ - Idx dest_node = -1; -@@ -1414,7 +1418,7 @@ set_regs (const regex_t *preg, const re_match_context_t *mctx, size_t nmatch, - update_regs (dfa, pmatch, prev_idx_match, cur_node, idx, nmatch); - - if ((idx == pmatch[0].rm_eo && cur_node == mctx->last_node) -- || re_node_set_contains (&eps_via_nodes, cur_node)) -+ || (fs && re_node_set_contains (&eps_via_nodes, cur_node))) - { - Idx reg_idx; - cur_node = -1; -diff --git a/lib/rename.c b/lib/rename.c -index 4873025..a3b7dc6 100644 ---- a/lib/rename.c -+++ b/lib/rename.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2001-2003, 2005-2006, 2009-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/rmdir.c b/lib/rmdir.c -index a99fb1e..6295e41 100644 ---- a/lib/rmdir.c -+++ b/lib/rmdir.c -@@ -3,12 +3,12 @@ - Copyright (C) 1988, 1990, 1999, 2003-2006, 2009-2021 Free Software - Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/round.c b/lib/round.c -index 47a3936..5525050 100644 ---- a/lib/round.c -+++ b/lib/round.c -@@ -1,18 +1,18 @@ - /* Round toward nearest, breaking ties away from zero. - Copyright (C) 2007, 2010-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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 3 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - /* Written by Ben Pfaff , 2007. - Based heavily on code by Bruno Haible. */ -diff --git a/lib/safe-read.c b/lib/safe-read.c -index a4a1b08..e187b12 100644 ---- a/lib/safe-read.c -+++ b/lib/safe-read.c -@@ -3,12 +3,12 @@ - Copyright (C) 1993-1994, 1998, 2002-2006, 2009-2021 Free Software - Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/safe-read.h b/lib/safe-read.h -index 5050124..111aff5 100644 ---- a/lib/safe-read.h -+++ b/lib/safe-read.h -@@ -1,12 +1,12 @@ - /* An interface to read() that retries after interrupts. - Copyright (C) 2002, 2006, 2009-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/safe-write.c b/lib/safe-write.c -index f8b3b8b..494de14 100644 ---- a/lib/safe-write.c -+++ b/lib/safe-write.c -@@ -1,12 +1,12 @@ - /* An interface to write that retries after interrupts. - Copyright (C) 2002, 2009-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/safe-write.h b/lib/safe-write.h -index 459629e..25d8c71 100644 ---- a/lib/safe-write.h -+++ b/lib/safe-write.h -@@ -1,12 +1,12 @@ - /* An interface to write() that retries after interrupts. - Copyright (C) 2002, 2009-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/same-inode.h b/lib/same-inode.h -index 45e322a8..c727777 100644 ---- a/lib/same-inode.h -+++ b/lib/same-inode.h -@@ -2,12 +2,12 @@ - - Copyright (C) 2006, 2009-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/scratch_buffer.h b/lib/scratch_buffer.h -index 4b17f72..8873577 100644 ---- a/lib/scratch_buffer.h -+++ b/lib/scratch_buffer.h -@@ -1,12 +1,12 @@ - /* Variable-sized buffer with on-stack default allocation. - Copyright (C) 2017-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -@@ -110,14 +110,18 @@ extern void *scratch_buffer_dupfree (struct scratch_buffer *buffer, - - /* The implementation is imported from glibc. */ - --#include -- - /* Avoid possible conflicts with symbols exported by the GNU libc. */ - #define __libc_scratch_buffer_dupfree gl_scratch_buffer_dupfree - #define __libc_scratch_buffer_grow gl_scratch_buffer_grow - #define __libc_scratch_buffer_grow_preserve gl_scratch_buffer_grow_preserve - #define __libc_scratch_buffer_set_array_size gl_scratch_buffer_set_array_size - --#include -+#ifndef _GL_LIKELY -+/* Rely on __builtin_expect, as provided by the module 'builtin-expect'. */ -+# define _GL_LIKELY(cond) __builtin_expect ((cond), 1) -+# define _GL_UNLIKELY(cond) __builtin_expect ((cond), 0) -+#endif -+ -+#include - - #endif /* _GL_SCRATCH_BUFFER_H */ -diff --git a/lib/select.c b/lib/select.c -index 9a6fc28..eddac4b 100644 ---- a/lib/select.c -+++ b/lib/select.c -@@ -5,18 +5,18 @@ - - This file is part of gnulib. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #include - -@@ -530,12 +530,13 @@ restart: - if (h != handle_array[nhandles]) - { - /* Perform handle->descriptor mapping. */ -- WSAEventSelect ((SOCKET) h, NULL, 0); -- if (FD_ISSET (h, &handle_rfds)) -+ SOCKET s = (SOCKET) h; -+ WSAEventSelect (s, NULL, 0); -+ if (FD_ISSET (s, &handle_rfds)) - FD_SET (i, rfds); -- if (FD_ISSET (h, &handle_wfds)) -+ if (FD_ISSET (s, &handle_wfds)) - FD_SET (i, wfds); -- if (FD_ISSET (h, &handle_xfds)) -+ if (FD_ISSET (s, &handle_xfds)) - FD_SET (i, xfds); - } - else -diff --git a/lib/send.c b/lib/send.c -index 3625864..58cb70b 100644 ---- a/lib/send.c -+++ b/lib/send.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/sendto.c b/lib/sendto.c -index 5372a66..029ccd6 100644 ---- a/lib/sendto.c -+++ b/lib/sendto.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/setenv.c b/lib/setenv.c -index 5374044..3ad3477 100644 ---- a/lib/setenv.c -+++ b/lib/setenv.c -@@ -1,12 +1,12 @@ - /* Copyright (C) 1992, 1995-2003, 2005-2021 Free Software Foundation, Inc. - This file is part of the GNU C Library. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/setlocale-lock.c b/lib/setlocale-lock.c -index 3cb5d47..53e231c 100644 ---- a/lib/setlocale-lock.c -+++ b/lib/setlocale-lock.c -@@ -1,12 +1,12 @@ - /* Return the internal lock used by setlocale_null_r. - Copyright (C) 2019-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/setlocale_null.c b/lib/setlocale_null.c -index 4c50472..dbfda25 100644 ---- a/lib/setlocale_null.c -+++ b/lib/setlocale_null.c -@@ -1,12 +1,12 @@ - /* Query the name of the current global locale. - Copyright (C) 2019-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/setlocale_null.h b/lib/setlocale_null.h -index bf96fa4..00c42e2 100644 ---- a/lib/setlocale_null.h -+++ b/lib/setlocale_null.h -@@ -1,12 +1,12 @@ - /* Query the name of the current global locale. - Copyright (C) 2019-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/setsockopt.c b/lib/setsockopt.c -index db32996..10b1e90 100644 ---- a/lib/setsockopt.c -+++ b/lib/setsockopt.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/shutdown.c b/lib/shutdown.c -index c5527cd..70c927c 100644 ---- a/lib/shutdown.c -+++ b/lib/shutdown.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/signal.in.h b/lib/signal.in.h -index b211137..275da8c 100644 ---- a/lib/signal.in.h -+++ b/lib/signal.in.h -@@ -2,12 +2,12 @@ - - Copyright (C) 2006-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/signbitd.c b/lib/signbitd.c -index 2992dd4..2259771 100644 ---- a/lib/signbitd.c -+++ b/lib/signbitd.c -@@ -1,12 +1,12 @@ - /* signbit() macro: Determine the sign bit of a floating-point number. - Copyright (C) 2007-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/signbitf.c b/lib/signbitf.c -index 01be49a..b196d9a 100644 ---- a/lib/signbitf.c -+++ b/lib/signbitf.c -@@ -1,12 +1,12 @@ - /* signbit() macro: Determine the sign bit of a floating-point number. - Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/signbitl.c b/lib/signbitl.c -index 6e0f64e..f73802d 100644 ---- a/lib/signbitl.c -+++ b/lib/signbitl.c -@@ -1,12 +1,12 @@ - /* signbit() macro: Determine the sign bit of a floating-point number. - Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/size_max.h b/lib/size_max.h -index c6d4a18..1186ba9 100644 ---- a/lib/size_max.h -+++ b/lib/size_max.h -@@ -2,18 +2,18 @@ - Copyright (C) 2005-2006, 2009-2021 Free Software Foundation, Inc. - Written by Simon Josefsson. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ along with this program. If not, see . */ - - #ifndef GNULIB_SIZE_MAX_H - #define GNULIB_SIZE_MAX_H -diff --git a/lib/snprintf.c b/lib/snprintf.c -index 357f287..a589cf1 100644 ---- a/lib/snprintf.c -+++ b/lib/snprintf.c -@@ -2,18 +2,18 @@ - Copyright (C) 2004, 2006-2021 Free Software Foundation, Inc. - Written by Simon Josefsson and Paul Eggert. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #include - -diff --git a/lib/socket.c b/lib/socket.c -index 8525260..0f2e6ff 100644 ---- a/lib/socket.c -+++ b/lib/socket.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/sockets.c b/lib/sockets.c -index 394b01e..934da73 100644 ---- a/lib/sockets.c -+++ b/lib/sockets.c -@@ -2,12 +2,12 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/sockets.h b/lib/sockets.h -index a13b0cb..e70c2bb 100644 ---- a/lib/sockets.h -+++ b/lib/sockets.h -@@ -2,12 +2,12 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/stat-time.c b/lib/stat-time.c -index 81b83dd..7b92792 100644 ---- a/lib/stat-time.c -+++ b/lib/stat-time.c -@@ -1,3 +1,21 @@ -+/* stat-related time functions. -+ -+ Copyright (C) 2012-2021 Free Software Foundation, Inc. -+ -+ This file 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.1 of the -+ License, or (at your option) any later version. -+ -+ This file 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, see . */ -+ - #include -+ - #define _GL_STAT_TIME_INLINE _GL_EXTERN_INLINE - #include "stat-time.h" -diff --git a/lib/stat-time.h b/lib/stat-time.h -index 00c9329..fe3483d 100644 ---- a/lib/stat-time.h -+++ b/lib/stat-time.h -@@ -2,12 +2,12 @@ - - Copyright (C) 2005, 2007, 2009-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/stat-w32.c b/lib/stat-w32.c -index fe505cb..4164199 100644 ---- a/lib/stat-w32.c -+++ b/lib/stat-w32.c -@@ -1,12 +1,12 @@ - /* Core of implementation of fstat and stat for native Windows. - Copyright (C) 2017-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/stat-w32.h b/lib/stat-w32.h -index 05c9b0f..5b56c09 100644 ---- a/lib/stat-w32.h -+++ b/lib/stat-w32.h -@@ -1,12 +1,12 @@ - /* Core of implementation of fstat and stat for native Windows. - Copyright (C) 2017-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/stat.c b/lib/stat.c -index 39a1269..bc9a767 100644 ---- a/lib/stat.c -+++ b/lib/stat.c -@@ -1,12 +1,12 @@ - /* Work around platform bugs in stat. - Copyright (C) 2009-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/stdalign.in.h b/lib/stdalign.in.h -index 7b51043..592d58e 100644 ---- a/lib/stdalign.in.h -+++ b/lib/stdalign.in.h -@@ -2,18 +2,18 @@ - - Copyright 2011-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ along with this program. If not, see . */ - - /* Written by Paul Eggert and Bruno Haible. */ - -diff --git a/lib/stdbool.in.h b/lib/stdbool.in.h -index c404f8d..2a1992d 100644 ---- a/lib/stdbool.in.h -+++ b/lib/stdbool.in.h -@@ -1,18 +1,18 @@ - /* Copyright (C) 2001-2003, 2006-2021 Free Software Foundation, Inc. - Written by Bruno Haible , 2001. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ along with this program. If not, see . */ - - #ifndef _GL_STDBOOL_H - #define _GL_STDBOOL_H -diff --git a/lib/stddef.in.h b/lib/stddef.in.h -index 4c53e64..42290d4 100644 ---- a/lib/stddef.in.h -+++ b/lib/stddef.in.h -@@ -2,18 +2,18 @@ - - Copyright (C) 2009-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ along with this program. If not, see . */ - - /* Written by Eric Blake. */ - -diff --git a/lib/stdint.in.h b/lib/stdint.in.h -index a98f1c8..85c5418 100644 ---- a/lib/stdint.in.h -+++ b/lib/stdint.in.h -@@ -2,18 +2,18 @@ - Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood. - This file is part of gnulib. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ along with this program. If not, see . */ - - /* - * ISO C 99 for platforms that lack it. -@@ -85,7 +85,7 @@ - - /* Override WINT_MIN and WINT_MAX if gnulib's or overrides - wint_t. */ --#if @GNULIB_OVERRIDES_WINT_T@ -+#if @GNULIBHEADERS_OVERRIDE_WINT_T@ - # undef WINT_MIN - # undef WINT_MAX - # define WINT_MIN 0x0U -@@ -598,7 +598,7 @@ typedef int _verify_intmax_size[sizeof (intmax_t) == sizeof (uintmax_t) - /* wint_t limits */ - /* If gnulib's or overrides wint_t, @WINT_T_SUFFIX@ is not - accurate, therefore use the definitions from above. */ --# if !@GNULIB_OVERRIDES_WINT_T@ -+# if !@GNULIBHEADERS_OVERRIDE_WINT_T@ - # undef WINT_MIN - # undef WINT_MAX - # if @HAVE_SIGNED_WINT_T@ -diff --git a/lib/stdio.in.h b/lib/stdio.in.h -index 6e10c74..f1bf817 100644 ---- a/lib/stdio.in.h -+++ b/lib/stdio.in.h -@@ -2,18 +2,18 @@ - - Copyright (C) 2004, 2007-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ along with this program. If not, see . */ - - #if __GNUC__ >= 3 - @PRAGMA_SYSTEM_HEADER@ -@@ -242,7 +242,7 @@ _GL_WARN_ON_USE (fclose, "fclose is not always POSIX compliant - " - _GL_CXXALIAS_MDA (fcloseall, int, (void)); - # else - # if @HAVE_DECL_FCLOSEALL@ --# if defined __FreeBSD__ -+# if defined __FreeBSD__ || defined __DragonFly__ - _GL_CXXALIAS_SYS (fcloseall, void, (void)); - # else - _GL_CXXALIAS_SYS (fcloseall, int, (void)); -@@ -260,8 +260,9 @@ _GL_CXXALIASWARN (fcloseall); - # undef fdopen - # define fdopen rpl_fdopen - # endif --_GL_FUNCDECL_RPL (fdopen, FILE *, (int fd, const char *mode) -- _GL_ARG_NONNULL ((2))); -+_GL_FUNCDECL_RPL (fdopen, FILE *, -+ (int fd, const char *mode) -+ _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1)); - _GL_CXXALIAS_RPL (fdopen, FILE *, (int fd, const char *mode)); - # elif defined _WIN32 && !defined __CYGWIN__ - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) -@@ -270,28 +271,42 @@ _GL_CXXALIAS_RPL (fdopen, FILE *, (int fd, const char *mode)); - # endif - _GL_CXXALIAS_MDA (fdopen, FILE *, (int fd, const char *mode)); - # else -+# if __GNUC__ >= 11 -+/* For -Wmismatched-dealloc: Associate fdopen with fclose or rpl_fclose. */ -+_GL_FUNCDECL_SYS (fdopen, FILE *, -+ (int fd, const char *mode) -+ _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1)); -+# endif - _GL_CXXALIAS_SYS (fdopen, FILE *, (int fd, const char *mode)); - # endif - _GL_CXXALIASWARN (fdopen); --#elif defined GNULIB_POSIXCHECK --# undef fdopen -+#else -+# if @GNULIB_FCLOSE@ && __GNUC__ >= 11 && !defined fdopen -+/* For -Wmismatched-dealloc: Associate fdopen with fclose or rpl_fclose. */ -+_GL_FUNCDECL_SYS (fdopen, FILE *, -+ (int fd, const char *mode) -+ _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1)); -+# endif -+# if defined GNULIB_POSIXCHECK -+# undef fdopen - /* Assume fdopen is always declared. */ - _GL_WARN_ON_USE (fdopen, "fdopen on native Windows platforms is not POSIX compliant - " - "use gnulib module fdopen for portability"); --#elif @GNULIB_MDA_FDOPEN@ -+# elif @GNULIB_MDA_FDOPEN@ - /* On native Windows, map 'fdopen' to '_fdopen', so that -loldnames is not - required. In C++ with GNULIB_NAMESPACE, avoid differences between - platforms by defining GNULIB_NAMESPACE::fdopen always. */ --# if defined _WIN32 && !defined __CYGWIN__ --# if !(defined __cplusplus && defined GNULIB_NAMESPACE) --# undef fdopen --# define fdopen _fdopen --# endif -+# if defined _WIN32 && !defined __CYGWIN__ -+# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -+# undef fdopen -+# define fdopen _fdopen -+# endif - _GL_CXXALIAS_MDA (fdopen, FILE *, (int fd, const char *mode)); --# else -+# else - _GL_CXXALIAS_SYS (fdopen, FILE *, (int fd, const char *mode)); --# endif -+# endif - _GL_CXXALIASWARN (fdopen); -+# endif - #endif - - #if @GNULIB_FFLUSH@ -@@ -380,21 +395,35 @@ _GL_CXXALIASWARN (fileno); - # endif - _GL_FUNCDECL_RPL (fopen, FILE *, - (const char *restrict filename, const char *restrict mode) -- _GL_ARG_NONNULL ((1, 2))); -+ _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1)); - _GL_CXXALIAS_RPL (fopen, FILE *, - (const char *restrict filename, const char *restrict mode)); - # else -+# if __GNUC__ >= 11 -+/* For -Wmismatched-dealloc: Associate fopen with fclose or rpl_fclose. */ -+_GL_FUNCDECL_SYS (fopen, FILE *, -+ (const char *restrict filename, const char *restrict mode) -+ _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1)); -+# endif - _GL_CXXALIAS_SYS (fopen, FILE *, - (const char *restrict filename, const char *restrict mode)); - # endif - # if __GLIBC__ >= 2 - _GL_CXXALIASWARN (fopen); - # endif --#elif defined GNULIB_POSIXCHECK --# undef fopen -+#else -+# if @GNULIB_FCLOSE@ && __GNUC__ >= 11 && !defined fopen -+/* For -Wmismatched-dealloc: Associate fopen with fclose or rpl_fclose. */ -+_GL_FUNCDECL_SYS (fopen, FILE *, -+ (const char *restrict filename, const char *restrict mode) -+ _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1)); -+# endif -+# if defined GNULIB_POSIXCHECK -+# undef fopen - /* Assume fopen is always declared. */ - _GL_WARN_ON_USE (fopen, "fopen on native Windows platforms is not POSIX compliant - " - "use gnulib module fopen for portability"); -+# endif - #endif - - #if @GNULIB_FPRINTF_POSIX@ || @GNULIB_FPRINTF@ -@@ -1009,22 +1038,32 @@ _GL_WARN_ON_USE (perror, "perror is not always POSIX compliant - " - # undef popen - # define popen rpl_popen - # endif --_GL_FUNCDECL_RPL (popen, FILE *, (const char *cmd, const char *mode) -- _GL_ARG_NONNULL ((1, 2))); -+_GL_FUNCDECL_RPL (popen, FILE *, -+ (const char *cmd, const char *mode) -+ _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (pclose, 1)); - _GL_CXXALIAS_RPL (popen, FILE *, (const char *cmd, const char *mode)); - # else --# if !@HAVE_POPEN@ --_GL_FUNCDECL_SYS (popen, FILE *, (const char *cmd, const char *mode) -- _GL_ARG_NONNULL ((1, 2))); -+# if !@HAVE_POPEN@ || __GNUC__ >= 11 -+_GL_FUNCDECL_SYS (popen, FILE *, -+ (const char *cmd, const char *mode) -+ _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (pclose, 1)); - # endif - _GL_CXXALIAS_SYS (popen, FILE *, (const char *cmd, const char *mode)); - # endif - _GL_CXXALIASWARN (popen); --#elif defined GNULIB_POSIXCHECK --# undef popen --# if HAVE_RAW_DECL_POPEN -+#else -+# if @GNULIB_PCLOSE@ && __GNUC__ >= 11 && !defined popen -+/* For -Wmismatched-dealloc: Associate popen with pclose or rpl_pclose. */ -+_GL_FUNCDECL_SYS (popen, FILE *, -+ (const char *cmd, const char *mode) -+ _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (pclose, 1)); -+# endif -+# if defined GNULIB_POSIXCHECK -+# undef popen -+# if HAVE_RAW_DECL_POPEN - _GL_WARN_ON_USE (popen, "popen is buggy on some platforms - " - "use gnulib module popen or pipe for more portability"); -+# endif - # endif - #endif - -@@ -1257,6 +1296,7 @@ _GL_CXXALIASWARN (scanf); - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) - # define snprintf rpl_snprintf - # endif -+# define GNULIB_overrides_snprintf 1 - _GL_FUNCDECL_RPL (snprintf, int, - (char *restrict str, size_t size, - const char *restrict format, ...) -@@ -1302,6 +1342,7 @@ _GL_WARN_ON_USE (snprintf, "snprintf is unportable - " - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) - # define sprintf rpl_sprintf - # endif -+# define GNULIB_overrides_sprintf 1 - _GL_FUNCDECL_RPL (sprintf, int, - (char *restrict str, const char *restrict format, ...) - _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3) -@@ -1344,19 +1385,32 @@ _GL_CXXALIASWARN (tempnam); - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) - # define tmpfile rpl_tmpfile - # endif --_GL_FUNCDECL_RPL (tmpfile, FILE *, (void)); -+_GL_FUNCDECL_RPL (tmpfile, FILE *, (void) -+ _GL_ATTRIBUTE_DEALLOC (fclose, 1)); - _GL_CXXALIAS_RPL (tmpfile, FILE *, (void)); - # else -+# if __GNUC__ >= 11 -+/* For -Wmismatched-dealloc: Associate tmpfile with fclose or rpl_fclose. */ -+_GL_FUNCDECL_SYS (tmpfile, FILE *, (void) -+ _GL_ATTRIBUTE_DEALLOC (fclose, 1)); -+# endif - _GL_CXXALIAS_SYS (tmpfile, FILE *, (void)); - # endif - # if __GLIBC__ >= 2 - _GL_CXXALIASWARN (tmpfile); - # endif --#elif defined GNULIB_POSIXCHECK --# undef tmpfile --# if HAVE_RAW_DECL_TMPFILE -+#else -+# if @GNULIB_FCLOSE@ && __GNUC__ >= 11 && !defined tmpfile -+/* For -Wmismatched-dealloc: Associate tmpfile with fclose or rpl_fclose. */ -+_GL_FUNCDECL_SYS (tmpfile, FILE *, (void) -+ _GL_ATTRIBUTE_DEALLOC (fclose, 1)); -+# endif -+# if defined GNULIB_POSIXCHECK -+# undef tmpfile -+# if HAVE_RAW_DECL_TMPFILE - _GL_WARN_ON_USE (tmpfile, "tmpfile is not usable on mingw - " - "use gnulib module tmpfile for portability"); -+# endif - # endif - #endif - -@@ -1369,6 +1423,7 @@ _GL_WARN_ON_USE (tmpfile, "tmpfile is not usable on mingw - " - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) - # define asprintf rpl_asprintf - # endif -+# define GNULIB_overrides_asprintf - _GL_FUNCDECL_RPL (asprintf, int, - (char **result, const char *format, ...) - _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3) -@@ -1390,6 +1445,7 @@ _GL_CXXALIASWARN (asprintf); - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) - # define vasprintf rpl_vasprintf - # endif -+# define GNULIB_overrides_vasprintf 1 - _GL_FUNCDECL_RPL (vasprintf, int, - (char **result, const char *format, va_list args) - _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 0) -@@ -1573,6 +1629,7 @@ _GL_CXXALIASWARN (vscanf); - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) - # define vsnprintf rpl_vsnprintf - # endif -+# define GNULIB_overrides_vsnprintf 1 - _GL_FUNCDECL_RPL (vsnprintf, int, - (char *restrict str, size_t size, - const char *restrict format, va_list args) -@@ -1609,6 +1666,7 @@ _GL_WARN_ON_USE (vsnprintf, "vsnprintf is unportable - " - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) - # define vsprintf rpl_vsprintf - # endif -+# define GNULIB_overrides_vsprintf 1 - _GL_FUNCDECL_RPL (vsprintf, int, - (char *restrict str, - const char *restrict format, va_list args) -diff --git a/lib/stdlib.in.h b/lib/stdlib.in.h -index 7e01262..d86a880 100644 ---- a/lib/stdlib.in.h -+++ b/lib/stdlib.in.h -@@ -2,12 +2,12 @@ - - Copyright (C) 1995, 2001-2004, 2006-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -@@ -149,6 +149,28 @@ _GL_WARN_ON_USE (_Exit, "_Exit is unportable - " - #endif - - -+#if @GNULIB_FREE_POSIX@ -+# if @REPLACE_FREE@ -+# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -+# undef free -+# define free rpl_free -+# endif -+_GL_FUNCDECL_RPL (free, void, (void *ptr)); -+_GL_CXXALIAS_RPL (free, void, (void *ptr)); -+# else -+_GL_CXXALIAS_SYS (free, void, (void *ptr)); -+# endif -+# if __GLIBC__ >= 2 -+_GL_CXXALIASWARN (free); -+# endif -+#elif defined GNULIB_POSIXCHECK -+# undef free -+/* Assume free is always declared. */ -+_GL_WARN_ON_USE (free, "free is not future POSIX compliant everywhere - " -+ "use gnulib module free for portability"); -+#endif -+ -+ - /* Allocate memory with indefinite extent and specified alignment. */ - #if @GNULIB_ALIGNED_ALLOC@ - # if @REPLACE_ALIGNED_ALLOC@ -@@ -156,21 +178,37 @@ _GL_WARN_ON_USE (_Exit, "_Exit is unportable - " - # undef aligned_alloc - # define aligned_alloc rpl_aligned_alloc - # endif --_GL_FUNCDECL_RPL (aligned_alloc, void *, (size_t alignment, size_t size)); -+_GL_FUNCDECL_RPL (aligned_alloc, void *, -+ (size_t alignment, size_t size) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); - _GL_CXXALIAS_RPL (aligned_alloc, void *, (size_t alignment, size_t size)); - # else - # if @HAVE_ALIGNED_ALLOC@ -+# if __GNUC__ >= 11 -+/* For -Wmismatched-dealloc: Associate aligned_alloc with free or rpl_free. */ -+_GL_FUNCDECL_SYS (aligned_alloc, void *, -+ (size_t alignment, size_t size) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); -+# endif - _GL_CXXALIAS_SYS (aligned_alloc, void *, (size_t alignment, size_t size)); - # endif - # endif - # if @HAVE_ALIGNED_ALLOC@ - _GL_CXXALIASWARN (aligned_alloc); - # endif --#elif defined GNULIB_POSIXCHECK --# undef aligned_alloc --# if HAVE_RAW_DECL_ALIGNED_ALLOC -+#else -+# if @GNULIB_FREE_POSIX@ && __GNUC__ >= 11 && !defined aligned_alloc -+/* For -Wmismatched-dealloc: Associate aligned_alloc with free or rpl_free. */ -+_GL_FUNCDECL_SYS (aligned_alloc, void *, -+ (size_t alignment, size_t size) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); -+# endif -+# if defined GNULIB_POSIXCHECK -+# undef aligned_alloc -+# if HAVE_RAW_DECL_ALIGNED_ALLOC - _GL_WARN_ON_USE (aligned_alloc, "aligned_alloc is not portable - " - "use gnulib module aligned_alloc for portability"); -+# endif - # endif - #endif - -@@ -198,19 +236,35 @@ _GL_WARN_ON_USE (atoll, "atoll is unportable - " - # undef calloc - # define calloc rpl_calloc - # endif --_GL_FUNCDECL_RPL (calloc, void *, (size_t nmemb, size_t size)); -+_GL_FUNCDECL_RPL (calloc, void *, -+ (size_t nmemb, size_t size) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); - _GL_CXXALIAS_RPL (calloc, void *, (size_t nmemb, size_t size)); - # else -+# if __GNUC__ >= 11 -+/* For -Wmismatched-dealloc: Associate calloc with free or rpl_free. */ -+_GL_FUNCDECL_SYS (calloc, void *, -+ (size_t nmemb, size_t size) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); -+# endif - _GL_CXXALIAS_SYS (calloc, void *, (size_t nmemb, size_t size)); - # endif - # if __GLIBC__ >= 2 - _GL_CXXALIASWARN (calloc); - # endif --#elif defined GNULIB_POSIXCHECK --# undef calloc -+#else -+# if @GNULIB_FREE_POSIX@ && __GNUC__ >= 11 && !defined calloc -+/* For -Wmismatched-dealloc: Associate calloc with free or rpl_free. */ -+_GL_FUNCDECL_SYS (calloc, void *, -+ (size_t nmemb, size_t size) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); -+# endif -+# if defined GNULIB_POSIXCHECK -+# undef calloc - /* Assume calloc is always declared. */ - _GL_WARN_ON_USE (calloc, "calloc is not POSIX compliant everywhere - " - "use gnulib module calloc-posix for portability"); -+# endif - #endif - - #if @GNULIB_CANONICALIZE_FILE_NAME@ -@@ -218,13 +272,17 @@ _GL_WARN_ON_USE (calloc, "calloc is not POSIX compliant everywhere - " - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) - # define canonicalize_file_name rpl_canonicalize_file_name - # endif --_GL_FUNCDECL_RPL (canonicalize_file_name, char *, (const char *name) -- _GL_ARG_NONNULL ((1))); -+_GL_FUNCDECL_RPL (canonicalize_file_name, char *, -+ (const char *name) -+ _GL_ARG_NONNULL ((1)) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); - _GL_CXXALIAS_RPL (canonicalize_file_name, char *, (const char *name)); - # else --# if !@HAVE_CANONICALIZE_FILE_NAME@ --_GL_FUNCDECL_SYS (canonicalize_file_name, char *, (const char *name) -- _GL_ARG_NONNULL ((1))); -+# if !@HAVE_CANONICALIZE_FILE_NAME@ || __GNUC__ >= 11 -+_GL_FUNCDECL_SYS (canonicalize_file_name, char *, -+ (const char *name) -+ _GL_ARG_NONNULL ((1)) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); - # endif - _GL_CXXALIAS_SYS (canonicalize_file_name, char *, (const char *name)); - # endif -@@ -233,12 +291,22 @@ _GL_CXXALIAS_SYS (canonicalize_file_name, char *, (const char *name)); - (!@HAVE_CANONICALIZE_FILE_NAME@ || @REPLACE_CANONICALIZE_FILE_NAME@) - # endif - _GL_CXXALIASWARN (canonicalize_file_name); --#elif defined GNULIB_POSIXCHECK --# undef canonicalize_file_name --# if HAVE_RAW_DECL_CANONICALIZE_FILE_NAME -+#else -+# if @GNULIB_FREE_POSIX@ && __GNUC__ >= 11 && !defined canonicalize_file_name -+/* For -Wmismatched-dealloc: Associate canonicalize_file_name with free or -+ rpl_free. */ -+_GL_FUNCDECL_SYS (canonicalize_file_name, char *, -+ (const char *name) -+ _GL_ARG_NONNULL ((1)) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); -+# endif -+# if defined GNULIB_POSIXCHECK -+# undef canonicalize_file_name -+# if HAVE_RAW_DECL_CANONICALIZE_FILE_NAME - _GL_WARN_ON_USE (canonicalize_file_name, - "canonicalize_file_name is unportable - " - "use gnulib module canonicalize-lgpl for portability"); -+# endif - # endif - #endif - -@@ -288,27 +356,6 @@ _GL_CXXALIASWARN (fcvt); - # endif - #endif - --#if @GNULIB_FREE_POSIX@ --# if @REPLACE_FREE@ --# if !(defined __cplusplus && defined GNULIB_NAMESPACE) --# undef free --# define free rpl_free --# endif --_GL_FUNCDECL_RPL (free, void, (void *ptr)); --_GL_CXXALIAS_RPL (free, void, (void *ptr)); --# else --_GL_CXXALIAS_SYS (free, void, (void *ptr)); --# endif --# if __GLIBC__ >= 2 --_GL_CXXALIASWARN (free); --# endif --#elif defined GNULIB_POSIXCHECK --# undef free --/* Assume free is always declared. */ --_GL_WARN_ON_USE (free, "free is not future POSIX compliant everywhere - " -- "use gnulib module free for portability"); --#endif -- - #if @GNULIB_MDA_GCVT@ - /* On native Windows, map 'gcvt' to '_gcvt', so that -loldnames is not - required. In C++ with GNULIB_NAMESPACE, avoid differences between -@@ -404,19 +451,35 @@ _GL_WARN_ON_USE (grantpt, "grantpt is not portable - " - # undef malloc - # define malloc rpl_malloc - # endif --_GL_FUNCDECL_RPL (malloc, void *, (size_t size)); -+_GL_FUNCDECL_RPL (malloc, void *, -+ (size_t size) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); - _GL_CXXALIAS_RPL (malloc, void *, (size_t size)); - # else -+# if __GNUC__ >= 11 -+/* For -Wmismatched-dealloc: Associate malloc with free or rpl_free. */ -+_GL_FUNCDECL_SYS (malloc, void *, -+ (size_t size) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); -+# endif - _GL_CXXALIAS_SYS (malloc, void *, (size_t size)); - # endif - # if __GLIBC__ >= 2 - _GL_CXXALIASWARN (malloc); - # endif --#elif defined GNULIB_POSIXCHECK && !_GL_USE_STDLIB_ALLOC --# undef malloc -+#else -+# if @GNULIB_FREE_POSIX@ && __GNUC__ >= 11 && !defined malloc -+/* For -Wmismatched-dealloc: Associate malloc with free or rpl_free. */ -+_GL_FUNCDECL_SYS (malloc, void *, -+ (size_t size) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); -+# endif -+# if defined GNULIB_POSIXCHECK && !_GL_USE_STDLIB_ALLOC -+# undef malloc - /* Assume malloc is always declared. */ - _GL_WARN_ON_USE (malloc, "malloc is not POSIX compliant everywhere - " - "use gnulib module malloc-posix for portability"); -+# endif - #endif - - /* Convert a multibyte character to a wide character. */ -@@ -1015,29 +1078,53 @@ _GL_WARN_ON_USE (setstate_r, "setstate_r is unportable - " - # undef realloc - # define realloc rpl_realloc - # endif --_GL_FUNCDECL_RPL (realloc, void *, (void *ptr, size_t size)); -+_GL_FUNCDECL_RPL (realloc, void *, (void *ptr, size_t size) -+ _GL_ATTRIBUTE_DEALLOC_FREE); - _GL_CXXALIAS_RPL (realloc, void *, (void *ptr, size_t size)); - # else -+# if __GNUC__ >= 11 -+/* For -Wmismatched-dealloc: Associate realloc with free or rpl_free. */ -+_GL_FUNCDECL_SYS (realloc, void *, (void *ptr, size_t size) -+ _GL_ATTRIBUTE_DEALLOC_FREE); -+# endif - _GL_CXXALIAS_SYS (realloc, void *, (void *ptr, size_t size)); - # endif - # if __GLIBC__ >= 2 - _GL_CXXALIASWARN (realloc); - # endif --#elif defined GNULIB_POSIXCHECK && !_GL_USE_STDLIB_ALLOC --# undef realloc -+#else -+# if @GNULIB_FREE_POSIX@ && __GNUC__ >= 11 && !defined realloc -+/* For -Wmismatched-dealloc: Associate realloc with free or rpl_free. */ -+_GL_FUNCDECL_SYS (realloc, void *, (void *ptr, size_t size) -+ _GL_ATTRIBUTE_DEALLOC_FREE); -+# endif -+# if defined GNULIB_POSIXCHECK && !_GL_USE_STDLIB_ALLOC -+# undef realloc - /* Assume realloc is always declared. */ - _GL_WARN_ON_USE (realloc, "realloc is not POSIX compliant everywhere - " - "use gnulib module realloc-posix for portability"); -+# endif - #endif - - - #if @GNULIB_REALLOCARRAY@ --# if ! @HAVE_REALLOCARRAY@ -+# if @REPLACE_REALLOCARRAY@ -+# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -+# undef reallocarray -+# define reallocarray rpl_reallocarray -+# endif -+_GL_FUNCDECL_RPL (reallocarray, void *, -+ (void *ptr, size_t nmemb, size_t size)); -+_GL_CXXALIAS_RPL (reallocarray, void *, -+ (void *ptr, size_t nmemb, size_t size)); -+# else -+# if ! @HAVE_REALLOCARRAY@ - _GL_FUNCDECL_SYS (reallocarray, void *, - (void *ptr, size_t nmemb, size_t size)); --# endif -+# endif - _GL_CXXALIAS_SYS (reallocarray, void *, - (void *ptr, size_t nmemb, size_t size)); -+# endif - _GL_CXXALIASWARN (reallocarray); - #elif defined GNULIB_POSIXCHECK - # undef reallocarray -diff --git a/lib/strdup.c b/lib/strdup.c -index 2a37049..e5d4d75 100644 ---- a/lib/strdup.c -+++ b/lib/strdup.c -@@ -3,18 +3,18 @@ - - This file is part of the GNU C Library. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #ifndef _LIBC - # include -diff --git a/lib/streq.h b/lib/streq.h -index 2d9d4c2..adabd15 100644 ---- a/lib/streq.h -+++ b/lib/streq.h -@@ -1,15 +1,15 @@ - /* Optimized string comparison. - Copyright (C) 2001-2002, 2007, 2009-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -+ 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, see . */ -diff --git a/lib/strftime.h b/lib/strftime.h -index 645e8c7..790a80e 100644 ---- a/lib/strftime.h -+++ b/lib/strftime.h -@@ -2,12 +2,12 @@ - - Copyright (C) 2002, 2004, 2008-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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 3 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/striconveh.c b/lib/striconveh.c -index 82f6467..78a5e02 100644 ---- a/lib/striconveh.c -+++ b/lib/striconveh.c -@@ -2,12 +2,12 @@ - Copyright (C) 2001-2021 Free Software Foundation, Inc. - Written by Bruno Haible and Simon Josefsson. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/striconveh.h b/lib/striconveh.h -index c9dff1e..60c6329 100644 ---- a/lib/striconveh.h -+++ b/lib/striconveh.h -@@ -2,12 +2,12 @@ - Copyright (C) 2001-2007, 2009-2021 Free Software Foundation, Inc. - Written by Bruno Haible and Simon Josefsson. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -@@ -18,7 +18,7 @@ - #ifndef _STRICONVEH_H - #define _STRICONVEH_H - --#include -+#include - #if HAVE_ICONV - #include - #endif -@@ -95,7 +95,8 @@ extern int - extern char * - str_cd_iconveh (const char *src, - const iconveh_t *cd, -- enum iconv_ilseq_handler handler); -+ enum iconv_ilseq_handler handler) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE; - - #endif - -@@ -129,7 +130,8 @@ extern int - extern char * - str_iconveh (const char *src, - const char *from_codeset, const char *to_codeset, -- enum iconv_ilseq_handler handler); -+ enum iconv_ilseq_handler handler) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE; - - - #ifdef __cplusplus -diff --git a/lib/string.in.h b/lib/string.in.h -index 1292e29..b043c75 100644 ---- a/lib/string.in.h -+++ b/lib/string.in.h -@@ -2,18 +2,18 @@ - - Copyright (C) 1995-1996, 2001-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ along with this program. If not, see . */ - - #if __GNUC__ >= 3 - @PRAGMA_SYSTEM_HEADER@ -@@ -47,6 +47,9 @@ - /* NetBSD 5.0 mis-defines NULL. */ - #include - -+/* Get free(). */ -+#include -+ - /* MirBSD defines mbslen as a macro. */ - #if @GNULIB_MBSLEN@ && defined __MirBSD__ - # include -@@ -418,7 +421,10 @@ _GL_WARN_ON_USE (strchrnul, "strchrnul is unportable - " - # undef strdup - # define strdup rpl_strdup - # endif --_GL_FUNCDECL_RPL (strdup, char *, (char const *__s) _GL_ARG_NONNULL ((1))); -+_GL_FUNCDECL_RPL (strdup, char *, -+ (char const *__s) -+ _GL_ARG_NONNULL ((1)) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); - _GL_CXXALIAS_RPL (strdup, char *, (char const *__s)); - # elif defined _WIN32 && !defined __CYGWIN__ - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) -@@ -431,35 +437,47 @@ _GL_CXXALIAS_MDA (strdup, char *, (char const *__s)); - /* strdup exists as a function and as a macro. Get rid of the macro. */ - # undef strdup - # endif --# if !(@HAVE_DECL_STRDUP@ || defined strdup) --_GL_FUNCDECL_SYS (strdup, char *, (char const *__s) _GL_ARG_NONNULL ((1))); -+# if (!@HAVE_DECL_STRDUP@ || __GNUC__ >= 11) && !defined strdup -+_GL_FUNCDECL_SYS (strdup, char *, -+ (char const *__s) -+ _GL_ARG_NONNULL ((1)) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); - # endif - _GL_CXXALIAS_SYS (strdup, char *, (char const *__s)); - # endif - _GL_CXXALIASWARN (strdup); --#elif defined GNULIB_POSIXCHECK --# undef strdup --# if HAVE_RAW_DECL_STRDUP -+#else -+# if __GNUC__ >= 11 && !defined strdup -+/* For -Wmismatched-dealloc: Associate strdup with free or rpl_free. */ -+_GL_FUNCDECL_SYS (strdup, char *, -+ (char const *__s) -+ _GL_ARG_NONNULL ((1)) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); -+# endif -+# if defined GNULIB_POSIXCHECK -+# undef strdup -+# if HAVE_RAW_DECL_STRDUP - _GL_WARN_ON_USE (strdup, "strdup is unportable - " - "use gnulib module strdup for portability"); --# endif --#elif @GNULIB_MDA_STRDUP@ -+# endif -+# elif @GNULIB_MDA_STRDUP@ - /* On native Windows, map 'creat' to '_creat', so that -loldnames is not - required. In C++ with GNULIB_NAMESPACE, avoid differences between -- platforms by defining GNULIB_NAMESPACE::creat always. */ --# if defined _WIN32 && !defined __CYGWIN__ --# if !(defined __cplusplus && defined GNULIB_NAMESPACE) --# undef strdup --# define strdup _strdup --# endif -+ platforms by defining GNULIB_NAMESPACE::strdup always. */ -+# if defined _WIN32 && !defined __CYGWIN__ -+# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -+# undef strdup -+# define strdup _strdup -+# endif - _GL_CXXALIAS_MDA (strdup, char *, (char const *__s)); --# else --# if defined __cplusplus && defined GNULIB_NAMESPACE && defined strdup --# undef strdup --# endif -+# else -+# if defined __cplusplus && defined GNULIB_NAMESPACE && defined strdup -+# undef strdup -+# endif - _GL_CXXALIAS_SYS (strdup, char *, (char const *__s)); --# endif -+# endif - _GL_CXXALIASWARN (strdup); -+# endif - #endif - - /* Append no more than N characters from SRC onto DEST. */ -diff --git a/lib/stripslash.c b/lib/stripslash.c -index b079795..99bfbe6 100644 ---- a/lib/stripslash.c -+++ b/lib/stripslash.c -@@ -3,12 +3,12 @@ - Copyright (C) 1990, 2001, 2003-2006, 2009-2021 Free Software Foundation, - Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/sys-limits.h b/lib/sys-limits.h -index 1856e7f..2d9784d 100644 ---- a/lib/sys-limits.h -+++ b/lib/sys-limits.h -@@ -2,18 +2,18 @@ - - Copyright 2018-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ along with this program. If not, see . */ - - #ifndef _GL_SYS_LIMITS_H - #define _GL_SYS_LIMITS_H -diff --git a/lib/sys_file.in.h b/lib/sys_file.in.h -index e18594f..4166082 100644 ---- a/lib/sys_file.in.h -+++ b/lib/sys_file.in.h -@@ -2,18 +2,18 @@ - - Copyright (C) 2007-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ along with this program. If not, see . */ - - /* Written by Richard W.M. Jones. */ - -diff --git a/lib/sys_random.in.h b/lib/sys_random.in.h -index 1a479e9..1abd6c5 100644 ---- a/lib/sys_random.in.h -+++ b/lib/sys_random.in.h -@@ -1,18 +1,18 @@ - /* Substitute for . - Copyright (C) 2020-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ along with this program. If not, see . */ - - # if __GNUC__ >= 3 - @PRAGMA_SYSTEM_HEADER@ -diff --git a/lib/sys_select.in.h b/lib/sys_select.in.h -index d82c5d1..f8ef648 100644 ---- a/lib/sys_select.in.h -+++ b/lib/sys_select.in.h -@@ -1,18 +1,18 @@ - /* Substitute for . - Copyright (C) 2007-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ along with this program. If not, see . */ - - # if __GNUC__ >= 3 - @PRAGMA_SYSTEM_HEADER@ -diff --git a/lib/sys_socket.c b/lib/sys_socket.c -index 3b261da..d90b32c 100644 ---- a/lib/sys_socket.c -+++ b/lib/sys_socket.c -@@ -1,4 +1,22 @@ -+/* Inline functions for . -+ -+ Copyright (C) 2012-2021 Free Software Foundation, Inc. -+ -+ This file 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.1 of the -+ License, or (at your option) any later version. -+ -+ This file 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, see . */ -+ - #include -+ - #define _GL_SYS_SOCKET_INLINE _GL_EXTERN_INLINE - #include "sys/socket.h" - typedef int dummy; -diff --git a/lib/sys_socket.in.h b/lib/sys_socket.in.h -index c0baa71..0a2c57d 100644 ---- a/lib/sys_socket.in.h -+++ b/lib/sys_socket.in.h -@@ -3,18 +3,18 @@ - Copyright (C) 2005-2021 Free Software Foundation, Inc. - Written by Simon Josefsson. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ along with this program. If not, see . */ - - /* This file is supposed to be used on platforms that lack , - on platforms where cannot be included standalone, and on -diff --git a/lib/sys_stat.in.h b/lib/sys_stat.in.h -index 125aca0..babe3db 100644 ---- a/lib/sys_stat.in.h -+++ b/lib/sys_stat.in.h -@@ -1,18 +1,18 @@ - /* Provide a more complete sys/stat.h header file. - Copyright (C) 2005-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ along with this program. If not, see . */ - - /* Written by Eric Blake, Paul Eggert, and Jim Meyering. */ - -diff --git a/lib/sys_time.in.h b/lib/sys_time.in.h -index f310ca5..8035fbe 100644 ---- a/lib/sys_time.in.h -+++ b/lib/sys_time.in.h -@@ -2,18 +2,18 @@ - - Copyright (C) 2007-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ along with this program. If not, see . */ - - /* Written by Paul Eggert. */ - -diff --git a/lib/sys_times.in.h b/lib/sys_times.in.h -index 3d96200..85b728f 100644 ---- a/lib/sys_times.in.h -+++ b/lib/sys_times.in.h -@@ -1,18 +1,18 @@ - /* Provide a sys/times.h header file. - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ along with this program. If not, see . */ - - /* Written by Simon Josefsson , 2008. */ - -diff --git a/lib/sys_types.in.h b/lib/sys_types.in.h -index 26e7db7..2079d72 100644 ---- a/lib/sys_types.in.h -+++ b/lib/sys_types.in.h -@@ -2,18 +2,18 @@ - - Copyright (C) 2011-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ along with this program. If not, see . */ - - #if __GNUC__ >= 3 - @PRAGMA_SYSTEM_HEADER@ -diff --git a/lib/sys_uio.in.h b/lib/sys_uio.in.h -index 1941360..507ab01 100644 ---- a/lib/sys_uio.in.h -+++ b/lib/sys_uio.in.h -@@ -1,18 +1,18 @@ - /* Substitute for . - Copyright (C) 2011-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ along with this program. If not, see . */ - - # if __GNUC__ >= 3 - @PRAGMA_SYSTEM_HEADER@ -diff --git a/lib/tempname.h b/lib/tempname.h -index c91a58d..795bb49 100644 ---- a/lib/tempname.h -+++ b/lib/tempname.h -@@ -2,12 +2,12 @@ - - Copyright (C) 2006, 2009-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/time-internal.h b/lib/time-internal.h -index b86b7a0..6bbd0a7 100644 ---- a/lib/time-internal.h -+++ b/lib/time-internal.h -@@ -2,18 +2,18 @@ - - Copyright 2015-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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 3 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - /* Written by Paul Eggert. */ - -diff --git a/lib/time.in.h b/lib/time.in.h -index cbd2bba..a73fe59 100644 ---- a/lib/time.in.h -+++ b/lib/time.in.h -@@ -2,18 +2,18 @@ - - Copyright (C) 2007-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ along with this program. If not, see . */ - - #if __GNUC__ >= 3 - @PRAGMA_SYSTEM_HEADER@ -diff --git a/lib/time_r.c b/lib/time_r.c -index 2510c4e..88d3c1c 100644 ---- a/lib/time_r.c -+++ b/lib/time_r.c -@@ -2,18 +2,18 @@ - - Copyright (C) 2003, 2006-2007, 2010-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - /* Written by Paul Eggert. */ - -diff --git a/lib/time_rz.c b/lib/time_rz.c -index d32cce7..e772244 100644 ---- a/lib/time_rz.c -+++ b/lib/time_rz.c -@@ -2,18 +2,18 @@ - - Copyright 2015-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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 3 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - /* Written by Paul Eggert. */ - -diff --git a/lib/times.c b/lib/times.c -index b8afa60..72b852e 100644 ---- a/lib/times.c -+++ b/lib/times.c -@@ -2,18 +2,18 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ along with this program. If not, see . */ - - /* Written by Simon Josefsson , 2008. */ - -diff --git a/lib/trunc.c b/lib/trunc.c -index cf2adac..1c9c420 100644 ---- a/lib/trunc.c -+++ b/lib/trunc.c -@@ -1,12 +1,12 @@ - /* Round towards zero. - Copyright (C) 2007, 2010-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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 3 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/tzset.c b/lib/tzset.c -index 1f423c4..7fd4936 100644 ---- a/lib/tzset.c -+++ b/lib/tzset.c -@@ -2,18 +2,18 @@ - - Copyright (C) 2001-2003, 2005-2007, 2009-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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 3 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ along with this program. If not, see . */ - - /* written by Jim Meyering */ - -diff --git a/lib/unistd.c b/lib/unistd.c -index 72bad1c..0763456 100644 ---- a/lib/unistd.c -+++ b/lib/unistd.c -@@ -1,4 +1,22 @@ -+/* Inline functions for . -+ -+ Copyright (C) 2012-2021 Free Software Foundation, Inc. -+ -+ This file 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.1 of the -+ License, or (at your option) any later version. -+ -+ This file 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, see . */ -+ - #include -+ - #define _GL_UNISTD_INLINE _GL_EXTERN_INLINE - #include "unistd.h" - typedef int dummy; -diff --git a/lib/unistd.in.h b/lib/unistd.in.h -index 5914fd5..73c882f 100644 ---- a/lib/unistd.in.h -+++ b/lib/unistd.in.h -@@ -1,18 +1,18 @@ - /* Substitute for and wrapper around . - Copyright (C) 2003-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ along with this program. If not, see . */ - - #ifndef _@GUARD_PREFIX@_UNISTD_H - -@@ -1521,6 +1521,7 @@ _GL_WARN_ON_USE (group_member, "group_member is unportable - " - # undef isatty - # define isatty rpl_isatty - # endif -+# define GNULIB_defined_isatty 1 - _GL_FUNCDECL_RPL (isatty, int, (int fd)); - _GL_CXXALIAS_RPL (isatty, int, (int fd)); - # elif defined _WIN32 && !defined __CYGWIN__ -@@ -2027,15 +2028,23 @@ _GL_WARN_ON_USE (sleep, "sleep is unportable - " - #if @GNULIB_MDA_SWAB@ - /* On native Windows, map 'swab' to '_swab', so that -loldnames is not - required. In C++ with GNULIB_NAMESPACE, avoid differences between -- platforms by defining GNULIB_NAMESPACE::creat always. */ -+ platforms by defining GNULIB_NAMESPACE::swab always. */ - # if defined _WIN32 && !defined __CYGWIN__ - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) - # undef swab - # define swab _swab - # endif --_GL_CXXALIAS_MDA (swab, void, (char *from, char *to, int n)); -+/* Need to cast, because in old mingw the arguments are -+ (const char *from, char *to, size_t n). */ -+_GL_CXXALIAS_MDA_CAST (swab, void, (char *from, char *to, int n)); - # else -+# if defined __hpux /* HP-UX */ -+_GL_CXXALIAS_SYS (swab, void, (const char *from, char *to, int n)); -+# elif defined __sun && !defined _XPG4 /* Solaris */ -+_GL_CXXALIAS_SYS (swab, void, (const char *from, char *to, ssize_t n)); -+# else - _GL_CXXALIAS_SYS (swab, void, (const void *from, void *to, ssize_t n)); -+# endif - # endif - _GL_CXXALIASWARN (swab); - #endif -diff --git a/lib/unsetenv.c b/lib/unsetenv.c -index 005fb1f..b2e910e 100644 ---- a/lib/unsetenv.c -+++ b/lib/unsetenv.c -@@ -1,12 +1,12 @@ - /* Copyright (C) 1992, 1995-2002, 2005-2021 Free Software Foundation, Inc. - This file is part of the GNU C Library. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c -index 8d51006..d9b669d 100644 ---- a/lib/vasnprintf.c -+++ b/lib/vasnprintf.c -@@ -1,18 +1,18 @@ - /* vsprintf with automatic memory allocation. - Copyright (C) 1999, 2002-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - /* This file can be parametrized with the following macros: - VASNPRINTF The name of the function being defined. -@@ -60,10 +60,16 @@ - #ifndef VASNPRINTF - # include - #endif --#ifndef IN_LIBINTL --# include -+ -+/* As of GCC 11.2.1, gcc -Wanalyzer-too-complex reports that main's -+ use of CHECK macros expands to code that is too complicated for gcc -+ -fanalyzer. Suppress the resulting bogus warnings. */ -+#if 10 <= __GNUC__ -+# pragma GCC diagnostic ignored "-Wanalyzer-null-argument" - #endif - -+#include -+ - /* Specification. */ - #ifndef VASNPRINTF - # if WIDE_CHAR_VERSION -@@ -1924,7 +1930,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, - - /* Ensures that allocated >= needed. Aborts through a jump to - out_of_memory if needed is SIZE_MAX or otherwise too big. */ --#define ENSURE_ALLOCATION(needed) \ -+#define ENSURE_ALLOCATION_ELSE(needed, oom_statement) \ - if ((needed) > allocated) \ - { \ - size_t memory_size; \ -@@ -1935,17 +1941,19 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, - allocated = (needed); \ - memory_size = xtimes (allocated, sizeof (DCHAR_T)); \ - if (size_overflow_p (memory_size)) \ -- goto out_of_memory; \ -+ oom_statement \ - if (result == resultbuf || result == NULL) \ - memory = (DCHAR_T *) malloc (memory_size); \ - else \ - memory = (DCHAR_T *) realloc (result, memory_size); \ - if (memory == NULL) \ -- goto out_of_memory; \ -+ oom_statement \ - if (result == resultbuf && length > 0) \ - DCHAR_CPY (memory, result, length); \ - result = memory; \ - } -+#define ENSURE_ALLOCATION(needed) \ -+ ENSURE_ALLOCATION_ELSE((needed), goto out_of_memory; ) - - for (cp = format, i = 0, dp = &d.dir[0]; ; cp = dp->dir_end, i++, dp++) - { -@@ -2193,7 +2201,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, - } - if (converted != result + length) - { -- ENSURE_ALLOCATION (xsum (length, converted_len)); -+ ENSURE_ALLOCATION_ELSE (xsum (length, converted_len), -+ { free (converted); goto out_of_memory; }); - DCHAR_CPY (result + length, converted, converted_len); - free (converted); - } -@@ -2317,7 +2326,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, - } - if (converted != result + length) - { -- ENSURE_ALLOCATION (xsum (length, converted_len)); -+ ENSURE_ALLOCATION_ELSE (xsum (length, converted_len), -+ { free (converted); goto out_of_memory; }); - DCHAR_CPY (result + length, converted, converted_len); - free (converted); - } -@@ -2441,7 +2451,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, - } - if (converted != result + length) - { -- ENSURE_ALLOCATION (xsum (length, converted_len)); -+ ENSURE_ALLOCATION_ELSE (xsum (length, converted_len), -+ { free (converted); goto out_of_memory; }); - DCHAR_CPY (result + length, converted, converted_len); - free (converted); - } -@@ -2944,7 +2955,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, - } - } - # else -- ENSURE_ALLOCATION (xsum (length, tmpdst_len)); -+ ENSURE_ALLOCATION_ELSE (xsum (length, tmpdst_len), -+ { free (tmpdst); goto out_of_memory; }); - DCHAR_CPY (result + length, tmpdst, tmpdst_len); - free (tmpdst); - length += tmpdst_len; -@@ -3147,7 +3159,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, - } - } - # else -- ENSURE_ALLOCATION (xsum (length, tmpdst_len)); -+ ENSURE_ALLOCATION_ELSE (xsum (length, tmpdst_len), -+ { free (tmpdst); goto out_of_memory; }); - DCHAR_CPY (result + length, tmpdst, tmpdst_len); - free (tmpdst); - length += tmpdst_len; -@@ -5598,7 +5611,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, - CLEANUP (); - return NULL; - } -- ENSURE_ALLOCATION (xsum (length, tmpdst_len)); -+ ENSURE_ALLOCATION_ELSE (xsum (length, tmpdst_len), -+ { free (tmpdst); goto out_of_memory; }); - DCHAR_CPY (result + length, tmpdst, tmpdst_len); - free (tmpdst); - count = tmpdst_len; -diff --git a/lib/vasnprintf.h b/lib/vasnprintf.h -index aaed859..9b02cdf 100644 ---- a/lib/vasnprintf.h -+++ b/lib/vasnprintf.h -@@ -1,18 +1,18 @@ - /* vsprintf with automatic memory allocation. - Copyright (C) 2002-2004, 2007-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #ifndef _VASNPRINTF_H - #define _VASNPRINTF_H -diff --git a/lib/verify.h b/lib/verify.h -index d1b4995..a8ca59b 100644 ---- a/lib/verify.h -+++ b/lib/verify.h -@@ -2,12 +2,12 @@ - - Copyright (C) 2005-2006, 2009-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -@@ -25,7 +25,7 @@ - works as per C11. This is supported by GCC 4.6.0+ and by clang 4+. - - Define _GL_HAVE__STATIC_ASSERT1 to 1 if _Static_assert (R) works as -- per C2X. This is supported by GCC 9.1+. -+ per C2x. This is supported by GCC 9.1+. - - Support compilers claiming conformance to the relevant standard, - and also support GCC when not pedantic. If we were willing to slow -@@ -202,7 +202,7 @@ template - - This macro requires three or more arguments but uses at most the first - two, so that the _Static_assert macro optionally defined below supports -- both the C11 two-argument syntax and the C2X one-argument syntax. -+ both the C11 two-argument syntax and the C2x one-argument syntax. - - Unfortunately, unlike C11, this implementation must appear as an - ordinary declaration, and cannot appear inside struct { ... }. */ -diff --git a/lib/vsnprintf.c b/lib/vsnprintf.c -index c94c5cb..4a0a3dc 100644 ---- a/lib/vsnprintf.c -+++ b/lib/vsnprintf.c -@@ -2,18 +2,18 @@ - Copyright (C) 2004, 2006-2021 Free Software Foundation, Inc. - Written by Simon Josefsson and Yoann Vandoorselaere . - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - #ifdef HAVE_CONFIG_H - # include -diff --git a/lib/w32sock.h b/lib/w32sock.h -index 9b6a231..635a1b2 100644 ---- a/lib/w32sock.h -+++ b/lib/w32sock.h -@@ -2,12 +2,12 @@ - - Copyright (C) 2008-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/wchar.in.h b/lib/wchar.in.h -index fe4171c..be5d36c 100644 ---- a/lib/wchar.in.h -+++ b/lib/wchar.in.h -@@ -2,18 +2,18 @@ - - Copyright (C) 2007-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ along with this program. If not, see . */ - - /* Written by Eric Blake. */ - -@@ -72,6 +72,9 @@ - # include - #endif - -+/* Get free(). */ -+#include -+ - /* Include the original if it exists. - Some builds of uClibc lack it. */ - /* The include_next requires a split double-inclusion guard. */ -@@ -111,7 +114,7 @@ - /* mingw and MSVC define wint_t as 'unsigned short' in or - . This is too small: ISO C 99 section 7.24.1.(2) says that - wint_t must be "unchanged by default argument promotions". Override it. */ --# if @GNULIB_OVERRIDES_WINT_T@ -+# if @GNULIBHEADERS_OVERRIDE_WINT_T@ - # if !GNULIB_defined_wint_t - # if @HAVE_CRTDEFS_H@ - # include -@@ -941,36 +944,48 @@ _GL_WARN_ON_USE (wcsxfrm, "wcsxfrm is unportable - " - # endif - _GL_CXXALIAS_MDA (wcsdup, wchar_t *, (const wchar_t *s)); - # else --# if !@HAVE_WCSDUP@ --_GL_FUNCDECL_SYS (wcsdup, wchar_t *, (const wchar_t *s)); -+# if !@HAVE_WCSDUP@ || __GNUC__ >= 11 -+_GL_FUNCDECL_SYS (wcsdup, wchar_t *, -+ (const wchar_t *s) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); - # endif - _GL_CXXALIAS_SYS (wcsdup, wchar_t *, (const wchar_t *s)); - # endif - _GL_CXXALIASWARN (wcsdup); --#elif defined GNULIB_POSIXCHECK --# undef wcsdup --# if HAVE_RAW_DECL_WCSDUP -+#else -+# if __GNUC__ >= 11 && !defined wcsdup -+/* For -Wmismatched-dealloc: Associate wcsdup with free or rpl_free. */ -+_GL_FUNCDECL_SYS (wcsdup, wchar_t *, -+ (const wchar_t *s) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); -+# endif -+# if defined GNULIB_POSIXCHECK -+# undef wcsdup -+# if HAVE_RAW_DECL_WCSDUP - _GL_WARN_ON_USE (wcsdup, "wcsdup is unportable - " - "use gnulib module wcsdup for portability"); --# endif --#elif @GNULIB_MDA_WCSDUP@ -+# endif -+# elif @GNULIB_MDA_WCSDUP@ - /* On native Windows, map 'wcsdup' to '_wcsdup', so that -loldnames is not - required. In C++ with GNULIB_NAMESPACE, avoid differences between - platforms by defining GNULIB_NAMESPACE::wcsdup always. */ --# if defined _WIN32 && !defined __CYGWIN__ --# if !(defined __cplusplus && defined GNULIB_NAMESPACE) --# undef wcsdup --# define wcsdup _wcsdup --# endif -+# if defined _WIN32 && !defined __CYGWIN__ -+# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -+# undef wcsdup -+# define wcsdup _wcsdup -+# endif - _GL_CXXALIAS_MDA (wcsdup, wchar_t *, (const wchar_t *s)); --# else --_GL_FUNCDECL_SYS (wcsdup, wchar_t *, (const wchar_t *s)); --# if @HAVE_DECL_WCSDUP@ -+# else -+_GL_FUNCDECL_SYS (wcsdup, wchar_t *, -+ (const wchar_t *s) -+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); -+# if @HAVE_DECL_WCSDUP@ - _GL_CXXALIAS_SYS (wcsdup, wchar_t *, (const wchar_t *s)); -+# endif - # endif --# endif --# if (defined _WIN32 && !defined __CYGWIN__) || @HAVE_DECL_WCSDUP@ -+# if (defined _WIN32 && !defined __CYGWIN__) || @HAVE_DECL_WCSDUP@ - _GL_CXXALIASWARN (wcsdup); -+# endif - # endif - #endif - -diff --git a/lib/wcrtomb.c b/lib/wcrtomb.c -index 76d21ae..5c9fd79 100644 ---- a/lib/wcrtomb.c -+++ b/lib/wcrtomb.c -@@ -2,12 +2,12 @@ - Copyright (C) 2008-2021 Free Software Foundation, Inc. - Written by Bruno Haible , 2008. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/wctype-h.c b/lib/wctype-h.c -index bb5f847..150221d 100644 ---- a/lib/wctype-h.c -+++ b/lib/wctype-h.c -@@ -1,4 +1,23 @@ -+/* Inline functions for . -+ -+ Copyright (C) 2012-2021 Free Software Foundation, Inc. -+ -+ This file 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.1 of the -+ License, or (at your option) any later version. -+ -+ This file 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, see . */ -+ - /* Normally this would be wctype.c, but that name's already taken. */ -+ - #include -+ - #define _GL_WCTYPE_INLINE _GL_EXTERN_INLINE - #include "wctype.h" -diff --git a/lib/wctype.in.h b/lib/wctype.in.h -index 6f0cd21..652d811 100644 ---- a/lib/wctype.in.h -+++ b/lib/wctype.in.h -@@ -2,18 +2,18 @@ - - Copyright (C) 2006-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ along with this program. If not, see . */ - - /* Written by Bruno Haible and Paul Eggert. */ - -@@ -103,7 +103,7 @@ _GL_INLINE_HEADER_BEGIN - /* mingw and MSVC define wint_t as 'unsigned short' in or - . This is too small: ISO C 99 section 7.24.1.(2) says that - wint_t must be "unchanged by default argument promotions". Override it. */ --# if @GNULIB_OVERRIDES_WINT_T@ -+# if @GNULIBHEADERS_OVERRIDE_WINT_T@ - # if !GNULIB_defined_wint_t - # if @HAVE_CRTDEFS_H@ - # include -@@ -132,7 +132,7 @@ typedef unsigned int rpl_wint_t; - same way, or not at all. */ - # if ! @HAVE_ISWCNTRL@ || @REPLACE_ISWCNTRL@ - --# if @GNULIB_OVERRIDES_WINT_T@ /* implies @REPLACE_ISWCNTRL@ */ -+# if @GNULIBHEADERS_OVERRIDE_WINT_T@ /* implies @REPLACE_ISWCNTRL@ */ - - _GL_WCTYPE_INLINE int - rpl_iswalnum (wint_t wc) -@@ -496,7 +496,7 @@ _GL_FUNCDECL_RPL (iswxdigit, int, (wint_t wc)); - - # endif - --# if defined __MINGW32__ && !@GNULIB_OVERRIDES_WINT_T@ -+# if defined __MINGW32__ && !@GNULIBHEADERS_OVERRIDE_WINT_T@ - - /* On native Windows, wchar_t is uint16_t, and wint_t is uint32_t. - The functions towlower and towupper are implemented in the MSVCRT library -@@ -529,7 +529,7 @@ rpl_towupper (wint_t wc) - # define towupper rpl_towupper - # endif - --# endif /* __MINGW32__ && !@GNULIB_OVERRIDES_WINT_T@ */ -+# endif /* __MINGW32__ && !@GNULIBHEADERS_OVERRIDE_WINT_T@ */ - - # define GNULIB_defined_wctype_functions 1 - #endif -@@ -646,7 +646,7 @@ _GL_WARN_ON_USE (wctype, "wctype is unportable - " - The argument WC must be either a wchar_t value or WEOF. - The argument DESC must have been returned by the wctype() function. */ - #if @GNULIB_ISWCTYPE@ --# if @GNULIB_OVERRIDES_WINT_T@ -+# if @GNULIBHEADERS_OVERRIDE_WINT_T@ - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) - # undef iswctype - # define iswctype rpl_iswctype -diff --git a/lib/windows-initguard.h b/lib/windows-initguard.h -index e84051e..7999b23 100644 ---- a/lib/windows-initguard.h -+++ b/lib/windows-initguard.h -@@ -1,18 +1,18 @@ - /* Init guards, somewhat like spinlocks (native Windows implementation). - Copyright (C) 2005-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ along with this program. If not, see . */ - - /* Written by Bruno Haible , 2005. - Based on GCC's gthr-win32.h. */ -diff --git a/lib/write.c b/lib/write.c -index bc53d4d..614cdc6 100644 ---- a/lib/write.c -+++ b/lib/write.c -@@ -2,12 +2,12 @@ - Copyright (C) 2008-2021 Free Software Foundation, Inc. - Written by Bruno Haible , 2008. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -diff --git a/lib/xalloc-oversized.h b/lib/xalloc-oversized.h -index d255969..4184f33 100644 ---- a/lib/xalloc-oversized.h -+++ b/lib/xalloc-oversized.h -@@ -2,12 +2,12 @@ - - Copyright (C) 1990-2000, 2003-2004, 2006-2021 Free Software Foundation, Inc. - -- This program 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 3 of the License, or -- (at your option) any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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. -@@ -22,33 +22,38 @@ - #include - - /* True if N * S does not fit into both ptrdiff_t and size_t. -- S must be positive and N must be nonnegative. -+ N and S should be nonnegative and free of side effects. - This expands to a constant expression if N and S are both constants. - By gnulib convention, SIZE_MAX represents overflow in size_t - calculations, so the conservative size_t-based dividend to use here - is SIZE_MAX - 1. */ - #define __xalloc_oversized(n, s) \ -- ((size_t) (PTRDIFF_MAX < SIZE_MAX ? PTRDIFF_MAX : SIZE_MAX - 1) / (s) < (n)) -+ ((s) != 0 \ -+ && ((size_t) (PTRDIFF_MAX < SIZE_MAX ? PTRDIFF_MAX : SIZE_MAX - 1) / (s) \ -+ < (n))) - --#if PTRDIFF_MAX < SIZE_MAX --typedef ptrdiff_t xalloc_count_t; --#else --typedef size_t xalloc_count_t; --#endif -+/* Return 1 if and only if an array of N objects, each of size S, -+ cannot exist reliably because its total size in bytes would exceed -+ MIN (PTRDIFF_MAX, SIZE_MAX - 1). -+ -+ N and S should be nonnegative and free of side effects. -+ -+ Warning: (xalloc_oversized (N, S) ? NULL : malloc (N * S)) can -+ misbehave if N and S are both narrower than ptrdiff_t and size_t, -+ and can be rewritten as (xalloc_oversized (N, S) ? NULL -+ : malloc (N * (size_t) S)). - --/* Return 1 if an array of N objects, each of size S, cannot exist reliably -- because its total size in bytes exceeds MIN (PTRDIFF_MAX, SIZE_MAX). -- N must be nonnegative, S must be positive, and either N or S should be -- of type ptrdiff_t or size_t or wider. This is a macro, not a function, -- so that it works even if an argument exceeds MAX (PTRDIFF_MAX, SIZE_MAX). */ --#if 7 <= __GNUC__ && !defined __clang__ -+ This is a macro, not a function, so that it works even if an -+ argument exceeds MAX (PTRDIFF_MAX, SIZE_MAX). */ -+#if 7 <= __GNUC__ && !defined __clang__ && PTRDIFF_MAX < SIZE_MAX - # define xalloc_oversized(n, s) \ -- __builtin_mul_overflow_p (n, s, (xalloc_count_t) 1) --#elif 5 <= __GNUC__ && !defined __ICC && !__STRICT_ANSI__ -+ __builtin_mul_overflow_p (n, s, (ptrdiff_t) 1) -+#elif (5 <= __GNUC__ && !defined __ICC && !__STRICT_ANSI__ \ -+ && PTRDIFF_MAX < SIZE_MAX) - # define xalloc_oversized(n, s) \ - (__builtin_constant_p (n) && __builtin_constant_p (s) \ - ? __xalloc_oversized (n, s) \ -- : ({ xalloc_count_t __xalloc_count; \ -+ : ({ ptrdiff_t __xalloc_count; \ - __builtin_mul_overflow (n, s, &__xalloc_count); })) - - /* Other compilers use integer division; this may be slower but is -diff --git a/lib/xsize.c b/lib/xsize.c -index 4b4914c..b3d73a2 100644 ---- a/lib/xsize.c -+++ b/lib/xsize.c -@@ -1,3 +1,21 @@ -+/* Checked size_t computations. -+ -+ Copyright (C) 2012-2021 Free Software Foundation, Inc. -+ -+ This file 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.1 of the -+ License, or (at your option) any later version. -+ -+ This file 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, see . */ -+ - #include -+ - #define XSIZE_INLINE _GL_EXTERN_INLINE - #include "xsize.h" -diff --git a/lib/xsize.h b/lib/xsize.h -index d4d7b1c..91fa877 100644 ---- a/lib/xsize.h -+++ b/lib/xsize.h -@@ -2,18 +2,18 @@ - - Copyright (C) 2003, 2008-2021 Free Software Foundation, Inc. - -- This program 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, or (at your option) -- any later version. -+ This file 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.1 of the -+ License, or (at your option) any later version. - -- This program is distributed in the hope that it will be useful, -+ This file 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, see . */ -+ along with this program. If not, see . */ - - #ifndef _XSIZE_H - #define _XSIZE_H -diff --git a/m4/arpa_inet_h.m4 b/m4/arpa_inet_h.m4 -index c4e386d..a3ba256 100644 ---- a/m4/arpa_inet_h.m4 -+++ b/m4/arpa_inet_h.m4 -@@ -1,4 +1,4 @@ --# arpa_inet_h.m4 serial 14 -+# arpa_inet_h.m4 serial 17 - dnl Copyright (C) 2006, 2008-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -6,10 +6,10 @@ dnl with or without modifications, as long as this notice is preserved. - - dnl Written by Simon Josefsson and Bruno Haible - --AC_DEFUN([gl_HEADER_ARPA_INET], -+AC_DEFUN_ONCE([gl_ARPA_INET_H], - [ -- dnl Use AC_REQUIRE here, so that the default behavior below is expanded -- dnl once only, before all statements that occur in other macros. -+ dnl Ensure to expand the default settings once only, before all statements -+ dnl that occur in other macros. - AC_REQUIRE([gl_ARPA_INET_H_DEFAULTS]) - - AC_CHECK_HEADERS_ONCE([arpa/inet.h]) -@@ -40,17 +40,32 @@ AC_DEFUN([gl_HEADER_ARPA_INET], - ]], [inet_ntop inet_pton]) - ]) - -+# gl_ARPA_INET_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_ARPA_INET_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_ARPA_INET_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_ARPA_INET_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_ARPA_INET_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_ARPA_INET_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_INET_NTOP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_INET_PTON]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_ARPA_INET_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_ARPA_INET_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_ARPA_INET_H_DEFAULTS], - [ -- GNULIB_INET_NTOP=0; AC_SUBST([GNULIB_INET_NTOP]) -- GNULIB_INET_PTON=0; AC_SUBST([GNULIB_INET_PTON]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_DECL_INET_NTOP=1; AC_SUBST([HAVE_DECL_INET_NTOP]) - HAVE_DECL_INET_PTON=1; AC_SUBST([HAVE_DECL_INET_PTON]) -diff --git a/m4/dirent_h.m4 b/m4/dirent_h.m4 -index 6d86142..17e2a20 100644 ---- a/m4/dirent_h.m4 -+++ b/m4/dirent_h.m4 -@@ -1,4 +1,4 @@ --# dirent_h.m4 serial 16 -+# dirent_h.m4 serial 19 - dnl Copyright (C) 2008-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -6,10 +6,10 @@ dnl with or without modifications, as long as this notice is preserved. - - dnl Written by Bruno Haible. - --AC_DEFUN([gl_DIRENT_H], -+AC_DEFUN_ONCE([gl_DIRENT_H], - [ -- dnl Use AC_REQUIRE here, so that the default behavior below is expanded -- dnl once only, before all statements that occur in other macros. -+ dnl Ensure to expand the default settings once only, before all statements -+ dnl that occur in other macros. - AC_REQUIRE([gl_DIRENT_H_DEFAULTS]) - - dnl is always overridden, because of GNULIB_POSIXCHECK. -@@ -27,26 +27,41 @@ AC_DEFUN([gl_DIRENT_H], - ]], [alphasort closedir dirfd fdopendir opendir readdir rewinddir scandir]) - ]) - -+# gl_DIRENT_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_DIRENT_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_DIRENT_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_DIRENT_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_DIRENT_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_DIRENT_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_UNISTD_H_REQUIRE_DEFAULTS dnl for REPLACE_FCHDIR -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OPENDIR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_READDIR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REWINDDIR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CLOSEDIR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DIRFD]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FDOPENDIR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SCANDIR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ALPHASORT]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_DIRENT_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_DIRENT_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_DIRENT_H_DEFAULTS], - [ -- AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) dnl for REPLACE_FCHDIR -- GNULIB_OPENDIR=0; AC_SUBST([GNULIB_OPENDIR]) -- GNULIB_READDIR=0; AC_SUBST([GNULIB_READDIR]) -- GNULIB_REWINDDIR=0; AC_SUBST([GNULIB_REWINDDIR]) -- GNULIB_CLOSEDIR=0; AC_SUBST([GNULIB_CLOSEDIR]) -- GNULIB_DIRFD=0; AC_SUBST([GNULIB_DIRFD]) -- GNULIB_FDOPENDIR=0; AC_SUBST([GNULIB_FDOPENDIR]) -- GNULIB_SCANDIR=0; AC_SUBST([GNULIB_SCANDIR]) -- GNULIB_ALPHASORT=0; AC_SUBST([GNULIB_ALPHASORT]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_OPENDIR=1; AC_SUBST([HAVE_OPENDIR]) - HAVE_READDIR=1; AC_SUBST([HAVE_READDIR]) -diff --git a/m4/environ.m4 b/m4/environ.m4 -index d971770..ae53291 100644 ---- a/m4/environ.m4 -+++ b/m4/environ.m4 -@@ -1,4 +1,4 @@ --# environ.m4 serial 7 -+# environ.m4 serial 8 - dnl Copyright (C) 2001-2004, 2006-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -33,7 +33,8 @@ AC_DEFUN([gt_CHECK_VAR_DECL], - [AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[$1 -- extern struct { int foo; } $2;]], -+ typedef struct { int foo; } foo_t; -+ extern foo_t $2;]], - [[$2.foo = 1;]])], - [gt_cv_var=no], - [gt_cv_var=yes])]) -diff --git a/m4/fcntl_h.m4 b/m4/fcntl_h.m4 -index e63a82f..aba4473 100644 ---- a/m4/fcntl_h.m4 -+++ b/m4/fcntl_h.m4 -@@ -1,4 +1,4 @@ --# serial 17 -+# serial 20 - # Configure fcntl.h. - dnl Copyright (C) 2006-2007, 2009-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation -@@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is preserved. - - dnl Written by Paul Eggert. - --AC_DEFUN([gl_FCNTL_H], -+AC_DEFUN_ONCE([gl_FCNTL_H], - [ - AC_REQUIRE([gl_FCNTL_H_DEFAULTS]) - AC_REQUIRE([gl_FCNTL_O_FLAGS]) -@@ -26,25 +26,40 @@ AC_DEFUN([gl_FCNTL_H], - ]], [fcntl openat]) - ]) - -+# gl_FCNTL_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_FCNTL_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_FCNTL_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_FCNTL_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_FCNTL_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_FCNTL_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CREAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FCNTL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_NONBLOCKING]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OPEN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OPENAT]) -+ dnl Support Microsoft deprecated alias function names by default. -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_CREAT], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_OPEN], [1]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_FCNTL_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_FCNTL_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_FCNTL_H_DEFAULTS], - [ -- GNULIB_CREAT=0; AC_SUBST([GNULIB_CREAT]) -- GNULIB_FCNTL=0; AC_SUBST([GNULIB_FCNTL]) -- GNULIB_NONBLOCKING=0; AC_SUBST([GNULIB_NONBLOCKING]) -- GNULIB_OPEN=0; AC_SUBST([GNULIB_OPEN]) -- GNULIB_OPENAT=0; AC_SUBST([GNULIB_OPENAT]) -- dnl Support Microsoft deprecated alias function names by default. -- GNULIB_MDA_CREAT=1; AC_SUBST([GNULIB_MDA_CREAT]) -- GNULIB_MDA_OPEN=1; AC_SUBST([GNULIB_MDA_OPEN]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_FCNTL=1; AC_SUBST([HAVE_FCNTL]) - HAVE_OPENAT=1; AC_SUBST([HAVE_OPENAT]) -diff --git a/m4/flock.m4 b/m4/flock.m4 -index eb46642..e1e5fe0 100644 ---- a/m4/flock.m4 -+++ b/m4/flock.m4 -@@ -1,4 +1,4 @@ --# flock.m4 serial 3 -+# flock.m4 serial 4 - dnl Copyright (C) 2008-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is preserved. - - AC_DEFUN([gl_FUNC_FLOCK], - [ -- AC_REQUIRE([gl_HEADER_SYS_FILE_H_DEFAULTS]) -+ AC_REQUIRE([gl_SYS_FILE_H_DEFAULTS]) - AC_CHECK_FUNCS_ONCE([flock]) - if test $ac_cv_func_flock = no; then - HAVE_FLOCK=0 -diff --git a/m4/fstat.m4 b/m4/fstat.m4 -index 3b5b238..cdaca80 100644 ---- a/m4/fstat.m4 -+++ b/m4/fstat.m4 -@@ -1,4 +1,4 @@ --# fstat.m4 serial 7 -+# fstat.m4 serial 8 - dnl Copyright (C) 2011-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -34,7 +34,7 @@ AC_DEFUN([gl_FUNC_FSTAT], - - # Prerequisites of lib/fstat.c and lib/stat-w32.c. - AC_DEFUN([gl_PREREQ_FSTAT], [ -- AC_REQUIRE([gl_HEADER_SYS_STAT_H]) -+ AC_REQUIRE([gl_SYS_STAT_H]) - AC_REQUIRE([gl_PREREQ_STAT_W32]) - : - ]) -diff --git a/m4/getaddrinfo.m4 b/m4/getaddrinfo.m4 -index 97889a8..3f8e04f 100644 ---- a/m4/getaddrinfo.m4 -+++ b/m4/getaddrinfo.m4 -@@ -1,4 +1,4 @@ --# getaddrinfo.m4 serial 33 -+# getaddrinfo.m4 serial 34 - dnl Copyright (C) 2004-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -6,8 +6,8 @@ dnl with or without modifications, as long as this notice is preserved. - - AC_DEFUN([gl_GETADDRINFO], - [ -- AC_REQUIRE([gl_HEADER_SYS_SOCKET])dnl for HAVE_SYS_SOCKET_H, HAVE_WINSOCK2_H -- AC_REQUIRE([gl_HEADER_NETDB])dnl for HAVE_NETDB_H -+ AC_REQUIRE([gl_SYS_SOCKET_H])dnl for HAVE_SYS_SOCKET_H, HAVE_WINSOCK2_H -+ AC_REQUIRE([gl_NETDB_H])dnl for HAVE_NETDB_H - GETADDRINFO_LIB= - gai_saved_LIBS="$LIBS" - -@@ -156,13 +156,13 @@ const char *gai_strerror(int);]])], - # Prerequisites of lib/netdb.in.h and lib/getaddrinfo.c. - AC_DEFUN([gl_PREREQ_GETADDRINFO], [ - AC_REQUIRE([gl_NETDB_H_DEFAULTS]) -- AC_REQUIRE([gl_HEADER_SYS_SOCKET])dnl for HAVE_SYS_SOCKET_H, HAVE_WINSOCK2_H -+ AC_REQUIRE([gl_SYS_SOCKET_H])dnl for HAVE_SYS_SOCKET_H, HAVE_WINSOCK2_H - AC_REQUIRE([gl_HOSTENT]) dnl for HOSTENT_LIB - AC_REQUIRE([gl_SERVENT]) dnl for SERVENT_LIB - AC_REQUIRE([gl_FUNC_INET_NTOP]) dnl for INET_NTOP_LIB - AC_REQUIRE([AC_C_RESTRICT]) - AC_REQUIRE([gl_SOCKET_FAMILIES]) -- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -+ AC_REQUIRE([gl_SYS_SOCKET_H]) - AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) - - dnl Including sys/socket.h is wrong for Windows, but Windows does not -diff --git a/m4/gnulib-common.m4 b/m4/gnulib-common.m4 -index f2eff10..c801b3d 100644 ---- a/m4/gnulib-common.m4 -+++ b/m4/gnulib-common.m4 -@@ -1,4 +1,4 @@ --# gnulib-common.m4 serial 63 -+# gnulib-common.m4 serial 67 - dnl Copyright (C) 2007-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -85,12 +85,12 @@ AC_DEFUN([gl_COMMON_BODY], [ - # define _GL_ATTR_fallthrough _GL_GNUC_PREREQ (7, 0) - # define _GL_ATTR_format _GL_GNUC_PREREQ (2, 7) - # define _GL_ATTR_leaf _GL_GNUC_PREREQ (4, 6) -+# define _GL_ATTR_malloc _GL_GNUC_PREREQ (3, 0) - # ifdef _ICC - # define _GL_ATTR_may_alias 0 - # else - # define _GL_ATTR_may_alias _GL_GNUC_PREREQ (3, 3) - # endif --# define _GL_ATTR_malloc _GL_GNUC_PREREQ (3, 0) - # define _GL_ATTR_noinline _GL_GNUC_PREREQ (3, 1) - # define _GL_ATTR_nonnull _GL_GNUC_PREREQ (3, 3) - # define _GL_ATTR_nonstring _GL_GNUC_PREREQ (8, 0) -@@ -103,6 +103,12 @@ AC_DEFUN([gl_COMMON_BODY], [ - # define _GL_ATTR_warn_unused_result _GL_GNUC_PREREQ (3, 4) - #endif - -+#ifdef __has_c_attribute -+# define _GL_HAS_C_ATTRIBUTE(attr) __has_c_attribute (__##attr##__) -+#else -+# define _GL_HAS_C_ATTRIBUTE(attr) 0 -+#endif -+ - ]dnl There is no _GL_ATTRIBUTE_ALIGNED; use stdalign's _Alignas instead. - [ - #if _GL_HAS_ATTRIBUTE (alloc_size) -@@ -142,7 +148,20 @@ AC_DEFUN([gl_COMMON_BODY], [ - # define _GL_ATTRIBUTE_CONST - #endif - --#if 201710L < __STDC_VERSION__ -+/* _GL_ATTRIBUTE_DEALLOC (F, I) is for functions returning pointers -+ that can be freed by passing them as the Ith argument to the -+ function F. _GL_ATTRIBUTE_DEALLOC_FREE is for functions that -+ return pointers that can be freed via 'free'; it can be used -+ only after including stdlib.h. These macros cannot be used on -+ inline functions. */ -+#if _GL_GNUC_PREREQ (11, 0) -+# define _GL_ATTRIBUTE_DEALLOC(f, i) __attribute__ ((__malloc__ (f, i))) -+#else -+# define _GL_ATTRIBUTE_DEALLOC(f, i) -+#endif -+#define _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_DEALLOC (free, 1) -+ -+#if _GL_HAS_C_ATTRIBUTE (deprecated) - # define _GL_ATTRIBUTE_DEPRECATED [[__deprecated__]] - #elif _GL_HAS_ATTRIBUTE (deprecated) - # define _GL_ATTRIBUTE_DEPRECATED __attribute__ ((__deprecated__)) -@@ -168,7 +187,7 @@ AC_DEFUN([gl_COMMON_BODY], [ - #endif - - /* FALLTHROUGH is special, because it always expands to something. */ --#if 201710L < __STDC_VERSION__ -+#if _GL_HAS_C_ATTRIBUTE (fallthrough) - # define _GL_ATTRIBUTE_FALLTHROUGH [[__fallthrough__]] - #elif _GL_HAS_ATTRIBUTE (fallthrough) - # define _GL_ATTRIBUTE_FALLTHROUGH __attribute__ ((__fallthrough__)) -@@ -188,6 +207,12 @@ AC_DEFUN([gl_COMMON_BODY], [ - # define _GL_ATTRIBUTE_LEAF - #endif - -+#if _GL_HAS_ATTRIBUTE (malloc) -+# define _GL_ATTRIBUTE_MALLOC __attribute__ ((__malloc__)) -+#else -+# define _GL_ATTRIBUTE_MALLOC -+#endif -+ - /* Oracle Studio 12.6 mishandles may_alias despite __has_attribute OK. */ - #if _GL_HAS_ATTRIBUTE (may_alias) && !defined __SUNPRO_C - # define _GL_ATTRIBUTE_MAY_ALIAS __attribute__ ((__may_alias__)) -@@ -195,24 +220,15 @@ AC_DEFUN([gl_COMMON_BODY], [ - # define _GL_ATTRIBUTE_MAY_ALIAS - #endif - --#if 201710L < __STDC_VERSION__ -+#if _GL_HAS_C_ATTRIBUTE (maybe_unused) - # define _GL_ATTRIBUTE_MAYBE_UNUSED [[__maybe_unused__]] --#elif _GL_HAS_ATTRIBUTE (unused) --# define _GL_ATTRIBUTE_MAYBE_UNUSED __attribute__ ((__unused__)) - #else --# define _GL_ATTRIBUTE_MAYBE_UNUSED -+# define _GL_ATTRIBUTE_MAYBE_UNUSED _GL_ATTRIBUTE_UNUSED - #endif - /* Earlier spellings of this macro. */ --#define _GL_UNUSED _GL_ATTRIBUTE_MAYBE_UNUSED - #define _UNUSED_PARAMETER_ _GL_ATTRIBUTE_MAYBE_UNUSED - --#if _GL_HAS_ATTRIBUTE (malloc) --# define _GL_ATTRIBUTE_MALLOC __attribute__ ((__malloc__)) --#else --# define _GL_ATTRIBUTE_MALLOC --#endif -- --#if 201710L < __STDC_VERSION__ -+#if _GL_HAS_C_ATTRIBUTE (nodiscard) - # define _GL_ATTRIBUTE_NODISCARD [[__nodiscard__]] - #elif _GL_HAS_ATTRIBUTE (warn_unused_result) - # define _GL_ATTRIBUTE_NODISCARD __attribute__ ((__warn_unused_result__)) -@@ -270,11 +286,19 @@ AC_DEFUN([gl_COMMON_BODY], [ - # define _GL_ATTRIBUTE_SENTINEL(pos) - #endif - -+#if _GL_HAS_ATTRIBUTE (unused) -+# define _GL_ATTRIBUTE_UNUSED __attribute__ ((__unused__)) -+#else -+# define _GL_ATTRIBUTE_UNUSED -+#endif -+/* Earlier spellings of this macro. */ -+#define _GL_UNUSED _GL_ATTRIBUTE_UNUSED -+ - ]dnl There is no _GL_ATTRIBUTE_VISIBILITY; see m4/visibility.m4 instead. - [ - /* To support C++ as well as C, use _GL_UNUSED_LABEL with trailing ';'. */ - #if !defined __cplusplus || _GL_GNUC_PREREQ (4, 5) --# define _GL_UNUSED_LABEL _GL_ATTRIBUTE_MAYBE_UNUSED -+# define _GL_UNUSED_LABEL _GL_ATTRIBUTE_UNUSED - #else - # define _GL_UNUSED_LABEL - #endif -@@ -357,6 +381,16 @@ AC_DEFUN([gl_COMMON_BODY], [ - export LIBC_FATAL_STDERR_ - ]) - -+# gl_MODULE_INDICATOR_INIT_VARIABLE([variablename]) -+# gl_MODULE_INDICATOR_INIT_VARIABLE([variablename], [initialvalue]) -+# initializes the shell variable that indicates the presence of the given module -+# as a C preprocessor expression. -+AC_DEFUN([gl_MODULE_INDICATOR_INIT_VARIABLE], -+[ -+ GL_MODULE_INDICATOR_PREFIX[]_[$1]=m4_if([$2], , [0], [$2]) -+ AC_SUBST(GL_MODULE_INDICATOR_PREFIX[]_[$1]) -+]) -+ - # gl_MODULE_INDICATOR_CONDITION - # expands to a C preprocessor expression that evaluates to 1 or 0, depending - # whether a gnulib module that has been requested shall be considered present -@@ -369,9 +403,9 @@ m4_define([gl_MODULE_INDICATOR_CONDITION], [1]) - AC_DEFUN([gl_MODULE_INDICATOR_SET_VARIABLE], - [ - gl_MODULE_INDICATOR_SET_VARIABLE_AUX( -- [GNULIB_[]m4_translit([[$1]], -- [abcdefghijklmnopqrstuvwxyz./-], -- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])], -+ [GL_MODULE_INDICATOR_PREFIX[]_GNULIB_[]m4_translit([[$1]], -+ [abcdefghijklmnopqrstuvwxyz./-], -+ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])], - [gl_MODULE_INDICATOR_CONDITION]) - ]) - -@@ -656,6 +690,72 @@ AC_DEFUN([gl_CACHE_VAL_SILENT], - ]) - ]) - -+# gl_CC_ALLOW_WARNINGS -+# sets and substitutes a variable GL_CFLAG_ALLOW_WARNINGS, to a $(CC) option -+# that reverts a preceding '-Werror' option, if available. -+# This is expected to be '-Wno-error' on gcc, clang (except clang/MSVC), xlclang -+# and empty otherwise. -+AC_DEFUN([gl_CC_ALLOW_WARNINGS], -+[ -+ AC_REQUIRE([AC_PROG_CC]) -+ AC_CACHE_CHECK([for C compiler option to allow warnings], -+ [gl_cv_cc_wallow], -+ [rm -f conftest* -+ echo 'int dummy;' > conftest.c -+ AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS -c conftest.c 2>conftest1.err]) >/dev/null -+ AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS -Wno-error -c conftest.c 2>conftest2.err]) >/dev/null -+ dnl Test the number of error output lines, because AIX xlc accepts the -+ dnl option '-Wno-error', just to produce a warning -+ dnl "Option -Wno-error was incorrectly specified. The option will be ignored." -+ dnl afterwards. -+ if test $? = 0 && test `wc -l < conftest1.err` = `wc -l < conftest2.err`; then -+ gl_cv_cc_wallow='-Wno-error' -+ else -+ gl_cv_cc_wallow=none -+ fi -+ rm -f conftest* -+ ]) -+ case "$gl_cv_cc_wallow" in -+ none) GL_CFLAG_ALLOW_WARNINGS='' ;; -+ *) GL_CFLAG_ALLOW_WARNINGS="$gl_cv_cc_wallow" ;; -+ esac -+ AC_SUBST([GL_CFLAG_ALLOW_WARNINGS]) -+]) -+ -+# gl_CXX_ALLOW_WARNINGS -+# sets and substitutes a variable GL_CXXFLAG_ALLOW_WARNINGS, to a $(CC) option -+# that reverts a preceding '-Werror' option, if available. -+AC_DEFUN([gl_CXX_ALLOW_WARNINGS], -+[ -+ dnl Requires AC_PROG_CXX or gl_PROG_ANSI_CXX. -+ if test -n "$CXX" && test "$CXX" != no; then -+ AC_CACHE_CHECK([for C++ compiler option to allow warnings], -+ [gl_cv_cxx_wallow], -+ [rm -f conftest* -+ echo 'int dummy;' > conftest.cc -+ AC_TRY_COMMAND([${CXX-c++} $CXXFLAGS $CPPFLAGS -c conftest.cc 2>conftest1.err]) >/dev/null -+ AC_TRY_COMMAND([${CXX-c++} $CXXFLAGS $CPPFLAGS -Wno-error -c conftest.cc 2>conftest2.err]) >/dev/null -+ dnl Test the number of error output lines, because AIX xlC accepts the -+ dnl option '-Wno-error', just to produce a warning -+ dnl "Option -Wno-error was incorrectly specified. The option will be ignored." -+ dnl afterwards. -+ if test $? = 0 && test `wc -l < conftest1.err` = `wc -l < conftest2.err`; then -+ gl_cv_cxx_wallow='-Wno-error' -+ else -+ gl_cv_cxx_wallow=none -+ fi -+ rm -f conftest* -+ ]) -+ case "$gl_cv_cxx_wallow" in -+ none) GL_CXXFLAG_ALLOW_WARNINGS='' ;; -+ *) GL_CXXFLAG_ALLOW_WARNINGS="$gl_cv_cxx_wallow" ;; -+ esac -+ else -+ GL_CXXFLAG_ALLOW_WARNINGS='' -+ fi -+ AC_SUBST([GL_CXXFLAG_ALLOW_WARNINGS]) -+]) -+ - dnl Expands to some code for use in .c programs that, on native Windows, defines - dnl the Microsoft deprecated alias function names to the underscore-prefixed - dnl actual function names. With this macro, these function names are available -diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 -index 1290d75..0ae96ea 100644 ---- a/m4/gnulib-comp.m4 -+++ b/m4/gnulib-comp.m4 -@@ -142,6 +142,7 @@ AC_DEFUN([gl_EARLY], - # Code from module langinfo: - # Code from module largefile: - AC_REQUIRE([AC_SYS_LARGEFILE]) -+ AC_REQUIRE([gl_YEAR2038_EARLY]) - # Code from module ldexp: - # Code from module lib-symbol-versions: - # Code from module lib-symbol-visibility: -@@ -281,9 +282,11 @@ AC_DEFUN([gl_INIT], - m4_pushdef([AC_LIBSOURCES], m4_defn([gl_LIBSOURCES])) - m4_pushdef([gl_LIBSOURCES_LIST], []) - m4_pushdef([gl_LIBSOURCES_DIR], []) -+ m4_pushdef([GL_MACRO_PREFIX], [gl]) -+ m4_pushdef([GL_MODULE_INDICATOR_PREFIX], [GL]) - gl_COMMON - gl_source_base='lib' -- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -+ AC_REQUIRE([gl_SYS_SOCKET_H]) - if test "$ac_cv_header_winsock2_h" = yes; then - AC_LIBOBJ([accept]) - fi -@@ -291,9 +294,10 @@ AC_DEFUN([gl_INIT], - gl_FUNC_ACCEPT4 - gl_SYS_SOCKET_MODULE_INDICATOR([accept4]) - gl_FUNC_ALLOCA -- gl_HEADER_ARPA_INET -+ gl_ARPA_INET_H -+ gl_ARPA_INET_H_REQUIRE_DEFAULTS - AC_PROG_MKDIR_P -- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -+ AC_REQUIRE([gl_SYS_SOCKET_H]) - if test "$ac_cv_header_winsock2_h" = yes; then - AC_LIBOBJ([bind]) - fi -@@ -317,7 +321,7 @@ AC_DEFUN([gl_INIT], - AC_LIBOBJ([close]) - fi - gl_UNISTD_MODULE_INDICATOR([close]) -- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -+ AC_REQUIRE([gl_SYS_SOCKET_H]) - if test "$ac_cv_header_winsock2_h" = yes; then - AC_LIBOBJ([connect]) - fi -@@ -328,6 +332,7 @@ AC_DEFUN([gl_INIT], - fi - gl_MATH_MODULE_INDICATOR([copysign]) - gl_DIRENT_H -+ gl_DIRENT_H_REQUIRE_DEFAULTS - gl_FUNC_DIRFD - if test $ac_cv_func_dirfd = no && test $gl_cv_func_dirfd_macro = no \ - || test $REPLACE_DIRFD = 1; then -@@ -347,6 +352,7 @@ AC_DEFUN([gl_INIT], - gl_HEADER_ERRNO_H - AC_REQUIRE([gl_EXTERN_INLINE]) - gl_FCNTL_H -+ gl_FCNTL_H_REQUIRE_DEFAULTS - AC_C_FLEXIBLE_ARRAY_MEMBER - gl_FLOAT_H - if test $REPLACE_FLOAT_LDBL = 1; then -@@ -360,7 +366,7 @@ AC_DEFUN([gl_INIT], - AC_LIBOBJ([flock]) - gl_PREREQ_FLOCK - fi -- gl_HEADER_SYS_FILE_MODULE_INDICATOR([flock]) -+ gl_SYS_FILE_MODULE_INDICATOR([flock]) - AC_REQUIRE([gl_FUNC_FLOOR]) - if test $REPLACE_FLOOR = 1; then - AC_LIBOBJ([floor]) -@@ -409,17 +415,17 @@ AC_DEFUN([gl_INIT], - fi - gl_UNISTD_MODULE_INDICATOR([getlogin]) - AC_REQUIRE([gl_LIB_GETLOGIN]) -- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -+ AC_REQUIRE([gl_SYS_SOCKET_H]) - if test "$ac_cv_header_winsock2_h" = yes; then - AC_LIBOBJ([getpeername]) - fi - gl_SYS_SOCKET_MODULE_INDICATOR([getpeername]) -- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -+ AC_REQUIRE([gl_SYS_SOCKET_H]) - if test "$ac_cv_header_winsock2_h" = yes; then - AC_LIBOBJ([getsockname]) - fi - gl_SYS_SOCKET_MODULE_INDICATOR([getsockname]) -- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -+ AC_REQUIRE([gl_SYS_SOCKET_H]) - if test "$ac_cv_header_winsock2_h" = yes; then - AC_LIBOBJ([getsockopt]) - fi -@@ -439,6 +445,7 @@ AC_DEFUN([gl_INIT], - m4_ifdef([gl_ICONV_MODULE_INDICATOR], - [gl_ICONV_MODULE_INDICATOR([iconv])]) - gl_ICONV_H -+ gl_ICONV_H_REQUIRE_DEFAULTS - gl_FUNC_ICONV_OPEN - if test $REPLACE_ICONV_OPEN = 1; then - AC_LIBOBJ([iconv_open]) -@@ -461,6 +468,7 @@ AC_DEFUN([gl_INIT], - fi - gl_ARPA_INET_MODULE_INDICATOR([inet_pton]) - gl_INTTYPES_INCOMPLETE -+ gl_INTTYPES_H_REQUIRE_DEFAULTS - gl_ISFINITE - if test $REPLACE_ISFINITE = 1; then - AC_LIBOBJ([isfinite]) -@@ -501,6 +509,7 @@ AC_DEFUN([gl_INIT], - fi - gl_MATH_MODULE_INDICATOR([isnanl]) - gl_LANGINFO_H -+ gl_LANGINFO_H_REQUIRE_DEFAULTS - AC_REQUIRE([gl_LARGEFILE]) - gl_FUNC_LDEXP - gl_LD_VERSION_SCRIPT -@@ -512,7 +521,7 @@ AC_DEFUN([gl_INIT], - AC_LIBOBJ([link]) - fi - gl_UNISTD_MODULE_INDICATOR([link]) -- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -+ AC_REQUIRE([gl_SYS_SOCKET_H]) - if test "$ac_cv_header_winsock2_h" = yes; then - AC_LIBOBJ([listen]) - fi -@@ -522,6 +531,7 @@ AC_DEFUN([gl_INIT], - LOCALCHARSET_TESTS_ENVIRONMENT= - AC_SUBST([LOCALCHARSET_TESTS_ENVIRONMENT]) - gl_LOCALE_H -+ gl_LOCALE_H_REQUIRE_DEFAULTS - gl_FUNC_LOG1P - if test $HAVE_LOG1P = 0 || test $REPLACE_LOG1P = 1; then - AC_LIBOBJ([log1p]) -@@ -541,15 +551,14 @@ AC_DEFUN([gl_INIT], - if test $REPLACE_MALLOC = 1; then - AC_LIBOBJ([malloc]) - fi -- gl_MODULE_INDICATOR([malloc-gnu]) -- gl_FUNC_MALLOC_POSIX -+ AC_REQUIRE([gl_FUNC_MALLOC_POSIX]) - if test $REPLACE_MALLOC = 1; then - AC_LIBOBJ([malloc]) - fi - gl_STDLIB_MODULE_INDICATOR([malloc-posix]) -- gl_MODULE_INDICATOR([malloc-posix]) - gl_MALLOCA - gl_MATH_H -+ gl_MATH_H_REQUIRE_DEFAULTS - gl_MINMAX - gl_FUNC_MKDIR - if test $REPLACE_MKDIR = 1; then -@@ -573,7 +582,8 @@ AC_DEFUN([gl_INIT], - fi - gl_MODULE_INDICATOR([msvc-nothrow]) - gl_MULTIARCH -- gl_HEADER_NETDB -+ gl_NETDB_H -+ gl_NETDB_H_REQUIRE_DEFAULTS - gl_HEADER_NETINET_IN - AC_PROG_MKDIR_P - gl_FUNC_NL_LANGINFO -@@ -607,6 +617,7 @@ AC_DEFUN([gl_INIT], - fi - gl_POLL_MODULE_INDICATOR([poll]) - gl_POLL_H -+ gl_POLL_H_REQUIRE_DEFAULTS - gl_FUNC_PUTENV - if test $REPLACE_PUTENV = 1; then - AC_LIBOBJ([putenv]) -@@ -625,12 +636,12 @@ AC_DEFUN([gl_INIT], - gl_PREREQ_READLINK - fi - gl_UNISTD_MODULE_INDICATOR([readlink]) -- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -+ AC_REQUIRE([gl_SYS_SOCKET_H]) - if test "$ac_cv_header_winsock2_h" = yes; then - AC_LIBOBJ([recv]) - fi - gl_SYS_SOCKET_MODULE_INDICATOR([recv]) -- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -+ AC_REQUIRE([gl_SYS_SOCKET_H]) - if test "$ac_cv_header_winsock2_h" = yes; then - AC_LIBOBJ([recvfrom]) - fi -@@ -657,12 +668,12 @@ AC_DEFUN([gl_INIT], - AC_LIBOBJ([select]) - fi - gl_SYS_SELECT_MODULE_INDICATOR([select]) -- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -+ AC_REQUIRE([gl_SYS_SOCKET_H]) - if test "$ac_cv_header_winsock2_h" = yes; then - AC_LIBOBJ([send]) - fi - gl_SYS_SOCKET_MODULE_INDICATOR([send]) -- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -+ AC_REQUIRE([gl_SYS_SOCKET_H]) - if test "$ac_cv_header_winsock2_h" = yes; then - AC_LIBOBJ([sendto]) - fi -@@ -672,25 +683,26 @@ AC_DEFUN([gl_INIT], - AC_LIBOBJ([setenv]) - fi - gl_STDLIB_MODULE_INDICATOR([setenv]) -- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -+ AC_REQUIRE([gl_SYS_SOCKET_H]) - if test "$ac_cv_header_winsock2_h" = yes; then - AC_LIBOBJ([setsockopt]) - fi - gl_SYS_SOCKET_MODULE_INDICATOR([setsockopt]) -- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -+ AC_REQUIRE([gl_SYS_SOCKET_H]) - if test "$ac_cv_header_winsock2_h" = yes; then - AC_LIBOBJ([shutdown]) - fi - gl_SYS_SOCKET_MODULE_INDICATOR([shutdown]) - gl_SIGNAL_H -- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -+ gl_SIGNAL_H_REQUIRE_DEFAULTS -+ AC_REQUIRE([gl_SYS_SOCKET_H]) - if test "$ac_cv_header_winsock2_h" = yes; then - AC_LIBOBJ([socket]) - fi - # When this module is used, sockets may actually occur as file descriptors, - # hence it is worth warning if the modules 'close' and 'ioctl' are not used. -- m4_ifdef([gl_UNISTD_H_DEFAULTS], [AC_REQUIRE([gl_UNISTD_H_DEFAULTS])]) -- m4_ifdef([gl_SYS_IOCTL_H_DEFAULTS], [AC_REQUIRE([gl_SYS_IOCTL_H_DEFAULTS])]) -+ m4_ifdef([gl_UNISTD_H_DEFAULTS], [gl_UNISTD_H_REQUIRE_DEFAULTS]) -+ m4_ifdef([gl_SYS_IOCTL_H_DEFAULTS], [gl_SYS_IOCTL_H_REQUIRE_DEFAULTS]) - AC_REQUIRE([gl_PREREQ_SYS_H_WINSOCK2]) - if test "$ac_cv_header_winsock2_h" = yes; then - UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS=1 -@@ -705,31 +717,67 @@ AC_DEFUN([gl_INIT], - gl_STDALIGN_H - AM_STDBOOL_H - gl_STDDEF_H -+ gl_STDDEF_H_REQUIRE_DEFAULTS - gl_STDINT_H - gl_STDIO_H -+ gl_STDIO_H_REQUIRE_DEFAULTS -+ dnl No need to create extra modules for these functions. Everyone who uses -+ dnl likely needs them. -+ gl_STDIO_MODULE_INDICATOR([fscanf]) -+ gl_MODULE_INDICATOR([fscanf]) -+ gl_STDIO_MODULE_INDICATOR([scanf]) -+ gl_MODULE_INDICATOR([scanf]) -+ gl_STDIO_MODULE_INDICATOR([fgetc]) -+ gl_STDIO_MODULE_INDICATOR([getc]) -+ gl_STDIO_MODULE_INDICATOR([getchar]) -+ gl_STDIO_MODULE_INDICATOR([fgets]) -+ gl_STDIO_MODULE_INDICATOR([fread]) -+ dnl No need to create extra modules for these functions. Everyone who uses -+ dnl likely needs them. -+ gl_STDIO_MODULE_INDICATOR([fprintf]) -+ gl_STDIO_MODULE_INDICATOR([printf]) -+ gl_STDIO_MODULE_INDICATOR([vfprintf]) -+ gl_STDIO_MODULE_INDICATOR([vprintf]) -+ gl_STDIO_MODULE_INDICATOR([fputc]) -+ gl_STDIO_MODULE_INDICATOR([putc]) -+ gl_STDIO_MODULE_INDICATOR([putchar]) -+ gl_STDIO_MODULE_INDICATOR([fputs]) -+ gl_STDIO_MODULE_INDICATOR([puts]) -+ gl_STDIO_MODULE_INDICATOR([fwrite]) - gl_STDLIB_H -+ gl_STDLIB_H_REQUIRE_DEFAULTS - if test $gl_cond_libtool = false; then - gl_ltlibdeps="$gl_ltlibdeps $LTLIBICONV" - gl_libdeps="$gl_libdeps $LIBICONV" - fi -- gl_HEADER_STRING_H -- gl_HEADER_SYS_FILE_H -+ gl_STRING_H -+ gl_STRING_H_REQUIRE_DEFAULTS -+ gl_SYS_FILE_H -+ gl_SYS_FILE_H_REQUIRE_DEFAULTS - AC_PROG_MKDIR_P -- AC_REQUIRE([gl_HEADER_SYS_SELECT]) -+ gl_SYS_SELECT_H -+ gl_SYS_SELECT_H_REQUIRE_DEFAULTS - AC_PROG_MKDIR_P -- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -+ gl_SYS_SOCKET_H -+ gl_SYS_SOCKET_H_REQUIRE_DEFAULTS - AC_PROG_MKDIR_P -- gl_HEADER_SYS_STAT_H -+ gl_SYS_STAT_H -+ gl_SYS_STAT_H_REQUIRE_DEFAULTS - AC_PROG_MKDIR_P -- gl_HEADER_SYS_TIME_H -+ gl_SYS_TIME_H -+ gl_SYS_TIME_H_REQUIRE_DEFAULTS - AC_PROG_MKDIR_P - gl_SYS_TIMES_H -+ gl_SYS_TIMES_H_REQUIRE_DEFAULTS - AC_PROG_MKDIR_P - gl_SYS_TYPES_H -+ gl_SYS_TYPES_H_REQUIRE_DEFAULTS - AC_PROG_MKDIR_P -- gl_HEADER_SYS_UIO -+ gl_SYS_UIO_H -+ gl_SYS_UIO_H_REQUIRE_DEFAULTS - AC_PROG_MKDIR_P -- gl_HEADER_TIME_H -+ gl_TIME_H -+ gl_TIME_H_REQUIRE_DEFAULTS - gl_TIME_RZ - if test $HAVE_TIMEZONE_T = 0; then - AC_LIBOBJ([time_rz]) -@@ -746,9 +794,11 @@ AC_DEFUN([gl_INIT], - fi - gl_MATH_MODULE_INDICATOR([trunc]) - gl_UNISTD_H -+ gl_UNISTD_H_REQUIRE_DEFAULTS - gl_FUNC_VSNPRINTF - gl_STDIO_MODULE_INDICATOR([vsnprintf]) - gl_WCHAR_H -+ gl_WCHAR_H_REQUIRE_DEFAULTS - gl_FUNC_WRITE - if test $REPLACE_WRITE = 1; then - AC_LIBOBJ([write]) -@@ -771,7 +821,6 @@ AC_DEFUN([gl_INIT], - gl_gnulib_enabled_be453cec5eecf5731a274f2de7f2db36=false - gl_gnulib_enabled_30838f5439487421042f2225bed3af76=false - gl_gnulib_enabled_hostent=false -- gl_gnulib_enabled_idx=false - gl_gnulib_enabled_b1df7117b479d2da59d76deba468ee21=false - gl_gnulib_enabled_3f0e593033d1fc2c127581960f641b66=false - gl_gnulib_enabled_dbdf22868a5367f28bf18e0013ac6f8f=false -@@ -880,7 +929,9 @@ AC_SUBST([LTALLOCA]) - func_gl_gnulib_m4code_dynarray () - { - if ! $gl_gnulib_enabled_dynarray; then -+ AC_PROG_MKDIR_P - gl_gnulib_enabled_dynarray=true -+ func_gl_gnulib_m4code_37f71b604aa9c54446783d80f42fe547 - func_gl_gnulib_m4code_21ee726a3540c09237a8e70c0baf7467 - fi - } -@@ -963,12 +1014,6 @@ AC_SUBST([LTALLOCA]) - gl_gnulib_enabled_hostent=true - fi - } -- func_gl_gnulib_m4code_idx () -- { -- if ! $gl_gnulib_enabled_idx; then -- gl_gnulib_enabled_idx=true -- fi -- } - func_gl_gnulib_m4code_b1df7117b479d2da59d76deba468ee21 () - { - if ! $gl_gnulib_enabled_b1df7117b479d2da59d76deba468ee21; then -@@ -1181,7 +1226,6 @@ AC_SUBST([LTALLOCA]) - AC_LIBOBJ([realloc]) - fi - gl_STDLIB_MODULE_INDICATOR([realloc-posix]) -- gl_MODULE_INDICATOR([realloc-posix]) - gl_gnulib_enabled_61bcaca76b3e6f9ae55d57a1c3193bc4=true - fi - } -@@ -1205,7 +1249,9 @@ AC_SUBST([LTALLOCA]) - func_gl_gnulib_m4code_scratch_buffer () - { - if ! $gl_gnulib_enabled_scratch_buffer; then -+ AC_PROG_MKDIR_P - gl_gnulib_enabled_scratch_buffer=true -+ func_gl_gnulib_m4code_37f71b604aa9c54446783d80f42fe547 - func_gl_gnulib_m4code_21ee726a3540c09237a8e70c0baf7467 - func_gl_gnulib_m4code_61bcaca76b3e6f9ae55d57a1c3193bc4 - fi -@@ -1319,7 +1365,8 @@ AC_SUBST([LTALLOCA]) - func_gl_gnulib_m4code_sys_random () - { - if ! $gl_gnulib_enabled_sys_random; then -- gl_HEADER_SYS_RANDOM -+ gl_SYS_RANDOM_H -+ gl_SYS_RANDOM_H_REQUIRE_DEFAULTS - AC_PROG_MKDIR_P - gl_gnulib_enabled_sys_random=true - fi -@@ -1416,6 +1463,7 @@ AC_SUBST([LTALLOCA]) - { - if ! $gl_gnulib_enabled_3dcce957eadc896e63ab5f137947b410; then - gl_WCTYPE_H -+ gl_WCTYPE_H_REQUIRE_DEFAULTS - gl_gnulib_enabled_3dcce957eadc896e63ab5f137947b410=true - fi - } -@@ -1431,9 +1479,6 @@ AC_SUBST([LTALLOCA]) - func_gl_gnulib_m4code_925677f0343de64b89a9f0c790b4104c - fi - if test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1; then -- func_gl_gnulib_m4code_idx -- fi -- if test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1; then - func_gl_gnulib_m4code_21ee726a3540c09237a8e70c0baf7467 - fi - if test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1; then -@@ -1584,9 +1629,6 @@ AC_SUBST([LTALLOCA]) - func_gl_gnulib_m4code_sockets - fi - if test $HAVE_TIMEZONE_T = 0; then -- func_gl_gnulib_m4code_idx -- fi -- if test $HAVE_TIMEZONE_T = 0; then - func_gl_gnulib_m4code_time_r - fi - if test $HAVE_TIMEZONE_T = 0; then -@@ -1621,7 +1663,6 @@ AC_SUBST([LTALLOCA]) - AM_CONDITIONAL([gl_GNULIB_ENABLED_be453cec5eecf5731a274f2de7f2db36], [$gl_gnulib_enabled_be453cec5eecf5731a274f2de7f2db36]) - AM_CONDITIONAL([gl_GNULIB_ENABLED_30838f5439487421042f2225bed3af76], [$gl_gnulib_enabled_30838f5439487421042f2225bed3af76]) - AM_CONDITIONAL([gl_GNULIB_ENABLED_hostent], [$gl_gnulib_enabled_hostent]) -- AM_CONDITIONAL([gl_GNULIB_ENABLED_idx], [$gl_gnulib_enabled_idx]) - AM_CONDITIONAL([gl_GNULIB_ENABLED_b1df7117b479d2da59d76deba468ee21], [$gl_gnulib_enabled_b1df7117b479d2da59d76deba468ee21]) - AM_CONDITIONAL([gl_GNULIB_ENABLED_3f0e593033d1fc2c127581960f641b66], [$gl_gnulib_enabled_3f0e593033d1fc2c127581960f641b66]) - AM_CONDITIONAL([gl_GNULIB_ENABLED_dbdf22868a5367f28bf18e0013ac6f8f], [$gl_gnulib_enabled_dbdf22868a5367f28bf18e0013ac6f8f]) -@@ -1673,6 +1714,8 @@ AC_SUBST([LTALLOCA]) - m4_if(m4_sysval, [0], [], - [AC_FATAL([expected source file, required through AC_LIBSOURCES, not found])]) - ]) -+ m4_popdef([GL_MODULE_INDICATOR_PREFIX]) -+ m4_popdef([GL_MACRO_PREFIX]) - m4_popdef([gl_LIBSOURCES_DIR]) - m4_popdef([gl_LIBSOURCES_LIST]) - m4_popdef([AC_LIBSOURCES]) -@@ -1699,6 +1742,8 @@ AC_SUBST([LTALLOCA]) - m4_pushdef([AC_LIBSOURCES], m4_defn([gltests_LIBSOURCES])) - m4_pushdef([gltests_LIBSOURCES_LIST], []) - m4_pushdef([gltests_LIBSOURCES_DIR], []) -+ m4_pushdef([GL_MACRO_PREFIX], [gltests]) -+ m4_pushdef([GL_MODULE_INDICATOR_PREFIX], [GL]) - gl_COMMON - gl_source_base='tests' - changequote(,)dnl -@@ -1720,6 +1765,8 @@ changequote([, ])dnl - m4_if(m4_sysval, [0], [], - [AC_FATAL([expected source file, required through AC_LIBSOURCES, not found])]) - ]) -+ m4_popdef([GL_MODULE_INDICATOR_PREFIX]) -+ m4_popdef([GL_MACRO_PREFIX]) - m4_popdef([gltests_LIBSOURCES_DIR]) - m4_popdef([gltests_LIBSOURCES_LIST]) - m4_popdef([AC_LIBSOURCES]) -@@ -2265,6 +2312,7 @@ AC_DEFUN([gl_FILE_LIST], [ - m4/wint_t.m4 - m4/write.m4 - m4/xsize.m4 -+ m4/year2038.m4 - m4/zzgnulib.m4 - top/GNUmakefile - top/maint.mk -diff --git a/m4/hostent.m4 b/m4/hostent.m4 -index 641d72f..f1390a3 100644 ---- a/m4/hostent.m4 -+++ b/m4/hostent.m4 -@@ -1,4 +1,4 @@ --# hostent.m4 serial 3 -+# hostent.m4 serial 4 - dnl Copyright (C) 2008, 2010-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -13,7 +13,7 @@ AC_DEFUN([gl_HOSTENT], - dnl - On BeOS, they are in libnet. - dnl - On native Windows, they are in ws2_32.dll. - dnl - Otherwise they are in libc. -- AC_REQUIRE([gl_HEADER_SYS_SOCKET])dnl for HAVE_SYS_SOCKET_H, HAVE_WINSOCK2_H -+ AC_REQUIRE([gl_SYS_SOCKET_H])dnl for HAVE_SYS_SOCKET_H, HAVE_WINSOCK2_H - HOSTENT_LIB= - gl_saved_libs="$LIBS" - AC_SEARCH_LIBS([gethostbyname], [nsl network net], -diff --git a/m4/iconv_h.m4 b/m4/iconv_h.m4 -index ab8e283..2940988 100644 ---- a/m4/iconv_h.m4 -+++ b/m4/iconv_h.m4 -@@ -1,10 +1,10 @@ --# iconv_h.m4 serial 12 -+# iconv_h.m4 serial 15 - dnl Copyright (C) 2007-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. - --AC_DEFUN([gl_ICONV_H], -+AC_DEFUN_ONCE([gl_ICONV_H], - [ - AC_REQUIRE([gl_ICONV_H_DEFAULTS]) - -@@ -24,22 +24,37 @@ AC_DEFUN([gl_ICONV_H], - dnl Unconditionally enables the replacement of . - AC_DEFUN([gl_REPLACE_ICONV_H], - [ -- AC_REQUIRE([gl_ICONV_H_DEFAULTS]) -+ gl_ICONV_H_REQUIRE_DEFAULTS - ICONV_H='iconv.h' - AM_CONDITIONAL([GL_GENERATE_ICONV_H], [test -n "$ICONV_H"]) - ]) - -+# gl_ICONV_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_ICONV_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_ICONV_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_ICONV_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_ICONV_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_ICONV_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ICONV]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_ICONV_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_ICONV_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_ICONV_H_DEFAULTS], - [ - m4_ifdef([gl_ANSI_CXX], [AC_REQUIRE([gl_ANSI_CXX])]) -- GNULIB_ICONV=0; AC_SUBST([GNULIB_ICONV]) - dnl Assume proper GNU behavior unless another module says otherwise. - ICONV_CONST=; AC_SUBST([ICONV_CONST]) - REPLACE_ICONV=0; AC_SUBST([REPLACE_ICONV]) -diff --git a/m4/inttypes.m4 b/m4/inttypes.m4 -index f56e94a..64b1de5 100644 ---- a/m4/inttypes.m4 -+++ b/m4/inttypes.m4 -@@ -1,4 +1,4 @@ --# inttypes.m4 serial 32 -+# inttypes.m4 serial 35 - dnl Copyright (C) 2006-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is preserved. - dnl From Derek Price, Bruno Haible. - dnl Test whether is supported or must be substituted. - --AC_DEFUN([gl_INTTYPES_H], -+AC_DEFUN_ONCE([gl_INTTYPES_H], - [ - AC_REQUIRE([gl_INTTYPES_INCOMPLETE]) - gl_INTTYPES_PRI_SCN -@@ -136,19 +136,34 @@ AC_DEFUN([gl_INTTYPES_CHECK_LONG_LONG_INT_CONDITION], - AC_SUBST([$1]) - ]) - -+# gl_INTTYPES_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_INTTYPES_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_INTTYPES_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_INTTYPES_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_INTTYPES_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_INTTYPES_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_IMAXABS]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_IMAXDIV]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOIMAX]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOUMAX]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_INTTYPES_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_INTTYPES_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_INTTYPES_H_DEFAULTS], - [ -- GNULIB_IMAXABS=0; AC_SUBST([GNULIB_IMAXABS]) -- GNULIB_IMAXDIV=0; AC_SUBST([GNULIB_IMAXDIV]) -- GNULIB_STRTOIMAX=0; AC_SUBST([GNULIB_STRTOIMAX]) -- GNULIB_STRTOUMAX=0; AC_SUBST([GNULIB_STRTOUMAX]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_DECL_IMAXABS=1; AC_SUBST([HAVE_DECL_IMAXABS]) - HAVE_DECL_IMAXDIV=1; AC_SUBST([HAVE_DECL_IMAXDIV]) -diff --git a/m4/langinfo_h.m4 b/m4/langinfo_h.m4 -index 950fe20..87959f7 100644 ---- a/m4/langinfo_h.m4 -+++ b/m4/langinfo_h.m4 -@@ -1,10 +1,10 @@ --# langinfo_h.m4 serial 9 -+# langinfo_h.m4 serial 12 - dnl Copyright (C) 2009-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. - --AC_DEFUN([gl_LANGINFO_H], -+AC_DEFUN_ONCE([gl_LANGINFO_H], - [ - AC_REQUIRE([gl_LANGINFO_H_DEFAULTS]) - -@@ -104,18 +104,33 @@ int a = YESEXPR; - ]], [nl_langinfo]) - ]) - -+# gl_LANGINFO_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_LANGINFO_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_LANGINFO_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_LANGINFO_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_LANGINFO_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_LANGINFO_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_NL_LANGINFO]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_LANGINFO_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_LANGINFO_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_LANGINFO_H_DEFAULTS], - [ -- GNULIB_NL_LANGINFO=0; AC_SUBST([GNULIB_NL_LANGINFO]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_NL_LANGINFO=1; AC_SUBST([HAVE_NL_LANGINFO]) - REPLACE_NL_LANGINFO=0; AC_SUBST([REPLACE_NL_LANGINFO]) -diff --git a/m4/largefile.m4 b/m4/largefile.m4 -index cadb16d..fbde5e6 100644 ---- a/m4/largefile.m4 -+++ b/m4/largefile.m4 -@@ -22,7 +22,8 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE], - esac - ]) - --# The following implementation works around a problem in autoconf <= 2.69; -+# Work around a problem in Autoconf through at least 2.71 on glibc 2.34+ -+# with _TIME_BITS. Also, work around a problem in autoconf <= 2.69: - # AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5, - # or configures them incorrectly in some cases. - m4_version_prereq([2.70], [], [ -@@ -40,6 +41,7 @@ m4_define([_AC_SYS_LARGEFILE_TEST_INCLUDES], - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]];[]dnl - ]) -+])# m4_version_prereq 2.70 - - - # _AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE, -@@ -54,7 +56,8 @@ m4_define([_AC_SYS_LARGEFILE_MACRO_VALUE], - [AC_LANG_PROGRAM([$5], [$6])], - [$3=no; break]) - m4_ifval([$6], [AC_LINK_IFELSE], [AC_COMPILE_IFELSE])( -- [AC_LANG_PROGRAM([#define $1 $2 -+ [AC_LANG_PROGRAM([#undef $1 -+#define $1 $2 - $5], [$6])], - [$3=$2; break]) - $3=unknown -@@ -80,9 +83,8 @@ rm -rf conftest*[]dnl - AC_DEFUN([AC_SYS_LARGEFILE], - [AC_ARG_ENABLE(largefile, - [ --disable-largefile omit support for large files]) --if test "$enable_largefile" != no; then -- -- AC_CACHE_CHECK([for special C compiler options needed for large files], -+AS_IF([test "$enable_largefile" != no], -+ [AC_CACHE_CHECK([for special C compiler options needed for large files], - ac_cv_sys_largefile_CC, - [ac_cv_sys_largefile_CC=no - if test "$GCC" != yes; then -@@ -107,15 +109,15 @@ if test "$enable_largefile" != no; then - ac_cv_sys_file_offset_bits, - [Number of bits in a file offset, on hosts where this is settable.], - [_AC_SYS_LARGEFILE_TEST_INCLUDES]) -- if test $ac_cv_sys_file_offset_bits = unknown; then -- _AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES, 1, -- ac_cv_sys_large_files, -- [Define for large files, on AIX-style hosts.], -- [_AC_SYS_LARGEFILE_TEST_INCLUDES]) -- fi --fi -+ AS_CASE([$ac_cv_sys_file_offset_bits], -+ [unknown], -+ [_AC_SYS_LARGEFILE_MACRO_VALUE([_LARGE_FILES], [1], -+ [ac_cv_sys_large_files], -+ [Define for large files, on AIX-style hosts.], -+ [_AC_SYS_LARGEFILE_TEST_INCLUDES])], -+ [64], -+ [gl_YEAR2038_BODY([])])]) - ])# AC_SYS_LARGEFILE --])# m4_version_prereq 2.70 - - # Enable large files on systems where this is implemented by Gnulib, not by the - # system headers. -diff --git a/m4/limits-h.m4 b/m4/limits-h.m4 -index 70dbb7d..00c9fe9 100644 ---- a/m4/limits-h.m4 -+++ b/m4/limits-h.m4 -@@ -11,7 +11,7 @@ AC_DEFUN_ONCE([gl_LIMITS_H], - [ - gl_CHECK_NEXT_HEADERS([limits.h]) - -- AC_CACHE_CHECK([whether limits.h has LLONG_MAX, WORD_BIT, ULLONG_WIDTH etc.], -+ AC_CACHE_CHECK([whether limits.h has WORD_BIT, BOOL_WIDTH etc.], - [gl_cv_header_limits_width], - [AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( -@@ -22,6 +22,7 @@ AC_DEFUN_ONCE([gl_LIMITS_H], - long long llm = LLONG_MAX; - int wb = WORD_BIT; - int ullw = ULLONG_WIDTH; -+ int bw = BOOL_WIDTH; - ]])], - [gl_cv_header_limits_width=yes], - [gl_cv_header_limits_width=no])]) -diff --git a/m4/locale_h.m4 b/m4/locale_h.m4 -index 7b50aa7..444a381 100644 ---- a/m4/locale_h.m4 -+++ b/m4/locale_h.m4 -@@ -1,13 +1,13 @@ --# locale_h.m4 serial 25 -+# locale_h.m4 serial 28 - dnl Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. - --AC_DEFUN([gl_LOCALE_H], -+AC_DEFUN_ONCE([gl_LOCALE_H], - [ -- dnl Use AC_REQUIRE here, so that the default behavior below is expanded -- dnl once only, before all statements that occur in other macros. -+ dnl Ensure to expand the default settings once only, before all statements -+ dnl that occur in other macros. - AC_REQUIRE([gl_LOCALE_H_DEFAULTS]) - - dnl Persuade glibc to define locale_t and the int_p_*, int_n_* -@@ -129,22 +129,37 @@ AC_DEFUN([gl_LOCALE_T], - AC_SUBST([HAVE_XLOCALE_H]) - ]) - -+# gl_LOCALE_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_LOCALE_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_LOCALE_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_LOCALE_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_LOCALE_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_LOCALE_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOCALECONV]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETLOCALE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETLOCALE_NULL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DUPLOCALE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOCALENAME]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_LOCALE_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_LOCALE_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_LOCALE_H_DEFAULTS], - [ -- GNULIB_LOCALECONV=0; AC_SUBST([GNULIB_LOCALECONV]) -- GNULIB_SETLOCALE=0; AC_SUBST([GNULIB_SETLOCALE]) -- GNULIB_SETLOCALE_NULL=0; AC_SUBST([GNULIB_SETLOCALE_NULL]) -- GNULIB_DUPLOCALE=0; AC_SUBST([GNULIB_DUPLOCALE]) -- GNULIB_LOCALENAME=0; AC_SUBST([GNULIB_LOCALENAME]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_NEWLOCALE=1; AC_SUBST([HAVE_NEWLOCALE]) - HAVE_DUPLOCALE=1; AC_SUBST([HAVE_DUPLOCALE]) -diff --git a/m4/malloc.m4 b/m4/malloc.m4 -index 32ab42e..972e808 100644 ---- a/m4/malloc.m4 -+++ b/m4/malloc.m4 -@@ -1,21 +1,21 @@ --# malloc.m4 serial 22 -+# malloc.m4 serial 27 - dnl Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. - - # This is adapted with modifications from upstream Autoconf here: --# https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=04be2b7a29d65d9a08e64e8e56e594c91749598c -+# https://git.savannah.gnu.org/cgit/autoconf.git/tree/lib/autoconf/functions.m4?id=v2.70#n949 - AC_DEFUN([_AC_FUNC_MALLOC_IF], - [ - AC_REQUIRE([AC_CANONICAL_HOST])dnl for cross-compiles -- AC_CACHE_CHECK([for GNU libc compatible malloc], -+ AC_CACHE_CHECK([whether malloc (0) returns nonnull], - [ac_cv_func_malloc_0_nonnull], - [AC_RUN_IFELSE( - [AC_LANG_PROGRAM( - [[#include - ]], -- [[char *p = malloc (0); -+ [[void *p = malloc (0); - int result = !p; - free (p); - return result;]]) -@@ -24,75 +24,151 @@ AC_DEFUN([_AC_FUNC_MALLOC_IF], - [ac_cv_func_malloc_0_nonnull=no], - [case "$host_os" in - # Guess yes on platforms where we know the result. -- *-gnu* | gnu* | *-musl* | freebsd* | midnightbsd* | netbsd* | openbsd* \ -- | hpux* | solaris* | cygwin* | mingw*) -+ *-gnu* | freebsd* | netbsd* | openbsd* | bitrig* \ -+ | gnu* | *-musl* | midnightbsd* \ -+ | hpux* | solaris* | cygwin* | mingw* | msys* ) - ac_cv_func_malloc_0_nonnull="guessing yes" ;; - # If we don't know, obey --enable-cross-guesses. - *) ac_cv_func_malloc_0_nonnull="$gl_cross_guess_normal" ;; - esac - ]) - ]) -- case "$ac_cv_func_malloc_0_nonnull" in -- *yes) -- $1 -- ;; -- *) -- $2 -- ;; -- esac -+ AS_CASE([$ac_cv_func_malloc_0_nonnull], [*yes], [$1], [$2]) - ])# _AC_FUNC_MALLOC_IF - - # gl_FUNC_MALLOC_GNU - # ------------------ --# Test whether 'malloc (0)' is handled like in GNU libc, and replace malloc if --# it is not. -+# Replace malloc if it is not compatible with GNU libc. - AC_DEFUN([gl_FUNC_MALLOC_GNU], - [ - AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) -- dnl _AC_FUNC_MALLOC_IF is defined in Autoconf. -- _AC_FUNC_MALLOC_IF( -- [AC_DEFINE([HAVE_MALLOC_GNU], [1], -- [Define to 1 if your system has a GNU libc compatible 'malloc' -- function, and to 0 otherwise.])], -- [AC_DEFINE([HAVE_MALLOC_GNU], [0]) -- REPLACE_MALLOC=1 -+ AC_REQUIRE([gl_FUNC_MALLOC_POSIX]) -+ if test $REPLACE_MALLOC = 0; then -+ _AC_FUNC_MALLOC_IF([], [REPLACE_MALLOC=1]) -+ fi -+]) -+ -+# gl_FUNC_MALLOC_PTRDIFF -+# ---------------------- -+# Test whether malloc (N) reliably fails when N exceeds PTRDIFF_MAX, -+# and replace malloc otherwise. -+AC_DEFUN([gl_FUNC_MALLOC_PTRDIFF], -+[ -+ AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) -+ AC_REQUIRE([gl_CHECK_MALLOC_PTRDIFF]) -+ test "$gl_cv_malloc_ptrdiff" = yes || REPLACE_MALLOC=1 -+]) -+ -+# Test whether malloc, realloc, calloc refuse to create objects -+# larger than what can be expressed in ptrdiff_t. -+# Set gl_cv_func_malloc_gnu to yes or no accordingly. -+AC_DEFUN([gl_CHECK_MALLOC_PTRDIFF], -+[ -+ AC_CACHE_CHECK([whether malloc is ptrdiff_t safe], -+ [gl_cv_malloc_ptrdiff], -+ [AC_COMPILE_IFELSE( -+ [AC_LANG_PROGRAM( -+ [[#include -+ ]], -+ [[/* 64-bit ptrdiff_t is so wide that no practical platform -+ can exceed it. */ -+ #define WIDE_PTRDIFF (PTRDIFF_MAX >> 31 >> 31 != 0) -+ -+ /* On rare machines where size_t fits in ptrdiff_t there -+ is no problem. */ -+ #define NARROW_SIZE (SIZE_MAX <= PTRDIFF_MAX) -+ -+ /* glibc 2.30 and later malloc refuses to exceed ptrdiff_t -+ bounds even on 32-bit platforms. We don't know which -+ non-glibc systems are safe. */ -+ #define KNOWN_SAFE (2 < __GLIBC__ + (30 <= __GLIBC_MINOR__)) -+ -+ #if WIDE_PTRDIFF || NARROW_SIZE || KNOWN_SAFE -+ return 0; -+ #else -+ #error "malloc might not be ptrdiff_t safe" -+ syntax error -+ #endif -+ ]])], -+ [gl_cv_malloc_ptrdiff=yes], -+ [gl_cv_malloc_ptrdiff=no]) - ]) - ]) - - # gl_FUNC_MALLOC_POSIX - # -------------------- - # Test whether 'malloc' is POSIX compliant (sets errno to ENOMEM when it --# fails), and replace malloc if it is not. -+# fails, and doesn't mess up with ptrdiff_t overflow), and replace -+# malloc if it is not. - AC_DEFUN([gl_FUNC_MALLOC_POSIX], - [ - AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) -+ AC_REQUIRE([gl_FUNC_MALLOC_PTRDIFF]) - AC_REQUIRE([gl_CHECK_MALLOC_POSIX]) -- if test $gl_cv_func_malloc_posix = yes; then -+ if test "$gl_cv_func_malloc_posix" = yes; then - AC_DEFINE([HAVE_MALLOC_POSIX], [1], -- [Define if the 'malloc' function is POSIX compliant.]) -+ [Define if malloc, realloc, and calloc set errno on allocation failure.]) - else - REPLACE_MALLOC=1 - fi - ]) - --# Test whether malloc, realloc, calloc are POSIX compliant, -+# Test whether malloc, realloc, calloc set errno to ENOMEM on failure. - # Set gl_cv_func_malloc_posix to yes or no accordingly. - AC_DEFUN([gl_CHECK_MALLOC_POSIX], - [ -- AC_CACHE_CHECK([whether malloc, realloc, calloc are POSIX compliant], -+ AC_REQUIRE([AC_CANONICAL_HOST]) -+ AC_CACHE_CHECK([whether malloc, realloc, calloc set errno on failure], - [gl_cv_func_malloc_posix], - [ - dnl It is too dangerous to try to allocate a large amount of memory: - dnl some systems go to their knees when you do that. So assume that -- dnl all Unix implementations of the function are POSIX compliant. -- AC_COMPILE_IFELSE( -- [AC_LANG_PROGRAM( -- [[]], -- [[#if defined _WIN32 && ! defined __CYGWIN__ -- choke me -- #endif -- ]])], -- [gl_cv_func_malloc_posix=yes], -- [gl_cv_func_malloc_posix=no]) -+ dnl all Unix implementations of the function set errno on failure, -+ dnl except on those platforms where we have seen 'test-malloc-gnu', -+ dnl 'test-realloc-gnu', 'test-calloc-gnu' fail. -+ case "$host_os" in -+ mingw*) -+ gl_cv_func_malloc_posix=no ;; -+ irix* | solaris*) -+ dnl On IRIX 6.5, the three functions return NULL with errno unset -+ dnl when the argument is larger than PTRDIFF_MAX. -+ dnl On Solaris 11.3, the three functions return NULL with errno set -+ dnl to EAGAIN, not ENOMEM, when the argument is larger than -+ dnl PTRDIFF_MAX. -+ dnl Here is a test program: -+m4_divert_push([KILL]) -+#include -+#include -+#include -+#define ptrdiff_t long -+#ifndef PTRDIFF_MAX -+# define PTRDIFF_MAX ((ptrdiff_t) ((1UL << (8 * sizeof (ptrdiff_t) - 1)) - 1)) -+#endif -+ -+int main () -+{ -+ void *p; -+ -+ fprintf (stderr, "PTRDIFF_MAX = %lu\n", (unsigned long) PTRDIFF_MAX); -+ -+ errno = 0; -+ p = malloc ((unsigned long) PTRDIFF_MAX + 1); -+ fprintf (stderr, "p=%p errno=%d\n", p, errno); -+ -+ errno = 0; -+ p = calloc (PTRDIFF_MAX / 2 + 1, 2); -+ fprintf (stderr, "p=%p errno=%d\n", p, errno); -+ -+ errno = 0; -+ p = realloc (NULL, (unsigned long) PTRDIFF_MAX + 1); -+ fprintf (stderr, "p=%p errno=%d\n", p, errno); -+ -+ return 0; -+} -+m4_divert_pop([KILL]) -+ gl_cv_func_malloc_posix=no ;; -+ *) -+ gl_cv_func_malloc_posix=yes ;; -+ esac - ]) - ]) -diff --git a/m4/math_h.m4 b/m4/math_h.m4 -index a9ba5e6..b3a10c3 100644 ---- a/m4/math_h.m4 -+++ b/m4/math_h.m4 -@@ -1,10 +1,10 @@ --# math_h.m4 serial 122 -+# math_h.m4 serial 125 - dnl Copyright (C) 2007-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. - --AC_DEFUN([gl_MATH_H], -+AC_DEFUN_ONCE([gl_MATH_H], - [ - AC_REQUIRE([gl_MATH_H_DEFAULTS]) - gl_CHECK_NEXT_HEADERS([math.h]) -@@ -53,119 +53,134 @@ AC_DEFUN([gl_MATH_H], - tanf tanl tanhf trunc truncf truncl]) - ]) - -+# gl_MATH_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_MATH_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_MATH_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_MATH_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_MATH_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_MATH_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ACOSF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ACOSL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ASINF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ASINL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ATANF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ATANL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ATAN2F]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CBRT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CBRTF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CBRTL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CEIL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CEILF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CEILL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_COPYSIGN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_COPYSIGNF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_COPYSIGNL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_COSF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_COSL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_COSHF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXPF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXPL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXP2]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXP2F]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXP2L]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXPM1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXPM1F]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXPM1L]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FABSF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FABSL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FLOOR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FLOORF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FLOORL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FMA]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FMAF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FMAL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FMOD]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FMODF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FMODL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FREXPF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FREXP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FREXPL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_HYPOT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_HYPOTF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_HYPOTL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ILOGB]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ILOGBF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ILOGBL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISFINITE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISINF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISNAN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISNANF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISNAND]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISNANL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LDEXPF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LDEXPL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOGF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOGL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG10]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG10F]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG10L]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG1P]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG1PF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG1PL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG2]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG2F]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG2L]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOGB]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOGBF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOGBL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MODF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MODFF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MODFL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POWF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REMAINDER]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REMAINDERF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REMAINDERL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RINT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RINTF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RINTL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ROUND]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ROUNDF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ROUNDL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGNBIT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SINF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SINL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SINHF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SQRTF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SQRTL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TANF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TANL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TANHF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TRUNC]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TRUNCF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TRUNCL]) -+ dnl Support Microsoft deprecated alias function names by default. -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_J0], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_J1], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_JN], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_Y0], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_Y1], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_YN], [1]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_MATH_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_MATH_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_MATH_H_DEFAULTS], - [ -- GNULIB_ACOSF=0; AC_SUBST([GNULIB_ACOSF]) -- GNULIB_ACOSL=0; AC_SUBST([GNULIB_ACOSL]) -- GNULIB_ASINF=0; AC_SUBST([GNULIB_ASINF]) -- GNULIB_ASINL=0; AC_SUBST([GNULIB_ASINL]) -- GNULIB_ATANF=0; AC_SUBST([GNULIB_ATANF]) -- GNULIB_ATANL=0; AC_SUBST([GNULIB_ATANL]) -- GNULIB_ATAN2F=0; AC_SUBST([GNULIB_ATAN2F]) -- GNULIB_CBRT=0; AC_SUBST([GNULIB_CBRT]) -- GNULIB_CBRTF=0; AC_SUBST([GNULIB_CBRTF]) -- GNULIB_CBRTL=0; AC_SUBST([GNULIB_CBRTL]) -- GNULIB_CEIL=0; AC_SUBST([GNULIB_CEIL]) -- GNULIB_CEILF=0; AC_SUBST([GNULIB_CEILF]) -- GNULIB_CEILL=0; AC_SUBST([GNULIB_CEILL]) -- GNULIB_COPYSIGN=0; AC_SUBST([GNULIB_COPYSIGN]) -- GNULIB_COPYSIGNF=0; AC_SUBST([GNULIB_COPYSIGNF]) -- GNULIB_COPYSIGNL=0; AC_SUBST([GNULIB_COPYSIGNL]) -- GNULIB_COSF=0; AC_SUBST([GNULIB_COSF]) -- GNULIB_COSL=0; AC_SUBST([GNULIB_COSL]) -- GNULIB_COSHF=0; AC_SUBST([GNULIB_COSHF]) -- GNULIB_EXPF=0; AC_SUBST([GNULIB_EXPF]) -- GNULIB_EXPL=0; AC_SUBST([GNULIB_EXPL]) -- GNULIB_EXP2=0; AC_SUBST([GNULIB_EXP2]) -- GNULIB_EXP2F=0; AC_SUBST([GNULIB_EXP2F]) -- GNULIB_EXP2L=0; AC_SUBST([GNULIB_EXP2L]) -- GNULIB_EXPM1=0; AC_SUBST([GNULIB_EXPM1]) -- GNULIB_EXPM1F=0; AC_SUBST([GNULIB_EXPM1F]) -- GNULIB_EXPM1L=0; AC_SUBST([GNULIB_EXPM1L]) -- GNULIB_FABSF=0; AC_SUBST([GNULIB_FABSF]) -- GNULIB_FABSL=0; AC_SUBST([GNULIB_FABSL]) -- GNULIB_FLOOR=0; AC_SUBST([GNULIB_FLOOR]) -- GNULIB_FLOORF=0; AC_SUBST([GNULIB_FLOORF]) -- GNULIB_FLOORL=0; AC_SUBST([GNULIB_FLOORL]) -- GNULIB_FMA=0; AC_SUBST([GNULIB_FMA]) -- GNULIB_FMAF=0; AC_SUBST([GNULIB_FMAF]) -- GNULIB_FMAL=0; AC_SUBST([GNULIB_FMAL]) -- GNULIB_FMOD=0; AC_SUBST([GNULIB_FMOD]) -- GNULIB_FMODF=0; AC_SUBST([GNULIB_FMODF]) -- GNULIB_FMODL=0; AC_SUBST([GNULIB_FMODL]) -- GNULIB_FREXPF=0; AC_SUBST([GNULIB_FREXPF]) -- GNULIB_FREXP=0; AC_SUBST([GNULIB_FREXP]) -- GNULIB_FREXPL=0; AC_SUBST([GNULIB_FREXPL]) -- GNULIB_HYPOT=0; AC_SUBST([GNULIB_HYPOT]) -- GNULIB_HYPOTF=0; AC_SUBST([GNULIB_HYPOTF]) -- GNULIB_HYPOTL=0; AC_SUBST([GNULIB_HYPOTL]) -- GNULIB_ILOGB=0; AC_SUBST([GNULIB_ILOGB]) -- GNULIB_ILOGBF=0; AC_SUBST([GNULIB_ILOGBF]) -- GNULIB_ILOGBL=0; AC_SUBST([GNULIB_ILOGBL]) -- GNULIB_ISFINITE=0; AC_SUBST([GNULIB_ISFINITE]) -- GNULIB_ISINF=0; AC_SUBST([GNULIB_ISINF]) -- GNULIB_ISNAN=0; AC_SUBST([GNULIB_ISNAN]) -- GNULIB_ISNANF=0; AC_SUBST([GNULIB_ISNANF]) -- GNULIB_ISNAND=0; AC_SUBST([GNULIB_ISNAND]) -- GNULIB_ISNANL=0; AC_SUBST([GNULIB_ISNANL]) -- GNULIB_LDEXPF=0; AC_SUBST([GNULIB_LDEXPF]) -- GNULIB_LDEXPL=0; AC_SUBST([GNULIB_LDEXPL]) -- GNULIB_LOG=0; AC_SUBST([GNULIB_LOG]) -- GNULIB_LOGF=0; AC_SUBST([GNULIB_LOGF]) -- GNULIB_LOGL=0; AC_SUBST([GNULIB_LOGL]) -- GNULIB_LOG10=0; AC_SUBST([GNULIB_LOG10]) -- GNULIB_LOG10F=0; AC_SUBST([GNULIB_LOG10F]) -- GNULIB_LOG10L=0; AC_SUBST([GNULIB_LOG10L]) -- GNULIB_LOG1P=0; AC_SUBST([GNULIB_LOG1P]) -- GNULIB_LOG1PF=0; AC_SUBST([GNULIB_LOG1PF]) -- GNULIB_LOG1PL=0; AC_SUBST([GNULIB_LOG1PL]) -- GNULIB_LOG2=0; AC_SUBST([GNULIB_LOG2]) -- GNULIB_LOG2F=0; AC_SUBST([GNULIB_LOG2F]) -- GNULIB_LOG2L=0; AC_SUBST([GNULIB_LOG2L]) -- GNULIB_LOGB=0; AC_SUBST([GNULIB_LOGB]) -- GNULIB_LOGBF=0; AC_SUBST([GNULIB_LOGBF]) -- GNULIB_LOGBL=0; AC_SUBST([GNULIB_LOGBL]) -- GNULIB_MODF=0; AC_SUBST([GNULIB_MODF]) -- GNULIB_MODFF=0; AC_SUBST([GNULIB_MODFF]) -- GNULIB_MODFL=0; AC_SUBST([GNULIB_MODFL]) -- GNULIB_POWF=0; AC_SUBST([GNULIB_POWF]) -- GNULIB_REMAINDER=0; AC_SUBST([GNULIB_REMAINDER]) -- GNULIB_REMAINDERF=0; AC_SUBST([GNULIB_REMAINDERF]) -- GNULIB_REMAINDERL=0; AC_SUBST([GNULIB_REMAINDERL]) -- GNULIB_RINT=0; AC_SUBST([GNULIB_RINT]) -- GNULIB_RINTF=0; AC_SUBST([GNULIB_RINTF]) -- GNULIB_RINTL=0; AC_SUBST([GNULIB_RINTL]) -- GNULIB_ROUND=0; AC_SUBST([GNULIB_ROUND]) -- GNULIB_ROUNDF=0; AC_SUBST([GNULIB_ROUNDF]) -- GNULIB_ROUNDL=0; AC_SUBST([GNULIB_ROUNDL]) -- GNULIB_SIGNBIT=0; AC_SUBST([GNULIB_SIGNBIT]) -- GNULIB_SINF=0; AC_SUBST([GNULIB_SINF]) -- GNULIB_SINL=0; AC_SUBST([GNULIB_SINL]) -- GNULIB_SINHF=0; AC_SUBST([GNULIB_SINHF]) -- GNULIB_SQRTF=0; AC_SUBST([GNULIB_SQRTF]) -- GNULIB_SQRTL=0; AC_SUBST([GNULIB_SQRTL]) -- GNULIB_TANF=0; AC_SUBST([GNULIB_TANF]) -- GNULIB_TANL=0; AC_SUBST([GNULIB_TANL]) -- GNULIB_TANHF=0; AC_SUBST([GNULIB_TANHF]) -- GNULIB_TRUNC=0; AC_SUBST([GNULIB_TRUNC]) -- GNULIB_TRUNCF=0; AC_SUBST([GNULIB_TRUNCF]) -- GNULIB_TRUNCL=0; AC_SUBST([GNULIB_TRUNCL]) -- dnl Support Microsoft deprecated alias function names by default. -- GNULIB_MDA_J0=1; AC_SUBST([GNULIB_MDA_J0]) -- GNULIB_MDA_J1=1; AC_SUBST([GNULIB_MDA_J1]) -- GNULIB_MDA_JN=1; AC_SUBST([GNULIB_MDA_JN]) -- GNULIB_MDA_Y0=1; AC_SUBST([GNULIB_MDA_Y0]) -- GNULIB_MDA_Y1=1; AC_SUBST([GNULIB_MDA_Y1]) -- GNULIB_MDA_YN=1; AC_SUBST([GNULIB_MDA_YN]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_ACOSF=1; AC_SUBST([HAVE_ACOSF]) - HAVE_ACOSL=1; AC_SUBST([HAVE_ACOSL]) -diff --git a/m4/memchr.m4 b/m4/memchr.m4 -index 64470de..ca08192 100644 ---- a/m4/memchr.m4 -+++ b/m4/memchr.m4 -@@ -1,4 +1,4 @@ --# memchr.m4 serial 17 -+# memchr.m4 serial 18 - dnl Copyright (C) 2002-2004, 2009-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -13,7 +13,7 @@ AC_DEFUN_ONCE([gl_FUNC_MEMCHR], - AC_CHECK_HEADERS_ONCE([sys/mman.h]) - AC_CHECK_FUNCS_ONCE([mprotect]) - -- AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) -+ AC_REQUIRE([gl_STRING_H_DEFAULTS]) - # Detect platform-specific bugs in some versions of glibc: - # memchr should not dereference anything with length 0 - # https://bugzilla.redhat.com/show_bug.cgi?id=499689 -diff --git a/m4/mempcpy.m4 b/m4/mempcpy.m4 -index c5ee2af..f9d9ec8 100644 ---- a/m4/mempcpy.m4 -+++ b/m4/mempcpy.m4 -@@ -1,4 +1,4 @@ --# mempcpy.m4 serial 11 -+# mempcpy.m4 serial 12 - dnl Copyright (C) 2003-2004, 2006-2007, 2009-2021 Free Software Foundation, - dnl Inc. - dnl This file is free software; the Free Software Foundation -@@ -13,7 +13,7 @@ AC_DEFUN([gl_FUNC_MEMPCPY], - dnl The mempcpy() declaration in lib/string.in.h uses 'restrict'. - AC_REQUIRE([AC_C_RESTRICT]) - -- AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) -+ AC_REQUIRE([gl_STRING_H_DEFAULTS]) - AC_CHECK_FUNCS([mempcpy]) - if test $ac_cv_func_mempcpy = no; then - HAVE_MEMPCPY=0 -diff --git a/m4/mktime.m4 b/m4/mktime.m4 -index 245649e..721189a 100644 ---- a/m4/mktime.m4 -+++ b/m4/mktime.m4 -@@ -1,4 +1,4 @@ --# serial 35 -+# serial 36 - dnl Copyright (C) 2002-2003, 2005-2007, 2009-2021 Free Software Foundation, - dnl Inc. - dnl This file is free software; the Free Software Foundation -@@ -255,7 +255,7 @@ main () - dnl Main macro of module 'mktime'. - AC_DEFUN([gl_FUNC_MKTIME], - [ -- AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) -+ AC_REQUIRE([gl_TIME_H_DEFAULTS]) - AC_REQUIRE([AC_CANONICAL_HOST]) - AC_REQUIRE([gl_FUNC_MKTIME_WORKS]) - -diff --git a/m4/netdb_h.m4 b/m4/netdb_h.m4 -index db84c78..eb7c3b8 100644 ---- a/m4/netdb_h.m4 -+++ b/m4/netdb_h.m4 -@@ -1,10 +1,10 @@ --# netdb_h.m4 serial 12 -+# netdb_h.m4 serial 15 - dnl Copyright (C) 2008-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. - --AC_DEFUN([gl_HEADER_NETDB], -+AC_DEFUN_ONCE([gl_NETDB_H], - [ - AC_REQUIRE([gl_NETDB_H_DEFAULTS]) - gl_CHECK_NEXT_HEADERS([netdb.h]) -@@ -21,18 +21,33 @@ AC_DEFUN([gl_HEADER_NETDB], - [getaddrinfo freeaddrinfo gai_strerror getnameinfo]) - ]) - -+# gl_NETDB_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_NETDB_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_NETDB_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_NETDB_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_NETDB_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_NETDB_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETADDRINFO]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_NETDB_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_NETDB_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_NETDB_H_DEFAULTS], - [ -- GNULIB_GETADDRINFO=0; AC_SUBST([GNULIB_GETADDRINFO]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_STRUCT_ADDRINFO=1; AC_SUBST([HAVE_STRUCT_ADDRINFO]) - HAVE_DECL_FREEADDRINFO=1; AC_SUBST([HAVE_DECL_FREEADDRINFO]) -diff --git a/m4/poll_h.m4 b/m4/poll_h.m4 -index 20692d8..1f0d796 100644 ---- a/m4/poll_h.m4 -+++ b/m4/poll_h.m4 -@@ -1,4 +1,4 @@ --# poll_h.m4 serial 3 -+# poll_h.m4 serial 6 - dnl Copyright (C) 2010-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -6,10 +6,10 @@ dnl with or without modifications, as long as this notice is preserved. - - dnl Written by Bruno Haible. - --AC_DEFUN([gl_POLL_H], -+AC_DEFUN_ONCE([gl_POLL_H], - [ -- dnl Use AC_REQUIRE here, so that the default behavior below is expanded -- dnl once only, before all statements that occur in other macros. -+ dnl Ensure to expand the default settings once only, before all statements -+ dnl that occur in other macros. - AC_REQUIRE([gl_POLL_H_DEFAULTS]) - - AC_CHECK_HEADERS_ONCE([poll.h]) -@@ -31,18 +31,33 @@ AC_DEFUN([gl_POLL_H], - [poll]) - ]) - -+# gl_POLL_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_POLL_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_POLL_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_POLL_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_POLL_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_POLL_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POLL]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_POLL_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_POLL_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_POLL_H_DEFAULTS], - [ -- GNULIB_POLL=0; AC_SUBST([GNULIB_POLL]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_POLL=1; AC_SUBST([HAVE_POLL]) - REPLACE_POLL=0; AC_SUBST([REPLACE_POLL]) -diff --git a/m4/printf.m4 b/m4/printf.m4 -index d8b3521..284c7c5 100644 ---- a/m4/printf.m4 -+++ b/m4/printf.m4 -@@ -1,4 +1,4 @@ --# printf.m4 serial 72 -+# printf.m4 serial 73 - dnl Copyright (C) 2003, 2007-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -537,7 +537,7 @@ int main () - && strcmp (buf, "-0X6.488P-1 33") != 0 - && strcmp (buf, "-0XC.91P-2 33") != 0)) - result |= 2; -- /* This catches a FreeBSD 6.1 bug: it doesn't round. */ -+ /* This catches a FreeBSD 13.0 bug: it doesn't round. */ - if (sprintf (buf, "%.2a %d", 1.51, 33, 44, 55) < 0 - || (strcmp (buf, "0x1.83p+0 33") != 0 - && strcmp (buf, "0x3.05p-1 33") != 0 -@@ -1690,6 +1690,7 @@ dnl - dnl 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 - dnl glibc 2.5 . . . . . . . . . . . . . . . . . . . . - dnl glibc 2.3.6 . . . . # . . . . . . . . . . . . . . . -+dnl FreeBSD 13.0 . . . . # . . . . . . . . # . . . . . . - dnl FreeBSD 5.4, 6.1 . . . . # . . . . . . # . # . . . . . . - dnl Mac OS X 10.13.5 . . . # # . # . . . . . . . . . . # . . - dnl Mac OS X 10.5.8 . . . # # . . . . . . # . . . . . . . . -diff --git a/m4/rawmemchr.m4 b/m4/rawmemchr.m4 -index f928465..452fab1 100644 ---- a/m4/rawmemchr.m4 -+++ b/m4/rawmemchr.m4 -@@ -1,4 +1,4 @@ --# rawmemchr.m4 serial 2 -+# rawmemchr.m4 serial 3 - dnl Copyright (C) 2003, 2007-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -9,7 +9,7 @@ AC_DEFUN([gl_FUNC_RAWMEMCHR], - dnl Persuade glibc to declare rawmemchr(). - AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) - -- AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) -+ AC_REQUIRE([gl_STRING_H_DEFAULTS]) - AC_CHECK_FUNCS([rawmemchr]) - if test $ac_cv_func_rawmemchr = no; then - HAVE_RAWMEMCHR=0 -diff --git a/m4/realloc.m4 b/m4/realloc.m4 -index a80a02a..0abc418 100644 ---- a/m4/realloc.m4 -+++ b/m4/realloc.m4 -@@ -1,21 +1,21 @@ --# realloc.m4 serial 20 -+# realloc.m4 serial 24 - dnl Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. - - # This is adapted with modifications from upstream Autoconf here: --# https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=04be2b7a29d65d9a08e64e8e56e594c91749598c -+# https://git.savannah.gnu.org/cgit/autoconf.git/tree/lib/autoconf/functions.m4?id=v2.70#n1455 - AC_DEFUN([_AC_FUNC_REALLOC_IF], - [ - AC_REQUIRE([AC_CANONICAL_HOST])dnl for cross-compiles -- AC_CACHE_CHECK([for GNU libc compatible realloc], -+ AC_CACHE_CHECK([whether realloc (0, 0) returns nonnull], - [ac_cv_func_realloc_0_nonnull], - [AC_RUN_IFELSE( - [AC_LANG_PROGRAM( - [[#include - ]], -- [[char *p = realloc (0, 0); -+ [[void *p = realloc (0, 0); - int result = !p; - free (p); - return result;]]) -@@ -24,53 +24,40 @@ AC_DEFUN([_AC_FUNC_REALLOC_IF], - [ac_cv_func_realloc_0_nonnull=no], - [case "$host_os" in - # Guess yes on platforms where we know the result. -- *-gnu* | gnu* | *-musl* | freebsd* | midnightbsd* | netbsd* | openbsd* \ -- | hpux* | solaris* | cygwin* | mingw*) -+ *-gnu* | freebsd* | netbsd* | openbsd* | bitrig* \ -+ | gnu* | *-musl* | midnightbsd* \ -+ | hpux* | solaris* | cygwin* | mingw* | msys* ) - ac_cv_func_realloc_0_nonnull="guessing yes" ;; - # If we don't know, obey --enable-cross-guesses. - *) ac_cv_func_realloc_0_nonnull="$gl_cross_guess_normal" ;; - esac - ]) - ]) -- case "$ac_cv_func_realloc_0_nonnull" in -- *yes) -- $1 -- ;; -- *) -- $2 -- ;; -- esac -+ AS_CASE([$ac_cv_func_realloc_0_nonnull], [*yes], [$1], [$2]) - ])# AC_FUNC_REALLOC - - # gl_FUNC_REALLOC_GNU - # ------------------- --# Test whether 'realloc (0, 0)' is handled like in GNU libc, and replace --# realloc if it is not. -+# Replace realloc if it is not compatible with GNU libc. - AC_DEFUN([gl_FUNC_REALLOC_GNU], - [ - AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) -- dnl _AC_FUNC_REALLOC_IF is defined in Autoconf. -- _AC_FUNC_REALLOC_IF( -- [AC_DEFINE([HAVE_REALLOC_GNU], [1], -- [Define to 1 if your system has a GNU libc compatible 'realloc' -- function, and to 0 otherwise.])], -- [AC_DEFINE([HAVE_REALLOC_GNU], [0]) -- REPLACE_REALLOC=1 -- ]) -+ AC_REQUIRE([gl_FUNC_REALLOC_POSIX]) -+ if test $REPLACE_REALLOC = 0; then -+ _AC_FUNC_REALLOC_IF([], [REPLACE_REALLOC=1]) -+ fi - ])# gl_FUNC_REALLOC_GNU - - # gl_FUNC_REALLOC_POSIX - # --------------------- - # Test whether 'realloc' is POSIX compliant (sets errno to ENOMEM when it --# fails), and replace realloc if it is not. -+# fails, and doesn't mess up with ptrdiff_t overflow), -+# and replace realloc if it is not. - AC_DEFUN([gl_FUNC_REALLOC_POSIX], - [ - AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) -- AC_REQUIRE([gl_CHECK_MALLOC_POSIX]) -- if test $gl_cv_func_malloc_posix = yes; then -- AC_DEFINE([HAVE_REALLOC_POSIX], [1], -- [Define if the 'realloc' function is POSIX compliant.]) -- else -+ AC_REQUIRE([gl_FUNC_MALLOC_POSIX]) -+ if test $REPLACE_MALLOC = 1; then - REPLACE_REALLOC=1 - fi - ]) -diff --git a/m4/regex.m4 b/m4/regex.m4 -index 850c572..1c7e562 100644 ---- a/m4/regex.m4 -+++ b/m4/regex.m4 -@@ -1,4 +1,4 @@ --# serial 71 -+# serial 73 - - # Copyright (C) 1996-2001, 2003-2021 Free Software Foundation, Inc. - # -@@ -246,7 +246,7 @@ AC_DEFUN([gl_REGEX], - & ~RE_CONTEXT_INVALID_DUP - & ~RE_NO_EMPTY_RANGES); - memset (®ex, 0, sizeof regex); -- s = re_compile_pattern ("[[:alnum:]_-]\\\\+$", 16, ®ex); -+ s = re_compile_pattern ("[[:alnum:]_-]\\\\+\$", 16, ®ex); - if (s) - result |= 32; - else -@@ -264,14 +264,50 @@ AC_DEFUN([gl_REGEX], - back reference. */ - re_set_syntax (RE_SYNTAX_POSIX_EGREP); - memset (®ex, 0, sizeof regex); -- s = re_compile_pattern ("0|()0|\\1|0", 10, ®ex); -+ s = re_compile_pattern ("0|()0|\\\\1|0", 10, ®ex); - if (!s) -- result |= 64; -+ { -+ memset (®s, 0, sizeof regs); -+ i = re_search (®ex, "x", 1, 0, 1, ®s); -+ if (i != -1) -+ result |= 64; -+ if (0 <= i) -+ { -+ free (regs.start); -+ free (regs.end); -+ } -+ regfree (®ex); -+ } - else - { - if (strcmp (s, "Invalid back reference")) - result |= 64; -+ } -+ -+ /* glibc bug 11053. */ -+ re_set_syntax (RE_SYNTAX_POSIX_BASIC); -+ memset (®ex, 0, sizeof regex); -+ static char const pat_sub2[] = "\\\\(a*\\\\)*a*\\\\1"; -+ s = re_compile_pattern (pat_sub2, sizeof pat_sub2 - 1, ®ex); -+ if (s) -+ result |= 64; -+ else -+ { -+ memset (®s, 0, sizeof regs); -+ static char const data[] = "a"; -+ int datalen = sizeof data - 1; -+ i = re_search (®ex, data, datalen, 0, datalen, ®s); -+ if (i != 0) -+ result |= 64; -+ else if (regs.num_regs < 2) -+ result |= 64; -+ else if (! (regs.start[0] == 0 && regs.end[0] == 1)) -+ result |= 64; -+ else if (! (regs.start[1] == 0 && regs.end[1] == 0)) -+ result |= 64; - regfree (®ex); -+ free (regs.start); -+ free (regs.end); - } - - #if 0 -diff --git a/m4/select.m4 b/m4/select.m4 -index c7409d2..72c068f 100644 ---- a/m4/select.m4 -+++ b/m4/select.m4 -@@ -1,4 +1,4 @@ --# select.m4 serial 12 -+# select.m4 serial 13 - dnl Copyright (C) 2009-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is preserved. - - AC_DEFUN([gl_FUNC_SELECT], - [ -- AC_REQUIRE([gl_HEADER_SYS_SELECT]) -+ AC_REQUIRE([gl_SYS_SELECT_H]) - AC_REQUIRE([AC_C_RESTRICT]) - AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles - AC_REQUIRE([gl_SOCKETS]) -diff --git a/m4/servent.m4 b/m4/servent.m4 -index 2dda177..9bc3bcd 100644 ---- a/m4/servent.m4 -+++ b/m4/servent.m4 -@@ -1,4 +1,4 @@ --# servent.m4 serial 3 -+# servent.m4 serial 4 - dnl Copyright (C) 2008, 2010-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -15,7 +15,7 @@ AC_DEFUN([gl_SERVENT], - dnl - On BeOS, they are in libnet. - dnl - On native Windows, they are in ws2_32.dll. - dnl - Otherwise they are in libc. -- AC_REQUIRE([gl_HEADER_SYS_SOCKET])dnl for HAVE_SYS_SOCKET_H, HAVE_WINSOCK2_H -+ AC_REQUIRE([gl_SYS_SOCKET_H])dnl for HAVE_SYS_SOCKET_H, HAVE_WINSOCK2_H - SERVENT_LIB= - gl_saved_libs="$LIBS" - AC_SEARCH_LIBS([getservbyname], [socket network net], -diff --git a/m4/signal_h.m4 b/m4/signal_h.m4 -index ff9f025..8b93880 100644 ---- a/m4/signal_h.m4 -+++ b/m4/signal_h.m4 -@@ -1,10 +1,10 @@ --# signal_h.m4 serial 19 -+# signal_h.m4 serial 22 - dnl Copyright (C) 2007-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. - --AC_DEFUN([gl_SIGNAL_H], -+AC_DEFUN_ONCE([gl_SIGNAL_H], - [ - AC_REQUIRE([gl_SIGNAL_H_DEFAULTS]) - AC_REQUIRE([gl_CHECK_TYPE_SIGSET_T]) -@@ -52,22 +52,37 @@ AC_DEFUN([gl_CHECK_TYPE_SIGSET_T], - fi - ]) - -+# gl_SIGNAL_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_SIGNAL_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_SIGNAL_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_SIGNAL_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_SIGNAL_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_SIGNAL_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PTHREAD_SIGMASK]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RAISE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGNAL_H_SIGPIPE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGPROCMASK]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGACTION]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_SIGNAL_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_SIGNAL_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_SIGNAL_H_DEFAULTS], - [ -- GNULIB_PTHREAD_SIGMASK=0; AC_SUBST([GNULIB_PTHREAD_SIGMASK]) -- GNULIB_RAISE=0; AC_SUBST([GNULIB_RAISE]) -- GNULIB_SIGNAL_H_SIGPIPE=0; AC_SUBST([GNULIB_SIGNAL_H_SIGPIPE]) -- GNULIB_SIGPROCMASK=0; AC_SUBST([GNULIB_SIGPROCMASK]) -- GNULIB_SIGACTION=0; AC_SUBST([GNULIB_SIGACTION]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_POSIX_SIGNALBLOCKING=1; AC_SUBST([HAVE_POSIX_SIGNALBLOCKING]) - HAVE_PTHREAD_SIGMASK=1; AC_SUBST([HAVE_PTHREAD_SIGMASK]) -diff --git a/m4/sockpfaf.m4 b/m4/sockpfaf.m4 -index edae5d8..17e14c7 100644 ---- a/m4/sockpfaf.m4 -+++ b/m4/sockpfaf.m4 -@@ -1,4 +1,4 @@ --# sockpfaf.m4 serial 9 -+# sockpfaf.m4 serial 10 - dnl Copyright (C) 2004, 2006, 2009-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -13,7 +13,7 @@ dnl From Bruno Haible. - - AC_DEFUN([gl_SOCKET_FAMILIES], - [ -- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -+ AC_REQUIRE([gl_SYS_SOCKET_H]) - AC_CHECK_HEADERS_ONCE([netinet/in.h]) - - AC_CACHE_CHECK([for IPv4 sockets], -@@ -60,7 +60,7 @@ AC_DEFUN([gl_SOCKET_FAMILIES], - - AC_DEFUN([gl_SOCKET_FAMILY_UNIX], - [ -- AC_REQUIRE([gl_HEADER_SYS_SOCKET]) -+ AC_REQUIRE([gl_SYS_SOCKET_H]) - AC_CHECK_HEADERS_ONCE([sys/un.h]) - - AC_CACHE_CHECK([for UNIX domain sockets], -diff --git a/m4/stat.m4 b/m4/stat.m4 -index 66f6c8c..9bcdb72 100644 ---- a/m4/stat.m4 -+++ b/m4/stat.m4 -@@ -1,4 +1,4 @@ --# serial 17 -+# serial 18 - - # Copyright (C) 2009-2021 Free Software Foundation, Inc. - # -@@ -69,7 +69,7 @@ AC_DEFUN([gl_FUNC_STAT], - - # Prerequisites of lib/stat.c and lib/stat-w32.c. - AC_DEFUN([gl_PREREQ_STAT], [ -- AC_REQUIRE([gl_HEADER_SYS_STAT_H]) -+ AC_REQUIRE([gl_SYS_STAT_H]) - AC_REQUIRE([gl_PREREQ_STAT_W32]) - : - ]) -diff --git a/m4/stddef_h.m4 b/m4/stddef_h.m4 -index cd666c4..1303d2e 100644 ---- a/m4/stddef_h.m4 -+++ b/m4/stddef_h.m4 -@@ -1,4 +1,4 @@ --# stddef_h.m4 serial 9 -+# stddef_h.m4 serial 11 - dnl Copyright (C) 2009-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is preserved. - - dnl A placeholder for , for platforms that have issues. - --AC_DEFUN([gl_STDDEF_H], -+AC_DEFUN_ONCE([gl_STDDEF_H], - [ - AC_REQUIRE([gl_STDDEF_H_DEFAULTS]) - AC_REQUIRE([gt_TYPE_WCHAR_T]) -@@ -68,13 +68,28 @@ AC_DEFUN([gl_STDDEF_H], - fi - ]) - -+# gl_STDDEF_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_STDDEF_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_STDDEF_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_STDDEF_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_STDDEF_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_STDDEF_H_MODULE_INDICATOR_DEFAULTS], [ -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_STDDEF_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_STDDEF_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_STDDEF_H_DEFAULTS], - [ - dnl Assume proper GNU behavior unless another module says otherwise. -diff --git a/m4/stdint.m4 b/m4/stdint.m4 -index a785b44..2eb1652 100644 ---- a/m4/stdint.m4 -+++ b/m4/stdint.m4 -@@ -1,4 +1,4 @@ --# stdint.m4 serial 58 -+# stdint.m4 serial 60 - dnl Copyright (C) 2001-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -170,7 +170,7 @@ struct s { - PTRDIFF_MIN == TYPE_MINIMUM (ptrdiff_t) - && PTRDIFF_MAX == TYPE_MAXIMUM (ptrdiff_t) - ? 1 : -1; -- /* Detect bug in FreeBSD 6.0 / ia64. */ -+ /* Detect bug in FreeBSD 6.0/ia64 and FreeBSD 13.0/arm64. */ - int check_SIG_ATOMIC: - SIG_ATOMIC_MIN == TYPE_MINIMUM (sig_atomic_t) - && SIG_ATOMIC_MAX == TYPE_MAXIMUM (sig_atomic_t) -@@ -527,7 +527,7 @@ AC_DEFUN([gl_STDINT_TYPE_PROPERTIES], - dnl requirement that wint_t is "unchanged by default argument promotions". - dnl In this case gnulib's and override wint_t. - dnl Set the variable BITSIZEOF_WINT_T accordingly. -- if test $GNULIB_OVERRIDES_WINT_T = 1; then -+ if test $GNULIBHEADERS_OVERRIDE_WINT_T = 1; then - BITSIZEOF_WINT_T=32 - fi - ]) -diff --git a/m4/stdio_h.m4 b/m4/stdio_h.m4 -index 4c3f24a..e704383 100644 ---- a/m4/stdio_h.m4 -+++ b/m4/stdio_h.m4 -@@ -1,11 +1,12 @@ --# stdio_h.m4 serial 52 -+# stdio_h.m4 serial 56 - dnl Copyright (C) 2007-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. - --AC_DEFUN([gl_STDIO_H], -+AC_DEFUN_ONCE([gl_STDIO_H], - [ -+ AC_REQUIRE([gl_STDIO_H_DEFAULTS]) - AH_VERBATIM([MINGW_ANSI_STDIO], - [/* Use GNU style printf and scanf. */ - #ifndef __USE_MINGW_ANSI_STDIO -@@ -13,7 +14,6 @@ AC_DEFUN([gl_STDIO_H], - #endif - ]) - AC_DEFINE([__USE_MINGW_ANSI_STDIO]) -- AC_REQUIRE([gl_STDIO_H_DEFAULTS]) - gl_NEXT_HEADERS([stdio.h]) - - dnl Determine whether __USE_MINGW_ANSI_STDIO makes printf and -@@ -40,17 +40,6 @@ AC_DEFUN([gl_STDIO_H], - attribute "__gnu_printf__" instead of "__printf__"]) - fi - -- dnl No need to create extra modules for these functions. Everyone who uses -- dnl likely needs them. -- GNULIB_FSCANF=1 -- gl_MODULE_INDICATOR([fscanf]) -- GNULIB_SCANF=1 -- gl_MODULE_INDICATOR([scanf]) -- GNULIB_FGETC=1 -- GNULIB_GETC=1 -- GNULIB_GETCHAR=1 -- GNULIB_FGETS=1 -- GNULIB_FREAD=1 - dnl This ifdef is necessary to avoid an error "missing file lib/stdio-read.c" - dnl "expected source file, required through AC_LIBSOURCES, not found". It is - dnl also an optimization, to avoid performing a configure check whose result -@@ -64,18 +53,6 @@ AC_DEFUN([gl_STDIO_H], - fi - ]) - -- dnl No need to create extra modules for these functions. Everyone who uses -- dnl likely needs them. -- GNULIB_FPRINTF=1 -- GNULIB_PRINTF=1 -- GNULIB_VFPRINTF=1 -- GNULIB_VPRINTF=1 -- GNULIB_FPUTC=1 -- GNULIB_PUTC=1 -- GNULIB_PUTCHAR=1 -- GNULIB_FPUTS=1 -- GNULIB_PUTS=1 -- GNULIB_FWRITE=1 - dnl This ifdef is necessary to avoid an error "missing file lib/stdio-write.c" - dnl "expected source file, required through AC_LIBSOURCES, not found". It is - dnl also an optimization, to avoid performing a configure check whose result -@@ -116,77 +93,92 @@ AC_DEFUN([gl_STDIO_H], - fi - ]) - -+# gl_STDIO_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_STDIO_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_STDIO_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_STDIO_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_STDIO_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_STDIO_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DPRINTF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FCLOSE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FDOPEN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FFLUSH]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FGETC]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FGETS]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FOPEN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FPRINTF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FPRINTF_POSIX]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FPURGE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FPUTC]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FPUTS]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FREAD]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FREOPEN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSCANF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSEEK]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSEEKO]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FTELL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FTELLO]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FWRITE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETC]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETCHAR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETDELIM]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETLINE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OBSTACK_PRINTF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OBSTACK_PRINTF_POSIX]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PCLOSE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PERROR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POPEN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PRINTF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PRINTF_POSIX]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PUTC]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PUTCHAR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PUTS]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REMOVE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RENAME]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RENAMEAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SCANF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SNPRINTF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SPRINTF_POSIX]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STDIO_H_NONBLOCKING]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STDIO_H_SIGPIPE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TMPFILE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VASPRINTF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VFSCANF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VSCANF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VDPRINTF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VFPRINTF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VFPRINTF_POSIX]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VPRINTF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VPRINTF_POSIX]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VSNPRINTF]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VSPRINTF_POSIX]) -+ dnl Support Microsoft deprecated alias function names by default. -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_FCLOSEALL], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_FDOPEN], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_FILENO], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_GETW], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_PUTW], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_TEMPNAM], [1]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_STDIO_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_STDIO_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_STDIO_H_DEFAULTS], - [ -- GNULIB_DPRINTF=0; AC_SUBST([GNULIB_DPRINTF]) -- GNULIB_FCLOSE=0; AC_SUBST([GNULIB_FCLOSE]) -- GNULIB_FDOPEN=0; AC_SUBST([GNULIB_FDOPEN]) -- GNULIB_FFLUSH=0; AC_SUBST([GNULIB_FFLUSH]) -- GNULIB_FGETC=0; AC_SUBST([GNULIB_FGETC]) -- GNULIB_FGETS=0; AC_SUBST([GNULIB_FGETS]) -- GNULIB_FOPEN=0; AC_SUBST([GNULIB_FOPEN]) -- GNULIB_FPRINTF=0; AC_SUBST([GNULIB_FPRINTF]) -- GNULIB_FPRINTF_POSIX=0; AC_SUBST([GNULIB_FPRINTF_POSIX]) -- GNULIB_FPURGE=0; AC_SUBST([GNULIB_FPURGE]) -- GNULIB_FPUTC=0; AC_SUBST([GNULIB_FPUTC]) -- GNULIB_FPUTS=0; AC_SUBST([GNULIB_FPUTS]) -- GNULIB_FREAD=0; AC_SUBST([GNULIB_FREAD]) -- GNULIB_FREOPEN=0; AC_SUBST([GNULIB_FREOPEN]) -- GNULIB_FSCANF=0; AC_SUBST([GNULIB_FSCANF]) -- GNULIB_FSEEK=0; AC_SUBST([GNULIB_FSEEK]) -- GNULIB_FSEEKO=0; AC_SUBST([GNULIB_FSEEKO]) -- GNULIB_FTELL=0; AC_SUBST([GNULIB_FTELL]) -- GNULIB_FTELLO=0; AC_SUBST([GNULIB_FTELLO]) -- GNULIB_FWRITE=0; AC_SUBST([GNULIB_FWRITE]) -- GNULIB_GETC=0; AC_SUBST([GNULIB_GETC]) -- GNULIB_GETCHAR=0; AC_SUBST([GNULIB_GETCHAR]) -- GNULIB_GETDELIM=0; AC_SUBST([GNULIB_GETDELIM]) -- GNULIB_GETLINE=0; AC_SUBST([GNULIB_GETLINE]) -- GNULIB_OBSTACK_PRINTF=0; AC_SUBST([GNULIB_OBSTACK_PRINTF]) -- GNULIB_OBSTACK_PRINTF_POSIX=0; AC_SUBST([GNULIB_OBSTACK_PRINTF_POSIX]) -- GNULIB_PCLOSE=0; AC_SUBST([GNULIB_PCLOSE]) -- GNULIB_PERROR=0; AC_SUBST([GNULIB_PERROR]) -- GNULIB_POPEN=0; AC_SUBST([GNULIB_POPEN]) -- GNULIB_PRINTF=0; AC_SUBST([GNULIB_PRINTF]) -- GNULIB_PRINTF_POSIX=0; AC_SUBST([GNULIB_PRINTF_POSIX]) -- GNULIB_PUTC=0; AC_SUBST([GNULIB_PUTC]) -- GNULIB_PUTCHAR=0; AC_SUBST([GNULIB_PUTCHAR]) -- GNULIB_PUTS=0; AC_SUBST([GNULIB_PUTS]) -- GNULIB_REMOVE=0; AC_SUBST([GNULIB_REMOVE]) -- GNULIB_RENAME=0; AC_SUBST([GNULIB_RENAME]) -- GNULIB_RENAMEAT=0; AC_SUBST([GNULIB_RENAMEAT]) -- GNULIB_SCANF=0; AC_SUBST([GNULIB_SCANF]) -- GNULIB_SNPRINTF=0; AC_SUBST([GNULIB_SNPRINTF]) -- GNULIB_SPRINTF_POSIX=0; AC_SUBST([GNULIB_SPRINTF_POSIX]) -- GNULIB_STDIO_H_NONBLOCKING=0; AC_SUBST([GNULIB_STDIO_H_NONBLOCKING]) -- GNULIB_STDIO_H_SIGPIPE=0; AC_SUBST([GNULIB_STDIO_H_SIGPIPE]) -- GNULIB_TMPFILE=0; AC_SUBST([GNULIB_TMPFILE]) -- GNULIB_VASPRINTF=0; AC_SUBST([GNULIB_VASPRINTF]) -- GNULIB_VFSCANF=0; AC_SUBST([GNULIB_VFSCANF]) -- GNULIB_VSCANF=0; AC_SUBST([GNULIB_VSCANF]) -- GNULIB_VDPRINTF=0; AC_SUBST([GNULIB_VDPRINTF]) -- GNULIB_VFPRINTF=0; AC_SUBST([GNULIB_VFPRINTF]) -- GNULIB_VFPRINTF_POSIX=0; AC_SUBST([GNULIB_VFPRINTF_POSIX]) -- GNULIB_VPRINTF=0; AC_SUBST([GNULIB_VPRINTF]) -- GNULIB_VPRINTF_POSIX=0; AC_SUBST([GNULIB_VPRINTF_POSIX]) -- GNULIB_VSNPRINTF=0; AC_SUBST([GNULIB_VSNPRINTF]) -- GNULIB_VSPRINTF_POSIX=0; AC_SUBST([GNULIB_VSPRINTF_POSIX]) -- dnl Support Microsoft deprecated alias function names by default. -- GNULIB_MDA_FCLOSEALL=1; AC_SUBST([GNULIB_MDA_FCLOSEALL]) -- GNULIB_MDA_FDOPEN=1; AC_SUBST([GNULIB_MDA_FDOPEN]) -- GNULIB_MDA_FILENO=1; AC_SUBST([GNULIB_MDA_FILENO]) -- GNULIB_MDA_GETW=1; AC_SUBST([GNULIB_MDA_GETW]) -- GNULIB_MDA_PUTW=1; AC_SUBST([GNULIB_MDA_PUTW]) -- GNULIB_MDA_TEMPNAM=1; AC_SUBST([GNULIB_MDA_TEMPNAM]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_DECL_FCLOSEALL=1; AC_SUBST([HAVE_DECL_FCLOSEALL]) - HAVE_DECL_FPURGE=1; AC_SUBST([HAVE_DECL_FPURGE]) -diff --git a/m4/stdlib_h.m4 b/m4/stdlib_h.m4 -index 5fdb0a7..9c1d1c7 100644 ---- a/m4/stdlib_h.m4 -+++ b/m4/stdlib_h.m4 -@@ -1,10 +1,10 @@ --# stdlib_h.m4 serial 59 -+# stdlib_h.m4 serial 63 - dnl Copyright (C) 2007-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. - --AC_DEFUN([gl_STDLIB_H], -+AC_DEFUN_ONCE([gl_STDLIB_H], - [ - AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) - gl_NEXT_HEADERS([stdlib.h]) -@@ -46,63 +46,78 @@ AC_DEFUN([gl_STDLIB_H], - fi - ]) - -+# gl_STDLIB_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_STDLIB_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_STDLIB_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_STDLIB_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_STDLIB_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB__EXIT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ALIGNED_ALLOC]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ATOLL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CALLOC_POSIX]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CANONICALIZE_FILE_NAME]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FREE_POSIX]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETLOADAVG]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETSUBOPT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GRANTPT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MALLOC_POSIX]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBTOWC]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKDTEMP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKOSTEMP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKOSTEMPS]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKSTEMP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKSTEMPS]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POSIX_MEMALIGN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POSIX_OPENPT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PTSNAME]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PTSNAME_R]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PUTENV]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_QSORT_R]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RANDOM]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RANDOM_R]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REALLOCARRAY]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REALLOC_POSIX]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REALPATH]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RPMATCH]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SECURE_GETENV]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETENV]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOD]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOLD]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOLL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOUL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOULL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SYSTEM_POSIX]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNLOCKPT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNSETENV]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCTOMB]) -+ dnl Support Microsoft deprecated alias function names by default. -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_ECVT], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_FCVT], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_GCVT], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_MKTEMP], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_PUTENV], [1]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_STDLIB_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_STDLIB_H_DEFAULTS], - [ -- GNULIB__EXIT=0; AC_SUBST([GNULIB__EXIT]) -- GNULIB_ALIGNED_ALLOC=0; AC_SUBST([GNULIB_ALIGNED_ALLOC]) -- GNULIB_ATOLL=0; AC_SUBST([GNULIB_ATOLL]) -- GNULIB_CALLOC_POSIX=0; AC_SUBST([GNULIB_CALLOC_POSIX]) -- GNULIB_CANONICALIZE_FILE_NAME=0; AC_SUBST([GNULIB_CANONICALIZE_FILE_NAME]) -- GNULIB_FREE_POSIX=0; AC_SUBST([GNULIB_FREE_POSIX]) -- GNULIB_GETLOADAVG=0; AC_SUBST([GNULIB_GETLOADAVG]) -- GNULIB_GETSUBOPT=0; AC_SUBST([GNULIB_GETSUBOPT]) -- GNULIB_GRANTPT=0; AC_SUBST([GNULIB_GRANTPT]) -- GNULIB_MALLOC_POSIX=0; AC_SUBST([GNULIB_MALLOC_POSIX]) -- GNULIB_MBTOWC=0; AC_SUBST([GNULIB_MBTOWC]) -- GNULIB_MKDTEMP=0; AC_SUBST([GNULIB_MKDTEMP]) -- GNULIB_MKOSTEMP=0; AC_SUBST([GNULIB_MKOSTEMP]) -- GNULIB_MKOSTEMPS=0; AC_SUBST([GNULIB_MKOSTEMPS]) -- GNULIB_MKSTEMP=0; AC_SUBST([GNULIB_MKSTEMP]) -- GNULIB_MKSTEMPS=0; AC_SUBST([GNULIB_MKSTEMPS]) -- GNULIB_POSIX_MEMALIGN=0;AC_SUBST([GNULIB_POSIX_MEMALIGN]) -- GNULIB_POSIX_OPENPT=0; AC_SUBST([GNULIB_POSIX_OPENPT]) -- GNULIB_PTSNAME=0; AC_SUBST([GNULIB_PTSNAME]) -- GNULIB_PTSNAME_R=0; AC_SUBST([GNULIB_PTSNAME_R]) -- GNULIB_PUTENV=0; AC_SUBST([GNULIB_PUTENV]) -- GNULIB_QSORT_R=0; AC_SUBST([GNULIB_QSORT_R]) -- GNULIB_RANDOM=0; AC_SUBST([GNULIB_RANDOM]) -- GNULIB_RANDOM_R=0; AC_SUBST([GNULIB_RANDOM_R]) -- GNULIB_REALLOCARRAY=0; AC_SUBST([GNULIB_REALLOCARRAY]) -- GNULIB_REALLOC_POSIX=0; AC_SUBST([GNULIB_REALLOC_POSIX]) -- GNULIB_REALPATH=0; AC_SUBST([GNULIB_REALPATH]) -- GNULIB_RPMATCH=0; AC_SUBST([GNULIB_RPMATCH]) -- GNULIB_SECURE_GETENV=0; AC_SUBST([GNULIB_SECURE_GETENV]) -- GNULIB_SETENV=0; AC_SUBST([GNULIB_SETENV]) -- GNULIB_STRTOD=0; AC_SUBST([GNULIB_STRTOD]) -- GNULIB_STRTOL=0; AC_SUBST([GNULIB_STRTOL]) -- GNULIB_STRTOLD=0; AC_SUBST([GNULIB_STRTOLD]) -- GNULIB_STRTOLL=0; AC_SUBST([GNULIB_STRTOLL]) -- GNULIB_STRTOUL=0; AC_SUBST([GNULIB_STRTOUL]) -- GNULIB_STRTOULL=0; AC_SUBST([GNULIB_STRTOULL]) -- GNULIB_SYSTEM_POSIX=0; AC_SUBST([GNULIB_SYSTEM_POSIX]) -- GNULIB_UNLOCKPT=0; AC_SUBST([GNULIB_UNLOCKPT]) -- GNULIB_UNSETENV=0; AC_SUBST([GNULIB_UNSETENV]) -- GNULIB_WCTOMB=0; AC_SUBST([GNULIB_WCTOMB]) -- dnl Support Microsoft deprecated alias function names by default. -- GNULIB_MDA_ECVT=1; AC_SUBST([GNULIB_MDA_ECVT]) -- GNULIB_MDA_FCVT=1; AC_SUBST([GNULIB_MDA_FCVT]) -- GNULIB_MDA_GCVT=1; AC_SUBST([GNULIB_MDA_GCVT]) -- GNULIB_MDA_MKTEMP=1; AC_SUBST([GNULIB_MDA_MKTEMP]) -- GNULIB_MDA_PUTENV=1; AC_SUBST([GNULIB_MDA_PUTENV]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE__EXIT=1; AC_SUBST([HAVE__EXIT]) - HAVE_ALIGNED_ALLOC=1; AC_SUBST([HAVE_ALIGNED_ALLOC]) -@@ -164,6 +179,7 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS], - REPLACE_RANDOM=0; AC_SUBST([REPLACE_RANDOM]) - REPLACE_RANDOM_R=0; AC_SUBST([REPLACE_RANDOM_R]) - REPLACE_REALLOC=0; AC_SUBST([REPLACE_REALLOC]) -+ REPLACE_REALLOCARRAY=0; AC_SUBST([REPLACE_REALLOCARRAY]) - REPLACE_REALPATH=0; AC_SUBST([REPLACE_REALPATH]) - REPLACE_SETENV=0; AC_SUBST([REPLACE_SETENV]) - REPLACE_SETSTATE=0; AC_SUBST([REPLACE_SETSTATE]) -diff --git a/m4/strdup.m4 b/m4/strdup.m4 -index f6f421d..5b6018f 100644 ---- a/m4/strdup.m4 -+++ b/m4/strdup.m4 -@@ -1,4 +1,4 @@ --# strdup.m4 serial 14 -+# strdup.m4 serial 15 - - dnl Copyright (C) 2002-2021 Free Software Foundation, Inc. - -@@ -8,7 +8,7 @@ dnl with or without modifications, as long as this notice is preserved. - - AC_DEFUN([gl_FUNC_STRDUP], - [ -- AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) -+ AC_REQUIRE([gl_STRING_H_DEFAULTS]) - AC_CHECK_DECLS_ONCE([strdup]) - if test $ac_cv_have_decl_strdup = no; then - HAVE_DECL_STRDUP=0 -@@ -17,7 +17,7 @@ AC_DEFUN([gl_FUNC_STRDUP], - - AC_DEFUN([gl_FUNC_STRDUP_POSIX], - [ -- AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) -+ AC_REQUIRE([gl_STRING_H_DEFAULTS]) - AC_REQUIRE([gl_CHECK_MALLOC_POSIX]) - if test $gl_cv_func_malloc_posix != yes; then - REPLACE_STRDUP=1 -diff --git a/m4/string_h.m4 b/m4/string_h.m4 -index a4cc5b4..80d1e58 100644 ---- a/m4/string_h.m4 -+++ b/m4/string_h.m4 -@@ -5,20 +5,15 @@ - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. - --# serial 29 -+# serial 32 - - # Written by Paul Eggert. - --AC_DEFUN([gl_HEADER_STRING_H], -+AC_DEFUN_ONCE([gl_STRING_H], - [ -- dnl Use AC_REQUIRE here, so that the default behavior below is expanded -- dnl once only, before all statements that occur in other macros. -- AC_REQUIRE([gl_HEADER_STRING_H_BODY]) --]) -- --AC_DEFUN([gl_HEADER_STRING_H_BODY], --[ -- AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only, before all statements -+ dnl that occur in other macros. -+ AC_REQUIRE([gl_STRING_H_DEFAULTS]) - gl_NEXT_HEADERS([string.h]) - - dnl Check for declarations of anything we want to poison if the -@@ -33,62 +28,77 @@ AC_DEFUN([gl_HEADER_STRING_H_BODY], - AC_REQUIRE([AC_C_RESTRICT]) - ]) - -+# gl_STRING_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_STRING_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_STRING_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - --AC_DEFUN([gl_HEADER_STRING_H_DEFAULTS], -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_STRING_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_STRING_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXPLICIT_BZERO]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FFSL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FFSLL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MEMCHR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MEMMEM]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MEMPCPY]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MEMRCHR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RAWMEMCHR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STPCPY]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STPNCPY]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRCHRNUL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRDUP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRNCAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRNDUP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRNLEN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRPBRK]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRSEP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRSTR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRCASESTR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOK_R]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSLEN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSNLEN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSCHR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSRCHR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSSTR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSCASECMP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSNCASECMP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSPCASECMP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSCASESTR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSCSPN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSPBRK]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSSPN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSSEP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSTOK_R]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRERROR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRERROR_R]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRERRORNAME_NP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGABBREV_NP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGDESCR_NP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRSIGNAL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRVERSCMP]) -+ dnl Support Microsoft deprecated alias function names by default. -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_MEMCCPY], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_STRDUP], [1]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_STRING_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_STRING_H_DEFAULTS]) -+]) -+ -+AC_DEFUN([gl_STRING_H_DEFAULTS], - [ -- GNULIB_EXPLICIT_BZERO=0; AC_SUBST([GNULIB_EXPLICIT_BZERO]) -- GNULIB_FFSL=0; AC_SUBST([GNULIB_FFSL]) -- GNULIB_FFSLL=0; AC_SUBST([GNULIB_FFSLL]) -- GNULIB_MEMCHR=0; AC_SUBST([GNULIB_MEMCHR]) -- GNULIB_MEMMEM=0; AC_SUBST([GNULIB_MEMMEM]) -- GNULIB_MEMPCPY=0; AC_SUBST([GNULIB_MEMPCPY]) -- GNULIB_MEMRCHR=0; AC_SUBST([GNULIB_MEMRCHR]) -- GNULIB_RAWMEMCHR=0; AC_SUBST([GNULIB_RAWMEMCHR]) -- GNULIB_STPCPY=0; AC_SUBST([GNULIB_STPCPY]) -- GNULIB_STPNCPY=0; AC_SUBST([GNULIB_STPNCPY]) -- GNULIB_STRCHRNUL=0; AC_SUBST([GNULIB_STRCHRNUL]) -- GNULIB_STRDUP=0; AC_SUBST([GNULIB_STRDUP]) -- GNULIB_STRNCAT=0; AC_SUBST([GNULIB_STRNCAT]) -- GNULIB_STRNDUP=0; AC_SUBST([GNULIB_STRNDUP]) -- GNULIB_STRNLEN=0; AC_SUBST([GNULIB_STRNLEN]) -- GNULIB_STRPBRK=0; AC_SUBST([GNULIB_STRPBRK]) -- GNULIB_STRSEP=0; AC_SUBST([GNULIB_STRSEP]) -- GNULIB_STRSTR=0; AC_SUBST([GNULIB_STRSTR]) -- GNULIB_STRCASESTR=0; AC_SUBST([GNULIB_STRCASESTR]) -- GNULIB_STRTOK_R=0; AC_SUBST([GNULIB_STRTOK_R]) -- GNULIB_MBSLEN=0; AC_SUBST([GNULIB_MBSLEN]) -- GNULIB_MBSNLEN=0; AC_SUBST([GNULIB_MBSNLEN]) -- GNULIB_MBSCHR=0; AC_SUBST([GNULIB_MBSCHR]) -- GNULIB_MBSRCHR=0; AC_SUBST([GNULIB_MBSRCHR]) -- GNULIB_MBSSTR=0; AC_SUBST([GNULIB_MBSSTR]) -- GNULIB_MBSCASECMP=0; AC_SUBST([GNULIB_MBSCASECMP]) -- GNULIB_MBSNCASECMP=0; AC_SUBST([GNULIB_MBSNCASECMP]) -- GNULIB_MBSPCASECMP=0; AC_SUBST([GNULIB_MBSPCASECMP]) -- GNULIB_MBSCASESTR=0; AC_SUBST([GNULIB_MBSCASESTR]) -- GNULIB_MBSCSPN=0; AC_SUBST([GNULIB_MBSCSPN]) -- GNULIB_MBSPBRK=0; AC_SUBST([GNULIB_MBSPBRK]) -- GNULIB_MBSSPN=0; AC_SUBST([GNULIB_MBSSPN]) -- GNULIB_MBSSEP=0; AC_SUBST([GNULIB_MBSSEP]) -- GNULIB_MBSTOK_R=0; AC_SUBST([GNULIB_MBSTOK_R]) -- GNULIB_STRERROR=0; AC_SUBST([GNULIB_STRERROR]) -- GNULIB_STRERROR_R=0; AC_SUBST([GNULIB_STRERROR_R]) -- GNULIB_STRERRORNAME_NP=0; AC_SUBST([GNULIB_STRERRORNAME_NP]) -- GNULIB_SIGABBREV_NP=0; AC_SUBST([GNULIB_SIGABBREV_NP]) -- GNULIB_SIGDESCR_NP=0; AC_SUBST([GNULIB_SIGDESCR_NP]) -- GNULIB_STRSIGNAL=0; AC_SUBST([GNULIB_STRSIGNAL]) -- GNULIB_STRVERSCMP=0; AC_SUBST([GNULIB_STRVERSCMP]) - HAVE_MBSLEN=0; AC_SUBST([HAVE_MBSLEN]) -- dnl Support Microsoft deprecated alias function names by default. -- GNULIB_MDA_MEMCCPY=1; AC_SUBST([GNULIB_MDA_MEMCCPY]) -- GNULIB_MDA_STRDUP=1; AC_SUBST([GNULIB_MDA_STRDUP]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_EXPLICIT_BZERO=1; AC_SUBST([HAVE_EXPLICIT_BZERO]) - HAVE_FFSL=1; AC_SUBST([HAVE_FFSL]) -diff --git a/m4/sys_file_h.m4 b/m4/sys_file_h.m4 -index 99c2285..bcde4d7 100644 ---- a/m4/sys_file_h.m4 -+++ b/m4/sys_file_h.m4 -@@ -1,5 +1,5 @@ - # Configure a replacement for . --# serial 6 -+# serial 9 - - # Copyright (C) 2008-2021 Free Software Foundation, Inc. - # This file is free software; the Free Software Foundation -@@ -8,9 +8,9 @@ - - # Written by Richard W.M. Jones. - --AC_DEFUN([gl_HEADER_SYS_FILE_H], -+AC_DEFUN_ONCE([gl_SYS_FILE_H], - [ -- AC_REQUIRE([gl_HEADER_SYS_FILE_H_DEFAULTS]) -+ AC_REQUIRE([gl_SYS_FILE_H_DEFAULTS]) - - dnl is always overridden, because of GNULIB_POSIXCHECK. - gl_CHECK_NEXT_HEADERS([sys/file.h]) -@@ -28,14 +28,29 @@ AC_DEFUN([gl_HEADER_SYS_FILE_H], - ]], [flock]) - ]) - --AC_DEFUN([gl_HEADER_SYS_FILE_MODULE_INDICATOR], -+# gl_SYS_FILE_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. -+AC_DEFUN([gl_SYS_FILE_MODULE_INDICATOR], - [ -- AC_REQUIRE([gl_HEADER_SYS_FILE_H_DEFAULTS]) -+ gl_SYS_FILE_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - ]) - --AC_DEFUN([gl_HEADER_SYS_FILE_H_DEFAULTS], -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_SYS_FILE_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_FILE_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FLOCK]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_FILE_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_SYS_FILE_H_DEFAULTS]) -+]) -+ -+AC_DEFUN([gl_SYS_FILE_H_DEFAULTS], - [ -- GNULIB_FLOCK=0; AC_SUBST([GNULIB_FLOCK]) - HAVE_FLOCK=1; AC_SUBST([HAVE_FLOCK]) - ]) -diff --git a/m4/sys_random_h.m4 b/m4/sys_random_h.m4 -index 45e0469..37bc316 100644 ---- a/m4/sys_random_h.m4 -+++ b/m4/sys_random_h.m4 -@@ -1,10 +1,10 @@ --# sys_random_h.m4 serial 5 -+# sys_random_h.m4 serial 8 - dnl Copyright (C) 2020-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. - --AC_DEFUN([gl_HEADER_SYS_RANDOM], -+AC_DEFUN_ONCE([gl_SYS_RANDOM_H], - [ - AC_REQUIRE([gl_SYS_RANDOM_H_DEFAULTS]) - dnl is always overridden, because of GNULIB_POSIXCHECK. -@@ -35,18 +35,33 @@ AC_DEFUN([gl_HEADER_SYS_RANDOM], - [getrandom]) - ]) - -+# gl_SYS_RANDOM_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_SYS_RANDOM_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_SYS_RANDOM_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_SYS_RANDOM_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_SYS_RANDOM_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_RANDOM_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETRANDOM]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_RANDOM_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_SYS_RANDOM_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_SYS_RANDOM_H_DEFAULTS], - [ -- GNULIB_GETRANDOM=0; AC_SUBST([GNULIB_GETRANDOM]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_GETRANDOM=1; AC_SUBST([HAVE_GETRANDOM]) - REPLACE_GETRANDOM=0; AC_SUBST([REPLACE_GETRANDOM]) -diff --git a/m4/sys_select_h.m4 b/m4/sys_select_h.m4 -index 4b33d31..2e7d140 100644 ---- a/m4/sys_select_h.m4 -+++ b/m4/sys_select_h.m4 -@@ -1,13 +1,13 @@ --# sys_select_h.m4 serial 20 -+# sys_select_h.m4 serial 23 - dnl Copyright (C) 2006-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. - --AC_DEFUN([gl_HEADER_SYS_SELECT], -+AC_DEFUN_ONCE([gl_SYS_SELECT_H], - [ -- AC_REQUIRE([AC_C_RESTRICT]) - AC_REQUIRE([gl_SYS_SELECT_H_DEFAULTS]) -+ AC_REQUIRE([AC_C_RESTRICT]) - AC_CACHE_CHECK([whether is self-contained], - [gl_cv_header_sys_select_h_selfcontained], - [ -@@ -75,19 +75,34 @@ AC_DEFUN([gl_HEADER_SYS_SELECT], - ]], [pselect select]) - ]) - -+# gl_SYS_SELECT_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_SYS_SELECT_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_SYS_SELECT_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_SYS_SELECT_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_SYS_SELECT_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_SELECT_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PSELECT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SELECT]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_SELECT_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_SYS_SELECT_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_SYS_SELECT_H_DEFAULTS], - [ -- GNULIB_PSELECT=0; AC_SUBST([GNULIB_PSELECT]) -- GNULIB_SELECT=0; AC_SUBST([GNULIB_SELECT]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_PSELECT=1; AC_SUBST([HAVE_PSELECT]) - REPLACE_PSELECT=0; AC_SUBST([REPLACE_PSELECT]) -diff --git a/m4/sys_socket_h.m4 b/m4/sys_socket_h.m4 -index 503cb96..5676a0d 100644 ---- a/m4/sys_socket_h.m4 -+++ b/m4/sys_socket_h.m4 -@@ -1,4 +1,4 @@ --# sys_socket_h.m4 serial 25 -+# sys_socket_h.m4 serial 28 - dnl Copyright (C) 2005-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is preserved. - - dnl From Simon Josefsson. - --AC_DEFUN([gl_HEADER_SYS_SOCKET], -+AC_DEFUN_ONCE([gl_SYS_SOCKET_H], - [ - AC_REQUIRE([gl_SYS_SOCKET_H_DEFAULTS]) - AC_REQUIRE([AC_CANONICAL_HOST]) -@@ -156,32 +156,47 @@ AC_DEFUN([gl_PREREQ_SYS_H_WS2TCPIP], - AC_SUBST([HAVE_WS2TCPIP_H]) - ]) - -+# gl_SYS_SOCKET_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_SYS_SOCKET_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_SYS_SOCKET_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_SYS_SOCKET_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_SYS_SOCKET_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_SOCKET_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SOCKET]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CONNECT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ACCEPT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_BIND]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETPEERNAME]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETSOCKNAME]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETSOCKOPT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LISTEN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RECV]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SEND]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RECVFROM]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SENDTO]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETSOCKOPT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SHUTDOWN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ACCEPT4]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_SOCKET_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_SYS_SOCKET_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_SYS_SOCKET_H_DEFAULTS], - [ -- GNULIB_SOCKET=0; AC_SUBST([GNULIB_SOCKET]) -- GNULIB_CONNECT=0; AC_SUBST([GNULIB_CONNECT]) -- GNULIB_ACCEPT=0; AC_SUBST([GNULIB_ACCEPT]) -- GNULIB_BIND=0; AC_SUBST([GNULIB_BIND]) -- GNULIB_GETPEERNAME=0; AC_SUBST([GNULIB_GETPEERNAME]) -- GNULIB_GETSOCKNAME=0; AC_SUBST([GNULIB_GETSOCKNAME]) -- GNULIB_GETSOCKOPT=0; AC_SUBST([GNULIB_GETSOCKOPT]) -- GNULIB_LISTEN=0; AC_SUBST([GNULIB_LISTEN]) -- GNULIB_RECV=0; AC_SUBST([GNULIB_RECV]) -- GNULIB_SEND=0; AC_SUBST([GNULIB_SEND]) -- GNULIB_RECVFROM=0; AC_SUBST([GNULIB_RECVFROM]) -- GNULIB_SENDTO=0; AC_SUBST([GNULIB_SENDTO]) -- GNULIB_SETSOCKOPT=0; AC_SUBST([GNULIB_SETSOCKOPT]) -- GNULIB_SHUTDOWN=0; AC_SUBST([GNULIB_SHUTDOWN]) -- GNULIB_ACCEPT4=0; AC_SUBST([GNULIB_ACCEPT4]) - HAVE_STRUCT_SOCKADDR_STORAGE=1; AC_SUBST([HAVE_STRUCT_SOCKADDR_STORAGE]) - HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY=1; - AC_SUBST([HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY]) -diff --git a/m4/sys_stat_h.m4 b/m4/sys_stat_h.m4 -index 23cbdd2..ac91d42 100644 ---- a/m4/sys_stat_h.m4 -+++ b/m4/sys_stat_h.m4 -@@ -1,4 +1,4 @@ --# sys_stat_h.m4 serial 38 -*- Autoconf -*- -+# sys_stat_h.m4 serial 41 -*- Autoconf -*- - dnl Copyright (C) 2006-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is preserved. - dnl From Eric Blake. - dnl Provide a GNU-like . - --AC_DEFUN([gl_HEADER_SYS_STAT_H], -+AC_DEFUN_ONCE([gl_SYS_STAT_H], - [ - AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS]) - -@@ -52,38 +52,53 @@ AC_DEFUN([gl_HEADER_SYS_STAT_H], - AC_REQUIRE([AC_C_RESTRICT]) - ]) - -+# gl_SYS_STAT_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_SYS_STAT_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_SYS_STAT_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_SYS_STAT_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_STAT_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_UNISTD_H_REQUIRE_DEFAULTS dnl for REPLACE_FCHDIR -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FCHMODAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSTAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSTATAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FUTIMENS]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETUMASK]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LCHMOD]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LSTAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKDIR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKDIRAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKFIFO]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKFIFOAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKNOD]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKNODAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UTIMENSAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OVERRIDES_STRUCT_STAT]) -+ dnl Support Microsoft deprecated alias function names by default. -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_CHMOD], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_MKDIR], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_UMASK], [1]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_STAT_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_SYS_STAT_H_DEFAULTS], - [ -- AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) dnl for REPLACE_FCHDIR -- GNULIB_FCHMODAT=0; AC_SUBST([GNULIB_FCHMODAT]) -- GNULIB_FSTAT=0; AC_SUBST([GNULIB_FSTAT]) -- GNULIB_FSTATAT=0; AC_SUBST([GNULIB_FSTATAT]) -- GNULIB_FUTIMENS=0; AC_SUBST([GNULIB_FUTIMENS]) -- GNULIB_GETUMASK=0; AC_SUBST([GNULIB_GETUMASK]) -- GNULIB_LCHMOD=0; AC_SUBST([GNULIB_LCHMOD]) -- GNULIB_LSTAT=0; AC_SUBST([GNULIB_LSTAT]) -- GNULIB_MKDIR=0; AC_SUBST([GNULIB_MKDIR]) -- GNULIB_MKDIRAT=0; AC_SUBST([GNULIB_MKDIRAT]) -- GNULIB_MKFIFO=0; AC_SUBST([GNULIB_MKFIFO]) -- GNULIB_MKFIFOAT=0; AC_SUBST([GNULIB_MKFIFOAT]) -- GNULIB_MKNOD=0; AC_SUBST([GNULIB_MKNOD]) -- GNULIB_MKNODAT=0; AC_SUBST([GNULIB_MKNODAT]) -- GNULIB_STAT=0; AC_SUBST([GNULIB_STAT]) -- GNULIB_UTIMENSAT=0; AC_SUBST([GNULIB_UTIMENSAT]) -- GNULIB_OVERRIDES_STRUCT_STAT=0; AC_SUBST([GNULIB_OVERRIDES_STRUCT_STAT]) -- dnl Support Microsoft deprecated alias function names by default. -- GNULIB_MDA_CHMOD=1; AC_SUBST([GNULIB_MDA_CHMOD]) -- GNULIB_MDA_MKDIR=1; AC_SUBST([GNULIB_MDA_MKDIR]) -- GNULIB_MDA_UMASK=1; AC_SUBST([GNULIB_MDA_UMASK]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_FCHMODAT=1; AC_SUBST([HAVE_FCHMODAT]) - HAVE_FSTATAT=1; AC_SUBST([HAVE_FSTATAT]) -diff --git a/m4/sys_time_h.m4 b/m4/sys_time_h.m4 -index 64f133d..c425a96 100644 ---- a/m4/sys_time_h.m4 -+++ b/m4/sys_time_h.m4 -@@ -1,5 +1,5 @@ - # Configure a replacement for . --# serial 9 -+# serial 12 - - # Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. - # This file is free software; the Free Software Foundation -@@ -8,18 +8,13 @@ - - # Written by Paul Eggert and Martin Lambers. - --AC_DEFUN([gl_HEADER_SYS_TIME_H], -+AC_DEFUN_ONCE([gl_SYS_TIME_H], - [ - dnl Use AC_REQUIRE here, so that the REPLACE_GETTIMEOFDAY=0 statement - dnl below is expanded once only, before all REPLACE_GETTIMEOFDAY=1 - dnl statements that occur in other macros. -- AC_REQUIRE([gl_HEADER_SYS_TIME_H_BODY]) --]) -- --AC_DEFUN([gl_HEADER_SYS_TIME_H_BODY], --[ -+ AC_REQUIRE([gl_SYS_TIME_H_DEFAULTS]) - AC_REQUIRE([AC_C_RESTRICT]) -- AC_REQUIRE([gl_HEADER_SYS_TIME_H_DEFAULTS]) - AC_CHECK_HEADERS_ONCE([sys/time.h]) - gl_CHECK_NEXT_HEADERS([sys/time.h]) - -@@ -89,18 +84,33 @@ AC_DEFUN([gl_HEADER_SYS_TIME_H_BODY], - ]], [gettimeofday]) - ]) - -+# gl_SYS_TIME_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_SYS_TIME_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_HEADER_SYS_TIME_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_SYS_TIME_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - --AC_DEFUN([gl_HEADER_SYS_TIME_H_DEFAULTS], -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_SYS_TIME_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_TIME_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETTIMEOFDAY]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_TIME_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_SYS_TIME_H_DEFAULTS]) -+]) -+ -+AC_DEFUN([gl_SYS_TIME_H_DEFAULTS], - [ -- GNULIB_GETTIMEOFDAY=0; AC_SUBST([GNULIB_GETTIMEOFDAY]) - dnl Assume POSIX behavior unless another module says otherwise. - HAVE_GETTIMEOFDAY=1; AC_SUBST([HAVE_GETTIMEOFDAY]) - HAVE_STRUCT_TIMEVAL=1; AC_SUBST([HAVE_STRUCT_TIMEVAL]) -diff --git a/m4/sys_times_h.m4 b/m4/sys_times_h.m4 -index b9daaa7..577ead6 100644 ---- a/m4/sys_times_h.m4 -+++ b/m4/sys_times_h.m4 -@@ -1,5 +1,5 @@ - # Configure a replacement for . --# serial 8 -+# serial 11 - - # Copyright (C) 2008-2021 Free Software Foundation, Inc. - # This file is free software; the Free Software Foundation -@@ -8,7 +8,7 @@ - - # Written by Simon Josefsson. - --AC_DEFUN([gl_SYS_TIMES_H], -+AC_DEFUN_ONCE([gl_SYS_TIMES_H], - [ - AC_REQUIRE([gl_SYS_TIMES_H_DEFAULTS]) - -@@ -36,16 +36,31 @@ AC_DEFUN([gl_SYS_TIMES_H], - ]], [times]) - ]) - -+# gl_SYS_TIMES_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_SYS_TIMES_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_SYS_TIMES_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_SYS_TIMES_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_SYS_TIMES_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_TIMES_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIMES]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_TIMES_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_SYS_TIMES_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_SYS_TIMES_H_DEFAULTS], - [ -- GNULIB_TIMES=0; AC_SUBST([GNULIB_TIMES]) - HAVE_STRUCT_TMS=1; AC_SUBST([HAVE_STRUCT_TMS]) - HAVE_TIMES=1; AC_SUBST([HAVE_TIMES]) - ]) -diff --git a/m4/sys_types_h.m4 b/m4/sys_types_h.m4 -index 2172c83..6dd6fee 100644 ---- a/m4/sys_types_h.m4 -+++ b/m4/sys_types_h.m4 -@@ -1,4 +1,4 @@ --# sys_types_h.m4 serial 11 -+# sys_types_h.m4 serial 13 - dnl Copyright (C) 2011-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -6,10 +6,11 @@ dnl with or without modifications, as long as this notice is preserved. - - AC_DEFUN_ONCE([gl_SYS_TYPES_H], - [ -+ AC_REQUIRE([gl_SYS_TYPES_H_DEFAULTS]) -+ - dnl Use sane struct stat types in OpenVMS 8.2 and later. - AC_DEFINE([_USE_STD_STAT], 1, [For standard stat data types on VMS.]) - -- AC_REQUIRE([gl_SYS_TYPES_H_DEFAULTS]) - gl_NEXT_HEADERS([sys/types.h]) - - dnl Ensure the type pid_t gets defined. -@@ -30,6 +31,17 @@ AC_DEFUN_ONCE([gl_SYS_TYPES_H], - AC_SUBST([WINDOWS_STAT_INODES]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_SYS_TYPES_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_TYPE_H_MODULE_INDICATOR_DEFAULTS], [ -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_TYPE_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_SYS_TYPES_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_SYS_TYPES_H_DEFAULTS], - [ - ]) -diff --git a/m4/sys_uio_h.m4 b/m4/sys_uio_h.m4 -index 503de4d..fa176e0 100644 ---- a/m4/sys_uio_h.m4 -+++ b/m4/sys_uio_h.m4 -@@ -1,10 +1,10 @@ --# sys_uio_h.m4 serial 1 -+# sys_uio_h.m4 serial 3 - dnl Copyright (C) 2011-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. - --AC_DEFUN([gl_HEADER_SYS_UIO], -+AC_DEFUN_ONCE([gl_SYS_UIO_H], - [ - AC_REQUIRE([gl_SYS_UIO_H_DEFAULTS]) - dnl is always overridden, because of GNULIB_POSIXCHECK. -@@ -17,15 +17,30 @@ AC_DEFUN([gl_HEADER_SYS_UIO], - AC_SUBST([HAVE_SYS_UIO_H]) - ]) - -+# gl_SYS_UIO_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_SYS_UIO_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_SYS_UIO_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_SYS_UIO_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_SYS_UIO_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_UIO_H_MODULE_INDICATOR_DEFAULTS], [ -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_UIO_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_SYS_UIO_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_SYS_UIO_H_DEFAULTS], - [ - ]) -diff --git a/m4/threadlib.m4 b/m4/threadlib.m4 -index 8fc3dfd..37b797c 100644 ---- a/m4/threadlib.m4 -+++ b/m4/threadlib.m4 -@@ -1,4 +1,4 @@ --# threadlib.m4 serial 30 -+# threadlib.m4 serial 31 - dnl Copyright (C) 2005-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -212,6 +212,27 @@ AC_DEFUN([gl_PTHREADLIB_BODY], - LIBS=$save_LIBS - test $gl_pthread_api = yes && break - done -+ echo "$as_me:__oline__: gl_pthread_api=$gl_pthread_api" >&AS_MESSAGE_LOG_FD -+ echo "$as_me:__oline__: LIBPTHREAD=$LIBPTHREAD" >&AS_MESSAGE_LOG_FD -+ -+ gl_pthread_in_glibc=no -+ # On Linux with glibc >= 2.34, libc contains the fully functional -+ # pthread functions. -+ case "$host_os" in -+ linux*) -+ AC_EGREP_CPP([Lucky user], -+ [#include -+ #ifdef __GNU_LIBRARY__ -+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 34) || (__GLIBC__ > 2) -+ Lucky user -+ #endif -+ #endif -+ ], -+ [gl_pthread_in_glibc=yes], -+ []) -+ ;; -+ esac -+ echo "$as_me:__oline__: gl_pthread_in_glibc=$gl_pthread_in_glibc" >&AS_MESSAGE_LOG_FD - - # Test for libpthread by looking for pthread_kill. (Not pthread_self, - # since it is defined as a macro on OSF/1.) -@@ -219,18 +240,22 @@ AC_DEFUN([gl_PTHREADLIB_BODY], - # The program links fine without libpthread. But it may actually - # need to link with libpthread in order to create multiple threads. - AC_CHECK_LIB([pthread], [pthread_kill], -- [LIBPMULTITHREAD=-lpthread -- # On Solaris and HP-UX, most pthread functions exist also in libc. -- # Therefore pthread_in_use() needs to actually try to create a -- # thread: pthread_create from libc will fail, whereas -- # pthread_create will actually create a thread. -- # On Solaris 10 or newer, this test is no longer needed, because -- # libc contains the fully functional pthread functions. -- case "$host_os" in -- solaris | solaris2.[1-9] | solaris2.[1-9].* | hpux*) -- AC_DEFINE([PTHREAD_IN_USE_DETECTION_HARD], [1], -- [Define if the pthread_in_use() detection is hard.]) -- esac -+ [if test $gl_pthread_in_glibc = yes; then -+ LIBPMULTITHREAD= -+ else -+ LIBPMULTITHREAD=-lpthread -+ # On Solaris and HP-UX, most pthread functions exist also in libc. -+ # Therefore pthread_in_use() needs to actually try to create a -+ # thread: pthread_create from libc will fail, whereas -+ # pthread_create will actually create a thread. -+ # On Solaris 10 or newer, this test is no longer needed, because -+ # libc contains the fully functional pthread functions. -+ case "$host_os" in -+ solaris | solaris2.[1-9] | solaris2.[1-9].* | hpux*) -+ AC_DEFINE([PTHREAD_IN_USE_DETECTION_HARD], [1], -+ [Define if the pthread_in_use() detection is hard.]) -+ esac -+ fi - ]) - elif test $gl_pthread_api != yes; then - # Some library is needed. Try libpthread and libc_r. -@@ -246,6 +271,7 @@ AC_DEFUN([gl_PTHREADLIB_BODY], - LIBPMULTITHREAD=-lc_r]) - fi - fi -+ echo "$as_me:__oline__: LIBPMULTITHREAD=$LIBPMULTITHREAD" >&AS_MESSAGE_LOG_FD - fi - AC_MSG_CHECKING([whether POSIX threads API is available]) - AC_MSG_RESULT([$gl_pthread_api]) -@@ -311,7 +337,8 @@ AC_DEFUN([gl_STDTHREADLIB_BODY], - dnl glibc >= 2.29 has thrd_create in libpthread. - dnl FreeBSD >= 10 has thrd_create in libstdthreads; this library depends - dnl on libpthread (for the symbol 'pthread_mutexattr_gettype'). -- dnl AIX >= 7.1 and Solaris >= 11.4 have thrd_create in libc. -+ dnl glibc >= 2.34, AIX >= 7.1, and Solaris >= 11.4 have thrd_create in -+ dnl libc. - AC_CHECK_FUNCS([thrd_create]) - if test $ac_cv_func_thrd_create = yes; then - LIBSTDTHREAD= -@@ -481,7 +508,10 @@ AC_DEFUN([gl_THREADLIB_BODY], - gl_threads_api=posix - AC_DEFINE([USE_POSIX_THREADS], [1], - [Define if the POSIX multithreading library can be used.]) -- if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then -+ if test -z "$LIBMULTITHREAD" && test -z "$LTLIBMULTITHREAD"; then -+ AC_DEFINE([USE_POSIX_THREADS_FROM_LIBC], [1], -+ [Define if references to the POSIX multithreading library are satisfied by libc.]) -+ else - if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then - AC_DEFINE([USE_POSIX_THREADS_WEAK], [1], - [Define if references to the POSIX multithreading library should be made weak.]) -@@ -576,7 +606,9 @@ dnl flavours option weak result - dnl --------------- --------- --------- -------- --------- - dnl Linux 2.4/glibc posix -lpthread Y OK - dnl --dnl GNU Hurd/glibc posix -+dnl Linux/glibc 2.34 posix Y OK -+dnl -+dnl GNU Hurd/glibc posix -lpthread Y OK - dnl - dnl Ubuntu 14.04 posix -pthread Y OK - dnl -diff --git a/m4/time_h.m4 b/m4/time_h.m4 -index b6a1aa3..b57474b 100644 ---- a/m4/time_h.m4 -+++ b/m4/time_h.m4 -@@ -2,7 +2,7 @@ - - # Copyright (C) 2000-2001, 2003-2007, 2009-2021 Free Software Foundation, Inc. - --# serial 15 -+# serial 18 - - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, -@@ -10,16 +10,11 @@ - - # Written by Paul Eggert and Jim Meyering. - --AC_DEFUN([gl_HEADER_TIME_H], -+AC_DEFUN_ONCE([gl_TIME_H], - [ -- dnl Use AC_REQUIRE here, so that the default behavior below is expanded -- dnl once only, before all statements that occur in other macros. -- AC_REQUIRE([gl_HEADER_TIME_H_BODY]) --]) -- --AC_DEFUN([gl_HEADER_TIME_H_BODY], --[ -- AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only, before all statements -+ dnl that occur in other macros. -+ AC_REQUIRE([gl_TIME_H_DEFAULTS]) - - gl_NEXT_HEADERS([time.h]) - AC_REQUIRE([gl_CHECK_TYPE_STRUCT_TIMESPEC]) -@@ -111,30 +106,45 @@ AC_DEFUN([gl_CHECK_TYPE_STRUCT_TIMESPEC], - AC_SUBST([UNISTD_H_DEFINES_STRUCT_TIMESPEC]) - ]) - -+# gl_TIME_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_TIME_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_TIME_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - --AC_DEFUN([gl_HEADER_TIME_H_DEFAULTS], -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_TIME_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_TIME_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CTIME]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKTIME]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOCALTIME]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_NANOSLEEP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRFTIME]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRPTIME]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIMEGM]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIMESPEC_GET]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIME_R]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIME_RZ]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TZSET]) -+ dnl Support Microsoft deprecated alias function names by default. -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_TZSET], [1]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_TIME_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_TIME_H_DEFAULTS]) -+]) -+ -+AC_DEFUN([gl_TIME_H_DEFAULTS], - [ -- GNULIB_CTIME=0; AC_SUBST([GNULIB_CTIME]) -- GNULIB_MKTIME=0; AC_SUBST([GNULIB_MKTIME]) -- GNULIB_LOCALTIME=0; AC_SUBST([GNULIB_LOCALTIME]) -- GNULIB_NANOSLEEP=0; AC_SUBST([GNULIB_NANOSLEEP]) -- GNULIB_STRFTIME=0; AC_SUBST([GNULIB_STRFTIME]) -- GNULIB_STRPTIME=0; AC_SUBST([GNULIB_STRPTIME]) -- GNULIB_TIMEGM=0; AC_SUBST([GNULIB_TIMEGM]) -- GNULIB_TIMESPEC_GET=0; AC_SUBST([GNULIB_TIMESPEC_GET]) -- GNULIB_TIME_R=0; AC_SUBST([GNULIB_TIME_R]) -- GNULIB_TIME_RZ=0; AC_SUBST([GNULIB_TIME_RZ]) -- GNULIB_TZSET=0; AC_SUBST([GNULIB_TZSET]) -- dnl Support Microsoft deprecated alias function names by default. -- GNULIB_MDA_TZSET=1; AC_SUBST([GNULIB_MDA_TZSET]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_DECL_LOCALTIME_R=1; AC_SUBST([HAVE_DECL_LOCALTIME_R]) - HAVE_NANOSLEEP=1; AC_SUBST([HAVE_NANOSLEEP]) -diff --git a/m4/time_r.m4 b/m4/time_r.m4 -index 713e93a..2d49b64 100644 ---- a/m4/time_r.m4 -+++ b/m4/time_r.m4 -@@ -12,7 +12,7 @@ AC_DEFUN([gl_TIME_R], - dnl Persuade glibc and Solaris to declare localtime_r. - AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) - -- AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) -+ AC_REQUIRE([gl_TIME_H_DEFAULTS]) - AC_REQUIRE([AC_C_RESTRICT]) - - dnl Some systems don't declare localtime_r() and gmtime_r() if _REENTRANT is -diff --git a/m4/time_rz.m4 b/m4/time_rz.m4 -index 34ef0ba..c5e85dc 100644 ---- a/m4/time_rz.m4 -+++ b/m4/time_rz.m4 -@@ -10,7 +10,7 @@ dnl Written by Paul Eggert. - AC_DEFUN([gl_TIME_RZ], - [ - AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) -- AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) -+ AC_REQUIRE([gl_TIME_H_DEFAULTS]) - AC_REQUIRE([AC_STRUCT_TIMEZONE]) - - # On Mac OS X 10.6, localtime loops forever with some time_t values. -diff --git a/m4/timegm.m4 b/m4/timegm.m4 -index 098c857..58123be 100644 ---- a/m4/timegm.m4 -+++ b/m4/timegm.m4 -@@ -1,4 +1,4 @@ --# timegm.m4 serial 12 -+# timegm.m4 serial 13 - dnl Copyright (C) 2003, 2007, 2009-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is preserved. - - AC_DEFUN([gl_FUNC_TIMEGM], - [ -- AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) -+ AC_REQUIRE([gl_TIME_H_DEFAULTS]) - AC_REQUIRE([gl_FUNC_MKTIME_WORKS]) - REPLACE_TIMEGM=0 - AC_CHECK_FUNCS_ONCE([timegm]) -diff --git a/m4/tzset.m4 b/m4/tzset.m4 -index 8eaf41f..8a4f285 100644 ---- a/m4/tzset.m4 -+++ b/m4/tzset.m4 -@@ -1,4 +1,4 @@ --# serial 15 -+# serial 16 - - # Copyright (C) 2003, 2007, 2009-2021 Free Software Foundation, Inc. - # This file is free software; the Free Software Foundation -@@ -9,7 +9,7 @@ - - AC_DEFUN([gl_FUNC_TZSET], - [ -- AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) -+ AC_REQUIRE([gl_TIME_H_DEFAULTS]) - AC_REQUIRE([AC_CANONICAL_HOST]) - REPLACE_TZSET=0 - case "$host_os" in -diff --git a/m4/unistd_h.m4 b/m4/unistd_h.m4 -index 0f26fb9..0ce4ea4 100644 ---- a/m4/unistd_h.m4 -+++ b/m4/unistd_h.m4 -@@ -1,4 +1,4 @@ --# unistd_h.m4 serial 85 -+# unistd_h.m4 serial 89 - dnl Copyright (C) 2006-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -6,10 +6,10 @@ dnl with or without modifications, as long as this notice is preserved. - - dnl Written by Simon Josefsson, Bruno Haible. - --AC_DEFUN([gl_UNISTD_H], -+AC_DEFUN_ONCE([gl_UNISTD_H], - [ -- dnl Use AC_REQUIRE here, so that the default behavior below is expanded -- dnl once only, before all statements that occur in other macros. -+ dnl Ensure to expand the default settings once only, before all statements -+ dnl that occur in other macros. - AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) - - gl_CHECK_NEXT_HEADERS([unistd.h]) -@@ -59,100 +59,116 @@ AC_DEFUN([gl_UNISTD_H], - fi - ]) - -+# gl_UNISTD_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_UNISTD_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_UNISTD_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_UNISTD_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_UNISTD_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ACCESS]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CHDIR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CHOWN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CLOSE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_COPY_FILE_RANGE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DUP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DUP2]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DUP3]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ENVIRON]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EUIDACCESS]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECLE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECLP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECV]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECVE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECVP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECVPE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FACCESSAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FCHDIR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FCHOWNAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FDATASYNC]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSYNC]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FTRUNCATE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETCWD]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETDOMAINNAME]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETDTABLESIZE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETENTROPY]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETGROUPS]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETHOSTNAME]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETLOGIN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETLOGIN_R]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETOPT_POSIX]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETPAGESIZE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETPASS]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETUSERSHELL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GROUP_MEMBER]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISATTY]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LCHOWN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LINK]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LINKAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LSEEK]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PIPE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PIPE2]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PREAD]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PWRITE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_READ]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_READLINK]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_READLINKAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RMDIR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETHOSTNAME]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SLEEP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SYMLINK]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SYMLINKAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TRUNCATE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TTYNAME_R]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNISTD_H_GETOPT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNISTD_H_NONBLOCKING]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNISTD_H_SIGPIPE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNLINK]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNLINKAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_USLEEP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WRITE]) -+ dnl Support Microsoft deprecated alias function names by default. -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_ACCESS], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_CHDIR], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_CLOSE], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_DUP], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_DUP2], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECL], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECLE], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECLP], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECV], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECVE], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECVP], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECVPE], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_GETCWD], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_GETPID], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_ISATTY], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_LSEEK], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_READ], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_RMDIR], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_SWAB], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_UNLINK], [1]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_WRITE], [1]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_UNISTD_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_UNISTD_H_DEFAULTS], - [ -- GNULIB_ACCESS=0; AC_SUBST([GNULIB_ACCESS]) -- GNULIB_CHDIR=0; AC_SUBST([GNULIB_CHDIR]) -- GNULIB_CHOWN=0; AC_SUBST([GNULIB_CHOWN]) -- GNULIB_CLOSE=0; AC_SUBST([GNULIB_CLOSE]) -- GNULIB_COPY_FILE_RANGE=0; AC_SUBST([GNULIB_COPY_FILE_RANGE]) -- GNULIB_DUP=0; AC_SUBST([GNULIB_DUP]) -- GNULIB_DUP2=0; AC_SUBST([GNULIB_DUP2]) -- GNULIB_DUP3=0; AC_SUBST([GNULIB_DUP3]) -- GNULIB_ENVIRON=0; AC_SUBST([GNULIB_ENVIRON]) -- GNULIB_EUIDACCESS=0; AC_SUBST([GNULIB_EUIDACCESS]) -- GNULIB_EXECL=0; AC_SUBST([GNULIB_EXECL]) -- GNULIB_EXECLE=0; AC_SUBST([GNULIB_EXECLE]) -- GNULIB_EXECLP=0; AC_SUBST([GNULIB_EXECLP]) -- GNULIB_EXECV=0; AC_SUBST([GNULIB_EXECV]) -- GNULIB_EXECVE=0; AC_SUBST([GNULIB_EXECVE]) -- GNULIB_EXECVP=0; AC_SUBST([GNULIB_EXECVP]) -- GNULIB_EXECVPE=0; AC_SUBST([GNULIB_EXECVPE]) -- GNULIB_FACCESSAT=0; AC_SUBST([GNULIB_FACCESSAT]) -- GNULIB_FCHDIR=0; AC_SUBST([GNULIB_FCHDIR]) -- GNULIB_FCHOWNAT=0; AC_SUBST([GNULIB_FCHOWNAT]) -- GNULIB_FDATASYNC=0; AC_SUBST([GNULIB_FDATASYNC]) -- GNULIB_FSYNC=0; AC_SUBST([GNULIB_FSYNC]) -- GNULIB_FTRUNCATE=0; AC_SUBST([GNULIB_FTRUNCATE]) -- GNULIB_GETCWD=0; AC_SUBST([GNULIB_GETCWD]) -- GNULIB_GETDOMAINNAME=0; AC_SUBST([GNULIB_GETDOMAINNAME]) -- GNULIB_GETDTABLESIZE=0; AC_SUBST([GNULIB_GETDTABLESIZE]) -- GNULIB_GETENTROPY=0; AC_SUBST([GNULIB_GETENTROPY]) -- GNULIB_GETGROUPS=0; AC_SUBST([GNULIB_GETGROUPS]) -- GNULIB_GETHOSTNAME=0; AC_SUBST([GNULIB_GETHOSTNAME]) -- GNULIB_GETLOGIN=0; AC_SUBST([GNULIB_GETLOGIN]) -- GNULIB_GETLOGIN_R=0; AC_SUBST([GNULIB_GETLOGIN_R]) -- GNULIB_GETOPT_POSIX=0; AC_SUBST([GNULIB_GETOPT_POSIX]) -- GNULIB_GETPAGESIZE=0; AC_SUBST([GNULIB_GETPAGESIZE]) -- GNULIB_GETPASS=0; AC_SUBST([GNULIB_GETPASS]) -- GNULIB_GETUSERSHELL=0; AC_SUBST([GNULIB_GETUSERSHELL]) -- GNULIB_GROUP_MEMBER=0; AC_SUBST([GNULIB_GROUP_MEMBER]) -- GNULIB_ISATTY=0; AC_SUBST([GNULIB_ISATTY]) -- GNULIB_LCHOWN=0; AC_SUBST([GNULIB_LCHOWN]) -- GNULIB_LINK=0; AC_SUBST([GNULIB_LINK]) -- GNULIB_LINKAT=0; AC_SUBST([GNULIB_LINKAT]) -- GNULIB_LSEEK=0; AC_SUBST([GNULIB_LSEEK]) -- GNULIB_PIPE=0; AC_SUBST([GNULIB_PIPE]) -- GNULIB_PIPE2=0; AC_SUBST([GNULIB_PIPE2]) -- GNULIB_PREAD=0; AC_SUBST([GNULIB_PREAD]) -- GNULIB_PWRITE=0; AC_SUBST([GNULIB_PWRITE]) -- GNULIB_READ=0; AC_SUBST([GNULIB_READ]) -- GNULIB_READLINK=0; AC_SUBST([GNULIB_READLINK]) -- GNULIB_READLINKAT=0; AC_SUBST([GNULIB_READLINKAT]) -- GNULIB_RMDIR=0; AC_SUBST([GNULIB_RMDIR]) -- GNULIB_SETHOSTNAME=0; AC_SUBST([GNULIB_SETHOSTNAME]) -- GNULIB_SLEEP=0; AC_SUBST([GNULIB_SLEEP]) -- GNULIB_SYMLINK=0; AC_SUBST([GNULIB_SYMLINK]) -- GNULIB_SYMLINKAT=0; AC_SUBST([GNULIB_SYMLINKAT]) -- GNULIB_TRUNCATE=0; AC_SUBST([GNULIB_TRUNCATE]) -- GNULIB_TTYNAME_R=0; AC_SUBST([GNULIB_TTYNAME_R]) -- GNULIB_UNISTD_H_NONBLOCKING=0; AC_SUBST([GNULIB_UNISTD_H_NONBLOCKING]) -- GNULIB_UNISTD_H_SIGPIPE=0; AC_SUBST([GNULIB_UNISTD_H_SIGPIPE]) -- GNULIB_UNLINK=0; AC_SUBST([GNULIB_UNLINK]) -- GNULIB_UNLINKAT=0; AC_SUBST([GNULIB_UNLINKAT]) -- GNULIB_USLEEP=0; AC_SUBST([GNULIB_USLEEP]) -- GNULIB_WRITE=0; AC_SUBST([GNULIB_WRITE]) -- dnl Support Microsoft deprecated alias function names by default. -- GNULIB_MDA_ACCESS=1; AC_SUBST([GNULIB_MDA_ACCESS]) -- GNULIB_MDA_CHDIR=1; AC_SUBST([GNULIB_MDA_CHDIR]) -- GNULIB_MDA_CLOSE=1; AC_SUBST([GNULIB_MDA_CLOSE]) -- GNULIB_MDA_DUP=1; AC_SUBST([GNULIB_MDA_DUP]) -- GNULIB_MDA_DUP2=1; AC_SUBST([GNULIB_MDA_DUP2]) -- GNULIB_MDA_EXECL=1; AC_SUBST([GNULIB_MDA_EXECL]) -- GNULIB_MDA_EXECLE=1; AC_SUBST([GNULIB_MDA_EXECLE]) -- GNULIB_MDA_EXECLP=1; AC_SUBST([GNULIB_MDA_EXECLP]) -- GNULIB_MDA_EXECV=1; AC_SUBST([GNULIB_MDA_EXECV]) -- GNULIB_MDA_EXECVE=1; AC_SUBST([GNULIB_MDA_EXECVE]) -- GNULIB_MDA_EXECVP=1; AC_SUBST([GNULIB_MDA_EXECVP]) -- GNULIB_MDA_EXECVPE=1; AC_SUBST([GNULIB_MDA_EXECVPE]) -- GNULIB_MDA_GETCWD=1; AC_SUBST([GNULIB_MDA_GETCWD]) -- GNULIB_MDA_GETPID=1; AC_SUBST([GNULIB_MDA_GETPID]) -- GNULIB_MDA_ISATTY=1; AC_SUBST([GNULIB_MDA_ISATTY]) -- GNULIB_MDA_LSEEK=1; AC_SUBST([GNULIB_MDA_LSEEK]) -- GNULIB_MDA_READ=1; AC_SUBST([GNULIB_MDA_READ]) -- GNULIB_MDA_RMDIR=1; AC_SUBST([GNULIB_MDA_RMDIR]) -- GNULIB_MDA_SWAB=1; AC_SUBST([GNULIB_MDA_SWAB]) -- GNULIB_MDA_UNLINK=1; AC_SUBST([GNULIB_MDA_UNLINK]) -- GNULIB_MDA_WRITE=1; AC_SUBST([GNULIB_MDA_WRITE]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_CHOWN=1; AC_SUBST([HAVE_CHOWN]) - HAVE_COPY_FILE_RANGE=1; AC_SUBST([HAVE_COPY_FILE_RANGE]) -diff --git a/m4/visibility.m4 b/m4/visibility.m4 -index 8f27a12..d161bd7 100644 ---- a/m4/visibility.m4 -+++ b/m4/visibility.m4 -@@ -1,4 +1,4 @@ --# visibility.m4 serial 7 -+# visibility.m4 serial 8 - dnl Copyright (C) 2005, 2008, 2010-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -59,6 +59,10 @@ AC_DEFUN([gl_VISIBILITY], - extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void); - extern __attribute__((__visibility__("default"))) int exportedfunc (void); - void dummyfunc (void); -+ int hiddenvar; -+ int exportedvar; -+ int hiddenfunc (void) { return 51; } -+ int exportedfunc (void) { return 1225736919; } - void dummyfunc (void) {} - ]], - [[]])], -diff --git a/m4/wchar_h.m4 b/m4/wchar_h.m4 -index 59c55fc..818b319 100644 ---- a/m4/wchar_h.m4 -+++ b/m4/wchar_h.m4 -@@ -7,9 +7,9 @@ dnl with or without modifications, as long as this notice is preserved. - - dnl Written by Eric Blake. - --# wchar_h.m4 serial 50 -+# wchar_h.m4 serial 53 - --AC_DEFUN([gl_WCHAR_H], -+AC_DEFUN_ONCE([gl_WCHAR_H], - [ - AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) - AC_REQUIRE([gl_WCHAR_H_INLINE_OK]) -@@ -125,60 +125,75 @@ Configuration aborted.]) - fi - ]) - -+# gl_WCHAR_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_WCHAR_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_WCHAR_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_WCHAR_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_WCHAR_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_BTOWC]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCTOB]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSINIT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBRTOWC]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBRLEN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSRTOWCS]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSNRTOWCS]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCRTOMB]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSRTOMBS]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNRTOMBS]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCWIDTH]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMCHR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMCMP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMCPY]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMMOVE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMPCPY]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMSET]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSLEN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNLEN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCPY]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCPCPY]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNCPY]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCPNCPY]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNCAT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCMP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNCMP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCASECMP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNCASECMP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCOLL]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSXFRM]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSDUP]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCHR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSRCHR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCSPN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSSPN]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSPBRK]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSSTR]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSTOK]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSWIDTH]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSFTIME]) -+ dnl Support Microsoft deprecated alias function names by default. -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_WCSDUP], [1]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_WCHAR_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_WCHAR_H_DEFAULTS], - [ -- GNULIB_BTOWC=0; AC_SUBST([GNULIB_BTOWC]) -- GNULIB_WCTOB=0; AC_SUBST([GNULIB_WCTOB]) -- GNULIB_MBSINIT=0; AC_SUBST([GNULIB_MBSINIT]) -- GNULIB_MBRTOWC=0; AC_SUBST([GNULIB_MBRTOWC]) -- GNULIB_MBRLEN=0; AC_SUBST([GNULIB_MBRLEN]) -- GNULIB_MBSRTOWCS=0; AC_SUBST([GNULIB_MBSRTOWCS]) -- GNULIB_MBSNRTOWCS=0; AC_SUBST([GNULIB_MBSNRTOWCS]) -- GNULIB_WCRTOMB=0; AC_SUBST([GNULIB_WCRTOMB]) -- GNULIB_WCSRTOMBS=0; AC_SUBST([GNULIB_WCSRTOMBS]) -- GNULIB_WCSNRTOMBS=0; AC_SUBST([GNULIB_WCSNRTOMBS]) -- GNULIB_WCWIDTH=0; AC_SUBST([GNULIB_WCWIDTH]) -- GNULIB_WMEMCHR=0; AC_SUBST([GNULIB_WMEMCHR]) -- GNULIB_WMEMCMP=0; AC_SUBST([GNULIB_WMEMCMP]) -- GNULIB_WMEMCPY=0; AC_SUBST([GNULIB_WMEMCPY]) -- GNULIB_WMEMMOVE=0; AC_SUBST([GNULIB_WMEMMOVE]) -- GNULIB_WMEMPCPY=0; AC_SUBST([GNULIB_WMEMPCPY]) -- GNULIB_WMEMSET=0; AC_SUBST([GNULIB_WMEMSET]) -- GNULIB_WCSLEN=0; AC_SUBST([GNULIB_WCSLEN]) -- GNULIB_WCSNLEN=0; AC_SUBST([GNULIB_WCSNLEN]) -- GNULIB_WCSCPY=0; AC_SUBST([GNULIB_WCSCPY]) -- GNULIB_WCPCPY=0; AC_SUBST([GNULIB_WCPCPY]) -- GNULIB_WCSNCPY=0; AC_SUBST([GNULIB_WCSNCPY]) -- GNULIB_WCPNCPY=0; AC_SUBST([GNULIB_WCPNCPY]) -- GNULIB_WCSCAT=0; AC_SUBST([GNULIB_WCSCAT]) -- GNULIB_WCSNCAT=0; AC_SUBST([GNULIB_WCSNCAT]) -- GNULIB_WCSCMP=0; AC_SUBST([GNULIB_WCSCMP]) -- GNULIB_WCSNCMP=0; AC_SUBST([GNULIB_WCSNCMP]) -- GNULIB_WCSCASECMP=0; AC_SUBST([GNULIB_WCSCASECMP]) -- GNULIB_WCSNCASECMP=0; AC_SUBST([GNULIB_WCSNCASECMP]) -- GNULIB_WCSCOLL=0; AC_SUBST([GNULIB_WCSCOLL]) -- GNULIB_WCSXFRM=0; AC_SUBST([GNULIB_WCSXFRM]) -- GNULIB_WCSDUP=0; AC_SUBST([GNULIB_WCSDUP]) -- GNULIB_WCSCHR=0; AC_SUBST([GNULIB_WCSCHR]) -- GNULIB_WCSRCHR=0; AC_SUBST([GNULIB_WCSRCHR]) -- GNULIB_WCSCSPN=0; AC_SUBST([GNULIB_WCSCSPN]) -- GNULIB_WCSSPN=0; AC_SUBST([GNULIB_WCSSPN]) -- GNULIB_WCSPBRK=0; AC_SUBST([GNULIB_WCSPBRK]) -- GNULIB_WCSSTR=0; AC_SUBST([GNULIB_WCSSTR]) -- GNULIB_WCSTOK=0; AC_SUBST([GNULIB_WCSTOK]) -- GNULIB_WCSWIDTH=0; AC_SUBST([GNULIB_WCSWIDTH]) -- GNULIB_WCSFTIME=0; AC_SUBST([GNULIB_WCSFTIME]) -- dnl Support Microsoft deprecated alias function names by default. -- GNULIB_MDA_WCSDUP=1; AC_SUBST([GNULIB_MDA_WCSDUP]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_BTOWC=1; AC_SUBST([HAVE_BTOWC]) - HAVE_MBSINIT=1; AC_SUBST([HAVE_MBSINIT]) -diff --git a/m4/wctype_h.m4 b/m4/wctype_h.m4 -index 1ab0bc9..7d74212 100644 ---- a/m4/wctype_h.m4 -+++ b/m4/wctype_h.m4 -@@ -1,4 +1,4 @@ --# wctype_h.m4 serial 26 -+# wctype_h.m4 serial 30 - - dnl A placeholder for ISO C99 , for platforms that lack it. - -@@ -9,7 +9,7 @@ dnl with or without modifications, as long as this notice is preserved. - - dnl Written by Paul Eggert. - --AC_DEFUN([gl_WCTYPE_H], -+AC_DEFUN_ONCE([gl_WCTYPE_H], - [ - AC_REQUIRE([gl_WCTYPE_H_DEFAULTS]) - AC_REQUIRE([AC_PROG_CC]) -@@ -62,7 +62,7 @@ AC_DEFUN([gl_WCTYPE_H], - fi - AC_SUBST([HAVE_WCTYPE_H]) - -- if test $GNULIB_OVERRIDES_WINT_T = 1; then -+ if test $GNULIBHEADERS_OVERRIDE_WINT_T = 1; then - REPLACE_ISWCNTRL=1 - else - case "$gl_cv_func_iswcntrl_works" in -@@ -157,24 +157,39 @@ AC_DEFUN([gl_WCTYPE_H], - ]) - ]) - -+# gl_WCTYPE_MODULE_INDICATOR([modulename]) -+# sets the shell variable that indicates the presence of the given module -+# to a C preprocessor expression that will evaluate to 1. -+# This macro invocation must not occur in macros that are AC_REQUIREd. - AC_DEFUN([gl_WCTYPE_MODULE_INDICATOR], - [ -- dnl Use AC_REQUIRE here, so that the default settings are expanded once only. -- AC_REQUIRE([gl_WCTYPE_H_DEFAULTS]) -+ dnl Ensure to expand the default settings once only. -+ gl_WCTYPE_H_REQUIRE_DEFAULTS - gl_MODULE_INDICATOR_SET_VARIABLE([$1]) - dnl Define it also as a C macro, for the benefit of the unit tests. - gl_MODULE_INDICATOR_FOR_TESTS([$1]) - ]) - -+# Initializes the default values for AC_SUBSTed shell variables. -+# This macro must not be AC_REQUIREd. It must only be invoked, and only -+# outside of macros or in macros that are not AC_REQUIREd. -+AC_DEFUN([gl_WCTYPE_H_REQUIRE_DEFAULTS], -+[ -+ m4_defun(GL_MODULE_INDICATOR_PREFIX[_WCTYPE_H_MODULE_INDICATOR_DEFAULTS], [ -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISWBLANK]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISWDIGIT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISWXDIGIT]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCTYPE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISWCTYPE]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCTRANS]) -+ gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TOWCTRANS]) -+ ]) -+ m4_require(GL_MODULE_INDICATOR_PREFIX[_WCTYPE_H_MODULE_INDICATOR_DEFAULTS]) -+ AC_REQUIRE([gl_WCTYPE_H_DEFAULTS]) -+]) -+ - AC_DEFUN([gl_WCTYPE_H_DEFAULTS], - [ -- GNULIB_ISWBLANK=0; AC_SUBST([GNULIB_ISWBLANK]) -- GNULIB_ISWDIGIT=0; AC_SUBST([GNULIB_ISWDIGIT]) -- GNULIB_ISWXDIGIT=0; AC_SUBST([GNULIB_ISWXDIGIT]) -- GNULIB_WCTYPE=0; AC_SUBST([GNULIB_WCTYPE]) -- GNULIB_ISWCTYPE=0; AC_SUBST([GNULIB_ISWCTYPE]) -- GNULIB_WCTRANS=0; AC_SUBST([GNULIB_WCTRANS]) -- GNULIB_TOWCTRANS=0; AC_SUBST([GNULIB_TOWCTRANS]) - dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_ISWBLANK=1; AC_SUBST([HAVE_ISWBLANK]) - HAVE_WCTYPE_T=1; AC_SUBST([HAVE_WCTYPE_T]) -diff --git a/m4/wint_t.m4 b/m4/wint_t.m4 -index 2fc7467..a49c508 100644 ---- a/m4/wint_t.m4 -+++ b/m4/wint_t.m4 -@@ -1,4 +1,4 @@ --# wint_t.m4 serial 10 -+# wint_t.m4 serial 11 - dnl Copyright (C) 2003, 2007-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -34,14 +34,14 @@ AC_DEFUN([gt_TYPE_WINT_T], - [gl_cv_type_wint_t_large_enough=yes], - [gl_cv_type_wint_t_large_enough=no])]) - if test $gl_cv_type_wint_t_large_enough = no; then -- GNULIB_OVERRIDES_WINT_T=1 -+ GNULIBHEADERS_OVERRIDE_WINT_T=1 - else -- GNULIB_OVERRIDES_WINT_T=0 -+ GNULIBHEADERS_OVERRIDE_WINT_T=0 - fi - else -- GNULIB_OVERRIDES_WINT_T=0 -+ GNULIBHEADERS_OVERRIDE_WINT_T=0 - fi -- AC_SUBST([GNULIB_OVERRIDES_WINT_T]) -+ AC_SUBST([GNULIBHEADERS_OVERRIDE_WINT_T]) - ]) - - dnl Prerequisites of the 'wint_t' override. -diff --git a/m4/year2038.m4 b/m4/year2038.m4 -new file mode 100644 -index 0000000..da0f8d7 ---- /dev/null -+++ b/m4/year2038.m4 -@@ -0,0 +1,124 @@ -+# year2038.m4 serial 7 -+dnl Copyright (C) 2017-2021 Free Software Foundation, Inc. -+dnl This file is free software; the Free Software Foundation -+dnl gives unlimited permission to copy and/or distribute it, -+dnl with or without modifications, as long as this notice is preserved. -+ -+dnl Attempt to ensure that 'time_t' can go past the year 2038 and that -+dnl the functions 'time', 'stat', etc. work with post-2038 timestamps. -+ -+AC_DEFUN([gl_YEAR2038_EARLY], -+[ -+ AC_REQUIRE([AC_CANONICAL_HOST]) -+ case "$host_os" in -+ mingw*) -+ AC_DEFINE([__MINGW_USE_VC2005_COMPAT], [1], -+ [For 64-bit time_t on 32-bit mingw.]) -+ ;; -+ esac -+]) -+ -+# gl_YEAR2038_TEST_INCLUDES -+# ------------------------- -+AC_DEFUN([gl_YEAR2038_TEST_INCLUDES], -+[[ -+ #include -+ /* Check that time_t can represent 2**32 - 1 correctly. */ -+ #define LARGE_TIME_T \\ -+ ((time_t) (((time_t) 1 << 30) - 1 + 3 * ((time_t) 1 << 30))) -+ int verify_time_t_range[(LARGE_TIME_T / 65537 == 65535 -+ && LARGE_TIME_T % 65537 == 0) -+ ? 1 : -1]; -+]]) -+ -+# gl_YEAR2038_BODY(REQUIRE-YEAR2038-SAFE) -+----------------------------------------- -+AC_DEFUN([gl_YEAR2038_BODY], -+[ -+ AC_ARG_ENABLE([year2038], -+ [ --disable-year2038 omit support for timestamps past the year 2038]) -+ AS_IF([test "$enable_year2038" != no], -+ [ -+ dnl On many systems, time_t is already a 64-bit type. -+ dnl On those systems where time_t is still 32-bit, it requires kernel -+ dnl and libc support to make it 64-bit. For glibc 2.34 and later on Linux, -+ dnl defining _TIME_BITS=64 and _FILE_OFFSET_BITS=64 is needed on x86 and ARM. -+ dnl -+ dnl On native Windows, the system include files define types __time32_t -+ dnl and __time64_t. By default, time_t is an alias of -+ dnl - __time32_t on 32-bit mingw, -+ dnl - __time64_t on 64-bit mingw and on MSVC (since MSVC 8). -+ dnl But when compiling with -D__MINGW_USE_VC2005_COMPAT, time_t is an -+ dnl alias of __time64_t. -+ dnl And when compiling with -D_USE_32BIT_TIME_T, time_t is an alias of -+ dnl __time32_t. -+ AC_CACHE_CHECK([for time_t past the year 2038], [gl_cv_type_time_t_y2038], -+ [AC_COMPILE_IFELSE( -+ [AC_LANG_SOURCE([gl_YEAR2038_TEST_INCLUDES])], -+ [gl_cv_type_time_t_y2038=yes], [gl_cv_type_time_t_y2038=no]) -+ ]) -+ if test "$gl_cv_type_time_t_y2038" = no; then -+ AC_CACHE_CHECK([for 64-bit time_t with _TIME_BITS=64], -+ [gl_cv_type_time_t_bits_macro], -+ [AC_COMPILE_IFELSE( -+ [AC_LANG_SOURCE([[#define _TIME_BITS 64 -+ #define _FILE_OFFSET_BITS 64 -+ ]gl_YEAR2038_TEST_INCLUDES])], -+ [gl_cv_type_time_t_bits_macro=yes], -+ [gl_cv_type_time_t_bits_macro=no]) -+ ]) -+ if test "$gl_cv_type_time_t_bits_macro" = yes; then -+ AC_DEFINE([_TIME_BITS], [64], -+ [Number of bits in a timestamp, on hosts where this is settable.]) -+ dnl AC_SYS_LARGFILE also defines this; it's OK if we do too. -+ AC_DEFINE([_FILE_OFFSET_BITS], [64], -+ [Number of bits in a file offset, on hosts where this is settable.]) -+ gl_cv_type_time_t_y2038=yes -+ fi -+ fi -+ if test $gl_cv_type_time_t_y2038 = no; then -+ AC_COMPILE_IFELSE( -+ [AC_LANG_SOURCE( -+ [[#ifdef _USE_32BIT_TIME_T -+ int ok; -+ #else -+ error fail -+ #endif -+ ]])], -+ [AC_MSG_FAILURE( -+ [The 'time_t' type stops working after January 2038. -+ Remove _USE_32BIT_TIME_T from the compiler flags.])], -+ [# If not cross-compiling and $1 says we should check, -+ # and 'touch' works with a large timestamp, then evidently wider time_t -+ # is desired and supported, so fail and ask the builder to fix the -+ # problem. Otherwise, just warn the builder. -+ m4_ifval([$1], -+ [if test $cross_compiling = no \ -+ && TZ=UTC0 touch -t 210602070628.15 conftest.time 2>/dev/null; then -+ case `TZ=UTC0 LC_ALL=C ls -l conftest.time 2>/dev/null` in -+ *'Feb 7 2106'* | *'Feb 7 17:10'*) -+ AC_MSG_FAILURE( -+ [The 'time_t' type stops working after January 2038, -+ and your system appears to support a wider 'time_t'. -+ Try configuring with 'CC="${CC} -m64"'. -+ To build with a 32-bit time_t anyway (not recommended), -+ configure with '--disable-year2038'.]);; -+ esac -+ rm -f conftest.time -+ fi]) -+ if test "$gl_warned_about_y2038" != yes; then -+ AC_MSG_WARN( -+ [The 'time_t' type stops working after January 2038, -+ and this package needs a wider 'time_t' type -+ if there is any way to access timestamps after that. -+ Configure with 'CC="${CC} -m64"' perhaps?]) -+ gl_warned_about_y2038=yes -+ fi -+ ]) -+ fi]) -+]) -+ -+AC_DEFUN([gl_YEAR2038], -+[ -+ gl_YEAR2038_BODY([require-year2038-safe]) -+]) -diff --git a/maint.mk b/maint.mk -index ae3a817..6a3ea96 100644 ---- a/maint.mk -+++ b/maint.mk -@@ -1409,7 +1409,7 @@ announcement_mail_headers_alpha = \ - announcement_mail_Cc_beta = $(announcement_mail_Cc_alpha) - announcement_mail_headers_beta = $(announcement_mail_headers_alpha) - --announcement_mail_Cc_ ?= $(announcement_mail_Cc_$(release-type)) -+announcement_Cc_ ?= $(announcement_Cc_$(release-type)) - announcement_mail_headers_ ?= $(announcement_mail_headers_$(release-type)) - announcement: NEWS ChangeLog $(rel-files) - # Not $(AM_V_GEN) since the output of this command serves as -@@ -1426,7 +1426,6 @@ announcement: NEWS ChangeLog $(rel-files) - --bootstrap-tools=$(bootstrap-tools) \ - $$(case ,$(bootstrap-tools), in (*,gnulib,*) \ - echo --gnulib-version=$(gnulib-version);; esac) \ -- --no-print-checksums \ - $(addprefix --url-dir=, $(url_dir_list)) - - .PHONY: release-commit --- -cgit v1.1 - diff --git a/package/guile/Config.in b/package/guile/Config.in index f70e6740181..eeeeaf4035e 100644 --- a/package/guile/Config.in +++ b/package/guile/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_GUILE bool "guile" + depends on BR2_USE_MMU # bdwgc depends on !BR2_TOOLCHAIN_USES_MUSL # no strtol_l depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS # bdwgc @@ -17,5 +18,7 @@ config BR2_PACKAGE_GUILE http://www.gnu.org/software/guile comment "guile needs a uClibc or glibc toolchain w/ threads, wchar, dynamic library" + depends on BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS + depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL diff --git a/package/guile/guile.hash b/package/guile/guile.hash index c2719fa7f26..e9ae5b6e517 100644 --- a/package/guile/guile.hash +++ b/package/guile/guile.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 f57d86c70620271bfceb7a9be0c81744a033f08adc7ceba832c9917ab3e691b7 guile-3.0.7.tar.xz +sha256 daa7060a56f2804e9b74c8d7e7fe8beed12b43aab2789a38585183fcc17b8a13 guile-3.0.8.tar.xz # Locally computed sha256 b51c6f20e6d029cb5b3e5bf235ac562c9a188c5bdc4ffcdc663897772d6e0260 LICENSE sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/guile/guile.mk b/package/guile/guile.mk index 859d7ec96f6..9478e75b41f 100644 --- a/package/guile/guile.mk +++ b/package/guile/guile.mk @@ -4,7 +4,7 @@ # ################################################################################ -GUILE_VERSION = 3.0.7 +GUILE_VERSION = 3.0.8 GUILE_SOURCE = guile-$(GUILE_VERSION).tar.xz GUILE_SITE = $(BR2_GNU_MIRROR)/guile GUILE_INSTALL_STAGING = YES diff --git a/package/gupnp-av/gupnp-av.hash b/package/gupnp-av/gupnp-av.hash index ceab42ef52b..ab1739aaa40 100644 --- a/package/gupnp-av/gupnp-av.hash +++ b/package/gupnp-av/gupnp-av.hash @@ -1,4 +1,4 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp-av/0.14/gupnp-av-0.14.0.sha256sum: +# Hash from: https://download.gnome.org/sources/gupnp-av/0.14/gupnp-av-0.14.0.sha256sum: sha256 20aed546fc882e78a3f186a0c8bce5c841cc3a44b7ea528298fbdc82596fb156 gupnp-av-0.14.0.tar.xz # Hash for license file: diff --git a/package/gupnp-av/gupnp-av.mk b/package/gupnp-av/gupnp-av.mk index 655de876082..e83aa57bda2 100644 --- a/package/gupnp-av/gupnp-av.mk +++ b/package/gupnp-av/gupnp-av.mk @@ -7,7 +7,7 @@ GUPNP_AV_VERSION_MAJOR = 0.14 GUPNP_AV_VERSION = $(GUPNP_AV_VERSION_MAJOR).0 GUPNP_AV_SOURCE = gupnp-av-$(GUPNP_AV_VERSION).tar.xz -GUPNP_AV_SITE = http://ftp.gnome.org/pub/gnome/sources/gupnp-av/$(GUPNP_AV_VERSION_MAJOR) +GUPNP_AV_SITE = https://download.gnome.org/sources/gupnp-av/$(GUPNP_AV_VERSION_MAJOR) GUPNP_AV_LICENSE = LGPL-2.1+ GUPNP_AV_LICENSE_FILES = COPYING GUPNP_AV_INSTALL_STAGING = YES diff --git a/package/gupnp-dlna/gupnp-dlna.hash b/package/gupnp-dlna/gupnp-dlna.hash index dd9f2e4e4ff..c7cab2601cc 100644 --- a/package/gupnp-dlna/gupnp-dlna.hash +++ b/package/gupnp-dlna/gupnp-dlna.hash @@ -1,4 +1,4 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp-dlna/0.12/gupnp-dlna-0.12.0.sha256sum: +# Hash from: https://download.gnome.org/sources/gupnp-dlna/0.12/gupnp-dlna-0.12.0.sha256sum: sha256 3d53b96f85bc5628d33e367ec9bf2adb38ef2b34d7ad0434a6ba0cf4ad9048e6 gupnp-dlna-0.12.0.tar.xz # Locally computed: diff --git a/package/gupnp-dlna/gupnp-dlna.mk b/package/gupnp-dlna/gupnp-dlna.mk index 64146f894bb..0064700fd2b 100644 --- a/package/gupnp-dlna/gupnp-dlna.mk +++ b/package/gupnp-dlna/gupnp-dlna.mk @@ -8,7 +8,7 @@ GUPNP_DLNA_VERSION_MAJOR = 0.12 GUPNP_DLNA_VERSION = $(GUPNP_DLNA_VERSION_MAJOR).0 GUPNP_DLNA_SOURCE = gupnp-dlna-$(GUPNP_DLNA_VERSION).tar.xz GUPNP_DLNA_SITE = \ - http://ftp.gnome.org/pub/gnome/sources/gupnp-dlna/$(GUPNP_DLNA_VERSION_MAJOR) + https://download.gnome.org/sources/gupnp-dlna/$(GUPNP_DLNA_VERSION_MAJOR) # COPYING contains LGPL-2.1 but all source files contain LPGL-2.0+ GUPNP_DLNA_LICENSE = LGPL-2.0+ GUPNP_DLNA_LICENSE_FILES = COPYING diff --git a/package/gupnp-tools/gupnp-tools.hash b/package/gupnp-tools/gupnp-tools.hash index 28a1d26edeb..c3808de6e2c 100644 --- a/package/gupnp-tools/gupnp-tools.hash +++ b/package/gupnp-tools/gupnp-tools.hash @@ -1,5 +1,5 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp-tools/0.10/gupnp-tools-0.10.2.sha256sum: -sha256 6de49ef4b375b8a164f74b766168b1184e0d28196b6b07a4f5341f08dfd85d6c gupnp-tools-0.10.2.tar.xz +# Hash from: https://download.gnome.org/sources/gupnp-tools/0.10/gupnp-tools-0.10.3.sha256sum: +sha256 457f4d923935b078415cd2ba88d78db60079b725926b7ee106e4565efe3204de gupnp-tools-0.10.3.tar.xz # Locally computed: sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/gupnp-tools/gupnp-tools.mk b/package/gupnp-tools/gupnp-tools.mk index 7b34de52a0d..f87e98ef036 100644 --- a/package/gupnp-tools/gupnp-tools.mk +++ b/package/gupnp-tools/gupnp-tools.mk @@ -5,10 +5,10 @@ ################################################################################ GUPNP_TOOLS_VERSION_MAJOR = 0.10 -GUPNP_TOOLS_VERSION = $(GUPNP_TOOLS_VERSION_MAJOR).2 +GUPNP_TOOLS_VERSION = $(GUPNP_TOOLS_VERSION_MAJOR).3 GUPNP_TOOLS_SOURCE = gupnp-tools-$(GUPNP_TOOLS_VERSION).tar.xz GUPNP_TOOLS_SITE = \ - http://ftp.gnome.org/pub/gnome/sources/gupnp-tools/$(GUPNP_TOOLS_VERSION_MAJOR) + https://download.gnome.org/sources/gupnp-tools/$(GUPNP_TOOLS_VERSION_MAJOR) GUPNP_TOOLS_LICENSE = GPL-2.0+ GUPNP_TOOLS_LICENSE_FILES = COPYING GUPNP_TOOLS_INSTALL_STAGING = YES diff --git a/package/gupnp/0001-all-Drop-xmlRecoverMemory.patch b/package/gupnp/0001-all-Drop-xmlRecoverMemory.patch new file mode 100644 index 00000000000..46e09c267ee --- /dev/null +++ b/package/gupnp/0001-all-Drop-xmlRecoverMemory.patch @@ -0,0 +1,113 @@ +From c3d084736cca81dd4ec05f7e4b634050eb6e8525 Mon Sep 17 00:00:00 2001 +From: Jens Georg +Date: Thu, 4 May 2023 19:14:29 +0200 +Subject: [PATCH] all: Drop xmlRecoverMemory + +use xmlReadMemory, also use NONET flat + +Upstream: https://gitlab.gnome.org/GNOME/gupnp/-/commit/80e68995b745a5900eaaa1d0c424d3a9d354e42d + +Signed-off-by: Bernd Kuhls +[Bernd: backported to branch gupnp-1.4] +--- + libgupnp/gupnp-control-point.c | 7 +++++-- + libgupnp/gupnp-service-info.c | 8 ++++++-- + libgupnp/gupnp-service-proxy-action.c | 7 +++++-- + libgupnp/gupnp-service-proxy.c | 7 +++++-- + libgupnp/gupnp-service.c | 7 +++++-- + 5 files changed, 26 insertions(+), 10 deletions(-) + +diff --git a/libgupnp/gupnp-control-point.c b/libgupnp/gupnp-control-point.c +index deb4b42..17c485a 100644 +--- a/libgupnp/gupnp-control-point.c ++++ b/libgupnp/gupnp-control-point.c +@@ -613,8 +613,11 @@ got_description_url (SoupSession *session, + xmlDoc *xml_doc; + + /* Parse response */ +- xml_doc = xmlRecoverMemory (msg->response_body->data, +- msg->response_body->length); ++ xml_doc = xmlReadMemory (msg->response_body->data, ++ msg->response_body->length, ++ NULL, ++ NULL, ++ XML_PARSE_NONET | XML_PARSE_RECOVER); + if (xml_doc) { + doc = gupnp_xml_doc_new (xml_doc); + +diff --git a/libgupnp/gupnp-service-info.c b/libgupnp/gupnp-service-info.c +index 9a9f4de..1c7489e 100644 +--- a/libgupnp/gupnp-service-info.c ++++ b/libgupnp/gupnp-service-info.c +@@ -592,8 +592,12 @@ got_scpd_url (G_GNUC_UNUSED SoupSession *session, + if (SOUP_STATUS_IS_SUCCESSFUL (msg->status_code)) { + xmlDoc *scpd; + +- scpd = xmlRecoverMemory (msg->response_body->data, +- msg->response_body->length); ++ scpd = xmlReadMemory (msg->response_body->data, ++ msg->response_body->length, ++ NULL, ++ NULL, ++ XML_PARSE_NONET | XML_PARSE_RECOVER); ++ + if (scpd) { + introspection = gupnp_service_introspection_new (scpd); + +diff --git a/libgupnp/gupnp-service-proxy-action.c b/libgupnp/gupnp-service-proxy-action.c +index f089152..079219f 100644 +--- a/libgupnp/gupnp-service-proxy-action.c ++++ b/libgupnp/gupnp-service-proxy-action.c +@@ -87,8 +87,11 @@ check_action_response (G_GNUC_UNUSED GUPnPServiceProxy *proxy, + } + + /* Parse response */ +- response = xmlRecoverMemory (action->msg->response_body->data, +- action->msg->response_body->length); ++ response = xmlReadMemory (action->msg->response_body->data, ++ action->msg->response_body->length, ++ NULL, ++ NULL, ++ XML_PARSE_NONET | XML_PARSE_RECOVER); + + if (!response) { + if (action->msg->status_code == SOUP_STATUS_OK) { +diff --git a/libgupnp/gupnp-service-proxy.c b/libgupnp/gupnp-service-proxy.c +index 5dd1bfc..eed9882 100644 +--- a/libgupnp/gupnp-service-proxy.c ++++ b/libgupnp/gupnp-service-proxy.c +@@ -1561,8 +1561,11 @@ server_handler (G_GNUC_UNUSED SoupServer *soup_server, + } + + /* Parse the actual XML message content */ +- doc = xmlRecoverMemory (msg->request_body->data, +- msg->request_body->length); ++ doc = xmlReadMemory (msg->request_body->data, ++ msg->request_body->length, ++ NULL, ++ NULL, ++ XML_PARSE_NONET | XML_PARSE_RECOVER); + if (doc == NULL) { + /* Failed */ + g_warning ("Failed to parse NOTIFY message body"); +diff --git a/libgupnp/gupnp-service.c b/libgupnp/gupnp-service.c +index 2794ebc..e82daaa 100644 +--- a/libgupnp/gupnp-service.c ++++ b/libgupnp/gupnp-service.c +@@ -1002,8 +1002,11 @@ control_server_handler (SoupServer *server, + *end = '\0'; + + /* Parse action_node */ +- doc = xmlRecoverMemory (msg->request_body->data, +- msg->request_body->length); ++ doc = xmlReadMemory (msg->request_body->data, ++ msg->request_body->length, ++ NULL, ++ NULL, ++ XML_PARSE_NONET | XML_PARSE_RECOVER); + if (doc == NULL) { + soup_message_set_status (msg, SOUP_STATUS_BAD_REQUEST); + +-- +2.39.2 + diff --git a/package/gupnp/gupnp.hash b/package/gupnp/gupnp.hash index cc5e2b5775e..823dbd7927e 100644 --- a/package/gupnp/gupnp.hash +++ b/package/gupnp/gupnp.hash @@ -1,4 +1,4 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp/1.4/gupnp-1.4.3.sha256sum: +# Hash from: https://download.gnome.org/sources/gupnp/1.4/gupnp-1.4.3.sha256sum: sha256 14eda777934da2df743d072489933bd9811332b7b5bf41626b8032efb28b33ba gupnp-1.4.3.tar.xz # Hash for license file: diff --git a/package/gupnp/gupnp.mk b/package/gupnp/gupnp.mk index dca747f0645..f41f26d2dd3 100644 --- a/package/gupnp/gupnp.mk +++ b/package/gupnp/gupnp.mk @@ -7,7 +7,7 @@ GUPNP_VERSION_MAJOR = 1.4 GUPNP_VERSION = $(GUPNP_VERSION_MAJOR).3 GUPNP_SOURCE = gupnp-$(GUPNP_VERSION).tar.xz -GUPNP_SITE = http://ftp.gnome.org/pub/gnome/sources/gupnp/$(GUPNP_VERSION_MAJOR) +GUPNP_SITE = https://download.gnome.org/sources/gupnp/$(GUPNP_VERSION_MAJOR) GUPNP_LICENSE = LGPL-2.1+ GUPNP_LICENSE_FILES = COPYING GUPNP_CPE_ID_VENDOR = gnome diff --git a/package/gvfs/gvfs.hash b/package/gvfs/gvfs.hash index f4a5364f1f2..fc068ddb949 100644 --- a/package/gvfs/gvfs.hash +++ b/package/gvfs/gvfs.hash @@ -1,4 +1,4 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/gvfs/1.48/gvfs-1.48.1.sha256sum +# From https://download.gnome.org/sources/gvfs/1.48/gvfs-1.48.1.sha256sum sha256 b2ea4f271aad2711f16b43c03151e2ec5a9874ff1a21142ef6d6406486a19dc2 gvfs-1.48.1.tar.xz # Hash for license file diff --git a/package/gvfs/gvfs.mk b/package/gvfs/gvfs.mk index 41745924557..50efed1abbf 100644 --- a/package/gvfs/gvfs.mk +++ b/package/gvfs/gvfs.mk @@ -7,7 +7,7 @@ GVFS_VERSION_MAJOR = 1.48 GVFS_VERSION = $(GVFS_VERSION_MAJOR).1 GVFS_SOURCE = gvfs-$(GVFS_VERSION).tar.xz -GVFS_SITE = http://ftp.gnome.org/pub/GNOME/sources/gvfs/$(GVFS_VERSION_MAJOR) +GVFS_SITE = https://download.gnome.org/sources/gvfs/$(GVFS_VERSION_MAJOR) GVFS_INSTALL_STAGING = YES GVFS_DEPENDENCIES = \ host-pkgconf \ diff --git a/package/gzip/gzip.hash b/package/gzip/gzip.hash index 1cf73ff9120..80b86f4797e 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.11.tar.xz.sig +# https://ftp.gnu.org/gnu/gzip/gzip-1.12.tar.xz.sig # using key 155D3FC500C834486D1EEA677FD9FCCB000BEEEE -sha256 9b9a95d68fdcb936849a4d6fada8bf8686cddf58b9b26c9c4289ed0c92a77907 gzip-1.11.tar.xz +sha256 ce5e03e519f637e1f814011ace35c4f87b33c0bbabeec35baf5fbd3479e91956 gzip-1.12.tar.xz # Locally calculated sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/gzip/gzip.mk b/package/gzip/gzip.mk index 92588fcdb8e..2092df363c7 100644 --- a/package/gzip/gzip.mk +++ b/package/gzip/gzip.mk @@ -4,7 +4,7 @@ # ################################################################################ -GZIP_VERSION = 1.11 +GZIP_VERSION = 1.12 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/hackrf/0001-Don-t-require-a-C-compiler.patch b/package/hackrf/0001-Don-t-require-a-C-compiler.patch deleted file mode 100644 index 3369dca670c..00000000000 --- a/package/hackrf/0001-Don-t-require-a-C-compiler.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 8b0a8b2be8cf2e4a76c03d3bcdf99bff5025ba22 Mon Sep 17 00:00:00 2001 -From: "Arnout Vandecappelle (Essensium/Mind)" -Date: Sat, 31 Mar 2018 22:50:37 +0200 -Subject: [PATCH] Don't require a C++ compiler - -By default, CMake assumes that the project is using both C and C++. By -explicitly passing 'C' as argument of the project() macro, we tell CMake -that only C is used, which prevents CMake from erroring out if a C++ -compiler doesn't exist. - -Upstream status: https://github.com/mossmann/hackrf/pull/469 - -This patch differs from upstream because: -- project name upstream has been changed into HackRF; -- in Buildroot, we are only interested in host, not firmware. - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - host/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt -index 874163f..d9cbe31 100644 ---- a/host/CMakeLists.txt -+++ b/host/CMakeLists.txt -@@ -1,7 +1,7 @@ - #top dir cmake project for libhackrf + tools - - cmake_minimum_required(VERSION 2.8) --project (hackrf_all) -+project (hackrf_all C) - - add_subdirectory(libhackrf) - add_subdirectory(hackrf-tools) --- -2.16.3 - diff --git a/package/hackrf/Config.in b/package/hackrf/Config.in index 05d01adc963..d5df328dfa5 100644 --- a/package/hackrf/Config.in +++ b/package/hackrf/Config.in @@ -9,7 +9,7 @@ config BR2_PACKAGE_HACKRF help Library and tools for accessing HackRF SDR boards. - https://github.com/mossmann/hackrf/tree/master/host + https://hackrf.readthedocs.io comment "hackrf needs a toolchain w/ threads, dynamic library, gcc >= 4.9" depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || \ diff --git a/package/hackrf/hackrf.hash b/package/hackrf/hackrf.hash index c0cf7322134..16ccb9dcfb2 100644 --- a/package/hackrf/hackrf.hash +++ b/package/hackrf/hackrf.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a89badc09a1d2fa18367b3b2c974580ad5f6ce93aaa4e54557dc3d013c029d14 hackrf-2018.01.1.tar.xz +sha256 bacd4e7937467ffa14654624444c8b5c716ab470d8c1ee8d220d2094ae2adb3e hackrf-2022.09.1.tar.xz sha256 49b60a6288f90f49074228cc1fae0fb16871ba36b756013abdf7c2fc92f01fad COPYING diff --git a/package/hackrf/hackrf.mk b/package/hackrf/hackrf.mk index d80f87e6b96..4317da60bc8 100644 --- a/package/hackrf/hackrf.mk +++ b/package/hackrf/hackrf.mk @@ -4,8 +4,8 @@ # ################################################################################ -HACKRF_VERSION = 2018.01.1 -HACKRF_SITE = https://github.com/mossmann/hackrf/releases/download/v$(HACKRF_VERSION) +HACKRF_VERSION = 2022.09.1 +HACKRF_SITE = https://github.com/greatscottgadgets/hackrf/releases/download/v$(HACKRF_VERSION) HACKRF_SOURCE = hackrf-$(HACKRF_VERSION).tar.xz HACKRF_LICENSE = GPL-2.0+, BSD-3-Clause HACKRF_LICENSE_FILES = COPYING @@ -13,8 +13,6 @@ HACKRF_DEPENDENCIES = fftw-single libusb HACKRF_SUBDIR = host HACKRF_INSTALL_STAGING = YES -HACKRF_CONF_OPTS += -DBUILD_HACKRF_TOOLS=ON - ifeq ($(BR2_PACKAGE_HAS_UDEV),y) HACKRF_CONF_OPTS += \ -DINSTALL_UDEV_RULES=ON \ diff --git a/package/hans/hans.hash b/package/hans/hans.hash index fe46ab58892..a1f591eb1c5 100644 --- a/package/hans/hans.hash +++ b/package/hans/hans.hash @@ -1,6 +1,6 @@ # From http://sourceforge.net/projects/hanstunnel/files/source/ -md5 8628393ec1b61a6c3a47a0a3dcb455b3 hans-1.0.tar.gz -sha1 0bc857df109af222732cb95c861a0f0a6dd53dee hans-1.0.tar.gz +md5 d23fbaeb990ed7d05695fcc8f8ef7847 hans-1.1.tar.gz +sha1 15dd4b717e8808d9279af970d4826aad826bc849 hans-1.1.tar.gz # Locally computed -sha256 f8f70cf22ba14d9223695c9e9a2d75289d8360f61f533b83ee538836f29a458e hans-1.0.tar.gz +sha256 966962d8734ab6b4d871e035d08f45256025a5220216bd48e41fa7fd0ad136c5 hans-1.1.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE diff --git a/package/hans/hans.mk b/package/hans/hans.mk index e26c2f37f88..6d2b1dabe5f 100644 --- a/package/hans/hans.mk +++ b/package/hans/hans.mk @@ -4,7 +4,7 @@ # ################################################################################ -HANS_VERSION = 1.0 +HANS_VERSION = 1.1 HANS_SITE = http://downloads.sourceforge.net/project/hanstunnel/source HANS_LICENSE = GPL-3.0+ HANS_LICENSE_FILES = LICENSE diff --git a/package/haproxy/0001-BUILD-atomic-atomic.h-may-need-compiler.h-on-ARMv8.2.patch b/package/haproxy/0001-BUILD-atomic-atomic.h-may-need-compiler.h-on-ARMv8.2.patch new file mode 100644 index 00000000000..b3b1f732abc --- /dev/null +++ b/package/haproxy/0001-BUILD-atomic-atomic.h-may-need-compiler.h-on-ARMv8.2.patch @@ -0,0 +1,36 @@ +From 5ab3c61932af7619518169da744ba6346f060405 Mon Sep 17 00:00:00 2001 +From: Willy Tarreau +Date: Thu, 8 Dec 2022 08:32:57 +0100 +Subject: [PATCH] BUILD: atomic: atomic.h may need compiler.h on ARMv8.2-a + +We get a build error in ncbuf.c when building for ARMv8.2-a because ncbuf +has minimal includes and among them bug.h which includes atomic.h. Atomic.h +may use "forceinline" without including compiler.h, hence the build error. +It was verified that adding it doesn't inflate the total headers. + +Since all other C files include api.h which already covers this, there's +no real need to bapkport this. The issue was already there in 2.3 though. + +Upstream: https://git.haproxy.org/?p=haproxy.git;a=commitdiff;h=5ab3c61932af7619518169da744ba6346f060405#patch1 + +Signed-off-by: Bernd Kuhls +--- + include/haproxy/atomic.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/include/haproxy/atomic.h b/include/haproxy/atomic.h +index f60be95..7e3c826 100644 +--- a/include/haproxy/atomic.h ++++ b/include/haproxy/atomic.h +@@ -23,6 +23,8 @@ + #ifndef _HAPROXY_ATOMIC_H + #define _HAPROXY_ATOMIC_H + ++#include ++ + /* A few notes for the macros and functions here: + * - this file is painful to edit, most operations exist in 3 variants, + * no-thread, threads with gcc<4.7, threads with gcc>=4.7. Be careful when +-- +1.7.10.4 + diff --git a/package/haproxy/haproxy.hash b/package/haproxy/haproxy.hash index e3120b521fd..74390c2ff5e 100644 --- a/package/haproxy/haproxy.hash +++ b/package/haproxy/haproxy.hash @@ -1,5 +1,5 @@ -# From: http://www.haproxy.org/download/2.4/src/haproxy-2.4.13.tar.gz.sha256 -sha256 4788fe975fe7e521746f826c25e80bc95cd15983e2bafa33e43bff23a3fe5ba1 haproxy-2.4.13.tar.gz +# From: http://www.haproxy.org/download/2.6/src/haproxy-2.6.15.tar.gz.sha256 +sha256 41f8e1695e92fafdffe39690a68993f1a0f5f7f06931a99e9a153f749ea39cfd haproxy-2.6.15.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 83d9cfee370..63a92090f3d 100644 --- a/package/haproxy/haproxy.mk +++ b/package/haproxy/haproxy.mk @@ -4,8 +4,8 @@ # ################################################################################ -HAPROXY_VERSION_MAJOR = 2.4 -HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).13 +HAPROXY_VERSION_MAJOR = 2.6 +HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).15 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/0001-meson.build-check-for-pthread.h.patch b/package/harfbuzz/0001-meson.build-check-for-pthread.h.patch index 9fa09863c63..102f9ff493d 100644 --- a/package/harfbuzz/0001-meson.build-check-for-pthread.h.patch +++ b/package/harfbuzz/0001-meson.build-check-for-pthread.h.patch @@ -26,7 +26,7 @@ diff --git a/meson.build b/meson.build index bf3925db..6d263d48 100644 --- a/meson.build +++ b/meson.build -@@ -281,7 +281,9 @@ endif +@@ -270,7 +270,9 @@ endif # threads thread_dep = null_dep if host_machine.system() != 'windows' diff --git a/package/harfbuzz/harfbuzz.hash b/package/harfbuzz/harfbuzz.hash index 61f28655638..9489f25c6a5 100644 --- a/package/harfbuzz/harfbuzz.hash +++ b/package/harfbuzz/harfbuzz.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1c13bca136c4f66658059853e2c1253f34c88f4b5c5aba6050aba7b5e0ce2503 harfbuzz-3.3.2.tar.xz +sha256 4a6ce097b75a8121facc4ba83b5b083bfec657f45b003cd5a3424f2ae6b4434d harfbuzz-5.3.1.tar.xz sha256 4345e1735f8bc6d812fed5180cabb5a5e88a4109d332652f2a45c13cfa5ee692 COPYING diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk index 1f5dfa88223..b0112168e1b 100644 --- a/package/harfbuzz/harfbuzz.mk +++ b/package/harfbuzz/harfbuzz.mk @@ -4,7 +4,7 @@ # ################################################################################ -HARFBUZZ_VERSION = 3.3.2 +HARFBUZZ_VERSION = 5.3.1 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 8c62ead7c3a..61bf6cc9a16 100644 --- a/package/haveged/haveged.hash +++ b/package/haveged/haveged.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f882919ccead07ad6687a4784c0c501e617321e96dd0118403464969359cf6ad haveged-1.9.15.tar.gz +sha256 b835fa02b52ee7d06276e028571cadcb14d08f5e5a4b5767adf81451f70561c7 haveged-1.9.18.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/haveged/haveged.mk b/package/haveged/haveged.mk index 7035142aee0..fbf72a96ad7 100644 --- a/package/haveged/haveged.mk +++ b/package/haveged/haveged.mk @@ -4,7 +4,7 @@ # ################################################################################ -HAVEGED_VERSION = 1.9.15 +HAVEGED_VERSION = 1.9.18 HAVEGED_SITE = $(call github,jirka-h,haveged,v$(HAVEGED_VERSION)) HAVEGED_LICENSE = GPL-3.0+ HAVEGED_LICENSE_FILES = COPYING diff --git a/package/hawktracer/Config.in b/package/hawktracer/Config.in new file mode 100644 index 00000000000..bee9c27b7de --- /dev/null +++ b/package/hawktracer/Config.in @@ -0,0 +1,25 @@ +config BR2_PACKAGE_HAWKTRACER + bool "hawktracer" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + help + HawkTracer is a highly portable, low-overhead, configurable + profiling tool built in Amazon Video for getting performance + metrics from low-end devices. + + https://hawktracer.github.io/ + +if BR2_PACKAGE_HAWKTRACER + +config BR2_PACKAGE_HAWKTRACER_TCP_LISTENER + bool "TCP listener" + default y + depends on BR2_TOOLCHAIN_HAS_THREADS + +comment "TCP listener needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS + +endif + +comment "hawktracer needs a toolchain w/ C++, gcc >= 4.8" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/package/hawktracer/hawktracer.hash b/package/hawktracer/hawktracer.hash new file mode 100644 index 00000000000..29d00e29ecc --- /dev/null +++ b/package/hawktracer/hawktracer.hash @@ -0,0 +1,3 @@ +# Computed locally +sha256 099f76d5be18ad5d714fded0c6f889f588986cdde2b31f2c0058413698a5f35c hawktracer-3c22b3908912e2ec727fd2ddc5dbfe7464e6b4a5.tar.gz +sha256 2f377333e64ad08ad3afec8ed6c2c96ced2a6d7d67443eb2784a931bb7b3fd59 LICENSE diff --git a/package/hawktracer/hawktracer.mk b/package/hawktracer/hawktracer.mk new file mode 100644 index 00000000000..462d0737552 --- /dev/null +++ b/package/hawktracer/hawktracer.mk @@ -0,0 +1,48 @@ +################################################################################ +# +# hawktracer +# +################################################################################ + +HAWKTRACER_VERSION = 3c22b3908912e2ec727fd2ddc5dbfe7464e6b4a5 +HAWKTRACER_SITE = $(call github,amzn,hawktracer,$(HAWKTRACER_VERSION)) +HAWKTRACER_LICENSE = MIT +HAWKTRACER_LICENSE_FILES = LICENSE +HAWKTRACER_INSTALL_STAGING = YES + +HAWKTRACER_CONF_OPTS = \ + -DENABLE_ASAN=OFF \ + -DENABLE_TESTS=OFF \ + -DENABLE_CODE_COVERAGE=OFF \ + -DENABLE_BENCHMARKS=OFF \ + -DENABLE_DOC=OFF \ + -DENABLE_PYTHON_BINDINGS=OFF \ + -DENABLE_MAINTAINER_MODE=OFF \ + -DENABLE_RELEASE_MODE=OFF \ + -DENABLE_CLIENT=OFF \ + -DENABLE_EXAMPLES=OFF + +ifeq ($(BR2_STATIC_LIBS),y) +HAWKTRACER_CONF_OPTS += -DBUILD_STATIC_LIB=ON +else +HAWKTRACER_CONF_OPTS += -DBUILD_STATIC_LIB=OFF +endif + +ifeq ($(BR2_PACKAGE_HAWKTRACER_TCP_LISTENER),y) +HAWKTRACER_CONF_OPTS += -DENABLE_TCP_LISTENER=ON +else +HAWKTRACER_CONF_OPTS += -DENABLE_TCP_LISTENER=OFF +endif + +# Enable threads support if supported by toolchain +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +HAWKTRACER_CONF_OPTS += \ + -DENABLE_CPU_USAGE_FEATURE=ON \ + -DENABLE_THREADS=ON +else +HAWKTRACER_CONF_OPTS += \ + -DENABLE_CPU_USAGE_FEATURE=OFF \ + -DENABLE_THREADS=OFF +endif + +$(eval $(cmake-package)) diff --git a/package/hddtemp/Config.in b/package/hddtemp/Config.in new file mode 100644 index 00000000000..0e022524614 --- /dev/null +++ b/package/hddtemp/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_HDDTEMP + bool "hddtemp" + depends on BR2_USE_MMU # fork() + depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_LIBEXECINFO if !BR2_TOOLCHAIN_USES_GLIBC + select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE + help + hddtemp is a small utility that gives you the temperature of + your hard drive by reading S.M.A.R.T. informations, for drives + that support this feature. + + https://github.com/vitlav/hddtemp + http://www.guzu.net/linux/hddtemp.php + +comment "hddtemp needs dynamic library" + depends on BR2_USE_MMU + depends on BR2_STATIC_LIBS diff --git a/package/hddtemp/hddtemp.hash b/package/hddtemp/hddtemp.hash new file mode 100644 index 00000000000..cd82d7f89b8 --- /dev/null +++ b/package/hddtemp/hddtemp.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 592322c64f0d5f035132249e3d051b752f5d24867514522a17285d5e72d21075 hddtemp-0.4.3.tar.gz +sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 GPL-2 diff --git a/package/hddtemp/hddtemp.mk b/package/hddtemp/hddtemp.mk new file mode 100644 index 00000000000..4f45647dffa --- /dev/null +++ b/package/hddtemp/hddtemp.mk @@ -0,0 +1,36 @@ +################################################################################ +# +# hddtemp +# +################################################################################ + +HDDTEMP_VERSION = 0.4.3 +HDDTEMP_SITE = $(call github,vitlav,hddtemp,v$(HDDTEMP_VERSION)) +HDDTEMP_LICENSE = GPLv2 +HDDTEMP_LICENSE_FILES = GPL-2 + +# Fetched from Github with no configure script +HDDTEMP_AUTORECONF = YES +HDDTEMP_GETTEXTIZE = YES + +HDDTEMP_DB_PATH = /usr/share/misc/hddtemp.db +HDDTEMP_CONF_OPTS = --with-db-path=$(HDDTEMP_DB_PATH) +HDDTEMP_CONF_ENV = LIBS="$(HDDTEMP_LIBS) $(TARGET_NLS_LIBS)" +HDDTEMP_DEPENDENCIES += $(TARGET_NLS_DEPENDENCIES) + +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +HDDTEMP_DEPENDENCIES += libexecinfo +HDDTEMP_LIBS += -lexecinfo +endif + +ifeq ($(BR2_PACKAGE_LIBICONV),y) +HDDTEMP_DEPENDENCIES += libiconv +HDDTEMP_LIBS += -liconv +endif + +define HDDTEMP_INSTALL_HDDTEMP_DB + $(INSTALL) -D $(@D)/data/hddtemp.db $(TARGET_DIR)$(HDDTEMP_DB_PATH) +endef +HDDTEMP_POST_INSTALL_TARGET_HOOKS += HDDTEMP_INSTALL_HDDTEMP_DB + +$(eval $(autotools-package)) diff --git a/package/hdparm/hdparm.hash b/package/hdparm/hdparm.hash index c039481f773..1d735852325 100644 --- a/package/hdparm/hdparm.hash +++ b/package/hdparm/hdparm.hash @@ -1,5 +1,5 @@ # From https://sourceforge.net/projects/hdparm/files/hdparm/ -sha1 c8e24233b4d29506907ad2bf0725f793106c3a78 hdparm-9.63.tar.gz +sha1 3bc0916493f2f485c6371ec0fd16418d0e1fa636 hdparm-9.65.tar.gz # Locally computed -sha256 2c0f9d75cdbeda928a25a128cd3d0b7120445ec0910c0b29d4c1038ed1be777f hdparm-9.62.tar.gz +sha256 d14929f910d060932e717e9382425d47c2e7144235a53713d55a94f7de535a4b hdparm-9.65.tar.gz sha256 eae572b06d2733f5c65fbe81680ce2b8a109afee2bdd1a161343c772af0e82e1 LICENSE.TXT diff --git a/package/hdparm/hdparm.mk b/package/hdparm/hdparm.mk index 2c3b372deb2..3c8b77e5eb9 100644 --- a/package/hdparm/hdparm.mk +++ b/package/hdparm/hdparm.mk @@ -4,7 +4,7 @@ # ################################################################################ -HDPARM_VERSION = 9.63 +HDPARM_VERSION = 9.65 HDPARM_SITE = https://downloads.sourceforge.net/project/hdparm/hdparm HDPARM_LICENSE = BSD-Style HDPARM_LICENSE_FILES = LICENSE.TXT diff --git a/package/heimdal/0001-Use-perl-module-JSON-PP-part-of-core-instead-of-JSON.patch b/package/heimdal/0001-Use-perl-module-JSON-PP-part-of-core-instead-of-JSON.patch new file mode 100644 index 00000000000..7323ac70df0 --- /dev/null +++ b/package/heimdal/0001-Use-perl-module-JSON-PP-part-of-core-instead-of-JSON.patch @@ -0,0 +1,57 @@ +From f6fdb0a28e3bfcb3fd0aa1c81ad59c5411c0d660 Mon Sep 17 00:00:00 2001 +From: Andrew Sim +Date: Sat, 10 Jun 2023 09:00:24 +0200 +Subject: [PATCH] Use perl module JSON:PP, part of core, instead of JSON + package + +This patch removes the need for an external package. + +Ported from +https://github.com/openwrt/packages/blob/master/net/samba4/patches/105-perl-json-pp.patch +https://github.com/openwrt/packages/commit/402f4ba4eff65b80a9deaa6085256112bec4d67b#diff-208d4e0345c9d29fbec23d6f655ba794afd3052f5cb8dd73944db72ce81b847b + +Upstream: https://github.com/heimdal/heimdal/pull/1176 + +Signed-off-by: Bernd Kuhls +--- + cf/make-proto.pl | 4 ++-- + configure.ac | 1 - + 2 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/cf/make-proto.pl b/cf/make-proto.pl +index 36a040ce6..4af21916b 100644 +--- a/cf/make-proto.pl ++++ b/cf/make-proto.pl +@@ -4,7 +4,7 @@ + use Getopt::Std; + use File::Compare; + +-use JSON; ++use JSON::PP + + my $comment = 0; + my $doxygen = 0; +@@ -70,7 +70,7 @@ if($opt_x) { + my $EXP; + local $/; + open(EXP, '<', $opt_x) || die "open ${opt_x}"; +- my $obj = JSON->new->utf8->decode(); ++ my $obj = JSON::PP->new->utf8->decode(); + close $EXP; + + foreach my $x (keys %$obj) { +diff --git a/configure.ac b/configure.ac +index cedb4c01f..cecd030e6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -56,7 +56,6 @@ if ! test -f "$srcdir/lib/asn1/der-protos.h" || + AC_KRB_PROG_PERL + AC_KRB_PERL_MOD(Getopt::Std) + AC_KRB_PERL_MOD(File::Compare) +- AC_KRB_PERL_MOD(JSON) + fi + + AC_KRB_PROG_YACC +-- +2.39.2 + diff --git a/package/heimdal/heimdal.hash b/package/heimdal/heimdal.hash index 07502338584..250ddbbd4db 100644 --- a/package/heimdal/heimdal.hash +++ b/package/heimdal/heimdal.hash @@ -1,5 +1,3 @@ -# From https://github.com/heimdal/heimdal/releases -sha1 5dd16703be7255f66a4d65440f0c622aeeca60d9 heimdal-7.7.0.tar.gz -sha256 f02d3314d634cc55eb9cf04a1eae0d96b293e45a1f837de9d894e800161b7d1b heimdal-7.7.0.tar.gz # Locally computed -sha256 0c4b07bf5b98f7a1d01f8e60722d6c6747ef052c2aa6d2043daf690d4e1b0a7f LICENSE +sha256 2576c5e2d793db53c86e108fd117b278437bb02d6c6db2bec4d1b86958f1980a heimdal-f4faaeaba371fff3f8d1bc14389f5e6d70ca8e17.tar.gz +sha256 0c4b07bf5b98f7a1d01f8e60722d6c6747ef052c2aa6d2043daf690d4e1b0a7f LICENSE diff --git a/package/heimdal/heimdal.mk b/package/heimdal/heimdal.mk index ce509c7afa0..59b64c358b1 100644 --- a/package/heimdal/heimdal.mk +++ b/package/heimdal/heimdal.mk @@ -4,11 +4,11 @@ # ################################################################################ -HEIMDAL_VERSION = 7.7.0 -HEIMDAL_SITE = https://github.com/heimdal/heimdal/releases/download/heimdal-$(HEIMDAL_VERSION) +HEIMDAL_VERSION = f4faaeaba371fff3f8d1bc14389f5e6d70ca8e17 +HEIMDAL_SITE = $(call github,heimdal,heimdal,$(HEIMDAL_VERSION)) HOST_HEIMDAL_DEPENDENCIES = host-e2fsprogs host-ncurses host-pkgconf +HOST_HEIMDAL_AUTORECONF = YES HEIMDAL_INSTALL_STAGING = YES -HEIMDAL_MAKE = $(MAKE1) # static because of -fPIC issues with e2fsprogs on x86_64 host HOST_HEIMDAL_CONF_OPTS = \ --disable-shared \ @@ -40,14 +40,7 @@ define HOST_HEIMDAL_INSTALL_COMPILE_ET $(HOST_DIR)/bin/compile_et endef -# We need asn1_compile in the PATH for samba4 -define HOST_HEIMDAL_MAKE_SYMLINK - ln -sf $(HOST_DIR)/libexec/heimdal/asn1_compile \ - $(HOST_DIR)/bin/asn1_compile -endef - HOST_HEIMDAL_POST_INSTALL_HOOKS += \ - HOST_HEIMDAL_INSTALL_COMPILE_ET \ - HOST_HEIMDAL_MAKE_SYMLINK + HOST_HEIMDAL_INSTALL_COMPILE_ET $(eval $(host-autotools-package)) diff --git a/package/heirloom-mailx/0001-Patched-out-SSL2-support-since-it-is-no-longer-suppo.patch b/package/heirloom-mailx/0001-Patched-out-SSL2-support-since-it-is-no-longer-suppo.patch deleted file mode 100644 index db5b19ee520..00000000000 --- a/package/heirloom-mailx/0001-Patched-out-SSL2-support-since-it-is-no-longer-suppo.patch +++ /dev/null @@ -1,42 +0,0 @@ -From: Hilko Bengen -Date: Wed, 27 Apr 2011 00:18:42 +0200 -Subject: Patched out SSL2 support since it is no longer supported by OpenSSL. - -Now that openssl has dropped SSLv2 support we need to patch it out. -Patch picked up from debian patchseries 5. - -Signed-off-by: Gustavo Zacarias - ---- - mailx.1 | 2 +- - openssl.c | 4 +--- - 2 files changed, 2 insertions(+), 4 deletions(-) - -diff --git a/mailx.1 b/mailx.1 -index 417ea04..a02e430 100644 ---- a/mailx.1 -+++ b/mailx.1 -@@ -3575,7 +3575,7 @@ Only applicable if SSL/TLS support is built using OpenSSL. - .TP - .B ssl-method - Selects a SSL/TLS protocol version; --valid values are `ssl2', `ssl3', and `tls1'. -+valid values are `ssl3', and `tls1'. - If unset, the method is selected automatically, - if possible. - .TP -diff --git a/openssl.c b/openssl.c -index b4e33fc..44fe4e5 100644 ---- a/openssl.c -+++ b/openssl.c -@@ -216,9 +216,7 @@ ssl_select_method(const char *uhp) - - cp = ssl_method_string(uhp); - if (cp != NULL) { -- if (equal(cp, "ssl2")) -- method = SSLv2_client_method(); -- else if (equal(cp, "ssl3")) -+ if (equal(cp, "ssl3")) - method = SSLv3_client_method(); - else if (equal(cp, "tls1")) - method = TLSv1_client_method(); diff --git a/package/heirloom-mailx/0002-fix-libressl-support.patch b/package/heirloom-mailx/0001-fix-libressl-support.patch similarity index 100% rename from package/heirloom-mailx/0002-fix-libressl-support.patch rename to package/heirloom-mailx/0001-fix-libressl-support.patch diff --git a/package/heirloom-mailx/heirloom-mailx.hash b/package/heirloom-mailx/heirloom-mailx.hash index 1f59f7349d8..c42f9b6de75 100644 --- a/package/heirloom-mailx/heirloom-mailx.hash +++ b/package/heirloom-mailx/heirloom-mailx.hash @@ -1,4 +1,5 @@ -# From http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/h/heirloom-mailx/heirloom-mailx_12.5-3.dsc -sha256 015ba4209135867f37a0245d22235a392b8bbed956913286b887c2e2a9a421ad heirloom-mailx_12.5.orig.tar.gz +# From http://snapshot.debian.org/archive/debian/20150815T155609Z/pool/main/h/heirloom-mailx/heirloom-mailx_12.5-5.dsc +sha256 015ba4209135867f37a0245d22235a392b8bbed956913286b887c2e2a9a421ad heirloom-mailx_12.5.orig.tar.gz +sha256 0140cef831f966cf65a0a6ba2ed4eef4f2bfb402b7b18db7307bc42e63328ce6 heirloom-mailx_12.5-5.debian.tar.xz # Locally computed sha256 5ddc00aed98a0cf75fc7edfd9f3aeb1e919ae0ad5e9ff55d61f643d62d802b07 COPYING diff --git a/package/heirloom-mailx/heirloom-mailx.mk b/package/heirloom-mailx/heirloom-mailx.mk index e851e1dfcc2..063fccf5eb1 100644 --- a/package/heirloom-mailx/heirloom-mailx.mk +++ b/package/heirloom-mailx/heirloom-mailx.mk @@ -6,11 +6,16 @@ HEIRLOOM_MAILX_VERSION = 12.5 HEIRLOOM_MAILX_SOURCE = heirloom-mailx_$(HEIRLOOM_MAILX_VERSION).orig.tar.gz -HEIRLOOM_MAILX_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/h/heirloom-mailx +HEIRLOOM_MAILX_SITE = http://snapshot.debian.org/archive/debian/20150815T155609Z/pool/main/h/heirloom-mailx +HEIRLOOM_MAILX_PATCH = heirloom-mailx_$(HEIRLOOM_MAILX_VERSION)-5.debian.tar.xz HEIRLOOM_MAILX_LICENSE = BSD-4-Clause, Bellcore (base64), OpenVision (imap_gssapi), RSA Data Security (md5), Network Working Group (hmac), MPL-1.1 (nss) HEIRLOOM_MAILX_LICENSE_FILES = COPYING HEIRLOOM_MAILX_CPE_ID_VENDOR = heirloom HEIRLOOM_MAILX_CPE_ID_PRODUCT = mailx +# 0011-outof-Introduce-expandaddr-flag.patch in the Debian patches +HEIRLOOM_MAILX_IGNORE_CVES += CVE-2014-7844 +# 0014-globname-Invoke-wordexp-with-WRDE_NOCMD.patch in the Debian patches +HEIRLOOM_MAILX_IGNORE_CVES += CVE-2004-2771 ifeq ($(BR2_PACKAGE_OPENSSL),y) HEIRLOOM_MAILX_DEPENDENCIES += openssl diff --git a/package/hiawatha/hiawatha.hash b/package/hiawatha/hiawatha.hash index b06dc2e661a..1ee94ee69a4 100644 --- a/package/hiawatha/hiawatha.hash +++ b/package/hiawatha/hiawatha.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d21722986f64163e30a560283123cdf4d6cb5ff8188ab754387b26724565268d hiawatha-11.1.tar.gz +sha256 99c64f76927f93469f062ab76b74eb79a397ea4be12da86bf746b2bb57cf1bc5 hiawatha-11.2.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE diff --git a/package/hiawatha/hiawatha.mk b/package/hiawatha/hiawatha.mk index 25da98a43c8..2ba8efb2fed 100644 --- a/package/hiawatha/hiawatha.mk +++ b/package/hiawatha/hiawatha.mk @@ -4,7 +4,7 @@ # ################################################################################ -HIAWATHA_VERSION = 11.1 +HIAWATHA_VERSION = 11.2 HIAWATHA_SITE = https://www.hiawatha-webserver.org/files HIAWATHA_DEPENDENCIES = zlib HIAWATHA_LICENSE = GPL-2.0 diff --git a/package/highway/0001-Check-for-the-presence-of-sys-auxv.h.patch b/package/highway/0001-Check-for-the-presence-of-sys-auxv.h.patch new file mode 100644 index 00000000000..df867986135 --- /dev/null +++ b/package/highway/0001-Check-for-the-presence-of-sys-auxv.h.patch @@ -0,0 +1,62 @@ +From 491e3b1c2b8c44a2cfd35db117b02ef0fdf6a8e5 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Wed, 23 Nov 2022 23:27:11 +0100 +Subject: [PATCH] Check for the presence of + +Not all gcc versions are providing . Checking for +HWY_ARCH_ARM && HWY_COMPILER_GCC_ACTUAL && HWY_OS_LINUX is not +sufficient and fail to build in some situations (it was observed for +some gcc armv7m toolchains). + +This patch adds a check for and include it only if present. + +Signed-off-by: Julien Olivain +--- + CMakeLists.txt | 3 +++ + hwy/detect_targets.h | 2 +- + hwy/targets.cc | 2 +- + 3 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b6b14ab..df6b5ab 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -84,6 +84,9 @@ check_cxx_source_compiles( + HWY_RISCV + ) + ++include(CheckIncludeFile) ++check_include_file(sys/auxv.h HAVE_SYS_AUXV_H) ++ + if (HWY_ENABLE_CONTRIB) + # Glob all the traits so we don't need to modify this file when adding + # additional special cases. +diff --git a/hwy/detect_targets.h b/hwy/detect_targets.h +index 7f7e179..f0c6f94 100644 +--- a/hwy/detect_targets.h ++++ b/hwy/detect_targets.h +@@ -392,7 +392,7 @@ + #define HWY_HAVE_RUNTIME_DISPATCH 1 + // On Arm, currently only GCC does, and we require Linux to detect CPU + // capabilities. +-#elif HWY_ARCH_ARM && HWY_COMPILER_GCC_ACTUAL && HWY_OS_LINUX ++#elif HWY_ARCH_ARM && HWY_COMPILER_GCC_ACTUAL && HWY_OS_LINUX && HAVE_SYS_AUXV_H + #define HWY_HAVE_RUNTIME_DISPATCH 1 + #else + #define HWY_HAVE_RUNTIME_DISPATCH 0 +diff --git a/hwy/targets.cc b/hwy/targets.cc +index 2fde4db..abd6a94 100644 +--- a/hwy/targets.cc ++++ b/hwy/targets.cc +@@ -42,7 +42,7 @@ + #include + #endif // HWY_COMPILER_MSVC + +-#elif HWY_ARCH_ARM && HWY_OS_LINUX ++#elif HWY_ARCH_ARM && HWY_OS_LINUX && HAVE_SYS_AUXV_H + #include + #include + #endif // HWY_ARCH_* +-- +2.38.1 + diff --git a/package/highway/Config.in b/package/highway/Config.in new file mode 100644 index 00000000000..f4cef30e017 --- /dev/null +++ b/package/highway/Config.in @@ -0,0 +1,34 @@ +config BR2_PACKAGE_HIGHWAY + bool "highway" + depends on BR2_TOOLCHAIN_HAS_ATOMIC + depends on BR2_INSTALL_LIBSTDCPP + # For gcc bug 58969, see: + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58969 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++11, GCC_BUG_58969 + help + Highway is a C++ library that provides portable SIMD/vector + intrinsics. + + https://github.com/google/highway + +if BR2_PACKAGE_HIGHWAY + +config BR2_PACKAGE_HIGHWAY_CONTRIB + bool "Enable Contrib" + help + Build Highway contrib library which contains extra + SIMD-related utilities: an image class with aligned rows, a + math library (16 functions already implemented, mostly + trigonometry), and functions for computing dot products and + sorting. + +config BR2_PACKAGE_HIGHWAY_EXAMPLES + bool "Enable Examples" + help + Build Highway examples + +endif + +comment "highway needs a toolchain w/ C++, gcc >= 7" + depends on BR2_TOOLCHAIN_HAS_ATOMIC + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 diff --git a/package/highway/highway.hash b/package/highway/highway.hash new file mode 100644 index 00000000000..3ff468443e0 --- /dev/null +++ b/package/highway/highway.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 e8ef71236ac0d97f12d553ec1ffc5b6375d57b5f0b860c7447dd69b6ed1072db highway-1.0.2.tar.gz +sha256 43070e2d4e532684de521b885f385d0841030efa2b1a20bafb76133a5e1379c1 LICENSE diff --git a/package/highway/highway.mk b/package/highway/highway.mk new file mode 100644 index 00000000000..ed7f6ca8713 --- /dev/null +++ b/package/highway/highway.mk @@ -0,0 +1,50 @@ +################################################################################ +# +# highway +# +################################################################################ + +HIGHWAY_VERSION = 1.0.2 +HIGHWAY_SITE = $(call github,google,highway,$(HIGHWAY_VERSION)) +HIGHWAY_LICENSE = Apache-2.0 +HIGHWAY_LICENSE_FILES = LICENSE +HIGHWAY_INSTALL_STAGING = YES + +HIGHWAY_CXXFLAGS = $(TARGET_CXXFLAGS) + +ifeq ($(BR2_PACKAGE_HIGHWAY_CONTRIB),y) +HIGHWAY_CONF_OPTS += -DHWY_ENABLE_CONTRIB=ON +else +HIGHWAY_CONF_OPTS += -DHWY_ENABLE_CONTRIB=OFF +endif + +ifeq ($(BR2_PACKAGE_HIGHWAY_EXAMPLES),y) +HIGHWAY_CONF_OPTS += -DHWY_ENABLE_EXAMPLES=ON +# Examples are not installed by cmake. This binary can be useful for +# quick testing and debug. +define HIGHWAY_INSTALL_EXAMPLES + $(INSTALL) -m 0755 \ + $(@D)/examples/hwy_benchmark \ + $(TARGET_DIR)/usr/bin/hwy_benchmark +endef +HIGHWAY_POST_INSTALL_TARGET_HOOKS += HIGHWAY_INSTALL_EXAMPLES +else +HIGHWAY_CONF_OPTS += -DHWY_ENABLE_EXAMPLES=OFF +endif + +ifeq ($(BR2_ARM_FPU_VFPV4),y) +HIGHWAY_CONF_OPTS += -DHWY_CMAKE_ARM7=ON +else +HIGHWAY_CONF_OPTS += -DHWY_CMAKE_ARM7=OFF +endif + +# Workaround for gcc bug 104028 on m68k. +# See: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104028 +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_104028),y) +HIGHWAY_CXXFLAGS += -O0 +endif + +HIGHWAY_CONF_OPTS += \ + -DCMAKE_CXX_FLAGS="$(HIGHWAY_CXXFLAGS)" + +$(eval $(cmake-package)) diff --git a/package/hiredis/0001-CMakeLists.txt-do-not-force-SHARED.patch b/package/hiredis/0001-CMakeLists.txt-do-not-force-SHARED.patch deleted file mode 100644 index b7fdb879106..00000000000 --- a/package/hiredis/0001-CMakeLists.txt-do-not-force-SHARED.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 0ce382c275b087e866517c003e565f8cc4855bdd Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 29 Aug 2020 23:19:26 +0200 -Subject: [PATCH] CMakeLists.txt: do not force SHARED - -Allow the user to build static libraries by removing SHARED from -ADD_LIBRARY calls. - -Here is an extract of -https://cmake.org/cmake/help/latest/command/add_library.html: - -"If no type is given explicitly the type is STATIC or SHARED based on -whether the current value of the variable BUILD_SHARED_LIBS is ON." - -Signed-off-by: Fabrice Fontaine -[Upstream status: probably not upstreamable as is because it will -conflict with https://github.com/redis/hiredis/pull/851. So, this patch -will probably have to be reworked for 1.0.x] ---- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1beccc6..fed79fd 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -40,7 +40,7 @@ IF(WIN32) - ADD_COMPILE_DEFINITIONS(_CRT_SECURE_NO_WARNINGS WIN32_LEAN_AND_MEAN) - ENDIF() - --ADD_LIBRARY(hiredis SHARED ${hiredis_sources}) -+ADD_LIBRARY(hiredis ${hiredis_sources}) - - SET_TARGET_PROPERTIES(hiredis - PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE -@@ -97,7 +97,7 @@ IF(ENABLE_SSL) - FIND_PACKAGE(OpenSSL REQUIRED) - SET(hiredis_ssl_sources - ssl.c) -- ADD_LIBRARY(hiredis_ssl SHARED -+ ADD_LIBRARY(hiredis_ssl - ${hiredis_ssl_sources}) - - IF (APPLE) --- -2.28.0 - diff --git a/package/hiredis/0001-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch b/package/hiredis/0001-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch new file mode 100644 index 00000000000..38e92820415 --- /dev/null +++ b/package/hiredis/0001-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch @@ -0,0 +1,171 @@ +From 286ba29771611abfaf126527141cac1d406c7eaf Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 22 Dec 2022 23:00:56 +0100 +Subject: [PATCH] CMakeLists.txt: respect BUILD_SHARED_LIBS + +To allow building hiredis on toolchain without dynamic library support, +respect standard cmake BUILD_SHARED_LIBS: +https://cmake.org/cmake/help/latest/variable/BUILD_SHARED_LIBS.html + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/redis/hiredis/pull/1147] +--- + CMakeLists.txt | 70 ++++++++++++++++++++++++++++++++++---------------- + 1 file changed, 48 insertions(+), 22 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3d52d0c..66a1383 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,5 +1,6 @@ + CMAKE_MINIMUM_REQUIRED(VERSION 3.0.0) + ++OPTION(BUILD_SHARED_LIBS "Build shared libraries" ON) + OPTION(ENABLE_SSL "Build hiredis_ssl for SSL support" OFF) + OPTION(DISABLE_TESTS "If tests should be compiled or not" OFF) + OPTION(ENABLE_SSL_TESTS "Should we test SSL connections" OFF) +@@ -44,35 +45,49 @@ IF(WIN32) + ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS -DWIN32_LEAN_AND_MEAN) + ENDIF() + +-ADD_LIBRARY(hiredis SHARED ${hiredis_sources}) + ADD_LIBRARY(hiredis_static STATIC ${hiredis_sources}) +-ADD_LIBRARY(hiredis::hiredis ALIAS hiredis) + ADD_LIBRARY(hiredis::hiredis_static ALIAS hiredis_static) ++SET(HIREDIS_DEFAULT_LIBRARY hiredis_static) ++SET(HIREDIS_TARGETS hiredis_static) + + IF(NOT MSVC) + SET_TARGET_PROPERTIES(hiredis_static + PROPERTIES OUTPUT_NAME hiredis) + ENDIF() + +-SET_TARGET_PROPERTIES(hiredis +- PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE +- VERSION "${HIREDIS_SONAME}") ++IF(BUILD_SHARED_LIBS) ++ ADD_LIBRARY(hiredis SHARED ${hiredis_sources}) ++ ADD_LIBRARY(hiredis::hiredis ALIAS hiredis) ++ SET(HIREDIS_DEFAULT_LIBRARY hiredis) ++ SET(HIREDIS_TARGETS ${HIREDIS_TARGETS} hiredis) ++ SET_TARGET_PROPERTIES(hiredis ++ PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE ++ VERSION "${HIREDIS_SONAME}") ++ENDIF() + IF(MSVC) + SET_TARGET_PROPERTIES(hiredis_static + PROPERTIES COMPILE_FLAGS /Z7) + ENDIF() + IF(WIN32 OR MINGW) +- TARGET_LINK_LIBRARIES(hiredis PUBLIC ws2_32 crypt32) ++ IF(BUILD_SHARED_LIBS) ++ TARGET_LINK_LIBRARIES(hiredis PUBLIC ws2_32 crypt32) ++ ENDIF() + TARGET_LINK_LIBRARIES(hiredis_static PUBLIC ws2_32 crypt32) + ELSEIF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") +- TARGET_LINK_LIBRARIES(hiredis PUBLIC m) ++ IF(BUILD_SHARED_LIBS) ++ TARGET_LINK_LIBRARIES(hiredis PUBLIC m) ++ ENDIF() + TARGET_LINK_LIBRARIES(hiredis_static PUBLIC m) + ELSEIF(CMAKE_SYSTEM_NAME MATCHES "SunOS") +- TARGET_LINK_LIBRARIES(hiredis PUBLIC socket) ++ IF(BUILD_SHARED_LIBS) ++ TARGET_LINK_LIBRARIES(hiredis PUBLIC socket) ++ ENDIF() + TARGET_LINK_LIBRARIES(hiredis_static PUBLIC socket) + ENDIF() + +-TARGET_INCLUDE_DIRECTORIES(hiredis PUBLIC $ $) ++IF(BUILD_SHARED_LIBS) ++ TARGET_INCLUDE_DIRECTORIES(hiredis PUBLIC $ $) ++ENDIF() + TARGET_INCLUDE_DIRECTORIES(hiredis_static PUBLIC $ $) + + CONFIGURE_FILE(hiredis.pc.in hiredis.pc @ONLY) +@@ -103,7 +118,7 @@ set(CPACK_RPM_PACKAGE_AUTOREQPROV ON) + + include(CPack) + +-INSTALL(TARGETS hiredis hiredis_static ++INSTALL(TARGETS ${HIREDIS_TARGETS} + EXPORT hiredis-targets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +@@ -161,39 +176,50 @@ IF(ENABLE_SSL) + FIND_PACKAGE(OpenSSL REQUIRED) + SET(hiredis_ssl_sources + ssl.c) +- ADD_LIBRARY(hiredis_ssl SHARED +- ${hiredis_ssl_sources}) ++ + ADD_LIBRARY(hiredis_ssl_static STATIC + ${hiredis_ssl_sources}) ++ SET(HIREDIS_SSL_DEFAULT_LIBRARY hiredis_ssl_static) ++ SET(HIREDIS_SSL_TARGETS hiredis_ssl_static) ++ IF(BUILD_SHARED_LIBS) ++ ADD_LIBRARY(hiredis_ssl SHARED ++ ${hiredis_ssl_sources}) ++ SET(HIREDIS_SSL_DEFAULT_LIBRARY hiredis_ssl) ++ SET(HIREDIS_SSL_TARGETS ${HIREDIS_SSL_TARGETS} hiredis_ssl) ++ ENDIF() + IF(NOT MSVC) + SET_TARGET_PROPERTIES(hiredis_ssl_static + PROPERTIES OUTPUT_NAME hiredis_ssl) + ENDIF() + +- IF (APPLE) ++ IF (APPLE AND BUILD_SHARED_LIBS) + SET_PROPERTY(TARGET hiredis_ssl PROPERTY LINK_FLAGS "-Wl,-undefined -Wl,dynamic_lookup") + ENDIF() + +- SET_TARGET_PROPERTIES(hiredis_ssl +- PROPERTIES +- WINDOWS_EXPORT_ALL_SYMBOLS TRUE +- VERSION "${HIREDIS_SONAME}") ++ IF(BUILD_SHARED_LIBS) ++ SET_TARGET_PROPERTIES(hiredis_ssl ++ PROPERTIES ++ WINDOWS_EXPORT_ALL_SYMBOLS TRUE ++ VERSION "${HIREDIS_SONAME}") ++ ENDIF() + IF(MSVC) + SET_TARGET_PROPERTIES(hiredis_ssl_static + PROPERTIES COMPILE_FLAGS /Z7) + ENDIF() + +- TARGET_INCLUDE_DIRECTORIES(hiredis_ssl PRIVATE "${OPENSSL_INCLUDE_DIR}") + TARGET_INCLUDE_DIRECTORIES(hiredis_ssl_static PRIVATE "${OPENSSL_INCLUDE_DIR}") ++ IF(BUILD_SHARED_LIBS) ++ TARGET_INCLUDE_DIRECTORIES(hiredis_ssl PRIVATE "${OPENSSL_INCLUDE_DIR}") ++ TARGET_LINK_LIBRARIES(hiredis_ssl PRIVATE ${OPENSSL_LIBRARIES}) ++ ENDIF() + +- TARGET_LINK_LIBRARIES(hiredis_ssl PRIVATE ${OPENSSL_LIBRARIES}) + IF (WIN32 OR MINGW) + TARGET_LINK_LIBRARIES(hiredis_ssl PRIVATE hiredis) + TARGET_LINK_LIBRARIES(hiredis_ssl_static PUBLIC hiredis_static) + ENDIF() + CONFIGURE_FILE(hiredis_ssl.pc.in hiredis_ssl.pc @ONLY) + +- INSTALL(TARGETS hiredis_ssl hiredis_ssl_static ++ INSTALL(TARGETS ${HIREDIS_SSL_TARGETS} + EXPORT hiredis_ssl-targets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +@@ -236,10 +262,10 @@ ENDIF() + IF(NOT DISABLE_TESTS) + ENABLE_TESTING() + ADD_EXECUTABLE(hiredis-test test.c) +- TARGET_LINK_LIBRARIES(hiredis-test hiredis) ++ TARGET_LINK_LIBRARIES(hiredis-test ${HIREDIS_DEFAULT_LIBRARY}) + IF(ENABLE_SSL_TESTS) + ADD_DEFINITIONS(-DHIREDIS_TEST_SSL=1) +- TARGET_LINK_LIBRARIES(hiredis-test hiredis_ssl) ++ TARGET_LINK_LIBRARIES(hiredis-test ${HIREDIS_SSL_DEFAULT_LIBRARY}) + ENDIF() + IF(ENABLE_ASYNC_TESTS) + ADD_DEFINITIONS(-DHIREDIS_TEST_ASYNC=1) +-- +2.35.1 + diff --git a/package/hiredis/0002-CMakeLists.txt-allow-building-without-a-C-compiler.patch b/package/hiredis/0002-CMakeLists.txt-allow-building-without-a-C-compiler.patch deleted file mode 100644 index 08a9ef9854b..00000000000 --- a/package/hiredis/0002-CMakeLists.txt-allow-building-without-a-C-compiler.patch +++ /dev/null @@ -1,57 +0,0 @@ -From bb4a8937411a9e6ac2e5c12c0e7eeaa7dab251ba Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 5 Sep 2020 12:54:21 +0200 -Subject: [PATCH] CMakeLists.txt: allow building without a C++ compiler - -Define hiredis as a C project (and use a single PROJECT statement) to -avoid the following build failure if a C++ compiler is not found: - -CMake Error at CMakeLists.txt:3 (PROJECT): - The CMAKE_CXX_COMPILER: - - /srv/storage/autobuild/run/instance-1/output-1/host/bin/arm-linux-g++ - - is not a full path to an existing compiler tool. - - Tell CMake where to find the compiler by setting either the environment - variable "CXX" or the CMake cache entry CMAKE_CXX_COMPILER to the full path - to the compiler, or to the compiler name if it is in the PATH. - -The only cpp source file is examples/example-qt.cpp which is never -compiled with cmake buildsystem. This file is compiled only with the -Makefile buildsystem so perhaps it should be removed. If it is added to -the cmake buildsystem, a call to enable_language(CXX) will have to be -added. - -Fixes: - - http://autobuild.buildroot.org/results/830ec3398cd29b9fc5cde06a225ef531d7a9d850 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/redis/hiredis/pull/872] ---- - CMakeLists.txt | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4cbd438..9d65b7f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,6 +1,5 @@ - CMAKE_MINIMUM_REQUIRED(VERSION 3.4.0) - INCLUDE(GNUInstallDirs) --PROJECT(hiredis) - - OPTION(ENABLE_SSL "Build hiredis_ssl for SSL support" OFF) - OPTION(DISABLE_TESTS "If tests should be compiled or not" OFF) -@@ -20,7 +19,7 @@ getVersionBit(HIREDIS_SONAME) - SET(VERSION "${HIREDIS_MAJOR}.${HIREDIS_MINOR}.${HIREDIS_PATCH}") - MESSAGE("Detected version: ${VERSION}") - --PROJECT(hiredis VERSION "${VERSION}") -+PROJECT(hiredis LANGUAGES "C" VERSION "${VERSION}") - - # Hiredis requires C99 - SET(CMAKE_C_STANDARD 99) --- -2.28.0 - diff --git a/package/hiredis/0003-Explicitly-set-c99-in-CMake.patch b/package/hiredis/0003-Explicitly-set-c99-in-CMake.patch deleted file mode 100644 index 7e6ef8bca49..00000000000 --- a/package/hiredis/0003-Explicitly-set-c99-in-CMake.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 13a35bdb64615e381c5e1151cdd4e78bba71a6db Mon Sep 17 00:00:00 2001 -From: michael-grunder -Date: Fri, 28 Aug 2020 12:35:01 -0700 -Subject: [PATCH] Explicitly set c99 in CMake - -See #869 - -[Retrieved from: -https://github.com/redis/hiredis/commit/13a35bdb64615e381c5e1151cdd4e78bba71a6db] -Signed-off-by: Fabrice Fontaine ---- - CMakeLists.txt | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1beccc69a..4cbd438d7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -22,6 +22,9 @@ MESSAGE("Detected version: ${VERSION}") - - PROJECT(hiredis VERSION "${VERSION}") - -+# Hiredis requires C99 -+SET(CMAKE_C_STANDARD 99) -+ - SET(ENABLE_EXAMPLES OFF CACHE BOOL "Enable building hiredis examples") - - SET(hiredis_sources diff --git a/package/hiredis/hiredis.hash b/package/hiredis/hiredis.hash index a45cf68f993..cdcbef1525f 100644 --- a/package/hiredis/hiredis.hash +++ b/package/hiredis/hiredis.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 e0ab696e2f07deb4252dda45b703d09854e53b9703c7d52182ce5a22616c3819 hiredis-1.0.2.tar.gz +sha256 fe6d21741ec7f3fc9df409d921f47dfc73a4d8ff64f4ac6f1d95f951bf7f53d6 hiredis-1.1.0.tar.gz sha256 dca05ce8fc87a8261783b4aed0deef8becc9350b6aa770bc714d0c1833b896eb COPYING diff --git a/package/hiredis/hiredis.mk b/package/hiredis/hiredis.mk index a571951fa36..a2f7627b58d 100644 --- a/package/hiredis/hiredis.mk +++ b/package/hiredis/hiredis.mk @@ -4,14 +4,21 @@ # ################################################################################ -HIREDIS_VERSION_MAJOR = 1.0 -HIREDIS_VERSION = $(HIREDIS_VERSION_MAJOR).2 +HIREDIS_VERSION_MAJOR = 1.1 +HIREDIS_VERSION = $(HIREDIS_VERSION_MAJOR).0 HIREDIS_SITE = $(call github,redis,hiredis,v$(HIREDIS_VERSION)) HIREDIS_LICENSE = BSD-3-Clause HIREDIS_LICENSE_FILES = COPYING HIREDIS_CPE_ID_VENDOR = redislabs HIREDIS_INSTALL_STAGING = YES + HIREDIS_CONF_OPTS = -DDISABLE_TESTS=ON +HOST_HIREDIS_CONF_OPTS = -DDISABLE_TESTS=ON -DENABLE_SSL=OFF + +# Set CMAKE_BUILD_TYPE to Release or the libraries will be suffixed with "d" +# resulting in build failures when linking. +HIREDIS_CONF_OPTS += -DCMAKE_BUILD_TYPE=Release +HOST_HIREDIS_CONF_OPTS += -DCMAKE_BUILD_TYPE=Release ifeq ($(BR2_PACKAGE_OPENSSL)$(BR2_TOOLCHAIN_HAS_THREADS),yy) HIREDIS_CONF_OPTS += -DENABLE_SSL=ON @@ -20,4 +27,11 @@ else HIREDIS_CONF_OPTS += -DENABLE_SSL=OFF endif +# We may be a ccache dependency, so we can't use ccache; reset the +# options set by the cmake infra. +HOST_HIREDIS_CONF_OPTS += \ + -UCMAKE_C_COMPILER_LAUNCHER \ + -UCMAKE_CXX_COMPILER_LAUNCHER + $(eval $(cmake-package)) +$(eval $(host-cmake-package)) diff --git a/package/hostapd/0001-use-a-less-generic-name-for-IEEE802.11-CRC-32-routin.patch b/package/hostapd/0001-use-a-less-generic-name-for-IEEE802.11-CRC-32-routin.patch new file mode 100644 index 00000000000..bf85e97f21c --- /dev/null +++ b/package/hostapd/0001-use-a-less-generic-name-for-IEEE802.11-CRC-32-routin.patch @@ -0,0 +1,102 @@ +From 9896d8c116f054cebc49928404018a75c9b892cb Mon Sep 17 00:00:00 2001 +From: Sergey Matyukevich +Date: Fri, 16 Sep 2022 23:18:50 +0300 +Subject: [PATCH] hostapd: use a less generic name for IEEE802.11 CRC-32 routine + +Hostapd uses 'crc32' name for IEEE802.11 CRC-32 routine. This name is +too generic. Buildroot autobuilder detected build configuration that +failed to build due to the naming conflict: static linking with openssl +using zlib-ng as a zlib provider, e.g. see: +- http://autobuild.buildroot.net/results/9901df820d3afa4cde78e8ad6d62cb8ce7e69fdb/ +- http://autobuild.buildroot.net/results/ac19975f0bf77f4a8ca574c374092ba81cd5a332/ + +Use a less generic name ieee80211_crc32 for IEEE802.11 CRC-32 routine +to avoid such naming conflicts. + +Upstream: https://w1.fi/cgit/hostap/commit/?id=0c7b3814ca6070a8e930dea09fde08b4058a4ca6 +Signed-off-by: Sergey Matyukevich +--- + hostapd/config_file.c | 4 ++-- + src/ap/hostapd.c | 3 ++- + src/ap/neighbor_db.c | 2 +- + src/utils/crc32.c | 2 +- + src/utils/crc32.h | 2 +- + 5 files changed, 7 insertions(+), 6 deletions(-) + +diff --git a/hostapd/config_file.c b/hostapd/config_file.c +index b14728d1b..b38a84647 100644 +--- a/hostapd/config_file.c ++++ b/hostapd/config_file.c +@@ -2407,7 +2407,7 @@ static int hostapd_config_fill(struct hostapd_config *conf, + } + os_memcpy(ssid->ssid, pos, ssid->ssid_len); + ssid->ssid_set = 1; +- ssid->short_ssid = crc32(ssid->ssid, ssid->ssid_len); ++ ssid->short_ssid = ieee80211_crc32(ssid->ssid, ssid->ssid_len); + } else if (os_strcmp(buf, "ssid2") == 0) { + struct hostapd_ssid *ssid = &bss->ssid; + size_t slen; +@@ -2421,7 +2421,7 @@ static int hostapd_config_fill(struct hostapd_config *conf, + os_memcpy(ssid->ssid, str, slen); + ssid->ssid_len = slen; + ssid->ssid_set = 1; +- ssid->short_ssid = crc32(ssid->ssid, ssid->ssid_len); ++ ssid->short_ssid = ieee80211_crc32(ssid->ssid, ssid->ssid_len); + os_free(str); + } else if (os_strcmp(buf, "utf8_ssid") == 0) { + bss->ssid.utf8_ssid = atoi(pos) > 0; +diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c +index 4b88641a2..56c8fb90e 100644 +--- a/src/ap/hostapd.c ++++ b/src/ap/hostapd.c +@@ -1230,7 +1230,8 @@ static int hostapd_setup_bss(struct hostapd_data *hapd, int first) + * Short SSID calculation is identical to FCS and it is defined in + * IEEE P802.11-REVmd/D3.0, 9.4.2.170.3 (Calculating the Short-SSID). + */ +- conf->ssid.short_ssid = crc32(conf->ssid.ssid, conf->ssid.ssid_len); ++ conf->ssid.short_ssid = ieee80211_crc32(conf->ssid.ssid, ++ conf->ssid.ssid_len); + + if (!hostapd_drv_none(hapd)) { + wpa_printf(MSG_DEBUG, "Using interface %s with hwaddr " MACSTR +diff --git a/src/ap/neighbor_db.c b/src/ap/neighbor_db.c +index 229edd2a9..ef17634c3 100644 +--- a/src/ap/neighbor_db.c ++++ b/src/ap/neighbor_db.c +@@ -136,7 +136,7 @@ int hostapd_neighbor_set(struct hostapd_data *hapd, const u8 *bssid, + + os_memcpy(entry->bssid, bssid, ETH_ALEN); + os_memcpy(&entry->ssid, ssid, sizeof(entry->ssid)); +- entry->short_ssid = crc32(ssid->ssid, ssid->ssid_len); ++ entry->short_ssid = ieee80211_crc32(ssid->ssid, ssid->ssid_len); + + entry->nr = wpabuf_dup(nr); + if (!entry->nr) +diff --git a/src/utils/crc32.c b/src/utils/crc32.c +index 12d9e2a70..371254994 100644 +--- a/src/utils/crc32.c ++++ b/src/utils/crc32.c +@@ -72,7 +72,7 @@ static const u32 crc32_table[256] = { + }; + + +-u32 crc32(const u8 *frame, size_t frame_len) ++u32 ieee80211_crc32(const u8 *frame, size_t frame_len) + { + size_t i; + u32 crc; +diff --git a/src/utils/crc32.h b/src/utils/crc32.h +index dc31399be..71a19dc5f 100644 +--- a/src/utils/crc32.h ++++ b/src/utils/crc32.h +@@ -9,6 +9,6 @@ + #ifndef CRC32_H + #define CRC32_H + +-u32 crc32(const u8 *frame, size_t frame_len); ++u32 ieee80211_crc32(const u8 *frame, size_t frame_len); + + #endif /* CRC32_H */ +-- +2.37.1 + diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk index 99f0cdf1b82..8981d9247e4 100644 --- a/package/hostapd/hostapd.mk +++ b/package/hostapd/hostapd.mk @@ -53,6 +53,7 @@ endif ifeq ($(BR2_PACKAGE_HOSTAPD_HAS_WIFI_DRIVERS),y) HOSTAPD_CONFIG_ENABLE += \ CONFIG_HS20 \ + CONFIG_IEEE80211AX \ CONFIG_IEEE80211AC \ CONFIG_IEEE80211N \ CONFIG_IEEE80211R \ @@ -85,11 +86,13 @@ ifeq ($(BR2_PACKAGE_HOSTAPD_WPA3),y) HOSTAPD_CONFIG_ENABLE += \ CONFIG_DPP \ CONFIG_SAE \ + CONFIG_SAE_PK \ CONFIG_OWE else HOSTAPD_CONFIG_DISABLE += \ CONFIG_DPP \ CONFIG_SAE \ + CONFIG_SAE_PK \ CONFIG_OWE endif diff --git a/package/htop/htop.hash b/package/htop/htop.hash index dffe5ca1ad6..d43da134414 100644 --- a/package/htop/htop.hash +++ b/package/htop/htop.hash @@ -1,3 +1,5 @@ +# From https://github.com/htop-dev/htop/releases/download/3.2.1/htop-3.2.1.tar.xz.sha256 +sha256 5a17121cf1c69d2f2e557c0b29d45a2c353ab983f644742e1c2e4ece15aa6cbb htop-3.2.1.tar.xz + # Locally calculated -sha256 fe9559637c8f21f5fd531a4c072048a404173806acbdad1359c6b82fd87aa001 htop-3.1.2.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/htop/htop.mk b/package/htop/htop.mk index 7caa47ce13e..df2ec25908d 100644 --- a/package/htop/htop.mk +++ b/package/htop/htop.mk @@ -4,15 +4,19 @@ # ################################################################################ -HTOP_VERSION = 3.1.2 -HTOP_SITE = $(call github,htop-dev,htop,$(HTOP_VERSION)) +HTOP_VERSION = 3.2.1 +HTOP_SOURCE = htop-$(HTOP_VERSION).tar.xz +HTOP_SITE = https://github.com/htop-dev/htop/releases/download/$(HTOP_VERSION) HTOP_DEPENDENCIES = ncurses -HTOP_AUTORECONF = YES # Prevent htop build system from searching the host paths HTOP_CONF_ENV = HTOP_NCURSES_CONFIG_SCRIPT=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS) HTOP_LICENSE = GPL-2.0+ HTOP_LICENSE_FILES = COPYING +# ac_cv_prog_cc_c99 is required for BR2_USE_WCHAR=n because the C99 test +# provided by autoconf relies on wchar_t. +HTOP_CONF_ENV += ac_cv_prog_cc_c99=-std=gnu99 + ifeq ($(BR2_PACKAGE_HWLOC),y) HTOP_CONF_OPTS += --enable-hwloc HTOP_DEPENDENCIES += hwloc @@ -28,10 +32,10 @@ HTOP_CONF_OPTS += --disable-capabilities endif ifeq ($(BR2_PACKAGE_LM_SENSORS),y) -HTOP_CONF_OPTS += --with-sensors +HTOP_CONF_OPTS += --enable-sensors HTOP_DEPENDENCIES += lm-sensors else -HTOP_CONF_OPTS += --without-sensors +HTOP_CONF_OPTS += --disable-sensors endif ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y) diff --git a/package/htpdate/0001-Allow-SSL_LIBS-to-be-configured-from-environment.patch b/package/htpdate/0001-Allow-SSL_LIBS-to-be-configured-from-environment.patch deleted file mode 100644 index 6dca2babab3..00000000000 --- a/package/htpdate/0001-Allow-SSL_LIBS-to-be-configured-from-environment.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 4ba90fedd553c3b06c925fb6ff5245a5dcabace9 Mon Sep 17 00:00:00 2001 -From: Eddy Vervest -Date: Sat, 29 Jan 2022 10:58:13 +0100 -Subject: [PATCH] Allow SSL_LIBS to be configured from environment - -[Retrieved from: -https://github.com/twekkel/htpdate/commit/4ba90fedd553c3b06c925fb6ff5245a5dcabace9] -Signed-off-by: Fabrice Fontaine ---- - Makefile | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/Makefile b/Makefile -index 4796efa..cf077e6 100644 ---- a/Makefile -+++ b/Makefile -@@ -2,8 +2,9 @@ prefix = $(DESTDIR)/usr - bindir = ${prefix}/sbin - mandir = ${prefix}/share/man - --CC ?= gcc --CFLAGS += -Wall -std=c11 -pedantic -O2 -+CC ?= gcc -+CFLAGS += -Wall -std=c11 -pedantic -O2 -+SSL_LIBS ?= -lssl - - INSTALL ?= install -c - STRIP ?= strip -s -@@ -14,7 +15,7 @@ htpdate: htpdate.c - $(CC) $(CFLAGS) -o htpdate htpdate.c - - https: htpdate.c -- $(CC) $(CFLAGS) -DENABLE_HTTPS -o htpdate htpdate.c -lssl -+ $(CC) $(CFLAGS) -DENABLE_HTTPS -o htpdate htpdate.c $(SSL_LIBS) - - install: all - $(STRIP) htpdate diff --git a/package/htpdate/htpdate.hash b/package/htpdate/htpdate.hash index b56522ea99f..f572fb1e843 100644 --- a/package/htpdate/htpdate.hash +++ b/package/htpdate/htpdate.hash @@ -1,3 +1,3 @@ # Locally calculated: -sha256 74f34b013eba6f99369819fa4b3d48e9ab5e531ad04f6af59cc04e8777c76ed7 htpdate-1.3.3.tar.gz +sha256 3cdc558ec8e53ef374a42490b2f28c0b23981fa8754a6d7182044707828ad1e9 htpdate-1.3.6.tar.gz sha256 7989949df09a0489434723c571541604cd3f2e0418c6a6aa9179bfaf8ec807cc LICENSE diff --git a/package/htpdate/htpdate.mk b/package/htpdate/htpdate.mk index e32480fc859..2d4a11dd9db 100644 --- a/package/htpdate/htpdate.mk +++ b/package/htpdate/htpdate.mk @@ -4,7 +4,7 @@ # ################################################################################ -HTPDATE_VERSION = 1.3.3 +HTPDATE_VERSION = 1.3.6 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 c396157646d..3178c32377d 100644 --- a/package/httping/httping.hash +++ b/package/httping/httping.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3e895a0a6d7bd79de25a255a1376d4da88eb09c34efdd0476ab5a907e75bfaf8 httping-2.5.tgz -sha256 c5db2e5b9a692fcdf2bd370f1533529063fbcf8947a8f5ee9d4b050a14e0566d license.txt +sha256 3e895a0a6d7bd79de25a255a1376d4da88eb09c34efdd0476ab5a907e75bfaf8 httping-2.5.tgz +sha256 c5db2e5b9a692fcdf2bd370f1533529063fbcf8947a8f5ee9d4b050a14e0566d license.txt diff --git a/package/hwdata/hwdata.hash b/package/hwdata/hwdata.hash index 7861106859d..4f56b0c12f8 100644 --- a/package/hwdata/hwdata.hash +++ b/package/hwdata/hwdata.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 0d3d21af57822f35141b524808fd9e4823dbb413df338606195010dc0aa1c935 hwdata-0.355.tar.gz +sha256 d6ae2436a69c6f5e04d926f5d753a99d90deb864065a2e2f8a8eda87b70dcdd5 hwdata-0.365.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 21d0406f93e884a050426ebc21931839a45d56bfcbcbfdda7686d583f36f107f LICENSE diff --git a/package/hwdata/hwdata.mk b/package/hwdata/hwdata.mk index 4dd9c9e28e2..4bda6c73293 100644 --- a/package/hwdata/hwdata.mk +++ b/package/hwdata/hwdata.mk @@ -4,10 +4,11 @@ # ################################################################################ -HWDATA_VERSION = 0.355 +HWDATA_VERSION = 0.365 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 +HWDATA_INSTALL_STAGING = YES HWDATA_FILES = \ $(if $(BR2_PACKAGE_HWDATA_IAB_OUI_TXT),iab.txt oui.txt) \ @@ -15,7 +16,22 @@ HWDATA_FILES = \ $(if $(BR2_PACKAGE_HWDATA_PNP_IDS),pnp.ids) \ $(if $(BR2_PACKAGE_HWDATA_USB_IDS),usb.ids) +define HWDATA_CONFIGURE_CMDS + (cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure) +endef + +define HWDATA_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) hwdata.pc +endef + ifneq ($(strip $(HWDATA_FILES)),) +define HWDATA_INSTALL_STAGING_CMDS + $(INSTALL) -D -m 0644 $(@D)/hwdata.pc \ + $(STAGING_DIR)/usr/lib/pkgconfig/hwdata.pc + $(INSTALL) -d -m 755 $(STAGING_DIR)/usr/share/hwdata + $(INSTALL) -m 644 -t $(STAGING_DIR)/usr/share/hwdata \ + $(addprefix $(@D)/,$(HWDATA_FILES)) +endef define HWDATA_INSTALL_TARGET_CMDS $(INSTALL) -d -m 755 $(TARGET_DIR)/usr/share/hwdata $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/share/hwdata \ diff --git a/package/hwloc/hwloc.hash b/package/hwloc/hwloc.hash index ca77e3301c1..8010b857f07 100644 --- a/package/hwloc/hwloc.hash +++ b/package/hwloc/hwloc.hash @@ -1,4 +1,5 @@ -# From https://www.open-mpi.org/software/hwloc/v2.7/ -sha256 028cee53ebcfe048283a2b3e87f2fa742c83645fc3ae329134bf5bb8b90384e0 hwloc-2.7.0.tar.bz2 +# From https://www.open-mpi.org/software/hwloc/v2.9/ +sha1 76b49087619b46d71e18bd1131d35a5ccf5de791 hwloc-2.9.3.tar.bz2 +sha256 5c4062ce556f6d3451fc177ffb8673a2120f81df6835dea6a21a90fbdfff0dec hwloc-2.9.3.tar.bz2 # Locally computed sha256 d79a936a42f3c6cb7c8375a023d43f4435f4664d3a5a2ea6b4623cff83c7fc06 COPYING diff --git a/package/hwloc/hwloc.mk b/package/hwloc/hwloc.mk index 04543a7e645..8fe9e648a7b 100644 --- a/package/hwloc/hwloc.mk +++ b/package/hwloc/hwloc.mk @@ -4,8 +4,8 @@ # ################################################################################ -HWLOC_VERSION_MAJOR = 2.7 -HWLOC_VERSION = $(HWLOC_VERSION_MAJOR).0 +HWLOC_VERSION_MAJOR = 2.9 +HWLOC_VERSION = $(HWLOC_VERSION_MAJOR).3 HWLOC_SOURCE = hwloc-$(HWLOC_VERSION).tar.bz2 HWLOC_SITE = https://download.open-mpi.org/release/hwloc/v$(HWLOC_VERSION_MAJOR) HWLOC_LICENSE = BSD-3-Clause diff --git a/package/hyperfine/Config.in b/package/hyperfine/Config.in new file mode 100644 index 00000000000..527e978146f --- /dev/null +++ b/package/hyperfine/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_HYPERFINE + bool "hyperfine" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_RUSTC + help + hyperfine is a benchmark tool written in Rust. It evaluates + execution time of a command passed in arguments and make a + relative comparison if multiple arguments are used at the + same time. + + https://github.com/sharkdp/hyperfine diff --git a/package/hyperfine/hyperfine.hash b/package/hyperfine/hyperfine.hash new file mode 100644 index 00000000000..50cc7694b31 --- /dev/null +++ b/package/hyperfine/hyperfine.hash @@ -0,0 +1,4 @@ +# Locally computed +sha256 28fcd72c556b4ca2150577217a4d7d51907b7e00ff86b764943d068202a92ace hyperfine-1.14.0.tar.gz +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE-APACHE +sha256 1dfee18c2ff07ce551de4d6a1d2db158c0380746b488a7f0d08c8e0d3568b7c3 LICENSE-MIT diff --git a/package/hyperfine/hyperfine.mk b/package/hyperfine/hyperfine.mk new file mode 100644 index 00000000000..62246f002ec --- /dev/null +++ b/package/hyperfine/hyperfine.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# hyperfine +# +################################################################################ + +HYPERFINE_VERSION = 1.14.0 +HYPERFINE_SITE = $(call github,sharkdp,hyperfine,v$(HYPERFINE_VERSION)) +HYPERFINE_LICENSE = Apache-2.0 or MIT +HYPERFINE_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT + +$(eval $(cargo-package)) diff --git a/package/i2pd/i2pd.hash b/package/i2pd/i2pd.hash index 99c474a2e5d..98c0db243dd 100644 --- a/package/i2pd/i2pd.hash +++ b/package/i2pd/i2pd.hash @@ -1,4 +1,4 @@ -# From https://github.com/PurpleI2P/i2pd/releases/download/2.40.0/SHA512SUMS -sha512 58d10417f3fd2c2fb427fb88b30ccd3e03053c84aa7ac6d3e346c388f2376d1768846bec5ee8d5134dd62d5712b20f890af11083634f94095b1117f6494c25fd i2pd-2.40.0.tar.gz +# From https://github.com/PurpleI2P/i2pd/releases/download/2.43.0/SHA512SUMS +sha512 7247850cd47cccc540346b4a1becc6dba5f40bcb333cd722e9fc59fd8b0beddee700376829d29add05cea6b84bb34303ed37e01914a1a41cf8cd94fe5c826e4a i2pd-2.43.0.tar.gz # Locally computed: sha256 9c87aff490b272254d716475e3c4973f5f64af1d18f9f6962c1e61e252e1ad9a LICENSE diff --git a/package/i2pd/i2pd.mk b/package/i2pd/i2pd.mk index 8eea09493f7..ad268a235c2 100644 --- a/package/i2pd/i2pd.mk +++ b/package/i2pd/i2pd.mk @@ -4,10 +4,11 @@ # ################################################################################ -I2PD_VERSION = 2.40.0 +I2PD_VERSION = 2.43.0 I2PD_SITE = $(call github,PurpleI2P,i2pd,$(I2PD_VERSION)) I2PD_LICENSE = BSD-3-Clause I2PD_LICENSE_FILES = LICENSE +I2PD_CPE_ID_VENDOR = i2pd I2PD_SUBDIR = build I2PD_DEPENDENCIES = \ boost \ @@ -43,6 +44,7 @@ define I2PD_INSTALL_CONFIGURATION_FILES mkdir -p $(TARGET_DIR)/var/lib/i2pd cp -a $(@D)/contrib/certificates $(TARGET_DIR)/var/lib/i2pd endef +I2PD_POST_INSTALL_TARGET_HOOKS += I2PD_INSTALL_CONFIGURATION_FILES define I2PD_USERS i2pd -1 i2pd -1 * /var/lib/i2pd - - I2P Daemon diff --git a/package/ibrcommon/ibrcommon.hash b/package/ibrcommon/ibrcommon.hash index 9d13f06d383..4b7144214ee 100644 --- a/package/ibrcommon/ibrcommon.hash +++ b/package/ibrcommon/ibrcommon.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 9c457c1ebc01e6216524636628c647bef34ab11bd96f0e0788be8749374fdc20 ibrcommon-1.0.1.tar.gz -sha256 1a0b57773a46d9d4cc2f0d1780a17acc38af506bb1e0234aaa85f8ccd6dc0b92 COPYING -sha256 9b8a430c2136ebcf76bd37f50da7d7a80ede413ec6604cc4694ea536e779854c README +sha256 9c457c1ebc01e6216524636628c647bef34ab11bd96f0e0788be8749374fdc20 ibrcommon-1.0.1.tar.gz +sha256 1a0b57773a46d9d4cc2f0d1780a17acc38af506bb1e0234aaa85f8ccd6dc0b92 COPYING +sha256 9b8a430c2136ebcf76bd37f50da7d7a80ede413ec6604cc4694ea536e779854c README diff --git a/package/icu/icu.mk b/package/icu/icu.mk index ebbb1968fcc..111c2124e4f 100644 --- a/package/icu/icu.mk +++ b/package/icu/icu.mk @@ -17,9 +17,6 @@ ICU_CPE_ID_VENDOR = icu-project ICU_CPE_ID_PRODUCT = international_components_for_unicode ICU_CPE_ID_VERSION = $(subst -,.,$(ICU_VERSION)) -# 0005-ICU-21587-Fix-memory-bug-w-baseName.patch -ICU_IGNORE_CVES += CVE-2021-30535 - ICU_DEPENDENCIES = host-icu ICU_INSTALL_STAGING = YES ICU_CONFIG_SCRIPTS = icu-config @@ -28,6 +25,13 @@ ICU_CONF_OPTS = \ --disable-samples \ --disable-tests +# the icu build process breaks if the TARGET environment variable is +# non-empty +ICU_CONF_ENV += TARGET="" +ICU_MAKE_ENV += TARGET="" +HOST_ICU_CONF_ENV += TARGET="" +HOST_ICU_MAKE_ENV += TARGET="" + # When available, icu prefers to use C++11 atomics, which rely on the # __atomic builtins. On certain architectures, this requires linking # with libatomic starting from gcc 4.8. diff --git a/package/ifenslave/ifenslave.hash b/package/ifenslave/ifenslave.hash index 9073165e7f4..825f2d6f2ae 100644 --- a/package/ifenslave/ifenslave.hash +++ b/package/ifenslave/ifenslave.hash @@ -1,5 +1,5 @@ # From http://snapshot.debian.org/archive/debian/20170102T091407Z/pool/main/i/ifenslave/ifenslave_2.9.dsc -sha1 a17e88fa298ef337e872c8aa5d7a390921239d1a ifenslave_2.9.tar.xz +sha1 a17e88fa298ef337e872c8aa5d7a390921239d1a ifenslave_2.9.tar.xz sha256 e5666c0b61347bd06f2394c16eca6895fcb5e5cc83d0a1c596a975274de5a3c9 ifenslave_2.9.tar.xz # Locally computed sha256 299e00f3afc0e6ea0685340df73ad444e58e6fe0229989ba0983f5f33e275c41 debian/copyright diff --git a/package/ifmetric/ifmetric.hash b/package/ifmetric/ifmetric.hash index 186522efabf..7b3733fa444 100644 --- a/package/ifmetric/ifmetric.hash +++ b/package/ifmetric/ifmetric.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 0fa8510a4e34e555f136f9df81d26618313f2d69a4880c0fb5967f19502f1aec ifmetric-0.3.tar.gz -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 LICENSE -sha256 1e33d5a8750b4b3c2cb4fb89a916463f3c838f8eb361abbf72faf244c7dde771 README +sha256 0fa8510a4e34e555f136f9df81d26618313f2d69a4880c0fb5967f19502f1aec ifmetric-0.3.tar.gz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 LICENSE +sha256 1e33d5a8750b4b3c2cb4fb89a916463f3c838f8eb361abbf72faf244c7dde771 README diff --git a/package/igd2-for-linux/igd2-for-linux.hash b/package/igd2-for-linux/igd2-for-linux.hash index fe1272338a3..3b4fd4f5c92 100644 --- a/package/igd2-for-linux/igd2-for-linux.hash +++ b/package/igd2-for-linux/igd2-for-linux.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 843f2b0a7597e6cc7af85da099a7cce3401a334cbb4a6ae9d38ce252311db9b9 igd2-for-linux-2.1.tar.gz +sha256 68ee10bf02b18890af8bf9e38be377f038627cd16fce54200fc1b26fd83e4375 igd2-for-linux-2.2.tar.gz sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 linuxigd2/doc/LICENSE sha256 c8b99423cad48bb44e2cf52a496361404290865eac259a82da6d1e4331ececb3 linuxigd2/src/threadutil/COPYING diff --git a/package/igd2-for-linux/igd2-for-linux.mk b/package/igd2-for-linux/igd2-for-linux.mk index 8cc3c6ae181..c646c6bf927 100644 --- a/package/igd2-for-linux/igd2-for-linux.mk +++ b/package/igd2-for-linux/igd2-for-linux.mk @@ -4,7 +4,7 @@ # ################################################################################ -IGD2_FOR_LINUX_VERSION = 2.1 +IGD2_FOR_LINUX_VERSION = 2.2 IGD2_FOR_LINUX_SITE = \ $(call github,Orange-OpenSource,igd2-for-linux,v$(IGD2_FOR_LINUX_VERSION)) diff --git a/package/igh-ethercat/igh-ethercat.hash b/package/igh-ethercat/igh-ethercat.hash index fd373a14073..88548bf23ea 100644 --- a/package/igh-ethercat/igh-ethercat.hash +++ b/package/igh-ethercat/igh-ethercat.hash @@ -1,5 +1,4 @@ -# From http://etherlab.org/download/ethercat/ethercat-1.5.2.tar.bz2.md5 -md5 6b4001f8d975865d74a0b108b3bdda3d ethercat-1.5.2.tar.bz2 # Locally computed +sha256 eb13a0f7f073ad54589c4f41829d9e995b37b26fbc7fcd05e3adb5e201e6feb4 igh-ethercat-2e2cef6131895336f87c57c18fe78ae01a90d3de.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 b9771e8f8c7..1041ba0758a 100644 --- a/package/igh-ethercat/igh-ethercat.mk +++ b/package/igh-ethercat/igh-ethercat.mk @@ -4,22 +4,29 @@ # ################################################################################ -IGH_ETHERCAT_VERSION = 1.5.2 -IGH_ETHERCAT_SITE = http://etherlab.org/download/ethercat -IGH_ETHERCAT_SOURCE = ethercat-$(IGH_ETHERCAT_VERSION).tar.bz2 +IGH_ETHERCAT_VERSION = 2e2cef6131895336f87c57c18fe78ae01a90d3de +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 +# Fetching from Git +IGH_ETHERCAT_AUTORECONF = YES IGH_ETHERCAT_INSTALL_STAGING = YES IGH_ETHERCAT_CONF_OPTS = \ - --with-linux-dir=$(LINUX_DIR) + --with-linux-dir=$(LINUX_DIR) \ + $(if $(BR2_INSTALL_LIBSTDCPP),--enable-tool,--disable-tool) \ + $(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) -IGH_ETHERCAT_CONF_OPTS += $(if $(BR2_PACKAGE_IGH_ETHERCAT_8139TOO),--enable-8139too,--disable-8139too) -IGH_ETHERCAT_CONF_OPTS += $(if $(BR2_PACKAGE_IGH_ETHERCAT_E100),--enable-e100,--disable-e100) -IGH_ETHERCAT_CONF_OPTS += $(if $(BR2_PACKAGE_IGH_ETHERCAT_E1000),--enable-e1000,--disable-e1000) -IGH_ETHERCAT_CONF_OPTS += $(if $(BR2_PACKAGE_IGH_ETHERCAT_E1000E),--enable-e1000e,--disable-e1000e) -IGH_ETHERCAT_CONF_OPTS += $(if $(BR2_PACKAGE_IGH_ETHERCAT_R8169),--enable-r8169,--disable-r8169) +# Needed to make autoreconf happy +define IGH_ETHERCAT_CREATE_CHANGELOG + touch $(@D)/ChangeLog +endef +IGH_ETHERCAT_POST_PATCH_HOOKS += IGH_ETHERCAT_CREATE_CHANGELOG $(eval $(kernel-module)) $(eval $(autotools-package)) diff --git a/package/igmpproxy/igmpproxy.hash b/package/igmpproxy/igmpproxy.hash index 238de67e88b..a7e1a065d93 100644 --- a/package/igmpproxy/igmpproxy.hash +++ b/package/igmpproxy/igmpproxy.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 d1fc244cb2fbbf99f720bda3e841fe59ece9b6919073790b4b892739b1b844eb igmpproxy-0.3.tar.gz +sha256 afa4b75a823b82f71ce99f33eae4e8136b906ae8a5ede5caaad93bac38cdae24 igmpproxy-0.4.tar.gz sha256 be3d05af93dbbc4650f8d641d8e1bec220af4a729e07ba71e949c25b93a1b4f6 COPYING sha256 c4f65d5d396ad518a37d30b83fe33897661858dc174ff64a15d0461630ce64e4 GPL.txt sha256 4328a21f0822caa9976356623118bcdcc9970c7a0f9a3deeba23c779b7cfb5d1 Stanford.txt diff --git a/package/igmpproxy/igmpproxy.mk b/package/igmpproxy/igmpproxy.mk index 6a6b56afa0e..357c9087e0c 100644 --- a/package/igmpproxy/igmpproxy.mk +++ b/package/igmpproxy/igmpproxy.mk @@ -4,7 +4,7 @@ # ################################################################################ -IGMPPROXY_VERSION = 0.3 +IGMPPROXY_VERSION = 0.4 IGMPPROXY_SITE = \ https://github.com/pali/igmpproxy/releases/download/$(IGMPPROXY_VERSION) IGMPPROXY_AUTORECONF = YES diff --git a/package/ijs/ijs.hash b/package/ijs/ijs.hash index 6accb57123b..3d860fc85dd 100644 --- a/package/ijs/ijs.hash +++ b/package/ijs/ijs.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 11a5f5084488c480f3ff5a24d64d7147bb64272bf60a0ba51330a56c5b50cab9 ijs-0.35.tar.bz2 -sha256 f723390b7ee019eccf07763dcb5744acf8bb43034bc3ba3d6f1c94440e365b4f README +sha256 11a5f5084488c480f3ff5a24d64d7147bb64272bf60a0ba51330a56c5b50cab9 ijs-0.35.tar.bz2 +sha256 f723390b7ee019eccf07763dcb5744acf8bb43034bc3ba3d6f1c94440e365b4f README diff --git a/package/ima-evm-utils/ima-evm-utils.hash b/package/ima-evm-utils/ima-evm-utils.hash index 2267a59b790..56d830e54c7 100644 --- a/package/ima-evm-utils/ima-evm-utils.hash +++ b/package/ima-evm-utils/ima-evm-utils.hash @@ -1,4 +1,4 @@ # sha1 from sourceforge, sha256 locally computed sha1 f23d8a406759a469b0223b0bfb302ada4407a1d1 ima-evm-utils-1.4.tar.gz -sha256 fcf85b31d6292051b3679e5f17ffa7f89b6898957aad0f59aa4e9878884b27d1 ima-evm-utils-1.4.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 fcf85b31d6292051b3679e5f17ffa7f89b6898957aad0f59aa4e9878884b27d1 ima-evm-utils-1.4.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/ima-evm-utils/ima-evm-utils.mk b/package/ima-evm-utils/ima-evm-utils.mk index 7ee34d5e1a4..01984402ced 100644 --- a/package/ima-evm-utils/ima-evm-utils.mk +++ b/package/ima-evm-utils/ima-evm-utils.mk @@ -8,6 +8,7 @@ IMA_EVM_UTILS_VERSION = 1.4 IMA_EVM_UTILS_SITE = http://downloads.sourceforge.net/project/linux-ima/ima-evm-utils IMA_EVM_UTILS_LICENSE = GPL-2.0 IMA_EVM_UTILS_LICENSE_FILES = COPYING +IMA_EVM_UTILS_INSTALL_STAGING = YES IMA_EVM_UTILS_DEPENDENCIES = host-pkgconf keyutils openssl tpm2-tss # Tarball doesn't contain configure diff --git a/package/imagemagick/Config.in.host b/package/imagemagick/Config.in.host index 671b0995dc7..5055101e236 100644 --- a/package/imagemagick/Config.in.host +++ b/package/imagemagick/Config.in.host @@ -17,6 +17,7 @@ if BR2_PACKAGE_HOST_IMAGEMAGICK config BR2_PACKAGE_HOST_IMAGEMAGICK_SVG bool "SVG support" depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS # host-librsvg + depends on BR2_HOST_GCC_AT_LEAST_4_9 # host-pango -> host-harfbuzz help Say 'y' here is you need ImageMagick tools (like convert) to support SVG. @@ -24,4 +25,8 @@ config BR2_PACKAGE_HOST_IMAGEMAGICK_SVG This is not enabled by default, as it brings quite a few extra dependencies, and thus extra build time. +comment "SVG support needs host gcc >= 4.9" + depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS + depends on !BR2_HOST_GCC_AT_LEAST_4_9 + endif diff --git a/package/imagemagick/imagemagick.hash b/package/imagemagick/imagemagick.hash index 278becd2abd..8988dad5da0 100644 --- a/package/imagemagick/imagemagick.hash +++ b/package/imagemagick/imagemagick.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 385ca5bd8ce9b37e685779c46868171af949265c9db40067c1c4d7442dbc723e imagemagick-7.1.0-19.tar.gz -sha256 040badb77b659e751ea16113490a937e1e01f3f5d32181e966b8982413533fb2 LICENSE +sha256 4333ef2fe63f2510988af82b726f5b1919ebd54037ea6674566c69fcceb67e11 imagemagick-7.1.0-51.tar.gz +sha256 8cceeb67d4e783cb63075c7311fdb990fa0369ee80fbd0f481064cd02386ca2d LICENSE diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index 64a530c6d27..8a2ec460d5f 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMAGEMAGICK_VERSION = 7.1.0-19 +IMAGEMAGICK_VERSION = 7.1.0-51 IMAGEMAGICK_SITE = $(call github,ImageMagick,ImageMagick,$(IMAGEMAGICK_VERSION)) IMAGEMAGICK_LICENSE = Apache-2.0 IMAGEMAGICK_LICENSE_FILES = LICENSE @@ -178,6 +178,12 @@ else IMAGEMAGICK_CONF_OPTS += --without-bzlib endif +ifeq ($(BR2_INSTALL_LIBSTDCPP),y) +IMAGEMAGICK_CONF_OPTS += --with-utilities +else +IMAGEMAGICK_CONF_OPTS += --without-utilities +endif + HOST_IMAGEMAGICK_CONF_OPTS = \ --disable-opencl \ --disable-openmp \ diff --git a/package/imx-mkimage/0001-Add-support-for-overriding-BL32-and-BL33-not-only-BL.patch b/package/imx-mkimage/0001-Add-support-for-overriding-BL32-and-BL33-not-only-BL.patch index e8ba820f2f1..66891ac8e75 100644 --- a/package/imx-mkimage/0001-Add-support-for-overriding-BL32-and-BL33-not-only-BL.patch +++ b/package/imx-mkimage/0001-Add-support-for-overriding-BL32-and-BL33-not-only-BL.patch @@ -1,4 +1,4 @@ -From 4870df3d70e94f9f0d6c06f610cea2d88cd6edb5 Mon Sep 17 00:00:00 2001 +From a4993eda7483cd01662f3f3e2965e7a568cb7178 Mon Sep 17 00:00:00 2001 From: Erik Larsson Date: Thu, 8 Mar 2018 19:04:37 +0100 Subject: [PATCH] Add support for overriding BL32 and BL33 not only BL31 @@ -11,7 +11,7 @@ Signed-off-by: Marcus Folkesson 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/iMX8M/mkimage_fit_atf.sh b/iMX8M/mkimage_fit_atf.sh -index 95749b1..c1aa902 100755 +index 4f2b3f3..0444ff0 100755 --- a/iMX8M/mkimage_fit_atf.sh +++ b/iMX8M/mkimage_fit_atf.sh @@ -18,23 +18,23 @@ if [ ! -f $BL31 ]; then @@ -26,7 +26,7 @@ index 95749b1..c1aa902 100755 -BL32="tee.bin" +[ -z "$BL32" ] && BL32="tee.bin" - LOADABLES="\"atf@1\"" + LOADABLES="\"atf-1\"" if [ ! -f $BL32 ]; then BL32=/dev/null @@ -36,7 +36,7 @@ index 95749b1..c1aa902 100755 - ls -lct tee.bin | awk '{print $5}' >&2 + echo "$BL32 size: " >&2 + ls -lct $BL32 | awk '{print $5}' >&2 - LOADABLES="$LOADABLES, \"tee@1\"" + LOADABLES="$LOADABLES, \"tee-1\"" fi -BL33="u-boot-nodtb.bin" @@ -56,5 +56,5 @@ index 95749b1..c1aa902 100755 for dtname in $* -- -2.25.1 +2.31.1 diff --git a/package/imx-mkimage/0002-Add-LDFLAGS-to-link-step.patch b/package/imx-mkimage/0002-Add-LDFLAGS-to-link-step.patch index 7272c3ac6c6..086e634d231 100644 --- a/package/imx-mkimage/0002-Add-LDFLAGS-to-link-step.patch +++ b/package/imx-mkimage/0002-Add-LDFLAGS-to-link-step.patch @@ -1,4 +1,4 @@ -From 3ef9f773ce1a402607957fa73775d2e0a591a1a5 Mon Sep 17 00:00:00 2001 +From b7ace564b419a05a375a205fd4df8933716b241a Mon Sep 17 00:00:00 2001 From: Erik Larsson Date: Tue, 6 Mar 2018 12:28:39 +0100 Subject: [PATCH] Add LDFLAGS to link step @@ -9,18 +9,18 @@ Signed-off-by: Erik Larsson 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iMX8M/soc.mak b/iMX8M/soc.mak -index d714259..aecf84b 100644 +index 4bfdc37..806b805 100644 --- a/iMX8M/soc.mak +++ b/iMX8M/soc.mak -@@ -67,7 +67,7 @@ FW_DIR = imx-boot/imx-boot-tools/$(PLAT) +@@ -84,7 +84,7 @@ FW_DIR = imx-boot/imx-boot-tools/$(PLAT) $(MKIMG): mkimage_imx8.c @echo "PLAT="$(PLAT) "HDMI="$(HDMI) @echo "Compiling mkimage_imx8" - $(CC) $(CFLAGS) mkimage_imx8.c -o $(MKIMG) -lz + $(CC) $(CFLAGS) mkimage_imx8.c -o $(MKIMG) $(LDFLAGS) -lz - u-boot-spl-ddr.bin: u-boot-spl.bin lpddr4_pmu_train_1d_imem.bin lpddr4_pmu_train_1d_dmem.bin lpddr4_pmu_train_2d_imem.bin lpddr4_pmu_train_2d_dmem.bin - @objcopy -I binary -O binary --pad-to 0x8000 --gap-fill=0x0 lpddr4_pmu_train_1d_imem.bin lpddr4_pmu_train_1d_imem_pad.bin + lpddr4_imem_1d = lpddr4_pmu_train_1d_imem$(LPDDR_FW_VERSION).bin + lpddr4_dmem_1d = lpddr4_pmu_train_1d_dmem$(LPDDR_FW_VERSION).bin -- -2.25.1 +2.31.1 diff --git a/package/imx-mkimage/0003-Add-unused-fake-version.patch b/package/imx-mkimage/0003-Add-unused-fake-version.patch index 0e817a1ac82..7e8a98c137d 100644 --- a/package/imx-mkimage/0003-Add-unused-fake-version.patch +++ b/package/imx-mkimage/0003-Add-unused-fake-version.patch @@ -1,4 +1,4 @@ -From b25b4324be4c0dd9ee5fecdf2981d291fb187686 Mon Sep 17 00:00:00 2001 +From 30e81d949d03f24de3b89d14cf98cb7decb2740c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Hentschel?= Date: Mon, 25 Feb 2019 22:15:55 +0100 Subject: [PATCH] Add unused fake version @@ -17,10 +17,10 @@ Signed-off-by: André Hentschel 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile b/Makefile -index 49ef486..b966399 100644 +index 1c0b039..49639a5 100644 --- a/Makefile +++ b/Makefile -@@ -37,9 +37,7 @@ $(MKIMG): src/build_info.h $(SRCS) +@@ -41,9 +41,7 @@ $(MKIMG): src/build_info.h $(SRCS) bin: $(MKIMG) src/build_info.h: @@ -32,5 +32,5 @@ index 49ef486..b966399 100644 help: @echo $(CURR_DIR) -- -2.25.1 +2.31.1 diff --git a/package/imx-mkimage/0004-Add-support-for-overriding-BL31-BL32-and-BL33.patch b/package/imx-mkimage/0004-Add-support-for-overriding-BL31-BL32-and-BL33.patch new file mode 100644 index 00000000000..494aaf15665 --- /dev/null +++ b/package/imx-mkimage/0004-Add-support-for-overriding-BL31-BL32-and-BL33.patch @@ -0,0 +1,61 @@ +From b1e77d8ccabc6a3910ede2441ff567326291a355 Mon Sep 17 00:00:00 2001 +From: Thomas Perrot +Date: Tue, 26 Apr 2022 15:10:04 +0200 +Subject: [PATCH] Add support for overriding BL31, BL32 and BL33 + +Signed-off-by: Thomas Perrot +--- + iMX8M/print_fit_hab.sh | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +diff --git a/iMX8M/print_fit_hab.sh b/iMX8M/print_fit_hab.sh +index b915115..dbc28f2 100755 +--- a/iMX8M/print_fit_hab.sh ++++ b/iMX8M/print_fit_hab.sh +@@ -1,12 +1,16 @@ + #!/bin/bash + +-BL32="tee.bin" +- + let fit_off=$1 + + # keep backward compatibility + [ -z "$TEE_LOAD_ADDR" ] && TEE_LOAD_ADDR="0xfe000000" + ++[ -z "$BL31" ] && BL31="bl31.bin" ++ ++[ -z "$BL32" ] && BL32="tee.bin" ++ ++[ -z "$BL33" ] && BL33="u-boot-nodtb.bin" ++ + if [ -z "$ATF_LOAD_ADDR" ]; then + echo "ERROR: BL31 load address is not set" >&2 + exit 0 +@@ -26,7 +30,7 @@ else + let uboot_sign_off=$((fit_off - 0x8000 - ivt_off + 0x3000)) + fi + +-let uboot_size=$(ls -lct u-boot-nodtb.bin | awk '{print $5}') ++let uboot_size=$(ls -lct $BL33 | awk '{print $5}') + let uboot_load_addr=0x40200000 + + let last_sign_off=$(((uboot_sign_off + uboot_size + 3) & ~3)) +@@ -64,13 +68,13 @@ done + + let atf_sign_off=$((last_sign_off)) + let atf_load_addr=$ATF_LOAD_ADDR +-let atf_size=$(ls -lct bl31.bin | awk '{print $5}') ++let atf_size=$(ls -lct $BL31 | awk '{print $5}') + + if [ ! -f $BL32 ]; then + let tee_size=0x0 + let tee_sign_off=$((atf_sign_off + atf_size)) + else +- let tee_size=$(ls -lct tee.bin | awk '{print $5}') ++ let tee_size=$(ls -lct $BL32 | awk '{print $5}') + + let tee_sign_off=$(((atf_sign_off + atf_size + 3) & ~3)) + let tee_load_addr=$TEE_LOAD_ADDR +-- +2.31.1 + diff --git a/package/imx-mkimage/Config.in.host b/package/imx-mkimage/Config.in.host index 8d273557a10..09df2a3c291 100644 --- a/package/imx-mkimage/Config.in.host +++ b/package/imx-mkimage/Config.in.host @@ -4,4 +4,4 @@ config BR2_PACKAGE_HOST_IMX_MKIMAGE imx-mkimage is used to combine input images and generate final boot image with appropriate IVT set. - https://source.codeaurora.org/external/imx/imx-mkimage + https://github.com/nxp-imx/imx-mkimage diff --git a/package/imx-mkimage/imx-mkimage.hash b/package/imx-mkimage/imx-mkimage.hash index 88fac9bb391..8346fd64b1f 100644 --- a/package/imx-mkimage/imx-mkimage.hash +++ b/package/imx-mkimage/imx-mkimage.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2746136aa5ed79ba24cfbe877d29022a2a33f6614b1bba728e95d1b2f0448196 imx-mkimage-rel_imx_5.4.70_2.3.0-br1.tar.gz +sha256 593bd94aac027844bc58c62aae55557c14e1f8a99e68ba235a46f083759df3d4 imx-mkimage-lf-5.10.72_2.2.0.tar.gz sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/package/imx-mkimage/imx-mkimage.mk b/package/imx-mkimage/imx-mkimage.mk index 17ba3596f75..54c948e0d30 100644 --- a/package/imx-mkimage/imx-mkimage.mk +++ b/package/imx-mkimage/imx-mkimage.mk @@ -4,9 +4,8 @@ # ################################################################################ -IMX_MKIMAGE_VERSION = rel_imx_5.4.70_2.3.0 -IMX_MKIMAGE_SITE = https://source.codeaurora.org/external/imx/imx-mkimage -IMX_MKIMAGE_SITE_METHOD = git +IMX_MKIMAGE_VERSION = lf-5.10.72_2.2.0 +IMX_MKIMAGE_SITE = $(call github,nxp-imx,imx-mkimage,$(IMX_MKIMAGE_VERSION)) IMX_MKIMAGE_LICENSE = GPL-2.0+ IMX_MKIMAGE_LICENSE_FILES = COPYING HOST_IMX_MKIMAGE_DEPENDENCIES = host-zlib @@ -21,6 +20,7 @@ endef define HOST_IMX_MKIMAGE_INSTALL_CMDS $(INSTALL) -D -m 755 $(@D)/iMX8M/mkimage_imx8 $(HOST_DIR)/bin/mkimage_imx8 $(INSTALL) -D -m 755 $(@D)/iMX8M/mkimage_fit_atf.sh $(HOST_DIR)/bin/mkimage_fit_atf.sh + $(INSTALL) -D -m 755 $(@D)/iMX8M/print_fit_hab.sh $(HOST_DIR)/bin/print_fit_hab.sh endef else # i.MX8 and i.MX8X diff --git a/package/inadyn/inadyn.hash b/package/inadyn/inadyn.hash index 98af30e9fc3..2c0995babfc 100644 --- a/package/inadyn/inadyn.hash +++ b/package/inadyn/inadyn.hash @@ -1,5 +1,5 @@ # Upstream .sha256 from GitHub -sha256 7370eb7ad5d33a9cf2e7e4a6a86c09587fbf9592cd357c6f472c33f575bac26d inadyn-2.9.1.tar.gz +sha256 1727b6aae6727f99eba584e46950369d7b259d2ef09e5bc02566e9c3c1d6daf6 inadyn-2.10.0.tar.gz # Locally computed sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/inadyn/inadyn.mk b/package/inadyn/inadyn.mk index 041d1eff573..5a24c1eced8 100644 --- a/package/inadyn/inadyn.mk +++ b/package/inadyn/inadyn.mk @@ -4,7 +4,7 @@ # ################################################################################ -INADYN_VERSION = 2.9.1 +INADYN_VERSION = 2.10.0 INADYN_SITE = https://github.com/troglobit/inadyn/releases/download/v$(INADYN_VERSION) INADYN_LICENSE = GPL-2.0+ INADYN_LICENSE_FILES = COPYING @@ -15,6 +15,8 @@ INADYN_CONF_OPTS += --enable-openssl INADYN_DEPENDENCIES += openssl else ifeq ($(BR2_PACKAGE_GNUTLS),y) INADYN_DEPENDENCIES += gnutls +else ifeq ($BR2_PACKAGE_MBEDTLS, y) +INADYN_DEPENDENCIES += mbedtls else INADYN_CONF_OPTS += --disable-ssl endif diff --git a/package/inih/inih.hash b/package/inih/inih.hash index 21234e156d2..e2ed923c7a7 100644 --- a/package/inih/inih.hash +++ b/package/inih/inih.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 01b0366fdfdf6363efc070c2f856f1afa33e7a6546548bada5456ad94a516241 inih-53.tar.gz +sha256 4f2ba6bd122d30281a8c7a4d5723b7af90b56aa828c0e88256d7fceda03a491a inih-56.tar.gz sha256 9ae3b39e83e9158e44b67733baa3bb2d84e80efdcfb14a5820210a42c7abdf7f LICENSE.txt diff --git a/package/inih/inih.mk b/package/inih/inih.mk index dec94651215..c43412894a4 100644 --- a/package/inih/inih.mk +++ b/package/inih/inih.mk @@ -4,7 +4,7 @@ # ################################################################################ -INIH_VERSION = 53 +INIH_VERSION = 56 INIH_SITE = $(call github,benhoyt,inih,r$(INIH_VERSION)) INIH_INSTALL_STAGING = YES INIH_LICENSE = BSD-3-Clause diff --git a/package/intel-gmmlib/0001-Drop-hardening-related-flags.patch b/package/intel-gmmlib/0001-Drop-hardening-related-flags.patch index 581afd90663..b63d82f3c86 100644 --- a/package/intel-gmmlib/0001-Drop-hardening-related-flags.patch +++ b/package/intel-gmmlib/0001-Drop-hardening-related-flags.patch @@ -15,7 +15,7 @@ diff --git a/Source/GmmLib/Linux.cmake b/Source/GmmLib/Linux.cmake index 1a09bc4..b28fc1b 100644 --- a/Source/GmmLib/Linux.cmake +++ b/Source/GmmLib/Linux.cmake -@@ -62,7 +62,6 @@ SET (GMMLIB_COMPILER_FLAGS_COMMON +@@ -97,7 +97,6 @@ SET (GMMLIB_COMPILER_FLAGS_COMMON -DUSE_SSE3 -DUSE_SSSE3 # Other common flags diff --git a/package/intel-gmmlib/Config.in b/package/intel-gmmlib/Config.in index 9d5fbd9cae4..a3d0d2610b2 100644 --- a/package/intel-gmmlib/Config.in +++ b/package/intel-gmmlib/Config.in @@ -2,6 +2,8 @@ config BR2_PACKAGE_INTEL_GMMLIB bool "intel-gmmlib" depends on BR2_x86_64 depends on !BR2_STATIC_LIBS + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS help The Intel(R) Graphics Memory Management Library provides device specific and buffer management for the Intel(R) @@ -10,5 +12,6 @@ config BR2_PACKAGE_INTEL_GMMLIB https://github.com/intel/gmmlib -comment "intel-gmmlib needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS +comment "intel-gmmlib needs a toolchain w/ dynamic library, C++, threads" + depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/intel-gmmlib/intel-gmmlib.hash b/package/intel-gmmlib/intel-gmmlib.hash index 71a153e0a3e..693d9d09050 100644 --- a/package/intel-gmmlib/intel-gmmlib.hash +++ b/package/intel-gmmlib/intel-gmmlib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7cc044dc0979269abe825054ba6cc1b67169dc7a7f4192898e2dd04142a633fa intel-gmmlib-22.0.2.tar.gz +sha256 86651bd2803c9f0afd82471bec784e65d2b418dee315a053d22215eb2a679be7 intel-gmmlib-22.3.3.tar.gz sha256 8b7446825df3f8b0268307e272aa6aaaf78351c83161d860d02c913c22666c48 LICENSE.md diff --git a/package/intel-gmmlib/intel-gmmlib.mk b/package/intel-gmmlib/intel-gmmlib.mk index 235f71341c1..3eb3458ee71 100644 --- a/package/intel-gmmlib/intel-gmmlib.mk +++ b/package/intel-gmmlib/intel-gmmlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_GMMLIB_VERSION = 22.0.2 +INTEL_GMMLIB_VERSION = 22.3.3 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-Add-MEDIA-BUILD-HARDENING-option.patch b/package/intel-mediadriver/0001-Add-MEDIA-BUILD-HARDENING-option.patch deleted file mode 100644 index 968445759aa..00000000000 --- a/package/intel-mediadriver/0001-Add-MEDIA-BUILD-HARDENING-option.patch +++ /dev/null @@ -1,106 +0,0 @@ -From 103c00c8d74a1cd87686850212bd93c0e4d59fc9 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 11 Aug 2021 21:34:59 +0200 -Subject: [PATCH] Add MEDIA_BUILD_HARDENING option - -Add MEDIA_BUILD_HARDENING option to allow the user to disable hardening -options such as stack-protector-all or FORTIFY SOURCE 2 which are not -always available (e.g. fortify source 2 is only available on glibc >= 6 -and not musl/uclibc-ng) - -Patch sent upstream: https://github.com/intel/media-driver/pull/1242 - -Signed-off-by: Fabrice Fontaine -Signed-off-by: Bernd Kuhls -[Bernd: rebased for version 21.4.1] ---- - cmrtlib/linux/CMakeLists.txt | 14 ++++++++++---- - .../cmake/linux/media_compile_flags_linux.cmake | 12 ++++++++++-- - media_driver/media_top_cmake.cmake | 8 +++++++- - 3 files changed, 27 insertions(+), 7 deletions(-) - -diff --git a/cmrtlib/linux/CMakeLists.txt b/cmrtlib/linux/CMakeLists.txt -index 65f71ceef..b066138d9 100644 ---- a/cmrtlib/linux/CMakeLists.txt -+++ b/cmrtlib/linux/CMakeLists.txt -@@ -32,12 +32,18 @@ else() - endif() - - # Set up compile options that will be used for the Linux build --set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CPP_STANDARD_OPTION} -fPIC -fpermissive -fstack-protector-all") --set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-strict-aliasing -D_FORTIFY_SOURCE=2") -+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CPP_STANDARD_OPTION} -fPIC -fpermissive") -+set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-strict-aliasing") - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -D__DEBUG -O0") --set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CPP_STANDARD_OPTION} -fPIC -fpermissive -fstack-protector-all") --set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fno-strict-aliasing -D_FORTIFY_SOURCE=2") -+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CPP_STANDARD_OPTION} -fPIC -fpermissive") -+set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fno-strict-aliasing") - set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG -D__DEBUG -O0") -+if(MEDIA_BUILD_HARDENING) -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS} -fstack-protector-all") -+ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -D_FORTIFY_SOURCE=2") -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS} -fstack-protector-all") -+ set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -D_FORTIFY_SOURCE=2") -+endif() - if(MEDIA_BUILD_FATAL_WARNINGS) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS} -Werror") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS} -Werror") -diff --git a/media_driver/cmake/linux/media_compile_flags_linux.cmake b/media_driver/cmake/linux/media_compile_flags_linux.cmake -index 7a2bd64b6..98896b131 100755 ---- a/media_driver/cmake/linux/media_compile_flags_linux.cmake -+++ b/media_driver/cmake/linux/media_compile_flags_linux.cmake -@@ -47,7 +47,6 @@ set(MEDIA_COMPILER_FLAGS_COMMON - # Other common flags - -fmessage-length=0 - -fvisibility=hidden -- -fstack-protector - -fdata-sections - -ffunction-sections - -Wl,--gc-sections -@@ -64,6 +63,11 @@ set(MEDIA_COMPILER_FLAGS_COMMON - -g - ) - -+if(MEDIA_BUILD_HARDENING) -+ set(MEDIA_COMPILER_FLAGS_COMMON -+ ${MEDIA_COMPILER_FLAGS_COMMON} -+ -fstack-protector) -+endif() - - if(${UFO_MARCH} STREQUAL "slm") - set(MEDIA_COMPILER_FLAGS_COMMON -@@ -119,9 +123,13 @@ if(${UFO_VARIANT} STREQUAL "default") - set(MEDIA_COMPILER_FLAGS_RELEASE - ${MEDIA_COMPILER_FLAGS_RELEASE} - -O2 -- -D_FORTIFY_SOURCE=2 - -fno-omit-frame-pointer - ) -+ if(MEDIA_BUILD_HARDENING) -+ set(MEDIA_COMPILER_FLAGS_RELEASE -+ ${MEDIA_COMPILER_FLAGS_RELEASE} -+ -D_FORTIFY_SOURCE=2) -+ endif() - endif() - - if(NOT ${PLATFORM} STREQUAL "android") -diff --git a/media_driver/media_top_cmake.cmake b/media_driver/media_top_cmake.cmake -index f089ea45f..b0b428914 100755 ---- a/media_driver/media_top_cmake.cmake -+++ b/media_driver/media_top_cmake.cmake -@@ -113,7 +113,13 @@ if(MEDIA_BUILD_FATAL_WARNINGS) - set_target_properties(${LIB_NAME_OBJ} PROPERTIES COMPILE_FLAGS "-Werror") - endif() - --set_target_properties(${LIB_NAME} PROPERTIES LINK_FLAGS "-Wl,--no-as-needed -Wl,--gc-sections -z relro -z now -fstack-protector -fPIC") -+set(MEDIA_LINK_FLAGS "-Wl,--no-as-needed -Wl,--gc-sections -z relro -z now -fPIC") -+option(MEDIA_BUILD_HARDENING "Enable hardening (stack-protector, fortify source)" ON) -+if(MEDIA_BUILD_HARDENING) -+ set(MEDIA_LINK_FLAGS "${MEDIA_LINK_FLAGS} -fstack-protector") -+endif() -+set_target_properties(${LIB_NAME} PROPERTIES LINK_FLAGS ${MEDIA_LINK_FLAGS}) -+ - set_target_properties(${LIB_NAME} PROPERTIES PREFIX "") - set_target_properties(${LIB_NAME_STATIC} PROPERTIES PREFIX "") - diff --git a/package/intel-mediadriver/Config.in b/package/intel-mediadriver/Config.in index c29c2fb6abf..c59437ec73e 100644 --- a/package/intel-mediadriver/Config.in +++ b/package/intel-mediadriver/Config.in @@ -2,9 +2,10 @@ config BR2_PACKAGE_INTEL_MEDIADRIVER bool "intel-mediadriver" depends on BR2_x86_64 depends on !BR2_STATIC_LIBS # mesa3d, libva - depends on BR2_INSTALL_LIBSTDCPP # mesa3d + depends on BR2_INSTALL_LIBSTDCPP # intel-gmmlib, mesa3d + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # mesa3d depends on BR2_TOOLCHAIN_HAS_SYNC_1 # mesa3d - depends on BR2_TOOLCHAIN_HAS_THREADS # libva + depends on BR2_TOOLCHAIN_HAS_THREADS # intel-gmmlib, libva depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # mesa3d select BR2_PACKAGE_INTEL_GMMLIB select BR2_PACKAGE_LIBPCIACCESS @@ -28,7 +29,7 @@ config BR2_PACKAGE_INTEL_MEDIADRIVER_GEN8 endif # BR2_PACKAGE_INTEL_MEDIADRIVER -comment "intel-mediadriver needs a toolchain w/ dynamic library, C++, NPTL" +comment "intel-mediadriver needs a toolchain w/ dynamic library, gcc >= 8, C++, NPTL" depends on BR2_x86_64 && BR2_TOOLCHAIN_HAS_SYNC_1 depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_HAS_THREADS_NPTL + !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_TOOLCHAIN_GCC_AT_LEAST_8 diff --git a/package/intel-mediadriver/intel-mediadriver.hash b/package/intel-mediadriver/intel-mediadriver.hash index ceafa20e806..e4e41e4ad39 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6eaa4a9caf58faa8934b253adb4b0ece1c7d5de6f084167d5138b4e3ba423683 intel-media-22.1.1.tar.gz +sha256 edae1bdc07b694bd6e42099feddcf875e3b5d7254894f4b3fb292128577baf82 intel-media-23.1.0.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index 9a2b4a8753e..6cc862dce47 100644 --- a/package/intel-mediadriver/intel-mediadriver.mk +++ b/package/intel-mediadriver/intel-mediadriver.mk @@ -6,8 +6,8 @@ # based on https://software.intel.com/en-us/articles/build-and-debug-open-source-media-stack -INTEL_MEDIADRIVER_VERSION = 22.1.1 -INTEL_MEDIADRIVER_SITE = http://github.com/intel/media-driver/archive +INTEL_MEDIADRIVER_VERSION = 23.1.0 +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 INTEL_MEDIADRIVER_LICENSE_FILES = LICENSE.md @@ -18,6 +18,10 @@ INTEL_MEDIADRIVER_DEPENDENCIES = \ libva \ mesa3d +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +INTEL_MEDIADRIVER_DEPENDENCIES += libexecinfo +endif + ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y) INTEL_MEDIADRIVER_DEPENDENCIES += xlib_libX11 endif diff --git a/package/intel-mediasdk/0001-Don-t-force-fstack-protector.patch b/package/intel-mediasdk/0001-Don-t-force-fstack-protector.patch index a7e3b70294c..b3ecfc98b74 100644 --- a/package/intel-mediasdk/0001-Don-t-force-fstack-protector.patch +++ b/package/intel-mediasdk/0001-Don-t-force-fstack-protector.patch @@ -40,7 +40,7 @@ index 7e36ae2d..5b8b9b9d 100644 # message( STATUS "Libva located at: ${PKG_LIBVA_LIBRARY_DIRS}" ) if( ARGV1 MATCHES hw AND Linux ) -@@ -445,7 +445,7 @@ function(configure_dependencies target dependencies variant) +@@ -452,7 +452,7 @@ function(configure_dependencies target dependencies variant) endforeach() set(SCOPE_CFLAGS ${SCOPE_CFLAGS} PARENT_SCOPE) diff --git a/package/intel-mediasdk/intel-mediasdk.hash b/package/intel-mediasdk/intel-mediasdk.hash index 7cd61fe9b8a..a2c42437901 100644 --- a/package/intel-mediasdk/intel-mediasdk.hash +++ b/package/intel-mediasdk/intel-mediasdk.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5ed1d22b5c5a05d3e848e43caa2b3966dbfb7f74281a646e6d0774a0621a9b8b intel-mediasdk-22.1.0.tar.gz +sha256 9208c35641ba995760d662689426a6c433973cf5283b8510f9cfb774e4b9cb38 intel-mediasdk-23.1.0.tar.gz sha256 dfd67773578903698f9ff4a61eb8f2d84810cbecd56f3f3cee8c649f813b6ea6 LICENSE diff --git a/package/intel-mediasdk/intel-mediasdk.mk b/package/intel-mediasdk/intel-mediasdk.mk index 7d57e0e928c..462d487ebed 100644 --- a/package/intel-mediasdk/intel-mediasdk.mk +++ b/package/intel-mediasdk/intel-mediasdk.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_MEDIASDK_VERSION = 22.1.0 +INTEL_MEDIASDK_VERSION = 23.1.0 INTEL_MEDIASDK_SITE = https://github.com/Intel-Media-SDK/MediaSDK/archive INTEL_MEDIASDK_LICENSE = MIT INTEL_MEDIASDK_LICENSE_FILES = LICENSE diff --git a/package/intel-microcode/intel-microcode.hash b/package/intel-microcode/intel-microcode.hash index 6687d4c0ebf..64c50dd6f78 100644 --- a/package/intel-microcode/intel-microcode.hash +++ b/package/intel-microcode/intel-microcode.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 fd85b6b769efd029dec6a2c07106fd18fb4dcb548b7bc4cde09295a8344ef6d7 intel-microcode-20210608.tar.gz +sha256 fe49bb719441f20335ed6004090ab38cdc374134d36d4f5d30be7ed93b820313 intel-microcode-20230808.tar.gz sha256 03efb1491c7e899feb2665fa299363e64035e5444c1b8bc1f6ebed30de964e12 license diff --git a/package/intel-microcode/intel-microcode.mk b/package/intel-microcode/intel-microcode.mk index af7f6fa8040..0a89d3a603c 100644 --- a/package/intel-microcode/intel-microcode.mk +++ b/package/intel-microcode/intel-microcode.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_MICROCODE_VERSION = 20210608 +INTEL_MICROCODE_VERSION = 20230808 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/intltool/intltool.hash b/package/intltool/intltool.hash index de1df87bc78..59983b02e9c 100644 --- a/package/intltool/intltool.hash +++ b/package/intltool/intltool.hash @@ -1,6 +1,6 @@ # From https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz/+md5 -md5 12e517cac2b57a0121cda351570f1e63 intltool-0.51.0.tar.gz +md5 12e517cac2b57a0121cda351570f1e63 intltool-0.51.0.tar.gz # Locally calculated -sha256 67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd intltool-0.51.0.tar.gz -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING +sha256 67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd intltool-0.51.0.tar.gz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/iodine/iodine.hash b/package/iodine/iodine.hash index 691ef4d7fb5..4ba7aa95b8b 100644 --- a/package/iodine/iodine.hash +++ b/package/iodine/iodine.hash @@ -1,4 +1,4 @@ # From http://code.kryo.se/iodine/ -md5 fdbf3b81cd69caf5230d76a8b039fd99 iodine-0.7.0.tar.gz +md5 fdbf3b81cd69caf5230d76a8b039fd99 iodine-0.7.0.tar.gz # Locally computed sha256 f41a252b2218759aa351270b7ad9791bdd323836b940e35c0614837a5d24dcb7 README diff --git a/package/ipcalc/ipcalc.hash b/package/ipcalc/ipcalc.hash index bf9b34a6108..50d08239fa8 100644 --- a/package/ipcalc/ipcalc.hash +++ b/package/ipcalc/ipcalc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 dac080c0773cc14c1d6f818899351d2286cace85751dd9dc704944e54c2c3565 ipcalc-1.0.1.tar.bz2 +sha256 47c866941916800270fca23496acc9976ca9488ce9053aeaedc5f47c5929b772 ipcalc-1.0.2.tar.bz2 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/ipcalc/ipcalc.mk b/package/ipcalc/ipcalc.mk index dfe35e2cdc7..e63e174ce20 100644 --- a/package/ipcalc/ipcalc.mk +++ b/package/ipcalc/ipcalc.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPCALC_VERSION = 1.0.1 +IPCALC_VERSION = 1.0.2 IPCALC_SITE = $(call gitlab,ipcalc,ipcalc,$(IPCALC_VERSION)) IPCALC_SOURCE = ipcalc-$(IPCALC_VERSION).tar.bz2 IPCALC_LICENSE = GPL-2.0+ diff --git a/package/iperf/0001-Fix-build-with-musl-libc.patch b/package/iperf/0001-Fix-build-with-musl-libc.patch deleted file mode 100644 index 269079ee1e7..00000000000 --- a/package/iperf/0001-Fix-build-with-musl-libc.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 6766ab322a9eb8c73f8276be9cdea356eb124de0 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Thu, 11 Nov 2021 07:58:10 +0200 -Subject: [PATCH] Fix build with musl libc -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -musl libc defines its own struct ethhdr that conflicts with the kernel -define one. The kernel headers provide a way to suppress its struct -ethhdr. For that to work the libc headers must precede the kernel. Move -the kernel linux/if_tun.h include below libc net/ethernet.h. That fixes -the following build failure: - -In file included from .../arm-buildroot-linux-musleabihf/sysroot/usr/include/net/ethernet.h:10, - from ../include/headers.h:117, - from Thread.c:72: -.../arm-buildroot-linux-musleabihf/sysroot/usr/include/netinet/if_ether.h:116:8: error: redefinition of ‘struct ethhdr’ - 116 | struct ethhdr { - | ^~~~~~ -In file included from .../arm-buildroot-linux-musleabihf/sysroot/usr/include/linux/if_tun.h:20, - from ../include/headers.h:110, - from Thread.c:72: -.../arm-buildroot-linux-musleabihf/sysroot/usr/include/linux/if_ether.h:148:8: note: originally defined here - 148 | struct ethhdr { - | ^~~~~~ - -Fixes bug #157. - -Signed-off-by: Baruch Siach ---- -Upstream status: sent to Robert McMahon - - include/headers.h | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/include/headers.h b/include/headers.h -index 00e0ea0dba42..887490475381 100644 ---- a/include/headers.h -+++ b/include/headers.h -@@ -106,11 +106,6 @@ typedef bool _Bool; - #include - #endif - --#if ((HAVE_TUNTAP_TAP) || (HAVE_TUNTAP_TUN)) --#include --#include --#endif -- - - // AF_PACKET HEADERS - #if defined(HAVE_LINUX_FILTER_H) && defined(HAVE_AF_PACKET) -@@ -146,6 +141,11 @@ typedef bool _Bool; - #define IPV6HDRLEN 40 - #endif // HAVE_AF_PACKET - -+#if ((HAVE_TUNTAP_TAP) || (HAVE_TUNTAP_TUN)) -+#include -+#include -+#endif -+ - #ifdef WIN32 - - /* Windows config file */ --- -2.33.0 - diff --git a/package/iperf/0001-fix-single-threaded-compile-breakage.patch b/package/iperf/0001-fix-single-threaded-compile-breakage.patch new file mode 100644 index 00000000000..85baf76ea41 --- /dev/null +++ b/package/iperf/0001-fix-single-threaded-compile-breakage.patch @@ -0,0 +1,32 @@ +From 6405b7a005bb2364466b56f480d50af0be423d76 Mon Sep 17 00:00:00 2001 +From: Robert McMahon +Date: Tue, 27 Sep 2022 20:31:04 -0700 +Subject: [PATCH] fix single threaded compile breakage + +[Retrieved (and backported) from: +https://sourceforge.net/p/iperf2/code/ci/6405b7a005bb2364466b56f480d50af0be423d76] +Signed-off-by: Fabrice Fontaine +--- + include/version.h | 2 +- + src/Settings.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/Settings.cpp b/src/Settings.cpp +index aac1b5f..fc5a181 100644 +--- a/src/Settings.cpp ++++ b/src/Settings.cpp +@@ -1160,10 +1160,10 @@ void Settings_Interpret (char option, const char *optarg, struct thread_Settings + delete [] tmp; + } + } ++ } + #else + fprintf(stderr, "bounceback-congest option requires a platform that supports threads\n"); + #endif +- } + } + if (bouncebackdelaystart) { + bouncebackdelaystart = 0; +-- +2.35.1 + diff --git a/package/iperf/0002-compat-gettcpinfo.c-fix-build.patch b/package/iperf/0002-compat-gettcpinfo.c-fix-build.patch deleted file mode 100644 index 786c7d1873c..00000000000 --- a/package/iperf/0002-compat-gettcpinfo.c-fix-build.patch +++ /dev/null @@ -1,34 +0,0 @@ -From a3339604bafa99f66e12687efc2c50d2e2df1276 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 12 Dec 2021 20:03:04 +0100 -Subject: [PATCH] compat/gettcpinfo.c: fix build - -Fix the following build failure raised since commit -c8f861a0a07b0606a581f2658c71959ad9417923: - -gettcpinfo.c: In function 'gettcpinfo': -gettcpinfo.c:101:42: error: expected declaration or statement at end of input - 101 | inline void gettcpinfo (int sock, struct ReportStruct *sample) { - | ^~~~~~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/073e070478f0cda34784af96bb3a802c3aac8f72 - -Signed-off-by: Fabrice Fontaine ---- - compat/gettcpinfo.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/compat/gettcpinfo.c b/compat/gettcpinfo.c -index 4e11e2a..1d3791a 100644 ---- a/compat/gettcpinfo.c -+++ b/compat/gettcpinfo.c -@@ -99,4 +99,5 @@ inline void gettcpinfo (SOCKET sock, struct ReportStruct *sample) { - }; - #else - inline void gettcpinfo (int sock, struct ReportStruct *sample) { -+}; - #endif --- -2.33.0 - diff --git a/package/iperf/iperf.hash b/package/iperf/iperf.hash index 2e1f433dc7c..34218bcf3b7 100644 --- a/package/iperf/iperf.hash +++ b/package/iperf/iperf.hash @@ -1,6 +1,6 @@ # From https://sourceforge.net/projects/iperf2/files/ -sha1 41bd049625cbecda2bf5b6a6cc12a6c5baec549b iperf-2.1.6.tar.gz +sha1 7725efffc6ef46fe5247ee326c39e5fa2eadf1eb iperf-2.1.8.tar.gz # Locally computed: -sha256 4a43e44439b95622aebeee55754a17d1c94076032e90620dfc1ab9908cb9e080 iperf-2.1.6.tar.gz +sha256 8e2cf2fbc9d0d4d1cf9d109b1e328459f9622993dc9a4c5a7dc8a2088fb7beaf iperf-2.1.8.tar.gz sha256 5f9f5c4feca3347c3b3c0ada8b16b4e6b698aac4e6f016a24adf61a5915336d1 COPYING diff --git a/package/iperf/iperf.mk b/package/iperf/iperf.mk index f999ff4ac28..47944880a3c 100644 --- a/package/iperf/iperf.mk +++ b/package/iperf/iperf.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPERF_VERSION = 2.1.6 +IPERF_VERSION = 2.1.8 IPERF_SITE = http://downloads.sourceforge.net/project/iperf2 IPERF_LICENSE = MIT-like IPERF_LICENSE_FILES = COPYING diff --git a/package/iperf3/iperf3.hash b/package/iperf3/iperf3.hash index c96d68cd993..02ada0dcc64 100644 --- a/package/iperf3/iperf3.hash +++ b/package/iperf3/iperf3.hash @@ -1,4 +1,4 @@ -# From https://downloads.es.net/pub/iperf/iperf-3.10.1.tar.gz.sha256 -sha256 03bc9760cc54a245191d46bfc8edaf8a4750f0e87abca6764486972044d6715a iperf-3.10.1.tar.gz +# From https://downloads.es.net/pub/iperf/iperf-3.14.tar.gz.sha256 +sha256 723fcc430a027bc6952628fa2a3ac77584a1d0bd328275e573fc9b206c155004 iperf-3.14.tar.gz # Locally computed -sha256 0e1cb1921904626f0d3e86cacc0e28333140f0f9957267cff0b9d185645743ed LICENSE +sha256 35aa7c4618b9884d6faa9b43a4e70291b35ea9f89329d5d33becd852e85221b0 LICENSE diff --git a/package/iperf3/iperf3.mk b/package/iperf3/iperf3.mk index 8c57c61fcee..c00b16ce613 100644 --- a/package/iperf3/iperf3.mk +++ b/package/iperf3/iperf3.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPERF3_VERSION = 3.10.1 +IPERF3_VERSION = 3.14 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/0001-Fix-missing-stddef.h-include.patch b/package/ipmitool/0001-Fix-missing-stddef.h-include.patch deleted file mode 100644 index dc3f92e4827..00000000000 --- a/package/ipmitool/0001-Fix-missing-stddef.h-include.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 04d489936191e685123978a1ca370f9cc30e6a06 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Mon, 18 Apr 2016 21:17:26 +0200 -Subject: [PATCH] Fix missing stddef.h include -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Needed for wchar_t. Fixes build error: - -imbapi.h:140:9: error: unknown type name 'wchar_t' - typedef wchar_t WCHAR; - -Upstream status: Pending -https://sourceforge.net/p/ipmitool/mailman/message/35022779/ - -Signed-off-by: Jörg Krause ---- - src/plugins/imb/imbapi.h | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/plugins/imb/imbapi.h b/src/plugins/imb/imbapi.h -index 6ba4121..6b39b47 100644 ---- a/src/plugins/imb/imbapi.h -+++ b/src/plugins/imb/imbapi.h -@@ -33,6 +33,9 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - *----------------------------------------------------------------------*/ -+ -+#include -+ - #ifndef _WINDEFS_H - #define _WINDEFS_H - #ifndef FALSE --- -2.10.2 - diff --git a/package/ipmitool/0001-configure.ac-fix-readline-static-build.patch b/package/ipmitool/0001-configure.ac-fix-readline-static-build.patch new file mode 100644 index 00000000000..e3d43495025 --- /dev/null +++ b/package/ipmitool/0001-configure.ac-fix-readline-static-build.patch @@ -0,0 +1,49 @@ +From 9836e2211ba8b3035a1d390bbf6a0eebe4c2439d Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 3 Nov 2022 17:19:09 +0100 +Subject: [PATCH] configure.ac: fix readline static build + +Use pkg-config to retrieve readline dependencies such as ncurses to +avoid the following static build when readline is built with ncurses +support (which is raised since version 1.8.19 and +https://github.com/ipmitool/ipmitool/commit/63dd71c39c9bf522ad3a785dd001737a285458eb): + +** Unable to build Solaris 9 x86 IPMI interface support! +checking for library containing readline... no +configure: error: ** Unable to find readline required by ipmishell. + +[...] + +configure:15125: /tmp/instance-0/output-1/host/bin/armeb-buildroot-linux-musleabi-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O0 -g0 -static -Wall -Wextra -std=gnu11 -pedantic -Wformat -Wformat-nonliteral -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -static conftest.c -lreadline -lcrypto >&5 +/tmp/instance-0/output-1/host/lib/gcc/armeb-buildroot-linux-musleabi/11.3.0/../../../../armeb-buildroot-linux-musleabi/bin/ld: /tmp/instance-0/output-1/host/armeb-buildroot-linux-musleabi/sysroot/usr/lib/libreadline.a(display.o): in function `_rl_move_cursor_relative': +display.c:(.text+0x80fc): undefined reference to `tputs' + +Fixes: + - http://autobuild.buildroot.org/results/dabc6a4f49d464c129ac6bc3710011678142fcbe + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/ipmitool/ipmitool/pull/374] +--- + configure.ac | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index d6ba62b..4ee1be8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -624,7 +624,11 @@ AC_ARG_ENABLE([ipmishell], + + dnl check for readline library to enable ipmi shell + if test "x$xenable_ipmishell" = "xyes"; then +- AC_SEARCH_LIBS([readline], [readline edit], [have_readline=yes]) ++ PKG_PROG_PKG_CONFIG ++ PKG_CHECK_MODULES([READLINE], [readline], ++ [LIBS="$LIBS $READLINE_LIBS" have_readline=yes], ++ [AC_SEARCH_LIBS([readline], [readline edit], [have_readline=yes])] ++ ) + if test "x$have_readline" != "xyes"; then + AC_MSG_ERROR([** Unable to find readline required by ipmishell.]) + xenable_ipmishell=no +-- +2.35.1 + diff --git a/package/ipmitool/0002-Fix-enterprise-numbers-URL.patch b/package/ipmitool/0002-Fix-enterprise-numbers-URL.patch new file mode 100644 index 00000000000..07cdbd45271 --- /dev/null +++ b/package/ipmitool/0002-Fix-enterprise-numbers-URL.patch @@ -0,0 +1,36 @@ +From 1edb0e27e44196d1ebe449aba0b9be22d376bcb6 Mon Sep 17 00:00:00 2001 +From: Alexander Amelkin +Date: Tue, 22 Nov 2022 13:55:33 +0300 +Subject: [PATCH] Fix enterprise-numbers URL + +IANA has changed their URL scheme, and the content at the old URL for +enterprise-numbers switched from text/plain to text/html. + +Fix Makefile.am to use the new URL + +Resolves ipmitool/ipmitool#377 + +Signed-off-by: Alexander Amelkin + +[vfazio: backport from upstream 1edb0e27e44196d1ebe449aba0b9be22d376bcb6] +Signed-off-by: Vincent Fazio +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index ce3267f..3182a52 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -41,7 +41,7 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure configure-stamp \ + $(distdir).tar.gz $(distdir).tar.bz2 + + SUBDIRS = lib src include doc contrib control +-IANA_PEN = http://www.iana.org/assignments/enterprise-numbers ++IANA_PEN = http://www.iana.org/assignments/enterprise-numbers.txt + + dist-hook: + cp control/ipmitool.spec $(distdir) +-- +2.25.1 + diff --git a/package/ipmitool/0002-ID-461-OpenSSL-1.1-compatibility-error-storage-size-.patch b/package/ipmitool/0002-ID-461-OpenSSL-1.1-compatibility-error-storage-size-.patch deleted file mode 100644 index d43f22e278e..00000000000 --- a/package/ipmitool/0002-ID-461-OpenSSL-1.1-compatibility-error-storage-size-.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 1ad09f56d461e78ad83c77b654fb65467a68388b Mon Sep 17 00:00:00 2001 -From: Dennis Schridde -Date: Wed, 30 Nov 2016 17:33:00 +0100 -Subject: [PATCH] ID:461 - OpenSSL 1.1 compatibility - "error: storage size - of 'ctx' isn't known" - -In OpenSSL 1.1 EVP_CIPHER_CTX became opaque, cf. `man 3ssl EVP_EncryptInit` - -Fixes: ID:461 - -Upstream: https://github.com/ipmitool/ipmitool/commit/b57487e360916ab3eaa50aa6d021c73b6337a4a0 - -Signed-off-by: Matthew Weber ---- - src/plugins/lanplus/lanplus_crypt_impl.c | 28 ++++++++++++++-------------- - 1 file changed, 14 insertions(+), 14 deletions(-) - -diff --git a/src/plugins/lanplus/lanplus_crypt_impl.c b/src/plugins/lanplus/lanplus_crypt_impl.c -index d5fac37..3c0df23 100644 ---- a/src/plugins/lanplus/lanplus_crypt_impl.c -+++ b/src/plugins/lanplus/lanplus_crypt_impl.c -@@ -164,10 +164,10 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv, - uint8_t * output, - uint32_t * bytes_written) - { -- EVP_CIPHER_CTX ctx; -- EVP_CIPHER_CTX_init(&ctx); -- EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv); -- EVP_CIPHER_CTX_set_padding(&ctx, 0); -+ EVP_CIPHER_CTX* ctx; -+ EVP_CIPHER_CTX_init(ctx); -+ EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv); -+ EVP_CIPHER_CTX_set_padding(ctx, 0); - - - *bytes_written = 0; -@@ -191,7 +191,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv, - assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0); - - -- if(!EVP_EncryptUpdate(&ctx, output, (int *)bytes_written, input, input_length)) -+ if(!EVP_EncryptUpdate(ctx, output, (int *)bytes_written, input, input_length)) - { - /* Error */ - *bytes_written = 0; -@@ -201,7 +201,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv, - { - uint32_t tmplen; - -- if(!EVP_EncryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen)) -+ if(!EVP_EncryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen)) - { - *bytes_written = 0; - return; /* Error */ -@@ -210,7 +210,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv, - { - /* Success */ - *bytes_written += tmplen; -- EVP_CIPHER_CTX_cleanup(&ctx); -+ EVP_CIPHER_CTX_cleanup(ctx); - } - } - } -@@ -239,10 +239,10 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv, - uint8_t * output, - uint32_t * bytes_written) - { -- EVP_CIPHER_CTX ctx; -- EVP_CIPHER_CTX_init(&ctx); -- EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv); -- EVP_CIPHER_CTX_set_padding(&ctx, 0); -+ EVP_CIPHER_CTX* ctx; -+ EVP_CIPHER_CTX_init(ctx); -+ EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv); -+ EVP_CIPHER_CTX_set_padding(ctx, 0); - - - if (verbose >= 5) -@@ -266,7 +266,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv, - assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0); - - -- if (!EVP_DecryptUpdate(&ctx, output, (int *)bytes_written, input, input_length)) -+ if (!EVP_DecryptUpdate(ctx, output, (int *)bytes_written, input, input_length)) - { - /* Error */ - lprintf(LOG_DEBUG, "ERROR: decrypt update failed"); -@@ -277,7 +277,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv, - { - uint32_t tmplen; - -- if (!EVP_DecryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen)) -+ if (!EVP_DecryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen)) - { - char buffer[1000]; - ERR_error_string(ERR_get_error(), buffer); -@@ -290,7 +290,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv, - { - /* Success */ - *bytes_written += tmplen; -- EVP_CIPHER_CTX_cleanup(&ctx); -+ EVP_CIPHER_CTX_cleanup(ctx); - } - } - --- -1.9.1 - diff --git a/package/ipmitool/0003-Do-not-require-the-IANA-PEN-registry-file.patch b/package/ipmitool/0003-Do-not-require-the-IANA-PEN-registry-file.patch new file mode 100644 index 00000000000..3f35a78af22 --- /dev/null +++ b/package/ipmitool/0003-Do-not-require-the-IANA-PEN-registry-file.patch @@ -0,0 +1,115 @@ +From 26b088193a55624df4cbe2a0d33c7bba5bca108d Mon Sep 17 00:00:00 2001 +From: Vincent Fazio +Date: Sat, 7 Jan 2023 21:02:48 -0600 +Subject: [PATCH] Do not require the IANA PEN registry file + +Previously, ipmitool would fail to run if the local copy of the IANA PEN +registry could not be parsed. + +When the registry is not available the manufacturer will be "Unknown" but +ipmitool will otherwise function so should not be considered fatal. + +Also, fix an issue with improperly handling the `oem_info_list_load` +return value. Previously, in `ipmi_oem_info_init`, if `oem_info_list_load` +returned a negative value due to the registry file not existing, an +improper count would cause `oem_info_init_from_list` to aallocate a list +that didn't encompass the full header/tail list. + + IANA PEN registry open failed: No such file or directory + Allocating 3 entries + [ 1] 16777214 | A Debug Assisting Company, Ltd. + [ 0] 1048575 | Unspecified + +Now, use a signed int and ensure a valid count of loaded OEMs is used. + +Signed-off-by: Vincent Fazio + +[vfazio: backport from upstream 26b088193a55624df4cbe2a0d33c7bba5bca108d] +Signed-off-by: Vincent Fazio +--- + include/ipmitool/ipmi_strings.h | 2 +- + lib/ipmi_main.c | 5 +---- + lib/ipmi_strings.c | 19 +++++-------------- + 3 files changed, 7 insertions(+), 19 deletions(-) + +diff --git a/include/ipmitool/ipmi_strings.h b/include/ipmitool/ipmi_strings.h +index 17c37c6..d60179c 100644 +--- a/include/ipmitool/ipmi_strings.h ++++ b/include/ipmitool/ipmi_strings.h +@@ -55,7 +55,7 @@ extern const struct valstr ipmi_integrity_algorithms[]; + extern const struct valstr ipmi_encryption_algorithms[]; + extern const struct valstr ipmi_user_enable_status_vals[]; + extern const struct valstr *ipmi_oem_info; +-int ipmi_oem_info_init(); ++void ipmi_oem_info_init(); + void ipmi_oem_info_free(); + + extern const struct valstr picmg_frucontrol_vals[]; +diff --git a/lib/ipmi_main.c b/lib/ipmi_main.c +index a673a30..510bc2d 100644 +--- a/lib/ipmi_main.c ++++ b/lib/ipmi_main.c +@@ -853,10 +853,7 @@ ipmi_main(int argc, char ** argv, + } + + /* load the IANA PEN registry */ +- if (ipmi_oem_info_init()) { +- lprintf(LOG_ERR, "Failed to initialize the OEM info dictionary"); +- goto out_free; +- } ++ ipmi_oem_info_init(); + + /* run OEM setup if found */ + if (oemtype && +diff --git a/lib/ipmi_strings.c b/lib/ipmi_strings.c +index 26b359f..c8fc2d0 100644 +--- a/lib/ipmi_strings.c ++++ b/lib/ipmi_strings.c +@@ -1719,39 +1719,30 @@ out: + return rc; + } + +-int ipmi_oem_info_init() ++void ipmi_oem_info_init() + { + oem_valstr_list_t terminator = { { -1, NULL}, NULL }; /* Terminator */ + oem_valstr_list_t *oemlist = &terminator; + bool free_strings = true; +- size_t count; +- int rc = -4; ++ int count; + + lprintf(LOG_INFO, "Loading IANA PEN Registry..."); + + if (ipmi_oem_info) { + lprintf(LOG_INFO, "IANA PEN Registry is already loaded"); +- rc = 0; + goto out; + } + +- if (!(count = oem_info_list_load(&oemlist))) { +- /* +- * We can't identify OEMs without a loaded registry. +- * Set the pointer to dummy and return. +- */ +- ipmi_oem_info = ipmi_oem_info_dummy; +- goto out; ++ if ((count = oem_info_list_load(&oemlist)) < 1) { ++ lprintf(LOG_WARN, "Failed to load entries from IANA PEN Registry"); ++ count = 0; + } + + /* In the array was allocated, don't free the strings at cleanup */ + free_strings = !oem_info_init_from_list(oemlist, count); + +- rc = IPMI_CC_OK; +- + out: + oem_info_list_free(&oemlist, free_strings); +- return rc; + } + + void ipmi_oem_info_free() +-- +2.25.1 + diff --git a/package/ipmitool/0003-ID-461-Make-compiler-happier-about-changes-related-t.patch b/package/ipmitool/0003-ID-461-Make-compiler-happier-about-changes-related-t.patch deleted file mode 100644 index 7ff27bdab6e..00000000000 --- a/package/ipmitool/0003-ID-461-Make-compiler-happier-about-changes-related-t.patch +++ /dev/null @@ -1,40 +0,0 @@ -From ccc85e4fd67423e770901ec59975e84b07eed883 Mon Sep 17 00:00:00 2001 -From: Zdenek Styblik -Date: Sun, 15 Jan 2017 15:11:25 +0100 -Subject: [PATCH] ID:461 - Make compiler happier about changes related to - OpenSSL 1.1 - -Complaint was that ctx isn't initialized. - -Upstream: https://github.com/ipmitool/ipmitool/commit/77fe5635037ebaf411cae46cf5045ca819b5c145 - -Signed-off-by: Matthew Weber ---- - src/plugins/lanplus/lanplus_crypt_impl.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/plugins/lanplus/lanplus_crypt_impl.c b/src/plugins/lanplus/lanplus_crypt_impl.c -index 3c0df23..d12d0e3 100644 ---- a/src/plugins/lanplus/lanplus_crypt_impl.c -+++ b/src/plugins/lanplus/lanplus_crypt_impl.c -@@ -164,7 +164,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv, - uint8_t * output, - uint32_t * bytes_written) - { -- EVP_CIPHER_CTX* ctx; -+ EVP_CIPHER_CTX *ctx = NULL; - EVP_CIPHER_CTX_init(ctx); - EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv); - EVP_CIPHER_CTX_set_padding(ctx, 0); -@@ -239,7 +239,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv, - uint8_t * output, - uint32_t * bytes_written) - { -- EVP_CIPHER_CTX* ctx; -+ EVP_CIPHER_CTX *ctx = NULL; - EVP_CIPHER_CTX_init(ctx); - EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv); - EVP_CIPHER_CTX_set_padding(ctx, 0); --- -1.9.1 - diff --git a/package/ipmitool/0004-ID-480-ipmitool-coredumps-in-EVP_CIPHER_CTX_init.patch b/package/ipmitool/0004-ID-480-ipmitool-coredumps-in-EVP_CIPHER_CTX_init.patch deleted file mode 100644 index aabcc62d32c..00000000000 --- a/package/ipmitool/0004-ID-480-ipmitool-coredumps-in-EVP_CIPHER_CTX_init.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 72df3eadb27161a292f35b1d97178f70f41e50f6 Mon Sep 17 00:00:00 2001 -From: Zdenek Styblik -Date: Sun, 12 Mar 2017 14:00:35 +0100 -Subject: [PATCH] ID:480 - ipmitool coredumps in EVP_CIPHER_CTX_init - -IPMI tool coredumps due to changes introduced in ID:461. This shouldn't be -surprise as a NULL pointer is passed to init. Commit addresses this issue by -calling EVP_CIPHER_CTX_new() instead of EVP_CIPHER_CTX_init(), which is -deprecated, and by checking return value of call to former function. - -Upstream: https://github.com/ipmitool/ipmitool/commit/f004b4b7197fc83e7d47ec8cbcaefffa9a922717 - -Signed-off-by: Matthew Weber ---- - src/plugins/lanplus/lanplus_crypt_impl.c | 14 ++++++++++---- - 1 file changed, 10 insertions(+), 4 deletions(-) - -diff --git a/src/plugins/lanplus/lanplus_crypt_impl.c b/src/plugins/lanplus/lanplus_crypt_impl.c -index d12d0e3..0e330c1 100644 ---- a/src/plugins/lanplus/lanplus_crypt_impl.c -+++ b/src/plugins/lanplus/lanplus_crypt_impl.c -@@ -165,10 +165,13 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv, - uint32_t * bytes_written) - { - EVP_CIPHER_CTX *ctx = NULL; -- EVP_CIPHER_CTX_init(ctx); -+ ctx = EVP_CIPHER_CTX_new(); -+ if (ctx == NULL) { -+ *bytes_written = 0; -+ return; -+ } - EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv); - EVP_CIPHER_CTX_set_padding(ctx, 0); -- - - *bytes_written = 0; - -@@ -240,11 +243,14 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv, - uint32_t * bytes_written) - { - EVP_CIPHER_CTX *ctx = NULL; -- EVP_CIPHER_CTX_init(ctx); -+ ctx = EVP_CIPHER_CTX_new(); -+ if (ctx == NULL) { -+ *bytes_written = 0; -+ return; -+ } - EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv); - EVP_CIPHER_CTX_set_padding(ctx, 0); - -- - if (verbose >= 5) - { - printbuf(iv, 16, "decrypting with this IV"); --- -1.9.1 - diff --git a/package/ipmitool/0004-configure.ac-allow-disabling-registry-downloads.patch b/package/ipmitool/0004-configure.ac-allow-disabling-registry-downloads.patch new file mode 100644 index 00000000000..9a995b9a14c --- /dev/null +++ b/package/ipmitool/0004-configure.ac-allow-disabling-registry-downloads.patch @@ -0,0 +1,75 @@ +From be11d948f89b10be094e28d8a0a5e8fb532c7b60 Mon Sep 17 00:00:00 2001 +From: Vincent Fazio +Date: Wed, 11 Jan 2023 22:55:51 -0600 +Subject: [PATCH] configure.ac: allow disabling registry downloads + +Some environments require reproducible builds. Since the IANA PEN +registry is constantly updating and there is no snapshot available, +installing ipmitool via `make install` is not reproducible. + +Provide a configure mechanism to disable the registry download/install.. + +[vfazio: backport from upstream be11d948f89b10be094e28d8a0a5e8fb532c7b60] +Signed-off-by: Vincent Fazio +--- + configure.ac | 30 ++++++++++++++++++++---------- + 1 file changed, 20 insertions(+), 10 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 4ee1be8..1dd2742 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -18,8 +18,6 @@ AC_PROG_LN_S + AC_PROG_MAKE_SET + AC_CHECK_PROG([RPMBUILD], [rpmbuild], [rpmbuild], [rpm]) + AC_CHECK_PROG([SED], [sed], [sed]) +-AC_CHECK_PROG([WGET], [wget], [wget]) +-AC_CHECK_PROG([CURL], [curl], [curl]) + + AC_HEADER_STDC + AC_CHECK_HEADERS([stdlib.h string.h sys/ioctl.h sys/stat.h unistd.h paths.h]) +@@ -56,21 +54,33 @@ if test "x$exec_prefix" = "xNONE"; then + exec_prefix="$prefix" + fi + +-if test "x$WGET" = "x"; then +- if test "x$CURL" = "x"; then ++dnl allow enabling/disabling the fetching of the IANA PEN registry ++AC_ARG_ENABLE([registry-download], ++ [AC_HELP_STRING([--enable-registry-download], ++ [download/install the IANA PEN registry [default=yes]])], ++ [xenable_registry_download=$enableval], ++ [xenable_registry_download=yes]) ++ ++AM_CONDITIONAL([DOWNLOAD], [false]) ++ ++if test "x$xenable_registry_download" = "xyes"; then ++ AC_CHECK_PROG([WGET], [wget], [wget]) ++ AC_CHECK_PROG([CURL], [curl], [curl]) ++ ++ if test "x$WGET" = "x" && test "x$CURL" = "x"; then + AC_MSG_WARN([** Neither wget nor curl could be found.]) + AC_MSG_WARN([** IANA PEN database will not be installed by `make install` !]) + else +- DOWNLOAD="$CURL --location --progress-bar" + AM_CONDITIONAL([DOWNLOAD], [true]) ++ if test "x$WGET" != "x"; then ++ DOWNLOAD="$WGET -c -nd -O -" ++ else ++ DOWNLOAD="$CURL --location --progress-bar" ++ fi + fi +-else +- DOWNLOAD="$WGET -c -nd -O -" +- AM_CONDITIONAL([DOWNLOAD], [true]) + fi + +-AC_MSG_WARN([** Download is:]) +-AC_MSG_WARN($DOWNLOAD) ++AC_MSG_WARN([** Download is: $DOWNLOAD]) + AC_SUBST(DOWNLOAD, $DOWNLOAD) + + dnl +-- +2.25.1 + diff --git a/package/ipmitool/0005-ID-480-Call-EVP_CIPHER_CTX_free-instead-of-EVP_CIPHE.patch b/package/ipmitool/0005-ID-480-Call-EVP_CIPHER_CTX_free-instead-of-EVP_CIPHE.patch deleted file mode 100644 index b3ce9650773..00000000000 --- a/package/ipmitool/0005-ID-480-Call-EVP_CIPHER_CTX_free-instead-of-EVP_CIPHE.patch +++ /dev/null @@ -1,148 +0,0 @@ -From d9d6e0bff831da03f4448f0cdb82fc3d143662c8 Mon Sep 17 00:00:00 2001 -From: Holger Liebig -Date: Tue, 4 Apr 2017 20:43:05 +0200 -Subject: [PATCH] ID:480 - Call EVP_CIPHER_CTX_free() instead of - EVP_CIPHER_CTX_cleanup() - -Call EVP_CIPHER_CTX_free() instead of EVP_CIPHER_CTX_cleanup() to fix memory -leak. - -Upstream: https://github.com/ipmitool/ipmitool/commit/1664902525a1c3771b4d8b3ccab7ea1ba6b2bdd1 - -Signed-off-by: Matthew Weber ---- - src/plugins/lanplus/lanplus_crypt_impl.c | 44 +++++++++++++++++--------------- - 1 file changed, 23 insertions(+), 21 deletions(-) - -diff --git a/src/plugins/lanplus/lanplus_crypt_impl.c b/src/plugins/lanplus/lanplus_crypt_impl.c -index 0e330c1..9652a5e 100644 ---- a/src/plugins/lanplus/lanplus_crypt_impl.c -+++ b/src/plugins/lanplus/lanplus_crypt_impl.c -@@ -165,13 +165,6 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv, - uint32_t * bytes_written) - { - EVP_CIPHER_CTX *ctx = NULL; -- ctx = EVP_CIPHER_CTX_new(); -- if (ctx == NULL) { -- *bytes_written = 0; -- return; -- } -- EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv); -- EVP_CIPHER_CTX_set_padding(ctx, 0); - - *bytes_written = 0; - -@@ -185,6 +178,14 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv, - printbuf(input, input_length, "encrypting this data"); - } - -+ ctx = EVP_CIPHER_CTX_new(); -+ if (ctx == NULL) { -+ lprintf(LOG_DEBUG, "ERROR: EVP_CIPHER_CTX_new() failed"); -+ return; -+ } -+ EVP_CIPHER_CTX_init(ctx); -+ EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv); -+ EVP_CIPHER_CTX_set_padding(ctx, 0); - - /* - * The default implementation adds a whole block of padding if the input -@@ -198,7 +199,6 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv, - { - /* Error */ - *bytes_written = 0; -- return; - } - else - { -@@ -206,16 +206,17 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv, - - if(!EVP_EncryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen)) - { -+ /* Error */ - *bytes_written = 0; -- return; /* Error */ - } - else - { - /* Success */ - *bytes_written += tmplen; -- EVP_CIPHER_CTX_cleanup(ctx); - } - } -+ /* performs cleanup and free */ -+ EVP_CIPHER_CTX_free(ctx); - } - - -@@ -243,13 +244,6 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv, - uint32_t * bytes_written) - { - EVP_CIPHER_CTX *ctx = NULL; -- ctx = EVP_CIPHER_CTX_new(); -- if (ctx == NULL) { -- *bytes_written = 0; -- return; -- } -- EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv); -- EVP_CIPHER_CTX_set_padding(ctx, 0); - - if (verbose >= 5) - { -@@ -258,12 +252,20 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv, - printbuf(input, input_length, "decrypting this data"); - } - -- - *bytes_written = 0; - - if (input_length == 0) - return; - -+ ctx = EVP_CIPHER_CTX_new(); -+ if (ctx == NULL) { -+ lprintf(LOG_DEBUG, "ERROR: EVP_CIPHER_CTX_new() failed"); -+ return; -+ } -+ EVP_CIPHER_CTX_init(ctx); -+ EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv); -+ EVP_CIPHER_CTX_set_padding(ctx, 0); -+ - /* - * The default implementation adds a whole block of padding if the input - * data is perfectly aligned. We would like to keep that from happening. -@@ -277,7 +279,6 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv, - /* Error */ - lprintf(LOG_DEBUG, "ERROR: decrypt update failed"); - *bytes_written = 0; -- return; - } - else - { -@@ -285,20 +286,21 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv, - - if (!EVP_DecryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen)) - { -+ /* Error */ - char buffer[1000]; - ERR_error_string(ERR_get_error(), buffer); - lprintf(LOG_DEBUG, "the ERR error %s", buffer); - lprintf(LOG_DEBUG, "ERROR: decrypt final failed"); - *bytes_written = 0; -- return; /* Error */ - } - else - { - /* Success */ - *bytes_written += tmplen; -- EVP_CIPHER_CTX_cleanup(ctx); - } - } -+ /* performs cleanup and free */ -+ EVP_CIPHER_CTX_free(ctx); - - if (verbose >= 5) - { --- -1.9.1 - diff --git a/package/ipmitool/0006-lanplus-Fix-compile-with-deprecated-APIs-disabled.patch b/package/ipmitool/0006-lanplus-Fix-compile-with-deprecated-APIs-disabled.patch deleted file mode 100644 index 87fdd0aaf70..00000000000 --- a/package/ipmitool/0006-lanplus-Fix-compile-with-deprecated-APIs-disabled.patch +++ /dev/null @@ -1,50 +0,0 @@ -From fc2136969adfb926eed610b8ed0a74b2030b48ed Mon Sep 17 00:00:00 2001 -From: Rosen Penev -Date: Tue, 21 Aug 2018 19:29:07 -0700 -Subject: [PATCH] lanplus: Fix compile with deprecated APIs disabled. - -From the man page: - -EVP_CIPHER_CTX was made opaque in OpenSSL 1.1.0. As a result, -EVP_CIPHER_CTX_reset() appeared and EVP_CIPHER_CTX_cleanup() disappeared. -EVP_CIPHER_CTX_init() remains as an alias for EVP_CIPHER_CTX_reset(). - -Upstream: https://github.com/ipmitool/ipmitool/commit/a8862d7508fb138b1c286eea958700cca63c9476 - -Signed-off-by: Rosen Penev -Signed-off-by: Matthew Weber ---- - src/plugins/lanplus/lanplus_crypt_impl.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/src/plugins/lanplus/lanplus_crypt_impl.c b/src/plugins/lanplus/lanplus_crypt_impl.c -index 9652a5e..e94401e 100644 ---- a/src/plugins/lanplus/lanplus_crypt_impl.c -+++ b/src/plugins/lanplus/lanplus_crypt_impl.c -@@ -183,7 +183,11 @@ lanplus_encrypt_aes_cbc_128(const uint8_t * iv, - lprintf(LOG_DEBUG, "ERROR: EVP_CIPHER_CTX_new() failed"); - return; - } -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - EVP_CIPHER_CTX_init(ctx); -+#else -+ EVP_CIPHER_CTX_reset(ctx); -+#endif - EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv); - EVP_CIPHER_CTX_set_padding(ctx, 0); - -@@ -262,7 +266,11 @@ lanplus_decrypt_aes_cbc_128(const uint8_t * iv, - lprintf(LOG_DEBUG, "ERROR: EVP_CIPHER_CTX_new() failed"); - return; - } -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - EVP_CIPHER_CTX_init(ctx); -+#else -+ EVP_CIPHER_CTX_reset(ctx); -+#endif - EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv); - EVP_CIPHER_CTX_set_padding(ctx, 0); - --- -1.9.1 - diff --git a/package/ipmitool/0007-hpmfwupg-move-variable-definition-to-c-file.patch b/package/ipmitool/0007-hpmfwupg-move-variable-definition-to-c-file.patch deleted file mode 100644 index 0b49160ba41..00000000000 --- a/package/ipmitool/0007-hpmfwupg-move-variable-definition-to-c-file.patch +++ /dev/null @@ -1,40 +0,0 @@ -From c3939dac2c060651361fc71516806f9ab8c38901 Mon Sep 17 00:00:00 2001 -From: Vaclav Dolezal -Date: Thu, 23 Jan 2020 11:26:32 +0100 -Subject: [PATCH] hpmfwupg: move variable definition to .c file - -Signed-off-by: Vaclav Dolezal -[Retrieved from: -https://github.com/ipmitool/ipmitool/commit/c3939dac2c060651361fc71516806f9ab8c38901] -Signed-off-by: Fabrice Fontaine ---- - include/ipmitool/ipmi_hpmfwupg.h | 2 +- - lib/ipmi_hpmfwupg.c | 2 ++ - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/include/ipmitool/ipmi_hpmfwupg.h b/include/ipmitool/ipmi_hpmfwupg.h -index de65292b..07f597be 100644 ---- a/include/ipmitool/ipmi_hpmfwupg.h -+++ b/include/ipmitool/ipmi_hpmfwupg.h -@@ -800,7 +800,7 @@ typedef struct _VERSIONINFO { - char descString[HPMFWUPG_DESC_STRING_LENGTH + 1]; - }VERSIONINFO, *PVERSIONINFO; - --VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX]; -+extern VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX]; - - #define TARGET_VER (0x01) - #define ROLLBACK_VER (0x02) -diff --git a/lib/ipmi_hpmfwupg.c b/lib/ipmi_hpmfwupg.c -index 4aa8cecd..d63d2c15 100644 ---- a/lib/ipmi_hpmfwupg.c -+++ b/lib/ipmi_hpmfwupg.c -@@ -50,6 +50,8 @@ - - extern int verbose; - -+VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX]; -+ - int HpmfwupgUpgrade(struct ipmi_intf *intf, char *imageFilename, - int activate, int, int); - int HpmfwupgValidateImageIntegrity(struct HpmfwupgUpgradeCtx *pFwupgCtx); diff --git a/package/ipmitool/0008-fru-Fix-buffer-overflow-vulnerabilities.patch b/package/ipmitool/0008-fru-Fix-buffer-overflow-vulnerabilities.patch deleted file mode 100644 index a39713fdb1a..00000000000 --- a/package/ipmitool/0008-fru-Fix-buffer-overflow-vulnerabilities.patch +++ /dev/null @@ -1,132 +0,0 @@ -From d615cb6c39d401a569941be2a615176191afa7ac Mon Sep 17 00:00:00 2001 -From: Chrostoper Ertl -Date: Thu, 28 Nov 2019 16:33:59 +0000 -Subject: [PATCH] fru: Fix buffer overflow vulnerabilities - -Partial fix for CVE-2020-5208, see -https://github.com/ipmitool/ipmitool/security/advisories/GHSA-g659-9qxw-p7cp - -The `read_fru_area_section` function only performs size validation of -requested read size, and falsely assumes that the IPMI message will not -respond with more than the requested amount of data; it uses the -unvalidated response size to copy into `frubuf`. If the response is -larger than the request, this can result in overflowing the buffer. - -The same issue affects the `read_fru_area` function. - -[Retrieve from -https://github.com/ipmitool/ipmitool/commit/e824c23316ae50beb7f7488f2055ac65e8b341f2] -Signed-off-by: Heiko Thiery ---- - lib/ipmi_fru.c | 33 +++++++++++++++++++++++++++++++-- - 1 file changed, 31 insertions(+), 2 deletions(-) - -diff --git a/lib/ipmi_fru.c b/lib/ipmi_fru.c -index cf00eff..af99aa9 100644 ---- a/lib/ipmi_fru.c -+++ b/lib/ipmi_fru.c -@@ -615,7 +615,10 @@ int - read_fru_area(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id, - uint32_t offset, uint32_t length, uint8_t *frubuf) - { -- uint32_t off = offset, tmp, finish; -+ uint32_t off = offset; -+ uint32_t tmp; -+ uint32_t finish; -+ uint32_t size_left_in_buffer; - struct ipmi_rs * rsp; - struct ipmi_rq req; - uint8_t msg_data[4]; -@@ -628,10 +631,12 @@ read_fru_area(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id, - - finish = offset + length; - if (finish > fru->size) { -+ memset(frubuf + fru->size, 0, length - fru->size); - finish = fru->size; - lprintf(LOG_NOTICE, "Read FRU Area length %d too large, " - "Adjusting to %d", - offset + length, finish - offset); -+ length = finish - offset; - } - - memset(&req, 0, sizeof(req)); -@@ -667,6 +672,7 @@ read_fru_area(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id, - } - } - -+ size_left_in_buffer = length; - do { - tmp = fru->access ? off >> 1 : off; - msg_data[0] = id; -@@ -707,9 +713,18 @@ read_fru_area(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id, - } - - tmp = fru->access ? rsp->data[0] << 1 : rsp->data[0]; -+ if(rsp->data_len < 1 -+ || tmp > rsp->data_len - 1 -+ || tmp > size_left_in_buffer) -+ { -+ printf(" Not enough buffer size"); -+ return -1; -+ } -+ - memcpy(frubuf, rsp->data + 1, tmp); - off += tmp; - frubuf += tmp; -+ size_left_in_buffer -= tmp; - /* sometimes the size returned in the Info command - * is too large. return 0 so higher level function - * still attempts to parse what was returned */ -@@ -742,7 +757,9 @@ read_fru_area_section(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id, - uint32_t offset, uint32_t length, uint8_t *frubuf) - { - static uint32_t fru_data_rqst_size = 20; -- uint32_t off = offset, tmp, finish; -+ uint32_t off = offset; -+ uint32_t tmp, finish; -+ uint32_t size_left_in_buffer; - struct ipmi_rs * rsp; - struct ipmi_rq req; - uint8_t msg_data[4]; -@@ -755,10 +772,12 @@ read_fru_area_section(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id, - - finish = offset + length; - if (finish > fru->size) { -+ memset(frubuf + fru->size, 0, length - fru->size); - finish = fru->size; - lprintf(LOG_NOTICE, "Read FRU Area length %d too large, " - "Adjusting to %d", - offset + length, finish - offset); -+ length = finish - offset; - } - - memset(&req, 0, sizeof(req)); -@@ -773,6 +792,8 @@ read_fru_area_section(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id, - if (fru->access && fru_data_rqst_size > 16) - #endif - fru_data_rqst_size = 16; -+ -+ size_left_in_buffer = length; - do { - tmp = fru->access ? off >> 1 : off; - msg_data[0] = id; -@@ -804,8 +825,16 @@ read_fru_area_section(struct ipmi_intf * intf, struct fru_info *fru, uint8_t id, - } - - tmp = fru->access ? rsp->data[0] << 1 : rsp->data[0]; -+ if(rsp->data_len < 1 -+ || tmp > rsp->data_len - 1 -+ || tmp > size_left_in_buffer) -+ { -+ printf(" Not enough buffer size"); -+ return -1; -+ } - memcpy((frubuf + off)-offset, rsp->data + 1, tmp); - off += tmp; -+ size_left_in_buffer -= tmp; - - /* sometimes the size returned in the Info command - * is too large. return 0 so higher level function --- -2.20.1 - diff --git a/package/ipmitool/0009-fru-Fix-buffer-overflow-in-ipmi_spd_print_fru.patch b/package/ipmitool/0009-fru-Fix-buffer-overflow-in-ipmi_spd_print_fru.patch deleted file mode 100644 index 213a2ad7bb6..00000000000 --- a/package/ipmitool/0009-fru-Fix-buffer-overflow-in-ipmi_spd_print_fru.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 879f57c3b1ff17b1ca0dbdc8aac9c7a814e876fc Mon Sep 17 00:00:00 2001 -From: Chrostoper Ertl -Date: Thu, 28 Nov 2019 16:44:18 +0000 -Subject: [PATCH] fru: Fix buffer overflow in ipmi_spd_print_fru - -Partial fix for CVE-2020-5208, see -https://github.com/ipmitool/ipmitool/security/advisories/GHSA-g659-9qxw-p7cp - -The `ipmi_spd_print_fru` function has a similar issue as the one fixed -by the previous commit in `read_fru_area_section`. An initial request is -made to get the `fru.size`, which is used as the size for the allocation -of `spd_data`. Inside a loop, further requests are performed to get the -copy sizes which are not checked before being used as the size for a -copy into the buffer. - -[Retrieve from: -https://github.com/ipmitool/ipmitool/commit/840fb1cbb4fb365cb9797300e3374d4faefcdb10] -Signed-off-by: Heiko Thiery ---- - lib/dimm_spd.c | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/lib/dimm_spd.c b/lib/dimm_spd.c -index 41e30db..68f3b4f 100644 ---- a/lib/dimm_spd.c -+++ b/lib/dimm_spd.c -@@ -1621,7 +1621,7 @@ ipmi_spd_print_fru(struct ipmi_intf * intf, uint8_t id) - struct ipmi_rq req; - struct fru_info fru; - uint8_t *spd_data, msg_data[4]; -- int len, offset; -+ uint32_t len, offset; - - msg_data[0] = id; - -@@ -1697,6 +1697,13 @@ ipmi_spd_print_fru(struct ipmi_intf * intf, uint8_t id) - } - - len = rsp->data[0]; -+ if(rsp->data_len < 1 -+ || len > rsp->data_len - 1 -+ || len > fru.size - offset) -+ { -+ printf(" Not enough buffer size"); -+ return -1; -+ } - memcpy(&spd_data[offset], rsp->data + 1, len); - offset += len; - } while (offset < fru.size); --- -2.20.1 - diff --git a/package/ipmitool/0010-session-Fix-buffer-overflow-in-ipmi_get_session_info.patch b/package/ipmitool/0010-session-Fix-buffer-overflow-in-ipmi_get_session_info.patch deleted file mode 100644 index 94a5ce65049..00000000000 --- a/package/ipmitool/0010-session-Fix-buffer-overflow-in-ipmi_get_session_info.patch +++ /dev/null @@ -1,52 +0,0 @@ -From cd785a7fe4f42ab59bcefcf01b9175f039af29b5 Mon Sep 17 00:00:00 2001 -From: Chrostoper Ertl -Date: Thu, 28 Nov 2019 16:51:49 +0000 -Subject: [PATCH] session: Fix buffer overflow in ipmi_get_session_info - -Partial fix for CVE-2020-5208, see -https://github.com/ipmitool/ipmitool/security/advisories/GHSA-g659-9qxw-p7cp - -The `ipmi_get_session_info` function does not properly check the -response `data_len`, which is used as a copy size, allowing stack buffer -overflow. - -[Retrieve from: -https://github.com/ipmitool/ipmitool/commit/41d7026946fafbd4d1ec0bcaca3ea30a6e8eed22] -Signed-off-by: Heiko Thiery ---- - lib/ipmi_session.c | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - -diff --git a/lib/ipmi_session.c b/lib/ipmi_session.c -index 141f0f4..b9af1fd 100644 ---- a/lib/ipmi_session.c -+++ b/lib/ipmi_session.c -@@ -309,8 +309,10 @@ ipmi_get_session_info(struct ipmi_intf * intf, - } - else - { -- memcpy(&session_info, rsp->data, rsp->data_len); -- print_session_info(&session_info, rsp->data_len); -+ memcpy(&session_info, rsp->data, -+ __min(rsp->data_len, sizeof(session_info))); -+ print_session_info(&session_info, -+ __min(rsp->data_len, sizeof(session_info))); - } - break; - -@@ -341,8 +343,10 @@ ipmi_get_session_info(struct ipmi_intf * intf, - break; - } - -- memcpy(&session_info, rsp->data, rsp->data_len); -- print_session_info(&session_info, rsp->data_len); -+ memcpy(&session_info, rsp->data, -+ __min(rsp->data_len, sizeof(session_info))); -+ print_session_info(&session_info, -+ __min(rsp->data_len, sizeof(session_info))); - - } while (i <= session_info.session_slot_count); - break; --- -2.20.1 - diff --git a/package/ipmitool/0011-channel-Fix-buffer-overflow.patch b/package/ipmitool/0011-channel-Fix-buffer-overflow.patch deleted file mode 100644 index 62e04c3e27c..00000000000 --- a/package/ipmitool/0011-channel-Fix-buffer-overflow.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 1d479fc61feacc64adea64da9601f3dfcf6f74b3 Mon Sep 17 00:00:00 2001 -From: Chrostoper Ertl -Date: Thu, 28 Nov 2019 16:56:38 +0000 -Subject: [PATCH] channel: Fix buffer overflow -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Partial fix for CVE-2020-5208, see -https://github.com/ipmitool/ipmitool/security/advisories/GHSA-g659-9qxw-p7cp - -The `ipmi_get_channel_cipher_suites` function does not properly check -the final response’s `data_len`, which can lead to stack buffer overflow -on the final copy. - -[Retrieve from: -https://github.com/ipmitool/ipmitool/commit/9452be87181a6e83cfcc768b3ed8321763db50e4 - -The patch is slightly modified manually. The define -(MAX_CIPHER_SUITE_DATA_LEN) was introduced upstream in another patch. -Replace the define by the value 0x10.] - -Signed-off-by: Heiko Thiery ---- - lib/ipmi_channel.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/lib/ipmi_channel.c b/lib/ipmi_channel.c -index fab2e54..59ac227 100644 ---- a/lib/ipmi_channel.c -+++ b/lib/ipmi_channel.c -@@ -413,7 +413,10 @@ ipmi_get_channel_cipher_suites(struct ipmi_intf *intf, const char *payload_type, - lprintf(LOG_ERR, "Unable to Get Channel Cipher Suites"); - return -1; - } -- if (rsp->ccode > 0) { -+ if (rsp->ccode -+ || rsp->data_len < 1 -+ || rsp->data_len > sizeof(uint8_t) + 0x10) -+ { - lprintf(LOG_ERR, "Get Channel Cipher Suites failed: %s", - val2str(rsp->ccode, completion_code_vals)); - return -1; --- -2.20.1 - diff --git a/package/ipmitool/0012-lanp-Fix-buffer-overflows-in-get_lan_param_select.patch b/package/ipmitool/0012-lanp-Fix-buffer-overflows-in-get_lan_param_select.patch deleted file mode 100644 index aba9ad2c71b..00000000000 --- a/package/ipmitool/0012-lanp-Fix-buffer-overflows-in-get_lan_param_select.patch +++ /dev/null @@ -1,92 +0,0 @@ -From ceebf5998b71e11c81133680560b498977d3d3cd Mon Sep 17 00:00:00 2001 -From: Chrostoper Ertl -Date: Thu, 28 Nov 2019 17:06:39 +0000 -Subject: [PATCH] lanp: Fix buffer overflows in get_lan_param_select -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Partial fix for CVE-2020-5208, see -https://github.com/ipmitool/ipmitool/security/advisories/GHSA-g659-9qxw-p7cp - -The `get_lan_param_select` function is missing a validation check on the -response’s `data_len`, which it then returns to caller functions, where -stack buffer overflow can occur. - -[Retrieve from: -https://github.com/ipmitool/ipmitool/commit/d45572d71e70840e0d4c50bf48218492b79c1a10] -Signed-off-by: Heiko Thiery ---- - lib/ipmi_lanp.c | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/lib/ipmi_lanp.c b/lib/ipmi_lanp.c -index 65d881b..022c7f1 100644 ---- a/lib/ipmi_lanp.c -+++ b/lib/ipmi_lanp.c -@@ -1809,7 +1809,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert, - if (p == NULL) { - return (-1); - } -- memcpy(data, p->data, p->data_len); -+ memcpy(data, p->data, __min(p->data_len, sizeof(data))); - /* set new ipaddr */ - memcpy(data+3, temp, 4); - printf("Setting LAN Alert %d IP Address to %d.%d.%d.%d\n", alert, -@@ -1824,7 +1824,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert, - if (p == NULL) { - return (-1); - } -- memcpy(data, p->data, p->data_len); -+ memcpy(data, p->data, __min(p->data_len, sizeof(data))); - /* set new macaddr */ - memcpy(data+7, temp, 6); - printf("Setting LAN Alert %d MAC Address to " -@@ -1838,7 +1838,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert, - if (p == NULL) { - return (-1); - } -- memcpy(data, p->data, p->data_len); -+ memcpy(data, p->data, __min(p->data_len, sizeof(data))); - - if (strncasecmp(argv[1], "def", 3) == 0 || - strncasecmp(argv[1], "default", 7) == 0) { -@@ -1864,7 +1864,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert, - if (p == NULL) { - return (-1); - } -- memcpy(data, p->data, p->data_len); -+ memcpy(data, p->data, __min(p->data_len, sizeof(data))); - - if (strncasecmp(argv[1], "on", 2) == 0 || - strncasecmp(argv[1], "yes", 3) == 0) { -@@ -1889,7 +1889,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert, - if (p == NULL) { - return (-1); - } -- memcpy(data, p->data, p->data_len); -+ memcpy(data, p->data, __min(p->data_len, sizeof(data))); - - if (strncasecmp(argv[1], "pet", 3) == 0) { - printf("Setting LAN Alert %d destination to PET Trap\n", alert); -@@ -1917,7 +1917,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert, - if (p == NULL) { - return (-1); - } -- memcpy(data, p->data, p->data_len); -+ memcpy(data, p->data, __min(p->data_len, sizeof(data))); - - if (str2uchar(argv[1], &data[2]) != 0) { - lprintf(LOG_ERR, "Invalid time: %s", argv[1]); -@@ -1933,7 +1933,7 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert, - if (p == NULL) { - return (-1); - } -- memcpy(data, p->data, p->data_len); -+ memcpy(data, p->data, __min(p->data_len, sizeof(data))); - - if (str2uchar(argv[1], &data[3]) != 0) { - lprintf(LOG_ERR, "Invalid retry: %s", argv[1]); --- -2.20.1 - diff --git a/package/ipmitool/0013-fru-sdr-Fix-id_string-buffer-overflows.patch b/package/ipmitool/0013-fru-sdr-Fix-id_string-buffer-overflows.patch deleted file mode 100644 index 2a519f3c729..00000000000 --- a/package/ipmitool/0013-fru-sdr-Fix-id_string-buffer-overflows.patch +++ /dev/null @@ -1,141 +0,0 @@ -From bf3ded3a474d85da99eb717acdcd8ff4f89f9879 Mon Sep 17 00:00:00 2001 -From: Chrostoper Ertl -Date: Thu, 28 Nov 2019 17:13:45 +0000 -Subject: [PATCH] fru, sdr: Fix id_string buffer overflows - -Final part of the fixes for CVE-2020-5208, see -https://github.com/ipmitool/ipmitool/security/advisories/GHSA-g659-9qxw-p7cp - -9 variants of stack buffer overflow when parsing `id_string` field of -SDR records returned from `CMD_GET_SDR` command. - -SDR record structs have an `id_code` field, and an `id_string` `char` -array. - -The length of `id_string` is calculated as `(id_code & 0x1f) + 1`, -which can be larger than expected 16 characters (if `id_code = 0xff`, -then length will be `(0xff & 0x1f) + 1 = 32`). - -In numerous places, this can cause stack buffer overflow when copying -into fixed buffer of size `17` bytes from this calculated length. - -[Retrieve from: -https://github.com/ipmitool/ipmitool/commit/7ccea283dd62a05a320c1921e3d8d71a87772637] -Signed-off-by: Heiko Thiery ---- - lib/ipmi_fru.c | 2 +- - lib/ipmi_sdr.c | 40 ++++++++++++++++++++++++---------------- - 2 files changed, 25 insertions(+), 17 deletions(-) - -diff --git a/lib/ipmi_fru.c b/lib/ipmi_fru.c -index af99aa9..98bc984 100644 ---- a/lib/ipmi_fru.c -+++ b/lib/ipmi_fru.c -@@ -3062,7 +3062,7 @@ ipmi_fru_print(struct ipmi_intf * intf, struct sdr_record_fru_locator * fru) - return 0; - - memset(desc, 0, sizeof(desc)); -- memcpy(desc, fru->id_string, fru->id_code & 0x01f); -+ memcpy(desc, fru->id_string, __min(fru->id_code & 0x01f, sizeof(desc))); - desc[fru->id_code & 0x01f] = 0; - printf("FRU Device Description : %s (ID %d)\n", desc, fru->device_id); - -diff --git a/lib/ipmi_sdr.c b/lib/ipmi_sdr.c -index 2a9cbe3..62aac08 100644 ---- a/lib/ipmi_sdr.c -+++ b/lib/ipmi_sdr.c -@@ -2084,7 +2084,7 @@ ipmi_sdr_print_sensor_eventonly(struct ipmi_intf *intf, - return -1; - - memset(desc, 0, sizeof (desc)); -- snprintf(desc, (sensor->id_code & 0x1f) + 1, "%s", sensor->id_string); -+ snprintf(desc, sizeof(desc), "%.*s", (sensor->id_code & 0x1f) + 1, sensor->id_string); - - if (verbose) { - printf("Sensor ID : %s (0x%x)\n", -@@ -2135,7 +2135,7 @@ ipmi_sdr_print_sensor_mc_locator(struct ipmi_intf *intf, - return -1; - - memset(desc, 0, sizeof (desc)); -- snprintf(desc, (mc->id_code & 0x1f) + 1, "%s", mc->id_string); -+ snprintf(desc, sizeof(desc), "%.*s", (mc->id_code & 0x1f) + 1, mc->id_string); - - if (verbose == 0) { - if (csv_output) -@@ -2228,7 +2228,7 @@ ipmi_sdr_print_sensor_generic_locator(struct ipmi_intf *intf, - char desc[17]; - - memset(desc, 0, sizeof (desc)); -- snprintf(desc, (dev->id_code & 0x1f) + 1, "%s", dev->id_string); -+ snprintf(desc, sizeof(desc), "%.*s", (dev->id_code & 0x1f) + 1, dev->id_string); - - if (!verbose) { - if (csv_output) -@@ -2285,7 +2285,7 @@ ipmi_sdr_print_sensor_fru_locator(struct ipmi_intf *intf, - char desc[17]; - - memset(desc, 0, sizeof (desc)); -- snprintf(desc, (fru->id_code & 0x1f) + 1, "%s", fru->id_string); -+ snprintf(desc, sizeof(desc), "%.*s", (fru->id_code & 0x1f) + 1, fru->id_string); - - if (!verbose) { - if (csv_output) -@@ -2489,35 +2489,43 @@ ipmi_sdr_print_name_from_rawentry(struct ipmi_intf *intf, uint16_t id, - - int rc =0; - char desc[17]; -+ const char *id_string; -+ uint8_t id_code; - memset(desc, ' ', sizeof (desc)); - - switch ( type) { - case SDR_RECORD_TYPE_FULL_SENSOR: - record.full = (struct sdr_record_full_sensor *) raw; -- snprintf(desc, (record.full->id_code & 0x1f) +1, "%s", -- (const char *)record.full->id_string); -+ id_code = record.full->id_code; -+ id_string = record.full->id_string; - break; -+ - case SDR_RECORD_TYPE_COMPACT_SENSOR: - record.compact = (struct sdr_record_compact_sensor *) raw ; -- snprintf(desc, (record.compact->id_code & 0x1f) +1, "%s", -- (const char *)record.compact->id_string); -+ id_code = record.compact->id_code; -+ id_string = record.compact->id_string; - break; -+ - case SDR_RECORD_TYPE_EVENTONLY_SENSOR: - record.eventonly = (struct sdr_record_eventonly_sensor *) raw ; -- snprintf(desc, (record.eventonly->id_code & 0x1f) +1, "%s", -- (const char *)record.eventonly->id_string); -- break; -+ id_code = record.eventonly->id_code; -+ id_string = record.eventonly->id_string; -+ break; -+ - case SDR_RECORD_TYPE_MC_DEVICE_LOCATOR: - record.mcloc = (struct sdr_record_mc_locator *) raw ; -- snprintf(desc, (record.mcloc->id_code & 0x1f) +1, "%s", -- (const char *)record.mcloc->id_string); -+ id_code = record.mcloc->id_code; -+ id_string = record.mcloc->id_string; - break; -+ - default: - rc = -1; -- break; -- } -+ } -+ if (!rc) { -+ snprintf(desc, sizeof(desc), "%.*s", (id_code & 0x1f) + 1, id_string); -+ } - -- lprintf(LOG_INFO, "ID: 0x%04x , NAME: %-16s", id, desc); -+ lprintf(LOG_INFO, "ID: 0x%04x , NAME: %-16s", id, desc); - return rc; - } - --- -2.20.1 - diff --git a/package/ipmitool/Config.in b/package/ipmitool/Config.in index 826bc094be8..9516ff8596d 100644 --- a/package/ipmitool/Config.in +++ b/package/ipmitool/Config.in @@ -5,10 +5,22 @@ config BR2_PACKAGE_IPMITOOL IPMItool provides a simple command-line interface to IPMI-enabled devices. - http://sourceforge.net/projects/ipmitool/ + https://github.com/ipmitool/ipmitool/ if BR2_PACKAGE_IPMITOOL +config BR2_PACKAGE_IPMITOOL_PEN_REG_URI + string "IANA PEN registry URL or path" + default "https://www.iana.org/assignments/enterprise-numbers.txt" + help + Enter an URL or a file path to the PEN registry to use. + + Note that the official registry is 4MiB+ and may change any + time and is thus not guaranteed to be reproducible. + + Leave empty to not use a registry; vendor IDs will be + displayed instead of the corresponding names. + config BR2_PACKAGE_IPMITOOL_LANPLUS bool "enable lanplus interface" select BR2_PACKAGE_OPENSSL @@ -32,7 +44,6 @@ config BR2_PACKAGE_IPMITOOL_IPMIEVD config BR2_PACKAGE_IPMITOOL_IPMISHELL bool "ipmishell" - select BR2_PACKAGE_NCURSES select BR2_PACKAGE_READLINE help IPMI shell interface diff --git a/package/ipmitool/ipmitool.hash b/package/ipmitool/ipmitool.hash index 5c053dc8690..c3b298e3ba5 100644 --- a/package/ipmitool/ipmitool.hash +++ b/package/ipmitool/ipmitool.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 0c1ba3b1555edefb7c32ae8cd6a3e04322056bc087918f07189eeedfc8b81e01 ipmitool-1.8.18.tar.bz2 +sha256 48b010e7bcdf93e4e4b6e43c53c7f60aa6873d574cbd45a8d86fa7aaeebaff9c ipmitool-1_8_19.tar.gz sha256 b7e2382a8be43b5f6cb092f2d2bda163bf1a1938be9300f821a845cbcd535f56 COPYING diff --git a/package/ipmitool/ipmitool.mk b/package/ipmitool/ipmitool.mk index 801f1ea6b09..b3f1e217ff7 100644 --- a/package/ipmitool/ipmitool.mk +++ b/package/ipmitool/ipmitool.mk @@ -4,20 +4,16 @@ # ################################################################################ -IPMITOOL_VERSION = 1.8.18 -IPMITOOL_SOURCE = ipmitool-$(IPMITOOL_VERSION).tar.bz2 -IPMITOOL_SITE = http://downloads.sourceforge.net/project/ipmitool/ipmitool/$(IPMITOOL_VERSION) +IPMITOOL_VERSION = 1_8_19 +IPMITOOL_SITE = $(call github,ipmitool,ipmitool,IPMITOOL_$(IPMITOOL_VERSION)) IPMITOOL_LICENSE = BSD-3-Clause IPMITOOL_LICENSE_FILES = COPYING IPMITOOL_CPE_ID_VENDOR = ipmitool_project +# From git +IPMITOOL_AUTORECONF = YES +IPMITOOL_DEPENDENCIES = host-pkgconf -# 0008-fru-Fix-buffer-overflow-vulnerabilities.patch -# 0009-fru-Fix-buffer-overflow-in-ipmi_spd_print_fru.patch -# 0010-session-Fix-buffer-overflow-in-ipmi_get_session_info.patch -# 0011-channel-Fix-buffer-overflow.patch -# 0012-lanp-Fix-buffer-overflows-in-get_lan_param_select.patch -# 0013-fru-sdr-Fix-id_string-buffer-overflows.patch -IPMITOOL_IGNORE_CVES += CVE-2020-5208 +IPMITOOL_CONF_OPTS = --disable-registry-download ifeq ($(BR2_PACKAGE_FREEIPMI),y) IPMITOOL_DEPENDENCIES += freeipmi @@ -40,7 +36,7 @@ IPMITOOL_CONF_OPTS += --disable-intf-usb endif ifeq ($(BR2_PACKAGE_IPMITOOL_IPMISHELL),y) -IPMITOOL_DEPENDENCIES += ncurses readline +IPMITOOL_DEPENDENCIES += readline IPMITOOL_CONF_OPTS += --enable-ipmishell else IPMITOOL_CONF_OPTS += --disable-ipmishell @@ -53,4 +49,20 @@ endef IPMITOOL_POST_INSTALL_TARGET_HOOKS += IPMITOOL_REMOVE_IPMIEVD endif +IPMITOOL_PEN_REG_URI = $(call qstrip,$(BR2_PACKAGE_IPMITOOL_PEN_REG_URI)) +ifneq ($(IPMITOOL_PEN_REG_URI),) +ifneq ($(findstring ://,$(IPMITOOL_PEN_REG_URI)),) +IPMITOOL_EXTRA_DOWNLOADS += $(IPMITOOL_PEN_REG_URI) +BR_NO_CHECK_HASH_FOR += $(notdir $(IPMITOOL_PEN_REG_URI)) +IPMITOOL_PEN_REG = $(IPMITOOL_DL_DIR)/$(notdir $(IPMITOOL_PEN_REG_URI)) +else +IPMITOOL_PEN_REG = $(IPMITOOL_PEN_REG_URI) +endif #findstring +define IPMITOOL_INSTALL_PEN_REG + $(INSTALL) -D -m 0644 $(IPMITOOL_PEN_REG) \ + $(TARGET_DIR)/usr/share/misc/enterprise-numbers +endef +IPMITOOL_POST_INSTALL_TARGET_HOOKS += IPMITOOL_INSTALL_PEN_REG +endif # IPMITOOL_PEN_REG_URI !empty + $(eval $(autotools-package)) diff --git a/package/ipmiutil/ipmiutil.hash b/package/ipmiutil/ipmiutil.hash index f87c2762de9..c1a813ad1fc 100644 --- a/package/ipmiutil/ipmiutil.hash +++ b/package/ipmiutil/ipmiutil.hash @@ -1,6 +1,6 @@ # From https://sourceforge.net/projects/ipmiutil/files/ -md5 fab260bc834a0f3f9324a6365fc26eca ipmiutil-3.1.7.tar.gz -sha1 a0cd29820b15166120eb4a51e6239bfa6f9c65dd ipmiutil-3.1.7.tar.gz +md5 b38ef567b6bb8a24418e448f23115190 ipmiutil-3.1.8.tar.gz +sha1 0697fc2342c55ba4374e31dcd38e58a00d1287e8 ipmiutil-3.1.8.tar.gz # Locally computed -sha256 911fd6f8b33651b98863d57e678d2fc593bc43fcd2a21f5dc7d5db8f92128a9a ipmiutil-3.1.7.tar.gz +sha256 b14357b9723e38a19c24df2771cff63d5f15f8682cd8a5b47235044b767b1888 ipmiutil-3.1.8.tar.gz sha256 7e0ec8238aa1431e95a4950032a4483fe33fec3fac348eaade5856cdc5ae3e39 COPYING diff --git a/package/ipmiutil/ipmiutil.mk b/package/ipmiutil/ipmiutil.mk index 4c9de265830..b48eaa7cb2c 100644 --- a/package/ipmiutil/ipmiutil.mk +++ b/package/ipmiutil/ipmiutil.mk @@ -4,21 +4,15 @@ # ################################################################################ -IPMIUTIL_VERSION = 3.1.7 +IPMIUTIL_VERSION = 3.1.8 IPMIUTIL_SITE = https://sourceforge.net/projects/ipmiutil/files IPMIUTIL_LICENSE = BSD-3-Clause IPMIUTIL_LICENSE_FILES = COPYING IPMIUTIL_MAKE = $(MAKE1) +IPMIUTIL_CONF_ENV = ac_cv_type_wchar_t=$(if $(BR2_USE_WCHAR),yes,no) -# aclocal.m4 is newer than config.h.in. Touch the latter to avoid autoreconf -define IPMIUTIL_TOUCH_CONFIG_H_IN - touch $(@D)/config.h.in -endef -IPMIUTIL_PRE_CONFIGURE_HOOKS += IPMIUTIL_TOUCH_CONFIG_H_IN - -# forgets to link against libcrypto dependencies breaking static link -ifeq ($(BR2_PACKAGE_OPENSSL)x$(BR2_STATIC_LIBS),yx) +ifeq ($(BR2_PACKAGE_OPENSSL),y) # tests against distro libcrypto so it might get a false positive when # the openssl version is old, so force it off # SKIP_MD2 can be used only if ALLOW_GNU is defined. diff --git a/package/iproute2/0001-lib-fix-ax25-h-include-for-musl.patch b/package/iproute2/0001-lib-fix-ax25-h-include-for-musl.patch deleted file mode 100644 index 1f8860c5d82..00000000000 --- a/package/iproute2/0001-lib-fix-ax25-h-include-for-musl.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 8bced38a941a181f1468fa39541e872e51b6022f Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Thu, 13 Jan 2022 08:14:13 +0000 -Subject: [PATCH] lib: fix ax25.h include for musl - -ax25.h isn't guaranteed to be avilable in netax25/*; -it's dependent on our choice of libc (it's not available -on musl at least) [0]. - -Let's use the version from linux-headers. - -[0] https://sourceware.org/glibc/wiki/Synchronizing_Headers -Bug: https://bugs.gentoo.org/831102 - -Signed-off-by: Sam James -Signed-off-by: Stephen Hemminger - -[Retrieved from: -https://github.com/shemminger/iproute2/commit/8bced38a941a181f1468fa39541e872e51b6022f] -Signed-off-by: Fabrice Fontaine ---- - lib/ax25_ntop.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/ax25_ntop.c b/lib/ax25_ntop.c -index cfd0e04b0..3a72a43e9 100644 ---- a/lib/ax25_ntop.c -+++ b/lib/ax25_ntop.c -@@ -2,7 +2,7 @@ - - #include - #include --#include -+#include - - #include "utils.h" - diff --git a/package/iproute2/iproute2.hash b/package/iproute2/iproute2.hash index f7e7f682a9d..9e8be43f2b0 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 c064b66f6b001c2a35aa5224b5b1ac8aa4bee104d7dce30d6f10a84cb8b01e2f iproute2-5.16.0.tar.xz +sha256 5ce12a0fec6b212725ef218735941b2dab76244db7e72646a76021b0537b43ab iproute2-6.1.0.tar.xz sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk index a51b5b2996c..9792630f151 100644 --- a/package/iproute2/iproute2.mk +++ b/package/iproute2/iproute2.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPROUTE2_VERSION = 5.16.0 +IPROUTE2_VERSION = 6.1.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 \ @@ -43,9 +43,12 @@ define IPROUTE2_CONFIGURE_CMDS $(IPROUTE2_DISABLE_IPTABLES) endef +# workaround for static_assert on uclibc-ng < 1.0.42 +IPROUTE2_CFLAGS = $(TARGET_CFLAGS) -Dstatic_assert=_Static_assert + define IPROUTE2_BUILD_CMDS $(TARGET_MAKE_ENV) LDFLAGS="$(TARGET_LDFLAGS)" \ - CFLAGS="$(TARGET_CFLAGS) -DXT_LIB_DIR=\\\"/usr/lib/xtables\\\"" \ + CFLAGS="$(IPROUTE2_CFLAGS) -DXT_LIB_DIR=\\\"/usr/lib/xtables\\\"" \ CBUILD_CFLAGS="$(HOST_CFLAGS)" $(MAKE) V=1 LIBDB_LIBS=-lpthread \ DBM_INCLUDE="$(STAGING_DIR)/usr/include" \ SHARED_LIBS="$(if $(BR2_STATIC_LIBS),n,y)" -C $(@D) diff --git a/package/ipset/ipset.hash b/package/ipset/ipset.hash index 9c251be27e7..fb9b8c40d20 100644 --- a/package/ipset/ipset.hash +++ b/package/ipset/ipset.hash @@ -1,4 +1,4 @@ -# From https://ipset.netfilter.org/ipset-7.15.tar.bz2.sha512sum.txt -sha512 0fc936d971c30a0925c585d506c8840e782fdaeec09bc8fd249e874fe838fa55a4dbb697f6e1423a6769abf07a1ce2195abc37cb641e8e4ad70f1b4c7130916a ipset-7.15.tar.bz2 +# From https://ipset.netfilter.org/ipset-7.16.tar.bz2.sha512sum.txt +sha512 e69ddee956f0922c8e08e7e5d358d6b5b24178a9f08151b20957cc3465baaba9ecd6aa938ae157f2cd286ccd7f0b7a279cfd89cec2393a00b43e4d945c275307 ipset-7.16.tar.bz2 # Locally calculated sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/package/ipset/ipset.mk b/package/ipset/ipset.mk index 4eda65e81ba..9832d8fd30e 100644 --- a/package/ipset/ipset.mk +++ b/package/ipset/ipset.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPSET_VERSION = 7.15 +IPSET_VERSION = 7.16 IPSET_SOURCE = ipset-$(IPSET_VERSION).tar.bz2 IPSET_SITE = http://ipset.netfilter.org IPSET_DEPENDENCIES = libmnl host-pkgconf diff --git a/package/iptables/iptables.hash b/package/iptables/iptables.hash index 7f144139313..a908b9cbc1a 100644 --- a/package/iptables/iptables.hash +++ b/package/iptables/iptables.hash @@ -1,4 +1,4 @@ # From https://netfilter.org/projects/iptables/downloads.html -sha256 c109c96bb04998cd44156622d36f8e04b140701ec60531a10668cfdff5e8d8f0 iptables-1.8.7.tar.bz2 +sha256 ef6639a43be8325a4f8ea68123ffac236cb696e8c78501b64e8106afb008c87f iptables-1.8.9.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk index 555bb384fd4..561c82ca0bd 100644 --- a/package/iptables/iptables.mk +++ b/package/iptables/iptables.mk @@ -4,12 +4,11 @@ # ################################################################################ -IPTABLES_VERSION = 1.8.7 -IPTABLES_SOURCE = iptables-$(IPTABLES_VERSION).tar.bz2 +IPTABLES_VERSION = 1.8.9 +IPTABLES_SOURCE = iptables-$(IPTABLES_VERSION).tar.xz IPTABLES_SITE = https://netfilter.org/projects/iptables/files IPTABLES_INSTALL_STAGING = YES -IPTABLES_DEPENDENCIES = host-pkgconf \ - $(if $(BR2_PACKAGE_LIBNETFILTER_CONNTRACK),libnetfilter_conntrack) +IPTABLES_DEPENDENCIES = host-pkgconf IPTABLES_LICENSE = GPL-2.0 IPTABLES_LICENSE_FILES = COPYING IPTABLES_CPE_ID_VENDOR = netfilter diff --git a/package/iputils/Config.in b/package/iputils/Config.in index 1a8b555570e..ec7bc5418da 100644 --- a/package/iputils/Config.in +++ b/package/iputils/Config.in @@ -28,37 +28,12 @@ config BR2_PACKAGE_IPUTILS_PING help Installs ping. -config BR2_PACKAGE_IPUTILS_RARPD - bool "rarpd" - help - Installs rarpd. - -config BR2_PACKAGE_IPUTILS_RDISC - bool "rdisc" - default y - help - Installs rdisc. - -config BR2_PACKAGE_IPUTILS_RDISC_SERVER - bool "rdisc (server code)" - default y - depends on BR2_PACKAGE_IPUTILS_RDISC - help - Builds rdisc with server code. - config BR2_PACKAGE_IPUTILS_TRACEPATH bool "tracepath" default y help Installs tracepath. -config BR2_PACKAGE_IPUTILS_NINFOD - bool "ninfod" - default y - depends on BR2_TOOLCHAIN_HAS_THREADS # ninfod requires - help - Installs ninfod. - comment "ninfod needs a toolchain w/ threads" depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/iputils/iputils.hash b/package/iputils/iputils.hash index edfa384d438..ea23f27f3ce 100644 --- a/package/iputils/iputils.hash +++ b/package/iputils/iputils.hash @@ -1,6 +1,6 @@ -# https://github.com/iputils/iputils/releases/download/20211215/sha256sum.asc -sha256 b6f67fc705490673ff4471d006221b4a2f1b1180b929d9fefd771352621ccedf iputils-20211215.tar.gz +# https://github.com/iputils/iputils/releases/download/20221126/sha256sum.asc +sha256 745ea711fe06d5c57d470d21acce3c3ab866eb6afb69379a16c6d60b89bd4311 iputils-20221126.tar.gz # Locally computed -sha256 973281334c2da6364fa6bdc44c1f0f8d60d80d73c782982ffc5d53b0a31aa042 LICENSE -sha256 9acc4bc871a4742550158e3696dcb381953172ef808d04ca248184f9f6322712 Documentation/LICENSE.BSD3 -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Documentation/LICENSE.GPL2 +sha256 2c9f29d982c48665c30b3adaf400c048988fd256eb91c691e351eb3b6a8b2036 LICENSE +sha256 9acc4bc871a4742550158e3696dcb381953172ef808d04ca248184f9f6322712 Documentation/LICENSE.BSD3 +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Documentation/LICENSE.GPL2 diff --git a/package/iputils/iputils.mk b/package/iputils/iputils.mk index 84059de3304..fe4468ec193 100644 --- a/package/iputils/iputils.mk +++ b/package/iputils/iputils.mk @@ -11,7 +11,7 @@ # and IPv6 updates. # http://www.spinics.net/lists/netdev/msg279881.html -IPUTILS_VERSION = 20211215 +IPUTILS_VERSION = 20221126 IPUTILS_SITE = $(call github,iputils,iputils,$(IPUTILS_VERSION)) IPUTILS_LICENSE = GPL-2.0+, BSD-3-Clause IPUTILS_LICENSE_FILES = LICENSE Documentation/LICENSE.BSD3 Documentation/LICENSE.GPL2 @@ -21,19 +21,14 @@ IPUTILS_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) # Selectively build binaries IPUTILS_CONF_OPTS += \ -DBUILD_CLOCKDIFF=$(if $(BR2_PACKAGE_IPUTILS_CLOCKDIFF),true,false) \ - -DBUILD_RARPD=$(if $(BR2_PACKAGE_IPUTILS_RARPD),true,false) \ - -DBUILD_RDISC=$(if $(BR2_PACKAGE_IPUTILS_RDISC),true,false) \ - -DENABLE_RDISC_SERVER=$(if $(BR2_PACKAGE_IPUTILS_RDISC_SERVER),true,false) \ -DBUILD_TRACEPATH=$(if $(BR2_PACKAGE_IPUTILS_TRACEPATH),true,false) \ - -DBUILD_NINFOD=$(if $(BR2_PACKAGE_IPUTILS_NINFOD),true,false) \ -DSKIP_TESTS=true # Selectively select the appropriate SELinux refpolicy modules IPUTILS_SELINUX_MODULES = \ $(if $(BR2_PACKAGE_IPUTILS_ARPING),netutils) \ $(if $(BR2_PACKAGE_IPUTILS_PING),netutils) \ - $(if $(BR2_PACKAGE_IPUTILS_TRACEPATH),netutils) \ - $(if $(BR2_PACKAGE_IPUTILS_RDISC),rdisc) + $(if $(BR2_PACKAGE_IPUTILS_TRACEPATH),netutils) # # arping diff --git a/package/irqbalance/0001-configure.ac-use-pkg-config-to-find-numa.patch b/package/irqbalance/0001-configure.ac-use-pkg-config-to-find-numa.patch deleted file mode 100644 index 751367ccfbb..00000000000 --- a/package/irqbalance/0001-configure.ac-use-pkg-config-to-find-numa.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 274cb8ea470a10ce46b783e77784b0eb08cf20d8 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 1 Aug 2021 23:26:01 +0200 -Subject: [PATCH] configure.ac: use pkg-config to find numa - -Use pkg-config to find numa and fallback to current mechanism. -Thanks to pkg-config, numa dependencies such as -latomic will be -retrieved. - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/Irqbalance/irqbalance/pull/188] ---- - configure.ac | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index c45b9ce..50c62ba 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -23,7 +23,14 @@ AC_CHECK_HEADERS([numa.h]) - - AC_CHECK_FUNCS(getopt_long) - --AC_CHECK_LIB(numa, numa_available) -+PKG_CHECK_MODULES([NUMA], [numa], [has_numa=yes], [AC_CHECK_LIB(numa, numa_available)]) -+AS_IF([test "x$has_numa" = "xyes"], [ -+ AC_SUBST([NUMA_CFLAGS]) -+ AC_SUBST([NUMA_LIBS]) -+ LIBS="$LIBS $NUMA_LIBS" -+ AC_SUBST([LIBS]) -+]) -+ - AC_CHECK_LIB(m, floor) - - PKG_CHECK_MODULES([GLIB2], [glib-2.0], [], [AC_MSG_ERROR([glib-2.0 is required])]) --- -2.30.2 - diff --git a/package/irqbalance/irqbalance.hash b/package/irqbalance/irqbalance.hash index 49118f8c7da..3dd83a017f0 100644 --- a/package/irqbalance/irqbalance.hash +++ b/package/irqbalance/irqbalance.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2e7ddb9687a6a5cc1f41626659eac2ad9d6b5875629156b92f693bd404d8ae63 irqbalance-1.8.0.tar.gz +sha256 883d3f6296f7e4a17e09dc2c91bd972e110fe574c119d9e45ec0c4e35c7317bb irqbalance-1.9.0.tar.gz sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/irqbalance/irqbalance.mk b/package/irqbalance/irqbalance.mk index 1efc0b7fa27..abd64e6b9ee 100644 --- a/package/irqbalance/irqbalance.mk +++ b/package/irqbalance/irqbalance.mk @@ -4,7 +4,7 @@ # ################################################################################ -IRQBALANCE_VERSION = 1.8.0 +IRQBALANCE_VERSION = 1.9.0 IRQBALANCE_SITE = $(call github,irqbalance,irqbalance,v$(IRQBALANCE_VERSION)) IRQBALANCE_LICENSE = GPL-2.0 IRQBALANCE_LICENSE_FILES = COPYING diff --git a/package/irrlicht/irrlicht.hash b/package/irrlicht/irrlicht.hash index 1f5631f229a..e7cd3ec9184 100644 --- a/package/irrlicht/irrlicht.hash +++ b/package/irrlicht/irrlicht.hash @@ -1,6 +1,6 @@ # From https://sourceforge.net/projects/irrlicht/files/Irrlicht%20SDK/1.8/1.8.4 -md5 9401cfff801395010b0912211f3cbb4f irrlicht-1.8.4.zip -sha1 38bf0223fe868d243d6a39d0dc191c8df6e03b3b irrlicht-1.8.4.zip +md5 9401cfff801395010b0912211f3cbb4f irrlicht-1.8.4.zip +sha1 38bf0223fe868d243d6a39d0dc191c8df6e03b3b irrlicht-1.8.4.zip # Locally calculated sha256 f42b280bc608e545b820206fe2a999c55f290de5c7509a02bdbeeccc1bf9e433 irrlicht-1.8.4.zip sha256 cc86e0b830f9d48933feb198f2741a7d9bb7c34fe8a35302d8ce36b8e2ecb27b doc/aesGladman.txt diff --git a/package/irssi/irssi.hash b/package/irssi/irssi.hash index 05555250a7a..df72ee4d767 100644 --- a/package/irssi/irssi.hash +++ b/package/irssi/irssi.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 a647bfefed14d2221fa77b6edac594934dc672c4a560417b1abcbbc6b88d769f irssi-1.2.3.tar.xz +sha256 fefe9ec8c7b1475449945c934a2360ab12693454892be47a6d288c63eb107ead irssi-1.4.4.tar.xz # Locally calculated sha256 a1a27cb2ecee8d5378fbb3562f577104a445d6d66fee89286e16758305e63e2b COPYING diff --git a/package/irssi/irssi.mk b/package/irssi/irssi.mk index da71622a049..6790bf0c966 100644 --- a/package/irssi/irssi.mk +++ b/package/irssi/irssi.mk @@ -4,11 +4,9 @@ # ################################################################################ -IRSSI_VERSION = 1.2.3 +IRSSI_VERSION = 1.4.4 IRSSI_SOURCE = irssi-$(IRSSI_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. -IRSSI_SITE = https://github.com/irssi/irssi/releases/download/$(IRSSI_VERSION) +IRSSI_SITE = https://codeberg.org/irssi/irssi/releases/download/$(IRSSI_VERSION) IRSSI_LICENSE = GPL-2.0+ IRSSI_LICENSE_FILES = COPYING IRSSI_CPE_ID_VENDOR = irssi diff --git a/package/isl/isl.hash b/package/isl/isl.hash index 3df331b1435..46d8e920f3e 100644 --- a/package/isl/isl.hash +++ b/package/isl/isl.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5efc53efaef151301f4e7dde3856b66812d8153dede24fab17673f801c8698f2 isl-0.23.tar.xz +sha256 be7b210647ccadf90a2f0b000fca11a4d40546374a850db67adb32fad4b230d9 isl-0.25.tar.xz sha256 3a2c398103f6bca0f50a9a9465deca9230b370b0212af5fdf31ed88a36215c30 LICENSE diff --git a/package/isl/isl.mk b/package/isl/isl.mk index df57c83f55d..ce9aaecebc2 100644 --- a/package/isl/isl.mk +++ b/package/isl/isl.mk @@ -4,7 +4,7 @@ # ################################################################################ -ISL_VERSION = 0.23 +ISL_VERSION = 0.25 ISL_SOURCE = isl-$(ISL_VERSION).tar.xz ISL_SITE = https://libisl.sourceforge.io ISL_LICENSE = MIT diff --git a/package/iucode-tool/iucode-tool.hash b/package/iucode-tool/iucode-tool.hash index 6d8fb635d02..ae18339c96e 100644 --- a/package/iucode-tool/iucode-tool.hash +++ b/package/iucode-tool/iucode-tool.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 12b88efa4d0d95af08db05a50b3dcb217c0eb2bfc67b483779e33d498ddb2f95 iucode-tool_2.3.1.tar.xz -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING +sha256 12b88efa4d0d95af08db05a50b3dcb217c0eb2bfc67b483779e33d498ddb2f95 iucode-tool_2.3.1.tar.xz +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/iucode-tool/iucode-tool.mk b/package/iucode-tool/iucode-tool.mk index 596ad268b7a..b123973a909 100644 --- a/package/iucode-tool/iucode-tool.mk +++ b/package/iucode-tool/iucode-tool.mk @@ -7,11 +7,15 @@ IUCODE_TOOL_VERSION = 2.3.1 IUCODE_TOOL_SOURCE = iucode-tool_$(IUCODE_TOOL_VERSION).tar.xz IUCODE_TOOL_SITE = https://gitlab.com/iucode-tool/releases/raw/master -IUCODE_TOOL_DEPENDENCIES = $(if $(BR2_PACKAGE_ARGP_STANDALONE),argp-standalone) IUCODE_TOOL_LICENSE = GPL-2.0+ IUCODE_TOOL_LICENSE_FILES = COPYING IUCODE_TOOL_CPE_ID_VENDOR = iucode-tool_project +ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y) +IUCODE_TOOL_DEPENDENCIES += argp-standalone $(TARGET_NLS_DEPENDENCIES) +IUCODE_TOOL_CONF_ENV += LIBS=$(TARGET_NLS_LIBS) +endif + define IUCODE_TOOL_INSTALL_INIT_SYSV $(INSTALL) -D -m 0755 package/iucode-tool/S00iucode-tool \ $(TARGET_DIR)/etc/init.d/S00iucode-tool diff --git a/package/iw/iw.hash b/package/iw/iw.hash index 33dd117368a..376dc3b4998 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 4c44e42762f903f9094ba5a598998c800a97a62afd6fd31ec1e0a799e308659c iw-5.16.tar.xz +sha256 f167bbe947dd53bb9ebc0c1dcef5db6ad73ac1d6084f2c6f9376c5c360cc4d4e iw-5.19.tar.xz # Locally calculated sha256 5932fb70481e128940168a5fdf133e6454293c0865c7e757874b235cb6daa2af COPYING diff --git a/package/iw/iw.mk b/package/iw/iw.mk index 9bf6ddbfc6c..60ada9d57f8 100644 --- a/package/iw/iw.mk +++ b/package/iw/iw.mk @@ -4,7 +4,7 @@ # ################################################################################ -IW_VERSION = 5.16 +IW_VERSION = 5.19 IW_SOURCE = iw-$(IW_VERSION).tar.xz IW_SITE = $(BR2_KERNEL_MIRROR)/software/network/iw IW_LICENSE = ISC diff --git a/package/iwd/0001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch b/package/iwd/0001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch deleted file mode 100644 index 3e808deb88e..00000000000 --- a/package/iwd/0001-dpp-fix-implicit-declaration-of-function-explicit_bz.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 6ce41f621154eff0145dab41308bc145c0440f16 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Mon, 10 Jan 2022 22:32:18 +0100 -Subject: [PATCH] dpp: fix implicit declaration of function explicit_bzero - warning -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -- add missing src/missing.h include for explicit_bzero, fixes uclibc - compile/linking - -Fixes: - - src/dpp.c:166:2: warning: implicit declaration of function ‘explicit_bzero’ [-Wimplicit-function-declaration] - 166 | explicit_bzero(dpp->r_nonce, dpp->nonce_len); - | ^~~~~~~~~~~~~~ - -[backport from upstream] -Signed-off-by: Peter Seiderer -[yann.morin.1998@free.fr: actual backport now upstreamn applied] -Signed-off-by: Yann E. MORIN ---- - src/dpp.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/dpp.c b/src/dpp.c -index 84e89f6c..8091ded1 100644 ---- a/src/dpp.c -+++ b/src/dpp.c -@@ -30,6 +30,7 @@ - - #include "linux/nl80211.h" - -+#include "src/missing.h" - #include "src/dbus.h" - #include "src/netdev.h" - #include "src/module.h" --- -2.34.1 - diff --git a/package/iwd/iwd.hash b/package/iwd/iwd.hash index 8e34d2983fa..1647f93d9ef 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 bac891df91c605271e91b73cf0015e1ba86ff784347e53fc67601366859b3851 iwd-1.21.tar.xz +sha256 b0506d797a8bfb88f3c3eeea5e49dcf4ee8e6cef118f57c118e587eeb377ac64 iwd-2.3.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/iwd/iwd.mk b/package/iwd/iwd.mk index a70da86ecc4..c54031b1021 100644 --- a/package/iwd/iwd.mk +++ b/package/iwd/iwd.mk @@ -4,7 +4,7 @@ # ################################################################################ -IWD_VERSION = 1.21 +IWD_VERSION = 2.3 IWD_SOURCE = iwd-$(IWD_VERSION).tar.xz IWD_SITE = $(BR2_KERNEL_MIRROR)/linux/network/wireless IWD_LICENSE = LGPL-2.1+ @@ -12,20 +12,12 @@ IWD_LICENSE_FILES = COPYING IWD_CPE_ID_VENDOR = intel IWD_CPE_ID_PRODUCT = inet_wireless_daemon IWD_SELINUX_MODULES = networkmanager -# We're patching configure.ac -IWD_AUTORECONF = YES IWD_CONF_OPTS = \ --disable-manual-pages \ - --enable-external-ell -IWD_DEPENDENCIES = ell - -ifeq ($(BR2_PACKAGE_DBUS),y) -IWD_CONF_OPTS += --enable-dbus-policy --with-dbus-datadir=/usr/share -IWD_DEPENDENCIES += dbus -else -IWD_CONF_OPTS += --disable-dbus-policy -endif + --enable-external-ell \ + --enable-dbus-policy +IWD_DEPENDENCIES = dbus ell ifeq ($(BR2_PACKAGE_READLINE),y) # iwd client depends on readline (GPL-3.0+) diff --git a/package/jack1/Config.in b/package/jack1/Config.in index 1c67f103325..5b3116e2f15 100644 --- a/package/jack1/Config.in +++ b/package/jack1/Config.in @@ -10,8 +10,6 @@ config BR2_PACKAGE_JACK1 select BR2_PACKAGE_ALSA_LIB_RAWMIDI select BR2_PACKAGE_ALSA_LIB_SEQ select BR2_PACKAGE_BERKELEYDB - select BR2_PACKAGE_LIBSAMPLERATE - select BR2_PACKAGE_LIBSNDFILE help JACK Audio Connection Kit (JACK 1 implementation). diff --git a/package/jack1/jack1.hash b/package/jack1/jack1.hash index d7787ac2add..d82b9daffd1 100644 --- a/package/jack1/jack1.hash +++ b/package/jack1/jack1.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 3517b5bff82139a76b2b66fe2fd9a3b34b6e594c184f95a988524c575b11d444 jack-audio-connection-kit-0.125.0.tar.gz -sha256 661fe53a7e3fce790b185e35c60b7ed80d7efdf25fd7df5af6814a9a215a538f COPYING -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING.GPL -sha256 ad01ea5cd2755f6048383c8d54c88459cd6fcb17757c5c8892f8c5ea060f6140 COPYING.LGPL +sha256 7b290e9dc7b9262ac328d41eef80c1053c97013efacbefa30477cb9b2a5445ea jack1-0.126.0.tar.gz +sha256 661fe53a7e3fce790b185e35c60b7ed80d7efdf25fd7df5af6814a9a215a538f COPYING +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING.GPL +sha256 ad01ea5cd2755f6048383c8d54c88459cd6fcb17757c5c8892f8c5ea060f6140 COPYING.LGPL diff --git a/package/jack1/jack1.mk b/package/jack1/jack1.mk index 311f7c9ba02..4e16d7e96ec 100644 --- a/package/jack1/jack1.mk +++ b/package/jack1/jack1.mk @@ -4,17 +4,17 @@ # ################################################################################ -JACK1_VERSION = 0.125.0 -JACK1_SOURCE = jack-audio-connection-kit-$(JACK1_VERSION).tar.gz -JACK1_SITE = http://jackaudio.org/downloads +JACK1_VERSION = 0.126.0 +JACK1_SITE = \ + https://github.com/jackaudio/jack1/releases/download/$(JACK1_VERSION) JACK1_LICENSE = GPL-2.0+ (jack server), LGPL-2.1+ (jack library) JACK1_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL JACK1_INSTALL_STAGING = YES -JACK1_DEPENDENCIES = host-pkgconf alsa-lib berkeleydb libsamplerate libsndfile +JACK1_DEPENDENCIES = host-pkgconf alsa-lib berkeleydb -ifeq ($(BR2_PACKAGE_READLINE),y) -JACK1_DEPENDENCIES += readline +ifeq ($(BR2_PACKAGE_LIBSAMPLERATE),y) +JACK1_DEPENDENCIES += libsamplerate endif JACK1_CONF_OPTS = --without-html-dir --disable-oss diff --git a/package/jack2/0001-Remove-usage-of-U-mode-bit-for-opening-files-in-pyth.patch b/package/jack2/0001-Remove-usage-of-U-mode-bit-for-opening-files-in-pyth.patch new file mode 100644 index 00000000000..9ee5a43e189 --- /dev/null +++ b/package/jack2/0001-Remove-usage-of-U-mode-bit-for-opening-files-in-pyth.patch @@ -0,0 +1,55 @@ +From 328c58967dce8be426f9208ba7717ab5afc2c4f3 Mon Sep 17 00:00:00 2001 +From: Daan De Meyer +Date: Mon, 11 Jul 2022 00:56:28 +0200 +Subject: [PATCH] Remove usage of 'U' mode bit for opening files in python + +The 'U' mode bit is removed in python 3.11. It has been +deprecated for a long time. The 'U' mode bit has no effect +so this change doesn't change any behavior. + +See https://docs.python.org/3.11/whatsnew/3.11.html#changes-in-the-python-api + +Signed-off-by: Peter Korsgaard +--- + waflib/ConfigSet.py | 2 +- + waflib/Context.py | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/waflib/ConfigSet.py b/waflib/ConfigSet.py +index b300bb56..84736c9c 100644 +--- a/waflib/ConfigSet.py ++++ b/waflib/ConfigSet.py +@@ -312,7 +312,7 @@ class ConfigSet(object): + :type filename: string + """ + tbl = self.table +- code = Utils.readf(filename, m='rU') ++ code = Utils.readf(filename, m='r') + for m in re_imp.finditer(code): + g = m.group + tbl[g(2)] = eval(g(3)) +diff --git a/waflib/Context.py b/waflib/Context.py +index 9fee3fa1..761b521f 100644 +--- a/waflib/Context.py ++++ b/waflib/Context.py +@@ -266,7 +266,7 @@ class Context(ctx): + cache[node] = True + self.pre_recurse(node) + try: +- function_code = node.read('rU', encoding) ++ function_code = node.read('r', encoding) + exec(compile(function_code, node.abspath(), 'exec'), self.exec_dict) + finally: + self.post_recurse(node) +@@ -662,7 +662,7 @@ def load_module(path, encoding=None): + + module = imp.new_module(WSCRIPT_FILE) + try: +- code = Utils.readf(path, m='rU', encoding=encoding) ++ code = Utils.readf(path, m='r', encoding=encoding) + except EnvironmentError: + raise Errors.WafError('Could not read the file %r' % path) + +-- +2.30.2 + diff --git a/package/jack2/Config.in b/package/jack2/Config.in index bc883190d55..f5ac0399ebb 100644 --- a/package/jack2/Config.in +++ b/package/jack2/Config.in @@ -5,8 +5,6 @@ config BR2_PACKAGE_JACK2 depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_SYNC_4 - select BR2_PACKAGE_LIBSAMPLERATE - select BR2_PACKAGE_LIBSNDFILE select BR2_PACKAGE_ALSA_LIB select BR2_PACKAGE_ALSA_LIB_HWDEP select BR2_PACKAGE_ALSA_LIB_SEQ @@ -30,7 +28,7 @@ config BR2_PACKAGE_JACK2_LEGACY help Build and use jackd. - https://github.com/jackaudio/jackaudio.github.com/wiki/JackDbusPackaging + https://github.com/jackaudio/jackaudio.github.com/wiki/JACK-DBus-packaging config BR2_PACKAGE_JACK2_DBUS bool "dbus jack2" @@ -42,7 +40,7 @@ config BR2_PACKAGE_JACK2_DBUS help Build and use jackdbus. - https://github.com/jackaudio/jackaudio.github.com/wiki/JackDbusPackaging + https://github.com/jackaudio/jackaudio.github.com/wiki/JACK-DBus-packaging endif diff --git a/package/jack2/jack2.hash b/package/jack2/jack2.hash index df708f7ca55..c98971ca1cb 100644 --- a/package/jack2/jack2.hash +++ b/package/jack2/jack2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 38f674bbc57852a8eb3d9faa1f96a0912d26f7d5df14c11005ad499c8ae352f2 jack2-1.9.17.tar.gz +sha256 8b044a40ba5393b47605a920ba30744fdf8bf77d210eca90d39c8637fe6bc65d jack2-1.9.21.tar.gz sha256 d8c320ffc0030d1b096ae4732b50d2b811cf95e9a9b7377c1127b2563e0a0388 COPYING diff --git a/package/jack2/jack2.mk b/package/jack2/jack2.mk index e6a036bac98..f7683304a64 100644 --- a/package/jack2/jack2.mk +++ b/package/jack2/jack2.mk @@ -4,22 +4,54 @@ # ################################################################################ -JACK2_VERSION = 1.9.17 +JACK2_VERSION = 1.9.21 JACK2_SITE = $(call github,jackaudio,jack2,v$(JACK2_VERSION)) JACK2_LICENSE = GPL-2.0+ (jack server), LGPL-2.1+ (jack library) JACK2_LICENSE_FILES = COPYING JACK2_CPE_ID_VENDOR = jackaudio -JACK2_DEPENDENCIES = libsamplerate libsndfile alsa-lib +JACK2_DEPENDENCIES = host-pkgconf alsa-lib JACK2_INSTALL_STAGING = YES -JACK2_CONF_OPTS = --alsa +JACK2_CONF_OPTS = --alsa --example-tools=no + +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +JACK2_DEPENDENCIES += libexecinfo +JACK2_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -lexecinfo" +endif + +ifeq ($(BR2_PACKAGE_LIBSAMPLERATE),y) +JACK2_DEPENDENCIES += libsamplerate +JACK2_CONF_OPTS += --samplerate=yes +else +JACK2_CONF_OPTS += --samplerate=no +endif + +ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) +JACK2_DEPENDENCIES += libsndfile +JACK2_CONF_OPTS += --sndfile=yes +else +JACK2_CONF_OPTS += --sndfile=no +endif ifeq ($(BR2_PACKAGE_OPUS),y) JACK2_DEPENDENCIES += opus +JACK2_CONF_OPTS += --opus=yes +else +JACK2_CONF_OPTS += --opus=no endif ifeq ($(BR2_PACKAGE_READLINE),y) JACK2_DEPENDENCIES += readline +JACK2_CONF_OPTS += --readline=yes +else +JACK2_CONF_OPTS += --readline=no +endif + +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +JACK2_DEPENDENCIES += systemd +JACK2_CONF_OPTS += --systemd=yes +else +JACK2_CONF_OPTS += --systemd=no endif ifeq ($(BR2_PACKAGE_JACK2_LEGACY),y) diff --git a/package/jailhouse/jailhouse.hash b/package/jailhouse/jailhouse.hash index 13a260e8d07..297d0f19308 100644 --- a/package/jailhouse/jailhouse.hash +++ b/package/jailhouse/jailhouse.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 3777a553c2acb2b693843fe4d16ab80333879daedd47d9c9f3717c9644e6cf93 jailhouse-0.12.tar.gz -sha256 3aafb31a2436178323663e00511f16d58fc36ea654b1457532e79d017205efd8 COPYING +sha256 3777a553c2acb2b693843fe4d16ab80333879daedd47d9c9f3717c9644e6cf93 jailhouse-0.12.tar.gz +sha256 3aafb31a2436178323663e00511f16d58fc36ea654b1457532e79d017205efd8 COPYING diff --git a/package/janet/0001-Update-for-more-minimal-builds.patch b/package/janet/0001-Update-for-more-minimal-builds.patch new file mode 100644 index 00000000000..ba36a9beba8 --- /dev/null +++ b/package/janet/0001-Update-for-more-minimal-builds.patch @@ -0,0 +1,29 @@ +From 746ff5307d309536984b648460e7b5c5dac44453 Mon Sep 17 00:00:00 2001 +From: Calvin Rose +Date: Sun, 12 Feb 2023 12:14:11 -0600 +Subject: [PATCH] Update for more minimal builds. + +[Retrieved (and backported) from: +https://github.com/janet-lang/janet/commit/746ff5307d309536984b648460e7b5c5dac44453] +Signed-off-by: Fabrice Fontaine +--- + src/core/ffi.c | 4 ++++ + src/core/marsh.c | 2 ++ + 2 files changed, 6 insertions(+) + +diff --git a/src/core/ffi.c b/src/core/ffi.c +index 45a498c7..b453f1f6 100644 +--- a/src/core/ffi.c ++++ b/src/core/ffi.c +@@ -1311,7 +1311,11 @@ JANET_CORE_FN(cfun_ffi_jitfn, + size_t alloc_size = ((size_t) bytes.len + FFI_PAGE_MASK) & ~FFI_PAGE_MASK; + + #ifdef JANET_FFI_JIT ++#ifdef JANET_EV + JanetFFIJittedFn *fn = janet_abstract_threaded(&janet_type_ffijit, sizeof(JanetFFIJittedFn)); ++#else ++ JanetFFIJittedFn *fn = janet_abstract(&janet_type_ffijit, sizeof(JanetFFIJittedFn)); ++#endif + fn->function_pointer = NULL; + fn->size = 0; + #ifdef JANET_WINDOWS diff --git a/package/janet/Config.in b/package/janet/Config.in index 0e25ce34e3e..7b78c14bf4e 100644 --- a/package/janet/Config.in +++ b/package/janet/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_JANET bool "janet" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C11/stdatomic.h help Janet is a functional and imperative programming language. The entire language (core library, interpreter, compiler, @@ -8,3 +9,6 @@ config BR2_PACKAGE_JANET and two headers. https://janet-lang.org/ + +comment "janet needs a toolchain w/ gcc >= 4.9" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/janet/janet.hash b/package/janet/janet.hash index 50e6b1fef0e..47e0de4a0fb 100644 --- a/package/janet/janet.hash +++ b/package/janet/janet.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 02ff892f4bfc060a8a37f4a5c3e659bf34ba5f1f1c5eb07d60dc2642c5cf0476 janet-1.19.2.tar.gz +sha256 c95dab93e8e4ebcab5c293d5ee448fb43ab8bd2f6391fd66a6ca92fe1ec72c03 janet-1.26.0.tar.gz # Locally calculated -sha256 e2d2ae8360d95386af751ac7d1a3da36ea8ceb230e5f0eba7eb762547b1c58c9 LICENSE +sha256 95fca700e8dce9699248e7cc80ac88ce2357874c8352cd2be4d18f183dc9710b LICENSE diff --git a/package/janet/janet.mk b/package/janet/janet.mk index 5b6a9a182da..db1eb2a5c44 100644 --- a/package/janet/janet.mk +++ b/package/janet/janet.mk @@ -4,7 +4,7 @@ # ################################################################################ -JANET_VERSION = 1.19.2 +JANET_VERSION = 1.26.0 JANET_SITE = $(call github,janet-lang,janet,v$(JANET_VERSION)) JANET_LICENSE = MIT JANET_LICENSE_FILES = LICENSE diff --git a/package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch b/package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch index 2dfcc76d684..31796d6e28e 100644 --- a/package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch +++ b/package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch @@ -18,6 +18,8 @@ Signed-off-by: Thomas Petazzoni Signed-off-by: Bernd Kuhls (rebased against v0.6.3) Signed-off-by: Adam Duskett +[rebased against v1.0.3) +Signed-off-by: Fabrice Fontaine [Upstream status: rejected (https://github.com/meetecho/janus-gateway/pull/1789)] --- @@ -27,10 +29,10 @@ Signed-off-by: Adam Duskett 3 files changed, 79 insertions(+), 2 deletions(-) create mode 100644 m4/ax_check_compile_flag.m4 -diff --git a/Makefile.am b/Makefile.am +diff --git a/src/Makefile.am b/src/Makefile.am index f961fdb..3ddbe59 100644 ---- a/Makefile.am -+++ b/Makefile.am +--- a/src/Makefile.am ++++ b/src/Makefile.am @@ -151,6 +151,7 @@ janus_CFLAGS = \ -DEVENTDIR=\"$(eventdir)\" \ -DLOGGERDIR=\"$(loggerdir)\" \ diff --git a/package/janus-gateway/0003-Fixed-missing-XSS-mitigation.patch b/package/janus-gateway/0003-Fixed-missing-XSS-mitigation.patch deleted file mode 100644 index e1e612133b1..00000000000 --- a/package/janus-gateway/0003-Fixed-missing-XSS-mitigation.patch +++ /dev/null @@ -1,25 +0,0 @@ -From f62bba6513ec840761f2434b93168106c7c65a3d Mon Sep 17 00:00:00 2001 -From: Lorenzo Miniero -Date: Wed, 15 Dec 2021 14:10:01 +0100 -Subject: [PATCH] Fixed missing XSS mitigation (see #2817) - -[Retrieved from: -https://github.com/meetecho/janus-gateway/commit/f62bba6513ec840761f2434b93168106c7c65a3d] -Signed-off-by: Fabrice Fontaine ---- - html/textroomtest.js | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/html/textroomtest.js b/html/textroomtest.js -index bf95a260a..7d5ae832c 100644 ---- a/html/textroomtest.js -+++ b/html/textroomtest.js -@@ -351,7 +351,7 @@ function sendPrivateMsg(username) { - text: JSON.stringify(message), - error: function(reason) { bootbox.alert(reason); }, - success: function() { -- $('#chatroom').append('

[' + getDateString() + '] [whisper to ' + display + '] ' + result); -+ $('#chatroom').append('

[' + getDateString() + '] [whisper to ' + display + '] ' + escapeXmlTags(result)); - $('#chatroom').get(0).scrollTop = $('#chatroom').get(0).scrollHeight; - } - }); diff --git a/package/janus-gateway/0003-Use-parentheses-to-ensure-compilation.patch b/package/janus-gateway/0003-Use-parentheses-to-ensure-compilation.patch new file mode 100644 index 00000000000..f91c13d1f6a --- /dev/null +++ b/package/janus-gateway/0003-Use-parentheses-to-ensure-compilation.patch @@ -0,0 +1,27 @@ +From 51431c36cd5f2997c0f7723909195b9883ae0486 Mon Sep 17 00:00:00 2001 +From: Benson Muite +Date: Wed, 4 Jan 2023 13:33:36 +0300 +Subject: [PATCH] Use parentheses to ensure compilation (#3138) + +Compiler fails with latest Curl release. Use parenthesis to ensure compiler evaluates expression correctly. + +[Retrieved from: +https://github.com/meetecho/janus-gateway/commit/51431c36cd5f2997c0f7723909195b9883ae0486] +Signed-off-by: Fabrice Fontaine +--- + src/turnrest.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/turnrest.c b/src/turnrest.c +index b8560d22f2..42e6114de8 100644 +--- a/src/turnrest.c ++++ b/src/turnrest.c +@@ -165,7 +165,7 @@ janus_turnrest_response *janus_turnrest_request(const char *user) { + JANUS_LOG(LOG_VERB, "Sending request: %s\n", request_uri); + janus_mutex_unlock(&api_mutex); + curl_easy_setopt(curl, CURLOPT_URL, request_uri); +- curl_easy_setopt(curl, api_http_get ? CURLOPT_HTTPGET : CURLOPT_POST, 1); ++ curl_easy_setopt(curl, (api_http_get ? CURLOPT_HTTPGET : CURLOPT_POST), 1); + if(!api_http_get) { + /* FIXME Some servers don't like a POST with no data */ + curl_easy_setopt(curl, CURLOPT_POSTFIELDS, query_string); diff --git a/package/janus-gateway/Config.in b/package/janus-gateway/Config.in index 5d711fe746f..ccf065d211e 100644 --- a/package/janus-gateway/Config.in +++ b/package/janus-gateway/Config.in @@ -30,6 +30,14 @@ config BR2_PACKAGE_JANUS_GATEWAY_AUDIO_BRIDGE bool "audio bridge" select BR2_PACKAGE_OPUS +config BR2_PACKAGE_JANUS_GATEWAY_DUKTAPE + bool "duktape" + depends on !BR2_OPTIMIZE_FAST # duktape + select BR2_PACKAGE_DUKTAPE + +comment "duktape plugin can't be built with optimize for fast" + depends on BR2_OPTIMIZE_FAST + config BR2_PACKAGE_JANUS_GATEWAY_ECHO_TEST bool "echo test" diff --git a/package/janus-gateway/janus-gateway.hash b/package/janus-gateway/janus-gateway.hash index 7aec3d2aa36..7a87ae737a7 100644 --- a/package/janus-gateway/janus-gateway.hash +++ b/package/janus-gateway/janus-gateway.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b5fe70d95b9288200df15d5f75cb8eb6db66484c6ded159422a81e880ecb7104 janus-gateway-0.11.6.tar.gz +sha256 bb83c19d6137e39833e8eb2b1deeecb33b5d19d4f503d51703bdcc478c447940 janus-gateway-1.1.1.tar.gz sha256 91d04c97fa1da3fcd28205873276358aafc071c5b00a9ea8c49dd06d487a9dc6 COPYING diff --git a/package/janus-gateway/janus-gateway.mk b/package/janus-gateway/janus-gateway.mk index 84ca0bc1168..dd898563e5c 100644 --- a/package/janus-gateway/janus-gateway.mk +++ b/package/janus-gateway/janus-gateway.mk @@ -4,19 +4,16 @@ # ################################################################################ -JANUS_GATEWAY_VERSION = 0.11.6 +JANUS_GATEWAY_VERSION = 1.1.1 JANUS_GATEWAY_SITE = $(call github,meetecho,janus-gateway,v$(JANUS_GATEWAY_VERSION)) JANUS_GATEWAY_LICENSE = GPL-3.0 with OpenSSL exception JANUS_GATEWAY_LICENSE_FILES = COPYING JANUS_GATEWAY_CPE_ID_VENDOR = meetecho JANUS_GATEWAY_CPE_ID_PRODUCT = janus -# 0003-Fixed-missing-XSS-mitigation.patch -JANUS_GATEWAY_IGNORE_CVES += CVE-2021-4124 - # ding-libs provides the ini_config library JANUS_GATEWAY_DEPENDENCIES = host-pkgconf jansson libnice \ - libsrtp host-gengetopt libglib2 openssl libconfig \ + libsrtp libglib2 openssl libconfig \ $(if $(BR2_PACKAGE_LIBOGG),libogg) # Straight out of the repository, no ./configure, and we also patch @@ -41,6 +38,13 @@ else JANUS_GATEWAY_CONF_OPTS += --disable-plugin-audiobridge endif +ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_DUKTAPE),y) +JANUS_GATEWAY_DEPENDENCIES += duktape +JANUS_GATEWAY_CONF_OPTS += --enable-plugin-duktape +else +JANUS_GATEWAY_CONF_OPTS += --disable-plugin-duktape +endif + ifeq ($(BR2_PACKAGE_JANUS_GATEWAY_ECHO_TEST),y) JANUS_GATEWAY_CONF_OPTS += --enable-plugin-echotest else @@ -124,6 +128,13 @@ else JANUS_GATEWAY_CONF_OPTS += --disable-websockets endif +ifeq ($(BR2_PACKAGE_LIBCURL),y) +JANUS_GATEWAY_DEPENDENCIES += libcurl +JANUS_GATEWAY_CONF_OPTS += --enable-turn-rest-api +else +JANUS_GATEWAY_CONF_OPTS += --disable-turn-rest-api +endif + ifeq ($(BR2_PACKAGE_SYSTEMD),y) JANUS_GATEWAY_DEPENDENCIES += systemd JANUS_GATEWAY_CONF_OPTS += --enable-systemd-sockets @@ -131,4 +142,9 @@ else JANUS_GATEWAY_CONF_OPTS += --disable-systemd-sockets endif +define JANUS_GATEWAY_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 644 package/janus-gateway/janus-gateway.service \ + $(TARGET_DIR)/usr/lib/systemd/system/janus-gateway.service +endef + $(eval $(autotools-package)) diff --git a/package/janus-gateway/janus-gateway.service b/package/janus-gateway/janus-gateway.service new file mode 100644 index 00000000000..6e6bc7f0170 --- /dev/null +++ b/package/janus-gateway/janus-gateway.service @@ -0,0 +1,13 @@ +[Unit] +Description=Janus WebRTC Gateway +Wants=network.target +StartLimitIntervalSec=0 + +[Service] +Type=simple +ExecStart=/usr/bin/janus +Restart=on-failure +RestartSec=5 + +[Install] +WantedBy=multi-user.target diff --git a/package/jemalloc/jemalloc.hash b/package/jemalloc/jemalloc.hash index 5db53d0535e..214fe8062b1 100644 --- a/package/jemalloc/jemalloc.hash +++ b/package/jemalloc/jemalloc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 34330e5ce276099e2e8950d9335db5a875689a4c6a56751ef3b1d8c537f887f6 jemalloc-5.2.1.tar.bz2 -sha256 94aa2caa98c25d942f58b956c71dba6a99ff98fc3a31cbc669fe2a4cd0268b53 COPYING +sha256 2db82d1e7119df3e71b7640219b6dfe84789bc0537983c3b7ac4f7189aecfeaa jemalloc-5.3.0.tar.bz2 +sha256 94aa2caa98c25d942f58b956c71dba6a99ff98fc3a31cbc669fe2a4cd0268b53 COPYING diff --git a/package/jemalloc/jemalloc.mk b/package/jemalloc/jemalloc.mk index e43a4f79068..bd8a2d76544 100644 --- a/package/jemalloc/jemalloc.mk +++ b/package/jemalloc/jemalloc.mk @@ -4,7 +4,7 @@ # ################################################################################ -JEMALLOC_VERSION = 5.2.1 +JEMALLOC_VERSION = 5.3.0 JEMALLOC_SOURCE = jemalloc-$(JEMALLOC_VERSION).tar.bz2 JEMALLOC_SITE = https://github.com/jemalloc/jemalloc/releases/download/$(JEMALLOC_VERSION) JEMALLOC_LICENSE = BSD-2-Clause diff --git a/package/jhead/jhead.hash b/package/jhead/jhead.hash index bd9c8560d5f..1fe856198dc 100644 --- a/package/jhead/jhead.hash +++ b/package/jhead/jhead.hash @@ -1,3 +1,3 @@ # Locally calculated from download (no sig, hash) -sha256 5c5258c3d7a840bf831e22174e4a24cb1de3baf442f7cb73d5ab31b4ae0b0058 jhead-3.06.0.1.tar.gz -sha256 8b709512c737fc0c1e1024800b9a44c54d14ab02132c636a66c3ac66955c3e95 readme.txt +sha256 999a81b489c7b2a7264118f194359ecf4c1b714996a2790ff6d5d2f3940f1e9f jhead-3.08.tar.gz +sha256 b3971a74d00c834bc7f112d8a0027b25663fd1637a21381a3e5df4bd2b614dff readme.txt diff --git a/package/jhead/jhead.mk b/package/jhead/jhead.mk index a206e2fe342..f07739bc213 100644 --- a/package/jhead/jhead.mk +++ b/package/jhead/jhead.mk @@ -4,7 +4,7 @@ # ################################################################################ -JHEAD_VERSION = 3.06.0.1 +JHEAD_VERSION = 3.08 JHEAD_SITE = $(call github,Matthias-Wandel,jhead,$(JHEAD_VERSION)) JHEAD_LICENSE = Public Domain JHEAD_LICENSE_FILES = readme.txt diff --git a/package/jimtcl/jimtcl.mk b/package/jimtcl/jimtcl.mk index 2f8e0e6c690..3d68ca8f645 100644 --- a/package/jimtcl/jimtcl.mk +++ b/package/jimtcl/jimtcl.mk @@ -92,11 +92,11 @@ endef define HOST_JIMTCL_INSTALL_CMDS for i in $(JIMTCL_HEADERS_TO_INSTALL); do \ - cp -a $(@D)/$$i $(HOST_DIR)/usr/include/ || exit 1 ; \ + cp -a $(@D)/$$i $(HOST_DIR)/include/ || exit 1 ; \ done; $(INSTALL) -m 0755 -D $(@D)/libjim.so.$(JIMTCL_VERSION) \ - $(HOST_DIR)/usr/lib/libjim.so.$(JIMTCL_VERSION) - ln -sf libjim.so.$(JIMTCL_VERSION) $(HOST_DIR)/usr/lib/libjim.so + $(HOST_DIR)/lib/libjim.so.$(JIMTCL_VERSION) + ln -sf libjim.so.$(JIMTCL_VERSION) $(HOST_DIR)/lib/libjim.so endef $(eval $(generic-package)) diff --git a/package/jitterentropy-library/0001-Makefile-add-ENABLE_STACK_PROTECTOR.patch b/package/jitterentropy-library/0001-Makefile-add-ENABLE_STACK_PROTECTOR.patch deleted file mode 100644 index c4388663b0f..00000000000 --- a/package/jitterentropy-library/0001-Makefile-add-ENABLE_STACK_PROTECTOR.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 272ee47892563e849f6b1bf59b0173f8aa33b631 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 19 Dec 2021 11:36:13 +0100 -Subject: [PATCH] Makefile: add ENABLE_STACK_PROTECTOR - -Add ENABLE_STACK_PROTECTOR as build on embedded toolchains without -stack-protector is again broken since -https://github.com/smuellerDD/jitterentropy-library/commit/5b3cb7f35e41ba2f34a75d004cf095c965a1a0c4: - -/home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i686-buildroot-linux-uclibc/9.3.0/../../../../i686-buildroot-linux-uclibc/bin/ld: src/jitterentropy-base.o: in function `jent_fips_enabled': -jitterentropy-base.c:(.text+0x131): undefined reference to `__stack_chk_fail_local' - -Fixes: - - http://autobuild.buildroot.org/results/8dee462d16d934dd173d58f17933c6911e4336bf - -Signed-off-by: Fabrice Fontaine -Signed-off-by: Stephan Mueller -[Retrieved from: -https://github.com/smuellerDD/jitterentropy-library/commit/272ee47892563e849f6b1bf59b0173f8aa33b631] ---- - Makefile | 11 +++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) - -diff --git a/Makefile b/Makefile -index dfb96a8..c999ef5 100644 ---- a/Makefile -+++ b/Makefile -@@ -2,6 +2,7 @@ - - CC ?= gcc - #Hardening -+ENABLE_STACK_PROTECTOR ?= 1 - CFLAGS ?= -fwrapv --param ssp-buffer-size=4 -fvisibility=hidden -fPIE -Wcast-align -Wmissing-field-initializers -Wshadow -Wswitch-enum - CFLAGS +=-Wextra -Wall -pedantic -fPIC -O0 -fwrapv -Wconversion - LDFLAGS +=-Wl,-z,relro,-z,now -lpthread -@@ -13,10 +14,12 @@ else - GCC_GTEQ_490 := $(shell expr `$(CC) -dumpfullversion | sed -e 's/\.\([0-9][0-9]\)/\1/g' -e 's/\.\([0-9]\)/0\1/g' -e 's/^[0-9]\{3,4\}$$/&00/'` \>= 40900) - endif - --ifeq "$(GCC_GTEQ_490)" "1" -- CFLAGS += -fstack-protector-strong --else -- CFLAGS += -fstack-protector-all -+ifeq "$(ENABLE_STACK_PROTECTOR)" "1" -+ ifeq "$(GCC_GTEQ_490)" "1" -+ CFLAGS += -fstack-protector-strong -+ else -+ CFLAGS += -fstack-protector-all -+ endif - endif - - # Change as necessary diff --git a/package/jitterentropy-library/jitterentropy-library.hash b/package/jitterentropy-library/jitterentropy-library.hash index 760befab533..c7833f14280 100644 --- a/package/jitterentropy-library/jitterentropy-library.hash +++ b/package/jitterentropy-library/jitterentropy-library.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 9fcc954763a1dd4afe614a1b360f53b600d3376bbcc4b19177f27abf191ebad5 jitterentropy-library-3.3.1.tar.xz -sha256 7e06574ff822594269083a796d06fa4e5e78c40efe5ca01a72d2a4662e8206df LICENSE +sha256 802f025f766c38abf663fd5a21482b8313b6d6e2c68c36a4ffd6bc105fe975ab jitterentropy-library-3.4.1.tar.xz +sha256 7a89069066f6c0b8767d3256e5ec5d765b2c7f3354a5a06fc8d5bd7b8103d8a3 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 4cdebf46a3b..f405082d08a 100644 --- a/package/jitterentropy-library/jitterentropy-library.mk +++ b/package/jitterentropy-library/jitterentropy-library.mk @@ -4,7 +4,7 @@ # ################################################################################ -JITTERENTROPY_LIBRARY_VERSION = 3.3.1 +JITTERENTROPY_LIBRARY_VERSION = 3.4.1 JITTERENTROPY_LIBRARY_SOURCE = \ jitterentropy-library-$(JITTERENTROPY_LIBRARY_VERSION).tar.xz JITTERENTROPY_LIBRARY_SITE = http://www.chronox.de/jent diff --git a/package/joe/joe.hash b/package/joe/joe.hash index 1e2de4225ea..8029a22dc35 100644 --- a/package/joe/joe.hash +++ b/package/joe/joe.hash @@ -1,6 +1,6 @@ # From https://sourceforge.net/projects/joe-editor/files/JOE%20sources/joe-4.6/ -sha1 da7712333f676cfb5ae9f3565fd2225c5a2185ca joe-4.6.tar.gz -md5 9017484e6116830d846678b625ea5c43 joe-4.6.tar.gz +sha1 da7712333f676cfb5ae9f3565fd2225c5a2185ca joe-4.6.tar.gz +md5 9017484e6116830d846678b625ea5c43 joe-4.6.tar.gz # Locally computed: -sha256 495a0a61f26404070fe8a719d80406dc7f337623788e445b92a9f6de512ab9de joe-4.6.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 495a0a61f26404070fe8a719d80406dc7f337623788e445b92a9f6de512ab9de joe-4.6.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/jose/0002-man-add-option-to-skip-building-man-pages.patch b/package/jose/0002-man-add-option-to-skip-building-man-pages.patch new file mode 100644 index 00000000000..3a5ad1eadc8 --- /dev/null +++ b/package/jose/0002-man-add-option-to-skip-building-man-pages.patch @@ -0,0 +1,64 @@ +From 506132d3edc8d062f65fdacf007a15613d27e5c5 Mon Sep 17 00:00:00 2001 +From: Eneas U de Queiroz +Date: Wed, 6 Apr 2022 09:49:48 -0300 +Subject: [PATCH] man: add option to skip building man pages + +Add a 'skip_manpages' option to meson, so that man pages do not get +built. + +Signed-off-by: Eneas U de Queiroz +[Retrieved from: https://github.com/latchset/jose/pull/115] +Signed-off-by: Fabrice Fontaine +--- + meson.build | 24 +++++++++++++----------- + meson_options.txt | 1 + + 2 files changed, 14 insertions(+), 11 deletions(-) + create mode 100644 meson_options.txt + +diff --git a/meson.build b/meson.build +index 1edfbe7..9b40efb 100644 +--- a/meson.build ++++ b/meson.build +@@ -37,7 +37,6 @@ zlib = dependency('zlib') + threads = dependency('threads') + jansson = dependency('jansson', version: '>=2.10') + libcrypto = dependency('libcrypto', version: '>=1.0.2') +-a2x = find_program('a2x', required: false) + + mans = [] + +@@ -63,14 +62,17 @@ pkg.generate( + requires: 'jansson', + ) + +-if a2x.found() +- foreach m : mans +- custom_target(m.split('/')[-1], input: m + '.adoc', output: m.split('/')[-1], +- command: [a2x, '-f', 'manpage', '-D', meson.current_build_dir(), '@INPUT@'], +- install_dir: join_paths(get_option('mandir'), 'man' + m.split('.')[-1]), +- install: true +- ) +- endforeach +-else +- warning('Will not build man pages due to missing dependencies!') ++if not get_option('skip_manpages') ++ a2x = find_program('a2x', required: false) ++ if a2x.found() ++ foreach m : mans ++ custom_target(m.split('/')[-1], input: m + '.adoc', output: m.split('/')[-1], ++ command: [a2x, '-f', 'manpage', '-D', meson.current_build_dir(), '@INPUT@'], ++ install_dir: join_paths(get_option('mandir'), 'man' + m.split('.')[-1]), ++ install: true ++ ) ++ endforeach ++ else ++ warning('Will not build man pages due to missing dependencies!') ++ endif + endif +diff --git a/meson_options.txt b/meson_options.txt +new file mode 100644 +index 0000000..0885515 +--- /dev/null ++++ b/meson_options.txt +@@ -0,0 +1 @@ ++option('skip_manpages', type: 'boolean', value: false, description: 'Do not build manpages') diff --git a/package/jose/jose.mk b/package/jose/jose.mk index 8a60e20cc6f..723ebe8bb93 100644 --- a/package/jose/jose.mk +++ b/package/jose/jose.mk @@ -11,5 +11,6 @@ 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 $(eval $(meson-package)) diff --git a/package/jpeg-turbo/jpeg-turbo.hash b/package/jpeg-turbo/jpeg-turbo.hash index de821996593..6e1278b48a2 100644 --- a/package/jpeg-turbo/jpeg-turbo.hash +++ b/package/jpeg-turbo/jpeg-turbo.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/libjpeg-turbo/files/2.1.2/ -sha1 65c51c543b1fbba6db9ff5bee474ccb0b52a929f libjpeg-turbo-2.1.2.tar.gz -md5 e181bd78884dd5392a869209bfa41d4a libjpeg-turbo-2.1.2.tar.gz +# From https://sourceforge.net/projects/libjpeg-turbo/files/2.1.4/ +sha1 5a355c08caa326cef7c2a61e062edfe8dd02ac07 libjpeg-turbo-2.1.4.tar.gz +md5 3241b54016c445e5d8f0ebb0ad9294ed libjpeg-turbo-2.1.4.tar.gz # Locally computed -sha256 09b96cb8cbff9ea556a9c2d173485fd19488844d55276ed4f42240e1e2073ce5 libjpeg-turbo-2.1.2.tar.gz -sha256 7d8683a7f048e715e08b4cada8b7f0d9a6ab8afad88ed09c1143ef764ecbc0f2 LICENSE.md +sha256 d3ed26a1131a13686dfca4935e520eb7c90ae76fbc45d98bb50a8dc86230342b libjpeg-turbo-2.1.4.tar.gz +sha256 ee1eaf194d5924b6360af8a6ba6a4e1554037091f7505943300cdeec65f1aebb LICENSE.md sha256 4b7b9f8c03bb8d60270dfd12684e70ab21e4abfd27e73905cd1a7c4cae6f5cdb README.ijg diff --git a/package/jpeg-turbo/jpeg-turbo.mk b/package/jpeg-turbo/jpeg-turbo.mk index ddae019839f..e5bc8e7cf2c 100644 --- a/package/jpeg-turbo/jpeg-turbo.mk +++ b/package/jpeg-turbo/jpeg-turbo.mk @@ -4,7 +4,7 @@ # ################################################################################ -JPEG_TURBO_VERSION = 2.1.2 +JPEG_TURBO_VERSION = 2.1.4 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_LICENSE = IJG (libjpeg), BSD-3-Clause (TurboJPEG), Zlib (SIMD) diff --git a/package/jpeg/Config.in b/package/jpeg/Config.in index 0a786060d7b..371f89aa492 100644 --- a/package/jpeg/Config.in +++ b/package/jpeg/Config.in @@ -3,7 +3,8 @@ config BR2_PACKAGE_JPEG_SIMD_SUPPORT bool default y if BR2_X86_CPU_HAS_MMX default y if BR2_ARM_CPU_HAS_NEON - default y if BR2_POWERPC_CPU_HAS_ALTIVEC + default y if BR2_POWERPC_CPU_HAS_ALTIVEC && !BR2_powerpc64le + default y if BR2_POWERPC_CPU_HAS_VSX && BR2_powerpc64le default y if BR2_aarch64 || BR2_aarch64_be config BR2_PACKAGE_JPEG diff --git a/package/jquery-ui-themes/Config.in b/package/jquery-ui-themes/Config.in index 29359544ac3..b372d40b605 100644 --- a/package/jquery-ui-themes/Config.in +++ b/package/jquery-ui-themes/Config.in @@ -112,6 +112,6 @@ config BR2_PACKAGE_JQUERY_UI_THEMES_THEME default "trontastic" if BR2_PACKAGE_JQUERY_UI_THEMES_TRONTASTIC default "ui-darkness" if BR2_PACKAGE_JQUERY_UI_THEMES_UI_DARKNESS default "ui-lightness" if BR2_PACKAGE_JQUERY_UI_THEMES_UI_LIGHTNESS - default "vader" if BR2_PACKAGE_JQUERY_UI_THEMES_UI_VADER + default "vader" if BR2_PACKAGE_JQUERY_UI_THEMES_VADER endif diff --git a/package/jquery-ui/jquery-ui.hash b/package/jquery-ui/jquery-ui.hash index 453ecd55216..92bb5312dac 100644 --- a/package/jquery-ui/jquery-ui.hash +++ b/package/jquery-ui/jquery-ui.hash @@ -1,3 +1,3 @@ # locally computed -sha256 c76f349930245360f4d1dea672b9a587f8938b536a378e20eeff919f7263f99f jquery-ui-1.10.4.zip -sha256 ef1fdd608b20fbea7ef269ed03bd24e637717cc193971798a394bf2fa983cd53 MIT-LICENSE.txt +sha256 5f063f91df85431e3fea84f5d5709726d6dcd15ee4bf86b0e9a4b134912a5efd jquery-ui-1.13.1.zip +sha256 de33fb695880d0b07615d4b86f78cd43796906959ade5fdfef70968827a0db78 LICENSE.txt diff --git a/package/jquery-ui/jquery-ui.mk b/package/jquery-ui/jquery-ui.mk index 9284e683f1b..98d150bbf37 100644 --- a/package/jquery-ui/jquery-ui.mk +++ b/package/jquery-ui/jquery-ui.mk @@ -4,14 +4,11 @@ # ################################################################################ -JQUERY_UI_VERSION = 1.10.4 -# Use buildroot mirror since upstream switched the zipfile and directory -# structure without bumping/renaming. -# Remember to switch back to jqueryui.com when bumping! -JQUERY_UI_SITE = http://sources.buildroot.net +JQUERY_UI_VERSION = 1.13.1 +JQUERY_UI_SITE = https://jqueryui.com/resources/download JQUERY_UI_SOURCE = jquery-ui-$(JQUERY_UI_VERSION).zip JQUERY_UI_LICENSE = MIT -JQUERY_UI_LICENSE_FILES = MIT-LICENSE.txt +JQUERY_UI_LICENSE_FILES = LICENSE.txt define JQUERY_UI_EXTRACT_CMDS $(UNZIP) -d $(@D) $(JQUERY_UI_DL_DIR)/$(JQUERY_UI_SOURCE) @@ -20,15 +17,13 @@ define JQUERY_UI_EXTRACT_CMDS endef define JQUERY_UI_INSTALL_TARGET_CMDS - $(INSTALL) -m 0644 -D $(@D)/ui/minified/jquery-ui.min.js \ + $(INSTALL) -m 0644 -D $(@D)/jquery-ui.min.js \ $(TARGET_DIR)/var/www/jquery-ui.js - $(INSTALL) -m 0644 -D $(@D)/ui/minified/i18n/jquery-ui-i18n.min.js \ - $(TARGET_DIR)/var/www/jquery-ui-i18n.js - $(INSTALL) -m 0644 -D $(@D)/themes/base/minified/jquery-ui.min.css \ + $(INSTALL) -m 0644 -D $(@D)/jquery-ui.min.css \ $(TARGET_DIR)/var/www/jquery-ui.css $(INSTALL) -d $(TARGET_DIR)/var/www/images $(INSTALL) -m 0644 -t $(TARGET_DIR)/var/www/images \ - $(@D)/themes/base/minified/images/*.png + $(@D)/images/*.png endef $(eval $(generic-package)) diff --git a/package/jquery-validation/jquery-validation.hash b/package/jquery-validation/jquery-validation.hash index 4dbe07e2180..31ecd62bcb1 100644 --- a/package/jquery-validation/jquery-validation.hash +++ b/package/jquery-validation/jquery-validation.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 01ad2ef0a7f9cd413aeb51081651293916da47d20e5c0a59ec62587e58b03564 jquery-validation-1.19.3.zip -sha256 3e5a99460077c16bf75f6821a30cdac9baa339119ebf63b2a6c49f4f50421ca4 README.md +sha256 52381e080f266f8bca1a17acd6a4a68be4c2606a8b16f8a12e597cc69f2c0584 jquery-validation-1.19.5.zip +sha256 f398878cab338b869638bdac1aeae76bf3ac11b2b89da6e0b68bc1a645733440 LICENSE.md diff --git a/package/jquery-validation/jquery-validation.mk b/package/jquery-validation/jquery-validation.mk index 920ed1cece1..1ed37ee73b5 100644 --- a/package/jquery-validation/jquery-validation.mk +++ b/package/jquery-validation/jquery-validation.mk @@ -4,11 +4,11 @@ # ################################################################################ -JQUERY_VALIDATION_VERSION = 1.19.3 +JQUERY_VALIDATION_VERSION = 1.19.5 JQUERY_VALIDATION_SITE = https://github.com/jquery-validation/jquery-validation/releases/download/$(JQUERY_VALIDATION_VERSION) JQUERY_VALIDATION_SOURCE = jquery-validation-$(JQUERY_VALIDATION_VERSION).zip JQUERY_VALIDATION_LICENSE = MIT -JQUERY_VALIDATION_LICENSE_FILES = README.md +JQUERY_VALIDATION_LICENSE_FILES = LICENSE.md JQUERY_VALIDATION_CPE_ID_VENDOR = jqueryvalidation JQUERY_VALIDATION_CPE_ID_PRODUCT = jquery_validation diff --git a/package/jquery/jquery.hash b/package/jquery/jquery.hash index e9ef56a46db..173eb95ffd2 100644 --- a/package/jquery/jquery.hash +++ b/package/jquery/jquery.hash @@ -1,2 +1,2 @@ # Locally computed hashes, not provided by upstream -sha256 f7f6a5894f1d19ddad6fa392b2ece2c5e578cbf7da4ea805b6885eb6985b6e3d jquery-3.5.1.min.js +sha256 f7f6a5894f1d19ddad6fa392b2ece2c5e578cbf7da4ea805b6885eb6985b6e3d jquery-3.5.1.min.js diff --git a/package/jsmin/jsmin.hash b/package/jsmin/jsmin.hash index c1609785194..cc4490557b5 100644 --- a/package/jsmin/jsmin.hash +++ b/package/jsmin/jsmin.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 aae127bf7291a7b2592f36599e5ed6c6423eac7abe0cd5992f82d6d46fe9ed2d jsmin-1bf6ce5f74a9f8752ac7f5d115b8d7ccb31cfe1b.tar.gz -sha256 b420f61778af09534adc836a5086f5625b8499124051c50baefa218e7c03a58c jsmin.c +sha256 aae127bf7291a7b2592f36599e5ed6c6423eac7abe0cd5992f82d6d46fe9ed2d jsmin-1bf6ce5f74a9f8752ac7f5d115b8d7ccb31cfe1b.tar.gz +sha256 b420f61778af09534adc836a5086f5625b8499124051c50baefa218e7c03a58c jsmin.c diff --git a/package/jsmn/jsmn.hash b/package/jsmn/jsmn.hash index b5a78f6ebfd..7eaf6800444 100644 --- a/package/jsmn/jsmn.hash +++ b/package/jsmn/jsmn.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5f0913a10657fe7ec8d5794ccf00a01000e3e1f2f1e1f143c34a0f7b47edcb38 jsmn-1.1.0.tar.gz -sha256 4675b94a50d2afe811c52785463c854f1156056632cce17cc7133939eac8ed55 LICENSE +sha256 5f0913a10657fe7ec8d5794ccf00a01000e3e1f2f1e1f143c34a0f7b47edcb38 jsmn-1.1.0.tar.gz +sha256 4675b94a50d2afe811c52785463c854f1156056632cce17cc7133939eac8ed55 LICENSE diff --git a/package/json-c/json-c.hash b/package/json-c/json-c.hash index a20d370eb07..44d068a8b40 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 b8d80a1ddb718b3ba7492916237bbf86609e9709fb007e7f7d4322f02341a4c6 json-c-0.15.tar.gz +sha256 8e45ac8f96ec7791eaf3bb7ee50e9c2100bbbc87b8d0f1d030c5ba8a0288d96b json-c-0.16.tar.gz # Locally calculated sha256 74c1e6ca5eba76b54d0ad00d4815c8315c1b3bc45ff99de61d103dc92486284c COPYING diff --git a/package/json-c/json-c.mk b/package/json-c/json-c.mk index 3639bad25ab..9af7f9a83ef 100644 --- a/package/json-c/json-c.mk +++ b/package/json-c/json-c.mk @@ -4,12 +4,13 @@ # ################################################################################ -JSON_C_VERSION = 0.15 +JSON_C_VERSION = 0.16 JSON_C_SITE = https://s3.amazonaws.com/json-c_releases/releases JSON_C_INSTALL_STAGING = YES JSON_C_LICENSE = MIT JSON_C_LICENSE_FILES = COPYING JSON_C_CPE_ID_VENDOR = json-c_project +JSON_C_CONF_OPTS = -DDISABLE_EXTRA_LIBS=ON $(eval $(cmake-package)) $(eval $(host-cmake-package)) 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 a193fa6d496..7668f672492 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 5daca6ca216495edf89d167f808d1d03c4a4d929cef7da5e10f135ae1540c7e4 json-3.10.5.tar.gz +sha256 d69f9deb6a75e2580465c6c4c5111b89c4dc2fa94e3a85fcd2ffcd9a143d9273 json-3.11.2.tar.gz sha256 86b998c792894ccb911a1cb7994f7a9652894e7a094c0b5e45be2f553f45cf14 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 fd13ce1fd17..435644fd533 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.10.5 +JSON_FOR_MODERN_CPP_VERSION = 3.11.2 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 b68794db377..0c3cf7f7f70 100644 --- a/package/json-glib/json-glib.hash +++ b/package/json-glib/json-glib.hash @@ -1,5 +1,5 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/json-glib/1.4/json-glib-1.4.4.sha256sum -sha256 720c5f4379513dc11fd97dc75336eb0c0d3338c53128044d9fabec4374f4bc47 json-glib-1.4.4.tar.xz +# From https://download.gnome.org/sources/json-glib/1.6/json-glib-1.6.6.sha256sum +sha256 96ec98be7a91f6dde33636720e3da2ff6ecbb90e76ccaa49497f31a6855a490e json-glib-1.6.6.tar.xz # Hash for license file: -sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 COPYING +sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 COPYING diff --git a/package/json-glib/json-glib.mk b/package/json-glib/json-glib.mk index accdb4f888a..b7ff0bfd573 100644 --- a/package/json-glib/json-glib.mk +++ b/package/json-glib/json-glib.mk @@ -4,13 +4,14 @@ # ################################################################################ -JSON_GLIB_VERSION_MAJOR = 1.4 -JSON_GLIB_VERSION = $(JSON_GLIB_VERSION_MAJOR).4 -JSON_GLIB_SITE = http://ftp.gnome.org/pub/GNOME/sources/json-glib/$(JSON_GLIB_VERSION_MAJOR) +JSON_GLIB_VERSION_MAJOR = 1.6 +JSON_GLIB_VERSION = $(JSON_GLIB_VERSION_MAJOR).6 +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_INSTALL_STAGING = YES +JSON_GLIB_CONF_OPTS = -Dgtk_doc=disabled -Dtests=false JSON_GLIB_DEPENDENCIES = \ $(TARGET_NLS_DEPENDENCIES) \ @@ -18,10 +19,10 @@ JSON_GLIB_DEPENDENCIES = \ libglib2 ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) -JSON_GLIB_CONF_OPTS += -Dintrospection=true +JSON_GLIB_CONF_OPTS += -Dintrospection=enabled JSON_GLIB_DEPENDENCIES += gobject-introspection else -JSON_GLIB_CONF_OPTS += -Dintrospection=false +JSON_GLIB_CONF_OPTS += -Dintrospection=disabled endif JSON_GLIB_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) diff --git a/package/jszip/0001-fix-Use-a-null-prototype-object-for-this-files.patch b/package/jszip/0001-fix-Use-a-null-prototype-object-for-this-files.patch deleted file mode 100644 index 969db5b403e..00000000000 --- a/package/jszip/0001-fix-Use-a-null-prototype-object-for-this-files.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 22357494f424178cb416cdb7d93b26dd4f824b36 Mon Sep 17 00:00:00 2001 -From: Michael Aquilina -Date: Mon, 14 Jun 2021 12:28:46 +0100 -Subject: [PATCH] fix: Use a null prototype object for this.files - -This approach is taken to prevent overriding object methods that would -exist on a normal object Object.create({}) - -[Retrieved from: -https://github.com/Stuk/jszip/commit/22357494f424178cb416cdb7d93b26dd4f824b36] -Signed-off-by: Fabrice Fontaine ---- - lib/index.js | 5 ++++- - lib/object.js | 6 +++--- - 2 files changed, 7 insertions(+), 4 deletions(-) - -diff --git a/lib/index.js b/lib/index.js -index b449877..b4c95ba 100644 ---- a/lib/index.js -+++ b/lib/index.js -@@ -19,7 +19,10 @@ function JSZip() { - // "folder/" : {...}, - // "folder/data.txt" : {...} - // } -- this.files = {}; -+ // NOTE: we use a null prototype because we do not -+ // want filenames like "toString" coming from a zip file -+ // to overwrite methods and attributes in a normal Object. -+ this.files = Object.create(null); - - this.comment = null; - -diff --git a/lib/object.js b/lib/object.js -index 1c9d8e8..aec3db7 100644 ---- a/lib/object.js -+++ b/lib/object.js -@@ -179,16 +179,16 @@ var out = { - */ - forEach: function(cb) { - var filename, relativePath, file; -+ /* jshint ignore:start */ -+ // ignore warning about unwanted properties because this.files is a null prototype object - for (filename in this.files) { -- if (!this.files.hasOwnProperty(filename)) { -- continue; -- } - file = this.files[filename]; - relativePath = filename.slice(this.root.length, filename.length); - if (relativePath && filename.slice(0, this.root.length) === this.root) { // the file is in the current root - cb(relativePath, file); // TODO reverse the parameters ? need to be clean AND consistent with the filter search fn... - } - } -+ /* jshint ignore:end */ - }, - - /** diff --git a/package/jszip/jszip.hash b/package/jszip/jszip.hash index 13a2076ade1..d0c56a44ab9 100644 --- a/package/jszip/jszip.hash +++ b/package/jszip/jszip.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 e5343decfb781b15c54c0df9ddedd6c8518c800a4667a0a95741c694a4f38d34 jszip-3.2.2.tar.gz -sha256 14450c78405ad2a2173e25740b56406556779149df9c4c83523a8c63d0686210 LICENSE.markdown +sha256 aa3033c6bb5357a0b0965c92fbdb6d6abe64676e70ffa7933b63c573ab79ee45 jszip-3.10.0.tar.gz +sha256 566c953c6090b1218ca6217dd7359d45dde46581968586dc607d59a78af6a9c4 LICENSE.markdown diff --git a/package/jszip/jszip.mk b/package/jszip/jszip.mk index a93766be11a..35043686753 100644 --- a/package/jszip/jszip.mk +++ b/package/jszip/jszip.mk @@ -4,15 +4,12 @@ # ################################################################################ -JSZIP_VERSION = 3.2.2 +JSZIP_VERSION = 3.10.0 JSZIP_SITE = $(call github,Stuk,jszip,v$(JSZIP_VERSION)) JSZIP_LICENSE = MIT or GPL-3.0 JSZIP_LICENSE_FILES = LICENSE.markdown JSZIP_CPE_ID_VENDOR = jszip_project -# 0001-fix-Use-a-null-prototype-object-for-this-files.patch -JSZIP_IGNORE_CVES += CVE-2021-23413 - define JSZIP_INSTALL_TARGET_CMDS $(INSTALL) -m 0644 -D $(@D)/dist/jszip.min.js \ $(TARGET_DIR)/var/www/jszip/js/jszip.min.js diff --git a/package/kbd/kbd.hash b/package/kbd/kbd.hash index 324ba065d0d..63f7286d30b 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 55f0740458cfd3a84e775e50d7e8b92dc01846db1edad8e2411ccc293ece9b9f kbd-2.4.0.tar.xz -sha256 ddb9db7630752f8fdc6898f7c99a99eaeeac5213627ecb093df9c82f56175dc7 COPYING +sha256 ccdf452387a6380973d2927363e9cbb939fa2068915a6f937ff9d24522024683 kbd-2.5.1.tar.xz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 5a16340fe773f422144b436df90319114a2884933c56e9be6fad642e59be5e1f CREDITS diff --git a/package/kbd/kbd.mk b/package/kbd/kbd.mk index ea2c00a3737..15912419f83 100644 --- a/package/kbd/kbd.mk +++ b/package/kbd/kbd.mk @@ -4,7 +4,7 @@ # ################################################################################ -KBD_VERSION = 2.4.0 +KBD_VERSION = 2.5.1 KBD_SOURCE = kbd-$(KBD_VERSION).tar.xz KBD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kbd KBD_CONF_OPTS = \ diff --git a/package/keepalived/0003-fix-build-with-libressl.patch b/package/keepalived/0003-fix-build-with-libressl.patch new file mode 100644 index 00000000000..090d35511c6 --- /dev/null +++ b/package/keepalived/0003-fix-build-with-libressl.patch @@ -0,0 +1,50 @@ +From bbec15d4781670ac1be5e543cb04543f79200e69 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 12 Apr 2022 20:30:57 +0200 +Subject: [PATCH] fix build with libressl + +SSL_set0_rbio is provided by libressl since version 3.4.0 and +https://github.com/libressl-portable/openbsd/commit/c99939f9665a9c3c648682b4987df46600b70efc +but SSL_set0_wbio is not provided resulting in the following build +failure: + +/nvmedata/autobuild/instance-9/output-1/host/lib/gcc/s390x-buildroot-linux-gnu/10.3.0/../../../../s390x-buildroot-linux-gnu/bin/ld: check/libcheck.a(check_ssl.o): in function `ssl_connect': +check_ssl.c:(.text+0x7da): undefined reference to `SSL_set0_wbio' + +Fixes: + - http://autobuild.buildroot.org/results/76f72a3c7350ea265e2277c89d68e5256410e94c + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/acassen/keepalived/commit/bbec15d4781670ac1be5e543cb04543f79200e69] +--- + configure.ac | 2 +- + keepalived/check/check_ssl.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 5a2ea76ec..e8b5ccc41 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1327,7 +1327,7 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ + AC_CHECK_FUNCS([SSL_CTX_set_verify_depth]) + + # SSL_set0_rbio(), SSL_set0_wbio() OPENSSL_init_crypto() and TLS_method() introduced OpenSSL v1.1.0 +-AC_CHECK_FUNCS([SSL_set0_rbio OPENSSL_init_crypto TLS_method]) ++AC_CHECK_FUNCS([SSL_set0_wbio OPENSSL_init_crypto TLS_method]) + + # In OpenSSL v1.1.1 the call to SSL_CTX_new() fails if OPENSSL_init_crypto() has been called with + # OPENSSL_INIT_NO_LOAD_CONFIG. It does not fail in v1.1.0h and v1.1.1b. +diff --git a/keepalived/check/check_ssl.c b/keepalived/check/check_ssl.c +index 0155fce59..2cbedb8d3 100644 +--- a/keepalived/check/check_ssl.c ++++ b/keepalived/check/check_ssl.c +@@ -234,7 +234,7 @@ ssl_connect(thread_ref_t thread, int new_req) + BIO_get_fd(req->bio, &bio_fd); + if (fcntl(bio_fd, F_SETFD, fcntl(bio_fd, F_GETFD) | FD_CLOEXEC) == -1) + log_message(LOG_INFO, "Setting CLOEXEC failed on ssl socket - errno %d", errno); +-#ifdef HAVE_SSL_SET0_RBIO ++#ifdef HAVE_SSL_SET0_WBIO + BIO_up_ref(req->bio); + SSL_set0_rbio(req->ssl, req->bio); + SSL_set0_wbio(req->ssl, req->bio); diff --git a/package/kexec/kexec.hash b/package/kexec/kexec.hash index 05eb9e3d02d..34e17339b97 100644 --- a/package/kexec/kexec.hash +++ b/package/kexec/kexec.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/utils/kernel/kexec/sha256sums.asc -sha256 aa63cd6c7dd95b06ceba6240a7fdc6792789cada75a655e6714987175224241b kexec-tools-2.0.23.tar.xz +sha256 7ce2e5def38ec04f79feb107d02243dd586fbc68569eccf02f44bad3a13ec07d kexec-tools-2.0.25.tar.xz # locally calculated sha256 fa5fc1d1eec39532ea517518eeefd7b6e3c14341a55e5880a0e2a49eee47a5b7 COPYING diff --git a/package/kexec/kexec.mk b/package/kexec/kexec.mk index b3b4e565467..05acfbed17f 100644 --- a/package/kexec/kexec.mk +++ b/package/kexec/kexec.mk @@ -4,11 +4,13 @@ # ################################################################################ -KEXEC_VERSION = 2.0.23 +KEXEC_VERSION = 2.0.25 KEXEC_SOURCE = kexec-tools-$(KEXEC_VERSION).tar.xz KEXEC_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kexec KEXEC_LICENSE = GPL-2.0 KEXEC_LICENSE_FILES = COPYING +KEXEC_CPE_ID_PRODUCT = kexec-tools +KEXEC_CPE_ID_VENDOR = kexec-tools_project KEXEC_SELINUX_MODULES = kdump # Makefile expects $STRIP -o to work, so needed for !BR2_STRIP_strip diff --git a/package/keyutils/keyutils.mk b/package/keyutils/keyutils.mk index cba57cf199e..5af5c4e92ca 100644 --- a/package/keyutils/keyutils.mk +++ b/package/keyutils/keyutils.mk @@ -8,6 +8,7 @@ KEYUTILS_VERSION = 1.6.3 KEYUTILS_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/snapshot KEYUTILS_LICENSE = GPL-2.0+, LGPL-2.1+ KEYUTILS_LICENSE_FILES = LICENCE.GPL LICENCE.LGPL +KEYUTILS_CPE_ID_VENDOR = keyutils_project KEYUTILS_INSTALL_STAGING = YES KEYUTILS_MAKE_PARAMS = \ diff --git a/package/kismet/Config.in b/package/kismet/Config.in index 961d5f230e7..7bde6c92af3 100644 --- a/package/kismet/Config.in +++ b/package/kismet/Config.in @@ -3,14 +3,14 @@ comment "kismet needs a toolchain w/ threads, C++, gcc >= 5" depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_5 - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" + depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS config BR2_PACKAGE_KISMET bool "kismet" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" # protobuf-c + depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS # protobuf-c depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++14 select BR2_PACKAGE_LIBPCAP select BR2_PACKAGE_PROTOBUF_C diff --git a/package/kismet/kismet.hash b/package/kismet/kismet.hash index 9a9d2260b95..725d24e5511 100644 --- a/package/kismet/kismet.hash +++ b/package/kismet/kismet.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1c8e31b1babdb0fc93ac38fd0772a24d4b40f865fbc292fa8ec7f4a18ced0135 kismet-2021-08-R1.tar.xz +sha256 2149cceac5526508653f4d02dcf7a694e3da3dc000a2372a1ee4bf9988279781 kismet-2022-08-R1.tar.xz sha256 93c7f0d7e356b0abfb6f494ff3ea37f96abc84e9a5619b25d4e43f7553a55739 LICENSE diff --git a/package/kismet/kismet.mk b/package/kismet/kismet.mk index 819ed510d7e..8def78ad2ae 100644 --- a/package/kismet/kismet.mk +++ b/package/kismet/kismet.mk @@ -4,7 +4,7 @@ # ################################################################################ -KISMET_VERSION = 2021-08-R1 +KISMET_VERSION = 2022-08-R1 KISMET_SOURCE = kismet-$(KISMET_VERSION).tar.xz KISMET_SITE = http://www.kismetwireless.net/code KISMET_DEPENDENCIES = \ @@ -29,10 +29,6 @@ endif KISMET_CONF_ENV += CXXFLAGS="$(KISMET_CXXFLAGS)" -ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -KISMET_CONF_ENV += LIBS=-latomic -endif - ifeq ($(BR2_PACKAGE_LIBCAP),y) KISMET_DEPENDENCIES += libcap KISMET_CONF_OPTS += --enable-libcap diff --git a/package/kmemd/Config.in b/package/kmemd/Config.in new file mode 100644 index 00000000000..cd92757508e --- /dev/null +++ b/package/kmemd/Config.in @@ -0,0 +1,20 @@ +config BR2_PACKAGE_KMEMD + bool "kmemd" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libbpf + depends on BR2_USE_WCHAR # libbpf + depends on !BR2_STATIC_LIBS # libbpf + depends on BR2_TOOLCHAIN_HAS_THREADS # libbpf + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_14 + depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # libbpf + select BR2_PACKAGE_LIBBPF + help + Explore a live Linux kernel's memory using GDB + + https://github.com/wkz/kmemd + +comment "kmemd needs a uClibc or glibc toolchain w/ wchar, dynamic library, threads, headers >= 5.14" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_HAS_THREADS \ + || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13 \ + || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) diff --git a/package/kmemd/kmemd.hash b/package/kmemd/kmemd.hash new file mode 100644 index 00000000000..aecfea57f81 --- /dev/null +++ b/package/kmemd/kmemd.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 519ac3cdd367acee5090eec3b7e08400724f9b84486b191f3af534bd7cffca70 kmemd-1.0.0.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/kmemd/kmemd.mk b/package/kmemd/kmemd.mk new file mode 100644 index 00000000000..902941b981c --- /dev/null +++ b/package/kmemd/kmemd.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# kmemd +# +################################################################################ + +KMEMD_VERSION = 1.0.0 +KMEMD_SITE = https://github.com/wkz/kmemd/releases/download/$(KMEMD_VERSION) +KMEMD_LICENSE = GPL-2.0 +KMEMD_LICENSE_FILES = COPYING +KMEMD_DEPENDENCIES = libbpf + +define KMEMD_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_BPF_SYSCALL) + $(call KCONFIG_ENABLE_OPT,CONFIG_FTRACE) + $(call KCONFIG_ENABLE_OPT,CONFIG_KPROBES) + $(call KCONFIG_ENABLE_OPT,CONFIG_PERF_EVENTS) +endef + +$(eval $(autotools-package)) diff --git a/package/kmod/kmod.hash b/package/kmod/kmod.hash index c68e41f1b67..b181f73e9b1 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 0b80eea7aa184ac6fd20cafa2a1fdf290ffecc70869a797079e2cc5c6225a52a kmod-29.tar.xz +sha256 f897dd72698dc6ac1ef03255cd0a5734ad932318e4adbaebc7338ef2f5202f9f kmod-30.tar.xz # Locally calculated sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 libkmod/COPYING diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk index 82e8597759f..5d6d4408f95 100644 --- a/package/kmod/kmod.mk +++ b/package/kmod/kmod.mk @@ -4,7 +4,7 @@ # ################################################################################ -KMOD_VERSION = 29 +KMOD_VERSION = 30 KMOD_SOURCE = kmod-$(KMOD_VERSION).tar.xz KMOD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kmod KMOD_INSTALL_STAGING = YES diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash index 74aefe2138e..a36095c38cc 100644 --- a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash +++ b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1549422ac1386929dfc1a479898d6311440d1f8bfd1bc94e1fe5da9cc2db805c kodi-inputstream-adaptive-19.0.3-Matrix.tar.gz +sha256 b208313fd50442cabd339a16a3beec8cfa41c1b6bf19617ffeb269144c5f65fe kodi-inputstream-adaptive-19.0.7-Matrix.tar.gz sha256 89931c1fb1f3716694175763cf3221cfcd63d6935031cf6b4512d17ffe5d9860 LICENSE.GPL diff --git a/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk b/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk index 83ac8970377..9da87e0e380 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 = 19.0.3-Matrix +KODI_INPUTSTREAM_ADAPTIVE_VERSION = 19.0.7-Matrix KODI_INPUTSTREAM_ADAPTIVE_SITE = $(call github,xbmc,inputstream.adaptive,$(KODI_INPUTSTREAM_ADAPTIVE_VERSION)) KODI_INPUTSTREAM_ADAPTIVE_LICENSE = GPL-2.0+ KODI_INPUTSTREAM_ADAPTIVE_LICENSE_FILES = LICENSE.GPL diff --git a/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.hash b/package/kodi-inputstream-ffmpegdirect/kodi-inputstream-ffmpegdirect.hash index 97385a5167b..888c0ca9188 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 b676f5264df50f3cf990b270bbeb4a18bb082e99ff189d7b9a25fd67313a0382 kodi-inputstream-ffmpegdirect-19.0.1-Matrix.tar.gz +sha256 4693793a44b54204884c676a285bd371b354c426162736e5adae4ad2aa6088cf kodi-inputstream-ffmpegdirect-19.0.3-Matrix.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 bad6c6ac972..39347010b5b 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 = 19.0.1-Matrix +KODI_INPUTSTREAM_FFMPEGDIRECT_VERSION = 19.0.3-Matrix 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-jsonschemabuilder/kodi-jsonschemabuilder.mk b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk index 81fc2bb9f1c..a13fb91afee 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 = 19.3-Matrix +KODI_JSONSCHEMABUILDER_VERSION = 19.5-Matrix 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 c43d5d86281..0b483f70bf6 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 65efcfb8b0ed6595082d8d7298ec25b5c31d0189bb8e09ae1bc10989b9655204 kodi-peripheral-joystick-19.0.1-Matrix.tar.gz +sha256 a5c7c6b8b1f39c92d00289bd602ea2db13a3d3f73a50bd3f95ec08cf110a570e kodi-peripheral-joystick-19.0.4-Matrix.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 b823550751f..db1bc2c50f3 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 = 19.0.1-Matrix +KODI_PERIPHERAL_JOYSTICK_VERSION = 19.0.4-Matrix 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 5cb774fe26a..5467513a0b9 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 27f592e07c788067c97f7bbcac8a2c6803954730e6f0f66f2047a1d939e6648d kodi-peripheral-xarcade-19.0.1-Matrix.tar.gz +sha256 11f746cfeeffdfc1de6829d17aad999c8b598ca2239fcddb64801738546be6c9 kodi-peripheral-xarcade-19.0.5-Matrix.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 fd8b1af38c7..2d9e33b6251 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 = 19.0.1-Matrix +KODI_PERIPHERAL_XARCADE_VERSION = 19.0.5-Matrix 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-dvbviewer/kodi-pvr-dvbviewer.hash b/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash index d6a3e1c29c7..e3ff5bd1c15 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 5a6d6ff8ee87f37e2a6580b2a880a2ede635a4d9615962996831362150a5a20e kodi-pvr-dvbviewer-19.0.2-Matrix.tar.gz +sha256 5ccb4fa952c8909169dddd0a4c8f393ef8c1e8d35b9df0332f66a5f6442d6e85 kodi-pvr-dvbviewer-19.1.0-Matrix.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 db7884fcf7e..e4b00c06b5f 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 = 19.0.2-Matrix +KODI_PVR_DVBVIEWER_VERSION = 19.1.0-Matrix 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-hdhomerun/kodi-pvr-hdhomerun.hash b/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash index 4c866b59d8a..f177eabd538 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 6a5e5135b176d9aeba35e16fb6ce48ce7323c53960457597e25c2962b126cca2 kodi-pvr-hdhomerun-19.0.2-Matrix.tar.gz +sha256 cfd2695f38b0c0e3c7e7490e17476c2b82e2bbf18f0993d8041c7f15f6640cdd kodi-pvr-hdhomerun-19.1.0-Matrix.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 5c6829cee3f..a4a448c51eb 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 = 19.0.2-Matrix +KODI_PVR_HDHOMERUN_VERSION = 19.1.0-Matrix 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-iptvsimple/kodi-pvr-iptvsimple.hash b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash index 6ace3a5859c..47dd2022588 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 c92736b3f3c96fe36d7b20b329c82b47180260e3ed40fc456ef709572fad5fb0 kodi-pvr-iptvsimple-19.1.0-Matrix.tar.gz +sha256 57710d3add72301d47a9eef016916ee5f61b7b8604c73450d67b9ba962eff60c kodi-pvr-iptvsimple-19.2.2-Matrix.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 eedb0fb817a..5b91c35c0c6 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 = 19.1.0-Matrix +KODI_PVR_IPTVSIMPLE_VERSION = 19.2.2-Matrix 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-mythtv/kodi-pvr-mythtv.hash b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash index 15596333f58..81270ca7d22 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 ccb97573c308c99adccdedf8328133c02d48c11620b602a906cf25107602dba5 kodi-pvr-mythtv-19.0.7-Matrix.tar.gz +sha256 27c2546bf512f87f230e8312abeccd61d6bbb52ec1fbd7751f19d8df3c3afd4e kodi-pvr-mythtv-19.0.11-Matrix.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 3040f87e14e..8475249e513 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 = 19.0.7-Matrix +KODI_PVR_MYTHTV_VERSION = 19.0.11-Matrix 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 df13732957b..17d98170536 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 f9a03f7e61ae69096b149184a1ababa2d98cf2486688022e7b63823047c04496 kodi-pvr-nextpvr-19.0.3-Matrix.tar.gz +sha256 45ad0def6bbdb50fc42dc0b8a997e0db758fda42421fa7eb7643466ea512134f kodi-pvr-nextpvr-19.0.6-Matrix.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 c245a7e0bc0..6b3590a6d61 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 = 19.0.3-Matrix +KODI_PVR_NEXTPVR_VERSION = 19.0.6-Matrix 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-stalker/kodi-pvr-stalker.hash b/package/kodi-pvr-stalker/kodi-pvr-stalker.hash index 2eae79d3718..167905f637a 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 ca472c4f43f77d7badca3fbe174f5877e6b3ff63407da09f690d8146ec737b59 kodi-pvr-stalker-19.0.2-Matrix.tar.gz +sha256 191b2bd2dcbe15de29c1b867c127668784991e43817b00947cf955e569cf148e kodi-pvr-stalker-19.0.4-Matrix.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 efa293a40d6..f306c3a51bf 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 = 19.0.2-Matrix +KODI_PVR_STALKER_VERSION = 19.0.4-Matrix 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-vdr-vnsi/kodi-pvr-vdr-vnsi.hash b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash index e3dc5585d25..3e17fd553d3 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 317442cdfd333f47dfe95d05057a682340dd5ba53efc8894e892ee565b8aaece kodi-pvr-vdr-vnsi-19.0.3-Matrix.tar.gz +sha256 521add432b7fe38b6019f99547a440b1a2927d10f1420d518235c1c6d2e95b6b kodi-pvr-vdr-vnsi-19.0.5-Matrix.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 f0d61d9d2e0..ebb5f117b82 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 = 19.0.3-Matrix +KODI_PVR_VDR_VNSI_VERSION = 19.0.5-Matrix 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 92ccd0cbfeb..b2a4031bd3e 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 59e8b63e3b5a6dd4500fd2c1426e021b5b243909d326e173e84804618a6c2fc6 kodi-pvr-vuplus-19.0.0-Matrix.tar.gz +sha256 cd5658c5e40d42bc02e5c99b47c28cb24bdda4b6dd49029131ff147405d4c8a8 kodi-pvr-vuplus-19.0.1-Matrix.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 6a50ce703a4..81159e05f31 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 = 19.0.0-Matrix +KODI_PVR_VUPLUS_VERSION = 19.0.1-Matrix 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 9411453bf06..b80ca10ae5c 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 ab4995ed32910ced6004da800ca05fe5bf2d1882277e835eb64343806cfe217d kodi-pvr-waipu-19.1.1-Matrix.tar.gz +sha256 67ae49e516dfe4328587ea36439b3f48b099d1784dd57acebe1e49e137d75b56 kodi-pvr-waipu-19.3.1-Matrix.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 ffe9e31e5a9..b20f1c64143 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 = 19.1.1-Matrix +KODI_PVR_WAIPU_VERSION = 19.3.1-Matrix 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-zattoo/kodi-pvr-zattoo.hash b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash index ac4960df92c..c1d3b476b96 100644 --- a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash +++ b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8cc02c4627b5108e39bb7b6a6f56f7ba5debbb1adf982c4f23395944aa7d2c8e kodi-pvr-zattoo-19.7.10-Matrix.tar.gz +sha256 ac09db721e51b47f1ca7f4c2201833dbcd69040fd19b09c194fa7491ff4dad41 kodi-pvr-zattoo-19.7.16-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk index 7a3b230e8bc..49b33916ee1 100644 --- a/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk +++ b/package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_ZATTOO_VERSION = 19.7.10-Matrix +KODI_PVR_ZATTOO_VERSION = 19.7.16-Matrix KODI_PVR_ZATTOO_SITE = $(call github,rbuehlma,pvr.zattoo,$(KODI_PVR_ZATTOO_VERSION)) KODI_PVR_ZATTOO_LICENSE = GPL-2.0+ KODI_PVR_ZATTOO_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 e3d1ff73f49..c840e5b161b 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 49ba4dcf4b512ac0a97bd1a4ebf14685d294d89a7a07c26ddda0fe730c8aa047 kodi-skin-confluence-37a196cdb58c0da87b5b22b047a5d44dc447f1ae.tar.gz +sha256 c57b9a303ad1ebf14ad487901e5da15eba7b3a40304046974fad1d64fb7b8b57 kodi-skin-confluence-e6d31bc84eea73a04b2a23358929d5276be832b8.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 fcae506d1e3..c32718fd105 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 = 37a196cdb58c0da87b5b22b047a5d44dc447f1ae +KODI_SKIN_CONFLUENCE_VERSION = e6d31bc84eea73a04b2a23358929d5276be832b8 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 2ebcd7d8de8..9432e4bbd61 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 = 19.3-Matrix +KODI_TEXTUREPACKER_VERSION = 19.5-Matrix 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 f3a2c8fcefb..c0468517f2e 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 1360154d86bc73fc6f01f546d7b09a92968653cf05b037b0cd80a825d95a9187 kodi-vfs-libarchive-19.0.1-Matrix.tar.gz +sha256 957c76d3327b618396d9530394b235cebb73090b53afdeb2bd0d87f9677622d9 kodi-vfs-libarchive-19.2.0-Matrix.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 eac02d74422..1f79bad71f3 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 = 19.0.1-Matrix +KODI_VFS_LIBARCHIVE_VERSION = 19.2.0-Matrix 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-visualisation-goom/kodi-visualisation-goom.hash b/package/kodi-visualisation-goom/kodi-visualisation-goom.hash index 6fec1d495e2..f49fff77de3 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 167206c02b7c4ace0b5446cac013f77a7a238d2a9a7cc768987088b42ac1d941 kodi-visualisation-goom-19.0.1-Matrix.tar.gz +sha256 1936aaacdf0b3b032e848f8e7b7694111e1c78ce16efdb063263d543d70f003a kodi-visualisation-goom-19.0.2-Matrix.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 c7168af3061..8b258e19c2c 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 = 19.0.1-Matrix +KODI_VISUALISATION_GOOM_VERSION = 19.0.2-Matrix 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-spectrum/kodi-visualisation-spectrum.hash b/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.hash index 26cb7e3c779..1198dd1eabb 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 37cea1b82e4b70ab60494b6fe31a5dfd56d7e4feff16347d661f5d14c2f28724 kodi-visualisation-spectrum-19.0.1-Matrix.tar.gz +sha256 524a740db973673c0038bcc9f73fbae9af497c6699dd3c34527683f29824a5c9 kodi-visualisation-spectrum-19.0.2-Matrix.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 09aefd63fa4..0da5f22bae2 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 = 19.0.1-Matrix +KODI_VISUALISATION_SPECTRUM_VERSION = 19.0.2-Matrix 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-waveform/kodi-visualisation-waveform.hash b/package/kodi-visualisation-waveform/kodi-visualisation-waveform.hash index efd8eddc66f..3265477050c 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 a6180038f43d9344678952d29b6479e24194e6038518f9064e80781bf303ae70 kodi-visualisation-waveform-19.0.2-Matrix.tar.gz +sha256 a89b7d82afaa3bb279ecf32a2c04e6c7653f536b0df6fee2b7389c15340a01c7 kodi-visualisation-waveform-19.0.3-Matrix.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 71acd733a0b..9d75f79a87c 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 = 19.0.2-Matrix +KODI_VISUALISATION_WAVEFORM_VERSION = 19.0.3-Matrix 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 6896e85e7b4..7bd8bc2943d 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -27,6 +27,9 @@ config BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_GBM depends on BR2_PACKAGE_HAS_UDEV # libinput select BR2_PACKAGE_KODI_PLATFORM_SUPPORTS +comment "kodi needs udev support for gbm" + depends on !BR2_PACKAGE_KODI_PLATFORM_SUPPORTS + config BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_WAYLAND bool default y @@ -72,6 +75,8 @@ menuconfig BR2_PACKAGE_KODI select BR2_PACKAGE_FONTCONFIG # needed for libass select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_FSTRCMP + select BR2_PACKAGE_GIFLIB + select BR2_PACKAGE_JPEG select BR2_PACKAGE_LIBASS select BR2_PACKAGE_LIBCDIO select BR2_PACKAGE_LIBCROSSGUID @@ -81,6 +86,7 @@ menuconfig BR2_PACKAGE_KODI select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_LIBICONV_EXTRA_ENCODINGS if !BR2_ENABLE_LOCALE select BR2_PACKAGE_LIBPLIST + select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_LZO select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_PCRE @@ -127,7 +133,7 @@ config BR2_PACKAGE_KODI_AVAHI config BR2_PACKAGE_KODI_BLUEZ bool "bluetooth" - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # bluez5_utils + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # bluez5_utils hid plugin depends on BR2_TOOLCHAIN_HAS_SYNC_4 # bluez5_utils select BR2_PACKAGE_BLUEZ5_UTILS select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO @@ -135,9 +141,9 @@ config BR2_PACKAGE_KODI_BLUEZ help Enable bluetooth support -comment "bluetooth support needs a toolchain w/ headers >= 3.4" +comment "bluetooth support needs a toolchain w/ headers >= 3.18" depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 config BR2_PACKAGE_KODI_DBUS bool "dbus" @@ -247,7 +253,7 @@ config BR2_PACKAGE_KODI_LIBUSB config BR2_PACKAGE_KODI_LIBVDPAU bool "vdpau" - depends on BR2_PACKAGE_KODI_PLATFORM_X11 && \ + depends on BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_X11 && \ BR2_PACKAGE_KODI_RENDER_SYSTEM_GL select BR2_PACKAGE_LIBVDPAU help diff --git a/package/kodi/kodi.hash b/package/kodi/kodi.hash index 7f96af385ac..e0f548879e4 100644 --- a/package/kodi/kodi.hash +++ b/package/kodi/kodi.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 440f47e475dd8a48e0a6d41349e83b74890f3fbe8275d3e401d3c50f5b9ea09b kodi-19.3-Matrix.tar.gz +sha256 56e0074f27f08496b2a21af5704a15378a2f0979ae3e9fa9a50a2630d0313d19 kodi-19.5-Matrix.tar.gz sha256 38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d kodi-libdvdcss-1.4.2-Leia-Beta-5.tar.gz sha256 071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a kodi-libdvdnav-6.0.0-Leia-Alpha-3.tar.gz sha256 a30b6aa0aad0f2c505bc77948af2d5531a80b6e68112addb4c123fca24d5d3bf kodi-libdvdread-6.0.0-Leia-Alpha-3.tar.gz diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index 58ad1154750..093b3aa9ae3 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 = 19.3 +KODI_VERSION_MAJOR = 19.5 KODI_VERSION_NAME = Matrix KODI_VERSION = $(KODI_VERSION_MAJOR)-$(KODI_VERSION_NAME) KODI_SITE = $(call github,xbmc,xbmc,$(KODI_VERSION)) @@ -25,6 +25,7 @@ KODI_DEPENDENCIES = \ fontconfig \ freetype \ fstrcmp \ + giflib \ host-flatbuffers \ host-gawk \ host-gettext \ @@ -34,6 +35,7 @@ KODI_DEPENDENCIES = \ host-nasm \ host-swig \ host-xmlstarlet \ + jpeg \ libass \ libcdio \ libcrossguid \ @@ -42,6 +44,7 @@ KODI_DEPENDENCIES = \ libegl \ libfribidi \ libplist \ + libpng \ lzo \ openssl \ pcre \ @@ -133,7 +136,7 @@ else ifeq ($(BR2_powerpc)$(BR2_powerpc64le),y) KODI_CONF_OPTS += \ -DWITH_ARCH=powerpc$(if $(BR2_ARCH_IS_64),64) \ -DWITH_CPU=powerpc$(if $(BR2_ARCH_IS_64),64) -else ifeq ($(BR2_powerpc64)$(BR2_sparc64)$(BR2_sh4)$(BR2_xtensa),y) +else ifeq ($(BR2_or1k)$(BR2_powerpc64)$(BR2_riscv)$(BR2_sparc64)$(BR2_sh4)$(BR2_xtensa),y) KODI_CONF_OPTS += -DWITH_ARCH=$(BR2_ARCH) -DWITH_CPU=$(BR2_ARCH) else # Kodi auto-detects ARCH, tested: arm, aarch64, i386, x86_64 @@ -141,6 +144,14 @@ else KODI_CONF_OPTS += -DWITH_CPU=$(BR2_ARCH) endif +ifeq ($(BR2_ARM_CPU_HAS_NEON),y) +KODI_CONF_OPTS += -DENABLE_NEON=ON +else ifeq ($(BR2_aarch64),y) +KODI_CONF_OPTS += -DENABLE_NEON=ON +else +KODI_CONF_OPTS += -DENABLE_NEON=OFF +endif + ifeq ($(BR2_X86_CPU_HAS_SSE),y) KODI_CONF_OPTS += -D_SSE_OK=ON -D_SSE_TRUE=ON else diff --git a/package/kompexsqlite/0001-Makefile-use-autoconf-CXX-for-proper-builds.patch b/package/kompexsqlite/0001-Makefile-use-autoconf-CXX-for-proper-builds.patch deleted file mode 100644 index 408c100d719..00000000000 --- a/package/kompexsqlite/0001-Makefile-use-autoconf-CXX-for-proper-builds.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 769693d9ddf63b04dd4aad6cad080f3cee3f997e Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Thu, 11 Jun 2015 14:08:38 -0300 -Subject: [PATCH] Makefile: use autoconf CXX for proper builds - -Status: applied upstream. - -Signed-off-by: Gustavo Zacarias ---- - Makefile.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Makefile.in b/Makefile.in -index 91fb8b2..fe862cd 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -23,6 +23,7 @@ mandir = $(prefix)/share/man/man3 - headerdir = $(prefix)/include/kompex - - CC = @CC@ -+CXX = @CXX@ - CFLAGS = @CFLAGS@ - CPPFLAGS = $(CFLAGS) @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ --- -2.3.6 - diff --git a/package/kompexsqlite/0002-append-to-cflags-and-cxxflags.patch b/package/kompexsqlite/0002-append-to-cflags-and-cxxflags.patch deleted file mode 100644 index abd0dc0fddd..00000000000 --- a/package/kompexsqlite/0002-append-to-cflags-and-cxxflags.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 3eb064ffa9b43fb5f245b8abda48a1c152a6f2d7 Mon Sep 17 00:00:00 2001 -From: me -Date: Thu, 20 Nov 2014 14:37:34 -0700 -Subject: [PATCH] Append to CFLAGS and CXXFLAGS as setup by ./configure. This - can allow users to Customize the SQLite build process with compile time - #defines rather than altering the sources. - -Signed-off-by: Max Filippov ---- -Backported from: 3eb064ffa9b43fb5f245b8abda48a1c152a6f2d7 - - Makefile-shared.mk | 4 ++-- - Makefile-static.mk | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Makefile-shared.mk b/Makefile-shared.mk -index b2a4920..d15ce3c 100644 ---- a/Makefile-shared.mk -+++ b/Makefile-shared.mk -@@ -12,10 +12,10 @@ OBJS= \ - ${objsdir}/sqlite3.o - - # C Compiler Flags --CFLAGS= -fPIC -MMD -MP -+CFLAGS+= -fPIC -MMD -MP - - # CC Compiler Flags --CPPFLAGS= -DKOMPEX_SQLITEWRAPPER_EXPORT -DKOMPEX_SQLITEWRAPPER_DYN -fPIC -MMD -MP -I${includedir} -+CPPFLAGS+= -DKOMPEX_SQLITEWRAPPER_EXPORT -DKOMPEX_SQLITEWRAPPER_DYN -fPIC -MMD -MP -I${includedir} - - # Link Libraries and Options - LDLIBSOPTIONS= -shared -fPIC -diff --git a/Makefile-static.mk b/Makefile-static.mk -index 429a4ff..0678681 100644 ---- a/Makefile-static.mk -+++ b/Makefile-static.mk -@@ -12,10 +12,10 @@ OBJS= \ - ${objsdir}/sqlite3.o - - # C Compiler Flags --CFLAGS= -MMD -MP -+CFLAGS+= -MMD -MP - - # CC Compiler Flags --CPPFLAGS= -I${includedir} -MMD -MP -+CPPFLAGS+= -I${includedir} -MMD -MP - - # Link Libraries and Options - LDLIBSOPTIONS= diff --git a/package/kompexsqlite/kompexsqlite.hash b/package/kompexsqlite/kompexsqlite.hash index 8869e9b7d96..aa0f269570a 100644 --- a/package/kompexsqlite/kompexsqlite.hash +++ b/package/kompexsqlite/kompexsqlite.hash @@ -1,3 +1,4 @@ # Locally calculated -sha256 73bec94fe5dd3a24bd8668b3a131a84dbe39a992579eebab1236aa0e73b2c9cc kompexsqlite-1.10.12-1.tar.gz -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.txt +sha256 81773ddb156fed51ef43a5f562e3b47761c4c33de9197bf0c3e7099b08579e2a download.php?dl=KompexSQLiteWrapper-Source_1.12.15.tar.gz +sha256 65fd20aeb67892740a710a09d788acfda8747741e746395739412919f84b5f9f inc/KompexSQLiteDatabase.h +sha256 001f26c0b2ca407a9a5d3f5e0690d7e576687b23110e18d2a08014dd774eb71c inc/sqlite3.h diff --git a/package/kompexsqlite/kompexsqlite.mk b/package/kompexsqlite/kompexsqlite.mk index a40088fa2d3..6a619de0ef9 100644 --- a/package/kompexsqlite/kompexsqlite.mk +++ b/package/kompexsqlite/kompexsqlite.mk @@ -4,11 +4,44 @@ # ################################################################################ -KOMPEXSQLITE_VERSION = 1.10.12-1 -KOMPEXSQLITE_SITE = \ - $(call github,Aethelflaed,kompex-sqlite-wrapper,v$(KOMPEXSQLITE_VERSION)) +KOMPEXSQLITE_VERSION = 1.12.15 +KOMPEXSQLITE_SOURCE = download.php?dl=KompexSQLiteWrapper-Source_$(KOMPEXSQLITE_VERSION).tar.gz +KOMPEXSQLITE_SITE = http://sqlitewrapper.kompex-online.com/counter KOMPEXSQLITE_INSTALL_STAGING = YES -KOMPEXSQLITE_LICENSE = LGPL-3.0+ (wrapper), Public Domain (bundled sqlite) -KOMPEXSQLITE_LICENSE_FILES = LICENSE.txt +KOMPEXSQLITE_LICENSE = MIT (wrapper), Public Domain (bundled sqlite) +KOMPEXSQLITE_LICENSE_FILES = inc/KompexSQLiteDatabase.h inc/sqlite3.h -$(eval $(autotools-package)) +ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),y) +KOMPEXSQLITE_CONFS += ReleaseStaticLib +define KOMPEXSQLITE_INSTALL_STATIC_LIB + $(INSTALL) -D -m 0644 $(@D)/lib/release/KompexSQLiteWrapper_Static.a \ + $(STAGING_DIR)/usr/lib/libkompex-sqlite-wrapper.a +endef +endif + +ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y) +KOMPEXSQLITE_CONFS += ReleaseDynamicLib +define KOMPEXSQLITE_INSTALL_SHARED_LIB + $(INSTALL) -D -m 0755 $(@D)/lib/release/KompexSQLiteWrapper.so \ + $(1)/usr/lib/libkompex-sqlite-wrapper.so +endef +endif + +define KOMPEXSQLITE_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + ALLCONFS="$(KOMPEXSQLITE_CONFS)" \ + -C "$(@D)/Kompex SQLite Wrapper" all +endef + +define KOMPEXSQLITE_INSTALL_STAGING_CMDS + mkdir -p $(STAGING_DIR)/usr/include/kompex + $(INSTALL) -m 644 $(@D)/inc/* $(STAGING_DIR)/usr/include/kompex + $(KOMPEXSQLITE_INSTALL_STATIC_LIB) + $(call KOMPEXSQLITE_INSTALL_SHARED_LIB,$(STAGING_DIR)) +endef + +define KOMPEXSQLITE_INSTALL_TARGET_CMDS + $(call KOMPEXSQLITE_INSTALL_SHARED_LIB,$(TARGET_DIR)) +endef + +$(eval $(generic-package)) diff --git a/package/ksmbd-tools/ksmbd-tools.hash b/package/ksmbd-tools/ksmbd-tools.hash index d146f36a0e6..b31c66bbe72 100644 --- a/package/ksmbd-tools/ksmbd-tools.hash +++ b/package/ksmbd-tools/ksmbd-tools.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f42aec21515e34305bc07e1ce2c4926c87ea7bc8a675ca6d0a453f6b6be34e2b ksmbd-tools-3.4.4.tar.gz +sha256 09ab343e9bf10ddfdd3216f400b19740a391645bf3645fa6f136b8da36306559 ksmbd-tools-3.4.6.tar.gz sha256 576540abf5e95029ad4ad90e32071385a5e95b2c30708c706116f3eb87b9a3de COPYING diff --git a/package/ksmbd-tools/ksmbd-tools.mk b/package/ksmbd-tools/ksmbd-tools.mk index b08845b581b..c4f9c503e66 100644 --- a/package/ksmbd-tools/ksmbd-tools.mk +++ b/package/ksmbd-tools/ksmbd-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -KSMBD_TOOLS_VERSION = 3.4.4 +KSMBD_TOOLS_VERSION = 3.4.6 KSMBD_TOOLS_SITE = https://github.com/cifsd-team/ksmbd-tools/releases/download/$(KSMBD_TOOLS_VERSION) KSMBD_TOOLS_LICENSE = GPL-2.0+ KSMBD_TOOLS_LICENSE_FILES = COPYING diff --git a/package/ktap/Config.in b/package/ktap/Config.in deleted file mode 100644 index 38293f6ddee..00000000000 --- a/package/ktap/Config.in +++ /dev/null @@ -1,31 +0,0 @@ -config BR2_PACKAGE_KTAP - bool "ktap" - depends on BR2_LINUX_KERNEL - depends on BR2_TOOLCHAIN_HAS_THREADS - help - ktap is a script-based dynamic tracing tool for Linux - - It uses a scripting language and lets users trace the Linux - kernel dynamically. ktap is designed to give operational - insights with interoperability that allows users to tune, - troubleshoot and extend kernel and application. - It's similar to Linux Systemtap and Solaris Dtrace. - - ktap doesn't support kernels older than 3.1. - - To be able to resolve symbols in DSO and for sdt, you need to - enable elfutils. - - Your kernel must have CONFIG_EVENT_TRACING, - CONFIG_PERF_EVENTS, and CONFIG_DEBUG_FS enabled to compile. - - Buildroot automatically enables these in the kernel - configuration. - - http://www.ktap.org - -comment "ktap needs a Linux kernel to be built" - depends on !BR2_LINUX_KERNEL - -comment "ktap needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/ktap/ktap.hash b/package/ktap/ktap.hash deleted file mode 100644 index 1eff7125013..00000000000 --- a/package/ktap/ktap.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 44a0808d57175cf9d15466f720e1e10d5ed1abc3497aedf9ddd6469545552345 ktap-23bc7a4a94bd9e4e1b8b7c06632e61c041d57b5f.tar.gz -sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 LICENSE-GPL diff --git a/package/ktap/ktap.mk b/package/ktap/ktap.mk deleted file mode 100644 index eec8b75b7f5..00000000000 --- a/package/ktap/ktap.mk +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# -# ktap -# -################################################################################ - -KTAP_VERSION = 23bc7a4a94bd9e4e1b8b7c06632e61c041d57b5f -KTAP_SITE = $(call github,ktap,ktap,$(KTAP_VERSION)) -KTAP_LICENSE = GPL-2.0 -KTAP_LICENSE_FILES = LICENSE-GPL - -ifeq ($(BR2_PACKAGE_ELFUTILS),y) -KTAP_DEPENDENCIES += elfutils -else -KTAP_FLAGS += NO_LIBELF=1 -endif - -define KTAP_BUILD_CMDS - $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) $(KTAP_FLAGS) ktap -endef - -define KTAP_INSTALL_TARGET_CMDS - $(INSTALL) -D -m755 $(@D)/ktap $(TARGET_DIR)/usr/bin/ktap -endef - -KTAP_MODULE_MAKE_OPTS = KVERSION=$(LINUX_VERSION_PROBED) - -define KTAP_LINUX_CONFIG_FIXUPS - $(call KCONFIG_ENABLE_OPT,CONFIG_DEBUG_FS) - $(call KCONFIG_ENABLE_OPT,CONFIG_ENABLE_DEFAULT_TRACERS) - $(call KCONFIG_ENABLE_OPT,CONFIG_PERF_EVENTS) - $(call KCONFIG_ENABLE_OPT,CONFIG_FUNCTION_TRACER) -endef - -$(eval $(kernel-module)) -$(eval $(generic-package)) diff --git a/package/kvazaar/kvazaar.hash b/package/kvazaar/kvazaar.hash index fe3255a6c72..20b8e5918e9 100644 --- a/package/kvazaar/kvazaar.hash +++ b/package/kvazaar/kvazaar.hash @@ -1,3 +1,5 @@ # Locally calculated -sha256 480ecfd9b4d2b7d21b355e4a35fcf47b4db7a3b0315b6219d93733db42392bd9 kvazaar-1.2.0.tar.gz -sha256 531712277c3543b9ee86c4c4e0e424f531b893a44cc021c74a24b038d8de4d2a COPYING +sha256 a76998462924ab8409cf8de4947ba5a5023daa33207676e9c4eefc2bbd46c834 kvazaar-2.1.0.tar.xz +sha256 4caf7852236f62bfd77aac10a7b9a42372b00aa461ad8912780cd865a39062ff LICENSE +sha256 16f569c87d5ec20b7474b55ee0a8877b8f8b4dc13f9567ebe0b8fe8afdeb34d2 LICENSE.greatest +sha256 f84c0f33873a015f399d8171cf321af2f09ef915ae7ad5a9edaa7d0286cf9d5e LICENSE.x264asm diff --git a/package/kvazaar/kvazaar.mk b/package/kvazaar/kvazaar.mk index 29433d6eb3b..17e2ea8caf1 100644 --- a/package/kvazaar/kvazaar.mk +++ b/package/kvazaar/kvazaar.mk @@ -4,13 +4,19 @@ # ################################################################################ -KVAZAAR_VERSION = 1.2.0 -KVAZAAR_SITE = $(call github,ultravideo,kvazaar,v$(KVAZAAR_VERSION)) -KVAZAAR_LICENSE = LGPL-2.1+ -KVAZAAR_LICENSE_FILES = COPYING -KVAZAAR_AUTORECONF = YES +KVAZAAR_VERSION = 2.1.0 +KVAZAAR_SOURCE = kvazaar-$(KVAZAAR_VERSION).tar.xz +KVAZAAR_SITE = https://github.com/ultravideo/kvazaar/releases/download/v$(KVAZAAR_VERSION) +KVAZAAR_LICENSE = BSD-3-Clause, ISC (greatest, x264asm) +KVAZAAR_LICENSE_FILES = LICENSE LICENSE.greatest LICENSE.x264asm KVAZAAR_INSTALL_STAGING = YES KVAZAAR_DEPENDENCIES = host-pkgconf -KVAZAAR_CONF_OPTS = --without-cryptopp + +ifeq ($(BR2_PACKAGE_CRYPTOPP),y) +KVAZAAR_DEPENDENCIES += cryptopp +KVAZAAR_CONF_OPTS += --with-cryptopp +else +KVAZAAR_CONF_OPTS += --without-cryptopp +endif $(eval $(autotools-package)) diff --git a/package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch b/package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch deleted file mode 100644 index cbfa3a87e61..00000000000 --- a/package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 08e14a662b9e75daec29722e49150869952ba1b6 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Mon, 20 Nov 2017 22:09:39 +0100 -Subject: [PATCH] Makefile: remove -Werror to avoid build failures - -Signed-off-by: Thomas Petazzoni -[Matthew: Refactoring of Thomas Petazzoni's original.] -Signed-off-by: Matthew Weber ---- - Makefile | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 7231334..d9ad42b 100644 ---- a/Makefile -+++ b/Makefile -@@ -53,7 +53,6 @@ cc-option = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null \ - COMMON_CFLAGS += -g $(autodepend-flags) - COMMON_CFLAGS += -Wall -Wwrite-strings -Wclobbered -Wempty-body -Wuninitialized - COMMON_CFLAGS += -Wignored-qualifiers -Wunused-but-set-parameter --COMMON_CFLAGS += -Werror - frame-pointer-flag=-f$(if $(KEEP_FRAME_POINTER),no-,)omit-frame-pointer - fomit_frame_pointer := $(call cc-option, $(frame-pointer-flag), "") - fnostack_protector := $(call cc-option, -fno-stack-protector, "") --- -2.14.2 - diff --git a/package/kvm-unit-tests/0002-kvm-unit-tests-test-for-rdseed-rdrand.patch b/package/kvm-unit-tests/0002-kvm-unit-tests-test-for-rdseed-rdrand.patch deleted file mode 100644 index 1a1a90ce99c..00000000000 --- a/package/kvm-unit-tests/0002-kvm-unit-tests-test-for-rdseed-rdrand.patch +++ /dev/null @@ -1,110 +0,0 @@ -From 8d9a62a5fa89001266352a929c5d40b28c0dda85 Mon Sep 17 00:00:00 2001 -From: Matt Weber -Date: Fri, 12 Jan 2018 19:07:27 -0600 -Subject: [PATCH] kvm-unit-tests: test for rdseed/rdrand - -The build fails when the host binutils isn't at least 2.23 -(2.22.x introduced RDSEED). - -Fixes: -http://autobuild.buildroot.net/results/c39/c3987a3cbd2960b0ff50f872636bdfd8d1a9c820/ - -Upstream: -https://marc.info/?l=kvm&m=151580743523259&w=2 - -Signed-off-by: Matthew Weber ---- - Makefile | 2 +- - configure | 18 ++++++++++++++++++ - x86/vmx_tests.c | 6 ++++++ - 3 files changed, 25 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index d9ad42b..799e9b5 100644 ---- a/Makefile -+++ b/Makefile -@@ -50,7 +50,7 @@ include $(SRCDIR)/$(TEST_DIR)/Makefile - cc-option = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null \ - > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;) - --COMMON_CFLAGS += -g $(autodepend-flags) -+COMMON_CFLAGS += -g $(autodepend-flags) $(EXTRA_CFLAGS) - COMMON_CFLAGS += -Wall -Wwrite-strings -Wclobbered -Wempty-body -Wuninitialized - COMMON_CFLAGS += -Wignored-qualifiers -Wunused-but-set-parameter - frame-pointer-flag=-f$(if $(KEEP_FRAME_POINTER),no-,)omit-frame-pointer -diff --git a/configure b/configure -index dd9d361..21c0219 100755 ---- a/configure -+++ b/configure -@@ -171,6 +171,23 @@ mkdir -p lib - ln -sf "$asm" lib/asm - - -+cat > rd_test.c < -+int main() { -+ uint16_t seed=0; -+ unsigned char ok; -+ asm volatile ("rdseed %0; setc %1" -+ : "=r" (seed), "=qm" (ok)); -+ return ok; -+} -+EOF -+if $cross_prefix$cc -o /dev/null rd_test.c &> /dev/null; then -+ echo "Checking for rdseed/rdrand... Yes." -+else -+ echo "Checking for rdseed/rdrand... No." -+ extra_cflags="-DNO_RDSEEDRAND" -+fi -+ - # create the config - cat < config.mak - SRCDIR=$srcdir -@@ -181,6 +198,7 @@ ARCH_NAME=$arch_name - PROCESSOR=$processor - CC=$cross_prefix$cc - CXX=$cross_prefix$cxx -+EXTRA_CFLAGS=$extra_cflags - LD=$cross_prefix$ld - OBJCOPY=$cross_prefix$objcopy - OBJDUMP=$cross_prefix$objdump -diff --git a/x86/vmx_tests.c b/x86/vmx_tests.c -index 4a3e94b..2cbe3eb 100644 ---- a/x86/vmx_tests.c -+++ b/x86/vmx_tests.c -@@ -770,8 +770,10 @@ asm( - "insn_sldt: sldt %ax;ret\n\t" - "insn_lldt: xor %eax, %eax; lldt %ax;ret\n\t" - "insn_str: str %ax;ret\n\t" -+#ifndef NO_RDSEEDRAND - "insn_rdrand: rdrand %rax;ret\n\t" - "insn_rdseed: rdseed %rax;ret\n\t" -+#endif - ); - extern void insn_hlt(); - extern void insn_invlpg(); -@@ -796,8 +798,10 @@ extern void insn_lldt(); - extern void insn_str(); - extern void insn_cpuid(); - extern void insn_invd(); -+#ifndef NO_RDSEEDRAND - extern void insn_rdrand(); - extern void insn_rdseed(); -+#endif - - u32 cur_insn; - u64 cr3; -@@ -853,8 +857,10 @@ static struct insn_table insn_table[] = { - {"DESC_TABLE (LLDT)", CPU_DESC_TABLE, insn_lldt, INSN_CPU1, 47, 0, 0, 0}, - {"DESC_TABLE (STR)", CPU_DESC_TABLE, insn_str, INSN_CPU1, 47, 0, 0, 0}, - /* LTR causes a #GP if done with a busy selector, so it is not tested. */ -+#ifndef NO_RDSEEDRAND - {"RDRAND", CPU_RDRAND, insn_rdrand, INSN_CPU1, VMX_RDRAND, 0, 0, 0}, - {"RDSEED", CPU_RDSEED, insn_rdseed, INSN_CPU1, VMX_RDSEED, 0, 0, 0}, -+#endif - // Instructions always trap - {"CPUID", 0, insn_cpuid, INSN_ALWAYS_TRAP, 10, 0, 0, 0}, - {"INVD", 0, insn_invd, INSN_ALWAYS_TRAP, 13, 0, 0, 0}, --- -1.9.1 - diff --git a/package/kvm-unit-tests/0003-Makefile-fix-stack-protector-tests.patch b/package/kvm-unit-tests/0003-Makefile-fix-stack-protector-tests.patch deleted file mode 100644 index be819f27c61..00000000000 --- a/package/kvm-unit-tests/0003-Makefile-fix-stack-protector-tests.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 9bf9155804652c0b3a94af9723c79b6de430187b Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 24 Feb 2020 00:04:06 +0100 -Subject: [PATCH] Makefile: fix stack-protector tests - -Rename fnostack_protector into fno_stack_protector and -fnostack_protector_all into fnostack_protector_all otherwise build will -fail if -fstack-protector is passed by the toolchain - -Fixes: - - http://autobuild.buildroot.org/results/ad689b08173548af21dd1fb0e827fd561de6dfef - -Signed-off-by: Fabrice Fontaine -[Upstream status: sent to kvm@vger.kernel.org] ---- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 767b6c6..754ed65 100644 ---- a/Makefile -+++ b/Makefile -@@ -55,8 +55,8 @@ COMMON_CFLAGS += -Wignored-qualifiers -Werror - - frame-pointer-flag=-f$(if $(KEEP_FRAME_POINTER),no-,)omit-frame-pointer - fomit_frame_pointer := $(call cc-option, $(frame-pointer-flag), "") --fnostack_protector := $(call cc-option, -fno-stack-protector, "") --fnostack_protector_all := $(call cc-option, -fno-stack-protector-all, "") -+fno_stack_protector := $(call cc-option, -fno-stack-protector, "") -+fno_stack_protector_all := $(call cc-option, -fno-stack-protector-all, "") - wno_frame_address := $(call cc-option, -Wno-frame-address, "") - fno_pic := $(call cc-option, -fno-pic, "") - no_pie := $(call cc-option, -no-pie, "") --- -2.25.0 - diff --git a/package/kvm-unit-tests/0004-Fix-powerpc-issue-with-the-linker-from-Fedora-32.patch b/package/kvm-unit-tests/0004-Fix-powerpc-issue-with-the-linker-from-Fedora-32.patch deleted file mode 100644 index 1768c668b7b..00000000000 --- a/package/kvm-unit-tests/0004-Fix-powerpc-issue-with-the-linker-from-Fedora-32.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 5126732d73aa75a0bc84f898042bfe35640624b8 Mon Sep 17 00:00:00 2001 -From: Thomas Huth -Date: Wed, 13 May 2020 13:14:46 +0200 -Subject: [PATCH] Fix powerpc issue with the linker from Fedora 32 - -The linker from Fedora 32 complains: - -powerpc64-linux-gnu-ld: powerpc/selftest.elf: error: PHDR segment not - covered by LOAD segment - -Let's introduce some fake PHDRs to the linker script to get this -working again. - -Message-Id: <20200514192626.9950-7-thuth@redhat.com> -Signed-off-by: Thomas Huth -Signed-off-by: Matthew Weber ---- - powerpc/flat.lds | 19 ++++++++++++++++--- - 1 file changed, 16 insertions(+), 3 deletions(-) - -diff --git a/powerpc/flat.lds b/powerpc/flat.lds -index 53221e8..5eed368 100644 ---- a/powerpc/flat.lds -+++ b/powerpc/flat.lds -@@ -1,7 +1,17 @@ - -+PHDRS -+{ -+ text PT_LOAD FLAGS(5); -+ data PT_LOAD FLAGS(6); -+} -+ - SECTIONS - { -- .text : { *(.init) *(.text) *(.text.*) } -+ .text : { -+ *(.init) -+ *(.text) -+ *(.text.*) -+ } :text - . = ALIGN(64K); - etext = .; - .opd : { *(.opd) } -@@ -19,9 +29,12 @@ SECTIONS - .data : { - *(.data) - *(.data.rel*) -- } -+ } :data - . = ALIGN(16); -- .rodata : { *(.rodata) *(.rodata.*) } -+ .rodata : { -+ *(.rodata) -+ *(.rodata.*) -+ } :data - . = ALIGN(16); - .bss : { *(.bss) } - . = ALIGN(256); --- -2.17.1 - diff --git a/package/kvm-unit-tests/Config.in b/package/kvm-unit-tests/Config.in index e470dd6157f..02ea8dd58c9 100644 --- a/package/kvm-unit-tests/Config.in +++ b/package/kvm-unit-tests/Config.in @@ -1,11 +1,16 @@ config BR2_PACKAGE_KVM_UNIT_TESTS_ARCH_SUPPORTS bool - # On ARM, it uses virtualization extensions - default y if BR2_cortex_a7 || BR2_cortex_a12 || \ + # On ARM, it needs virtualization extensions and little endian CPUs + default y if (BR2_arm || BR2_aarch64) && \ + (BR2_cortex_a7 || BR2_cortex_a12 || \ BR2_cortex_a15 || BR2_cortex_a15_a7 || \ - BR2_cortex_a17 || BR2_cortex_a17_a7 + BR2_cortex_a17 || BR2_cortex_a17_a7 || \ + BR2_cortex_a55 || BR2_cortex_a75 || \ + BR2_cortex_a75_a55 || BR2_cortex_a76 || \ + BR2_cortex_a76_a55) default y if BR2_i386 || BR2_x86_64 default y if BR2_powerpc64 || BR2_powerpc64le + default y if BR2_s390x config BR2_PACKAGE_KVM_UNIT_TESTS bool "kvm-unit-tests" @@ -15,7 +20,7 @@ config BR2_PACKAGE_KVM_UNIT_TESTS # x86-64 we use the host gcc (see .mk file for details) depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 || !BR2_i386 depends on BR2_HOSTARCH = "x86_64" || !BR2_x86_64 - select BR2_HOSTARCH_NEEDS_IA32_COMPILER if BR2_x86_64=y + select BR2_HOSTARCH_NEEDS_IA32_COMPILER if BR2_x86_64 help kvm-unit-tests is a project as old as KVM. As its name suggests, it's purpose is to provide unit tests for KVM. The diff --git a/package/kvm-unit-tests/kvm-unit-tests.hash b/package/kvm-unit-tests/kvm-unit-tests.hash index ad500d04f2c..3b6d02dd8e6 100644 --- a/package/kvm-unit-tests/kvm-unit-tests.hash +++ b/package/kvm-unit-tests/kvm-unit-tests.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e476443cd76c8f540734e075b419638b2f200ae002986d6fc14076d410f3751e kvm-unit-tests-kvm-unit-tests-20171020-br1.tar.gz +sha256 9c9b093ffe3fa33145a53102de9c3e2d55cd0cdc8a20cf172b726296ffe22f4f kvm-unit-tests-v2023-01-05.tar.bz2 sha256 d9bbb60891710d248f01c8bdac50ef7ad39188de512610437872e83112b38a1b COPYRIGHT diff --git a/package/kvm-unit-tests/kvm-unit-tests.mk b/package/kvm-unit-tests/kvm-unit-tests.mk index a972602fb94..956f07b3046 100644 --- a/package/kvm-unit-tests/kvm-unit-tests.mk +++ b/package/kvm-unit-tests/kvm-unit-tests.mk @@ -4,18 +4,22 @@ # ################################################################################ -KVM_UNIT_TESTS_VERSION = kvm-unit-tests-20171020 -KVM_UNIT_TESTS_SITE = https://git.kernel.org/pub/scm/virt/kvm/kvm-unit-tests.git -KVM_UNIT_TESTS_SITE_METHOD = git -KVM_UNIT_TESTS_LICENSE = LGPL-2.0 +KVM_UNIT_TESTS_VERSION = 2023-01-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 KVM_UNIT_TESTS_LICENSE_FILES = COPYRIGHT -ifeq ($(BR2_arm),y) +ifeq ($(BR2_aarch64)$(BR2_aarch64_be),y) +KVM_UNIT_TESTS_ARCH = aarch64 +else ifeq ($(BR2_arm),y) KVM_UNIT_TESTS_ARCH = arm 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_s390x),y) +KVM_UNIT_TESTS_ARCH = s390x else ifeq ($(BR2_x86_64),y) KVM_UNIT_TESTS_ARCH = x86_64 endif @@ -27,6 +31,7 @@ KVM_UNIT_TESTS_ENDIAN = big endif KVM_UNIT_TESTS_CONF_OPTS =\ + --disable-werror \ --arch="$(KVM_UNIT_TESTS_ARCH)" \ --processor="$(GCC_TARGET_CPU)" \ --endian="$(KVM_UNIT_TESTS_ENDIAN)" diff --git a/package/kyua/kyua.hash b/package/kyua/kyua.hash index 66681692fc2..4b0e5589d3f 100644 --- a/package/kyua/kyua.hash +++ b/package/kyua/kyua.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 db6e5d341d5cf7e49e50aa361243e19087a00ba33742b0855d2685c0b8e721d6 kyua-0.13.tar.gz -sha256 a6a8f43f6d2ed9b801978cc012cc816c4a9421a6dcea0579d3a40eab4b349674 LICENSE +sha256 db6e5d341d5cf7e49e50aa361243e19087a00ba33742b0855d2685c0b8e721d6 kyua-0.13.tar.gz +sha256 a6a8f43f6d2ed9b801978cc012cc816c4a9421a6dcea0579d3a40eab4b349674 LICENSE diff --git a/package/lapack/0001-Fix-out-of-bounds-read-in-slarrv.patch b/package/lapack/0001-Fix-out-of-bounds-read-in-slarrv.patch deleted file mode 100644 index 43c6444b02a..00000000000 --- a/package/lapack/0001-Fix-out-of-bounds-read-in-slarrv.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 0631b6beaed60ba118b0b027c0f8d35397bf5df0 Mon Sep 17 00:00:00 2001 -From: Keno Fischer -Date: Thu, 30 Sep 2021 03:51:23 -0400 -Subject: [PATCH] Fix out of bounds read in slarrv - -This was originally reported as https://github.com/JuliaLang/julia/issues/42415. -I've tracked this down to an our of bounds read on the following line: - -https://github.com/Reference-LAPACK/lapack/blob/44ecb6a5ff821b1cbb39f8cc2166cb098e060b4d/SRC/slarrv.f#L423 - -In the crashing example, `M` is `0`, causing `slarrv` to read uninitialized -memory from the work array. I believe the `0` for `M` is correct and indeed, -the documentation above supports that `M` may be zero: - -https://github.com/Reference-LAPACK/lapack/blob/44ecb6a5ff821b1cbb39f8cc2166cb098e060b4d/SRC/slarrv.f#L113-L116 - -I believe it may be sufficient to early-out this function as suggested -in this PR. However, I have limited context for the full routine here, -so I would appreciate a sanity check. - -[Retrieved from: -https://github.com/Reference-LAPACK/lapack/commit/38f3eeee3108b18158409ca2a100e6fe03754781] -Signed-off-by: Fabrice Fontaine ---- - SRC/clarrv.f | 2 +- - SRC/dlarrv.f | 2 +- - SRC/slarrv.f | 2 +- - SRC/zlarrv.f | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/SRC/clarrv.f b/SRC/clarrv.f -index 1f09e4da6..42f710757 100644 ---- a/SRC/clarrv.f -+++ b/SRC/clarrv.f -@@ -348,7 +348,7 @@ SUBROUTINE CLARRV( N, VL, VU, D, L, PIVMIN, - * - * Quick return if possible - * -- IF( N.LE.0 ) THEN -+ IF( (N.LE.0).OR.(M.LE.0) ) THEN - RETURN - END IF - * -diff --git a/SRC/dlarrv.f b/SRC/dlarrv.f -index b036c1e66..299430361 100644 ---- a/SRC/dlarrv.f -+++ b/SRC/dlarrv.f -@@ -350,7 +350,7 @@ SUBROUTINE DLARRV( N, VL, VU, D, L, PIVMIN, - * - * Quick return if possible - * -- IF( N.LE.0 ) THEN -+ IF( (N.LE.0).OR.(M.LE.0) ) THEN - RETURN - END IF - * -diff --git a/SRC/slarrv.f b/SRC/slarrv.f -index 9d72b339a..95f94fd1b 100644 ---- a/SRC/slarrv.f -+++ b/SRC/slarrv.f -@@ -350,7 +350,7 @@ SUBROUTINE SLARRV( N, VL, VU, D, L, PIVMIN, - * - * Quick return if possible - * -- IF( N.LE.0 ) THEN -+ IF( (N.LE.0).OR.(M.LE.0) ) THEN - RETURN - END IF - * -diff --git a/SRC/zlarrv.f b/SRC/zlarrv.f -index 51ec558f5..e4be63e0d 100644 ---- a/SRC/zlarrv.f -+++ b/SRC/zlarrv.f -@@ -348,7 +348,7 @@ SUBROUTINE ZLARRV( N, VL, VU, D, L, PIVMIN, - * - * Quick return if possible - * -- IF( N.LE.0 ) THEN -+ IF( (N.LE.0).OR.(M.LE.0) ) THEN - RETURN - END IF - * diff --git a/package/lapack/lapack.hash b/package/lapack/lapack.hash index 6f6dbff1a6e..4d4d2c05960 100644 --- a/package/lapack/lapack.hash +++ b/package/lapack/lapack.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 328c1bea493a32cac5257d84157dc686cc3ab0b004e2bea22044e0a59f6f8a19 lapack-3.10.0.tar.gz -sha256 66246b7d3e6736aea46e63fd5e087659474d07edfe2f9b051d085d9b42aaac61 LICENSE +sha256 cd005cd021f144d7d5f7f33c943942db9f03a28d110d6a3b80d718a295f7f714 lapack-3.10.1.tar.gz +sha256 44f7c08ab11e40b21d8bf8220712929ba8d0204645d2174869acf915562d0969 LICENSE diff --git a/package/lapack/lapack.mk b/package/lapack/lapack.mk index 609075842d2..3db27972024 100644 --- a/package/lapack/lapack.mk +++ b/package/lapack/lapack.mk @@ -4,7 +4,7 @@ # ################################################################################ -LAPACK_VERSION = 3.10.0 +LAPACK_VERSION = 3.10.1 LAPACK_LICENSE = BSD-3-Clause LAPACK_LICENSE_FILES = LICENSE LAPACK_SITE = $(call github,Reference-LAPACK,lapack,v$(LAPACK_VERSION)) @@ -13,13 +13,18 @@ LAPACK_INSTALL_STAGING = YES LAPACK_SUPPORTS_IN_SOURCE_BUILD = NO LAPACK_CONF_OPTS = -DLAPACKE=ON -DCBLAS=ON -# 0001-Fix-out-of-bounds-read-in-slarrv.patch -LAPACK_IGNORE_CVES += CVE-2021-4048 - ifeq ($(BR2_PACKAGE_LAPACK_COMPLEX),y) -LAPACK_CONF_OPTS += -DBUILD_COMPLEX=ON -DBUILD_COMPLEX16=ON +LAPACK_CONF_OPTS += \ + -DBUILD_COMPLEX=ON \ + -DBUILD_COMPLEX16=ON \ + -DLAPACKE_BUILD_COMPLEX=ON \ + -DLAPACKE_BUILD_COMPLEX16=ON else -LAPACK_CONF_OPTS += -DBUILD_COMPLEX=OFF -DBUILD_COMPLEX16=OFF +LAPACK_CONF_OPTS += \ + -DBUILD_COMPLEX=OFF \ + -DBUILD_COMPLEX16=OFF \ + -DLAPACKE_BUILD_COMPLEX=OFF \ + -DLAPACKE_BUILD_COMPLEX16=OFF endif $(eval $(cmake-package)) diff --git a/package/lbreakout2/lbreakout2.hash b/package/lbreakout2/lbreakout2.hash index 56d0a9501ff..440ffed3d39 100644 --- a/package/lbreakout2/lbreakout2.hash +++ b/package/lbreakout2/lbreakout2.hash @@ -1,6 +1,6 @@ # From https://sourceforge.net/projects/lgames/files/lbreakout2/2.6/ -md5 1a9238b83f9f13f09b7a4d53e00b4e84 lbreakout2-2.6.5.tar.gz -sha1 d92326499165fd368be04378d633e13d42b4d2d7 lbreakout2-2.6.5.tar.gz +md5 1a9238b83f9f13f09b7a4d53e00b4e84 lbreakout2-2.6.5.tar.gz +sha1 d92326499165fd368be04378d633e13d42b4d2d7 lbreakout2-2.6.5.tar.gz # Locally computed: sha256 9104d6175553da3442dc6a5fc407a669e2f5aff3eedc5d30409eb003b7a78d6f lbreakout2-2.6.5.tar.gz sha256 67f82e045cf7acfef853ea0f426575a8359161a0a325e19f02b529a87c4b6c34 COPYING diff --git a/package/lcdproc/Config.in b/package/lcdproc/Config.in index 042abd69df9..e5ff432d407 100644 --- a/package/lcdproc/Config.in +++ b/package/lcdproc/Config.in @@ -1,4 +1,4 @@ -comment "lcdproc needs a toolchain w/ dynamic library" +comment "lcdproc needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS config BR2_PACKAGE_LCDPROC diff --git a/package/lcms2/lcms2.hash b/package/lcms2/lcms2.hash index d3ae1d934fb..700b9746f18 100644 --- a/package/lcms2/lcms2.hash +++ b/package/lcms2/lcms2.hash @@ -1,5 +1,5 @@ -# From https://sourceforge.net/projects/lcms/files/lcms/2.13 -sha1 1676097fb18fce83c9c876d56828c83a6ad829dd lcms2-2.13.tar.gz +# From https://sourceforge.net/projects/lcms/files/lcms/2.14 +sha1 94350a2638fe58da736e8726048c859b46a69e6f lcms2-2.14.tar.gz # Locally computed: -sha256 0c67a5cc144029cfa34647a52809ec399aae488db4258a6a66fba318474a070f lcms2-2.13.tar.gz +sha256 28474ea6f6591c4d4cee972123587001a4e6e353412a41b3e9e82219818d5740 lcms2-2.14.tar.gz sha256 46d4e05af3bce75332a12d01f19bcce7e32b6bac544be28a64043d0231291e31 COPYING diff --git a/package/lcms2/lcms2.mk b/package/lcms2/lcms2.mk index 5a253d044b8..743b0ec8583 100644 --- a/package/lcms2/lcms2.mk +++ b/package/lcms2/lcms2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LCMS2_VERSION = 2.13 +LCMS2_VERSION = 2.14 LCMS2_SITE = http://downloads.sourceforge.net/project/lcms/lcms/$(LCMS2_VERSION) LCMS2_LICENSE = MIT LCMS2_LICENSE_FILES = COPYING diff --git a/package/leafnode2/leafnode2.mk b/package/leafnode2/leafnode2.mk index a02aad4302b..e82ca2e1ee1 100644 --- a/package/leafnode2/leafnode2.mk +++ b/package/leafnode2/leafnode2.mk @@ -23,7 +23,7 @@ LEAFNODE2_CONF_OPTS = \ --enable-runas-user=root # Leafnode2 needs the host version of b_sortnl during -# compilation. Instead of creating a seperate host package and +# compilation. Instead of creating a separate host package and # installing b_sortnl to $(HOST_DIR) this binary is compiled # on-the-fly, host-pcre is needed for this define LEAFNODE2_BUILD_SORTNL_TOOL diff --git a/package/lensfun/Config.in b/package/lensfun/Config.in index 7ec49020eef..7c424f53515 100644 --- a/package/lensfun/Config.in +++ b/package/lensfun/Config.in @@ -11,7 +11,7 @@ config BR2_PACKAGE_LENSFUN actually use Lensfun to process your images you need an image editing application with Lensfun support. - http://lensfun.sourceforge.net + https://lensfun.github.io if BR2_PACKAGE_LENSFUN diff --git a/package/lensfun/lensfun.hash b/package/lensfun/lensfun.hash index 1a27373f233..f03d0b54ae1 100644 --- a/package/lensfun/lensfun.hash +++ b/package/lensfun/lensfun.hash @@ -1,7 +1,4 @@ -# From https://sourceforge.net/projects/lensfun/files/0.3.2 -sha1 1d978b15aa7304d66a4931fa37ca9f8f89396c16 lensfun-0.3.2.tar.gz -md5 247e59a0812ec451f6cd0d20b3379cb5 lensfun-0.3.2.tar.gz # Locally calculated -sha256 ae8bcad46614ca47f5bda65b00af4a257a9564a61725df9c74cb260da544d331 lensfun-0.3.2.tar.gz +sha256 57ba5a0377f24948972339e18be946af12eda22b7c707eb0ddd26586370f6765 lensfun-0.3.3.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 docs/gpl-3.0.txt sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c docs/lgpl-3.0.txt diff --git a/package/lensfun/lensfun.mk b/package/lensfun/lensfun.mk index 9258409f57c..f82ed44495c 100644 --- a/package/lensfun/lensfun.mk +++ b/package/lensfun/lensfun.mk @@ -4,8 +4,8 @@ # ################################################################################ -LENSFUN_VERSION = 0.3.2 -LENSFUN_SITE = https://sourceforge.net/projects/lensfun/files/$(LENSFUN_VERSION) +LENSFUN_VERSION = 0.3.3 +LENSFUN_SITE = $(call github,lensfun,lensfun,v$(LENSFUN_VERSION)) LENSFUN_LICENSE = LGPL-3.0+ (libraries), GPL-3.0+ (programs) LENSFUN_LICENSE_FILES = docs/gpl-3.0.txt docs/lgpl-3.0.txt LENSFUN_INSTALL_STAGING = YES diff --git a/package/less/0001-End-OSC8-hyperlink-on-invalid-embedded-escape-sequence.patch b/package/less/0001-End-OSC8-hyperlink-on-invalid-embedded-escape-sequence.patch new file mode 100644 index 00000000000..233f949e247 --- /dev/null +++ b/package/less/0001-End-OSC8-hyperlink-on-invalid-embedded-escape-sequence.patch @@ -0,0 +1,27 @@ +From a78e1351113cef564d790a730d657a321624d79c Mon Sep 17 00:00:00 2001 +From: Mark Nudelman +Date: Fri, 7 Oct 2022 19:25:46 -0700 +Subject: [PATCH] End OSC8 hyperlink on invalid embedded escape sequence. + +[Retrieved from: +https://github.com/gwsw/less/commit/a78e1351113cef564d790a730d657a321624d79c] +Signed-off-by: Fabrice Fontaine +--- + line.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/line.c b/line.c +index 236c49ae..cba7bdd1 100644 +--- a/line.c ++++ b/line.c +@@ -633,8 +633,8 @@ ansi_step(pansi, ch) + /* Hyperlink ends with \7 or ESC-backslash. */ + if (ch == '\7') + return ANSI_END; +- if (pansi->prev_esc && ch == '\\') +- return ANSI_END; ++ if (pansi->prev_esc) ++ return (ch == '\\') ? ANSI_END : ANSI_ERR; + pansi->prev_esc = (ch == ESC); + return ANSI_MID; + } diff --git a/package/less/less.mk b/package/less/less.mk index 7d7a6d5fe58..2c68ac5a119 100644 --- a/package/less/less.mk +++ b/package/less/less.mk @@ -11,8 +11,7 @@ LESS_LICENSE_FILES = COPYING LESS_CPE_ID_VENDOR = gnu LESS_DEPENDENCIES = ncurses -define LESS_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 $(@D)/less $(TARGET_DIR)/usr/bin/less -endef +# 0001-End-OSC8-hyperlink-on-invalid-embedded-escape-sequence.patch +LESS_IGNORE_CVES += CVE-2022-46663 $(eval $(autotools-package)) diff --git a/package/lftp/0002-src-lftp_ssl.c-fix-build-with-libressl-2.7.0.patch b/package/lftp/0002-src-lftp_ssl.c-fix-build-with-libressl-2.7.0.patch new file mode 100644 index 00000000000..4251a5e176c --- /dev/null +++ b/package/lftp/0002-src-lftp_ssl.c-fix-build-with-libressl-2.7.0.patch @@ -0,0 +1,36 @@ +From 3ffa0132987bdde986c82c924bc51b13b37f8b54 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 6 Apr 2022 22:56:21 +0200 +Subject: [PATCH] src/lftp_ssl.c: fix build with libressl >= 2.7.0 + +X509_OBJECT_get0_X509_CRL is provided by libressl since version 2.7.0 +and +https://github.com/libressl-portable/openbsd/commit/9866ae34c0af718973475296bd9ef036d3aaa94e +resulting in the following build failure: + +/nvmedata/autobuild/instance-21/output-1/host/opt/ext-toolchain/bin/../lib/gcc/microblaze-buildroot-linux-musl/11.2.0/../../../../microblaze-buildroot-linux-musl/bin/ld: /nvmedata/autobuild/instance-21/output-1/host/microblaze-buildroot-linux-musl/sysroot/usr/lib/libcrypto.a(x509_lu.c.o): in function `X509_OBJECT_get0_X509_CRL': +(.text+0xc3c): multiple definition of `X509_OBJECT_get0_X509_CRL'; /nvmedata/autobuild/instance-21/output-1/build/lftp-4.9.2/src/.libs/liblftp-network.a(liblftp_network_la-lftp_ssl.o):(.text+0x894): first defined here + +Fixes: + - http://autobuild.buildroot.org/results/7fd1dfd5bc750ae5a3278ca950c838ae90704b23 + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/lavv17/lftp/commit/3ffa0132987bdde986c82c924bc51b13b37f8b54] +--- + src/lftp_ssl.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/lftp_ssl.cc b/src/lftp_ssl.cc +index 26e91e4b..a814543d 100644 +--- a/src/lftp_ssl.cc ++++ b/src/lftp_ssl.cc +@@ -664,7 +664,7 @@ int gnutls_x509_crt_list_import(gnutls_x509_crt_t *certs, unsigned int* cert_max + #elif USE_OPENSSL + //static int lftp_ssl_passwd_callback(char *buf,int size,int rwflag,void *userdata); + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000L) + // for compatibility with older versions + X509_OBJECT *X509_OBJECT_new() + { diff --git a/package/libaacs/0001-read_file.h-include-sys-types.h.patch b/package/libaacs/0001-read_file.h-include-sys-types.h.patch deleted file mode 100644 index 9bb1e045392..00000000000 --- a/package/libaacs/0001-read_file.h-include-sys-types.h.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 1fb08a352afada589f0b93af7a07c6fcd6da9bb8 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Mon, 21 Sep 2020 20:19:38 +0200 -Subject: [PATCH] read_file.h: include sys/types.h -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes build error with uClibc and gcc-8.3.0: - -In file included from src/devtools/uk_dump.c:28: -src/devtools/read_file.h:24:44: error: unknown type name ‘off_t’ - static size_t _read_file(const char *name, off_t min_size, off_t max_size, uint8_t **pdata) - -Upstream status: pending - -Signed-off-by: Bernd Kuhls ---- - src/devtools/read_file.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/devtools/read_file.h b/src/devtools/read_file.h -index 953b2ef..a5d185c 100644 ---- a/src/devtools/read_file.h -+++ b/src/devtools/read_file.h -@@ -19,6 +19,7 @@ - - #include - #include -+#include - #include - - static size_t _read_file(const char *name, off_t min_size, off_t max_size, uint8_t **pdata) --- -2.27.0 - diff --git a/package/libaacs/libaacs.hash b/package/libaacs/libaacs.hash index 62e389f2f9b..d4977727b04 100644 --- a/package/libaacs/libaacs.hash +++ b/package/libaacs/libaacs.hash @@ -1,5 +1,5 @@ -# From http://download.videolan.org/pub/videolan/libaacs/0.11.0/libaacs-0.11.0.tar.bz2.sha512 -sha512 167edbb6f26599e41d6084908039bf902f69f57da1f64f1491734157d1568ad0b32c8ea3064e0706e383af8dc6007eef65170b2b47222bf3d363e395e0b60388 libaacs-0.11.0.tar.bz2 +# From http://download.videolan.org/pub/videolan/libaacs/0.11.1/libaacs-0.11.1.tar.bz2.sha512 +sha512 42dcba5fd593c9a8ec7af11251006b083ad2c49ec198734d1d66f67c2ded4557d77617600edbf0c5250e9b0407ef9a2f906d59d154bda8ecfc8adfd234fb2c42 libaacs-0.11.1.tar.bz2 # Hash for license file: sha256 592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c COPYING diff --git a/package/libaacs/libaacs.mk b/package/libaacs/libaacs.mk index 3e0df18010b..d4e90be26c2 100644 --- a/package/libaacs/libaacs.mk +++ b/package/libaacs/libaacs.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBAACS_VERSION = 0.11.0 +LIBAACS_VERSION = 0.11.1 LIBAACS_SITE = http://download.videolan.org/pub/videolan/libaacs/$(LIBAACS_VERSION) LIBAACS_SOURCE = libaacs-$(LIBAACS_VERSION).tar.bz2 LIBAACS_LICENSE = LGPL-2.1+ diff --git a/package/libabseil-cpp/Config.in b/package/libabseil-cpp/Config.in index 222e3a092a3..45f339ff26a 100644 --- a/package/libabseil-cpp/Config.in +++ b/package/libabseil-cpp/Config.in @@ -5,9 +5,13 @@ config BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS default y if BR2_aarch64 || BR2_aarch64_be default y if BR2_arm || BR2_armeb default y if BR2_i386 + 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_riscv + default y if BR2_s390x + default y if BR2_sh + default y if BR2_sparc || BR2_sparc64 default y if BR2_x86_64 depends on BR2_TOOLCHAIN_HAS_UCONTEXT diff --git a/package/libabseil-cpp/libabseil-cpp.hash b/package/libabseil-cpp/libabseil-cpp.hash index 2d6c5988807..808bdbab293 100644 --- a/package/libabseil-cpp/libabseil-cpp.hash +++ b/package/libabseil-cpp/libabseil-cpp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 dcf71b9cba8dc0ca9940c4b316a0c796be8fab42b070bb6b7cab62b48f0e66c4 libabseil-cpp-20211102.0.tar.gz +sha256 91ac87d30cc6d79f9ab974c51874a704de9c2647c40f6932597329a282217ba8 libabseil-cpp-20220623.1.tar.gz sha256 c79a7fea0e3cac04cd43f20e7b648e5a0ff8fa5344e644b0ee09ca1162b62747 LICENSE diff --git a/package/libabseil-cpp/libabseil-cpp.mk b/package/libabseil-cpp/libabseil-cpp.mk index 738cd03c390..ceda106b7d4 100644 --- a/package/libabseil-cpp/libabseil-cpp.mk +++ b/package/libabseil-cpp/libabseil-cpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBABSEIL_CPP_VERSION = 20211102.0 +LIBABSEIL_CPP_VERSION = 20220623.1 LIBABSEIL_CPP_SITE = $(call github,abseil,abseil-cpp,$(LIBABSEIL_CPP_VERSION)) LIBABSEIL_CPP_LICENSE = Apache-2.0 LIBABSEIL_CPP_LICENSE_FILES = LICENSE @@ -13,14 +13,12 @@ LIBABSEIL_CPP_INSTALL_STAGING = YES LIBABSEIL_CPP_CONF_OPTS = \ -DCMAKE_CXX_STANDARD=11 \ -DABSL_ENABLE_INSTALL=ON \ - -DABSL_USE_GOOGLETEST_HEAD=OFF \ - -DABSL_RUN_TESTS=OFF + -DABSL_USE_GOOGLETEST_HEAD=OFF HOST_LIBABSEIL_CPP_CONF_OPTS = \ -DCMAKE_CXX_STANDARD=11 \ -DABSL_ENABLE_INSTALL=ON \ - -DABSL_USE_GOOGLETEST_HEAD=OFF \ - -DABSL_RUN_TESTS=OFF + -DABSL_USE_GOOGLETEST_HEAD=OFF $(eval $(cmake-package)) $(eval $(host-cmake-package)) diff --git a/package/libaio/libaio.hash b/package/libaio/libaio.hash index ac815a73b5c..4ddc97334f9 100644 --- a/package/libaio/libaio.hash +++ b/package/libaio/libaio.hash @@ -1,5 +1,5 @@ # From https://releases.pagure.org/libaio/CHECKSUMS -sha256 ab0462f2c9d546683e5147b1ce9c195fe95d07fac5bf362f6c01637955c3b492 libaio-0.3.112.tar.gz +sha512 65c30a102433bf8386581b03fc706d84bd341be249fbdee11a032b237a7b239e8c27413504fef15e2797b1acd67f752526637005889590ecb380e2e120ab0b71 libaio-0.3.113.tar.gz # Hash for license file: sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING diff --git a/package/libaio/libaio.mk b/package/libaio/libaio.mk index 34f08b75e78..e13e49346b5 100644 --- a/package/libaio/libaio.mk +++ b/package/libaio/libaio.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBAIO_VERSION = 0.3.112 +LIBAIO_VERSION = 0.3.113 LIBAIO_SITE = https://releases.pagure.org/libaio LIBAIO_INSTALL_STAGING = YES LIBAIO_LICENSE = LGPL-2.1+ diff --git a/package/libao/libao.hash b/package/libao/libao.hash index dced3dddeb4..91c6bd11a78 100644 --- a/package/libao/libao.hash +++ b/package/libao/libao.hash @@ -1,5 +1,5 @@ # From http://downloads.xiph.org/releases/ao/SHA256SUMS.txt -sha256 03ad231ad1f9d64b52474392d63c31197b0bc7bd416e58b1c10a329a5ed89caf libao-1.2.0.tar.gz +sha256 03ad231ad1f9d64b52474392d63c31197b0bc7bd416e58b1c10a329a5ed89caf libao-1.2.0.tar.gz # Hash for license file: -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/libapparmor/0001-replace-deprecated-distutils-with-setuptools.patch b/package/libapparmor/0001-replace-deprecated-distutils-with-setuptools.patch deleted file mode 100644 index 5aed31d0b53..00000000000 --- a/package/libapparmor/0001-replace-deprecated-distutils-with-setuptools.patch +++ /dev/null @@ -1,244 +0,0 @@ -From 21e5a721ab2abe26bb12b9da7accc39d4fff9804 Mon Sep 17 00:00:00 2001 -From: Georgia Garcia -Date: Wed, 10 Nov 2021 19:50:35 +0000 -Subject: [PATCH] replace deprecated distutils with setuptools - -Adds python3 setuptools as a build dependency for libapparmor - -Fixes: https://gitlab.com/apparmor/apparmor/-/issues/202 -MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/813 -Signed-off-by: Georgia Garcia -Acked-by: Christian Boltz - -[Retrieved (and updated to remove changes on .gitlab-ci.yml and -README.md) from: -https://gitlab.com/apparmor/apparmor/-/commit/21e5a721ab2abe26bb12b9da7accc39d4fff9804] -Signed-off-by: Fabrice Fontaine ---- - .gitignore | 3 ++ - .gitlab-ci.yml | 2 +- - libraries/libapparmor/m4/ac_python_devel.m4 | 36 +++++++++---------- - libraries/libapparmor/swig/python/Makefile.am | 2 +- - libraries/libapparmor/swig/python/setup.py.in | 2 +- - .../libapparmor/swig/python/test/Makefile.am | 2 +- - profiles/Makefile | 2 +- - utils/Makefile | 1 + - utils/python-tools-setup.py | 6 ++-- - utils/test/Makefile | 2 +- - utils/test/README.md | 2 +- - 11 files changed, 32 insertions(+), 28 deletions(-) - -diff --git a/.gitignore b/.gitignore -index 78a06fdf9..4782a351a 100644 ---- a/.gitignore -+++ b/.gitignore -@@ -160,6 +160,7 @@ libraries/libapparmor/swig/perl/libapparmor_wrap.c - libraries/libapparmor/swig/perl/libapparmor_wrap.o - libraries/libapparmor/swig/perl/pm_to_blib - libraries/libapparmor/swig/python/LibAppArmor.py -+libraries/libapparmor/swig/python/LibAppArmor.egg-info/ - libraries/libapparmor/swig/python/build/ - libraries/libapparmor/swig/python/libapparmor_wrap.c - libraries/libapparmor/swig/python/Makefile -@@ -204,6 +205,8 @@ utils/*.tmp - utils/po/*.mo - utils/apparmor/*.pyc - utils/apparmor/rule/*.pyc -+utils/apparmor.egg-info/ -+utils/build/ - utils/htmlcov/ - utils/test/common_test.pyc - utils/test/.coverage -diff --git a/libraries/libapparmor/m4/ac_python_devel.m4 b/libraries/libapparmor/m4/ac_python_devel.m4 -index 1da29d873..f21f70ce7 100644 ---- a/libraries/libapparmor/m4/ac_python_devel.m4 -+++ b/libraries/libapparmor/m4/ac_python_devel.m4 -@@ -66,17 +66,17 @@ variable to configure. See ``configure --help'' for reference. - fi - - # -- # Check if you have distutils, else fail -+ # Check if you have setuptools, else fail - # -- AC_MSG_CHECKING([for the distutils Python package]) -- ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` -- if test -z "$ac_distutils_result"; then -+ AC_MSG_CHECKING([for the setuptools Python package]) -+ ac_setuptools_result=`$PYTHON -c "import setuptools" 2>&1` -+ if test -z "$ac_setuptools_result"; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) -- AC_MSG_ERROR([cannot import Python module "distutils". -+ AC_MSG_ERROR([cannot import Python module "setuptools". - Please check your Python installation. The error was: --$ac_distutils_result]) -+$ac_setuptools_result]) - PYTHON_VERSION="" - fi - -@@ -88,8 +88,8 @@ $ac_distutils_result]) - PYTHON_CPPFLAGS=`$PYTHON_CONFIG --includes` - fi - if test -z "$PYTHON_CPPFLAGS"; then -- python_path=`$PYTHON -c "import sys; import distutils.sysconfig;\ --sys.stdout.write('%s\n' % distutils.sysconfig.get_python_inc());"` -+ python_path=`$PYTHON -c "import sys; import sysconfig;\ -+sys.stdout.write('%s\n' % sysconfig.get_path('include'));"` - if test -n "${python_path}"; then - python_path="-I$python_path" - fi -@@ -108,8 +108,8 @@ sys.stdout.write('%s\n' % distutils.sysconfig.get_python_inc());"` - if test -z "$PYTHON_LDFLAGS"; then - # (makes two attempts to ensure we've got a version number - # from the interpreter) -- py_version=`$PYTHON -c "import sys; from distutils.sysconfig import *; \ --sys.stdout.write('%s\n' % ''.join(get_config_vars('VERSION')))"` -+ py_version=`$PYTHON -c "import sys; import sysconfig; \ -+sys.stdout.write('%s\n' % ''.join(sysconfig.get_config_vars('VERSION')))"` - if test "$py_version" == "[None]"; then - if test -n "$PYTHON_VERSION"; then - py_version=$PYTHON_VERSION -@@ -119,8 +119,8 @@ sys.stdout.write("%s\n" % sys.version[[:3]])"` - fi - fi - -- PYTHON_LDFLAGS=`$PYTHON -c "import sys; from distutils.sysconfig import *; \ --sys.stdout.write('-L' + get_python_lib(0,1) + ' -lpython\n')"`$py_version`$PYTHON -c \ -+ PYTHON_LDFLAGS=`$PYTHON -c "import sys; import sysconfig; \ -+sys.stdout.write('-L' + sysconfig.get_path('stdlib') + ' -lpython\n')"`$py_version`$PYTHON -c \ - "import sys; sys.stdout.write('%s' % getattr(sys,'abiflags',''))"` - fi - AC_MSG_RESULT([$PYTHON_LDFLAGS]) -@@ -131,8 +131,8 @@ sys.stdout.write('-L' + get_python_lib(0,1) + ' -lpython\n')"`$py_version`$PYTHO - # - AC_MSG_CHECKING([for Python site-packages path]) - if test -z "$PYTHON_SITE_PKG"; then -- PYTHON_SITE_PKG=`$PYTHON -c "import sys; import distutils.sysconfig; \ --sys.stdout.write('%s\n' % distutils.sysconfig.get_python_lib(0,0));"` -+ PYTHON_SITE_PKG=`$PYTHON -c "import sys; import sysconfig; \ -+sys.stdout.write('%s\n' % sysconfig.get_path('purelib'));"` - fi - AC_MSG_RESULT([$PYTHON_SITE_PKG]) - AC_SUBST([PYTHON_SITE_PKG]) -@@ -146,8 +146,8 @@ sys.stdout.write('%s\n' % distutils.sysconfig.get_python_lib(0,0));"` - PYTHON_EXTRA_LIBS='' - fi - if test -z "$PYTHON_EXTRA_LIBS"; then -- PYTHON_EXTRA_LIBS=`$PYTHON -c "import sys; import distutils.sysconfig; \ --conf = distutils.sysconfig.get_config_var; \ -+ PYTHON_EXTRA_LIBS=`$PYTHON -c "import sys; import sysconfig; \ -+conf = sysconfig.get_config_var; \ - sys.stdout.write('%s %s %s\n' % (conf('BLDLIBRARY'), conf('LOCALMODLIBS'), conf('LIBS')))"` - fi - AC_MSG_RESULT([$PYTHON_EXTRA_LIBS]) -@@ -162,8 +162,8 @@ sys.stdout.write('%s %s %s\n' % (conf('BLDLIBRARY'), conf('LOCALMODLIBS'), conf( - PYTHON_EXTRA_LDFLAGS='' - fi - if test -z "$PYTHON_EXTRA_LDFLAGS"; then -- PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import sys; import distutils.sysconfig; \ --conf = distutils.sysconfig.get_config_var; \ -+ PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import sys; import sysconfig; \ -+conf = sysconfig.get_config_var; \ - sys.stdout.write('%s\n' % conf('LINKFORSHARED'))"` - fi - AC_MSG_RESULT([$PYTHON_EXTRA_LDFLAGS]) -diff --git a/libraries/libapparmor/swig/python/Makefile.am b/libraries/libapparmor/swig/python/Makefile.am -index 04edff003..bf05fe0fc 100644 ---- a/libraries/libapparmor/swig/python/Makefile.am -+++ b/libraries/libapparmor/swig/python/Makefile.am -@@ -21,7 +21,7 @@ install-exec-local: - - clean-local: - if test -x "$(PYTHON)"; then $(PYTHON) setup.py clean; fi -- rm -rf build -+ rm -rf build LibAppArmor.egg-info - if test $(top_srcdir) != $(top_builddir) ; then rm -f libapparmor_wrap.c ; fi - - endif -diff --git a/libraries/libapparmor/swig/python/setup.py.in b/libraries/libapparmor/swig/python/setup.py.in -index 32abd46b2..b23e40746 100644 ---- a/libraries/libapparmor/swig/python/setup.py.in -+++ b/libraries/libapparmor/swig/python/setup.py.in -@@ -1,4 +1,4 @@ --from distutils.core import setup, Extension -+from setuptools import setup, Extension - import string - - setup(name = 'LibAppArmor', -diff --git a/libraries/libapparmor/swig/python/test/Makefile.am b/libraries/libapparmor/swig/python/test/Makefile.am -index 7287819c9..9dccfdef6 100644 ---- a/libraries/libapparmor/swig/python/test/Makefile.am -+++ b/libraries/libapparmor/swig/python/test/Makefile.am -@@ -11,7 +11,7 @@ test_python.py: test_python.py.in $(top_builddir)/config.status - CLEANFILES = test_python.py - - # bah, how brittle is this? --PYTHON_DIST_BUILD_PATH = '$(builddir)/../build/$$($(PYTHON) -c "import distutils.util; import platform; print(\"lib.%s-%s\" %(distutils.util.get_platform(), platform.python_version()[:3]))")' -+PYTHON_DIST_BUILD_PATH = '$(builddir)/../build/$$($(PYTHON) -c "import sysconfig; print(\"lib.%s-%s\" %(sysconfig.get_platform(), sysconfig.get_python_version()))")' - - TESTS = test_python.py - TESTS_ENVIRONMENT = \ -diff --git a/profiles/Makefile b/profiles/Makefile -index c471e58e8..0b7f2655d 100644 ---- a/profiles/Makefile -+++ b/profiles/Makefile -@@ -41,7 +41,7 @@ ifdef USE_SYSTEM - LOGPROF?=aa-logprof - else - # PYTHON_DIST_BUILD_PATH based on libapparmor/swig/python/test/Makefile.am -- PYTHON_DIST_BUILD_PATH = ../libraries/libapparmor/swig/python/build/$$($(PYTHON) -c "import distutils.util; import platform; print(\"lib.%s-%s\" %(distutils.util.get_platform(), platform.python_version()[:3]))") -+ PYTHON_DIST_BUILD_PATH = ../libraries/libapparmor/swig/python/build/$$($(PYTHON) -c "import sysconfig; print(\"lib.%s-%s\" %(sysconfig.get_platform(), sysconfig.get_python_version()))") - LIBAPPARMOR_PATH=../libraries/libapparmor/src/.libs/ - LD_LIBRARY_PATH=$(LIBAPPARMOR_PATH):$(PYTHON_DIST_BUILD_PATH) - PYTHONPATH=../utils/:$(PYTHON_DIST_BUILD_PATH) -diff --git a/utils/Makefile b/utils/Makefile -index 1f08f259a..91a15107b 100644 ---- a/utils/Makefile -+++ b/utils/Makefile -@@ -72,6 +72,7 @@ clean: pod_clean - rm -rf staging/ build/ - rm -f apparmor/*.pyc apparmor/rule/*.pyc - rm -rf apparmor/__pycache__/ apparmor/rule/__pycache__/ -+ rm -rf apparmor.egg-info/ - - # ${CAPABILITIES} is defined in common/Make.rules - .PHONY: check_severity_db -diff --git a/utils/python-tools-setup.py b/utils/python-tools-setup.py -index 30ce0cb05..2cbde8fc1 100644 ---- a/utils/python-tools-setup.py -+++ b/utils/python-tools-setup.py -@@ -20,14 +20,14 @@ - # Note: --version=... must be the last argument to this script - # - --from distutils.command.install import install as _install --from distutils.core import setup -+from setuptools.command.install import install as _install -+from setuptools import setup - import os - import shutil - import sys - - class Install(_install, object): -- '''Override distutils to install the files where we want them.''' -+ '''Override setuptools to install the files where we want them.''' - def run(self): - # Now byte-compile everything - super(Install, self).run() -diff --git a/utils/test/Makefile b/utils/test/Makefile -index 90354aa50..9126bdd71 100644 ---- a/utils/test/Makefile -+++ b/utils/test/Makefile -@@ -32,7 +32,7 @@ ifdef USE_SYSTEM - PARSER= - else - # PYTHON_DIST_BUILD_PATH based on libapparmor/swig/python/test/Makefile.am -- PYTHON_DIST_BUILD_PATH = ../../libraries/libapparmor/swig/python/build/$$($(PYTHON) -c "import distutils.util; import platform; print(\"lib.%s-%s\" %(distutils.util.get_platform(), platform.python_version()[:3]))") -+ PYTHON_DIST_BUILD_PATH = ../../libraries/libapparmor/swig/python/build/$$($(PYTHON) -c "import sysconfig; print(\"lib.%s-%s\" %(sysconfig.get_platform(), sysconfig.get_python_version()))") - LIBAPPARMOR_PATH=../../libraries/libapparmor/src/.libs/ - LD_LIBRARY_PATH=$(LIBAPPARMOR_PATH):$(PYTHON_DIST_BUILD_PATH) - PYTHONPATH=..:$(PYTHON_DIST_BUILD_PATH) --- -GitLab - diff --git a/package/libapparmor/libapparmor.hash b/package/libapparmor/libapparmor.hash index 6a19aef77a3..574ff95b60a 100644 --- a/package/libapparmor/libapparmor.hash +++ b/package/libapparmor/libapparmor.hash @@ -1,5 +1,5 @@ -# From: https://gitlab.com/apparmor/apparmor/-/wikis/home#userspace -sha256 153db05d8f491e0596022663c19fb1166806cb473b3c6f0a7279feda2ec25a59 apparmor-3.0.3.tar.gz +# From https://gitlab.com/apparmor/apparmor/-/wikis/Release_Notes_3.1.2 +sha256 7cbd0b2f6393abf57acaf25dc2b32b2ae197c0b5b0d661e14be46127df93a5eb apparmor-3.1.2.tar.gz # locally computed sha256 a7e0cdcbea5c14927cedfc600d46526bdcbb1eb0a4d951e2ea53c2a6de159cb4 LICENSE diff --git a/package/libapparmor/libapparmor.mk b/package/libapparmor/libapparmor.mk index 7bb849ab944..7f3cfcab2fa 100644 --- a/package/libapparmor/libapparmor.mk +++ b/package/libapparmor/libapparmor.mk @@ -5,8 +5,8 @@ ################################################################################ # When updating the version here, please also update the apparmor package -LIBAPPARMOR_VERSION_MAJOR = 3.0 -LIBAPPARMOR_VERSION = $(LIBAPPARMOR_VERSION_MAJOR).3 +LIBAPPARMOR_VERSION_MAJOR = 3.1 +LIBAPPARMOR_VERSION = $(LIBAPPARMOR_VERSION_MAJOR).2 LIBAPPARMOR_SOURCE = apparmor-$(LIBAPPARMOR_VERSION).tar.gz LIBAPPARMOR_SITE = https://launchpad.net/apparmor/$(LIBAPPARMOR_VERSION_MAJOR)/$(LIBAPPARMOR_VERSION)/+download LIBAPPARMOR_LICENSE = LGPL-2.1 @@ -31,7 +31,7 @@ ifeq ($(BR2_PACKAGE_PYTHON3),y) LIBAPPARMOR_DEPENDENCIES += host-python3 host-python-setuptools host-swig python3 LIBAPPARMOR_CONF_OPTS += \ --with-python \ - PYTHON=$(HOST_DIR)/usr/bin/python3 \ + PYTHON=$(HOST_DIR)/bin/python3 \ PYTHON_CONFIG=$(STAGING_DIR)/usr/bin/python3-config \ SWIG=$(SWIG) else diff --git a/package/libarchive/0001-autotools-do-not-add-iconv-for-Requires.private.patch b/package/libarchive/0001-autotools-do-not-add-iconv-for-Requires.private.patch new file mode 100644 index 00000000000..91903866ef2 --- /dev/null +++ b/package/libarchive/0001-autotools-do-not-add-iconv-for-Requires.private.patch @@ -0,0 +1,28 @@ +From 619c1be8d38ff79622db8f66f3b02832795315f9 Mon Sep 17 00:00:00 2001 +From: Christian Hesse +Date: Wed, 14 Dec 2022 09:04:39 +0100 +Subject: [PATCH] autotools: do not add iconv for Requires.private + +There is no pkgconfig file for iconv, thus things break with this +change. Let's drop iconv from Requires.private. + +Fixes: a83f3d32 ("autotools: Fix static linking when openssl is enabled in windows") +[Retrieved from: +https://github.com/libarchive/libarchive/pull/1817/commits/619c1be8d38ff79622db8f66f3b02832795315f9] +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 99bff20d1..f245d0c55 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -378,7 +378,6 @@ if test "x$with_iconv" != "xno"; then + AC_CHECK_HEADERS([localcharset.h]) + am_save_LIBS="$LIBS" + LIBS="${LIBS} ${LIBICONV}" +- LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }iconv" + AC_CHECK_FUNCS([locale_charset]) + LIBS="${am_save_LIBS}" + if test "x$ac_cv_func_locale_charset" != "xyes"; then diff --git a/package/libarchive/Config.in b/package/libarchive/Config.in index fd429acb602..ffa4cff7b33 100644 --- a/package/libarchive/Config.in +++ b/package/libarchive/Config.in @@ -8,7 +8,7 @@ config BR2_PACKAGE_LIBARCHIVE Libarchive is a reusable C library for reading and writing a variety of streaming archive formats. - http://www.libarchive.org/ + https://www.libarchive.org/ if BR2_PACKAGE_LIBARCHIVE diff --git a/package/libarchive/libarchive.hash b/package/libarchive/libarchive.hash index 5dd8e5c167a..b03bef3de59 100644 --- a/package/libarchive/libarchive.hash +++ b/package/libarchive/libarchive.hash @@ -1,4 +1,4 @@ # From https://www.libarchive.de/downloads/sha256sums -sha256 5cac725dd4be31c4a10b65d30f29dc957ea29ef3d758df6e46e8ae90a996a19a libarchive-3.5.3.tar.xz +sha256 9e2c1b80d5fbe59b61308fdfab6c79b5021d7ff4ff2489fb12daf0a96a83551d libarchive-3.6.2.tar.xz # Locally computed: sha256 b2cdf763345de2de34cebf54394df3c61a105c3b71288603c251f2fa638200ba COPYING diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk index cf16c27e675..2010b6529f4 100644 --- a/package/libarchive/libarchive.mk +++ b/package/libarchive/libarchive.mk @@ -4,13 +4,17 @@ # ################################################################################ -LIBARCHIVE_VERSION = 3.5.3 +LIBARCHIVE_VERSION = 3.6.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) @@ -136,6 +140,8 @@ endif # The only user of host-libarchive needs zlib support HOST_LIBARCHIVE_DEPENDENCIES = host-zlib +# needed for autoreconf +HOST_LIBARCHIVE_DEPENDENCIES += host-pkgconf HOST_LIBARCHIVE_CONF_OPTS = \ --disable-bsdtar \ --disable-bsdcpio \ diff --git a/package/libart/libart.hash b/package/libart/libart.hash index 105277b1f2a..c00272c5941 100644 --- a/package/libart/libart.hash +++ b/package/libart/libart.hash @@ -1,5 +1,5 @@ -# From http://ftp.gnome.org/pub/gnome/sources/libart_lgpl/2.3/libart_lgpl-2.3.21.sha256sum -sha256 2a10b1c884bb37c7bd5c5eba59dbd0d28bf68e64a42d7f2083c836f60f8e98fa libart_lgpl-2.3.21.tar.gz +# From https://download.gnome.org/sources/libart_lgpl/2.3/libart_lgpl-2.3.21.sha256sum +sha256 2a10b1c884bb37c7bd5c5eba59dbd0d28bf68e64a42d7f2083c836f60f8e98fa libart_lgpl-2.3.21.tar.gz # Hash for license file: -sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING +sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING diff --git a/package/libart/libart.mk b/package/libart/libart.mk index b3c6176a570..2c64a3576ab 100644 --- a/package/libart/libart.mk +++ b/package/libart/libart.mk @@ -7,7 +7,7 @@ LIBART_VERSION_MAJOR = 2.3 LIBART_VERSION = $(LIBART_VERSION_MAJOR).21 LIBART_SOURCE = libart_lgpl-$(LIBART_VERSION).tar.gz -LIBART_SITE = http://ftp.gnome.org/pub/gnome/sources/libart_lgpl/$(LIBART_VERSION_MAJOR) +LIBART_SITE = https://download.gnome.org/sources/libart_lgpl/$(LIBART_VERSION_MAJOR) LIBART_AUTORECONF = YES LIBART_INSTALL_STAGING = YES LIBART_CONFIG_SCRIPTS = libart2-config diff --git a/package/libasplib/libasplib.hash b/package/libasplib/libasplib.hash index db8e9203345..251a50ee457 100644 --- a/package/libasplib/libasplib.hash +++ b/package/libasplib/libasplib.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 68e117348fa17592dde7672477e927119a0e477103ced1d3a57d92e30880a147 libasplib-be7fac89218a84b75f7598e3d76625ece99296f2.tar.gz -sha256 12ac5047f2af0522f06798b1589ffc4599bc29c91f954d7874e0320634e777c0 LICENSE +sha256 68e117348fa17592dde7672477e927119a0e477103ced1d3a57d92e30880a147 libasplib-be7fac89218a84b75f7598e3d76625ece99296f2.tar.gz +sha256 12ac5047f2af0522f06798b1589ffc4599bc29c91f954d7874e0320634e777c0 LICENSE diff --git a/package/libass/libass.hash b/package/libass/libass.hash index 33ed0c4fc7f..bf9b8251d75 100644 --- a/package/libass/libass.hash +++ b/package/libass/libass.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1be2df9c4485a57d78bb18c0a8ed157bc87a5a8dd48c661961c625cb112832fd libass-0.15.2.tar.xz +sha256 f0da0bbfba476c16ae3e1cfd862256d30915911f7abaa1b16ce62ee653192784 libass-0.17.1.tar.xz sha256 f7e30699d02798351e7f839e3d3bfeb29ce65e44efa7735c225464c4fd7dfe9c COPYING diff --git a/package/libass/libass.mk b/package/libass/libass.mk index 93bfbe4e2e1..8b14c899c4d 100644 --- a/package/libass/libass.mk +++ b/package/libass/libass.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBASS_VERSION = 0.15.2 +LIBASS_VERSION = 0.17.1 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. @@ -33,4 +33,11 @@ else LIBASS_CONF_OPTS += --disable-fontconfig --disable-require-system-font-provider endif +ifeq ($(BR2_PACKAGE_LIBUNIBREAK),y) +LIBASS_DEPENDENCIES += libunibreak +LIBASS_CONF_OPTS += --enable-libunibreak +else +LIBASS_CONF_OPTS += --disable-libunibreak +endif + $(eval $(autotools-package)) diff --git a/package/libatasmart/libatasmart.hash b/package/libatasmart/libatasmart.hash index b661332a77e..edf09041572 100644 --- a/package/libatasmart/libatasmart.hash +++ b/package/libatasmart/libatasmart.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 61f0ea345f63d28ab2ff0dc352c22271661b66bf09642db3a4049ac9dbdb0f8d libatasmart-0.19.tar.xz -sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 LGPL +sha256 61f0ea345f63d28ab2ff0dc352c22271661b66bf09642db3a4049ac9dbdb0f8d libatasmart-0.19.tar.xz +sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 LGPL diff --git a/package/libatomic_ops/libatomic_ops.hash b/package/libatomic_ops/libatomic_ops.hash index 991c3fbe80e..32a0795a5af 100644 --- a/package/libatomic_ops/libatomic_ops.hash +++ b/package/libatomic_ops/libatomic_ops.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 18091d5f3cb7008b0432016390ff437b9d1d76c10b92c8e63ff63f0c1331b030 libatomic_ops-7.6.12.tar.gz -sha256 f0e630c0ca489767033da5a0c869fb4231db522c5ff479ce55a853a923a00f69 doc/LICENSING.txt +sha256 b4b0072bdb6780e2331db4fadba7e423fde25c71b1f0eb04859cc1eba59c2c2c libatomic_ops-7.6.14.tar.gz +sha256 636c2bf07975765ab9aff17f7c9b6beb9540378f45b5a1b21691d14ea804f0ff doc/LICENSING.txt sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/libatomic_ops/libatomic_ops.mk b/package/libatomic_ops/libatomic_ops.mk index fb1e86f6bca..1b34d3b7884 100644 --- a/package/libatomic_ops/libatomic_ops.mk +++ b/package/libatomic_ops/libatomic_ops.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBATOMIC_OPS_VERSION = 7.6.12 +LIBATOMIC_OPS_VERSION = 7.6.14 LIBATOMIC_OPS_SITE = $(call github,ivmai,libatomic_ops,v$(LIBATOMIC_OPS_VERSION)) LIBATOMIC_OPS_AUTORECONF = YES diff --git a/package/libavl/libavl.hash b/package/libavl/libavl.hash index 4d70f0cca9e..eb62ae5a724 100644 --- a/package/libavl/libavl.hash +++ b/package/libavl/libavl.hash @@ -1,5 +1,5 @@ # From http://snapshot.debian.org/archive/debian/20160621T164030Z/pool/main/liba/libavl/libavl_0.3.5-4.dsc -sha256 4497b9e22cdd61ae2fa893b9d5fd6213dc306726d7c4be08c29e173622dca8a0 libavl_0.3.5.orig.tar.gz +sha256 4497b9e22cdd61ae2fa893b9d5fd6213dc306726d7c4be08c29e173622dca8a0 libavl_0.3.5.orig.tar.gz # Locally computed -sha256 767a9accfe3b110153b567983b98889469dfaae02899a632aeadbb81ad611293 COPYING +sha256 767a9accfe3b110153b567983b98889469dfaae02899a632aeadbb81ad611293 COPYING diff --git a/package/libb2/Config.in b/package/libb2/Config.in new file mode 100644 index 00000000000..5cb462eb193 --- /dev/null +++ b/package/libb2/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_LIBB2 + bool "libb2" + help + C library providing BLAKE2b, BLAKE2s, BLAKE2bp, BLAKE2sp. + + https://github.com/BLAKE2/libb2 diff --git a/package/libb2/libb2.hash b/package/libb2/libb2.hash new file mode 100644 index 00000000000..6ef24a98ca6 --- /dev/null +++ b/package/libb2/libb2.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 10053dbc2fa342516b780a6bbf6e7b2a2360b8d49c5ac426936bf3df82526732 libb2-0.98.1.tar.gz +sha256 6a1ee543e5282cd9061881edf462e6fdab181f328da71fc2c9a6950a80e94d01 COPYING diff --git a/package/libb2/libb2.mk b/package/libb2/libb2.mk new file mode 100644 index 00000000000..761c0599e35 --- /dev/null +++ b/package/libb2/libb2.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# libb2 +# +################################################################################ + +LIBB2_VERSION = 0.98.1 +LIBB2_SITE = $(call github,BLAKE2,libb2,v$(LIBB2_VERSION)) +LIBB2_LICENSE = CC0-1.0 +LIBB2_LICENSE_FILES = COPYING +LIBB2_INSTALL_STAGING = YES +LIBB2_AUTORECONF = YES +LIBB2_DEPENDENCIES = host-pkgconf +LIBB2_CONF_OPTS = --disable-fat --disable-native +HOST_LIBB2_DEPENDENCIES = host-pkgconf +HOST_LIBB2_CONF_OPTS = --disable-fat --enable-native + +$(eval $(autotools-package)) +$(eval $(host-autotools-package)) diff --git a/package/libbacktrace/libbacktrace.hash b/package/libbacktrace/libbacktrace.hash index ecd530a33ba..bb5e00ee40c 100644 --- a/package/libbacktrace/libbacktrace.hash +++ b/package/libbacktrace/libbacktrace.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 13072c499c76866c188beaf3d50f3dddbf2c27ed9fd72b33d1b857acd33b1cb5 libbacktrace-9b7f216e867916594d81e8b6118f092ac3fcf704.tar.gz -sha256 ef8a9b3247488f8901ca60de9b17b745d7bd67e5ec1e622f80d62364572200d8 LICENSE +sha256 13072c499c76866c188beaf3d50f3dddbf2c27ed9fd72b33d1b857acd33b1cb5 libbacktrace-9b7f216e867916594d81e8b6118f092ac3fcf704.tar.gz +sha256 ef8a9b3247488f8901ca60de9b17b745d7bd67e5ec1e622f80d62364572200d8 LICENSE diff --git a/package/libbdplus/libbdplus.hash b/package/libbdplus/libbdplus.hash index 6abc0e49704..2445af6e821 100644 --- a/package/libbdplus/libbdplus.hash +++ b/package/libbdplus/libbdplus.hash @@ -1,5 +1,5 @@ -# From http://download.videolan.org/pub/videolan/libbdplus/0.1.2/libbdplus-0.1.2.tar.bz2.sha512 -sha512 e00e7bc9f52b9275646593b753ba646b052255be94a7241965f4dbe4734f8f6a072973ed4b9997957f939236b0633897c295749f79e232188430795be5b5087b libbdplus-0.1.2.tar.bz2 +# From http://download.videolan.org/pub/videolan/libbdplus/0.2.0/libbdplus-0.2.0.tar.bz2.sha512 +sha512 172e4932fb5540fbdb5b86e1d42cfaddf60b81416d2de50c8add83fb7f1bd7c296c975fd84a6ec42566977086dccfe07db5ce696038862bc75c6494c647998d6 libbdplus-0.2.0.tar.bz2 # Hash for license file: -sha256 592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c COPYING +sha256 592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c COPYING diff --git a/package/libbdplus/libbdplus.mk b/package/libbdplus/libbdplus.mk index b0e8b1488d2..600cb6b5454 100644 --- a/package/libbdplus/libbdplus.mk +++ b/package/libbdplus/libbdplus.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBBDPLUS_VERSION = 0.1.2 +LIBBDPLUS_VERSION = 0.2.0 LIBBDPLUS_SITE = http://download.videolan.org/pub/videolan/libbdplus/$(LIBBDPLUS_VERSION) LIBBDPLUS_SOURCE = libbdplus-$(LIBBDPLUS_VERSION).tar.bz2 LIBBDPLUS_LICENSE = LGPL-2.1+ diff --git a/package/libblockdev/Config.in b/package/libblockdev/Config.in index 4389fd794c2..4f98621bd83 100644 --- a/package/libblockdev/Config.in +++ b/package/libblockdev/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_LIBBLOCKDEV depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_USE_MMU # libglib2 depends on BR2_PACKAGE_HAS_UDEV + depends on BR2_ENABLE_LOCALE select BR2_PACKAGE_KMOD select BR2_PACKAGE_LIBGLIB2 help @@ -66,7 +67,8 @@ config BR2_PACKAGE_LIBBLOCKDEV_SWAP endif -comment "libblockdev needs udev /dev management and a toolchain w/ wchar, threads, dynamic library" +comment "libblockdev needs udev /dev management and a toolchain w/ wchar, threads, dynamic library, locale" depends on BR2_USE_MMU depends on !BR2_PACKAGE_HAS_UDEV || BR2_STATIC_LIBS || \ - !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_ENABLE_LOCALE diff --git a/package/libbluray/libbluray.hash b/package/libbluray/libbluray.hash index 4ab8c858669..a631722bb0d 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.0/libbluray-1.3.0.tar.bz2.sha512 -sha512 3d5145e6fd7de099c07f937282112c7abb12a5590b7c0b965b00bddee3837ddfd1a30076aaa6d6278d07a5beee3856f602125983ae075ab30eceb6ac1bd9bcdc libbluray-1.3.0.tar.bz2 +# 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 # Locally computed sha256 b3aa400aca6d2ba1f0bd03bd98d03d1fe7489a3bbb26969d72016360af8a5c9d COPYING diff --git a/package/libbluray/libbluray.mk b/package/libbluray/libbluray.mk index 233797f38dc..54f4caa368f 100644 --- a/package/libbluray/libbluray.mk +++ b/package/libbluray/libbluray.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBBLURAY_VERSION = 1.3.0 +LIBBLURAY_VERSION = 1.3.4 LIBBLURAY_SITE = http://download.videolan.org/pub/videolan/libbluray/$(LIBBLURAY_VERSION) LIBBLURAY_SOURCE = libbluray-$(LIBBLURAY_VERSION).tar.bz2 LIBBLURAY_INSTALL_STAGING = YES @@ -21,6 +21,8 @@ endif ifeq ($(BR2_PACKAGE_LIBUDFREAD),y) LIBBLURAY_DEPENDENCIES += libudfread +else +LIBBLURAY_CONF_OPTS += --without-external-libudfread endif ifeq ($(BR2_PACKAGE_FREETYPE),y) diff --git a/package/libbpf/Config.in b/package/libbpf/Config.in index 3aa6679b3ac..1465366c9e3 100644 --- a/package/libbpf/Config.in +++ b/package/libbpf/Config.in @@ -1,15 +1,6 @@ -config BR2_PACKAGE_LIBBPF_ARCH_SUPPORTS - bool - # see src/bpf.c - default y if BR2_arc - default y if BR2_aarch64 || BR2_aarch64_be - default y if BR2_i386 || BR2_x86_64 - default y if BR2_sparc || BR2_sparc64 - default y if BR2_s390x - config BR2_PACKAGE_LIBBPF bool "libbpf" - depends on BR2_PACKAGE_LIBBPF_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_USE_WCHAR # elfutils depends on !BR2_STATIC_LIBS # elfutils depends on BR2_TOOLCHAIN_HAS_THREADS # elfutils @@ -26,7 +17,7 @@ config BR2_PACKAGE_LIBBPF https://github.com/libbpf/libbpf comment "libbpf needs a uClibc or glibc toolchain w/ wchar, dynamic library, threads, headers >= 4.13" - depends on BR2_PACKAGE_LIBBPF_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS \ || !BR2_TOOLCHAIN_HAS_THREADS \ || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13 \ diff --git a/package/libbpf/libbpf.hash b/package/libbpf/libbpf.hash index 27e22be9e91..75f2b1695cb 100644 --- a/package/libbpf/libbpf.hash +++ b/package/libbpf/libbpf.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 ce3a8eb32d85ac48490256597736d8b27e0a5e947a0731613b7aba6b4ae43ac0 libbpf-0.6.1.tar.gz +sha256 5da826c968fdb8a2f714701cfef7a4b7078be030cf58b56143b245816301cbb8 libbpf-1.1.0.tar.gz sha256 847f4addbd56e2d5be20c4ea0845e972672fc07b755fadaae5f7abd35d71e349 LICENSE -sha256 6313108c23efffa36948f8b2cff1560a5935373b527b0e1a837cc77e6ed1bacd LICENSE.BSD-2-Clause +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 06f3f3475a7..670dbee87e2 100644 --- a/package/libbpf/libbpf.mk +++ b/package/libbpf/libbpf.mk @@ -4,12 +4,13 @@ # ################################################################################ -LIBBPF_VERSION = 0.6.1 +LIBBPF_VERSION = 1.1.0 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 LIBBPF_CPE_ID_VENDOR = libbpf_project LIBBPF_DEPENDENCIES = host-bison host-flex host-pkgconf elfutils zlib +HOST_LIBBPF_DEPENDENCIES = host-bison host-flex host-pkgconf host-elfutils host-zlib LIBBPF_INSTALL_STAGING = YES define LIBBPF_BUILD_CMDS @@ -38,4 +39,10 @@ define LIBBPF_INSTALL_TARGET_CMDS -C $(@D)/src install DESTDIR=$(TARGET_DIR) endef +define HOST_LIBBPF_INSTALL_CMDS + $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \ + -C $(@D)/src install install_uapi_headers DESTDIR=$(HOST_DIR) +endef + $(eval $(generic-package)) +$(eval $(host-generic-package)) diff --git a/package/libbsd/0001-src-local-elf.h-fix-big-endian-sh.patch b/package/libbsd/0001-src-local-elf.h-fix-big-endian-sh.patch new file mode 100644 index 00000000000..8612d268f89 --- /dev/null +++ b/package/libbsd/0001-src-local-elf.h-fix-big-endian-sh.patch @@ -0,0 +1,39 @@ +From 93c9f8aa72349a4fe33e2a732100c76f3904eb80 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 7 Jun 2022 19:27:13 +0200 +Subject: [PATCH] src/local-elf.h: fix big endian sh + +Fix the following build failure with big endian sh (e.g. sh4aeb): + +In file included from nlist.c:44: +nlist.c: In function '__elf_is_okay__': +local-elf.h:223:25: error: 'ELFDATA2LMSB' undeclared (first use in this function); did you mean 'ELFDATA2LSB'? + 223 | #define ELF_TARG_DATA ELFDATA2LMSB + | ^~~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/2980fb79c208454195d77383f1ece9afbd7f981b + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://gitlab.freedesktop.org/libbsd/libbsd/-/merge_requests/19] +--- + src/local-elf.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/local-elf.h b/src/local-elf.h +index 1dd3b42..8c4794f 100644 +--- a/src/local-elf.h ++++ b/src/local-elf.h +@@ -230,7 +230,7 @@ + #if defined(__LITTLE_ENDIAN__) + #define ELF_TARG_DATA ELFDATA2LSB + #elif defined(__BIG_ENDIAN__) +-#define ELF_TARG_DATA ELFDATA2LMSB ++#define ELF_TARG_DATA ELFDATA2MSB + #else + #error Unknown SH endianness + #endif +-- +2.35.1 + diff --git a/package/libbsd/Config.in b/package/libbsd/Config.in index 093a2e646cc..9f4b30f68c6 100644 --- a/package/libbsd/Config.in +++ b/package/libbsd/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS depends on !BR2_microblaze depends on !BR2_arc depends on !BR2_xtensa - depends on !BR2_nds32 config BR2_PACKAGE_LIBBSD bool "libbsd" diff --git a/package/libbson/libbson.hash b/package/libbson/libbson.hash index 568459900a0..e4b636d2fd2 100644 --- a/package/libbson/libbson.hash +++ b/package/libbson/libbson.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 6bb51b863a4641d6d7729e4b55df8f4389ed534c34eb3a1cda906a53df11072c libbson-1.9.5.tar.gz -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING -sha256 8dc5cb3146b026715e6c145621c7732f36c295d825b7b3a03076ad3f238db48e THIRD_PARTY_NOTICES +sha256 6bb51b863a4641d6d7729e4b55df8f4389ed534c34eb3a1cda906a53df11072c libbson-1.9.5.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING +sha256 8dc5cb3146b026715e6c145621c7732f36c295d825b7b3a03076ad3f238db48e THIRD_PARTY_NOTICES diff --git a/package/libbytesize/libbytesize.hash b/package/libbytesize/libbytesize.hash index 2dfa97dd6a6..7dd572842d1 100644 --- a/package/libbytesize/libbytesize.hash +++ b/package/libbytesize/libbytesize.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 efaa2b35b2bb3b52bf7b4ff5d0ed2c5c61360a5196053808d615dd0aa2cf0741 libbytesize-2.6.tar.gz +sha256 8bae8287af6ef5624c320f70defdcd84ddc0c2057d3b59a5871897f27697811e libbytesize-2.7.tar.gz sha256 97bdc721d875501b6243a456333fdfdb1ab64d31c4da2554de845caf4674b946 LICENSE diff --git a/package/libbytesize/libbytesize.mk b/package/libbytesize/libbytesize.mk index 2ef08211c57..a95ee083577 100644 --- a/package/libbytesize/libbytesize.mk +++ b/package/libbytesize/libbytesize.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBBYTESIZE_VERSION = 2.6 +LIBBYTESIZE_VERSION = 2.7 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-cmake-remove-Werror-and-Wfatal-errors-compiler-comma.patch b/package/libcamera-apps/0001-cmake-remove-Werror-and-Wfatal-errors-compiler-comma.patch deleted file mode 100644 index 988d89cca3b..00000000000 --- a/package/libcamera-apps/0001-cmake-remove-Werror-and-Wfatal-errors-compiler-comma.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 6bd733b52f0b4039407c676cd3126a9e2f79456b Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Fri, 5 Feb 2021 18:24:08 +0100 -Subject: [PATCH] cmake: remove -Werror and -Wfatal-errors compiler command - line option -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes (with bootlin-riscv64-musl toolchain): - - .../build/libcamera-apps-2d1009e3badcc8047361ff81149ad6cba3b911b5/core/libcamera_app.cpp:30:22: error: overflow in conversion from ‘long unsigned int’ to ‘int’ changes value from ‘2154321408’ to ‘-2140645888’ [-Werror=overflow] - 30 | int ret = ioctl(fd, VIDIOC_QUERYCAP, &caps); - | ^~~~~~~~~~~~~~~ - cc1plus: all warnings being treated as errors - -Signed-off-by: Peter Seiderer ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 748c6dd..1ca1e39 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -11,7 +11,7 @@ endif() - - set (CMAKE_EXPORT_COMPILE_COMMANDS ON) - set (CMAKE_CXX_STANDARD 17) --add_compile_options(-Wall -Wextra -pedantic -Wno-unused-parameter -faligned-new -Werror -Wfatal-errors) -+add_compile_options(-Wall -Wextra -pedantic -Wno-unused-parameter -faligned-new) - add_definitions(-D_FILE_OFFSET_BITS=64) - - if (CMAKE_COMPILER_IS_GNUCXX) --- -2.34.1 - diff --git a/package/libcamera-apps/0001-core-pass-VIDIOC_QUERYCAP-as-unsigned-long.patch b/package/libcamera-apps/0001-core-pass-VIDIOC_QUERYCAP-as-unsigned-long.patch new file mode 100644 index 00000000000..fbd1d2d4ba1 --- /dev/null +++ b/package/libcamera-apps/0001-core-pass-VIDIOC_QUERYCAP-as-unsigned-long.patch @@ -0,0 +1,35 @@ +From a65682a97e19f96b86aeceb3ca3befb1687e3861 Mon Sep 17 00:00:00 2001 +From: Marcus Folkesson +Date: Tue, 31 Jan 2023 09:14:15 +0100 +Subject: [PATCH] core: pass VIDIOC_QUERYCAP as unsigned long + +VIDIOC_QUARYCAP is an unsigned long and should be passed as one. + +Get rid of the following error: +core/libcamera_app.cpp:33:22: error: overflow in conversion from 'long unsigned int' to 'int' changes value from '2154321408' to '-2140645888' [-Werror=overflow] + 33 | int ret = ioctl(fd, VIDIOC_QUERYCAP, &caps); + +Upstream: https://github.com/raspberrypi/libcamera-apps/commit/a65682a97e19f96b86aeceb3ca3befb1687e3861 +Signed-off-by: Marcus Folkesson +--- + core/libcamera_app.cpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/core/libcamera_app.cpp b/core/libcamera_app.cpp +index 04696fb..8cb6563 100644 +--- a/core/libcamera_app.cpp ++++ b/core/libcamera_app.cpp +@@ -30,7 +30,9 @@ static void check_camera_stack() + return; + + v4l2_capability caps; +- int ret = ioctl(fd, VIDIOC_QUERYCAP, &caps); ++ unsigned long request = VIDIOC_QUERYCAP; ++ ++ int ret = ioctl(fd, request, &caps); + close(fd); + + if (ret < 0 || strcmp((char *)caps.driver, "bm2835 mmal")) +-- +2.38.1 + diff --git a/package/libcamera-apps/Config.in b/package/libcamera-apps/Config.in index a1affc2d232..711fd6de05f 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_7 # C++17/libcamera + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # libcamera depends on !BR2_STATIC_LIBS # gnutls/libcamera depends on BR2_USE_WCHAR # gnutls/libcamera/boost select BR2_PACKAGE_BOOST @@ -14,6 +14,7 @@ config BR2_PACKAGE_LIBCAMERA_APPS select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_TIFF select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 && (BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBGL) + select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_XORG7 && (BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBGL) select BR2_PACKAGE_LIBEPOXY if BR2_PACKAGE_XORG7 && (BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBGL) select BR2_PACKAGE_QT5BASE_GUI if BR2_PACKAGE_QT5 select BR2_PACKAGE_QT5BASE_WIDGETS if BR2_PACKAGE_QT5 @@ -23,7 +24,7 @@ config BR2_PACKAGE_LIBCAMERA_APPS https://github.com/raspberrypi/libcamera-apps -comment "libcamera-apps needs a toolchain w/ C++, threads, wchar, dynamic library, gcc >= 7" +comment "libcamera-apps needs a toolchain w/ C++, threads, wchar, dynamic library, gcc >= 8" depends on BR2_PACKAGE_LIBCAMERA_ARCH_SUPPORTS 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 diff --git a/package/libcamera-apps/libcamera-apps.hash b/package/libcamera-apps/libcamera-apps.hash index 2dbb74d463a..fbb3150cb53 100644 --- a/package/libcamera-apps/libcamera-apps.hash +++ b/package/libcamera-apps/libcamera-apps.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 611aec06dd24de6586580164d9b7c55da0698ac4cf129944b2fc41fe67210597 libcamera-apps-2d1009e3badcc8047361ff81149ad6cba3b911b5.tar.gz +sha256 c05e29e02da05fa92739941295d96dcb93324805f7b348ad182e7e29e7e0c520 libcamera-apps-1.1.1.tar.gz sha256 36dfed86bdef661a0a14ec1a1cc84c771d5a06b6f9b92e9ebb610ba711bd528a license.txt diff --git a/package/libcamera-apps/libcamera-apps.mk b/package/libcamera-apps/libcamera-apps.mk index f4fc019c179..fe402ec3f40 100644 --- a/package/libcamera-apps/libcamera-apps.mk +++ b/package/libcamera-apps/libcamera-apps.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBCAMERA_APPS_VERSION = 2d1009e3badcc8047361ff81149ad6cba3b911b5 -LIBCAMERA_APPS_SITE = $(call github,raspberrypi,libcamera-apps,$(LIBCAMERA_APPS_VERSION)) +LIBCAMERA_APPS_VERSION = 1.1.1 +LIBCAMERA_APPS_SITE = $(call github,raspberrypi,libcamera-apps,v$(LIBCAMERA_APPS_VERSION)) LIBCAMERA_APPS_LICENSE = BSD-2-Clause LIBCAMERA_APPS_LICENSE_FILES = license.txt LIBCAMERA_APPS_DEPENDENCIES = \ @@ -29,6 +29,13 @@ else LIBCAMERA_APPS_CONF_OPTS += -DENABLE_DRM=0 endif +ifeq ($(BR2_PACKAGE_FFMPEG)$(BR2_PACKAGE_LIBDRM),yy) +LIBCAMERA_APPS_DEPENDENCIES += ffmpeg libdrm +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_LIBAV=1 +else +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_LIBAV=0 +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 23a0040abf6..63c06173dbf 100644 --- a/package/libcamera/Config.in +++ b/package/libcamera/Config.in @@ -10,10 +10,11 @@ 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_7 # C++17 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # C++17 depends on !BR2_STATIC_LIBS # gnutls depends on BR2_USE_WCHAR # gnutls select BR2_PACKAGE_GNUTLS + select BR2_PACKAGE_LIBYAML select BR2_PACKAGE_LIBCAMERA_PIPELINE_UVCVIDEO if !BR2_PACKAGE_LIBCAMERA_HAS_PIPELINE help libcamera provides a software stack to support @@ -77,22 +78,21 @@ config BR2_PACKAGE_LIBCAMERA_COMPLIANCE depends on BR2_USE_WCHAR # gtest depends on BR2_TOOLCHAIN_HAS_THREADS # gtest depends on BR2_INSTALL_LIBSTDCPP # gtest - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # gtest + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # gtest depends on BR2_USE_MMU # gtest select BR2_PACKAGE_GTEST select BR2_PACKAGE_LIBEVENT help lc-compliance test application -comment "lc-compliance test application needs a toolchain w/ C++, wchar, threads, gcc >= 4.9" +comment "lc-compliance test application needs a toolchain w/ C++, wchar, threads, gcc >= 5" depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 endif # BR2_PACKAGE_LIBCAMERA -comment "libcamera needs a toolchain w/ C++, threads, wchar, dynamic library, gcc >= 7" +comment "libcamera needs a toolchain w/ C++, threads, wchar, dynamic library, gcc >= 8" depends on BR2_PACKAGE_LIBCAMERA_ARCH_SUPPORTS 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 diff --git a/package/libcamera/libcamera.hash b/package/libcamera/libcamera.hash index 8d5abf0e621..ea204aee980 100644 --- a/package/libcamera/libcamera.hash +++ b/package/libcamera/libcamera.hash @@ -1,4 +1,4 @@ -sha256 3624c71ba492c602c5335aab3dc87798193f7596c6cc75f7cfb847165f180930 libcamera-1966b9a58436fab51f8270aad6a228b935e4fac4-br1.tar.gz +sha256 13e53b33652b16454264b6eff0a6f032aa9331f919b07b6d0e622917ed7f7dd8 libcamera-v0.0.4-br1.tar.gz # license files sha256 fd38b2c053c0cce46d9c5ef3545a6e34d157a240ba99c9b8dca5d37a8147da6c LICENSES/BSD-2-Clause.txt diff --git a/package/libcamera/libcamera.mk b/package/libcamera/libcamera.mk index 9cbb1910dcf..01c4cb2ff26 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 = 1966b9a58436fab51f8270aad6a228b935e4fac4 +LIBCAMERA_VERSION = v0.0.4 LIBCAMERA_SITE_METHOD = git LIBCAMERA_DEPENDENCIES = \ host-openssl \ @@ -13,6 +13,7 @@ LIBCAMERA_DEPENDENCIES = \ host-python-jinja2 \ host-python-ply \ host-python-pyyaml \ + libyaml \ gnutls LIBCAMERA_CONF_OPTS = \ -Dandroid=disabled \ @@ -84,6 +85,13 @@ 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_TIFF),y) LIBCAMERA_DEPENDENCIES += tiff endif @@ -104,4 +112,24 @@ LIBCAMERA_DEPENDENCIES += libexecinfo LIBCAMERA_LDFLAGS = $(TARGET_LDFLAGS) -lexecinfo endif +# Open-Source IPA shlibs need to be signed in order to be runnable within the +# same process, otherwise they are deemed Closed-Source and run in another +# process and communicate over IPC. +# Buildroot sanitizes RPATH in a post build process. meson gets rid of rpath +# while installing so we don't need to do it manually here. +# Buildroot may strip symbols, so we need to do the same before signing +# 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 \ + $(if $(call qstrip,$(BR2_STRIP_EXCLUDE_FILES)), \ + -not \( $(call findfileclauses,$(call qstrip,$(BR2_STRIP_EXCLUDE_FILES))) \) ) \ + -type f -name 'ipa_*.so' -print0 + +define LIBCAMERA_BUILD_STRIP_IPA_SO + $(LIBCAMERA_STRIP_FIND_CMD) | xargs --no-run-if-empty -0 $(STRIPCMD) +endef + +LIBCAMERA_POST_BUILD_HOOKS += LIBCAMERA_BUILD_STRIP_IPA_SO + $(eval $(meson-package)) diff --git a/package/libcap-ng/libcap-ng.hash b/package/libcap-ng/libcap-ng.hash index f775ae6fc91..d4590dd7397 100644 --- a/package/libcap-ng/libcap-ng.hash +++ b/package/libcap-ng/libcap-ng.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 52c083b77c2b0d8449dee141f9c3eba76e6d4c5ad44ef05df25891126cb85ae9 libcap-ng-0.8.2.tar.gz +sha256 bed6f6848e22bb2f83b5f764b2aef0ed393054e803a8e3a8711cb2a39e6b492d libcap-ng-0.8.3.tar.gz sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING sha256 f18a0811fa0e220ccbc42f661545e77f0388631e209585ed582a1c693029c6aa COPYING.LIB diff --git a/package/libcap-ng/libcap-ng.mk b/package/libcap-ng/libcap-ng.mk index 4fb0cf47779..46f72c702e2 100644 --- a/package/libcap-ng/libcap-ng.mk +++ b/package/libcap-ng/libcap-ng.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCAP_NG_VERSION = 0.8.2 +LIBCAP_NG_VERSION = 0.8.3 LIBCAP_NG_SITE = http://people.redhat.com/sgrubb/libcap-ng LIBCAP_NG_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (library) LIBCAP_NG_LICENSE_FILES = COPYING COPYING.LIB diff --git a/package/libcap/libcap.hash b/package/libcap/libcap.hash index 396e592c5b5..0f1501d31bc 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 190c5baac9bee06a129eae20d3e827de62f664fe3507f0bf6c50a9a59fbd83a2 libcap-2.62.tar.xz +sha256 f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb libcap-2.69.tar.xz # Hash for license file: -sha256 f58c80bcce8c929db39a23c32e924876e3311f3ffa54f66076c38056d38fa59b License +sha256 68467e731f4744bd6e0bb69e8df9c3a994e09cd6b203d0c41327ac6d079c581d License diff --git a/package/libcap/libcap.mk b/package/libcap/libcap.mk index 12079953339..c9727c75c96 100644 --- a/package/libcap/libcap.mk +++ b/package/libcap/libcap.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCAP_VERSION = 2.62 +LIBCAP_VERSION = 2.69 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 diff --git a/package/libcddb/libcddb.hash b/package/libcddb/libcddb.hash index f3519c25774..b2da48fcaf7 100644 --- a/package/libcddb/libcddb.hash +++ b/package/libcddb/libcddb.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 35ce0ee1741ea38def304ddfe84a958901413aa829698357f0bee5bb8f0a223b libcddb-1.3.2.tar.bz2 -sha256 7a4436f9ec37603356791c87de3bc444989befd2682d29efb3d97604e04c1852 COPYING +sha256 35ce0ee1741ea38def304ddfe84a958901413aa829698357f0bee5bb8f0a223b libcddb-1.3.2.tar.bz2 +sha256 7a4436f9ec37603356791c87de3bc444989befd2682d29efb3d97604e04c1852 COPYING diff --git a/package/libcdio-paranoia/libcdio-paranoia.hash b/package/libcdio-paranoia/libcdio-paranoia.hash index 18e6f33dff1..f1f64f6c080 100644 --- a/package/libcdio-paranoia/libcdio-paranoia.hash +++ b/package/libcdio-paranoia/libcdio-paranoia.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 33b1cf305ccfbfd03b43936975615000ce538b119989c4bec469577570b60e8a libcdio-paranoia-10.2+2.0.1.tar.bz2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 33b1cf305ccfbfd03b43936975615000ce538b119989c4bec469577570b60e8a libcdio-paranoia-10.2+2.0.1.tar.bz2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/libcdio/libcdio.hash b/package/libcdio/libcdio.hash index 07bd85ff164..1b157992b26 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 8550e9589dbd594bfac93b81ecf129b1dc9d0d51e90f9696f1b2f9b2af32712b libcdio-2.1.0.tar.bz2 # Hash for license file: -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/libcec/0001-cecloader-h-fix-null-return.patch b/package/libcec/0001-cecloader-h-fix-null-return.patch new file mode 100644 index 00000000000..424e41c0aeb --- /dev/null +++ b/package/libcec/0001-cecloader-h-fix-null-return.patch @@ -0,0 +1,37 @@ +From 452b2049b2ee3e73968c603e5524b2d349ac0c3e Mon Sep 17 00:00:00 2001 +From: psykose +Date: Sat, 9 Apr 2022 17:59:11 +0000 +Subject: [PATCH] cecloader.h: fix null return + +returning NULL is invalid for a return type of bool when NULL is defined +as `nullptr` instead of 0L + +[Retrieved from: +https://github.com/Pulse-Eight/libcec/pull/599/commits/452b2049b2ee3e73968c603e5524b2d349ac0c3e] +Signed-off-by: Fabrice Fontaine +--- + include/cecloader.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/cecloader.h b/include/cecloader.h +index be76468f..550f598e 100644 +--- a/include/cecloader.h ++++ b/include/cecloader.h +@@ -172,7 +172,7 @@ bool LibCecBootloader(const char *strLib = NULL) + if (!g_libCEC) + { + std::cout << dlerror() << std::endl; +- return NULL; ++ return false; + } + } + +@@ -181,7 +181,7 @@ bool LibCecBootloader(const char *strLib = NULL) + if (!LibCecBootloader) + { + std::cout << "cannot find CECStartBootloader" << std::endl; +- return NULL; ++ return false; + } + + bool bReturn = LibCecBootloader(); diff --git a/package/libcec/libcec.mk b/package/libcec/libcec.mk index 8b5d70d0083..33e0463eb85 100644 --- a/package/libcec/libcec.mk +++ b/package/libcec/libcec.mk @@ -39,7 +39,6 @@ endif # Disable information about how libCEC is compiled. LIBCEC_CONF_OPTS += -DHAVE_GIT_BIN="" \ - -DHAVE_DATE_BIN="" \ -DHAVE_WHOAMI_BIN="" \ -DHAVE_HOSTNAME_BIN="" \ -DHAVE_UNAME_BIN="" diff --git a/package/libcgi/0001-CMakeLists.txt-honour-BUILD_TESTING.patch b/package/libcgi/0001-CMakeLists.txt-honour-BUILD_TESTING.patch new file mode 100644 index 00000000000..3ec674ae705 --- /dev/null +++ b/package/libcgi/0001-CMakeLists.txt-honour-BUILD_TESTING.patch @@ -0,0 +1,44 @@ +From 15ec267520efbe45193eb1df5361a4ab56164294 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 8 May 2022 17:54:42 +0200 +Subject: [PATCH] CMakeLists.txt: honour BUILD_TESTING + +Allow the user to disable tests through the standard BUILD_TESTING +option: https://cmake.org/cmake/help/latest/module/CTest.html + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/rafaelsteil/libcgi/commit/15ec267520efbe45193eb1df5361a4ab56164294] +--- + CMakeLists.txt | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cbf0d97..e3329a1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -29,15 +29,21 @@ option(BUILD_SHARED_LIBS + "Global flag to cause add_library to create shared libraries if on." + ON + ) ++option(BUILD_TESTING ++ "Build tests." ++ ON ++) + + # subdirectories + add_subdirectory("include/libcgi") + add_subdirectory("src") + + # test +-enable_testing() +-include(CTest) +-add_subdirectory("test") ++if(BUILD_TESTING) ++ enable_testing() ++ include(CTest) ++ add_subdirectory("test") ++endif(BUILD_TESTING) + + # cmake package stuff + configure_package_config_file(${PROJECT_NAME_LC}-config.cmake.in diff --git a/package/libcgi/libcgi.hash b/package/libcgi/libcgi.hash index 8760f91cf5f..5e8845ede28 100644 --- a/package/libcgi/libcgi.hash +++ b/package/libcgi/libcgi.hash @@ -1,5 +1,5 @@ # From https://github.com/rafaelsteil/libcgi/releases/download/v1.3.0/libcgi-1.3.0.tar.gz.md5 -md5 6efdc968bdf986832b7e220d1b914e57 libcgi-1.3.0.tar.gz +md5 6efdc968bdf986832b7e220d1b914e57 libcgi-1.3.0.tar.gz # From https://github.com/rafaelsteil/libcgi/releases/download/v1.3.0/libcgi-1.3.0.tar.gz.sha256 sha256 d932f380b1a5dbfbddffaa76fac71bf505a9585d441c9ae86bfbf76033d9d8df libcgi-1.3.0.tar.gz diff --git a/package/libcgicc/libcgicc.hash b/package/libcgicc/libcgicc.hash index 6fd19e305c6..87540c81444 100644 --- a/package/libcgicc/libcgicc.hash +++ b/package/libcgicc/libcgicc.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 2a17b976248de03447f9e36d6ce18a80749990d8543e2dfeea09c413eb67f7f0 cgicc-3.2.19.tar.gz +sha256 2a17b976248de03447f9e36d6ce18a80749990d8543e2dfeea09c413eb67f7f0 cgicc-3.2.19.tar.gz # Hash for license files: sha256 a2e480f5e8afd7c587a3c0ac2ed3b73ed4b10fa3a553dea26e7b661c7cedda72 COPYING.LIB diff --git a/package/libclc/0001-support-out-of-tree-build.patch b/package/libclc/0001-support-out-of-tree-build.patch new file mode 100644 index 00000000000..de7207bedb9 --- /dev/null +++ b/package/libclc/0001-support-out-of-tree-build.patch @@ -0,0 +1,71 @@ +From 495491e9d53bfb184c15753b5187e4bb55b19511 Mon Sep 17 00:00:00 2001 +From: Matt Weber +Date: Tue, 9 Mar 2021 15:55:17 -0600 +Subject: [PATCH] support out of tree build + +(1) The package has a prepare_builtins tool which 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. + +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 +--- + CMakeLists.txt | 2 +- + cmake/CMakeDetermineCLCCompiler.cmake | 4 ++++ + cmake/CMakeDetermineLLAsmCompiler.cmake | 4 ++++ + 3 files changed, 9 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9472f19..a784519 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) +-- +2.17.1 + diff --git a/package/libclc/Config.in b/package/libclc/Config.in index 797f090bfcd..938933fdd39 100644 --- a/package/libclc/Config.in +++ b/package/libclc/Config.in @@ -1,9 +1,14 @@ config BR2_PACKAGE_LIBCLC bool "libclc" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS + depends on BR2_HOST_GCC_AT_LEAST_5 # host-llvm help libclc is an open source, BSD licensed implementation of the library requirements of the OpenCL C programming language, as specified by the OpenCL 1.1 Specification. http://libclc.llvm.org/ + +comment "libclc needs host gcc >= 5" + depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS + depends on !BR2_HOST_GCC_AT_LEAST_5 diff --git a/package/libclc/libclc.hash b/package/libclc/libclc.hash index 2af64bc8e85..c496291d81e 100644 --- a/package/libclc/libclc.hash +++ b/package/libclc/libclc.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 54d7ae523aabf68d533011739d6c01546cae0c294442d0f44fd657c046cb707d libclc-d1cbc92e2ceee59963f5c3a576382e5bba31f060-br1.tar.gz +sha256 8f0213e52e2fcaca3dfcc438f05d0e15e9b3c96fd6b0994a802b267dc1047a1d libclc-13.0.1.src.tar.xz sha256 3c536c052db9afd997809e38785c9f2a9e54e2892330fa7c5b438e18a7413479 LICENSE.TXT diff --git a/package/libclc/libclc.mk b/package/libclc/libclc.mk index 6fe8e10a77d..5d246cf4f8a 100644 --- a/package/libclc/libclc.mk +++ b/package/libclc/libclc.mk @@ -4,43 +4,39 @@ # ################################################################################ -# Use the latest commit from release_90 branch. -LIBCLC_VERSION = d1cbc92e2ceee59963f5c3a576382e5bba31f060 -LIBCLC_SITE = https://github.com/llvm-mirror/libclc -LIBCLC_SITE_METHOD = git +LIBCLC_VERSION = 13.0.1 +LIBCLC_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(LIBCLC_VERSION) +LIBCLC_SOURCE = libclc-$(LIBCLC_VERSION).src.tar.xz LIBCLC_LICENSE = Apache-2.0 with exceptions or MIT LIBCLC_LICENSE_FILES = LICENSE.TXT -LIBCLC_DEPENDENCIES = host-clang host-llvm +LIBCLC_DEPENDENCIES = host-clang host-llvm host-spirv-llvm-translator LIBCLC_INSTALL_STAGING = YES -# C++ compiler is used to build a small tool (prepare-builtins) for the host. -# It must be built with the C++ compiler from the host. +# CMAKE_*_COMPILER_FORCED=ON skips testing the tools and assumes +# llvm-config provided values +# +# CMAKE_*_COMPILER has to be set to the host compiler to build a host +# 'prepare_builtins' tool used during the build process # # The headers are installed in /usr/share and not /usr/include, # because they are needed at runtime on the target to build the OpenCL # kernels. LIBCLC_CONF_OPTS = \ - --with-llvm-config=$(HOST_DIR)/usr/bin/llvm-config \ - --prefix=/usr \ - --includedir=/usr/share \ - --pkgconfigdir=/usr/lib/pkgconfig \ - --with-cxx-compiler=$(HOSTCXX_NOCCACHE) - -define LIBCLC_CONFIGURE_CMDS - (cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure.py $(LIBCLC_CONF_OPTS)) -endef - -define LIBCLC_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define LIBCLC_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install -endef - -define LIBCLC_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install -endef - -$(eval $(generic-package)) + -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)" \ + -DCMAKE_CXX_FLAGS="$(HOST_CXXFLAGS)" \ + -DCMAKE_EXE_LINKER_FLAGS="$(HOST_LDFLAGS)" \ + -DCMAKE_SHARED_LINKER_FLAGS="$(HOST_LDFLAGS)" \ + -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" + +$(eval $(cmake-package)) diff --git a/package/libcoap/0001-Backport-fix-for-CVE-2023-30362.patch b/package/libcoap/0001-Backport-fix-for-CVE-2023-30362.patch new file mode 100644 index 00000000000..ddc53292993 --- /dev/null +++ b/package/libcoap/0001-Backport-fix-for-CVE-2023-30362.patch @@ -0,0 +1,59 @@ +From c63ecbdc6b38cc7e571a72964fe9ca63834dcc89 Mon Sep 17 00:00:00 2001 +From: Jon Shallow +Date: Wed, 6 Sep 2023 21:38:13 +0200 +Subject: [PATCH] Backport fix for CVE-2023-30362 + +Upstream: https://github.com/obgm/libcoap/issues/1063#issuecomment-1626962307 +Signed-off-by: Daniel Lang +--- + src/net.c | 34 +++++++++++++++++++++------------- + 1 file changed, 21 insertions(+), 13 deletions(-) + +diff --git a/src/net.c b/src/net.c +index 98859443..e259ab00 100644 +--- a/src/net.c ++++ b/src/net.c +@@ -1305,19 +1305,27 @@ coap_send_internal(coap_session_t *session, coap_pdu_t *pdu) { + + /* Need to check that we are not seeing this proxy in the return loop */ + if (pdu->data && opt == NULL) { +- if (pdu->used_size + 1 <= pdu->max_size) { +- char *a_match; +- size_t data_len = pdu->used_size - (pdu->data - pdu->token); +- pdu->data[data_len] = '\000'; +- a_match = strstr((char*)pdu->data, cp); +- if (a_match && (a_match == (char*)pdu->data || a_match[-1] == ' ') && +- ((size_t)(a_match - (char*)pdu->data + len) == data_len || +- a_match[len] == ' ')) { +- coap_log(LOG_WARNING, "Proxy loop detected '%s'\n", +- (char*)pdu->data); +- coap_delete_pdu(pdu); +- return (coap_mid_t)COAP_DROPPED_RESPONSE; +- } ++ char *a_match; ++ size_t data_len; ++ ++ if (pdu->used_size + 1 > pdu->max_size) { ++ /* No space */ ++ return (coap_mid_t)COAP_DROPPED_RESPONSE; ++ } ++ if (!coap_pdu_resize(pdu, pdu->used_size + 1)) { ++ /* Internal error */ ++ return (coap_mid_t)COAP_DROPPED_RESPONSE; ++ } ++ data_len = pdu->used_size - (pdu->data - pdu->token); ++ pdu->data[data_len] = '\000'; ++ a_match = strstr((char*)pdu->data, cp); ++ if (a_match && (a_match == (char*)pdu->data || a_match[-1] == ' ') && ++ ((size_t)(a_match - (char*)pdu->data + len) == data_len || ++ a_match[len] == ' ')) { ++ coap_log(LOG_WARNING, "Proxy loop detected '%s'\n", ++ (char*)pdu->data); ++ coap_delete_pdu(pdu); ++ return (coap_mid_t)COAP_DROPPED_RESPONSE; + } + } + if (pdu->used_size + len + 1 <= pdu->max_size) { +-- +2.42.0 + diff --git a/package/libcoap/libcoap.hash b/package/libcoap/libcoap.hash index 4a5bcaa7ff4..e0006b62af9 100644 --- a/package/libcoap/libcoap.hash +++ b/package/libcoap/libcoap.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 1a195adacd6188d3b71c476e7b21706fef7f3663ab1fb138652e8da49a9ec556 libcoap-4.3.0.tar.gz +sha256 074a71deca01e06d3acb00a1416d0fbeb87d130f40a3c0f6fda3a5c711855dca libcoap-4.3.1.tar.gz sha256 09dd86a017bad210527085008cbf706609c58210897b69845af14099577e7eb7 COPYING -sha256 c5625e704d52deade1c9b2d7931ac8593be147ba63af62b53b8c7e309b7eaeb9 LICENSE +sha256 5711e8bf7e94b59fcf0681d0f73752111bc196563b60f8568f19dacd0213192b LICENSE diff --git a/package/libcoap/libcoap.mk b/package/libcoap/libcoap.mk index 8a85ff3a2e7..94bfc597020 100644 --- a/package/libcoap/libcoap.mk +++ b/package/libcoap/libcoap.mk @@ -4,21 +4,26 @@ # ################################################################################ -LIBCOAP_VERSION = 4.3.0 +LIBCOAP_VERSION = 4.3.1 LIBCOAP_SITE = $(call github,obgm,libcoap,v$(LIBCOAP_VERSION)) LIBCOAP_INSTALL_STAGING = YES LIBCOAP_LICENSE = BSD-2-Clause LIBCOAP_LICENSE_FILES = COPYING LICENSE +LIBCOAP_CPE_ID_VENDOR = libcoap LIBCOAP_DEPENDENCIES = host-pkgconf LIBCOAP_CONF_OPTS = \ --disable-examples --disable-examples-source --without-tinydtls LIBCOAP_AUTORECONF = YES +# 0001-Backport-fix-for-CVE-2023-30362.patch +LIBCOAP_IGNORE_CVES += CVE-2023-30362 +# Doesn't affect 4.3.1, see https://github.com/obgm/libcoap/issues/1117 +LIBCOAP_IGNORE_CVES += CVE-2023-35862 ifeq ($(BR2_PACKAGE_GNUTLS),y) LIBCOAP_DEPENDENCIES += gnutls LIBCOAP_CONF_OPTS += \ --enable-dtls --with-gnutls --without-mbedtls --without-openssl -else ifeq ($(BR2_PACKAGE_OPENSSL),y) +else ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) LIBCOAP_DEPENDENCIES += openssl LIBCOAP_CONF_OPTS += \ --enable-dtls --without-gnutls --without-mbedtls --with-openssl diff --git a/package/libcodec2/0001-update-cmake.patch b/package/libcodec2/0001-update-cmake.patch new file mode 100644 index 00000000000..e983800e278 --- /dev/null +++ b/package/libcodec2/0001-update-cmake.patch @@ -0,0 +1,301 @@ +From 812d69af486e608a10380ed5817b03d08c6e786a Mon Sep 17 00:00:00 2001 +From: "A. Maitland Bottoms" +Date: Sun, 17 Jul 2022 17:04:44 -0400 +Subject: [PATCH] update cmake + +Some minor refactoring of Codec2 build to better use CMake +features to improve readability ans maintainability. + +[Retrieved from: +https://github.com/drowe67/codec2/commit/812d69af486e608a10380ed5817b03d08c6e786a] +Signed-off-by: Fabrice Fontaine +--- + CMakeLists.txt | 48 +++++--------------------- + src/CMakeLists.txt | 84 ++++++++++++++++++++++++---------------------- + 2 files changed, 53 insertions(+), 79 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 54ac1f4f4..998af5ddf 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -5,19 +5,13 @@ + # Please report questions, comments, problems, or patches to the freetel + # mailing list: https://lists.sourceforge.net/lists/listinfo/freetel-codec2 + # +-set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "Minimum OS X deployment version") +- +-project(codec2) +- +-cmake_minimum_required(VERSION 3.0) +- +-# Set policies here, probably should move to cmake dir. +-if(POLICY CMP0075) +- cmake_policy(SET CMP0075 NEW) +-endif() +-if(POLICY CMP0079) +- cmake_policy(SET CMP0079 NEW) +-endif() ++cmake_minimum_required(VERSION 3.13) ++project(CODEC2 ++ VERSION 1.0.5 ++ DESCRIPTION "Next-Generation Digital Voice for Two-Way Radio" ++ HOMEPAGE_URL "https://www.rowetel.com/codec2.html" ++ LANGUAGES C ++ ) + + include(GNUInstallDirs) + mark_as_advanced(CLEAR +@@ -39,23 +33,6 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") + "separate build directory and run cmake from there.") + endif("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") + +-# +-# Set project version information. This should probably be done via external +-# file at some point. +-# +-set(CODEC2_VERSION_MAJOR 1) +-set(CODEC2_VERSION_MINOR 0) +-# Set to patch level if needed, otherwise leave FALSE. +-# Must be positive (non-zero) if set, since 0 == FALSE in CMake. +-set(CODEC2_VERSION_PATCH 5) +-set(CODEC2_VERSION "${CODEC2_VERSION_MAJOR}.${CODEC2_VERSION_MINOR}") +-# Patch level version bumps should not change API/ABI. +-set(SOVERSION "${CODEC2_VERSION_MAJOR}.${CODEC2_VERSION_MINOR}") +-if(CODEC2_VERSION_PATCH) +- set(CODEC2_VERSION "${CODEC2_VERSION}.${CODEC2_VERSION_PATCH}") +-endif() +-message(STATUS "codec2 version: ${CODEC2_VERSION}") +- + # Set default build type + if(NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE "Debug") +@@ -65,6 +42,7 @@ endif() + if(BUILD_OSX_UNIVERSAL) + set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64") + endif(BUILD_OSX_UNIVERSAL) ++set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "Minimum OS X deployment version") + + # + # Find the git hash if this is a working copy. +@@ -190,10 +168,6 @@ if (_GNU_SOURCE) + add_definitions(-D_GNU_SOURCE=1) + endif() + +-if(UNIX) +- set(CMAKE_REQUIRED_LIBRARIES m) +-endif() +- + check_symbol_exists(floor math.h HAVE_FLOOR) + check_symbol_exists(ceil math.h HAVE_CEIL) + check_symbol_exists(pow math.h HAVE_POW) +@@ -288,11 +262,7 @@ else() + endif() + + # Return the date (yyyy-mm-dd) +-macro(DATE RESULT) +- execute_process(COMMAND "date" "+%Y%m%d" OUTPUT_VARIABLE ${RESULT}) +-endmacro() +-DATE(DATE_RESULT) +-string(REGEX REPLACE "\n$" "" DATE_RESULT "${DATE_RESULT}") ++string(TIMESTAMP DATE_RESULT "%Y-%m-%d" UTC) + message(STATUS "Compilation date = XX${DATE_RESULT}XX") + + set(CPACK_PACKAGE_VERSION_PATCH "${CPACK_PACKAGE_VERSION_PATCH}-${DATE_RESULT}-${FREEDV_HASH}") +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 642404962..cb0990bc2 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -81,7 +81,7 @@ else(CMAKE_CROSSCOMPILING) + # Build code generator binaries. These do not get installed. + # generate_codebook + add_executable(generate_codebook generate_codebook.c) +- target_link_libraries(generate_codebook m ${CMAKE_REQUIRED_LIBRARIES}) ++ target_link_libraries(generate_codebook m) + # Make native builds available for cross-compiling. + export(TARGETS generate_codebook + FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake) +@@ -238,12 +238,16 @@ set(CODEC2_PUBLIC_HEADERS + # + # Setup the codec2 library + # ++# Patch level version bumps should not change API/ABI. ++set(SOVERSION "${CODEC2_VERSION_MAJOR}.${CODEC2_VERSION_MINOR}") ++message(STATUS "codec2 version: ${CODEC2_VERSION}") + add_library(codec2 ${CODEC2_SRCS}) + if(UNIX) +- target_link_libraries(codec2 m) ++ target_link_libraries(codec2 PUBLIC m) + endif(UNIX) + if(LPCNET AND lpcnetfreedv_FOUND) +- target_link_libraries(codec2 lpcnetfreedv) ++ target_link_libraries(codec2 PRIVATE lpcnetfreedv) ++ list(APPEND CODEC2_PUBLIC_HEADERS ${CMAKE_SOURCE_DIR}/lpcnet/src/lpcnet_freedv.h) + endif() + include_directories(${CMAKE_CURRENT_SOURCE_DIR}) + set_target_properties(codec2 PROPERTIES +@@ -269,70 +273,70 @@ export(TARGETS codec2 + ) + + add_executable(c2enc c2enc.c) +-target_link_libraries(c2enc ${CMAKE_REQUIRED_LIBRARIES} codec2) ++target_link_libraries(c2enc codec2) + + add_executable(c2dec c2dec.c) +-target_link_libraries(c2dec ${CMAKE_REQUIRED_LIBRARIES} codec2) ++target_link_libraries(c2dec codec2) + + add_executable(c2sim c2sim.c sd.c) +-target_link_libraries(c2sim ${CMAKE_REQUIRED_LIBRARIES} codec2) ++target_link_libraries(c2sim codec2) + + add_executable(fdmdv_get_test_bits fdmdv_get_test_bits.c fdmdv.c kiss_fft.c codec2_fft.c kiss_fftr.c) +-target_link_libraries(fdmdv_get_test_bits m ${CMAKE_REQUIRED_LIBRARIES}) ++target_link_libraries(fdmdv_get_test_bits m) + + add_executable(fdmdv_mod fdmdv_mod.c fdmdv.c kiss_fft.c codec2_fft.c kiss_fftr.c) +-target_link_libraries(fdmdv_mod m ${CMAKE_REQUIRED_LIBRARIES}) ++target_link_libraries(fdmdv_mod m) + + add_executable(fdmdv_demod fdmdv_demod.c fdmdv.c kiss_fft.c octave.c modem_stats.c codec2_fft.c kiss_fftr.c) +-target_link_libraries(fdmdv_demod m ${CMAKE_REQUIRED_LIBRARIES}) ++target_link_libraries(fdmdv_demod m) + + add_executable(fdmdv_put_test_bits fdmdv_put_test_bits.c fdmdv.c kiss_fft.c codec2_fft.c kiss_fftr.c) +-target_link_libraries(fdmdv_put_test_bits m ${CMAKE_REQUIRED_LIBRARIES}) ++target_link_libraries(fdmdv_put_test_bits m) + + add_executable(fdmdv_channel fdmdv_channel.c) +-target_link_libraries(fdmdv_channel ${CMAKE_REQUIRED_LIBRARIES} codec2) ++target_link_libraries(fdmdv_channel codec2) + + add_executable(insert_errors insert_errors.c) +-target_link_libraries(insert_errors ${CMAKE_REQUIRED_LIBRARIES}) ++target_link_libraries(insert_errors) + + add_executable(freedv_tx freedv_tx.c) +-target_link_libraries(freedv_tx ${CMAKE_REQUIRED_LIBRARIES} codec2) ++target_link_libraries(freedv_tx codec2) + + add_executable(freedv_rx freedv_rx.c) +-target_link_libraries(freedv_rx ${CMAKE_REQUIRED_LIBRARIES} codec2) ++target_link_libraries(freedv_rx codec2) + + add_executable(freedv_data_raw_tx freedv_data_raw_tx.c) +-target_link_libraries(freedv_data_raw_tx ${CMAKE_REQUIRED_LIBRARIES} codec2) ++target_link_libraries(freedv_data_raw_tx codec2) + + add_executable(freedv_data_raw_rx freedv_data_raw_rx.c octave.c) +-target_link_libraries(freedv_data_raw_rx ${CMAKE_REQUIRED_LIBRARIES} codec2) ++target_link_libraries(freedv_data_raw_rx codec2) + + add_executable(freedv_data_tx freedv_data_tx.c) +-target_link_libraries(freedv_data_tx ${CMAKE_REQUIRED_LIBRARIES} codec2) ++target_link_libraries(freedv_data_tx codec2) + + add_executable(freedv_data_rx freedv_data_rx.c) +-target_link_libraries(freedv_data_rx ${CMAKE_REQUIRED_LIBRARIES} codec2) ++target_link_libraries(freedv_data_rx codec2) + + add_executable(freedv_mixed_tx freedv_mixed_tx.c) +-target_link_libraries(freedv_mixed_tx ${CMAKE_REQUIRED_LIBRARIES} codec2) ++target_link_libraries(freedv_mixed_tx codec2) + + add_executable(freedv_mixed_rx freedv_mixed_rx.c) +-target_link_libraries(freedv_mixed_rx ${CMAKE_REQUIRED_LIBRARIES} codec2) ++target_link_libraries(freedv_mixed_rx codec2) + + add_executable(fsk_mod fsk_mod.c) +-target_link_libraries(fsk_mod ${CMAKE_REQUIRED_LIBRARIES} codec2) ++target_link_libraries(fsk_mod codec2) + + add_executable(fsk_mod_ext_vco fsk_mod_ext_vco.c) +-target_link_libraries(fsk_mod_ext_vco m ${CMAKE_REQUIRED_LIBRARIES}) ++target_link_libraries(fsk_mod_ext_vco m) + + add_executable(fsk_demod fsk_demod.c modem_probe.c octave.c) +-target_link_libraries(fsk_demod ${CMAKE_REQUIRED_LIBRARIES} codec2) ++target_link_libraries(fsk_demod codec2) + + add_executable(fsk_get_test_bits fsk_get_test_bits.c) + target_link_libraries(fsk_get_test_bits) + + add_executable(fsk_put_test_bits fsk_put_test_bits.c) +-target_link_libraries(fsk_put_test_bits ${CMAKE_REQUIRED_LIBRARIES} codec2) ++target_link_libraries(fsk_put_test_bits codec2) + + add_executable(framer framer.c) + target_link_libraries(framer) +@@ -341,46 +345,46 @@ add_executable(deframer deframer.c) + target_link_libraries(deframer) + + add_executable(fm_demod fm_demod.c fm.c) +-target_link_libraries(fm_demod m ${CMAKE_REQUIRED_LIBRARIES}) ++target_link_libraries(fm_demod m) + + add_executable(cohpsk_mod cohpsk_mod.c) +-target_link_libraries(cohpsk_mod ${CMAKE_REQUIRED_LIBRARIES} codec2) ++target_link_libraries(cohpsk_mod codec2) + + add_executable(ofdm_get_test_bits ofdm_get_test_bits.c) +-target_link_libraries(ofdm_get_test_bits ${CMAKE_REQUIRED_LIBRARIES} codec2) ++target_link_libraries(ofdm_get_test_bits codec2) + + add_executable(ofdm_put_test_bits ofdm_put_test_bits.c) +-target_link_libraries(ofdm_put_test_bits ${CMAKE_REQUIRED_LIBRARIES} codec2) ++target_link_libraries(ofdm_put_test_bits codec2) + + add_executable(ofdm_mod ofdm_mod.c) +-target_link_libraries(ofdm_mod ${CMAKE_REQUIRED_LIBRARIES} codec2) ++target_link_libraries(ofdm_mod codec2) + + add_executable(ofdm_demod ofdm_demod.c octave.c) +-target_link_libraries(ofdm_demod ${CMAKE_REQUIRED_LIBRARIES} codec2) ++target_link_libraries(ofdm_demod codec2) + + add_executable(fmfsk_mod fmfsk_mod.c) +-target_link_libraries(fmfsk_mod ${CMAKE_REQUIRED_LIBRARIES} codec2) ++target_link_libraries(fmfsk_mod codec2) + + add_executable(fmfsk_demod fmfsk_demod.c modem_probe.c octave.c) +-target_link_libraries(fmfsk_demod ${CMAKE_REQUIRED_LIBRARIES} codec2) ++target_link_libraries(fmfsk_demod codec2) + + add_executable(vhf_deframe_c2 vhf_deframe_c2.c) +-target_link_libraries(vhf_deframe_c2 ${CMAKE_REQUIRED_LIBRARIES} codec2) ++target_link_libraries(vhf_deframe_c2 codec2) + + add_executable(vhf_frame_c2 vhf_frame_c2.c) +-target_link_libraries(vhf_frame_c2 ${CMAKE_REQUIRED_LIBRARIES} codec2) ++target_link_libraries(vhf_frame_c2 codec2) + + add_executable(cohpsk_demod cohpsk_demod.c octave.c) +-target_link_libraries(cohpsk_demod ${CMAKE_REQUIRED_LIBRARIES} codec2) ++target_link_libraries(cohpsk_demod codec2) + + add_executable(cohpsk_get_test_bits cohpsk_get_test_bits.c) +-target_link_libraries(cohpsk_get_test_bits ${CMAKE_REQUIRED_LIBRARIES} codec2) ++target_link_libraries(cohpsk_get_test_bits codec2) + + add_executable(cohpsk_put_test_bits cohpsk_put_test_bits.c octave.c) +-target_link_libraries(cohpsk_put_test_bits ${CMAKE_REQUIRED_LIBRARIES} codec2) ++target_link_libraries(cohpsk_put_test_bits codec2) + + add_executable(ch ch.c) +-target_link_libraries(ch ${CMAKE_REQUIRED_LIBRARIES} codec2) ++target_link_libraries(ch codec2) + + add_executable(tollr tollr.c) + +@@ -388,10 +392,10 @@ add_executable(ldpc_noise ldpc_noise.c) + target_link_libraries(ldpc_noise m) + + add_executable(ldpc_enc ldpc_enc.c) +-target_link_libraries(ldpc_enc ${CMAKE_REQUIRED_LIBRARIES} codec2) ++target_link_libraries(ldpc_enc codec2) + + add_executable(ldpc_dec ldpc_dec.c) +-target_link_libraries(ldpc_dec ${CMAKE_REQUIRED_LIBRARIES} codec2) ++target_link_libraries(ldpc_dec codec2) + + install(TARGETS codec2 EXPORT codec2-config + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT lib diff --git a/package/libcodec2/libcodec2.hash b/package/libcodec2/libcodec2.hash index 795ca37006c..ba44aa015c1 100644 --- a/package/libcodec2/libcodec2.hash +++ b/package/libcodec2/libcodec2.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 14227963940d79e0ec5af810f37101b30e1c7e8555abd96c56b3c0473abac8ef libcodec2-1.0.1.tar.gz +sha256 cd9a065dd1c3477f6172a0156294f767688847e4d170103d1f08b3a075f82826 libcodec2-1.0.5.tar.gz sha256 9ebb6f82b7380a62ac74c5f0322c88e6744dedf2ebe1f54d6f088282b39844bf COPYING diff --git a/package/libcodec2/libcodec2.mk b/package/libcodec2/libcodec2.mk index b4f08a496e1..b97db8ff59d 100644 --- a/package/libcodec2/libcodec2.mk +++ b/package/libcodec2/libcodec2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCODEC2_VERSION = 1.0.1 +LIBCODEC2_VERSION = 1.0.5 LIBCODEC2_SITE = $(call github,drowe67,codec2,v$(LIBCODEC2_VERSION)) LIBCODEC2_LICENSE = LGPL-2.1 LIBCODEC2_LICENSE_FILES = COPYING diff --git a/package/libconfuse/0001-Fix-163-unterminated-username-used-with-getpwnam.patch b/package/libconfuse/0001-Fix-163-unterminated-username-used-with-getpwnam.patch new file mode 100644 index 00000000000..9ff3f5ec1cf --- /dev/null +++ b/package/libconfuse/0001-Fix-163-unterminated-username-used-with-getpwnam.patch @@ -0,0 +1,43 @@ +From d73777c2c3566fb2647727bb56d9a2295b81669b Mon Sep 17 00:00:00 2001 +From: Joachim Wiberg +Date: Fri, 2 Sep 2022 16:12:46 +0200 +Subject: [PATCH] Fix #163: unterminated username used with getpwnam() + +Signed-off-by: Joachim Wiberg + +[Retrieved (and backported) from: +https://github.com/libconfuse/libconfuse/commit/d73777c2c3566fb2647727bb56d9a2295b81669b] +Signed-off-by: Fabrice Fontaine +--- + src/confuse.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/src/confuse.c b/src/confuse.c +index 6d1fdbd..05566b5 100644 +--- a/src/confuse.c ++++ b/src/confuse.c +@@ -1894,18 +1894,20 @@ DLLIMPORT char *cfg_tilde_expand(const char *filename) + passwd = getpwuid(geteuid()); + file = filename + 1; + } else { +- /* ~user or ~user/path */ +- char *user; ++ char *user; /* ~user or ~user/path */ ++ size_t len; + + file = strchr(filename, '/'); + if (file == 0) + file = filename + strlen(filename); + +- user = malloc(file - filename); ++ len = file - filename - 1; ++ user = malloc(len + 1); + if (!user) + return NULL; + +- strncpy(user, filename + 1, file - filename - 1); ++ strncpy(user, &filename[1], len); ++ user[len] = 0; + passwd = getpwnam(user); + free(user); + } diff --git a/package/libconfuse/libconfuse.mk b/package/libconfuse/libconfuse.mk index 2beb0e4fbf8..e7c2ef0a84b 100644 --- a/package/libconfuse/libconfuse.mk +++ b/package/libconfuse/libconfuse.mk @@ -14,5 +14,8 @@ LIBCONFUSE_LICENSE_FILES = LICENSE LIBCONFUSE_CPE_ID_VENDOR = libconfuse_project LIBCONFUSE_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) +# 0001-Fix-163-unterminated-username-used-with-getpwnam.patch +LIBCONFUSE_IGNORE_CVES += CVE-2022-40320 + $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/package/libcorrect/libcorrect.hash b/package/libcorrect/libcorrect.hash index 20df38c158c..4c6289fb82d 100644 --- a/package/libcorrect/libcorrect.hash +++ b/package/libcorrect/libcorrect.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 79861750540fb3a1cc501ee217cb4d1febc4855f3fb82e5eb60906eec5379890 libcorrect-ce6c17f1f988765ae3695315d7cce1f2a2e6cf0d.tar.gz -sha256 135138cd4304aa637836758dc5edfb5f21b7d09ecc637d25288d206b151a5768 LICENSE +sha256 79861750540fb3a1cc501ee217cb4d1febc4855f3fb82e5eb60906eec5379890 libcorrect-ce6c17f1f988765ae3695315d7cce1f2a2e6cf0d.tar.gz +sha256 135138cd4304aa637836758dc5edfb5f21b7d09ecc637d25288d206b151a5768 LICENSE diff --git a/package/libcsv/libcsv.hash b/package/libcsv/libcsv.hash index 33a521d2565..c482d9fed9a 100644 --- a/package/libcsv/libcsv.hash +++ b/package/libcsv/libcsv.hash @@ -1,3 +1,3 @@ #locally computed -sha256 d9c0431cb803ceb9896ce74f683e6e5a0954e96ae1d9e4028d6e0f967bebd7e4 libcsv-3.0.3.tar.gz -sha256 6876b170378d38f65aadd271485f0a5c45beaa043a7d3de5e1636ec927922c83 COPYING.LESSER +sha256 d9c0431cb803ceb9896ce74f683e6e5a0954e96ae1d9e4028d6e0f967bebd7e4 libcsv-3.0.3.tar.gz +sha256 6876b170378d38f65aadd271485f0a5c45beaa043a7d3de5e1636ec927922c83 COPYING.LESSER diff --git a/package/libcue/libcue.hash b/package/libcue/libcue.hash index b69fb7fa2b4..93ae2dacdba 100644 --- a/package/libcue/libcue.hash +++ b/package/libcue/libcue.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 f27bc3ebb2e892cd9d32a7bee6d84576a60f955f29f748b9b487b173712f1200 libcue-2.2.1.tar.gz -sha256 c388d36583fa54e13b6d73ad924d0b68d073ed8a5771e17cb49104705df4504f LICENSE +sha256 f27bc3ebb2e892cd9d32a7bee6d84576a60f955f29f748b9b487b173712f1200 libcue-2.2.1.tar.gz +sha256 c388d36583fa54e13b6d73ad924d0b68d073ed8a5771e17cb49104705df4504f LICENSE diff --git a/package/libcuefile/libcuefile.hash b/package/libcuefile/libcuefile.hash index 47c0c2fd76b..2f737af0dc6 100644 --- a/package/libcuefile/libcuefile.hash +++ b/package/libcuefile/libcuefile.hash @@ -1,7 +1,7 @@ # From https://www.musepack.net/index.php?pg=src -md5 1a6ac52e1080fd54f0f59372345f1e4e libcuefile_r475.tar.gz +md5 1a6ac52e1080fd54f0f59372345f1e4e libcuefile_r475.tar.gz # Calculated based on the hash above -sha256 b681ca6772b3f64010d24de57361faecf426ee6182f5969fcf29b3f649133fe7 libcuefile_r475.tar.gz +sha256 b681ca6772b3f64010d24de57361faecf426ee6182f5969fcf29b3f649133fe7 libcuefile_r475.tar.gz # Hash for license file: -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/libcurl/Config.in b/package/libcurl/Config.in index d8072c0afc1..adab1ca3e6d 100644 --- a/package/libcurl/Config.in +++ b/package/libcurl/Config.in @@ -45,13 +45,18 @@ config BR2_PACKAGE_LIBCURL_EXTRA_PROTOCOLS_FEATURES - DICT - Gopher +# Packages must select that if they require a SSL/TLS-enabled libcurl. +# Those packages must also select one crypto package that can be used +# as a backend below. +config BR2_PACKAGE_LIBCURL_FORCE_TLS + bool + choice prompt "SSL/TLS library to use" config BR2_PACKAGE_LIBCURL_OPENSSL bool "OpenSSL" depends on BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL config BR2_PACKAGE_LIBCURL_BEARSSL bool "BearSSL" @@ -61,10 +66,6 @@ config BR2_PACKAGE_LIBCURL_GNUTLS bool "GnuTLS" depends on BR2_PACKAGE_GNUTLS -config BR2_PACKAGE_LIBCURL_LIBNSS - bool "NSS" - depends on BR2_PACKAGE_LIBNSS - config BR2_PACKAGE_LIBCURL_MBEDTLS bool "mbed TLS" depends on BR2_PACKAGE_MBEDTLS @@ -72,10 +73,16 @@ config BR2_PACKAGE_LIBCURL_MBEDTLS config BR2_PACKAGE_LIBCURL_WOLFSSL bool "WolfSSL" depends on BR2_PACKAGE_WOLFSSL + depends on !BR2_STATIC_LIBS # wolfssl-all select BR2_PACKAGE_WOLFSSL_ALL +comment "WolfSSL needs a toolchain w/ dynamic library" + depends on BR2_PACKAGE_WOLFSSL + depends on BR2_STATIC_LIBS + config BR2_PACKAGE_LIBCURL_TLS_NONE bool "None" + depends on !BR2_PACKAGE_LIBCURL_FORCE_TLS endchoice diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index 63d6ba306c9..371d20a6326 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-7.81.0.tar.xz.asc +# https://curl.se/download/curl-8.3.0.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 a067b688d1645183febc31309ec1f3cdce9213d02136b6a6de3d50f69c95a7d3 curl-7.81.0.tar.xz -sha256 6fd1a1c008b5ef4c4741dd188c3f8af6944c14c25afa881eb064f98fb98358e7 COPYING +sha256 376d627767d6c4f05105ab6d497b0d9aba7111770dd9d995225478209c37ea63 curl-8.3.0.tar.xz +sha256 b1d7feb949ea5023552029fbe0bf5db4f23c2f85e9b8e51e18536f0ecbf9c524 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 20ebb4f2712..dd4cf43c6aa 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.81.0 +LIBCURL_VERSION = 8.3.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ @@ -16,15 +16,22 @@ LIBCURL_CPE_ID_VENDOR = haxx LIBCURL_CPE_ID_PRODUCT = libcurl LIBCURL_INSTALL_STAGING = YES -# We disable NTLM support because it uses fork(), which doesn't work -# on non-MMU platforms. Moreover, this authentication method is -# probably almost never used. See -# http://curl.se/docs/manpage.html#--ntlm. +# 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-wb \ - --enable-hidden-symbols --with-random=/dev/urandom --disable-curldebug \ - --disable-libcurl-option --disable-ldap --disable-ldaps +LIBCURL_CONF_OPTS = \ + --disable-manual \ + --disable-ntlm \ + --disable-ntlm-wb \ + --with-random=/dev/urandom \ + --disable-curldebug \ + --disable-libcurl-option \ + --disable-ldap \ + --disable-ldaps ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) LIBCURL_CONF_OPTS += --enable-threaded-resolver @@ -32,6 +39,16 @@ else LIBCURL_CONF_OPTS += --disable-threaded-resolver endif +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +LIBCURL_CONF_OPTS += LIBS=-latomic +endif + +ifeq ($(BR2_TOOLCHAIN_HAS_SYNC_1),) +# Even though stdatomic.h does exist, link fails for __atomic_exchange_1 +# Work around this by pretending atomics aren't available. +LIBCURL_CONF_ENV += ac_cv_header_stdatomic_h=no +endif + ifeq ($(BR2_PACKAGE_LIBCURL_VERBOSE),y) LIBCURL_CONF_OPTS += --enable-verbose else @@ -40,17 +57,16 @@ endif LIBCURL_CONFIG_SCRIPTS = curl-config +ifeq ($(BR2_PACKAGE_LIBCURL_TLS_NONE),y) +LIBCURL_CONF_OPTS += --without-ssl +endif + ifeq ($(BR2_PACKAGE_LIBCURL_OPENSSL),y) LIBCURL_DEPENDENCIES += openssl -# configure adds the cross openssl dir to LD_LIBRARY_PATH which screws up -# native stuff during the rest of configure when target == host. -# Fix it by setting LD_LIBRARY_PATH to something sensible so those libs -# are found first. -LIBCURL_CONF_ENV += LD_LIBRARY_PATH=$(if $(LD_LIBRARY_PATH),$(LD_LIBRARY_PATH):)/lib:/usr/lib -LIBCURL_CONF_OPTS += --with-ssl=$(STAGING_DIR)/usr \ +LIBCURL_CONF_OPTS += --with-openssl=$(STAGING_DIR)/usr \ --with-ca-path=/etc/ssl/certs else -LIBCURL_CONF_OPTS += --without-ssl +LIBCURL_CONF_OPTS += --without-openssl endif ifeq ($(BR2_PACKAGE_LIBCURL_BEARSSL),y) @@ -68,14 +84,6 @@ else LIBCURL_CONF_OPTS += --without-gnutls endif -ifeq ($(BR2_PACKAGE_LIBCURL_LIBNSS),y) -LIBCURL_CONF_OPTS += --with-nss=$(STAGING_DIR)/usr -LIBCURL_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) `$(PKG_CONFIG_HOST_BINARY) nspr nss --cflags`" -LIBCURL_DEPENDENCIES += libnss -else -LIBCURL_CONF_OPTS += --without-nss -endif - ifeq ($(BR2_PACKAGE_LIBCURL_MBEDTLS),y) LIBCURL_CONF_OPTS += --with-mbedtls=$(STAGING_DIR)/usr LIBCURL_DEPENDENCIES += mbedtls @@ -85,6 +93,7 @@ endif ifeq ($(BR2_PACKAGE_LIBCURL_WOLFSSL),y) LIBCURL_CONF_OPTS += --with-wolfssl=$(STAGING_DIR)/usr +LIBCURL_CONF_OPTS += --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt LIBCURL_DEPENDENCIES += wolfssl else LIBCURL_CONF_OPTS += --without-wolfssl @@ -128,9 +137,9 @@ endif ifeq ($(BR2_PACKAGE_LIBGSASL),y) LIBCURL_DEPENDENCIES += libgsasl -LIBCURL_CONF_OPTS += --with-gsasl +LIBCURL_CONF_OPTS += --with-libgsasl else -LIBCURL_CONF_OPTS += --without-gsasl +LIBCURL_CONF_OPTS += --without-libgsasl endif ifeq ($(BR2_PACKAGE_LIBCURL_COOKIES_SUPPORT),y) @@ -181,17 +190,4 @@ endef LIBCURL_POST_INSTALL_TARGET_HOOKS += LIBCURL_TARGET_CLEANUP endif -HOST_LIBCURL_DEPENDENCIES = host-openssl -HOST_LIBCURL_CONF_OPTS = \ - --disable-manual \ - --disable-ntlm-wb \ - --disable-curldebug \ - --with-ssl \ - --without-gnutls \ - --without-mbedtls \ - --without-nss - -HOST_LIBCURL_POST_PATCH_HOOKS += LIBCURL_FIX_DOT_PC - $(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package/libcutl/libcutl.hash b/package/libcutl/libcutl.hash index 1e0baa7f6e9..6c0358cb3af 100644 --- a/package/libcutl/libcutl.hash +++ b/package/libcutl/libcutl.hash @@ -1,6 +1,6 @@ # From https://www.codesynthesis.com/download/libcutl/1.10/libcutl-1.10.0.tar.bz2.sha1 -sha1 2885b79529f8caeb13687d722f5c114186f56956 libcutl-1.10.0.tar.bz2 +sha1 2885b79529f8caeb13687d722f5c114186f56956 libcutl-1.10.0.tar.bz2 # Locally Computed -sha256 125163c670e372b47d5626d54379ff8fbaded6ccd5db77ac0bf5912a4017121c libcutl-1.10.0.tar.bz2 -sha256 c7aa98c5af3b67174f16b12a1fed4332a51cd524b82c69e85baa4c2c412da239 LICENSE +sha256 125163c670e372b47d5626d54379ff8fbaded6ccd5db77ac0bf5912a4017121c libcutl-1.10.0.tar.bz2 +sha256 c7aa98c5af3b67174f16b12a1fed4332a51cd524b82c69e85baa4c2c412da239 LICENSE diff --git a/package/libdaemon/libdaemon.hash b/package/libdaemon/libdaemon.hash index b5103218280..72652f0d238 100644 --- a/package/libdaemon/libdaemon.hash +++ b/package/libdaemon/libdaemon.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 fd23eb5f6f986dcc7e708307355ba3289abe03cc381fc47a80bca4a50aa6b834 libdaemon-0.14.tar.gz -sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 LICENSE +sha256 fd23eb5f6f986dcc7e708307355ba3289abe03cc381fc47a80bca4a50aa6b834 libdaemon-0.14.tar.gz +sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 LICENSE diff --git a/package/libdcadec/Config.in b/package/libdcadec/Config.in deleted file mode 100644 index 2687a181874..00000000000 --- a/package/libdcadec/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_LIBDCADEC - bool "libdcadec" - help - dcadec is a free DTS Coherent Acoustics decoder with support - for HD extensions. - - https://github.com/foo86/dcadec diff --git a/package/libdcadec/libdcadec.hash b/package/libdcadec/libdcadec.hash deleted file mode 100644 index d3a9ae7d4c5..00000000000 --- a/package/libdcadec/libdcadec.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 ed9d207fde3e8d576f3af8b0d1235b3371e315175757173689104efcaebf0d44 libdcadec-0.2.0.tar.gz -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPLv2.1 diff --git a/package/libdcadec/libdcadec.mk b/package/libdcadec/libdcadec.mk deleted file mode 100644 index a3579ad6323..00000000000 --- a/package/libdcadec/libdcadec.mk +++ /dev/null @@ -1,33 +0,0 @@ -################################################################################ -# -# libdcadec -# -################################################################################ - -LIBDCADEC_VERSION = 0.2.0 -LIBDCADEC_SITE = $(call github,foo86,dcadec,v$(LIBDCADEC_VERSION)) -LIBDCADEC_LICENSE = LGPL-2.1+ -LIBDCADEC_LICENSE_FILES = COPYING.LGPLv2.1 -LIBDCADEC_INSTALL_STAGING = YES - -ifeq ($(BR2_STATIC_LIBS),) -LIBDCADEC_SHARED = CONFIG_SHARED=1 -endif - -define LIBDCADEC_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS) -std=gnu99" \ - $(LIBDCADEC_SHARED) -C $(@D) -endef - -define LIBDCADEC_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ - $(LIBDCADEC_SHARED) DESTDIR=$(STAGING_DIR) PREFIX=/usr install -endef - -define LIBDCADEC_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ - $(LIBDCADEC_SHARED) DESTDIR=$(TARGET_DIR) PREFIX=/usr install -endef - -$(eval $(generic-package)) diff --git a/package/libdeflate/0001-lib-arm-crc32-use-crypto-target-when-required-due-to-gcc-bug.patch b/package/libdeflate/0001-lib-arm-crc32-use-crypto-target-when-required-due-to-gcc-bug.patch new file mode 100644 index 00000000000..8823ec4b39d --- /dev/null +++ b/package/libdeflate/0001-lib-arm-crc32-use-crypto-target-when-required-due-to-gcc-bug.patch @@ -0,0 +1,90 @@ +From f8f022e5bc574088ae80327ea5f88a8fe09b48c8 Mon Sep 17 00:00:00 2001 +From: Eric Biggers +Date: Sun, 25 Dec 2022 15:05:52 -0800 +Subject: [PATCH] lib/arm/crc32: use crypto target when required due to gcc bug + +Fixes https://github.com/ebiggers/libdeflate/issues/280 +Fixes: 6db64ab7afd2 ("lib/crc32: CRC-32 optimizations and other improvements") +[Retrieved from: +https://github.com/ebiggers/libdeflate/commit/f8f022e5bc574088ae80327ea5f88a8fe09b48c8] +Signed-off-by: Fabrice Fontaine +--- + lib/arm/cpu_features.h | 23 +++++++++++++++++++++++ + lib/arm/crc32_impl.h | 9 +++++---- + 2 files changed, 28 insertions(+), 4 deletions(-) + +diff --git a/lib/arm/cpu_features.h b/lib/arm/cpu_features.h +index 204c0cd5..4092eba8 100644 +--- a/lib/arm/cpu_features.h ++++ b/lib/arm/cpu_features.h +@@ -116,6 +116,29 @@ static inline u32 get_arm_cpu_features(void) { return 0; } + #else + # define HAVE_PMULL_INTRIN 0 + #endif ++/* ++ * Set USE_PMULL_TARGET_EVEN_IF_NATIVE if a workaround for a gcc bug that was ++ * fixed by commit 11a113d501ff ("aarch64: Simplify feature definitions") in gcc ++ * 13 is needed. A minimal program that fails to build due to this bug when ++ * compiled with -mcpu=emag, at least with gcc 10 through 12, is: ++ * ++ * static inline __attribute__((always_inline,target("+crypto"))) void f() {} ++ * void g() { f(); } ++ * ++ * The error is: ++ * ++ * error: inlining failed in call to ‘always_inline’ ‘f’: target specific option mismatch ++ * ++ * The workaround is to explicitly add the crypto target to the non-inline ++ * function g(), even though this should not be required due to -mcpu=emag ++ * enabling 'crypto' natively and causing __ARM_FEATURE_CRYPTO to be defined. ++ */ ++#if HAVE_PMULL_NATIVE && defined(ARCH_ARM64) && \ ++ GCC_PREREQ(6, 1) && !GCC_PREREQ(13, 1) ++# define USE_PMULL_TARGET_EVEN_IF_NATIVE 1 ++#else ++# define USE_PMULL_TARGET_EVEN_IF_NATIVE 0 ++#endif + + /* CRC32 */ + #ifdef __ARM_FEATURE_CRC32 +diff --git a/lib/arm/crc32_impl.h b/lib/arm/crc32_impl.h +index e426a63d..b9300e4b 100644 +--- a/lib/arm/crc32_impl.h ++++ b/lib/arm/crc32_impl.h +@@ -236,7 +236,7 @@ crc32_arm_crc(u32 crc, const u8 *p, size_t len) + * for implementations that use pmull for folding the data itself. + */ + #if HAVE_CRC32_INTRIN && HAVE_PMULL_INTRIN +-# if HAVE_CRC32_NATIVE && HAVE_PMULL_NATIVE ++# if HAVE_CRC32_NATIVE && HAVE_PMULL_NATIVE && !USE_PMULL_TARGET_EVEN_IF_NATIVE + # define ATTRIBUTES + # else + # ifdef ARCH_ARM32 +@@ -438,7 +438,7 @@ crc32_arm_crc_pmullcombine(u32 crc, const u8 *p, size_t len) + #if HAVE_PMULL_INTRIN + # define crc32_arm_pmullx4 crc32_arm_pmullx4 + # define SUFFIX _pmullx4 +-# if HAVE_PMULL_NATIVE ++# if HAVE_PMULL_NATIVE && !USE_PMULL_TARGET_EVEN_IF_NATIVE + # define ATTRIBUTES + # else + # ifdef ARCH_ARM32 +@@ -558,7 +558,7 @@ crc32_arm_pmullx4(u32 crc, const u8 *p, size_t len) + #if defined(ARCH_ARM64) && HAVE_PMULL_INTRIN && HAVE_CRC32_INTRIN + # define crc32_arm_pmullx12_crc crc32_arm_pmullx12_crc + # define SUFFIX _pmullx12_crc +-# if HAVE_PMULL_NATIVE && HAVE_CRC32_NATIVE ++# if HAVE_PMULL_NATIVE && HAVE_CRC32_NATIVE && !USE_PMULL_TARGET_EVEN_IF_NATIVE + # define ATTRIBUTES + # else + # ifdef __clang__ +@@ -584,7 +584,8 @@ crc32_arm_pmullx4(u32 crc, const u8 *p, size_t len) + (HAVE_SHA3_TARGET || HAVE_SHA3_NATIVE) + # define crc32_arm_pmullx12_crc_eor3 crc32_arm_pmullx12_crc_eor3 + # define SUFFIX _pmullx12_crc_eor3 +-# if HAVE_PMULL_NATIVE && HAVE_CRC32_NATIVE && HAVE_SHA3_NATIVE ++# if HAVE_PMULL_NATIVE && HAVE_CRC32_NATIVE && HAVE_SHA3_NATIVE && \ ++ !USE_PMULL_TARGET_EVEN_IF_NATIVE + # define ATTRIBUTES + # else + # ifdef __clang__ diff --git a/package/libdeflate/0002-lib-arm-cpu_features-fix-build-error-due-to-PMULL-enabled-without-NEON.patch b/package/libdeflate/0002-lib-arm-cpu_features-fix-build-error-due-to-PMULL-enabled-without-NEON.patch new file mode 100644 index 00000000000..b13cbc48af8 --- /dev/null +++ b/package/libdeflate/0002-lib-arm-cpu_features-fix-build-error-due-to-PMULL-enabled-without-NEON.patch @@ -0,0 +1,35 @@ +From 079a6dd171583c1953017b703ec63c5367a284b4 Mon Sep 17 00:00:00 2001 +From: Eric Biggers +Date: Mon, 26 Dec 2022 11:32:47 -0800 +Subject: [PATCH] lib/arm/cpu_features: fix build error due to PMULL enabled + without NEON + +When building for soft float arm32, HAVE_PMULL_INTRIN is being set when +it shouldn't be, causing a build error: + + #error "NEON intrinsics not available with the soft-float ABI..." + +Fix this by making HAVE_PMULL_INTRIN depend on HAVE_NEON_INTRIN, as used +to be the case, in order to get the 'defined(__ARM_FP)' dependency, + +Fixes https://github.com/ebiggers/libdeflate/issues/282 +Fixes: 84c76f6f2cf5 ("lib/arm: make crc32 code work with MSVC") +[Retrieved from: +https://github.com/ebiggers/libdeflate/commit/079a6dd171583c1953017b703ec63c5367a284b4] +Signed-off-by: Fabrice Fontaine +--- + lib/arm/cpu_features.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/arm/cpu_features.h b/lib/arm/cpu_features.h +index 4092eba8..edcf7359 100644 +--- a/lib/arm/cpu_features.h ++++ b/lib/arm/cpu_features.h +@@ -97,6 +97,7 @@ static inline u32 get_arm_cpu_features(void) { return 0; } + #endif + #if HAVE_PMULL_NATIVE || \ + (HAVE_DYNAMIC_ARM_CPU_FEATURES && \ ++ HAVE_NEON_INTRIN /* needed to exclude soft float arm32 case */ && \ + (GCC_PREREQ(6, 1) || __has_builtin(__builtin_neon_vmull_p64) || \ + defined(_MSC_VER)) && \ + /* diff --git a/package/libdeflate/Config.in b/package/libdeflate/Config.in new file mode 100644 index 00000000000..d2fb0d6c55b --- /dev/null +++ b/package/libdeflate/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_LIBDEFLATE + bool "libdeflate" + help + Libdeflate is a heavily optimized library for DEFLATE/zlib/ + gzip compression and decompression + + https://github.com/ebiggers/libdeflate diff --git a/package/libdeflate/libdeflate.hash b/package/libdeflate/libdeflate.hash new file mode 100644 index 00000000000..79de3439d7b --- /dev/null +++ b/package/libdeflate/libdeflate.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 58b95040df7383dc0413defb700d9893c194732474283cc4c8f144b00a68154b libdeflate-1.15.tar.gz +sha256 5d246dd2537307b80fed9ba5fdddf5d0fe7a8f023393a071182b9daed56b40fe COPYING diff --git a/package/libdeflate/libdeflate.mk b/package/libdeflate/libdeflate.mk new file mode 100644 index 00000000000..c09a0333251 --- /dev/null +++ b/package/libdeflate/libdeflate.mk @@ -0,0 +1,38 @@ +################################################################################ +# +# libdeflate +# +################################################################################ + +LIBDEFLATE_VERSION = 1.15 +LIBDEFLATE_SITE = $(call github,ebiggers,libdeflate,v$(LIBDEFLATE_VERSION)) +LIBDEFLATE_LICENSE = MIT +LIBDEFLATE_LICENSE_FILES = COPYING +LIBDEFLATE_INSTALL_STAGING = YES + +LIBDEFLATE_CFLAGS = -D_DEFAULT_SOURCE + +# Thumb build is broken, build in ARM mode, since all architectures +# that support Thumb1 also support ARM. +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +LIBDEFLATE_CFLAGS += -marm +endif + +LIBDEFLATE_CONF_OPTS = \ + -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) $(LIBDEFLATE_CFLAGS)" + +ifeq ($(BR2_SHARED_LIBS),y) +LIBDEFLATE_CONF_OPTS += \ + -DLIBDEFLATE_BUILD_SHARED_LIB=ON \ + -DLIBDEFLATE_BUILD_STATIC_LIB=OFF +else ifeq ($(BR2_STATIC_LIBS),y) +LIBDEFLATE_CONF_OPTS += \ + -DLIBDEFLATE_BUILD_SHARED_LIB=OFF \ + -DLIBDEFLATE_BUILD_STATIC_LIB=ON +else ifeq ($(BR2_SHARED_STATIC_LIBS),y) +LIBDEFLATE_CONF_OPTS += \ + -DLIBDEFLATE_BUILD_SHARED_LIB=ON \ + -DLIBDEFLATE_BUILD_STATIC_LIB=ON +endif + +$(eval $(cmake-package)) diff --git a/package/libdill/Config.in b/package/libdill/Config.in new file mode 100644 index 00000000000..2376fc96983 --- /dev/null +++ b/package/libdill/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_LIBDILL + bool "libdill" + help + Libdill is a C library that makes writing structured + concurrent programs easy. + + http://libdill.org diff --git a/package/libdill/libdill.hash b/package/libdill/libdill.hash new file mode 100644 index 00000000000..2f74b762c6a --- /dev/null +++ b/package/libdill/libdill.hash @@ -0,0 +1,3 @@ +# sha256 locally computed +sha256 a883a38d4073f43612b3221f908428ce9f663f940e5dd89c8dfad14058890380 libdill-32d0e8b733416208e0412a56490332772bc5c6e1.tar.gz +sha256 3f78d9c42c8919cb6dc63e51de17b9eb40a49d9cdd876ce59e77392721e8c2c6 COPYING diff --git a/package/libdill/libdill.mk b/package/libdill/libdill.mk new file mode 100644 index 00000000000..9dda81d085e --- /dev/null +++ b/package/libdill/libdill.mk @@ -0,0 +1,28 @@ +################################################################################ +# +# libdill +# +################################################################################ + +LIBDILL_VERSION = 32d0e8b733416208e0412a56490332772bc5c6e1 +LIBDILL_SITE = $(call github,sustrik,libdill,$(LIBDILL_VERSION)) +LIBDILL_LICENSE = MIT +LIBDILL_LICENSE_FILES = COPYING +LIBDILL_INSTALL_STAGING = YES +# Fetched from Github, with no configure script +LIBDILL_AUTORECONF = YES + +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +LIBDILL_CONF_OPTS += --enable-threads +else +LIBDILL_CONF_OPTS += --disable-threads +endif + +ifeq ($(BR2_PACKAGE_OPENSSL),y) +LIBDILL_DEPENDENCIES += host-pkgconf openssl +LIBDILL_CONF_OPTS += --enable-tls +else +LIBDILL_CONF_OPTS += --disable-tls +endif + +$(eval $(autotools-package)) diff --git a/package/libdmtx/libdmtx.hash b/package/libdmtx/libdmtx.hash index 98eef9aeeb7..8b176d737a1 100644 --- a/package/libdmtx/libdmtx.hash +++ b/package/libdmtx/libdmtx.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 be0c5275695a732a5f434ded1fcc232aa63b1a6015c00044fe87f3a689b75f2e libdmtx-0.7.5.tar.gz +sha256 7aa62adcefdd6e24bdabeb82b3ce41a8d35f4a0c95ab0c4438206aecafd6e1a1 libdmtx-0.7.7.tar.gz sha256 fcc277b7302645322c63de22b9b0bdae2df3dfa7d6cbc0d5bed7a4d3f1a9af79 LICENSE diff --git a/package/libdmtx/libdmtx.mk b/package/libdmtx/libdmtx.mk index 04e089f1f79..00d37fb94e8 100644 --- a/package/libdmtx/libdmtx.mk +++ b/package/libdmtx/libdmtx.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBDMTX_VERSION = 0.7.5 +LIBDMTX_VERSION = 0.7.7 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/libdnet/0001-python-makefile.patch b/package/libdnet/0001-python-makefile.patch index eae22b2f14c..e5526482ed0 100644 --- a/package/libdnet/0001-python-makefile.patch +++ b/package/libdnet/0001-python-makefile.patch @@ -6,6 +6,8 @@ Subject: [PATCH] python makefile Signed-off-by: Peter Korsgaard [adam: refresh for 1.14; make it git-formatted] Signed-off-by: Adam Duskett +[Fabrice: updated for 1.16.1] +Signed-off-by: Fabrice Fontaine --- python/Makefile.am | 1 + 1 file changed, 1 insertion(+) @@ -15,9 +17,9 @@ index 1a74ef2..59fe0f3 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -11,6 +11,7 @@ $(srcdir)/dnet.c: $(srcdir)/dnet.pyx - pyrexc $(srcdir)/dnet.pyx - python-build: $(srcdir)/dnet.c + + python-build: + CC="$(CC)" LDSHARED="$(CC) -shared" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" $(PYTHON) setup.py build_ext -I$(PYINCDIR) -L$(PYLIBDIR) $(PYTHON) setup.py build touch python-build diff --git a/package/libdnet/0002-Correct-path-to-string-h-from-bsd.patch b/package/libdnet/0002-Correct-path-to-string-h-from-bsd.patch new file mode 100644 index 00000000000..2aa4f4516b0 --- /dev/null +++ b/package/libdnet/0002-Correct-path-to-string-h-from-bsd.patch @@ -0,0 +1,26 @@ +From 347c23da1ec6f19b0b0143d53edcc209e522bbf2 Mon Sep 17 00:00:00 2001 +From: Oliver Falk +Date: Wed, 29 Jun 2022 13:27:45 +0200 +Subject: [PATCH] Correct path to string.h (from bsd); Fixes #74 + +[Retrieved (and backported) from: +https://github.com/ofalk/libdnet/commit/347c23da1ec6f19b0b0143d53edcc209e522bbf2] +Signed-off-by: Fabrice Fontaine +--- + python/dnet.c | 64 +++++++++++++++++++++++-------------------------- + python/dnet.pyx | 2 +- + 2 files changed, 31 insertions(+), 35 deletions(-) + +diff --git a/python/dnet.pyx b/python/dnet.pyx +index d9cbc90..af65a11 100644 +--- a/python/dnet.pyx ++++ b/python/dnet.pyx +@@ -40,7 +40,7 @@ cdef extern from *: + unsigned long htonl(unsigned long n) + unsigned long ntohl(unsigned long n) + +-cdef extern from "string.h": ++cdef extern from "bsd/string.h": + int strlcpy(char *dst, char *src, int size) + + cdef __memcpy(char *dst, object src, int n): diff --git a/package/libdnet/Config.in b/package/libdnet/Config.in index f853e4e12d9..473e8aea228 100644 --- a/package/libdnet/Config.in +++ b/package/libdnet/Config.in @@ -10,11 +10,22 @@ if BR2_PACKAGE_LIBDNET config BR2_PACKAGE_LIBDNET_PYTHON bool "libdnet python module" + depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS depends on BR2_PACKAGE_PYTHON3 + depends on !BR2_STATIC_LIBS # libbsd + depends on BR2_TOOLCHAIN_HAS_THREADS # libbsd + depends on BR2_USE_WCHAR # libbsd + select BR2_PACKAGE_LIBBSD help dnet module for python comment "dnet module for python requires python3 package" + depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS depends on !BR2_PACKAGE_PYTHON3 +comment "dnet module for python needs a toolchain w/ dynamic library, threads, wchar" + depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_USE_WCHAR + endif diff --git a/package/libdnet/libdnet.hash b/package/libdnet/libdnet.hash index d322a1cc294..c31ec905966 100644 --- a/package/libdnet/libdnet.hash +++ b/package/libdnet/libdnet.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 592599c54a57102a177270f3a2caabda2c2ac7768b977d7458feba97da923dfe libdnet-1.14.tar.gz +sha256 b151c4913758ef80daf4558361b4f2680a37b01d59272625bb78c77183062c63 libdnet-1.16.1.tar.gz sha256 6b46ec86e290066c47b6607d322135b3c473566e7225ac23d35a7c0588a82da6 LICENSE diff --git a/package/libdnet/libdnet.mk b/package/libdnet/libdnet.mk index 4c58ea20a5c..14af07e6d55 100644 --- a/package/libdnet/libdnet.mk +++ b/package/libdnet/libdnet.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBDNET_VERSION = 1.14 +LIBDNET_VERSION = 1.16.1 LIBDNET_SITE = $(call github,ofalk,libdnet,libdnet-$(LIBDNET_VERSION)) LIBDNET_LICENSE = BSD-3-Clause LIBDNET_LICENSE_FILES = LICENSE @@ -14,9 +14,10 @@ LIBDNET_CONF_OPTS = \ --with-gnu-ld \ --with-check=no LIBDNET_CONFIG_SCRIPTS = dnet-config +LIBDNET_DEPENDENCIES = host-pkgconf ifeq ($(BR2_PACKAGE_LIBDNET_PYTHON),y) -LIBDNET_DEPENDENCIES += host-python-cython python3 +LIBDNET_DEPENDENCIES += libbsd host-python-cython python3 LIBDNET_CONF_OPTS += --with-python=$(HOST_DIR)/bin LIBDNET_MAKE_ENV += $(PKG_PYTHON_DISTUTILS_ENV) LIBDNET_INSTALL_TARGET_OPTS = $(LIBDNET_MAKE_OPTS) DESTDIR=$(TARGET_DIR) INSTALL_STRIP_FLAG=-s install-exec diff --git a/package/libdri2/libdri2.hash b/package/libdri2/libdri2.hash index 4cb360ff6b9..dbaccbdd6bb 100644 --- a/package/libdri2/libdri2.hash +++ b/package/libdri2/libdri2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7c427f5c3fbda3d1df1dc77129e87605f4af1f3ad2adf2653c560d1703aa4395 libdri2-4f1eef3183df2b270c3d5cbef07343ee5127a6a4.tar.gz -sha256 4fac4d581d00f11c459d68b7cb970f3d4e5a5bbfb53784d85f59a90076280301 COPYING +sha256 7c427f5c3fbda3d1df1dc77129e87605f4af1f3ad2adf2653c560d1703aa4395 libdri2-4f1eef3183df2b270c3d5cbef07343ee5127a6a4.tar.gz +sha256 4fac4d581d00f11c459d68b7cb970f3d4e5a5bbfb53784d85f59a90076280301 COPYING diff --git a/package/libdrm/libdrm.hash b/package/libdrm/libdrm.hash index ca7332dd767..87cc1706170 100644 --- a/package/libdrm/libdrm.hash +++ b/package/libdrm/libdrm.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/dri-devel/2021-November/332386.html -sha256 629352e08c1fe84862ca046598d8a08ce14d26ab25ee1f4704f993d074cb7f26 libdrm-2.4.109.tar.xz -sha512 45194bb28207421afcff3e247930d2eeab77a5fea58e6be22f67525f2e0aab2f410a9ae0ab315b55ef56b80c481bba40b1660468b7cda539758b2bbb8e814fd8 libdrm-2.4.109.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-February/003323.html +sha256 554cfbfe0542bddb391b4e3e05bfbbfc3e282b955bd56218d21c0616481f65eb libdrm-2.4.115.tar.xz +sha512 0c38d3cfd76f627b899f052527c2939d5fc87a417422dceb0761839ba21e69736703a87ba170b5ba7a4aca2506a240760c8c97ca1781a7fb78468225295293bd libdrm-2.4.115.tar.xz # Hash for license file sha256 d0a616a9020dc0271e36e6dd4bad174b4e2c2a42636f13785f8e18dd5f85fd83 data/meson.build diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk index 9b614bf4212..52ac13b7d02 100644 --- a/package/libdrm/libdrm.mk +++ b/package/libdrm/libdrm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBDRM_VERSION = 2.4.109 +LIBDRM_VERSION = 2.4.115 LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.xz LIBDRM_SITE = https://dri.freedesktop.org/libdrm LIBDRM_LICENSE = MIT @@ -16,8 +16,8 @@ LIBDRM_DEPENDENCIES = \ host-pkgconf LIBDRM_CONF_OPTS = \ - -Dcairo-tests=false \ - -Dman-pages=false + -Dcairo-tests=disabled \ + -Dman-pages=disabled ifeq ($(BR2_PACKAGE_LIBATOMIC_OPS),y) LIBDRM_DEPENDENCIES += libatomic_ops @@ -27,70 +27,70 @@ endif endif ifeq ($(BR2_PACKAGE_LIBDRM_INTEL),y) -LIBDRM_CONF_OPTS += -Dintel=true +LIBDRM_CONF_OPTS += -Dintel=enabled LIBDRM_DEPENDENCIES += libpciaccess else -LIBDRM_CONF_OPTS += -Dintel=false +LIBDRM_CONF_OPTS += -Dintel=disabled endif ifeq ($(BR2_PACKAGE_LIBDRM_RADEON),y) -LIBDRM_CONF_OPTS += -Dradeon=true +LIBDRM_CONF_OPTS += -Dradeon=enabled else -LIBDRM_CONF_OPTS += -Dradeon=false +LIBDRM_CONF_OPTS += -Dradeon=disabled endif ifeq ($(BR2_PACKAGE_LIBDRM_AMDGPU),y) -LIBDRM_CONF_OPTS += -Damdgpu=true +LIBDRM_CONF_OPTS += -Damdgpu=enabled else -LIBDRM_CONF_OPTS += -Damdgpu=false +LIBDRM_CONF_OPTS += -Damdgpu=disabled endif ifeq ($(BR2_PACKAGE_LIBDRM_NOUVEAU),y) -LIBDRM_CONF_OPTS += -Dnouveau=true +LIBDRM_CONF_OPTS += -Dnouveau=enabled else -LIBDRM_CONF_OPTS += -Dnouveau=false +LIBDRM_CONF_OPTS += -Dnouveau=disabled endif ifeq ($(BR2_PACKAGE_LIBDRM_VMWGFX),y) -LIBDRM_CONF_OPTS += -Dvmwgfx=true +LIBDRM_CONF_OPTS += -Dvmwgfx=enabled else -LIBDRM_CONF_OPTS += -Dvmwgfx=false +LIBDRM_CONF_OPTS += -Dvmwgfx=disabled endif ifeq ($(BR2_PACKAGE_LIBDRM_OMAP),y) -LIBDRM_CONF_OPTS += -Domap=true +LIBDRM_CONF_OPTS += -Domap=enabled else -LIBDRM_CONF_OPTS += -Domap=false +LIBDRM_CONF_OPTS += -Domap=disabled endif ifeq ($(BR2_PACKAGE_LIBDRM_ETNAVIV),y) -LIBDRM_CONF_OPTS += -Detnaviv=true +LIBDRM_CONF_OPTS += -Detnaviv=enabled else -LIBDRM_CONF_OPTS += -Detnaviv=false +LIBDRM_CONF_OPTS += -Detnaviv=disabled endif ifeq ($(BR2_PACKAGE_LIBDRM_EXYNOS),y) -LIBDRM_CONF_OPTS += -Dexynos=true +LIBDRM_CONF_OPTS += -Dexynos=enabled else -LIBDRM_CONF_OPTS += -Dexynos=false +LIBDRM_CONF_OPTS += -Dexynos=disabled endif ifeq ($(BR2_PACKAGE_LIBDRM_FREEDRENO),y) -LIBDRM_CONF_OPTS += -Dfreedreno=true +LIBDRM_CONF_OPTS += -Dfreedreno=enabled else -LIBDRM_CONF_OPTS += -Dfreedreno=false +LIBDRM_CONF_OPTS += -Dfreedreno=disabled endif ifeq ($(BR2_PACKAGE_LIBDRM_TEGRA),y) -LIBDRM_CONF_OPTS += -Dtegra=true +LIBDRM_CONF_OPTS += -Dtegra=enabled else -LIBDRM_CONF_OPTS += -Dtegra=false +LIBDRM_CONF_OPTS += -Dtegra=disabled endif ifeq ($(BR2_PACKAGE_LIBDRM_VC4),y) -LIBDRM_CONF_OPTS += -Dvc4=true +LIBDRM_CONF_OPTS += -Dvc4=enabled else -LIBDRM_CONF_OPTS += -Dvc4=false +LIBDRM_CONF_OPTS += -Dvc4=disabled endif ifeq ($(BR2_PACKAGE_HAS_UDEV),y) @@ -101,10 +101,10 @@ LIBDRM_CONF_OPTS += -Dudev=false endif ifeq ($(BR2_PACKAGE_VALGRIND),y) -LIBDRM_CONF_OPTS += -Dvalgrind=true +LIBDRM_CONF_OPTS += -Dvalgrind=enabled LIBDRM_DEPENDENCIES += valgrind else -LIBDRM_CONF_OPTS += -Dvalgrind=false +LIBDRM_CONF_OPTS += -Dvalgrind=disabled endif ifeq ($(BR2_PACKAGE_LIBDRM_INSTALL_TESTS),y) diff --git a/package/libdvbcsa/libdvbcsa.hash b/package/libdvbcsa/libdvbcsa.hash index 55ad51b5957..03ac761255a 100644 --- a/package/libdvbcsa/libdvbcsa.hash +++ b/package/libdvbcsa/libdvbcsa.hash @@ -1,7 +1,7 @@ # From http://download.videolan.org/pub/videolan/libdvbcsa/1.1.0/libdvbcsa-1.1.0.tar.gz.sha256 -sha256 4db78af5cdb2641dfb1136fe3531960a477c9e3e3b6ba19a2754d046af3f456d libdvbcsa-1.1.0.tar.gz +sha256 4db78af5cdb2641dfb1136fe3531960a477c9e3e3b6ba19a2754d046af3f456d libdvbcsa-1.1.0.tar.gz # From http://download.videolan.org/pub/videolan/libdvbcsa/1.1.0/libdvbcsa-1.1.0.tar.gz.sha1 -sha1 5f4640a7e93ae6494f24a881414e5c343f803365 libdvbcsa-1.1.0.tar.gz +sha1 5f4640a7e93ae6494f24a881414e5c343f803365 libdvbcsa-1.1.0.tar.gz # Hash for license file: -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/libdvbpsi/libdvbpsi.hash b/package/libdvbpsi/libdvbpsi.hash index 727b1cf4974..acf43488d40 100644 --- a/package/libdvbpsi/libdvbpsi.hash +++ b/package/libdvbpsi/libdvbpsi.hash @@ -1,6 +1,6 @@ # From http://download.videolan.org/pub/libdvbpsi/1.3.3/libdvbpsi-1.3.3.tar.bz2.md5 -md5 9b556ab08bb62a8bec61f5c1649bc9a8 libdvbpsi-1.3.3.tar.bz2 +md5 9b556ab08bb62a8bec61f5c1649bc9a8 libdvbpsi-1.3.3.tar.bz2 # From http://download.videolan.org/pub/libdvbpsi/1.3.3/libdvbpsi-1.3.3.tar.bz2.sha256 -sha256 02b5998bcf289cdfbd8757bedd5987e681309b0a25b3ffe6cebae599f7a00112 libdvbpsi-1.3.3.tar.bz2 +sha256 02b5998bcf289cdfbd8757bedd5987e681309b0a25b3ffe6cebae599f7a00112 libdvbpsi-1.3.3.tar.bz2 # Hash for license file: -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libdvdread/libdvdread.hash b/package/libdvdread/libdvdread.hash index de9afcfa30f..7fe0210727e 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.2/libdvdread-6.1.2.tar.bz2.sha1 -sha1 789d0780fbdcd7d6dadf0fda3d4a4b6198c16393 libdvdread-6.1.2.tar.bz2 -# From http://download.videolan.org/pub/videolan/libdvdread/6.1.2/libdvdread-6.1.2.tar.bz2.sha256 -sha256 cc190f553758ced7571859e301f802cb4821f164d02bfacfd320c14a4e0da763 libdvdread-6.1.2.tar.bz2 +# 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 # Hash for license file: sha256 d6cb0e9e560f51085556949a84af12b79a00f10ab8b66c752537faf7cd665572 COPYING diff --git a/package/libdvdread/libdvdread.mk b/package/libdvdread/libdvdread.mk index 9ddb6721c7a..bc486891ce5 100644 --- a/package/libdvdread/libdvdread.mk +++ b/package/libdvdread/libdvdread.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBDVDREAD_VERSION = 6.1.2 +LIBDVDREAD_VERSION = 6.1.3 LIBDVDREAD_SOURCE = libdvdread-$(LIBDVDREAD_VERSION).tar.bz2 LIBDVDREAD_SITE = http://www.videolan.org/pub/videolan/libdvdread/$(LIBDVDREAD_VERSION) LIBDVDREAD_INSTALL_STAGING = YES diff --git a/package/libeXosip2/0001-src-eXtl_dtls.c-fix-build-with-libressl-3.4.1.patch b/package/libeXosip2/0001-src-eXtl_dtls.c-fix-build-with-libressl-3.4.1.patch new file mode 100644 index 00000000000..0b4be43b6c7 --- /dev/null +++ b/package/libeXosip2/0001-src-eXtl_dtls.c-fix-build-with-libressl-3.4.1.patch @@ -0,0 +1,43 @@ +From 4201c0ff3fd75e09025d515c427f85f9fec89621 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 5 Apr 2022 22:27:35 +0200 +Subject: [PATCH] src/eXtl_dtls.c: fix build with libressl >= 3.4.1 + +Fix the following build failure with libressl >= 3.4.1 which provides +SSL_set0_rbio() since +https://github.com/libressl-portable/openbsd/commit/c99939f9665a9c3c648682b4987df46600b70efc: + +In file included from eXtl_dtls.c:82: +/home/autobuild/autobuild/instance-4/output-1/host/x86_64-buildroot-linux-musl/sysroot/usr/include/openssl/ssl.h:1272:6: note: previous declaration of 'SSL_set0_rbio' was here + 1272 | void SSL_set0_rbio(SSL *s, BIO *rbio); + | ^~~~~~~~~~~~~ +eXtl_dtls.c: In function 'SSL_set0_rbio': +eXtl_dtls.c:108:17: error: invalid use of incomplete typedef 'SSL' {aka 'struct ssl_st'} + 108 | BIO_free_all(s->rbio); + | ^~ + +Fixes: + - http://autobuild.buildroot.org/results/dfafdbf71b31fbda1b5ba491ac35239af4a20aa2 + +Signed-off-by: Fabrice Fontaine +[Upstream status: sent to amoizard@antisip.com] +--- + src/eXtl_dtls.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/eXtl_dtls.c b/src/eXtl_dtls.c +index 07c0dc2..d0bd7dc 100644 +--- a/src/eXtl_dtls.c ++++ b/src/eXtl_dtls.c +@@ -102,7 +102,7 @@ + #define RANDOM "random.pem" + #define DHFILE "dh1024.pem" + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x3040100L) + + static void SSL_set0_rbio(SSL *s, BIO *rbio) { + BIO_free_all(s->rbio); +-- +2.35.1 + diff --git a/package/libeastl/Config.in b/package/libeastl/Config.in index 5abea8f8106..738b293be48 100644 --- a/package/libeastl/Config.in +++ b/package/libeastl/Config.in @@ -11,6 +11,7 @@ config BR2_PACKAGE_LIBEASTL depends on BR2_PACKAGE_LIBEASTL_ARCH_SUPPORTS depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 + depends on BR2_TOOLCHAIN_HAS_THREADS help EASTL stands for Electronic Arts Standard Template Library. It is a C++ template library of containers, @@ -21,6 +22,7 @@ config BR2_PACKAGE_LIBEASTL https://github.com/electronicarts/EASTL -comment "libeastl needs a toolchain w/ C++, gcc >= 4.9" +comment "libeastl needs a toolchain w/ C++, threads, gcc >= 4.9" depends on BR2_PACKAGE_LIBEASTL_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_INSTALL_LIBSTDCPP + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP diff --git a/package/libeastl/libeastl.hash b/package/libeastl/libeastl.hash index 2d8367c0267..c7ba6da09f9 100644 --- a/package/libeastl/libeastl.hash +++ b/package/libeastl/libeastl.hash @@ -1,2 +1,2 @@ -sha256 9b3484553812b3ec3bad0857f7f675499c81f7cf4ac87e5f3b2acbe72e3a878a libeastl-45469730d641868ce05433fff2e199510c7d45c3.tar.gz -sha256 82c0243a1a62b8af01dab3bce6ed2b0852604bd508b85a561ba7d32480e598e3 LICENSE +sha256 9b3484553812b3ec3bad0857f7f675499c81f7cf4ac87e5f3b2acbe72e3a878a libeastl-45469730d641868ce05433fff2e199510c7d45c3.tar.gz +sha256 82c0243a1a62b8af01dab3bce6ed2b0852604bd508b85a561ba7d32480e598e3 LICENSE diff --git a/package/libee/libee.hash b/package/libee/libee.hash index 5ad47e162c5..4783bbc2dd8 100644 --- a/package/libee/libee.hash +++ b/package/libee/libee.hash @@ -1,5 +1,5 @@ # From http://www.libee.org/download/libee-0-4-1/ -md5 7bbf4160876c12db6193c06e2badedb2 libee-0.4.1.tar.gz +md5 7bbf4160876c12db6193c06e2badedb2 libee-0.4.1.tar.gz # Hash for license file: -sha256 275fecbf835387e042ba96884f0f05356a485a6ea8449b2c5295cc11652ad439 COPYING +sha256 275fecbf835387e042ba96884f0f05356a485a6ea8449b2c5295cc11652ad439 COPYING diff --git a/package/libenca/libenca.hash b/package/libenca/libenca.hash index 6c874b16a5f..04c9d5127f2 100644 --- a/package/libenca/libenca.hash +++ b/package/libenca/libenca.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3a487eca40b41021e2e4b7a6440b97d822e6532db5464471f572ecf77295e8b8 enca-1.19.tar.xz -sha256 87f1bd4a52b4029476b684fcdd51fed3c6b2540e462d3c2d3bfc9be4558b2825 COPYING +sha256 3a487eca40b41021e2e4b7a6440b97d822e6532db5464471f572ecf77295e8b8 enca-1.19.tar.xz +sha256 87f1bd4a52b4029476b684fcdd51fed3c6b2540e462d3c2d3bfc9be4558b2825 COPYING diff --git a/package/libepoxy/libepoxy.hash b/package/libepoxy/libepoxy.hash index 376920c3ccf..27adb70f40b 100644 --- a/package/libepoxy/libepoxy.hash +++ b/package/libepoxy/libepoxy.hash @@ -1,5 +1,5 @@ -# From http://ftp.gnome.org/pub/gnome/sources/libepoxy/1.5/libepoxy-1.5.9.sha256sum -sha256 d168a19a6edfdd9977fef1308ccf516079856a4275cf876de688fb7927e365e4 libepoxy-1.5.9.tar.xz +# From https://download.gnome.org/sources/libepoxy/1.5/libepoxy-1.5.10.sha256sum +sha256 072cda4b59dd098bba8c2363a6247299db1fa89411dc221c8b81b8ee8192e623 libepoxy-1.5.10.tar.xz # Hashes for license files: sha256 8d5144666f9c4df9bbd69b8900086d5979259152a1060421cdcc0fb9061a1c12 COPYING diff --git a/package/libepoxy/libepoxy.mk b/package/libepoxy/libepoxy.mk index 5a71fe59989..1630428844c 100644 --- a/package/libepoxy/libepoxy.mk +++ b/package/libepoxy/libepoxy.mk @@ -5,8 +5,8 @@ ################################################################################ LIBEPOXY_VERSION_MAJOR = 1.5 -LIBEPOXY_VERSION = $(LIBEPOXY_VERSION_MAJOR).9 -LIBEPOXY_SITE = http://ftp.gnome.org/pub/gnome/sources/libepoxy/$(LIBEPOXY_VERSION_MAJOR) +LIBEPOXY_VERSION = $(LIBEPOXY_VERSION_MAJOR).10 +LIBEPOXY_SITE = https://download.gnome.org/sources/libepoxy/$(LIBEPOXY_VERSION_MAJOR) LIBEPOXY_SOURCE = libepoxy-$(LIBEPOXY_VERSION).tar.xz LIBEPOXY_INSTALL_STAGING = YES LIBEPOXY_DEPENDENCIES = host-pkgconf xutil_util-macros diff --git a/package/libest/0001-java-jni-client.c-add-support-for-OpenSSL-1.1.patch b/package/libest/0001-java-jni-client.c-add-support-for-OpenSSL-1.1.patch deleted file mode 100644 index 3c0d890d3fb..00000000000 --- a/package/libest/0001-java-jni-client.c-add-support-for-OpenSSL-1.1.patch +++ /dev/null @@ -1,112 +0,0 @@ -From 8f152a6e47484056968973a71a16e4f2142213a9 Mon Sep 17 00:00:00 2001 -From: Aleksandr Makarov -Date: Mon, 13 Jul 2020 23:05:26 +0000 -Subject: [PATCH] java/jni/client.c: add support for OpenSSL 1.1 - -This shall allow the java/jni to build with and link against OpenSSL 1.1. - -Additionally, the configuration program will not attempt to process the -java/jni/ subdirectory if no --enable-jni has been specified. - -Upstream: https://github.com/cisco/libest/pull/81/. It was merged -upstream in commit 4fd7e74dc556519132b9ea4c8a0f022bd1254a31, but this -commit mixes multiple patches in one. - -Signed-off-by: Aleksandr Makarov ---- - Makefile.am | 8 ++++++-- - configure.ac | 10 ++++++---- - java/jni/client.c | 21 ++++++++++++++++----- - 3 files changed, 28 insertions(+), 11 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 10e38fd..9601de6 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,9 +1,13 @@ - ACLOCAL_AMFLAGS = -I m4 - -+if ENABLE_JNI -+libest_jni = java/jni -+endif -+ - if ENABLE_CLIENT_ONLY --SUBDIRS = safe_c_stub src java/jni example/client example/client-simple example/client-brski -+SUBDIRS = safe_c_stub src $(libest_jni) example/client example/client-simple example/client-brski - else --SUBDIRS = safe_c_stub src java/jni example/client example/client-simple example/server example/proxy example/client-brski -+SUBDIRS = safe_c_stub src $(libest_jni) example/client example/client-simple example/server example/proxy example/client-brski - endif - - EXTRA_DIST = autogen.sh example/util LICENSE README.brski $(srcdir)/build.gradle $(srcdir)/example/build_examples.gradle -diff --git a/configure.ac b/configure.ac -index e02a54d..d648030 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -35,9 +35,9 @@ AM_COND_IF([FREEBSD], AC_MSG_RESULT([Skipping libdl check]), - AC_ARG_ENABLE([jni], - [AS_HELP_STRING([--enable-jni], - [Enable support for JNI library])], -- [jni_on=1], -- [jni_on=0]) --AM_CONDITIONAL([ENABLE_JNI], [test x$jni_on = x1]) -+ [], -+ [enable_jni="no"]) -+AM_CONDITIONAL([ENABLE_JNI], [test "$enable_jni" = "yes"]) - AM_COND_IF([ENABLE_JNI], - AC_MSG_RESULT([JNI support enabled]) - AC_DEFINE([ENABLE_JNI]), -@@ -198,5 +198,7 @@ AC_PREFIX_DEFAULT([/usr/local/est]) - - cp confdefs.h est_config.h - --AC_CONFIG_FILES([Makefile version safe_c_stub/Makefile safe_c_stub/lib/Makefile java/jni/Makefile src/Makefile src/est/Makefile example/client/Makefile example/client-simple/Makefile example/client-brski/Makefile example/server/Makefile example/proxy/Makefile]) -+AC_CONFIG_FILES([Makefile version safe_c_stub/Makefile safe_c_stub/lib/Makefile src/Makefile src/est/Makefile example/client/Makefile example/client-simple/Makefile example/client-brski/Makefile example/server/Makefile example/proxy/Makefile]) -+AM_COND_IF([ENABLE_JNI], -+ [AC_CONFIG_FILES([java/jni/Makefile])]) - AC_OUTPUT -diff --git a/java/jni/client.c b/java/jni/client.c -index 9a8a34e..f7aeefc 100644 ---- a/java/jni/client.c -+++ b/java/jni/client.c -@@ -130,11 +130,18 @@ static int jni_est_client_X509_REQ_sign (X509_REQ *x, EVP_PKEY *pkey, const EVP_ - { - int rv; - EVP_PKEY_CTX *pkctx = NULL; -- EVP_MD_CTX mctx; -+ EVP_MD_CTX *mctx; - -- EVP_MD_CTX_init(&mctx); -+#ifdef HAVE_OLD_OPENSSL -+ EVP_MD_CTX md_ctx; -+ mctx = &md_ctx; - -- if (!EVP_DigestSignInit(&mctx, &pkctx, md, NULL, pkey)) { -+ EVP_MD_CTX_init(mctx); -+#else -+ mctx = EVP_MD_CTX_new(); -+#endif -+ -+ if (!EVP_DigestSignInit(mctx, &pkctx, md, NULL, pkey)) { - return 0; - } - -@@ -150,9 +157,13 @@ static int jni_est_client_X509_REQ_sign (X509_REQ *x, EVP_PKEY *pkey, const EVP_ - x->req_info->enc.modified = 1; - #endif - -- rv = X509_REQ_sign_ctx(x, &mctx); -+ rv = X509_REQ_sign_ctx(x, mctx); - -- EVP_MD_CTX_cleanup(&mctx); -+#ifdef HAVE_OLD_OPENSSL -+ EVP_MD_CTX_cleanup(mctx); -+#else -+ EVP_MD_CTX_free(mctx); -+#endif - - return (rv); - } --- -2.17.1 - diff --git a/package/libest/0002-Add-enable-disable-examples-flag-to-toggle-examples-.patch b/package/libest/0002-Add-enable-disable-examples-flag-to-toggle-examples-.patch deleted file mode 100644 index 9b35e8831d3..00000000000 --- a/package/libest/0002-Add-enable-disable-examples-flag-to-toggle-examples-.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 4bd41ea12924161baca48add39ba5ecfab2cae30 Mon Sep 17 00:00:00 2001 -From: Aleksandr Makarov -Date: Mon, 13 Jul 2020 23:42:42 +0000 -Subject: [PATCH] Add --{enable,disable}-examples flag to toggle examples - compilation - -Upstream: https://github.com/cisco/libest/pull/81/. It was merged -upstream in commit 4fd7e74dc556519132b9ea4c8a0f022bd1254a31, but this -commit mixes multiple patches in one. - -Signed-off-by: Aleksandr Makarov ---- - Makefile.am | 11 +++++++---- - configure.ac | 24 ++++++++++++++++++------ - 2 files changed, 25 insertions(+), 10 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 9601de6..e2561e7 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -4,10 +4,13 @@ if ENABLE_JNI - libest_jni = java/jni - endif - --if ENABLE_CLIENT_ONLY --SUBDIRS = safe_c_stub src $(libest_jni) example/client example/client-simple example/client-brski --else --SUBDIRS = safe_c_stub src $(libest_jni) example/client example/client-simple example/server example/proxy example/client-brski -+if ENABLE_EXAMPLES -+if ENABLE_CLIENT_ONLY -+examples = example/client example/client-simple example/client-brski -+else -+examples = example/client example/client-simple example/client-brski example/server example/proxy -+endif - endif - -+SUBDIRS = safe_c_stub src $(libest_jni) $(examples) - EXTRA_DIST = autogen.sh example/util LICENSE README.brski $(srcdir)/build.gradle $(srcdir)/example/build_examples.gradle -diff --git a/configure.ac b/configure.ac -index d648030..95b3223 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2,11 +2,6 @@ dnl Process this file with autoconf to produce a configure script. - AC_INIT([libest],[3.2.0p],[libest-dev]) - AC_CONFIG_AUX_DIR(config) - AC_CONFIG_SRCDIR(src/est/est.c) --AC_CONFIG_SRCDIR(example/client/estclient.c) --AC_CONFIG_SRCDIR(example/client-simple/estclient-simple.c) --AC_CONFIG_SRCDIR(example/client-brski/estclient-brski.c) --AC_CONFIG_SRCDIR(example/server/estserver.c) --AC_CONFIG_SRCDIR(example/proxy/estproxy.c) - AC_CONFIG_MACRO_DIR([m4]) - - AM_INIT_AUTOMAKE -@@ -80,6 +75,15 @@ AM_COND_IF([DISABLE_PTHREAD], [], - [AC_CHECK_LIB([pthread], [pthread_create], [], - [AC_MSG_FAILURE([can't find pthread lib])])]) - -+AC_ARG_ENABLE([examples], -+ [AS_HELP_STRING([--disable-examples], -+ [Disable examples compilation])], -+ [], -+ [enable_examples="yes"]) -+AC_MSG_CHECKING(whether to build examples) -+AM_CONDITIONAL([ENABLE_EXAMPLES], [test "$enable_examples" = "yes"]) -+AM_COND_IF([ENABLE_EXAMPLES], AC_MSG_RESULT([yes]), AC_MSG_RESULT([no])) -+ - AC_ARG_WITH([ssl-dir], - [AS_HELP_STRING([--with-ssl-dir], - [location of OpenSSL install folder, defaults to /usr/local/ssl])], -@@ -198,7 +202,15 @@ AC_PREFIX_DEFAULT([/usr/local/est]) - - cp confdefs.h est_config.h - --AC_CONFIG_FILES([Makefile version safe_c_stub/Makefile safe_c_stub/lib/Makefile src/Makefile src/est/Makefile example/client/Makefile example/client-simple/Makefile example/client-brski/Makefile example/server/Makefile example/proxy/Makefile]) -+AC_CONFIG_FILES([Makefile version safe_c_stub/Makefile safe_c_stub/lib/Makefile src/Makefile src/est/Makefile]) - AM_COND_IF([ENABLE_JNI], - [AC_CONFIG_FILES([java/jni/Makefile])]) -+AM_COND_IF([ENABLE_EXAMPLES], -+[ -+ AC_CONFIG_FILES([example/client/Makefile example/client-simple/Makefile example/client-brski/Makefile]) -+ AM_COND_IF([ENABLE_CLIENT_ONLY], -+ [], -+ [AC_CONFIG_FILES([example/server/Makefile example/proxy/Makefile])]) -+]) -+ - AC_OUTPUT --- -2.17.1 - diff --git a/package/libest/0003-Add-with-system-libsafec-flag-to-link-against-system.patch b/package/libest/0003-Add-with-system-libsafec-flag-to-link-against-system.patch deleted file mode 100644 index 66574cd9379..00000000000 --- a/package/libest/0003-Add-with-system-libsafec-flag-to-link-against-system.patch +++ /dev/null @@ -1,109 +0,0 @@ -From 017155b98ff3722816a52953b1079c9c8704d2ff Mon Sep 17 00:00:00 2001 -From: Aleksandr Makarov -Date: Tue, 14 Jul 2020 10:03:14 +0000 -Subject: [PATCH] Add --with-system-libsafec flag to link against system - libsafec - -Specifying the --with-system-libsafec flag shall allow the configuration -program to search for and, if found, to link against the libsafec library -that is installed in the system. - -Upstream: https://github.com/cisco/libest/pull/81/. It was merged -upstream in commit 4fd7e74dc556519132b9ea4c8a0f022bd1254a31, but this -commit mixes multiple patches in one. - -Signed-off-by: Aleksandr Makarov ---- - Makefile.am | 6 +++++- - configure.ac | 41 +++++++++++++++++++++++++++++++---------- - 2 files changed, 36 insertions(+), 11 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index e2561e7..d53b0d5 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -12,5 +12,9 @@ examples = example/client example/client-simple example/client-brski example/ser - endif - endif - --SUBDIRS = safe_c_stub src $(libest_jni) $(examples) -+if ! WITH_SYSTEM_LIBSAFEC -+builtin_libsafec = safe_c_stub -+endif -+ -+SUBDIRS = $(builtin_libsafec) src $(libest_jni) $(examples) - EXTRA_DIST = autogen.sh example/util LICENSE README.brski $(srcdir)/build.gradle $(srcdir)/example/build_examples.gradle -diff --git a/configure.ac b/configure.ac -index 95b3223..048aa3c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -10,6 +10,7 @@ AM_INIT_AUTOMAKE([subdir-objects]) - - AC_PROG_CC - AM_PROG_CC_C_O -+PKG_PROG_PKG_CONFIG - LT_INIT - AC_CANONICAL_HOST - case $host in -@@ -187,22 +188,39 @@ AC_ARG_WITH([libcoap-dir], - ] - ) - --SAFEC_STUB_DIR='$(abs_top_builddir)/safe_c_stub' --AC_SUBST(SAFEC_STUB_DIR) --safecdir="$SAFEC_STUB_DIR" --AC_SUBST([SAFEC_DIR], "$safecdir") --AC_SUBST([SAFEC_CFLAGS], "$safecdir/include") --AC_SUBST([SAFEC_LDFLAGS], "$safecdir/lib") -+AC_ARG_WITH(system-libsafec, -+ AS_HELP_STRING([--with-system-libsafec], -+ [select to use libsafec installed in the system]), -+ [], -+ [with_system_libsafec="no"]) - --CFLAGS="$CFLAGS -Wall -I$safecdir/include" --LDFLAGS="$LDFLAGS -L$safecdir/lib" --LIBS="$LIBS -lsafe_lib" -+AC_MSG_CHECKING(which libsafec to use) -+AM_CONDITIONAL([WITH_SYSTEM_LIBSAFEC], [test "$with_system_libsafec" = "yes"]) -+AM_COND_IF([WITH_SYSTEM_LIBSAFEC], AC_MSG_RESULT([system]), AC_MSG_RESULT([built-in])) -+AM_COND_IF([WITH_SYSTEM_LIBSAFEC], -+[ -+ PKG_CHECK_MODULES([libsafec], [libsafec]) -+ LIBS="$LIBS $libsafec_LIBS" -+ CFLAGS="$CFLAGS $libsafec_CFLAGS" -+ CPPFLAGS="$CPPFLAGS $libsafec_CFLAGS" -+],[ -+ SAFEC_STUB_DIR='$(abs_top_builddir)/safe_c_stub' -+ AC_SUBST(SAFEC_STUB_DIR) -+ safecdir="$SAFEC_STUB_DIR" -+ AC_SUBST([SAFEC_DIR], "$safecdir") -+ AC_SUBST([SAFEC_CFLAGS], "$safecdir/include") -+ AC_SUBST([SAFEC_LDFLAGS], "$safecdir/lib") -+ -+ CFLAGS="$CFLAGS -Wall -I$safecdir/include" -+ LDFLAGS="$LDFLAGS -L$safecdir/lib" -+ LIBS="$LIBS -lsafe_lib" -+]) - - AC_PREFIX_DEFAULT([/usr/local/est]) - - cp confdefs.h est_config.h - --AC_CONFIG_FILES([Makefile version safe_c_stub/Makefile safe_c_stub/lib/Makefile src/Makefile src/est/Makefile]) -+AC_CONFIG_FILES([Makefile version src/Makefile src/est/Makefile]) - AM_COND_IF([ENABLE_JNI], - [AC_CONFIG_FILES([java/jni/Makefile])]) - AM_COND_IF([ENABLE_EXAMPLES], -@@ -212,5 +230,8 @@ AM_COND_IF([ENABLE_EXAMPLES], - [], - [AC_CONFIG_FILES([example/server/Makefile example/proxy/Makefile])]) - ]) -+AM_COND_IF([WITH_SYSTEM_LIBSAFEC], -+ [], -+ [AC_CONFIG_FILES([safe_c_stub/Makefile safe_c_stub/lib/Makefile])]) - - AC_OUTPUT --- -2.17.1 - diff --git a/package/libest/0004-configure.ac-Fix-AC_ARG_ENABLE-AC_ARG_WITH-macros.patch b/package/libest/0004-configure.ac-Fix-AC_ARG_ENABLE-AC_ARG_WITH-macros.patch deleted file mode 100644 index f5e1b0c41a4..00000000000 --- a/package/libest/0004-configure.ac-Fix-AC_ARG_ENABLE-AC_ARG_WITH-macros.patch +++ /dev/null @@ -1,164 +0,0 @@ -From 9a76187aa4d779de39afa12024d5a73a14175371 Mon Sep 17 00:00:00 2001 -From: Aleksandr Makarov -Date: Wed, 15 Jul 2020 11:25:05 +0000 -Subject: [PATCH] configure.ac: Fix AC_ARG_ENABLE/AC_ARG_WITH macros - -Multiple tests in configure.ac are flawed: - -[--snip--] - AC_ARG_ENABLE([pthreads], - [AS_HELP_STRING([--disable-pthreads], - [Disable support for pthreads])], - [pthreads_on=1], - [pthreads_on=0]) -[--snip--] - -The third argument is "action-if-given" and the fourth argument -is "action-if-not-given" [0]. Which means that, whether you pass ---enable-pthreads or --disable-pthreads, the third argument will be -executed, that is "pthreads_on=1". And if you pass neither, the fourth -argument will be executed, i.e. "pthreads_on=0". - -We want `--enable-pthreads` and `--disable-pthreads` flags to do their job. -The right way to do that will be to eliminate "action-if-given" and replace -the user-defined `FEATURE_on=0|1` shell variables with the `enable_FEATURE` -and `with_PACKAGE` shell variables provided by Autotools. - -[0] https://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.69/autoconf.html#Package-Options - -Upstream: https://github.com/cisco/libest/pull/81/. It was merged -upstream in commit 4fd7e74dc556519132b9ea4c8a0f022bd1254a31, but this -commit mixes multiple patches in one. - -Signed-off-by: Aleksandr Makarov ---- - configure.ac | 60 ++++++++++++++++++++++++++-------------------------- - 1 file changed, 30 insertions(+), 30 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 048aa3c..0b930bf 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -43,9 +43,9 @@ AM_CONDITIONAL([JAVA_HOME_SET], [test ! -z "$JAVA_HOME"]) - AC_ARG_ENABLE([client-only], - [AS_HELP_STRING([--enable-client-only], - [Enable the building of only the client mode of libEST])], -- [clientonly_on=1], -- [clientonly_on=0]) --AM_CONDITIONAL([ENABLE_CLIENT_ONLY], [test x$clientonly_on = x1]) -+ [], -+ [enable_client_only="no"]) -+AM_CONDITIONAL([ENABLE_CLIENT_ONLY], [test "$enable_client_only" = "yes"]) - AM_COND_IF([ENABLE_CLIENT_ONLY], - AC_MSG_RESULT([Client only build enabled]) - AC_DEFINE([ENABLE_CLIENT_ONLY]), -@@ -54,9 +54,9 @@ AM_COND_IF([ENABLE_CLIENT_ONLY], - AC_ARG_ENABLE([brski], - [AS_HELP_STRING([--enable-brski], - [Enable support for brski bootstrap functionality])], -- [brski_on=1], -- [brski_on=0]) --AM_CONDITIONAL([ENABLE_BRSKI], [test x$brski_on = x1]) -+ [], -+ [enable_brski="no"]) -+AM_CONDITIONAL([ENABLE_BRSKI], [test "$enable_brski" = "yes"]) - AM_COND_IF([ENABLE_BRSKI], - AC_MSG_RESULT([BRSKI support enabled]) - AC_DEFINE([ENABLE_BRSKI]), -@@ -65,9 +65,9 @@ AM_COND_IF([ENABLE_BRSKI], - AC_ARG_ENABLE([pthreads], - [AS_HELP_STRING([--disable-pthreads], - [Disable support for pthreads])], -- [pthreads_on=1], -- [pthreads_on=0]) --AM_CONDITIONAL([DISABLE_PTHREAD], [test x$pthreads_on = x1]) -+ [], -+ [enable_pthreads="yes"]) -+AM_CONDITIONAL([DISABLE_PTHREAD], [test "$enable_pthreads" = "no"]) - AM_COND_IF([DISABLE_PTHREAD], - AC_MSG_RESULT([pthread support disabled]) - AC_DEFINE([DISABLE_PTHREADS]), -@@ -88,13 +88,13 @@ AM_COND_IF([ENABLE_EXAMPLES], AC_MSG_RESULT([yes]), AC_MSG_RESULT([no])) - AC_ARG_WITH([ssl-dir], - [AS_HELP_STRING([--with-ssl-dir], - [location of OpenSSL install folder, defaults to /usr/local/ssl])], -- [ssldir="$withval"], -- [ssldir="/usr/local/ssl"]) --AC_SUBST([SSL_CFLAGS], "$ssldir/include") --AC_SUBST([SSL_LDFLAGS], "$ssldir/lib") -+ [], -+ [with_ssl_dir="/usr/local/ssl"]) -+AC_SUBST([SSL_CFLAGS], "$with_ssl_dir/include") -+AC_SUBST([SSL_LDFLAGS], "$with_ssl_dir/lib") - --CFLAGS="$CFLAGS -Wall -I$ssldir/include" --LDFLAGS="$LDFLAGS -L$ssldir/lib" -+CFLAGS="$CFLAGS -Wall -I$with_ssl_dir/include" -+LDFLAGS="$LDFLAGS -L$with_ssl_dir/lib" - if test "$is_freebsd" = "1" ; then - AC_CHECK_LIB([crypto], [EVP_EncryptInit], [], - [AC_MSG_FAILURE([can't find openssl crypto lib])] -@@ -120,13 +120,13 @@ AC_CHECK_LIB([crypto], [EVP_CIPHER_CTX_reset], [], - AC_ARG_WITH([libcurl-dir], - [AS_HELP_STRING([--with-libcurl-dir], - [enable support for client proxy using libcurl])], -- [libcurldir="$withval"], -- [with_libcurldir=no]) -+ [], -+ [with_libcurl_dir=no]) - - AS_IF( -- [test "x$with_libcurldir" != xno], -- [[CFLAGS="$CFLAGS -I$libcurldir/include"] -- [LDFLAGS="$LDFLAGS -L$libcurldir/lib -lcurl"] -+ [test "$with_libcurl_dir" != "no"], -+ [[CFLAGS="$CFLAGS -I$with_libcurl_dir/include"] -+ [LDFLAGS="$LDFLAGS -L$with_libcurl_dir/lib -lcurl"] - AC_CHECK_LIB( - [curl], - [curl_easy_init], -@@ -143,17 +143,17 @@ AC_ARG_WITH([libcurl-dir], - AC_ARG_WITH([uriparser-dir], - [AS_HELP_STRING([--with-uriparser-dir], - [enable support for path segments using uriparser])], -- [uriparserdir="$withval"], -- [with_uriparserdir=no]) -+ [], -+ [with_uriparser_dir=no]) - - dnl CFLAGS="$CFLAGS -Wall -I$uriparserdir/include" - dnl CPPFLAGS="$CPPFLAGS -I$uriparser/include" - dnl LDFLAGS="$LDFLAGS -L$uriparserdir/lib -luriparser" - - AS_IF( -- [test "x$with_uriparserdir" != xno], -- [[CFLAGS="$CFLAGS -I$uriparserdir/include"] -- [LDFLAGS="$LDFLAGS -L$uriparserdir/lib -luriparser"] -+ [test "$with_uriparser_dir" != "no"], -+ [[CFLAGS="$CFLAGS -I$with_uriparser_dir/include"] -+ [LDFLAGS="$LDFLAGS -L$with_uriparser_dir/lib -luriparser"] - AC_CHECK_LIB( - [uriparser], - [uriParseUriA], -@@ -170,13 +170,13 @@ AC_ARG_WITH([uriparser-dir], - AC_ARG_WITH([libcoap-dir], - [AS_HELP_STRING([--with-libcoap-dir], - [enable support for ESToCoAP using libcoap library])], -- [libcoapdir="$withval"], -- [with_libcoapdir=no]) -+ [], -+ [with_libcoap_dir=no]) - - AS_IF( -- [test "x$with_libcoapdir" != xno], -- [[CFLAGS="$CFLAGS -I$libcoapdir/include"] -- [LDFLAGS="$LDFLAGS -L$libcoapdir/lib -lcoap-2-openssl"] -+ [test "$with_libcoap_dir" != "no"], -+ [[CFLAGS="$CFLAGS -I$with_libcoap_dir/include"] -+ [LDFLAGS="$LDFLAGS -L$with_libcoap_dir/lib -lcoap-2-openssl"] - AC_CHECK_LIB( - [coap-2-openssl], - [coap_startup], --- -2.17.1 - diff --git a/package/libest/Config.in b/package/libest/Config.in index d8271ad69e2..bd5f40afae9 100644 --- a/package/libest/Config.in +++ b/package/libest/Config.in @@ -6,6 +6,8 @@ config BR2_PACKAGE_LIBEST depends on !BR2_STATIC_LIBS # libexecinfo or glibc select BR2_PACKAGE_LIBEXECINFO if !BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL + select BR2_PACKAGE_SAFECLIB help libest is a C implementation of RFC 7030 (Enrollment over Secure Transport). diff --git a/package/libest/libest.hash b/package/libest/libest.hash index c902a9568fc..dc9bc052554 100644 --- a/package/libest/libest.hash +++ b/package/libest/libest.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 324b3a2b16cd14ea4234d75fa90f08b29509bac9cd3795c44268e22f906ee0ad libest-3.2.0.tar.gz +sha256 83983ac05137fd73586ddcb4874e30689fe694ee9a329797b60b3defc9a87327 libest-f8a6e5b53a5f70e72fe4029981df0693b17cbb32.tar.gz sha256 fbdb055f98babf8d86095d6f9b9e34d2ff21a8212e442b8f18bdcb403e44366c LICENSE diff --git a/package/libest/libest.mk b/package/libest/libest.mk index d9f3cf87bc3..9f3168767d5 100644 --- a/package/libest/libest.mk +++ b/package/libest/libest.mk @@ -4,22 +4,25 @@ # ################################################################################ -LIBEST_VERSION = 3.2.0 -LIBEST_SITE = $(call github,cisco,libest,r$(LIBEST_VERSION)) +LIBEST_VERSION = f8a6e5b53a5f70e72fe4029981df0693b17cbb32 +LIBEST_SITE = $(call github,cisco,libest,$(LIBEST_VERSION)) # We don't build examples, so we're not affected by the OpenSSL # license LIBEST_LICENSE = BSD-3-Clause, MIT, W3C LIBEST_LICENSE_FILES = LICENSE LIBEST_INSTALL_STAGING = YES LIBEST_AUTORECONF = YES -LIBEST_DEPENDENCIES = openssl host-pkgconf +LIBEST_DEPENDENCIES = openssl host-pkgconf safeclib # libcoap support is explicitly disabled because it breaks the build +# libsafec support is explicitly enabled because we want to avoid +# possible hidden use of bundled copy of library. LIBEST_CONF_OPTS = \ --with-ssl-dir=$(STAGING_DIR)/usr \ $(if $(BR2_TOOLCHAIN_HAS_THREADS),--enable-pthreads,--disable-pthreads) \ $(if $(BR2_PACKAGE_LIBEST_BRSKI),--enable-brski,--disable-brski) \ --disable-examples \ - --without-libcoap-dir + --without-libcoap-dir \ + --with-system-libsafec ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) LIBEST_DEPENDENCIES += libexecinfo @@ -55,13 +58,6 @@ else LIBEST_CONF_OPTS += --without-uriparser-dir endif -ifeq ($(BR2_PACKAGE_SAFECLIB),y) -LIBEST_CONF_OPTS += --with-system-libsafec -LIBEST_DEPENDENCIES += safeclib -else -LIBEST_CONF_OPTS += --without-system-libsafec -endif - define LIBEST_INSTALL_PC $(INSTALL) -c -m 0644 $(LIBEST_PKGDIR)/libest.pc \ $(STAGING_DIR)/usr/lib/pkgconfig/libest.pc diff --git a/package/libestr/libestr.hash b/package/libestr/libestr.hash index 6445d010817..61ab3278776 100644 --- a/package/libestr/libestr.hash +++ b/package/libestr/libestr.hash @@ -1,5 +1,5 @@ # From http://libestr.adiscon.com/download/libestr-0-1-11/ -sha256 46632b2785ff4a231dcf241eeb0dcb5fc0c7d4da8ee49cf5687722cdbe8b2024 libestr-0.1.11.tar.gz +sha256 46632b2785ff4a231dcf241eeb0dcb5fc0c7d4da8ee49cf5687722cdbe8b2024 libestr-0.1.11.tar.gz # Hash for license file: -sha256 835b4793da5cbb8965fbd63905b55a4cb4310b7d1b882077d23066b08f901ff8 COPYING +sha256 835b4793da5cbb8965fbd63905b55a4cb4310b7d1b882077d23066b08f901ff8 COPYING diff --git a/package/libev/libev.mk b/package/libev/libev.mk index 9f3c19d46cd..cbd5433d76e 100644 --- a/package/libev/libev.mk +++ b/package/libev/libev.mk @@ -10,6 +10,13 @@ LIBEV_INSTALL_STAGING = YES LIBEV_LICENSE = BSD-2-Clause or GPL-2.0+ LIBEV_LICENSE_FILES = LICENSE +# libev has some assembly function that is not present in Thumb mode: +# Error: selected processor does not support `mcr p15,0,r3,c7,c10,5' in Thumb mode +# so, we desactivate Thumb mode +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +LIBEV_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" +endif + # The 'compatibility' event.h header conflicts with libevent # It's completely unnecessary for BR packages so remove it define LIBEV_DISABLE_EVENT_H_INSTALL diff --git a/package/libevdev/libevdev.hash b/package/libevdev/libevdev.hash index 68a5ebdcbaf..dd76e158efd 100644 --- a/package/libevdev/libevdev.hash +++ b/package/libevdev/libevdev.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/input-tools/2021-November/001573.html -sha256 2f729e3480695791f9482e8388bd723402b89f0eaf118057bbdea3cecee9b237 libevdev-1.12.0.tar.xz -sha512 6c1c1362d5112cdf3816d1f735c27e625f5463ebf10a83d675cd9364c3fb291ebcb91c051da442f1a36ed28ba7dd99af74546707f61274f7d5715c544a0ed04c libevdev-1.12.0.tar.xz +# From https://lists.freedesktop.org/archives/input-tools/2022-March/001574.html +sha256 1dbba41bc516d3ca7abc0da5b862efe3ea8a7018fa6e9b97ce9d39401b22426c libevdev-1.12.1.tar.xz +sha512 eefce287a665e4f89eb2e0437dfefd45ecf8925c7dac35a1bdd46158541f77f2032c6146900a30a01321751d55a9b537bd1d61777cca9cfa02c39a6e31c97be4 libevdev-1.12.1.tar.xz # Hash for license files: sha256 6f13de7ce28e4948ba95170e0723ee1254c1978ce1f127af82aeca597b567cb9 COPYING diff --git a/package/libevdev/libevdev.mk b/package/libevdev/libevdev.mk index cd80154be26..726a5afcee5 100644 --- a/package/libevdev/libevdev.mk +++ b/package/libevdev/libevdev.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBEVDEV_VERSION = 1.12.0 +LIBEVDEV_VERSION = 1.12.1 LIBEVDEV_SITE = http://www.freedesktop.org/software/libevdev LIBEVDEV_SOURCE = libevdev-$(LIBEVDEV_VERSION).tar.xz LIBEVDEV_LICENSE = MIT diff --git a/package/libevent/0001-Don-t-define-BIO_get_init-for-LibreSSL-3-5.patch b/package/libevent/0001-Don-t-define-BIO_get_init-for-LibreSSL-3-5.patch new file mode 100644 index 00000000000..33c349b11d9 --- /dev/null +++ b/package/libevent/0001-Don-t-define-BIO_get_init-for-LibreSSL-3-5.patch @@ -0,0 +1,29 @@ +From 883630f76cbf512003b81de25cd96cb75c6cf0f9 Mon Sep 17 00:00:00 2001 +From: Theo Buehler +Date: Sun, 21 Nov 2021 21:38:20 +0100 +Subject: [PATCH] Don't define BIO_get_init() for LibreSSL 3.5+ + +BIO_get_init() is available in LibreSSL 3.5 and later. The BIO type +will become opaque, so the existing macro will break the build. + +[Retrieved from: +https://github.com/libevent/libevent/commit/883630f76cbf512003b81de25cd96cb75c6cf0f9] +Signed-off-by: Fabrice Fontaine +--- + openssl-compat.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/openssl-compat.h b/openssl-compat.h +index a23e34251b..f5de25539f 100644 +--- a/openssl-compat.h ++++ b/openssl-compat.h +@@ -40,7 +40,8 @@ static inline BIO_METHOD *BIO_meth_new(int type, const char *name) + #endif /* (OPENSSL_VERSION_NUMBER < 0x10100000L) || \ + (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) */ + +-#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L ++#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L && \ ++ LIBRESSL_VERSION_NUMBER < 0x30500000L + #define BIO_get_init(b) (b)->init + #endif + diff --git a/package/libfcgi/libfcgi.hash b/package/libfcgi/libfcgi.hash index 110461235f5..83860a4f3d3 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 1fe83501edfc3a7ec96bb1e69db3fd5ea1730135bd73ab152186fd0b437013bc libfcgi-2.4.2.tar.gz +sha256 f0a8fe4513a43e8eebb24cdcf9d2e7efc52e4d8259178c6d76d3d84418397d81 LICENSE.TERMS diff --git a/package/libffi/libffi.hash b/package/libffi/libffi.hash index cf1977c40db..8d2349ec21d 100644 --- a/package/libffi/libffi.hash +++ b/package/libffi/libffi.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 540fb721619a6aba3bdeef7d940d8e9e0e6d2c193595bc243241b77ff9e93620 libffi-3.4.2.tar.gz +sha256 d66c56ad259a82cf2a9dfc408b32bf5da52371500b84745f7fb8b645712df676 libffi-3.4.4.tar.gz # License files, locally calculated -sha256 a61d06e8f7be57928e71e800eb9273b05cb8868c484108afe41e4305bb320dde LICENSE +sha256 2c9c2acb9743e6b007b91350475308aee44691d96aa20eacef8e199988c8c388 LICENSE diff --git a/package/libffi/libffi.mk b/package/libffi/libffi.mk index 093256a6296..8f6844113c4 100644 --- a/package/libffi/libffi.mk +++ b/package/libffi/libffi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFFI_VERSION = 3.4.2 +LIBFFI_VERSION = 3.4.4 LIBFFI_SITE = \ https://github.com/libffi/libffi/releases/download/v$(LIBFFI_VERSION) LIBFFI_LICENSE = MIT diff --git a/package/libfreefare/libfreefare.hash b/package/libfreefare/libfreefare.hash index ed982c9dd7c..9115518a3f3 100644 --- a/package/libfreefare/libfreefare.hash +++ b/package/libfreefare/libfreefare.hash @@ -1,5 +1,5 @@ # From https://github.com/nfc-tools/libfreefare/releases/download/libfreefare-0.4.0/libfreefare-0.4.0.tar.bz2 -sha256 bfa31d14a99a1247f5ed49195d6373de512e3eb75bf1627658b40cf7f876bc64 libfreefare-0.4.0.tar.bz2 +sha256 bfa31d14a99a1247f5ed49195d6373de512e3eb75bf1627658b40cf7f876bc64 libfreefare-0.4.0.tar.bz2 # Hash for license file: -sha256 be6209dfd763a0ba77fbe990cfd2512804441d8b5f0cad927baa3341b50fcade COPYING +sha256 be6209dfd763a0ba77fbe990cfd2512804441d8b5f0cad927baa3341b50fcade COPYING diff --git a/package/libfreeglut/0001-Work-around-for-an-issue-which-cropped-up-with-the-release-of-gcc-10.patch b/package/libfreeglut/0001-Work-around-for-an-issue-which-cropped-up-with-the-release-of-gcc-10.patch deleted file mode 100644 index e98e71537f2..00000000000 --- a/package/libfreeglut/0001-Work-around-for-an-issue-which-cropped-up-with-the-release-of-gcc-10.patch +++ /dev/null @@ -1,69 +0,0 @@ -From b9998bbc1e1c329f6bf69c24606a2be7a4973b8c Mon Sep 17 00:00:00 2001 -From: jtsiomb -Date: Fri, 21 Feb 2020 22:25:31 +0000 -Subject: [PATCH] Work-around for an issue which cropped up with the release of - gcc-10. In their infinite wisdom, they decided to build with -fno-common as - default from now on, breaking every piece of C code which used to declare - common symbols in header files, as was the convention since the dawn of time. - We now have to duplicate all declarations to an arbitrary source file, and - change the header-file ones to prefix them with extern. - -git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1863 7f0cb862-5218-0410-a997-914c9d46530a -[Retrieved from: -https://github.com/dcnieho/FreeGLUT/commit/b9998bbc1e1c329f6bf69c24606a2be7a4973b8c] -Signed-off-by: Fabrice Fontaine ---- - freeglut/freeglut/src/fg_gl2.c | 14 ++++++++++++++ - freeglut/freeglut/src/fg_gl2.h | 14 +++++++------- - 2 files changed, 21 insertions(+), 7 deletions(-) - -diff --git a/src/fg_gl2.c b/src/fg_gl2.c -index 38b0acbb..54b4285b 100644 ---- a/src/fg_gl2.c -+++ b/src/fg_gl2.c -@@ -27,6 +27,20 @@ - #include "fg_internal.h" - #include "fg_gl2.h" - -+#ifndef GL_ES_VERSION_2_0 -+/* GLES2 has the corresponding entry points built-in, and these fgh-prefixed -+ * names are defined in fg_gl2.h header to reference them, for any other case, -+ * define them as function pointers here. -+ */ -+FGH_PFNGLGENBUFFERSPROC fghGenBuffers; -+FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers; -+FGH_PFNGLBINDBUFFERPROC fghBindBuffer; -+FGH_PFNGLBUFFERDATAPROC fghBufferData; -+FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray; -+FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray; -+FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer; -+#endif -+ - void FGAPIENTRY glutSetVertexAttribCoord3(GLint attrib) { - if (fgStructure.CurrentWindow != NULL) - fgStructure.CurrentWindow->Window.attribute_v_coord = attrib; -diff --git a/src/fg_gl2.h b/src/fg_gl2.h -index ab8ba5c7..fb3d4676 100644 ---- a/src/fg_gl2.h -+++ b/src/fg_gl2.h -@@ -67,13 +67,13 @@ typedef void (APIENTRY *FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index); - typedef void (APIENTRY *FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint); - typedef void (APIENTRY *FGH_PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer); - --FGH_PFNGLGENBUFFERSPROC fghGenBuffers; --FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers; --FGH_PFNGLBINDBUFFERPROC fghBindBuffer; --FGH_PFNGLBUFFERDATAPROC fghBufferData; --FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray; --FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray; --FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer; -+extern FGH_PFNGLGENBUFFERSPROC fghGenBuffers; -+extern FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers; -+extern FGH_PFNGLBINDBUFFERPROC fghBindBuffer; -+extern FGH_PFNGLBUFFERDATAPROC fghBufferData; -+extern FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray; -+extern FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray; -+extern FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer; - - # endif - diff --git a/package/libfreeglut/libfreeglut.hash b/package/libfreeglut/libfreeglut.hash index 2771cbde2f0..249a780f04d 100644 --- a/package/libfreeglut/libfreeglut.hash +++ b/package/libfreeglut/libfreeglut.hash @@ -1,6 +1,3 @@ -# From http://sourceforge.net/projects/freeglut/files/freeglut/3.2.1/ -md5 cd5c670c1086358598a6d4a9d166949d freeglut-3.2.1.tar.gz -sha1 7a62e0d2caad92ff745bc5037592b2753f0b2f20 freeglut-3.2.1.tar.gz # Locally computed -sha256 d4000e02102acaf259998c870e25214739d1f16f67f99cb35e4f46841399da68 freeglut-3.2.1.tar.gz -sha256 b6593d5ec4c113a274abb85b10e8615895cb0ddb89f7912af5fe5aa8df38a275 COPYING +sha256 3c0bcb915d9b180a97edaebd011b7a1de54583a838644dcd42bb0ea0c6f3eaec freeglut-3.4.0.tar.gz +sha256 b6593d5ec4c113a274abb85b10e8615895cb0ddb89f7912af5fe5aa8df38a275 COPYING diff --git a/package/libfreeglut/libfreeglut.mk b/package/libfreeglut/libfreeglut.mk index 379de3121bd..09309aeceb2 100644 --- a/package/libfreeglut/libfreeglut.mk +++ b/package/libfreeglut/libfreeglut.mk @@ -4,9 +4,9 @@ # ################################################################################ -LIBFREEGLUT_VERSION = 3.2.1 +LIBFREEGLUT_VERSION = 3.4.0 LIBFREEGLUT_SOURCE = freeglut-$(LIBFREEGLUT_VERSION).tar.gz -LIBFREEGLUT_SITE = http://downloads.sourceforge.net/freeglut +LIBFREEGLUT_SITE = https://github.com/FreeGLUTProject/freeglut/releases/download/v$(LIBFREEGLUT_VERSION) LIBFREEGLUT_LICENSE = MIT LIBFREEGLUT_LICENSE_FILES = COPYING LIBFREEGLUT_INSTALL_STAGING = YES diff --git a/package/libfreeimage/0004-fixed-C-11-warnings.patch b/package/libfreeimage/0004-fixed-C-11-warnings.patch new file mode 100644 index 00000000000..cf9c47303ad --- /dev/null +++ b/package/libfreeimage/0004-fixed-C-11-warnings.patch @@ -0,0 +1,94 @@ +fixed C++11 warnings + +Signed-off-by: Fabrice Fontaine +[Retrieved from: https://sourceforge.net/p/freeimage/svn/1896] + +Index: trunk/Source/FreeImage/CacheFile.cpp +=================================================================== +--- trunk/Source/FreeImage/CacheFile.cpp (révision 1895) ++++ trunk/Source/FreeImage/CacheFile.cpp (révision 1896) +@@ -147,10 +147,14 @@ + m_current_block->data = new BYTE[BLOCK_SIZE]; + + fseek(m_file, m_current_block->nr * BLOCK_SIZE, SEEK_SET); +- fread(m_current_block->data, BLOCK_SIZE, 1, m_file); +- +- m_page_cache_mem.splice(m_page_cache_mem.begin(), m_page_cache_disk, it->second); +- m_page_map[nr] = m_page_cache_mem.begin(); ++ if (fread(m_current_block->data, BLOCK_SIZE, 1, m_file) == 1) { ++ m_page_cache_mem.splice(m_page_cache_mem.begin(), m_page_cache_disk, it->second); ++ m_page_map[nr] = m_page_cache_mem.begin(); ++ } ++ else { ++ FreeImage_OutputMessageProc(FIF_UNKNOWN, "Failed to lock a block in CacheFile"); ++ return NULL; ++ } + } + + // if the memory cache size is too large, swap an item to disc +Index: trunk/Source/FreeImage/MultiPage.cpp +=================================================================== +--- trunk/Source/FreeImage/MultiPage.cpp (révision 1895) ++++ trunk/Source/FreeImage/MultiPage.cpp (révision 1896) +@@ -271,8 +271,8 @@ + } + } + +- std::auto_ptr bitmap (new FIMULTIBITMAP); +- std::auto_ptr header (new MULTIBITMAPHEADER); ++ std::unique_ptr bitmap (new FIMULTIBITMAP); ++ std::unique_ptr header (new MULTIBITMAPHEADER); + header->m_filename = filename; + // io is default + header->node = node; +@@ -339,8 +339,8 @@ + PluginNode *node = list->FindNodeFromFIF(fif); + + if (node) { +- std::auto_ptr bitmap (new FIMULTIBITMAP); +- std::auto_ptr header (new MULTIBITMAPHEADER); ++ std::unique_ptr bitmap (new FIMULTIBITMAP); ++ std::unique_ptr header (new MULTIBITMAPHEADER); + header->io = *io; + header->node = node; + header->fif = fif; +Index: trunk/Source/FreeImage/PSDParser.cpp +=================================================================== +--- trunk/Source/FreeImage/PSDParser.cpp (révision 1895) ++++ trunk/Source/FreeImage/PSDParser.cpp (révision 1896) +@@ -97,7 +97,7 @@ + template + class PSDGetValue { + public: +- static inline int get(const BYTE * iprBuffer) {} // error ++ static inline int get(const BYTE * iprBuffer) { return -1; } // error + }; + + template <> +Index: trunk/Source/FreeImage/PluginPSD.cpp +=================================================================== +--- trunk/Source/FreeImage/PluginPSD.cpp (révision 1895) ++++ trunk/Source/FreeImage/PluginPSD.cpp (révision 1896) +@@ -127,7 +127,7 @@ + static BOOL DLL_CALLCONV + Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void *data) { + if(!handle) { +- return NULL; ++ return FALSE; + } + try { + psdParser parser; +Index: trunk/Source/FreeImage/PluginHDR.cpp +=================================================================== +--- trunk/Source/FreeImage/PluginHDR.cpp (révision 1895) ++++ trunk/Source/FreeImage/PluginHDR.cpp (révision 1896) +@@ -244,7 +244,8 @@ + } + else if((buf[0] == '#') && (buf[1] == 0x20)) { + header_info->valid |= RGBE_VALID_COMMENT; +- strcpy(header_info->comment, buf); ++ strncpy(header_info->comment, buf, HDR_MAXLINE - 1); ++ header_info->comment[HDR_MAXLINE - 1] = '\0'; + } + } + if(!bHeaderFound || !bFormatFound) { diff --git a/package/libfreeimage/libfreeimage.hash b/package/libfreeimage/libfreeimage.hash index 6d8ba20409c..388f3bb52dc 100644 --- a/package/libfreeimage/libfreeimage.hash +++ b/package/libfreeimage/libfreeimage.hash @@ -1,9 +1,9 @@ # From https://sourceforge.net/projects/freeimage/files/Source%20Distribution/3.18.0/ -md5 f8ba138a3be233a3eed9c456e42e2578 FreeImage3180.zip -sha1 38daa9d8f1bca2330a2eaa42ec66fbe6ede7dce9 FreeImage3180.zip +md5 f8ba138a3be233a3eed9c456e42e2578 FreeImage3180.zip +sha1 38daa9d8f1bca2330a2eaa42ec66fbe6ede7dce9 FreeImage3180.zip # Locally computed -sha256 f41379682f9ada94ea7b34fe86bf9ee00935a3147be41b6569c9605a53e438fd FreeImage3180.zip -sha256 d51615a1a47f1ddbb027920d60d3fc30a00e1284c795a47857883e641349fadf license-gplv2.txt -sha256 084be110e3e8757d8e6945cda1fbc7e5073bbe688dc19b92c0d8440155d8e282 license-gplv3.txt -sha256 0bb9a3123297c73ae6e19c70459fb0e58f313f67ca63176fd43f8e77668b8243 license-fi.txt +sha256 f41379682f9ada94ea7b34fe86bf9ee00935a3147be41b6569c9605a53e438fd FreeImage3180.zip +sha256 d51615a1a47f1ddbb027920d60d3fc30a00e1284c795a47857883e641349fadf license-gplv2.txt +sha256 084be110e3e8757d8e6945cda1fbc7e5073bbe688dc19b92c0d8440155d8e282 license-gplv3.txt +sha256 0bb9a3123297c73ae6e19c70459fb0e58f313f67ca63176fd43f8e77668b8243 license-fi.txt diff --git a/package/libfribidi/libfribidi.hash b/package/libfribidi/libfribidi.hash index da25b2d24d5..7e5df981127 100644 --- a/package/libfribidi/libfribidi.hash +++ b/package/libfribidi/libfribidi.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 30f93e9c63ee627d1a2cedcf59ac34d45bf30240982f99e44c6e015466b4e73d fribidi-1.0.11.tar.xz +sha256 0cd233f97fc8c67bb3ac27ce8440def5d3ffacf516765b91c2cc654498293495 fribidi-1.0.12.tar.xz sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING diff --git a/package/libfribidi/libfribidi.mk b/package/libfribidi/libfribidi.mk index adbd786db19..ec86f468a42 100644 --- a/package/libfribidi/libfribidi.mk +++ b/package/libfribidi/libfribidi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFRIBIDI_VERSION = 1.0.11 +LIBFRIBIDI_VERSION = 1.0.12 LIBFRIBIDI_SOURCE = fribidi-$(LIBFRIBIDI_VERSION).tar.xz LIBFRIBIDI_SITE = https://github.com/fribidi/fribidi/releases/download/v$(LIBFRIBIDI_VERSION) LIBFRIBIDI_LICENSE = LGPL-2.1+ diff --git a/package/libftdi1/0003-CMakeLists.txt-fix-static-build-with-libusb-and-lato.patch b/package/libftdi1/0003-CMakeLists.txt-fix-static-build-with-libusb-and-lato.patch new file mode 100644 index 00000000000..c818c58d688 --- /dev/null +++ b/package/libftdi1/0003-CMakeLists.txt-fix-static-build-with-libusb-and-lato.patch @@ -0,0 +1,47 @@ +From b5b8fab6063ad90bb5ef05a72708ecde1796bc81 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 13 May 2022 18:11:50 +0200 +Subject: [PATCH] CMakeLists.txt: fix static build with libusb and -latomic + +Use pkg-config to retrieve libusb dependencies such as -latomic and +avoid the following static build failure: + +/nvmedata/autobuild/instance-29/output-1/per-package/libftdi1/host/bin/../lib/gcc/sparc-buildroot-linux-uclibc/10.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: /nvmedata/autobuild/instance-29/output-1/per-package/libftdi1/host/sparc-buildroot-linux-uclibc/sysroot/lib/libusb-1.0.a(core.o): in function `libusb_unref_device': +/nvmedata/autobuild/instance-29/output-1/build/libusb-1.0.25/libusb/core.c:1186: undefined reference to `__atomic_fetch_add_4' + +Fixes: + - http://autobuild.buildroot.org/results/1ca7cd85ae60ad4797a6d8a83b2fb51d7eab96d9 + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +http://developer.intra2net.com/git/?p=libftdi;a=commit;h=b5b8fab6063ad90bb5ef05a72708ecde1796bc81] +--- + CMakeLists.txt | 12 ++++++++++-- + 1 files changed, 10 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 58f664a..d20aa94 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -25,8 +25,16 @@ if(${CMAKE_BUILD_TYPE} STREQUAL Debug) + endif(${CMAKE_BUILD_TYPE} STREQUAL Debug) + + # find libusb +-find_package ( USB1 REQUIRED ) +-include_directories ( ${LIBUSB_INCLUDE_DIR} ) ++find_package( PkgConfig ) ++if (PkgConfig_FOUND) ++ pkg_check_modules( LIBUSB libusb-1.0 ) ++ if (LIBUSB_FOUND) ++ include_directories ( ${LIBUSB_INCLUDE_DIRS} ) ++ else() ++ find_package ( USB1 REQUIRED ) ++ include_directories ( ${LIBUSB_INCLUDE_DIR} ) ++ endif() ++endif() + + # Find Boost + if (FTDIPP OR BUILD_TESTS) +-- +1.7.1 + diff --git a/package/libftdi1/libftdi1.mk b/package/libftdi1/libftdi1.mk index d2e3f42e147..66798addc49 100644 --- a/package/libftdi1/libftdi1.mk +++ b/package/libftdi1/libftdi1.mk @@ -8,7 +8,7 @@ LIBFTDI1_VERSION = 1.5 LIBFTDI1_SOURCE = libftdi1-$(LIBFTDI1_VERSION).tar.bz2 LIBFTDI1_SITE = http://www.intra2net.com/en/developer/libftdi/download LIBFTDI1_INSTALL_STAGING = YES -LIBFTDI1_DEPENDENCIES = libusb +LIBFTDI1_DEPENDENCIES = host-pkgconf libusb LIBFTDI1_LICENSE = LGPL-2.1 (libftdi1), MIT (libftdi1) LIBFTDI1_LICENSE_FILES = LICENSE COPYING.LIB LIBFTDI1_CONFIG_SCRIPTS = libftdi1-config diff --git a/package/libfuse/libfuse.hash b/package/libfuse/libfuse.hash index f522325945a..3ab32248953 100644 --- a/package/libfuse/libfuse.hash +++ b/package/libfuse/libfuse.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -sha256 d0e69d5d608cc22ff4843791ad097f554dd32540ddc9bed7638cc6fea7c1b4b5 fuse-2.9.9.tar.gz +sha256 d0e69d5d608cc22ff4843791ad097f554dd32540ddc9bed7638cc6fea7c1b4b5 fuse-2.9.9.tar.gz # Hash for license files: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/libfuse3/libfuse3.hash b/package/libfuse3/libfuse3.hash index cce2b111715..2d78153c811 100644 --- a/package/libfuse3/libfuse3.hash +++ b/package/libfuse3/libfuse3.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 checksums -sha256 e73f75e58da59a0e333d337c105093c496c0fd7356ef3a5a540f560697c9c4e6 libfuse3-3.10.5.tar.gz +sha256 b14f7d97abc11a5a70a37955021a7a1d8eb1d3dd5b6abec66af093eae3168c62 libfuse3-3.14.0.tar.gz sha256 b8832d9caaa075bbbd2aef24efa09f8b7ab66a832812d88c602da0c7b4397fad LICENSE diff --git a/package/libfuse3/libfuse3.mk b/package/libfuse3/libfuse3.mk index 1dbe918c5b5..8c306ba1875 100644 --- a/package/libfuse3/libfuse3.mk +++ b/package/libfuse3/libfuse3.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFUSE3_VERSION = 3.10.5 +LIBFUSE3_VERSION = 3.14.0 LIBFUSE3_SITE = $(call github,libfuse,libfuse,fuse-$(LIBFUSE3_VERSION)) LIBFUSE3_LICENSE = LGPL-2.1 LIBFUSE3_LICENSE_FILES = LICENSE diff --git a/package/libgcrypt/0001-configure.ac-add-an-option-to-disable-tests.patch b/package/libgcrypt/0001-configure.ac-add-an-option-to-disable-tests.patch index 4ef02fba65b..5ddde9df1b4 100644 --- a/package/libgcrypt/0001-configure.ac-add-an-option-to-disable-tests.patch +++ b/package/libgcrypt/0001-configure.ac-add-an-option-to-disable-tests.patch @@ -44,7 +44,7 @@ diff --git a/configure.ac b/configure.ac index e8c8cd39..1a6b61e5 100644 --- a/configure.ac +++ b/configure.ac -@@ -3198,6 +3198,16 @@ AC_ARG_ENABLE([doc], AC_HELP_STRING([--disable-doc], +@@ -3231,6 +3231,16 @@ AC_ARG_ENABLE([doc], AC_HELP_STRING([--disable-doc], AM_CONDITIONAL([BUILD_DOC], [test "x$build_doc" != xno]) diff --git a/package/libgcrypt/libgcrypt.hash b/package/libgcrypt/libgcrypt.hash index 23562d0ed39..cfbf9eaf17d 100644 --- a/package/libgcrypt/libgcrypt.hash +++ b/package/libgcrypt/libgcrypt.hash @@ -1,7 +1,5 @@ # From https://www.gnupg.org/download/integrity_check.html -sha1 1bccc8393482fa1953323ff429c6b5ba5676eb1a libgcrypt-1.9.4.tar.bz2 -# Locally calculated after checking signature -# https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.9.4.tar.bz2.sig -# using key 6DAA6E64A76D2840571B4902528897B826403ADA -sha256 ea849c83a72454e3ed4267697e8ca03390aee972ab421e7df69dfe42b65caaf7 libgcrypt-1.9.4.tar.bz2 +sha1 0b9555960d84a09ea14e52360808f2e02e9c12d2 libgcrypt-1.10.2.tar.bz2 +sha256 3b9c02a004b68c256add99701de00b383accccf37177e0d6c58289664cce0c03 libgcrypt-1.10.2.tar.bz2 +# Locally calculated sha256 ca0061fc1381a3ab242310e4b3f56389f28e3d460eb2fd822ed7a21c6f030532 COPYING.LIB diff --git a/package/libgcrypt/libgcrypt.mk b/package/libgcrypt/libgcrypt.mk index e5fdfcfc8e0..b74838b6499 100644 --- a/package/libgcrypt/libgcrypt.mk +++ b/package/libgcrypt/libgcrypt.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGCRYPT_VERSION = 1.9.4 +LIBGCRYPT_VERSION = 1.10.2 LIBGCRYPT_SOURCE = libgcrypt-$(LIBGCRYPT_VERSION).tar.bz2 LIBGCRYPT_LICENSE = LGPL-2.1+ LIBGCRYPT_LICENSE_FILES = COPYING.LIB @@ -18,16 +18,17 @@ LIBGCRYPT_CPE_ID_VENDOR = gnupg LIBGCRYPT_AUTORECONF = YES LIBGCRYPT_CONF_OPTS = \ --disable-tests \ + $(if $(BR2_OPTIMIZE_0),--disable-ppc-crypto-support,) \ --with-gpg-error-prefix=$(STAGING_DIR)/usr -# Libgcrypt doesn't support assembly for coldfire -ifeq ($(BR2_m68k_cf),y) +# disable asm for broken archs +ifeq ($(BR2_i386)$(BR2_m68k_cf),y) LIBGCRYPT_CONF_OPTS += --disable-asm endif # Code doesn't build in thumb mode -ifeq ($(BR2_arm),y) -LIBGCRYPT_CONF_ENV += CFLAGS="$(patsubst -mthumb,,$(TARGET_CFLAGS))" +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +LIBGCRYPT_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" endif $(eval $(autotools-package)) diff --git a/package/libgdiplus/libgdiplus.hash b/package/libgdiplus/libgdiplus.hash index 3a2e5ff25c6..11cacc13f6d 100644 --- a/package/libgdiplus/libgdiplus.hash +++ b/package/libgdiplus/libgdiplus.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 1fd034f4b636214cc24e94c563cd10b3f3444d9f0660927b60e63fd4131d97fa libgdiplus-6.0.5.tar.gz -sha256 81317bf837e02a116dc20b032fa1d0cbf9ec357621f141ff2c2daf26c17cbb5d LICENSE +sha256 1fd034f4b636214cc24e94c563cd10b3f3444d9f0660927b60e63fd4131d97fa libgdiplus-6.0.5.tar.gz +sha256 81317bf837e02a116dc20b032fa1d0cbf9ec357621f141ff2c2daf26c17cbb5d LICENSE diff --git a/package/libgee/Config.in b/package/libgee/Config.in index 07c387c985a..cb33ec9ec24 100644 --- a/package/libgee/Config.in +++ b/package/libgee/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBGEE depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 select BR2_PACKAGE_LIBGLIB2 help Libgee is an utility library providing GObject-based @@ -10,6 +11,7 @@ config BR2_PACKAGE_LIBGEE https://wiki.gnome.org/Projects/Libgee -comment "libgee needs a toolchain w/ wchar, threads" +comment "libgee needs a toolchain w/ wchar, threads, gcc >= 4.9" depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/libgee/libgee.hash b/package/libgee/libgee.hash index 54a46f954c4..f733bf34a81 100644 --- a/package/libgee/libgee.hash +++ b/package/libgee/libgee.hash @@ -1,5 +1,5 @@ -# From http://ftp.acc.umu.se/pub/gnome/sources/libgee/0.20/libgee-0.20.5.sha256sum -sha256 31863a8957d5a727f9067495cabf0a0889fa5d3d44626e54094331188d5c1518 libgee-0.20.5.tar.xz +# From https://download.gnome.org/sources/libgee/0.20/libgee-0.20.6.sha256sum +sha256 1bf834f5e10d60cc6124d74ed3c1dd38da646787fbf7872220b8b4068e476d4d libgee-0.20.6.tar.xz # Hash for license file: sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING diff --git a/package/libgee/libgee.mk b/package/libgee/libgee.mk index 7d8d3d48630..36eddef171f 100644 --- a/package/libgee/libgee.mk +++ b/package/libgee/libgee.mk @@ -5,8 +5,8 @@ ################################################################################ LIBGEE_VERSION_MAJOR = 0.20 -LIBGEE_VERSION = $(LIBGEE_VERSION_MAJOR).5 -LIBGEE_SITE = http://ftp.gnome.org/pub/gnome/sources/libgee/$(LIBGEE_VERSION_MAJOR) +LIBGEE_VERSION = $(LIBGEE_VERSION_MAJOR).6 +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 LIBGEE_INSTALL_STAGING = YES diff --git a/package/libgeos/libgeos.hash b/package/libgeos/libgeos.hash index f93badbaa36..54f53d19deb 100644 --- a/package/libgeos/libgeos.hash +++ b/package/libgeos/libgeos.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 50bbc599ac386b4c2b3962dcc411f0040a61f204aaef4eba7225ecdd0cf45715 geos-3.10.2.tar.bz2 +sha256 b1f077669481c5a3e62affc49e96eb06f281987a5d36fdab225217e5b825e4cc geos-3.11.2.tar.bz2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libgeos/libgeos.mk b/package/libgeos/libgeos.mk index 197def1212f..5a7932bad2b 100644 --- a/package/libgeos/libgeos.mk +++ b/package/libgeos/libgeos.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGEOS_VERSION = 3.10.2 +LIBGEOS_VERSION = 3.11.2 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 ec9fccb492c..883199501d5 100644 --- a/package/libgeotiff/libgeotiff.hash +++ b/package/libgeotiff/libgeotiff.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 fc304d8839ca5947cfbeb63adb9d1aa47acef38fc6d6689e622926e672a99a7e libgeotiff-1.7.0.tar.gz -sha256 6a22340b8293c50a34ce8e95589489bd3ec65bcb8b93e61cbda3daaafe498375 LICENSE +sha256 05ab1347aaa471fc97347d8d4269ff0c00f30fa666d956baba37948ec87e55d6 libgeotiff-1.7.1.tar.gz +sha256 a822a731a7ac4ba7d8f18fa0dc29db2e68a5dcfc315b46e4a4c8956720d55d93 LICENSE diff --git a/package/libgeotiff/libgeotiff.mk b/package/libgeotiff/libgeotiff.mk index c49528565d8..6ab60c93fcc 100644 --- a/package/libgeotiff/libgeotiff.mk +++ b/package/libgeotiff/libgeotiff.mk @@ -4,9 +4,9 @@ # ################################################################################ -LIBGEOTIFF_VERSION = 1.7.0 +LIBGEOTIFF_VERSION = 1.7.1 LIBGEOTIFF_SITE = http://download.osgeo.org/geotiff/libgeotiff -LIBGEOTIFF_LICENSE = X11-style, public domain +LIBGEOTIFF_LICENSE = MIT, public domain LIBGEOTIFF_LICENSE_FILES = LICENSE LIBGEOTIFF_DEPENDENCIES = proj tiff host-pkgconf LIBGEOTIFF_INSTALL_STAGING = YES diff --git a/package/libgit2/Config.in b/package/libgit2/Config.in index a6a9728ff05..5d28f054f24 100644 --- a/package/libgit2/Config.in +++ b/package/libgit2/Config.in @@ -12,3 +12,13 @@ config BR2_PACKAGE_LIBGIT2 comment "libgit2 needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS + +if BR2_PACKAGE_LIBGIT2 + +config BR2_PACKAGE_LIBGIT2_CLI + bool "enable command line interface (git2_cli)" + help + Enable a command-line interface for libgit2. + It aims to be git-compatible. + +endif diff --git a/package/libgit2/libgit2.hash b/package/libgit2/libgit2.hash index 07b1a260a4d..e834525df59 100644 --- a/package/libgit2/libgit2.hash +++ b/package/libgit2/libgit2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 192eeff84596ff09efb6b01835a066f2df7cd7985e0991c79595688e6b36444e libgit2-1.3.0.tar.gz -sha256 8b7e4f54f8bf210c8fe010a49571a1ee57463ef020cc43f051d4d3fbb74942af COPYING +sha256 7074f1e2697992b82402501182db254fe62d64877b12f6e4c64656516f4cde88 libgit2-1.5.1.tar.gz +sha256 0fc09da43d666b5b0cf5695defc3100d5cf387936b260ebab37e396d7e0dbc83 COPYING diff --git a/package/libgit2/libgit2.mk b/package/libgit2/libgit2.mk index 6cc0f1ea74e..c962c8030fd 100644 --- a/package/libgit2/libgit2.mk +++ b/package/libgit2/libgit2.mk @@ -4,21 +4,25 @@ # ################################################################################ -LIBGIT2_VERSION = 1.3.0 +LIBGIT2_VERSION = 1.5.1 LIBGIT2_SITE = $(call github,libgit2,libgit2,v$(LIBGIT2_VERSION)) -LIBGIT2_LICENSE = GPL-2.0 with linking exception, MIT (sha1), wildmatch license (wildmatch) +LIBGIT2_LICENSE = \ + GPL-2.0 with linking exception, \ + MIT (sha1), \ + BSD-3-Clause (sha256), \ + wildmatch license (wildmatch), \ + CC0-1.0 (xoroshiro256) LIBGIT2_LICENSE_FILES = COPYING LIBGIT2_CPE_ID_VENDOR = libgit2_project LIBGIT2_INSTALL_STAGING = YES LIBGIT2_CONF_OPTS = \ -DUSE_GSSAPI=OFF \ - -DBUILD_CLAR=OFF \ -DUSE_ICONV=ON \ -DREGEX_BACKEND=regcomp \ -DUSE_HTTP_PARSER=system \ -DUSE_NTLMCLIENT=OFF \ - -DTHREADSAFE=$(if $(BR2_TOOLCHAIN_HAS_THREADS),ON,OFF) + -DUSE_THREADS=$(if $(BR2_TOOLCHAIN_HAS_THREADS),ON,OFF) LIBGIT2_DEPENDENCIES = zlib libhttpparser @@ -45,4 +49,16 @@ else LIBGIT2_CONF_OPTS += -DUSE_HTTPS=OFF endif +ifeq ($(BR2_PACKAGE_LIBGIT2_CLI),y) +LIBGIT2_CONF_OPTS += -DBUILD_CLI=ON +else +LIBGIT2_CONF_OPTS += -DBUILD_CLI=OFF +endif + +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +LIBGIT2_CONF_OPTS += \ + -DCMAKE_EXE_LINKER_FLAGS=-latomic \ + -DCMAKE_SHARED_LINKER_FLAGS=-latomic +endif + $(eval $(cmake-package)) diff --git a/package/libglade/Config.in b/package/libglade/Config.in index e269a075483..c97c9becd2c 100644 --- a/package/libglade/Config.in +++ b/package/libglade/Config.in @@ -12,7 +12,7 @@ config BR2_PACKAGE_LIBGLADE at runtime. It doesn't require GLADE to be used, but GLADE is by far the easiest way to create the interface files. - http://ftp.gnome.org/pub/GNOME/sources/libglade/ + https://download.gnome.org/sources/libglade/ comment "libglade needs a toolchain w/ wchar, threads" depends on BR2_USE_MMU diff --git a/package/libglade/libglade.hash b/package/libglade/libglade.hash index b96c5814b4d..b04087e2863 100644 --- a/package/libglade/libglade.hash +++ b/package/libglade/libglade.hash @@ -1,5 +1,5 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/libglade/2.6/libglade-2.6.4.sha256sum -sha256 64361e7647839d36ed8336d992fd210d3e8139882269bed47dc4674980165dec libglade-2.6.4.tar.bz2 +# 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 +sha256 94b03f1a60a7fd5007149530626a895a6ef5a8b9342abfd56860c5f3956f5d23 COPYING diff --git a/package/libglade/libglade.mk b/package/libglade/libglade.mk index 32fa595f5a4..21aed606051 100644 --- a/package/libglade/libglade.mk +++ b/package/libglade/libglade.mk @@ -7,7 +7,7 @@ LIBGLADE_VERSION_MAJOR = 2.6 LIBGLADE_VERSION = $(LIBGLADE_VERSION_MAJOR).4 LIBGLADE_SOURCE = libglade-$(LIBGLADE_VERSION).tar.bz2 -LIBGLADE_SITE = http://ftp.gnome.org/pub/GNOME/sources/libglade/$(LIBGLADE_VERSION_MAJOR) +LIBGLADE_SITE = https://download.gnome.org/sources/libglade/$(LIBGLADE_VERSION_MAJOR) LIBGLADE_INSTALL_STAGING = YES LIBGLADE_DEPENDENCIES = host-pkgconf libglib2 libgtk2 atk libxml2 LIBGLADE_LICENSE = LGPL-2.0+ diff --git a/package/libglfw/libglfw.hash b/package/libglfw/libglfw.hash index 5bffc55d26b..9d38946f3c8 100644 --- a/package/libglfw/libglfw.hash +++ b/package/libglfw/libglfw.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ed07b90e334dcd39903e6288d90fa1ae0cf2d2119fec516cf743a0a404527c02 libglfw-3.3.6.tar.gz +sha256 f30f42e05f11e5fc62483e513b0488d5bceeab7d9c5da0ffe2252ad81816c713 libglfw-3.3.8.tar.gz sha256 149704059b5d0bf551637e50042dd4de9c2cae921021f6636298911e3a5f9462 LICENSE.md diff --git a/package/libglfw/libglfw.mk b/package/libglfw/libglfw.mk index 0a3986f6628..f5d254eec36 100644 --- a/package/libglfw/libglfw.mk +++ b/package/libglfw/libglfw.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGLFW_VERSION = 3.3.6 +LIBGLFW_VERSION = 3.3.8 LIBGLFW_SITE = $(call github,glfw,glfw,$(LIBGLFW_VERSION)) LIBGLFW_INSTALL_STAGING = YES LIBGLFW_LICENSE = Zlib @@ -29,7 +29,7 @@ LIBGLFW_DEPENDENCIES += libgles endif ifeq ($(BR2_PACKAGE_WAYLAND),y) -LIBGLFW_DEPENDENCIES += libxkbcommon wayland-protocols +LIBGLFW_DEPENDENCIES += libxkbcommon wayland wayland-protocols # Override pkg-config pkgdatadir variable, it needs the prefix LIBGLFW_CONF_OPTS += \ -DGLFW_USE_WAYLAND=1 \ diff --git a/package/libglib2/0002-remove-cpp-requirement.patch b/package/libglib2/0002-remove-cpp-requirement.patch index 2f952289324..84511dea324 100644 --- a/package/libglib2/0002-remove-cpp-requirement.patch +++ b/package/libglib2/0002-remove-cpp-requirement.patch @@ -1,4 +1,4 @@ -From 2f168951df1feebeac549ada1ea44ea092484c54 Mon Sep 17 00:00:00 2001 +From dd65a8cfdeafeb18b72d8d1eb676c7ca43ae505f Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 16 Sep 2019 10:12:38 -0700 Subject: [PATCH] remove cpp requirement @@ -12,15 +12,14 @@ Upstream status: Denied (Buildroot specific) https://gitlab.gnome.org/GNOME/glib/issues/1748 --- glib/glibconfig.h.in | 1 - - meson.build | 18 +----------------- - tests/meson.build | 5 ----- - 3 files changed, 1 insertion(+), 23 deletions(-) + meson.build | 19 +------------------ + 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/glib/glibconfig.h.in b/glib/glibconfig.h.in -index 7ef8c48..128e65d 100644 +index e66748d95..2173d8be6 100644 --- a/glib/glibconfig.h.in +++ b/glib/glibconfig.h.in -@@ -117,7 +117,6 @@ typedef unsigned @glib_intptr_type_define@ guintptr; +@@ -119,7 +119,6 @@ typedef unsigned @glib_intptr_type_define@ guintptr; @glib_vacopy@ @g_have_iso_c_varargs@ @@ -29,15 +28,15 @@ index 7ef8c48..128e65d 100644 /* gcc-2.95.x supports both gnu style and ISO varargs, but if -ansi * is passed ISO vararg support is turned off, and there is no work diff --git a/meson.build b/meson.build -index 4bbf4c2..ac59f4e 100644 +index 48fdfe864..5df242e39 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,4 @@ -project('glib', 'c', 'cpp', +project('glib', 'c', - version : '2.70.0', - # NOTE: We keep this pinned at 0.49 because that's what Debian 10 ships - meson_version : '>= 0.49.2', + version : '2.72.3', + # NOTE: We keep this pinned at 0.52 because that's what Debian Stable ships + meson_version : '>= 0.52.0', @@ -10,7 +10,6 @@ project('glib', 'c', 'cpp', ) @@ -46,7 +45,15 @@ index 4bbf4c2..ac59f4e 100644 cc_can_run = not meson.is_cross_build() or meson.has_exe_wrapper() -@@ -1679,20 +1678,6 @@ if g_have_iso_c_varargs +@@ -495,7 +494,6 @@ else + endif + + add_project_arguments(cc.get_supported_arguments(warning_c_args), language: 'c') +-add_project_arguments(cxx.get_supported_arguments(warning_cxx_args), language: 'cpp') + + # FIXME: We cannot build some of the GResource tests with -z nodelete, which + # means we cannot use that flag in add_project_link_arguments(), and must add +@@ -1734,20 +1732,6 @@ if g_have_iso_c_varargs #endif''') endif @@ -67,7 +74,7 @@ index 4bbf4c2..ac59f4e 100644 g_have_gnuc_varargs = cc.compiles(''' void some_func (void) { int a(int p1, int p2, int p3); -@@ -2330,7 +2315,6 @@ subdir('gobject') +@@ -2381,7 +2365,6 @@ subdir('gobject') subdir('gthread') subdir('gmodule') subdir('gio') @@ -75,22 +82,6 @@ index 4bbf4c2..ac59f4e 100644 if build_tests subdir('tests') endif -diff --git a/tests/meson.build b/tests/meson.build -index e4ea226..7fd974c 100644 ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -55,11 +55,6 @@ tests = { - 'source': 'module-test.c', - 'c_args': ['-DMODULE_TYPE="plugin"'], - }, -- 'cxx-test' : { -- 'source' : 'cxx-test.cpp', -- 'include_directories' : gmoduleinc, -- 'dependencies' : [libgio_dep], -- }, - } - - test_extra_programs = { -- -2.23.0 +2.34.1 diff --git a/package/libglib2/0003-Add-Wno-format-nonliteral-to-compiler-arguments.patch b/package/libglib2/0003-Add-Wno-format-nonliteral-to-compiler-arguments.patch index 67aea7982e1..e212393011a 100644 --- a/package/libglib2/0003-Add-Wno-format-nonliteral-to-compiler-arguments.patch +++ b/package/libglib2/0003-Add-Wno-format-nonliteral-to-compiler-arguments.patch @@ -16,7 +16,7 @@ diff --git a/meson.build b/meson.build index 3c615b7..7cae4e8 100644 --- a/meson.build +++ b/meson.build -@@ -431,6 +431,7 @@ if cc.get_id() == 'gcc' or cc.get_id() == 'clang' +@@ -435,6 +435,7 @@ if cc.get_id() == 'gcc' or cc.get_id() == 'clang' # building with -Wbad-function-cast. '-Wno-bad-function-cast', '-Wno-cast-function-type', diff --git a/package/libglib2/0004-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch b/package/libglib2/0004-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch index a29587bd317..db77a73203f 100644 --- a/package/libglib2/0004-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch +++ b/package/libglib2/0004-meson.build-add-girdir-to-gio-2.0.pc-and-glib-2.0.pc.patch @@ -23,7 +23,7 @@ diff --git a/gio/meson.build b/gio/meson.build index 29473d26b..112d4ada9 100644 --- a/gio/meson.build +++ b/gio/meson.build -@@ -831,6 +831,7 @@ pkg.generate(libgio, +@@ -841,6 +841,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')), @@ -35,7 +35,7 @@ diff --git a/glib/meson.build b/glib/meson.build index f78f32969..6c5486699 100644 --- a/glib/meson.build +++ b/glib/meson.build -@@ -377,6 +377,7 @@ pkg.generate(libglib, +@@ -384,6 +384,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')), diff --git a/package/libglib2/libglib2.hash b/package/libglib2/libglib2.hash index 580be3e08ed..0395ff234ad 100644 --- a/package/libglib2/libglib2.hash +++ b/package/libglib2/libglib2.hash @@ -1,4 +1,4 @@ -# https://download.gnome.org/sources/glib/2.70/glib-2.70.0.sha256sum -sha256 200d7df811c5ba634afbf109f14bb40ba7fde670e89389885da14e27c0840742 glib-2.70.0.tar.xz +# https://download.gnome.org/sources/glib/2.72/glib-2.72.3.sha256sum +sha256 4a39a2f624b8512d500d5840173eda7fa85f51c109052eae806acece85d345f0 glib-2.72.3.tar.xz # License files, locally calculated sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index d3cba1a8bba..3084aa6cb8d 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -4,10 +4,10 @@ # ################################################################################ -LIBGLIB2_VERSION_MAJOR = 2.70 -LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).0 +LIBGLIB2_VERSION_MAJOR = 2.72 +LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).3 LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz -LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR) +LIBGLIB2_SITE = https://download.gnome.org/sources/glib/$(LIBGLIB2_VERSION_MAJOR) LIBGLIB2_LICENSE = LGPL-2.1+ LIBGLIB2_LICENSE_FILES = COPYING LIBGLIB2_CPE_ID_VENDOR = gnome diff --git a/package/libglvnd/Config.in b/package/libglvnd/Config.in index d020c214659..f471e289bdf 100644 --- a/package/libglvnd/Config.in +++ b/package/libglvnd/Config.in @@ -24,7 +24,7 @@ config BR2_PACKAGE_LIBGLVND_DISPATCH_GL depends on BR2_PACKAGE_XORG7 # libx11, libXext, xorgproto select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_XLIB_XORGPROTO + select BR2_PACKAGE_XORGPROTO select BR2_PACKAGE_HAS_LIBGL config BR2_PACKAGE_LIBGLVND_DISPATCH_EGL diff --git a/package/libglvnd/libglvnd.hash b/package/libglvnd/libglvnd.hash index 15e76ea9e86..e463a8def5e 100644 --- a/package/libglvnd/libglvnd.hash +++ b/package/libglvnd/libglvnd.hash @@ -1,7 +1,7 @@ # Locally computed -sha256 6332c27f4c792b09a3eb1d7ae18c2d6ff6a0acaf3a746489caf859e659fca2f7 libglvnd-v1.3.2.tar.gz +sha256 c4a884503d2412dc1fa209613aa8a77193aeb7065b823fe1775dc8b6f3e45211 libglvnd-1.4.0.tar.gz # Locally computed hashes for license files -sha256 224534547628a9e5e889d8808385bd38839e6bdb77d89c90ac04dad6891a4f5f README.md -sha256 bebdc0fd27cd37af8406e47af23c113866b7856c3f7349ffcbc672029ec8acf7 src/util/uthash/LICENSE +sha256 f84a3eca98cc5bdf5318741124c38c5e877f856df8c7e229ee5065e5c61038c2 README.md +sha256 e9b9aac8421b6d29176c6f23f6f7a907194245e35ef99ace10839734961cfaa2 src/util/uthash/LICENSE sha256 f6f207863675ca5a5128fd120b9aef4f4bbab73ffa57e5f771ccffc8e3cc56b7 src/util/cJSON/LICENSE diff --git a/package/libglvnd/libglvnd.mk b/package/libglvnd/libglvnd.mk index 3bac4b31e2a..95ac19dd91e 100644 --- a/package/libglvnd/libglvnd.mk +++ b/package/libglvnd/libglvnd.mk @@ -4,9 +4,8 @@ # ################################################################################ -LIBGLVND_VERSION = 1.3.2 -LIBGLVND_SOURCE = libglvnd-v$(LIBGLVND_VERSION).tar.gz -LIBGLVND_SITE = https://gitlab.freedesktop.org/glvnd/libglvnd/-/archive/v$(LIBGLVND_VERSION) +LIBGLVND_VERSION = 1.4.0 +LIBGLVND_SITE = https://gitlab.freedesktop.org/glvnd/libglvnd/uploads/ca5bf4295beb39bb324f692c481ac8a1 LIBGLVND_LICENSE = \ libglvnd license, \ diff --git a/package/libgpg-error/0001-build-Fix-generation-of-lock-obj-pub.native.h-for-cr.patch b/package/libgpg-error/0001-build-Fix-generation-of-lock-obj-pub.native.h-for-cr.patch deleted file mode 100644 index 621f070ee28..00000000000 --- a/package/libgpg-error/0001-build-Fix-generation-of-lock-obj-pub.native.h-for-cr.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 7350874f6f62314af4c8ec1973c91d305a6f4ddc Mon Sep 17 00:00:00 2001 -From: David Michael -Date: Fri, 26 Mar 2021 16:06:50 +0900 -Subject: [PATCH] build: Fix generation of lock-obj-pub.native.h for cross - build. - -* src/gen-lock-obj.sh: Capture echo output with quotes. - --- - -Fixes-commit: 99ae862a96a569724f49a604ebb7d3f6d2c2d374 -Signed-off-by: David Michael -Upstream: 33593864cd54143db594c4237bba41e14179061c -Signed-off-by: Thomas Petazzoni ---- - src/gen-lock-obj.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/gen-lock-obj.sh b/src/gen-lock-obj.sh -index a710f0c..258eec6 100755 ---- a/src/gen-lock-obj.sh -+++ b/src/gen-lock-obj.sh -@@ -38,7 +38,7 @@ - # AWK=gawk ./gen-lock-obj.sh - # - --if test -n `echo -n`; then -+if test -n "`echo -n`"; then - ECHO_C='\c' - ECHO_N='' - else --- -2.31.1 - diff --git a/package/libgpg-error/0002-build-Fix-disable-threads.patch b/package/libgpg-error/0002-build-Fix-disable-threads.patch deleted file mode 100644 index 6ed0f830708..00000000000 --- a/package/libgpg-error/0002-build-Fix-disable-threads.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 7ede0d4ce19e0ed14cd1cec81ba7df4e467f1eeb Mon Sep 17 00:00:00 2001 -From: NIIBE Yutaka -Date: Mon, 21 Jun 2021 12:16:20 +0900 -Subject: [PATCH] build: Fix --disable-threads. - -* src/gen-lock-obj.sh: Fix generating '}}}'. - --- - -GnuPG-bug-id: 5495 -Reported-by: Fabrice Fontaine -Fixes-commit: 1fb90a7da186ee2ee098a666f6f3a35bb1720e59 -Signed-off-by: NIIBE Yutaka -[Retrieved from: -https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=commit;h=220a427b4f997ef6af1b2d4e82ef1dc96e0cd6ff] -Signed-off-by: Fabrice Fontaine ---- - src/gen-lock-obj.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/gen-lock-obj.sh b/src/gen-lock-obj.sh -index 258eec6..014667f 100755 ---- a/src/gen-lock-obj.sh -+++ b/src/gen-lock-obj.sh -@@ -121,10 +121,10 @@ while test "$i" -lt $ac_mtx_size; do - fi - i=$(( i + 1 )) - done -+echo '}}}' - fi - - cat <<'EOF' --}}} - ## - ## Local Variables: - ## mode: c --- -2.31.1 - diff --git a/package/libgpg-error/Config.in b/package/libgpg-error/Config.in index 03157dd9fe7..5a2c14ead86 100644 --- a/package/libgpg-error/Config.in +++ b/package/libgpg-error/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS bool # see src/syscfg/ default y if \ - BR2_aarch64 || BR2_aarch64_eb || \ + BR2_aarch64 || BR2_aarch64_be || \ BR2_arm || BR2_armeb || \ BR2_i386 || BR2_mips || \ BR2_mipsel || BR2_mips64 || \ @@ -28,7 +28,7 @@ config BR2_PACKAGE_LIBGPG_ERROR config BR2_PACKAGE_LIBGPG_ERROR_SYSCFG string default "aarch64-unknown-linux-gnu" \ - if BR2_aarch64 || BR2_aarch64_eb + if BR2_aarch64 || BR2_aarch64_be default "arm-unknown-linux-gnueabi" \ if BR2_arm || BR2_armeb default "i686-pc-linux-gnu" \ diff --git a/package/libgpg-error/libgpg-error.hash b/package/libgpg-error/libgpg-error.hash index 4e124941cdf..5c445ba0b27 100644 --- a/package/libgpg-error/libgpg-error.hash +++ b/package/libgpg-error/libgpg-error.hash @@ -1,10 +1,6 @@ # From https://www.gnupg.org/download/integrity_check.html -sha1 5e620d71fc24d287a7ac2460b1d819074bb8b9bb libgpg-error-1.42.tar.bz2 - -# Locally calculated after checking pgp signature -# https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.42.tar.bz2.sig -# using key D8692123C4065DEA5E0F3AB5249B39D24F25E3B6 -sha256 fc07e70f6c615f8c4f590a8e37a9b8dd2e2ca1e9408f8e60459c67452b925e23 libgpg-error-1.42.tar.bz2 +sha1 94668233fd7bd8e7c0ec5e363134cd53c575da60 libgpg-error-1.47.tar.bz2 +sha256 9e3c670966b96ecc746c28c2c419541e3bcb787d1a73930f5e5f5e1bcbbb9bdb libgpg-error-1.47.tar.bz2 # Locally calculated sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB diff --git a/package/libgpg-error/libgpg-error.mk b/package/libgpg-error/libgpg-error.mk index babcbdadede..60e3da9de14 100644 --- a/package/libgpg-error/libgpg-error.mk +++ b/package/libgpg-error/libgpg-error.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGPG_ERROR_VERSION = 1.42 +LIBGPG_ERROR_VERSION = 1.47 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+ @@ -13,8 +13,12 @@ LIBGPG_ERROR_CPE_ID_VENDOR = gnupg LIBGPG_ERROR_INSTALL_STAGING = YES LIBGPG_ERROR_CONFIG_SCRIPTS = gpg-error-config LIBGPG_ERROR_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) -LIBGPG_ERROR_CONF_OPTS = --disable-tests \ - --host=$(BR2_PACKAGE_LIBGPG_ERROR_SYSCFG) +LIBGPG_ERROR_CONF_OPTS = \ + cross_compiling=yes \ + --host=$(BR2_PACKAGE_LIBGPG_ERROR_SYSCFG) \ + --enable-install-gpg-error-config \ + --disable-tests \ + --disable-languages ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) LIBGPG_ERROR_CONF_OPTS += --enable-threads diff --git a/package/libgpgme/0001-Fix-build-without-threads.patch b/package/libgpgme/0001-Fix-build-without-threads.patch new file mode 100644 index 00000000000..caa4ed7d78f --- /dev/null +++ b/package/libgpgme/0001-Fix-build-without-threads.patch @@ -0,0 +1,59 @@ +From fc1b821c80c78f4ae635639c7fce5bad754edda7 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 27 Aug 2022 23:24:44 +0200 +Subject: [PATCH] Fix build without threads + +Allow the user to disable cpp tests to avoid the following build failure +without threads raised since version 1.17.1 and +https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=commit;h=f3177d3ee0a1d30e15f33ff226b5e4c96b7610db + +run-wkdlookup.cpp: In function 'int main(int, char**)': +run-wkdlookup.cpp:130:18: error: 'std::this_thread' has not been declared + 130 | std::this_thread::sleep_for(std::chrono::milliseconds{250 * cnt}); + | ^~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/2915f6105bae595274fabaa12de7cc53926d22d0 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://dev.gnupg.org/T6165] +--- + configure.ac | 5 +++++ + lang/cpp/Makefile.am | 6 +++++- + 2 files changed, 10 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index e7fe04a7..d1c87486 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -553,6 +553,11 @@ AC_ARG_ENABLE(g13-test, + run_g13_test=$enableval) + AM_CONDITIONAL(RUN_G13_TESTS, test "$run_g13_test" = "yes") + ++run_cpp_test="yes" ++AC_ARG_ENABLE(cpp-test, ++ AS_HELP_STRING([--disable-cpp-test],[disable CPP regression test]), ++ run_cpp_test=$enableval) ++AM_CONDITIONAL(RUN_CPP_TESTS, test "$run_cpp_test" = "yes") + + # Checks for header files. + AC_CHECK_HEADERS_ONCE([locale.h sys/select.h sys/uio.h argp.h stdint.h +diff --git a/lang/cpp/Makefile.am b/lang/cpp/Makefile.am +index 724da6ca..243c463d 100644 +--- a/lang/cpp/Makefile.am ++++ b/lang/cpp/Makefile.am +@@ -18,6 +18,10 @@ + # License along with this program; if not, see . + # SPDX-License-Identifier: LGPL-2.1-or-later + +-SUBDIRS = src tests ++SUBDIRS = src ++ ++if RUN_CPP_TESTS ++SUBDIRS += tests ++endif + + EXTRA_DIST = README +-- +2.35.1 + diff --git a/package/libgpgme/0001-core-Support-closefrom-also-for-glibc.patch b/package/libgpgme/0001-core-Support-closefrom-also-for-glibc.patch deleted file mode 100644 index b8db949cefe..00000000000 --- a/package/libgpgme/0001-core-Support-closefrom-also-for-glibc.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 4b64774b6d13ffa4f59dddf947a97d61bcfa2f2e Mon Sep 17 00:00:00 2001 -From: Jiri Kucera -Date: Sun, 25 Jul 2021 11:35:54 +0200 -Subject: [PATCH] core: Support closefrom also for glibc. - -* src/posix-io.c (_gpgme_io_spawn): Use glibc's closefrom. --- - -Since 2.34, glibc introduces closefrom (the implementation -follows *BSD standard). - -Signed-off-by: Werner Koch - -[Retrieved from: -https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=commit;h=4b64774b6d13ffa4f59dddf947a97d61bcfa2f2e] -Signed-off-by: Fabrice Fontaine ---- - src/posix-io.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/posix-io.c b/src/posix-io.c -index e712ef28..2a3a81fc 100644 ---- a/src/posix-io.c -+++ b/src/posix-io.c -@@ -570,7 +570,7 @@ _gpgme_io_spawn (const char *path, char *const argv[], unsigned int flags, - if (fd_list[i].fd > fd) - fd = fd_list[i].fd; - fd++; --#if defined(__sun) || defined(__FreeBSD__) -+#if defined(__sun) || defined(__FreeBSD__) || defined(__GLIBC__) - closefrom (fd); - max_fds = fd; - #else /*!__sun */ --- -2.11.0 - diff --git a/package/libgpgme/Config.in b/package/libgpgme/Config.in index 4aabd063672..16ce27d0efb 100644 --- a/package/libgpgme/Config.in +++ b/package/libgpgme/Config.in @@ -2,8 +2,8 @@ config BR2_PACKAGE_LIBGPGME bool "libgpgme" depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgpg-error depends on BR2_USE_MMU # libassuan - #gnupg is not needed to build, but at runtime. - select BR2_PACKAGE_GNUPG if !BR2_PACKAGE_GNUPG2 + select BR2_PACKAGE_GNUPG2 if BR2_PACKAGE_GNUPG2_DEPENDS && !BR2_PACKAGE_GNUPG # runtime + select BR2_PACKAGE_GNUPG if !BR2_PACKAGE_GNUPG2_DEPENDS # runtime select BR2_PACKAGE_LIBGPG_ERROR select BR2_PACKAGE_LIBASSUAN help diff --git a/package/libgpgme/libgpgme.hash b/package/libgpgme/libgpgme.hash index ca2a79496c1..7d02b9e1391 100644 --- a/package/libgpgme/libgpgme.hash +++ b/package/libgpgme/libgpgme.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://gnupg.org/ftp/gcrypt/gpgme/gpgme-1.16.0.tar.bz2.sig -# using key D8692123C4065DEA5E0F3AB5249B39D24F25E3B6 -sha256 6c8cc4aedb10d5d4c905894ba1d850544619ee765606ac43df7405865de29ed0 gpgme-1.16.0.tar.bz2 +# https://gnupg.org/ftp/gcrypt/gpgme/gpgme-1.17.1.tar.bz2.sig +# using key 6DAA6E64A76D2840571B4902528897B826403ADA +sha256 711eabf5dd661b9b04be9edc9ace2a7bc031f6bd9d37a768d02d0efdef108f5f gpgme-1.17.1.tar.bz2 # Locally calculated sha256 ca0061fc1381a3ab242310e4b3f56389f28e3d460eb2fd822ed7a21c6f030532 COPYING.LESSER diff --git a/package/libgpgme/libgpgme.mk b/package/libgpgme/libgpgme.mk index f61e9fe41ae..2120ee8e3c0 100644 --- a/package/libgpgme/libgpgme.mk +++ b/package/libgpgme/libgpgme.mk @@ -4,16 +4,18 @@ # ################################################################################ -LIBGPGME_VERSION = 1.16.0 +LIBGPGME_VERSION = 1.17.1 LIBGPGME_SITE = https://gnupg.org/ftp/gcrypt/gpgme LIBGPGME_SOURCE = gpgme-$(LIBGPGME_VERSION).tar.bz2 LIBGPGME_LICENSE = LGPL-2.1+ LIBGPGME_LICENSE_FILES = COPYING.LESSER LIBGPGME_CPE_ID_VENDOR = gnupg -LIBGPGME_CPE_ID_PRODUCT = gpgpme +LIBGPGME_CPE_ID_PRODUCT = gpgme LIBGPGME_INSTALL_STAGING = YES LIBGPGME_DEPENDENCIES = libassuan libgpg-error LIBGPGME_CONFIG_SCRIPTS = gpgme-config +# We're patching configure.ac +LIBGPGME_AUTORECONF = YES LIBGPGME_LANGUAGE_BINDINGS = cl # C++ bindings require a C++11 capable gcc, and -Wsuggest-override support @@ -28,6 +30,7 @@ LIBGPGME_CONF_OPTS = \ --disable-gpgconf-test \ --disable-g13-test \ --disable-gpg-test \ + --disable-cpp-test \ --enable-languages=$(subst $(space),$(comma),$(LIBGPGME_LANGUAGE_BINDINGS)) # Handle argp-standalone or it errors out during build diff --git a/package/libgtk2/libgtk2.hash b/package/libgtk2/libgtk2.hash index 9b10a1f0cec..7b9a46b6975 100644 --- a/package/libgtk2/libgtk2.hash +++ b/package/libgtk2/libgtk2.hash @@ -1,4 +1,4 @@ -# From http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-2.24.33.sha256sum +# 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: diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk index d30e1d9d431..859925e8d3a 100644 --- a/package/libgtk2/libgtk2.mk +++ b/package/libgtk2/libgtk2.mk @@ -7,7 +7,7 @@ LIBGTK2_VERSION_MAJOR = 2.24 LIBGTK2_VERSION = $(LIBGTK2_VERSION_MAJOR).33 LIBGTK2_SOURCE = gtk+-$(LIBGTK2_VERSION).tar.xz -LIBGTK2_SITE = http://ftp.gnome.org/pub/gnome/sources/gtk+/$(LIBGTK2_VERSION_MAJOR) +LIBGTK2_SITE = https://download.gnome.org/sources/gtk+/$(LIBGTK2_VERSION_MAJOR) LIBGTK2_INSTALL_STAGING = YES LIBGTK2_LICENSE = LGPL-2.0+ LIBGTK2_LICENSE_FILES = COPYING diff --git a/package/libgtk3/0001-disable-atk-bridge.patch b/package/libgtk3/0001-disable-atk-bridge.patch new file mode 100644 index 00000000000..f3e9bff2ba7 --- /dev/null +++ b/package/libgtk3/0001-disable-atk-bridge.patch @@ -0,0 +1,41 @@ +Remove atk-bridge support. + +atk-bridge doesn't seem useful for now in Buildroot and requires to +add two new packages just for it: at-spi2-core and at-spi2-atk. + +Signed-off-by: Hadrien Boutteville + +--- a/gtk/a11y/gtkaccessibility.c ++++ b/gtk/a11y/gtkaccessibility.c +@@ -37,10 +37,6 @@ + #include + #include + +-#ifdef GDK_WINDOWING_X11 +-#include +-#endif +- + static gboolean gail_focus_watcher (GSignalInvocationHint *ihint, + guint n_param_values, + const GValue *param_values, +@@ -988,9 +984,5 @@ _gtk_accessibility_init (void) + _gtk_accessibility_override_atk_util (); + do_window_event_initialization (); + +-#ifdef GDK_WINDOWING_X11 +- atk_bridge_adaptor_init (NULL, NULL); +-#endif +- + atk_misc_instance = g_object_new (GTK_TYPE_MISC_IMPL, NULL); + } +--- a/meson.build ++++ b/meson.build +@@ -564,7 +564,7 @@ if x11_enabled + xfixes_dep = dependency('xfixes', required: false) + xcomposite_dep = dependency('xcomposite', required: false) + fontconfig_dep = dependency('fontconfig', fallback: ['fontconfig', 'fontconfig_dep']) +- atkbridge_dep = dependency('atk-bridge-2.0', version: at_spi2_atk_req) ++ atkbridge_dep = dependency('atk-bridge-2.0', version: at_spi2_atk_req, required: false) + + backend_immodules += ['xim'] + diff --git a/package/libgtk3/0001-no-gtk-doc.patch b/package/libgtk3/0001-no-gtk-doc.patch deleted file mode 100644 index e1d32080220..00000000000 --- a/package/libgtk3/0001-no-gtk-doc.patch +++ /dev/null @@ -1,25 +0,0 @@ -Same patch as for systemd in commit -http://git.buildroot.net/buildroot/commit/?id=7144f2f04b70553 - -Fix deactivation of gtk-doc - -The tarball contains the Makefile for building documentation with gtk-doc, -Unfortunately the AM_CONDITIONAL variable is not the correct one, which -results in an error when running autoreconf. - -This patch fixes this issue. - -Signed-off-by: Eric Le Bihan -Signed-off-by: Hadrien Boutteville - ---- a/gtk-doc.make -+++ b/gtk-doc.make -@@ -300,7 +300,7 @@ - # - # Require gtk-doc when making dist - # --if HAVE_GTK_DOC -+if ENABLE_GTK_DOC - dist-check-gtkdoc: docs - else - dist-check-gtkdoc: diff --git a/package/libgtk3/0004-Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch b/package/libgtk3/0002-Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch similarity index 100% rename from package/libgtk3/0004-Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch rename to package/libgtk3/0002-Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch diff --git a/package/libgtk3/0002-fix-introspection-check.patch b/package/libgtk3/0002-fix-introspection-check.patch deleted file mode 100644 index b12e1a4fca2..00000000000 --- a/package/libgtk3/0002-fix-introspection-check.patch +++ /dev/null @@ -1,28 +0,0 @@ -Fix HAVE_INTROSPECTION does not appear in AM_CONDITIONAL - -During autoreconf GOBJECT_INTROSPECTION_CHECK could not be resolved because we -don't have introspection which provides its custom m4 macro. Reconfigure fails -with: - -gdk/Makefile.am:196: error: HAVE_INTROSPECTION does not appear in AM_CONDITIONAL -gtk/Makefile.am:1347: error: HAVE_INTROSPECTION does not appear in AM_CONDITIONAL - -We avoid to add a copy of introspection.m4 in the m4 directory of libgtk3 by -adding a check, as performed in Systemd. - -Signed-off-by: Hadrien Boutteville - ---- a/configure.ac -+++ b/configure.ac -@@ -1679,7 +1679,10 @@ - # GObject introspection - ################################################## - --GOBJECT_INTROSPECTION_CHECK(introspection_required_version) -+m4_ifdef([GOBJECT_INTROSPECTION_CHECK], -+ [GOBJECT_INTROSPECTION_CHECK(introspection_required_version)], -+ [AM_CONDITIONAL([HAVE_INTROSPECTION], [false]) -+ enable_introspection=no]) - - ################################################## - # colord module diff --git a/package/libgtk3/0003-disable-atk-bridge.patch b/package/libgtk3/0003-disable-atk-bridge.patch deleted file mode 100644 index 09ede966137..00000000000 --- a/package/libgtk3/0003-disable-atk-bridge.patch +++ /dev/null @@ -1,45 +0,0 @@ -Remove atk-bridge support. - -atk-bridge doesn't seem useful for now in Buildroot and requires to -add two new packages just for it: at-spi2-core and at-spi2-atk. - -Signed-off-by: Hadrien Boutteville - ---- a/configure.ac -+++ b/configure.ac -@@ -1375,11 +1375,7 @@ - # Check for Accessibility Toolkit flags - ######################################## - --if test x$enable_x11_backend = xyes; then -- ATK_PACKAGES="atk atk-bridge-2.0" --else -- ATK_PACKAGES="atk" --fi -+ATK_PACKAGES="atk" - - PKG_CHECK_MODULES(ATK, $ATK_PACKAGES) - ---- a/gtk/a11y/gtkaccessibility.c -+++ b/gtk/a11y/gtkaccessibility.c -@@ -37,10 +37,6 @@ - #include - #include - --#ifdef GDK_WINDOWING_X11 --#include --#endif -- - static gboolean gail_focus_watcher (GSignalInvocationHint *ihint, - guint n_param_values, - const GValue *param_values, -@@ -988,9 +984,5 @@ - _gtk_accessibility_override_atk_util (); - do_window_event_initialization (); - --#ifdef GDK_WINDOWING_X11 -- atk_bridge_adaptor_init (NULL, NULL); --#endif -- - atk_misc_instance = g_object_new (GTK_TYPE_MISC_IMPL, NULL); - } diff --git a/package/libgtk3/Config.in b/package/libgtk3/Config.in index bc8cacd9f5e..82ca68d2da2 100644 --- a/package/libgtk3/Config.in +++ b/package/libgtk3/Config.in @@ -88,6 +88,7 @@ config BR2_PACKAGE_LIBGTK3_X11 select BR2_PACKAGE_FONTCONFIG select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXEXT + select BR2_PACKAGE_XLIB_LIBXRANDR select BR2_PACKAGE_XLIB_LIBXRENDER select BR2_PACKAGE_XLIB_LIBXI help diff --git a/package/libgtk3/libgtk3.hash b/package/libgtk3/libgtk3.hash index c23abcb5189..4d6c210c62d 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.31.sha256sum -sha256 423c3e7fdb4c459ee889e35fd4d71fd2623562541c1041b11c07e5ad1ff10bf9 gtk+-3.24.31.tar.xz +# From https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.38.sha256sum +sha256 ce11decf018b25bdd8505544a4f87242854ec88be054d9ade5f3a20444dd8ee7 gtk+-3.24.38.tar.xz # Hash for license file: sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk index f298afade69..e53d2aa0400 100644 --- a/package/libgtk3/libgtk3.mk +++ b/package/libgtk3/libgtk3.mk @@ -5,77 +5,50 @@ ################################################################################ LIBGTK3_VERSION_MAJOR = 3.24 -LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).31 +LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).38 LIBGTK3_SOURCE = gtk+-$(LIBGTK3_VERSION).tar.xz -LIBGTK3_SITE = http://ftp.gnome.org/pub/gnome/sources/gtk+/$(LIBGTK3_VERSION_MAJOR) +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 LIBGTK3_CPE_ID_PRODUCT = gtk LIBGTK3_INSTALL_STAGING = YES -LIBGTK3_AUTORECONF = YES - -LIBGTK3_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 \ - PKG_CONFIG_FOR_BUILD=$(HOST_DIR)/bin/pkgconf - -LIBGTK3_CONF_OPTS = \ - --disable-glibtest \ - --enable-explicit-deps=no -HOST_LIBGTK3_CONF_OPTS = --disable-introspection - -# Override pkg-config pkgdatadir variable, it needs the prefix -LIBGTK3_MAKE_OPTS = \ - WAYLAND_PROTOCOLS_DATADIR=$(STAGING_DIR)/usr/share/wayland-protocols \ - LIBS=$(TARGET_NLS_LIBS) LIBGTK3_DEPENDENCIES = host-pkgconf host-libgtk3 atk libglib2 cairo pango \ gdk-pixbuf libepoxy $(TARGET_NLS_DEPENDENCIES) ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) -LIBGTK3_DEPENDENCIES += fontconfig xlib_libX11 xlib_libXext xlib_libXrender xlib_libXi - -LIBGTK3_CONF_OPTS += \ - --enable-x11-backend \ - --x-includes=$(STAGING_DIR)/usr/include/X11 \ - --x-libraries=$(STAGING_DIR)/usr/lib +LIBGTK3_DEPENDENCIES += fontconfig xlib_libX11 xlib_libXext xlib_libXrandr xlib_libXrender xlib_libXi +LIBGTK3_CONF_OPTS += -Dx11_backend=true else -LIBGTK3_CONF_OPTS += --disable-x11-backend +LIBGTK3_CONF_OPTS += -Dx11_backend=false endif ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) -LIBGTK3_CONF_OPTS += --enable-introspection +LIBGTK3_CONF_OPTS += -Dintrospection=true LIBGTK3_DEPENDENCIES += gobject-introspection else -LIBGTK3_CONF_OPTS += --disable-introspection +LIBGTK3_CONF_OPTS += -Dintrospection=false endif ifeq ($(BR2_PACKAGE_LIBGTK3_WAYLAND),y) LIBGTK3_DEPENDENCIES += wayland wayland-protocols libxkbcommon -LIBGTK3_CONF_OPTS += --enable-wayland-backend +LIBGTK3_CONF_OPTS += -Dwayland_backend=true else -LIBGTK3_CONF_OPTS += --disable-wayland-backend +LIBGTK3_CONF_OPTS += -Dwayland_backend=false endif ifeq ($(BR2_PACKAGE_LIBGTK3_BROADWAY),y) -LIBGTK3_CONF_OPTS += --enable-broadway-backend +LIBGTK3_CONF_OPTS += -Dbroadway_backend=true else -LIBGTK3_CONF_OPTS += --disable-broadway-backend +LIBGTK3_CONF_OPTS += -Dbroadway_backend=false endif ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y) -LIBGTK3_CONF_OPTS += --enable-xinerama +LIBGTK3_CONF_OPTS += -Dxinerama=yes LIBGTK3_DEPENDENCIES += xlib_libXinerama else -LIBGTK3_CONF_OPTS += --disable-xinerama -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXRANDR),y) -LIBGTK3_CONF_OPTS += --enable-xrandr -LIBGTK3_DEPENDENCIES += xlib_libXrandr -else -LIBGTK3_CONF_OPTS += --disable-xrandr +LIBGTK3_CONF_OPTS += -Dxinerama=no endif ifeq ($(BR2_PACKAGE_XLIB_LIBXCURSOR),y) @@ -83,55 +56,35 @@ LIBGTK3_DEPENDENCIES += xlib_libXcursor endif ifeq ($(BR2_PACKAGE_XLIB_LIBXFIXES),y) -LIBGTK3_CONF_OPTS += --enable-xfixes LIBGTK3_DEPENDENCIES += xlib_libXfixes -else -LIBGTK3_CONF_OPTS += --disable-xfixes endif ifeq ($(BR2_PACKAGE_XLIB_LIBXCOMPOSITE),y) -LIBGTK3_CONF_OPTS += --enable-xcomposite LIBGTK3_DEPENDENCIES += xlib_libXcomposite -else -LIBGTK3_CONF_OPTS += --disable-xcomposite endif ifeq ($(BR2_PACKAGE_XLIB_LIBXDAMAGE),y) -LIBGTK3_CONF_OPTS += --enable-xdamage LIBGTK3_DEPENDENCIES += xlib_libXdamage -else -LIBGTK3_CONF_OPTS += --disable-xdamage -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXKBFILE),y) -LIBGTK3_CONF_OPTS += --enable-xkb -LIBGTK3_DEPENDENCIES += xlib_libxkbfile -else -LIBGTK3_CONF_OPTS += --disable-xkb endif ifeq ($(BR2_PACKAGE_CUPS),y) -LIBGTK3_CONF_OPTS += --enable-cups -LIBGTK3_CONF_ENV += ac_cv_path_CUPS_CONFIG=$(STAGING_DIR)/usr/bin/cups-config +LIBGTK3_CONF_OPTS += -Dprint_backends=file,cups LIBGTK3_DEPENDENCIES += cups else -LIBGTK3_CONF_OPTS += --disable-cups +LIBGTK3_CONF_OPTS += -Dprint_backends=auto endif ifeq ($(BR2_PACKAGE_LIBGTK3_DEMO),y) +LIBGTK3_CONF_OPTS += -Ddemos=true -Dexamples=true LIBGTK3_DEPENDENCIES += hicolor-icon-theme shared-mime-info else -define LIBGTK3_REMOVE_DEMOS - $(RM) $(TARGET_DIR)/usr/bin/gtk3-demo \ - $(TARGET_DIR)/usr/bin/gtk3-demo-application -endef -LIBGTK3_POST_INSTALL_TARGET_HOOKS += LIBGTK3_REMOVE_DEMOS +LIBGTK3_CONF_OPTS += -Ddemos=false -Dexamples=false endif ifeq ($(BR2_PACKAGE_LIBGTK3_TESTS),y) -LIBGTK3_CONF_OPTS += --enable-installed-tests +LIBGTK3_CONF_OPTS += -Dtests=true -Dinstalled_tests=true else -LIBGTK3_CONF_OPTS += --disable-installed-tests +LIBGTK3_CONF_OPTS += -Dtests=false -Dinstalled_tests=false endif define LIBGTK3_COMPILE_GLIB_SCHEMAS @@ -193,10 +146,11 @@ endef # Create icon-theme.cache for each of the icon directories/themes # It's not strictly necessary but speeds up lookups define LIBGTK3_UPDATE_ICON_CACHE - find $(TARGET_DIR)/usr/share/icons -maxdepth 1 -mindepth 1 -type d \ - -exec $(HOST_DIR)/bin/gtk-update-icon-cache {} \; + [ ! -d $(TARGET_DIR)/usr/share/icons ] || \ + find $(TARGET_DIR)/usr/share/icons -maxdepth 1 -mindepth 1 -type d \ + -exec $(HOST_DIR)/bin/gtk-update-icon-cache {} \; endef LIBGTK3_TARGET_FINALIZE_HOOKS += LIBGTK3_UPDATE_ICON_CACHE -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) +$(eval $(meson-package)) +$(eval $(host-generic-package)) diff --git a/package/libgudev/libgudev.hash b/package/libgudev/libgudev.hash index 1040ffb0c07..90f27a02fc5 100644 --- a/package/libgudev/libgudev.hash +++ b/package/libgudev/libgudev.hash @@ -1,5 +1,5 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/libgudev/236/libgudev-236.sha256sum -sha256 e50369d06d594bae615eb7aeb787de304ebaad07a26d1043cef8e9c7ab7c9524 libgudev-236.tar.xz +# From https://download.gnome.org/sources/libgudev/237/libgudev-237.sha256sum +sha256 0d06b21170d20c93e4f0534dbb9b0a8b4f1119ffb00b4031aaeb5b9148b686aa libgudev-237.tar.xz # Hash for license file: sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libgudev/libgudev.mk b/package/libgudev/libgudev.mk index eabd446d7bc..ef0bd997fab 100644 --- a/package/libgudev/libgudev.mk +++ b/package/libgudev/libgudev.mk @@ -4,9 +4,9 @@ # ################################################################################ -LIBGUDEV_VERSION = 236 +LIBGUDEV_VERSION = 237 LIBGUDEV_SOURCE = libgudev-$(LIBGUDEV_VERSION).tar.xz -LIBGUDEV_SITE = http://ftp.gnome.org/pub/GNOME/sources/libgudev/$(LIBGUDEV_VERSION) +LIBGUDEV_SITE = https://download.gnome.org/sources/libgudev/$(LIBGUDEV_VERSION) LIBGUDEV_INSTALL_STAGING = YES LIBGUDEV_DEPENDENCIES = host-pkgconf udev libglib2 LIBGUDEV_LICENSE = LGPL-2.1+ diff --git a/package/libhtp/libhtp.hash b/package/libhtp/libhtp.hash index eae3009c762..8759823e161 100644 --- a/package/libhtp/libhtp.hash +++ b/package/libhtp/libhtp.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 d5956b49314fc6a058864130fbcf040a12584ee1e38f3b6ea52aedfa99d4c14a libhtp-0.5.39.tar.gz +sha256 0afaff837c295c868db8c967b87b1b5e21c0386c15c3b5ead474799724c54ef8 libhtp-0.5.40.tar.gz sha256 87c93904e5434c81622ea690c2b90097b9f162aaa92a96542649a157dbf98d15 LICENSE diff --git a/package/libhtp/libhtp.mk b/package/libhtp/libhtp.mk index 532eaa340b5..bb8aa73b424 100644 --- a/package/libhtp/libhtp.mk +++ b/package/libhtp/libhtp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBHTP_VERSION = 0.5.39 +LIBHTP_VERSION = 0.5.40 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 7edb29bd282..52046bd843c 100644 --- a/package/libical/libical.hash +++ b/package/libical/libical.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 089ce3c42d97fbd7a5d4b3c70adbdd82115dd306349c1f5c46a8fb3f8c949592 libical-1.0.1.tar.gz -sha256 c393726f82e6f21df5262110215f6a4382b32046d10afdcfcc49338aa7a191f2 LICENSE +sha256 089ce3c42d97fbd7a5d4b3c70adbdd82115dd306349c1f5c46a8fb3f8c949592 libical-1.0.1.tar.gz +sha256 c393726f82e6f21df5262110215f6a4382b32046d10afdcfcc49338aa7a191f2 LICENSE diff --git a/package/libiconv/libiconv.hash b/package/libiconv/libiconv.hash index 93ad555e155..e3a6125e259 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 ccf536620a45458d26ba83887a983b96827001e92a13847b45e4925cc8913178 libiconv-1.15.tar.gz # Hash for license files: -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING -sha256 56bdea73b6145ef6ac5259b3da390b981d840c24cb03b8e1cbc678de7ecfa18d COPYING.LIB +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 56bdea73b6145ef6ac5259b3da390b981d840c24cb03b8e1cbc678de7ecfa18d COPYING.LIB diff --git a/package/libidn/libidn.hash b/package/libidn/libidn.hash index c6cd668bbcb..837424d93e1 100644 --- a/package/libidn/libidn.hash +++ b/package/libidn/libidn.hash @@ -1,7 +1,7 @@ # Locally computed: -sha256 de00b840f757cd3bb14dd9a20d5936473235ddcba06d4bc2da804654b8bbf0f6 libidn-1.38.tar.gz +sha256 884d706364b81abdd17bee9686d8ff2ae7431c5a14651047c68adf8b31fd8945 libidn-1.41.tar.gz # Hash for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYINGv2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYINGv3 +sha256 e6037104443f9a7829b2aa7c5370d0789a7bda3ca65a0b904cdc0c2e285d9195 COPYINGv3 sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING.LESSERv3 diff --git a/package/libidn/libidn.mk b/package/libidn/libidn.mk index 4a400d195db..e1a357de1b2 100644 --- a/package/libidn/libidn.mk +++ b/package/libidn/libidn.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBIDN_VERSION = 1.38 +LIBIDN_VERSION = 1.41 LIBIDN_SITE = $(BR2_GNU_MIRROR)/libidn LIBIDN_INSTALL_STAGING = YES LIBIDN_CONF_ENV = EMACS="no" MAKEINFO=true diff --git a/package/libidn2/libidn2.hash b/package/libidn2/libidn2.hash index bc96d7e15a7..1051231bded 100644 --- a/package/libidn2/libidn2.hash +++ b/package/libidn2/libidn2.hash @@ -1,5 +1,5 @@ # Calculated locally after checking signature -sha256 76940cd4e778e8093579a9d195b25fff5e936e9dc6242068528b437a76764f91 libidn2-2.3.2.tar.gz +sha256 93caba72b4e051d1f8d4f5a076ab63c99b77faee019b72b9783b267986dbb45f libidn2-2.3.4.tar.gz # Hash for license files: sha256 73483f797a83373fca1b968c11785b98c4fc4803cdc7d3210811ca8b075d6d76 COPYING diff --git a/package/libidn2/libidn2.mk b/package/libidn2/libidn2.mk index 19fbe4aafda..9d24e93d27e 100644 --- a/package/libidn2/libidn2.mk +++ b/package/libidn2/libidn2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBIDN2_VERSION = 2.3.2 +LIBIDN2_VERSION = 2.3.4 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 @@ -13,10 +13,12 @@ LIBIDN2_DEPENDENCIES = \ host-pkgconf \ $(TARGET_NLS_DEPENDENCIES) \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) +LIBIDN2_CONF_OPTS = --without-included-libunistring LIBIDN2_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_LIBUNISTRING),y) LIBIDN2_DEPENDENCIES += libunistring +LIBIDN2_CONF_OPTS += --with-libunistring-prefix=$(STAGING_DIR)/usr/lib endif ifeq ($(BR2_PACKAGE_LIBIDN2_BINARY),) diff --git a/package/libiec61850/libiec61850.hash b/package/libiec61850/libiec61850.hash index 3a024be7c6e..a416ecdb4dd 100644 --- a/package/libiec61850/libiec61850.hash +++ b/package/libiec61850/libiec61850.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7b832c195ae9f42faa1ccfe1b82b9ff187103155ce45aaca08881be98459d164 libiec61850-1.5.0.tar.gz +sha256 b6d7ffac831e7d9aec3470e45e2f1734071859c95cab4cfe99ffd1091776b3cc libiec61850-1.5.1.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/libiec61850/libiec61850.mk b/package/libiec61850/libiec61850.mk index 6da782ad393..4b61e40c6d1 100644 --- a/package/libiec61850/libiec61850.mk +++ b/package/libiec61850/libiec61850.mk @@ -4,12 +4,15 @@ # ################################################################################ -LIBIEC61850_VERSION = 1.5.0 -LIBIEC61850_SITE = $(call github,mz-automation,libiec61850,v$(LIBIEC61850_VERSION)) +LIBIEC61850_VERSION = 1.5.1 +LIBIEC61850_SITE = https://libiec61850.com/wp-content/uploads/2022/03 LIBIEC61850_INSTALL_STAGING = YES LIBIEC61850_LICENSE = GPL-3.0+ LIBIEC61850_LICENSE_FILES = COPYING LIBIEC61850_CPE_ID_VENDOR = mz-automation LIBIEC61850_CONF_OPTS = -DBUILD_PYTHON_BINDINGS=OFF +# Examples aren't build +# https://github.com/mz-automation/libiec61850/issues/442 +LIBIEC61850_IGNORE_CVES += CVE-2023-27772 $(eval $(cmake-package)) diff --git a/package/libiio/0001-iiod-serial.c-fix-sparc-build.patch b/package/libiio/0001-iiod-serial.c-fix-sparc-build.patch new file mode 100644 index 00000000000..1c2d606e631 --- /dev/null +++ b/package/libiio/0001-iiod-serial.c-fix-sparc-build.patch @@ -0,0 +1,76 @@ +From 40ffc5d9b8f6e47866292bf1365ac3a5d22cf123 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 25 Sep 2022 11:19:18 +0200 +Subject: [PATCH] iiod/serial.c: fix sparc build + +Fix the following sparc build failure raised since version 0.24 and +https://github.com/analogdevicesinc/libiio/commit/2d3cae005f364742b3a9e7234d15b2fd2cbac664: + +/home/buildroot/autobuild/instance-0/output-1/build/libiio-0.24/iiod/serial.c: In function 'serial_configure': +/home/buildroot/autobuild/instance-0/output-1/build/libiio-0.24/iiod/serial.c:99:58: error: 'B2500000' undeclared (first use in this function); did you mean 'B1500000'? + 99 | #define CASE_BPS(bps, attr) case bps: (attr)->c_cflag |= B##bps; break + | ^ +/home/buildroot/autobuild/instance-0/output-1/build/libiio-0.24/iiod/serial.c:127:9: note: in expansion of macro 'CASE_BPS' + 127 | CASE_BPS(2500000, &tty_attrs); + | ^~~~~~~~ +/home/buildroot/autobuild/instance-0/output-1/build/libiio-0.24/iiod/serial.c:99:58: note: each undeclared identifier is reported only once for each function it appears in + 99 | #define CASE_BPS(bps, attr) case bps: (attr)->c_cflag |= B##bps; break + | ^ +/home/buildroot/autobuild/instance-0/output-1/build/libiio-0.24/iiod/serial.c:127:9: note: in expansion of macro 'CASE_BPS' + 127 | CASE_BPS(2500000, &tty_attrs); + | ^~~~~~~~ +/home/buildroot/autobuild/instance-0/output-1/build/libiio-0.24/iiod/serial.c:99:58: error: 'B3000000' undeclared (first use in this function); did you mean 'B1000000'? + 99 | #define CASE_BPS(bps, attr) case bps: (attr)->c_cflag |= B##bps; break + | ^ +/home/buildroot/autobuild/instance-0/output-1/build/libiio-0.24/iiod/serial.c:128:9: note: in expansion of macro 'CASE_BPS' + 128 | CASE_BPS(3000000, &tty_attrs); + | ^~~~~~~~ +/home/buildroot/autobuild/instance-0/output-1/build/libiio-0.24/iiod/serial.c:99:58: error: 'B3500000' undeclared (first use in this function); did you mean 'B1500000'? + 99 | #define CASE_BPS(bps, attr) case bps: (attr)->c_cflag |= B##bps; break + | ^ +/home/buildroot/autobuild/instance-0/output-1/build/libiio-0.24/iiod/serial.c:129:9: note: in expansion of macro 'CASE_BPS' + 129 | CASE_BPS(3500000, &tty_attrs); + | ^~~~~~~~ +/home/buildroot/autobuild/instance-0/output-1/build/libiio-0.24/iiod/serial.c:99:58: error: 'B4000000' undeclared (first use in this function); did you mean 'B1000000'? + 99 | #define CASE_BPS(bps, attr) case bps: (attr)->c_cflag |= B##bps; break + | ^ +/home/buildroot/autobuild/instance-0/output-1/build/libiio-0.24/iiod/serial.c:130:9: note: in expansion of macro 'CASE_BPS' + 130 | CASE_BPS(4000000, &tty_attrs); + | ^~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/8a9902f6eddaab812ebce3506ed6de686f647e02 + +Signed-off-by: Fabrice Fontaine +[yann.morin.1998@free.fr: actual backport now that upstream accepted it] +Signed-off-by: Yann E. MORIN +--- + iiod/serial.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/iiod/serial.c b/iiod/serial.c +index f829361d..b140d051 100644 +--- a/iiod/serial.c ++++ b/iiod/serial.c +@@ -124,10 +124,18 @@ static int serial_configure(int fd, unsigned int uart_bps, + CASE_BPS(1152000, &tty_attrs); + CASE_BPS(1500000, &tty_attrs); + CASE_BPS(2000000, &tty_attrs); ++#ifdef B2500000 /* Not available on all architectures, i.e. sparc */ + CASE_BPS(2500000, &tty_attrs); ++#endif ++#ifdef B3000000 /* Not available on all architectures, i.e. sparc */ + CASE_BPS(3000000, &tty_attrs); ++#endif ++#ifdef B3500000 /* Not available on all architectures, i.e. sparc */ + CASE_BPS(3500000, &tty_attrs); ++#endif ++#ifdef B4000000 /* Not available on all architectures, i.e. sparc */ + CASE_BPS(4000000, &tty_attrs); ++#endif + default: + IIO_ERROR("Invalid baud rate\n"); + return -EINVAL; +-- +2.25.1 + diff --git a/package/libiio/Config.in b/package/libiio/Config.in index 9ddf44fdc1b..1b8938bb1a8 100644 --- a/package/libiio/Config.in +++ b/package/libiio/Config.in @@ -45,7 +45,7 @@ config BR2_PACKAGE_LIBIIO_NETWORK_BACKEND config BR2_PACKAGE_LIBIIO_USB_BACKEND bool "USB backend" default y - depends on BR2_TOOLCHAIN_HAS_THREADS # from libusb + depends on BR2_TOOLCHAIN_HAS_THREADS # libusb depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBIIO_XML_BACKEND select BR2_PACKAGE_LIBUSB diff --git a/package/libimxvpuapi/libimxvpuapi.hash b/package/libimxvpuapi/libimxvpuapi.hash index 6e0e5d60c99..1ab5196c801 100644 --- a/package/libimxvpuapi/libimxvpuapi.hash +++ b/package/libimxvpuapi/libimxvpuapi.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 7151e10a24929935bada1d3d87626f17e411575b3a4ac0d86440999ad0100a55 libimxvpuapi-0.10.3.tar.gz -sha256 4bb33cc4cd956b56b779b501f18cae46a9e26f8c8500cca86ed758b8bc5e1788 LICENSE +sha256 7151e10a24929935bada1d3d87626f17e411575b3a4ac0d86440999ad0100a55 libimxvpuapi-0.10.3.tar.gz +sha256 4bb33cc4cd956b56b779b501f18cae46a9e26f8c8500cca86ed758b8bc5e1788 LICENSE diff --git a/package/libinput/Config.in b/package/libinput/Config.in index 14e4e70f96a..1a8fcc7ed47 100644 --- a/package/libinput/Config.in +++ b/package/libinput/Config.in @@ -13,5 +13,27 @@ config BR2_PACKAGE_LIBINPUT http://freedesktop.org/wiki/Software/libinput/ +if BR2_PACKAGE_LIBINPUT + +config BR2_PACKAGE_LIBINPUT_PYTHON_TOOLS + bool "install python tools " + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_LIBEVDEV # runtime + select BR2_PACKAGE_PYTHON_PYUDEV # runtime + select BR2_PACKAGE_PYTHON_PYYAML # runtime + help + Install python tools: + libinput-analyze-per-slot-delta, + libinput-analyze-recording, + libinput-analyze-touch-down-state, + libinput-measure-fuzz, + libinput-measure-touchpad-pressure, + libinput-measure-touchpad-size, + libinput-measure-touchpad-tap, + libinput-measure-touch-size, + libinput-replay + +endif + comment "libinput needs udev /dev management" depends on !BR2_PACKAGE_HAS_UDEV diff --git a/package/libinput/libinput.hash b/package/libinput/libinput.hash index f18a7278101..d8282ff03b5 100644 --- a/package/libinput/libinput.hash +++ b/package/libinput/libinput.hash @@ -1,6 +1,5 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2021-December/042068.html -sha256 3cae78ccde19d7d0f387e58bc734d4d17ab5f6426f54a9e8b728c90b17baa068 libinput-1.19.3.tar.xz -sha512 f4b776d0da78c687ba21b430a04941ac6b43f68970c82ec9f7360358fdea5ed6a873948ce66a25bcdd64d4b95fa4bf705cc24dbc25c7c0f5fd2d0efbd763f298 libinput-1.19.3.tar.xz +# Locally computed +sha256 08c003f724f361ed21f4dfbfe755a6c115b85385f1418907bb98f185457273f0 libinput-1.20.1.tar.bz2 # License files sha256 80de50b2022a840db044c56db804ca3565600a692c0714babface587acc6d1b0 COPYING diff --git a/package/libinput/libinput.mk b/package/libinput/libinput.mk index 2f9c639c221..d9a7ed1519d 100644 --- a/package/libinput/libinput.mk +++ b/package/libinput/libinput.mk @@ -4,13 +4,14 @@ # ################################################################################ -LIBINPUT_VERSION = 1.19.3 -LIBINPUT_SOURCE = libinput-$(LIBINPUT_VERSION).tar.xz -LIBINPUT_SITE = http://www.freedesktop.org/software/libinput +LIBINPUT_VERSION = 1.20.1 +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_INSTALL_STAGING = YES LIBINPUT_LICENSE = MIT LIBINPUT_LICENSE_FILES = COPYING +LIBINPUT_CPE_ID_VENDOR = freedesktop # Tests need fork, so just disable them everywhere. LIBINPUT_CONF_OPTS = -Dtests=false -Dlibwacom=false -Ddocumentation=false @@ -30,4 +31,23 @@ else LIBINPUT_CONF_OPTS += -Ddebug-gui=false endif +ifeq ($(BR2_PACKAGE_LIBINPUT_PYTHON_TOOLS),) +LIBINPUT_PYTHON_TOOLS = libinput-analyze-per-slot-delta \ + libinput-analyze-recording \ + libinput-analyze-touch-down-state \ + libinput-measure-fuzz \ + libinput-measure-touchpad-pressure \ + libinput-measure-touchpad-size \ + libinput-measure-touchpad-tap \ + libinput-measure-touch-size \ + libinput-replay + +define LIBINPUT_REMOVE_UNNEEDED_FILES + $(foreach f,$(LIBINPUT_PYTHON_TOOLS), \ + rm -f $(TARGET_DIR)/usr/libexec/libinput/$(f) + ) +endef +LIBINPUT_POST_INSTALL_TARGET_HOOKS += LIBINPUT_REMOVE_UNNEEDED_FILES +endif + $(eval $(meson-package)) diff --git a/package/libiscsi/libiscsi.hash b/package/libiscsi/libiscsi.hash index b70bb423dc7..769035837c5 100644 --- a/package/libiscsi/libiscsi.hash +++ b/package/libiscsi/libiscsi.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 c7848ac722c8361d5064654bc6e926c2be61ef11dd3875020a63931836d806df libiscsi-1.19.0.tar.gz -sha256 88e3eccc48722b2a0eaff456dda94b8e8e123848d01f631969bec8e3c6c6eb85 COPYING -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENCE-GPL-2.txt -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENCE-LGPL-2.1.txt +sha256 c7848ac722c8361d5064654bc6e926c2be61ef11dd3875020a63931836d806df libiscsi-1.19.0.tar.gz +sha256 88e3eccc48722b2a0eaff456dda94b8e8e123848d01f631969bec8e3c6c6eb85 COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENCE-GPL-2.txt +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENCE-LGPL-2.1.txt diff --git a/package/libite/libite.hash b/package/libite/libite.hash index 1dec65bd6b1..7dac198ab87 100644 --- a/package/libite/libite.hash +++ b/package/libite/libite.hash @@ -1,5 +1,5 @@ # Upstream .sha256 from GitHub -sha256 5278fa0ca933727c78f4e05082cea58256d9302afac30bad0c3760cf2a18ef8f libite-2.5.1.tar.xz +sha256 ca086adc7ebf0c2ebf2ed7a6787f9567fb802db8583576228dd5dd5ddfb7bb97 libite-2.5.3.tar.xz # Locally calculated sha256 20db0601195f708d68ff7907907b3cd3b25808efa8332e064b11f00c839a5d2f LICENSE diff --git a/package/libite/libite.mk b/package/libite/libite.mk index 185ffe77de8..1cef992e533 100644 --- a/package/libite/libite.mk +++ b/package/libite/libite.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBITE_VERSION = 2.5.1 +LIBITE_VERSION = 2.5.3 LIBITE_SOURCE = libite-$(LIBITE_VERSION).tar.xz LIBITE_SITE = https://github.com/troglobit/libite/releases/download/v$(LIBITE_VERSION) LIBITE_LICENSE = MIT, X11, ISC, BSD-2-Clause diff --git a/package/libjxl/0001-djxl-fix-segmentation-fault-when-JPEG-is-disabled.patch b/package/libjxl/0001-djxl-fix-segmentation-fault-when-JPEG-is-disabled.patch new file mode 100644 index 00000000000..3d709c956b9 --- /dev/null +++ b/package/libjxl/0001-djxl-fix-segmentation-fault-when-JPEG-is-disabled.patch @@ -0,0 +1,44 @@ +From 504f35c8204248ae6f97278e8b7c6cc5853a1b94 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Fri, 10 Feb 2023 21:31:30 +0100 +Subject: [PATCH] djxl: fix segmentation fault when JPEG is disabled + +When libjxl is compiled without JPEG support, by configuring for example +with: + + cmake -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=TRUE ... + +djxl crashes with a segmentation fault at: +https://github.com/libjxl/libjxl/blob/v0.8.1/tools/djxl_main.cc#L367 + +The crash can be reproduced with the sequence: + + gm convert IMAGE:LOGO ref.ppm + cjxl ref.ppm enc.jxl + djxl enc.jxl dec.ppm + +The crash happen because opt_jpeg_quality_id does not get +initialized at: +https://github.com/libjxl/libjxl/blob/v0.8.1/tools/djxl_main.cc#L107 + +This commit fixes the crash by adding a test on opt_jpeg_quality_id. + +Signed-off-by: Julien Olivain +[Retrieved from: +https://github.com/libjxl/libjxl/pull/2178/commits/504f35c8204248ae6f97278e8b7c6cc5853a1b94] +--- + tools/djxl_main.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tools/djxl_main.cc b/tools/djxl_main.cc +index b755301fcb..42b889e7ce 100644 +--- a/tools/djxl_main.cc ++++ b/tools/djxl_main.cc +@@ -370,6 +370,7 @@ int main(int argc, const char* argv[]) { + args.color_space = force_colorspace; + } + if (codec == jxl::extras::Codec::kPNM && extension != ".pfm" && ++ args.opt_jpeg_quality_id != -1 && + !cmdline.GetOption(args.opt_jpeg_quality_id)->matched()) { + args.bits_per_sample = 0; + } diff --git a/package/libjxl/0002-Add-missing-atomic-content-to-fix-gcc-compilation-fo.patch b/package/libjxl/0002-Add-missing-atomic-content-to-fix-gcc-compilation-fo.patch new file mode 100644 index 00000000000..b856b00728a --- /dev/null +++ b/package/libjxl/0002-Add-missing-atomic-content-to-fix-gcc-compilation-fo.patch @@ -0,0 +1,47 @@ +From 42e944a471672dae8522fbcf161941895ba16632 Mon Sep 17 00:00:00 2001 +From: Eastdong <31920925+IEAST@users.noreply.github.com> +Date: Thu, 23 Feb 2023 06:08:36 +0800 +Subject: [PATCH] Add missing content to fix gcc compilation for RISCV + architecture. (#2211) + +* Add missing content to fix gcc compilation for RISCV architecture. + +* add name to AUTHORS + +* lint fix + +Co-authored-by: Moritz Firsching +Upstream: https://github.com/libjxl/libjxl/commit/22d12d74e7bc56b09cfb1973aa89ec8d714fa3fc +Signed-off-by: Julien Olivain +--- + AUTHORS | 1 + + lib/jxl/enc_xyb.cc | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/AUTHORS b/AUTHORS +index 44dcc409..3340422d 100644 +--- a/AUTHORS ++++ b/AUTHORS +@@ -30,6 +30,7 @@ Daniel Novomeský + David Burnett + Dirk Lemstra + Don Olmstead ++Dong Xu + Even Rouault + Fred Brennan + Heiko Becker +diff --git a/lib/jxl/enc_xyb.cc b/lib/jxl/enc_xyb.cc +index c7310765..2fd5d025 100644 +--- a/lib/jxl/enc_xyb.cc ++++ b/lib/jxl/enc_xyb.cc +@@ -6,6 +6,7 @@ + #include "lib/jxl/enc_xyb.h" + + #include ++#include + #include + + #undef HWY_TARGET_INCLUDE +-- +2.41.0 + diff --git a/package/libjxl/Config.in b/package/libjxl/Config.in new file mode 100644 index 00000000000..923560298fc --- /dev/null +++ b/package/libjxl/Config.in @@ -0,0 +1,26 @@ +config BR2_PACKAGE_LIBJXL + bool "libjxl" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # highway + depends on BR2_TOOLCHAIN_HAS_ATOMIC # highway + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_INSTALL_LIBSTDCPP # highway + # libjxl fail to link statically due to libatomic issue + depends on !BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_81426 + select BR2_HOST_CMAKE_AT_LEAST_3_19 + select BR2_PACKAGE_BROTLI + select BR2_PACKAGE_HIGHWAY + select BR2_PACKAGE_LCMS2 + help + libjxl is the reference implementation of JPEG XL (encoder + and decoder). + + https://github.com/libjxl/libjxl + +comment "libjxl needs a toolchain with C++, threads, gcc >= 7, dynamic library" + depends on BR2_TOOLCHAIN_HAS_ATOMIC + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_81426 + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ + !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_STATIC_LIBS diff --git a/package/libjxl/libjxl.hash b/package/libjxl/libjxl.hash new file mode 100644 index 00000000000..c8f98d10ea9 --- /dev/null +++ b/package/libjxl/libjxl.hash @@ -0,0 +1,4 @@ +# Locally computed: +sha256 c70916fb3ed43784eb840f82f05d390053a558e2da106e40863919238fa7b420 libjxl-0.8.2.tar.gz +sha256 8405932022a556380c2d8c272eff154a923feb197233f348ce5f7334fb0a5ede LICENSE +sha256 91915f8ae056a68a3c5bdf05d9f6f78bb6903e27a8ca3a8434c9e4ac87300575 PATENTS diff --git a/package/libjxl/libjxl.mk b/package/libjxl/libjxl.mk new file mode 100644 index 00000000000..47c110eb537 --- /dev/null +++ b/package/libjxl/libjxl.mk @@ -0,0 +1,42 @@ +################################################################################ +# +# libjxl +# +################################################################################ + +LIBJXL_VERSION = 0.8.2 +LIBJXL_SITE = $(call github,libjxl,libjxl,v$(LIBJXL_VERSION)) +LIBJXL_LICENSE = BSD-3-Clause +LIBJXL_LICENSE_FILES = LICENSE PATENTS +LIBJXL_CPE_ID_VENDOR = libjxl_project +LIBJXL_INSTALL_STAGING = YES + +LIBJXL_DEPENDENCIES = \ + brotli \ + lcms2 \ + highway + +ifeq ($(BR2_PACKAGE_LIBPNG),y) +LIBJXL_DEPENDENCIES += libpng +endif + +LIBJXL_CONF_OPTS = \ + -DJPEGXL_BUNDLE_LIBPNG=OFF \ + -DJPEGXL_BUNDLE_SKCMS=OFF \ + -DJPEGXL_ENABLE_BENCHMARK=OFF \ + -DJPEGXL_ENABLE_DOXYGEN=OFF \ + -DJPEGXL_ENABLE_EXAMPLES=OFF \ + -DJPEGXL_ENABLE_JNI=OFF \ + -DJPEGXL_ENABLE_MANPAGES=OFF \ + -DJPEGXL_ENABLE_OPENEXR=OFF \ + -DJPEGXL_ENABLE_SJPEG=OFF \ + -DJPEGXL_ENABLE_SKCMS=OFF + +ifeq ($(BR2_PACKAGE_JPEG_TURBO),y) +LIBJXL_DEPENDENCIES += jpeg-turbo +LIBJXL_CONF_OPTS += -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=OFF +else +LIBJXL_CONF_OPTS += -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=ON +endif + +$(eval $(cmake-package)) diff --git a/package/libkcapi/0001-Disable-use-of-__NR_io_getevents-when-not-defined.patch b/package/libkcapi/0001-Disable-use-of-__NR_io_getevents-when-not-defined.patch deleted file mode 100644 index 20aa75b741c..00000000000 --- a/package/libkcapi/0001-Disable-use-of-__NR_io_getevents-when-not-defined.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 455c4938f5822c017c7ff79dd2dca638b6410923 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 15 Nov 2020 18:05:48 -0800 -Subject: [PATCH] Disable use of __NR_io_getevents when not defined - -Architectures like riscv32 do not define this syscall, therefore return -ENOSYS on such architectures - -Upstream-Status: Pending -Signed-off-by: Khem Raj -Signed-off-by: Stephan Mueller -[Retrieved from: -https://github.com/smuellerDD/libkcapi/commit/455c4938f5822c017c7ff79dd2dca638b6410923] -Signed-off-by: Fabrice Fontaine ---- - lib/internal.h | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/lib/internal.h b/lib/internal.h -index 1237827..f765461 100644 ---- a/lib/internal.h -+++ b/lib/internal.h -@@ -325,10 +325,17 @@ static inline int io_submit(aio_context_t ctx, long n, struct iocb **iocb) - return syscall(__NR_io_submit, ctx, n, iocb); - } - --static inline int io_getevents(aio_context_t ctx, long min, long max, -- struct io_event *events, struct timespec *timeout) -+static inline int io_getevents(__attribute__((unused)) aio_context_t ctx, -+ __attribute__((unused)) long min, -+ __attribute__((unused)) long max, -+ __attribute__((unused)) struct io_event *events, -+ __attribute__((unused)) struct timespec *timeout) - { -+#ifdef __NR_io_getevents - return syscall(__NR_io_getevents, ctx, min, max, events, timeout); -+#else -+ return -ENOSYS; -+#endif - } - - /************************************************************ diff --git a/package/libkcapi/0001-lib-kcapi-kernel-if.c-fix-uclibc-build.patch b/package/libkcapi/0001-lib-kcapi-kernel-if.c-fix-uclibc-build.patch new file mode 100644 index 00000000000..818150dafbf --- /dev/null +++ b/package/libkcapi/0001-lib-kcapi-kernel-if.c-fix-uclibc-build.patch @@ -0,0 +1,55 @@ +From 4d9bbc866682bdf46c78047dca02230372620295 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 6 Nov 2022 17:05:14 +0100 +Subject: [PATCH] lib/kcapi-kernel-if.c: fix uclibc build + +Fix the following uclibc build failure raised since version 1.4.0 and +https://github.com/smuellerDD/libkcapi/commit/12f19b9a1dd308117f83e8cb33e28e3c040710a0: + +lib/kcapi-kernel-if.c: In function '_kcapi_common_send_meta': +lib/kcapi-kernel-if.c:196:26: error: conversion to 'int' from 'size_t' {aka 'unsigned int'} may change the sign of the result [-Werror=sign-conversion] + 196 | msg.msg_iovlen = kcapi_downcast_int(iovlen); + | ^~~~~~~~~~~~~~~~~~ + +Indeed, uclibc has the same behavior than musl when __WORDSIZE != 32 +even if it defines __GLIBC__: +https://github.com/wbx-github/uclibc-ng/blob/ab1dd83bec59c9e65c31efd6e887182948f627be/libc/sysdeps/linux/common/bits/socket.h + +Fixes: + - http://autobuild.buildroot.org/results/eccf4b84670b5ef0fdd68b46338edf5043c7cc0d + +Signed-off-by: Tan En De +Signed-off-by: Fabrice Fontaine +Signed-off-by: Stephan Mueller +[Retrieved from: +https://github.com/smuellerDD/libkcapi/commit/4d9bbc866682bdf46c78047dca02230372620295] +--- + lib/kcapi-kernel-if.c | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +diff --git a/lib/kcapi-kernel-if.c b/lib/kcapi-kernel-if.c +index d7b10bf..b4d7f74 100644 +--- a/lib/kcapi-kernel-if.c ++++ b/lib/kcapi-kernel-if.c +@@ -119,7 +119,7 @@ int _kcapi_common_accept(struct kcapi_handle *handle) + return 0; + } + +-#ifdef __GLIBC__ ++#if defined(__GLIBC__) && !(defined(__UCLIBC__) && __WORDSIZE == 32) + static inline size_t kcapi_downcast_int(size_t in) + { + return in; +@@ -564,11 +564,7 @@ ssize_t _kcapi_common_recv_data(struct kcapi_handle *handle, + msg.msg_controllen = 0; + msg.msg_flags = 0; + msg.msg_iov = iov; +-#ifdef __GLIBC__ +- msg.msg_iovlen = iovlen; +-#else +- msg.msg_iovlen = (int)iovlen; +-#endif ++ msg.msg_iovlen = kcapi_downcast_int(iovlen); + ret = recvmsg(*_kcapi_get_opfd(handle), &msg, 0); + if (ret < 0) + ret = -errno; diff --git a/package/libkcapi/0002-Add-disable-werror.patch b/package/libkcapi/0002-Add-disable-werror.patch new file mode 100644 index 00000000000..4f2f55f1457 --- /dev/null +++ b/package/libkcapi/0002-Add-disable-werror.patch @@ -0,0 +1,46 @@ +From c27b154f03ad7e94447c7114d73aee60f0098093 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 7 Nov 2022 13:38:06 +0100 +Subject: [PATCH] Add --disable-werror + +Allow the user to disable -Werror through --disable-werror + +Signed-off-by: Fabrice Fontaine +Signed-off-by: Stephan Mueller +[Retrieved from: +https://github.com/smuellerDD/libkcapi/commit/c27b154f03ad7e94447c7114d73aee60f0098093] +--- + Makefile.am | 5 ++++- + configure.ac | 3 +++ + 2 files changed, 7 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 1c95d3d..cddedac 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -2,7 +2,10 @@ ACLOCAL_AMFLAGS = -I m4 + AUTOMAKE_OPTIONS = subdir-objects + lib_LTLIBRARIES = libkcapi.la + +-COMMON_CPPFLAGS = -Wextra -Wall -pedantic -fwrapv --param ssp-buffer-size=4 -O2 -Werror -std=gnu99 -Wconversion ++COMMON_CPPFLAGS = -Wextra -Wall -pedantic -fwrapv --param ssp-buffer-size=4 -O2 -std=gnu99 -Wconversion ++if ENABLE_WERROR ++COMMON_CPPFLAGS += -Werror ++endif + COMMON_LDFLAGS = -Wl,-z,relro,-z,now + + libtool: $(LIBTOOL_DEPS) +diff --git a/configure.ac b/configure.ac +index cb910e2..e230577 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -76,6 +76,9 @@ AX_ADD_FORTIFY_SOURCE + + AC_CHECK_API_VERSION + ++AC_ARG_ENABLE([werror], [AS_HELP_STRING([--disable-werror], [Disable -Werror])], [with_werror=$enableval], [with_werror=yes]) ++AM_CONDITIONAL([ENABLE_WERROR], [test "x$with_werror" = "xyes"]) ++ + AC_ARG_ENABLE([kcapi-test], [AS_HELP_STRING([--enable-kcapi-test], [Compile kcapi test program])], [with_kcapi_test=$enableval]) + AM_CONDITIONAL([ENABLE_KCAPI_TEST], [test "x$with_kcapi_test" = "xyes"]) + diff --git a/package/libkcapi/0003-Fix-symver-build-error-on-non-ELF-platforms.patch b/package/libkcapi/0003-Fix-symver-build-error-on-non-ELF-platforms.patch new file mode 100644 index 00000000000..206ac7ec4a5 --- /dev/null +++ b/package/libkcapi/0003-Fix-symver-build-error-on-non-ELF-platforms.patch @@ -0,0 +1,84 @@ +From f630ed1f807e26de04b3a5dfd7f1b39d1c5cb642 Mon Sep 17 00:00:00 2001 +From: Tan En De +Date: Sat, 26 Nov 2022 07:47:39 +0800 +Subject: [PATCH] Fix symver build error on non-ELF platforms + +The following error is observed on Microblaze [1] build: +``` +error: symver is only supported on ELF platforms +``` +due to using __attribute__((symver)) on non-ELF platform. +So, revert to using .symver in such case. + +[1]: http://autobuild.buildroot.net/results/447/4470efb5a078c0e368f6bd4f5ec455eea5eeebb5/build-end.log + +Signed-off-by: Tan En De +Signed-off-by: Stephan Mueller +--- +Upstream status: commit f630ed1f807e26de04b3a5dfd7f1b39d1c5cb642 + + configure.ac | 2 ++ + lib/internal.h | 2 +- + m4/ac_check_attribute_symver.m4 | 24 ++++++++++++++++++++++++ + 3 files changed, 27 insertions(+), 1 deletion(-) + create mode 100644 m4/ac_check_attribute_symver.m4 + +diff --git a/configure.ac b/configure.ac +index e230577..ba17404 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -76,6 +76,8 @@ AX_ADD_FORTIFY_SOURCE + + AC_CHECK_API_VERSION + ++AC_CHECK_ATTRIBUTE_SYMVER ++ + AC_ARG_ENABLE([werror], [AS_HELP_STRING([--disable-werror], [Disable -Werror])], [with_werror=$enableval], [with_werror=yes]) + AM_CONDITIONAL([ENABLE_WERROR], [test "x$with_werror" = "xyes"]) + +diff --git a/lib/internal.h b/lib/internal.h +index 14844a9..7977b04 100644 +--- a/lib/internal.h ++++ b/lib/internal.h +@@ -352,7 +352,7 @@ static inline int io_getevents(__attribute__((unused)) aio_context_t ctx, + * Auxiliary macros + ************************************************************/ + +-#if __GNUC__ >= 10 ++#if HAVE_ATTRIBUTE_SYMVER && __GNUC__ >= 10 + # define IMPL_SYMVER(name, version) \ + __attribute__((__symver__("kcapi_" #name "@@LIBKCAPI_" version))) + +diff --git a/m4/ac_check_attribute_symver.m4 b/m4/ac_check_attribute_symver.m4 +new file mode 100644 +index 0000000..b484c5e +--- /dev/null ++++ b/m4/ac_check_attribute_symver.m4 +@@ -0,0 +1,24 @@ ++dnl Check compiler support for symver function attribute ++AC_DEFUN([AC_CHECK_ATTRIBUTE_SYMVER], [ ++ saved_CFLAGS=$CFLAGS ++ CFLAGS="-O0 -Werror" ++ AC_COMPILE_IFELSE( ++ [AC_LANG_PROGRAM( ++ [[ ++ void _test_attribute_symver(void); ++ __attribute__((__symver__("sym@VER_1.2.3"))) void _test_attribute_symver(void) {} ++ ]], ++ [[ ++ _test_attribute_symver() ++ ]] ++ )], ++ [ ++ AC_DEFINE([HAVE_ATTRIBUTE_SYMVER], 1, [Define to 1 if __attribute__((symver)) is supported]) ++ ], ++ [ ++ AC_DEFINE([HAVE_ATTRIBUTE_SYMVER], 0, [Define to 0 if __attribute__((symver)) is not supported]) ++ ] ++ ) ++ CFLAGS=$saved_CFLAGS ++]) ++ +-- +2.34.1 + diff --git a/package/libkcapi/Config.in b/package/libkcapi/Config.in index 8243f6b738e..bf9c95270c2 100644 --- a/package/libkcapi/Config.in +++ b/package/libkcapi/Config.in @@ -8,6 +8,16 @@ config BR2_PACKAGE_LIBKCAPI if BR2_PACKAGE_LIBKCAPI +config BR2_PACKAGE_LIBKCAPI_ASYM + bool "build asymmetric ciphers library" + help + Using this library requires the Linux kernel to be patched + with libkcapi Linux kernel patches found in libkcapi + kernel-patches/ directory. + +config BR2_PACKAGE_LIBKCAPI_DGSTAPP + bool "build dgst application" + config BR2_PACKAGE_LIBKCAPI_ENCAPP bool "build enc application" @@ -18,6 +28,13 @@ config BR2_PACKAGE_LIBKCAPI_HASHER comment "hasher application needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS +config BR2_PACKAGE_LIBKCAPI_KPP + bool "build KPP library" + help + Using this library requires the Linux kernel to be patched + with libkcapi Linux kernel patches found in libkcapi + kernel-patches/ directory. + config BR2_PACKAGE_LIBKCAPI_RNGAPP bool "build rng read application" diff --git a/package/libkcapi/libkcapi.hash b/package/libkcapi/libkcapi.hash index b3c2c749c34..d8580864086 100644 --- a/package/libkcapi/libkcapi.hash +++ b/package/libkcapi/libkcapi.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 8a08dcbb4d05ede4357cdc9d61c7f2a7f2cd96b7ce2eb41b28e45b2e378267ad libkcapi-1.1.5.tar.xz -sha256 c6b8402a68999b0f84560ab43cdf60f9ff33c4a9a8ced6a40db9d3b787ba5b4a COPYING -sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING.gplv2 -sha256 13aa749a5b0a454917a944ed8fffc530b784f5ead522b1aacaf4ec8aa55a6239 COPYING.bsd +sha256 644b47593b3f27f08add7a8808ccdbe569a2f331d70fb8b52551e57379b917fa libkcapi-1.4.0.tar.xz +sha256 9765fad61726afb2b253db2c68153672e4178d6809667ae98141f3e90fe8645b COPYING +sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING.gplv2 +sha256 13aa749a5b0a454917a944ed8fffc530b784f5ead522b1aacaf4ec8aa55a6239 COPYING.bsd diff --git a/package/libkcapi/libkcapi.mk b/package/libkcapi/libkcapi.mk index 60b3f943882..c6251c286cd 100644 --- a/package/libkcapi/libkcapi.mk +++ b/package/libkcapi/libkcapi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBKCAPI_VERSION = 1.1.5 +LIBKCAPI_VERSION = 1.4.0 LIBKCAPI_SOURCE = libkcapi-$(LIBKCAPI_VERSION).tar.xz LIBKCAPI_SITE = http://www.chronox.de/libkcapi LIBKCAPI_AUTORECONF = YES @@ -15,6 +15,20 @@ LIBKCAPI_CONF_ENV = \ ac_cv_path_DB2PDF="" \ ac_cv_path_DB2PS="" \ ac_cv_path_XMLTO="" +LIBKCAPI_CONF_OPTS = --disable-werror +LIBKCAPI_MAKE_OPTS = CPPFLAGS="$(TARGET_CPPFLAGS)" + +ifeq ($(BR2_PACKAGE_LIBKCAPI_ASYM),y) +LIBKCAPI_CONF_OPTS += --enable-lib-asym +else +LIBKCAPI_CONF_OPTS += --disable-lib-asym +endif + +ifeq ($(BR2_PACKAGE_LIBKCAPI_DGSTAPP),y) +LIBKCAPI_CONF_OPTS += --enable-kcapi-dgstapp +else +LIBKCAPI_CONF_OPTS += --disable-kcapi-dgstapp +endif ifeq ($(BR2_PACKAGE_LIBKCAPI_ENCAPP),y) LIBKCAPI_CONF_OPTS += --enable-kcapi-encapp @@ -28,6 +42,12 @@ else LIBKCAPI_CONF_OPTS += --disable-kcapi-hasher endif +ifeq ($(BR2_PACKAGE_LIBKCAPI_KPP),y) +LIBKCAPI_CONF_OPTS += --enable-lib-kpp +else +LIBKCAPI_CONF_OPTS += --disable-lib-kpp +endif + ifeq ($(BR2_PACKAGE_LIBKCAPI_RNGAPP),y) LIBKCAPI_CONF_OPTS += --enable-kcapi-rngapp else diff --git a/package/libkrb5/0001-Fix-KDC-null-deref-on-TGS-inner-body-null-server.patch b/package/libkrb5/0001-Fix-KDC-null-deref-on-TGS-inner-body-null-server.patch deleted file mode 100644 index ec6f6233805..00000000000 --- a/package/libkrb5/0001-Fix-KDC-null-deref-on-TGS-inner-body-null-server.patch +++ /dev/null @@ -1,47 +0,0 @@ -From d775c95af7606a51bf79547a94fa52ddd1cb7f49 Mon Sep 17 00:00:00 2001 -From: Greg Hudson -Date: Tue, 3 Aug 2021 01:15:27 -0400 -Subject: [PATCH] Fix KDC null deref on TGS inner body null server - -After the KDC decodes a FAST inner body, it does not check for a null -server. Prior to commit 39548a5b17bbda9eeb63625a201cfd19b9de1c5b this -would typically result in an error from krb5_unparse_name(), but with -the addition of get_local_tgt() it results in a null dereference. Add -a null check. - -Reported by Joseph Sutton of Catalyst. - -CVE-2021-37750: - -In MIT krb5 releases 1.14 and later, an authenticated attacker can -cause a null dereference in the KDC by sending a FAST TGS request with -no server field. - -ticket: 9008 (new) -tags: pullup -target_version: 1.19-next -target_version: 1.18-next - -[Retrieved from: -https://github.com/krb5/krb5/commit/d775c95af7606a51bf79547a94fa52ddd1cb7f49] -Signed-off-by: Fabrice Fontaine ---- - src/kdc/do_tgs_req.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/kdc/do_tgs_req.c b/src/kdc/do_tgs_req.c -index 582e497cc9..32dc65fa8e 100644 ---- a/src/kdc/do_tgs_req.c -+++ b/src/kdc/do_tgs_req.c -@@ -204,6 +204,11 @@ process_tgs_req(krb5_kdc_req *request, krb5_data *pkt, - status = "FIND_FAST"; - goto cleanup; - } -+ if (sprinc == NULL) { -+ status = "NULL_SERVER"; -+ errcode = KRB5KDC_ERR_S_PRINCIPAL_UNKNOWN; -+ goto cleanup; -+ } - - errcode = get_local_tgt(kdc_context, &sprinc->realm, header_server, - &local_tgt, &local_tgt_storage, &local_tgt_key); diff --git a/package/libkrb5/libkrb5.hash b/package/libkrb5/libkrb5.hash index 860f8287935..94dfa2ed6ea 100644 --- a/package/libkrb5/libkrb5.hash +++ b/package/libkrb5/libkrb5.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 66085e2f594751e77e82e0dbf7bbc344320fb48a9df2a633cfdd8f7d6da99fc8 krb5-1.18.4.tar.gz +sha256 704aed49b19eb5a7178b34b2873620ec299db08752d6a8574f95d41879ab8851 krb5-1.20.1.tar.gz # Hash for license file: -sha256 7fba8b076bdc2cfef1d0813c5d4067d76d5be60c32d84de22d5d1cf451744feb NOTICE +sha256 cfadcf7b2ead2f3af793c25c00638c9908ac0023b101695f40cb9a03b16811dc NOTICE diff --git a/package/libkrb5/libkrb5.mk b/package/libkrb5/libkrb5.mk index d41e7559a52..9bacfaee585 100644 --- a/package/libkrb5/libkrb5.mk +++ b/package/libkrb5/libkrb5.mk @@ -4,21 +4,18 @@ # ################################################################################ -LIBKRB5_VERSION_MAJOR = 1.18 -LIBKRB5_VERSION = $(LIBKRB5_VERSION_MAJOR).4 +LIBKRB5_VERSION_MAJOR = 1.20 +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 -LIBKRB5_LICENSE = MIT +LIBKRB5_LICENSE = MIT, BSD-2-Clause, BSD-3-Clause, BSD-4-Clause, others LIBKRB5_LICENSE_FILES = NOTICE LIBKRB5_CPE_ID_VENDOR = mit LIBKRB5_CPE_ID_PRODUCT = kerberos_5 LIBKRB5_DEPENDENCIES = host-bison $(TARGET_NLS_DEPENDENCIES) LIBKRB5_INSTALL_STAGING = YES -# 0001-Fix-KDC-null-deref-on-TGS-inner-body-null-server.patch -LIBKRB5_IGNORE_CVES += CVE-2021-37750 - # 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 @@ -37,6 +34,11 @@ LIBKRB5_CONF_OPTS = \ --without-tcl \ --disable-rpath +# Enabling static and shared at the same time is not supported +ifeq ($(BR2_SHARED_STATIC_LIBS),y) +LIBKRB5_CONF_OPTS += --disable-static +endif + ifeq ($(BR2_PACKAGE_OPENLDAP),y) LIBKRB5_CONF_OPTS += --with-ldap LIBKRB5_DEPENDENCIES += openldap @@ -44,7 +46,7 @@ else LIBKRB5_CONF_OPTS += --without-ldap endif -ifeq ($(BR2_PACKAGE_OPENSSL),y) +ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) LIBKRB5_CONF_OPTS += \ --enable-pkinit \ --with-crypto-impl=openssl \ diff --git a/package/libks/0001-CMakeLists.txt-honour-BUILD_TESTING.patch b/package/libks/0001-CMakeLists.txt-honour-BUILD_TESTING.patch new file mode 100644 index 00000000000..fbe6cabd861 --- /dev/null +++ b/package/libks/0001-CMakeLists.txt-honour-BUILD_TESTING.patch @@ -0,0 +1,41 @@ +From c850e04898a9498d447b43bf346365646ff1b19c Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 13 May 2022 23:12:31 +0200 +Subject: [PATCH] CMakeLists.txt: honour BUILD_TESTING + +Allow the user to disable tests through the standard BUILD_TESTING +option: https://cmake.org/cmake/help/latest/module/CTest.html + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/signalwire/libks/pull/125] +--- + CMakeLists.txt | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5bbac31..37e6bcd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,5 +1,6 @@ + cmake_minimum_required(VERSION 3.7.2) + ++option(BUILD_TESTING "Build tests" ON) + option(KS_DEBUG_MUTEX "Debug mutexes, only works on linux for now" OFF) + option(KS_DEBUG_SPINLOCK "Debug spinlocks" OFF) + option(KS_DEBUG_POOL "Track pool allocations and provide hooks for rendering them" OFF) +@@ -609,8 +610,10 @@ endif() + #cotire(ks) + + # Add tests +-enable_testing() +-add_subdirectory(tests) ++if (BUILD_TESTING) ++ enable_testing() ++ add_subdirectory(tests) ++endif() + + if (WITH_KS_TEST) + enable_testing() +-- +2.35.1 + diff --git a/package/libks/Config.in b/package/libks/Config.in index 366b5bda71a..4781d188bf2 100644 --- a/package/libks/Config.in +++ b/package/libks/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_LIBKS bool "libks" depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_STATIC_LIBS # dlfcn.h - depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # pthread_setname_np() select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBUUID @@ -11,6 +11,6 @@ config BR2_PACKAGE_LIBKS https://github.com/signalwire/libks -comment "libks needs a toolchain w/ C++, threads, dynamic library" +comment "libks needs a toolchain w/ C++, NPTL, dynamic library" depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP \ - || !BR2_TOOLCHAIN_HAS_THREADS + || !BR2_TOOLCHAIN_HAS_THREADS_NPTL diff --git a/package/libks/libks.hash b/package/libks/libks.hash index 5acbcd1ea6c..f66798699f5 100644 --- a/package/libks/libks.hash +++ b/package/libks/libks.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 73c5751eadad4d3390d61b9765e9b860e0aba7336044ecf8b007dfc1818baa69 libks-1.7.0.tar.gz -sha256 1d1327f37b58a4c9ce520fcf9dd3f348c7c639229ee7aed41c47164a8f7836cd copyright +sha256 af94f9fcdb2022b8f09187309ac2d372a5a4cc639af77cd4375f2d5c88b4fd63 libks-2.0.2.tar.gz +sha256 3aba376a08bf91c95518532e627157f0ee3ab2712d1198463e2b1ac9186dd142 copyright diff --git a/package/libks/libks.mk b/package/libks/libks.mk index adf0107b30a..c8bcb309611 100644 --- a/package/libks/libks.mk +++ b/package/libks/libks.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBKS_VERSION = 1.7.0 +LIBKS_VERSION = 2.0.2 LIBKS_SITE = $(call github,signalwire,libks,v$(LIBKS_VERSION)) LIBKS_LICENSE = MIT LIBKS_LICENSE_FILES = copyright diff --git a/package/libksba/libksba.hash b/package/libksba/libksba.hash index 422048be5f2..5c6c5eda7aa 100644 --- a/package/libksba/libksba.hash +++ b/package/libksba/libksba.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 dad683e6f2d915d880aa4bed5cea9a115690b8935b78a1bbe01669189307a48b libksba-1.6.0.tar.bz2 +sha256 3f72c68db30971ebbf14367527719423f0a4d5f8103fc9f4a1c01a9fa440de5c libksba-1.6.3.tar.bz2 # Hash for license files: sha256 8f1b87e551d97b2b23b6d3403a5d598c63ea89824cb8ee351f631f6cab2beaa5 AUTHORS diff --git a/package/libksba/libksba.mk b/package/libksba/libksba.mk index ca5fc1d749d..122914d524e 100644 --- a/package/libksba/libksba.mk +++ b/package/libksba/libksba.mk @@ -4,12 +4,12 @@ # ################################################################################ -LIBKSBA_VERSION = 1.6.0 +LIBKSBA_VERSION = 1.6.3 LIBKSBA_SOURCE = libksba-$(LIBKSBA_VERSION).tar.bz2 -LIBKSBA_SITE = ftp://ftp.gnupg.org/gcrypt/libksba +LIBKSBA_SITE = https://gnupg.org/ftp/gcrypt/libksba LIBKSBA_LICENSE = LGPL-3.0+ or GPL-2.0+ (library, headers), GPL-3.0+ (manual, tests, build system) LIBKSBA_LICENSE_FILES = AUTHORS COPYING COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv3 -LIBKSBA_CPE_ID_VENDOR = libksba_project +LIBKSBA_CPE_ID_VENDOR = gnupg LIBKSBA_INSTALL_STAGING = YES LIBKSBA_DEPENDENCIES = libgpg-error LIBKSBA_CONF_OPTS = --with-gpg-error-prefix=$(STAGING_DIR)/usr diff --git a/package/libldns/libldns.hash b/package/libldns/libldns.hash index cab8b7dbdf9..ff86ae348ea 100644 --- a/package/libldns/libldns.hash +++ b/package/libldns/libldns.hash @@ -1,7 +1,7 @@ -# From http://www.nlnetlabs.nl/downloads/ldns/ldns-1.8.1.tar.gz.sha1 -sha1 df19a0404a608821b571525214a18988bc88bb46 ldns-1.8.1.tar.gz -# From http://www.nlnetlabs.nl/downloads/ldns/ldns-1.8.1.tar.gz.sha256 -sha256 958229abce4d3aaa19a75c0d127666564b17216902186e952ca4aef47c6d7fa3 ldns-1.8.1.tar.gz +# From http://www.nlnetlabs.nl/downloads/ldns/ldns-1.8.3.tar.gz.sha1 +sha1 2796cc49636f68260c9662b60d5a7c9e6eed195c ldns-1.8.3.tar.gz +# From http://www.nlnetlabs.nl/downloads/ldns/ldns-1.8.3.tar.gz.sha256 +sha256 c3f72dd1036b2907e3a56e6acf9dfb2e551256b3c1bbd9787942deeeb70e7860 ldns-1.8.3.tar.gz # Hash for license file: sha256 9e0b1505c358d1a7c79555ee8bd1acbe2985dbc74dd81f3697cebf2161e922e6 LICENSE diff --git a/package/libldns/libldns.mk b/package/libldns/libldns.mk index 86e7c0eafc8..06564e3d9fc 100644 --- a/package/libldns/libldns.mk +++ b/package/libldns/libldns.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBLDNS_VERSION = 1.8.1 +LIBLDNS_VERSION = 1.8.3 LIBLDNS_SOURCE = ldns-$(LIBLDNS_VERSION).tar.gz LIBLDNS_SITE = http://www.nlnetlabs.nl/downloads/ldns LIBLDNS_LICENSE = BSD-3-Clause diff --git a/package/liblinear/0001-blas-don-t-overwrite-ar-options.patch b/package/liblinear/0001-blas-don-t-overwrite-ar-options.patch deleted file mode 100644 index 23ed6dd2278..00000000000 --- a/package/liblinear/0001-blas-don-t-overwrite-ar-options.patch +++ /dev/null @@ -1,36 +0,0 @@ -From cae4c3b80fee0f3637d70f6d33946888c8105637 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sat, 13 Dec 2014 17:16:58 +0100 -Subject: [PATCH] blas: don't overwrite ar options - -ar's rcv options get lost when AR is passed on -the command line. - -Signed-off-by: Romain Naour -Signed-off-by: Fabrice Fontaine ---- - blas/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/blas/Makefile b/blas/Makefile -index 895fd24..78cec9a 100644 ---- a/blas/Makefile -+++ b/blas/Makefile -@@ -1,4 +1,4 @@ --AR = ar rcv -+AR = ar - RANLIB = ranlib - - HEADERS = blas.h blasp.h -@@ -8,7 +8,7 @@ CFLAGS = $(OPTFLAGS) - FFLAGS = $(OPTFLAGS) - - blas: $(FILES) $(HEADERS) -- $(AR) blas.a $(FILES) -+ $(AR) rcv blas.a $(FILES) - $(RANLIB) blas.a - - clean: --- -1.9.3 - diff --git a/package/liblinear/0002-build-static-lib.patch b/package/liblinear/0001-build-static-lib.patch similarity index 100% rename from package/liblinear/0002-build-static-lib.patch rename to package/liblinear/0001-build-static-lib.patch diff --git a/package/liblinear/liblinear.hash b/package/liblinear/liblinear.hash index a714b8bc4e7..6bc72909d0d 100644 --- a/package/liblinear/liblinear.hash +++ b/package/liblinear/liblinear.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 02bad43d745e2796f39a08ac9d117770e71939ef06b1ee7afc6ab7909e304807 liblinear-2.43.tar.gz -sha256 c5c91211a0edaa4c77e352f6b27a8f9c6768afe27d48176d6094905c534eacb3 COPYRIGHT +sha256 3c64eec45c01943a656baac7aeb8ffd782fe0aea53629aa9f5fdb8eec177c92f liblinear-2.45.tar.gz +sha256 d49b7898fd9ea7c29f0478e8c409ee7c0f621533d5eca7b7912e80391dc564e3 COPYRIGHT diff --git a/package/liblinear/liblinear.mk b/package/liblinear/liblinear.mk index 1ad734c7568..014f9e2de47 100644 --- a/package/liblinear/liblinear.mk +++ b/package/liblinear/liblinear.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBLINEAR_VERSION = 2.43 +LIBLINEAR_VERSION = 2.45 LIBLINEAR_SITE = http://www.csie.ntu.edu.tw/~cjlin/liblinear 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.4 $(1)/usr/lib/liblinear.so.4 - ln -sf liblinear.so.4 $(1)/usr/lib/liblinear.so + $(INSTALL) -m 0644 -D $(@D)/liblinear.so.5 $(1)/usr/lib/liblinear.so.5 + ln -sf liblinear.so.5 $(1)/usr/lib/liblinear.so endef LIBLINEAR_CFLAGS += -fPIC endif diff --git a/package/libllcp/libllcp.hash b/package/libllcp/libllcp.hash index e6f63017311..ff946dd38f9 100644 --- a/package/libllcp/libllcp.hash +++ b/package/libllcp/libllcp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4336533304a11ecb3041d211ccecd7759b7c7aad4f44037721803e2da1094d22 libllcp-05dfa8003433a7070bfd8ae02efdb0203bbf34aa.tar.gz -sha256 9ccf26cfe845e0eb8bb58053e47366e7ab6b697ae010f7650978d4b71b7d1fc1 COPYING +sha256 4336533304a11ecb3041d211ccecd7759b7c7aad4f44037721803e2da1094d22 libllcp-05dfa8003433a7070bfd8ae02efdb0203bbf34aa.tar.gz +sha256 9ccf26cfe845e0eb8bb58053e47366e7ab6b697ae010f7650978d4b71b7d1fc1 COPYING diff --git a/package/liblog4c-localtime/liblog4c-localtime.hash b/package/liblog4c-localtime/liblog4c-localtime.hash index d14b79594dc..66d1595038e 100644 --- a/package/liblog4c-localtime/liblog4c-localtime.hash +++ b/package/liblog4c-localtime/liblog4c-localtime.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a1f68d8251509c0171f8bfea42f9e2a5255a4185f7dcbe67f584aa09709b2496 liblog4c-localtime-1.0.tar.gz -sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 COPYING +sha256 a1f68d8251509c0171f8bfea42f9e2a5255a4185f7dcbe67f584aa09709b2496 liblog4c-localtime-1.0.tar.gz +sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 COPYING diff --git a/package/liblogging/liblogging.hash b/package/liblogging/liblogging.hash index 618689b49b4..32cab29b10e 100644 --- a/package/liblogging/liblogging.hash +++ b/package/liblogging/liblogging.hash @@ -1,5 +1,5 @@ # From http://www.liblogging.org/ -sha256 338c6174e5c8652eaa34f956be3451f7491a4416ab489aef63151f802b00bf93 liblogging-1.0.6.tar.gz +sha256 338c6174e5c8652eaa34f956be3451f7491a4416ab489aef63151f802b00bf93 liblogging-1.0.6.tar.gz # Hash for license file: -sha256 a5626f700d3ee92513673b5f43733af5b651d9e7a9157d4bd81ceb9c89ec04b0 COPYING +sha256 a5626f700d3ee92513673b5f43733af5b651d9e7a9157d4bd81ceb9c89ec04b0 COPYING diff --git a/package/libloki/libloki.hash b/package/libloki/libloki.hash index 52d67c88016..ee9c0a55c98 100644 --- a/package/libloki/libloki.hash +++ b/package/libloki/libloki.hash @@ -1,5 +1,5 @@ # From https://sourceforge.net/projects/loki-lib/files/Loki/Loki%200.1.7 -md5 33a24bcbb99fa2ec8fcbbab65649f3f6 loki-0.1.7.tar.bz2 -sha1 006c630217b1e1fd33015dc0597d2d743d8ee4e3 loki-0.1.7.tar.bz2 +md5 33a24bcbb99fa2ec8fcbbab65649f3f6 loki-0.1.7.tar.bz2 +sha1 006c630217b1e1fd33015dc0597d2d743d8ee4e3 loki-0.1.7.tar.bz2 # locally computed -sha256 07553754f6be2738559947db69b0718512665bf4a34015fa3a875b6eb1111198 loki-0.1.7.tar.bz2 +sha256 07553754f6be2738559947db69b0718512665bf4a34015fa3a875b6eb1111198 loki-0.1.7.tar.bz2 diff --git a/package/libmad/libmad.mk b/package/libmad/libmad.mk index 33134e26d46..084a533cc00 100644 --- a/package/libmad/libmad.mk +++ b/package/libmad/libmad.mk @@ -31,6 +31,13 @@ LIBMAD_IGNORE_CVES += CVE-2017-8374 # is able to properly behave in the face of a missing C++ compiler. LIBMAD_AUTORECONF = YES +# libmad has some assembly function that is not present in Thumb mode: +# Error: selected processor does not support `smull r6,r7,r3,r1' in Thumb mode +# so, we desactivate Thumb mode +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +LIBMAD_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" +endif + define LIBMAD_INSTALL_STAGING_PC $(INSTALL) -D package/libmad/mad.pc \ $(STAGING_DIR)/usr/lib/pkgconfig/mad.pc diff --git a/package/libmanette/0001-Meson-Un-hardcode-building-a-shared-library.patch b/package/libmanette/0001-Meson-Un-hardcode-building-a-shared-library.patch new file mode 100644 index 00000000000..a93a1f72193 --- /dev/null +++ b/package/libmanette/0001-Meson-Un-hardcode-building-a-shared-library.patch @@ -0,0 +1,34 @@ +From 003c2e84d95357bbbef72fb395ef85f1650097a3 Mon Sep 17 00:00:00 2001 +From: Adrian Perez de Castro +Date: Fri, 23 Sep 2022 14:35:51 +0300 +Subject: [PATCH] Meson: Un-hardcode building a shared library + +Use library() instead of shared_library() to allow specifying which kind +of library to build with "meson setup --default-library ..." + +This allows more easily incorporating libmanette in an application e.g. +as a Meson subproject which gets built into a program as a static +library. + +Signed-off-by: Adrian Perez de Castro +[Upstream status: https://gitlab.gnome.org/GNOME/libmanette/-/merge_requests/84] +--- + src/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/meson.build b/src/meson.build +index c140cac..b71d090 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -63,7 +63,7 @@ if gudev.found() + libmanette_deps += [ gudev ] + endif + +-libmanette_lib = shared_library( ++libmanette_lib = library( + libmanette_module, + libmanette_sources, + c_args: libmanette_c_args, +-- +2.37.3 + diff --git a/package/libmanette/Config.in b/package/libmanette/Config.in new file mode 100644 index 00000000000..31fff152862 --- /dev/null +++ b/package/libmanette/Config.in @@ -0,0 +1,17 @@ +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_TOOLCHAIN_HEADERS_AT_LEAST_4_16 + select BR2_PACKAGE_LIBEVDEV + select BR2_PACKAGE_LIBGLIB2 + help + GObject library which provides access to game controllers. + + https://gitlab.gnome.org/GNOME/libmanette + +comment "libmanette needs a toolchain w/ wchar, threads, headers >= 4.16" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_16 diff --git a/package/libmanette/libmanette.hash b/package/libmanette/libmanette.hash new file mode 100644 index 00000000000..96089f971aa --- /dev/null +++ b/package/libmanette/libmanette.hash @@ -0,0 +1,5 @@ +# From https://download.gnome.org/sources/libmanette/0.2/libmanette-0.2.6.sha256sum +sha256 63653259a821ec7d90d681e52e757e2219d462828c9d74b056a5f53267636bac libmanette-0.2.6.tar.xz + +# Locally calculated +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libmanette/libmanette.mk b/package/libmanette/libmanette.mk new file mode 100644 index 00000000000..10f2b8a4663 --- /dev/null +++ b/package/libmanette/libmanette.mk @@ -0,0 +1,42 @@ +################################################################################ +# +# libmanette +# +################################################################################ + +LIBMANETTE_VERSION_MAJOR = 0.2 +LIBMANETTE_VERSION = $(LIBMANETTE_VERSION_MAJOR).6 +LIBMANETTE_SOURCE = libmanette-$(LIBMANETTE_VERSION).tar.xz +LIBMANETTE_SITE = https://download.gnome.org/sources/libmanette/$(LIBMANETTE_VERSION_MAJOR) +LIBMANETTE_LICENSE = LGPL-2.1+ +LIBMANETTE_LICENSE_FILES = COPYING +LIBMANETTE_INSTALL_STAGING = YES +LIBMANETTE_DEPENDENCIES = \ + libevdev \ + libglib2 \ + $(TARGET_NLS_DEPENDENCIES) + +LIBMANETTE_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) + +LIBMANETTE_CONF_OPTS = \ + -Ddemos=false \ + -Dbuild-tests=false \ + -Dinstall-tests=false \ + -Ddoc=false \ + -Dvapi=false + +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +LIBMANETTE_CONF_OPTS += -Dintrospection=true +LIBMANETTE_DEPENDENCIES += gobject-introspection +else +LIBMANETTE_CONF_OPTS += -Dintrospection=false +endif + +ifeq ($(BR2_PACKAGE_LIBGUDEV),y) +LIBMANETTE_CONF_OPTS += -Dgudev=enabled +LIBMANETTE_DEPENDENCIES += libgudev +else +LIBMANETTE_CONF_OPTS += -Dgudev=disabled +endif + +$(eval $(meson-package)) diff --git a/package/libmaxminddb/libmaxminddb.hash b/package/libmaxminddb/libmaxminddb.hash index cfe838f7e5c..7e56351c0fa 100644 --- a/package/libmaxminddb/libmaxminddb.hash +++ b/package/libmaxminddb/libmaxminddb.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 7620ac187c591ce21bcd7bf352376a3c56a933e684558a1f6bef4bd4f3f98267 libmaxminddb-1.6.0.tar.gz +sha256 e8414f0dedcecbc1f6c31cb65cd81650952ab0677a4d8c49cab603b3b8fb083e libmaxminddb-1.7.1.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/libmaxminddb/libmaxminddb.mk b/package/libmaxminddb/libmaxminddb.mk index 4037f89a15c..993b4aec9df 100644 --- a/package/libmaxminddb/libmaxminddb.mk +++ b/package/libmaxminddb/libmaxminddb.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMAXMINDDB_VERSION = 1.6.0 +LIBMAXMINDDB_VERSION = 1.7.1 LIBMAXMINDDB_SITE = \ https://github.com/maxmind/libmaxminddb/releases/download/$(LIBMAXMINDDB_VERSION) LIBMAXMINDDB_INSTALL_STAGING = YES diff --git a/package/libmbim/libmbim.hash b/package/libmbim/libmbim.hash index 7ecc99d333e..8e7633cb946 100644 --- a/package/libmbim/libmbim.hash +++ b/package/libmbim/libmbim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 c12e61ea462fca40ddba2a8e1e401242d4f13827944369fad27ff70936b1e09d libmbim-1.26.2.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB +sha256 cf74682c56f4c34ca4aee86de3b8c425a89fc2c0782052815295faf6a8e0a9fb libmbim-1.28.2.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 eba5f0a6e06..59f55a57bc1 100644 --- a/package/libmbim/libmbim.mk +++ b/package/libmbim/libmbim.mk @@ -4,10 +4,11 @@ # ################################################################################ -LIBMBIM_VERSION = 1.26.2 +LIBMBIM_VERSION = 1.28.2 LIBMBIM_SITE = https://gitlab.freedesktop.org/mobile-broadband/libmbim/-/archive/$(LIBMBIM_VERSION) -LIBMBIM_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (programs) -LIBMBIM_LICENSE_FILES = COPYING COPYING.LIB +LIBMBIM_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (programs) +LIBMBIM_LICENSE_FILES = \ + LICENSES/GPL-2.0-or-later.txt LICENSES/LGPL-2.1-or-later.txt LIBMBIM_CPE_ID_VENDOR = freedesktop LIBMBIM_INSTALL_STAGING = YES diff --git a/package/libmbus/libmbus.hash b/package/libmbus/libmbus.hash index 91fe15ced10..493bab58205 100644 --- a/package/libmbus/libmbus.hash +++ b/package/libmbus/libmbus.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9fca42592da0ba75df66c6f885a4dbfa916d23e65e3d1ce6e38d940d2a2719a4 libmbus-0.8.0.tar.gz -sha256 ea171a4ae443eca7186f564db2c3cc8b84c1ac343f227f92cd52ec6a948f4a74 COPYING +sha256 9fca42592da0ba75df66c6f885a4dbfa916d23e65e3d1ce6e38d940d2a2719a4 libmbus-0.8.0.tar.gz +sha256 ea171a4ae443eca7186f564db2c3cc8b84c1ac343f227f92cd52ec6a948f4a74 COPYING diff --git a/package/libmdbx/Config.in b/package/libmdbx/Config.in index d13f73938fe..a9a4ac45c52 100644 --- a/package/libmdbx/Config.in +++ b/package/libmdbx/Config.in @@ -13,7 +13,7 @@ config BR2_PACKAGE_LIBMDBX libmdbx surpasses the legendary LMDB in terms of reliability, features and performance. - https://github.com/erthink/libmdbx + https://libmdbx.dqdkfa.ru if BR2_PACKAGE_LIBMDBX diff --git a/package/libmdbx/libmdbx.hash b/package/libmdbx/libmdbx.hash index 2483d14dd12..b1a2891b915 100644 --- a/package/libmdbx/libmdbx.hash +++ b/package/libmdbx/libmdbx.hash @@ -1,5 +1,5 @@ -# Hashes from: https://github.com/erthink/libmdbx/releases/ -sha256 884de528f5c2abab2187b7c4c84b769d2551e1a748cbfdf0ae4c0f5c9f8dbd27 libmdbx-amalgamated-0.11.4.tar.gz +# Hashes from: https://libmdbx.dqdkfa.ru/release/SHA256SUMS +sha256 97b03965b5b61727dc4232c50ccb174c632470a3d24438b3c52315bef6fb4033 libmdbx-amalgamated-0.11.14.tar.xz # Locally calculated sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 LICENSE diff --git a/package/libmdbx/libmdbx.mk b/package/libmdbx/libmdbx.mk index 1aff8fbb4d6..5e7995f8c8a 100644 --- a/package/libmdbx/libmdbx.mk +++ b/package/libmdbx/libmdbx.mk @@ -4,13 +4,12 @@ # ################################################################################ -LIBMDBX_VERSION = 0.11.4 -LIBMDBX_SOURCE = libmdbx-amalgamated-$(LIBMDBX_VERSION).tar.gz -LIBMDBX_SITE = https://github.com/erthink/libmdbx/releases/download/v$(LIBMDBX_VERSION) +LIBMDBX_VERSION = 0.11.14 +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_REDISTRIBUTE = YES LIBMDBX_STRIP_COMPONENTS = 0 LIBMDBX_INSTALL_STAGING = YES diff --git a/package/libmediaart/0001-meson-add-introspection-option.patch b/package/libmediaart/0001-meson-add-introspection-option.patch deleted file mode 100644 index 2b849040fe6..00000000000 --- a/package/libmediaart/0001-meson-add-introspection-option.patch +++ /dev/null @@ -1,87 +0,0 @@ -From ee7d8736af172cd5ad71a0bd511c39daf401e3f6 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 5 Oct 2021 23:35:26 +0200 -Subject: [PATCH] meson: add introspection option - -Add introspection option - -Fix #3 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.gnome.org/GNOME/libmediaart/-/merge_requests/14] ---- - libmediaart/meson.build | 42 +++++++++++++++++++++-------------------- - meson_options.txt | 2 ++ - 2 files changed, 24 insertions(+), 20 deletions(-) - -diff --git a/libmediaart/meson.build b/libmediaart/meson.build -index 56e00ab..2f44e63 100644 ---- a/libmediaart/meson.build -+++ b/libmediaart/meson.build -@@ -41,28 +41,30 @@ libmediaart = shared_library( - install: true, - ) - --gir_args = [ -- '--quiet', -- '-DLIBMEDIAART_COMPILATION', --] -+if get_option('introspection') -+ gir_args = [ -+ '--quiet', -+ '-DLIBMEDIAART_COMPILATION', -+ ] - --libmediaart_gir_and_typelib = gnome.generate_gir(libmediaart, -- sources: libmediaart_sources + libmediaart_introspection_sources + libmediaart_public_headers, -- nsversion: libmediaart_api_version, -- namespace: 'MediaArt', -- identifier_prefix: 'MediaArt', -- symbol_prefix: 'media_art', -- includes: ['Gio-2.0', 'GObject-2.0'], -- header: 'libmediaart/mediaart.h', -- export_packages: 'libmediaart-' + libmediaart_api_version, -- extra_args: gir_args, -- install: true --) -+ libmediaart_gir_and_typelib = gnome.generate_gir(libmediaart, -+ sources: libmediaart_sources + libmediaart_introspection_sources + libmediaart_public_headers, -+ nsversion: libmediaart_api_version, -+ namespace: 'MediaArt', -+ identifier_prefix: 'MediaArt', -+ symbol_prefix: 'media_art', -+ includes: ['Gio-2.0', 'GObject-2.0'], -+ header: 'libmediaart/mediaart.h', -+ export_packages: 'libmediaart-' + libmediaart_api_version, -+ extra_args: gir_args, -+ install: true -+ ) - --libmediaart_vapi = gnome.generate_vapi('libmediaart-' + libmediaart_api_version, -- sources: libmediaart_gir_and_typelib[0], -- packages: 'gio-2.0', -- install: true) -+ libmediaart_vapi = gnome.generate_vapi('libmediaart-' + libmediaart_api_version, -+ sources: libmediaart_gir_and_typelib[0], -+ packages: 'gio-2.0', -+ install: true) -+endif - - libmediaart_dep = declare_dependency( - link_with: libmediaart, -diff --git a/meson_options.txt b/meson_options.txt -index 3ef49ba..b8c51b1 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -1,5 +1,7 @@ - option('image_library', type: 'combo', choices: ['auto', 'gdk-pixbuf', 'qt4', 'qt5'], - description: 'Which image processing backend to use') -+option('introspection', type : 'boolean', value : 'true', -+ description : 'Enable / disable the GObject-Introspection integration') - option('gtk_doc', - type: 'boolean', - value: 'false', --- -2.33.0 - diff --git a/package/libmediaart/0002-meson-add-unit_tests-option.patch b/package/libmediaart/0002-meson-add-unit_tests-option.patch deleted file mode 100644 index 3519ff19846..00000000000 --- a/package/libmediaart/0002-meson-add-unit_tests-option.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 01d94777d9d1906750db0e27e2e7b8f228ae4343 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 9 Oct 2021 23:45:53 +0200 -Subject: [PATCH] meson: add unit_tests option - -Signed-off-by: Fabrice Fontaine -[Upstream status: not sent yet (waiting feedback on first patch)] ---- - meson_options.txt | 2 ++ - tests/meson.build | 14 ++++++++------ - 2 files changed, 10 insertions(+), 6 deletions(-) - -diff --git a/meson_options.txt b/meson_options.txt -index b8c51b1..1172f93 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -2,6 +2,8 @@ option('image_library', type: 'combo', choices: ['auto', 'gdk-pixbuf', 'qt4', 'q - description: 'Which image processing backend to use') - option('introspection', type : 'boolean', value : 'true', - description : 'Enable / disable the GObject-Introspection integration') -+option('unit_tests', type : 'boolean', value : 'true', -+ description : 'Enable / disable unit tests') - option('gtk_doc', - type: 'boolean', - value: 'false', -diff --git a/tests/meson.build b/tests/meson.build -index 28834c0..02c96a1 100644 ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -1,7 +1,9 @@ --mediaart_test = executable('mediaart-test', -- 'mediaarttest.c', -- dependencies: libmediaart_dep, --) -+if get_option('unit_tests') -+ mediaart_test = executable('mediaart-test', -+ 'mediaarttest.c', -+ dependencies: libmediaart_dep, -+ ) - --test('mediaart', mediaart_test, -- env: 'G_TEST_SRCDIR=' + meson.current_source_dir()) -+ test('mediaart', mediaart_test, -+ env: 'G_TEST_SRCDIR=' + meson.current_source_dir()) -+endif --- -2.33.0 - diff --git a/package/libmediaart/0003-libmediaart-meson.build-replace-shared_library.patch b/package/libmediaart/0003-libmediaart-meson.build-replace-shared_library.patch deleted file mode 100644 index d4b377d327e..00000000000 --- a/package/libmediaart/0003-libmediaart-meson.build-replace-shared_library.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 2272d762436a3b0d2e4fef8fb4f1669814904620 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 12 Dec 2021 20:14:54 +0100 -Subject: [PATCH] libmediaart/meson.build: replace shared_library - -Replace shared_library by library call to avoid the following build -failure when building statically: - -/home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /home/buildroot/autobuild/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libc.a(__uClibc_main.os): in function `__uClibc_fini': -__uClibc_main.c:(.text+0x15c): undefined reference to `__fini_array_start' - -Fixes: - - http://autobuild.buildroot.org/results/18d26882a68dcf8f09b3e3d25636454a12939310 - -Signed-off-by: Fabrice Fontaine ---- - libmediaart/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libmediaart/meson.build b/libmediaart/meson.build -index 2f44e63..1fd3b99 100644 ---- a/libmediaart/meson.build -+++ b/libmediaart/meson.build -@@ -30,7 +30,7 @@ marshal = gnome.genmarshal('marshal', - - libmediaart_dependencies = [glib, gio_unix, gobject, image_library] - --libmediaart = shared_library( -+libmediaart = library( - 'mediaart-' + libmediaart_api_version, - libmediaart_sources, marshal[0], marshal[1], - version: libmediaart_ltversion, --- -2.33.0 - diff --git a/package/libmediaart/libmediaart.hash b/package/libmediaart/libmediaart.hash index d7115b20d4e..34094744a96 100644 --- a/package/libmediaart/libmediaart.hash +++ b/package/libmediaart/libmediaart.hash @@ -1,5 +1,5 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/libmediaart/1.9/libmediaart-1.9.5.sha256sum: -sha256 07def5a42c482ae71d3e1f77a4d0fdc337f74226059a65284d6d5a241f0e9cd6 libmediaart-1.9.5.tar.xz +# Hash from: https://download.gnome.org/sources/libmediaart/1.9/libmediaart-1.9.6.sha256sum: +sha256 c3bc5025d7db380587f9c8eb800c611f6b5a16d6b4b78fcff93f62876a677f17 libmediaart-1.9.6.tar.xz # Locally computed: sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LESSER diff --git a/package/libmediaart/libmediaart.mk b/package/libmediaart/libmediaart.mk index 77665fd95b1..d4480dbe5d5 100644 --- a/package/libmediaart/libmediaart.mk +++ b/package/libmediaart/libmediaart.mk @@ -5,15 +5,15 @@ ################################################################################ LIBMEDIAART_VERSION_MAJOR = 1.9 -LIBMEDIAART_VERSION = $(LIBMEDIAART_VERSION_MAJOR).5 +LIBMEDIAART_VERSION = $(LIBMEDIAART_VERSION_MAJOR).6 LIBMEDIAART_SOURCE = libmediaart-$(LIBMEDIAART_VERSION).tar.xz LIBMEDIAART_SITE = \ - http://ftp.gnome.org/pub/gnome/sources/libmediaart/$(LIBMEDIAART_VERSION_MAJOR) + https://download.gnome.org/sources/libmediaart/$(LIBMEDIAART_VERSION_MAJOR) LIBMEDIAART_LICENSE = LGPL-2.1+ LIBMEDIAART_LICENSE_FILES = COPYING.LESSER LIBMEDIAART_INSTALL_STAGING = YES LIBMEDIAART_DEPENDENCIES = libglib2 $(TARGET_NLS_DEPENDENCIES) -LIBMEDIAART_CONF_OPTS = -Dunit_tests=false +LIBMEDIAART_CONF_OPTS = -Dtests=false LIBMEDIAART_LDFLAGS = $(TARGET_NLS_LIBS) ifeq ($(BR2_PACKAGE_LIBMEDIAART_BACKEND_GDK_PIXBUF),y) @@ -24,6 +24,9 @@ else ifeq ($(BR2_PACKAGE_LIBMEDIAART_BACKEND_QT),y) LIBMEDIAART_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" LIBMEDIAART_DEPENDENCIES += qt5base LIBMEDIAART_CONF_OPTS += -Dimage_library=qt5 +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +LIBMEDIAART_LDFLAGS += -latomic +endif endif ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) diff --git a/package/libmemcached/libmemcached.hash b/package/libmemcached/libmemcached.hash index 77d7c478bc0..ccc31ee7ed3 100644 --- a/package/libmemcached/libmemcached.hash +++ b/package/libmemcached/libmemcached.hash @@ -1,5 +1,5 @@ # From https://launchpad.net/libmemcached/1.0/1.0.18/+download/libmemcached-1.0.18.tar.gz/+md5 -md5 b3958716b4e53ddc5992e6c49d97e819 libmemcached-1.0.18.tar.gz +md5 b3958716b4e53ddc5992e6c49d97e819 libmemcached-1.0.18.tar.gz # Hash for license file: -sha256 4e9032d0f539276db05519ee3d09ca6167d2134ec91c556e8c80ef3efe633fd2 COPYING +sha256 4e9032d0f539276db05519ee3d09ca6167d2134ec91c556e8c80ef3efe633fd2 COPYING diff --git a/package/libmicrohttpd/libmicrohttpd.hash b/package/libmicrohttpd/libmicrohttpd.hash index 7f95e78a6e9..ce30e2ba118 100644 --- a/package/libmicrohttpd/libmicrohttpd.hash +++ b/package/libmicrohttpd/libmicrohttpd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9278907a6f571b391aab9644fd646a5108ed97311ec66f6359cebbedb0a4e3bb libmicrohttpd-0.9.75.tar.gz +sha256 f0b1547b5a42a6c0f724e8e1c1cb5ce9c4c35fb495e7d780b9930d35011ceb4c libmicrohttpd-0.9.76.tar.gz sha256 7399547209438c93f9b90297954698773d4846cea44cde5ca982c84c45952a3b COPYING diff --git a/package/libmicrohttpd/libmicrohttpd.mk b/package/libmicrohttpd/libmicrohttpd.mk index f75178bc0a2..4e7b72b65c3 100644 --- a/package/libmicrohttpd/libmicrohttpd.mk +++ b/package/libmicrohttpd/libmicrohttpd.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMICROHTTPD_VERSION = 0.9.75 +LIBMICROHTTPD_VERSION = 0.9.76 LIBMICROHTTPD_SITE = $(BR2_GNU_MIRROR)/libmicrohttpd LIBMICROHTTPD_LICENSE_FILES = COPYING LIBMICROHTTPD_CPE_ID_VENDOR = gnu diff --git a/package/libminiupnpc/Config.in b/package/libminiupnpc/Config.in index a3410a0225d..51f4b43bbb4 100644 --- a/package/libminiupnpc/Config.in +++ b/package/libminiupnpc/Config.in @@ -1,7 +1,5 @@ config BR2_PACKAGE_LIBMINIUPNPC bool "libminiupnpc" - depends on !BR2_BINFMT_FLAT - depends on !BR2_STATIC_LIBS help The UPnP protocol is supported by most home adsl/cable routers and Microsoft Windows 2K/XP. The aim of the MiniUPnP project @@ -14,7 +12,3 @@ config BR2_PACKAGE_LIBMINIUPNPC ANSI C. http://miniupnp.free.fr - -comment "libminiupnpc needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS - depends on !BR2_BINFMT_FLAT diff --git a/package/libminiupnpc/libminiupnpc.hash b/package/libminiupnpc/libminiupnpc.hash index 758ea29f591..5dca8dd6cfc 100644 --- a/package/libminiupnpc/libminiupnpc.hash +++ b/package/libminiupnpc/libminiupnpc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 69f72fe355f911b807915f78dcfc0af772c0f22bc7ab1157e70f334e37db7d39 miniupnpc-2.1.20201016.tar.gz -sha256 0b476c395af6dd21eeb54c40a21d22e1c11a751fbd2dd17a41ce26e370be88d5 LICENSE +sha256 481a5e4aede64e9ef29895b218836c3608d973e77a35b4f228ab1f3629412c4b miniupnpc-2.2.4.tar.gz +sha256 a0f853256954f388ce4fab5faaef6a1f5bcd5e682c3c7c70b07b7130e932a021 LICENSE diff --git a/package/libminiupnpc/libminiupnpc.mk b/package/libminiupnpc/libminiupnpc.mk index 551a6767cfe..9dc5c719a95 100644 --- a/package/libminiupnpc/libminiupnpc.mk +++ b/package/libminiupnpc/libminiupnpc.mk @@ -4,9 +4,7 @@ # ################################################################################ -LIBMINIUPNPC_VERSION_MAJOR = 2.1 -LIBMINIUPNPC_VERSION_MINOR = 20201016 -LIBMINIUPNPC_VERSION = $(LIBMINIUPNPC_VERSION_MAJOR).$(LIBMINIUPNPC_VERSION_MINOR) +LIBMINIUPNPC_VERSION = 2.2.4 LIBMINIUPNPC_SOURCE = miniupnpc-$(LIBMINIUPNPC_VERSION).tar.gz LIBMINIUPNPC_SITE = http://miniupnp.free.fr/files LIBMINIUPNPC_INSTALL_STAGING = YES @@ -14,7 +12,14 @@ LIBMINIUPNPC_LICENSE = BSD-3-Clause LIBMINIUPNPC_LICENSE_FILES = LICENSE LIBMINIUPNPC_CPE_ID_VENDOR = miniupnp_project LIBMINIUPNPC_CPE_ID_PRODUCT = miniupnpc -LIBMINIUPNPC_CPE_ID_VERSION = $(LIBMINIUPNPC_VERSION_MAJOR) -LIBMINIUPNPC_CPE_ID_UPDATE = $(LIBMINIUPNPC_VERSION_MINOR) +LIBMINIUPNPC_CONF_OPTS = -DUPNPC_BUILD_SAMPLE=OFF -DUPNPC_BUILD_TESTS=OFF + +ifeq ($(BR2_STATIC_LIBS),y) +LIBMINIUPNPC_CONF_OPTS += -DUPNPC_BUILD_SHARED=OFF -DUPNPC_BUILD_STATIC=ON +else ifeq ($(BR2_SHARED_LIBS),y) +LIBMINIUPNPC_CONF_OPTS += -DUPNPC_BUILD_SHARED=ON -DUPNPC_BUILD_STATIC=OFF +else +LIBMINIUPNPC_CONF_OPTS += -DUPNPC_BUILD_SHARED=ON -DUPNPC_BUILD_STATIC=ON +endif $(eval $(cmake-package)) diff --git a/package/libmng/libmng.hash b/package/libmng/libmng.hash index 02a493f414c..df078dcfd0d 100644 --- a/package/libmng/libmng.hash +++ b/package/libmng/libmng.hash @@ -1,6 +1,6 @@ # From http://sourceforge.net/projects/libmng/files/libmng-devel/2.0.3/ -md5 e9e899adb1b681b17f14d91e261878c5 libmng-2.0.3.tar.xz -sha1 0f141482ffcef6f8cd4413f945a59310ac2e49af libmng-2.0.3.tar.xz +md5 e9e899adb1b681b17f14d91e261878c5 libmng-2.0.3.tar.xz +sha1 0f141482ffcef6f8cd4413f945a59310ac2e49af libmng-2.0.3.tar.xz # Hash for license file: -sha256 ba280734838eb3f22a85b92a7e62de357d4d4c325029dce723b0cb125c417c35 LICENSE +sha256 ba280734838eb3f22a85b92a7e62de357d4d4c325029dce723b0cb125c417c35 LICENSE diff --git a/package/libmng/libmng.mk b/package/libmng/libmng.mk index 090fe183807..8ffd74c05b8 100644 --- a/package/libmng/libmng.mk +++ b/package/libmng/libmng.mk @@ -14,7 +14,7 @@ LIBMNG_LICENSE = libmng license LIBMNG_LICENSE_FILES = LICENSE ifeq ($(BR2_PACKAGE_LCMS2),y) -LIBMNG_DEPDENDENCIES += lcms2 +LIBMNG_DEPENDENCIES += lcms2 else LIBMNG_CONF_OPTS += --without-lcms2 endif diff --git a/package/libmnl/Config.in b/package/libmnl/Config.in index 5acfb2447eb..b4a4195751e 100644 --- a/package/libmnl/Config.in +++ b/package/libmnl/Config.in @@ -5,3 +5,12 @@ config BR2_PACKAGE_LIBMNL to Netlink developers. http://netfilter.org/projects/libmnl/ + +if BR2_PACKAGE_LIBMNL + +config BR2_PACKAGE_LIBMNL_EXAMPLES + bool "install examples" + help + Install binary examples. + +endif diff --git a/package/libmnl/libmnl.hash b/package/libmnl/libmnl.hash index e5bb2fa603b..4b592333cb2 100644 --- a/package/libmnl/libmnl.hash +++ b/package/libmnl/libmnl.hash @@ -1,6 +1,7 @@ -# From ftp://ftp.netfilter.org/pub/libmnl/libmnl-1.0.4.tar.bz2.{md5sum,sha1sum} -md5 be9b4b5328c6da1bda565ac5dffadb2d libmnl-1.0.4.tar.bz2 -sha1 2db40dea612e88c62fd321906be40ab5f8f1685a libmnl-1.0.4.tar.bz2 +# From ftp://ftp.netfilter.org/pub/libmnl/libmnl-1.0.5.tar.bz2.{md5sum,sha1sum} +md5 0bbb70573119ec5d49435114583e7a49 libmnl-1.0.5.tar.bz2 +sha1 63c6456b77f7978a7b37e62c1b38346b2ef2d91c libmnl-1.0.5.tar.bz2 -# Hash for license file: -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING +# Locally calculated +sha256 274b9b919ef3152bfb3da3a13c950dd60d6e2bcd54230ffeca298d03b40d0525 libmnl-1.0.5.tar.bz2 +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libmnl/libmnl.mk b/package/libmnl/libmnl.mk index d3b33db2e09..d9b1fbabe70 100644 --- a/package/libmnl/libmnl.mk +++ b/package/libmnl/libmnl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMNL_VERSION = 1.0.4 +LIBMNL_VERSION = 1.0.5 LIBMNL_SOURCE = libmnl-$(LIBMNL_VERSION).tar.bz2 LIBMNL_SITE = http://netfilter.org/projects/libmnl/files LIBMNL_INSTALL_STAGING = YES @@ -12,4 +12,32 @@ LIBMNL_LICENSE = LGPL-2.1+ LIBMNL_LICENSE_FILES = COPYING LIBMNL_CPE_ID_VENDOR = netfilter +ifeq ($(BR2_PACKAGE_LIBMNL_EXAMPLES),y) +define LIBMNL_EXAMPLES_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) check -C $(@D) +endef +LIBMNL_POST_BUILD_HOOKS += LIBMNL_EXAMPLES_BUILD_CMDS + +LIBMNL_EXAMPLES_INSTALL_TARGETS += \ + $(addprefix examples/genl/, genl-family-get genl-group-events) +LIBMNL_EXAMPLES_INSTALL_TARGETS += \ + $(addprefix examples/kobject/, kobject-event) +LIBMNL_EXAMPLES_INSTALL_TARGETS += \ + $(addprefix examples/netfilter/, nfct-create-batch \ + nfct-daemon nfct-dump nfct-event nf-log \ + nf-queue) +LIBMNL_EXAMPLES_INSTALL_TARGETS += \ + $(addprefix examples/rtnl/, rtnl-addr-add rtnl-addr-dump \ + rtnl-link-dump rtnl-link-dump2 rtnl-link-dump3 \ + rtnl-link-event rtnl-link-set rtnl-neigh-dump \ + rtnl-route-add rtnl-route-dump rtnl-route-event) + +define LIBMNL_EXAMPLES_INSTALL_TARGET_CMDS + $(foreach t,$(LIBMNL_EXAMPLES_INSTALL_TARGETS), \ + $(INSTALL) -D -m 0755 $(@D)/$(t) \ + $(TARGET_DIR)/usr/bin/$(notdir $(t))$(sep)) +endef +LIBMNL_POST_INSTALL_TARGET_HOOKS += LIBMNL_EXAMPLES_INSTALL_TARGET_CMDS +endif + $(eval $(autotools-package)) diff --git a/package/libmodbus/libmodbus.hash b/package/libmodbus/libmodbus.hash index b676d261de2..83b0c3a012d 100644 --- a/package/libmodbus/libmodbus.hash +++ b/package/libmodbus/libmodbus.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7dfe958431d0570b271e1a5b329b76a658e89c614cf119eb5aadb725c87f8fbd libmodbus-3.1.7.tar.gz +sha256 b122f2bc29f749702a22c0a760a7ca2182d541f5fa26bf25e3431f907b606f3c libmodbus-3.1.8.tar.gz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LESSER diff --git a/package/libmodbus/libmodbus.mk b/package/libmodbus/libmodbus.mk index 46eb8603920..2f8c1735da2 100644 --- a/package/libmodbus/libmodbus.mk +++ b/package/libmodbus/libmodbus.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBMODBUS_VERSION = 3.1.7 -LIBMODBUS_SITE = http://libmodbus.org/releases +LIBMODBUS_VERSION = 3.1.8 +LIBMODBUS_SITE = https://github.com/stephane/libmodbus/releases/download/v$(LIBMODBUS_VERSION) LIBMODBUS_LICENSE = LGPL-2.1+ LIBMODBUS_LICENSE_FILES = COPYING.LESSER LIBMODBUS_CPE_ID_VENDOR = libmodbus diff --git a/package/libmodplug/libmodplug.hash b/package/libmodplug/libmodplug.hash index e75152e27fa..01ff71014c9 100644 --- a/package/libmodplug/libmodplug.hash +++ b/package/libmodplug/libmodplug.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 457ca5a6c179656d66c01505c0d95fafaead4329b9dbaa0f997d00a3508ad9de libmodplug-0.8.9.0.tar.gz +sha256 d145910ca10c3ecab0019d45be7e31ea6be1d1ee951ef0e1f747c9752d20f043 libmodplug-d1b97ed.tar.gz sha256 49942e7b3b175f549e751feb08b5270ca6f6c5fb7a1be9f9517db275ec32c92e COPYING diff --git a/package/libmodplug/libmodplug.mk b/package/libmodplug/libmodplug.mk index 98c38a3b00c..735d0e704db 100644 --- a/package/libmodplug/libmodplug.mk +++ b/package/libmodplug/libmodplug.mk @@ -4,11 +4,14 @@ # ################################################################################ -LIBMODPLUG_VERSION = 0.8.9.0 -LIBMODPLUG_SITE = http://downloads.sourceforge.net/project/modplug-xmms/libmodplug/$(LIBMODPLUG_VERSION) +LIBMODPLUG_VERSION = d1b97ed +LIBMODPLUG_SITE = $(call github,Konstanty,libmodplug,$(LIBMODPLUG_VERSION)) LIBMODPLUG_INSTALL_STAGING = YES LIBMODPLUG_LICENSE = Public Domain LIBMODPLUG_LICENSE_FILES = COPYING LIBMODPLUG_CPE_ID_VENDOR = konstanty_bialkowski +# Our version is actually newer than this, but having this allows to +# not have reports about CVEs for versions older than 0.8.9.0. +LIBMODPLUG_CPE_ID_VERSION = 0.8.9.0 -$(eval $(autotools-package)) +$(eval $(cmake-package)) diff --git a/package/libmodsecurity/0001-configure.ac-drop-usage-of-git-at-configure-time.patch b/package/libmodsecurity/0001-configure.ac-drop-usage-of-git-at-configure-time.patch index 14767fb28ea..6853b19ccdb 100644 --- a/package/libmodsecurity/0001-configure.ac-drop-usage-of-git-at-configure-time.patch +++ b/package/libmodsecurity/0001-configure.ac-drop-usage-of-git-at-configure-time.patch @@ -1,4 +1,4 @@ -From a2116312068b6b2c5732dfebde19b751cc81d4f3 Mon Sep 17 00:00:00 2001 +From d242b011a8f0d84781bbf7667a44a12646903ca4 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 1 Aug 2021 23:21:35 +0200 Subject: [PATCH] configure.ac: drop usage of git at configure time @@ -8,12 +8,13 @@ which is not very useful, and causes a significant number of warning when regenerating the configure script. Signed-off-by: Thomas Petazzoni +Signed-off-by: Frank Vanbever --- configure.ac | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/configure.ac b/configure.ac -index 20163e1e..14e5892a 100644 +index 66d6f4f2..746b1fb4 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,6 @@ @@ -46,7 +47,7 @@ index 20163e1e..14e5892a 100644 # Check for yajl -@@ -217,10 +208,6 @@ AC_SUBST([MSC_VERSION_WITH_PATCHLEVEL]) +@@ -224,10 +215,6 @@ AC_SUBST([MSC_VERSION_WITH_PATCHLEVEL]) MSC_VERSION=msc_version AC_SUBST([MSC_VERSION]) @@ -55,9 +56,9 @@ index 20163e1e..14e5892a 100644 - - AC_ARG_ENABLE(debug-logs, - [AC_HELP_STRING([--disable-debug-logs],[Turn off the SecDebugLog feature])], + [AS_HELP_STRING([--disable-debug-logs],[Turn off the SecDebugLog feature])], -@@ -412,16 +399,6 @@ AC_OUTPUT +@@ -419,16 +406,6 @@ AC_OUTPUT # Print a fancy summary @@ -66,14 +67,14 @@ index 20163e1e..14e5892a 100644 -echo "ModSecurity - ${MSC_GIT_VERSION} for $PLATFORM" -echo " " -echo " Mandatory dependencies" --echo -n " + libInjection ...." +-AS_ECHO_N(" + libInjection ....") -echo LIBINJECTION_VERSION --echo -n " + SecLang tests ...." +-AS_ECHO_N(" + SecLang tests ....") -echo SECLANG_TEST_VERSION - echo " " echo " Optional dependencies" -- -2.31.1 +2.39.2 diff --git a/package/libmodsecurity/0002-modsecurity.pc.in-add-lstdc.patch b/package/libmodsecurity/0002-modsecurity.pc.in-add-lstdc.patch index 6511e6f1e0b..9e0b672c8df 100644 --- a/package/libmodsecurity/0002-modsecurity.pc.in-add-lstdc.patch +++ b/package/libmodsecurity/0002-modsecurity.pc.in-add-lstdc.patch @@ -1,4 +1,4 @@ -From 1a84881b280eb08852d5495c57e44351a40d3f91 Mon Sep 17 00:00:00 2001 +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++ @@ -13,6 +13,7 @@ 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(-) @@ -28,5 +29,5 @@ index 96cdf5ca..7c895ddc 100644 -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.30.2 +2.39.2 diff --git a/package/libmodsecurity/0003-Revert-Fix-maxminddb-link-on-FreeBSD.patch b/package/libmodsecurity/0003-Revert-Fix-maxminddb-link-on-FreeBSD.patch deleted file mode 100644 index 9608e3d9350..00000000000 --- a/package/libmodsecurity/0003-Revert-Fix-maxminddb-link-on-FreeBSD.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 6737dc133cb4811a000c02b4e0a92b72f0b220ee Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 16 Jul 2021 19:12:51 +0200 -Subject: [PATCH] Revert "Fix maxminddb link on FreeBSD" - -This reverts commit 785958f9b5089b918c7d054cbcc2fe4a3c7b3788. - -Signed-off-by: Fabrice Fontaine ---- - build/libmaxmind.m4 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/build/libmaxmind.m4 b/build/libmaxmind.m4 -index 656fc250..02820b5a 100644 ---- a/build/libmaxmind.m4 -+++ b/build/libmaxmind.m4 -@@ -10,7 +10,7 @@ dnl MAXMIND_VERSION - AC_DEFUN([PROG_MAXMIND], [ - - # Possible names for the maxmind library/package (pkg-config) --MAXMIND_POSSIBLE_LIB_NAMES="maxminddb maxmind" -+MAXMIND_POSSIBLE_LIB_NAMES="libmaxminddb maxminddb maxmind" - - # Possible extensions for the library - MAXMIND_POSSIBLE_EXTENSIONS="so la sl dll dylib" --- -2.30.2 - diff --git a/package/libmodsecurity/Config.in b/package/libmodsecurity/Config.in index 87f7a9c103d..69bb0494ccc 100644 --- a/package/libmodsecurity/Config.in +++ b/package/libmodsecurity/Config.in @@ -2,7 +2,11 @@ config BR2_PACKAGE_LIBMODSECURITY bool "libmodsecurity" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_PCRE + # libmodsecurity embeds several mbedtls source files, causing + # various issues when static linking and other dependencies of + # libmodsecurity in turn use mbedtls + depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_PCRE2 help Libmodsecurity is one component of the ModSecurity v3 project. The library codebase serves as an @@ -15,5 +19,6 @@ config BR2_PACKAGE_LIBMODSECURITY https://github.com/SpiderLabs/ModSecurity -comment "libmodsecurity needs a toolchain w/ C++, threads" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS +comment "libmodsecurity needs a toolchain w/ C++, threads, dynamic library" + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/libmodsecurity/libmodsecurity.hash b/package/libmodsecurity/libmodsecurity.hash index 341dbc37659..7bcf99e167a 100644 --- a/package/libmodsecurity/libmodsecurity.hash +++ b/package/libmodsecurity/libmodsecurity.hash @@ -1,4 +1,4 @@ -# From https://github.com/SpiderLabs/ModSecurity/releases/download/v3.0.6/modsecurity-v3.0.6.tar.gz.sha256 -sha256 06315d9a32fc830997178f30a69e933c9c2364b263a2f036959bebc4dde59a08 modsecurity-v3.0.6.tar.gz +# From https://github.com/SpiderLabs/ModSecurity/releases/download/v3.0.10/modsecurity-v3.0.10.tar.gz.sha256 +sha256 d5d459f7c2e57a69a405f3222d8e285de419a594b0ea8829058709962227ead0 modsecurity-v3.0.10.tar.gz # Localy calculated sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/libmodsecurity/libmodsecurity.mk b/package/libmodsecurity/libmodsecurity.mk index 8fa3d598452..257f0a56df5 100644 --- a/package/libmodsecurity/libmodsecurity.mk +++ b/package/libmodsecurity/libmodsecurity.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMODSECURITY_VERSION = 3.0.6 +LIBMODSECURITY_VERSION = 3.0.10 LIBMODSECURITY_SOURCE = modsecurity-v$(LIBMODSECURITY_VERSION).tar.gz LIBMODSECURITY_SITE = https://github.com/SpiderLabs/ModSecurity/releases/download/v$(LIBMODSECURITY_VERSION) LIBMODSECURITY_INSTALL_STAGING = YES @@ -12,12 +12,13 @@ LIBMODSECURITY_LICENSE = Apache-2.0 LIBMODSECURITY_LICENSE_FILES = LICENSE LIBMODSECURITY_CPE_ID_VENDOR = trustwave LIBMODSECURITY_CPE_ID_PRODUCT = modsecurity -# We're patching build/libmaxmind.m4 +# We're patching configure.ac LIBMODSECURITY_AUTORECONF = YES -LIBMODSECURITY_DEPENDENCIES = pcre +LIBMODSECURITY_DEPENDENCIES = pcre2 LIBMODSECURITY_CONF_OPTS = \ - --with-pcre="$(STAGING_DIR)/usr/bin/pcre-config" \ + --without-pcre \ + --with-pcre2="$(STAGING_DIR)/usr" \ --disable-examples \ --without-lmdb \ --without-ssdeep \ diff --git a/package/libmpd/libmpd.hash b/package/libmpd/libmpd.hash index c0e5c6b3c3d..875eba2b053 100644 --- a/package/libmpd/libmpd.hash +++ b/package/libmpd/libmpd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 fe20326b0d10641f71c4673fae637bf9222a96e1712f71f170fca2fc34bf7a83 libmpd-11.8.17.tar.gz -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING +sha256 fe20326b0d10641f71c4673fae637bf9222a96e1712f71f170fca2fc34bf7a83 libmpd-11.8.17.tar.gz +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/libmspack/libmspack.hash b/package/libmspack/libmspack.hash index b12e9b62803..9e97063f019 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 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 COPYING.LIB +sha256 bac862dee6e0fc10d92c70212441d9f8ad9b0222edc9a708c3ead4adb1b24a8e libmspack-0.10.1alpha.tar.gz +sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 COPYING.LIB diff --git a/package/libnatpmp/libnatpmp.hash b/package/libnatpmp/libnatpmp.hash index baf9b353929..38bc3f44445 100644 --- a/package/libnatpmp/libnatpmp.hash +++ b/package/libnatpmp/libnatpmp.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e1aa9c4c4219bc06943d6b2130f664daee213fb262fcb94dd355815b8f4536b0 libnatpmp-20150609.tar.gz -sha256 e8d8277e1a101fcfedb0cd5a1cc76646522c0da69f3490dd5a4055fc87ea96a2 LICENSE +sha256 e1aa9c4c4219bc06943d6b2130f664daee213fb262fcb94dd355815b8f4536b0 libnatpmp-20150609.tar.gz +sha256 e8d8277e1a101fcfedb0cd5a1cc76646522c0da69f3490dd5a4055fc87ea96a2 LICENSE diff --git a/package/libnet/libnet.hash b/package/libnet/libnet.hash index 1f03d8f983e..6962ffc83f0 100644 --- a/package/libnet/libnet.hash +++ b/package/libnet/libnet.hash @@ -1,5 +1,5 @@ # From https://github.com/libnet/libnet/releases/download/v1.2/libnet-1.2.tar.gz.md5 -md5 a36c669e0cdfda6a2aa3adfb1f6fe60a libnet-1.2.tar.gz +md5 a36c669e0cdfda6a2aa3adfb1f6fe60a libnet-1.2.tar.gz # Locally computed sha256 caa4868157d9e5f32e9c7eac9461efeff30cb28357f7f6bf07e73933fb4edaa7 libnet-1.2.tar.gz sha256 a06f600f67f239898d85f083aeed82ce6015b1c57599ab1def00fb68787ef388 LICENSE diff --git a/package/libnetconf2/0001-libnetconf2-BUGFIX-netopeer2-build-fails-when-buildi.patch b/package/libnetconf2/0001-libnetconf2-BUGFIX-netopeer2-build-fails-when-buildi.patch deleted file mode 100644 index c03fdc99993..00000000000 --- a/package/libnetconf2/0001-libnetconf2-BUGFIX-netopeer2-build-fails-when-buildi.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e06f291cc36c9e9a3c9c224e23109ac6dad4eb1c Mon Sep 17 00:00:00 2001 -From: Heiko Thiery -Date: Thu, 25 Nov 2021 12:29:47 +0100 -Subject: [PATCH] libnetconf2 BUGFIX netopeer2 build fails when building with - musl libc -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -/home/hthiery/sources/mainline/buildroot/output/host/x86_64-buildroot-linux-musl/sysroot/usr/include/libnetconf2/session_server.h:439:55: error: unknown type name ‘mode_t’ - 439 | int nc_server_endpt_set_perms(const char *endpt_name, mode_t mode, uid_t uid, gid_t gid); - -For musl libc the include "sys/types.h" is required. - -Signed-off-by: Heiko Thiery ---- - src/session_server.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/session_server.h b/src/session_server.h -index 4507eea..4779119 100644 ---- a/src/session_server.h -+++ b/src/session_server.h -@@ -19,6 +19,7 @@ - extern "C" { - #endif - -+#include - #include - #include - --- -2.30.2 - diff --git a/package/libnetconf2/libnetconf2.hash b/package/libnetconf2/libnetconf2.hash index 2dee93cc4c1..675c76a5006 100644 --- a/package/libnetconf2/libnetconf2.hash +++ b/package/libnetconf2/libnetconf2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 78ffa0bd85823abd321a1dbb09c1ead36612f2a12049638a14bb081567f86ade libnetconf2-2.0.24.tar.gz +sha256 72e9a6461fadbd22f0cf0d23ba68d62b297c8f564f7f2bee069748fb67fc3a24 libnetconf2-2.1.28.tar.gz sha256 bd962ab457c8a8cb8faaaa36c11484680f3c9a47dbc336507817ae8935384064 LICENSE diff --git a/package/libnetconf2/libnetconf2.mk b/package/libnetconf2/libnetconf2.mk index ddbb99b7ede..e349c1bce49 100644 --- a/package/libnetconf2/libnetconf2.mk +++ b/package/libnetconf2/libnetconf2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNETCONF2_VERSION = 2.0.24 +LIBNETCONF2_VERSION = 2.1.28 LIBNETCONF2_SITE = $(call github,CESNET,libnetconf2,v$(LIBNETCONF2_VERSION)) LIBNETCONF2_INSTALL_STAGING = YES LIBNETCONF2_LICENSE = BSD-3-Clause @@ -23,7 +23,7 @@ else LIBNETCONF2_CONF_OPTS += -DENABLE_SSH=OFF endif -ifeq ($(BR2_PACKAGE_OPENSSL), y) +ifeq ($(BR2_PACKAGE_LIBOPENSSL), y) LIBNETCONF2_CONF_OPTS += -DENABLE_TLS=ON LIBNETCONF2_DEPENDENCIES += openssl else diff --git a/package/libnetfilter_acct/libnetfilter_acct.hash b/package/libnetfilter_acct/libnetfilter_acct.hash index 0d37c436776..a72d83fb288 100644 --- a/package/libnetfilter_acct/libnetfilter_acct.hash +++ b/package/libnetfilter_acct/libnetfilter_acct.hash @@ -1,6 +1,6 @@ # From ftp://ftp.netfilter.org/pub/libnetfilter_acct/libnetfilter_acct-1.0.3.tar.bz2.{md5sum,sha1sum} -md5 814b2972b2f5c740ff87510bc109168b libnetfilter_acct-1.0.3.tar.bz2 -sha1 4b9073e4aa989b0f000c8da1ab01b22fceed52b2 libnetfilter_acct-1.0.3.tar.bz2 +md5 814b2972b2f5c740ff87510bc109168b libnetfilter_acct-1.0.3.tar.bz2 +sha1 4b9073e4aa989b0f000c8da1ab01b22fceed52b2 libnetfilter_acct-1.0.3.tar.bz2 # Hash for license file: -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libnetfilter_conntrack/0001-conntrack-fix-build-with-kernel-5-15-and-musl.patch b/package/libnetfilter_conntrack/0001-conntrack-fix-build-with-kernel-5-15-and-musl.patch new file mode 100644 index 00000000000..9e965941203 --- /dev/null +++ b/package/libnetfilter_conntrack/0001-conntrack-fix-build-with-kernel-5-15-and-musl.patch @@ -0,0 +1,60 @@ +From 21ee35dde73aec5eba35290587d479218c6dd824 Mon Sep 17 00:00:00 2001 +From: Robert Marko +Date: Thu, 24 Feb 2022 15:01:11 +0100 +Subject: conntrack: fix build with kernel 5.15 and musl + +Currently, with kernel 5.15 headers and musl building is failing with +redefinition errors due to a conflict between the kernel and musl headers. + +Musl is able to suppres the conflicting kernel header definitions if they +are included after the standard libc ones, however since ICMP definitions +were moved into a separate internal header to avoid duplication this has +stopped working and is breaking the builds. + +It seems that the issue is that which contains the UAPI +suppression defines is included in the internal.h header and not in the +proto.h which actually includes the kernel ICMP headers and thus UAPI +supression defines are not present. + +Solve this by moving the include before the ICMP kernel +includes in the proto.h + +Fixes: bc1cb4b11403 ("conntrack: Move icmp request>reply type mapping to common file") +Signed-off-by: Robert Marko +Signed-off-by: Florian Westphal + +[Retrieved from: +https://git.netfilter.org/libnetfilter_conntrack/commit/?id=21ee35dde73aec5eba35290587d479218c6dd824] +Signed-off-by: Fabrice Fontaine +--- + include/internal/internal.h | 1 - + include/internal/proto.h | 1 + + 2 files changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/internal/internal.h b/include/internal/internal.h +index 2ef8a90..7cd7c44 100644 +--- a/include/internal/internal.h ++++ b/include/internal/internal.h +@@ -14,7 +14,6 @@ + #include + #include + #include +-#include + + #include + #include +diff --git a/include/internal/proto.h b/include/internal/proto.h +index 40e7bfe..60a5f4e 100644 +--- a/include/internal/proto.h ++++ b/include/internal/proto.h +@@ -2,6 +2,7 @@ + #define _NFCT_PROTO_H_ + + #include ++#include + #include + #include + +-- +cgit v1.2.3 + diff --git a/package/libnetfilter_conntrack/0001-libnetfilter_conntrack.pc.in-add-LIBMNL_LIBS-to-Libs.patch b/package/libnetfilter_conntrack/0001-libnetfilter_conntrack.pc.in-add-LIBMNL_LIBS-to-Libs.patch deleted file mode 100644 index 0b373d92615..00000000000 --- a/package/libnetfilter_conntrack/0001-libnetfilter_conntrack.pc.in-add-LIBMNL_LIBS-to-Libs.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 93bbd7e56cefc8488a61892b3bf5df63a175d20d Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 12 Apr 2020 14:05:15 +0200 -Subject: [PATCH] libnetfilter_conntrack.pc.in: add LIBMNL_LIBS to Libs.Private - -Since version 1.0.8 and commit -c1c0f16c1fedb46547c2e104beeaaeac5933b214, libnetfilter_conntrack depends -on libmnl so add it to Libs.Private. - -Otherwise, applications such as dnsmasq will fail to link on: - -/home/buildroot/autobuild/instance-0/output-1/host/bin/arm-linux-gcc -Wl,-elf2flt -static -o dnsmasq cache.o rfc1035.o util.o option.o forward.o network.o dnsmasq.o dhcp.o lease.o rfc2131.o netlink.o dbus.o bpf.o helper.o tftp.o log.o conntrack.o dhcp6.o rfc3315.o dhcp-common.o outpacket.o radv.o slaac.o auth.o ipset.o domain.o dnssec.o blockdata.o tables.o loop.o inotify.o poll.o rrfilter.o edns0.o arp.o crypto.o dump.o ubus.o metrics.o -L/home/buildroot/autobuild/instance-0/output-1/host/bin/../arm-buildroot-uclinux-uclibcgnueabi/sysroot/usr/lib -lnetfilter_conntrack -L/home/buildroot/autobuild/instance-0/output-1/host/bin/../arm-buildroot-uclinux-uclibcgnueabi/sysroot/usr/lib -lnfnetlink -/home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/arm-buildroot-uclinux-uclibcgnueabi/bin/ld.real: /home/buildroot/autobuild/instance-0/output-1/host/bin/../arm-buildroot-uclinux-uclibcgnueabi/sysroot/usr/lib/libnetfilter_conntrack.a(api.o): in function `nfct_fill_hdr.constprop.4': -api.c:(.text+0x34): undefined reference to `mnl_nlmsg_put_header' - -Fixes: - - http://autobuild.buildroot.org/results/3fdc2cba20162eb86eaa5c49a056fb40fb18a392 - -Signed-off-by: Fabrice Fontaine -[Upstream status: commit e94172f09e4d] ---- - libnetfilter_conntrack.pc.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libnetfilter_conntrack.pc.in b/libnetfilter_conntrack.pc.in -index 857f993..fbd7132 100644 ---- a/libnetfilter_conntrack.pc.in -+++ b/libnetfilter_conntrack.pc.in -@@ -12,5 +12,5 @@ Version: @VERSION@ - Requires: libnfnetlink - Conflicts: - Libs: -L${libdir} -lnetfilter_conntrack --Libs.private: @LIBNFNETLINK_LIBS@ -+Libs.private: @LIBNFNETLINK_LIBS@ @LIBMNL_LIBS@ - Cflags: -I${includedir} --- -2.25.1 - diff --git a/package/libnetfilter_conntrack/libnetfilter_conntrack.hash b/package/libnetfilter_conntrack/libnetfilter_conntrack.hash index 19520aa3f0c..205eecf1f38 100644 --- a/package/libnetfilter_conntrack/libnetfilter_conntrack.hash +++ b/package/libnetfilter_conntrack/libnetfilter_conntrack.hash @@ -1,5 +1,5 @@ -# From ftp://ftp.netfilter.org/pub/libnetfilter_conntrack/libnetfilter_conntrack-1.0.8.tar.bz2.sha256sum -sha256 0cd13be008923528687af6c6b860f35392d49251c04ee0648282d36b1faec1cf libnetfilter_conntrack-1.0.8.tar.bz2 +# From https://www.netfilter.org/pub/libnetfilter_conntrack/libnetfilter_conntrack-1.0.9.tar.bz2.sha256sum +sha256 67bd9df49fe34e8b82144f6dfb93b320f384a8ea59727e92ff8d18b5f4b579a8 libnetfilter_conntrack-1.0.9.tar.bz2 # Hash for license file: sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING diff --git a/package/libnetfilter_conntrack/libnetfilter_conntrack.mk b/package/libnetfilter_conntrack/libnetfilter_conntrack.mk index 0a5a94be8fb..e10bdd02e95 100644 --- a/package/libnetfilter_conntrack/libnetfilter_conntrack.mk +++ b/package/libnetfilter_conntrack/libnetfilter_conntrack.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNETFILTER_CONNTRACK_VERSION = 1.0.8 +LIBNETFILTER_CONNTRACK_VERSION = 1.0.9 LIBNETFILTER_CONNTRACK_SOURCE = libnetfilter_conntrack-$(LIBNETFILTER_CONNTRACK_VERSION).tar.bz2 LIBNETFILTER_CONNTRACK_SITE = http://www.netfilter.org/projects/libnetfilter_conntrack/files LIBNETFILTER_CONNTRACK_INSTALL_STAGING = YES diff --git a/package/libnetfilter_cthelper/0001-uclinux.patch b/package/libnetfilter_cthelper/0001-uclinux.patch deleted file mode 100644 index 7a6ca70b533..00000000000 --- a/package/libnetfilter_cthelper/0001-uclinux.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d028334281b218209412ec6e1dba56ca96320bd9 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Tue, 10 Sep 2013 16:08:29 -0300 -Subject: [PATCH] configure: uclinux is also linux - -Signed-off-by: Gustavo Zacarias ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index d52b1ce..9389b70 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -22,7 +22,7 @@ AC_DISABLE_STATIC - LT_INIT - CHECK_GCC_FVISIBILITY - case "$host" in --*-*-linux*) ;; -+*-*-linux* | *-*-uclinux*) ;; - *) AC_MSG_ERROR([Linux only, dude!]);; - esac - --- -1.8.1.5 - diff --git a/package/libnetfilter_cthelper/libnetfilter_cthelper.hash b/package/libnetfilter_cthelper/libnetfilter_cthelper.hash index 42deade7dd2..93b9f8da8e9 100644 --- a/package/libnetfilter_cthelper/libnetfilter_cthelper.hash +++ b/package/libnetfilter_cthelper/libnetfilter_cthelper.hash @@ -1,6 +1,5 @@ -# From ftp://ftp.netfilter.org/pub/libnetfilter_cthelper/libnetfilter_cthelper-1.0.0.tar.bz2.{md5sum,sha1sum} -md5 b2efab1a3a198a5add448960ba011acd libnetfilter_cthelper-1.0.0.tar.bz2 -sha1 5d0a82794bd46aafde20c16800edca23d563de66 libnetfilter_cthelper-1.0.0.tar.bz2 +# From http://ftp.netfilter.org/pub/libnetfilter_cthelper/libnetfilter_cthelper-1.0.1.tar.bz2.sha256sum +sha256 14073d5487233897355d3ff04ddc1c8d03cc5ba8d2356236aa88161a9f2dc912 libnetfilter_cthelper-1.0.1.tar.bz2 # Hash for license file: -sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING +sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING diff --git a/package/libnetfilter_cthelper/libnetfilter_cthelper.mk b/package/libnetfilter_cthelper/libnetfilter_cthelper.mk index d74ea4d0fdc..e0bbbab8338 100644 --- a/package/libnetfilter_cthelper/libnetfilter_cthelper.mk +++ b/package/libnetfilter_cthelper/libnetfilter_cthelper.mk @@ -4,12 +4,11 @@ # ################################################################################ -LIBNETFILTER_CTHELPER_VERSION = 1.0.0 +LIBNETFILTER_CTHELPER_VERSION = 1.0.1 LIBNETFILTER_CTHELPER_SOURCE = libnetfilter_cthelper-$(LIBNETFILTER_CTHELPER_VERSION).tar.bz2 LIBNETFILTER_CTHELPER_SITE = http://www.netfilter.org/projects/libnetfilter_cthelper/files LIBNETFILTER_CTHELPER_INSTALL_STAGING = YES LIBNETFILTER_CTHELPER_DEPENDENCIES = host-pkgconf libmnl -LIBNETFILTER_CTHELPER_AUTORECONF = YES LIBNETFILTER_CTHELPER_LICENSE = GPL-2.0+ LIBNETFILTER_CTHELPER_LICENSE_FILES = COPYING LIBNETFILTER_CTHELPER_CPE_ID_VENDOR = netfilter diff --git a/package/libnetfilter_cttimeout/0001-uclinux.patch b/package/libnetfilter_cttimeout/0001-uclinux.patch deleted file mode 100644 index 5d462d8fec4..00000000000 --- a/package/libnetfilter_cttimeout/0001-uclinux.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d8d2ec14bc192f998afae2b71c69248e73518ddf Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Tue, 10 Sep 2013 16:09:14 -0300 -Subject: [PATCH] configure: uclinux is also linux - -Signed-off-by: Gustavo Zacarias ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index d79e941..aeb6ad0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -22,7 +22,7 @@ AC_DISABLE_STATIC - LT_INIT - CHECK_GCC_FVISIBILITY - case "$host" in --*-*-linux*) ;; -+*-*-linux* | *-*-uclinux*) ;; - *) AC_MSG_ERROR([Linux only, dude!]);; - esac - --- -1.8.1.5 - diff --git a/package/libnetfilter_cttimeout/libnetfilter_cttimeout.hash b/package/libnetfilter_cttimeout/libnetfilter_cttimeout.hash index af5a281e4d9..81d54dd645a 100644 --- a/package/libnetfilter_cttimeout/libnetfilter_cttimeout.hash +++ b/package/libnetfilter_cttimeout/libnetfilter_cttimeout.hash @@ -1,6 +1,5 @@ -# From ftp://ftp.netfilter.org/pub/libnetfilter_cttimeout/libnetfilter_cttimeout-1.0.0.tar.bz2.{md5sum,sha1sum} -md5 7697437fc9ebb6f6b83df56a633db7f9 libnetfilter_cttimeout-1.0.0.tar.bz2 -sha1 24cba24b0371e80007be4ea0fa9d872df63b8a7a libnetfilter_cttimeout-1.0.0.tar.bz2 +# From http://ftp.netfilter.org/pub/libnetfilter_cttimeout/libnetfilter_cttimeout-1.0.1.tar.bz2.sha256sum +sha256 0b59da2f3204e1c80cb85d1f6d72285fc07b01a2f5678abf5dccfbbefd650325 libnetfilter_cttimeout-1.0.1.tar.bz2 # Hash for license file: -sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING +sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING diff --git a/package/libnetfilter_cttimeout/libnetfilter_cttimeout.mk b/package/libnetfilter_cttimeout/libnetfilter_cttimeout.mk index f5c5067b643..dcdf34c71e7 100644 --- a/package/libnetfilter_cttimeout/libnetfilter_cttimeout.mk +++ b/package/libnetfilter_cttimeout/libnetfilter_cttimeout.mk @@ -4,12 +4,11 @@ # ################################################################################ -LIBNETFILTER_CTTIMEOUT_VERSION = 1.0.0 +LIBNETFILTER_CTTIMEOUT_VERSION = 1.0.1 LIBNETFILTER_CTTIMEOUT_SOURCE = libnetfilter_cttimeout-$(LIBNETFILTER_CTTIMEOUT_VERSION).tar.bz2 LIBNETFILTER_CTTIMEOUT_SITE = http://www.netfilter.org/projects/libnetfilter_cttimeout/files LIBNETFILTER_CTTIMEOUT_INSTALL_STAGING = YES LIBNETFILTER_CTTIMEOUT_DEPENDENCIES = host-pkgconf libmnl -LIBNETFILTER_CTTIMEOUT_AUTORECONF = YES LIBNETFILTER_CTTIMEOUT_LICENSE = GPL-2.0+ LIBNETFILTER_CTTIMEOUT_LICENSE_FILES = COPYING LIBNETFILTER_CTTIMEOUT_CPE_ID_VENDOR = netfilter diff --git a/package/libnfc/Config.in b/package/libnfc/Config.in index ead61e45290..3686f570a9c 100644 --- a/package/libnfc/Config.in +++ b/package/libnfc/Config.in @@ -13,13 +13,15 @@ config BR2_PACKAGE_LIBNFC_ACR122_PCSC 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 help support for acr112_pcsc driver -comment "acr122_pcsc driver needs a toolchain w/ threads, dynamic library" +comment "acr122_pcsc driver needs a toolchain w/ threads, dynamic library, gcc >= 4.9" depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 config BR2_PACKAGE_LIBNFC_ACR122_USB bool "acr122_usb driver" diff --git a/package/libnfnetlink/0001-uclinux.patch b/package/libnfnetlink/0001-uclinux.patch deleted file mode 100644 index b15201283a3..00000000000 --- a/package/libnfnetlink/0001-uclinux.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 8e5a9d8f32c9646d01d8c84e979892dfd28a7f7c Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Tue, 10 Sep 2013 15:35:22 -0300 -Subject: [PATCH] configure: uclinux is also linux - -Signed-off-by: Gustavo Zacarias ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 0926a1c..b979772 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -18,7 +18,7 @@ AC_DISABLE_STATIC - AM_PROG_LIBTOOL - - case "$host" in --*-*-linux*) ;; -+*-*-linux* | *-*-uclinux*) ;; - *) AC_MSG_ERROR([Linux only, dude!]);; - esac - --- -1.8.1.5 - diff --git a/package/libnfnetlink/0002-include-Sync-with-kernel-headers.patch b/package/libnfnetlink/0002-include-Sync-with-kernel-headers.patch deleted file mode 100644 index f9e9c2e2eae..00000000000 --- a/package/libnfnetlink/0002-include-Sync-with-kernel-headers.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 7a1a07c0028a1c88cd7716a058697c552a563b24 Mon Sep 17 00:00:00 2001 -From: Felix Janda -Date: Sat, 16 May 2015 14:49:07 +0200 -Subject: include: Sync with kernel headers - -Signed-off-by: Felix Janda -Signed-off-by: Pablo Neira Ayuso - -[Retrieved from: -https://git.netfilter.org/libnfnetlink/commit/?id=7a1a07c0028a1c88cd7716a058697c552a563b24] -Signed-off-by: Fabrice Fontaine ---- - include/libnfnetlink/linux_nfnetlink.h | 44 ++++----------------------- - include/libnfnetlink/linux_nfnetlink_compat.h | 12 ++++---- - 2 files changed, 12 insertions(+), 44 deletions(-) - -diff --git a/include/libnfnetlink/linux_nfnetlink.h b/include/libnfnetlink/linux_nfnetlink.h -index 76a8550..44a38d6 100644 ---- a/include/libnfnetlink/linux_nfnetlink.h -+++ b/include/libnfnetlink/linux_nfnetlink.h -@@ -25,9 +25,9 @@ enum nfnetlink_groups { - /* General form of address family dependent message. - */ - struct nfgenmsg { -- u_int8_t nfgen_family; /* AF_xxx */ -- u_int8_t version; /* nfnetlink version */ -- u_int16_t res_id; /* resource id */ -+ __u8 nfgen_family; /* AF_xxx */ -+ __u8 version; /* nfnetlink version */ -+ __be16 res_id; /* resource id */ - }; - - #define NFNETLINK_V0 0 -@@ -46,40 +46,8 @@ struct nfgenmsg { - #define NFNL_SUBSYS_CTNETLINK_EXP 2 - #define NFNL_SUBSYS_QUEUE 3 - #define NFNL_SUBSYS_ULOG 4 --#define NFNL_SUBSYS_COUNT 5 -+#define NFNL_SUBSYS_OSF 5 -+#define NFNL_SUBSYS_IPSET 6 -+#define NFNL_SUBSYS_COUNT 7 - --#ifdef __KERNEL__ -- --#include --#include --#include -- --struct nfnl_callback --{ -- int (*call)(struct sock *nl, struct sk_buff *skb, -- struct nlmsghdr *nlh, struct nlattr *cda[]); -- const struct nla_policy *policy; /* netlink attribute policy */ -- const u_int16_t attr_count; /* number of nlattr's */ --}; -- --struct nfnetlink_subsystem --{ -- const char *name; -- __u8 subsys_id; /* nfnetlink subsystem ID */ -- __u8 cb_count; /* number of callbacks */ -- const struct nfnl_callback *cb; /* callback for individual types */ --}; -- --extern int nfnetlink_subsys_register(const struct nfnetlink_subsystem *n); --extern int nfnetlink_subsys_unregister(const struct nfnetlink_subsystem *n); -- --extern int nfnetlink_has_listeners(unsigned int group); --extern int nfnetlink_send(struct sk_buff *skb, u32 pid, unsigned group, -- int echo); --extern int nfnetlink_unicast(struct sk_buff *skb, u_int32_t pid, int flags); -- --#define MODULE_ALIAS_NFNL_SUBSYS(subsys) \ -- MODULE_ALIAS("nfnetlink-subsys-" __stringify(subsys)) -- --#endif /* __KERNEL__ */ - #endif /* _NFNETLINK_H */ -diff --git a/include/libnfnetlink/linux_nfnetlink_compat.h b/include/libnfnetlink/linux_nfnetlink_compat.h -index e145176..74b9e55 100644 ---- a/include/libnfnetlink/linux_nfnetlink_compat.h -+++ b/include/libnfnetlink/linux_nfnetlink_compat.h -@@ -1,6 +1,8 @@ - #ifndef _NFNETLINK_COMPAT_H - #define _NFNETLINK_COMPAT_H --#ifndef __KERNEL__ -+ -+#include -+ - /* Old nfnetlink macros for userspace */ - - /* nfnetlink groups: Up to 32 maximum */ -@@ -18,10 +20,9 @@ - * ! nfnetlink use the same attributes methods. - J. Schulist. - */ - --struct nfattr --{ -- u_int16_t nfa_len; -- u_int16_t nfa_type; /* we use 15 bits for the type, and the highest -+struct nfattr { -+ __u16 nfa_len; -+ __u16 nfa_type; /* we use 15 bits for the type, and the highest - * bit to indicate whether the payload is nested */ - }; - -@@ -57,5 +58,4 @@ struct nfattr - + NLMSG_ALIGN(sizeof(struct nfgenmsg)))) - #define NFM_PAYLOAD(n) NLMSG_PAYLOAD(n, sizeof(struct nfgenmsg)) - --#endif /* ! __KERNEL__ */ - #endif /* _NFNETLINK_COMPAT_H */ --- -cgit v1.2.3 - diff --git a/package/libnfnetlink/0002-musl.patch b/package/libnfnetlink/0002-musl.patch deleted file mode 100644 index bee7898aae7..00000000000 --- a/package/libnfnetlink/0002-musl.patch +++ /dev/null @@ -1,32 +0,0 @@ -Include to get the u_int* definitions - -This is needed to fix the build with the musl C library, and this -patch comes from -http://git.alpinelinux.org/cgit/aports/plain/main/libnfnetlink/musl-fix-includes.patch. - -It will no longer be needed with upcoming upstream releases of -libnfnetlink, since they have switched to use the types -instead. However this change was too invasive to backport. - -Signed-off-by: Thomas Petazzoni - ---- libnfnetlink-1.0.1.orig/include/libnfnetlink/linux_nfnetlink.h -+++ libnfnetlink-1.0.1/include/libnfnetlink/linux_nfnetlink.h -@@ -1,6 +1,6 @@ - #ifndef _NFNETLINK_H - #define _NFNETLINK_H --#include -+#include - #include - - enum nfnetlink_groups { ---- libnfnetlink-1.0.1.orig/include/libnfnetlink/libnfnetlink.h -+++ libnfnetlink-1.0.1/include/libnfnetlink/libnfnetlink.h -@@ -15,6 +15,7 @@ - #define aligned_u64 unsigned long long __attribute__((aligned(8))) - #endif - -+#include - #include /* for sa_family_t */ - #include - #include diff --git a/package/libnfnetlink/libnfnetlink.hash b/package/libnfnetlink/libnfnetlink.hash index 3392d239b66..63708f8f267 100644 --- a/package/libnfnetlink/libnfnetlink.hash +++ b/package/libnfnetlink/libnfnetlink.hash @@ -1,6 +1,5 @@ -# From ftp://ftp.netfilter.org/pub/libnfnetlink/libnfnetlink-1.0.1.tar.bz2.{md5sum,sha1sum} -md5 98927583d2016a9fb1936fed992e2c5e libnfnetlink-1.0.1.tar.bz2 -sha1 27ae2dfbd976e28cb7a417f9e946c901f512dd9a libnfnetlink-1.0.1.tar.bz2 +# From http://ftp.netfilter.org/pub/libnfnetlink/libnfnetlink-1.0.2.tar.bz2.sha256sum +sha256 b064c7c3d426efb4786e60a8e6859b82ee2f2c5e49ffeea640cfe4fe33cbc376 libnfnetlink-1.0.2.tar.bz2 # Hash for license file: -sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING +sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING diff --git a/package/libnfnetlink/libnfnetlink.mk b/package/libnfnetlink/libnfnetlink.mk index a5ad47b85e0..85a717b8d24 100644 --- a/package/libnfnetlink/libnfnetlink.mk +++ b/package/libnfnetlink/libnfnetlink.mk @@ -4,10 +4,9 @@ # ################################################################################ -LIBNFNETLINK_VERSION = 1.0.1 +LIBNFNETLINK_VERSION = 1.0.2 LIBNFNETLINK_SOURCE = libnfnetlink-$(LIBNFNETLINK_VERSION).tar.bz2 LIBNFNETLINK_SITE = http://www.netfilter.org/projects/libnfnetlink/files -LIBNFNETLINK_AUTORECONF = YES LIBNFNETLINK_INSTALL_STAGING = YES LIBNFNETLINK_LICENSE = GPL-2.0 LIBNFNETLINK_LICENSE_FILES = COPYING diff --git a/package/libnfs/libnfs.hash b/package/libnfs/libnfs.hash index bb92ebe6976..ffb6c620732 100644 --- a/package/libnfs/libnfs.hash +++ b/package/libnfs/libnfs.hash @@ -1,6 +1,6 @@ # Locally calculated -sha256 6ee77e9fe220e2d3e3b1f53cfea04fb319828cc7dbb97dd9df09e46e901d797d libnfs-4.0.0.tar.gz -sha256 edd960c0142b8ada98b43b6396b78f4e557b0bc70ac601a51e397ad04070e2c5 COPYING -sha256 d9406ced95457941032aa11d04623b8ab71f2827a3395ebef137aec475be35b1 LICENCE-BSD.txt -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENCE-LGPL-2.1.txt -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENCE-GPL-3.txt +sha256 6ee77e9fe220e2d3e3b1f53cfea04fb319828cc7dbb97dd9df09e46e901d797d libnfs-4.0.0.tar.gz +sha256 edd960c0142b8ada98b43b6396b78f4e557b0bc70ac601a51e397ad04070e2c5 COPYING +sha256 d9406ced95457941032aa11d04623b8ab71f2827a3395ebef137aec475be35b1 LICENCE-BSD.txt +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENCE-LGPL-2.1.txt +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENCE-GPL-3.txt diff --git a/package/libnftnl/Config.in b/package/libnftnl/Config.in index 347223ce22a..0d17751e509 100644 --- a/package/libnftnl/Config.in +++ b/package/libnftnl/Config.in @@ -13,13 +13,3 @@ config BR2_PACKAGE_LIBNFTNL currently used by nftables. http://netfilter.org/projects/libnftnl/index.html - -if BR2_PACKAGE_LIBNFTNL - -config BR2_PACKAGE_LIBNFTNL_JSON - bool "enable JSON support" - select BR2_PACKAGE_JANSSON - help - Enable JSON parsing support - -endif diff --git a/package/libnftnl/libnftnl.hash b/package/libnftnl/libnftnl.hash index 0a183eedcf2..0cb3917f2d3 100644 --- a/package/libnftnl/libnftnl.hash +++ b/package/libnftnl/libnftnl.hash @@ -1,3 +1,3 @@ # From http://www.netfilter.org/projects/libnftnl/downloads.html -sha256 7508a5c414fab13e3cb3ce8262d0ce4f02c1590a8e4f8628ab497b5b4585937c libnftnl-1.2.1.tar.bz2 +sha256 966de0a8120c8a53db859889749368bfb2cba0c4f0b4c1a30d264eccc45f1226 libnftnl-1.2.5.tar.xz sha256 98193898c663001eff2fdcfb676e210c13042bc1a05e8d570c363efa396f8e24 COPYING diff --git a/package/libnftnl/libnftnl.mk b/package/libnftnl/libnftnl.mk index 616afa63072..a7045337d0d 100644 --- a/package/libnftnl/libnftnl.mk +++ b/package/libnftnl/libnftnl.mk @@ -4,19 +4,12 @@ # ################################################################################ -LIBNFTNL_VERSION = 1.2.1 +LIBNFTNL_VERSION = 1.2.5 LIBNFTNL_SITE = https://netfilter.org/projects/libnftnl/files -LIBNFTNL_SOURCE = libnftnl-$(LIBNFTNL_VERSION).tar.bz2 +LIBNFTNL_SOURCE = libnftnl-$(LIBNFTNL_VERSION).tar.xz LIBNFTNL_LICENSE = GPL-2.0+ LIBNFTNL_LICENSE_FILES = COPYING LIBNFTNL_INSTALL_STAGING = YES LIBNFTNL_DEPENDENCIES = host-pkgconf libmnl -ifeq ($(BR2_PACKAGE_LIBNFTNL_JSON),y) -LIBNFTNL_CONF_OPTS += --with-json-parsing -LIBNFTNL_DEPENDENCIES += jansson -else -LIBNFTNL_CONF_OPTS += --without-json-parsing -endif - $(eval $(autotools-package)) diff --git a/package/libnice/libnice.hash b/package/libnice/libnice.hash index 55785cd5ff8..cf6d825f835 100644 --- a/package/libnice/libnice.hash +++ b/package/libnice/libnice.hash @@ -1,5 +1,5 @@ # Locally computed after checking pgp signature -sha256 5eabd25ba2b54e817699832826269241abaa1cf78f9b240d1435f936569273f4 libnice-0.1.18.tar.gz +sha256 72e73a2acf20f59093e21d5601606e405873503eb35f346fa621de23e99b3b39 libnice-0.1.21.tar.gz # Hash for license files: sha256 9246b2ee8b1db30cf03d5d9719ad8bb5edce1cadc85f8cfef319c23d24d950b5 COPYING diff --git a/package/libnice/libnice.mk b/package/libnice/libnice.mk index 5889b24ba21..56ee35e4528 100644 --- a/package/libnice/libnice.mk +++ b/package/libnice/libnice.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBNICE_VERSION = 0.1.18 -LIBNICE_SITE = http://nice.freedesktop.org/releases +LIBNICE_VERSION = 0.1.21 +LIBNICE_SITE = https://libnice.freedesktop.org/releases LIBNICE_LICENSE = MPL-1.1 or LGPL-2.1 LIBNICE_LICENSE_FILES = COPYING COPYING.MPL COPYING.LGPL LIBNICE_DEPENDENCIES = libglib2 host-pkgconf diff --git a/package/libnids/libnids.hash b/package/libnids/libnids.hash index 4a2949c39d0..e51dbf151cd 100644 --- a/package/libnids/libnids.hash +++ b/package/libnids/libnids.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 314b4793e0902fbf1fdb7fb659af37a3c1306ed1aad5d1c84de6c931b351d359 libnids-1.24.tar.gz -sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING +sha256 3f3e9f99a83cd37bc74af83d415c5e3a7505f5b190dfaf456b0849e0054f6733 libnids-1.26.tar.gz +sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING diff --git a/package/libnids/libnids.mk b/package/libnids/libnids.mk index 3e36838c401..40620eca57c 100644 --- a/package/libnids/libnids.mk +++ b/package/libnids/libnids.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBNIDS_VERSION = 1.24 -LIBNIDS_SITE = https://sourceforge.net/projects/libnids/files/libnids/$(LIBNIDS_VERSION) +LIBNIDS_VERSION = 1.26 +LIBNIDS_SITE = $(call github,MITRECND,libnids,$(LIBNIDS_VERSION)) LIBNIDS_LICENSE = GPL-2.0 LIBNIDS_LICENSE_FILES = COPYING LIBNIDS_CPE_ID_VENDOR = libnids_project diff --git a/package/libnl/0002-Add-musl-workaround-to-the-libc-compat.h-copy.patch b/package/libnl/0001-Add-musl-workaround-to-the-libc-compat.h-copy.patch similarity index 100% rename from package/libnl/0002-Add-musl-workaround-to-the-libc-compat.h-copy.patch rename to package/libnl/0001-Add-musl-workaround-to-the-libc-compat.h-copy.patch diff --git a/package/libnl/0001-build-add-Libs.private-field-in-libnl-pkg-config-fil.patch b/package/libnl/0001-build-add-Libs.private-field-in-libnl-pkg-config-fil.patch deleted file mode 100644 index 2419ae282c9..00000000000 --- a/package/libnl/0001-build-add-Libs.private-field-in-libnl-pkg-config-fil.patch +++ /dev/null @@ -1,30 +0,0 @@ -From db0d59cd06f3ffd350379847c0885e1bfb85af0f Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 7 Mar 2015 11:34:42 +0100 -Subject: [PATCH] build: add Libs.private field in libnl pkg-config file - -In order to support static linking, the libnl pkg-config file should -indicate in its Libs.private field the libraries that libnl-3.0.a -requires. The LIBS variable contains the appropriate list of -libraries: -lm in all cases, and -lpthread when pthread support is -enabled. This allows to statically link applications against libnl -properly. - -Signed-off-by: Thomas Petazzoni ---- - libnl-3.0.pc.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libnl-3.0.pc.in b/libnl-3.0.pc.in -index b87e3dc..ddbc999 100644 ---- a/libnl-3.0.pc.in -+++ b/libnl-3.0.pc.in -@@ -7,4 +7,5 @@ Name: libnl - Description: Convenience library for netlink sockets - Version: @PACKAGE_VERSION@ - Libs: -L${libdir} -lnl-@MAJ_VERSION@ -+Libs.private: @LIBS@ - Cflags: -I${includedir}/libnl@MAJ_VERSION@ --- -2.1.0 - diff --git a/package/libnl/libnl.hash b/package/libnl/libnl.hash index d7cd5c9532d..8a1bd56780f 100644 --- a/package/libnl/libnl.hash +++ b/package/libnl/libnl.hash @@ -1,6 +1,4 @@ -# From https://github.com/thom311/libnl/releases/download/libnl3_5_0/libnl-3.5.0.tar.gz.md5sum -md5 74ba57b1b1d6f9f92268aa8141d8e8e4 libnl-3.5.0.tar.gz -# From https://github.com/thom311/libnl/releases/download/libnl3_5_0/libnl-3.5.0.tar.gz.sha256sum -sha256 352133ec9545da76f77e70ccb48c9d7e5324d67f6474744647a7ed382b5e05fa libnl-3.5.0.tar.gz +# From https://github.com/thom311/libnl/releases/download/libnl3_7_0/libnl-3.7.0.tar.gz.sha256sum +sha256 9fe43ccbeeea72c653bdcf8c93332583135cda46a79507bfd0a483bb57f65939 libnl-3.7.0.tar.gz # Locally calculated -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libnl/libnl.mk b/package/libnl/libnl.mk index fc9398b29ae..6896188f4dc 100644 --- a/package/libnl/libnl.mk +++ b/package/libnl/libnl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNL_VERSION = 3.5.0 +LIBNL_VERSION = 3.7.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 8d0b6bd5476..b9f72e07707 100644 --- a/package/libnpth/libnpth.hash +++ b/package/libnpth/libnpth.hash @@ -1,7 +1,7 @@ # Locally calculated after checking signature # https://gnupg.org/ftp/gcrypt/npth/npth-1.6.tar.bz2.sig # using key D8692123C4065DEA5E0F3AB5249B39D24F25E3B6 -sha256 1393abd9adcf0762d34798dc34fdcf4d0d22a8410721e76f1e3afcd1daa4e2d1 npth-1.6.tar.bz2 +sha256 1393abd9adcf0762d34798dc34fdcf4d0d22a8410721e76f1e3afcd1daa4e2d1 npth-1.6.tar.bz2 # Hash for license file: -sha256 ce64d5f7b49ea6d80fdb6d4cdee6839d1a94274f7493dc797c3b55b65ec8e9ed COPYING.LIB +sha256 ce64d5f7b49ea6d80fdb6d4cdee6839d1a94274f7493dc797c3b55b65ec8e9ed COPYING.LIB diff --git a/package/libnpupnp/libnpupnp.hash b/package/libnpupnp/libnpupnp.hash index 276bf93c99a..15ee26c6d24 100644 --- a/package/libnpupnp/libnpupnp.hash +++ b/package/libnpupnp/libnpupnp.hash @@ -1,5 +1,5 @@ -# Hash from: http://www.lesbonscomptes.com/upmpdcli/downloads/libnpupnp-4.2.1.tar.gz.sha256 -sha256 e0e59eb2d3d024e827050428e0e7eb228355912a38c85eb30bfeb2f0926eca4c libnpupnp-4.2.1.tar.gz +# Hash from: http://www.lesbonscomptes.com/upmpdcli/downloads/libnpupnp-4.2.2.tar.gz.sha256 +sha256 cb3968773d30e2bfc765547df514fdc8927b9a37ecccca2e260ee8b612e756bc libnpupnp-4.2.2.tar.gz # Hash for license file: sha256 c8b99423cad48bb44e2cf52a496361404290865eac259a82da6d1e4331ececb3 COPYING diff --git a/package/libnpupnp/libnpupnp.mk b/package/libnpupnp/libnpupnp.mk index 09bfa34b87e..d7192ec3f1d 100644 --- a/package/libnpupnp/libnpupnp.mk +++ b/package/libnpupnp/libnpupnp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNPUPNP_VERSION = 4.2.1 +LIBNPUPNP_VERSION = 4.2.2 LIBNPUPNP_SITE = http://www.lesbonscomptes.com/upmpdcli/downloads LIBNPUPNP_LICENSE = BSD-3-Clause LIBNPUPNP_LICENSE_FILES = COPYING diff --git a/package/libnspr/libnspr.hash b/package/libnspr/libnspr.hash index 0064a9b2792..c5691356634 100644 --- a/package/libnspr/libnspr.hash +++ b/package/libnspr/libnspr.hash @@ -1,4 +1,4 @@ -# From https://ftp.mozilla.org/pub/nspr/releases/v4.33/src/SHA256SUMS -sha256 b23ee315be0e50c2fb1aa374d17f2d2d9146a835b1a79c1918ea15d075a693d7 nspr-4.33.tar.gz +# From https://ftp.mozilla.org/pub/nspr/releases/v4.35/src/SHA256SUMS +sha256 7ea3297ea5969b5d25a5dd8d47f2443cda88e9ee746301f6e1e1426f8a6abc8f nspr-4.35.tar.gz # Locally calculated sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 nspr/LICENSE diff --git a/package/libnspr/libnspr.mk b/package/libnspr/libnspr.mk index 7491d18884f..e891aa48525 100644 --- a/package/libnspr/libnspr.mk +++ b/package/libnspr/libnspr.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSPR_VERSION = 4.33 +LIBNSPR_VERSION = 4.35 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/0001-Bug-1801182-Allow-overriding-OS_ARCH-OS_TEST-and-OS_.patch b/package/libnss/0001-Bug-1801182-Allow-overriding-OS_ARCH-OS_TEST-and-OS_.patch new file mode 100644 index 00000000000..7b3abea307e --- /dev/null +++ b/package/libnss/0001-Bug-1801182-Allow-overriding-OS_ARCH-OS_TEST-and-OS_.patch @@ -0,0 +1,45 @@ +From a1a5f3afea2ee59bdbb7a74eb2d7f82b635dbd1a Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Thu, 17 Nov 2022 20:38:48 +0100 +Subject: [PATCH] Bug 1801182 - Allow overriding OS_ARCH, OS_TEST and + OS_RELEASE in Makefile + +Starting from Make 4.3.91 simple expanded variables can't be safely +overriden via command line anymore, so let's use conditional expanded +variables to override OS_ARCH, OS_TEST and OS_RELEASE. + +Signed-off-by: Giulio Benetti +[Upstream status: https://bugzilla.mozilla.org/show_bug.cgi?id=1801182] +--- + nss/coreconf/arch.mk | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk +index 17e9faeac..85aac9341 100644 +--- a/nss/coreconf/arch.mk ++++ b/nss/coreconf/arch.mk +@@ -20,17 +20,17 @@ + # Macros for getting the OS architecture + # + +-OS_ARCH := $(subst /,_,$(shell uname -s)) ++OS_ARCH ?= $(subst /,_,$(shell uname -s)) + + # + # Attempt to differentiate between sparc and x86 Solaris + # + +-OS_TEST := $(shell uname -m) ++OS_TEST ?= $(shell uname -m) + ifeq ($(OS_TEST),i86pc) +- OS_RELEASE := $(shell uname -r)_$(OS_TEST) ++ OS_RELEASE ?= $(shell uname -r)_$(OS_TEST) + else +- OS_RELEASE := $(shell uname -r) ++ OS_RELEASE ?= $(shell uname -r) + endif + + +-- +2.34.1 + diff --git a/package/libnss/libnss.hash b/package/libnss/libnss.hash index 07fb340c335..ec3fe0d7779 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_75_RTM/src/SHA256SUMS -sha256 fd571507827284644f4dd522a032acda2286835f6683ed22a1c2d3878cc58582 nss-3.75.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_88_1_RTM/src/SHA256SUMS +sha256 27d243edf87d1cf1bb9c861f03d387e0e9230ce5017f4308c941f558b54b3496 nss-3.88.1.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index a9549e48ddd..ac342cf3af3 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.75 +LIBNSS_VERSION = 3.88.1 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 @@ -64,6 +64,11 @@ ifeq ($(BR2_POWERPC_CPU_HAS_ALTIVEC),) LIBNSS_BUILD_VARS += NSS_DISABLE_ALTIVEC=1 endif +ifeq ($(BR2_POWERPC_CPU_HAS_VSX),) +# Disable VSX if not supported +LIBNSS_BUILD_VARS += NSS_DISABLE_CRYPTO_VSX=1 +endif + ifeq ($(BR2_ARM_CPU_HAS_NEON),) # Disable arm32-neon if neon is not supported LIBNSS_BUILD_VARS += NSS_DISABLE_ARM32_NEON=1 @@ -87,7 +92,9 @@ define LIBNSS_BUILD_CMDS SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \ DIST=$(@D)/$(LIBNSS_DISTDIR) \ CHECKLOC= \ - $(LIBNSS_BUILD_VARS) NATIVE_FLAGS="$(HOST_CFLAGS) -DLINUX" + $(LIBNSS_BUILD_VARS) \ + NATIVE_FLAGS="$(HOST_CFLAGS) -DLINUX" \ + NATIVE_LDFLAGS="$(HOST_LDFLAGS)" endef define LIBNSS_INSTALL_STAGING_CMDS diff --git a/package/libodb-boost/libodb-boost.mk b/package/libodb-boost/libodb-boost.mk index bac5f1e78f3..996759a03ac 100644 --- a/package/libodb-boost/libodb-boost.mk +++ b/package/libodb-boost/libodb-boost.mk @@ -12,6 +12,9 @@ LIBODB_BOOST_INSTALL_STAGING = YES LIBODB_BOOST_LICENSE = GPL-2.0 LIBODB_BOOST_LICENSE_FILES = LICENSE LIBODB_BOOST_DEPENDENCIES = boost libodb +HOST_LIBODB_BOOST_DEPENDENCIES = host-boost host-libodb LIBODB_BOOST_CONF_ENV = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" +HOST_LIBODB_BOOST_CONF_ENV = CXXFLAGS="$(HOST_CXXFLAGS) -std=c++11" $(eval $(autotools-package)) +$(eval $(host-autotools-package)) diff --git a/package/libodb-mysql/libodb-mysql.hash b/package/libodb-mysql/libodb-mysql.hash index 1c35041af8a..c8204a3f655 100644 --- a/package/libodb-mysql/libodb-mysql.hash +++ b/package/libodb-mysql/libodb-mysql.hash @@ -1,4 +1,4 @@ -sha1 2021a67577354f1d6bed50c0b257c1920760eda7 libodb-mysql-2.4.0.tar.bz2 +sha1 2021a67577354f1d6bed50c0b257c1920760eda7 libodb-mysql-2.4.0.tar.bz2 -sha256 ce2fcdb6ab4a02fc0aff263a891c56949fa41b89e65d7a40d8b656d3ebf0d9bc libodb-mysql-2.4.0.tar.bz2 -sha256 841105a470fc283851c63941510ffd403c726d1910b688f7df95914ab8b1b5a3 LICENSE +sha256 ce2fcdb6ab4a02fc0aff263a891c56949fa41b89e65d7a40d8b656d3ebf0d9bc libodb-mysql-2.4.0.tar.bz2 +sha256 841105a470fc283851c63941510ffd403c726d1910b688f7df95914ab8b1b5a3 LICENSE diff --git a/package/libodb-pgsql/libodb-pgsql.hash b/package/libodb-pgsql/libodb-pgsql.hash index 5799f092366..609b3e90938 100644 --- a/package/libodb-pgsql/libodb-pgsql.hash +++ b/package/libodb-pgsql/libodb-pgsql.hash @@ -1,6 +1,6 @@ # From https://www.codesynthesis.com/download/odb/2.4/libodb-pgsql-2.4.0.tar.bz2.sha1 -sha1 4628d5e296da01dbaf8658fd402b4f709f30ea2d libodb-pgsql-2.4.0.tar.bz2 +sha1 4628d5e296da01dbaf8658fd402b4f709f30ea2d libodb-pgsql-2.4.0.tar.bz2 # Locally Computed -sha256 778a4d38bd1161e1f0b368815514c3335da20c7584e3d07613526dcce53523bc libodb-pgsql-2.4.0.tar.bz2 -sha256 841105a470fc283851c63941510ffd403c726d1910b688f7df95914ab8b1b5a3 LICENSE +sha256 778a4d38bd1161e1f0b368815514c3335da20c7584e3d07613526dcce53523bc libodb-pgsql-2.4.0.tar.bz2 +sha256 841105a470fc283851c63941510ffd403c726d1910b688f7df95914ab8b1b5a3 LICENSE diff --git a/package/libodb/libodb.hash b/package/libodb/libodb.hash index cea5b9eda28..7db7f969f2c 100644 --- a/package/libodb/libodb.hash +++ b/package/libodb/libodb.hash @@ -1,6 +1,6 @@ # From https://www.codesynthesis.com/projects/libcutl/ -sha1 42bd2a8023e338e004711e755eb30bd122b844a6 libodb-2.4.0.tar.bz2 +sha1 42bd2a8023e338e004711e755eb30bd122b844a6 libodb-2.4.0.tar.bz2 # Locally Computed -sha256 66a1bb4e8bb6ef60cc79334f8028c4d4de98d87f2ff6f8123b4cfb7751ce0007 libodb-2.4.0.tar.bz2 -sha256 841105a470fc283851c63941510ffd403c726d1910b688f7df95914ab8b1b5a3 LICENSE +sha256 66a1bb4e8bb6ef60cc79334f8028c4d4de98d87f2ff6f8123b4cfb7751ce0007 libodb-2.4.0.tar.bz2 +sha256 841105a470fc283851c63941510ffd403c726d1910b688f7df95914ab8b1b5a3 LICENSE diff --git a/package/libodb/libodb.mk b/package/libodb/libodb.mk index 11ca9de866f..b25e8ac5014 100644 --- a/package/libodb/libodb.mk +++ b/package/libodb/libodb.mk @@ -12,5 +12,7 @@ LIBODB_INSTALL_STAGING = YES LIBODB_LICENSE = GPL-2.0 LIBODB_LICENSE_FILES = LICENSE LIBODB_CONF_ENV = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" +HOST_LIBODB_CONF_ENV = CXXFLAGS="$(HOST_CXXFLAGS) -std=c++11" $(eval $(autotools-package)) +$(eval $(host-autotools-package)) diff --git a/package/libolm/libolm.mk b/package/libolm/libolm.mk index 607e50702f6..6f066865550 100644 --- a/package/libolm/libolm.mk +++ b/package/libolm/libolm.mk @@ -9,6 +9,8 @@ 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 diff --git a/package/libopenaptx/libopenaptx.hash b/package/libopenaptx/libopenaptx.hash index 76b4e66c9b2..fca603d9db7 100644 --- a/package/libopenaptx/libopenaptx.hash +++ b/package/libopenaptx/libopenaptx.hash @@ -1,3 +1,3 @@ # Locally calculated: -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING -sha256 a19b3b642def6f86441b73dd4efda6e6f13d49e7e2d6e5e91cc7eb464ebb505a libopenaptx-0.2.1.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 a19b3b642def6f86441b73dd4efda6e6f13d49e7e2d6e5e91cc7eb464ebb505a libopenaptx-0.2.1.tar.gz diff --git a/package/libopenh264/libopenh264.hash b/package/libopenh264/libopenh264.hash index 712425a0248..eecb0b9625d 100644 --- a/package/libopenh264/libopenh264.hash +++ b/package/libopenh264/libopenh264.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e4e5c8ba48e64ba6ce61e8b6e2b76b2d870c74c270147649082feabb40f25905 libopenh264-2.2.0.tar.gz +sha256 453afa66dacb560bc5fd0468aabee90c483741571bca820a39a1c07f0362dc32 libopenh264-2.3.1.tar.gz sha256 dd5c1c9668512530fa5a96e4c29ac4033d70a7eeb0eed7a42fddb6dd794ebdbb LICENSE diff --git a/package/libopenh264/libopenh264.mk b/package/libopenh264/libopenh264.mk index ea41f726616..750ec41e4d6 100644 --- a/package/libopenh264/libopenh264.mk +++ b/package/libopenh264/libopenh264.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENH264_VERSION = 2.2.0 +LIBOPENH264_VERSION = 2.3.1 LIBOPENH264_SITE = $(call github,cisco,openh264,v$(LIBOPENH264_VERSION)) LIBOPENH264_LICENSE = BSD-2-Clause LIBOPENH264_LICENSE_FILES = LICENSE diff --git a/package/libopenssl/0003-Introduce-the-OPENSSL_NO_MADVISE-to-disable-call-to-.patch b/package/libopenssl/0003-Introduce-the-OPENSSL_NO_MADVISE-to-disable-call-to-.patch index c51a3cd684e..ef40b0353a3 100644 --- a/package/libopenssl/0003-Introduce-the-OPENSSL_NO_MADVISE-to-disable-call-to-.patch +++ b/package/libopenssl/0003-Introduce-the-OPENSSL_NO_MADVISE-to-disable-call-to-.patch @@ -13,7 +13,7 @@ diff --git a/crypto/mem_sec.c b/crypto/mem_sec.c index 9e0f670..32c7282 100644 --- a/crypto/mem_sec.c +++ b/crypto/mem_sec.c -@@ -485,7 +485,7 @@ static int sh_init(size_t size, int minsize) +@@ -491,7 +491,7 @@ static int sh_init(size_t size, int minsize) if (mlock(sh.arena, sh.arena_size) < 0) ret = 2; #endif diff --git a/package/libopenssl/0004-Configure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch b/package/libopenssl/0004-Configure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch index b5070ad74cc..9f34e1f5fb7 100644 --- a/package/libopenssl/0004-Configure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch +++ b/package/libopenssl/0004-Configure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch @@ -21,7 +21,7 @@ diff --git a/Configure b/Configure index 5a699836f3..f9152b1702 100755 --- a/Configure +++ b/Configure -@@ -1417,6 +1417,10 @@ my %predefined_CXX = $config{CXX} +@@ -1424,6 +1424,10 @@ my %predefined_CXX = $config{CXX} ? compiler_predefined($config{CROSS_COMPILE}.$config{CXX}) : (); diff --git a/package/libopenssl/0007-Fixup-support-for-io_pgetevents_time64-syscall.patch b/package/libopenssl/0007-Fixup-support-for-io_pgetevents_time64-syscall.patch index 4313eecd6d1..7b003e48363 100644 --- a/package/libopenssl/0007-Fixup-support-for-io_pgetevents_time64-syscall.patch +++ b/package/libopenssl/0007-Fixup-support-for-io_pgetevents_time64-syscall.patch @@ -23,7 +23,7 @@ diff --git a/engines/e_afalg.c b/engines/e_afalg.c index 9480d7c24b..4e9d67db2d 100644 --- a/engines/e_afalg.c +++ b/engines/e_afalg.c -@@ -124,27 +124,56 @@ static ossl_inline int io_read(aio_context_t ctx, long n, struct iocb **iocb) +@@ -121,27 +121,56 @@ static ossl_inline int io_read(aio_context_t ctx, long n, struct iocb **iocb) return syscall(__NR_io_submit, ctx, n, iocb); } diff --git a/package/libopenssl/Config.in b/package/libopenssl/Config.in index fcead4c11a2..7a3f56a512d 100644 --- a/package/libopenssl/Config.in +++ b/package/libopenssl/Config.in @@ -44,10 +44,6 @@ config BR2_PACKAGE_LIBOPENSSL_ENABLE_CHACHA bool "enable CHACHA" default y -config BR2_PACKAGE_LIBOPENSSL_ENABLE_RC5 - bool "enable RC5" - default y - config BR2_PACKAGE_LIBOPENSSL_ENABLE_RC2 bool "enable RC2" default y @@ -67,6 +63,7 @@ config BR2_PACKAGE_LIBOPENSSL_ENABLE_MD4 config BR2_PACKAGE_LIBOPENSSL_ENABLE_MDC2 bool "enable MDC2" default y + select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES config BR2_PACKAGE_LIBOPENSSL_ENABLE_BLAKE2 bool "enable BLAKE2" diff --git a/package/libopenssl/libopenssl.hash b/package/libopenssl/libopenssl.hash index a055cbc2703..4541087c07a 100644 --- a/package/libopenssl/libopenssl.hash +++ b/package/libopenssl/libopenssl.hash @@ -1,5 +1,5 @@ -# From https://www.openssl.org/source/openssl-1.1.1m.tar.gz.sha256 -sha256 f89199be8b23ca45fc7cb9f1d8d3ee67312318286ad030f5316aca6462db6c96 openssl-1.1.1m.tar.gz +# From https://www.openssl.org/source/openssl-1.1.1v.tar.gz.sha256 +sha256 d6697e2871e77238460402e9362d47d18382b15ef9f246aba6c7bd780d38a6b0 openssl-1.1.1v.tar.gz # License files sha256 c32913b33252e71190af2066f08115c69bc9fddadf3bf29296e20c835389841c LICENSE diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index bd8ef6141a7..fe68a20ed1e 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENSSL_VERSION = 1.1.1m +LIBOPENSSL_VERSION = 1.1.1v LIBOPENSSL_SITE = https://www.openssl.org/source LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz LIBOPENSSL_LICENSE = OpenSSL or SSLeay @@ -52,7 +52,7 @@ LIBOPENSSL_CFLAGS += -DOPENSSL_NO_ASYNC endif define HOST_LIBOPENSSL_CONFIGURE_CMDS - (cd $(@D); \ + cd $(@D); \ $(HOST_CONFIGURE_OPTS) \ ./config \ --prefix=$(HOST_DIR) \ @@ -61,15 +61,14 @@ define HOST_LIBOPENSSL_CONFIGURE_CMDS no-fuzz-libfuzzer \ no-fuzz-afl \ shared \ - zlib-dynamic \ - ) - $(SED) "s#-O[0-9sg]#$(HOST_CFLAGS)#" $(@D)/Makefile + zlib-dynamic endef define LIBOPENSSL_CONFIGURE_CMDS - (cd $(@D); \ + cd $(@D); \ $(TARGET_CONFIGURE_ARGS) \ $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(LIBOPENSSL_CFLAGS)" \ ./Configure \ $(LIBOPENSSL_TARGET_ARCH) \ --prefix=/usr \ @@ -80,12 +79,11 @@ define LIBOPENSSL_CONFIGURE_CMDS $(if $(BR2_PACKAGE_HAS_CRYPTODEV),enable-devcryptoeng) \ no-rc5 \ enable-camellia \ - enable-mdc2 \ no-tests \ no-fuzz-libfuzzer \ no-fuzz-afl \ + no-afalgeng \ $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_CHACHA),,no-chacha) \ - $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_RC5),,no-rc5) \ $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_RC2),,no-rc2) \ $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_RC4),,no-rc4) \ $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_MD2),,no-md2) \ @@ -108,11 +106,7 @@ define LIBOPENSSL_CONFIGURE_CMDS $(if $(BR2_PACKAGE_LIBOPENSSL_DYNAMIC_ENGINE),,no-dynamic-engine ) \ $(if $(BR2_PACKAGE_LIBOPENSSL_ENABLE_COMP),,no-comp) \ $(if $(BR2_STATIC_LIBS),zlib,zlib-dynamic) \ - $(if $(BR2_STATIC_LIBS),no-dso) \ - ) - $(SED) "s#-march=[-a-z0-9] ##" -e "s#-mcpu=[-a-z0-9] ##g" $(@D)/Makefile - $(SED) "s#-O[0-9sg]#$(LIBOPENSSL_CFLAGS)#" $(@D)/Makefile - $(SED) "s# build_tests##" $(@D)/Makefile + $(if $(BR2_STATIC_LIBS),no-dso) endef # libdl is not available in a static build, and this is not implied by no-dso diff --git a/package/liboping/0002-fix-utf8-support.patch b/package/liboping/0001-fix-utf8-support.patch similarity index 100% rename from package/liboping/0002-fix-utf8-support.patch rename to package/liboping/0001-fix-utf8-support.patch diff --git a/package/liboping/0001-ping_host_add-Decrease-buffer-size-to-make-GCC-s-truncation-check-happy.patch b/package/liboping/0001-ping_host_add-Decrease-buffer-size-to-make-GCC-s-truncation-check-happy.patch deleted file mode 100644 index b0aca8a7159..00000000000 --- a/package/liboping/0001-ping_host_add-Decrease-buffer-size-to-make-GCC-s-truncation-check-happy.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 18ca43507b351f339ff23062541ee8d58e813a53 Mon Sep 17 00:00:00 2001 -From: Florian Forster -Date: Sun, 29 Jul 2018 14:34:19 +0200 -Subject: [PATCH] ping_host_add: Decrease buffer size to make GCC's truncation - check happy. - -Fixes: #38 -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/octo/liboping/commit/18ca43507b351f339ff23062541ee8d58e813a53] ---- - src/liboping.c | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/src/liboping.c b/src/liboping.c -index 5253e8c..2470988 100644 ---- a/src/liboping.c -+++ b/src/liboping.c -@@ -1636,10 +1636,8 @@ int ping_host_add (pingobj_t *obj, const char *host) - } - else - { -- char errmsg[PING_ERRMSG_LEN]; -- -- snprintf (errmsg, PING_ERRMSG_LEN, "Unknown `ai_family': %i", ai_ptr->ai_family); -- errmsg[PING_ERRMSG_LEN - 1] = '\0'; -+ char errmsg[64]; -+ snprintf (errmsg, sizeof(errmsg), "Unknown `ai_family': %d", ai_ptr->ai_family); - - dprintf ("%s", errmsg); - ping_set_error (obj, "getaddrinfo", errmsg); diff --git a/package/liboping/0003-Open-raw-sockets-when-adding-hosts-not-when-doing-th.patch b/package/liboping/0002-Open-raw-sockets-when-adding-hosts-not-when-doing-th.patch similarity index 100% rename from package/liboping/0003-Open-raw-sockets-when-adding-hosts-not-when-doing-th.patch rename to package/liboping/0002-Open-raw-sockets-when-adding-hosts-not-when-doing-th.patch diff --git a/package/liboping/0003-Fix-compile-break-with-GCC-7-buffer-overflow-with-snprintf.patch b/package/liboping/0003-Fix-compile-break-with-GCC-7-buffer-overflow-with-snprintf.patch new file mode 100644 index 00000000000..546f159187d --- /dev/null +++ b/package/liboping/0003-Fix-compile-break-with-GCC-7-buffer-overflow-with-snprintf.patch @@ -0,0 +1,28 @@ +From 0ad9ee080a7cd8037c341067cc67a84e32e69fea Mon Sep 17 00:00:00 2001 +From: Maurice Smulders +Date: Thu, 30 Dec 2021 10:45:42 -0700 +Subject: [PATCH] Fix compile break with GCC 7+ - buffer overflow with snprintf + +[Retrieved from: +https://github.com/octo/liboping/pull/64/commits/0ad9ee080a7cd8037c341067cc67a84e32e69fea] +Signed-off-by: Fabrice Fontaine +--- + src/liboping.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/liboping.c b/src/liboping.c +index bf9e059..9fd8f53 100644 +--- a/src/liboping.c ++++ b/src/liboping.c +@@ -203,8 +203,11 @@ static char *sstrerror (int errnum, char *buf, size_t buflen) + static void ping_set_error (pingobj_t *obj, const char *function, + const char *message) + { ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wformat-truncation" + snprintf (obj->errmsg, sizeof (obj->errmsg), + "%s: %s", function, message); ++#pragma GCC diagnostic pop + obj->errmsg[sizeof (obj->errmsg) - 1] = 0; + } + diff --git a/package/liboping/0004-Fix-compile-error-on-GCC-7.patch b/package/liboping/0004-Fix-compile-error-on-GCC-7.patch new file mode 100644 index 00000000000..38355be40e0 --- /dev/null +++ b/package/liboping/0004-Fix-compile-error-on-GCC-7.patch @@ -0,0 +1,32 @@ +From 3d685bdb1a6c655bce6d36cfd96e084be07cd2b1 Mon Sep 17 00:00:00 2001 +From: Maurice Smulders +Date: Tue, 4 Jan 2022 12:49:36 -0700 +Subject: [PATCH] Fix compile error on GCC < 7 + +[Retrieved from: +https://github.com/octo/liboping/pull/64/commits/3d685bdb1a6c655bce6d36cfd96e084be07cd2b1] +Signed-off-by: Fabrice Fontaine +--- + src/liboping.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/liboping.c b/src/liboping.c +index 9fd8f53..1ccf609 100644 +--- a/src/liboping.c ++++ b/src/liboping.c +@@ -203,11 +203,15 @@ static char *sstrerror (int errnum, char *buf, size_t buflen) + static void ping_set_error (pingobj_t *obj, const char *function, + const char *message) + { ++#if __GNUC__ >= 7 + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wformat-truncation" ++#endif + snprintf (obj->errmsg, sizeof (obj->errmsg), + "%s: %s", function, message); ++#if __GNUC__ >= 7 + #pragma GCC diagnostic pop ++#endif + obj->errmsg[sizeof (obj->errmsg) - 1] = 0; + } + diff --git a/package/liboping/0005-src-oping.c-always-use-s-style-format-for-printf-sty.patch b/package/liboping/0005-src-oping.c-always-use-s-style-format-for-printf-sty.patch new file mode 100644 index 00000000000..3b68feea3db --- /dev/null +++ b/package/liboping/0005-src-oping.c-always-use-s-style-format-for-printf-sty.patch @@ -0,0 +1,59 @@ +From 670834fd8fbd2533ea25ca83065800e924116579 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Mon, 15 Nov 2021 08:05:43 +0000 +Subject: [PATCH] src/oping.c: always use "%s"-style format for + printf()-style functions + +`ncuses-6.3` added printf-style function attributes and now makes +it easier to catch cases when user input is used in palce of format +string when built with CFLAGS=-Werror=format-security: + + oping.c:1265:41: error: format not a string literal and no format arguments [-Werror=format-security] + 1265 | hist_symbols_utf8[index]); + | ^~~~~~~~~~~~~~~~~ + +Let's wrap all the missing places with "%s" format. + +Downloaded from upstream PR https://github.com/octo/liboping/pull/61 + +Signed-off-by: Bernd Kuhls +[Bernd: rebased for liboping version 1.10.0] +--- + src/oping.c | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/src/oping.c b/src/oping.c +index c087c80..af4a0cb 100644 +--- a/src/oping.c ++++ b/src/oping.c +@@ -1156,7 +1156,7 @@ static int update_graph_prettyping (ping_context_t *ctx, /* {{{ */ + wattron (ctx->window, COLOR_PAIR(color)); + + if (has_utf8()) +- mvwprintw (ctx->window, /* y = */ 3, /* x = */ x + 2, symbol); ++ mvwprintw (ctx->window, /* y = */ 3, /* x = */ x + 2, "%s", symbol); + else + mvwaddch (ctx->window, /* y = */ 3, /* x = */ x + 2, symbolc); + +@@ -1262,7 +1262,7 @@ static int update_graph_histogram (ping_context_t *ctx) /* {{{ */ + mvwaddch (ctx->window, /* y = */ 3, /* x = */ x + 2, ' '); + else if (has_utf8 ()) + mvwprintw (ctx->window, /* y = */ 3, /* x = */ x + 2, +- hist_symbols_utf8[index]); ++ "%s", hist_symbols_utf8[index]); + else + mvwaddch (ctx->window, /* y = */ 3, /* x = */ x + 2, + hist_symbols_acs[index] | A_ALTCHARSET); +@@ -1639,8 +1639,7 @@ static void update_host_hook (pingobj_iter_t *iter, /* {{{ */ + + HOST_PRINTF ("%zu bytes from %s (%s): icmp_seq=%u ttl=%i ", + data_len, context->host, context->addr, +- sequence, recv_ttl, +- format_qos (recv_qos, recv_qos_str, sizeof (recv_qos_str))); ++ sequence, recv_ttl); + if ((recv_qos != 0) || (opt_send_qos != 0)) + { + HOST_PRINTF ("qos=%s ", +-- +2.34.1 + diff --git a/package/liboping/liboping.hash b/package/liboping/liboping.hash index 926b234f05f..7042ed9cf75 100644 --- a/package/liboping/liboping.hash +++ b/package/liboping/liboping.hash @@ -1,5 +1,5 @@ # From http://noping.cc/#download -sha256 eb38aa93f93e8ab282d97e2582fbaea88b3f889a08cbc9dbf20059c3779d5cd8 liboping-1.10.0.tar.bz2 +sha256 eb38aa93f93e8ab282d97e2582fbaea88b3f889a08cbc9dbf20059c3779d5cd8 liboping-1.10.0.tar.bz2 # Hash for license file: -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libosip2/libosip2.hash b/package/libosip2/libosip2.hash index 071ad7e61ac..a563f0c4cd4 100644 --- a/package/libosip2/libosip2.hash +++ b/package/libosip2/libosip2.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 f4725916c22cf514969efb15c3c207233d64739383f7d42956038b78f6cae8c8 libosip2-5.3.0.tar.gz +sha256 fe82fe841608266ac15a5c1118216da00c554d5006e2875a8ac3752b1e6adc79 libosip2-5.3.1.tar.gz # Hash for license file: sha256 8d9e95ed0e48df46dc758eb0d86df611f771eab4eed94bebb77dca87f1c897de COPYING diff --git a/package/libosip2/libosip2.mk b/package/libosip2/libosip2.mk index 2f9b7a9242a..618d98a85c5 100644 --- a/package/libosip2/libosip2.mk +++ b/package/libosip2/libosip2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOSIP2_VERSION = 5.3.0 +LIBOSIP2_VERSION = 5.3.1 LIBOSIP2_SITE = $(BR2_GNU_MIRROR)/osip LIBOSIP2_INSTALL_STAGING = YES LIBOSIP2_LICENSE = LGPL-2.1+ diff --git a/package/libosmium/Config.in b/package/libosmium/Config.in index 3a4c64e9d22..825e2b7e338 100644 --- a/package/libosmium/Config.in +++ b/package/libosmium/Config.in @@ -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 >= 4.7" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libosmium/libosmium.hash b/package/libosmium/libosmium.hash index ccfd3b09b01..b055aa21eaa 100644 --- a/package/libosmium/libosmium.hash +++ b/package/libosmium/libosmium.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ff85d55ca83d77fc41f6b7ae77f3d8d4337d299cbb4cc60c00e1f9d90d94e71b libosmium-2.17.3.tar.gz +sha256 6911a8ca8e81d49205357177982df908af11376919f93b814cccf02f1d4d63e3 libosmium-2.19.0.tar.gz sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 LICENSE diff --git a/package/libosmium/libosmium.mk b/package/libosmium/libosmium.mk index 6510af4e775..2725130e729 100644 --- a/package/libosmium/libosmium.mk +++ b/package/libosmium/libosmium.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOSMIUM_VERSION = 2.17.3 +LIBOSMIUM_VERSION = 2.19.0 LIBOSMIUM_SITE = $(call github,osmcode,libosmium,v$(LIBOSMIUM_VERSION)) LIBOSMIUM_LICENSE = BSL-1.0 LIBOSMIUM_LICENSE_FILES = LICENSE diff --git a/package/libostree/Config.in b/package/libostree/Config.in index 14ae4da4c8e..696e8e1d6c5 100644 --- a/package/libostree/Config.in +++ b/package/libostree/Config.in @@ -7,6 +7,7 @@ config BR2_PACKAGE_LIBOSTREE # doesn't build with musl due to lack of TEMP_FAILURE_RETRY() depends on !BR2_TOOLCHAIN_USES_MUSL select BR2_PACKAGE_E2FSPROGS + select BR2_PACKAGE_LIBARCHIVE if BR2_s390x select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBGPG_ERROR select BR2_PACKAGE_LIBGPGME diff --git a/package/libostree/libostree.hash b/package/libostree/libostree.hash index 3a063405757..63dfe98d80f 100644 --- a/package/libostree/libostree.hash +++ b/package/libostree/libostree.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 43a00e7856842b8a34f6616fc2ce1ce238ef43210cca41f70e6b4b0d2a9fcad5 libostree-2022.1.tar.xz +sha256 dd792b167693a1971c9f6e3168013d906ac035100ff6c719a3b322eb44b96f55 libostree-2023.1.tar.xz sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libostree/libostree.mk b/package/libostree/libostree.mk index 9cbf2848c96..4b17fcf391d 100644 --- a/package/libostree/libostree.mk +++ b/package/libostree/libostree.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOSTREE_VERSION = 2022.1 +LIBOSTREE_VERSION = 2023.1 LIBOSTREE_SOURCE = libostree-$(LIBOSTREE_VERSION).tar.xz LIBOSTREE_SITE = https://github.com/ostreedev/ostree/releases/download/v$(LIBOSTREE_VERSION) diff --git a/package/libp11/0001-src-p11_attr.c-fix-build-with-gcc-4.8.patch b/package/libp11/0001-src-p11_attr.c-fix-build-with-gcc-4.8.patch new file mode 100644 index 00000000000..60fc16d9d08 --- /dev/null +++ b/package/libp11/0001-src-p11_attr.c-fix-build-with-gcc-4.8.patch @@ -0,0 +1,42 @@ +From ba44b87318ed89e489fa3ce0a5d66002afa2bd6c Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 12 Aug 2022 11:54:54 +0200 +Subject: [PATCH] src/p11_attr.c: fix build with gcc 4.8 + +Fix the following build failure with gcc 4.8 raised since version 0.4.12 +and +https://github.com/OpenSC/libp11/commit/639a4b6463278c0119a2ec60b261da3e5330fb33: + +p11_attr.c: In function 'pkcs11_zap_attrs': +p11_attr.c:167:2: error: 'for' loop initial declarations are only allowed in C99 mode + for (unsigned i = 0; i < 32; i++) { + ^ +p11_attr.c:167:2: note: use option -std=c99 or -std=gnu99 to compile your code + +Fixes: + - http://autobuild.buildroot.org/results/4391020fb5738cc8c26dc53783a6228bbf76473a + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/OpenSC/libp11/commit/ba44b87318ed89e489fa3ce0a5d66002afa2bd6c] +--- + src/p11_attr.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/p11_attr.c b/src/p11_attr.c +index d49456ff..d425241a 100644 +--- a/src/p11_attr.c ++++ b/src/p11_attr.c +@@ -162,9 +162,11 @@ void pkcs11_addattr_obj(PKCS11_TEMPLATE *tmpl, int type, pkcs11_i2d_fn enc, void + + void pkcs11_zap_attrs(PKCS11_TEMPLATE *tmpl) + { ++ unsigned int i; ++ + if (!tmpl->allocated) + return; +- for (unsigned i = 0; i < 32; i++) { ++ for (i = 0; i < 32; i++) { + if (tmpl->allocated & (1<attrs[i].pValue); + } diff --git a/package/libp11/Config.in b/package/libp11/Config.in index 4d7ff568957..ef1e5b47039 100644 --- a/package/libp11/Config.in +++ b/package/libp11/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_LIBP11 bool "libp11" depends on !BR2_STATIC_LIBS # dlopen + depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_OPENSSL help OpenSSL engine for PKCS#11 modules. Part of the OpenSC @@ -8,5 +9,5 @@ config BR2_PACKAGE_LIBP11 https://github.com/OpenSC/OpenSC/wiki -comment "libp11 needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS +comment "libp11 needs a toolchain w/ dynamic library, threads" + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libp11/libp11.hash b/package/libp11/libp11.hash index 52d73d42068..0e42bdd4cfa 100644 --- a/package/libp11/libp11.hash +++ b/package/libp11/libp11.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 57d47a12a76fd92664ae30032cf969284ebac1dfc25bf824999d74b016d51366 libp11-0.4.11.tar.gz +sha256 1e1a2533b3fcc45fde4da64c9c00261b1047f14c3f911377ebd1b147b3321cfd libp11-0.4.12.tar.gz sha256 d80c9d084ebfb50ea1ed91bfbc2410d6ce542097a32c43b00781b83adcb8c77f COPYING diff --git a/package/libp11/libp11.mk b/package/libp11/libp11.mk index 45a718ee999..7718573ace7 100644 --- a/package/libp11/libp11.mk +++ b/package/libp11/libp11.mk @@ -4,17 +4,23 @@ # ################################################################################ -LIBP11_VERSION = 0.4.11 +LIBP11_VERSION = 0.4.12 LIBP11_SITE = https://github.com/OpenSC/libp11/releases/download/libp11-$(LIBP11_VERSION) LIBP11_DEPENDENCIES = openssl host-pkgconf LIBP11_INSTALL_STAGING = YES LIBP11_LICENSE = LGPL-2.1+ LIBP11_LICENSE_FILES = COPYING +ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) +LIBP11_ENGINESDIR = enginesdir +else ifeq ($(BR2_PACKAGE_LIBRESSL),y) +LIBP11_ENGINESDIR = libdir +endif + # pkg-config returns a libcrypto enginesdir prefixed with the sysroot, # so let's rip it out. LIBP11_CONF_OPTS = \ - --with-enginesdir=`$(PKG_CONFIG_HOST_BINARY) --variable enginesdir libcrypto | xargs readlink -f | sed 's%^$(STAGING_DIR)%%'` + --with-enginesdir=`$(PKG_CONFIG_HOST_BINARY) --variable $(LIBP11_ENGINESDIR) libcrypto | xargs readlink -f | sed 's%^$(STAGING_DIR)%%'` ifeq ($(BR2_PACKAGE_P11_KIT),y) LIBP11_CONF_OPTS += --with-pkcs11-module=/usr/lib/p11-kit-proxy.so diff --git a/package/libpagekite/libpagekite.hash b/package/libpagekite/libpagekite.hash index 8716b991cad..2c2e5c9b593 100644 --- a/package/libpagekite/libpagekite.hash +++ b/package/libpagekite/libpagekite.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 c812815aae6f100212b7d6f662370a0634151fabb59f028126a59c4083a6d26d libpagekite-0.91.190530.tar.gz +sha256 db835d49becebc00d462f2f47aefc1f1d3a4e0e096487cb3b4248134185df715 libpagekite-0.91.201110.tar.gz # License files, locally calculated sha256 ba443b9c9d4273d06aae3e147e9ad1ec199cc9c23455f486a039536d47f57eed doc/COPYING.md diff --git a/package/libpagekite/libpagekite.mk b/package/libpagekite/libpagekite.mk index 60b62f5cfd8..bb235ba1f3e 100644 --- a/package/libpagekite/libpagekite.mk +++ b/package/libpagekite/libpagekite.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPAGEKITE_VERSION = 0.91.190530 +LIBPAGEKITE_VERSION = 0.91.201110 LIBPAGEKITE_SITE = $(call github,pagekite,libpagekite,v$(LIBPAGEKITE_VERSION)) # pkrelay is AGPL-3.0+ but is not built diff --git a/package/libpam-radius-auth/libpam-radius-auth.hash b/package/libpam-radius-auth/libpam-radius-auth.hash index 3e8dc025583..63f3f1e45ec 100644 --- a/package/libpam-radius-auth/libpam-radius-auth.hash +++ b/package/libpam-radius-auth/libpam-radius-auth.hash @@ -1,5 +1,5 @@ # Locally calculated after checking PGP signature -sha256 742d79fc39824726c098e746bd3dc3484f983f5ee082c621c1e848b2c3725305 pam_radius-1.4.0.tar.gz +sha256 798dc358e7a143163e103bd38c4101645b2e93d82aa0ec63d32c0cb929d9c65c libpam-radius-auth-2.0.0.tar.gz # Hash for license file: -sha256 67f82e045cf7acfef853ea0f426575a8359161a0a325e19f02b529a87c4b6c34 LICENSE +sha256 67f82e045cf7acfef853ea0f426575a8359161a0a325e19f02b529a87c4b6c34 LICENSE diff --git a/package/libpam-radius-auth/libpam-radius-auth.mk b/package/libpam-radius-auth/libpam-radius-auth.mk index 184e48d3b78..9519aad750a 100644 --- a/package/libpam-radius-auth/libpam-radius-auth.mk +++ b/package/libpam-radius-auth/libpam-radius-auth.mk @@ -4,9 +4,8 @@ # ################################################################################ -LIBPAM_RADIUS_AUTH_VERSION = 1.4.0 -LIBPAM_RADIUS_AUTH_SITE = ftp://ftp.freeradius.org/pub/radius -LIBPAM_RADIUS_AUTH_SOURCE = pam_radius-$(LIBPAM_RADIUS_AUTH_VERSION).tar.gz +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_DEPENDENCIES = linux-pam LIBPAM_RADIUS_AUTH_INSTALL_STAGING = YES LIBPAM_RADIUS_AUTH_LICENSE = GPL-2.0+ diff --git a/package/libpcap/Config.in b/package/libpcap/Config.in index a5f64bdc81d..7ffac64c461 100644 --- a/package/libpcap/Config.in +++ b/package/libpcap/Config.in @@ -5,4 +5,4 @@ config BR2_PACKAGE_LIBPCAP A system-independent library for user-level network packet capture. - http://www.tcpdump.org/ + https://www.tcpdump.org/ diff --git a/package/libpcap/libpcap.hash b/package/libpcap/libpcap.hash index 84c8e405df5..270fd8869da 100644 --- a/package/libpcap/libpcap.hash +++ b/package/libpcap/libpcap.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://www.tcpdump.org/release/libpcap-1.10.1.tar.gz.sig -sha256 ed285f4accaf05344f90975757b3dbfe772ba41d1c401c2648b7fa45b711bdd4 libpcap-1.10.1.tar.gz +# https://www.tcpdump.org/release/libpcap-1.10.3.tar.gz.sig +sha256 2a8885c403516cf7b0933ed4b14d6caa30e02052489ebd414dc75ac52e7559e6 libpcap-1.10.3.tar.gz # Hash for license file: sha256 8a54594d257e14a5260ac770f1633516cb51e3fc28c40136ce2697014eda7afd LICENSE diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk index 1e02ec56e04..d4292ae9a3f 100644 --- a/package/libpcap/libpcap.mk +++ b/package/libpcap/libpcap.mk @@ -4,13 +4,14 @@ # ################################################################################ -LIBPCAP_VERSION = 1.10.1 +LIBPCAP_VERSION = 1.10.3 LIBPCAP_SITE = https://www.tcpdump.org/release LIBPCAP_LICENSE = BSD-3-Clause LIBPCAP_LICENSE_FILES = LICENSE LIBPCAP_CPE_ID_VENDOR = tcpdump LIBPCAP_INSTALL_STAGING = YES LIBPCAP_DEPENDENCIES = host-flex host-bison host-pkgconf +HOST_LIBPCAP_DEPENDENCIES = host-flex host-bison host-pkgconf # ac_cv_prog_cc_c99 is required for BR2_USE_WCHAR=n because the C99 test # provided by autoconf relies on wchar_t. @@ -23,6 +24,13 @@ LIBPCAP_CONF_OPTS = --disable-yydebug --with-pcap=linux --without-dag \ --without-dpdk # Disable dbus to break recursive dependencies LIBPCAP_CONF_OPTS += --disable-dbus +HOST_LIBPCAP_CONF_OPTS = \ + --disable-bluetooth \ + --disable-dbus \ + --disable-yydebug \ + --with-pcap=linux \ + --without-dag \ + --without-libnl LIBPCAP_CONFIG_SCRIPTS = pcap-config # Omit -rpath from pcap-config output @@ -50,3 +58,4 @@ LIBPCAP_CFLAGS += -fPIC endif $(eval $(autotools-package)) +$(eval $(host-autotools-package)) diff --git a/package/libpciaccess/0001-pciaccess.pc.in-add-Libs.Private.patch b/package/libpciaccess/0001-pciaccess.pc.in-add-Libs.Private.patch deleted file mode 100644 index e520dd03d82..00000000000 --- a/package/libpciaccess/0001-pciaccess.pc.in-add-Libs.Private.patch +++ /dev/null @@ -1,28 +0,0 @@ -From e1f9fc0a11559c1200005c4bfe34cd217ec117b4 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 25 Oct 2019 19:03:32 +0200 -Subject: [PATCH] pciaccess.pc.in: add Libs.Private - -Add Libs.Private in pciaccess.pc.in so applications that wants to link -statically with pciaccess will know that they have to link with its -dependencies such as -lz - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.freedesktop.org/xorg/lib/libpciaccess/merge_requests/10] ---- - pciaccess.pc.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/pciaccess.pc.in b/pciaccess.pc.in -index 706c5f7..c2da3d9 100644 ---- a/pciaccess.pc.in -+++ b/pciaccess.pc.in -@@ -8,3 +8,4 @@ Description: Library providing generic access to the PCI bus and devices. - Version: @PACKAGE_VERSION@ - Cflags: -I${includedir} - Libs: -L${libdir} -lpciaccess -+Libs.Private: @PCIACCESS_LIBS@ --- -2.23.0 - diff --git a/package/libpciaccess/libpciaccess.hash b/package/libpciaccess/libpciaccess.hash index 23823bb07f2..27ec59a4523 100644 --- a/package/libpciaccess/libpciaccess.hash +++ b/package/libpciaccess/libpciaccess.hash @@ -1,7 +1,4 @@ -# From https://lists.x.org/archives/xorg-announce/2019-July/003014.html -md5 b34e2cbdd6aa8f9cc3fa613fd401a6d6 libpciaccess-0.16.tar.bz2 -sha1 ffaa13f2df5f822da1089b55223b217c142ef919 libpciaccess-0.16.tar.bz2 -sha256 214c9d0d884fdd7375ec8da8dcb91a8d3169f263294c9a90c575bf1938b9f489 libpciaccess-0.16.tar.bz2 -sha512 2f250048a270dfc0823d4bdd613aa272c58a80eaafd922850f56c4b6f7a45a263ed4cf521b52b49f04484ea44ebefb7407d079aa058318a5751ffb181e38fed1 libpciaccess-0.16.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003226.html +sha512 8484605c66ef18c8d8a3e029a6d33e26fcaa450c1263790d89ac8b0a160ffb2dfceaa6140ac9ad7d8087283ecbec8ac801f757e44890d547c3cbecd2c922ca47 libpciaccess-0.17.tar.xz # Hash for license file: -sha256 47012fd746980d1712ac4f3841ab6164bda1d2b84880760e45dbe1e1dc07f608 COPYING +sha256 47012fd746980d1712ac4f3841ab6164bda1d2b84880760e45dbe1e1dc07f608 COPYING diff --git a/package/libpciaccess/libpciaccess.mk b/package/libpciaccess/libpciaccess.mk index d9a3a4e481c..525a3bcd027 100644 --- a/package/libpciaccess/libpciaccess.mk +++ b/package/libpciaccess/libpciaccess.mk @@ -4,12 +4,13 @@ # ################################################################################ -LIBPCIACCESS_VERSION = 0.16 -LIBPCIACCESS_SOURCE = libpciaccess-$(LIBPCIACCESS_VERSION).tar.bz2 +LIBPCIACCESS_VERSION = 0.17 +LIBPCIACCESS_SOURCE = libpciaccess-$(LIBPCIACCESS_VERSION).tar.xz LIBPCIACCESS_SITE = http://xorg.freedesktop.org/releases/individual/lib LIBPCIACCESS_LICENSE = MIT LIBPCIACCESS_LICENSE_FILES = COPYING LIBPCIACCESS_INSTALL_STAGING = YES +LIBPCIACCESS_DEPENDENCIES = host-pkgconf ifeq ($(BR2_PACKAGE_ZLIB),y) LIBPCIACCESS_CONF_OPTS += --with-zlib diff --git a/package/libpeas/libpeas.hash b/package/libpeas/libpeas.hash index 2b030c01c57..f69fd2945f8 100644 --- a/package/libpeas/libpeas.hash +++ b/package/libpeas/libpeas.hash @@ -1,4 +1,4 @@ -# From https://ftp.gnome.org/pub/GNOME/sources/libpeas/1.30/libpeas-1.30.0.sha256sum -sha256 0bf5562e9bfc0382a9dcb81f64340787542568762a3a367d9d90f6185898b9a3 libpeas-1.30.0.tar.xz +# From https://download.gnome.org/sources/libpeas/1.32/libpeas-1.32.0.sha256sum +sha256 d625520fa02e8977029b246ae439bc218968965f1e82d612208b713f1dcc3d0e libpeas-1.32.0.tar.xz # Locally calculated sha256 592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c COPYING diff --git a/package/libpeas/libpeas.mk b/package/libpeas/libpeas.mk index 097cc860eb3..3d2e79452c8 100644 --- a/package/libpeas/libpeas.mk +++ b/package/libpeas/libpeas.mk @@ -4,10 +4,10 @@ # ################################################################################ -LIBPEAS_VERSION_MAJOR = 1.30 +LIBPEAS_VERSION_MAJOR = 1.32 LIBPEAS_VERSION = $(LIBPEAS_VERSION_MAJOR).0 LIBPEAS_SOURCE = libpeas-$(LIBPEAS_VERSION).tar.xz -LIBPEAS_SITE = http://ftp.gnome.org/pub/gnome/sources/libpeas/$(LIBPEAS_VERSION_MAJOR) +LIBPEAS_SITE = https://download.gnome.org/sources/libpeas/$(LIBPEAS_VERSION_MAJOR) LIBPEAS_LICENSE = LGPL-2.1+ LIBPEAS_LICENSE_FILES = COPYING LIBPEAS_CPE_ID_VENDOR = gnome diff --git a/package/libpfm4/libpfm4.hash b/package/libpfm4/libpfm4.hash index bdc7806a7c2..42740adb1e8 100644 --- a/package/libpfm4/libpfm4.hash +++ b/package/libpfm4/libpfm4.hash @@ -1,6 +1,6 @@ # From http://sourceforge.net/projects/perfmon2/files/libpfm4/: -sha1 112bced9a67d565ff0ce6c2bb90452516d1183e5 libpfm-4.11.0.tar.gz -md5 4811c1d99b95752b4ba53b89a9389ec3 libpfm-4.11.0.tar.gz +sha1 4c61cfb489426d9fff15428cb8536ba0e391c8ac libpfm-4.12.0.tar.gz +md5 9e4f9b89d23171eb9314a948a51b4284 libpfm-4.12.0.tar.gz # Locally calculated -sha256 5da5f8872bde14b3634c9688d980f68bda28b510268723cc12973eedbab9fecc libpfm-4.11.0.tar.gz +sha256 4b0c1f53f39a61525b69bebf532c68040c1b984d7544a8ae0844b13cd91e1ee4 libpfm-4.12.0.tar.gz sha256 beef323d68fc5db9c67b20e8e9de7ccde371d20cdbcdd686804055b18b926d90 COPYING diff --git a/package/libpfm4/libpfm4.mk b/package/libpfm4/libpfm4.mk index 2144766d96e..7165d78cd91 100644 --- a/package/libpfm4/libpfm4.mk +++ b/package/libpfm4/libpfm4.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPFM4_VERSION = 4.11.0 +LIBPFM4_VERSION = 4.12.0 LIBPFM4_SOURCE = libpfm-$(LIBPFM4_VERSION).tar.gz LIBPFM4_SITE = http://downloads.sourceforge.net/project/perfmon2/libpfm4 LIBPFM4_LICENSE = libpfm4 license diff --git a/package/libpjsip/Config.in b/package/libpjsip/Config.in index 727d2ec3d06..980fada3d5f 100644 --- a/package/libpjsip/Config.in +++ b/package/libpjsip/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_LIBPJSIP bool "libpjsip" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_LIBSRTP help PJSIP is a free and open source multimedia communication library written in C language implementing standard based diff --git a/package/libpjsip/libpjsip.hash b/package/libpjsip/libpjsip.hash index 74331ab6fb4..2edd97bed4c 100644 --- a/package/libpjsip/libpjsip.hash +++ b/package/libpjsip/libpjsip.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b3b94d9be4aba8f6d2d1cb164603e81b0a6ee17352f9e2ba5b58e325e610ca5a pjproject-2.12.tar.gz +sha256 32a5ab5bfbb9752cb6a46627e4c410e61939c8dbbd833ac858473cfbd9fb9d7d pjproject-2.13.1.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk index 32cfa8c53ce..f97d547fd7b 100644 --- a/package/libpjsip/libpjsip.mk +++ b/package/libpjsip/libpjsip.mk @@ -4,12 +4,10 @@ # ################################################################################ -LIBPJSIP_VERSION = 2.12 +LIBPJSIP_VERSION = 2.13.1 LIBPJSIP_SOURCE = pjproject-$(LIBPJSIP_VERSION).tar.gz LIBPJSIP_SITE = $(call github,pjsip,pjproject,$(LIBPJSIP_VERSION)) -# https://github.com/pjsip/pjproject/archive/2.12.tar.gz -LIBPJSIP_DEPENDENCIES = libsrtp LIBPJSIP_LICENSE = GPL-2.0+ LIBPJSIP_LICENSE_FILES = COPYING LIBPJSIP_CPE_ID_VENDOR = teluu @@ -38,8 +36,7 @@ LIBPJSIP_CONF_OPTS = \ --disable-l16-codec \ --disable-g722-codec \ --disable-ipp \ - --disable-silk \ - --with-external-srtp + --disable-silk # Note: aconfigure.ac is broken: --enable-epoll or --disable-epoll will # both enable it. But that's OK, epoll is better than the alternative, @@ -101,6 +98,22 @@ else LIBPJSIP_CONF_OPTS += --disable-libsamplerate endif +ifeq ($(BR2_PACKAGE_LIBSRTP),y) +LIBPJSIP_DEPENDENCIES += libsrtp +LIBPJSIP_CONF_OPTS += \ + --enable-libsrtp \ + --with-external-srtp +else +LIBPJSIP_CONF_OPTS += --disable-libsrtp +endif + +ifeq ($(BR2_PACKAGE_LIBUPNP),y) +LIBPJSIP_DEPENDENCIES += libupnp +LIBPJSIP_CONF_OPTS += --with-upnp=$(STAGING_DIR)/usr +else +LIBPJSIP_CONF_OPTS += --disable-upnp +endif + ifeq ($(BR2_PACKAGE_LIBV4L),y) # --enable-v4l2 is broken (check for libv4l2 will be omitted) LIBPJSIP_DEPENDENCIES += libv4l @@ -159,6 +172,9 @@ endif ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) LIBPJSIP_DEPENDENCIES += util-linux +LIBPJSIP_CONF_OPTS += --enable-libuuid +else +LIBPJSIP_CONF_OPTS += --disable-libuuid endif # disable build of test binaries diff --git a/package/libpng/0001-Disable-pngfix-and-png-fix-itxt.patch b/package/libpng/0001-Disable-pngfix-and-png-fix-itxt.patch index d232e4d62fd..d16bdb2b11f 100644 --- a/package/libpng/0001-Disable-pngfix-and-png-fix-itxt.patch +++ b/package/libpng/0001-Disable-pngfix-and-png-fix-itxt.patch @@ -40,8 +40,8 @@ index a66f6aa..4e67782 100644 -bin_PROGRAMS = pngfix$(EXEEXT) png-fix-itxt$(EXEEXT) +bin_PROGRAMS = @PNG_ARM_NEON_TRUE@am__append_2 = arm/arm_init.c\ - @PNG_ARM_NEON_TRUE@ arm/filter_neon.S arm/filter_neon_intrinsics.c - + @PNG_ARM_NEON_TRUE@ arm/filter_neon.S arm/filter_neon_intrinsics.c \ + @PNG_ARM_NEON_TRUE@ arm/palette_neon_intrinsics.c -- 2.7.3 diff --git a/package/libpng/libpng.hash b/package/libpng/libpng.hash index e86b8c65cee..c1f65c93af0 100644 --- a/package/libpng/libpng.hash +++ b/package/libpng/libpng.hash @@ -1,6 +1,6 @@ -# From https://sourceforge.net/projects/libpng/files/libpng16/1.6.37/ -md5 015e8e15db1eecde5f2eb9eb5b6e59e9 libpng-1.6.37.tar.xz -sha1 3ab93fabbf4c27e1c4724371df408d9a1bd3f656 libpng-1.6.37.tar.xz +# From https://sourceforge.net/projects/libpng/files/libpng16/1.6.39/ +md5 aa1ae92e172417039bda072b702f6326 libpng-1.6.39.tar.xz +sha1 3f2386d61eccae211ec4f57899e4ac2ca60d390b libpng-1.6.39.tar.xz # Locally computed: -sha256 505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca libpng-1.6.37.tar.xz -sha256 bf5e22b9dce8464064ae17a48ea1133c3369ac9e1d80ef9e320e5219aa14ea9b LICENSE +sha256 1f4696ce70b4ee5f85f1e1623dc1229b210029fa4b7aee573df3e2ba7b036937 libpng-1.6.39.tar.xz +sha256 dfe5a536b0e5a531f844fb9c101a3089aca60772a503893b8e15f9457e369960 LICENSE diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk index e4e629bbb51..a18c36fe780 100644 --- a/package/libpng/libpng.mk +++ b/package/libpng/libpng.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPNG_VERSION = 1.6.37 +LIBPNG_VERSION = 1.6.39 LIBPNG_SERIES = 16 LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.xz LIBPNG_SITE = http://downloads.sourceforge.net/project/libpng/libpng$(LIBPNG_SERIES)/$(LIBPNG_VERSION) diff --git a/package/libpqxx/libpqxx.hash b/package/libpqxx/libpqxx.hash index 8e3164937f4..167b5edc9d6 100644 --- a/package/libpqxx/libpqxx.hash +++ b/package/libpqxx/libpqxx.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 86921fdb0fe54495a79d5af2c96f2c771098c31e9b352d0834230fd2799ad362 libpqxx-6.4.5.tar.gz -sha256 36c48c1ca1b0a68639d919196b5d92c971858ad8e24da24385ba1c65cc5eac38 COPYING +sha256 86921fdb0fe54495a79d5af2c96f2c771098c31e9b352d0834230fd2799ad362 libpqxx-6.4.5.tar.gz +sha256 36c48c1ca1b0a68639d919196b5d92c971858ad8e24da24385ba1c65cc5eac38 COPYING diff --git a/package/libpri/libpri.hash b/package/libpri/libpri.hash index 47c4a003076..77985df96ae 100644 --- a/package/libpri/libpri.hash +++ b/package/libpri/libpri.hash @@ -1,6 +1,6 @@ # sha1 and sha256 from http://downloads.asterisk.org/pub/telephony/libpri/releases/ -sha1 63536f3300fb007dfd5fe8064406992ca938bd9a libpri-1.5.0.tar.gz -sha256 ee224bc4aa65c54546bd09675c3f0b71817ce9e277332bce86989d8dcd556a24 libpri-1.5.0.tar.gz +sha1 8440007477ebf131020afb00f57672b108b4db2c libpri-1.6.0.tar.gz +sha256 7225ea7ec334a115f9dc08e71f55589c38cb4e00b13964cd2f08cc4e6123e3f6 libpri-1.6.0.tar.gz # License files, locally calculated sha256 fa5fc1d1eec39532ea517518eeefd7b6e3c14341a55e5880a0e2a49eee47a5b7 LICENSE diff --git a/package/libpri/libpri.mk b/package/libpri/libpri.mk index e1fa2abcf5b..48a10192101 100644 --- a/package/libpri/libpri.mk +++ b/package/libpri/libpri.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPRI_VERSION = 1.5.0 +LIBPRI_VERSION = 1.6.0 LIBPRI_SITE = http://downloads.asterisk.org/pub/telephony/libpri/releases LIBPRI_LICENSE = GPL-2.0 with OpenH323 exception @@ -17,6 +17,7 @@ LIBPRI_INSTALL_STAGING = YES # So we need to explicitly build only what we can. ifneq ($(BR2_SHARED_LIBS),y) LIBPRI_LIBS = libpri.a +LIBPRI_UTILS += pritest rosetest testprilib define LIBPRI_INSTALL_A $(INSTALL) -D -m 0644 $(@D)/libpri.a $(1)/usr/lib/libpri.a endef @@ -24,14 +25,13 @@ endif ifneq ($(BR2_STATIC_LIBS),y) LIBPRI_LIBS += libpri.so.1.4 +LIBPRI_UTILS += pridump define LIBPRI_INSTALL_SO $(INSTALL) -D -m 0644 $(@D)/libpri.so.1.4 $(1)/usr/lib/libpri.so.1.4 ln -sf libpri.so.1.4 $(1)/usr/lib/libpri.so endef endif -LIBPRI_UTILS = pridump pritest rosetest testprilib - define LIBPRI_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE1) $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS) -fPIC" -C $(@D) \ diff --git a/package/libpsl/Config.in b/package/libpsl/Config.in index a4cbce6b436..7b02d961c85 100644 --- a/package/libpsl/Config.in +++ b/package/libpsl/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_LIBPSL bool "libpsl" depends on BR2_USE_WCHAR # libunistring, icu + select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_LIBIDN2 if !BR2_PACKAGE_ICU && !BR2_PACKAGE_LIBIDN select BR2_PACKAGE_LIBUNISTRING if !BR2_PACKAGE_ICU help diff --git a/package/libpsl/libpsl.hash b/package/libpsl/libpsl.hash index 552935e9ecf..a35a609ff2f 100644 --- a/package/libpsl/libpsl.hash +++ b/package/libpsl/libpsl.hash @@ -1,6 +1,6 @@ # Locally generated -sha256 ac6ce1e1fbd4d0254c4ddb9d37f1fa99dec83619c1253328155206b896210d4c libpsl-0.21.1.tar.gz +sha256 e35991b6e17001afa2c0ca3b10c357650602b92596209b7492802f3768a6285f libpsl-0.21.2.tar.gz # Hashes for license files: -sha256 7903413e7aa0bbcb77aa19150a3f1034edc0a760cff174f9a53efe4de6f056a4 COPYING +sha256 776cd11d54f0ea3e5efdd25ff1a0d952a1744215bb5858ea7aeb91808e70c9f7 COPYING sha256 1d7f52747a9169751cdf2641a8299c0098e9ecdf9429296ffd55bdb14c9ed5b3 src/LICENSE.chromium diff --git a/package/libpsl/libpsl.mk b/package/libpsl/libpsl.mk index 5dc03a7c247..ef3c524b4f7 100644 --- a/package/libpsl/libpsl.mk +++ b/package/libpsl/libpsl.mk @@ -4,22 +4,27 @@ # ################################################################################ -LIBPSL_VERSION = 0.21.1 +LIBPSL_VERSION = 0.21.2 LIBPSL_SITE = https://github.com/rockdaboot/libpsl/releases/download/$(LIBPSL_VERSION) LIBPSL_LICENSE = MIT, BSD-3-Clause LIBPSL_LICENSE_FILES = COPYING src/LICENSE.chromium +LIBPSL_CONF_OPTS = -Dbuiltin=true LIBPSL_DEPENDENCIES = host-pkgconf LIBPSL_INSTALL_STAGING = YES +ifeq ($(BR2_ENABLE_LOCALE),) +LIBPSL_DEPENDENCIES += libiconv +endif + # The order of checks is the same as done by libpsl when configured. ifeq ($(BR2_PACKAGE_LIBIDN2)$(BR2_PACKAGE_LIBUNISTRING),yy) -LIBPSL_CONF_OPTS += -Druntime=libidn2 -Dbuiltin=libidn2 +LIBPSL_CONF_OPTS += -Druntime=libidn2 LIBPSL_DEPENDENCIES += libidn2 libunistring else ifeq ($(BR2_PACKAGE_ICU),y) -LIBPSL_CONF_OPTS += -Druntime=libicu -Dbuiltin=libicu +LIBPSL_CONF_OPTS += -Druntime=libicu LIBPSL_DEPENDENCIES += icu else -LIBPSL_CONF_OPTS += -Druntime=libidn -Dbuiltin=libidn +LIBPSL_CONF_OPTS += -Druntime=libidn LIBPSL_DEPENDENCIES += libidn libunistring endif diff --git a/package/libpthread-stubs/libpthread-stubs.hash b/package/libpthread-stubs/libpthread-stubs.hash index fb33618be8b..3f82bb23e90 100644 --- a/package/libpthread-stubs/libpthread-stubs.hash +++ b/package/libpthread-stubs/libpthread-stubs.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e4d05911a3165d3b18321cc067fdd2f023f06436e391c6a28dff618a78d2e733 libpthread-stubs-0.4.tar.bz2 -sha256 78c20706e799f2b8f445e71d3d2ade6ba23b3388fd6cbeed7d71796623febde8 COPYING +sha256 e4d05911a3165d3b18321cc067fdd2f023f06436e391c6a28dff618a78d2e733 libpthread-stubs-0.4.tar.bz2 +sha256 78c20706e799f2b8f445e71d3d2ade6ba23b3388fd6cbeed7d71796623febde8 COPYING diff --git a/package/libpwquality/libpwquality.hash b/package/libpwquality/libpwquality.hash index 1469bc0b7a7..e64fb4bf500 100644 --- a/package/libpwquality/libpwquality.hash +++ b/package/libpwquality/libpwquality.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d43baf23dc6887fe8f8e9b75cabaabc5f4bbbaa0f9eff44278d276141752a545 libpwquality-1.4.4.tar.bz2 +sha256 6fcf18b75d305d99d04d2e42982ed5b787a081af2842220ed63287a2d6a10988 libpwquality-1.4.5.tar.bz2 sha256 aa44d09f651bf99b56253187c7778a240740c767d28453ab7fdc9804c842baee COPYING diff --git a/package/libpwquality/libpwquality.mk b/package/libpwquality/libpwquality.mk index d4f7a471201..ae6babbcae8 100644 --- a/package/libpwquality/libpwquality.mk +++ b/package/libpwquality/libpwquality.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPWQUALITY_VERSION = 1.4.4 +LIBPWQUALITY_VERSION = 1.4.5 LIBPWQUALITY_SOURCE = libpwquality-$(LIBPWQUALITY_VERSION).tar.bz2 LIBPWQUALITY_SITE = https://github.com/libpwquality/libpwquality/releases/download/libpwquality-$(LIBPWQUALITY_VERSION) LIBPWQUALITY_LICENSE = BSD-3-Clause or GPL-2.0+ diff --git a/package/libqb/libqb.hash b/package/libqb/libqb.hash index b2c216f24ca..f7006ff10e6 100644 --- a/package/libqb/libqb.hash +++ b/package/libqb/libqb.hash @@ -1,5 +1,5 @@ -# From https://github.com/ClusterLabs/libqb/releases/download/v2.0.3/libqb-2.0.3.sha256 -sha256 a74582bc886fa625f5238374c7c8ca98672a2519c8196b91276be55886d84e9c libqb-2.0.3.tar.xz +# From https://github.com/ClusterLabs/libqb/releases/download/v2.0.8/libqb-2.0.8.sha256 +sha256 b42531fc20b8ac02f4c6d0a4dc49f7c4a1eef09bdb13af5f6927b7fc49522ee6 libqb-2.0.8.tar.xz # Locally calculated sha256 00a89b0d18aacd4114decf79122db87bf35bddaf2bc50e383c9c9f4c263390b2 COPYING diff --git a/package/libqb/libqb.mk b/package/libqb/libqb.mk index fb132365f1e..11b5788b455 100644 --- a/package/libqb/libqb.mk +++ b/package/libqb/libqb.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBQB_VERSION = 2.0.3 +LIBQB_VERSION = 2.0.8 LIBQB_SOURCE = libqb-$(LIBQB_VERSION).tar.xz LIBQB_SITE = \ https://github.com/ClusterLabs/libqb/releases/download/v$(LIBQB_VERSION) @@ -12,6 +12,7 @@ LIBQB_LICENSE = LGPL-2.1+ LIBQB_LICENSE_FILES = COPYING LIBQB_CPE_ID_VENDOR = clusterlabs LIBQB_INSTALL_STAGING = YES +LIBQB_CONF_OPTS = --disable-tests LIBQB_DEPENDENCIES = libxml2 # ac_cv_prog_cc_c99 is required for BR2_USE_WCHAR=n because the C99 test diff --git a/package/libqmi/0001-build-add-an-option-to-not-build-man-pages.patch b/package/libqmi/0001-build-add-an-option-to-not-build-man-pages.patch deleted file mode 100644 index d9053de537d..00000000000 --- a/package/libqmi/0001-build-add-an-option-to-not-build-man-pages.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 295b75e9c8dc895e281e36b1e8121d09fd556af0 Mon Sep 17 00:00:00 2001 -From: Aleksander Morgado -Date: Wed, 3 Nov 2021 10:57:51 +0100 -Subject: [PATCH] build: add an option to not build man pages - -When cross-compiling, the compiled binaries cannot be run on the build -machine, unless one defines a helper (e.g. qemu) in the meson -configuration, which is most of the time undesirable. - -If help2man is installed on the build machine, then the build would fail -because of this, so add an option to disable generating the man pages. - -With later versions of meson, it will be possible to automatically -detect this condition. - -Based on the same fix done in libmbim by Nicolas Cavallari, see -https://gitlab.freedesktop.org/mobile-broadband/libmbim/-/commit/792af73ea90e9689703ab526dd444fdb1c2f8e40 - -Fixes https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/issues/75 - -[Retrieved (and backported) from: -https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/commit/295b75e9c8dc895e281e36b1e8121d09fd556af0] -Signed-off-by: Fabrice Fontaine ---- - meson.build | 8 +++++++- - meson_options.txt | 1 + - 2 files changed, 8 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index e88b43a1..c7312146 100644 ---- a/meson.build -+++ b/meson.build -@@ -223,8 +223,8 @@ if enable_gtk_doc - subdir('docs/reference/libqmi-glib') - endif - --help2man = find_program('help2man', required: false) --if help2man.found() -+enable_man = get_option('man') -+if enable_man - subdir('docs/man') - endif - -@@ -237,6 +242,7 @@ summary({ - output += ' Documentation: ' + enable_gtk_doc.to_string() + '\n' - output += ' bash completion: ' + enable_bash_completion.to_string() + '\n' - output += ' gobject introspection: ' + enable_gir.to_string() + '\n\n' -+output += ' man pages: ' + enable_man.to_string() + '\n\n' - output += ' System paths\n' - output += ' prefix: ' + qmi_prefix + '\n' - output += ' udev base directory: ' + qmi_username + '\n\n' -diff --git a/meson_options.txt b/meson_options.txt -index 4d4f913d..bee5daac 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -16,5 +16,6 @@ option('udevdir', type: 'string', value: '', description: 'where udev base direc - - option('introspection', type: 'boolean', value: 'auto', description: 'build introspection support') - option('gtk_doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation') -+option('man', type: 'boolean', value: 'true', description: 'build man pages using help2man') - - option('bash_completion', type: 'boolean', value: true, description: 'install bash completion files') --- -GitLab - diff --git a/package/libqmi/libqmi.hash b/package/libqmi/libqmi.hash index 1f2da45ac01..5036c1d3c0e 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 2eb7c7971b91a64ad830643b0170cff692a69bf0f093ca61d72d3f466a0272d4 libqmi-1.30.2.tar.gz +sha256 aec96bf2733a7b5ba27bb52346ce3a1ab54440800843f78001cc2a51213ce1b9 libqmi-1.32.2.tar.gz diff --git a/package/libqmi/libqmi.mk b/package/libqmi/libqmi.mk index a4839f1efb6..c3db50a92cb 100644 --- a/package/libqmi/libqmi.mk +++ b/package/libqmi/libqmi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBQMI_VERSION = 1.30.2 +LIBQMI_VERSION = 1.32.2 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/libraw/0001-Add-Libs.private-to-libraw.pc.patch b/package/libraw/0001-Add-Libs.private-to-libraw.pc.patch deleted file mode 100644 index a90af231784..00000000000 --- a/package/libraw/0001-Add-Libs.private-to-libraw.pc.patch +++ /dev/null @@ -1,67 +0,0 @@ -From ad911cbc3c16397cf9d326c30571a4d1edaaa03f Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 2 Jun 2021 07:45:40 +0200 -Subject: [PATCH] Add Libs.private to libraw.pc - -Add Libs.private to libraw.pc to avoid the following static build -failure when enabling libraw with jasper support in imagemagick: - -/home/giuliobenetti/autobuild/run/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /home/giuliobenetti/autobuild/run/instance-1/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libjasper.a(jpg_enc.c.o): in function `jpg_encode': -jpg_enc.c:(.text+0x1f4): undefined reference to `jpeg_stdio_dest' - --ljpeg must be added after -ljasper because jasper depends on jpeg - -Fixes: - - http://autobuild.buildroot.org/results/88e43a1ea2059a684e50b0f5f2af407e8c6df2e1 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/LibRaw/LibRaw/pull/406] ---- - configure.ac | 2 ++ - libraw.pc.in | 1 + - libraw_r.pc.in | 1 + - 3 files changed, 4 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 4ab2f313..7bf5fdfd 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -57,6 +57,7 @@ if test x$jpeg = xtrue; then - AC_CHECK_HEADERS([jpeglib.h], [ - CPPFLAGS="$CPPFLAGS -DUSE_JPEG -DUSE_JPEG8" - LIBS="$LIBS -ljpeg" -+ AC_SUBST([PACKAGE_LIBS_PRIVATE],"-ljpeg $PACKAGE_LIBS_PRIVATE") - ], AC_MSG_WARN([no jpeg headers found])) - ], - AC_MSG_WARN([libjpeg not found]) -@@ -78,6 +79,7 @@ if test x$jasper = xtrue; then - AC_CHECK_HEADERS([jasper/jasper.h], [ - CPPFLAGS="$CPPFLAGS -DUSE_JASPER" - LIBS="$LIBS -ljasper" -+ AC_SUBST([PACKAGE_LIBS_PRIVATE],"-ljasper $PACKAGE_LIBS_PRIVATE") - ], AC_MSG_WARN([no jasper headers found])) - ], - AC_MSG_WARN([libjasper not found]) -diff --git a/libraw.pc.in b/libraw.pc.in -index 1bab18b8..c95fbc48 100644 ---- a/libraw.pc.in -+++ b/libraw.pc.in -@@ -8,4 +8,5 @@ Description: Raw image decoder library (non-thread-safe) - Requires: @PACKAGE_REQUIRES@ - Version: @PACKAGE_VERSION@ - Libs: -L${libdir} -lraw -lstdc++@PC_OPENMP@ -+Libs.private: @PACKAGE_LIBS_PRIVATE@ - Cflags: -I${includedir}/libraw -I${includedir} -diff --git a/libraw_r.pc.in b/libraw_r.pc.in -index e8427271..92bbbffa 100644 ---- a/libraw_r.pc.in -+++ b/libraw_r.pc.in -@@ -8,4 +8,5 @@ Description: Raw image decoder library (thread-safe) - Requires: @PACKAGE_REQUIRES@ - Version: @PACKAGE_VERSION@ - Libs: -L${libdir} -lraw_r -lstdc++@PC_OPENMP@ -+Libs.private: @PACKAGE_LIBS_PRIVATE@ - Cflags: -I${includedir}/libraw -I${includedir} --- -2.30.2 - diff --git a/package/libraw/0001-do-not-set-shrink-flag-for-3-4-component-images.patch b/package/libraw/0001-do-not-set-shrink-flag-for-3-4-component-images.patch new file mode 100644 index 00000000000..ef93e0901bb --- /dev/null +++ b/package/libraw/0001-do-not-set-shrink-flag-for-3-4-component-images.patch @@ -0,0 +1,24 @@ +From 477e0719ffc07190c89b4f3d12d51b1292e75828 Mon Sep 17 00:00:00 2001 +From: Alex Tutubalin +Date: Sat, 14 Jan 2023 18:32:59 +0300 +Subject: [PATCH] do not set shrink flag for 3/4 component images + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/LibRaw/LibRaw/commit/477e0719ffc07190c89b4f3d12d51b1292e75828 +--- + src/preprocessing/raw2image.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/preprocessing/raw2image.cpp b/src/preprocessing/raw2image.cpp +index e65e2ad7..702cf290 100644 +--- a/src/preprocessing/raw2image.cpp ++++ b/src/preprocessing/raw2image.cpp +@@ -43,6 +43,8 @@ void LibRaw::raw2image_start() + + // adjust for half mode! + IO.shrink = ++ !imgdata.rawdata.color4_image && !imgdata.rawdata.color3_image && ++ !imgdata.rawdata.float4_image && !imgdata.rawdata.float3_image && + P1.filters && + (O.half_size || ((O.threshold || O.aber[0] != 1 || O.aber[2] != 1))); + diff --git a/package/libraw/libraw.hash b/package/libraw/libraw.hash index f2a01c277bd..58bb1b47536 100644 --- a/package/libraw/libraw.hash +++ b/package/libraw/libraw.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 dc1b486c2003435733043e4e05273477326e51c3ea554c6864a4eafaff1004a6 LibRaw-0.20.2.tar.gz +sha256 630a6bcf5e65d1b1b40cdb8608bdb922316759bfb981c65091fec8682d1543cd LibRaw-0.21.1.tar.gz sha256 eea173a556abac0370461e57e12aab266894ea6be3874c2be05fd87871f75449 LICENSE.LGPL sha256 0e3098d2d54a12434715f6679ea408d57da5e8d613c385c58ecc6fe5d30cc81f LICENSE.CDDL -sha256 313415f7f48f6cd3cc78856626aab4bbe97dbb1e9a11db9c25396ca8d0e76cd9 README.md +sha256 7d6650cef6cf892abe95e55a6bda1e1c42f221fd411b807deb2fc0b805b868d4 README.md diff --git a/package/libraw/libraw.mk b/package/libraw/libraw.mk index fc02c7915f9..63b50e340da 100644 --- a/package/libraw/libraw.mk +++ b/package/libraw/libraw.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRAW_VERSION = 0.20.2 +LIBRAW_VERSION = 0.21.1 LIBRAW_SOURCE = LibRaw-$(LIBRAW_VERSION).tar.gz LIBRAW_SITE = http://www.libraw.org/data LIBRAW_INSTALL_STAGING = YES @@ -15,11 +15,12 @@ LIBRAW_LICENSE = LGPL-2.1 or CDDL-1.0 LIBRAW_LICENSE_FILES = LICENSE.LGPL LICENSE.CDDL README.md LIBRAW_CPE_ID_VENDOR = libraw LIBRAW_DEPENDENCIES = host-pkgconf -# https://github.com/LibRaw/LibRaw/issues/353 -LIBRAW_AUTORECONF = YES LIBRAW_CXXFLAGS = $(TARGET_CXXFLAGS) LIBRAW_CONF_ENV = CXXFLAGS="$(LIBRAW_CXXFLAGS)" +# 0001-do-not-set-shrink-flag-for-3-4-component-images.patch +LIBRAW_IGNORE_CVES += CVE-2023-1729 + ifeq ($(BR2_PACKAGE_JASPER),y) LIBRAW_CONF_OPTS += --enable-jasper LIBRAW_DEPENDENCIES += jasper diff --git a/package/libraw1394/libraw1394.hash b/package/libraw1394/libraw1394.hash index 9a44ab7d414..a69686f59f1 100644 --- a/package/libraw1394/libraw1394.hash +++ b/package/libraw1394/libraw1394.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/libs/ieee1394/sha256sums.asc -sha256 03ccc69761d22c7deb1127fc301010dd13e70e44bb7134b8ff0d07590259a55e libraw1394-2.1.2.tar.xz +sha256 03ccc69761d22c7deb1127fc301010dd13e70e44bb7134b8ff0d07590259a55e libraw1394-2.1.2.tar.xz # Locally computed -sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING.LIB +sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING.LIB diff --git a/package/libreplaygain/libreplaygain.hash b/package/libreplaygain/libreplaygain.hash index 63e5dca5789..0f7bc987bd3 100644 --- a/package/libreplaygain/libreplaygain.hash +++ b/package/libreplaygain/libreplaygain.hash @@ -1,5 +1,5 @@ # From https://www.musepack.net/index.php?pg=src -md5 e27b3b1249b7fbae92d656d9e3d26633 libreplaygain_r475.tar.gz +md5 e27b3b1249b7fbae92d656d9e3d26633 libreplaygain_r475.tar.gz # Calculated based on the hash above sha256 8258bf785547ac2cda43bb195e07522f0a3682f55abe97753c974609ec232482 libreplaygain_r475.tar.gz # Locally computed diff --git a/package/libressl/0001-always-expose-SSL_OP_NO_TLSv1_3.patch b/package/libressl/0001-always-expose-SSL_OP_NO_TLSv1_3.patch index 98fe250f658..48f3fa16e04 100644 --- a/package/libressl/0001-always-expose-SSL_OP_NO_TLSv1_3.patch +++ b/package/libressl/0001-always-expose-SSL_OP_NO_TLSv1_3.patch @@ -20,7 +20,7 @@ diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index 46f24b2ea..4048a6e63 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h -@@ -411,11 +411,7 @@ typedef int (*tls_session_secret_cb_fn)(SSL *s, void *secret, int *secret_len, +@@ -412,11 +412,7 @@ typedef int (*tls_session_secret_cb_fn)(SSL *s, void *secret, int *secret_len, #define SSL_OP_NO_TLSv1 0x04000000L #define SSL_OP_NO_TLSv1_2 0x08000000L #define SSL_OP_NO_TLSv1_1 0x10000000L diff --git a/package/libressl/libressl.hash b/package/libressl/libressl.hash index 990ec8bda80..e2d4decb7c1 100644 --- a/package/libressl/libressl.hash +++ b/package/libressl/libressl.hash @@ -1,4 +1,4 @@ # From https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/SHA256 -sha256 cb82ca7d547336917352fbd23db2fc483c6c44d35157b32780214ec74197b3ce libressl-3.4.2.tar.gz +sha256 87b1bbe36e9eec8d0ae5f04c83d36b2c5b0e581784c7eb0817025ed29eadea37 libressl-3.6.3.tar.gz # Locally computed sha256 5c63613f008f16a9c0025c096bbd736cecf720494d121b5c5203e0ec6e5955b1 COPYING diff --git a/package/libressl/libressl.mk b/package/libressl/libressl.mk index 6eee86dda92..58c8398e79f 100644 --- a/package/libressl/libressl.mk +++ b/package/libressl/libressl.mk @@ -4,13 +4,13 @@ # ################################################################################ -LIBRESSL_VERSION = 3.4.2 +LIBRESSL_VERSION = 3.6.3 LIBRESSL_SITE = https://ftp.openbsd.org/pub/OpenBSD/LibreSSL LIBRESSL_LICENSE = ISC (new additions), OpenSSL or SSLeay (original OpenSSL code) LIBRESSL_LICENSE_FILES = COPYING LIBRESSL_CPE_ID_VENDOR = openbsd LIBRESSL_INSTALL_STAGING = YES -LIBRESSL_CONF_OPTS = -DOPENSSLDIR="/etc/ssl" +LIBRESSL_CONF_OPTS = -DLIBRESSL_TESTS=OFF -DOPENSSLDIR="/etc/ssl" ifeq ($(BR2_PACKAGE_LIBRESSL_BIN),) define LIBRESSL_REMOVE_BIN diff --git a/package/libroxml/libroxml.hash b/package/libroxml/libroxml.hash index 2e01a549856..547f82b60c0 100644 --- a/package/libroxml/libroxml.hash +++ b/package/libroxml/libroxml.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ed6d68d1bceabf98e5e76907411e2e4d93b2dbd48479ab41dede851f59dad6a3 libroxml-3.0.2.tar.gz -sha256 fe11466c265ad0a6c3896ea113af9403c0a8372b1fdd78712db64f0f1bac6387 License.txt +sha256 ed6d68d1bceabf98e5e76907411e2e4d93b2dbd48479ab41dede851f59dad6a3 libroxml-3.0.2.tar.gz +sha256 fe11466c265ad0a6c3896ea113af9403c0a8372b1fdd78712db64f0f1bac6387 License.txt diff --git a/package/librsvg/librsvg.hash b/package/librsvg/librsvg.hash index 8b32c6581e2..c8da3354f59 100644 --- a/package/librsvg/librsvg.hash +++ b/package/librsvg/librsvg.hash @@ -1,4 +1,4 @@ -# From https://ftp.gnome.org/pub/gnome/sources/librsvg/2.50/librsvg-2.50.7.sha256sum +# From https://download.gnome.org/sources/librsvg/2.50/librsvg-2.50.7.sha256sum sha256 fffb61b08cd5282aaae147a02b305166a7426fad22a8b9427708f0f2fc426ebc librsvg-2.50.7.tar.xz # Locally computed diff --git a/package/librsvg/librsvg.mk b/package/librsvg/librsvg.mk index 07a14b43664..df6559a858f 100644 --- a/package/librsvg/librsvg.mk +++ b/package/librsvg/librsvg.mk @@ -6,7 +6,7 @@ LIBRSVG_VERSION_MAJOR = 2.50 LIBRSVG_VERSION = $(LIBRSVG_VERSION_MAJOR).7 -LIBRSVG_SITE = http://ftp.gnome.org/pub/gnome/sources/librsvg/$(LIBRSVG_VERSION_MAJOR) +LIBRSVG_SITE = https://download.gnome.org/sources/librsvg/$(LIBRSVG_VERSION_MAJOR) LIBRSVG_SOURCE = librsvg-$(LIBRSVG_VERSION).tar.xz LIBRSVG_INSTALL_STAGING = YES LIBRSVG_CONF_ENV = \ diff --git a/package/librtas/0001-configure.ac-remove-LOCAL_CHECK_FLAGS.patch b/package/librtas/0001-configure.ac-remove-LOCAL_CHECK_FLAGS.patch new file mode 100644 index 00000000000..dd5f9443175 --- /dev/null +++ b/package/librtas/0001-configure.ac-remove-LOCAL_CHECK_FLAGS.patch @@ -0,0 +1,46 @@ +From 148712f8a559cc613236e9e72b3ce6c24b83c373 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sat, 23 Jul 2022 18:51:37 +0200 +Subject: [PATCH] configure.ac: remove LOCAL_CHECK_FLAGS + +These cause problems with Buildroot (the -fstack-protector-all check +does only a compile test, it should do a link test), and generally the +decision of using those flags or not should be left to Buildroot. + +An issue has been reported upstream at +https://github.com/ibm-power-utilities/librtas/issues/25 to hopefully +get a better solution. + +Signed-off-by: Thomas Petazzoni +--- + configure.ac | 14 -------------- + 1 file changed, 14 deletions(-) + +diff --git a/configure.ac b/configure.ac +index c3429e8..b7208ee 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -24,20 +24,6 @@ AC_TYPE_UID_T + AC_TYPE_UINT32_T + AC_TYPE_UINT64_T + +-AC_DEFUN([LOCAL_CHECK_FLAGS],[ +- AC_REQUIRE([AX_CHECK_LINK_FLAG]) +- AC_REQUIRE([AX_APPEND_COMPILE_FLAGS]) +- AC_LANG_PUSH([C]) +- AX_APPEND_COMPILE_FLAGS([-Wall]) +- AX_APPEND_COMPILE_FLAGS([-D_FORTIFY_SOURCE=2 -fstack-protector-all]) +- AX_APPEND_COMPILE_FLAGS([-fwrapv -fPIE -Wstack-protector]) +- AX_APPEND_COMPILE_FLAGS([--param=ssp-buffer-size=1]) +- AX_CHECK_LINK_FLAG([-z relro -z now]) +- AX_CHECK_LINK_FLAG([-pie]) +- AC_LANG_POP +-]) +-LOCAL_CHECK_FLAGS +- + LT_INIT + LT_LANG([C]) + +-- +2.37.1 + diff --git a/package/librtas/Config.in b/package/librtas/Config.in index 11660eb2817..2f8219ee98e 100644 --- a/package/librtas/Config.in +++ b/package/librtas/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_LIBRTAS bool "librtas" depends on BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le - depends on BR2_TOOLCHAIN_USES_GLIBC help The librtas package provides an interface for Run-Time Abstraction Services (RTAS) calls on PAPR platforms. @@ -9,7 +8,3 @@ config BR2_PACKAGE_LIBRTAS and parse RTAS events. http://librtas.sourceforge.net/ - -comment "librtas needs a glibc toolchain" - depends on BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le - depends on !BR2_TOOLCHAIN_USES_GLIBC diff --git a/package/librtas/librtas.hash b/package/librtas/librtas.hash index de0c0a476ca..8d4c4e19123 100644 --- a/package/librtas/librtas.hash +++ b/package/librtas/librtas.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b47b2a6f140347ac265e2c66ddf68293f6cdcc7c0c9a78c6e21ff52846465415 librtas-2.0.2.tar.gz +sha256 1b951422ec9553fa9d5e5e158fd8e298f867f561189fff6817a9540d5661f145 librtas-2.0.3.tar.gz sha256 592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c COPYING.LESSER diff --git a/package/librtas/librtas.mk b/package/librtas/librtas.mk index c92a9e2fa49..458d7a0e478 100644 --- a/package/librtas/librtas.mk +++ b/package/librtas/librtas.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRTAS_VERSION = 2.0.2 +LIBRTAS_VERSION = 2.0.3 LIBRTAS_SITE = $(call github,ibm-power-utilities,librtas,v$(LIBRTAS_VERSION)) LIBRTAS_LICENSE = LGPL-2.1+ LIBRTAS_LICENSE_FILES = COPYING.LESSER diff --git a/package/librtlsdr/0001-Makefile.am-respect-DESTDIR-with-install-udev-rules.patch b/package/librtlsdr/0001-Makefile.am-respect-DESTDIR-with-install-udev-rules.patch new file mode 100644 index 00000000000..1aec8166cce --- /dev/null +++ b/package/librtlsdr/0001-Makefile.am-respect-DESTDIR-with-install-udev-rules.patch @@ -0,0 +1,31 @@ +From 082c9e4cb6c8f96aa59dd3d03b0288752518fad7 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 19 Feb 2022 22:29:45 +0100 +Subject: [PATCH] Makefile.am: respect $(DESTDIR) with install-udev-rules + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/steve-m/librtlsdr/pull/67] +--- + Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 65b2f21..6b8691a 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -14,10 +14,10 @@ dist-hook: + echo $(VERSION) > $(distdir)/.tarball-version + + install-udev-rules: +- $(INSTALL_DATA) rtl-sdr.rules /etc/udev/rules.d ++ $(INSTALL_DATA) rtl-sdr.rules $(DESTDIR)/etc/udev/rules.d + + uninstall-udev-rules: +- rm -rf /etc/udev/rules.d/rtl-sdr.rules ++ rm -rf $(DESTDIR)/etc/udev/rules.d/rtl-sdr.rules + + EXTRA_DIST = git-version-gen .version + +-- +2.34.1 + diff --git a/package/librtlsdr/0001-disable_shared_library_target_in_build.patch b/package/librtlsdr/0001-disable_shared_library_target_in_build.patch deleted file mode 100644 index 2fb63465deb..00000000000 --- a/package/librtlsdr/0001-disable_shared_library_target_in_build.patch +++ /dev/null @@ -1,130 +0,0 @@ -From 9a1c2587d4ef18e2026811deabd024eb7577d9ce Mon Sep 17 00:00:00 2001 -From: Gwenhael Goavec-Merou -Date: Fri, 15 May 2020 16:14:48 +0200 -Subject: [PATCH] disable shared library target in build - -Disable shared library target if BUILD_SHARED_LIBS if OFF. - -Patch retrieved from -https://git.buildroot.net/buildroot/tree/package/librtlsdr/0001-disable_shared_library_target_in_build.patch?h=2020.02.x - -Patch has been updated to work with master and to be able to keep current -behavior of building shared and static version of library if -BUILD_SHARED_LIBS and BUILD_STATIC_LIBS are both set. -Moreover, if BUILD_STATIC_LIBS is OFF, only shared version of library -will be install. - -[Upstream status: http://lists.osmocom.org/pipermail/osmocom-sdr/2020-May/002075.html] - -Signed-off-by: Yuvaraj Patil -Signed-off-by: Fabrice Fontaine -Signed-off-by: Gwenhael Goavec-Merou -Signed-off-by: Titouan Christophe ---- - src/CMakeLists.txt | 30 +++++++++++++++++++++--------- - 1 file changed, 21 insertions(+), 9 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index de93044..13b7b1a 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -18,6 +18,8 @@ - ######################################################################## - # Setup shared library variant - ######################################################################## -+option(BUILD_SHARED_LIBS "Build shared library" ON) -+if(BUILD_SHARED_LIBS) - add_library(rtlsdr SHARED librtlsdr.c - tuner_e4k.c tuner_fc0012.c tuner_fc0013.c tuner_fc2580.c tuner_r82xx.c) - target_link_libraries(rtlsdr PkgConfig::LIBUSB) -@@ -30,10 +32,14 @@ set_target_properties(rtlsdr PROPERTIES OUTPUT_NAME rtlsdr) - set_target_properties(rtlsdr PROPERTIES SOVERSION ${MAJOR_VERSION}) - set_target_properties(rtlsdr PROPERTIES VERSION ${LIBVER}) - generate_export_header(rtlsdr) -+list(APPEND rtlsdr_lib rtlsdr) -+endif() - - ######################################################################## - # Setup static library variant - ######################################################################## -+option(BUILD_STATIC_LIBS "Build static library" ON) -+if(BUILD_STATIC_LIBS) - add_library(rtlsdr_static STATIC librtlsdr.c - tuner_e4k.c tuner_fc0012.c tuner_fc0013.c tuner_fc2580.c tuner_r82xx.c) - target_link_libraries(rtlsdr_static PkgConfig::LIBUSB) -@@ -47,6 +53,8 @@ if(NOT WIN32) - set_target_properties(rtlsdr_static PROPERTIES OUTPUT_NAME rtlsdr) - endif() - generate_export_header(rtlsdr_static) -+list(APPEND rtlsdr_lib rtlsdr_static) -+endif() - - ######################################################################## - # Set up Windows DLL resource files -@@ -90,37 +98,37 @@ add_executable(rtl_eeprom rtl_eeprom.c) - add_executable(rtl_adsb rtl_adsb.c) - add_executable(rtl_power rtl_power.c) - add_executable(rtl_biast rtl_biast.c) --set(INSTALL_TARGETS rtlsdr rtlsdr_static rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power rtl_biast) -+set(INSTALL_TARGETS ${rtlsdr_lib} rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power rtl_biast) - --target_link_libraries(rtl_sdr rtlsdr convenience_static -+target_link_libraries(rtl_sdr ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_tcp rtlsdr convenience_static -+target_link_libraries(rtl_tcp ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_test rtlsdr convenience_static -+target_link_libraries(rtl_test ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_fm rtlsdr convenience_static -+target_link_libraries(rtl_fm ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_eeprom rtlsdr convenience_static -+target_link_libraries(rtl_eeprom ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_adsb rtlsdr convenience_static -+target_link_libraries(rtl_adsb ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_power rtlsdr convenience_static -+target_link_libraries(rtl_power ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_biast rtlsdr convenience_static -+target_link_libraries(rtl_biast ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) -@@ -156,12 +164,16 @@ endif() - ######################################################################## - # Install built library files & utilities - ######################################################################## -+if(BUILD_SHARED_LIBS) - install(TARGETS rtlsdr EXPORT RTLSDR-export - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} # .so/.dylib file - ) -+endif() -+if(BUILD_STATIC_LIBS) - install(TARGETS rtlsdr_static EXPORT RTLSDR-export - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} # .so/.dylib file - ) -+endif() - install(TARGETS rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power rtl_biast - DESTINATION ${CMAKE_INSTALL_BINDIR} - ) --- -2.25.3 - diff --git a/package/librtlsdr/0002-cmake-Modules-Version.cmake-don-t-use-Git-version-if.patch b/package/librtlsdr/0002-cmake-Modules-Version.cmake-don-t-use-Git-version-if.patch deleted file mode 100644 index 9c808edd41b..00000000000 --- a/package/librtlsdr/0002-cmake-Modules-Version.cmake-don-t-use-Git-version-if.patch +++ /dev/null @@ -1,47 +0,0 @@ -From feb5d9c6b7bcec788f9b01781c205e31fff260e7 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 11 Aug 2020 23:07:08 +0200 -Subject: [PATCH] cmake/Modules/Version.cmake: don't use Git version if not in - a Git repo - -If the librtlsdr code comes from a tarball, it doesn't have any .git/ -metadata, and therefore even if Git (as a tool) is found, the logic in -cmake/Modules/Version.cmake fails finding a version through Git: - --- Extracting version information from git describe... -fatal: Not a git repository (or any of the parent directories): .git - -As a consequence, the VERSION variable is empty, which later causes -cmake to bail out with: - -CMake Error at /home/test/autobuild/run/instance-1/output-1/host/share/cmake-3.15/Modules/WriteBasicConfigVersionFile.cmake:43 (message): - No VERSION specified for WRITE_BASIC_CONFIG_VERSION_FILE() -Call Stack (most recent call first): - /home/test/autobuild/run/instance-1/output-1/host/share/cmake-3.15/Modules/CMakePackageConfigHelpers.cmake:225 (write_basic_config_version_file) - CMakeLists.txt:173 (write_basic_package_version_file) - -To avoid this, we only use Git to determine the version if the cmake -project top-level source directory has a .git/ folder. - -Upstream: https://github.com/librtlsdr/librtlsdr/pull/75 -Signed-off-by: Thomas Petazzoni ---- - cmake/Modules/Version.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmake/Modules/Version.cmake b/cmake/Modules/Version.cmake -index 2d4e76d..6f67fa4 100644 ---- a/cmake/Modules/Version.cmake -+++ b/cmake/Modules/Version.cmake -@@ -32,7 +32,7 @@ set(PATCH_VERSION ${VERSION_INFO_PATCH_VERSION}) - ######################################################################## - find_package(Git QUIET) - --if(GIT_FOUND) -+if(GIT_FOUND AND EXISTS ${CMAKE_SOURCE_DIR}/.git) - message(STATUS "Extracting version information from git describe...") - execute_process( - COMMAND ${GIT_EXECUTABLE} describe --always --abbrev=4 --long --- -2.26.2 - diff --git a/package/librtlsdr/librtlsdr.mk b/package/librtlsdr/librtlsdr.mk index 7796d1096a1..908be158b11 100644 --- a/package/librtlsdr/librtlsdr.mk +++ b/package/librtlsdr/librtlsdr.mk @@ -9,29 +9,25 @@ LIBRTLSDR_SITE = $(call github,steve-m,librtlsdr,$(LIBRTLSDR_VERSION)) LIBRTLSDR_LICENSE = GPL-2.0+ LIBRTLSDR_LICENSE_FILES = COPYING LIBRTLSDR_INSTALL_STAGING = YES -LIBRTLSDR_DEPENDENCIES = libusb - -# BUILD_SHARED_LIBS is handled in pkg-cmake.mk as it is a generic cmake variable -ifeq ($(BR2_STATIC_LIBS),y) -LIBRTLSDR_CONF_OPTS += -DBUILD_STATIC_LIBS=ON -else ifeq ($(BR2_SHARED_STATIC_LIBS),y) -LIBRTLSDR_CONF_OPTS += -DBUILD_STATIC_LIBS=ON -else ifeq ($(BR2_SHARED_LIBS),y) -LIBRTLSDR_CONF_OPTS += -DBUILD_STATIC_LIBS=OFF -endif +# From git +LIBRTLSDR_AUTORECONF = YES +LIBRTLSDR_DEPENDENCIES = host-pkgconf libusb +LIBRTLSDR_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install ifeq ($(BR2_PACKAGE_HAS_UDEV),y) -LIBRTLSDR_CONF_OPTS += -DINSTALL_UDEV_RULES=ON +LIBRTLSDR_INSTALL_TARGET_OPTS += install-udev-rules endif ifeq ($(BR2_PACKAGE_LIBRTLSDR_DETACH_DRIVER),y) -LIBRTLSDR_CONF_OPTS += -DDETACH_KERNEL_DRIVER=1 +LIBRTLSDR_CONF_OPTS += --enable-driver-detach +else +LIBRTLSDR_CONF_OPTS += --disable-driver-detach endif ifeq ($(BR2_PACKAGE_LIBRTLSDR_ZEROCOPY),y) -LIBRTLSDR_CONF_OPTS += -DENABLE_ZEROCOPY=ON +LIBRTLSDR_CONF_OPTS += --enable-zerocopy else -LIBRTLSDR_CONF_OPTS += -DENABLE_ZEROCOPY=OFF +LIBRTLSDR_CONF_OPTS += --disable-zerocopy endif -$(eval $(cmake-package)) +$(eval $(autotools-package)) diff --git a/package/libsamplerate/Config.in b/package/libsamplerate/Config.in index b394fdb0ac5..5cce287f811 100644 --- a/package/libsamplerate/Config.in +++ b/package/libsamplerate/Config.in @@ -6,4 +6,4 @@ config BR2_PACKAGE_LIBSAMPLERATE be useful is converting audio from the CD sample rate of 44.1kHz to the 48kHz sample rate used by DAT players. - http://www.mega-nerd.com/SRC/ + http://libsndfile.github.io/libsamplerate/ diff --git a/package/libsamplerate/libsamplerate.hash b/package/libsamplerate/libsamplerate.hash index 73722563ef0..c5e22ba57c5 100644 --- a/package/libsamplerate/libsamplerate.hash +++ b/package/libsamplerate/libsamplerate.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 0a7eb168e2f21353fb6d84da152e4512126f7dc48ccb0be80578c565413444c1 libsamplerate-0.1.9.tar.gz +sha256 3258da280511d24b49d6b08615bbe824d0cacc9842b0e4caf11c52cf2b043893 libsamplerate-0.2.2.tar.xz # Locally computed -sha256 2c1f76ce2effdddb425018405d5690c0b1ab4e6976e35296b0a6db65c5e1a55d COPYING +sha256 2c1f76ce2effdddb425018405d5690c0b1ab4e6976e35296b0a6db65c5e1a55d COPYING diff --git a/package/libsamplerate/libsamplerate.mk b/package/libsamplerate/libsamplerate.mk index 146d57d15ea..2844fde33c0 100644 --- a/package/libsamplerate/libsamplerate.mk +++ b/package/libsamplerate/libsamplerate.mk @@ -4,21 +4,26 @@ # ################################################################################ -LIBSAMPLERATE_VERSION = 0.1.9 -LIBSAMPLERATE_SITE = http://www.mega-nerd.com/SRC +LIBSAMPLERATE_VERSION = 0.2.2 +LIBSAMPLERATE_SOURCE = libsamplerate-$(LIBSAMPLERATE_VERSION).tar.xz +LIBSAMPLERATE_SITE = https://github.com/libsndfile/libsamplerate/releases/download/$(LIBSAMPLERATE_VERSION) LIBSAMPLERATE_INSTALL_STAGING = YES LIBSAMPLERATE_DEPENDENCIES = host-pkgconf -LIBSAMPLERATE_CONF_OPTS = --disable-fftw --program-transform-name='' +# sndfile is only used for examples and tests so it doesn't make sense +# to support it as an optional dependency +LIBSAMPLERATE_CONF_OPTS = \ + --disable-fftw \ + --disable-sndfile \ + --program-transform-name='' LIBSAMPLERATE_LICENSE = BSD-2-Clause LIBSAMPLERATE_LICENSE_FILES = COPYING LIBSAMPLERATE_CPE_ID_VENDOR = libsamplerate_project ifeq ($(BR2_PACKAGE_ALSA_LIB),y) LIBSAMPLERATE_DEPENDENCIES += alsa-lib -endif - -ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) -LIBSAMPLERATE_DEPENDENCIES += libsndfile +LIBSAMPLERATE_CONF_OPTS += --enable-alsa +else +LIBSAMPLERATE_CONF_OPTS += --disable-alsa endif $(eval $(autotools-package)) diff --git a/package/libscrypt/0001-Allow-adding-options-to-CFLAGS-and-LDFLAGS-variables.patch b/package/libscrypt/0001-Allow-adding-options-to-CFLAGS-and-LDFLAGS-variables.patch deleted file mode 100644 index a023a6fe1cb..00000000000 --- a/package/libscrypt/0001-Allow-adding-options-to-CFLAGS-and-LDFLAGS-variables.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 097c5d9248f4afd34c73de5aba01a143ef784257 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Stefan=20S=C3=B8rensen?= -Date: Tue, 14 Mar 2017 09:23:51 +0100 -Subject: [PATCH] Allow adding options to CFLAGS and LDFLAGS variables -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This also removes a number of hard-coded CFLAGS, leaving it up to the -user to pass appropriate optimization/hardening flags. - -Signed-off-by: Stefan Sørensen ---- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 7022a4a..3098a9a 100644 ---- a/Makefile -+++ b/Makefile -@@ -5,8 +5,8 @@ MAKE_DIR ?= install -d - INSTALL_DATA ?= install - - CC?=gcc --CFLAGS?=-O2 -Wall -g -D_FORTIFY_SOURCE=2 -fstack-protector -fPIC --LDFLAGS?=-Wl,-z,now -Wl,-z,relro -Wl,-soname,libscrypt.so.0 -Wl,--version-script=libscrypt.version -+override CFLAGS+=-fPIC -+override LDFLAGS+=-Wl,-z,now -Wl,-z,relro -Wl,-soname,libscrypt.so.0 -Wl,--version-script=libscrypt.version - CFLAGS_EXTRA?=-Wl,-rpath=. - - all: reference --- -2.7.4 - diff --git a/package/libscrypt/libscrypt.hash b/package/libscrypt/libscrypt.hash index fda63d1c0d5..fcdc4bbeeb4 100644 --- a/package/libscrypt/libscrypt.hash +++ b/package/libscrypt/libscrypt.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 68e377e79745c10d489b759b970e52d819dbb80dd8ca61f8c975185df3f457d3 libscrypt-1.21.tar.gz -sha256 aacbfd9e19e5b38ea09616cebf0751ef0cc7b6a19ea0fd78f4b0598b2c503394 LICENSE +sha256 a2d30ea16e6d288772791de68be56153965fe4fd4bcd787777618b8048708936 libscrypt-1.22.tar.gz +sha256 aacbfd9e19e5b38ea09616cebf0751ef0cc7b6a19ea0fd78f4b0598b2c503394 LICENSE diff --git a/package/libscrypt/libscrypt.mk b/package/libscrypt/libscrypt.mk index fa89ed31bc5..193c963f76b 100644 --- a/package/libscrypt/libscrypt.mk +++ b/package/libscrypt/libscrypt.mk @@ -4,23 +4,29 @@ # ################################################################################ -LIBSCRYPT_VERSION = 1.21 +LIBSCRYPT_VERSION = 1.22 LIBSCRYPT_SITE = $(call github,technion,libscrypt,v$(LIBSCRYPT_VERSION)) LIBSCRYPT_LICENSE = BSD-2-Clause LIBSCRYPT_LICENSE_FILES = LICENSE LIBSCRYPT_INSTALL_STAGING = YES +LIBSCRYPT_MAKE_OPTS = \ + CC=$(TARGET_CC) \ + CFLAGS_EXTRA="$(TARGET_CFLAGS)" \ + LDFLAGS_EXTRA="$(TARGET_LDFLAGS)" \ + PREFIX=/usr + define LIBSCRYPT_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LIBSCRYPT_MAKE_OPTS) endef define LIBSCRYPT_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=/usr \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LIBSCRYPT_MAKE_OPTS) \ DESTDIR=$(STAGING_DIR) install endef define LIBSCRYPT_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=/usr \ + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LIBSCRYPT_MAKE_OPTS) \ DESTDIR=$(TARGET_DIR) install endef diff --git a/package/libseccomp/libseccomp.hash b/package/libseccomp/libseccomp.hash index 20b88647273..8337f33f3e2 100644 --- a/package/libseccomp/libseccomp.hash +++ b/package/libseccomp/libseccomp.hash @@ -1,4 +1,4 @@ -# From https://github.com/seccomp/libseccomp/releases/tag/v2.5.3 -sha256 59065c8733364725e9721ba48c3a99bbc52af921daf48df4b1e012fbc7b10a76 libseccomp-2.5.3.tar.gz +# From https://github.com/seccomp/libseccomp/releases/tag/v2.5.4 +sha256 d82902400405cf0068574ef3dc1fe5f5926207543ba1ae6f8e7a1576351dcbdb libseccomp-2.5.4.tar.gz # Locally calculated sha256 102900208eef27b766380135906d431dba87edaa7ec6aa72e6ebd3dd67f3a97b LICENSE diff --git a/package/libseccomp/libseccomp.mk b/package/libseccomp/libseccomp.mk index ee2cb126f1a..7d7f33618ea 100644 --- a/package/libseccomp/libseccomp.mk +++ b/package/libseccomp/libseccomp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSECCOMP_VERSION = 2.5.3 +LIBSECCOMP_VERSION = 2.5.4 LIBSECCOMP_SITE = https://github.com/seccomp/libseccomp/releases/download/v$(LIBSECCOMP_VERSION) LIBSECCOMP_LICENSE = LGPL-2.1 LIBSECCOMP_LICENSE_FILES = LICENSE diff --git a/package/libsecret/libsecret.hash b/package/libsecret/libsecret.hash index 792ec838e3c..4eb3d9b95c8 100644 --- a/package/libsecret/libsecret.hash +++ b/package/libsecret/libsecret.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/libsecret/0.20/libsecret-0.20.4.sha256sum -sha256 325a4c54db320c406711bf2b55e5cb5b6c29823426aa82596a907595abb39d28 libsecret-0.20.4.tar.xz +# From https://download.gnome.org/sources/libsecret/0.20/libsecret-0.20.5.sha256sum +sha256 3fb3ce340fcd7db54d87c893e69bfc2b1f6e4d4b279065ffe66dac9f0fd12b4d libsecret-0.20.5.tar.xz # Hash for license file: sha256 a1a33180d02960ab1c5de36cf20b1a2f0fe9888d83826ad263da5db52f1b183b COPYING diff --git a/package/libsecret/libsecret.mk b/package/libsecret/libsecret.mk index 4d14c231d70..e98c66131e8 100644 --- a/package/libsecret/libsecret.mk +++ b/package/libsecret/libsecret.mk @@ -5,33 +5,45 @@ ################################################################################ LIBSECRET_VERSION_MAJOR = 0.20 -LIBSECRET_VERSION = $(LIBSECRET_VERSION_MAJOR).4 -LIBSECRET_SITE = http://ftp.gnome.org/pub/GNOME/sources/libsecret/$(LIBSECRET_VERSION_MAJOR) +LIBSECRET_VERSION = $(LIBSECRET_VERSION_MAJOR).5 +LIBSECRET_SITE = https://download.gnome.org/sources/libsecret/$(LIBSECRET_VERSION_MAJOR) LIBSECRET_SOURCE = libsecret-$(LIBSECRET_VERSION).tar.xz LIBSECRET_INSTALL_STAGING = YES LIBSECRET_DEPENDENCIES = libglib2 $(TARGET_NLS_DEPENDENCIES) -LIBSECRET_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) +LIBSECRET_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) LIBSECRET_CONF_OPTS = \ - --disable-manpages \ - --disable-strict \ - --disable-coverage \ - --enable-vala=no + -Dgtk_doc=false \ + -Dmanpage=false \ + -Dvapi=false LIBSECRET_LICENSE = LGPL-2.1+ LIBSECRET_LICENSE_FILES = COPYING +ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y) +LIBSECRET_CONF_OPTS += -Dbash_completion=enabled +LIBSECRET_DEPENDENCIES += bash-completion +else +LIBSECRET_CONF_OPTS += -Dbash_completion=disabled +endif + ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) -LIBSECRET_CONF_OPTS += --enable-introspection=yes +LIBSECRET_CONF_OPTS += -Dintrospection=true LIBSECRET_DEPENDENCIES += gobject-introspection else -LIBSECRET_CONF_OPTS += --enable-introspection=no +LIBSECRET_CONF_OPTS += -Dintrospection=false endif ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) LIBSECRET_DEPENDENCIES += libgcrypt -LIBSECRET_CONF_OPTS += --enable-gcrypt \ - --with-libgcrypt-prefix=$(STAGING_DIR)/usr +LIBSECRET_CONF_OPTS += -Dgcrypt=true +else +LIBSECRET_CONF_OPTS += -Dgcrypt=false +endif + +ifeq ($(BR2_PACKAGE_TPM2_TSS),y) +LIBSECRET_CONF_OPTS += -Dtpm2=true +LIBSECRET_DEPENDENCIES += tpm2-tss else -LIBSECRET_CONF_OPTS += --disable-gcrypt +LIBSECRET_CONF_OPTS += -Dtpm2=false endif -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/package/libselinux/Config.in b/package/libselinux/Config.in index 348757abce3..3098fe3ea45 100644 --- a/package/libselinux/Config.in +++ b/package/libselinux/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_LIBSELINUX depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libsepol select BR2_PACKAGE_LIBSEPOL - select BR2_PACKAGE_PCRE + select BR2_PACKAGE_PCRE2 select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC help libselinux is the runtime SELinux library that provides diff --git a/package/libselinux/libselinux.mk b/package/libselinux/libselinux.mk index 5790e79040f..db35da130f6 100644 --- a/package/libselinux/libselinux.mk +++ b/package/libselinux/libselinux.mk @@ -10,7 +10,8 @@ LIBSELINUX_LICENSE = Public Domain LIBSELINUX_LICENSE_FILES = LICENSE LIBSELINUX_CPE_ID_VENDOR = selinuxproject -LIBSELINUX_DEPENDENCIES = $(BR2_COREUTILS_HOST_DEPENDENCY) libsepol pcre +LIBSELINUX_DEPENDENCIES = \ + $(BR2_COREUTILS_HOST_DEPENDENCY) host-pkgconf libsepol pcre2 LIBSELINUX_INSTALL_STAGING = YES @@ -19,7 +20,8 @@ LIBSELINUX_INSTALL_STAGING = YES LIBSELINUX_MAKE_OPTS = \ $(TARGET_CONFIGURE_OPTS) \ ARCH=$(NORMALIZED_ARCH) \ - SHLIBDIR=/usr/lib + SHLIBDIR=/usr/lib \ + USE_PCRE2=y LIBSELINUX_MAKE_INSTALL_TARGETS = install @@ -52,8 +54,7 @@ endif # python3 # when the python binding is enabled. LIBSELINUX_MAKE_OPTS += \ CFLAGS="$(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CFLAGS))" \ - CPPFLAGS="$(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CPPFLAGS))" \ - LDFLAGS="$(TARGET_LDFLAGS) -lpcre -lpthread" + CPPFLAGS="$(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CPPFLAGS))" define LIBSELINUX_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ @@ -76,15 +77,15 @@ define LIBSELINUX_INSTALL_TARGET_CMDS endef HOST_LIBSELINUX_DEPENDENCIES = \ - host-libsepol host-pcre host-swig host-python3 + host-pkgconf host-libsepol host-pcre2 host-swig host-python3 HOST_LIBSELINUX_MAKE_OPTS = \ $(HOST_CONFIGURE_OPTS) \ PREFIX=$(HOST_DIR) \ SHLIBDIR=$(HOST_DIR)/lib \ - LDFLAGS="$(HOST_LDFLAGS) -lpcre -lpthread" \ $(HOST_PKG_PYTHON_DISTUTILS_ENV) \ - PYTHON=python$(PYTHON3_VERSION_MAJOR) + PYTHON=python$(PYTHON3_VERSION_MAJOR) \ + USE_PCRE2=y define HOST_LIBSELINUX_BUILD_CMDS $(HOST_MAKE_ENV) $(MAKE1) -C $(@D) \ diff --git a/package/libsepol/Config.in b/package/libsepol/Config.in index 7516076cd5c..5dfd1a41d33 100644 --- a/package/libsepol/Config.in +++ b/package/libsepol/Config.in @@ -18,7 +18,6 @@ config BR2_PACKAGE_LIBSEPOL_POLICY_VERSION default 30 if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_3 default 29 if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14 default 28 if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_5 - default 26 if BR2_TOOLCHAIN_HEADERS_AT_LEAST_2_6 default 25 help The maximum SELinux policy version your kernel supports. diff --git a/package/libserial/libserial.hash b/package/libserial/libserial.hash index 30005e39a9b..87744904f81 100644 --- a/package/libserial/libserial.hash +++ b/package/libserial/libserial.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 063142d6bfe08898316e9a6055f2ddeedef56de06f7cfc8dcdfecc6efabf4bdd libserial-1.0.0.tar.gz -sha256 c42fdfe17c192cfdb900e22d40ef246db1b473f99165e405eda62b41be27f4bf LICENSE.txt +sha256 063142d6bfe08898316e9a6055f2ddeedef56de06f7cfc8dcdfecc6efabf4bdd libserial-1.0.0.tar.gz +sha256 c42fdfe17c192cfdb900e22d40ef246db1b473f99165e405eda62b41be27f4bf LICENSE.txt diff --git a/package/libsha1/libsha1.hash b/package/libsha1/libsha1.hash index 5a2b0ed1381..e896a2f570b 100644 --- a/package/libsha1/libsha1.hash +++ b/package/libsha1/libsha1.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ef4c75007ac41c3dc09e0225943c789ba2b9c632a6cd7b548e0519477ac2f768 libsha1-0.3.tar.gz -sha256 4c387926596bfeacc5b72ebeb96ab36c299a07568e18592c727a6c11dd512c20 COPYING +sha256 ef4c75007ac41c3dc09e0225943c789ba2b9c632a6cd7b548e0519477ac2f768 libsha1-0.3.tar.gz +sha256 4c387926596bfeacc5b72ebeb96ab36c299a07568e18592c727a6c11dd512c20 COPYING diff --git a/package/libshout/0001-configure.ac-add-an-option-to-disable-tools.patch b/package/libshout/0001-configure.ac-add-an-option-to-disable-tools.patch deleted file mode 100644 index 5c20db72e9d..00000000000 --- a/package/libshout/0001-configure.ac-add-an-option-to-disable-tools.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 148b56bf894192cef6dd133715e295260b934a71 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 5 Mar 2021 15:50:32 +0100 -Subject: [PATCH] configure.ac: add an option to disable tools - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.xiph.org/xiph/icecast-libshout/-/issues/2331] ---- - Makefile.am | 5 ++++- - configure.ac | 5 +++++ - 2 files changed, 9 insertions(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index ea855cf..79241f1 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -3,10 +3,13 @@ - AUTOMAKE_OPTIONS = 1.6 foreign - ACLOCAL_AMFLAGS = -I m4 - --SUBDIRS = include src doc win32 tools -+SUBDIRS = include src doc win32 - if HAVE_EXAMPLES - SUBDIRS += examples - endif -+if HAVE_TOOLS -+SUBDIRS += tools -+endif - - EXTRA_DIST = INSTALL m4/shout.m4 m4/acx_pthread.m4 \ - m4/ogg.m4 m4/vorbis.m4 m4/xiph_compiler.m4 m4/xiph_net.m4 \ -diff --git a/configure.ac b/configure.ac -index 264b9b0..34f971c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -100,6 +100,11 @@ AC_ARG_ENABLE([examples], - AS_HELP_STRING([--disable-examples],[Do not build example code])) - AM_CONDITIONAL([HAVE_EXAMPLES],[test "${enable_examples}" != "no"]) - -+dnl Allow tools not to be build -+AC_ARG_ENABLE([tools], -+ AS_HELP_STRING([--disable-tools],[Do not build tools])) -+AM_CONDITIONAL([HAVE_TOOLS],[test "${enable_tools}" != "no"]) -+ - dnl Module checks - XIPH_NET - --- -2.30.0 - diff --git a/package/libshout/Config.in b/package/libshout/Config.in index f8749b9183d..6a7560b3492 100644 --- a/package/libshout/Config.in +++ b/package/libshout/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_LIBSHOUT bool "libshout" select BR2_PACKAGE_LIBOGG - select BR2_PACKAGE_LIBVORBIS help Libshout is a library for communicating with and sending data to an icecast server. It handles the socket connection, the diff --git a/package/libshout/libshout.hash b/package/libshout/libshout.hash index ae43e0a9c8b..d562b5231b0 100644 --- a/package/libshout/libshout.hash +++ b/package/libshout/libshout.hash @@ -1,8 +1,8 @@ # From https://ftp.osuosl.org/pub/xiph/releases/libshout/SHA512SUMS -sha512 290844185da16961f03434d3e341573dd6cb0139e5fa81902903021b641382d2629302d7c356bc591b35656754e07f4e44a8d9e782e092b17a051b9ae8f54341 libshout-2.4.5.tar.gz +sha512 e8478cdbf9a27674c16a7b620d1576f2e31a47262b8e29b314d0f46d4e5be24b9a29790b7b226f48939bc34cacf5734fae0aa5686c7ed5879cdbd827ff8e0339 libshout-2.4.6.tar.gz # From https://ftp.osuosl.org/pub/xiph/releases/libshout/SHA256SUMS -sha256 d9e568668a673994ebe3f1eb5f2bee06e3236a5db92b8d0c487e1c0f886a6890 libshout-2.4.5.tar.gz +sha256 39cbd4f0efdfddc9755d88217e47f8f2d7108fa767f9d58a2ba26a16d8f7c910 libshout-2.4.6.tar.gz # Hash for license file sha256 7a4436f9ec37603356791c87de3bc444989befd2682d29efb3d97604e04c1852 COPYING diff --git a/package/libshout/libshout.mk b/package/libshout/libshout.mk index 4afb762de6a..be637867959 100644 --- a/package/libshout/libshout.mk +++ b/package/libshout/libshout.mk @@ -4,14 +4,12 @@ # ################################################################################ -LIBSHOUT_VERSION = 2.4.5 +LIBSHOUT_VERSION = 2.4.6 LIBSHOUT_SITE = https://downloads.xiph.org/releases/libshout LIBSHOUT_LICENSE = LGPL-2.0+ LIBSHOUT_LICENSE_FILES = COPYING LIBSHOUT_INSTALL_STAGING = YES -LIBSHOUT_DEPENDENCIES = host-pkgconf libogg libvorbis -# We're patching configure.ac -LIBSHOUT_AUTORECONF = YES +LIBSHOUT_DEPENDENCIES = host-pkgconf libogg LIBSHOUT_CONF_OPTS = \ --disable-examples \ --disable-tools @@ -23,6 +21,13 @@ else LIBSHOUT_CONF_OPTS += --disable-theora endif +ifeq ($(BR2_PACKAGE_LIBVORBIS),y) +LIBSHOUT_CONF_OPTS += --enable-vorbis +LIBSHOUT_DEPENDENCIES += libvorbis +else +LIBSHOUT_CONF_OPTS += --disable-vorbis +endif + ifeq ($(BR2_PACKAGE_SPEEX),y) LIBSHOUT_CONF_OPTS += --enable-speex LIBSHOUT_DEPENDENCIES += speex diff --git a/package/libsidplay2/libsidplay2.hash b/package/libsidplay2/libsidplay2.hash index 5342135adfc..b6ba26d654e 100644 --- a/package/libsidplay2/libsidplay2.hash +++ b/package/libsidplay2/libsidplay2.hash @@ -1,4 +1,4 @@ # From http://sourceforge.net/projects/sidplay2/files/sidplay2/sidplay-libs-2.1.1/ -sha1 8af6350866edc30b0d331e075fa97292f6f645a5 sidplay-libs-2.1.1.tar.gz +sha1 8af6350866edc30b0d331e075fa97292f6f645a5 sidplay-libs-2.1.1.tar.gz # Locally computed sha256 b8a2f73f743dc1a51aff23f1aacbca4b868564db52496fa3c0caba755bfd1eaf libsidplay/COPYING diff --git a/package/libsigc/Config.in b/package/libsigc/Config.in index 428774a3ab0..4bea5965790 100644 --- a/package/libsigc/Config.in +++ b/package/libsigc/Config.in @@ -1,5 +1,5 @@ config BR2_PACKAGE_LIBSIGC - bool "libsigc++" + bool "libsigc++ (latest)" depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 depends on BR2_INSTALL_LIBSTDCPP help diff --git a/package/libsigc/libsigc.hash b/package/libsigc/libsigc.hash index 97c9d0cc841..6becfb19cee 100644 --- a/package/libsigc/libsigc.hash +++ b/package/libsigc/libsigc.hash @@ -1,5 +1,5 @@ -# From http://ftp.gnome.org/pub/gnome/sources/libsigc++/3.0/libsigc++-3.0.7.sha256sum -sha256 bfbe91c0d094ea6bbc6cbd3909b7d98c6561eea8b6d9c0c25add906a6e83d733 libsigc++-3.0.7.tar.xz +# From https://download.gnome.org/sources/libsigc++/3.4/libsigc++-3.4.0.sha256sum +sha256 02e2630ffb5ce93cd52c38423521dfe7063328863a6e96d41d765a6116b8707e libsigc++-3.4.0.tar.xz # Locally calculated sha256 97628afebc60f026f5c2b25d7491c46a5c4ee61f693e7cfa07fbd2c03605979b COPYING diff --git a/package/libsigc/libsigc.mk b/package/libsigc/libsigc.mk index 18be25fd030..c054575ea60 100644 --- a/package/libsigc/libsigc.mk +++ b/package/libsigc/libsigc.mk @@ -4,15 +4,16 @@ # ################################################################################ -LIBSIGC_VERSION_MAJOR = 3.0 -LIBSIGC_VERSION = $(LIBSIGC_VERSION_MAJOR).7 +LIBSIGC_VERSION_MAJOR = 3.4 +LIBSIGC_VERSION = $(LIBSIGC_VERSION_MAJOR).0 LIBSIGC_SOURCE = libsigc++-$(LIBSIGC_VERSION).tar.xz -LIBSIGC_SITE = http://ftp.gnome.org/pub/GNOME/sources/libsigc++/$(LIBSIGC_VERSION_MAJOR) +LIBSIGC_SITE = https://download.gnome.org/sources/libsigc++/$(LIBSIGC_VERSION_MAJOR) LIBSIGC_INSTALL_STAGING = YES LIBSIGC_LICENSE = LGPL-3.0+ LIBSIGC_LICENSE_FILES = COPYING LIBSIGC_CONF_OPTS = \ -Dbuild-examples=false \ + -Dbuild-tests=false \ -Dvalidation=false $(eval $(meson-package)) diff --git a/package/libsigc2/Config.in b/package/libsigc2/Config.in new file mode 100644 index 00000000000..e302e27af0c --- /dev/null +++ b/package/libsigc2/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_LIBSIGC2 + bool "libsigc++ (2.x.x)" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 + depends on BR2_INSTALL_LIBSTDCPP + help + libsigc++ implements a typesafe callback system for standard + C++. It allows you to define signals and to connect those + signals to any callback function, either global or a member + function, regardless of whether it is static or virtual. + + This is the last version before the API and ABI change + introduced in 3.0.0 which requires C++17. + + https://libsigcplusplus.github.io/libsigcplusplus/ + +comment "libsigc++ (2.x.x) needs a toolchain w/ C++, gcc >= 4.9" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/libsigc2/libsigc2.hash b/package/libsigc2/libsigc2.hash new file mode 100644 index 00000000000..48112135682 --- /dev/null +++ b/package/libsigc2/libsigc2.hash @@ -0,0 +1,5 @@ +# From https://download.gnome.org/sources/libsigc++/2.12/libsigc++-2.12.0.sha256sum +sha256 1c466d2e64b34f9b118976eb21b138c37ed124d0f61497df2a90ce6c3d9fa3b5 libsigc++-2.12.0.tar.xz + +# Locally calculated +sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING diff --git a/package/libsigc2/libsigc2.mk b/package/libsigc2/libsigc2.mk new file mode 100644 index 00000000000..845d03ba855 --- /dev/null +++ b/package/libsigc2/libsigc2.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# libsigc2 +# +################################################################################ + +LIBSIGC2_VERSION_MAJOR = 2.12 +LIBSIGC2_VERSION = $(LIBSIGC2_VERSION_MAJOR).0 +LIBSIGC2_SOURCE = libsigc++-$(LIBSIGC2_VERSION).tar.xz +LIBSIGC2_SITE = https://download.gnome.org/sources/libsigc++/$(LIBSIGC2_VERSION_MAJOR) +LIBSIGC2_INSTALL_STAGING = YES +LIBSIGC2_LICENSE = LGPL-2.1+ +LIBSIGC2_LICENSE_FILES = COPYING +LIBSIGC2_CONF_OPTS = \ + -Dbuild-examples=false \ + -Dbuild-tests=false \ + -Dvalidation=false + +$(eval $(meson-package)) diff --git a/package/libsigrok/libsigrok.hash b/package/libsigrok/libsigrok.hash index 0898a2fba00..0c47ef49d56 100644 --- a/package/libsigrok/libsigrok.hash +++ b/package/libsigrok/libsigrok.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4d341f90b6220d3e8cb251dacf726c41165285612248f2c52d15df4590a1ce3c libsigrok-0.5.2.tar.gz -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 4d341f90b6220d3e8cb251dacf726c41165285612248f2c52d15df4590a1ce3c libsigrok-0.5.2.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/libsigrokdecode/0003-configure-ac-Use-python3-embed-pc-as-a-fallback.patch b/package/libsigrokdecode/0003-configure-ac-Use-python3-embed-pc-as-a-fallback.patch new file mode 100644 index 00000000000..8e9c6f0063e --- /dev/null +++ b/package/libsigrokdecode/0003-configure-ac-Use-python3-embed-pc-as-a-fallback.patch @@ -0,0 +1,30 @@ +From a6a5e2c8b0e9ecf5d69d0c237c8e8b717b82b36f Mon Sep 17 00:00:00 2001 +From: Evangelos Foutras +Date: Thu, 3 Dec 2020 19:17:00 +0200 +Subject: [PATCH] configure.ac: Use python3-embed.pc as a fallback + +This provides some future-proofing against newer Python versions. + +[Retrieved from: +https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=commit;h=a6a5e2c8b0e9ecf5d69d0c237c8e8b717b82b36f] +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index b8841f8..c1314bb 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -100,7 +100,7 @@ SR_PKG_CHECK_SUMMARY([srd_pkglibs_summary]) + # first, since usually only that variant will add "-lpython3.8". + # https://docs.python.org/3/whatsnew/3.8.html#debug-build-uses-the-same-abi-as-release-build + SR_PKG_CHECK([python3], [SRD_PKGLIBS], +- [python-3.10-embed], [python-3.9-embed], [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2]) ++ [python-3.10-embed], [python-3.9-embed], [python-3.8-embed], [python3-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2]) + AS_IF([test "x$sr_have_python3" = xno], + [AC_MSG_ERROR([Cannot find Python 3 development headers.])]) + +-- +2.30.2 + diff --git a/package/libsigrokdecode/libsigrokdecode.hash b/package/libsigrokdecode/libsigrokdecode.hash index 44e03ad37a6..a00a662fac4 100644 --- a/package/libsigrokdecode/libsigrokdecode.hash +++ b/package/libsigrokdecode/libsigrokdecode.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c50814aa6743cd8c4e88c84a0cdd8889d883c3be122289be90c63d7d67883fc0 libsigrokdecode-0.5.3.tar.gz -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 c50814aa6743cd8c4e88c84a0cdd8889d883c3be122289be90c63d7d67883fc0 libsigrokdecode-0.5.3.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/libsigsegv/libsigsegv.hash b/package/libsigsegv/libsigsegv.hash index c827e6b8666..13978da3983 100644 --- a/package/libsigsegv/libsigsegv.hash +++ b/package/libsigsegv/libsigsegv.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/libsigsegv/libsigsegv-2.13.tar.gz.sig -sha256 be78ee4176b05f7c75ff03298d84874db90f4b6c9d5503f0da1226b3a3c48119 libsigsegv-2.13.tar.gz +# https://ftp.gnu.org/gnu/libsigsegv/libsigsegv-2.14.tar.gz.sig +sha256 cdac3941803364cf81a908499beb79c200ead60b6b5b40cad124fd1e06caa295 libsigsegv-2.14.tar.gz # Locally calculated sha256 8f2983e9a940367f48999881c14775db725ee643bce1e2f1ba195eb629a33cde COPYING diff --git a/package/libsigsegv/libsigsegv.mk b/package/libsigsegv/libsigsegv.mk index 87a5d7a124c..98bcd55c8cb 100644 --- a/package/libsigsegv/libsigsegv.mk +++ b/package/libsigsegv/libsigsegv.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSIGSEGV_VERSION = 2.13 +LIBSIGSEGV_VERSION = 2.14 LIBSIGSEGV_SITE = $(BR2_GNU_MIRROR)/libsigsegv LIBSIGSEGV_INSTALL_STAGING = YES LIBSIGSEGV_CONF_ENV = sv_cv_fault_posix=yes diff --git a/package/libsndfile/0001-ms_adpcm-Fix-and-extend-size-checks.patch b/package/libsndfile/0001-ms_adpcm-Fix-and-extend-size-checks.patch deleted file mode 100644 index edacbda01ab..00000000000 --- a/package/libsndfile/0001-ms_adpcm-Fix-and-extend-size-checks.patch +++ /dev/null @@ -1,40 +0,0 @@ -From deb669ee8be55a94565f6f8a6b60890c2e7c6f32 Mon Sep 17 00:00:00 2001 -From: bobsayshilol -Date: Thu, 18 Feb 2021 21:52:09 +0000 -Subject: [PATCH] ms_adpcm: Fix and extend size checks - -'blockalign' is the size of a block, and each block contains 7 samples -per channel as part of the preamble, so check against 'samplesperblock' -rather than 'blockalign'. Also add an additional check that the block -is big enough to hold the samples it claims to hold. - -https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=26803 -Signed-off-by: Peter Korsgaard ---- - src/ms_adpcm.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/src/ms_adpcm.c b/src/ms_adpcm.c -index 5e8f1a31..a21cb994 100644 ---- a/src/ms_adpcm.c -+++ b/src/ms_adpcm.c -@@ -128,8 +128,14 @@ wavlike_msadpcm_init (SF_PRIVATE *psf, int blockalign, int samplesperblock) - if (psf->file.mode == SFM_WRITE) - samplesperblock = 2 + 2 * (blockalign - 7 * psf->sf.channels) / psf->sf.channels ; - -- if (blockalign < 7 * psf->sf.channels) -- { psf_log_printf (psf, "*** Error blockalign (%d) should be > %d.\n", blockalign, 7 * psf->sf.channels) ; -+ /* There's 7 samples per channel in the preamble of each block */ -+ if (samplesperblock < 7 * psf->sf.channels) -+ { psf_log_printf (psf, "*** Error samplesperblock (%d) should be >= %d.\n", samplesperblock, 7 * psf->sf.channels) ; -+ return SFE_INTERNAL ; -+ } ; -+ -+ if (2 * blockalign < samplesperblock * psf->sf.channels) -+ { psf_log_printf (psf, "*** Error blockalign (%d) should be >= %d.\n", blockalign, samplesperblock * psf->sf.channels / 2) ; - return SFE_INTERNAL ; - } ; - --- -2.20.1 - diff --git a/package/libsndfile/libsndfile.hash b/package/libsndfile/libsndfile.hash index 14dfe823f96..be3ba41dc66 100644 --- a/package/libsndfile/libsndfile.hash +++ b/package/libsndfile/libsndfile.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 a8cfb1c09ea6e90eff4ca87322d4168cdbe5035cb48717b40bf77e751cc02163 libsndfile-1.0.31.tar.bz2 +sha256 0e30e7072f83dc84863e2e55f299175c7e04a5902ae79cfb99d4249ee8f6d60a libsndfile-1.2.0.tar.xz # Locally calculated sha256 ad01ea5cd2755f6048383c8d54c88459cd6fcb17757c5c8892f8c5ea060f6140 COPYING diff --git a/package/libsndfile/libsndfile.mk b/package/libsndfile/libsndfile.mk index ed9e8e3d149..d8d1725444f 100644 --- a/package/libsndfile/libsndfile.mk +++ b/package/libsndfile/libsndfile.mk @@ -4,19 +4,14 @@ # ################################################################################ -LIBSNDFILE_VERSION = 1.0.31 -LIBSNDFILE_SOURCE = libsndfile-$(LIBSNDFILE_VERSION).tar.bz2 +LIBSNDFILE_VERSION = 1.2.0 +LIBSNDFILE_SOURCE = libsndfile-$(LIBSNDFILE_VERSION).tar.xz LIBSNDFILE_SITE = https://github.com/libsndfile/libsndfile/releases/download/$(LIBSNDFILE_VERSION) LIBSNDFILE_INSTALL_STAGING = YES LIBSNDFILE_LICENSE = LGPL-2.1+ LIBSNDFILE_LICENSE_FILES = COPYING LIBSNDFILE_CPE_ID_VENDOR = libsndfile_project - -# 0001-ms_adpcm-Fix-and-extend-size-checks.patch -LIBSNDFILE_IGNORE_CVES += CVE-2021-3246 - -# disputed, https://github.com/erikd/libsndfile/issues/398 -LIBSNDFILE_IGNORE_CVES += CVE-2018-13419 +LIBSNDFILE_DEPENDENCIES = host-pkgconf LIBSNDFILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' LIBSNDFILE_CONF_OPTS = \ diff --git a/package/libsodium/libsodium.hash b/package/libsodium/libsodium.hash index bc7b02d64fe..37c1a620b6c 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 +sha256 6f504490b342a4f8a4c4a02fc9b866cbef8622d5df4e5452b46be121e46636c1 libsodium-1.0.18.tar.gz +sha256 dea1855c9809f3faf22aa4a1fba20ec8af5a5587f23115012e5b98279cedc4af LICENSE diff --git a/package/libsolv/0001-Fix-build-without-C.patch b/package/libsolv/0001-Fix-build-without-C.patch new file mode 100644 index 00000000000..2389aebcde1 --- /dev/null +++ b/package/libsolv/0001-Fix-build-without-C.patch @@ -0,0 +1,49 @@ +From 5691f58d1f8ce1332b02536e48f1ac5864629c6c Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 12 Feb 2023 15:27:27 +0100 +Subject: [PATCH] Fix build without C++ + +Fix the following build failure without C++: + +CMake Error at CMakeLists.txt:1 (PROJECT): + No CMAKE_CXX_COMPILER could be found. + + Tell CMake where to find the compiler by setting either the environment + variable "CXX" or the CMake cache entry CMAKE_CXX_COMPILER to the full path + to the compiler, or to the compiler name if it is in the PATH. + +Fixes: + - http://autobuild.buildroot.org/results/a7f2176d40f156c319754ef5d3b7fd0decfe754f + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/openSUSE/libsolv/pull/520] +--- + CMakeLists.txt | 2 +- + ext/CMakeLists.txt | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3541f496..f899c49a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-PROJECT (libsolv) ++PROJECT (libsolv C) + + CMAKE_MINIMUM_REQUIRED (VERSION 2.8.5) + +diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt +index f01c0238..589fa946 100644 +--- a/ext/CMakeLists.txt ++++ b/ext/CMakeLists.txt +@@ -103,6 +103,7 @@ IF (ENABLE_CUDFREPO) + ENDIF (ENABLE_CUDFREPO) + + IF (ENABLE_HAIKU) ++ enable_language(CXX) + SET (libsolvext_SRCS ${libsolvext_SRCS} + repo_haiku.cpp) + SET (libsolvext_HEADERS ${libsolvext_HEADERS} +-- +2.39.0 + diff --git a/package/libsolv/Config.in b/package/libsolv/Config.in new file mode 100644 index 00000000000..1415d2bc2b6 --- /dev/null +++ b/package/libsolv/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_LIBSOLV + bool "libsolv" + depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_ZLIB + help + A free package dependency solver using a satisfiability + algorithm. + + https://github.com/openSUSE/libsolv diff --git a/package/libsolv/libsolv.hash b/package/libsolv/libsolv.hash new file mode 100644 index 00000000000..162e46e54d9 --- /dev/null +++ b/package/libsolv/libsolv.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 968aef452b5493751fa0168cd58745a77c755e202a43fe8d549d791eb16034d5 libsolv-0.7.22.tar.gz +sha256 57f15acfb29fbef7749779e096a5885c60b716633e34484a21bb717554c0198f LICENSE.BSD diff --git a/package/libsolv/libsolv.mk b/package/libsolv/libsolv.mk new file mode 100644 index 00000000000..04fdb387fd9 --- /dev/null +++ b/package/libsolv/libsolv.mk @@ -0,0 +1,27 @@ +################################################################################ +# +# libsolv +# +################################################################################ + +LIBSOLV_VERSION = 0.7.22 +LIBSOLV_SITE = $(call github,openSUSE,libsolv,$(LIBSOLV_VERSION)) +LIBSOLV_LICENSE = BSD-3-Clause +LIBSOLV_LICENSE_FILES = LICENSE.BSD +LIBSOLV_CPE_ID_VENDOR = opensuse +LIBSOLV_INSTALL_STAGING = YES +LIBSOLV_DEPENDENCIES = zlib + +ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),y) +LIBSOLV_CONF_OPTS += -DENABLE_STATIC=ON +else +LIBSOLV_CONF_OPTS += -DENABLE_STATIC=OFF +endif + +ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y) +LIBSOLV_CONF_OPTS += -DDISABLE_SHARED=OFF +else +LIBSOLV_CONF_OPTS += -DDISABLE_SHARED=ON +endif + +$(eval $(cmake-package)) diff --git a/package/libsoup/libsoup.hash b/package/libsoup/libsoup.hash index 95c1c26eb48..2f44e63d713 100644 --- a/package/libsoup/libsoup.hash +++ b/package/libsoup/libsoup.hash @@ -1,4 +1,4 @@ -# From https://ftp.gnome.org/pub/GNOME/sources/libsoup/2.74/libsoup-2.74.0.sha256sum -sha256 33b1d4e0d639456c675c227877e94a8078d731233e2d57689c11abcef7d3c48e libsoup-2.74.0.tar.xz +# From https://download.gnome.org/sources/libsoup/2.74/libsoup-2.74.2.sha256sum +sha256 f0a427656e5fe19e1df71c107e88dfa1b2e673c25c547b7823b6018b40d01159 libsoup-2.74.2.tar.xz # Locally calculated sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libsoup/libsoup.mk b/package/libsoup/libsoup.mk index 1a26714992e..026ea3a8b7f 100644 --- a/package/libsoup/libsoup.mk +++ b/package/libsoup/libsoup.mk @@ -5,9 +5,9 @@ ################################################################################ LIBSOUP_VERSION_MAJOR = 2.74 -LIBSOUP_VERSION = $(LIBSOUP_VERSION_MAJOR).0 +LIBSOUP_VERSION = $(LIBSOUP_VERSION_MAJOR).2 LIBSOUP_SOURCE = libsoup-$(LIBSOUP_VERSION).tar.xz -LIBSOUP_SITE = http://ftp.gnome.org/pub/gnome/sources/libsoup/$(LIBSOUP_VERSION_MAJOR) +LIBSOUP_SITE = https://download.gnome.org/sources/libsoup/$(LIBSOUP_VERSION_MAJOR) LIBSOUP_LICENSE = LGPL-2.0+ LIBSOUP_LICENSE_FILES = COPYING LIBSOUP_CPE_ID_VENDOR = gnome diff --git a/package/libsquish/libsquish.hash b/package/libsquish/libsquish.hash index 06c96e977ba..e4229a90a9e 100644 --- a/package/libsquish/libsquish.hash +++ b/package/libsquish/libsquish.hash @@ -1,5 +1,5 @@ # From http://sourceforge.net/projects/libsquish/files -sha1 51844b9a8bc815a27e2cc0ffbede5fee3ef75110 libsquish-1.15.tgz -md5 c02645800131e55b519ff8dbe7284f93 libsquish-1.15.tgz +sha1 51844b9a8bc815a27e2cc0ffbede5fee3ef75110 libsquish-1.15.tgz +md5 c02645800131e55b519ff8dbe7284f93 libsquish-1.15.tgz # Locally calculated -sha256 a6b8c383bf3ab28460d6507484d605dd722e03971606f0cd3032a3af682b63a5 LICENSE.txt +sha256 a6b8c383bf3ab28460d6507484d605dd722e03971606f0cd3032a3af682b63a5 LICENSE.txt diff --git a/package/libsrtp/0001-Remove-compatibility-code-for-legacy-OpenSSL-to-fix-LibreSSL-build.patch b/package/libsrtp/0001-Remove-compatibility-code-for-legacy-OpenSSL-to-fix-LibreSSL-build.patch new file mode 100644 index 00000000000..68bfb085f70 --- /dev/null +++ b/package/libsrtp/0001-Remove-compatibility-code-for-legacy-OpenSSL-to-fix-LibreSSL-build.patch @@ -0,0 +1,86 @@ +From 16483b18a9980575bee23898b2dbfbe2a4675d84 Mon Sep 17 00:00:00 2001 +From: Klemens Nanni +Date: Sat, 15 Jan 2022 23:19:35 +0300 +Subject: [PATCH] Remove compatibility code for legacy OpenSSL to fix LibreSSL + build + +In current LibreSSL, `HMAC_CTX` aka. `struct hmac_ctx_st` is an opaque +structure as of LibreSSL hmac.h revision 1.15 (14.01.2022) [0], thus +`sizeof(HMAC_CTX)` fails to compile. + +The non-legacy code path should compile with LibreSSL versions as old +as 2.7.0 (21.03.2018). + +Found while building https://github.com/desktop-app/tg_owt which bundles +libsrtp 2.2.0 [1] on OpenBSD 7.0 -CURRENT/with latest LibreSSL. + +Suggestion to remove the legacy code from Theo Buehler, thanks. + +0: http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/lib/libcrypto/hmac/hmac.h?rev=1.15&content-type=text/x-cvsweb-markup +1: https://github.com/desktop-app/tg_owt/blob/6708e0d31a73e64fe12f54829bf4060c41b2658e/src/third_party/libsrtp/crypto/hash/hmac_ossl.c#L85 + +[Retrieved from: +https://github.com/cisco/libsrtp/commit/16483b18a9980575bee23898b2dbfbe2a4675d84] +Signed-off-by: Fabrice Fontaine +--- + crypto/hash/hmac_ossl.c | 29 ----------------------------- + 1 file changed, 29 deletions(-) + +diff --git a/crypto/hash/hmac_ossl.c b/crypto/hash/hmac_ossl.c +index ee6b0b58..c23c7f21 100644 +--- a/crypto/hash/hmac_ossl.c ++++ b/crypto/hash/hmac_ossl.c +@@ -78,26 +78,6 @@ static srtp_err_status_t srtp_hmac_alloc(srtp_auth_t **a, + return srtp_err_status_bad_param; + } + +-/* OpenSSL 1.1.0 made HMAC_CTX an opaque structure, which must be allocated +- using HMAC_CTX_new. But this function doesn't exist in OpenSSL 1.0.x. */ +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER +- { +- /* allocate memory for auth and HMAC_CTX structures */ +- uint8_t *pointer; +- HMAC_CTX *new_hmac_ctx; +- pointer = (uint8_t *)srtp_crypto_alloc(sizeof(HMAC_CTX) + +- sizeof(srtp_auth_t)); +- if (pointer == NULL) { +- return srtp_err_status_alloc_fail; +- } +- *a = (srtp_auth_t *)pointer; +- (*a)->state = pointer + sizeof(srtp_auth_t); +- new_hmac_ctx = (HMAC_CTX *)((*a)->state); +- +- HMAC_CTX_init(new_hmac_ctx); +- } +- +-#else + *a = (srtp_auth_t *)srtp_crypto_alloc(sizeof(srtp_auth_t)); + if (*a == NULL) { + return srtp_err_status_alloc_fail; +@@ -109,7 +89,6 @@ static srtp_err_status_t srtp_hmac_alloc(srtp_auth_t **a, + *a = NULL; + return srtp_err_status_alloc_fail; + } +-#endif + + /* set pointers */ + (*a)->type = &srtp_hmac; +@@ -126,18 +105,10 @@ static srtp_err_status_t srtp_hmac_dealloc(srtp_auth_t *a) + + hmac_ctx = (HMAC_CTX *)a->state; + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER +- HMAC_CTX_cleanup(hmac_ctx); +- +- /* zeroize entire state*/ +- octet_string_set_to_zero(a, sizeof(HMAC_CTX) + sizeof(srtp_auth_t)); +- +-#else + HMAC_CTX_free(hmac_ctx); + + /* zeroize entire state*/ + octet_string_set_to_zero(a, sizeof(srtp_auth_t)); +-#endif + + /* free memory */ + srtp_crypto_free(a); diff --git a/package/libsrtp/libsrtp.mk b/package/libsrtp/libsrtp.mk index f2ba600dd68..e7a771c6b20 100644 --- a/package/libsrtp/libsrtp.mk +++ b/package/libsrtp/libsrtp.mk @@ -21,8 +21,7 @@ endif LIBSRTP_DEPENDENCIES = host-pkgconf -# openssl handling needs libdl support -ifeq ($(BR2_PACKAGE_OPENSSL)x$(BR2_STATIC_LIBS),yx) +ifeq ($(BR2_PACKAGE_OPENSSL),y) LIBSRTP_DEPENDENCIES += openssl LIBSRTP_CONF_OPTS += --disable-nss --enable-openssl else ifeq ($(BR2_PACKAGE_LIBNSS),y) diff --git a/package/libss7/libss7.hash b/package/libss7/libss7.hash index 8e1d6635db9..442422fcd98 100644 --- a/package/libss7/libss7.hash +++ b/package/libss7/libss7.hash @@ -1,6 +1,6 @@ # Hashes from http://downloads.asterisk.org/pub/telephony/libss7/releases/ -sha1 7112a0717293fc273d5d488e1387ad28abe4e9b3 libss7-2.0.0.tar.gz -sha256 5af00853cfb2bc6bcf050947804db132ae6872db0cd2ab24b5378828f78eda52 libss7-2.0.0.tar.gz +sha1 301fd3eff4387db6407cbc72c3fec9aed5bc3860 libss7-2.0.1.tar.gz +sha256 091f1c14dcf13a094021334218cde363041816fa5b5037caee38719e4e6891c7 libss7-2.0.1.tar.gz # License file, locally calculated sha256 fa5fc1d1eec39532ea517518eeefd7b6e3c14341a55e5880a0e2a49eee47a5b7 LICENSE diff --git a/package/libss7/libss7.mk b/package/libss7/libss7.mk index 151b6a61b51..faa147c78e5 100644 --- a/package/libss7/libss7.mk +++ b/package/libss7/libss7.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSS7_VERSION = 2.0.0 +LIBSS7_VERSION = 2.0.1 LIBSS7_SITE = http://downloads.asterisk.org/pub/telephony/libss7/releases LIBSS7_LICENSE = GPL-2.0 diff --git a/package/libssh/libssh.hash b/package/libssh/libssh.hash index 4dbab113748..0d611918421 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.9/libssh-0.9.6.tar.xz.asc +# https://www.libssh.org/files/0.10/libssh-0.10.5.tar.xz.asc # with key 8DFF53E18F2ABC8D8F3C92237EE0FC4DCC014E3D -sha256 86bcf885bd9b80466fe0e05453c58b877df61afa8ba947a58c356d7f0fab829b libssh-0.9.6.tar.xz +sha256 b60e2ff7f367b9eee2b5634d3a63303ddfede0e6a18dfca88c44a8770e7e4234 libssh-0.10.5.tar.xz sha256 1656186e951db1c010a8485481fa94587f7e53a26d24976bef97945ad0c4df5a COPYING diff --git a/package/libssh/libssh.mk b/package/libssh/libssh.mk index 4cadf83aeed..ff4cddaf91d 100644 --- a/package/libssh/libssh.mk +++ b/package/libssh/libssh.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBSSH_VERSION_MAJOR = 0.9 -LIBSSH_VERSION = $(LIBSSH_VERSION_MAJOR).6 +LIBSSH_VERSION_MAJOR = 0.10 +LIBSSH_VERSION = $(LIBSSH_VERSION_MAJOR).5 LIBSSH_SOURCE = libssh-$(LIBSSH_VERSION).tar.xz LIBSSH_SITE = https://www.libssh.org/files/$(LIBSSH_VERSION_MAJOR) LIBSSH_LICENSE = LGPL-2.1 @@ -17,6 +17,14 @@ 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 + +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +LIBSSH_CONF_OPTS += -DWITH_STACK_CLASH_PROTECTION=OFF +endif + ifeq ($(BR2_PACKAGE_LIBSSH_SERVER),y) LIBSSH_CONF_OPTS += -DWITH_SERVER=ON else diff --git a/package/libssh2/0001-Opaque-structs-in-LibreSSL-3-5.patch b/package/libssh2/0001-Opaque-structs-in-LibreSSL-3-5.patch new file mode 100644 index 00000000000..2e1fd8871c8 --- /dev/null +++ b/package/libssh2/0001-Opaque-structs-in-LibreSSL-3-5.patch @@ -0,0 +1,27 @@ +From 7f55a033e5054529e5e69f06725dd02a573329b6 Mon Sep 17 00:00:00 2001 +From: Charlie Li +Date: Wed, 2 Mar 2022 19:50:56 -0500 +Subject: [PATCH] Opaque structs in LibreSSL 3.5 + +[Retrieved (and backported) from: +https://github.com/libssh2/libssh2/pull/682/commits/7f55a033e5054529e5e69f06725dd02a573329b6] +Signed-off-by: Fabrice Fontaine +--- + src/openssl.h | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/openssl.h b/src/openssl.h +index 3eef02368..c13542481 100644 +--- a/src/openssl.h ++++ b/src/openssl.h +@@ -94,8 +94,8 @@ + #include + #include + +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \ +- !defined(LIBRESSL_VERSION_NUMBER) ++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x30500000L) + # define HAVE_OPAQUE_STRUCTS 1 + #endif + diff --git a/package/libstrophe/libstrophe.hash b/package/libstrophe/libstrophe.hash index 9551b191c6f..3ccba06202d 100644 --- a/package/libstrophe/libstrophe.hash +++ b/package/libstrophe/libstrophe.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 feafee545403d26a44aa573d4adf327d6d07ad3f3466370634d22bbac5bd49ee libstrophe-0.11.0.tar.xz +sha256 b3c79b6deeafafc0f622ba3ee3ca67e9a8e7d75edb102588c6b6f52b38c9fa4b libstrophe-0.12.2.tar.xz sha256 82476f36ffd5e895a176013c0812166ba7b7d99f3d536fc7f5ed2e33e9f74a08 MIT-LICENSE.txt sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 GPL-LICENSE.txt diff --git a/package/libstrophe/libstrophe.mk b/package/libstrophe/libstrophe.mk index 04ba0a69d0e..43d55592fa6 100644 --- a/package/libstrophe/libstrophe.mk +++ b/package/libstrophe/libstrophe.mk @@ -4,13 +4,14 @@ # ################################################################################ -LIBSTROPHE_VERSION = 0.11.0 +LIBSTROPHE_VERSION = 0.12.2 LIBSTROPHE_SOURCE = libstrophe-$(LIBSTROPHE_VERSION).tar.xz LIBSTROPHE_SITE = https://github.com/strophe/libstrophe/releases/download/$(LIBSTROPHE_VERSION) LIBSTROPHE_DEPENDENCIES = host-pkgconf LIBSTROPHE_LICENSE = MIT or GPL-3.0 LIBSTROPHE_LICENSE_FILES = MIT-LICENSE.txt GPL-LICENSE.txt LIBSTROPHE_INSTALL_STAGING = YES +LIBSTROPHE_CONF_OPTS = --disable-examples ifeq ($(BR2_PACKAGE_EXPAT),y) LIBSTROPHE_CONF_OPTS += --without-libxml2 diff --git a/package/libsvg-cairo/libsvg-cairo.hash b/package/libsvg-cairo/libsvg-cairo.hash index 7240ee57b14..d9cfbffa7a9 100644 --- a/package/libsvg-cairo/libsvg-cairo.hash +++ b/package/libsvg-cairo/libsvg-cairo.hash @@ -1,5 +1,5 @@ # From http://cairographics.org/snapshots/libsvg-cairo-0.1.6.tar.gz.md5 -md5 d79da7b3a60ad8c8e4b902c9b3563047 libsvg-cairo-0.1.6.tar.gz +md5 d79da7b3a60ad8c8e4b902c9b3563047 libsvg-cairo-0.1.6.tar.gz # Locally calculated sha256 a380be6a78ec2938100ce904363815a94068fca372c666b8cc82aa8711a0215c libsvg-cairo-0.1.6.tar.gz diff --git a/package/libsvg/libsvg.hash b/package/libsvg/libsvg.hash index c314c58015c..4a9d42a6518 100644 --- a/package/libsvg/libsvg.hash +++ b/package/libsvg/libsvg.hash @@ -1,5 +1,5 @@ # From http://cairographics.org/snapshots/libsvg-0.1.4.tar.gz.md5 -md5 ce0715e3013f78506795fba16e8455d3 libsvg-0.1.4.tar.gz +md5 ce0715e3013f78506795fba16e8455d3 libsvg-0.1.4.tar.gz # Locally calculated sha256 4c3bf9292e676a72b12338691be64d0f38cd7f2ea5e8b67fbbf45f1ed404bc8f libsvg-0.1.4.tar.gz diff --git a/package/libtalloc/0001-buildtools-wafsamba-add-disable-stack-protector-opti.patch b/package/libtalloc/0001-buildtools-wafsamba-add-disable-stack-protector-opti.patch new file mode 100644 index 00000000000..839479a3fa4 --- /dev/null +++ b/package/libtalloc/0001-buildtools-wafsamba-add-disable-stack-protector-opti.patch @@ -0,0 +1,116 @@ +From 5885ed8e6db7648e6842d9811aace7edc4e8aba7 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 20 Apr 2022 11:16:52 +0200 +Subject: [PATCH] buildtools/wafsamba: add --disable-stack-protector option + +Allow the user to disable stack-protector through +--disable-stack-protector to avoid the following build failure with +libtalloc on embedded toolchains which don't support stack-protector: + +/home/autobuild/autobuild/instance-5/output-1/host/lib/gcc/i686-buildroot-linux-musl/9.4.0/../../../../i686-buildroot-linux-musl/bin/ld: talloc.c.5.o: in function `_vasprintf_tc': +talloc.c:(.text+0x427d): undefined reference to `__stack_chk_fail_local' + +This build failure is raised since +https://gitlab.com/ffontaine/samba/-/commit/38e97f8b52e85bdfcf2d74a4fb3c848fa46ba371 +because stack-protector is enabled on libtalloc despite the fact that +libssp is not available: + +Checking if compiler accepts -fstack-protector-strong : yes + +Fixes: + - http://autobuild.buildroot.org/results/e221bde25c7622db99761d0adcd56663296beb15 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://gitlab.com/samba-team/samba/-/merge_requests/2493] +--- + buildtools/wafsamba/samba_autoconf.py | 49 ++++++++++++++------------- + buildtools/wafsamba/wscript | 3 ++ + 2 files changed, 28 insertions(+), 24 deletions(-) + +diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py +index 78927d85193..23a995e1c34 100644 +--- a/buildtools/wafsamba/samba_autoconf.py ++++ b/buildtools/wafsamba/samba_autoconf.py +@@ -703,9 +703,28 @@ def SAMBA_CONFIG_H(conf, path=None): + if not IN_LAUNCH_DIR(conf): + return + +- # we need to build real code that can't be optimized away to test +- stack_protect_list = ['-fstack-protector-strong', '-fstack-protector'] +- for stack_protect_flag in stack_protect_list: ++ if not Options.options.disable_stack_protector: ++ # we need to build real code that can't be optimized away to test ++ stack_protect_list = ['-fstack-protector-strong', '-fstack-protector'] ++ for stack_protect_flag in stack_protect_list: ++ flag_supported = conf.check(fragment=''' ++ #include ++ ++ int main(void) ++ { ++ char t[100000]; ++ while (fgets(t, sizeof(t), stdin)); ++ return 0; ++ } ++ ''', ++ execute=0, ++ cflags=[ '-Werror', '-Wp,-D_FORTIFY_SOURCE=2', stack_protect_flag], ++ mandatory=False, ++ msg='Checking if compiler accepts %s' % (stack_protect_flag)) ++ if flag_supported: ++ conf.ADD_CFLAGS('%s' % (stack_protect_flag)) ++ break ++ + flag_supported = conf.check(fragment=''' + #include + +@@ -717,29 +736,11 @@ def SAMBA_CONFIG_H(conf, path=None): + } + ''', + execute=0, +- cflags=[ '-Werror', '-Wp,-D_FORTIFY_SOURCE=2', stack_protect_flag], ++ cflags=[ '-Werror', '-fstack-clash-protection'], + mandatory=False, +- msg='Checking if compiler accepts %s' % (stack_protect_flag)) ++ msg='Checking if compiler accepts -fstack-clash-protection') + if flag_supported: +- conf.ADD_CFLAGS('%s' % (stack_protect_flag)) +- break +- +- flag_supported = conf.check(fragment=''' +- #include +- +- int main(void) +- { +- char t[100000]; +- while (fgets(t, sizeof(t), stdin)); +- return 0; +- } +- ''', +- execute=0, +- cflags=[ '-Werror', '-fstack-clash-protection'], +- mandatory=False, +- msg='Checking if compiler accepts -fstack-clash-protection') +- if flag_supported: +- conf.ADD_CFLAGS('-fstack-clash-protection') ++ conf.ADD_CFLAGS('-fstack-clash-protection') + + if Options.options.debug: + conf.ADD_CFLAGS('-g', testflags=True) +diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript +index 8729b0829da..d75bb3b1c0c 100644 +--- a/buildtools/wafsamba/wscript ++++ b/buildtools/wafsamba/wscript +@@ -165,6 +165,9 @@ Currently the only tested value is 'smbtorture,smbd/smbd' for Samba'''), + gr.add_option('--disable-warnings-as-errors', + help=("Do not treat all warnings as errors (disable -Werror)"), + action="store_true", dest='disable_warnings_as_errors', default=False) ++ gr.add_option('--disable-stack-protector', ++ help=("Disable stack-protector"), ++ action="store_true", dest='disable_stack_protector', default=False) + opt.add_option('--enable-coverage', + help=("enable options necessary for code coverage " + "reporting on selftest (default=no)"), +-- +2.35.1 + diff --git a/package/libtalloc/libtalloc.hash b/package/libtalloc/libtalloc.hash index cbfd11e63b2..0bc8edb6951 100644 --- a/package/libtalloc/libtalloc.hash +++ b/package/libtalloc/libtalloc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6be95b2368bd0af1c4cd7a88146eb6ceea18e46c3ffc9330bf6262b40d1d8aaa talloc-2.3.3.tar.gz +sha256 179f9ebe265e67e4ab2c26cad2b7de4b6a77c6c212f966903382869f06be6505 talloc-2.3.4.tar.gz sha256 f8340c449dd64a55c6605b02fcad2aec6f473612ac6026739a22995380a8043c talloc.h diff --git a/package/libtalloc/libtalloc.mk b/package/libtalloc/libtalloc.mk index 79bcf949473..ca15180d22d 100644 --- a/package/libtalloc/libtalloc.mk +++ b/package/libtalloc/libtalloc.mk @@ -4,13 +4,19 @@ # ################################################################################ -LIBTALLOC_VERSION = 2.3.3 +LIBTALLOC_VERSION = 2.3.4 LIBTALLOC_SOURCE = talloc-$(LIBTALLOC_VERSION).tar.gz LIBTALLOC_SITE = https://www.samba.org/ftp/talloc LIBTALLOC_LICENSE = LGPL-3.0+ LIBTALLOC_LICENSE_FILES = talloc.h LIBTALLOC_INSTALL_STAGING = YES +# libtalloc is extracted from the samba source tree, and that has a workaround +# that requires PYTHONHASHSEED to be set, and to be set to 1. +# See https://gitlab.com/samba-team/samba/-/commit/420bbb1d92fd2a28725b53f425ba3d214831b660 +LIBTALLOC_CONF_ENV = PYTHONHASHSEED=1 +LIBTALLOC_MAKE_ENV = PYTHONHASHSEED=1 + # --with-libiconv= is unconditionally passed, even if libiconv is not # present. Indeed, waf will search for libiconv by default in # /usr/local. Because of a bug in some waf python script, /usr/local @@ -20,12 +26,11 @@ LIBTALLOC_INSTALL_STAGING = YES # libtalloc since it's optional. LIBTALLOC_CONF_OPTS += --cross-compile \ --cross-answers=$(@D)/cache.txt \ + --disable-stack-protector \ --hostcc=gcc \ --with-libiconv=$(STAGING_DIR)/usr ifeq ($(BR2_PACKAGE_LIBTIRPC),y) -LIBTALLOC_CFLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags libtirpc` -LIBTALLOC_LDFLAGS += `$(PKG_CONFIG_HOST_BINARY) --libs libtirpc` LIBTALLOC_DEPENDENCIES += libtirpc host-pkgconf endif diff --git a/package/libtasn1/0001-fuzz-Makefile.am-do-not-force-static.patch b/package/libtasn1/0001-fuzz-Makefile.am-do-not-force-static.patch deleted file mode 100644 index 1f1abc7d9db..00000000000 --- a/package/libtasn1/0001-fuzz-Makefile.am-do-not-force-static.patch +++ /dev/null @@ -1,35 +0,0 @@ -From cf1b20f3d881a1cfbf8cae1f615f45a5a4fbb3b4 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 22 Apr 2020 18:35:55 +0200 -Subject: [PATCH] fuzz/Makefile.am: do not force static - -Don't force static when linking corpus2arry to libtasn1 otherwise the -build will fail if libtasn1 has been built only as a shared library: - - CCLD corpus2array -/home/fabrice/buildroot/output/host/lib/gcc/arm-buildroot-linux-musleabihf/8.4.0/../../../../arm-buildroot-linux-musleabihf/bin/ld: attempted static link of dynamic object `../lib/.libs/libtasn1.so' -collect2: error: ld returned 1 exit status - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.com/gnutls/libtasn1/-/merge_requests/61] ---- - fuzz/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/fuzz/Makefile.am b/fuzz/Makefile.am -index c6310d1..1fb7152 100644 ---- a/fuzz/Makefile.am -+++ b/fuzz/Makefile.am -@@ -26,7 +26,7 @@ AM_CFLAGS = $(WERROR_CFLAGS) $(WARN_CFLAGS) $(CODE_COVERAGE_CFLAGS) - AM_CPPFLAGS = -I$(top_builddir)/lib/includes -I$(top_srcdir)/lib/includes -I$(srcdir) \ - -I$(top_builddir)/lib/gl -I$(top_srcdir)/lib/gl -DSRCDIR=\"$(abs_srcdir)\" \ - $(CODE_COVERAGE_CPPFLAGS) --AM_LDFLAGS = -no-install -static -+AM_LDFLAGS = -no-install - - LDADD = ../lib/gl/libgnu.la ../lib/libtasn1.la $(FUZZ_LIBS) $(CODE_COVERAGE_LIBS) - --- -2.25.1 - diff --git a/package/libtasn1/libtasn1.hash b/package/libtasn1/libtasn1.hash index fa39dd2c739..4bcb6a3feb1 100644 --- a/package/libtasn1/libtasn1.hash +++ b/package/libtasn1/libtasn1.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/libtasn1/libtasn1-4.18.0.tar.gz.sig -sha256 4365c154953563d64c67a024b607d1ee75c6db76e0d0f65709ea80a334cd1898 libtasn1-4.18.0.tar.gz +# https://ftp.gnu.org/gnu/libtasn1/libtasn1-4.19.0.tar.gz.sig +sha256 1613f0ac1cf484d6ec0ce3b8c06d56263cc7242f1c23b30d82d23de345a63f7a libtasn1-4.19.0.tar.gz # Locally calculated sha256 7446831f659f7ebfd8d497acc7f05dfa8e31c6cb6ba1b45df33d4895ab80f5a6 COPYING sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 doc/COPYING diff --git a/package/libtasn1/libtasn1.mk b/package/libtasn1/libtasn1.mk index ba86081df91..3af1bcdcbb2 100644 --- a/package/libtasn1/libtasn1.mk +++ b/package/libtasn1/libtasn1.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBTASN1_VERSION = 4.18.0 +LIBTASN1_VERSION = 4.19.0 LIBTASN1_SITE = $(BR2_GNU_MIRROR)/libtasn1 LIBTASN1_DEPENDENCIES = host-bison host-pkgconf LIBTASN1_LICENSE = GPL-3.0+ (tests, tools), LGPL-2.1+ (library) @@ -12,9 +12,6 @@ LIBTASN1_LICENSE_FILES = COPYING doc/COPYING doc/COPYING.LESSER LIBTASN1_CPE_ID_VENDOR = gnu LIBTASN1_INSTALL_STAGING = YES -# We're patching fuzz/Makefile.am -LIBTASN1_AUTORECONF = YES - # 'missing' fallback logic botched so disable it completely LIBTASN1_CONF_ENV = MAKEINFO="true" @@ -29,3 +26,4 @@ endef LIBTASN1_POST_INSTALL_TARGET_HOOKS += LIBTASN1_REMOVE_PROGS $(eval $(autotools-package)) +$(eval $(host-autotools-package)) diff --git a/package/libtelnet/libtelnet.hash b/package/libtelnet/libtelnet.hash index afbb29e4fb9..e64cc5fa1a6 100644 --- a/package/libtelnet/libtelnet.hash +++ b/package/libtelnet/libtelnet.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d2f01a9dc0cc01777844b6d27f0f836dad9a4b9a32a31c7bbde0762480262f25 libtelnet-0.23.tar.gz -sha256 b1faf309467bc1d0aab9b42d6e86a614e78f8fe3580e289966b5b9f9a8f94d99 COPYING +sha256 d2f01a9dc0cc01777844b6d27f0f836dad9a4b9a32a31c7bbde0762480262f25 libtelnet-0.23.tar.gz +sha256 b1faf309467bc1d0aab9b42d6e86a614e78f8fe3580e289966b5b9f9a8f94d99 COPYING diff --git a/package/libtheora/libtheora.hash b/package/libtheora/libtheora.hash index 45376ddaa48..42ffa05045b 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 f36da409947aa2b3dcc6af0a8c2e3144bc19db2ed547d64e9171c59c66561c61 libtheora-1.1.1.tar.xz # Locally calculated -sha256 8417fad7da775735564e209484a2e011e0fa201e94f01fdbee6e4977e478e6fc COPYING -sha256 654a0238f789f4435c4818f50005b141d013c5a09a31d861efc1d0d67ba975a4 LICENSE +sha256 8417fad7da775735564e209484a2e011e0fa201e94f01fdbee6e4977e478e6fc COPYING +sha256 654a0238f789f4435c4818f50005b141d013c5a09a31d861efc1d0d67ba975a4 LICENSE diff --git a/package/libtirpc/libtirpc.hash b/package/libtirpc/libtirpc.hash index 56c1d9de3fa..1efc3e47e2b 100644 --- a/package/libtirpc/libtirpc.hash +++ b/package/libtirpc/libtirpc.hash @@ -1,5 +1,5 @@ # From sourceforge's info on download page: -sha1 51d75be0e5acc094a888f40042b23e128d163cb5 libtirpc-1.3.2.tar.bz2 +sha1 6e52c39148494e4836e2d5d4f28b11ddfa65394b libtirpc-1.3.3.tar.bz2 # Locally computed -sha256 e24eb88b8ce7db3b7ca6eb80115dd1284abc5ec32a8deccfed2224fc2532b9fd libtirpc-1.3.2.tar.bz2 +sha256 6474e98851d9f6f33871957ddee9714fdcd9d8a5ee9abb5a98d63ea2e60e12f3 libtirpc-1.3.3.tar.bz2 sha256 17cf6098f95bdbb269f0bbc68e76c88fe20487ca7ec53f454923ab4256ecd2e7 COPYING diff --git a/package/libtirpc/libtirpc.mk b/package/libtirpc/libtirpc.mk index 9d3c4b5a949..179adc97d00 100644 --- a/package/libtirpc/libtirpc.mk +++ b/package/libtirpc/libtirpc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBTIRPC_VERSION = 1.3.2 +LIBTIRPC_VERSION = 1.3.3 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/libtommath/0001-Build-test-bn_mp_set_double-c-on-more-platforms.patch b/package/libtommath/0001-Build-test-bn_mp_set_double-c-on-more-platforms.patch index c25002ba704..1cf411b3913 100644 --- a/package/libtommath/0001-Build-test-bn_mp_set_double-c-on-more-platforms.patch +++ b/package/libtommath/0001-Build-test-bn_mp_set_double-c-on-more-platforms.patch @@ -20,7 +20,7 @@ diff --git a/demo/test.c b/demo/test.c index 998f14b3..f719709d 100644 --- a/demo/test.c +++ b/demo/test.c -@@ -522,7 +522,7 @@ static int test_mp_invmod(void) +@@ -625,7 +625,7 @@ static int test_mp_invmod(void) } diff --git a/package/libtommath/libtommath.hash b/package/libtommath/libtommath.hash index fa1af5ec28b..4f5dd40231a 100644 --- a/package/libtommath/libtommath.hash +++ b/package/libtommath/libtommath.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 b7c75eecf680219484055fcedd686064409254ae44bc31a96c5032843c0e18b1 ltm-1.2.0.tar.xz +sha256 986025d7b374276fee2e30e99f3649e4ac0db8a02257a37ee10eae72abed0d1f ltm-1.2.1.tar.xz # Hashes for license files: -sha256 2fa64b163659f41965c9815882a8296d3d03ff546b76153e11445f9bdecf955a LICENSE +sha256 2fa64b163659f41965c9815882a8296d3d03ff546b76153e11445f9bdecf955a LICENSE diff --git a/package/libtommath/libtommath.mk b/package/libtommath/libtommath.mk index bd3957d6c25..25d4e836bbd 100644 --- a/package/libtommath/libtommath.mk +++ b/package/libtommath/libtommath.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBTOMMATH_VERSION = 1.2.0 +LIBTOMMATH_VERSION = 1.2.1 LIBTOMMATH_SITE = https://github.com/libtom/libtommath/releases/download/v$(LIBTOMMATH_VERSION) LIBTOMMATH_SOURCE = ltm-$(LIBTOMMATH_VERSION).tar.xz LIBTOMMATH_LICENSE = Unlicense diff --git a/package/libtool/libtool.hash b/package/libtool/libtool.hash index e2adfa1897c..8deaf4fbf68 100644 --- a/package/libtool/libtool.hash +++ b/package/libtool/libtool.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 7c87a8c2c8c0fc9cd5019e402bed4292462d00a718a7cd5f11218153bf28b26f libtool-2.4.6.tar.xz +sha256 7c87a8c2c8c0fc9cd5019e402bed4292462d00a718a7cd5f11218153bf28b26f libtool-2.4.6.tar.xz # License files, locally calculated -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 libltdl/COPYING.LIB +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 libltdl/COPYING.LIB diff --git a/package/libtorrent-rasterbar/Config.in b/package/libtorrent-rasterbar/Config.in index fe9a9fc027c..459edc1be5c 100644 --- a/package/libtorrent-rasterbar/Config.in +++ b/package/libtorrent-rasterbar/Config.in @@ -18,7 +18,6 @@ config BR2_PACKAGE_LIBTORRENT_RASTERBAR depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr select BR2_PACKAGE_BOOST select BR2_PACKAGE_BOOST_SYSTEM - select BR2_PACKAGE_OPENSSL help libtorrent is a feature complete C++ bittorrent implementation focusing on efficiency and scalability. diff --git a/package/libtorrent-rasterbar/libtorrent-rasterbar.mk b/package/libtorrent-rasterbar/libtorrent-rasterbar.mk index 914e0cbca34..085b38343c4 100644 --- a/package/libtorrent-rasterbar/libtorrent-rasterbar.mk +++ b/package/libtorrent-rasterbar/libtorrent-rasterbar.mk @@ -11,7 +11,7 @@ LIBTORRENT_RASTERBAR_LICENSE = BSD-3-Clause LIBTORRENT_RASTERBAR_LICENSE_FILES = COPYING LIBTORRENT_RASTERBAR_CPE_ID_VENDOR = libtorrent LIBTORRENT_RASTERBAR_CPE_ID_PRODUCT = libtorrent -LIBTORRENT_RASTERBAR_DEPENDENCIES = host-pkgconf boost openssl +LIBTORRENT_RASTERBAR_DEPENDENCIES = host-pkgconf boost LIBTORRENT_RASTERBAR_INSTALL_STAGING = YES LIBTORRENT_RASTERBAR_CONF_OPTS = \ --with-boost-libdir=$(STAGING_DIR)/usr/lib \ @@ -37,4 +37,11 @@ else LIBTORRENT_RASTERBAR_CONF_OPTS += --without-libiconv endif +ifeq ($(BR2_PACKAGE_OPENSSL),y) +LIBTORRENT_RASTERBAR_DEPENDENCIES += openssl +LIBTORRENT_RASTERBAR_CONF_OPTS += --enable-encryption +else +LIBTORRENT_RASTERBAR_CONF_OPTS += --disable-encryption +endif + $(eval $(autotools-package)) diff --git a/package/libtorrent/libtorrent.hash b/package/libtorrent/libtorrent.hash index 3a4fe89a4e3..5c755c8befd 100644 --- a/package/libtorrent/libtorrent.hash +++ b/package/libtorrent/libtorrent.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ed115a28f4ae8cfcd33b94a597c076ca74fd549867a26e4fac9505c27288e983 libtorrent-0.13.8.tar.gz -sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING +sha256 ed115a28f4ae8cfcd33b94a597c076ca74fd549867a26e4fac9505c27288e983 libtorrent-0.13.8.tar.gz +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/libubootenv/0002-Revert-fw_setenv-fix-bug-when-SPI-flash-write-size-s.patch b/package/libubootenv/0002-Revert-fw_setenv-fix-bug-when-SPI-flash-write-size-s.patch new file mode 100644 index 00000000000..414cb3d2056 --- /dev/null +++ b/package/libubootenv/0002-Revert-fw_setenv-fix-bug-when-SPI-flash-write-size-s.patch @@ -0,0 +1,71 @@ +From 35bbc4d8155ed86ca7200e060dad98bdfbce684d Mon Sep 17 00:00:00 2001 +From: Stefano Babic +Date: Thu, 15 Jun 2023 16:54:46 +0200 +Subject: [PATCH] Revert "fw_setenv: fix bug when SPI flash write size != + sector size" + +This reverts commit 44ecc1c216007272a6f99a104a71c9d410969d9e. + +mtd writesize was errouneously interpreted as maximum allowed size, but +it is the minimum size. The patch raises performance issues because on +NOR flashes single bytes are written. + +Signed-off-by: Stefano Babic +Upstream: https://github.com/sbabic/libubootenv/commit/9f17a00ee56dc5cfb1d9b51e6639d67b64cb3309 +Signed-off-by: Brandon Maier +--- + src/uboot_env.c | 29 +++++++++-------------------- + 1 file changed, 9 insertions(+), 20 deletions(-) + +diff --git a/src/uboot_env.c b/src/uboot_env.c +index c5eefe7..76e2619 100644 +--- a/src/uboot_env.c ++++ b/src/uboot_env.c +@@ -712,8 +712,6 @@ static int mtdwrite(struct uboot_flash_env *dev, void *data) + sectors = dev->envsectors ? dev->envsectors : 1; + buf = data; + while (count > 0) { +- int blockcount; +- + erase.start = start; + + skip = is_nand_badblock(dev, start); +@@ -744,26 +742,17 @@ static int mtdwrite(struct uboot_flash_env *dev, void *data) + ret =-EIO; + goto devwrite_out; + } +- +- blockcount = blocksize; +- +- /* writesize can be different than the sector size. */ +- +- while (blockcount > 0) { +- if (lseek(dev->fd, start, SEEK_SET) < 0) { +- ret =-EIO; +- goto devwrite_out; +- } +- if (write(dev->fd, buf, dev->mtdinfo.writesize) != dev->mtdinfo.writesize) { +- ret =-EIO; +- goto devwrite_out; +- } +- +- blockcount -= dev->mtdinfo.writesize; +- start += dev->mtdinfo.writesize; +- buf += dev->mtdinfo.writesize; ++ if (lseek(dev->fd, start, SEEK_SET) < 0) { ++ ret =-EIO; ++ goto devwrite_out; ++ } ++ if (write(dev->fd, buf, blocksize) != blocksize) { ++ ret =-EIO; ++ goto devwrite_out; + } + MTDLOCK(dev, &erase); ++ start += dev->sectorsize; ++ buf += blocksize; + count -= blocksize; + ret += blocksize; + } +-- +2.41.0 + diff --git a/package/libubootenv/libubootenv.hash b/package/libubootenv/libubootenv.hash index 5ff7450806f..6863b7fcf74 100644 --- a/package/libubootenv/libubootenv.hash +++ b/package/libubootenv/libubootenv.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 760fe53ca20ced93a09dea0f123eb429c820b565c103920afa738873e8cd16b7 libubootenv-7dbfffa4cc0e42ad3febb122a711fe9d1b20e9f7.tar.gz +sha256 8fc9498b557bbf4ae4d39a2dbd15a2ef44f8ea8de4686cc971c6788a65cd1ec0 libubootenv-0.3.3.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 51ea02e678b..e841e0b8432 100644 --- a/package/libubootenv/libubootenv.mk +++ b/package/libubootenv/libubootenv.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBUBOOTENV_VERSION = 7dbfffa4cc0e42ad3febb122a711fe9d1b20e9f7 -LIBUBOOTENV_SITE = $(call github,sbabic,libubootenv,$(LIBUBOOTENV_VERSION)) +LIBUBOOTENV_VERSION = 0.3.3 +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 \ LICENSES/LGPL-2.1-or-later.txt \ diff --git a/package/libucl/libucl.hash b/package/libucl/libucl.hash index 8d4a796e22d..164b00276f9 100644 --- a/package/libucl/libucl.hash +++ b/package/libucl/libucl.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a6397e179672f0e8171a0f9a2cfc37e01432b357fd748b13f4394436689d24ef libucl-0.8.1.tar.gz -sha256 1bf976835764c1d827e07472a0a75adb098682df56681878af05fc0db7439b03 COPYING +sha256 a6397e179672f0e8171a0f9a2cfc37e01432b357fd748b13f4394436689d24ef libucl-0.8.1.tar.gz +sha256 1bf976835764c1d827e07472a0a75adb098682df56681878af05fc0db7439b03 COPYING diff --git a/package/libudfread/Config.in b/package/libudfread/Config.in index 8d425705006..c1f3f23af91 100644 --- a/package/libudfread/Config.in +++ b/package/libudfread/Config.in @@ -1,6 +1,10 @@ config BR2_PACKAGE_LIBUDFREAD bool "libudfread" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 || 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 diff --git a/package/libuecc/libuecc.hash b/package/libuecc/libuecc.hash index bfc9aaf396f..b72519f1679 100644 --- a/package/libuecc/libuecc.hash +++ b/package/libuecc/libuecc.hash @@ -1,5 +1,5 @@ # from https://projects.universe-factory.net/projects/fastd/files -md5 5cd543cb8e7bce83a22c07a0579c95a1 libuecc-7.tar.xz +md5 5cd543cb8e7bce83a22c07a0579c95a1 libuecc-7.tar.xz # computed locally sha256 b94aef08eab5359d0facaa7ead2ce81b193eef0c61379d9835213ebc0a46257a libuecc-7.tar.xz sha256 ec4d9fcc3a37a7998a9ea4decf38f4c0c91a44fd05bb17638c52fe16f2b12e23 COPYRIGHT diff --git a/package/libuhttpd/0001-add-compatibility-for-wolfssl-5-0.patch b/package/libuhttpd/0001-add-compatibility-for-wolfssl-5-0.patch new file mode 100644 index 00000000000..7da7199e7ed --- /dev/null +++ b/package/libuhttpd/0001-add-compatibility-for-wolfssl-5-0.patch @@ -0,0 +1,30 @@ +From 73aa4ef762b2de67bc8c7c260bd36b34fdb91e63 Mon Sep 17 00:00:00 2001 +From: "Sergey V. Lobanov" +Date: Mon, 3 Jan 2022 19:36:52 +0300 +Subject: [PATCH] add compatibility for wolfssl >= 5.0 + +NTRU support has been removed in wolfssl 5.0 so it is required to +mask NTRU specific code if wolfssl >= 5.0 + +Signed-off-by: Sergey V. Lobanov +[Retrieved from: +https://github.com/zhaojh329/ssl/commit/73aa4ef762b2de67bc8c7c260bd36b34fdb91e63] +Signed-off-by: Fabrice Fontaine +--- + openssl.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/ssl/openssl.c b/src/ssl/openssl.c +index 5a49267..278bab5 100644 +--- a/src/ssl/openssl.c ++++ b/src/ssl/openssl.c +@@ -336,7 +336,9 @@ static bool handle_wolfssl_asn_error(void *ssl, int r, + case ASN_SIG_HASH_E: + case ASN_SIG_KEY_E: + case ASN_DH_KEY_E: ++#if LIBWOLFSSL_VERSION_HEX < 0x05000000 + case ASN_NTRU_KEY_E: ++#endif + case ASN_CRIT_EXT_E: + case ASN_ALT_NAME_E: + case ASN_NO_PEM_HEADER: diff --git a/package/libuhttpd/Config.in b/package/libuhttpd/Config.in index 97fc984ea01..d89f4541b6a 100644 --- a/package/libuhttpd/Config.in +++ b/package/libuhttpd/Config.in @@ -3,7 +3,8 @@ config BR2_PACKAGE_LIBUHTTPD depends on BR2_USE_MMU # fork() depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 select BR2_PACKAGE_LIBEV - select BR2_PACKAGE_WOLFSSL_ALL if BR2_PACKAGE_WOLFSSL + select BR2_PACKAGE_WOLFSSL_ALL if BR2_PACKAGE_WOLFSSL && \ + !BR2_STATIC_LIBS help A lightweight and fully asynchronous HTTP server library based on libev @@ -12,4 +13,4 @@ config BR2_PACKAGE_LIBUHTTPD comment "libuhttpd needs a toolchain w/ gcc >= 4.9" depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/libuhttpd/libuhttpd.mk b/package/libuhttpd/libuhttpd.mk index b8cf935d015..0d5306c6dd6 100644 --- a/package/libuhttpd/libuhttpd.mk +++ b/package/libuhttpd/libuhttpd.mk @@ -18,7 +18,7 @@ LIBUHTTPD_CONF_OPTS += \ -DUSE_MBEDTLS=OFF \ -DUSE_OPENSSL=ON \ -DUSE_WOLFSSL=OFF -else ifeq ($(BR2_PACKAGE_WOLFSSL),y) +else ifeq ($(BR2_PACKAGE_WOLFSSL_ALL),y) LIBUHTTPD_DEPENDENCIES += wolfssl LIBUHTTPD_CONF_OPTS += \ -DSSL_SUPPORT=ON \ diff --git a/package/libunibreak/Config.in b/package/libunibreak/Config.in new file mode 100644 index 00000000000..101d621fd62 --- /dev/null +++ b/package/libunibreak/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_LIBUNIBREAK + bool "libunibreak" + help + libunibreak is an implementation of the line breaking and word + breaking algorithms as described in Unicode Standard Annex 14 + and Unicode Standard Annex 29. + + https://github.com/adah1972/libunibreak diff --git a/package/libunibreak/libunibreak.hash b/package/libunibreak/libunibreak.hash new file mode 100644 index 00000000000..bb85f21cdca --- /dev/null +++ b/package/libunibreak/libunibreak.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 dd1a92d4c5646aa0e457ff41d89812ec5243863be6c20bbcb5ee380f3dd78377 libunibreak-5.1.tar.gz +sha256 0c57e2ec42ece17791a75d2f9b2f8e0663181be008667a507f765b3ef22522db LICENCE diff --git a/package/libunibreak/libunibreak.mk b/package/libunibreak/libunibreak.mk new file mode 100644 index 00000000000..fa52116c1f2 --- /dev/null +++ b/package/libunibreak/libunibreak.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# libunibreak +# +################################################################################ + +LIBUNIBREAK_VERSION = 5.1 +LIBUNIBREAK_SITE = https://github.com/adah1972/libunibreak/releases/download/libunibreak_$(subst .,_,$(LIBUNIBREAK_VERSION)) +LIBUNIBREAK_INSTALL_STAGING = YES +LIBUNIBREAK_LICENSE = Zlib +LIBUNIBREAK_LICENSE_FILES = LICENCE + +$(eval $(autotools-package)) diff --git a/package/libunistring/libunistring.hash b/package/libunistring/libunistring.hash index 81ffd4fb0ce..8267d56327b 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-0.9.10.tar.xz.sig -sha256 5bab55b49f75d77ed26b257997e919b693f29fd4a1bc22e0e6e024c246c72741 libunistring-1.0.tar.xz +sha256 827c1eb9cb6e7c738b171745dac0888aa58c5924df2e59239318383de0729b98 libunistring-1.1.tar.xz # Locally calculated sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING.LIB diff --git a/package/libunistring/libunistring.mk b/package/libunistring/libunistring.mk index a69eacd676f..8d5b6f54ec1 100644 --- a/package/libunistring/libunistring.mk +++ b/package/libunistring/libunistring.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUNISTRING_VERSION = 1.0 +LIBUNISTRING_VERSION = 1.1 LIBUNISTRING_SITE = $(BR2_GNU_MIRROR)/libunistring LIBUNISTRING_SOURCE = libunistring-$(LIBUNISTRING_VERSION).tar.xz LIBUNISTRING_INSTALL_STAGING = YES diff --git a/package/libunwind/0001-Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch b/package/libunwind/0001-Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch deleted file mode 100644 index 2a37ed7784e..00000000000 --- a/package/libunwind/0001-Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 24484e80b3e329c9edee1995e102f8612eedb79c Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 13 May 2014 23:32:27 +0200 -Subject: [PATCH] Add AO_REQUIRE_CAS to fix build on ARM < v6 - -ARM earlier than ARMv6, such as ARMv4 and ARMv5 do not provide -optimize atomic operations in libatomic_ops. Since libunwind is using -such operations, it should define AO_REQUIRE_CAS before including - so that libatomic_ops knows it should use emulated -atomic operations instead (even though they are obviously a lot more -expensive). - -Also, while real atomic operations are all inline functions and -therefore linking against libatomic_ops was not required, the emulated -atomic operations actually require linking against libatomic_ops, so -the commented AC_CHECK_LIB test in acinclude.m4 is uncommented to make -sure we link against libatomic_ops. - -Signed-off-by: Thomas Petazzoni ---- - acinclude.m4 | 8 +------- - include/libunwind_i.h | 1 + - 2 files changed, 2 insertions(+), 7 deletions(-) - -diff --git a/acinclude.m4 b/acinclude.m4 -index 497f7c2..9c15af1 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -22,11 +22,5 @@ fi]) - AC_DEFUN([CHECK_ATOMIC_OPS], - [dnl Check whether the system has the atomic_ops package installed. - AC_CHECK_HEADERS(atomic_ops.h) --# --# Don't link against libatomic_ops for now. We don't want libunwind --# to depend on libatomic_ops.so. Fortunately, none of the platforms --# we care about so far need libatomic_ops.a (everything is done via --# inline macros). --# --# AC_CHECK_LIB(atomic_ops, main) -+ AC_CHECK_LIB(atomic_ops, main) - ]) -diff --git a/include/libunwind_i.h b/include/libunwind_i.h -index 23f615e..deabdfd 100644 ---- a/include/libunwind_i.h -+++ b/include/libunwind_i.h -@@ -95,6 +95,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - (pthread_mutex_unlock != NULL ? pthread_mutex_unlock (l) : 0) - - #ifdef HAVE_ATOMIC_OPS_H -+# define AO_REQUIRE_CAS - # include - static inline int - cmpxchg_ptr (void *addr, void *old, void *new) --- -1.9.2 - diff --git a/package/libunwind/Config.in b/package/libunwind/Config.in index 5284b5864c9..dfd0df30fa7 100644 --- a/package/libunwind/Config.in +++ b/package/libunwind/Config.in @@ -23,6 +23,7 @@ config BR2_PACKAGE_LIBUNWIND bool "libunwind" depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_PACKAGE_LIBUNWIND_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C11 atomics # forcefully links against libgcc_s, only available in dynamic # linking configurations depends on !BR2_STATIC_LIBS @@ -31,6 +32,7 @@ config BR2_PACKAGE_LIBUNWIND http://www.nongnu.org/libunwind/index.html -comment "libunwind needs a toolchain w/ threads, dynamic library" +comment "libunwind needs a toolchain w/ threads, dynamic library, gcc >= 4.9" depends on BR2_PACKAGE_LIBUNWIND_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/libunwind/libunwind.hash b/package/libunwind/libunwind.hash index de00c59988f..1d532a7830e 100644 --- a/package/libunwind/libunwind.hash +++ b/package/libunwind/libunwind.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 90337653d92d4a13de590781371c604f9031cdb50520366aa1e3a91e1efb1017 libunwind-1.5.0.tar.gz +sha256 4a6aec666991fb45d0889c44aede8ad6eb108071c3554fcdff671f9c94794976 libunwind-1.6.2.tar.gz # Hash for license file sha256 6a0dbbdaec2b3136b7bf045586f4212bdf74e7af688bf9dfe9154607cf5ec156 COPYING diff --git a/package/libunwind/libunwind.mk b/package/libunwind/libunwind.mk index aaa33464a9b..9cd587d0a3e 100644 --- a/package/libunwind/libunwind.mk +++ b/package/libunwind/libunwind.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUNWIND_VERSION = 1.5.0 +LIBUNWIND_VERSION = 1.6.2 LIBUNWIND_SITE = http://download.savannah.gnu.org/releases/libunwind LIBUNWIND_INSTALL_STAGING = YES LIBUNWIND_LICENSE_FILES = COPYING @@ -16,8 +16,4 @@ LIBUNWIND_CONF_OPTS = \ --disable-tests \ $(if $(BR2_INSTALL_LIBSTDCPP),--enable-cxx-exceptions,--disable-cxx-exceptions) -ifeq ($(BR2_PACKAGE_LIBATOMIC_OPS),y) -LIBUNWIND_DEPENDENCIES += libatomic_ops -endif - $(eval $(autotools-package)) diff --git a/package/libupnp/libupnp.hash b/package/libupnp/libupnp.hash index aebde064b87..fcb231cff66 100644 --- a/package/libupnp/libupnp.hash +++ b/package/libupnp/libupnp.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 091c80aada1e939c2294245c122be2f5e337cc932af7f7d40504751680b5b5ac libupnp-1.14.12.tar.bz2 +sha256 025d7aee1ac5ca8f0bd99cb58b83fcfca0efab0c5c9c1d48f72667fe40788a4e libupnp-1.14.13.tar.bz2 sha256 c8b99423cad48bb44e2cf52a496361404290865eac259a82da6d1e4331ececb3 COPYING diff --git a/package/libupnp/libupnp.mk b/package/libupnp/libupnp.mk index a754ca76fc8..8c6ae005a00 100644 --- a/package/libupnp/libupnp.mk +++ b/package/libupnp/libupnp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUPNP_VERSION = 1.14.12 +LIBUPNP_VERSION = 1.14.13 LIBUPNP_SOURCE = libupnp-$(LIBUPNP_VERSION).tar.bz2 LIBUPNP_SITE = \ http://downloads.sourceforge.net/project/pupnp/release-$(LIBUPNP_VERSION) diff --git a/package/liburcu/liburcu.hash b/package/liburcu/liburcu.hash index 1968c3784e5..bed765dd6f3 100644 --- a/package/liburcu/liburcu.hash +++ b/package/liburcu/liburcu.hash @@ -1,5 +1,5 @@ -# http://www.lttng.org/files/urcu/userspace-rcu-0.13.1.tar.bz2.sha256 -sha256 3213f33d2b8f710eb920eb1abb279ec04bf8ae6361f44f2513c28c20d3363083 userspace-rcu-0.13.1.tar.bz2 +# http://www.lttng.org/files/urcu/userspace-rcu-0.13.2.tar.bz2.sha256 +sha256 1213fd9f1b0b74da7de2bb74335b76098db9738fec5d3cdc07c0c524f34fc032 userspace-rcu-0.13.2.tar.bz2 # Hash for license files sha256 36b6d3fa47916943fd5fec313c584784946047ec1337a78b440e5992cb595f89 lgpl-2.1.txt diff --git a/package/liburcu/liburcu.mk b/package/liburcu/liburcu.mk index 895dd6bb665..d7776c61ec0 100644 --- a/package/liburcu/liburcu.mk +++ b/package/liburcu/liburcu.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBURCU_VERSION = 0.13.1 +LIBURCU_VERSION = 0.13.2 LIBURCU_SITE = http://lttng.org/files/urcu LIBURCU_SOURCE = userspace-rcu-$(LIBURCU_VERSION).tar.bz2 LIBURCU_LICENSE = LGPL-2.1+ (library), MIT-like (few source files listed in LICENSE), GPL-2.0+ (test), GPL-3.0 (few *.m4 files) diff --git a/package/liburing/Config.in b/package/liburing/Config.in index d65a3f1322f..fc13f1c17ce 100644 --- a/package/liburing/Config.in +++ b/package/liburing/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LIBURING bool "liburing" + depends on BR2_USE_MMU # madvise() depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C11/stdatomic.h depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1 help @@ -11,5 +12,6 @@ config BR2_PACKAGE_LIBURING https://git.kernel.dk/cgit/liburing comment "liburing needs a toolchain w/ gcc >= 4.9, headers >= 5.1" + depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1 diff --git a/package/liburing/liburing.hash b/package/liburing/liburing.hash index 56e90d71cc8..7d3306850ff 100644 --- a/package/liburing/liburing.hash +++ b/package/liburing/liburing.hash @@ -1,8 +1,8 @@ # Locally calculated -sha256 df7c8fd05fd39da622b2814e06f815f11f1beb429487a4330eed64bb7f353dbf liburing-2.1.tar.bz2 +sha256 0fcd25dc1eb32cbeb534219f8e7fcfeadbd8dc2304aa447148e5ca8408076f22 liburing-2.2.tar.bz2 # Hash for license files sha256 592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c COPYING sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL -sha256 d0b225f17ef2d05d5cda6b25b2dc334ef6f5f12537c20edf6e391852a095ec19 LICENSE -sha256 97d62ff5d7cf0b1cef34c33a89877352911278ca4ac1c6c4f24a835baa5ea10b README +sha256 2ec12f7934cdfce25ff72b0557738989d79fc7a496d1cf9b2d3f9464fd61edbe LICENSE +sha256 1c3351726408c22787dafbb5cc4bfeaa38ca8e92eabf59a36a046a5a2e66108f README diff --git a/package/liburing/liburing.mk b/package/liburing/liburing.mk index 874e268d431..e98c710997e 100644 --- a/package/liburing/liburing.mk +++ b/package/liburing/liburing.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBURING_VERSION = 2.1 +LIBURING_VERSION = 2.2 LIBURING_SOURCE = liburing-$(LIBURING_VERSION).tar.bz2 LIBURING_SITE = https://git.kernel.dk/cgit/liburing/snapshot LIBURING_LICENSE = (GPL-2.0 with exceptions and LGPL-2.1+) or MIT diff --git a/package/liburiparser/liburiparser.hash b/package/liburiparser/liburiparser.hash index 8b408075414..73b4ec6867c 100644 --- a/package/liburiparser/liburiparser.hash +++ b/package/liburiparser/liburiparser.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a288a06668528c19e85e38c508335938e1de6fdd4b8f2072401b4533fcebf644 uriparser-0.9.6.tar.xz +sha256 1ddae35cb3cc2c36e8199829d46f1c7f8b222e74a723fdae67ec8561e1ac5a39 uriparser-0.9.7.tar.xz sha256 287f09e6546a9610f949f89e8fb937cacfeabd7bfaa8c8a0c18312193bf04ad3 COPYING diff --git a/package/liburiparser/liburiparser.mk b/package/liburiparser/liburiparser.mk index c9903bd74ff..6d25b1d9bbe 100644 --- a/package/liburiparser/liburiparser.mk +++ b/package/liburiparser/liburiparser.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBURIPARSER_VERSION = 0.9.6 +LIBURIPARSER_VERSION = 0.9.7 LIBURIPARSER_SOURCE = uriparser-$(LIBURIPARSER_VERSION).tar.xz LIBURIPARSER_SITE = https://github.com/uriparser/uriparser/releases/download/uriparser-$(LIBURIPARSER_VERSION) LIBURIPARSER_LICENSE = BSD-3-Clause diff --git a/package/libusb/0001-configure.ac-link-with-latomic-if-needed.patch b/package/libusb/0001-configure.ac-link-with-latomic-if-needed.patch deleted file mode 100644 index 5f6c88e57d4..00000000000 --- a/package/libusb/0001-configure.ac-link-with-latomic-if-needed.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 0b857081d687f7ee41483a3d7e9846af44a5ba7d Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 7 Feb 2022 11:55:54 +0100 -Subject: [PATCH] configure.ac: link with -latomic if needed - -libusb unconditionally uses atomic_fetch_add since version 1.0.25 and -https://github.com/libusb/libusb/commit/1a08aa84d96397a3840a75abe66051f5360c2c84 -https://github.com/libusb/libusb/commit/eed8a371ea53939096ba94d44001e0637d042572 -but some architectures (e.g. sparc) needs to link with -latomic to be -able to use it. So check if -latomic is needed and update libusb-1.0.pc -accordingly to avoid the following build failure with openocd: - -/home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/10.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: /home/buildroot/autobuild/instance-0/output-1/host/sparc-buildroot-linux-uclibc/sysroot/usr/lib/libusb-1.0.so: undefined reference to `__atomic_fetch_add_4' -collect2: error: ld returned 1 exit status - -Fixes: - - http://autobuild.buildroot.org/results/4a27a769bb3cdf78643c3049b87d792178d6512c - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/libusb/libusb/pull/1064] ---- - configure.ac | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/configure.ac b/configure.ac -index f6cf2f9..002bcf6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -152,6 +152,7 @@ if test "x$platform" = xposix; then - AC_SEARCH_LIBS([pthread_create], [pthread], - [test "x$ac_cv_search_pthread_create" != "xnone required" && AC_SUBST(THREAD_LIBS, [-lpthread])], - [], []) -+ AC_SEARCH_LIBS([__atomic_fetch_add_4], [atomic]) - elif test "x$platform" = xwindows; then - AC_DEFINE([PLATFORM_WINDOWS], [1], [Define to 1 if compiling for a Windows platform.]) - else --- -2.34.1 - diff --git a/package/libusb/0002-linux_usbfs-fix-maybe-uninitialized-error.patch b/package/libusb/0002-linux_usbfs-fix-maybe-uninitialized-error.patch deleted file mode 100644 index ea299081aa4..00000000000 --- a/package/libusb/0002-linux_usbfs-fix-maybe-uninitialized-error.patch +++ /dev/null @@ -1,37 +0,0 @@ -From bea5891591402f14940a607eafbdcd169ff8827f Mon Sep 17 00:00:00 2001 -From: Yegor Yefremov -Date: Sun, 6 Feb 2022 07:12:14 +0100 -Subject: [PATCH] linux_usbfs: fix maybe-uninitialized error -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Initialize active_config to an invalid value to avoid the following -compilation error: - -os/linux_usbfs.c: In function ‘op_get_configuration’: -os/linux_usbfs.c:1452:12: error: ‘active_config’ may be used uninitialized in this function [-Werror=maybe-uninitialized] - 1452 | *config = (uint8_t)active_config; - -Signed-off-by: Yegor Yefremov -Upstream: https://github.com/libusb/libusb/pull/1062 ---- - libusb/os/linux_usbfs.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libusb/os/linux_usbfs.c b/libusb/os/linux_usbfs.c -index c300675..285d9ca 100644 ---- a/libusb/os/linux_usbfs.c -+++ b/libusb/os/linux_usbfs.c -@@ -1429,7 +1429,7 @@ static int op_get_configuration(struct libusb_device_handle *handle, - uint8_t *config) - { - struct linux_device_priv *priv = usbi_get_device_priv(handle->dev); -- int active_config; -+ int active_config = -1; /* to please compiler */ - int r; - - if (priv->sysfs_dir) { --- -2.17.0 - diff --git a/package/libusb/libusb.hash b/package/libusb/libusb.hash index a18935fe035..bbb0ccf5b9f 100644 --- a/package/libusb/libusb.hash +++ b/package/libusb/libusb.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 8a28ef197a797ebac2702f095e81975e2b02b2eeff2774fa909c78a74ef50849 libusb-1.0.25.tar.bz2 +sha256 12ce7a61fc9854d1d2a1ffe095f7b5fac19ddba095c259e6067a46500381b5a5 libusb-1.0.26.tar.bz2 sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING diff --git a/package/libusb/libusb.mk b/package/libusb/libusb.mk index aa306e295da..98a4a578b20 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).25 +LIBUSB_VERSION = $(LIBUSB_VERSION_MAJOR).26 LIBUSB_SOURCE = libusb-$(LIBUSB_VERSION).tar.bz2 LIBUSB_SITE = https://github.com/libusb/libusb/releases/download/v$(LIBUSB_VERSION) LIBUSB_LICENSE = LGPL-2.1+ @@ -13,8 +13,6 @@ LIBUSB_LICENSE_FILES = COPYING LIBUSB_CPE_ID_VENDOR = libusb LIBUSB_DEPENDENCIES = host-pkgconf LIBUSB_INSTALL_STAGING = YES -# We're patching configure.ac -LIBUSB_AUTORECONF = YES # Avoid the discovery of udev for the host variant HOST_LIBUSB_CONF_OPTS = --disable-udev diff --git a/package/libutp/Config.in b/package/libutp/Config.in new file mode 100644 index 00000000000..63829131037 --- /dev/null +++ b/package/libutp/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_LIBUTP + bool "libutp" + depends on BR2_INSTALL_LIBSTDCPP + help + uTorrent Transport Protocol library + + https://github.com/bittorrent/libutp + +comment "libutp support needs a toolchain with C++" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/libutp/libutp.hash b/package/libutp/libutp.hash new file mode 100644 index 00000000000..f347dc3f2cc --- /dev/null +++ b/package/libutp/libutp.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 484f802d044f774fa5f669476ecdd9cb6110c383781c39adc03bbf6575090771 libutp-059c9449a104e440e4f913756a5f560dd4ae76a9.tar.gz +sha256 73b400bf61dde52223dae1642205ca187f1a6b24a508dcce52bf386c27a0e58c LICENSE diff --git a/package/libutp/libutp.mk b/package/libutp/libutp.mk new file mode 100644 index 00000000000..394c1e9cb9f --- /dev/null +++ b/package/libutp/libutp.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# libutp +# +################################################################################ + +LIBUTP_VERSION = 059c9449a104e440e4f913756a5f560dd4ae76a9 +LIBUTP_SITE = $(call github,transmission,libutp,$(LIBUTP_VERSION)) +LIBUTP_LICENSE = MIT +LIBUTP_LICENSE_FILES = LICENSE +LIBUTP_INSTALL_STAGING = YES + +$(eval $(cmake-package)) diff --git a/package/libuv/libuv.hash b/package/libuv/libuv.hash index 172ef1f1688..b0fa0ff5be2 100644 --- a/package/libuv/libuv.hash +++ b/package/libuv/libuv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 371e5419708f6aaeb8656671f89400b92a9bba6443369af1bb70bcd6e4b3c764 libuv-1.42.0.tar.gz -sha256 6d20216ae022fbeed23916f48508fd807ece3d8464992330643b0e64e5c0c24b LICENSE +sha256 e6e2ba8b4c349a4182a33370bb9be5e23c51b32efb9b9e209d0e8556b73a48da libuv-1.44.2.tar.gz +sha256 95b8b163c60d17cfce3cef61a2d8a9cf70137502c8fb5f3d93cd2fc529fa98c8 LICENSE diff --git a/package/libuv/libuv.mk b/package/libuv/libuv.mk index 9fe775951de..c169b76a6a2 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.42.0 +LIBUV_VERSION = 1.44.2 LIBUV_SITE = $(call github,libuv,libuv,v$(LIBUV_VERSION)) LIBUV_DEPENDENCIES = host-pkgconf LIBUV_INSTALL_STAGING = YES diff --git a/package/libuwsc/libuwsc.mk b/package/libuwsc/libuwsc.mk index cad351529df..051ea411fa4 100644 --- a/package/libuwsc/libuwsc.mk +++ b/package/libuwsc/libuwsc.mk @@ -18,7 +18,7 @@ LIBUWSC_CONF_OPTS += \ -DUWSC_USE_MBEDTLS=OFF \ -DUWSC_USE_OPENSSL=ON \ -DUWSC_USE_WOLFSSL=OFF -else ifeq ($(BR2_PACKAGE_WOLFSSL),y) +else ifeq ($(BR2_PACKAGE_WOLFSSL_ALL),y) LIBUWSC_DEPENDENCIES += wolfssl LIBUWSC_CONF_OPTS += \ -DUWSC_SSL_SUPPORT=ON \ diff --git a/package/libv4l/libv4l.mk b/package/libv4l/libv4l.mk index 8300f5c970f..fd69b7ac7a1 100644 --- a/package/libv4l/libv4l.mk +++ b/package/libv4l/libv4l.mk @@ -27,8 +27,8 @@ LIBV4L_DEPENDENCIES += alsa-lib endif ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y) -LIBV4L_DEPENDENCIES += argp-standalone -LIBV4L_LIBS += -largp +LIBV4L_DEPENDENCIES += argp-standalone $(TARGET_NLS_DEPENDENCIES) +LIBV4L_CONF_ENV += LIBS=$(TARGET_NLS_LIBS) endif LIBV4L_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv) @@ -85,6 +85,4 @@ ifeq ($(BR2_PACKAGE_SDL2_IMAGE),y) LIBV4L_DEPENDENCIES += sdl2_image endif -LIBV4L_CONF_ENV += LIBS="$(LIBV4L_LIBS)" - $(eval $(autotools-package)) diff --git a/package/libva-utils/libva-utils.hash b/package/libva-utils/libva-utils.hash index 18a078dc1cd..41374a2ff6f 100644 --- a/package/libva-utils/libva-utils.hash +++ b/package/libva-utils/libva-utils.hash @@ -1,5 +1,3 @@ -# From https://github.com/intel/libva-utils/releases/download/2.13.0/libva-utils-2.13.0.tar.bz2.sha1sum -sha1 7ab945cf232387f762891f9e4f7a6cb41e0766e8 libva-utils-2.13.0.tar.bz2 # Locally computed -sha256 db3ae0bd63c2a3f6ef498450c29ffc99c387ce611e1eb5db6a8da1f88845d612 libva-utils-2.13.0.tar.bz2 +sha256 6ea5993c3eba230a979fa9d35b4cad8df06d4474a773dc0918033bf50353f966 libva-utils-2.17.1.tar.gz sha256 c6220c9f87832c27abcb8a32eafdd2823e13ce146b3ea63d5deae2a76798ef50 COPYING diff --git a/package/libva-utils/libva-utils.mk b/package/libva-utils/libva-utils.mk index e6e31df8bda..3dc8cdacde9 100644 --- a/package/libva-utils/libva-utils.mk +++ b/package/libva-utils/libva-utils.mk @@ -4,11 +4,10 @@ # ################################################################################ -LIBVA_UTILS_VERSION = 2.13.0 -LIBVA_UTILS_SOURCE = libva-utils-$(LIBVA_UTILS_VERSION).tar.bz2 -LIBVA_UTILS_SITE = https://github.com/intel/libva-utils/releases/download/$(LIBVA_UTILS_VERSION) +LIBVA_UTILS_VERSION = 2.17.1 +LIBVA_UTILS_SITE = $(call github,intel,libva-utils,$(LIBVA_UTILS_VERSION)) LIBVA_UTILS_LICENSE = MIT LIBVA_UTILS_LICENSE_FILES = COPYING LIBVA_UTILS_DEPENDENCIES = host-pkgconf libva -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/package/libva/libva.hash b/package/libva/libva.hash index 7b66a7709d9..780c186069c 100644 --- a/package/libva/libva.hash +++ b/package/libva/libva.hash @@ -1,5 +1,3 @@ -# From https://github.com/intel/libva/releases/download/2.13.0/libva-2.13.0.tar.bz2.sha1sum -sha1 2adb2c023371dd68fe0d23e58afcf0b072b79828 libva-2.13.0.tar.bz2 # Locally computed -sha256 fad383f39f36115814bd0eda1496a4cc01761643bd962635400df2d4470ad460 libva-2.13.0.tar.bz2 +sha256 8940541980ef998a36cd8f6ad905e81838ea4ddf56dc479ed2bebd12711e6001 libva-2.17.0.tar.gz sha256 c86a782ee845b52472dae9b9d79fb915d333628ac0efe49cdce63644814931de COPYING diff --git a/package/libva/libva.mk b/package/libva/libva.mk index 6ac53865402..f50010d9fc4 100644 --- a/package/libva/libva.mk +++ b/package/libva/libva.mk @@ -4,9 +4,8 @@ # ################################################################################ -LIBVA_VERSION = 2.13.0 -LIBVA_SOURCE = libva-$(LIBVA_VERSION).tar.bz2 -LIBVA_SITE = https://github.com/intel/libva/releases/download/$(LIBVA_VERSION) +LIBVA_VERSION = 2.17.0 +LIBVA_SITE = $(call github,intel,libva,$(LIBVA_VERSION)) LIBVA_LICENSE = MIT LIBVA_LICENSE_FILES = COPYING LIBVA_INSTALL_STAGING = YES @@ -14,26 +13,25 @@ LIBVA_DEPENDENCIES = host-pkgconf libdrm # libdrm is a hard-dependency LIBVA_CONF_OPTS = \ - --enable-drm \ - --with-drivers-path="/usr/lib/va" + -Ddisable_drm=false \ + -Ddriverdir="/usr/lib/va" ifeq ($(BR2_PACKAGE_XORG7),y) LIBVA_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXfixes -LIBVA_CONF_OPTS += --enable-x11 +LIBVA_CONF_OPTS += -Dwith_x11=yes ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) LIBVA_DEPENDENCIES += libgl -LIBVA_CONF_OPTS += --enable-glx +LIBVA_CONF_OPTS += -Dwith_glx=yes endif else -LIBVA_CONF_OPTS += --disable-glx --disable-x11 +LIBVA_CONF_OPTS += -Dwith_glx=no -Dwith_x11=no endif ifeq ($(BR2_PACKAGE_WAYLAND),y) LIBVA_DEPENDENCIES += wayland -LIBVA_CONF_ENV += ac_cv_path_WAYLAND_SCANNER=$(HOST_DIR)/usr/bin/wayland-scanner -LIBVA_CONF_OPTS += --enable-wayland +LIBVA_CONF_OPTS += -Dwith_wayland=yes else -LIBVA_CONF_OPTS += --disable-wayland +LIBVA_CONF_OPTS += -Dwith_wayland=no endif -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/package/libvdpau/libvdpau.hash b/package/libvdpau/libvdpau.hash index 653657322ad..ac974902d06 100644 --- a/package/libvdpau/libvdpau.hash +++ b/package/libvdpau/libvdpau.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 4258824c5a4555ef31de0a7d82b3caf19e75a16a13949f1edafc5f6fb2d33f30 libvdpau-1.4.tar.bz2 +sha256 a5d50a42b8c288febc07151ab643ac8de06a18446965c7241f89b4e810821913 libvdpau-1.5.tar.bz2 # Locally computed sha256 ce4af7294872ff07f6e82ae5f1f5eba926215b1e2fb6d55d64759de082458d61 COPYING diff --git a/package/libvdpau/libvdpau.mk b/package/libvdpau/libvdpau.mk index ae2f3888556..67ffdf17c16 100644 --- a/package/libvdpau/libvdpau.mk +++ b/package/libvdpau/libvdpau.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVDPAU_VERSION = 1.4 +LIBVDPAU_VERSION = 1.5 LIBVDPAU_SOURCE = libvdpau-$(LIBVDPAU_VERSION).tar.bz2 LIBVDPAU_SITE = \ https://gitlab.freedesktop.org/vdpau/libvdpau/-/archive/$(LIBVDPAU_VERSION) diff --git a/package/libvirt/Config.in b/package/libvirt/Config.in index af0fc36aea4..3f4fc70e624 100644 --- a/package/libvirt/Config.in +++ b/package/libvirt/Config.in @@ -44,18 +44,23 @@ if BR2_PACKAGE_LIBVIRT config BR2_PACKAGE_LIBVIRT_DAEMON bool "libvirtd" default y + depends on BR2_INSTALL_LIBSTDCPP # nmap select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS select BR2_PACKAGE_DNSMASQ select BR2_PACKAGE_EBTABLES select BR2_PACKAGE_IPTABLES select BR2_PACKAGE_IPROUTE2 # These are required because there is no way to unequivocally select a modern netcat - select BR2_PACKAGE_NETCAT_OPENBSD if !BR2_PACKAGE_NMAP_NCAT + select BR2_PACKAGE_NMAP if !BR2_PACKAGE_NETCAT_OPENBSD + select BR2_PACKAGE_NMAP_NCAT if !BR2_PACKAGE_NETCAT_OPENBSD select BR2_PACKAGE_RADVD help Build the libvirt daemon (libvirtd) otherwise build only the utility programs. +comment "libvirtd needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP + # Stateful drivers are useful only when building the daemon. if BR2_PACKAGE_LIBVIRT_DAEMON @@ -68,7 +73,7 @@ config BR2_PACKAGE_LIBVIRT_QEMU select BR2_PACKAGE_HWDATA_PCI_IDS # libpciaccess select BR2_PACKAGE_LIBSECCOMP select BR2_PACKAGE_QEMU - select BR2_PACKAGE_QEMU_SYSTEM if BR2_PACKAGE_QEMU_CUSTOM_TARGETS = "" + select BR2_PACKAGE_QEMU_SYSTEM select BR2_PACKAGE_YAJL help QEMU/KVM support diff --git a/package/libvncserver/Config.in b/package/libvncserver/Config.in index 6189b379d23..f284894555e 100644 --- a/package/libvncserver/Config.in +++ b/package/libvncserver/Config.in @@ -27,5 +27,5 @@ endif comment "libvncserver needs a toolchain w/ dynamic library" depends on BR2_USE_MMU - depends on !BR2_nios + depends on !BR2_nios2 depends on BR2_STATIC_LIBS diff --git a/package/libvncserver/libvncserver.hash b/package/libvncserver/libvncserver.hash index 8e61a3d0eaf..225c42e46a3 100644 --- a/package/libvncserver/libvncserver.hash +++ b/package/libvncserver/libvncserver.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 0ae5bb9175dc0a602fe85c1cf591ac47ee5247b87f2bf164c16b05f87cbfa81a LibVNCServer-0.9.13.tar.gz +sha256 83104e4f7e28b02f8bf6b010d69b626fae591f887e949816305daebae527c9a5 LibVNCServer-0.9.14.tar.gz sha256 4d23c8c814e5baf007d854f01d8502e77dc56a41144934e003fb32c4e052d20f COPYING diff --git a/package/libvncserver/libvncserver.mk b/package/libvncserver/libvncserver.mk index ead809d19c9..700e26a8d6e 100644 --- a/package/libvncserver/libvncserver.mk +++ b/package/libvncserver/libvncserver.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVNCSERVER_VERSION = 0.9.13 +LIBVNCSERVER_VERSION = 0.9.14 LIBVNCSERVER_SOURCE = LibVNCServer-$(LIBVNCSERVER_VERSION).tar.gz LIBVNCSERVER_SITE = https://github.com/LibVNC/libvncserver/archive LIBVNCSERVER_LICENSE = GPL-2.0+ @@ -16,9 +16,11 @@ LIBVNCSERVER_CONF_OPTS = -DWITH_LZO=ON # only used for examples LIBVNCSERVER_CONF_OPTS += \ + -DWITH_EXAMPLES=OFF \ -DWITH_FFMPEG=OFF \ -DWITH_GTK=OFF \ - -DWITH_SDL=OFF + -DWITH_SDL=OFF \ + -DWITH_TESTS=OFF ifneq ($(BR2_TOOLCHAIN_HAS_THREADS),y) LIBVNCSERVER_CONF_OPTS += -DWITH_THREADS=ON diff --git a/package/libvpx/libvpx.hash b/package/libvpx/libvpx.hash index 4e9bd91dee9..828718e7134 100644 --- a/package/libvpx/libvpx.hash +++ b/package/libvpx/libvpx.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 965e51c91ad9851e2337aebcc0f517440c637c506f3a03948062e3d5ea129a83 libvpx-1.11.0.tar.gz +sha256 f1acc15d0fd0cb431f4bf6eac32d5e932e40ea1186fe78e074254d6d003957bb libvpx-1.12.0.tar.gz sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 LICENSE sha256 cc3273e0694ea5896145e0677699b53471b03ea43021ddc50e7923fbb9f5023c PATENTS diff --git a/package/libvpx/libvpx.mk b/package/libvpx/libvpx.mk index ece1ad2cb89..c8a22b9ab2c 100644 --- a/package/libvpx/libvpx.mk +++ b/package/libvpx/libvpx.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVPX_VERSION = 1.11.0 +LIBVPX_VERSION = 1.12.0 LIBVPX_SITE = $(call github,webmproject,libvpx,v$(LIBVPX_VERSION)) LIBVPX_LICENSE = BSD-3-Clause LIBVPX_LICENSE_FILES = LICENSE PATENTS @@ -21,11 +21,11 @@ LIBVPX_CONF_OPTS = \ --disable-docs \ --disable-unit-tests -# vp9/ratectrl_rtc.cc +# vp8/ratectrl_rtc.cc vp9/ratectrl_rtc.cc ifeq ($(BR2_INSTALL_LIBSTDCPP),y) -LIBVPX_CONF_OPTS += --enable-vp9-encoder +LIBVPX_CONF_OPTS += --enable-vp8-encoder --enable-vp9-encoder else -LIBVPX_CONF_OPTS += --disable-vp9-encoder +LIBVPX_CONF_OPTS += --disable-vp8-encoder --disable-vp9-encoder endif # This is not a true autotools package. It is based on the ffmpeg build system diff --git a/package/libwebsock/libwebsock.hash b/package/libwebsock/libwebsock.hash index 11b4f55f047..43f0935a361 100644 --- a/package/libwebsock/libwebsock.hash +++ b/package/libwebsock/libwebsock.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 34cf8376446e2371c9af47394043a30dc16af7ed5437d56bc6135c5dfda9ed22 libwebsock-3c1615eeadb0b582b63851073bfe3e5132f31ebc.tar.gz -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING.lesser +sha256 34cf8376446e2371c9af47394043a30dc16af7ed5437d56bc6135c5dfda9ed22 libwebsock-3c1615eeadb0b582b63851073bfe3e5132f31ebc.tar.gz +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING.lesser diff --git a/package/libwebsockets/0001-lib-tls-CMakeLists.txt-fix-build-without-threads.patch b/package/libwebsockets/0001-lib-tls-CMakeLists.txt-fix-build-without-threads.patch new file mode 100644 index 00000000000..ae46602a532 --- /dev/null +++ b/package/libwebsockets/0001-lib-tls-CMakeLists.txt-fix-build-without-threads.patch @@ -0,0 +1,47 @@ +From c83cf48b9095a6914a0844bec4439763bb0c9138 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 28 May 2022 23:15:40 +0200 +Subject: [PATCH] lib/tls/CMakeLists.txt: fix build without threads + +openssl can be built without threads resulting in the following build +failure: + +-- Looking for HMAC_CTX_new +-- Looking for HMAC_CTX_new - not found + +[...] + +In file included from /home/buildroot/autobuild/instance-0/output-1/build/libwebsockets-4.3.1/include/libwebsockets.h:661, + from /home/buildroot/autobuild/instance-0/output-1/build/libwebsockets-4.3.1/lib/core/./private-lib-core.h:140, + from /home/buildroot/autobuild/instance-0/output-1/build/libwebsockets-4.3.1/lib/plat/unix/unix-misc.c:28: +/home/buildroot/autobuild/instance-0/output-1/build/libwebsockets-4.3.1/include/libwebsockets/lws-genhash.h:85:18: error: field 'ctx' has incomplete type + 85 | HMAC_CTX ctx; + | ^~~ + +To fix this build failure, don't unconditionally add pthread if openssl +has been found through pkg-config as openssl.pc will contain the +appropriate dependencies (i.e. -lpthread but also -lz or -latomic) + +Fixes: + - http://autobuild.buildroot.org/results/2ae9e3249b6fcc9e6c30e7783e264fc6599e61df + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/warmcat/libwebsockets/commit/c83cf48b9095a6914a0844bec4439763bb0c9138] +--- + lib/tls/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/tls/CMakeLists.txt b/lib/tls/CMakeLists.txt +index 559be9abb..a2b78c252 100644 +--- a/lib/tls/CMakeLists.txt ++++ b/lib/tls/CMakeLists.txt +@@ -311,7 +311,7 @@ endif() + if (UNIX AND NOT (${CMAKE_SYSTEM_NAME} MATCHES "QNX")) + set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${CMAKE_DL_LIBS}) + endif() +-if ((CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) AND NOT (${CMAKE_SYSTEM_NAME} MATCHES "QNX")) ++if ((CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) AND NOT ((${CMAKE_SYSTEM_NAME} MATCHES "QNX") OR PC_OPENSSL_FOUND)) + set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} pthread) + endif() + diff --git a/package/libwebsockets/libwebsockets.hash b/package/libwebsockets/libwebsockets.hash index 1761a7658a5..4bff0682418 100644 --- a/package/libwebsockets/libwebsockets.hash +++ b/package/libwebsockets/libwebsockets.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 6ece1f422c6d38aabedec2476f2ac12e9aede8691b08137068ad85545ce3ff78 libwebsockets-4.0.21.tar.gz -sha256 5756db345eb9c21cb06dd7cb69c38ec234657a233f9a186b4f5fa453681bd394 LICENSE +sha256 6a85a1bccf25acc7e8e5383e4934c9b32a102880d1e4c37c70b27ae2a42406e1 libwebsockets-4.3.2.tar.gz +sha256 2b5dd8030691f3d1870a040f085c37e45d9ab9c684a7f1284f5f379c1e829b28 LICENSE diff --git a/package/libwebsockets/libwebsockets.mk b/package/libwebsockets/libwebsockets.mk index c25686d3855..79624948a57 100644 --- a/package/libwebsockets/libwebsockets.mk +++ b/package/libwebsockets/libwebsockets.mk @@ -4,13 +4,14 @@ # ################################################################################ -LIBWEBSOCKETS_VERSION = 4.0.21 +LIBWEBSOCKETS_VERSION = 4.3.2 LIBWEBSOCKETS_SITE = $(call github,warmcat,libwebsockets,v$(LIBWEBSOCKETS_VERSION)) LIBWEBSOCKETS_LICENSE = MIT with exceptions LIBWEBSOCKETS_LICENSE_FILES = LICENSE LIBWEBSOCKETS_DEPENDENCIES = zlib LIBWEBSOCKETS_INSTALL_STAGING = YES LIBWEBSOCKETS_CONF_OPTS = \ + -DDISABLE_WERROR=ON \ -DLWS_WITHOUT_TESTAPPS=ON \ -DLWS_IPV6=ON \ -DLWS_UNIX_SOCK=ON \ @@ -20,16 +21,38 @@ LIBWEBSOCKETS_CONF_OPTS = \ # in the library. If unset, LWS_MAX_SMP defaults to 32 and a small # amount of pthread mutex code is built into the library. ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) -LIBWEBSOCKETS_CONF_OPTS += -DLWS_MAX_SMP=1 +LIBWEBSOCKETS_CONF_OPTS += \ + -DLWS_MAX_SMP=1 \ + -DLWS_WITH_SYS_SMD=OFF else -LIBWEBSOCKETS_CONF_OPTS += -DLWS_MAX_SMP= +LIBWEBSOCKETS_CONF_OPTS += \ + -DLWS_MAX_SMP= \ + -DLWS_WITH_SYS_SMD=ON endif ifeq ($(BR2_PACKAGE_OPENSSL),y) LIBWEBSOCKETS_DEPENDENCIES += openssl host-openssl -LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_SSL=ON +LIBWEBSOCKETS_CONF_OPTS += \ + -DLWS_WITH_SSL=ON \ + -DLWS_WITH_MBEDTLS=OFF \ + -DLWS_WITH_WOLFSSL=OFF +else ifeq ($(BR2_PACKAGE_MBEDTLS),y) +LIBWEBSOCKETS_DEPENDENCIES += mbedtls +LIBWEBSOCKETS_CONF_OPTS += \ + -DLWS_WITH_SSL=ON \ + -DLWS_WITH_MBEDTLS=ON \ + -DLWS_WITH_WOLFSSL=OFF +else ifeq ($(BR2_PACKAGE_WOLFSSL),y) +LIBWEBSOCKETS_DEPENDENCIES += host-pkgconf wolfssl +LIBWEBSOCKETS_CONF_OPTS += \ + -DLWS_WITH_SSL=ON \ + -DLWS_WITH_MBEDTLS=OFF \ + -DLWS_WITH_WOLFSSL=ON else -LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_SSL=OFF +LIBWEBSOCKETS_CONF_OPTS += \ + -DLWS_WITH_SSL=OFF \ + -DLWS_WITH_MBEDTLS=OFF \ + -DLWS_WITH_WOLFSSL=OFF endif ifeq ($(BR2_PACKAGE_LIBEV),y) diff --git a/package/libwpe/libwpe.hash b/package/libwpe/libwpe.hash index 2ebe4f19bda..28b7685b93b 100644 --- a/package/libwpe/libwpe.hash +++ b/package/libwpe/libwpe.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/libwpe-1.12.0.tar.xz.sums -md5 5a3f11789535d826370ba465ea141393 libwpe-1.12.0.tar.xz -sha1 91aa47a593a5db511d667b3bdbaa76dee4301311 libwpe-1.12.0.tar.xz -sha256 e8eeca228a6b4c36294cfb63f7d3ba9ada47a430904a5a973b3c99c96a44c18c libwpe-1.12.0.tar.xz +# From https://wpewebkit.org/releases/libwpe-1.14.0.tar.xz.sums +md5 f9737912975f979f9e4e01eec174a271 libwpe-1.14.0.tar.xz +sha1 7a5d51c99254fc14ffcbcca9e8550cc7940fe871 libwpe-1.14.0.tar.xz +sha256 c073305bbac5f4402cc1c8a4753bfa3d63a408901f86182051eaa5a75dd89c00 libwpe-1.14.0.tar.xz # Hashes for license files: sha256 35bef295cedbbf179eaee14328002587a0e7dc08ebf3f15ea080a6f2815f0d7b COPYING diff --git a/package/libwpe/libwpe.mk b/package/libwpe/libwpe.mk index fe3c4b16d77..e7b3ce9eaf8 100644 --- a/package/libwpe/libwpe.mk +++ b/package/libwpe/libwpe.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBWPE_VERSION = 1.12.0 +LIBWPE_VERSION = 1.14.0 LIBWPE_SITE = https://wpewebkit.org/releases LIBWPE_SOURCE = libwpe-$(LIBWPE_VERSION).tar.xz LIBWPE_INSTALL_STAGING = YES diff --git a/package/libxcrypt/libxcrypt.hash b/package/libxcrypt/libxcrypt.hash index 99ddf62be01..e1250727055 100644 --- a/package/libxcrypt/libxcrypt.hash +++ b/package/libxcrypt/libxcrypt.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 e4ff47b7fa5370fa08e27258f8a0de5cb7e9b09c297ec7ab56a8a82e229a1c84 libxcrypt-4.4.27.tar.gz +sha256 efb4e225c4e37658444ecdb4825883b70b744541b73022d91c4d12e0dd8e39a0 libxcrypt-4.4.29.tar.gz sha256 f9b48b0bc67a92b752780710aa774cf08b62ec2ebaa3f4aebd00069fba6effd2 LICENSING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/libxcrypt/libxcrypt.mk b/package/libxcrypt/libxcrypt.mk index 65efa2bab9a..18ea6e3c173 100644 --- a/package/libxcrypt/libxcrypt.mk +++ b/package/libxcrypt/libxcrypt.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBXCRYPT_VERSION = 4.4.27 +LIBXCRYPT_VERSION = 4.4.29 LIBXCRYPT_SITE = $(call github,besser82,libxcrypt,v$(LIBXCRYPT_VERSION)) LIBXCRYPT_LICENSE = LGPL-2.1+ LIBXCRYPT_LICENSE_FILES = LICENSING COPYING.LIB diff --git a/package/libxkbcommon/Config.in b/package/libxkbcommon/Config.in index 4e73a24abb9..e9f61227a02 100644 --- a/package/libxkbcommon/Config.in +++ b/package/libxkbcommon/Config.in @@ -7,3 +7,14 @@ config BR2_PACKAGE_LIBXKBCOMMON specification. https://xkbcommon.org + +if BR2_PACKAGE_LIBXKBCOMMON + +config BR2_PACKAGE_LIBXKBCOMMON_TOOLS + bool "tools" + help + Tools: xkbcli, xkbcli-compile-keymap, xkbcli-how-to-type, + xkbcli-interactive-evdev, xkbcli-interactive-x11, + xkbcli-interactive-wayland + +endif diff --git a/package/libxkbcommon/libxkbcommon.hash b/package/libxkbcommon/libxkbcommon.hash index c00fffe7061..fff2b7a9436 100644 --- a/package/libxkbcommon/libxkbcommon.hash +++ b/package/libxkbcommon/libxkbcommon.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2021-September/041976.html -sha256 b3c710d27a2630054e1e1399c85b7f330ef03359b460f0c1b3b587fd01fe9234 libxkbcommon-1.3.1.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2022-February/042104.html +sha256 106cec5263f9100a7e79b5f7220f889bc78e7d7ffc55d2b6fdb1efefb8024031 libxkbcommon-1.4.0.tar.xz # License file: sha256 086caee279449369d41c1157911ec7696e707b93feba7280de757d3c470b2dfb LICENSE diff --git a/package/libxkbcommon/libxkbcommon.mk b/package/libxkbcommon/libxkbcommon.mk index ee2bc1ee99a..236bf4c5d94 100644 --- a/package/libxkbcommon/libxkbcommon.mk +++ b/package/libxkbcommon/libxkbcommon.mk @@ -4,11 +4,12 @@ # ################################################################################ -LIBXKBCOMMON_VERSION = 1.3.1 +LIBXKBCOMMON_VERSION = 1.4.0 LIBXKBCOMMON_SITE = https://xkbcommon.org/download LIBXKBCOMMON_SOURCE = libxkbcommon-$(LIBXKBCOMMON_VERSION).tar.xz LIBXKBCOMMON_LICENSE = MIT/X11 LIBXKBCOMMON_LICENSE_FILES = LICENSE +LIBXKBCOMMON_CPE_ID_VENDOR = xkbcommon LIBXKBCOMMON_INSTALL_STAGING = YES LIBXKBCOMMON_DEPENDENCIES = host-bison host-flex LIBXKBCOMMON_CONF_OPTS = \ @@ -23,4 +24,10 @@ else LIBXKBCOMMON_CONF_OPTS += -Denable-x11=false endif +ifeq ($(BR2_PACKAGE_LIBXKBCOMMON_TOOLS),y) +LIBXKBCOMMON_CONF_OPTS += -Denable-tools=true +else +LIBXKBCOMMON_CONF_OPTS += -Denable-tools=false +endif + $(eval $(meson-package)) diff --git a/package/libxml-parser-perl/libxml-parser-perl.hash b/package/libxml-parser-perl/libxml-parser-perl.hash index 7aeec70b9e7..c3ef1016e8b 100644 --- a/package/libxml-parser-perl/libxml-parser-perl.hash +++ b/package/libxml-parser-perl/libxml-parser-perl.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 d331332491c51cccfb4cb94ffc44f9cd73378e618498d4a37df9e043661c515d XML-Parser-2.46.tar.gz -sha256 6a2e768443ed00f09d3d4bc4dd14451035eac13c6864d68d8e2f76edf5a044f2 README +sha256 d331332491c51cccfb4cb94ffc44f9cd73378e618498d4a37df9e043661c515d XML-Parser-2.46.tar.gz +sha256 6a2e768443ed00f09d3d4bc4dd14451035eac13c6864d68d8e2f76edf5a044f2 README diff --git a/package/libxml2/libxml2.hash b/package/libxml2/libxml2.hash index 81ac3e3f315..37030bdfaa7 100644 --- a/package/libxml2/libxml2.hash +++ b/package/libxml2/libxml2.hash @@ -1,4 +1,4 @@ -# From http://ftp.acc.umu.se/pub/gnome/sources/libxml2/2.9/libxml2-2.9.13.sha256sum -sha256 276130602d12fe484ecc03447ee5e759d0465558fbc9d6bd144e3745306ebf0e libxml2-2.9.13.tar.xz +# From https://download.gnome.org/sources/libxml2/2.10/libxml2-2.10.4.sha256sum +sha256 ed0c91c5845008f1936739e4eee2035531c1c94742c6541f44ee66d885948d45 libxml2-2.10.4.tar.xz # License files, locally calculated -sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd COPYING +sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd Copyright diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk index 5382f28ec4a..cf26a36cc4b 100644 --- a/package/libxml2/libxml2.mk +++ b/package/libxml2/libxml2.mk @@ -4,14 +4,14 @@ # ################################################################################ -LIBXML2_VERSION_MAJOR = 2.9 -LIBXML2_VERSION = $(LIBXML2_VERSION_MAJOR).13 +LIBXML2_VERSION_MAJOR = 2.10 +LIBXML2_VERSION = $(LIBXML2_VERSION_MAJOR).4 LIBXML2_SOURCE = libxml2-$(LIBXML2_VERSION).tar.xz LIBXML2_SITE = \ - http://ftp.gnome.org/pub/gnome/sources/libxml2/$(LIBXML2_VERSION_MAJOR) + https://download.gnome.org/sources/libxml2/$(LIBXML2_VERSION_MAJOR) LIBXML2_INSTALL_STAGING = YES LIBXML2_LICENSE = MIT -LIBXML2_LICENSE_FILES = COPYING +LIBXML2_LICENSE_FILES = Copyright LIBXML2_CPE_ID_VENDOR = xmlsoft LIBXML2_CONFIG_SCRIPTS = xml2-config diff --git a/package/libxmlpp/libxmlpp.hash b/package/libxmlpp/libxmlpp.hash index 50238eff006..1c1342a1051 100644 --- a/package/libxmlpp/libxmlpp.hash +++ b/package/libxmlpp/libxmlpp.hash @@ -1,5 +1,5 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/libxml++/5.0/libxml++-5.0.1.sha256sum -sha256 15c38307a964fa6199f4da6683a599eb7e63cc89198545b36349b87cf9aa0098 libxml++-5.0.1.tar.xz +# From https://download.gnome.org/sources/libxml++/5.0/libxml++-5.0.2.sha256sum +sha256 7c17cc3e5a2214314dee5a1354f4b436f266ded6185232a0534f352a76240d5a libxml++-5.0.2.tar.xz # Hash for license file sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 COPYING diff --git a/package/libxmlpp/libxmlpp.mk b/package/libxmlpp/libxmlpp.mk index 874577eb1fa..dacd5c1eaea 100644 --- a/package/libxmlpp/libxmlpp.mk +++ b/package/libxmlpp/libxmlpp.mk @@ -5,11 +5,11 @@ ################################################################################ LIBXMLPP_VERSION_MAJOR = 5.0 -LIBXMLPP_VERSION = $(LIBXMLPP_VERSION_MAJOR).1 +LIBXMLPP_VERSION = $(LIBXMLPP_VERSION_MAJOR).2 LIBXMLPP_LICENSE = LGPL-2.1 (library), LGPL-2.0+ (examples) LIBXMLPP_LICENSE_FILES = COPYING LIBXMLPP_SOURCE = libxml++-$(LIBXMLPP_VERSION).tar.xz -LIBXMLPP_SITE = http://ftp.gnome.org/pub/GNOME/sources/libxml++/$(LIBXMLPP_VERSION_MAJOR) +LIBXMLPP_SITE = https://download.gnome.org/sources/libxml++/$(LIBXMLPP_VERSION_MAJOR) LIBXMLPP_INSTALL_STAGING = YES LIBXMLPP_DEPENDENCIES = libxml2 glibmm host-pkgconf LIBXMLPP_CONF_OPTS = \ diff --git a/package/libxslt/libxslt.hash b/package/libxslt/libxslt.hash index 39523a69534..458c1388d32 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.35.sha256sum -sha256 8247f33e9a872c6ac859aa45018bc4c4d00b97e2feac9eebc10c93ce1f34dd79 libxslt-1.1.35.tar.xz +# From https://download.gnome.org/sources/libxslt/1.1/libxslt-1.1.38.sha256sum +sha256 1f32450425819a09acaff2ab7a5a7f8a2ec7956e505d7beeb45e843d0e1ecab1 libxslt-1.1.38.tar.xz # Hash for license file: sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 COPYING diff --git a/package/libxslt/libxslt.mk b/package/libxslt/libxslt.mk index df0286e9868..ec066fbfa22 100644 --- a/package/libxslt/libxslt.mk +++ b/package/libxslt/libxslt.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBXSLT_VERSION = 1.1.35 +LIBXSLT_VERSION = 1.1.38 LIBXSLT_SOURCE = libxslt-$(LIBXSLT_VERSION).tar.xz LIBXSLT_SITE = https://download.gnome.org/sources/libxslt/1.1 LIBXSLT_INSTALL_STAGING = YES diff --git a/package/libyang/libyang.hash b/package/libyang/libyang.hash index c129896a633..26a28d6eedf 100644 --- a/package/libyang/libyang.hash +++ b/package/libyang/libyang.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 184dd67c66c1ad968a2ee4d0950fb6b103834917b04b17af9c7bca80967636ee libyang-2.0.112.tar.gz +sha256 761cfd959342b147f6a43a84c931c7fde68dd3a1ad540a0e5302288b204f073d libyang-2.1.30.tar.gz sha256 0b7ec43747d211a1e49c53588b0822062947bab6bdcc95238578beab34cba5bb LICENSE diff --git a/package/libyang/libyang.mk b/package/libyang/libyang.mk index 7de9531bffa..f160035c098 100644 --- a/package/libyang/libyang.mk +++ b/package/libyang/libyang.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBYANG_VERSION = 2.0.112 +LIBYANG_VERSION = 2.1.30 LIBYANG_SITE = $(call github,CESNET,libyang,v$(LIBYANG_VERSION)) LIBYANG_LICENSE = BSD-3-Clause LIBYANG_LICENSE_FILES = LICENSE @@ -15,13 +15,12 @@ LIBYANG_DEPENDENCIES = pcre2 HOST_LIBYANG_DEPENDENCIES = host-pcre2 LIBYANG_CONF_OPTS = \ - -DENABLE_VALGRIND_TESTS=OFF \ - -DGEN_PYTHON_BINDINGS=OFF \ - -DENABLE_LYD_PRIV=ON + -DENABLE_TESTS=OFF \ + -DENABLE_VALGRIND_TESTS=OFF HOST_LIBYANG_CONF_OPTS = \ - -DENABLE_VALGRIND_TESTS=OFF \ - -DGEN_PYTHON_BINDINGS=OFF + -DENABLE_TESTS=OFF \ + -DENABLE_VALGRIND_TESTS=OFF $(eval $(cmake-package)) $(eval $(host-cmake-package)) diff --git a/package/libzip/libzip.hash b/package/libzip/libzip.hash index 5afdfd7cb8c..26c038e4b65 100644 --- a/package/libzip/libzip.hash +++ b/package/libzip/libzip.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f0763bda24ba947e80430be787c4b068d8b6aa6027a26a19923f0acfa3dac97e libzip-1.8.0.tar.xz -sha256 deae392de70503672793ee784d603bfa8069dcd5974a325dfbf91160f3a147d6 LICENSE +sha256 c93e9852b7b2dc931197831438fee5295976ee0ba24f8524a8907be5c2ba5937 libzip-1.9.2.tar.xz +sha256 01c022eca6d566e2e8792fd0f091a28653b2a608319922bcd4de91c49d1438e1 LICENSE diff --git a/package/libzip/libzip.mk b/package/libzip/libzip.mk index 6bc5c5c1939..0c9d66d8776 100644 --- a/package/libzip/libzip.mk +++ b/package/libzip/libzip.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBZIP_VERSION = 1.8.0 +LIBZIP_VERSION = 1.9.2 LIBZIP_SITE = https://libzip.org/download LIBZIP_SOURCE = libzip-$(LIBZIP_VERSION).tar.xz LIBZIP_LICENSE = BSD-3-Clause diff --git a/package/libzlib/libzlib.hash b/package/libzlib/libzlib.hash index e3736b10118..df5e8d723a1 100644 --- a/package/libzlib/libzlib.hash +++ b/package/libzlib/libzlib.hash @@ -1,4 +1,4 @@ # From http://www.zlib.net/ -sha256 4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066 zlib-1.2.11.tar.xz +sha256 d14c38e313afc35a9a8760dadf26042f51ea0f5d154b0630a31da0540107fb98 zlib-1.2.13.tar.xz # License files, locally calculated -sha256 7960b6b1cc63e619abb77acaea5427159605afee8c8b362664f4effc7d7f7d15 README +sha256 845efc77857d485d91fb3e0b884aaa929368c717ae8186b66fe1ed2495753243 LICENSE diff --git a/package/libzlib/libzlib.mk b/package/libzlib/libzlib.mk index a10fc748d17..e344cc7ad9c 100644 --- a/package/libzlib/libzlib.mk +++ b/package/libzlib/libzlib.mk @@ -4,14 +4,14 @@ # ################################################################################ -LIBZLIB_VERSION = 1.2.11 +LIBZLIB_VERSION = 1.2.13 LIBZLIB_SOURCE = zlib-$(LIBZLIB_VERSION).tar.xz LIBZLIB_SITE = http://www.zlib.net LIBZLIB_LICENSE = Zlib -LIBZLIB_LICENSE_FILES = README +LIBZLIB_LICENSE_FILES = LICENSE LIBZLIB_INSTALL_STAGING = YES LIBZLIB_PROVIDES = zlib -LIBZLIB_CPE_ID_VENDOR = gnu +LIBZLIB_CPE_ID_VENDOR = zlib LIBZLIB_CPE_ID_PRODUCT = zlib # It is not possible to build only a shared version of zlib, so we build both diff --git a/package/lightning/0001-include-Makefile.am-don-t-install-lightning.h-twice.patch b/package/lightning/0001-include-Makefile.am-don-t-install-lightning.h-twice.patch deleted file mode 100644 index fb5299c25f5..00000000000 --- a/package/lightning/0001-include-Makefile.am-don-t-install-lightning.h-twice.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 604c931bc673c507254a84c0f423c9ec8ce6e3a1 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 10 Oct 2019 20:36:46 +0200 -Subject: [PATCH] include/Makefile.am: don't install lightning.h twice - -Commit 17164ed32d8f3530153b9cad67a4399c65f24512 added lightning.h to -nodist_include_HEADERS without removing it from include_HEADERS - -This raises the following error on one of the buildroot autobuilders: -/usr/bin/install -c -m 644 lightning.h '/home/test/autobuild/run/instance-3/output-1/target/usr/include' -/usr/bin/install -c -m 644 lightning.h '/home/test/autobuild/run/instance-3/output-1/target/usr/include' -/usr/bin/install: cannot create regular file `/home/test/autobuild/run/instance-3/output-1/target/usr/include/lightning.h': File exists - -Fix this by removing lightning.h from include_HEADERS - -Fixes: - - http://autobuild.buildroot.org/results/05ebc75598627d2a08e08e194f51cb8464f97b95 - -Signed-off-by: Fabrice Fontaine ---- - include/Makefile.am | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/include/Makefile.am b/include/Makefile.am -index e754dd3..8f91594 100644 ---- a/include/Makefile.am -+++ b/include/Makefile.am -@@ -14,7 +14,6 @@ - # License for more details. - # - --include_HEADERS = lightning.h - SUBDIRS = \ - lightning - --- -2.23.0 - diff --git a/package/lightning/0001-lib-jit_disasm.c-fix-build.patch b/package/lightning/0001-lib-jit_disasm.c-fix-build.patch new file mode 100644 index 00000000000..9e79be91a0a --- /dev/null +++ b/package/lightning/0001-lib-jit_disasm.c-fix-build.patch @@ -0,0 +1,42 @@ +From 0d828c96c373c34b201ca7ea37b61c1e3b0485cd Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 19 Dec 2022 23:55:31 +0100 +Subject: [PATCH] lib/jit_disasm.c: fix build + +Fix the following build failure raised since +http://git.savannah.gnu.org/cgit/lightning.git/commit/?id=837c7a1e8d08fb9294578dc84694077f4d6106f9: + +jit_disasm.c: In function 'fprintf_styled': +jit_disasm.c:57:27: error: parameter name omitted + 57 | static int fprintf_styled(void *, enum disassembler_style, const char* fmt, ...) + | ^~~~~~ +jit_disasm.c:57:35: error: parameter name omitted + 57 | static int fprintf_styled(void *, enum disassembler_style, const char* fmt, ...) + | ^~~~~~~~~~~~~~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/e15e01e98e0d8c873efd3f512b671d98e4daf6c0 + +Signed-off-by: Fabrice Fontaine +[yann.morin.1998@free.fr: make it a backport now it's applied upstream] +Signed-off-by: Yann E. MORIN +--- + lib/jit_disasm.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/jit_disasm.c b/lib/jit_disasm.c +index 58a269b..68c966d 100644 +--- a/lib/jit_disasm.c ++++ b/lib/jit_disasm.c +@@ -54,7 +54,7 @@ static FILE *disasm_stream; + #endif + + #if BINUTILS_2_38 +-static int fprintf_styled(void *, enum disassembler_style, const char* fmt, ...) ++static int fprintf_styled(void * stream, enum disassembler_style style, const char* fmt, ...) + { + va_list args; + int r; +-- +2.25.1 + diff --git a/package/lightning/Config.in b/package/lightning/Config.in index a0542edce94..3cf7c28ae29 100644 --- a/package/lightning/Config.in +++ b/package/lightning/Config.in @@ -1,13 +1,14 @@ -comment "lightning needs a toolchain w/ dynamic library" +comment "lightning needs a toolchain w/ dynamic library, threads" depends on BR2_sparc || BR2_i386 || BR2_x86_64 || BR2_mips || \ BR2_mipsel || BR2_arm || BR2_powerpc || BR2_RISCV_64 - depends on BR2_STATIC_LIBS + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS config BR2_PACKAGE_LIGHTNING bool "lightning" depends on BR2_sparc || BR2_i386 || BR2_x86_64 || BR2_mips || \ BR2_mipsel || BR2_arm || BR2_powerpc || BR2_RISCV_64 depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_THREADS help GNU lightning is a library that generates assembly language code at run-time. diff --git a/package/lightning/lightning.hash b/package/lightning/lightning.hash index bd20c85cbb7..998ae3743bb 100644 --- a/package/lightning/lightning.hash +++ b/package/lightning/lightning.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ed856b866dc6f68678dc1151579118fab1c65fad687cf847fc2d94ca045efdc9 lightning-2.1.3.tar.gz -sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING.LESSER +sha256 4e3984ff1ccf0ba30a985211d40fc5c06b25f014ebdf3d80d0fe3d0c80dd7c0e lightning-2.2.0.tar.gz +sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING.LESSER diff --git a/package/lightning/lightning.mk b/package/lightning/lightning.mk index da8c07e61f7..8ab2ca1f9db 100644 --- a/package/lightning/lightning.mk +++ b/package/lightning/lightning.mk @@ -4,14 +4,12 @@ # ################################################################################ -LIGHTNING_VERSION = 2.1.3 +LIGHTNING_VERSION = 2.2.0 LIGHTNING_SITE = $(BR2_GNU_MIRROR)/lightning LIGHTNING_LICENSE = LGPL-3.0+ LIGHTNING_LICENSE_FILES = COPYING.LESSER LIGHTNING_INSTALL_STAGING = YES LIGHTNING_CPE_ID_VENDOR = gnu -# We're patching include/Makefile.am -LIGHTNING_AUTORECONF = YES ifeq ($(BR2_PACKAGE_LIGHTNING_DISASSEMBLER),y) LIGHTNING_DEPENDENCIES += binutils zlib 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 1a887655b8b..2eab2a84e52 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,11 +1,11 @@ -From d1de409b0aeb8dffd42673444043caf01437804e Mon Sep 17 00:00:00 2001 +From d9e1c9c4a95797c812dd4906ecbbc532ae459364 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 starting conf * Changed the log path to /var/log and logs filenames - * Disable IPv6 + * Disable IPv6 (Dropped since 1.4.68) * Do not setuid to a user that doesn't exist on the system * Change the network backend to writev since linux-sendfile fails on buildroot @@ -13,13 +13,15 @@ Signed-off-by: Maxime Ripard Signed-off-by: Simon Dawson [Gustavo: update for 1.4.37] Signed-off-by: Gustavo Zacarias +[Thomas: update for 1.4.69 - drop server.use-ipv6] +Signed-off-by: Thomas Devoogdt --- doc/config/conf.d/access_log.conf | 2 +- - doc/config/lighttpd.conf | 16 ++++++++-------- - 2 files changed, 9 insertions(+), 9 deletions(-) + doc/config/lighttpd.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 e685d43..92cff4f 100644 +index e685d437..92cff4f0 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" ) @@ -32,7 +34,7 @@ index e685d43..92cff4f 100644 ## ## The default format produces CLF compatible output. diff --git a/doc/config/lighttpd.conf b/doc/config/lighttpd.conf -index 495d2a1..c3e1446 100644 +index d45a284d..4e926d5a 100644 --- a/doc/config/lighttpd.conf +++ b/doc/config/lighttpd.conf @@ -13,8 +13,8 @@ @@ -46,16 +48,7 @@ index 495d2a1..c3e1446 100644 var.state_dir = "/run" var.home_dir = "/var/lib/lighttpd" var.conf_dir = "/etc/lighttpd" -@@ -90,7 +90,7 @@ server.port = 80 - ## - ## Use IPv6? - ## --server.use-ipv6 = "enable" -+# server.use-ipv6 = "enable" - - ## - ## bind to a specific IP -@@ -101,8 +101,8 @@ server.use-ipv6 = "enable" +@@ -97,8 +97,8 @@ server.port = 80 ## Run as a different username/groupname. ## This requires root permissions during startup. ## @@ -66,7 +59,7 @@ index 495d2a1..c3e1446 100644 ## ## Enable lighttpd to serve requests on sockets received from systemd -@@ -118,7 +118,7 @@ server.groupname = "lighttpd" +@@ -114,7 +114,7 @@ server.groupname = "lighttpd" ## ## Document root ## @@ -75,7 +68,7 @@ index 495d2a1..c3e1446 100644 ## ## The value for the "Server:" response field. -@@ -144,7 +144,7 @@ server.pid-file = state_dir + "/lighttpd.pid" +@@ -140,7 +140,7 @@ server.pid-file = state_dir + "/lighttpd.pid" ## ## Path to the error log file ## @@ -84,7 +77,7 @@ index 495d2a1..c3e1446 100644 ## ## If you want to log to syslog you have to unset the -@@ -192,7 +192,7 @@ include conf_dir + "/conf.d/debug.conf" +@@ -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 ## @@ -94,5 +87,5 @@ index 495d2a1..c3e1446 100644 ## ## As lighttpd is a single-threaded server, its main resource limit is -- -2.34.1 +2.39.0 diff --git a/package/lighttpd/0002-build-meson-fix-typo-in-variable-name.patch b/package/lighttpd/0002-build-meson-fix-typo-in-variable-name.patch deleted file mode 100644 index d338979d465..00000000000 --- a/package/lighttpd/0002-build-meson-fix-typo-in-variable-name.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 876a1e1b2cc21282a0df5245004197cdffe1d380 Mon Sep 17 00:00:00 2001 -From: Glenn Strauss -Date: Thu, 20 Jan 2022 07:04:51 -0500 -Subject: [PATCH] [build] meson: fix typo in variable name - -[Retrieved from: -https://github.com/lighttpd/lighttpd1.4/commit/876a1e1b2cc21282a0df5245004197cdffe1d380] -Signed-off-by: Fabrice Fontaine ---- - src/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/meson.build b/src/meson.build -index 4ee163468..b35c1037f 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -266,7 +266,7 @@ endif - libbrotli = [] - if get_option('with_brotli') - libbrotli = [ compiler.find_library('brotlienc') ] -- if compiler.has_function('BrotliEncoderCreateInstance', args: defs, dependencies: libbrotlienc, prefix: '#include ') -+ if compiler.has_function('BrotliEncoderCreateInstance', args: defs, dependencies: libbrotli, prefix: '#include ') - conf_data.set('HAVE_BROTLI_ENCODE_H', true) - conf_data.set('HAVE_BROTLI', true) - else diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in index 6f0c927319f..5d9e6245067 100644 --- a/package/lighttpd/Config.in +++ b/package/lighttpd/Config.in @@ -93,6 +93,7 @@ config BR2_PACKAGE_LIGHTTPD_PGSQL bool "pgsql support" depends on BR2_USE_MMU # postgresql depends on BR2_USE_WCHAR # postgresql + depends on !BR2_OPTIMIZE_FAST # postgresql select BR2_PACKAGE_POSTGRESQL help Enable postgres support for lighttpd mod_vhostdb_pgsql. @@ -101,6 +102,9 @@ comment "pgsql support needs a toolchain w/ wchar" depends on BR2_USE_MMU depends on !BR2_USE_WCHAR +comment "pgsql support can't be built with Optimize for fast" + depends on BR2_OPTIMIZE_FAST + config BR2_PACKAGE_LIGHTTPD_WEBDAV bool "webdav support" select BR2_PACKAGE_LIBXML2 diff --git a/package/lighttpd/lighttpd.hash b/package/lighttpd/lighttpd.hash index ce026b9b4a6..29bf5124b69 100644 --- a/package/lighttpd/lighttpd.hash +++ b/package/lighttpd/lighttpd.hash @@ -1,4 +1,4 @@ -# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.64.sha512sum -sha512 8e2ad0830ff80fcebf0c33600caafb5ab4e9ff6b5073c12572f88a44fdfe85f777fa8b22b2fc2964fecbeb556997ad660867dcee80efb224d63329c8b18ea936 lighttpd-1.4.64.tar.xz +# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.69.sha512sum +sha512 9d174c8e0a192b4eb8218a9f76b0bd42f90030228600bb7bbe35ebb9e7bbaea36ee2732535c5cc6dab171294817837bfa26074ff84a37832dd89f57488b4071f lighttpd-1.4.69.tar.xz # Locally calculated sha256 5c98cad2fbaf5c5e2562bcbab401a7c557c1bb1bac9914ecc63730925052fb13 COPYING diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index 595c59cb372..ca2035b6b39 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).64 +LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).69 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,49 +13,49 @@ LIGHTTPD_LICENSE_FILES = COPYING LIGHTTPD_CPE_ID_VENDOR = lighttpd LIGHTTPD_DEPENDENCIES = host-pkgconf xxhash LIGHTTPD_CONF_OPTS = \ - -Dwith_dbi=false \ - -Dwith_fam=false \ + -Dwith_dbi=disabled \ + -Dwith_fam=disabled \ -Dwith_gnutls=false \ - -Dwith_libev=false \ - -Dwith_libunwind=false \ + -Dwith_libev=disabled \ + -Dwith_libunwind=disabled \ -Dwith_mbedtls=false \ -Dwith_nettle=false \ -Dwith_nss=false \ - -Dwith_pcre=false \ - -Dwith_sasl=false \ + -Dwith_pcre=disabled \ + -Dwith_sasl=disabled \ -Dwith_wolfssl=false \ -Dwith_xattr=false \ - -Dwith_xxhash=true \ + -Dwith_xxhash=enabled \ -Dbuild_extra_warnings=false \ -Dbuild_static=false \ -Dmoduledir=lib/lighttpd ifeq ($(BR2_PACKAGE_LIGHTTPD_BROTLI),y) LIGHTTPD_DEPENDENCIES += brotli -LIGHTTPD_CONF_OPTS += -Dwith_brotli=true +LIGHTTPD_CONF_OPTS += -Dwith_brotli=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_brotli=false +LIGHTTPD_CONF_OPTS += -Dwith_brotli=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_BZIP2),y) LIGHTTPD_DEPENDENCIES += bzip2 -LIGHTTPD_CONF_OPTS += -Dwith_bzip=true +LIGHTTPD_CONF_OPTS += -Dwith_bzip=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_bzip=false +LIGHTTPD_CONF_OPTS += -Dwith_bzip=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_KRB5),y) LIGHTTPD_DEPENDENCIES += libkrb5 -LIGHTTPD_CONF_OPTS += -Dwith_krb5=true +LIGHTTPD_CONF_OPTS += -Dwith_krb5=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_krb5=false +LIGHTTPD_CONF_OPTS += -Dwith_krb5=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_LDAP),y) LIGHTTPD_DEPENDENCIES += openldap -LIGHTTPD_CONF_OPTS += -Dwith_ldap=true +LIGHTTPD_CONF_OPTS += -Dwith_ldap=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_ldap=false +LIGHTTPD_CONF_OPTS += -Dwith_ldap=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_LUA),y) @@ -67,16 +67,16 @@ endif ifeq ($(BR2_PACKAGE_LIGHTTPD_MAXMINDDB),y) LIGHTTPD_DEPENDENCIES += libmaxminddb -LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=true +LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=false +LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_MYSQL),y) LIGHTTPD_DEPENDENCIES += mysql -LIGHTTPD_CONF_OPTS += -Dwith_mysql=true +LIGHTTPD_CONF_OPTS += -Dwith_mysql=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_mysql=false +LIGHTTPD_CONF_OPTS += -Dwith_mysql=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_OPENSSL),y) @@ -88,9 +88,9 @@ endif ifeq ($(BR2_PACKAGE_LIGHTTPD_PAM),y) LIGHTTPD_DEPENDENCIES += linux-pam -LIGHTTPD_CONF_OPTS += -Dwith_pam=true +LIGHTTPD_CONF_OPTS += -Dwith_pam=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_pam=false +LIGHTTPD_CONF_OPTS += -Dwith_pam=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_PCRE),y) @@ -102,36 +102,36 @@ endif ifeq ($(BR2_PACKAGE_LIGHTTPD_PGSQL),y) LIGHTTPD_DEPENDENCIES += postgresql -LIGHTTPD_CONF_OPTS += -Dwith_pgsql=true +LIGHTTPD_CONF_OPTS += -Dwith_pgsql=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_pgsql=false +LIGHTTPD_CONF_OPTS += -Dwith_pgsql=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_WEBDAV),y) LIGHTTPD_DEPENDENCIES += libxml2 sqlite -LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=true +LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=enabled ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) -LIGHTTPD_CONF_OPTS += -Dwith_webdav_locks=true +LIGHTTPD_CONF_OPTS += -Dwith_webdav_locks=enabled LIGHTTPD_DEPENDENCIES += util-linux else -LIGHTTPD_CONF_OPTS += -Dwith_webdav_locks=false +LIGHTTPD_CONF_OPTS += -Dwith_webdav_locks=disabled endif else -LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=false -Dwith_webdav_locks=false +LIGHTTPD_CONF_OPTS += -Dwith_webdav_props=disabled -Dwith_webdav_locks=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_ZLIB),y) LIGHTTPD_DEPENDENCIES += zlib -LIGHTTPD_CONF_OPTS += -Dwith_zlib=true +LIGHTTPD_CONF_OPTS += -Dwith_zlib=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_zlib=false +LIGHTTPD_CONF_OPTS += -Dwith_zlib=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_ZSTD),y) LIGHTTPD_DEPENDENCIES += zstd -LIGHTTPD_CONF_OPTS += -Dwith_zstd=true +LIGHTTPD_CONF_OPTS += -Dwith_zstd=enabled else -LIGHTTPD_CONF_OPTS += -Dwith_zstd=false +LIGHTTPD_CONF_OPTS += -Dwith_zstd=disabled endif define LIGHTTPD_INSTALL_CONFIG diff --git a/package/linenoise/linenoise.hash b/package/linenoise/linenoise.hash index a1cabd9eff0..9a1436eb8b0 100644 --- a/package/linenoise/linenoise.hash +++ b/package/linenoise/linenoise.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f5054a4fe120d43d85427cf58af93e56b9bb80389d507a9bec9b75531a340014 linenoise-1.0.tar.gz +sha256 1086f82fbf30b0618b1953b05d33db62c68fc7ce49391ce1374192f776fde72d linenoise-97d2850af13c339369093b78abe5265845d78220.tar.gz sha256 efe1692aa5b869edaa0ac88f95eb0276c1125304ffc636a299db3ebbab47f62b LICENSE diff --git a/package/linenoise/linenoise.mk b/package/linenoise/linenoise.mk index a8fe7674c2b..fd2c4c70358 100644 --- a/package/linenoise/linenoise.mk +++ b/package/linenoise/linenoise.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINENOISE_VERSION = 1.0 +LINENOISE_VERSION = 97d2850af13c339369093b78abe5265845d78220 LINENOISE_SITE = $(call github,antirez,linenoise,$(LINENOISE_VERSION)) LINENOISE_LICENSE = BSD-2-Clause LINENOISE_LICENSE_FILES = LICENSE diff --git a/package/linknx/linknx.mk b/package/linknx/linknx.mk index dbee0742fed..dcfcd5e3f59 100644 --- a/package/linknx/linknx.mk +++ b/package/linknx/linknx.mk @@ -23,7 +23,10 @@ LINKNX_DEPENDENCIES = \ host-pkgconf \ libpthsem \ $(if $(BR2_PACKAGE_ARGP_STANDALONE),argp-standalone) \ - $(if $(BR2_PACKAGE_LIBICONV),libiconv) + $(if $(BR2_PACKAGE_LIBICONV),libiconv) \ + $(TARGET_NLS_DEPENDENCIES) + +LINKNX_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) ifeq ($(BR2_PACKAGE_LIBCURL),y) LINKNX_CONF_OPTS += --with-libcurl=$(STAGING_DIR)/usr diff --git a/package/links/links.hash b/package/links/links.hash index 0f8cd329378..83b27aeb9dd 100644 --- a/package/links/links.hash +++ b/package/links/links.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2dd78508698e8279ef4f09a3a2a21e9595040113402da6c553974414fb49dd2c links-2.25.tar.bz2 +sha256 f05b3577f25dbe63e491c424f0ecb31f7bfadce9b2bc2f111dfed049c004c9cb links-2.26.tar.bz2 sha256 92deeb70791366630095d4e0714fe37d6e2bd5db0e6ef498ebb8de328f45b253 COPYING diff --git a/package/links/links.mk b/package/links/links.mk index 1f1a7a91894..a861fd657a6 100644 --- a/package/links/links.mk +++ b/package/links/links.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINKS_VERSION = 2.25 +LINKS_VERSION = 2.26 LINKS_SOURCE = links-$(LINKS_VERSION).tar.bz2 LINKS_SITE = http://links.twibright.com/download LINKS_DEPENDENCIES = host-pkgconf diff --git a/package/linux-backports/Config.in b/package/linux-backports/Config.in index 251d202fd27..a434d0042b5 100644 --- a/package/linux-backports/Config.in +++ b/package/linux-backports/Config.in @@ -8,13 +8,24 @@ config BR2_PACKAGE_LINUX_BACKPORTS The linux-backports package includes many Linux drivers from recent kernels, backported to older ones. - This version of linux-backports supports kernels starting - from 3.10. - https://backports.wiki.kernel.org if BR2_PACKAGE_LINUX_BACKPORTS +choice + prompt "Linux Backports version" + default BR2_PACKAGE_LINUX_BACKPORTS_5_15_X + help + Select the highest version that supports your kernel version. + +config BR2_PACKAGE_LINUX_BACKPORTS_5_15_X + bool "5.15.x (for kernels back to 4.4)" + +config BR2_PACKAGE_LINUX_BACKPORTS_5_10_X + bool "5.10.x (for kernels back to 3.10)" + +endchoice + choice prompt "Linux kernel driver backports configuration" default BR2_PACKAGE_LINUX_BACKPORTS_USE_DEFCONFIG diff --git a/package/linux-backports/linux-backports.hash b/package/linux-backports/linux-backports.hash index 3e103424f50..ce4278dffa8 100644 --- a/package/linux-backports/linux-backports.hash +++ b/package/linux-backports/linux-backports.hash @@ -1,5 +1,7 @@ -# From: https://www.kernel.org/pub/linux/kernel/projects/backports/stable/v5.8/sha256sums.asc -sha256 19b4174d89bf11ee221458e11f1e8dace26558498774b823051156f522d2036b backports-5.8-1.tar.xz +# From: https://www.kernel.org/pub/linux/kernel/projects/backports/stable/v5.10.110/sha256sums.asc +sha256 3d958154080c059adaf26512430fd1a8888d65a2228e5e70e48d028201e148b1 backports-5.10.110-1.tar.xz +# From: https://www.kernel.org/pub/linux/kernel/projects/backports/stable/v5.15.58/sha256sums.asc +sha256 a3c2a2b7bbaf8943c65fd72f4e7d7ad5e205aeae28b26c835f9d8afa0f9810bf backports-5.15.58-1.tar.xz # Locally computed sha256 fb5a425bd3b3cd6071a3a9aff9909a859e7c1158d54d32e07658398cd67eb6a0 COPYING sha256 8e378ab93586eb55135d3bc119cce787f7324f48394777d00c34fa3d0be3303f LICENSES/exceptions/Linux-syscall-note diff --git a/package/linux-backports/linux-backports.mk b/package/linux-backports/linux-backports.mk index 068dcffcc82..8513a84487a 100644 --- a/package/linux-backports/linux-backports.mk +++ b/package/linux-backports/linux-backports.mk @@ -4,7 +4,17 @@ # ################################################################################ -LINUX_BACKPORTS_VERSION_MAJOR = 5.8 +ifeq ($(BR2_PACKAGE_LINUX_BACKPORTS_5_10_X),y) +LINUX_BACKPORTS_VERSION_MAJOR = 5.10.110 +LINUX_BACKPORTS_MINIMAL_KVER_MAJOR = 3 +LINUX_BACKPORTS_MINIMAL_KVER_MINOR = 10 +else +# use default the latest version as default +LINUX_BACKPORTS_VERSION_MAJOR = 5.15.58 +LINUX_BACKPORTS_MINIMAL_KVER_MAJOR = 4 +LINUX_BACKPORTS_MINIMAL_KVER_MINOR = 4 +endif + LINUX_BACKPORTS_VERSION = $(LINUX_BACKPORTS_VERSION_MAJOR)-1 LINUX_BACKPORTS_SOURCE = backports-$(LINUX_BACKPORTS_VERSION).tar.xz LINUX_BACKPORTS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/projects/backports/stable/v$(LINUX_BACKPORTS_VERSION_MAJOR) @@ -93,8 +103,8 @@ $(eval $(kconfig-package)) # can't use it as a stamp file. We use the LINUX_KCONFIG_STAMP_DOTCONFIG # instead. # -# Furthermore, we want to check the kernel version, since linux-backports -# only supports kernels >= 3.10. To avoid overriding linux-backports' +# Furthermore, we want to check the kernel version is compatible with +# linux-backports. To avoid overriding linux-backports' # KCONFIG_STAMP_DOTCONFIG rule defined in the kconfig-package infra, we # use an intermediate stamp-file. # @@ -107,11 +117,18 @@ $(LINUX_BACKPORTS_DIR)/$(LINUX_BACKPORTS_KCONFIG_STAMP_DOTCONFIG): $(LINUX_BACKP .SECONDEXPANSION: $(LINUX_BACKPORTS_DIR)/.stamp_check_kernel_version: $$(LINUX_DIR)/$$(LINUX_KCONFIG_STAMP_DOTCONFIG) $(Q)KVER=$(LINUX_VERSION_PROBED); \ + MIN_KVER_MAJOR=$(LINUX_BACKPORTS_MINIMAL_KVER_MAJOR); \ + MIN_KVER_MINOR=$(LINUX_BACKPORTS_MINIMAL_KVER_MINOR); \ KVER_MAJOR=`echo $${KVER} | sed 's/^\([0-9]*\)\..*/\1/'`; \ KVER_MINOR=`echo $${KVER} | sed 's/^[0-9]*\.\([0-9]*\).*/\1/'`; \ - if [ $${KVER_MAJOR} -lt 3 -o \( $${KVER_MAJOR} -eq 3 -a $${KVER_MINOR} -lt 10 \) ]; then \ - printf "Linux version '%s' is too old for linux-backports (needs 3.10 or later)\n" \ - "$${KVER}"; \ + if [ $${KVER_MAJOR} -lt $(LINUX_BACKPORTS_MINIMAL_KVER_MAJOR) \ + -o \( $${KVER_MAJOR} -eq $(LINUX_BACKPORTS_MINIMAL_KVER_MAJOR) \ + -a $${KVER_MINOR} -lt $(LINUX_BACKPORTS_MINIMAL_KVER_MINOR) \ + \) ]; then \ + printf "Linux version '%s' is too old for linux-backports (needs %s.%s or later)\n" \ + "$${KVER}" \ + "$(LINUX_BACKPORTS_MINIMAL_KVER_MAJOR)" \ + "$(LINUX_BACKPORTS_MINIMAL_KVER_MINOR)"; \ exit 1; \ fi $(Q)touch $(@) diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in index c94ffe24def..4b415a7da2e 100644 --- a/package/linux-firmware/Config.in +++ b/package/linux-firmware/Config.in @@ -175,6 +175,12 @@ config BR2_PACKAGE_LINUX_FIRMWARE_CYPRESS_CYW54XXX help Firmware files for the Cypress cyw54xxx FullMAC. +config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_22000 + bool "Intel iwlwifi 22000" + help + Firmware files for the Intel Wifi 22000 devices supported by + the iwlwifi kernel driver. + config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_22260 bool "Intel iwlwifi 22260" help @@ -193,6 +199,18 @@ config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3168 Firmware files for the Intel Wifi 3168 devices supported by the iwlwifi kernel driver. +config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3945 + bool "Intel iwlwifi 3945" + help + Firmware files for the Intel Wifi 3945 devices supported by + the iwl3945 kernel driver. + +config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_4965 + bool "Intel iwlwifi 4965" + help + Firmware files for the Intel Wifi 4965 devices supported by + the iwl4965 kernel driver. + config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_5000 bool "Intel iwlwifi 5000" help @@ -250,6 +268,12 @@ config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_9XXX Firmware files for the Intel Wifi 9xxx devices supported by the iwlwifi kernel driver. +config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_6E + bool "Intel iwlwifi 6/6E" + help + Firmware files for the Intel Wi-Fi 6 and Wi-Fi 6E devices + supported by the iwlwifi kernel driver. + config BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8686_V8 bool "Libertas SD 8686 v8" help diff --git a/package/linux-firmware/linux-firmware.hash b/package/linux-firmware/linux-firmware.hash index 83275ec6d74..6bbc2f9c772 100644 --- a/package/linux-firmware/linux-firmware.hash +++ b/package/linux-firmware/linux-firmware.hash @@ -1,9 +1,9 @@ # From https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/sha256sums.asc -sha256 eeddb4e6bef31fd1a3757f12ccc324929bbad97855c0b9ec5ed780f74de1837d linux-firmware-20211216.tar.xz +sha256 e793783e92acbde549965521462d1d1327827360664cf242dbda08f075654331 linux-firmware-20221214.tar.xz # Hash for license files sha256 8116433f4004fc0c24d72b3d9e497808b724aa0e5e1cd63fc1bf66b715b1e2e9 LICENCE.Abilis -sha256 8d5847d2971241d4d6a51c16e206379de53a6d4e203fa6f8e1c1e9279c7c4ad0 LICENSE.amdgpu +sha256 a6c0ec4338bc89480da52812bea7f9e4b52bc7118e3e352141f99d779c397c53 LICENSE.amdgpu sha256 2d6062d63b91eb750bf741498691604f75184b9fee97608ec537cd09bd6a42b4 LICENCE.Marvell sha256 802b7014b26c606cf6248ae8b0ab1ce6d2d1b0db236d38dd269e676cd70710f2 LICENCE.atheros_firmware sha256 3b5eb392b2d9d8c46d6aae26d06c187e5ea3029b12d13bc2b8deb8b3ce6bfa53 ath10k/QCA6174/hw3.0/notice_ath10k_firmware-4.txt @@ -14,9 +14,11 @@ sha256 a5777f9e80aca0603b0648454de996168b1c530322550ccda94d6d78bcf6c061 LICENC sha256 ae0db6cc4db33941148df0f67de53e76a77b1b5a46b3165edb7040aa2750015f LICENCE.cypress sha256 60fbc9cccb455e1a3306c97db942d6f24fa93664be61d54c497637e6d0e2ae83 LICENCE.fw_sst_0f28 sha256 5181b0b51efc79d5acb2c9bb92042878fdbad97a92114d4ab5e32e2b5b52fce4 LICENCE.ibt_firmware +sha256 8c45a83562a69f7ac4207e4cb5c0063af2e545791b3947bc81dc82305481c15c LICENSE.ice_enhanced sha256 0e0c11073ba3c832097da38e0905da36b8a3526f219407977b13b71c6675be7d LICENCE.it913x sha256 16d5040c7cf851fc693b7542e20870935b99802533ea1bfd231c377a2305e5c5 LICENCE.iwlwifi_firmware sha256 0fc67bd715b3395f3f2af464781910e9e69c4ba23da304352229b42dc9e986c3 LICENCE.microchip +sha256 59ae206c89108905ebdc9ad4c9336526bd2c0d50fbf988c21e8c2a82719d42a4 LICENCE.moxa sha256 2051d5bf0755a0668f8c3d9a0d1c41d4b8cc411aba70f720fda71ae9e3b4d25c LICENCE.qat_firmware sha256 4071a11d878dbc0ac6d9e71203d03b151638f9d7a8bc47a54c3cb964100d5822 LICENCE.qla2xxx sha256 d7bec70668ddd4aae8fb4aa32870e54b49fcdb0b9b007aa9f54b53a1ac7461bd LICENCE.ralink-firmware.txt @@ -33,6 +35,6 @@ sha256 8542aeabf2761935122d693561e16766ce1bcc2b0d003204f9040b7d6d929f2e LICENS sha256 be904cd28cb292b80cdb6cf412ab0d9159d431671e987ad433c1f62e0988a9bc LICENSE.qcom sha256 fc6223d4bfe9f2f9e2eddc44b9fe5721d0caf49f01cb08d602906add686d8c6f LICENSE.radeon sha256 2bdd2e716f05d9737d3f9a20f9a3a3c0caee0e866100ddb0673f1178e42f92b9 LICENSE.sdma_firmware -sha256 dfb98c5474d6264a6554322b3936e305e9d73cc7b683932e3f17550dc7d2d29b WHENCE +sha256 744babd4eae138ccfb5bd343b1589912b9839274f8a794af0b6c9b451df73579 WHENCE sha256 fa43e1b9a13b341a07adca9dbe73d0f9072d7966fdfe811c01f0dd2872d7309a qcom/NOTICE.txt sha256 bef9c828e84f21e7835b4de7daf954a327e1ff777871b58e116039b684c0d604 LICENCE.e100 diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 2d103df05c4..9d9d12bd5f9 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINUX_FIRMWARE_VERSION = 20211216 +LINUX_FIRMWARE_VERSION = 20221214 LINUX_FIRMWARE_SOURCE = linux-firmware-$(LINUX_FIRMWARE_VERSION).tar.xz LINUX_FIRMWARE_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/firmware LINUX_FIRMWARE_INSTALL_IMAGES = YES @@ -71,7 +71,9 @@ LINUX_FIRMWARE_FILES += \ rtl_bt/rtl8723a_fw.bin rtl_bt/rtl8723b_fw.bin \ rtl_bt/rtl8723bs_config-OBDA8723.bin \ rtl_bt/rtl8723bs_fw.bin rtl_bt/rtl8723d_config.bin \ - rtl_bt/rtl8723d_fw.bin rtl_bt/rtl8761a_fw.bin + rtl_bt/rtl8723d_fw.bin rtl_bt/rtl8761a_fw.bin \ + rtl_bt/rtl8761b_fw.bin rtl_bt/rtl8761b_config.bin \ + rtl_bt/rtl8761bu_fw.bin rtl_bt/rtl8761bu_config.bin LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.rtlwifi_firmware.txt endif @@ -154,9 +156,7 @@ endif # rtw88 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_RTL_RTW88),y) LINUX_FIRMWARE_FILES += \ - rtw88/rtw8723d_fw.bin \ - rtw88/rtw8822b_fw.bin \ - rtw88/rtw8822c_fw.bin + rtw88/rtw*.bin LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.rtlwifi_firmware.txt endif @@ -437,6 +437,11 @@ LINUX_FIRMWARE_FILES += wil6210.* LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.QualcommAtheros_ath10k endif +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_22000),y) +LINUX_FIRMWARE_FILES += iwlwifi-QuZ-*.ucode 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_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware @@ -452,6 +457,16 @@ LINUX_FIRMWARE_FILES += 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_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware +endif + +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_4965),y) +LINUX_FIRMWARE_FILES += iwlwifi-4965-2.ucode +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware +endif + # iwlwifi 5000. Multiple files are available (iwlwifi-5000-1.ucode, # iwlwifi-5000-2.ucode, iwlwifi-5000-5.ucode), corresponding to # different versions of the firmware API. For now, we only install the @@ -501,6 +516,11 @@ LINUX_FIRMWARE_FILES += iwlwifi-9???-*.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_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 @@ -566,6 +586,7 @@ LINUX_FIRMWARE_FILES += \ rtl_nic/rtl8107e-1.fw \ rtl_nic/rtl8107e-2.fw \ rtl_nic/rtl8125a-3.fw \ + rtl_nic/rtl8125b-2.fw \ rtl_nic/rtl8168d-1.fw \ rtl_nic/rtl8168d-2.fw \ rtl_nic/rtl8168e-1.fw \ @@ -630,7 +651,7 @@ LINUX_FIRMWARE_FILES += \ brcm/brcmfmac4373.bin \ brcm/brcmfmac4330-sdio.Prowise-PT301.txt \ brcm/brcmfmac4356-pcie.gpd-win-pocket.txt \ - brcm/brcmfmac4356-sdio.vamrs,rock960.txt + brcm/brcmfmac4356-sdio.AP6356S.txt LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.broadcom_bcm43xx endif diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 8cfbd41831e..740fd55669f 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -1,12 +1,9 @@ comment "Kernel Header Options" -config BR2_PACKAGE_HOST_LINUX_HEADERS - bool - choice prompt "Kernel Headers" default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL - default BR2_KERNEL_HEADERS_5_15 + default BR2_KERNEL_HEADERS_6_1 help Select the kernel version to get headers from. @@ -27,27 +24,13 @@ config BR2_KERNEL_HEADERS_AS_KERNEL depends on BR2_LINUX_KERNEL select BR2_KERNEL_HEADERS_LATEST if BR2_LINUX_KERNEL_LATEST_VERSION -config BR2_KERNEL_HEADERS_4_4 - bool "Linux 4.4.x kernel headers" - depends on !BR2_riscv - depends on !BR2_csky - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_4 - -config BR2_KERNEL_HEADERS_4_9 - bool "Linux 4.9.x kernel headers" - depends on !BR2_riscv - depends on !BR2_csky - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 - config BR2_KERNEL_HEADERS_4_14 bool "Linux 4.14.x kernel headers" depends on !BR2_riscv - depends on !BR2_csky select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 config BR2_KERNEL_HEADERS_4_19 bool "Linux 4.19.x kernel headers" - depends on !BR2_csky select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 config BR2_KERNEL_HEADERS_5_4 @@ -62,9 +45,9 @@ config BR2_KERNEL_HEADERS_5_15 bool "Linux 5.15.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 -config BR2_KERNEL_HEADERS_5_16 - bool "Linux 5.16.x kernel headers" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_16 +config BR2_KERNEL_HEADERS_6_1 + bool "Linux 6.1.x kernel headers" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 select BR2_KERNEL_HEADERS_LATEST config BR2_KERNEL_HEADERS_VERSION @@ -127,8 +110,9 @@ endif choice bool "Custom kernel headers series" - default BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15 if \ - (BR2_KERNEL_HEADERS_AS_KERNEL && BR2_LINUX_KERNEL_LATEST_VERSION) + depends on !BR2_LINUX_KERNEL_LATEST_VERSION || !BR2_KERNEL_HEADERS_AS_KERNEL + depends on !BR2_LINUX_KERNEL_LATEST_CIP_VERSION || !BR2_KERNEL_HEADERS_AS_KERNEL + depends on !BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION || !BR2_KERNEL_HEADERS_AS_KERNEL depends on BR2_KERNEL_HEADERS_VERSION || BR2_KERNEL_HEADERS_AS_KERNEL || \ BR2_KERNEL_HEADERS_CUSTOM_TARBALL || BR2_KERNEL_HEADERS_CUSTOM_GIT help @@ -141,8 +125,28 @@ choice If your kernel headers are more recent than the latest version in the choice, then select the latest version. +config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1 + bool "6.1.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 + +config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0 + bool "6.0.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 + +config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19 + bool "5.19.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_19 + +config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_18 + bool "5.18.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_18 + +config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17 + bool "5.17.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_17 + config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16 - bool "5.16.x or later" + bool "5.16.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_16 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15 @@ -380,14 +384,12 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.4.302" if BR2_KERNEL_HEADERS_4_4 - default "4.9.304" if BR2_KERNEL_HEADERS_4_9 - default "4.14.269" if BR2_KERNEL_HEADERS_4_14 - default "4.19.232" if BR2_KERNEL_HEADERS_4_19 - default "5.4.182" if BR2_KERNEL_HEADERS_5_4 - default "5.10.103" if BR2_KERNEL_HEADERS_5_10 - default "5.15.26" if BR2_KERNEL_HEADERS_5_15 - default "5.16.12" if BR2_KERNEL_HEADERS_5_16 + default "4.14.325" if BR2_KERNEL_HEADERS_4_14 + default "4.19.294" if BR2_KERNEL_HEADERS_4_19 + default "5.4.256" if BR2_KERNEL_HEADERS_5_4 + default "5.10.194" if BR2_KERNEL_HEADERS_5_10 + default "5.15.130" if BR2_KERNEL_HEADERS_5_15 + default "6.1.51" if BR2_KERNEL_HEADERS_6_1 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ diff --git a/package/linux-headers/linux-headers.mk b/package/linux-headers/linux-headers.mk index a8d1c2ccaf5..e2a0b7a7c96 100644 --- a/package/linux-headers/linux-headers.mk +++ b/package/linux-headers/linux-headers.mk @@ -33,8 +33,19 @@ LINUX_HEADERS_REPO_URL = $(call qstrip,$(BR2_KERNEL_HEADERS_CUSTOM_REPO_URL)) LINUX_HEADERS_CIP = endif # BR2_KERNEL_HEADERS_AS_KERNEL +ifeq ($(BR2_KERNEL_HEADERS_VERSION)$(BR_BUILDING),yy) +ifeq ($(LINUX_HEADERS_VERSION),) +$(error No kernel headers version set, check your BR2_DEFAULT_KERNEL_VERSION setting) +endif +endif + # Compute LINUX_HEADERS_SOURCE and LINUX_HEADERS_SITE from the configuration ifeq ($(LINUX_HEADERS_CUSTOM_TARBALL),y) +ifeq ($(BR_BUILDING),y) +ifeq ($(LINUX_HEADERS_CUSTOM_TARBALL_LOCATION),) +$(error No kernel headers tarball location set, check your BR2_KERNEL_HEADERS_CUSTOM_TARBALL_LOCATION setting) +endif +endif LINUX_HEADERS_SOURCE = $(notdir $(LINUX_HEADERS_CUSTOM_TARBALL_LOCATION)) LINUX_HEADERS_SITE = $(patsubst %/,%,$(dir $(LINUX_HEADERS_CUSTOM_TARBALL_LOCATION))) else ifeq ($(LINUX_HEADERS_CUSTOM_GIT),y) diff --git a/package/linux-syscall-support/linux-syscall-support.hash b/package/linux-syscall-support/linux-syscall-support.hash index 3445bf13982..9d8855cf23f 100644 --- a/package/linux-syscall-support/linux-syscall-support.hash +++ b/package/linux-syscall-support/linux-syscall-support.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 498efb6915ac6e65c82c712fadd3c30f9472764114c835849e02f2c092bacd2d linux-syscall-support-3f6478ac95edf86cd3da300c2c0d34a438f5dbeb-br1.tar.gz -sha256 4c1fc9acc9f3867e5c81b5d5f57c52fb9a932662bd4e2e5e43b3fe95390035f5 linux_syscall_support.h +sha256 2a12703ce59773ec714b603e46c733b03f3fbf9b4763195fae40d0042e5da3f6 linux-syscall-support-e1e7b0ad8ee99a875b272c8e33e308472e897660-br1.tar.gz +sha256 c180f12840c00224cceed7139192018d2c7e6061db4ce4310b8626f7ad10bf26 LICENSE diff --git a/package/linux-syscall-support/linux-syscall-support.mk b/package/linux-syscall-support/linux-syscall-support.mk index 050c5058abb..a4cadf03c30 100644 --- a/package/linux-syscall-support/linux-syscall-support.mk +++ b/package/linux-syscall-support/linux-syscall-support.mk @@ -5,11 +5,11 @@ ################################################################################ # Use the same version that the one used by Google-breakpad (see DEPS file) -LINUX_SYSCALL_SUPPORT_VERSION = 3f6478ac95edf86cd3da300c2c0d34a438f5dbeb +LINUX_SYSCALL_SUPPORT_VERSION = e1e7b0ad8ee99a875b272c8e33e308472e897660 LINUX_SYSCALL_SUPPORT_SITE = https://chromium.googlesource.com/linux-syscall-support LINUX_SYSCALL_SUPPORT_SITE_METHOD = git LINUX_SYSCALL_SUPPORT_LICENSE = BSD-3-Clause -LINUX_SYSCALL_SUPPORT_LICENSE_FILES = linux_syscall_support.h +LINUX_SYSCALL_SUPPORT_LICENSE_FILES = LICENSE # Provide only one header file. LINUX_SYSCALL_SUPPORT_INSTALL_TARGET = NO diff --git a/package/linux-tools/Config.in b/package/linux-tools/Config.in index f459b417629..8a0b6d5802c 100644 --- a/package/linux-tools/Config.in +++ b/package/linux-tools/Config.in @@ -7,12 +7,16 @@ config BR2_PACKAGE_LINUX_TOOLS config BR2_PACKAGE_LINUX_TOOLS_CPUPOWER bool "cpupower" + depends on !BR2_STATIC_LIBS select BR2_PACKAGE_LINUX_TOOLS select BR2_PACKAGE_PCIUTILS help cpupower is a collection of tools to examine and tune power saving related features of your processor. +comment "cpupower needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS + config BR2_PACKAGE_LINUX_TOOLS_GPIO bool "gpio" select BR2_PACKAGE_LINUX_TOOLS @@ -43,9 +47,15 @@ config BR2_PACKAGE_LINUX_TOOLS_PCI These tools are available only from kernel version 4.20. +comment "perf needs a toolchain w/ dynamic library, threads" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS + config BR2_PACKAGE_LINUX_TOOLS_PERF bool "perf" depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_STATIC_LIBS # dlfcn.h + depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_LINUX_TOOLS help perf (sometimes "Perf Events" or perf tools, originally @@ -67,6 +77,13 @@ config BR2_PACKAGE_LINUX_TOOLS_PERF if BR2_PACKAGE_LINUX_TOOLS_PERF +config BR2_PACKAGE_LINUX_TOOLS_PERF_SCRIPTS + bool "enable installation of perf scripts" + help + Enable the installation of the perf scripts under + /usr/libexec/perf-core/ which is necessary for running "perf + tests" + config BR2_PACKAGE_LINUX_TOOLS_PERF_TUI bool "enable perf TUI" depends on BR2_USE_MMU # slang @@ -76,6 +93,13 @@ config BR2_PACKAGE_LINUX_TOOLS_PERF_TUI enables zooming into DSOs and threads as well as other features. +config BR2_PACKAGE_LINUX_TOOLS_PERF_NEEDS_HOST_PYTHON3 + bool "perf need python3 to build" + select BR2_PACKAGE_HOST_PYTHON3 + help + Starting with linux 6.0, parts of the perf source code + is generated by running a python3 script. + endif config BR2_PACKAGE_LINUX_TOOLS_SELFTESTS @@ -94,6 +118,7 @@ config BR2_PACKAGE_LINUX_TOOLS_SELFTESTS select BR2_PACKAGE_LIBCAP_NG select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS # runtime (taskset) + select BR2_PACKAGE_OPENSSL if BR2_x86_64 help Build and install (to /usr/lib/kselftests) kernel selftests. @@ -112,12 +137,16 @@ comment "selftests needs BR2_PACKAGE_BUSYBOX_SHOW_OTHERS and a toolchain w/ dyna config BR2_PACKAGE_LINUX_TOOLS_TMON bool "tmon" + depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_LINUX_TOOLS select BR2_PACKAGE_NCURSES help tmon is a terminal-based tool (using curses) that allows the user to access thermal information about the system. +comment "tmon needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS + config BR2_PACKAGE_LINUX_TOOLS_HV bool "hv" depends on BR2_i386 || BR2_x86_64 diff --git a/package/linux-tools/S10hyperv b/package/linux-tools/S10hyperv index ec934bc972d..32887d1b6c3 100644 --- a/package/linux-tools/S10hyperv +++ b/package/linux-tools/S10hyperv @@ -24,7 +24,7 @@ start() { for prog in ${PROGS}; do start_one "${prog}" || ret=$? done - return $ret + return "$ret" } stop_one() { @@ -45,7 +45,7 @@ stop() { for prog in ${PROGS}; do stop_one "${prog}" || ret=$? done - return $ret + return "$ret" } restart() { diff --git a/package/linux-tools/linux-tool-gpio.mk.in b/package/linux-tools/linux-tool-gpio.mk.in index d5a0dbda381..e825db1b112 100644 --- a/package/linux-tools/linux-tool-gpio.mk.in +++ b/package/linux-tools/linux-tool-gpio.mk.in @@ -6,7 +6,7 @@ LINUX_TOOLS += gpio -GPIO_MAKE_OPTS = $(LINUX_MAKE_FLAGS) +GPIO_MAKE_OPTS = $(LINUX_MAKE_FLAGS) LDFLAGS="$(TARGET_LDFLAGS)" define GPIO_BUILD_CMDS $(Q)if ! grep install $(LINUX_DIR)/tools/gpio/Makefile >/dev/null 2>&1 ; then \ diff --git a/package/linux-tools/linux-tool-iio.mk.in b/package/linux-tools/linux-tool-iio.mk.in index a8cc89e830e..27ab0ed7ed6 100644 --- a/package/linux-tools/linux-tool-iio.mk.in +++ b/package/linux-tools/linux-tool-iio.mk.in @@ -6,7 +6,7 @@ LINUX_TOOLS += iio -IIO_MAKE_OPTS = $(LINUX_MAKE_FLAGS) +IIO_MAKE_OPTS = $(LINUX_MAKE_FLAGS) LDFLAGS="$(TARGET_LDFLAGS)" define IIO_BUILD_CMDS $(Q)if ! grep install $(LINUX_DIR)/tools/iio/Makefile >/dev/null 2>&1 ; then \ diff --git a/package/linux-tools/linux-tool-pci.mk.in b/package/linux-tools/linux-tool-pci.mk.in index 4ef0368a322..17246f5d7ed 100644 --- a/package/linux-tools/linux-tool-pci.mk.in +++ b/package/linux-tools/linux-tool-pci.mk.in @@ -6,7 +6,7 @@ LINUX_TOOLS += pci -PCI_MAKE_OPTS = $(LINUX_MAKE_FLAGS) +PCI_MAKE_OPTS = $(LINUX_MAKE_FLAGS) LDFLAGS="$(TARGET_LDFLAGS)" define PCI_BUILD_CMDS $(Q)if ! grep install $(LINUX_DIR)/tools/pci/Makefile >/dev/null 2>&1 ; then \ diff --git a/package/linux-tools/linux-tool-perf.mk.in b/package/linux-tools/linux-tool-perf.mk.in index 4e28129f506..ee308a85dfd 100644 --- a/package/linux-tools/linux-tool-perf.mk.in +++ b/package/linux-tools/linux-tool-perf.mk.in @@ -8,6 +8,10 @@ LINUX_TOOLS += perf PERF_DEPENDENCIES = host-flex host-bison +ifeq ($(BR2_PACKAGE_LINUX_TOOLS_PERF_NEEDS_HOST_PYTHON3),y) +PERF_DEPENDENCIES += host-python3 +endif + ifeq ($(NORMALIZED_ARCH),x86_64) PERF_ARCH=x86 else @@ -20,11 +24,11 @@ PERF_MAKE_FLAGS = \ ARCH=$(PERF_ARCH) \ DESTDIR=$(TARGET_DIR) \ prefix=/usr \ - WERROR=0 \ NO_GTK2=1 \ NO_LIBPERL=1 \ NO_LIBPYTHON=1 \ - NO_LIBBIONIC=1 + NO_LIBBIONIC=1 \ + NO_LIBTRACEEVENT=1 # We need to pass an argument to ld for setting the emulation when # building for MIPS architecture, otherwise the default one will always @@ -127,7 +131,7 @@ define PERF_DISABLE_DOCUMENTATION printf "%%:\n\t@:\n" >$(LINUX_DIR)/tools/perf/Documentation/GNUmakefile; \ fi endef -LINUX_POST_PATCH_HOOKS += PERF_DISABLE_DOCUMENTATION +LINUX_TOOLS_POST_PATCH_HOOKS += PERF_DISABLE_DOCUMENTATION # O must be redefined here to overwrite the one used by Buildroot for # out of tree build. We build perf in $(LINUX_DIR)/tools/perf/ and not just @@ -160,12 +164,22 @@ define PERF_BUILD_CMDS endef # After installation, we remove the Perl and Python scripts from the -# target. +# target unless BR2_PACKAGE_LINUX_TOOLS_PERF_SCRIPTS is enabled +ifeq ($(BR2_PACKAGE_LINUX_TOOLS_PERF_SCRIPTS),) +define PERF_INSTALL_REMOVE_SCRIPTS + $(RM) -r $(TARGET_DIR)/usr/libexec/perf-core/scripts/ + $(RM) -r $(TARGET_DIR)/usr/libexec/perf-core/tests/ +endef + +LINUX_TOOLS_BIN_ARCH_EXCLUDE += \ + /usr/libexec/perf-core/tests/pe-file.exe \ + /usr/libexec/perf-core/tests/pe-file.exe.debug +endif + define PERF_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE1) $(PERF_MAKE_FLAGS) \ -C $(LINUX_DIR)/tools/perf O=$(LINUX_DIR)/tools/perf/ install - $(RM) -rf $(TARGET_DIR)/usr/libexec/perf-core/scripts/ - $(RM) -rf $(TARGET_DIR)/usr/libexec/perf-core/tests/ + $(PERF_INSTALL_REMOVE_SCRIPTS) endef define PERF_LINUX_CONFIG_FIXUPS diff --git a/package/linux-tools/linux-tool-selftests.mk.in b/package/linux-tools/linux-tool-selftests.mk.in index b824c11bd64..e29c7f59deb 100644 --- a/package/linux-tools/linux-tool-selftests.mk.in +++ b/package/linux-tools/linux-tool-selftests.mk.in @@ -16,7 +16,10 @@ SELFTESTS_ARCH=$(NORMALIZED_ARCH) endif endif -SELFTESTS_DEPENDENCIES = libcap-ng popt +SELFTESTS_DEPENDENCIES = \ + libcap-ng \ + popt \ + $(if $(BR2_PACKAGE_OPENSSL),openssl) SELFTESTS_MAKE_FLAGS = \ $(LINUX_MAKE_FLAGS) \ diff --git a/package/linux-tools/linux-tool-tmon.mk.in b/package/linux-tools/linux-tool-tmon.mk.in index 15931c31240..56c328c51fd 100644 --- a/package/linux-tools/linux-tool-tmon.mk.in +++ b/package/linux-tools/linux-tool-tmon.mk.in @@ -9,6 +9,7 @@ LINUX_TOOLS += tmon TMON_DEPENDENCIES = host-pkgconf ncurses TMON_MAKE_OPTS = $(LINUX_MAKE_FLAGS) \ CC=$(TARGET_CC) \ + LDFLAGS="$(TARGET_LDFLAGS)" \ PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig ifeq ($(BR2_TOOLCHAIN_HAS_SSP),) diff --git a/package/linux-zigbee/linux-zigbee.hash b/package/linux-zigbee/linux-zigbee.hash index f337038855e..232c1cb438a 100644 --- a/package/linux-zigbee/linux-zigbee.hash +++ b/package/linux-zigbee/linux-zigbee.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 92fbefdf18d45147c2b78ca2ce2d899d4d1da5a3391a4ff6c51a5b14c6d6f87c lowpan-tools-0.3.1.tar.gz -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING +sha256 92fbefdf18d45147c2b78ca2ce2d899d4d1da5a3391a4ff6c51a5b14c6d6f87c lowpan-tools-0.3.1.tar.gz +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/linuxconsoletools/0001-conditional-build.patch b/package/linuxconsoletools/0001-conditional-build.patch deleted file mode 100644 index 9f462a64369..00000000000 --- a/package/linuxconsoletools/0001-conditional-build.patch +++ /dev/null @@ -1,58 +0,0 @@ -Selectively build groups of tools (inputattach, -joystick tools and/or force-feedback tools). - -Signed-off-by: Koen Martens - -diff -Naur a/utils/Makefile b/utils/Makefile ---- a/utils/Makefile 2016-04-19 23:28:36.000000000 +0200 -+++ b/utils/Makefile 2017-06-19 08:54:20.152184000 +0200 -@@ -27,8 +27,26 @@ - - CFLAGS ?= -g -O2 -Wall - --PROGRAMS = inputattach jstest jscal fftest ffmvforce ffset \ -- ffcfstress jscal-restore jscal-store evdev-joystick -+PROGRAMS = -+ -+ifdef ENABLE_INPUTATTACH -+PROGRAMS += inputattach -+endif -+ -+ifdef ENABLE_JOYSTICK -+PROGRAMS += jstest -+PROGRAMS += jscal -+PROGRAMS += jscal-restore -+PROGRAMS += jscal-store -+PROGRAMS += evdev-joystick -+endif -+ -+ifdef ENABLE_FORCEFEEDBACK -+PROGRAMS += fftest -+PROGRAMS += ffmvforce -+PROGRAMS += ffset -+PROGRAMS += ffcfstress -+endif - - PREFIX ?= /usr/local - -@@ -79,13 +97,20 @@ - 80-stelladaptor-joystick.rules: 80-stelladaptor-joystick.rules.in - sed "s^@@PREFIX@@^$(PREFIX)^g" < $^ > $@ - -+INSTALL_DEP = compile -+ifdef ENABLE_JOYSTICK -+INSTALL_DEP += 80-stelladaptor-joystick.rules -+endif -+ - install: compile 80-stelladaptor-joystick.rules - install -d $(DESTDIR)$(PREFIX)/bin - install $(PROGRAMS) $(DESTDIR)$(PREFIX)/bin -+ifdef ENABLE_JOYSTICK - install -d $(DESTDIR)$(PREFIX)/share/joystick - install extract filter ident $(DESTDIR)$(PREFIX)/share/joystick - install -d $(DESTDIR)/lib/udev/rules.d - install js-set-enum-leds $(DESTDIR)/lib/udev - install -m 644 80-stelladaptor-joystick.rules $(DESTDIR)/lib/udev/rules.d -+endif - - .PHONY: compile clean distclean install diff --git a/package/linuxconsoletools/linuxconsoletools.hash b/package/linuxconsoletools/linuxconsoletools.hash index 889f6d1d6c4..8e4099f163d 100644 --- a/package/linuxconsoletools/linuxconsoletools.hash +++ b/package/linuxconsoletools/linuxconsoletools.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 bd4d4b7e37da02fc67e47ddf20b6f1243c0a7af7b02b918d5e72138ea8727547 linuxconsoletools-1.7.1.tar.bz2 +sha256 4da29745c782b7db18f5f37c49e77bf163121dd3761e2fc7636fa0cbf35c2456 linuxconsoletools-1.8.1.tar.bz2 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/linuxconsoletools/linuxconsoletools.mk b/package/linuxconsoletools/linuxconsoletools.mk index 306a5b1fa02..a97618c832a 100644 --- a/package/linuxconsoletools/linuxconsoletools.mk +++ b/package/linuxconsoletools/linuxconsoletools.mk @@ -4,24 +4,24 @@ # ################################################################################ -LINUXCONSOLETOOLS_VERSION = 1.7.1 +LINUXCONSOLETOOLS_VERSION = 1.8.1 LINUXCONSOLETOOLS_SOURCE = linuxconsoletools-$(LINUXCONSOLETOOLS_VERSION).tar.bz2 LINUXCONSOLETOOLS_SITE = https://downloads.sourceforge.net/project/linuxconsole LINUXCONSOLETOOLS_LICENSE = GPL-2.0+ LINUXCONSOLETOOLS_LICENSE_FILES = COPYING -ifeq ($(BR2_PACKAGE_LINUXCONSOLETOOLS_INPUTATTACH),y) -LINUXCONSOLETOOLS_MAKE_OPTS += ENABLE_INPUTATTACH=1 +ifneq ($(BR2_PACKAGE_LINUXCONSOLETOOLS_INPUTATTACH),y) +LINUXCONSOLETOOLS_MAKE_OPTS += DISABLE_INPUTATTACH=1 endif -ifeq ($(BR2_PACKAGE_LINUXCONSOLETOOLS_JOYSTICK),y) -LINUXCONSOLETOOLS_MAKE_OPTS += ENABLE_JOYSTICK=1 +ifneq ($(BR2_PACKAGE_LINUXCONSOLETOOLS_JOYSTICK),y) +LINUXCONSOLETOOLS_MAKE_OPTS += DISABLE_JOYSTICK=1 endif -ifeq ($(BR2_PACKAGE_LINUXCONSOLETOOLS_FORCEFEEDBACK),y) -LINUXCONSOLETOOLS_MAKE_OPTS += \ - ENABLE_FORCEFEEDBACK=1 \ - CFLAGS="$(TARGET_CFLAGS) -std=gnu99" +ifneq ($(BR2_PACKAGE_LINUXCONSOLETOOLS_FORCEFEEDBACK),y) +LINUXCONSOLETOOLS_MAKE_OPTS += DISABLE_FORCEFEEDBACK=1 +else +LINUXCONSOLETOOLS_MAKE_OPTS += CFLAGS="$(TARGET_CFLAGS) -std=gnu99" LINUXCONSOLETOOLS_DEPENDENCIES += sdl2 host-pkgconf endif diff --git a/package/linuxptp/0002-makefile-use-conditional-assignment-for-KBUILD_OUTPUT.patch b/package/linuxptp/0002-makefile-use-conditional-assignment-for-KBUILD_OUTPUT.patch new file mode 100644 index 00000000000..73cd34f7447 --- /dev/null +++ b/package/linuxptp/0002-makefile-use-conditional-assignment-for-KBUILD_OUTPUT.patch @@ -0,0 +1,43 @@ +From: Changqing Li +Date: Wed, 23 Nov 2022 08:23:46 +0800 +Subject: [Linuxptp-devel] [PATCH] makefile: use conditional assignment for KBUILD_OUTPUT + +Refer [1],from make 4.4, all variables that are marked as export will +also be passed to the shell started by the shell function. use "=" will +make KBUILD_OUTPUT always empty for shell function, use "?=" to make +"export KBUILD_OUTPUT" in enrironment can work. + +[snip of 4.4 NEWS] +* WARNING: Backward-incompatibility! + Previously makefile variables marked as export were not exported to commands + started by the $(shell ...) function. Now, all exported variables are + exported to $(shell ...). +[snip] + +[1] https://git.savannah.gnu.org/cgit/make.git/tree/NEWS?h=4.4&id=ed493f6c9116cc217b99c2cfa6a95f15803235a2#n74 + +Signed-off-by: Changqing Li + +[Retrieved from mailing list. The patch was not yet accepted and applied: +https://www.mail-archive.com/linuxptp-devel@lists.sourceforge.net/msg06151.html] +Signed-off-by: Heiko Thiery + +--- + makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/makefile b/makefile +index 9aed383..ba3fb38 100644 +--- a/makefile ++++ b/makefile +@@ -15,7 +15,7 @@ + # with this program; if not, write to the Free Software Foundation, Inc., + # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +-KBUILD_OUTPUT = ++KBUILD_OUTPUT ?= + + DEBUG = + CC = $(CROSS_COMPILE)gcc +-- +2.25.1 diff --git a/package/liquid-dsp/liquid-dsp.hash b/package/liquid-dsp/liquid-dsp.hash index 31bcd687679..7e5de6b259a 100644 --- a/package/liquid-dsp/liquid-dsp.hash +++ b/package/liquid-dsp/liquid-dsp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 85093624ef9cb90ead64c836d2f42690197edace1a86257d6524c4e4dc870483 liquid-dsp-1.3.2.tar.gz -sha256 4df7126196efba1283deb99e3269418dde4ab0ad1fde80a55051153451eb4df2 LICENSE +sha256 66f38d509aa8f6207d2035bae5ee081a3d9df0f2cab516bc2118b5b1c6ce3333 liquid-dsp-1.4.0.tar.gz +sha256 4df7126196efba1283deb99e3269418dde4ab0ad1fde80a55051153451eb4df2 LICENSE diff --git a/package/liquid-dsp/liquid-dsp.mk b/package/liquid-dsp/liquid-dsp.mk index 9745893b7c9..fcdf5725321 100644 --- a/package/liquid-dsp/liquid-dsp.mk +++ b/package/liquid-dsp/liquid-dsp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIQUID_DSP_VERSION = 1.3.2 +LIQUID_DSP_VERSION = 1.4.0 LIQUID_DSP_SITE = $(call github,jgaeddert,liquid-dsp,v$(LIQUID_DSP_VERSION)) LIQUID_DSP_LICENSE = MIT LIQUID_DSP_LICENSE_FILES = LICENSE diff --git a/package/lirc-tools/0001-Fix-build-without-Python.patch b/package/lirc-tools/0001-Fix-build-without-Python.patch deleted file mode 100644 index b1940eac0d1..00000000000 --- a/package/lirc-tools/0001-Fix-build-without-Python.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 71f329d997d949d3c12d62d2f1473a1c99ee49b0 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Sun, 27 Aug 2017 21:30:37 +0300 -Subject: [PATCH] Fix build without Python - -Don't define HAVE_PYTHON35 when PYTHON_LIBS is empty. - -Also, don't build Python dependent code when HAVE_PYTHON35 is not -defined. - -This fixes build failures like: - -Makefile:1616: recipe for target 'python-pkg/dist/lirc-0.10.0.tar.gz' failed -make[3]: *** [python-pkg/dist/lirc-0.10.0.tar.gz] Error 1 -python-pkg/lirc/_client.c:1:20: fatal error: Python.h: No such file or directory - #include - ^ - -Signed-off-by: Baruch Siach ---- -Upstream status: commit 74a2bcab6b - - Makefile.am | 2 ++ - configure.ac | 3 ++- - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 9f3dd14340cc..d8164fcd44cf 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -104,6 +104,7 @@ dist_py_pkg_doc_DATA = python-pkg/doc/Doxyfile \ - - libpython = $(libdir)/python$(PYTHON_VERSION) - pydir = $(libpython)/site-packages/lirc -+if HAVE_PYTHON35 - py_LTLIBRARIES = python-pkg/lib/_client.la - python_pkg_lib__client_la_SOURCES = \ - python-pkg/lirc/_client.c -@@ -116,6 +117,7 @@ python_pkg_lib__client_la_LDFLAGS = \ - $(PYTHON_LIBS) - python_pkg_lib__client_la_LIBADD = \ - lib/liblirc_client.la -+endif - - pylint: .phony - $(MAKE) -C tools pylint -diff --git a/configure.ac b/configure.ac -index 4108688433f8..07d901deafdf 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -50,7 +50,8 @@ test -z "$PYTHON_LIBS" && \ - test -n "$PYTHON_LIBS" || \ - AC_MSG_WARN([No python package found (missing devel package?)]) - python_version_nodots=$(echo $PYTHON_VERSION | tr -d '.') --AM_CONDITIONAL(HAVE_PYTHON35, [test $python_version_nodots -ge 35]) -+AM_CONDITIONAL(HAVE_PYTHON35, [test -n "$PYTHON_LIBS" && \ -+ test $python_version_nodots -ge 35]) - CFLAGS="$CFLAGS $PYTHON_CFLAGS" - - --- -2.14.1 - diff --git a/package/lirc-tools/0004-plugins-devinput.c-fix-build-with-musl-1.2.0.patch b/package/lirc-tools/0001-plugins-devinput.c-fix-build-with-musl-1.2.0.patch similarity index 100% rename from package/lirc-tools/0004-plugins-devinput.c-fix-build-with-musl-1.2.0.patch rename to package/lirc-tools/0001-plugins-devinput.c-fix-build-with-musl-1.2.0.patch diff --git a/package/lirc-tools/0002-Fix-python-client-cross-compile.patch b/package/lirc-tools/0002-Fix-python-client-cross-compile.patch deleted file mode 100644 index 02deefaf98c..00000000000 --- a/package/lirc-tools/0002-Fix-python-client-cross-compile.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 13c4ffcfde07f659a836fba4a604dc1c5024bb90 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Tue, 29 Aug 2017 11:37:36 +0300 -Subject: [PATCH] Fix python client cross compile - -The setup.py setuptools wrapper needs to use a version of python built -specifically for cross compiling to cross compile successfully. Allow -setting that in the environment using the SETUPTOOLS_ENV variable. - -Fixes the following build failure: - -/usr/bin/ld: skipping incompatible .../lirc-tools-0.10.0/lib/.libs/liblirc_client.so when searching for -llirc_client -/usr/bin/ld: cannot find -llirc_client -collect2: error: ld returned 1 exit status -error: command '/usr/bin/gcc' failed with exit status 1 -Makefile:1578: recipe for target 'all-local' failed - -Signed-off-by: Baruch Siach ---- -Upstream status: https://sourceforge.net/p/lirc/tickets/308/ - - Makefile.am | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/Makefile.am b/Makefile.am -index d8164fcd44cf..a16be4278ae2 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -131,6 +131,7 @@ pep8: $(py_PYTHON) - if HAVE_PYTHON35 - all-local: - cd python-pkg; \ -+ $(SETUPTOOLS_ENV) \ - CFLAGS="-I$(abs_top_srcdir)/lib -I$(abs_builddir)/lib" \ - LDFLAGS=-L$(abs_builddir)/lib/.libs $(PYTHON) setup.py \ - $(if $(VERBOSE),,-q) build -@@ -179,6 +180,7 @@ $(abs_builddir)/python-pkg/setup.py: - $(PYTHON_TARBALL): $(abs_builddir)/python-pkg/setup.py - cp $(top_builddir)/VERSION $(abs_builddir)/python-pkg - cd $(abs_builddir)/python-pkg; CFLAGS=-I$(abs_top_srcdir)/lib \ -+ $(SETUPTOOLS_ENV) \ - LDFLAGS=-L$(abs_builddir)/lib/.libs $(PYTHON) setup.py -q sdist - - $(top_builddir)/python-pkg/VERSION: VERSION --- -2.14.1 - diff --git a/package/lirc-tools/0002-configure-add-disable-doc-option.patch b/package/lirc-tools/0002-configure-add-disable-doc-option.patch new file mode 100644 index 00000000000..fab485ffefb --- /dev/null +++ b/package/lirc-tools/0002-configure-add-disable-doc-option.patch @@ -0,0 +1,52 @@ +From e9d5cbc01e3c0d6a31e2dba2f224b7f3dd21db37 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 23 Oct 2022 16:10:50 +0200 +Subject: [PATCH] configure: add --disable-doc option + +Allow the user to disable documentation through --disable-doc + +Signed-off-by: Fabrice Fontaine +--- + Makefile.am | 6 +++++- + configure.ac | 8 ++++++++ + 2 files changed, 13 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 6718af13..58a321d8 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -45,7 +45,11 @@ if WITH_SYSTEMDSYSTEMUNITDIR + SYSTEMD_DIR = systemd + endif + +-SUBDIRS = lib daemons tools plugins configs doc $(SYSTEMD_DIR) ++if HAVE_DOC ++ DOC_DIR = doc ++endif ++ ++SUBDIRS = lib daemons tools plugins configs $(DOC_DIR) $(SYSTEMD_DIR) + + if INSTALL_ETC + +diff --git a/configure.ac b/configure.ac +index d28c6732..f3384c95 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -486,6 +486,14 @@ AC_ARG_VAR(SETUPTOOLS_ENV, + ) + + ++AC_ARG_ENABLE(doc, ++ [ --enable-doc Build and install documentation (default=yes)], ++ [ enable_doc="${enableval}" ], ++ [ enable_doc=yes] ++) ++AM_CONDITIONAL([HAVE_DOC], [test x$enable_doc = xyes]) ++ ++ + suffix=$(echo "$VERSION" | sed 's/.*-//') + AM_CONDITIONAL(DEVEL, [test x$suffix = xdevel]) + +-- +2.35.1 + diff --git a/package/lirc-tools/0003-python-pkg-Fix-lirc-version-detection-when-cross-com.patch b/package/lirc-tools/0003-python-pkg-Fix-lirc-version-detection-when-cross-com.patch deleted file mode 100644 index 04fbfe6ea25..00000000000 --- a/package/lirc-tools/0003-python-pkg-Fix-lirc-version-detection-when-cross-com.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 732fd31610a6790a927ea9ed6d660796a1641254 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Thu, 7 Sep 2017 08:12:01 +0200 -Subject: [PATCH] build: Fix lirc version detection when cross compiling. - -The setup.py script that runs on the host can't use the client library -built for target. So setup.py falls back to a wrong hard-coded VERSION -value. - -Instead of importing the target library, use exec() to read -lirc/config.py directly for its VERSION value. - -Fixes build failure: - -/usr/bin/install -c -m 644 ./python-pkg/dist/lirc-0.10.0.tar.gz \ - '.../output/host/arm-buildroot-linux-musleabihf/sysroot/usr/share/lirc' -/usr/bin/install: cannot stat './python-pkg/dist/lirc-0.10.0.tar.gz': \ - No such file or directory - -Signed-off-by: Baruch Siach ---- -Upstream status: commit 732fd31610a6 - - python-pkg/setup.py | 9 +++------ - 1 file changed, 3 insertions(+), 6 deletions(-) - -diff --git a/python-pkg/setup.py b/python-pkg/setup.py -index e9b33690f828..a2d92e0432aa 100644 ---- a/python-pkg/setup.py -+++ b/python-pkg/setup.py -@@ -6,14 +6,11 @@ import subprocess - import os.path - import os - --try: -- import lirc.config -- VERSION = lirc.config.VERSION.replace('-devel','') --except ImportError: -- VERSION='0.0.0' -- - from setuptools import setup, Extension - -+exec(open("lirc/config.py").read()) -+VERSION = VERSION.replace('-devel','') -+ - if 'CFLAGS' in os.environ: - cflags = os.environ['CFLAGS'].split() - if 'LDFLAGS' in os.environ: --- -2.14.1 - diff --git a/package/lirc-tools/lirc-tools.hash b/package/lirc-tools/lirc-tools.hash index 8d9a79d2d1a..4808508cca5 100644 --- a/package/lirc-tools/lirc-tools.hash +++ b/package/lirc-tools/lirc-tools.hash @@ -1,6 +1,6 @@ -# hash from https://sourceforge.net/projects/lirc/files/LIRC/0.10.1/ -sha1 9d6f6d18ac566a96ef4ca1d6909a4e8bc517d48a lirc-0.10.1.tar.bz2 -md5 86c3f8e4efaba10571addb8313d1e040 lirc-0.10.1.tar.bz2 +# hash from https://sourceforge.net/projects/lirc/files/LIRC/0.10.2/ +sha1 02092890205891b6de5a699294485a1eedba46c5 lirc-0.10.2.tar.bz2 +md5 cb96cfb0af8067c0062e2f5a100f426a lirc-0.10.2.tar.bz2 # Locally computed -sha256 8b753c60df2a7f5dcda2db72c38e448ca300c3b4f6000c1501fcb0bd5df414f2 lirc-0.10.1.tar.bz2 +sha256 3d44ec8274881cf262f160805641f0827ffcc20ade0d85e7e6f3b90e0d3d222a lirc-0.10.2.tar.bz2 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/lirc-tools/lirc-tools.mk b/package/lirc-tools/lirc-tools.mk index 05f20f57261..a3ad6bd5a09 100644 --- a/package/lirc-tools/lirc-tools.mk +++ b/package/lirc-tools/lirc-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIRC_TOOLS_VERSION = 0.10.1 +LIRC_TOOLS_VERSION = 0.10.2 LIRC_TOOLS_SOURCE = lirc-$(LIRC_TOOLS_VERSION).tar.bz2 LIRC_TOOLS_SITE = http://downloads.sourceforge.net/project/lirc/LIRC/$(LIRC_TOOLS_VERSION) LIRC_TOOLS_LICENSE = GPL-2.0+ @@ -48,7 +48,9 @@ endif ifeq ($(BR2_PACKAGE_PYTHON3),y) LIRC_TOOLS_DEPENDENCIES += python3 host-python-setuptools -LIRC_TOOLS_MAKE_ENV += SETUPTOOLS_ENV='$(PKG_PYTHON_SETUPTOOLS_ENV)' +LIRC_TOOLS_MAKE_ENV += \ + CC="$(TARGET_CC)" \ + SETUPTOOLS_ENV='$(PKG_PYTHON_SETUPTOOLS_ENV)' endif define LIRC_TOOLS_INSTALL_INIT_SYSV diff --git a/package/live555/live555.mk b/package/live555/live555.mk index effd4517cfc..56ed7057836 100644 --- a/package/live555/live555.mk +++ b/package/live555/live555.mk @@ -39,7 +39,7 @@ else LIVE555_CFLAGS += -DNO_OPENSSL endif -ifndef ($(BR2_ENABLE_LOCALE),y) +ifneq ($(BR2_ENABLE_LOCALE),y) LIVE555_CFLAGS += -DLOCALE_NOT_USED endif diff --git a/package/ljlinenoise/ljlinenoise.hash b/package/ljlinenoise/ljlinenoise.hash index 647f11d8664..a9e9c6d5b27 100644 --- a/package/ljlinenoise/ljlinenoise.hash +++ b/package/ljlinenoise/ljlinenoise.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 7a6c4142b0096106f498d7ee4bea5bf5086c076d1f071893441b8e5c0665fb47 ljlinenoise-0.1.3-1.src.rock -sha256 9b17730cb34ea591fb39688e70bd2be9c13d11b9db1c813b4ae68e3da9b7093e ljlinenoise-0.1.3/COPYRIGHT +sha256 7a6c4142b0096106f498d7ee4bea5bf5086c076d1f071893441b8e5c0665fb47 ljlinenoise-0.1.3-1.src.rock +sha256 9b17730cb34ea591fb39688e70bd2be9c13d11b9db1c813b4ae68e3da9b7093e ljlinenoise-0.1.3/COPYRIGHT diff --git a/package/ljsyscall/ljsyscall.hash b/package/ljsyscall/ljsyscall.hash index 6fd7f6a5191..e9aba33da15 100644 --- a/package/ljsyscall/ljsyscall.hash +++ b/package/ljsyscall/ljsyscall.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6e29503609bd966fed33dec1a1571b36bbdbc37bf1a828af6722ed0ead192ff1 ljsyscall-0.12.tar.gz -sha256 c8e21d8e74afbe26c2c8e69b42327d3b48e602117f9ef7b22c31ddca6f46b1f2 COPYRIGHT +sha256 6e29503609bd966fed33dec1a1571b36bbdbc37bf1a828af6722ed0ead192ff1 ljsyscall-0.12.tar.gz +sha256 c8e21d8e74afbe26c2c8e69b42327d3b48e602117f9ef7b22c31ddca6f46b1f2 COPYRIGHT diff --git a/package/ljsyscall/ljsyscall.mk b/package/ljsyscall/ljsyscall.mk index 12dfbcb4ae9..b847739a08b 100644 --- a/package/ljsyscall/ljsyscall.mk +++ b/package/ljsyscall/ljsyscall.mk @@ -18,7 +18,7 @@ else ifeq ($(BR2_powerpc),y) LJSYSCALL_ARCH = ppc else ifeq ($(BR2_arm)$(BR2_armeb),y) LJSYSCALL_ARCH = arm -else ifeq ($(BR2_aarch64),y) +else ifeq ($(BR2_aarch64)$(BR2_aarch64_be),y) LJSYSCALL_ARCH = arm64 else ifeq ($(BR2_mips)$(BR2_mipsel),y) LJSYSCALL_ARCH = mips diff --git a/package/lksctp-tools/lksctp-tools.hash b/package/lksctp-tools/lksctp-tools.hash index 7c8ef604606..b3a1f59d863 100644 --- a/package/lksctp-tools/lksctp-tools.hash +++ b/package/lksctp-tools/lksctp-tools.hash @@ -1,6 +1,6 @@ # From https://sourceforge.net/projects/lksctp/files/lksctp-tools/ -md5 68e9b8fa4d4e331029b247b72d46d7a5 lksctp-tools-1.0.17.tar.gz -sha1 941b0b5c39e364a971f514bba66120435660e518 lksctp-tools-1.0.17.tar.gz +md5 0fbb288c9f9625b88d3ab21c9ed9f011 lksctp-tools-1.0.19.tar.gz +sha1 d410a596485c38464177a38ae7c7081444e6589e lksctp-tools-1.0.19.tar.gz # Locally computed sha256 dee5f35e583183abb9212938643ecb2d858fd89e2e286f4b1d903f65d49d6c76 COPYING.lib sha256 cc2a6651c315b233ebc110b49ea3c6452eff9a28f8bc051ffd2bb92a8dcfa3d2 COPYING diff --git a/package/lksctp-tools/lksctp-tools.mk b/package/lksctp-tools/lksctp-tools.mk index 5ac794e842d..af86a285169 100644 --- a/package/lksctp-tools/lksctp-tools.mk +++ b/package/lksctp-tools/lksctp-tools.mk @@ -4,8 +4,8 @@ # ################################################################################ -LKSCTP_TOOLS_VERSION = 1.0.17 -LKSCTP_TOOLS_SITE = http://downloads.sourceforge.net/project/lksctp/lksctp-tools +LKSCTP_TOOLS_VERSION = 1.0.19 +LKSCTP_TOOLS_SITE = $(call github,sctp,lksctp-tools,v$(LKSCTP_TOOLS_VERSION)) LKSCTP_TOOLS_INSTALL_STAGING = YES # configure not shipped LKSCTP_TOOLS_AUTORECONF = YES diff --git a/package/lld/Config.in.host b/package/lld/Config.in.host index f016f3445e1..d015fdd520d 100644 --- a/package/lld/Config.in.host +++ b/package/lld/Config.in.host @@ -1,6 +1,7 @@ config BR2_PACKAGE_HOST_LLD bool "host lld" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS # llvm + depends on BR2_HOST_GCC_AT_LEAST_5 # host-llvm help LLD is a linker from the LLVM project that is a drop-in replacement for system linkers, and runs much faster than @@ -8,3 +9,7 @@ config BR2_PACKAGE_HOST_LLD toolchain developers. https://lld.llvm.org/ + +comment "host lld needs host gcc >= 5" + depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS + depends on !BR2_HOST_GCC_AT_LEAST_5 diff --git a/package/lld/lld.hash b/package/lld/lld.hash index 2144cc56666..6d56ffcaab1 100644 --- a/package/lld/lld.hash +++ b/package/lld/lld.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 86262bad3e2fd784ba8c5e2158d7aa36f12b85f2515e95bc81d65d75bb9b0c82 lld-9.0.1.src.tar.xz -sha256 f7891568956e34643eb6a0db1462db30820d40d7266e2a78063f2fe233ece5a0 LICENSE.TXT +sha256 017a788cbe1ecc4a949abf10755870519086d058a2e99f438829aef24f0c66ce lld-11.1.0.src.tar.xz +sha256 f7891568956e34643eb6a0db1462db30820d40d7266e2a78063f2fe233ece5a0 LICENSE.TXT diff --git a/package/lld/lld.mk b/package/lld/lld.mk index cd1a03c1d32..4bf903cda0c 100644 --- a/package/lld/lld.mk +++ b/package/lld/lld.mk @@ -5,7 +5,7 @@ ################################################################################ # LLVM, Clang and lld should be version bumped together -LLD_VERSION = 9.0.1 +LLD_VERSION = 11.1.0 LLD_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(LLD_VERSION) LLD_SOURCE = lld-$(LLD_VERSION).src.tar.xz LLD_LICENSE = Apache-2.0 with exceptions diff --git a/package/lldpd/0001-daemon-fix-read-overflow-when-parsing-CDP-addresses.patch b/package/lldpd/0001-daemon-fix-read-overflow-when-parsing-CDP-addresses.patch new file mode 100644 index 00000000000..05d882a07a1 --- /dev/null +++ b/package/lldpd/0001-daemon-fix-read-overflow-when-parsing-CDP-addresses.patch @@ -0,0 +1,24 @@ +From a9aeabdf879c25c584852a0bb5523837632f099b Mon Sep 17 00:00:00 2001 +From: Vincent Bernat +Date: Wed, 12 Apr 2023 07:38:31 +0200 +Subject: [PATCH] daemon: fix read overflow when parsing CDP addresses + +Upstream: https://github.com/lldpd/lldpd/commit/a9aeabdf879c25c584852a0bb5523837632f099b +Signed-off-by: Fabrice Fontaine +--- + NEWS | 4 ++++ + src/daemon/protocols/cdp.c | 1 + + 2 files changed, 5 insertions(+) + +diff --git a/src/daemon/protocols/cdp.c b/src/daemon/protocols/cdp.c +index 8a1be863..42861c0e 100644 +--- a/src/daemon/protocols/cdp.c ++++ b/src/daemon/protocols/cdp.c +@@ -466,6 +466,7 @@ cdp_decode(struct lldpd *cfg, char *frame, int s, struct lldpd_hardware *hardwar + goto malformed; + } + PEEK_DISCARD(address_len); ++ addresses_len -= address_len; + (void)PEEK_SAVE(pos_next_address); + /* Next, we go back and try to extract + IPv4 address */ diff --git a/package/lldpd/Config.in b/package/lldpd/Config.in index 9a9517b5b0f..3e0446986fe 100644 --- a/package/lldpd/Config.in +++ b/package/lldpd/Config.in @@ -18,7 +18,7 @@ config BR2_PACKAGE_LLDPD lldpd is an ISC-licensed implementation of LLDP for various Unixes. It also supports some proprietary protocols. - https://vincentbernat.github.io/lldpd/ + https://lldpd.github.io/ if BR2_PACKAGE_LLDPD diff --git a/package/lldpd/lldpd.hash b/package/lldpd/lldpd.hash index 6e809b2796a..6db5ca98f12 100644 --- a/package/lldpd/lldpd.hash +++ b/package/lldpd/lldpd.hash @@ -1,5 +1,5 @@ # Locally computed after checking gpg key -# https://media.luffy.cx/files/lldpd/lldpd-1.0.9.tar.gz.gpg +# https://media.luffy.cx/files/lldpd/lldpd-1.0.15.tar.gz.gpg # using key AEF2348766F371C689A7360095A42FE8353525F9 -sha256 6b64eb3125952b1e33472198b054e8aa0dee45f45d3d4be22789090a474949f5 lldpd-1.0.9.tar.gz +sha256 f7fe3a130be98a19c491479ef60f36b8ee41a9e6bc4d7f2c41033f63956a3126 lldpd-1.0.15.tar.gz sha256 0e96a5aea65f16e2239231ce4ab90497f8bc3bb8fe6abe9299aade4726ff7c8d LICENSE diff --git a/package/lldpd/lldpd.mk b/package/lldpd/lldpd.mk index b88dd002e4c..d4abfade818 100644 --- a/package/lldpd/lldpd.mk +++ b/package/lldpd/lldpd.mk @@ -4,7 +4,7 @@ # ################################################################################ -LLDPD_VERSION = 1.0.9 +LLDPD_VERSION = 1.0.15 LLDPD_SITE = https://media.luffy.cx/files/lldpd LLDPD_DEPENDENCIES = \ $(if $(BR2_PACKAGE_CHECK),check) \ @@ -16,6 +16,9 @@ LLDPD_LICENSE = ISC LLDPD_LICENSE_FILES = LICENSE LLDPD_CPE_ID_VENDOR = lldpd_project +# 0001-daemon-fix-read-overflow-when-parsing-CDP-addresses.patch +LLDPD_IGNORE_CVES += CVE-2023-41910 + # Detection of c99 support in configure fails without WCHAR. To enable # automatic detection of c99 support by configure, we need to enable # WCHAR in toolchain. But actually we do not need WCHAR at lldpd diff --git a/package/llvm/0002-Add-missing-cstdint-header-to-Signals.h.patch b/package/llvm/0002-Add-missing-cstdint-header-to-Signals.h.patch new file mode 100644 index 00000000000..c798f585d68 --- /dev/null +++ b/package/llvm/0002-Add-missing-cstdint-header-to-Signals.h.patch @@ -0,0 +1,34 @@ +From c6c71ab47d658ab8f84e6a6066d476fd9632bbca Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Mon, 23 May 2022 08:03:23 +0100 +Subject: [PATCH] Add missing header to Signals.h + +Without the change llvm build fails on this week's gcc-13 snapshot as: + + [ 0%] Building CXX object lib/Support/CMakeFiles/LLVMSupport.dir/Signals.cpp.o + In file included from llvm/lib/Support/Signals.cpp:14: + llvm/include/llvm/Support/Signals.h:119:8: error: variable or field 'CleanupOnSignal' declared void + 119 | void CleanupOnSignal(uintptr_t Context); + | ^~~~~~~~~~~~~~~ + +Upstream: https://github.com/llvm/llvm-project/commit/ff1681ddb303223973653f7f5f3f3435b48a1983.patch +Signed-off-by: Peter Seiderer +--- + include/llvm/Support/Signals.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/llvm/Support/Signals.h b/include/llvm/Support/Signals.h +index e0a18e72..148216b8 100644 +--- a/include/llvm/Support/Signals.h ++++ b/include/llvm/Support/Signals.h +@@ -14,6 +14,7 @@ + #ifndef LLVM_SUPPORT_SIGNALS_H + #define LLVM_SUPPORT_SIGNALS_H + ++#include + #include + + namespace llvm { +-- +2.40.1 + diff --git a/package/llvm/Config.in b/package/llvm/Config.in index 6ec2ffcfe60..d9d30a5ba58 100644 --- a/package/llvm/Config.in +++ b/package/llvm/Config.in @@ -4,22 +4,26 @@ config BR2_PACKAGE_LLVM_ARCH_SUPPORTS default y if BR2_x86_64 default y if BR2_aarch64 default y if BR2_arm || BR2_armeb + default y if BR2_riscv config BR2_PACKAGE_LLVM_TARGET_ARCH string default "AArch64" if BR2_aarch64 default "ARM" if BR2_arm || BR2_armeb default "X86" if BR2_i386 || BR2_x86_64 + default "riscv32" if BR2_riscv && !BR2_ARCH_IS_64 + default "riscv64" if BR2_riscv && BR2_ARCH_IS_64 config BR2_PACKAGE_LLVM bool "llvm" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::shared_future depends on !BR2_STATIC_LIBS depends on BR2_USE_WCHAR # std::wstring + depends on BR2_HOST_GCC_AT_LEAST_5 # host-llvm help The LLVM Project is a collection of modular and reusable compiler and toolchain technologies. @@ -55,11 +59,12 @@ config BR2_PACKAGE_LLVM_BPF endif -comment "llvm needs a toolchain w/ wchar, threads, C++, gcc >= 4.8, dynamic library" +comment "llvm needs a toolchain w/ wchar, threads, C++, gcc >= 5, dynamic library, host gcc >= 5" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \ - || BR2_STATIC_LIBS || !BR2_USE_WCHAR + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 \ + || BR2_STATIC_LIBS || !BR2_USE_WCHAR \ + || !BR2_HOST_GCC_AT_LEAST_5 comment "llvm needs a toolchain not affected by GCC bug 64735" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS diff --git a/package/llvm/llvm.hash b/package/llvm/llvm.hash index 6bf27557772..e7f79492dee 100644 --- a/package/llvm/llvm.hash +++ b/package/llvm/llvm.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 00a1ee1f389f81e9979f3a640a01c431b3021de0d42278f6508391a2f0b81c9a llvm-9.0.1.src.tar.xz -sha256 8d85c1057d742e597985c7d4e6320b015a9139385cff4cbae06ffc0ebe89afee LICENSE.TXT +sha256 ce8508e318a01a63d4e8b3090ab2ded3c598a50258cc49e2625b9120d4c03ea5 llvm-11.1.0.src.tar.xz +sha256 8d85c1057d742e597985c7d4e6320b015a9139385cff4cbae06ffc0ebe89afee LICENSE.TXT diff --git a/package/llvm/llvm.mk b/package/llvm/llvm.mk index 6c721c30b98..977c0a08c29 100644 --- a/package/llvm/llvm.mk +++ b/package/llvm/llvm.mk @@ -5,7 +5,7 @@ ################################################################################ # LLVM, Clang and lld should be version bumped together -LLVM_VERSION = 9.0.1 +LLVM_VERSION = 11.1.0 LLVM_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(LLVM_VERSION) LLVM_SOURCE = llvm-$(LLVM_VERSION).src.tar.xz LLVM_LICENSE = Apache-2.0 with exceptions @@ -41,8 +41,13 @@ HOST_LLVM_CONF_OPTS += -DCMAKE_INSTALL_RPATH="$(HOST_DIR)/lib" # Get target architecture LLVM_TARGET_ARCH = $(call qstrip,$(BR2_PACKAGE_LLVM_TARGET_ARCH)) -# Build backend for target architecture. This include backends like AMDGPU. +# Build backend for target architecture. This include backends like +# AMDGPU. We need to special case RISCV. +ifneq ($(filter riscv%,$(LLVM_TARGET_ARCH)),) +LLVM_TARGETS_TO_BUILD = RISCV +else LLVM_TARGETS_TO_BUILD = $(LLVM_TARGET_ARCH) +endif HOST_LLVM_CONF_OPTS += -DLLVM_TARGETS_TO_BUILD="$(subst $(space),;,$(LLVM_TARGETS_TO_BUILD))" LLVM_CONF_OPTS += -DLLVM_TARGETS_TO_BUILD="$(subst $(space),;,$(LLVM_TARGETS_TO_BUILD))" @@ -157,15 +162,9 @@ LLVM_CONF_OPTS += -DLLVM_ENABLE_PIC=ON HOST_LLVM_CONF_OPTS += -DCMAKE_BUILD_TYPE=Release LLVM_CONF_OPTS += -DCMAKE_BUILD_TYPE=Release -# Disable C++1y (ISO C++ 2014 standard) -# Disable C++1z (ISO C++ 2017 standard) -# Compile llvm with the C++11 (ISO C++ 2011 standard) which is the fallback. -HOST_LLVM_CONF_OPTS += \ - -DLLVM_ENABLE_CXX1Y=OFF \ - -DLLVM_ENABLE_CXX1Z=OFF -LLVM_CONF_OPTS += \ - -DLLVM_ENABLE_CXX1Y=OFF \ - -DLLVM_ENABLE_CXX1Z=OFF +# Compile llvm with the C++14 (ISO C++ 2014 standard). +HOST_LLVM_CONF_OPTS += -DCMAKE_CXX_STANDARD=14 +LLVM_CONF_OPTS += -DCMAKE_CXX_STANDARD=14 # Disabled, requires sys/ndir.h header # Disable debug in module @@ -220,8 +219,7 @@ HOST_LLVM_CONF_OPTS += \ # We need to activate LLVM_INCLUDE_TOOLS, otherwise it does not generate # libLLVM.so LLVM_CONF_OPTS += \ - -DLLVM_INCLUDE_TOOLS=ON \ - -DLLVM_BUILD_TOOLS=OFF + -DLLVM_INCLUDE_TOOLS=ON ifeq ($(BR2_PACKAGE_LLVM_RTTI),y) HOST_LLVM_CONF_OPTS += -DLLVM_ENABLE_RTTI=ON @@ -237,13 +235,11 @@ endif HOST_LLVM_CONF_OPTS += \ -DLLVM_BUILD_EXTERNAL_COMPILER_RT=OFF \ -DLLVM_BUILD_RUNTIME=OFF \ - -DLLVM_INCLUDE_RUNTIMES=OFF \ - -DLLVM_POLLY_BUILD=OFF + -DLLVM_INCLUDE_RUNTIMES=OFF LLVM_CONF_OPTS += \ -DLLVM_BUILD_EXTERNAL_COMPILER_RT=OFF \ -DLLVM_BUILD_RUNTIME=OFF \ - -DLLVM_INCLUDE_RUNTIMES=OFF \ - -DLLVM_POLLY_BUILD=OFF + -DLLVM_INCLUDE_RUNTIMES=OFF HOST_LLVM_CONF_OPTS += \ -DLLVM_ENABLE_WARNINGS=ON \ @@ -286,11 +282,25 @@ LLVM_CONF_OPTS += \ # directories from STAGING_DIR. # output/staging/usr/bin/llvm-config --includedir # output/staging/usr/include -define HOST_LLVM_COPY_LLVM_CONFIG_TO_STAGING_DIR +define LLVM_COPY_LLVM_CONFIG_TO_STAGING_DIR $(INSTALL) -D -m 0755 $(HOST_DIR)/bin/llvm-config \ $(STAGING_DIR)/usr/bin/llvm-config endef -HOST_LLVM_POST_INSTALL_HOOKS = HOST_LLVM_COPY_LLVM_CONFIG_TO_STAGING_DIR +HOST_LLVM_POST_INSTALL_HOOKS = LLVM_COPY_LLVM_CONFIG_TO_STAGING_DIR + +# The llvm-symbolizer binary is used by the Compiler-RT Fuzzer +# and AddressSanitizer tools on the target for stack traces. +# If we set -DLLVM_BUILD_TOOLS=ON this will also install the llvm-config +# target binary to STAGING_DIR, which means we can no longer run it. +# Therefore, overwrite it again with the host llvm-config. +ifeq ($(BR2_PACKAGE_COMPILER_RT),y) +LLVM_CONF_OPTS += \ + -DLLVM_BUILD_TOOLS=ON +LLVM_POST_INSTALL_STAGING_HOOKS = LLVM_COPY_LLVM_CONFIG_TO_STAGING_DIR +else +LLVM_CONF_OPTS += \ + -DLLVM_BUILD_TOOLS=OFF +endif # By default llvm-tblgen is built and installed on the target but it is # not necessary. Also erase LLVMHello.so from /usr/lib diff --git a/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-HACK-only-build-and-install-localedef.patch b/package/localedef/0001-HACK-only-build-and-install-localedef.patch similarity index 100% rename from package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0001-HACK-only-build-and-install-localedef.patch rename to package/localedef/0001-HACK-only-build-and-install-localedef.patch diff --git a/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/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 similarity index 100% rename from package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch rename to package/localedef/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch diff --git a/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/localedef.hash b/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/localedef.hash deleted file mode 100644 index dfd939020f8..00000000000 --- a/package/localedef/2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c/localedef.hash +++ /dev/null @@ -1,7 +0,0 @@ -# Locally calculated (fetched from Github) -sha256 3c299a21468a80356b848ca341f45551616c4928a6c871e6d45cee942e8b0f24 glibc-2.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c.tar.gz - -# Hashes for license files -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB -sha256 b33d0bd9f685b46853548814893a6135e74430d12f6d94ab3eba42fc591f83bc LICENSES diff --git a/package/localedef/localedef.hash b/package/localedef/localedef.hash deleted file mode 100644 index 5316f03b105..00000000000 --- a/package/localedef/localedef.hash +++ /dev/null @@ -1,2 +0,0 @@ -# This hash file is not used; instead, update the -# hash files in the per-version sub-directories. diff --git a/package/localedef/localedef.hash b/package/localedef/localedef.hash new file mode 120000 index 00000000000..86320aa5e08 --- /dev/null +++ b/package/localedef/localedef.hash @@ -0,0 +1 @@ +../glibc/glibc.hash \ No newline at end of file diff --git a/package/localedef/localedef.mk b/package/localedef/localedef.mk index f8f0b429848..66998408542 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.34-109-gd64b08d5ba7ffbc9155630f4843cf2e271b1629c +LOCALEDEF_VERSION = 2.36-81-g4f4d7a13edfd2fdc57c9d76e1fd6d017fb47550c LOCALEDEF_SOURCE = glibc-$(LOCALEDEF_VERSION).tar.gz LOCALEDEF_SITE = $(call github,bminor,glibc,$(LOCALEDEF_VERSION)) HOST_LOCALEDEF_DL_SUBDIR = glibc diff --git a/package/log4cplus/log4cplus.hash b/package/log4cplus/log4cplus.hash index a668eca37af..1779b30949e 100644 --- a/package/log4cplus/log4cplus.hash +++ b/package/log4cplus/log4cplus.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 8f74a0a5920ba044b24e2ebeb0f1e5e36d85d5c23ed48d9fe328882b16130db8 log4cplus-2.0.7.tar.xz +sha256 d84ac8b1c46645122fbf72691f8eacef68c71b587403ee833bd9a252e06d46cc log4cplus-2.1.0.tar.xz sha256 91d7e42ff80e74c4c94e5ad353375fa0358cd0abbf43f5fe957097cdbd4e2c4d LICENSE diff --git a/package/log4cplus/log4cplus.mk b/package/log4cplus/log4cplus.mk index 56a85025cbd..28eb4ed8f47 100644 --- a/package/log4cplus/log4cplus.mk +++ b/package/log4cplus/log4cplus.mk @@ -4,14 +4,14 @@ # ################################################################################ -LOG4CPLUS_VERSION = 2.0.7 +LOG4CPLUS_VERSION = 2.1.0 LOG4CPLUS_SOURCE = log4cplus-$(LOG4CPLUS_VERSION).tar.xz LOG4CPLUS_SITE = http://downloads.sourceforge.net/project/log4cplus/log4cplus-stable/$(LOG4CPLUS_VERSION) LOG4CPLUS_LICENSE = Apache-2.0, BSD-2-Clause, BSD-like (threadpool) LOG4CPLUS_LICENSE_FILES = LICENSE LOG4CPLUS_INSTALL_STAGING = YES -ifeq ($(BR2_GCC_ENABLE_LTO),y) +ifeq ($(BR2_ENABLE_LTO),y) LOG4CPLUS_CONF_OPTS += --enable-lto else LOG4CPLUS_CONF_OPTS += --disable-lto diff --git a/package/log4cpp/log4cpp.hash b/package/log4cpp/log4cpp.hash index f79aabee9d8..f4084c81125 100644 --- a/package/log4cpp/log4cpp.hash +++ b/package/log4cpp/log4cpp.hash @@ -1,6 +1,6 @@ # From http://sourceforge.net/projects/log4cpp/files/log4cpp-1.1.x%20%28new%29/log4cpp-1.1/ -md5 b9e2cee932da987212f2c74b767b4d8b log4cpp-1.1.3.tar.gz -sha1 74f0fea7931dc1bc4e5cd34a6318cd2a51322041 log4cpp-1.1.3.tar.gz +md5 b9e2cee932da987212f2c74b767b4d8b log4cpp-1.1.3.tar.gz +sha1 74f0fea7931dc1bc4e5cd34a6318cd2a51322041 log4cpp-1.1.3.tar.gz # Locally computed -sha256 2cbbea55a5d6895c9f0116a9a9ce3afb86df383cd05c9d6c1a4238e5e5c8f51d log4cpp-1.1.3.tar.gz -sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 log4cpp/COPYING +sha256 2cbbea55a5d6895c9f0116a9a9ce3afb86df383cd05c9d6c1a4238e5e5c8f51d log4cpp-1.1.3.tar.gz +sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 log4cpp/COPYING diff --git a/package/log4cxx/0001-Make-ODBC-and-SMTP-opt-in-191.patch b/package/log4cxx/0001-Make-ODBC-and-SMTP-opt-in-191.patch new file mode 100644 index 00000000000..a116fcc4915 --- /dev/null +++ b/package/log4cxx/0001-Make-ODBC-and-SMTP-opt-in-191.patch @@ -0,0 +1,73 @@ +From 4900c27cc284ba2f671ae92e6ffb4ab391f9507a Mon Sep 17 00:00:00 2001 +From: Robert Middleton +Date: Mon, 6 Feb 2023 20:39:02 -0500 +Subject: [PATCH] Make ODBC and SMTP opt-in (#191) + +See #189 + +Upstream: afeaab6d0f0107c77dfadcbe3708f170c48d5ed9 +Signed-off-by: Thomas Petazzoni +--- + src/main/include/CMakeLists.txt | 40 ++++++++++++++++++++++++--------- + 1 file changed, 30 insertions(+), 10 deletions(-) + +diff --git a/src/main/include/CMakeLists.txt b/src/main/include/CMakeLists.txt +index e31443fb..d6835293 100644 +--- a/src/main/include/CMakeLists.txt ++++ b/src/main/include/CMakeLists.txt +@@ -85,22 +85,42 @@ include(CheckIncludeFiles) + include(CheckIncludeFileCXX) + include(CheckLibraryExists) + +-if(WIN32) +- CHECK_INCLUDE_FILES(sqlext.h HAS_ODBC) ++option(LOG4CXX_ENABLE_ODBC "Support logging via ODBC" OFF) ++if(LOG4CXX_ENABLE_ODBC) ++ if(WIN32) ++ CHECK_INCLUDE_FILES(sqlext.h HAS_ODBC) ++ else() ++ include(FindPkgConfig) ++ ++ pkg_check_modules( odbc odbc ) ++ if(${odbc_FOUND}) ++ set(HAS_ODBC 1) ++ else() ++ set(HAS_ODBC 0) ++ endif(${odbc_FOUND}) ++ endif(WIN32) ++ ++ if(NOT ${HAS_ODBC}) ++ message(SEND_ERROR "ODBC not found but requested") ++ endif() + else() +- include(FindPkgConfig) +- +- pkg_check_modules( odbc QUIET odbc ) +- if(${odbc_FOUND}) +- set(HAS_ODBC 1) +- endif(${odbc_FOUND}) +-endif(WIN32) ++ set(HAS_ODBC 0) ++endif(LOG4CXX_ENABLE_ODBC) ++ ++option(LOG4CXX_ENABLE_ESMTP "Support logging via libesmtp" OFF) ++if(LOG4CXX_ENABLE_ESMTP) ++ CHECK_LIBRARY_EXISTS(esmtp smtp_create_session "" HAS_LIBESMTP) ++ if(NOT HAS_LIBESMTP) ++ message(SEND_ERROR "SMTP support with libesmtp not found but requested") ++ endif() ++else() ++ set(HAS_LIBESMTP 0) ++endif(LOG4CXX_ENABLE_ESMTP) + + CHECK_INCLUDE_FILE_CXX(locale HAS_STD_LOCALE) + CHECK_FUNCTION_EXISTS(mbsrtowcs HAS_MBSRTOWCS) + CHECK_FUNCTION_EXISTS(wcstombs HAS_WCSTOMBS) + CHECK_FUNCTION_EXISTS(fwide HAS_FWIDE) +-CHECK_LIBRARY_EXISTS(esmtp smtp_create_session "" HAS_LIBESMTP) + CHECK_FUNCTION_EXISTS(syslog HAS_SYSLOG) + if(UNIX) + set(CMAKE_REQUIRED_LIBRARIES "pthread") +-- +2.41.0 + diff --git a/package/log4cxx/0001-boost-fallback-only-check-for-boost-if-really-needed.patch b/package/log4cxx/0001-boost-fallback-only-check-for-boost-if-really-needed.patch deleted file mode 100644 index 7df29ea120f..00000000000 --- a/package/log4cxx/0001-boost-fallback-only-check-for-boost-if-really-needed.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 24e7adc8d67b3c8f7d275b4f9a7e70a61b73fcd4 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Fri, 28 Jan 2022 13:11:01 +0100 -Subject: [PATCH] boost-fallback: only check for boost if really needed - -- only check for boost if really needed (in case of legacy c++ standard < c++17) - -Signed-off-by: Peter Seiderer ---- - src/cmake/boost-fallback/boost-fallback.cmake | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/cmake/boost-fallback/boost-fallback.cmake b/src/cmake/boost-fallback/boost-fallback.cmake -index 8285b0b9..0ecf8c6c 100644 ---- a/src/cmake/boost-fallback/boost-fallback.cmake -+++ b/src/cmake/boost-fallback/boost-fallback.cmake -@@ -55,6 +55,8 @@ try_compile(STD_SHARED_PTR_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tes - try_compile(STD_ATOMIC_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tests" - "${CMAKE_CURRENT_LIST_DIR}/test-stdatomic.cpp") - -+# search for boost only in case needed for legacy c++ standard < c++17 -+if(NOT ${STD_THREAD_FOUND} OR NOT ${STD_MUTEX_FOUND} OR NOT ${STD_SHARED_MUTEX_FOUND} OR NOT ${STD_SHARED_PTR_FOUND} OR NOT ${STD_ATOMIC_FOUND}) - find_package(Boost COMPONENTS thread) - if( ${Boost_FOUND} ) - try_compile(Boost_SHARED_PTR_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tests" -@@ -67,6 +69,7 @@ if( ${Boost_FOUND} ) - try_compile(Boost_ATOMIC_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tests" - "${CMAKE_CURRENT_LIST_DIR}/test-boostatomic.cpp") - endif( ${Boost_FOUND} ) -+endif() - - # Link the target with the appropriate boost libraries(if required) - function(boostfallback_link target) --- -2.34.1 - diff --git a/package/log4cxx/log4cxx.hash b/package/log4cxx/log4cxx.hash index 12633c8e57d..8190f94aa3f 100644 --- a/package/log4cxx/log4cxx.hash +++ b/package/log4cxx/log4cxx.hash @@ -1,4 +1,4 @@ -# From https://www.apache.org/dist/logging/log4cxx/0.12.1/apache-log4cxx-0.12.1.tar.gz.sha512 -sha512 807058734cebf7c92e99484313becbc6be63e48bd930889c733318bb78dfec498b66aaa12255ed30879abb005b32e2b965f9dd87ec50d0421ca067f3f66280d9 apache-log4cxx-0.12.1.tar.gz +# From https://www.apache.org/dist/logging/log4cxx/0.13.0/apache-log4cxx-0.13.0.tar.gz.sha512 +sha512 2a5f4fecc0415d942658c588774f0666082c497b6fd49bf64ab3328a997775206788c9b10a8c89208896c57da52fcc12c18d5d11ca1d3bf699e4633b8fcea6e5 apache-log4cxx-0.13.0.tar.gz # Locally computed sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/log4cxx/log4cxx.mk b/package/log4cxx/log4cxx.mk index d20cc792a6c..aee682529c8 100644 --- a/package/log4cxx/log4cxx.mk +++ b/package/log4cxx/log4cxx.mk @@ -4,16 +4,21 @@ # ################################################################################ -LOG4CXX_VERSION = 0.12.1 +LOG4CXX_VERSION = 0.13.0 LOG4CXX_SITE = https://archive.apache.org/dist/logging/log4cxx/$(LOG4CXX_VERSION) LOG4CXX_SOURCE = apache-log4cxx-$(LOG4CXX_VERSION).tar.gz LOG4CXX_INSTALL_STAGING = YES LOG4CXX_LICENSE = Apache-2.0 LOG4CXX_LICENSE_FILES = LICENSE +LOG4CXX_CPE_ID_VENDOR = apache +# We do not support ODBC functionality +LOG4CXX_IGNORE_CVES = CVE-2023-31038 +# Note: if you want to support odbc, make sure CVE-2023-31038 is fixed LOG4CXX_CONF_OPTS = \ -DAPR_CONFIG_EXECUTABLE=$(STAGING_DIR)/usr/bin/apr-1-config \ - -DAPR_UTIL_CONFIG_EXECUTABLE=$(STAGING_DIR)/usr/bin/apu-1-config + -DAPR_UTIL_CONFIG_EXECUTABLE=$(STAGING_DIR)/usr/bin/apu-1-config \ + -DLOG4CXX_ENABLE_ODBC=OFF LOG4CXX_DEPENDENCIES = apr apr-util @@ -22,7 +27,10 @@ LOG4CXX_DEPENDENCIES += boost endif ifeq ($(BR2_PACKAGE_LIBESMTP),y) +LOG4CXX_CONF_OPTS += -DLOG4CXX_ENABLE_LIBESMTP=ON LOG4CXX_DEPENDENCIES += libesmtp +else +LOG4CXX_CONF_OPTS += -DLOG4CXX_ENABLE_LIBESMTP=OFF endif ifeq ($(BR2_USE_WCHAR),y) diff --git a/package/logrotate/logrotate.hash b/package/logrotate/logrotate.hash index 2af46d60b7f..9c8e73f738e 100644 --- a/package/logrotate/logrotate.hash +++ b/package/logrotate/logrotate.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 841f81bf09d0014e4a2e11af166bb33fcd8429cc0c2d4a7d3d9ceb3858cfccc5 logrotate-3.18.0.tar.xz +sha256 742f6d6e18eceffa49a4bacd933686d3e42931cfccfb694d7f6369b704e5d094 logrotate-3.20.1.tar.xz diff --git a/package/logrotate/logrotate.mk b/package/logrotate/logrotate.mk index 4d1344c2cdf..453dbe477a8 100644 --- a/package/logrotate/logrotate.mk +++ b/package/logrotate/logrotate.mk @@ -4,8 +4,8 @@ # ################################################################################ -LOGROTATE_VERSION = 3.18.0 -LOGROTATE_SOURCE = logrotate-3.18.0.tar.xz +LOGROTATE_VERSION = 3.20.1 +LOGROTATE_SOURCE = logrotate-$(LOGROTATE_VERSION).tar.xz LOGROTATE_SITE = https://github.com/logrotate/logrotate/releases/download/$(LOGROTATE_VERSION) LOGROTATE_LICENSE = GPL-2.0+ LOGROTATE_LICENSE_FILES = COPYING diff --git a/package/logsurfer/logsurfer.hash b/package/logsurfer/logsurfer.hash index 539a41a3cee..8e9f5c95bdd 100644 --- a/package/logsurfer/logsurfer.hash +++ b/package/logsurfer/logsurfer.hash @@ -1,3 +1,3 @@ # From https://www.crypt.gen.nz/logsurfer/ -md5 4c26a74d813ccf766117c95c644aa601 logsurfer-1.8.tar.gz -sha256 74a36e8530a884031b4ae2344a46b9aaa07a1ee36d143802f6b64f817c5bd1af logsurfer-1.8.tar.gz +md5 4c26a74d813ccf766117c95c644aa601 logsurfer-1.8.tar.gz +sha256 74a36e8530a884031b4ae2344a46b9aaa07a1ee36d143802f6b64f817c5bd1af logsurfer-1.8.tar.gz diff --git a/package/lpeg/lpeg.hash b/package/lpeg/lpeg.hash index 7a20f063f38..cb995bde2c5 100644 --- a/package/lpeg/lpeg.hash +++ b/package/lpeg/lpeg.hash @@ -1,2 +1,4 @@ # computed by luarocks/buildroot -sha256 e0d0d687897f06588558168eeb1902ac41a11edd1b58f1aa61b99d0ea0abbfbc lpeg-1.0.2-1.src.rock +sha256 e0d0d687897f06588558168eeb1902ac41a11edd1b58f1aa61b99d0ea0abbfbc lpeg-1.0.2-1.src.rock +# computed locally +sha256 2b80a8cce793e008ba433e5e0184f20aca4a67ec741439fafd86a874a6a91c49 lpeg-1.0.2/lpeg.html diff --git a/package/lpeg/lpeg.mk b/package/lpeg/lpeg.mk index cdb2e81a5ff..7326e59e010 100644 --- a/package/lpeg/lpeg.mk +++ b/package/lpeg/lpeg.mk @@ -6,5 +6,6 @@ LPEG_VERSION = 1.0.2-1 LPEG_LICENSE = MIT +LPEG_LICENSE_FILES = $(LPEG_SUBDIR)/lpeg.html $(eval $(luarocks-package)) diff --git a/package/lpty/lpty.hash b/package/lpty/lpty.hash index 6b21d75a5d6..1fe88107eaa 100644 --- a/package/lpty/lpty.hash +++ b/package/lpty/lpty.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 cf263ece9b50a78a7fb2277e3546fbbf0bf6858f41821932d92f2e3d8a065091 lpty-1.0.1-1.src.rock -sha256 c5a128a73cad5f6e111ebd8f4a9fa3500562c57912972eb15627db9610d43dec lpty-1.0.1-1/doc/LICENSE +sha256 cf263ece9b50a78a7fb2277e3546fbbf0bf6858f41821932d92f2e3d8a065091 lpty-1.0.1-1.src.rock +sha256 c5a128a73cad5f6e111ebd8f4a9fa3500562c57912972eb15627db9610d43dec lpty-1.0.1-1/doc/LICENSE diff --git a/package/lrandom/lrandom.hash b/package/lrandom/lrandom.hash index 111635e50e6..fc6c81d4cfa 100644 --- a/package/lrandom/lrandom.hash +++ b/package/lrandom/lrandom.hash @@ -1,2 +1,2 @@ # computed by luarocks/buildroot -sha256 9b77af41202feb38b09cb4a99cd49680ea9dbc9df3e640f801be378dd286eab8 lrandom-20180729-1.src.rock +sha256 9b77af41202feb38b09cb4a99cd49680ea9dbc9df3e640f801be378dd286eab8 lrandom-20180729-1.src.rock diff --git a/package/lrzip/lrzip.hash b/package/lrzip/lrzip.hash index 19295383c32..cb03ff07cce 100644 --- a/package/lrzip/lrzip.hash +++ b/package/lrzip/lrzip.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 9b6b4bb1ae76dafbaab96ec9d50d41af5fed45a6c4f2e06feea828c2cd8025c0 lrzip-0.641.tar.gz +sha256 48bd8decb097c1596c9b3777959cd3e332819434ed77a2823e65aa436f1602f9 lrzip-0.651.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/lrzip/lrzip.mk b/package/lrzip/lrzip.mk index 409d9912d8e..03756964147 100644 --- a/package/lrzip/lrzip.mk +++ b/package/lrzip/lrzip.mk @@ -4,11 +4,13 @@ # ################################################################################ -LRZIP_VERSION = 0.641 -LRZIP_SITE = $(call github,ckolivas,lrzip,v$(LRZIP_VERSION)) -LRZIP_AUTORECONF = YES +LRZIP_VERSION = 0.651 +LRZIP_SOURCE = lrzip-$(LRZIP_VERSION).tar.xz +LRZIP_SITE = http://ck.kolivas.org/apps/lrzip LRZIP_LICENSE = GPL-2.0+ LRZIP_LICENSE_FILES = COPYING +LRZIP_CPE_ID_VENDOR = long_range_zip_project +LRZIP_CPE_ID_PRODUCT = long_range_zip LRZIP_DEPENDENCIES = zlib lz4 lzo bzip2 ifeq ($(BR2_i386)$(BR2_x86_64),y) diff --git a/package/lrzsz/lrzsz.mk b/package/lrzsz/lrzsz.mk index 45c88619e08..3897975d732 100644 --- a/package/lrzsz/lrzsz.mk +++ b/package/lrzsz/lrzsz.mk @@ -18,10 +18,6 @@ define LRZSZ_POST_CONFIGURE_HOOKS $(SED) "s~\(#define ENABLE_SYSLOG.*\)~/* \1 */~;" $(@D)/config.h endef -define LRZSZ_BUILD_HOOKS - $(TARGET_MAKE_ENV) $(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" prefix="$(TARGET_DIR)" -C $(@D) -endef - define LRZSZ_INSTALL_TARGET_CMDS $(INSTALL) -m 0755 -D $(@D)/src/lrz $(TARGET_DIR)/usr/bin/rz $(INSTALL) -m 0755 -D $(@D)/src/lsz $(TARGET_DIR)/usr/bin/sz diff --git a/package/lshw/0001-Fix-musl-build-basename-is-in-libgen.h.patch b/package/lshw/0001-Fix-musl-build-basename-is-in-libgen.h.patch deleted file mode 100644 index 0917260d4c9..00000000000 --- a/package/lshw/0001-Fix-musl-build-basename-is-in-libgen.h.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 6bc5abf99ef01e5aeea4f5bce5f5bff7f1b8ddd9 Mon Sep 17 00:00:00 2001 -From: Sergio Prado -Date: Sat, 4 Jul 2020 20:02:53 -0300 -Subject: [PATCH] Fix musl build: basename() is in libgen.h. - -Also, its argument is not const, so add const_cast. - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) -Signed-off-by: Sergio Prado ---- - src/core/sysfs.cc | 19 ++++++++++--------- - 1 file changed, 10 insertions(+), 9 deletions(-) - -diff --git a/src/core/sysfs.cc b/src/core/sysfs.cc -index 32d65642f157..c2fa84fe8d0f 100644 ---- a/src/core/sysfs.cc -+++ b/src/core/sysfs.cc -@@ -16,6 +16,7 @@ - #include - #include - #include -+#include - - - __ID("@(#) $Id$"); -@@ -100,7 +101,7 @@ static string sysfs_getbustype(const string & path) - { - devname = - string(fs.path + "/bus/") + string(namelist[i]->d_name) + -- "/devices/" + basename(path.c_str()); -+ "/devices/" + basename(const_cast(path.c_str())); - - if (samefile(devname, path)) - return string(namelist[i]->d_name); -@@ -140,7 +141,7 @@ static string sysfstobusinfo(const string & path) - - if (bustype == "usb") - { -- string name = basename(path.c_str()); -+ string name = basename(const_cast(path.c_str())); - if (matches(name, "^[0-9]+-[0-9]+(\\.[0-9]+)*:[0-9]+\\.[0-9]+$")) - { - size_t colon = name.rfind(":"); -@@ -151,7 +152,7 @@ static string sysfstobusinfo(const string & path) - - if (bustype == "virtio") - { -- string name = basename(path.c_str()); -+ string name = basename(const_cast(path.c_str())); - if (name.compare(0, 6, "virtio") == 0) - return "virtio@" + name.substr(6); - else -@@ -159,10 +160,10 @@ static string sysfstobusinfo(const string & path) - } - - if (bustype == "vio") -- return string("vio@") + basename(path.c_str()); -+ return string("vio@") + basename(const_cast(path.c_str())); - - if (bustype == "ccw") -- return string("ccw@") + basename(path.c_str()); -+ return string("ccw@") + basename(const_cast(path.c_str())); - - if (bustype == "ccwgroup") - { -@@ -240,7 +241,7 @@ string entry::driver() const - string driverlink = This->devpath + "/driver"; - if (!exists(driverlink)) - return ""; -- return basename(readlink(driverlink).c_str()); -+ return basename(const_cast(readlink(driverlink).c_str())); - } - - -@@ -328,7 +329,7 @@ string entry::name_in_class(const string & classname) const - - string entry::name() const - { -- return basename(This->devpath.c_str()); -+ return basename(const_cast(This->devpath.c_str())); - } - - -@@ -340,12 +341,12 @@ entry entry::parent() const - - string entry::classname() const - { -- return basename(dirname(This->devpath).c_str()); -+ return basename(const_cast(dirname(This->devpath).c_str())); - } - - bool entry::isvirtual() const - { -- return string(basename(dirname(dirname(This->devpath)).c_str())) == "virtual"; -+ return string(basename(const_cast(dirname(dirname(This->devpath)).c_str()))) == "virtual"; - } - - string entry::string_attr(const string & name, const string & def) const --- -2.17.1 - diff --git a/package/lshw/0001-solve-Compile-error-when-g-version-is-less-than-5.patch b/package/lshw/0001-solve-Compile-error-when-g-version-is-less-than-5.patch new file mode 100644 index 00000000000..f15c8bc52c3 --- /dev/null +++ b/package/lshw/0001-solve-Compile-error-when-g-version-is-less-than-5.patch @@ -0,0 +1,65 @@ +From 383c80bf486f806438bb11a9c9a9567407cd47ab Mon Sep 17 00:00:00 2001 +From: "E.V.Acacia" <624758472@qq.com> +Date: Fri, 3 Sep 2021 14:19:37 +0800 +Subject: [PATCH] solve: Compile error when gcc version is less than 5 + +[Retrieved from: +https://github.com/lyonel/lshw/pull/70/commits/383c80bf486f806438bb11a9c9a9567407cd47ab] +Signed-off-by: Fabrice Fontaine +--- + src/core/cpuinfo.cc | 8 ++++---- + src/core/hw.cc | 2 +- + src/core/spd.cc | 4 ++-- + 3 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/src/core/cpuinfo.cc b/src/core/cpuinfo.cc +index 9e41a421..ed1c4164 100644 +--- a/src/core/cpuinfo.cc ++++ b/src/core/cpuinfo.cc +@@ -465,13 +465,13 @@ string value) + if (id == "model name") + cpu->setProduct(value); + if (id == "microcode") +- cpu->setConfig(id, stoll(value, NULL, 0)); ++ cpu->setConfig(id, strtoll(value.c_str(), NULL, 0)); + if (id == "cpu family") +- cpu->addHint(id, stoll(value, NULL, 0)); ++ cpu->addHint(id, strtoll(value.c_str(), NULL, 0)); + if (id == "model") +- cpu->addHint(id, stoll(value, NULL, 0)); ++ cpu->addHint(id, strtoll(value.c_str(), NULL, 0)); + if (id == "stepping") +- cpu->addHint(id, stoll(value, NULL, 0)); ++ cpu->addHint(id, strtoll(value.c_str(), NULL, 0)); + + family = cpu->getHint("cpu family"); + model = cpu->getHint("model"); +diff --git a/src/core/hw.cc b/src/core/hw.cc +index 1c1dad46..b266a863 100644 +--- a/src/core/hw.cc ++++ b/src/core/hw.cc +@@ -2459,7 +2459,7 @@ long long value::asInteger() const + switch(This->type) + { + case hw::text: +- return stoll(This->s, NULL, 0); ++ return strtoll(This->s.c_str(), NULL, 0); + case hw::integer: + return This->ll; + case hw::boolean: +diff --git a/src/core/spd.cc b/src/core/spd.cc +index a304d061..2ad66b82 100644 +--- a/src/core/spd.cc ++++ b/src/core/spd.cc +@@ -195,9 +195,9 @@ static bool scan_eeproms(hwNode & memory) + { + if (scan_eeprom(memory, namelist[i]->d_name)) + current_bank++; +- free(namelist[i]); ++ delete(namelist[i]); + } +- free(namelist); ++ delete(namelist); + + return true; + } diff --git a/package/lshw/0002-Fix-musl-build-wrong-usage-of-LONG_BIT.patch b/package/lshw/0002-Fix-musl-build-wrong-usage-of-LONG_BIT.patch deleted file mode 100644 index dd8bdb5beb6..00000000000 --- a/package/lshw/0002-Fix-musl-build-wrong-usage-of-LONG_BIT.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 246b9e07f22d551fae0718315273760c087b79ca Mon Sep 17 00:00:00 2001 -From: Sergio Prado -Date: Sat, 4 Jul 2020 20:28:26 -0300 -Subject: [PATCH] Fix musl build: wrong usage of LONG_BIT - -LONG_BIT is not a sysconf value, it is either 32 or 64. Using it as -a sysconf value will give weird results. - -Originally it was sysconf(_SC_LONG_BIT) (before it was "fixed" by the -gentoo guys). But this is useless: it will always return a value -equal to LONG_BIT: it's either compiled 32-bit or 64-bit so a runtime -lookup doesn't make sense. For this reason, musl has removed the -definition of _SC_LONG_BIT. - -Signed-off-by: Sergio Prado -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - src/core/abi.cc | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/src/core/abi.cc b/src/core/abi.cc -index adff7b55acfa..76c664c03ce7 100644 ---- a/src/core/abi.cc -+++ b/src/core/abi.cc -@@ -20,9 +20,7 @@ __ID("@(#) $Id: mem.cc 1352 2006-05-27 23:54:13Z ezix $"); - bool scan_abi(hwNode & system) - { - // are we compiled as 32- or 64-bit process ? -- long sc = sysconf(LONG_BIT); -- if(sc==-1) sc = sysconf(_SC_LONG_BIT); -- if(sc!=-1) system.setWidth(sc); -+ system.setWidth(LONG_BIT); - - pushd(PROC_SYS); - --- -2.17.1 - diff --git a/package/lshw/Config.in b/package/lshw/Config.in index 5e0e47b6e2e..fb557aacff0 100644 --- a/package/lshw/Config.in +++ b/package/lshw/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_LSHW depends on BR2_USE_WCHAR select BR2_PACKAGE_HWDATA # runtime select BR2_PACKAGE_HWDATA_PCI_IDS + select BR2_PACKAGE_HWDATA_PNP_IDS select BR2_PACKAGE_HWDATA_USB_IDS help lshw (Hardware Lister) is a small tool to provide diff --git a/package/lshw/lshw.hash b/package/lshw/lshw.hash index 0b60b3b5722..5626d7131eb 100644 --- a/package/lshw/lshw.hash +++ b/package/lshw/lshw.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9bb347ac87142339a366a1759ac845e3dbb337ec000aa1b99b50ac6758a80f80 lshw-B.02.19.2.tar.gz +sha256 c62c89d4b3305d897bd644524bbc816c1793c41c9fea10381b75f9d5b074e056 lshw-d76afbaaf40e953243da921844cddff8185324f3.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/lshw/lshw.mk b/package/lshw/lshw.mk index 9f1ff8938a7..86c8f356cce 100644 --- a/package/lshw/lshw.mk +++ b/package/lshw/lshw.mk @@ -4,26 +4,49 @@ # ################################################################################ -LSHW_VERSION = 02.19.2 -LSHW_SITE = http://ezix.org/software/files -LSHW_SOURCE = lshw-B.$(LSHW_VERSION).tar.gz +LSHW_VERSION = d76afbaaf40e953243da921844cddff8185324f3 +LSHW_SITE = $(call github,lyonel,lshw,$(LSHW_VERSION)) LSHW_LICENSE = GPL-2.0 LSHW_LICENSE_FILES = COPYING -LSHW_MAKE_OPTS = CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" AR="$(TARGET_AR)" \ - RPM_OPT_FLAGS="$(TARGET_CFLAGS)" all +LSHW_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) + +LSHW_MAKE_OPTS = \ + CC="$(TARGET_CC)" \ + CXX="$(TARGET_CXX)" \ + AR="$(TARGET_AR)" \ + LANGUAGES= \ + RPM_OPT_FLAGS="$(TARGET_CFLAGS)" + LSHW_MAKE_ENV = \ $(TARGET_MAKE_ENV) \ LIBS=$(TARGET_NLS_LIBS) -LSHW_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) + +ifeq ($(BR2_PACKAGE_SQLITE),y) +LSHW_DEPENDENCIES += host-pkgconf sqlite +LSHW_MAKE_OPTS += SQLITE=1 +else +LSHW_MAKE_OPTS += SQLITE=0 +endif + +ifeq ($(BR2_PACKAGE_ZLIB),y) +LSHW_DEPENDENCIES += host-pkgconf zlib +LSHW_MAKE_OPTS += ZLIB=1 +else +LSHW_MAKE_OPTS += ZLIB=0 +endif define LSHW_BUILD_CMDS - $(LSHW_MAKE_ENV) $(MAKE) -C $(@D)/src $(LSHW_MAKE_OPTS) + $(LSHW_MAKE_ENV) $(MAKE) -C $(@D)/src \ + $(LSHW_MAKE_OPTS) \ + all endef define LSHW_INSTALL_TARGET_CMDS - $(LSHW_MAKE_ENV) $(MAKE) -C $(@D)/src DESTDIR=$(TARGET_DIR) \ - $(LSHW_MAKE_OPTS) install + $(LSHW_MAKE_ENV) $(MAKE) -C $(@D)/src \ + $(LSHW_MAKE_OPTS) \ + DESTDIR=$(TARGET_DIR) \ + install $(RM) -rf $(TARGET_DIR)/usr/share/lshw endef diff --git a/package/lsof/0001-makefile.patch b/package/lsof/0001-makefile.patch deleted file mode 100644 index 65b1b2e2a78..00000000000 --- a/package/lsof/0001-makefile.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ru lsof_4.81.orig/lsof_4.81_src/lib/Makefile.skel lsof_4.81/lsof_4.81_src/lib/Makefile.skel ---- a/lib/Makefile.skel 2001-02-13 03:12:22.000000000 +0100 -+++ b/lib/Makefile.skel 2006-11-29 13:51:44.000000000 +0100 -@@ -21,8 +21,8 @@ - all: ${LIB} - - ${LIB}: ${OBJ} -- ${AR} -- ${RANLIB} -+ ${AR} cr ${LIB} ${OBJ} -+ ${RANLIB} ${LIB} - - clean: FRC - rm -f ${LIB} ${OBJ} errs Makefile.bak a.out core diff --git a/package/lsof/0002-remove-susvlegacy-funcs.patch b/package/lsof/0002-remove-susvlegacy-funcs.patch deleted file mode 100644 index fca66aee575..00000000000 --- a/package/lsof/0002-remove-susvlegacy-funcs.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rdup lsof_4.81.orig/lsof_4.81_src/dialects/linux/machine.h lsof_4.81/lsof_4.81_src/dialects/linux/machine.h ---- a/dialects/linux/machine.h 2007-04-24 18:20:58.000000000 +0200 -+++ b/dialects/linux/machine.h 2007-05-15 12:17:03.000000000 +0200 -@@ -616,6 +616,6 @@ - * zeromem is a macro that uses bzero or memset. - */ - --#define zeromem(a, l) bzero(a, l) -+#define zeromem(a, l) memset(a, 0, l) - - #endif /* !defined(LSOF_MACHINE_H) */ - diff --git a/package/lsof/0003-override-cflags.patch b/package/lsof/0003-override-cflags.patch deleted file mode 100644 index 135e599ac94..00000000000 --- a/package/lsof/0003-override-cflags.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- lsof_4.84/Configure 2008-10-21 18:21:45.000000000 +0200 -+++ lsof_4.84/Configure 2010-11-03 14:00:00.000000000 +0100 -@@ -5206,6 +5206,10 @@ - cp $LSOF_MKFC ${LSOF_LIB}/$LSOF_LIBMKF - fi # } - cat ./dialects/$LSOF_DIALECT_DIR/$LSOF_REST >> $LSOF_MKFC -+if test "X$LSOF_CFLAGS_OVERRIDE" != "X" # { -+then -+ sed -i -e 's/^CFLAGS=/override CFLAGS=/' $LSOF_MKFC -+fi # } - if test "X$LSOF_LIB_NO" = "X" # { - then - diff --git a/package/lsof/lsof.hash b/package/lsof/lsof.hash index 9e72023d30d..29cf443a244 100644 --- a/package/lsof/lsof.hash +++ b/package/lsof/lsof.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c41709c2543ecf9de1e950795790a9786a2f225e51c3cc53d6a9a256f872472b lsof_4.94.0.linux.tar.bz2 +sha256 e9030af1123ff052ab69e12ef55b8a17dc47ac4bccfba85ee1ca1f31acf29607 lsof-4.96.5.tar.gz sha256 32a728188b19bf86917659d904ab29d0a294b4506e1c98b8b7f1c70ab4975fe1 dialects/linux/dproto.h diff --git a/package/lsof/lsof.mk b/package/lsof/lsof.mk index ff09d64345e..f318950ded0 100644 --- a/package/lsof/lsof.mk +++ b/package/lsof/lsof.mk @@ -4,13 +4,13 @@ # ################################################################################ -LSOF_VERSION = 4.94.0 -LSOF_SOURCE = lsof_$(LSOF_VERSION).linux.tar.bz2 -LSOF_SITE = https://github.com/lsof-org/lsof/releases/download/$(LSOF_VERSION) +LSOF_VERSION = 4.96.5 +LSOF_SITE = $(call github,lsof-org,lsof,$(LSOF_VERSION)) LSOF_LICENSE = lsof license # License is repeated in each file, this is a relatively small one. # It is also defined in 00README, but that contains a lot of other cruft. LSOF_LICENSE_FILES = dialects/linux/dproto.h +LSOF_CPE_ID_VENDOR = lsof_project ifeq ($(BR2_PACKAGE_LIBTIRPC),y) LSOF_DEPENDENCIES += libtirpc @@ -33,7 +33,8 @@ endif define LSOF_CONFIGURE_CMDS (cd $(@D) ; \ echo n | $(TARGET_CONFIGURE_OPTS) DEBUG="$(TARGET_CFLAGS)" \ - LSOF_INCLUDE="$(STAGING_DIR)/usr/include" LSOF_CFLAGS_OVERRIDE=1 \ + LSOF_AR="$(TARGET_AR) cr" LSOF_CC="$(TARGET_CC)" \ + LSOF_INCLUDE="$(STAGING_DIR)/usr/include" \ LINUX_CLIB=-DGLIBCV=2 LSOF_CFGL="$(TARGET_LDFLAGS)" \ ./Configure linux) $(LSOF_CONFIGURE_WCHAR_FIXUPS) @@ -41,7 +42,7 @@ define LSOF_CONFIGURE_CMDS endef define LSOF_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) DEBUG="$(TARGET_CFLAGS)" -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) endef define LSOF_INSTALL_TARGET_CMDS diff --git a/package/lsqlite3/lsqlite3.hash b/package/lsqlite3/lsqlite3.hash index 8ed989825e0..48ae2fce851 100644 --- a/package/lsqlite3/lsqlite3.hash +++ b/package/lsqlite3/lsqlite3.hash @@ -1,2 +1,2 @@ # computed by luarocks/buildroot -sha256 fdae3c03390ab4e4b7db3a13d09b79ffe19318739b752d17914adcdb3d2ef9ff lsqlite3-0.9.5-1.src.rock +sha256 fdae3c03390ab4e4b7db3a13d09b79ffe19318739b752d17914adcdb3d2ef9ff lsqlite3-0.9.5-1.src.rock diff --git a/package/ltp-testsuite/0001-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch b/package/ltp-testsuite/0001-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch index 2ceba64ed5b..1553908cf8f 100644 --- a/package/ltp-testsuite/0001-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch +++ b/package/ltp-testsuite/0001-lapi-Add-sysinfo.h-to-fix-build-with-MUSL-libc.patch @@ -29,7 +29,7 @@ Signed-off-by: Petr Vorel [ upstream status: https://patchwork.ozlabs.org/project/ltp/patch/20201001231256.6930-1-petr.vorel@gmail.com/, -rebased for 20210927 ] +rebased for 20220527 ] But this patch is not going to get upstreamed because it got fixed in Linux kernel: a85cbe6159ff "uapi: move constants from to " @@ -56,7 +56,7 @@ Signed-off-by: Petr Vorel diff --git a/include/lapi/sysinfo.h b/include/lapi/sysinfo.h new file mode 100644 -index 0000000000..d0e0e93d7f +index 000000000..d0e0e93d7 --- /dev/null +++ b/include/lapi/sysinfo.h @@ -0,0 +1,22 @@ @@ -83,7 +83,7 @@ index 0000000000..d0e0e93d7f + +#endif /* SYSINFO_H__ */ diff --git a/include/tst_safe_macros.h b/include/tst_safe_macros.h -index d99441c86f..0d26e9d455 100644 +index 81c4b0844..a8c02d7df 100644 --- a/include/tst_safe_macros.h +++ b/include/tst_safe_macros.h @@ -12,7 +12,7 @@ @@ -96,7 +96,7 @@ index d99441c86f..0d26e9d455 100644 #include #include diff --git a/lib/safe_macros.c b/lib/safe_macros.c -index a5b6bc5047..87d922a928 100644 +index a5b6bc504..87d922a92 100644 --- a/lib/safe_macros.c +++ b/lib/safe_macros.c @@ -11,7 +11,7 @@ @@ -109,7 +109,7 @@ index a5b6bc5047..87d922a928 100644 #include #include diff --git a/lib/tst_memutils.c b/lib/tst_memutils.c -index 4a49747613..000688f5a3 100644 +index 0d20bb17c..21a3a5ba0 100644 --- a/lib/tst_memutils.c +++ b/lib/tst_memutils.c @@ -6,7 +6,7 @@ @@ -119,15 +119,15 @@ index 4a49747613..000688f5a3 100644 -#include +#include "lapi/sysinfo.h" #include - + #define TST_NO_DEFAULT_MAIN diff --git a/testcases/kernel/mem/mtest01/mtest01.c b/testcases/kernel/mem/mtest01/mtest01.c -index 20cb95191d..3462dc3f82 100644 +index fb991ce8b..0fccd5405 100644 --- a/testcases/kernel/mem/mtest01/mtest01.c +++ b/testcases/kernel/mem/mtest01/mtest01.c @@ -20,7 +20,6 @@ */ - + #include -#include #include @@ -135,14 +135,14 @@ index 20cb95191d..3462dc3f82 100644 #include @@ -29,6 +28,7 @@ #include - + #include "lapi/abisize.h" +#include "lapi/sysinfo.h" #include "tst_test.h" - + #define FIVE_HUNDRED_MB (500ULL*1024*1024) diff --git a/testcases/kernel/syscalls/madvise/madvise06.c b/testcases/kernel/syscalls/madvise/madvise06.c -index 263b8e78bf..4fa52e6eae 100644 +index 6d218801c..8af11a030 100644 --- a/testcases/kernel/syscalls/madvise/madvise06.c +++ b/testcases/kernel/syscalls/madvise/madvise06.c @@ -46,7 +46,7 @@ @@ -152,10 +152,10 @@ index 263b8e78bf..4fa52e6eae 100644 -#include +#include "lapi/sysinfo.h" #include "tst_test.h" - #include "tst_cgroup.h" - + + #define CHUNK_SZ (400*1024*1024L) diff --git a/testcases/kernel/syscalls/sysinfo/sysinfo01.c b/testcases/kernel/syscalls/sysinfo/sysinfo01.c -index 2ea44a2beb..a237345ef7 100644 +index 2ea44a2be..a237345ef 100644 --- a/testcases/kernel/syscalls/sysinfo/sysinfo01.c +++ b/testcases/kernel/syscalls/sysinfo/sysinfo01.c @@ -69,7 +69,7 @@ @@ -164,11 +164,11 @@ index 2ea44a2beb..a237345ef7 100644 #include -#include +#include "lapi/sysinfo.h" - + #include "test.h" - + diff --git a/testcases/kernel/syscalls/sysinfo/sysinfo02.c b/testcases/kernel/syscalls/sysinfo/sysinfo02.c -index 7ad0e8bdcf..61fa1ab757 100644 +index 7ad0e8bdc..61fa1ab75 100644 --- a/testcases/kernel/syscalls/sysinfo/sysinfo02.c +++ b/testcases/kernel/syscalls/sysinfo/sysinfo02.c @@ -65,7 +65,7 @@ @@ -178,23 +178,23 @@ index 7ad0e8bdcf..61fa1ab757 100644 -#include +#include "lapi/sysinfo.h" #include - + #include "test.h" diff --git a/testcases/kernel/syscalls/sysinfo/sysinfo03.c b/testcases/kernel/syscalls/sysinfo/sysinfo03.c -index af7cb6421e..dc5ae65e35 100644 +index af7cb6421..dc5ae65e3 100644 --- a/testcases/kernel/syscalls/sysinfo/sysinfo03.c +++ b/testcases/kernel/syscalls/sysinfo/sysinfo03.c @@ -13,7 +13,7 @@ - + */ - + -#include +#include "lapi/sysinfo.h" #include "lapi/namespaces_constants.h" #include "lapi/posix_clocks.h" #include "tst_test.h" diff --git a/testcases/open_posix_testsuite/conformance/interfaces/pthread_cond_broadcast/1-2.c b/testcases/open_posix_testsuite/conformance/interfaces/pthread_cond_broadcast/1-2.c -index 22e7c36386..572701f9fd 100644 +index 22e7c3638..572701f9f 100644 --- a/testcases/open_posix_testsuite/conformance/interfaces/pthread_cond_broadcast/1-2.c +++ b/testcases/open_posix_testsuite/conformance/interfaces/pthread_cond_broadcast/1-2.c @@ -43,7 +43,7 @@ @@ -204,8 +204,8 @@ index 22e7c36386..572701f9fd 100644 -#include +#include "lapi/sysinfo.h" #endif - + #include "../testfrmw/testfrmw.h" --- -2.34.1 +-- +2.36.1 diff --git a/package/ltp-testsuite/ltp-testsuite.hash b/package/ltp-testsuite/ltp-testsuite.hash index 53429fd59f3..8b411a8ffe5 100644 --- a/package/ltp-testsuite/ltp-testsuite.hash +++ b/package/ltp-testsuite/ltp-testsuite.hash @@ -1,5 +1,5 @@ -# From: https://github.com/linux-test-project/ltp/releases/download/20220121/ltp-full-20220121.tar.xz.sha1 -sha1 211935e901afea1010ec4f70369b782fbee93ed4 ltp-full-20220121.tar.xz +# From: https://github.com/linux-test-project/ltp/releases/download/20220527/ltp-full-20220527.tar.bz2.sha1 +sha1 c8d658cd3ab1f5a5c7b5bf56398d3a9525012c6b ltp-full-20220930.tar.xz # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 ad002520616fac52362229ea0f1bb9d304fc03ff0096ccb5b1820cee9fc8413a ltp-full-20220121.tar.xz +sha256 533ab63915b916640667ecce17ee4998006d80d394d4b1f1d105a7aa1df50d38 ltp-full-20220930.tar.xz diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk index d9b7133b078..34412d562fa 100644 --- a/package/ltp-testsuite/ltp-testsuite.mk +++ b/package/ltp-testsuite/ltp-testsuite.mk @@ -4,7 +4,7 @@ # ################################################################################ -LTP_TESTSUITE_VERSION = 20220121 +LTP_TESTSUITE_VERSION = 20220930 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) @@ -80,9 +80,7 @@ LTP_TESTSUITE_UNSUPPORTED_TEST_CASES_$(BR2_TOOLCHAIN_USES_UCLIBC) += \ testcases/misc/math/float/float_bessel.c LTP_TESTSUITE_UNSUPPORTED_TEST_CASES_$(BR2_TOOLCHAIN_USES_MUSL) += \ - testcases/kernel/syscalls/confstr/confstr01.c \ testcases/kernel/syscalls/fmtmsg/fmtmsg01.c \ - testcases/kernel/syscalls/getcontext/getcontext01.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/lttng-babeltrace/0002-configure.ac-fix-popt-static-build.patch b/package/lttng-babeltrace/0002-configure.ac-fix-popt-static-build.patch new file mode 100644 index 00000000000..896c67470fb --- /dev/null +++ b/package/lttng-babeltrace/0002-configure.ac-fix-popt-static-build.patch @@ -0,0 +1,48 @@ +From 35076fd4592ca23136ff5eacdf8eaebc926e0224 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 23 Feb 2023 13:04:08 +0100 +Subject: [PATCH] configure.ac: fix popt static build + +Fix the following popt static build failure: + +configure:18149: checking for poptGetContext in -lpopt +configure:18172: /home/buildroot/autobuild/instance-2/output-1/host/bin/m68k-buildroot-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -static -I/home/buildroot/autobuild/instance-2/output-1/host/bin/../m68k-buildroot-linux-uclibc/sysroot/usr/include/uuid -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -static conftest.c -lpopt -L/home/buildroot/autobuild/instance-2/output-1/host/bin/../m68k-buildroot-linux-uclibc/sysroot/usr/lib -luuid >&5 +/home/buildroot/autobuild/instance-2/output-1/host/lib/gcc/m68k-buildroot-linux-uclibc/10.4.0/../../../../m68k-buildroot-linux-uclibc/bin/ld: /home/buildroot/autobuild/instance-2/output-1/host/bin/../m68k-buildroot-linux-uclibc/sysroot/usr/lib/libpopt.a(poptint.o): in function `POPT_fprintf': +poptint.c:(.text+0x28a): undefined reference to `libiconv_open' + +[...] + +checking for poptGetContext in -lpopt... no +configure: error: Cannot find popt. + +Fixes: + - http://autobuild.buildroot.org/results/4f465fe15664b1f9df3f26c331dc550852972f2f + +Signed-off-by: Fabrice Fontaine +[Upstream status: not upstreamable as popt has been removed with +https://github.com/efficios/babeltrace/commit/916d0d910ad5407bc7826505aa05b277f5739a34] +--- + configure.ac | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index a17c23c3..8f700d3e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -223,8 +223,11 @@ AC_CHECK_LIB([c], [faccessat], + ] + ) + +-AC_CHECK_LIB([popt], [poptGetContext], [], +- [AC_MSG_ERROR([Cannot find popt.])] ++PKG_CHECK_MODULES([POPT], [popt], [LIBS="${POPT_LIBS} ${LIBS}"], ++[ ++ AC_CHECK_LIB([popt], [poptGetContext], [], ++ [AC_MSG_ERROR([Cannot find popt.])]) ++] + ) + + # For Python +-- +2.39.1 + diff --git a/package/lttng-babeltrace/lttng-babeltrace.hash b/package/lttng-babeltrace/lttng-babeltrace.hash index 7c114ac7ecb..9bf327fc494 100644 --- a/package/lttng-babeltrace/lttng-babeltrace.hash +++ b/package/lttng-babeltrace/lttng-babeltrace.hash @@ -1,7 +1,7 @@ # From http://www.efficios.com/files/babeltrace/babeltrace-1.5.7.tar.bz2.sha256 -sha256 215331e025ffd39c665a34231b9429180e48aca78f79fb972d0bf1322d2b807b babeltrace-1.5.7.tar.bz2 +sha256 215331e025ffd39c665a34231b9429180e48aca78f79fb972d0bf1322d2b807b babeltrace-1.5.7.tar.bz2 # Hash for license files -sha256 2f801b7c2494850c3d91da820eb230502dc0192c9d0db024db37ec08d0be1434 mit-license.txt -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 gpl-2.0.txt -sha256 12d4222ac628fe4092cba8ed90bc5227a4dedd0b94973273cecbc393325bf1c2 LICENSE +sha256 2f801b7c2494850c3d91da820eb230502dc0192c9d0db024db37ec08d0be1434 mit-license.txt +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 gpl-2.0.txt +sha256 12d4222ac628fe4092cba8ed90bc5227a4dedd0b94973273cecbc393325bf1c2 LICENSE diff --git a/package/lttng-modules/lttng-modules.hash b/package/lttng-modules/lttng-modules.hash index fb253c9bf63..e685cc33679 100644 --- a/package/lttng-modules/lttng-modules.hash +++ b/package/lttng-modules/lttng-modules.hash @@ -1,5 +1,5 @@ -# From https://lttng.org/files/lttng-modules/lttng-modules-2.13.1.tar.bz2.sha256 -sha256 a7c86d91c9bbe66d27f025aa04b8cfc6d7785ed2fc7ef774930800ee44d7f343 lttng-modules-2.13.1.tar.bz2 +# From https://lttng.org/files/lttng-modules/lttng-modules-2.13.7.tar.bz2.sha256 +sha256 5a99679df7903160cbde3918fee5af90ffafc90fc96ccdefaa57cf230492b234 lttng-modules-2.13.7.tar.bz2 # Hash for license files sha256 d72921266bc8452a8789f8a04a82755373990d00b7e0b0f1a8edb8f854e94d1c LICENSES/LGPL-2.1 diff --git a/package/lttng-modules/lttng-modules.mk b/package/lttng-modules/lttng-modules.mk index 4c1c50d0a0b..416833f4ef5 100644 --- a/package/lttng-modules/lttng-modules.mk +++ b/package/lttng-modules/lttng-modules.mk @@ -4,7 +4,7 @@ # ################################################################################ -LTTNG_MODULES_VERSION = 2.13.1 +LTTNG_MODULES_VERSION = 2.13.7 LTTNG_MODULES_SITE = http://lttng.org/files/lttng-modules LTTNG_MODULES_SOURCE = lttng-modules-$(LTTNG_MODULES_VERSION).tar.bz2 LTTNG_MODULES_LICENSE = LGPL-2.1/GPL-2.0 (kernel modules), MIT (lib/bitfield.h, lib/prio_heap/*) @@ -12,5 +12,10 @@ LTTNG_MODULES_LICENSE_FILES = \ LICENSES/LGPL-2.1 LICENSES/GPL-2.0 LICENSES/MIT LICENSE LTTNG_MODULES_MODULE_MAKE_OPTS = CONFIG_LTTNG=m CONFIG_LTTNG_CLOCK_PLUGIN_TEST=m +define LTTNG_MODULES_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_KPROBES) + $(call KCONFIG_ENABLE_OPT,CONFIG_FTRACE) +endef + $(eval $(kernel-module)) $(eval $(generic-package)) diff --git a/package/lttng-tools/lttng-tools.hash b/package/lttng-tools/lttng-tools.hash index 5b5f55da30d..b48904d0b91 100644 --- a/package/lttng-tools/lttng-tools.hash +++ b/package/lttng-tools/lttng-tools.hash @@ -1,5 +1,5 @@ -# From https://lttng.org/files/lttng-tools/lttng-tools-2.13.2.tar.bz2.sha256 -sha256 ced2ba00020da77fd17ac92b5a53825502409a07e3aeca28f9515d4a844fd7bd lttng-tools-2.13.2.tar.bz2 +# From https://lttng.org/files/lttng-tools/lttng-tools-2.13.8.tar.bz2.sha256 +sha256 b1e959579b260790930b20f3c7aa7cefb8a40e0de80d4a777c2bf78c6b353dc1 lttng-tools-2.13.8.tar.bz2 # Locally computed sha256 068e55c7dbe597400199aee75ac5e71bdb2ca88c4c9a4cfa8e1fbc61f933eda5 LICENSE diff --git a/package/lttng-tools/lttng-tools.mk b/package/lttng-tools/lttng-tools.mk index efa22a52e35..add1f12a8cb 100644 --- a/package/lttng-tools/lttng-tools.mk +++ b/package/lttng-tools/lttng-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -LTTNG_TOOLS_VERSION = 2.13.2 +LTTNG_TOOLS_VERSION = 2.13.8 LTTNG_TOOLS_SITE = https://lttng.org/files/lttng-tools LTTNG_TOOLS_SOURCE = lttng-tools-$(LTTNG_TOOLS_VERSION).tar.bz2 LTTNG_TOOLS_INSTALL_STAGING = YES diff --git a/package/lua-basexx/lua-basexx.hash b/package/lua-basexx/lua-basexx.hash index aee636c32fc..447ec60ba00 100644 --- a/package/lua-basexx/lua-basexx.hash +++ b/package/lua-basexx/lua-basexx.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 ff5379b1f5b396103b8bb589ab3dd94d0a727c8e7a48dcfe1c73e2f07af6a8df basexx-0.4.0-1.src.rock -sha256 a1826a43c9e04f9e9b2e5d26d636c656812483bcd513618eec9d72cee69d446b basexx-0.4.0/LICENSE +sha256 3f6a7134a518676d73a9ba80437487de9a7d482e54859a96c0c5d8b381b0a8c6 basexx-0.4.1-1.src.rock +sha256 a1826a43c9e04f9e9b2e5d26d636c656812483bcd513618eec9d72cee69d446b basexx-0.4.1/LICENSE diff --git a/package/lua-basexx/lua-basexx.mk b/package/lua-basexx/lua-basexx.mk index 5aa5ecf2185..22b5a3771e9 100644 --- a/package/lua-basexx/lua-basexx.mk +++ b/package/lua-basexx/lua-basexx.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_BASEXX_VERSION = 0.4.0-1 +LUA_BASEXX_VERSION = 0.4.1-1 LUA_BASEXX_NAME_UPSTREAM = basexx LUA_BASEXX_LICENSE = MIT LUA_BASEXX_LICENSE_FILES = $(LUA_BASEXX_SUBDIR)/LICENSE diff --git a/package/lua-binaryheap/lua-binaryheap.hash b/package/lua-binaryheap/lua-binaryheap.hash index 3713ea331e5..dd5036b4231 100644 --- a/package/lua-binaryheap/lua-binaryheap.hash +++ b/package/lua-binaryheap/lua-binaryheap.hash @@ -1,2 +1,2 @@ # computed by luarocks/buildroot -sha256 ecce14dedfa7a1938aa2383c83036b98461876934f169384a2cec6bb46462d87 binaryheap-0.4-1.src.rock +sha256 ecce14dedfa7a1938aa2383c83036b98461876934f169384a2cec6bb46462d87 binaryheap-0.4-1.src.rock diff --git a/package/lua-bit32/lua-bit32.hash b/package/lua-bit32/lua-bit32.hash index 9a4f64b66c0..90bc2c19db2 100644 --- a/package/lua-bit32/lua-bit32.hash +++ b/package/lua-bit32/lua-bit32.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 0e273427f2b877270f9cec5642ebe2670242926ba9638d4e6df7e4e1263ca12c bit32-5.3.5.1-1.src.rock -sha256 1b24f475812c979684fb3469f6faccbdc7c33c9d39421728aa0d78deda5a89a5 lua-compat-5.3-0.10/LICENSE +sha256 0e273427f2b877270f9cec5642ebe2670242926ba9638d4e6df7e4e1263ca12c bit32-5.3.5.1-1.src.rock +sha256 1b24f475812c979684fb3469f6faccbdc7c33c9d39421728aa0d78deda5a89a5 lua-compat-5.3-0.10/LICENSE diff --git a/package/lua-cffi/lua-cffi.hash b/package/lua-cffi/lua-cffi.hash index a532c6c7b36..318f60fefe5 100644 --- a/package/lua-cffi/lua-cffi.hash +++ b/package/lua-cffi/lua-cffi.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c30080d6309167f86d1a96d3ee33f33ef52e884052b7feac140b8c52db10ad7a lua-cffi-0.2.1.tar.gz +sha256 1d2577a62a843e5e6db35af1b58300d279b4df58eccef5e823441501f960d388 lua-cffi-0.2.3.tar.gz sha256 f5653a4d5864a3920ea1e07dacfd646067314be647598f0acaaf685beaa2e396 COPYING.md diff --git a/package/lua-cffi/lua-cffi.mk b/package/lua-cffi/lua-cffi.mk index 964f49f030c..30427ac34c0 100644 --- a/package/lua-cffi/lua-cffi.mk +++ b/package/lua-cffi/lua-cffi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_CFFI_VERSION = 0.2.1 +LUA_CFFI_VERSION = 0.2.3 LUA_CFFI_SITE = $(call github,q66,cffi-lua,v$(LUA_CFFI_VERSION)) LUA_CFFI_LICENSE = MIT LUA_CFFI_LICENSE_FILES = COPYING.md diff --git a/package/lua-cjson/Config.in b/package/lua-cjson/Config.in index 9474b3176c3..1c153fa46ae 100644 --- a/package/lua-cjson/Config.in +++ b/package/lua-cjson/Config.in @@ -12,4 +12,4 @@ config BR2_PACKAGE_LUA_CJSON (C-module) - http://www.kyne.com.au/~mark/software/lua-cjson.php + https://www.kyne.com.au/~mark/software/lua-cjson.php diff --git a/package/lua-cjson/lua-cjson.hash b/package/lua-cjson/lua-cjson.hash index 2a23eb3d2b8..5ddc07bcc63 100644 --- a/package/lua-cjson/lua-cjson.hash +++ b/package/lua-cjson/lua-cjson.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 455fa7d07d8ac9d61f68f538958f8e28972256f38b0a1c2740873daf809d1837 lua-cjson-2.1.0.6-1.src.rock -sha256 9576e82ef5013fbe80b3bd446a7d9ddd47328baa2186c31d3d885e2a9a8cd31e lua-cjson/LICENSE +sha256 02dea368d07753647c75bd9e6660dd4d06ff7d09956d90d5afc4c3f5b78ed187 lua-cjson-2.1.0.10-1.src.rock +sha256 9576e82ef5013fbe80b3bd446a7d9ddd47328baa2186c31d3d885e2a9a8cd31e lua-cjson/LICENSE diff --git a/package/lua-cjson/lua-cjson.mk b/package/lua-cjson/lua-cjson.mk index e029dab5cb4..e08d230060b 100644 --- a/package/lua-cjson/lua-cjson.mk +++ b/package/lua-cjson/lua-cjson.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_CJSON_VERSION = 2.1.0.6-1 +LUA_CJSON_VERSION = 2.1.0.10-1 LUA_CJSON_SUBDIR = lua-cjson LUA_CJSON_LICENSE = MIT LUA_CJSON_LICENSE_FILES = $(LUA_CJSON_SUBDIR)/LICENSE diff --git a/package/lua-coat/lua-coat.hash b/package/lua-coat/lua-coat.hash index 491ba2964c9..f2e79d69baf 100644 --- a/package/lua-coat/lua-coat.hash +++ b/package/lua-coat/lua-coat.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 24d0e894d743f46c09a282e4dd272d2a6004557608b618c1c9d9f464dd65af02 lua-coat-0.9.2-1.src.rock -sha256 81b5f657812ccfd63f19c9af1389b5fe6b26f079a4841c5d074940c47bf7cb1e lua-Coat-0.9.2/COPYRIGHT +sha256 24d0e894d743f46c09a282e4dd272d2a6004557608b618c1c9d9f464dd65af02 lua-coat-0.9.2-1.src.rock +sha256 81b5f657812ccfd63f19c9af1389b5fe6b26f079a4841c5d074940c47bf7cb1e lua-Coat-0.9.2/COPYRIGHT diff --git a/package/lua-coatpersistent/lua-coatpersistent.hash b/package/lua-coatpersistent/lua-coatpersistent.hash index a15379e134a..0dae3dcab80 100644 --- a/package/lua-coatpersistent/lua-coatpersistent.hash +++ b/package/lua-coatpersistent/lua-coatpersistent.hash @@ -1,4 +1,4 @@ # computed by luarocks/buildroot -sha256 e718ee36a17312108f266e8412f840db150afd89e8587d36e685673fff65f142 lua-coatpersistent-lsqlite3-0.2.2-1.src.rock -sha256 5d36d6a8b413a2d56a466a45314291a0265c514a179e741b3fc95f4dd901abe6 lua-coatpersistent-luasql-0.2.2-1.src.rock -sha256 f8ed30644056ceff4315e694a1c1af4af4f08ec0adabae353ab8f3f5289ffbf3 lua-CoatPersistent-0.2.2/COPYRIGHT +sha256 e718ee36a17312108f266e8412f840db150afd89e8587d36e685673fff65f142 lua-coatpersistent-lsqlite3-0.2.2-1.src.rock +sha256 5d36d6a8b413a2d56a466a45314291a0265c514a179e741b3fc95f4dd901abe6 lua-coatpersistent-luasql-0.2.2-1.src.rock +sha256 f8ed30644056ceff4315e694a1c1af4af4f08ec0adabae353ab8f3f5289ffbf3 lua-CoatPersistent-0.2.2/COPYRIGHT diff --git a/package/lua-codegen/lua-codegen.hash b/package/lua-codegen/lua-codegen.hash index 0b49a5a78c3..2fd466ac707 100644 --- a/package/lua-codegen/lua-codegen.hash +++ b/package/lua-codegen/lua-codegen.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 c09126d7f5d0fa9c867ee9108eb5961dab111320ee35e5f842317f6058e922ec lua-codegen-0.3.3-1.src.rock -sha256 f09265c450c3a59558ecc552ea4ba61e5a74dec995738eec545d121718833a80 lua-CodeGen-0.3.3/COPYRIGHT +sha256 c09126d7f5d0fa9c867ee9108eb5961dab111320ee35e5f842317f6058e922ec lua-codegen-0.3.3-1.src.rock +sha256 f09265c450c3a59558ecc552ea4ba61e5a74dec995738eec545d121718833a80 lua-CodeGen-0.3.3/COPYRIGHT diff --git a/package/lua-compat53/lua-compat53.hash b/package/lua-compat53/lua-compat53.hash index 07783820ccb..ccd9a712050 100644 --- a/package/lua-compat53/lua-compat53.hash +++ b/package/lua-compat53/lua-compat53.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 e513e75ba0ef4923a1ec0d4f0beb5972a11cc9bd7ac1b0953b5e4f037b259c92 compat53-0.8-1.src.rock -sha256 1b24f475812c979684fb3469f6faccbdc7c33c9d39421728aa0d78deda5a89a5 lua-compat-5.3-0.8/LICENSE +sha256 e513e75ba0ef4923a1ec0d4f0beb5972a11cc9bd7ac1b0953b5e4f037b259c92 compat53-0.8-1.src.rock +sha256 1b24f475812c979684fb3469f6faccbdc7c33c9d39421728aa0d78deda5a89a5 lua-compat-5.3-0.8/LICENSE diff --git a/package/lua-cqueues/Config.in b/package/lua-cqueues/Config.in index 60f022848bc..a8c38950cf4 100644 --- a/package/lua-cqueues/Config.in +++ b/package/lua-cqueues/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_LUA_CQUEUES bool "lua-cqueues" depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL help Continuation Queues: Embeddable asynchronous networking, threading, and notification framework for Lua on Unix. diff --git a/package/lua-csnappy/lua-csnappy.hash b/package/lua-csnappy/lua-csnappy.hash index 43790f2bdaf..dd3c0c32dcd 100644 --- a/package/lua-csnappy/lua-csnappy.hash +++ b/package/lua-csnappy/lua-csnappy.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 4fc373ba714cb8b428e9971f1725d82de6a43dfea361a0b7894e4762238dc95c lua-csnappy-0.1.5-1.src.rock -sha256 8865da757dbc6fe3c8cee4d88bdfd82c1e0e789974a4d0d52db75a985025c1f0 lua-csnappy-0.1.5/COPYRIGHT +sha256 4fc373ba714cb8b428e9971f1725d82de6a43dfea361a0b7894e4762238dc95c lua-csnappy-0.1.5-1.src.rock +sha256 8865da757dbc6fe3c8cee4d88bdfd82c1e0e789974a4d0d52db75a985025c1f0 lua-csnappy-0.1.5/COPYRIGHT diff --git a/package/lua-datafile/lua-datafile.hash b/package/lua-datafile/lua-datafile.hash index c43b2b147cb..e3b415ad4df 100644 --- a/package/lua-datafile/lua-datafile.hash +++ b/package/lua-datafile/lua-datafile.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 4f7d58c50267b5ebd2145e52aaa5fb63fbf63a74ae765f08e2d0dddd570b6b6a datafile-0.6-1.src.rock -sha256 0443ddabab14f69d4c5e2641860343784a0ccbe5ae7a3743f20de9a13991da66 datafile/LICENSE +sha256 b511ce5a4f4072bb6c496bd42760fa92a0576d0c77828b6a2600d68fe9d7e998 datafile-0.7-1.src.rock +sha256 0443ddabab14f69d4c5e2641860343784a0ccbe5ae7a3743f20de9a13991da66 datafile/LICENSE diff --git a/package/lua-datafile/lua-datafile.mk b/package/lua-datafile/lua-datafile.mk index 5d30fdcf97c..3b4c65d3e34 100644 --- a/package/lua-datafile/lua-datafile.mk +++ b/package/lua-datafile/lua-datafile.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_DATAFILE_VERSION = 0.6-1 +LUA_DATAFILE_VERSION = 0.7-1 LUA_DATAFILE_NAME_UPSTREAM = datafile LUA_DATAFILE_SUBDIR = datafile LUA_DATAFILE_LICENSE = MIT diff --git a/package/lua-ev/lua-ev.hash b/package/lua-ev/lua-ev.hash index eb4f4cf74c2..278f5f8f7f1 100644 --- a/package/lua-ev/lua-ev.hash +++ b/package/lua-ev/lua-ev.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4e26e05830955fdd882a1b48b535be94356582eea310327f839f830cd9250d3a lua-ev-339426fbe528f11cb3cd1af69a88f06bba367981.tar.gz -sha256 c224cc31feec52e33b621ccdbc245e21316a20a134a4cd8706438a3b3382e8ac README +sha256 26ac116722a241bf59daf5315ce0ffe751c1babea9a146ffc0a389f1af3facca lua-ev-1.5.tar.gz +sha256 3b6f8a25e3443c8be61fc7a91e1d27b5514d489bb3ea5986eace6fe1531aabcc README diff --git a/package/lua-ev/lua-ev.mk b/package/lua-ev/lua-ev.mk index 39394875b8d..eec078944bb 100644 --- a/package/lua-ev/lua-ev.mk +++ b/package/lua-ev/lua-ev.mk @@ -4,8 +4,8 @@ # ################################################################################ -LUA_EV_VERSION = 339426fbe528f11cb3cd1af69a88f06bba367981 -LUA_EV_SITE = $(call github,brimworks,lua-ev,$(LUA_EV_VERSION)) +LUA_EV_VERSION = 1.5 +LUA_EV_SITE = $(call github,brimworks,lua-ev,v$(LUA_EV_VERSION)) LUA_EV_DEPENDENCIES = luainterpreter libev LUA_EV_LICENSE = MIT LUA_EV_LICENSE_FILES = README diff --git a/package/lua-fifo/lua-fifo.hash b/package/lua-fifo/lua-fifo.hash index 7d885f413db..61b4e984da7 100644 --- a/package/lua-fifo/lua-fifo.hash +++ b/package/lua-fifo/lua-fifo.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 53dea24ad658614a0254dcb10296a1a0fc5357315ada5724d6362f54c32b4c20 fifo-0.2-0.src.rock -sha256 8b4423dd4f55a69da1454b7a48346a54fd5b6e0408b38fde25cd29c0922962b6 fifo.lua-0.2/LICENSE +sha256 53dea24ad658614a0254dcb10296a1a0fc5357315ada5724d6362f54c32b4c20 fifo-0.2-0.src.rock +sha256 8b4423dd4f55a69da1454b7a48346a54fd5b6e0408b38fde25cd29c0922962b6 fifo.lua-0.2/LICENSE diff --git a/package/lua-flu/lua-flu.hash b/package/lua-flu/lua-flu.hash index 63f414d38fa..28ffd012df2 100644 --- a/package/lua-flu/lua-flu.hash +++ b/package/lua-flu/lua-flu.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 221ba8f8d3abbf12d5fc217dbb965605391892eb314eff1cd9c7beca90fe9887 flu-20181218-1.src.rock -sha256 409f7c274eb26874a382241d675a360ba6b2659742c5941e680d71a41dd35913 doub-flu-63f077a988cd/doc/LICENSE.txt +sha256 221ba8f8d3abbf12d5fc217dbb965605391892eb314eff1cd9c7beca90fe9887 flu-20181218-1.src.rock +sha256 409f7c274eb26874a382241d675a360ba6b2659742c5941e680d71a41dd35913 doub-flu-63f077a988cd/doc/LICENSE.txt diff --git a/package/lua-http/lua-http.hash b/package/lua-http/lua-http.hash index 491167eeda4..0f9284896d9 100644 --- a/package/lua-http/lua-http.hash +++ b/package/lua-http/lua-http.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 dbe1b29ff89fb937059e4398c9a628361d97d856acc87fd8cd85cb9340cde328 http-0.4-0.src.rock -sha256 1b486781068bcfd373f8c54f8d78eeab76d900bdf32e589e8330a4c563c2874b lua-http-0.4/LICENSE.md +sha256 dbe1b29ff89fb937059e4398c9a628361d97d856acc87fd8cd85cb9340cde328 http-0.4-0.src.rock +sha256 1b486781068bcfd373f8c54f8d78eeab76d900bdf32e589e8330a4c563c2874b lua-http-0.4/LICENSE.md diff --git a/package/lua-iconv/lua-iconv.hash b/package/lua-iconv/lua-iconv.hash index 8015599e421..b28ce0b31cc 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 fb66e785e15376c2d2817f1f1b27d10272b877eacc998c727a10f081a7d768fa lua-iconv-7-1.src.rock +sha256 30227b9571827f3dfcdeb3830594fc415459d64ad7271e9954178d3ef58a9bd4 lua-iconv-7/COPYING diff --git a/package/lua-inotify/lua-inotify.hash b/package/lua-inotify/lua-inotify.hash index 183638954c1..3ec4ea9bb1e 100644 --- a/package/lua-inotify/lua-inotify.hash +++ b/package/lua-inotify/lua-inotify.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 9164b5777b132d7e1e073478d8837a526262991c57e32d75d517100f533eb436 inotify-0.5-1.src.rock -sha256 b02158adb3c7763e1183a9386672f4f037bfeaab0cb0c73d684f34f3ea1993d8 linotify-0.5/COPYRIGHT +sha256 9164b5777b132d7e1e073478d8837a526262991c57e32d75d517100f533eb436 inotify-0.5-1.src.rock +sha256 b02158adb3c7763e1183a9386672f4f037bfeaab0cb0c73d684f34f3ea1993d8 linotify-0.5/COPYRIGHT diff --git a/package/lua-livr-extra/lua-livr-extra.hash b/package/lua-livr-extra/lua-livr-extra.hash index cb7cf898bc6..747004cfa60 100644 --- a/package/lua-livr-extra/lua-livr-extra.hash +++ b/package/lua-livr-extra/lua-livr-extra.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 42fef357db3e05e32112ddebcd4296f040a825dfac77ff2fa03aedbdcdaac729 lua-livr-extra-0.1.1-1.src.rock -sha256 96751dc604608ecf2357d1599bc2d2e9f56382793a6c218dc98d460759adbf07 lua-LIVR-extra-0.1.1/COPYRIGHT +sha256 42fef357db3e05e32112ddebcd4296f040a825dfac77ff2fa03aedbdcdaac729 lua-livr-extra-0.1.1-1.src.rock +sha256 96751dc604608ecf2357d1599bc2d2e9f56382793a6c218dc98d460759adbf07 lua-LIVR-extra-0.1.1/COPYRIGHT diff --git a/package/lua-livr/lua-livr.hash b/package/lua-livr/lua-livr.hash index 73b0fefa71e..fe9876909d1 100644 --- a/package/lua-livr/lua-livr.hash +++ b/package/lua-livr/lua-livr.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 e2f39316b8a1e66420c56e8ddc9ce4c0118c1a240582f2ba52d7627da6dfb76d lua-livr-0.2.2-1.src.rock -sha256 69fd426251454ea43a8068e58ac25d882922372de6b22e249bb56e00ea2cd834 lua-LIVR-0.2.2/COPYRIGHT +sha256 e2f39316b8a1e66420c56e8ddc9ce4c0118c1a240582f2ba52d7627da6dfb76d lua-livr-0.2.2-1.src.rock +sha256 69fd426251454ea43a8068e58ac25d882922372de6b22e249bb56e00ea2cd834 lua-LIVR-0.2.2/COPYRIGHT diff --git a/package/lua-lpeg-patterns/lua-lpeg-patterns.hash b/package/lua-lpeg-patterns/lua-lpeg-patterns.hash index 3fad73ca01e..012d7035dd9 100644 --- a/package/lua-lpeg-patterns/lua-lpeg-patterns.hash +++ b/package/lua-lpeg-patterns/lua-lpeg-patterns.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 0e6d33543689e83911e2cb47965752e00412cbdfca888812ccbde9ec95259c56 lpeg_patterns-0.5-0.src.rock -sha256 5b0346f2b2432e5f05e8e4ad31503cf84ddf802dacde9e8c3e529efaa4be3348 lpeg_patterns-0.5/LICENSE.md +sha256 0e6d33543689e83911e2cb47965752e00412cbdfca888812ccbde9ec95259c56 lpeg_patterns-0.5-0.src.rock +sha256 5b0346f2b2432e5f05e8e4ad31503cf84ddf802dacde9e8c3e529efaa4be3348 lpeg_patterns-0.5/LICENSE.md diff --git a/package/lua-lunitx/lua-lunitx.hash b/package/lua-lunitx/lua-lunitx.hash index b97b93f0903..8bb9c15407b 100644 --- a/package/lua-lunitx/lua-lunitx.hash +++ b/package/lua-lunitx/lua-lunitx.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 2299facf4977f9b663e1ad402098139116a87a693c3df66e1f6b89e2cf47646f lunitx-0.8-1.src.rock -sha256 3fcfcd6010d73bc2b22505b6a91779022a82661809a3e4e0a0bdd7b3463def8f lunit/LICENSE +sha256 2299facf4977f9b663e1ad402098139116a87a693c3df66e1f6b89e2cf47646f lunitx-0.8-1.src.rock +sha256 3fcfcd6010d73bc2b22505b6a91779022a82661809a3e4e0a0bdd7b3463def8f lunit/LICENSE diff --git a/package/lua-lunix/0001-fix-with-uClibc.patch b/package/lua-lunix/0001-fix-with-uClibc.patch deleted file mode 100644 index 236eec47a19..00000000000 --- a/package/lua-lunix/0001-fix-with-uClibc.patch +++ /dev/null @@ -1,28 +0,0 @@ -From ee41d97a80b978f54941ac6857c00b8a8f28de24 Mon Sep 17 00:00:00 2001 -From: Francois Perrad -Date: Sun, 6 Jun 2021 17:55:06 +0200 -Subject: [PATCH] fix with uClibc - -uClibc doesn't have is no sys_siglist. - -Signed-off-by: Francois Perrad ---- - lunix-rel-20170920/src/unix.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lunix-rel-20170920/src/unix.c b/lunix-rel-20170920/src/unix.c -index 5f3a70a..e561ab2 100644 ---- a/lunix-rel-20170920/src/unix.c -+++ b/lunix-rel-20170920/src/unix.c -@@ -438,7 +438,7 @@ - #endif - - #ifndef HAVE_SYS_SIGLIST --#define HAVE_SYS_SIGLIST (!MUSL_MAYBE && !__sun && !_AIX) -+#define HAVE_SYS_SIGLIST (!MUSL_MAYBE && !__sun && !_AIX && !__UCLIBC__) - #endif - - #ifndef HAVE_UNLINKAT --- -2.30.2 - diff --git a/package/lua-lunix/0001-remove-link-with-librt.patch b/package/lua-lunix/0001-remove-link-with-librt.patch new file mode 100644 index 00000000000..2650e9117ce --- /dev/null +++ b/package/lua-lunix/0001-remove-link-with-librt.patch @@ -0,0 +1,36 @@ +From aeaff83b9ae42547b8728edac000f3d41d5e44aa Mon Sep 17 00:00:00 2001 +From: Francois Perrad +Date: Sat, 17 Jul 2021 13:21:38 +0200 +Subject: [PATCH] remove link with librt + +librt is not available with musl + +Signed-off-by: Francois Perrad +--- + lunix-rel-20220331/lunix-20220331-1.rockspec | 10 ---------- + 1 file changed, 10 deletions(-) + +diff --git a/lunix-rel-20220331/lunix-20220331-1.rockspec b/lunix-rel-20220331/lunix-20220331-1.rockspec +index 741179d..76cafeb 100644 +--- a/lunix-rel-20220331/lunix-20220331-1.rockspec ++++ b/lunix-rel-20220331/lunix-20220331-1.rockspec +@@ -26,16 +26,6 @@ build = { + }; + }; + platforms = { +- linux = { +- modules = { +- ["unix"] = { +- libraries = { +- -- glibc <= 2.17 needs to link with librt +- "rt"; +- }; +- }; +- }; +- }; + osx = { + modules = { + ["unix"] = { +-- +2.30.2 + diff --git a/package/lua-lunix/0002-remove-link-with-librt.patch b/package/lua-lunix/0002-remove-link-with-librt.patch deleted file mode 100644 index 7b1c8ddd575..00000000000 --- a/package/lua-lunix/0002-remove-link-with-librt.patch +++ /dev/null @@ -1,36 +0,0 @@ -From aeaff83b9ae42547b8728edac000f3d41d5e44aa Mon Sep 17 00:00:00 2001 -From: Francois Perrad -Date: Sat, 17 Jul 2021 13:21:38 +0200 -Subject: [PATCH] remove link with librt - -librt is not available with musl - -Signed-off-by: Francois Perrad ---- - lunix-rel-20170920/lunix-20170920-1.rockspec | 10 ---------- - 1 file changed, 10 deletions(-) - -diff --git a/lunix-rel-20170920/lunix-20170920-1.rockspec b/lunix-rel-20170920/lunix-20170920-1.rockspec -index 741179d..76cafeb 100644 ---- a/lunix-rel-20170920/lunix-20170920-1.rockspec -+++ b/lunix-rel-20170920/lunix-20170920-1.rockspec -@@ -26,16 +26,6 @@ build = { - }; - }; - platforms = { -- linux = { -- modules = { -- ["unix"] = { -- libraries = { -- -- glibc <= 2.17 needs to link with librt -- "rt"; -- }; -- }; -- }; -- }; - osx = { - modules = { - ["unix"] = { --- -2.30.2 - diff --git a/package/lua-lunix/0003-fix-sysctl-detection.patch b/package/lua-lunix/0003-fix-sysctl-detection.patch deleted file mode 100644 index 18656b19215..00000000000 --- a/package/lua-lunix/0003-fix-sysctl-detection.patch +++ /dev/null @@ -1,24 +0,0 @@ -sys/sysctl.h was removed with glibc 2.32 - -Fetched from: https://github.com/wahern/lunix/pull/20/files -Signed-off-by: Francois Perrad ---- - lunix-rel-20170920/src/unix.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lunix-rel-20170920/src/unix.c b/lunix-rel-20170920/src/unix.c -index 272820a..fa00876 100644 ---- a/lunix-rel-20170920/src/unix.c -+++ b/lunix-rel-20170920/src/unix.c -@@ -165,7 +165,7 @@ - #endif - - #ifndef HAVE_SYS_SYSCTL_H /* missing on musl libc */ --#define HAVE_SYS_SYSCTL_H (defined BSD || GLIBC_PREREQ(0,0) || UCLIBC_PREREQ(0,0,0)) -+#define HAVE_SYS_SYSCTL_H (defined BSD || (__GLIBC__ && !GLIBC_PREREQ(2,32)) || UCLIBC_PREREQ(0,0,0)) - #endif - - #ifndef HAVE_STRUCT_IN_PKTINFO --- -2.30.2 - diff --git a/package/lua-lunix/lua-lunix.hash b/package/lua-lunix/lua-lunix.hash index 3cbf3481b5a..911f475b0ed 100644 --- a/package/lua-lunix/lua-lunix.hash +++ b/package/lua-lunix/lua-lunix.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 4a4007b394ae884e18e9d0319ea584e8b4a682d7bf8fa5b99c7eea9baf1e5ed6 lunix-20170920-1.src.rock -sha256 9b74be104d59caa45bf3321ebe771f9cc7874209261a93f1cf971ceca44fbe03 lunix-rel-20170920/LICENSE +sha256 eb13e89e1dfcc82aec3915ed4185f3a2a9205ec3e98a991b13cc39d7f389c427 lunix-20220331-1.src.rock +sha256 9b74be104d59caa45bf3321ebe771f9cc7874209261a93f1cf971ceca44fbe03 lunix-rel-20220331/LICENSE diff --git a/package/lua-lunix/lua-lunix.mk b/package/lua-lunix/lua-lunix.mk index 28cb2dc4115..f3c159cbf46 100644 --- a/package/lua-lunix/lua-lunix.mk +++ b/package/lua-lunix/lua-lunix.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_LUNIX_VERSION_UPSTREAM = 20170920 +LUA_LUNIX_VERSION_UPSTREAM = 20220331 LUA_LUNIX_VERSION = $(LUA_LUNIX_VERSION_UPSTREAM)-1 LUA_LUNIX_NAME_UPSTREAM = lunix LUA_LUNIX_SUBDIR = lunix-rel-$(LUA_LUNIX_VERSION_UPSTREAM) diff --git a/package/lua-lyaml/lua-lyaml.hash b/package/lua-lyaml/lua-lyaml.hash index af3d0ae6dac..a8599bc3dd0 100644 --- a/package/lua-lyaml/lua-lyaml.hash +++ b/package/lua-lyaml/lua-lyaml.hash @@ -1,3 +1,3 @@ # locally computed -sha256 9bb489cefae48b150d66f6bab4141d8d5831fcb7465bfc52a9845fa01efc63b0 lua-lyaml-6.2.7.tar.gz -sha256 81e4ea1d897e259b31111adc2d3c185fe23e435942ff3e9de8c8c9c5d01247d0 LICENSE +sha256 c6169f516ff2a8da96d55aa3a087e718edf7bceb2f1cae2def4e65cd2b41ac2d lua-lyaml-6.2.8.tar.gz +sha256 796d267e51d61652c55694d21108e7352e98b1ed489ab7516acc07102157e08d LICENSE diff --git a/package/lua-lyaml/lua-lyaml.mk b/package/lua-lyaml/lua-lyaml.mk index 77980f53129..00a868ec294 100644 --- a/package/lua-lyaml/lua-lyaml.mk +++ b/package/lua-lyaml/lua-lyaml.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_LYAML_VERSION = 6.2.7 +LUA_LYAML_VERSION = 6.2.8 LUA_LYAML_NAME_UPSTREAM = lyaml LUA_LYAML_SITE = $(call github,gvvaughan,$(LUA_LYAML_NAME_UPSTREAM),v$(LUA_LYAML_VERSION)) LUA_LYAML_LICENSE = MIT diff --git a/package/lua-markdown/lua-markdown.hash b/package/lua-markdown/lua-markdown.hash index 682b4f84c1e..9f58e4cf0d0 100644 --- a/package/lua-markdown/lua-markdown.hash +++ b/package/lua-markdown/lua-markdown.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 bed84231bb48322f8e614b4392181c52c36bc71340f9273e0c3bd72dc922bc07 markdown-0.33-1.src.rock -sha256 c13c5634db49d16c87f164ce0b79fb7e1b313c8b66818ebf1c970747a429b39b markdown/LICENSE +sha256 bed84231bb48322f8e614b4392181c52c36bc71340f9273e0c3bd72dc922bc07 markdown-0.33-1.src.rock +sha256 c13c5634db49d16c87f164ce0b79fb7e1b313c8b66818ebf1c970747a429b39b markdown/LICENSE diff --git a/package/lua-messagepack/lua-messagepack.hash b/package/lua-messagepack/lua-messagepack.hash index a550a190f8d..5c8dd593662 100644 --- a/package/lua-messagepack/lua-messagepack.hash +++ b/package/lua-messagepack/lua-messagepack.hash @@ -1,4 +1,4 @@ # computed by luarocks/buildroot -sha256 cbb1b7b12834b7f49fd20621446ec4d76eff67d324b8182b7988324b10830a43 lua-messagepack-0.5.2-1.src.rock -sha256 b3b3d8c3d28a4d4f26404cdb7d7d9329e2e831ea2dd2c6b119d958ed113579b2 lua-messagepack-lua53-0.5.2-1.src.rock -sha256 709fd93a7dd6f8e941e7f0cb9e3eeba1f4de375302f1b19e14bb51aff23c5970 lua-MessagePack-0.5.2/COPYRIGHT +sha256 cbb1b7b12834b7f49fd20621446ec4d76eff67d324b8182b7988324b10830a43 lua-messagepack-0.5.2-1.src.rock +sha256 b3b3d8c3d28a4d4f26404cdb7d7d9329e2e831ea2dd2c6b119d958ed113579b2 lua-messagepack-lua53-0.5.2-1.src.rock +sha256 709fd93a7dd6f8e941e7f0cb9e3eeba1f4de375302f1b19e14bb51aff23c5970 lua-MessagePack-0.5.2/COPYRIGHT diff --git a/package/lua-mqtt/Config.in b/package/lua-mqtt/Config.in new file mode 100644 index 00000000000..b7133190547 --- /dev/null +++ b/package/lua-mqtt/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_LUA_MQTT + bool "lua-mqtt" + depends on BR2_PACKAGE_LUA_5_3 || BR2_PACKAGE_LUA_5_4 + help + client library for MQTT 3.1.1 & 5. + + https://fperrad.frama.io/lua-mqtt + +comment "lua-mqtt needs a Lua >= 5.3" + depends on !BR2_PACKAGE_LUA_5_3 + depends on !BR2_PACKAGE_LUA_5_4 diff --git a/package/lua-mqtt/lua-mqtt.hash b/package/lua-mqtt/lua-mqtt.hash new file mode 100644 index 00000000000..3636e9e6af5 --- /dev/null +++ b/package/lua-mqtt/lua-mqtt.hash @@ -0,0 +1,3 @@ +# computed by luarocks/buildroot +sha256 986ec63dd9f0761f9c5231f6e19529138602c289e13da5c71dc1449f5f247152 lua-mqtt-0.1.0-1.src.rock +sha256 e86d7c8adfabcb7c6515cc6e524bf0a76f7b3a86560a7ac47d7cabae5f8391a2 lua-mqtt-0.1.0/COPYRIGHT diff --git a/package/lua-mqtt/lua-mqtt.mk b/package/lua-mqtt/lua-mqtt.mk new file mode 100644 index 00000000000..a2f17d2b2ea --- /dev/null +++ b/package/lua-mqtt/lua-mqtt.mk @@ -0,0 +1,11 @@ +################################################################################ +# +# lua-mqtt +# +################################################################################ + +LUA_MQTT_VERSION = 0.1.0-1 +LUA_MQTT_LICENSE = MIT +LUA_MQTT_LICENSE_FILES = $(LUA_MQTT_SUBDIR)/COPYRIGHT + +$(eval $(luarocks-package)) diff --git a/package/lua-periphery/lua-periphery.hash b/package/lua-periphery/lua-periphery.hash index b87cfbbc6e8..d1331a489f8 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 ff8a4d08f02356586fadfe47f01859ba28539cc42013836f79a032bf4ccc78b3 lua-periphery-1.1.1-1.src.rock +sha256 7c60847b46f718e9651d1eca2f56bf6be09608cf08d130446a521eb8288c98e1 lua-periphery/LICENSE diff --git a/package/lua-resty-http/lua-resty-http.hash b/package/lua-resty-http/lua-resty-http.hash index 4aacc097c7e..19547e6c1fe 100644 --- a/package/lua-resty-http/lua-resty-http.hash +++ b/package/lua-resty-http/lua-resty-http.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 df913a055ddc2f029017602732c7a497225f4e0df1bcc6858e13f9f4d9524184 lua-resty-http-0.15-0.src.rock -sha256 407e4b1412d8afa317dc703a1d318866c3de87d78899402125cbd90548c6057d lua-resty-http/LICENSE +sha256 df913a055ddc2f029017602732c7a497225f4e0df1bcc6858e13f9f4d9524184 lua-resty-http-0.15-0.src.rock +sha256 407e4b1412d8afa317dc703a1d318866c3de87d78899402125cbd90548c6057d lua-resty-http/LICENSE diff --git a/package/lua-rotas/lua-rotas.hash b/package/lua-rotas/lua-rotas.hash index 2633f3b728f..037844e9f74 100644 --- a/package/lua-rotas/lua-rotas.hash +++ b/package/lua-rotas/lua-rotas.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 a947026be3552cbf676a0cef36a618111712257d306cbd9d340ed8895a4cbd2b lua-rotas-0.2.1-1.src.rock -sha256 ac8bb87b7b5e803ae27510b9c6fd284f1b00e741258bc59fc78d3bc107d96fbb lua-Rotas-0.2.1/COPYRIGHT +sha256 a947026be3552cbf676a0cef36a618111712257d306cbd9d340ed8895a4cbd2b lua-rotas-0.2.1-1.src.rock +sha256 ac8bb87b7b5e803ae27510b9c6fd284f1b00e741258bc59fc78d3bc107d96fbb lua-Rotas-0.2.1/COPYRIGHT diff --git a/package/lua-sailor/lua-sailor.hash b/package/lua-sailor/lua-sailor.hash index aec00afe57a..36aa88979ad 100644 --- a/package/lua-sailor/lua-sailor.hash +++ b/package/lua-sailor/lua-sailor.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 4f7f43a7cf6c62712a521ebaf5f53aaf230039c7fb06480ae168c3aa036120bf sailor-0.5-4.src.rock -sha256 3a19bc44e1a653b39bcb1b91cc8058ac6b1cd1caf7e6cef93517fd559b189065 sailor/LICENSE +sha256 4f7f43a7cf6c62712a521ebaf5f53aaf230039c7fb06480ae168c3aa036120bf sailor-0.5-4.src.rock +sha256 3a19bc44e1a653b39bcb1b91cc8058ac6b1cd1caf7e6cef93517fd559b189065 sailor/LICENSE diff --git a/package/lua-silva/lua-silva.hash b/package/lua-silva/lua-silva.hash index bcd0d3071d1..418c3e9e430 100644 --- a/package/lua-silva/lua-silva.hash +++ b/package/lua-silva/lua-silva.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 0e656c42c71b64285d4a375fa7b8b1a910b05c4ab6d30f5b427b078fff204e1f lua-silva-0.1.8-1.src.rock -sha256 5b59ffbfc12d9d1cb907dd65b0f16d3453e1a43cc018c6128a00b00e08f6c485 lua-Silva-0.1.8/COPYRIGHT +sha256 0e656c42c71b64285d4a375fa7b8b1a910b05c4ab6d30f5b427b078fff204e1f lua-silva-0.1.8-1.src.rock +sha256 5b59ffbfc12d9d1cb907dd65b0f16d3453e1a43cc018c6128a00b00e08f6c485 lua-Silva-0.1.8/COPYRIGHT diff --git a/package/lua-std-debug/lua-std-debug.hash b/package/lua-std-debug/lua-std-debug.hash index 3e94b40a9c3..8e4bc69f20e 100644 --- a/package/lua-std-debug/lua-std-debug.hash +++ b/package/lua-std-debug/lua-std-debug.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7f6b84283d4b78dafee17e7765dd5f1f8e75c3314169977f4dda0e7873616ce2 std._debug-1.0.1-1.src.rock -sha256 034abdbbe9a13899c813509776d1e04af81bc58c2982b704c8b3663549504a31 _debug-1.0.1/LICENSE.md +sha256 7f6b84283d4b78dafee17e7765dd5f1f8e75c3314169977f4dda0e7873616ce2 std._debug-1.0.1-1.src.rock +sha256 034abdbbe9a13899c813509776d1e04af81bc58c2982b704c8b3663549504a31 _debug-1.0.1/LICENSE.md diff --git a/package/lua-std-normalize/lua-std-normalize.hash b/package/lua-std-normalize/lua-std-normalize.hash index 84cdfca422f..41a91f1ef2b 100644 --- a/package/lua-std-normalize/lua-std-normalize.hash +++ b/package/lua-std-normalize/lua-std-normalize.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 3a040b6ca43297367c527e12c1aab37acab86289f9415ffb130544c48b17f802 std.normalize-2.0.3-1.src.rock -sha256 9c9094f0cea86c2c62b893e59a78d5eaed69df0d7da24e122ef9753baeef0f04 normalize-2.0.3/LICENSE.md +sha256 3a040b6ca43297367c527e12c1aab37acab86289f9415ffb130544c48b17f802 std.normalize-2.0.3-1.src.rock +sha256 9c9094f0cea86c2c62b893e59a78d5eaed69df0d7da24e122ef9753baeef0f04 normalize-2.0.3/LICENSE.md diff --git a/package/lua-stdlib/lua-stdlib.hash b/package/lua-stdlib/lua-stdlib.hash index 68f4d241244..c6c7c656fab 100644 --- a/package/lua-stdlib/lua-stdlib.hash +++ b/package/lua-stdlib/lua-stdlib.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 67eadaccbb2b6037ea70129f9616da49eaeeaf1477652a8e2cc77740286531cf stdlib-41.2.2-1.src.rock -sha256 d3177e0cd97e6ef7c459aa2c6a85f53d9b4ff091f7f296d4ed8bfaf713b6fea2 lua-stdlib-release-v41.2.2/COPYING +sha256 67eadaccbb2b6037ea70129f9616da49eaeeaf1477652a8e2cc77740286531cf stdlib-41.2.2-1.src.rock +sha256 d3177e0cd97e6ef7c459aa2c6a85f53d9b4ff091f7f296d4ed8bfaf713b6fea2 lua-stdlib-release-v41.2.2/COPYING diff --git a/package/lua-testmore/lua-testmore.hash b/package/lua-testmore/lua-testmore.hash index 4ff577e5284..1f435709f45 100644 --- a/package/lua-testmore/lua-testmore.hash +++ b/package/lua-testmore/lua-testmore.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 b3e57955888aba3974d6f5a21219214e2803a38e4623671f7d9d9e0f1851e608 lua-testmore-0.3.6-1.src.rock -sha256 37a3afb014325b98f0ad919cb40bc9d5a948120e5260e75b9d00c198d350da6d lua-TestMore-0.3.6/COPYRIGHT +sha256 b3e57955888aba3974d6f5a21219214e2803a38e4623671f7d9d9e0f1851e608 lua-testmore-0.3.6-1.src.rock +sha256 37a3afb014325b98f0ad919cb40bc9d5a948120e5260e75b9d00c198d350da6d lua-TestMore-0.3.6/COPYRIGHT diff --git a/package/lua-utf8/Config.in b/package/lua-utf8/Config.in index 313fa4e45d1..5815936df58 100644 --- a/package/lua-utf8/Config.in +++ b/package/lua-utf8/Config.in @@ -4,4 +4,4 @@ config BR2_PACKAGE_LUA_UTF8 This module adds UTF-8 support to Lua. It's compatible with Lua "string" module. - http://github.com/starwing/luautf8 + https://github.com/starwing/luautf8 diff --git a/package/lua-utf8/lua-utf8.hash b/package/lua-utf8/lua-utf8.hash index 135574f36dd..b4d455ceb7f 100644 --- a/package/lua-utf8/lua-utf8.hash +++ b/package/lua-utf8/lua-utf8.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 88c456bc0f00d28201b33551d83fa6e5c3ae6025aebec790c37afb317290e4fa luautf8-0.1.3-1.src.rock -sha256 74506285923bcc3e58aaca1b774db26461021783d02b2dc26bafcaa02ef7a00b luautf8-0.1.3/LICENSE +sha256 68bd8e3c3e20f98fceb9e20d5a7a50168202c22eb45b87eff3247a0608f465ae luautf8-0.1.5-2.src.rock +sha256 74506285923bcc3e58aaca1b774db26461021783d02b2dc26bafcaa02ef7a00b luautf8-0.1.5/LICENSE diff --git a/package/lua-utf8/lua-utf8.mk b/package/lua-utf8/lua-utf8.mk index 52aaf5c71e1..33c34a4eb27 100644 --- a/package/lua-utf8/lua-utf8.mk +++ b/package/lua-utf8/lua-utf8.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUA_UTF8_VERSION = 0.1.3-1 +LUA_UTF8_VERSION = 0.1.5-2 LUA_UTF8_NAME_UPSTREAM = luautf8 LUA_UTF8_LICENSE = MIT LUA_UTF8_LICENSE_FILES = $(LUA_UTF8_SUBDIR)/LICENSE diff --git a/package/lua-valua/lua-valua.hash b/package/lua-valua/lua-valua.hash index 71d43e4faff..d4b1d4758cc 100644 --- a/package/lua-valua/lua-valua.hash +++ b/package/lua-valua/lua-valua.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 bff39692fd2ac3590fd814aa1b1ca33e5d5971092955309aa8424b02b88ce1a3 valua-0.3-1.src.rock -sha256 3444c2e739c88e41e327c6cd15e4a50fea8988570642bad6e6a43d50a7f7961f valua/LICENSE +sha256 bff39692fd2ac3590fd814aa1b1ca33e5d5971092955309aa8424b02b88ce1a3 valua-0.3-1.src.rock +sha256 3444c2e739c88e41e327c6cd15e4a50fea8988570642bad6e6a43d50a7f7961f valua/LICENSE diff --git a/package/lua-zlib/lua-zlib.hash b/package/lua-zlib/lua-zlib.hash index 8c108b39ae2..cef29efb10a 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 42436ba2b78c9a2d515d6da59ceb12cdea7f84c9ce3c859d91addb42badd4061 lua-zlib-1.2-0.src.rock diff --git a/package/lua/5.4.4/lua.hash b/package/lua/5.4.4/lua.hash deleted file mode 100644 index b55b17f2586..00000000000 --- a/package/lua/5.4.4/lua.hash +++ /dev/null @@ -1,6 +0,0 @@ -# Hashes from: https://www.lua.org/ftp/ -md5 bd8ce7069ff99a400efd14cf339a727b lua-5.4.4.tar.gz -sha1 03c27684b9d5d9783fb79a7c836ba1cdc5f309cd lua-5.4.4.tar.gz - -# Locally computed -sha256 2556ac7198243f9f83130b9c81016e1904f7b30351481f1c28e02475dbd237fb doc/readme.html diff --git a/package/lua/5.4.4/0001-root-path.patch b/package/lua/5.4.6/0001-root-path.patch similarity index 95% rename from package/lua/5.4.4/0001-root-path.patch rename to package/lua/5.4.6/0001-root-path.patch index c4f6e312eb0..5e3037b7865 100644 --- a/package/lua/5.4.4/0001-root-path.patch +++ b/package/lua/5.4.6/0001-root-path.patch @@ -6,7 +6,7 @@ Index: b/src/luaconf.h =================================================================== --- a/src/luaconf.h +++ b/src/luaconf.h -@@ -217,7 +217,7 @@ +@@ -223,7 +223,7 @@ #else /* }{ */ diff --git a/package/lua/5.4.4/0002-shared-libs-for-lua.patch b/package/lua/5.4.6/0002-shared-libs-for-lua.patch similarity index 96% rename from package/lua/5.4.4/0002-shared-libs-for-lua.patch rename to package/lua/5.4.6/0002-shared-libs-for-lua.patch index 4ff20442982..388aa9966a8 100644 --- a/package/lua/5.4.4/0002-shared-libs-for-lua.patch +++ b/package/lua/5.4.6/0002-shared-libs-for-lua.patch @@ -31,7 +31,7 @@ Index: b/src/Makefile --- a/src/Makefile +++ b/src/Makefile @@ -33,6 +33,7 @@ - PLATS= guess aix bsd c89 freebsd generic linux linux-readline macosx mingw posix solaris + PLATS= guess aix bsd c89 freebsd generic ios linux linux-readline macosx mingw posix solaris LUA_A= liblua.a +LUA_SO= liblua.so diff --git a/package/lua/5.4.4/0011-linenoise.patch b/package/lua/5.4.6/0011-linenoise.patch similarity index 97% rename from package/lua/5.4.4/0011-linenoise.patch rename to package/lua/5.4.6/0011-linenoise.patch index 68316e108f5..5054ae19e24 100644 --- a/package/lua/5.4.4/0011-linenoise.patch +++ b/package/lua/5.4.6/0011-linenoise.patch @@ -8,7 +8,7 @@ Index: b/src/lua.c =================================================================== --- a/src/lua.c +++ b/src/lua.c -@@ -428,6 +428,14 @@ +@@ -438,6 +438,14 @@ #define lua_saveline(L,line) ((void)L, add_history(line)) #define lua_freeline(L,b) ((void)L, free(b)) diff --git a/package/lua/5.4.6/lua.hash b/package/lua/5.4.6/lua.hash new file mode 100644 index 00000000000..0b03fd563c6 --- /dev/null +++ b/package/lua/5.4.6/lua.hash @@ -0,0 +1,5 @@ +# Hashes from: https://www.lua.org/ftp/ +sha256 7d5ea1b9cb6aa0b59ca3dde1c6adcb57ef83a1ba8e5432c0ecd06bf439b3ad88 lua-5.4.6.tar.gz + +# Locally computed +sha256 8f1bff27c5b0585ab679dbe4e37e75a1014af0f79732f42a79f86728321a0c6d doc/readme.html diff --git a/package/lua/Config.in b/package/lua/Config.in index 309dd6eec2f..888c34b21d9 100644 --- a/package/lua/Config.in +++ b/package/lua/Config.in @@ -14,6 +14,7 @@ config BR2_PACKAGE_PROVIDES_LUAINTERPRETER choice prompt "Lua Version" + default BR2_PACKAGE_LUA_5_3 if BR2_PACKAGE_LUA_5_2 # legacy default BR2_PACKAGE_LUA_5_4 help Select the version of Lua API/ABI you wish to use. @@ -21,6 +22,8 @@ choice config BR2_PACKAGE_LUA_5_1 bool "Lua 5.1.x" select BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1 + select BR2_PACKAGE_LUA_CVT_N2S + select BR2_PACKAGE_LUA_CVT_S2N config BR2_PACKAGE_LUA_5_3 bool "Lua 5.3.x" @@ -43,6 +46,20 @@ config BR2_PACKAGE_LUA_32BITS endif +config BR2_PACKAGE_LUA_CVT_N2S + bool "automatic coercion from number to string" + default y # legacy + help + If unsure, say y, this is the default behavior of the Lua + interpreter. See LUA_NOCVTN2S in luaconf.h + +config BR2_PACKAGE_LUA_CVT_S2N + bool "automatic coercion from string to number" + default y # legacy + help + If unsure, say y, this is the default behavior of the Lua + interpreter. See LUA_NOCVTN2S in luaconf.h + choice prompt "Lua command-line editing" default BR2_PACKAGE_LUA_EDITING_NONE diff --git a/package/lua/lua.mk b/package/lua/lua.mk index 09e7b34f7dc..93d4803812a 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.4 +LUA_VERSION = 5.4.6 else ifeq ($(BR2_PACKAGE_LUA_5_3),y) LUA_VERSION = 5.3.6 else @@ -31,6 +31,14 @@ else ifeq ($(BR2_PACKAGE_LUA_5_3),y) LUA_CFLAGS += -DLUA_COMPAT_5_2 endif +ifeq ($(BR2_PACKAGE_LUA_CVT_N2S),) +LUA_CFLAGS += -DLUA_NOCVTN2S +endif + +ifeq ($(BR2_PACKAGE_LUA_CVT_S2N),) +LUA_CFLAGS += -DLUA_NOCVTS2N +endif + ifeq ($(BR2_STATIC_LIBS),y) LUA_BUILDMODE = static else @@ -60,7 +68,7 @@ LUA_POST_PATCH_HOOKS += LUA_32BITS_LUACONF endif define HOST_LUA_LUACONF - $(SED) 's|#define LUA_ROOT.*|#define LUA_ROOT "$(HOST_DIR)/usr/"|' $(@D)/src/luaconf.h + $(SED) 's|#define LUA_ROOT.*|#define LUA_ROOT "$(HOST_DIR)/"|' $(@D)/src/luaconf.h endef HOST_LUA_POST_PATCH_HOOKS += HOST_LUA_LUACONF diff --git a/package/luadbi-sqlite3/luadbi-sqlite3.hash b/package/luadbi-sqlite3/luadbi-sqlite3.hash index 3e865df3001..4096fbb26a8 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 988d73cc2e56f972e8177091e084855fc2904d0fafcfe5c4e02864f25ce2b928 luadbi/COPYING +sha256 c5b043db43941a3c6e43d3e3699236846ed6d03a6c4cb12fa1a497f965138d9f luadbi-sqlite3-0.7.2-1.src.rock +sha256 988d73cc2e56f972e8177091e084855fc2904d0fafcfe5c4e02864f25ce2b928 luadbi/COPYING diff --git a/package/luadbi/luadbi.hash b/package/luadbi/luadbi.hash index 07a9cc2184f..e142f5e62e5 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 988d73cc2e56f972e8177091e084855fc2904d0fafcfe5c4e02864f25ce2b928 luadbi/COPYING +sha256 9ebbbaf4ea1f48628341e9ff3c1de10a57200c02453734f41b8016b0fc7b4956 luadbi-0.7.2-1.src.rock +sha256 988d73cc2e56f972e8177091e084855fc2904d0fafcfe5c4e02864f25ce2b928 luadbi/COPYING diff --git a/package/luaexpat/0001-restore-getcurrentbytecount.patch b/package/luaexpat/0001-restore-getcurrentbytecount.patch deleted file mode 100644 index 6cf21926783..00000000000 --- a/package/luaexpat/0001-restore-getcurrentbytecount.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 77cb691f781918908dfe34785f00a5ff75d5cc20 Mon Sep 17 00:00:00 2001 -From: Francois Perrad -Date: Sat, 16 Feb 2019 15:56:00 +0100 -Subject: [PATCH] restore getcurrentbytecount - -see https://github.com/tomasguisasola/luaexpat/issues/3 - -Fetch from: https://github.com/tomasguisasola/luaexpat/commit/0926f2d705109b7d35b721344264b39c1169e0de - -Signed-off-by: Francois Perrad ---- - src/lxplib.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/luaexpat-1.3.3/src/lxplib.c b/luaexpat-1.3.3/src/lxplib.c -index 7726913..35bec3c 100644 ---- a/luaexpat-1.3.3/src/lxplib.c -+++ b/luaexpat-1.3.3/src/lxplib.c -@@ -538,11 +538,18 @@ static int lxp_stop (lua_State *L) { - return 1; - } - -+static int lxp_getcurrentbytecount (lua_State* L) { -+ lxp_userdata *xpu = checkparser(L, 1); -+ lua_pushinteger(L, XML_GetCurrentByteCount(xpu->parser)); -+ return 1; -+} -+ - static const luaL_Reg lxp_meths[] = { - {"parse", lxp_parse}, - {"close", lxp_close}, - {"__gc", parser_gc}, - {"pos", lxp_pos}, -+ {"getcurrentbytecount", lxp_getcurrentbytecount}, - {"setencoding", lxp_setencoding}, - {"getcallbacks", getcallbacks}, - {"getbase", getbase}, --- -2.17.1 - diff --git a/package/luaexpat/Config.in b/package/luaexpat/Config.in index 2322dc430ce..25b067460ad 100644 --- a/package/luaexpat/Config.in +++ b/package/luaexpat/Config.in @@ -4,4 +4,4 @@ config BR2_PACKAGE_LUAEXPAT help LuaExpat is a SAX XML parser based on the Expat library. - http://www.keplerproject.org/luaexpat/ + https://lunarmodules.github.io/luaexpat diff --git a/package/luaexpat/luaexpat.hash b/package/luaexpat/luaexpat.hash index dd1cf40e5f6..621293a0b96 100644 --- a/package/luaexpat/luaexpat.hash +++ b/package/luaexpat/luaexpat.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 b55908fcd7df490a59aab25284460add8283f1c6b94ab584900fe3e49775172a luaexpat-1.3.3-1.src.rock -sha256 7f5cb0c1750babcbb09637b7f0ff34972d51cf23b7f413bef902b47aa65febcd luaexpat-1.3.3/LICENSE +sha256 eb7abc4cc39dd50eecb30896686bac84e66fd3c0774d0749b391e7ac5d222f45 luaexpat-1.5.1-1.src.rock +sha256 7e6a727e5b57cca713a2f2633f05d7e0cc1e261cc6a7613bbe266e625b2f14da luaexpat/LICENSE diff --git a/package/luaexpat/luaexpat.mk b/package/luaexpat/luaexpat.mk index 8c86b24f269..73675a8ee65 100644 --- a/package/luaexpat/luaexpat.mk +++ b/package/luaexpat/luaexpat.mk @@ -4,7 +4,8 @@ # ################################################################################ -LUAEXPAT_VERSION = 1.3.3-1 +LUAEXPAT_VERSION = 1.5.1-1 +LUAEXPAT_SUBDIR = luaexpat LUAEXPAT_LICENSE = MIT LUAEXPAT_LICENSE_FILES = $(LUAEXPAT_SUBDIR)/LICENSE LUAEXPAT_DEPENDENCIES = expat diff --git a/package/luaexpatutils/luaexpatutils.hash b/package/luaexpatutils/luaexpatutils.hash index fe32eea1285..8b6befc94a9 100644 --- a/package/luaexpatutils/luaexpatutils.hash +++ b/package/luaexpatutils/luaexpatutils.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 9b50bef94a6ddb6e6d4fffd5392f5c53d15e1a048966b559c4f8eda5e84d4517 luaexpatutils-88c228365b084224c911d34aff06002634b38b50.tar.gz +sha256 9b50bef94a6ddb6e6d4fffd5392f5c53d15e1a048966b559c4f8eda5e84d4517 luaexpatutils-88c228365b084224c911d34aff06002634b38b50.tar.gz diff --git a/package/luafilesystem/luafilesystem.hash b/package/luafilesystem/luafilesystem.hash index 747b9848020..cbe38294b05 100644 --- a/package/luafilesystem/luafilesystem.hash +++ b/package/luafilesystem/luafilesystem.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 576270a55752894254c2cba0d49d73595d37ec4ea8a75e557fdae7aff80e19cf luafilesystem-1.8.0-1.src.rock -sha256 beb2c9eed6466d572c3888028a77421206053a3c023429cbd69e5015badba842 luafilesystem/LICENSE +sha256 576270a55752894254c2cba0d49d73595d37ec4ea8a75e557fdae7aff80e19cf luafilesystem-1.8.0-1.src.rock +sha256 beb2c9eed6466d572c3888028a77421206053a3c023429cbd69e5015badba842 luafilesystem/LICENSE diff --git a/package/luajit/0001-no-bin-symlink.patch b/package/luajit/0001-no-bin-symlink.patch index d32ec5ad604..dc36fa58d60 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 -@@ -44,8 +44,7 @@ +@@ -45,8 +45,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) -@@ -60,7 +59,6 @@ +@@ -61,7 +60,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 5f6547fc3fe..8de777dce21 100644 --- a/package/luajit/0002-install-inc.patch +++ b/package/luajit/0002-install-inc.patch @@ -10,8 +10,8 @@ Index: b/Makefile INSTALL_BIN= $(DPREFIX)/bin INSTALL_LIB= $(DPREFIX)/$(MULTILIB) INSTALL_SHARE= $(DPREFIX)/share --INSTALL_INC= $(DPREFIX)/include/luajit-$(MAJVER).$(MINVER) -+INSTALL_INC= $(DPREFIX)/include +-INSTALL_DEFINC= $(DPREFIX)/include/luajit-$(MAJVER).$(MINVER) ++INSTALL_DEFINC= $(DPREFIX)/include + INSTALL_INC= $(INSTALL_DEFINC) INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(VERSION) - INSTALL_JITLIB= $(INSTALL_LJLIBD)/jit diff --git a/package/luajit/Config.in b/package/luajit/Config.in index 3111a2548f6..31e9e0243eb 100644 --- a/package/luajit/Config.in +++ b/package/luajit/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS bool - default y if BR2_arm || BR2_armeb || BR2_aarch64 + default y if BR2_arm || BR2_aarch64 || BR2_aarch64_be default y if BR2_i386 || BR2_x86_64 default y if (BR2_mips || BR2_mipsel) && !BR2_MIPS_SOFT_FLOAT \ && !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6 @@ -14,6 +14,8 @@ config BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS config BR2_PACKAGE_LUAJIT bool "luajit" depends on !BR2_STATIC_LIBS # dlopen + # Luajit conflicts with the regular lua package + depends on !BR2_PACKAGE_LUA # Luajit is only available for some target architectures, and # has some complexity wrt 32/64. See luajit.mk for details. depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS diff --git a/package/luajit/luajit.hash b/package/luajit/luajit.hash index d92eefb39aa..c655e9931cc 100644 --- a/package/luajit/luajit.hash +++ b/package/luajit/luajit.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 7ea92e2414b6405c7fb3974ab092707c400a5496e8d4936174b5bd3aa6e94477 luajit-a91d0d9d3bba1a936669cfac3244509a0f2ac0e3.tar.gz +sha256 aa354d1265814db5a1ee9dfff6049e19b148e1fd818f1ecfa4fcf2b19f6e4dd9 luajit-d0e88930ddde28ff662503f9f20facf34f7265aa.tar.gz # Locally calculated -sha256 43fc251179d900f9948e51dd3cc93733d1219f2db060faaa0c8100ad054f54d8 COPYRIGHT +sha256 52fc5b15ac968ed81aabb4c1e23ab3bce50f57a5764e9cdca86b463a11072921 COPYRIGHT diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk index cca806309db..09bde3590f7 100644 --- a/package/luajit/luajit.mk +++ b/package/luajit/luajit.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUAJIT_VERSION = a91d0d9d3bba1a936669cfac3244509a0f2ac0e3 +LUAJIT_VERSION = d0e88930ddde28ff662503f9f20facf34f7265aa LUAJIT_SITE = $(call github,LuaJIT,LuaJIT,$(LUAJIT_VERSION)) LUAJIT_LICENSE = MIT LUAJIT_LICENSE_FILES = COPYRIGHT diff --git a/package/luajson/luajson.hash b/package/luajson/luajson.hash index 3b7885aa7e5..ea779994d38 100644 --- a/package/luajson/luajson.hash +++ b/package/luajson/luajson.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 28a5928cf2e4fd79fa9a9aceaef5ebf1dccb1146489b7de4c2726f561700f01c luajson-1.3.4-1.src.rock -sha256 87565fca189b70f2e119b2a99e5e92a7aaab9f2eb05228b56b88e6c2e2f98bcd luajson/LICENSE +sha256 28a5928cf2e4fd79fa9a9aceaef5ebf1dccb1146489b7de4c2726f561700f01c luajson-1.3.4-1.src.rock +sha256 87565fca189b70f2e119b2a99e5e92a7aaab9f2eb05228b56b88e6c2e2f98bcd luajson/LICENSE diff --git a/package/lualdap/lualdap.hash b/package/lualdap/lualdap.hash index a65260b1322..15ca840f1fa 100644 --- a/package/lualdap/lualdap.hash +++ b/package/lualdap/lualdap.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 49c253f540187c61850c856b8e70e45dca904b81720a760f6a94e4eb474958ad lualdap-1.3.0-1.src.rock -sha256 b9b75da18d1e1147ec47bff508ffdce831da07dc371891b9057cf1c422660af4 lualdap/docs/license.md +sha256 49c253f540187c61850c856b8e70e45dca904b81720a760f6a94e4eb474958ad lualdap-1.3.0-1.src.rock +sha256 b9b75da18d1e1147ec47bff508ffdce831da07dc371891b9057cf1c422660af4 lualdap/docs/license.md diff --git a/package/lualogging/lualogging.hash b/package/lualogging/lualogging.hash index 294ef95adb1..af1ee1055d3 100644 --- a/package/lualogging/lualogging.hash +++ b/package/lualogging/lualogging.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 d29c9c78e4266d9390069b2a5f7afacfcf9189dea12ce3774a5aa4e3cdbcd89f lualogging-1.6.0-1.src.rock -sha256 4d95b123e667a13615f567a829aa39211dd55b0b48c9f247bf3fcc5c0b485da7 lualogging/COPYRIGHT +sha256 7bc2dcd13dbe85e48de50f05000b391e467a54d537b44ed856c1f7ad29c3549a lualogging-1.8.2-1.src.rock +sha256 9740a719a5e4ee280e65f42e3624354c3c4464e61d94de33efca9d7072d31092 lualogging/COPYRIGHT diff --git a/package/lualogging/lualogging.mk b/package/lualogging/lualogging.mk index 4d01f546e96..c7969fb7b37 100644 --- a/package/lualogging/lualogging.mk +++ b/package/lualogging/lualogging.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUALOGGING_VERSION = 1.6.0-1 +LUALOGGING_VERSION = 1.8.2-1 LUALOGGING_SUBDIR = lualogging LUALOGGING_LICENSE = MIT LUALOGGING_LICENSE_FILES = $(LUALOGGING_SUBDIR)/COPYRIGHT diff --git a/package/luaossl/luaossl.hash b/package/luaossl/luaossl.hash index c8fa7942edc..bf08fbd51eb 100644 --- a/package/luaossl/luaossl.hash +++ b/package/luaossl/luaossl.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 ea6d624e557939e30b93355dd1dc11465e81aa38a5542ab3c04b48608ac3cd78 luaossl-20200709-0.src.rock -sha256 7bd585fba3ae52943e0915e4c8ca049acde9f1e5cea101ef6b294427c8f0ee7d luaossl-rel-20200709/LICENSE +sha256 d711c86f433def90f63cb6747fe0bebaac604b868de6a9a35e4da2bb4e0967be luaossl-20220711-0.src.rock +sha256 7bd585fba3ae52943e0915e4c8ca049acde9f1e5cea101ef6b294427c8f0ee7d luaossl-rel-20220711/LICENSE diff --git a/package/luaossl/luaossl.mk b/package/luaossl/luaossl.mk index d241bce85cd..a6283a520e9 100644 --- a/package/luaossl/luaossl.mk +++ b/package/luaossl/luaossl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUAOSSL_VERSION_UPSTREAM = 20200709 +LUAOSSL_VERSION_UPSTREAM = 20220711 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 ee76ea103d7..2d54a6901ef 100644 --- a/package/luaposix/luaposix.hash +++ b/package/luaposix/luaposix.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1b5c48d2abd59de0738d1fc1e6204e44979ad2a1a26e8e22a2d6215dd502c797 luaposix-35.1.tar.gz -sha256 f50bc0f3197523b1709f31707425f2de95f8a45534b081a6b564179ab059e850 LICENSE +sha256 7944c2b4fbcef0667d407302740d87645325e751fd8d819f2b253c5d9ad0d497 luaposix-36.1.tar.gz +sha256 ea0fdaae50b0d31a81c2c99f4354264783c71043fd40522feaa40eecc069599b LICENSE diff --git a/package/luaposix/luaposix.mk b/package/luaposix/luaposix.mk index fa267091543..d17c8188b54 100644 --- a/package/luaposix/luaposix.mk +++ b/package/luaposix/luaposix.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUAPOSIX_VERSION = 35.1 +LUAPOSIX_VERSION = 36.1 LUAPOSIX_SITE = $(call github,luaposix,luaposix,v$(LUAPOSIX_VERSION)) LUAPOSIX_LICENSE = MIT LUAPOSIX_LICENSE_FILES = LICENSE diff --git a/package/luarocks/buildroot.lua b/package/luarocks/buildroot.lua index 2d160f02b60..3c044d89b5f 100644 --- a/package/luarocks/buildroot.lua +++ b/package/luarocks/buildroot.lua @@ -265,10 +265,10 @@ local function generate_hash (rockspec, lcname, rock_file, licenses, digest) local f = assert(io.open(fname, 'w')) util.printout('write ' .. fname) f:write('# computed by luarocks/buildroot\n') - f:write('sha256 ' .. digest[rock_file] .. ' ' .. rock_file .. '\n') + f:write('sha256 ' .. digest[rock_file] .. ' ' .. rock_file .. '\n') for i = 1, #licenses do local file = licenses[i] - f:write('sha256 ' .. digest[file] .. ' ' .. subdir .. '/' .. file .. '\n') + f:write('sha256 ' .. digest[file] .. ' ' .. subdir .. '/' .. file .. '\n') end f:close() end diff --git a/package/luarocks/luarocks.hash b/package/luarocks/luarocks.hash index d80e08a200d..71364569231 100644 --- a/package/luarocks/luarocks.hash +++ b/package/luarocks/luarocks.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 56ab9b90f5acbc42eb7a94cf482e6c058a63e8a1effdf572b8b2a6323a06d923 luarocks-3.8.0.tar.gz +sha256 ffafd83b1c42aa38042166a59ac3b618c838ce4e63f4ace9d961a5679ef58253 luarocks-3.9.1.tar.gz sha256 542ad0ee9b8ba582437ca7b4d0959c9b9432f25d2067f144d017188a7a84dd2f COPYING diff --git a/package/luarocks/luarocks.mk b/package/luarocks/luarocks.mk index 028e144e252..2bec2fca255 100644 --- a/package/luarocks/luarocks.mk +++ b/package/luarocks/luarocks.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUAROCKS_VERSION = 3.8.0 +LUAROCKS_VERSION = 3.9.1 LUAROCKS_SITE = https://luarocks.org/releases LUAROCKS_LICENSE = MIT LUAROCKS_LICENSE_FILES = COPYING diff --git a/package/luasec/luasec.hash b/package/luasec/luasec.hash index 1ea422aa9bd..3c2b7d803b4 100644 --- a/package/luasec/luasec.hash +++ b/package/luasec/luasec.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 b7e18f475c64896fe4921d367adabae765914f7526a68487a5fa6831040e7138 luasec-1.0-1.src.rock -sha256 0d3431dad143f41c8902e4ee867e386a702ebad856c45239fb86460e27dabfbf luasec/LICENSE +sha256 82d9ea7d11688a2b11fc1c4549a2e7b0aca00790b49e67a41dac0c81f2890f1c luasec-1.2.0-1.src.rock +sha256 bbf73e23eae7df57a4c4ff33bc23c41a2dc4f8707ba33235c2026d20b41405a7 luasec/LICENSE diff --git a/package/luasec/luasec.mk b/package/luasec/luasec.mk index 3ef0c14daf5..c7f3a94d9a5 100644 --- a/package/luasec/luasec.mk +++ b/package/luasec/luasec.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUASEC_VERSION = 1.0-1 +LUASEC_VERSION = 1.2.0-1 LUASEC_SUBDIR = luasec LUASEC_LICENSE = MIT LUASEC_LICENSE_FILES = $(LUASEC_SUBDIR)/LICENSE diff --git a/package/luasocket/Config.in b/package/luasocket/Config.in index 45263030f36..5ad00f5c488 100644 --- a/package/luasocket/Config.in +++ b/package/luasocket/Config.in @@ -6,4 +6,4 @@ config BR2_PACKAGE_LUASOCKET It provides easy access to TCP, UDP, DNS, SMTP, FTP, HTTP, MIME and much more. - http://luaforge.net/projects/luasocket/ + https://github.com/lunarmodules/luasocket diff --git a/package/luasocket/luasocket.hash b/package/luasocket/luasocket.hash index 843647b27f9..bfbc06f3eec 100644 --- a/package/luasocket/luasocket.hash +++ b/package/luasocket/luasocket.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 453fc1d0e9b6a44bbada4290d565f840a5e96ba2d1b47562ba38bd9c7e82195a luasocket-3.0rc1-1.src.rock -sha256 8e8c6314d9e78fe452ee355167f2c40cfbee8207e14dcb5ddd4a2655cb5c6aad luasocket-3.0-rc1/LICENSE +sha256 f4a207f50a3f99ad65def8e29c54ac9aac668b216476f7fae3fae92413398ed2 luasocket-3.1.0-1.src.rock +sha256 224afe42d0738eaaeb57ab289466a1c4e77091591e69dbcef2dbb385589f2f41 luasocket/LICENSE diff --git a/package/luasocket/luasocket.mk b/package/luasocket/luasocket.mk index 20927fc1d61..be360a33716 100644 --- a/package/luasocket/luasocket.mk +++ b/package/luasocket/luasocket.mk @@ -4,8 +4,8 @@ # ################################################################################ -LUASOCKET_VERSION = 3.0rc1-1 -LUASOCKET_SUBDIR = luasocket-3.0-rc1 +LUASOCKET_VERSION = 3.1.0-1 +LUASOCKET_SUBDIR = luasocket LUASOCKET_LICENSE = MIT LUASOCKET_LICENSE_FILES = $(LUASOCKET_SUBDIR)/LICENSE diff --git a/package/luasql-sqlite3/luasql-sqlite3.hash b/package/luasql-sqlite3/luasql-sqlite3.hash index 5406d9454f9..f8c7376558f 100644 --- a/package/luasql-sqlite3/luasql-sqlite3.hash +++ b/package/luasql-sqlite3/luasql-sqlite3.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 502faabc5e06c1d7c1ddb9a0550eb19220020c86b9f1e26a2cc2001e1343b35d luasql-sqlite3-2.4.0-1.src.rock -sha256 c8bb3a3947379addb89412e578d0aae95ca37dc6e48a17e128f40e512d10b025 luasql/doc/us/license.html +sha256 502faabc5e06c1d7c1ddb9a0550eb19220020c86b9f1e26a2cc2001e1343b35d luasql-sqlite3-2.4.0-1.src.rock +sha256 c8bb3a3947379addb89412e578d0aae95ca37dc6e48a17e128f40e512d10b025 luasql/doc/us/license.html diff --git a/package/luasyslog/0002-build-ax_lua.m4-fix-cross-compilation.patch b/package/luasyslog/0002-build-ax_lua.m4-fix-cross-compilation.patch new file mode 100644 index 00000000000..ac7c1d97e2b --- /dev/null +++ b/package/luasyslog/0002-build-ax_lua.m4-fix-cross-compilation.patch @@ -0,0 +1,45 @@ +From aed16d13d881492e8558f9da21be2dffc4ab2c33 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 4 Sep 2021 17:23:58 +0200 +Subject: [PATCH] build/ax_lua.m4: fix cross-compilation + +Don't try to "find" and "fix" the script and module directories when +cross-compiling as this will give unexpected results such as using +${prefix}/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/host/usr/share/lua/5.3 +instead of +${prefix}/share/lua/5.3 +if the host machine root directory is /usr + +Fixes: + - http://autobuild.buildroot.org/results/09fa6dd9844d6d4694801ec59434dad7a56bf290 + +Signed-off-by: Fabrice Fontaine +--- + build/ax_lua.m4 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/build/ax_lua.m4 b/build/ax_lua.m4 +index 23ca774..7c25cfd 100644 +--- a/build/ax_lua.m4 ++++ b/build/ax_lua.m4 +@@ -291,7 +291,7 @@ AC_DEFUN([AX_PROG_LUA], + + dnl Try to find a path with the prefix. + _AX_LUA_FND_PRFX_PTH([$LUA], [$ax_lua_prefix], [package.path]) +- AS_IF([test "x$ax_lua_prefixed_path" != 'x'], ++ AS_IF([test "x$ax_lua_prefixed_path" != 'x' && test "x$cross_compiling" != 'xyes'], + [ dnl Fix the prefix. + _ax_strip_prefix=`echo "$ax_lua_prefix" | sed 's|.|.|g'` + ax_cv_lua_luadir=`echo "$ax_lua_prefixed_path" | \ +@@ -318,7 +318,7 @@ AC_DEFUN([AX_PROG_LUA], + dnl Try to find a path with the prefix. + _AX_LUA_FND_PRFX_PTH([$LUA], + [$ax_lua_exec_prefix], [package.cpathd]) +- AS_IF([test "x$ax_lua_prefixed_path" != 'x'], ++ AS_IF([test "x$ax_lua_prefixed_path" != 'x' && test "x$cross_compiling" != 'xyes'], + [ dnl Fix the prefix. + _ax_strip_prefix=`echo "$ax_lua_exec_prefix" | sed 's|.|.|g'` + ax_cv_lua_luaexecdir=`echo "$ax_lua_prefixed_path" | \ +-- +2.32.0 + diff --git a/package/luksmeta/luksmeta.hash b/package/luksmeta/luksmeta.hash index 7e252294bbd..b367f29a5cd 100644 --- a/package/luksmeta/luksmeta.hash +++ b/package/luksmeta/luksmeta.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2ca0c35b551b331ba1444fc9d36e8c48ff8cae53dd4e6155b028e8904edc202a luksmeta-9.tar.bz2 -sha256 4b72eb6b5a336cd3ec837cc2d6347c23bf7574168db6b4802267700b93021abf COPYING +sha256 2ca0c35b551b331ba1444fc9d36e8c48ff8cae53dd4e6155b028e8904edc202a luksmeta-9.tar.bz2 +sha256 4b72eb6b5a336cd3ec837cc2d6347c23bf7574168db6b4802267700b93021abf COPYING diff --git a/package/luv/luv.hash b/package/luv/luv.hash index 2fb2b5c4fcf..4cdb91729f1 100644 --- a/package/luv/luv.hash +++ b/package/luv/luv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4b6fbaa89d2420edf6070ad9e522993e132bd7eb2540ff754c2b9f1497744db2 luv-1.42.0-1.tar.gz +sha256 567a6f3dcdcf8a9b54ddc57ffef89d1e950d72832b85ee81c8c83a9d4e0e9de2 luv-1.43.0-0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/luv/luv.mk b/package/luv/luv.mk index 2dc9af3b7a4..36fcdc742ec 100644 --- a/package/luv/luv.mk +++ b/package/luv/luv.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUV_VERSION = 1.42.0-1 +LUV_VERSION = 1.43.0-0 LUV_SITE = https://github.com/luvit/luv/releases/download/$(LUV_VERSION) LUV_LICENSE = Apache-2.0 LUV_LICENSE_FILES = LICENSE.txt diff --git a/package/luvi/luvi.hash b/package/luvi/luvi.hash index fcc81430db4..9621ef4d03a 100644 --- a/package/luvi/luvi.hash +++ b/package/luvi/luvi.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4149c87646f487f9076c29e9861f64468637b1d1361b777b093e6204a83e1ed9 luvi-src-v2.12.0.tar.gz +sha256 da25c74a30a3fe2fc75e9797a6fa0717ebb05ceb7e6ccb61301f80c7dd436b73 luvi-src-v2.13.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/luvi/luvi.mk b/package/luvi/luvi.mk index 5daa3c17933..5266281ffc8 100644 --- a/package/luvi/luvi.mk +++ b/package/luvi/luvi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUVI_VERSION = 2.12.0 +LUVI_VERSION = 2.13.0 LUVI_SOURCE = luvi-src-v$(LUVI_VERSION).tar.gz LUVI_SITE = https://github.com/luvit/luvi/releases/download/v$(LUVI_VERSION) LUVI_LICENSE = Apache-2.0 diff --git a/package/lv2/lv2.hash b/package/lv2/lv2.hash index ed21620bee3..0814958887f 100644 --- a/package/lv2/lv2.hash +++ b/package/lv2/lv2.hash @@ -1,4 +1,4 @@ # Locally calculated after checking signature -# https://lv2plug.in/spec/lv2-1.18.2.tar.bz2.asc -sha256 4e891fbc744c05855beb5dfa82e822b14917dd66e98f82b8230dbd1c7ab2e05e lv2-1.18.2.tar.bz2 -sha256 0b0b07d852e3ce7fa04986e141f73001bd7f260683968f0a19e02dbcc4131aa6 COPYING +# https://lv2plug.in/spec/lv2-1.18.10.tar.xz.sig +sha256 78c51bcf21b54e58bb6329accbb4dae03b2ed79b520f9a01e734bd9de530953f lv2-1.18.10.tar.xz +sha256 1e6bb175e193608b767ff25a4ed68b82c4db599491cf0d2694435cf60e9a4841 COPYING diff --git a/package/lv2/lv2.mk b/package/lv2/lv2.mk index 13ffaa34b05..2dde9b907c6 100644 --- a/package/lv2/lv2.mk +++ b/package/lv2/lv2.mk @@ -4,18 +4,17 @@ # ################################################################################ -LV2_VERSION = 1.18.2 +LV2_VERSION = 1.18.10 LV2_SITE = https://lv2plug.in/spec -LV2_SOURCE = lv2-$(LV2_VERSION).tar.bz2 +LV2_SOURCE = lv2-$(LV2_VERSION).tar.xz LV2_LICENSE = ISC LV2_LICENSE_FILES = COPYING LV2_DEPENDENCIES = host-pkgconf LV2_INSTALL_STAGING = YES LV2_CONF_OPTS += \ - --no-coverage \ - --no-check-links \ - --copy-headers + -Ddocs=disabled \ + -Dtests=disabled ifeq ($(BR2_PACKAGE_CAIRO),y) LV2_DEPENDENCIES += cairo @@ -30,7 +29,7 @@ LV2_DEPENDENCIES += libgtk2 endif ifeq ($(BR2_STATIC_LIBS),y) -LV2_CONF_OPTS += --no-plugins +LV2_CONF_OPTS += -Dplugins=disabled endif -$(eval $(waf-package)) +$(eval $(meson-package)) diff --git a/package/lvm2/lvm2.hash b/package/lvm2/lvm2.hash index c52eaee1e12..126748d3393 100644 --- a/package/lvm2/lvm2.hash +++ b/package/lvm2/lvm2.hash @@ -1,4 +1,4 @@ -# From http://sources.redhat.com/pub/lvm2/sha512.sum +# From https://sourceware.org/ftp/lvm2/sha512.sum sha512 6a93bed1d5cf36f0f48d4d413d028b0e480cd4fc20e25d173770a892f265d2a0cc68d01a720b1513469953649e989532cd0c45f9538f92a4190eb3dc4555857d LVM2.2.03.14.tgz # Locally computed sha256 checksums sha256 e76fbcd2fb97cf202da330301327754d2db5c58b5b4bebd3a8a749393e7603d1 COPYING diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk index 89fdf2c1be6..9caf99eb9b9 100644 --- a/package/lvm2/lvm2.mk +++ b/package/lvm2/lvm2.mk @@ -6,7 +6,7 @@ LVM2_VERSION = 2.03.14 LVM2_SOURCE = LVM2.$(LVM2_VERSION).tgz -LVM2_SITE = http://sources.redhat.com/pub/lvm2 +LVM2_SITE = https://sourceware.org/ftp/lvm2 LVM2_INSTALL_STAGING = YES LVM2_LICENSE = GPL-2.0, LGPL-2.1 LVM2_LICENSE_FILES = COPYING COPYING.LIB diff --git a/package/lxc/lxc.hash b/package/lxc/lxc.hash index 2b58df2f1d8..2dd983a3611 100644 --- a/package/lxc/lxc.hash +++ b/package/lxc/lxc.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 afa481e17ca9a9cf9fd3d2d7a04e42a8f6bfe60b323909326c968e852cd9f02c lxc-4.0.11.tar.gz +sha256 bea08d2e49efcee34fa58acd2bc95c0adc64d291c07f4cfaf4ac1d8ac5a36f45 lxc-5.0.2.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk index 08f64bcec7c..4a4d3a62123 100644 --- a/package/lxc/lxc.mk +++ b/package/lxc/lxc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LXC_VERSION = 4.0.11 +LXC_VERSION = 5.0.2 LXC_SITE = https://linuxcontainers.org/downloads/lxc LXC_LICENSE = GPL-2.0 (some tools), LGPL-2.1+ LXC_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 @@ -13,49 +13,69 @@ LXC_DEPENDENCIES = host-pkgconf LXC_INSTALL_STAGING = YES LXC_CONF_OPTS = \ - --disable-apparmor \ - --disable-examples \ - --with-distro=buildroot \ - --disable-werror \ - $(if $(BR2_PACKAGE_BASH),,--disable-bash) + -Dapparmor=false \ + -Dexamples=false \ + -Dman=false ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y) LXC_DEPENDENCIES += bash-completion endif ifeq ($(BR2_PACKAGE_LIBCAP),y) -LXC_CONF_OPTS += --enable-capabilities +LXC_CONF_OPTS += -Dcapabilities=true LXC_DEPENDENCIES += libcap else -LXC_CONF_OPTS += --disable-capabilities +LXC_CONF_OPTS += -Dcapabilities=false endif ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) -LXC_CONF_OPTS += --enable-seccomp +LXC_CONF_OPTS += -Dseccomp=true LXC_DEPENDENCIES += libseccomp else -LXC_CONF_OPTS += --disable-seccomp +LXC_CONF_OPTS += -Dseccomp=false endif ifeq ($(BR2_PACKAGE_LIBSELINUX),y) -LXC_CONF_OPTS += --enable-selinux +LXC_CONF_OPTS += -Dselinux=true LXC_DEPENDENCIES += libselinux else -LXC_CONF_OPTS += --disable-selinux +LXC_CONF_OPTS += -Dselinux=false endif ifeq ($(BR2_PACKAGE_LIBURING),y) -LXC_CONF_OPTS += --enable-liburing +LXC_CONF_OPTS += -Dio-uring-event-loop=true LXC_DEPENDENCIES += liburing else -LXC_CONF_OPTS += --disable-liburing +LXC_CONF_OPTS += -Dio-uring-event-loop=false +endif + +ifeq ($(BR2_PACKAGE_LINUX_PAM),y) +LXC_CONF_OPTS += -Dpam-cgroup=true +LXC_DEPENDENCIES += linux-pam +else +LXC_CONF_OPTS += -Dpam-cgroup=false endif ifeq ($(BR2_PACKAGE_OPENSSL),y) -LXC_CONF_OPTS += --enable-openssl +LXC_CONF_OPTS += -Dopenssl=true LXC_DEPENDENCIES += openssl else -LXC_CONF_OPTS += --disable-openssl +LXC_CONF_OPTS += -Dopenssl=false +endif + +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +LXC_CONF_OPTS += -Dsd-bus=enabled +LXC_DEPENDENCIES += systemd +else +LXC_CONF_OPTS += -Dsd-bus=disabled +endif + +ifeq ($(BR2_INIT_SYSTEMD),y) +LXC_CONF_OPTS += -Dinit-script=systemd +else ifeq ($(BR2_INIT_SYSV),y) +LXC_CONF_OPTS += -Dinit-script=sysvinit +else +LXC_CONF_OPTS += -Dinit-script= endif -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/package/lz4/0001-Fix-potential-memory-corruption-with-negative-memmov.patch b/package/lz4/0001-Fix-potential-memory-corruption-with-negative-memmov.patch deleted file mode 100644 index 57e4e38f847..00000000000 --- a/package/lz4/0001-Fix-potential-memory-corruption-with-negative-memmov.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 8301a21773ef61656225e264f4f06ae14462bca7 Mon Sep 17 00:00:00 2001 -From: Jasper Lievisse Adriaanse -Date: Fri, 26 Feb 2021 15:21:20 +0100 -Subject: [PATCH] Fix potential memory corruption with negative memmove() size - -Signed-off-by: Peter Korsgaard ---- - lib/lz4.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/lz4.c b/lib/lz4.c -index 5f524d0..c2f504e 100644 ---- a/lib/lz4.c -+++ b/lib/lz4.c -@@ -1749,7 +1749,7 @@ LZ4_decompress_generic( - const size_t dictSize /* note : = 0 if noDict */ - ) - { -- if (src == NULL) { return -1; } -+ if ((src == NULL) || (outputSize < 0)) { return -1; } - - { const BYTE* ip = (const BYTE*) src; - const BYTE* const iend = ip + srcSize; --- -2.20.1 - diff --git a/package/lz4/0001-build-Support-BUILD_SHARED-no.patch b/package/lz4/0001-build-Support-BUILD_SHARED-no.patch new file mode 100644 index 00000000000..d2d8639a3bb --- /dev/null +++ b/package/lz4/0001-build-Support-BUILD_SHARED-no.patch @@ -0,0 +1,42 @@ +From 5ccbd38277989ae6a728171d59ae03bad6f2f4d5 Mon Sep 17 00:00:00 2001 +From: Fotis Xenakis +Date: Tue, 13 Sep 2022 20:09:36 +0300 +Subject: [PATCH] build: Support BUILD_SHARED=no + +Since e585a438c714652e866a59371b287f52aa4d2dc3, the BUILD_SHARED +Makefile variable only takes effect for the install target (i.e. the +shared libraries always built). This restores the original behaviour. + +[Retrieved from: +https://github.com/lz4/lz4/commit/5ccbd38277989ae6a728171d59ae03bad6f2f4d5] +Signed-off-by: Fabrice Fontaine +--- + lib/Makefile | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/lib/Makefile b/lib/Makefile +index 06503cb2a..ee262c0df 100644 +--- a/lib/Makefile ++++ b/lib/Makefile +@@ -112,17 +112,21 @@ liblz4-dll.o: liblz4-dll.rc + $(WINDRES) -i liblz4-dll.rc -o liblz4-dll.o + + $(LIBLZ4): $(SRCFILES) liblz4-dll.o ++ifeq ($(BUILD_SHARED),yes) + @echo compiling dynamic library $(LIBVER) + $(CC) $(FLAGS) -DLZ4_DLL_EXPORT=1 -shared $^ -o dll/$@.dll -Wl,--out-implib,dll/$(LIBLZ4_EXP) ++endif + + else # not windows + + $(LIBLZ4): $(SRCFILES) ++ifeq ($(BUILD_SHARED),yes) + @echo compiling dynamic library $(LIBVER) + $(CC) $(FLAGS) -shared $^ -fPIC -fvisibility=hidden $(SONAME_FLAGS) -o $@ + @echo creating versioned links + $(LN_SF) $@ liblz4.$(SHARED_EXT_MAJOR) + $(LN_SF) $@ liblz4.$(SHARED_EXT) ++endif + + endif + diff --git a/package/lz4/lz4.hash b/package/lz4/lz4.hash index 0b03089ecdf..04bd118cfe9 100644 --- a/package/lz4/lz4.hash +++ b/package/lz4/lz4.hash @@ -1,4 +1,4 @@ # sha256 locally computed -sha256 030644df4611007ff7dc962d981f390361e6c97a34e5cbc393ddfbe019ffe2c1 lz4-1.9.3.tar.gz -sha256 d15d99c8dc6b0ec22174c0e563a95bc40f9363ca7f9d9d793bb5c5a8e8d0af71 lib/LICENSE +sha256 0b0e3aa07c8c063ddf40b082bdf7e37a1562bda40a0ff5272957f3e987e0e54b lz4-1.9.4.tar.gz +sha256 8b58c446121a109ccf32edc094bba3010a3d85e4ee3702950db55e4d3e87736c lib/LICENSE sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 programs/COPYING diff --git a/package/lz4/lz4.mk b/package/lz4/lz4.mk index 9b9b6198c3f..5da1ae27034 100644 --- a/package/lz4/lz4.mk +++ b/package/lz4/lz4.mk @@ -4,21 +4,12 @@ # ################################################################################ -LZ4_VERSION = 1.9.3 +LZ4_VERSION = 1.9.4 LZ4_SITE = $(call github,lz4,lz4,v$(LZ4_VERSION)) LZ4_INSTALL_STAGING = YES LZ4_LICENSE = BSD-2-Clause (library), GPL-2.0+ (programs) LZ4_LICENSE_FILES = lib/LICENSE programs/COPYING -LZ4_CPE_ID_VENDOR = yann_collet - -# CVE-2014-4715 is misclassified (by our CVE tracker) as affecting version -# 1.9.2, while in fact this issue has been fixed since lz4-r130: -# https://github.com/lz4/lz4/commit/140e6e72ddb6fc5f7cd28ce0c8ec3812ef4a9c08 -# See https://github.com/lz4/lz4/issues/818 -LZ4_IGNORE_CVES += CVE-2014-4715 - -# 0001-Fix-potential-memory-corruption-with-negative-memmov.patch -LZ4_IGNORE_CVES += CVE-2021-3520 +LZ4_CPE_ID_VENDOR = lz4_project ifeq ($(BR2_STATIC_LIBS),y) LZ4_MAKE_OPTS += BUILD_SHARED=no diff --git a/package/lzma-alone/Config.in.host b/package/lzma-alone/Config.in.host new file mode 100644 index 00000000000..053b8696352 --- /dev/null +++ b/package/lzma-alone/Config.in.host @@ -0,0 +1,18 @@ +config BR2_PACKAGE_HOST_LZMA_ALONE + bool "host lzma-alone" + help + LZMA has two well-known command-line tools: + 1. lzma from LZMA SDK + 2. lzma from XZ Utils (previously LZMA Utils) + + This package provides the former one which: + 1. Gives more control over compression parameters + 2. Gets named lzma_alone to allow coexistence + + This tool may be used to prepare firmwares for bootloaders + with limited LZMA support. + E.g. Broadcom's CFE bootloader for MIPS BCM47xx devices is + known to fail to boot images using LZMA compression with + dictionary. + + https://www.7-zip.org/sdk.html diff --git a/package/lzma-alone/lzma-alone.hash b/package/lzma-alone/lzma-alone.hash new file mode 100644 index 00000000000..33901d16203 --- /dev/null +++ b/package/lzma-alone/lzma-alone.hash @@ -0,0 +1,5 @@ +# From https://sourceforge.net/projects/sevenzip/files/LZMA%20SDK/ +sha1 fbe4d6c02202d65fae75c2db0e3cdc542ca41e6d lzma922.tar.bz2 +# Locally computed +sha256 9aade84f229fb25f7aef39d8866b375fe6d35a9e18098d7cd86a99e294902944 lzma922.tar.bz2 +sha256 65cd2f7b76266889cbdcec55ab8ce6e845beabb5f450d58287439b25666e3b6a lzma.txt diff --git a/package/lzma-alone/lzma-alone.mk b/package/lzma-alone/lzma-alone.mk new file mode 100644 index 00000000000..2ed6c2c7722 --- /dev/null +++ b/package/lzma-alone/lzma-alone.mk @@ -0,0 +1,27 @@ +################################################################################ +# +# lzma-alone +# +################################################################################ + +LZMA_ALONE_VERSION = 9.22 +LZMA_ALONE_SITE = https://sourceforge.net/projects/sevenzip/files/LZMA%20SDK +LZMA_ALONE_SOURCE = lzma922.tar.bz2 +LZMA_ALONE_STRIP_COMPONENTS = 0 +LZMA_ALONE_LICENSE = Public Domain +LZMA_ALONE_LICENSE_FILES = lzma.txt + +define HOST_LZMA_ALONE_BUILD_CMDS + $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \ + -C $(@D)/C/Util/Lzma -f makefile.gcc + $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \ + -C $(@D)/CPP/7zip/Bundles/LzmaCon -f makefile.gcc +endef + +define HOST_LZMA_ALONE_INSTALL_CMDS + $(INSTALL) -D -m 0755 \ + $(@D)/CPP/7zip/Bundles/LzmaCon/lzma \ + $(HOST_DIR)/bin/lzma_alone +endef + +$(eval $(host-generic-package)) diff --git a/package/lzma/lzma.hash b/package/lzma/lzma.hash index 6055d7d9861..940c40e6adc 100644 --- a/package/lzma/lzma.hash +++ b/package/lzma/lzma.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 02aa57f995d15b7acb7c2496d88a39fb0124ea00bf027cc61dd24eddb5942dff lzma-4.32.7.tar.xz -sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING.GPLv2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.GPLv3 -sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING.LGPLv2.1 +sha256 02aa57f995d15b7acb7c2496d88a39fb0124ea00bf027cc61dd24eddb5942dff lzma-4.32.7.tar.xz +sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING.GPLv2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.GPLv3 +sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING.LGPLv2.1 diff --git a/package/lzo/lzo.hash b/package/lzo/lzo.hash index 39a2dd4959d..6eb9c505355 100644 --- a/package/lzo/lzo.hash +++ b/package/lzo/lzo.hash @@ -1,5 +1,5 @@ # From http://www.oberhumer.com/opensource/lzo/ -sha1 4924676a9bae5db58ef129dc1cebce3baa3c4b5d lzo-2.10.tar.gz +sha1 4924676a9bae5db58ef129dc1cebce3baa3c4b5d lzo-2.10.tar.gz # Locally computed -sha256 c0f892943208266f9b6543b3ae308fab6284c5c90e627931446fb49b4221a072 lzo-2.10.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 c0f892943208266f9b6543b3ae308fab6284c5c90e627931446fb49b4221a072 lzo-2.10.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/lzop/lzop.hash b/package/lzop/lzop.hash index 8496ac2188e..adc20648b66 100644 --- a/package/lzop/lzop.hash +++ b/package/lzop/lzop.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c1425b8c77d49f5a679d5a126c90ea6ad99585a55e335a613cae59e909dbb2c9 lzop-1.03.tar.gz -sha256 70439f6e2b47057a408d2390ed6663b9875f5a08066a06a060a357ef1df89a8c COPYING +sha256 c1425b8c77d49f5a679d5a126c90ea6ad99585a55e335a613cae59e909dbb2c9 lzop-1.03.tar.gz +sha256 70439f6e2b47057a408d2390ed6663b9875f5a08066a06a060a357ef1df89a8c COPYING diff --git a/package/m4/m4.mk b/package/m4/m4.mk index 3a120929717..39ad898b106 100644 --- a/package/m4/m4.mk +++ b/package/m4/m4.mk @@ -9,6 +9,5 @@ M4_SOURCE = m4-$(M4_VERSION).tar.xz M4_SITE = $(BR2_GNU_MIRROR)/m4 M4_LICENSE = GPL-3.0+ M4_LICENSE_FILES = COPYING -HOST_M4_CONF_OPTS = --disable-static $(eval $(host-autotools-package)) diff --git a/package/make/make.hash b/package/make/make.hash index 242cb956432..0bd0e5546f4 100644 --- a/package/make/make.hash +++ b/package/make/make.hash @@ -1,5 +1,5 @@ # From http://lists.gnu.org/archive/html/info-gnu/2016-06/msg00005.html -md5 15b012617e7c44c0ed482721629577ac make-4.2.1.tar.bz2 +md5 15b012617e7c44c0ed482721629577ac make-4.2.1.tar.bz2 # Locally calculated after checking signature sha256 d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589 make-4.2.1.tar.bz2 # Locally computed diff --git a/package/makedevs/makedevs.c b/package/makedevs/makedevs.c index 2796cd5e780..a5c9c7d64d1 100644 --- a/package/makedevs/makedevs.c +++ b/package/makedevs/makedevs.c @@ -446,11 +446,12 @@ int bb_recursive(const char *fpath, const struct stat *sb, } /* chmod() is optional, also skip if dangling symlink */ - if (recursive_mode != -1 && tflag == FTW_SL && access(fpath, F_OK)) { - if (chmod(fpath, recursive_mode) < 0) { - bb_perror_msg("chmod failed for %s", fpath); - return -1; - } + if (recursive_mode == -1 || (tflag == FTW_SL && !access(fpath, F_OK))) + return 0; + + if (chmod(fpath, recursive_mode) < 0) { + bb_perror_msg("chmod failed for %s", fpath); + return -1; } return 0; diff --git a/package/makedumpfile/0002-Handle-__mips64.patch b/package/makedumpfile/0002-Handle-__mips64.patch new file mode 100644 index 00000000000..fd3fdbbb39a --- /dev/null +++ b/package/makedumpfile/0002-Handle-__mips64.patch @@ -0,0 +1,69 @@ +From a5779893ee087409b2d1fe391ead102defe0f00b Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 2 Nov 2022 13:00:00 +0100 +Subject: [PATCH] Handle __mips64 + +Handle __mips64 as __mips64__ to avoid the following build failure: + +makedumpfile.c: In function 'is_kvaddr': +makedumpfile.c:1613:39: error: 'KVBASE' undeclared (first use in this function) + return (addr >= (unsigned long long)(KVBASE)); + ^~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/94824fa8baa8edb99a5ca245e5561e0c4e430638 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/makedumpfile/makedumpfile/pull/11] +--- + arch/mips64.c | 2 +- + makedumpfile.h | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/arch/mips64.c b/arch/mips64.c +index ab45b6e..fd987b0 100644 +--- a/arch/mips64.c ++++ b/arch/mips64.c +@@ -16,7 +16,7 @@ + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +-#ifdef __mips64__ ++#if defined(__mips64__) || defined(__mips64) + + #include "../print_info.h" + #include "../elf_info.h" +diff --git a/makedumpfile.h b/makedumpfile.h +index 70a1a91..3842f9c 100644 +--- a/makedumpfile.h ++++ b/makedumpfile.h +@@ -963,7 +963,7 @@ typedef unsigned long pgd_t; + + #endif /* sparc64 */ + +-#ifdef __mips64__ /* mips64 */ ++#if defined(__mips64__) || defined(__mips64) /* mips64 */ + #define KVBASE PAGE_OFFSET + + #ifndef _XKPHYS_START_ADDR +@@ -1204,7 +1204,7 @@ unsigned long long vaddr_to_paddr_sparc64(unsigned long vaddr); + #define arch_crashkernel_mem_size() stub_false() + #endif /* sparc64 */ + +-#ifdef __mips64__ /* mips64 */ ++#if defined(__mips64__) || defined(__mips64) /* mips64 */ + int get_phys_base_mips64(void); + int get_machdep_info_mips64(void); + int get_versiondep_info_mips64(void); +@@ -2364,7 +2364,7 @@ int get_xen_info_ia64(void); + #define get_xen_info_arch(X) FALSE + #endif /* sparc64 */ + +-#ifdef __mips64__ /* mips64 */ ++#if defined(__mips64__) || defined(__mips64) /* mips64 */ + #define kvtop_xen(X) FALSE + #define get_xen_basic_info_arch(X) FALSE + #define get_xen_info_arch(X) FALSE +-- +2.35.1 + diff --git a/package/makedumpfile/Config.in b/package/makedumpfile/Config.in index d5af38b5980..62549f851fc 100644 --- a/package/makedumpfile/Config.in +++ b/package/makedumpfile/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_MAKEDUMPFILE_ARCH_SUPPORTS default y if BR2_aarch64 || BR2_aarch64_be default y if BR2_arm || BR2_armeb default y if BR2_i386 || BR2_x86_64 + default y if BR2_mips64 || BR2_mips64el default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le default y if BR2_s390x default y if BR2_sparc64 diff --git a/package/makedumpfile/makedumpfile.hash b/package/makedumpfile/makedumpfile.hash index 5eeb6387fae..f38d93c04aa 100644 --- a/package/makedumpfile/makedumpfile.hash +++ b/package/makedumpfile/makedumpfile.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 8985f8df249087ea68c6051dec6dac3ef0703fe2aa87d0266f3951f93aa8da5e makedumpfile-1.7.0.tar.gz +sha256 748583ea4c0b32346008aa53b313e9708f60a8481959c25c76e5c94740032d9b makedumpfile-1.7.2.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/makedumpfile/makedumpfile.mk b/package/makedumpfile/makedumpfile.mk index 8399e4d0636..8dc60b043e2 100644 --- a/package/makedumpfile/makedumpfile.mk +++ b/package/makedumpfile/makedumpfile.mk @@ -4,8 +4,8 @@ # ################################################################################ -MAKEDUMPFILE_VERSION = 1.7.0 -MAKEDUMPFILE_SITE = $(call github,makedumpfile,makedumpfile,$(MAKEDUMPFILE_VERSION)) +MAKEDUMPFILE_VERSION = 1.7.2 +MAKEDUMPFILE_SITE = https://github.com/makedumpfile/makedumpfile/releases/download/$(MAKEDUMPFILE_VERSION) MAKEDUMPFILE_DEPENDENCIES = bzip2 elfutils xz zlib MAKEDUMPFILE_LICENSE = GPL-2.0 MAKEDUMPFILE_LICENSE_FILES = COPYING @@ -17,6 +17,7 @@ MAKEDUMPFILE_TARGET = $(BR2_ARCH) endif MAKEDUMPFILE_MAKE_OPTS = \ + CROSS= \ TARGET=$(MAKEDUMPFILE_TARGET) \ LINKTYPE=dynamic @@ -30,6 +31,11 @@ MAKEDUMPFILE_DEPENDENCIES += snappy MAKEDUMPFILE_MAKE_OPTS += USESNAPPY=on endif +ifeq ($(BR2_PACKAGE_ZSTD),y) +MAKEDUMPFILE_DEPENDENCIES += zstd +MAKEDUMPFILE_MAKE_OPTS += USEZSTD=on +endif + define MAKEDUMPFILE_BUILD_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ $(MAKEDUMPFILE_MAKE_OPTS) diff --git a/package/mali-driver/Config.in b/package/mali-driver/Config.in index fee67096c88..4c1a96d05cd 100644 --- a/package/mali-driver/Config.in +++ b/package/mali-driver/Config.in @@ -3,6 +3,7 @@ comment "mali-driver needs a Linux kernel to be built" config BR2_PACKAGE_MALI_DRIVER bool "mali-driver" + depends on BR2_aarch64 || BR2_arm depends on BR2_LINUX_KERNEL help This package builds and installs the Linux kernel driver for diff --git a/package/mali-driver/mali-driver.hash b/package/mali-driver/mali-driver.hash index a144d5189ed..de3b6e69f05 100644 --- a/package/mali-driver/mali-driver.hash +++ b/package/mali-driver/mali-driver.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 76464e5ed55e9d21062cf154733ce61217211172629ec8742af902607f14d41a mali-driver-a742530232d1de41b57465744a1259fa6c35049e.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE +sha256 763d3cf76eb03584df6a13986a2877dc0ae5f310fc3d91e8a498fc5f89271dcc mali-driver-c90627f78d58567a2acb7cbf77d565e03a131294.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/mali-driver/mali-driver.mk b/package/mali-driver/mali-driver.mk index b12bfec69d6..8e059fe8bda 100644 --- a/package/mali-driver/mali-driver.mk +++ b/package/mali-driver/mali-driver.mk @@ -4,11 +4,11 @@ # ################################################################################ -MALI_DRIVER_VERSION = a742530232d1de41b57465744a1259fa6c35049e +MALI_DRIVER_VERSION = c90627f78d58567a2acb7cbf77d565e03a131294 MALI_DRIVER_SITE = $(call github,bootlin,mali-driver,$(MALI_DRIVER_VERSION)) MALI_DRIVER_DEPENDENCIES = linux MALI_DRIVER_LICENSE = GPL-2.0 -MALI_DRIVER_LICENSE_FILE = LICENSE +MALI_DRIVER_LICENSE_FILES = LICENSE MALI_DRIVER_MODULE_SUBDIRS = r8p0/drivers/gpu/arm/midgard $(eval $(kernel-module)) diff --git a/package/mariadb/0001-add-extra-check-for-librt.patch b/package/mariadb/0001-add-extra-check-for-librt.patch index 0dd4c546fbf..6e3fc702764 100644 --- a/package/mariadb/0001-add-extra-check-for-librt.patch +++ b/package/mariadb/0001-add-extra-check-for-librt.patch @@ -8,6 +8,8 @@ https://jira.mariadb.org/browse/MDEV-10841 Signed-off-by: Ryan Coe [Rebased on mariadb-10.3.30] Signed-off-by: Peter Seiderer +[Rebased on mariadb-10.3.36] +Signed-off-by: Fabrice Fontaine --- configure.cmake | 3 +++ 1 file changed, 3 insertions(+) @@ -23,9 +25,9 @@ index 1b85c31b..4a1cd847 100644 + IF(NOT LIBRT) + MY_SEARCH_LIBS(posix_spawn_file_actions_addclose rt LIBRT) + ENDIF() - set(THREADS_PREFER_PTHREAD_FLAG ON) - FIND_PACKAGE(Threads) + MY_SEARCH_LIBS(backtrace_symbols_fd execinfo LIBEXECINFO) + set(THREADS_PREFER_PTHREAD_FLAG ON) -- 2.32.0 diff --git a/package/mariadb/0002-include-ssl_compat.h-fix-build-with-libressl-3.5.0.patch b/package/mariadb/0002-include-ssl_compat.h-fix-build-with-libressl-3.5.0.patch new file mode 100644 index 00000000000..fd3e6e66079 --- /dev/null +++ b/package/mariadb/0002-include-ssl_compat.h-fix-build-with-libressl-3.5.0.patch @@ -0,0 +1,39 @@ +From 79ed770a37c8669390a58a4485dd8f5565fe2497 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 15 Jan 2023 19:12:05 +0100 +Subject: [PATCH] include/ssl_compat.h: fix build with libressl >= 3.5.0 + +Fix the following build failure with libressl >= 3.5.0: + +In file included from /tmp/instance-10/output-1/build/mariadb-10.3.36/vio/viosslfactories.c:18: +/tmp/instance-10/output-1/build/mariadb-10.3.36/vio/viosslfactories.c: In function 'get_dh2048': +/tmp/instance-10/output-1/build/mariadb-10.3.36/include/ssl_compat.h:68:45: error: invalid use of incomplete typedef 'DH' {aka 'struct dh_st'} + 68 | #define DH_set0_pqg(D,P,Q,G) ((D)->p= (P), (D)->g= (G)) + | ^~ + +Fixes: + - http://autobuild.buildroot.org/results/524198344aafca58d214537af64c5961c407b0f8 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/MariaDB/server/pull/2435] +--- + include/ssl_compat.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/include/ssl_compat.h b/include/ssl_compat.h +index 664f3aac87c..3678e5fa084 100644 +--- a/include/ssl_compat.h ++++ b/include/ssl_compat.h +@@ -19,7 +19,8 @@ + /* OpenSSL version specific definitions */ + #if defined(OPENSSL_VERSION_NUMBER) + +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \ ++ !(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) + #define HAVE_OPENSSL11 1 + #define SSL_LIBRARY OpenSSL_version(OPENSSL_VERSION) + #define ERR_remove_state(X) ERR_clear_error() +-- +2.39.0 + diff --git a/package/mariadb/mariadb.hash b/package/mariadb/mariadb.hash index 4da26bdf947..c4064cff66f 100644 --- a/package/mariadb/mariadb.hash +++ b/package/mariadb/mariadb.hash @@ -1,5 +1,5 @@ -# From https://dlm.mariadb.com/2117287/MariaDB/mariadb-10.3.34/source/sha512sums.txt -sha512 46d4575ec1afb68510652a4bb31ca5ce83a2f5f61048a6e9c1487b0ba58f079465a8b72518d44043cd42c631b19ff50b5498584676ac6473705b138fe3300741 mariadb-10.3.34.tar.gz +# From https://downloads.mariadb.org/mariadb/10.3.36 +sha512 321b4c48fcea4413eb239c4904c806306de660f2844edfa1d2a2a15213db287070d0f923db976588dfe329559d565bd98bddef3aaf8f14502f8c3db2ee27757a mariadb-10.3.36.tar.gz # Hash for license files sha256 084aa0007efac6dda6aafffb3f3ef8b66b105862dad7ee23f6a4b52813f84464 README.md diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk index 4eb9c71827b..5fb88762787 100644 --- a/package/mariadb/mariadb.mk +++ b/package/mariadb/mariadb.mk @@ -4,8 +4,8 @@ # ################################################################################ -MARIADB_VERSION = 10.3.34 -MARIADB_SITE = https://dlm.mariadb.com/2117285/MariaDB/mariadb-$(MARIADB_VERSION)/source +MARIADB_VERSION = 10.3.36 +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 # https://jira.mariadb.org/browse/MDEV-12297 @@ -60,6 +60,12 @@ MARIADB_CONF_OPTS += -DCMAKE_CROSSCOMPILING=1 # Explicitly disable dtrace to avoid detection of a host version MARIADB_CONF_OPTS += -DENABLE_DTRACE=0 +ifeq ($(BR2_PACKAGE_LIBRESSL),y) +MARIADB_CONF_OPTS += \ + -DLIBRESSL_RESULT=ON \ + -DLIBRESSL_RESULT__TRYRUN_OUTPUT="LibreSSL $(LIBRESSL_VERSION)" +endif + ifeq ($(BR2_PACKAGE_MARIADB_SERVER),y) ifeq ($(BR2_PACKAGE_MARIADB_SERVER_EMBEDDED),y) MARIADB_CONF_OPTS += -DWITH_EMBEDDED_SERVER=ON @@ -76,6 +82,10 @@ ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) MARIADB_CXXFLAGS += -latomic endif +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_68485),y) +MARIADB_CXXFLAGS += -O0 +endif + MARIADB_CONF_OPTS += \ -DCMAKE_CXX_FLAGS="$(MARIADB_CXXFLAGS)" \ -DINSTALL_DOCDIR=share/doc/mariadb-$(MARIADB_VERSION) \ diff --git a/package/matchbox-common/matchbox-common.hash b/package/matchbox-common/matchbox-common.hash index b4aa42a15e9..683354b8a35 100644 --- a/package/matchbox-common/matchbox-common.hash +++ b/package/matchbox-common/matchbox-common.hash @@ -1,4 +1,4 @@ # From http://downloads.yoctoproject.org/releases/matchbox/matchbox-common/0.9/matchbox-common-0.9.1.tar.bz2.md5 -md5 8e8ba0ee170a9ac78fdc583b00ccf76b matchbox-common-0.9.1.tar.bz2 +md5 8e8ba0ee170a9ac78fdc583b00ccf76b matchbox-common-0.9.1.tar.bz2 # Locally computed sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/matchbox-desktop/matchbox-desktop.hash b/package/matchbox-desktop/matchbox-desktop.hash index 0673e8e10f9..61e8b8636e1 100644 --- a/package/matchbox-desktop/matchbox-desktop.hash +++ b/package/matchbox-desktop/matchbox-desktop.hash @@ -1,4 +1,4 @@ # From http://downloads.yoctoproject.org/releases/matchbox/matchbox-desktop/0.9/matchbox-desktop-0.9.1.tar.bz2.md5 -md5 3335a30b1a1aacfb39f23b505254765c matchbox-desktop-0.9.1.tar.bz2 +md5 3335a30b1a1aacfb39f23b505254765c matchbox-desktop-0.9.1.tar.bz2 # Locally computed sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/matchbox-keyboard/Config.in b/package/matchbox-keyboard/Config.in index b6753f3bec5..3d7a9d203c0 100644 --- a/package/matchbox-keyboard/Config.in +++ b/package/matchbox-keyboard/Config.in @@ -1,6 +1,8 @@ config BR2_PACKAGE_MATCHBOX_KEYBOARD bool "matchbox-keyboard" + select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_XLIB_LIBXTST + select BR2_PACKAGE_XLIB_LIBXRENDER select BR2_PACKAGE_XLIB_LIBXFT if !BR2_PACKAGE_CAIRO select BR2_PACKAGE_MATCHBOX_FAKEKEY select BR2_PACKAGE_MATCHBOX_LIB diff --git a/package/matchbox-keyboard/matchbox-keyboard.hash b/package/matchbox-keyboard/matchbox-keyboard.hash index c65fbecff4c..43ace650a46 100644 --- a/package/matchbox-keyboard/matchbox-keyboard.hash +++ b/package/matchbox-keyboard/matchbox-keyboard.hash @@ -1,4 +1,4 @@ -# From http://downloads.yoctoproject.org/releases/matchbox/matchbox-keyboard/0.1/matchbox-keyboard-0.1.tar.bz2.md5 -md5 50940321d59fee23b38a4941100abf25 matchbox-keyboard-0.1.tar.bz2 # Locally computed -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING +sha256 44fc6dc6075090d6f8e43f8667cf8a85bed59b7221a5ee81843454c66e352790 matchbox-keyboard-0.1.1.tar.bz2 +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING +sha256 bba6fd8976fa5c669ddc1378a3d8d49a74263d4d39efb9a90cefb3583a813ecc applet/applet.c diff --git a/package/matchbox-keyboard/matchbox-keyboard.mk b/package/matchbox-keyboard/matchbox-keyboard.mk index 23ab5ad7e55..a1e3c615433 100644 --- a/package/matchbox-keyboard/matchbox-keyboard.mk +++ b/package/matchbox-keyboard/matchbox-keyboard.mk @@ -4,15 +4,16 @@ # ################################################################################ -MATCHBOX_KEYBOARD_VERSION = 0.1 +MATCHBOX_KEYBOARD_VERSION = 0.1.1 MATCHBOX_KEYBOARD_SOURCE = matchbox-keyboard-$(MATCHBOX_KEYBOARD_VERSION).tar.bz2 -MATCHBOX_KEYBOARD_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-keyboard/$(MATCHBOX_KEYBOARD_VERSION) -MATCHBOX_KEYBOARD_LICENSE = GPL-2.0+ -MATCHBOX_KEYBOARD_LICENSE_FILES = COPYING -MATCHBOX_KEYBOARD_DEPENDENCIES = host-pkgconf matchbox-lib matchbox-fakekey expat - -# Workaround bug in configure script -MATCHBOX_KEYBOARD_CONF_ENV = expat=yes +MATCHBOX_KEYBOARD_SITE = \ + http://git.yoctoproject.org/cgit/cgit.cgi/matchbox-keyboard/snapshot +MATCHBOX_KEYBOARD_LICENSE = LGPL-2.1, GPL-2.0+ (applet.c) +MATCHBOX_KEYBOARD_LICENSE_FILES = COPYING applet/applet.c +MATCHBOX_KEYBOARD_DEPENDENCIES = \ + host-pkgconf matchbox-lib matchbox-fakekey expat libpng xlib_libXrender +# From git +MATCHBOX_KEYBOARD_AUTORECONF = YES define MATCHBOX_KEYBOARD_POST_INSTALL_FIXES $(INSTALL) -D -m 0755 package/matchbox-keyboard/mb-applet-kbd-wrapper.sh \ @@ -29,4 +30,11 @@ MATCHBOX_KEYBOARD_CONF_OPTS += --disable-cairo MATCHBOX_KEYBOARD_DEPENDENCIES += xlib_libXft endif +ifeq ($(BR2_PACKAGE_LIBGTK3),y) +MATCHBOX_KEYBOARD_CONF_OPTS += --enable-gtk3-im +MATCHBOX_KEYBOARD_DEPENDENCIES += libgtk3 +else +MATCHBOX_KEYBOARD_CONF_OPTS += --disable-gtk3-im +endif + $(eval $(autotools-package)) diff --git a/package/matchbox-panel/matchbox-panel.hash b/package/matchbox-panel/matchbox-panel.hash index 5e72b9ec8fc..9b4f985b2c6 100644 --- a/package/matchbox-panel/matchbox-panel.hash +++ b/package/matchbox-panel/matchbox-panel.hash @@ -1,4 +1,4 @@ # From http://downloads.yoctoproject.org/releases/matchbox/matchbox-panel/0.9/matchbox-panel-0.9.3.tar.bz2.md5 -md5 56d1807636f3919e22e51896ab7ccd2e matchbox-panel-0.9.3.tar.bz2 +md5 56d1807636f3919e22e51896ab7ccd2e matchbox-panel-0.9.3.tar.bz2 # Locally computed sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/matchbox-startup-monitor/matchbox-startup-monitor.hash b/package/matchbox-startup-monitor/matchbox-startup-monitor.hash index c1b5098e929..ec312a62986 100644 --- a/package/matchbox-startup-monitor/matchbox-startup-monitor.hash +++ b/package/matchbox-startup-monitor/matchbox-startup-monitor.hash @@ -1,4 +1,4 @@ # From http://downloads.yoctoproject.org/releases/matchbox/mb-applet-startup-monitor/0.1/mb-applet-startup-monitor-0.1.tar.bz2.md5 -md5 ea4b3c1ebee3f731b77a2d4bf8e9aa3c mb-applet-startup-monitor-0.1.tar.bz2 +md5 ea4b3c1ebee3f731b77a2d4bf8e9aa3c mb-applet-startup-monitor-0.1.tar.bz2 # Locally computed sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/matchbox-startup-monitor/matchbox-startup-monitor.mk b/package/matchbox-startup-monitor/matchbox-startup-monitor.mk index c80e75332c1..cd2ae4162f2 100644 --- a/package/matchbox-startup-monitor/matchbox-startup-monitor.mk +++ b/package/matchbox-startup-monitor/matchbox-startup-monitor.mk @@ -11,4 +11,9 @@ MATCHBOX_STARTUP_MONITOR_LICENSE = GPL-2.0+ MATCHBOX_STARTUP_MONITOR_LICENSE_FILES = COPYING MATCHBOX_STARTUP_MONITOR_DEPENDENCIES = matchbox-lib startup-notification +# Obsolete constructs in the archaic configure.ac generated an outworn +# configure script that incorrectly searches a C++ compiler. Regenerate +# the autoconf machinery to avoid failures without a C++ compiler. +MATCHBOX_STARTUP_MONITOR_AUTORECONF = YES + $(eval $(autotools-package)) diff --git a/package/matio/matio.hash b/package/matio/matio.hash index 4dd05dee072..94e0e48f690 100644 --- a/package/matio/matio.hash +++ b/package/matio/matio.hash @@ -1,4 +1,4 @@ -# From https://sourceforge.net/projects/matio/files/matio/1.5.21/ -sha512 b00bcad807e6a7e10afa656eb77a0e3e9fb08d9cecc3e94ba41ef91ce60367d6686e6d387a874bbb83eb2f895d4a97caac554a70e7f5f6f5cb750052702d411c matio-1.5.21.tar.gz +# From https://sourceforge.net/projects/matio/files/matio/1.5.23/ +sha512 e125278dcb25695affb7c576d0e2a86c0eff4225aa866b81536c9e4d7b2aea2c554f5389e96d534a8b559f5554b6cbecff4b44fe8915173cd64b2da6d1dc2629 matio-1.5.23.tar.gz # Locally computed -sha256 69143d4a8f1933022bb909327df1ce812dd2420ed57949812dd8f370856bf2a1 COPYING +sha256 3ed9a50d754fcc92d4accb8448e397eafeab686796b2a7445557ce782806e239 COPYING diff --git a/package/matio/matio.mk b/package/matio/matio.mk index 236466d4d9a..2ba9c8f5689 100644 --- a/package/matio/matio.mk +++ b/package/matio/matio.mk @@ -4,7 +4,7 @@ # ################################################################################ -MATIO_VERSION = 1.5.21 +MATIO_VERSION = 1.5.23 MATIO_SITE = http://downloads.sourceforge.net/project/matio/matio/$(MATIO_VERSION) MATIO_LICENSE = BSD-2-Clause MATIO_LICENSE_FILES = COPYING @@ -15,6 +15,14 @@ MATIO_INSTALL_STAGING = YES # va_copy() 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 MATIO_CONF_OPTS = --disable-mat73 --enable-extended-sparse diff --git a/package/mbedtls/0001-bn_mul.h-fix-x86-PIC-inline-ASM-compilation-with-GCC.patch b/package/mbedtls/0001-bn_mul.h-fix-x86-PIC-inline-ASM-compilation-with-GCC.patch deleted file mode 100644 index 60bf53f6e43..00000000000 --- a/package/mbedtls/0001-bn_mul.h-fix-x86-PIC-inline-ASM-compilation-with-GCC.patch +++ /dev/null @@ -1,74 +0,0 @@ -From a0ae2ba37ca479c6edddec8634b25686be965e0d Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Mon, 27 Aug 2018 22:50:57 +0200 -Subject: [PATCH] bn_mul.h: fix x86 PIC inline ASM compilation with GCC < 5 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes #1910 - -With ebx added to the MULADDC_STOP clobber list to fix #1550, the inline -assembly fails to build with GCC < 5 in PIC mode with the following error: - -include/mbedtls/bn_mul.h:46:13: error: PIC register clobbered by ‘ebx’ in ‘asm’ - -This is because older GCC versions treated the x86 ebx register (which is -used for the GOT) as a fixed reserved register when building as PIC. - -This is fixed by an improved register allocator in GCC 5+. From the release -notes: - -Register allocation improvements: Reuse of the PIC hard register, instead of -using a fixed register, was implemented on x86/x86-64 targets. This -improves generated PIC code performance as more hard registers can be used. - -https://www.gnu.org/software/gcc/gcc-5/changes.html - -As a workaround, detect this situation and disable the inline assembly, -similar to the MULADDC_CANNOT_USE_R7 logic. - -Signed-off-by: Peter Korsgaard -Upstream: https://github.com/ARMmbed/mbedtls/pull/1986 ---- - include/mbedtls/bn_mul.h | 18 +++++++++++++++++- - 1 file changed, 17 insertions(+), 1 deletion(-) - -diff --git a/include/mbedtls/bn_mul.h b/include/mbedtls/bn_mul.h -index b587317d9..74a2d29be 100644 ---- a/include/mbedtls/bn_mul.h -+++ b/include/mbedtls/bn_mul.h -@@ -50,13 +50,29 @@ - #if defined(__GNUC__) && \ - ( !defined(__ARMCC_VERSION) || __ARMCC_VERSION >= 6000000 ) - -+/* -+ * GCC < 5.0 treated the x86 ebx (which is used for the GOT) as a -+ * fixed reserved register when building as PIC, leading to errors -+ * like: bn_mul.h:46:13: error: PIC register clobbered by ‘ebx’ in ‘asm’ -+ * -+ * This is fixed by an improved register allocator in GCC 5+. From the -+ * release notes: -+ * Register allocation improvements: Reuse of the PIC hard register, -+ * instead of using a fixed register, was implemented on x86/x86-64 -+ * targets. This improves generated PIC code performance as more hard -+ * registers can be used. -+ */ -+#if defined(__GNUC__) && __GNUC__ < 5 && defined(__PIC__) -+#define MULADDC_CANNOT_USE_EBX -+#endif -+ - /* - * Disable use of the i386 assembly code below if option -O0, to disable all - * compiler optimisations, is passed, detected with __OPTIMIZE__ - * This is done as the number of registers used in the assembly code doesn't - * work with the -O0 option. - */ --#if defined(__i386__) && defined(__OPTIMIZE__) -+#if defined(__i386__) && defined(__OPTIMIZE__) && !defined(MULADDC_CANNOT_USE_EBX) - - #define MULADDC_INIT \ - asm( \ --- -2.11.0 - diff --git a/package/mbedtls/Config.in b/package/mbedtls/Config.in index a39ba65d981..abbe3356d84 100644 --- a/package/mbedtls/Config.in +++ b/package/mbedtls/Config.in @@ -29,4 +29,10 @@ config BR2_PACKAGE_MBEDTLS_COMPRESSION sure CRIME and similar attacks are not applicable to your particular situation. +config BR2_PACKAGE_MBEDTLS_DTLS_SRTP + bool "enable DTLS-SRTP support" + help + Enable support for negotiation of DTLS-SRTP (RFC 5764) + through the use_srtp extension. + endif diff --git a/package/mbedtls/mbedtls.hash b/package/mbedtls/mbedtls.hash index 80ae173aff4..876cd7b77e4 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.0: -sha256 6519579b836ed78cc549375c7c18b111df5717e86ca0eeff4cb64b2674f424cc mbedtls-2.28.0.tar.gz +# From https://github.com/ARMmbed/mbedtls/releases/tag/v2.28.2: +sha256 bc55232bf71fd66045122ba9050a29ea7cb2e8f99b064a9e6334a82f715881a0 mbedtls-2.28.2.tar.gz # Locally calculated sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/mbedtls/mbedtls.mk b/package/mbedtls/mbedtls.mk index 8745ff33f40..7a605ac5b1c 100644 --- a/package/mbedtls/mbedtls.mk +++ b/package/mbedtls/mbedtls.mk @@ -4,7 +4,7 @@ # ################################################################################ -MBEDTLS_VERSION = 2.28.0 +MBEDTLS_VERSION = 2.28.2 MBEDTLS_SITE = $(call github,ARMmbed,mbedtls,v$(MBEDTLS_VERSION)) MBEDTLS_CONF_OPTS = \ -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -std=c99" \ @@ -25,7 +25,7 @@ define MBEDTLS_ENABLE_THREADING $(SED) "s://#define MBEDTLS_THREADING_PTHREAD:#define MBEDTLS_THREADING_PTHREAD:" \ $(@D)/include/mbedtls/config.h endef -MBEDTLS_POST_PATCH_HOOKS += MBEDTLS_ENABLE_THREADING +MBEDTLS_PRE_CONFIGURE_HOOKS += MBEDTLS_ENABLE_THREADING ifeq ($(BR2_STATIC_LIBS),y) MBEDTLS_CONF_OPTS += -DLINK_WITH_PTHREAD=ON endif @@ -49,7 +49,7 @@ define MBEDTLS_ENABLE_ZLIB $(SED) "s://#define MBEDTLS_ZLIB_SUPPORT:#define MBEDTLS_ZLIB_SUPPORT:" \ $(@D)/include/mbedtls/config.h endef -MBEDTLS_POST_PATCH_HOOKS += MBEDTLS_ENABLE_ZLIB +MBEDTLS_PRE_CONFIGURE_HOOKS += MBEDTLS_ENABLE_ZLIB else MBEDTLS_CONF_OPTS += -DENABLE_ZLIB_SUPPORT=OFF endif @@ -72,4 +72,12 @@ else ifeq ($(BR2_microblaze)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6),y) MBEDTLS_POST_CONFIGURE_HOOKS += MBEDTLS_DISABLE_ASM 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 +endef +MBEDTLS_PRE_CONFIGURE_HOOKS += MBEDTLS_ENABLE_DTLS_SRTP +endif + $(eval $(cmake-package)) diff --git a/package/mbpfan/mbpfan.hash b/package/mbpfan/mbpfan.hash index eafd313b4ea..9195692d520 100644 --- a/package/mbpfan/mbpfan.hash +++ b/package/mbpfan/mbpfan.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 52a3a79d99f775fe90917a0958e527ea14ff5b83d010164bd91f7cc3ce046b6a mbpfan-2.2.1.tar.gz +sha256 f690e9302da4cf97e582606614d91e1ee4ac495a4939aec7c0b3468c8988eb67 mbpfan-2.3.0.tar.gz sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 COPYING diff --git a/package/mbpfan/mbpfan.mk b/package/mbpfan/mbpfan.mk index 2455b0a4cad..52d823cbdc6 100644 --- a/package/mbpfan/mbpfan.mk +++ b/package/mbpfan/mbpfan.mk @@ -4,7 +4,7 @@ # ################################################################################ -MBPFAN_VERSION = 2.2.1 +MBPFAN_VERSION = 2.3.0 MBPFAN_SITE = $(call github,linux-on-mac,mbpfan,v$(MBPFAN_VERSION)) MBPFAN_LICENSE = GPL-3.0+ MBPFAN_LICENSE_FILES = COPYING diff --git a/package/mbuffer/mbuffer.hash b/package/mbuffer/mbuffer.hash index bab568d1d89..8f7b8dd07be 100644 --- a/package/mbuffer/mbuffer.hash +++ b/package/mbuffer/mbuffer.hash @@ -1,8 +1,8 @@ # From http://www.maier-komor.de/mbuffer.html -md5 b6787260112e3ac416c0febdb097caa8 mbuffer-20211018.tgz +md5 90e183efeec2812e2413e97b65600acc mbuffer-20220418.tgz # Locally computed after checking signature upstream -sha256 e240c1e4e4ac14c28be8c660ec47d44ce16b1e8ec92aa907ad13004ffd5db6e3 mbuffer-20211018.tgz +sha256 6e5801f9f5ff11445d1d03028b5a03cd08af5408697b7f94c427833228a300c7 mbuffer-20220418.tgz # Hash for license file sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE diff --git a/package/mbuffer/mbuffer.mk b/package/mbuffer/mbuffer.mk index bbf27579f1f..6381d97e8a2 100644 --- a/package/mbuffer/mbuffer.mk +++ b/package/mbuffer/mbuffer.mk @@ -4,7 +4,7 @@ # ################################################################################ -MBUFFER_VERSION = 20211018 +MBUFFER_VERSION = 20220418 MBUFFER_SOURCE = mbuffer-$(MBUFFER_VERSION).tgz MBUFFER_SITE = http://www.maier-komor.de/software/mbuffer MBUFFER_LICENSE = GPL-3.0+ diff --git a/package/mbw/0001-CMakeLists.txt-fix-build-without-C.patch b/package/mbw/0001-CMakeLists.txt-fix-build-without-C.patch new file mode 100644 index 00000000000..2c2585ebe25 --- /dev/null +++ b/package/mbw/0001-CMakeLists.txt-fix-build-without-C.patch @@ -0,0 +1,38 @@ +From 059f67459912bba6d7f605b7c43519ff547f3a80 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 7 Aug 2022 11:34:19 +0200 +Subject: [PATCH] CMakeLists.txt: fix build without C++ + +Fix the following build failure without C++: + +CMake Error at CMakeLists.txt:3 (project): + No CMAKE_CXX_COMPILER could be found. + + Tell CMake where to find the compiler by setting either the environment + variable "CXX" or the CMake cache entry CMAKE_CXX_COMPILER to the full path + to the compiler, or to the compiler name if it is in the PATH. + +Fixes: + - http://autobuild.buildroot.org/results/17e2d6e6d6ddf7845a37a8bbf733faf40d9faa61 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/raas/mbw/pull/14] +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d3d4fcd..3b2cb3e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,6 +1,6 @@ + cmake_minimum_required(VERSION 3.10) + +-project(mbw VERSION 1.5) ++project(mbw VERSION 1.5 LANGUAGES C) + + add_executable(mbw mbw.c) + install(TARGETS mbw DESTINATION bin) +-- +2.35.1 + diff --git a/package/mbw/Config.in b/package/mbw/Config.in new file mode 100644 index 00000000000..e4f56c83879 --- /dev/null +++ b/package/mbw/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_MBW + bool "mbw" + help + MBW is a memory bandwidth benchmarking tool. + MBW determines the "copy" memory bandwidth available + to userspace programs. + + https://github.com/raas/mbw diff --git a/package/mbw/mbw.hash b/package/mbw/mbw.hash new file mode 100644 index 00000000000..74e38992de0 --- /dev/null +++ b/package/mbw/mbw.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 3c396ce09bb78c895e4d45e99b1ae07f80e3ea5eee59d78ed2048a7f2ae591ae mbw-1.5.tar.gz +sha256 1afb2b8258506742238b9ceb8a865d7030c5889c56ba2911a0c0c042aa1335d1 mbw.spec diff --git a/package/mbw/mbw.mk b/package/mbw/mbw.mk new file mode 100644 index 00000000000..755a9f52933 --- /dev/null +++ b/package/mbw/mbw.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# mbw +# +################################################################################ + +MBW_VERSION = 1.5 +MBW_SITE = $(call github,raas,mbw,v$(MBW_VERSION)) +MBW_LICENSE = LGPL-2.1 +MBW_LICENSE_FILES = mbw.spec + +$(eval $(cmake-package)) diff --git a/package/mc/mc.hash b/package/mc/mc.hash index 6400f64b995..b0381474ffd 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.27.sha256 -sha256 31be59225ffa9920816e9a8b3be0ab225a16d19e4faf46890f25bdffa02a4ff4 mc-4.8.27.tar.xz +# Hash from http://ftp.midnight-commander.org/mc-4.8.28.sha256 +sha256 e994d9be9a7172e9ac4a4ad62107921f6aa312e668b056dfe5b8bcebbaf53803 mc-4.8.28.tar.xz # sha256 locally computed: sha256 5576bbec76296e1c8e081f7037ebd01bdada388635f58d844a2f20d37bbe4284 COPYING diff --git a/package/mc/mc.mk b/package/mc/mc.mk index 678d687bcff..3858d628867 100644 --- a/package/mc/mc.mk +++ b/package/mc/mc.mk @@ -4,13 +4,15 @@ # ################################################################################ -MC_VERSION = 4.8.27 +MC_VERSION = 4.8.28 MC_SOURCE = mc-$(MC_VERSION).tar.xz MC_SITE = http://ftp.midnight-commander.org MC_LICENSE = GPL-3.0+ MC_LICENSE_FILES = COPYING MC_DEPENDENCIES = libglib2 host-pkgconf $(TARGET_NLS_DEPENDENCIES) -MC_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) +MC_CONF_ENV = \ + CFLAGS="$(TARGET_CFLAGS) -std=c99" \ + LIBS=$(TARGET_NLS_LIBS) ifeq ($(BR2_PACKAGE_GPM),y) MC_CONF_OPTS += --with-gpm-mouse diff --git a/package/mcelog/mcelog.hash b/package/mcelog/mcelog.hash index 598aa648fd9..23fd4e50f38 100644 --- a/package/mcelog/mcelog.hash +++ b/package/mcelog/mcelog.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e9c82b565da06673c2630f9e6bc668634ad7d2c7f13c70db1900cce110ae62dc mcelog-180.tar.gz +sha256 b3b2616acde7afba4752d4dc447a2c2ad5a75da65e7496e0da30f8f8d2015cfa mcelog-191.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/mcelog/mcelog.mk b/package/mcelog/mcelog.mk index da7785ca913..9f7194e376e 100644 --- a/package/mcelog/mcelog.mk +++ b/package/mcelog/mcelog.mk @@ -4,18 +4,19 @@ # ################################################################################ -MCELOG_VERSION = 180 +MCELOG_VERSION = 191 MCELOG_SITE = $(call github,andikleen,mcelog,v$(MCELOG_VERSION)) MCELOG_LICENSE = GPL-2.0 MCELOG_LICENSE_FILES = LICENSE MCELOG_SELINUX_MODULES = mcelog define MCELOG_BUILD_CMDS + echo "$(MCELOG_VERSION)" > $(@D)/.os_version $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) all endef define MCELOG_INSTALL_TARGET_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) DESTDIR=$(TARGET_DIR) install + $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) DESTDIR=$(TARGET_DIR) install-nodoc endef define MCELOG_INSTALL_INIT_SYSTEMD diff --git a/package/mdadm/mdadm.mk b/package/mdadm/mdadm.mk index 0a2eb4e5bd3..ef518cd2387 100644 --- a/package/mdadm/mdadm.mk +++ b/package/mdadm/mdadm.mk @@ -9,6 +9,7 @@ MDADM_SOURCE = mdadm-$(MDADM_VERSION).tar.xz MDADM_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/raid/mdadm MDADM_LICENSE = GPL-2.0+ MDADM_LICENSE_FILES = COPYING +MDADM_CPE_ID_VENDOR = mdadm_project MDADM_CXFLAGS = $(TARGET_CFLAGS) @@ -21,12 +22,15 @@ MDADM_BUILD_OPTS = \ CPPFLAGS="$(TARGET_CPPFLAGS) -DBINDIR=\\\"/sbin\\\"" \ CHECK_RUN_DIR=0 +MDADM_INSTALL_TARGET_OPTS = install-bin + ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) MDADM_BUILD_OPTS += USE_PTHREADS= endif ifeq ($(BR2_PACKAGE_HAS_UDEV),y) MDADM_DEPENDENCIES += udev +MDADM_INSTALL_TARGET_OPTS += install-udev else MDADM_CXFLAGS += -DNO_LIBUDEV endif @@ -36,7 +40,7 @@ define MDADM_BUILD_CMDS endef define MDADM_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install-bin + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) $(MDADM_INSTALL_TARGET_OPTS) endef $(eval $(generic-package)) diff --git a/package/mdevd/mdevd.hash b/package/mdevd/mdevd.hash index 93950304bef..dea2f149784 100644 --- a/package/mdevd/mdevd.hash +++ b/package/mdevd/mdevd.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 ffd3b223b4cf0e51253b4a8f09cb88d70bf22693228ab0818af174a3f099dcd2 mdevd-0.1.4.0.tar.gz -sha256 31b60c66aba1fa0a7f8847339ac35c28638e25ff96da700d995533ad810e3995 COPYING +sha256 33cf2b118634538fd24f302b30f52cc8aa28ea68b414916ce482b54a4ee57283 mdevd-0.1.6.0.tar.gz +sha256 7fe938b5e0fec18848955ca8081c532e24ae77310beb730b301e1f77bad3d390 COPYING diff --git a/package/mdevd/mdevd.mk b/package/mdevd/mdevd.mk index a0cd71e76e2..9997cb5275e 100644 --- a/package/mdevd/mdevd.mk +++ b/package/mdevd/mdevd.mk @@ -4,7 +4,7 @@ # ################################################################################ -MDEVD_VERSION = 0.1.4.0 +MDEVD_VERSION = 0.1.6.0 MDEVD_SITE = http://skarnet.org/software/mdevd MDEVD_LICENSE = ISC MDEVD_LICENSE_FILES = COPYING diff --git a/package/mdio-tools/Config.in b/package/mdio-tools/Config.in new file mode 100644 index 00000000000..790c9c534a8 --- /dev/null +++ b/package/mdio-tools/Config.in @@ -0,0 +1,19 @@ +comment "mdio-tools needs a Linux kernel to be built" + depends on BR2_USE_MMU + depends on !BR2_LINUX_KERNEL + +comment "mdio-tools needs a toolchain w/ headers >= 5.1" + depends on BR2_USE_MMU + depends on BR2_LINUX_KERNEL + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1 + +config BR2_PACKAGE_MDIO_TOOLS + bool "mdio-tools" + depends on BR2_USE_MMU # fork() + depends on BR2_LINUX_KERNEL + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1 + select BR2_PACKAGE_LIBMNL + help + Low-level debug tools for MDIO devices. + + https://github.com/wkz/mdio-tools diff --git a/package/mdio-tools/mdio-tools.hash b/package/mdio-tools/mdio-tools.hash new file mode 100644 index 00000000000..0111165f273 --- /dev/null +++ b/package/mdio-tools/mdio-tools.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 c5e17431c62392f6c1da1ba4fb0a6f5918521509a377af74485851f93ff2a106 mdio-tools-1.2.0.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/mdio-tools/mdio-tools.mk b/package/mdio-tools/mdio-tools.mk new file mode 100644 index 00000000000..c4be54142e5 --- /dev/null +++ b/package/mdio-tools/mdio-tools.mk @@ -0,0 +1,21 @@ +################################################################################ +# +# mdio-tools +# +################################################################################ + +MDIO_TOOLS_VERSION = 1.2.0 +MDIO_TOOLS_SITE = https://github.com/wkz/mdio-tools/releases/download/$(MDIO_TOOLS_VERSION) +MDIO_TOOLS_LICENSE = GPL-2.0 +MDIO_TOOLS_LICENSE_FILES = COPYING +MDIO_TOOLS_DEPENDENCIES = host-pkgconf libmnl + +MDIO_TOOLS_MODULE_SUBDIRS = kernel + +define MDIO_TOOLS_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_NET) + $(call KCONFIG_ENABLE_OPT,CONFIG_MDIO_DEVICE) +endef + +$(eval $(kernel-module)) +$(eval $(autotools-package)) diff --git a/package/mediastreamer/Config.in b/package/mediastreamer/Config.in index 471d8ad91a1..e776b60df3a 100644 --- a/package/mediastreamer/Config.in +++ b/package/mediastreamer/Config.in @@ -5,6 +5,8 @@ config BR2_PACKAGE_MEDIASTREAMER 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 diff --git a/package/mediastreamer/mediastreamer.mk b/package/mediastreamer/mediastreamer.mk index 5d66a09880a..febbb7b3430 100644 --- a/package/mediastreamer/mediastreamer.mk +++ b/package/mediastreamer/mediastreamer.mk @@ -22,7 +22,7 @@ MEDIASTREAMER_CONF_OPTS = \ -DENABLE_UNIT_TESTS=OFF \ -DENABLE_ZRTP=OFF -ifeq ($(BR2_PACKAGE_ALSA_LIB_MIXER)$(BR2_PACKAGE_ALSA_LIB_PCM),yy) +ifeq ($(BR2_PACKAGE_ALSA_LIB),y) MEDIASTREAMER_CONF_OPTS += \ -DENABLE_ALSA=ON \ -DENABLE_SOUND=ON diff --git a/package/memcached/0002-check-for-sys-auxv.h.patch b/package/memcached/0002-check-for-sys-auxv.h.patch new file mode 100644 index 00000000000..a7d0dfdd001 --- /dev/null +++ b/package/memcached/0002-check-for-sys-auxv.h.patch @@ -0,0 +1,50 @@ +From 58b6de2135c10b64918f25c48f69f144d08a9c0d Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 3 Jun 2022 19:10:15 +0200 +Subject: [PATCH] check for sys/auxv.h + +Check for sys/auxv.h to avoid the following uclibc build failure on +aarch64: + +crc32c.c:277:10: fatal error: sys/auxv.h: No such file or directory + 277 | #include + | ^~~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/08591fbf9677ff126492c50c15170c641bcab56a + +Signed-off-by: Fabrice Fontaine +[Upstream status: not sent yet] +--- + configure.ac | 1 + + crc32c.c | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 0985f07..3337fe7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -516,6 +516,7 @@ AH_BOTTOM([#ifdef HAVE_INTTYPES_H + #include + #endif + ]) ++AC_CHECK_HEADERS([sys/auxv.h]) + + dnl ********************************************************************** + dnl Figure out if this system has the stupid sasl_callback_ft +diff --git a/crc32c.c b/crc32c.c +index 26df879..05e61ff 100644 +--- a/crc32c.c ++++ b/crc32c.c +@@ -273,7 +273,7 @@ void crc32c_init(void) { + } + + #elif defined(__aarch64__) && (defined(__linux__) || defined(__APPLE__)) +-#if defined(__linux__) ++#if defined(__linux__) && defined(HAVE_SYS_AUX_H) + #include + #elif defined(__APPLE__) + #include +-- +2.35.1 + diff --git a/package/memcached/0003-configure.ac-add-disable-werror.patch b/package/memcached/0003-configure.ac-add-disable-werror.patch new file mode 100644 index 00000000000..dab9b8835dc --- /dev/null +++ b/package/memcached/0003-configure.ac-add-disable-werror.patch @@ -0,0 +1,65 @@ +From 8497f7ed38146378a988bc22800b3a5eba38b0fd Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 13 Jun 2022 16:29:38 +0200 +Subject: [PATCH] configure.ac: add --disable-werror + +Allow the user to disable -Werror to avoid the following build failure: + +In file included from hash.c:7: +xxhash.h:2667:5: error: #warning is a GCC extension [-Werror] + 2667 | # warning "XXH3 is highly inefficient without ARM or Thumb-2." + | ^~~~~~~ +xxhash.h:2667:5: error: #warning "XXH3 is highly inefficient without ARM or Thumb-2." [-Werror=cpp] + +Fixes: + - http://autobuild.buildroot.org/results/3124bae73c207f1a118e57e41e222ef464ccb297 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/memcached/memcached/pull/926] +--- + configure.ac | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 3337fe7..7683b8f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -114,6 +114,9 @@ AC_ARG_ENABLE(static, + AC_ARG_ENABLE(unix_socket, + [AS_HELP_STRING([--disable-unix-socket], [Disable unix domain socket])]) + ++AC_ARG_ENABLE(werror, ++ [AS_HELP_STRING([--disable-werror], [Disable -Werror])]) ++ + dnl ********************************************************************** + dnl DETECT_SASL_CB_GETCONF + dnl +@@ -783,6 +786,10 @@ AM_CONDITIONAL([BUILD_SPECIFICATIONS], + [test "x$enable_docs" != "xno" -a "x$XML2RFC" != "xno" -a "x$XSLTPROC" != "xno"]) + + ++if test "x$enable_werror" != "xno"; then ++ CFLAGS="$CFLAGS -Werror" ++fi ++ + dnl Let the compiler be a bit more picky. Please note that you cannot + dnl specify these flags to the compiler before AC_CHECK_FUNCS, because + dnl the test program will generate a compilation warning and hence fail +@@ -790,12 +797,12 @@ dnl to detect the function ;-) + if test "$ICC" = "yes" + then + dnl ICC trying to be gcc. +- CFLAGS="$CFLAGS -diag-disable 187 -Wall -Werror" ++ CFLAGS="$CFLAGS -diag-disable 187 -Wall" + AC_DEFINE([_GNU_SOURCE],[1],[make sure IOV_MAX is defined]) + elif test "$GCC" = "yes" + then + GCC_VERSION=`$CC -dumpversion` +- CFLAGS="$CFLAGS -Wall -Werror -pedantic -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls" ++ CFLAGS="$CFLAGS -Wall -pedantic -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls" + if test "x$enable_asan" = "xyes"; then + CFLAGS="$CFLAGS -fsanitize=address" + fi +-- +2.35.1 + diff --git a/package/memcached/memcached.hash b/package/memcached/memcached.hash index 22c794d07b4..78875dde662 100644 --- a/package/memcached/memcached.hash +++ b/package/memcached/memcached.hash @@ -1,6 +1,6 @@ -# From http://www.memcached.org/files/memcached-1.6.12.tar.gz.sha1 -sha1 40d43e98f149e13e6c81eee813e6734f23413a01 memcached-1.6.12.tar.gz +# From http://www.memcached.org/files/memcached-1.6.17.tar.gz.sha1 +sha1 e25639473e15f1bd9516b915fb7e03ab8209030f memcached-1.6.17.tar.gz # Locally computed -sha256 f291a35f82ef9756ed1d952879ef5f4be870f932bdfcb2ab61356609abf82346 memcached-1.6.12.tar.gz +sha256 2055e373613d8fc21529aff9f0adce3e23b9ce01ba0478d30e7941d9f2bd1224 memcached-1.6.17.tar.gz sha256 bc887c4ad8051fe690ace9528fe37a2e0bb362e6d963331d82e845ca9b585a0c COPYING diff --git a/package/memcached/memcached.mk b/package/memcached/memcached.mk index 8f3506f9d46..7183da6c14e 100644 --- a/package/memcached/memcached.mk +++ b/package/memcached/memcached.mk @@ -4,15 +4,17 @@ # ################################################################################ -MEMCACHED_VERSION = 1.6.12 +MEMCACHED_VERSION = 1.6.17 MEMCACHED_SITE = http://www.memcached.org/files MEMCACHED_DEPENDENCIES = libevent MEMCACHED_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' -MEMCACHED_CONF_OPTS = --disable-coverage +MEMCACHED_CONF_OPTS = --disable-coverage --disable-werror MEMCACHED_LICENSE = BSD-3-Clause MEMCACHED_LICENSE_FILES = COPYING MEMCACHED_CPE_ID_VENDOR = memcached MEMCACHED_SELINUX_MODULES = memcached +# We're patching configure.ac +MEMCACHED_AUTORECONF = YES ifeq ($(BR2_ENDIAN),"BIG") MEMCACHED_CONF_ENV += ac_cv_c_endian=big @@ -20,4 +22,15 @@ else MEMCACHED_CONF_ENV += ac_cv_c_endian=little endif +ifeq ($(BR2_PACKAGE_OPENSSL),y) +MEMCACHED_CONF_OPTS += --enable-tls +MEMCACHED_DEPENDENCIES += host-pkgconf openssl +else +MEMCACHED_CONF_OPTS += --disable-tls +endif + +ifeq ($(BR2_STATIC_LIBS),) +MEMCACHED_CONF_OPTS += --disable-static +endif + $(eval $(autotools-package)) diff --git a/package/memstat/memstat.hash b/package/memstat/memstat.hash index 9a30e342fb5..6aa2c54359f 100644 --- a/package/memstat/memstat.hash +++ b/package/memstat/memstat.hash @@ -1,4 +1,4 @@ # From http://sourceforge.net/projects/memstattool/files/ -sha1 26071dbc30a2796c0503c7d8060a548ca36f8df9 memstat_1.0.tar.gz +sha1 26071dbc30a2796c0503c7d8060a548ca36f8df9 memstat_1.0.tar.gz # Locally computed sha256 5e5db2a2fab637bbbc5d2400141fcb9f1b4b55540d025c2dc54378dc497cb524 debian/copyright diff --git a/package/memtester/memtester.hash b/package/memtester/memtester.hash index 7d7820e746a..6e5d156ffd9 100644 --- a/package/memtester/memtester.hash +++ b/package/memtester/memtester.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8ed52b0d06d4aeb61954994146e2a5b2d20448a8f3ce3ee995120e6dbde2ae37 memtester-4.5.0.tar.gz +sha256 1c5fc2382576c084b314cfd334d127a66c20bd63892cac9f445bc1d8b4ca5a47 memtester-4.5.1.tar.gz sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING diff --git a/package/memtester/memtester.mk b/package/memtester/memtester.mk index ec515f63927..347a158b741 100644 --- a/package/memtester/memtester.mk +++ b/package/memtester/memtester.mk @@ -4,7 +4,7 @@ # ################################################################################ -MEMTESTER_VERSION = 4.5.0 +MEMTESTER_VERSION = 4.5.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 27f18862bc0..8262e26bf0f 100644 --- a/package/mender-artifact/mender-artifact.hash +++ b/package/mender-artifact/mender-artifact.hash @@ -1,6 +1,6 @@ # Locally computed: -sha256 c46c305616cf53e65b786862addf04d97c388e451f11478886967b494c4ce5d9 mender-artifact-3.6.1.tar.gz -sha256 ac23df36801aea6a28685b60a742f68f99d357e0d9973d5c36aa2e72599d8e2a LIC_FILES_CHKSUM.sha256 +sha256 d3ed68d8637195ff35de97b12c8fa148cebffb1ee0fd0d43909ec1643c0c296a mender-artifact-3.8.0.tar.gz +sha256 b8462a14975e30fb0dff14ed50e7563e833ccce13c2aa93f95386ffe877ed673 LIC_FILES_CHKSUM.sha256 # License hash extracted from LIC_FILES_CHKSUM.sha256 using the # following command: @@ -8,9 +8,21 @@ sha256 ac23df36801aea6a28685b60a742f68f99d357e0d9973d5c36aa2e72599d8e2a LIC_FI # sed '/^[A-Za-z0-9_]/s/^/sha256 /' LIC_FILES_CHKSUM.sha256 # Apache 2.0 licenses. -sha256 b4acfcfa2a0ba1a8c82ec3965fbcee886cff8394ca4214e0ddac0a36beb1e05a LICENSE +sha256 1033348db7606a7e61b6484f293847cf8d7a35766efebb97e304d4bd5d7f3f6b LICENSE sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 vendor/github.com/minio/sha256-simd/LICENSE sha256 8f5d89b47d7a05a199b77b7e0f362dad391d451ebda4ef48ba11c50c071564c7 vendor/github.com/mendersoftware/progressbar/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 vendor/google.golang.org/genproto/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 vendor/google.golang.org/grpc/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 vendor/google.golang.org/appengine/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 vendor/cloud.google.com/go/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 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd vendor/go.opencensus.io/LICENSE +sha256 73ba74dfaa520b49a401b5d21459a8523a146f3b7518a833eea5efa85130bf68 vendor/github.com/golang/groupcache/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 vendor/gopkg.in/square/go-jose.v2/LICENSE +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 vendor/github.com/oklog/run/LICENSE + # # BSD 2 Clause licenses. sha256 8d427fd87bc9579ea368fde3d49f9ca22eac857f91a9dec7e3004bdfab7dee86 vendor/github.com/pkg/errors/LICENSE @@ -18,10 +30,23 @@ sha256 8d427fd87bc9579ea368fde3d49f9ca22eac857f91a9dec7e3004bdfab7dee86 vendor # BSD 3 Clause licenses. sha256 2eb550be6801c1ea434feba53bf6d12e7c71c90253e0a9de4a4f46cf88b56477 vendor/github.com/pmezard/go-difflib/LICENSE sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/sys/LICENSE -sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/crypto/LICENSE -sha256 a284e538f3e5649ae6a8f32da2bbd18e9daabf2c1ebbfb99ed92e797b159be1a vendor/github.com/remyoudompheng/go-liblzma/LICENSE -sha256 16f848582e4b276a7392cd34496b7a33d6f65c0e190c163ff3a056a7c61219ce vendor/github.com/klauspost/compress/LICENSE +sha256 87640bc4df2ceb1559f268a3db1ba859ab780f7ba5b1b4545173d4680a3d918b vendor/github.com/remyoudompheng/go-liblzma/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 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 f69f157b0be75da373605dbc8bbf142e8924ee82d8f44f11bcaf351335bf98cf vendor/github.com/golang/snappy/LICENSE +sha256 dd26a7abddd02e2d0aba97805b31f248ef7835d9e10da289b22e3b8ab78b324d vendor/gopkg.in/square/go-jose.v2/json/LICENSE +sha256 6a358d2540ca14048f02d366f23787c0a480157e58f058113f0e27168dd4e447 vendor/github.com/pierrec/lz4/LICENSE # # ISC licenses. sha256 1b93a317849ee09d3d7e4f1d20c2b78ddb230b4becb12d7c224c927b9d470251 vendor/github.com/davecgh/go-spew/LICENSE @@ -35,3 +60,36 @@ sha256 a55959c4e3e8917bfa857359bb641115336276a6cc97408fd8197e079fb18470 vendor sha256 c8024e31c1de453fea90f22a221968835cc7af9d520274a2576c9ec9976055b0 vendor/github.com/shurcooL/sanitized_anchor_name/LICENSE sha256 d18f6323b71b0b768bb5e9616e36da390fbd39369a81807cca352de4e4e6aa0b vendor/gopkg.in/yaml.v3/LICENSE sha256 08eab1118c80885fa1fa6a6dd7303f65a379fcb3733e063d20d1bbc2c76e6fa1 vendor/github.com/mattn/go-isatty/LICENSE +sha256 5d966570d7a442d4e969892860a914e542c97f262c873baee8f0aa48e1f40212 vendor/github.com/klauspost/cpuid/v2/LICENSE +sha256 edbb5a4d165ac69376c765b551c0662ff42bea87e1f1eda85f42ac90c34b09d0 vendor/go.uber.org/atomic/LICENSE.txt +sha256 22adc4abdece712a737573672f082fd61ac2b21df878efb87ffcff4354a07f26 vendor/github.com/mitchellh/go-homedir/LICENSE +sha256 f48b778b7fccb6650f915cf4527c941a9578f8876a2911d035c4e44641a916be vendor/github.com/mitchellh/go-testing-interface/LICENSE +sha256 22adc4abdece712a737573672f082fd61ac2b21df878efb87ffcff4354a07f26 vendor/github.com/mitchellh/mapstructure/LICENSE +sha256 3c377fad2e5ae1d7081c7c2f16da867a87cca1d1f5f1aa7ed0b8a16bb553142a vendor/github.com/mitchellh/copystructure/LICENSE +sha256 22adc4abdece712a737573672f082fd61ac2b21df878efb87ffcff4354a07f26 vendor/github.com/mitchellh/reflectwalk/LICENSE +sha256 38049e50b486f5394e40b786388f4a006401996e46c7c1cd18925afe7c3b4e34 vendor/github.com/ryanuber/go-glob/LICENSE +sha256 88a2379b3ca34bf5c57127aff9dcb802bbb60ece0805cdbda65b3bd115f971d9 vendor/github.com/mattn/go-colorable/LICENSE +sha256 de95ed802d2f90e3c72cb3c9a927cca5f2aec234a3ef1250232db0f8178b2d93 vendor/github.com/fatih/color/LICENSE.md +sha256 831892cd31b9eef0311bb1de9014527ef5d3592eed7add1f9f829510d2065e62 vendor/github.com/armon/go-radix/LICENSE +sha256 d0bb61dd59b6d59021893751bdd1205ee88c8206dcabd6b4c68d35b94ee19750 vendor/github.com/armon/go-metrics/LICENSE +sha256 5c0476add4c38b55d0ed5ac11b85e00c38f26e1caee20dfe3ab58190103d1fbc vendor/github.com/cenkalti/backoff/v3/LICENSE +sha256 b8ce983c0e0b1410115d42b65d5471b3666a8d4f4334a52f29f457a39a71b463 vendor/github.com/hashicorp/go-hclog/LICENSE +# +# MPL-2.0 licenses. +sha256 60222c28c1a7f6a92c7df98e5c5f4459e624e6e285e0b9b94467af5f6ab3343d vendor/github.com/hashicorp/go-secure-stdlib/strutil/LICENSE +sha256 60222c28c1a7f6a92c7df98e5c5f4459e624e6e285e0b9b94467af5f6ab3343d vendor/github.com/hashicorp/go-secure-stdlib/parseutil/LICENSE +sha256 bef1747eda88b9ed46e94830b0d978c3499dad5dfe38d364971760881901dadd vendor/github.com/hashicorp/errwrap/LICENSE +sha256 bef1747eda88b9ed46e94830b0d978c3499dad5dfe38d364971760881901dadd vendor/github.com/hashicorp/hcl/LICENSE +sha256 60222c28c1a7f6a92c7df98e5c5f4459e624e6e285e0b9b94467af5f6ab3343d vendor/github.com/hashicorp/go-cleanhttp/LICENSE +sha256 bef1747eda88b9ed46e94830b0d978c3499dad5dfe38d364971760881901dadd vendor/github.com/hashicorp/go-version/LICENSE +sha256 60222c28c1a7f6a92c7df98e5c5f4459e624e6e285e0b9b94467af5f6ab3343d vendor/github.com/hashicorp/go-rootcerts/LICENSE +sha256 60222c28c1a7f6a92c7df98e5c5f4459e624e6e285e0b9b94467af5f6ab3343d vendor/github.com/hashicorp/go-retryablehttp/LICENSE +sha256 60222c28c1a7f6a92c7df98e5c5f4459e624e6e285e0b9b94467af5f6ab3343d vendor/github.com/hashicorp/go-uuid/LICENSE +sha256 a830016911a348a54e89bd54f2f8b0d8fffdeac20aecfba8e36ebbf38a03f5ff vendor/github.com/hashicorp/go-plugin/LICENSE +sha256 1f256ecad192880510e84ad60474eab7589218784b9a50bc7ceee34c2b91f1d5 vendor/github.com/hashicorp/go-sockaddr/LICENSE +sha256 60222c28c1a7f6a92c7df98e5c5f4459e624e6e285e0b9b94467af5f6ab3343d vendor/github.com/hashicorp/vault/sdk/LICENSE +sha256 60222c28c1a7f6a92c7df98e5c5f4459e624e6e285e0b9b94467af5f6ab3343d vendor/github.com/hashicorp/vault/api/LICENSE +sha256 812e9d96e900a093ae4d1d3f22c5f82f568a0a0461c3007a99d00573d41c5461 vendor/github.com/hashicorp/yamux/LICENSE +sha256 60222c28c1a7f6a92c7df98e5c5f4459e624e6e285e0b9b94467af5f6ab3343d vendor/github.com/hashicorp/go-immutable-radix/LICENSE +sha256 a830016911a348a54e89bd54f2f8b0d8fffdeac20aecfba8e36ebbf38a03f5ff vendor/github.com/hashicorp/go-multierror/LICENSE +sha256 af175b9d96ee93c21a036152e1b905b0b95304d4ae8c2c921c7609100ba8df7e vendor/github.com/hashicorp/golang-lru/LICENSE diff --git a/package/mender-artifact/mender-artifact.mk b/package/mender-artifact/mender-artifact.mk index 34d0cd9469f..6ade624a23c 100644 --- a/package/mender-artifact/mender-artifact.mk +++ b/package/mender-artifact/mender-artifact.mk @@ -4,21 +4,45 @@ # ################################################################################ -HOST_MENDER_ARTIFACT_VERSION = 3.6.1 +HOST_MENDER_ARTIFACT_VERSION = 3.8.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 +HOST_MENDER_ARTIFACT_LICENSE = Apache2.0, BSD-2-Clause, BSD-3-Clause, ISC, MIT, MPL-2.0 HOST_MENDER_ARTIFACT_LICENSE_FILES = \ LICENSE \ LIC_FILES_CHKSUM.sha256 \ vendor/github.com/minio/sha256-simd/LICENSE \ vendor/github.com/mendersoftware/progressbar/LICENSE \ + vendor/google.golang.org/genproto/LICENSE \ + vendor/google.golang.org/grpc/LICENSE \ + vendor/google.golang.org/appengine/LICENSE \ + vendor/cloud.google.com/go/LICENSE \ + vendor/cloud.google.com/go/kms/LICENSE \ + vendor/cloud.google.com/go/iam/LICENSE \ + vendor/cloud.google.com/go/compute/LICENSE \ + vendor/go.opencensus.io/LICENSE \ + vendor/github.com/golang/groupcache/LICENSE \ + vendor/gopkg.in/square/go-jose.v2/LICENSE \ + vendor/github.com/oklog/run/LICENSE \ vendor/github.com/pkg/errors/LICENSE \ vendor/github.com/pmezard/go-difflib/LICENSE \ vendor/golang.org/x/sys/LICENSE \ - vendor/golang.org/x/crypto/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/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/github.com/golang/snappy/LICENSE \ + vendor/gopkg.in/square/go-jose.v2/json/LICENSE \ + vendor/github.com/pierrec/lz4/LICENSE \ vendor/github.com/davecgh/go-spew/LICENSE \ vendor/github.com/stretchr/testify/LICENSE \ vendor/github.com/urfave/cli/LICENSE \ @@ -27,18 +51,41 @@ HOST_MENDER_ARTIFACT_LICENSE_FILES = \ vendor/github.com/cpuguy83/go-md2man/v2/LICENSE.md \ vendor/github.com/shurcooL/sanitized_anchor_name/LICENSE \ vendor/gopkg.in/yaml.v3/LICENSE \ - vendor/github.com/mattn/go-isatty/LICENSE + vendor/github.com/mattn/go-isatty/LICENSE \ + vendor/github.com/klauspost/cpuid/v2/LICENSE \ + vendor/go.uber.org/atomic/LICENSE.txt \ + vendor/github.com/mitchellh/go-homedir/LICENSE \ + vendor/github.com/mitchellh/go-testing-interface/LICENSE \ + vendor/github.com/mitchellh/mapstructure/LICENSE \ + vendor/github.com/mitchellh/copystructure/LICENSE \ + vendor/github.com/mitchellh/reflectwalk/LICENSE \ + vendor/github.com/ryanuber/go-glob/LICENSE \ + vendor/github.com/mattn/go-colorable/LICENSE \ + vendor/github.com/fatih/color/LICENSE.md \ + vendor/github.com/armon/go-radix/LICENSE \ + vendor/github.com/armon/go-metrics/LICENSE \ + vendor/github.com/cenkalti/backoff/v3/LICENSE \ + vendor/github.com/hashicorp/go-hclog/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 \ + vendor/github.com/hashicorp/hcl/LICENSE \ + vendor/github.com/hashicorp/go-cleanhttp/LICENSE \ + vendor/github.com/hashicorp/go-version/LICENSE \ + vendor/github.com/hashicorp/go-rootcerts/LICENSE \ + vendor/github.com/hashicorp/go-retryablehttp/LICENSE \ + vendor/github.com/hashicorp/go-uuid/LICENSE \ + vendor/github.com/hashicorp/go-plugin/LICENSE \ + vendor/github.com/hashicorp/go-sockaddr/LICENSE \ + vendor/github.com/hashicorp/vault/sdk/LICENSE \ + vendor/github.com/hashicorp/vault/api/LICENSE \ + vendor/github.com/hashicorp/yamux/LICENSE \ + vendor/github.com/hashicorp/go-immutable-radix/LICENSE \ + vendor/github.com/hashicorp/go-multierror/LICENSE \ + vendor/github.com/hashicorp/golang-lru/LICENSE HOST_MENDER_ARTIFACT_DEPENDENCIES = host-xz -# By default, go will attempt to download needed modules before building, which -# is not desirable. This behavior also causes permission issues when cleaning, -# as go downloads modules as read-only by default. Because mender-artifact -# includes the modules in the vendor directory, mod=vendor prevents the package -# from downloading the go modules during the build process and prevents -# permission issues when cleaning. -HOST_MENDER_ARTIFACT_GO_ENV = GOFLAGS="-mod=vendor" - HOST_MENDER_ARTIFACT_LDFLAGS = -X github.com/mendersoftware/mender-artifact/cli.Version=$(HOST_MENDER_ARTIFACT_VERSION) HOST_MENDER_ARTIFACT_BIN_NAME = mender-artifact diff --git a/package/mender-connect/Config.in b/package/mender-connect/Config.in new file mode 100644 index 00000000000..0845910880b --- /dev/null +++ b/package/mender-connect/Config.in @@ -0,0 +1,33 @@ +config BR2_PACKAGE_MENDER_CONNECT + bool "mender-connect" + 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 # libglib2, mender + depends on BR2_USE_WCHAR # libglib2 -> gettext + depends on BR2_USE_MMU # dbus -> fork() + select BR2_PACKAGE_DBUS # runtime + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_MENDER # runtime + select BR2_PACKAGE_OPENSSL + help + mender-connect is a daemon responsible for handling + bidirectional (websocket) communication with the Mender + server. The daemon is responsible for implementing a range of + troubleshooting features to the device as well as several + enhancement to the mender-client. + + Mender Connect is loosely coupled with the Mender Client. The + main information passed between mender-client and + mender-connect is the device authorization status. Since only + accepted devices can interact with the Mender Server, the + Mender Client passes over DBus the authorization token which + Mender Connect uses to establish a Websocket connection to the + server. + + https://github.com/mendersoftware/mender-connect + +comment "mender-connect needs a toolchain w/ threads, wchar" + 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_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR diff --git a/package/mender-connect/S43mender-connect b/package/mender-connect/S43mender-connect new file mode 100644 index 00000000000..4cc21510c4d --- /dev/null +++ b/package/mender-connect/S43mender-connect @@ -0,0 +1,53 @@ +#!/bin/sh +DAEMON="mender-connect" +DAEMON_PATH="/usr/bin/mender-connect" +PIDFILE="/var/run/${DAEMON}.pid" + +MENDER_CONNECT_ARGS="" + +# shellcheck source=/dev/null +[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" + +start() { + printf 'Starting %s: ' "${DAEMON}" + umask 077 + # shellcheck disable=SC2086 # we need the word splitting + start-stop-daemon -bmSqp "$PIDFILE" -x ${DAEMON_PATH} \ + -- -daemon ${DAEMON_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 +} + +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/mender-connect/mender-connect.hash b/package/mender-connect/mender-connect.hash new file mode 100644 index 00000000000..da4ec5fbbdb --- /dev/null +++ b/package/mender-connect/mender-connect.hash @@ -0,0 +1,34 @@ +# Locally computed: +sha256 96b81bb4c72eb8c1756febb94101c0dea5a6d4884591824e61a5f2509cd9ca9b mender-connect-2.1.0.tar.gz +sha256 78b3954421ec6499c3f9735b96d52288574ae80c747416a52548d7f526f26e8c LIC_FILES_CHKSUM.sha256 + +# Vendor licenses +# Generated with sed '/^[A-Za-z0-9_]/s/^/sha256 /' LIC_FILES_CHKSUM.sha256 + +# +# Apache-2.0 +sha256 1033348db7606a7e61b6484f293847cf8d7a35766efebb97e304d4bd5d7f3f6b LICENSE +sha256 3eb823230e5d112e1bd032ccc82ae765cf676d0d6d46a1a1daa2d658b3005b67 vendor/github.com/mendersoftware/go-lib-micro/LICENSE +# +# BSD-2-Clause +sha256 2be1b548b0387ca8948e1bb9434e709126904d15f622cc2d0d8e7f186e4d122d vendor/github.com/gorilla/websocket/LICENSE +sha256 8d427fd87bc9579ea368fde3d49f9ca22eac857f91a9dec7e3004bdfab7dee86 vendor/github.com/pkg/errors/LICENSE +sha256 1530185dd39cdde7cb2f786a7a5fcf8bc34368b6ae73c15e72bafe88fd80b9a2 vendor/github.com/vmihailenco/msgpack/v5/LICENSE +sha256 0f02aac22084ef463aa5f42f566feeec6aa4c99653519744a8c25cb079da5b5d vendor/github.com/vmihailenco/tagparser/v2/LICENSE +# +# BSD-3-Clause +sha256 2eb550be6801c1ea434feba53bf6d12e7c71c90253e0a9de4a4f46cf88b56477 vendor/github.com/pmezard/go-difflib/LICENSE +sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/sys/LICENSE +# +# ISC +sha256 1b93a317849ee09d3d7e4f1d20c2b78ddb230b4becb12d7c224c927b9d470251 vendor/github.com/davecgh/go-spew/LICENSE +# +# MIT +sha256 a2a1cea59d9c2d71908082f516f86bb560abf857646ecf69d70c121ead14aef4 vendor/github.com/creack/pty/LICENSE +sha256 caa932df46551b53643952fe03b351d55db97be73b5393b986dcf6b05d3c416a vendor/github.com/go-ozzo/ozzo-validation/v4/LICENSE +sha256 92a328e1d5f3269b42e2ce32b4494eafdb3132f204a911c5c95cf3d8465490e4 vendor/github.com/satori/go.uuid/LICENSE +sha256 51a0c9ec7f8b7634181b8d4c03e5b5d204ac21d6e72f46c313973424664b2e6b vendor/github.com/sirupsen/logrus/LICENSE +sha256 b2663894033a05fd80261176cd8da1d72546e25842d5c1abcc852ca23b6b61b0 vendor/github.com/stretchr/objx/LICENSE +sha256 f8e536c1c7b695810427095dc85f5f80d44ff7c10535e8a9486cf393e2599189 vendor/github.com/stretchr/testify/LICENSE +sha256 da277af11b85227490377fbcac6afccc68be560c4fff36ac05ca62de55345fd7 vendor/github.com/urfave/cli/v2/LICENSE +sha256 d18f6323b71b0b768bb5e9616e36da390fbd39369a81807cca352de4e4e6aa0b vendor/gopkg.in/yaml.v3/LICENSE diff --git a/package/mender-connect/mender-connect.mk b/package/mender-connect/mender-connect.mk new file mode 100644 index 00000000000..36ddd5f7db9 --- /dev/null +++ b/package/mender-connect/mender-connect.mk @@ -0,0 +1,59 @@ +################################################################################ +# +# mender-connect +# +################################################################################ + +MENDER_CONNECT_VERSION = 2.1.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 + +# Vendor license paths generated with: +# awk '{print $2}' LIC_FILES_CHKSUM.sha256 | grep vendor +MENDER_CONNECT_LICENSE_FILES = \ + LIC_FILES_CHKSUM.sha256 \ + LICENSE \ + vendor/github.com/mendersoftware/go-lib-micro/LICENSE \ + vendor/github.com/gorilla/websocket/LICENSE \ + vendor/github.com/pkg/errors/LICENSE \ + vendor/github.com/vmihailenco/msgpack/v5/LICENSE \ + vendor/github.com/vmihailenco/tagparser/v2/LICENSE \ + vendor/github.com/pmezard/go-difflib/LICENSE \ + vendor/golang.org/x/sys/LICENSE \ + vendor/github.com/davecgh/go-spew/LICENSE \ + vendor/github.com/creack/pty/LICENSE \ + vendor/github.com/go-ozzo/ozzo-validation/v4/LICENSE \ + vendor/github.com/satori/go.uuid/LICENSE \ + vendor/github.com/sirupsen/logrus/LICENSE \ + vendor/github.com/stretchr/objx/LICENSE \ + vendor/github.com/stretchr/testify/LICENSE \ + vendor/github.com/urfave/cli/v2/LICENSE \ + vendor/gopkg.in/yaml.v3/LICENSE + +MENDER_CONNECT_DEPENDENCIES = \ + dbus \ + libglib2 \ + mender \ + openssl + +MENDER_CONNECT_LDFLAGS = -X github.com/mendersoftware/mender-connect/config.Version=$(MENDER_CONNECT_VERSION) + +define MENDER_CONNECT_INSTALL_CONFIG_FILES + $(INSTALL) -d -m 755 $(TARGET_DIR)/etc/mender + + $(INSTALL) -D -m 0644 $(@D)/examples/mender-connect.conf \ + $(TARGET_DIR)/etc/mender/mender-connect.conf +endef +MENDER_CONNECT_POST_INSTALL_TARGET_HOOKS += MENDER_CONNECT_INSTALL_CONFIG_FILES + +define MENDER_CONNECT_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 0644 $(@D)/support/mender-connect.service \ + $(TARGET_DIR)/usr/lib/systemd/system/mender-connect.service +endef + +define MENDER_CONNECT_INSTALL_INIT_SYSV + $(INSTALL) -D -m 0755 $(MENDER_CONNECT_PKGDIR)/S43mender-connect \ + $(TARGET_DIR)/etc/init.d/S43mender-connect +endef + +$(eval $(golang-package)) diff --git a/package/mender-grubenv/mender-grubenv.hash b/package/mender-grubenv/mender-grubenv.hash index fcc4e02cbea..193bff073be 100644 --- a/package/mender-grubenv/mender-grubenv.hash +++ b/package/mender-grubenv/mender-grubenv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 00a574d2bed8d54ba6739700da789a420a02de900df56dd2cfbe0df460a98dca mender-grubenv-1a7db967495bbe8be53b7a69dcb42822f39d9a74.tar.gz -sha256 b4acfcfa2a0ba1a8c82ec3965fbcee886cff8394ca4214e0ddac0a36beb1e05a LICENSE +sha256 b7a08eb3d996afb38c1a4f7c51b7eb44aec6197ff713ce75e4f39d5b448cfc82 mender-grubenv-2ac898f5924d5870f8394ad8ecd3ef1ab1422e3b.tar.gz +sha256 1033348db7606a7e61b6484f293847cf8d7a35766efebb97e304d4bd5d7f3f6b LICENSE diff --git a/package/mender-grubenv/mender-grubenv.mk b/package/mender-grubenv/mender-grubenv.mk index 9d5be8d8f4d..8679ad92367 100644 --- a/package/mender-grubenv/mender-grubenv.mk +++ b/package/mender-grubenv/mender-grubenv.mk @@ -4,7 +4,7 @@ # ################################################################################ -MENDER_GRUBENV_VERSION = 1a7db967495bbe8be53b7a69dcb42822f39d9a74 +MENDER_GRUBENV_VERSION = 2ac898f5924d5870f8394ad8ecd3ef1ab1422e3b MENDER_GRUBENV_SITE = $(call github,mendersoftware,grub-mender-grubenv,$(MENDER_GRUBENV_VERSION)) MENDER_GRUBENV_LICENSE = Apache-2.0 MENDER_GRUBENV_LICENSE_FILES = LICENSE @@ -30,13 +30,15 @@ MENDER_GRUBENV_MODULES_MISSING_PC = \ $(filter-out $(call qstrip,$(BR2_TARGET_GRUB2_BUILTIN_MODULES_PC)),\ $(MENDER_GRUBENV_MANDATORY_MODULES)) -MENDER_GRUBENV_MAKE_ENV += ENV_DIR=/boot/grub +MENDER_GRUBENV_MAKE_ENV += BOOT_DIR=/boot/grub define MENDER_GRUBENV_INSTALL_I386_CFG mkdir -p $(BINARIES_DIR)/boot-part/grub + cp -dpfr $(@D)/mender_grub.cfg \ + $(TARGET_DIR)/boot/grub/grub.cfg cp -dpfr $(TARGET_DIR)/boot/grub/grub.cfg \ - $(TARGET_DIR)/boot/grub/mender_grubenv* \ - $(BINARIES_DIR)/boot-part/grub + $(TARGET_DIR)/boot/grub/grub-mender-grubenv \ + $(BINARIES_DIR)/boot-part/ endef endif # BR2_TARGET_GRUB2_HAS_LEGACY_BOOT @@ -45,13 +47,16 @@ MENDER_GRUBENV_MODULES_MISSING_EFI = \ $(filter-out $(call qstrip,$(BR2_TARGET_GRUB2_BUILTIN_MODULES_EFI)),\ $(MENDER_GRUBENV_MANDATORY_MODULES)) -MENDER_GRUBENV_MAKE_ENV += ENV_DIR=/boot/EFI/BOOT +MENDER_GRUBENV_MAKE_ENV += BOOT_DIR=/boot/EFI/BOOT define MENDER_GRUBENV_INSTALL_EFI_CFG mkdir -p $(BINARIES_DIR)/efi-part/EFI/BOOT + cp -dpfr $(@D)/mender_grub.cfg \ + $(TARGET_DIR)/boot/EFI/BOOT/grub.cfg cp -dpfr $(TARGET_DIR)/boot/EFI/BOOT/grub.cfg \ - $(TARGET_DIR)/boot/EFI/BOOT/mender_grubenv* \ $(BINARIES_DIR)/efi-part/EFI/BOOT + cp -dpfr $(TARGET_DIR)/boot/EFI/BOOT/grub-mender-grubenv \ + $(BINARIES_DIR)/efi-part/ endef endif # BR2_TARGET_GRUB2_HAS_EFI_BOOT @@ -75,7 +80,10 @@ define MENDER_GRUBENV_BUILD_CMDS endef define MENDER_GRUBENV_INSTALL_TARGET_CMDS - $(MENDER_GRUBENV_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install + $(MENDER_GRUBENV_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) \ + install install-boot-env + # The grub-mender-grubenv-* utilities use this file to function. + echo 'ENV_DIR=/boot/grub-mender-grubenv' > $(TARGET_DIR)/etc/mender_grubenv.config endef define MENDER_GRUBENV_INSTALL_IMAGES_CMDS diff --git a/package/mender/Config.in b/package/mender/Config.in index cccb46361bb..7d768cebec6 100644 --- a/package/mender/Config.in +++ b/package/mender/Config.in @@ -4,8 +4,9 @@ config BR2_PACKAGE_MENDER depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_LIBOPENSSL_ENABLE_MD4 if BR2_PACKAGE_LIBOPENSSL - select BR2_PACKAGE_LIBOPENSSL_ENABLE_RMD160 if BR2_PACKAGE_LIBOPENSSL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_MD4 + select BR2_PACKAGE_LIBOPENSSL_ENABLE_RMD160 help Mender is an open source over-the-air (OTA) software updater for embedded Linux devices. Mender comprises a client diff --git a/package/mender/S42mender b/package/mender/S42mender index dc60f94f8bd..0f2077d0890 100644 --- a/package/mender/S42mender +++ b/package/mender/S42mender @@ -2,6 +2,10 @@ # # Starts mender service. # +DAEMON="mender" +DAEMON_PATH="/usr/bin/mender" +PIDFILE="/var/run/${DAEMON}.pid" +DAEMON_ARGS="daemon" start() { # If /var/lib/mender is a symlink to /var/run/mender, and @@ -9,8 +13,7 @@ start() { # 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 \ - -a "$(readlink /var/lib/mender)" = "/var/run/mender" ] + 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 @@ -23,15 +26,16 @@ start() { printf "Starting mender service: " umask 077 - - start-stop-daemon -S -q -b -m -p /var/run/mender.pid \ - --exec /usr/bin/mender -- daemon - [ $? = 0 ] && echo "OK" || echo "FAIL" + start-stop-daemon -bmSqp "$PIDFILE" -x ${DAEMON_PATH} -- ${DAEMON_ARGS} + status=$? + [ "${status}" = 0 ] && echo "OK" || echo "FAIL" } + stop() { printf "Stopping mender service: " - start-stop-daemon -K -q -p /var/run/mender.pid - [ $? = 0 ] && echo "OK" || echo "FAIL" + start-stop-daemon -Kqp "$PIDFILE" + status=$? + [ "${status}" = 0 ] && echo "OK" || echo "FAIL" } restart() { stop @@ -49,7 +53,7 @@ case "$1" in restart ;; *) - echo "Usage: $0 {start|stop|restart}" + echo "Usage: $0 {start|stop|reload|restart}" exit 1 esac diff --git a/package/mender/mender.hash b/package/mender/mender.hash index 40d82f072fa..d563dc534b4 100644 --- a/package/mender/mender.hash +++ b/package/mender/mender.hash @@ -1,12 +1,12 @@ # Locally computed: -sha256 716ba7110dd68cdafc5caa989706ff67bbac0617c284d666aa81605850be5763 3.1.0.tar.gz +sha256 8a149b11b990beb7620b372023eec28df63cee6a1aa4132e88ecef554f080f72 mender-3.4.0.tar.gz # Vendor licenses # Generated with sed '/^[A-Za-z0-9_]/s/^/sha256 /' LIC_FILES_CHKSUM.sha256 # Apache-2.0 license. -sha256 b4acfcfa2a0ba1a8c82ec3965fbcee886cff8394ca4214e0ddac0a36beb1e05a LICENSE -sha256 32714818ad6f98ee0185a52e23a475d89122e3efd2b2c26c733781c28e798c99 vendor/github.com/mendersoftware/mender-artifact/LICENSE +sha256 1033348db7606a7e61b6484f293847cf8d7a35766efebb97e304d4bd5d7f3f6b LICENSE +sha256 1033348db7606a7e61b6484f293847cf8d7a35766efebb97e304d4bd5d7f3f6b 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 @@ -14,26 +14,27 @@ sha256 8f5d89b47d7a05a199b77b7e0f362dad391d451ebda4ef48ba11c50c071564c7 vendor # BSD 2 Clause license. sha256 8d427fd87bc9579ea368fde3d49f9ca22eac857f91a9dec7e3004bdfab7dee86 vendor/github.com/pkg/errors/LICENSE sha256 e4646a82a976369d7ae8f6ed5c11d35dc0af18433a8ccc24c85b459ad8b95128 vendor/github.com/godbus/dbus/LICENSE +sha256 2be1b548b0387ca8948e1bb9434e709126904d15f622cc2d0d8e7f186e4d122d vendor/github.com/gorilla/websocket/LICENSE # # BSD 3 Clause license. -sha256 16f848582e4b276a7392cd34496b7a33d6f65c0e190c163ff3a056a7c61219ce vendor/github.com/klauspost/compress/LICENSE +sha256 0d9e582ee4bff57bf1189c9e514e6da7ce277f9cd3bc2d488b22fbb39a6d87cf vendor/github.com/klauspost/compress/LICENSE sha256 2eb550be6801c1ea434feba53bf6d12e7c71c90253e0a9de4a4f46cf88b56477 vendor/github.com/pmezard/go-difflib/LICENSE -sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/crypto/LICENSE sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/sys/LICENSE sha256 0634b008cee55ca01f0888d2f5aba2d34e66c3f52c31a4e16a5d5d33d0c2a03e vendor/github.com/bmatsuo/lmdb-go/LICENSE.md sha256 87640bc4df2ceb1559f268a3db1ba859ab780f7ba5b1b4545173d4680a3d918b vendor/github.com/remyoudompheng/go-liblzma/LICENSE +sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/term/LICENSE # # ISC license. sha256 1b93a317849ee09d3d7e4f1d20c2b78ddb230b4becb12d7c224c927b9d470251 vendor/github.com/davecgh/go-spew/LICENSE # # MIT license. sha256 6d2de1cde19c4d2bd8bcd9aaa1d581f4cfa3db9cf71896140330eaa2f2687685 vendor/github.com/klauspost/pgzip/LICENSE +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 sha256 ffa15bdce332058a03a1d923910864fb6e58bf6df66a0e3914284725b327183e vendor/github.com/ungerik/go-sysfs/LICENSE sha256 da277af11b85227490377fbcac6afccc68be560c4fff36ac05ca62de55345fd7 vendor/github.com/urfave/cli/v2/LICENSE sha256 b2663894033a05fd80261176cd8da1d72546e25842d5c1abcc852ca23b6b61b0 vendor/github.com/stretchr/objx/LICENSE -sha256 95b8ef9c4137a8f75ddd3101ffdc4cfd594fa875b261697b68baddc16b0e537c vendor/github.com/konsorten/go-windows-terminal-sequences/LICENSE sha256 d18f6323b71b0b768bb5e9616e36da390fbd39369a81807cca352de4e4e6aa0b vendor/gopkg.in/yaml.v3/LICENSE sha256 08eab1118c80885fa1fa6a6dd7303f65a379fcb3733e063d20d1bbc2c76e6fa1 vendor/github.com/mattn/go-isatty/LICENSE # @@ -41,4 +42,4 @@ sha256 08eab1118c80885fa1fa6a6dd7303f65a379fcb3733e063d20d1bbc2c76e6fa1 vendor sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 vendor/github.com/bmatsuo/lmdb-go/LICENSE.mdb.md # sha256 of all the vendor licenses combined -sha256 4f3541ea69b9b6e3959679576c146b42ba9a840a9dc4e593bff43e5e3a313d24 LIC_FILES_CHKSUM.sha256 +sha256 93d9db9b43097b174e362ac8f398aa9a37fcdde2974d0567b62bd6d1e0d22037 LIC_FILES_CHKSUM.sha256 diff --git a/package/mender/mender.mk b/package/mender/mender.mk index ddf3e43be28..724295f7848 100644 --- a/package/mender/mender.mk +++ b/package/mender/mender.mk @@ -4,9 +4,8 @@ # ################################################################################ -MENDER_VERSION = 3.1.0 -MENDER_SITE = https://github.com/mendersoftware/mender/archive -MENDER_SOURCE = $(MENDER_VERSION).tar.gz +MENDER_VERSION = 3.4.0 +MENDER_SITE = $(call github,mendersoftware,mender,$(MENDER_VERSION)) MENDER_LICENSE = Apache-2.0, BSD-2-Clause, BSD-3-Clause, ISC, MIT, OLDAP-2.8 # Vendor license paths generated with: @@ -20,20 +19,21 @@ MENDER_LICENSE_FILES = \ vendor/github.com/mendersoftware/progressbar/LICENSE \ vendor/github.com/pkg/errors/LICENSE \ vendor/github.com/godbus/dbus/LICENSE \ + vendor/github.com/gorilla/websocket/LICENSE \ vendor/github.com/klauspost/compress/LICENSE \ vendor/github.com/pmezard/go-difflib/LICENSE \ - vendor/golang.org/x/crypto/LICENSE \ vendor/golang.org/x/sys/LICENSE \ vendor/github.com/bmatsuo/lmdb-go/LICENSE.md \ vendor/github.com/remyoudompheng/go-liblzma/LICENSE \ + vendor/golang.org/x/term/LICENSE \ vendor/github.com/davecgh/go-spew/LICENSE \ vendor/github.com/klauspost/pgzip/LICENSE \ + vendor/github.com/klauspost/cpuid/v2/LICENSE \ vendor/github.com/sirupsen/logrus/LICENSE \ vendor/github.com/stretchr/testify/LICENSE \ vendor/github.com/ungerik/go-sysfs/LICENSE \ vendor/github.com/urfave/cli/v2/LICENSE \ vendor/github.com/stretchr/objx/LICENSE \ - vendor/github.com/konsorten/go-windows-terminal-sequences/LICENSE \ vendor/gopkg.in/yaml.v3/LICENSE \ vendor/github.com/mattn/go-isatty/LICENSE \ vendor/github.com/bmatsuo/lmdb-go/LICENSE.mdb.md @@ -60,7 +60,7 @@ define MENDER_INSTALL_CONFIG_FILES $(INSTALL) -D -m 0755 $(@D)/support/mender-device-identity \ $(TARGET_DIR)/usr/share/mender/identity/mender-device-identity - $(foreach f,hostinfo network os rootfs-type, \ + $(foreach f,bootloader-integration hostinfo network os rootfs-type, \ $(INSTALL) -D -m 0755 $(@D)/support/mender-inventory-$(f) \ $(TARGET_DIR)/usr/share/mender/inventory/mender-inventory-$(f) ) diff --git a/package/menu-cache/menu-cache.hash b/package/menu-cache/menu-cache.hash index a46a7070caa..f3ced3e8c36 100644 --- a/package/menu-cache/menu-cache.hash +++ b/package/menu-cache/menu-cache.hash @@ -1,6 +1,6 @@ # From https://sourceforge.net/projects/lxde/files/menu-cache/1.1/ -md5 99999a0bca48b980105208760c8fd893 menu-cache-1.1.0.tar.xz -sha1 01e6035aa1fe76d7047bdec235254aa5ce17394a menu-cache-1.1.0.tar.xz +md5 99999a0bca48b980105208760c8fd893 menu-cache-1.1.0.tar.xz +sha1 01e6035aa1fe76d7047bdec235254aa5ce17394a menu-cache-1.1.0.tar.xz # Hash for license file: -sha256 7459fbad62653e4061dbfde3b0cad7c72777838beb10d2d11d969fac6226e7de COPYING +sha256 7459fbad62653e4061dbfde3b0cad7c72777838beb10d2d11d969fac6226e7de COPYING diff --git a/package/mesa3d-demos/0001-demos-makes-opengl-an-optional-component.patch b/package/mesa3d-demos/0001-demos-makes-opengl-an-optional-component.patch index b328fca8101..e51b6f1a2ad 100644 --- a/package/mesa3d-demos/0001-demos-makes-opengl-an-optional-component.patch +++ b/package/mesa3d-demos/0001-demos-makes-opengl-an-optional-component.patch @@ -1,88 +1,101 @@ -From bb0ffae7164d296d32da24fa5499534de259169a Mon Sep 17 00:00:00 2001 -From: Spenser Gilliland -Date: Sat, 24 Feb 2018 11:36:17 +0100 +From 9ec9f7b4d0ef5e799ca4cc5103163e4630d184d8 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Fri, 16 Sep 2022 22:30:59 +0200 Subject: [PATCH] demos: makes opengl an optional component -Signed-off-by: Spenser Gilliland -[Romain: convert to git patch, rebase on 8.4.0] -Signed-off-by: Romain Naour +This patch is a port of [1] for the new meson build system. + +[1]. +https://git.busybox.net/buildroot/tree/package/mesa3d-demos/0001-demos-makes-opengl-an-optional-component.patch?h=2022.08 + +Signed-off-by: Julien Olivain --- - configure.ac | 12 +++++++++++- - src/egl/opengl/Makefile.am | 2 ++ - src/util/Makefile.am | 2 ++ - 3 files changed, 15 insertions(+), 1 deletion(-) + meson.build | 19 ++++++++++++------- + meson_options.txt | 1 + + src/egl/meson.build | 5 ++++- + src/meson.build | 4 +++- + 4 files changed, 20 insertions(+), 9 deletions(-) -diff --git a/configure.ac b/configure.ac -index 0b5e9a76..24298c44 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -51,6 +51,14 @@ m4_ifndef([PKG_PROG_PKG_CONFIG], - ACLOCAL="aclocal -I/other/macro/dir" before running autoreconf.])]) - PKG_PROG_PKG_CONFIG() +diff --git a/meson.build b/meson.build +index e1968fab..a15699d6 100644 +--- a/meson.build ++++ b/meson.build +@@ -38,7 +38,10 @@ add_project_arguments( + dep_m = cc.find_library('m', required : false) + dep_winmm = cc.find_library('winmm', required : false) -+AC_ARG_ENABLE([gl], -+ [AS_HELP_STRING([--enable-gl], -+ [enable GL library @<:@default=no@:>@])], -+ [gl_enabled="$enableval"], -+ [gl_enabled=auto]) -+ -+if test "x$gl_enabled" != "xno"; then -+ - dnl Get the pkg-config definitions for libGL. We include a fallback - dnl path for GL implementation that don't provide a .pc file - PKG_CHECK_MODULES(GL, [gl], [], [ -@@ -112,6 +120,8 @@ PKG_CHECK_MODULES(GLU, [glu], [], - DEMO_CFLAGS="$DEMO_CFLAGS $GLU_CFLAGS" - DEMO_LIBS="$DEMO_LIBS $GLU_LIBS" +-dep_gl = dependency('gl') ++dep_gl = dependency('gl', required : get_option('gl')) ++if not dep_gl.found() ++ add_project_arguments('-DEGL_NO_X11=1', language: 'c') ++endif -+fi -+ - AC_ARG_ENABLE([egl], - [AS_HELP_STRING([--enable-egl], - [enable EGL library @<:@default=auto@:>@])], -@@ -302,7 +312,7 @@ AC_SUBST([MESA_GLAPI]) - AC_SUBST([WAYLAND_CFLAGS]) - AC_SUBST([WAYLAND_LIBS]) + dep_gles1 = dependency('glesv1_cm', required : get_option('gles1')) + dep_gles2 = dependency('glesv2', required : get_option('gles2')) +@@ -75,13 +78,15 @@ endif -- -+AM_CONDITIONAL(HAVE_GL, test "x$gl_enabled" = "xyes") - AM_CONDITIONAL(HAVE_EGL, test "x$egl_enabled" = "xyes") - AM_CONDITIONAL(HAVE_GLESV1, test "x$glesv1_enabled" = "xyes") - AM_CONDITIONAL(HAVE_GLESV2, test "x$glesv2_enabled" = "xyes") -diff --git a/src/egl/opengl/Makefile.am b/src/egl/opengl/Makefile.am -index 6d184ff6..219ab850 100644 ---- a/src/egl/opengl/Makefile.am -+++ b/src/egl/opengl/Makefile.am -@@ -56,6 +56,7 @@ endif - endif + dep_threads = dependency('threads') - if HAVE_EGL -+if HAVE_GL - bin_PROGRAMS = \ - eglinfo - noinst_PROGRAMS = \ -@@ -64,6 +65,7 @@ noinst_PROGRAMS = \ - $(EGL_X11_DEMOS) \ - $(EGL_WL_DEMOS) +-dep_glu = dependency('glu', required : dep_x11.found()) +-if not dep_glu.found() +- _glu_name = 'GLU' +- if host_machine.system() == 'windows' +- _glu_name = 'glu32' ++if dep_gl.found() ++ dep_glu = dependency('glu', required : dep_x11.found()) ++ if not dep_glu.found() ++ _glu_name = 'GLU' ++ if host_machine.system() == 'windows' ++ _glu_name = 'glu32' ++ endif ++ dep_glu = cc.find_library(_glu_name, has_headers: 'GL/glu.h') + endif +- dep_glu = cc.find_library(_glu_name, has_headers: 'GL/glu.h') endif + + # GBM is needed for EGL on KMS +diff --git a/meson_options.txt b/meson_options.txt +index ddadd2e3..f5405698 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -1,5 +1,6 @@ + option('with-glut', type : 'string') + option('egl', type : 'feature') ++option('gl', type : 'feature') + option('gles1', type : 'feature') + option('gles2', type : 'feature') + option('osmesa', type : 'feature') +diff --git a/src/egl/meson.build b/src/egl/meson.build +index d1846921..42bf8ecd 100644 +--- a/src/egl/meson.build ++++ b/src/egl/meson.build +@@ -19,7 +19,10 @@ + # SOFTWARE. + + subdir('eglut') +-subdir('opengl') ++ ++if dep_gl.found() ++ subdir('opengl') +endif - egltri_x11_SOURCES = egltri.c - eglgears_x11_SOURCES = eglgears.c -diff --git a/src/util/Makefile.am b/src/util/Makefile.am -index 759a293a..012b9c75 100644 ---- a/src/util/Makefile.am -+++ b/src/util/Makefile.am -@@ -27,7 +27,9 @@ AM_CFLAGS = \ - AM_LDFLAGS = \ - $(DEMO_LIBS) + if dep_gles1.found() + subdir('opengles1') +diff --git a/src/meson.build b/src/meson.build +index 39cac78d..7607c6de 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -20,7 +20,9 @@ + + subdir('glad') -+if HAVE_GL - noinst_LTLIBRARIES = libutil.la +-subdir('util') ++if dep_gl.found() ++ subdir('util') +endif - if HAVE_GLUT - AM_CFLAGS += \ + if dep_glut.found() + subdir('demos') -- -2.14.3 +2.37.3 diff --git a/package/mesa3d-demos/Config.in b/package/mesa3d-demos/Config.in index b716cf57991..7848bb6faf6 100644 --- a/package/mesa3d-demos/Config.in +++ b/package/mesa3d-demos/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_MESA3D_DEMOS bool "mesa3d-demos" + depends on BR2_INSTALL_LIBSTDCPP depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES \ || BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBOPENVG select BR2_PACKAGE_LIBGLEW if BR2_PACKAGE_XORG7 && BR2_PACKAGE_HAS_LIBGL @@ -10,3 +11,8 @@ config BR2_PACKAGE_MESA3D_DEMOS OpenGL demos from the Mesa 3D project. http://mesa3d.org + +comment "mesa3d-demos needs a toolchain with C++" + depends on !BR2_INSTALL_LIBSTDCPP + depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES \ + || BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBOPENVG diff --git a/package/mesa3d-demos/mesa3d-demos.hash b/package/mesa3d-demos/mesa3d-demos.hash index 8a771df2f82..b0cfb888165 100644 --- a/package/mesa3d-demos/mesa3d-demos.hash +++ b/package/mesa3d-demos/mesa3d-demos.hash @@ -1,5 +1,3 @@ -# From https://lists.freedesktop.org/archives/mesa-dev/2018-February/186542.html -md5 6b65a02622765522176d00f553086fa3 mesa-demos-8.4.0.tar.bz2 -sha1 57ba892e919fa22ce3db9f25e7331a6fa33c652c mesa-demos-8.4.0.tar.bz2 -sha256 01e99c94a0184e63e796728af89bfac559795fb2a0d6f506fa900455ca5fff7d mesa-demos-8.4.0.tar.bz2 -sha512 b72d03cad36e0535ff18dcfb222ec4200064b9264f6da51a6e5f03b0dd912abe188bc1d600b6698de3ce6f63b28d2ce01565886ca8e7079edc4967fbf2fb0957 mesa-demos-8.4.0.tar.bz2 +# From https://lists.freedesktop.org/archives/mesa-announce/2022-May/000677.html +sha256 cea2df0a80f09a30f635c4eb1a672bf90c5ddee0b8e77f4d70041668ef71aac1 mesa-demos-8.5.0.tar.bz2 +sha512 df6a7f09638ca389d6e8bc569e599dcc59c9aa280bcfb95976d83e5cd3edfe74bb3a31f0953956dc16faa540ee5b09990e3377e1341d836fc527e50ace6e60b8 mesa-demos-8.5.0.tar.bz2 diff --git a/package/mesa3d-demos/mesa3d-demos.mk b/package/mesa3d-demos/mesa3d-demos.mk index 6b5262a2e95..5f7fe8e24dc 100644 --- a/package/mesa3d-demos/mesa3d-demos.mk +++ b/package/mesa3d-demos/mesa3d-demos.mk @@ -4,77 +4,69 @@ # ################################################################################ -MESA3D_DEMOS_VERSION = 8.4.0 +MESA3D_DEMOS_VERSION = 8.5.0 MESA3D_DEMOS_SOURCE = mesa-demos-$(MESA3D_DEMOS_VERSION).tar.bz2 -MESA3D_DEMOS_SITE = ftp://ftp.freedesktop.org/pub/mesa/demos -# 0001-demos-makes-opengl-an-optional-component.patch -MESA3D_DEMOS_AUTORECONF = YES +MESA3D_DEMOS_SITE = https://archive.mesa3d.org/demos/$(MESA3D_DEMOS_VERSION) MESA3D_DEMOS_DEPENDENCIES = host-pkgconf MESA3D_DEMOS_LICENSE = MIT MESA3D_DEMOS_CONF_OPTS += \ - --disable-gles1 + -Dgles1=disabled ifeq ($(BR2_PACKAGE_XORG7)$(BR2_PACKAGE_HAS_LIBGL),yy) MESA3D_DEMOS_DEPENDENCIES += libgl libglew libglu xlib_libX11 xlib_libXext -MESA3D_DEMOS_CONF_OPTS += --enable-gl --enable-x11 +MESA3D_DEMOS_CONF_OPTS += -Dgl=enabled -Dx11=enabled else -MESA3D_DEMOS_CONF_OPTS += --disable-gl --disable-x11 +MESA3D_DEMOS_CONF_OPTS += -Dgl=disabled -Dx11=disabled endif ifeq ($(BR2_PACKAGE_HAS_LIBEGL),y) MESA3D_DEMOS_DEPENDENCIES += libegl -MESA3D_DEMOS_CONF_OPTS += --enable-egl +MESA3D_DEMOS_CONF_OPTS += -Degl=enabled else -MESA3D_DEMOS_CONF_OPTS += --disable-egl +MESA3D_DEMOS_CONF_OPTS += -Degl=disabled endif ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y) MESA3D_DEMOS_DEPENDENCIES += libgles -MESA3D_DEMOS_CONF_OPTS += --enable-gles2 +MESA3D_DEMOS_CONF_OPTS += -Dgles2=enabled else -MESA3D_DEMOS_CONF_OPTS += --disable-gles2 +MESA3D_DEMOS_CONF_OPTS += -Dgles2=disabled endif -ifeq ($(BR2_PACKAGE_HAS_LIBOPENVG),y) -MESA3D_DEMOS_DEPENDENCIES += libopenvg -MESA3D_DEMOS_CONF_OPTS += --enable-vg +ifeq ($(BR2_PACKAGE_LIBDRM),y) +MESA3D_DEMOS_DEPENDENCIES += libdrm +MESA3D_DEMOS_CONF_OPTS += -Dlibdrm=enabled else -MESA3D_DEMOS_CONF_OPTS += --disable-vg +MESA3D_DEMOS_CONF_OPTS += -Dlibdrm=disabled endif ifeq ($(BR2_PACKAGE_MESA3D_GBM),y) +# Meson search for gbm, but has no option to enable/disable it. See: +# https://gitlab.freedesktop.org/mesa/demos/-/blob/mesa-demos-8.5.0/meson.build#L88 +# We still add the dependency, if needed, to make sure it will always +# be detected. MESA3D_DEMOS_DEPENDENCIES += mesa3d -MESA3D_DEMOS_CONF_OPTS += --enable-gbm -else -MESA3D_DEMOS_CONF_OPTS += --disable-gbm -endif - -ifeq ($(BR2_PACKAGE_FREETYPE),y) -MESA3D_DEMOS_DEPENDENCIES += freetype -MESA3D_DEMOS_CONF_OPTS += --enable-freetype2 -else -MESA3D_DEMOS_CONF_OPTS += --disable-freetype2 endif ifeq ($(BR2_PACKAGE_LIBFREEGLUT),y) MESA3D_DEMOS_DEPENDENCIES += libfreeglut -MESA3D_DEMOS_CONF_OPTS += --with-glut=$(STAGING_DIR)/usr +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 += --enable-osmesa +MESA3D_DEMOS_CONF_OPTS += -Dosmesa=enabled else -MESA3D_DEMOS_CONF_OPTS += --disable-osmesa +MESA3D_DEMOS_CONF_OPTS += -Dosmesa=disabled endif else -MESA3D_DEMOS_CONF_OPTS += --without-glut --disable-osmesa +MESA3D_DEMOS_CONF_OPTS += -Dosmesa=disabled endif ifeq ($(BR2_PACKAGE_WAYLAND),y) MESA3D_DEMOS_DEPENDENCIES += wayland -MESA3D_DEMOS_CONF_OPTS += --enable-wayland +MESA3D_DEMOS_CONF_OPTS += -Dwayland=enabled else -MESA3D_DEMOS_CONF_OPTS += --disable-wayland +MESA3D_DEMOS_CONF_OPTS += -Dwayland=disabled endif -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 871cf2f4957..9177adceda5 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -6,13 +6,13 @@ # mesa3d-headers is inherently incompatible with mesa3d, so error out # if both are enabled. -ifeq ($(BR2_PACKAGE_MESA3D)$(BR2_PACKAGE_MESA3D_HEADERS),yy) +ifeq ($(BR_BUILDING)$(BR2_PACKAGE_MESA3D)$(BR2_PACKAGE_MESA3D_HEADERS),yyy) $(error mesa3d-headers enabled, but mesa3d enabled too) endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 21.3.5 +MESA3D_HEADERS_VERSION = 22.3.4 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://archive.mesa3d.org MESA3D_HEADERS_DL_SUBDIR = mesa3d @@ -37,14 +37,14 @@ ifeq ($(BR2_PACKAGE_XORG7),y) # contains -i. define MESA3D_HEADERS_BUILD_DRI_PC sed -e 's:@VERSION@:$(MESA3D_HEADERS_VERSION):' \ - package/mesa3d-headers/dri.pc \ - >$(@D)/src/mesa/drivers/dri/dri.pc + $(MESA3D_HEADERS_PKGDIR)/dri.pc \ + >$(@D)/src/gallium/frontends/dri/dri.pc endef define MESA3D_HEADERS_INSTALL_DRI_PC $(INSTALL) -D -m 0644 $(@D)/include/GL/internal/dri_interface.h \ $(STAGING_DIR)/usr/include/GL/internal/dri_interface.h - $(INSTALL) -D -m 0644 $(@D)/src/mesa/drivers/dri/dri.pc \ + $(INSTALL) -D -m 0644 $(@D)/src/gallium/frontends/dri/dri.pc \ $(STAGING_DIR)/usr/lib/pkgconfig/dri.pc endef diff --git a/package/mesa3d/0001-c99_math-import-isinf-for-uclibc-based-toolchains.patch b/package/mesa3d/0001-c99_math-import-isinf-for-uclibc-based-toolchains.patch deleted file mode 100644 index 5acbaa4daab..00000000000 --- a/package/mesa3d/0001-c99_math-import-isinf-for-uclibc-based-toolchains.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 705490763fcc052defa2d49a5c5200775cd12c54 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Wed, 4 Mar 2020 08:27:24 +0100 -Subject: [PATCH] c99_math: import isinf for uclibc based toolchains - -The same fix as for glibc >= 2.23 is needed for uclibc -based toolchains. - -[Upstream suggested: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4042] -Signed-off-by: Peter Seiderer ---- - include/c99_math.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/c99_math.h b/include/c99_math.h -index e906c26aa54..c8a73a2d2c7 100644 ---- a/include/c99_math.h -+++ b/include/c99_math.h -@@ -190,7 +190,7 @@ fpclassify(double x) - * undefines those functions, which in glibc 2.23, are defined as macros rather - * than functions as in glibc 2.22. - */ --#if __cplusplus >= 201103L && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 23)) -+#if __cplusplus >= 201103L && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 23) || defined(__UCLIBC__)) - #include - - using std::fpclassify; --- -2.25.1 - diff --git a/package/mesa3d/0002-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch b/package/mesa3d/0001-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch similarity index 100% rename from package/mesa3d/0002-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch rename to package/mesa3d/0001-meson-Set-proper-value-for-LIBCLC_INCLUDEDIR.patch diff --git a/package/mesa3d/0003-vc4-add-meson-option-to-disable-optional-neon-suppor.patch b/package/mesa3d/0002-vc4-add-meson-option-to-disable-optional-neon-suppor.patch similarity index 100% rename from package/mesa3d/0003-vc4-add-meson-option-to-disable-optional-neon-suppor.patch rename to package/mesa3d/0002-vc4-add-meson-option-to-disable-optional-neon-suppor.patch diff --git a/package/mesa3d/0004-src-util-rand_xor-Include-stddef.h-to-fix-build-erro.patch b/package/mesa3d/0003-src-util-rand_xor-Include-stddef.h-to-fix-build-erro.patch similarity index 100% rename from package/mesa3d/0004-src-util-rand_xor-Include-stddef.h-to-fix-build-erro.patch rename to package/mesa3d/0003-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/0004-Fix-uClibc-build.patch new file mode 100644 index 00000000000..95ca95fd672 --- /dev/null +++ b/package/mesa3d/0004-Fix-uClibc-build.patch @@ -0,0 +1,70 @@ +From 09ce52fe375a6fc1ccf51b6b691aaa2c3f53fbd5 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Fri, 3 Jun 2022 16:26:03 +0200 +Subject: [PATCH] Fix uClibc build +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes build errors with uClibc and gcc-9.3.0: + +../src/gallium/drivers/lima/lima_texture.c:47:15: error: expected + declaration specifiers or ‘...’ before ‘__builtin_offsetof’ + 47 | static_assert(offsetof(lima_tex_desc, va) == 24, + "lima_tex_desc->va offset isn't 24"); + +../src/egl/main/egldisplay.c: In function ‘_eglGetNativePlatformFromEnv’: + ../src/egl/main/egldisplay.c:101:4: error: implicit declaration of + function ‘static_assert’ [-Werror=implicit-function-declaration] 101 | + static_assert(ARRAY_SIZE(egl_platforms) == _EGL_NUM_PLATFORMS, + +../src/util/macros.h:74:4: error: implicit declaration of function + ‘static_assert’ [-Werror=implicit-function-declaration] + 74 | static_assert(cond, #cond); \ + | ^~~~~~~~~~~~~ + +Patch sent upstream: +https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13898 + +Signed-off-by: Bernd Kuhls +--- + src/util/compiler.h | 10 ++++++++++ + src/util/macros.h | 1 + + 2 files changed, 11 insertions(+) + +diff --git a/src/util/compiler.h b/src/util/compiler.h +index d184ad455af..b5c56807acc 100644 +--- a/src/util/compiler.h ++++ b/src/util/compiler.h +@@ -36,6 +36,16 @@ + + #include + ++/* ++ * C11 static_assert() macro ++ * assert.h only defines that name for C11 and above ++ */ ++#if !defined(__cplusplus) ++#ifndef static_assert ++#define static_assert _Static_assert ++#endif ++#endif ++ + #include "util/macros.h" + + +diff --git a/src/util/macros.h b/src/util/macros.h +index 22b18303826..8f73ee72693 100644 +--- a/src/util/macros.h ++++ b/src/util/macros.h +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include "util/compiler.h" + + /* Compute the size of an array */ + #ifndef ARRAY_SIZE +-- +2.34.1 + diff --git a/package/mesa3d/0005-src-util-futex.h-fix-build-on-32-bit-architectures-u.patch b/package/mesa3d/0005-src-util-futex.h-fix-build-on-32-bit-architectures-u.patch deleted file mode 100644 index b01db8a4b48..00000000000 --- a/package/mesa3d/0005-src-util-futex.h-fix-build-on-32-bit-architectures-u.patch +++ /dev/null @@ -1,43 +0,0 @@ -From e501b7c17ada9c694d3f8302622b78d733485b38 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 21 Aug 2021 17:55:33 +0200 -Subject: [PATCH] src/util/futex.h: fix build on 32-bit architectures using - 64-bit time_t - -Fix the following build failure on 32-bit architectures using 64-bit -time_t (e.g. riscv32): - -../src/util/futex.h: In function 'sys_futex': -../src/util/futex.h:39:19: error: 'SYS_futex' undeclared (first use in this function); did you mean 'sys_futex'? - 39 | return syscall(SYS_futex, addr1, op, val1, timeout, addr2, val3); - | ^~~~~~~~~ - | sys_futex - -Fixes: - - http://autobuild.buildroot.org/results/692700a5f967760a0b8cd358b1712f1d5a7b681e - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12496] ---- - src/util/futex.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/util/futex.h b/src/util/futex.h -index 43097f4cd5b..221eda9db0c 100644 ---- a/src/util/futex.h -+++ b/src/util/futex.h -@@ -34,6 +34,10 @@ - #include - #include - -+#ifndef SYS_futex -+#define SYS_futex SYS_futex_time64 -+#endif -+ - static inline long sys_futex(void *addr1, int op, int val1, const struct timespec *timeout, void *addr2, int val3) - { - return syscall(SYS_futex, addr1, op, val1, timeout, addr2, val3); --- -2.32.0 - diff --git a/package/mesa3d/0006-fix-valist.patch b/package/mesa3d/0006-fix-valist.patch deleted file mode 100644 index 84a254cec5b..00000000000 --- a/package/mesa3d/0006-fix-valist.patch +++ /dev/null @@ -1,37 +0,0 @@ -From f6892df8eb115fa712fd69068432b48b028e1e54 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sat, 20 Nov 2021 22:48:54 +0100 -Subject: [PATCH] util/u_printf.h: fix build -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes build error with uClibc and gcc-9.3.0: - -In file included from ../src/util/u_printf.cpp:24: -../src/util/u_printf.h:43:41: error: ‘va_list’ has not been declared - 43 | size_t u_printf_length(const char *fmt, va_list untouched_args); - -Patch sent upstream: -https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13897 - -Signed-off-by: Bernd Kuhls ---- - src/util/u_printf.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/util/u_printf.h b/src/util/u_printf.h -index 44dcce5529f..14f324de10c 100644 ---- a/src/util/u_printf.h -+++ b/src/util/u_printf.h -@@ -25,6 +25,7 @@ - #ifdef __cplusplus - - #include -+#include - - /* find next valid printf specifier in a C++ std::string */ - size_t util_printf_next_spec_pos(const std::string &s, size_t pos); --- -GitLab - diff --git a/package/mesa3d/0006-meson-ensure-i915-Gallium-driver-includes-Intel-sour.patch b/package/mesa3d/0006-meson-ensure-i915-Gallium-driver-includes-Intel-sour.patch new file mode 100644 index 00000000000..6831bdafd36 --- /dev/null +++ b/package/mesa3d/0006-meson-ensure-i915-Gallium-driver-includes-Intel-sour.patch @@ -0,0 +1,46 @@ +From cd861b7f38e448822ce765aee61304d1e0a3a8b5 Mon Sep 17 00:00:00 2001 +From: James Knight +Date: Thu, 13 Apr 2023 16:38:51 -0400 +Subject: meson: ensure i915 Gallium driver includes Intel sources + +Ensure builds flag the use of Intel sources when the i915 Gallium driver +is configured (`-Dgallium-drivers=i915`). Otherwise, a build may fail if +other Intel-based configuration options are not enabled: + + ./src/gallium/winsys/i915/drm/meson.build:21:0: ERROR: Unknown variable "libintel_common". + +Signed-off-by: James Knight +Part-of: + +Upstream: https://gitlab.freedesktop.org/mesa/mesa/-/commit/cd861b7f38e448822ce765aee61304d1e0a3a8b5 + +Signed-off-by: Bernd Kuhls +--- + meson.build | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +(limited to 'meson.build') + +diff --git a/meson.build b/meson.build +index 23d2d965b37..a3e3c5478a8 100644 +--- a/meson.build ++++ b/meson.build +@@ -245,7 +245,14 @@ with_microsoft_vk = _vulkan_drivers.contains('microsoft-experimental') + with_any_vk = _vulkan_drivers.length() != 0 + + with_any_broadcom = with_gallium_vc4 or with_gallium_v3d or with_broadcom_vk +-with_any_intel = with_intel_vk or with_intel_hasvk or with_gallium_iris or with_gallium_crocus or with_intel_tools ++with_any_intel = [ ++ with_gallium_crocus, ++ with_gallium_i915, ++ with_gallium_iris, ++ with_intel_hasvk, ++ with_intel_tools, ++ with_intel_vk, ++].contains(true) + + if with_swrast_vk and not with_gallium_softpipe + error('swrast vulkan requires gallium swrast') +-- +cgit v1.2.1 + diff --git a/package/mesa3d/0007-fix-cpp-detection.patch b/package/mesa3d/0007-fix-cpp-detection.patch deleted file mode 100644 index 2e097277de2..00000000000 --- a/package/mesa3d/0007-fix-cpp-detection.patch +++ /dev/null @@ -1,40 +0,0 @@ -From ab5519971a090863f8c559907766e0b2382e0471 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sat, 20 Nov 2021 23:02:18 +0100 -Subject: [PATCH] c11_compat.h: fix uClibc build -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes build error with uClibc and gcc-9.3.0: - -../src/egl/main/egldisplay.c: In function ‘_eglGetNativePlatformFromEnv’: -../src/egl/main/egldisplay.c:101:4: error: implicit declaration of function ‘static_assert’ [-Werror=implicit-function-declaration] - 101 | static_assert(ARRAY_SIZE(egl_platforms) == _EGL_NUM_PLATFORMS, - -CC: 21.3 - -Patch sent upstream: -https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13898 - -Signed-off-by: Bernd Kuhls ---- - include/c11_compat.h | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/include/c11_compat.h b/include/c11_compat.h -index d35740f47a4..cdcd3f1f52f 100644 ---- a/include/c11_compat.h -+++ b/include/c11_compat.h -@@ -8,8 +8,6 @@ - - #if defined(__cplusplus) - /* This is C++ code, not C */ --#elif (__STDC_VERSION__ >= 201112L) -- /* Already C11 */ - #else - - --- -GitLab - diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index e41da562dcf..e21bbbe3e4a 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -4,7 +4,7 @@ menuconfig BR2_PACKAGE_MESA3D depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_SYNC_1 depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL - depends on !BR2_m68k || BR2_TOOLCHAIN_GCC_AT_LEAST_7 # m68k needs gcc >= 7.x + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 select BR2_PACKAGE_EXPAT select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_WAYLAND_PROTOCOLS if BR2_PACKAGE_WAYLAND @@ -24,19 +24,19 @@ config BR2_PACKAGE_MESA3D_NEEDS_ELFUTILS config BR2_PACKAGE_MESA3D_LLVM bool "llvm support" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::shared_future depends on !BR2_STATIC_LIBS depends on BR2_USE_WCHAR # std::wstring + depends on BR2_HOST_GCC_AT_LEAST_5 # host-llvm select BR2_PACKAGE_LLVM -comment "llvm support needs a toolchain w/ wchar, threads, C++, gcc >= 4.8, dynamic library" +comment "llvm support needs a toolchain w/ wchar, threads, C++, dynamic library, host gcc >= 5" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \ - || BR2_STATIC_LIBS || !BR2_USE_WCHAR + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP \ + || BR2_STATIC_LIBS || !BR2_USE_WCHAR \ + || !BR2_HOST_GCC_AT_LEAST_5 comment "llvm support needs a toolchain not affected by GCC bug 64735" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS @@ -63,16 +63,6 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER bool select BR2_PACKAGE_MESA3D_DRIVER -config BR2_PACKAGE_MESA3D_DRI_DRIVER - bool - select BR2_PACKAGE_MESA3D_DRI3 if \ - (BR2_PACKAGE_XORG7 && BR2_TOOLCHAIN_HAS_SYNC_4 && \ - !BR2_RISCV_32) - select BR2_PACKAGE_MESA3D_DRIVER - select BR2_PACKAGE_MESA3D_GBM if \ - !BR2_PACKAGE_MESA3D_OPENGL_GLX && \ - !BR2_PACKAGE_MESA3D_OPENGL_EGL - config BR2_PACKAGE_MESA3D_VULKAN_DRIVER bool select BR2_PACKAGE_MESA3D_DRIVER @@ -134,16 +124,11 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_FREEDRENO config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_I915 bool "Gallium i915 driver" depends on BR2_i386 || BR2_x86_64 - depends on !BR2_PACKAGE_MESA3D_DRI_DRIVER_I915 select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER select BR2_PACKAGE_LIBDRM_INTEL help Support for i915-based Intel GPUs. -comment "Gallium i915: Only one i915 provider can be built" - depends on BR2_i386 || BR2_x86_64 - depends on BR2_PACKAGE_MESA3D_DRI_DRIVER_I915 - config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS bool "Gallium iris driver" depends on BR2_i386 || BR2_x86_64 @@ -312,67 +297,6 @@ comment "Gallium VDPAU state tracker needs X.org and gallium drivers r300, r600, || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600 \ || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI) -config BR2_PACKAGE_MESA3D_XVMC - bool "Gallium XvMC state tracker" - depends on BR2_i386 || BR2_x86_64 - depends on BR2_PACKAGE_XORG7 - depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU \ - || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600 - select BR2_PACKAGE_MESA3D_NEEDS_X11 - select BR2_PACKAGE_XLIB_LIBXV - select BR2_PACKAGE_XLIB_LIBXVMC - help - XvMC state tracker (needs r600 or nouveau gallium drivers). - -comment "Gallium XvMC state tracker needs X.org and gallium drivers r600 or nouveau" - depends on BR2_i386 || BR2_x86_64 - depends on !BR2_PACKAGE_XORG7 || \ - !(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU \ - || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600) - -comment "DRI drivers" - -config BR2_PACKAGE_MESA3D_DRI_DRIVER_I915 - bool "DRI i915 driver" - depends on BR2_i386 || BR2_x86_64 - select BR2_PACKAGE_MESA3D_DRI_DRIVER - select BR2_PACKAGE_LIBDRM_INTEL - help - Support for i915-based Intel GPUs. - -config BR2_PACKAGE_MESA3D_DRI_DRIVER_I965 - bool "DRI i965 driver" - depends on BR2_i386 || BR2_x86_64 - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 # memfd.h - select BR2_PACKAGE_MESA3D_DRI_DRIVER - select BR2_PACKAGE_LIBDRM_INTEL - help - Support for i965-based Intel GPUs. - -comment "DRI i965 driver needs a toolchain w/ headers >= 3.17" - depends on BR2_i386 || BR2_x86_64 - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 - -config BR2_PACKAGE_MESA3D_DRI_DRIVER_NOUVEAU - bool "DRI nouveau driver" - select BR2_PACKAGE_MESA3D_DRI_DRIVER - select BR2_PACKAGE_LIBDRM_NOUVEAU - help - Support for Nvidia-based GPUs. - -config BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON - bool "DRI radeon r100 driver" - depends on BR2_i386 || BR2_x86_64 - # libdrm's radeon option depends on LIBDRM_HAS_ATOMIC. Propagating - # that dependency here causes a circular dependency that Kconfig - # can't see is just spurious. However, that dependency is about - # the toolchain having sync4 primitives, which is always a given - # for i386 and x86_64. - select BR2_PACKAGE_MESA3D_DRI_DRIVER - select BR2_PACKAGE_LIBDRM_RADEON - help - Legacy Radeon driver for R100 series GPUs. - comment "Vulkan drivers" config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL @@ -406,17 +330,16 @@ comment "OpenGL API Support" config BR2_PACKAGE_MESA3D_GBM bool "gbm" - depends on BR2_PACKAGE_MESA3D_DRI_DRIVER \ - || (BR2_PACKAGE_MESA3D_GALLIUM_DRIVER && BR2_PACKAGE_MESA3D_OPENGL_EGL) + depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER && \ + BR2_PACKAGE_MESA3D_OPENGL_EGL select BR2_PACKAGE_HAS_LIBGBM select BR2_PACKAGE_LIBGBM_HAS_FEATURE_FORMAT_MODIFIER_PLANE_COUNT select BR2_PACKAGE_LIBGBM_HAS_FEATURE_DMA_BUF help Enable Generic Buffer Management (gbm) -comment "gbm support needs a dri driver or a gallium driver w/ EGL support." - depends on !BR2_PACKAGE_MESA3D_DRI_DRIVER \ - && !(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER && BR2_PACKAGE_MESA3D_OPENGL_EGL) +comment "gbm support needs a gallium driver w/ EGL support." + depends on !(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER && BR2_PACKAGE_MESA3D_OPENGL_EGL) config BR2_PACKAGE_MESA3D_OPENGL_GLX bool "OpenGL GLX" @@ -432,7 +355,7 @@ comment "OpenGL GLX support needs X11" config BR2_PACKAGE_MESA3D_OPENGL_EGL bool "OpenGL EGL" - depends on BR2_PACKAGE_MESA3D_DRI_DRIVER || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER select BR2_PACKAGE_HAS_LIBEGL if !BR2_PACKAGE_LIBGLVND select BR2_PACKAGE_LIBGLVND_DISPATCH_EGL if BR2_PACKAGE_LIBGLVND select BR2_PACKAGE_HAS_LIBEGL_WAYLAND @@ -468,11 +391,7 @@ config BR2_PACKAGE_PROVIDES_LIBOPENCL endif # BR2_PACKAGE_MESA3D -comment "mesa3d needs a toolchain w/ C++, NPTL, dynamic library" +comment "mesa3d needs a toolchain w/ gcc >=8, C++, NPTL, dynamic library" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ - BR2_STATIC_LIBS + BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_8 depends on BR2_TOOLCHAIN_HAS_SYNC_1 - -comment "mesa3d needs a toolchain w/ gcc >= 7" - depends on BR2_m68k - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_7 diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index e36d798e21d..e4de997f0ec 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,6 +1,5 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2022-January/000660.html -sha256 d93b2a9d2464ee856d7637a07dff6b7cd950f295ad58518bb959f76882cf4a4c mesa-21.3.5.tar.xz -sha512 417d1787f8177567f0c547dde3e24212f7497f2fe7cdaa945fe998cd61ec0e9eb9388feb444e377c4fd8794b056af02aac28d1bbfb9527844391ba49e6893933 mesa-21.3.5.tar.xz - +# From https://lists.freedesktop.org/archives/mesa-announce/2023-January/000703.html +sha256 37a1ddaf03f41919ee3c89c97cff41e87de96e00e9d3247959cc8279d8294593 mesa-22.3.4.tar.xz +sha512 6af340153244d3e95d0e155a45d6db134335654d62590797ae0ef6ba44c2ccfe91ebf95f70ff82c67cee108ac35536767b1f6848d6d1129f52eb9e8414ee321d mesa-22.3.4.tar.xz # License -sha256 998437f3f75f0c542046f83c1cb349408122268168fb13eb4ae6967aa18b7d98 docs/license.rst +sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 5f080ff5fcc..36b71515101 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 21.3.5 +MESA3D_VERSION = 22.3.4 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos @@ -48,6 +48,11 @@ ifeq ($(BR2_PACKAGE_MESA3D_LLVM),y) MESA3D_DEPENDENCIES += host-llvm llvm MESA3D_MESON_EXTRA_BINARIES += llvm-config='$(STAGING_DIR)/usr/bin/llvm-config' MESA3D_CONF_OPTS += -Dllvm=enabled +ifeq ($(BR2_PACKAGE_LLVM_RTTI),y) +MESA3D_CONF_OPTS += -Dcpp_rtti=true +else +MESA3D_CONF_OPTS += -Dcpp_rtti=false +endif else # Avoid automatic search of llvm-config MESA3D_CONF_OPTS += -Dllvm=disabled @@ -72,7 +77,6 @@ ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX),y) # glx: # dri : dri based GLX requires at least one DRI driver || dri based GLX requires shared-glapi # xlib : xlib conflicts with any dri driver -# gallium-xlib : Gallium-xlib based GLX requires at least one gallium driver || Gallium-xlib based GLX requires softpipe or llvmpipe || gallium-xlib conflicts with any dri driver. # Always enable glx-direct; without it, many GLX applications don't work. MESA3D_CONF_OPTS += \ -Dglx=dri \ @@ -114,11 +118,6 @@ 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 -# DRI Drivers -MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_I915) += i915 -MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_I965) += i965 -MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_NOUVEAU) += nouveau -MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON) += r100 # Vulkan Drivers MESA3D_VULKAN_DRIVERS-$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL) += intel @@ -133,19 +132,11 @@ MESA3D_CONF_OPTS += \ -Dgallium-extra-hud=true endif -ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) -MESA3D_CONF_OPTS += \ - -Ddri-drivers= -else -MESA3D_CONF_OPTS += \ - -Dshared-glapi=enabled \ - -Ddri-drivers=$(subst $(space),$(comma),$(MESA3D_DRI_DRIVERS-y)) -endif - ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER),) MESA3D_CONF_OPTS += \ -Dvulkan-drivers= else +MESA3D_DEPENDENCIES += host-python-glslang MESA3D_CONF_OPTS += \ -Dvulkan-drivers=$(subst $(space),$(comma),$(MESA3D_VULKAN_DRIVERS-y)) endif @@ -221,13 +212,6 @@ else MESA3D_CONF_OPTS += -Dgles1=disabled -Dgles2=disabled endif -ifeq ($(BR2_PACKAGE_MESA3D_XVMC),y) -MESA3D_DEPENDENCIES += xlib_libXv xlib_libXvMC -MESA3D_CONF_OPTS += -Dgallium-xvmc=enabled -else -MESA3D_CONF_OPTS += -Dgallium-xvmc=disabled -endif - ifeq ($(BR2_PACKAGE_VALGRIND),y) MESA3D_CONF_OPTS += -Dvalgrind=enabled MESA3D_DEPENDENCIES += valgrind diff --git a/package/meson/meson.hash b/package/meson/meson.hash index c2d53519d40..6993b756ae4 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/0.61.1/meson-0.61.1.tar.gz.asc -sha256 feb2cefb325b437dbf36146df7c6b87688ddff0b0205caa31dc64055c6da410c meson-0.61.1.tar.gz +# https://github.com/mesonbuild/meson/releases/download/1.0.0/meson-1.0.0.tar.gz.asc +sha256 aa50a4ba4557c25e7d48446abfde857957dcdf58385fffbe670ba0e8efacce05 meson-1.0.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/package/meson/meson.mk b/package/meson/meson.mk index 125488dd460..e417d8d6272 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 0.61.1 +MESON_VERSION = 1.0.0 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/metacity.hash b/package/metacity/metacity.hash index 583db0f204f..2aca099038f 100644 --- a/package/metacity/metacity.hash +++ b/package/metacity/metacity.hash @@ -1,4 +1,4 @@ -# From http://ftp.gnome.org/pub/gnome/sources/metacity/2.25/metacity-2.25.1.sha256sum +# From https://download.gnome.org/sources/metacity/2.25/metacity-2.25.1.sha256sum sha256 fb2ede4ac02d7da08d3c3323fb76afaf945c8cccc07cb2d3a4b7f44fb49f1c47 metacity-2.25.1.tar.bz2 # Locally computed diff --git a/package/metacity/metacity.mk b/package/metacity/metacity.mk index f5a6d4afd9b..57566583000 100644 --- a/package/metacity/metacity.mk +++ b/package/metacity/metacity.mk @@ -8,7 +8,7 @@ METACITY_VERSION_MAJOR = 2.25 METACITY_VERSION = $(METACITY_VERSION_MAJOR).1 METACITY_SOURCE = metacity-$(METACITY_VERSION).tar.bz2 -METACITY_SITE = http://ftp.gnome.org/pub/gnome/sources/metacity/$(METACITY_VERSION_MAJOR) +METACITY_SITE = https://download.gnome.org/sources/metacity/$(METACITY_VERSION_MAJOR) METACITY_LICENSE = GPL-2.0+ METACITY_LICENSE_FILES = COPYING diff --git a/package/mfgtools/Config.in.host b/package/mfgtools/Config.in.host index 2b506c8f678..f1e7ab58e39 100644 --- a/package/mfgtools/Config.in.host +++ b/package/mfgtools/Config.in.host @@ -8,7 +8,7 @@ config BR2_PACKAGE_HOST_MFGTOOLS production. The communication is done over USB using the Freescale UTP protocol. - https://github.com/codeauroraforum/mfgtools + https://github.com/NXPmicro/mfgtools comment "host mfgtools needs a toolchain w/ host gcc >= 4.9" depends on BR2_arm diff --git a/package/mfgtools/mfgtools.mk b/package/mfgtools/mfgtools.mk index 48ce5dda281..3de93936b80 100644 --- a/package/mfgtools/mfgtools.mk +++ b/package/mfgtools/mfgtools.mk @@ -5,7 +5,7 @@ ################################################################################ MFGTOOLS_VERSION = 0.02 -MFGTOOLS_SITE = $(call github,codeauroraforum,mfgtools,v$(MFGTOOLS_VERSION)) +MFGTOOLS_SITE = $(call github,NXPmicro,mfgtools,v$(MFGTOOLS_VERSION)) MFGTOOLS_SUBDIR = MfgToolLib MFGTOOLS_LICENSE = BSD-3-Clause or CPOL MFGTOOLS_LICENSE_FILES = LICENSE README.txt diff --git a/package/mg/mg.hash b/package/mg/mg.hash index 9257daf5ac6..19cf1e29d58 100644 --- a/package/mg/mg.hash +++ b/package/mg/mg.hash @@ -1,4 +1,4 @@ # From https://github.com/troglobit/mg/releases/tag/v3.5 -sha256 a906eab9370c0f24a5fa25923561ad933b74ad339d0b2851d2067badf0d7e4ce mg-3.5.tar.gz +sha256 a906eab9370c0f24a5fa25923561ad933b74ad339d0b2851d2067badf0d7e4ce mg-3.5.tar.gz # Locally computed: -sha256 7e12e5df4bae12cb21581ba157ced20e1986a0508dd10d0e8a4ab9a4cf94e85c UNLICENSE +sha256 7e12e5df4bae12cb21581ba157ced20e1986a0508dd10d0e8a4ab9a4cf94e85c UNLICENSE diff --git a/package/micropython/micropython.hash b/package/micropython/micropython.hash index d5045e8f275..7bff7de4e25 100644 --- a/package/micropython/micropython.hash +++ b/package/micropython/micropython.hash @@ -1,3 +1,3 @@ #locally computed -sha256 c21dbf8144237b3dbe3847c9ad5264cd0f3104eb078c810b3986004cce8fcd70 micropython-1.17.tar.gz -sha256 59b1f0947a87c90d0d29dbe2c8deb3d1f8263bbbd2fb5ebcc79a649cff6dfcba LICENSE +sha256 c980ad7e742491df0dc10db2958137dbbf9aa7a8009e102fc75f4c0cac2d6b5e micropython-1.19.1.tar.gz +sha256 0f678c2abd7fe2cfca36693630506bbcbdfc219bd04bf4a02fe3b094ae4c666f LICENSE diff --git a/package/micropython/micropython.mk b/package/micropython/micropython.mk index 55c00ba08af..5f687c73b9b 100644 --- a/package/micropython/micropython.mk +++ b/package/micropython/micropython.mk @@ -4,7 +4,7 @@ # ################################################################################ -MICROPYTHON_VERSION = 1.17 +MICROPYTHON_VERSION = 1.19.1 MICROPYTHON_SITE = $(call github,micropython,micropython,v$(MICROPYTHON_VERSION)) # Micropython has a lot of code copied from other projects, and also a number # of submodules for various libs. However, we don't even clone the submodules, @@ -36,6 +36,7 @@ MICROPYTHON_MAKE_OPTS += \ MICROPY_PY_USSL=0 \ CROSS_COMPILE=$(TARGET_CROSS) \ CFLAGS_EXTRA=$(MICROPYTHON_CFLAGS) \ + LDFLAGS_EXTRA="$(TARGET_LDFLAGS)" \ CWARN= define MICROPYTHON_BUILD_CMDS diff --git a/package/midori/Config.in b/package/midori/Config.in index 715295e5a62..6029c0a9dfa 100644 --- a/package/midori/Config.in +++ b/package/midori/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_MIDORI_ARCH_SUPPORTS depends on BR2_USE_MMU depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # gcr -> libgcrypt -> libgpg-error depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS depends on !BR2_BINFMT_FLAT # webkitgtk -> icu diff --git a/package/minetest-game/minetest-game.hash b/package/minetest-game/minetest-game.hash index 3f057e4ee5f..629871edbeb 100644 --- a/package/minetest-game/minetest-game.hash +++ b/package/minetest-game/minetest-game.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 b4bfa0755b88230cf4bdb6af6a0951dd1248f6cdf87fecc340e43ac12c80b0b2 minetest-game-5.4.1.tar.gz +sha256 5dc857003d24bb489f126865fcd6bf0d9c0cb146ca4c1c733570699d15abd0e3 minetest-game-5.6.1.tar.gz sha256 f8a254e8d5f6b3ca3873f990986e86c864f943aa5dc9bf56808c5f4bfa509db0 LICENSE.txt sha256 ed2afed388c470e08edc1104e4ff6d12b68a32a76b8c52d760a99d4d2d7716f3 mods/beds/license.txt @@ -21,7 +21,9 @@ sha256 01370a00e7b2157a07ee21fa4dac9cc108c7449442f612a3e55cfe18b5b03c2b mods/f sha256 d92ac36a0235f4c02f8cfe2137d7d632bd53374c44ead97f20c152dddf475837 mods/flowers/license.txt sha256 ffbac006d197fcb8e36e9cdda638053ac80eef4e6446bbe36cb94bd28f54ba0b mods/game_commands/license.txt sha256 857f64cd62c13e27f25363584342fe049885b16c6b2392f1ebd7c3a7fb6ca436 mods/give_initial_stuff/license.txt +sha256 aca908299369e2187ae9107e5e870721ea0dcb699a470fec1fd7fabce4bcbcdf mods/keys/license.txt sha256 dcbab8d7dc4137789958d19471807b37447fd303bced310d7d76d901eefca8ff mods/map/license.txt +sha256 babdfff9fe0cc4a3d4346b5388129d4ba79e50b517c82ca37cfdfd78086b83aa mods/mtg_craftguide/license.txt sha256 88385cd60d15c4fb4856c3c4c551c76c30958268c5c1160c1aa4e520c037a623 mods/player_api/license.txt sha256 0066e63d682d54a014ad3359794365a1abb87562d2b1e5e32093976d88c295b4 mods/screwdriver/license.txt sha256 b903866d052774e4127952690ce62ca26aa5bc4c2ddd48fceae501fa0d24ed74 mods/sethome/license.txt @@ -31,5 +33,6 @@ sha256 eab4c0cb318bb83c13362047a5a0fc5cb650a4e561ceb5a9124e5a1253cbc21a mods/s sha256 e8593deed04ed4199ce9303db900f32276e0b629fd7f0089074d13370c12d00a mods/tnt/license.txt sha256 a0814bccd28157a160049efeac03864ff4c4dd6a34bc9cfcd3cc62de66fb156a mods/vessels/license.txt sha256 e9ebf1b4b170e64a0ea6e246edd03689aeb859d6560b8372a8081c004b30cb65 mods/walls/license.txt +sha256 84f4ed8b688ab385eb9d5b482eb35c26cd7a45e065ed93ff6ad477d29ff3c708 mods/weather/license.txt sha256 551b19e2c8b18c143301e090a1ceb5dc5d4ca243cad846de179d693439910816 mods/wool/license.txt sha256 c71155c9a68a5242223c5f814c1b9b1270492729b0ff0add770b6418bccf17c9 mods/xpanes/license.txt diff --git a/package/minetest-game/minetest-game.mk b/package/minetest-game/minetest-game.mk index df118b9e529..ec8d5bff260 100644 --- a/package/minetest-game/minetest-game.mk +++ b/package/minetest-game/minetest-game.mk @@ -4,7 +4,7 @@ # ################################################################################ -MINETEST_GAME_VERSION = 5.4.1 +MINETEST_GAME_VERSION = 5.6.1 MINETEST_GAME_SITE = $(call github,minetest,minetest_game,$(MINETEST_GAME_VERSION)) MINETEST_GAME_LICENSE = LGPL-2.1+ (code), CC-BY-SA-2.0, CC-BY-SA-3.0, \ CC-BY-SA-4.0, MIT, CC0 1.0, CC-BY-2.0 (mods) @@ -28,7 +28,9 @@ MINETEST_GAME_LICENSE_FILES = LICENSE.txt \ mods/flowers/license.txt \ mods/game_commands/license.txt \ mods/give_initial_stuff/license.txt \ + mods/keys/license.txt \ mods/map/license.txt \ + mods/mtg_craftguide/license.txt \ mods/player_api/license.txt \ mods/screwdriver/license.txt \ mods/sethome/license.txt \ @@ -38,6 +40,7 @@ MINETEST_GAME_LICENSE_FILES = LICENSE.txt \ mods/tnt/license.txt \ mods/vessels/license.txt \ mods/walls/license.txt \ + mods/weather/license.txt \ mods/wool/license.txt \ mods/xpanes/license.txt diff --git a/package/minetest/0001-Fix-build-for-newer-versions-of-GCC-11246.patch b/package/minetest/0001-Fix-build-for-newer-versions-of-GCC-11246.patch deleted file mode 100644 index 35102a077b4..00000000000 --- a/package/minetest/0001-Fix-build-for-newer-versions-of-GCC-11246.patch +++ /dev/null @@ -1,35 +0,0 @@ -From a327c06f5dee9f432666b503203fd15e4ccafc1b Mon Sep 17 00:00:00 2001 -From: lhofhansl -Date: Thu, 6 May 2021 10:24:30 -0700 -Subject: [PATCH] Fix build for newer versions of GCC (#11246) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -(cherry picked from commit 7c2826cbc0f36027d4a9781f433150d1c5d0d03f) - -Fixes: - -minetest-5.4.1/src/clientiface.h:444:36: error: ‘shared_ptr’ in namespace ‘std’ does not name a template type - 444 | ClientInterface(const std::shared_ptr &con); - -Signed-off-by: Romain Naour ---- - src/clientiface.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/clientiface.h b/src/clientiface.h -index cc5292b71..dfd976741 100644 ---- a/src/clientiface.h -+++ b/src/clientiface.h -@@ -31,6 +31,7 @@ with this program; if not, write to the Free Software Foundation, Inc., - #include - #include - #include -+#include - #include - - class MapBlock; --- -2.31.1 - diff --git a/package/minetest/Config.in b/package/minetest/Config.in index b8ee175d52c..4e139ac3e27 100644 --- a/package/minetest/Config.in +++ b/package/minetest/Config.in @@ -1,16 +1,16 @@ config BR2_PACKAGE_MINETEST bool "minetest" - depends on BR2_INSTALL_LIBSTDCPP # irrlicht - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 + depends on BR2_INSTALL_LIBSTDCPP # irrlichtMt (bundled) + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++11 depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_PACKAGE_XORG7 # irrlicht - depends on BR2_PACKAGE_HAS_LIBGL # irrlicht + depends on BR2_PACKAGE_XORG7 # irrlichtMt (bundled) + depends on BR2_PACKAGE_HAS_LIBGL # irrlichtMt (bundled) depends on BR2_PACKAGE_LUAJIT - select BR2_PACKAGE_IRRLICHT select BR2_PACKAGE_GMP select BR2_PACKAGE_JSONCPP select BR2_PACKAGE_SQLITE select BR2_PACKAGE_ZLIB + select BR2_PACKAGE_ZSTD # At least one option must be enabled select BR2_PACKAGE_MINETEST_CLIENT if !BR2_PACKAGE_MINETEST_SERVER help @@ -25,9 +25,10 @@ if BR2_PACKAGE_MINETEST config BR2_PACKAGE_MINETEST_CLIENT bool "minetest client" select BR2_PACKAGE_BZIP2 + select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_JPEG - select BR2_PACKAGE_XLIB_LIBXXF86VM + select BR2_PACKAGE_XLIB_LIBXI help Build Minetest client. @@ -51,14 +52,14 @@ comment "sound support needs a toolchain w/ threads NPTL" endif -comment "minetest needs a toolchain w/ C++, gcc >= 4.9, threads" +comment "minetest needs a toolchain w/ C++, gcc >= 5.1, threads" depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 \ || !BR2_TOOLCHAIN_HAS_THREADS comment "minetest needs X11 and an OpenGL provider" depends on (BR2_INSTALL_LIBSTDCPP \ - && BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 \ + && BR2_TOOLCHAIN_GCC_AT_LEAST_5 \ && BR2_TOOLCHAIN_HAS_THREADS) depends on !BR2_PACKAGE_HAS_LIBGL || !BR2_PACKAGE_XORG7 diff --git a/package/minetest/minetest.hash b/package/minetest/minetest.hash index 7eb57cb2a9c..ec67d4136da 100644 --- a/package/minetest/minetest.hash +++ b/package/minetest/minetest.hash @@ -1,4 +1,6 @@ # Locally calculated -sha256 de9e4410583c845c104b4be25f9d0b8743d8573c120149b8910ae2519f9ab14e minetest-5.4.1.tar.gz +sha256 1440603e19dca70e2691e86a74c822ee2c4a36fceee32b2d85ae74772149e9a3 minetest-5.6.1.tar.gz +sha256 27594242da8c7cc1e5ef45922e1dfdd130c37d77719b5d927359eb47992051e0 irrlicht-1.9.0mt8.tar.gz -sha256 5bc4bb4ff369d5039bcfff5a83a378335240ca86c58299e7de25097153c70132 LICENSE.txt +sha256 b38c8d428ceddf8e9b49dca63610c74499d952895d756b7eab5f5d4cef2954f6 LICENSE.txt +sha256 ca38f1ba4ab901111f6eee50009bd46dbd866e6beb98d592d843f7c162d73409 lib/irrlichtmt/doc/irrlicht-license.txt diff --git a/package/minetest/minetest.mk b/package/minetest/minetest.mk index e046ec2851a..3904bd687c0 100644 --- a/package/minetest/minetest.mk +++ b/package/minetest/minetest.mk @@ -4,12 +4,26 @@ # ################################################################################ -MINETEST_VERSION = 5.4.1 +MINETEST_VERSION = 5.6.1 MINETEST_SITE = $(call github,minetest,minetest,$(MINETEST_VERSION)) -MINETEST_LICENSE = LGPL-2.1+ (code), CC-BY-SA-3.0 (textures and sounds) -MINETEST_LICENSE_FILES = LICENSE.txt +MINETEST_LICENSE = LGPL-2.1+ (code), CC-BY-SA-3.0 (textures and sounds), Zlib (irrlicht) +MINETEST_LICENSE_FILES = LICENSE.txt lib/irrlichtmt/doc/irrlicht-license.txt +MINETEST_CPE_ID_VENDOR = minetest -MINETEST_DEPENDENCIES = gmp irrlicht jsoncpp luajit sqlite zlib +MINETEST_DEPENDENCIES = gmp jsoncpp luajit sqlite zlib zstd + +MINETEST_IRRLICHTMT_VERSION = 1.9.0mt8 +MINETEST_EXTRA_DOWNLOADS = $(call github,minetest,irrlicht,$(MINETEST_IRRLICHTMT_VERSION))/irrlicht-$(MINETEST_IRRLICHTMT_VERSION).tar.gz + +define MINETEST_IRRLICHTMT_EXTRACT + mkdir -p $(@D)/lib + $(foreach f, $(notdir $(MINETEST_EXTRA_DOWNLOADS)), \ + $(call suitable-extractor,$(f)) $(MINETEST_DL_DIR)/$(f) | \ + $(TAR) -C $(@D)/lib $(TAR_OPTIONS) - + ) + ln -sf irrlicht-$(MINETEST_IRRLICHTMT_VERSION) $(@D)/lib/irrlichtmt +endef +MINETEST_POST_EXTRACT_HOOKS += MINETEST_IRRLICHTMT_EXTRACT MINETEST_CONF_OPTS = \ -DDEFAULT_RUN_IN_PLACE=OFF \ @@ -22,7 +36,7 @@ MINETEST_CONF_OPTS = \ -DBUILD_UNITTESTS=OFF ifeq ($(BR2_PACKAGE_MINETEST_CLIENT),y) -MINETEST_DEPENDENCIES += bzip2 jpeg libgl libpng xlib_libXxf86vm +MINETEST_DEPENDENCIES += bzip2 freetype jpeg libgl libpng xlib_libXi MINETEST_CONF_OPTS += -DBUILD_CLIENT=ON else MINETEST_CONF_OPTS += -DBUILD_CLIENT=OFF @@ -41,13 +55,6 @@ else MINETEST_CONF_OPTS += -DENABLE_SOUND=OFF endif -ifeq ($(BR2_PACKAGE_FREETYPE),y) -MINETEST_DEPENDENCIES += freetype -MINETEST_CONF_OPTS += -DENABLE_FREETYPE=ON -else -MINETEST_CONF_OPTS += -DENABLE_FREETYPE=OFF -endif - ifeq ($(BR2_PACKAGE_HIREDIS),y) MINETEST_DEPENDENCIES += hiredis MINETEST_CONF_OPTS += -DENABLE_REDIS=ON diff --git a/package/mini-snmpd/mini-snmpd.hash b/package/mini-snmpd/mini-snmpd.hash index 2d668092910..fee76c07a31 100644 --- a/package/mini-snmpd/mini-snmpd.hash +++ b/package/mini-snmpd/mini-snmpd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 de00c475a3c70c56f3ee97cd683cb71009d3521d60b1f589c5a91b4671ede9f3 mini-snmpd-1.6.tar.gz -sha256 8a43b895972a24567297f44f35dab0f5f9ed3b7db6dac0bf6094075b27ab9d56 COPYING +sha256 de00c475a3c70c56f3ee97cd683cb71009d3521d60b1f589c5a91b4671ede9f3 mini-snmpd-1.6.tar.gz +sha256 8a43b895972a24567297f44f35dab0f5f9ed3b7db6dac0bf6094075b27ab9d56 COPYING diff --git a/package/minidlna/minidlna.hash b/package/minidlna/minidlna.hash index 175fe67304f..b78dd5b4dda 100644 --- a/package/minidlna/minidlna.hash +++ b/package/minidlna/minidlna.hash @@ -1,6 +1,6 @@ -# From https://sourceforge.net/projects/minidlna/files/minidlna/1.3.0/ -sha1 6563a881884879b2aef52611934e08bb42985964 minidlna-1.3.0.tar.gz +# From https://sourceforge.net/projects/minidlna/files/minidlna/1.3.3/ +sha1 2d42028d2ca5ae04affdb96cb414314867e179ea minidlna-1.3.3.tar.gz # Locally computed -sha256 47d9b06b4c48801a4c1112ec23d24782728b5495e95ec2195bbe5c81bc2d3c63 minidlna-1.3.0.tar.gz +sha256 39026c6d4a139b9180192d1c37225aa3376fdf4f1a74d7debbdbb693d996afa4 minidlna-1.3.3.tar.gz sha256 79146b7f558e56510b9a714ff75318c05ab93aeccfd6597497b9bce212cf92ea COPYING sha256 94876d7886116e176e702b4902bd9f19731a6883db5f229ac2a7058a22aa6529 LICENCE.miniupnpd diff --git a/package/minidlna/minidlna.mk b/package/minidlna/minidlna.mk index adea200f4f7..1609695ebff 100644 --- a/package/minidlna/minidlna.mk +++ b/package/minidlna/minidlna.mk @@ -4,7 +4,7 @@ # ################################################################################ -MINIDLNA_VERSION = 1.3.0 +MINIDLNA_VERSION = 1.3.3 MINIDLNA_SITE = https://downloads.sourceforge.net/project/minidlna/minidlna/$(MINIDLNA_VERSION) MINIDLNA_LICENSE = GPL-2.0, BSD-3-Clause MINIDLNA_LICENSE_FILES = COPYING LICENCE.miniupnpd diff --git a/package/minimodem/minimodem.hash b/package/minimodem/minimodem.hash index 084a5606fb7..82c3de53e13 100644 --- a/package/minimodem/minimodem.hash +++ b/package/minimodem/minimodem.hash @@ -1,2 +1,2 @@ -sha256 f8cca4db8e3f284d67f843054d6bb4d88a3db5e77b26192410e41e9a06f4378e minimodem-0.24.tar.gz -sha256 c298178753129680ef6d3112f0f8b61acc405c86c1997dfe59735257988f8b33 COPYING +sha256 f8cca4db8e3f284d67f843054d6bb4d88a3db5e77b26192410e41e9a06f4378e minimodem-0.24.tar.gz +sha256 c298178753129680ef6d3112f0f8b61acc405c86c1997dfe59735257988f8b33 COPYING diff --git a/package/minissdpd/minissdpd.hash b/package/minissdpd/minissdpd.hash index e14fe7ab2c2..bc1db5f2833 100644 --- a/package/minissdpd/minissdpd.hash +++ b/package/minissdpd/minissdpd.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 a073be9c6d9194feaeccf31cd986c48afd2212426b6594e75166cedff1c461aa minissdpd-1.5.20211105.tar.gz -sha256 45950e1d443106906f83a4ec7b9c2e1a9d6457130737a493cff0e5b7a39da570 LICENSE +sha256 f4c2dea6a472e0a5cc9dca2dc4c1fc36ba5538eacf8d793825293251725546bd minissdpd-1.6.0.tar.gz +sha256 a0f853256954f388ce4fab5faaef6a1f5bcd5e682c3c7c70b07b7130e932a021 LICENSE diff --git a/package/minissdpd/minissdpd.mk b/package/minissdpd/minissdpd.mk index 2b9fac4df11..4f594cb5a01 100644 --- a/package/minissdpd/minissdpd.mk +++ b/package/minissdpd/minissdpd.mk @@ -4,7 +4,7 @@ # ################################################################################ -MINISSDPD_VERSION = 1.5.20211105 +MINISSDPD_VERSION = 1.6.0 MINISSDPD_SITE = http://miniupnp.free.fr/files MINISSDPD_LICENSE = BSD-3-Clause MINISSDPD_LICENSE_FILES = LICENSE diff --git a/package/minizip-zlib/Config.in b/package/minizip-zlib/Config.in new file mode 100644 index 00000000000..fe9b337a861 --- /dev/null +++ b/package/minizip-zlib/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_MINIZIP_ZLIB + bool "minizip-zlib" + select BR2_PACKAGE_ZLIB + help + Legacy minizip provided in contrib/minizip of zlib. + + https://www.winimage.com/zLibDll/minizip.html diff --git a/package/minizip-zlib/minizip-zlib.hash b/package/minizip-zlib/minizip-zlib.hash new file mode 100644 index 00000000000..df5e8d723a1 --- /dev/null +++ b/package/minizip-zlib/minizip-zlib.hash @@ -0,0 +1,4 @@ +# From http://www.zlib.net/ +sha256 d14c38e313afc35a9a8760dadf26042f51ea0f5d154b0630a31da0540107fb98 zlib-1.2.13.tar.xz +# License files, locally calculated +sha256 845efc77857d485d91fb3e0b884aaa929368c717ae8186b66fe1ed2495753243 LICENSE diff --git a/package/minizip-zlib/minizip-zlib.mk b/package/minizip-zlib/minizip-zlib.mk new file mode 100644 index 00000000000..4367a2420f6 --- /dev/null +++ b/package/minizip-zlib/minizip-zlib.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# minizip-zlib +# +################################################################################ + +MINIZIP_ZLIB_VERSION = 1.2.13 +MINIZIP_ZLIB_SOURCE = zlib-$(MINIZIP_ZLIB_VERSION).tar.xz +MINIZIP_ZLIB_SITE = http://www.zlib.net +MINIZIP_ZLIB_LICENSE = Zlib +MINIZIP_ZLIB_LICENSE_FILES = LICENSE +MINIZIP_ZLIB_INSTALL_STAGING = YES +MINIZIP_ZLIB_SUBDIR = contrib/minizip +# configure is not shipped in contrib/minizip +MINIZIP_ZLIB_AUTORECONF = YES +MINIZIP_ZLIB_DEPENDENCIES = zlib +# demos must be disabled to avoid a conflict with BR2_PACKAGE_MINIZIP_DEMOS +MINIZIP_ZLIB_CONF_OPTS = --disable-demos + +$(eval $(autotools-package)) diff --git a/package/minizip/Config.in b/package/minizip/Config.in index e4d185d9d76..98eb4dec164 100644 --- a/package/minizip/Config.in +++ b/package/minizip/Config.in @@ -7,7 +7,7 @@ config BR2_PACKAGE_MINIZIP It is compatible with PKZip 2.04g, WinZip, InfoZip, MimarSinan Codex Suite 2002 tools, and compatible sofware. - https://github.com/nmoinvaz/minizip + https://github.com/zlib-ng/minizip-ng config BR2_PACKAGE_MINIZIP_DEMOS bool "minizip" diff --git a/package/minizip/minizip.hash b/package/minizip/minizip.hash index 3e87e64dae3..55fc176dbd1 100644 --- a/package/minizip/minizip.hash +++ b/package/minizip/minizip.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2ab219f651901a337a7d3c268128711b80330a99ea36bdc528c76b591a624c3c minizip-3.0.4.tar.gz +sha256 39981a0db1bb6da504909bce63d7493286c5e50825c056564544c990d15c55cf minizip-3.0.7.tar.gz sha256 675181c03fc1302a1c8554c00f7be9bb420c5dbc9dcc2013433cec144413de03 LICENSE diff --git a/package/minizip/minizip.mk b/package/minizip/minizip.mk index 07f67c13545..c74c0df8d1c 100644 --- a/package/minizip/minizip.mk +++ b/package/minizip/minizip.mk @@ -4,8 +4,8 @@ # ################################################################################ -MINIZIP_VERSION = 3.0.4 -MINIZIP_SITE = $(call github,nmoinvaz,minizip,$(MINIZIP_VERSION)) +MINIZIP_VERSION = 3.0.7 +MINIZIP_SITE = $(call github,zlib-ng,minizip-ng,$(MINIZIP_VERSION)) MINIZIP_DEPENDENCIES = host-pkgconf MINIZIP_INSTALL_STAGING = YES MINIZIP_CONF_OPTS = \ diff --git a/package/mjpg-streamer/mjpg-streamer.hash b/package/mjpg-streamer/mjpg-streamer.hash index 63dcdb9fbe7..164c9b2181c 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 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 mjpg-streamer-experimental/LICENSE +sha256 5b427b07c03c2c0468cc782daf1510d315141170246828fcbb7c07f927879973 mjpg-streamer-5a6e0a2db163e6ae9461552b59079870d0959340.tar.gz +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 mjpg-streamer-experimental/LICENSE diff --git a/package/mmc-utils/0001-mmc_cmds.c-fix-build-with-gcc-4.9.patch b/package/mmc-utils/0001-mmc_cmds.c-fix-build-with-gcc-4.9.patch deleted file mode 100644 index 7725f9ca5e0..00000000000 --- a/package/mmc-utils/0001-mmc_cmds.c-fix-build-with-gcc-4.9.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 6208cc78f6efd1fafc4f5bc6a487247a383df80f Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 28 Sep 2019 20:44:52 +0200 -Subject: [PATCH] mmc_cmds.c: fix build with gcc 4.9 - -Fix following error with gcc 4.9: - -mmc_cmds.c:1918:9: error: missing braces around initializer [-Werror=missing-braces] - struct rpmb_frame frame_status = {0}; - -Fixes: - - http://autobuild.buildroot.org/results/bf3b6f9f6ef39b99842b3c92495b7bf359c68158 - -Signed-off-by: Fabrice Fontaine -[Upstream status: sent to linux-mmc@vger.kernel.org] ---- - mmc_cmds.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/mmc_cmds.c b/mmc_cmds.c -index fb37189..6b09f26 100644 ---- a/mmc_cmds.c -+++ b/mmc_cmds.c -@@ -1915,7 +1915,9 @@ static int do_rpmb_op(int fd, - u_int16_t rpmb_type; - struct mmc_ioc_multi_cmd *mioc; - struct mmc_ioc_cmd *ioc; -- struct rpmb_frame frame_status = {0}; -+ struct rpmb_frame frame_status; -+ -+ memset(&frame_status, 0, sizeof(frame_status)); - - if (!frame_in || !frame_out || !out_cnt) - return -EINVAL; --- -2.23.0 - diff --git a/package/mmc-utils/Config.in b/package/mmc-utils/Config.in index 850aeac4457..d65988c7497 100644 --- a/package/mmc-utils/Config.in +++ b/package/mmc-utils/Config.in @@ -1,10 +1,21 @@ config BR2_PACKAGE_MMC_UTILS bool "mmc-utils" - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_4 help MMC utils https://git.kernel.org/cgit/linux/kernel/git/cjb/mmc-utils.git -comment "mmc-utils needs a toolchain w/ headers >= 3.0" - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 +if BR2_PACKAGE_MMC_UTILS + +config BR2_PACKAGE_MMC_UTILS_ENABLE_DANGEROUS_COMMANDS + bool "Enable dangerous commands" + help + Enable support for dangerous commands in mmc-utils. mmc-utils + considers turning on permanent write protection on a device a + "dangerous command" and doesn't offer it by default. + +endif + +comment "mmc-utils needs a toolchain w/ headers >= 4.4" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_4 diff --git a/package/mmc-utils/mmc-utils.hash b/package/mmc-utils/mmc-utils.hash index e8b28266126..1256f63487e 100644 --- a/package/mmc-utils/mmc-utils.hash +++ b/package/mmc-utils/mmc-utils.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ffc8f77233d1bd39ce4ec68835ad94aa6762624e4e96fb60102e87ba82db083e mmc-utils-d40ec535b9d4e4c974e8c2fbfb422cd0348cc5e8-br1.tar.gz -sha256 c3165393bcd710624e2909327a6fbeb736c47bdbe66de1c1a364ac7324d3e4d6 mmc.h +sha256 f6ed1cb2f02d49df4244f8872b47b22780dd634fa19d857298ce1b793752776f mmc-utils-dfc3b6ecda84d21418fb4408b39c5c71db4c6458-br1.tar.gz +sha256 f57e3c6169116aa9ff06eec95734ca000e4d0196467bb221e80e50530c768081 mmc.h diff --git a/package/mmc-utils/mmc-utils.mk b/package/mmc-utils/mmc-utils.mk index 8c264a454a3..435e6ae7f15 100644 --- a/package/mmc-utils/mmc-utils.mk +++ b/package/mmc-utils/mmc-utils.mk @@ -4,17 +4,26 @@ # ################################################################################ -MMC_UTILS_VERSION = d40ec535b9d4e4c974e8c2fbfb422cd0348cc5e8 -MMC_UTILS_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git +MMC_UTILS_VERSION = dfc3b6ecda84d21418fb4408b39c5c71db4c6458 +MMC_UTILS_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git +MMC_UTILS_SITE_METHOD = git MMC_UTILS_LICENSE = GPL-2.0 MMC_UTILS_LICENSE_FILES = mmc.h +MMC_UTILS_CFLAGS = $(TARGET_CFLAGS) + +ifeq ($(BR2_PACKAGE_MMC_UTILS_ENABLE_DANGEROUS_COMMANDS),y) +MMC_UTILS_CFLAGS += -DDANGEROUS_COMMANDS_ENABLED +endif + # override AM_CFLAGS as the project Makefile uses it to pass # -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2, and the latter conflicts # with the _FORTIFY_SOURCE that we pass when hardening options are # enabled. define MMC_UTILS_BUILD_CMDS - $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) AM_CFLAGS= + $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(MMC_UTILS_CFLAGS)" \ + AM_CFLAGS= endef define MMC_UTILS_INSTALL_TARGET_CMDS diff --git a/package/moarvm/moarvm.hash b/package/moarvm/moarvm.hash index 01e3ee4aeeb..624988215e3 100644 --- a/package/moarvm/moarvm.hash +++ b/package/moarvm/moarvm.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7f3487a70e8b77be0e4e2f12b14c49f6a01d0378e0940c86958c9016c495ad75 MoarVM-2021.10.tar.gz +sha256 51c3e9c9a7a191c148f213b65ae1f4fcfe5d4b7c16c86300e9ee8e18eaa8becb MoarVM-2022.12.tar.gz sha256 c53c6b96081b0a5b9b2fb4d0133d55c20e5e00e4c127ade62f03434ee7b3d2de Artistic2.txt diff --git a/package/moarvm/moarvm.mk b/package/moarvm/moarvm.mk index 99e26c73c9f..ef9d29d5af7 100644 --- a/package/moarvm/moarvm.mk +++ b/package/moarvm/moarvm.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOARVM_VERSION = 2021.10 +MOARVM_VERSION = 2022.12 MOARVM_SITE = http://moarvm.com/releases MOARVM_SOURCE = MoarVM-$(MOARVM_VERSION).tar.gz MOARVM_LICENSE = Artistic-2.0 diff --git a/package/mobile-broadband-provider-info/mobile-broadband-provider-info.hash b/package/mobile-broadband-provider-info/mobile-broadband-provider-info.hash index bbdfd1f03da..c965f5c7834 100644 --- a/package/mobile-broadband-provider-info/mobile-broadband-provider-info.hash +++ b/package/mobile-broadband-provider-info/mobile-broadband-provider-info.hash @@ -1,4 +1,4 @@ -# http://ftp.acc.umu.se/pub/GNOME/sources/mobile-broadband-provider-info/20190618/mobile-broadband-provider-info-20190618.sha256sum -sha256 c22d64a565d1975b9eecb6ed2eeaef18634bc6f385c8137d05e845d8fb3cce5b mobile-broadband-provider-info-20190618.tar.xz +# https://download.gnome.org/sources/mobile-broadband-provider-info/20221107/mobile-broadband-provider-info-20221107.sha256sum +sha256 d93392566c347a96eed95da8c66a5da0dd94f4115cfb3a305ff2682c64cfd810 mobile-broadband-provider-info-20221107.tar.xz # Locally computed -sha256 3d510b215a33087b9ceb9592da21575ea1f9f98bd4d983a38e65fe851a552174 COPYING +sha256 3d510b215a33087b9ceb9592da21575ea1f9f98bd4d983a38e65fe851a552174 COPYING diff --git a/package/mobile-broadband-provider-info/mobile-broadband-provider-info.mk b/package/mobile-broadband-provider-info/mobile-broadband-provider-info.mk index 2986f92f697..27448449513 100644 --- a/package/mobile-broadband-provider-info/mobile-broadband-provider-info.mk +++ b/package/mobile-broadband-provider-info/mobile-broadband-provider-info.mk @@ -4,8 +4,8 @@ # ################################################################################ -MOBILE_BROADBAND_PROVIDER_INFO_VERSION = 20190618 -MOBILE_BROADBAND_PROVIDER_INFO_SITE = http://ftp.gnome.org/pub/GNOME/sources/mobile-broadband-provider-info/$(MOBILE_BROADBAND_PROVIDER_INFO_VERSION) +MOBILE_BROADBAND_PROVIDER_INFO_VERSION = 20221107 +MOBILE_BROADBAND_PROVIDER_INFO_SITE = https://download.gnome.org/sources/mobile-broadband-provider-info/$(MOBILE_BROADBAND_PROVIDER_INFO_VERSION) MOBILE_BROADBAND_PROVIDER_INFO_SOURCE = mobile-broadband-provider-info-$(MOBILE_BROADBAND_PROVIDER_INFO_VERSION).tar.xz MOBILE_BROADBAND_PROVIDER_INFO_LICENSE = Public domain MOBILE_BROADBAND_PROVIDER_INFO_LICENSE_FILES = COPYING diff --git a/package/moby-buildkit/Config.in.host b/package/moby-buildkit/Config.in.host new file mode 100644 index 00000000000..a3b18548f84 --- /dev/null +++ b/package/moby-buildkit/Config.in.host @@ -0,0 +1,8 @@ +config BR2_PACKAGE_HOST_MOBY_BUILDKIT + bool "host moby-buildkit" + depends on BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS + help + BuildKit is a toolkit for converting source code to build + artifacts in an efficient expressive and repeatable manner. + + https://github.com/moby/buildkit diff --git a/package/moby-buildkit/moby-buildkit.hash b/package/moby-buildkit/moby-buildkit.hash index 3015e479f61..f7922d7e8f1 100644 --- a/package/moby-buildkit/moby-buildkit.hash +++ b/package/moby-buildkit/moby-buildkit.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 0cc31aa4b6dcdead63b07d75e0b89495ecffcc183f4f62695d8bb507433fc8ff moby-buildkit-0.8.1.tar.gz +sha256 1efa1c54b299c463c1b039d3df8ba1c68e70fe4de608fd14653fcebf9f27837b moby-buildkit-0.11.6.tar.gz sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/moby-buildkit/moby-buildkit.mk b/package/moby-buildkit/moby-buildkit.mk index 3f0df351ef4..91560c1ed1d 100644 --- a/package/moby-buildkit/moby-buildkit.mk +++ b/package/moby-buildkit/moby-buildkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOBY_BUILDKIT_VERSION = 0.8.1 +MOBY_BUILDKIT_VERSION = 0.11.6 MOBY_BUILDKIT_SITE = $(call github,moby,buildkit,v$(MOBY_BUILDKIT_VERSION)) MOBY_BUILDKIT_LICENSE = Apache-2.0 MOBY_BUILDKIT_LICENSE_FILES = LICENSE @@ -19,4 +19,10 @@ MOBY_BUILDKIT_LDFLAGS = \ 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 c4c723776d0..6990996a862 100644 --- a/package/modem-manager/Config.in +++ b/package/modem-manager/Config.in @@ -3,7 +3,8 @@ config BR2_PACKAGE_MODEM_MANAGER depends on BR2_USE_WCHAR # libglib2 and gnutls depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2 depends on BR2_USE_MMU # dbus - select BR2_PACKAGE_DBUS # runtime dependency + depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_DBUS select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBGUDEV if BR2_PACKAGE_HAS_UDEV help @@ -25,8 +26,21 @@ config BR2_PACKAGE_MODEM_MANAGER_LIBQMI select BR2_PACKAGE_LIBQMI help This option enables support for QMI protocol + +config BR2_PACKAGE_MODEM_MANAGER_LIBQRTR + bool "QRTR support" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15 # libqrtr-glib + select BR2_PACKAGE_LIBQRTR_GLIB + select BR2_PACKAGE_MODEM_MANAGER_LIBQMI + help + This option enables support for QRTR protocol + +comment "QRTR support needs a toolchain w/ headers >= 4.15" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15 + endif -comment "modemmanager needs a toolchain w/ wchar, threads" - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS +comment "modemmanager needs a toolchain w/ wchar, threads, dynamic library" + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_STATIC_LIBS depends on BR2_USE_MMU diff --git a/package/modem-manager/modem-manager.hash b/package/modem-manager/modem-manager.hash index 14597215df7..4b8b795af78 100644 --- a/package/modem-manager/modem-manager.hash +++ b/package/modem-manager/modem-manager.hash @@ -1,4 +1,4 @@ -# Locally computed -sha256 2ccf1f716c2d121e8e6709bcf8af29ee86971a90adacca2e8d6288b30278862e ModemManager-1.16.10.tar.xz +#Locally calculated after checking https://www.freedesktop.org/software/ModemManager/ModemManager-1.18.12.tar.xz.asc +sha256 9c16b47547faac9515f2d03d1e8175de9c5e6769b1ee16b608ba6cfe6f04b03e ModemManager-1.20.4.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 a881edc2728..979a80a8e94 100644 --- a/package/modem-manager/modem-manager.mk +++ b/package/modem-manager/modem-manager.mk @@ -4,42 +4,80 @@ # ################################################################################ -MODEM_MANAGER_VERSION = 1.16.10 -MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.xz -MODEM_MANAGER_SITE = http://www.freedesktop.org/software/ModemManager +MODEM_MANAGER_VERSION = 1.20.4 +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) MODEM_MANAGER_LICENSE_FILES = COPYING COPYING.LIB MODEM_MANAGER_SELINUX_MODULES = modemmanager -MODEM_MANAGER_DEPENDENCIES = host-pkgconf libglib2 $(TARGET_NLS_DEPENDENCIES) +MODEM_MANAGER_DEPENDENCIES = host-pkgconf dbus libglib2 $(TARGET_NLS_DEPENDENCIES) host-libxslt MODEM_MANAGER_INSTALL_STAGING = YES -MODEM_MANAGER_CONF_OPTS = --disable-more-warnings +MODEM_MANAGER_CONF_OPTS = \ + -Dman=false \ + -Dpowerd_suspend_resume=false \ + -Dtests=false \ + -Dudevdir=/usr/lib/udev -ifeq ($(BR2_PACKAGE_MODEM_MANAGER_LIBQMI),y) -MODEM_MANAGER_DEPENDENCIES += libqmi -MODEM_MANAGER_CONF_OPTS += --with-qmi +ifeq ($(BR2_PACKAGE_LIBGUDEV),y) +MODEM_MANAGER_DEPENDENCIES += libgudev +MODEM_MANAGER_CONF_OPTS += -Dudev=true else -MODEM_MANAGER_CONF_OPTS += --without-qmi +MODEM_MANAGER_CONF_OPTS += -Dudev=false endif -ifeq ($(BR2_PACKAGE_LIBGUDEV),y) -MODEM_MANAGER_DEPENDENCIES += libgudev -MODEM_MANAGER_CONF_OPTS += --with-udev +ifeq ($(BR2_PACKAGE_MODEM_MANAGER_LIBQMI),y) +MODEM_MANAGER_DEPENDENCIES += libqmi +MODEM_MANAGER_CONF_OPTS += -Dqmi=true else -MODEM_MANAGER_CONF_OPTS += --without-udev +MODEM_MANAGER_CONF_OPTS += -Dqmi=false endif ifeq ($(BR2_PACKAGE_MODEM_MANAGER_LIBMBIM),y) MODEM_MANAGER_DEPENDENCIES += libmbim -MODEM_MANAGER_CONF_OPTS += --with-mbim +MODEM_MANAGER_CONF_OPTS += -Dmbim=true +else +MODEM_MANAGER_CONF_OPTS += -Dmbim=false +endif + +ifeq ($(BR2_PACKAGE_MODEM_MANAGER_LIBQRTR),y) +MODEM_MANAGER_DEPENDENCIES += libqrtr-glib +MODEM_MANAGER_CONF_OPTS += -Dqrtr=true +else +MODEM_MANAGER_CONF_OPTS += -Dqrtr=false +endif + +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +MODEM_MANAGER_DEPENDENCIES += systemd +MODEM_MANAGER_CONF_OPTS += \ + -Dsystemd_journal=true \ + -Dsystemd_suspend_resume=true \ + -Dsystemdsystemunitdir=/usr/lib/systemd/system +else +MODEM_MANAGER_CONF_OPTS += \ + -Dsystemd_journal=false \ + -Dsystemd_suspend_resume=false \ + -Dsystemdsystemunitdir=no +endif + +ifeq ($(BR2_PACKAGE_POLKIT),y) +MODEM_MANAGER_DEPENDENCIES += polkit +MODEM_MANAGER_CONF_OPTS += -Dpolkit=strict else -MODEM_MANAGER_CONF_OPTS += --without-mbim +MODEM_MANAGER_CONF_OPTS += -Dpolkit=no endif ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) MODEM_MANAGER_DEPENDENCIES += gobject-introspection -MODEM_MANAGER_CONF_OPTS += --enable-introspection +MODEM_MANAGER_CONF_OPTS += -Dintrospection=true +else +MODEM_MANAGER_CONF_OPTS += -Dintrospection=false +endif + +ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y) +MODEM_MANAGER_DEPENDENCIES += bash-completion +MODEM_MANAGER_CONF_OPTS += -Dbash_completion=true else -MODEM_MANAGER_CONF_OPTS += --disable-introspection +MODEM_MANAGER_CONF_OPTS += -Dbash_completion=false endif define MODEM_MANAGER_INSTALL_INIT_SYSV @@ -47,4 +85,4 @@ define MODEM_MANAGER_INSTALL_INIT_SYSV $(TARGET_DIR)/etc/init.d/S44modem-manager endef -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/package/modsecurity2/Config.in b/package/modsecurity2/Config.in index 2870386a999..fb1bfc960e5 100644 --- a/package/modsecurity2/Config.in +++ b/package/modsecurity2/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_MODSECURITY2 bool "modsecurity2" depends on BR2_PACKAGE_APACHE select BR2_PACKAGE_LIBXML2 - select BR2_PACKAGE_PCRE + select BR2_PACKAGE_PCRE2 help ModSecurity is an open source, cross-platform web application firewall (WAF) module. Known as the "Swiss Army Knife" of diff --git a/package/modsecurity2/modsecurity2.hash b/package/modsecurity2/modsecurity2.hash index a19f4823a8a..2c77ffd830d 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.5/modsecurity-2.9.5.tar.gz.sha256 -sha256 e2bfc8cd8b8de1e21f054d310543373ea5d89adbd96784e832be0da3e4dc149e modsecurity-2.9.5.tar.gz +# 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 # Locally computed sha256 2c564f5a67e49e74c80e5a7dcacd1904e7408f1fd6a95218b38c04f012d94cb9 LICENSE diff --git a/package/modsecurity2/modsecurity2.mk b/package/modsecurity2/modsecurity2.mk index a1ad8fe5bc3..88bbf3bb296 100644 --- a/package/modsecurity2/modsecurity2.mk +++ b/package/modsecurity2/modsecurity2.mk @@ -4,7 +4,7 @@ # ################################################################################ -MODSECURITY2_VERSION = 2.9.5 +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_LICENSE = Apache-2.0 @@ -12,16 +12,16 @@ MODSECURITY2_LICENSE_FILES = LICENSE MODSECURITY2_CPE_ID_VENDOR = trustwave MODSECURITY2_CPE_ID_PRODUCT = modsecurity MODSECURITY2_INSTALL_STAGING = YES -MODSECURITY2_DEPENDENCIES = apache libxml2 pcre +MODSECURITY2_DEPENDENCIES = host-pkgconf apache libxml2 pcre2 MODSECURITY2_CONF_OPTS = \ - --with-pcre=$(STAGING_DIR)/usr/bin/pcre-config \ - --with-libxml=$(STAGING_DIR)/usr \ + --with-pcre2=$(STAGING_DIR)/usr/bin/pcre2-config \ --with-apr=$(STAGING_DIR)/usr/bin/apr-1-config \ --with-apu=$(STAGING_DIR)/usr/bin/apu-1-config \ --with-apxs=$(STAGING_DIR)/usr/bin/apxs \ --without-curl \ --without-lua \ + --without-pcre \ --without-yajl \ --without-ssdeep diff --git a/package/mongoose/mongoose.hash b/package/mongoose/mongoose.hash index 809f160cf0b..ffef9f446c9 100644 --- a/package/mongoose/mongoose.hash +++ b/package/mongoose/mongoose.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 8c5024a4e5b5a0c7fdae3c24ebc68e2b3ccfaba08cf25c2e76fc7f14f92fd4a5 mongoose-7.2.tar.gz -sha256 9553d057f2ba980642f2c18d87ed38896cff1c9612d77d684a73a11fe1443b05 LICENSE +sha256 55073dcd427ab9475731ad855e417884f4fbfb24b7d5694f6cabadbee1329f16 mongoose-7.8.tar.gz +sha256 b41c293820074278291813af9f181918154875c94d744a90bf4eec331be28ac5 LICENSE diff --git a/package/mongoose/mongoose.mk b/package/mongoose/mongoose.mk index 2c5df1d0cc8..0693f7553a2 100644 --- a/package/mongoose/mongoose.mk +++ b/package/mongoose/mongoose.mk @@ -4,7 +4,7 @@ # ################################################################################ -MONGOOSE_VERSION = 7.2 +MONGOOSE_VERSION = 7.8 MONGOOSE_SITE = $(call github,cesanta,mongoose,$(MONGOOSE_VERSION)) MONGOOSE_LICENSE = GPL-2.0 MONGOOSE_LICENSE_FILES = LICENSE @@ -13,7 +13,7 @@ MONGOOSE_INSTALL_STAGING = YES # static library MONGOOSE_INSTALL_TARGET = NO -MONGOOSE_CFLAGS = $(TARGET_CFLAGS) +MONGOOSE_CFLAGS = $(TARGET_CFLAGS) -std=gnu99 ifeq ($(BR2_PACKAGE_OPENSSL),y) MONGOOSE_DEPENDENCIES += openssl diff --git a/package/mono-gtksharp3/mono-gtksharp3.mk b/package/mono-gtksharp3/mono-gtksharp3.mk index 126aabeda28..27fcda94822 100644 --- a/package/mono-gtksharp3/mono-gtksharp3.mk +++ b/package/mono-gtksharp3/mono-gtksharp3.mk @@ -6,7 +6,7 @@ MONO_GTKSHARP3_VERSION_MAJOR = 2.99 MONO_GTKSHARP3_VERSION = $(MONO_GTKSHARP3_VERSION_MAJOR).3 -MONO_GTKSHARP3_SITE = http://ftp.gnome.org/pub/gnome/sources/gtk-sharp/$(MONO_GTKSHARP3_VERSION_MAJOR) +MONO_GTKSHARP3_SITE = https://download.gnome.org/sources/gtk-sharp/$(MONO_GTKSHARP3_VERSION_MAJOR) MONO_GTKSHARP3_SOURCE = gtk-sharp-$(MONO_GTKSHARP3_VERSION).tar.xz MONO_GTKSHARP3_LICENSE = LGPL-2.0, MIT (cairo) MONO_GTKSHARP3_LICENSE_FILES = COPYING diff --git a/package/mono/Config.in b/package/mono/Config.in index 44b8cf85817..76178bcf9be 100644 --- a/package/mono/Config.in +++ b/package/mono/Config.in @@ -14,7 +14,7 @@ config BR2_PACKAGE_MONO bool "mono" depends on BR2_PACKAGE_MONO_ARCH_SUPPORTS depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # pthread_getattr_np() depends on !BR2_STATIC_LIBS select BR2_PACKAGE_LIBATOMIC_OPS help @@ -23,7 +23,7 @@ config BR2_PACKAGE_MONO http://download.mono-project.com/sources/mono/ -comment "mono needs a toolchain w/ C++, threads, dynamic library" +comment "mono needs a toolchain w/ C++, NPTL, dynamic library" depends on BR2_PACKAGE_MONO_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS diff --git a/package/mono/mono.hash b/package/mono/mono.hash index 2477e9231c4..1010f6d0abf 100644 --- a/package/mono/mono.hash +++ b/package/mono/mono.hash @@ -1,5 +1,5 @@ # sha256 locally computed -sha256 51de5c02ad511333f93ff585bca54c8784de35af4ff27b759d16b46c4402cdac mono-6.12.0.90.tar.xz -sha256 923c7053ad0d430cd9b0b69a0ccf3abb7170a1ce50ecbf01915b565a35823d10 LICENSE -sha256 fc488f3ec9f36856bea8cce5cdde1449176341ef93a3962b691970f8981799f4 mcs/COPYING -sha256 2c3c3ef532828bcd42bb3127349625a25291ff5ae7e6f8d42e0fe9b5be836a99 external/Newtonsoft.Json/Tools/7-zip/copying.txt +sha256 57366a6ab4f3b5ecf111d48548031615b3a100db87c679fc006e8c8a4efd9424 mono-6.12.0.182.tar.xz +sha256 923c7053ad0d430cd9b0b69a0ccf3abb7170a1ce50ecbf01915b565a35823d10 LICENSE +sha256 fc488f3ec9f36856bea8cce5cdde1449176341ef93a3962b691970f8981799f4 mcs/COPYING +sha256 2c3c3ef532828bcd42bb3127349625a25291ff5ae7e6f8d42e0fe9b5be836a99 external/Newtonsoft.Json/Tools/7-zip/copying.txt diff --git a/package/mono/mono.mk b/package/mono/mono.mk index 27f7886224f..b88f2b379eb 100644 --- a/package/mono/mono.mk +++ b/package/mono/mono.mk @@ -4,7 +4,7 @@ # ################################################################################ -MONO_VERSION = 6.12.0.90 +MONO_VERSION = 6.12.0.182 MONO_SITE = http://download.mono-project.com/sources/mono MONO_SOURCE = mono-$(MONO_VERSION).tar.xz MONO_LICENSE = GPL-2.0 or MIT (compiler, tools), MIT (libs) or commercial diff --git a/package/monolite/monolite.hash b/package/monolite/monolite.hash index b008d42ebb7..e72ccfbf9dc 100644 --- a/package/monolite/monolite.hash +++ b/package/monolite/monolite.hash @@ -1,2 +1,2 @@ # sha256 locally computed -sha256 0ac314f75ca2bc4455785f12ceb50da89b6dac90162f9f46afbbb988a8752d4b monolite-linux-1A5E0066-58DC-428A-B21C-0AD6CDAE2789-latest.tar.gz +sha256 0ac314f75ca2bc4455785f12ceb50da89b6dac90162f9f46afbbb988a8752d4b monolite-linux-1A5E0066-58DC-428A-B21C-0AD6CDAE2789-latest.tar.gz diff --git a/package/mosh/mosh.hash b/package/mosh/mosh.hash index baffe1f1433..6c1d0e7af35 100644 --- a/package/mosh/mosh.hash +++ b/package/mosh/mosh.hash @@ -1,5 +1,5 @@ # From https://mailman.mit.edu/pipermail/mosh-users/2017-July/000357.html -sha256 da600573dfa827d88ce114e0fed30210689381bbdcff543c931e4d6a2e851216 mosh-1.3.2.tar.gz +sha256 872e4b134e5df29c8933dff12350785054d2fd2839b5ae6b5587b14db1465ddd mosh-1.4.0.tar.gz # Locally calculcated -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING -sha256 8042495ddc8d99b883335d53552554eccf825fc1f0ba487d0f8e6656baaa8199 COPYING.iOS +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 8042495ddc8d99b883335d53552554eccf825fc1f0ba487d0f8e6656baaa8199 COPYING.iOS diff --git a/package/mosh/mosh.mk b/package/mosh/mosh.mk index f9e335799d7..c938f70719e 100644 --- a/package/mosh/mosh.mk +++ b/package/mosh/mosh.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOSH_VERSION = 1.3.2 +MOSH_VERSION = 1.4.0 MOSH_SITE = https://mosh.org MOSH_DEPENDENCIES = zlib ncurses protobuf host-pkgconf MOSH_LICENSE = GPL-3.0+ with exception diff --git a/package/mosquitto/Config.in b/package/mosquitto/Config.in index b4effa36bef..6fa5f79c6c0 100644 --- a/package/mosquitto/Config.in +++ b/package/mosquitto/Config.in @@ -17,7 +17,7 @@ config BR2_PACKAGE_MOSQUITTO implementing MQTT clients, and the very popular mosquitto_pub and mosquitto_sub command line MQTT clients. - http://mosquitto.org/ + https://mosquitto.org/ config BR2_PACKAGE_MOSQUITTO_BROKER bool "install the mosquitto broker" diff --git a/package/mosquitto/Config.in.host b/package/mosquitto/Config.in.host new file mode 100644 index 00000000000..39e287ee899 --- /dev/null +++ b/package/mosquitto/Config.in.host @@ -0,0 +1,4 @@ +config BR2_PACKAGE_HOST_MOSQUITTO + bool "host mosquitto (mosquitto_passwd)" + help + Only installs mosquitto_passwd. diff --git a/package/mosquitto/mosquitto.hash b/package/mosquitto/mosquitto.hash index 24b8869d136..df0a51df3a5 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.13.tar.gz.asc -sha256 d0dde8fdb12caf6e2426b4f28081919a2fce3448773bdb8af0d3cd5fe5776925 mosquitto-2.0.14.tar.gz +# from https://mosquitto.org/files/source/mosquitto-2.0.17.tar.gz.asc +sha256 3be7a911236567c1a9fbe25baf3e3167004ba4a0c151a448ef1f7fc077dba52f mosquitto-2.0.17.tar.gz # License files sha256 d3c4ccace4e5d3cc89d34cf2a0bc85b8596bfc0a32b815d0d77f9b7c41b5350c LICENSE.txt diff --git a/package/mosquitto/mosquitto.mk b/package/mosquitto/mosquitto.mk index 3e7a728acb8..0b85246f39c 100644 --- a/package/mosquitto/mosquitto.mk +++ b/package/mosquitto/mosquitto.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOSQUITTO_VERSION = 2.0.14 +MOSQUITTO_VERSION = 2.0.17 MOSQUITTO_SITE = https://mosquitto.org/files/source MOSQUITTO_LICENSE = EPL-2.0 or EDLv1.0 MOSQUITTO_LICENSE_FILES = LICENSE.txt epl-v20 edl-v10 @@ -124,8 +124,28 @@ define MOSQUITTO_INSTALL_INIT_SYSTEMD endef define MOSQUITTO_USERS - mosquitto -1 nobody -1 * - - - Mosquitto user + mosquitto -1 mosquitto -1 * - - - Mosquitto user endef endif +HOST_MOSQUITTO_DEPENDENCIES = host-pkgconf host-openssl + +HOST_MOSQUITTO_MAKE_OPTS = \ + $(HOST_CONFIGURE_OPTS) \ + UNAME=Linux \ + STRIP=true \ + prefix=$(HOST_DIR) \ + WITH_WRAP=no \ + WITH_DOCS=no \ + WITH_TLS=yes + +define HOST_MOSQUITTO_BUILD_CMDS + $(MAKE) -C $(@D)/apps/mosquitto_passwd $(HOST_MOSQUITTO_MAKE_OPTS) +endef + +define HOST_MOSQUITTO_INSTALL_CMDS + $(MAKE) -C $(@D)/apps/mosquitto_passwd $(HOST_MOSQUITTO_MAKE_OPTS) install +endef + $(eval $(generic-package)) +$(eval $(host-generic-package)) diff --git a/package/most/most.hash b/package/most/most.hash index 151caadc3a8..ec9da9adcde 100644 --- a/package/most/most.hash +++ b/package/most/most.hash @@ -1,6 +1,6 @@ # From https://www.jedsoft.org/releases/most/ -sha1 db811669a6b22c15478c957b439b5e4483ce1c95 most-5.1.0.tar.gz +sha1 322073ee6e8c45ce084f4fccd08d3f026aa1f66d most-5.2.0.tar.gz # Locally computed -sha256 db805d1ffad3e85890802061ac8c90e3c89e25afb184a794e03715a3ed190501 most-5.1.0.tar.gz -sha256 1b2a567f289f66a143c56353e7b3d4fa5862514a5e3c5cfdf8b02ee5e5aaa953 COPYING -sha256 47ad1c3f9b94d6ec42d9bee6c5df980c5c2daa5b9d22113545ae6a3f21ca2f52 COPYRIGHT +sha256 9455aeb8f826fa8385c850dc22bf0f22cf9069b3c3423fba4bf2c6f6226d9903 most-5.2.0.tar.gz +sha256 1b2a567f289f66a143c56353e7b3d4fa5862514a5e3c5cfdf8b02ee5e5aaa953 COPYING +sha256 3d8f860532c9f202db9300375fb29a1e7b32f538c6033e7013266ad55317fc3e COPYRIGHT diff --git a/package/most/most.mk b/package/most/most.mk index 28d82cddf1f..24627c046ab 100644 --- a/package/most/most.mk +++ b/package/most/most.mk @@ -5,7 +5,7 @@ ################################################################################ MOST_SITE = http://www.jedsoft.org/releases/most -MOST_VERSION = 5.1.0 +MOST_VERSION = 5.2.0 MOST_LICENSE = GPL-2.0+ MOST_LICENSE_FILES = COPYING COPYRIGHT MOST_DEPENDENCIES = slang diff --git a/package/motion/motion.hash b/package/motion/motion.hash index 085ac904495..21f74b481f4 100644 --- a/package/motion/motion.hash +++ b/package/motion/motion.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 3fb0d14fff8a8a143716223b5d2d55c0f52b11badf13a2e485b98bae3cf1b572 motion-4.4.0.tar.gz +sha256 0c824276bb23565b7cf10409ebdcb46b85fb1f6abca957252e52290bb1fe473e motion-4.5.1.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/motion/motion.mk b/package/motion/motion.mk index 5d54ecea01d..4e9ccdc3f71 100644 --- a/package/motion/motion.mk +++ b/package/motion/motion.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOTION_VERSION = 4.4.0 +MOTION_VERSION = 4.5.1 MOTION_SITE = $(call github,Motion-Project,motion,release-$(MOTION_VERSION)) MOTION_LICENSE = GPL-2.0 MOTION_LICENSE_FILES = LICENSE diff --git a/package/mp4v2/0001-Static-cast-to-unsigned-int-for-cases.patch b/package/mp4v2/0001-Static-cast-to-unsigned-int-for-cases.patch deleted file mode 100644 index 6c9b13bed80..00000000000 --- a/package/mp4v2/0001-Static-cast-to-unsigned-int-for-cases.patch +++ /dev/null @@ -1,99 +0,0 @@ -From a5ca35b044bbf13c0b16f0066bf24646604bb218 Mon Sep 17 00:00:00 2001 -From: "Jason A. Donenfeld" -Date: Thu, 6 Aug 2020 15:22:04 +0200 -Subject: [PATCH] Static cast to unsigned int for cases - -Signed-off-by: Jason A. Donenfeld -[Retrieved from: -https://gitweb.gentoo.org/repo/gentoo.git/tree/media-libs/libmp4v2/files/libmp4v2-2.0.0-unsigned-int-cast.patch] -Signed-off-by: Fabrice Fontaine ---- - libutil/Utility.cpp | 2 +- - util/mp4art.cpp | 2 +- - util/mp4chaps.cpp | 2 +- - util/mp4file.cpp | 2 +- - util/mp4subtitle.cpp | 2 +- - util/mp4track.cpp | 2 +- - 6 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/libutil/Utility.cpp b/libutil/Utility.cpp -index 76cdd12..d6739d4 100644 ---- a/libutil/Utility.cpp -+++ b/libutil/Utility.cpp -@@ -493,7 +493,7 @@ Utility::process_impl() - if( codes.find( code ) == codes.end() ) - continue; - -- switch( code ) { -+ switch( static_cast( code ) ) { - case 'z': - _optimize = true; - break; -diff --git a/util/mp4art.cpp b/util/mp4art.cpp -index add935e..6e7f531 100644 ---- a/util/mp4art.cpp -+++ b/util/mp4art.cpp -@@ -376,7 +376,7 @@ ArtUtility::utility_option( int code, bool& handled ) - { - handled = true; - -- switch( code ) { -+ switch( static_cast ( code ) ) { - case LC_ART_ANY: - _artFilter = numeric_limits::max(); - break; -diff --git a/util/mp4chaps.cpp b/util/mp4chaps.cpp -index 98400f8..ccc8b70 100644 ---- a/util/mp4chaps.cpp -+++ b/util/mp4chaps.cpp -@@ -632,7 +632,7 @@ ChapterUtility::utility_option( int code, bool& handled ) - { - handled = true; - -- switch( code ) { -+ switch( static_cast ( code ) ) { - case 'A': - case LC_CHPT_ANY: - _ChapterType = MP4ChapterTypeAny; -diff --git a/util/mp4file.cpp b/util/mp4file.cpp -index c27844b..b127cd1 100644 ---- a/util/mp4file.cpp -+++ b/util/mp4file.cpp -@@ -189,7 +189,7 @@ FileUtility::utility_option( int code, bool& handled ) - { - handled = true; - -- switch( code ) { -+ switch( static_cast( code ) ) { - case LC_LIST: - _action = &FileUtility::actionList; - break; -diff --git a/util/mp4subtitle.cpp b/util/mp4subtitle.cpp -index 7462153..19d977d 100644 ---- a/util/mp4subtitle.cpp -+++ b/util/mp4subtitle.cpp -@@ -164,7 +164,7 @@ SubtitleUtility::utility_option( int code, bool& handled ) - { - handled = true; - -- switch( code ) { -+ switch( static_cast( code ) ) { - case LC_LIST: - _action = &SubtitleUtility::actionList; - break; -diff --git a/util/mp4track.cpp b/util/mp4track.cpp -index d550506..cd63d7e 100644 ---- a/util/mp4track.cpp -+++ b/util/mp4track.cpp -@@ -788,7 +788,7 @@ TrackUtility::utility_option( int code, bool& handled ) - { - handled = true; - -- switch( code ) { -+ switch( static_cast( code ) ) { - case LC_TRACK_WILDCARD: - _trackMode = TM_WILDCARD; - break; --- -2.28.0 - diff --git a/package/mp4v2/Config.in b/package/mp4v2/Config.in index 00e80cd358f..705a8c9d24d 100644 --- a/package/mp4v2/Config.in +++ b/package/mp4v2/Config.in @@ -1,12 +1,11 @@ config BR2_PACKAGE_MP4V2 bool "mp4v2" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++11 help The MP4v2 library provides functions to read, create, and modify mp4 files. - https://github.com/TechSmith/mp4v2/ + https://mp4v2.org/ if BR2_PACKAGE_MP4V2 @@ -19,6 +18,5 @@ config BR2_PACKAGE_MP4V2_UTIL endif -comment "mp4v2 needs a toolchain w/ C++, gcc >= 5" - depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_5 +comment "mp4v2 needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/mp4v2/mp4v2.hash b/package/mp4v2/mp4v2.hash index 7aa5402c8fd..d3f02436504 100644 --- a/package/mp4v2/mp4v2.hash +++ b/package/mp4v2/mp4v2.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 de31e430e2641f25b67d10c47b0cda35279881b0196120e33bcd71b9cef1bd58 mp4v2-5.0.1.tar.gz -sha256 15e38684c940176e2fc76331a2299d2ab5115ac997078f768ef31b896af69fc5 COPYING +sha256 29420c62e56a2e527fd8979d59d05ed6d83ebe27e0e2c782c1ec19a3a402eaee mp4v2-2.1.1.tar.bz2 +sha256 7187891a4c39ee9e7ec70c71fc7dc8b8ed02c6f56ae1ffc017a34ac66dca5390 COPYING diff --git a/package/mp4v2/mp4v2.mk b/package/mp4v2/mp4v2.mk index 6d29228a135..7de837c170e 100644 --- a/package/mp4v2/mp4v2.mk +++ b/package/mp4v2/mp4v2.mk @@ -4,9 +4,10 @@ # ################################################################################ -MP4V2_VERSION = 5.0.1 +MP4V2_VERSION = 2.1.1 MP4V2_SITE = \ - $(call github,TechSmith,mp4v2,Release-ThirdParty-MP4v2-$(MP4V2_VERSION)) + https://github.com/enzo1982/mp4v2/releases/download/v$(MP4V2_VERSION) +MP4V2_SOURCE = mp4v2-$(MP4V2_VERSION).tar.bz2 MP4V2_INSTALL_STAGING = YES MP4V2_LICENSE = MPL-1.1 MP4V2_LICENSE_FILES = COPYING diff --git a/package/mpd/0002-lib-alsa-Error-add-missing-include.patch b/package/mpd/0002-lib-alsa-Error-add-missing-include.patch deleted file mode 100644 index c45a087a54f..00000000000 --- a/package/mpd/0002-lib-alsa-Error-add-missing-include.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 3856224df9160c201bc6d224aa927e7c358e3269 Mon Sep 17 00:00:00 2001 -From: aeolio -Date: Tue, 14 Dec 2021 09:01:23 +0100 -Subject: [PATCH] lib/alsa/Error: add missing #include - -Downloaded from upstream commit: -https://github.com/MusicPlayerDaemon/MPD/commit/3856224df9160c201bc6d224aa927e7c358e3269 - -Signed-off-by: Bernd Kuhls ---- - src/lib/alsa/Error.cxx | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/lib/alsa/Error.cxx b/src/lib/alsa/Error.cxx -index cd351f37d1..8ceb4417ca 100644 ---- a/src/lib/alsa/Error.cxx -+++ b/src/lib/alsa/Error.cxx -@@ -29,6 +29,7 @@ - - #include "Error.hxx" - -+#include - #include - - namespace Alsa { diff --git a/package/mpd/Config.in b/package/mpd/Config.in index fc0f4094484..902a3da7795 100644 --- a/package/mpd/Config.in +++ b/package/mpd/Config.in @@ -127,7 +127,7 @@ config BR2_PACKAGE_MPD_LIBSNDFILE config BR2_PACKAGE_MPD_MAD bool "mad" default y - select BR2_PACKAGE_LIBID3TAG + select BR2_PACKAGE_MPD_ID3TAG select BR2_PACKAGE_LIBMAD help Enable mad input support. @@ -141,7 +141,7 @@ config BR2_PACKAGE_MPD_MODPLUG config BR2_PACKAGE_MPD_MPG123 bool "mpg123" - select BR2_PACKAGE_LIBID3TAG + select BR2_PACKAGE_MPD_ID3TAG select BR2_PACKAGE_MPG123 help Enable mpg123 input support. @@ -347,6 +347,16 @@ config BR2_PACKAGE_MPD_AVAHI_SUPPORT comment "avahi support needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS +config BR2_PACKAGE_MPD_IO_URING + bool "io_uring" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1 + select BR2_PACKAGE_LIBURING + help + Asynchronous I/O using kernel io_uring subsystem + +comment "io_uring support needs a toolchain w/ headers >= 5.1" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1 + config BR2_PACKAGE_MPD_LIBMPDCLIENT bool "libmpdclient" select BR2_PACKAGE_LIBMPDCLIENT @@ -397,6 +407,7 @@ config BR2_PACKAGE_MPD_UPNP_PUPNP config BR2_PACKAGE_MPD_UPNP_NPUPNP bool "npupnp" + select BR2_PACKAGE_EXPAT select BR2_PACKAGE_LIBNPUPNP select BR2_PACKAGE_MPD_CURL help diff --git a/package/mpd/mpd.hash b/package/mpd/mpd.hash index 56f88490cf2..8683b02e3b2 100644 --- a/package/mpd/mpd.hash +++ b/package/mpd/mpd.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 f22c2c25093a05f4566f9cd7207cfbcd8405af67ed29a989bcf8905f80b7a299 mpd-0.23.5.tar.xz +sha256 a96b01e6fbbb7e8ab25eb7c15d5c811c62eb19b76d143a802f51674791f1d519 mpd-0.23.13.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index a55e4adde2d..f03a459b8c2 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -5,7 +5,7 @@ ################################################################################ MPD_VERSION_MAJOR = 0.23 -MPD_VERSION = $(MPD_VERSION_MAJOR).5 +MPD_VERSION = $(MPD_VERSION_MAJOR).13 MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz MPD_SITE = https://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR) MPD_DEPENDENCIES = host-pkgconf boost fmt @@ -29,6 +29,13 @@ else MPD_CONF_OPTS += -Dzeroconf=disabled endif +ifeq ($(BR2_PACKAGE_EXPAT),y) +MPD_DEPENDENCIES += expat +MPD_CONF_OPTS += -Dexpat=enabled +else +MPD_CONF_OPTS += -Dexpat=disabled +endif + # MPD prefers libicu for utf8 collation instead of libglib2. ifeq ($(BR2_PACKAGE_ICU),y) MPD_DEPENDENCIES += icu @@ -37,6 +44,13 @@ else MPD_CONF_OPTS += -Dicu=disabled endif +ifeq ($(BR2_PACKAGE_YAJL),y) +MPD_DEPENDENCIES += yajl +MPD_CONF_OPTS += -Dyajl=enabled +else +MPD_CONF_OPTS += -Dyajl=disabled +endif + ifeq ($(BR2_PACKAGE_MPD_ALSA),y) MPD_DEPENDENCIES += alsa-lib MPD_CONF_OPTS += -Dalsa=enabled @@ -119,6 +133,13 @@ else MPD_CONF_OPTS += -Did3tag=disabled endif +ifeq ($(BR2_PACKAGE_MPD_IO_URING),y) +MPD_DEPENDENCIES += liburing +MPD_CONF_OPTS += -Dio_uring=enabled +else +MPD_CONF_OPTS += -Dio_uring=disabled +endif + ifeq ($(BR2_PACKAGE_MPD_JACK2),y) MPD_DEPENDENCIES += jack2 MPD_CONF_OPTS += -Djack=enabled @@ -183,7 +204,7 @@ MPD_CONF_OPTS += -Dsoxr=disabled endif ifeq ($(BR2_PACKAGE_MPD_MAD),y) -MPD_DEPENDENCIES += libid3tag libmad +MPD_DEPENDENCIES += libmad MPD_CONF_OPTS += -Dmad=enabled else MPD_CONF_OPTS += -Dmad=disabled @@ -197,7 +218,7 @@ MPD_CONF_OPTS += -Dmodplug=disabled endif ifeq ($(BR2_PACKAGE_MPD_MPG123),y) -MPD_DEPENDENCIES += libid3tag mpg123 +MPD_DEPENDENCIES += mpg123 MPD_CONF_OPTS += -Dmpg123=enabled else MPD_CONF_OPTS += -Dmpg123=disabled @@ -244,7 +265,7 @@ MPD_CONF_OPTS += -Dpulse=disabled endif ifeq ($(BR2_PACKAGE_MPD_QOBUZ),y) -MPD_DEPENDENCIES += libgcrypt yajl +MPD_DEPENDENCIES += libgcrypt MPD_CONF_OPTS += -Dqobuz=enabled else MPD_CONF_OPTS += -Dqobuz=disabled @@ -265,7 +286,6 @@ MPD_CONF_OPTS += -Dsidplay=disabled endif ifeq ($(BR2_PACKAGE_MPD_SOUNDCLOUD),y) -MPD_DEPENDENCIES += yajl MPD_CONF_OPTS += -Dsoundcloud=enabled else MPD_CONF_OPTS += -Dsoundcloud=disabled @@ -278,8 +298,10 @@ else MPD_CONF_OPTS += -Dsqlite=disabled endif -ifneq ($(BR2_PACKAGE_MPD_TCP),y) +ifeq ($(BR2_PACKAGE_MPD_TCP),y) MPD_CONF_OPTS += -Dtcp=true +else +MPD_CONF_OPTS += -Dtcp=false endif ifeq ($(BR2_PACKAGE_MPD_TREMOR),y) @@ -298,7 +320,6 @@ endif ifeq ($(BR2_PACKAGE_MPD_UPNP_PUPNP),y) MPD_DEPENDENCIES += \ - expat \ libupnp MPD_CONF_OPTS += -Dupnp=pupnp else ifeq ($(BR2_PACKAGE_MPD_UPNP_NPUPNP),y) diff --git a/package/mpfr/mpfr.hash b/package/mpfr/mpfr.hash index 35056f626ae..4b0d14c9c2c 100644 --- a/package/mpfr/mpfr.hash +++ b/package/mpfr/mpfr.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 0c98a3f1732ff6ca4ea690552079da9c597872d30e96ec28414ee23c95558a7f mpfr-4.1.0.tar.xz +sha256 ffd195bd567dbaffc3b98b23fd00aad0537680c9896171e44fe3ff79e28ac33d mpfr-4.1.1.tar.xz # Hash for license file sha256 e3a994d82e644b03a792a930f574002658412f62407f5fee083f2555c5f23118 COPYING.LESSER diff --git a/package/mpfr/mpfr.mk b/package/mpfr/mpfr.mk index cd558dae0ea..8d12c7502be 100644 --- a/package/mpfr/mpfr.mk +++ b/package/mpfr/mpfr.mk @@ -4,7 +4,7 @@ # ################################################################################ -MPFR_VERSION = 4.1.0 +MPFR_VERSION = 4.1.1 MPFR_SITE = http://www.mpfr.org/mpfr-$(MPFR_VERSION) MPFR_SOURCE = mpfr-$(MPFR_VERSION).tar.xz MPFR_LICENSE = LGPL-3.0+ diff --git a/package/mpir/mpir.mk b/package/mpir/mpir.mk index 91f704d30cd..5dbd760aa1f 100644 --- a/package/mpir/mpir.mk +++ b/package/mpir/mpir.mk @@ -36,4 +36,8 @@ ifeq ($(BR2_powerpc64le),y) MPIR_CONF_ENV += MPN_PATH="generic" endif +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +MPIR_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" +endif + $(eval $(autotools-package)) diff --git a/package/mpv/Config.in b/package/mpv/Config.in index 81b1e24b5f0..8efb353c333 100644 --- a/package/mpv/Config.in +++ b/package/mpv/Config.in @@ -8,10 +8,12 @@ config BR2_PACKAGE_MPV bool "mpv" depends on BR2_INSTALL_LIBSTDCPP # libass depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libass - depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C11/stdatomic.h depends on BR2_TOOLCHAIN_HAS_ATOMIC + 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_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_FFMPEG select BR2_PACKAGE_FFMPEG_SWSCALE @@ -32,10 +34,10 @@ config BR2_PACKAGE_MPV https://mpv.io/ -comment "mpv needs a toolchain w/ C++, threads, gcc >= 4.9" +comment "mpv needs a toolchain w/ C++, NPTL, gcc >= 4.9" depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/mpv/mpv.mk b/package/mpv/mpv.mk index ff77f248e56..f9250070d13 100644 --- a/package/mpv/mpv.mk +++ b/package/mpv/mpv.mk @@ -39,8 +39,7 @@ else MPV_CONF_OPTS += --enable-libmpv-shared --disable-libmpv-static endif -# ALSA support requires pcm+mixer -ifeq ($(BR2_PACKAGE_ALSA_LIB_MIXER)$(BR2_PACKAGE_ALSA_LIB_PCM),yy) +ifeq ($(BR2_PACKAGE_ALSA_LIB),y) MPV_CONF_OPTS += --enable-alsa MPV_DEPENDENCIES += alsa-lib else diff --git a/package/msmtp/msmtp.hash b/package/msmtp/msmtp.hash index 1e73d92470f..c5571f2fb34 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.14.tar.xz.sig +# https://marlam.de/msmtp/releases/msmtp-1.8.22.tar.xz.sig # with key 2F61B4828BBA779AECB3F32703A2A4AB1E32FD34 -sha256 d56f065d711486e9c234618515a02a48a48dab4051b34f3e108fbecb6fb773b4 msmtp-1.8.14.tar.xz +sha256 1b04206286a5b82622335e4eb09e17074368b7288e53d134543cbbc6b79ea3e7 msmtp-1.8.22.tar.xz # Hash for license file: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/msmtp/msmtp.mk b/package/msmtp/msmtp.mk index 3db36f4cd09..c3928ffcbb1 100644 --- a/package/msmtp/msmtp.mk +++ b/package/msmtp/msmtp.mk @@ -4,7 +4,7 @@ # ################################################################################ -MSMTP_VERSION = 1.8.14 +MSMTP_VERSION = 1.8.22 MSMTP_SITE = https://marlam.de/msmtp/releases MSMTP_SOURCE = msmtp-$(MSMTP_VERSION).tar.xz MSMTP_DEPENDENCIES = host-pkgconf diff --git a/package/mstpd/0001-bridge-stp.in-support-different-versions-of-pidof-13.patch b/package/mstpd/0001-bridge-stp.in-support-different-versions-of-pidof-13.patch new file mode 100644 index 00000000000..daa591131b0 --- /dev/null +++ b/package/mstpd/0001-bridge-stp.in-support-different-versions-of-pidof-13.patch @@ -0,0 +1,48 @@ +From 181c453fc1a00573e19f14960dcc54ad84beea7c Mon Sep 17 00:00:00 2001 +From: colin-foster-in-advantage +Date: Tue, 12 Jul 2022 23:01:09 -0700 +Subject: [PATCH] bridge-stp.in: support different versions of pidof (#137) + +* bridge-stp.in: support different versions of pidof + +Busybox uses a version of pdiof that doesn't support the -c option. As +such, this renders mstpd non-functional on any Busybox system. + +Just use the standard form of pidof to detect any running instances of mstpd. + +Signed-off-by: Colin Foster +--- + bridge-stp.in | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/bridge-stp.in b/bridge-stp.in +index 47cbe79..3807873 100755 +--- a/bridge-stp.in ++++ b/bridge-stp.in +@@ -139,7 +139,7 @@ case "$action" in + fi + + # Start mstpd if necessary. +- if ! pidof -c -s mstpd >/dev/null; then ++ if ! pidof -s mstpd >/dev/null; then + if [ "$MANAGE_MSTPD" != 'y' ]; then + errmsg 'mstpd is not running' + exit 3 +@@ -212,12 +212,12 @@ case "$action" in + done + + # Kill mstpd, since no bridges are currently using it. +- kill $(pidof -c mstpd) ++ kill $(pidof mstpd) + ;; + restart|restart_config) + if [ "$action" = 'restart' ]; then + # Kill mstpd. +- pids="$(pidof -c mstpd)" ; Err=$? ++ pids="$(pidof mstpd)" ; Err=$? + if [ $Err -eq 0 ]; then + echo 'Stopping mstpd ...' + kill $pids +-- +2.25.1 + diff --git a/package/mstpd/mstpd.mk b/package/mstpd/mstpd.mk index 907d0942423..07c41af8dfd 100644 --- a/package/mstpd/mstpd.mk +++ b/package/mstpd/mstpd.mk @@ -10,4 +10,8 @@ MSTPD_AUTORECONF = YES MSTPD_LICENSE = GPL-2.0, RSA Data Security (md5) MSTPD_LICENSE_FILES = LICENSE hmac_md5.c +# The Linux kernel requires mstp binaries to be installed into /sbin, +# not /usr/sbin. +MSTPD_CONF_OPTS = --sbindir=/sbin + $(eval $(autotools-package)) diff --git a/package/mtd/Config.in b/package/mtd/Config.in index c45dd1e2b76..3ba48da645f 100644 --- a/package/mtd/Config.in +++ b/package/mtd/Config.in @@ -71,6 +71,9 @@ config BR2_PACKAGE_MTD_JFFS2DUMP bool "jffs2dump" select BR2_PACKAGE_MTD_JFFS_UTILS +config BR2_PACKAGE_MTD_LSMTD + bool "lsmtd" + config BR2_PACKAGE_MTD_MKFSJFFS2 bool "mkfs.jffs2" select BR2_PACKAGE_MTD_JFFS_UTILS diff --git a/package/mtd/mtd.hash b/package/mtd/mtd.hash index 481788f8443..a2133e3ce23 100644 --- a/package/mtd/mtd.hash +++ b/package/mtd/mtd.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-2.1.3.tar.bz2.asc -sha256 11305a5daf6fc6ed85120695c8593290b577effb039adbfa63d35b4418ff5630 mtd-utils-2.1.3.tar.bz2 +# ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-2.1.5.tar.bz2.asc +sha256 386e27fd121699b6b729bc2e8e04dda987b31cca6b16e12fb6cc6dcf26449f46 mtd-utils-2.1.5.tar.bz2 sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk index 45e7c0c61c9..db2b104586d 100644 --- a/package/mtd/mtd.mk +++ b/package/mtd/mtd.mk @@ -4,7 +4,7 @@ # ################################################################################ -MTD_VERSION = 2.1.3 +MTD_VERSION = 2.1.5 MTD_SOURCE = mtd-utils-$(MTD_VERSION).tar.bz2 MTD_SITE = ftp://ftp.infradead.org/pub/mtd-utils MTD_LICENSE = GPL-2.0 @@ -94,6 +94,7 @@ MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_UNLOCK) += flash_unlock MTD_TARGETS_$(BR2_PACKAGE_MTD_FTL_CHECK) += ftl_check MTD_TARGETS_$(BR2_PACKAGE_MTD_FTL_FORMAT) += ftl_format MTD_TARGETS_$(BR2_PACKAGE_MTD_JFFS2DUMP) += jffs2dump +MTD_TARGETS_$(BR2_PACKAGE_MTD_LSMTD) += lsmtd MTD_TARGETS_$(BR2_PACKAGE_MTD_MKFSJFFS2) += mkfs.jffs2 MTD_TARGETS_$(BR2_PACKAGE_MTD_MTD_DEBUG) += mtd_debug MTD_TARGETS_$(BR2_PACKAGE_MTD_MTDPART) += mtdpart diff --git a/package/mtools/mtools.hash b/package/mtools/mtools.hash index 5d1bca486fe..a162bfdc95d 100644 --- a/package/mtools/mtools.hash +++ b/package/mtools/mtools.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 f4dd1fb4b4d72f344f7efcfb05219de3882c6c6fce678d75e7cfb29ca162c7ca mtools-4.0.37.tar.lz +sha256 7086821b399a39b8a3c5a372d064de4860f3c195b4911dd4e8b76219fcabe75c mtools-4.0.38.tar.lz # Locally calculated sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/mtools/mtools.mk b/package/mtools/mtools.mk index f73fd5d231d..c875814bc7e 100644 --- a/package/mtools/mtools.mk +++ b/package/mtools/mtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -MTOOLS_VERSION = 4.0.37 +MTOOLS_VERSION = 4.0.38 MTOOLS_SOURCE = mtools-$(MTOOLS_VERSION).tar.lz MTOOLS_SITE = $(BR2_GNU_MIRROR)/mtools MTOOLS_LICENSE = GPL-3.0+ diff --git a/package/mtr/mtr.hash b/package/mtr/mtr.hash index d6062ef08f3..399799f49e4 100644 --- a/package/mtr/mtr.hash +++ b/package/mtr/mtr.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ea036fdd45da488c241603f6ea59a06bbcfe6c26177ebd34fff54336a44494b8 mtr-0.94.tar.gz +sha256 12490fb660ba5fb34df8c06a0f62b4f9cbd11a584fc3f6eceda0a99124e8596f mtr-0.95.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/mtr/mtr.mk b/package/mtr/mtr.mk index 07c58a1e93a..d3e3b1a97a3 100644 --- a/package/mtr/mtr.mk +++ b/package/mtr/mtr.mk @@ -4,7 +4,7 @@ # ################################################################################ -MTR_VERSION = 0.94 +MTR_VERSION = 0.95 MTR_SITE = $(call github,traviscross,mtr,v$(MTR_VERSION)) MTR_AUTORECONF = YES MTR_DEPENDENCIES = \ diff --git a/package/multicat/multicat.hash b/package/multicat/multicat.hash index 9cf84bc50f5..63acc15f45e 100644 --- a/package/multicat/multicat.hash +++ b/package/multicat/multicat.hash @@ -1,6 +1,6 @@ # From https://get.videolan.org/multicat/2.3/multicat-2.3.tar.bz2.md5 -md5 cf4e4bc07d72eda110050d755db14620 multicat-2.3.tar.bz2 +md5 cf4e4bc07d72eda110050d755db14620 multicat-2.3.tar.bz2 # From https://get.videolan.org/multicat/2.3/multicat-2.3.tar.bz2.sha256 -sha256 2be162e9e8b2e6f6aa7686431f102db6c72c8288bd82dbc67ffed631f4a3361e multicat-2.3.tar.bz2 +sha256 2be162e9e8b2e6f6aa7686431f102db6c72c8288bd82dbc67ffed631f4a3361e multicat-2.3.tar.bz2 # locally calculated -sha256 94f68aec169fb6c9937eade757251714d38a56812be5dbfc3973914a71ad8d2d COPYING +sha256 94f68aec169fb6c9937eade757251714d38a56812be5dbfc3973914a71ad8d2d COPYING diff --git a/package/multipath-tools/0001-kpartx-libmultipath-use-pkg-config-to-get-path-to-he.patch b/package/multipath-tools/0001-kpartx-libmultipath-use-pkg-config-to-get-path-to-he.patch deleted file mode 100644 index 0d46f12a694..00000000000 --- a/package/multipath-tools/0001-kpartx-libmultipath-use-pkg-config-to-get-path-to-he.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 922855e245c8bdadc0d24b5b706549b18fb5f079 Mon Sep 17 00:00:00 2001 -From: Alexander Egorenkov -Date: Sat, 21 Nov 2020 11:08:56 +0100 -Subject: [PATCH] kpartx, libmultipath: use pkg-config to get path to - headers - -Use pkg-config in Makefile to find path to devmapper and udev headers -to enable cross-compilation. - -Signed-off-by: Alexander Egorenkov ---- - kpartx/Makefile | 2 +- - libmultipath/Makefile | 12 ++++++------ - 2 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/kpartx/Makefile b/kpartx/Makefile -index 2906a984..29573890 100644 ---- a/kpartx/Makefile -+++ b/kpartx/Makefile -@@ -8,7 +8,7 @@ LDFLAGS += $(BIN_LDFLAGS) - - LIBDEPS += -ldevmapper - --ifneq ($(call check_func,dm_task_set_cookie,/usr/include/libdevmapper.h),0) -+ifneq ($(call check_func,dm_task_set_cookie,$(shell $(PKG_CONFIG) --variable=includedir devmapper)/libdevmapper.h),0) - CFLAGS += -DLIBDM_API_COOKIE - endif - -diff --git a/libmultipath/Makefile b/libmultipath/Makefile -index 62ba16e8..3ad9130c 100644 ---- a/libmultipath/Makefile -+++ b/libmultipath/Makefile -@@ -20,27 +20,27 @@ ifdef SYSTEMD - endif - endif - --ifneq ($(call check_func,dm_task_no_flush,/usr/include/libdevmapper.h),0) -+ifneq ($(call check_func,dm_task_no_flush,$(shell $(PKG_CONFIG) --variable=includedir devmapper)/libdevmapper.h),0) - CFLAGS += -DLIBDM_API_FLUSH -D_GNU_SOURCE - endif - --ifneq ($(call check_func,dm_task_get_errno,/usr/include/libdevmapper.h),0) -+ifneq ($(call check_func,dm_task_get_errno,$(shell $(PKG_CONFIG) --variable=includedir devmapper)/libdevmapper.h),0) - CFLAGS += -DLIBDM_API_GET_ERRNO - endif - --ifneq ($(call check_func,dm_task_set_cookie,/usr/include/libdevmapper.h),0) -+ifneq ($(call check_func,dm_task_set_cookie,$(shell $(PKG_CONFIG) --variable=includedir devmapper)/libdevmapper.h),0) - CFLAGS += -DLIBDM_API_COOKIE - endif - --ifneq ($(call check_func,udev_monitor_set_receive_buffer_size,/usr/include/libudev.h),0) -+ifneq ($(call check_func,udev_monitor_set_receive_buffer_size,$(shell $(PKG_CONFIG) --variable=includedir libudev)/libudev.h),0) - CFLAGS += -DLIBUDEV_API_RECVBUF - endif - --ifneq ($(call check_func,dm_task_deferred_remove,/usr/include/libdevmapper.h),0) -+ifneq ($(call check_func,dm_task_deferred_remove,$(shell $(PKG_CONFIG) --variable=includedir devmapper)/libdevmapper.h),0) - CFLAGS += -DLIBDM_API_DEFERRED - endif - --ifneq ($(call check_func,dm_hold_control_dev,/usr/include/libdevmapper.h),0) -+ifneq ($(call check_func,dm_hold_control_dev,$(shell $(PKG_CONFIG) --variable=includedir devmapper)/libdevmapper.h),0) - CFLAGS += -DLIBDM_API_HOLD_CONTROL - endif - --- -2.29.2 - diff --git a/package/multipath-tools/0002-Makefile.inc-Enable-systemd-if-ENABLE_SYSTEMD-is-def.patch b/package/multipath-tools/0002-Makefile.inc-Enable-systemd-if-ENABLE_SYSTEMD-is-def.patch deleted file mode 100644 index 133094a7f79..00000000000 --- a/package/multipath-tools/0002-Makefile.inc-Enable-systemd-if-ENABLE_SYSTEMD-is-def.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 8370da992c752e4238de7a8b02ce0e179353c959 Mon Sep 17 00:00:00 2001 -From: Alexander Egorenkov -Date: Sun, 6 Sep 2020 10:37:41 +0200 -Subject: [PATCH] Makefile.inc: Enable systemd if ENABLE_SYSTEMD is defined - -systemd is disabled by default, to activate it set ENABLE_SYSTEMD. - -Signed-off-by: Alexander Egorenkov ---- - Makefile.inc | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/Makefile.inc b/Makefile.inc -index d4d1e0dd..32bc1846 100644 ---- a/Makefile.inc -+++ b/Makefile.inc -@@ -35,6 +35,7 @@ ifndef RUN - endif - endif - -+ifdef ENABLE_SYSTEMD - ifndef SYSTEMD - ifeq ($(shell pkg-config --modversion libsystemd >/dev/null 2>&1 && echo 1), 1) - SYSTEMD = $(shell pkg-config --modversion libsystemd) -@@ -45,6 +46,7 @@ ifndef SYSTEMD - endif - endif - endif -+endif - - ifndef SYSTEMDPATH - SYSTEMDPATH=usr/lib --- -2.28.0 - diff --git a/package/multipath-tools/multipath-tools.hash b/package/multipath-tools/multipath-tools.hash index f063848681e..ecaad05e25a 100644 --- a/package/multipath-tools/multipath-tools.hash +++ b/package/multipath-tools/multipath-tools.hash @@ -1,7 +1,7 @@ # Locally computed: -sha256 ff45ddb18a1effbfbe5712f513dd3b7146c68141091fc1c2489af8d6197026ef multipath-tools-0.8.8.tar.gz +sha256 6ed3cf6e786da20a451d9747cbd4c5817815388b8fc8022d1074b3018479031d multipath-tools-0.9.4.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0 sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 LICENSES/GPL-3.0 sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c LICENSES/LGPL-2.0 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSES/LGPL-2.1 -sha256 b1bd70cc61ab014cc2e744af6b117db481ef4fa5d59cb3a21d86059935c666df README.md +sha256 b8b4369c539d6a61ad2a5a359a1ecdfb9f630a89590216d490314e19bf07aa0c README.md diff --git a/package/multipath-tools/multipath-tools.mk b/package/multipath-tools/multipath-tools.mk index eecfe390023..23b3cc94426 100644 --- a/package/multipath-tools/multipath-tools.mk +++ b/package/multipath-tools/multipath-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -MULTIPATH_TOOLS_VERSION = 0.8.8 +MULTIPATH_TOOLS_VERSION = 0.9.4 MULTIPATH_TOOLS_SITE = $(call github,opensvc,multipath-tools,$(MULTIPATH_TOOLS_VERSION)) MULTIPATH_TOOLS_LICENSE = \ @@ -18,9 +18,11 @@ MULTIPATH_TOOLS_LICENSE_FILES = \ LICENSES/LGPL-2.0 \ LICENSES/LGPL-2.1 \ README.md +MULTIPATH_TOOLS_CPE_ID_VENDOR = opensvc MULTIPATH_TOOLS_DEPENDENCIES = lvm2 json-c readline udev liburcu libaio host-pkgconf MULTIPATH_TOOLS_MAKE_OPTS = \ + kernel_incdir=$(STAGING_DIR)/usr/include \ LIB="lib" \ RUN="run" \ OPTFLAGS="" \ @@ -29,7 +31,8 @@ MULTIPATH_TOOLS_MAKE_OPTS = \ ifeq ($(BR2_PACKAGE_SYSTEMD),y) MULTIPATH_TOOLS_DEPENDENCIES += systemd -MULTIPATH_TOOLS_MAKE_OPTS += ENABLE_SYSTEMD=1 +else +MULTIPATH_TOOLS_MAKE_OPTS += SYSTEMD="" endif define MULTIPATH_TOOLS_BUILD_CMDS diff --git a/package/mupdf/0001-Add-missing-limits.h-include-for-UINT_MAX.patch b/package/mupdf/0001-Add-missing-limits.h-include-for-UINT_MAX.patch new file mode 100644 index 00000000000..95f2f86666d --- /dev/null +++ b/package/mupdf/0001-Add-missing-limits.h-include-for-UINT_MAX.patch @@ -0,0 +1,70 @@ +From ebce9f1b129ebc8f2b17afa02a4ffcb9453c11d9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?= +Date: Mon, 24 Apr 2023 17:27:35 +0200 +Subject: [PATCH] Add missing limits.h include for UINT_MAX +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +encode-basic.c uses 'UINT_MAX', which is available in the 'limits.h' +header. + +In some configurations that build with zlib from [1], by chance +limits.h gets indirectly included when including 'z-imp.h' (the +includes are: 'z-imp.h' -> 'zlib.h' -> 'zconf.h' -> 'limits.h'), so +the build succeeds. + +When using other zlib implementations however (for example from [2]), +limits.h is not necessarily included indirectly, which leads to the +build failing in the following way: + +source/fitz/encode-basic.c: In function 'deflate_write': +source/fitz/encode-basic.c:343:27: error: 'UINT_MAX' undeclared (first use in this function) + 343 | newbufsize = n >= UINT_MAX ? UINT_MAX : deflateBound(&state->z, n); + | ^~~~~~~~ +source/fitz/encode-basic.c:26:1: note: 'UINT_MAX' is defined in header ''; did you forget to '#include '? + +Add the missing include, so that the build succeeds no matter if zlib +indirectly includes 'limit.h' or not. + +Similarly, also add it in output-ps.c where it's also missing. + +[1]: https://zlib.net/ +[2]: https://github.com/zlib-ng/zlib-ng + +Signed-off-by: Raphaël Mélotte +Upstream: https://bugs.ghostscript.com/show_bug.cgi?id=706667 +--- + source/fitz/encode-basic.c | 2 ++ + source/fitz/output-ps.c | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/source/fitz/encode-basic.c b/source/fitz/encode-basic.c +index 03a4ff76b..84f0c35e6 100644 +--- a/source/fitz/encode-basic.c ++++ b/source/fitz/encode-basic.c +@@ -24,6 +24,8 @@ + + #include "z-imp.h" + ++#include ++ + struct ahx + { + fz_output *chain; +diff --git a/source/fitz/output-ps.c b/source/fitz/output-ps.c +index ef22c3cd6..3dc8ea17d 100644 +--- a/source/fitz/output-ps.c ++++ b/source/fitz/output-ps.c +@@ -24,6 +24,8 @@ + + #include "z-imp.h" + ++#include ++ + typedef struct ps_band_writer_s + { + fz_band_writer super; +-- +2.39.1 + diff --git a/package/mupdf/0001-Makefile-add-an-install_libs-target.patch b/package/mupdf/0001-Makefile-add-an-install_libs-target.patch deleted file mode 100644 index 9cb5a2fec9d..00000000000 --- a/package/mupdf/0001-Makefile-add-an-install_libs-target.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 0989f13ecbc2155b05da0cb091801d32d750d2d4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?= - -Date: Thu, 29 Aug 2019 09:51:02 +0200 -Subject: [PATCH] Makefile: add an install_libs target. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This allows to install only the library files (if you need pymupdf but -not mupdf binaries for example). - -Signed-off-by: Raphaël Mélotte ---- - Makefile | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index c5bc541ac..e14f88526 100644 ---- a/Makefile -+++ b/Makefile -@@ -322,7 +322,7 @@ libs: $(INSTALL_LIBS) - tools: $(TOOL_APPS) - apps: $(TOOL_APPS) $(VIEW_APPS) - --install: libs apps -+install_libs: - install -d $(DESTDIR)$(incdir)/mupdf - install -d $(DESTDIR)$(incdir)/mupdf/fitz - install -d $(DESTDIR)$(incdir)/mupdf/pdf -@@ -333,6 +333,7 @@ install: libs apps - install -d $(DESTDIR)$(libdir) - install -m 644 $(INSTALL_LIBS) $(DESTDIR)$(libdir) - -+install: libs apps install_libs - install -d $(DESTDIR)$(bindir) - install -m 755 $(TOOL_APPS) $(VIEW_APPS) $(DESTDIR)$(bindir) - --- -2.21.0 - diff --git a/package/mupdf/0002-Bug-703366-Fix-double-free-of-object-during-linearization.patch b/package/mupdf/0002-Bug-703366-Fix-double-free-of-object-during-linearization.patch deleted file mode 100644 index a4746961a6d..00000000000 --- a/package/mupdf/0002-Bug-703366-Fix-double-free-of-object-during-linearization.patch +++ /dev/null @@ -1,52 +0,0 @@ -From cee7cefc610d42fd383b3c80c12cbc675443176a Mon Sep 17 00:00:00 2001 -From: Robin Watts -Date: Fri, 22 Jan 2021 17:05:15 +0000 -Subject: [PATCH] Bug 703366: Fix double free of object during linearization. - -This appears to happen because we parse an illegal object from -a broken file and assign it to object 0, which is defined to -be free. - -Here, we fix the parsing code so this can't happen. - -[Retrieved from: -http://git.ghostscript.com/?p=mupdf.git;h=cee7cefc610d42fd383b3c80c12cbc675443176a] -Signed-off-by: Fabrice Fontaine ---- - source/pdf/pdf-parse.c | 6 ++++++ - source/pdf/pdf-xref.c | 2 ++ - 2 files changed, 8 insertions(+) - -diff --git a/source/pdf/pdf-parse.c b/source/pdf/pdf-parse.c -index 7abc8c3d4..5761c3351 100644 ---- a/source/pdf/pdf-parse.c -+++ b/source/pdf/pdf-parse.c -@@ -749,6 +749,12 @@ pdf_parse_ind_obj(fz_context *ctx, pdf_document *doc, - fz_throw(ctx, FZ_ERROR_SYNTAX, "expected generation number (%d ? obj)", num); - } - gen = buf->i; -+ if (gen < 0 || gen >= 65536) -+ { -+ if (try_repair) -+ *try_repair = 1; -+ fz_throw(ctx, FZ_ERROR_SYNTAX, "invalid generation number (%d)", gen); -+ } - - tok = pdf_lex(ctx, file, buf); - if (tok != PDF_TOK_OBJ) -diff --git a/source/pdf/pdf-xref.c b/source/pdf/pdf-xref.c -index 1b2bdcd59..30197b4b8 100644 ---- a/source/pdf/pdf-xref.c -+++ b/source/pdf/pdf-xref.c -@@ -1190,6 +1190,8 @@ pdf_read_new_xref(fz_context *ctx, pdf_document *doc, pdf_lexbuf *buf) - { - ofs = fz_tell(ctx, doc->file); - trailer = pdf_parse_ind_obj(ctx, doc, doc->file, buf, &num, &gen, &stm_ofs, NULL); -+ if (num == 0) -+ fz_throw(ctx, FZ_ERROR_GENERIC, "Trailer object number cannot be 0\n"); - } - fz_catch(ctx) - { --- -2.17.1 - diff --git a/package/mupdf/0003-Bug-703791-Stay-within-hash-table-max-key-size-in-cached-color-converter.patch b/package/mupdf/0003-Bug-703791-Stay-within-hash-table-max-key-size-in-cached-color-converter.patch deleted file mode 100644 index 5335f140d69..00000000000 --- a/package/mupdf/0003-Bug-703791-Stay-within-hash-table-max-key-size-in-cached-color-converter.patch +++ /dev/null @@ -1,119 +0,0 @@ -From f5712c9949d026e4b891b25837edd2edc166151f Mon Sep 17 00:00:00 2001 -From: Tor Andersson -Date: Tue, 20 Apr 2021 14:46:48 +0200 -Subject: [PATCH] Bug 703791: Stay within hash table max key size in cached - color converter. - -[Retrieved from: -http://git.ghostscript.com/?p=mupdf.git;h=f5712c9949d026e4b891b25837edd2edc166151f] -Signed-off-by: Fabrice Fontaine ---- - include/mupdf/fitz/hash.h | 2 ++ - source/fitz/colorspace.c | 40 ++++++++++++++++++++++++--------------- - source/fitz/hash.c | 7 +++---- - 3 files changed, 30 insertions(+), 19 deletions(-) - -diff --git a/include/mupdf/fitz/hash.h b/include/mupdf/fitz/hash.h -index e92eb0458..feb37a5e4 100644 ---- a/include/mupdf/fitz/hash.h -+++ b/include/mupdf/fitz/hash.h -@@ -5,6 +5,8 @@ - #include "mupdf/fitz/context.h" - #include "mupdf/fitz/output.h" - -+#define FZ_HASH_TABLE_KEY_LENGTH 48 -+ - /** - Generic hash-table with fixed-length keys. - -diff --git a/source/fitz/colorspace.c b/source/fitz/colorspace.c -index af454caf1..f4db9d3d2 100644 ---- a/source/fitz/colorspace.c -+++ b/source/fitz/colorspace.c -@@ -1025,23 +1025,30 @@ typedef struct fz_cached_color_converter - static void fz_cached_color_convert(fz_context *ctx, fz_color_converter *cc_, const float *ss, float *ds) - { - fz_cached_color_converter *cc = cc_->opaque; -- float *val = fz_hash_find(ctx, cc->hash, ss); -- int n = cc->base.ds->n * sizeof(float); -- -- if (val) -+ if (cc->hash) - { -- memcpy(ds, val, n); -- return; -- } -+ float *val = fz_hash_find(ctx, cc->hash, ss); -+ int n = cc->base.ds->n * sizeof(float); - -- cc->base.convert(ctx, &cc->base, ss, ds); -+ if (val) -+ { -+ memcpy(ds, val, n); -+ return; -+ } - -- val = Memento_label(fz_malloc_array(ctx, cc->base.ds->n, float), "cached_color_convert"); -- memcpy(val, ds, n); -- fz_try(ctx) -- fz_hash_insert(ctx, cc->hash, ss, val); -- fz_catch(ctx) -- fz_free(ctx, val); -+ cc->base.convert(ctx, &cc->base, ss, ds); -+ -+ val = Memento_label(fz_malloc_array(ctx, cc->base.ds->n, float), "cached_color_convert"); -+ memcpy(val, ds, n); -+ fz_try(ctx) -+ fz_hash_insert(ctx, cc->hash, ss, val); -+ fz_catch(ctx) -+ fz_free(ctx, val); -+ } -+ else -+ { -+ cc->base.convert(ctx, &cc->base, ss, ds); -+ } - } - - void fz_init_cached_color_converter(fz_context *ctx, fz_color_converter *cc, fz_colorspace *ss, fz_colorspace *ds, fz_colorspace *is, fz_color_params params) -@@ -1060,7 +1067,10 @@ void fz_init_cached_color_converter(fz_context *ctx, fz_color_converter *cc, fz_ - fz_try(ctx) - { - fz_find_color_converter(ctx, &cached->base, ss, ds, is, params); -- cached->hash = fz_new_hash_table(ctx, 256, n * sizeof(float), -1, fz_free); -+ if (n * sizeof(float) <= FZ_HASH_TABLE_KEY_LENGTH) -+ cached->hash = fz_new_hash_table(ctx, 256, n * sizeof(float), -1, fz_free); -+ else -+ fz_warn(ctx, "colorspace has too many components to be cached"); - } - fz_catch(ctx) - { -diff --git a/source/fitz/hash.c b/source/fitz/hash.c -index 882b886c9..287d43f03 100644 ---- a/source/fitz/hash.c -+++ b/source/fitz/hash.c -@@ -11,11 +11,9 @@ - and removed frequently. - */ - --enum { MAX_KEY_LEN = 48 }; -- - typedef struct - { -- unsigned char key[MAX_KEY_LEN]; -+ unsigned char key[FZ_HASH_TABLE_KEY_LENGTH]; - void *val; - } fz_hash_entry; - -@@ -50,7 +48,8 @@ fz_new_hash_table(fz_context *ctx, int initialsize, int keylen, int lock, fz_has - { - fz_hash_table *table; - -- assert(keylen <= MAX_KEY_LEN); -+ if (keylen > FZ_HASH_TABLE_KEY_LENGTH) -+ fz_throw(ctx, FZ_ERROR_GENERIC, "hash table key length too large"); - - table = fz_malloc_struct(ctx, fz_hash_table); - table->keylen = keylen; --- -2.17.1 - diff --git a/package/mupdf/0004-Makefile-compile-hexdump.exe-with-HOSTCC.patch b/package/mupdf/0004-Makefile-compile-hexdump.exe-with-HOSTCC.patch deleted file mode 100644 index bc9debd3326..00000000000 --- a/package/mupdf/0004-Makefile-compile-hexdump.exe-with-HOSTCC.patch +++ /dev/null @@ -1,40 +0,0 @@ -From c0036573a995dc78d3cf60a30ff0af2b47f3680a Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 14 Nov 2021 23:24:27 +0100 -Subject: [PATCH] Makefile: compile hexdump.exe with HOSTCC - -hexdump.exe must be compiled for the host or the build will fail when -cross-compiling with HAVE_OBJCOPY=no - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://bugs.ghostscript.com/show_bug.cgi?id=704442] ---- - Makefile | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/Makefile b/Makefile -index 6492b1ca3..0732b358f 100644 ---- a/Makefile -+++ b/Makefile -@@ -60,6 +60,8 @@ AR_CMD = $(QUIET_AR) $(MKTGTDIR) ; $(AR) cr $@ $^ - ifdef RANLIB - RANLIB_CMD = $(QUIET_RANLIB) $(RANLIB) $@ - endif -+HOSTCC ?= $(CC) -+HOST_LINK_CMD = $(QUIET_LINK) $(MKTGTDIR) ; $(HOSTCC) -o $@ $^ - LINK_CMD = $(QUIET_LINK) $(MKTGTDIR) ; $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) - TAGS_CMD = $(QUIET_TAGS) ctags -R --c-kinds=+p --exclude=platform/python --exclude=platform/c++ - WINDRES_CMD = $(QUIET_WINDRES) $(MKTGTDIR) ; $(WINDRES) $< $@ -@@ -81,6 +83,9 @@ $(OUT)/%.a : - $(AR_CMD) - $(RANLIB_CMD) - -+$(OUT)/scripts/hexdump.exe: scripts/hexdump.c -+ $(HOST_LINK_CMD) -+ - $(OUT)/%.exe: %.c - $(LINK_CMD) - --- -2.33.0 - diff --git a/package/mupdf/mupdf.hash b/package/mupdf/mupdf.hash index 934836e76af..ef91abee18a 100644 --- a/package/mupdf/mupdf.hash +++ b/package/mupdf/mupdf.hash @@ -1,8 +1,8 @@ # From https://mupdf.com/downloads/index.html: -sha1 fc17bd01d5860e49b009f28a5ddb629e94af4510 mupdf-1.18.0-source.tar.xz +sha1 f759d914ec6ad6a3b96f994630ff70b75823831b mupdf-1.21.1-source.tar.lz # Locally computed: -sha256 592d4f6c0fba41bb954eb1a41616661b62b134d5b383e33bd45a081af5d4a59a mupdf-1.18.0-source.tar.xz +sha256 66a43490676c7f7c2ff74067328ef13285506fcc758d365ae27ea3668bd5e620 mupdf-1.21.1-source.tar.lz # Hash for license files: sha256 57c8ff33c9c0cfc3ef00e650a1cc910d7ee479a8bc509f6c9209a7c2a11399d6 COPYING diff --git a/package/mupdf/mupdf.mk b/package/mupdf/mupdf.mk index 56ea7cc507e..4c35ba500ef 100644 --- a/package/mupdf/mupdf.mk +++ b/package/mupdf/mupdf.mk @@ -5,8 +5,8 @@ ################################################################################ # python-pymupdf's version must match mupdf's version -MUPDF_VERSION = 1.18.0 -MUPDF_SOURCE = mupdf-$(MUPDF_VERSION)-source.tar.xz +MUPDF_VERSION = 1.21.1 +MUPDF_SOURCE = mupdf-$(MUPDF_VERSION)-source.tar.lz MUPDF_SITE = https://mupdf.com/downloads/archive MUPDF_LICENSE = AGPL-3.0+ MUPDF_LICENSE_FILES = COPYING @@ -22,12 +22,6 @@ MUPDF_DEPENDENCIES = \ xlib_libX11 \ zlib -# 0002-Bug-703366-Fix-double-free-of-object-during-linearization.patch -MUPDF_IGNORE_CVES += CVE-2021-3407 - -# 0003-Bug-703791-Stay-within-hash-table-max-key-size-in-cached-color-converter.patch -MUPDF_IGNORE_CVES += CVE-2021-37220 - # The pkg-config name for gumbo-parser is `gumbo`. MUPDF_PKG_CONFIG_PACKAGES = \ freetype2 \ @@ -68,7 +62,7 @@ endef define MUPDF_INSTALL_STAGING_CMDS $(MUPDF_MAKE_ENV) $(MAKE) -C $(@D) $(MUPDF_MAKE_OPTS) \ - DESTDIR="$(STAGING_DIR)" install_libs + DESTDIR="$(STAGING_DIR)" install-libs endef define MUPDF_INSTALL_TARGET_CMDS diff --git a/package/murata-cyw-fw/murata-cyw-fw.hash b/package/murata-cyw-fw/murata-cyw-fw.hash index c1afb229eb4..d3c23dca71e 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 3a892759b73e8b459f1a750954b316118b0061fd9d1868d11fa258c104ee7e0c LICENCE.cypress +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 3a892759b73e8b459f1a750954b316118b0061fd9d1868d11fa258c104ee7e0c LICENCE.cypress diff --git a/package/musepack/musepack.hash b/package/musepack/musepack.hash index b811edd9911..5a03bd260a6 100644 --- a/package/musepack/musepack.hash +++ b/package/musepack/musepack.hash @@ -1,5 +1,5 @@ # From https://www.musepack.net/index.php?pg=src -md5 754d67be67f713e54baf70fcfdb2817e musepack_src_r475.tar.gz +md5 754d67be67f713e54baf70fcfdb2817e musepack_src_r475.tar.gz # Calculated based on the hash above sha256 a4b1742f997f83e1056142d556a8c20845ba764b70365ff9ccf2e3f81c427b2b musepack_src_r475.tar.gz # Locally computed diff --git a/package/musl-compat-headers/musl-compat-headers.hash b/package/musl-compat-headers/musl-compat-headers.hash index f8e2a6c5987..626145df34f 100644 --- a/package/musl-compat-headers/musl-compat-headers.hash +++ b/package/musl-compat-headers/musl-compat-headers.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 c13407edd0e33be73cae72514cb234f8612e1c0e54401c9448daffd3a240158b queue.h?rev=1.70 +sha256 c13407edd0e33be73cae72514cb234f8612e1c0e54401c9448daffd3a240158b queue.h?rev=1.70 diff --git a/package/musl-fts/musl-fts.hash b/package/musl-fts/musl-fts.hash index 8838c84793f..e1266cfcd71 100644 --- a/package/musl-fts/musl-fts.hash +++ b/package/musl-fts/musl-fts.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 49ae567a96dbab22823d045ffebe0d6b14b9b799925e9ca9274d47d26ff482a6 musl-fts-1.2.7.tar.gz -sha256 55af87e4017668f54467a3380e7ebbac5e672d8c763bfe95e6fc882a6fdc4046 COPYING +sha256 49ae567a96dbab22823d045ffebe0d6b14b9b799925e9ca9274d47d26ff482a6 musl-fts-1.2.7.tar.gz +sha256 55af87e4017668f54467a3380e7ebbac5e672d8c763bfe95e6fc882a6fdc4046 COPYING diff --git a/package/musl/0003-fix-incorrect-parameter-name-in-internal-netlink.h-R.patch b/package/musl/0003-fix-incorrect-parameter-name-in-internal-netlink.h-R.patch new file mode 100644 index 00000000000..fa3057ff082 --- /dev/null +++ b/package/musl/0003-fix-incorrect-parameter-name-in-internal-netlink.h-R.patch @@ -0,0 +1,33 @@ +From 8cf87b3027009c0acac591d9ae80262dc25daccf Mon Sep 17 00:00:00 2001 +From: Ondrej Jirman +Date: Wed, 21 Nov 2018 17:29:21 +0100 +Subject: [PATCH] fix incorrect parameter name in internal netlink.h RTA_OK + macro + +the wrong name works only by accident. + +Signed-off-by: Ondrej Jirman +Signed-off-by: Rich Felker +Signed-off-by: Petr Vorel + +[ upstream status: 8cf87b3027009c0acac591d9ae80262dc25daccf ] +--- + src/network/netlink.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/network/netlink.h b/src/network/netlink.h +index 38acb178..873fabe2 100644 +--- a/src/network/netlink.h ++++ b/src/network/netlink.h +@@ -86,7 +86,7 @@ struct ifaddrmsg { + #define RTA_DATALEN(rta) ((rta)->rta_len-sizeof(struct rtattr)) + #define RTA_DATAEND(rta) ((char*)(rta)+(rta)->rta_len) + #define RTA_NEXT(rta) (struct rtattr*)((char*)(rta)+NETLINK_ALIGN((rta)->rta_len)) +-#define RTA_OK(nlh,end) ((char*)(end)-(char*)(rta) >= sizeof(struct rtattr)) ++#define RTA_OK(rta,end) ((char*)(end)-(char*)(rta) >= sizeof(struct rtattr)) + + #define NLMSG_RTA(nlh,len) ((void*)((char*)(nlh)+sizeof(struct nlmsghdr)+NETLINK_ALIGN(len))) + #define NLMSG_RTAOK(rta,nlh) RTA_OK(rta,NLMSG_DATAEND(nlh)) +-- +2.36.0 + diff --git a/package/musl/Config.in b/package/musl/Config.in index 69da615b632..c1a10bdd583 100644 --- a/package/musl/Config.in +++ b/package/musl/Config.in @@ -1,3 +1,31 @@ +config BR2_PACKAGE_MUSL_ARCH_SUPPORTS + bool + default y if BR2_aarch64 + default y if BR2_arm + default y if BR2_armeb + default y if BR2_i386 + default y if BR2_microblaze + default y if BR2_mips + default y if BR2_mipsel + default y if BR2_mips64 + default y if BR2_mips64el + default y if BR2_or1k + default y if BR2_powerpc + default y if BR2_powerpc64 + default y if BR2_powerpc64le + default y if BR2_RISCV_64 + default y if BR2_sh + default y if BR2_x86_64 + depends on !BR2_powerpc_SPE # not supported, build breaks + depends on !(BR2_powerpc64 || BR2_powerpc64le) || BR2_POWERPC_CPU_HAS_ALTIVEC + # sh2 nommu is supported by musl, but we don't have support + # for it in Buildroot. + depends on BR2_USE_MMU + +config BR2_PACKAGE_MUSL_SUPPORTS + bool + default y if BR2_PACKAGE_MUSL_ARCH_SUPPORTS + config BR2_PACKAGE_MUSL bool default y diff --git a/package/musl/musl.hash b/package/musl/musl.hash index 4ab18cebd84..e093a5358e6 100644 --- a/package/musl/musl.hash +++ b/package/musl/musl.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature from -# https://musl.libc.org/releases/musl-1.2.2.tar.gz.asc -sha256 9b969322012d796dc23dda27a35866034fa67d8fb67e0e2c45c913c3d43219dd musl-1.2.2.tar.gz +# https://musl.libc.org/releases/musl-1.2.3.tar.gz.asc +sha256 7d5b0b6062521e4627e099e4c9dc8248d32a30285e959b7eecaa780cf8cfd4a4 musl-1.2.3.tar.gz sha256 f9bc4423732350eb0b3f7ed7e91d530298476f8fec0c6c427a1c04ade22655af COPYRIGHT diff --git a/package/musl/musl.mk b/package/musl/musl.mk index b89945e3beb..30c3c2fbc01 100644 --- a/package/musl/musl.mk +++ b/package/musl/musl.mk @@ -4,7 +4,7 @@ # ################################################################################ -MUSL_VERSION = 1.2.2 +MUSL_VERSION = 1.2.3 MUSL_SITE = http://www.musl-libc.org/releases MUSL_LICENSE = MIT MUSL_LICENSE_FILES = COPYRIGHT @@ -60,12 +60,14 @@ endef define MUSL_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ DESTDIR=$(STAGING_DIR) install-libs install-tools install-headers + ln -sf libc.so $(STAGING_DIR)/lib/ld-musl* endef define MUSL_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ DESTDIR=$(TARGET_DIR) install-libs $(RM) $(addprefix $(TARGET_DIR)/lib/,crt1.o crtn.o crti.o rcrt1.o Scrt1.o) + ln -sf libc.so $(TARGET_DIR)/lib/ld-musl* endef $(eval $(generic-package)) diff --git a/package/mutt/mutt.hash b/package/mutt/mutt.hash index d439b23aa39..8c4aae3c1c9 100644 --- a/package/mutt/mutt.hash +++ b/package/mutt/mutt.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 92a309e47e363a97d62425bcb71adceae5ab5c4c413dbcac37fa98ed70c12be0 mutt-2.1.5.tar.gz +sha256 043af312f64b8e56f7fd0bf77f84a205d4c498030bd9586457665c47bb18ce38 mutt-2.2.12.tar.gz sha256 732f24b69a6c71cd8e01e4672bb8e12cc1cbb88a50a4665e6ca4fd95000a57ee GPL diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk index 7e9046fe8a8..09f547a0913 100644 --- a/package/mutt/mutt.mk +++ b/package/mutt/mutt.mk @@ -4,7 +4,7 @@ # ################################################################################ -MUTT_VERSION = 2.1.5 +MUTT_VERSION = 2.2.12 MUTT_SITE = https://bitbucket.org/mutt/mutt/downloads MUTT_LICENSE = GPL-2.0+ MUTT_LICENSE_FILES = GPL @@ -37,6 +37,10 @@ MUTT_DEPENDENCIES += libgpgme MUTT_CONF_OPTS += \ --enable-gpgme \ --with-gpgme-prefix=$(STAGING_DIR)/usr + +# Force the path to "gpgrt-config" (from the libgpg-error package) to +# avoid using the one on host, if present. +MUTT_CONF_ENV += GPGRT_CONFIG=$(STAGING_DIR)/usr/bin/gpgrt-config else MUTT_CONF_OPTS += --disable-gpgme endif @@ -53,8 +57,15 @@ else MUTT_CONF_OPTS += --disable-pop endif -# SSL support is only used by imap or pop3 module +# SASL and SSL support are only used by imap or pop3 module ifneq ($(BR2_PACKAGE_MUTT_IMAP)$(BR2_PACKAGE_MUTT_POP3),) +ifeq ($(BR2_PACKAGE_LIBGSASL),y) +MUTT_DEPENDENCIES += libgsasl +MUTT_CONF_OPTS += --with-gsasl +else +MUTT_CONF_OPTS += --without-gsasl +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) MUTT_DEPENDENCIES += openssl MUTT_CONF_OPTS += \ @@ -72,6 +83,7 @@ MUTT_CONF_OPTS += \ endif else MUTT_CONF_OPTS += \ + --without-gsasl \ --without-gnutls \ --without-ssl endif diff --git a/package/mxml/mxml.hash b/package/mxml/mxml.hash index 38056f4c3af..412977dff04 100644 --- a/package/mxml/mxml.hash +++ b/package/mxml/mxml.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 7cf976366f9e8e4f8cff7d35a59bcf6201c769fce9e58015d64f4b6de1fe3dd8 mxml-3.3.tar.gz +sha256 0c663ed1fe393b5619f80101798202eea43534abd7c8aff389022fd8c1dacc32 mxml-3.3.1.tar.gz sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE -sha256 ed63aec4c75b9c21a5156b40052138032269bd27fd6f4bc0c51389807cdc7db9 NOTICE +sha256 7dedb0043b0bbed7880bcc9724b3a3dae4d5ab2dce98a7904703109572b626e3 NOTICE diff --git a/package/mxml/mxml.mk b/package/mxml/mxml.mk index 88d35cb7ee5..d224cf53088 100644 --- a/package/mxml/mxml.mk +++ b/package/mxml/mxml.mk @@ -4,7 +4,7 @@ # ################################################################################ -MXML_VERSION = 3.3 +MXML_VERSION = 3.3.1 MXML_SITE = https://github.com/michaelrsweet/mxml/releases/download/v$(MXML_VERSION) MXML_LICENSE = Apache-2.0 with exceptions MXML_LICENSE_FILES = LICENSE NOTICE diff --git a/package/mxsldr/mxsldr.mk b/package/mxsldr/mxsldr.mk index 239b40ad29a..2375b9f42b5 100644 --- a/package/mxsldr/mxsldr.mk +++ b/package/mxsldr/mxsldr.mk @@ -5,7 +5,8 @@ ################################################################################ MXSLDR_VERSION = 2793a657ab7a22487d21c1b020957806f8ae8383 -MXSLDR_SITE = git://git.denx.de/mxsldr.git +MXSLDR_SITE = https://git.denx.de/mxsldr.git +MXSLDR_SITE_METHOD = git MXSLDR_LICENSE = GPL-2.0+ MXSLDR_LICENSE_FILES = COPYING HOST_MXSLDR_DEPENDENCIES = host-libusb host-pkgconf diff --git a/package/nano/nano.hash b/package/nano/nano.hash index 80529437d17..3ca37c6337e 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/v6/nano-6.0.tar.xz.asc -# using key BFD009061E535052AD0DF2150D28D4D2A0ACE884 -sha256 93ac8cb68b4ad10e0aaeb80a2dd15c5bb89eb665a4844f7ad01c67efcb169ea2 nano-6.0.tar.xz +# https://www.nano-editor.org/dist/v7/nano-7.2.tar.xz.asc +# using key 168E6F4297BFD7A79AFD4496514BBE2EB8E1961F +sha256 86f3442768bd2873cec693f83cdf80b4b444ad3cc14760b74361474fc87a4526 nano-7.2.tar.xz sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING diff --git a/package/nano/nano.mk b/package/nano/nano.mk index 30db3249e7a..8a2003b92a6 100644 --- a/package/nano/nano.mk +++ b/package/nano/nano.mk @@ -4,8 +4,8 @@ # ################################################################################ -NANO_VERSION_MAJOR = 6 -NANO_VERSION = $(NANO_VERSION_MAJOR).0 +NANO_VERSION_MAJOR = 7 +NANO_VERSION = $(NANO_VERSION_MAJOR).2 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/nanomsg/nanomsg.hash b/package/nanomsg/nanomsg.hash index 062ac9f6fb0..04b658e8d8e 100644 --- a/package/nanomsg/nanomsg.hash +++ b/package/nanomsg/nanomsg.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 218b31ae1534ab897cb5c419973603de9ca1a5f54df2e724ab4a188eb416df5a nanomsg-1.1.5.tar.gz +sha256 218b31ae1534ab897cb5c419973603de9ca1a5f54df2e724ab4a188eb416df5a nanomsg-1.1.5.tar.gz # Hash for license file: -sha256 4e51f6a04312ea7c5f4f0e92d91b6415c1eeb09bdaf86a6fd11d93499457c07a COPYING +sha256 4e51f6a04312ea7c5f4f0e92d91b6415c1eeb09bdaf86a6fd11d93499457c07a COPYING diff --git a/package/nasm/nasm.hash b/package/nasm/nasm.hash index 86c67d6ba5e..e9771c1d7f4 100644 --- a/package/nasm/nasm.hash +++ b/package/nasm/nasm.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3caf6729c1073bf96629b57cee31eeb54f4f8129b01902c73428836550b30a3f nasm-2.15.05.tar.xz +sha256 c77745f4802375efeee2ec5c0ad6b7f037ea9c87c92b149a9637ff099f162558 nasm-2.16.01.tar.xz sha256 1563996c52e220e15ef2418e67d39488255aa8c28c89e617074d3afe3ee329e0 LICENSE diff --git a/package/nasm/nasm.mk b/package/nasm/nasm.mk index ecb08893636..043a84cf076 100644 --- a/package/nasm/nasm.mk +++ b/package/nasm/nasm.mk @@ -4,7 +4,7 @@ # ################################################################################ -NASM_VERSION = 2.15.05 +NASM_VERSION = 2.16.01 NASM_SOURCE = nasm-$(NASM_VERSION).tar.xz NASM_SITE = https://www.nasm.us/pub/nasm/releasebuilds/$(NASM_VERSION) NASM_LICENSE = BSD-2-Clause diff --git a/package/nbd/nbd.hash b/package/nbd/nbd.hash index f0df35bc277..f58a89bf9af 100644 --- a/package/nbd/nbd.hash +++ b/package/nbd/nbd.hash @@ -1,7 +1,7 @@ -# From http://sourceforge.net/projects/nbd/files/nbd/3.21/ -md5 c51c4c500fe1ed84c3d5d5dd2ca71d23 nbd-3.21.tar.xz -sha1 88c3296d43d20d7bda97e0f1bab0243a4f6fa880 nbd-3.21.tar.xz +# From http://sourceforge.net/projects/nbd/files/nbd/3.24/ +md5 a6d9e7bbc311a2ed07ef84a58b82b5dd nbd-3.24.tar.xz +sha1 72c59ef5186ae355de6f539a1b348e18cbb8314e nbd-3.24.tar.xz # Locally calculated -sha256 e7688af39d91733bbcd2db08062c44fe503d004e51528740139c44aff6a6bef9 nbd-3.21.tar.xz +sha256 6877156d23a7b33f75eee89d2f5c2c91c542afc3cdcb636dea5a88539a58d10c nbd-3.24.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/nbd/nbd.mk b/package/nbd/nbd.mk index 0a7f08b2cfb..50f698dd24c 100644 --- a/package/nbd/nbd.mk +++ b/package/nbd/nbd.mk @@ -4,11 +4,11 @@ # ################################################################################ -NBD_VERSION = 3.21 +NBD_VERSION = 3.24 NBD_SOURCE = nbd-$(NBD_VERSION).tar.xz NBD_SITE = http://downloads.sourceforge.net/project/nbd/nbd/$(NBD_VERSION) NBD_CONF_OPTS = --enable-lfs -NBD_DEPENDENCIES = host-pkgconf libglib2 +NBD_DEPENDENCIES = host-bison host-pkgconf libglib2 NBD_LICENSE = GPL-2.0 NBD_LICENSE_FILES = COPYING NBD_CPE_ID_VENDOR = network_block_device_project diff --git a/package/ncdu/ncdu.hash b/package/ncdu/ncdu.hash index c2d367f15a3..1e31eaea8ee 100644 --- a/package/ncdu/ncdu.hash +++ b/package/ncdu/ncdu.hash @@ -1,5 +1,7 @@ # From https://dev.yorhel.nl/ncdu -sha256 2b915752a183fae014b5e5b1f0a135b4b408de7488c716e325217c2513980fd4 ncdu-1.16.tar.gz +md5 4186b5be477cc3a0944619ade81f123b ncdu-1.18.tar.gz +sha1 d47ce3cdf317adadc1426817d07899c90b767aba ncdu-1.18.tar.gz +sha256 3c37a1a96580c9c5d2cc352dc3c5eef0d909158c05f1cc29db4712544c8b9f95 ncdu-1.18.tar.gz # computed locally -sha256 e9ed7095eee84ad6804450495738277b539da0c0b2006f50faf8e6e67a0a15aa COPYING +sha256 4590cb935ff8a50cee76ce12c2cb0411c0b06e84c267b478579785dcf328660d COPYING diff --git a/package/ncdu/ncdu.mk b/package/ncdu/ncdu.mk index 59fa8deb25e..240ef9d8eab 100644 --- a/package/ncdu/ncdu.mk +++ b/package/ncdu/ncdu.mk @@ -4,7 +4,7 @@ # ################################################################################ -NCDU_VERSION = 1.16 +NCDU_VERSION = 1.18 NCDU_SITE = http://dev.yorhel.nl/download NCDU_DEPENDENCIES = ncurses diff --git a/package/ncmpc/0002-meson.build-link-with-lintl-if-needed.patch b/package/ncmpc/0002-meson.build-link-with-lintl-if-needed.patch deleted file mode 100644 index 9f599c89e92..00000000000 --- a/package/ncmpc/0002-meson.build-link-with-lintl-if-needed.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 21ad6bf2bcb0745c25a28637449a72eee883a8e2 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 21 Apr 2019 19:19:10 +0200 -Subject: [PATCH] meson.build: link with lintl if needed - -Fixes: - - http://autobuild.buildroot.org/results/d53978fb30d77cb4d10921bf721eff3d066567ce - -Signed-off-by: Fabrice Fontaine -[Upstream status: not sent as upstream already rejected the first patch -on atomic: https://github.com/MusicPlayerDaemon/ncmpc/pull/45] ---- - meson.build | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/meson.build b/meson.build -index 2e6defc..28e9d29 100644 ---- a/meson.build -+++ b/meson.build -@@ -42,6 +42,7 @@ else - error('libintl.h not found') - endif - conf.set('ENABLE_NLS', enable_nls) -+intl_dep = cc.find_library('intl', required: false) - if enable_nls - conf.set_quoted('GETTEXT_PACKAGE', meson.project_name()) - subdir('po') -@@ -356,6 +357,7 @@ ncmpc = executable('ncmpc', - boost_dep, - pcre_dep, - curses_dep, -+ intl_dep, - lirc_dep, - libmpdclient_dep, - ], --- -2.20.1 - diff --git a/package/ncmpc/Config.in b/package/ncmpc/Config.in index eda6e0bbd5d..61c186a4ae4 100644 --- a/package/ncmpc/Config.in +++ b/package/ncmpc/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_NCMPC depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_10 # C++20 select BR2_PACKAGE_LIBMPDCLIENT select BR2_PACKAGE_NCURSES help @@ -14,7 +14,8 @@ config BR2_PACKAGE_NCMPC http://www.musicpd.org/clients/ncmpc/ -comment "ncmpc needs a toolchain w/ C++, wchar, threads, gcc >= 7" +comment "ncmpc needs a toolchain w/ C++, wchar, threads, gcc >= 10" depends on BR2_USE_MMU depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 + !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_10 diff --git a/package/ncmpc/ncmpc.hash b/package/ncmpc/ncmpc.hash index a5d6698a61f..17bc6e3acef 100644 --- a/package/ncmpc/ncmpc.hash +++ b/package/ncmpc/ncmpc.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 177f77cf09dd4ab914e8438be399cdd5d83c9aa992abc8d9abac006bb092934e ncmpc-0.46.tar.xz +sha256 61da23b1bc6c7a593fdc28611932cd7a30fcf6803830e01764c29b8abed2249c ncmpc-0.47.tar.xz # Hash for license file: sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/ncmpc/ncmpc.mk b/package/ncmpc/ncmpc.mk index 41fface525d..5d4702de78a 100644 --- a/package/ncmpc/ncmpc.mk +++ b/package/ncmpc/ncmpc.mk @@ -5,13 +5,14 @@ ################################################################################ NCMPC_VERSION_MAJOR = 0 -NCMPC_VERSION = $(NCMPC_VERSION_MAJOR).46 +NCMPC_VERSION = $(NCMPC_VERSION_MAJOR).47 NCMPC_SOURCE = ncmpc-$(NCMPC_VERSION).tar.xz NCMPC_SITE = http://www.musicpd.org/download/ncmpc/$(NCMPC_VERSION_MAJOR) NCMPC_DEPENDENCIES = \ host-pkgconf \ libmpdclient \ ncurses \ + $(if $(BR2_PACKAGE_LIBICONV),libiconv) \ $(TARGET_NLS_DEPENDENCIES) NCMPC_LICENSE = GPL-2.0+ NCMPC_LICENSE_FILES = COPYING diff --git a/package/ncurses/0001-gcc-5.x-MKlib_gen.patch b/package/ncurses/0001-gcc-5.x-MKlib_gen.patch deleted file mode 100644 index 0106e8077fe..00000000000 --- a/package/ncurses/0001-gcc-5.x-MKlib_gen.patch +++ /dev/null @@ -1,44 +0,0 @@ -Fix gcc 5.x build failure - -Extracted from upstream commit -http://ncurses.scripts.mit.edu/?p=ncurses.git;a=commit;h=97bb4678dc03e753290b39bbff30ba2825df9517. - -+ modify MKlib_gen.sh to work around change in development version of - gcc introduced here: - https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html - https://gcc.gnu.org/ml/gcc-patches/2014-07/msg00236.html - (reports by Marcus Shawcroft, Maohui Lei). - -Original author: Thomas E. Dickey -Signed-off-by: Mikhail Peselnik -[Adam Duskett: Refresh for 6.1] -Signed-off-by: Adam Duskett ---- a/ncurses/base/MKlib_gen.sh 2015-08-06 20:48:24.000000000 -0400 -+++ b/ncurses/base/MKlib_gen.sh 2017-02-07 10:09:01.293962392 -0500 -@@ -505,11 +505,22 @@ - -e 's/gen_$//' \ - -e 's/ / /g' >>$TMP - -+cat >$ED1 < $ED2 -+cat $ED2 >$TMP -+ - $preprocessor $TMP 2>/dev/null \ --| sed \ -- -e 's/ / /g' \ -- -e 's/^ //' \ -- -e 's/_Bool/NCURSES_BOOL/g' \ -+| sed -f $ED1 \ - | $AWK -f $AW2 \ - | sed -f $ED3 \ - | sed \ diff --git a/package/ncurses/Config.in b/package/ncurses/Config.in index 9f7753b06aa..c0086cbbe39 100644 --- a/package/ncurses/Config.in +++ b/package/ncurses/Config.in @@ -6,7 +6,7 @@ config BR2_PACKAGE_NCURSES This package installs only a few vital termcap entries - http://www.gnu.org/software/ncurses/ + https://invisible-island.net/ncurses/ if BR2_PACKAGE_NCURSES diff --git a/package/ncurses/ncurses.hash b/package/ncurses/ncurses.hash index 69115f5caf6..a5f83c8725d 100644 --- a/package/ncurses/ncurses.hash +++ b/package/ncurses/ncurses.hash @@ -1,39 +1,4 @@ -# Locally calculated after checking pgp signature -sha256 aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17 ncurses-6.1.tar.gz -sha256 cf9038be62c49a6b5fe93f33b32f983649b2f4c4c31cc99bd18e1e5871c31443 ncurses-6.1-20190609-patch.sh.bz2 -sha256 4b0a4c6abce4543ac4fd4c3389b14825e73b7cddcbb01a687c5dd837f21a3b04 ncurses-6.1-20190615.patch.gz -sha256 b2302625ec2fa6dce79622670452e56ff6130dc02e655b52177264cfeff84c51 ncurses-6.1-20190623.patch.gz -sha256 48b004a3e5409a02a5e751f996fe487f5ce45be1fff38572f7cc8167b22179bf ncurses-6.1-20190630.patch.gz -sha256 faf849eed92161ac09782badf84a19ad6beae472e87d460905865e08a6ed46e4 ncurses-6.1-20190706.patch.gz -sha256 62d4954bf818659105aa1c21cc27cb2c133e02bdc7d3f6aa548caae2d1db7440 ncurses-6.1-20190713.patch.gz -sha256 0c1a54bd5de9c890d1fabcfa92bf5bf46f7eccc54a48051367e82bdb29636450 ncurses-6.1-20190720.patch.gz -sha256 0bbd08d3bd12686d4427c242d6a8fde2e299698039cd597303af713c5f538f17 ncurses-6.1-20190727.patch.gz -sha256 40e5f350a921dbd03e3d9ff93bc477ec4f1f65878f307c534882fba3b0b40507 ncurses-6.1-20190728.patch.gz -sha256 9648104311e209d17db9556d6efc898d5c80ed5fc80e8aa3cd08769544c839b8 ncurses-6.1-20190803.patch.gz -sha256 fa1f583575717b2538d3a4ea59a67bc17dd07ed46cb99fe2beaf23d1b006e9df ncurses-6.1-20190810.patch.gz -sha256 5e9ae4f1b3e2e2d567a01a8fb2c9b7f3804cae97f28cd483d239afee781b8c2b ncurses-6.1-20190817.patch.gz -sha256 7592e5e610b3e9eeca78897da2330b7518f00e0a59d20df873c88a9b26bc4da9 ncurses-6.1-20190824.patch.gz -sha256 1a9800a5ccc4f2cb572b63cdc8f1431642e014a58a30151af73977614d5c4aac ncurses-6.1-20190831.patch.gz -sha256 87685a6b90225efcd03375eb11b124fd9e95ee4b0f36bcbc82e56a70cd466b33 ncurses-6.1-20190907.patch.gz -sha256 4ddebb6e0e5a67028eb3aca2352c9bd48cf122a512719f93e449e00a3c6634f8 ncurses-6.1-20190914.patch.gz -sha256 4c725fa729d754f4e75af78fda4cf67d60e71c1625b5f4f49b7930c95bb8dd36 ncurses-6.1-20190921.patch.gz -sha256 a830b879b57906b1e480e4785b32cec05081b7849c06c4b116459c4d343ba21b ncurses-6.1-20190928.patch.gz -sha256 d5eae35d920409613f565825e1e215fed89828040aab541328455da38e1a9b7c ncurses-6.1-20191005.patch.gz -sha256 136dbd07254810728c1fcb7614b566e7c3cb6af8c0783019bbb6b4b5e3c1e2c6 ncurses-6.1-20191012.patch.gz -sha256 1d5125b20792e9f534432c3ef2aa68984c713416addeb2c4364c5ae897a3b8b7 ncurses-6.1-20191015.patch.gz -sha256 a6475c05312ba0b12b72b83529c1d283a14c4470414c505fa45451e35f3ffcf5 ncurses-6.1-20191019.patch.gz -sha256 f6c7469f33065faf1d04ac9e9bea1a88142b00b82e3db3674cca9ec24920b4af ncurses-6.1-20191026.patch.gz -sha256 0d0443937b9c04663de25b405bb95e658e7c87e1dd7a726b3813aa7f9b55f69a ncurses-6.1-20191102.patch.gz -sha256 f3b75787918d2f02a2005877e81fdc054c45b8249b43aabb531e3b817bcf7576 ncurses-6.1-20191109.patch.gz -sha256 801d138b55986719aea7f42dc8c0cb618fa9a6edf92d1789a6ba5d61678f7761 ncurses-6.1-20191116.patch.gz -sha256 45f447cf2c7a24295c7b9210473e943a238c57ca80581d121c9a1a3aa05332a6 ncurses-6.1-20191123.patch.gz -sha256 ea758e3b0162348c4d5d6dac56f95809da3b7d0589205661a13430eb93f72f75 ncurses-6.1-20191130.patch.gz -sha256 16b5a588c56a53c468d2359b21d5d8a007c4ef7696de12c964a1b661ed185f72 ncurses-6.1-20191207.patch.gz -sha256 8725a2dc8f1cfdab41cb5fe56f930e070f8cdc81a77f303ef2658f65cd0b8edd ncurses-6.1-20191214.patch.gz -sha256 7e2a06fb0af6c84269d23ffe06c689bf1a8a57af39369690ee0698778d4b6cda ncurses-6.1-20191221.patch.gz -sha256 d052bcdb38f8b45a00c0a3190dec7ac1e72d5682f3a16d8accda239308aad62f ncurses-6.1-20191228.patch.gz -sha256 7b6253bae438154a88c7f3e301b872ed7ad71f943c873f4e6c82d8d36a5df72b ncurses-6.1-20200104.patch.gz -sha256 e438f28025c7d97c7f8fabf40eeab68bbf8ca871a0ba349e3fdec9165efe85cb ncurses-6.1-20200111.patch.gz -sha256 06d002c33f727c4a36a0b502c226ea3c3c5b80770703d2f783fffa6a0db04d92 ncurses-6.1-20200118.patch.gz +# Locally calculated +sha256 004603a9b3ec51599ef0a0089482004ee3d33b0240d87ce17b6f77525b51fb4e ncurses-6.4-20230429.tar.gz # Locally computed -sha256 4d1fde61868c73776a539366dccf5d5a4857e7fd7299efb1f02e07c2afe9ea87 COPYING +sha256 0413b2f4ea863194c174673032f0fca84f1ea1ed4eed6476baea68c075a631ce COPYING diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk index 5d9c6bb0dd9..4753da299c3 100644 --- a/package/ncurses/ncurses.mk +++ b/package/ncurses/ncurses.mk @@ -4,61 +4,19 @@ # ################################################################################ -NCURSES_VERSION = 6.1 -NCURSES_SITE = $(BR2_GNU_MIRROR)/ncurses +# When there is no snapshost yet for a new version, set it to the empty string +NCURSES_VERSION_MAJOR = 6.4 +NCURSES_SNAPSHOT_DATE = 20230429 +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)) NCURSES_INSTALL_STAGING = YES NCURSES_DEPENDENCIES = host-ncurses NCURSES_LICENSE = MIT with advertising clause NCURSES_LICENSE_FILES = COPYING NCURSES_CPE_ID_VENDOR = gnu -# Commit 4b21273d71d09 added upstream (security) patches up to 20200118 -NCURSES_IGNORE_CVES += CVE-2018-10754 -NCURSES_IGNORE_CVES += CVE-2018-19211 -NCURSES_IGNORE_CVES += CVE-2018-19217 -NCURSES_IGNORE_CVES += CVE-2019-17594 -NCURSES_IGNORE_CVES += CVE-2019-17595 +NCURSES_CPE_ID_VERSION = $(NCURSES_VERSION_MAJOR)$(if $(NCURSES_SNAPSHOT_DATE),.$(NCURSES_SNAPSHOT_DATE)) NCURSES_CONFIG_SCRIPTS = ncurses$(NCURSES_LIB_SUFFIX)6-config -NCURSES_PATCH = \ - $(addprefix https://invisible-mirror.net/archives/ncurses/$(NCURSES_VERSION)/, \ - ncurses-6.1-20190609-patch.sh.bz2 \ - ncurses-6.1-20190615.patch.gz \ - ncurses-6.1-20190623.patch.gz \ - ncurses-6.1-20190630.patch.gz \ - ncurses-6.1-20190706.patch.gz \ - ncurses-6.1-20190713.patch.gz \ - ncurses-6.1-20190720.patch.gz \ - ncurses-6.1-20190727.patch.gz \ - ncurses-6.1-20190728.patch.gz \ - ncurses-6.1-20190803.patch.gz \ - ncurses-6.1-20190810.patch.gz \ - ncurses-6.1-20190817.patch.gz \ - ncurses-6.1-20190824.patch.gz \ - ncurses-6.1-20190831.patch.gz \ - ncurses-6.1-20190907.patch.gz \ - ncurses-6.1-20190914.patch.gz \ - ncurses-6.1-20190921.patch.gz \ - ncurses-6.1-20190928.patch.gz \ - ncurses-6.1-20191005.patch.gz \ - ncurses-6.1-20191012.patch.gz \ - ncurses-6.1-20191015.patch.gz \ - ncurses-6.1-20191019.patch.gz \ - ncurses-6.1-20191026.patch.gz \ - ncurses-6.1-20191102.patch.gz \ - ncurses-6.1-20191109.patch.gz \ - ncurses-6.1-20191116.patch.gz \ - ncurses-6.1-20191123.patch.gz \ - ncurses-6.1-20191130.patch.gz \ - ncurses-6.1-20191207.patch.gz \ - ncurses-6.1-20191214.patch.gz \ - ncurses-6.1-20191221.patch.gz \ - ncurses-6.1-20191228.patch.gz \ - ncurses-6.1-20200104.patch.gz \ - ncurses-6.1-20200111.patch.gz \ - ncurses-6.1-20200118.patch.gz \ - ) - -# ncurses-6.1-20191012.patch.gz -NCURSES_IGNORE_CVES += CVE-2019-17594 CVE-2019-17595 NCURSES_CONF_OPTS = \ --without-cxx \ @@ -184,16 +142,6 @@ define NCURSES_TARGET_CLEANUP_TERMINFO endef NCURSES_POST_INSTALL_TARGET_HOOKS += NCURSES_TARGET_CLEANUP_TERMINFO -# -# On systems with an older version of tic, the installation of ncurses hangs -# forever. To resolve the problem, build a static version of tic on host -# ourselves, and use that during installation. -# -define HOST_NCURSES_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE1) -C $(@D) sources - $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/progs tic -endef - HOST_NCURSES_CONF_ENV = \ ac_cv_path_LDCONFIG="" diff --git a/package/ndisc6/ndisc6.hash b/package/ndisc6/ndisc6.hash index d76e831208d..e258382c53d 100644 --- a/package/ndisc6/ndisc6.hash +++ b/package/ndisc6/ndisc6.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 36932f9fc47e2844abcda7550fa1343b3af4b4208dfb61e0c9d9224aad5df351 ndisc6-1.0.5.tar.bz2 +sha256 a713210e9be1f15cfa0809f4c2728b00cd5f25881d7585126986982055453cfb ndisc6-1.0.6.tar.bz2 # Locally computed sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/ndisc6/ndisc6.mk b/package/ndisc6/ndisc6.mk index ff6439e310d..23734ca7d7e 100644 --- a/package/ndisc6/ndisc6.mk +++ b/package/ndisc6/ndisc6.mk @@ -4,7 +4,7 @@ # ################################################################################ -NDISC6_VERSION = 1.0.5 +NDISC6_VERSION = 1.0.6 NDISC6_SOURCE = ndisc6-$(NDISC6_VERSION).tar.bz2 NDISC6_SITE = http://www.remlab.net/files/ndisc6 NDISC6_CONF_ENV = CC="$(TARGET_CC) -std=c11" LIBS=$(TARGET_NLS_LIBS) diff --git a/package/ne10/0002-fix-build-without-C.patch b/package/ne10/0002-fix-build-without-C.patch new file mode 100644 index 00000000000..9dafffd5b0a --- /dev/null +++ b/package/ne10/0002-fix-build-without-C.patch @@ -0,0 +1,55 @@ +From f19b109f2a879af7b0753d94a2a312e4039adbed Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 8 May 2022 23:52:36 +0200 +Subject: [PATCH] fix build without C++ + +Fix the following build failure without C++ raised since version 1.2.0 +and +https://github.com/projectNe10/Ne10/commit/20b1896fd6532336e6a46608778bd6e0396dc4dc: + +CMake Error at /nvmedata/autobuild/instance-11/output-1/host/share/cmake-3.18/Modules/CMakeTestCXXCompiler.cmake:59 (message): + The C++ compiler + + "/usr/bin/clang++" + + is not able to compile a simple test program. + +Fixes: + - http://autobuild.buildroot.org/results/a86d09d569babe6b88cb8e5fbb47483772f42aed + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/projectNe10/Ne10/pull/280] +--- + CMakeLists.txt | 2 +- + modules/CMakeLists.txt | 2 ++ + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 40e1b72..10081f8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -26,7 +26,7 @@ + # + cmake_minimum_required(VERSION 2.6) + +-project(NE10 C CXX ASM) ++project(NE10 C ASM) + + option(NE10_BUILD_SHARED "Build NE10 shared libraries" OFF) + option(NE10_BUILD_STATIC "Build NE10 static libraries" ON) +diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt +index 4f158e9..951527a 100644 +--- a/modules/CMakeLists.txt ++++ b/modules/CMakeLists.txt +@@ -173,6 +173,8 @@ endif(IOS_PLATFORM) + endif() + + if(NE10_ENABLE_DSP) ++ enable_language(CXX) ++ + #enable NE10_init_dsp + add_definitions(-DNE10_ENABLE_DSP) + +-- +2.35.1 + diff --git a/package/ne10/ne10.mk b/package/ne10/ne10.mk index e529caf2aff..ce0f7e7b775 100644 --- a/package/ne10/ne10.mk +++ b/package/ne10/ne10.mk @@ -16,6 +16,12 @@ NE10_CONF_OPTS = \ -DNE10_BUILD_UNIT_TEST=OFF \ -DNE10_LINUX_TARGET_ARCH=$(if $(BR2_aarch64),aarch64,armv7) +ifeq ($(BR2_INSTALL_LIBSTDCPP),y) +NE10_CONF_OPTS += -DNE10_ENABLE_DSP=ON +else +NE10_CONF_OPTS += -DNE10_ENABLE_DSP=OFF +endif + ifeq ($(BR2_STATIC_LIBS),) NE10_CONF_OPTS += \ -DNE10_BUILD_SHARED=ON @@ -36,8 +42,10 @@ define NE10_INSTALL_STAGING_CMDS $(NE10_INSTALL_STAGING_SHARED_LIB) endef +ifeq ($(BR2_STATIC_LIBS),) define NE10_INSTALL_TARGET_CMDS cp -dpf $(@D)/modules/libNE10*.so* $(TARGET_DIR)/usr/lib/ endef +endif $(eval $(cmake-package)) diff --git a/package/neardal/neardal.hash b/package/neardal/neardal.hash index b8b8b96a44b..daee3f3e032 100644 --- a/package/neardal/neardal.hash +++ b/package/neardal/neardal.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 dae3c432e619a0d3102c5222d0b8fde74413ae519a64ccaae0fc81d31504aecb neardal-4143d130ed39299bfc59d08d2c7c77dbc7f809e9.tar.gz -sha256 296a87e9098d3f2ce1ef80c73c53399dc2c7412f35d4175c45810ea15ed86406 COPYING +sha256 dae3c432e619a0d3102c5222d0b8fde74413ae519a64ccaae0fc81d31504aecb neardal-4143d130ed39299bfc59d08d2c7c77dbc7f809e9.tar.gz +sha256 296a87e9098d3f2ce1ef80c73c53399dc2c7412f35d4175c45810ea15ed86406 COPYING diff --git a/package/neon-2-sse/Config.in b/package/neon-2-sse/Config.in new file mode 100644 index 00000000000..25613c5ec46 --- /dev/null +++ b/package/neon-2-sse/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_NEON_2_SSE + bool "neon-2-sse" + help + The platform independent header allowing to compile any + C/C++ code containing ARM NEON intrinsic functions for + x86 target systems using SIMD up to SSE4 intrinsic + functions. + + https://github.com/intel/ARM_NEON_2_x86_SSE diff --git a/package/neon-2-sse/neon-2-sse.hash b/package/neon-2-sse/neon-2-sse.hash new file mode 100644 index 00000000000..f964d2fa618 --- /dev/null +++ b/package/neon-2-sse/neon-2-sse.hash @@ -0,0 +1,4 @@ +# Locally calculated +sha256 4567ca8c8cbc8ce0ea3ddb9dc0f158707eb85c631cb400fd7010cd299cdc5377 neon-2-sse-097a5ecacd527d5b5c3006e360fb9cb1c1c48a1f.tar.gz +# License files, locally calculated +sha256 7022f51b439a5915e933ecc270c83e24ca0cb2cceeb08b0132dcd4dbb03ed2dc LICENSE diff --git a/package/neon-2-sse/neon-2-sse.mk b/package/neon-2-sse/neon-2-sse.mk new file mode 100644 index 00000000000..ee6f5446b6b --- /dev/null +++ b/package/neon-2-sse/neon-2-sse.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# neon-2-sse +# +################################################################################ + +NEON_2_SSE_VERSION = 097a5ecacd527d5b5c3006e360fb9cb1c1c48a1f +NEON_2_SSE_SITE = $(call github,intel,ARM_NEON_2_x86_SSE,$(NEON_2_SSE_VERSION)) +NEON_2_SSE_LICENSE = BSD-2-Clause +NEON_2_SSE_LICENSE_FILES = LICENSE +NEON_2_SSE_INSTALL_STAGING = YES +# Only installs a header +NEON_2_SSE_INSTALL_TARGET = NO + +$(eval $(cmake-package)) diff --git a/package/neon/neon.hash b/package/neon/neon.hash index 5a5a77a58be..9bd6195e391 100644 --- a/package/neon/neon.hash +++ b/package/neon/neon.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 986566468c6295fc5d0fb141a5981e31c9f82ee38e938374abed8471ef2fb286 neon-0.32.2.tar.gz +sha256 b1e2120e4ae07df952c4a858731619733115c5f438965de4fab41d6bf7e7a508 neon-0.32.4.tar.gz # Hash for license files sha256 ce2421ee38d6c0e02c85ac076478a0f92da6ef92b92b7a174877cabf01b2e531 README.md sha256 d7bf9d064ac3e5840f9dd02422b7eeec4f1fd03f37fadbd043602be5e882304f src/COPYING.LIB diff --git a/package/neon/neon.mk b/package/neon/neon.mk index eae6bfbad64..1ce8f1ff16f 100644 --- a/package/neon/neon.mk +++ b/package/neon/neon.mk @@ -4,7 +4,7 @@ # ################################################################################ -NEON_VERSION = 0.32.2 +NEON_VERSION = 0.32.4 NEON_SITE = https://notroj.github.io/neon NEON_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (manual and tests) NEON_LICENSE_FILES = src/COPYING.LIB test/COPYING README.md diff --git a/package/nerdctl/Config.in b/package/nerdctl/Config.in new file mode 100644 index 00000000000..969b9bb40e9 --- /dev/null +++ b/package/nerdctl/Config.in @@ -0,0 +1,18 @@ +config BR2_PACKAGE_NERDCTL + bool "nerdctl" + 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_USES_UCLIBC # containerd + depends on BR2_USE_MMU # util-linux + select BR2_PACKAGE_CONTAINERD # runtime + help + Docker-compatible CLI for containerd, controlling runc. + + https://github.com/containerd/nerdctl + +comment "nerdctl needs a glibc or musl toolchain w/ threads" + 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_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_UCLIBC diff --git a/package/nerdctl/nerdctl.hash b/package/nerdctl/nerdctl.hash new file mode 100644 index 00000000000..8f2c6781989 --- /dev/null +++ b/package/nerdctl/nerdctl.hash @@ -0,0 +1,3 @@ +# Computed locally +sha256 08a84b9481b37dbd8cc6f955dbec0c18a1934bcffeb135fd5d2dc23987152b7c nerdctl-1.2.0.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/nerdctl/nerdctl.mk b/package/nerdctl/nerdctl.mk new file mode 100644 index 00000000000..7556bcc3913 --- /dev/null +++ b/package/nerdctl/nerdctl.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# nerdctl +# +################################################################################ + +NERDCTL_VERSION = 1.2.0 +NERDCTL_SITE = $(call github,containerd,nerdctl,v$(NERDCTL_VERSION)) + +NERDCTL_LICENSE = Apache-2.0 +NERDCTL_LICENSE_FILES = LICENSE + +NERDCTL_GOMOD = github.com/containerd/nerdctl + +NERDCTL_LDFLAGS = \ + -X $(NERDCTL_GOMOD)/pkg/version.Version=$(NERDCTL_VERSION) + +NERDCTL_BUILD_TARGETS = cmd/nerdctl + +$(eval $(golang-package)) diff --git a/package/netatalk/0001-Fix-setting-of-LD_LIBRARY_FLAGS-shlibpath_var.patch b/package/netatalk/0001-Fix-setting-of-LD_LIBRARY_FLAGS-shlibpath_var.patch deleted file mode 100644 index 01d57765963..00000000000 --- a/package/netatalk/0001-Fix-setting-of-LD_LIBRARY_FLAGS-shlibpath_var.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 60d100713b5289948e9cdf5b0646ff3cdd2c206b Mon Sep 17 00:00:00 2001 -From: "Arnout Vandecappelle (Essensium/Mind)" -Date: Mon, 17 Dec 2012 22:32:44 +0100 -Subject: [PATCH] Fix setting of LD_LIBRARY_FLAGS ($shlibpath_var). - -LD_LIBRARY_PATH should not be set when cross-compiling, because it -adds the cross-libraries to the build's LD-path. - -Also the restoring of LD_LIBRARY_PATH was done incorrectly: it would -set LD_LIBRARY_PATH=LD_LIBRARY_PATH. - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - macros/db3-check.m4 | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/macros/db3-check.m4 b/macros/db3-check.m4 -index 902220b..d5a5446 100644 ---- a/macros/db3-check.m4 -+++ b/macros/db3-check.m4 -@@ -94,7 +94,7 @@ if test "x$bdb_required" = "xyes"; then - savedldflags="$LDFLAGS" - savedcppflags="$CPPFLAGS" - savedlibs="$LIBS" -- saved_shlibpath_var=$shlibpath_var -+ eval saved_shlibpath_var=\$$shlibpath_var - - dnl required BDB version: 4.6, because of cursor API change - DB_MAJOR_REQ=4 -@@ -148,7 +148,7 @@ if test "x$bdb_required" = "xyes"; then - dnl -- LD_LIBRARY_PATH on many platforms. This will be fairly - dnl -- portable hopefully. Reference: - dnl -- http://lists.gnu.org/archive/html/autoconf/2009-03/msg00040.html -- eval export $shlibpath_var=$bdblibdir -+ test "$cross_compiling" = yes || eval export $shlibpath_var=$bdblibdir - NETATALK_BDB_TRY_LINK - eval export $shlibpath_var=$saved_shlibpath_var - -@@ -171,7 +171,7 @@ if test "x$bdb_required" = "xyes"; then - CPPFLAGS="-I${bdbdir}/include${subdir} $CPPFLAGS" - LDFLAGS="-L$bdblibdir $LDFLAGS" - -- eval export $shlibpath_var=$bdblibdir -+ test "$cross_compiling" = yes || eval export $shlibpath_var=$bdblibdir - NETATALK_BDB_TRY_LINK - eval export $shlibpath_var=$saved_shlibpath_var - --- diff --git a/package/netatalk/0002-fix-ftbs-multiple-def-of-invalid_dircache_entries.patch b/package/netatalk/0002-fix-ftbs-multiple-def-of-invalid_dircache_entries.patch deleted file mode 100644 index e7ccc525538..00000000000 --- a/package/netatalk/0002-fix-ftbs-multiple-def-of-invalid_dircache_entries.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 32df6e155ccfc83216321925273c3e75e631ebe6 Mon Sep 17 00:00:00 2001 -From: Andrew Bauer -Date: Wed, 22 Jan 2020 09:59:47 -0600 -Subject: [PATCH] fix ftbs multiple def of invalid_dircache_entries - -[Retrieved from: -https://github.com/Netatalk/Netatalk/pull/125/commits/32df6e155ccfc83216321925273c3e75e631ebe6] -Signed-off-by: Fabrice Fontaine ---- - etc/afpd/directory.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/etc/afpd/directory.h b/etc/afpd/directory.h -index eb89c606..81bfa9cb 100644 ---- a/etc/afpd/directory.h -+++ b/etc/afpd/directory.h -@@ -91,7 +91,7 @@ struct maccess { - #define AR_UWRITE (1<<2) - #define AR_UOWN (1<<7) - --q_t *invalid_dircache_entries; -+extern q_t *invalid_dircache_entries; - - typedef int (*dir_loop)(struct dirent *, char *, void *); - diff --git a/package/netatalk/netatalk.hash b/package/netatalk/netatalk.hash index 6c3250a0050..a35e6bc36c5 100644 --- a/package/netatalk/netatalk.hash +++ b/package/netatalk/netatalk.hash @@ -1,6 +1,7 @@ -# From http://sourceforge.net/projects/netatalk/files/netatalk/3.1.12/ -md5 021d2330cb7f7cd2977aec46299dcc1b netatalk-3.1.12.tar.bz2 -sha1 cc1fe1ebdbdb4da9cf82835c440e82ba28a832c5 netatalk-3.1.12.tar.bz2 +# From http://sourceforge.net/projects/netatalk/files/netatalk/3.1.17/ +md5 a6429a28948f85b69c9012fb437dd9c2 netatalk-3.1.17.tar.xz +sha1 bc6578d9fa874b3816fd4ddd60a30a8f3aadc71d netatalk-3.1.17.tar.xz # Locally computed -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING +sha256 8c208e2c94bf3047db33cdbc3ce4325d2b80db61d6cc527f18f9dbd8e95b5cff netatalk-3.1.17.tar.xz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 7599ae145e53be03a08f8b558b2f2e0c828e1630f1843cc04f41981b8cefcd65 COPYRIGHT diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk index 0c219a2316b..a47bfa7e844 100644 --- a/package/netatalk/netatalk.mk +++ b/package/netatalk/netatalk.mk @@ -4,11 +4,9 @@ # ################################################################################ -NETATALK_VERSION = 3.1.12 -NETATALK_SITE = http://downloads.sourceforge.net/project/netatalk/netatalk/$(NETATALK_VERSION) -NETATALK_SOURCE = netatalk-$(NETATALK_VERSION).tar.bz2 -# For 0001-Fix-setting-of-LD_LIBRARY_FLAGS-shlibpath_var.patch -NETATALK_AUTORECONF = YES +NETATALK_VERSION = 3.1.17 +NETATALK_SITE = http://downloads.sourceforge.net/project/netatalk/netatalk-$(subst .,-,$(NETATALK_VERSION)) +NETATALK_SOURCE = netatalk-$(NETATALK_VERSION).tar.xz NETATALK_CONFIG_SCRIPTS = netatalk-config NETATALK_DEPENDENCIES = host-pkgconf openssl berkeleydb libgcrypt libgpg-error \ libevent diff --git a/package/netcalc/netcalc.hash b/package/netcalc/netcalc.hash index 34d64b1679d..ba503b6457f 100644 --- a/package/netcalc/netcalc.hash +++ b/package/netcalc/netcalc.hash @@ -1,5 +1,5 @@ # From https://github.com/troglobit/netcalc/releases/tag/v2.1.6 -md5 c8660b61370c76d866247fe65966a35b netcalc-2.1.6.tar.gz +md5 c8660b61370c76d866247fe65966a35b netcalc-2.1.6.tar.gz # Locally computed: -sha256 cff41782fcf63d7d4ce6d35f95ed302127f6ddf6fc0ca03a8188af95a7c3243b netcalc-2.1.6.tar.gz -sha256 745538f8d515d37af6f03442df982a8b211b129e8dc10d0195e33c4b42f8fe5f LICENSE +sha256 cff41782fcf63d7d4ce6d35f95ed302127f6ddf6fc0ca03a8188af95a7c3243b netcalc-2.1.6.tar.gz +sha256 745538f8d515d37af6f03442df982a8b211b129e8dc10d0195e33c4b42f8fe5f LICENSE diff --git a/package/netdata/netdata.hash b/package/netdata/netdata.hash index 8d5ce51fca6..bc33a8b8a1c 100644 --- a/package/netdata/netdata.hash +++ b/package/netdata/netdata.hash @@ -1,3 +1,5 @@ +# From https://github.com/netdata/netdata/releases/download/v1.33.1/sha256sums.txt +sha256 20ba8695d87187787b27128ac3aab9b09aa29ca6b508c48542e0f7d50ec9322b netdata-v1.33.1.tar.gz + # Locally calculated -sha256 60cdde3f1f8bd9035fef6a566053c0a7195d1714b5da6814473263e85382b4a8 netdata-1.21.1.tar.gz -sha256 0e5fd9d833efe9b79f784d1903281554af82d1b4261af67d35455728e5572aa6 LICENSE +sha256 0e5fd9d833efe9b79f784d1903281554af82d1b4261af67d35455728e5572aa6 LICENSE diff --git a/package/netdata/netdata.mk b/package/netdata/netdata.mk index 6def59764af..4bc573df599 100644 --- a/package/netdata/netdata.mk +++ b/package/netdata/netdata.mk @@ -4,19 +4,26 @@ # ################################################################################ -NETDATA_VERSION = 1.21.1 -NETDATA_SITE = $(call github,netdata,netdata,v$(NETDATA_VERSION)) +NETDATA_VERSION = 1.33.1 +NETDATA_SOURCE = netdata-v$(NETDATA_VERSION).tar.gz +NETDATA_SITE = \ + https://github.com/netdata/netdata/releases/download/v$(NETDATA_VERSION) NETDATA_LICENSE = GPL-3.0+ NETDATA_LICENSE_FILES = LICENSE NETDATA_CPE_ID_VENDOR = netdata -# netdata's source code is released without a generated configure script -NETDATA_AUTORECONF = YES NETDATA_CONF_OPTS = \ + --disable-cloud \ --disable-dbengine \ + --disable-ebpf \ + --disable-ml \ --disable-unit-tests NETDATA_DEPENDENCIES = libuv util-linux zlib -ifeq ($(BR2_GCC_ENABLE_LTO),y) +# 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 + +ifeq ($(BR2_ENABLE_LTO),y) NETDATA_CONF_OPTS += --enable-lto else NETDATA_CONF_OPTS += --disable-lto @@ -29,6 +36,13 @@ else NETDATA_CONF_OPTS += --disable-plugin-cups endif +ifeq ($(BR2_PACKAGE_FREEIPMI),y) +NETDATA_CONF_OPTS += --enable-plugin-freeipmi +NETDATA_DEPENDENCIES += freeipmi +else +NETDATA_CONF_OPTS += --disable-plugin-freeipmi +endif + ifeq ($(BR2_PACKAGE_JSON_C),y) NETDATA_CONF_OPTS += --enable-jsonc NETDATA_DEPENDENCIES += json-c @@ -43,6 +57,13 @@ else NETDATA_CONF_OPTS += --without-libcap endif +ifeq ($(BR2_PACKAGE_LZ4),y) +NETDATA_CONF_OPTS += --enable-compression +NETDATA_DEPENDENCIES += lz4 +else +NETDATA_CONF_OPTS += --disable-compression +endif + ifeq ($(BR2_PACKAGE_NFACCT),y) NETDATA_CONF_OPTS += --enable-plugin-nfacct NETDATA_DEPENDENCIES += nfacct diff --git a/package/netifrc/netifrc.hash b/package/netifrc/netifrc.hash index d811acc4a2b..e92c394018c 100644 --- a/package/netifrc/netifrc.hash +++ b/package/netifrc/netifrc.hash @@ -1,3 +1,3 @@ # Calculated manually -sha256 004907e0c3db2d106d6a51d604d79f971f1013fa7642054ad7efe5076e52f7b3 netifrc-0.6.1.tar.gz -sha256 da376c9e2244f2a7220767ea4dd88cf423ff5b548e7c2f96b0f3b9dac727748a LICENSE +sha256 ad6578bf0c08eac474fa7b557beda0aed1032bef410a01f0493395cd6568128e netifrc-0.7.3.tar.gz +sha256 da376c9e2244f2a7220767ea4dd88cf423ff5b548e7c2f96b0f3b9dac727748a LICENSE diff --git a/package/netifrc/netifrc.mk b/package/netifrc/netifrc.mk index d13dc356f3d..dfa1c96bb87 100644 --- a/package/netifrc/netifrc.mk +++ b/package/netifrc/netifrc.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETIFRC_VERSION = 0.6.1 +NETIFRC_VERSION = 0.7.3 NETIFRC_SITE = $(call github,gentoo,netifrc,$(NETIFRC_VERSION)) NETIFRC_LICENSE = BSD-2-Clause NETIFRC_LICENSE_FILES = LICENSE diff --git a/package/netopeer2/S52netopeer2 b/package/netopeer2/S52netopeer2 index cf53a8f109e..cadd6b9feb6 100644 --- a/package/netopeer2/S52netopeer2 +++ b/package/netopeer2/S52netopeer2 @@ -8,7 +8,7 @@ NETOPEER2_SERVER_ARGS="" start() { printf 'Starting %s: ' "$DAEMON" - start-stop-daemon -S -b -q -p $PIDFILE -x "/usr/bin/$DAEMON" \ + start-stop-daemon -S -q -p $PIDFILE -x "/usr/sbin/$DAEMON" \ -- $NETOPEER2_SERVER_ARGS status=$? if [ "$status" -eq 0 ]; then diff --git a/package/netopeer2/netopeer2.hash b/package/netopeer2/netopeer2.hash index 2895bc51d06..6a278fbbafe 100644 --- a/package/netopeer2/netopeer2.hash +++ b/package/netopeer2/netopeer2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 dedae40419cfddd09c1be7bb536b3a762ec8dcd568c2bfe803c0f6789a5ca834 netopeer2-2.0.35.tar.gz +sha256 2b1daac037f18c303e0c0dc3318ba30196459472e4c59f2f8547ee74d4cdf31d netopeer2-2.1.49.tar.gz sha256 b46f161fbdcf127d3ef22602e15958c3092fe3294f71a2dc8cdf8f6689cba95b LICENSE diff --git a/package/netopeer2/netopeer2.mk b/package/netopeer2/netopeer2.mk index 43f22b7e4c5..47fcd31acd3 100644 --- a/package/netopeer2/netopeer2.mk +++ b/package/netopeer2/netopeer2.mk @@ -4,13 +4,17 @@ # ################################################################################ -NETOPEER2_VERSION = 2.0.35 +NETOPEER2_VERSION = 2.1.49 NETOPEER2_SITE = $(call github,CESNET,Netopeer2,v$(NETOPEER2_VERSION)) NETOPEER2_DL_SUBDIR = netopeer2 NETOPEER2_LICENSE = BSD-3-Clause NETOPEER2_LICENSE_FILES = LICENSE NETOPEER2_DEPENDENCIES = libnetconf2 libyang sysrepo host-sysrepo +ifeq ($(BR2_INIT_SYSTEMD),y) +NETOPEER2_DEPENDENCIES += systemd +endif + NETOPEER2_CONF_OPTS = \ -DBUILD_CLI=$(if $(BR2_PACKAGE_NETOPEER2_CLI),ON,OFF) \ -DENABLE_TESTS=OFF diff --git a/package/netsniff-ng/Config.in b/package/netsniff-ng/Config.in index 5d1407baacd..9ad3628f149 100644 --- a/package/netsniff-ng/Config.in +++ b/package/netsniff-ng/Config.in @@ -1,9 +1,8 @@ config BR2_PACKAGE_NETSNIFF_NG bool "netsniff-ng" depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 - depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # pthread_spin_lock depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS - select BR2_PACKAGE_LIBNL select BR2_PACKAGE_LIBPCAP select BR2_PACKAGE_LIBNETFILTER_CONNTRACK select BR2_PACKAGE_LIBURCU @@ -29,7 +28,7 @@ comment "mausezahn needs glibc or musl toolchain" endif -comment "netsniff-ng needs a toolchain w/ threads, headers >= 3.0" +comment "netsniff-ng needs a toolchain w/ NPTL, headers >= 3.0" depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 diff --git a/package/netsniff-ng/netsniff-ng.mk b/package/netsniff-ng/netsniff-ng.mk index 27bd707c844..2b5b19b27f4 100644 --- a/package/netsniff-ng/netsniff-ng.mk +++ b/package/netsniff-ng/netsniff-ng.mk @@ -13,7 +13,8 @@ NETSNIFF_NG_LICENSE_FILES = README COPYING NETSNIFF_NG_CONF_ENV = \ NACL_INC_DIR=/dev/null \ NACL_LIB_DIR=/dev/null -NETSNIFF_NG_DEPENDENCIES = host-pkgconf libnl libpcap libnetfilter_conntrack liburcu +NETSNIFF_NG_DEPENDENCIES = host-pkgconf libpcap libnetfilter_conntrack liburcu +NETSNIFF_NG_CONF_OPTS = --prefix=$(TARGET_DIR)/usr ifeq ($(BR2_PACKAGE_NETSNIFF_NG_MAUSEZAHN),y) NETSNIFF_NG_DEPENDENCIES += libcli libnet @@ -26,6 +27,14 @@ endif ifeq ($(BR2_PACKAGE_GEOIP),y) NETSNIFF_NG_DEPENDENCIES += geoip +else +NETSNIFF_NG_CONF_OPTS += --disable-geoip +endif + +ifeq ($(BR2_PACKAGE_LIBNL),y) +NETSNIFF_NG_DEPENDENCIES += libnl +else +NETSNIFF_NG_CONF_OPTS += --disable-libnl endif ifeq ($(BR2_PACKAGE_NCURSES),y) @@ -34,6 +43,8 @@ endif ifeq ($(BR2_PACKAGE_ZLIB),y) NETSNIFF_NG_DEPENDENCIES += zlib +else +NETSNIFF_NG_CONF_OPTS += --disable-zlib endif # hand-written configure script and makefile @@ -43,7 +54,7 @@ define NETSNIFF_NG_CONFIGURE_CMDS $(TARGET_CONFIGURE_ARGS) \ $(TARGET_CONFIGURE_OPTS) \ ./configure \ - --prefix=$(TARGET_DIR)/usr \ + $(NETSNIFF_NG_CONF_OPTS) \ ) endef diff --git a/package/netsnmp/0001-configure-static-linking-Fix-SSL-checks.patch b/package/netsnmp/0001-configure-static-linking-Fix-SSL-checks.patch deleted file mode 100644 index bf61fdfe7a1..00000000000 --- a/package/netsnmp/0001-configure-static-linking-Fix-SSL-checks.patch +++ /dev/null @@ -1,146 +0,0 @@ -From bd59be8e4e339870a1400f6866a7b73ca11f6460 Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Wed, 12 Sep 2018 20:16:39 +0200 -Subject: [PATCH] configure, static linking: Fix SSL checks - -During checking of DTLS_method, the stub program is linked only with -ssl -libssl.a lacks some function from -lcrypto: -RAND_*() -ERR_*() -BUF_MEM_*() -etc. -and -lz: -- inflate() -- deflate() - -Append -lcrypto and -lz to LIBS variable when checking DTLS_method. - -See also https://sourceforge.net/p/net-snmp/patches/1374/. - -Signed-off-by: Giulio Benetti -[bvanassche: Edited subject / rewrote this patch] -[yann.morin.1998@free.fr: - - use an actual backport of bd59be8e4e339870a1400f6866a7b73ca11f6460 -] -Signed-off-by: Yann E. MORIN ---- - configure | 52 ++++++++++++++++++++++++++++++++++--- - configure.d/config_os_libs2 | 14 +++++++--- - 2 files changed, 58 insertions(+), 8 deletions(-) - -diff --git a/configure b/configure -index 6504a8e58a..1116cecaad 100755 ---- a/configure -+++ b/configure -@@ -23228,16 +23228,60 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_EVP_md5" >&5 - $as_echo "$ac_cv_lib_crypto_EVP_md5" >&6; } - if test "x$ac_cv_lib_crypto_EVP_md5" = xyes; then : -- CRYPTO="crypto" -+ CRYPTO="crypto"; LIBCRYPTO="-lcrypto" -+else -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVP_md5 in -lcrypto" >&5 -+$as_echo_n "checking for EVP_md5 in -lcrypto... " >&6; } -+if ${ac_cv_lib_crypto_EVP_md5+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lcrypto -lz $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char EVP_md5 (); -+int -+main () -+{ -+return EVP_md5 (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_crypto_EVP_md5=yes -+else -+ ac_cv_lib_crypto_EVP_md5=no -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_EVP_md5" >&5 -+$as_echo "$ac_cv_lib_crypto_EVP_md5" >&6; } -+if test "x$ac_cv_lib_crypto_EVP_md5" = xyes; then : -+ CRYPTO="crypto"; LIBCRYPTO="-lcrypto -lz" -+fi -+ -+ - fi - -- fi -+ else -+ LIBCRYPTO="-l${CRYPTO}" -+ fi - - if test x$CRYPTO != x; then - - $as_echo "#define HAVE_LIBCRYPTO 1" >>confdefs.h - -- LIBCRYPTO="-l${CRYPTO}" - netsnmp_save_LIBS="$LIBS" - LIBS="$LIBCRYPTO" - for ac_func in AES_cfb128_encrypt EVP_sha224 EVP_sha384 EVP_MD_CTX_create EVP_MD_CTX_destroy EVP_MD_CTX_new EVP_MD_CTX_free DH_set0_pqg DH_get0_pqg DH_get0_key ASN1_STRING_get0_data X509_NAME_ENTRY_get_object X509_NAME_ENTRY_get_data X509_get_signature_nid -@@ -23291,7 +23335,7 @@ _ACEOF - LIBS="$netsnmp_save_LIBS" - fi - netsnmp_save_LIBS="$LIBS" -- LIBS="-lssl" -+ LIBS="-lssl $LIBCRYPTO" - for ac_func in TLS_method TLSv1_method DTLS_method DTLSv1_method SSL_library_init SSL_load_error_strings ERR_get_error_all - do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -diff --git a/configure.d/config_os_libs2 b/configure.d/config_os_libs2 -index 4a1ad1551f..75214cfff3 100644 ---- a/configure.d/config_os_libs2 -+++ b/configure.d/config_os_libs2 -@@ -306,13 +306,19 @@ if test "x$tryopenssl" != "xno" -a "x$tryopenssl" != "xinternal"; then - LIBS="$netsnmp_save_LIBS" - - if test x$CRYPTO = x; then -- AC_CHECK_LIB([crypto], [EVP_md5], [CRYPTO="crypto"]) -- fi -+ AC_CHECK_LIB([crypto], [EVP_md5], -+ [CRYPTO="crypto"; LIBCRYPTO="-lcrypto"], [ -+ AC_CHECK_LIB([crypto], [EVP_md5], -+ [CRYPTO="crypto"; LIBCRYPTO="-lcrypto -lz"], [], -+ [-lz]) -+ ]) -+ else -+ LIBCRYPTO="-l${CRYPTO}" -+ fi - - if test x$CRYPTO != x; then - AC_DEFINE(HAVE_LIBCRYPTO, 1, - [Define to 1 if you have the OpenSSL library (-lcrypto or -leay32).]) -- LIBCRYPTO="-l${CRYPTO}" - netsnmp_save_LIBS="$LIBS" - LIBS="$LIBCRYPTO" - AC_CHECK_FUNCS([AES_cfb128_encrypt]dnl -@@ -342,7 +348,7 @@ if test "x$tryopenssl" != "xno" -a "x$tryopenssl" != "xinternal"; then - LIBS="$netsnmp_save_LIBS" - fi - netsnmp_save_LIBS="$LIBS" -- LIBS="-lssl" -+ LIBS="-lssl $LIBCRYPTO" - AC_CHECK_FUNCS([TLS_method TLSv1_method DTLS_method DTLSv1_method]dnl - [SSL_library_init SSL_load_error_strings]) - LIBS="$netsnmp_save_LIBS" --- -2.25.1 - diff --git a/package/netsnmp/0002-configure-Fix-lcrypto-lz-test.patch b/package/netsnmp/0002-configure-Fix-lcrypto-lz-test.patch deleted file mode 100644 index 50387c8390c..00000000000 --- a/package/netsnmp/0002-configure-Fix-lcrypto-lz-test.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 13da2bcde8e22dd0127a668374fdf79bed04d353 Mon Sep 17 00:00:00 2001 -From: Bart Van Assche -Date: Mon, 17 Sep 2018 07:33:34 -0700 -Subject: [PATCH] configure: Fix -lcrypto -lz test - -Avoid that the second crypto library test uses the cached result from -the first test by explicitly clearing the cached test result. - -[yann.morin.1998@free.fr: - - use an actual backport of 13da2bcde8e22dd0127a668374fdf79bed04d353 -] -Signed-off-by: Yann E. MORIN ---- - configure | 1 + - configure.d/config_os_libs2 | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/configure b/configure -index 1116cecaad..33b8c93e57 100755 ---- a/configure -+++ b/configure -@@ -23231,6 +23231,7 @@ if test "x$ac_cv_lib_crypto_EVP_md5" = xyes; then : - CRYPTO="crypto"; LIBCRYPTO="-lcrypto" - else - -+ unset ac_cv_lib_crypto_EVP_md5 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVP_md5 in -lcrypto" >&5 - $as_echo_n "checking for EVP_md5 in -lcrypto... " >&6; } - if ${ac_cv_lib_crypto_EVP_md5+:} false; then : -diff --git a/configure.d/config_os_libs2 b/configure.d/config_os_libs2 -index 75214cfff3..81788a2096 100644 ---- a/configure.d/config_os_libs2 -+++ b/configure.d/config_os_libs2 -@@ -308,6 +308,7 @@ if test "x$tryopenssl" != "xno" -a "x$tryopenssl" != "xinternal"; then - if test x$CRYPTO = x; then - AC_CHECK_LIB([crypto], [EVP_md5], - [CRYPTO="crypto"; LIBCRYPTO="-lcrypto"], [ -+ unset ac_cv_lib_crypto_EVP_md5 - AC_CHECK_LIB([crypto], [EVP_md5], - [CRYPTO="crypto"; LIBCRYPTO="-lcrypto -lz"], [], - [-lz]) --- -2.25.1 - diff --git a/package/netsnmp/0003-configure-fix-AC_CHECK_FUNCS-EVP_sha224-EVP_sha384-..patch b/package/netsnmp/0003-configure-fix-AC_CHECK_FUNCS-EVP_sha224-EVP_sha384-..patch deleted file mode 100644 index 4293e15d25a..00000000000 --- a/package/netsnmp/0003-configure-fix-AC_CHECK_FUNCS-EVP_sha224-EVP_sha384-..patch +++ /dev/null @@ -1,39 +0,0 @@ -From 8e273c688aa235ed9c68570a700d31596bac14df Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Mon, 15 Oct 2018 19:07:05 +0200 -Subject: [PATCH] configure: fix AC_CHECK_FUNCS(EVP_sha224 EVP_sha384 ...) - failure on static linking - -If building as static lib, AC_CHECK_FUNCS(EVP_sha224 EVP_sha384 ...) -fails due to missing -lz in $LIBS. -At the moment, $LIBS contains $LIBCRYPTO only discarding previous $LIBS -content. - -Add $LIBS to: -LIBS="$LIBCRYPTO" -as: -LIBS="$LIBCRYPTO $LIBS" -This way $LIBS will contain -lz at the end of linking command that in -static linking build is mandatory. - -Signed-off-by: Giulio Benetti ---- - configure.d/config_os_libs2 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.d/config_os_libs2 b/configure.d/config_os_libs2 -index 81788a209..93044000b 100644 ---- a/configure.d/config_os_libs2 -+++ b/configure.d/config_os_libs2 -@@ -321,7 +321,7 @@ if test "x$tryopenssl" != "xno" -a "x$tryopenssl" != "xinternal"; then - AC_DEFINE(HAVE_LIBCRYPTO, 1, - [Define to 1 if you have the OpenSSL library (-lcrypto or -leay32).]) - netsnmp_save_LIBS="$LIBS" -- LIBS="$LIBCRYPTO" -+ LIBS="$LIBCRYPTO $LIBS" - AC_CHECK_FUNCS([AES_cfb128_encrypt]dnl - [EVP_sha224 EVP_sha384 ]dnl - [EVP_MD_CTX_create EVP_MD_CTX_destroy]dnl --- -2.17.1 - diff --git a/package/netsnmp/0004-configure-fix-AC_CHECK_FUNCS-TLS_method-TLSv1_method.patch b/package/netsnmp/0004-configure-fix-AC_CHECK_FUNCS-TLS_method-TLSv1_method.patch deleted file mode 100644 index 8fcce2a5c75..00000000000 --- a/package/netsnmp/0004-configure-fix-AC_CHECK_FUNCS-TLS_method-TLSv1_method.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 1ab6e3fc3cf61fa5a7b7363e59095e868474524b Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Mon, 15 Oct 2018 19:34:26 +0200 -Subject: [PATCH] configure: fix AC_CHECK_FUNCS(TLS_method TLSv1_method - ...) failure on static linking - -If building as static lib, AC_CHECK_FUNCS(TLS_method TLSv1_method ...) -fails due to missing -lz in $LIBS. -At the moment, $LIBS contains "-lssl $LIBCRYPTO" only discarding -previous $LIBS content. - -Add $LIBS to: -LIBS="-lssl $LIBCRYPTO" -as: -LIBS="-lssl $LIBCRYPTO $LIBS" -This way $LIBS will contain -lz at the end of linking command that in -static linking build is mandatory. - -Signed-off-by: Giulio Benetti ---- - configure.d/config_os_libs2 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.d/config_os_libs2 b/configure.d/config_os_libs2 -index 93044000b..c811c63ec 100644 ---- a/configure.d/config_os_libs2 -+++ b/configure.d/config_os_libs2 -@@ -349,7 +349,7 @@ if test "x$tryopenssl" != "xno" -a "x$tryopenssl" != "xinternal"; then - LIBS="$netsnmp_save_LIBS" - fi - netsnmp_save_LIBS="$LIBS" -- LIBS="-lssl $LIBCRYPTO" -+ LIBS="-lssl $LIBCRYPTO $LIBS" - AC_CHECK_FUNCS([TLS_method TLSv1_method DTLS_method DTLSv1_method]dnl - [SSL_library_init SSL_load_error_strings]dnl - [ERR_get_error_all]) --- -2.17.1 - diff --git a/package/netsnmp/netsnmp.hash b/package/netsnmp/netsnmp.hash index 9d196c8bee6..e1e9d10898c 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/net-snmp-5.9.tar.gz.asc +# https://sourceforge.net/projects/net-snmp/files/net-snmp/5.9.3/net-snmp-5.9.3.tar.gz.asc # using key D0F8F495DA6160C44EFFBF10F07B9D2DACB19FD6 -sha256 04303a66f85d6d8b16d3cc53bde50428877c82ab524e17591dfceaeb94df6071 net-snmp-5.9.tar.gz +sha256 2097f29b7e1bf3f1300b4bae52fa2308d0bb8d5d3998dbe02f9462a413a2ef0a net-snmp-5.9.3.tar.gz # Hash for license file sha256 ed869ea395a1f125819a56676385ab0557a21507764bf56f2943302011381e59 COPYING diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk index 985cfeac728..15bc318e36b 100644 --- a/package/netsnmp/netsnmp.mk +++ b/package/netsnmp/netsnmp.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETSNMP_VERSION = 5.9 +NETSNMP_VERSION = 5.9.3 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 @@ -40,7 +40,6 @@ NETSNMP_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) LIB_LDCONFIG_CMD=true inst NETSNMP_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) LIB_LDCONFIG_CMD=true install NETSNMP_MAKE = $(MAKE1) NETSNMP_CONFIG_SCRIPTS = net-snmp-config -NETSNMP_AUTORECONF = YES ifeq ($(BR2_ENDIAN),"BIG") NETSNMP_CONF_OPTS += --with-endianness=big diff --git a/package/netsurf/0002-do-not-cross-compile-nsgenbind.patch b/package/netsurf/0002-do-not-cross-compile-nsgenbind.patch index 2d4637511ea..7caad47a20e 100644 --- a/package/netsurf/0002-do-not-cross-compile-nsgenbind.patch +++ b/package/netsurf/0002-do-not-cross-compile-nsgenbind.patch @@ -8,6 +8,8 @@ the build, so it should not be built with the cross-compiler, but with the native compiler. Signed-off-by: Francois Perrad +[Fabrice: add quotes around BUILD_CC to fix build with ccache] +Signed-off-by: Fabrice Fontaine --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -21,7 +23,7 @@ index f279f01..5698c87 100644 # prefixed install macro for each host sub target define do_build_prefix_install - $(MAKE) install --directory=$1 HOST=$(BUILD) PREFIX=$(TMP_PREFIX) Q=$(Q) DESTDIR= -+ $(MAKE) install --directory=$1 HOST=$(BUILD) CC=$(BUILD_CC) PREFIX=$(TMP_PREFIX) Q=$(Q) DESTDIR= ++ $(MAKE) install --directory=$1 HOST=$(BUILD) CC="$(BUILD_CC)" PREFIX=$(TMP_PREFIX) Q=$(Q) DESTDIR= endef diff --git a/package/netsurf/Config.in b/package/netsurf/Config.in index 4f7d5c2713b..394befcf289 100644 --- a/package/netsurf/Config.in +++ b/package/netsurf/Config.in @@ -20,6 +20,7 @@ config BR2_PACKAGE_NETSURF select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_OPENSSL if BR2_PACKAGE_LIBCURL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL if BR2_PACKAGE_LIBCURL help NetSurf is a compact graphical web browser which aims for HTML5, CSS and JavaScript support. diff --git a/package/netsurf/netsurf.mk b/package/netsurf/netsurf.mk index 1064698c12f..574c1423df1 100644 --- a/package/netsurf/netsurf.mk +++ b/package/netsurf/netsurf.mk @@ -14,6 +14,17 @@ NETSURF_CPE_ID_VENDOR = netsurf-browser NETSURF_DEPENDENCIES = expat jpeg libpng \ host-bison host-flex host-gperf host-pkgconf host-vim +# internal duktape doesn't build with BR2_OPTIMIZE_FAST +ifeq ($(BR2_OPTIMIZE_FAST),y) +define NETSURF_DUKTAPE_CONFIGURE_CMDS + echo "override NETSURF_USE_DUKTAPE := NO" >> $(@D)/netsurf/Makefile.config +endef +else +define NETSURF_DUKTAPE_CONFIGURE_CMDS + echo "override NETSURF_USE_DUKTAPE := YES" >> $(@D)/netsurf/Makefile.config +endef +endif + ifeq ($(BR2_PACKAGE_NETSURF_GTK),y) NETSURF_DEPENDENCIES += libgtk2 NETSURF_FRONTEND = gtk2 @@ -77,6 +88,7 @@ endef endif define NETSURF_CONFIGURE_CMDS + $(NETSURF_DUKTAPE_CONFIGURE_CMDS) $(NETSURF_ICONV_CONFIGURE_CMDS) $(NETSURF_SVG_CONFIGURE_CMDS) $(NETSURF_FONTLIB_CONFIGURE_CMDS) diff --git a/package/nettle/Config.in b/package/nettle/Config.in index cf4803c7bbf..92a0e0b59be 100644 --- a/package/nettle/Config.in +++ b/package/nettle/Config.in @@ -7,4 +7,4 @@ config BR2_PACKAGE_NETTLE object-oriented languages, in applications like LSH or GNUPG, or even in kernel space - https://www.lysator.liu.se/~nisse/nettle/ + https://directory.fsf.org/wiki/Nettle diff --git a/package/nettle/nettle.hash b/package/nettle/nettle.hash index cd32ad442ec..d726cb94c61 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.7.3.tar.gz.sig -sha256 661f5eb03f048a3b924c3a8ad2515d4068e40f67e774e8a26827658007e3bcf0 nettle-3.7.3.tar.gz +# https://ftp.gnu.org/gnu/nettle/nettle-3.8.1.tar.gz.sig +sha256 364f3e2b77cd7dcde83fd7c45219c834e54b0c75e428b6f894a23d12dd41cbfe nettle-3.8.1.tar.gz # Locally calculated sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING.LESSERv3 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYINGv2 diff --git a/package/nettle/nettle.mk b/package/nettle/nettle.mk index 3dbd0cb94b7..dd4dfbbe386 100644 --- a/package/nettle/nettle.mk +++ b/package/nettle/nettle.mk @@ -4,8 +4,8 @@ # ################################################################################ -NETTLE_VERSION = 3.7.3 -NETTLE_SITE = http://www.lysator.liu.se/~nisse/archive +NETTLE_VERSION = 3.8.1 +NETTLE_SITE = https://ftp.gnu.org/gnu/nettle NETTLE_DEPENDENCIES = gmp NETTLE_INSTALL_STAGING = YES NETTLE_LICENSE = Dual GPL-2.0+/LGPL-3.0+ @@ -27,3 +27,4 @@ NETTLE_CONF_OPTS += --disable-arm-neon endif $(eval $(autotools-package)) +$(eval $(host-autotools-package)) diff --git a/package/network-manager-openvpn/network-manager-openvpn.hash b/package/network-manager-openvpn/network-manager-openvpn.hash index d0cbc7ca87d..11fb28f8c87 100644 --- a/package/network-manager-openvpn/network-manager-openvpn.hash +++ b/package/network-manager-openvpn/network-manager-openvpn.hash @@ -1,4 +1,4 @@ -# From https://download.gnome.org/sources/NetworkManager-openvpn/1.8/NetworkManager-openvpn-1.8.14.sha256sum -sha256 e7419053fc3b5a7e25f1a7517c313ad4531b6ea280255524ebb85a70c76fdbeb NetworkManager-openvpn-1.8.14.tar.xz +# From https://download.gnome.org/sources/NetworkManager-openvpn/1.10/NetworkManager-openvpn-1.10.2.sha256sum +sha256 62f0f2a8782221b923f212ac2a8ebbc1002efd6a90ee945dad4adfb56d076d21 NetworkManager-openvpn-1.10.2.tar.xz # Locally computed sha256 c39e345d992dfba62db265f8c6d6ff1d90c61d92876635ae05adbfa2f45fff46 COPYING diff --git a/package/network-manager-openvpn/network-manager-openvpn.mk b/package/network-manager-openvpn/network-manager-openvpn.mk index d5d4c5da422..ccc86e45f7b 100644 --- a/package/network-manager-openvpn/network-manager-openvpn.mk +++ b/package/network-manager-openvpn/network-manager-openvpn.mk @@ -4,8 +4,8 @@ # ################################################################################ -NETWORK_MANAGER_OPENVPN_VERSION_MAJOR = 1.8 -NETWORK_MANAGER_OPENVPN_VERSION = $(NETWORK_MANAGER_OPENVPN_VERSION_MAJOR).14 +NETWORK_MANAGER_OPENVPN_VERSION_MAJOR = 1.10 +NETWORK_MANAGER_OPENVPN_VERSION = $(NETWORK_MANAGER_OPENVPN_VERSION_MAJOR).2 NETWORK_MANAGER_OPENVPN_SOURCE = NetworkManager-openvpn-$(NETWORK_MANAGER_OPENVPN_VERSION).tar.xz NETWORK_MANAGER_OPENVPN_SITE = https://download.gnome.org/sources/NetworkManager-openvpn/$(NETWORK_MANAGER_OPENVPN_VERSION_MAJOR) NETWORK_MANAGER_OPENVPN_DEPENDENCIES = network-manager openvpn diff --git a/package/network-manager/0001-build-meson-add-option-to-set-the-mobile-broadband-p.patch b/package/network-manager/0001-build-meson-add-option-to-set-the-mobile-broadband-p.patch new file mode 100644 index 00000000000..4336472e45d --- /dev/null +++ b/package/network-manager/0001-build-meson-add-option-to-set-the-mobile-broadband-p.patch @@ -0,0 +1,60 @@ +From 03ba04d4784fa4fc7ec31455070fb5ecf25ade23 Mon Sep 17 00:00:00 2001 +From: Heiko Thiery +Date: Fri, 27 Jan 2023 22:38:42 +0100 +Subject: [PATCH] build: meson: add option to set the + mobile-broadband-provider-info database + +When building network-manager in cross-compile environment meson is not able +to detect the right location of the mobile-broadband-provider-info +database by using the pkg-config module. + +By adding the option 'mobile_broadband_provider_info_database' to set the +correct path to the datafile this can be solved. + +Signed-off-by: Heiko Thiery + +https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1519 +--- + meson.build | 6 +++++- + meson_options.txt | 1 + + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 0adc42f738..84ce52c736 100644 +--- a/meson.build ++++ b/meson.build +@@ -584,7 +584,10 @@ enable_modem_manager = get_option('modem_manager') + if enable_modem_manager + mm_glib_dep = dependency('mm-glib', version: '>= 0.7.991') + +- mobile_broadband_provider_info_database = dependency('mobile-broadband-provider-info').get_pkgconfig_variable('database') ++ mobile_broadband_provider_info_database = get_option('mobile_broadband_provider_info_database') ++ if mobile_broadband_provider_info_database == '' ++ mobile_broadband_provider_info_database = dependency('mobile-broadband-provider-info').get_pkgconfig_variable('database') ++ endif + config_h.set_quoted('MOBILE_BROADBAND_PROVIDER_INFO_DATABASE', mobile_broadband_provider_info_database) + endif + +@@ -1054,6 +1057,7 @@ output += ' jansson: ' + jansson_msg + '\n' + output += ' iptables: ' + config_h.get('IPTABLES_PATH') + '\n' + output += ' nft: ' + config_h.get('NFT_PATH') + '\n' + output += ' modemmanager-1: ' + enable_modem_manager.to_string() + '\n' ++output += ' mobile-broadband-provider-info-database: ' + mobile_broadband_provider_info_database + '\n' + output += ' ofono: ' + enable_ofono.to_string() + '\n' + output += ' concheck: ' + enable_concheck.to_string() + '\n' + output += ' libteamdctl: ' + enable_teamdctl.to_string() + '\n' +diff --git a/meson_options.txt b/meson_options.txt +index 8b1d32e645..4e359f9e92 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -32,6 +32,7 @@ option('ppp', type: 'boolean', value: true, description: 'enable PPP/PPPoE suppo + option('pppd', type: 'string', value: '', description: 'path to pppd binary') + option('pppd_plugin_dir', type: 'string', value: '', description: 'path to the pppd plugins directory') + option('modem_manager', type: 'boolean', value: true, description: 'Enable new ModemManager1 interface support') ++option('mobile_broadband_provider_info_database', type: 'string', value: '', description: 'path to the mobile-broadband-provider-info database') + option('ofono', type: 'boolean', value: false, description: 'Enable oFono support (experimental)') + option('concheck', type: 'boolean', value: true, description: 'enable connectivity checking support') + option('teamdctl', type: 'boolean', value: false, description: 'enable Teamd control support') +-- +2.20.1 + diff --git a/package/network-manager/0002-meson.build-fix-build-failure-with-Dmodem_manager-fa.patch b/package/network-manager/0002-meson.build-fix-build-failure-with-Dmodem_manager-fa.patch new file mode 100644 index 00000000000..648be027e02 --- /dev/null +++ b/package/network-manager/0002-meson.build-fix-build-failure-with-Dmodem_manager-fa.patch @@ -0,0 +1,38 @@ +From 736a2c356c1c4871e8c4e70be622c65c87d3bca8 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 21 Feb 2023 13:03:00 +0100 +Subject: [PATCH] meson.build: fix build failure with -Dmodem_manager=false + +Fix the following build failure with -Dmodem_manager=false raised since +https://gitlab.freedesktop.org/ffontaine/NetworkManager/-/commit/03ba04d4784fa4fc7ec31455070fb5ecf25ade23: + +../output-1/build/network-manager-1.40.10/meson.build:1060:0: ERROR: Unknown variable "mobile_broadband_provider_info_database". + +Fixes: + - http://autobuild.buildroot.org/results/896879c8e8ce022556ee834216ced2f962ff279c + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1544] +--- + meson.build | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 84ce52c736..b79240efc0 100644 +--- a/meson.build ++++ b/meson.build +@@ -1057,7 +1057,9 @@ output += ' jansson: ' + jansson_msg + '\n' + output += ' iptables: ' + config_h.get('IPTABLES_PATH') + '\n' + output += ' nft: ' + config_h.get('NFT_PATH') + '\n' + output += ' modemmanager-1: ' + enable_modem_manager.to_string() + '\n' +-output += ' mobile-broadband-provider-info-database: ' + mobile_broadband_provider_info_database + '\n' ++if enable_modem_manager ++ output += ' mobile-broadband-provider-info-database: ' + mobile_broadband_provider_info_database + '\n' ++endif + output += ' ofono: ' + enable_ofono.to_string() + '\n' + output += ' concheck: ' + enable_concheck.to_string() + '\n' + output += ' libteamdctl: ' + enable_teamdctl.to_string() + '\n' +-- +2.39.0 + diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in index a48cb37b150..57d7543131a 100644 --- a/package/network-manager/Config.in +++ b/package/network-manager/Config.in @@ -1,24 +1,19 @@ config BR2_PACKAGE_NETWORK_MANAGER bool "network-manager" - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt depends on !BR2_STATIC_LIBS # gnutls depends on BR2_USE_MMU # dbus depends on BR2_PACKAGE_HAS_UDEV depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 - # Tested with 3.2, but may even work with earlier versions depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_6 depends on BR2_TOOLCHAIN_USES_GLIBC # CLOCK_BOOTTIME, IPTOS_CLASS_* depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_USE_WCHAR # libglib2 select BR2_PACKAGE_DBUS - select BR2_PACKAGE_GNUTLS + select BR2_PACKAGE_GNUTLS if !BR2_PACKAGE_LIBNSS select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_LIBGCRYPT + select BR2_PACKAGE_LIBNDP select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBUUID - select BR2_PACKAGE_WIRELESS_TOOLS - select BR2_PACKAGE_WIRELESS_TOOLS_LIB - select BR2_PACKAGE_LIBNDP help NetworkManager is a set of co-operative tools that make networking simple and straightforward. Whether WiFi, wired, @@ -37,9 +32,17 @@ config BR2_PACKAGE_NETWORK_MANAGER_TUI help This option enables terminal based UI +config BR2_PACKAGE_NETWORK_MANAGER_CLI + bool "nmcli support" + select BR2_PACKAGE_READLINE + help + This option enables support for the NetworkManager Command + Line Interface + config BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER bool "modem-manager support" select BR2_PACKAGE_MODEM_MANAGER + select BR2_PACKAGE_MOBILE_BROADBAND_PROVIDER_INFO help This option enables support for ModemManager @@ -54,7 +57,6 @@ config BR2_PACKAGE_NETWORK_MANAGER_OVS select BR2_PACKAGE_JANSSON help This option enables support for OpenVSwitch - endif comment "NetworkManager needs udev /dev management and a glibc toolchain w/ headers >= 4.6, dynamic library, wchar, threads, gcc >= 4.9" diff --git a/package/network-manager/network-manager.hash b/package/network-manager/network-manager.hash index d25f0e81940..3895c1ffc36 100644 --- a/package/network-manager/network-manager.hash +++ b/package/network-manager/network-manager.hash @@ -1,6 +1,6 @@ -# From https://download.gnome.org/sources/NetworkManager/1.34/NetworkManager-1.34.0.sha256sum -sha256 819795d0899076204f5672421a58f1b1d9e393536ee87bb844b911e6243bf0bd NetworkManager-1.34.0.tar.xz +# From https://download.gnome.org/sources/NetworkManager/1.40/NetworkManager-1.40.10.sha256sum +sha256 fa251455df3c38e2bf1e1ff806b4bc4346938dd135a3568bd250e92caa85eaf7 NetworkManager-1.40.10.tar.xz # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL -sha256 ad0abd8e90dd134cc5546f7a13eb4268707b77a5a1a5e3afe31dc4397a573a04 CONTRIBUTING.md +sha256 f3c5ae3cafa27c24590cf89e732581cbeb4d25d950fe49ce7e4042963012b105 CONTRIBUTING.md diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index a90228992cb..87932c75e4a 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -4,142 +4,162 @@ # ################################################################################ -NETWORK_MANAGER_VERSION_MAJOR = 1.34 -NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).0 +NETWORK_MANAGER_VERSION_MAJOR = 1.40 +NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).10 NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz NETWORK_MANAGER_SITE = https://download.gnome.org/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR) NETWORK_MANAGER_INSTALL_STAGING = YES -NETWORK_MANAGER_DEPENDENCIES = host-pkgconf udev gnutls libglib2 \ - libgcrypt wireless_tools util-linux host-intltool libndp NETWORK_MANAGER_LICENSE = GPL-2.0+ (app), LGPL-2.1+ (libnm) NETWORK_MANAGER_LICENSE_FILES = COPYING COPYING.LGPL CONTRIBUTING.md NETWORK_MANAGER_CPE_ID_VENDOR = gnome NETWORK_MANAGER_CPE_ID_PRODUCT = networkmanager NETWORK_MANAGER_SELINUX_MODULES = networkmanager -NETWORK_MANAGER_CONF_ENV = \ - ac_cv_path_LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config \ - ac_cv_file__etc_fedora_release=no \ - ac_cv_file__etc_mandriva_release=no \ - ac_cv_file__etc_debian_version=no \ - ac_cv_file__etc_redhat_release=no \ - ac_cv_file__etc_SuSE_release=no +NETWORK_MANAGER_DEPENDENCIES = \ + host-intltool \ + host-libxslt \ + host-pkgconf \ + dbus \ + libglib2 \ + libndp \ + udev \ + util-linux NETWORK_MANAGER_CONF_OPTS = \ - --disable-introspection \ - --disable-tests \ - --disable-qt \ - --disable-more-warnings \ - --with-crypto=gnutls \ - --with-iptables=/usr/sbin/iptables \ - --disable-ifupdown \ - --without-nm-cloud-setup + -Dintrospection=false \ + -Ddocs=false \ + -Dtests=no \ + -Dqt=false \ + -Diptables=/usr/sbin/iptables \ + -Difupdown=false \ + -Dnm_cloud_setup=false \ + -Dsession_tracking_consolekit=false ifeq ($(BR2_PACKAGE_AUDIT),y) NETWORK_MANAGER_DEPENDENCIES += audit -NETWORK_MANAGER_CONF_OPTS += --with-libaudit +NETWORK_MANAGER_CONF_OPTS += -Dlibaudit=yes else -NETWORK_MANAGER_CONF_OPTS += --without-libaudit +NETWORK_MANAGER_CONF_OPTS += -Dlibaudit=no endif ifeq ($(BR2_PACKAGE_DHCP_CLIENT),y) -NETWORK_MANAGER_CONF_OPTS += --with-dhclient=/sbin/dhclient +NETWORK_MANAGER_CONF_OPTS += -Ddhclient=/sbin/dhclient endif ifeq ($(BR2_PACKAGE_DHCPCD),y) -NETWORK_MANAGER_CONF_OPTS += --with-dhcpcd=/sbin/dhcpcd +NETWORK_MANAGER_CONF_OPTS += -Ddhcpcd=/sbin/dhcpcd endif ifeq ($(BR2_PACKAGE_IWD),y) NETWORK_MANAGER_DEPENDENCIES += iwd -NETWORK_MANAGER_CONF_OPTS += --with-iwd +NETWORK_MANAGER_CONF_OPTS += -Diwd=true +ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT),y) +NETWORK_MANAGER_CONF_OPTS += -Dconfig_wifi_backend_default=wpa_supplicant else -NETWORK_MANAGER_CONF_OPTS += --without-iwd +NETWORK_MANAGER_CONF_OPTS += -Dconfig_wifi_backend_default=iwd +endif +else +NETWORK_MANAGER_CONF_OPTS += \ + -Diwd=false \ + -Dconfig_wifi_backend_default=wpa_supplicant endif ifeq ($(BR2_PACKAGE_LIBCURL),y) NETWORK_MANAGER_DEPENDENCIES += libcurl -NETWORK_MANAGER_CONF_OPTS += --enable-concheck +NETWORK_MANAGER_CONF_OPTS += -Dconcheck=true else -NETWORK_MANAGER_CONF_OPTS += --disable-concheck +NETWORK_MANAGER_CONF_OPTS += -Dconcheck=false +endif + +ifeq ($(BR2_PACKAGE_LIBNSS),y) +NETWORK_MANAGER_DEPENDENCIES += libnss +NETWORK_MANAGER_CONF_OPTS += -Dcrypto=nss +else +NETWORK_MANAGER_DEPENDENCIES += gnutls +NETWORK_MANAGER_CONF_OPTS += -Dcrypto=gnutls endif ifeq ($(BR2_PACKAGE_LIBPSL),y) NETWORK_MANAGER_DEPENDENCIES += libpsl -NETWORK_MANAGER_CONF_OPTS += --with-libpsl +NETWORK_MANAGER_CONF_OPTS += -Dlibpsl=true else -NETWORK_MANAGER_CONF_OPTS += --without-libpsl +NETWORK_MANAGER_CONF_OPTS += -Dlibpsl=false endif ifeq ($(BR2_PACKAGE_LIBSELINUX),y) NETWORK_MANAGER_DEPENDENCIES += libselinux -NETWORK_MANAGER_CONF_OPTS += --with-selinux +NETWORK_MANAGER_CONF_OPTS += -Dselinux=true else -NETWORK_MANAGER_CONF_OPTS += --without-selinux +NETWORK_MANAGER_CONF_OPTS += -Dselinux=false endif ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER),y) -NETWORK_MANAGER_DEPENDENCIES += modem-manager -NETWORK_MANAGER_CONF_OPTS += --with-modem-manager-1 +NETWORK_MANAGER_DEPENDENCIES += modem-manager mobile-broadband-provider-info +NETWORK_MANAGER_CONF_OPTS += -Dmodem_manager=true +NETWORK_MANAGER_CONF_OPTS += -Dmobile_broadband_provider_info_database=/usr/share/mobile-broadband-provider-info/serviceproviders.xml else -NETWORK_MANAGER_CONF_OPTS += --without-modem-manager-1 +NETWORK_MANAGER_CONF_OPTS += -Dmodem_manager=false endif ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_OVS),y) -NETWORK_MANAGER_CONF_OPTS += --enable-ovs +NETWORK_MANAGER_CONF_OPTS += -Dovs=true NETWORK_MANAGER_DEPENDENCIES += jansson else -NETWORK_MANAGER_CONF_OPTS += --disable-ovs +NETWORK_MANAGER_CONF_OPTS += -Dovs=false endif ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_PPPD),y) NETWORK_MANAGER_DEPENDENCIES += pppd -NETWORK_MANAGER_CONF_OPTS += --enable-ppp +NETWORK_MANAGER_CONF_OPTS += \ + -Dppp=true \ + -Dpppd=/usr/sbin/pppd \ + -Dpppd_plugin_dir=/usr/lib/pppd/$(PPPD_VERSION) else -NETWORK_MANAGER_CONF_OPTS += --disable-ppp +NETWORK_MANAGER_CONF_OPTS += -Dppp=false endif ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_TUI),y) NETWORK_MANAGER_DEPENDENCIES += newt -NETWORK_MANAGER_CONF_OPTS += --with-nmtui +NETWORK_MANAGER_CONF_OPTS += -Dnmtui=true else -NETWORK_MANAGER_CONF_OPTS += --without-nmtui +NETWORK_MANAGER_CONF_OPTS += -Dnmtui=false endif ifeq ($(BR2_PACKAGE_OFONO),y) NETWORK_MANAGER_DEPENDENCIES += ofono -NETWORK_MANAGER_CONF_OPTS += --with-ofono +NETWORK_MANAGER_CONF_OPTS += -Dofono=true else -NETWORK_MANAGER_CONF_OPTS += --without-ofono +NETWORK_MANAGER_CONF_OPTS += -Dofono=false endif ifeq ($(BR2_PACKAGE_SYSTEMD),y) NETWORK_MANAGER_DEPENDENCIES += systemd NETWORK_MANAGER_CONF_OPTS += \ - --with-systemd-journal \ - --with-config-logging-backend-default=journal \ - --with-session-tracking=systemd \ - --with-suspend-resume=systemd + -Dsystemd_journal=true \ + -Dconfig_logging_backend_default=journal \ + -Dsession_tracking=systemd \ + -Dsuspend_resume=systemd else NETWORK_MANAGER_CONF_OPTS += \ - --without-systemd-journal \ - --with-config-logging-backend-default=syslog \ - --without-session-tracking \ - --with-suspend-resume=upower + -Dsystemd_journal=false \ + -Dconfig_logging_backend_default=syslog \ + -Dsession_tracking=no \ + -Dsuspend_resume=upower \ + -Dsystemdsystemunitdir=no endif ifeq ($(BR2_PACKAGE_POLKIT),y) NETWORK_MANAGER_DEPENDENCIES += polkit -NETWORK_MANAGER_CONF_OPTS += --enable-polkit +NETWORK_MANAGER_CONF_OPTS += -Dpolkit=true else -NETWORK_MANAGER_CONF_OPTS += --disable-polkit +NETWORK_MANAGER_CONF_OPTS += -Dpolkit=false endif -ifeq ($(BR2_PACKAGE_READLINE),y) +ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_CLI),y) NETWORK_MANAGER_DEPENDENCIES += readline -NETWORK_MANAGER_CONF_OPTS += --with-nmcli +NETWORK_MANAGER_CONF_OPTS += -Dnmcli=true else -NETWORK_MANAGER_CONF_OPTS += --without-nmcli +NETWORK_MANAGER_CONF_OPTS += -Dnmcli=false endif define NETWORK_MANAGER_INSTALL_INIT_SYSV @@ -152,4 +172,4 @@ define NETWORK_MANAGER_INSTALL_INIT_SYSTEMD endef -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/package/networkd-dispatcher/networkd-dispatcher.hash b/package/networkd-dispatcher/networkd-dispatcher.hash index ca7c300783d..ffb4fa846a6 100644 --- a/package/networkd-dispatcher/networkd-dispatcher.hash +++ b/package/networkd-dispatcher/networkd-dispatcher.hash @@ -1,3 +1,3 @@ # locally computed -sha256 1682c0106d9d2879087612e76aebb87672ebf339c43f229a3ee27dadb428575b networkd-dispatcher-2.1.tar.bz2 +sha256 61270b4c2f39c36da4b0a62724a3cc01f6732493fed0f166ee675bafedff11df networkd-dispatcher-2.2.3.tar.bz2 sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE diff --git a/package/networkd-dispatcher/networkd-dispatcher.mk b/package/networkd-dispatcher/networkd-dispatcher.mk index 4f609db73aa..2b1aa257ce7 100644 --- a/package/networkd-dispatcher/networkd-dispatcher.mk +++ b/package/networkd-dispatcher/networkd-dispatcher.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETWORKD_DISPATCHER_VERSION = 2.1 +NETWORKD_DISPATCHER_VERSION = 2.2.3 NETWORKD_DISPATCHER_SOURCE = networkd-dispatcher-$(NETWORKD_DISPATCHER_VERSION).tar.bz2 NETWORKD_DISPATCHER_SITE = https://gitlab.com/craftyguy/networkd-dispatcher/-/archive/$(NETWORKD_DISPATCHER_VERSION) NETWORKD_DISPATCHER_LICENSE = GPL-3.0 diff --git a/package/newt/newt.hash b/package/newt/newt.hash index b136d82af1a..36487d998ee 100644 --- a/package/newt/newt.hash +++ b/package/newt/newt.hash @@ -1,5 +1,5 @@ # From https://releases.pagure.org/newt/CHECKSUMS -sha256 265eb46b55d7eaeb887fca7a1d51fe115658882dfe148164b6c49fccac5abb31 newt-0.52.21.tar.gz -sha512 d53d927996d17223e688bf54dccfabb2a3dc02bfe38ffc455964e86feaca3cd9f9ab5b19774433be430fa4d761cd9b6680b558f297acb86f80daeb6942f7d23c newt-0.52.21.tar.gz +sha256 265eb46b55d7eaeb887fca7a1d51fe115658882dfe148164b6c49fccac5abb31 newt-0.52.21.tar.gz +sha512 d53d927996d17223e688bf54dccfabb2a3dc02bfe38ffc455964e86feaca3cd9f9ab5b19774433be430fa4d761cd9b6680b558f297acb86f80daeb6942f7d23c newt-0.52.21.tar.gz # Locally calculated -sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING +sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/nfacct/nfacct.hash b/package/nfacct/nfacct.hash index d6c05e16d30..aac5ce0ab88 100644 --- a/package/nfacct/nfacct.hash +++ b/package/nfacct/nfacct.hash @@ -1,5 +1,5 @@ # From ftp://ftp.netfilter.org/pub/nfacct/nfacct-1.0.2.tar.bz2.{md5sum,sha1sum} -md5 94faafdaaed85ca9220c5692be8a408e nfacct-1.0.2.tar.bz2 -sha1 17d6576778227ea93c62600d9b18ff4932963c6a nfacct-1.0.2.tar.bz2 +md5 94faafdaaed85ca9220c5692be8a408e nfacct-1.0.2.tar.bz2 +sha1 17d6576778227ea93c62600d9b18ff4932963c6a nfacct-1.0.2.tar.bz2 # Locally computed sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING diff --git a/package/nfs-utils/0001-nfsrahead-fix-linking-while-static-linking.patch b/package/nfs-utils/0001-nfsrahead-fix-linking-while-static-linking.patch new file mode 100644 index 00000000000..e1d57f30cf4 --- /dev/null +++ b/package/nfs-utils/0001-nfsrahead-fix-linking-while-static-linking.patch @@ -0,0 +1,49 @@ +From d9abb221cea81dee5956bd987c6efa680c03571a Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Wed, 10 Aug 2022 23:38:17 +0200 +Subject: [PATCH] nfsrahead: fix linking while static linking + +-lmount must preceed -lblkid and to obtain this let's add in configure.ac: +PKG_CHECK_MODULES([LIBMOUNT], [mount]) +and in tools/nfsrahead/Makefile.am let's substitute explicit `-lmount` +with: +$(LIBMOUNT_LIBS) +This way all the required libraries will be present and in the right order +when static linking. + +Signed-off-by: Giulio Benetti +[Upstream: https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=627c95b2b853161b359095e7fdf05d3b07d51379] +--- + configure.ac | 3 +++ + tools/nfsrahead/Makefile.am | 2 +- + 2 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index f1c46c5c..ff85200b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -273,6 +273,9 @@ AC_LIBCAP + dnl Check for -lxml2 + AC_LIBXML2 + ++dnl Check for -lmount ++PKG_CHECK_MODULES([LIBMOUNT], [mount]) ++ + # Check whether user wants TCP wrappers support + AC_TCP_WRAPPERS + +diff --git a/tools/nfsrahead/Makefile.am b/tools/nfsrahead/Makefile.am +index 845ea0d5..7e08233a 100644 +--- a/tools/nfsrahead/Makefile.am ++++ b/tools/nfsrahead/Makefile.am +@@ -1,6 +1,6 @@ + libexec_PROGRAMS = nfsrahead + nfsrahead_SOURCES = main.c +-nfsrahead_LDFLAGS= -lmount ++nfsrahead_LDFLAGS= $(LIBMOUNT_LIBS) + nfsrahead_LDADD = ../../support/nfs/libnfsconf.la + + man5_MANS = nfsrahead.man +-- +2.34.1 + diff --git a/package/nfs-utils/0002-configure.ac-allow-to-disable-nfsrahead-tool.patch b/package/nfs-utils/0002-configure.ac-allow-to-disable-nfsrahead-tool.patch new file mode 100644 index 00000000000..ee5e3fa2515 --- /dev/null +++ b/package/nfs-utils/0002-configure.ac-allow-to-disable-nfsrahead-tool.patch @@ -0,0 +1,68 @@ +From 9a0002978eb32b78d22f053302e012a4255dc4ef Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Mon, 19 Sep 2022 23:43:28 +0200 +Subject: [PATCH] configure.ac: allow to disable nfsrahead tool + +This allows to make libmount not mandatory but depending on nfsrahead +since it only requires it. This is useful when cross-compiling because +in that case we need rpcgen only built for host but not nfsrahead that +also require libmount. So this reduces the dependencies for host +building. + +Signed-off-by: Giulio Benetti +[Upstream: https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=844d3ad5376603bc9c205a6084d38a2d25146179] +--- + configure.ac | 13 ++++++++++--- + tools/Makefile.am | 6 +++++- + 2 files changed, 15 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index ff85200b..5d9cbf31 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -249,6 +249,16 @@ AC_ARG_ENABLE(nfsdcld, + enable_nfsdcld=$enableval, + enable_nfsdcld="yes") + ++AC_ARG_ENABLE(nfsrahead, ++ [AS_HELP_STRING([--disable-nfsrahead],[disable nfsrahead command @<:@default=no@:>@])], ++ enable_nfsrahead=$enableval, ++ enable_nfsrahead="yes") ++ AM_CONDITIONAL(CONFIG_NFSRAHEAD, [test "$enable_nfsrahead" = "yes" ]) ++ if test "$enable_nfsrahead" = yes; then ++ dnl Check for -lmount ++ PKG_CHECK_MODULES([LIBMOUNT], [mount]) ++ fi ++ + AC_ARG_ENABLE(nfsdcltrack, + [AS_HELP_STRING([--disable-nfsdcltrack],[disable NFSv4 clientid tracking programs @<:@default=no@:>@])], + enable_nfsdcltrack=$enableval, +@@ -273,9 +283,6 @@ AC_LIBCAP + dnl Check for -lxml2 + AC_LIBXML2 + +-dnl Check for -lmount +-PKG_CHECK_MODULES([LIBMOUNT], [mount]) +- + # Check whether user wants TCP wrappers support + AC_TCP_WRAPPERS + +diff --git a/tools/Makefile.am b/tools/Makefile.am +index 40c17c37..48fd0cdf 100644 +--- a/tools/Makefile.am ++++ b/tools/Makefile.am +@@ -12,6 +12,10 @@ if CONFIG_NFSDCLD + OPTDIRS += nfsdclddb + endif + +-SUBDIRS = locktest rpcdebug nlmtest mountstats nfs-iostat rpcctl nfsdclnts nfsrahead $(OPTDIRS) ++if CONFIG_NFSRAHEAD ++OPTDIRS += nfsrahead ++endif ++ ++SUBDIRS = locktest rpcdebug nlmtest mountstats nfs-iostat rpcctl nfsdclnts $(OPTDIRS) + + MAINTAINERCLEANFILES = Makefile.in +-- +2.34.1 + diff --git a/package/nfs-utils/Config.in b/package/nfs-utils/Config.in index f00debc4201..f3cb17918e1 100644 --- a/package/nfs-utils/Config.in +++ b/package/nfs-utils/Config.in @@ -8,6 +8,8 @@ config BR2_PACKAGE_NFS_UTILS depends on BR2_USE_MMU # fork() select BR2_PACKAGE_LIBTIRPC # IPv6 requires libtirpc select BR2_PACKAGE_UTIL_LINUX + select BR2_PACKAGE_UTIL_LINUX_LIBBLKID + select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT select BR2_PACKAGE_UTIL_LINUX_LIBUUID help The NFS Linux kernel server. diff --git a/package/nfs-utils/nfs-utils.hash b/package/nfs-utils/nfs-utils.hash index a73bf80e70b..2efe693875d 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.1/sha256sums.asc -sha256 60dfcd94a9f3d72a12bc7058d811787ec87a6d593d70da2123faf9aad3d7a1df nfs-utils-2.6.1.tar.xz +# From https://www.kernel.org/pub/linux/utils/nfs-utils/2.6.2/sha256sums.asc +sha256 5200873e81c4d610e2462fc262fe18135f2dbe78b7979f95accd159ae64d5011 nfs-utils-2.6.2.tar.xz # Locally computed sha256 576540abf5e95029ad4ad90e32071385a5e95b2c30708c706116f3eb87b9a3de COPYING diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk index 44653e27073..1a4a99f566a 100644 --- a/package/nfs-utils/nfs-utils.mk +++ b/package/nfs-utils/nfs-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -NFS_UTILS_VERSION = 2.6.1 +NFS_UTILS_VERSION = 2.6.2 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+ @@ -34,6 +34,7 @@ HOST_NFS_UTILS_CONF_OPTS = \ --without-tcp-wrappers \ --with-statedir=/run/nfs \ --disable-caps \ + --disable-nfsrahead \ --without-systemd \ --with-rpcgen=internal \ --with-tirpcinclude=$(HOST_DIR)/include/tirpc @@ -68,12 +69,6 @@ else NFS_UTILS_CONF_OPTS += --disable-caps endif -ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBBLKID),y) -NFS_UTILS_CONF_OPTS += --enable-uuid -else -NFS_UTILS_CONF_OPTS += --disable-uuid -endif - define NFS_UTILS_INSTALL_FIXUP cd $(TARGET_DIR) && rm -f $(NFS_UTILS_TARGETS_) touch $(TARGET_DIR)/etc/exports diff --git a/package/nftables/Config.in b/package/nftables/Config.in index 8d172b72569..833a3a38a2c 100644 --- a/package/nftables/Config.in +++ b/package/nftables/Config.in @@ -13,5 +13,10 @@ 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 +source "package/nftables/nftables-python/Config.in" +endif + comment "nftables needs a toolchain w/ wchar, headers >= 3.12" depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 diff --git a/package/nftables/nftables-python/Config.in b/package/nftables/nftables-python/Config.in new file mode 100644 index 00000000000..b16e2d0ad11 --- /dev/null +++ b/package/nftables/nftables-python/Config.in @@ -0,0 +1,4 @@ +config BR2_PACKAGE_NFTABLES_PYTHON + bool "python bindings" + default y # legacy + depends on BR2_PACKAGE_PYTHON3 diff --git a/package/nftables/nftables-python/nftables-python.hash b/package/nftables/nftables-python/nftables-python.hash new file mode 120000 index 00000000000..9ac74580e7c --- /dev/null +++ b/package/nftables/nftables-python/nftables-python.hash @@ -0,0 +1 @@ +../nftables.hash \ No newline at end of file diff --git a/package/nftables/nftables-python/nftables-python.mk b/package/nftables/nftables-python/nftables-python.mk new file mode 100644 index 00000000000..908bacd99a2 --- /dev/null +++ b/package/nftables/nftables-python/nftables-python.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# nftables-python +# +################################################################################ + +# The following assignments work only because nftables.mk is included before +# this file is. +NFTABLES_PYTHON_VERSION = $(NFTABLES_VERSION) +NFTABLES_PYTHON_SOURCE = $(NFTABLES_SOURCE) +NFTABLES_PYTHON_SITE = $(NFTABLES_SITE) +NFTABLES_PYTHON_LICENSE = $(NFTABLES_LICENSE) +NFTABLES_PYTHON_LICENSE_FILES = $(NFTABLES_LICENSE_FILES) + +# We share the same source code as nftables +NFTABLES_PYTHON_DL_SUBDIR = nftables + +NFTABLES_PYTHON_SUBDIR = py + +NFTABLES_PYTHON_SETUP_TYPE = setuptools + +$(eval $(python-package)) diff --git a/package/nftables/nftables.hash b/package/nftables/nftables.hash index 53878abba97..7e1e856229f 100644 --- a/package/nftables/nftables.hash +++ b/package/nftables/nftables.hash @@ -1,3 +1,3 @@ # From https://netfilter.org/projects/nftables/downloads.html -sha256 3ceeba625818e81a0be293e9dd486c3ef799ebd92165270f1e57e9a201efa423 nftables-1.0.1.tar.bz2 -sha256 c17bc4fa5b2434c6f283ffcb2312e5bf3c7cdf5787b79505f094d8de734ac53e COPYING +sha256 c12ac941fff9adaedf17367d5ce213789b98a0d314277bc22b3d71e10891f412 nftables-1.0.7.tar.xz +sha256 4ee1e51baf5f3166712fa0c3e01338c7257e50ddef245d28bb14ad68f6070ba5 COPYING diff --git a/package/nftables/nftables.mk b/package/nftables/nftables.mk index 232d5414886..d31df8afa46 100644 --- a/package/nftables/nftables.mk +++ b/package/nftables/nftables.mk @@ -4,15 +4,21 @@ # ################################################################################ -NFTABLES_VERSION = 1.0.1 -NFTABLES_SOURCE = nftables-$(NFTABLES_VERSION).tar.bz2 +NFTABLES_VERSION = 1.0.7 +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) NFTABLES_LICENSE = GPL-2.0 NFTABLES_LICENSE_FILES = COPYING -NFTABLES_CONF_OPTS = --disable-debug --disable-man-doc --disable-pdf-doc NFTABLES_SELINUX_MODULES = iptables +# Python bindings are handled by package nftables-python +NFTABLES_CONF_OPTS = \ + --disable-debug \ + --disable-man-doc \ + --disable-pdf-doc \ + --disable-python + ifeq ($(BR2_PACKAGE_GMP),y) NFTABLES_DEPENDENCIES += gmp NFTABLES_CONF_OPTS += --without-mini-gmp @@ -20,10 +26,17 @@ else NFTABLES_CONF_OPTS += --with-mini-gmp endif -ifeq ($(BR2_PACKAGE_READLINE),y) +ifeq ($(BR2_PACKAGE_LIBEDIT),y) +NFTABLES_CONF_OPTS += --with-cli=editline +NFTABLES_DEPENDENCIES += libedit +NFTABLES_LIBS += -lncurses +else ifeq ($(BR2_PACKAGE_READLINE),y) NFTABLES_CONF_OPTS += --with-cli=readline NFTABLES_DEPENDENCIES += readline NFTABLES_LIBS += -lncurses +else ifeq ($(BR2_PACKAGE_LINENOISE),y) +NFTABLES_CONF_OPTS += --with-cli=linenoise +NFTABLES_DEPENDENCIES += linenoise else NFTABLES_CONF_OPTS += --without-cli endif @@ -35,17 +48,6 @@ else NFTABLES_CONF_OPTS += --without-json endif -ifeq ($(BR2_PACKAGE_PYTHON3),y) -NFTABLES_CONF_OPTS += --enable-python -NFTABLES_DEPENDENCIES += python3 -else -NFTABLES_CONF_OPTS += --disable-python -endif - -ifeq ($(BR2_STATIC_LIBS)$(BR2_PACKAGE_LIBNFTNL_JSON),yy) -NFTABLES_LIBS += -ljansson -lm -endif - NFTABLES_CONF_ENV = LIBS="$(NFTABLES_LIBS)" define NFTABLES_LINUX_CONFIG_FIXUPS @@ -55,3 +57,6 @@ define NFTABLES_LINUX_CONFIG_FIXUPS endef $(eval $(autotools-package)) + +# Legacy: we used to handle it in this .mk +include package/nftables/nftables-python/nftables-python.mk diff --git a/package/nginx-dav-ext/nginx-dav-ext.hash b/package/nginx-dav-ext/nginx-dav-ext.hash index 07deab08db8..8a146c72edf 100644 --- a/package/nginx-dav-ext/nginx-dav-ext.hash +++ b/package/nginx-dav-ext/nginx-dav-ext.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d2499d94d82d4e4eac8425d799e52883131ae86a956524040ff2fd230ef9f859 nginx-dav-ext-3.0.0.tar.gz -sha256 e377bb81e5024682a66438306e8ff9541d843d3831e480aec2f58eb8d83e48de LICENSE +sha256 d2499d94d82d4e4eac8425d799e52883131ae86a956524040ff2fd230ef9f859 nginx-dav-ext-3.0.0.tar.gz +sha256 e377bb81e5024682a66438306e8ff9541d843d3831e480aec2f58eb8d83e48de LICENSE diff --git a/package/nginx-modsecurity/Config.in b/package/nginx-modsecurity/Config.in index b1fcbadd7a7..0bbf05fad9d 100644 --- a/package/nginx-modsecurity/Config.in +++ b/package/nginx-modsecurity/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_NGINX_MODSECURITY depends on BR2_PACKAGE_NGINX_HTTP depends on BR2_INSTALL_LIBSTDCPP # libmodsecurity depends on BR2_TOOLCHAIN_HAS_THREADS # libmodsecurity + depends on !BR2_STATIC_LIBS # libmodsecurity select BR2_PACKAGE_LIBMODSECURITY help The ModSecurity-nginx connector is the connection @@ -11,6 +12,7 @@ config BR2_PACKAGE_NGINX_MODSECURITY https://github.com/SpiderLabs/ModSecurity-nginx -comment "nginx-modsecurity needs a toolchain w/ C++, threads" +comment "nginx-modsecurity needs a toolchain w/ C++, threads, dynamic library" depends on BR2_PACKAGE_NGINX_HTTP - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/nginx-modsecurity/nginx-modsecurity.hash b/package/nginx-modsecurity/nginx-modsecurity.hash index fbaf1ca239c..0cd2ee07cd1 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.2/modsecurity-nginx-v1.0.2.tar.gz.sha256 -sha256 41a6660c50508c60df59f8f09c444d18ef8112a4c118cdc791a3992390b78c32 modsecurity-nginx-v1.0.2.tar.gz +# 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 # Localy calculated sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/nginx-modsecurity/nginx-modsecurity.mk b/package/nginx-modsecurity/nginx-modsecurity.mk index 90ef8ecd511..a00c200469c 100644 --- a/package/nginx-modsecurity/nginx-modsecurity.mk +++ b/package/nginx-modsecurity/nginx-modsecurity.mk @@ -4,7 +4,7 @@ # ################################################################################ -NGINX_MODSECURITY_VERSION = 1.0.2 +NGINX_MODSECURITY_VERSION = 1.0.3 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_LICENSE = Apache-2.0 diff --git a/package/nginx-naxsi/0002-PCRE2-compatibility.patch b/package/nginx-naxsi/0002-PCRE2-compatibility.patch new file mode 100644 index 00000000000..aa3df4dff7d --- /dev/null +++ b/package/nginx-naxsi/0002-PCRE2-compatibility.patch @@ -0,0 +1,221 @@ +From 2937c44276cba21601ade4e265d32515f570d68c Mon Sep 17 00:00:00 2001 +From: Danila Vershinin +Date: Thu, 16 Jun 2022 01:22:23 +0300 +Subject: [PATCH] PCRE2 compatibility (#587) + +* Fix: use pcre2 when building with nginx >= 1.21.5 + +I've tried to compile naxsi 1.3 as module for nginx 1.21.6, and got the error: + +error: invalid use of incomplete typedef 'ngx_regex_t' {aka 'struct pcre2_real_code_8'} + 205 | (tmp_idx < len && (match = pcre_exec(rl->br->rx->regex->code, + +I found this issue report: Ref: https://github.com/nbs-system/naxsi/issues/580 +then i tried to solve the pcre2 compatibility issue. + +I've included an helper function that is 'copied' from: https://github.com/nginx/nginx/blob/master/src/core/ngx_regex.c#L393 +that it is called in place of 'pcre_exec' when nginx_version >= 1021005 + +Not sure if this is the best solution, but I managed to build naxsi 1.3 as module for nginx 1.21.6 succesfully, and it seems to work well. + +I'm not used to develop in C anymore (since 25 years ago, at least!), but I hope that this patch I made can help anybody else. + +* Added a check for nginx_version >= 1021005 + +Added a check for nginx_version >= 1021005 to avoid helper function definition on older versions + +* Use NGX_PCRE2 conditional + +Update naxsi.h + +Don't include pcre.h in order for compilation to work both against pcre and pcre2 + +Fix pcre vs pcre2 compilation + +Co-authored-by: laluigino <99279306+laluigino@users.noreply.github.com> +[Retrieved from: +https://github.com/nbs-system/naxsi/commit/2937c44276cba21601ade4e265d32515f570d68c] +Signed-off-by: Fabrice Fontaine +--- + naxsi_src/naxsi.h | 1 - + naxsi_src/naxsi_config.c | 9 ++++- + naxsi_src/naxsi_runtime.c | 82 ++++++++++++++++++++++++++++++++++++++- + naxsi_src/naxsi_utils.c | 8 ++++ + 4 files changed, 96 insertions(+), 4 deletions(-) + +diff --git a/naxsi_src/naxsi.h b/naxsi_src/naxsi.h +index 53df1bd8..b2f5c1a5 100644 +--- a/naxsi_src/naxsi.h ++++ b/naxsi_src/naxsi.h +@@ -19,7 +19,6 @@ + #include + #include + #include +-#include + + extern ngx_module_t ngx_http_naxsi_module; + +diff --git a/naxsi_src/naxsi_config.c b/naxsi_src/naxsi_config.c +index 4ea15567..6d2f0e23 100644 +--- a/naxsi_src/naxsi_config.c ++++ b/naxsi_src/naxsi_config.c +@@ -322,8 +322,11 @@ naxsi_zone(ngx_conf_t* r, ngx_str_t* tmp, ngx_http_rule_t* rule) + + custom_rule->target_rx = ngx_pcalloc(r->pool, sizeof(ngx_regex_compile_t)); + return_value_if(!custom_rule->target_rx, NGX_CONF_ERROR); +- ++#if (NGX_PCRE2) ++ custom_rule->target_rx->options = PCRE2_CASELESS | PCRE2_MULTILINE; ++#else + custom_rule->target_rx->options = PCRE_CASELESS | PCRE_MULTILINE; ++#endif + custom_rule->target_rx->pattern = custom_rule->target; + custom_rule->target_rx->pool = r->pool; + custom_rule->target_rx->err.len = 0; +@@ -442,7 +445,11 @@ naxsi_rx(ngx_conf_t* r, ngx_str_t* tmp, ngx_http_rule_t* rule) + ha.len = tmp->len - strlen(RX_T); + rgc = ngx_pcalloc(r->pool, sizeof(ngx_regex_compile_t)); + return_value_if(!rgc, NGX_CONF_ERROR); ++#if (NGX_PCRE2) ++ rgc->options = PCRE2_CASELESS | PCRE2_MULTILINE; ++#else + rgc->options = PCRE_CASELESS | PCRE_MULTILINE; ++#endif + rgc->pattern = ha; + rgc->pool = r->pool; + rgc->err.len = 0; +diff --git a/naxsi_src/naxsi_runtime.c b/naxsi_src/naxsi_runtime.c +index d548ce37..784852b0 100644 +--- a/naxsi_src/naxsi_runtime.c ++++ b/naxsi_src/naxsi_runtime.c +@@ -181,6 +181,75 @@ ngx_http_naxsi_rawbody_parse(ngx_http_request_ctx_t* ctx, + unsigned char* + ngx_utf8_check(ngx_str_t* str); + ++#if defined nginx_version && (nginx_version >= 1021005) ++/* ++ * variables to use pcre2 ++ */ ++static pcre2_match_data *ngx_pcre2_match_data; ++static ngx_uint_t ngx_pcre2_match_data_size; ++ ++/* ++ * helper function to use pcre2 ++ */ ++ngx_int_t ++ngx_pcre2_exec(ngx_regex_t *re, unsigned char* str, unsigned int len, ngx_int_t tmp_idx, int *captures, ngx_uint_t size) ++{ ++ size_t *ov; ++ ngx_int_t rc; ++ ngx_uint_t n, i; ++ ++ /* ++ * The pcre2_match() function might allocate memory for backtracking ++ * frames, typical allocations are from 40k and above. So the allocator ++ * is configured to do direct allocations from heap during matching. ++ */ ++ ++ if (ngx_pcre2_match_data == NULL ++ || size > ngx_pcre2_match_data_size) ++ { ++ /* ++ * Allocate a match data if not yet allocated or smaller than ++ * needed. ++ */ ++ ++ if (ngx_pcre2_match_data) { ++ pcre2_match_data_free(ngx_pcre2_match_data); ++ } ++ ++ ngx_pcre2_match_data_size = size; ++ ngx_pcre2_match_data = pcre2_match_data_create(size / 3, NULL); ++ ++ if (ngx_pcre2_match_data == NULL) { ++ rc = PCRE2_ERROR_NOMEMORY; ++ goto failed; ++ } ++ } ++ ++ rc = pcre2_match(re, str, len, tmp_idx, 0, ngx_pcre2_match_data, NULL); ++ ++ if (rc < 0) { ++ goto failed; ++ } ++ ++ n = pcre2_get_ovector_count(ngx_pcre2_match_data); ++ ov = pcre2_get_ovector_pointer(ngx_pcre2_match_data); ++ ++ if (n > size / 3) { ++ n = size / 3; ++ } ++ ++ for (i = 0; i < n; i++) { ++ captures[i * 2] = ov[i * 2]; ++ captures[i * 2 + 1] = ov[i * 2 + 1]; ++ } ++ ++failed: ++ ++ return rc; ++ ++} ++#endif ++ + /* + ** in : string to inspect, associated rule + ** does : apply the rule on the string, return 1 if matched, +@@ -201,7 +270,14 @@ ngx_http_process_basic_rule_buffer(ngx_str_t* str, ngx_http_rule_t* rl, ngx_int_ + tmp_idx = 0; + len = str->len; + while +-#if defined nginx_version && (nginx_version >= 1002002 && nginx_version != 1003000) ++#if (NGX_PCRE2) ++ (tmp_idx < len && (match = ngx_pcre2_exec(rl->br->rx->regex, ++ str->data, ++ str->len, ++ tmp_idx, ++ captures, ++ 30)) >= 0) ++#elif defined nginx_version && (nginx_version >= 1002002 && nginx_version != 1003000) + (tmp_idx < len && (match = pcre_exec(rl->br->rx->regex->code, + 0, + (const char*)str->data, +@@ -496,7 +572,9 @@ ngx_http_naxsi_pcre_wrapper(ngx_regex_compile_t* rx, unsigned char* str, unsigne + int match; + int captures[30]; + +-#if defined nginx_version && (nginx_version >= 1002002 && nginx_version != 1003000) ++#if (NGX_PCRE2) ++ match = ngx_pcre2_exec(rx->regex, str, len, 0, captures, 1); ++#elif defined nginx_version && (nginx_version >= 1002002 && nginx_version != 1003000) + match = pcre_exec(rx->regex->code, 0, (const char*)str, len, 0, 0, captures, 1); + #elif defined nginx_version && (nginx_version > 1001011) + match = pcre_exec(rx->regex->pcre, 0, (const char*)str, len, 0, 0, captures, 1); +diff --git a/naxsi_src/naxsi_utils.c b/naxsi_src/naxsi_utils.c +index e3d6f185..d2ecedec 100644 +--- a/naxsi_src/naxsi_utils.c ++++ b/naxsi_src/naxsi_utils.c +@@ -800,7 +800,11 @@ ngx_http_naxsi_create_hashtables_n(ngx_http_naxsi_loc_conf_t* dlc, ngx_conf_t* c + ngx_pcalloc(cf->pool, sizeof(ngx_regex_compile_t)); + rgc = custloc_array(curr_r->br->custom_locations->elts)[name_idx].target_rx; + if (rgc) { ++#if (NGX_PCRE2) ++ rgc->options = PCRE2_CASELESS | PCRE2_MULTILINE; ++#else + rgc->options = PCRE_CASELESS | PCRE_MULTILINE; ++#endif + rgc->pattern = custloc_array(curr_r->br->custom_locations->elts)[name_idx].target; + rgc->pool = cf->pool; + rgc->err.len = 0; +@@ -816,7 +820,11 @@ ngx_http_naxsi_create_hashtables_n(ngx_http_naxsi_loc_conf_t* dlc, ngx_conf_t* c + ngx_pcalloc(cf->pool, sizeof(ngx_regex_compile_t)); + rgc = custloc_array(curr_r->br->custom_locations->elts)[uri_idx].target_rx; + if (rgc) { ++#if (NGX_PCRE2) ++ rgc->options = PCRE2_CASELESS | PCRE2_MULTILINE; ++#else + rgc->options = PCRE_CASELESS | PCRE_MULTILINE; ++#endif + rgc->pattern = custloc_array(curr_r->br->custom_locations->elts)[uri_idx].target; + rgc->pool = cf->pool; + rgc->err.len = 0; diff --git a/package/nginx/Config.in b/package/nginx/Config.in index 1200b2bf4c1..8e888baa1c6 100644 --- a/package/nginx/Config.in +++ b/package/nginx/Config.in @@ -6,7 +6,7 @@ menuconfig BR2_PACKAGE_NGINX nginx is an HTTP and reverse proxy server, as well as a mail proxy server. - http://nginx.org/ + https://nginx.org/ if BR2_PACKAGE_NGINX @@ -214,7 +214,7 @@ config BR2_PACKAGE_NGINX_HTTP_REFERER_MODULE config BR2_PACKAGE_NGINX_HTTP_REWRITE_MODULE bool "ngx_http_rewrite_module" default y - select BR2_PACKAGE_PCRE + select BR2_PACKAGE_PCRE2 help Enable ngx_http_rewrite_module @@ -296,6 +296,14 @@ config BR2_PACKAGE_NGINX_HTTP_UPSTREAM_RANDOM_MODULE help Enable ngx_http_upstream_random_module +config BR2_PACKAGE_NGINX_HTTP_UPSTREAM_ZONE_MODULE + bool "ngx_http_upstream_zone_module" + default y + depends on BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS + select BR2_PACKAGE_LIBATOMIC_OPS + help + Enable ngx_http_upstream_zone_module + endif #BR2_PACKAGE_NGINX_HTTP config BR2_PACKAGE_NGINX_MAIL @@ -419,6 +427,8 @@ config BR2_PACKAGE_NGINX_STREAM_UPSTREAM_RANDOM_MODULE config BR2_PACKAGE_NGINX_STREAM_UPSTREAM_ZONE_MODULE bool "ngx_stream_upstream_zone_module" default y + depends on BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS + select BR2_PACKAGE_LIBATOMIC_OPS help Enable ngx_stream_upstream_zone_module diff --git a/package/nginx/nginx.hash b/package/nginx/nginx.hash index 06d3392a2e1..06454c5e320 100644 --- a/package/nginx/nginx.hash +++ b/package/nginx/nginx.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 e462e11533d5c30baa05df7652160ff5979591d291736cfa5edb9fd2edb48c49 nginx-1.20.1.tar.gz +sha256 9ebb333a9e82b952acd3e2b4aeb1d4ff6406f72491bab6cd9fe69f0dea737f31 nginx-1.22.1.tar.gz # License files, locally calculated -sha256 b57270c1f73eb6624b38b2d0a1affcec56b21fab39efbf8c837428f05cef1d73 LICENSE +sha256 ececed0b0e7243a4766cbc62b26df4bd3513b41de3a07425da1679c836d06320 LICENSE diff --git a/package/nginx/nginx.mk b/package/nginx/nginx.mk index 31b6e276b74..185bcd576f2 100644 --- a/package/nginx/nginx.mk +++ b/package/nginx/nginx.mk @@ -4,11 +4,11 @@ # ################################################################################ -NGINX_VERSION = 1.20.1 -NGINX_SITE = http://nginx.org/download +NGINX_VERSION = 1.22.1 +NGINX_SITE = https://nginx.org/download NGINX_LICENSE = BSD-2-Clause NGINX_LICENSE_FILES = LICENSE -NGINX_CPE_ID_VENDOR = nginx +NGINX_CPE_ID_VENDOR = f5 NGINX_DEPENDENCIES = \ host-pkgconf \ $(if $(BR2_PACKAGE_LIBXCRYPT),libxcrypt) @@ -80,8 +80,8 @@ else NGINX_CONF_ENV += ngx_force_have_libatomic=no endif -ifeq ($(BR2_PACKAGE_PCRE),y) -NGINX_DEPENDENCIES += pcre +ifeq ($(BR2_PACKAGE_PCRE2),y) +NGINX_DEPENDENCIES += pcre2 NGINX_CONF_OPTS += --with-pcre else NGINX_CONF_OPTS += --without-pcre @@ -164,7 +164,7 @@ NGINX_CONF_OPTS += --without-http_gzip_module endif ifeq ($(BR2_PACKAGE_NGINX_HTTP_REWRITE_MODULE),y) -NGINX_DEPENDENCIES += pcre +NGINX_DEPENDENCIES += pcre2 else NGINX_CONF_OPTS += --without-http_rewrite_module endif @@ -203,7 +203,8 @@ NGINX_CONF_OPTS += \ $(if $(BR2_PACKAGE_NGINX_HTTP_UPSTREAM_IP_HASH_MODULE),,--without-http_upstream_ip_hash_module) \ $(if $(BR2_PACKAGE_NGINX_HTTP_UPSTREAM_LEAST_CONN_MODULE),,--without-http_upstream_least_conn_module) \ $(if $(BR2_PACKAGE_NGINX_HTTP_UPSTREAM_RANDOM_MODULE),,--without-http_upstream_random_module) \ - $(if $(BR2_PACKAGE_NGINX_HTTP_UPSTREAM_KEEPALIVE_MODULE),,--without-http_upstream_keepalive_module) + $(if $(BR2_PACKAGE_NGINX_HTTP_UPSTREAM_KEEPALIVE_MODULE),,--without-http_upstream_keepalive_module) \ + $(if $(BR2_PACKAGE_NGINX_HTTP_UPSTREAM_ZONE_MODULE),,--without-http_upstream_zone_module) else # !BR2_PACKAGE_NGINX_HTTP NGINX_CONF_OPTS += --without-http diff --git a/package/ngircd/Config.in b/package/ngircd/Config.in index 9b3d430922c..1e93a5702c7 100644 --- a/package/ngircd/Config.in +++ b/package/ngircd/Config.in @@ -2,6 +2,6 @@ config BR2_PACKAGE_NGIRCD bool "ngircd" depends on BR2_USE_MMU # fork() help - Next Generation IRC server deamon. + Next Generation IRC server daemon. http://ngircd.barton.de diff --git a/package/nilfs-utils/nilfs-utils.hash b/package/nilfs-utils/nilfs-utils.hash index ad6a57d8f57..ec71751b00b 100644 --- a/package/nilfs-utils/nilfs-utils.hash +++ b/package/nilfs-utils/nilfs-utils.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha512 3232390581f63de5ebe7b461b178a40dfbdaa4bc6aa96b218ea8182c5bf81b162a1e632a1c21d9f1e89fdba9393b4e268e001c335a99ce22f645a62ae3154783 nilfs-utils-2.2.8.tar.bz2 -sha512 4fc92d3998910acb108f81b1aee70a55a572b661a2766d0e57a55e48e2b737eea41415356cbd62593f26aec5797ab9fbb40211d7782b5834b4855ff1ce6ad5f7 COPYING +sha512 dd8ab20ee0d6750a6d81f86fe4d1ad94a8a71aa53ee7cd38550ea32fffcc9527db1c75d34f732f0f8f6379a808249f8eec2619e54c595566a3fc434a87d9e66d nilfs-utils-2.2.9.tar.bz2 +sha512 4fc92d3998910acb108f81b1aee70a55a572b661a2766d0e57a55e48e2b737eea41415356cbd62593f26aec5797ab9fbb40211d7782b5834b4855ff1ce6ad5f7 COPYING diff --git a/package/nilfs-utils/nilfs-utils.mk b/package/nilfs-utils/nilfs-utils.mk index 7335d87209a..9f9bd091c3e 100644 --- a/package/nilfs-utils/nilfs-utils.mk +++ b/package/nilfs-utils/nilfs-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -NILFS_UTILS_VERSION = 2.2.8 +NILFS_UTILS_VERSION = 2.2.9 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) diff --git a/package/ninja/ninja.hash b/package/ninja/ninja.hash index fd2c594a77e..57c10bb287c 100644 --- a/package/ninja/ninja.hash +++ b/package/ninja/ninja.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 ce35865411f0490368a8fc383f29071de6690cbadc27704734978221f25e2bed ninja-1.10.2.tar.gz +sha256 7ba84551f5b315b4270dc7c51adef5dff83a2154a3665a6c9744245c122dd0db ninja-1.11.1.g95dee.kitware.jobserver-1.tar.gz sha256 eb7e9ab9690124c5c9f42bdc81383d886a3dede26345b6ed15bbad7caf81f7ea COPYING diff --git a/package/ninja/ninja.mk b/package/ninja/ninja.mk index ab1941023eb..b7bc1a4f1c8 100644 --- a/package/ninja/ninja.mk +++ b/package/ninja/ninja.mk @@ -4,8 +4,9 @@ # ################################################################################ -NINJA_VERSION = 1.10.2 -NINJA_SITE = $(call github,ninja-build,ninja,v$(NINJA_VERSION)) +NINJA_VERSION_MAJOR = 1.11.1 +NINJA_VERSION = $(NINJA_VERSION_MAJOR).g95dee.kitware.jobserver-1 +NINJA_SITE = $(call github,Kitware,ninja,v$(NINJA_VERSION)) NINJA_LICENSE = Apache-2.0 NINJA_LICENSE_FILES = COPYING diff --git a/package/nload/nload.hash b/package/nload/nload.hash index f5b8e58f664..cf211674fa5 100644 --- a/package/nload/nload.hash +++ b/package/nload/nload.hash @@ -1,5 +1,5 @@ # From https://sourceforge.net/projects/nload/files/nload/0.7.4/ -md5 3c733c528f244ca5a4f76bf185729c39 nload-0.7.4.tar.gz -sha1 bb0a168c93c588ad4fd5e3a653b3620b79ada1e8 nload-0.7.4.tar.gz +md5 3c733c528f244ca5a4f76bf185729c39 nload-0.7.4.tar.gz +sha1 bb0a168c93c588ad4fd5e3a653b3620b79ada1e8 nload-0.7.4.tar.gz # Locally computed sha256 67f82e045cf7acfef853ea0f426575a8359161a0a325e19f02b529a87c4b6c34 COPYING diff --git a/package/nodejs/0001-add-qemu-wrapper-support.patch b/package/nodejs/0001-add-qemu-wrapper-support.patch index 1368ca5a386..184f3d19b70 100644 --- a/package/nodejs/0001-add-qemu-wrapper-support.patch +++ b/package/nodejs/0001-add-qemu-wrapper-support.patch @@ -1,4 +1,4 @@ -From fa09fa3ad6a21ae0b35fb860f76d1762e5f29972 Mon Sep 17 00:00:00 2001 +From 1f6c55d7318e7075169004b4314708f4766ec193 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 27 Sep 2021 12:55:09 -0700 Subject: [PATCH] add qemu-wrapper support @@ -17,15 +17,15 @@ host-builds. Signed-off-by: Adam Duskett --- - node.gyp | 4 ++-- - tools/v8_gypfiles/v8.gyp | 8 ++++---- - 2 files changed, 6 insertions(+), 6 deletions(-) + node.gyp | 4 ++-- + tools/v8_gypfiles/v8.gyp | 10 +++++----- + 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/node.gyp b/node.gyp -index 8ba0dfeb..c77f6f7d 100644 +index 97cdbb531d..db5cf51ce6 100644 --- a/node.gyp +++ b/node.gyp -@@ -491,7 +491,7 @@ +@@ -319,7 +319,7 @@ 'action_name': 'run_mkcodecache', 'process_outputs_as_sources': 1, 'inputs': [ @@ -34,20 +34,20 @@ index 8ba0dfeb..c77f6f7d 100644 ], 'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/node_code_cache.cc', -@@ -516,7 +516,7 @@ - 'action_name': 'node_mksnapshot', - 'process_outputs_as_sources': 1, - 'inputs': [ -- '<(node_mksnapshot_exec)', -+ @MAYBE_WRAPPER@ '<(node_mksnapshot_exec)', - ], - 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/node_snapshot.cc', +@@ -346,7 +346,7 @@ + 'action_name': 'node_mksnapshot', + 'process_outputs_as_sources': 1, + 'inputs': [ +- '<(node_mksnapshot_exec)', ++ @MAYBE_WRAPPER@ '<(node_mksnapshot_exec)', + '<(node_snapshot_main)', + ], + 'outputs': [ diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp -index 48ec392b..f9bb0fbe 100644 +index 73099a03e4..88ca91efb4 100644 --- a/tools/v8_gypfiles/v8.gyp +++ b/tools/v8_gypfiles/v8.gyp -@@ -220,7 +220,7 @@ +@@ -68,7 +68,7 @@ { 'action_name': 'run_torque_action', 'inputs': [ # Order matters. @@ -56,7 +56,16 @@ index 48ec392b..f9bb0fbe 100644 '<@(torque_files)', ], 'outputs': [ -@@ -351,7 +351,7 @@ +@@ -99,7 +99,7 @@ + '<@(torque_outputs_inc)', + ], + 'action': [ +- '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)torque<(EXECUTABLE_SUFFIX)', ++ @MAYBE_WRAPPER@ '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)torque<(EXECUTABLE_SUFFIX)', + '-o', '<(SHARED_INTERMEDIATE_DIR)/torque-generated', + '-v8-root', '<(V8_ROOT)', + '<@(torque_files_without_v8_root)', +@@ -211,7 +211,7 @@ { 'action_name': 'generate_bytecode_builtins_list_action', 'inputs': [ @@ -65,7 +74,7 @@ index 48ec392b..f9bb0fbe 100644 ], 'outputs': [ '<(generate_bytecode_builtins_list_output)', -@@ -533,7 +533,7 @@ +@@ -395,7 +395,7 @@ ], }, 'inputs': [ @@ -74,7 +83,7 @@ index 48ec392b..f9bb0fbe 100644 ], 'outputs': [ '<(INTERMEDIATE_DIR)/snapshot.cc', -@@ -1448,7 +1448,7 @@ +@@ -1505,7 +1505,7 @@ { 'action_name': 'run_gen-regexp-special-case_action', 'inputs': [ @@ -83,6 +92,6 @@ index 48ec392b..f9bb0fbe 100644 ], 'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/src/regexp/special-case.cc', --- -2.31.1 +-- +2.37.3 diff --git a/package/nodejs/0001-check-if-uclibc-has-backtrace-support.patch b/package/nodejs/0001-check-if-uclibc-has-backtrace-support.patch deleted file mode 100644 index 079bbb4366f..00000000000 --- a/package/nodejs/0001-check-if-uclibc-has-backtrace-support.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 7c69553d7275bbcaa88fada8ccd0d2d9f787e1ad Mon Sep 17 00:00:00 2001 -From: Martin Bark -Date: Sat, 4 Mar 2017 20:41:40 +0000 -Subject: [PATCH] check if uclibc has backtrace support - -Signed-off-by: Martin Bark ---- - deps/v8/src/base/debug/stack_trace_posix.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/deps/v8/src/base/debug/stack_trace_posix.cc b/deps/v8/src/base/debug/stack_trace_posix.cc -index 87c0a73..d2c182a 100644 ---- a/deps/v8/src/base/debug/stack_trace_posix.cc -+++ b/deps/v8/src/base/debug/stack_trace_posix.cc -@@ -25,7 +25,7 @@ - #include - #include - --#if V8_LIBC_GLIBC || V8_LIBC_BSD || V8_LIBC_UCLIBC || V8_OS_SOLARIS -+#if V8_LIBC_GLIBC || V8_LIBC_BSD || ( V8_LIBC_UCLIBC && __UCLIBC_HAS_BACKTRACE__ ) || V8_OS_SOLARIS - #define HAVE_EXECINFO_H 1 - #endif - --- -2.7.4 - diff --git a/package/nodejs/0002-check-if-uclibc-has-backtrace-support.patch b/package/nodejs/0002-check-if-uclibc-has-backtrace-support.patch new file mode 100644 index 00000000000..367b9fb8d5b --- /dev/null +++ b/package/nodejs/0002-check-if-uclibc-has-backtrace-support.patch @@ -0,0 +1,26 @@ +From f1a15cea9a47d0a9b0ae78fb22fef3a268e355ad Mon Sep 17 00:00:00 2001 +From: Martin Bark +Date: Sat, 4 Mar 2017 20:41:40 +0000 +Subject: [PATCH] check if uclibc has backtrace support + +Signed-off-by: Martin Bark +--- + deps/v8/src/base/debug/stack_trace_posix.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/deps/v8/src/base/debug/stack_trace_posix.cc b/deps/v8/src/base/debug/stack_trace_posix.cc +index 270f1ca4e0..5227e88671 100644 +--- a/deps/v8/src/base/debug/stack_trace_posix.cc ++++ b/deps/v8/src/base/debug/stack_trace_posix.cc +@@ -25,7 +25,7 @@ + #include + #include + +-#if V8_LIBC_GLIBC || V8_LIBC_BSD || V8_LIBC_UCLIBC || V8_OS_SOLARIS ++#if V8_LIBC_GLIBC || V8_LIBC_BSD || ( V8_LIBC_UCLIBC && __UCLIBC_HAS_BACKTRACE__ ) || V8_OS_SOLARIS + #define HAVE_EXECINFO_H 1 + #endif + +-- +2.37.3 + diff --git a/package/nodejs/0003-include-obj-name-in-shared-intermediate.patch b/package/nodejs/0003-include-obj-name-in-shared-intermediate.patch new file mode 100644 index 00000000000..5b44e6c4001 --- /dev/null +++ b/package/nodejs/0003-include-obj-name-in-shared-intermediate.patch @@ -0,0 +1,42 @@ +From af47d317e5ae12978c1cdc40627008ada144f98b Mon Sep 17 00:00:00 2001 +From: Min RK +Date: Fri, 19 Feb 2021 11:57:04 +0100 +Subject: [PATCH] include obj name in shared intermediate + +avoids duplicate ninja rules for v8 used in host and target + +From: https://github.com/minrk/node/commit/5e533cb943eef68b270f55f0cba02c0ec67c699d +Signed-off-by: Thomas Petazzoni +--- + tools/gyp/pylib/gyp/generator/ninja.py | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/tools/gyp/pylib/gyp/generator/ninja.py b/tools/gyp/pylib/gyp/generator/ninja.py +index 3db3771ac9..2e0a021703 100644 +--- a/tools/gyp/pylib/gyp/generator/ninja.py ++++ b/tools/gyp/pylib/gyp/generator/ninja.py +@@ -42,7 +42,7 @@ generator_default_variables = { + # the start of a string, while $| is used for variables that can appear + # anywhere in a string. + "INTERMEDIATE_DIR": "$!INTERMEDIATE_DIR", +- "SHARED_INTERMEDIATE_DIR": "$!PRODUCT_DIR/gen", ++ "SHARED_INTERMEDIATE_DIR": "$!PRODUCT_DIR/$|OBJ/gen", + "PRODUCT_DIR": "$!PRODUCT_DIR", + "CONFIGURATION_NAME": "$|CONFIGURATION_NAME", + # Special variables that may be used by gyp 'rule' targets. +@@ -285,6 +285,12 @@ class NinjaWriter: + CONFIGURATION_NAME = "$|CONFIGURATION_NAME" + path = path.replace(CONFIGURATION_NAME, self.config_name) + ++ obj = "obj" ++ if self.toolset != "target": ++ obj += "." + self.toolset ++ ++ path = path.replace("$|OBJ", obj) ++ + return path + + def ExpandRuleVariables(self, path, root, dirname, source, ext, name): +-- +2.37.3 + diff --git a/package/nodejs/0004-lib-internal-modules-cjs-loader.js-adjust-default-pa.patch b/package/nodejs/0004-lib-internal-modules-cjs-loader.js-adjust-default-pa.patch new file mode 100644 index 00000000000..5b93998e5e7 --- /dev/null +++ b/package/nodejs/0004-lib-internal-modules-cjs-loader.js-adjust-default-pa.patch @@ -0,0 +1,36 @@ +From a31425bdfcb5d695ab25c3d295898326784cffec Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sun, 25 Sep 2022 11:10:06 +0200 +Subject: [PATCH] lib/internal/modules/cjs/loader.js: adjust default path to + search modules + +NPM installs modules in /usr/lib/node_modules/, but by default NodeJS +searches for them only in /usr/lib/node/. We could also set the +NODE_PATH environment variable, but it is more convienient to have +NodeJS configured by default to find modules where they are installed. + +This issue is discussed at +https://stackoverflow.com/questions/15636367/nodejs-require-a-global-module-package. + +Signed-off-by: Thomas Petazzoni +--- + lib/internal/modules/cjs/loader.js | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js +index f1971c40a4..5fe3884156 100644 +--- a/lib/internal/modules/cjs/loader.js ++++ b/lib/internal/modules/cjs/loader.js +@@ -1261,7 +1261,8 @@ Module._initPaths = function() { + path.resolve(process.execPath, '..') : + path.resolve(process.execPath, '..', '..'); + +- const paths = [path.resolve(prefixDir, 'lib', 'node')]; ++ const paths = [path.resolve(prefixDir, 'lib', 'node'), ++ path.resolve(prefixDir, 'lib', 'node_modules')]; + + if (homeDir) { + ArrayPrototypeUnshift(paths, path.resolve(homeDir, '.node_libraries')); +-- +2.37.3 + diff --git a/package/nodejs/Config.in b/package/nodejs/Config.in index 016aeb4e1a6..1489306be09 100644 --- a/package/nodejs/Config.in +++ b/package/nodejs/Config.in @@ -2,11 +2,10 @@ config BR2_PACKAGE_NODEJS_ARCH_SUPPORTS bool # On ARM, at least ARMv6+ with VFPv2+ is needed default y if BR2_arm && !BR2_ARM_CPU_ARMV4 && !BR2_ARM_CPU_ARMV5 && BR2_ARM_CPU_HAS_VFPV2 - default y if BR2_mipsel && !BR2_MIPS_SOFT_FLOAT default y if BR2_aarch64 || BR2_i386 || BR2_x86_64 # libuv depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on BR2_PACKAGE_QEMU_ARCH_SUPPORTS_TARGET + depends on BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORTS comment "nodejs needs a toolchain w/ C++, dynamic library, NPTL, gcc >= 7, wchar, host gcc >= 8" depends on BR2_USE_MMU @@ -27,7 +26,12 @@ config BR2_PACKAGE_NODEJS # uses dlopen(). On ARMv5, we could technically support static # linking, but that's too much of a corner case to support it. depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_HOST_NODEJS + select BR2_PACKAGE_HOST_NODEJS if BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL != "" + select BR2_PACKAGE_HOST_PYTHON3 + select BR2_PACKAGE_HOST_PYTHON3_BZIP2 + select BR2_PACKAGE_HOST_PYTHON3_SSL + select BR2_PACKAGE_HOST_QEMU + select BR2_PACKAGE_HOST_QEMU_LINUX_USER_MODE select BR2_PACKAGE_C_ARES select BR2_PACKAGE_LIBUV select BR2_PACKAGE_ZLIB diff --git a/package/nodejs/Config.in.host b/package/nodejs/Config.in.host index 4ceaf0c73ee..f7f2b80a9b8 100644 --- a/package/nodejs/Config.in.host +++ b/package/nodejs/Config.in.host @@ -1,12 +1,9 @@ config BR2_PACKAGE_HOST_NODEJS bool "host nodejs" - depends on BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORTS depends on BR2_HOST_GCC_AT_LEAST_8 select BR2_PACKAGE_HOST_PYTHON3 select BR2_PACKAGE_HOST_PYTHON3_BZIP2 select BR2_PACKAGE_HOST_PYTHON3_SSL - select BR2_PACKAGE_HOST_QEMU - select BR2_PACKAGE_HOST_QEMU_LINUX_USER_MODE help Event-driven I/O server-side JavaScript environment based on V8. @@ -14,5 +11,4 @@ config BR2_PACKAGE_HOST_NODEJS http://nodejs.org/ comment "host nodejs needs a host gcc >= 8" - depends on BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORTS depends on !BR2_HOST_GCC_AT_LEAST_8 diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash index 6365ef852bb..6ab4c53e79d 100644 --- a/package/nodejs/nodejs.hash +++ b/package/nodejs/nodejs.hash @@ -1,5 +1,5 @@ -# From https://nodejs.org/dist/v14.18.3/SHASUMS256.txt -sha256 783ac443cd343dd6c68d2abcf7e59e7b978a6a428f6a6025f9b84918b769d608 node-v14.18.3.tar.xz +# From https://nodejs.org/dist/v16.20.0/SHASUMS256.txt +sha256 e0990f992234e40a51fe11f92c3816c93a77e1b081145d3dd762cd1026345349 node-v16.20.0.tar.xz # Hash for license file -sha256 b3a67885b5a6ac35e8bbe8190509e41b79b0d9a2e3fbd47186f2ac4727f63be5 LICENSE +sha256 ba325815d3df8819bebaf37cad67d6e1f82271e1e4a1189b53abd28e261977d6 LICENSE diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 2e41c11dbdf..ff32ae6c134 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -4,13 +4,26 @@ # ################################################################################ -NODEJS_VERSION = 14.18.3 +NODEJS_VERSION = 16.20.0 NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.xz NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION) -NODEJS_DEPENDENCIES = host-qemu host-python3 host-nodejs c-ares \ - libuv zlib nghttp2 \ +NODEJS_DEPENDENCIES = \ + host-ninja \ + host-pkgconf \ + host-python3 \ + host-qemu \ + c-ares \ + libuv \ + nghttp2 \ + zlib \ $(call qstrip,$(BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL_DEPS)) -HOST_NODEJS_DEPENDENCIES = host-icu host-libopenssl host-python3 host-zlib +HOST_NODEJS_DEPENDENCIES = \ + host-icu \ + host-libopenssl \ + host-ninja \ + host-pkgconf \ + host-python3 \ + host-zlib NODEJS_INSTALL_STAGING = YES NODEJS_LICENSE = MIT (core code); MIT, Apache and BSD family licenses (Bundled components) NODEJS_LICENSE_FILES = LICENSE @@ -25,21 +38,24 @@ NODEJS_CONF_OPTS = \ --without-dtrace \ --without-etw \ --cross-compiling \ - --dest-os=linux + --dest-os=linux \ + --ninja HOST_NODEJS_MAKE_OPTS = \ $(HOST_CONFIGURE_OPTS) \ CXXFLAGS="$(HOST_NODEJS_CXXFLAGS)" \ LDFLAGS.host="$(HOST_LDFLAGS)" \ NO_LOAD=cctest.target.mk \ - PATH=$(@D)/bin:$(BR_PATH) + PATH=$(@D)/bin:$(BR_PATH) \ + JOBS=$(BR2_JLEVEL) NODEJS_MAKE_OPTS = \ $(TARGET_CONFIGURE_OPTS) \ NO_LOAD=cctest.target.mk \ PATH=$(@D)/bin:$(BR_PATH) \ LDFLAGS="$(NODEJS_LDFLAGS)" \ - LD="$(TARGET_CXX)" + LD="$(TARGET_CXX)" \ + JOBS=$(BR2_JLEVEL) # nodejs's build system uses python which can be a symlink to an unsupported # python version (e.g. python 3.10 with nodejs 14.18.1). We work around this by @@ -70,11 +86,11 @@ NODEJS_CONF_OPTS += --without-npm endif define HOST_NODEJS_CONFIGURE_CMDS - (cd $(@D); \ + cd $(@D); \ $(HOST_CONFIGURE_OPTS) \ PATH=$(@D)/bin:$(BR_PATH) \ PYTHON=$(HOST_DIR)/bin/python3 \ - $(HOST_DIR)/bin/python3 ./configure \ + $(HOST_DIR)/bin/python3 configure.py \ --prefix=$(HOST_DIR) \ --without-dtrace \ --without-etw \ @@ -84,16 +100,9 @@ define HOST_NODEJS_CONFIGURE_CMDS --shared-zlib \ --no-cross-compiling \ --with-intl=system-icu \ - ) + --ninja endef -NODEJS_HOST_TOOLS_V8 = \ - torque \ - gen-regexp-special-case \ - bytecode_builtins_list_generator -NODEJS_HOST_TOOLS_NODE = mkcodecache -NODEJS_HOST_TOOLS = $(NODEJS_HOST_TOOLS_V8) $(NODEJS_HOST_TOOLS_NODE) - HOST_NODEJS_CXXFLAGS = $(HOST_CXXFLAGS) define HOST_NODEJS_BUILD_CMDS @@ -106,10 +115,6 @@ define HOST_NODEJS_INSTALL_CMDS $(HOST_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python3 \ $(MAKE) -C $(@D) install \ $(HOST_NODEJS_MAKE_OPTS) - - $(foreach f,$(NODEJS_HOST_TOOLS), \ - $(INSTALL) -m755 -D $(@D)/out/Release/$(f) $(HOST_DIR)/bin/$(f) - ) endef ifeq ($(BR2_i386),y) @@ -197,7 +202,7 @@ define NODEJS_CONFIGURE_CMDS LDFLAGS="$(NODEJS_LDFLAGS)" \ LD="$(TARGET_CXX)" \ PYTHON=$(HOST_DIR)/bin/python3 \ - $(HOST_DIR)/bin/python3 ./configure \ + $(HOST_DIR)/bin/python3 configure.py \ --prefix=/usr \ --dest-cpu=$(NODEJS_CPU) \ $(if $(NODEJS_ARM_FP),--with-arm-float-abi=$(NODEJS_ARM_FP)) \ @@ -236,6 +241,7 @@ NPM = $(TARGET_CONFIGURE_OPTS) \ # We can only call NPM if there's something to install. # ifneq ($(NODEJS_MODULES_LIST),) +NODEJS_DEPENDENCIES += host-nodejs define NODEJS_INSTALL_MODULES # If you're having trouble with module installation, adding -d to the # npm install call below and setting npm_config_rollback=false can both diff --git a/package/nodejs/v8-qemu-wrapper.in b/package/nodejs/v8-qemu-wrapper.in index e1083f47f70..48222d089b1 100644 --- a/package/nodejs/v8-qemu-wrapper.in +++ b/package/nodejs/v8-qemu-wrapper.in @@ -5,5 +5,6 @@ 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/noip/noip.mk b/package/noip/noip.mk index b7fcc84e2f6..8b57d824698 100644 --- a/package/noip/noip.mk +++ b/package/noip/noip.mk @@ -10,10 +10,13 @@ NOIP_SOURCE = noip-duc-linux.tar.gz NOIP_LICENSE = GPL-2.0+ NOIP_LICENSE_FILES = COPYING +# Pass TARGET_{C,LD}FLAGS through LIBS as noip doesn't rely on implicit +# make rules define NOIP_BUILD_CMDS $(SED) "/^#define CONFIG_FILENAME/ s/PREFIX//" $(@D)/noip2.c $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) CC="$(TARGET_CC)" \ - CFLAGS="$(TARGET_CFLAGS)" PREFIX=/usr CONFDIR=/etc + LIBS="$(TARGET_CFLAGS) $(TARGET_LDFLAGS)" \ + PREFIX=/usr CONFDIR=/etc endef define NOIP_INSTALL_TARGET_CMDS diff --git a/package/norm/norm.mk b/package/norm/norm.mk index 2f9fc7b657d..a3fa1b4f808 100644 --- a/package/norm/norm.mk +++ b/package/norm/norm.mk @@ -11,6 +11,9 @@ NORM_INSTALL_STAGING = YES NORM_LICENSE = NRL License NORM_LICENSE_FILES = LICENSE.TXT +# The bundled waf script is too old for >= python3.11 +NORM_NEEDS_EXTERNAL_WAF = YES + ifeq ($(BR2_PACKAGE_LIBNETFILTER_QUEUE),y) NORM_DEPENDENCIES += libnetfilter_queue endif diff --git a/package/nss-mdns/nss-mdns.hash b/package/nss-mdns/nss-mdns.hash index 9bcec08496a..3ab546f965f 100644 --- a/package/nss-mdns/nss-mdns.hash +++ b/package/nss-mdns/nss-mdns.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a2094101b735cade45048764ea594bdae2bfa9399837f3c852a5b264416e9c8c nss-mdns-0.14.1.tar.gz -sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 LICENSE +sha256 ddf71453d7a7cdc5921fe53ef387b24fd0c3c49f4dcf94a2a437498596761a21 nss-mdns-0.15.1.tar.gz +sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 LICENSE diff --git a/package/nss-mdns/nss-mdns.mk b/package/nss-mdns/nss-mdns.mk index 77ab6c1edef..fd10fd88815 100644 --- a/package/nss-mdns/nss-mdns.mk +++ b/package/nss-mdns/nss-mdns.mk @@ -4,7 +4,7 @@ # ################################################################################ -NSS_MDNS_VERSION = 0.14.1 +NSS_MDNS_VERSION = 0.15.1 NSS_MDNS_SITE = \ https://github.com/lathiat/nss-mdns/releases/download/v$(NSS_MDNS_VERSION) NSS_MDNS_LICENSE = LGPL-2.1+ diff --git a/package/nss-myhostname/nss-myhostname.hash b/package/nss-myhostname/nss-myhostname.hash index dfa531c94be..3ea0618a331 100644 --- a/package/nss-myhostname/nss-myhostname.hash +++ b/package/nss-myhostname/nss-myhostname.hash @@ -1,3 +1,3 @@ # locally computed -sha256 2ba744ea8d578d1c57c85884e94a3042ee17843a5294434d3a7f6c4d67e7caf2 nss-myhostname-0.3.tar.gz -sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 LICENSE +sha256 2ba744ea8d578d1c57c85884e94a3042ee17843a5294434d3a7f6c4d67e7caf2 nss-myhostname-0.3.tar.gz +sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 LICENSE diff --git a/package/nss-pam-ldapd/nss-pam-ldapd.hash b/package/nss-pam-ldapd/nss-pam-ldapd.hash index e0cdc403eee..3286f127dcb 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 +md5 cc30ee0ab91d6c94b7a343ae09b5dc69 nss-pam-ldapd-0.9.12.tar.gz # Locally computed: -sha256 c6d661e74693cbf531a790631ca93b73f291fb23cc39465b09deb8da2bfb0e14 nss-pam-ldapd-0.9.12.tar.gz -sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING +sha256 c6d661e74693cbf531a790631ca93b73f291fb23cc39465b09deb8da2bfb0e14 nss-pam-ldapd-0.9.12.tar.gz +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING diff --git a/package/ntfs-3g/ntfs-3g.hash b/package/ntfs-3g/ntfs-3g.hash index 668e11a8001..3fcba6af4dd 100644 --- a/package/ntfs-3g/ntfs-3g.hash +++ b/package/ntfs-3g/ntfs-3g.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 55b883aa05d94b2ec746ef3966cb41e66bed6db99f22ddd41d1b8b94bb202efb ntfs-3g_ntfsprogs-2021.8.22.tgz +sha256 f20e36ee68074b845e3629e6bced4706ad053804cbaf062fbae60738f854170c ntfs-3g_ntfsprogs-2022.10.3.tgz sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING sha256 d7bf9d064ac3e5840f9dd02422b7eeec4f1fd03f37fadbd043602be5e882304f COPYING.LIB diff --git a/package/ntfs-3g/ntfs-3g.mk b/package/ntfs-3g/ntfs-3g.mk index 21f7cfc46db..62c515d50f6 100644 --- a/package/ntfs-3g/ntfs-3g.mk +++ b/package/ntfs-3g/ntfs-3g.mk @@ -4,7 +4,7 @@ # ################################################################################ -NTFS_3G_VERSION = 2021.8.22 +NTFS_3G_VERSION = 2022.10.3 NTFS_3G_SOURCE = ntfs-3g_ntfsprogs-$(NTFS_3G_VERSION).tgz NTFS_3G_SITE = http://tuxera.com/opensource NTFS_3G_CONF_OPTS = --disable-ldconfig diff --git a/package/ntp/Config.in b/package/ntp/Config.in index 97d933b5a85..78f008a4b81 100644 --- a/package/ntp/Config.in +++ b/package/ntp/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_NTP bool "ntp" + depends on BR2_USE_MMU || BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_LIBEVENT help Network Time Protocol suite/programs. diff --git a/package/ntpsec/0001-wscript-remove-checks-for-bsd-string.h-fixes-host-co.patch b/package/ntpsec/0001-wscript-remove-checks-for-bsd-string.h-fixes-host-co.patch new file mode 100644 index 00000000000..d6ac61fc702 --- /dev/null +++ b/package/ntpsec/0001-wscript-remove-checks-for-bsd-string.h-fixes-host-co.patch @@ -0,0 +1,73 @@ +From 54fbeaa68a59f536819d1cfb2e9204176fbff54b Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Thu, 16 Dec 2021 23:27:35 +0100 +Subject: [PATCH] wscript: remove checks for bsd/string.h, fixes host-compile + failure + +Fixes the following host-compile failure while cross-compiling +in case target libbsd is found: + + [2/2] Compiling build/host/ntpd/ntp_parser.tab.c + In file included from ../../include/ntp.h:15, + from .../build/ntpsec-1_2_1/ntpd/ntp_parser.y:16: + ../../include/ntp_stdlib.h:20:10: fatal error: bsd/string.h: No such file or directory + 20 | #include + | ^~~~~~~~~~~~~~ + compilation terminated. + +Signed-off-by: Peter Seiderer +--- + include/ntp_stdlib.h | 4 ---- + wscript | 14 -------------- + 2 files changed, 18 deletions(-) + +diff --git a/include/ntp_stdlib.h b/include/ntp_stdlib.h +index fe4d78e5c..73d97084f 100644 +--- a/include/ntp_stdlib.h ++++ b/include/ntp_stdlib.h +@@ -16,10 +16,6 @@ + #include "ntp_malloc.h" + #include "ntp_syslog.h" + +-#ifdef HAVE_BSD_STRING_H +-#include +-#endif +- + #ifdef __GNUC__ + #define NTP_PRINTF(fmt, args) __attribute__((__format__(__printf__, fmt, args))) + #else +diff --git a/wscript b/wscript +index 641073f00..aa04b1d1c 100644 +--- a/wscript ++++ b/wscript +@@ -660,19 +660,6 @@ int main(int argc, char **argv) { + prerequisites=ft[1], use=ft[2], + mandatory=ft[3]) + +- # check for BSD versions outside of libc +- if not ctx.get_define("HAVE_STRLCAT"): +- ret = probe_function(ctx, function='strlcat', +- prerequisites=['bsd/string.h']) +- if ret: +- ctx.define("HAVE_STRLCAT", 1, comment="Using bsd/strlcat") +- +- if not ctx.get_define("HAVE_STRLCPY"): +- ret = probe_function(ctx, function='strlcpy', +- prerequisites=['bsd/string.h']) +- if ret: +- ctx.define("HAVE_STRLCPY", 1, comment="Using bsd/strlcpy") +- + # Nobody uses the symbol, but this seems like a good sanity check. + ctx.check_cc(header_name="stdbool.h", mandatory=True, + comment="Sanity check.") +@@ -691,7 +678,6 @@ int main(int argc, char **argv) { + optional_headers = ( + "alloca.h", + ("arpa/nameser.h", ["sys/types.h"]), +- "bsd/string.h", # bsd emulation + ("ifaddrs.h", ["sys/types.h"]), + ("linux/if_addr.h", ["sys/socket.h"]), + ("linux/rtnetlink.h", ["sys/socket.h"]), +-- +2.34.1 + diff --git a/package/ntpsec/0002-wscript-fix-build-without-stack-protector.patch b/package/ntpsec/0002-wscript-fix-build-without-stack-protector.patch new file mode 100644 index 00000000000..f494bf479c6 --- /dev/null +++ b/package/ntpsec/0002-wscript-fix-build-without-stack-protector.patch @@ -0,0 +1,50 @@ +From 0a3ce09c14eb9c7e36aa30a4dafe40e56676d678 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 24 Feb 2023 11:33:32 +0100 +Subject: [PATCH] wscript: fix build without stack-protector + +-fstack-protector-all can depends on ssp library availability (e.g. on musl) so +move the test from cc_test_flags to ld_hardening_flags, this will avoid the +following build failure: + +Checking for library ssp : not found +Checking for library ssp_nonshared : not found +Checking if C compiler supports -fstack-protector-all : yes + +[...] + +The configuration failed +(complete log in /home/autobuild/autobuild/instance-2/output-1/build/ntpsec-1_2_2/build/config.log) + +Fixes: + - http://autobuild.buildroot.org/results/f38abc6b7f8464836231192cfe078a5b27319a8a + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/ntpsec/ntpsec/pull/6] +--- + wscript | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/wscript b/wscript +index be396b33b..f301809fc 100644 +--- a/wscript ++++ b/wscript +@@ -298,7 +298,6 @@ def configure(ctx): + ctx.env.LDFLAGS += ["-lssp_nonshared"] + + cc_test_flags = [ +- ('f_stack_protector_all', '-fstack-protector-all'), + ('PIC', '-fPIC'), + ('PIE', '-pie -fPIE'), + # this quiets most of macOS warnings on -fpie +@@ -332,6 +331,7 @@ def configure(ctx): + + # Check which linker flags are supported + ld_hardening_flags = [ ++ ('f_stack_protector_all', '-fstack-protector-all'), + ("z_now", "-Wl,-z,now"), # no deferred symbol resolution + ] + +-- +2.39.1 + diff --git a/package/ntpsec/Config.in b/package/ntpsec/Config.in new file mode 100644 index 00000000000..3b20daecc77 --- /dev/null +++ b/package/ntpsec/Config.in @@ -0,0 +1,44 @@ +config BR2_PACKAGE_NTPSEC + bool "ntpsec" + depends on BR2_USE_MMU # python3 + depends on BR2_USE_WCHAR # python3 + depends on BR2_TOOLCHAIN_HAS_THREADS # python3 + depends on !BR2_STATIC_LIBS # python3 + select BR2_PACKAGE_LIBCAP + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_PYTHON3 + help + NTPsec project - a secure, hardened, and improved + implementation of Network Time Protocol derived + from NTP Classic, Dave Mills’s original. + + Provides things like ntpd, ntpdate, ntpq, etc... + + https://www.ntpsec.org/ + +if BR2_PACKAGE_NTPSEC + +config BR2_PACKAGE_NTPSEC_CLASSIC_MODE + bool "classic-mode" + help + Enable strict configuration and log-format compatibility + with NTP Classic. + +config BR2_PACKAGE_NTPSEC_NTS + bool "NTS support" + help + Enable Network Time Security (NTS) support. + +config BR2_PACKAGE_NTPSEC_REFCLOCK_ALL + bool "refclock-all" + select BR2_PACKAGE_PPS_TOOLS + help + Enable all refclocks (hardware, sync source and discplined + clocks) + +endif + +comment "ntpsec needs a toolchain w/ wchar, threads, dynamic library" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_STATIC_LIBS diff --git a/package/ntpsec/S49ntpd b/package/ntpsec/S49ntpd new file mode 100644 index 00000000000..f3db51418e9 --- /dev/null +++ b/package/ntpsec/S49ntpd @@ -0,0 +1,58 @@ +#!/bin/sh +# +# Starts Network Time Protocol daemon +# + +DAEMON="ntpd" +PIDFILE="/var/run/$DAEMON.pid" + +NTPD_ARGS="-g -u ntp:ntp -s /var/run/ntp" + +# shellcheck source=/dev/null +[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" + +mkdir -p /var/run/ntp && chown ntp:ntp /var/run/ntp + +start() { + printf 'Starting %s: ' "$DAEMON" + # shellcheck disable=SC2086 # we need the word splitting + start-stop-daemon -S -q -p "$PIDFILE" -x "/usr/sbin/$DAEMON" \ + -- $NTPD_ARGS -p "$PIDFILE" + 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 + rm -f "$PIDFILE" + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +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 diff --git a/package/ntpsec/ntpd.etc.conf b/package/ntpsec/ntpd.etc.conf new file mode 100644 index 00000000000..e0f45c1438d --- /dev/null +++ b/package/ntpsec/ntpd.etc.conf @@ -0,0 +1,33 @@ +# +# legacy NTP configuration +# +pool 0.pool.ntp.org iburst +pool 1.pool.ntp.org iburst +pool 2.pool.ntp.org iburst +pool 3.pool.ntp.org iburst + +# +# NTS configuration +# +# Notes: +# - uncomment the following lines to enable NTS support (but +# make sure the initial clock is up-to-date (otherwise the +# NTS certificate validation will fail with 'NTSc: certificate invalid: +# 9=>certificate is not yet valid' as on boards without RTC support) +# and/or keep at least one line from the legacy NTP lines +# - enable BR2_PACKAGE_CA_CERTIFICATES to gain access to the certificate +# files +# +# server time.cloudflare.com nts # Global, anycast +# server nts.ntp.se:4443 nts # Sweden +# server ntpmon.dcs1.biz nts # Singapore +# server ntp1.glypnod.com nts # San Francisco +# server ntp2.glypnod.com nts # London +# +# ca /usr/share/ca-certificates/mozilla + +# Allow only time queries, at a limited rate, sending KoD when in excess. +# Allow all local queries (IPv4, IPv6) +restrict default nomodify nopeer noquery limited kod +restrict 127.0.0.1 +restrict [::1] diff --git a/package/ntpsec/ntpsec.hash b/package/ntpsec/ntpsec.hash new file mode 100644 index 00000000000..8d98b5c4115 --- /dev/null +++ b/package/ntpsec/ntpsec.hash @@ -0,0 +1,8 @@ +# Locally calculated +sha256 ef901df5a05d486563db22f4d0dad3840a3bf5d0a9aceb8c3ecaeb396c67a805 ntpsec-NTPsec_1_2_2a.tar.bz2 +sha256 899261d6eb6c922cf8f051225411f27b738ba0014be18c2eaf6afbf30d421bb1 LICENSES/BSD-2 +sha256 5fe38d8724c53ff4e69f0a3492a368b4a6719700ac16f706efeb01a45c62f2b5 LICENSES/BSD-3 +sha256 9ba9550ad48438d0836ddab3da480b3b69ffa0aac7b7878b5a0039e7ab429411 LICENSES/CC-BY-4.0 +sha256 074415b57c6ba1780483d89e55f40dec3ded96c28aaf47d63c486683ba553e7c LICENSES/MIT +sha256 62fec6cd79721af81b7c12f1a679535235fdd22800ab17653042f024187ff274 LICENSES/NTP +sha256 d3b21470adadd9abd9c6d675378f8c371ac5a4ea6dbec91859e02fadca3c0856 docs/copyright.adoc diff --git a/package/ntpsec/ntpsec.mk b/package/ntpsec/ntpsec.mk new file mode 100644 index 00000000000..f6262cdaca9 --- /dev/null +++ b/package/ntpsec/ntpsec.mk @@ -0,0 +1,76 @@ +################################################################################ +# +# ntpsec +# +################################################################################ + +NTPSEC_VERSION = 1.2.2a +NTPSEC_SOURCE = ntpsec-NTPsec_$(subst .,_,$(NTPSEC_VERSION)).tar.bz2 +NTPSEC_SITE = https://gitlab.com/NTPsec/ntpsec/-/archive/NTPsec_$(subst .,_,$(NTPSEC_VERSION)) +NTPSEC_LICENSE = BSD-2-Clause, NTP, BSD-3-Clause, MIT, CC-BY-4.0 (docs) +NTPSEC_LICENSE_FILES = \ + LICENSES/BSD-2 \ + LICENSES/BSD-3 \ + LICENSES/CC-BY-4.0 \ + LICENSES/MIT \ + LICENSES/NTP \ + docs/copyright.adoc + +NTPSEC_CPE_ID_VENDOR = ntpsec + +NTPSEC_DEPENDENCIES = \ + host-bison \ + host-pkgconf \ + python3 \ + libcap \ + openssl + +# 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)" \ + 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" \ + --cross-ldflags="$(TARGET_LDFLAGS)" \ + --notests \ + --enable-early-droproot \ + --disable-mdns-registration \ + --enable-pylib=ffi \ + --nopyc \ + --nopyo \ + --nopycache \ + --disable-doc \ + --disable-manpage + +ifeq ($(BR2_PACKAGE_NTPSEC_CLASSIC_MODE),y) +NTPSEC_CONF_OPTS += --enable-classic-mode +endif + +# no '--enable-nts' option available +ifeq ($(BR2_PACKAGE_NTPSEC_NTS),) +NTPSEC_CONF_OPTS += --disable-nts +endif + +# refclocks are disabled by default, can only be enabled +ifeq ($(BR2_PACKAGE_NTPSEC_REFCLOCK_ALL),y) +NTPSEC_DEPENDENCIES += pps-tools +NTPSEC_CONF_OPTS += --refclock=all +endif + +define NTPSEC_INSTALL_NTPSEC_CONF + $(INSTALL) -m 644 package/ntpsec/ntpd.etc.conf $(TARGET_DIR)/etc/ntp.conf +endef +NTPSEC_POST_INSTALL_TARGET_HOOKS += NTPSEC_INSTALL_NTPSEC_CONF + +define NTPSEC_INSTALL_INIT_SYSV + $(INSTALL) -D -m 755 package/ntpsec/S49ntpd $(TARGET_DIR)/etc/init.d/S49ntpd +endef + +define NTPSEC_USERS + ntp -1 ntp -1 * - - - ntpd user +endef + +$(eval $(waf-package)) diff --git a/package/numactl/0001-Do-not-stringify-SYMVER-symbols.patch b/package/numactl/0001-Do-not-stringify-SYMVER-symbols.patch deleted file mode 100644 index c6981aaf732..00000000000 --- a/package/numactl/0001-Do-not-stringify-SYMVER-symbols.patch +++ /dev/null @@ -1,25 +0,0 @@ -From f96c96af7fbf2779b15f66f03b10315a24fb4f5a Mon Sep 17 00:00:00 2001 -From: Scott McMillan -Date: Fri, 9 Oct 2020 08:56:52 -0500 -Subject: [PATCH] Do not stringify SYMVER symbols - -Upstream: f96c96af7fbf2779b15f66f03b10315a24fb4f5a -Signed-off-by: Thomas Petazzoni ---- - util.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/util.h b/util.h -index 99ada33..f2a20ac 100644 ---- a/util.h -+++ b/util.h -@@ -22,5 +22,5 @@ extern char *policy_name(int policy); - #if HAVE_ATTRIBUTE_SYMVER - #define SYMVER(a,b) __attribute__ ((symver (b))) - #else --#define SYMVER(a,b) __asm__ (".symver " #a "," #b); -+#define SYMVER(a,b) __asm__ (".symver " a "," b); - #endif --- -2.30.2 - diff --git a/package/numactl/0001-link-with-latomic-if-needed-again.patch b/package/numactl/0001-link-with-latomic-if-needed-again.patch new file mode 100644 index 00000000000..54d55656ec2 --- /dev/null +++ b/package/numactl/0001-link-with-latomic-if-needed-again.patch @@ -0,0 +1,41 @@ +From 692abb6d751a41c7f0206771ecd454933750256e Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 2 Nov 2022 13:28:02 +0100 +Subject: [PATCH] link with -latomic if needed (again ...) + +numactl unconditionally uses __atomic_fetch_and but some architectures +(e.g. sparc) needs to link with -latomic to be able to use it. So check +if -latomic is needed and update numa.pc accordingly. + +This linking was made by e0de0d9e981ddb53bdeb4a4b9dc43046c9ff4ff9 but +wrongly reverted by 10c277c20768be9a563f75265bcd7e73954763ad resulting +in the following build failure on sparc or microblaze: + +/nvmedata/autobuild/instance-7/output-1/per-package/numactl/host/bin/../lib/gcc/sparc-buildroot-linux-uclibc/10.4.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: ./.libs/libnuma.a(libnuma.o): in function `numa_police_memory': +libnuma.c:(.text+0xe28): undefined reference to `__atomic_fetch_and_1' + +Fixes: + - http://autobuild.buildroot.org/results/54b7567d804d9abff56f47cd26bae774c1e38669 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/numactl/numactl/pull/144] +--- + configure.ac | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 8510fc5..ebf9917 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -27,6 +27,8 @@ AM_CONDITIONAL([RISCV64], [test x"${target_cpu}" = x"riscv64"]) + + AC_CONFIG_FILES([Makefile]) + ++AC_SEARCH_LIBS([__atomic_fetch_and_1], [atomic]) ++ + # GCC tries to be "helpful" and only issue a warning for unrecognized + # attributes. So we compile the test with Werror, so that if the + # attribute is not recognized the compilation fails +-- +2.35.1 + diff --git a/package/numactl/0002-link-with-latomic-if-needed.patch b/package/numactl/0002-link-with-latomic-if-needed.patch deleted file mode 100644 index 6dff0cb233f..00000000000 --- a/package/numactl/0002-link-with-latomic-if-needed.patch +++ /dev/null @@ -1,52 +0,0 @@ -From e0de0d9e981ddb53bdeb4a4b9dc43046c9ff4ff9 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 6 May 2021 23:08:36 +0200 -Subject: [PATCH] link with -latomic if needed - -numactl unconditionally uses __atomic_fetch_and but some architectures -(e.g. sparc) needs to link with -latomic to be able to use it. So check -if -latomic is needed and update numa.pc accordingly - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/numactl/numactl/commit/e0de0d9e981ddb53bdeb4a4b9dc43046c9ff4ff9] ---- - Makefile.am | 1 + - configure.ac | 2 ++ - numa.pc.in | 1 + - 3 files changed, 4 insertions(+) - -diff --git a/Makefile.am b/Makefile.am -index 44d0d76..34f6815 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -151,6 +151,7 @@ SED_PROCESS = \ - -e 's,@exec_prefix\@,$(exec_prefix),g' \ - -e 's,@libdir\@,$(libdir),g' \ - -e 's,@includedir\@,$(includedir),g' \ -+ -e 's,@LIBS\@,$(LIBS),g' \ - < $< > $@ || rm $@ - - %.pc: %.pc.in Makefile -diff --git a/configure.ac b/configure.ac -index 659a765..e3b0eb3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -24,6 +24,8 @@ AM_CONDITIONAL([HAVE_TREE_VECTORIZE], [test x"${tree_vectorize}" = x"true"]) - - AC_CONFIG_FILES([Makefile]) - -+AC_SEARCH_LIBS([__atomic_fetch_and_1], [atomic]) -+ - # GCC tries to be "helpful" and only issue a warning for unrecognized - # attributes. So we compile the test with Werror, so that if the - # attribute is not recognized the compilation fails -diff --git a/numa.pc.in b/numa.pc.in -index 8a0f202..cc04d50 100644 ---- a/numa.pc.in -+++ b/numa.pc.in -@@ -8,3 +8,4 @@ Description: NUMA policy library - Version: @VERSION@ - Cflags: -I${includedir} - Libs: -L${libdir} -lnuma -+Libs.Private: @LIBS@ diff --git a/package/numactl/Config.in b/package/numactl/Config.in index 23cf7facb0d..325a05d6093 100644 --- a/package/numactl/Config.in +++ b/package/numactl/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_NUMACTL bool "numactl" depends on BR2_USE_MMU # madvise() + depends on BR2_TOOLCHAIN_HAS_ATOMIC help numactl allows you to run your application on specific cpus and memory nodes. It does this by supplying a NUMA memory diff --git a/package/numactl/numactl.hash b/package/numactl/numactl.hash index 802175d3602..757001b7509 100644 --- a/package/numactl/numactl.hash +++ b/package/numactl/numactl.hash @@ -1,3 +1,4 @@ # Locally calculated -sha256 1ee27abd07ff6ba140aaf9bc6379b37825e54496e01d6f7343330cf1a4487035 numactl-2.0.14.tar.gz -sha256 e2b738b1303c088421b09933a78c1326fe43692e2c05a7c510a2eb7e7a8eb575 README.md +sha256 1b242f893af977a1d31af6ce9d6b8dafdd2d8ec3dc9207f7c2dc0d3446e7c7c8 numactl-2.0.16.tar.gz +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 diff --git a/package/numactl/numactl.mk b/package/numactl/numactl.mk index cf9c7596937..157f953c51f 100644 --- a/package/numactl/numactl.mk +++ b/package/numactl/numactl.mk @@ -4,11 +4,13 @@ # ################################################################################ -NUMACTL_VERSION = 2.0.14 -NUMACTL_SITE = $(call github,numactl,numactl,v$(NUMACTL_VERSION)) +NUMACTL_VERSION = 2.0.16 +NUMACTL_SITE = \ + https://github.com/numactl/numactl/releases/download/v$(NUMACTL_VERSION) NUMACTL_LICENSE = LGPL-2.1 (libnuma), GPL-2.0 (programs) -NUMACTL_LICENSE_FILES = README.md +NUMACTL_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 NUMACTL_INSTALL_STAGING = YES +# We're patching configure.ac NUMACTL_AUTORECONF = YES NUMACTL_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -fPIC" diff --git a/package/nut/0001-clients-upsclient-h-ensure-time_t-is-defined.patch b/package/nut/0001-clients-upsclient-h-ensure-time_t-is-defined.patch new file mode 100644 index 00000000000..c9fb04b8cd6 --- /dev/null +++ b/package/nut/0001-clients-upsclient-h-ensure-time_t-is-defined.patch @@ -0,0 +1,35 @@ +From cafd77993ec5e16634b774b65bf6da9b34a21fc5 Mon Sep 17 00:00:00 2001 +From: Jim Klimov +Date: Wed, 31 Aug 2022 11:24:19 +0200 +Subject: [PATCH] clients/upsclient.h: ensure time_t is defined + +[Retrieved from: +https://github.com/networkupstools/nut/commit/cafd77993ec5e16634b774b65bf6da9b34a21fc5] +Signed-off-by: Fabrice Fontaine +--- + clients/upsclient.h | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/clients/upsclient.h b/clients/upsclient.h +index 08574b8f8b..e346d8f519 100644 +--- a/clients/upsclient.h ++++ b/clients/upsclient.h +@@ -41,6 +41,18 @@ + #include + #endif + ++/* Not including NUT timehead.h because this is part of end-user API */ ++#ifdef TIME_WITH_SYS_TIME ++# include ++# include ++#else ++# ifdef HAVE_SYS_TIME_H ++# include ++# else ++# include ++# endif ++#endif ++ + #ifdef __cplusplus + /* *INDENT-OFF* */ + extern "C" { diff --git a/package/nut/nut.hash b/package/nut/nut.hash index a4e84244b58..3dda340a1b2 100644 --- a/package/nut/nut.hash +++ b/package/nut/nut.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 7129b2df45f9a9df3943f4d09f2b95b5a63d66ca4913431352570206968ca97b nut-03c3bbe8df9a2caf3c09c120ae7045d35af99b76.tar.gz +sha256 c3e5a708da797b7c70b653d37b1206a000fcb503b85519fe4cdf6353f792bfe5 nut-2.8.0.tar.gz sha256 9f562d0e6be5108a06684dd249686d378abe1653df14b1944e971e084f6751f0 COPYING sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE-GPL2 sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 LICENSE-GPL3 diff --git a/package/nut/nut.mk b/package/nut/nut.mk index db0247dc2c3..4c322aeb850 100644 --- a/package/nut/nut.mk +++ b/package/nut/nut.mk @@ -4,44 +4,44 @@ # ################################################################################ -NUT_VERSION = 03c3bbe8df9a2caf3c09c120ae7045d35af99b76 -NUT_SITE = $(call github,networkupstools,nut,$(NUT_VERSION)) +NUT_VERSION = 2.8.0 +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 NUT_SELINUX_MODULES = apache nut NUT_INSTALL_STAGING = YES -NUT_DEPENDENCIES = host-pkgconf host-perl +NUT_DEPENDENCIES = host-pkgconf -# From git: -NUT_AUTORECONF = YES - -# Generate files otherwise generated by autogen.sh -# buildroot does not support augeas, creating an empty file prevents -# us from adding a dependency to host-python -define NUT_PREGEN - touch $(@D)/scripts/augeas/nutupsconf.aug.in - cd $(@D)/tools && PATH=$(BR_PATH) ./nut-usbinfo.pl +# prevent usage of unsafe paths +define NUT_FIX_CONFIGURE + $(SED) 's%CFLAGS="-isystem /usr/local/include%_UNUSED_CFLAGS="-isystem /usr/local/include%' $(@D)/configure + $(SED) 's%CXXFLAGS="-isystem /usr/local/include%_UNUSED_CXXFLAGS="-isystem /usr/local/include%' $(@D)/configure endef -NUT_PRE_CONFIGURE_HOOKS += NUT_PREGEN - -# Race condition in tools generation -NUT_MAKE = $(MAKE1) +NUT_POST_PATCH_HOOKS += NUT_FIX_CONFIGURE # Put the PID files in a read-write place (/var/run is a tmpfs) # since the default location (/var/state/ups) maybe readonly. NUT_CONF_OPTS = \ --with-altpidpath=/var/run/upsd \ - --with-dev - -NUT_CONF_ENV = ax_cv__printf_string_null=yes - -# For uClibc-based toolchains, nut forgets to link with -lm -ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) -NUT_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -lm" -endif + --with-dev \ + --without-doc \ + --with-user=nut \ + --with-group=nut + +NUT_CONF_ENV = \ + 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 \ + ac_cv_func_strdup=yes \ + ac_cv_func_strncasecmp=yes \ + ax_cv__printf_string_null=yes + +define NUT_USERS + nut -1 nut -1 * - - - NUT user +endef ifeq ($(call qstrip,$(BR2_PACKAGE_NUT_DRIVERS)),) -NUT_CONF_OPTS += --with-drivers=all +NUT_CONF_OPTS += --with-drivers=auto else NUT_CONF_OPTS += --with-drivers=$(BR2_PACKAGE_NUT_DRIVERS) endif @@ -53,6 +53,13 @@ else NUT_CONF_OPTS += --without-avahi endif +ifeq ($(BR2_PACKAGE_FREEIPMI),y) +NUT_CONF_OPTS += --with-freeipmi +NUT_DEPENDENCIES += freeipmi +else +NUT_CONF_OPTS += --without-freeipmi +endif + # gd with support for png is required for the CGI ifeq ($(BR2_PACKAGE_GD)$(BR2_PACKAGE_LIBPNG),yy) NUT_DEPENDENCIES += gd libpng @@ -61,7 +68,7 @@ else NUT_CONF_OPTS += --without-cgi endif -# nut-scanner needs libltdl, which is a wrapper arounf dlopen/dlsym, +# nut-scanner needs libltdl, which is a wrapper around dlopen/dlsym, # so is not available for static-only builds. # There is no flag to directly enable/disable nut-scanner, it's done # via the --enable/disable-libltdl flag. @@ -72,7 +79,10 @@ else NUT_CONF_OPTS += --without-libltdl endif -ifeq ($(BR2_PACKAGE_LIBUSB_COMPAT),y) +ifeq ($(BR2_PACKAGE_LIBUSB),y) +NUT_DEPENDENCIES += libusb +NUT_CONF_OPTS += --with-usb +else ifeq ($(BR2_PACKAGE_LIBUSB_COMPAT),y) NUT_DEPENDENCIES += libusb-compat NUT_CONF_OPTS += --with-usb else diff --git a/package/nvidia-driver/nvidia-driver.hash b/package/nvidia-driver/nvidia-driver.hash index 7f2248d0f9d..620112e6c81 100644 --- a/package/nvidia-driver/nvidia-driver.hash +++ b/package/nvidia-driver/nvidia-driver.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 51adb28f0ed4548f35a88a93ad6767ebd807fa14f418bf5e51a6d63a3ff7f275 NVIDIA-Linux-x86-390.132.run -sha256 b6b4b8af37e78e026c9ebdf4a5c64ea412dfcb710931dd028c22dac228de659d NVIDIA-Linux-x86_64-390.132-no-compat32.run -sha256 bd28b0c5aeeb00eb11d3ec6f6f3449d4b3a40100914258332734a53527997526 LICENSE +sha256 94e399b459659c12b1344e8c8f4f5eee1ed5915ff459fc8bb831c9e1d44677db NVIDIA-Linux-x86-390.151.run +sha256 6e4fd2258465f5d5527fe80abd46de925a30348b4a84658498a6d75caf42c47c NVIDIA-Linux-x86_64-390.151-no-compat32.run +sha256 bd28b0c5aeeb00eb11d3ec6f6f3449d4b3a40100914258332734a53527997526 LICENSE diff --git a/package/nvidia-driver/nvidia-driver.mk b/package/nvidia-driver/nvidia-driver.mk index 54c2aa46d81..f1217b00aa7 100644 --- a/package/nvidia-driver/nvidia-driver.mk +++ b/package/nvidia-driver/nvidia-driver.mk @@ -4,7 +4,7 @@ # ################################################################################ -NVIDIA_DRIVER_VERSION = 390.132 +NVIDIA_DRIVER_VERSION = 390.151 NVIDIA_DRIVER_SUFFIX = $(if $(BR2_x86_64),_64) NVIDIA_DRIVER_SITE = http://download.nvidia.com/XFree86/Linux-x86$(NVIDIA_DRIVER_SUFFIX)/$(NVIDIA_DRIVER_VERSION) NVIDIA_DRIVER_SOURCE = NVIDIA-Linux-x86$(NVIDIA_DRIVER_SUFFIX)-$(NVIDIA_DRIVER_VERSION)$(if $(BR2_x86_64),-no-compat32).run @@ -137,6 +137,7 @@ endif # because they don't recognise the usual variables set by the kernel # build system. We also need to tell them what modules to build. NVIDIA_DRIVER_MODULE_MAKE_OPTS = \ + IGNORE_CC_MISMATCH=1 \ NV_KERNEL_SOURCES="$(LINUX_DIR)" \ NV_KERNEL_OUTPUT="$(LINUX_DIR)" \ NV_KERNEL_MODULES="$(NVIDIA_DRIVER_MODULES)" diff --git a/package/nvidia-modprobe/nvidia-modprobe.hash b/package/nvidia-modprobe/nvidia-modprobe.hash index 99908680f00..10b765e35cb 100644 --- a/package/nvidia-modprobe/nvidia-modprobe.hash +++ b/package/nvidia-modprobe/nvidia-modprobe.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 396b4102d3075a2dee3024652fae206a1b38ace54b8efb1e2c20757a11ec19f1 nvidia-modprobe-450.57.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 396b4102d3075a2dee3024652fae206a1b38ace54b8efb1e2c20757a11ec19f1 nvidia-modprobe-450.57.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/obsidian-cursors/obsidian-cursors.hash b/package/obsidian-cursors/obsidian-cursors.hash index 8f1775e8a4a..a476a0ba05c 100644 --- a/package/obsidian-cursors/obsidian-cursors.hash +++ b/package/obsidian-cursors/obsidian-cursors.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 3d38fe875f6feae8b7772e02cfda530fcf669479807915cd2c12c149da17cfb9 73135-Obsidian.tar.bz2 +sha256 3d38fe875f6feae8b7772e02cfda530fcf669479807915cd2c12c149da17cfb9 73135-Obsidian.tar.bz2 diff --git a/package/ocf-linux/ocf-linux.hash b/package/ocf-linux/ocf-linux.hash index 0bd0ea19df5..747bbcab56c 100644 --- a/package/ocf-linux/ocf-linux.hash +++ b/package/ocf-linux/ocf-linux.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 5113609d2c2c43fde962bec1238fe5a81211a751ebb0337b54a9804d40cfef53 ocf-linux-20120127.tar.gz +sha256 3d7984754d58ced5695889744caf1e18a53f5d2e35ed40cc04d3595e59b7431f ocf-linux-20171122.tar.gz diff --git a/package/ocf-linux/ocf-linux.mk b/package/ocf-linux/ocf-linux.mk index 01854fa73ae..52169eda4ff 100644 --- a/package/ocf-linux/ocf-linux.mk +++ b/package/ocf-linux/ocf-linux.mk @@ -4,7 +4,7 @@ # ################################################################################ -OCF_LINUX_VERSION = 20120127 +OCF_LINUX_VERSION = 20171122 OCF_LINUX_SITE = http://downloads.sourceforge.net/project/ocf-linux/ocf-linux/$(OCF_LINUX_VERSION) OCF_LINUX_INSTALL_STAGING = YES diff --git a/package/ocrad/Config.in b/package/ocrad/Config.in index 38d37c612aa..b6c4300f869 100644 --- a/package/ocrad/Config.in +++ b/package/ocrad/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_OCRAD bool "ocrad" depends on BR2_INSTALL_LIBSTDCPP + select BR2_PACKAGE_LIBPNG help GNU Ocrad is an OCR (Optical Character Recognition) program based on a feature extraction method. diff --git a/package/ocrad/ocrad.hash b/package/ocrad/ocrad.hash index 7ae38c30e80..cd5b0039ea7 100644 --- a/package/ocrad/ocrad.hash +++ b/package/ocrad/ocrad.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 a9bfe67e9a040907aff5640dca56392476b6a89e48e37dc94ba846c5b6733b36 ocrad-0.27.tar.lz -sha256 3d77c1a58fbde5ddba612d1fe09965e20a3804953eca12e8c1892298bb8a5eef COPYING +sha256 34ccea576dbdadaa5979e6202344c3ff68737d829ca7b66f71c8497d36bbbf2e ocrad-0.28.tar.lz +sha256 3d77c1a58fbde5ddba612d1fe09965e20a3804953eca12e8c1892298bb8a5eef COPYING diff --git a/package/ocrad/ocrad.mk b/package/ocrad/ocrad.mk index e037a081952..d62b7af3515 100644 --- a/package/ocrad/ocrad.mk +++ b/package/ocrad/ocrad.mk @@ -4,17 +4,25 @@ # ################################################################################ -OCRAD_VERSION = 0.27 +OCRAD_VERSION = 0.28 OCRAD_SOURCE = ocrad-$(OCRAD_VERSION).tar.lz OCRAD_SITE = $(BR2_GNU_MIRROR)/ocrad -OCRAD_LICENSE = GPL-3.0+ +OCRAD_LICENSE = GPL-2.0+ OCRAD_LICENSE_FILES = COPYING OCRAD_INSTALL_STAGING = YES +OCRAD_DEPENDENCIES = host-pkgconf libpng + +OCRAD_LIBS = `$(PKG_CONFIG_HOST_BINARY) --libs libpng` # This is not a true autotools package. define OCRAD_CONFIGURE_CMDS cd $(@D) && \ - $(TARGET_MAKE_ENV) ./configure --prefix=/usr --sysconfdir=/etc $(TARGET_CONFIGURE_OPTS) + $(TARGET_MAKE_ENV) \ + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + $(TARGET_CONFIGURE_OPTS) \ + LIBS="$(OCRAD_LIBS)" endef define OCRAD_BUILD_CMDS diff --git a/package/octave/0001-Fix-BLAS-library-integer-size-detection.patch b/package/octave/0001-Fix-BLAS-library-integer-size-detection.patch new file mode 100644 index 00000000000..3fb609de07c --- /dev/null +++ b/package/octave/0001-Fix-BLAS-library-integer-size-detection.patch @@ -0,0 +1,40 @@ +From e4dcfefac4215ee66c3dda5b067dd6d06066b0a2 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Sat, 5 Mar 2022 12:36:09 +0100 +Subject: [PATCH] Fix BLAS library integer size detection + +When cross-compiling, octave ./configure script fails to detect the BLAS +library integer size and fails with the message: + + configure: error: unrecognized BLAS library integer size + +This patch fixes this detection. + +Patch adapted from: +https://github.com/openembedded/meta-openembedded/commit/0ad153f721ef99de585c4452a997a7104f45d71d + +Signed-off-by: Julien Olivain +--- + configure.ac | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/configure.ac b/configure.ac +index de7a00a330..383ce27b06 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -781,6 +781,12 @@ if test $ax_blas_ok = no || test $ax_lapack_ok = no; then + AC_MSG_ERROR([BLAS and LAPACK libraries are required]) + fi + ++if ac_fn_f77_try_run "$LINENO"; then : ++ ax_blas_integer_size=8 ++else ++ ax_blas_integer_size=4 ++fi ++ + case $ax_blas_integer_size in + 4) + HAVE_64_BIT_BLAS=no +-- +2.36.0 + diff --git a/package/octave/Config.in b/package/octave/Config.in new file mode 100644 index 00000000000..171bdfa156d --- /dev/null +++ b/package/octave/Config.in @@ -0,0 +1,39 @@ +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_HAS_FORTRAN + # Some Bootlin x86_64 toolchains (like version + # bleeding-edge-2021.11-1) has a file + # "x86_64-buildroot-linux-gnu/lib64/libgfortran.la" including + # a "dependency_libs=" entry with an incorrect absolute path + # to linquadmath.la on the bootlin build host. This breaks + # builds using libtool with libgfortran. Those toolchains are + # used by the "utils/test-pkg" script. + depends on !BR2_TOOLCHAIN_EXTERNAL_BOOTLIN || !BR2_x86_64 + select BR2_PACKAGE_OPENBLAS + select BR2_PACKAGE_PCRE + select BR2_PACKAGE_PCRE_UTF + help + GNU Octave is a high-level language, primarily intended for + numerical computations. It provides a convenient command + line interface for solving linear and nonlinear problems + numerically, and for performing other numerical experiments + using a language that is mostly compatible with Matlab. It + may also be used as a batch-oriented language. Octave has + extensive tools for solving common numerical linear algebra + problems, finding the roots of nonlinear equations, + integrating ordinary functions, manipulating polynomials, + and integrating ordinary differential and + differential-algebraic equations. It is easily extensible + and customizable via user-defined functions written in + Octave's own language, or using dynamically loaded modules + written in C++, C, Fortran, or other languages. + + https://www.octave.org/ + +comment "octave needs a toolchain w/ C++ and fortran, gcc >= 4.8" + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ + !BR2_TOOLCHAIN_HAS_FORTRAN diff --git a/package/octave/octave.hash b/package/octave/octave.hash new file mode 100644 index 00000000000..9696f2a00aa --- /dev/null +++ b/package/octave/octave.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 fdb32602252289e068431329add2eed146e6f26301cbb5fc4412f9d972db9475 octave-7.3.0.tar.lz +sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING diff --git a/package/octave/octave.mk b/package/octave/octave.mk new file mode 100644 index 00000000000..647f988a3f0 --- /dev/null +++ b/package/octave/octave.mk @@ -0,0 +1,28 @@ +################################################################################ +# +# octave +# +################################################################################ + +OCTAVE_VERSION = 7.3.0 +OCTAVE_SITE = https://ftp.gnu.org/gnu/octave +OCTAVE_SOURCE = octave-$(OCTAVE_VERSION).tar.lz +OCTAVE_LICENSE = GPL-3.0+ +OCTAVE_LICENSE_FILES = COPYING +OCTAVE_AUTORECONF = YES + +OCTAVE_CONF_OPTS = --disable-java + +OCTAVE_DEPENDENCIES = \ + host-gperf \ + openblas \ + pcre + +ifeq ($(BR2_PACKAGE_READLINE),y) +OCTAVE_CONF_OPTS += --enable-readline +OCTAVE_DEPENDENCIES += readline +else +OCTAVE_CONF_OPTS += --disable-readline +endif + +$(eval $(autotools-package)) diff --git a/package/odb/0012-Adjust-to-changes-in-GCC-11.patch b/package/odb/0012-Adjust-to-changes-in-GCC-11.patch new file mode 100644 index 00000000000..2959a71dea2 --- /dev/null +++ b/package/odb/0012-Adjust-to-changes-in-GCC-11.patch @@ -0,0 +1,50 @@ +From 5a5656920c6b49902ae0da6a0da84efe6e5a66f0 Mon Sep 17 00:00:00 2001 +From: Boris Kolpackov +Date: Wed, 31 Mar 2021 10:45:21 +0200 +Subject: [PATCH] Adjust to changes in GCC 11 + +[Upstream: 61d80f051293a7449a09081f60f48b8377bfbbad] +Signed-off-by: Thomas Petazzoni +--- + odb/gcc.hxx | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +diff --git a/odb/gcc.hxx b/odb/gcc.hxx +index fb6a1bf..d8ad590 100644 +--- a/odb/gcc.hxx ++++ b/odb/gcc.hxx +@@ -164,6 +164,7 @@ gcc_tree_code_name (gcc_tree_code_type tc) {return tree_code_name[tc];} + // In GCC 9: + // + // INCLUDED_FROM Became linemap_included_from_linemap(). ++// + // LAST_SOURCE_LINE Was removed apparently as no longer used. Studying + // the line-map.h diff from 8.3 suggests that the old + // implementation should still work. +@@ -193,4 +194,23 @@ LAST_SOURCE_LINE (const line_map_ordinary* map) + + #endif + ++// In GCC 11: ++// ++// lookup_qualified_name() has a new interface. ++// ++// DECL_IS_BUILTIN became DECL_IS_UNDECLARED_BUILTIN. ++// ++#if BUILDING_GCC_MAJOR >= 11 ++ ++inline tree ++lookup_qualified_name (tree scope, tree name, bool type, bool complain) ++{ ++ return lookup_qualified_name ( ++ scope, name, (type ? LOOK_want::TYPE : LOOK_want::NORMAL), complain); ++} ++ ++#define DECL_IS_BUILTIN(decl) DECL_IS_UNDECLARED_BUILTIN(decl) ++ ++#endif ++ + #endif // ODB_GCC_HXX +-- +2.34.1 + diff --git a/package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch b/package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch new file mode 100644 index 00000000000..79c3d982fa4 --- /dev/null +++ b/package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch @@ -0,0 +1,68 @@ +From 60460df2a6d7b43a860a8f8b614c049ec0127ea8 Mon Sep 17 00:00:00 2001 +From: Boris Kolpackov +Date: Wed, 7 Jul 2021 09:26:57 +0200 +Subject: [PATCH] Resolve name lookup ambiguity causing error with GCC 11 + +[Upstream: 47035c0f72efd99a2210cd45db6e42423fb74533] +Signed-off-by: Thomas Petazzoni +--- + odb/relational/header.hxx | 2 ++ + odb/relational/source.hxx | 8 ++++++++ + 2 files changed, 10 insertions(+) + +diff --git a/odb/relational/header.hxx b/odb/relational/header.hxx +index 63dea09..d7f78fa 100644 +--- a/odb/relational/header.hxx ++++ b/odb/relational/header.hxx +@@ -50,6 +50,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual bool + pre (member_info& mi) + { +diff --git a/odb/relational/source.hxx b/odb/relational/source.hxx +index 716aa10..7da25fc 100644 +--- a/odb/relational/source.hxx ++++ b/odb/relational/source.hxx +@@ -1360,6 +1360,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual bool + pre (member_info& mi) + { +@@ -1744,6 +1746,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual bool + pre (member_info& mi) + { +@@ -2007,6 +2011,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual void + set_null (member_info&) = 0; + +@@ -2458,6 +2464,8 @@ namespace relational + + typedef typename member_base_impl::member_info member_info; + ++ using member_base_impl::container; ++ + virtual void + get_null (string const& var) const = 0; + +-- +2.34.1 + diff --git a/package/odb/odb.hash b/package/odb/odb.hash index 773a9c829b3..36c374588c5 100644 --- a/package/odb/odb.hash +++ b/package/odb/odb.hash @@ -1,6 +1,6 @@ # From https://www.codesynthesis.com/products/odb/download.xhtml -sha1 810fc02e591429ed19f5a2699d144fb611fb121b odb-2.4.0.tar.bz2 +sha1 810fc02e591429ed19f5a2699d144fb611fb121b odb-2.4.0.tar.bz2 # Locally computed -sha256 6785154fa98ea3977c8c2ab38cec16c4aa78c2c2039e80cd2908347b1c1d4198 odb-2.4.0.tar.bz2 -sha256 7983b82cb1f1686ac2b55420ded9c0f348f93dd17bf3e048ae3b25c1da51b80e LICENSE +sha256 6785154fa98ea3977c8c2ab38cec16c4aa78c2c2039e80cd2908347b1c1d4198 odb-2.4.0.tar.bz2 +sha256 7983b82cb1f1686ac2b55420ded9c0f348f93dd17bf3e048ae3b25c1da51b80e LICENSE diff --git a/package/odb/odb.mk b/package/odb/odb.mk index 85c7ccb8bbc..a2340699528 100644 --- a/package/odb/odb.mk +++ b/package/odb/odb.mk @@ -10,7 +10,13 @@ ODB_SOURCE = odb-$(ODB_VERSION).tar.bz2 ODB_SITE = https://www.codesynthesis.com/download/odb/$(ODB_VERSION_MAJOR) ODB_LICENSE = GPL-3.0 ODB_LICENSE_FILES = LICENSE -HOST_ODB_DEPENDENCIES = host-libcutl +# host-libodb is not needed to build host-odb, but it is needed to use +# the ODB compiler, as it install header files that are needed at +# runtime by the odb compiler. +HOST_ODB_DEPENDENCIES = host-libcutl host-libodb +ifeq ($(BR2_PACKAGE_LIBODB_BOOST),y) +HOST_ODB_DEPENDENCIES += host-libodb-boost +endif HOST_ODB_CONF_ENV = CXXFLAGS="$(HOST_CXXFLAGS) -std=c++11" # Prevent odb from trying to install the gcc plugin into the hosts diff --git a/package/ogre/Config.in b/package/ogre/Config.in index 7d57d3f82a4..e00d76d93d3 100644 --- a/package/ogre/Config.in +++ b/package/ogre/Config.in @@ -8,6 +8,7 @@ config BR2_PACKAGE_OGRE depends on !BR2_STATIC_LIBS depends on BR2_USE_MMU depends on BR2_USE_WCHAR # use wchar_t + depends on !BR2_arc # libfreeimage select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_LIBFREEIMAGE select BR2_PACKAGE_PUGIXML @@ -34,9 +35,11 @@ comment "ogre needs X11 and an OpenGL provider" depends on BR2_TOOLCHAIN_HAS_THREADS && BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \ && BR2_INSTALL_LIBSTDCPP && !BR2_STATIC_LIBS && BR2_USE_WCHAR depends on BR2_USE_MMU + depends on !BR2_arc comment "ogre needs a toolchain w/ C++, dynamic library, gcc >= 4.8, threads, wchar" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \ || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS \ || !BR2_USE_WCHAR depends on BR2_USE_MMU + depends on !BR2_arc 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 new file mode 100644 index 00000000000..f236ef0957b --- /dev/null +++ b/package/ola/0001-ola-fix-compilation-with-musl-1-2-3.patch @@ -0,0 +1,35 @@ +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 new file mode 100644 index 00000000000..701083b5d3b --- /dev/null +++ b/package/ola/Config.in @@ -0,0 +1,193 @@ +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 + select BR2_PACKAGE_PYTHON_NUMPY + help + Build OLA RDM tests. + +comment "rdm tests needs a toolchain w/ glibc or musl" + 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 + +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 new file mode 100644 index 00000000000..7565adabde0 --- /dev/null +++ b/package/ola/ola.hash @@ -0,0 +1,8 @@ +# Locally calculated +sha256 102aa3114562a2a71dbf7f77d2a0fb9fc47acc35d6248a70b6e831365ca71b13 ola-0.10.8.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 new file mode 100644 index 00000000000..82615e8155d --- /dev/null +++ b/package/ola/ola.mk @@ -0,0 +1,232 @@ +################################################################################ +# +# ola +# +################################################################################ + +OLA_VERSION = 0.10.8 +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.hash b/package/olsr/olsr.hash index 821361bb134..c148025b12c 100644 --- a/package/olsr/olsr.hash +++ b/package/olsr/olsr.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 ee9e524224e5d5304dcf61f1dc5485c569da09d382934ff85b233be3e24821a3 olsr-0.9.8.tar.gz -sha256 7dcf1fb93ef105e2708b02603bb6ee443115d4819fbf2c5a3a001b46887acb9a license.txt -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 lib/pud/nmealib/LICENSE +sha256 ee9e524224e5d5304dcf61f1dc5485c569da09d382934ff85b233be3e24821a3 olsr-0.9.8.tar.gz +sha256 7dcf1fb93ef105e2708b02603bb6ee443115d4819fbf2c5a3a001b46887acb9a license.txt +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 lib/pud/nmealib/LICENSE diff --git a/package/omniorb/omniorb.mk b/package/omniorb/omniorb.mk index b44ec53fd5c..d6434735cf0 100644 --- a/package/omniorb/omniorb.mk +++ b/package/omniorb/omniorb.mk @@ -25,7 +25,7 @@ HOST_OMNIORB_CONF_OPTS += --disable-longdouble ifeq ($(BR2_PACKAGE_OPENSSL),y) OMNIORB_CONF_OPTS += --with-openssl -OMNIORB_DEPENDENCIES += openssl +OMNIORB_DEPENDENCIES += host-pkgconf openssl else OMNIORB_CONF_OPTS += --without-openssl endif diff --git a/package/omxplayer/omxplayer.hash b/package/omxplayer/omxplayer.hash index fcbf730ab3f..5826c68d703 100644 --- a/package/omxplayer/omxplayer.hash +++ b/package/omxplayer/omxplayer.hash @@ -1,5 +1,5 @@ # Locally computed: -sha1 a9106203f822fe88eb35980479f46a555086d4a7 omxplayer-f06235cc9690a6d58187514452df8cf8fcdaacec.tar.gz +sha1 a9106203f822fe88eb35980479f46a555086d4a7 omxplayer-f06235cc9690a6d58187514452df8cf8fcdaacec.tar.gz sha256 af2d9450f8947842ea8c401fe9f71eec444013ebbdee29f2ac828c9c493c1329 omxplayer-f06235cc9690a6d58187514452df8cf8fcdaacec.tar.gz # Hash for license file: diff --git a/package/oniguruma/oniguruma.hash b/package/oniguruma/oniguruma.hash index 3a6112e832c..89befe7dbf3 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.7/onig-6.9.7.1.tar.gz.sha256 -sha256 6444204b9c34e6eb6c0b23021ce89a0370dad2b2f5c00cd44c342753e0b204d9 onig-6.9.7.1.tar.gz +# From https://github.com/kkos/oniguruma/releases/download/v6.9.8/onig-6.9.8.tar.gz.sha256 +sha256 28cd62c1464623c7910565fb1ccaaa0104b2fe8b12bcd646e81f73b47535213e onig-6.9.8.tar.gz # Hash for license file sha256 70ba5469ea0bab6e18a32d7009068f996503168d27be57747e08da34337ff26f COPYING diff --git a/package/oniguruma/oniguruma.mk b/package/oniguruma/oniguruma.mk index 31c8d8e5123..f5ac810c10e 100644 --- a/package/oniguruma/oniguruma.mk +++ b/package/oniguruma/oniguruma.mk @@ -4,7 +4,7 @@ # ################################################################################ -ONIGURUMA_VERSION = 6.9.7.1 +ONIGURUMA_VERSION = 6.9.8 ONIGURUMA_SITE = \ https://github.com/kkos/oniguruma/releases/download/v$(ONIGURUMA_VERSION) ONIGURUMA_SOURCE = onig-$(ONIGURUMA_VERSION).tar.gz diff --git a/package/open-iscsi/0001-SHA3-is-not-supported-by-libressl.patch b/package/open-iscsi/0001-SHA3-is-not-supported-by-libressl.patch new file mode 100644 index 00000000000..0423179d937 --- /dev/null +++ b/package/open-iscsi/0001-SHA3-is-not-supported-by-libressl.patch @@ -0,0 +1,144 @@ +From 29a4c3a518d13bfc0a07915e7e87fbec2b66597c Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 13 Feb 2023 08:55:11 +0100 +Subject: [PATCH] SHA3 is not supported by libressl + +Disable SHA3 with libressl as it is not supported resulting in the +following build failure: + +/home/buildroot/autobuild/instance-3/output-1/host/lib/gcc/or1k-buildroot-linux-gnu/11.3.0/../../../../or1k-buildroot-linux-gnu/bin/ld: iscsid.p/usr_auth.c.o: in function `auth_hash_init': +auth.c:(.text+0x7bc): undefined reference to `EVP_sha3_256' + +Fixes: + - http://autobuild.buildroot.org/results/48a4bddc355956733d712214797350cca8e111d9 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/open-iscsi/open-iscsi/pull/396] +--- + libopeniscsiusr/idbm.h | 2 ++ + usr/auth.c | 13 ++++++++++++- + usr/auth.h | 4 ++++ + usr/idbm.c | 2 ++ + 4 files changed, 20 insertions(+), 1 deletion(-) + +diff --git a/libopeniscsiusr/idbm.h b/libopeniscsiusr/idbm.h +index be5986f..1043b27 100644 +--- a/libopeniscsiusr/idbm.h ++++ b/libopeniscsiusr/idbm.h +@@ -56,7 +56,9 @@ enum iscsi_chap_algs { + ISCSI_AUTH_CHAP_ALG_MD5 = 5, + ISCSI_AUTH_CHAP_ALG_SHA1 = 6, + ISCSI_AUTH_CHAP_ALG_SHA256 = 7, ++#ifndef LIBRESSL_VERSION_NUMBER + ISCSI_AUTH_CHAP_ALG_SHA3_256 = 8, ++#endif + AUTH_CHAP_ALG_MAX_COUNT = 5, + }; + +diff --git a/usr/auth.c b/usr/auth.c +index 46c328e..5f50e26 100644 +--- a/usr/auth.c ++++ b/usr/auth.c +@@ -181,9 +181,11 @@ static int auth_hash_init(EVP_MD_CTX **context, int chap_alg) { + case AUTH_CHAP_ALG_SHA256: + digest = EVP_sha256(); + break; ++#ifndef LIBRESSL_VERSION_NUMBER + case AUTH_CHAP_ALG_SHA3_256: + digest = EVP_sha3_256(); + break; ++#endif + } + + if (*context == NULL) +@@ -298,7 +300,9 @@ static int + acl_chk_chap_alg_optn(int chap_algorithm) + { + if (chap_algorithm == AUTH_OPTION_NONE || ++#ifndef LIBRESSL_VERSION_NUMBER + chap_algorithm == AUTH_CHAP_ALG_SHA3_256 || ++#endif + chap_algorithm == AUTH_CHAP_ALG_SHA256 || + chap_algorithm == AUTH_CHAP_ALG_SHA1 || + chap_algorithm == AUTH_CHAP_ALG_MD5) +@@ -711,9 +715,11 @@ acl_chk_chap_alg_key(struct iscsi_acl *client) + case AUTH_CHAP_ALG_SHA256: + client->chap_challenge_len = AUTH_CHAP_SHA256_RSP_LEN; + break; ++#ifndef LIBRESSL_VERSION_NUMBER + case AUTH_CHAP_ALG_SHA3_256: + client->chap_challenge_len = AUTH_CHAP_SHA3_256_RSP_LEN; + break; ++#endif + } + return; + } +@@ -862,7 +868,10 @@ acl_local_auth(struct iscsi_acl *client) + client->local_state = AUTH_LOCAL_STATE_ERROR; + client->dbg_status = AUTH_DBG_STATUS_CHAP_ALG_REJECT; + break; +- } else if ((client->negotiated_chap_alg != AUTH_CHAP_ALG_SHA3_256) && ++ } else if ( ++#ifndef LIBRESSL_VERSION_NUMBER ++ (client->negotiated_chap_alg != AUTH_CHAP_ALG_SHA3_256) && ++#endif + (client->negotiated_chap_alg != AUTH_CHAP_ALG_SHA256) && + (client->negotiated_chap_alg != AUTH_CHAP_ALG_SHA1) && + (client->negotiated_chap_alg != AUTH_CHAP_ALG_MD5)) { +@@ -1824,6 +1833,7 @@ acl_init_chap_digests(int *value_list, unsigned *chap_algs, int conf_count) { + "SHA256 due to crypto lib configuration"); + } + break; ++#ifndef LIBRESSL_VERSION_NUMBER + case AUTH_CHAP_ALG_SHA3_256: + if (EVP_DigestInit_ex(context, EVP_sha3_256(), NULL)) { + value_list[i++] = AUTH_CHAP_ALG_SHA3_256; +@@ -1832,6 +1842,7 @@ acl_init_chap_digests(int *value_list, unsigned *chap_algs, int conf_count) { + "SHA3-256 due to crypto lib configuration"); + } + break; ++#endif + case ~0: + /* unset value in array, just ignore */ + break; +diff --git a/usr/auth.h b/usr/auth.h +index 16cdb24..9357772 100644 +--- a/usr/auth.h ++++ b/usr/auth.h +@@ -32,7 +32,9 @@ enum { + AUTH_CHAP_MD5_RSP_LEN = 16, + AUTH_CHAP_SHA1_RSP_LEN = 20, + AUTH_CHAP_SHA256_RSP_LEN = 32, ++#ifndef LIBRESSL_VERSION_NUMBER + AUTH_CHAP_SHA3_256_RSP_LEN = 32, ++#endif + AUTH_CHAP_RSP_MAX = 32, + }; + +@@ -67,7 +69,9 @@ enum { + AUTH_CHAP_ALG_MD5 = 5, + AUTH_CHAP_ALG_SHA1 = 6, + AUTH_CHAP_ALG_SHA256 = 7, ++#ifndef LIBRESSL_VERSION_NUMBER + AUTH_CHAP_ALG_SHA3_256 = 8, ++#endif + AUTH_CHAP_ALG_MAX_COUNT = 5 + }; + +diff --git a/usr/idbm.c b/usr/idbm.c +index 90bc142..082e1c6 100644 +--- a/usr/idbm.c ++++ b/usr/idbm.c +@@ -200,7 +200,9 @@ static struct int_list_tbl { + { "MD5", AUTH_CHAP_ALG_MD5 }, + { "SHA1", AUTH_CHAP_ALG_SHA1 }, + { "SHA256", AUTH_CHAP_ALG_SHA256 }, ++#ifndef LIBRESSL_VERSION_NUMBER + { "SHA3-256", AUTH_CHAP_ALG_SHA3_256 }, ++#endif + }; + + static void +-- +2.39.0 + diff --git a/package/open-iscsi/Config.in b/package/open-iscsi/Config.in new file mode 100644 index 00000000000..e55bbfd867d --- /dev/null +++ b/package/open-iscsi/Config.in @@ -0,0 +1,18 @@ +config BR2_PACKAGE_OPEN_ISCSI + bool "open-iscsi" + depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_HAS_THREADS # pthread + depends on !BR2_STATIC_LIBS # kmod + select BR2_PACKAGE_KMOD + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPEN_ISNS + select BR2_PACKAGE_UTIL_LINUX + select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT + help + iSCSI tools for Linux. + + https://www.open-iscsi.com + +comment "open-iscsi needs a toolchain w/ threads, dynamic library" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/open-iscsi/open-iscsi.hash b/package/open-iscsi/open-iscsi.hash new file mode 100644 index 00000000000..9fd651cae8d --- /dev/null +++ b/package/open-iscsi/open-iscsi.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 9565bdf6b68b223e1e0d455d9a04d7536724a3f5b5a254e9398d06b2a0c6b6d2 open-iscsi-2.1.8.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/open-iscsi/open-iscsi.mk b/package/open-iscsi/open-iscsi.mk new file mode 100644 index 00000000000..e5b965b80da --- /dev/null +++ b/package/open-iscsi/open-iscsi.mk @@ -0,0 +1,30 @@ +################################################################################ +# +# open-iscsi +# +################################################################################ + +OPEN_ISCSI_VERSION = 2.1.8 +OPEN_ISCSI_SITE = $(call github,open-iscsi,open-iscsi,$(OPEN_ISCSI_VERSION)) +# The COPYING file says GPL-2.0, but there is some GPL-3.0+ code as +# well. See https://github.com/open-iscsi/open-iscsi/issues/379 +OPEN_ISCSI_LICENSE = GPL-2.0+, GPL-3.0+ +OPEN_ISCSI_LICENSE_FILES = COPYING +OPEN_ISCSI_CPE_ID_VENDOR = open-iscsi_project +OPEN_ISCSI_DEPENDENCIES = kmod open-isns openssl util-linux + +OPEN_ISCSI_CONF_OPTS = -Ddbroot=/var/lib/iscsi + +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +OPEN_ISCSI_DEPENDENCIES += systemd +OPEN_ISCSI_CONF_OPTS += -Dno_systemd=false +else +OPEN_ISCSI_CONF_OPTS += -Dno_systemd=true +endif + +define OPEN_ISCSI_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_SCSI_LOWLEVEL) + $(call KCONFIG_ENABLE_OPT,CONFIG_ISCSI_TCP) +endef + +$(eval $(meson-package)) diff --git a/package/open-isns/Config.in b/package/open-isns/Config.in new file mode 100644 index 00000000000..a9bf7bbc1da --- /dev/null +++ b/package/open-isns/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_OPEN_ISNS + bool "open-isns" + depends on BR2_USE_MMU # fork() + help + iSNS server and client for Linux. + + https://github.com/open-iscsi/open-isns diff --git a/package/open-isns/open-isns.hash b/package/open-isns/open-isns.hash new file mode 100644 index 00000000000..653fabaa9f1 --- /dev/null +++ b/package/open-isns/open-isns.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 9611344733c0cdf14395f60880950ea4c3c7d6b765565b6493ad3e1afbe216de open-isns-0.102.tar.gz +sha256 00a89b0d18aacd4114decf79122db87bf35bddaf2bc50e383c9c9f4c263390b2 COPYING diff --git a/package/open-isns/open-isns.mk b/package/open-isns/open-isns.mk new file mode 100644 index 00000000000..ae8fb415781 --- /dev/null +++ b/package/open-isns/open-isns.mk @@ -0,0 +1,32 @@ +################################################################################ +# +# open-isns +# +################################################################################ + +OPEN_ISNS_VERSION = 0.102 +OPEN_ISNS_SITE = $(call github,open-iscsi,open-isns,v$(OPEN_ISNS_VERSION)) +OPEN_ISNS_LICENSE = LGPL-2.1+ +OPEN_ISNS_LICENSE_FILES = COPYING +OPEN_ISNS_INSTALL_STAGING = YES + +OPEN_ISNS_CONF_OPTS = -Dslp=disabled + +ifeq ($(BR2_PACKAGE_OPENSSL),y) +OPEN_ISNS_DEPENDENCIES += openssl +OPEN_ISNS_CONF_OPTS += -Dsecurity=enabled +else +OPEN_ISNS_CONF_OPTS += -Dsecurity=disabled +endif + +ifeq ($(BR2_INIT_SYSTEMD),) +define OPEN_ISNS_REMOVE_SYSTEMD_UNITS + rm $(TARGET_DIR)/usr/lib/systemd/system/isnsd.service + rm $(TARGET_DIR)/usr/lib/systemd/system/isnsd.socket + rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/usr/lib/systemd/system + rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/usr/lib/systemd +endef +OPEN_ISNS_POST_INSTALL_TARGET_HOOKS += OPEN_ISNS_REMOVE_SYSTEMD_UNITS +endif + +$(eval $(meson-package)) diff --git a/package/open62541/0001-CMakeLists.txt-project-only-contains-C-code.patch b/package/open62541/0001-CMakeLists.txt-project-only-contains-C-code.patch deleted file mode 100644 index 52a9cbaac55..00000000000 --- a/package/open62541/0001-CMakeLists.txt-project-only-contains-C-code.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 61f9440dfeacad517965451773371aca0332d700 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 5 Jan 2021 23:08:53 +0100 -Subject: [PATCH] CMakeLists.txt: project only contains C code - -Make sure CMake doesn't check for a C++ compiler when it's not needed, -as open62541 is in C. - -Signed-off-by: Thomas Petazzoni ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 94ceb127..acc41ab2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,5 +1,5 @@ - cmake_minimum_required(VERSION 3.0...3.12) --project(open62541) -+project(open62541 C) - # set(CMAKE_VERBOSE_MAKEFILE ON) - if(${CMAKE_VERSION} VERSION_LESS 3.12) - cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}) --- -2.29.2 - diff --git a/package/open62541/0002-arch-posix-CMakeLists.txt-fix-build-without-threads.patch b/package/open62541/0002-arch-posix-CMakeLists.txt-fix-build-without-threads.patch deleted file mode 100644 index bdf3608041a..00000000000 --- a/package/open62541/0002-arch-posix-CMakeLists.txt-fix-build-without-threads.patch +++ /dev/null @@ -1,37 +0,0 @@ -From a312e82124fb8c9f139d5a40fa5a28123bb77a33 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 10 Jan 2021 14:25:56 +0100 -Subject: [PATCH] arch/posix/CMakeLists.txt: fix build without threads - -Fix the following build failure without threads: - -[100%] Linking C shared library bin/libopen62541.so -/home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: cannot find -lpthread -collect2: error: ld returned 1 exit status -CMakeFiles/open62541.dir/build.make:192: recipe for target 'bin/libopen62541.so.0.0.0' failed -make[3]: *** [bin/libopen62541.so.0.0.0] Error 1 - -Fixes: - - http://autobuild.buildroot.org/results/87ec3c987c991f790757276316d6caf81e635fa2 - -Signed-off-by: Fabrice Fontaine ---- - arch/posix/CMakeLists.txt | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/arch/posix/CMakeLists.txt b/arch/posix/CMakeLists.txt -index bb24757c..a53c9f2c 100644 ---- a/arch/posix/CMakeLists.txt -+++ b/arch/posix/CMakeLists.txt -@@ -20,8 +20,6 @@ if (${_index} GREATER -1 OR "${UA_ARCHITECTURE}" STREQUAL "posix") - ua_architecture_append_to_library(netdb ndblib socket) - else() - ua_architecture_append_to_library(m) -- #TODO - Error on first make run if pthread is included conditional? -- ua_architecture_append_to_library(pthread) - if(UA_MULTITHREADING OR UA_BUILD_UNIT_TESTS) - ua_architecture_append_to_library(pthread) - endif() --- -2.29.2 - diff --git a/package/open62541/0003-fix-core-Explicit-cast-to-avoid-compiler-warning.patch b/package/open62541/0003-fix-core-Explicit-cast-to-avoid-compiler-warning.patch deleted file mode 100644 index dea325c17f7..00000000000 --- a/package/open62541/0003-fix-core-Explicit-cast-to-avoid-compiler-warning.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0c53fd776af9631c915c8722e1d68ce9a69fa3f6 Mon Sep 17 00:00:00 2001 -From: Andreas Walter -Date: Fri, 26 Feb 2021 11:49:25 +0100 -Subject: [PATCH] fix(core): Explicit cast to avoid compiler warning (#4203) - -[Retrieved from: -https://github.com/open62541/open62541/commit/0c53fd776af9631c915c8722e1d68ce9a69fa3f6] -Signed-off-by: Fabrice Fontaine ---- - src/ua_types_encoding_binary.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/ua_types_encoding_binary.c b/src/ua_types_encoding_binary.c -index 0fe88eb98e0..abbd23735d3 100644 ---- a/src/ua_types_encoding_binary.c -+++ b/src/ua_types_encoding_binary.c -@@ -319,7 +319,7 @@ static long double - unpack754(uint64_t i, unsigned bits, unsigned expbits) { - unsigned significandbits = bits - expbits - 1; - long double result = (long double)(i&(uint64_t)((1LL<>significandbits) & (uint64_t)((1LL< -Date: Mon, 2 Aug 2021 09:49:48 +0200 -Subject: [PATCH] CMakeLists.txt: add UA_FORCE_WERROR - -Allow the user to disable -Werror to avoid the following build failures: - -/tmp/instance-0/output-1/build/open62541-v1.2.2/arch/network_tcp.c: In function 'connection_recv': -/tmp/instance-0/output-1/build/open62541-v1.2.2/arch/network_tcp.c:96:5: error: conversion to 'unsigned int' from 'int' may change the sign of the result [-Werror=sign-conversion] - 96 | UA_fd_set(connection->sockfd, &fdset); - | ^~~~~~~~~ - -/tmp/instance-6/output-1/build/open62541-v1.2.2/plugins/ua_pubsub_udp.c: In function 'UA_PubSubChannelUDPMC_receive': -/tmp/instance-6/output-1/build/open62541-v1.2.2/plugins/ua_pubsub_udp.c:477:21: error: conversion to '__suseconds_t' {aka 'int'} from 'UA_UInt32' {aka 'unsigned int'} may change the sign of the result [-Werror=sign-conversion] - 477 | tmptv.tv_usec = (long int)(timeout % 1000000); - | ^ - -Fixes: - - http://autobuild.buildroot.org/results/911811de81d8abb2a31feb8f27af1592641c6fbc - - http://autobuild.buildroot.org/results/f0187b3f2d62e955fddeef4e90f84ba4fd642bd2 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/open62541/open62541/pull/4572] ---- - CMakeLists.txt | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index bc839f27..963460d0 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -292,6 +292,8 @@ if(UA_FORCE_CPP) - add_definitions(-D__STDC_CONSTANT_MACROS) # We need the UINT32_C define - endif() - -+option(UA_FORCE_WERROR "Force compilation with -Werror" ON) -+ - #General PubSub setup - option(UA_ENABLE_PUBSUB "Enable the PubSub protocol" OFF) - -@@ -589,7 +591,9 @@ if(NOT UA_FORCE_CPP AND (CMAKE_COMPILER_IS_GNUCC OR "x${CMAKE_C_COMPILER_ID}" ST - check_add_cc_flag("-Wall") # Warnings - check_add_cc_flag("-Wextra") # More warnings - check_add_cc_flag("-Wpedantic") # Standard compliance -- check_add_cc_flag("-Werror") # All warnings are errors -+ if(UA_FORCE_WERROR) -+ check_add_cc_flag("-Werror") # All warnings are errors -+ endif() - - check_add_cc_flag("-Wno-static-in-inline") # Clang doesn't like the use of static inline methods inside static inline methods - check_add_cc_flag("-Wno-overlength-strings") # May happen in the nodeset compiler when complex values are directly encoded --- -2.30.2 - diff --git a/package/open62541/Config.in b/package/open62541/Config.in index a835595e83f..296be1578d1 100644 --- a/package/open62541/Config.in +++ b/package/open62541/Config.in @@ -3,10 +3,30 @@ config BR2_PACKAGE_OPEN62541 help open62541 is an open source and free implementation of OPC UA. - http://open62541.org + https://open62541.org/ if BR2_PACKAGE_OPEN62541 +choice + prompt "encryption" + default BR2_PACKAGE_OPEN62541_ENCRYPTION_NONE + help + Encryption support + +config BR2_PACKAGE_OPEN62541_ENCRYPTION_NONE + bool "none" + +config BR2_PACKAGE_OPEN62541_ENCRYPTION_MBEDTLS + bool "mbedtls" + select BR2_PACKAGE_MBEDTLS + +config BR2_PACKAGE_OPEN62541_ENCRYPTION_OPENSSL + bool "openssl" + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL + +endchoice + choice prompt "namespace zero nodes" help @@ -39,8 +59,20 @@ config BR2_PACKAGE_OPEN62541_UA_NAMESPACE_ZERO_FULL endchoice +config BR2_PACKAGE_OPEN62541_HISTORIZING + bool "historizing" + help + Enable basic support for historical access (client and server) + +config BR2_PACKAGE_OPEN62541_DISCOVERY + bool "discovery" + help + Enable Discovery Service (LDS) + config BR2_PACKAGE_OPEN62541_JSON_ENCODING bool "json encoding" + help + Enable JSON encoding config BR2_PACKAGE_OPEN62541_PUBSUB bool "publish/subscribe" @@ -66,6 +98,20 @@ config BR2_PACKAGE_OPEN62541_PUBSUB_INFORMATIONMODEL Enable the information model representation of the PubSub configuration. +if BR2_PACKAGE_OPEN62541_PUBSUB_INFORMATIONMODEL + +config BR2_PACKAGE_OPEN62541_PUBSUB_INFORMATIONMODEL_METHODS + bool "publish/subscribe information model methods" + help + Enable PubSub informationmodel methods + +endif + +config BR2_PACKAGE_OPEN62541_PUBSUB_ETH_UADP + bool "publish/subscribe UADP" + help + Enable publish/subscribe UADP over Ethernet + endif # BR2_PACKAGE_OPEN62541_PUBSUB endif diff --git a/package/open62541/open62541.hash b/package/open62541/open62541.hash index 5aa340ac185..09002436e9d 100644 --- a/package/open62541/open62541.hash +++ b/package/open62541/open62541.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c59c85b519a18350f5014b6e7b7545ee144ceeb15094e75b0b7ecec7dce43dd0 open62541-v1.2.2-br1.tar.gz +sha256 9a7955ba01e12dbd327e534c25288f4918d275031394c804943a7e45ba903621 open62541-v1.3.4-br1.tar.gz sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 LICENSE diff --git a/package/open62541/open62541.mk b/package/open62541/open62541.mk index fb28a614e2a..2c0e3b17fe6 100644 --- a/package/open62541/open62541.mk +++ b/package/open62541/open62541.mk @@ -4,9 +4,9 @@ # ################################################################################ -OPEN62541_VERSION = v1.2.2 +OPEN62541_VERSION = v1.3.4 OPEN62541_SITE_METHOD = git -OPEN62541_SITE = git://github.com/open62541/open62541.git +OPEN62541_SITE = https://github.com/open62541/open62541.git OPEN62541_GIT_SUBMODULES = YES OPEN62541_INSTALL_STAGING = YES OPEN62541_LICENSE = MPL-2.0 @@ -23,14 +23,36 @@ OPEN62541_CONF_OPTS = \ -DUA_ENABLE_HARDENING=OFF \ -DUA_FORCE_WERROR=OFF +ifeq ($(BR2_PACKAGE_OPEN62541_ENCRYPTION_MBEDTLS),y) +OPEN62541_DEPENDENCIES += mbedtls +OPEN62541_CONF_OPTS += -DUA_ENABLE_ENCRYPTION=MBEDTLS +endif + +ifeq ($(BR2_PACKAGE_OPEN62541_ENCRYPTION_OPENSSL),y) +OPEN62541_DEPENDENCIES += openssl +OPEN62541_CONF_OPTS += -DUA_ENABLE_ENCRYPTION=OPENSSL +endif + ifeq ($(BR2_PACKAGE_OPEN62541_UA_NAMESPACE_ZERO_MINIMAL),y) -OPEN62541_CONF_OPTS += -DUA_NAMESPACE_ZERO=MINIMAL +OPEN62541_CONF_OPTS += -DUA_NAMESPACE_ZERO=MINIMAL -DUA_ENABLE_SUBSCRIPTIONS_EVENTS=OFF else ifeq ($(BR2_PACKAGE_OPEN62541_UA_NAMESPACE_ZERO_REDUCED),y) OPEN62541_CONF_OPTS += -DUA_NAMESPACE_ZERO=REDUCED else ifeq ($(BR2_PACKAGE_OPEN62541_UA_NAMESPACE_ZERO_FULL),y) OPEN62541_CONF_OPTS += -DUA_NAMESPACE_ZERO=FULL endif +ifeq ($(BR2_PACKAGE_OPEN62541_HISTORIZING),y) +OPEN62541_CONF_OPTS += -DUA_ENABLE_HISTORIZING=ON +else +OPEN62541_CONF_OPTS += -DUA_ENABLE_HISTORIZING=OFF +endif + +ifeq ($(BR2_PACKAGE_OPEN62541_DISCOVERY),y) +OPEN62541_CONF_OPTS += -DUA_ENABLE_DISCOVERY=ON +else +OPEN62541_CONF_OPTS += -DUA_ENABLE_DISCOVERY=OFF +endif + ifeq ($(BR2_PACKAGE_OPEN62541_JSON_ENCODING),y) OPEN62541_CONF_OPTS += -DUA_ENABLE_JSON_ENCODING=ON else @@ -55,6 +77,18 @@ else OPEN62541_CONF_OPTS += -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=OFF endif +ifeq ($(BR2_PACKAGE_OPEN62541_PUBSUB_INFORMATIONMODEL_METHODS),y) +OPEN62541_CONF_OPTS += -DUA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS=ON +else +OPEN62541_CONF_OPTS += -DUA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS=OFF +endif + +ifeq ($(BR2_PACKAGE_OPEN62541_PUBSUB_ETH_UADP),y) +OPEN62541_CONF_OPTS += -DUA_ENABLE_PUBSUB_ETH_UADP=ON +else +OPEN62541_CONF_OPTS += -DUA_ENABLE_PUBSUB_ETH_UADP=OFF +endif + # Remove unneeded files define OPEN62541_REMOVE_UNNEEDED_FILES $(RM) -r $(TARGET_DIR)/usr/share/open62541 diff --git a/package/openal/openal.hash b/package/openal/openal.hash index 3f1a574e3e0..eae78b0582d 100644 --- a/package/openal/openal.hash +++ b/package/openal/openal.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8ac17e4e3b32c1af3d5508acfffb838640669b4274606b7892aa796ca9d7467f openal-1.21.1.tar.gz +sha256 814831a8013d7365dfd1917b27f1fb6e723f3be3fe1c6a7ff4516425d8392f68 openal-1.22.0.tar.gz sha256 d808ce217e5b611854da622b57ec29fe545584c48bc5352fae72a4b6e5074a15 COPYING diff --git a/package/openal/openal.mk b/package/openal/openal.mk index a878e4847f6..3d624139c26 100644 --- a/package/openal/openal.mk +++ b/package/openal/openal.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENAL_VERSION = 1.21.1 +OPENAL_VERSION = 1.22.0 OPENAL_SITE = $(call github,kcat,openal-soft,$(OPENAL_VERSION)) OPENAL_LICENSE = LGPL-2.0+ OPENAL_LICENSE_FILES = COPYING diff --git a/package/openblas/0001-Makefile-also-consider-Os-when-determining-LAPACK_NO.patch b/package/openblas/0001-Makefile-also-consider-Os-when-determining-LAPACK_NO.patch deleted file mode 100644 index f9278bd0998..00000000000 --- a/package/openblas/0001-Makefile-also-consider-Os-when-determining-LAPACK_NO.patch +++ /dev/null @@ -1,31 +0,0 @@ -From ced08de1ad74811bc23d74121751537bfd8e9556 Mon Sep 17 00:00:00 2001 -From: Thomas De Schampheleire -Date: Fri, 5 Mar 2021 11:15:52 +0100 -Subject: [PATCH] Makefile: also consider -O, -Og and -Os when stripping flags - -gcc also supports -O, -Og and -Os as optimization flags. -They may be given on the make command-line by users. - -For the calculation of LAPACK_NOOPT, all such flags should be considered. - -Signed-off-by: Thomas De Schampheleire ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index a22e16ba..fc5fe3f5 100644 ---- a/Makefile -+++ b/Makefile -@@ -32,7 +32,7 @@ export NOFORTRAN - export NO_LAPACK - endif - --LAPACK_NOOPT := $(filter-out -O0 -O1 -O2 -O3 -Ofast,$(LAPACK_FFLAGS)) -+LAPACK_NOOPT := $(filter-out -O0 -O1 -O2 -O3 -Ofast -O -Og -Os,$(LAPACK_FFLAGS)) - - SUBDIRS_ALL = $(SUBDIRS) test ctest utest exports benchmark ../laswp ../bench cpp_thread_test - --- -2.26.2 - diff --git a/package/openblas/0001-Makefile.system-don-t-specify-optimization-level-bui.patch b/package/openblas/0001-Makefile.system-don-t-specify-optimization-level-bui.patch new file mode 100644 index 00000000000..e0c738748a1 --- /dev/null +++ b/package/openblas/0001-Makefile.system-don-t-specify-optimization-level-bui.patch @@ -0,0 +1,39 @@ +From d8ec4e4c6ef69165179f376e365034de10e6fee3 Mon Sep 17 00:00:00 2001 +From: Thomas De Schampheleire +Date: Fri, 5 Mar 2021 14:09:23 +0100 +Subject: [PATCH] Makefile.system: don't specify optimization level + [buildroot-specific] + +Buildroot will pass an optimization level, but it is ignored because the +openblas makefiles _append_ to the flags passed on the command-line. + +The CFLAGS/FFLAGS would e.g. contain '-Os -O2' in which -O2 survives. + +Remove the optimization level specified in openblas itself. + +Signed-off-by: Thomas De Schampheleire +--- + Makefile.system | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.system b/Makefile.system +index 438a8148..9de1bbd5 100644 +--- a/Makefile.system ++++ b/Makefile.system +@@ -1519,11 +1519,11 @@ FCOMMON_OPT += -g + endif + + ifndef COMMON_OPT +-COMMON_OPT = -O2 ++COMMON_OPT = + endif + + ifndef FCOMMON_OPT +-FCOMMON_OPT = -O2 -frecursive ++FCOMMON_OPT = -frecursive + endif + + override CFLAGS += $(COMMON_OPT) $(CCOMMON_OPT) -I$(TOPDIR) +-- +2.35.1 + diff --git a/package/openblas/0002-Makefile.system-don-t-specify-optimization-level-bui.patch b/package/openblas/0002-Makefile.system-don-t-specify-optimization-level-bui.patch deleted file mode 100644 index bcc3e0eb6a9..00000000000 --- a/package/openblas/0002-Makefile.system-don-t-specify-optimization-level-bui.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 6d1c1350977d74fb2239f765bd92a5763cd3bb73 Mon Sep 17 00:00:00 2001 -From: Thomas De Schampheleire -Date: Fri, 5 Mar 2021 14:09:23 +0100 -Subject: [PATCH] Makefile.system: don't specify optimization level - [buildroot-specific] - -Buildroot will pass an optimization level, but it is ignored because the -openblas makefiles _append_ to the flags passed on the command-line. - -The CFLAGS/FFLAGS would e.g. contain '-Os -O2' in which -O2 survives. - -Remove the optimization level specified in openblas itself. - -Signed-off-by: Thomas De Schampheleire - ---- - Makefile.system | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile.system b/Makefile.system -index 1e30d05a..04b0be16 100644 ---- a/Makefile.system -+++ b/Makefile.system -@@ -1216,11 +1216,11 @@ FCOMMON_OPT += -g - endif - - ifndef COMMON_OPT --COMMON_OPT = -O2 -+COMMON_OPT = - endif - - ifndef FCOMMON_OPT --FCOMMON_OPT = -O2 -frecursive -+FCOMMON_OPT = -frecursive - endif - - override CFLAGS += $(COMMON_OPT) $(CCOMMON_OPT) -I$(TOPDIR) --- -2.26.2 - diff --git a/package/openblas/openblas.hash b/package/openblas/openblas.hash index a1e35f4fc47..3a52600056c 100644 --- a/package/openblas/openblas.hash +++ b/package/openblas/openblas.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1632c1e8cca62d8bed064b37747e331a1796fc46f688626337362bf0d16aeadb openblas-0.3.18.tar.gz +sha256 f36ba3d7a60e7c8bcc54cd9aaa9b1223dd42eaf02c811791c37e8ca707c241ca openblas-0.3.21.tar.gz sha256 190b5a9c8d9723fe958ad33916bd7346d96fab3c5ea90832bb02d854f620fcff LICENSE diff --git a/package/openblas/openblas.mk b/package/openblas/openblas.mk index 4d506fa618a..e05687bb8f9 100644 --- a/package/openblas/openblas.mk +++ b/package/openblas/openblas.mk @@ -4,11 +4,12 @@ # ################################################################################ -OPENBLAS_VERSION = 0.3.18 +OPENBLAS_VERSION = 0.3.21 OPENBLAS_SITE = https://github.com/xianyi/OpenBLAS/releases/download/v$(OPENBLAS_VERSION) OPENBLAS_LICENSE = BSD-3-Clause OPENBLAS_LICENSE_FILES = LICENSE OPENBLAS_INSTALL_STAGING = YES +OPENBLAS_CPE_ID_VENDOR = openblas_project # Initialise OpenBLAS make options to $(TARGET_CONFIGURE_OPTS) OPENBLAS_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) @@ -48,6 +49,12 @@ ifeq ($(BR2_STATIC_LIBS),y) OPENBLAS_MAKE_OPTS += NO_SHARED=1 endif +ifeq ($(BR2_ARCH_IS_64),y) +OPENBLAS_MAKE_OPTS += BINARY=64 +else +OPENBLAS_MAKE_OPTS += BINARY=32 +endif + # binutils version <= 2.23.2 has a bug # (https://sourceware.org/bugzilla/show_bug.cgi?id=14887) where # whitespaces in ARM register specifications such as [ r1, #12 ] or [ diff --git a/package/opencl-clhpp/Config.in b/package/opencl-clhpp/Config.in new file mode 100644 index 00000000000..59110ec2624 --- /dev/null +++ b/package/opencl-clhpp/Config.in @@ -0,0 +1,14 @@ +config BR2_PACKAGE_OPENCL_CLHPP + bool "opencl-clhpp" + # header only library, so there is no build per-se, but + # packages depending on us will need C++ support + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_PACKAGE_HAS_LIBOPENCL + help + opencl-clhpp are the OpenCL API C++ bindings + + http://github.khronos.org/OpenCL-CLHPP/ + +comment "opencl-clhpp needs a toolchain w/ C++" + depends on BR2_PACKAGE_HAS_LIBOPENCL + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/opencl-clhpp/opencl-clhpp.hash b/package/opencl-clhpp/opencl-clhpp.hash new file mode 100644 index 00000000000..27b27cd80cc --- /dev/null +++ b/package/opencl-clhpp/opencl-clhpp.hash @@ -0,0 +1,3 @@ +# Locally Computed +sha256 869456032e60787eed9fceaeaf6c6cb4452bc0ff97e0f5a271510145a1c8f4d4 opencl-clhpp-2.0.16.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/opencl-clhpp/opencl-clhpp.mk b/package/opencl-clhpp/opencl-clhpp.mk new file mode 100644 index 00000000000..933b40e3fef --- /dev/null +++ b/package/opencl-clhpp/opencl-clhpp.mk @@ -0,0 +1,29 @@ +################################################################################ +# +# opencl-clhpp +# +################################################################################ + +OPENCL_CLHPP_VERSION = 2.0.16 +OPENCL_CLHPP_SITE = $(call github,KhronosGroup,OpenCL-CLHPP,v$(OPENCL_CLHPP_VERSION)) +OPENCL_CLHPP_LICENSE = Apache-2.0 +OPENCL_CLHPP_LICENSE_FILES = LICENSE.txt +OPENCL_CLHPP_DEPENDENCIES = libopencl +OPENCL_CLHPP_INSTALL_STAGING = YES + +# OpenCL_CLHPP is a header-only library +OPENCL_CLHPP_INSTALL_TARGET = NO + +# This package has a CMake build system, and it checks for C++11 +# compliant compiler, but all we need to do is install two headers, so +# let's do it manually. +OPENCL_CLHPP_HEADERS = cl2.hpp opencl.hpp + +define OPENCL_CLHPP_INSTALL_STAGING_CMDS + $(foreach header,$(OPENCL_CLHPP_HEADERS), \ + $(INSTALL) -D -m 0644 $(@D)/include/CL/$(header) \ + $(STAGING_DIR)/usr/include/CL/$(header) + ) +endef + +$(eval $(generic-package)) diff --git a/package/opencore-amr/opencore-amr.hash b/package/opencore-amr/opencore-amr.hash index b333822b908..2a2d7498467 100644 --- a/package/opencore-amr/opencore-amr.hash +++ b/package/opencore-amr/opencore-amr.hash @@ -1,6 +1,6 @@ # From https://sourceforge.net/projects/opencore-amr/files/opencore-amr/ -md5 e0798587b91411cc092aa73091a97dfc opencore-amr-0.1.5.tar.gz -sha1 bef4d1e3a8a155b47569b6691a223843b33e279e opencore-amr-0.1.5.tar.gz +md5 e0798587b91411cc092aa73091a97dfc opencore-amr-0.1.5.tar.gz +sha1 bef4d1e3a8a155b47569b6691a223843b33e279e opencore-amr-0.1.5.tar.gz # Locally computed: -sha256 2c006cb9d5f651bfb5e60156dbff6af3c9d35c7bbcc9015308c0aff1e14cd341 opencore-amr-0.1.5.tar.gz -sha256 8b3f1762349248d444ab9acbafe73941254e36e1064954da56bb9ddbd5873ddb LICENSE +sha256 2c006cb9d5f651bfb5e60156dbff6af3c9d35c7bbcc9015308c0aff1e14cd341 opencore-amr-0.1.5.tar.gz +sha256 8b3f1762349248d444ab9acbafe73941254e36e1064954da56bb9ddbd5873ddb LICENSE diff --git a/package/opencv3/opencv3.hash b/package/opencv3/opencv3.hash index 30308188aa0..3d6fd2ed8a5 100644 --- a/package/opencv3/opencv3.hash +++ b/package/opencv3/opencv3.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1353eec67849aadb20df71d8bae18b83708e18fc5da080fe5efeabb1e99b2ee8 opencv3-3.4.17.tar.gz -sha256 9076d3d934839a2f8e7bfe549abda6faea4751f1edd6e9460ff703559890ad5f LICENSE +sha256 9b913e74299ce4416a5c94000da577c592bf670fd53bad16220eb115a0821529 opencv3-3.4.19.tar.gz +sha256 c1fed9cd2f557ba23a1b37a21e2c90629d1a60bdb61e92d0e79369bb6fca3390 LICENSE diff --git a/package/opencv3/opencv3.mk b/package/opencv3/opencv3.mk index 8e4c90786e6..29fb246e650 100644 --- a/package/opencv3/opencv3.mk +++ b/package/opencv3/opencv3.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENCV3_VERSION = 3.4.17 +OPENCV3_VERSION = 3.4.19 OPENCV3_SITE = $(call github,opencv,opencv,$(OPENCV3_VERSION)) OPENCV3_INSTALL_STAGING = YES OPENCV3_LICENSE = BSD-3-Clause diff --git a/package/opencv4-contrib/Config.in b/package/opencv4-contrib/Config.in new file mode 100644 index 00000000000..98003330352 --- /dev/null +++ b/package/opencv4-contrib/Config.in @@ -0,0 +1,313 @@ +menuconfig BR2_PACKAGE_OPENCV4_CONTRIB + bool "opencv4-contrib" + depends on BR2_PACKAGE_OPENCV4 + help + OpenCV (Open Source Computer Vision) is a library of + programming functions for real time computer vision. + + http://opencv.org/ + +if BR2_PACKAGE_OPENCV4_CONTRIB + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_ALPHAMAT + bool "alphamat" + help + Computer Vision based Alpha Matting -- Given an input image + and a trimap, generate an alpha matte. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_ARUCO + bool "aruco" + help + ArUco and ChArUco Markers -- Augmented reality ArUco marker + and "ChARUco" markers where ArUco markers embedded inside the + white areas of the checker board. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_BARCODE + bool "barcode" + help + Barcode detecting and decoding methods. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_BGSEGM + bool "bgsegm" + help + Background segmentation algorithm combining statistical + background image estimation and per-pixel Bayesian + segmentation. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_BIOINSPIRED + bool "bioinspired" + help + Biological Vision -- Biologically inspired vision model: + minimize noise and luminance variance, transient event + segmentation, high dynamic range tone mapping methods. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_CCALIB + bool "ccalib" + help + Custom Calibration -- Patterns for 3D reconstruction, + omnidirectional camera calibration, random pattern calibration + and multi-camera calibration. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_CNN_3DOBJ + bool "cnn_3dobj" + help + Deep Object Recognition and Pose -- Uses Caffe Deep Neural Net + library to build, train and test a CNN model of visual object + recognition and pose. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_CVV + bool "cvv" + help + Computer Vision Debugger -- Simple code that you can add + to your program that pops up a GUI allowing you to + interactively and visually debug computer vision programs. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_DATASETS + bool "datasets" + help + Datasets Reader -- Code for reading existing computer vision + databases and samples of using the readers to train, test and + run using that dataset's data. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_DNN_OBJDETECT + bool "dnn_objdetect" + help + Object Detection using CNNs -- Implements compact CNN Model + for object detection. Trained using Caffe but uses + opencv_dnn module. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_DNN_SUPERRES + bool "dnn_superres" + help + Superresolution using CNNs -- Contains four trained + convolutional neural networks to upscale images. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_DNNS_EASILY_FOOLED + bool "dnns_easily_fooled" + help + Subvert DNNs -- This code can use the activations in a + network to fool the networks into recognizing something else. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_DPM + bool "dpm" + help + Deformable Part Model -- Felzenszwalb's Cascade with + deformable parts object recognition code. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_FACE + bool "face" + help + Face Recognition -- Face recognition techniques: Eigen, Fisher + and Local Binary Pattern Histograms LBPH methods. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_FREETYPE + bool "freetype" + help + Drawing text using freetype and harfbuzz. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_FUZZY + bool "fuzzy" + help + Fuzzy Logic in Vision -- Fuzzy logic image transform and + inverse; Fuzzy image processing. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_HDF + bool "hdf" + help + Hierarchical Data Storage -- This module contains I/O + routines for Hierarchical Data Format: + https://en.m.wikipedia.org/wiki/Hierarchical_Data_Format + meant to store large amounts of data. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_HFS + bool "hfs" + help + Hierarchical Feature Selection for Efficient Image + Segmentation -- This module contains an efficient + algorithm to segment an image. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_IMG_HASH + bool "img_hash" + help + This module contains algorithms to extract hash of an + image allowing to efficiently estimate similarity between + images. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_INTENSITY_TRANSFORM + bool "intensity_transform" + help + The module brings implementations of intensity transformation + algorithms to adjust image contrast. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_JULIA + bool "julia" + help + Julia language wrappers with samples and tests. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_LINE_DESCRIPTOR + bool "line_descriptor" + help + Line Segment Extract and Match -- Methods of extracting, + describing and matching line segments using binary + descriptors. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_MATLAB + bool "matlab" + help + Matlab Interface -- OpenCV Matlab Mex wrapper code generator + for certain opencv core modules. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_MCC + bool "mcc" + help + Macbeth Color Chart detector -- Find and return color patch + location in MacBeth color calibration charts. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_OPTFLOW + bool "optflow" + help + Optical Flow -- Algorithms for running and evaluating + deepflow, simpleflow, sparsetodenseflow and motion + templates (silhouette flow). + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_OVIS + bool "ovis" + help + OGRE 3D Visualiser -- allows you to render 3D data using + the OGRE 3D engine. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_PHASE_UNWRAPPING + bool "phase_unwrapping" + help + Quality-guided phase unwrapping. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_PLOT + bool "plot" + help + Plotting -- The plot module allows you to easily plot data + in 1D or 2D. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_QUALITY + bool "quality" + help + Image Quality Analysis (IQA) API. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_RAPID + bool "rapid" + help + Silhouette based 3D object tracking. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_REG + bool "reg" + help + Image Registration -- Pixels based image registration for + precise alignment. Follows the paper "Image Alignment and + Stitching: A Tutorial", by Richard Szeliski. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_RGBD + bool "rgbd" + help + RGB-Depth Processing module -- Linemod 3D object recognition; + Fast surface normals and 3D plane finding. 3D visual odometry. + 3d reconstruction using KinectFusion. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_SALIENCY + bool "saliency" + help + Saliency API -- Where humans would look in a scene. Has + routines for static, motion and "objectness" saliency. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_SFM + bool "sfm" + help + Structure from Motion -- This module contains algorithms + to perform 3d reconstruction from 2d images. The core of + the module is a light version of Libmv. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_SHAPE + bool "shape" + help + Shape Distance and Matching + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_STEREO + bool "stereo" + help + Stereo Correspondence -- Stereo matching done with different + descriptors: Census / CS-Census / MCT / BRIEF / MV and dense + stereo correspondence using Quasi Dense Stereo method. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_STRUCTURED_LIGHT + bool "structured_light" + help + Structured Light Use -- How to generate and project gray code + patterns and use them to find dense depth in a scene. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_SUPERRES + bool "superres" + help + Super Resolution + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_SURFACE_MATCHING + bool "surface_matching" + help + Point Pair Features -- Implements 3d object detection and + localization using multimodal point pair features. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_TEXT + bool "text" + help + Scene Text Detection and Recognition -- This module contains + algorithms to perform text detection, words segmentation and + text recognition in a visual scene. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_TRACKING + bool "tracking" + help + Vision Based Object Tracking -- Use and/or evaluate different + visual object tracking techniques. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_VIDEOSTAB + bool "videostab" + help + Video Stabilization + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_VIZ + bool "viz" + help + 3D Visualizer + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_WECHAT_QRCODE + bool "wechat_qrcode" + help + WeChat QR code detector for detecting and parsing QR code. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_XFEATURES2D + bool "xfeatures2d" + help + Features2D extra -- Extra 2D Features Framework containing + experimental and non-free 2D feature detector/descriptor + algorithms. SURF, BRIEF, Censure, Freak, LUCID, Daisy, + Self-similar. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_XIMGPROC + bool "ximgproc" + help + Extended Image Processing -- Structured Forests / Domain + Transform Filter / Guided Filter / Adaptive Manifold Filter + / Joint Bilateral Filter / Superpixels / Ridge Detection + Filter. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_XOBJDETECT + bool "xobjdetect" + help + Boosted 2D Object Detection -- Uses a Waldboost cascade and + local binary patterns computed as integral features for 2D + object detection. + +config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_XPHOTO + bool "xphoto" + help + Extra Computational Photography -- Additional photo processing + algorithms: Color balance / Denoising / Inpainting. + +endif diff --git a/package/opencv4-contrib/opencv4-contrib.hash b/package/opencv4-contrib/opencv4-contrib.hash new file mode 100644 index 00000000000..4f15162e507 --- /dev/null +++ b/package/opencv4-contrib/opencv4-contrib.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 1777d5fd2b59029cf537e5fd6f8aa68d707075822f90bde683fcde086f85f7a7 opencv4-contrib-4.6.0.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/opencv4-contrib/opencv4-contrib.mk b/package/opencv4-contrib/opencv4-contrib.mk new file mode 100644 index 00000000000..81c45c6e02c --- /dev/null +++ b/package/opencv4-contrib/opencv4-contrib.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# opencv4-contrib +# +################################################################################ + +OPENCV4_CONTRIB_VERSION = 4.6.0 +OPENCV4_CONTRIB_SITE = $(call github,opencv,opencv_contrib,$(OPENCV4_CONTRIB_VERSION)) +OPENCV4_CONTRIB_INSTALL_TARGET = FALSE +OPENCV4_CONTRIB_LICENSE = Apache-2.0 +OPENCV4_CONTRIB_LICENSE_FILES = LICENSE + +# Modules provided by opencv4-contrib are built as part of the opencv4 package, +# so opencv4-contrib only serves for downloading the source code. + +$(eval $(generic-package)) diff --git a/package/opencv4/Config.in b/package/opencv4/Config.in index 31c32385da1..286a7ebf9d9 100644 --- a/package/opencv4/Config.in +++ b/package/opencv4/Config.in @@ -30,6 +30,20 @@ config BR2_PACKAGE_OPENCV4_LIB_CALIB3D Include opencv_calib3d (camera calibration and 3d reconstruction) module into the OpenCV build. +config BR2_PACKAGE_OPENCV4_LIB_DNN + bool "dnn" + # dnn needs fenv.h which is not provided by uclibc + depends on !BR2_TOOLCHAIN_USES_UCLIBC + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS + 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" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_USES_UCLIBC + config BR2_PACKAGE_OPENCV4_LIB_FEATURES2D bool "features2d" select BR2_PACKAGE_OPENCV4_LIB_FLANN @@ -139,14 +153,21 @@ config BR2_PACKAGE_OPENCV4_LIB_ML 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 # opencv_core dependency is already enabled select BR2_PACKAGE_OPENCV4_LIB_CALIB3D + select BR2_PACKAGE_OPENCV4_LIB_DNN select BR2_PACKAGE_OPENCV4_LIB_IMGPROC select BR2_PACKAGE_OPENCV4_LIB_ML help Include opencv_objdetect (object detection) module into the OpenCV build. +comment "objdetect needs a glibc or musl toolchain" + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_USES_UCLIBC + config BR2_PACKAGE_OPENCV4_LIB_PHOTO bool "photo" select BR2_PACKAGE_OPENCV4_LIB_IMGPROC @@ -309,6 +330,20 @@ config BR2_PACKAGE_OPENCV4_WITH_PROTOBUF help Use shared protobuf from the target system. +config BR2_PACKAGE_OPENCV4_WITH_TBB + bool "tbb support" + depends on !BR2_TOOLCHAIN_USES_UCLIBC # tbb + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # tbb + select BR2_PACKAGE_TBB + help + Use shared tbb from the target system. + +comment "tbb needs a glibc or musl toolchain" + depends on BR2_TOOLCHAIN_USES_UCLIBC + +comment "tbb needs exception_ptr" + depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 + config BR2_PACKAGE_OPENCV4_WITH_TIFF bool "tiff support" select BR2_PACKAGE_TIFF diff --git a/package/opencv4/opencv4.hash b/package/opencv4/opencv4.hash index 6d43138be81..419b420917f 100644 --- a/package/opencv4/opencv4.hash +++ b/package/opencv4/opencv4.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a1cfdcf6619387ca9e232687504da996aaa9f7b5689986b8331ec02cb61d28ad opencv4-4.5.5.tar.gz +sha256 1ec1cba65f9f20fe5a41fda1586e01c70ea0c9a6d7b67c9e13edf0cfe2239277 opencv4-4.6.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/opencv4/opencv4.mk b/package/opencv4/opencv4.mk index e75f7144de1..a665793ad9b 100644 --- a/package/opencv4/opencv4.mk +++ b/package/opencv4/opencv4.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENCV4_VERSION = 4.5.5 +OPENCV4_VERSION = 4.6.0 OPENCV4_SITE = $(call github,opencv,opencv,$(OPENCV4_VERSION)) OPENCV4_INSTALL_STAGING = YES OPENCV4_LICENSE = Apache-2.0 @@ -82,16 +82,12 @@ OPENCV4_CONF_OPTS += \ # - viz: missing VTK dependency # - world: all-in-one module # -# * Contrib modules from [1] are disabled: -# - opencv_contrib package is not available in Buildroot; -# - OPENCV_EXTRA_MODULES_PATH is not set. -# -# [1] https://github.com/Itseez/opencv_contrib OPENCV4_CONF_OPTS += \ -DBUILD_opencv_androidcamera=OFF \ -DBUILD_opencv_apps=OFF \ -DBUILD_opencv_calib3d=$(if $(BR2_PACKAGE_OPENCV4_LIB_CALIB3D),ON,OFF) \ -DBUILD_opencv_core=ON \ + -DBUILD_opencv_dnn=$(if $(BR2_PACKAGE_OPENCV4_LIB_DNN),ON,OFF) \ -DBUILD_opencv_features2d=$(if $(BR2_PACKAGE_OPENCV4_LIB_FEATURES2D),ON,OFF) \ -DBUILD_opencv_flann=$(if $(BR2_PACKAGE_OPENCV4_LIB_FLANN),ON,OFF) \ -DBUILD_opencv_highgui=$(if $(BR2_PACKAGE_OPENCV4_LIB_HIGHGUI),ON,OFF) \ @@ -155,8 +151,7 @@ OPENCV4_CONF_OPTS += \ -DBUILD_WITH_DYNAMIC_IPP=OFF \ -DWITH_INTELPERC=OFF \ -DWITH_IPP=OFF \ - -DWITH_IPP_A=OFF \ - -DWITH_TBB=OFF + -DWITH_IPP_A=OFF # Smartek stuff OPENCV4_CONF_OPTS += -DWITH_GIGEAPI=OFF @@ -232,6 +227,63 @@ OPENCV4_CONF_OPTS += \ OPENCV4_DEPENDENCIES += host-pkgconf zlib +ifeq ($(BR2_PACKAGE_OPENCV4_CONTRIB),y) +# OPENCV4 depends on OPENCV4_CONTRIB, and not the other way around. +# The modules in OPENCV4_CONTRIB get built as part of the build +# process for OPENCV4, so the source needs to be unpacked already +OPENCV4_DEPENDENCIES += opencv4-contrib +OPENCV4_CONF_OPTS += \ + -DOPENCV_EXTRA_MODULES_PATH=$(OPENCV4_CONTRIB_DIR)/modules \ + -DBUILD_opencv_alphamat=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_ALPHAMAT),ON,OFF) \ + -DBUILD_opencv_aruco=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_ARUCO),ON,OFF) \ + -DBUILD_opencv_barcode=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_BARCODE),ON,OFF) \ + -DBUILD_opencv_bgsegm=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_BGSEGM),ON,OFF) \ + -DBUILD_opencv_bioinspired=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_BIOINSPIRED),ON,OFF) \ + -DBUILD_opencv_ccalib=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_CCALIB),ON,OFF) \ + -DBUILD_opencv_cnn_3dobj=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_CNN_3DOBJ),ON,OFF) \ + -DBUILD_opencv_cvv=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_CVV),ON,OFF) \ + -DBUILD_opencv_datasets=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_DATASETS),ON,OFF) \ + -DBUILD_opencv_dnn_objdetect=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_DNN_OBJDETECT),ON,OFF) \ + -DBUILD_opencv_dnn_superres=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_DNN_SUPERRES),ON,OFF) \ + -DBUILD_opencv_dnns_easily_fooled=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_DNNS_EASILY_FOOLED),ON,OFF) \ + -DBUILD_opencv_dpm=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_DPM),ON,OFF) \ + -DBUILD_opencv_face=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_FACE),ON,OFF) \ + -DBUILD_opencv_freetype=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_FREETYPE),ON,OFF) \ + -DBUILD_opencv_fuzzy=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_FUZZY),ON,OFF) \ + -DBUILD_opencv_hdf=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_HDF),ON,OFF) \ + -DBUILD_opencv_hfs=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_HFS),ON,OFF) \ + -DBUILD_opencv_img_hash=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_IMG_HASH),ON,OFF) \ + -DBUILD_opencv_intensity_transform=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_INTENSITY_TRANSFORM),ON,OFF) \ + -DBUILD_opencv_julia=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_JULIA),ON,OFF) \ + -DBUILD_opencv_line_descriptor=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_LINE_DESCRIPTOR),ON,OFF) \ + -DBUILD_opencv_matlab=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_MATLAB),ON,OFF) \ + -DBUILD_opencv_mcc=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_MCC),ON,OFF) \ + -DBUILD_opencv_optflow=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_OPTFLOW),ON,OFF) \ + -DBUILD_opencv_ovis=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_OVIS),ON,OFF) \ + -DBUILD_opencv_phase_unwrapping=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_PHASE_UNWRAPPING),ON,OFF) \ + -DBUILD_opencv_plot=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_PLOT),ON,OFF) \ + -DBUILD_opencv_quality=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_QUALITY),ON,OFF) \ + -DBUILD_opencv_rapid=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_RAPID),ON,OFF) \ + -DBUILD_opencv_reg=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_REG),ON,OFF) \ + -DBUILD_opencv_rgbd=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_RGBD),ON,OFF) \ + -DBUILD_opencv_saliency=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_SALIENCY),ON,OFF) \ + -DBUILD_opencv_sfm=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_SFM),ON,OFF) \ + -DBUILD_opencv_shape=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_SHAPE),ON,OFF) \ + -DBUILD_opencv_stereo=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_STEREO),ON,OFF) \ + -DBUILD_opencv_structured_light=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_STRUCTURED_LIGHT),ON,OFF) \ + -DBUILD_opencv_superres=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_SUPERRES),ON,OFF) \ + -DBUILD_opencv_surface_matching=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_SURFACE_MATCHING),ON,OFF) \ + -DBUILD_opencv_text=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_TEXT),ON,OFF) \ + -DBUILD_opencv_tracking=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_TRACKING),ON,OFF) \ + -DBUILD_opencv_videostab=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_VIDEOSTAB),ON,OFF) \ + -DBUILD_opencv_viz=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_VIZ),ON,OFF) \ + -DBUILD_opencv_wechat_qrcode=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_WECHAT_QRCODE),ON,OFF) \ + -DBUILD_opencv_xfeatures2d=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_XFEATURES2D),ON,OFF) \ + -DBUILD_opencv_ximgproc=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_XIMGPROC),ON,OFF) \ + -DBUILD_opencv_xobjdetect=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_XOBJDETECT),ON,OFF) \ + -DBUILD_opencv_xphoto=$(if $(BR2_PACKAGE_OPENCV4_CONTRIB_LIB_XPHOTO),ON,OFF) +endif + ifeq ($(BR2_PACKAGE_OPENCV4_JPEG2000_WITH_JASPER),y) OPENCV4_CONF_OPTS += -DWITH_JASPER=ON OPENCV4_DEPENDENCIES += jasper @@ -313,6 +365,13 @@ else OPENCV4_CONF_OPTS += -DWITH_QT=OFF endif +ifeq ($(BR2_PACKAGE_OPENCV4_WITH_TBB),y) +OPENCV4_CONF_OPTS += -DWITH_TBB=ON +OPENCV4_DEPENDENCIES += tbb +else +OPENCV4_CONF_OPTS += -DWITH_TBB=OFF +endif + ifeq ($(BR2_PACKAGE_OPENCV4_WITH_TIFF),y) OPENCV4_CONF_OPTS += -DWITH_TIFF=ON OPENCV4_DEPENDENCIES += tiff diff --git a/package/openipmi/0001-Avoid-searching-host-library-path.patch b/package/openipmi/0001-Avoid-searching-host-library-path.patch deleted file mode 100644 index 15b4510f675..00000000000 --- a/package/openipmi/0001-Avoid-searching-host-library-path.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Wed, 22 Jul 2015 07:04:33 +0300 -Subject: [PATCH] Avoid searching host library path - -The $(libdir) variable points to the location of the directory on the target -system, /usr/lib by default. When cross compiling this directory contains the -host libraries which may be different than target libraries. Don't use -$(libdir) in the library search path. - -Signed-off-by: Baruch Siach -Signed-off-by: Joel Stanley -[Fabrice: refresh patch for 2.0.32] -Signed-off-by: Fabrice Fontaine -[Upstream status: https://sourceforge.net/p/openipmi/patches/35] ---- - cmdlang/Makefile.am | 3 +-- - unix/Makefile.am | 6 ++---- - 2 files changed, 3 insertions(+), 6 deletions(-) - -diff --git a/cmdlang/Makefile.am b/cmdlang/Makefile.am -index 264ee12be79f..0b3843784656 100644 ---- a/cmdlang/Makefile.am -+++ b/cmdlang/Makefile.am -@@ -15,7 +15,7 @@ libOpenIPMIcmdlang_la_SOURCES = cmdlang.c cmd_domain.c cmd_entity.c cmd_mc.c \ - $(top_builddir)/utils/libOpenIPMIutils.la \ - $(top_builddir)/lib/libOpenIPMI.la - libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ -- -L$(libdir) -no-undefined -+ -no-undefined - - bin_PROGRAMS = openipmish - -diff --git a/unix/Makefile.am b/unix/Makefile.am -index 5128839dad13..bd0f897ba8d6 100644 ---- a/unix/Makefile.am -+++ b/unix/Makefile.am -@@ -10,12 +10,12 @@ lib_LTLIBRARIES = libOpenIPMIposix.la libOpenIPMIpthread.la - libOpenIPMIpthread_la_LIBADD = -lpthread $(GDBM_LIB) \ - $(top_builddir)/utils/libOpenIPMIutils.la $(RT_LIB) - libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ -- -L$(libdir) -no-undefined -+ -no-undefined - - libOpenIPMIposix_la_SOURCES = posix_os_hnd.c selector.c - libOpenIPMIposix_la_LIBADD = $(top_builddir)/utils/libOpenIPMIutils.la \ - $(GDBM_LIB) $(RT_LIB) - libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ -- -L$(libdir) -no-undefined -+ -no-undefined - - noinst_HEADERS = heap.h - diff --git a/package/openipmi/0002-configure.ac-add-without-execinfo-option.patch b/package/openipmi/0002-configure.ac-add-without-execinfo-option.patch deleted file mode 100644 index e1838a06f45..00000000000 --- a/package/openipmi/0002-configure.ac-add-without-execinfo-option.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 388033e3d0129510c3884333bc428cefeb75e0b8 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 3 Jan 2022 23:27:21 +0100 -Subject: [PATCH] configure.ac: add --without-execinfo option - -Add an option to allow the user to disable execinfo to avoid the -following build failure on musl with -https://github.com/mikroskeem/libexecinfo: - -/home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-musl/10.3.0/../../../../x86_64-buildroot-linux-musl/bin/ld: /home/buildroot/autobuild/instance-3/output-1/build/openipmi-2.0.28/utils/.libs/libOpenIPMIutils.so: undefined reference to `backtrace' - -Fixes: - - http://autobuild.buildroot.org/results/dcc33c5cca97d538231647a94212450f043974b3 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://sourceforge.net/p/openipmi/patches/36] ---- - configure.ac | 14 +++++++++++++- - 1 file changed, 13 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 607864b9..f369166f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -77,6 +77,16 @@ AC_ARG_WITH(poptlibs, - POPTLIBS="$withval" - ) - -+tryexecinfo=yes -+AC_ARG_WITH(execinfo, -+[ --with-execinfo[[=yes|no]] Look for execinfo.], -+ if test "x$withval" = "xyes"; then -+ tryexecinfo=yes -+ elif test "x$withval" = "xno"; then -+ tryexecinfo=no -+ fi, -+) -+ - # If UCD SNMP requires OpenSSL, this tells where to find the crypto lib - tryopenssl=yes - AC_ARG_WITH(openssl, -@@ -275,7 +285,9 @@ AM_PROG_CC_C_O - AC_PROG_LIBTOOL - AC_STDC_HEADERS - --AC_CHECK_HEADERS(execinfo.h) -+if test "x$tryexecinfo" != "xno"; then -+ AC_CHECK_HEADERS(execinfo.h) -+fi - AC_CHECK_HEADERS([netinet/ether.h]) - AC_CHECK_HEADERS([sys/ethernet.h]) - --- -2.34.1 - diff --git a/package/openipmi/openipmi.hash b/package/openipmi/openipmi.hash index eded076ade1..fc3cf1a5206 100644 --- a/package/openipmi/openipmi.hash +++ b/package/openipmi/openipmi.hash @@ -1,8 +1,8 @@ # From http://sourceforge.net/projects/openipmi/files/OpenIPMI%202.0%20Library/ -sha1 73d7dce4312b006983b11367e4a43d4ec52cf888 OpenIPMI-2.0.32.tar.gz -md5 532404c9df7d0e8bde975b95b9e6775b OpenIPMI-2.0.32.tar.gz +sha1 4387f227aad92756e296d1c9421e83231d355dbd OpenIPMI-2.0.33.tar.gz +md5 923d2914dbbc3307712f8c58401bab0f OpenIPMI-2.0.33.tar.gz # Locally computed -sha256 f6d0fd4c0a74b05f80907229d0b270f54ca23294bcc11979f8b8d12766786945 OpenIPMI-2.0.32.tar.gz +sha256 fb53e9ea5e2681cf8af7cda024b1a0044c675f84116ca27ae9616c8b7ad95b49 OpenIPMI-2.0.33.tar.gz sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING sha256 185323a62589e7ee80f86bf2ea29caad9a09fdda0ea3f1c00db8b778c7edf60e COPYING.BSD sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING.LIB diff --git a/package/openipmi/openipmi.mk b/package/openipmi/openipmi.mk index b3a4d90d4b1..ccf86f93cd6 100644 --- a/package/openipmi/openipmi.mk +++ b/package/openipmi/openipmi.mk @@ -4,18 +4,15 @@ # ################################################################################ -OPENIPMI_VERSION = 2.0.32 +OPENIPMI_VERSION = 2.0.33 OPENIPMI_SITE = https://sourceforge.net/projects/openipmi/files/OpenIPMI%202.0%20Library OPENIPMI_SOURCE = OpenIPMI-$(OPENIPMI_VERSION).tar.gz OPENIPMI_LICENSE = LGPL-2.0+, GPL-2.0+, BSD-3-Clause OPENIPMI_LICENSE_FILES = COPYING.LIB COPYING COPYING.BSD OPENIPMI_DEPENDENCIES = popt ncurses readline host-pkgconf OPENIPMI_INSTALL_STAGING = YES -# Patching Makefile.am -OPENIPMI_AUTORECONF = YES OPENIPMI_CONF_ENV = ac_cv_path_pkgprog="$(PKG_CONFIG_HOST_BINARY)" OPENIPMI_CONF_OPTS = \ - --with-execinfo=no \ --with-glib=no \ --with-tcl=no \ --with-perl=no \ @@ -26,6 +23,11 @@ ifeq ($(BR2_PACKAGE_GDBM),y) OPENIPMI_DEPENDENCIES += gdbm endif +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +OPENIPMI_DEPENDENCIES += libexecinfo +OPENIPMI_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -lexecinfo" +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) OPENIPMI_DEPENDENCIES += openssl OPENIPMI_CONF_OPTS += --with-openssl=yes diff --git a/package/openjdk-bin/openjdk-bin.hash b/package/openjdk-bin/openjdk-bin.hash index bbc939d4e88..401e83e75e5 100644 --- a/package/openjdk-bin/openjdk-bin.hash +++ b/package/openjdk-bin/openjdk-bin.hash @@ -1,8 +1,10 @@ # https://github.com/adoptium/temurin17-binaries/releases -sha256 6ea18c276dcbb8522feeebcfc3a4b5cb7c7e7368ba8590d3326c6c3efc5448b6 OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz +sha256 aa5fc7d388fe544e5d85902e68399d5299e931f9b280d358a3cbee218d6017b0 OpenJDK17U-jdk_x64_linux_hotspot_17.0.8_7.tar.gz +sha256 c43688163cfdcb1a6e6fe202cc06a51891df746b954c55dbd01430e7d7326d00 OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.8_7.tar.gz # From https://github.com/adoptium/temurin11-binaries/releases -sha256 3b1c0c34be4c894e64135a454f2d5aaa4bd10aea04ec2fa0c0efe6bb26528e30 OpenJDK11U-jdk_x64_linux_hotspot_11.0.13_8.tar.gz +sha256 7a99258af2e3ee9047e90f1c0c1775fd6285085759501295358d934d662e01f9 OpenJDK11U-jdk_x64_linux_hotspot_11.0.20_8.tar.gz +sha256 eb821c049c2d2f7c3fbf8ddcce2d608d3aa7d488700e76bfbbebabba93021748 OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.20_8.tar.gz # Locally calculated sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 legal/java.prefs/LICENSE diff --git a/package/openjdk-bin/openjdk-bin.mk b/package/openjdk-bin/openjdk-bin.mk index 266c93d3634..616c8d917d0 100644 --- a/package/openjdk-bin/openjdk-bin.mk +++ b/package/openjdk-bin/openjdk-bin.mk @@ -6,19 +6,27 @@ ifeq ($(BR2_PACKAGE_OPENJDK_VERSION_17),y) HOST_OPENJDK_BIN_VERSION_MAJOR = 17 -HOST_OPENJDK_BIN_VERSION_MINOR = 0.1_12 +HOST_OPENJDK_BIN_VERSION_MINOR = 0.8_7 else HOST_OPENJDK_BIN_VERSION_MAJOR = 11 -HOST_OPENJDK_BIN_VERSION_MINOR = 0.13_8 +HOST_OPENJDK_BIN_VERSION_MINOR = 0.20_8 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_SOURCE = OpenJDK$(HOST_OPENJDK_BIN_VERSION_MAJOR)U-jdk_x64_linux_hotspot_$(HOST_OPENJDK_BIN_VERSION).tar.gz +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)/usr/lib/jvm +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 diff --git a/package/openjdk/17.0.1+12/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch b/package/openjdk/17.0.8+7/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch similarity index 83% rename from package/openjdk/17.0.1+12/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch rename to package/openjdk/17.0.8+7/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch index 1ef523a4196..a8ea5aff65b 100644 --- a/package/openjdk/17.0.1+12/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch +++ b/package/openjdk/17.0.8+7/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch @@ -23,8 +23,8 @@ diff --git a/make/autoconf/libraries.m4 b/make/autoconf/libraries.m4 index 5120918aed2..f7a99955874 100644 --- a/make/autoconf/libraries.m4 +++ b/make/autoconf/libraries.m4 -@@ -122,6 +122,14 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES], - BASIC_JVM_LIBS="$BASIC_JVM_LIBS -lpthread" +@@ -146,6 +146,14 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES], + fi fi + # Libatomic library @@ -55,7 +55,7 @@ index c0f2446dbd7..dc416ece885 100644 arm*) VAR_CPU=arm VAR_CPU_ARCH=arm -@@ -478,6 +484,8 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS_HELPER], +@@ -563,6 +569,8 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS_HELPER], HOTSPOT_$1_CPU_DEFINE=PPC64 # The cpu defines below are for zero, we don't support them directly. @@ -68,7 +68,7 @@ diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.c index b08caf4d5d3..2bf084895ba 100644 --- a/src/hotspot/os/linux/os_linux.cpp +++ b/src/hotspot/os/linux/os_linux.cpp -@@ -1858,6 +1858,9 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { +@@ -1676,6 +1676,9 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { #ifndef EM_AARCH64 #define EM_AARCH64 183 /* ARM AARCH64 */ #endif @@ -78,7 +78,7 @@ index b08caf4d5d3..2bf084895ba 100644 #ifndef EM_RISCV #define EM_RISCV 243 /* RISC-V */ #endif -@@ -1879,6 +1882,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { +@@ -1700,6 +1703,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { {EM_SH, EM_SH, ELFCLASS32, ELFDATA2MSB, (char*)"SuperH BE"}, #endif {EM_ARM, EM_ARM, ELFCLASS32, ELFDATA2LSB, (char*)"ARM"}, @@ -86,7 +86,7 @@ index b08caf4d5d3..2bf084895ba 100644 // we only support 64 bit z architecture {EM_S390, EM_S390, ELFCLASS64, ELFDATA2MSB, (char*)"IBM System/390"}, {EM_ALPHA, EM_ALPHA, ELFCLASS64, ELFDATA2LSB, (char*)"Alpha"}, -@@ -1906,6 +1910,8 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { +@@ -1728,6 +1732,8 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { static Elf32_Half running_arch_code=EM_PPC; #elif (defined AARCH64) static Elf32_Half running_arch_code=EM_AARCH64; @@ -95,12 +95,12 @@ index b08caf4d5d3..2bf084895ba 100644 #elif (defined ARM) static Elf32_Half running_arch_code=EM_ARM; #elif (defined S390) -@@ -1926,7 +1932,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { - static Elf32_Half running_arch_code=EM_RISCV; +@@ -1750,7 +1756,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { + static Elf32_Half running_arch_code=EM_LOONGARCH; #else #error Method os::dll_load requires that one of following is defined:\ -- AARCH64, ALPHA, ARM, AMD64, IA32, IA64, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc -+ AARCH64, ALPHA, ARC, ARM, AMD64, IA32, IA64, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc +- AARCH64, ALPHA, ARM, AMD64, IA32, IA64, LOONGARCH, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc ++ AARCH64, ALPHA, ARC ARM, AMD64, IA32, IA64, LOONGARCH, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc #endif // Identify compatibility class for VM's architecture and library's architecture diff --git a/package/openjdk/Config.in b/package/openjdk/Config.in index 8b7fd4653e0..24a56e6b845 100644 --- a/package/openjdk/Config.in +++ b/package/openjdk/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_HOST_OPENJDK_BIN_ARCH_SUPPORTS bool default y if BR2_HOSTARCH = "x86_64" + default y if BR2_HOSTARCH = "aarch64" # Taken from make/autoconf/platform.m4 config BR2_PACKAGE_OPENJDK_ARCH_SUPPORTS @@ -56,6 +57,8 @@ if BR2_PACKAGE_OPENJDK choice prompt "openjdk version" + default BR2_PACKAGE_OPENJDK_VERSION_11 if BR2_OPENJDK_VERSION_LTS # legacy + default BR2_PACKAGE_OPENJDK_VERSION_17 if BR2_OPENJDK_VERSION_LATEST # legacy default BR2_PACKAGE_OPENJDK_VERSION_17 help Select the version of OpenJDK you wish to use. diff --git a/package/openjdk/openjdk.hash b/package/openjdk/openjdk.hash index 2f46b044ad7..ba398b84bec 100644 --- a/package/openjdk/openjdk.hash +++ b/package/openjdk/openjdk.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 8c076203a6f85ab916b3e54de1992bcbcc5ffe580c52b1ac8d52ca7afb9f02d1 openjdk-17.0.1+12.tar.gz -sha256 119c6233fe7ff5670c590e2f9d6686ac4d80c97b17065506998b75c547b54f2c openjdk-11.0.13+8.tar.gz +sha256 643ff42dcdf8751e0fee716c1a1914ddc7348b174e871a5eb2636578a181f20d openjdk-17.0.8+7.tar.gz +sha256 b2a37ef209ae7eaf8f34182b7c9aa3252af20a214d02970f96ce62242c805479 openjdk-11.0.20+8.tar.gz sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 LICENSE diff --git a/package/openjdk/openjdk.mk b/package/openjdk/openjdk.mk index 5fccdaa7acb..d1a2fa23ee1 100644 --- a/package/openjdk/openjdk.mk +++ b/package/openjdk/openjdk.mk @@ -6,10 +6,10 @@ ifeq ($(BR2_PACKAGE_OPENJDK_VERSION_17),y) OPENJDK_VERSION_MAJOR = 17 -OPENJDK_VERSION_MINOR = 0.1+12 +OPENJDK_VERSION_MINOR = 0.8+7 else OPENJDK_VERSION_MAJOR = 11 -OPENJDK_VERSION_MINOR = 0.13+8 +OPENJDK_VERSION_MINOR = 0.20+8 endif OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR).$(OPENJDK_VERSION_MINOR) OPENJDK_SITE = $(call github,openjdk,jdk$(OPENJDK_VERSION_MAJOR)u,jdk-$(OPENJDK_VERSION)) diff --git a/package/openjpeg/0001-thirdparty-tiff-append-flags-found-by-pkg-config-if-.patch b/package/openjpeg/0001-thirdparty-tiff-append-flags-found-by-pkg-config-if-.patch deleted file mode 100644 index bce790a4786..00000000000 --- a/package/openjpeg/0001-thirdparty-tiff-append-flags-found-by-pkg-config-if-.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 38f50c7d9ad3ba06b64583045665203afb53cbd9 Mon Sep 17 00:00:00 2001 -From: Samuel Martin -Date: Sun, 6 Nov 2016 16:29:08 +0100 -Subject: [PATCH] thirdparty: tiff: append flags found by pkg-config if - available - -This change allows to get all required CFLAGS/LDFLAGS in case of static only -build. - -This build issue [1] was triggered by the Buildroot farms. - -[1] http://autobuild.buildroot.net/results/d0d/d0d22727311d6300e0e400728126170407bfd699/build-end.log - -Signed-off-by: Samuel Martin ---- - thirdparty/CMakeLists.txt | 23 +++++++++++++++++++++-- - 1 file changed, 21 insertions(+), 2 deletions(-) - -diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt -index cb24b43b58e2..cd6a5e1391b0 100644 ---- a/thirdparty/CMakeLists.txt -+++ b/thirdparty/CMakeLists.txt -@@ -1,5 +1,9 @@ - # 3rd party libs - -+if(NOT BUILD_THIRDPARTY) -+ include(FindPkgConfig) -+endif(NOT BUILD_THIRDPARTY) -+ - #------------ - # Try to find lib Z - if(BUILD_THIRDPARTY) -@@ -36,6 +40,9 @@ if(BUILD_THIRDPARTY) - else(BUILD_THIRDPARTY) - if(ZLIB_FOUND) - find_package(PNG) -+ # Static only build: -+ # it is not necessary to invoke pkg_check_module on libpng, because libpng -+ # only depends on zlib, which is already checked. - if(PNG_FOUND) - message(STATUS "Your system seems to have a PNG lib available, we will use it") - set(OPJ_HAVE_PNG_H 1 PARENT_SCOPE) -@@ -66,12 +73,24 @@ if(BUILD_THIRDPARTY) - set(OPJ_HAVE_LIBTIFF 1 PARENT_SCOPE) - else(BUILD_THIRDPARTY) - find_package(TIFF) -+ # Static only build: -+ # it is necessary to invoke pkg_check_module on libtiff since it may have -+ # several other dependencies not declared by its cmake module, but they are -+ # in the its pkgconfig module. -+ if(PKG_CONFIG_FOUND) -+ foreach(pc_tiff_module tiff tiff3 tiff4 tiff-3 tiff-4 libtiff libtiff3 libtiff4 libtiff-3 libtiff-4) -+ pkg_check_modules(PC_TIFF QUIET ${pc_tiff_module}) -+ if(PC_TIFF_FOUND) -+ break() -+ endif(PC_TIFF_FOUND) -+ endforeach() -+ endif(PKG_CONFIG_FOUND) - if(TIFF_FOUND) - message(STATUS "Your system seems to have a TIFF lib available, we will use it") - set(OPJ_HAVE_TIFF_H 1 PARENT_SCOPE) - set(OPJ_HAVE_LIBTIFF 1 PARENT_SCOPE) -- set(TIFF_LIBNAME ${TIFF_LIBRARIES} PARENT_SCOPE) -- set(TIFF_INCLUDE_DIRNAME ${TIFF_INCLUDE_DIR} PARENT_SCOPE) -+ set(TIFF_LIBNAME ${TIFF_LIBRARIES} ${PC_TIFF_STATIC_LIBRARIES} PARENT_SCOPE) -+ set(TIFF_INCLUDE_DIRNAME ${TIFF_INCLUDE_DIR} ${PC_TIFF_STATIC_INCLUDE_DIRS} PARENT_SCOPE) - else(TIFF_FOUND) # not found - set(OPJ_HAVE_TIFF_H 0 PARENT_SCOPE) - set(OPJ_HAVE_LIBTIFF 0 PARENT_SCOPE) --- -2.10.2 - diff --git a/package/openjpeg/0002-thirdparty-lcms2-append-flags-found-by-pkg-config-if.patch b/package/openjpeg/0002-thirdparty-lcms2-append-flags-found-by-pkg-config-if.patch deleted file mode 100644 index 5697b82de2e..00000000000 --- a/package/openjpeg/0002-thirdparty-lcms2-append-flags-found-by-pkg-config-if.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 226daa77ea5a35da306f9af2548f3e2c9e79f577 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Fri, 11 Nov 2016 23:35:13 +0100 -Subject: [PATCH] thirdparty: lcms2: append flags found by pkg-config if - available - -This change allows to get all required CFLAGS/LDFLAGS in case of static only -build. - -Fixes a buildroot build failure (see [1], [2] and [3]). - -[1] http://autobuild.buildroot.net/results/5ce/5cee20afd8bef5268832cddcb3a5270746be7a57 -[2] http://lists.busybox.net/pipermail/buildroot/2016-November/177187.html -[3] http://lists.busybox.net/pipermail/buildroot/2016-November/177188.html - -Signed-off-by: Peter Seiderer ---- - thirdparty/CMakeLists.txt | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt -index cd6a5e1391b0..a3a8494d89b1 100644 ---- a/thirdparty/CMakeLists.txt -+++ b/thirdparty/CMakeLists.txt -@@ -113,12 +113,19 @@ if( BUILD_THIRDPARTY) - set(OPJ_HAVE_LIBLCMS2 1 PARENT_SCOPE) - else(BUILD_THIRDPARTY) - find_package(LCMS2) -+ # Static only build: -+ # it is necessary to invoke pkg_check_module on lcms2 since it may have -+ # several other dependencies not declared by its cmake module, but they are -+ # in the its pkgconfig module. -+ if(PKG_CONFIG_FOUND) -+ pkg_check_modules(PC_LCMS2 QUIET lcms2) -+ endif(PKG_CONFIG_FOUND) - if(LCMS2_FOUND) - message(STATUS "Your system seems to have a LCMS2 lib available, we will use it") - set(OPJ_HAVE_LCMS2_H 1 PARENT_SCOPE) - set(OPJ_HAVE_LIBLCMS2 1 PARENT_SCOPE) -- set(LCMS_LIBNAME ${LCMS2_LIBRARIES} PARENT_SCOPE) -- set(LCMS_INCLUDE_DIRNAME ${LCMS2_INCLUDE_DIRS} PARENT_SCOPE) -+ set(LCMS_LIBNAME ${LCMS2_LIBRARIES} ${PC_LCMS2_STATIC_LIBRARIES} PARENT_SCOPE) -+ set(LCMS_INCLUDE_DIRNAME ${LCMS2_INCLUDE_DIRS} ${PC_LCMS2_STATIC_INCLUDE_DIRS} PARENT_SCOPE) - else(LCMS2_FOUND) # not found lcms2 - # try to find LCMS - find_package(LCMS) --- -2.10.2 - diff --git a/package/openjpeg/0003-CMakeLists.txt-Don-t-require-a-C-compiler.patch b/package/openjpeg/0003-CMakeLists.txt-Don-t-require-a-C-compiler.patch deleted file mode 100644 index 13cceef1959..00000000000 --- a/package/openjpeg/0003-CMakeLists.txt-Don-t-require-a-C-compiler.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 786ddcd1475adc6193c59d53e0d8ed2c502f2b00 Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Sat, 23 Sep 2017 18:49:31 +0200 -Subject: [PATCH] CMakeLists.txt: Don't require a C++ compiler - -By default, CMake assumes that the project is using both C and C++. By -explicitly passing 'C' as argument of the project() macro, we tell CMake -that only C is used, which prevents CMake from erroring out if a C++ -compiler doesn't exist. - -Submitted upstream: -https://github.com/uclouvain/openjpeg/pull/1027 - -Signed-off-by: Peter Korsgaard ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ec42bc99..d80eb48b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -24,7 +24,7 @@ endif() - #string(TOLOWER ${OPENJPEG_NAMESPACE} OPENJPEG_LIBRARY_NAME) - set(OPENJPEG_LIBRARY_NAME openjp2) - --project(${OPENJPEG_NAMESPACE}) -+project(${OPENJPEG_NAMESPACE} C) - - # Do full dependency headers. - include_regular_expression("^.*$") --- -2.11.0 - diff --git a/package/openjpeg/0004-Revert-Use-INC_DIR-for-OPENJPEG_INCLUDE_DIRS-fixes-u.patch b/package/openjpeg/0004-Revert-Use-INC_DIR-for-OPENJPEG_INCLUDE_DIRS-fixes-u.patch deleted file mode 100644 index b85556a6790..00000000000 --- a/package/openjpeg/0004-Revert-Use-INC_DIR-for-OPENJPEG_INCLUDE_DIRS-fixes-u.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 14f4c27e7c91f745a1dda9991b5deea3cbef2072 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 7 Jan 2021 14:09:50 +0100 -Subject: [PATCH] Revert "Use INC_DIR for OPENJPEG_INCLUDE_DIRS (fixes - uclouvain#1174)" - -This reverts commit 65586374d639cfc0104419992f9022174b412594 which -breaks cross-compilation of poppler under buildroot (because of -DESTDIR usage). - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/uclouvain/openjpeg/pull/1321] ---- - cmake/OpenJPEGConfig.cmake.in | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/cmake/OpenJPEGConfig.cmake.in b/cmake/OpenJPEGConfig.cmake.in -index 8a726697..2925108a 100644 ---- a/cmake/OpenJPEGConfig.cmake.in -+++ b/cmake/OpenJPEGConfig.cmake.in -@@ -27,8 +27,12 @@ if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake) - # This is an install tree - include(${SELF_DIR}/OpenJPEGTargets.cmake) - -+ # We find a relative path from the PKG directory to header files. -+ set(PKG_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_PACKAGE_DIR@") - set(INC_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_INCLUDE_DIR@") -- get_filename_component(OPENJPEG_INCLUDE_DIRS "${INC_DIR}" ABSOLUTE) -+ file(RELATIVE_PATH PKG_TO_INC_RPATH "${PKG_DIR}" "${INC_DIR}") -+ -+ get_filename_component(OPENJPEG_INCLUDE_DIRS "${SELF_DIR}/${PKG_TO_INC_RPATH}" ABSOLUTE) - - else() - if(EXISTS ${SELF_DIR}/OpenJPEGExports.cmake) --- -2.29.2 - diff --git a/package/openjpeg/openjpeg.hash b/package/openjpeg/openjpeg.hash index 8798245256a..cfa0e01b7d7 100644 --- a/package/openjpeg/openjpeg.hash +++ b/package/openjpeg/openjpeg.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 8702ba68b442657f11aaeb2b338443ca8d5fb95b0d845757968a7be31ef7f16d openjpeg-2.4.0.tar.gz +sha256 0333806d6adecc6f7a91243b2b839ff4d2053823634d4f6ed7a59bc87409122a openjpeg-2.5.0.tar.gz sha256 a6af136f3e15038a666b61f376612a07d9a4e48cb7c01adbf3e33b3f14ab49b6 LICENSE diff --git a/package/openjpeg/openjpeg.mk b/package/openjpeg/openjpeg.mk index 7f2a2c439cd..5b03a6cf587 100644 --- a/package/openjpeg/openjpeg.mk +++ b/package/openjpeg/openjpeg.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENJPEG_VERSION = 2.4.0 +OPENJPEG_VERSION = 2.5.0 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 2d6c2fb9d33..7e33716f78b 100644 --- a/package/openlayers/openlayers.hash +++ b/package/openlayers/openlayers.hash @@ -1,2 +1,3 @@ # Locally computed: -sha256 aeb8107a23a99d79efb6031c7cf901307b63571c39fd744f771d4a707e06a14f v6.12.0-dist.zip +sha256 31b848cc55967c7de63fece8cd1699fc51152421d04653b859103c7391ad5bbe v7.2.2-package.zip +sha256 6c4347b83a8c9feef18d57b18e3b6c44cf901b3c344a4a1fbd837e421555ab8e LICENSE.md diff --git a/package/openlayers/openlayers.mk b/package/openlayers/openlayers.mk index 7532bb7f68b..852f5f1dcfd 100644 --- a/package/openlayers/openlayers.mk +++ b/package/openlayers/openlayers.mk @@ -4,21 +4,19 @@ # ################################################################################ -OPENLAYERS_VERSION = 6.12.0 -OPENLAYERS_SOURCE = v$(OPENLAYERS_VERSION)-dist.zip +OPENLAYERS_VERSION = 7.2.2 +OPENLAYERS_SOURCE = v$(OPENLAYERS_VERSION)-package.zip OPENLAYERS_SITE = https://github.com/openlayers/openlayers/releases/download/v$(OPENLAYERS_VERSION) OPENLAYERS_LICENSE = BSD-2-Clause -# There's no separate license file in the archive, only minified files. +OPENLAYERS_LICENSE_FILES = LICENSE.md define OPENLAYERS_EXTRACT_CMDS unzip $(OPENLAYERS_DL_DIR)/$(OPENLAYERS_SOURCE) -d $(@D) - mv $(@D)/v$(OPENLAYERS_VERSION)-dist/* $(@D) - rmdir $(@D)/v$(OPENLAYERS_VERSION)-dist/ endef define OPENLAYERS_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0644 $(@D)/ol.css $(TARGET_DIR)/var/www/ol.css - $(INSTALL) -D -m 0644 $(@D)/ol.js $(TARGET_DIR)/var/www/ol.js + $(INSTALL) -D -m 0644 $(@D)/dist/ol.js $(TARGET_DIR)/var/www/ol.js endef $(eval $(generic-package)) diff --git a/package/openmpi/openmpi.hash b/package/openmpi/openmpi.hash index 4e76951c8f4..a399adc7587 100644 --- a/package/openmpi/openmpi.hash +++ b/package/openmpi/openmpi.hash @@ -1,6 +1,6 @@ # From: https://www.open-mpi.org/software/ompi/v4.0/ -md5 e3da67df1e968c8798827e0e5fe9a510 openmpi-4.0.0.tar.bz2 -sha1 fee1d0287abfb150bae16957de342752c9bdd4e8 openmpi-4.0.0.tar.bz2 +md5 e3da67df1e968c8798827e0e5fe9a510 openmpi-4.0.0.tar.bz2 +sha1 fee1d0287abfb150bae16957de342752c9bdd4e8 openmpi-4.0.0.tar.bz2 # Locally computed -sha256 2f0b8a36cfeb7354b45dda3c5425ef8393c9b04115570b615213faaa3f97366b openmpi-4.0.0.tar.bz2 -sha256 8298a80ed5f09cfd007bae1c0e7d67d1c2810c6389876778dad070c31a691dac LICENSE +sha256 2f0b8a36cfeb7354b45dda3c5425ef8393c9b04115570b615213faaa3f97366b openmpi-4.0.0.tar.bz2 +sha256 8298a80ed5f09cfd007bae1c0e7d67d1c2810c6389876778dad070c31a691dac LICENSE diff --git a/package/openobex/openobex.hash b/package/openobex/openobex.hash index 1cdb09decb2..1a113c33792 100644 --- a/package/openobex/openobex.hash +++ b/package/openobex/openobex.hash @@ -1,6 +1,6 @@ # From http://sourceforge.net/projects/openobex/files/openobex/1.7.2/ -sha1 4a5098a62889134cbd2b54997e7ff3e959e601e6 openobex-1.7.2-Source.tar.gz -md5 f6e0b6cb7dcfd731460a7e9a91429a3a openobex-1.7.2-Source.tar.gz +sha1 4a5098a62889134cbd2b54997e7ff3e959e601e6 openobex-1.7.2-Source.tar.gz +md5 f6e0b6cb7dcfd731460a7e9a91429a3a openobex-1.7.2-Source.tar.gz # License files, locally calculated -sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING -sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING.LIB +sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING +sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING.LIB diff --git a/package/openobex/openobex.mk b/package/openobex/openobex.mk index bc4a47e3d74..7109bffa8d0 100644 --- a/package/openobex/openobex.mk +++ b/package/openobex/openobex.mk @@ -20,6 +20,7 @@ OPENOBEX_DEPENDENCIES += bluez5_utils endif ifeq ($(BR2_PACKAGE_LIBUSB),y) +OPENOBEX_CONF_OPTS += -DLibUSB_VERSION_1.0=ON OPENOBEX_DEPENDENCIES += libusb endif diff --git a/package/openocd/0002-configure.ac-fix-autoreconf-with-autoconf-2.70.patch b/package/openocd/0002-configure.ac-fix-autoreconf-with-autoconf-2.70.patch deleted file mode 100644 index ecb716b6fa0..00000000000 --- a/package/openocd/0002-configure.ac-fix-autoreconf-with-autoconf-2.70.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 3106d16bbc45de52bc0a8b638a84aa9d7c9abc46 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 6 Oct 2021 17:43:16 +0200 -Subject: [PATCH] configure.ac: fix autoreconf with autoconf >= 2.70 - -Fix the following build failure raised with openocd and autoconf >= 2.70 -due to -http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commit;h=aba75f6d4a9c875a9d5d90a07c6b3678db66a4bf: - ->>> openocd 0.11.0 Autoreconfiguring -autoreconf: error: configure.ac: AC_INIT not found; not an autoconf script? - -Fixes: - - http://autobuild.buildroot.org/results/5fb7aa28703aff61ba850eac11bd35c8804528ae - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/msteveb/jimtcl/pull/209] ---- - configure.ac | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/jimtcl/configure.ac b/jimtcl/configure.ac -index b70b5d8..8c45114 100644 ---- a/jimtcl/configure.ac -+++ b/jimtcl/configure.ac -@@ -1 +1,3 @@ - # Dummy configure.ac to make automake happy -+AC_INIT([jimtcl], [0.80]) -+AC_OUTPUT --- -2.33.0 - diff --git a/package/openocd/Config.in b/package/openocd/Config.in index b14f940b278..cef109b5116 100644 --- a/package/openocd/Config.in +++ b/package/openocd/Config.in @@ -190,13 +190,17 @@ config BR2_PACKAGE_OPENOCD_AT91RM help Enable building support for AT91RM9200 based SBCs +endif # BR2_arm + +if BR2_arm || BR2_aarch64 + config BR2_PACKAGE_OPENOCD_BCM2835 bool "bitbanging on BCM2835" help Enable building support for bitbanging on BCM2835 (as found in Raspberry Pi) -endif # BR2_arm +endif # BR2_arm || BR2_aarch64 config BR2_PACKAGE_OPENOCD_GW16012 bool "Gateworks GW16012 JTAG Programmer" diff --git a/package/openocd/openocd.hash b/package/openocd/openocd.hash index 91eb56d930e..938711d86c0 100644 --- a/package/openocd/openocd.hash +++ b/package/openocd/openocd.hash @@ -1,3 +1,15 @@ -# From http://sourceforge.net/projects/openocd/files/openocd/0.11.0/ -sha256 43a3ce734aff1d3706ad87793a9f3a5371cb0e357f0ffd0a151656b06b3d1e7d openocd-0.11.0.tar.bz2 -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +# From http://sourceforge.net/projects/openocd/files/openocd/0.12.0/ +sha256 af254788be98861f2bd9103fe6e60a774ec96a8c374744eef9197f6043075afa openocd-0.12.0.tar.bz2 +sha256 1b8f7e37ee5afbbf95c2a4d62b12b25232e29538692663b434318503a9a88419 COPYING +sha256 034da732b4f3079b8783fff756613c1cff89dec5ac80c5cdd90532b7539922a1 LICENSES/exceptions/eCos-exception-2.0 +sha256 0a37155eb8bc0cb94477a0cae4f030e39da9317374e8a9f597e9229fd09aff78 LICENSES/license-rules.txt +sha256 f3ba76203a7b6993db31f987559cc4c621ae1ff78119ced2a669756c2c5fd3b1 LICENSES/preferred/BSD-1-Clause +sha256 6313108c23efffa36948f8b2cff1560a5935373b527b0e1a837cc77e6ed1bacd LICENSES/preferred/BSD-2-Clause +sha256 1483f15e9fddc73b5df0acab1c42d21ecd0bf6ade8a79179fb90c09f13d03dcd LICENSES/preferred/BSD-2-Clause-Views +sha256 7a83b1aeb460458db9a4bd521d7f237c45b1650f6e60ea5ffc71e49472454de3 LICENSES/preferred/BSD-3-Clause +sha256 5cf024f6e3611d5c6fb98748d1a0ad99b8cf9ffe46f2d60fa10c299cd29e0a75 LICENSES/preferred/BSD-Source-Code +sha256 f35396f4095619f986736ca5e2976b313d381463a35c921c9ae677cc7eb83e28 LICENSES/preferred/GFDL-1.2 +sha256 76515be2d7334a1a038f775238c9a4c2b37e19514248e5eea0434cdfee526f9d LICENSES/preferred/gfdl-1.2.texi.readme +sha256 7d35bc44da7bb763022e3c2c32cfc0125dd222060bc50992420599d8e65f6c0a LICENSES/preferred/GPL-2.0 +sha256 323c587d0ccf10e376f8bf9a7f31fb4ca6078105194b42e0b1e0ee2bc9bde71f LICENSES/preferred/MIT +sha256 9a41b56594cd89743ca72f188318c9871661847074dd16497ae0c695fe3ab9c9 LICENSES/stand-alone/GPL-3.0 diff --git a/package/openocd/openocd.mk b/package/openocd/openocd.mk index 9f53ae3ee39..78c6e10c58e 100644 --- a/package/openocd/openocd.mk +++ b/package/openocd/openocd.mk @@ -4,12 +4,36 @@ # ################################################################################ -OPENOCD_VERSION = 0.11.0 +OPENOCD_VERSION = 0.12.0 OPENOCD_SOURCE = openocd-$(OPENOCD_VERSION).tar.bz2 OPENOCD_SITE = http://sourceforge.net/projects/openocd/files/openocd/$(OPENOCD_VERSION) -OPENOCD_LICENSE = GPL-2.0+ -OPENOCD_LICENSE_FILES = COPYING -# 0002-configure-enable-build-on-uclinux.patch patches configure.ac +OPENOCD_LICENSE = \ + BSD-1-clause, \ + BSD-2-clause, \ + BSD-2-Clause-Views, \ + BSD-3-clause, \ + BSD-Source-Code, \ + GFDL-1.2-no-invariants-or-later (docs), \ + GPL-2.0+ with eCos-exception-2.0 (code), \ + GPL-3.0+ (stand-alone code), \ + MIT + +OPENOCD_LICENSE_FILES = \ + COPYING \ + LICENSES/license-rules.txt \ + LICENSES/exceptions/eCos-exception-2.0 \ + LICENSES/preferred/BSD-1-Clause \ + LICENSES/preferred/BSD-2-Clause \ + LICENSES/preferred/BSD-2-Clause-Views \ + LICENSES/preferred/BSD-3-Clause \ + LICENSES/preferred/BSD-Source-Code \ + LICENSES/preferred/GFDL-1.2 \ + LICENSES/preferred/gfdl-1.2.texi.readme \ + LICENSES/preferred/GPL-2.0 \ + LICENSES/preferred/MIT \ + LICENSES/stand-alone/GPL-3.0 + +# 0001-configure-enable-build-on-uclinux.patch patches configure.ac OPENOCD_AUTORECONF = YES OPENOCD_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -std=gnu99" @@ -56,8 +80,6 @@ OPENOCD_CONF_OPTS += \ $(if $(BR2_PACKAGE_OPENOCD_VPI),--enable-jtag_vpi,--disable-jtag_vpi) \ $(if $(BR2_PACKAGE_OPENOCD_UBLASTER),--enable-usb-blaster,--disable-usb-blaster) \ $(if $(BR2_PACKAGE_OPENOCD_AMTJT),--enable-amtjtagaccel,--disable-amjtagaccel) \ - $(if $(BR2_PACKAGE_OPENOCD_ZY1000_MASTER),--enable-zy1000-master,--disable-zy1000-master) \ - $(if $(BR2_PACKAGE_OPENOCD_ZY1000),--enable-zy1000,--disable-zy1000) \ $(if $(BR2_PACKAGE_OPENOCD_EP93XX),--enable-ep93xx,--disable-ep93xx) \ $(if $(BR2_PACKAGE_OPENOCD_AT91RM),--enable-at91rm9200,--disable-at91rm9200) \ $(if $(BR2_PACKAGE_OPENOCD_BCM2835),--enable-bcm2835gpio,--disable-bcm2835gpio) \ diff --git a/package/openpgm/0003-fix-build-on-macOS-ARM.patch b/package/openpgm/0003-fix-build-on-macOS-ARM.patch new file mode 100644 index 00000000000..5769c5d7f16 --- /dev/null +++ b/package/openpgm/0003-fix-build-on-macOS-ARM.patch @@ -0,0 +1,34 @@ +From 43dfc3e3a66b8e4584eb46219b129197a2428181 Mon Sep 17 00:00:00 2001 +From: Michael Cho +Date: Thu, 10 Mar 2022 22:46:29 -0800 +Subject: [PATCH] fix build on macOS ARM + +[alexander.lukichev@gmail.com: backport from upstream] +Signed-off-by: Alexander Lukichev +--- + openpgm/pgm/cpu.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/openpgm/pgm/cpu.c b/openpgm/pgm/cpu.c +index cbcc988..f5da471 100644 +--- a/openpgm/pgm/cpu.c ++++ b/openpgm/pgm/cpu.c +@@ -33,6 +33,7 @@ + //#define CPU_DEBUG + + ++#if defined(__i386__) || defined(__x86_64__) + #ifndef _MSC_VER + static + void +@@ -59,7 +60,6 @@ _xgetbv(uint32_t xcr) { + #endif + + +-#if defined(__i386__) || defined(__x86_64__) + PGM_GNUC_INTERNAL + void + pgm_cpuid (pgm_cpu_t* cpu) +-- +2.37.2 + diff --git a/package/openpowerlink/Config.in b/package/openpowerlink/Config.in index 1a3dd62acdf..ef59a04bafe 100644 --- a/package/openpowerlink/Config.in +++ b/package/openpowerlink/Config.in @@ -38,6 +38,8 @@ endchoice choice prompt "stack type" + default BR2_PACKAGE_OPENPOWERLINK_STACK_KERNEL_STACK_LIB if BR2_PACKAGE_OPENPOWERLINK_KERNEL_MODULE # legacy + default BR2_PACKAGE_OPENPOWERLINK_STACK_USERSPACE_DAEMON_LIB if BR2_PACKAGE_OPENPOWERLINK_LIBPCAP # legacy config BR2_PACKAGE_OPENPOWERLINK_STACK_MONOLITHIC_USER_STACK_LIB bool "linked into application" diff --git a/package/openpowerlink/openpowerlink.hash b/package/openpowerlink/openpowerlink.hash index cd00f902fbe..2d8683f09c4 100644 --- a/package/openpowerlink/openpowerlink.hash +++ b/package/openpowerlink/openpowerlink.hash @@ -1,6 +1,6 @@ # From https://sourceforge.net/projects/openpowerlink/files/openPOWERLINK/V2.7.1/ -md5 04524d1b1f9946176dce0ccb0eecf537 openPOWERLINK_V2.7.1.tar.gz -sha1 4ee9c6e26bbc729fdbbb272155b093ffa0d9cefd openPOWERLINK_V2.7.1.tar.gz +md5 04524d1b1f9946176dce0ccb0eecf537 openPOWERLINK_V2.7.1.tar.gz +sha1 4ee9c6e26bbc729fdbbb272155b093ffa0d9cefd openPOWERLINK_V2.7.1.tar.gz # sha256 locally computed sha256 d0d65f4fb8f2ad209cf9575714f88f33168a1cf71e8f1801e1e1ac4df6a37ffd openPOWERLINK_V2.7.1.tar.gz sha256 348e31e9e5094104463d58d33abd31049fdf209afbc12ea7abb7fd4b4a147429 license.md diff --git a/package/opensc/0001-Fix-maybe-uninitialized-errors.patch b/package/opensc/0001-Fix-maybe-uninitialized-errors.patch new file mode 100644 index 00000000000..671d92c150d --- /dev/null +++ b/package/opensc/0001-Fix-maybe-uninitialized-errors.patch @@ -0,0 +1,82 @@ +From bcb39d6f4d2dee6beb035cb2f3618174ec1cb2b0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jos=C3=A9=20Pekkarinen?= +Date: Fri, 10 Dec 2021 13:54:26 +0200 +Subject: [PATCH] Fix maybe uninitialized errors +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: José Pekkarinen +Upstream: https://github.com/OpenSC/OpenSC/commit/05ec8c7fe785a2b9aeaac1164adb349df42b7f80 +--- + src/libopensc/pkcs15-coolkey.c | 12 ++++++------ + src/pkcs15init/pkcs15-asepcos.c | 2 +- + src/tools/opensc-explorer.c | 2 +- + 3 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/src/libopensc/pkcs15-coolkey.c b/src/libopensc/pkcs15-coolkey.c +index 586475dd..15684cef 100644 +--- a/src/libopensc/pkcs15-coolkey.c ++++ b/src/libopensc/pkcs15-coolkey.c +@@ -147,9 +147,9 @@ coolkey_find_matching_cert(sc_card_t *card, sc_cardctl_coolkey_object_t *in_obj, + static int + coolkey_get_attribute_ulong(sc_card_t *card, sc_cardctl_coolkey_object_t *obj, CK_ATTRIBUTE_TYPE type, CK_ULONG *value) + { +- const u8 *val; +- size_t val_len; +- u8 data_type; ++ const u8 *val = NULL; ++ size_t val_len = 0; ++ u8 data_type = 0; + int r; + + r = coolkey_get_attribute(card, obj, type, &val, &val_len, &data_type); +@@ -168,8 +168,8 @@ static int + coolkey_get_attribute_boolean(sc_card_t *card, sc_cardctl_coolkey_object_t *obj, CK_ATTRIBUTE_TYPE attr_type) + { + int r; +- const u8 *val; +- size_t val_len; ++ const u8 *val = NULL; ++ size_t val_len = 0; + + r = coolkey_get_attribute(card, obj, attr_type, &val, &val_len, NULL); + if (r < 0) { +@@ -186,7 +186,7 @@ static int + coolkey_get_attribute_bytes(sc_card_t *card, sc_cardctl_coolkey_object_t *obj, CK_ATTRIBUTE_TYPE type, u8 *data, size_t *data_len, size_t max_data_len) + { + const u8 *val; +- size_t val_len; ++ size_t val_len = 0; + int r; + + r = coolkey_get_attribute(card, obj, type, &val, &val_len, NULL); +diff --git a/src/pkcs15init/pkcs15-asepcos.c b/src/pkcs15init/pkcs15-asepcos.c +index d7122012..bc0efb5c 100644 +--- a/src/pkcs15init/pkcs15-asepcos.c ++++ b/src/pkcs15init/pkcs15-asepcos.c +@@ -221,7 +221,7 @@ static int asepcos_do_store_pin(sc_profile_t *profile, sc_card_t *card, + { + sc_file_t *nfile = NULL; + u8 buf[64], sbuf[64], *p = buf, *q = sbuf; +- int r, akn; ++ int r, akn = 0; + + if (auth_info->auth_type != SC_PKCS15_PIN_AUTH_TYPE_PIN) + return SC_ERROR_OBJECT_NOT_VALID; +diff --git a/src/tools/opensc-explorer.c b/src/tools/opensc-explorer.c +index 9ec4daa1..04efdf8f 100644 +--- a/src/tools/opensc-explorer.c ++++ b/src/tools/opensc-explorer.c +@@ -2472,7 +2472,7 @@ int main(int argc, char *argv[]) + char *line; + int cargc; + char *cargv[260]; +- int multiple; ++ int multiple = 0; + struct command *cmd; + char prompt[3*SC_MAX_PATH_STRING_SIZE]; + +-- +2.25.1 + diff --git a/package/opensc/0002-added-compatibility-with-LibreSSL.patch b/package/opensc/0002-added-compatibility-with-LibreSSL.patch new file mode 100644 index 00000000000..86a17448f85 --- /dev/null +++ b/package/opensc/0002-added-compatibility-with-LibreSSL.patch @@ -0,0 +1,173 @@ +From 302ad70471efa279b033d4d5511d979ec5d965fe Mon Sep 17 00:00:00 2001 +From: Frank Morgner +Date: Thu, 20 Jan 2022 17:01:46 +0100 +Subject: [PATCH] added compatibility with LibreSSL + +[Retrieved (and backported) from: +https://github.com/OpenSC/OpenSC/commit/302ad70471efa279b033d4d5511d979ec5d965fe] +Signed-off-by: Fabrice Fontaine +--- + src/libopensc/sc-ossl-compat.h | 7 +++++++ + src/tests/p11test/p11test_case_common.c | 14 ++++++++++++++ + src/tests/p11test/p11test_case_ec_derive.c | 4 ++++ + src/tests/p11test/p11test_case_readonly.c | 9 +++++++-- + 4 files changed, 32 insertions(+), 2 deletions(-) + +diff --git a/src/libopensc/sc-ossl-compat.h b/src/libopensc/sc-ossl-compat.h +index f885f85bb9..ec694ad48d 100644 +--- a/src/libopensc/sc-ossl-compat.h ++++ b/src/libopensc/sc-ossl-compat.h +@@ -105,6 +105,13 @@ extern "C" { + /* workaround unused value warning for a macro that does nothing */ + #if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L + #define OPENSSL_malloc_init() ++#define FIPS_mode() (0) ++#define EVP_sha3_224() (NULL) ++#define EVP_sha3_256() (NULL) ++#define EVP_sha3_384() (NULL) ++#define EVP_sha3_512() (NULL) ++#define EVP_PKEY_new_raw_public_key(t, e, p, l) (NULL) ++#define EVP_PKEY_get_raw_public_key(p, pu, l) (0) + #endif + + #if OPENSSL_VERSION_NUMBER >= 0x30000000L +diff --git a/src/tests/p11test/p11test_case_common.c b/src/tests/p11test/p11test_case_common.c +index e432f8f4ed..f091dbcc10 100644 +--- a/src/tests/p11test/p11test_case_common.c ++++ b/src/tests/p11test/p11test_case_common.c +@@ -164,6 +164,7 @@ add_supported_mechs(test_cert_t *o) + o->mechs[0].result_flags = 0; + o->mechs[0].usage_flags = CKF_SIGN | CKF_VERIFY; + } ++#ifdef EVP_PKEY_ED25519 + } else if (o->type == EVP_PKEY_ED25519) { + if (token.num_ed_mechs > 0 ) { + o->num_mechs = token.num_ed_mechs; +@@ -184,6 +185,8 @@ add_supported_mechs(test_cert_t *o) + o->mechs[0].result_flags = 0; + o->mechs[0].usage_flags = CKF_SIGN | CKF_VERIFY; + } ++#endif ++#ifdef EVP_PKEY_X25519 + } else if (o->type == EVP_PKEY_X25519) { + if (token.num_montgomery_mechs > 0 ) { + o->num_mechs = token.num_montgomery_mechs; +@@ -204,6 +207,7 @@ add_supported_mechs(test_cert_t *o) + o->mechs[0].result_flags = 0; + o->mechs[0].usage_flags = CKF_DERIVE; + } ++#endif + } + } + +@@ -601,6 +605,7 @@ int callback_public_keys(test_certs_t *objects, + a = template[6].pValue; + if (d2i_ASN1_PRINTABLESTRING(&curve, &a, (long)template[6].ulValueLen) != NULL) { + switch (o->key_type) { ++#ifdef EVP_PKEY_ED25519 + case CKK_EC_EDWARDS: + if (strcmp((char *)curve->data, "edwards25519")) { + debug_print(" [WARN %s ] Unknown curve name. " +@@ -608,6 +613,8 @@ int callback_public_keys(test_certs_t *objects, + } + evp_type = EVP_PKEY_ED25519; + break; ++#endif ++#ifdef EVP_PKEY_X25519 + case CKK_EC_MONTGOMERY: + if (strcmp((char *)curve->data, "curve25519")) { + debug_print(" [WARN %s ] Unknown curve name. " +@@ -615,16 +622,20 @@ int callback_public_keys(test_certs_t *objects, + } + evp_type = EVP_PKEY_X25519; + break; ++#endif + default: + debug_print(" [WARN %s ] Unknown key type %lu", o->id_str, o->key_type); + return -1; + } + ASN1_PRINTABLESTRING_free(curve); + } else if (d2i_ASN1_OBJECT(&obj, &a, (long)template[6].ulValueLen) != NULL) { ++#if defined(EVP_PKEY_ED25519) || defined (EVP_PKEY_X25519) + int nid = OBJ_obj2nid(obj); ++#endif + ASN1_OBJECT_free(obj); + + switch (o->key_type) { ++#ifdef EVP_PKEY_ED25519 + case CKK_EC_EDWARDS: + if (nid != NID_ED25519) { + debug_print(" [WARN %s ] Unknown OID. " +@@ -632,6 +643,8 @@ int callback_public_keys(test_certs_t *objects, + } + evp_type = EVP_PKEY_ED25519; + break; ++#endif ++#ifdef EVP_PKEY_X25519 + case CKK_EC_MONTGOMERY: + if (nid != NID_X25519) { + debug_print(" [WARN %s ] Unknown OID. " +@@ -639,6 +652,7 @@ int callback_public_keys(test_certs_t *objects, + } + evp_type = EVP_PKEY_X25519; + break; ++#endif + default: + debug_print(" [WARN %s ] Unknown key type %lu", o->id_str, o->key_type); + return -1; +diff --git a/src/tests/p11test/p11test_case_ec_derive.c b/src/tests/p11test/p11test_case_ec_derive.c +index 9f13b3e9d6..f7a5f92f9e 100644 +--- a/src/tests/p11test/p11test_case_ec_derive.c ++++ b/src/tests/p11test/p11test_case_ec_derive.c +@@ -89,6 +89,7 @@ pkcs11_derive(test_cert_t *o, token_info_t * info, + + int test_derive_x25519(test_cert_t *o, token_info_t *info, test_mech_t *mech) + { ++#ifdef EVP_PKEY_X25519 + unsigned char *secret = NULL, *pkcs11_secret = NULL; + EVP_PKEY_CTX *pctx = NULL; + EVP_PKEY *pkey = NULL; /* This is peer key */ +@@ -210,6 +211,9 @@ int test_derive_x25519(test_cert_t *o, token_info_t *info, test_mech_t *mech) + free(secret); + free(pkcs11_secret); + return 1; ++#else ++ return 0; ++#endif + } + + int test_derive(test_cert_t *o, token_info_t *info, test_mech_t *mech) +diff --git a/src/tests/p11test/p11test_case_readonly.c b/src/tests/p11test/p11test_case_readonly.c +index 624bd6a54d..2aefdc7a70 100644 +--- a/src/tests/p11test/p11test_case_readonly.c ++++ b/src/tests/p11test/p11test_case_readonly.c +@@ -522,6 +522,7 @@ int verify_message_openssl(test_cert_t *o, token_info_t *info, CK_BYTE *message, + rv, ERR_error_string(ERR_peek_last_error(), NULL)); + return -1; + } ++#ifdef EVP_PKEY_ED25519 + } else if (o->type == EVP_PKEY_ED25519) { + /* need to be created even though we do not do any MD */ + EVP_MD_CTX *ctx = EVP_MD_CTX_create(); +@@ -547,7 +548,7 @@ int verify_message_openssl(test_cert_t *o, token_info_t *info, CK_BYTE *message, + EVP_MD_CTX_free(ctx); + return -1; + } +- ++#endif + } else { + fprintf(stderr, " [ KEY %s ] Unknown type. Not verifying\n", o->id_str); + } +@@ -641,7 +642,11 @@ int sign_verify_test(test_cert_t *o, token_info_t *info, test_mech_t *mech, + return 0; + } + +- if (o->type != EVP_PK_EC && o->type != EVP_PK_RSA && o->type != EVP_PKEY_ED25519) { ++ if (o->type != EVP_PK_EC && o->type != EVP_PK_RSA ++#ifdef EVP_PKEY_ED25519 ++ && o->type != EVP_PKEY_ED25519 ++#endif ++ ) { + debug_print(" [SKIP %s ] Skip non-RSA and non-EC key", o->id_str); + return 0; + } diff --git a/package/opensc/0003-Fix-build-with-libressl-3.5.0.patch b/package/opensc/0003-Fix-build-with-libressl-3.5.0.patch new file mode 100644 index 00000000000..1d262362d66 --- /dev/null +++ b/package/opensc/0003-Fix-build-with-libressl-3.5.0.patch @@ -0,0 +1,47 @@ +From d13059d1ec2bbb8fe7068db0d66d521daa4b71ce Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 13 Aug 2022 14:27:22 +0200 +Subject: [PATCH] Fix build with libressl >= 3.5.0 + +libressl added back FIPS_mode since version 3.5.0 and +https://github.com/libressl-portable/openbsd/commit/a97eabc90d7647e374c1c6da686aeec63c49ff14 + +libressl provides X509_get_extension_flags since version 3.5.0 and +https://github.com/libressl-portable/openbsd/commit/3180723224c1b2c7856a110b8213e4966995d7e0 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/OpenSC/OpenSC/pull/2593 & + https://github.com/OpenSC/OpenSC/pull/2595 (merged)] +--- + src/libopensc/sc-ossl-compat.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/libopensc/sc-ossl-compat.h b/src/libopensc/sc-ossl-compat.h +index f0d55279..2c42794c 100644 +--- a/src/libopensc/sc-ossl-compat.h ++++ b/src/libopensc/sc-ossl-compat.h +@@ -86,9 +86,11 @@ extern "C" { + #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + #define RSA_PKCS1_OpenSSL RSA_PKCS1_SSLeay + ++#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L + #define X509_get_extension_flags(x) (x->ex_flags) + #define X509_get_key_usage(x) (x->ex_kusage) + #define X509_get_extended_key_usage(x) (x->ex_xkusage) ++#endif + #if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x2050300fL + #define X509_up_ref(cert) CRYPTO_add(&cert->references, 1, CRYPTO_LOCK_X509) + #endif +@@ -104,7 +106,9 @@ extern "C" { + /* workaround unused value warning for a macro that does nothing */ + #if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L + #define OPENSSL_malloc_init() ++#if LIBRESSL_VERSION_NUMBER < 0x30500000L + #define FIPS_mode() (0) ++#endif + #define EVP_sha3_224() (NULL) + #define EVP_sha3_256() (NULL) + #define EVP_sha3_384() (NULL) +-- +2.35.1 + diff --git a/package/opensc/0004-pkcs15init-correct-left-length-calculation-to-fix-buffer-overrun-bug.patch b/package/opensc/0004-pkcs15init-correct-left-length-calculation-to-fix-buffer-overrun-bug.patch new file mode 100644 index 00000000000..079f960b59a --- /dev/null +++ b/package/opensc/0004-pkcs15init-correct-left-length-calculation-to-fix-buffer-overrun-bug.patch @@ -0,0 +1,51 @@ +From 81944d1529202bd28359bede57c0a15deb65ba8a Mon Sep 17 00:00:00 2001 +From: fullwaywang +Date: Mon, 29 May 2023 10:38:48 +0800 +Subject: [PATCH] pkcs15init: correct left length calculation to fix buffer + overrun bug. Fixes #2785 + +Upstream: https://github.com/OpenSC/OpenSC/commit/81944d1529202bd28359bede57c0a15deb65ba8a +Signed-off-by: Fabrice Fontaine +--- + src/pkcs15init/pkcs15-cardos.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/pkcs15init/pkcs15-cardos.c b/src/pkcs15init/pkcs15-cardos.c +index 9715cf390f..f41f73c349 100644 +--- a/src/pkcs15init/pkcs15-cardos.c ++++ b/src/pkcs15init/pkcs15-cardos.c +@@ -872,7 +872,7 @@ static int cardos_have_verifyrc_package(sc_card_t *card) + sc_apdu_t apdu; + u8 rbuf[SC_MAX_APDU_BUFFER_SIZE]; + int r; +- const u8 *p = rbuf, *q; ++ const u8 *p = rbuf, *q, *pp; + size_t len, tlen = 0, ilen = 0; + + sc_format_apdu(card, &apdu, SC_APDU_CASE_2_SHORT, 0xca, 0x01, 0x88); +@@ -888,13 +888,13 @@ static int cardos_have_verifyrc_package(sc_card_t *card) + return 0; + + while (len != 0) { +- p = sc_asn1_find_tag(card->ctx, p, len, 0xe1, &tlen); +- if (p == NULL) ++ pp = sc_asn1_find_tag(card->ctx, p, len, 0xe1, &tlen); ++ if (pp == NULL) + return 0; + if (card->type == SC_CARD_TYPE_CARDOS_M4_3) { + /* the verifyRC package on CardOS 4.3B use Manufacturer ID 0x01 */ + /* and Package Number 0x07 */ +- q = sc_asn1_find_tag(card->ctx, p, tlen, 0x01, &ilen); ++ q = sc_asn1_find_tag(card->ctx, pp, tlen, 0x01, &ilen); + if (q == NULL || ilen != 4) + return 0; + if (q[0] == 0x07) +@@ -902,7 +902,7 @@ static int cardos_have_verifyrc_package(sc_card_t *card) + } else if (card->type == SC_CARD_TYPE_CARDOS_M4_4) { + /* the verifyRC package on CardOS 4.4 use Manufacturer ID 0x03 */ + /* and Package Number 0x02 */ +- q = sc_asn1_find_tag(card->ctx, p, tlen, 0x03, &ilen); ++ q = sc_asn1_find_tag(card->ctx, pp, tlen, 0x03, &ilen); + if (q == NULL || ilen != 4) + return 0; + if (q[0] == 0x02) diff --git a/package/opensc/Config.in b/package/opensc/Config.in new file mode 100644 index 00000000000..8c6a95a41d0 --- /dev/null +++ b/package/opensc/Config.in @@ -0,0 +1,20 @@ +config BR2_PACKAGE_OPENSC + bool "opensc" + depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pcsc-lite + select BR2_PACKAGE_PCSC_LITE + 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 + OpenSC provides a set of libraries and utilities to work + with smart cards. + + https://github.com/OpenSC/OpenSC/wiki + +comment "opensc needs a toolchain with dynamic library, threads, gcc >= 4.9" + depends on BR2_USE_MMU + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/opensc/opensc.hash b/package/opensc/opensc.hash new file mode 100644 index 00000000000..517cfe503a3 --- /dev/null +++ b/package/opensc/opensc.hash @@ -0,0 +1,5 @@ +# Computed locally from https://https://github.com/OpenSC/OpenSC/releases/ +sha256 8d4e5347195ebea332be585df61dcc470331c26969e4b0447c851fb0844c7186 opensc-0.22.0.tar.gz + +# Computed locally +sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 COPYING diff --git a/package/opensc/opensc.mk b/package/opensc/opensc.mk new file mode 100644 index 00000000000..70472b8fefa --- /dev/null +++ b/package/opensc/opensc.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# opensc +# +################################################################################ + +OPENSC_VERSION = 0.22.0 +OPENSC_SITE = https://github.com/OpenSC/OpenSC/releases/download/$(OPENSC_VERSION) +OPENSC_LICENSE = LGPL-2.1+ +OPENSC_LICENSE_FILES = COPYING +OPENSC_CPE_ID_VENDOR = opensc_project +OPENSC_DEPENDENCIES = openssl pcsc-lite +OPENSC_INSTALL_STAGING = YES +OPENSC_CONF_OPTS = --disable-cmocka --disable-strict + +# 0004-pkcs15init-correct-left-length-calculation-to-fix-buffer-overrun-bug.patch +OPENSC_IGNORE_CVES += CVE-2023-2977 + +$(eval $(autotools-package)) diff --git a/package/openssh/Config.in b/package/openssh/Config.in index cc5998742ee..08d3c7d391e 100644 --- a/package/openssh/Config.in +++ b/package/openssh/Config.in @@ -31,4 +31,12 @@ config BR2_PACKAGE_OPENSSH_KEY_UTILS help Key utilities: ssh-keygen, ssh-keyscan. +config BR2_PACKAGE_OPENSSH_SANDBOX + bool "use sandboxing" + default y + help + Use sandboxing for extra privilege protection of processes. + + This is normally preferable, but may cause seccomp problems + for certain combinations of C libraries and kernel versions. endif diff --git a/package/openssh/openssh.hash b/package/openssh/openssh.hash index dd123c1bb6b..df472e087df 100644 --- a/package/openssh/openssh.hash +++ b/package/openssh/openssh.hash @@ -1,4 +1,4 @@ -# From https://www.openssh.com/txt/release-8.9 (base64 encoded) -sha256 fd497654b7ab1686dac672fb83dfb4ba4096e8b5ffcdaccd262380ae58bec5e7 openssh-8.9p1.tar.gz +# From https://www.openssh.com/txt/release-9.3p2 +sha256 200ebe147f6cb3f101fd0cdf9e02442af7ddca298dffd9f456878e7ccac676e8 openssh-9.3p2.tar.gz # Locally calculated -sha256 d6807e99f3d159145c659060f57c3fa74e109faa39326dbfc38674cb550fd104 LICENCE +sha256 05c30446ba738934b3f1efa965b454c122ca26cc4b268e5ae6843f58ccd1b16d LICENCE diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index 0e0d59e6aba..a2c3f161295 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -4,14 +4,15 @@ # ################################################################################ -OPENSSH_VERSION_MAJOR = 8.9 -OPENSSH_VERSION_MINOR = p1 +OPENSSH_VERSION_MAJOR = 9.3 +OPENSSH_VERSION_MINOR = p2 OPENSSH_VERSION = $(OPENSSH_VERSION_MAJOR)$(OPENSSH_VERSION_MINOR) OPENSSH_CPE_ID_VERSION = $(OPENSSH_VERSION_MAJOR) OPENSSH_CPE_ID_UPDATE = $(OPENSSH_VERSION_MINOR) OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable OPENSSH_LICENSE = BSD-3-Clause, BSD-2-Clause, Public Domain OPENSSH_LICENSE_FILES = LICENCE + OPENSSH_CONF_ENV = \ LD="$(TARGET_CC)" \ LDFLAGS="$(TARGET_CFLAGS)" \ @@ -20,6 +21,7 @@ OPENSSH_CPE_ID_VENDOR = openbsd OPENSSH_CONF_OPTS = \ --sysconfdir=/etc/ssh \ --with-default-path=$(BR2_SYSTEM_DEFAULT_PATH) \ + $(if $(BR2_PACKAGE_OPENSSH_SANDBOX),--with-sandbox,--without-sandbox) \ --disable-lastlog \ --disable-utmp \ --disable-utmpx \ @@ -33,6 +35,10 @@ define OPENSSH_PERMISSIONS /var/empty d 755 root root - - - - - endef +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_110934),y) +OPENSSH_CONF_OPTS += --without-hardening +endif + ifeq ($(BR2_TOOLCHAIN_SUPPORTS_PIE),) OPENSSH_CONF_OPTS += --without-pie endif diff --git a/package/openssl/Config.in b/package/openssl/Config.in index 7bf49b05f66..c7641ecefa1 100644 --- a/package/openssl/Config.in +++ b/package/openssl/Config.in @@ -34,8 +34,8 @@ config BR2_PACKAGE_LIBRESSL bool "libressl" depends on !BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL depends on BR2_TOOLCHAIN_HAS_THREADS - # uClibc on noMMU doesn't provide __register_atfork() - depends on !(BR2_TOOLCHAIN_USES_UCLIBC && !BR2_USE_MMU) + # uClibc doesn't provide __register_atfork() without NPTL + depends on !BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_HAS_THREADS_NPTL help LibreSSL is a version of the TLS/crypto stack forked from OpenSSL in 2014, with goals of modernizing the codebase, diff --git a/package/openswan/0001-lib-libopenswan-constants.c-workaround-missing-ns_t_.patch b/package/openswan/0001-lib-libopenswan-constants.c-workaround-missing-ns_t_.patch new file mode 100644 index 00000000000..ea50dd11ad0 --- /dev/null +++ b/package/openswan/0001-lib-libopenswan-constants.c-workaround-missing-ns_t_.patch @@ -0,0 +1,29 @@ +From 66f8abe037970dda50fbc460edb2a2fa9f391d8a Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Wed, 3 Aug 2022 19:14:25 +0200 +Subject: [PATCH] lib/libopenswan/constants.c: workaround missing ns_t_tkey + definition in uClibc < 1.0.41 + +Signed-off-by: Thomas Petazzoni +--- + lib/libopenswan/constants.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/lib/libopenswan/constants.c b/lib/libopenswan/constants.c +index 90c973b5f..04e68da42 100644 +--- a/lib/libopenswan/constants.c ++++ b/lib/libopenswan/constants.c +@@ -1411,7 +1411,9 @@ static const char *const rr_qtype_name[] = { + NULL + }; + +-enum_names rr_qtype_names = { ns_t_tkey, ns_t_any ++/* ns_t_tkey is 249, but its definition is missing from uClibc < ++ * 1.0.41, so let's hardcode it */ ++enum_names rr_qtype_names = { 249 /* ns_t_tkey */, ns_t_any + , rr_qtype_name, &rr_type_names }; + + static const char *const rr_class_name[] = { +-- +2.37.1 + diff --git a/package/openswan/Config.in b/package/openswan/Config.in index c71d064dafc..724654e984d 100644 --- a/package/openswan/Config.in +++ b/package/openswan/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_OPENSWAN bool "openswan" depends on BR2_USE_MMU # iproute2 depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # iproute2 - depends on !BR2_TOOLCHAIN_USES_UCLIBC # ns_t_tkey select BR2_PACKAGE_GMP select BR2_PACKAGE_IPROUTE2 help @@ -10,7 +9,6 @@ config BR2_PACKAGE_OPENSWAN http://www.openswan.org -comment "openswan needs a glibc or musl toolchain w/ headers >= 3.4" +comment "openswan needs a toolchain w/ headers >= 3.4" depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 || \ - BR2_TOOLCHAIN_USES_UCLIBC + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 diff --git a/package/opentracing-cpp/opentracing-cpp.hash b/package/opentracing-cpp/opentracing-cpp.hash index 591c0e4a0a4..8cfaf5fd472 100644 --- a/package/opentracing-cpp/opentracing-cpp.hash +++ b/package/opentracing-cpp/opentracing-cpp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 015c4187f7a6426a2b5196f0ccd982aa87f010cf61f507ae3ce5c90523f92301 opentracing-cpp-1.5.1.tar.gz -sha256 076d03156735d5ff2df2ea0f8b12351ef65e5e9222b5c8c6a35101dadb41e717 LICENSE +sha256 5b170042da4d1c4c231df6594da120875429d5231e9baa5179822ee8d1054ac3 opentracing-cpp-1.6.0.tar.gz +sha256 076d03156735d5ff2df2ea0f8b12351ef65e5e9222b5c8c6a35101dadb41e717 LICENSE diff --git a/package/opentracing-cpp/opentracing-cpp.mk b/package/opentracing-cpp/opentracing-cpp.mk index 0605cd5d96d..12ce40fbed1 100644 --- a/package/opentracing-cpp/opentracing-cpp.mk +++ b/package/opentracing-cpp/opentracing-cpp.mk @@ -4,8 +4,9 @@ # ################################################################################ -OPENTRACING_CPP_VERSION = 1.5.1 -OPENTRACING_CPP_SITE = $(call github,opentracing,opentracing-cpp,v$(OPENTRACING_CPP_VERSION)) +OPENTRACING_CPP_VERSION = 1.6.0 +OPENTRACING_CPP_SITE = \ + $(call github,opentracing,opentracing-cpp,v$(OPENTRACING_CPP_VERSION)) OPENTRACING_CPP_LICENSE = Apache-2.0 OPENTRACING_CPP_LICENSE_FILES = LICENSE diff --git a/package/opentyrian-data/opentyrian-data.hash b/package/opentyrian-data/opentyrian-data.hash index 9a7079c4aed..26e5db1d2ba 100644 --- a/package/opentyrian-data/opentyrian-data.hash +++ b/package/opentyrian-data/opentyrian-data.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 7790d09a2a3addcd33c66ef063d5900eb81cc9c342f4807eb8356364dd1d9277 tyrian21.zip +sha256 7790d09a2a3addcd33c66ef063d5900eb81cc9c342f4807eb8356364dd1d9277 tyrian21.zip diff --git a/package/openvmtools/0003-Rename-poll-h-into-vm_poll-h-to-fix-build-failure-on-musl.patch b/package/openvmtools/0003-Rename-poll-h-into-vm_poll-h-to-fix-build-failure-on-musl.patch index e9495ce43f8..b4e94d870d0 100644 --- a/package/openvmtools/0003-Rename-poll-h-into-vm_poll-h-to-fix-build-failure-on-musl.patch +++ b/package/openvmtools/0003-Rename-poll-h-into-vm_poll-h-to-fix-build-failure-on-musl.patch @@ -1,4 +1,5 @@ -From 9d13e32e362ad3ce5169f49b7f0fe1d9380e558c Mon Sep 17 00:00:00 2001 +From 1dfab46d367d11e9132506ee0f7d3eb2ceff5f3c Mon Sep 17 00:00:00 2001 +Message-Id: <1dfab46d367d11e9132506ee0f7d3eb2ceff5f3c.1652913832.git.stefan@agner.ch> From: Fabrice Fontaine Date: Mon, 30 Sep 2019 13:32:35 +0200 Subject: [PATCH] Rename poll.h into vm_poll.h to fix build failure on musl @@ -38,19 +39,19 @@ Signed-off-by: Fabrice Fontaine lib/asyncsocket/asyncsocket.c | 4 +- lib/hgfsServer/hgfsServer.c | 2 +- lib/include/asyncsocket.h | 2 +- - lib/include/poll.h | 330 -------------------- + lib/include/poll.h | 337 -------------------- lib/include/pollImpl.h | 2 +- - lib/include/vm_poll.h | 330 ++++++++++++++++++++ + lib/include/vm_poll.h | 337 ++++++++++++++++++++ lib/rpcIn/rpcin.c | 2 +- - 7 files changed, 336 insertions(+), 336 deletions(-) - delete mode 100644 open-vm-tools/lib/include/poll.h - create mode 100644 open-vm-tools/lib/include/vm_poll.h + 7 files changed, 343 insertions(+), 343 deletions(-) + delete mode 100644 lib/include/poll.h + create mode 100644 lib/include/vm_poll.h -diff --git a/lib/asyncsocket/asyncsocket.c b/lib/asyncsocket/asyncsocket.c -index 102638cc..01181a95 100644 +diff --git a/lib/asyncsocket/asyncsocket.c b/open-vm-tools/lib/asyncsocket/asyncsocket.c +index 05147d2e..16949567 100644 --- a/lib/asyncsocket/asyncsocket.c +++ b/lib/asyncsocket/asyncsocket.c -@@ -69,8 +69,8 @@ +@@ -70,8 +70,8 @@ #else #include #include @@ -60,7 +61,7 @@ index 102638cc..01181a95 100644 #include #include #include -@@ -86,7 +86,7 @@ +@@ -87,7 +87,7 @@ #include "random.h" #include "asyncsocket.h" #include "asyncSocketBase.h" @@ -69,24 +70,24 @@ index 102638cc..01181a95 100644 #include "log.h" #include "err.h" #include "hostinfo.h" -diff --git a/lib/hgfsServer/hgfsServer.c b/lib/hgfsServer/hgfsServer.c -index 46224551..fc691286 100644 +diff --git a/lib/hgfsServer/hgfsServer.c b/open-vm-tools/lib/hgfsServer/hgfsServer.c +index 98f5b3f0..b436f0c7 100644 --- a/lib/hgfsServer/hgfsServer.c +++ b/lib/hgfsServer/hgfsServer.c -@@ -48,7 +48,7 @@ - #include "hgfsServerOplock.h" +@@ -51,7 +51,7 @@ #include "hgfsDirNotify.h" + #include "hgfsThreadpool.h" #include "userlock.h" -#include "poll.h" +#include "vm_poll.h" #include "mutexRankLib.h" #include "vm_basic_asm.h" #include "unicodeOperations.h" -diff --git a/lib/include/asyncsocket.h b/lib/include/asyncsocket.h -index 95a5e464..a4b4e5aa 100644 +diff --git a/lib/include/asyncsocket.h b/open-vm-tools/lib/include/asyncsocket.h +index 47b5b873..b8b0149e 100644 --- a/lib/include/asyncsocket.h +++ b/lib/include/asyncsocket.h -@@ -164,7 +164,7 @@ typedef struct AsyncSocket AsyncSocket; +@@ -171,7 +171,7 @@ typedef struct AsyncSocket AsyncSocket; * Or the client can specify its favorite poll class and locking behavior. * Use of IVmdbPoll is only supported for regular sockets and for Attach. */ @@ -95,14 +96,14 @@ index 95a5e464..a4b4e5aa 100644 struct IVmdbPoll; typedef struct AsyncSocketPollParams { int flags; /* Default 0, only POLL_FLAG_NO_BULL is valid */ -diff --git a/lib/include/poll.h b/lib/include/poll.h +diff --git a/lib/include/poll.h b/open-vm-tools/lib/include/poll.h deleted file mode 100644 -index 6acd4f35..00000000 +index c90f5dcd..00000000 --- a/lib/include/poll.h +++ /dev/null -@@ -1,330 +0,0 @@ +@@ -1,337 +0,0 @@ -/********************************************************* -- * Copyright (C) 1998-2018 VMware, Inc. All rights reserved. +- * Copyright (C) 1998-2020 VMware, Inc. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published @@ -152,7 +153,7 @@ index 6acd4f35..00000000 - -#ifdef _WIN32 -#define HZ 100 --#elif defined linux +-#elif defined __linux__ -#include -#elif __APPLE__ -#include @@ -335,6 +336,12 @@ index 6acd4f35..00000000 - * implementations are distinct from the core poll code. - */ - +- +-/* Socket pair created with non-blocking mode */ +-#define POLL_OPTIONS_SOCKET_PAIR_NONBLOCK_CONN 0x01 +- +-typedef unsigned int SocketSpecialOpts; +- -typedef struct PollOptions { - Bool locked; // Use internal MXUser for locking - Bool allowFullQueue; // Don't assert when device event queue is full. @@ -342,6 +349,7 @@ index 6acd4f35..00000000 - PollerFireWrapper fireWrapperFn; // optional; may be useful for stats - void *fireWrapperData; // optional - PollerErrorFn errorFn; // optional; called upon unrecoverable error +- SocketSpecialOpts pollSocketOpts; -} PollOptions; - - @@ -354,7 +362,7 @@ index 6acd4f35..00000000 -/* - * Functions - */ --int Poll_SocketPair(Bool vmci, Bool stream, int fds[2]); +-int Poll_SocketPair(Bool vmci, Bool stream, int fds[2], SocketSpecialOpts opts); -void Poll_Loop(Bool loop, Bool *exit, PollClass c); -void Poll_LoopTimeout(Bool loop, Bool *exit, PollClass c, int timeout); -Bool Poll_LockingEnabled(void); @@ -431,7 +439,7 @@ index 6acd4f35..00000000 -#endif - -#endif // _POLL_H_ -diff --git a/lib/include/pollImpl.h b/lib/include/pollImpl.h +diff --git a/lib/include/pollImpl.h b/open-vm-tools/lib/include/pollImpl.h index 46442e55..8bc66997 100644 --- a/lib/include/pollImpl.h +++ b/lib/include/pollImpl.h @@ -444,14 +452,14 @@ index 46442e55..8bc66997 100644 #include "vm_basic_asm.h" #if defined(__cplusplus) -diff --git a/lib/include/vm_poll.h b/lib/include/vm_poll.h +diff --git a/lib/include/vm_poll.h b/open-vm-tools/lib/include/vm_poll.h new file mode 100644 -index 00000000..6acd4f35 +index 00000000..c90f5dcd --- /dev/null +++ b/lib/include/vm_poll.h -@@ -0,0 +1,330 @@ +@@ -0,0 +1,337 @@ +/********************************************************* -+ * Copyright (C) 1998-2018 VMware, Inc. All rights reserved. ++ * Copyright (C) 1998-2020 VMware, Inc. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published @@ -501,7 +509,7 @@ index 00000000..6acd4f35 + +#ifdef _WIN32 +#define HZ 100 -+#elif defined linux ++#elif defined __linux__ +#include +#elif __APPLE__ +#include @@ -684,6 +692,12 @@ index 00000000..6acd4f35 + * implementations are distinct from the core poll code. + */ + ++ ++/* Socket pair created with non-blocking mode */ ++#define POLL_OPTIONS_SOCKET_PAIR_NONBLOCK_CONN 0x01 ++ ++typedef unsigned int SocketSpecialOpts; ++ +typedef struct PollOptions { + Bool locked; // Use internal MXUser for locking + Bool allowFullQueue; // Don't assert when device event queue is full. @@ -691,6 +705,7 @@ index 00000000..6acd4f35 + PollerFireWrapper fireWrapperFn; // optional; may be useful for stats + void *fireWrapperData; // optional + PollerErrorFn errorFn; // optional; called upon unrecoverable error ++ SocketSpecialOpts pollSocketOpts; +} PollOptions; + + @@ -703,7 +718,7 @@ index 00000000..6acd4f35 +/* + * Functions + */ -+int Poll_SocketPair(Bool vmci, Bool stream, int fds[2]); ++int Poll_SocketPair(Bool vmci, Bool stream, int fds[2], SocketSpecialOpts opts); +void Poll_Loop(Bool loop, Bool *exit, PollClass c); +void Poll_LoopTimeout(Bool loop, Bool *exit, PollClass c, int timeout); +Bool Poll_LockingEnabled(void); @@ -780,8 +795,8 @@ index 00000000..6acd4f35 +#endif + +#endif // _POLL_H_ -diff --git a/lib/rpcIn/rpcin.c b/lib/rpcIn/rpcin.c -index 47a3380e..660382c6 100644 +diff --git a/lib/rpcIn/rpcin.c b/open-vm-tools/lib/rpcIn/rpcin.c +index 8b1fe759..f22fcd40 100644 --- a/lib/rpcIn/rpcin.c +++ b/lib/rpcIn/rpcin.c @@ -57,7 +57,7 @@ @@ -794,5 +809,5 @@ index 47a3380e..660382c6 100644 # include "vmci_defs.h" #include "dataMap.h" -- -2.23.0 +2.36.1 diff --git a/package/openvmtools/0007-Use-configure-to-test-for-feature-instead-of-platfor.patch b/package/openvmtools/0007-Use-configure-to-test-for-feature-instead-of-platfor.patch index 0d3948aa108..abbc5183623 100644 --- a/package/openvmtools/0007-Use-configure-to-test-for-feature-instead-of-platfor.patch +++ b/package/openvmtools/0007-Use-configure-to-test-for-feature-instead-of-platfor.patch @@ -125,6 +125,7 @@ Index: open-vm-tools/lib/nicInfo/nicInfoPosix.c #include #include #include + #include -#if defined(__FreeBSD__) || defined(__APPLE__) +#if HAVE_SYS_SYSCTL_H # include diff --git a/package/openvmtools/0009-Set-permissions-on-rules-file.patch b/package/openvmtools/0009-Set-permissions-on-rules-file.patch deleted file mode 100644 index 6a37c1690d9..00000000000 --- a/package/openvmtools/0009-Set-permissions-on-rules-file.patch +++ /dev/null @@ -1,23 +0,0 @@ -From c3ef6a8285132871ad10f9300d8afff55d8d6de2 Mon Sep 17 00:00:00 2001 -From: puneetse <22071208+puneetse@users.noreply.github.com> -Date: Wed, 16 Oct 2019 10:09:38 -0700 -Subject: [PATCH] Set permissions on rules file - -udevs rules should not be executable otherwise udev will log a warning in the journal - -Signed-off-by: Pascal de Bruijn ---- - udev/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/udev/Makefile.am b/udev/Makefile.am -index 68fbc3e27..8b9a4d716 100644 ---- a/udev/Makefile.am -+++ b/udev/Makefile.am -@@ -17,5 +17,5 @@ - - install-data-local: - $(INSTALL) -d $(DESTDIR)$(UDEVRULESDIR) -- $(INSTALL) $(srcdir)/99-vmware-scsi-udev.rules $(DESTDIR)$(UDEVRULESDIR) -+ $(INSTALL) -m 0644 $(srcdir)/99-vmware-scsi-udev.rules $(DESTDIR)$(UDEVRULESDIR) - diff --git a/package/openvmtools/0010-Change-DEVPATH-to-devpath.patch b/package/openvmtools/0010-Change-DEVPATH-to-devpath.patch deleted file mode 100644 index 5af694d8f2e..00000000000 --- a/package/openvmtools/0010-Change-DEVPATH-to-devpath.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 22f5d198b3b2f7e4debed83948ba1baf70d4749a Mon Sep 17 00:00:00 2001 -From: puneetse <22071208+puneetse@users.noreply.github.com> -Date: Wed, 16 Oct 2019 10:04:41 -0700 -Subject: [PATCH] Change $DEVPATH to $devpath - -$DEVPATH throws a warning by udev. - -Signed-off-by: Pascal de Bruijn ---- - udev/99-vmware-scsi-udev.rules | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/udev/99-vmware-scsi-udev.rules b/udev/99-vmware-scsi-udev.rules -index 053b59706..a605d80ef 100644 ---- a/udev/99-vmware-scsi-udev.rules -+++ b/udev/99-vmware-scsi-udev.rules -@@ -2,6 +2,6 @@ - # - # This file is part of open-vm-tools - --ACTION=="add", SUBSYSTEMS=="scsi", ATTRS{vendor}=="VMware*", ATTRS{model}=="Virtual disk*", ENV{DEVTYPE}=="disk", RUN+="/bin/sh -c 'echo 180 >/sys$DEVPATH/device/timeout'" --ACTION=="add", SUBSYSTEMS=="scsi", ATTRS{vendor}=="VMware*", ATTRS{model}=="VMware Virtual S", ENV{DEVTYPE}=="disk", RUN+="/bin/sh -c 'echo 180 >/sys$DEVPATH/device/timeout'" -+ACTION=="add", SUBSYSTEMS=="scsi", ATTRS{vendor}=="VMware*", ATTRS{model}=="Virtual disk*", ENV{DEVTYPE}=="disk", RUN+="/bin/sh -c 'echo 180 >/sys/$devpath/device/timeout'" -+ACTION=="add", SUBSYSTEMS=="scsi", ATTRS{vendor}=="VMware*", ATTRS{model}=="VMware Virtual S", ENV{DEVTYPE}=="disk", RUN+="/bin/sh -c 'echo 180 >/sys/$devpath/device/timeout'" - diff --git a/package/openvmtools/0013-Properly-check-authorization-on-incoming-guestOps-re.patch b/package/openvmtools/0013-Properly-check-authorization-on-incoming-guestOps-re.patch new file mode 100644 index 00000000000..91e379b9a63 --- /dev/null +++ b/package/openvmtools/0013-Properly-check-authorization-on-incoming-guestOps-re.patch @@ -0,0 +1,40 @@ +From bb9f9ffbb151397545f921cee5b6a4933c6eea80 Mon Sep 17 00:00:00 2001 +Message-Id: +From: John Wolfe +Date: Wed, 10 Aug 2022 06:12:02 -0700 +Subject: [PATCH] Properly check authorization on incoming guestOps requests + +Fix public pipe request checks. Only a SessionRequest type should +be accepted on the public pipe. + +Upstream: https://github.com/vmware/open-vm-tools/blob/CVE-2022-31676.patch/1205-Properly-check-authorization-on-incoming-guestOps-re.patch +Signed-off-by: Stefan Agner +--- + vgauth/serviceImpl/proto.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/vgauth/serviceImpl/proto.c b/vgauth/serviceImpl/proto.c +index db7159ee..c4f85b02 100644 +--- a/vgauth/serviceImpl/proto.c ++++ b/vgauth/serviceImpl/proto.c +@@ -1,5 +1,5 @@ + /********************************************************* +- * Copyright (C) 2011-2016,2019-2021 VMware, Inc. All rights reserved. ++ * Copyright (c) 2011-2016,2019-2022 VMware, Inc. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published +@@ -1201,6 +1201,10 @@ Proto_SecurityCheckRequest(ServiceConnection *conn, + VGAuthError err; + gboolean isSecure = ServiceNetworkIsConnectionPrivateSuperUser(conn); + ++ if (conn->isPublic && req->reqType != PROTO_REQUEST_SESSION_REQ) { ++ return VGAUTH_E_PERMISSION_DENIED; ++ } ++ + switch (req->reqType) { + /* + * This comes over the public connection; alwsys let it through. +-- +2.38.0 + diff --git a/package/openvmtools/Config.in b/package/openvmtools/Config.in index a50b6b9b3e7..67855f50e0b 100644 --- a/package/openvmtools/Config.in +++ b/package/openvmtools/Config.in @@ -1,6 +1,12 @@ +config BR2_PACKAGE_OPENVMTOOLS_ARCH_SUPPORTS + bool + default y if BR2_i386 + default y if BR2_x86_64 + default y if BR2_aarch64 + config BR2_PACKAGE_OPENVMTOOLS bool "openvmtools" - depends on BR2_i386 || BR2_x86_64 + depends on BR2_PACKAGE_OPENVMTOOLS_ARCH_SUPPORTS depends on BR2_USE_MMU # libglib2 depends on BR2_USE_WCHAR # libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 @@ -12,7 +18,7 @@ config BR2_PACKAGE_OPENVMTOOLS help Open Virtual Machine Tools for VMware guest OS - http://open-vm-tools.sourceforge.net/ + https://github.com/vmware/open-vm-tools ICU locales, Xerces, and X11 tools are currently not supported. @@ -51,7 +57,7 @@ comment "resolutionkms needs udev, a toolchain w/ threads" endif comment "openvmtools needs a glibc or musl toolchain w/ wchar, threads, locale" - depends on BR2_i386 || BR2_x86_64 + depends on BR2_PACKAGE_OPENVMTOOLS_ARCH_SUPPORTS depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_ENABLE_LOCALE || \ diff --git a/package/openvmtools/openvmtools.hash b/package/openvmtools/openvmtools.hash index bd81d1f05c9..081538fbf36 100644 --- a/package/openvmtools/openvmtools.hash +++ b/package/openvmtools/openvmtools.hash @@ -1,3 +1,3 @@ # locally computed -sha256 364cd0fdfa5a05e872d08609659e6231ec99788669f7ebba24bfb8c94168daef open-vm-tools-10.3.5-10430147.tar.gz +sha256 2053daf7b224ab7ae1a9cfcd6ae12494c646e2bf9aaca998225bd082a4a43fb7 open-vm-tools-11.3.5-18557794.tar.gz sha256 f734933bd7d49aef25aaf897ed7281ee822e8635056e69b895a7d2e668937fc5 COPYING diff --git a/package/openvmtools/openvmtools.mk b/package/openvmtools/openvmtools.mk index 4201c6daa05..3106b9ecd69 100644 --- a/package/openvmtools/openvmtools.mk +++ b/package/openvmtools/openvmtools.mk @@ -4,12 +4,17 @@ # ################################################################################ -OPENVMTOOLS_VERSION_MAJOR = 10.3.5 -OPENVMTOOLS_VERSION = $(OPENVMTOOLS_VERSION_MAJOR)-10430147 +OPENVMTOOLS_VERSION_MAJOR = 11.3.5 +OPENVMTOOLS_VERSION = $(OPENVMTOOLS_VERSION_MAJOR)-18557794 OPENVMTOOLS_SITE = https://github.com/vmware/open-vm-tools/releases/download/stable-$(OPENVMTOOLS_VERSION_MAJOR) OPENVMTOOLS_SOURCE = open-vm-tools-$(OPENVMTOOLS_VERSION).tar.gz OPENVMTOOLS_LICENSE = LGPL-2.1 OPENVMTOOLS_LICENSE_FILES = COPYING +OPENVMTOOLS_CPE_ID_VENDOR = vmware +OPENVMTOOLS_CPE_ID_PRODUCT = tools + +# 0013-Properly-check-authorization-on-incoming-guestOps-re.patch +OPENVMTOOLS_IGNORE_CVES += CVE-2022-31676 # configure.ac is patched OPENVMTOOLS_AUTORECONF = YES diff --git a/package/openvpn/S60openvpn b/package/openvpn/S60openvpn index f097cf11ecb..00156c80dba 100644 --- a/package/openvpn/S60openvpn +++ b/package/openvpn/S60openvpn @@ -1,4 +1,4 @@ -#!/bin/sh -e +#!/bin/sh # # Original version by Robert Leslie # , edited by iwj and cs diff --git a/package/openvpn/openvpn.hash b/package/openvpn/openvpn.hash index f8e0493b543..0959b7f8380 100644 --- a/package/openvpn/openvpn.hash +++ b/package/openvpn/openvpn.hash @@ -1,3 +1,3 @@ # Locally calculated after checking signature -sha256 119bd69fa0210838f6cdaa273696dc738efa200f454dbe11eb6dfb75dfb6003b openvpn-2.5.5.tar.xz +sha256 08340a389905c84196b6cd750add1bc0fa2d46a1afebfd589c24120946c13e68 openvpn-2.5.7.tar.gz sha256 1fcb78d7e478bb8a9408010bdc91b36e213b1facfad093df3f7ce7e28af19043 COPYRIGHT.GPL diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index d6bcad62ba7..5c602e0448f 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -4,9 +4,8 @@ # ################################################################################ -OPENVPN_VERSION = 2.5.5 -OPENVPN_SOURCE = openvpn-$(OPENVPN_VERSION).tar.xz -OPENVPN_SITE = http://swupdate.openvpn.net/community/releases +OPENVPN_VERSION = 2.5.7 +OPENVPN_SITE = https://swupdate.openvpn.net/community/releases OPENVPN_DEPENDENCIES = host-pkgconf OPENVPN_LICENSE = GPL-2.0 OPENVPN_LICENSE_FILES = COPYRIGHT.GPL diff --git a/package/opkg-utils/opkg-utils.mk b/package/opkg-utils/opkg-utils.mk index 369a4586e87..ad267c5c943 100644 --- a/package/opkg-utils/opkg-utils.mk +++ b/package/opkg-utils/opkg-utils.mk @@ -12,7 +12,6 @@ OPKG_UTILS_LICENSE_FILES = COPYING HOST_OPKG_UTILS_DEPENDENCIES = \ $(BR2_PYTHON3_HOST_DEPENDENCY) \ - host-diffutils \ host-lz4 \ host-xz diff --git a/package/oprofile/Config.in b/package/oprofile/Config.in index cce2cfdab80..eca43d7ac3b 100644 --- a/package/oprofile/Config.in +++ b/package/oprofile/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_OPROFILE_ARCH_SUPPORTS depends on BR2_arceb || BR2_arcle || BR2_arm || BR2_armeb || \ BR2_aarch64 || BR2_aarch64_be || BR2_i386 || BR2_mips || \ BR2_mipsel || BR2_mips64 || BR2_mips64el || BR2_powerpc || \ - BR2_powerpc64 || BR2_powerpc64le || BR2_sh || \ + BR2_powerpc64 || BR2_powerpc64le || BR2_s390x || BR2_sh || \ BR2_sparc || BR2_sparc64 || BR2_x86_64 config BR2_PACKAGE_OPROFILE_NEEDS_LIBPFM4 diff --git a/package/optee-benchmark/optee-benchmark.hash b/package/optee-benchmark/optee-benchmark.hash index 3797920c35a..d74a24c8abe 100644 --- a/package/optee-benchmark/optee-benchmark.hash +++ b/package/optee-benchmark/optee-benchmark.hash @@ -1,4 +1,4 @@ -# From https://github.com/linaro-swg/optee_benchmark/archive/3.15.0/optee-benchmark-3.15.0.tar.gz -sha256 f1ddac5e9f58333194eb302e6d9840fa334300bc103abb3d9f783bf009a78c50 optee-benchmark-3.15.0.tar.gz +# From https://github.com/linaro-swg/optee_benchmark/archive/3.19.0/optee-benchmark-3.19.0.tar.gz +sha256 32f41854bf07eb7bb89dfc702da023c3a99518c33fbe7edf0e1f004e29a8c90c optee-benchmark-3.19.0.tar.gz # Locally computed -sha256 0571be5b739142dc3e40e0a4e7e30d4ab8bff0d4d606a3f2db2010745587d383 LICENSE +sha256 0571be5b739142dc3e40e0a4e7e30d4ab8bff0d4d606a3f2db2010745587d383 LICENSE diff --git a/package/optee-benchmark/optee-benchmark.mk b/package/optee-benchmark/optee-benchmark.mk index 1357f9f2707..338a51ada47 100644 --- a/package/optee-benchmark/optee-benchmark.mk +++ b/package/optee-benchmark/optee-benchmark.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_BENCHMARK_VERSION = 3.15.0 +OPTEE_BENCHMARK_VERSION = 3.19.0 OPTEE_BENCHMARK_SITE = $(call github,linaro-swg,optee_benchmark,$(OPTEE_BENCHMARK_VERSION)) OPTEE_BENCHMARK_LICENSE = BSD-2-Clause OPTEE_BENCHMARK_LICENSE_FILES = LICENSE diff --git a/package/optee-client/0001-libteeacl-condition-libteeacl-with-WITH_TEEACL.patch b/package/optee-client/0001-libteeacl-condition-libteeacl-with-WITH_TEEACL.patch new file mode 100644 index 00000000000..4fdf9afc944 --- /dev/null +++ b/package/optee-client/0001-libteeacl-condition-libteeacl-with-WITH_TEEACL.patch @@ -0,0 +1,105 @@ +From bbdf665aba39c29a3ce7bd06e4554c62a416ebaa Mon Sep 17 00:00:00 2001 +From: Etienne Carriere +Date: Thu, 10 Nov 2022 12:05:24 +0100 +Subject: [PATCH] libteeacl: condition libteeacl with WITH_TEEACL + +Build and embed libteeacl upon WITH_TEEACL=1 (default configuration). +This configuration switch allows one to build OP-TEE client without +dependencies on pkg-config and libuuid when OP-TEE ACL for +PKCS11 is not needed: + cmake -DWITH_TEEACL=0 ... +or + make WITH_TEEACL=0 ... + +With the comments below addressed, LGTM. + +Acked-by: Jerome Forissier +Acked-by: Jens Wiklander +Reviewed-by: Eero Aaltonen +[etienne.carriere@linaro.org: backport upstream commit] +Signed-off-by: Etienne Carriere +[yann.morin.1998@free.fr: actually do a backport of bbdf665] +Signed-off-by: Yann E. MORIN +--- + CMakeLists.txt | 9 ++++++--- + Makefile | 15 ++++++++++++--- + 2 files changed, 18 insertions(+), 6 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0786752..9fb5c6a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -5,6 +5,7 @@ project (optee_client C) + set (CMAKE_TOOLCHAIN_FILE CMakeToolchain.txt) + + set (CFG_WERROR 1 CACHE BOOL "Build with -Werror") ++option (WITH_TEEACL "Build libteeacl" TRUE) + + include(GNUInstallDirs) + +@@ -37,7 +38,9 @@ add_subdirectory (libteec) + add_subdirectory (tee-supplicant) + add_subdirectory (public) + add_subdirectory (libckteec) +-find_package (PkgConfig REQUIRED) +-pkg_check_modules(uuid REQUIRED IMPORTED_TARGET uuid) +-add_subdirectory (libteeacl) ++if(WITH_TEEACL) ++ find_package (PkgConfig REQUIRED) ++ pkg_check_modules(uuid REQUIRED IMPORTED_TARGET uuid) ++ add_subdirectory (libteeacl) ++endif(WITH_TEEACL) + add_subdirectory (libseteec) +diff --git a/Makefile b/Makefile +index 90b487e..2ee5621 100644 +--- a/Makefile ++++ b/Makefile +@@ -16,6 +16,8 @@ SBINDIR ?= /usr/sbin + LIBDIR ?= /usr/lib + INCLUDEDIR ?= /usr/include + ++WITH_TEEACL ?= 1 ++ + .PHONY: all build build-libteec build-libckteec build-libseteec \ + build-libteeacl check-libuuid install copy_export clean cscope \ + clean-cscope \ +@@ -35,8 +37,10 @@ build-tee-supplicant: build-libteec + @echo "Building tee-supplicant" + $(MAKE) --directory=tee-supplicant --no-print-directory --no-builtin-variables CFG_TEE_SUPP_LOG_LEVEL=$(CFG_TEE_SUPP_LOG_LEVEL) + +-build: build-libteec build-tee-supplicant build-libckteec build-libseteec \ +- build-libteeacl ++build: build-libteec build-tee-supplicant build-libckteec build-libseteec ++ifeq ($(WITH_TEEACL),1) ++build: build-libteeacl ++endif + + build-libckteec: build-libteec + @echo "Building libckteec.so" +@@ -57,7 +61,10 @@ check-libuuid: + install: copy_export + + clean: clean-libteec clean-tee-supplicant clean-cscope clean-libckteec \ +- clean-libseteec clean-libteeacl ++ clean-libseteec ++ifeq ($(WITH_TEEACL),1) ++clean: clean-libteeacl ++endif + + clean-libteec: + @$(MAKE) --directory=libteec --no-print-directory clean +@@ -158,9 +165,11 @@ copy_export: build + cp libckteec/include/*.h $(DESTDIR)$(INCLUDEDIR) + cp -d ${O}/libckteec/libckteec.so* $(DESTDIR)$(LIBDIR) + cp -d ${O}/libckteec/libckteec.a $(DESTDIR)$(LIBDIR) ++ifeq ($(WITH_TEEACL),1) + cp libteeacl/include/*.h $(DESTDIR)$(INCLUDEDIR) + cp -d ${O}/libteeacl/libteeacl.so* $(DESTDIR)$(LIBDIR) + cp -d ${O}/libteeacl/libteeacl.a $(DESTDIR)$(LIBDIR) ++endif + cp libseteec/include/*.h $(DESTDIR)$(INCLUDEDIR) + cp -d ${O}/libseteec/libseteec.so* $(DESTDIR)$(LIBDIR) + cp -d ${O}/libseteec/libseteec.a $(DESTDIR)$(LIBDIR) +-- +2.25.1 + diff --git a/package/optee-client/0002-libteeacl-use-realloc-instead-of-reallocarray.patch b/package/optee-client/0002-libteeacl-use-realloc-instead-of-reallocarray.patch new file mode 100644 index 00000000000..88f5a4f87e0 --- /dev/null +++ b/package/optee-client/0002-libteeacl-use-realloc-instead-of-reallocarray.patch @@ -0,0 +1,34 @@ +From dde6306458331371be5df15e3ca953697d2463ef Mon Sep 17 00:00:00 2001 +From: Eero Aaltonen +Date: Thu, 2 Feb 2023 17:22:29 +0200 +Subject: [PATCH] libteeacl: use realloc() instead of reallocarray() + +Use realloc() instead of reallocarray(), since uClibc apparently does +not implement reallocarray(). + +Fixes: https://github.com/OP-TEE/optee_client/issues/339 + +Signed-off-by: Eero Aaltonen +Reviewed-by: Jerome Forissier + +[Retrieved from: +https://github.com/OP-TEE/optee_client/commit/dde6306458331371be5df15e3ca953697d2463ef] +Signed-off-by: Fabrice Fontaine +--- + libteeacl/src/group.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/libteeacl/src/group.c b/libteeacl/src/group.c +index 10965dd0..bd165a11 100644 +--- a/libteeacl/src/group.c ++++ b/libteeacl/src/group.c +@@ -72,7 +72,8 @@ enum rv_groupmember teeacl_user_is_member_of(const char *user, gid_t group) + if (ret == -1) { + p_groups = groups; + +- groups = reallocarray(groups, grouplistsize, sizeof(gid_t)); ++ /* we use realloc, since uClibc does not implement reallocarray */ ++ groups = realloc(groups, grouplistsize * sizeof(gid_t)); + if (!groups) { + free(p_groups); + return E_MEMORY; diff --git a/package/optee-client/Config.in b/package/optee-client/Config.in index cc7f176c772..538948b72c1 100644 --- a/package/optee-client/Config.in +++ b/package/optee-client/Config.in @@ -37,6 +37,14 @@ config BR2_PACKAGE_OPTEE_CLIENT_SUPP_PLUGINS help Enable TEE supplicant plugin support. +config BR2_PACKAGE_OPTEE_CLIENT_TEEACL + bool "Enable TEE Access Control List login" + select BR2_PACKAGE_UTIL_LINUX + select BR2_PACKAGE_UTIL_LINUX_LIBUUID + help + Enable TEE ACL login identification for OP-TEE service that + supports them as OP-TEE PKCS#11 services. + endif comment "optee-client needs a toolchain w/ threads, headers >= 4.3" diff --git a/package/optee-client/S30optee b/package/optee-client/S30optee deleted file mode 100644 index 17e6d6d2b8a..00000000000 --- a/package/optee-client/S30optee +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh - -DAEMON="tee-supplicant" -PIDFILE="/var/run/$DAEMON.pid" - -DAEMON_ARGS="-d /dev/teepriv0" - -start() { - printf 'Starting %s: ' "$DAEMON" - start-stop-daemon -S -q -p "$PIDFILE" -x "/usr/sbin/$DAEMON" \ - -- $DAEMON_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 -} - -case "$1" in - start|stop|restart) - "$1";; - reload) - # Restart, since there is no true "reload" feature (does not - # reconfigure/restart on SIGHUP, just closes all open files). - restart;; - *) - echo "Usage: $0 {start|stop|restart|reload}" - exit 1 -esac diff --git a/package/optee-client/S30tee-supplicant b/package/optee-client/S30tee-supplicant new file mode 100644 index 00000000000..8a605dbe5f1 --- /dev/null +++ b/package/optee-client/S30tee-supplicant @@ -0,0 +1,50 @@ +#!/bin/sh + +DAEMON="tee-supplicant" +PIDFILE="/var/run/$DAEMON.pid" + +DAEMON_ARGS="-d /dev/teepriv0" + +start() { + printf 'Starting %s: ' "$DAEMON" + # shellcheck disable=SC2086 # we need the word splitting + start-stop-daemon -S -q -p "$PIDFILE" -x "/usr/sbin/$DAEMON" \ + -- $DAEMON_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 +} + +case "$1" in + start|stop|restart) + "$1";; + reload) + # Restart, since there is no true "reload" feature (does not + # reconfigure/restart on SIGHUP, just closes all open files). + restart;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 +esac diff --git a/package/optee-client/optee-client.hash b/package/optee-client/optee-client.hash index 3ae06f2afb6..c067e26f4e6 100644 --- a/package/optee-client/optee-client.hash +++ b/package/optee-client/optee-client.hash @@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_client/archive/3.15.0/optee-client-3.15.0.tar.gz -sha256 e1ea6c953e3584248d7a62050813e5ac0f0112933447954c44236a233a4cbba5 optee-client-3.15.0.tar.gz +# From https://github.com/OP-TEE/optee_client/archive/3.19.0/optee-client-3.19.0.tar.gz +sha256 5f0d02efa0e496964e86ca9dd2461ada923d1f9e11a4b9cafb5393bd08337644 optee-client-3.19.0.tar.gz # Locally computed -sha256 fda8385993f112d7ca61b88b54ba5b4cbeec7e43a0f9b317d5186703c1985e8f LICENSE +sha256 fda8385993f112d7ca61b88b54ba5b4cbeec7e43a0f9b317d5186703c1985e8f LICENSE diff --git a/package/optee-client/optee-client.mk b/package/optee-client/optee-client.mk index dda9a2855d2..ef113c838f0 100644 --- a/package/optee-client/optee-client.mk +++ b/package/optee-client/optee-client.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_CLIENT_VERSION = 3.15.0 +OPTEE_CLIENT_VERSION = 3.19.0 OPTEE_CLIENT_SITE = $(call github,OP-TEE,optee_client,$(OPTEE_CLIENT_VERSION)) OPTEE_CLIENT_LICENSE = BSD-2-Clause OPTEE_CLIENT_LICENSE_FILES = LICENSE @@ -26,9 +26,16 @@ else OPTEE_CLIENT_CONF_OPTS += -DCFG_TEE_SUPP_PLUGINS=OFF endif +ifeq ($(BR2_PACKAGE_OPTEE_CLIENT_TEEACL),y) +OPTEE_CLIENT_DEPENDENCIES += host-pkgconf util-linux +OPTEE_CLIENT_CONF_OPTS += -DWITH_TEEACL=ON +else +OPTEE_CLIENT_CONF_OPTS += -DWITH_TEEACL=OFF +endif + define OPTEE_CLIENT_INSTALL_INIT_SYSV - $(INSTALL) -m 0755 -D $(OPTEE_CLIENT_PKGDIR)/S30optee \ - $(TARGET_DIR)/etc/init.d/S30optee + $(INSTALL) -m 0755 -D $(OPTEE_CLIENT_PKGDIR)/S30tee-supplicant \ + $(TARGET_DIR)/etc/init.d/S30tee-supplicant endef $(eval $(cmake-package)) diff --git a/package/optee-examples/optee-examples.hash b/package/optee-examples/optee-examples.hash index f88904c795a..937dd44c8cb 100644 --- a/package/optee-examples/optee-examples.hash +++ b/package/optee-examples/optee-examples.hash @@ -1,4 +1,4 @@ -# From https://github.com/linaro-swg/optee_examples/archive/3.15.0/optee-examples-3.15.0.tar.gz -sha256 9770827292eea85068913077d3406070f6182389779c5d4a5c0876bffd962353 optee-examples-3.15.0.tar.gz +# From https://github.com/linaro-swg/optee_examples/archive/3.19.0/optee-examples-3.19.0.tar.gz +sha256 545f9438885220e890a4f785249a586a957b22dacc31a3cbafa4656f8e9db349 optee-examples-3.19.0.tar.gz # Locally computed -sha256 6f1ef8449cb82ae79d2155605f7985bdf0f08e7ab5007de9b4362e8bf28733b9 LICENSE +sha256 6f1ef8449cb82ae79d2155605f7985bdf0f08e7ab5007de9b4362e8bf28733b9 LICENSE diff --git a/package/optee-examples/optee-examples.mk b/package/optee-examples/optee-examples.mk index 2b46dcc1ebd..bb2b208583e 100644 --- a/package/optee-examples/optee-examples.mk +++ b/package/optee-examples/optee-examples.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_EXAMPLES_VERSION = 3.15.0 +OPTEE_EXAMPLES_VERSION = 3.19.0 OPTEE_EXAMPLES_SITE = $(call github,linaro-swg,optee_examples,$(OPTEE_EXAMPLES_VERSION)) OPTEE_EXAMPLES_LICENSE = BSD-2-Clause OPTEE_EXAMPLES_LICENSE_FILES = LICENSE diff --git a/package/optee-test/optee-test.hash b/package/optee-test/optee-test.hash index 5d68f94fbde..4da3807bb53 100644 --- a/package/optee-test/optee-test.hash +++ b/package/optee-test/optee-test.hash @@ -1,4 +1,4 @@ -# From https://github.com/OP-TEE/optee_test/archive/3.15.0/optee-test-3.15.0.tar.gz -sha256 9c2b6b80055cbef0f9bccce17dde494725bc71d9013dacaeb3e46d0926191098 optee-test-3.15.0.tar.gz +# From https://github.com/OP-TEE/optee_test/archive/3.19.0/optee-test-3.19.0.tar.gz +sha256 9435901e9329a25ef4de3904e27d80377b8bb4dd6b215e8fb29d66a7b76afa11 optee-test-3.19.0.tar.gz # Locally computed -sha256 6e6810981f0ddab9e0d44399d0700a15d9f760a3c2843cc866659c2074139ae7 LICENSE.md +sha256 6e6810981f0ddab9e0d44399d0700a15d9f760a3c2843cc866659c2074139ae7 LICENSE.md diff --git a/package/optee-test/optee-test.mk b/package/optee-test/optee-test.mk index f2117c0d004..7b065b6123e 100644 --- a/package/optee-test/optee-test.mk +++ b/package/optee-test/optee-test.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPTEE_TEST_VERSION = 3.15.0 +OPTEE_TEST_VERSION = 3.19.0 OPTEE_TEST_SITE = $(call github,OP-TEE,optee_test,$(OPTEE_TEST_VERSION)) OPTEE_TEST_LICENSE = GPL-2.0, BSD-2-Clause, OPTEE_TEST_LICENSE_FILES = LICENSE.md diff --git a/package/opus-tools/opus-tools.hash b/package/opus-tools/opus-tools.hash index 1b87458f530..1f66695dad6 100644 --- a/package/opus-tools/opus-tools.hash +++ b/package/opus-tools/opus-tools.hash @@ -1,5 +1,5 @@ # From http://downloads.xiph.org/releases/opus/SHA256SUMS.txt -sha256 b4e56cb00d3e509acfba9a9b627ffd8273b876b4e2408642259f6da28fa0ff86 opus-tools-0.2.tar.gz +sha256 b4e56cb00d3e509acfba9a9b627ffd8273b876b4e2408642259f6da28fa0ff86 opus-tools-0.2.tar.gz # Hash for license file -sha256 c28016e58544119d6b93aea28297d040f17dcef7a9f548d3e6a4d0b558c5d248 COPYING +sha256 c28016e58544119d6b93aea28297d040f17dcef7a9f548d3e6a4d0b558c5d248 COPYING diff --git a/package/opus/opus.hash b/package/opus/opus.hash index 2a94d3723dd..2365e47c7d9 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 65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d opus-1.3.1.tar.gz +sha256 65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d opus-1.3.1.tar.gz # Hash for license file -sha256 8338ce8d922bb4416ce3dd1e5680173332435e3f0755007ac7801ccd674fe682 COPYING +sha256 8338ce8d922bb4416ce3dd1e5680173332435e3f0755007ac7801ccd674fe682 COPYING diff --git a/package/opus/opus.mk b/package/opus/opus.mk index 3fb2d5d65f9..d8e0623e153 100644 --- a/package/opus/opus.mk +++ b/package/opus/opus.mk @@ -12,16 +12,28 @@ OPUS_INSTALL_STAGING = YES OPUS_CFLAGS = $(TARGET_CFLAGS) +# opus has ARM assembly optimizations not compatible with thumb1: +# Error: selected processor does not support `smull r6,ip,r5,r0' in Thumb mode +# so force ARM mode +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +OPUS_CFLAGS += -marm +endif + ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) OPUS_CFLAGS += -O0 endif OPUS_CONF_ENV = CFLAGS="$(OPUS_CFLAGS)" +OPUS_CONF_OPTS = --enable-custom-modes ifeq ($(BR2_PACKAGE_OPUS_FIXED_POINT),y) OPUS_CONF_OPTS += --enable-fixed-point endif +ifeq ($(BR2_OPTIMIZE_FAST),y) +OPUS_CONF_OPTS += --enable-float-approx +endif + # When we're on ARM, but we don't have ARM instructions (only # Thumb-2), disable the usage of assembly as it is not Thumb-ready. ifeq ($(BR2_arm)$(BR2_armeb):$(BR2_ARM_CPU_HAS_ARM),y:) diff --git a/package/opusfile/0001-Propagate-allocation-failure-from-ogg_sync_buffer.patch b/package/opusfile/0001-Propagate-allocation-failure-from-ogg_sync_buffer.patch new file mode 100644 index 00000000000..2ef08502abb --- /dev/null +++ b/package/opusfile/0001-Propagate-allocation-failure-from-ogg_sync_buffer.patch @@ -0,0 +1,44 @@ +From 0a4cd796df5b030cb866f3f4a5e41a4b92caddf5 Mon Sep 17 00:00:00 2001 +From: Ralph Giles +Date: Tue, 6 Sep 2022 19:04:31 -0700 +Subject: [PATCH] Propagate allocation failure from ogg_sync_buffer. + +Instead of segfault, report OP_EFAULT if ogg_sync_buffer returns +a null pointer. This allows more graceful recovery by the caller +in the unlikely event of a fallible ogg_malloc call. + +We do check the return value elsewhere in the code, so the new +checks make the code more consistent. + +Thanks to https://github.com/xiph/opusfile/issues/36 for reporting. + +Signed-off-by: Timothy B. Terriberry +Signed-off-by: Mark Harris + +[Retrieved from: +https://github.com/xiph/opusfile/commit/0a4cd796df5b030cb866f3f4a5e41a4b92caddf5] +Signed-off-by: Fabrice Fontaine +--- + src/opusfile.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/opusfile.c b/src/opusfile.c +index ca219b2..3c3c81e 100644 +--- a/src/opusfile.c ++++ b/src/opusfile.c +@@ -148,6 +148,7 @@ static int op_get_data(OggOpusFile *_of,int _nbytes){ + int nbytes; + OP_ASSERT(_nbytes>0); + buffer=(unsigned char *)ogg_sync_buffer(&_of->oy,_nbytes); ++ if(OP_UNLIKELY(buffer==NULL))return OP_EFAULT; + nbytes=(int)(*_of->callbacks.read)(_of->stream,buffer,_nbytes); + OP_ASSERT(nbytes<=_nbytes); + if(OP_LIKELY(nbytes>0))ogg_sync_wrote(&_of->oy,nbytes); +@@ -1527,6 +1528,7 @@ static int op_open1(OggOpusFile *_of, + if(_initial_bytes>0){ + char *buffer; + buffer=ogg_sync_buffer(&_of->oy,(long)_initial_bytes); ++ if(OP_UNLIKELY(buffer==NULL))return OP_EFAULT; + memcpy(buffer,_initial_data,_initial_bytes*sizeof(*buffer)); + ogg_sync_wrote(&_of->oy,(long)_initial_bytes); + } diff --git a/package/opusfile/opusfile.mk b/package/opusfile/opusfile.mk index 72ae82e8017..63553a81e73 100644 --- a/package/opusfile/opusfile.mk +++ b/package/opusfile/opusfile.mk @@ -11,6 +11,9 @@ OPUSFILE_LICENSE = BSD-3-Clause OPUSFILE_LICENSE_FILES = COPYING OPUSFILE_INSTALL_STAGING = YES +# 0001-Propagate-allocation-failure-from-ogg_sync_buffer.patch +OPUSFILE_IGNORE_CVES += CVE-2022-47021 + ifeq ($(BR2_PACKAGE_OPENSSL),y) OPUSFILE_DEPENDENCIES += openssl else diff --git a/package/oracle-mysql/oracle-mysql.hash b/package/oracle-mysql/oracle-mysql.hash index 9d1c86854f3..c4ce39437e6 100644 --- a/package/oracle-mysql/oracle-mysql.hash +++ b/package/oracle-mysql/oracle-mysql.hash @@ -1,5 +1,5 @@ # From https://downloads.mariadb.com/archives/mysql-5.1/mysql-5.1.73.tar.gz.md5 -md5 887f869bcc757957067b9198f707f32f mysql-5.1.73.tar.gz +md5 887f869bcc757957067b9198f707f32f mysql-5.1.73.tar.gz # Locally computed sha256 05ebe21305408b24407d14b77607a3e5ffa3c300e03f1359d3066f301989dcb5 mysql-5.1.73.tar.gz sha256 cbf0dbf56528a629f4358a1339f981202f1a9a0d9542c092b03f486064ced2db README diff --git a/package/oracle-mysql/oracle-mysql.mk b/package/oracle-mysql/oracle-mysql.mk index f1f16abbb4d..1086e4125f2 100644 --- a/package/oracle-mysql/oracle-mysql.mk +++ b/package/oracle-mysql/oracle-mysql.mk @@ -13,6 +13,8 @@ ORACLE_MYSQL_DEPENDENCIES = ncurses ORACLE_MYSQL_AUTORECONF = YES ORACLE_MYSQL_LICENSE = GPL-2.0 ORACLE_MYSQL_LICENSE_FILES = README COPYING +ORACLE_MYSQL_CPE_ID_VENDOR = oracle +ORACLE_MYSQL_CPE_ID_PRODUCT = mysql ORACLE_MYSQL_SELINUX_MODULES = mysql ORACLE_MYSQL_PROVIDES = mysql ORACLE_MYSQL_CONFIG_SCRIPTS = mysql_config diff --git a/package/orbit/orbit.hash b/package/orbit/orbit.hash index eb427b63bbe..8f425417aa9 100644 --- a/package/orbit/orbit.hash +++ b/package/orbit/orbit.hash @@ -1,4 +1,4 @@ # computed by luarocks/buildroot -sha256 91e3c514d5b86918db83666c8889635bb2d50c71d1ab3aeb69c6469c9424089b orbit-2.2.4-1.src.rock -sha256 dd7d37caed0f4ee994e9e64ea4ab292dce549bb609412c84fc47ed079275ae98 orbit/doc/us/license.html -sha256 140134369c1f041abf7d8cd39a5b0c42f8b5e827695ce7c1ef5ca8f0911a0246 orbit/doc/us/license.md +sha256 91e3c514d5b86918db83666c8889635bb2d50c71d1ab3aeb69c6469c9424089b orbit-2.2.4-1.src.rock +sha256 dd7d37caed0f4ee994e9e64ea4ab292dce549bb609412c84fc47ed079275ae98 orbit/doc/us/license.html +sha256 140134369c1f041abf7d8cd39a5b0c42f8b5e827695ce7c1ef5ca8f0911a0246 orbit/doc/us/license.md diff --git a/package/orc/0001-orc-orccpu-powerpc.c-fix-build-with-kernel-4.11.patch b/package/orc/0001-orc-orccpu-powerpc.c-fix-build-with-kernel-4.11.patch deleted file mode 100644 index 0a4e7010f2d..00000000000 --- a/package/orc/0001-orc-orccpu-powerpc.c-fix-build-with-kernel-4.11.patch +++ /dev/null @@ -1,70 +0,0 @@ -From a45f6d49ec090ad94333c0865c378d2d96ab2af4 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 15 Feb 2021 20:17:43 +0100 -Subject: [PATCH] orc/orccpu-powerpc.c: fix build with kernel < 4.11 - -Build with powerpc and kernel < 4.11 is broken since version 0.4.30 and -https://gitlab.freedesktop.org/gstreamer/orc/-/commit/a999325abea6a5549d60d99ddeb0271d2aa00235: - -FAILED: orc/liborc-0.4.so.0.32.0.p/orccpu-powerpc.c.o -/home/giuliobenetti/autobuild/run/instance-3/output-1/host/bin/powerpc-linux-gcc -Iorc/liborc-0.4.so.0.32.0.p -Iorc -I../orc -I. -I.. -fdiagnostics-color=always -pipe -Wall -Winvalid-pch -std=gnu99 -O3 -DHAVE_CONFIG_H -fvisibility=hidden -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O2 -fPIC -pthread -DORC_ENABLE_UNSTABLE_API -D_GNU_SOURCE -DBUILDING_ORC -MD -MQ orc/liborc-0.4.so.0.32.0.p/orccpu-powerpc.c.o -MF orc/liborc-0.4.so.0.32.0.p/orccpu-powerpc.c.o.d -o orc/liborc-0.4.so.0.32.0.p/orccpu-powerpc.c.o -c ../orc/orccpu-powerpc.c -../orc/orccpu-powerpc.c: In function 'orc_check_powerpc_proc_auxv': -../orc/orccpu-powerpc.c:164:21: error: 'AT_L1D_CACHESIZE' undeclared (first use in this function); did you mean 'AT_DCACHEBSIZE'? - 164 | if (buf[i] == AT_L1D_CACHESIZE) { - | ^~~~~~~~~~~~~~~~ - | AT_DCACHEBSIZE -../orc/orccpu-powerpc.c:164:21: note: each undeclared identifier is reported only once for each function it appears in -../orc/orccpu-powerpc.c:168:21: error: 'AT_L2_CACHESIZE' undeclared (first use in this function); did you mean 'AT_ICACHEBSIZE'? - 168 | if (buf[i] == AT_L2_CACHESIZE) { - | ^~~~~~~~~~~~~~~ - | AT_ICACHEBSIZE -../orc/orccpu-powerpc.c:172:21: error: 'AT_L3_CACHESIZE' undeclared (first use in this function); did you mean 'AT_ICACHEBSIZE'? - 172 | if (buf[i] == AT_L3_CACHESIZE) { - | ^~~~~~~~~~~~~~~ - | AT_ICACHEBSIZE - -Indeed, AT_{L1D,L2,L3}_CACHESIZE is only defined since kernel 4.11 and -https://github.com/torvalds/linux/commit/98a5f361b8625c6f4841d6ba013bbf0e80d08147 - -Fixes: - - http://autobuild.buildroot.org/results/0821e96cba3e455edd47b87485501d892fc7ac6a - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.freedesktop.org/gstreamer/orc/-/merge_requests/56] ---- - orc/orccpu-powerpc.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/orc/orccpu-powerpc.c b/orc/orccpu-powerpc.c -index 6796f17..340cf05 100644 ---- a/orc/orccpu-powerpc.c -+++ b/orc/orccpu-powerpc.c -@@ -161,18 +161,24 @@ orc_check_powerpc_proc_auxv (void) - _orc_cpu_name = (char*)buf[i + 1]; - found++; - } -+#ifdef AT_L1D_CACHESIZE - if (buf[i] == AT_L1D_CACHESIZE) { - _orc_data_cache_size_level1 = buf[i + 1]; - found++; - } -+#endif -+#ifdef AT_L2_CACHESIZE - if (buf[i] == AT_L2_CACHESIZE) { - _orc_data_cache_size_level2 = buf[i + 1]; - found++; - } -+#endif -+#ifdef AT_L3_CACHESIZE - if (buf[i] == AT_L3_CACHESIZE) { - _orc_data_cache_size_level3 = buf[i + 1]; - found++; - } -+#endif - if (found == 6) - break; - } --- -2.30.0 - diff --git a/package/orc/orc.hash b/package/orc/orc.hash index f48c2932ab6..136fc3ece4d 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.32.tar.xz.sha256sum -sha256 a66e3d8f2b7e65178d786a01ef61f2a0a0b4d0b8370de7ce134ba73da4af18f0 orc-0.4.32.tar.xz +# From https://gstreamer.freedesktop.org/data/src/orc/orc-0.4.33.tar.xz.sha256sum +sha256 844e6d7db8086f793f57618d3d4b68d29d99b16034e71430df3c21cfd3c3542a orc-0.4.33.tar.xz # Locally calculated sha256 4f5dabb1b44bb6fc5cd53820b1f103147ad61b395a57903991325bd1b85d97bf COPYING diff --git a/package/orc/orc.mk b/package/orc/orc.mk index a93a4f875af..be718e6f850 100644 --- a/package/orc/orc.mk +++ b/package/orc/orc.mk @@ -4,7 +4,7 @@ # ################################################################################ -ORC_VERSION = 0.4.32 +ORC_VERSION = 0.4.33 ORC_SOURCE = orc-$(ORC_VERSION).tar.xz ORC_SITE = http://gstreamer.freedesktop.org/data/src/orc ORC_LICENSE = BSD-2-Clause, BSD-3-Clause diff --git a/package/osm2pgsql/Config.in b/package/osm2pgsql/Config.in index e903e92c49e..3e73572a800 100644 --- a/package/osm2pgsql/Config.in +++ b/package/osm2pgsql/Config.in @@ -22,7 +22,7 @@ config BR2_PACKAGE_OSM2PGSQL https://osm2pgsql.org -comment "osm2pgsql needs a toolchain w/ C++, wchar, threads, gcc >= 4.9" +comment "osm2pgsql needs a toolchain w/ C++, wchar, threads, gcc >= 4.9" depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/osm2pgsql/osm2pgsql.hash b/package/osm2pgsql/osm2pgsql.hash index 898fcd55007..b5b76c15c68 100644 --- a/package/osm2pgsql/osm2pgsql.hash +++ b/package/osm2pgsql/osm2pgsql.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 0ec8b58ab972ac8356185af4161270c1b625a77299f09e5fb7f45e616ef1a9a5 osm2pgsql-1.6.0.tar.gz +sha256 b266b50f46fe4d1caddab61d26b39f10ea33b896ec23b8b3e294be4666e7b927 osm2pgsql-1.8.0.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/osm2pgsql/osm2pgsql.mk b/package/osm2pgsql/osm2pgsql.mk index d389fff590e..9cdfb44ce08 100644 --- a/package/osm2pgsql/osm2pgsql.mk +++ b/package/osm2pgsql/osm2pgsql.mk @@ -4,7 +4,7 @@ # ################################################################################ -OSM2PGSQL_VERSION = 1.6.0 +OSM2PGSQL_VERSION = 1.8.0 OSM2PGSQL_SITE = $(call github,openstreetmap,osm2pgsql,$(OSM2PGSQL_VERSION)) OSM2PGSQL_LICENSE = GPL-2.0+ OSM2PGSQL_LICENSE_FILES = COPYING diff --git a/package/paho-mqtt-c/paho-mqtt-c.hash b/package/paho-mqtt-c/paho-mqtt-c.hash index 4cdedfbf9af..529c538ff25 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 386c9b5fa1cf6d0d516db12d57fd8f6a410dd0fdc5e9a2da870aae437a2535ed paho-mqtt-c-1.3.9.tar.gz +sha256 6a70a664ed3bbcc1eafdc45a5dc11f3ad70c9bac12a54c2f8cef15c0e7d0a93b paho-mqtt-c-1.3.12.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 68b58f2e026..8d1fe009a75 100644 --- a/package/paho-mqtt-c/paho-mqtt-c.mk +++ b/package/paho-mqtt-c/paho-mqtt-c.mk @@ -4,13 +4,14 @@ # ################################################################################ -PAHO_MQTT_C_VERSION = 1.3.9 +PAHO_MQTT_C_VERSION = 1.3.12 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 PAHO_MQTT_C_INSTALL_STAGING = YES PAHO_MQTT_C_CONF_OPTS = \ + -DCMAKE_INSTALL_DOCDIR=share/doc/libpaho-mqtt \ -DPAHO_ENABLE_TESTING=FALSE \ -DPAHO_ENABLE_CPACK=FALSE \ -DPAHO_HIGH_PERFORMANCE=TRUE diff --git a/package/pahole/pahole.hash b/package/pahole/pahole.hash index 420db15e758..5610b252a3e 100644 --- a/package/pahole/pahole.hash +++ b/package/pahole/pahole.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 cde85af68b368f50a913be387f94f6b43612a04af6c92387b4dcabb712a668fe pahole-v1.23-br1.tar.gz +sha256 eeb88a62c3aaa1f4c389117b7e7cc08a49acc8a0e7f165f76dd9c5ab9af2c266 pahole-1.24.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/pahole/pahole.mk b/package/pahole/pahole.mk index 1ad937062df..82bba2f7771 100644 --- a/package/pahole/pahole.mk +++ b/package/pahole/pahole.mk @@ -4,14 +4,14 @@ # ################################################################################ -PAHOLE_VERSION = v1.23 -PAHOLE_SITE = git://git.kernel.org/pub/scm/devel/pahole/pahole.git -PAHOLE_SITE_METHOD = git -# pahole contains git submodule and relies on them to be built. -PAHOLE_GIT_SUBMODULES = YES -HOST_PAHOLE_DEPENDENCIES = host-elfutils +PAHOLE_VERSION = 1.24 +PAHOLE_SITE = https://git.kernel.org/pub/scm/devel/pahole/pahole.git/snapshot +HOST_PAHOLE_DEPENDENCIES = \ + host-elfutils \ + host-libbpf # Defining __LIB is needed to build pahole. -HOST_PAHOLE_CONF_OPTS = -D__LIB=lib +# Set LIBBPF_EMBEDDED to OFF to use host-libbpf. +HOST_PAHOLE_CONF_OPTS = -D__LIB=lib -DLIBBPF_EMBEDDED=OFF PAHOLE_LICENSE = GPL-2.0 PAHOLE_LICENSE_FILES = COPYING diff --git a/package/pamtester/pamtester.hash b/package/pamtester/pamtester.hash index 17497e31590..72a3fabffa7 100644 --- a/package/pamtester/pamtester.hash +++ b/package/pamtester/pamtester.hash @@ -1,3 +1,3 @@ # from https://sourceforge.net/projects/pamtester/files/pamtester/0.1.2/ -sha1 33bcc610d7f208b50a0a23c144bdbd1e2cae4ac6 pamtester-0.1.2.tar.gz -sha256 1e3922a8ab0907c1f3bcc3e00005ef88930e50d0890f40a6a39f5f83b05f05cc LICENSE +sha1 33bcc610d7f208b50a0a23c144bdbd1e2cae4ac6 pamtester-0.1.2.tar.gz +sha256 1e3922a8ab0907c1f3bcc3e00005ef88930e50d0890f40a6a39f5f83b05f05cc LICENSE diff --git a/package/pamtester/pamtester.mk b/package/pamtester/pamtester.mk index b09e4d1cc09..77867403c3c 100644 --- a/package/pamtester/pamtester.mk +++ b/package/pamtester/pamtester.mk @@ -10,4 +10,9 @@ PAMTESTER_DEPENDENCIES = linux-pam PAMTESTER_LICENSE = BSD-3-Clause PAMTESTER_LICENSE_FILES = LICENSE +# Obsolete constructs in the archaic configure.in generated an outworn +# configure script that incorrectly searches a C++ compiler. Regenerate +# the autoconf machinery to avoid failures without a C++ compiler. +PAMTESTER_AUTORECONF = YES + $(eval $(autotools-package)) diff --git a/package/pango/pango.hash b/package/pango/pango.hash index a6c924a8c9a..1dbc5c9197f 100644 --- a/package/pango/pango.hash +++ b/package/pango/pango.hash @@ -1,5 +1,5 @@ -# From https://ftp.acc.umu.se/pub/GNOME/sources/pango/1.50/pango-1.50.3.sha256sum -sha256 4add05edf51c1fb375a1ccde7498914120e23cb280dd7395b1aeb441f1838a4c pango-1.50.3.tar.xz +# From https://download.gnome.org/sources/pango/1.50/pango-1.50.12.sha256sum +sha256 caef96d27bbe792a6be92727c73468d832b13da57c8071ef79b9df69ee058fe3 pango-1.50.12.tar.xz # Locally computed sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING diff --git a/package/pango/pango.mk b/package/pango/pango.mk index 684407228f3..f19faf05021 100644 --- a/package/pango/pango.mk +++ b/package/pango/pango.mk @@ -5,9 +5,9 @@ ################################################################################ PANGO_VERSION_MAJOR = 1.50 -PANGO_VERSION = $(PANGO_VERSION_MAJOR).3 +PANGO_VERSION = $(PANGO_VERSION_MAJOR).12 PANGO_SOURCE = pango-$(PANGO_VERSION).tar.xz -PANGO_SITE = http://ftp.gnome.org/pub/GNOME/sources/pango/$(PANGO_VERSION_MAJOR) +PANGO_SITE = https://download.gnome.org/sources/pango/$(PANGO_VERSION_MAJOR) PANGO_INSTALL_STAGING = YES PANGO_LICENSE = LGPL-2.0+ PANGO_LICENSE_FILES = COPYING diff --git a/package/pangomm/Config.in b/package/pangomm/Config.in index c23ac4aaa8e..6ddad9e6efe 100644 --- a/package/pangomm/Config.in +++ b/package/pangomm/Config.in @@ -1,5 +1,5 @@ config BR2_PACKAGE_PANGOMM - bool "pangomm" + bool "pangomm (latest)" depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz depends on BR2_INSTALL_LIBSTDCPP # glibmm/pango depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # libsigc diff --git a/package/pangomm/pangomm.hash b/package/pangomm/pangomm.hash index 3fba695831c..0fb40e6568f 100644 --- a/package/pangomm/pangomm.hash +++ b/package/pangomm/pangomm.hash @@ -1,4 +1,4 @@ -# From http://ftp.gnome.org/pub/gnome/sources/pangomm/2.48/pangomm-2.48.2.sha256sum +# From https://download.gnome.org/sources/pangomm/2.48/pangomm-2.48.2.sha256sum sha256 e1d75522c53f462799875cd247f9b49c91ced4b1abe68387ac35b271392d4ea5 pangomm-2.48.2.tar.xz # Locally computed sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING diff --git a/package/pangomm/pangomm.mk b/package/pangomm/pangomm.mk index af90d69c4e0..e5b237197bb 100644 --- a/package/pangomm/pangomm.mk +++ b/package/pangomm/pangomm.mk @@ -7,7 +7,7 @@ PANGOMM_VERSION_MAJOR = 2.48 PANGOMM_VERSION = $(PANGOMM_VERSION_MAJOR).2 PANGOMM_SOURCE = pangomm-$(PANGOMM_VERSION).tar.xz -PANGOMM_SITE = http://ftp.gnome.org/pub/gnome/sources/pangomm/$(PANGOMM_VERSION_MAJOR) +PANGOMM_SITE = https://download.gnome.org/sources/pangomm/$(PANGOMM_VERSION_MAJOR) PANGOMM_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) PANGOMM_LICENSE_FILES = COPYING COPYING.tools PANGOMM_INSTALL_STAGING = YES diff --git a/package/pangomm2_46/Config.in b/package/pangomm2_46/Config.in new file mode 100644 index 00000000000..772b523c83f --- /dev/null +++ b/package/pangomm2_46/Config.in @@ -0,0 +1,25 @@ +config BR2_PACKAGE_PANGOMM2_46 + bool "pangomm (2.46.x)" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz + depends on BR2_INSTALL_LIBSTDCPP # glibmm/pango + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 + depends on BR2_TOOLCHAIN_HAS_THREADS # *mm/pango -> libglib2 + depends on BR2_USE_MMU # *mm/pango -> libglib2 + depends on BR2_USE_WCHAR # *mm/pango -> libglib2 + select BR2_PACKAGE_CAIROMM1_14 + select BR2_PACKAGE_GLIBMM2_66 + select BR2_PACKAGE_PANGO + select BR2_PACKAGE_LIBSIGC2 + help + The pangomm package is a set of C++ bindings for Pango. + + This is the last version before the API and ABI change + introduced in 2.48.0 which requires C++17. + + http://www.gtkmm.org/ + +comment "pangomm (2.46.x) needs a toolchain w/ C++, wchar, threads, gcc >= 4.9" + 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_TOOLCHAIN_HAS_THREADS diff --git a/package/pangomm2_46/pangomm2_46.hash b/package/pangomm2_46/pangomm2_46.hash new file mode 100644 index 00000000000..8d05dbc2ffb --- /dev/null +++ b/package/pangomm2_46/pangomm2_46.hash @@ -0,0 +1,5 @@ +# From https://download.gnome.org/sources/pangomm/2.46/pangomm-2.46.3.sha256sum +sha256 410fe04d471a608f3f0273d3a17d840241d911ed0ff2c758a9859c66c6f24379 pangomm-2.46.3.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 new file mode 100644 index 00000000000..17251584910 --- /dev/null +++ b/package/pangomm2_46/pangomm2_46.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# pangomm2_46 +# +################################################################################ + +PANGOMM2_46_VERSION_MAJOR = 2.46 +PANGOMM2_46_VERSION = $(PANGOMM2_46_VERSION_MAJOR).3 +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) +PANGOMM2_46_LICENSE_FILES = COPYING COPYING.tools +PANGOMM2_46_INSTALL_STAGING = YES +PANGOMM2_46_DEPENDENCIES = glibmm2_66 cairomm1_14 libsigc2 pango host-pkgconf + +$(eval $(meson-package)) diff --git a/package/parted/parted.hash b/package/parted/parted.hash index 2c466eb8d2e..8a167d9bb8f 100644 --- a/package/parted/parted.hash +++ b/package/parted/parted.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 57e2b4bd87018625c515421d4524f6e3b55175b472302056391c5f7eccb83d44 parted-3.3.tar.xz +sha256 4938dd5c1c125f6c78b1f4b3e297526f18ee74aa43d45c248578b1d2470c05a2 parted-3.5.tar.xz # Locally calculated -sha256 0abbff814cd00e2b0b6d08395af2b419c1a92026c4b4adacbb65ccda45fa58cf COPYING +sha256 0abbff814cd00e2b0b6d08395af2b419c1a92026c4b4adacbb65ccda45fa58cf COPYING diff --git a/package/parted/parted.mk b/package/parted/parted.mk index 66940fc516f..6d4626e2e67 100644 --- a/package/parted/parted.mk +++ b/package/parted/parted.mk @@ -4,7 +4,7 @@ # ################################################################################ -PARTED_VERSION = 3.3 +PARTED_VERSION = 3.5 PARTED_SOURCE = parted-$(PARTED_VERSION).tar.xz PARTED_SITE = $(BR2_GNU_MIRROR)/parted PARTED_DEPENDENCIES = host-pkgconf util-linux diff --git a/package/patch/patch.hash b/package/patch/patch.hash index 917d951a94d..f43400ea710 100644 --- a/package/patch/patch.hash +++ b/package/patch/patch.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd patch-2.7.6.tar.xz +sha256 ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd patch-2.7.6.tar.xz # Locally calculated -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/patchelf/0001-Add-option-to-make-the-rpath-relative-under-a-specif.patch b/package/patchelf/0001-Add-option-to-make-the-rpath-relative-under-a-specif.patch new file mode 100644 index 00000000000..8710bfb629a --- /dev/null +++ b/package/patchelf/0001-Add-option-to-make-the-rpath-relative-under-a-specif.patch @@ -0,0 +1,338 @@ +From 618220bfb55c875d6a4d197cb24fe632ac93ec85 Mon Sep 17 00:00:00 2001 +From: Wolfgang Grandegger +Date: Mon, 20 Feb 2017 16:29:24 +0100 +Subject: [PATCH] Add option to make the rpath relative under a specified root + directory + +Running "patchelf" with the option "--make-rpath-relative ROOTDIR" will +modify or delete the RPATHDIRs according the following rules +similar to Martin's patches [1] making the Buildroot toolchaing/SDK +relocatable. + +RPATHDIR starts with "$ORIGIN": + The original build-system already took care of setting a relative + RPATH, resolve it and test if it's valid (does exist) + +RPATHDIR starts with ROOTDIR: + The original build-system added some absolute RPATH (absolute on + the build machine). Test if it's valid (does exist). + +ROOTDIR/RPATHDIR exists: + The original build-system already took care of setting an absolute + RPATH (absolute in the final rootfs), resolve it and test if it's + valid (does exist). + +RPATHDIR points somewhere else: + (can be anywhere: build trees, staging tree, host location, + non-existing location, etc.). Just discard such a path. + +The option "--no-standard-libs" will discard RPATHDIRs ROOTDIR/lib and +ROOTDIR/usr/lib. Like "--shrink-rpath", RPATHDIRs are also discarded +if the directories do not contain a library referenced by the +DT_NEEDED fields. +If the option "--relative-to-file" is given, the rpath will start +with "$ORIGIN" making it relative to the ELF file, otherwise an +absolute path relative to ROOTDIR will be used. + +A pull request for a similar patch [2] for mainline inclusion is +pending. + +[1] http://lists.busybox.net/pipermail/buildroot/2016-April/159422.html +[2] https://github.com/NixOS/patchelf/pull/118 + +Signed-off-by: Wolfgang Grandegger +[Fabrice: update for 0.13] +Signed-off-by: Fabrice Fontaine +--- + src/patchelf.cc | 196 ++++++++++++++++++++++++++++++++++++++++++++++++++------ + 1 file changed, 175 insertions(+), 21 deletions(-) + +diff --git a/src/patchelf.cc b/src/patchelf.cc +index 1d9a772..35b4a33 100644 +--- a/src/patchelf.cc ++++ b/src/patchelf.cc +@@ -46,6 +46,10 @@ static bool debugMode = false; + + static bool forceRPath = false; + ++static bool noStandardLibDirs = false; ++ ++static bool relativeToFile = false; ++ + static std::vector fileNames; + static std::string outputFileName; + static bool alwaysWrite = false; +@@ -77,6 +81,49 @@ static unsigned int getPageSize(){ + return pageSize; + } + ++static bool absolutePathExists(const std::string & path, std::string & canonicalPath) ++{ ++ char *cpath = realpath(path.c_str(), NULL); ++ if (cpath) { ++ canonicalPath = cpath; ++ free(cpath); ++ return true; ++ } else { ++ return false; ++ } ++} ++ ++static std::string makePathRelative(const std::string & path, ++ const std::string & refPath) ++{ ++ std::string relPath = "$ORIGIN"; ++ std::string p = path, refP = refPath; ++ size_t pos; ++ ++ /* Strip the common part of path and refPath */ ++ while (true) { ++ pos = p.find_first_of('/', 1); ++ if (refP.find_first_of('/', 1) != pos) ++ break; ++ if (p.substr(0, pos) != refP.substr(0, pos)) ++ break; ++ if (pos == std::string::npos) ++ break; ++ p = p.substr(pos); ++ refP = refP.substr(pos); ++ } ++ /* Check if both pathes are equal */ ++ if (p != refP) { ++ pos = 0; ++ while (pos != std::string::npos) { ++ pos =refP.find_first_of('/', pos + 1); ++ relPath.append("/.."); ++ } ++ relPath.append(p); ++ } ++ ++ return relPath; ++} + + template + class ElfFile +@@ -183,9 +230,13 @@ public: + + void setInterpreter(const string & newInterpreter); + +- typedef enum { rpPrint, rpShrink, rpSet, rpAdd, rpRemove } RPathOp; ++ typedef enum { rpPrint, rpShrink, rpMakeRelative, rpSet, rpAdd, rpRemove} RPathOp; ++ ++ bool libFoundInRPath(const std::string & dirName, ++ const std::vector neededLibs, ++ std::vector & neededLibFound); + +- void modifyRPath(RPathOp op, const std::vector & allowedRpathPrefixes, std::string newRPath); ++ void modifyRPath(RPathOp op, std::string rootDir, const std::vector & allowedRpathPrefixes, std::string newRPath, const std::string & fileName); + + void addNeeded(set libs); + +@@ -1041,8 +1092,28 @@ static void concatToRPath(string & rpath, const string & path) + + + template +-void ElfFile::modifyRPath(RPathOp op, +- const std::vector & allowedRpathPrefixes, std::string newRPath) ++bool ElfFile::libFoundInRPath(const std::string & dirName, ++ const std::vector neededLibs, std::vector & neededLibFound) ++{ ++ /* For each library that we haven't found yet, see if it ++ exists in this directory. */ ++ bool libFound = false; ++ for (unsigned int j = 0; j < neededLibs.size(); ++j) ++ if (!neededLibFound[j]) { ++ std::string libName = dirName + "/" + neededLibs[j]; ++ struct stat st; ++ if (stat(libName.c_str(), &st) == 0) { ++ neededLibFound[j] = true; ++ libFound = true; ++ } ++ } ++ return libFound; ++} ++ ++ ++template ++void ElfFile::modifyRPath(RPathOp op, std::string rootDir, ++ const std::vector & allowedRpathPrefixes, std::string newRPath, const std::string & fileName) + { + Elf_Shdr & shdrDynamic = findSection(".dynamic"); + +@@ -1096,6 +1167,11 @@ void ElfFile::modifyRPath(RPathOp op, string newRPath) + return; + } + ++ if (op == rpMakeRelative && !rpath) { ++ debug("no RPATH to make relative\n"); ++ return; ++ } ++ + if (op == rpShrink && !rpath) { + debug("no RPATH to shrink\n"); + return; +@@ -1120,31 +1196,80 @@ void ElfFile::modifyRPath(RPathOp op, string newRPath) + continue; + } + +- /* For each library that we haven't found yet, see if it +- exists in this directory. */ +- bool libFound = false; +- for (unsigned int j = 0; j < neededLibs.size(); ++j) +- if (!neededLibFound[j]) { +- std::string libName = dirName + "/" + neededLibs[j]; +- try { +- Elf32_Half library_e_machine = getElfType(readFile(libName, sizeof(Elf32_Ehdr))).machine; +- if (rdi(library_e_machine) == rdi(hdr->e_machine)) { +- neededLibFound[j] = true; +- libFound = true; +- } else +- debug("ignoring library '%s' because its machine type differs\n", libName.c_str()); +- } catch (SysError & e) { +- if (e.errNo != ENOENT) throw; +- } +- } +- +- if (!libFound) ++ if (!libFoundInRPath(dirName, neededLibs, neededLibFound)) + debug("removing directory '%s' from RPATH\n", dirName.c_str()); + else + concatToRPath(newRPath, dirName); + } + } + ++ /* Make the the RPATH relative to the specified path */ ++ if (op == rpMakeRelative) { ++ std::vector neededLibFound(neededLibs.size(), false); ++ std::string fileDir = fileName.substr(0, fileName.find_last_of("/")); ++ ++ newRPath = ""; ++ ++ std::vector rpathDirs = splitColonDelimitedString(rpath); ++ for (std::vector::iterator it = rpathDirs.begin(); it != rpathDirs.end(); ++it) { ++ const std::string & dirName = *it; ++ ++ std::string canonicalPath; ++ ++ /* Figure out if we should keep or discard the path. There are several ++ cases to be handled: ++ "dirName" starts with "$ORIGIN": ++ The original build-system already took care of setting a relative ++ RPATH. Resolve it and test if it's valid (does exist). ++ "dirName" start with "rootDir": ++ The original build-system added some absolute RPATH (absolute on ++ the build machine). Test if it's valid (does exist). ++ "rootDir"/"dirName" exists: ++ The original build-system already took care of setting an absolute ++ RPATH (absolute in the final rootfs). Resolve it and test if it's ++ valid (does exist). ++ "dirName" points somewhere else: ++ (can be anywhere: build trees, staging tree, host location, ++ non-existing location, etc.). Just discard such a path. */ ++ if (!dirName.compare(0, 7, "$ORIGIN")) { ++ std::string path = fileDir + dirName.substr(7); ++ if (!absolutePathExists(path, canonicalPath)) { ++ debug("removing directory '%s' from RPATH because '%s' doesn't exist\n", ++ dirName.c_str(), path.c_str()); ++ continue; ++ } ++ } else if (!dirName.compare(0, rootDir.length(), rootDir)) { ++ if (!absolutePathExists(dirName, canonicalPath)) { ++ debug("removing directory '%s' from RPATH because it doesn't exist\n", dirName.c_str()); ++ continue; ++ } ++ } else { ++ std::string path = rootDir + dirName; ++ if (!absolutePathExists(path, canonicalPath)) { ++ debug("removing directory '%s' from RPATH because it's not in rootdir\n", ++ dirName.c_str()); ++ continue; ++ } ++ } ++ ++ if (noStandardLibDirs) { ++ if (!canonicalPath.compare(rootDir + "/lib") || ++ !canonicalPath.compare(rootDir + "/usr/lib")) { ++ debug("removing directory '%s' from RPATH because it's a standard library directory\n", ++ dirName.c_str()); ++ continue; ++ } ++ } ++ ++ /* Finally make "canonicalPath" relative to "filedir" in "rootDir" */ ++ if (relativeToFile) ++ concatToRPath(newRPath, makePathRelative(canonicalPath, fileDir)); ++ else ++ concatToRPath(newRPath, canonicalPath.substr(rootDir.length())); ++ debug("keeping relative path of %s\n", canonicalPath.c_str()); ++ } ++ } ++ + if (op == rpRemove) { + if (!rpath) { + debug("no RPATH to delete\n"); +@@ -1413,7 +1543,9 @@ static bool shrinkRPath = false; + static bool setRPath = false; + static bool addRPath = false; + static bool printRPath = false; ++static bool makeRPathRelative = false; + static std::string newRPath; ++static std::string rootDir; + static std::set neededLibsToRemove; + static std::map neededLibsToReplace; + static std::set neededLibsToAdd; +@@ -1438,16 +1570,18 @@ static void patchElf2(ElfFile & elfFile) + elfFile.setInterpreter(newInterpreter); + + if (printRPath) +- elfFile.modifyRPath(elfFile.rpPrint, {}, ""); ++ elfFile.modifyRPath(elfFile.rpPrint, "", {}, "", fileName); + + if (shrinkRPath) +- elfFile.modifyRPath(elfFile.rpShrink, allowedRpathPrefixes, ""); ++ elfFile.modifyRPath(elfFile.rpShrink, "", allowedRpathPrefixes, "", fileName); + else if (removeRPath) +- elfFile.modifyRPath(elfFile.rpRemove, {}, ""); ++ elfFile.modifyRPath(elfFile.rpRemove, "", {}, "", fileName); + else if (setRPath) +- elfFile.modifyRPath(elfFile.rpSet, {}, newRPath); ++ elfFile.modifyRPath(elfFile.rpSet, "", {}, newRPath, fileName); + else if (addRPath) +- elfFile.modifyRPath(elfFile.rpAdd, {}, newRPath); ++ elfFile.modifyRPath(elfFile.rpAdd, "", {}, newRPath, fileName); ++ else if (makeRPathRelative) ++ elfFile.modifyRPath(elfFile.rpMakeRelative, rootDir, {}, "", fileName); + + if (printNeeded) elfFile.printNeededLibs(); + +@@ -1508,6 +1642,9 @@ void showHelp(const string & progName) + [--remove-rpath]\n\ + [--shrink-rpath]\n\ + [--allowed-rpath-prefixes PREFIXES]\t\tWith '--shrink-rpath', reject rpath entries not starting with the allowed prefix\n\ ++ [--make-rpath-relative ROOTDIR]\n\ ++ [--no-standard-lib-dirs]\n\ ++ [--relative-to-file]\n\ + [--print-rpath]\n\ + [--force-rpath]\n\ + [--add-needed LIBRARY]\n\ +@@ -1564,6 +1701,17 @@ int main(int argc, char * * argv) + setRPath = true; + newRPath = argv[i]; + } ++ else if (arg == "--make-rpath-relative") { ++ if (++i == argc) error("missing argument to --make-rpath-relative"); ++ makeRPathRelative = true; ++ rootDir = argv[i]; ++ } ++ else if (arg == "--no-standard-lib-dirs") { ++ noStandardLibDirs = true; ++ } ++ else if (arg == "--relative-to-file") { ++ relativeToFile = true; ++ } + else if (arg == "--print-rpath") { + printRPath = true; + } +-- +1.9.1 + diff --git a/package/patchelf/0001-Remove-apparently-incorrect-usage-of-static.patch b/package/patchelf/0001-Remove-apparently-incorrect-usage-of-static.patch deleted file mode 100644 index dc462eff43e..00000000000 --- a/package/patchelf/0001-Remove-apparently-incorrect-usage-of-static.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 2480efa8411523cf046094492192a5ee451aae5d Mon Sep 17 00:00:00 2001 -From: Eelco Dolstra -Date: Mon, 19 Sep 2016 17:31:37 +0200 -Subject: [PATCH] Remove apparently incorrect usage of "static" - -[Upstream-commit: https://github.com/NixOS/patchelf/commit/a365bcb7d7025da51b33165ef7ebc7180199a05e -This patch also removes the DT_INIT symbols from needed_libs (DT_INIT -points to library initialisation function, not to needed libraries...)] -Signed-off-by: Wolfgang Grandegger ---- - src/patchelf.cc | 8 +++----- - 1 file changed, 3 insertions(+), 5 deletions(-) - -diff --git a/src/patchelf.cc b/src/patchelf.cc -index 136098f..c870638 100644 ---- a/src/patchelf.cc -+++ b/src/patchelf.cc -@@ -941,7 +941,6 @@ void ElfFile::modifySoname(sonameMode op, const string & newS - assert(strTabAddr == rdi(shdrDynStr.sh_addr)); - - /* Walk through the dynamic section, look for the DT_SONAME entry. */ -- static vector neededLibs; - dyn = (Elf_Dyn *) (contents + rdi(shdrDynamic.sh_offset)); - Elf_Dyn * dynSoname = 0; - char * soname = 0; -@@ -949,8 +948,7 @@ void ElfFile::modifySoname(sonameMode op, const string & newS - if (rdi(dyn->d_tag) == DT_SONAME) { - dynSoname = dyn; - soname = strTab + rdi(dyn->d_un.d_val); -- } else if (rdi(dyn->d_tag) == DT_INIT) -- neededLibs.push_back(string(strTab + rdi(dyn->d_un.d_val))); -+ } - } - - if (op == printSoname) { -@@ -1058,7 +1056,7 @@ void ElfFile::modifyRPath(RPathOp op, string newRPath) - unless you use its `--enable-new-dtag' option, in which case it - generates a DT_RPATH and DT_RUNPATH pointing at the same - string. */ -- static vector neededLibs; -+ vector neededLibs; - dyn = (Elf_Dyn *) (contents + rdi(shdrDynamic.sh_offset)); - Elf_Dyn * dynRPath = 0, * dynRunPath = 0; - char * rpath = 0; -@@ -1091,7 +1089,7 @@ void ElfFile::modifyRPath(RPathOp op, string newRPath) - /* For each directory in the RPATH, check if it contains any - needed library. */ - if (op == rpShrink) { -- static vector neededLibFound(neededLibs.size(), false); -+ vector neededLibFound(neededLibs.size(), false); - - newRPath = ""; - --- -1.9.1 - diff --git a/package/patchelf/0002-Extract-a-function-for-splitting-a-colon-separated-s.patch b/package/patchelf/0002-Extract-a-function-for-splitting-a-colon-separated-s.patch deleted file mode 100644 index 330bea23bc0..00000000000 --- a/package/patchelf/0002-Extract-a-function-for-splitting-a-colon-separated-s.patch +++ /dev/null @@ -1,63 +0,0 @@ -From a8452dc7e80eb17572c7458e33a4f4d609e6a3da Mon Sep 17 00:00:00 2001 -From: Tuomas Tynkkynen -Date: Fri, 3 Jun 2016 23:03:51 +0300 -Subject: [PATCH] Extract a function for splitting a colon-separated string - -We're going to need this logic in another place, so make a function of -this. - -[Upstream-commit: https://github.com/NixOS/patchelf/commit/2e3fdc2030c75c19df6fc2924083cfad53856562] -Signed-off-by: Wolfgang Grandegger ---- - src/patchelf.cc | 28 +++++++++++++++++++--------- - 1 file changed, 19 insertions(+), 9 deletions(-) - -diff --git a/src/patchelf.cc b/src/patchelf.cc -index c870638..1d9a772 100644 ---- a/src/patchelf.cc -+++ b/src/patchelf.cc -@@ -57,6 +57,22 @@ unsigned char * contents = 0; - #define ElfFileParamNames Elf_Ehdr, Elf_Phdr, Elf_Shdr, Elf_Addr, Elf_Off, Elf_Dyn, Elf_Sym - - -+static vector splitColonDelimitedString(const char * s){ -+ vector parts; -+ const char * pos = s; -+ while (*pos) { -+ const char * end = strchr(pos, ':'); -+ if (!end) end = strchr(pos, 0); -+ -+ parts.push_back(string(pos, end - pos)); -+ if (*end == ':') ++end; -+ pos = end; -+ } -+ -+ return parts; -+} -+ -+ - static unsigned int getPageSize(){ - return pageSize; - } -@@ -1093,15 +1109,9 @@ void ElfFile::modifyRPath(RPathOp op, string newRPath) - - newRPath = ""; - -- char * pos = rpath; -- while (*pos) { -- char * end = strchr(pos, ':'); -- if (!end) end = strchr(pos, 0); -- -- /* Get the name of the directory. */ -- string dirName(pos, end - pos); -- if (*end == ':') ++end; -- pos = end; -+ vector rpathDirs = splitColonDelimitedString(rpath); -+ for (vector::iterator it = rpathDirs.begin(); it != rpathDirs.end(); ++it) { -+ const string & dirName = *it; - - /* Non-absolute entries are allowed (e.g., the special - "$ORIGIN" hack). */ --- -1.9.1 - diff --git a/package/patchelf/0003-Add-option-to-make-the-rpath-relative-under-a-specif.patch b/package/patchelf/0003-Add-option-to-make-the-rpath-relative-under-a-specif.patch deleted file mode 100644 index f9f2537a6cf..00000000000 --- a/package/patchelf/0003-Add-option-to-make-the-rpath-relative-under-a-specif.patch +++ /dev/null @@ -1,326 +0,0 @@ -From 618220bfb55c875d6a4d197cb24fe632ac93ec85 Mon Sep 17 00:00:00 2001 -From: Wolfgang Grandegger -Date: Mon, 20 Feb 2017 16:29:24 +0100 -Subject: [PATCH] Add option to make the rpath relative under a specified root - directory - -Running "patchelf" with the option "--make-rpath-relative ROOTDIR" will -modify or delete the RPATHDIRs according the following rules -similar to Martin's patches [1] making the Buildroot toolchaing/SDK -relocatable. - -RPATHDIR starts with "$ORIGIN": - The original build-system already took care of setting a relative - RPATH, resolve it and test if it's valid (does exist) - -RPATHDIR starts with ROOTDIR: - The original build-system added some absolute RPATH (absolute on - the build machine). Test if it's valid (does exist). - -ROOTDIR/RPATHDIR exists: - The original build-system already took care of setting an absolute - RPATH (absolute in the final rootfs), resolve it and test if it's - valid (does exist). - -RPATHDIR points somewhere else: - (can be anywhere: build trees, staging tree, host location, - non-existing location, etc.). Just discard such a path. - -The option "--no-standard-libs" will discard RPATHDIRs ROOTDIR/lib and -ROOTDIR/usr/lib. Like "--shrink-rpath", RPATHDIRs are also discarded -if the directories do not contain a library referenced by the -DT_NEEDED fields. -If the option "--relative-to-file" is given, the rpath will start -with "$ORIGIN" making it relative to the ELF file, otherwise an -absolute path relative to ROOTDIR will be used. - -A pull request for a similar patch [2] for mainline inclusion is -pending. - -[1] http://lists.busybox.net/pipermail/buildroot/2016-April/159422.html -[2] https://github.com/NixOS/patchelf/pull/118 - -Signed-off-by: Wolfgang Grandegger ---- - src/patchelf.cc | 196 ++++++++++++++++++++++++++++++++++++++++++++++++++------ - 1 file changed, 175 insertions(+), 21 deletions(-) - -diff --git a/src/patchelf.cc b/src/patchelf.cc -index 1d9a772..35b4a33 100644 ---- a/src/patchelf.cc -+++ b/src/patchelf.cc -@@ -46,6 +46,10 @@ static bool debugMode = false; - - static bool forceRPath = false; - -+static bool noStandardLibDirs = false; -+ -+static bool relativeToFile = false; -+ - static string fileName; - static int pageSize = PAGESIZE; - -@@ -77,6 +81,49 @@ static unsigned int getPageSize(){ - return pageSize; - } - -+static bool absolutePathExists(const string & path, string & canonicalPath) -+{ -+ char *cpath = realpath(path.c_str(), NULL); -+ if (cpath) { -+ canonicalPath = cpath; -+ free(cpath); -+ return true; -+ } else { -+ return false; -+ } -+} -+ -+static string makePathRelative(const string & path, -+ const string & refPath) -+{ -+ string relPath = "$ORIGIN"; -+ string p = path, refP = refPath; -+ size_t pos; -+ -+ /* Strip the common part of path and refPath */ -+ while (true) { -+ pos = p.find_first_of('/', 1); -+ if (refP.find_first_of('/', 1) != pos) -+ break; -+ if (p.substr(0, pos) != refP.substr(0, pos)) -+ break; -+ if (pos == string::npos) -+ break; -+ p = p.substr(pos); -+ refP = refP.substr(pos); -+ } -+ /* Check if both pathes are equal */ -+ if (p != refP) { -+ pos = 0; -+ while (pos != string::npos) { -+ pos =refP.find_first_of('/', pos + 1); -+ relPath.append("/.."); -+ } -+ relPath.append(p); -+ } -+ -+ return relPath; -+} - - template - class ElfFile -@@ -183,9 +230,13 @@ public: - - void setInterpreter(const string & newInterpreter); - -- typedef enum { rpPrint, rpShrink, rpSet, rpRemove } RPathOp; -+ typedef enum { rpPrint, rpShrink, rpMakeRelative, rpSet, rpRemove} RPathOp; -+ -+ bool libFoundInRPath(const string & dirName, -+ const vector neededLibs, -+ vector & neededLibFound); - -- void modifyRPath(RPathOp op, string newRPath); -+ void modifyRPath(RPathOp op, string rootDir, string newRPath); - - void addNeeded(set libs); - -@@ -1041,7 +1092,27 @@ static void concatToRPath(string & rpath, const string & path) - - - template --void ElfFile::modifyRPath(RPathOp op, string newRPath) -+bool ElfFile::libFoundInRPath(const string & dirName, -+ const vector neededLibs, vector & neededLibFound) -+{ -+ /* For each library that we haven't found yet, see if it -+ exists in this directory. */ -+ bool libFound = false; -+ for (unsigned int j = 0; j < neededLibs.size(); ++j) -+ if (!neededLibFound[j]) { -+ string libName = dirName + "/" + neededLibs[j]; -+ struct stat st; -+ if (stat(libName.c_str(), &st) == 0) { -+ neededLibFound[j] = true; -+ libFound = true; -+ } -+ } -+ return libFound; -+} -+ -+ -+template -+void ElfFile::modifyRPath(RPathOp op, string rootDir, string newRPath) - { - Elf_Shdr & shdrDynamic = findSection(".dynamic"); - -@@ -1096,6 +1167,11 @@ void ElfFile::modifyRPath(RPathOp op, string newRPath) - return; - } - -+ if (op == rpMakeRelative && !rpath) { -+ debug("no RPATH to make relative\n"); -+ return; -+ } -+ - if (op == rpShrink && !rpath) { - debug("no RPATH to shrink\n"); - return; -@@ -1120,26 +1196,80 @@ void ElfFile::modifyRPath(RPathOp op, string newRPath) - continue; - } - -- /* For each library that we haven't found yet, see if it -- exists in this directory. */ -- bool libFound = false; -- for (unsigned int j = 0; j < neededLibs.size(); ++j) -- if (!neededLibFound[j]) { -- string libName = dirName + "/" + neededLibs[j]; -- struct stat st; -- if (stat(libName.c_str(), &st) == 0) { -- neededLibFound[j] = true; -- libFound = true; -- } -- } -- -- if (!libFound) -+ if (!libFoundInRPath(dirName, neededLibs, neededLibFound)) - debug("removing directory `%s' from RPATH\n", dirName.c_str()); - else - concatToRPath(newRPath, dirName); - } - } - -+ /* Make the the RPATH relative to the specified path */ -+ if (op == rpMakeRelative) { -+ vector neededLibFound(neededLibs.size(), false); -+ string fileDir = fileName.substr(0, fileName.find_last_of("/")); -+ -+ newRPath = ""; -+ -+ vector rpathDirs = splitColonDelimitedString(rpath); -+ for (vector::iterator it = rpathDirs.begin(); it != rpathDirs.end(); ++it) { -+ const string & dirName = *it; -+ -+ string canonicalPath; -+ -+ /* Figure out if we should keep or discard the path. There are several -+ cases to be handled: -+ "dirName" starts with "$ORIGIN": -+ The original build-system already took care of setting a relative -+ RPATH. Resolve it and test if it's valid (does exist). -+ "dirName" start with "rootDir": -+ The original build-system added some absolute RPATH (absolute on -+ the build machine). Test if it's valid (does exist). -+ "rootDir"/"dirName" exists: -+ The original build-system already took care of setting an absolute -+ RPATH (absolute in the final rootfs). Resolve it and test if it's -+ valid (does exist). -+ "dirName" points somewhere else: -+ (can be anywhere: build trees, staging tree, host location, -+ non-existing location, etc.). Just discard such a path. */ -+ if (!dirName.compare(0, 7, "$ORIGIN")) { -+ string path = fileDir + dirName.substr(7); -+ if (!absolutePathExists(path, canonicalPath)) { -+ debug("removing directory '%s' from RPATH because '%s' doesn't exist\n", -+ dirName.c_str(), path.c_str()); -+ continue; -+ } -+ } else if (!dirName.compare(0, rootDir.length(), rootDir)) { -+ if (!absolutePathExists(dirName, canonicalPath)) { -+ debug("removing directory '%s' from RPATH because it doesn't exist\n", dirName.c_str()); -+ continue; -+ } -+ } else { -+ string path = rootDir + dirName; -+ if (!absolutePathExists(path, canonicalPath)) { -+ debug("removing directory '%s' from RPATH because it's not in rootdir\n", -+ dirName.c_str()); -+ continue; -+ } -+ } -+ -+ if (noStandardLibDirs) { -+ if (!canonicalPath.compare(rootDir + "/lib") || -+ !canonicalPath.compare(rootDir + "/usr/lib")) { -+ debug("removing directory '%s' from RPATH because it's a standard library directory\n", -+ dirName.c_str()); -+ continue; -+ } -+ } -+ -+ /* Finally make "canonicalPath" relative to "filedir" in "rootDir" */ -+ if (relativeToFile) -+ concatToRPath(newRPath, makePathRelative(canonicalPath, fileDir)); -+ else -+ concatToRPath(newRPath, canonicalPath.substr(rootDir.length())); -+ debug("keeping relative path of %s\n", canonicalPath.c_str()); -+ } -+ } -+ - if (op == rpRemove) { - if (!rpath) { - debug("no RPATH to delete\n"); -@@ -1413,7 +1543,9 @@ static bool shrinkRPath = false; - static bool removeRPath = false; - static bool setRPath = false; - static bool printRPath = false; -+static bool makeRPathRelative = false; - static string newRPath; -+static string rootDir; - static set neededLibsToRemove; - static map neededLibsToReplace; - static set neededLibsToAdd; -@@ -1438,14 +1570,16 @@ static void patchElf2(ElfFile & elfFile) - elfFile.setInterpreter(newInterpreter); - - if (printRPath) -- elfFile.modifyRPath(elfFile.rpPrint, ""); -+ elfFile.modifyRPath(elfFile.rpPrint, "", ""); - - if (shrinkRPath) -- elfFile.modifyRPath(elfFile.rpShrink, ""); -+ elfFile.modifyRPath(elfFile.rpShrink, "", ""); - else if (removeRPath) -- elfFile.modifyRPath(elfFile.rpRemove, ""); -+ elfFile.modifyRPath(elfFile.rpRemove, "", ""); - else if (setRPath) -- elfFile.modifyRPath(elfFile.rpSet, newRPath); -+ elfFile.modifyRPath(elfFile.rpSet, "", newRPath); -+ else if (makeRPathRelative) -+ elfFile.modifyRPath(elfFile.rpMakeRelative, rootDir, ""); - - if (printNeeded) elfFile.printNeededLibs(); - -@@ -1508,6 +1642,9 @@ void showHelp(const string & progName) - [--set-rpath RPATH]\n\ - [--remove-rpath]\n\ - [--shrink-rpath]\n\ -+ [--make-rpath-relative ROOTDIR]\n\ -+ [--no-standard-lib-dirs]\n\ -+ [--relative-to-file]\n\ - [--print-rpath]\n\ - [--force-rpath]\n\ - [--add-needed LIBRARY]\n\ -@@ -1564,6 +1701,17 @@ int main(int argc, char * * argv) - setRPath = true; - newRPath = argv[i]; - } -+ else if (arg == "--make-rpath-relative") { -+ if (++i == argc) error("missing argument to --make-rpath-relative"); -+ makeRPathRelative = true; -+ rootDir = argv[i]; -+ } -+ else if (arg == "--no-standard-lib-dirs") { -+ noStandardLibDirs = true; -+ } -+ else if (arg == "--relative-to-file") { -+ relativeToFile = true; -+ } - else if (arg == "--print-rpath") { - printRPath = true; - } --- -1.9.1 - diff --git a/package/patchelf/0004-patchelf-Check-ELF-endianness-before-writing-new-run.patch b/package/patchelf/0004-patchelf-Check-ELF-endianness-before-writing-new-run.patch deleted file mode 100644 index 8a89d3a6311..00000000000 --- a/package/patchelf/0004-patchelf-Check-ELF-endianness-before-writing-new-run.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 8c75599b674c73fbfe9c15afeccad54ae88243f5 Mon Sep 17 00:00:00 2001 -From: Bryce Ferguson -Date: Mon, 25 Jun 2018 13:05:07 -0500 -Subject: [PATCH] patchelf: Check ELF endianness before writing new runpath - -This commit modifies the way fields are written in the dynamic -section in order to account the architecture of the target ELF -file. Instead of copying the raw data, use the helper functions -to convert endianness. - -Link to upstream PR: https://github.com/NixOS/patchelf/pull/151 - -Signed-off-by: Bryce Ferguson ---- - src/patchelf.cc | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/patchelf.cc b/src/patchelf.cc -index 35b4a33..a33f644 100644 ---- a/src/patchelf.cc -+++ b/src/patchelf.cc -@@ -1315,13 +1315,13 @@ void ElfFile::modifyRPath(RPathOp op, string rootDir, string - debug("new rpath is `%s'\n", newRPath.c_str()); - - if (!forceRPath && dynRPath && !dynRunPath) { /* convert DT_RPATH to DT_RUNPATH */ -- dynRPath->d_tag = DT_RUNPATH; -+ wri(dynRPath->d_tag, DT_RUNPATH); - dynRunPath = dynRPath; - dynRPath = 0; - } - - if (forceRPath && dynRPath && dynRunPath) { /* convert DT_RUNPATH to DT_RPATH */ -- dynRunPath->d_tag = DT_IGNORE; -+ wri(dynRunPath->d_tag, DT_IGNORE); - } - - if (newRPath.size() <= rpathSize) { --- -2.17.0 - diff --git a/package/patchelf/0005-Avoid-inflating-file-sizes-needlessly-and-allow-bina.patch b/package/patchelf/0005-Avoid-inflating-file-sizes-needlessly-and-allow-bina.patch deleted file mode 100644 index 0d7931cd520..00000000000 --- a/package/patchelf/0005-Avoid-inflating-file-sizes-needlessly-and-allow-bina.patch +++ /dev/null @@ -1,176 +0,0 @@ -From 79c093226e609b99fa889f6e37480b92b399610d Mon Sep 17 00:00:00 2001 -From: Richard Purdie -Date: Tue, 7 Mar 2017 21:08:34 +0000 -Subject: [PATCH] Avoid inflating file sizes needlessly and allow binaries to - be stripped - -The current approach to changing sections in ET_DYN executables is to move -the INTERP section to the end of the file. +This means changing PT_PHDR to -add an extra PT_LOAD section so that the new section is mmaped into memory -by the elf loader in the kernel. In order to extend PHDR, this means moving -it to the end of the file. - -Its documented in BUGS there is a kernel 'bug' which means that if you have holes -in memory between the base load address and the PT_LOAD segment that contains PHDR, -it will pass an incorrect PHDR address to ld.so and fail to load the binary, segfaulting. - -To avoid this, the code currently inserts space into the binary to ensure that when -loaded into memory there are no holes between the PT_LOAD sections. This inflates the -binaries by many MBs in some cases. Whilst we could make them sparse, there is a second -issue which is that strip can fail to process these binaries: - -$ strip fixincl -Not enough room for program headers, try linking with -N -[.note.ABI-tag]: Bad value - -This turns out to be due to libbfd not liking the relocated PHDR section either -(https://github.com/NixOS/patchelf/issues/10). - -Instead this patch implements a different approach, leaving PHDR where it is but extending -it in place to allow addition of a new PT_LOAD section. This overwrites sections in the -binary but those get moved to the end of the file in the new PT_LOAD section. - -This is based on patches linked from the above github issue, however whilst the idea -was good, the implementation wasn't correct and they've been rewritten here. - -Signed-off-by: Richard Purdie - -Fetch from: https://github.com/NixOS/patchelf/commit/c4deb5e9e1ce9c98a48e0d5bb37d87739b8cfee4 - -Backported to v0.9 - -Signed-off-by: Conrad Ratschan ---- - src/patchelf.cc | 71 ++++++++++++++++++++++++++++--------------------- - 1 file changed, 40 insertions(+), 31 deletions(-) - -diff --git a/src/patchelf.cc b/src/patchelf.cc -index 1d58061..c2147af 100644 ---- a/src/patchelf.cc -+++ b/src/patchelf.cc -@@ -209,6 +209,8 @@ private: - string & replaceSection(const SectionName & sectionName, - unsigned int size); - -+ bool haveReplacedSection(const SectionName & sectionName); -+ - void writeReplacedSections(Elf_Off & curOff, - Elf_Addr startAddr, Elf_Off startOffset); - -@@ -632,6 +634,15 @@ void ElfFile::writeReplacedSections(Elf_Off & curOff, - replacedSections.clear(); - } - -+template -+bool ElfFile::haveReplacedSection(const SectionName & sectionName) -+{ -+ ReplacedSections::iterator i = replacedSections.find(sectionName); -+ -+ if (i != replacedSections.end()) -+ return true; -+ return false; -+} - - template - void ElfFile::rewriteSectionsLibrary() -@@ -648,52 +659,53 @@ void ElfFile::rewriteSectionsLibrary() - - debug("last page is 0x%llx\n", (unsigned long long) startPage); - -+ /* Because we're adding a new section header, we're necessarily increasing -+ the size of the program header table. This can cause the first section -+ to overlap the program header table in memory; we need to shift the first -+ few segments to someplace else. */ -+ /* Some sections may already be replaced so account for that */ -+ unsigned int i = 1; -+ Elf_Addr pht_size = sizeof(Elf_Ehdr) + (phdrs.size() + 1)*sizeof(Elf_Phdr); -+ while( shdrs[i].sh_addr <= pht_size && i < rdi(hdr->e_shnum) ) { -+ if (not haveReplacedSection(getSectionName(shdrs[i]))) -+ replaceSection(getSectionName(shdrs[i]), shdrs[i].sh_size); -+ i++; -+ } - -- /* Compute the total space needed for the replaced sections and -- the program headers. */ -- off_t neededSpace = (phdrs.size() + 1) * sizeof(Elf_Phdr); -+ /* Compute the total space needed for the replaced sections */ -+ off_t neededSpace = 0; - for (ReplacedSections::iterator i = replacedSections.begin(); - i != replacedSections.end(); ++i) - neededSpace += roundUp(i->second.size(), sectionAlignment); - debug("needed space is %d\n", neededSpace); - -- - size_t startOffset = roundUp(fileSize, getPageSize()); - - growFile(startOffset + neededSpace); - -- - /* Even though this file is of type ET_DYN, it could actually be - an executable. For instance, Gold produces executables marked -- ET_DYN. In that case we can still hit the kernel bug that -- necessitated rewriteSectionsExecutable(). However, such -- executables also tend to start at virtual address 0, so -+ ET_DYN as does LD when linking with pie. If we move PT_PHDR, it -+ has to stay in the first PT_LOAD segment or any subsequent ones -+ if they're continuous in memory due to linux kernel constraints -+ (see BUGS). Since the end of the file would be after bss, we can't -+ move PHDR there, we therefore choose to leave PT_PHDR where it is but -+ move enough following sections such that we can add the extra PT_LOAD -+ section to it. This PT_LOAD segment ensures the sections at the end of -+ the file are mapped into memory for ld.so to process. -+ We can't use the approach in rewriteSectionsExecutable() -+ since DYN executables tend to start at virtual address 0, so - rewriteSectionsExecutable() won't work because it doesn't have -- any virtual address space to grow downwards into. As a -- workaround, make sure that the virtual address of our new -- PT_LOAD segment relative to the first PT_LOAD segment is equal -- to its offset; otherwise we hit the kernel bug. This may -- require creating a hole in the executable. The bigger the size -- of the uninitialised data segment, the bigger the hole. */ -+ any virtual address space to grow downwards into. */ - if (isExecutable) { - if (startOffset >= startPage) { - debug("shifting new PT_LOAD segment by %d bytes to work around a Linux kernel bug\n", startOffset - startPage); -- } else { -- size_t hole = startPage - startOffset; -- /* Print a warning, because the hole could be very big. */ -- fprintf(stderr, "warning: working around a Linux kernel bug by creating a hole of %zu bytes in ‘%s’\n", hole, fileName.c_str()); -- assert(hole % getPageSize() == 0); -- /* !!! We could create an actual hole in the file here, -- but it's probably not worth the effort. */ -- growFile(fileSize + hole); -- startOffset += hole; - } - startPage = startOffset; - } - - -- /* Add a segment that maps the replaced sections and program -- headers into memory. */ -+ /* Add a segment that maps the replaced sections into memory. */ - phdrs.resize(rdi(hdr->e_phnum) + 1); - wri(hdr->e_phnum, rdi(hdr->e_phnum) + 1); - Elf_Phdr & phdr = phdrs[rdi(hdr->e_phnum) - 1]; -@@ -706,15 +718,12 @@ void ElfFile::rewriteSectionsLibrary() - - - /* Write out the replaced sections. */ -- Elf_Off curOff = startOffset + phdrs.size() * sizeof(Elf_Phdr); -+ Elf_Off curOff = startOffset; - writeReplacedSections(curOff, startPage, startOffset); - assert(curOff == startOffset + neededSpace); - -- -- /* Move the program header to the start of the new area. */ -- wri(hdr->e_phoff, startOffset); -- -- rewriteHeaders(startPage); -+ /* Write out the updated program and section headers */ -+ rewriteHeaders(hdr->e_phoff); - } - - --- -2.17.1 - diff --git a/package/patchelf/0006-Fix-shared-library-corruption-when-rerunning-patchel.patch b/package/patchelf/0006-Fix-shared-library-corruption-when-rerunning-patchel.patch deleted file mode 100644 index 9fb3e260c16..00000000000 --- a/package/patchelf/0006-Fix-shared-library-corruption-when-rerunning-patchel.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 5df4791bf077127684faceeeea8bfab063e43774 Mon Sep 17 00:00:00 2001 -From: Richard Purdie -Date: Wed, 3 Jun 2020 12:14:58 +0100 -Subject: [PATCH] Fix shared library corruption when rerunning patchelf - -When running patchelf on some existing patchelf'd binaries to change to longer -RPATHS, ldd would report the binaries as invalid. The output of objdump -x on -those libraryies should show the top of the .dynamic section is getting trashed, -something like: - -0x600000001 0x0000000000429000 -0x335000 0x0000000000335000 -0xc740 0x000000000000c740 -0x1000 0x0000000000009098 -SONAME libglib-2.0.so.0 - -(which should be RPATH and DT_NEEDED entries) - -This was tracked down to the code which injects the PT_LOAD section. - -The issue is that if the program headers were previously relocated to the end -of the file which was how patchelf operated previously, the relocation code -wouldn't work properly on a second run as it now assumes they're located after -the elf header. This change forces them back to immediately follow the elf -header which is where the code has made space for them. - -Should fix https://github.com/NixOS/patchelf/issues/170 -and https://github.com/NixOS/patchelf/issues/192 - -Signed-off-by: Richard Purdie - -Fetch from: https://github.com/NixOS/patchelf/commit/ad5f1f078b716802dfb8f7226cb1d5c720348a78 - -Backported to v0.9 - -Signed-off-by: Conrad Ratschan ---- - src/patchelf.cc | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/patchelf.cc b/src/patchelf.cc -index c2147af..1224a89 100644 ---- a/src/patchelf.cc -+++ b/src/patchelf.cc -@@ -706,6 +706,7 @@ void ElfFile::rewriteSectionsLibrary() - - - /* Add a segment that maps the replaced sections into memory. */ -+ wri(hdr->e_phoff, sizeof(Elf_Ehdr)); - phdrs.resize(rdi(hdr->e_phnum) + 1); - wri(hdr->e_phnum, rdi(hdr->e_phnum) + 1); - Elf_Phdr & phdr = phdrs[rdi(hdr->e_phnum) - 1]; --- -2.17.1 - diff --git a/package/patchelf/0007-fix-adjusting-startPage.patch b/package/patchelf/0007-fix-adjusting-startPage.patch deleted file mode 100644 index fd044964e0b..00000000000 --- a/package/patchelf/0007-fix-adjusting-startPage.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 4a82c97e8a0677706d1d532812daaa73249768a8 Mon Sep 17 00:00:00 2001 -From: Ed Bartosh -Date: Fri, 21 Jul 2017 12:33:53 +0300 -Subject: [PATCH] fix adjusting startPage - -startPage is adjusted unconditionally for all executables. -This results in incorrect addresses assigned to INTERP and LOAD -program headers, which breaks patched executable. - -Adjusting startPage variable only when startOffset > startPage -should fix this. - -This change is related to the issue NixOS#10 - -Signed-off-by: Ed Bartosh - -Fetch from: https://github.com/NixOS/patchelf/commit/1cc234fea5600190d872329aca60e2365cefc39e - -Backported to v0.9 - -Signed-off-by: Conrad Ratschan ---- - src/patchelf.cc | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/src/patchelf.cc b/src/patchelf.cc -index 1224a89..4676157 100644 ---- a/src/patchelf.cc -+++ b/src/patchelf.cc -@@ -697,10 +697,8 @@ void ElfFile::rewriteSectionsLibrary() - since DYN executables tend to start at virtual address 0, so - rewriteSectionsExecutable() won't work because it doesn't have - any virtual address space to grow downwards into. */ -- if (isExecutable) { -- if (startOffset >= startPage) { -- debug("shifting new PT_LOAD segment by %d bytes to work around a Linux kernel bug\n", startOffset - startPage); -- } -+ if (isExecutable && startOffset > startPage) { -+ debug("shifting new PT_LOAD segment by %d bytes to work around a Linux kernel bug\n", startOffset - startPage); - startPage = startOffset; - } - --- -2.17.1 - diff --git a/package/patchelf/0008-Use-sh_offset-instead-of-sh_addr-when-checking-alrea.patch b/package/patchelf/0008-Use-sh_offset-instead-of-sh_addr-when-checking-alrea.patch deleted file mode 100644 index d423cad23a4..00000000000 --- a/package/patchelf/0008-Use-sh_offset-instead-of-sh_addr-when-checking-alrea.patch +++ /dev/null @@ -1,38 +0,0 @@ -From cb8326de54ad7a56658b0dc8efb7da5e71684a7c Mon Sep 17 00:00:00 2001 -From: Pablo Galindo -Date: Tue, 22 Sep 2020 01:33:47 +0100 -Subject: [PATCH] Use sh_offset instead of sh_addr when checking already - replaced libs - -When checking for already replaced libs, the check against the size must -be done using the section header offset, not the section file address. -This was not crashing in many situations because normally sh_address and -sh_offset have the same value but these two may differ and using the -sh_address value instead can cause library corruption in these -situations. - -Fetch from: https://github.com/NixOS/patchelf/commit/83aa89addf8757e2d63aa73222f2fa9bc6d7321a - -Backported to v0.9 - -Signed-off-by: Conrad Ratschan ---- - src/patchelf.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/patchelf.cc b/src/patchelf.cc -index 4676157..c025ae2 100644 ---- a/src/patchelf.cc -+++ b/src/patchelf.cc -@@ -666,7 +666,7 @@ void ElfFile::rewriteSectionsLibrary() - /* Some sections may already be replaced so account for that */ - unsigned int i = 1; - Elf_Addr pht_size = sizeof(Elf_Ehdr) + (phdrs.size() + 1)*sizeof(Elf_Phdr); -- while( shdrs[i].sh_addr <= pht_size && i < rdi(hdr->e_shnum) ) { -+ while( shdrs[i].sh_offset <= pht_size && i < rdi(hdr->e_shnum) ) { - if (not haveReplacedSection(getSectionName(shdrs[i]))) - replaceSection(getSectionName(shdrs[i]), shdrs[i].sh_size); - i++; --- -2.17.1 - diff --git a/package/patchelf/0009-Fix-issue-66-by-ignoring-the-first-section-header-wh.patch b/package/patchelf/0009-Fix-issue-66-by-ignoring-the-first-section-header-wh.patch deleted file mode 100644 index a820f2d1d26..00000000000 --- a/package/patchelf/0009-Fix-issue-66-by-ignoring-the-first-section-header-wh.patch +++ /dev/null @@ -1,41 +0,0 @@ -From e22ca2f593aa8fd392f1ac4f8dd104bc56d0d100 Mon Sep 17 00:00:00 2001 -From: Ezra Cooper -Date: Thu, 21 Jun 2018 11:07:35 -0700 -Subject: [PATCH] Fix issue #66 by ignoring the first section header when - sorting, and not overwriting NOBITS entries. - -Fetch from: https://github.com/NixOS/patchelf/commit/52ab908394958a2a5d0476e306e2cad4da4fdeae - -Backported to v0.9 - -Signed-off-by: Conrad Ratschan ---- - src/patchelf.cc | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/patchelf.cc b/src/patchelf.cc -index c025ae2..fa2945e 100644 ---- a/src/patchelf.cc -+++ b/src/patchelf.cc -@@ -435,7 +435,7 @@ void ElfFile::sortShdrs() - /* Sort the sections by offset. */ - CompShdr comp; - comp.elfFile = this; -- sort(shdrs.begin(), shdrs.end(), comp); -+ sort(shdrs.begin() + 1, shdrs.end(), comp); - - /* Restore the sh_link mappings. */ - for (unsigned int i = 1; i < rdi(hdr->e_shnum); ++i) -@@ -586,7 +586,8 @@ void ElfFile::writeReplacedSections(Elf_Off & curOff, - { - string sectionName = i->first; - Elf_Shdr & shdr = findSection(sectionName); -- memset(contents + rdi(shdr.sh_offset), 'X', rdi(shdr.sh_size)); -+ if (shdr.sh_type != SHT_NOBITS) -+ memset(contents + rdi(shdr.sh_offset), 'X', rdi(shdr.sh_size)); - } - - for (ReplacedSections::iterator i = replacedSections.begin(); --- -2.17.1 - diff --git a/package/patchelf/0010-Fix-endianness-issues-for-powerpc-PIE.patch b/package/patchelf/0010-Fix-endianness-issues-for-powerpc-PIE.patch deleted file mode 100644 index 6a3500b91ec..00000000000 --- a/package/patchelf/0010-Fix-endianness-issues-for-powerpc-PIE.patch +++ /dev/null @@ -1,80 +0,0 @@ -From c61c2960d782c67566790b210163ff9c799f018a Mon Sep 17 00:00:00 2001 -From: Conrad Ratschan -Date: Sat, 3 Oct 2020 20:17:24 -0500 -Subject: [PATCH] Fix endianness issues for powerpc PIE - -Previously when running `patchelf --set-rpath "/usr/sbin" my_bin` on a -PIE ppc32 binary that had no RPATH a few issues were encountered. - -This commit fixes: - -1. The PT_PHDR being sorted improperly due to the type being read in - incorrect endianness - -3. The interpreter being clobbered due to the replace sections routine - reading sh_offset and sh_size in incorrect endianness - -4. The PHDR segment having an incorrect virt and phys address due to - reading the e_phoff in the incorrect endianness - -This also fixes a read of the shdr.sh_type in writeReplacedSections but -this was not encountered during testing. - -Fetch from: https://github.com/NixOS/patchelf/commit/884eccc4f061a3dbdbe63a4c73f1cc9bbf77fa7d - -Backported to v0.9. Removed item 2 from the fix list as it is not -applicable to v0.9. - -Signed-off-by: Conrad Ratschan ---- - src/patchelf.cc | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/patchelf.cc b/src/patchelf.cc -index fa2945e..e60b17c 100644 ---- a/src/patchelf.cc -+++ b/src/patchelf.cc -@@ -173,8 +173,8 @@ private: - ElfFile * elfFile; - bool operator ()(const Elf_Phdr & x, const Elf_Phdr & y) - { -- if (x.p_type == PT_PHDR) return true; -- if (y.p_type == PT_PHDR) return false; -+ if (elfFile->rdi(x.p_type) == PT_PHDR) return true; -+ if (elfFile->rdi(y.p_type) == PT_PHDR) return false; - return elfFile->rdi(x.p_paddr) < elfFile->rdi(y.p_paddr); - } - }; -@@ -586,7 +586,7 @@ void ElfFile::writeReplacedSections(Elf_Off & curOff, - { - string sectionName = i->first; - Elf_Shdr & shdr = findSection(sectionName); -- if (shdr.sh_type != SHT_NOBITS) -+ if (rdi(shdr.sh_type) != SHT_NOBITS) - memset(contents + rdi(shdr.sh_offset), 'X', rdi(shdr.sh_size)); - } - -@@ -667,9 +667,9 @@ void ElfFile::rewriteSectionsLibrary() - /* Some sections may already be replaced so account for that */ - unsigned int i = 1; - Elf_Addr pht_size = sizeof(Elf_Ehdr) + (phdrs.size() + 1)*sizeof(Elf_Phdr); -- while( shdrs[i].sh_offset <= pht_size && i < rdi(hdr->e_shnum) ) { -+ while( rdi(shdrs[i].sh_offset) <= pht_size && i < rdi(hdr->e_shnum) ) { - if (not haveReplacedSection(getSectionName(shdrs[i]))) -- replaceSection(getSectionName(shdrs[i]), shdrs[i].sh_size); -+ replaceSection(getSectionName(shdrs[i]), rdi(shdrs[i].sh_size)); - i++; - } - -@@ -723,7 +723,7 @@ void ElfFile::rewriteSectionsLibrary() - assert(curOff == startOffset + neededSpace); - - /* Write out the updated program and section headers */ -- rewriteHeaders(hdr->e_phoff); -+ rewriteHeaders(rdi(hdr->e_phoff)); - } - - --- -2.17.1 - diff --git a/package/patchelf/patchelf.hash b/package/patchelf/patchelf.hash index 0f54560908b..d4064fb9af0 100644 --- a/package/patchelf/patchelf.hash +++ b/package/patchelf/patchelf.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 a0f65c1ba148890e9f2f7823f4bedf7ecad5417772f64f994004f59a39014f83 patchelf-0.9.tar.bz2 +sha256 4c7ed4bcfc1a114d6286e4a0d3c1a90db147a4c3adda1814ee0eee0f9ee917ed patchelf-0.13.tar.bz2 # License files, locally calculated -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/patchelf/patchelf.mk b/package/patchelf/patchelf.mk index 52912e295b6..c583b228a36 100644 --- a/package/patchelf/patchelf.mk +++ b/package/patchelf/patchelf.mk @@ -4,8 +4,9 @@ # ################################################################################ -PATCHELF_VERSION = 0.9 -PATCHELF_SITE = https://nixos.org/releases/patchelf/patchelf-$(PATCHELF_VERSION) +PATCHELF_VERSION = 0.13 +PATCHELF_SITE = \ + https://github.com/NixOS/patchelf/releases/download/$(PATCHELF_VERSION) PATCHELF_SOURCE = patchelf-$(PATCHELF_VERSION).tar.bz2 PATCHELF_LICENSE = GPL-3.0+ PATCHELF_LICENSE_FILES = COPYING diff --git a/package/paxtest/Config.in b/package/paxtest/Config.in index 1e09820ba37..565c45cc19c 100644 --- a/package/paxtest/Config.in +++ b/package/paxtest/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PAXTEST bool "paxtest" + depends on !BR2_microblaze # No UCLIBC or MUSL because __NO_A_OUT_SUPPORT depends on BR2_TOOLCHAIN_USES_GLIBC help @@ -8,4 +9,5 @@ config BR2_PACKAGE_PAXTEST http://pax.grsecurity.net/docs comment "paxtest needs a glibc toolchain" + depends on !BR2_microblaze depends on !BR2_TOOLCHAIN_USES_GLIBC diff --git a/package/pciutils/0001-Workaround-build-failure-with-older-binutils.patch b/package/pciutils/0001-Workaround-build-failure-with-older-binutils.patch new file mode 100644 index 00000000000..1590bc19c56 --- /dev/null +++ b/package/pciutils/0001-Workaround-build-failure-with-older-binutils.patch @@ -0,0 +1,57 @@ +From fda20d4bcb91f0f9d0db294b4813264de2d88866 Mon Sep 17 00:00:00 2001 +From: Baruch Siach +Date: Thu, 12 May 2022 16:16:21 +0300 +Subject: [PATCH] Workaround build failure with older binutils + +binutils releases older than 2.35 are affected by bug gas/23840[1] that +breaks the link of shared library: + +cc -O2 -Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes -fPIC -fvisibility=hidden -c -o filter.o filter.c +/tmp/ccLtucRG.s: Assembler messages: +/tmp/ccLtucRG.s:6: Error: multiple versions [`pci_filter_init@@LIBPCI_3.8'|`pci_filter_init@LIBPCI_3.3'] for symbol `pci_filter_init_v38' +/tmp/ccLtucRG.s:8: Error: multiple versions [`pci_filter_parse_slot@@LIBPCI_3.8'|`pci_filter_parse_slot@LIBPCI_3.3'] for symbol `pci_filter_parse_slot_v38' +/tmp/ccLtucRG.s:10: Error: multiple versions [`pci_filter_parse_id@@LIBPCI_3.8'|`pci_filter_parse_id@LIBPCI_3.3'] for symbol `pci_filter_parse_id_v38' +/tmp/ccLtucRG.s:12: Error: multiple versions [`pci_filter_match@@LIBPCI_3.8'|`pci_filter_match@LIBPCI_3.3'] for symbol `pci_filter_match_v38' + +The symbol versioning feature has little value in the context of +Buildroot. As a workaround remove one of each duplicated symbol. + +[1] https://sourceware.org/bugzilla/show_bug.cgi?id=23840 + +Signed-off-by: Baruch Siach +--- +Upstream status: not upstreamable + +Upstream bug report: https://lore.kernel.org/linux-pci/87mtfm7v58.fsf@tarshish/ +--- + lib/filter.c | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/lib/filter.c b/lib/filter.c +index b881b6bc9083..bc34e8c2bab9 100644 +--- a/lib/filter.c ++++ b/lib/filter.c +@@ -304,20 +304,16 @@ pci_filter_match_v30(struct pci_filter_v30 *f, struct pci_dev *d) + + STATIC_ALIAS(void pci_filter_init(struct pci_access *a, struct pci_filter *f), pci_filter_init_v38(a, f)); + SYMBOL_VERSION(pci_filter_init_v30, pci_filter_init@LIBPCI_3.0); +-SYMBOL_VERSION(pci_filter_init_v38, pci_filter_init@LIBPCI_3.3); + SYMBOL_VERSION(pci_filter_init_v38, pci_filter_init@@LIBPCI_3.8); + + STATIC_ALIAS(char *pci_filter_parse_slot(struct pci_filter *f, char *str), pci_filter_parse_slot_v38(f, str)); + SYMBOL_VERSION(pci_filter_parse_slot_v30, pci_filter_parse_slot@LIBPCI_3.0); +-SYMBOL_VERSION(pci_filter_parse_slot_v38, pci_filter_parse_slot@LIBPCI_3.3); + SYMBOL_VERSION(pci_filter_parse_slot_v38, pci_filter_parse_slot@@LIBPCI_3.8); + + STATIC_ALIAS(char *pci_filter_parse_id(struct pci_filter *f, char *str), pci_filter_parse_id_v38(f, str)); + SYMBOL_VERSION(pci_filter_parse_id_v30, pci_filter_parse_id@LIBPCI_3.0); +-SYMBOL_VERSION(pci_filter_parse_id_v38, pci_filter_parse_id@LIBPCI_3.3); + SYMBOL_VERSION(pci_filter_parse_id_v38, pci_filter_parse_id@@LIBPCI_3.8); + + STATIC_ALIAS(int pci_filter_match(struct pci_filter *f, struct pci_dev *d), pci_filter_match_v38(f, d)); + SYMBOL_VERSION(pci_filter_match_v30, pci_filter_match@LIBPCI_3.0); +-SYMBOL_VERSION(pci_filter_match_v38, pci_filter_match@LIBPCI_3.3); + SYMBOL_VERSION(pci_filter_match_v38, pci_filter_match@@LIBPCI_3.8); +-- +2.35.1 + diff --git a/package/pciutils/pciutils.hash b/package/pciutils/pciutils.hash index 4b13c7484e7..0b66b825891 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 9d40b97be8b6a2cdf96aead5a61881d1f7e4e0da9544a9bac4fba1ae9dcd40eb pciutils-3.7.0.tar.xz +sha256 91edbd0429a84705c9ad156d4ff38ccc724d41ea54c4c5b88e38e996f8a34f05 pciutils-3.8.0.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/pciutils/pciutils.mk b/package/pciutils/pciutils.mk index 67defcc7433..140276dbc47 100644 --- a/package/pciutils/pciutils.mk +++ b/package/pciutils/pciutils.mk @@ -4,7 +4,7 @@ # ################################################################################ -PCIUTILS_VERSION = 3.7.0 +PCIUTILS_VERSION = 3.8.0 PCIUTILS_SITE = $(BR2_KERNEL_MIRROR)/software/utils/pciutils PCIUTILS_SOURCE = pciutils-$(PCIUTILS_VERSION).tar.xz PCIUTILS_INSTALL_STAGING = YES @@ -13,7 +13,7 @@ PCIUTILS_LICENSE_FILES = COPYING PCIUTILS_MAKE_OPTS = \ CROSS_COMPILE="$(TARGET_CROSS)" \ HOST="$(NORMALIZED_ARCH)-linux" \ - OPT="$(TARGET_CFLAGS)" \ + OPT="$(TARGET_CFLAGS) -std=gnu99" \ LDFLAGS="$(TARGET_LDFLAGS)" \ DNS=no \ STRIP= diff --git a/package/pcm-tools/Config.in b/package/pcm-tools/Config.in index ca9719dc5f4..6bf05f32d78 100644 --- a/package/pcm-tools/Config.in +++ b/package/pcm-tools/Config.in @@ -1,11 +1,13 @@ -comment "pcm-tools needs a toolchain w/ C++" +comment "pcm-tools needs a toolchain w/ C++, NPTL" depends on BR2_i386 || BR2_x86_64 - depends on !BR2_INSTALL_LIBSTDCPP + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS_NPTL config BR2_PACKAGE_PCM_TOOLS bool "pcm-tools" depends on BR2_i386 || BR2_x86_64 depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL select BR2_PACKAGE_HWDATA select BR2_PACKAGE_HWDATA_PCI_IDS help diff --git a/package/pcm-tools/pcm-tools.hash b/package/pcm-tools/pcm-tools.hash index 1853dcebb57..cfa3faeff7b 100644 --- a/package/pcm-tools/pcm-tools.hash +++ b/package/pcm-tools/pcm-tools.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 aa48ab1473720aeb7837b67bfc612100f484748720a8b8034daff00419709057 pcm-tools-202110.tar.gz +sha256 29416f83d1de95594d225f63af34f8f074ee4822010ce2e05b1fabc66933472a pcm-tools-93fc9193a70e2f1f054be554c48f4a4791be5032-br1.tar.gz sha256 0f476c77009f982dcc4bdff41e692ddd456a9862908e99f2ae3d57296decc649 LICENSE diff --git a/package/pcm-tools/pcm-tools.mk b/package/pcm-tools/pcm-tools.mk index d676df57f9a..c5304926964 100644 --- a/package/pcm-tools/pcm-tools.mk +++ b/package/pcm-tools/pcm-tools.mk @@ -4,8 +4,12 @@ # ################################################################################ -PCM_TOOLS_VERSION = 202110 -PCM_TOOLS_SITE = $(call github,opcm,pcm,$(PCM_TOOLS_VERSION)) +# Don't use the github helper, as pcm-tools uses git attributes that are +# replaced when gnerating the archive. +# 93fc9193a70e2f1f054be554c48f4a4791be5032 is the hash of the 202110 tag. +PCM_TOOLS_VERSION = 93fc9193a70e2f1f054be554c48f4a4791be5032 +PCM_TOOLS_SITE = https://github.com/opcm/pcm +PCM_TOOLS_SITE_METHOD = git PCM_TOOLS_LICENSE = BSD-3-Clause PCM_TOOLS_LICENSE_FILES = LICENSE @@ -13,6 +17,14 @@ PCM_TOOLS_EXE_FILES = \ pcm-core pcm-iio pcm-lspci pcm-memory pcm-msr pcm-numa \ pcm-pcicfg pcm-pcie pcm-power pcm-sensor pcm-tsx pcm +# version.h contains git attributes; replace them with the previously-known +# value. +define PCM_TOOLS_FIXUP_VERSION_H + $(SED) 's/\$$Format:%ci ID=%h\$$/2021-10-25 16:07:54 +0200 ID=93fc9193/' \ + $(@D)/version.h +endef +PCM_TOOLS_POST_EXTRACT_HOOKS += PCM_TOOLS_FIXUP_VERSION_H + define PCM_TOOLS_BUILD_CMDS touch $(@D)/daemon-binaries $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ diff --git a/package/pcre2/Config.in b/package/pcre2/Config.in index f06f1914f30..ba4719dd3d1 100644 --- a/package/pcre2/Config.in +++ b/package/pcre2/Config.in @@ -29,7 +29,6 @@ config BR2_PACKAGE_PCRE2_JIT_ARCH_SUPPORTS default y if BR2_i386 || BR2_x86_64 default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el default y if BR2_powerpc - default y if BR2_sparc config BR2_PACKAGE_PCRE2_JIT bool "enable JIT support" diff --git a/package/pcre2/pcre2.hash b/package/pcre2/pcre2.hash index 3e6299f80bb..f609bdaee29 100644 --- a/package/pcre2/pcre2.hash +++ b/package/pcre2/pcre2.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature: -# https://github.com/PhilipHazel/pcre2/releases/download/pcre2-10.39/pcre2-10.39.tar.bz2.sig -sha256 0f03caf57f81d9ff362ac28cd389c055ec2bf0678d277349a1a4bee00ad6d440 pcre2-10.39.tar.bz2 +# https://github.com/PhilipHazel/pcre2/releases/download/pcre2-10.42/pcre2-10.42.tar.bz2.sig +sha256 8d36cd8cb6ea2a4c2bb358ff6411b0c788633a2a45dabbf1aeb4b701d1b5e840 pcre2-10.42.tar.bz2 # Locally computed -sha256 15bc778a1f7e1f857d57abab4181749a06ad1d1f9420d5c9e3c23ef8c991b025 LICENCE +sha256 87d884eceb7fc54611470ce9f74280d28612b0c877adfc767e9676892a638987 LICENCE diff --git a/package/pcre2/pcre2.mk b/package/pcre2/pcre2.mk index adcfaf1cae6..aba378cab6b 100644 --- a/package/pcre2/pcre2.mk +++ b/package/pcre2/pcre2.mk @@ -4,7 +4,7 @@ # ################################################################################ -PCRE2_VERSION = 10.39 +PCRE2_VERSION = 10.42 PCRE2_SITE = https://github.com/PhilipHazel/pcre2/releases/download/pcre2-$(PCRE2_VERSION) PCRE2_SOURCE = pcre2-$(PCRE2_VERSION).tar.bz2 PCRE2_LICENSE = BSD-3-Clause @@ -28,5 +28,8 @@ ifeq ($(BR2_USE_MMU),) PCRE2_CONF_OPTS += --disable-pcre2grep-callout endif +# needed for qt6base +HOST_PCRE2_CONF_OPTS = --enable-pcre2-16 + $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/package/pcsc-lite/0001-src-hotplug_generic.c-fix-build-without-lib-udev-usb.patch b/package/pcsc-lite/0001-src-hotplug_generic.c-fix-build-without-lib-udev-usb.patch deleted file mode 100644 index 7e93bf5fce1..00000000000 --- a/package/pcsc-lite/0001-src-hotplug_generic.c-fix-build-without-lib-udev-usb.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 2153e165c48e541bb5a8b23f81e87db87a9394fd Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 14 Dec 2021 08:20:59 +0100 -Subject: [PATCH] src/hotplug_generic.c: fix build without lib{udev,usb} - -Fix the following build failure without lib{udev,usb} raised since -version 1.9.5 and -https://github.com/LudovicRousseau/PCSC/commit/6f8f170db3c88c59a5ddb5ae5319b921a901a6aa: - -/home/giuliobenetti/autobuild/run/instance-2/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/11.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: pcscd-pcscdaemon.o: in function `signal_thread': -pcscdaemon.c:(.text+0x444): undefined reference to `HPReCheckSerialReaders' - -Fixes: - - http://autobuild.buildroot.org/results/6cf323229f32967aa554418410dc94b7094d09af - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/LudovicRousseau/PCSC/commit/2153e165c48e541bb5a8b23f81e87db87a9394fd] ---- - src/hotplug_generic.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/hotplug_generic.c b/src/hotplug_generic.c -index a0f34646..e4f19935 100644 ---- a/src/hotplug_generic.c -+++ b/src/hotplug_generic.c -@@ -48,7 +48,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #define FALSE 0 - #endif - --#if !defined(__APPLE__) && !defined(HAVE_LIBUSB) && !defined(__linux__) && !defined(HAVE_LIBUDEV) -+#if !defined(__APPLE__) && !defined(HAVE_LIBUSB) && !defined(HAVE_LIBUDEV) - - LONG HPSearchHotPluggables(void) - { diff --git a/package/pcsc-lite/Config.in b/package/pcsc-lite/Config.in index 1b4d0f7d18e..f4ed5ba2f0f 100644 --- a/package/pcsc-lite/Config.in +++ b/package/pcsc-lite/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_PCSC_LITE depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # _Atomic keyword help Middleware to access smart card using SCard API (PC/SC). @@ -33,6 +34,7 @@ config BR2_PACKAGE_PCSC_LITE_EMBEDDED endif -comment "pcsc-lite needs a toolchain w/ threads, dynamic library" +comment "pcsc-lite needs a toolchain w/ threads, dynamic library, gcc >= 4.9" depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/pcsc-lite/pcsc-lite.hash b/package/pcsc-lite/pcsc-lite.hash index 4844606c595..4326822e41f 100644 --- a/package/pcsc-lite/pcsc-lite.hash +++ b/package/pcsc-lite/pcsc-lite.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 9ee3f9b333537562177893559ad4f7b8d5c23ebe828eef53056c02db14049d08 pcsc-lite-1.9.5.tar.bz2 +sha256 cbcc3b34c61f53291cecc0d831423c94d437b188eb2b97b7febc08de1c914e8a pcsc-lite-1.9.9.tar.bz2 sha256 40d4358bb8dc8d30f5365ae6d999b6f820bbc051b292912482f2e4d0ebd837e1 COPYING sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 GPL-3.0.txt diff --git a/package/pcsc-lite/pcsc-lite.mk b/package/pcsc-lite/pcsc-lite.mk index a7db105987e..0b92380ccb0 100644 --- a/package/pcsc-lite/pcsc-lite.mk +++ b/package/pcsc-lite/pcsc-lite.mk @@ -4,14 +4,15 @@ # ################################################################################ -PCSC_LITE_VERSION = 1.9.5 +PCSC_LITE_VERSION = 1.9.9 PCSC_LITE_SOURCE = pcsc-lite-$(PCSC_LITE_VERSION).tar.bz2 PCSC_LITE_SITE = https://pcsclite.apdu.fr/files PCSC_LITE_INSTALL_STAGING = YES -PCSC_LITE_DEPENDENCIES = host-pkgconf -PCSC_LITE_LICENSE = BSD-2-Clause (auth), BSD-3-Clause, GPL-3.0+ (demo, spy, tests), ISC (simclist) +PCSC_LITE_DEPENDENCIES = host-pkgconf host-flex +PCSC_LITE_LICENSE = BSD-2-Clause (auth), BSD-3-Clause, GPL-3.0+ (spy, tests), ISC (simclist) PCSC_LITE_LICENSE_FILES = COPYING GPL-3.0.txt PCSC_LITE_SELINUX_MODULES = pcscd +PCSC_LITE_CONF_OPTS = --disable-strict # - libudev and libusb are optional # - libudev and libusb can't be used together @@ -36,12 +37,16 @@ else PCSC_LITE_CONF_OPTS += --disable-libsystemd endif -ifeq ($(PACKAGE_PCSC_LITE_DEBUGATR),y) +ifeq ($(BR2_PACKAGE_PCSC_LITE_DEBUGATR),y) PCSC_LITE_CONF_OPTS += --enable-debugatr endif -ifeq ($(PACKAGE_PCSC_LITE_EMBEDDED),y) +ifeq ($(BR2_PACKAGE_PCSC_LITE_EMBEDDED),y) PCSC_LITE_CONF_OPTS += --enable-embedded endif +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +PCSC_LITE_CONF_ENV += LIBS=-latomic +endif + $(eval $(autotools-package)) diff --git a/package/pdbg/pdbg.hash b/package/pdbg/pdbg.hash index df7ba314bfb..f859930dd6e 100644 --- a/package/pdbg/pdbg.hash +++ b/package/pdbg/pdbg.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 5b721fd5551591cd5626ccf72c8d9096d902de4da10324097a37b4763815f0d7 pdbg-3.4.tar.gz -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING +sha256 7bdbab4e14b8cf50dbf6242955e46e58882c37b1a52671d9e6f3073885629dfa pdbg-3.5.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/package/pdbg/pdbg.mk b/package/pdbg/pdbg.mk index 5a5cfbc62d8..871bf953f23 100644 --- a/package/pdbg/pdbg.mk +++ b/package/pdbg/pdbg.mk @@ -4,7 +4,7 @@ # ################################################################################ -PDBG_VERSION = 3.4 +PDBG_VERSION = 3.5 PDBG_SITE = $(call github,open-power,pdbg,v$(PDBG_VERSION)) PDBG_LICENSE = Apache-2.0 PDBG_LICENSE_FILES = COPYING diff --git a/package/perftest/Config.in b/package/perftest/Config.in new file mode 100644 index 00000000000..6d291b0f721 --- /dev/null +++ b/package/perftest/Config.in @@ -0,0 +1,42 @@ +config BR2_PACKAGE_PERFTEST_ARCH_SUPPORTS + bool + # Accurate cycle measurement in perftest is implemented for a + # limited set of architectures, see: + # https://github.com/linux-rdma/perftest/blob/v4.5-0.20/src/get_clock.h + # Note: the package has also a fallback to use "asm/timex.h" + # from the Kernel, in + # "$(LINUX_DIR)/arch/$(KERNEL_ARCH)/include". It is not + # reflected here as this path is not well tested. + default y if BR2_i386 || BR2_x86_64 + default y if BR2_arm && !BR2_ARM_CPU_ARMV4 && !BR2_ARM_CPU_ARMV5 && !BR2_ARM_CPU_ARMV6 + default y if BR2_aarch64 + default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le + default y if BR2_s390x + default y if BR2_sparc || BR2_sparc64 + default y if BR2_riscv + depends on BR2_USE_MMU # rdma-core + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # rdma-core + +config BR2_PACKAGE_PERFTEST + bool "perftest" + depends on BR2_PACKAGE_PERFTEST_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # rdma-core + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # rdma-core + depends on !BR2_STATIC_LIBS # rdma-core + # musl does not define sysconf(_SC_LEVEL1_DCACHE_LINESIZE) + depends on !BR2_TOOLCHAIN_USES_MUSL + select BR2_PACKAGE_PCIUTILS + select BR2_PACKAGE_RDMA_CORE + help + Open Fabrics Performance Tests. + + This is a collection of tests written over uverbs intended + for use as a performance micro-benchmark. The tests may be + used for HW or SW tuning as well as for functional testing. + + https://github.com/linux-rdma/perftest + +comment "perftest needs a glibc or uClibc toolchain w/ threads, dynamic library" + depends on BR2_PACKAGE_PERFTEST_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \ + || BR2_TOOLCHAIN_USES_MUSL diff --git a/package/perftest/perftest.hash b/package/perftest/perftest.hash new file mode 100644 index 00000000000..4333231c44f --- /dev/null +++ b/package/perftest/perftest.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 32e667dac1c0dd41a3951c5a54b961a8e28db5d9478caea2dfc268a312968c99 perftest-4.5-0.20.tar.gz +sha256 763adb7d5094f2127b026adea8701f042d28d4b1f6fb8b6e828989227a9cf7f5 COPYING diff --git a/package/perftest/perftest.mk b/package/perftest/perftest.mk new file mode 100644 index 00000000000..7ad20d0974b --- /dev/null +++ b/package/perftest/perftest.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# perftest +# +################################################################################ + +PERFTEST_VERSION = 4.5-0.20 +PERFTEST_SITE = $(call github,linux-rdma,perftest,v$(PERFTEST_VERSION)) +PERFTEST_LICENSE = GPL-2.0 or BSD-2-Clause +PERFTEST_LICENSE_FILES = COPYING +PERFTEST_DEPENDENCIES = pciutils rdma-core +# Fetched from Github, with no configure script +PERFTEST_AUTORECONF = YES + +$(eval $(autotools-package)) diff --git a/package/perl-apache-logformat-compiler/perl-apache-logformat-compiler.hash b/package/perl-apache-logformat-compiler/perl-apache-logformat-compiler.hash index de33cfb17b1..429302bfad7 100644 --- a/package/perl-apache-logformat-compiler/perl-apache-logformat-compiler.hash +++ b/package/perl-apache-logformat-compiler/perl-apache-logformat-compiler.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 a0cdfcd875cb2ee4dc9a2c24381eb55b Apache-LogFormat-Compiler-0.36.tar.gz -sha256 94509503ee74ea820183d070c11630ee5bc0fd8c12cb74fae953ed62e4a1ac17 Apache-LogFormat-Compiler-0.36.tar.gz +md5 a0cdfcd875cb2ee4dc9a2c24381eb55b Apache-LogFormat-Compiler-0.36.tar.gz +sha256 94509503ee74ea820183d070c11630ee5bc0fd8c12cb74fae953ed62e4a1ac17 Apache-LogFormat-Compiler-0.36.tar.gz # computed by scancpan -sha256 ab941cfc4794afa2113795b167177d1b25cbc77ebadd016e5727effc2cadd96b LICENSE +sha256 ab941cfc4794afa2113795b167177d1b25cbc77ebadd016e5727effc2cadd96b LICENSE diff --git a/package/perl-appconfig/perl-appconfig.hash b/package/perl-appconfig/perl-appconfig.hash index 151a2e903f6..0f0cf2f22a2 100644 --- a/package/perl-appconfig/perl-appconfig.hash +++ b/package/perl-appconfig/perl-appconfig.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 7747d9241561ed5567d5e134b8648707 AppConfig-1.71.tar.gz -sha256 1177027025ecb09ee64d9f9f255615c04db5e14f7536c344af632032eb887b0f AppConfig-1.71.tar.gz +md5 7747d9241561ed5567d5e134b8648707 AppConfig-1.71.tar.gz +sha256 1177027025ecb09ee64d9f9f255615c04db5e14f7536c344af632032eb887b0f AppConfig-1.71.tar.gz # computed by scancpan -sha256 0b22dd532e4123a511d14989c4169ed56b7316cf844c29c7897a1638a4616868 LICENSE +sha256 0b22dd532e4123a511d14989c4169ed56b7316cf844c29c7897a1638a4616868 LICENSE diff --git a/package/perl-astro-suntime/perl-astro-suntime.hash b/package/perl-astro-suntime/perl-astro-suntime.hash index e75293d4fb4..05a7af23509 100644 --- a/package/perl-astro-suntime/perl-astro-suntime.hash +++ b/package/perl-astro-suntime/perl-astro-suntime.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 42cb8c94de8a111ed652196925c22a45 Astro-SunTime-0.06.tar.gz -sha256 b4a44fddfc055cc42ee67bfd8939354793da7512ea04f30578d42dc6a701112a Astro-SunTime-0.06.tar.gz +md5 42cb8c94de8a111ed652196925c22a45 Astro-SunTime-0.06.tar.gz +sha256 b4a44fddfc055cc42ee67bfd8939354793da7512ea04f30578d42dc6a701112a Astro-SunTime-0.06.tar.gz # computed by scancpan -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE diff --git a/package/perl-class-inspector/perl-class-inspector.hash b/package/perl-class-inspector/perl-class-inspector.hash index ee7a95bfad5..3ec20d2098d 100644 --- a/package/perl-class-inspector/perl-class-inspector.hash +++ b/package/perl-class-inspector/perl-class-inspector.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 084c3aeec023639d21ecbaf7d4460b21 Class-Inspector-1.36.tar.gz -sha256 cc295d23a472687c24489d58226ead23b9fdc2588e522f0b5f0747741700694e Class-Inspector-1.36.tar.gz +md5 084c3aeec023639d21ecbaf7d4460b21 Class-Inspector-1.36.tar.gz +sha256 cc295d23a472687c24489d58226ead23b9fdc2588e522f0b5f0747741700694e Class-Inspector-1.36.tar.gz # computed by scancpan -sha256 401fe9c98bdb5707df71447fb93141f8cb2d85337d45505f5ae50a776a3f6666 LICENSE +sha256 401fe9c98bdb5707df71447fb93141f8cb2d85337d45505f5ae50a776a3f6666 LICENSE diff --git a/package/perl-class-load/perl-class-load.hash b/package/perl-class-load/perl-class-load.hash index c2900d69646..88dc5c84194 100644 --- a/package/perl-class-load/perl-class-load.hash +++ b/package/perl-class-load/perl-class-load.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 e4c831c08df592ce8dfee0c7cfc12fd7 Class-Load-0.25.tar.gz -sha256 2a48fa779b5297e56156380e8b32637c6c58decb4f4a7f3c7350523e11275f8f Class-Load-0.25.tar.gz +md5 e4c831c08df592ce8dfee0c7cfc12fd7 Class-Load-0.25.tar.gz +sha256 2a48fa779b5297e56156380e8b32637c6c58decb4f4a7f3c7350523e11275f8f Class-Load-0.25.tar.gz # computed by scancpan -sha256 dc030e63f20035291b90d09c2c40f296224e85878caf829ea981fc2f10910f9d LICENSE +sha256 dc030e63f20035291b90d09c2c40f296224e85878caf829ea981fc2f10910f9d LICENSE diff --git a/package/perl-class-method-modifiers/perl-class-method-modifiers.hash b/package/perl-class-method-modifiers/perl-class-method-modifiers.hash index 82bf91f74c0..ee0f5ec32c4 100644 --- a/package/perl-class-method-modifiers/perl-class-method-modifiers.hash +++ b/package/perl-class-method-modifiers/perl-class-method-modifiers.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 b1398e3682aa2e075b913b9f9000b596 Class-Method-Modifiers-2.13.tar.gz -sha256 ab5807f71018a842de6b7a4826d6c1f24b8d5b09fcce5005a3309cf6ea40fd63 Class-Method-Modifiers-2.13.tar.gz +md5 b1398e3682aa2e075b913b9f9000b596 Class-Method-Modifiers-2.13.tar.gz +sha256 ab5807f71018a842de6b7a4826d6c1f24b8d5b09fcce5005a3309cf6ea40fd63 Class-Method-Modifiers-2.13.tar.gz # computed by scancpan -sha256 d17e5cba8d4039f6973d5873f73b0c8949c1cffb338fafe7a57e972767546561 LICENSE +sha256 d17e5cba8d4039f6973d5873f73b0c8949c1cffb338fafe7a57e972767546561 LICENSE diff --git a/package/perl-class-std-fast/perl-class-std-fast.hash b/package/perl-class-std-fast/perl-class-std-fast.hash index 07e830a5eec..36d6e21cb9b 100644 --- a/package/perl-class-std-fast/perl-class-std-fast.hash +++ b/package/perl-class-std-fast/perl-class-std-fast.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 d06d084cb84f295b0aabf2eee78ef746 Class-Std-Fast-v0.0.8.tar.gz -sha256 1bd43763c6a373183097a30e787f5d6713b0db27511c52d533266b59d2cfa780 Class-Std-Fast-v0.0.8.tar.gz +md5 d06d084cb84f295b0aabf2eee78ef746 Class-Std-Fast-v0.0.8.tar.gz +sha256 1bd43763c6a373183097a30e787f5d6713b0db27511c52d533266b59d2cfa780 Class-Std-Fast-v0.0.8.tar.gz # computed by scancpan -sha256 aa1ab90c498aee078076e9a1f83e5f14bbfd841509582795ab5a9571428c0c38 README +sha256 aa1ab90c498aee078076e9a1f83e5f14bbfd841509582795ab5a9571428c0c38 README diff --git a/package/perl-class-std/perl-class-std.hash b/package/perl-class-std/perl-class-std.hash index 0cc38614162..eaa8705c530 100644 --- a/package/perl-class-std/perl-class-std.hash +++ b/package/perl-class-std/perl-class-std.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 82bcc56d9769edce671b0bd0e183ec3a Class-Std-0.013.tar.gz -sha256 bcd6d82f6c8af0fe069fced7dd165a4795b0b6e92351c7d4e5a1ab9a14fc35c6 Class-Std-0.013.tar.gz +md5 82bcc56d9769edce671b0bd0e183ec3a Class-Std-0.013.tar.gz +sha256 bcd6d82f6c8af0fe069fced7dd165a4795b0b6e92351c7d4e5a1ab9a14fc35c6 Class-Std-0.013.tar.gz # computed by scancpan -sha256 b8175bf3750dc54096bf1506c681b4f13262e5b82e40244e9a77730c6b72e4d6 README +sha256 b8175bf3750dc54096bf1506c681b4f13262e5b82e40244e9a77730c6b72e4d6 README diff --git a/package/perl-clone/Config.in b/package/perl-clone/Config.in new file mode 100644 index 00000000000..78f13dfe6b0 --- /dev/null +++ b/package/perl-clone/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_PERL_CLONE + bool "perl-clone" + depends on !BR2_STATIC_LIBS + help + recursively copy Perl datatypes. + + https://metacpan.org/release/Clone + +comment "perl-clone needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/package/perl-clone/perl-clone.hash b/package/perl-clone/perl-clone.hash new file mode 100644 index 00000000000..7b69b97d065 --- /dev/null +++ b/package/perl-clone/perl-clone.hash @@ -0,0 +1,6 @@ +# retrieved by scancpan from https://cpan.metacpan.org/ +md5 cafa8984a2c2e005e54b27dd1e3f0afe Clone-0.46.tar.gz +sha256 aadeed5e4c8bd6bbdf68c0dd0066cb513e16ab9e5b4382dc4a0aafd55890697b Clone-0.46.tar.gz + +# computed by scancpan +sha256 40aa7eb133e97b075024380640528760a54aefc344781741ed02539a375db5ac README.md diff --git a/package/perl-clone/perl-clone.mk b/package/perl-clone/perl-clone.mk new file mode 100644 index 00000000000..9e04329eabd --- /dev/null +++ b/package/perl-clone/perl-clone.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# perl-clone +# +################################################################################ + +PERL_CLONE_VERSION = 0.46 +PERL_CLONE_SOURCE = Clone-$(PERL_CLONE_VERSION).tar.gz +PERL_CLONE_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GA/GARU +PERL_CLONE_LICENSE = Artistic or GPL-1.0+ +PERL_CLONE_LICENSE_FILES = README.md +PERL_CLONE_DISTNAME = Clone + +$(eval $(perl-package)) diff --git a/package/perl-cookie-baker/perl-cookie-baker.hash b/package/perl-cookie-baker/perl-cookie-baker.hash index 3b056c46c84..cc2a84b1468 100644 --- a/package/perl-cookie-baker/perl-cookie-baker.hash +++ b/package/perl-cookie-baker/perl-cookie-baker.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 bc8f95893d6ec3093a62d1957e1908f2 Cookie-Baker-0.11.tar.gz -sha256 59275f474e07c0aa3611e3e684b894e7db913333d8214420be63f12ec18cd7ab Cookie-Baker-0.11.tar.gz +md5 bc8f95893d6ec3093a62d1957e1908f2 Cookie-Baker-0.11.tar.gz +sha256 59275f474e07c0aa3611e3e684b894e7db913333d8214420be63f12ec18cd7ab Cookie-Baker-0.11.tar.gz # computed by scancpan -sha256 b4ce94671fa219074d4e91e2268652d6bf9764cebcc7a5e27bfc14897745ca4c LICENSE +sha256 b4ce94671fa219074d4e91e2268652d6bf9764cebcc7a5e27bfc14897745ca4c LICENSE diff --git a/package/perl-crypt-blowfish/perl-crypt-blowfish.hash b/package/perl-crypt-blowfish/perl-crypt-blowfish.hash index f814cb9bd52..6199037ae82 100644 --- a/package/perl-crypt-blowfish/perl-crypt-blowfish.hash +++ b/package/perl-crypt-blowfish/perl-crypt-blowfish.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 792b43cd4e49d2c2cf4a9f6990ff7d1b Crypt-Blowfish-2.14.tar.gz -sha256 46b3431ffb6bf5b9cb359f79565d48407e652ad2b04fdf5ca62a69e7197a67b1 Crypt-Blowfish-2.14.tar.gz +md5 792b43cd4e49d2c2cf4a9f6990ff7d1b Crypt-Blowfish-2.14.tar.gz +sha256 46b3431ffb6bf5b9cb359f79565d48407e652ad2b04fdf5ca62a69e7197a67b1 Crypt-Blowfish-2.14.tar.gz # computed by scancpan -sha256 d61437443e6912d03677874c7baef242f28119c2c5d8b92b0f3f3660200f98d4 COPYRIGHT +sha256 d61437443e6912d03677874c7baef242f28119c2c5d8b92b0f3f3660200f98d4 COPYRIGHT diff --git a/package/perl-crypt-cbc/perl-crypt-cbc.hash b/package/perl-crypt-cbc/perl-crypt-cbc.hash index a54772a504b..281db4cb74c 100644 --- a/package/perl-crypt-cbc/perl-crypt-cbc.hash +++ b/package/perl-crypt-cbc/perl-crypt-cbc.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 3db5117d60df67e3b400fe367e716be0 Crypt-CBC-2.33.tar.gz -sha256 6a70de21b6cc7f2b100067e8e188db966e9a8001b5db6fa976e7cb5b294ae645 Crypt-CBC-2.33.tar.gz +md5 3db5117d60df67e3b400fe367e716be0 Crypt-CBC-2.33.tar.gz +sha256 6a70de21b6cc7f2b100067e8e188db966e9a8001b5db6fa976e7cb5b294ae645 Crypt-CBC-2.33.tar.gz # locally computed -sha256 9548d0beb746167270df647aa97a3e47b957adb4ec103c2cfb8f54b0005f99c7 CBC.pm +sha256 9548d0beb746167270df647aa97a3e47b957adb4ec103c2cfb8f54b0005f99c7 CBC.pm diff --git a/package/perl-crypt-openssl-aes/perl-crypt-openssl-aes.hash b/package/perl-crypt-openssl-aes/perl-crypt-openssl-aes.hash index 07064dfbbe8..16602fb92eb 100644 --- a/package/perl-crypt-openssl-aes/perl-crypt-openssl-aes.hash +++ b/package/perl-crypt-openssl-aes/perl-crypt-openssl-aes.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 269db65cbf580c3174471a2cbc9a9d95 Crypt-OpenSSL-AES-0.02.tar.gz -sha256 b66fab514edf97fc32f58da257582704a210c2b35e297d5c31b7fa2ffd08e908 Crypt-OpenSSL-AES-0.02.tar.gz +md5 269db65cbf580c3174471a2cbc9a9d95 Crypt-OpenSSL-AES-0.02.tar.gz +sha256 b66fab514edf97fc32f58da257582704a210c2b35e297d5c31b7fa2ffd08e908 Crypt-OpenSSL-AES-0.02.tar.gz # computed by scancpan -sha256 a60b8c187cc5d90f7a43adc6be3c127abaa4c739e1e7fdcff16be358533d037f README +sha256 a60b8c187cc5d90f7a43adc6be3c127abaa4c739e1e7fdcff16be358533d037f README diff --git a/package/perl-crypt-openssl-guess/perl-crypt-openssl-guess.hash b/package/perl-crypt-openssl-guess/perl-crypt-openssl-guess.hash index e6d19cb6817..b4795ed3ddd 100644 --- a/package/perl-crypt-openssl-guess/perl-crypt-openssl-guess.hash +++ b/package/perl-crypt-openssl-guess/perl-crypt-openssl-guess.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 9e86baf96828a38c967003a5e66f0c39 Crypt-OpenSSL-Guess-0.12.tar.gz -sha256 0a18d18768cf42b49b15c9dea626199dc74346bbbc76acd3d817b9c1d2bd471d Crypt-OpenSSL-Guess-0.12.tar.gz +md5 e07f470dd25023730cf8536e0cefbabd Crypt-OpenSSL-Guess-0.15.tar.gz +sha256 1c5033381819fdb4c9087dd291b90ec70e7810d31d57eade9b388eccfd70386d Crypt-OpenSSL-Guess-0.15.tar.gz # computed by scancpan sha256 5c739f181ce7aa31d739277996ff230067dad39332e5597c0dffd36e5d784072 LICENSE diff --git a/package/perl-crypt-openssl-guess/perl-crypt-openssl-guess.mk b/package/perl-crypt-openssl-guess/perl-crypt-openssl-guess.mk index 4f0898cf53b..56ff79d845f 100644 --- a/package/perl-crypt-openssl-guess/perl-crypt-openssl-guess.mk +++ b/package/perl-crypt-openssl-guess/perl-crypt-openssl-guess.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_CRYPT_OPENSSL_GUESS_VERSION = 0.12 +PERL_CRYPT_OPENSSL_GUESS_VERSION = 0.15 PERL_CRYPT_OPENSSL_GUESS_SOURCE = Crypt-OpenSSL-Guess-$(PERL_CRYPT_OPENSSL_GUESS_VERSION).tar.gz PERL_CRYPT_OPENSSL_GUESS_SITE = $(BR2_CPAN_MIRROR)/authors/id/A/AK/AKIYM PERL_CRYPT_OPENSSL_GUESS_LICENSE = Artistic or GPL-1.0+ diff --git a/package/perl-crypt-openssl-random/perl-crypt-openssl-random.hash b/package/perl-crypt-openssl-random/perl-crypt-openssl-random.hash index 57677e3445f..6c1344fb2a3 100644 --- a/package/perl-crypt-openssl-random/perl-crypt-openssl-random.hash +++ b/package/perl-crypt-openssl-random/perl-crypt-openssl-random.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 bcde8d5a822c91376deda3c4f0c75fbe Crypt-OpenSSL-Random-0.15.tar.gz -sha256 f0876faa1ba3111e39b86aa730c603211eff2905e460c72a57b61e8cf475cef4 Crypt-OpenSSL-Random-0.15.tar.gz +md5 bcde8d5a822c91376deda3c4f0c75fbe Crypt-OpenSSL-Random-0.15.tar.gz +sha256 f0876faa1ba3111e39b86aa730c603211eff2905e460c72a57b61e8cf475cef4 Crypt-OpenSSL-Random-0.15.tar.gz # computed by scancpan -sha256 fdaba2134145d3e252c5930180b2bcb13b5367ad5a8713d6868f014cd25c496f LICENSE +sha256 fdaba2134145d3e252c5930180b2bcb13b5367ad5a8713d6868f014cd25c496f LICENSE diff --git a/package/perl-crypt-openssl-rsa/perl-crypt-openssl-rsa.hash b/package/perl-crypt-openssl-rsa/perl-crypt-openssl-rsa.hash index fe2a5785830..946f879c212 100644 --- a/package/perl-crypt-openssl-rsa/perl-crypt-openssl-rsa.hash +++ b/package/perl-crypt-openssl-rsa/perl-crypt-openssl-rsa.hash @@ -1,6 +1,5 @@ -# retrieved by scancpan from http://cpan.metacpan.org/ -md5 d33681e19d2094df7c26bc7a4509265e Crypt-OpenSSL-RSA-0.31.tar.gz -sha256 4173403ad4cf76732192099f833fbfbf3cd8104e0246b3844187ae384d2c5436 Crypt-OpenSSL-RSA-0.31.tar.gz +# From https://cpan.metacpan.org/authors/id/T/TO/TODDR/CHECKSUMS +sha256 bdbe630f6d6f540325746ad99977272ac8664ff81bd19f0adaba6d6f45efd864 Crypt-OpenSSL-RSA-0.33.tar.gz # computed by scancpan -sha256 8a693ad3f52daeeb5ac5deceb1e1109c9c87095ed5ba6506d6d5c106e4066f5a LICENSE +sha256 8a693ad3f52daeeb5ac5deceb1e1109c9c87095ed5ba6506d6d5c106e4066f5a LICENSE diff --git a/package/perl-crypt-openssl-rsa/perl-crypt-openssl-rsa.mk b/package/perl-crypt-openssl-rsa/perl-crypt-openssl-rsa.mk index 23fd1ac3811..e1bfd6a76d9 100644 --- a/package/perl-crypt-openssl-rsa/perl-crypt-openssl-rsa.mk +++ b/package/perl-crypt-openssl-rsa/perl-crypt-openssl-rsa.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_CRYPT_OPENSSL_RSA_VERSION = 0.31 +PERL_CRYPT_OPENSSL_RSA_VERSION = 0.33 PERL_CRYPT_OPENSSL_RSA_SOURCE = Crypt-OpenSSL-RSA-$(PERL_CRYPT_OPENSSL_RSA_VERSION).tar.gz PERL_CRYPT_OPENSSL_RSA_SITE = $(BR2_CPAN_MIRROR)/authors/id/T/TO/TODDR PERL_CRYPT_OPENSSL_RSA_DEPENDENCIES = \ diff --git a/package/perl-data-optlist/perl-data-optlist.hash b/package/perl-data-optlist/perl-data-optlist.hash index 1c805acef7f..ccc05ae4d6d 100644 --- a/package/perl-data-optlist/perl-data-optlist.hash +++ b/package/perl-data-optlist/perl-data-optlist.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 3b2cdb7846391f9acaf4e948a9a6b21b Data-OptList-0.112.tar.gz -sha256 62c60ccaae88d5339ae36bcc8940b03388cf84adbf27828b1f8b300307103bab Data-OptList-0.112.tar.gz +md5 cda08370c4058ba56e40c2f21d94d233 Data-OptList-0.113.tar.gz +sha256 36aebc5817b7d4686b649434c2ee41f45c8bf97d4ca5a99f607cc40f695a4285 Data-OptList-0.113.tar.gz # computed by scancpan sha256 712f3e40537810ba3046533fd71d877f69ab446d5e8e8a1135771804494b8b42 LICENSE diff --git a/package/perl-data-optlist/perl-data-optlist.mk b/package/perl-data-optlist/perl-data-optlist.mk index 8e089245f61..1a9aa05cc99 100644 --- a/package/perl-data-optlist/perl-data-optlist.mk +++ b/package/perl-data-optlist/perl-data-optlist.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_DATA_OPTLIST_VERSION = 0.112 +PERL_DATA_OPTLIST_VERSION = 0.113 PERL_DATA_OPTLIST_SOURCE = Data-OptList-$(PERL_DATA_OPTLIST_VERSION).tar.gz PERL_DATA_OPTLIST_SITE = $(BR2_CPAN_MIRROR)/authors/id/R/RJ/RJBS PERL_DATA_OPTLIST_LICENSE = Artistic or GPL-1.0+ diff --git a/package/perl-date-manip/Config.in b/package/perl-date-manip/Config.in index 4ebcd4da432..d1aae7efde0 100644 --- a/package/perl-date-manip/Config.in +++ b/package/perl-date-manip/Config.in @@ -3,4 +3,4 @@ config BR2_PACKAGE_PERL_DATE_MANIP help Date manipulation routines. - https://metacpan.org/release/Date-Manip + https://github.com/SBECK-github/Date-Manip diff --git a/package/perl-date-manip/perl-date-manip.hash b/package/perl-date-manip/perl-date-manip.hash index dc267f525e2..9762e7bc6c2 100644 --- a/package/perl-date-manip/perl-date-manip.hash +++ b/package/perl-date-manip/perl-date-manip.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 77123a4cc874f72d7188f859626bdd84 Date-Manip-6.86.tar.gz -sha256 b5203782d03c79aa5822cf33d1828aaa3b4db93a275d4a428c89f56f4713361f Date-Manip-6.86.tar.gz +md5 f9fe372c7abaf90e9da2ee7c3a4d32ff Date-Manip-6.89.tar.gz +sha256 5caaa9cd1e2b0a1b84124c373e02e89b17c89fdb8fc5bc5f75ac41d304a37617 Date-Manip-6.89.tar.gz # computed by scancpan sha256 8ba2a138654f8b59b7e1e3ad0d4c81918b9148ff95078b172ccbb45fa241431d LICENSE diff --git a/package/perl-date-manip/perl-date-manip.mk b/package/perl-date-manip/perl-date-manip.mk index 35bce456e2a..6eab7790cfa 100644 --- a/package/perl-date-manip/perl-date-manip.mk +++ b/package/perl-date-manip/perl-date-manip.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_DATE_MANIP_VERSION = 6.86 +PERL_DATE_MANIP_VERSION = 6.89 PERL_DATE_MANIP_SOURCE = Date-Manip-$(PERL_DATE_MANIP_VERSION).tar.gz PERL_DATE_MANIP_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SB/SBECK PERL_DATE_MANIP_LICENSE = Artistic or GPL-1.0+ diff --git a/package/perl-datetime-tiny/perl-datetime-tiny.hash b/package/perl-datetime-tiny/perl-datetime-tiny.hash index 62fe407d295..8dc07657513 100644 --- a/package/perl-datetime-tiny/perl-datetime-tiny.hash +++ b/package/perl-datetime-tiny/perl-datetime-tiny.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 5ac2924652edb0cf5fda7c9d52162b3f DateTime-Tiny-1.07.tar.gz -sha256 83568a22838cb518fbeb9e060460ec7f59d5a0b0a1cc06562954c3674d7cf7e4 DateTime-Tiny-1.07.tar.gz +md5 5ac2924652edb0cf5fda7c9d52162b3f DateTime-Tiny-1.07.tar.gz +sha256 83568a22838cb518fbeb9e060460ec7f59d5a0b0a1cc06562954c3674d7cf7e4 DateTime-Tiny-1.07.tar.gz # computed by scancpan -sha256 21cda7a55a8d4b32a43c654f0d4d4a1587096b35bf2a93ea12a2e3a8c2c0b88f LICENSE +sha256 21cda7a55a8d4b32a43c654f0d4d4a1587096b35bf2a93ea12a2e3a8c2c0b88f LICENSE diff --git a/package/perl-dbd-mysql/perl-dbd-mysql.hash b/package/perl-dbd-mysql/perl-dbd-mysql.hash index 51de4760951..995928fbae1 100644 --- a/package/perl-dbd-mysql/perl-dbd-mysql.hash +++ b/package/perl-dbd-mysql/perl-dbd-mysql.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 bdf4f4d899b8af29ebd8ebfb7438d05f DBD-mysql-4.046.tar.gz -sha256 6165652ec959d05b97f5413fa3dff014b78a44cf6de21ae87283b28378daf1f7 DBD-mysql-4.046.tar.gz +md5 bdf4f4d899b8af29ebd8ebfb7438d05f DBD-mysql-4.046.tar.gz +sha256 6165652ec959d05b97f5413fa3dff014b78a44cf6de21ae87283b28378daf1f7 DBD-mysql-4.046.tar.gz # computed by scancpan -sha256 7a9ba29702b957805cfa8aa63bca43175625824263232dbade0010d385ab888c LICENSE +sha256 7a9ba29702b957805cfa8aa63bca43175625824263232dbade0010d385ab888c LICENSE diff --git a/package/perl-dbi/perl-dbi.hash b/package/perl-dbi/perl-dbi.hash index 707accf011b..757a4cc5a4d 100644 --- a/package/perl-dbi/perl-dbi.hash +++ b/package/perl-dbi/perl-dbi.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 352f80b1e23769c116082a90905d7398 DBI-1.643.tar.gz -sha256 8a2b993db560a2c373c174ee976a51027dd780ec766ae17620c20393d2e836fa DBI-1.643.tar.gz +md5 352f80b1e23769c116082a90905d7398 DBI-1.643.tar.gz +sha256 8a2b993db560a2c373c174ee976a51027dd780ec766ae17620c20393d2e836fa DBI-1.643.tar.gz # computed by scancpan -sha256 33453c8b0d8d474a42669ac702a13c20f39c91a34b3df4e6ca778fc2f0f711c7 LICENSE +sha256 33453c8b0d8d474a42669ac702a13c20f39c91a34b3df4e6ca778fc2f0f711c7 LICENSE diff --git a/package/perl-devel-globaldestruction/perl-devel-globaldestruction.hash b/package/perl-devel-globaldestruction/perl-devel-globaldestruction.hash index b3cd6e32f13..727df4d24f7 100644 --- a/package/perl-devel-globaldestruction/perl-devel-globaldestruction.hash +++ b/package/perl-devel-globaldestruction/perl-devel-globaldestruction.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 24221ba322cf2dc46a1fc99b53e2380b Devel-GlobalDestruction-0.14.tar.gz -sha256 34b8a5f29991311468fe6913cadaba75fd5d2b0b3ee3bb41fe5b53efab9154ab Devel-GlobalDestruction-0.14.tar.gz +md5 24221ba322cf2dc46a1fc99b53e2380b Devel-GlobalDestruction-0.14.tar.gz +sha256 34b8a5f29991311468fe6913cadaba75fd5d2b0b3ee3bb41fe5b53efab9154ab Devel-GlobalDestruction-0.14.tar.gz # computed by scancpan -sha256 f7adbd1db623233e220f9157521a620dbae4918ae7088845aa61e87b7f62bb23 README +sha256 f7adbd1db623233e220f9157521a620dbae4918ae7088845aa61e87b7f62bb23 README diff --git a/package/perl-devel-stacktrace-ashtml/perl-devel-stacktrace-ashtml.hash b/package/perl-devel-stacktrace-ashtml/perl-devel-stacktrace-ashtml.hash index 4f31c6a1e44..8a3e625f564 100644 --- a/package/perl-devel-stacktrace-ashtml/perl-devel-stacktrace-ashtml.hash +++ b/package/perl-devel-stacktrace-ashtml/perl-devel-stacktrace-ashtml.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 4ec8bd92e4a765a7cabf402db9640412 Devel-StackTrace-AsHTML-0.15.tar.gz -sha256 6283dbe2197e2f20009cc4b449997742169cdd951bfc44cbc6e62c2a962d3147 Devel-StackTrace-AsHTML-0.15.tar.gz +md5 4ec8bd92e4a765a7cabf402db9640412 Devel-StackTrace-AsHTML-0.15.tar.gz +sha256 6283dbe2197e2f20009cc4b449997742169cdd951bfc44cbc6e62c2a962d3147 Devel-StackTrace-AsHTML-0.15.tar.gz # computed by scancpan -sha256 ffecf60c52b85d56c928f5eac889b5044243c3907b810ef640c9f02fbce567ac LICENSE +sha256 ffecf60c52b85d56c928f5eac889b5044243c3907b810ef640c9f02fbce567ac LICENSE diff --git a/package/perl-devel-stacktrace/perl-devel-stacktrace.hash b/package/perl-devel-stacktrace/perl-devel-stacktrace.hash index 58923cc0716..4e64ef17164 100644 --- a/package/perl-devel-stacktrace/perl-devel-stacktrace.hash +++ b/package/perl-devel-stacktrace/perl-devel-stacktrace.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 a5b09f7be7f2b10b525a9740676906d8 Devel-StackTrace-2.04.tar.gz -sha256 cd3c03ed547d3d42c61fa5814c98296139392e7971c092e09a431f2c9f5d6855 Devel-StackTrace-2.04.tar.gz +md5 a5b09f7be7f2b10b525a9740676906d8 Devel-StackTrace-2.04.tar.gz +sha256 cd3c03ed547d3d42c61fa5814c98296139392e7971c092e09a431f2c9f5d6855 Devel-StackTrace-2.04.tar.gz # computed by scancpan -sha256 dbd3162d261db5b40cac4d85afba619ec6a196398003c57b85c2333e7ef4c393 LICENSE +sha256 dbd3162d261db5b40cac4d85afba619ec6a196398003c57b85c2333e7ef4c393 LICENSE diff --git a/package/perl-device-serialport/perl-device-serialport.hash b/package/perl-device-serialport/perl-device-serialport.hash index 35ddc13d3fa..305a5ec3887 100644 --- a/package/perl-device-serialport/perl-device-serialport.hash +++ b/package/perl-device-serialport/perl-device-serialport.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 82c698151f934eb28c65d1838cee7d9e Device-SerialPort-1.04.tar.gz -sha256 d392567cb39b4ea606c0e0acafd8ed72320311b995336ece5fcefcf9b150e9d7 Device-SerialPort-1.04.tar.gz +md5 82c698151f934eb28c65d1838cee7d9e Device-SerialPort-1.04.tar.gz +sha256 d392567cb39b4ea606c0e0acafd8ed72320311b995336ece5fcefcf9b150e9d7 Device-SerialPort-1.04.tar.gz # computed by scancpan -sha256 59432e84eca65c10c4b627f8af0b00833685856b68242b816aea2a38283a124c README +sha256 59432e84eca65c10c4b627f8af0b00833685856b68242b816aea2a38283a124c README diff --git a/package/perl-digest-sha1/perl-digest-sha1.hash b/package/perl-digest-sha1/perl-digest-sha1.hash index bfc94a12a54..dc32ddcfdb5 100644 --- a/package/perl-digest-sha1/perl-digest-sha1.hash +++ b/package/perl-digest-sha1/perl-digest-sha1.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 bd22388f268434f2b24f64e28bf1aa35 Digest-SHA1-2.13.tar.gz -sha256 68c1dac2187421f0eb7abf71452a06f190181b8fc4b28ededf5b90296fb943cc Digest-SHA1-2.13.tar.gz +md5 bd22388f268434f2b24f64e28bf1aa35 Digest-SHA1-2.13.tar.gz +sha256 68c1dac2187421f0eb7abf71452a06f190181b8fc4b28ededf5b90296fb943cc Digest-SHA1-2.13.tar.gz # computed by scancpan -sha256 805bee77fab9c72b0bfb452bb623b278f1767de62011e1814de2a6f6115439c8 README +sha256 805bee77fab9c72b0bfb452bb623b278f1767de62011e1814de2a6f6115439c8 README diff --git a/package/perl-dist-checkconflicts/perl-dist-checkconflicts.hash b/package/perl-dist-checkconflicts/perl-dist-checkconflicts.hash index 5605fed4aec..15074e0a27f 100644 --- a/package/perl-dist-checkconflicts/perl-dist-checkconflicts.hash +++ b/package/perl-dist-checkconflicts/perl-dist-checkconflicts.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 c8725a92b9169708b0f63036812070f2 Dist-CheckConflicts-0.11.tar.gz -sha256 ea844b9686c94d666d9d444321d764490b2cde2f985c4165b4c2c77665caedc4 Dist-CheckConflicts-0.11.tar.gz +md5 c8725a92b9169708b0f63036812070f2 Dist-CheckConflicts-0.11.tar.gz +sha256 ea844b9686c94d666d9d444321d764490b2cde2f985c4165b4c2c77665caedc4 Dist-CheckConflicts-0.11.tar.gz # computed by scancpan -sha256 b4e0637ed96008ddcbf7e0ddeb73967df3d0b4dc62a6b7fdb86eac37018cb12e LICENSE +sha256 b4e0637ed96008ddcbf7e0ddeb73967df3d0b4dc62a6b7fdb86eac37018cb12e LICENSE diff --git a/package/perl-encode-detect/perl-encode-detect.hash b/package/perl-encode-detect/perl-encode-detect.hash index 1893f1db943..a478f62d382 100644 --- a/package/perl-encode-detect/perl-encode-detect.hash +++ b/package/perl-encode-detect/perl-encode-detect.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 ee9faf55d7105c97b02b8ebe590819c7 Encode-Detect-1.01.tar.gz -sha256 834d893aa7db6ce3f158afbd0e432d6ed15a276e0940db0a74be13fd9c4bbbf1 Encode-Detect-1.01.tar.gz +md5 ee9faf55d7105c97b02b8ebe590819c7 Encode-Detect-1.01.tar.gz +sha256 834d893aa7db6ce3f158afbd0e432d6ed15a276e0940db0a74be13fd9c4bbbf1 Encode-Detect-1.01.tar.gz # computed by scancpan -sha256 53692a2ed6c6a2c6ec9b32dd0b820dfae91e0a1fcdf625ca9ed0bdf8705fcc4f LICENSE +sha256 53692a2ed6c6a2c6ec9b32dd0b820dfae91e0a1fcdf625ca9ed0bdf8705fcc4f LICENSE diff --git a/package/perl-encode-locale/perl-encode-locale.hash b/package/perl-encode-locale/perl-encode-locale.hash index 258eb295a75..844274242a6 100644 --- a/package/perl-encode-locale/perl-encode-locale.hash +++ b/package/perl-encode-locale/perl-encode-locale.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 fcfdb8e4ee34bcf62aed429b4a23db27 Encode-Locale-1.05.tar.gz -sha256 176fa02771f542a4efb1dbc2a4c928e8f4391bf4078473bd6040d8f11adb0ec1 Encode-Locale-1.05.tar.gz +md5 fcfdb8e4ee34bcf62aed429b4a23db27 Encode-Locale-1.05.tar.gz +sha256 176fa02771f542a4efb1dbc2a4c928e8f4391bf4078473bd6040d8f11adb0ec1 Encode-Locale-1.05.tar.gz # computed by scancpan -sha256 edfeacafbed5a0f2c4a2a3db3fb0274a7f210768d01c853c60b7feac841c83c8 README +sha256 edfeacafbed5a0f2c4a2a3db3fb0274a7f210768d01c853c60b7feac841c83c8 README diff --git a/package/perl-exporter-tiny/perl-exporter-tiny.hash b/package/perl-exporter-tiny/perl-exporter-tiny.hash index c714ef902e9..0ecdf78482b 100644 --- a/package/perl-exporter-tiny/perl-exporter-tiny.hash +++ b/package/perl-exporter-tiny/perl-exporter-tiny.hash @@ -1,7 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 485897322a2514b4d6ca90b2daacb7cd Exporter-Tiny-1.002002.tar.gz -sha256 00f0b95716b18157132c6c118ded8ba31392563d19e490433e9a65382e707101 Exporter-Tiny-1.002002.tar.gz +md5 2d555e289eac6450052e8683c292cbf7 Exporter-Tiny-1.006000.tar.gz +sha256 d95479ff085699d6422f7fc8306db085e34b626438deb82ec82d41df2295f400 Exporter-Tiny-1.006000.tar.gz # computed by scancpan -sha256 f4cb223c8ac37d6ccd0e78b2892ca54a48a6adbe6a271c3c17c0226646297e66 COPYRIGHT -sha256 1fb7395e76eabf94c421912d7d0a4f7fa745d49e1acb76b222c21d605b66bd25 LICENSE +sha256 a4f85c6f4d6e8bdd37b7ab08013e3e3bee1fe8e910e20f8f54d5025ffe40f384 LICENSE diff --git a/package/perl-exporter-tiny/perl-exporter-tiny.mk b/package/perl-exporter-tiny/perl-exporter-tiny.mk index c7abfbae2d7..489ee54e174 100644 --- a/package/perl-exporter-tiny/perl-exporter-tiny.mk +++ b/package/perl-exporter-tiny/perl-exporter-tiny.mk @@ -4,11 +4,11 @@ # ################################################################################ -PERL_EXPORTER_TINY_VERSION = 1.002002 +PERL_EXPORTER_TINY_VERSION = 1.006000 PERL_EXPORTER_TINY_SOURCE = Exporter-Tiny-$(PERL_EXPORTER_TINY_VERSION).tar.gz PERL_EXPORTER_TINY_SITE = $(BR2_CPAN_MIRROR)/authors/id/T/TO/TOBYINK PERL_EXPORTER_TINY_LICENSE = Artistic or GPL-1.0+ -PERL_EXPORTER_TINY_LICENSE_FILES = COPYRIGHT LICENSE +PERL_EXPORTER_TINY_LICENSE_FILES = LICENSE PERL_EXPORTER_TINY_DISTNAME = Exporter-Tiny $(eval $(perl-package)) diff --git a/package/perl-extutils-config/perl-extutils-config.hash b/package/perl-extutils-config/perl-extutils-config.hash index 518de841884..f4a4b18fc65 100644 --- a/package/perl-extutils-config/perl-extutils-config.hash +++ b/package/perl-extutils-config/perl-extutils-config.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 565a7b09c7cac5907a25bbe2c959a717 ExtUtils-Config-0.008.tar.gz -sha256 ae5104f634650dce8a79b7ed13fb59d67a39c213a6776cfdaa3ee749e62f1a8c ExtUtils-Config-0.008.tar.gz +md5 565a7b09c7cac5907a25bbe2c959a717 ExtUtils-Config-0.008.tar.gz +sha256 ae5104f634650dce8a79b7ed13fb59d67a39c213a6776cfdaa3ee749e62f1a8c ExtUtils-Config-0.008.tar.gz # computed by scancpan -sha256 33b39fda54675d4d681764049e27b537cac12213aa6650667abea43662264ddc LICENSE +sha256 33b39fda54675d4d681764049e27b537cac12213aa6650667abea43662264ddc LICENSE diff --git a/package/perl-extutils-helpers/perl-extutils-helpers.hash b/package/perl-extutils-helpers/perl-extutils-helpers.hash index 2d291901e63..3f80a96e6dd 100644 --- a/package/perl-extutils-helpers/perl-extutils-helpers.hash +++ b/package/perl-extutils-helpers/perl-extutils-helpers.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 83b00c1e401321c425ae5db6b2b2fd12 ExtUtils-Helpers-0.026.tar.gz -sha256 de901b6790a4557cf4ec908149e035783b125bf115eb9640feb1bc1c24c33416 ExtUtils-Helpers-0.026.tar.gz +md5 83b00c1e401321c425ae5db6b2b2fd12 ExtUtils-Helpers-0.026.tar.gz +sha256 de901b6790a4557cf4ec908149e035783b125bf115eb9640feb1bc1c24c33416 ExtUtils-Helpers-0.026.tar.gz # computed by scancpan -sha256 e5530d0ebc8662df3a970644d867faf12760b1a95ca6e2bf1c5f9af410a418e0 LICENSE +sha256 e5530d0ebc8662df3a970644d867faf12760b1a95ca6e2bf1c5f9af410a418e0 LICENSE diff --git a/package/perl-extutils-installpaths/perl-extutils-installpaths.hash b/package/perl-extutils-installpaths/perl-extutils-installpaths.hash index 2627a27d503..199706044cd 100644 --- a/package/perl-extutils-installpaths/perl-extutils-installpaths.hash +++ b/package/perl-extutils-installpaths/perl-extutils-installpaths.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 9a8d66aab1ffec98ea260faf03ac612b ExtUtils-InstallPaths-0.012.tar.gz -sha256 84735e3037bab1fdffa3c2508567ad412a785c91599db3c12593a50a1dd434ed ExtUtils-InstallPaths-0.012.tar.gz +md5 9a8d66aab1ffec98ea260faf03ac612b ExtUtils-InstallPaths-0.012.tar.gz +sha256 84735e3037bab1fdffa3c2508567ad412a785c91599db3c12593a50a1dd434ed ExtUtils-InstallPaths-0.012.tar.gz # computed by scancpan -sha256 b95d38ac031587625625d92fbd2ee1d5df0d02606057d680e7dcf3598fe629f9 LICENSE +sha256 b95d38ac031587625625d92fbd2ee1d5df0d02606057d680e7dcf3598fe629f9 LICENSE diff --git a/package/perl-file-listing/perl-file-listing.hash b/package/perl-file-listing/perl-file-listing.hash index 2358965714c..cb52c127cde 100644 --- a/package/perl-file-listing/perl-file-listing.hash +++ b/package/perl-file-listing/perl-file-listing.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 cf60a79563185391831613178a79b4cd File-Listing-6.14.tar.gz -sha256 15b3a4871e23164a36f226381b74d450af41f12cc94985f592a669fcac7b48ff File-Listing-6.14.tar.gz +md5 8ba34641a6c5a2ec1b0bf7064f68c535 File-Listing-6.15.tar.gz +sha256 46c4fb9f9eb9635805e26b7ea55b54455e47302758a10ed2a0b92f392713770c File-Listing-6.15.tar.gz # computed by scancpan -sha256 7f0ccec295e6d7d2be1439cedd7caf6cc6247191f4c10ac56d91ee9bc265ba02 LICENSE +sha256 287e6f0fdf2db790a24975b492cde64b210c16af7137f44373cbd03fcf844212 LICENSE diff --git a/package/perl-file-listing/perl-file-listing.mk b/package/perl-file-listing/perl-file-listing.mk index 61bbc18eb82..c8584ffa8ac 100644 --- a/package/perl-file-listing/perl-file-listing.mk +++ b/package/perl-file-listing/perl-file-listing.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_FILE_LISTING_VERSION = 6.14 +PERL_FILE_LISTING_VERSION = 6.15 PERL_FILE_LISTING_SOURCE = File-Listing-$(PERL_FILE_LISTING_VERSION).tar.gz PERL_FILE_LISTING_SITE = $(BR2_CPAN_MIRROR)/authors/id/P/PL/PLICEASE PERL_FILE_LISTING_LICENSE = Artistic or GPL-1.0+ diff --git a/package/perl-file-sharedir-install/perl-file-sharedir-install.hash b/package/perl-file-sharedir-install/perl-file-sharedir-install.hash index abbab34e98f..b462d8e683c 100644 --- a/package/perl-file-sharedir-install/perl-file-sharedir-install.hash +++ b/package/perl-file-sharedir-install/perl-file-sharedir-install.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 5eabd44a5d7d84bf2e8e502491226287 File-ShareDir-Install-0.13.tar.gz -sha256 45befdf0d95cbefe7c25a1daf293d85f780d6d2576146546e6828aad26e580f9 File-ShareDir-Install-0.13.tar.gz +md5 5eabd44a5d7d84bf2e8e502491226287 File-ShareDir-Install-0.13.tar.gz +sha256 45befdf0d95cbefe7c25a1daf293d85f780d6d2576146546e6828aad26e580f9 File-ShareDir-Install-0.13.tar.gz # computed by scancpan -sha256 c207ca1c71c16a443d875a78d8aeccfbe550da502cd7fda24819548afb04fb5c LICENSE +sha256 c207ca1c71c16a443d875a78d8aeccfbe550da502cd7fda24819548afb04fb5c LICENSE diff --git a/package/perl-filesys-notify-simple/perl-filesys-notify-simple.hash b/package/perl-filesys-notify-simple/perl-filesys-notify-simple.hash index 87d365d6c6e..eb4a53bf81a 100644 --- a/package/perl-filesys-notify-simple/perl-filesys-notify-simple.hash +++ b/package/perl-filesys-notify-simple/perl-filesys-notify-simple.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 4a3ca3098b2455346fe24a66c94d2151 Filesys-Notify-Simple-0.14.tar.gz -sha256 1fda712d4ba5e1868159ed35f6f8efbfae9d435d6376f5606d533bcb080555a4 Filesys-Notify-Simple-0.14.tar.gz +md5 4a3ca3098b2455346fe24a66c94d2151 Filesys-Notify-Simple-0.14.tar.gz +sha256 1fda712d4ba5e1868159ed35f6f8efbfae9d435d6376f5606d533bcb080555a4 Filesys-Notify-Simple-0.14.tar.gz # computed by scancpan -sha256 9a5cceb9fdb0064b57eeca0e7ad2af1e57eff51320a13083fc22930d2a190ed7 LICENSE +sha256 9a5cceb9fdb0064b57eeca0e7ad2af1e57eff51320a13083fc22930d2a190ed7 LICENSE diff --git a/package/perl-gd/0001-Makefile.PL-fix-cross-compilation-with-gdlib.pc.patch b/package/perl-gd/0001-Makefile.PL-fix-cross-compilation-with-gdlib.pc.patch deleted file mode 100644 index af053c56058..00000000000 --- a/package/perl-gd/0001-Makefile.PL-fix-cross-compilation-with-gdlib.pc.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 11dc017e902397c452331425eb6101b3315572fa Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 24 Jan 2021 10:59:31 +0100 -Subject: [PATCH] Makefile.PL: fix cross-compilation with gdlib.pc - -Cross-compilation will fail if gdlib.pc does not contain any cflags. -Indeed, if cflags is empty, Makefile.PL will use the default value for -INC (i.e. -I/usr/include -I/usr/include/gd) - -It should be noted that gdlib-config has been dropped from gd since -version 2.3.0 - -Signed-off-by: Fabrice Fontaine -[Upstream status: probably not upstreamable] ---- - Makefile.PL | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.PL b/Makefile.PL -index 25f2f93..7da3651 100644 ---- a/Makefile.PL -+++ b/Makefile.PL -@@ -47,7 +47,7 @@ If you want to try to compile anyway, please rerun this script with the option - - END - } - --@INC = qw(-I/usr/include -I/usr/include/gd) unless @INC; -+#@INC = qw(-I/usr/include -I/usr/include/gd) unless @INC; - @LIBPATH = qw(-L/usr/lib/X11 -L/usr/X11R6/lib -L/usr/X11/lib -L/usr/lib) unless @LIBPATH; - @LIBS = qw(-lgd) unless @LIBS; - --- -2.29.2 - diff --git a/package/perl-gd/perl-gd.hash b/package/perl-gd/perl-gd.hash index 780b1d1e27f..97f1da821ae 100644 --- a/package/perl-gd/perl-gd.hash +++ b/package/perl-gd/perl-gd.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 c2bf1ca56d15e33d2432e4d8ba5aeadf GD-2.73.tar.gz -sha256 491c9e73238522e2987e66725a20935f4268a3864202ecbaf4659a1691ba322b GD-2.73.tar.gz +md5 fb4bacab10ed4f28d52c2aabdaf866bb GD-2.76.tar.gz +sha256 693d9e3d709e9188a682cb9090a77b70aac12a04e84128677577b94e4331775b GD-2.76.tar.gz # computed by scancpan sha256 1e2250289d6df4ba1c24f7550982d7ffaff2c97cd02e847659406e1afd28e83f LICENSE diff --git a/package/perl-gd/perl-gd.mk b/package/perl-gd/perl-gd.mk index b402dfff496..cd32c7fb8f8 100644 --- a/package/perl-gd/perl-gd.mk +++ b/package/perl-gd/perl-gd.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_GD_VERSION = 2.73 +PERL_GD_VERSION = 2.76 PERL_GD_SOURCE = GD-$(PERL_GD_VERSION).tar.gz PERL_GD_SITE = $(BR2_CPAN_MIRROR)/authors/id/R/RU/RURBAN PERL_GD_DEPENDENCIES = host-perl-extutils-pkgconfig zlib gd @@ -40,6 +40,12 @@ PERL_GD_OPTIONS += PNG PERL_GD_CONF_OPTS += -lib_png_path=$(STAGING_DIR)/usr endif +ifeq ($(BR2_PACKAGE_WEBP),y) +PERL_GD_DEPENDENCIES += webp +PERL_GD_OPTIONS += WEBP +PERL_GD_CONF_OPTS += -lib_webp_path=$(STAGING_DIR)/usr +endif + ifeq ($(BR2_PACKAGE_XLIB_LIBXPM),y) PERL_GD_DEPENDENCIES += xlib_libXpm PERL_GD_OPTIONS += XPM diff --git a/package/perl-gdgraph/perl-gdgraph.hash b/package/perl-gdgraph/perl-gdgraph.hash index c0b195eb2a1..b2ad4ecc307 100644 --- a/package/perl-gdgraph/perl-gdgraph.hash +++ b/package/perl-gdgraph/perl-gdgraph.hash @@ -1,7 +1,7 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 38c6a188519e6272e9b2b722b315c3d8 GDGraph-1.54.tar.gz -sha256 b96f5c10b656c17d16ab65a1777c908297b028d3b6815f6d54b2337f006bfa4f GDGraph-1.54.tar.gz +md5 38c6a188519e6272e9b2b722b315c3d8 GDGraph-1.54.tar.gz +sha256 b96f5c10b656c17d16ab65a1777c908297b028d3b6815f6d54b2337f006bfa4f GDGraph-1.54.tar.gz # Hash for license files -sha256 710484e3a1196664bbe8a5ad5d53c528e01226eb20e2885a4e1131eb6c6565cd Dustismo.LICENSE -sha256 f44630ad9101e40a101d906a07908c975a9b0742273cfb0c00a51d73afb53e7d README +sha256 710484e3a1196664bbe8a5ad5d53c528e01226eb20e2885a4e1131eb6c6565cd Dustismo.LICENSE +sha256 f44630ad9101e40a101d906a07908c975a9b0742273cfb0c00a51d73afb53e7d README diff --git a/package/perl-gdtextutil/perl-gdtextutil.hash b/package/perl-gdtextutil/perl-gdtextutil.hash index add0717f1da..7f336038a83 100644 --- a/package/perl-gdtextutil/perl-gdtextutil.hash +++ b/package/perl-gdtextutil/perl-gdtextutil.hash @@ -1,7 +1,7 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 941ad06eadc86b47f3a32da405665c41 GDTextUtil-0.86.tar.gz -sha256 886ecbf85cfe94f4135ee5689c4847a9ae783ecb99e6759e12c734f2dd6116bc GDTextUtil-0.86.tar.gz +md5 941ad06eadc86b47f3a32da405665c41 GDTextUtil-0.86.tar.gz +sha256 886ecbf85cfe94f4135ee5689c4847a9ae783ecb99e6759e12c734f2dd6116bc GDTextUtil-0.86.tar.gz # Hash for license files -sha256 710484e3a1196664bbe8a5ad5d53c528e01226eb20e2885a4e1131eb6c6565cd Dustismo.LICENSE -sha256 93ca7dd7f372c79e8ec1f849f2a418a67d195e4027c1b3e3dd8444fb30f3e97c README +sha256 710484e3a1196664bbe8a5ad5d53c528e01226eb20e2885a4e1131eb6c6565cd Dustismo.LICENSE +sha256 93ca7dd7f372c79e8ec1f849f2a418a67d195e4027c1b3e3dd8444fb30f3e97c README diff --git a/package/perl-hash-multivalue/perl-hash-multivalue.hash b/package/perl-hash-multivalue/perl-hash-multivalue.hash index 3a686506972..a5922507438 100644 --- a/package/perl-hash-multivalue/perl-hash-multivalue.hash +++ b/package/perl-hash-multivalue/perl-hash-multivalue.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 508015312eb08cd2bcea987c4efbb93d Hash-MultiValue-0.16.tar.gz -sha256 66181df7aa68e2786faf6895c88b18b95c800a8e4e6fb4c07fd176410a3c73f4 Hash-MultiValue-0.16.tar.gz +md5 508015312eb08cd2bcea987c4efbb93d Hash-MultiValue-0.16.tar.gz +sha256 66181df7aa68e2786faf6895c88b18b95c800a8e4e6fb4c07fd176410a3c73f4 Hash-MultiValue-0.16.tar.gz # computed by scancpan -sha256 af32512e13f6722dab770b989c57556a5e3d29a49b22b8ad5668064db8592401 LICENSE +sha256 af32512e13f6722dab770b989c57556a5e3d29a49b22b8ad5668064db8592401 LICENSE diff --git a/package/perl-html-parser/perl-html-parser.hash b/package/perl-html-parser/perl-html-parser.hash index 36b094a7cbf..ccd115d6c95 100644 --- a/package/perl-html-parser/perl-html-parser.hash +++ b/package/perl-html-parser/perl-html-parser.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 60e266d5a07fbea671a0383dd8af7b6c HTML-Parser-3.76.tar.gz -sha256 64d9e2eb2b420f1492da01ec0e6976363245b4be9290f03f10b7d2cb63fa2f61 HTML-Parser-3.76.tar.gz +md5 8e7151d08f30457a2ba80020b936285f HTML-Parser-3.80.tar.gz +sha256 63411db03016747e37c2636db11b05f8cc71608ef5bff36d04ddb0dc92f7835b HTML-Parser-3.80.tar.gz # computed by scancpan -sha256 0e57338bc10d5fb8891012ebee65a7b504b247f5bb485e121b8b48d7a118a60b LICENSE +sha256 9081922eb873ec1809c20672a7385a65f3c6b1163166bf69b2bbe986fb5b0159 LICENSE diff --git a/package/perl-html-parser/perl-html-parser.mk b/package/perl-html-parser/perl-html-parser.mk index 097564dbcba..1e1f8e60501 100644 --- a/package/perl-html-parser/perl-html-parser.mk +++ b/package/perl-html-parser/perl-html-parser.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_HTML_PARSER_VERSION = 3.76 +PERL_HTML_PARSER_VERSION = 3.80 PERL_HTML_PARSER_SOURCE = HTML-Parser-$(PERL_HTML_PARSER_VERSION).tar.gz PERL_HTML_PARSER_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_HTML_PARSER_LICENSE = Artistic or GPL-1.0+ diff --git a/package/perl-html-tagset/perl-html-tagset.hash b/package/perl-html-tagset/perl-html-tagset.hash index 9569ece6626..648f75f6490 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 d2bfa18fe1904df7f683e96611e87437 HTML-Tagset-3.20.tar.gz +sha256 adb17dac9e36cd011f5243881c9739417fd102fce760f8de4e9be4c7131108e2 HTML-Tagset-3.20.tar.gz # computed by scancpan -sha256 275cc182d78ac2db6856442c5d334c925350fb56fe83ee3577f5850317423419 README +sha256 275cc182d78ac2db6856442c5d334c925350fb56fe83ee3577f5850317423419 README diff --git a/package/perl-http-cookies/Config.in b/package/perl-http-cookies/Config.in index 3ca461bf833..147d9521bb7 100644 --- a/package/perl-http-cookies/Config.in +++ b/package/perl-http-cookies/Config.in @@ -1,8 +1,12 @@ config BR2_PACKAGE_PERL_HTTP_COOKIES bool "perl-http-cookies" + depends on !BR2_STATIC_LIBS # perl-http-message -> perl-clone select BR2_PACKAGE_PERL_HTTP_DATE # runtime select BR2_PACKAGE_PERL_HTTP_MESSAGE # runtime help HTTP cookie jars. https://github.com/libwww-perl/HTTP-Cookies + +comment "perl-http-cookies needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/package/perl-http-daemon/Config.in b/package/perl-http-daemon/Config.in index 0c7ffe723aa..4d6277a7996 100644 --- a/package/perl-http-daemon/Config.in +++ b/package/perl-http-daemon/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PERL_HTTP_DAEMON bool "perl-http-daemon" + depends on !BR2_STATIC_LIBS # perl-http-message -> perl-clone select BR2_PACKAGE_PERL_HTTP_DATE # runtime select BR2_PACKAGE_PERL_HTTP_MESSAGE # runtime select BR2_PACKAGE_PERL_LWP_MEDIATYPES # runtime @@ -7,3 +8,6 @@ config BR2_PACKAGE_PERL_HTTP_DAEMON A simple http server class. https://github.com/libwww-perl/HTTP-Daemon + +comment "perl-http-daemon needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/package/perl-http-daemon/perl-http-daemon.hash b/package/perl-http-daemon/perl-http-daemon.hash index f8272a4fceb..c19b3b9558e 100644 --- a/package/perl-http-daemon/perl-http-daemon.hash +++ b/package/perl-http-daemon/perl-http-daemon.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 63674e3f81760a29075853413eb157d8 HTTP-Daemon-6.12.tar.gz -sha256 df47bed10c38670c780fd0116867d5fd4693604acde31ba63380dce04c4e1fa6 HTTP-Daemon-6.12.tar.gz +md5 3111b0081d08d8b225f52884033de349 HTTP-Daemon-6.14.tar.gz +sha256 f0767e7f3cbb80b21313c761f07ad8ed253bce9fa2d0ba806b3fb72d309b2e1d HTTP-Daemon-6.14.tar.gz # computed by scancpan -sha256 e84ac5ab84ace59952d2640e0ca4522eb0aaa8c2aa696352d1252aa109ea20bc LICENCE +sha256 311f168ba9a7819ffab4fea19858f9e880737baf6d112929d11530205035a4cc LICENCE diff --git a/package/perl-http-daemon/perl-http-daemon.mk b/package/perl-http-daemon/perl-http-daemon.mk index e4750726286..fe50c768bff 100644 --- a/package/perl-http-daemon/perl-http-daemon.mk +++ b/package/perl-http-daemon/perl-http-daemon.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_HTTP_DAEMON_VERSION = 6.12 +PERL_HTTP_DAEMON_VERSION = 6.14 PERL_HTTP_DAEMON_SOURCE = HTTP-Daemon-$(PERL_HTTP_DAEMON_VERSION).tar.gz PERL_HTTP_DAEMON_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_HTTP_DAEMON_DEPENDENCIES = host-perl-module-build-tiny diff --git a/package/perl-http-date/perl-http-date.hash b/package/perl-http-date/perl-http-date.hash index 7c1fa5b9c3c..b278423002f 100644 --- a/package/perl-http-date/perl-http-date.hash +++ b/package/perl-http-date/perl-http-date.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 2ecbb3aedf6aef062605191813ca3027 HTTP-Date-6.05.tar.gz -sha256 365d6294dfbd37ebc51def8b65b81eb79b3934ecbc95a2ec2d4d827efe6a922b HTTP-Date-6.05.tar.gz +md5 2ecbb3aedf6aef062605191813ca3027 HTTP-Date-6.05.tar.gz +sha256 365d6294dfbd37ebc51def8b65b81eb79b3934ecbc95a2ec2d4d827efe6a922b HTTP-Date-6.05.tar.gz # computed by scancpan -sha256 305b71c4d2fd6380585689c5f1c620737a36a318ce0f9c772badce0fe293a44e LICENSE +sha256 305b71c4d2fd6380585689c5f1c620737a36a318ce0f9c772badce0fe293a44e LICENSE diff --git a/package/perl-http-headers-fast/perl-http-headers-fast.hash b/package/perl-http-headers-fast/perl-http-headers-fast.hash index 9282f2ef1ae..484067f43c0 100644 --- a/package/perl-http-headers-fast/perl-http-headers-fast.hash +++ b/package/perl-http-headers-fast/perl-http-headers-fast.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 a166a4d0ba47eca8ff9dffb760865f5f HTTP-Headers-Fast-0.22.tar.gz -sha256 cc431db68496dd884db4bc0c0b7112c1f4a4f1dc68c4f5a3caa757a1e7481b48 HTTP-Headers-Fast-0.22.tar.gz +md5 a166a4d0ba47eca8ff9dffb760865f5f HTTP-Headers-Fast-0.22.tar.gz +sha256 cc431db68496dd884db4bc0c0b7112c1f4a4f1dc68c4f5a3caa757a1e7481b48 HTTP-Headers-Fast-0.22.tar.gz # computed by scancpan -sha256 511724425acf76d736145cfbf7c775b024c70ae8674ebf9a24dfda2c8e4032a3 LICENSE +sha256 511724425acf76d736145cfbf7c775b024c70ae8674ebf9a24dfda2c8e4032a3 LICENSE diff --git a/package/perl-http-message/Config.in b/package/perl-http-message/Config.in index 82538cfce81..e2cb42f9411 100644 --- a/package/perl-http-message/Config.in +++ b/package/perl-http-message/Config.in @@ -1,5 +1,7 @@ config BR2_PACKAGE_PERL_HTTP_MESSAGE bool "perl-http-message" + depends on !BR2_STATIC_LIBS # perl-clone + select BR2_PACKAGE_PERL_CLONE # runtime select BR2_PACKAGE_PERL_ENCODE_LOCALE # runtime select BR2_PACKAGE_PERL_HTTP_DATE # runtime select BR2_PACKAGE_PERL_IO_HTML # runtime @@ -9,3 +11,6 @@ config BR2_PACKAGE_PERL_HTTP_MESSAGE HTTP style message (base class). https://github.com/libwww-perl/HTTP-Message + +comment "perl-http-message needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/package/perl-http-message/perl-http-message.hash b/package/perl-http-message/perl-http-message.hash index 1a5d9ad0df5..94b5c06a4fd 100644 --- a/package/perl-http-message/perl-http-message.hash +++ b/package/perl-http-message/perl-http-message.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 e847fb3e297e740080ab6fd1ac127f7f HTTP-Message-6.36.tar.gz -sha256 576a53b486af87db56261a36099776370c06f0087d179fc8c7bb803b48cddd76 HTTP-Message-6.36.tar.gz +md5 926a077669a7828c5ca39b5cf7735625 HTTP-Message-6.44.tar.gz +sha256 398b647bf45aa972f432ec0111f6617742ba32fc773c6612d21f64ab4eacbca1 HTTP-Message-6.44.tar.gz # computed by scancpan sha256 f2f428b5f8a3bf4e6a71cd5ea92558a3d123d3d7c5075d34923e71e46dea94df LICENSE diff --git a/package/perl-http-message/perl-http-message.mk b/package/perl-http-message/perl-http-message.mk index 3b5d6e7b5f5..67b68b0de26 100644 --- a/package/perl-http-message/perl-http-message.mk +++ b/package/perl-http-message/perl-http-message.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_HTTP_MESSAGE_VERSION = 6.36 +PERL_HTTP_MESSAGE_VERSION = 6.44 PERL_HTTP_MESSAGE_SOURCE = HTTP-Message-$(PERL_HTTP_MESSAGE_VERSION).tar.gz PERL_HTTP_MESSAGE_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_HTTP_MESSAGE_LICENSE = Artistic or GPL-1.0+ diff --git a/package/perl-http-multipartparser/perl-http-multipartparser.hash b/package/perl-http-multipartparser/perl-http-multipartparser.hash index 079c02f60b6..8d0cf39b4d8 100644 --- a/package/perl-http-multipartparser/perl-http-multipartparser.hash +++ b/package/perl-http-multipartparser/perl-http-multipartparser.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 1b07ebac54ce3288c044a23ba60196d2 HTTP-MultiPartParser-0.02.tar.gz -sha256 5eddda159f54d16f868e032440ac2b024e55aac48931871b62627f1a16d00b12 HTTP-MultiPartParser-0.02.tar.gz +md5 1b07ebac54ce3288c044a23ba60196d2 HTTP-MultiPartParser-0.02.tar.gz +sha256 5eddda159f54d16f868e032440ac2b024e55aac48931871b62627f1a16d00b12 HTTP-MultiPartParser-0.02.tar.gz # computed by scancpan -sha256 a339d6cf9253720ba69b311423556cc02c94d5a6f76cf5cdf11af2112e14a074 README +sha256 a339d6cf9253720ba69b311423556cc02c94d5a6f76cf5cdf11af2112e14a074 README diff --git a/package/perl-http-negotiate/Config.in b/package/perl-http-negotiate/Config.in index c519ede2df0..2e82ce5ad27 100644 --- a/package/perl-http-negotiate/Config.in +++ b/package/perl-http-negotiate/Config.in @@ -1,7 +1,11 @@ config BR2_PACKAGE_PERL_HTTP_NEGOTIATE bool "perl-http-negotiate" + depends on !BR2_STATIC_LIBS # perl-http-message -> perl-clone select BR2_PACKAGE_PERL_HTTP_MESSAGE # runtime help choose a variant to serve. https://metacpan.org/release/HTTP-Negotiate + +comment "perl-http-negotiate needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/package/perl-http-negotiate/perl-http-negotiate.hash b/package/perl-http-negotiate/perl-http-negotiate.hash index e561496f262..9b2cf308e09 100644 --- a/package/perl-http-negotiate/perl-http-negotiate.hash +++ b/package/perl-http-negotiate/perl-http-negotiate.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 1236195250e264d7436e7bb02031671b HTTP-Negotiate-6.01.tar.gz -sha256 1c729c1ea63100e878405cda7d66f9adfd3ed4f1d6cacaca0ee9152df728e016 HTTP-Negotiate-6.01.tar.gz +md5 1236195250e264d7436e7bb02031671b HTTP-Negotiate-6.01.tar.gz +sha256 1c729c1ea63100e878405cda7d66f9adfd3ed4f1d6cacaca0ee9152df728e016 HTTP-Negotiate-6.01.tar.gz # computed by scancpan -sha256 7a2114bb46279309f8a67e359ab0a578a4e9a7c7add0d1725de46b44f6da6514 README +sha256 7a2114bb46279309f8a67e359ab0a578a4e9a7c7add0d1725de46b44f6da6514 README diff --git a/package/perl-i18n/perl-i18n.hash b/package/perl-i18n/perl-i18n.hash index f6ef8931a25..3e2b59378ff 100644 --- a/package/perl-i18n/perl-i18n.hash +++ b/package/perl-i18n/perl-i18n.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 4c3004474d6ff3554f82b52f92b3b1e1 i18n-0.13.tar.gz -sha256 2dbc3e4e25b41578cd83508fe011209e8f3c2b259fa4b5b6eafaac0d6ce4b457 i18n-0.13.tar.gz +md5 4c3004474d6ff3554f82b52f92b3b1e1 i18n-0.13.tar.gz +sha256 2dbc3e4e25b41578cd83508fe011209e8f3c2b259fa4b5b6eafaac0d6ce4b457 i18n-0.13.tar.gz # computed by scancpan -sha256 4755e5f2096e8ef0494f1565bf5a028a8fb4eeb5c1250e7d30948d1ed13c5ad7 README +sha256 4755e5f2096e8ef0494f1565bf5a028a8fb4eeb5c1250e7d30948d1ed13c5ad7 README diff --git a/package/perl-image-exiftool/Config.in b/package/perl-image-exiftool/Config.in new file mode 100644 index 00000000000..3bc72ba6349 --- /dev/null +++ b/package/perl-image-exiftool/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PERL_IMAGE_EXIFTOOL + bool "perl-image-exiftool" + help + ExifTool is a customizable set of Perl modules plus a + full-featured command-line application for reading and writing + meta information in a wide variety of image files. + + https://metacpan.org/release/Image-ExifTool diff --git a/package/perl-image-exiftool/perl-image-exiftool.hash b/package/perl-image-exiftool/perl-image-exiftool.hash new file mode 100644 index 00000000000..ac148aa89bc --- /dev/null +++ b/package/perl-image-exiftool/perl-image-exiftool.hash @@ -0,0 +1,6 @@ +# retrieved by scancpan from http://cpan.metacpan.org/ +md5 75dd9d375c1c4798a082dda79eaf6ba7 Image-ExifTool-12.50.tar.gz +sha256 bce841fc5c10302f0f3ef7678c3bf146953a8c065c0ba18c41f734007e2ec0a8 Image-ExifTool-12.50.tar.gz + +# computed by scancpan +sha256 63502bb7fd68b3b8265304d88932f70f1be82751cbc37936d1d62956582310fe README diff --git a/package/perl-image-exiftool/perl-image-exiftool.mk b/package/perl-image-exiftool/perl-image-exiftool.mk new file mode 100644 index 00000000000..42adb04d3af --- /dev/null +++ b/package/perl-image-exiftool/perl-image-exiftool.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# perl-image-exiftool +# +################################################################################ + +PERL_IMAGE_EXIFTOOL_VERSION = 12.50 +PERL_IMAGE_EXIFTOOL_SOURCE = Image-ExifTool-$(PERL_IMAGE_EXIFTOOL_VERSION).tar.gz +PERL_IMAGE_EXIFTOOL_SITE = $(BR2_CPAN_MIRROR)/authors/id/E/EX/EXIFTOOL +PERL_IMAGE_EXIFTOOL_LICENSE = Artistic or GPL-1.0+ +PERL_IMAGE_EXIFTOOL_LICENSE_FILES = README +PERL_IMAGE_EXIFTOOL_DISTNAME = Image-ExifTool + +$(eval $(perl-package)) diff --git a/package/perl-io-interface/perl-io-interface.hash b/package/perl-io-interface/perl-io-interface.hash index 75e572f9183..b5d990860f4 100644 --- a/package/perl-io-interface/perl-io-interface.hash +++ b/package/perl-io-interface/perl-io-interface.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 806f97aff5a7361b6f54cd494f4cc9fd IO-Interface-1.09.tar.gz -sha256 e63e81c52eb1e0e60ec2d983f5552d2493e117179925c96757f23c4bd9fa713a IO-Interface-1.09.tar.gz +md5 806f97aff5a7361b6f54cd494f4cc9fd IO-Interface-1.09.tar.gz +sha256 e63e81c52eb1e0e60ec2d983f5552d2493e117179925c96757f23c4bd9fa713a IO-Interface-1.09.tar.gz # computed by scancpan -sha256 b5a5bf59bd1be13f7f498e5aa2ea5c0c603c04a095dcf03a06aa5b83bbccf921 LICENSE +sha256 b5a5bf59bd1be13f7f498e5aa2ea5c0c603c04a095dcf03a06aa5b83bbccf921 LICENSE diff --git a/package/perl-io-socket-multicast/perl-io-socket-multicast.hash b/package/perl-io-socket-multicast/perl-io-socket-multicast.hash index c12da12c412..a8f2a336937 100644 --- a/package/perl-io-socket-multicast/perl-io-socket-multicast.hash +++ b/package/perl-io-socket-multicast/perl-io-socket-multicast.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 c96e6cbb367b1d11ffe7bb9fbd833540 IO-Socket-Multicast-1.12.tar.gz -sha256 70e8af4aa21d19bab5edd9f43a6b3d6277748a65145d46ff0ea2ae4c59495c72 IO-Socket-Multicast-1.12.tar.gz +md5 c96e6cbb367b1d11ffe7bb9fbd833540 IO-Socket-Multicast-1.12.tar.gz +sha256 70e8af4aa21d19bab5edd9f43a6b3d6277748a65145d46ff0ea2ae4c59495c72 IO-Socket-Multicast-1.12.tar.gz # computed by scancpan -sha256 ea33bda0e2ec6734e29895a37cd1fc005d86f2abbe7e9943e0213ae64844a697 README +sha256 ea33bda0e2ec6734e29895a37cd1fc005d86f2abbe7e9943e0213ae64844a697 README diff --git a/package/perl-io-socket-ssl/perl-io-socket-ssl.hash b/package/perl-io-socket-ssl/perl-io-socket-ssl.hash index 4a1d71e3497..a4abcc33cd7 100644 --- a/package/perl-io-socket-ssl/perl-io-socket-ssl.hash +++ b/package/perl-io-socket-ssl/perl-io-socket-ssl.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 53201b8e4dfaf25d4d661a54fdfda602 IO-Socket-SSL-2.074.tar.gz -sha256 36486b6be49da4d029819cf7069a7b41ed48af0c87e23be0f8e6aba23d08a832 IO-Socket-SSL-2.074.tar.gz +md5 eaea5b17592ccbd925aff47747f41dde IO-Socket-SSL-2.080.tar.gz +sha256 cd0ed303b08a72c5c256a9ec3bbb6ff61360be3a2ff6d775e4f6e25375fa8d1f IO-Socket-SSL-2.080.tar.gz # computed by scancpan sha256 090aff5421fd55a9dceeaf6c612c36360402e8d29c1284aef88c87be565ce032 README diff --git a/package/perl-io-socket-ssl/perl-io-socket-ssl.mk b/package/perl-io-socket-ssl/perl-io-socket-ssl.mk index 1ab70509bd8..d5c09d90823 100644 --- a/package/perl-io-socket-ssl/perl-io-socket-ssl.mk +++ b/package/perl-io-socket-ssl/perl-io-socket-ssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_IO_SOCKET_SSL_VERSION = 2.074 +PERL_IO_SOCKET_SSL_VERSION = 2.080 PERL_IO_SOCKET_SSL_SOURCE = IO-Socket-SSL-$(PERL_IO_SOCKET_SSL_VERSION).tar.gz PERL_IO_SOCKET_SSL_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SU/SULLR PERL_IO_SOCKET_SSL_LICENSE = Artistic or GPL-1.0+ diff --git a/package/perl-json-tiny/perl-json-tiny.hash b/package/perl-json-tiny/perl-json-tiny.hash index 48fae2b0cd9..ba7c5b3b57d 100644 --- a/package/perl-json-tiny/perl-json-tiny.hash +++ b/package/perl-json-tiny/perl-json-tiny.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 aa006882222e17a94295b3a655aab91b JSON-Tiny-0.58.tar.gz -sha256 ad42e9137f5148df7fdb22aa52186b306032977bcd70d49f44a288070e4f0f23 JSON-Tiny-0.58.tar.gz +md5 aa006882222e17a94295b3a655aab91b JSON-Tiny-0.58.tar.gz +sha256 ad42e9137f5148df7fdb22aa52186b306032977bcd70d49f44a288070e4f0f23 JSON-Tiny-0.58.tar.gz # computed by scancpan -sha256 19e2e0f2079ea1ce1576eb4ecc0575b33fe45b2b8e71f4aa589d6bedd1da4e0a LICENSE +sha256 19e2e0f2079ea1ce1576eb4ecc0575b33fe45b2b8e71f4aa589d6bedd1da4e0a LICENSE diff --git a/package/perl-libwww-perl/perl-libwww-perl.hash b/package/perl-libwww-perl/perl-libwww-perl.hash index e32258050cd..8b4b229b50e 100644 --- a/package/perl-libwww-perl/perl-libwww-perl.hash +++ b/package/perl-libwww-perl/perl-libwww-perl.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 ce5180358d9279b2843a6518bf2de200 libwww-perl-6.60.tar.gz -sha256 cdd28b9237b9c6791725b9099695c7c3c720b33881606fd6cc7635a5495bb07c libwww-perl-6.60.tar.gz +md5 ff7621d0350da3052f24db9a74692672 libwww-perl-6.67.tar.gz +sha256 96eec40a3fd0aa1bd834117be5eb21c438f73094d861a1a7e5774f0b1226b723 libwww-perl-6.67.tar.gz # computed by scancpan sha256 311f168ba9a7819ffab4fea19858f9e880737baf6d112929d11530205035a4cc LICENSE diff --git a/package/perl-libwww-perl/perl-libwww-perl.mk b/package/perl-libwww-perl/perl-libwww-perl.mk index aa15ebb594a..6c4bd29805b 100644 --- a/package/perl-libwww-perl/perl-libwww-perl.mk +++ b/package/perl-libwww-perl/perl-libwww-perl.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_LIBWWW_PERL_VERSION = 6.60 +PERL_LIBWWW_PERL_VERSION = 6.67 PERL_LIBWWW_PERL_SOURCE = libwww-perl-$(PERL_LIBWWW_PERL_VERSION).tar.gz PERL_LIBWWW_PERL_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_LIBWWW_PERL_LICENSE = Artistic or GPL-1.0+ diff --git a/package/perl-locale-maketext-lexicon/perl-locale-maketext-lexicon.hash b/package/perl-locale-maketext-lexicon/perl-locale-maketext-lexicon.hash index 683e8c7d16c..fbbf3355b39 100644 --- a/package/perl-locale-maketext-lexicon/perl-locale-maketext-lexicon.hash +++ b/package/perl-locale-maketext-lexicon/perl-locale-maketext-lexicon.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 51acf0cb00cc01a2c8f560d74dd6c593 Locale-Maketext-Lexicon-1.00.tar.gz -sha256 b73f6b04a58d3f0e38ebf2115a4c1532f1a4eef6fac5c6a2a449e4e14c1ddc7c Locale-Maketext-Lexicon-1.00.tar.gz +md5 51acf0cb00cc01a2c8f560d74dd6c593 Locale-Maketext-Lexicon-1.00.tar.gz +sha256 b73f6b04a58d3f0e38ebf2115a4c1532f1a4eef6fac5c6a2a449e4e14c1ddc7c Locale-Maketext-Lexicon-1.00.tar.gz # computed by scancpan -sha256 af693c8c99bee68656f09328c97d50b24eb742ae4473f57cdafaa90691807fbe LICENSE +sha256 af693c8c99bee68656f09328c97d50b24eb742ae4473f57cdafaa90691807fbe LICENSE diff --git a/package/perl-lwp-mediatypes/perl-lwp-mediatypes.hash b/package/perl-lwp-mediatypes/perl-lwp-mediatypes.hash index e125c0d5785..0a09f22ad79 100644 --- a/package/perl-lwp-mediatypes/perl-lwp-mediatypes.hash +++ b/package/perl-lwp-mediatypes/perl-lwp-mediatypes.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 84b799a90c0d2ce52897a7cb4c0478d0 LWP-MediaTypes-6.04.tar.gz -sha256 8f1bca12dab16a1c2a7c03a49c5e58cce41a6fec9519f0aadfba8dad997919d9 LWP-MediaTypes-6.04.tar.gz +md5 84b799a90c0d2ce52897a7cb4c0478d0 LWP-MediaTypes-6.04.tar.gz +sha256 8f1bca12dab16a1c2a7c03a49c5e58cce41a6fec9519f0aadfba8dad997919d9 LWP-MediaTypes-6.04.tar.gz # computed by scancpan -sha256 e84ac5ab84ace59952d2640e0ca4522eb0aaa8c2aa696352d1252aa109ea20bc LICENSE +sha256 e84ac5ab84ace59952d2640e0ca4522eb0aaa8c2aa696352d1252aa109ea20bc LICENSE diff --git a/package/perl-mail-dkim/perl-mail-dkim.hash b/package/perl-mail-dkim/perl-mail-dkim.hash index e94adfc6ed3..6edeaa9d8b2 100644 --- a/package/perl-mail-dkim/perl-mail-dkim.hash +++ b/package/perl-mail-dkim/perl-mail-dkim.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 9de35f8aa77a85dc17423cbcce2bf46d Mail-DKIM-1.20200824.tar.gz -sha256 871d329830acb4840423aa59036622fb2ee394efc1d09316dcc32ae94454e916 Mail-DKIM-1.20200824.tar.gz +md5 5a0dec58f0c2526521b2952a3c126906 Mail-DKIM-1.20220520.tar.gz +sha256 8ac4b8c84bbfad00a3d24bf676493d207dd3cd4a735efabb9e17181534f23646 Mail-DKIM-1.20220520.tar.gz # computed by scancpan sha256 ffaa40feb768566e52d93879fedd2c5483828b6de483874f30a0a4425351555f LICENSE diff --git a/package/perl-mail-dkim/perl-mail-dkim.mk b/package/perl-mail-dkim/perl-mail-dkim.mk index e67bf5ee185..f3383a02bf4 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.20200824 +PERL_MAIL_DKIM_VERSION = 1.20220520 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 bf8b17a5b96..317e020ac28 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 69ee516d40011e7e92b77c6f06c0dc01 MailTools-2.21.tar.gz +sha256 4ad9bd6826b6f03a2727332466b1b7d29890c8d99a32b4b3b0a8d926ee1a44cb MailTools-2.21.tar.gz # computed by scancpan -sha256 f7558badc4f4875df247bcccb50a8f369bfe4a2c19361f1df7b26ddf6aaaaf6b README +sha256 f7558badc4f4875df247bcccb50a8f369bfe4a2c19361f1df7b26ddf6aaaaf6b README diff --git a/package/perl-math-prime-util/perl-math-prime-util.hash b/package/perl-math-prime-util/perl-math-prime-util.hash index 789f3a35fcf..e28cfe542b5 100644 --- a/package/perl-math-prime-util/perl-math-prime-util.hash +++ b/package/perl-math-prime-util/perl-math-prime-util.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 26496630990db586dfede6551de79cbe Math-Prime-Util-0.73.tar.gz -sha256 4afa6dd8cdb97499bd4eca6925861812c29d9f5a0f1ac27ad9d2d9c9b5602894 Math-Prime-Util-0.73.tar.gz +md5 26496630990db586dfede6551de79cbe Math-Prime-Util-0.73.tar.gz +sha256 4afa6dd8cdb97499bd4eca6925861812c29d9f5a0f1ac27ad9d2d9c9b5602894 Math-Prime-Util-0.73.tar.gz # computed by scancpan -sha256 475b5f12062de0e197fb8cfa44eef3b032342d097752868e72c1239fe52a8942 LICENSE +sha256 475b5f12062de0e197fb8cfa44eef3b032342d097752868e72c1239fe52a8942 LICENSE diff --git a/package/perl-mime-base64-urlsafe/perl-mime-base64-urlsafe.hash b/package/perl-mime-base64-urlsafe/perl-mime-base64-urlsafe.hash index c6d01afe380..52b6706ff61 100644 --- a/package/perl-mime-base64-urlsafe/perl-mime-base64-urlsafe.hash +++ b/package/perl-mime-base64-urlsafe/perl-mime-base64-urlsafe.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 eccf42cc7e9576dd23b9f39ad59c9b62 MIME-Base64-URLSafe-0.01.tar.gz -sha256 cb9966c50538bb676ab67bc40a7c841019b23ba2243d0ffcc2ccf084e5c33798 MIME-Base64-URLSafe-0.01.tar.gz +md5 eccf42cc7e9576dd23b9f39ad59c9b62 MIME-Base64-URLSafe-0.01.tar.gz +sha256 cb9966c50538bb676ab67bc40a7c841019b23ba2243d0ffcc2ccf084e5c33798 MIME-Base64-URLSafe-0.01.tar.gz # computed by scancpan -sha256 2fffac76f75709b6d94111a37f6cd8cab21e8f2b2de73b0b4fa53a5bed4efc15 README +sha256 2fffac76f75709b6d94111a37f6cd8cab21e8f2b2de73b0b4fa53a5bed4efc15 README diff --git a/package/perl-mime-tools/perl-mime-tools.hash b/package/perl-mime-tools/perl-mime-tools.hash index 41e13eb0b26..f67fe615499 100644 --- a/package/perl-mime-tools/perl-mime-tools.hash +++ b/package/perl-mime-tools/perl-mime-tools.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 a2f0e07da2ff4b0478908544cc4b40fa MIME-tools-5.509.tar.gz -sha256 64579f0c923d81d9a2194586e47c3475519e2646e4b5c102a8920759facf6973 MIME-tools-5.509.tar.gz +md5 a2f0e07da2ff4b0478908544cc4b40fa MIME-tools-5.509.tar.gz +sha256 64579f0c923d81d9a2194586e47c3475519e2646e4b5c102a8920759facf6973 MIME-tools-5.509.tar.gz # computed by scancpan -sha256 151cd94e37eb05239c5a678c7d1c4d9d5241a7c9c138760b85152bc1947e2b93 COPYING +sha256 151cd94e37eb05239c5a678c7d1c4d9d5241a7c9c138760b85152bc1947e2b93 COPYING diff --git a/package/perl-module-build-tiny/perl-module-build-tiny.hash b/package/perl-module-build-tiny/perl-module-build-tiny.hash index 357c238dd33..7f03f96c184 100644 --- a/package/perl-module-build-tiny/perl-module-build-tiny.hash +++ b/package/perl-module-build-tiny/perl-module-build-tiny.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 2332c90c17454107fea3f2614e11a3a9 Module-Build-Tiny-0.039.tar.gz -sha256 7d580ff6ace0cbe555bf36b86dc8ea232581530cbeaaea09bccb57b55797f11c Module-Build-Tiny-0.039.tar.gz +md5 2332c90c17454107fea3f2614e11a3a9 Module-Build-Tiny-0.039.tar.gz +sha256 7d580ff6ace0cbe555bf36b86dc8ea232581530cbeaaea09bccb57b55797f11c Module-Build-Tiny-0.039.tar.gz # computed by scancpan -sha256 09fd2bc0428920c455f10c5a6c52e2bb4615114e88966c75ce27a07af028c36b LICENSE +sha256 09fd2bc0428920c455f10c5a6c52e2bb4615114e88966c75ce27a07af028c36b LICENSE diff --git a/package/perl-module-build/perl-module-build.hash b/package/perl-module-build/perl-module-build.hash index aad0b78e3d9..a2181290eed 100644 --- a/package/perl-module-build/perl-module-build.hash +++ b/package/perl-module-build/perl-module-build.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 066b193e461d7dfe1eca17a139353001 Module-Build-0.4231.tar.gz -sha256 7e0f4c692c1740c1ac84ea14d7ea3d8bc798b2fb26c09877229e04f430b2b717 Module-Build-0.4231.tar.gz +md5 144885f1cbaf9420017bbed696ec6b83 Module-Build-0.4232.tar.gz +sha256 67c82ee245d94ba06decfa25572ab75fdcd26a9009094289d8f45bc54041771b Module-Build-0.4232.tar.gz # computed by scancpan -sha256 f35ac2cc6b808a38c42c2d230b875217b0a24bb51e5a497ebb630cbb3d806c3e LICENSE +sha256 f35ac2cc6b808a38c42c2d230b875217b0a24bb51e5a497ebb630cbb3d806c3e LICENSE diff --git a/package/perl-module-build/perl-module-build.mk b/package/perl-module-build/perl-module-build.mk index f5cab36890a..d95a30647aa 100644 --- a/package/perl-module-build/perl-module-build.mk +++ b/package/perl-module-build/perl-module-build.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_MODULE_BUILD_VERSION = 0.4231 +PERL_MODULE_BUILD_VERSION = 0.4232 PERL_MODULE_BUILD_SOURCE = Module-Build-$(PERL_MODULE_BUILD_VERSION).tar.gz PERL_MODULE_BUILD_SITE = $(BR2_CPAN_MIRROR)/authors/id/L/LE/LEONT PERL_MODULE_BUILD_LICENSE = Artistic or GPL-1.0+ diff --git a/package/perl-module-implementation/perl-module-implementation.hash b/package/perl-module-implementation/perl-module-implementation.hash index caf365c024c..4e5ebd1dc3a 100644 --- a/package/perl-module-implementation/perl-module-implementation.hash +++ b/package/perl-module-implementation/perl-module-implementation.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 52e3fe0ca6b1eff0488d59b7aacc0667 Module-Implementation-0.09.tar.gz -sha256 c15f1a12f0c2130c9efff3c2e1afe5887b08ccd033bd132186d1e7d5087fd66d Module-Implementation-0.09.tar.gz +md5 52e3fe0ca6b1eff0488d59b7aacc0667 Module-Implementation-0.09.tar.gz +sha256 c15f1a12f0c2130c9efff3c2e1afe5887b08ccd033bd132186d1e7d5087fd66d Module-Implementation-0.09.tar.gz # computed by scancpan -sha256 dd34e4dbcadfaa3db992201873e1cbb4b4f4c18e9bf000821d5c768e66d7ff0b LICENSE +sha256 dd34e4dbcadfaa3db992201873e1cbb4b4f4c18e9bf000821d5c768e66d7ff0b LICENSE diff --git a/package/perl-module-runtime/perl-module-runtime.hash b/package/perl-module-runtime/perl-module-runtime.hash index c52cb755044..c87963bfb0f 100644 --- a/package/perl-module-runtime/perl-module-runtime.hash +++ b/package/perl-module-runtime/perl-module-runtime.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 d3d47222fa2e3dfcb4526f6cc8437b20 Module-Runtime-0.016.tar.gz -sha256 68302ec646833547d410be28e09676db75006f4aa58a11f3bdb44ffe99f0f024 Module-Runtime-0.016.tar.gz +md5 d3d47222fa2e3dfcb4526f6cc8437b20 Module-Runtime-0.016.tar.gz +sha256 68302ec646833547d410be28e09676db75006f4aa58a11f3bdb44ffe99f0f024 Module-Runtime-0.016.tar.gz # computed by scancpan -sha256 ad1761020436687e8493208336ef53e84589fdba212da59b05b8111cca75ddc1 README +sha256 ad1761020436687e8493208336ef53e84589fdba212da59b05b8111cca75ddc1 README diff --git a/package/perl-mojolicious-plugin-cspheader/perl-mojolicious-plugin-cspheader.hash b/package/perl-mojolicious-plugin-cspheader/perl-mojolicious-plugin-cspheader.hash index d0f9dc3ab0e..a0b0174fe73 100644 --- a/package/perl-mojolicious-plugin-cspheader/perl-mojolicious-plugin-cspheader.hash +++ b/package/perl-mojolicious-plugin-cspheader/perl-mojolicious-plugin-cspheader.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 3d1b01c393e7ed576e4b503d26a88a3e Mojolicious-Plugin-CSPHeader-0.06.tar.gz -sha256 0523a170af6620dab5b746725f171a138b6cff3d2d84e1a30af891741550f4a7 Mojolicious-Plugin-CSPHeader-0.06.tar.gz +md5 3d1b01c393e7ed576e4b503d26a88a3e Mojolicious-Plugin-CSPHeader-0.06.tar.gz +sha256 0523a170af6620dab5b746725f171a138b6cff3d2d84e1a30af891741550f4a7 Mojolicious-Plugin-CSPHeader-0.06.tar.gz # computed by scancpan -sha256 4bb36edd2bcafef11ca615f69607953a31ee05ae172b69990aee317e95653456 LICENSE +sha256 4bb36edd2bcafef11ca615f69607953a31ee05ae172b69990aee317e95653456 LICENSE diff --git a/package/perl-mojolicious-plugin-i18n/perl-mojolicious-plugin-i18n.hash b/package/perl-mojolicious-plugin-i18n/perl-mojolicious-plugin-i18n.hash index ed4bc207480..93a23b010f6 100644 --- a/package/perl-mojolicious-plugin-i18n/perl-mojolicious-plugin-i18n.hash +++ b/package/perl-mojolicious-plugin-i18n/perl-mojolicious-plugin-i18n.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 4002f7a7da4c90973ad6eedfb0fcfa16 Mojolicious-Plugin-I18N-1.6.tar.gz -sha256 32fb5ef8037d954b7ecebef5c1b2b24b420abd829702312f4ad42794f52b514d Mojolicious-Plugin-I18N-1.6.tar.gz +md5 4002f7a7da4c90973ad6eedfb0fcfa16 Mojolicious-Plugin-I18N-1.6.tar.gz +sha256 32fb5ef8037d954b7ecebef5c1b2b24b420abd829702312f4ad42794f52b514d Mojolicious-Plugin-I18N-1.6.tar.gz # manually computed -sha256 82b05028033057b388b0040a3b5590a1c51168fe3b9899bffdb5ef7962c4eb47 README.pod +sha256 82b05028033057b388b0040a3b5590a1c51168fe3b9899bffdb5ef7962c4eb47 README.pod diff --git a/package/perl-mojolicious-plugin-securityheader/perl-mojolicious-plugin-securityheader.hash b/package/perl-mojolicious-plugin-securityheader/perl-mojolicious-plugin-securityheader.hash index b8a20bdd607..74dcd522842 100644 --- a/package/perl-mojolicious-plugin-securityheader/perl-mojolicious-plugin-securityheader.hash +++ b/package/perl-mojolicious-plugin-securityheader/perl-mojolicious-plugin-securityheader.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 38cf59258547ac866577db2d43632f30 Mojolicious-Plugin-SecurityHeader-0.07.tar.gz -sha256 940474eaf7a415e5117b004387862473612e079a413590db1eb9c85d17a6648f Mojolicious-Plugin-SecurityHeader-0.07.tar.gz +md5 38cf59258547ac866577db2d43632f30 Mojolicious-Plugin-SecurityHeader-0.07.tar.gz +sha256 940474eaf7a415e5117b004387862473612e079a413590db1eb9c85d17a6648f Mojolicious-Plugin-SecurityHeader-0.07.tar.gz # computed by scancpan -sha256 0c38e4629cc9eee869217d62ad765e581e54958596672046a62dfa4cfd87bb09 LICENSE +sha256 0c38e4629cc9eee869217d62ad765e581e54958596672046a62dfa4cfd87bb09 LICENSE diff --git a/package/perl-mojolicious/perl-mojolicious.hash b/package/perl-mojolicious/perl-mojolicious.hash index cc29c355352..989eaf3419d 100644 --- a/package/perl-mojolicious/perl-mojolicious.hash +++ b/package/perl-mojolicious/perl-mojolicious.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 c7a00b4bd8fa2db991c9b918d34041d3 Mojolicious-9.22.tar.gz -sha256 6b76e024d3d6c077ad984ea3b3d229f093373d5e06438aca248235150d029043 Mojolicious-9.22.tar.gz +md5 523193316a839ff56a447f0f0c2e5b36 Mojolicious-9.31.tar.gz +sha256 cb96ccd7a5319321ec6f57633c88bf17193d45169f4d7846da254bb6f9ed8312 Mojolicious-9.31.tar.gz # computed by scancpan sha256 19e2e0f2079ea1ce1576eb4ecc0575b33fe45b2b8e71f4aa589d6bedd1da4e0a LICENSE diff --git a/package/perl-mojolicious/perl-mojolicious.mk b/package/perl-mojolicious/perl-mojolicious.mk index 559b995cdcc..618327d09d1 100644 --- a/package/perl-mojolicious/perl-mojolicious.mk +++ b/package/perl-mojolicious/perl-mojolicious.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_MOJOLICIOUS_VERSION = 9.22 +PERL_MOJOLICIOUS_VERSION = 9.31 PERL_MOJOLICIOUS_SOURCE = Mojolicious-$(PERL_MOJOLICIOUS_VERSION).tar.gz PERL_MOJOLICIOUS_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SR/SRI PERL_MOJOLICIOUS_LICENSE = Artistic-2.0 diff --git a/package/perl-mozilla-ca/perl-mozilla-ca.hash b/package/perl-mozilla-ca/perl-mozilla-ca.hash index 07966f9906a..799a531fe61 100644 --- a/package/perl-mozilla-ca/perl-mozilla-ca.hash +++ b/package/perl-mozilla-ca/perl-mozilla-ca.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 843e42f367ea3c7abc5de5b6225791dc Mozilla-CA-20211001.tar.gz -sha256 122c8900000a9d388aa8e44f911cab6c118fe8497417917a84a8ec183971b449 Mozilla-CA-20211001.tar.gz +md5 2f136d096352a418e546e4afb70e7aa9 Mozilla-CA-20221114.tar.gz +sha256 701bea67be670add5a102f9f8c879402b4983096b1cb0e20dd47d52d7a10666b Mozilla-CA-20221114.tar.gz # computed by scancpan sha256 95cd63dae5c2bf6e7cf33435981614a36c85ef01fc7a02464e05e58a5355398e README diff --git a/package/perl-mozilla-ca/perl-mozilla-ca.mk b/package/perl-mozilla-ca/perl-mozilla-ca.mk index 6b970c0f94d..a124860b7a3 100644 --- a/package/perl-mozilla-ca/perl-mozilla-ca.mk +++ b/package/perl-mozilla-ca/perl-mozilla-ca.mk @@ -4,9 +4,9 @@ # ################################################################################ -PERL_MOZILLA_CA_VERSION = 20211001 +PERL_MOZILLA_CA_VERSION = 20221114 PERL_MOZILLA_CA_SOURCE = Mozilla-CA-$(PERL_MOZILLA_CA_VERSION).tar.gz -PERL_MOZILLA_CA_SITE = $(BR2_CPAN_MIRROR)/authors/id/A/AB/ABH +PERL_MOZILLA_CA_SITE = $(BR2_CPAN_MIRROR)/authors/id/H/HA/HAARG PERL_MOZILLA_CA_LICENSE = MPL-2.0 PERL_MOZILLA_CA_LICENSE_FILES = README PERL_MOZILLA_CA_DISTNAME = Mozilla-CA diff --git a/package/perl-net-dns/perl-net-dns.hash b/package/perl-net-dns/perl-net-dns.hash index 1af14e2a451..a98ac3525da 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 http://cpan.metacpan.org/ -md5 f3ba5295ee588d25dabc74a2ecda296a Net-DNS-1.33.tar.gz -sha256 5a40e7cf524e4bd2c33cf03b82b47d5308b712083aa5ee180b0b5af54c71fbd2 Net-DNS-1.33.tar.gz +md5 b70b74481908d995f57569ab7cfe6432 Net-DNS-1.36.tar.gz +sha256 143ba0e530f8b727be61ec052974cbf52df5b0afc0582d75b04809e0b2a95ebe Net-DNS-1.36.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 fa7b50c023f..f4c20c07ad1 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.33 +PERL_NET_DNS_VERSION = 1.36 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-http/perl-net-http.hash b/package/perl-net-http/perl-net-http.hash index 85ddad6eeab..f02fd908087 100644 --- a/package/perl-net-http/perl-net-http.hash +++ b/package/perl-net-http/perl-net-http.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 dbe27483034a79a7d43f61cc48540641 Net-HTTP-6.21.tar.gz -sha256 375aa35b76be99f06464089174d66ac76f78ce83a5c92a907bbfab18b099eec4 Net-HTTP-6.21.tar.gz +md5 1d46019fb8559070a5ec1d838b690657 Net-HTTP-6.22.tar.gz +sha256 62faf9a5b84235443fe18f780e69cecf057dea3de271d7d8a0ba72724458a1a2 Net-HTTP-6.22.tar.gz # computed by scancpan -sha256 49fbcc80e17295888b909176a0029f275a8c17b6cbfaf8867fe571ebe9a9ca79 LICENSE +sha256 0ed700a4bfc022e999d83407f71ab62ead96662d8f7bbebfd857376bf3ed6528 LICENSE diff --git a/package/perl-net-http/perl-net-http.mk b/package/perl-net-http/perl-net-http.mk index de0809d0b66..b4cef6188b6 100644 --- a/package/perl-net-http/perl-net-http.mk +++ b/package/perl-net-http/perl-net-http.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_NET_HTTP_VERSION = 6.21 +PERL_NET_HTTP_VERSION = 6.22 PERL_NET_HTTP_SOURCE = Net-HTTP-$(PERL_NET_HTTP_VERSION).tar.gz PERL_NET_HTTP_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_NET_HTTP_LICENSE = Artistic or GPL-1.0+ diff --git a/package/perl-net-snmp/perl-net-snmp.hash b/package/perl-net-snmp/perl-net-snmp.hash index 0b162e6dcc2..74d860d9fc4 100644 --- a/package/perl-net-snmp/perl-net-snmp.hash +++ b/package/perl-net-snmp/perl-net-snmp.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 6137f04f9942d703f66179f890e3d096 Net-SNMP-v6.0.1.tar.gz -sha256 14c37bc1cbb3f3cdc7d6c13e0f27a859f14cdcfd5ea54a0467a88bc259b0b741 Net-SNMP-v6.0.1.tar.gz +md5 6137f04f9942d703f66179f890e3d096 Net-SNMP-v6.0.1.tar.gz +sha256 14c37bc1cbb3f3cdc7d6c13e0f27a859f14cdcfd5ea54a0467a88bc259b0b741 Net-SNMP-v6.0.1.tar.gz # computed by scancpan -sha256 a038159be54a2807dc48e2b946514d59fceab6737d5461d93d55297a98e6e24e LICENSE +sha256 a038159be54a2807dc48e2b946514d59fceab6737d5461d93d55297a98e6e24e LICENSE diff --git a/package/perl-net-ssleay/0001-fix-build-system.patch b/package/perl-net-ssleay/0001-fix-build-system.patch index a6cd0f9cebf..a5ccf464bad 100644 --- a/package/perl-net-ssleay/0001-fix-build-system.patch +++ b/package/perl-net-ssleay/0001-fix-build-system.patch @@ -8,29 +8,29 @@ paths, since they are missing the destdir; Buildroot compilers and linkers already know where to search, anyway. Signed-off-by: "Yann E. MORIN" +[Fabrice: update for 1.93_01] +Signed-off-by: Fabrice Fontaine diff -durN perl-net-ssleay-1.64.orig/inc/Module/Install/PRIVATE/Net/SSLeay.pm perl-net-ssleay-1.64/inc/Module/Install/PRIVATE/Net/SSLeay.pm ---- perl-net-ssleay-1.64.orig/inc/Module/Install/PRIVATE/Net/SSLeay.pm 2014-04-01 08:08:37.000000000 +0200 -+++ perl-net-ssleay-1.64/inc/Module/Install/PRIVATE/Net/SSLeay.pm 2014-07-13 00:38:46.281380282 +0200 -@@ -37,14 +37,18 @@ - exit 0; # according http://wiki.cpantesters.org/wiki/CPANAuthorNotes this is best-practice when "missing library" +--- perl-net-ssleay-1.64.orig/Makefile.PL 2014-04-01 08:08:37.000000000 +0200 ++++ perl-net-ssleay-1.64/Makefile.PL 2014-07-13 00:38:46.281380282 +0200 +@@ -192,12 +192,16 @@ + exit MISSING_PREREQ; } -- $self->check_openssl_version($prefix, $exec); +- check_openssl_version($prefix, $exec); +# Does not work for cross-compilation. +# In Buildroot, we do have a supported version. -+# $self->check_openssl_version($prefix, $exec); - my $opts = $self->ssleay_get_build_opts($prefix, $exec); - - $self->makemaker_args( ++# check_openssl_version($prefix, $exec); + my %args = ( CCCDLFLAGS => $opts->{cccdlflags}, OPTIMIZE => $opts->{optimize}, -- INC => join(' ', map {"-I$_"} @{$opts->{inc_paths}}), -- LIBS => join(' ', (map {"-L$_"} @{$opts->{lib_paths}}), (map {"-l$_"} @{$opts->{lib_links}})), +- INC => qq{-I"$opts->{inc_path}"}, +- LIBS => join(' ', (map '-L'.maybe_quote($_), @{$opts->{lib_paths}}), (map {"-l$_"} @{$opts->{lib_links}})), +# Buildroot already has the correct include and library search paths. -+# INC => join(' ', map {"-I$_"} @{$opts->{inc_paths}}), -+# LIBS => join(' ', (map {"-L$_"} @{$opts->{lib_paths}}), (map {"-l$_"} @{$opts->{lib_links}})), ++# INC => qq{-I"$opts->{inc_path}"}, ++# LIBS => join(' ', (map '-L'.maybe_quote($_), @{$opts->{lib_paths}}), (map {"-l$_"} @{$opts->{lib_links}})), + LIBS => join(' ', (map {"-l$_"} @{$opts->{lib_links}})), ); - - if ( $self->prompt( + # From HMBRAND to handle multple version of OPENSSL installed + if (my $lp = join " " => map '-L'.maybe_quote($_), @{$opts->{lib_paths} || []}) diff --git a/package/perl-net-ssleay/perl-net-ssleay.hash b/package/perl-net-ssleay/perl-net-ssleay.hash index 517b3c4da32..9caff68eddf 100644 --- a/package/perl-net-ssleay/perl-net-ssleay.hash +++ b/package/perl-net-ssleay/perl-net-ssleay.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 d602bdce4e0531c6efc276e3e429ca69 Net-SSLeay-1.85.tar.gz -sha256 9d8188b9fb1cae3bd791979c20554925d5e94a138d00414f1a6814549927b0c8 Net-SSLeay-1.85.tar.gz +md5 c73821e9790b3bdb3471d9b8faf48bbb Net-SSLeay-1.93_01.tar.gz +sha256 876d022fbc719631b11d6bb4b6e78db3c19bbca578093c376c8f9900a4432aa3 Net-SSLeay-1.93_01.tar.gz # computed by scancpan -sha256 b55065185a2172d9f2ea2dd87c18c206ea3dc45a64e5f3deb3eee34d839dc822 LICENSE +sha256 685e534b60d4e2b4fbb1a259a83b5a86e877a919bbb9efc95994276f706a3a71 LICENSE diff --git a/package/perl-net-ssleay/perl-net-ssleay.mk b/package/perl-net-ssleay/perl-net-ssleay.mk index 80ce8b9cc77..8b7b2b973bf 100644 --- a/package/perl-net-ssleay/perl-net-ssleay.mk +++ b/package/perl-net-ssleay/perl-net-ssleay.mk @@ -4,11 +4,11 @@ # ################################################################################ -PERL_NET_SSLEAY_VERSION = 1.85 +PERL_NET_SSLEAY_VERSION = 1.93_01 PERL_NET_SSLEAY_SOURCE = Net-SSLeay-$(PERL_NET_SSLEAY_VERSION).tar.gz -PERL_NET_SSLEAY_SITE = $(BR2_CPAN_MIRROR)/authors/id/M/MI/MIKEM +PERL_NET_SSLEAY_SITE = $(BR2_CPAN_MIRROR)/authors/id/C/CH/CHRISN PERL_NET_SSLEAY_DEPENDENCIES = openssl -PERL_NET_SSLEAY_LICENSE = OpenSSL +PERL_NET_SSLEAY_LICENSE = Artistic-2.0 PERL_NET_SSLEAY_LICENSE_FILES = LICENSE PERL_NET_SSLEAY_DISTNAME = Net-SSLeay @@ -24,4 +24,11 @@ define PERL_NET_SSLEAY_FIX_MAKEFILE endef PERL_NET_SSLEAY_POST_CONFIGURE_HOOKS += PERL_NET_SSLEAY_FIX_MAKEFILE +ifeq ($(BR2_PACKAGE_LIBRESSL),y) +define PERL_NET_SSLEAY_DROP_ZLIB_MAKEFILE + $(SED) "s/-lz//" $(@D)/Makefile +endef +PERL_NET_SSLEAY_POST_CONFIGURE_HOOKS += PERL_NET_SSLEAY_DROP_ZLIB_MAKEFILE +endif + $(eval $(perl-package)) diff --git a/package/perl-netaddr-ip/perl-netaddr-ip.hash b/package/perl-netaddr-ip/perl-netaddr-ip.hash index ce0477d9782..8912fc6ab93 100644 --- a/package/perl-netaddr-ip/perl-netaddr-ip.hash +++ b/package/perl-netaddr-ip/perl-netaddr-ip.hash @@ -1,7 +1,7 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 990dfcbffae356835c536e8ab56a2880 NetAddr-IP-4.079.tar.gz -sha256 ec5a82dfb7028bcd28bb3d569f95d87dd4166cc19867f2184ed3a59f6d6ca0e7 NetAddr-IP-4.079.tar.gz +md5 990dfcbffae356835c536e8ab56a2880 NetAddr-IP-4.079.tar.gz +sha256 ec5a82dfb7028bcd28bb3d569f95d87dd4166cc19867f2184ed3a59f6d6ca0e7 NetAddr-IP-4.079.tar.gz # computed by scancpan -sha256 b7fd9b73ea99602016a326e0b62e6646060d18febdd065ceca8bb482208c3d88 Artistic -sha256 773a84089e32147cffef4c6fa127a14658c8c5866987d71d86f0fe22161780f4 Copying +sha256 b7fd9b73ea99602016a326e0b62e6646060d18febdd065ceca8bb482208c3d88 Artistic +sha256 773a84089e32147cffef4c6fa127a14658c8c5866987d71d86f0fe22161780f4 Copying diff --git a/package/perl-number-bytes-human/perl-number-bytes-human.hash b/package/perl-number-bytes-human/perl-number-bytes-human.hash index af7a6b65a10..55bbf8f8bcd 100644 --- a/package/perl-number-bytes-human/perl-number-bytes-human.hash +++ b/package/perl-number-bytes-human/perl-number-bytes-human.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 43d2c86a55924aa71535a41de0311efd Number-Bytes-Human-0.11.tar.gz -sha256 5fc79c49b0b40df780479c43696381343e2b6ad1fe52859f60bc65b66ebe6f2c Number-Bytes-Human-0.11.tar.gz +md5 43d2c86a55924aa71535a41de0311efd Number-Bytes-Human-0.11.tar.gz +sha256 5fc79c49b0b40df780479c43696381343e2b6ad1fe52859f60bc65b66ebe6f2c Number-Bytes-Human-0.11.tar.gz # computed by scancpan -sha256 d42143fe4b63cb5d488d65a44e6c55769b098ea447462ff33316b33a837b7cf9 README +sha256 d42143fe4b63cb5d488d65a44e6c55769b098ea447462ff33316b33a837b7cf9 README diff --git a/package/perl-path-class/perl-path-class.hash b/package/perl-path-class/perl-path-class.hash index d2741dfca4d..96f8928fd5f 100644 --- a/package/perl-path-class/perl-path-class.hash +++ b/package/perl-path-class/perl-path-class.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 13e6db714f6d5a0e62ca1c4a7fc4d0f3 Path-Class-0.37.tar.gz -sha256 654781948602386f2cb2e4473a739f17dc6953d92aabc2498a4ca2561bc248ce Path-Class-0.37.tar.gz +md5 13e6db714f6d5a0e62ca1c4a7fc4d0f3 Path-Class-0.37.tar.gz +sha256 654781948602386f2cb2e4473a739f17dc6953d92aabc2498a4ca2561bc248ce Path-Class-0.37.tar.gz # computed by scancpan -sha256 636b5c82eabfe3d4cd86126db9502fd537d1442ad2c88c93dbe221e62b5f1710 LICENSE +sha256 636b5c82eabfe3d4cd86126db9502fd537d1442ad2c88c93dbe221e62b5f1710 LICENSE diff --git a/package/perl-path-tiny/perl-path-tiny.hash b/package/perl-path-tiny/perl-path-tiny.hash index 16f1a9a2221..7874846b891 100644 --- a/package/perl-path-tiny/perl-path-tiny.hash +++ b/package/perl-path-tiny/perl-path-tiny.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 f746d8da5d049a5523b1880666bb0992 Path-Tiny-0.122.tar.gz -sha256 4bc6f76d0548ccd8b38cb66291a885bf0de453d0167562c7b82e8861afdcfb7c Path-Tiny-0.122.tar.gz +md5 7b2fc4f5edfd29b88d2cc3b96830e7d1 Path-Tiny-0.144.tar.gz +sha256 f6ea094ece845c952a02c2789332579354de8d410a707f9b7045bd241206487d Path-Tiny-0.144.tar.gz # computed by scancpan sha256 c1a19c0d83f668a784640c0b41e024f37b182ad38011b170f9200123e57f6070 LICENSE diff --git a/package/perl-path-tiny/perl-path-tiny.mk b/package/perl-path-tiny/perl-path-tiny.mk index 310feed98b3..6d784a0d164 100644 --- a/package/perl-path-tiny/perl-path-tiny.mk +++ b/package/perl-path-tiny/perl-path-tiny.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_PATH_TINY_VERSION = 0.122 +PERL_PATH_TINY_VERSION = 0.144 PERL_PATH_TINY_SOURCE = Path-Tiny-$(PERL_PATH_TINY_VERSION).tar.gz PERL_PATH_TINY_SITE = $(BR2_CPAN_MIRROR)/authors/id/D/DA/DAGOLDEN PERL_PATH_TINY_LICENSE = Apache-2.0 diff --git a/package/perl-plack/Config.in b/package/perl-plack/Config.in index c81ac4a444f..420f8257e5e 100644 --- a/package/perl-plack/Config.in +++ b/package/perl-plack/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PERL_PLACK bool "perl-plack" + depends on !BR2_STATIC_LIBS # perl-http-message -> perl-clone select BR2_PACKAGE_PERL_APACHE_LOGFORMAT_COMPILER # runtime select BR2_PACKAGE_PERL_COOKIE_BAKER # runtime select BR2_PACKAGE_PERL_DEVEL_STACKTRACE # runtime @@ -19,3 +20,6 @@ config BR2_PACKAGE_PERL_PLACK toolkit). https://github.com/plack/Plack + +comment "perl-plack needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/package/perl-stream-buffered/perl-stream-buffered.hash b/package/perl-stream-buffered/perl-stream-buffered.hash index a40955d8f6f..5de355558eb 100644 --- a/package/perl-stream-buffered/perl-stream-buffered.hash +++ b/package/perl-stream-buffered/perl-stream-buffered.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 b030fecaa784cd573289ae797c7aeae9 Stream-Buffered-0.03.tar.gz -sha256 9b2d4390b5de6b0cf4558e4ad04317a73c5e13dd19af29149c4e47c37fb2423b Stream-Buffered-0.03.tar.gz +md5 b030fecaa784cd573289ae797c7aeae9 Stream-Buffered-0.03.tar.gz +sha256 9b2d4390b5de6b0cf4558e4ad04317a73c5e13dd19af29149c4e47c37fb2423b Stream-Buffered-0.03.tar.gz # computed by scancpan -sha256 68e8c38e6d2f2b0570a908411f8321b80a7e35ea44f43729807c9ac9a025f591 LICENSE +sha256 68e8c38e6d2f2b0570a908411f8321b80a7e35ea44f43729807c9ac9a025f591 LICENSE diff --git a/package/perl-sub-exporter-progressive/perl-sub-exporter-progressive.hash b/package/perl-sub-exporter-progressive/perl-sub-exporter-progressive.hash index 6bd2441641f..bb74dd2f3e3 100644 --- a/package/perl-sub-exporter-progressive/perl-sub-exporter-progressive.hash +++ b/package/perl-sub-exporter-progressive/perl-sub-exporter-progressive.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 72cf6acdd2a0a8b105821a4db98e4ebe Sub-Exporter-Progressive-0.001013.tar.gz -sha256 d535b7954d64da1ac1305b1fadf98202769e3599376854b2ced90c382beac056 Sub-Exporter-Progressive-0.001013.tar.gz +md5 72cf6acdd2a0a8b105821a4db98e4ebe Sub-Exporter-Progressive-0.001013.tar.gz +sha256 d535b7954d64da1ac1305b1fadf98202769e3599376854b2ced90c382beac056 Sub-Exporter-Progressive-0.001013.tar.gz # computed by scancpan -sha256 24c38cba4218e6be62e511bffe21e63aa57335d8929034aa58e8a85eed001e99 LICENSE +sha256 24c38cba4218e6be62e511bffe21e63aa57335d8929034aa58e8a85eed001e99 LICENSE diff --git a/package/perl-sub-install/perl-sub-install.hash b/package/perl-sub-install/perl-sub-install.hash index 3abd9940e61..bbac2a63771 100644 --- a/package/perl-sub-install/perl-sub-install.hash +++ b/package/perl-sub-install/perl-sub-install.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 e1ce4f9cb6b2f6b8778b036c31afa5ab Sub-Install-0.928.tar.gz -sha256 61e567a7679588887b7b86d427bc476ea6d77fffe7e0d17d640f89007d98ef0f Sub-Install-0.928.tar.gz +md5 e1ce4f9cb6b2f6b8778b036c31afa5ab Sub-Install-0.928.tar.gz +sha256 61e567a7679588887b7b86d427bc476ea6d77fffe7e0d17d640f89007d98ef0f Sub-Install-0.928.tar.gz # computed by scancpan -sha256 ad5fb5c05003488f924c60ead21694d629055c9db2ee2d9dd0cf0041b9fedaca LICENSE +sha256 ad5fb5c05003488f924c60ead21694d629055c9db2ee2d9dd0cf0041b9fedaca LICENSE diff --git a/package/perl-sub-quote/perl-sub-quote.hash b/package/perl-sub-quote/perl-sub-quote.hash index d918af2358a..602ff92ceca 100644 --- a/package/perl-sub-quote/perl-sub-quote.hash +++ b/package/perl-sub-quote/perl-sub-quote.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 1bb9caee697bcfa738f419d40505e506 Sub-Quote-2.006006.tar.gz -sha256 6e4e2af42388fa6d2609e0e82417de7cc6be47223f576592c656c73c7524d89d Sub-Quote-2.006006.tar.gz +md5 1bb9caee697bcfa738f419d40505e506 Sub-Quote-2.006006.tar.gz +sha256 6e4e2af42388fa6d2609e0e82417de7cc6be47223f576592c656c73c7524d89d Sub-Quote-2.006006.tar.gz # computed by scancpan -sha256 88f4a8719c584d756dcfeebc7f35643066354188bfb57c672fbafcd44e044e9c LICENSE +sha256 88f4a8719c584d756dcfeebc7f35643066354188bfb57c672fbafcd44e044e9c LICENSE diff --git a/package/perl-sys-meminfo/perl-sys-meminfo.hash b/package/perl-sys-meminfo/perl-sys-meminfo.hash index 207cfad2bf8..c80a45520c1 100644 --- a/package/perl-sys-meminfo/perl-sys-meminfo.hash +++ b/package/perl-sys-meminfo/perl-sys-meminfo.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 88f0632691d7de91cbed95ba1ff29025 Sys-MemInfo-0.99.tar.gz -sha256 0786319d3a3a8bae5d727939244bf17e140b714f52734d5e9f627203e4cf3e3b Sys-MemInfo-0.99.tar.gz +md5 88f0632691d7de91cbed95ba1ff29025 Sys-MemInfo-0.99.tar.gz +sha256 0786319d3a3a8bae5d727939244bf17e140b714f52734d5e9f627203e4cf3e3b Sys-MemInfo-0.99.tar.gz # computed by scancpan -sha256 62854ade112a6782f476bdc7dc9603776c4e064782623d999f966dba131a15de LICENSE +sha256 62854ade112a6782f476bdc7dc9603776c4e064782623d999f966dba131a15de LICENSE diff --git a/package/perl-sys-mmap/perl-sys-mmap.hash b/package/perl-sys-mmap/perl-sys-mmap.hash index ce4d673540d..ac4184b08d0 100644 --- a/package/perl-sys-mmap/perl-sys-mmap.hash +++ b/package/perl-sys-mmap/perl-sys-mmap.hash @@ -1,7 +1,7 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 57172ce9b33c04de460b4e7ad68d2e9c Sys-Mmap-0.20.tar.gz -sha256 1820ce2c89f1ab7357644f8db0f49f142f54526250fb1e235db10aa80f15e2cf Sys-Mmap-0.20.tar.gz +md5 57172ce9b33c04de460b4e7ad68d2e9c Sys-Mmap-0.20.tar.gz +sha256 1820ce2c89f1ab7357644f8db0f49f142f54526250fb1e235db10aa80f15e2cf Sys-Mmap-0.20.tar.gz # computed by scancpan -sha256 4ac2afe465736476a06e52edcc78c72cfa0fa4d625916e58ab4f2af6c598709c Artistic -sha256 51c144e9a67644fa8eea0ea63dedb4e837587305b22f073eb5e279e39e7325a8 Copying +sha256 4ac2afe465736476a06e52edcc78c72cfa0fa4d625916e58ab4f2af6c598709c Artistic +sha256 51c144e9a67644fa8eea0ea63dedb4e837587305b22f073eb5e279e39e7325a8 Copying diff --git a/package/perl-time-parsedate/perl-time-parsedate.hash b/package/perl-time-parsedate/perl-time-parsedate.hash index 39ce6b93f44..0e51998090f 100644 --- a/package/perl-time-parsedate/perl-time-parsedate.hash +++ b/package/perl-time-parsedate/perl-time-parsedate.hash @@ -1,7 +1,7 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 9143d075278857d21c77467d26f1603b Time-ParseDate-2015.103.tar.gz -sha256 2c1a06235bf811813caac9eaa9daa71af758667cdf7b082cb59863220fcaeed1 Time-ParseDate-2015.103.tar.gz +md5 9143d075278857d21c77467d26f1603b Time-ParseDate-2015.103.tar.gz +sha256 2c1a06235bf811813caac9eaa9daa71af758667cdf7b082cb59863220fcaeed1 Time-ParseDate-2015.103.tar.gz # locally calculated -sha256 6d8de888d0662f75cfa3bf21b261741d5634ac9cdd8604d6173850546a3d40a9 lib/Time/JulianDay.pm -sha256 9ae411fbaf87add414e7357417032dfedce652c393643bc5cb5b7698041a1dca lib/Time/Timezone.pm +sha256 6d8de888d0662f75cfa3bf21b261741d5634ac9cdd8604d6173850546a3d40a9 lib/Time/JulianDay.pm +sha256 9ae411fbaf87add414e7357417032dfedce652c393643bc5cb5b7698041a1dca lib/Time/Timezone.pm diff --git a/package/perl-uri/perl-uri.hash b/package/perl-uri/perl-uri.hash index e7e272c63a9..daf043347ff 100644 --- a/package/perl-uri/perl-uri.hash +++ b/package/perl-uri/perl-uri.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 2a00d3dbf891df4256d251382aefd9b9 URI-5.10.tar.gz -sha256 16325d5e308c7b7ab623d1bf944e1354c5f2245afcfadb8eed1e2cae9a0bd0b5 URI-5.10.tar.gz +md5 63675c429cfb1df73d7d21a9302e1000 URI-5.17.tar.gz +sha256 5f7e42b769cb27499113cfae4b786c37d49e7c7d32dbb469602cd808308568f8 URI-5.17.tar.gz # computed by scancpan sha256 d4f0b7a8771dcb1eee79a38c2e466eb997e23565a6687dd1900a2027eabe12a0 LICENSE diff --git a/package/perl-uri/perl-uri.mk b/package/perl-uri/perl-uri.mk index d451bc5d6a1..d4bfcb44ef1 100644 --- a/package/perl-uri/perl-uri.mk +++ b/package/perl-uri/perl-uri.mk @@ -4,7 +4,7 @@ # ################################################################################ -PERL_URI_VERSION = 5.10 +PERL_URI_VERSION = 5.17 PERL_URI_SOURCE = URI-$(PERL_URI_VERSION).tar.gz PERL_URI_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS PERL_URI_LICENSE = Artistic or GPL-1.0+ diff --git a/package/perl-www-form-urlencoded/perl-www-form-urlencoded.hash b/package/perl-www-form-urlencoded/perl-www-form-urlencoded.hash index c4ed488905c..43f65a00c33 100644 --- a/package/perl-www-form-urlencoded/perl-www-form-urlencoded.hash +++ b/package/perl-www-form-urlencoded/perl-www-form-urlencoded.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 cbe0e1c3ee54738d900c739ea348efda WWW-Form-UrlEncoded-0.26.tar.gz -sha256 c0480b5f1f15b71163ec327b8e7842298f0cb3ace97e63d7034af1e94a2d90f4 WWW-Form-UrlEncoded-0.26.tar.gz +md5 cbe0e1c3ee54738d900c739ea348efda WWW-Form-UrlEncoded-0.26.tar.gz +sha256 c0480b5f1f15b71163ec327b8e7842298f0cb3ace97e63d7034af1e94a2d90f4 WWW-Form-UrlEncoded-0.26.tar.gz # computed by scancpan -sha256 79c2a066104e71602785fd815c5aea6f7db78c19451d68521380083f9c2a8805 LICENSE +sha256 79c2a066104e71602785fd815c5aea6f7db78c19451d68521380083f9c2a8805 LICENSE diff --git a/package/perl-www-robotrules/perl-www-robotrules.hash b/package/perl-www-robotrules/perl-www-robotrules.hash index 41f2d7a19aa..38fd0620930 100644 --- a/package/perl-www-robotrules/perl-www-robotrules.hash +++ b/package/perl-www-robotrules/perl-www-robotrules.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 b7186e8b8b3701e70c22abf430742403 WWW-RobotRules-6.02.tar.gz -sha256 46b502e7a288d559429891eeb5d979461dd3ecc6a5c491ead85d165b6e03a51e WWW-RobotRules-6.02.tar.gz +md5 b7186e8b8b3701e70c22abf430742403 WWW-RobotRules-6.02.tar.gz +sha256 46b502e7a288d559429891eeb5d979461dd3ecc6a5c491ead85d165b6e03a51e WWW-RobotRules-6.02.tar.gz # computed by scancpan -sha256 fa375c4f771b92fc076b6c66e19440a0fff51dacf489fecd94bf560091279e05 README +sha256 fa375c4f771b92fc076b6c66e19440a0fff51dacf489fecd94bf560091279e05 README diff --git a/package/perl-x10/perl-x10.hash b/package/perl-x10/perl-x10.hash index 5411390e3eb..900ff62f1f5 100644 --- a/package/perl-x10/perl-x10.hash +++ b/package/perl-x10/perl-x10.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 20dcca2dfb978bfed3043276aa3481e5 X10-0.04.tar.gz -sha256 3dcee9d95614b2db70de608e933d42817f93fccd5b1f2f782b0846af487d9134 X10-0.04.tar.gz +md5 20dcca2dfb978bfed3043276aa3481e5 X10-0.04.tar.gz +sha256 3dcee9d95614b2db70de608e933d42817f93fccd5b1f2f782b0846af487d9134 X10-0.04.tar.gz # computed by scancpan -sha256 e6f320afa82517d663be348dd2515ecb1454a7c851ba5590f13aca01d219be80 README +sha256 e6f320afa82517d663be348dd2515ecb1454a7c851ba5590f13aca01d219be80 README diff --git a/package/perl-xml-libxml/perl-xml-libxml.hash b/package/perl-xml-libxml/perl-xml-libxml.hash index 4842f4fec26..3a2f1ae7da2 100644 --- a/package/perl-xml-libxml/perl-xml-libxml.hash +++ b/package/perl-xml-libxml/perl-xml-libxml.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 dce687dd8b7e82d1c359fd74b1852f64 XML-LibXML-2.0134.tar.gz -sha256 f0bca4d0c2da35d879fee4cd13f352014186cedab27ab5e191f39b5d7d4f46cf XML-LibXML-2.0134.tar.gz +md5 dce687dd8b7e82d1c359fd74b1852f64 XML-LibXML-2.0134.tar.gz +sha256 f0bca4d0c2da35d879fee4cd13f352014186cedab27ab5e191f39b5d7d4f46cf XML-LibXML-2.0134.tar.gz # computed by scancpan -sha256 5046a7ec515cc1542beafdf2eadeeff24cc221fc3fde9913dd144fd263ae6100 LICENSE +sha256 5046a7ec515cc1542beafdf2eadeeff24cc221fc3fde9913dd144fd263ae6100 LICENSE diff --git a/package/perl-xml-namespacesupport/perl-xml-namespacesupport.hash b/package/perl-xml-namespacesupport/perl-xml-namespacesupport.hash index e5a98ecf485..a00edfd98d2 100644 --- a/package/perl-xml-namespacesupport/perl-xml-namespacesupport.hash +++ b/package/perl-xml-namespacesupport/perl-xml-namespacesupport.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 a8916c6d095bcf073e1108af02e78c97 XML-NamespaceSupport-1.12.tar.gz -sha256 47e995859f8dd0413aa3f22d350c4a62da652e854267aa0586ae544ae2bae5ef XML-NamespaceSupport-1.12.tar.gz +md5 a8916c6d095bcf073e1108af02e78c97 XML-NamespaceSupport-1.12.tar.gz +sha256 47e995859f8dd0413aa3f22d350c4a62da652e854267aa0586ae544ae2bae5ef XML-NamespaceSupport-1.12.tar.gz # computed by scancpan -sha256 3fed787f0f9e1d74024ec7ae5f0f4736c693bcf263781da2054eb4bb1337e911 LICENSE +sha256 3fed787f0f9e1d74024ec7ae5f0f4736c693bcf263781da2054eb4bb1337e911 LICENSE diff --git a/package/perl-xml-sax-base/perl-xml-sax-base.hash b/package/perl-xml-sax-base/perl-xml-sax-base.hash index 1542922b17c..02c5124d08f 100644 --- a/package/perl-xml-sax-base/perl-xml-sax-base.hash +++ b/package/perl-xml-sax-base/perl-xml-sax-base.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 ec347a14065dd7aec7d9fb181b2d7946 XML-SAX-Base-1.09.tar.gz -sha256 66cb355ba4ef47c10ca738bd35999723644386ac853abbeb5132841f5e8a2ad0 XML-SAX-Base-1.09.tar.gz +md5 ec347a14065dd7aec7d9fb181b2d7946 XML-SAX-Base-1.09.tar.gz +sha256 66cb355ba4ef47c10ca738bd35999723644386ac853abbeb5132841f5e8a2ad0 XML-SAX-Base-1.09.tar.gz # computed by scancpan -sha256 2a9aae56e13888493523ee9053689627e092aafcf2c5fb06f06df07260f91b42 README +sha256 2a9aae56e13888493523ee9053689627e092aafcf2c5fb06f06df07260f91b42 README diff --git a/package/perl-xml-sax/perl-xml-sax.hash b/package/perl-xml-sax/perl-xml-sax.hash index df63047f06e..b7c2e4e0c9f 100644 --- a/package/perl-xml-sax/perl-xml-sax.hash +++ b/package/perl-xml-sax/perl-xml-sax.hash @@ -1,6 +1,6 @@ # retrieved by scancpan from http://cpan.metacpan.org/ -md5 b62e3754523695c7f5bbcafa3676a38d XML-SAX-1.02.tar.gz -sha256 4506c387043aa6a77b455f00f57409f3720aa7e553495ab2535263b4ed1ea12a XML-SAX-1.02.tar.gz +md5 b62e3754523695c7f5bbcafa3676a38d XML-SAX-1.02.tar.gz +sha256 4506c387043aa6a77b455f00f57409f3720aa7e553495ab2535263b4ed1ea12a XML-SAX-1.02.tar.gz # computed by scancpan -sha256 bf2fb225e77b46b8892ef2a8aa5efa92d65b176a870f42559d8b73b308a36509 LICENSE +sha256 bf2fb225e77b46b8892ef2a8aa5efa92d65b176a870f42559d8b73b308a36509 LICENSE diff --git a/package/perl/perl.hash b/package/perl/perl.hash index b0f60ef6f88..b21023f7303 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.34.0.tar.xz.{md5,sha1,sha256}.txt -md5 df7ecb0653440b26dc951ad9dbfab517 perl-5.34.0.tar.xz -sha1 d461e206a1dca5e79d39e77debf0b564f6d77d37 perl-5.34.0.tar.xz -sha256 82c2e5e5c71b0e10487a80d79140469ab1f8056349ca8545140a224dbbed7ded perl-5.34.0.tar.xz +# Hashes from: https://www.cpan.org/src/5.0/perl-5.36.0.tar.xz.{md5,sha1,sha256}.txt +md5 826e42da130011699172fd655e49cfa2 perl-5.36.0.tar.xz +sha1 938c56a77ae094eb7f5019318a5e4efb2d9c74fa perl-5.36.0.tar.xz +sha256 0f386dccbee8e26286404b2cca144e1005be65477979beb9b1ba272d4819bcf0 perl-5.36.0.tar.xz -# Hashes from: https://github.com/arsv/perl-cross/releases/download/1.3.6/perl-cross-1.3.6.hash -sha256 4010f41870d64e3957b4b8ce70ebba10a7c4a3e86c5551acb4099c3fcbb37ce5 perl-cross-1.3.6.tar.gz +# Hash from: https://github.com/arsv/perl-cross/releases/download/1.4/perl-cross-1.4.hash +sha256 be9d9f9f7148edff7a2f9695ba3cb7e3975eff6b25a9a81dd311725fd757aa91 perl-cross-1.4.tar.gz # Locally calculated sha256 dd90d4f42e4dcadf5a7c09eea0189d93c7b37ae560c91f0f6d5233ed3b9292a2 Artistic sha256 d77d235e41d54594865151f4751e835c5a82322b0e87ace266567c3391a4b912 Copying -sha256 df6ad59aefea68676c38325f25f6707f026ddde6c71291b2ca231b6247859907 README +sha256 06bab256e2e039c59d2ca3c5853425317b4a0f251fe4e5d5201a987b11fc4f78 README diff --git a/package/perl/perl.mk b/package/perl/perl.mk index d7f9c58ddda..9be00e1b2c4 100644 --- a/package/perl/perl.mk +++ b/package/perl/perl.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version here, also update utils/scancpan -PERL_VERSION_MAJOR = 34 +PERL_VERSION_MAJOR = 36 PERL_VERSION = 5.$(PERL_VERSION_MAJOR).0 PERL_SITE = https://www.cpan.org/src/5.0 PERL_SOURCE = perl-$(PERL_VERSION).tar.xz @@ -15,7 +15,7 @@ PERL_CPE_ID_VENDOR = perl PERL_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) PERL_INSTALL_STAGING = YES -PERL_CROSS_VERSION = 1.3.6 +PERL_CROSS_VERSION = 1.4 # 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 diff --git a/package/php-apcu/Config.in b/package/php-apcu/Config.in index 63389802225..f8e1eb17bb1 100644 --- a/package/php-apcu/Config.in +++ b/package/php-apcu/Config.in @@ -1,6 +1,10 @@ config BR2_PACKAGE_PHP_APCU bool "php-apcu" + depends on BR2_TOOLCHAIN_HAS_THREADS help APCu is an in-memory key-value store for PHP. https://pecl.php.net/package/APCu + +comment "php-apcu needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/php-apcu/php-apcu.mk b/package/php-apcu/php-apcu.mk index 3ac062e772c..d381c9054f1 100644 --- a/package/php-apcu/php-apcu.mk +++ b/package/php-apcu/php-apcu.mk @@ -16,8 +16,8 @@ PHP_APCU_CONF_OPTS = \ define PHP_APCU_PHPIZE (cd $(@D); \ - PHP_AUTOCONF=$(HOST_DIR)/usr/bin/autoconf \ - PHP_AUTOHEADER=$(HOST_DIR)/usr/bin/autoheader \ + PHP_AUTOCONF=$(HOST_DIR)/bin/autoconf \ + PHP_AUTOHEADER=$(HOST_DIR)/bin/autoheader \ $(STAGING_DIR)/usr/bin/phpize) endef PHP_APCU_PRE_CONFIGURE_HOOKS += PHP_APCU_PHPIZE diff --git a/package/php-imagick/php-imagick.hash b/package/php-imagick/php-imagick.hash index e9158085854..97c0b2f0e05 100644 --- a/package/php-imagick/php-imagick.hash +++ b/package/php-imagick/php-imagick.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 795db7c36fbacd3d33a4f53ff2d38584c846e80a04dcd04c55e9e46c28f5d229 imagick-3.5.0.tgz +sha256 5a364354109029d224bcbb2e82e15b248be9b641227f45e63425c06531792d3e imagick-3.7.0.tgz sha256 b6e00df9cb3b91977c0d64a7c4db48cb6f5041f6eeda6583c236775f70a35b78 LICENSE diff --git a/package/php-imagick/php-imagick.mk b/package/php-imagick/php-imagick.mk index 2dc055f0b3f..925423b12a1 100644 --- a/package/php-imagick/php-imagick.mk +++ b/package/php-imagick/php-imagick.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_IMAGICK_VERSION = 3.5.0 +PHP_IMAGICK_VERSION = 3.7.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/php-lua.mk b/package/php-lua/php-lua.mk index 529b347e426..559bd59209f 100644 --- a/package/php-lua/php-lua.mk +++ b/package/php-lua/php-lua.mk @@ -30,8 +30,8 @@ endif define PHP_LUA_PHPIZE (cd $(@D); \ - PHP_AUTOCONF=$(HOST_DIR)/usr/bin/autoconf \ - PHP_AUTOHEADER=$(HOST_DIR)/usr/bin/autoheader \ + PHP_AUTOCONF=$(HOST_DIR)/bin/autoconf \ + PHP_AUTOHEADER=$(HOST_DIR)/bin/autoheader \ $(STAGING_DIR)/usr/bin/phpize) endef PHP_LUA_PRE_CONFIGURE_HOOKS += PHP_LUA_PHPIZE diff --git a/package/php-pam/php-pam.mk b/package/php-pam/php-pam.mk index 8e20095d866..c35ad4f5d00 100644 --- a/package/php-pam/php-pam.mk +++ b/package/php-pam/php-pam.mk @@ -17,8 +17,8 @@ PHP_PAM_CONF_OPTS = \ define PHP_PAM_PHPIZE (cd $(@D); \ - PHP_AUTOCONF=$(HOST_DIR)/usr/bin/autoconf \ - PHP_AUTOHEADER=$(HOST_DIR)/usr/bin/autoheader \ + PHP_AUTOCONF=$(HOST_DIR)/bin/autoconf \ + PHP_AUTOHEADER=$(HOST_DIR)/bin/autoheader \ $(STAGING_DIR)/usr/bin/phpize) endef PHP_PAM_PRE_CONFIGURE_HOOKS += PHP_PAM_PHPIZE diff --git a/package/php-pecl-dbus/php-pecl-dbus.hash b/package/php-pecl-dbus/php-pecl-dbus.hash index f8c5aa50371..f43e2c8b513 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 c48761c645c6fa42b57af0e65d893217dc69bcd8d879ace74d6abbf1c5f73a8f php-pecl-dbus-315d17558c7614d02e923d898231e51c86a25789.tar.gz -sha256 ecc8b74820c32fb82ddee80446205408585d75d1632ac959fb3cdf8eaf3877b5 LICENSE +sha256 c48761c645c6fa42b57af0e65d893217dc69bcd8d879ace74d6abbf1c5f73a8f php-pecl-dbus-315d17558c7614d02e923d898231e51c86a25789.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 456d662554e..a70a2e7ae1d 100644 --- a/package/php-pecl-dbus/php-pecl-dbus.mk +++ b/package/php-pecl-dbus/php-pecl-dbus.mk @@ -15,8 +15,8 @@ PHP_PECL_DBUS_CONF_OPTS = \ define PHP_PECL_DBUS_PHPIZE (cd $(@D); \ - PHP_AUTOCONF=$(HOST_DIR)/usr/bin/autoconf \ - PHP_AUTOHEADER=$(HOST_DIR)/usr/bin/autoheader \ + PHP_AUTOCONF=$(HOST_DIR)/bin/autoconf \ + PHP_AUTOHEADER=$(HOST_DIR)/bin/autoheader \ $(STAGING_DIR)/usr/bin/phpize) endef PHP_PECL_DBUS_PRE_CONFIGURE_HOOKS += PHP_PECL_DBUS_PHPIZE diff --git a/package/php-xdebug/php-xdebug.hash b/package/php-xdebug/php-xdebug.hash index 72bfac67cea..fa92ee82ed3 100644 --- a/package/php-xdebug/php-xdebug.hash +++ b/package/php-xdebug/php-xdebug.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7e4f28fc65c8b535de43b6d2ec57429476a6de1d53c4d440a9108ae8d28e01f4 php-xdebug-3.0.4.tar.gz +sha256 7769b20eecdadf5fbe9f582512c10b394fb575b6f7a8c3a3a82db6883e0032b7 xdebug-3.2.0.tgz sha256 ef479ee1a3da3f933e0d046ca8cd0c14601f29b2c0c41cc60c9388546a4e0272 LICENSE diff --git a/package/php-xdebug/php-xdebug.mk b/package/php-xdebug/php-xdebug.mk index 18ebc325924..9429d4afeeb 100644 --- a/package/php-xdebug/php-xdebug.mk +++ b/package/php-xdebug/php-xdebug.mk @@ -4,8 +4,9 @@ # ################################################################################ -PHP_XDEBUG_VERSION = 3.0.4 -PHP_XDEBUG_SITE = $(call github,xdebug,xdebug,$(PHP_XDEBUG_VERSION)) +PHP_XDEBUG_VERSION = 3.2.0 +PHP_XDEBUG_SOURCE = xdebug-$(PHP_XDEBUG_VERSION).tgz +PHP_XDEBUG_SITE = https://xdebug.org/files PHP_XDEBUG_INSTALL_STAGING = YES PHP_XDEBUG_LICENSE = Xdebug License (PHP-3.0-like) PHP_XDEBUG_LICENSE_FILES = LICENSE diff --git a/package/php-yaml/php-yaml.hash b/package/php-yaml/php-yaml.hash index e4f31cdad98..b4d14c5a30c 100644 --- a/package/php-yaml/php-yaml.hash +++ b/package/php-yaml/php-yaml.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e17ad04e752e25fd099bddd2df9d26dfef183c8d00c4179bc9d7a2e1c97d7819 yaml-2.2.1.tgz +sha256 119052f0461d57d86f44c252f9c9b2dd743486c701c1a0aba0aebecdd0d8b82a yaml-2.2.2.tgz sha256 68d9700294396c72089bfc7bf38a5b3654a53ae415f3bd37768848c14e86f338 LICENSE diff --git a/package/php-yaml/php-yaml.mk b/package/php-yaml/php-yaml.mk index ba16c9ac625..39a422e25d2 100644 --- a/package/php-yaml/php-yaml.mk +++ b/package/php-yaml/php-yaml.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_YAML_VERSION = 2.2.1 +PHP_YAML_VERSION = 2.2.2 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 2d155527838..9badbd1cc28 100644 --- a/package/php/0001-acinclude.m4-don-t-unset-variables.patch +++ b/package/php/0001-acinclude.m4-don-t-unset-variables.patch @@ -9,6 +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] --- build/php.m4 | 4 ---- 1 file changed, 4 deletions(-) @@ -17,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 -@@ -1568,8 +1568,6 @@ dnl PHP_CHECK_FUNC_LIB +@@ -1580,8 +1580,6 @@ dnl PHP_CHECK_FUNC_LIB dnl AC_DEFUN([PHP_CHECK_FUNC_LIB],[ ifelse($2,,:,[ @@ -26,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]) -@@ -1601,8 +1599,6 @@ dnl and as a fall back in the specified library. Defines HAVE_func and +@@ -1616,8 +1616,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 19d7ab5cf92..758dd6133bb 100644 --- a/package/php/0002-iconv-tweak-iconv-detection.patch +++ b/package/php/0002-iconv-tweak-iconv-detection.patch @@ -16,7 +16,7 @@ Signed-off-by: Gustavo Zacarias 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] +[Bernd: rebased for 7.4.10, 7.4.13 & 8.1.7] --- build/php.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) @@ -25,7 +25,7 @@ diff --git a/build/php.m4 b/build/php.m4 index 9586c490..8b3d47ed 100644 --- a/build/php.m4 +++ b/build/php.m4 -@@ -1937,7 +1937,7 @@ AC_DEFUN([PHP_SETUP_ICONV], [ +@@ -1976,7 +1976,7 @@ AC_DEFUN([PHP_SETUP_ICONV], [ dnl Check external libs for iconv funcs. if test "$found_iconv" = "no"; then diff --git a/package/php/0003-configure-disable-the-phar-tool.patch b/package/php/0003-configure-disable-the-phar-tool.patch index cc4f55a8c83..6bfaf6640ff 100644 --- a/package/php/0003-configure-disable-the-phar-tool.patch +++ b/package/php/0003-configure-disable-the-phar-tool.patch @@ -13,7 +13,7 @@ Signed-off-by: Gustavo Zacarias 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] +[Bernd: rebased for 7.4.10, 7.4.13 & 8.1.7] --- 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 -@@ -1423,13 +1423,8 @@ CFLAGS_CLEAN="$CFLAGS \$(PROF_FLAGS)" +@@ -1638,13 +1638,8 @@ CFLAGS_CLEAN="$CFLAGS \$(PROF_FLAGS)" CFLAGS="\$(CFLAGS_CLEAN) $standard_libtool_flag" CXXFLAGS="$CXXFLAGS $standard_libtool_flag \$(PROF_FLAGS)" diff --git a/package/php/0005-allow-opcache-cross-compiling.patch b/package/php/0005-allow-opcache-cross-compiling.patch index d168f718923..f9bc8b3ef59 100644 --- a/package/php/0005-allow-opcache-cross-compiling.patch +++ b/package/php/0005-allow-opcache-cross-compiling.patch @@ -13,6 +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] --- ext/opcache/config.m4 | 4 ---- 1 file changed, 4 deletions(-) @@ -21,8 +23,8 @@ 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 -@@ -339,10 +339,6 @@ int main() { - PHP_ADD_BUILD_DIR([$ext_builddir/Optimizer], 1) +@@ -331,10 +331,6 @@ int main() { + 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 diff --git a/package/php/0006-xxhash-h-Fix-GCC-12-Og.patch b/package/php/0006-xxhash-h-Fix-GCC-12-Og.patch new file mode 100644 index 00000000000..9b5b9966cd5 --- /dev/null +++ b/package/php/0006-xxhash-h-Fix-GCC-12-Og.patch @@ -0,0 +1,94 @@ +From adcb38b1ffa8e401293e5028ee5af586fd304e00 Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Wed, 12 Apr 2023 13:33:07 +0800 +Subject: [PATCH] xxhash.h: Fix GCC 12 -Og + +Change whether to inline XXH3_hashLong_withSecret to a config option + +Ref: https://github.com/Cyan4973/xxHash/commit/ace22bddc7a366a5dd8a71e8b8247694530684ec + +Signed-off-by: Mingli Yu + +Closes GH-11062. + +Upstream: https://github.com/php/php-src/commit/adcb38b1ffa8e401293e5028ee5af586fd304e00 + +Signed-off-by: Bernd Kuhls +--- + ext/hash/xxhash/xxhash.h | 35 +++++++++++++++++++++++++++++++++-- + 1 file changed, 33 insertions(+), 2 deletions(-) + +diff --git a/ext/hash/xxhash/xxhash.h b/ext/hash/xxhash/xxhash.h +index b5bd286496c7..8e816c0584eb 100644 +--- a/ext/hash/xxhash/xxhash.h ++++ b/ext/hash/xxhash/xxhash.h +@@ -1375,6 +1375,23 @@ XXH3_128bits_reset_withSecretandSeed(XXH3_state_t* statePtr, + */ + # define XXH_NO_INLINE_HINTS 0 + ++/*! ++ * @def XXH3_INLINE_SECRET ++ * @brief Determines whether to inline the XXH3 withSecret code. ++ * ++ * When the secret size is known, the compiler can improve the performance ++ * of XXH3_64bits_withSecret() and XXH3_128bits_withSecret(). ++ * ++ * However, if the secret size is not known, it doesn't have any benefit. This ++ * happens when xxHash is compiled into a global symbol. Therefore, if ++ * @ref XXH_INLINE_ALL is *not* defined, this will be defined to 0. ++ * ++ * Additionally, this defaults to 0 on GCC 12+, which has an issue with function pointers ++ * that are *sometimes* force inline on -Og, and it is impossible to automatically ++ * detect this optimization level. ++ */ ++# define XXH3_INLINE_SECRET 0 ++ + /*! + * @def XXH32_ENDJMP + * @brief Whether to use a jump for `XXH32_finalize`. +@@ -1439,6 +1456,15 @@ XXH3_128bits_reset_withSecretandSeed(XXH3_state_t* statePtr, + # endif + #endif + ++#ifndef XXH3_INLINE_SECRET ++# if (defined(__GNUC__) && !defined(__clang__) && __GNUC__ >= 12) \ ++ || !defined(XXH_INLINE_ALL) ++# define XXH3_INLINE_SECRET 0 ++# else ++# define XXH3_INLINE_SECRET 1 ++# endif ++#endif ++ + #ifndef XXH32_ENDJMP + /* generally preferable for performance */ + # define XXH32_ENDJMP 0 +@@ -1515,6 +1541,11 @@ static void* XXH_memcpy(void* dest, const void* src, size_t size) + # define XXH_NO_INLINE static + #endif + ++#if XXH3_INLINE_SECRET ++# define XXH3_WITH_SECRET_INLINE XXH_FORCE_INLINE ++#else ++# define XXH3_WITH_SECRET_INLINE XXH_NO_INLINE ++#endif + + + /* ************************************* +@@ -4465,7 +4496,7 @@ XXH3_hashLong_64b_internal(const void* XXH_RESTRICT input, size_t len, + * so that the compiler can properly optimize the vectorized loop. + * This makes a big performance difference for "medium" keys (<1 KB) when using AVX instruction set. + */ +-XXH_FORCE_INLINE XXH64_hash_t ++XXH3_WITH_SECRET_INLINE XXH64_hash_t + XXH3_hashLong_64b_withSecret(const void* XXH_RESTRICT input, size_t len, + XXH64_hash_t seed64, const xxh_u8* XXH_RESTRICT secret, size_t secretLen) + { +@@ -5263,7 +5294,7 @@ XXH3_hashLong_128b_default(const void* XXH_RESTRICT input, size_t len, + * It's important for performance to pass @secretLen (when it's static) + * to the compiler, so that it can properly optimize the vectorized loop. + */ +-XXH_FORCE_INLINE XXH128_hash_t ++XXH3_WITH_SECRET_INLINE XXH128_hash_t + XXH3_hashLong_128b_withSecret(const void* XXH_RESTRICT input, size_t len, + XXH64_hash_t seed64, + const void* XXH_RESTRICT secret, size_t secretLen) diff --git a/package/php/Config.ext b/package/php/Config.ext index 5da5d8bed9a..d5f86590165 100644 --- a/package/php/Config.ext +++ b/package/php/Config.ext @@ -141,6 +141,7 @@ config BR2_PACKAGE_PHP_EXT_PGSQL depends on BR2_USE_MMU # postgresql depends on !BR2_STATIC_LIBS depends on BR2_USE_WCHAR # postgresql + depends on !BR2_OPTIMIZE_FAST # postgresql select BR2_PACKAGE_POSTGRESQL help PostgreSQL support @@ -149,6 +150,9 @@ comment "PostgreSQL extension needs a toolchain w/ dynamic library, wchar" depends on BR2_USE_MMU depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR +comment "PostgreSQL extension can't be built with Optimize for fast" + depends on BR2_OPTIMIZE_FAST + config BR2_PACKAGE_PHP_EXT_SQLITE bool "SQLite3" select BR2_PACKAGE_SQLITE @@ -172,6 +176,7 @@ config BR2_PACKAGE_PHP_EXT_PDO_POSTGRESQL depends on BR2_USE_MMU # postgresql depends on !BR2_STATIC_LIBS depends on BR2_USE_WCHAR # postgresql + depends on !BR2_OPTIMIZE_FAST # postgresql select BR2_PACKAGE_POSTGRESQL help PDO driver for PostgreSQL @@ -180,6 +185,9 @@ comment "PostgreSQL drivers need a toolchain w/ wchar, dynamic library" depends on BR2_USE_MMU depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR +comment "PostgreSQL drivers can't be built with Optimize for fast" + depends on BR2_OPTIMIZE_FAST + config BR2_PACKAGE_PHP_EXT_PDO_SQLITE bool "SQLite3" select BR2_PACKAGE_SQLITE @@ -377,13 +385,6 @@ config BR2_PACKAGE_PHP_EXT_SIMPLEXML help SimpleXML support -config BR2_PACKAGE_PHP_EXT_WDDX - bool "WDDX" - select BR2_PACKAGE_EXPAT - select BR2_PACKAGE_PHP_EXT_LIBXML2 - help - WDDX support - config BR2_PACKAGE_PHP_EXT_XML bool "XML Parser" select BR2_PACKAGE_PHP_EXT_LIBXML2 diff --git a/package/php/Config.in b/package/php/Config.in index 226d2d5fd24..69b4268c1d4 100644 --- a/package/php/Config.in +++ b/package/php/Config.in @@ -1,5 +1,18 @@ +config BR2_PACKAGE_PHP_ARCH_SUPPORTS + bool + # see fiber_cpu in configure.ac + default y if BR2_aarch64 || BR2_aarch64_be + default y if BR2_arm || BR2_armeb + default y if BR2_i386 || BR2_x86_64 + default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el + default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le + default y if BR2_RISCV_64 + default y if BR2_s390x + default y if BR2_TOOLCHAIN_HAS_UCONTEXT + config BR2_PACKAGE_PHP bool "php" + depends on BR2_PACKAGE_PHP_ARCH_SUPPORTS # PHP uses -export-dynamic, which breaks with elf2flt with a # message like "ld.real: section .junk LMA [...,...] overlaps # section .text LMA [...,...]" @@ -52,5 +65,6 @@ source "package/php/Config.ext" endif comment "php needs a toolchain w/ wchar" + depends on BR2_PACKAGE_PHP_ARCH_SUPPORTS depends on !BR2_BINFMT_FLAT depends on !BR2_USE_WCHAR diff --git a/package/php/php.hash b/package/php/php.hash index 2753f9a0eb4..b8ff7ccc5c4 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 f27a2f25259e8c51e42dfd74e24a546ee521438ad7d9f6c6e794aa91f38bab0a php-8.0.16.tar.xz +sha256 561dc4acd5386e47f25be76f2c8df6ae854756469159248313bcf276e282fbb3 php-8.2.10.tar.xz # License file -sha256 a188db807d711536f71e27b7d36879d63480f7994dc18adc08e624b3c5430fff LICENSE +sha256 080d0d0cca64181ef8bf1df9fba0c6f0c485f78f79540c479a45b593bb3b33b5 LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 5b29692d94d..6c70de27426 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.0.16 +PHP_VERSION = 8.2.10 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES @@ -35,6 +35,10 @@ ifeq ($(BR2_STATIC_LIBS)$(BR2_TOOLCHAIN_HAS_THREADS),yy) PHP_STATIC_LIBS += -lpthread endif +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +PHP_EXTRA_LIBS += -latomic +endif + ifeq ($(call qstrip,$(BR2_TARGET_LOCALTIME)),) PHP_LOCALTIME = UTC else @@ -80,6 +84,13 @@ else PHP_CONF_ENV += ac_cv_func_dlopen=no ac_cv_lib_dl_dlopen=no 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 +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +PHP_CFLAGS += -marm +endif + PHP_CONF_OPTS += $(if $(BR2_PACKAGE_PHP_SAPI_CLI),--enable-cli,--disable-cli) PHP_CONF_OPTS += $(if $(BR2_PACKAGE_PHP_SAPI_CGI),--enable-cgi,--disable-cgi) PHP_CONF_OPTS += $(if $(BR2_PACKAGE_PHP_SAPI_FPM),--enable-fpm,--disable-fpm) @@ -150,11 +161,6 @@ PHP_CONF_OPTS += --with-libxml PHP_DEPENDENCIES += libxml2 endif -ifeq ($(BR2_PACKAGE_PHP_EXT_WDDX),y) -PHP_CONF_OPTS += --enable-wddx --with-libexpat-dir=$(STAGING_DIR)/usr -PHP_DEPENDENCIES += expat -endif - ifeq ($(BR2_PACKAGE_PHP_EXT_ZIP),y) PHP_DEPENDENCIES += libzip endif @@ -181,13 +187,8 @@ endif endif ifeq ($(BR2_PACKAGE_PHP_EXT_INTL),y) -PHP_CONF_OPTS += --enable-intl --with-icu-dir=$(STAGING_DIR)/usr -PHP_CXXFLAGS += "`$(STAGING_DIR)/usr/bin/icu-config --cxxflags`" +PHP_CONF_OPTS += --enable-intl PHP_DEPENDENCIES += icu -# The intl module is implemented in C++, but PHP fails to use -# g++ as the compiler for the final link. As a workaround, -# tell it to link libstdc++. -PHP_EXTRA_LIBS += -lstdc++ endif ifeq ($(BR2_PACKAGE_PHP_EXT_GMP),y) diff --git a/package/physfs/physfs.hash b/package/physfs/physfs.hash index a2219edd25c..a56e7dcceff 100644 --- a/package/physfs/physfs.hash +++ b/package/physfs/physfs.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 304df76206d633df5360e738b138c94e82ccf086e50ba84f456d3f8432f9f863 physfs-3.0.2.tar.bz2 -sha256 d80c0b09a1c98c61667ea044eefa2fd98fb70bd5fe12c49ff52b1fc2289a6583 LICENSE.txt +sha256 304df76206d633df5360e738b138c94e82ccf086e50ba84f456d3f8432f9f863 physfs-3.0.2.tar.bz2 +sha256 d80c0b09a1c98c61667ea044eefa2fd98fb70bd5fe12c49ff52b1fc2289a6583 LICENSE.txt diff --git a/package/picocom/picocom.hash b/package/picocom/picocom.hash index 28f2d9cdc5a..77c270408c3 100644 --- a/package/picocom/picocom.hash +++ b/package/picocom/picocom.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e6761ca932ffc6d09bd6b11ff018bdaf70b287ce518b3282d29e0270e88420bb picocom-3.1.tar.gz -sha256 9273c6b2c55be95f0f0df292d87e8900e5bfdf5b510a6ea09e80306cf45c10f6 LICENSE.txt +sha256 e6761ca932ffc6d09bd6b11ff018bdaf70b287ce518b3282d29e0270e88420bb picocom-3.1.tar.gz +sha256 9273c6b2c55be95f0f0df292d87e8900e5bfdf5b510a6ea09e80306cf45c10f6 LICENSE.txt diff --git a/package/piglit/Config.in b/package/piglit/Config.in index 736fd95d719..22d1c7c28e7 100644 --- a/package/piglit/Config.in +++ b/package/piglit/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_PIGLIT BR2_PACKAGE_WAFFLE_SUPPORTS_WAYLAND || \ BR2_PACKAGE_WAFFLE_SUPPORTS_X11_EGL || \ BR2_PACKAGE_WAFFLE_SUPPORTS_GBM + depends on BR2_INSTALL_LIBSTDCPP # mesa3d-demos, python-numpy depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_HAS_LIBGL select BR2_PACKAGE_LIBPNG @@ -31,5 +32,6 @@ config BR2_PACKAGE_PIGLIT https://piglit.freedesktop.org -comment "piglit needs glibc or musl" - depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) +comment "piglit needs a glibc or musl toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP || \ + !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) diff --git a/package/pigz/pigz.hash b/package/pigz/pigz.hash index 512bf785c75..4a149605b33 100644 --- a/package/pigz/pigz.hash +++ b/package/pigz/pigz.hash @@ -1,3 +1,5 @@ +# From http://zlib.net/pigz +sha256 b4c9e60344a08d5db37ca7ad00a5b2c76ccb9556354b722d56d55ca7e8b1c707 pigz-2.7.tar.gz + # Locally calculated -sha256 577673676cd5c7219f94b236075451220bae3e1ca451cf849947a2998fbf5820 pigz-2.6.tar.gz -sha256 830b3e1b05cc20f443d89d7d8703a3c63fd64c57ab716f5e81fd178517df1e11 README +sha256 67e2b9e30e924724a9d72549a6004ed15a041f51d9ea9ab781e048fa27ae07a2 README diff --git a/package/pigz/pigz.mk b/package/pigz/pigz.mk index 3e5e892797e..fd48ab463de 100644 --- a/package/pigz/pigz.mk +++ b/package/pigz/pigz.mk @@ -4,8 +4,8 @@ # ################################################################################ -PIGZ_VERSION = 2.6 -PIGZ_SITE = $(call github,madler,pigz,v$(PIGZ_VERSION)) +PIGZ_VERSION = 2.7 +PIGZ_SITE = http://zlib.net/pigz PIGZ_DEPENDENCIES = zlib HOST_PIGZ_DEPENDENCIES = host-zlib PIGZ_LICENSE = Zlib diff --git a/package/pimd/pimd.hash b/package/pimd/pimd.hash index 98c717d2e8a..ae79d771f5b 100644 --- a/package/pimd/pimd.hash +++ b/package/pimd/pimd.hash @@ -1,6 +1,6 @@ # Locally computed: -sha256 c77a9812751f114490a28a6839b16aac8b020c8d9fd6aa22bf3880c054e19f1d pimd-2.3.2.tar.gz +sha256 c77a9812751f114490a28a6839b16aac8b020c8d9fd6aa22bf3880c054e19f1d pimd-2.3.2.tar.gz # Hash for license files: -sha256 3379436c16caccdef9b40a49fbdfdbb45aad8ecb05870834490b8fb080126009 LICENSE -sha256 4328a21f0822caa9976356623118bcdcc9970c7a0f9a3deeba23c779b7cfb5d1 LICENSE.mrouted +sha256 3379436c16caccdef9b40a49fbdfdbb45aad8ecb05870834490b8fb080126009 LICENSE +sha256 4328a21f0822caa9976356623118bcdcc9970c7a0f9a3deeba23c779b7cfb5d1 LICENSE.mrouted diff --git a/package/pimd/pimd.mk b/package/pimd/pimd.mk index 7a12f8fe0d0..8abfbd5644d 100644 --- a/package/pimd/pimd.mk +++ b/package/pimd/pimd.mk @@ -26,7 +26,7 @@ endef define PIMD_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) CROSS=$(TARGET_CROSS) \ - CC=$(TARGET_CC) -C $(@D) + CC=$(TARGET_CC) LDFLAGS="$(TARGET_LDFLAGS)" -C $(@D) endef define PIMD_INSTALL_TARGET_CMDS diff --git a/package/pinentry/Config.in b/package/pinentry/Config.in index 3f005f8c580..bd5e3af5a13 100644 --- a/package/pinentry/Config.in +++ b/package/pinentry/Config.in @@ -74,6 +74,7 @@ config BR2_PACKAGE_PINENTRY_QT5 depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_HOST_GCC_AT_LEAST_5 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 + depends on !BR2_ARM_CPU_ARMV4 depends on !BR2_arc depends on !BR2_STATIC_LIBS select BR2_PACKAGE_QT5 @@ -84,6 +85,7 @@ config BR2_PACKAGE_PINENTRY_QT5 comment "pinentry-qt5 needs a host gcc >= 5.0, and a toolchain w/ wchar, NPTL, gcc >= 5.0, C++, dynamic library" depends on !BR2_arc + depends on !BR2_ARM_CPU_ARMV4 depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || \ BR2_STATIC_LIBS || !BR2_HOST_GCC_AT_LEAST_5 diff --git a/package/pinentry/pinentry.hash b/package/pinentry/pinentry.hash index e5f3d906521..187c86f9bd7 100644 --- a/package/pinentry/pinentry.hash +++ b/package/pinentry/pinentry.hash @@ -1,5 +1,5 @@ # From https://www.gnupg.org/download/integrity_check.html -sha1 b8b88cab4fd844e3616d55aeba8f084f2b98fb0f pinentry-1.1.1.tar.bz2 +sha1 29daaf45f15cb5b8ec9b4a06284343f7a87082fb pinentry-1.2.1.tar.bz2 # Locally computed -sha256 cd12a064013ed18e2ee8475e669b9f58db1b225a0144debdb85a68cecddba57f pinentry-1.1.1.tar.bz2 +sha256 457a185e5a85238fb945a955dc6352ab962dc8b48720b62fc9fa48c7540a4067 pinentry-1.2.1.tar.bz2 sha256 67f82e045cf7acfef853ea0f426575a8359161a0a325e19f02b529a87c4b6c34 COPYING diff --git a/package/pinentry/pinentry.mk b/package/pinentry/pinentry.mk index 8ebd35cfab3..338d61af2d7 100644 --- a/package/pinentry/pinentry.mk +++ b/package/pinentry/pinentry.mk @@ -4,7 +4,7 @@ # ################################################################################ -PINENTRY_VERSION = 1.1.1 +PINENTRY_VERSION = 1.2.1 PINENTRY_SOURCE = pinentry-$(PINENTRY_VERSION).tar.bz2 PINENTRY_SITE = https://www.gnupg.org/ftp/gcrypt/pinentry PINENTRY_LICENSE = GPL-2.0+ diff --git a/package/pipewire-media-session/0001-meson-remove-session-managers-option-check.patch b/package/pipewire-media-session/0001-meson-remove-session-managers-option-check.patch deleted file mode 100644 index fc1d25edb31..00000000000 --- a/package/pipewire-media-session/0001-meson-remove-session-managers-option-check.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 1923c97fbd0b3d8cacdb72386886f860c818bccf Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Wed, 10 Nov 2021 08:54:06 -0700 -Subject: [PATCH] meson: remove session-managers option check. - -This option no longer exists and causes a build failure if building -with the systemd system service enabled. - -Signed-off-by: James Hilliard -[Upstream status: -https://gitlab.freedesktop.org/pipewire/media-session/-/merge_requests/24] ---- - systemd/system/meson.build | 10 ++++------ - 1 file changed, 4 insertions(+), 6 deletions(-) - -diff --git a/systemd/system/meson.build b/systemd/system/meson.build -index ab0d49064..0e9885b0f 100644 ---- a/systemd/system/meson.build -+++ b/systemd/system/meson.build -@@ -4,9 +4,7 @@ systemd_system_services_dir = systemd.get_variable(pkgconfig: 'systemdsystemunit - systemd_config = configuration_data() - systemd_config.set('PW_MEDIA_SESSION_BINARY', media_session_bindir / 'pipewire-media-session') - --if get_option('session-managers').contains('media-session') -- configure_file(input : 'pipewire-media-session.service.in', -- output : 'pipewire-media-session.service', -- configuration : systemd_config, -- install_dir : systemd_system_services_dir) --endif -+configure_file(input : 'pipewire-media-session.service.in', -+ output : 'pipewire-media-session.service', -+ configuration : systemd_config, -+ install_dir : systemd_system_services_dir) --- -2.25.1 - diff --git a/package/pipewire-media-session/pipewire-media-session.hash b/package/pipewire-media-session/pipewire-media-session.hash index e335fd8913b..e6b176eea25 100644 --- a/package/pipewire-media-session/pipewire-media-session.hash +++ b/package/pipewire-media-session/pipewire-media-session.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 ebdf9f8e389896fdc4b58da5f909afce18441b4b53d5b4f2104dd53586ea8681 media-session-0.4.1.tar.bz2 +sha256 26e21852e0834a4418b40eae342ac5178dfe40342b9c5afe204d43ef8aafa14e media-session-0.4.2.tar.bz2 sha256 8909c319a7e27dbb33a15b9035f89ab3b7b2f6a12f8bcddc755206a8db1ada44 COPYING sha256 77b9c867237ef919e33c0fdbcf22ab84b1cf24a63f9431ec68759026b658c994 LICENSE diff --git a/package/pipewire-media-session/pipewire-media-session.mk b/package/pipewire-media-session/pipewire-media-session.mk index d349fd74545..cc7317f9256 100644 --- a/package/pipewire-media-session/pipewire-media-session.mk +++ b/package/pipewire-media-session/pipewire-media-session.mk @@ -4,7 +4,7 @@ # ################################################################################ -PIPEWIRE_MEDIA_SESSION_VERSION = 0.4.1 +PIPEWIRE_MEDIA_SESSION_VERSION = 0.4.2 PIPEWIRE_MEDIA_SESSION_SOURCE = media-session-$(PIPEWIRE_MEDIA_SESSION_VERSION).tar.bz2 PIPEWIRE_MEDIA_SESSION_SITE = https://gitlab.freedesktop.org/pipewire/media-session/-/archive/$(PIPEWIRE_MEDIA_SESSION_VERSION) PIPEWIRE_MEDIA_SESSION_LICENSE = MIT @@ -17,7 +17,10 @@ PIPEWIRE_MEDIA_SESSION_DEPENDENCIES = \ pipewire \ $(TARGET_NLS_DEPENDENCIES) -PIPEWIRE_MEDIA_SESSION_CONF_OPTS = -Ddocs=disabled -Dtests=disabled +PIPEWIRE_MEDIA_SESSION_CONF_OPTS = \ + -Ddocs=disabled \ + -Dtests=disabled \ + -Dinstalled_tests=disabled PIPEWIRE_MEDIA_SESSION_MODULE_SETS_LIST = alsa diff --git a/package/pipewire/Config.in b/package/pipewire/Config.in index dd13f31a73f..4929e5d3d1e 100644 --- a/package/pipewire/Config.in +++ b/package/pipewire/Config.in @@ -1,9 +1,11 @@ config BR2_PACKAGE_PIPEWIRE bool "pipewire" depends on !BR2_STATIC_LIBS - depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # pthread_setname_np() depends on BR2_USE_MMU # fork() depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 + select BR2_PACKAGE_ALSA_LIB_UCM if BR2_PACKAGE_ALSA_LIB + select BR2_PACKAGE_ALSA_LIB_SEQ if BR2_PACKAGE_ALSA_LIB select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO if BR2_PACKAGE_BLUEZ5_UTILS # runtime help PipeWire is a server and user space API to deal with @@ -13,6 +15,18 @@ config BR2_PACKAGE_PIPEWIRE if BR2_PACKAGE_PIPEWIRE +config BR2_PACKAGE_PIPEWIRE_COMPRESS_OFFLOAD + bool "pipewire Compress-Offload" + depends on !BR2_STATIC_LIBS # tinycompress + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7 + select BR2_PACKAGE_TINYCOMPRESS + help + Enable ALSA Compress-Offload support + +comment "pipewire Compress-Offload needs a toolchain w/ dynamic library, headers >= 5.7" + depends on BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7 + config BR2_PACKAGE_PIPEWIRE_EXAMPLES bool "pipewire examples" help @@ -46,7 +60,8 @@ comment "pipewire v4l2 support needs udev and a toolchain w/ headers >= 3.18" endif -comment "pipewire needs a toolchain w/ dynamic library, threads, gcc >= 5" +comment "pipewire needs a toolchain w/ dynamic library, NTPL, gcc >= 5" depends on BR2_USE_MMU - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || \ + depends on BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_5 diff --git a/package/pipewire/pipewire.hash b/package/pipewire/pipewire.hash index a9d59663aea..0e027aaa55b 100644 --- a/package/pipewire/pipewire.hash +++ b/package/pipewire/pipewire.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 76291373f7ab271664df5b6a22b678ad57e485e25c73ee9c78e049a67b7886d2 pipewire-0.3.45.tar.bz2 +sha256 c78c95cdff2774418f0a9468e94a1b2800761d322f13104df6501e1a0dc92558 pipewire-0.3.65.tar.bz2 sha256 8909c319a7e27dbb33a15b9035f89ab3b7b2f6a12f8bcddc755206a8db1ada44 COPYING sha256 be4be5d77424833edf31f53fc1f1cecb6996b9e2d747d9e6fb8f878362ebc92b LICENSE diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index fc521c86acc..f71979db22b 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -4,7 +4,7 @@ # ################################################################################ -PIPEWIRE_VERSION = 0.3.45 +PIPEWIRE_VERSION = 0.3.65 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) @@ -20,6 +20,8 @@ PIPEWIRE_CONF_OPTS += \ -Dspa-plugins=enabled \ -Daudiomixer=enabled \ -Daudioconvert=enabled \ + -Dbluez5-codec-lc3=disabled \ + -Dbluez5-codec-lc3plus=disabled \ -Dcontrol=enabled \ -Daudiotestsrc=enabled \ -Dsupport=enabled \ @@ -28,9 +30,12 @@ PIPEWIRE_CONF_OPTS += \ -Dvideoconvert=enabled \ -Dvideotestsrc=enabled \ -Dvolume=enabled \ + -Dvulkan=disabled \ -Dsession-managers=[] \ + -Dlegacy-rtkit=false \ + -Davb=disabled \ -Dlibcanberra=disabled \ - -Dlv2=disabled + -Dflatpak=disabled ifeq ($(BR2_PACKAGE_DBUS),y) PIPEWIRE_CONF_OPTS += -Ddbus=enabled @@ -75,7 +80,7 @@ endif ifeq ($(BR2_PACKAGE_ALSA_LIB),y) PIPEWIRE_CONF_OPTS += -Dpipewire-alsa=enabled PIPEWIRE_DEPENDENCIES += alsa-lib -ifeq ($(BR2_PACKAGE_ALSA_LIB_SEQ)$(BR2_PACKAGE_ALSA_LIB_UCM)$(BR2_PACKAGE_HAS_UDEV),yyy) +ifeq ($(BR2_PACKAGE_HAS_UDEV),y) PIPEWIRE_CONF_OPTS += -Dalsa=enabled else PIPEWIRE_CONF_OPTS += -Dalsa=disabled @@ -101,15 +106,27 @@ endif ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS)$(BR2_PACKAGE_SBC),yy) PIPEWIRE_CONF_OPTS += -Dbluez5=enabled PIPEWIRE_DEPENDENCIES += bluez5_utils sbc +ifeq ($(BR2_PACKAGE_MODEM_MANAGER),y) +PIPEWIRE_CONF_OPTS += -Dbluez5-backend-native-mm=enabled +PIPEWIRE_DEPENDENCIES += modem-manager +else +PIPEWIRE_CONF_OPTS += -Dbluez5-backend-native-mm=disabled +endif +ifeq ($(BR2_PACKAGE_OPUS),y) +PIPEWIRE_CONF_OPTS += -Dbluez5-codec-opus=enabled +PIPEWIRE_DEPENDENCIES += opus else -PIPEWIRE_CONF_OPTS += -Dbluez5=disabled +PIPEWIRE_CONF_OPTS += -Dbluez5-codec-opus=disabled +endif +else +PIPEWIRE_CONF_OPTS += -Dbluez5=disabled -Dbluez5-codec-opus=disabled endif ifeq ($(BR2_PACKAGE_FFMPEG),y) -PIPEWIRE_CONF_OPTS += -Dffmpeg=enabled +PIPEWIRE_CONF_OPTS += -Dffmpeg=enabled -Dpw-cat-ffmpeg=enabled PIPEWIRE_DEPENDENCIES += ffmpeg else -PIPEWIRE_CONF_OPTS += -Dffmpeg=disabled +PIPEWIRE_CONF_OPTS += -Dffmpeg=disabled -Dpw-cat-ffmpeg=disabled endif ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y) @@ -129,6 +146,13 @@ else PIPEWIRE_CONF_OPTS += -Dlibcamera=disabled endif +ifeq ($(BR2_PACKAGE_LILV),y) +PIPEWIRE_CONF_OPTS += -Dlv2=enabled +PIPEWIRE_DEPENDENCIES += lilv +else +PIPEWIRE_CONF_OPTS += -Dlv2=disabled +endif + ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y) PIPEWIRE_CONF_OPTS += -Dx11=enabled PIPEWIRE_DEPENDENCIES += xlib_libX11 @@ -136,6 +160,20 @@ else PIPEWIRE_CONF_OPTS += -Dx11=disabled endif +ifeq ($(BR2_PACKAGE_XLIB_LIBXFIXES),y) +PIPEWIRE_CONF_OPTS += -Dx11-xfixes=enabled +PIPEWIRE_DEPENDENCIES += xlib_libXfixes +else +PIPEWIRE_CONF_OPTS += -Dx11-xfixes=disabled +endif + +ifeq ($(BR2_PACKAGE_LIBGLIB2),y) +PIPEWIRE_CONF_OPTS += -Dgsettings=enabled +PIPEWIRE_DEPENDENCIES += libglib2 +else +PIPEWIRE_CONF_OPTS += -Dgsettings=disabled +endif + ifeq ($(BR2_PACKAGE_LIBUSB),y) PIPEWIRE_CONF_OPTS += -Dlibusb=enabled PIPEWIRE_DEPENDENCIES += libusb @@ -143,13 +181,6 @@ else PIPEWIRE_CONF_OPTS += -Dlibusb=disabled endif -ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER),y) -PIPEWIRE_CONF_OPTS += -Dvulkan=enabled -PIPEWIRE_DEPENDENCIES += mesa3d -else -PIPEWIRE_CONF_OPTS += -Dvulkan=disabled -endif - ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) PIPEWIRE_CONF_OPTS += -Dpw-cat=enabled -Dsndfile=enabled PIPEWIRE_DEPENDENCIES += libsndfile @@ -165,7 +196,10 @@ PIPEWIRE_CONF_OPTS += -Dlibpulse=disabled endif ifeq ($(BR2_PACKAGE_READLINE),y) +PIPEWIRE_CONF_OPTS += -Dreadline=enabled PIPEWIRE_DEPENDENCIES += readline +else +PIPEWIRE_CONF_OPTS += -Dreadline=disabled endif ifeq ($(BR2_PACKAGE_SDL2),y) @@ -175,6 +209,13 @@ else PIPEWIRE_CONF_OPTS += -Dsdl2=disabled endif +ifeq ($(BR2_PACKAGE_PIPEWIRE_COMPRESS_OFFLOAD),y) +PIPEWIRE_CONF_OPTS += -Dcompress-offload=enabled +PIPEWIRE_DEPENDENCIES += tinycompress +else +PIPEWIRE_CONF_OPTS += -Dcompress-offload=disabled +endif + ifeq ($(WEBRTC_AUDIO_PROCESSING),y) PIPEWIRE_CONF_OPTS += -Decho-cancel-webrtc=enabled PIPEWIRE_DEPENDENCIES += webrtc-audio-processing diff --git a/package/pistache/0001-CMakeLists.txt-add-C-language-to-project-statement.patch b/package/pistache/0001-CMakeLists.txt-add-C-language-to-project-statement.patch deleted file mode 100644 index c393a48d0d7..00000000000 --- a/package/pistache/0001-CMakeLists.txt-add-C-language-to-project-statement.patch +++ /dev/null @@ -1,70 +0,0 @@ -From a50fc9bde098e4e89584a5da9f94f620c11b6733 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 16 Aug 2020 12:31:46 +0200 -Subject: [PATCH] CMakeLists.txt: add C language to project statement -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This will fix the detection of atomic: - --- Performing Test HAVE_CXX_ATOMICS64_WITHOUT_LIB --- Performing Test HAVE_CXX_ATOMICS64_WITHOUT_LIB - Failed --- Looking for __atomic_load_8 in atomic --- Looking for __atomic_load_8 in atomic - not found -CMake Error at CMakeModules/CheckAtomic.cmake:76 (message): - Host compiler appears to require libatomic for 64-bit operations, but - cannot find it. -Call Stack (most recent call first): - CMakeLists.txt:19 (include) - -Indeed if C language is not enabled, the test will be run with the C++ -compiler resulting in the following error: - -Building CXX object CMakeFiles/cmTC_fad22.dir/CheckFunctionExists.cxx.o -/tmp/instance-0/output-1/host/bin/mipsel-linux-g++ --sysroot=/tmp/instance-0/output-1/host/mipsel-buildroot-linux-gnu/sysroot -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -D_FORTIFY_SOURCE=1 -Wall -Wconversion -pedantic -Wextra -Wno-missing-field-initializers -DCHECK_FUNCTION_EXISTS=__atomic_load_8 -DNDEBUG -o CMakeFiles/cmTC_fad22.dir/CheckFunctionExists.cxx.o -c /tmp/instance-0/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/CMakeFiles/CheckLibraryExists/CheckFunctionExists.cxx -: error: new declaration 'char __atomic_load_8()' ambiguates built-in declaration 'long long unsigned int __atomic_load_8(const volatile void*, int)' [-fpermissive] -/tmp/instance-0/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/CMakeFiles/CheckLibraryExists/CheckFunctionExists.cxx:7:3: note: in expansion of macro 'CHECK_FUNCTION_EXISTS' - CHECK_FUNCTION_EXISTS(void); - ^~~~~~~~~~~~~~~~~~~~~ -/tmp/instance-0/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/CMakeFiles/CheckLibraryExists/CheckFunctionExists.cxx: In function 'int main(int, char**)': -/tmp/instance-0/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/CMakeFiles/CheckLibraryExists/CheckFunctionExists.cxx:17:25: error: too few arguments to function 'long long unsigned int __atomic_load_8(const volatile void*, int)' - CHECK_FUNCTION_EXISTS(); - ^ - -whereas with a C compiler, we'll get: - -Building C object CMakeFiles/cmTC_4b0f4.dir/CheckFunctionExists.c.o -/home/fabrice/buildroot/output/host/bin/riscv32-linux-gcc --sysroot=/home/fabrice/buildroot/output/host/riscv32-buildroot-linux-gnu/sysroot -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -DCHECK_FUNCTION_EXISTS=__atomic_load_8 -DNDEBUG -o CMakeFiles/cmTC_4b0f4.dir/CheckFunctionExists.c.o -c /usr/share/cmake-3.16/Modules/CheckFunctionExists.c -: warning: conflicting types for built-in function ‘__atomic_load_8’ [-Wbuiltin-declaration-mismatch] -/usr/share/cmake-3.16/Modules/CheckFunctionExists.c:7:3: note: in expansion of macro ‘CHECK_FUNCTION_EXISTS’ - CHECK_FUNCTION_EXISTS(void); - ^~~~~~~~~~~~~~~~~~~~~ -Linking C executable cmTC_4b0f4 -/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTC_4b0f4.dir/link.txt --verbose=1 -/home/fabrice/buildroot/output/host/bin/riscv32-linux-gcc --sysroot=/home/fabrice/buildroot/output/host/riscv32-buildroot-linux-gnu/sysroot -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -DCHECK_FUNCTION_EXISTS=__atomic_load_8 -DNDEBUG CMakeFiles/cmTC_4b0f4.dir/CheckFunctionExists.c.o -o cmTC_4b0f4 -latomic - -Fixes: - - http://autobuild.buildroot.org/results/2bf06c6a9e55b449ec5875cf9415a9e55b2065d6 - -Signed-off-by: Fabrice Fontaine ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index edc73c5..0286647 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -9,7 +9,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) - set(CMAKE_CXX_EXTENSIONS OFF) - - project (pistache -- LANGUAGES CXX) -+ LANGUAGES C CXX) - - include(GNUInstallDirs) - --- -2.27.0 - diff --git a/package/pistache/0001-src-common-transport.cc-fallback-value-for-RUSAGE_TH.patch b/package/pistache/0001-src-common-transport.cc-fallback-value-for-RUSAGE_TH.patch new file mode 100644 index 00000000000..327933e26de --- /dev/null +++ b/package/pistache/0001-src-common-transport.cc-fallback-value-for-RUSAGE_TH.patch @@ -0,0 +1,33 @@ +From 5feed6d2f86750bfe1e7c26d6fd4e8d2195ea81f Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Thu, 4 Aug 2022 19:54:23 +0200 +Subject: [PATCH] src/common/transport.cc: fallback value for RUSAGE_THREAD + +uClibc-ng currently does not define RUSAGE_THREAD, so let's add a +fallback value until it gets fixed in uClibc-ng. The value is the same +on all Linux systems, regardless of the CPU architecture. + +Signed-off-by: Thomas Petazzoni +Upstream bug: https://mailman.openadk.org/mailman3/hyperkitty/list/devel@uclibc-ng.org/thread/MEXOUSFSH46UFS3AEMEIEPTL5U4HVEFL/ +--- + src/common/transport.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/common/transport.cc b/src/common/transport.cc +index 62efb8c..0f3abb0 100644 +--- a/src/common/transport.cc ++++ b/src/common/transport.cc +@@ -515,6 +515,10 @@ namespace Pistache::Tcp + + rusage now; + ++#if !defined(RUSAGE_THREAD) ++#define RUSAGE_THREAD 1 ++#endif ++ + auto res = getrusage(RUSAGE_THREAD, &now); + if (res == -1) + loadRequest_.reject(std::runtime_error("Could not compute usage")); +-- +2.37.1 + diff --git a/package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch b/package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch deleted file mode 100644 index 09f59b11ec5..00000000000 --- a/package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch +++ /dev/null @@ -1,95 +0,0 @@ -From 45824f58b10575d8d88d4bce934aedee821a6df0 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 15 Oct 2020 22:26:55 +0200 -Subject: [PATCH] CMakeLists.txt: respect BUILD_SHARED_LIBS - -Don't build and install pistache_shared if the standard cmake -BUILD_SHARED_LIBS is set to OFF - -Signed-off-by: Fabrice Fontaine -[Backport from upstream: - https://github.com/oktal/pistache/commit/c04166ca9e6420a8fbc93fef4055ee2eccdcebe4 -] ---- - src/CMakeLists.txt | 43 +++++++++++++++++++++++++------------------ - 1 file changed, 25 insertions(+), 18 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 6521b20..c5b049f 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -26,31 +26,36 @@ set(include_install_dir ${CMAKE_INSTALL_INCLUDEDIR}) - set(lib_install_dir ${CMAKE_INSTALL_LIBDIR}) - set(bin_install_dir ${CMAKE_INSTALL_BINDIR}) - --add_library(pistache_shared SHARED $) --add_library(pistache_static STATIC $) -+if (BUILD_SHARED_LIBS) -+ add_library(pistache_shared SHARED $) -+ target_link_libraries(pistache_shared PRIVATE Threads::Threads ${CMAKE_REQUIRED_LIBRARIES}) -+ target_include_directories(pistache_shared INTERFACE ${PISTACHE_INCLUDE}) -+endif () - --target_link_libraries(pistache_shared PRIVATE Threads::Threads ${CMAKE_REQUIRED_LIBRARIES}) -+add_library(pistache_static STATIC $) - target_link_libraries(pistache_static PRIVATE Threads::Threads ${CMAKE_REQUIRED_LIBRARIES}) -- --target_include_directories(pistache_shared INTERFACE ${PISTACHE_INCLUDE}) - target_include_directories(pistache_static INTERFACE ${PISTACHE_INCLUDE}) - - if (PISTACHE_USE_SSL) - target_compile_definitions(pistache PUBLIC PISTACHE_USE_SSL) -- target_compile_definitions(pistache_shared PUBLIC PISTACHE_USE_SSL) - target_compile_definitions(pistache_static PUBLIC PISTACHE_USE_SSL) - - target_include_directories(pistache PRIVATE ${OPENSSL_INCLUDE_DIR}) -- target_link_libraries(pistache_shared PUBLIC OpenSSL::SSL OpenSSL::Crypto) - target_link_libraries(pistache_static PUBLIC OpenSSL::SSL OpenSSL::Crypto) -+ if (BUILD_SHARED_LIBS) -+ target_compile_definitions(pistache_shared PUBLIC PISTACHE_USE_SSL) -+ target_link_libraries(pistache_shared PUBLIC OpenSSL::SSL OpenSSL::Crypto) -+ endif () - endif () - - set(Pistache_OUTPUT_NAME "pistache") --set_target_properties(pistache_shared PROPERTIES -- OUTPUT_NAME ${Pistache_OUTPUT_NAME} -- VERSION ${version} -- SOVERSION ${VERSION_MAJOR} --) -+if (BUILD_SHARED_LIBS) -+ set_target_properties(pistache_shared PROPERTIES -+ OUTPUT_NAME ${Pistache_OUTPUT_NAME} -+ VERSION ${version} -+ SOVERSION ${VERSION_MAJOR} -+ ) -+endif () - - set_target_properties(pistache_static PROPERTIES - OUTPUT_NAME ${Pistache_OUTPUT_NAME} -@@ -60,13 +65,15 @@ if (PISTACHE_INSTALL) - set(Pistache_CONFIG_FILE "PistacheConfig.cmake") - set(Pistache_CONFIG_VERSION_FILE "PistacheConfigVersion.cmake") - -- install( -- TARGETS pistache_shared -- EXPORT PistacheTargets -- ARCHIVE DESTINATION ${lib_install_dir} -- LIBRARY DESTINATION ${lib_install_dir} -- RUNTIME DESTINATION ${bin_install_dir} -- INCLUDES DESTINATION ${include_install_dir}) -+ if (BUILD_SHARED_LIBS) -+ install( -+ TARGETS pistache_shared -+ EXPORT PistacheTargets -+ ARCHIVE DESTINATION ${lib_install_dir} -+ LIBRARY DESTINATION ${lib_install_dir} -+ RUNTIME DESTINATION ${bin_install_dir} -+ INCLUDES DESTINATION ${include_install_dir}) -+ endif() - - install( - DIRECTORY "${PROJECT_SOURCE_DIR}/include/pistache" --- -2.28.0 - diff --git a/package/pistache/0002-src-server-listener.cc-fix-libressl-build.patch b/package/pistache/0002-src-server-listener.cc-fix-libressl-build.patch new file mode 100644 index 00000000000..f2fe2183ae6 --- /dev/null +++ b/package/pistache/0002-src-server-listener.cc-fix-libressl-build.patch @@ -0,0 +1,38 @@ +From 656bff21c1d20b25058da9dbc27d28ad2ac7ae6e Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 25 Feb 2023 18:09:39 +0100 +Subject: [PATCH] src/server/listener.cc: fix libressl build + +Fix the following libressl build failure: + +../src/server/listener.cc: In member function 'void Pistache::Tcp::Listener::setupSSLAuth(const std::string&, const std::string&, int (*)(int, void*))': +../src/server/listener.cc:582:29: error: 'SSL_verify_cb' was not declared in this scope; did you mean 'RSA_verify'? + 582 | (SSL_verify_cb)cb + | ^~~~~~~~~~~~~ + | RSA_verify + +Fixes: + - http://autobuild.buildroot.org/results/066fc078980e5216f38411eee455088e15fa1101 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/pistacheio/pistache/pull/1124] +--- + src/server/listener.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/server/listener.cc b/src/server/listener.cc +index 38d2661..c09cb36 100644 +--- a/src/server/listener.cc ++++ b/src/server/listener.cc +@@ -609,7 +609,7 @@ namespace Pistache::Tcp + SSL_CTX_set_verify(GetSSLContext(ssl_ctx_), + SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT | SSL_VERIFY_CLIENT_ONCE, + /* Callback type did change in 1.0.1 */ +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + (int (*)(int, X509_STORE_CTX*))cb + #else + (SSL_verify_cb)cb +-- +2.39.1 + diff --git a/package/pistache/0003-include-pistache-typeid.h-include-cstddef.patch b/package/pistache/0003-include-pistache-typeid.h-include-cstddef.patch deleted file mode 100644 index be06ca760a2..00000000000 --- a/package/pistache/0003-include-pistache-typeid.h-include-cstddef.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 37291201ed948e9d65993a717c59bb14f4187e13 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 5 Aug 2021 19:02:56 +0200 -Subject: [PATCH] include/pistache/typeid.h: include cstddef - -Include cstddef to avoid the following build failure with gcc 11: - -In file included from /tmp/instance-3/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/src/../include/pistache/async.h:10, - from /tmp/instance-3/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/src/../include/pistache/client.h:9, - from /tmp/instance-3/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/src/client/client.cc:7: -/tmp/instance-3/output-1/build/pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d/src/../include/pistache/typeid.h:26:12: error: expected type-specifier before 'size_t' - 26 | operator size_t() const { return reinterpret_cast(id_); } - | ^~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/2443559df8c2357476e4cbdbebb08280cbb80a3b - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/pistacheio/pistache/pull/965] ---- - include/pistache/typeid.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/pistache/typeid.h b/include/pistache/typeid.h -index 10353ca..893e7c1 100644 ---- a/include/pistache/typeid.h -+++ b/include/pistache/typeid.h -@@ -7,6 +7,7 @@ - - #pragma once - -+#include - #include - - namespace Pistache --- -2.30.2 - diff --git a/package/pistache/Config.in b/package/pistache/Config.in index 96aed5210aa..3acf1f53f09 100644 --- a/package/pistache/Config.in +++ b/package/pistache/Config.in @@ -1,22 +1,21 @@ config BR2_PACKAGE_PISTACHE bool "pistache" - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17, std::optional depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP - depends on !BR2_TOOLCHAIN_USES_UCLIBC depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 + select BR2_PACKAGE_RAPIDJSON help Pistache is a modern and elegant HTTP and REST framework - for C++. It is entirely written in pure C++14 and provides + for C++. It is entirely written in pure C++17 and provides a clear and pleasant API. https://github.com/oktal/pistache -comment "pistache needs a glibc toolchain w/ C++, gcc >= 4.9, threads, wchar, not binutils bug 27597" +comment "pistache needs a toolchain w/ C++, gcc >= 7, threads, wchar, not binutils bug 27597" depends on !BR2_INSTALL_LIBSTDCPP || \ - BR2_TOOLCHAIN_USES_UCLIBC || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_USE_WCHAR || \ BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 diff --git a/package/pistache/pistache.hash b/package/pistache/pistache.hash index 5079387eb7f..9a2cd1d1f9b 100644 --- a/package/pistache/pistache.hash +++ b/package/pistache/pistache.hash @@ -1,3 +1,3 @@ #locally computed -sha256 70aeef5f5a4603cb2ceb20a284e3239f5da520e68f39dcb572c9f21473ac0b6d pistache-f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d.tar.gz +sha256 f2b3e8b2581cfed5e036d1b97a9b97dc7022b3ddaab69c4691238faff3199bc1 pistache-3ec9d7c4f8b828fdd391550fff81b01e72dd6269.tar.gz sha256 c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08 LICENSE diff --git a/package/pistache/pistache.mk b/package/pistache/pistache.mk index 4d6bd283ea8..f4de5e3b2a7 100644 --- a/package/pistache/pistache.mk +++ b/package/pistache/pistache.mk @@ -4,18 +4,20 @@ # ################################################################################ -PISTACHE_VERSION = f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d +PISTACHE_VERSION = 3ec9d7c4f8b828fdd391550fff81b01e72dd6269 PISTACHE_SITE = $(call github,oktal,pistache,$(PISTACHE_VERSION)) PISTACHE_LICENSE = Apache-2.0 PISTACHE_LICENSE_FILES = LICENSE PISTACHE_INSTALL_STAGING = YES +PISTACHE_DEPENDENCIES = rapidjson ifeq ($(BR2_PACKAGE_OPENSSL),y) PISTACHE_DEPENDENCIES += openssl -PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=ON +PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=true +PISTACHE_CONF_OPTS += -DPISTACHE_ENABLE_NETWORK_TESTS=false else -PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=OFF +PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=false endif -$(eval $(cmake-package)) +$(eval $(meson-package)) diff --git a/package/pixiewps/pixiewps.hash b/package/pixiewps/pixiewps.hash index bb566303882..99a09741a3d 100644 --- a/package/pixiewps/pixiewps.hash +++ b/package/pixiewps/pixiewps.hash @@ -1,3 +1,3 @@ # locally computed -sha256 d3d3cf57851e3e734fb1797aa078239ef161d1cbeffc4438497d58a425ef22a2 pixiewps-9e5bdc6c86c8487b2a6107d5ab3559ed5c738c59.tar.gz -sha256 ccb349b4132ed7737f25e5adebfe61f3d52dca33708df1e50352320438d1d4c2 LICENSE.md +sha256 d3d3cf57851e3e734fb1797aa078239ef161d1cbeffc4438497d58a425ef22a2 pixiewps-9e5bdc6c86c8487b2a6107d5ab3559ed5c738c59.tar.gz +sha256 ccb349b4132ed7737f25e5adebfe61f3d52dca33708df1e50352320438d1d4c2 LICENSE.md diff --git a/package/pixman/pixman.hash b/package/pixman/pixman.hash index 1af632a9f4e..78407bf0480 100644 --- a/package/pixman/pixman.hash +++ b/package/pixman/pixman.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2020-April/003043.html -sha256 da8ed9fe2d1c5ef8ce5d1207992db959226bd4e37e3f88acf908fd9a71e2704e pixman-0.40.0.tar.xz -sha512 8a60edb113d68791b41bd90b761ff7b3934260cb3dada3234c9351416f61394e4157353bc4d61b8f6c2c619de470f6feefffb4935bfcf79d291ece6285de7270 pixman-0.40.0.tar.xz +# 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 # Locally computed sha256 fac9270f0987b96ff4533fca3548c633e02083cbba4a0172a3b149b2e4019793 COPYING diff --git a/package/pixman/pixman.mk b/package/pixman/pixman.mk index 6fab5395936..37eb974c46c 100644 --- a/package/pixman/pixman.mk +++ b/package/pixman/pixman.mk @@ -4,7 +4,7 @@ # ################################################################################ -PIXMAN_VERSION = 0.40.0 +PIXMAN_VERSION = 0.42.2 PIXMAN_SOURCE = pixman-$(PIXMAN_VERSION).tar.xz PIXMAN_SITE = https://xorg.freedesktop.org/releases/individual/lib PIXMAN_LICENSE = MIT @@ -19,7 +19,17 @@ HOST_PIXMAN_DEPENDENCIES = host-pkgconf PIXMAN_AUTORECONF = YES # don't build gtk based demos -PIXMAN_CONF_OPTS = --disable-gtk +PIXMAN_CONF_OPTS = \ + --disable-gtk \ + --disable-loongson-mmi \ + --disable-arm-iwmmxt + +# Affects only tests, and we don't build tests (see +# 0001-Disable-tests.patch). See +# https://gitlab.freedesktop.org/pixman/pixman/-/issues/76, which says +# "not sure why NVD keeps assigning CVEs like this. This is just a +# test executable". +PIXMAN_IGNORE_CVES += CVE-2023-37769 # 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 @@ -38,12 +48,6 @@ else PIXMAN_CONF_OPTS += --disable-arm-neon endif -# disable iwmmxt support for CPU's that don't have -# this feature -ifneq ($(BR2_iwmmxt),y) -PIXMAN_CONF_OPTS += --disable-arm-iwmmxt -endif - PIXMAN_CFLAGS = $(TARGET_CFLAGS) # toolchain gets confused about TLS access through GOT (PIC), so disable TLS diff --git a/package/pkcs11-helper/0001-openssl-libressl-3-5-0-does-not-have-DSA_meth_set1_name.patch b/package/pkcs11-helper/0001-openssl-libressl-3-5-0-does-not-have-DSA_meth_set1_name.patch new file mode 100644 index 00000000000..21ce66ae793 --- /dev/null +++ b/package/pkcs11-helper/0001-openssl-libressl-3-5-0-does-not-have-DSA_meth_set1_name.patch @@ -0,0 +1,69 @@ +From 17d10b0dfb2b56a047db307687640adcd560e199 Mon Sep 17 00:00:00 2001 +From: Alon Bar-Lev +Date: Mon, 2 May 2022 21:26:58 +0300 +Subject: [PATCH] openssl: libressl-3.5.0 does not have DSA_meth_set1_name + +while it does not expose the DSA_METHOD structure. + +[Retrieved (and updated to remove ChangeLog update) from: +https://github.com/OpenSC/pkcs11-helper/commit/17d10b0dfb2b56a047db307687640adcd560e199] +Signed-off-by: Fabrice Fontaine +--- + ChangeLog | 1 + + configure.ac | 16 ++++++++++++++++ + lib/pkcs11h-openssl.c | 4 ++++ + 3 files changed, 21 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 716bb8d8..57697a3b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -300,7 +300,9 @@ if test "${have_openssl}" = "no"; then + fi + + if test "${have_openssl}" = "yes"; then ++ old_CFLAGS="${CFLAGS}" + old_LIBS="${LIBS}" ++ CFLAGS="${CFLAGS} ${OPENSSL_CFLAGS}" + LIBS="${LIBS} ${OPENSSL_LIBS}" + AC_CHECK_FUNCS([ \ + RSA_meth_dup RSA_meth_free \ +@@ -344,6 +346,20 @@ if test "${have_openssl}" = "yes"; then + ) + AC_MSG_CHECKING([for OpenSSL ec support]) + AC_MSG_RESULT([${openssl_ec}]) ++ # https://github.com/OpenSC/pkcs11-helper/pull/55 ++ AC_COMPILE_IFELSE( ++ [AC_LANG_PROGRAM( ++ [[#include ]], ++ [[ ++ int foo() { ++ DSA_METHOD *meth = NULL; ++ sizeof(meth->name); ++ } ++ ]] ++ )], ++ [AC_DEFINE([HAVE_DSA_METHOD_NAME], [1], [Have DSA_METHOD->name])] ++ ) ++ CFLAGS="${old_CFLAGS}" + LIBS="${old_LIBS}" + fi + +diff --git a/lib/pkcs11h-openssl.c b/lib/pkcs11h-openssl.c +index 961c955c..38ee8e2d 100644 +--- a/lib/pkcs11h-openssl.c ++++ b/lib/pkcs11h-openssl.c +@@ -235,9 +235,13 @@ DSA_meth_free (DSA_METHOD *meth) + static int + DSA_meth_set1_name (DSA_METHOD *meth, const char *name) + { ++#ifdef HAVE_DSA_METHOD_NAME + CK_RV rv; + rv = _pkcs11h_mem_strdup ((void *)&meth->name, name); + return rv == CKR_OK ? 1 : 0; ++#else ++ return 0; ++#endif + } + #endif + diff --git a/package/pkcs11-helper/pkcs11-helper.hash b/package/pkcs11-helper/pkcs11-helper.hash index 4114378ab8f..0614e8aed47 100644 --- a/package/pkcs11-helper/pkcs11-helper.hash +++ b/package/pkcs11-helper/pkcs11-helper.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 5bd55adafdbb708e096070dd0a910f23e1d5fd6291922398c1a15f00fff2b5ec pkcs11-helper-1.28.0.tar.bz2 +sha256 996846a3c8395e03d8c0515111dc84d82e6e3648d44ba28cb2dbbbca2d4db7d6 pkcs11-helper-1.29.0.tar.bz2 sha256 808705ac1daafe07a76431929575c5712a8693977a39ec9102aed25f030754d9 COPYING sha256 865496cf23a6c792739ff2f9ea11e95ac99db89cfe3780a295b4e1495a9c19fe COPYING.BSD sha256 cd2e7d63a11058f19c58b06fb8c759140ce70788369dce6e6e9db40d3475021e COPYING.GPL diff --git a/package/pkcs11-helper/pkcs11-helper.mk b/package/pkcs11-helper/pkcs11-helper.mk index 4fc3e21e5a8..d1a1e38d4e8 100644 --- a/package/pkcs11-helper/pkcs11-helper.mk +++ b/package/pkcs11-helper/pkcs11-helper.mk @@ -4,13 +4,15 @@ # ################################################################################ -PKCS11_HELPER_VERSION = 1.28 -PKCS11_HELPER_SOURCE = pkcs11-helper-$(PKCS11_HELPER_VERSION).0.tar.bz2 +PKCS11_HELPER_VERSION = 1.29.0 +PKCS11_HELPER_SOURCE = pkcs11-helper-$(PKCS11_HELPER_VERSION).tar.bz2 PKCS11_HELPER_SITE = https://github.com/OpenSC/pkcs11-helper/releases/download/pkcs11-helper-$(PKCS11_HELPER_VERSION) PKCS11_HELPER_LICENSE = GPL-2.0 or BSD-3-Clause PKCS11_HELPER_LICENSE_FILES = COPYING COPYING.BSD COPYING.GPL PKCS11_HELPER_DEPENDENCIES = host-pkgconf PKCS11_HELPER_INSTALL_STAGING = YES +# We're patching configure.ac +PKCS11_HELPER_AUTORECONF = YES PKCS11_HELPER_CONF_OPTS = \ --disable-crypto-engine-polarssl \ diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index f7e3f395039..264bf5a1aeb 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -20,8 +20,10 @@ # ################################################################################ +BR_CARGO_HOME = $(DL_DIR)/br-cargo-home + PKG_COMMON_CARGO_ENV = \ - CARGO_HOME=$(HOST_DIR)/share/cargo + CARGO_HOME=$(BR_CARGO_HOME) # __CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS is needed to allow # passing the -Z target-applies-to-host, which is needed together with @@ -32,7 +34,10 @@ PKG_COMMON_CARGO_ENV = \ # using nighly features on stable releases, i.e features that are not # yet considered stable. # -# CARGO_UNSTABLE_TARGET_APPLIES_TO_HOST="true" "enables the nightly +# CARGO_UNSTABLE_HOST_CONFIG="true" enables the host specific +# configuration feature +# +# CARGO_UNSTABLE_TARGET_APPLIES_TO_HOST="true" enables the nightly # configuration option target-applies-to-host value to be set # # CARGO_TARGET_APPLIES_TO_HOST="false" is actually setting the value @@ -41,9 +46,11 @@ PKG_COMMON_CARGO_ENV = \ PKG_CARGO_ENV = \ $(PKG_COMMON_CARGO_ENV) \ __CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS="nightly" \ + CARGO_UNSTABLE_HOST_CONFIG="true" \ CARGO_UNSTABLE_TARGET_APPLIES_TO_HOST="true" \ CARGO_TARGET_APPLIES_TO_HOST="false" \ CARGO_BUILD_TARGET="$(RUSTC_TARGET_NAME)" \ + CARGO_HOST_RUSTFLAGS="$(addprefix -C link-args=,$(HOST_LDFLAGS))" \ CARGO_TARGET_$(call UPPERCASE,$(RUSTC_TARGET_NAME))_LINKER=$(notdir $(TARGET_CROSS))gcc # @@ -51,11 +58,13 @@ PKG_CARGO_ENV = \ # and should be removed when fixed upstream # ifeq ($(NORMALIZED_ARCH),arm) - PKG_CARGO_ENV += RUSTFLAGS="-Clink-arg=-Wl,--allow-multiple-definition" + PKG_CARGO_ENV += \ + CARGO_TARGET_$(call UPPERCASE,$(RUSTC_TARGET_NAME))_RUSTFLAGS="-Clink-arg=-Wl,--allow-multiple-definition" endif HOST_PKG_CARGO_ENV = \ - $(PKG_COMMON_CARGO_ENV) + $(PKG_COMMON_CARGO_ENV) \ + RUSTFLAGS="$(addprefix -C link-args=,$(HOST_LDFLAGS))" ################################################################################ # inner-cargo-package -- defines how the configuration, compilation and @@ -79,7 +88,7 @@ $(2)_DOWNLOAD_DEPENDENCIES += host-rustc $(2)_DEPENDENCIES += host-rustc $(2)_DOWNLOAD_POST_PROCESS = cargo -$(2)_DL_ENV += CARGO_HOME=$$(HOST_DIR)/share/cargo +$(2)_DL_ENV += CARGO_HOME=$$(BR_CARGO_HOME) # If building in a sub directory, use that to find the Cargo.toml ifneq ($$($(2)_SUBDIR),) @@ -128,7 +137,6 @@ else # ifeq ($(4),target) define $(2)_BUILD_CMDS cd $$($$(PKG)_SRCDIR) && \ $$(HOST_MAKE_ENV) \ - RUSTFLAGS="$$(addprefix -C link-args=,$$(HOST_LDFLAGS))" \ $$(HOST_CONFIGURE_OPTS) \ $$(HOST_PKG_CARGO_ENV) \ $$($(2)_CARGO_ENV) \ @@ -169,7 +177,6 @@ ifndef $(2)_INSTALL_CMDS define $(2)_INSTALL_CMDS cd $$($$(PKG)_SRCDIR) && \ $$(HOST_MAKE_ENV) \ - RUSTFLAGS="$$(addprefix -C link-args=,$$(HOST_LDFLAGS))" \ $$(HOST_CONFIGURE_OPTS) \ $$(HOST_PKG_CARGO_ENV) \ $$($(2)_CARGO_ENV) \ diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk index 3b1db35fb60..8c375779cb6 100644 --- a/package/pkg-cmake.mk +++ b/package/pkg-cmake.mk @@ -88,8 +88,10 @@ define $(2)_CONFIGURE_CMDS rm -f CMakeCache.txt && \ PATH=$$(BR_PATH) \ $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ + -G"Unix Makefiles" \ -DCMAKE_TOOLCHAIN_FILE="$$(HOST_DIR)/share/buildroot/toolchainfile.cmake" \ -DCMAKE_INSTALL_PREFIX="/usr" \ + -DCMAKE_INSTALL_RUNSTATEDIR="/run" \ -DCMAKE_COLOR_MAKEFILE=OFF \ -DBUILD_DOC=OFF \ -DBUILD_DOCS=OFF \ @@ -117,6 +119,7 @@ define $(2)_CONFIGURE_CMDS PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \ $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ + -G"Unix Makefiles" \ -DCMAKE_INSTALL_SO_NO_EXE=0 \ -DCMAKE_FIND_ROOT_PATH="$$(HOST_DIR)" \ -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM="BOTH" \ diff --git a/package/pkg-download.mk b/package/pkg-download.mk index a15e21e110e..0718f21aad2 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -103,6 +103,7 @@ endif # # Argument 1 is the source location # Argument 2 is the upper-case package name +# Argument 3 is a space-separated list of optional arguments # ################################################################################ @@ -118,10 +119,10 @@ define DOWNLOAD -n '$($(2)_BASENAME_RAW)' \ -N '$($(2)_RAWNAME)' \ -o '$($(2)_DL_DIR)/$(notdir $(1))' \ - $(if $($(2)_DOWNLOAD_POST_PROCESS),-p '$($(2)_DOWNLOAD_POST_PROCESS)') \ $(if $($(2)_GIT_SUBMODULES),-r) \ $(if $($(2)_GIT_LFS),-l) \ $(foreach uri,$(call DOWNLOAD_URIS,$(1),$(2)),-u $(uri)) \ + $(3) \ $(QUIET) \ -- \ $($(2)_DL_OPTS) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index b3a7e1d60e3..82187d7db9d 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -192,7 +192,8 @@ $(BUILD_DIR)/%/.stamp_downloaded: break ; \ fi ; \ done - $(foreach p,$($(PKG)_ALL_DOWNLOADS),$(call DOWNLOAD,$(p),$(PKG))$(sep)) + $(if $($(PKG)_MAIN_DOWNLOAD),$(call DOWNLOAD,$($(PKG)_MAIN_DOWNLOAD),$(PKG),$(patsubst %,-p '%',$($(PKG)_DOWNLOAD_POST_PROCESS)))) + $(foreach p,$($(PKG)_ADDITIONAL_DOWNLOADS),$(call DOWNLOAD,$(p),$(PKG))$(sep)) $(foreach hook,$($(PKG)_POST_DOWNLOAD_HOOKS),$(call $(hook))$(sep)) $(Q)mkdir -p $(@D) @$(call step_end,download) @@ -540,6 +541,30 @@ ifndef $(2)_SUBDIR endif endif +ifndef $(2)_DL_SUBDIR + ifdef $(3)_DL_SUBDIR + $(2)_DL_SUBDIR = $$($(3)_DL_SUBDIR) + endif +endif + +ifndef $(2)_DOWNLOAD_DEPENDENCIES + ifdef $(3)_DOWNLOAD_DEPENDENCIES + $(2)_DOWNLOAD_DEPENDENCIES = $$(filter-out $(1),$$($(3)_DOWNLOAD_DEPENDENCIES)) + endif +endif + +ifndef $(2)_DL_ENV + ifdef $(3)_DL_ENV + $(2)_DL_ENV = $$($(3)_DL_ENV) + endif +endif + +ifndef $(2)_DOWNLOAD_POST_PROCESS + ifdef $(3)_DOWNLOAD_POST_PROCESS + $(2)_DOWNLOAD_POST_PROCESS = $$($(3)_DOWNLOAD_POST_PROCESS) + endif +endif + ifndef $(2)_STRIP_COMPONENTS ifdef $(3)_STRIP_COMPONENTS $(2)_STRIP_COMPONENTS = $$($(3)_STRIP_COMPONENTS) @@ -577,12 +602,16 @@ ifndef $(2)_PATCH endif endif -$(2)_ALL_DOWNLOADS = \ - $$(if $$($(2)_SOURCE),$$($(2)_SITE_METHOD)+$$($(2)_SITE)/$$($(2)_SOURCE)) \ +$(2)_MAIN_DOWNLOAD = \ + $$(if $$($(2)_SOURCE),$$($(2)_SITE_METHOD)+$$($(2)_SITE)/$$($(2)_SOURCE)) + +$(2)_ADDITIONAL_DOWNLOADS = \ $$(foreach p,$$($(2)_PATCH) $$($(2)_EXTRA_DOWNLOADS),\ $$(if $$(findstring ://,$$(p)),$$(p),\ $$($(2)_SITE_METHOD)+$$($(2)_SITE)/$$(p))) +$(2)_ALL_DOWNLOADS = $$($(2)_MAIN_DOWNLOAD) $$($(2)_ADDITIONAL_DOWNLOADS) + ifndef $(2)_SITE ifdef $(3)_SITE $(2)_SITE = $$($(3)_SITE) @@ -763,7 +792,7 @@ $(2)_EXTRACT_DEPENDENCIES += \ endif ifeq ($$(BR2_CCACHE),y) -ifeq ($$(filter host-tar host-skeleton host-xz host-lzip host-fakedate host-ccache,$(1)),) +ifeq ($$(filter host-tar host-skeleton host-xz host-lzip host-fakedate host-ccache host-hiredis host-pkgconf host-zstd,$(1)),) $(2)_DEPENDENCIES += host-ccache endif endif @@ -1064,15 +1093,15 @@ $$($(2)_TARGET_DIRCLEAN): PKG=$(2) $$($(2)_TARGET_DIRCLEAN): NAME=$(1) # Compute the name of the Kconfig option that correspond to the -# package being enabled. We handle three cases: the special Linux -# kernel case, the bootloaders case, and the normal packages case. -# Virtual packages are handled separately (see below). +# package being enabled. ifeq ($(1),linux) $(2)_KCONFIG_VAR = BR2_LINUX_KERNEL else ifneq ($$(filter boot/% $$(foreach dir,$$(BR2_EXTERNAL_DIRS),$$(dir)/boot/%),$(pkgdir)),) $(2)_KCONFIG_VAR = BR2_TARGET_$(2) else ifneq ($$(filter toolchain/% $$(foreach dir,$$(BR2_EXTERNAL_DIRS),$$(dir)/toolchain/%),$(pkgdir)),) $(2)_KCONFIG_VAR = BR2_$(2) +else ifeq ($$($(2)_IS_VIRTUAL),YES) +$(2)_KCONFIG_VAR = BR2_PACKAGE_HAS_$(2) else $(2)_KCONFIG_VAR = BR2_PACKAGE_$(2) endif @@ -1116,6 +1145,7 @@ else $(Q)$$(foreach F,$$($(2)_LICENSE_FILES),$$(call legal-license-file,$$($(2)_RAWNAME),$$($(2)_BASENAME_RAW),$$($(2)_HASH_FILE),$$(F),$$($(2)_DIR)/$$(F),$$(call UPPERCASE,$(4)))$$(sep)) endif # license files +ifeq ($$($(2)_REDISTRIBUTE),YES) ifeq ($$($(2)_SITE_METHOD),local) # Packages without a tarball: don't save and warn @$$(call legal-warning-nosource,$$($(2)_RAWNAME),local) @@ -1126,7 +1156,6 @@ else ifneq ($$($(2)_OVERRIDE_SRCDIR),) else # Other packages -ifeq ($$($(2)_REDISTRIBUTE),YES) # Save the source tarball and any extra downloads, but not # patches, as they are handled specially afterwards. $$(foreach e,$$($(2)_ACTUAL_SOURCE_TARBALL) $$(notdir $$($(2)_EXTRA_DOWNLOADS)),\ @@ -1140,9 +1169,9 @@ ifeq ($$($(2)_REDISTRIBUTE),YES) $$($(2)_REDIST_SOURCES_DIR) || exit 1; \ printf "%s\n" "$$$${f##*/}" >>$$($(2)_REDIST_SOURCES_DIR)/series || exit 1; \ done <$$($(2)_DIR)/.applied_patches_list -endif # redistribute - 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))) endif # ifneq ($$(call qstrip,$$($(2)_SOURCE)),) $$(foreach hook,$$($(2)_POST_LEGAL_INFO_HOOKS),$$(call $$(hook))$$(sep)) @@ -1153,10 +1182,12 @@ ifeq ($$($$($(2)_KCONFIG_VAR)),y) # Ensure the calling package is the declared provider for all the virtual # packages it claims to be an implementation of. +ifeq ($(BR_BUILDING),y) ifneq ($$($(2)_PROVIDES),) $$(foreach pkg,$$($(2)_PROVIDES),\ $$(eval $$(call virt-provides-single,$$(pkg),$$(call UPPERCASE,$$(pkg)),$(1))$$(sep))) endif +endif # Register package as a reverse-dependencies of all its dependencies $$(eval $$(foreach p,$$($(2)_FINAL_ALL_DEPENDENCIES),\ @@ -1219,6 +1250,13 @@ else ifeq ($$($(2)_SITE_METHOD),cvs) DL_TOOLS_DEPENDENCIES += cvs endif # SITE_METHOD +# cargo/go vendoring (may) need git +ifeq ($$($(2)_DOWNLOAD_POST_PROCESS),cargo) +DL_TOOLS_DEPENDENCIES += git +else ifeq ($$($(2)_DOWNLOAD_POST_PROCESS),go) +DL_TOOLS_DEPENDENCIES += git +endif + DL_TOOLS_DEPENDENCIES += $$(call extractor-system-dependency,$$($(2)_SOURCE)) # Ensure all virtual targets are PHONY. Listed alphabetically. @@ -1268,22 +1306,6 @@ ifneq ($$($(2)_HELP_CMDS),) HELP_PACKAGES += $(2) endif -# Virtual packages are not built but it's useful to allow them to have -# permission/device/user tables and target-finalize/rootfs-pre-cmd hooks. -else ifeq ($$(BR2_PACKAGE_HAS_$(2)),y) # $(2)_KCONFIG_VAR - -ifneq ($$($(2)_PERMISSIONS),) -PACKAGES_PERMISSIONS_TABLE += $$($(2)_PERMISSIONS)$$(sep) -endif -ifneq ($$($(2)_DEVICES),) -PACKAGES_DEVICES_TABLE += $$($(2)_DEVICES)$$(sep) -endif -ifneq ($$($(2)_USERS),) -PACKAGES_USERS += $$($(2)_USERS)$$(sep) -endif -TARGET_FINALIZE_HOOKS += $$($(2)_TARGET_FINALIZE_HOOKS) -ROOTFS_PRE_CMD_HOOKS += $$($(2)_ROOTFS_PRE_CMD_HOOKS) - endif # $(2)_KCONFIG_VAR endef # inner-generic-package diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk index 0b3dc3d32fe..7ba82284f3e 100644 --- a/package/pkg-golang.mk +++ b/package/pkg-golang.mk @@ -45,7 +45,8 @@ $(2)_BUILD_OPTS += \ -modcacherw \ -tags "$$($(2)_TAGS)" \ -trimpath \ - -p $$(PARALLEL_JOBS) + -p $$(PARALLEL_JOBS) \ + -buildvcs=false # Target packages need the Go compiler on the host at download time (for # vendoring), and at build and install time. @@ -87,7 +88,8 @@ $(2)_POST_PATCH_HOOKS += $(2)_GEN_GOMOD $(2)_DOWNLOAD_POST_PROCESS = go $(2)_DL_ENV += \ $$(HOST_GO_COMMON_ENV) \ - GOPROXY=direct + GOPROXY=direct \ + $$($(2)_GO_ENV) # Due to vendoring, it is pretty likely that not all licenses are # listed in _LICENSE. @@ -100,6 +102,7 @@ ifeq ($(4),target) ifeq ($(BR2_STATIC_LIBS),y) $(2)_LDFLAGS += -extldflags '-static' +$(2)_TAGS += osusergo netgo endif # Build package for target diff --git a/package/pkg-kconfig.mk b/package/pkg-kconfig.mk index 32dcfea0bc8..f4f35bf96ab 100644 --- a/package/pkg-kconfig.mk +++ b/package/pkg-kconfig.mk @@ -45,11 +45,16 @@ endef # only, as this can fail in complex cases. # $(1): the name of the package in upper-case letters define kconfig-package-regen-dot-config - $(if $(filter olddefconfig,$($(1)_KCONFIG_RULES)), - $(Q)$($(1)_KCONFIG_MAKE) olddefconfig, - $(if $(filter oldnoconfig,$($(1)_KCONFIG_RULES)), - $(Q)$($(1)_KCONFIG_MAKE) oldnoconfig, - $(Q)(yes "" | $($(1)_KCONFIG_MAKE) oldconfig))) + $(Q)[ -e $($(1)_DIR)/.br_regen_dot_config ] || \ + $($(1)_KCONFIG_MAKE) -pn config 2>/dev/null \ + | sed 's/^\([_0-9a-zA-Z]*config\):.*/\1/ p; d' >$($(1)_DIR)/.br_regen_dot_config + $(Q)if grep -q '\bolddefconfig\b' $($(1)_DIR)/.br_regen_dot_config; then \ + $($(1)_KCONFIG_MAKE) olddefconfig; \ + elif grep -q '\boldnoconfig\b' $($(1)_DIR)/.br_regen_dot_config; then \ + $($(1)_KCONFIG_MAKE) oldnoconfig; \ + else \ + yes "" | $($(1)_KCONFIG_MAKE) oldconfig; \ + fi endef # Macro to create a .config file where all given fragments are merged into. @@ -147,19 +152,6 @@ $(2)_KCONFIG_MAKE = \ $$($(2)_MAKE_ENV) $$($(2)_MAKE) -C $$($(2)_DIR) \ $$(PKG_KCONFIG_COMMON_OPTS) $$($(2)_KCONFIG_OPTS) -# $(2)_KCONFIG_MAKE may already rely on shell expansion. As the $() syntax -# of the shell conflicts with Make's own syntax, this means that backticks -# are used with those shell constructs. Unfortunately, the backtick syntax -# does not nest, and we need to use Make instead of the shell to handle -# conditions. - -# A recursively expanded variable is necessary, to be sure that the shell -# command is called when the rule is processed during the build and not -# when the rule is created when parsing all packages. -$(2)_KCONFIG_RULES = \ - $$(shell $$($(2)_KCONFIG_MAKE) -pn config 2>/dev/null | \ - sed 's/^\([_0-9a-zA-Z]*config\):.*/\1/ p; d') - # The specified source configuration file and any additional configuration file # fragments are merged together to .config, after the package has been patched. # Since the file could be a defconfig file it needs to be expanded to a diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk index 85de98e03a6..4aa6e44afa1 100644 --- a/package/pkg-meson.mk +++ b/package/pkg-meson.mk @@ -27,7 +27,7 @@ # MESON = PYTHONNOUSERSITE=y $(HOST_DIR)/bin/meson NINJA = PYTHONNOUSERSITE=y $(HOST_DIR)/bin/ninja -NINJA_OPTS = $(if $(VERBOSE),-v) -j$(PARALLEL_JOBS) +NINJA_OPTS = $(if $(VERBOSE),-v) # https://mesonbuild.com/Reference-tables.html#cpu-families ifeq ($(BR2_arcle)$(BR2_arceb),y) @@ -50,8 +50,12 @@ else ifeq ($(BR2_powerpc),y) PKG_MESON_TARGET_CPU_FAMILY = ppc else ifeq ($(BR2_powerpc64)$(BR2_powerpc64le),y) PKG_MESON_TARGET_CPU_FAMILY = ppc64 -else ifeq ($(BR2_riscv),y) +else ifeq ($(BR2_riscv)$(BR2_RISCV_32),yy) +PKG_MESON_TARGET_CPU_FAMILY = riscv32 +else ifeq ($(BR2_riscv)$(BR2_RISCV_64),yy) PKG_MESON_TARGET_CPU_FAMILY = riscv64 +else ifeq ($(BR2_s390x),y) +PKG_MESON_TARGET_CPU_FAMILY = s390x else ifeq ($(BR2_sh4)$(BR2_sh4eb)$(BR2_sh4a)$(BR2_sh4aeb),y) PKG_MESON_TARGET_CPU_FAMILY = sh4 else ifeq ($(BR2_sparc),y) @@ -64,22 +68,40 @@ else PKG_MESON_TARGET_CPU_FAMILY = $(ARCH) endif +# To avoid populating the cross-file with non existing compilers, +# we tie them to /bin/false +ifeq ($(BR2_INSTALL_LIBSTDCPP),y) +PKG_MESON_TARGET_CXX = $(TARGET_CXX) +else +PKG_MESON_TARGET_CXX = /bin/false +endif + +ifeq ($(BR2_TOOLCHAIN_HAS_FORTRAN),y) +PKG_MESON_TARGET_FC = $(TARGET_FC) +else +PKG_MESON_TARGET_FC = /bin/false +endif + # Generates sed patterns for patching the cross-compilation.conf template, # since Flags might contain commas the arguments are passed indirectly by # variable name (stripped to deal with whitespaces). -# Arguments are variable containing cflags, cxxflags, ldflags. +# Arguments are variable containing cflags, cxxflags, ldflags, fcflags define PKG_MESON_CROSSCONFIG_SED -e "s%@TARGET_CC@%$(TARGET_CC)%g" \ - -e "s%@TARGET_CXX@%$(TARGET_CXX)%g" \ + -e "s%@TARGET_CXX@%$(PKG_MESON_TARGET_CXX)%g" \ -e "s%@TARGET_AR@%$(TARGET_AR)%g" \ + -e "s%@TARGET_FC@%$(PKG_MESON_TARGET_FC)%g" \ -e "s%@TARGET_STRIP@%$(TARGET_STRIP)%g" \ -e "s%@TARGET_ARCH@%$(PKG_MESON_TARGET_CPU_FAMILY)%g" \ -e "s%@TARGET_CPU@%$(GCC_TARGET_CPU)%g" \ -e "s%@TARGET_ENDIAN@%$(call qstrip,$(call LOWERCASE,$(BR2_ENDIAN)))%g" \ + -e "s%@TARGET_FCFLAGS@%$(call make-sq-comma-list,$($(strip $(4))))%g" \ -e "s%@TARGET_CFLAGS@%$(call make-sq-comma-list,$($(strip $(1))))%g" \ -e "s%@TARGET_LDFLAGS@%$(call make-sq-comma-list,$($(strip $(3))))%g" \ -e "s%@TARGET_CXXFLAGS@%$(call make-sq-comma-list,$($(strip $(2))))%g" \ + -e "s%@BR2_CMAKE@%$(BR2_CMAKE)%g" \ -e "s%@PKGCONF_HOST_BINARY@%$(HOST_DIR)/bin/pkgconf%g" \ + -e "s%@HOST_DIR@%$(HOST_DIR)%g" \ -e "s%@STAGING_DIR@%$(STAGING_DIR)%g" \ -e "s%@STATIC@%$(if $(BR2_STATIC_LIBS),true,false)%g" \ $(TOPDIR)/support/misc/cross-compilation.conf.in @@ -121,13 +143,13 @@ define $(2)_CONFIGURE_CMDS mkdir -p $$($$(PKG)_SRCDIR)/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) \ + $$(call PKG_MESON_CROSSCONFIG_SED,$(2)_CFLAGS,$(2)_CXXFLAGS,$(2)_LDFLAGS,$(2)_FCFLAGS) \ > $$($$(PKG)_SRCDIR)/build/cross-compilation.conf PATH=$$(BR_PATH) \ CC_FOR_BUILD="$$(HOSTCC)" \ CXX_FOR_BUILD="$$(HOSTCXX)" \ $$($$(PKG)_CONF_ENV) \ - $$(MESON) \ + $$(MESON) setup \ --prefix=/usr \ --libdir=lib \ --default-library=$(if $(BR2_STATIC_LIBS),static,shared) \ @@ -136,6 +158,7 @@ define $(2)_CONFIGURE_CMDS -Db_pie=false \ -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 endef @@ -146,13 +169,14 @@ define $(2)_CONFIGURE_CMDS rm -rf $$($$(PKG)_SRCDIR)/build mkdir -p $$($$(PKG)_SRCDIR)/build $$(HOST_CONFIGURE_OPTS) \ - $$($$(PKG)_CONF_ENV) $$(MESON) \ + $$($$(PKG)_CONF_ENV) $$(MESON) setup \ --prefix=$$(HOST_DIR) \ --libdir=lib \ --sysconfdir=$$(HOST_DIR)/etc \ --localstatedir=$$(HOST_DIR)/var \ --default-library=shared \ --buildtype=release \ + --wrap-mode=nodownload \ -Dstrip=true \ $$($$(PKG)_CONF_OPTS) \ $$($$(PKG)_SRCDIR) $$($$(PKG)_SRCDIR)/build @@ -238,9 +262,10 @@ define PKG_MESON_INSTALL_CROSS_CONF sed -e "s%@TARGET_CFLAGS@%$(call make-sq-comma-list,$(TARGET_CFLAGS))@PKG_TARGET_CFLAGS@%g" \ -e "s%@TARGET_LDFLAGS@%$(call make-sq-comma-list,$(TARGET_LDFLAGS))@PKG_TARGET_LDFLAGS@%g" \ -e "s%@TARGET_CXXFLAGS@%$(call make-sq-comma-list,$(TARGET_CXXFLAGS))@PKG_TARGET_CXXFLAGS@%g" \ + -e "s%@TARGET_FCFLAGS@%$(call make-sq-comma-list,$(TARGET_FCFLAGS))@PKG_TARGET_FCFLAGS@%g" \ $(call PKG_MESON_CROSSCONFIG_SED) \ > $(HOST_DIR)/etc/meson/cross-compilation.conf.in - sed $(call PKG_MESON_CROSSCONFIG_SED,TARGET_CFLAGS,TARGET_CXXFLAGS,TARGET_LDFLAGS) \ + sed $(call PKG_MESON_CROSSCONFIG_SED,TARGET_CFLAGS,TARGET_CXXFLAGS,TARGET_LDFLAGS,TARGET_FCFLAGS) \ > $(HOST_DIR)/etc/meson/cross-compilation.conf endef diff --git a/package/pkg-python.mk b/package/pkg-python.mk index 38455e40fbb..c15a168f607 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -33,84 +33,123 @@ PKG_PYTHON_HOST_PLATFORM = linux-$(PKG_PYTHON_ARCH) PKG_PYTHON_SYSCONFIGDATA_PATH = $(PYTHON3_PATH)/_sysconfigdata__linux_*.py PKG_PYTHON_SYSCONFIGDATA_NAME = `{ [ -e $(PKG_PYTHON_SYSCONFIGDATA_PATH) ] && basename $(PKG_PYTHON_SYSCONFIGDATA_PATH) .py; } || true` -# Target distutils-based packages -PKG_PYTHON_DISTUTILS_ENV = \ +# Target python packages +PKG_PYTHON_ENV = \ + _PYTHON_HOST_PLATFORM="$(PKG_PYTHON_HOST_PLATFORM)" \ + _PYTHON_PROJECT_BASE="$(PYTHON3_DIR)" \ + _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ PATH=$(BR_PATH) \ $(TARGET_CONFIGURE_OPTS) \ - LDSHARED="$(TARGET_CROSS)gcc -shared" \ PYTHONPATH="$(PYTHON3_PATH)" \ PYTHONNOUSERSITE=1 \ - SETUPTOOLS_USE_DISTUTILS=stdlib \ - _PYTHON_HOST_PLATFORM="$(PKG_PYTHON_HOST_PLATFORM)" \ - _PYTHON_PROJECT_BASE="$(PYTHON3_DIR)" \ - _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ _python_sysroot=$(STAGING_DIR) \ _python_prefix=/usr \ _python_exec_prefix=/usr +# Host python packages +HOST_PKG_PYTHON_ENV = \ + PATH=$(BR_PATH) \ + PYTHONNOUSERSITE=1 \ + $(HOST_CONFIGURE_OPTS) + +# Target distutils-based packages +PKG_PYTHON_DISTUTILS_ENV = \ + $(PKG_PYTHON_ENV) \ + LDSHARED="$(TARGET_CROSS)gcc -shared" \ + SETUPTOOLS_USE_DISTUTILS=stdlib \ + PKG_PYTHON_DISTUTILS_BUILD_OPTS = \ --executable=/usr/bin/python -PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS = \ +PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \ --install-headers=/usr/include/python$(PYTHON3_VERSION_MAJOR) \ - --prefix=/usr \ + --prefix=/usr + +PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS = \ + $(PKG_PYTHON_DISTUTILS_INSTALL_OPTS) \ --root=$(TARGET_DIR) PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS = \ - --install-headers=/usr/include/python$(PYTHON3_VERSION_MAJOR) \ - --prefix=/usr \ + $(PKG_PYTHON_DISTUTILS_INSTALL_OPTS) \ --root=$(STAGING_DIR) # Host distutils-based packages HOST_PKG_PYTHON_DISTUTILS_ENV = \ - PATH=$(BR_PATH) \ - PYTHONNOUSERSITE=1 \ - SETUPTOOLS_USE_DISTUTILS=stdlib \ - $(HOST_CONFIGURE_OPTS) + $(HOST_PKG_PYTHON_ENV) \ + SETUPTOOLS_USE_DISTUTILS=stdlib HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \ --prefix=$(HOST_DIR) # Target setuptools-based packages PKG_PYTHON_SETUPTOOLS_ENV = \ - _PYTHON_HOST_PLATFORM="$(PKG_PYTHON_HOST_PLATFORM)" \ - _PYTHON_PROJECT_BASE="$(PYTHON3_DIR)" \ - _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ - PATH=$(BR_PATH) \ - $(TARGET_CONFIGURE_OPTS) \ - PYTHONPATH="$(PYTHON3_PATH)" \ - PYTHONNOUSERSITE=1 \ - SETUPTOOLS_USE_DISTUTILS=stdlib \ - _python_sysroot=$(STAGING_DIR) \ - _python_prefix=/usr \ - _python_exec_prefix=/usr + $(PKG_PYTHON_ENV) \ + SETUPTOOLS_USE_DISTUTILS=stdlib -PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS = \ +PKG_PYTHON_SETUPTOOLS_CMD = \ + $(if $(wildcard $($(PKG)_BUILDDIR)/setup.py),setup.py,-c 'from setuptools import setup;setup()') + +PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ --install-headers=/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --prefix=/usr \ --executable=/usr/bin/python \ - --single-version-externally-managed \ + --single-version-externally-managed + +PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS = \ + $(PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) \ --root=$(TARGET_DIR) PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS = \ - --install-headers=/usr/include/python$(PYTHON3_VERSION_MAJOR) \ - --prefix=/usr \ - --executable=/usr/bin/python \ - --single-version-externally-managed \ + $(PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) \ --root=$(STAGING_DIR) # Host setuptools-based packages HOST_PKG_PYTHON_SETUPTOOLS_ENV = \ - PATH=$(BR_PATH) \ - PYTHONNOUSERSITE=1 \ - SETUPTOOLS_USE_DISTUTILS=stdlib \ - $(HOST_CONFIGURE_OPTS) + $(HOST_PKG_PYTHON_ENV) \ + SETUPTOOLS_USE_DISTUTILS=stdlib HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ --prefix=$(HOST_DIR) \ --root=/ \ --single-version-externally-managed +# Target pep517-based packages +PKG_PYTHON_PEP517_ENV = \ + $(PKG_PYTHON_ENV) + +PKG_PYTHON_PEP517_INSTALL_OPTS = \ + --interpreter=/usr/bin/python \ + --script-kind=posix + +PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS = \ + $(PKG_PYTHON_PEP517_INSTALL_OPTS) \ + --purelib=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + --headers=$(TARGET_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ + --scripts=$(TARGET_DIR)/usr/bin \ + --data=$(TARGET_DIR)/usr + +PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS = \ + $(PKG_PYTHON_PEP517_INSTALL_OPTS) \ + --purelib=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + --headers=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ + --scripts=$(STAGING_DIR)/usr/bin \ + --data=$(STAGING_DIR)/usr + +# Host pep517-based packages +HOST_PKG_PYTHON_PEP517_ENV = \ + $(HOST_PKG_PYTHON_ENV) + +HOST_PKG_PYTHON_PEP517_INSTALL_OPTS = \ + --interpreter=$(HOST_DIR)/bin/python \ + --script-kind=posix \ + --purelib=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + --headers=$(HOST_DIR)/include/python$(PYTHON3_VERSION_MAJOR) \ + --scripts=$(HOST_DIR)/bin \ + --data=$(HOST_DIR) + +HOST_PKG_PYTHON_PEP517_BOOTSTRAP_INSTALL_OPTS = \ + --installdir=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages + ################################################################################ # inner-python-package -- defines how the configuration, compilation # and installation of a Python package should be done, implements a @@ -138,30 +177,49 @@ endif # Distutils ifeq ($$($(2)_SETUP_TYPE),distutils) ifeq ($(4),target) -$(2)_BASE_ENV = $$(PKG_PYTHON_DISTUTILS_ENV) -$(2)_BASE_BUILD_TGT = build -$(2)_BASE_BUILD_OPTS = $$(PKG_PYTHON_DISTUTILS_BUILD_OPTS) -$(2)_BASE_INSTALL_TARGET_OPTS = $$(PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS) -$(2)_BASE_INSTALL_STAGING_OPTS = $$(PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS) +$(2)_BASE_ENV = $$(PKG_PYTHON_DISTUTILS_ENV) +$(2)_BASE_BUILD_CMD = setup.py build +$(2)_BASE_BUILD_OPTS = $$(PKG_PYTHON_DISTUTILS_BUILD_OPTS) +$(2)_BASE_INSTALL_TARGET_CMD = setup.py install --no-compile $$(PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS) +$(2)_BASE_INSTALL_STAGING_CMD = setup.py install $$(PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS) else $(2)_BASE_ENV = $$(HOST_PKG_PYTHON_DISTUTILS_ENV) -$(2)_BASE_BUILD_TGT = build -$(2)_BASE_INSTALL_OPTS = $$(HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS) +$(2)_BASE_BUILD_CMD = setup.py build +$(2)_BASE_INSTALL_CMD = setup.py install $$(HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS) endif # Setuptools else ifeq ($$($(2)_SETUP_TYPE),setuptools) ifeq ($(4),target) -$(2)_BASE_ENV = $$(PKG_PYTHON_SETUPTOOLS_ENV) -$(2)_BASE_BUILD_TGT = build -$(2)_BASE_INSTALL_TARGET_OPTS = $$(PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS) -$(2)_BASE_INSTALL_STAGING_OPTS = $$(PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS) +$(2)_BASE_ENV = $$(PKG_PYTHON_SETUPTOOLS_ENV) +$(2)_BASE_BUILD_CMD = $$(PKG_PYTHON_SETUPTOOLS_CMD) build +$(2)_BASE_INSTALL_TARGET_CMD = $$(PKG_PYTHON_SETUPTOOLS_CMD) install --no-compile $$(PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS) +$(2)_BASE_INSTALL_STAGING_CMD = $$(PKG_PYTHON_SETUPTOOLS_CMD) install $$(PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS) else -$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_SETUPTOOLS_ENV) -$(2)_BASE_BUILD_TGT = build -$(2)_BASE_INSTALL_OPTS = $$(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) +$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_SETUPTOOLS_ENV) +$(2)_BASE_BUILD_CMD = $$(PKG_PYTHON_SETUPTOOLS_CMD) build +$(2)_BASE_INSTALL_CMD = $$(PKG_PYTHON_SETUPTOOLS_CMD) install $$(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) endif +else ifneq ($$(filter flit pep517,$$($(2)_SETUP_TYPE)),) +ifeq ($(4),target) +$(2)_BASE_ENV = $$(PKG_PYTHON_PEP517_ENV) +$(2)_BASE_BUILD_CMD = -m build -n -w +$(2)_BASE_INSTALL_TARGET_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS) +$(2)_BASE_INSTALL_STAGING_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS) +else +$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_PEP517_ENV) +$(2)_BASE_BUILD_CMD = -m build -n -w +$(2)_BASE_INSTALL_CMD = $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(HOST_PKG_PYTHON_PEP517_INSTALL_OPTS) +endif +else ifeq ($$($(2)_SETUP_TYPE),flit-bootstrap) +ifeq ($(4),target) +$$(error flit-bootstrap setup type only supported for host packages) else -$$(error "Invalid $(2)_SETUP_TYPE. Valid options are 'distutils' or 'setuptools'") +$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_PEP517_ENV) +$(2)_BASE_BUILD_CMD = -m flit_core.wheel +$(2)_BASE_INSTALL_CMD ?= $(TOPDIR)/support/scripts/pyinstaller.py dist/* $$(HOST_PKG_PYTHON_PEP517_INSTALL_OPTS) +endif +else +$$(error "Invalid $(2)_SETUP_TYPE. Valid options are 'distutils', 'setuptools', 'pep517' or 'flit'.") endif # Target packages need both the python interpreter on the target (for @@ -180,6 +238,17 @@ endif # ($(4),target) # ifeq ($$($(2)_SETUP_TYPE),setuptools) $(2)_DEPENDENCIES += $$(if $$(filter host-python-setuptools,$(1)),,host-python-setuptools) +else ifneq ($$(filter flit pep517,$$($(2)_SETUP_TYPE)),) +$(2)_DEPENDENCIES += host-python-pypa-build host-python-installer +ifeq ($$($(2)_SETUP_TYPE),flit) +$(2)_DEPENDENCIES += host-python-flit-core +endif +else ifeq ($$($(2)_SETUP_TYPE),flit-bootstrap) +# Don't add dependency on host-python-installer for +# host-python-installer itself, and its dependencies. +ifeq ($$(filter host-python-flit-core host-python-installer,$(1)),) +$(2)_DEPENDENCIES += host-python-installer +endif endif # SETUP_TYPE # Python interpreter to use for building the package. @@ -194,8 +263,8 @@ ifndef $(2)_BUILD_CMDS define $(2)_BUILD_CMDS (cd $$($$(PKG)_BUILDDIR)/; \ $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ - $$($(2)_PYTHON_INTERPRETER) setup.py \ - $$($$(PKG)_BASE_BUILD_TGT) \ + $$($(2)_PYTHON_INTERPRETER) \ + $$($$(PKG)_BASE_BUILD_CMD) \ $$($$(PKG)_BASE_BUILD_OPTS) $$($$(PKG)_BUILD_OPTS)) endef endif @@ -208,8 +277,9 @@ ifndef $(2)_INSTALL_CMDS define $(2)_INSTALL_CMDS (cd $$($$(PKG)_BUILDDIR)/; \ $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ - $$($(2)_PYTHON_INTERPRETER) setup.py install \ - $$($$(PKG)_BASE_INSTALL_OPTS) $$($$(PKG)_INSTALL_OPTS)) + $$($(2)_PYTHON_INTERPRETER) \ + $$($$(PKG)_BASE_INSTALL_CMD) \ + $$($$(PKG)_INSTALL_OPTS)) endef endif @@ -221,8 +291,8 @@ ifndef $(2)_INSTALL_TARGET_CMDS define $(2)_INSTALL_TARGET_CMDS (cd $$($$(PKG)_BUILDDIR)/; \ $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ - $$($(2)_PYTHON_INTERPRETER) setup.py install --no-compile \ - $$($$(PKG)_BASE_INSTALL_TARGET_OPTS) \ + $$($(2)_PYTHON_INTERPRETER) \ + $$($$(PKG)_BASE_INSTALL_TARGET_CMD) \ $$($$(PKG)_INSTALL_TARGET_OPTS)) endef endif @@ -235,8 +305,8 @@ ifndef $(2)_INSTALL_STAGING_CMDS define $(2)_INSTALL_STAGING_CMDS (cd $$($$(PKG)_BUILDDIR)/; \ $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ - $$($(2)_PYTHON_INTERPRETER) setup.py install \ - $$($$(PKG)_BASE_INSTALL_STAGING_OPTS) \ + $$($(2)_PYTHON_INTERPRETER) \ + $$($$(PKG)_BASE_INSTALL_STAGING_CMD) \ $$($$(PKG)_INSTALL_STAGING_OPTS)) endef endif diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk index 7d1aea77107..530638566c0 100644 --- a/package/pkg-utils.mk +++ b/package/pkg-utils.mk @@ -22,16 +22,21 @@ KCONFIG_DOT_CONFIG = $(strip \ # KCONFIG_MUNGE_DOT_CONFIG (option, newline [, file]) define KCONFIG_MUNGE_DOT_CONFIG - $(SED) "/\\<$(strip $(1))\\>/d" $(call KCONFIG_DOT_CONFIG,$(3)) + $(SED) '/^\(# \)\?$(strip $(1))\>/d' $(call KCONFIG_DOT_CONFIG,$(3)) && \ echo '$(strip $(2))' >> $(call KCONFIG_DOT_CONFIG,$(3)) endef # KCONFIG_ENABLE_OPT (option [, file]) -KCONFIG_ENABLE_OPT = $(call KCONFIG_MUNGE_DOT_CONFIG, $(1), $(1)=y, $(2)) +# If the option is already set to =m or =y, ignore. +define KCONFIG_ENABLE_OPT + $(Q)if ! grep -q '^$(strip $(1))=[my]' $(call KCONFIG_DOT_CONFIG,$(2)); then \ + $(call KCONFIG_MUNGE_DOT_CONFIG, $(1), $(1)=y, $(2)); \ + fi +endef # KCONFIG_SET_OPT (option, value [, file]) -KCONFIG_SET_OPT = $(call KCONFIG_MUNGE_DOT_CONFIG, $(1), $(1)=$(2), $(3)) +KCONFIG_SET_OPT = $(Q)$(call KCONFIG_MUNGE_DOT_CONFIG, $(1), $(1)=$(2), $(3)) # KCONFIG_DISABLE_OPT (option [, file]) -KCONFIG_DISABLE_OPT = $(call KCONFIG_MUNGE_DOT_CONFIG, $(1), $(SHARP_SIGN) $(1) is not set, $(2)) +KCONFIG_DISABLE_OPT = $(Q)$(call KCONFIG_MUNGE_DOT_CONFIG, $(1), $(SHARP_SIGN) $(1) is not set, $(2)) # Helper functions to determine the name of a package and its # directory from its makefile directory, using the $(MAKEFILE_LIST) @@ -270,3 +275,29 @@ legal-deps = \ $(filter-out $(if $(1:host-%=),host-%),\ $(call non-virtual-deps,\ $($(call UPPERCASE,$(1))_FINAL_RECURSIVE_DEPENDENCIES))),$(p) [$($(call UPPERCASE,$(p))_LICENSE)]) + +# Helper for self-extracting binaries distributed by NXP, and +# formerlly Freescale. +# +# The --force option makes sure it doesn't fail if the source +# directory already exists. The --auto-accept skips the license check, +# as it is not needed in Buildroot because we have legal-info. Since +# there's a EULA in the binary file, we extract it in this macro, and +# it should therefore be added to the LICENSE_FILES variable of +# packages using this macro. Also, remember to set REDISTRIBUTE to +# "NO". Indeed, this is a legal minefield: the EULA specifies that the +# Board Support Package includes software and hardware (sic!) for +# which a separate license is needed... +# +# $(1): full path to the archive file +# +define NXP_EXTRACT_HELPER + awk 'BEGIN { start = 0; } \ + /^EOEULA/ { start = 0; } \ + { if (start) print; } \ + /< $(@D)/EULA + cd $(@D) && sh $(1) --force --auto-accept + find $(@D)/$(basename $(notdir $(1))) -mindepth 1 -maxdepth 1 -exec mv {} $(@D) \; + rmdir $(@D)/$(basename $(notdir $(1))) +endef diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk index d546b4a817c..0529bb6ddaf 100644 --- a/package/pkg-waf.mk +++ b/package/pkg-waf.mk @@ -38,6 +38,13 @@ WAF_OPTS = $(if $(VERBOSE),-v) -j $(PARALLEL_JOBS) define inner-waf-package +# The version of waflib has to match with the version of waf, +# otherwise waf errors out with: +# Waf script 'X' and library 'Y' do not match +define WAF_PACKAGE_REMOVE_WAF_LIB + $$(RM) -fr $$(@D)/waf $$(@D)/waflib +endef + # We need host-python3 to run waf $(2)_DEPENDENCIES += host-python3 @@ -47,6 +54,7 @@ $(2)_NEEDS_EXTERNAL_WAF ?= NO ifeq ($$($(2)_NEEDS_EXTERNAL_WAF),YES) $(2)_DEPENDENCIES += host-waf $(2)_WAF = $$(HOST_DIR)/bin/waf +$(2)_POST_PATCH_HOOKS += WAF_PACKAGE_REMOVE_WAF_LIB else $(2)_WAF ?= ./waf endif @@ -75,7 +83,7 @@ endif ifndef $(2)_BUILD_CMDS define $(2)_BUILD_CMDS cd $$($$(PKG)_SRCDIR) && \ - $$(TARGET_MAKE_ENV) $$(HOST_DIR)/bin/python3 $$($(2)_WAF) \ + $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$(HOST_DIR)/bin/python3 $$($(2)_WAF) \ build $$(WAF_OPTS) $$($(2)_BUILD_OPTS) \ $$($(2)_WAF_OPTS) endef @@ -88,7 +96,7 @@ endif ifndef $(2)_INSTALL_STAGING_CMDS define $(2)_INSTALL_STAGING_CMDS cd $$($$(PKG)_SRCDIR) && \ - $$(TARGET_MAKE_ENV) $$(HOST_DIR)/bin/python3 $$($(2)_WAF) \ + $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$(HOST_DIR)/bin/python3 $$($(2)_WAF) \ install --destdir=$$(STAGING_DIR) \ $$($(2)_INSTALL_STAGING_OPTS) \ $$($(2)_WAF_OPTS) @@ -102,7 +110,7 @@ endif ifndef $(2)_INSTALL_TARGET_CMDS define $(2)_INSTALL_TARGET_CMDS cd $$($$(PKG)_SRCDIR) && \ - $$(TARGET_MAKE_ENV) $$(HOST_DIR)/bin/python3 $$($(2)_WAF) \ + $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$(HOST_DIR)/bin/python3 $$($(2)_WAF) \ install --destdir=$$(TARGET_DIR) \ $$($(2)_INSTALL_TARGET_OPTS) \ $$($(2)_WAF_OPTS) diff --git a/package/pkgconf/pkgconf.mk b/package/pkgconf/pkgconf.mk index 5d65f69c10a..1d73b691e17 100644 --- a/package/pkgconf/pkgconf.mk +++ b/package/pkgconf/pkgconf.mk @@ -5,12 +5,17 @@ ################################################################################ PKGCONF_VERSION = 1.6.3 -PKGCONF_SITE = https://distfiles.dereferenced.org/pkgconf +PKGCONF_SITE = https://distfiles.ariadne.space/pkgconf PKGCONF_SOURCE = pkgconf-$(PKGCONF_VERSION).tar.xz PKGCONF_LICENSE = pkgconf license PKGCONF_LICENSE_FILES = COPYING PKGCONF_CPE_ID_VENDOR = pkgconf +# We are a ccache dependency, so we can't use ccache +HOST_PKGCONF_CONF_ENV = \ + CC="$(HOSTCC_NOCCACHE)" \ + CXX="$(HOSTCXX_NOCCACHE)" + PKG_CONFIG_HOST_BINARY = $(HOST_DIR)/bin/pkg-config define PKGCONF_LINK_PKGCONFIG diff --git a/package/ply/Config.in b/package/ply/Config.in index 0500e7883f6..f7507095c11 100644 --- a/package/ply/Config.in +++ b/package/ply/Config.in @@ -5,16 +5,16 @@ config BR2_PACKAGE_PLY_ARCH_SUPPORTS default y if BR2_powerpc default y if BR2_x86_64 -comment "ply needs a toolchain w/ dynamic library, headers >= 4.14" +comment "ply needs a toolchain w/ dynamic library, headers >= 5.5" depends on BR2_PACKAGE_PLY_ARCH_SUPPORTS depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 || BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5 || BR2_STATIC_LIBS config BR2_PACKAGE_PLY bool "ply" depends on BR2_PACKAGE_PLY_ARCH_SUPPORTS depends on BR2_USE_MMU # fork() - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 # BPF_JLT + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5 # BPF_JLT depends on !BR2_STATIC_LIBS help ply is a light-weight dynamic tracer for Linux. By means of diff --git a/package/ply/ply.hash b/package/ply/ply.hash index df01ae08e01..b6a56aa909d 100644 --- a/package/ply/ply.hash +++ b/package/ply/ply.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8cd92fc8784873fb0507bc11f3f62a31d0345c64914ddaadb958d8b2d6de0100 ply-2.2.0.tar.gz +sha256 99be1ed3942370699cbfc7f493bc3ffd4601312a81471215ac7ccb2e04a0a8b2 ply-2.3.0.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/ply/ply.mk b/package/ply/ply.mk index b3c56bd9a5b..dc02fc5472a 100644 --- a/package/ply/ply.mk +++ b/package/ply/ply.mk @@ -4,7 +4,7 @@ # ################################################################################ -PLY_VERSION = 2.2.0 +PLY_VERSION = 2.3.0 PLY_SITE = $(call github,wkz,ply,$(PLY_VERSION)) PLY_AUTORECONF = YES PLY_LICENSE = GPL-2.0 diff --git a/package/poco/0001-Fix-optional-JSON-support-for-MySQL-3753.patch b/package/poco/0001-Fix-optional-JSON-support-for-MySQL-3753.patch new file mode 100644 index 00000000000..ba2f073a595 --- /dev/null +++ b/package/poco/0001-Fix-optional-JSON-support-for-MySQL-3753.patch @@ -0,0 +1,45 @@ +From 3884c734c261231c34f59e56cde7ae02945b4dae Mon Sep 17 00:00:00 2001 +From: Hernan Martinez +Date: Tue, 16 Aug 2022 23:07:25 -0500 +Subject: [PATCH] Fix optional JSON support for MySQL (#3753) + +* Fix optional JSON support for MySQL + +* Fix optional JSON support for MySQLTest +--- + Data/MySQL/src/ResultMetadata.cpp | 2 ++ + Data/MySQL/testsuite/src/MySQLTest.cpp | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/Data/MySQL/src/ResultMetadata.cpp b/Data/MySQL/src/ResultMetadata.cpp +index 61b49dd54..adb5dae84 100644 +--- a/Data/MySQL/src/ResultMetadata.cpp ++++ b/Data/MySQL/src/ResultMetadata.cpp +@@ -133,8 +133,10 @@ namespace + case MYSQL_TYPE_LONG_BLOB: + case MYSQL_TYPE_BLOB: + return Poco::Data::MetaColumn::FDT_BLOB; ++#ifdef POCO_MYSQL_JSON + case MYSQL_TYPE_JSON: + return Poco::Data::MetaColumn::FDT_JSON; ++#endif + default: + return Poco::Data::MetaColumn::FDT_UNKNOWN; + } +diff --git a/Data/MySQL/testsuite/src/MySQLTest.cpp b/Data/MySQL/testsuite/src/MySQLTest.cpp +index 80a3683b1..2a286d35e 100644 +--- a/Data/MySQL/testsuite/src/MySQLTest.cpp ++++ b/Data/MySQL/testsuite/src/MySQLTest.cpp +@@ -976,7 +976,9 @@ CppUnit::Test* MySQLTest::suite() + CppUnit_addTest(pSuite, MySQLTest, testBLOBStmt); + CppUnit_addTest(pSuite, MySQLTest, testLongBLOB); + CppUnit_addTest(pSuite, MySQLTest, testLongTEXT); ++#ifdef POCO_MYSQL_JSON + CppUnit_addTest(pSuite, MySQLTest, testJSON); ++#endif + CppUnit_addTest(pSuite, MySQLTest, testUnsignedInts); + CppUnit_addTest(pSuite, MySQLTest, testFloat); + CppUnit_addTest(pSuite, MySQLTest, testDouble); +-- +2.37.2 + diff --git a/package/poco/0001-poco-add-the-staging-path-to-search-path.patch b/package/poco/0001-poco-add-the-staging-path-to-search-path.patch deleted file mode 100644 index fbabfc8f261..00000000000 --- a/package/poco/0001-poco-add-the-staging-path-to-search-path.patch +++ /dev/null @@ -1,40 +0,0 @@ -From a53f3fd64a0f36ec9bc1307d7e66cdc2dee4aeaa Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Tue, 4 Aug 2015 10:14:00 +0200 -Subject: [PATCH] poco: add the staging path to search path -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Add the mysql headers and client libraries to the search path of the -preprocessor and the linker. The $MYSQL_LIBDIR / $MYSQL_INCIDR variables -must be set from the make command line. - -[Peter: Remove host dirs, add MYSQL_INCDIR] -Signed-off-by: Baruch Siach -[Jörg: Update to version 1.6.1 from github] -Signed-off-by: Jörg Krause -[Julien: Rebased on version 1.10.1] -Signed-off-by: Julien Olivain ---- - Data/MySQL/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Data/MySQL/Makefile b/Data/MySQL/Makefile -index 64a7d3f82..955fee2d4 100644 ---- a/Data/MySQL/Makefile -+++ b/Data/MySQL/Makefile -@@ -6,8 +6,8 @@ - - include $(POCO_BASE)/build/rules/global - --SYSLIBS += -L/usr/local/lib -L/usr/local/lib$(LIB64SUFFIX)/mysql -L/usr/lib$(LIB64SUFFIX)/mysql -L/usr/mysql/lib$(LIB64SUFFIX) -L/usr/mysql/lib$(LIB64SUFFIX)/mysql -L/usr/local/mysql/lib$(LIB64SUFFIX) -lmysqlclient --INCLUDE += -I/usr/local/include/mysql/ -I/usr/include/mysql/ -I/usr/mysql/include/mysql -I/usr/local/mysql/include -+SYSLIBS += -L$(MYSQL_LIBDIR) -lmysqlclient -+INCLUDE += -I$(MYSQL_INCDIR) - SYSFLAGS += -DTHREADSAFE -DNO_TCL - - objects = Binder Extractor SessionImpl Connector \ --- -2.26.2 - diff --git a/package/poco/0002-Add-support-for-m68000-1856.patch b/package/poco/0002-Add-support-for-m68000-1856.patch deleted file mode 100644 index bc04a9bf69b..00000000000 --- a/package/poco/0002-Add-support-for-m68000-1856.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 221e308ad452035f4c1dc25e194f817a30f38f7b Mon Sep 17 00:00:00 2001 -From: Jochen Sprickerhof -Date: Wed, 23 Aug 2017 16:50:51 +0200 -Subject: [PATCH] Add support for m68000 (#1856) - -Originally taken from - -https://github.com/google/double-conversion/commit/da11179623145f53b204105a93b8bbca431141da - -Signed-off-by: Thomas Petazzoni -[Julien: rebased on version 1.10.1] -Signed-off-by: Julien Olivain ---- - Foundation/src/utils.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/Foundation/src/utils.h b/Foundation/src/utils.h -index c87cee13c..e891c0f10 100644 ---- a/Foundation/src/utils.h -+++ b/Foundation/src/utils.h -@@ -66,6 +66,8 @@ - defined(__AARCH64EL__) || \ - defined(nios2) || defined(__nios2) || defined(__nios2__) - #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 -+#elif defined(__mc68000__) -+#undef DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS - #elif defined(_M_IX86) || defined(__i386__) || defined(__i386) - #if defined(_WIN32) - // Windows uses a 64bit wide floating point stack. --- -2.26.2 - diff --git a/package/poco/0003-Foundation-src-utils.h-backport-double-conversion-ch.patch b/package/poco/0003-Foundation-src-utils.h-backport-double-conversion-ch.patch deleted file mode 100644 index c06eebe8b06..00000000000 --- a/package/poco/0003-Foundation-src-utils.h-backport-double-conversion-ch.patch +++ /dev/null @@ -1,34 +0,0 @@ -From fe7d230da03a35725ef768c07ce064324f941863 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sun, 1 Jul 2018 15:37:47 +0200 -Subject: [PATCH] Foundation/src/utils.h: backport double-conversion change for - AArch64 BE support - -This commit, identical to upstream double-conversion commit -https://github.com/google/double-conversion/commit/cb2beeb6771025377c665d1c3ea08388bc6e619a -allows Poco to build on AArch64 big-endian. - -Signed-off-by: Thomas Petazzoni -Upstream: https://github.com/pocoproject/poco/pull/2378 -[Julien: rebased on version 1.10.1] -Signed-off-by: Julien Olivain ---- - Foundation/src/utils.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Foundation/src/utils.h b/Foundation/src/utils.h -index e891c0f10..892f7db18 100644 ---- a/Foundation/src/utils.h -+++ b/Foundation/src/utils.h -@@ -63,7 +63,7 @@ - defined(__SH4__) || defined(__alpha__) || \ - defined(_MIPS_ARCH_MIPS32R2) || \ - defined(__riscv) || \ -- defined(__AARCH64EL__) || \ -+ defined(__AARCH64EL__) || defined(__aarch64__) || \ - defined(nios2) || defined(__nios2) || defined(__nios2__) - #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 - #elif defined(__mc68000__) --- -2.26.2 - diff --git a/package/poco/Config.in b/package/poco/Config.in index dd87ee36bbb..820e6319662 100644 --- a/package/poco/Config.in +++ b/package/poco/Config.in @@ -17,8 +17,8 @@ config BR2_PACKAGE_POCO depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on !BR2_STATIC_LIBS # dlopen() depends on BR2_PACKAGE_POCO_ARCH_SUPPORTS + select BR2_PACKAGE_PCRE2 select BR2_PACKAGE_ZLIB - select BR2_PACKAGE_PCRE help The C++ Portable Components Libraries @@ -28,73 +28,91 @@ if BR2_PACKAGE_POCO comment "poco components" -config BR2_PACKAGE_POCO_JSON - bool "json" - -config BR2_PACKAGE_POCO_XML - bool "xml" - select BR2_PACKAGE_EXPAT - -config BR2_PACKAGE_POCO_UTIL - bool "util" +config BR2_PACKAGE_POCO_ACTIVERECORD + bool "ActiveRecord" select BR2_PACKAGE_POCO_XML -config BR2_PACKAGE_POCO_NET - bool "net" +config BR2_PACKAGE_POCO_CPP_PARSER + bool "CppParser" config BR2_PACKAGE_POCO_CRYPTO - bool "crypto" - select BR2_PACKAGE_OPENSSL + bool "Crypto" select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL + select BR2_PACKAGE_OPENSSL -config BR2_PACKAGE_POCO_NETSSL_OPENSSL - bool "netssl_openssl" - select BR2_PACKAGE_POCO_NET +config BR2_PACKAGE_POCO_DATA + bool + +config BR2_PACKAGE_POCO_DATA_MYSQL + bool "Data/MySQL" + depends on BR2_USE_MMU # mysql + select BR2_PACKAGE_MYSQL + select BR2_PACKAGE_POCO_DATA + +config BR2_PACKAGE_POCO_DATA_PGSQL + bool "Data/PostgreSQL" + depends on BR2_USE_MMU # postgresql + depends on !BR2_OPTIMIZE_FAST # postgresql + select BR2_PACKAGE_POCO_DATA + select BR2_PACKAGE_POSTGRESQL + +comment "Data/PostgreSQL can't be built with Optimize for fast" + depends on BR2_OPTIMIZE_FAST + +config BR2_PACKAGE_POCO_DATA_SQLITE + bool "Data/SQLite" + select BR2_PACKAGE_POCO_DATA + select BR2_PACKAGE_SQLITE + +config BR2_PACKAGE_POCO_JSON + bool "JSON" + +config BR2_PACKAGE_POCO_JWT + bool "JWT" select BR2_PACKAGE_POCO_CRYPTO - select BR2_PACKAGE_POCO_UTIL - select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_POCO_JSON -config BR2_PACKAGE_POCO_ZIP - bool "zip" - select BR2_PACKAGE_POCO_XML +config BR2_PACKAGE_POCO_MONGODB + bool "MongoDB" select BR2_PACKAGE_POCO_NET - select BR2_PACKAGE_POCO_UTIL -config BR2_PACKAGE_POCO_CPP_PARSER - bool "cpp_parser" +config BR2_PACKAGE_POCO_NET + bool "Net" + +config BR2_PACKAGE_POCO_NETSSL_OPENSSL + bool "NetSSL_OpenSSL" + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_POCO_CRYPTO + select BR2_PACKAGE_POCO_NET + select BR2_PACKAGE_POCO_UTIL config BR2_PACKAGE_POCO_PDF - bool "pdf" + bool "PDF" select BR2_PACKAGE_POCO_JSON select BR2_PACKAGE_POCO_UTIL select BR2_PACKAGE_POCO_XML -config BR2_PACKAGE_POCO_REDIS - bool "redis" +config BR2_PACKAGE_POCO_PROMETHEUS + bool "Prometheus" select BR2_PACKAGE_POCO_NET -config BR2_PACKAGE_POCO_MONGODB - bool "mongodb" +config BR2_PACKAGE_POCO_REDIS + bool "Redis" select BR2_PACKAGE_POCO_NET -config BR2_PACKAGE_POCO_DATA - bool - -config BR2_PACKAGE_POCO_DATA_SQLITE - bool "sqlite" - select BR2_PACKAGE_POCO_DATA - select BR2_PACKAGE_SQLITE +config BR2_PACKAGE_POCO_UTIL + bool "Util" + select BR2_PACKAGE_POCO_XML -config BR2_PACKAGE_POCO_DATA_MYSQL - bool "mysql" - depends on BR2_USE_MMU # mysql - select BR2_PACKAGE_POCO_DATA - select BR2_PACKAGE_MYSQL +config BR2_PACKAGE_POCO_XML + bool "XML" + select BR2_PACKAGE_EXPAT -config BR2_PACKAGE_POCO_JWT - bool "jwt" - select BR2_PACKAGE_POCO_JSON - select BR2_PACKAGE_POCO_CRYPTO +config BR2_PACKAGE_POCO_ZIP + bool "Zip" + select BR2_PACKAGE_POCO_NET + select BR2_PACKAGE_POCO_UTIL + select BR2_PACKAGE_POCO_XML endif # BR2_PACKAGE_POCO diff --git a/package/poco/poco.hash b/package/poco/poco.hash index 2a2629733df..eea3e2494a6 100644 --- a/package/poco/poco.hash +++ b/package/poco/poco.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 44592a488d2830c0b4f3bfe4ae41f0c46abbfad49828d938714444e858a00818 poco-1.10.1.tar.gz +sha256 30442ccb097a0074133f699213a59d6f8c77db5b2c98a7c1ad9c5eeb3a2b06f3 poco-1.12.2.tar.gz sha256 c4b1e1e5f36d8331737231fefcc30f5714326aec7c387ad59a8115eb0ba7d6b5 LICENSE diff --git a/package/poco/poco.mk b/package/poco/poco.mk index 857f215e3a7..d078faa8e53 100644 --- a/package/poco/poco.mk +++ b/package/poco/poco.mk @@ -4,36 +4,44 @@ # ################################################################################ -POCO_VERSION = 1.10.1 +POCO_VERSION = 1.12.2 POCO_SITE = $(call github,pocoproject,poco,poco-$(POCO_VERSION)-release) POCO_LICENSE = BSL-1.0 POCO_LICENSE_FILES = LICENSE POCO_CPE_ID_VENDOR = pocoproject POCO_INSTALL_STAGING = YES -POCO_DEPENDENCIES = zlib pcre \ - $(if $(BR2_PACKAGE_POCO_XML),expat) \ +POCO_DEPENDENCIES = \ + pcre2 \ + zlib \ $(if $(BR2_PACKAGE_POCO_CRYPTO),openssl) \ - $(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),openssl) \ + $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),mysql) \ $(if $(BR2_PACKAGE_POCO_DATA_SQLITE),sqlite) \ - $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),mysql) + $(if $(BR2_PACKAGE_POCO_DATA_PGSQL),postgresql) \ + $(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),openssl) \ + $(if $(BR2_PACKAGE_POCO_XML),expat) -POCO_OMIT = Data/ODBC PageCompiler \ +POCO_OMIT = \ + Data/ODBC \ + PageCompiler \ + $(if $(BR2_PACKAGE_POCO_ACTIVERECORD),,ActiveRecord) \ + $(if $(BR2_PACKAGE_POCO_CPP_PARSER),,CppParser) \ + $(if $(BR2_PACKAGE_POCO_CRYPTO),,Crypto) \ + $(if $(BR2_PACKAGE_POCO_DATA),,Data) \ + $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),,Data/MySQL) \ + $(if $(BR2_PACKAGE_POCO_DATA_SQLITE),,Data/SQLite) \ + $(if $(BR2_PACKAGE_POCO_DATA_PGSQL),,Data/PostgreSQL) \ $(if $(BR2_PACKAGE_POCO_JSON),,JSON) \ - $(if $(BR2_PACKAGE_POCO_XML),,XML) \ - $(if $(BR2_PACKAGE_POCO_UTIL),,Util) \ + $(if $(BR2_PACKAGE_POCO_JWT),,JWT) \ + $(if $(BR2_PACKAGE_POCO_MONGODB),,MongoDB) \ $(if $(BR2_PACKAGE_POCO_NET),,Net) \ $(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),,NetSSL_OpenSSL) \ - $(if $(BR2_PACKAGE_POCO_CRYPTO),,Crypto) \ - $(if $(BR2_PACKAGE_POCO_ZIP),,Zip) \ - $(if $(BR2_PACKAGE_POCO_CPP_PARSER),,CppParser) \ $(if $(BR2_PACKAGE_POCO_PDF),,PDF) \ + $(if $(BR2_PACKAGE_POCO_PROMETHEUS),,Prometheus) \ $(if $(BR2_PACKAGE_POCO_REDIS),,Redis) \ - $(if $(BR2_PACKAGE_POCO_MONGODB),,MongoDB) \ - $(if $(BR2_PACKAGE_POCO_DATA),,Data) \ - $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),,Data/MySQL) \ - $(if $(BR2_PACKAGE_POCO_DATA_SQLITE),,Data/SQLite) \ - $(if $(BR2_PACKAGE_POCO_JWT),,JWT) + $(if $(BR2_PACKAGE_POCO_UTIL),,Util) \ + $(if $(BR2_PACKAGE_POCO_XML),,XML) \ + $(if $(BR2_PACKAGE_POCO_ZIP),,Zip) ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) POCO_CONF_OPTS += --no-fpenvironment --no-wstring @@ -57,11 +65,17 @@ else ifeq ($(BR2_SHARED_STATIC_LIBS),y) POCO_MAKE_TARGET = all_release endif +POCO_LDFLAGS=$(TARGET_LDFLAGS) +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +POCO_LDFLAGS += -latomic +endif + define POCO_CONFIGURE_CMDS (cd $(@D); $(TARGET_MAKE_ENV) ./configure \ --config=Linux \ --prefix=/usr \ --cflags=-std=c++14 \ + --ldflags="$(POCO_LDFLAGS)" \ --omit="$(POCO_OMIT)" \ $(POCO_CONF_OPTS) \ --unbundled \ @@ -72,8 +86,10 @@ endef # Use $(MAKE1) to avoid failures on heavilly parallel machines (e.g. -j25) define POCO_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE1) POCO_TARGET_OSARCH=$(ARCH) CROSS_COMPILE=$(TARGET_CROSS) \ - MYSQL_LIBDIR=$(STAGING_DIR)/usr/lib/mysql \ - MYSQL_INCDIR=$(STAGING_DIR)/usr/include/mysql \ + POCO_MYSQL_INCLUDE=$(STAGING_DIR)/usr/include/mysql \ + POCO_MYSQL_LIB=$(STAGING_DIR)/usr/lib/mysql \ + POCO_PGSQL_INCLUDE=$(STAGING_DIR)/usr/include/postgresql \ + POCO_PGSQL_LIB=$(STAGING_DIR)/usr/lib/postgresql \ DEFAULT_TARGET=$(POCO_MAKE_TARGET) -C $(@D) endef diff --git a/package/poke/0001-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch b/package/poke/0001-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch index c1695161531..85a76e068e6 100644 --- a/package/poke/0001-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch +++ b/package/poke/0001-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch @@ -1,4 +1,4 @@ -From b35dadae6371c3727cac46ae5bd348b66aa411fc Mon Sep 17 00:00:00 2001 +From 51fb81264323f01a86dd0bdeaf1c7a044a9cb6dc Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 30 Apr 2021 15:43:59 +0200 Subject: [PATCH] configure.ac: HELP2MAN replace ':' by 'true' when @@ -17,10 +17,10 @@ Signed-off-by: Romain Naour 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 2c6f1aef..9c4c9be2 100644 +index a1943b57..c633f719 100644 --- a/configure.ac +++ b/configure.ac -@@ -74,7 +74,7 @@ gl_LIBTEXTSTYLE_OPTIONAL([0.20.5]) +@@ -90,7 +90,7 @@ gl_LIBTEXTSTYLE_OPTIONAL([0.20.5]) if test $cross_compiling = no; then AM_MISSING_PROG(HELP2MAN, help2man) else diff --git a/package/poke/0002-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch b/package/poke/0002-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch index 757dc3f760f..bd20b5d2c6f 100644 --- a/package/poke/0002-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch +++ b/package/poke/0002-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch @@ -1,4 +1,4 @@ -From a0594387565e1e6b4a8a8ba04ad13b135cc1f0b5 Mon Sep 17 00:00:00 2001 +From 236b019b83228d2e37fa07635fb6864ed7dc5fad Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 1 Apr 2021 07:49:46 +0200 Subject: [PATCH] lib/getrandom.c: fix build with uclibc < 1.0.35 @@ -15,7 +15,7 @@ In file included from ./sys/random.h:40, /tmp/instance-0/output-1/host/x86_64-buildroot-linux-uclibc/sysroot/usr/include/sys/random.h:8:1: note: 'size_t' is defined in header ''; did you forget to '#include '? 7 | #include +++ |+#include - 8 | + 8 | This patch is not upstreamable as it is only a workaround for uclibc < 1.0.35, upstream uclibc has been patched with @@ -26,15 +26,15 @@ Fixes: Signed-off-by: Fabrice Fontaine --- - jitter/gnulib-local/getrandom.c | 1 + - gl/getrandom.c | 1 + gl-libpoke/getrandom.c | 1 + + gl/getrandom.c | 1 + + jitter/gnulib-local/getrandom.c | 1 + 3 files changed, 3 insertions(+) -diff --git a/jitter/gnulib-local/getrandom.c b/jitter/gnulib-local/getrandom.c -index 41212fb32..0ad3f9648 100644 ---- a/jitter/gnulib-local/getrandom.c -+++ b/jitter/gnulib-local/getrandom.c +diff --git a/gl-libpoke/getrandom.c b/gl-libpoke/getrandom.c +index e146873..3948d8d 100644 +--- a/gl-libpoke/getrandom.c ++++ b/gl-libpoke/getrandom.c @@ -19,6 +19,7 @@ #include @@ -44,7 +44,7 @@ index 41212fb32..0ad3f9648 100644 #include diff --git a/gl/getrandom.c b/gl/getrandom.c -index 41212fb32..0ad3f9648 100644 +index e146873..3948d8d 100644 --- a/gl/getrandom.c +++ b/gl/getrandom.c @@ -19,6 +19,7 @@ @@ -55,10 +55,10 @@ index 41212fb32..0ad3f9648 100644 #include #include -diff --git a/gl-libpoke/getrandom.c b/gl-libpoke/getrandom.c -index 41212fb32..0ad3f9648 100644 ---- a/gl-libpoke/getrandom.c -+++ b/gl-libpoke/getrandom.c +diff --git a/jitter/gnulib-local/getrandom.c b/jitter/gnulib-local/getrandom.c +index e146873..3948d8d 100644 +--- a/jitter/gnulib-local/getrandom.c ++++ b/jitter/gnulib-local/getrandom.c @@ -19,6 +19,7 @@ #include @@ -68,5 +68,5 @@ index 41212fb32..0ad3f9648 100644 #include -- -2.30.2 +2.31.1 diff --git a/package/poke/Config.in b/package/poke/Config.in index 40e7a31bab3..8bedb12bf8c 100644 --- a/package/poke/Config.in +++ b/package/poke/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_POKE depends on BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS # bdwgc depends on BR2_USE_WCHAR # needs wctomb depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL + depends on BR2_USE_MMU # bdwgc select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # less select BR2_PACKAGE_BDWGC select BR2_PACKAGE_LESS # runtime @@ -25,4 +26,5 @@ config BR2_PACKAGE_POKE comment "poke needs a toolchain w/ NPTL, wchar" depends on BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS + depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_USE_WCHAR diff --git a/package/poke/poke.hash b/package/poke/poke.hash index 1367262f543..e6e436570c6 100644 --- a/package/poke/poke.hash +++ b/package/poke/poke.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 ce054df29560c921230132703ee449fe130b6e25ab03aa6cc796bb401506aa24 poke-1.4.tar.gz +sha256 79a9b2f33c9f8c327c499afadaeeabfeecf6ad4988924d2c6c6f317e50317add poke-3.0.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 jitter/COPYING diff --git a/package/poke/poke.mk b/package/poke/poke.mk index ddd03ae3b08..4a6ff344b28 100644 --- a/package/poke/poke.mk +++ b/package/poke/poke.mk @@ -4,7 +4,7 @@ # ################################################################################ -POKE_VERSION = 1.4 +POKE_VERSION = 3.0 POKE_SITE = $(BR2_GNU_MIRROR)/poke # gnulib license is a mix/mess of public-domain and various GPL and LGPL versions. POKE_LICENSE = GPL-3.0+, GPL-3.0+ (jitter), gnulib license (gnulib) diff --git a/package/policycoreutils/policycoreutils.hash b/package/policycoreutils/policycoreutils.hash index 7d086363705..e7f006b0233 100644 --- a/package/policycoreutils/policycoreutils.hash +++ b/package/policycoreutils/policycoreutils.hash @@ -1,3 +1,3 @@ # https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 d1331c6fa766c547b071c491de90b9f343c8dbffdb119be8a5a7e491199b93a9 policycoreutils-3.2.tar.gz -sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING +sha256 d1331c6fa766c547b071c491de90b9f343c8dbffdb119be8a5a7e491199b93a9 policycoreutils-3.2.tar.gz +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/policycoreutils/policycoreutils.mk b/package/policycoreutils/policycoreutils.mk index 60575ac6448..8505dbca3fb 100644 --- a/package/policycoreutils/policycoreutils.mk +++ b/package/policycoreutils/policycoreutils.mk @@ -16,10 +16,6 @@ POLICYCOREUTILS_MAKE_OPTS = LDLIBS=$(TARGET_NLS_LIBS) ifeq ($(BR2_PACKAGE_LINUX_PAM),y) POLICYCOREUTILS_DEPENDENCIES += linux-pam POLICYCOREUTILS_MAKE_OPTS += NAMESPACE_PRIV=y -define POLICYCOREUTILS_INSTALL_TARGET_LINUX_PAM_CONFS - $(INSTALL) -D -m 0644 $(@D)/newrole/newrole-lspp.pamd $(TARGET_DIR)/etc/pam.d/newrole - $(INSTALL) -D -m 0644 $(@D)/run_init/run_init.pamd $(TARGET_DIR)/etc/pam.d/run_init -endef endif ifeq ($(BR2_PACKAGE_AUDIT),y) diff --git a/package/polkit/0001-make-netgroup-support-optional.patch b/package/polkit/0001-make-netgroup-support-optional.patch deleted file mode 100644 index 09c48d7791b..00000000000 --- a/package/polkit/0001-make-netgroup-support-optional.patch +++ /dev/null @@ -1,426 +0,0 @@ -From 1b854ef4bb15032091a33fed587e5ba6f3e582eb Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 22 May 2019 13:18:55 -0700 -Subject: [PATCH] make netgroup support optional - -On at least Linux/musl and Linux/uclibc, netgroup -support is not available. PolKit fails to compile on these systems -for that reason. - -This change makes netgroup support conditional on the presence of the -setnetgrent(3) function which is required for the support to work. If -that function is not available on the system, an error will be returned -to the administrator if unix-netgroup: is specified in configuration. - -Fixes bug 50145. - -Signed-off-by: A. Wilcox -Signed-off-by: Khem Raj -[Adam: Extend patch to work with duktape integration.] -Signed-off-by: Adam Duskett -[Thomas: add introspection.m4.] -Signed-off-by: Thomas Petazzoni ---- - buildutil/introspection.m4 | 142 ++++++++++++++++++ - configure.ac | 2 +- - src/polkit/polkitidentity.c | 16 ++ - src/polkit/polkitunixnetgroup.c | 3 + - .../polkitbackendduktapeauthority.c | 2 + - .../polkitbackendinteractiveauthority.c | 14 +- - .../polkitbackendjsauthority.cpp | 3 +- - test/polkit/polkitidentitytest.c | 9 +- - test/polkit/polkitunixnetgrouptest.c | 3 + - .../test-polkitbackendjsauthority.c | 2 + - 10 files changed, 187 insertions(+), 9 deletions(-) - create mode 100644 buildutil/introspection.m4 - -diff --git a/buildutil/introspection.m4 b/buildutil/introspection.m4 -new file mode 100644 -index 0000000..b0ccd68 ---- /dev/null -+++ b/buildutil/introspection.m4 -@@ -0,0 +1,142 @@ -+dnl -*- mode: autoconf -*- -+dnl Copyright 2009 Johan Dahlin -+dnl -+dnl This file is free software; the author(s) gives unlimited -+dnl permission to copy and/or distribute it, with or without -+dnl modifications, as long as this notice is preserved. -+dnl -+ -+# serial 1 -+ -+dnl This is a copy of AS_AC_EXPAND -+dnl -+dnl (C) 2003, 2004, 2005 Thomas Vander Stichele -+dnl Copying and distribution of this file, with or without modification, -+dnl are permitted in any medium without royalty provided the copyright -+dnl notice and this notice are preserved. -+m4_define([_GOBJECT_INTROSPECTION_AS_AC_EXPAND], -+[ -+ EXP_VAR=[$1] -+ FROM_VAR=[$2] -+ -+ dnl first expand prefix and exec_prefix if necessary -+ prefix_save=$prefix -+ exec_prefix_save=$exec_prefix -+ -+ dnl if no prefix given, then use /usr/local, the default prefix -+ if test "x$prefix" = "xNONE"; then -+ prefix="$ac_default_prefix" -+ fi -+ dnl if no exec_prefix given, then use prefix -+ if test "x$exec_prefix" = "xNONE"; then -+ exec_prefix=$prefix -+ fi -+ -+ full_var="$FROM_VAR" -+ dnl loop until it doesn't change anymore -+ while true; do -+ new_full_var="`eval echo $full_var`" -+ if test "x$new_full_var" = "x$full_var"; then break; fi -+ full_var=$new_full_var -+ done -+ -+ dnl clean up -+ full_var=$new_full_var -+ AC_SUBST([$1], "$full_var") -+ -+ dnl restore prefix and exec_prefix -+ prefix=$prefix_save -+ exec_prefix=$exec_prefix_save -+]) -+ -+m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], -+[ -+ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first -+ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first -+ AC_BEFORE([LT_INIT],[$0])dnl setup libtool first -+ -+ dnl enable/disable introspection -+ m4_if([$2], [require], -+ [dnl -+ enable_introspection=yes -+ ],[dnl -+ AC_ARG_ENABLE(introspection, -+ AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], -+ [Enable introspection for this build]),, -+ [enable_introspection=auto]) -+ ])dnl -+ -+ AC_MSG_CHECKING([for gobject-introspection]) -+ -+ dnl presence/version checking -+ AS_CASE([$enable_introspection], -+ [no], [dnl -+ found_introspection="no (disabled, use --enable-introspection to enable)" -+ ],dnl -+ [yes],[dnl -+ PKG_CHECK_EXISTS([gobject-introspection-1.0],, -+ AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) -+ PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], -+ found_introspection=yes, -+ AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) -+ ],dnl -+ [auto],[dnl -+ PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) -+ dnl Canonicalize enable_introspection -+ enable_introspection=$found_introspection -+ ],dnl -+ [dnl -+ AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) -+ ])dnl -+ -+ AC_MSG_RESULT([$found_introspection]) -+ -+ dnl expand datadir/libdir so we can pass them to pkg-config -+ dnl and get paths relative to our target directories -+ _GOBJECT_INTROSPECTION_AS_AC_EXPAND(_GI_EXP_DATADIR, "$datadir") -+ _GOBJECT_INTROSPECTION_AS_AC_EXPAND(_GI_EXP_LIBDIR, "$libdir") -+ -+ INTROSPECTION_SCANNER= -+ INTROSPECTION_COMPILER= -+ INTROSPECTION_GENERATE= -+ INTROSPECTION_GIRDIR= -+ INTROSPECTION_TYPELIBDIR= -+ if test "x$found_introspection" = "xyes"; then -+ INTROSPECTION_SCANNER=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` -+ INTROSPECTION_COMPILER=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` -+ INTROSPECTION_GENERATE=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` -+ INTROSPECTION_GIRDIR=`$PKG_CONFIG --define-variable=datadir="${_GI_EXP_DATADIR}" --variable=girdir gobject-introspection-1.0` -+ INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --define-variable=libdir="${_GI_EXP_LIBDIR}" --variable=typelibdir gobject-introspection-1.0)" -+ INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` -+ INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` -+ INTROSPECTION_MAKEFILE=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection -+ fi -+ AC_SUBST(INTROSPECTION_SCANNER) -+ AC_SUBST(INTROSPECTION_COMPILER) -+ AC_SUBST(INTROSPECTION_GENERATE) -+ AC_SUBST(INTROSPECTION_GIRDIR) -+ AC_SUBST(INTROSPECTION_TYPELIBDIR) -+ AC_SUBST(INTROSPECTION_CFLAGS) -+ AC_SUBST(INTROSPECTION_LIBS) -+ AC_SUBST(INTROSPECTION_MAKEFILE) -+ -+ AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") -+]) -+ -+ -+dnl Usage: -+dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) -+ -+AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], -+[ -+ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) -+]) -+ -+dnl Usage: -+dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) -+ -+ -+AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], -+[ -+ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) -+]) -diff --git a/configure.ac b/configure.ac -index 5cedb4e..87aa0ad 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -111,7 +111,7 @@ AC_CHECK_LIB(expat,XML_ParserCreate,[EXPAT_LIBS="-lexpat"], - [AC_MSG_ERROR([Can't find expat library. Please install expat.])]) - AC_SUBST(EXPAT_LIBS) - --AC_CHECK_FUNCS(clearenv fdatasync) -+AC_CHECK_FUNCS(clearenv fdatasync setnetgrent) - - if test "x$GCC" = "xyes"; then - LDFLAGS="-Wl,--as-needed $LDFLAGS" -diff --git a/src/polkit/polkitidentity.c b/src/polkit/polkitidentity.c -index 3aa1f7f..10e9c17 100644 ---- a/src/polkit/polkitidentity.c -+++ b/src/polkit/polkitidentity.c -@@ -182,7 +182,15 @@ polkit_identity_from_string (const gchar *str, - } - else if (g_str_has_prefix (str, "unix-netgroup:")) - { -+#ifndef HAVE_SETNETGRENT -+ g_set_error (error, -+ POLKIT_ERROR, -+ POLKIT_ERROR_FAILED, -+ "Netgroups are not available on this machine ('%s')", -+ str); -+#else - identity = polkit_unix_netgroup_new (str + sizeof "unix-netgroup:" - 1); -+#endif - } - - if (identity == NULL && (error != NULL && *error == NULL)) -@@ -344,6 +352,13 @@ polkit_identity_new_for_gvariant (GVariant *variant, - GVariant *v; - const char *name; - -+#ifndef HAVE_SETNETGRENT -+ g_set_error (error, -+ POLKIT_ERROR, -+ POLKIT_ERROR_FAILED, -+ "Netgroups are not available on this machine"); -+ goto out; -+#else - v = lookup_asv (details_gvariant, "name", G_VARIANT_TYPE_STRING, error); - if (v == NULL) - { -@@ -353,6 +368,7 @@ polkit_identity_new_for_gvariant (GVariant *variant, - name = g_variant_get_string (v, NULL); - ret = polkit_unix_netgroup_new (name); - g_variant_unref (v); -+#endif - } - else - { -diff --git a/src/polkit/polkitunixnetgroup.c b/src/polkit/polkitunixnetgroup.c -index 8a2b369..83f8d4a 100644 ---- a/src/polkit/polkitunixnetgroup.c -+++ b/src/polkit/polkitunixnetgroup.c -@@ -194,6 +194,9 @@ polkit_unix_netgroup_set_name (PolkitUnixNetgroup *group, - PolkitIdentity * - polkit_unix_netgroup_new (const gchar *name) - { -+#ifndef HAVE_SETNETGRENT -+ g_assert_not_reached(); -+#endif - g_return_val_if_fail (name != NULL, NULL); - return POLKIT_IDENTITY (g_object_new (POLKIT_TYPE_UNIX_NETGROUP, - "name", name, -diff --git a/src/polkitbackend/polkitbackendduktapeauthority.c b/src/polkitbackend/polkitbackendduktapeauthority.c -index 4b4f8fd..e19b009 100644 ---- a/src/polkitbackend/polkitbackendduktapeauthority.c -+++ b/src/polkitbackend/polkitbackendduktapeauthority.c -@@ -1036,6 +1036,7 @@ js_polkit_user_is_in_netgroup (duk_context *cx) - const char *netgroup; - gboolean is_in_netgroup = FALSE; - -+#ifdef HAVE_SETNETGRENT - user = duk_require_string (cx, 0); - netgroup = duk_require_string (cx, 1); - -@@ -1046,6 +1047,7 @@ js_polkit_user_is_in_netgroup (duk_context *cx) - { - is_in_netgroup = TRUE; - } -+#endif - - duk_push_boolean (cx, is_in_netgroup); - return 1; -diff --git a/src/polkitbackend/polkitbackendinteractiveauthority.c b/src/polkitbackend/polkitbackendinteractiveauthority.c -index 056d9a8..36c2f3d 100644 ---- a/src/polkitbackend/polkitbackendinteractiveauthority.c -+++ b/src/polkitbackend/polkitbackendinteractiveauthority.c -@@ -2233,25 +2233,26 @@ get_users_in_net_group (PolkitIdentity *group, - GList *ret; - - ret = NULL; -+#ifdef HAVE_SETNETGRENT - name = polkit_unix_netgroup_get_name (POLKIT_UNIX_NETGROUP (group)); - --#ifdef HAVE_SETNETGRENT_RETURN -+# ifdef HAVE_SETNETGRENT_RETURN - if (setnetgrent (name) == 0) - { - g_warning ("Error looking up net group with name %s: %s", name, g_strerror (errno)); - goto out; - } --#else -+# else - setnetgrent (name); --#endif -+# endif /* HAVE_SETNETGRENT_RETURN */ - - for (;;) - { --#if defined(HAVE_NETBSD) || defined(HAVE_OPENBSD) -+# if defined(HAVE_NETBSD) || defined(HAVE_OPENBSD) - const char *hostname, *username, *domainname; --#else -+# else - char *hostname, *username, *domainname; --#endif -+# endif /* defined(HAVE_NETBSD) || defined(HAVE_OPENBSD) */ - PolkitIdentity *user; - GError *error = NULL; - -@@ -2282,6 +2283,7 @@ get_users_in_net_group (PolkitIdentity *group, - - out: - endnetgrent (); -+#endif /* HAVE_SETNETGRENT */ - return ret; - } - -diff --git a/src/polkitbackend/polkitbackendjsauthority.cpp b/src/polkitbackend/polkitbackendjsauthority.cpp -index 9b752d1..09b2878 100644 ---- a/src/polkitbackend/polkitbackendjsauthority.cpp -+++ b/src/polkitbackend/polkitbackendjsauthority.cpp -@@ -1520,6 +1520,7 @@ js_polkit_user_is_in_netgroup (JSContext *cx, - - JS::CallArgs args = JS::CallArgsFromVp (argc, vp); - -+#ifdef HAVE_SETNETGRENT - JS::RootedString usrstr (authority->priv->cx); - usrstr = args[0].toString(); - user = JS_EncodeStringToUTF8 (cx, usrstr); -@@ -1534,7 +1535,7 @@ js_polkit_user_is_in_netgroup (JSContext *cx, - { - is_in_netgroup = true; - } -- -+#endif - ret = true; - - args.rval ().setBoolean (is_in_netgroup); -diff --git a/test/polkit/polkitidentitytest.c b/test/polkit/polkitidentitytest.c -index e91967b..e829aaa 100644 ---- a/test/polkit/polkitidentitytest.c -+++ b/test/polkit/polkitidentitytest.c -@@ -19,6 +19,7 @@ - * Author: Nikki VonHollen - */ - -+#include "config.h" - #include "glib.h" - #include - #include -@@ -145,11 +146,15 @@ struct ComparisonTestData comparison_test_data [] = { - {"unix-group:root", "unix-group:jane", FALSE}, - {"unix-group:jane", "unix-group:jane", TRUE}, - -+#ifdef HAVE_SETNETGRENT - {"unix-netgroup:foo", "unix-netgroup:foo", TRUE}, - {"unix-netgroup:foo", "unix-netgroup:bar", FALSE}, -+#endif - - {"unix-user:root", "unix-group:root", FALSE}, -+#ifdef HAVE_SETNETGRENT - {"unix-user:jane", "unix-netgroup:foo", FALSE}, -+#endif - - {NULL}, - }; -@@ -181,11 +186,13 @@ main (int argc, char *argv[]) - g_test_add_data_func ("/PolkitIdentity/group_string_2", "unix-group:jane", test_string); - g_test_add_data_func ("/PolkitIdentity/group_string_3", "unix-group:users", test_string); - -+#ifdef HAVE_SETNETGRENT - g_test_add_data_func ("/PolkitIdentity/netgroup_string", "unix-netgroup:foo", test_string); -+ g_test_add_data_func ("/PolkitIdentity/netgroup_gvariant", "unix-netgroup:foo", test_gvariant); -+#endif - - g_test_add_data_func ("/PolkitIdentity/user_gvariant", "unix-user:root", test_gvariant); - g_test_add_data_func ("/PolkitIdentity/group_gvariant", "unix-group:root", test_gvariant); -- g_test_add_data_func ("/PolkitIdentity/netgroup_gvariant", "unix-netgroup:foo", test_gvariant); - - add_comparison_tests (); - -diff --git a/test/polkit/polkitunixnetgrouptest.c b/test/polkit/polkitunixnetgrouptest.c -index 3701ba1..e3352eb 100644 ---- a/test/polkit/polkitunixnetgrouptest.c -+++ b/test/polkit/polkitunixnetgrouptest.c -@@ -19,6 +19,7 @@ - * Author: Nikki VonHollen - */ - -+#include "config.h" - #include "glib.h" - #include - #include -@@ -69,7 +70,9 @@ int - main (int argc, char *argv[]) - { - g_test_init (&argc, &argv, NULL); -+#ifdef HAVE_SETNETGRENT - g_test_add_func ("/PolkitUnixNetgroup/new", test_new); - g_test_add_func ("/PolkitUnixNetgroup/set_name", test_set_name); -+#endif - return g_test_run (); - } -diff --git a/test/polkitbackend/test-polkitbackendjsauthority.c b/test/polkitbackend/test-polkitbackendjsauthority.c -index 71aad23..fdd28f3 100644 ---- a/test/polkitbackend/test-polkitbackendjsauthority.c -+++ b/test/polkitbackend/test-polkitbackendjsauthority.c -@@ -137,12 +137,14 @@ test_get_admin_identities (void) - "unix-group:users" - } - }, -+#ifdef HAVE_SETNETGRENT - { - "net.company.action3", - { - "unix-netgroup:foo" - } - }, -+#endif - }; - guint n; - --- -2.25.1 - diff --git a/package/polkit/0002-Don-t-pass-positional-parameters-to-i18n.merge_file.patch b/package/polkit/0002-Don-t-pass-positional-parameters-to-i18n.merge_file.patch deleted file mode 100644 index 25fa4ef19bc..00000000000 --- a/package/polkit/0002-Don-t-pass-positional-parameters-to-i18n.merge_file.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 30c368a6b729bc8a0a9d0d023739c4fa07b0928b Mon Sep 17 00:00:00 2001 -From: Simon McVittie -Date: Mon, 25 Oct 2021 20:21:27 +0100 -Subject: [PATCH] Don't pass positional parameters to i18n.merge_file - -These were always ignored, and Meson 0.60.0 disallowed them. - -Resolves: https://gitlab.freedesktop.org/polkit/polkit/-/issues/160 -Reference: https://github.com/mesonbuild/meson/pull/9445 -Signed-off-by: Simon McVittie -Signed-off-by: James Hilliard -[Upstream status: -https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/99] ---- - actions/meson.build | 1 - - src/examples/meson.build | 1 - - 2 files changed, 2 deletions(-) - -diff --git a/actions/meson.build b/actions/meson.build -index 2abaaf3..1e3f370 100644 ---- a/actions/meson.build -+++ b/actions/meson.build -@@ -1,7 +1,6 @@ - policy = 'org.freedesktop.policykit.policy' - - i18n.merge_file( -- policy, - input: policy + '.in', - output: '@BASENAME@', - po_dir: po_dir, -diff --git a/src/examples/meson.build b/src/examples/meson.build -index c6305ab..8c18de5 100644 ---- a/src/examples/meson.build -+++ b/src/examples/meson.build -@@ -1,7 +1,6 @@ - policy = 'org.freedesktop.policykit.examples.pkexec.policy' - - i18n.merge_file( -- policy, - input: policy + '.in', - output: '@BASENAME@', - po_dir: po_dir, --- -2.25.1 - diff --git a/package/polkit/Config.in b/package/polkit/Config.in index 622cbbb90b2..ca3323931c5 100644 --- a/package/polkit/Config.in +++ b/package/polkit/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_POLKIT depends on BR2_USE_MMU # libglib2, dbus depends on BR2_USE_WCHAR # libglib2 depends on !BR2_STATIC_LIBS # duktape + depends on !BR2_OPTIMIZE_FAST # duktape select BR2_PACKAGE_DBUS # runtime select BR2_PACKAGE_DUKTAPE select BR2_PACKAGE_EXPAT @@ -20,3 +21,6 @@ comment "polkit needs a toolchain with dynamic library, wchar, threads, gcc >= 7 depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS + +comment "polkit can't be built with Optimize for fast" + depends on BR2_OPTIMIZE_FAST diff --git a/package/polkit/S50polkit b/package/polkit/S50polkit deleted file mode 100755 index f07e2d613ba..00000000000 --- a/package/polkit/S50polkit +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/sh - -DAEMON="polkitd" -DAEMON_PATH="/usr/lib/polkit-1/${DAEMON}" -PIDFILE="/var/run/${DAEMON}.pid" -POLKITD_ARGS="--no-debug" - -# polkitd does not create a pidfile, so pass "-n" in the command line -# and use "-m" to instruct start-stop-daemon to create one. -start() { - printf 'Starting %s: ' "${DAEMON}" - # shellcheck disable=SC2086 # we need the word splitting - start-stop-daemon -bmSqp "$PIDFILE" -x ${DAEMON_PATH} -- ${POLKITD_ARGS} - status=$? - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -stop() { - printf 'Stopping %s: ' "${DAEMON}" - start-stop-daemon -Kqp "$PIDFILE" - status=$? - if [ "$status" -eq 0 ]; then - rm -f "$PIDFILE" - echo "OK" - else - echo "FAIL" - fi - return "$status" -} - -restart() { - stop - sleep 1 - start -} - -case "$1" in - start|stop|restart|reload) - "$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/polkit/S50polkitd b/package/polkit/S50polkitd new file mode 100644 index 00000000000..5810e780a03 --- /dev/null +++ b/package/polkit/S50polkitd @@ -0,0 +1,51 @@ +#!/bin/sh + +DAEMON="polkitd" +DAEMON_PATH="/usr/lib/polkit-1/${DAEMON}" +PIDFILE="/var/run/${DAEMON}.pid" +POLKITD_ARGS="--no-debug" + +# polkitd does not create a pidfile, so pass "-n" in the command line +# and use "-m" to instruct start-stop-daemon to create one. +start() { + printf 'Starting %s: ' "${DAEMON}" + # shellcheck disable=SC2086 # we need the word splitting + start-stop-daemon -bmSqp "$PIDFILE" -x ${DAEMON_PATH} -- ${POLKITD_ARGS} + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +stop() { + printf 'Stopping %s: ' "${DAEMON}" + start-stop-daemon -Kqp "$PIDFILE" + status=$? + if [ "$status" -eq 0 ]; then + rm -f "$PIDFILE" + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +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 diff --git a/package/polkit/polkit.hash b/package/polkit/polkit.hash index 1fedb5a7074..ffdc2a7568a 100644 --- a/package/polkit/polkit.hash +++ b/package/polkit/polkit.hash @@ -1,5 +1,3 @@ -# Locally calculated after checking pgp signature -sha256 243fa69d1e480510c504723487716cda7d6fb588360c7c8f7ec6ba4a3f6ae60e polkit-a2bf5c9c83b6ae46cbd5c779d3055bff81ded683.tar.gz - # Locally calculated +sha256 0d69656d60800835c3d7d1f0a8362b32e1ae3ace2875a35bb624296fc52d5dc4 polkit-122.tar.gz sha256 d2e2aa973e29c75e1b492e67ea7b7da9de2d501d49a934657971fd74f9a0b0a8 COPYING diff --git a/package/polkit/polkit.mk b/package/polkit/polkit.mk index 61666594a2a..dab5d542ebd 100644 --- a/package/polkit/polkit.mk +++ b/package/polkit/polkit.mk @@ -4,16 +4,12 @@ # ################################################################################ -POLKIT_VERSION = a2bf5c9c83b6ae46cbd5c779d3055bff81ded683 +POLKIT_VERSION = 122 POLKIT_SITE = https://gitlab.freedesktop.org/polkit/polkit/-/archive/$(POLKIT_VERSION) POLKIT_LICENSE = GPL-2.0 POLKIT_LICENSE_FILES = COPYING POLKIT_CPE_ID_VENDOR = polkit_project POLKIT_INSTALL_STAGING = YES - -# Fix was comitted in a2bf5c9c83b6ae46cbd5c779d3055bff81ded683 -POLKIT_IGNORE_CVE = CVE-2021-4034 - POLKIT_DEPENDENCIES = \ duktape libglib2 host-intltool expat $(TARGET_NLS_DEPENDENCIES) @@ -56,9 +52,10 @@ define POLKIT_USERS endef define POLKIT_PERMISSIONS - /etc/polkit-1 r 750 root polkitd - - - - - - /usr/share/polkit-1 r 750 root polkitd - - - - - + /etc/polkit-1/rules.d d 700 polkitd root - - - - - + /usr/share/polkit-1/rules.d d 700 polkitd root - - - - - /usr/bin/pkexec f 4755 root root - - - - - + /usr/lib/polkit-1/polkit-agent-helper-1 f 4755 root root - - - - - endef define POLKIT_INSTALL_INIT_SYSTEMD @@ -68,8 +65,8 @@ define POLKIT_INSTALL_INIT_SYSTEMD endef define POLKIT_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 package/polkit/S50polkit \ - $(TARGET_DIR)/etc/init.d/S50polkit + $(INSTALL) -D -m 0755 package/polkit/S50polkitd \ + $(TARGET_DIR)/etc/init.d/S50polkitd endef $(eval $(meson-package)) diff --git a/package/popperjs/popperjs.hash b/package/popperjs/popperjs.hash index d9cdabc32ca..a2388f5b7a3 100644 --- a/package/popperjs/popperjs.hash +++ b/package/popperjs/popperjs.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 83eecef51d10826faca2cd5cabb344e0bef6d4127d7e728db9e4d8308b7b15d1 popperjs-1.16.0.tar.gz -sha256 2961310ed05cd9373a08b8191c071425a7fede0ca5d807ca38fa5f5f61c5b834 LICENSE.md +sha256 83eecef51d10826faca2cd5cabb344e0bef6d4127d7e728db9e4d8308b7b15d1 popperjs-1.16.0.tar.gz +sha256 2961310ed05cd9373a08b8191c071425a7fede0ca5d807ca38fa5f5f61c5b834 LICENSE.md diff --git a/package/poppler/0001-Include-setjmp-h-when-WITH_JPEG-yes-and-WITH_PNG-no.patch b/package/poppler/0001-Include-setjmp-h-when-WITH_JPEG-yes-and-WITH_PNG-no.patch deleted file mode 100644 index 40af6a2e001..00000000000 --- a/package/poppler/0001-Include-setjmp-h-when-WITH_JPEG-yes-and-WITH_PNG-no.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 3ea6bca90d87d3f91556205c4e58ca425c6ac437 Mon Sep 17 00:00:00 2001 -From: Marco Genasci -Date: Sun, 12 Dec 2021 10:23:37 +0100 -Subject: [PATCH] Include setjmp.h when WITH_JPEG=yes and WITH_PNG=no - -[Retrieved from: -https://gitlab.freedesktop.org/poppler/poppler/-/commit/3ea6bca90d87d3f91556205c4e58ca425c6ac437] -Signed-off-by: Fabrice Fontaine ---- - poppler/ImageEmbeddingUtils.cc | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/poppler/ImageEmbeddingUtils.cc b/poppler/ImageEmbeddingUtils.cc -index 5c50f1269..c26b9eb2a 100644 ---- a/poppler/ImageEmbeddingUtils.cc -+++ b/poppler/ImageEmbeddingUtils.cc -@@ -16,6 +16,7 @@ - extern "C" { - # include - } -+# include - #endif - #ifdef ENABLE_LIBPNG - # include --- -GitLab - diff --git a/package/poppler/0001-OutlineItem-open-Fix-crash-on-malformed-files.patch b/package/poppler/0001-OutlineItem-open-Fix-crash-on-malformed-files.patch new file mode 100644 index 00000000000..478759e0ccf --- /dev/null +++ b/package/poppler/0001-OutlineItem-open-Fix-crash-on-malformed-files.patch @@ -0,0 +1,45 @@ +From e5cc11e0b5b867f4705fd28ff1b981c1224be1cd Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid +Date: Wed, 17 May 2023 22:42:05 +0200 +Subject: [PATCH] OutlineItem::open: Fix crash on malformed files + +Fixes #1399 + +Upstream: https://gitlab.freedesktop.org/poppler/poppler/-/commit/591235c8b6c65a2eee88991b9ae73490fd9afdfe +[Thomas: backported to fix CVE-2023-34872] +Signed-off-by: Thomas Petazzoni +--- + poppler/Outline.cc | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/poppler/Outline.cc b/poppler/Outline.cc +index cbb6cb49..4c68be99 100644 +--- a/poppler/Outline.cc ++++ b/poppler/Outline.cc +@@ -14,7 +14,7 @@ + // under GPL version 2 or later + // + // Copyright (C) 2005 Marco Pesenti Gritti +-// Copyright (C) 2008, 2016-2019, 2021 Albert Astals Cid ++// Copyright (C) 2008, 2016-2019, 2021, 2023 Albert Astals Cid + // Copyright (C) 2009 Nick Jones + // Copyright (C) 2016 Jason Crain + // Copyright (C) 2017 Adrian Johnson +@@ -483,8 +483,12 @@ void OutlineItem::open() + { + if (!kids) { + Object itemDict = xref->fetch(ref); +- const Object &firstRef = itemDict.dictLookupNF("First"); +- kids = readItemList(this, &firstRef, xref, doc); ++ if (itemDict.isDict()) { ++ const Object &firstRef = itemDict.dictLookupNF("First"); ++ kids = readItemList(this, &firstRef, xref, doc); ++ } else { ++ kids = new std::vector(); ++ } + } + } + +-- +2.41.0 + diff --git a/package/poppler/poppler.hash b/package/poppler/poppler.hash index cf6c5370633..bb07b2ee6af 100644 --- a/package/poppler/poppler.hash +++ b/package/poppler/poppler.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 acb840c2c1ec07d07e53c57c4b3a1ff3e3ee2d888d44e1e9f2f01aaf16814de7 poppler-21.12.0.tar.xz +sha256 d9aa9cacdfbd0f8e98fc2b3bb008e645597ed480685757c3e7bc74b4278d15c0 poppler-22.12.0.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/poppler/poppler.mk b/package/poppler/poppler.mk index 18c044a9f63..776fb4d5667 100644 --- a/package/poppler/poppler.mk +++ b/package/poppler/poppler.mk @@ -4,13 +4,15 @@ # ################################################################################ -POPPLER_VERSION = 21.12.0 +POPPLER_VERSION = 22.12.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 = \ @@ -44,7 +46,11 @@ endif ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) POPPLER_DEPENDENCIES += gobject-introspection -POPPLER_CONF_OPTS += -DENABLE_GOBJECT_INTROSPECTION=ON +POPPLER_CONF_OPTS += \ + -DENABLE_GOBJECT_INTROSPECTION=ON \ + -DINTROSPECTION_SCANNER=$(STAGING_DIR)/usr/bin/g-ir-scanner \ + -DINTROSPECTION_COMPILER=$(STAGING_DIR)/usr/bin/g-ir-compiler \ + -DINTROSPECTION_COMPILER_ARGS="--includedir=$(STAGING_DIR)/usr/share/gir-1.0" else POPPLER_CONF_OPTS += -DENABLE_GOBJECT_INTROSPECTION=OFF endif diff --git a/package/popt/0001-add-libiconv-to-popt.pc.patch b/package/popt/0001-add-libiconv-to-popt.pc.patch deleted file mode 100644 index baa3cd530d0..00000000000 --- a/package/popt/0001-add-libiconv-to-popt.pc.patch +++ /dev/null @@ -1,19 +0,0 @@ -Add LTLIBICONV to popt.pc.in - -Add ${LTLIBICONV} to popt.pc.in so applications such as shairport-sync -will know that they must link with -liconv when building statically - -Fixes: - - http://autobuild.buildroot.org/results/c5b0d1d2867e49c022a2ad971dd9f358ff0f3865 - -Signed-off-by: Fabrice Fontaine - -diff -Naurp popt-1.18-vanilla/popt.pc.in popt-1.18/popt.pc.in ---- popt-1.18-vanilla/popt.pc.in 2020-03-24 10:36:25.000000000 +0100 -+++ popt-1.18/popt.pc.in 2020-09-18 21:18:03.112609343 +0200 -@@ -7,4 +7,5 @@ Name: popt - Version: @VERSION@ - Description: popt library. - Libs: -L${libdir} -lpopt -+Libs.private: @LTLIBICONV@ - Cflags: -I${includedir} diff --git a/package/popt/0002-Detect-glob_pattern_p.patch b/package/popt/0002-Detect-glob_pattern_p.patch deleted file mode 100644 index f64ad36f86a..00000000000 --- a/package/popt/0002-Detect-glob_pattern_p.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 3938da1286534e4b280340411336eed5b6311d1b Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 15 Jul 2020 23:21:32 +0200 -Subject: [PATCH] Detect glob_pattern_p() - -The current popt build system tests the existence of , and -then assumes that if __GLIBC__ is defined, then glob_pattern_p() must -be available. Unfortunately, that's not true with uClibc: may -be installed, but not necessarily the GNU glob extensions... and -uClibc defines __GLIBC__. This is causing build issues with certain -uClibc toolchains that do not have GNU glob extensions enabled. - -To fix this, this patch adds an AC_CHECK_FUNCS() test for -glob_pattern_p, and uses that to find out whether glob_pattern_p() is -available or not. - -Signed-off-by: Thomas Petazzoni -[Retrieved (and slightly updated) from: -https://git.buildroot.net/buildroot/tree/package/popt/0003-glob-detection.patch] -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/rpm-software-management/popt/commit/3938da1286534e4b280340411336eed5b6311d1b] ---- - configure.ac | 2 +- - src/poptconfig.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index a5568c4..3b71d1a 100755 ---- a/configure.ac -+++ b/configure.ac -@@ -50,7 +50,7 @@ AC_ARG_ENABLE(build-gcov, - ]) - - AC_SEARCH_LIBS(setreuid, [ucb]) --AC_CHECK_FUNCS(getuid geteuid iconv mtrace secure_getenv __secure_getenv setreuid setuid stpcpy strerror vasprintf srandom) -+AC_CHECK_FUNCS(getuid geteuid iconv mtrace secure_getenv __secure_getenv setreuid setuid stpcpy strerror vasprintf srandom glob_pattern_p) - - AM_GNU_GETTEXT_VERSION([0.18.2]) - AM_GNU_GETTEXT([external]) -diff --git a/src/poptconfig.c b/src/poptconfig.c -index 9d97ccd..b4d1b76 100644 ---- a/src/poptconfig.c -+++ b/src/poptconfig.c -@@ -21,7 +21,7 @@ - #if defined(HAVE_GLOB_H) - #include - --#if !defined(__GLIBC__) -+#if !defined(HAVE_GLOB_PATTERN_P) - /* Return nonzero if PATTERN contains any metacharacters. - Metacharacters can be quoted with backslashes if QUOTE is nonzero. */ - static int diff --git a/package/popt/0003-configure-replace-deprecated-macros.patch b/package/popt/0003-configure-replace-deprecated-macros.patch deleted file mode 100644 index 32a6a8dc27b..00000000000 --- a/package/popt/0003-configure-replace-deprecated-macros.patch +++ /dev/null @@ -1,76 +0,0 @@ -From f492b19f59229b0494b5b9ffe5c660a35493a405 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= -Date: Mon, 29 Jun 2020 18:58:09 +0200 -Subject: [PATCH] configure: replace deprecated macros - -* use LT_INIT instead of deprecated AC_PROG_LIBTOOL -* use AS_HELP_STRING instead of deprecated AC_HELP_STRING -* quote macros - -[Retrieved from: -https://github.com/rpm-software-management/popt/commit/f492b19f59229b0494b5b9ffe5c660a35493a405] -Signed-off-by: Fabrice Fontaine ---- - configure.ac | 20 ++++++++++---------- - 1 file changed, 10 insertions(+), 10 deletions(-) - mode change 100755 => 100644 configure.ac - -diff --git a/configure.ac b/configure.ac -old mode 100755 -new mode 100644 -index 3b71d1a..009ae7b ---- a/configure.ac -+++ b/configure.ac -@@ -1,5 +1,5 @@ --AC_PREREQ(2.57) --AC_INIT(popt, 1.18, rpm-maint@lists.rpm.org) -+AC_PREREQ([2.57]) -+AC_INIT([popt], [1.18], [rpm-maint@lists.rpm.org]) - AC_CONFIG_SRCDIR([src/popt.h]) - AC_CONFIG_HEADERS([config.h]) - -@@ -14,11 +14,11 @@ AC_USE_SYSTEM_EXTENSIONS - AM_PROG_AR - - AC_PROG_INSTALL --AC_PROG_LIBTOOL -+LT_INIT - - AC_SYS_LARGEFILE - --AC_CHECK_HEADERS(fnmatch.h glob.h langinfo.h libintl.h mcheck.h stdalign.h) -+AC_CHECK_HEADERS([fnmatch.h glob.h langinfo.h libintl.h mcheck.h stdalign.h]) - - # For some systems we know that we have ld_version scripts. - # Use it then as default. -@@ -32,15 +32,15 @@ case "${host}" in - ;; - esac - AC_ARG_ENABLE([ld-version-script], -- AC_HELP_STRING([--enable-ld-version-script], -+ [AS_HELP_STRING([--enable-ld-version-script], - [enable/disable use of linker version script. -- (default is system dependent)]), -+ (default is system dependent)])], - [have_ld_version_script=$enableval], - [ : ] ) - AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes") - --AC_ARG_ENABLE(build-gcov, -- AS_HELP_STRING([--enable-build-gcov], [build POPT instrumented for gcov]), [dnl -+AC_ARG_ENABLE([build-gcov], -+ [AS_HELP_STRING([--enable-build-gcov], [build POPT instrumented for gcov])], [dnl - if test ".$enableval" = .yes; then - if test ".`$CC --version 2>&1 | grep 'GCC'`" != .; then - dnl # GNU GCC (usually "gcc") -@@ -49,8 +49,8 @@ AC_ARG_ENABLE(build-gcov, - fi - ]) - --AC_SEARCH_LIBS(setreuid, [ucb]) --AC_CHECK_FUNCS(getuid geteuid iconv mtrace secure_getenv __secure_getenv setreuid setuid stpcpy strerror vasprintf srandom glob_pattern_p) -+AC_SEARCH_LIBS([setreuid], [ucb]) -+AC_CHECK_FUNCS([getuid geteuid iconv mtrace secure_getenv __secure_getenv setreuid setuid stpcpy strerror vasprintf srandom glob_pattern_p]) - - AM_GNU_GETTEXT_VERSION([0.18.2]) - AM_GNU_GETTEXT([external]) diff --git a/package/popt/0004-fix-build-without-wchar.patch b/package/popt/0004-fix-build-without-wchar.patch deleted file mode 100644 index a5bb09918d9..00000000000 --- a/package/popt/0004-fix-build-without-wchar.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 41911aac46d69df6a205af59d60f23a418b0e875 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 2 Sep 2020 11:55:17 +0200 -Subject: [PATCH] fix build without wchar - -Check for wchar.h and use HAVE_WCHAR_H instead of hardcoding -POPT_WCHAR_HACK to fix the build with (embedded) toolchains that don't -support wchar - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/rpm-software-management/popt/commit/41911aac46d69df6a205af59d60f23a418b0e875] ---- - configure.ac | 2 +- - src/popthelp.c | 5 ++--- - 2 files changed, 3 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 009ae7b..1fce6df 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -18,7 +18,7 @@ LT_INIT - - AC_SYS_LARGEFILE - --AC_CHECK_HEADERS([fnmatch.h glob.h langinfo.h libintl.h mcheck.h stdalign.h]) -+AC_CHECK_HEADERS([fnmatch.h glob.h langinfo.h libintl.h mcheck.h stdalign.h wchar.h]) - - # For some systems we know that we have ld_version scripts. - # Use it then as default. -diff --git a/src/popthelp.c b/src/popthelp.c -index 9a3f489..5cbc1f4 100644 ---- a/src/popthelp.c -+++ b/src/popthelp.c -@@ -15,8 +15,7 @@ - #include - #endif - --#define POPT_WCHAR_HACK --#ifdef POPT_WCHAR_HACK -+#ifdef HAVE_WCHAR_H - #include /* for mbsrtowcs */ - #endif - #include "poptint.h" -@@ -118,7 +117,7 @@ static size_t maxColumnWidth(FILE *fp) - static inline size_t stringDisplayWidth(const char *s) - { - size_t n = strlen(s); --#ifdef POPT_WCHAR_HACK -+#ifdef HAVE_WCHAR_H - mbstate_t t; - - memset ((void *)&t, 0, sizeof (t)); /* In initial state. */ diff --git a/package/popt/0005-fix-build-without-mbstate_t.patch b/package/popt/0005-fix-build-without-mbstate_t.patch deleted file mode 100644 index 12bc73ee950..00000000000 --- a/package/popt/0005-fix-build-without-mbstate_t.patch +++ /dev/null @@ -1,68 +0,0 @@ -From e4788a0f9d820574a165b2609ff16b717ce0baba Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 19 Sep 2020 18:51:15 +0200 -Subject: [PATCH] fix build without mbstate_t - -Commit 41911aac46d69df6a205af59d60f23a418b0e875 tried to fix build -without wchar by checking for the availability of wchar.h however some -toolchains have wchar.h but does not define mbstate_t and mbsrtowcs so -replace HAVE_WCHAR_H by HAVE_MBSRTOWCS - -Fixes: - - http://autobuild.buildroot.org/results/27f184af35468941173628e5e847a284c0b80d73 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://github.com/rpm-software-management/popt/pull/51] ---- - configure.ac | 4 ++-- - src/popthelp.c | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 1fce6df..442086b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -18,7 +18,7 @@ LT_INIT - - AC_SYS_LARGEFILE - --AC_CHECK_HEADERS([fnmatch.h glob.h langinfo.h libintl.h mcheck.h stdalign.h wchar.h]) -+AC_CHECK_HEADERS([fnmatch.h glob.h langinfo.h libintl.h mcheck.h stdalign.h]) - - # For some systems we know that we have ld_version scripts. - # Use it then as default. -@@ -50,7 +50,7 @@ AC_ARG_ENABLE([build-gcov], - ]) - - AC_SEARCH_LIBS([setreuid], [ucb]) --AC_CHECK_FUNCS([getuid geteuid iconv mtrace secure_getenv __secure_getenv setreuid setuid stpcpy strerror vasprintf srandom glob_pattern_p]) -+AC_CHECK_FUNCS([getuid geteuid iconv mtrace secure_getenv __secure_getenv setreuid setuid stpcpy strerror vasprintf srandom glob_pattern_p mbsrtowcs]) - - AM_GNU_GETTEXT_VERSION([0.18.2]) - AM_GNU_GETTEXT([external]) -diff --git a/src/popthelp.c b/src/popthelp.c -index f604516..b4ab9b4 100644 ---- a/src/popthelp.c -+++ b/src/popthelp.c -@@ -15,7 +15,7 @@ - #include - #endif - --#ifdef HAVE_WCHAR_H -+#ifdef HAVE_MBSRTOWCS - #include /* for mbsrtowcs */ - #endif - #include "poptint.h" -@@ -117,7 +117,7 @@ static size_t maxColumnWidth(FILE *fp) - static inline size_t stringDisplayWidth(const char *s) - { - size_t n = strlen(s); --#ifdef HAVE_WCHAR_H -+#ifdef HAVE_MBSRTOWCS - mbstate_t t; - - memset ((void *)&t, 0, sizeof (t)); /* In initial state. */ --- -2.28.0 - diff --git a/package/popt/popt.hash b/package/popt/popt.hash index 9b5efe4be69..63d96326a64 100644 --- a/package/popt/popt.hash +++ b/package/popt/popt.hash @@ -1,3 +1,3 @@ # Locally calculated: -sha256 5159bc03a20b28ce363aa96765f37df99ea4d8850b1ece17d1e6ad5c24fdc5d1 popt-1.18.tar.gz -sha256 518d4f2a05064cb9a8ec0ea02e86408af4feed6916f78ef42171465db8b383c5 COPYING +sha256 c25a4838fc8e4c1c8aacb8bd620edb3084a3d63bf8987fdad3ca2758c63240f9 popt-1.19.tar.gz +sha256 2b488b239927935f34769a39309c0680be16e3725a1f55dbb06ed20d53852801 COPYING diff --git a/package/popt/popt.mk b/package/popt/popt.mk index f00bf115ee1..842cf0d0352 100644 --- a/package/popt/popt.mk +++ b/package/popt/popt.mk @@ -4,7 +4,7 @@ # ################################################################################ -POPT_VERSION = 1.18 +POPT_VERSION = 1.19 POPT_SITE = http://ftp.rpm.org/popt/releases/popt-1.x POPT_INSTALL_STAGING = YES POPT_LICENSE = MIT @@ -13,8 +13,6 @@ POPT_CPE_ID_VENDOR = popt_project POPT_GETTEXTIZE = YES POPT_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) -# We're patching configure.ac -POPT_AUTORECONF = YES POPT_CONF_ENV = ac_cv_va_copy=yes diff --git a/package/postgis/0001-Disable-forced-static-linking-of-liblwgeom.patch b/package/postgis/0001-Disable-forced-static-linking-of-liblwgeom.patch deleted file mode 100644 index 4329c9cd80a..00000000000 --- a/package/postgis/0001-Disable-forced-static-linking-of-liblwgeom.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 845c18c1288b7a96592901baadb198f96dd71c46 Mon Sep 17 00:00:00 2001 -From: fidomax -Date: Tue, 26 Jan 2021 09:49:19 +0300 -Subject: [PATCH] Disable forced static linking of liblwgeom - -In case of shared libs build fails: -ld: cannot find -lgeos_c -ld: attempted static link of dynamic object `/usr/lib/libproj.so' - -Signed-off-by: Maxim Kochetkov -Fetch from: https://github.com/postgis/postgis/commit/98070faad220e12fcaed9a583a70a37c510b7c6b.patch ---- - loader/Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/loader/Makefile.in b/loader/Makefile.in -index 9aebfe07f..9a0c90d3a 100644 ---- a/loader/Makefile.in -+++ b/loader/Makefile.in -@@ -44,7 +44,7 @@ ICONV_CFLAGS=@ICONV_CFLAGS@ - - # liblwgeom - LIBLWGEOM=../liblwgeom/liblwgeom.la --LDFLAGS += -static $(LIBLWGEOM) -+LDFLAGS += $(LIBLWGEOM) - - # GTK includes and libraries - GTK_CFLAGS = @GTK_CFLAGS@ @IGE_MAC_CFLAGS@ --- -2.30.0 - diff --git a/package/postgis/postgis.hash b/package/postgis/postgis.hash index 12ca18f84fa..8550a579393 100644 --- a/package/postgis/postgis.hash +++ b/package/postgis/postgis.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7ab9e154c6947c0cffb8fa12d70806add9aa060e62b6c86a2e206f9d4b507cfd postgis-3.2.0.tar.gz +sha256 9a2a219da005a1730a39d1959a1c7cec619b1efb009b65be80ffc25bad299068 postgis-3.3.2.tar.gz sha256 55b69f22e1752830dd565852dc7ff242daf289dbd3a6bfede5db43f90d2e28c9 LICENSE.TXT diff --git a/package/postgis/postgis.mk b/package/postgis/postgis.mk index d9cda647303..4148180adfe 100644 --- a/package/postgis/postgis.mk +++ b/package/postgis/postgis.mk @@ -4,7 +4,7 @@ # ################################################################################ -POSTGIS_VERSION = 3.2.0 +POSTGIS_VERSION = 3.3.2 POSTGIS_SITE = https://download.osgeo.org/postgis/source # parallel build issues POSTGIS_MAKE = $(MAKE1) @@ -21,13 +21,6 @@ POSTGIS_CONF_OPTS += \ --with-geosconfig=$(STAGING_DIR)/usr/bin/geos-config \ --with-xml2config=$(STAGING_DIR)/usr/bin/xml2-config -ifeq ($(BR2_PACKAGE_LIBGDAL),y) -POSTGIS_DEPENDENCIES += libgdal -POSTGIS_CONF_OPTS += --with-raster -else -POSTGIS_CONF_OPTS += --without-raster -endif - ifeq ($(BR2_PACKAGE_JSON_C),y) POSTGIS_DEPENDENCIES += json-c POSTGIS_CONF_OPTS += --with-json @@ -35,6 +28,13 @@ else POSTGIS_CONF_OPTS += --without-json endif +ifeq ($(BR2_PACKAGE_GDAL),y) +POSTGIS_DEPENDENCIES += gdal +POSTGIS_CONF_OPTS += --with-raster --with-gdalconfig=$(STAGING_DIR)/usr/bin/gdal-config +else +POSTGIS_CONF_OPTS += --without-raster +endif + ifeq ($(BR2_PACKAGE_PCRE),y) POSTGIS_DEPENDENCIES += pcre endif diff --git a/package/postgresql/Config.in b/package/postgresql/Config.in index b42b2195589..899907d6a56 100644 --- a/package/postgresql/Config.in +++ b/package/postgresql/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_POSTGRESQL # postgresql is unlikely to be used in a pure statically # linked environment. depends on !BR2_STATIC_LIBS + depends on !BR2_OPTIMIZE_FAST select BR2_PACKAGE_LIBOPENSSL_ENABLE_BLOWFISH if BR2_PACKAGE_LIBOPENSSL select BR2_PACKAGE_LIBOPENSSL_ENABLE_CAST if BR2_PACKAGE_LIBOPENSSL select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL @@ -34,3 +35,6 @@ endif comment "postgresql needs a toolchain w/ dynamic library, wchar" depends on BR2_USE_MMU depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR + +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 c2017a1226a..0640f883a75 100644 --- a/package/postgresql/postgresql.hash +++ b/package/postgresql/postgresql.hash @@ -1,5 +1,4 @@ -# From https://ftp.postgresql.org/pub/source/v14.1/postgresql-14.1.tar.bz2.sha256 -sha256 4d3c101ea7ae38982f06bdc73758b53727fb6402ecd9382006fa5ecc7c2ca41f postgresql-14.1.tar.bz2 - +# From https://ftp.postgresql.org/pub/source/v15.4/postgresql-15.4.tar.bz2.sha256 +sha256 baec5a4bdc4437336653b6cb5d9ed89be5bd5c0c58b94e0becee0a999e63c8f9 postgresql-15.4.tar.bz2 # License file, Locally calculated -sha256 31ccadc0a70e8e0e8a35c5833567b64388dfe34987d962e1911554e271294105 COPYRIGHT +sha256 1a7d13c3ab31961b91ba256f77d6e82e0b54bf992253060fe93bdb5466df416a COPYRIGHT diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 32aef0c68c6..b951b14aa09 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -4,7 +4,7 @@ # ################################################################################ -POSTGRESQL_VERSION = 14.1 +POSTGRESQL_VERSION = 15.4 POSTGRESQL_SOURCE = postgresql-$(POSTGRESQL_VERSION).tar.bz2 POSTGRESQL_SITE = https://ftp.postgresql.org/pub/source/v$(POSTGRESQL_VERSION) POSTGRESQL_LICENSE = PostgreSQL @@ -19,6 +19,10 @@ POSTGRESQL_CONF_ENV = \ POSTGRESQL_CONF_OPTS = --disable-rpath POSTGRESQL_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) +# 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" @@ -38,11 +42,11 @@ ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) POSTGRESQL_CONF_ENV += pgac_cv_type_locale_t=no endif -ifneq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +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)$(BR2_nds32),y) +ifeq ($(BR2_arcle)$(BR2_arceb)$(BR2_microblazeel)$(BR2_microblazebe)$(BR2_or1k)$(BR2_nios2)$(BR2_riscv)$(BR2_xtensa),y) POSTGRESQL_CONF_OPTS += --disable-spinlocks endif @@ -91,6 +95,20 @@ else POSTGRESQL_CONF_OPTS += --without-libxml endif +ifeq ($(BR2_PACKAGE_ZSTD),y) +POSTGRESQL_DEPENDENCIES += host-pkgconf zstd +POSTGRESQL_CONF_OPTS += --with-zstd +else +POSTGRESQL_CONF_OPTS += --without-zstd +endif + +ifeq ($(BR2_PACKAGE_LZ4),y) +POSTGRESQL_DEPENDENCIES += host-pkgconf lz4 +POSTGRESQL_CONF_OPTS += --with-lz4 +else +POSTGRESQL_CONF_OPTS += --without-lz4 +endif + # required for postgresql.service Type=notify ifeq ($(BR2_PACKAGE_SYSTEMD),y) POSTGRESQL_DEPENDENCIES += systemd @@ -101,7 +119,7 @@ endif POSTGRESQL_CFLAGS = $(TARGET_CFLAGS) -ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) +ifneq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_43744)$(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),) POSTGRESQL_CFLAGS += -O0 endif diff --git a/package/pound/pound.hash b/package/pound/pound.hash index 7fbf01b89b8..1e88218692f 100644 --- a/package/pound/pound.hash +++ b/package/pound/pound.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a7fd8690de0fd390615e79fd0f4bfd56a544b8ef97dd6659c07ecd3207480c25 Pound-2.8.tgz -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 GPL.txt +sha256 a7fd8690de0fd390615e79fd0f4bfd56a544b8ef97dd6659c07ecd3207480c25 Pound-2.8.tgz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 GPL.txt diff --git a/package/powerpc-utils/Config.in b/package/powerpc-utils/Config.in index d04d81c08ac..1ac247fe7c0 100644 --- a/package/powerpc-utils/Config.in +++ b/package/powerpc-utils/Config.in @@ -1,12 +1,17 @@ comment "powerpc-utils tools needs a toolchain w/ dynamic library" depends on BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le depends on BR2_STATIC_LIBS + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_ATOMIC config BR2_PACKAGE_POWERPC_UTILS bool "powerpc-utils" depends on !BR2_STATIC_LIBS # dlfcn.h depends on BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le + depends on BR2_USE_MMU # numactl + depends on BR2_TOOLCHAIN_HAS_ATOMIC # numactl select BR2_PACKAGE_ZLIB + select BR2_PACKAGE_NUMACTL help System utilities for PowerPC machines. @@ -16,7 +21,6 @@ if BR2_PACKAGE_POWERPC_UTILS config BR2_PACKAGE_POWERPC_UTILS_RTAS bool "RTAS support" - depends on BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_LIBRTAS help Enable support for functions that require RTAS. @@ -28,7 +32,4 @@ config BR2_PACKAGE_POWERPC_UTILS_RTAS lsslot, activate_firmware, rtas_ibm_get_vpd, serv_config, rtas_event_decode, sys_ident. -comment "RTAS support needs a glibc toolchain" - depends on !BR2_TOOLCHAIN_USES_GLIBC - endif diff --git a/package/powerpc-utils/powerpc-utils.hash b/package/powerpc-utils/powerpc-utils.hash index 8d0b10425b6..b3c77fb223b 100644 --- a/package/powerpc-utils/powerpc-utils.hash +++ b/package/powerpc-utils/powerpc-utils.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4e3a21419863c08adde49f0795eff0fbfe4597ce82593fa5fe1f1177913fb7b9 powerpc-utils-1.3.8.tar.gz +sha256 d64d9016a3e63a1e44c6e0833742cf964ae6bb1c6a9c7f0c7c5748aa335dc3db powerpc-utils-1.3.10.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/powerpc-utils/powerpc-utils.mk b/package/powerpc-utils/powerpc-utils.mk index b12194ae8e7..19fa84946c9 100644 --- a/package/powerpc-utils/powerpc-utils.mk +++ b/package/powerpc-utils/powerpc-utils.mk @@ -4,9 +4,9 @@ # ################################################################################ -POWERPC_UTILS_VERSION = 1.3.8 +POWERPC_UTILS_VERSION = 1.3.10 POWERPC_UTILS_SITE = $(call github,ibm-power-utilities,powerpc-utils,v$(POWERPC_UTILS_VERSION)) -POWERPC_UTILS_DEPENDENCIES = zlib +POWERPC_UTILS_DEPENDENCIES = zlib numactl POWERPC_UTILS_AUTORECONF = YES POWERPC_UTILS_LICENSE = GPL-2.0+ POWERPC_UTILS_LICENSE_FILES = COPYING diff --git a/package/pppd/0002-pppd-eap-tls.c-fix-build-with-libressl.patch b/package/pppd/0002-pppd-eap-tls.c-fix-build-with-libressl.patch new file mode 100644 index 00000000000..aefdc5b7a4c --- /dev/null +++ b/package/pppd/0002-pppd-eap-tls.c-fix-build-with-libressl.patch @@ -0,0 +1,36 @@ +From b0a011bc4abac8cb3de8dfff42b754ed236ecf0f Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 4 Jul 2022 10:07:03 +0200 +Subject: [PATCH] pppd/eap-tls.c: fix build with libressl (#338) + +Fix the following build failure with libressl: + +eap-tls.c: In function 'ssl_msg_callback': +eap-tls.c:1284:10: error: 'SSL3_RT_HEADER' undeclared (first use in this function); did you mean 'SSL3_RT_ALERT'? + 1284 | case SSL3_RT_HEADER: + | ^~~~~~~~~~~~~~ + | SSL3_RT_ALERT + +Fixes: + - http://autobuild.buildroot.org/results/7d721833bddf73531fa03b0a626511af6826d0df + +Signed-off-by: Fabrice Fontaine +[Retrieved (and backported) from: +https://github.com/ppp-project/ppp/commit/b0a011bc4abac8cb3de8dfff42b754ed236ecf0f] +--- + pppd/eap-tls.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pppd/eap-tls.c b/pppd/eap-tls.c +index b9bab842..40796d58 100644 +--- a/pppd/eap-tls.c ++++ b/pppd/eap-tls.c +@@ -61,7 +61,7 @@ + #include "mppe.h" + #include "pathnames.h" + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + + #define TLS_method SSLv23_method + diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk index 19b6f3ccce5..25d017a84f2 100644 --- a/package/pppd/pppd.mk +++ b/package/pppd/pppd.mk @@ -10,8 +10,8 @@ PPPD_LICENSE = LGPL-2.0+, LGPL, BSD-4-Clause, BSD-3-Clause, GPL-2.0+ PPPD_LICENSE_FILES = \ pppd/tdb.c pppd/plugins/pppoatm/COPYING \ pppdump/bsd-comp.c pppd/ccp.c pppd/plugins/passprompt.c -PPPD_CPE_ID_VENDOR = samba -PPPD_CPE_ID_PRODUCT = ppp +PPPD_CPE_ID_VENDOR = point-to-point_protocol_project +PPPD_CPE_ID_PRODUCT = point-to-point_protocol PPPD_SELINUX_MODULES = ppp PPPD_MAKE_OPTS = HAVE_INET6=y @@ -37,15 +37,6 @@ PPPD_DEPENDENCIES += libpcap PPPD_MAKE_OPTS += FILTER=y endif -# pppd bundles some but not all of the needed kernel headers. The embedded -# if_pppol2tp.h is unfortunately not compatible with kernel headers > 2.6.34, -# and has been part of the kernel headers since 2.6.23, so drop it -define PPPD_DROP_INTERNAL_IF_PPOL2TP_H - $(RM) $(@D)/include/linux/if_pppol2tp.h -endef - -PPPD_POST_EXTRACT_HOOKS += PPPD_DROP_INTERNAL_IF_PPOL2TP_H - # pppd defaults to /etc/ppp/resolv.conf, which not be writable and is # definitely not useful since the C library only uses # /etc/resolv.conf. Therefore, we change pppd to use /etc/resolv.conf diff --git a/package/pps-tools/Config.in b/package/pps-tools/Config.in index 0c4bb112a9b..16caef3e0ea 100644 --- a/package/pps-tools/Config.in +++ b/package/pps-tools/Config.in @@ -4,4 +4,4 @@ config BR2_PACKAGE_PPS_TOOLS Pulse per second tools. Provides timepps.h and other PPS utilities. - https://github.com/ago/pps-tools/ + https://github.com/redlab-i/pps-tools/ diff --git a/package/pps-tools/pps-tools.hash b/package/pps-tools/pps-tools.hash index ee3e4e3d793..b8cc2f64d51 100644 --- a/package/pps-tools/pps-tools.hash +++ b/package/pps-tools/pps-tools.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1168f1474235017af413afdb07288303ad7a7b12a0282f3bf9ed0e22fe0d7d2e pps-tools-e2b25049df9a4da28168b7378016f1650d0dfa6b.tar.gz +sha256 89163e29f1a4a0a702bbe25b900fd37d2eb86442329cefee58847e57e1964d7a pps-tools-1.0.3.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/pps-tools/pps-tools.mk b/package/pps-tools/pps-tools.mk index 2d82cf7dad3..0aa22acf4ed 100644 --- a/package/pps-tools/pps-tools.mk +++ b/package/pps-tools/pps-tools.mk @@ -4,8 +4,8 @@ # ################################################################################ -PPS_TOOLS_VERSION = e2b25049df9a4da28168b7378016f1650d0dfa6b -PPS_TOOLS_SITE = $(call github,ago,pps-tools,$(PPS_TOOLS_VERSION)) +PPS_TOOLS_VERSION = 1.0.3 +PPS_TOOLS_SITE = $(call github,redlab-i,pps-tools,v$(PPS_TOOLS_VERSION)) PPS_TOOLS_INSTALL_STAGING = YES PPS_TOOLS_LICENSE = GPL-2.0+ PPS_TOOLS_LICENSE_FILES = COPYING diff --git a/package/pptp-linux/pptp-linux.hash b/package/pptp-linux/pptp-linux.hash index 668e01c30b4..dc07c15d6f0 100644 --- a/package/pptp-linux/pptp-linux.hash +++ b/package/pptp-linux/pptp-linux.hash @@ -1,7 +1,7 @@ # From http://sourceforge.net/projects/pptpclient/files/pptp/pptp-1.10.0/ -md5 8d25341352fdae5ad5b36b9f18254908 pptp-1.10.0.tar.gz -sha1 173c9b7d204c89fd1538116f165bba1e9101b51c pptp-1.10.0.tar.gz +md5 8d25341352fdae5ad5b36b9f18254908 pptp-1.10.0.tar.gz +sha1 173c9b7d204c89fd1538116f165bba1e9101b51c pptp-1.10.0.tar.gz # Locally calculated -sha256 82492db8e487ce73b182ee7f444251d20c44f5c26d6e96c553ec7093aefb5af4 pptp-1.10.0.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 82492db8e487ce73b182ee7f444251d20c44f5c26d6e96c553ec7093aefb5af4 pptp-1.10.0.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/pptp-linux/pptp-linux.mk b/package/pptp-linux/pptp-linux.mk index 7fd07339776..b6c740e7104 100644 --- a/package/pptp-linux/pptp-linux.mk +++ b/package/pptp-linux/pptp-linux.mk @@ -7,7 +7,6 @@ PPTP_LINUX_VERSION = 1.10.0 PPTP_LINUX_SITE = http://downloads.sourceforge.net/project/pptpclient/pptp/pptp-$(PPTP_LINUX_VERSION) PPTP_LINUX_SOURCE = pptp-$(PPTP_LINUX_VERSION).tar.gz -PPTP_LINUX_MAKE = $(MAKE1) PPTP_LINUX_LICENSE = GPL-2.0+ PPTP_LINUX_LICENSE_FILES = COPYING diff --git a/package/procps-ng/0003-fix-pifd_open-check.patch b/package/procps-ng/0003-fix-pifd_open-check.patch new file mode 100644 index 00000000000..7152901e707 --- /dev/null +++ b/package/procps-ng/0003-fix-pifd_open-check.patch @@ -0,0 +1,59 @@ +From 0cce3e981540c28d2f703b9ab16c04d0df8fa03d Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 3 Nov 2022 18:24:53 +0100 +Subject: [PATCH] fix pifd_open check + +Replace AC_CHECK_FUNC by AC_CHECK_FUNCS otherwise HAVE_PIDFD_OPEN will +never be defined resulting in the following build failure if pidfd_open +is available but __NR_pidfd_open is not available: + +pgrep.c: In function 'pidfd_open': +pgrep.c:748:17: error: '__NR_pidfd_open' undeclared (first use in this function); did you mean 'pidfd_open'? + 748 | return syscall(__NR_pidfd_open, pid, flags); + | ^~~~~~~~~~~~~~~ + | pidfd_open + +This build failure is raised since the addition of pwait in version +3.3.17 and +https://gitlab.com/procps-ng/procps/-/commit/c8384e682c1cfb3b2dc797e0f8a3cbaaccf7a3da + +Fixes: + - http://autobuild.buildroot.org/results/f23a5156e641b2ebdd673973dec0f9c87760c688 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://gitlab.com/procps-ng/procps/-/merge_requests/166] +--- + configure.ac | 2 +- + src/pgrep.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 629881a6..1a3ccdb8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -160,7 +160,7 @@ AC_TRY_COMPILE([#include ], + AC_MSG_RESULT(yes), + AC_MSG_RESULT(no)) + +-AC_CHECK_FUNC([pidfd_open], [enable_pwait=yes], [ ++AC_CHECK_FUNCS([pidfd_open], [enable_pwait=yes], [ + AC_MSG_CHECKING([for __NR_pidfd_open]) + AC_COMPILE_IFELSE([AC_LANG_SOURCE([ + #include +diff --git a/pgrep.c b/pgrep.c +index c4ad5da3..29cfedf7 100644 +--- a/pgrep.c ++++ b/pgrep.c +@@ -38,7 +38,7 @@ + #include + #include + +-#if defined(ENABLE_PWAIT) && !defined(HAVE_PIDFD_OPEN) ++#if defined(ENABLE_PWAIT) + #include + #include + #endif +-- +2.35.1 + diff --git a/package/procrank_linux/procrank_linux.mk b/package/procrank_linux/procrank_linux.mk index 7e743194fc2..415a4e41b73 100644 --- a/package/procrank_linux/procrank_linux.mk +++ b/package/procrank_linux/procrank_linux.mk @@ -10,7 +10,8 @@ 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)" + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) CROSS_COMPILE="$(TARGET_CROSS)" \ + LOCAL_CFLAGS="$(TARGET_CFLAGS)" endef define PROCRANK_LINUX_INSTALL_TARGET_CMDS diff --git a/package/proftpd/0001-mod_quotatab-fix-build-failure-against-gcc-10.patch b/package/proftpd/0001-mod_quotatab-fix-build-failure-against-gcc-10.patch deleted file mode 100644 index 5f4eb66c714..00000000000 --- a/package/proftpd/0001-mod_quotatab-fix-build-failure-against-gcc-10.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 9c9623c8a47fb5580dfea1a59296c6d224479504 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich -Date: Mon, 2 Mar 2020 23:45:22 +0000 -Subject: [PATCH] mod_quotatab: fix build failure against gcc-10 - -On gcc-10 (and gcc-9 -fno-common) build fails as: - -``` -$ ./configure --with-modules=mod_quotatab && make -... -ld: modules/module_glue.o:(.data.rel+0x68): - undefined reference to `quotatab_file_module' -collect2: error: ld returned 1 exit status -make: *** [Makefile:56: proftpd] Error 1 -``` - -gcc-10 will change the default from -fcommon to fno-common: -https://gcc.gnu.org/PR85678. - -The error also happens if CFLAGS=-fno-common passed explicitly. - -Signed-off-by: Sergei Trofimovich - -[Retrieved from: -https://github.com/proftpd/proftpd/commit/9c9623c8a47fb5580dfea1a59296c6d224479504] -Signed-off-by: Fabrice Fontaine ---- - contrib/mod_quotatab.c | 1 + - contrib/mod_quotatab.h | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/contrib/mod_quotatab.c b/contrib/mod_quotatab.c -index 4fa6c1f44..0ee480163 100644 ---- a/contrib/mod_quotatab.c -+++ b/contrib/mod_quotatab.c -@@ -50,6 +50,7 @@ typedef struct regtab_obj { - module quotatab_module; - - /* Quota objects for the current session */ -+quota_deltas_t quotatab_deltas; - static quota_table_t *limit_tab = NULL; - static quota_limit_t sess_limit; - -diff --git a/contrib/mod_quotatab.h b/contrib/mod_quotatab.h -index ed30333f5..c818395a0 100644 ---- a/contrib/mod_quotatab.h -+++ b/contrib/mod_quotatab.h -@@ -188,7 +188,7 @@ typedef struct table_obj { - #define QUOTATAB_TALLY_SRC 0x0002 - - /* Quota objects for the current session. */ --quota_deltas_t quotatab_deltas; -+extern quota_deltas_t quotatab_deltas; - - /* Function prototypes necessary for quotatab sub-modules */ - int quotatab_log(const char *, ...) diff --git a/package/proftpd/Config.in b/package/proftpd/Config.in index 83094028a0c..7b9f74895a1 100644 --- a/package/proftpd/Config.in +++ b/package/proftpd/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PROFTPD bool "proftpd" depends on BR2_USE_MMU # fork() + depends on !BR2_STATIC_LIBS help ProFTPD, a highly configurable FTP server. @@ -29,7 +30,8 @@ config BR2_PACKAGE_PROFTPD_MOD_REDIS config BR2_PACKAGE_PROFTPD_MOD_SFTP bool "mod_sftp support" select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_LIBOPENSSL_ENABLE_RMD160 if BR2_PACKAGE_LIBOPENSSL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_RMD160 help Compile ProFTPD with mod_sftp support @@ -103,3 +105,7 @@ config BR2_PACKAGE_PROFTPD_BUFFER_SIZE 0 uses the default size of 1024. endif + +comment "proftpd needs a toolchain w/ dynamic library" + depends on BR2_USE_MMU + depends on BR2_STATIC_LIBS diff --git a/package/proftpd/proftpd.hash b/package/proftpd/proftpd.hash index 983500bb8e0..f950f26b860 100644 --- a/package/proftpd/proftpd.hash +++ b/package/proftpd/proftpd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2dbe684034ab592742ebdb778a8a234b70f959efeb30feedee3ea77f26f74fbb proftpd-1.3.6e.tar.gz +sha256 f7139e7377a2cb059b8b9b14d76a6df5f440e3181cb15ae890d43bbcae574748 proftpd-1.3.8.tar.gz sha256 391a473d755c29b5326fb726326ff3c37e42512f53a8f5789fc310232150bf80 COPYING diff --git a/package/proftpd/proftpd.mk b/package/proftpd/proftpd.mk index 64c16a84eb0..398155222d7 100644 --- a/package/proftpd/proftpd.mk +++ b/package/proftpd/proftpd.mk @@ -4,8 +4,8 @@ # ################################################################################ -PROFTPD_VERSION = 1.3.6e -PROFTPD_SITE = $(call github,proftpd,proftpd,v$(PROFTPD_VERSION)) +PROFTPD_VERSION = 1.3.8 +PROFTPD_SITE = ftp://ftp.proftpd.org/distrib/source PROFTPD_LICENSE = GPL-2.0+ PROFTPD_LICENSE_FILES = COPYING PROFTPD_CPE_ID_VENDOR = proftpd @@ -27,6 +27,17 @@ PROFTPD_CONF_OPTS = \ --with-gnu-ld \ --without-openssl-cmdline +ifeq ($(BR2_PACKAGE_LIBIDN2),y) +PROFTPD_DEPENDENCIES += libidn2 +endif + +ifeq ($(BR2_PACKAGE_PCRE2),y) +PROFTPD_CONF_OPTS += --enable-pcre2 +PROFTPD_DEPENDENCIES += pcre2 +else +PROFTPD_CONF_OPTS += --disable-pcre2 +endif + ifeq ($(BR2_PACKAGE_PROFTPD_MOD_CAP),y) PROFTPD_CONF_OPTS += --enable-cap PROFTPD_DEPENDENCIES += libcap diff --git a/package/prosody/prosody.hash b/package/prosody/prosody.hash index 3a3a363a4bd..1fd1abafe92 100644 --- a/package/prosody/prosody.hash +++ b/package/prosody/prosody.hash @@ -1,8 +1,8 @@ # Locally computed: -md5 7214ee57d4702585bd0d3428e69790b4 prosody-0.11.13.tar.gz -sha1 1cc5a72d98738872d0c1a4c34b1fcb8878348c7d prosody-0.11.13.tar.gz -sha256 39c61b346a09b5125b604cb969e14206cbbcb86c81156ffc6ba2d62527cf0432 prosody-0.11.13.tar.gz -sha512 7616785536b7b51767a26963a80c961ef2403609e1e78dda3f88cf68c00d5bb899278c70a22b006b58c36c62cbb1bbd390a9298bad5b8d6524928a1cd5457813 prosody-0.11.13.tar.gz +md5 93665d86c47e99c9c525610ac53400fb prosody-0.11.14.tar.gz +sha1 abbd0ad42e2b30051f4d3f198c54a52b4e9f39d0 prosody-0.11.14.tar.gz +sha256 ec0c7447ec07ed336b6912d06a2f533439cb16d60d8d3bffa8ce46269ee52c87 prosody-0.11.14.tar.gz +sha512 128e12427ae0b5080fd3cc2380974c04570b16f0f79de7b39ef85cec6e8f579bee2d1150ce70ca731222c487dba646cbcd48bdb4a102a14395644eb5f19f1c88 prosody-0.11.14.tar.gz # Hash for license file: sha256 bbbdc1c5426e5944cf869fc0faeaf19d88a220cd2b39ea98b7b8e86b0e88a2ef COPYING diff --git a/package/prosody/prosody.mk b/package/prosody/prosody.mk index 62ba073b9ec..b5d89ebba42 100644 --- a/package/prosody/prosody.mk +++ b/package/prosody/prosody.mk @@ -4,7 +4,7 @@ # ################################################################################ -PROSODY_VERSION = 0.11.13 +PROSODY_VERSION = 0.11.14 PROSODY_SITE = https://prosody.im/downloads/source PROSODY_LICENSE = MIT PROSODY_LICENSE_FILES = COPYING diff --git a/package/protobuf-c/Config.in b/package/protobuf-c/Config.in index a32e6cd9e89..d96cd7b382c 100644 --- a/package/protobuf-c/Config.in +++ b/package/protobuf-c/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_PROTOBUF_C depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS # host-protobuf only builds on certain architectures - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" + depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS help Code generator and runtime libraries to use Protocol Buffers from pure C (not C++). @@ -12,4 +12,4 @@ config BR2_PACKAGE_PROTOBUF_C comment "protobuf-c needs a toolchain w/ C++, threads" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" + depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS diff --git a/package/protobuf-c/protobuf-c.hash b/package/protobuf-c/protobuf-c.hash index 13e1b474bc0..ec00442277d 100644 --- a/package/protobuf-c/protobuf-c.hash +++ b/package/protobuf-c/protobuf-c.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1068bca1e9870e9492096f97c409cd15f10c5019c183e52ec6d53e8d18630cbf protobuf-c-1.4.0.tar.gz -sha256 20e800cad4550f4b19bb37fc9577dac21de13333ae66497c4c45ae489c35c34a LICENSE +sha256 4cc4facd508172f3e0a4d3a8736225d472418aee35b4ad053384b137b220339f protobuf-c-1.4.1.tar.gz +sha256 b8999cb392cc5bbe8cd679de59584ad8d2f26033123e76f1d662fa14b9d4f287 LICENSE diff --git a/package/protobuf-c/protobuf-c.mk b/package/protobuf-c/protobuf-c.mk index baea4d623f8..0742a33db2d 100644 --- a/package/protobuf-c/protobuf-c.mk +++ b/package/protobuf-c/protobuf-c.mk @@ -4,8 +4,8 @@ # ################################################################################ -PROTOBUF_C_VERSION = 1.4.0 -PROTOBUF_C_SITE = $(call github,protobuf-c,protobuf-c,v$(PROTOBUF_C_VERSION)) +PROTOBUF_C_VERSION = 1.4.1 +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 PROTOBUF_C_MAKE = $(MAKE1) @@ -13,8 +13,7 @@ PROTOBUF_C_CONF_OPTS = --disable-protoc PROTOBUF_C_INSTALL_STAGING = YES PROTOBUF_C_LICENSE = BSD-2-Clause PROTOBUF_C_LICENSE_FILES = LICENSE -PROTOBUF_C_AUTORECONF = YES -HOST_PROTOBUF_C_AUTORECONF = YES +PROTOBUF_C_CPE_ID_VENDOR = protobuf-c_project # host-protobuf needs c++11 (since 3.6.0) HOST_PROTOBUF_C_CONF_ENV += CXXFLAGS="$(HOST_CXXFLAGS) -std=c++11" diff --git a/package/protobuf/Config.in b/package/protobuf/Config.in index 46c820b9cfa..47e987fa2b4 100644 --- a/package/protobuf/Config.in +++ b/package/protobuf/Config.in @@ -14,6 +14,20 @@ # and we can live with requiring gcc 4.8 on PowerPC to build protobuf. # # host-protobuf only builds on certain architectures +config BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS + bool + default y if BR2_HOSTARCH = "aarch64" + default y if BR2_HOSTARCH = "arm" + default y if BR2_HOSTARCH = "mips" + default y if BR2_HOSTARCH = "mipsel" + default y if BR2_HOSTARCH = "powerpc" + default y if BR2_HOSTARCH = "powerpc64" + default y if BR2_HOSTARCH = "powerpc64le" + default y if BR2_HOSTARCH = "sparc" + default y if BR2_HOSTARCH = "sparc64" + default y if BR2_HOSTARCH = "x86" + default y if BR2_HOSTARCH = "x86_64" + config BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS bool default y if BR2_arm @@ -22,7 +36,7 @@ config BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS default y if BR2_x86_64 default y if BR2_sparc64 default y if BR2_TOOLCHAIN_HAS_ATOMIC - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" + depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS depends on BR2_USE_MMU # fork() config BR2_PACKAGE_PROTOBUF diff --git a/package/protobuf/protobuf.hash b/package/protobuf/protobuf.hash index 60e64f54d45..b092c9303f1 100644 --- a/package/protobuf/protobuf.hash +++ b/package/protobuf/protobuf.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d LICENSE -sha256 645192532f28254152b51c01868efdf9b766b1dbe49c77cccd6efcdb2d7c7bc2 protobuf-cpp-3.19.1.tar.gz +sha256 4eab9b524aa5913c6fffb20b2a8abf5ef7f95a80bc0701f3a6dbb4c607f73460 protobuf-cpp-3.21.12.tar.gz diff --git a/package/protobuf/protobuf.mk b/package/protobuf/protobuf.mk index 80764f0216e..8cd4e99e067 100644 --- a/package/protobuf/protobuf.mk +++ b/package/protobuf/protobuf.mk @@ -7,8 +7,8 @@ # 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 = 3.19.1 -PROTOBUF_SOURCE = protobuf-cpp-$(PROTOBUF_VERSION).tar.gz +PROTOBUF_VERSION = 21.12 +PROTOBUF_SOURCE = protobuf-cpp-3.$(PROTOBUF_VERSION).tar.gz PROTOBUF_SITE = https://github.com/protocolbuffers/protobuf/releases/download/v$(PROTOBUF_VERSION) PROTOBUF_LICENSE = BSD-3-Clause PROTOBUF_LICENSE_FILES = LICENSE diff --git a/package/protozero/0001-CMakeLists.txt-protobuf-is-only-needed-for-tests.patch b/package/protozero/0001-CMakeLists.txt-protobuf-is-only-needed-for-tests.patch new file mode 100644 index 00000000000..3033e24aa2c --- /dev/null +++ b/package/protozero/0001-CMakeLists.txt-protobuf-is-only-needed-for-tests.patch @@ -0,0 +1,35 @@ +From 1c16d3ffccd9e415c6ea3681f23231cd5184043c Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 16 Feb 2022 00:11:38 +0100 +Subject: [PATCH] CMakeLists.txt: protobuf is only needed for tests + +Don't check for protobuf if tests are disabled. As a side effect, this +will avoid a build failure if clang-tidy and protobuf are found but +tests are disabled + +Fix #109 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/mapbox/protozero/pull/110] +--- + CMakeLists.txt | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b975d49..df2ca15 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -52,7 +52,9 @@ endif() + # + #----------------------------------------------------------------------------- + +-find_package(Protobuf) ++if(BUILD_TESTING) ++ find_package(Protobuf) ++endif() + + + #----------------------------------------------------------------------------- +-- +2.34.1 + diff --git a/package/protozero/Config.in b/package/protozero/Config.in index 19048dfe8da..e6347e6f7f3 100644 --- a/package/protozero/Config.in +++ b/package/protozero/Config.in @@ -16,5 +16,5 @@ config BR2_PACKAGE_PROTOZERO https://github.com/mapbox/protozero -comment "protozero needs a toolchain w/ C++, gcc >= 4.7" +comment "protozero needs a toolchain w/ C++, gcc >= 4.7" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 diff --git a/package/proxychains-ng/0001-add-configure-check-for-non-POSIX-compliant-getnameinfo-signature.patch b/package/proxychains-ng/0001-add-configure-check-for-non-POSIX-compliant-getnameinfo-signature.patch new file mode 100644 index 00000000000..d111667c8b1 --- /dev/null +++ b/package/proxychains-ng/0001-add-configure-check-for-non-POSIX-compliant-getnameinfo-signature.patch @@ -0,0 +1,76 @@ +From 07c15a02f6890f56aa0b9341c27fc889956ab114 Mon Sep 17 00:00:00 2001 +From: rofl0r +Date: Tue, 25 Jan 2022 14:51:27 +0000 +Subject: [PATCH] add configure check for non-POSIX compliant getnameinfo + signature + +- glibc < 2.14 uses "unsigned" instead of "int" for flags +- openbsd and freebsd use "size_t" instead of socklen_t for servlen + and nodelen, while still using socklen_t for salen. + +closes #430 + +[Retrieved from: +https://github.com/rofl0r/proxychains-ng/commit/07c15a02f6890f56aa0b9341c27fc889956ab114] +Signed-off-by: Fabrice Fontaine +--- + configure | 16 ++++++++++++++++ + src/core.h | 2 +- + src/libproxychains.c | 4 ++-- + 3 files changed, 19 insertions(+), 3 deletions(-) + +diff --git a/configure b/configure +index 4c8bcbc..0102eb2 100755 +--- a/configure ++++ b/configure +@@ -175,6 +175,22 @@ ishaiku() { + + check_compile 'whether C compiler works' '' 'int main() {return 0;}' || fail 'error: install a C compiler and library' + ++if ! check_compile 'whether getnameinfo() servlen argument is POSIX compliant (socklen_t)' "-DGN_NODELEN_T=socklen_t -DGN_SERVLEN_T=socklen_t -DGN_FLAGS_T=int" \ ++'#define _GNU_SOURCE\n#include \nint getnameinfo(const struct sockaddr *, socklen_t, char *, socklen_t, char *, socklen_t, int);int main() {\nreturn 0;}' ; then ++ # GLIBC < 2.14 ++ if ! check_compile 'whether getnameinfo() flags argument is unsigned' "-DGN_NODELEN_T=socklen_t -DGN_SERVLEN_T=socklen_t -DGN_FLAGS_T=unsigned" \ ++ '#define _GNU_SOURCE\n#include \nint getnameinfo(const struct sockaddr *, socklen_t, char *, socklen_t, char *, socklen_t, unsigned);int main() {\nreturn 0;}' ; then ++ if ! check_compile 'whether getnameinfo() servlen argument is size_t' "-DGN_NODELEN_T=socklen_t -DGN_SERVLEN_T=size_t -DGN_FLAGS_T=int" \ ++ '#define _GNU_SOURCE\n#include \nint getnameinfo(const struct sockaddr *, socklen_t, char *, socklen_t, char *, size_t, int);int main() {\nreturn 0;}' ; then ++ # OpenBSD & FreeBSD ++ if ! check_compile 'whether getnameinfo() servlen and nodelen argument is size_t' "-DGN_NODELEN_T=size_t -DGN_SERVLEN_T=size_t -DGN_FLAGS_T=int" \ ++ '#define _GNU_SOURCE\n#include \nint getnameinfo(const struct sockaddr *, socklen_t, char *, size_t, char *, size_t, int);int main() {\nreturn 0;}' ; then ++ fail "failed to detect getnameinfo signature" ++ fi ++ fi ++ fi ++fi ++ + check_compile 'whether we have GNU-style getservbyname_r()' "-DHAVE_GNU_GETSERVBYNAME_R" \ + '#define _GNU_SOURCE\n#include \nint main() {\nstruct servent *se = 0;struct servent se_buf;char buf[1024];\ngetservbyname_r("foo", (void*) 0, &se_buf, buf, sizeof(buf), &se);\nreturn 0;}' + +diff --git a/src/core.h b/src/core.h +index 31f3003..3045b86 100644 +--- a/src/core.h ++++ b/src/core.h +@@ -109,7 +109,7 @@ typedef int (*getaddrinfo_t)(const char *, const char *, const struct addrinfo * + struct addrinfo **); + + typedef int (*getnameinfo_t) (const struct sockaddr *, socklen_t, char *, +- socklen_t, char *, socklen_t, int); ++ GN_NODELEN_T, char *, GN_SERVLEN_T, GN_FLAGS_T); + + typedef ssize_t (*sendto_t) (int sockfd, const void *buf, size_t len, int flags, + const struct sockaddr *dest_addr, socklen_t addrlen); +diff --git a/src/libproxychains.c b/src/libproxychains.c +index 001ffcd..578ff84 100644 +--- a/src/libproxychains.c ++++ b/src/libproxychains.c +@@ -729,8 +729,8 @@ HOOKFUNC(void, freeaddrinfo, struct addrinfo *res) { + } + + HOOKFUNC(int, getnameinfo, const struct sockaddr *sa, socklen_t salen, +- char *host, socklen_t hostlen, char *serv, +- socklen_t servlen, int flags) ++ char *host, GN_NODELEN_T hostlen, char *serv, ++ GN_SERVLEN_T servlen, GN_FLAGS_T flags) + { + INIT(); + PFUNC(); diff --git a/package/proxychains-ng/0001-configure-fix-check_link_silent-test.patch b/package/proxychains-ng/0001-configure-fix-check_link_silent-test.patch deleted file mode 100644 index aadfef9cd96..00000000000 --- a/package/proxychains-ng/0001-configure-fix-check_link_silent-test.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 4a557f242a76c6a2a3134acf1d3279818f8ab371 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 23 Jul 2021 09:50:36 +0200 -Subject: [PATCH] configure: fix check_link_silent test - -Replace -o /dev/null by -o "$tmpc".out when testing with -check_link_silent otherwise test will fail with some bugged binutils -(https://sourceware.org/bugzilla/show_bug.cgi?id=19526) since version -4.13 and -https://github.com/rofl0r/proxychains-ng/commit/35a674bdbc294730429a1007c9e7ce01e65b49b5: - -checking what's the option to use in linker to set library name ... -cannot find an option to set library name -package/pkg-generic.mk:249: recipe for target '/home/buildroot/autobuild/instance-2/output-1/build/proxychains-ng-4.14/.stamp_configured' failed - -Fixes: - - http://autobuild.buildroot.org/results/9320d9b2c69882e23bbe7b30057eb8bee0c9d2e5 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/rofl0r/proxychains-ng/pull/387] ---- - configure | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/configure b/configure -index 8b21b97..cfe19e7 100755 ---- a/configure -+++ b/configure -@@ -49,7 +49,8 @@ check_compile_run() { - - check_link_silent() { - printf "$2" > "$tmpc" -- $CC $OUR_CPPFLAGS $CPPFLAGS $1 $CFLAGS "$tmpc" -o /dev/null >/dev/null 2>&1 -+ $CC $OUR_CPPFLAGS $CPPFLAGS $1 $CFLAGS "$tmpc" -o "$tmpc".out >/dev/null 2>&1 -+ rm -f "$tmpc".out - } - - check_link() { --- -2.30.2 - diff --git a/package/proxychains-ng/proxychains-ng.hash b/package/proxychains-ng/proxychains-ng.hash index 779f6b626d3..e9016ffd863 100644 --- a/package/proxychains-ng/proxychains-ng.hash +++ b/package/proxychains-ng/proxychains-ng.hash @@ -1,4 +1,4 @@ -# From https://github.com/rofl0r/proxychains-ng/releases/tag/v4.14 -sha512 75a1a4629d2b7ebac9b909a694b395339cf669fa4e23bfcc57938e46377b5619f31c9651d2bc457d1ad10ec1be7747981106392bf8bf65999cb7bb9c748d7e95 proxychains-ng-4.14.tar.xz +# From https://github.com/rofl0r/proxychains-ng/releases/tag/v4.16 +sha512 c4402599043887b1481a46cec8d3ca5fcd2612b46b73a4d4ce025318640cd61b37181ad70236303933103006b313882dc57dc8838172863090f9ce33e9463a8d proxychains-ng-4.16.tar.xz # Locally computed: sha256 86728623caeff60e9bcc37e03b432fd191de927eed48a72a3bb4ac4e53fe20df COPYING diff --git a/package/proxychains-ng/proxychains-ng.mk b/package/proxychains-ng/proxychains-ng.mk index bb7c9ff6875..beb8909088e 100644 --- a/package/proxychains-ng/proxychains-ng.mk +++ b/package/proxychains-ng/proxychains-ng.mk @@ -4,16 +4,17 @@ # ################################################################################ -PROXYCHAINS_NG_VERSION = 4.14 +PROXYCHAINS_NG_VERSION = 4.16 PROXYCHAINS_NG_SOURCE = proxychains-ng-$(PROXYCHAINS_NG_VERSION).tar.xz -PROXYCHAINS_NG_SITE = http://downloads.sourceforge.net/project/proxychains-ng +PROXYCHAINS_NG_SITE = https://github.com/rofl0r/proxychains-ng/releases/download/v$(PROXYCHAINS_NG_VERSION) PROXYCHAINS_NG_LICENSE = GPL-2.0+ PROXYCHAINS_NG_LICENSE_FILES = COPYING PROXYCHAINS_NG_CPE_ID_VENDOR = proxychains-ng_project define PROXYCHAINS_NG_CONFIGURE_CMDS cd $(@D) && \ - $(TARGET_CONFIGURE_OPTS) ./configure --prefix=/usr --sysconfdir=/etc + $(TARGET_CONFIGURE_OPTS) CPPFLAGS="$(TARGET_CPPFLAGS) -fPIC" \ + ./configure --prefix=/usr --sysconfdir=/etc endef define PROXYCHAINS_NG_BUILD_CMDS diff --git a/package/pru-software-support/pru-software-support.hash b/package/pru-software-support/pru-software-support.hash index e8ccc93a2cb..c9af9fe25cf 100644 --- a/package/pru-software-support/pru-software-support.hash +++ b/package/pru-software-support/pru-software-support.hash @@ -1,3 +1,3 @@ # Locally-calculated hash -sha256 cba9e0bca3abc0041cf7ce6a30af9de440b325cf8c9bcc826485d2f837cb4cf2 pru-software-support-package-v6.0.1.tar.gz +sha256 cba9e0bca3abc0041cf7ce6a30af9de440b325cf8c9bcc826485d2f837cb4cf2 pru-software-support-package-v6.0.1.tar.gz sha256 62a2f56498cd1bac2d4ea6ea1c941affba1e4bb65bfdf2dcffd8e5079fa34399 PRU-Package-v6.1-Manifest.html diff --git a/package/psmisc/psmisc.hash b/package/psmisc/psmisc.hash index 47e44f69215..fe146f90c9f 100644 --- a/package/psmisc/psmisc.hash +++ b/package/psmisc/psmisc.hash @@ -1,6 +1,6 @@ # From https://sourceforge.net/projects/psmisc/files/psmisc/ -md5 8114cd4489b95308efe2509c3a406bbf psmisc-23.4.tar.xz -sha1 a4c34111e570c43967efb2bbd8a4f31d94d22e0f psmisc-23.4.tar.xz +md5 014f0b5d5ab32478a2c57812ad01e1fb psmisc-23.5.tar.xz +sha1 a16073f459a19288c1ea2b413a84e1b996cab595 psmisc-23.5.tar.xz # Locally computed: -sha256 7f0cceeace2050c525f3ebb35f3ba01d618b8d690620580bdb8cd8269a0c1679 psmisc-23.4.tar.xz +sha256 dc37ecc2f7e4a90a94956accc6e1c77adb71316b7c9cbd39b26738db0c3ae58b psmisc-23.5.tar.xz sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING diff --git a/package/psmisc/psmisc.mk b/package/psmisc/psmisc.mk index 8b92be11e8e..3229184459b 100644 --- a/package/psmisc/psmisc.mk +++ b/package/psmisc/psmisc.mk @@ -4,7 +4,7 @@ # ################################################################################ -PSMISC_VERSION = 23.4 +PSMISC_VERSION = 23.5 PSMISC_SITE = http://downloads.sourceforge.net/project/psmisc/psmisc PSMISC_SOURCE = psmisc-$(PSMISC_VERSION).tar.xz PSMISC_LICENSE = GPL-2.0+ diff --git a/package/psplash/psplash.mk b/package/psplash/psplash.mk index 5e61f2392f7..69f9bf386da 100644 --- a/package/psplash/psplash.mk +++ b/package/psplash/psplash.mk @@ -5,7 +5,8 @@ ################################################################################ PSPLASH_VERSION = 44afb7506d43cca15582b4c5b90ba5580344d75d -PSPLASH_SITE = git://git.yoctoproject.org/psplash +PSPLASH_SITE = https://git.yoctoproject.org/psplash +PSPLASH_SITE_METHOD = git PSPLASH_LICENSE = GPL-2.0+ PSPLASH_LICENSE_FILES = COPYING PSPLASH_AUTORECONF = YES diff --git a/package/ptm2human/ptm2human.hash b/package/ptm2human/ptm2human.hash index 5546ef4018a..03460196677 100644 --- a/package/ptm2human/ptm2human.hash +++ b/package/ptm2human/ptm2human.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 28947eeb458d8b6a362cbeb8c5cb6098006274af04ebb4f5da70eac89f927d95 ptm2human-d0b8b6be9897ea5b04fd6460038a4773cec078bc.tar.gz -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE +sha256 28947eeb458d8b6a362cbeb8c5cb6098006274af04ebb4f5da70eac89f927d95 ptm2human-d0b8b6be9897ea5b04fd6460038a4773cec078bc.tar.gz +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE diff --git a/package/pugixml/Config.in b/package/pugixml/Config.in index 6b7d2e32591..d5a3cb3ebbb 100644 --- a/package/pugixml/Config.in +++ b/package/pugixml/Config.in @@ -39,15 +39,6 @@ config BR2_PACKAGE_PUGIXML_COMPACT http://pugixml.org/docs/manual.html#dom.memory.compact -config BR2_PACKAGE_PUGIXML_HEADER_ONLY - bool "Enable header-only version" - help - All source code for pugixml will be included in every - translation unit that includes pugixml.hpp. This is how most - of Boost and STL libraries work. - - http://pugixml.org/docs/manual.html#install.building.header - endif comment "pugixml needs a toolchain w/ C++" diff --git a/package/pugixml/pugixml.hash b/package/pugixml/pugixml.hash index 5c629ac66f6..b828e03561d 100644 --- a/package/pugixml/pugixml.hash +++ b/package/pugixml/pugixml.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 8ddf57b65fb860416979a3f0640c2ad45ddddbbafa82508ef0a0af3ce7061716 pugixml-1.11.4.tar.gz -sha256 ee495f34aeff0c578a99f3350a2050d4e5860d27b2004c03c384a594fa2b0a7a LICENSE.md +sha256 40c0b3914ec131485640fa57e55bf1136446026b41db91c1bef678186a12abbe pugixml-1.13.tar.gz +sha256 206f671b6d342557adcc973088c2c638df0ec0b1dabbcd24e65aadd2191778d2 LICENSE.md diff --git a/package/pugixml/pugixml.mk b/package/pugixml/pugixml.mk index bc018180ef8..415227a40a0 100644 --- a/package/pugixml/pugixml.mk +++ b/package/pugixml/pugixml.mk @@ -4,7 +4,7 @@ # ################################################################################ -PUGIXML_VERSION = 1.11.4 +PUGIXML_VERSION = 1.13 PUGIXML_SITE = https://github.com/zeux/pugixml/releases/download/v$(PUGIXML_VERSION) PUGIXML_LICENSE = MIT PUGIXML_LICENSE_FILES = LICENSE.md @@ -12,6 +12,18 @@ PUGIXML_CPE_ID_VENDOR = pugixml_project PUGIXML_INSTALL_STAGING = YES +ifeq ($(BR2_PACKAGE_PUGIXML_XPATH_SUPPORT),y) +PUGIXML_CONF_OPTS += -DPUGIXML_NO_XPATH=OFF +else +PUGIXML_CONF_OPTS += -DPUGIXML_NO_XPATH=ON +endif + +ifeq ($(BR2_PACKAGE_PUGIXML_COMPACT),y) +PUGIXML_CONF_OPTS += -DPUGIXML_COMPACT=ON +else +PUGIXML_CONF_OPTS += -DPUGIXML_COMPACT=OFF +endif + # Pugixml will automatically enable 'long long' support on C++11 compilers, # which means gcc 4.8+. As gcc always supports the 'long long' type, # force-enable this option to support older gcc versions. See also: @@ -19,23 +31,11 @@ PUGIXML_INSTALL_STAGING = YES PUGIXML_BUILD_DEFINES += PUGIXML_HAS_LONG_LONG HOST_PUGIXML_BUILD_DEFINES += PUGIXML_HAS_LONG_LONG -ifeq ($(BR2_PACKAGE_PUGIXML_XPATH_SUPPORT),) -PUGIXML_BUILD_DEFINES += PUGIXML_NO_XPATH -endif -ifeq ($(BR2_PACKAGE_PUGIXML_COMPACT),y) -PUGIXML_BUILD_DEFINES += PUGIXML_COMPACT -endif -ifeq ($(BR2_PACKAGE_PUGIXML_HEADER_ONLY),y) -PUGIXML_BUILD_DEFINES += PUGIXML_HEADER_ONLY -endif - -ifdef PUGIXML_BUILD_DEFINES -PUGIXML_CONF_OPTS += -DBUILD_DEFINES="$(subst $(space),;,$(PUGIXML_BUILD_DEFINES))" -endif +PUGIXML_CONF_OPTS += -DPUGIXML_BUILD_DEFINES="$(subst $(space),;,$(PUGIXML_BUILD_DEFINES))" HOST_PUGIXML_CONF_OPTS += \ -DBUILD_PKGCONFIG=ON \ - -DBUILD_DEFINES="$(subst $(space),;,$(HOST_PUGIXML_BUILD_DEFINES))" + -DPUGIXML_BUILD_DEFINES="$(subst $(space),;,$(HOST_PUGIXML_BUILD_DEFINES))" $(eval $(cmake-package)) $(eval $(host-cmake-package)) diff --git a/package/pulseaudio/0001-shm.c-use-_Static_assert-instead-of-static_assert-fo.patch b/package/pulseaudio/0001-shm.c-use-_Static_assert-instead-of-static_assert-fo.patch new file mode 100644 index 00000000000..8cdc23e1e0d --- /dev/null +++ b/package/pulseaudio/0001-shm.c-use-_Static_assert-instead-of-static_assert-fo.patch @@ -0,0 +1,32 @@ +From fb39f9600d464ce761917c0e787b940097f6024c Mon Sep 17 00:00:00 2001 +From: Nicolas Cavallari +Date: Thu, 23 Jun 2022 16:52:49 +0200 +Subject: [PATCH] shm.c: use _Static_assert instead of static_assert for uclibc + +Both are C11 constructs. The first one is defined by the compiler in +gnu11 mode, but the second one should be a macro defined in assert.h + +The macro exists in glibc >= 2.16 and musl >= 1.1.10 but not in +uclibc 1.0.41. It is expected to be present in uclibc 1.0.42. + +Signed-off-by: Nicolas Cavallari +--- + src/pulsecore/shm.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/pulsecore/shm.c b/src/pulsecore/shm.c +index e464f6bce..5220cc90d 100644 +--- a/src/pulsecore/shm.c ++++ b/src/pulsecore/shm.c +@@ -94,7 +94,7 @@ struct shm_marker { + }; + + // Ensure struct is appropriately packed +-static_assert(sizeof(struct shm_marker) == 8 * 5, "`struct shm_marker` is not tightly packed"); ++_Static_assert(sizeof(struct shm_marker) == 8 * 5, "`struct shm_marker` is not tightly packed"); + + static inline size_t shm_marker_size(pa_mem_type_t type) { + if (type == PA_MEM_TYPE_SHARED_POSIX) +-- +2.36.1 + diff --git a/package/pulseaudio/0002-build-sys-Fix-atomic-support-detection.patch b/package/pulseaudio/0002-build-sys-Fix-atomic-support-detection.patch new file mode 100644 index 00000000000..631cb7f0161 --- /dev/null +++ b/package/pulseaudio/0002-build-sys-Fix-atomic-support-detection.patch @@ -0,0 +1,59 @@ +From a5392576ceba92d04706cefc1929ddd5ace5537a Mon Sep 17 00:00:00 2001 +From: Nicolas Cavallari +Date: Fri, 1 Jul 2022 14:03:44 +0200 +Subject: [PATCH] build-sys: Fix atomic support detection + +Attempting to use atomics operations on an architecture that does not +support them generally results in a link error: + +ld: /tmp/ccjYcMPP.o: in function `func': +testfile.c:(.text+0x1c): undefined reference to `__sync_bool_compare_and_swap_4' + +The current build system uses cc.compiles() to check if atomic ops are +supported, but cc.compiles() does not attempt to link, so the test fails +to enable libatomics_opts. + +Fix this by using cc.links() instead of cc.compiles(). + +Signed-off-by: Nicolas Cavallari +Upstream-status: Submitted [https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/732] +--- + meson.build | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/meson.build b/meson.build +index c6db7e670..c5135330f 100644 +--- a/meson.build ++++ b/meson.build +@@ -498,22 +498,24 @@ endif + + need_libatomic_ops = false + +-atomictest = '''void func() { ++atomictest = '''int main() { + volatile int atomic = 2; + __sync_bool_compare_and_swap (&atomic, 2, 3); ++ return 0; + } + ''' + +-if cc.compiles(atomictest) ++if cc.links(atomictest) + cdata.set('HAVE_ATOMIC_BUILTINS', 1) + +- newatomictest = '''void func() { ++ newatomictest = '''int main() { + int c = 0; + __atomic_store_n(&c, 4, __ATOMIC_SEQ_CST); ++ return 0; + } + ''' + +- if(cc.compiles(newatomictest)) ++ if(cc.links(newatomictest)) + cdata.set('HAVE_ATOMIC_BUILTINS_MEMORY_MODEL', 1) + endif + +-- +2.36.1 + diff --git a/package/pulseaudio/0003-build-sys-Add-missing-libatomic_ops-dependencies.patch b/package/pulseaudio/0003-build-sys-Add-missing-libatomic_ops-dependencies.patch new file mode 100644 index 00000000000..fac441e7dd2 --- /dev/null +++ b/package/pulseaudio/0003-build-sys-Add-missing-libatomic_ops-dependencies.patch @@ -0,0 +1,129 @@ +From 96361ff2a8f37dd3ce7ea188ce4e7b038bb6a5aa Mon Sep 17 00:00:00 2001 +From: Nicolas Cavallari +Date: Mon, 4 Jul 2022 13:49:34 +0200 +Subject: [PATCH] build-sys: Add missing libatomic_ops dependencies + +Add libatomic_ops dependencies to libraries/modules that showed a +failure on an arch that does not have native atomic operations support. + +Not all optional dependencies were tested, so it is possible that +some optional modules are still missing libatomic_ops dependencies. + +Signed-off-by: Nicolas Cavallari +Upstream-status: Submitted [https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/732] +--- + src/meson.build | 2 +- + src/modules/meson.build | 6 +++--- + src/pulse/meson.build | 2 +- + src/pulsecore/meson.build | 10 +++++----- + 4 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/src/meson.build b/src/meson.build +index 96dcec354..9efb561d8 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -205,7 +205,7 @@ else + libm_dep, thread_dep, dl_dep, shm_dep, iconv_dep, sndfile_dep, dbus_dep, + x11_dep, libsystemd_dep, glib_dep.partial_dependency(compile_args: true), + gtk_dep.partial_dependency(compile_args: true), asyncns_dep, libintl_dep, +- platform_dep, platform_socket_dep, execinfo_dep, ++ platform_dep, platform_socket_dep, execinfo_dep, libatomic_ops_dep, + ], + implicit_include_directories : false) + +diff --git a/src/modules/meson.build b/src/modules/meson.build +index 1d8004300..1e12569dc 100644 +--- a/src/modules/meson.build ++++ b/src/modules/meson.build +@@ -14,7 +14,7 @@ all_modules = [ + [ 'module-cli-protocol-tcp', 'module-protocol-stub.c', [], ['-DUSE_PROTOCOL_CLI', '-DUSE_TCP_SOCKETS'], [], libprotocol_cli ], + [ 'module-cli-protocol-unix', 'module-protocol-stub.c', [], ['-DUSE_PROTOCOL_CLI', '-DUSE_UNIX_SOCKETS'], [], libprotocol_cli ], + [ 'module-combine', 'module-combine.c' ], +- [ 'module-combine-sink', 'module-combine-sink.c' ], ++ [ 'module-combine-sink', 'module-combine-sink.c', [], [], [libatomic_ops_dep] ], + # [ 'module-coreaudio-detect', 'macosx/module-coreaudio-detect.c' ], + # [ 'module-coreaudio-device', 'macosx/module-coreaudio-device.c' ], + [ 'module-default-device-restore', 'module-default-device-restore.c', [], [], [], libprotocol_native ], +@@ -73,7 +73,7 @@ endif + + if host_machine.system() != 'windows' + all_modules += [ +- [ 'module-rtp-recv', 'rtp/module-rtp-recv.c', [], [], [], librtp ], ++ [ 'module-rtp-recv', 'rtp/module-rtp-recv.c', [], [], [libatomic_ops_dep], librtp ], + [ 'module-rtp-send', 'rtp/module-rtp-send.c' , [], [], [], librtp ], + ] + endif +@@ -243,7 +243,7 @@ module_echo_cancel_sources = [ + ] + module_echo_cancel_orc_sources = [] + module_echo_cancel_flags = [] +-module_echo_cancel_deps = [] ++module_echo_cancel_deps = [libatomic_ops_dep] + module_echo_cancel_libs = [] + + if get_option('adrian-aec') +diff --git a/src/pulse/meson.build b/src/pulse/meson.build +index c2128e087..1b82c807c 100644 +--- a/src/pulse/meson.build ++++ b/src/pulse/meson.build +@@ -85,7 +85,7 @@ libpulse = shared_library('pulse', + link_args : [nodelete_link_args, versioning_link_args], + install : true, + install_rpath : privlibdir, +- dependencies : [libm_dep, thread_dep, libpulsecommon_dep, dbus_dep, dl_dep, iconv_dep, libintl_dep, platform_dep, platform_socket_dep], ++ dependencies : [libm_dep, thread_dep, libpulsecommon_dep, dbus_dep, dl_dep, iconv_dep, libintl_dep, platform_dep, platform_socket_dep, libatomic_ops_dep], + implicit_include_directories : false) + + libpulse_dep = declare_dependency(link_with: libpulse) +diff --git a/src/pulsecore/meson.build b/src/pulsecore/meson.build +index b30264b3a..b37fec499 100644 +--- a/src/pulsecore/meson.build ++++ b/src/pulsecore/meson.build +@@ -251,7 +251,7 @@ libcli = shared_library('cli', + c_args : [pa_c_args, server_c_args, database_c_args], + link_args : [nodelete_link_args], + include_directories : [configinc, topinc], +- dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep], ++ dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, libatomic_ops_dep], + install : true, + install_rpath : privlibdir, + install_dir : modlibexecdir, +@@ -268,7 +268,7 @@ libprotocol_cli = shared_library('protocol-cli', + c_args : [pa_c_args, server_c_args, database_c_args], + link_args : [nodelete_link_args], + include_directories : [configinc, topinc], +- dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, libcli_dep], ++ dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, libcli_dep, libatomic_ops_dep], + install : true, + install_rpath : rpath_dirs, + install_dir : modlibexecdir, +@@ -280,7 +280,7 @@ libprotocol_http = shared_library('protocol-http', + c_args : [pa_c_args, server_c_args, database_c_args], + link_args : [nodelete_link_args], + include_directories : [configinc, topinc], +- dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep], ++ dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, libatomic_ops_dep], + install : true, + install_rpath : privlibdir, + install_dir : modlibexecdir, +@@ -292,7 +292,7 @@ libprotocol_native = shared_library('protocol-native', + c_args : [pa_c_args, server_c_args, database_c_args], + link_args : [nodelete_link_args], + include_directories : [configinc, topinc], +- dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, dbus_dep], ++ dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, dbus_dep, libatomic_ops_dep], + install : true, + install_rpath : privlibdir, + install_dir : modlibexecdir, +@@ -304,7 +304,7 @@ libprotocol_simple = shared_library('protocol-simple', + c_args : [pa_c_args, server_c_args, database_c_args], + link_args : [nodelete_link_args], + include_directories : [configinc, topinc], +- dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep], ++ dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, libatomic_ops_dep], + install : true, + install_rpath : privlibdir, + install_dir : modlibexecdir, +-- +2.36.1 + diff --git a/package/pulseaudio/0004-meson.build-fix-build-without-C.patch b/package/pulseaudio/0004-meson.build-fix-build-without-C.patch new file mode 100644 index 00000000000..e770927f541 --- /dev/null +++ b/package/pulseaudio/0004-meson.build-fix-build-without-C.patch @@ -0,0 +1,56 @@ +From ac88536d7c3fde3c22933368296c9029bb67b9fc Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 25 Jul 2022 21:49:25 +0200 +Subject: [PATCH] meson.build: fix build without C++ + +Fix the following build failure without C++: + +../output-1/build/pulseaudio-16.1/meson.build:1:0: ERROR: Unknown compiler(s): [['/home/autobuild/autobuild/instance-1/output-1/per-package/pulseaudio/host/bin/powerpc64-buildroot-linux-gnu-g++']] +The following exception(s) were encountered: +Running "/home/autobuild/autobuild/instance-1/output-1/per-package/pulseaudio/host/bin/powerpc64-buildroot-linux-gnu-g++ --version" gave "[Errno 2] No such file or directory: '/home/autobuild/autobuild/instance-1/output-1/per-package/pulseaudio/host/bin/powerpc64-buildroot-linux-gnu-g++'" + +Fixes: + - http://autobuild.buildroot.org/results/6526a21bd4da3b8458188f27c1ec04c381e4b673 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/737] +--- + meson.build | 3 ++- + src/modules/echo-cancel/meson.build | 2 ++ + 2 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index c5135330f..8248f263b 100644 +--- a/meson.build ++++ b/meson.build +@@ -1,4 +1,4 @@ +-project('pulseaudio', 'c', 'cpp', ++project('pulseaudio', 'c', + version : run_command(find_program('git-version-gen'), join_paths(meson.current_source_dir(), '.tarball-version')).stdout().strip(), + meson_version : '>= 0.50.0', + default_options : [ 'c_std=gnu11', 'cpp_std=c++11' ] +@@ -433,6 +433,7 @@ endif + # Code coverage + + if get_option('gcov') ++ add_languages('cpp') + add_project_arguments('--coverage', language: ['c', 'cpp']) + add_project_link_arguments('--coverage', language: ['c', 'cpp']) + endif +diff --git a/src/modules/echo-cancel/meson.build b/src/modules/echo-cancel/meson.build +index 641cd35e7..3b998364e 100644 +--- a/src/modules/echo-cancel/meson.build ++++ b/src/modules/echo-cancel/meson.build +@@ -6,6 +6,8 @@ + # '-Wl,--unresolved-symbols=ignore-in-object-files' otherwise it fails + # at link time. + ++add_languages('cpp') ++ + libwebrtc_util_sources = [ + 'webrtc.cc' + ] +-- +GitLab + diff --git a/package/pulseaudio/Config.in b/package/pulseaudio/Config.in index dcc88f3841b..337a64bf1d2 100644 --- a/package/pulseaudio/Config.in +++ b/package/pulseaudio/Config.in @@ -14,11 +14,14 @@ config BR2_PACKAGE_PULSEAUDIO depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_ALSA_LIB_PCM if BR2_PACKAGE_ALSA_LIB + select BR2_PACKAGE_ALSA_LIB_MIXER if BR2_PACKAGE_ALSA_LIB + select BR2_PACKAGE_ALSA_LIB_UCM if BR2_PACKAGE_ALSA_LIB select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_AUDIO if BR2_PACKAGE_BLUEZ5_UTILS # runtime + select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBTOOL select BR2_PACKAGE_LIBSNDFILE select BR2_PACKAGE_PULSEAUDIO_ENABLE_ATOMIC - select BR2_PACKAGE_SPEEX help PulseAudio is a sound system for POSIX OSes, meaning that it is a proxy for your sound applications. It allows you to do diff --git a/package/pulseaudio/pulseaudio.hash b/package/pulseaudio/pulseaudio.hash index b3e19fdcca5..acbb56a07df 100644 --- a/package/pulseaudio/pulseaudio.hash +++ b/package/pulseaudio/pulseaudio.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/pulseaudio-discuss/2021-January/031990.html -sha256 75d3f7742c1ae449049a4c88900e454b8b350ecaa8c544f3488a2562a9ff66f1 pulseaudio-14.2.tar.xz +# From https://lists.freedesktop.org/archives/pulseaudio-discuss/2022-June/032287.html +sha256 8eef32ce91d47979f95fd9a935e738cd7eb7463430dabc72863251751e504ae4 pulseaudio-16.1.tar.xz # Locally computed sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 GPL sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 LGPL diff --git a/package/pulseaudio/pulseaudio.mk b/package/pulseaudio/pulseaudio.mk index a238315778e..89191db541d 100644 --- a/package/pulseaudio/pulseaudio.mk +++ b/package/pulseaudio/pulseaudio.mk @@ -4,7 +4,7 @@ # ################################################################################ -PULSEAUDIO_VERSION = 14.2 +PULSEAUDIO_VERSION = 16.1 PULSEAUDIO_SOURCE = pulseaudio-$(PULSEAUDIO_VERSION).tar.xz PULSEAUDIO_SITE = https://freedesktop.org/software/pulseaudio/releases PULSEAUDIO_INSTALL_STAGING = YES @@ -13,120 +13,136 @@ PULSEAUDIO_LICENSE_FILES = LICENSE GPL LGPL PULSEAUDIO_CPE_ID_VENDOR = pulseaudio PULSEAUDIO_SELINUX_MODULES = pulseaudio xdg PULSEAUDIO_CONF_OPTS = \ - --disable-default-build-tests \ - --disable-legacy-database-entry-format \ - --disable-manpages \ - --disable-running-from-build-tree + -Ddoxygen=false \ + -Dlegacy-database-entry-format=false \ + -Dman=false \ + -Drunning-from-build-tree=false \ + -Dtests=false PULSEAUDIO_DEPENDENCIES = \ - host-pkgconf libtool libsndfile speex \ - $(TARGET_NLS_DEPENDENCIES) \ - $(if $(BR2_PACKAGE_LIBGLIB2),libglib2) \ - $(if $(BR2_PACKAGE_AVAHI_DAEMON),avahi) \ - $(if $(BR2_PACKAGE_DBUS),dbus) \ - $(if $(BR2_PACKAGE_NCURSES),ncurses) \ - $(if $(BR2_PACKAGE_OPENSSL),openssl) \ - $(if $(BR2_PACKAGE_FFTW_SINGLE),fftw-single) \ - $(if $(BR2_PACKAGE_SYSTEMD),systemd) + host-pkgconf libtool libsndfile libglib2 \ + $(TARGET_NLS_DEPENDENCIES) + +PULSEAUDIO_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) + +ifeq ($(BR2_PACKAGE_AVAHI_LIBAVAHI_CLIENT),y) +PULSEAUDIO_CONF_OPTS += -Davahi=enabled +PULSEAUDIO_DEPENDENCIES += avahi +else +PULSEAUDIO_CONF_OPTS += -Davahi=disabled +endif + +ifeq ($(BR2_PACKAGE_DBUS),y) +PULSEAUDIO_CONF_OPTS += -Ddbus=enabled +PULSEAUDIO_DEPENDENCIES += dbus +else +PULSEAUDIO_CONF_OPTS += -Ddbus=disabled +endif + +ifeq ($(BR2_PACKAGE_FFTW_SINGLE),y) +PULSEAUDIO_CONF_OPTS += -Dfftw=enabled +PULSEAUDIO_DEPENDENCIES += fftw-single +else +PULSEAUDIO_CONF_OPTS += -Dfftw=disabled +endif ifeq ($(BR2_PACKAGE_LIBSAMPLERATE),y) -PULSEAUDIO_CONF_OPTS += --enable-samplerate +PULSEAUDIO_CONF_OPTS += -Dsamplerate=enabled PULSEAUDIO_DEPENDENCIES += libsamplerate else -PULSEAUDIO_CONF_OPTS += --disable-samplerate +PULSEAUDIO_CONF_OPTS += -Dsamplerate=disabled endif ifeq ($(BR2_PACKAGE_GDBM),y) -PULSEAUDIO_CONF_OPTS += --with-database=gdbm +PULSEAUDIO_CONF_OPTS += -Ddatabase=gdbm PULSEAUDIO_DEPENDENCIES += gdbm else -PULSEAUDIO_CONF_OPTS += --with-database=simple +PULSEAUDIO_CONF_OPTS += -Ddatabase=simple endif ifeq ($(BR2_PACKAGE_JACK2),y) -PULSEAUDIO_CONF_OPTS += --enable-jack +PULSEAUDIO_CONF_OPTS += -Djack=enabled PULSEAUDIO_DEPENDENCIES += jack2 else -PULSEAUDIO_CONF_OPTS += --disable-jack +PULSEAUDIO_CONF_OPTS += -Djack=disabled endif ifeq ($(BR2_PACKAGE_LIBATOMIC_OPS),y) PULSEAUDIO_DEPENDENCIES += libatomic_ops ifeq ($(BR2_sparc_v8)$(BR2_sparc_leon3),y) -PULSEAUDIO_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -DAO_NO_SPARC_V9" +PULSEAUDIO_CFLAGS = $(TARGET_CFLAGS) -DAO_NO_SPARC_V9 +endif +endif + +ifeq ($(BR2_PACKAGE_LIRC_TOOLS),y) +PULSEAUDIO_DEPENDENCIES += lirc-tools +PULSEAUDIO_CONF_OPTS += -Dlirc=enabled +else +PULSEAUDIO_CONF_OPTS += -Dlirc=disabled endif + +ifeq ($(BR2_PACKAGE_OPENSSL),y) +PULSEAUDIO_CONF_OPTS += -Dopenssl=enabled +PULSEAUDIO_DEPENDENCIES += openssl +else +PULSEAUDIO_CONF_OPTS += -Dopenssl=disabled endif ifeq ($(BR2_PACKAGE_ORC),y) PULSEAUDIO_DEPENDENCIES += orc PULSEAUDIO_CONF_ENV += ORCC=$(HOST_DIR)/bin/orcc -PULSEAUDIO_CONF_OPTS += --enable-orc +PULSEAUDIO_CONF_OPTS += -Dorc=enabled else -PULSEAUDIO_CONF_OPTS += --disable-orc +PULSEAUDIO_CONF_OPTS += -Dorc=disabled endif ifeq ($(BR2_PACKAGE_LIBCAP),y) PULSEAUDIO_DEPENDENCIES += libcap -PULSEAUDIO_CONF_OPTS += --with-caps -else -PULSEAUDIO_CONF_OPTS += --without-caps endif # gtk3 support needs X11 backend ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) PULSEAUDIO_DEPENDENCIES += libgtk3 -PULSEAUDIO_CONF_OPTS += --enable-gtk3 +PULSEAUDIO_CONF_OPTS += -Dgtk=enabled else -PULSEAUDIO_CONF_OPTS += --disable-gtk3 +PULSEAUDIO_CONF_OPTS += -Dgtk=disabled endif ifeq ($(BR2_PACKAGE_LIBSOXR),y) -PULSEAUDIO_CONF_OPTS += --with-soxr +PULSEAUDIO_CONF_OPTS += -Dsoxr=enabled PULSEAUDIO_DEPENDENCIES += libsoxr else -PULSEAUDIO_CONF_OPTS += --without-soxr +PULSEAUDIO_CONF_OPTS += -Dsoxr=disabled endif ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS)$(BR2_PACKAGE_SBC),yy) -PULSEAUDIO_CONF_OPTS += --enable-bluez5 +PULSEAUDIO_CONF_OPTS += -Dbluez5=enabled PULSEAUDIO_DEPENDENCIES += bluez5_utils sbc else -PULSEAUDIO_CONF_OPTS += --disable-bluez5 +PULSEAUDIO_CONF_OPTS += -Dbluez5=disabled endif ifeq ($(BR2_PACKAGE_HAS_UDEV),y) -PULSEAUDIO_CONF_OPTS += --enable-udev +PULSEAUDIO_CONF_OPTS += -Dudev=enabled PULSEAUDIO_DEPENDENCIES += udev else -PULSEAUDIO_CONF_OPTS += --disable-udev +PULSEAUDIO_CONF_OPTS += -Dudev=disabled endif ifeq ($(BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING),y) -PULSEAUDIO_CONF_OPTS += --enable-webrtc-aec +PULSEAUDIO_CONF_OPTS += -Dwebrtc-aec=enabled PULSEAUDIO_DEPENDENCIES += webrtc-audio-processing else -PULSEAUDIO_CONF_OPTS += --disable-webrtc-aec -endif - -# neon intrinsics not available with float-abi=soft -ifeq ($(BR2_ARM_SOFT_FLOAT),) -ifeq ($(BR2_ARM_CPU_HAS_NEON),y) -PULSEAUDIO_USE_NEON = y -endif -endif - -ifeq ($(PULSEAUDIO_USE_NEON),y) -PULSEAUDIO_CONF_OPTS += --enable-neon-opt=yes -else -PULSEAUDIO_CONF_OPTS += --enable-neon-opt=no +PULSEAUDIO_CONF_OPTS += -Dwebrtc-aec=disabled endif -# pulseaudio alsa backend needs pcm/mixer apis -ifeq ($(BR2_PACKAGE_ALSA_LIB_PCM)$(BR2_PACKAGE_ALSA_LIB_MIXER),yy) +# our Config.in makes sure that all needed alsa-lib features are +# enabled +ifeq ($(BR2_PACKAGE_ALSA_LIB),y) PULSEAUDIO_DEPENDENCIES += alsa-lib -PULSEAUDIO_CONF_OPTS += --enable-alsa +PULSEAUDIO_CONF_OPTS += -Dalsa=enabled else -PULSEAUDIO_CONF_OPTS += --disable-alsa +PULSEAUDIO_CONF_OPTS += -Dalsa=disabled endif ifeq ($(BR2_PACKAGE_LIBXCB)$(BR2_PACKAGE_XLIB_LIBSM)$(BR2_PACKAGE_XLIB_LIBXTST),yyy) @@ -143,7 +159,30 @@ PULSEAUDIO_POST_PATCH_HOOKS += PULSEAUDIO_FIXUP_DESKTOP_FILES endif else -PULSEAUDIO_CONF_OPTS += --disable-x11 +PULSEAUDIO_CONF_OPTS += -Dx11=disabled +endif + +# This is not a mistake: the option is called speex, but what it +# really needs is speexdsp +ifeq ($(BR2_PACKAGE_SPEEXDSP),y) +PULSEAUDIO_CONF_OPTS += -Dspeex=enabled +PULSEAUDIO_DEPENDENCIES += speexdsp +else +PULSEAUDIO_CONF_OPTS += -Dspeex=disabled +endif + +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +PULSEAUDIO_CONF_OPTS += -Dsystemd=enabled +PULSEAUDIO_DEPENDENCIES += systemd +else +PULSEAUDIO_CONF_OPTS += -Dsystemd=disabled +endif + +ifeq ($(BR2_PACKAGE_VALGRIND),y) +PULSEAUDIO_CONF_OPTS += -Dvalgrind=enabled +PULSEAUDIO_DEPENDENCIES += valgrind +else +PULSEAUDIO_CONF_OPTS += -Dvalgrind=disabled endif # ConsoleKit module init failure breaks user daemon startup @@ -175,4 +214,4 @@ endef endif -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/package/pure-ftpd/pure-ftpd.hash b/package/pure-ftpd/pure-ftpd.hash index e8b779c313e..4cbbfa15ad6 100644 --- a/package/pure-ftpd/pure-ftpd.hash +++ b/package/pure-ftpd/pure-ftpd.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 6722c7fd09fe3c9ebbd572f3d097087ec7b32aacb3df8fa3400d4c07e4f377d7 pure-ftpd-1.0.50.tar.bz2 -sha256 c1be5d56c28927b05131d7384bd522af4b11c3afea45725f5ca7983c11db61ac COPYING +sha256 622360b86c60b563abe0e994f0a86cfe5ccfde597b29a14b0a79b6e5aa05a304 pure-ftpd-1.0.51.tar.bz2 +sha256 88c813191c1a59213c641e322cf4562618ab0116ddd7c8341c419f8863b8b0a9 COPYING diff --git a/package/pure-ftpd/pure-ftpd.mk b/package/pure-ftpd/pure-ftpd.mk index f3cbef84b90..138b05ebb40 100644 --- a/package/pure-ftpd/pure-ftpd.mk +++ b/package/pure-ftpd/pure-ftpd.mk @@ -4,7 +4,7 @@ # ################################################################################ -PURE_FTPD_VERSION = 1.0.50 +PURE_FTPD_VERSION = 1.0.51 PURE_FTPD_SITE = https://download.pureftpd.org/pub/pure-ftpd/releases PURE_FTPD_SOURCE = pure-ftpd-$(PURE_FTPD_VERSION).tar.bz2 PURE_FTPD_LICENSE = ISC diff --git a/package/pwgen/pwgen.hash b/package/pwgen/pwgen.hash index 6dca6363c1e..f04e6c3df8a 100644 --- a/package/pwgen/pwgen.hash +++ b/package/pwgen/pwgen.hash @@ -1,5 +1,5 @@ # From http://sourceforge.net/projects/pwgen/files/pwgen/2.08/ -md5 6cfba450ac6ff72d11e88a6b0b049165 pwgen-2.08.tar.gz -sha1 6406deba61297784888c2ec0c14e3c735a85a2b6 pwgen-2.08.tar.gz +md5 6cfba450ac6ff72d11e88a6b0b049165 pwgen-2.08.tar.gz +sha1 6406deba61297784888c2ec0c14e3c735a85a2b6 pwgen-2.08.tar.gz # Locally computed: -sha256 5d3e49e01ef782be5841d5d1f7fb64d290cd86459598a913818584a46a2f81a1 debian/copyright +sha256 5d3e49e01ef782be5841d5d1f7fb64d290cd86459598a913818584a46a2f81a1 debian/copyright diff --git a/package/python-aenum/python-aenum.hash b/package/python-aenum/python-aenum.hash index d10254f9b15..40c0e55fc52 100644 --- a/package/python-aenum/python-aenum.hash +++ b/package/python-aenum/python-aenum.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aenum/json -md5 6f30144abd4d156f22f8a49d81c496df aenum-3.1.0.tar.gz -sha256 87f0e9ef4f828578ab06af30e4d7944043bf4ecd3f4b7bd1cbe37e2173cde94a aenum-3.1.0.tar.gz +md5 c0b78a74cdfacc0bf0cbb42785afaed8 aenum-3.1.11.tar.gz +sha256 aed2c273547ae72a0d5ee869719c02a643da16bf507c80958faadc7e038e3f73 aenum-3.1.11.tar.gz # Locally computed sha256 checksums sha256 0db837e38002017b352666c83c8d3216ee5b9b2229375eb2cf4487f8c24e1f8c aenum/LICENSE diff --git a/package/python-aenum/python-aenum.mk b/package/python-aenum/python-aenum.mk index 72eaa1db2bb..603fc66d0cc 100644 --- a/package/python-aenum/python-aenum.mk +++ b/package/python-aenum/python-aenum.mk @@ -4,11 +4,19 @@ # ################################################################################ -PYTHON_AENUM_VERSION = 3.1.0 +PYTHON_AENUM_VERSION = 3.1.11 PYTHON_AENUM_SOURCE = aenum-$(PYTHON_AENUM_VERSION).tar.gz -PYTHON_AENUM_SITE = https://files.pythonhosted.org/packages/ae/25/00b2949186e76a4c9732e33221274964fecf5c88178cbe5a14a80cfc04e8 +PYTHON_AENUM_SITE = https://files.pythonhosted.org/packages/63/6c/a71e18de7c651f384b328be6bccadbbd472aca62f547c1a307b9388d03ca PYTHON_AENUM_SETUP_TYPE = setuptools PYTHON_AENUM_LICENSE = BSD-3-Clause PYTHON_AENUM_LICENSE_FILES = aenum/LICENSE +# _py2.py uses syntax not compatible with Python3. +# Remove _py2.py to avoid compilation error. +define PYTHON_AENUM_REMOVE_PY2_PY + rm $(@D)/aenum/_py2.py +endef + +PYTHON_AENUM_POST_EXTRACT_HOOKS = PYTHON_AENUM_REMOVE_PY2_PY + $(eval $(python-package)) diff --git a/package/python-aioblescan/python-aioblescan.hash b/package/python-aioblescan/python-aioblescan.hash index 2592aace339..c754325fb1f 100644 --- a/package/python-aioblescan/python-aioblescan.hash +++ b/package/python-aioblescan/python-aioblescan.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aioblescan/json -md5 f59934c040a817192fcd3e713633cf20 aioblescan-0.2.8.tar.gz -sha256 2b048f5fe6e85b18fe306bdb63307705f3d1139563d3187d751b8657065a5bd9 aioblescan-0.2.8.tar.gz +md5 10014cfd24b8f9f54099bbf7e2ea528a aioblescan-0.2.14.tar.gz +sha256 3a47c5292186ee87fc49cb076a5271c766510f44749b93ac4a32bbb4cb5258a0 aioblescan-0.2.14.tar.gz # Locally computed sha256 checksums sha256 c2066cd44079e0c706234001af18cb6ad4b62fc68d0d08d29fdc7319916647e0 LICENSE.txt diff --git a/package/python-aioblescan/python-aioblescan.mk b/package/python-aioblescan/python-aioblescan.mk index 8a9db927ac4..7e0cde6c85a 100644 --- a/package/python-aioblescan/python-aioblescan.mk +++ b/package/python-aioblescan/python-aioblescan.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOBLESCAN_VERSION = 0.2.8 +PYTHON_AIOBLESCAN_VERSION = 0.2.14 PYTHON_AIOBLESCAN_SOURCE = aioblescan-$(PYTHON_AIOBLESCAN_VERSION).tar.gz -PYTHON_AIOBLESCAN_SITE = https://files.pythonhosted.org/packages/d2/10/b8b496903f33935c99f3602200d44ccc0b0a57b87e5fa65b89466c1b1f31 +PYTHON_AIOBLESCAN_SITE = https://files.pythonhosted.org/packages/45/15/faf503083bc5a2d81f1b17fbbe30d15f35217b6c5e944c771c8760354d59 PYTHON_AIOBLESCAN_SETUP_TYPE = setuptools PYTHON_AIOBLESCAN_LICENSE = MIT PYTHON_AIOBLESCAN_LICENSE_FILES = LICENSE.txt diff --git a/package/python-aiocoap/python-aiocoap.hash b/package/python-aiocoap/python-aiocoap.hash index 6357a87931e..ab50ff0958d 100644 --- a/package/python-aiocoap/python-aiocoap.hash +++ b/package/python-aiocoap/python-aiocoap.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiocoap/json -md5 c5809dfb02be8784ec17897380009052 aiocoap-0.4.1.tar.gz -sha256 c47c9d19a98699f27707186871b7c84f4a7016fe4fbb5bd300f809ae456f8a55 aiocoap-0.4.1.tar.gz +md5 03ca0411b7401bfd6e9bdaefe09bd88a aiocoap-0.4.5.tar.gz +sha256 906c927822185c8acf04fdcc1dd98fd845f31dabf5d5e395c39137dcbd6ba1e3 aiocoap-0.4.5.tar.gz # Locally computed sha256 checksums sha256 2bb211d412a6bfa4b2a9cf01123c7fe90e5e6185938896e23ab07b84f8494180 LICENSE diff --git a/package/python-aiocoap/python-aiocoap.mk b/package/python-aiocoap/python-aiocoap.mk index c933d27b23f..92f47b7a4ff 100644 --- a/package/python-aiocoap/python-aiocoap.mk +++ b/package/python-aiocoap/python-aiocoap.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOCOAP_VERSION = 0.4.1 +PYTHON_AIOCOAP_VERSION = 0.4.5 PYTHON_AIOCOAP_SOURCE = aiocoap-$(PYTHON_AIOCOAP_VERSION).tar.gz -PYTHON_AIOCOAP_SITE = https://files.pythonhosted.org/packages/67/1c/6d6764010a4779d61bc7241afa663b368261c72af20555b26efc875d4276 +PYTHON_AIOCOAP_SITE = https://files.pythonhosted.org/packages/65/63/9051af6a2fc498f50b71f23bdbde0cc1d1f0a69eb767776dbf6d1411e240 PYTHON_AIOCOAP_SETUP_TYPE = setuptools PYTHON_AIOCOAP_LICENSE = MIT PYTHON_AIOCOAP_LICENSE_FILES = LICENSE diff --git a/package/python-aioconsole/python-aioconsole.hash b/package/python-aioconsole/python-aioconsole.hash index 39ce16f8b25..107910b6be6 100644 --- a/package/python-aioconsole/python-aioconsole.hash +++ b/package/python-aioconsole/python-aioconsole.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aioconsole/json -md5 56a1e6542ea3627bdbc67f24abcaa341 aioconsole-0.4.0.tar.gz -sha256 a30ad5276b85dd20a48d235111d0bd26c6bedf7b56d605ffc10ae27124b4b0b4 aioconsole-0.4.0.tar.gz +md5 ae7bae13cb8aab6b1a4d2c25284ffcd3 aioconsole-0.5.1.tar.gz +sha256 c8ddd9fd21db71ea51fb9b0d20d21d11c409c92988edf07c935d705fa60e026b aioconsole-0.5.1.tar.gz # Locally computed sha256 checksums sha256 fe3eea6c599e23a00c08c5f5cb2320c30adc8f8687db5fcec9b79a662c53ff6b LICENSE diff --git a/package/python-aioconsole/python-aioconsole.mk b/package/python-aioconsole/python-aioconsole.mk index 44857054d45..dc0eb36158b 100644 --- a/package/python-aioconsole/python-aioconsole.mk +++ b/package/python-aioconsole/python-aioconsole.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOCONSOLE_VERSION = 0.4.0 +PYTHON_AIOCONSOLE_VERSION = 0.5.1 PYTHON_AIOCONSOLE_SOURCE = aioconsole-$(PYTHON_AIOCONSOLE_VERSION).tar.gz -PYTHON_AIOCONSOLE_SITE = https://files.pythonhosted.org/packages/f2/7a/7628ec23f140ffca532c7f630e179503727b755849b5eab15576bbf7d3df +PYTHON_AIOCONSOLE_SITE = https://files.pythonhosted.org/packages/71/74/cd64dbc518f71486b235f0e1538ea4b7cbf4375a8bdc6f96c9c9595291ab PYTHON_AIOCONSOLE_SETUP_TYPE = setuptools PYTHON_AIOCONSOLE_LICENSE = GPL-3.0 PYTHON_AIOCONSOLE_LICENSE_FILES = LICENSE diff --git a/package/python-aiofiles/python-aiofiles.hash b/package/python-aiofiles/python-aiofiles.hash index 268136a406d..d1594c3989c 100644 --- a/package/python-aiofiles/python-aiofiles.hash +++ b/package/python-aiofiles/python-aiofiles.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiofiles/json -md5 697deeb4fdcb620c45f114f173ed7c0d aiofiles-0.8.0.tar.gz -sha256 8334f23235248a3b2e83b2c3a78a22674f39969b96397126cc93664d9a901e59 aiofiles-0.8.0.tar.gz +md5 b22db90039c881f6aa64431c6b23f30f aiofiles-22.1.0.tar.gz +sha256 9107f1ca0b2a5553987a94a3c9959fe5b491fdf731389aa5b7b1bd0733e32de6 aiofiles-22.1.0.tar.gz # Locally computed sha256 checksums sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSE diff --git a/package/python-aiofiles/python-aiofiles.mk b/package/python-aiofiles/python-aiofiles.mk index 996e5eb6c03..b65d2cfa82b 100644 --- a/package/python-aiofiles/python-aiofiles.mk +++ b/package/python-aiofiles/python-aiofiles.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOFILES_VERSION = 0.8.0 +PYTHON_AIOFILES_VERSION = 22.1.0 PYTHON_AIOFILES_SOURCE = aiofiles-$(PYTHON_AIOFILES_VERSION).tar.gz -PYTHON_AIOFILES_SITE = https://files.pythonhosted.org/packages/10/ca/c416cfacf6a47e1400dad56eab85aa86c92c6fbe58447d12035e434f0d5c +PYTHON_AIOFILES_SITE = https://files.pythonhosted.org/packages/86/26/6e5060a159a6131c430e8a01ec8327405a19a449a506224b394e36f2ebc9 PYTHON_AIOFILES_SETUP_TYPE = setuptools PYTHON_AIOFILES_LICENSE = Apache-2.0 PYTHON_AIOFILES_LICENSE_FILES = LICENSE diff --git a/package/python-aiohttp-cors/python-aiohttp-cors.hash b/package/python-aiohttp-cors/python-aiohttp-cors.hash index b91e5fa8c00..29ae2d79090 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 de3940a901b269be82c8bd9f28d53ff0 aiohttp-cors-0.7.0.tar.gz +sha256 4d39c6d7100fd9764ed1caf8cebf0eb01bf5e3f24e2e073fda6234bc48b19f5d aiohttp-cors-0.7.0.tar.gz # Locally computed sha256 checksums -sha256 86cb2262ff825ce1c8b8fb9ea9f5174318badc3912639b9275fc25d0e305c556 LICENSE +sha256 86cb2262ff825ce1c8b8fb9ea9f5174318badc3912639b9275fc25d0e305c556 LICENSE diff --git a/package/python-aiohttp-debugtoolbar/python-aiohttp-debugtoolbar.hash b/package/python-aiohttp-debugtoolbar/python-aiohttp-debugtoolbar.hash index 927bd328951..3cd9462d72e 100644 --- a/package/python-aiohttp-debugtoolbar/python-aiohttp-debugtoolbar.hash +++ b/package/python-aiohttp-debugtoolbar/python-aiohttp-debugtoolbar.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiohttp_debugtoolbar/json -md5 496734057cb413d7a49a52a817802dbb aiohttp-debugtoolbar-0.6.0.tar.gz -sha256 ec231661133b40136608d39dfb688e7ea0c3d47b6ae6dee52d5bf24ceb9e4d45 aiohttp-debugtoolbar-0.6.0.tar.gz +md5 496734057cb413d7a49a52a817802dbb aiohttp-debugtoolbar-0.6.0.tar.gz +sha256 ec231661133b40136608d39dfb688e7ea0c3d47b6ae6dee52d5bf24ceb9e4d45 aiohttp-debugtoolbar-0.6.0.tar.gz # Locally computed sha256 checksums -sha256 94d638be2cb4f186cc62bb567455837757547c15f1b350863aaf05a38843b542 LICENSE +sha256 94d638be2cb4f186cc62bb567455837757547c15f1b350863aaf05a38843b542 LICENSE diff --git a/package/python-aiohttp-mako/python-aiohttp-mako.hash b/package/python-aiohttp-mako/python-aiohttp-mako.hash index 169027e1dfb..1991acdbce2 100644 --- a/package/python-aiohttp-mako/python-aiohttp-mako.hash +++ b/package/python-aiohttp-mako/python-aiohttp-mako.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiohttp-mako/json -md5 c0f2da2851d0b6e819b5c882f700bb11 aiohttp-mako-0.4.0.tar.gz -sha256 f10bdee54589b6567e8a0339db582276fdaaa198764541d2f9741f1d3836312c aiohttp-mako-0.4.0.tar.gz +md5 c0f2da2851d0b6e819b5c882f700bb11 aiohttp-mako-0.4.0.tar.gz +sha256 f10bdee54589b6567e8a0339db582276fdaaa198764541d2f9741f1d3836312c aiohttp-mako-0.4.0.tar.gz # Locally computed sha256 checksums -sha256 b81fea0e0d4cda42faf00466cabe7b9e2a0cc3a0ffbf20ae3773c18e077c7c52 LICENSE +sha256 b81fea0e0d4cda42faf00466cabe7b9e2a0cc3a0ffbf20ae3773c18e077c7c52 LICENSE diff --git a/package/python-aiohttp-remotes/0001-Fix-flit_core-build-requires-backend.patch b/package/python-aiohttp-remotes/0001-Fix-flit_core-build-requires-backend.patch new file mode 100644 index 00000000000..cf940eaf87a --- /dev/null +++ b/package/python-aiohttp-remotes/0001-Fix-flit_core-build-requires-backend.patch @@ -0,0 +1,32 @@ +From 3d39ee9a03a1c96b8e798dc6acf98165da31da1f Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Fri, 11 Mar 2022 12:59:53 -0700 +Subject: [PATCH] Fix flit_core build requires/backend. + +Only flit_core should be required by pyproject.toml, the regular flit +package is the pep517 frontend which is not what should be set for the +build system. + +Signed-off-by: James Hilliard +[Upstream status: +https://github.com/aio-libs/aiohttp-remotes/pull/355] +--- + pyproject.toml | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pyproject.toml b/pyproject.toml +index 214d64d..8c6b882 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -1,6 +1,6 @@ + [build-system] +-requires=["flit"] +-build-backend="flit.buildapi" ++requires=["flit_core"] ++build-backend="flit_core.buildapi" + + [tool.flit.metadata] + module="aiohttp_remotes" +-- +2.38.1 + diff --git a/package/python-aiohttp-remotes/python-aiohttp-remotes.hash b/package/python-aiohttp-remotes/python-aiohttp-remotes.hash index 595340d5d87..51c5cf08b42 100644 --- a/package/python-aiohttp-remotes/python-aiohttp-remotes.hash +++ b/package/python-aiohttp-remotes/python-aiohttp-remotes.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiohttp-remotes/json -md5 da13880f25ec3b9cf98c7baff92835a2 aiohttp_remotes-1.1.0.tar.gz -sha256 e44f2c5fd5fc3305477c89bb25f14570589100cc58c48b36745d4239839d3174 aiohttp_remotes-1.1.0.tar.gz +md5 c46a71df656e7f1e111684ced68a85d0 aiohttp_remotes-1.2.0.tar.gz +sha256 f95c3a6be5e2de746a85ce9af49ec548da6db8378d7e81bb171ec77b13562a6c aiohttp_remotes-1.2.0.tar.gz # Locally computed sha256 checksums sha256 4e7d0edf250abe2a28027788b8c55a53d1b5c9ff961b8a00643c76aed637ba13 LICENSE diff --git a/package/python-aiohttp-remotes/python-aiohttp-remotes.mk b/package/python-aiohttp-remotes/python-aiohttp-remotes.mk index e2bc3e1c180..e0ec789f416 100644 --- a/package/python-aiohttp-remotes/python-aiohttp-remotes.mk +++ b/package/python-aiohttp-remotes/python-aiohttp-remotes.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_AIOHTTP_REMOTES_VERSION = 1.1.0 +PYTHON_AIOHTTP_REMOTES_VERSION = 1.2.0 PYTHON_AIOHTTP_REMOTES_SOURCE = aiohttp_remotes-$(PYTHON_AIOHTTP_REMOTES_VERSION).tar.gz -PYTHON_AIOHTTP_REMOTES_SITE = https://files.pythonhosted.org/packages/e3/fc/5523010172e2d8685a8934fbb49d564118c9ebc1e4233a62b77310f979db -PYTHON_AIOHTTP_REMOTES_SETUP_TYPE = distutils +PYTHON_AIOHTTP_REMOTES_SITE = https://files.pythonhosted.org/packages/54/05/7c4be6171cc78a13171a4f89e5d308c4a636bdd8ee36101367e99e410ed8 +PYTHON_AIOHTTP_REMOTES_SETUP_TYPE = flit PYTHON_AIOHTTP_REMOTES_LICENSE = MIT PYTHON_AIOHTTP_REMOTES_LICENSE_FILES = LICENSE diff --git a/package/python-aiohttp-security/python-aiohttp-security.hash b/package/python-aiohttp-security/python-aiohttp-security.hash index 1d2604c90c3..2c23df14d6f 100644 --- a/package/python-aiohttp-security/python-aiohttp-security.hash +++ b/package/python-aiohttp-security/python-aiohttp-security.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiohttp-security/json -md5 1624f982d7a779e6ed396ef2ed20acc7 aiohttp-security-0.4.0.tar.gz -sha256 40d4bb150454e392c2dfa3620f6eab28e140e94cf0c2d3b4bf43aef653ec9405 aiohttp-security-0.4.0.tar.gz +md5 1624f982d7a779e6ed396ef2ed20acc7 aiohttp-security-0.4.0.tar.gz +sha256 40d4bb150454e392c2dfa3620f6eab28e140e94cf0c2d3b4bf43aef653ec9405 aiohttp-security-0.4.0.tar.gz # Locally computed sha256 checksums -sha256 a1cc8ff7210897d55d2552fa0792340f8e59720e0160b6918699d40f9a782b1c LICENSE +sha256 a1cc8ff7210897d55d2552fa0792340f8e59720e0160b6918699d40f9a782b1c LICENSE diff --git a/package/python-aiohttp-session/python-aiohttp-session.hash b/package/python-aiohttp-session/python-aiohttp-session.hash index 8b443183072..efdac390074 100644 --- a/package/python-aiohttp-session/python-aiohttp-session.hash +++ b/package/python-aiohttp-session/python-aiohttp-session.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiohttp-session/json -md5 797273eb5f0ef9e95fa92c6a933cf4ad aiohttp-session-2.11.0.tar.gz -sha256 0fdf39600f6a05c4943ef6c7b099071ca9854413111a26761626244be5015dc4 aiohttp-session-2.11.0.tar.gz +md5 b89bde69f6f3c61a991ff408d2733838 aiohttp-session-2.12.0.tar.gz +sha256 0ccd11a7c77cb9e5a61f4daacdc9170d561112f9cfaf9e9a2d9867c0587d1950 aiohttp-session-2.12.0.tar.gz # Locally computed sha256 checksums sha256 7bc5dd2f229a6b922befb1427fd4ad2c0b255f12c1b1869370ba77520dc22bc7 LICENSE diff --git a/package/python-aiohttp-session/python-aiohttp-session.mk b/package/python-aiohttp-session/python-aiohttp-session.mk index 3d59b75e3de..55bf0e87f3a 100644 --- a/package/python-aiohttp-session/python-aiohttp-session.mk +++ b/package/python-aiohttp-session/python-aiohttp-session.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOHTTP_SESSION_VERSION = 2.11.0 +PYTHON_AIOHTTP_SESSION_VERSION = 2.12.0 PYTHON_AIOHTTP_SESSION_SOURCE = aiohttp-session-$(PYTHON_AIOHTTP_SESSION_VERSION).tar.gz -PYTHON_AIOHTTP_SESSION_SITE = https://files.pythonhosted.org/packages/3b/a7/0b97b9a2e3a553a86a6703f86b0e9b1afb2b262849700e8f80015c0f643f +PYTHON_AIOHTTP_SESSION_SITE = https://files.pythonhosted.org/packages/34/87/8dbc1385c875497d6bc16c9d94e25dbd8ff62599843b73fb4048ba74c867 PYTHON_AIOHTTP_SESSION_SETUP_TYPE = setuptools PYTHON_AIOHTTP_SESSION_LICENSE = Apache-2.0 PYTHON_AIOHTTP_SESSION_LICENSE_FILES = LICENSE diff --git a/package/python-aiohttp/python-aiohttp.hash b/package/python-aiohttp/python-aiohttp.hash index b2b0f8c9379..e59b6969e63 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 faf7726dc65a940272874c0f441e8ec6 aiohttp-3.8.1.tar.gz -sha256 fc5471e1a54de15ef71c1bc6ebe80d4dc681ea600e68bfd1cbce40427f0b7578 aiohttp-3.8.1.tar.gz +md5 642653db642be1508e50fcdeafe0f928 aiohttp-3.8.3.tar.gz +sha256 3828fb41b7203176b82fe5d699e0d845435f2374750a44b480ea6b930f6be269 aiohttp-3.8.3.tar.gz # Locally computed sha256 checksums -sha256 383c70c090b60ae81e035fe4fafed689b45c4421cd3bc355f1bd41ac208ccf3f LICENSE.txt +sha256 9f80d0db7d755a941db4572172c270ecbd8f082ba215ddd095985942ed94a9eb LICENSE.txt diff --git a/package/python-aiohttp/python-aiohttp.mk b/package/python-aiohttp/python-aiohttp.mk index 5a2d3064388..8b0b15f13b1 100644 --- a/package/python-aiohttp/python-aiohttp.mk +++ b/package/python-aiohttp/python-aiohttp.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOHTTP_VERSION = 3.8.1 +PYTHON_AIOHTTP_VERSION = 3.8.3 PYTHON_AIOHTTP_SOURCE = aiohttp-$(PYTHON_AIOHTTP_VERSION).tar.gz -PYTHON_AIOHTTP_SITE = https://files.pythonhosted.org/packages/5a/86/5f63de7a202550269a617a5d57859a2961f3396ecd1739a70b92224766bc +PYTHON_AIOHTTP_SITE = https://files.pythonhosted.org/packages/ff/4f/62d9859b7d4e6dc32feda67815c5f5ab4421e6909e48cbc970b6a40d60b7 PYTHON_AIOHTTP_SETUP_TYPE = setuptools PYTHON_AIOHTTP_LICENSE = Apache-2.0 PYTHON_AIOHTTP_LICENSE_FILES = LICENSE.txt diff --git a/package/python-aiojobs/Config.in b/package/python-aiojobs/Config.in index 0cdd1c106f2..2dc4f3f9550 100644 --- a/package/python-aiojobs/Config.in +++ b/package/python-aiojobs/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_AIOJOBS bool "python-aiojobs" + select BR2_PACKAGE_PYTHON_ASYNC_TIMEOUT # runtime help Jobs scheduler for managing background task (asyncio). diff --git a/package/python-aiojobs/python-aiojobs.hash b/package/python-aiojobs/python-aiojobs.hash index 44bf20c4280..511953713b9 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 d537fefca047067255758d7cb9e39db8 aiojobs-0.3.0.tar.gz -sha256 f6631d42dc4308f7d883abbd70d4e976f3fcc35a3ba1e8eae5d4af4940a1e0c3 aiojobs-0.3.0.tar.gz +md5 18a5b38cc13b2d59a91fdfec64588b4c aiojobs-1.1.0.tar.gz +sha256 f0c43dfc4de359052a67df309b593732c32028deef1bb787c7a363da29accde3 aiojobs-1.1.0.tar.gz # Locally computed sha256 checksums -sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE +sha256 1803dc89455114eefad3b827543343edc2452432fdac29b5edc66c8b66d4cbf3 LICENSE diff --git a/package/python-aiojobs/python-aiojobs.mk b/package/python-aiojobs/python-aiojobs.mk index 5d9a19eb8cf..075d807d8b1 100644 --- a/package/python-aiojobs/python-aiojobs.mk +++ b/package/python-aiojobs/python-aiojobs.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_AIOJOBS_VERSION = 0.3.0 +PYTHON_AIOJOBS_VERSION = 1.1.0 PYTHON_AIOJOBS_SOURCE = aiojobs-$(PYTHON_AIOJOBS_VERSION).tar.gz -PYTHON_AIOJOBS_SITE = https://files.pythonhosted.org/packages/da/09/76d9c0d66d2fd1333835f110cd85f7456de7cf3f60425e3b283fba562731 -PYTHON_AIOJOBS_SETUP_TYPE = distutils +PYTHON_AIOJOBS_SITE = https://files.pythonhosted.org/packages/99/75/b6d3678d804fffda81ebbac6214c35a4417d5ddbd70ffe7958ad951e64d2 +PYTHON_AIOJOBS_SETUP_TYPE = setuptools PYTHON_AIOJOBS_LICENSE = Apache-2.0 PYTHON_AIOJOBS_LICENSE_FILES = LICENSE diff --git a/package/python-aiologstash/python-aiologstash.hash b/package/python-aiologstash/python-aiologstash.hash index ff7d2cce99c..81ebfedfc33 100644 --- a/package/python-aiologstash/python-aiologstash.hash +++ b/package/python-aiologstash/python-aiologstash.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiologstash/json -md5 1e321c11b34477f780f31b2553557d69 aiologstash-2.0.0.tar.gz -sha256 698522126ffd4e905cd5f52a08092a0a78096c8f0e28bc1e303369873da71f78 aiologstash-2.0.0.tar.gz +md5 1e321c11b34477f780f31b2553557d69 aiologstash-2.0.0.tar.gz +sha256 698522126ffd4e905cd5f52a08092a0a78096c8f0e28bc1e303369873da71f78 aiologstash-2.0.0.tar.gz # Locally computed sha256 checksums -sha256 beddf3a80aaaa71ebd6765b13bc680bd0450bb81191249cc889539523f9404ec LICENSE +sha256 beddf3a80aaaa71ebd6765b13bc680bd0450bb81191249cc889539523f9404ec LICENSE diff --git a/package/python-aiomonitor/python-aiomonitor.hash b/package/python-aiomonitor/python-aiomonitor.hash index 410beb79730..652702c479b 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 5f184e4b97ea161fc2d690aef604f997 aiomonitor-0.4.5.tar.gz -sha256 6232c1ab14bf06cd7217845801c27340032f74e283bdaf32d01cdd3b7c673d0e aiomonitor-0.4.5.tar.gz +md5 5f184e4b97ea161fc2d690aef604f997 aiomonitor-0.4.5.tar.gz +sha256 6232c1ab14bf06cd7217845801c27340032f74e283bdaf32d01cdd3b7c673d0e aiomonitor-0.4.5.tar.gz # Locally computed sha256 checksums -sha256 9b42fe3a288996988c552e387e7877be7525a1649e62086aedd6b32d3cb56365 LICENSE +sha256 9b42fe3a288996988c552e387e7877be7525a1649e62086aedd6b32d3cb56365 LICENSE diff --git a/package/python-aioprocessing/python-aioprocessing.hash b/package/python-aioprocessing/python-aioprocessing.hash index cf92a72d4a0..8913a7abb02 100644 --- a/package/python-aioprocessing/python-aioprocessing.hash +++ b/package/python-aioprocessing/python-aioprocessing.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aioprocessing/json -md5 838b6aa073f1373bd42204f86b0e3196 aioprocessing-2.0.0.tar.gz -sha256 469dfb746e8c4e0c727ba135cfabf9e034c554f6a73c27f908bfe3625dd74b9e aioprocessing-2.0.0.tar.gz +md5 e533c65f5879374c27f266c2040405ea aioprocessing-2.0.1.tar.gz +sha256 fe01c7b1a38c78168611d3040e73d93036c3b7c8a649d636dc9ed7a3bc9b1ba2 aioprocessing-2.0.1.tar.gz # Locally computed sha256 checksums sha256 53c809e8f0b91a68a39477e5fbdf77fe2b74dd6a1647c2dd9b7b22fed135239e LICENSE.txt diff --git a/package/python-aioprocessing/python-aioprocessing.mk b/package/python-aioprocessing/python-aioprocessing.mk index e1e919de2d3..6cd59ab599d 100644 --- a/package/python-aioprocessing/python-aioprocessing.mk +++ b/package/python-aioprocessing/python-aioprocessing.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_AIOPROCESSING_VERSION = 2.0.0 +PYTHON_AIOPROCESSING_VERSION = 2.0.1 PYTHON_AIOPROCESSING_SOURCE = aioprocessing-$(PYTHON_AIOPROCESSING_VERSION).tar.gz -PYTHON_AIOPROCESSING_SITE = https://files.pythonhosted.org/packages/8e/3e/54266241660fb026bfd27f660d44cd81a4b7f8a145d8e2db010de12622a0 -PYTHON_AIOPROCESSING_SETUP_TYPE = setuptools +PYTHON_AIOPROCESSING_SITE = https://files.pythonhosted.org/packages/4d/85/9a75151e7049bf144c01384279201d82d99484bd658f8e6fb013552d8724 +PYTHON_AIOPROCESSING_SETUP_TYPE = flit PYTHON_AIOPROCESSING_LICENSE = BSD-2-Clause PYTHON_AIOPROCESSING_LICENSE_FILES = LICENSE.txt diff --git a/package/python-aiosignal/python-aiosignal.hash b/package/python-aiosignal/python-aiosignal.hash index f2a09749b80..061816a66e7 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 011700c3acc576a3a38deade6a4860cb aiosignal-1.2.0.tar.gz -sha256 78ed67db6c7b7ced4f98e495e572106d5c432a93e1ddd1bf475e1dc05f5b7df2 aiosignal-1.2.0.tar.gz +md5 2a15f4008b899377590cef4773020902 aiosignal-1.3.1.tar.gz +sha256 54cd96e15e1649b75d6c87526a6ff0b6c1b0dd3459f43d9ca11d48c339b68cfc aiosignal-1.3.1.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 e0436e973ed..ffd581cfba7 100644 --- a/package/python-aiosignal/python-aiosignal.mk +++ b/package/python-aiosignal/python-aiosignal.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOSIGNAL_VERSION = 1.2.0 +PYTHON_AIOSIGNAL_VERSION = 1.3.1 PYTHON_AIOSIGNAL_SOURCE = aiosignal-$(PYTHON_AIOSIGNAL_VERSION).tar.gz -PYTHON_AIOSIGNAL_SITE = https://files.pythonhosted.org/packages/27/6b/a89fbcfae70cf53f066ec22591938296889d3cc58fec1e1c393b10e8d71d +PYTHON_AIOSIGNAL_SITE = https://files.pythonhosted.org/packages/ae/67/0952ed97a9793b4958e5736f6d2b346b414a2cd63e82d05940032f45b32f PYTHON_AIOSIGNAL_SETUP_TYPE = setuptools PYTHON_AIOSIGNAL_LICENSE = Apache-2.0 PYTHON_AIOSIGNAL_LICENSE_FILES = LICENSE diff --git a/package/python-alembic/Config.in b/package/python-alembic/Config.in new file mode 100644 index 00000000000..a53dde7f7f6 --- /dev/null +++ b/package/python-alembic/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_ALEMBIC + bool "python-alembic" + help + Alembic is a database migrations tool written by the author + of SQLAlchemy. + + https://alembic.sqlalchemy.org diff --git a/package/python-alembic/python-alembic.hash b/package/python-alembic/python-alembic.hash new file mode 100644 index 00000000000..f94f5ab10a9 --- /dev/null +++ b/package/python-alembic/python-alembic.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/alembic/json +md5 999392ffc900da18afbf10d2ac31bdc6 alembic-1.9.1.tar.gz +sha256 f9f76e41061f5ebe27d4fe92600df9dd612521a7683f904dab328ba02cffa5a2 alembic-1.9.1.tar.gz +# Locally computed sha256 checksums +sha256 f0e3f7a5080879ccae798882d9bee3d48fe335d0bad84ca8eec86fa594375ea0 LICENSE diff --git a/package/python-alembic/python-alembic.mk b/package/python-alembic/python-alembic.mk new file mode 100644 index 00000000000..64ce85bead4 --- /dev/null +++ b/package/python-alembic/python-alembic.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-alembic +# +################################################################################ + +PYTHON_ALEMBIC_VERSION = 1.9.1 +PYTHON_ALEMBIC_SOURCE = alembic-$(PYTHON_ALEMBIC_VERSION).tar.gz +PYTHON_ALEMBIC_SITE = https://files.pythonhosted.org/packages/81/87/5c531d2923c61e7ae68b23c8660df289ae4241a0d38f3fbcbd8dba64ca6b +PYTHON_ALEMBIC_SETUP_TYPE = setuptools +PYTHON_ALEMBIC_LICENSE = MIT +PYTHON_ALEMBIC_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/package/python-alsaaudio/python-alsaaudio.hash b/package/python-alsaaudio/python-alsaaudio.hash index 476bc8f1a14..af3d0faad24 100644 --- a/package/python-alsaaudio/python-alsaaudio.hash +++ b/package/python-alsaaudio/python-alsaaudio.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyalsaaudio/json -md5 b46f69561bc85fc52e698b2440ca251e pyalsaaudio-0.8.4.tar.gz -sha256 84e8f8da544d7f4bd96479ce4a237600077984d9be1d7f16c1d9a492ecf50085 pyalsaaudio-0.8.4.tar.gz +md5 5408be7d7017ae9272706acb4a543c2f pyalsaaudio-0.9.2.tar.gz +sha256 e74a66d6c7a6bcceb990df66d3ebc0fe382fc9d765f35f050f9d98c695304b36 pyalsaaudio-0.9.2.tar.gz # Locally computed sha256 checksums -sha256 ef6ba930f96986d78082e67c817ac617b9e833d60d5a0460f24c9c674a010935 LICENSE +sha256 ef6ba930f96986d78082e67c817ac617b9e833d60d5a0460f24c9c674a010935 LICENSE diff --git a/package/python-alsaaudio/python-alsaaudio.mk b/package/python-alsaaudio/python-alsaaudio.mk index 3344583cf7c..205bfdb86ca 100644 --- a/package/python-alsaaudio/python-alsaaudio.mk +++ b/package/python-alsaaudio/python-alsaaudio.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ALSAAUDIO_VERSION = 0.8.4 +PYTHON_ALSAAUDIO_VERSION = 0.9.2 PYTHON_ALSAAUDIO_SOURCE = pyalsaaudio-$(PYTHON_ALSAAUDIO_VERSION).tar.gz -PYTHON_ALSAAUDIO_SITE = https://files.pythonhosted.org/packages/52/b6/44871791929d9d7e11325af0b7be711388dfeeab17147988f044a41a6d83 +PYTHON_ALSAAUDIO_SITE = https://files.pythonhosted.org/packages/a9/bd/24f576c07953671edfeba2545c3c92c46e97384f622957ecf95967c2b456 PYTHON_ALSAAUDIO_SETUP_TYPE = setuptools PYTHON_ALSAAUDIO_LICENSE = Python-2.0 PYTHON_ALSAAUDIO_LICENSE_FILES = LICENSE diff --git a/package/python-apispec/Config.in b/package/python-apispec/Config.in new file mode 100644 index 00000000000..7a322c99699 --- /dev/null +++ b/package/python-apispec/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_PYTHON_APISPEC + bool "python-apispec" + select BR2_PACKAGE_PYTHON_PACKAGING # runtime + help + A pluggable API specification generator. Currently supports + the OpenAPI Specification (f.k.a. the Swagger + specification). + + https://github.com/marshmallow-code/apispec diff --git a/package/python-apispec/python-apispec.hash b/package/python-apispec/python-apispec.hash new file mode 100644 index 00000000000..f2861f920a6 --- /dev/null +++ b/package/python-apispec/python-apispec.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/apispec/json +md5 b4e90006a26215e2e0a6fe2629d12c10 apispec-6.0.2.tar.gz +sha256 e76d80b739edef4be213092a6384ad7fd933ba7d64f6d5a0aff8d4da1bef7887 apispec-6.0.2.tar.gz +# Locally computed sha256 checksums +sha256 a452afcef750956a8396f7e7a6f913a117d28ef99a13170c29dc74c3b7a95f29 LICENSE diff --git a/package/python-apispec/python-apispec.mk b/package/python-apispec/python-apispec.mk new file mode 100644 index 00000000000..4674ce0c3da --- /dev/null +++ b/package/python-apispec/python-apispec.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-apispec +# +################################################################################ + +PYTHON_APISPEC_VERSION = 6.0.2 +PYTHON_APISPEC_SOURCE = apispec-$(PYTHON_APISPEC_VERSION).tar.gz +PYTHON_APISPEC_SITE = https://files.pythonhosted.org/packages/a7/2a/b42c17e0d653341b8f5916999892cd2d8489de127dac6118ae44531674f5 +PYTHON_APISPEC_SETUP_TYPE = setuptools +PYTHON_APISPEC_LICENSE = MIT +PYTHON_APISPEC_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/package/python-appdirs/Config.in b/package/python-appdirs/Config.in new file mode 100644 index 00000000000..5585759aa6b --- /dev/null +++ b/package/python-appdirs/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_APPDIRS + bool "python-appdirs" + help + A small Python module for determining appropriate platform- + specific dirs, e.g. a "user data dir". + + http://github.com/ActiveState/appdirs diff --git a/package/python-appdirs/python-appdirs.hash b/package/python-appdirs/python-appdirs.hash new file mode 100644 index 00000000000..52689b8b2c9 --- /dev/null +++ b/package/python-appdirs/python-appdirs.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/appdirs/json +md5 d6bca12613174185dd9abc8a29f4f012 appdirs-1.4.4.tar.gz +sha256 7d5d0167b2b1ba821647616af46a749d1c653740dd0d2415100fe26e27afdf41 appdirs-1.4.4.tar.gz +# Locally computed sha256 checksums +sha256 36ddb4d0a745a93ab203203d7190814b1b89727d254caff48c7a7afbbd47000b LICENSE.txt diff --git a/package/python-appdirs/python-appdirs.mk b/package/python-appdirs/python-appdirs.mk new file mode 100644 index 00000000000..222aadbb29b --- /dev/null +++ b/package/python-appdirs/python-appdirs.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-appdirs +# +################################################################################ + +PYTHON_APPDIRS_VERSION = 1.4.4 +PYTHON_APPDIRS_SOURCE = appdirs-$(PYTHON_APPDIRS_VERSION).tar.gz +PYTHON_APPDIRS_SITE = https://files.pythonhosted.org/packages/d7/d8/05696357e0311f5b5c316d7b95f46c669dd9c15aaeecbb48c7d0aeb88c40 +PYTHON_APPDIRS_SETUP_TYPE = setuptools +PYTHON_APPDIRS_LICENSE = MIT +PYTHON_APPDIRS_LICENSE_FILES = LICENSE.txt + +$(eval $(python-package)) diff --git a/package/python-argh/python-argh.hash b/package/python-argh/python-argh.hash index 163ea6cee89..15f72eb015c 100644 --- a/package/python-argh/python-argh.hash +++ b/package/python-argh/python-argh.hash @@ -1,5 +1,5 @@ # md5 from https://pypi.python.org/pypi/argh/json -md5 edda25f3f0164a963dd89c0e3c619973 argh-0.26.2.tar.gz +md5 edda25f3f0164a963dd89c0e3c619973 argh-0.26.2.tar.gz # Locally computed -sha256 e9535b8c84dc9571a48999094fda7f33e63c3f1b74f3e5f3ac0105a58405bb65 argh-0.26.2.tar.gz +sha256 e9535b8c84dc9571a48999094fda7f33e63c3f1b74f3e5f3ac0105a58405bb65 argh-0.26.2.tar.gz sha256 9c318783389a2e78735dc3d633e745e5648b826744521857045e84ed2e79ce2e README.rst diff --git a/package/python-argon2-cffi/Config.in b/package/python-argon2-cffi/Config.in index 5cddb3314e0..4d5a703d76a 100644 --- a/package/python-argon2-cffi/Config.in +++ b/package/python-argon2-cffi/Config.in @@ -1,10 +1,8 @@ config BR2_PACKAGE_PYTHON_ARGON2_CFFI bool "python-argon2-cffi" - depends on BR2_USE_MMU # libargon2 - depends on !BR2_STATIC_LIBS # libargon2 - select BR2_PACKAGE_PYTHON_CFFI # runtime - select BR2_PACKAGE_PYTHON_SIX # runtime - select BR2_PACKAGE_LIBARGON2 + depends on BR2_USE_MMU # python-argon2-cffi-bindings + depends on !BR2_STATIC_LIBS # python-argon2-cffi-bindings + select BR2_PACKAGE_PYTHON_ARGON2_CFFI_BINDINGS # runtime help The secure Argon2 password hashing algorithm. diff --git a/package/python-argon2-cffi/python-argon2-cffi.hash b/package/python-argon2-cffi/python-argon2-cffi.hash index 6c416ffd884..09da5855a3f 100644 --- a/package/python-argon2-cffi/python-argon2-cffi.hash +++ b/package/python-argon2-cffi/python-argon2-cffi.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/argon2-cffi/json -md5 f33bc18f2c2438f685ba1f0bbd2b86a4 argon2-cffi-21.1.0.tar.gz -sha256 f710b61103d1a1f692ca3ecbd1373e28aa5e545ac625ba067ff2feca1b2bb870 argon2-cffi-21.1.0.tar.gz +md5 b7843e8690c790f8e743d37bb75c25a8 argon2-cffi-21.3.0.tar.gz +sha256 d384164d944190a7dd7ef22c6aa3ff197da12962bd04b17f64d4e93d934dba5b argon2-cffi-21.3.0.tar.gz # Locally computed sha256 checksums sha256 bf659a28b49240602f56bbdf490cbe2ec509b15b98f99d7b19a52c740e327863 LICENSE diff --git a/package/python-argon2-cffi/python-argon2-cffi.mk b/package/python-argon2-cffi/python-argon2-cffi.mk index f01c9405896..0fb3e50ff35 100644 --- a/package/python-argon2-cffi/python-argon2-cffi.mk +++ b/package/python-argon2-cffi/python-argon2-cffi.mk @@ -4,19 +4,11 @@ # ################################################################################ -PYTHON_ARGON2_CFFI_VERSION = 21.1.0 +PYTHON_ARGON2_CFFI_VERSION = 21.3.0 PYTHON_ARGON2_CFFI_SOURCE = argon2-cffi-$(PYTHON_ARGON2_CFFI_VERSION).tar.gz -PYTHON_ARGON2_CFFI_SITE = https://files.pythonhosted.org/packages/7b/39/a26aaef5c3f0c6cfd67c80599b5b40a794fdab46f4ee3be925d71e2f9596 -PYTHON_ARGON2_CFFI_SETUP_TYPE = setuptools +PYTHON_ARGON2_CFFI_SITE = https://files.pythonhosted.org/packages/3f/18/20bb5b6bf55e55d14558b57afc3d4476349ab90e0c43e60f27a7c2187289 +PYTHON_ARGON2_CFFI_SETUP_TYPE = flit PYTHON_ARGON2_CFFI_LICENSE = MIT PYTHON_ARGON2_CFFI_LICENSE_FILES = LICENSE -PYTHON_ARGON2_CFFI_DEPENDENCIES = host-python-cffi libargon2 -PYTHON_ARGON2_CFFI_ENV = ARGON2_CFFI_USE_SYSTEM=1 - -ifeq ($(BR2_X86_CPU_HAS_SSE2),y) -PYTHON_ARGON2_CFFI_ENV += ARGON2_CFFI_USE_SSE2=1 -else -PYTHON_ARGON2_CFFI_ENV += ARGON2_CFFI_USE_SSE2=0 -endif $(eval $(python-package)) diff --git a/package/python-arrow/python-arrow.hash b/package/python-arrow/python-arrow.hash index 9216e1c26c0..30fb88e8c04 100644 --- a/package/python-arrow/python-arrow.hash +++ b/package/python-arrow/python-arrow.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/arrow/json -md5 608682052926c7e5636285af0618ef38 arrow-1.2.0.tar.gz -sha256 16fc29bbd9e425e3eb0fef3018297910a0f4568f21116fc31771e2760a50e074 arrow-1.2.0.tar.gz +md5 a964a7574e486b0642f3fbc02ef22773 arrow-1.2.3.tar.gz +sha256 3934b30ca1b9f292376d9db15b19446088d12ec58629bc3f0da28fd55fb633a1 arrow-1.2.3.tar.gz # Locally computed sha256 checksums sha256 40d6e1255d7151f5f041a514725d3c94ffa8c1881e5a0c29b6bea93f03e2e3bb LICENSE diff --git a/package/python-arrow/python-arrow.mk b/package/python-arrow/python-arrow.mk index a20ac8dbc7c..1e34ef09c81 100644 --- a/package/python-arrow/python-arrow.mk +++ b/package/python-arrow/python-arrow.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ARROW_VERSION = 1.2.0 +PYTHON_ARROW_VERSION = 1.2.3 PYTHON_ARROW_SOURCE = arrow-$(PYTHON_ARROW_VERSION).tar.gz -PYTHON_ARROW_SITE = https://files.pythonhosted.org/packages/dc/bd/2565b8533bb8cf66e10a9e68a1d489ad839799b2050f0635039e614e3b1a +PYTHON_ARROW_SITE = https://files.pythonhosted.org/packages/7f/c0/c601ea7811f422700ef809f167683899cdfddec5aa3f83597edf97349962 PYTHON_ARROW_SETUP_TYPE = setuptools PYTHON_ARROW_LICENSE = Apache-2.0 PYTHON_ARROW_LICENSE_FILES = LICENSE diff --git a/package/python-asgiref/python-asgiref.hash b/package/python-asgiref/python-asgiref.hash index c349ad5a442..26d8e78e471 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 5afe03ecc39ae94950ff95e80166d945 asgiref-3.3.4.tar.gz -sha256 d1216dfbdfb63826470995d31caed36225dcaf34f182e0fa257a4dd9e86f1b78 asgiref-3.3.4.tar.gz +md5 562ecd896dcbf5576db8c29cb1881ca4 asgiref-3.6.0.tar.gz +sha256 9567dfe7bd8d3c8c892227827c41cce860b368104c3431da67a0c5a65a949506 asgiref-3.6.0.tar.gz # Locally computed sha256 checksums -sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE +sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-asgiref/python-asgiref.mk b/package/python-asgiref/python-asgiref.mk index 0353f5d5a03..bfd90f10e8d 100644 --- a/package/python-asgiref/python-asgiref.mk +++ b/package/python-asgiref/python-asgiref.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ASGIREF_VERSION = 3.3.4 +PYTHON_ASGIREF_VERSION = 3.6.0 PYTHON_ASGIREF_SOURCE = asgiref-$(PYTHON_ASGIREF_VERSION).tar.gz -PYTHON_ASGIREF_SITE = https://files.pythonhosted.org/packages/d8/3f/ef696a6d8254f182b1a089aeffb638d2eb83055e603146d3a40605c5b7da +PYTHON_ASGIREF_SITE = https://files.pythonhosted.org/packages/78/2d/797c0537426266d6c9377a2ed6a4ac61e50c2d5b1ab4da101a4b9bfe26e2 PYTHON_ASGIREF_SETUP_TYPE = setuptools PYTHON_ASGIREF_LICENSE = BSD-3-Clause PYTHON_ASGIREF_LICENSE_FILES = LICENSE diff --git a/package/python-asn1crypto/python-asn1crypto.hash b/package/python-asn1crypto/python-asn1crypto.hash index fb2da94ed5a..4c9fda4618b 100644 --- a/package/python-asn1crypto/python-asn1crypto.hash +++ b/package/python-asn1crypto/python-asn1crypto.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/asn1crypto/json -md5 00bf5b72d37778e62cc73b1d8909ae27 asn1crypto-1.4.0.tar.gz -sha256 f4f6e119474e58e04a2b1af817eb585b4fd72bdd89b998624712b5c99be7641c asn1crypto-1.4.0.tar.gz +md5 f7a5271af9b81246fbdf57d703afce2f asn1crypto-1.5.1.tar.gz +sha256 13ae38502be632115abf8a24cbe5f4da52e3b5231990aff31123c805306ccb9c asn1crypto-1.5.1.tar.gz # Locally computed sha256 checksums -sha256 a88480656ec98943fb04344f6a477ee74062896f3ddb1a6f99e5f05f0109a286 LICENSE +sha256 29c3425e5da53ab842273e5f2f2f068ce2e35df4260f7fa156aa1ac6bed02433 LICENSE diff --git a/package/python-asn1crypto/python-asn1crypto.mk b/package/python-asn1crypto/python-asn1crypto.mk index af4e43b3d0a..480b70d17aa 100644 --- a/package/python-asn1crypto/python-asn1crypto.mk +++ b/package/python-asn1crypto/python-asn1crypto.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ASN1CRYPTO_VERSION = 1.4.0 +PYTHON_ASN1CRYPTO_VERSION = 1.5.1 PYTHON_ASN1CRYPTO_SOURCE = asn1crypto-$(PYTHON_ASN1CRYPTO_VERSION).tar.gz -PYTHON_ASN1CRYPTO_SITE = https://files.pythonhosted.org/packages/6b/b4/42f0e52ac2184a8abb31f0a6f98111ceee1aac0b473cee063882436e0e09 +PYTHON_ASN1CRYPTO_SITE = https://files.pythonhosted.org/packages/de/cf/d547feed25b5244fcb9392e288ff9fdc3280b10260362fc45d37a798a6ee PYTHON_ASN1CRYPTO_SETUP_TYPE = setuptools PYTHON_ASN1CRYPTO_LICENSE = MIT PYTHON_ASN1CRYPTO_LICENSE_FILES = LICENSE diff --git a/package/python-asttokens/Config.in b/package/python-asttokens/Config.in new file mode 100644 index 00000000000..2732b8124bc --- /dev/null +++ b/package/python-asttokens/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_ASTTOKENS + bool "python-asttokens" + select BR2_PACKAGE_PYTHON_SIX # runtime + help + Annotate AST trees with source code positions. + + https://github.com/gristlabs/asttokens diff --git a/package/python-asttokens/python-asttokens.hash b/package/python-asttokens/python-asttokens.hash new file mode 100644 index 00000000000..6529e4db412 --- /dev/null +++ b/package/python-asttokens/python-asttokens.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/asttokens/json +md5 a9ae6ae0f85398e511bcb9ec87695eed asttokens-2.2.1.tar.gz +sha256 4622110b2a6f30b77e1473affaa97e711bc2f07d3f10848420ff1898edbe94f3 asttokens-2.2.1.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 new file mode 100644 index 00000000000..8a8ce1ddd92 --- /dev/null +++ b/package/python-asttokens/python-asttokens.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# python-asttokens +# +################################################################################ + +PYTHON_ASTTOKENS_VERSION = 2.2.1 +PYTHON_ASTTOKENS_SOURCE = asttokens-$(PYTHON_ASTTOKENS_VERSION).tar.gz +PYTHON_ASTTOKENS_SITE = https://files.pythonhosted.org/packages/c8/e3/b0b4f32162621126fbdaba636c152c6b6baec486c99f48686e66343d638f +PYTHON_ASTTOKENS_SETUP_TYPE = setuptools +PYTHON_ASTTOKENS_LICENSE = Apache-2.0 +PYTHON_ASTTOKENS_LICENSE_FILES = LICENSE + +PYTHON_ASTTOKENS_DEPENDENCIES = host-python-setuptools-scm + +$(eval $(python-package)) diff --git a/package/python-async-generator/Config.in b/package/python-async-generator/Config.in new file mode 100644 index 00000000000..eb5720c652b --- /dev/null +++ b/package/python-async-generator/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_ASYNC_GENERATOR + bool "python-async-generator" + help + Async generators and context managers for Python 3.5+. + + https://github.com/python-trio/async_generator diff --git a/package/python-async-generator/python-async-generator.hash b/package/python-async-generator/python-async-generator.hash new file mode 100644 index 00000000000..3a94d5eb319 --- /dev/null +++ b/package/python-async-generator/python-async-generator.hash @@ -0,0 +1,7 @@ +# md5, sha256 from https://pypi.org/pypi/async_generator/json +md5 078a29b4afb3d7f38c097a530f042a55 async_generator-1.10.tar.gz +sha256 6ebb3d106c12920aaae42ccb6f787ef5eefdcdd166ea3d628fa8476abe712144 async_generator-1.10.tar.gz +# Locally computed sha256 checksums +sha256 b54d37617a67005623de975715952a2df062a2616c197bc3b6b451245b0c9265 LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.APACHE2 +sha256 3e6dae555eb92787fc82d1d48355677f454c7f65aeb38d3f9e72bf9a3daf034b LICENSE.MIT diff --git a/package/python-async-generator/python-async-generator.mk b/package/python-async-generator/python-async-generator.mk new file mode 100644 index 00000000000..d5e4f430fc5 --- /dev/null +++ b/package/python-async-generator/python-async-generator.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-async-generator +# +################################################################################ + +PYTHON_ASYNC_GENERATOR_VERSION = 1.10 +PYTHON_ASYNC_GENERATOR_SOURCE = async_generator-$(PYTHON_ASYNC_GENERATOR_VERSION).tar.gz +PYTHON_ASYNC_GENERATOR_SITE = https://files.pythonhosted.org/packages/ce/b6/6fa6b3b598a03cba5e80f829e0dadbb49d7645f523d209b2fb7ea0bbb02a +PYTHON_ASYNC_GENERATOR_SETUP_TYPE = setuptools +PYTHON_ASYNC_GENERATOR_LICENSE = Apache-2.0 or MIT +PYTHON_ASYNC_GENERATOR_LICENSE_FILES = LICENSE LICENSE.APACHE2 LICENSE.MIT + +$(eval $(python-package)) diff --git a/package/python-async-lru/python-async-lru.hash b/package/python-async-lru/python-async-lru.hash index 6fa61e0e128..231af32baa0 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 69bed62927426353513e68aec77989ab async_lru-1.0.2.tar.gz -sha256 baa898027619f5cc31b7966f96f00e4fc0df43ba206a8940a5d1af5336a477cb async_lru-1.0.2.tar.gz +# md5, sha256 from https://pypi.org/pypi/async-lru/json +md5 4dfcb328f2e9a8fdc9cf78dfdb6d3eef async-lru-1.0.3.tar.gz +sha256 c2cb9b2915eb14e6cf3e717154b40f715bf90e596d73623677affd0d1fbcd32a async-lru-1.0.3.tar.gz # Locally computed sha256 checksums -sha256 ea65975679bc2093be925d520358e41096bd96fddedee3e929160a5faadcf573 LICENSE +sha256 ea65975679bc2093be925d520358e41096bd96fddedee3e929160a5faadcf573 LICENSE diff --git a/package/python-async-lru/python-async-lru.mk b/package/python-async-lru/python-async-lru.mk index adaa8f628d7..872540b713c 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 = 1.0.2 -PYTHON_ASYNC_LRU_SOURCE = async_lru-$(PYTHON_ASYNC_LRU_VERSION).tar.gz -PYTHON_ASYNC_LRU_SITE = https://files.pythonhosted.org/packages/7e/c1/a3d6207deaaeb582d16dc9a0fd217f192efc9487ce59897131cf9a2bdc1c +PYTHON_ASYNC_LRU_VERSION = 1.0.3 +PYTHON_ASYNC_LRU_SOURCE = async-lru-$(PYTHON_ASYNC_LRU_VERSION).tar.gz +PYTHON_ASYNC_LRU_SITE = https://files.pythonhosted.org/packages/fe/67/4cb179c14ffa8b4a35fbe02255744bee4cbbaf61b35612c96ba4a618e4d5 PYTHON_ASYNC_LRU_SETUP_TYPE = setuptools PYTHON_ASYNC_LRU_LICENSE = MIT PYTHON_ASYNC_LRU_LICENSE_FILES = LICENSE diff --git a/package/python-attrs/python-attrs.hash b/package/python-attrs/python-attrs.hash index 823a9459bd9..66b2082cfff 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 5a9b5e9ceebc380a13fb93235b11bbda attrs-21.4.0.tar.gz -sha256 626ba8234211db98e869df76230a137c4c40a12d72445c45d5f5b716f076e2fd attrs-21.4.0.tar.gz +md5 eff16b3bbd0d9b72e118cca83a19d380 attrs-22.2.0.tar.gz +sha256 c9227bfc2f01993c03f68db37d1d15c9690188323c067c641f1a35ca58185f99 attrs-22.2.0.tar.gz # Locally computed sha256 checksums -sha256 bf659a28b49240602f56bbdf490cbe2ec509b15b98f99d7b19a52c740e327863 LICENSE +sha256 882115c95dfc2af1eeb6714f8ec6d5cbcabf667caff8729f42420da63f714e9f LICENSE diff --git a/package/python-attrs/python-attrs.mk b/package/python-attrs/python-attrs.mk index 4877d622859..0462f7cb0b9 100644 --- a/package/python-attrs/python-attrs.mk +++ b/package/python-attrs/python-attrs.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ATTRS_VERSION = 21.4.0 +PYTHON_ATTRS_VERSION = 22.2.0 PYTHON_ATTRS_SOURCE = attrs-$(PYTHON_ATTRS_VERSION).tar.gz -PYTHON_ATTRS_SITE = https://files.pythonhosted.org/packages/d7/77/ebb15fc26d0f815839ecd897b919ed6d85c050feeb83e100e020df9153d2 +PYTHON_ATTRS_SITE = https://files.pythonhosted.org/packages/21/31/3f468da74c7de4fcf9b25591e682856389b3400b4b62f201e65f15ea3e07 PYTHON_ATTRS_SETUP_TYPE = setuptools PYTHON_ATTRS_LICENSE = MIT PYTHON_ATTRS_LICENSE_FILES = LICENSE diff --git a/package/python-autobahn/Config.in b/package/python-autobahn/Config.in index 627bcd73e52..527416a3cd9 100644 --- a/package/python-autobahn/Config.in +++ b/package/python-autobahn/Config.in @@ -10,3 +10,52 @@ config BR2_PACKAGE_PYTHON_AUTOBAHN framework. https://pypi.python.org/pypi/autobahn + +if BR2_PACKAGE_PYTHON_AUTOBAHN + +config BR2_PACKAGE_PYTHON_AUTOBAHN_ACCELERATE + bool "C-based WebSocket acceleration" + select BR2_PACKAGE_PYTHON_WSACCEL # runtime + +config BR2_PACKAGE_PYTHON_AUTOBAHN_COMPRESS + bool "Non-standard WebSocket compression support" + depends on BR2_INSTALL_LIBSTDCPP # python-snappy -> snappy + select BR2_PACKAGE_PYTHON_SNAPPY # runtime + +comment "Non-standard WebSocket compression needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP + +config BR2_PACKAGE_PYTHON_AUTOBAHN_ENCRYPTION + bool "TLS and WAMP-cryptosign encryption/authentication support" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-pyopenssl -> python-cryptography + select BR2_PACKAGE_PYTHON_PYNACL # runtime + select BR2_PACKAGE_PYTHON_PYOPENSSL # runtime + select BR2_PACKAGE_PYTHON_QRCODE # runtime + select BR2_PACKAGE_PYTHON_QRCODE_SVG # runtime + select BR2_PACKAGE_PYTHON_PYTRIE # runtime + select BR2_PACKAGE_PYTHON_SERVICE_IDENTITY # runtime + +config BR2_PACKAGE_PYTHON_AUTOBAHN_SCRAM + bool "WAMP-SCRAM authentication support" + select BR2_PACKAGE_PYTHON_ARGON2_CFFI # runtime + select BR2_PACKAGE_PYTHON_PASSLIB # runtime + +config BR2_PACKAGE_PYTHON_AUTOBAHN_SERIALIZATION + bool "Accelerated JSON, MessagePack, CBOR, UBJSON, and FlatBuffers serialization support" + depends on BR2_INSTALL_LIBSTDCPP # python-ujson + select BR2_PACKAGE_PYTHON_CBOR2 # runtime + select BR2_PACKAGE_PYTHON_FLATBUFFERS # runtime + select BR2_PACKAGE_PYTHON_MSGPACK # runtime + select BR2_PACKAGE_PYTHON_UBJSON # runtime + select BR2_PACKAGE_PYTHON_UJSON # runtime + +comment "Accelerated JSON, MessagePack, CBOR, UBJSON, and FlatBuffers serialization needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP + +config BR2_PACKAGE_PYTHON_AUTOBAHN_TWISTED + bool "Twisted support" + select BR2_PACKAGE_PYTHON_ATTRS # runtime + select BR2_PACKAGE_PYTHON_TWISTED # runtime + select BR2_PACKAGE_PYTHON_ZOPE_INTERFACE # runtime + +endif diff --git a/package/python-autobahn/python-autobahn.hash b/package/python-autobahn/python-autobahn.hash index 7b963df6359..f9b68dcb221 100644 --- a/package/python-autobahn/python-autobahn.hash +++ b/package/python-autobahn/python-autobahn.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/autobahn/json -md5 9b0ae4ff164232c952ba01ab3516188e autobahn-22.1.1.tar.gz -sha256 17e1b58b6ae1a63ca7d926b1d71bb9e4fd6b9ac9a1a2277d8ee40e0b61f54746 autobahn-22.1.1.tar.gz +md5 98d8451385ccd8ece2d2fac023c61a19 autobahn-22.12.1.tar.gz +sha256 43b4e8b1aeaeb20a0cc0a81572e613dc958057c0ab248a7d6b41b2763270f925 autobahn-22.12.1.tar.gz # Locally computed sha256 checksums sha256 0387eefce570453daaa60633f28676003731eeca28b2d0a0071c628e3a0004ef LICENSE diff --git a/package/python-autobahn/python-autobahn.mk b/package/python-autobahn/python-autobahn.mk index df43e9cdf23..4c141519608 100644 --- a/package/python-autobahn/python-autobahn.mk +++ b/package/python-autobahn/python-autobahn.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AUTOBAHN_VERSION = 22.1.1 +PYTHON_AUTOBAHN_VERSION = 22.12.1 PYTHON_AUTOBAHN_SOURCE = autobahn-$(PYTHON_AUTOBAHN_VERSION).tar.gz -PYTHON_AUTOBAHN_SITE = https://files.pythonhosted.org/packages/0e/2a/0b627ad4adf70437b5753462958b3ba5c6802d7664eb4a680e46423659ba +PYTHON_AUTOBAHN_SITE = https://files.pythonhosted.org/packages/a8/6f/78b90951f263232e468439627f31a2c0846e36043c95af96dc527a4aeee6 PYTHON_AUTOBAHN_LICENSE = MIT PYTHON_AUTOBAHN_LICENSE_FILES = LICENSE PYTHON_AUTOBAHN_CPE_ID_VENDOR = crossbar diff --git a/package/python-automat/0001-Remove-uneeded-dependency-to-wheel.patch b/package/python-automat/0001-Remove-uneeded-dependency-to-wheel.patch new file mode 100644 index 00000000000..2be7ec6cdab --- /dev/null +++ b/package/python-automat/0001-Remove-uneeded-dependency-to-wheel.patch @@ -0,0 +1,28 @@ +From d04d51d62a23370869ad466fa95b7d4ec2e0fa6e Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Mon, 14 Nov 2022 22:30:33 +0100 +Subject: [PATCH] Remove uneeded dependency to "wheel" + +Attempting to build Automat in Buildroot fails while trying +to check for this undeeded dependency. + +Signed-off-by: Julien Olivain +--- + setup.py | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/setup.py b/setup.py +index c2f9816..afa8012 100644 +--- a/setup.py ++++ b/setup.py +@@ -15,7 +15,6 @@ setup( + packages=find_packages(exclude=[]), + package_dir={'automat': 'automat'}, + setup_requires=[ +- 'wheel', + 'setuptools-scm', + ], + install_requires=[ +-- +2.38.1 + diff --git a/package/python-automat/python-automat.hash b/package/python-automat/python-automat.hash index 33a64abedf9..cfb16ac6645 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 d6cef9886b037b8857bfbc686f3ae30a Automat-20.2.0.tar.gz -sha256 7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33 Automat-20.2.0.tar.gz +md5 b8064994239aabb172748f984489ce75 Automat-22.10.0.tar.gz +sha256 e56beb84edad19dcc11d30e8d9b895f75deeb5ef5e96b84a467066b3b84bb04e Automat-22.10.0.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 b94fd2e1c4b..101197b15b5 100644 --- a/package/python-automat/python-automat.mk +++ b/package/python-automat/python-automat.mk @@ -4,12 +4,12 @@ # ################################################################################ -PYTHON_AUTOMAT_VERSION = 20.2.0 +PYTHON_AUTOMAT_VERSION = 22.10.0 PYTHON_AUTOMAT_SOURCE = Automat-$(PYTHON_AUTOMAT_VERSION).tar.gz -PYTHON_AUTOMAT_SITE = https://files.pythonhosted.org/packages/80/c5/82c63bad570f4ef745cc5c2f0713c8eddcd07153b4bee7f72a8dc9f9384b +PYTHON_AUTOMAT_SITE = https://files.pythonhosted.org/packages/7a/7b/9c3d26d8a0416eefbc0428f168241b32657ca260fb7ef507596ff5c2f6c4 PYTHON_AUTOMAT_SETUP_TYPE = setuptools PYTHON_AUTOMAT_LICENSE = MIT PYTHON_AUTOMAT_LICENSE_FILES = LICENSE -PYTHON_AUTOMAT_DEPENDENCIES = host-python-m2r host-python-setuptools-scm +PYTHON_AUTOMAT_DEPENDENCIES = host-python-setuptools-scm $(eval $(python-package)) diff --git a/package/python-avro/0002-drop-install-time-linting-and-imports-sorting.patch b/package/python-avro/0002-drop-install-time-linting-and-imports-sorting.patch deleted file mode 100644 index 41231e923d5..00000000000 --- a/package/python-avro/0002-drop-install-time-linting-and-imports-sorting.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 3446a4af8474cd863efddeae7f3e5dd3f9b8e25e Mon Sep 17 00:00:00 2001 -From: Titouan Christophe -Date: Mon, 17 Feb 2020 15:12:13 +0100 -Subject: [PATCH] drop install time linting and imports sorting - -Since the 1.9.2 release, the setup script is also performing code linting -tasks, which require additional python libraries. - -These linting tasks are not needed anyway, since they are intended to prepare -the code for distribution, but the Buildroot package is already using a -distributed version. We therefore simply remove them. - -Signed-off-by: Titouan Christophe ---- - setup.cfg | 2 -- - setup.py | 1 - - 2 files changed, 3 deletions(-) - -diff --git a/setup.cfg b/setup.cfg -index 7b5de18..d46a36e 100644 ---- a/setup.cfg -+++ b/setup.cfg -@@ -25,8 +25,6 @@ package_dir = - include_package_data = true - packages = avro - setup_requires = -- isort -- pycodestyle - install_requires = - zip_safe = true - scripts = -diff --git a/setup.py b/setup.py -index f6297bb..91d3287 100755 ---- a/setup.py -+++ b/setup.py -@@ -164,7 +164,6 @@ def main(): - setuptools.setup(cmdclass={ - "clean": CleanCommand, - "generate_interop_data": GenerateInteropDataCommand, -- "lint": LintCommand, - }) - - --- -2.24.1 - diff --git a/package/python-avro/python-avro.hash b/package/python-avro/python-avro.hash index 2428be96e5c..0d457a11fdf 100644 --- a/package/python-avro/python-avro.hash +++ b/package/python-avro/python-avro.hash @@ -1,5 +1,5 @@ -# From https://downloads.apache.org/avro/avro-1.10.0/py3/avro-python3-1.10.0.tar.gz.sha512 -sha512 fb41f9227d2410c29cde10d7573aebbc142c2bf3f5945a1aaffdeac8b4b5ec690b0befdfc813a8762289dbbb7fc4e1be1564ba0c69d03092b84d8e938d6156f6 avro-python3-1.10.0.tar.gz +# From https://downloads.apache.org/avro/avro-1.11.1/py/avro-1.11.1.tar.gz.sha512 +sha512 bce5983cd7ed20be848cca41d143f16bf5bab57edc010d590fc1268405de4267e028ff7ec740282a03034aff5aa528feadb2be4e71ee6879b3080e0a9e19cb37 avro-1.11.1.tar.gz # License files sha256 c79a7fea0e3cac04cd43f20e7b648e5a0ff8fa5344e644b0ee09ca1162b62747 avro/LICENSE diff --git a/package/python-avro/python-avro.mk b/package/python-avro/python-avro.mk index dd6008b1ba0..6193cbbd8e9 100644 --- a/package/python-avro/python-avro.mk +++ b/package/python-avro/python-avro.mk @@ -4,9 +4,11 @@ # ################################################################################ -PYTHON_AVRO_VERSION = $(AVRO_C_VERSION) -PYTHON_AVRO_SITE = https://www-eu.apache.org/dist/avro/avro-$(PYTHON_AVRO_VERSION)/py3 -PYTHON_AVRO_SOURCE = avro-python3-$(PYTHON_AVRO_VERSION).tar.gz +# When updating the version, please also update avro-c +PYTHON_AVRO_VERSION = 1.11.1 +PYTHON_AVRO_SITE = \ + https://www-eu.apache.org/dist/avro/avro-$(PYTHON_AVRO_VERSION)/py +PYTHON_AVRO_SOURCE = avro-$(PYTHON_AVRO_VERSION).tar.gz PYTHON_AVRO_LICENSE = Apache-2.0 PYTHON_AVRO_LICENSE_FILES = avro/LICENSE PYTHON_AVRO_SETUP_TYPE = setuptools diff --git a/package/python-babel/python-babel.hash b/package/python-babel/python-babel.hash index 5211f20110a..2b2f56d8c64 100644 --- a/package/python-babel/python-babel.hash +++ b/package/python-babel/python-babel.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/babel/json -md5 7166099733d78aa857d74fa50d8ff58c Babel-2.9.1.tar.gz -sha256 bc0c176f9f6a994582230df350aa6e05ba2ebe4b3ac317eab29d9be5d2768da0 Babel-2.9.1.tar.gz +md5 9ee7784fd452d456206ecd3a12694010 Babel-2.11.0.tar.gz +sha256 5ef4b3226b0180dedded4229651c8b0e1a3a6a2837d45a073272f313e4cf97f6 Babel-2.11.0.tar.gz # Locally computed sha256 checksums -sha256 28c97bf33e7506e277487bdaa3a69b70f170d6af5a82785ac0a74c8428042e40 LICENSE +sha256 2499aec3c5f041c3ac2c448a15fb233314e4c20cbac1530be04ec31b2788631c LICENSE diff --git a/package/python-babel/python-babel.mk b/package/python-babel/python-babel.mk index a503a139f95..35857dc1273 100644 --- a/package/python-babel/python-babel.mk +++ b/package/python-babel/python-babel.mk @@ -4,11 +4,13 @@ # ################################################################################ -PYTHON_BABEL_VERSION = 2.9.1 +PYTHON_BABEL_VERSION = 2.11.0 PYTHON_BABEL_SOURCE = Babel-$(PYTHON_BABEL_VERSION).tar.gz -PYTHON_BABEL_SITE = https://files.pythonhosted.org/packages/17/e6/ec9aa6ac3d00c383a5731cc97ed7c619d3996232c977bb8326bcbb6c687e +PYTHON_BABEL_SITE = https://files.pythonhosted.org/packages/ff/80/45b42203ecc32c8de281f52e3ec81cb5e4ef16127e9e8543089d8b1649fb PYTHON_BABEL_SETUP_TYPE = setuptools PYTHON_BABEL_LICENSE = BSD-3-Clause PYTHON_BABEL_LICENSE_FILES = LICENSE +HOST_PYTHON_BABEL_DEPENDENCIES = host-python-pytz $(eval $(python-package)) +$(eval $(host-python-package)) diff --git a/package/python-bcrypt/Config.in b/package/python-bcrypt/Config.in index 9e9864e9d2b..67800df3e15 100644 --- a/package/python-bcrypt/Config.in +++ b/package/python-bcrypt/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_PYTHON_BCRYPT bool "python-bcrypt" - select BR2_PACKAGE_PYTHON_CFFI # runtime + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS help Modern password hashing for your software and your servers. diff --git a/package/python-bcrypt/python-bcrypt.hash b/package/python-bcrypt/python-bcrypt.hash index b1970d8684b..e148078699b 100644 --- a/package/python-bcrypt/python-bcrypt.hash +++ b/package/python-bcrypt/python-bcrypt.hash @@ -1,5 +1,4 @@ -# md5, sha256 from https://pypi.org/pypi/bcrypt/json -md5 fe31390dab603728f756cd3d6830c80a bcrypt-3.2.0.tar.gz -sha256 5b93c1726e50a93a033c36e5ca7fdcd29a5c7395af50a6892f5d9e7c6cfbfb29 bcrypt-3.2.0.tar.gz +# Locally calculated after vendoring +sha256 d64daee0af1afe137718674e67a49b8bb791842aab265b588a6d68d44a449c70 bcrypt-4.0.1.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 ad770cc974e..cbd6855d9c0 100644 --- a/package/python-bcrypt/python-bcrypt.mk +++ b/package/python-bcrypt/python-bcrypt.mk @@ -4,12 +4,23 @@ # ################################################################################ -PYTHON_BCRYPT_VERSION = 3.2.0 +PYTHON_BCRYPT_VERSION = 4.0.1 PYTHON_BCRYPT_SOURCE = bcrypt-$(PYTHON_BCRYPT_VERSION).tar.gz -PYTHON_BCRYPT_SITE = https://files.pythonhosted.org/packages/d8/ba/21c475ead997ee21502d30f76fd93ad8d5858d19a3fad7cd153de698c4dd +PYTHON_BCRYPT_SITE = https://files.pythonhosted.org/packages/8c/ae/3af7d006aacf513975fd1948a6b4d6f8b4a307f8a244e1a3d3774b297aad PYTHON_BCRYPT_SETUP_TYPE = setuptools PYTHON_BCRYPT_LICENSE = Apache-2.0 PYTHON_BCRYPT_LICENSE_FILES = LICENSE -PYTHON_BCRYPT_DEPENDENCIES = host-python-cffi +PYTHON_BCRYPT_DEPENDENCIES = \ + host-python-setuptools-rust \ + host-rustc +PYTHON_BCRYPT_ENV = \ + $(PKG_CARGO_ENV) \ + PYO3_CROSS_LIB_DIR="$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)" +# We need to vendor the Cargo crates at download time +PYTHON_BCRYPT_DOWNLOAD_POST_PROCESS = cargo +PYTHON_BCRYPT_DOWNLOAD_DEPENDENCIES = host-rustc +PYTHON_BCRYPT_DL_ENV = \ + $(PKG_CARGO_ENV) \ + BR_CARGO_MANIFEST_PATH=src/_bcrypt/Cargo.toml $(eval $(python-package)) diff --git a/package/python-beautifulsoup4/python-beautifulsoup4.hash b/package/python-beautifulsoup4/python-beautifulsoup4.hash index 665c142d53b..4641d2e3a3b 100644 --- a/package/python-beautifulsoup4/python-beautifulsoup4.hash +++ b/package/python-beautifulsoup4/python-beautifulsoup4.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/beautifulsoup4/json -md5 e754242642253dd31d249d00358d552e beautifulsoup4-4.10.0.tar.gz -sha256 c23ad23c521d818955a4151a67d81580319d4bf548d3d49f4223ae041ff98891 beautifulsoup4-4.10.0.tar.gz +md5 22f22f89cf9da41b22e1ece9639c66a3 beautifulsoup4-4.11.1.tar.gz +sha256 ad9aa55b65ef2808eb405f46cf74df7fcb7044d5cbc26487f96eb2ef2e436693 beautifulsoup4-4.11.1.tar.gz # Locally computed sha256 checksums -sha256 a47ea51236098464fe0b4f559743590b533056d9e00f49ecbf80299fab47e231 COPYING.txt +sha256 9e41dab3a48f5c734a9d5446557b28a6616e4924ee51d205598e4416bb93ce25 LICENSE diff --git a/package/python-beautifulsoup4/python-beautifulsoup4.mk b/package/python-beautifulsoup4/python-beautifulsoup4.mk index f729d1051ab..78f885ba08b 100644 --- a/package/python-beautifulsoup4/python-beautifulsoup4.mk +++ b/package/python-beautifulsoup4/python-beautifulsoup4.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_BEAUTIFULSOUP4_VERSION = 4.10.0 +PYTHON_BEAUTIFULSOUP4_VERSION = 4.11.1 PYTHON_BEAUTIFULSOUP4_SOURCE = beautifulsoup4-$(PYTHON_BEAUTIFULSOUP4_VERSION).tar.gz -PYTHON_BEAUTIFULSOUP4_SITE = https://files.pythonhosted.org/packages/a1/69/daeee6d8f22c997e522cdbeb59641c4d31ab120aba0f2c799500f7456b7e +PYTHON_BEAUTIFULSOUP4_SITE = https://files.pythonhosted.org/packages/e8/b0/cd2b968000577ec5ce6c741a54d846dfa402372369b8b6861720aa9ecea7 PYTHON_BEAUTIFULSOUP4_SETUP_TYPE = setuptools PYTHON_BEAUTIFULSOUP4_LICENSE = MIT -PYTHON_BEAUTIFULSOUP4_LICENSE_FILES = COPYING.txt +PYTHON_BEAUTIFULSOUP4_LICENSE_FILES = LICENSE $(eval $(python-package)) diff --git a/package/python-beniget/python-beniget.hash b/package/python-beniget/python-beniget.hash new file mode 100644 index 00000000000..cd4fa7b8735 --- /dev/null +++ b/package/python-beniget/python-beniget.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/beniget/json +md5 a2bbe7f17f10f9c127d8ef00692ddc55 beniget-0.4.1.tar.gz +sha256 75554b3b8ad0553ce2f607627dad3d95c60c441189875b98e097528f8e23ac0c beniget-0.4.1.tar.gz +# Locally computed sha256 checksums +sha256 64ad3e304e9d2d8731c26ac3e652335a6016e38be2f71fe30350be51c6d500b0 LICENSE diff --git a/package/python-beniget/python-beniget.mk b/package/python-beniget/python-beniget.mk new file mode 100644 index 00000000000..9970546b142 --- /dev/null +++ b/package/python-beniget/python-beniget.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-beniget +# +################################################################################ + +PYTHON_BENIGET_VERSION = 0.4.1 +PYTHON_BENIGET_SOURCE = beniget-$(PYTHON_BENIGET_VERSION).tar.gz +PYTHON_BENIGET_SITE = https://files.pythonhosted.org/packages/14/e7/50cbac38f77eca8efd39516be6651fdb9f3c4c0fab8cf2cf05f612578737 +PYTHON_BENIGET_SETUP_TYPE = setuptools +PYTHON_BENIGET_LICENSE = BSD-3-Clause +PYTHON_BENIGET_LICENSE_FILES = LICENSE +HOST_PYTHON_BENIGET_DEPENDENCIES = host-python-gast + +$(eval $(host-python-package)) diff --git a/package/python-bidict/python-bidict.hash b/package/python-bidict/python-bidict.hash index 59229f96d9f..bcb9ea3f34e 100644 --- a/package/python-bidict/python-bidict.hash +++ b/package/python-bidict/python-bidict.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/bidict/json -md5 d9342771969dd0d42092a669ed6f3241 bidict-0.21.3.tar.gz -sha256 d50bd81fae75e34198ffc94979a0eb0939ff9adb3ef32bcc93a913d8b3e3ed1d bidict-0.21.3.tar.gz +md5 67dd74f41341e7ff437d69e00a6fd514 bidict-0.22.1.tar.gz +sha256 1e0f7f74e4860e6d0943a05d4134c63a2fad86f3d4732fb265bd79e4e856d81d bidict-0.22.1.tar.gz # Locally computed sha256 checksums -sha256 1f256ecad192880510e84ad60474eab7589218784b9a50bc7ceee34c2b91f1d5 LICENSE +sha256 be0487398bba08e7772b4077b637787b94973b53c44b3cbdd6c7dab10ed15035 LICENSE diff --git a/package/python-bidict/python-bidict.mk b/package/python-bidict/python-bidict.mk index c6b7b862eaa..ae3a1ee024c 100644 --- a/package/python-bidict/python-bidict.mk +++ b/package/python-bidict/python-bidict.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BIDICT_VERSION = 0.21.3 +PYTHON_BIDICT_VERSION = 0.22.1 PYTHON_BIDICT_SOURCE = bidict-$(PYTHON_BIDICT_VERSION).tar.gz -PYTHON_BIDICT_SITE = https://files.pythonhosted.org/packages/3f/81/7221b28d692af5c5fc180c4850b8e4a48c7db92b3d529b430488f67db74f +PYTHON_BIDICT_SITE = https://files.pythonhosted.org/packages/f2/be/b31e6ea9c94096a323e7a0e2c61480db01f07610bb7e7ea72a06fd1a23a8 PYTHON_BIDICT_SETUP_TYPE = setuptools PYTHON_BIDICT_LICENSE = MPL-2.0 PYTHON_BIDICT_LICENSE_FILES = LICENSE diff --git a/package/python-bitstring/python-bitstring.hash b/package/python-bitstring/python-bitstring.hash index f05619a5d36..f078cc7f146 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 04d24380a0dc491e6bdacd983a90912e bitstring-3.1.9.tar.gz -sha256 a5848a3f63111785224dca8bb4c0a75b62ecdef56a042c8d6be74b16f7e860e7 bitstring-3.1.9.tar.gz +md5 ffd806650062e2fae33ee19b51906924 bitstring-4.0.1.tar.gz +sha256 7719f08f6df89ce28453a5e580d4a8ec1d1bda892dbb033466da0ccd9bdcb706 bitstring-4.0.1.tar.gz # Locally computed sha256 checksums -sha256 a9e9c584106d4f9686c9a6aa036e507b5e7044633b8acb4365bc074d8d004711 LICENSE +sha256 3705eed5a923f35d9bfaca1f10e9136cc84d6e576570aec661bda69991f129ea LICENSE diff --git a/package/python-bitstring/python-bitstring.mk b/package/python-bitstring/python-bitstring.mk index ff59487540c..11c9375707b 100644 --- a/package/python-bitstring/python-bitstring.mk +++ b/package/python-bitstring/python-bitstring.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BITSTRING_VERSION = 3.1.9 +PYTHON_BITSTRING_VERSION = 4.0.1 PYTHON_BITSTRING_SOURCE = bitstring-$(PYTHON_BITSTRING_VERSION).tar.gz -PYTHON_BITSTRING_SITE = https://files.pythonhosted.org/packages/4c/b1/80d58eeb21c9d4ca739770558d61f6adacb13aa4908f4f55e0974cbd25ee +PYTHON_BITSTRING_SITE = https://files.pythonhosted.org/packages/d2/64/e733b18349be383a4b7859c865d6c9e5ccc5845e9b4258504055607ec1cb PYTHON_BITSTRING_SETUP_TYPE = setuptools PYTHON_BITSTRING_LICENSE = MIT PYTHON_BITSTRING_LICENSE_FILES = LICENSE diff --git a/package/python-bleak/Config.in b/package/python-bleak/Config.in index 085c16fae8c..691450f86b4 100644 --- a/package/python-bleak/Config.in +++ b/package/python-bleak/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_BLEAK bool "python-bleak" - select BR2_PACKAGE_PYTHON_DBUS_NEXT # runtime + select BR2_PACKAGE_PYTHON_ASYNC_TIMEOUT # runtime + select BR2_PACKAGE_PYTHON_DBUS_FAST # runtime help Bluetooth Low Energy platform Agnostic Klient. diff --git a/package/python-bleak/python-bleak.hash b/package/python-bleak/python-bleak.hash index 5acac877c97..001ef65b65a 100644 --- a/package/python-bleak/python-bleak.hash +++ b/package/python-bleak/python-bleak.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/bleak/json -md5 0c26b270358a782767012220fc595aa5 bleak-0.12.1.tar.gz -sha256 4a80a24cc944e52e856054639f298229c39a2fc720e5f7adbeebb117d10849ed bleak-0.12.1.tar.gz +md5 d038483ec145c3d32c1ef03e04c42621 bleak-0.19.5.tar.gz +sha256 87845a96453c58c19031c735444a7b3156800534bcd3f23ba74e119e9ae3cd88 bleak-0.19.5.tar.gz # Locally computed sha256 checksums sha256 c4029a2b63b3824ab68be841f414addbdde20cb79cdbe272fa80c0b2abe65374 LICENSE diff --git a/package/python-bleak/python-bleak.mk b/package/python-bleak/python-bleak.mk index 3ae6d903110..95ac1d17664 100644 --- a/package/python-bleak/python-bleak.mk +++ b/package/python-bleak/python-bleak.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BLEAK_VERSION = 0.12.1 +PYTHON_BLEAK_VERSION = 0.19.5 PYTHON_BLEAK_SOURCE = bleak-$(PYTHON_BLEAK_VERSION).tar.gz -PYTHON_BLEAK_SITE = https://files.pythonhosted.org/packages/67/4b/ba00c69a24a8d08c86f02caa45727a2ad2844c7bee9630ccb063be226f71 +PYTHON_BLEAK_SITE = https://files.pythonhosted.org/packages/e6/b4/e63829826a157d180831a1c5d3720e75d613c1290cb239510d148b906836 PYTHON_BLEAK_SETUP_TYPE = setuptools PYTHON_BLEAK_LICENSE = MIT PYTHON_BLEAK_LICENSE_FILES = LICENSE diff --git a/package/python-bluezero/python-bluezero.hash b/package/python-bluezero/python-bluezero.hash index 59e8c5af5bb..6bedf62b27e 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 b26e6425d8adc4613b7cdf1d131f8c0b bluezero-0.6.0.tar.gz -sha256 d94f0672b1de3ff0040801538143fe9a42c501d8db79bcd183c9e051b8da83bc bluezero-0.6.0.tar.gz +md5 efa07525f1bf6db9af66eb7d9775cdb0 bluezero-0.7.1.tar.gz +sha256 f146feb65ee9f6fd9f3638ff0a44df9fd6efb48cf66a39ce51a62a7d38ab5206 bluezero-0.7.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 7e244fe3f0a..34efb6155cd 100644 --- a/package/python-bluezero/python-bluezero.mk +++ b/package/python-bluezero/python-bluezero.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BLUEZERO_VERSION = 0.6.0 +PYTHON_BLUEZERO_VERSION = 0.7.1 PYTHON_BLUEZERO_SOURCE = bluezero-$(PYTHON_BLUEZERO_VERSION).tar.gz -PYTHON_BLUEZERO_SITE = https://files.pythonhosted.org/packages/be/15/4a806580ffd359a03184776f37cf201298918f302b414b8a3e594d1be65c +PYTHON_BLUEZERO_SITE = https://files.pythonhosted.org/packages/9a/66/d4a92869ed2afd9483a65aff200b2ba0ca4365429bc9a836c5803ab876a5 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 358fabd39bc..eecc87ab2dd 100644 --- a/package/python-boto3/python-boto3.hash +++ b/package/python-boto3/python-boto3.hash @@ -1,4 +1,5 @@ -# sha256 from https://pypi.org/pypi/boto3/json -sha256 11a6035060230e92327d4f10fef6bc44188b2cd68504012bc25ed62ac31d670b boto3-1.19.2.tar.gz +# md5, sha256 from https://pypi.org/pypi/boto3/json +md5 e3777333a201a2511dd7c814782fe9f0 boto3-1.26.45.tar.gz +sha256 cc7f652df93e1ce818413fd82ffd645d4f92a64fec67c72946212d3750eaa80f boto3-1.26.45.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 8e10aa482d5..4d8fe587018 100644 --- a/package/python-boto3/python-boto3.mk +++ b/package/python-boto3/python-boto3.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BOTO3_VERSION = 1.19.2 +PYTHON_BOTO3_VERSION = 1.26.45 PYTHON_BOTO3_SOURCE = boto3-$(PYTHON_BOTO3_VERSION).tar.gz -PYTHON_BOTO3_SITE = https://files.pythonhosted.org/packages/ec/45/d12f9c09b5c4dad8bcb098dfae5e9e1253ed6408efbbd9a3e60bff55b824 +PYTHON_BOTO3_SITE = https://files.pythonhosted.org/packages/f5/5d/62bfcda02d90699d41d5ff2573f88b5555354fb87308e8a3427fef3956c5 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 9d5f706fef2..0e9d0572d79 100644 --- a/package/python-botocore/python-botocore.hash +++ b/package/python-botocore/python-botocore.hash @@ -1,4 +1,5 @@ -# sha256 from https://pypi.org/pypi/botocore/json -sha256 011360e79a4b843aa6591573cfa61e8eddc99b91adab1dfdb9a2b7f2c8511193 botocore-1.22.2.tar.gz +# md5, sha256 from https://pypi.org/pypi/botocore/json +md5 3946a693e09b65a0f6615a1a30f606d7 botocore-1.29.45.tar.gz +sha256 62ae03e591ff25555854aa338da35190ffe18c0b1be2ebf5cfb277164233691f botocore-1.29.45.tar.gz # Locally computed sha256 checksums sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE.txt diff --git a/package/python-botocore/python-botocore.mk b/package/python-botocore/python-botocore.mk index 1628e055628..ceb3fbe6ead 100644 --- a/package/python-botocore/python-botocore.mk +++ b/package/python-botocore/python-botocore.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BOTOCORE_VERSION = 1.22.2 +PYTHON_BOTOCORE_VERSION = 1.29.45 PYTHON_BOTOCORE_SOURCE = botocore-$(PYTHON_BOTOCORE_VERSION).tar.gz -PYTHON_BOTOCORE_SITE = https://files.pythonhosted.org/packages/0d/95/f2e74e4a91994d9ebe45746f75a8c5cafd723a88270a9772d8d66e1a8ba1 +PYTHON_BOTOCORE_SITE = https://files.pythonhosted.org/packages/9d/4f/1c24126941d1f8c1f2ecf459f88959d59566af34a55a81d926368fd2e6e5 PYTHON_BOTOCORE_SETUP_TYPE = setuptools PYTHON_BOTOCORE_LICENSE = Apache-2.0 PYTHON_BOTOCORE_LICENSE_FILES = LICENSE.txt diff --git a/package/python-bottle/python-bottle.hash b/package/python-bottle/python-bottle.hash index 7dcaac8dc68..58bc52e3cb1 100644 --- a/package/python-bottle/python-bottle.hash +++ b/package/python-bottle/python-bottle.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/bottle/json -md5 50075544706b5e662a3fbd9a98e24b07 bottle-0.12.19.tar.gz -sha256 a9d73ffcbc6a1345ca2d7949638db46349f5b2b77dac65d6494d45c23628da2c bottle-0.12.19.tar.gz +md5 d07df795cd4baa596ee803e964ba77fd bottle-0.12.23.tar.gz +sha256 683de3aa399fb26e87b274dbcf70b1a651385d459131716387abdc3792e04167 bottle-0.12.23.tar.gz # Locally computed sha256 checksums -sha256 d0e7211f1c3c1a1c56f39d18bcb07f27f480c8a9552617756dda3a335933b8a6 LICENSE +sha256 d0e7211f1c3c1a1c56f39d18bcb07f27f480c8a9552617756dda3a335933b8a6 LICENSE diff --git a/package/python-bottle/python-bottle.mk b/package/python-bottle/python-bottle.mk index d19a439f8c3..e1691972c3f 100644 --- a/package/python-bottle/python-bottle.mk +++ b/package/python-bottle/python-bottle.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_BOTTLE_VERSION = 0.12.19 +PYTHON_BOTTLE_VERSION = 0.12.23 PYTHON_BOTTLE_SOURCE = bottle-$(PYTHON_BOTTLE_VERSION).tar.gz -PYTHON_BOTTLE_SITE = https://files.pythonhosted.org/packages/ea/80/3d2dca1562ffa1929017c74635b4cb3645a352588de89e90d0bb53af3317 +PYTHON_BOTTLE_SITE = https://files.pythonhosted.org/packages/7c/58/75f3765b0a3f86ef0b6e0b23d0503920936752ca6e0fc27efce7403b01bd PYTHON_BOTTLE_LICENSE = MIT PYTHON_BOTTLE_LICENSE_FILES = LICENSE PYTHON_BOTTLE_CPE_ID_VENDOR = bottlepy diff --git a/package/python-brotli/Config.in b/package/python-brotli/Config.in index 1c09c26866d..c31315392b7 100644 --- a/package/python-brotli/Config.in +++ b/package/python-brotli/Config.in @@ -5,3 +5,6 @@ config BR2_PACKAGE_PYTHON_BROTLI Python bindings for the Brotli compression library. https://github.com/google/brotli + +comment "python-brotli needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-bsdiff4/python-bsdiff4.hash b/package/python-bsdiff4/python-bsdiff4.hash index 4fddd137e66..bb84bb09a5f 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 58889a1cd439c82c78aa2e4776b1ff38 bsdiff4-1.2.1.tar.gz -sha256 87cffc7522effdda03fd1564b212ad2279c0af50d16c3e65776f80acb6705d4b bsdiff4-1.2.1.tar.gz -# Locally computed sha256 +md5 fc5ea1adfe629a7c7ac6f4bb1a0dca93 bsdiff4-1.2.2.tar.gz +sha256 1880ac3f52a6c46ae6bcc6db117e4fb35f9b0ccd5af75fd4fee6907d00d6983c bsdiff4-1.2.2.tar.gz +# Locally computed sha256 checksums sha256 c6c921c90383f1c43beb53c49a652d28309a410a7c394c729fd8870271451cf0 LICENSE diff --git a/package/python-bsdiff4/python-bsdiff4.mk b/package/python-bsdiff4/python-bsdiff4.mk index e1c3f7765b7..7a50e3379a4 100644 --- a/package/python-bsdiff4/python-bsdiff4.mk +++ b/package/python-bsdiff4/python-bsdiff4.mk @@ -4,13 +4,13 @@ # ################################################################################ -PYTHON_BSDIFF4_VERSION = 1.2.1 +PYTHON_BSDIFF4_VERSION = 1.2.2 PYTHON_BSDIFF4_SOURCE = bsdiff4-$(PYTHON_BSDIFF4_VERSION).tar.gz -PYTHON_BSDIFF4_SITE = https://files.pythonhosted.org/packages/d8/97/101315b0d8c8d6340ee310484a1af6a2ccf65d7bb4762c3a669cf9457c71 +PYTHON_BSDIFF4_SITE = https://files.pythonhosted.org/packages/34/e2/e28dd282974f919a6b9adb3b7e64bb1fa4390046706c3e58a60b94aeb497 PYTHON_BSDIFF4_LICENSE = BSD-2-Clause, BSD-Protection (core.c) PYTHON_BSDIFF4_LICENSE_FILES = LICENSE PYTHON_BSDIFF4_CPE_ID_VENDOR = pypi PYTHON_BSDIFF4_CPE_ID_PRODUCT = bsdiff4 -PYTHON_BSDIFF4_SETUP_TYPE = distutils +PYTHON_BSDIFF4_SETUP_TYPE = setuptools $(eval $(python-package)) diff --git a/package/python-bunch/Config.in b/package/python-bunch/Config.in deleted file mode 100644 index 89eae742b8e..00000000000 --- a/package/python-bunch/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PYTHON_BUNCH - bool "python-bunch" - help - A dot-accessible dictionary (a la JavaScript objects). - - http://github.com/dsc/bunch diff --git a/package/python-bunch/python-bunch.hash b/package/python-bunch/python-bunch.hash deleted file mode 100644 index 5cf2cece463..00000000000 --- a/package/python-bunch/python-bunch.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/bunch/json -md5 0a829d64e95ed96defbcae2bf9061bb0 bunch-1.0.1.tar.gz -sha256 50c77a0fc0cb372dfe48b5e11937d5f70e743adbf42683f3a6d2857645a76aaa bunch-1.0.1.tar.gz -# Locally computed sha256 checksums -sha256 57ca95c92059c8380625192462979bd32994aae3fcdf902ff6eb1e467eeb0469 LICENSE.txt diff --git a/package/python-bunch/python-bunch.mk b/package/python-bunch/python-bunch.mk deleted file mode 100644 index 18fdc223bb6..00000000000 --- a/package/python-bunch/python-bunch.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-bunch -# -################################################################################ - -PYTHON_BUNCH_VERSION = 1.0.1 -PYTHON_BUNCH_SOURCE = bunch-$(PYTHON_BUNCH_VERSION).tar.gz -PYTHON_BUNCH_SITE = https://files.pythonhosted.org/packages/ef/bf/a4cf1779a4ffb4f610903fa08e15d1f4a8a2f4e3353a02afbe097c5bf4a8 -PYTHON_BUNCH_SETUP_TYPE = setuptools -PYTHON_BUNCH_LICENSE = MIT -PYTHON_BUNCH_LICENSE_FILES = LICENSE.txt - -$(eval $(python-package)) diff --git a/package/python-can/Config.in b/package/python-can/Config.in index dc9eb0ae4e2..68a9ffca71b 100644 --- a/package/python-can/Config.in +++ b/package/python-can/Config.in @@ -3,6 +3,9 @@ config BR2_PACKAGE_PYTHON_CAN select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime select BR2_PACKAGE_PYTHON3_SQLITE # runtime select BR2_PACKAGE_PYTHON_AENUM # runtime + select BR2_PACKAGE_PYTHON_MSGPACK # runtime + select BR2_PACKAGE_PYTHON_PACKAGING # runtime + select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime select BR2_PACKAGE_PYTHON_WRAPT # runtime select BR2_PACKAGE_PYTHON3_ZLIB help diff --git a/package/python-can/python-can.hash b/package/python-can/python-can.hash index 5330e5899c8..73be2302016 100644 --- a/package/python-can/python-can.hash +++ b/package/python-can/python-can.hash @@ -1,4 +1,5 @@ -# sha256 from https://pypi.org/pypi/python-can -sha256 2d3c223b7adc4dd46ce258d4a33b7e0dbb6c339e002faa40ee4a69d5fdce9449 python-can-3.3.4.tar.gz +# md5, sha256 from https://pypi.org/pypi/python-can/json +md5 d8365b7a09e49f47dac0da75d8518808 python-can-4.1.0.tar.gz +sha256 3f2b6b0dc5f459591d171ee0c0136dce79acedc2740ce695024aa3444e911bb9 python-can-4.1.0.tar.gz # Locally computed sha256 checksums -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.txt +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.txt diff --git a/package/python-can/python-can.mk b/package/python-can/python-can.mk index 1ab813e2c99..ba98337d5d3 100644 --- a/package/python-can/python-can.mk +++ b/package/python-can/python-can.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_CAN_VERSION = 3.3.4 -PYTHON_CAN_SITE = https://files.pythonhosted.org/packages/97/dd/5e5ae96db41ba57dde127e0600c3d324239ed692e167296c5fdb992cbf41 +PYTHON_CAN_VERSION = 4.1.0 +PYTHON_CAN_SITE = https://files.pythonhosted.org/packages/90/55/898e69e37d5d4692bf21ba8750e095493d2ecbb29be7394d5cb735f0ab0f PYTHON_CAN_SETUP_TYPE = setuptools PYTHON_CAN_LICENSE = LGPL-3.0 PYTHON_CAN_LICENSE_FILES = LICENSE.txt diff --git a/package/python-canopen/python-canopen.hash b/package/python-canopen/python-canopen.hash index e1a628a3a31..e6485e72f06 100644 --- a/package/python-canopen/python-canopen.hash +++ b/package/python-canopen/python-canopen.hash @@ -1,4 +1,5 @@ -# sha256 from https://pypi.org/pypi/canopen/json -sha256 4394770d528e93a48936138c4a7b37b5dff26d54f82a435ad9790cd1e43f55b9 canopen-1.0.0.tar.gz +# md5, sha256 from https://pypi.org/pypi/canopen/json +md5 d51443bdc8a55faea63c9da82196dd47 canopen-2.1.0.tar.gz +sha256 bc126bb1dcb62e3b34d8a12e38a07b5aa8319c17457c9bfe208f0bbbda90ff61 canopen-2.1.0.tar.gz # Locally computed sha256 checksums -sha256 0740d30978affcd91c0fc817b7cf942a332381bf0380fe17e60c6a0b377c6e0d LICENSE.txt +sha256 d9035caf7b8b135899da92a2730e2ac2e9f5ae3220dc98bd661be18045fcf689 LICENSE.txt diff --git a/package/python-canopen/python-canopen.mk b/package/python-canopen/python-canopen.mk index fc328c698e9..a0f5220ded8 100644 --- a/package/python-canopen/python-canopen.mk +++ b/package/python-canopen/python-canopen.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CANOPEN_VERSION = 1.0.0 +PYTHON_CANOPEN_VERSION = 2.1.0 PYTHON_CANOPEN_SOURCE = canopen-$(PYTHON_CANOPEN_VERSION).tar.gz -PYTHON_CANOPEN_SITE = https://files.pythonhosted.org/packages/1f/2b/55b6d82b3dcba184a01c6fe027df239953940e36a463cd24b71e67bd1f37 +PYTHON_CANOPEN_SITE = https://files.pythonhosted.org/packages/29/d1/54462c949c384b1a9a2bd260143a8ec6f4259a18d119bd122e8f8a791b50 PYTHON_CANOPEN_SETUP_TYPE = setuptools PYTHON_CANOPEN_LICENSE = MIT PYTHON_CANOPEN_LICENSE_FILES = LICENSE.txt diff --git a/package/python-cbor/python-cbor.hash b/package/python-cbor/python-cbor.hash index a47607d9d47..71e0b1eb937 100644 --- a/package/python-cbor/python-cbor.hash +++ b/package/python-cbor/python-cbor.hash @@ -1,3 +1,3 @@ # md5 from https://pypi.python.org/pypi/cbor/json, sha256 locally computed -md5 22b03b59784fd78cb6c27aa498af0db6 cbor-1.0.0.tar.gz -sha256 13225a262ddf5615cbd9fd55a76a0d53069d18b07d2e9f19c39e6acb8609bbb6 cbor-1.0.0.tar.gz +md5 22b03b59784fd78cb6c27aa498af0db6 cbor-1.0.0.tar.gz +sha256 13225a262ddf5615cbd9fd55a76a0d53069d18b07d2e9f19c39e6acb8609bbb6 cbor-1.0.0.tar.gz diff --git a/package/python-cbor2/python-cbor2.hash b/package/python-cbor2/python-cbor2.hash index 8858fc72d35..70c35ca8645 100644 --- a/package/python-cbor2/python-cbor2.hash +++ b/package/python-cbor2/python-cbor2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/cbor2/json -md5 a9518fd435d9eafd91063b3bf10d5c5b cbor2-5.4.2.post1.tar.gz -sha256 9cf21d59604b9529d7877c8e0342a2ebaae1a07fe8ff5683dc75fec15847c797 cbor2-5.4.2.post1.tar.gz +md5 74512376482be8a6af10596a63b6d254 cbor2-5.4.6.tar.gz +sha256 b893500db0fe033e570c3adc956af6eefc57e280026bd2d86fd53da9f1e594d7 cbor2-5.4.6.tar.gz # Locally computed sha256 checksums sha256 a6afd126d8f545a15166a22f25fadff4b9fb4978bbdd17e97d97d950b66d2fef LICENSE.txt diff --git a/package/python-cbor2/python-cbor2.mk b/package/python-cbor2/python-cbor2.mk index dd007217d1b..a2fcd73b74d 100644 --- a/package/python-cbor2/python-cbor2.mk +++ b/package/python-cbor2/python-cbor2.mk @@ -4,12 +4,13 @@ # ################################################################################ -PYTHON_CBOR2_VERSION = 5.4.2.post1 +PYTHON_CBOR2_VERSION = 5.4.6 PYTHON_CBOR2_SOURCE = cbor2-$(PYTHON_CBOR2_VERSION).tar.gz -PYTHON_CBOR2_SITE = https://files.pythonhosted.org/packages/49/74/2b9f9b76e2831f54d70e177a4e602e72cb86441632d1bcc15be1f04a73f6 +PYTHON_CBOR2_SITE = https://files.pythonhosted.org/packages/d9/69/de486293f5211d2e8fe1a19854e69f2811a18448162c52b48c67f8fbcac3 PYTHON_CBOR2_SETUP_TYPE = setuptools PYTHON_CBOR2_LICENSE = MIT PYTHON_CBOR2_LICENSE_FILES = LICENSE.txt PYTHON_CBOR2_DEPENDENCIES = host-python-setuptools-scm +PYTHON_CBOR2_ENV = CBOR2_BUILD_C_EXTENSION=1 $(eval $(python-package)) diff --git a/package/python-cchardet/python-cchardet.mk b/package/python-cchardet/python-cchardet.mk index 396e9d6c53e..53a17f67328 100644 --- a/package/python-cchardet/python-cchardet.mk +++ b/package/python-cchardet/python-cchardet.mk @@ -10,5 +10,6 @@ PYTHON_CCHARDET_SITE = https://files.pythonhosted.org/packages/a8/5d/090c9f0312b PYTHON_CCHARDET_SETUP_TYPE = setuptools PYTHON_CCHARDET_LICENSE = MPL-1.1 PYTHON_CCHARDET_LICENSE_FILES = COPYING +PYTHON_CCHARDET_DEPENDENCIES = host-python-cython $(eval $(python-package)) diff --git a/package/python-certifi/python-certifi.hash b/package/python-certifi/python-certifi.hash index 0245496ebf6..d3cf24ecfad 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 880ed9e5d04aff8f46f5ff82a3a3e395 certifi-2021.10.8.tar.gz -sha256 78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872 certifi-2021.10.8.tar.gz +md5 d00966473b8ac42c2c033b75f4bed6f4 certifi-2022.12.7.tar.gz +sha256 35824b4c3a97115964b408844d64aa14db1cc518f6562e8d7261699d1350a9e3 certifi-2022.12.7.tar.gz # Locally computed sha256 checksums -sha256 be9d82f36112f87a7f1d74ecd4887e1467bbae8878a84004a00117b1e475a3e2 LICENSE +sha256 a02f6c638f9fb84d06f7764c3ab085d8af7eda5b93c166da54312479077c6fb0 LICENSE diff --git a/package/python-certifi/python-certifi.mk b/package/python-certifi/python-certifi.mk index 17098e3fae5..70f9e69d2ca 100644 --- a/package/python-certifi/python-certifi.mk +++ b/package/python-certifi/python-certifi.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CERTIFI_VERSION = 2021.10.8 +PYTHON_CERTIFI_VERSION = 2022.12.7 PYTHON_CERTIFI_SOURCE = certifi-$(PYTHON_CERTIFI_VERSION).tar.gz -PYTHON_CERTIFI_SITE = https://files.pythonhosted.org/packages/6c/ae/d26450834f0acc9e3d1f74508da6df1551ceab6c2ce0766a593362d6d57f +PYTHON_CERTIFI_SITE = https://files.pythonhosted.org/packages/37/f7/2b1b0ec44fdc30a3d31dfebe52226be9ddc40cd6c0f34ffc8923ba423b69 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 41565f9a628..ae7f9a477f8 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 f3a3f26cd3335fc597479c9475da0a0b cffi-1.15.0.tar.gz -sha256 920f0d66a896c2d99f0adbb391f990a84091179542c205fa53ce5787aff87954 cffi-1.15.0.tar.gz +md5 f493860a6e98cd0c4178149568a6b4f6 cffi-1.15.1.tar.gz +sha256 d400bfb9a37b1351253cb402671cea7e89bdecc294e8016a707f6d1d8ac934f9 cffi-1.15.1.tar.gz # Locally computed sha256 checksums sha256 04b80f5b077bbed68808cfebadeb5e3523f2a8c9a96495c587bd96df1eac2a33 LICENSE diff --git a/package/python-cffi/python-cffi.mk b/package/python-cffi/python-cffi.mk index 83a21cb75a4..c1fcfda5fe6 100644 --- a/package/python-cffi/python-cffi.mk +++ b/package/python-cffi/python-cffi.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CFFI_VERSION = 1.15.0 +PYTHON_CFFI_VERSION = 1.15.1 PYTHON_CFFI_SOURCE = cffi-$(PYTHON_CFFI_VERSION).tar.gz -PYTHON_CFFI_SITE = https://files.pythonhosted.org/packages/00/9e/92de7e1217ccc3d5f352ba21e52398372525765b2e0c4530e6eb2ba9282a +PYTHON_CFFI_SITE = https://files.pythonhosted.org/packages/2b/a8/050ab4f0c3d4c1b8aaa805f70e26e84d0e27004907c5b8ecc1d31815f92a PYTHON_CFFI_SETUP_TYPE = setuptools PYTHON_CFFI_DEPENDENCIES = host-pkgconf libffi PYTHON_CFFI_LICENSE = MIT diff --git a/package/python-channels-redis/python-channels-redis.hash b/package/python-channels-redis/python-channels-redis.hash index 1d80b4c1241..eaab5814a66 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 9ec9ffd467e181906f257d6c0dbabf45 channels_redis-2.4.1.tar.gz -sha256 ddfa0c067085fdce24fb80d9c0b848638cbdbf0e1167f14eb2e99d635ad216e6 channels_redis-2.4.1.tar.gz +md5 82898cb3b50bb19e8484b80b4d940910 channels_redis-4.0.0.tar.gz +sha256 122414f29f525f7b9e0c9d59cdcfc4dc1b0eecba16fbb6a1c23f1d9b58f49dcb channels_redis-4.0.0.tar.gz # Locally computed sha256 checksums -sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE +sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-channels-redis/python-channels-redis.mk b/package/python-channels-redis/python-channels-redis.mk index c2c6f59c3c8..727f403aafd 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 = 2.4.1 +PYTHON_CHANNELS_REDIS_VERSION = 4.0.0 PYTHON_CHANNELS_REDIS_SOURCE = channels_redis-$(PYTHON_CHANNELS_REDIS_VERSION).tar.gz -PYTHON_CHANNELS_REDIS_SITE = https://files.pythonhosted.org/packages/87/a9/8d11c32ae6bf3a2cc893185f7d1e03b80bda680131a08473c07ed1fe591d +PYTHON_CHANNELS_REDIS_SITE = https://files.pythonhosted.org/packages/8a/8d/bf96c62e3ca6c5ae59eb3482804afbe026c1c98b05b3ab65a0d46663644a 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 beeef4acc60..ea643f15897 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 6f3fb75828b681a69372934a09ac3f32 channels-2.3.1.tar.gz -sha256 6b8ebd93fe0041a23e31c9f4130d92fadb9c0040c0eb377a004540631325a31d channels-2.3.1.tar.gz +md5 b145f0623bf1bad8ceb534c306ad2f2a channels-4.0.0.tar.gz +sha256 0ce53507a7da7b148eaa454526e0e05f7da5e5d1c23440e4886cf146981d8420 channels-4.0.0.tar.gz # Locally computed sha256 checksums -sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE +sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-channels/python-channels.mk b/package/python-channels/python-channels.mk index c0eca71aa24..40f17cb1142 100644 --- a/package/python-channels/python-channels.mk +++ b/package/python-channels/python-channels.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CHANNELS_VERSION = 2.3.1 +PYTHON_CHANNELS_VERSION = 4.0.0 PYTHON_CHANNELS_SOURCE = channels-$(PYTHON_CHANNELS_VERSION).tar.gz -PYTHON_CHANNELS_SITE = https://files.pythonhosted.org/packages/75/53/2db9662a52dcedb02a25f87d8efc5e630059967790e4c10887dbd2db2073 +PYTHON_CHANNELS_SITE = https://files.pythonhosted.org/packages/8e/cb/6fedd9df5972b893a04c8e5d7748873d6480a813e74b0797945bee1f4282 PYTHON_CHANNELS_SETUP_TYPE = setuptools PYTHON_CHANNELS_LICENSE = BSD-3-Clause PYTHON_CHANNELS_LICENSE_FILES = LICENSE diff --git a/package/python-characteristic/python-characteristic.hash b/package/python-characteristic/python-characteristic.hash index 2a5c7f5cdda..c91017d7074 100644 --- a/package/python-characteristic/python-characteristic.hash +++ b/package/python-characteristic/python-characteristic.hash @@ -1,5 +1,5 @@ # md5 from https://pypi.python.org/pypi?:action=show_md5&digest=b249368dd021fde1c06b4802867c0913 -md5 b249368dd021fde1c06b4802867c0913 characteristic-14.3.0.tar.gz +md5 b249368dd021fde1c06b4802867c0913 characteristic-14.3.0.tar.gz # Locally computed -sha256 ded68d4e424115ed44e5c83c2a901a0b6157a959079d7591d92106ffd3ada380 characteristic-14.3.0.tar.gz +sha256 ded68d4e424115ed44e5c83c2a901a0b6157a959079d7591d92106ffd3ada380 characteristic-14.3.0.tar.gz sha256 0af91b662f8428b28f5e517b049a0bb9feeb59b1adaa5c9418c1579f9485107c LICENSE diff --git a/package/python-chardet/Config.in b/package/python-chardet/Config.in index 869888cfe07..59e7cbfa2cc 100644 --- a/package/python-chardet/Config.in +++ b/package/python-chardet/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_CHARDET bool "python-chardet" - select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime help - Universal encoding detector for Python 2 and 3. + Universal encoding detector for Python 3. https://github.com/chardet/chardet diff --git a/package/python-chardet/python-chardet.hash b/package/python-chardet/python-chardet.hash index fb4260a2274..7887dd769d6 100644 --- a/package/python-chardet/python-chardet.hash +++ b/package/python-chardet/python-chardet.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/chardet/json -md5 bc9a5603d8d0994b2d4cbf255f99e654 chardet-4.0.0.tar.gz -sha256 0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa chardet-4.0.0.tar.gz +md5 394bd03d7a258d2771040bfbd5a7bf66 chardet-5.1.0.tar.gz +sha256 0d62712b956bc154f85fb0a266e2a3c5913c2967e00348701b32411d6def31e5 chardet-5.1.0.tar.gz # Locally computed -sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 LICENSE +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE diff --git a/package/python-chardet/python-chardet.mk b/package/python-chardet/python-chardet.mk index 448877d0563..42646aa5132 100644 --- a/package/python-chardet/python-chardet.mk +++ b/package/python-chardet/python-chardet.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CHARDET_VERSION = 4.0.0 +PYTHON_CHARDET_VERSION = 5.1.0 PYTHON_CHARDET_SOURCE = chardet-$(PYTHON_CHARDET_VERSION).tar.gz -PYTHON_CHARDET_SITE = https://files.pythonhosted.org/packages/ee/2d/9cdc2b527e127b4c9db64b86647d567985940ac3698eeabc7ffaccb4ea61 +PYTHON_CHARDET_SITE = https://files.pythonhosted.org/packages/41/32/cdc91dcf83849c7385bf8e2a5693d87376536ed000807fa07f5eab33430d PYTHON_CHARDET_SETUP_TYPE = setuptools PYTHON_CHARDET_LICENSE = LGPL-2.1+ PYTHON_CHARDET_LICENSE_FILES = LICENSE diff --git a/package/python-charset-normalizer/python-charset-normalizer.hash b/package/python-charset-normalizer/python-charset-normalizer.hash index 3c6e58a6164..a70499917a4 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 2abe3754fef25c99799a518cb83a81ae charset-normalizer-2.0.11.tar.gz -sha256 98398a9d69ee80548c762ba991a4728bfc3836768ed226b3945908d1a688371c charset-normalizer-2.0.11.tar.gz +md5 12ee1c8bedbfba84e99db46d5d94f411 charset-normalizer-3.0.1.tar.gz +sha256 ebea339af930f8ca5d7a699b921106c6e29c617fe9606fa7baa043c1cdae326f charset-normalizer-3.0.1.tar.gz # Locally computed sha256 checksums sha256 eb31a0c5a4fb09b8a4e32055d25c1e5f9c358a2752fef3cd720213d1ccfee241 LICENSE diff --git a/package/python-charset-normalizer/python-charset-normalizer.mk b/package/python-charset-normalizer/python-charset-normalizer.mk index c37b068b368..95c55ffd3c9 100644 --- a/package/python-charset-normalizer/python-charset-normalizer.mk +++ b/package/python-charset-normalizer/python-charset-normalizer.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CHARSET_NORMALIZER_VERSION = 2.0.11 +PYTHON_CHARSET_NORMALIZER_VERSION = 3.0.1 PYTHON_CHARSET_NORMALIZER_SOURCE = charset-normalizer-$(PYTHON_CHARSET_NORMALIZER_VERSION).tar.gz -PYTHON_CHARSET_NORMALIZER_SITE = https://files.pythonhosted.org/packages/e8/e8/b6cfd28fb430b2ec9923ad0147025bf8bbdf304b1eb3039b69f1ce44ed6e +PYTHON_CHARSET_NORMALIZER_SITE = https://files.pythonhosted.org/packages/96/d7/1675d9089a1f4677df5eb29c3f8b064aa1e70c1251a0a8a127803158942d PYTHON_CHARSET_NORMALIZER_SETUP_TYPE = setuptools PYTHON_CHARSET_NORMALIZER_LICENSE = MIT PYTHON_CHARSET_NORMALIZER_LICENSE_FILES = LICENSE diff --git a/package/python-cheetah/python-cheetah.hash b/package/python-cheetah/python-cheetah.hash index f7094a8bb1d..de397e800c9 100644 --- a/package/python-cheetah/python-cheetah.hash +++ b/package/python-cheetah/python-cheetah.hash @@ -1,5 +1,5 @@ # From https://pypi.org/pypi/Cheetah3/json md5 42bb9da785974c7e4089aa754ff99a73 Cheetah3-3.2.6.post2.tar.gz -sha256 63157d7a00a273b59676b5be5aa817c75c37efc88478231f1a160f4cfb7f7878 Cheetah3-3.2.6.post2.tar.gz +sha256 63157d7a00a273b59676b5be5aa817c75c37efc88478231f1a160f4cfb7f7878 Cheetah3-3.2.6.post2.tar.gz # Locally computed sha256 checksums sha256 635349ae512fafc2e60eb74a50d0a5276fa06c00b5ecb20da53546449ddc45ea LICENSE diff --git a/package/python-cheroot/python-cheroot.hash b/package/python-cheroot/python-cheroot.hash index e8144abaf62..c3556109cd1 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 7ace4b584a8092deb9f6b0142a627086 cheroot-8.2.1.tar.gz -sha256 5b525b3e4a755adf78070ab54c1821fb860d4255a9317dba2b88eb2df2441cff cheroot-8.2.1.tar.gz +md5 1617fdbaba7d6edbe5b0ff48f7563111 cheroot-9.0.0.tar.gz +sha256 3d47ad9ee19ecbec144b4758399036692fdbf67a40b96eef1fb1454367b3d338 cheroot-9.0.0.tar.gz # Locally computed sha256 checksums -sha256 da6dc218683f6dab91c6367f00bf33095d980fb1f04d430c81c5e6994b8605e0 LICENSE.md +sha256 e20feeb491a7e98084f15719349e9857aad41c4503c5e479f8815b063dbf7564 LICENSE.md diff --git a/package/python-cheroot/python-cheroot.mk b/package/python-cheroot/python-cheroot.mk index 9eae8879893..f75065c7da6 100644 --- a/package/python-cheroot/python-cheroot.mk +++ b/package/python-cheroot/python-cheroot.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CHEROOT_VERSION = 8.2.1 +PYTHON_CHEROOT_VERSION = 9.0.0 PYTHON_CHEROOT_SOURCE = cheroot-$(PYTHON_CHEROOT_VERSION).tar.gz -PYTHON_CHEROOT_SITE = https://files.pythonhosted.org/packages/9b/4d/2e51e7ce60f54a5279e91648b9b9b497d4d22bc624ecae6af1b6866144a7 +PYTHON_CHEROOT_SITE = https://files.pythonhosted.org/packages/8c/e7/8e6387d59a352c5799e917a23e7b76771a8bb97322c1ce7e42934d0066c3 PYTHON_CHEROOT_LICENSE = BSD-3-Clause PYTHON_CHEROOT_LICENSE_FILES = LICENSE.md PYTHON_CHEROOT_SETUP_TYPE = setuptools diff --git a/package/python-cherrypy/python-cherrypy.hash b/package/python-cherrypy/python-cherrypy.hash index d8f97af0f7a..cd8f8756d85 100644 --- a/package/python-cherrypy/python-cherrypy.hash +++ b/package/python-cherrypy/python-cherrypy.hash @@ -1,4 +1,5 @@ -# md5 from https://pypi.python.org/pypi/CherryPy/json, sha256 locally computed -md5 e21fd0c5706504a8f26c46d808a14255 CherryPy-12.0.1.tar.gz -sha256 6a3a90a43b1e05bd4634c60acfdcf34efe74f9f8746aca14dbe95a9b69db30ea CherryPy-12.0.1.tar.gz -sha256 02f4efe6e7dcd218c33cfa065c0552de983b5ad563b053e97697c5abd2ef14f9 LICENSE.md +# md5, sha256 from https://pypi.org/pypi/cherrypy/json +md5 033c58bf3da497f283b039911d1c882b CherryPy-18.8.0.tar.gz +sha256 9b48cfba8a2f16d5b6419cc657e6d51db005ba35c5e3824e4728bb03bbc7ef9b CherryPy-18.8.0.tar.gz +# Locally computed sha256 checksums +sha256 45ade933c280ece37e3e01d3a91afeed9505746a456f72ad10b0897c49e65104 LICENSE.md diff --git a/package/python-cherrypy/python-cherrypy.mk b/package/python-cherrypy/python-cherrypy.mk index 72b17bc8760..9b6ad0e99ac 100644 --- a/package/python-cherrypy/python-cherrypy.mk +++ b/package/python-cherrypy/python-cherrypy.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CHERRYPY_VERSION = 12.0.1 +PYTHON_CHERRYPY_VERSION = 18.8.0 PYTHON_CHERRYPY_SOURCE = CherryPy-$(PYTHON_CHERRYPY_VERSION).tar.gz -PYTHON_CHERRYPY_SITE = https://pypi.python.org/packages/be/d8/a8ef56bfe1c39d466b8d55b496b64459cc43dec71361d88edf904901637f +PYTHON_CHERRYPY_SITE = https://files.pythonhosted.org/packages/60/ea/6c4d16b0cd1f4f64a478bac8a37d75a585e854afb5693ce80a9711efdc4a PYTHON_CHERRYPY_LICENSE = BSD-3-Clause PYTHON_CHERRYPY_LICENSE_FILES = LICENSE.md PYTHON_CHERRYPY_SETUP_TYPE = setuptools diff --git a/package/python-click/python-click.hash b/package/python-click/python-click.hash index fb6e457ad55..81d19c419ea 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 53692f62cb99a1a10c59248f1776d9c0 click-7.1.2.tar.gz -sha256 d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a click-7.1.2.tar.gz -# Locally computed sha256 +md5 a804b085de7a3ff96968e38e0f6f2e05 click-8.1.3.tar.gz +sha256 7682dc8afb30297001674575ea00d1814d808d6a36af415a82bd481d37ba7b8e click-8.1.3.tar.gz +# Locally computed sha256 checksums sha256 9a8ad106a394e853bfe21f42f4e72d592819a22805d991b5f3275029292b658d LICENSE.rst diff --git a/package/python-click/python-click.mk b/package/python-click/python-click.mk index a829257f5e0..6444d0148e2 100644 --- a/package/python-click/python-click.mk +++ b/package/python-click/python-click.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CLICK_VERSION = 7.1.2 +PYTHON_CLICK_VERSION = 8.1.3 PYTHON_CLICK_SOURCE = click-$(PYTHON_CLICK_VERSION).tar.gz -PYTHON_CLICK_SITE = https://files.pythonhosted.org/packages/27/6f/be940c8b1f1d69daceeb0032fee6c34d7bd70e3e649ccac0951500b4720e +PYTHON_CLICK_SITE = https://files.pythonhosted.org/packages/59/87/84326af34517fca8c58418d148f2403df25303e02736832403587318e9e8 PYTHON_CLICK_LICENSE = BSD-3-Clause PYTHON_CLICK_LICENSE_FILES = LICENSE.rst PYTHON_CLICK_SETUP_TYPE = setuptools diff --git a/package/python-colorama/python-colorama.hash b/package/python-colorama/python-colorama.hash index e975a663630..aba1be3ebae 100644 --- a/package/python-colorama/python-colorama.hash +++ b/package/python-colorama/python-colorama.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/colorama/json -md5 57b22f2597f63df051b69906fbf310cc colorama-0.4.4.tar.gz -sha256 5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b colorama-0.4.4.tar.gz +md5 11fe1cbf8299798551ac88f824ea11c4 colorama-0.4.6.tar.gz +sha256 08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44 colorama-0.4.6.tar.gz # Locally computed sha256 checksums sha256 cac35c02686e5d04a5a7140bfb3b36e73aed496656e891102e428886d7930318 LICENSE.txt diff --git a/package/python-colorama/python-colorama.mk b/package/python-colorama/python-colorama.mk index d3d29a63e9c..d633e006024 100644 --- a/package/python-colorama/python-colorama.mk +++ b/package/python-colorama/python-colorama.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_COLORAMA_VERSION = 0.4.4 +PYTHON_COLORAMA_VERSION = 0.4.6 PYTHON_COLORAMA_SOURCE = colorama-$(PYTHON_COLORAMA_VERSION).tar.gz -PYTHON_COLORAMA_SITE = https://files.pythonhosted.org/packages/1f/bb/5d3246097ab77fa083a61bd8d3d527b7ae063c7d8e8671b1cf8c4ec10cbe -PYTHON_COLORAMA_SETUP_TYPE = setuptools +PYTHON_COLORAMA_SITE = https://files.pythonhosted.org/packages/d8/53/6f443c9a4a8358a93a6792e2acffb9d9d5cb0a5cfd8802644b7b1c9a02e4 +PYTHON_COLORAMA_SETUP_TYPE = pep517 PYTHON_COLORAMA_LICENSE = BSD-3-Clause PYTHON_COLORAMA_LICENSE_FILES = LICENSE.txt +PYTHON_COLORAMA_DEPENDENCIES = host-python-hatchling $(eval $(python-package)) diff --git a/package/python-colorlog/python-colorlog.hash b/package/python-colorlog/python-colorlog.hash index f324c1f2902..f4d0dd4c0ec 100644 --- a/package/python-colorlog/python-colorlog.hash +++ b/package/python-colorlog/python-colorlog.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/colorlog/json -md5 f1b92c1cac428b2e3c9ac7edf2988440 colorlog-6.4.1.tar.gz -sha256 af99440154a01f27c09256760ea3477982bf782721feaa345904e806879df4d8 colorlog-6.4.1.tar.gz +md5 80b79f7824d39d4f3b11c75d1cba094e colorlog-6.7.0.tar.gz +sha256 bd94bd21c1e13fac7bd3153f4bc3a7dc0eb0974b8bc2fdf1a989e474f6e582e5 colorlog-6.7.0.tar.gz # Locally computed sha256 checksums sha256 b1d9082bc483623fd59fc7279b457f0e40d942a76426cde257239e04dfe4125a LICENSE diff --git a/package/python-colorlog/python-colorlog.mk b/package/python-colorlog/python-colorlog.mk index 801b30be897..12a1c8ec77c 100644 --- a/package/python-colorlog/python-colorlog.mk +++ b/package/python-colorlog/python-colorlog.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_COLORLOG_VERSION = 6.4.1 +PYTHON_COLORLOG_VERSION = 6.7.0 PYTHON_COLORLOG_SOURCE = colorlog-$(PYTHON_COLORLOG_VERSION).tar.gz -PYTHON_COLORLOG_SITE = https://files.pythonhosted.org/packages/d6/4a/840f6cb7e922a717c765a3cdc6988aff22a6ef211d88c8d16701dfbd664f +PYTHON_COLORLOG_SITE = https://files.pythonhosted.org/packages/78/6b/4e5481ddcdb9c255b2715f54c863629f1543e97bc8c309d1c5c131ad14f2 PYTHON_COLORLOG_SETUP_TYPE = setuptools PYTHON_COLORLOG_LICENSE = MIT PYTHON_COLORLOG_LICENSE_FILES = LICENSE diff --git a/package/python-constantly/python-constantly.hash b/package/python-constantly/python-constantly.hash index d2033de3739..8e646d82ba1 100644 --- a/package/python-constantly/python-constantly.hash +++ b/package/python-constantly/python-constantly.hash @@ -1,5 +1,5 @@ # md5 from https://pypi.python.org/pypi/constantly/json -md5 f0762f083d83039758e53f8cf0086eef constantly-15.1.0.tar.gz +md5 f0762f083d83039758e53f8cf0086eef constantly-15.1.0.tar.gz # Locally computed -sha256 586372eb92059873e29eba4f9dec8381541b4d3834660707faf8ba59146dfc35 constantly-15.1.0.tar.gz +sha256 586372eb92059873e29eba4f9dec8381541b4d3834660707faf8ba59146dfc35 constantly-15.1.0.tar.gz sha256 020870fcaf4bf9c50b233e331817094fe109b91c0880570fd476f527cfbfc085 LICENSE diff --git a/package/python-construct/Config.in b/package/python-construct/Config.in new file mode 100644 index 00000000000..f70c8dc6312 --- /dev/null +++ b/package/python-construct/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_CONSTRUCT + bool "python-construct" + help + A powerful declarative symmetric parser/builder for binary + data. + + https://construct.readthedocs.io/ diff --git a/package/python-construct/python-construct.hash b/package/python-construct/python-construct.hash new file mode 100644 index 00000000000..f406d6739ba --- /dev/null +++ b/package/python-construct/python-construct.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/project/construct +md5 e426d3dd1566066e4ef1a03fe474dec0 construct-2.10.68.tar.gz +sha256 7b2a3fd8e5f597a5aa1d614c3bd516fa065db01704c72a1efaaeec6ef23d8b45 construct-2.10.68.tar.gz +# Locally computed sha256 checksums +sha256 1552d70acfd0d3fe464ce13d30113ddc6fe4bac21e52212acc98509e3cc1a8f4 LICENSE diff --git a/package/python-construct/python-construct.mk b/package/python-construct/python-construct.mk new file mode 100644 index 00000000000..3b0bb56106d --- /dev/null +++ b/package/python-construct/python-construct.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-construct +# +################################################################################ + +PYTHON_CONSTRUCT_VERSION = 2.10.68 +PYTHON_CONSTRUCT_SOURCE = construct-$(PYTHON_CONSTRUCT_VERSION).tar.gz +PYTHON_CONSTRUCT_SITE = https://files.pythonhosted.org/packages/e0/b7/a4a032e94bcfdff481f2e6fecd472794d9da09f474a2185ed33b2c7cad64 +PYTHON_CONSTRUCT_SETUP_TYPE = setuptools +PYTHON_CONSTRUCT_LICENSE = MIT +PYTHON_CONSTRUCT_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/package/python-couchdb/python-couchdb.hash b/package/python-couchdb/python-couchdb.hash index 67b7b12692f..c73ee1e0b1d 100644 --- a/package/python-couchdb/python-couchdb.hash +++ b/package/python-couchdb/python-couchdb.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/couchdb/json -md5 de40696472202d728cfca4279629e4ff CouchDB-1.2.tar.gz -sha256 1386a1a43f25bed3667e3b805222054940d674fa1967fa48e9d2012a18630ab7 CouchDB-1.2.tar.gz +md5 de40696472202d728cfca4279629e4ff CouchDB-1.2.tar.gz +sha256 1386a1a43f25bed3667e3b805222054940d674fa1967fa48e9d2012a18630ab7 CouchDB-1.2.tar.gz # Locally computed sha256 checksums -sha256 c538da1ae16b6d75f6fa65852bb158dbf9e556b01681be5b692692906d244241 COPYING +sha256 c538da1ae16b6d75f6fa65852bb158dbf9e556b01681be5b692692906d244241 COPYING diff --git a/package/python-cppy/python-cppy.hash b/package/python-cppy/python-cppy.hash new file mode 100644 index 00000000000..45b78eab8e0 --- /dev/null +++ b/package/python-cppy/python-cppy.hash @@ -0,0 +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 +# Locally computed sha256 checksums +sha256 db7a008bff1e63ccec397cfa033109740c4dc6cb12070a70d0cfe69aba27c4df LICENSE diff --git a/package/python-cppy/python-cppy.mk b/package/python-cppy/python-cppy.mk new file mode 100644 index 00000000000..adadc352d30 --- /dev/null +++ b/package/python-cppy/python-cppy.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-cppy +# +################################################################################ + +PYTHON_CPPY_VERSION = 1.2.1 +PYTHON_CPPY_SOURCE = cppy-$(PYTHON_CPPY_VERSION).tar.gz +PYTHON_CPPY_SITE = https://files.pythonhosted.org/packages/c5/7e/6cc5acd93752ee52d2f0423046072a2ce3ae16dfcd44373b9fe2a0222204 +PYTHON_CPPY_LICENSE = BSD-3-Clause +PYTHON_CPPY_LICENSE_FILES = LICENSE +PYTHON_CPPY_SETUP_TYPE = setuptools + +$(eval $(host-python-package)) diff --git a/package/python-crcmod/python-crcmod.hash b/package/python-crcmod/python-crcmod.hash index 8ba98d3c014..43ef7dd8e7c 100644 --- a/package/python-crcmod/python-crcmod.hash +++ b/package/python-crcmod/python-crcmod.hash @@ -1,5 +1,5 @@ # md5 from https://pypi.python.org/pypi/crcmod/json -md5 2d5b92117d958dcead94f9e17f54cd32 crcmod-1.7.tar.gz +md5 2d5b92117d958dcead94f9e17f54cd32 crcmod-1.7.tar.gz # Locally computed -sha256 dc7051a0db5f2bd48665a990d3ec1cc305a466a77358ca4492826f41f283601e crcmod-1.7.tar.gz +sha256 dc7051a0db5f2bd48665a990d3ec1cc305a466a77358ca4492826f41f283601e crcmod-1.7.tar.gz sha256 89480768826f408daea1f3caff0509c2cc9606e10f6bb0ccfd12a3d604842c35 LICENSE diff --git a/package/python-crontab/python-crontab.hash b/package/python-crontab/python-crontab.hash index b3aa96fc1bc..d9519096dfa 100644 --- a/package/python-crontab/python-crontab.hash +++ b/package/python-crontab/python-crontab.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/python-crontab/json -md5 2982bdce2d9b7789f32da649a9507c4b python-crontab-2.6.0.tar.gz -sha256 1e35ed7a3cdc3100545b43e196d34754e6551e7f95e4caebbe0e1c0ca41c2f1b python-crontab-2.6.0.tar.gz +md5 0a71aa83eed18752c2850632d84cfd89 python-crontab-2.7.1.tar.gz +sha256 b21af4647c7bbb848fef2f020616c6b0289dcb9f94b4f991a55310ff9bec5749 python-crontab-2.7.1.tar.gz # Locally computed sha256 checksums sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING diff --git a/package/python-crontab/python-crontab.mk b/package/python-crontab/python-crontab.mk index 9b29e11ccd8..1c2802ef613 100644 --- a/package/python-crontab/python-crontab.mk +++ b/package/python-crontab/python-crontab.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_CRONTAB_VERSION = 2.6.0 -PYTHON_CRONTAB_SITE = https://files.pythonhosted.org/packages/06/b0/c270a1b5c83d9e0f83ab654d3153c39d80f61ba49fefde50fd23ab351381 +PYTHON_CRONTAB_VERSION = 2.7.1 +PYTHON_CRONTAB_SITE = https://files.pythonhosted.org/packages/6a/b6/94d861e868698b8e3f288f7e4684e30535b0d9a6b38316ee0a3d4d31e6ae PYTHON_CRONTAB_SETUP_TYPE = setuptools PYTHON_CRONTAB_LICENSE = LGPL-3.0+ PYTHON_CRONTAB_LICENSE_FILES = COPYING diff --git a/package/python-crossbar/0002-Remove-idna-requirement.patch b/package/python-crossbar/0002-Remove-idna-requirement.patch deleted file mode 100644 index 5e19a467c2d..00000000000 --- a/package/python-crossbar/0002-Remove-idna-requirement.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 9164d21cc66c1f78de37c9383528c5d528cbdbeb Mon Sep 17 00:00:00 2001 -From: Asaf Kahlon -Date: Wed, 26 Sep 2018 15:33:43 +0300 -Subject: [PATCH] Remove idna requirement. - -The latest version of idna is 2.7, but it seems like idna is not a direct -dependency anymore (a short "git grep" shows it's only written in requirement -and readme files). - -Signed-off-by: Asaf Kahlon ---- - requirements-min.txt | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/requirements-min.txt b/requirements-min.txt -index 92fb0f8f..13cdac87 100644 ---- a/requirements-min.txt -+++ b/requirements-min.txt -@@ -8,7 +8,6 @@ click>=6.7 - constantly>=15.1.0 - cryptography>=2.6.1 - h2>=3.2.0 --idna<2.6,>=2.5 - importlib-resources>=4.1.1 - incremental>=17.5.0 - jinja2>=2.10.1 --- -2.17.1 - diff --git a/package/python-crossbar/0002-requirements-min.txt-drop-indirect-dependencies.patch b/package/python-crossbar/0002-requirements-min.txt-drop-indirect-dependencies.patch new file mode 100644 index 00000000000..12027d779cf --- /dev/null +++ b/package/python-crossbar/0002-requirements-min.txt-drop-indirect-dependencies.patch @@ -0,0 +1,74 @@ +From 3ae2b36e48fc0f75f0bb6c89f893ece033bccd87 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sun, 7 Aug 2022 18:44:29 +0200 +Subject: [PATCH] requirements-min.txt: drop indirect dependencies + +For some interesting reason, the crossbar maintainers have decided to +include indirect dependencies in their requirements-min.txt, i.e +dependencies that they don't use directly, but that packages they +depend on themselves depend on. + +This makes the packaging in Buildroot confusing, as it means not all +dependencies in requirements-min.txt should be taken into +account. Also some of these indirect dependencies cause issues due to +upper bounds set on the version (which is the case for idna and +urllib3). + +This patch therefore clarifies the situation by removing such indirect +dependencies from requirements-min.txt. As the patch is obviously not +upstreamable, it will require some maintenance effort, but that effort +is anyway already there to sort out direct dependencies from indirect +dependencies when updating the Buildroot packaging for crossbar. + +Signed-off-by: Thomas Petazzoni +--- + requirements-min.txt | 12 ------------ + 1 file changed, 12 deletions(-) + +diff --git a/requirements-min.txt b/requirements-min.txt +index 5ac4e0ee..cdd82d27 100644 +--- a/requirements-min.txt ++++ b/requirements-min.txt +@@ -1,20 +1,13 @@ +-attrs>=17.2.0 + autobahn[asyncio,twisted,encryption,compress,serialization,scram]>=21.3.1 + bitstring>=3.1.5 +-bcrypt>=3.1.6 + cbor>=1.0.0 + click>=6.7 + colorama>=0.4.4 +-constantly>=15.1.0 + cryptography>=2.6.1 +-h2>=3.2.0 +-idna<2.6,>=2.5 + importlib-resources>=4.1.1 +-incremental>=17.5.0 + jinja2>=2.10.1 + lmdb>=0.92 + mistune>=0.7.4 +-netaddr>=0.7.19 + passlib>=1.7.1 + priority>=1.3.0 + psutil>=5.2.2 +@@ -28,7 +21,6 @@ pyqrcode>=1.2.1 + pytrie>=0.3 + pyyaml>=4.2b4 + sdnotify>=0.3.1 +-service_identity>=17.0.0 + setproctitle>=1.1.10 + setuptools>=36.2.7 + treq>=20.4.1 +@@ -37,10 +29,6 @@ twisted[tls,conch,http2,osx_platform]>=20.3.0; sys_platform == 'darwin' + twisted[tls,conch,http2,windows_platform]>=20.3.0; sys_platform == 'win32' + txaio>=21.2.1 + txtorcon>=20.0.0 +-u-msgpack-python>=2.4.1 +-# urllib3 is an indirect dependency, but we force a recent version because of https://nvd.nist.gov/vuln/detail/CVE-2019-11324 +-# workaround for version conflict in requests vs sth else: +-urllib3<1.25,>=1.21.1 + vmprof>=0.4.12; platform_machine=='x86_64' or platform_machine=='i386' or platform_machine=='arm' + watchdog>=0.8.3 + werkzeug>=0.14.1 +-- +2.37.1 + diff --git a/package/python-crossbar/0003-crossbar-webservice-wap-use-markupsafe-instead-of-we.patch b/package/python-crossbar/0003-crossbar-webservice-wap-use-markupsafe-instead-of-we.patch new file mode 100644 index 00000000000..ab2d4709bdc --- /dev/null +++ b/package/python-crossbar/0003-crossbar-webservice-wap-use-markupsafe-instead-of-we.patch @@ -0,0 +1,53 @@ +From a6866509b0387ab6d6f99f68cd82bcac922fe839 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Mon, 30 May 2022 19:38:11 +0200 +Subject: [PATCH] crossbar/webservice/wap: use markupsafe instead of werkzeug + +wap.py use escape from werkzeug but it has been removed since +the version 2.1.0 [1]. + +Replace with escape from markupsafe like upstream commit [2] +(wihout other changes). + +[1] https://github.com/pallets/werkzeug/commit/22d1e9ac13829b83347107a9b4d77072a8e1af6a +[2] https://github.com/crossbario/crossbar/commit/ca8d383f01231e2b3f986e791f215f12f2deee5d + +Signed-off-by: Romain Naour +--- + crossbar/webservice/wap.py | 7 ++++++- + requirements-min.txt | 1 + + 2 files changed, 7 insertions(+), 1 deletion(-) + +diff --git a/crossbar/webservice/wap.py b/crossbar/webservice/wap.py +index 825558b1..6daa9b21 100644 +--- a/crossbar/webservice/wap.py ++++ b/crossbar/webservice/wap.py +@@ -36,7 +36,12 @@ from collections.abc import Mapping, Sequence + + from werkzeug.routing import Map, Rule + from werkzeug.exceptions import NotFound, MethodNotAllowed +-from werkzeug.utils import escape ++ ++try: ++ # removed in werkzeug 2.1.0 ++ from werkzeug.utils import escape ++except ImportError: ++ from markupsafe import escape + + from jinja2 import Environment, FileSystemLoader + from jinja2.sandbox import SandboxedEnvironment +diff --git a/requirements-min.txt b/requirements-min.txt +index cdd82d27..50cb1489 100644 +--- a/requirements-min.txt ++++ b/requirements-min.txt +@@ -7,6 +7,7 @@ cryptography>=2.6.1 + importlib-resources>=4.1.1 + jinja2>=2.10.1 + lmdb>=0.92 ++MarkupSafe>=1.1.1 + mistune>=0.7.4 + passlib>=1.7.1 + priority>=1.3.0 +-- +2.37.1 + diff --git a/package/python-crossbar/Config.in b/package/python-crossbar/Config.in index 9625d9ce8ee..aadcb2c3609 100644 --- a/package/python-crossbar/Config.in +++ b/package/python-crossbar/Config.in @@ -1,22 +1,36 @@ config BR2_PACKAGE_PYTHON_CROSSBAR bool "python-crossbar" depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography - # All the following dependencies are runtime dependencies - select BR2_PACKAGE_PYTHON_ATTRS + depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS # python-numpy + depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy + depends on BR2_INSTALL_LIBSTDCPP # python-autobahn's compress and serialization + # All the following dependencies are runtime dependencies. It + # matches almost 1:1 the requirements-min.txt from crossbar + # with the following exceptions: + # - importlib-resources is in Python itself, so no external + # module is needed + # - vmprof, while listed as a needed dependency, isn't + # actually strictly necesary + # - wsaccel is not a direct dependency, it is there to make + # sure autobahn has the 'accelerate' feature, when the + # Python implementation is CPython, and our package does + # enable autobahn[accelerate] select BR2_PACKAGE_PYTHON_AUTOBAHN + select BR2_PACKAGE_PYTHON_AUTOBAHN_ACCELERATE + select BR2_PACKAGE_PYTHON_AUTOBAHN_COMPRESS + select BR2_PACKAGE_PYTHON_AUTOBAHN_ENCRYPTION + select BR2_PACKAGE_PYTHON_AUTOBAHN_SCRAM + select BR2_PACKAGE_PYTHON_AUTOBAHN_SERIALIZATION + select BR2_PACKAGE_PYTHON_AUTOBAHN_TWISTED select BR2_PACKAGE_PYTHON_BITSTRING select BR2_PACKAGE_PYTHON_CBOR - select BR2_PACKAGE_PYTHON_CBOR2 select BR2_PACKAGE_PYTHON_CLICK - select BR2_PACKAGE_PYTHON_CONSTANTLY + select BR2_PACKAGE_PYTHON_COLORAMA select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY - select BR2_PACKAGE_PYTHON_H2 - select BR2_PACKAGE_PYTHON_IDNA - select BR2_PACKAGE_PYTHON_INCREMENTAL select BR2_PACKAGE_PYTHON_JINJA2 select BR2_PACKAGE_PYTHON_LMDB + select BR2_PACKAGE_PYTHON_MARKUPSAFE select BR2_PACKAGE_PYTHON_MISTUNE - select BR2_PACKAGE_PYTHON_NETADDR select BR2_PACKAGE_PYTHON_PASSLIB select BR2_PACKAGE_PYTHON_PRIORITY select BR2_PACKAGE_PYTHON_PSUTIL @@ -29,17 +43,19 @@ config BR2_PACKAGE_PYTHON_CROSSBAR select BR2_PACKAGE_PYTHON_PYTRIE select BR2_PACKAGE_PYTHON_PYYAML select BR2_PACKAGE_PYTHON_SDNOTIFY - select BR2_PACKAGE_PYTHON_SERVICE_IDENTITY select BR2_PACKAGE_PYTHON_SETPROCTITLE select BR2_PACKAGE_PYTHON_SETUPTOOLS select BR2_PACKAGE_PYTHON_TREQ select BR2_PACKAGE_PYTHON_TWISTED + select BR2_PACKAGE_PYTHON_TWISTED_CONCH + select BR2_PACKAGE_PYTHON_TWISTED_HTTP2 + select BR2_PACKAGE_PYTHON_TWISTED_TLS select BR2_PACKAGE_PYTHON_TXAIO select BR2_PACKAGE_PYTHON_TXTORCON - select BR2_PACKAGE_PYTHON_U_MSGPACK select BR2_PACKAGE_PYTHON_UBJSON select BR2_PACKAGE_PYTHON_WATCHDOG select BR2_PACKAGE_PYTHON_WERKZEUG + select BR2_PACKAGE_PYTHON_ZLMDB select BR2_PACKAGE_PYTHON_ZOPE_INTERFACE help Crossbar.io is an open-source WAMP application router that @@ -47,3 +63,9 @@ config BR2_PACKAGE_PYTHON_CROSSBAR components that can talk in real-time with each other. https://pypi.python.org/pypi/crossbar + +comment "python-crossbar needs a glibc or musl toolchain w/ C++" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS + depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) || \ + !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-cryptography/python-cryptography.hash b/package/python-cryptography/python-cryptography.hash index 1219fa9b5f1..e0830147500 100644 --- a/package/python-cryptography/python-cryptography.hash +++ b/package/python-cryptography/python-cryptography.hash @@ -1,5 +1,5 @@ # Locally calculated after vendoring -sha256 196bba703cebc052a19f5353614fcfa9d680471990c10305f110adcc05744eeb cryptography-36.0.1.tar.gz +sha256 405c9a6271e1a088ea0b432bc2094e2e8baadb2241e192ce9c73a7cc9793b127 cryptography-39.0.2.tar.gz # Locally computed sha256 checksums sha256 43dad2cc752ab721cd9a9f36ece70fb53ab7713551f2d3d8694d8e8c5a06d6e2 LICENSE sha256 aac73b3148f6d1d7111dbca32099f68d26c644c6813ae1e4f05f6579aa2663fe LICENSE.APACHE diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk index a524f729c8c..67aa20742dd 100644 --- a/package/python-cryptography/python-cryptography.mk +++ b/package/python-cryptography/python-cryptography.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CRYPTOGRAPHY_VERSION = 36.0.1 +PYTHON_CRYPTOGRAPHY_VERSION = 39.0.2 PYTHON_CRYPTOGRAPHY_SOURCE = cryptography-$(PYTHON_CRYPTOGRAPHY_VERSION).tar.gz -PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/f9/4b/1cf8e281f7ae4046a59e5e39dd7471d46db9f61bb564fddbff9084c4334f +PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/fa/f3/f4b8c175ea9a1de650b0085858059050b7953a93d66c97ed89b93b232996 PYTHON_CRYPTOGRAPHY_SETUP_TYPE = setuptools PYTHON_CRYPTOGRAPHY_LICENSE = Apache-2.0 or BSD-3-Clause PYTHON_CRYPTOGRAPHY_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD @@ -17,14 +17,26 @@ PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ host-python-cffi \ host-rustc \ openssl +HOST_PYTHON_CRYPTOGRAPHY_DEPENDENCIES = \ + host-python-setuptools-rust \ + host-python-cffi \ + host-rustc \ + host-openssl PYTHON_CRYPTOGRAPHY_ENV = \ $(PKG_CARGO_ENV) \ PYO3_CROSS_LIB_DIR="$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)" +HOST_PYTHON_CRYPTOGRAPHY_ENV = \ + $(HOST_PKG_CARGO_ENV) \ + PYO3_CROSS_LIB_DIR="$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)" # We need to vendor the Cargo crates at download time PYTHON_CRYPTOGRAPHY_DOWNLOAD_POST_PROCESS = cargo PYTHON_CRYPTOGRAPHY_DOWNLOAD_DEPENDENCIES = host-rustc PYTHON_CRYPTOGRAPHY_DL_ENV = \ $(PKG_CARGO_ENV) \ BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml +HOST_PYTHON_CRYPTOGRAPHY_DL_ENV = \ + $(HOST_PKG_CARGO_ENV) \ + BR_CARGO_MANIFEST_PATH=src/rust/Cargo.toml $(eval $(python-package)) +$(eval $(host-python-package)) diff --git a/package/python-cssselect/python-cssselect.hash b/package/python-cssselect/python-cssselect.hash index 44813416cbb..df2523265f9 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 fa57704c1cb66cc8e537b782bd6b227e cssselect-1.1.0.tar.gz -sha256 f95f8dedd925fd8f54edb3d2dfb44c190d9d18512377d3c1e2388d16126879bc cssselect-1.1.0.tar.gz +md5 27fbafacce5447cb867acb240d35002a cssselect-1.2.0.tar.gz +sha256 666b19839cfaddb9ce9d36bfe4c969132c647b92fc9088c4e23f786b30f1b3dc cssselect-1.2.0.tar.gz # Locally computed sha256 checksums -sha256 5c8da9f744e0afba81a48c9b5dbe73048f798b3287d6f1af8a05ee08ebb10892 LICENSE +sha256 5c8da9f744e0afba81a48c9b5dbe73048f798b3287d6f1af8a05ee08ebb10892 LICENSE diff --git a/package/python-cssselect/python-cssselect.mk b/package/python-cssselect/python-cssselect.mk index f6faa94b4c2..96f6f987377 100644 --- a/package/python-cssselect/python-cssselect.mk +++ b/package/python-cssselect/python-cssselect.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CSSSELECT_VERSION = 1.1.0 +PYTHON_CSSSELECT_VERSION = 1.2.0 PYTHON_CSSSELECT_SOURCE = cssselect-$(PYTHON_CSSSELECT_VERSION).tar.gz -PYTHON_CSSSELECT_SITE = https://files.pythonhosted.org/packages/70/54/37630f6eb2c214cdee2ae56b7287394c8aa2f3bafb8b4eb8c3791aae7a14 +PYTHON_CSSSELECT_SITE = https://files.pythonhosted.org/packages/d1/91/d51202cc41fbfca7fa332f43a5adac4b253962588c7cc5a54824b019081c PYTHON_CSSSELECT_SETUP_TYPE = setuptools PYTHON_CSSSELECT_LICENSE = BSD-3-Clause PYTHON_CSSSELECT_LICENSE_FILES = LICENSE diff --git a/package/python-cssselect2/python-cssselect2.hash b/package/python-cssselect2/python-cssselect2.hash index ed5b8633021..13bdca9a394 100644 --- a/package/python-cssselect2/python-cssselect2.hash +++ b/package/python-cssselect2/python-cssselect2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/cssselect2/json -md5 6dfd5963c8a5d85f2634d1650b1ddfe1 cssselect2-0.4.1.tar.gz -sha256 93fbb9af860e95dd40bf18c3b2b6ed99189a07c0f29ba76f9c5be71344664ec8 cssselect2-0.4.1.tar.gz +md5 594ebe75a12dfd6cc288858faeb77415 cssselect2-0.7.0.tar.gz +sha256 1ccd984dab89fc68955043aca4e1b03e0cf29cad9880f6e28e3ba7a74b14aa5a cssselect2-0.7.0.tar.gz # Locally computed sha256 checksums sha256 6fd97229a1d1b0f6a8b41e109f413426dbc0874b1e03746d66cc33282601c2c2 LICENSE diff --git a/package/python-cssselect2/python-cssselect2.mk b/package/python-cssselect2/python-cssselect2.mk index 18e0fba8394..67907f9bcdb 100644 --- a/package/python-cssselect2/python-cssselect2.mk +++ b/package/python-cssselect2/python-cssselect2.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_CSSSELECT2_VERSION = 0.4.1 +PYTHON_CSSSELECT2_VERSION = 0.7.0 PYTHON_CSSSELECT2_SOURCE = cssselect2-$(PYTHON_CSSSELECT2_VERSION).tar.gz -PYTHON_CSSSELECT2_SITE = https://files.pythonhosted.org/packages/ad/3d/fb764303deb34cbc1a32fcecdfd239367cb16323920c88390b2f5ad751f0 -PYTHON_CSSSELECT2_SETUP_TYPE = distutils +PYTHON_CSSSELECT2_SITE = https://files.pythonhosted.org/packages/e7/fc/326cb6f988905998f09bb54a3f5d98d4462ba119363c0dfad29750d48c09 +PYTHON_CSSSELECT2_SETUP_TYPE = flit PYTHON_CSSSELECT2_LICENSE = BSD-3-Clause PYTHON_CSSSELECT2_LICENSE_FILES = LICENSE diff --git a/package/python-cssutils/python-cssutils.hash b/package/python-cssutils/python-cssutils.hash index e22dde6e56e..cb989131a3e 100644 --- a/package/python-cssutils/python-cssutils.hash +++ b/package/python-cssutils/python-cssutils.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/cssutils/json -md5 71955999f595e4b0eb5a218d614652ca cssutils-2.3.0.tar.gz -sha256 b2d3b16047caae82e5c590036935bafa1b621cf45c2f38885af4be4838f0fd00 cssutils-2.3.0.tar.gz +md5 b01ea364e79eada181c3ae46d69249af cssutils-2.6.0.tar.gz +sha256 f7dcd23c1cec909fdf3630de346e1413b7b2555936dec14ba2ebb9913bf0818e cssutils-2.6.0.tar.gz # Locally computed sha256 checksums sha256 03c570a068086ee577dcd795519ea93462b2ed2fcb6dcc4dfce56a71a2fd6e5a COPYING.LESSER diff --git a/package/python-cssutils/python-cssutils.mk b/package/python-cssutils/python-cssutils.mk index 09c2ca44d6f..fff9e393f32 100644 --- a/package/python-cssutils/python-cssutils.mk +++ b/package/python-cssutils/python-cssutils.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CSSUTILS_VERSION = 2.3.0 +PYTHON_CSSUTILS_VERSION = 2.6.0 PYTHON_CSSUTILS_SOURCE = cssutils-$(PYTHON_CSSUTILS_VERSION).tar.gz -PYTHON_CSSUTILS_SITE = https://files.pythonhosted.org/packages/f5/c6/878abb7df855938a067b762a688da3fcdfea4e41c2399feaf80369b61ed7 +PYTHON_CSSUTILS_SITE = https://files.pythonhosted.org/packages/43/d5/505d96b7456fd334f8b963c05bd9425dacd317e209bb9adf103613339325 PYTHON_CSSUTILS_LICENSE = LGPL-3.0+ PYTHON_CSSUTILS_LICENSE_FILES = COPYING.LESSER PYTHON_CSSUTILS_SETUP_TYPE = setuptools diff --git a/package/python-cython/python-cython.hash b/package/python-cython/python-cython.hash index 9c5f1225cfb..e7e86264d2d 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 2b2ba86abcf823985935d37f5e43b19a Cython-0.29.27.tar.gz -sha256 c6a442504db906dfc13a480e96850cced994ecdc076bcf492c43515b78f70da2 Cython-0.29.27.tar.gz +md5 bd42c555cb2298b8a94fa8de7ee679ba Cython-0.29.33.tar.gz +sha256 5040764c4a4d2ce964a395da24f0d1ae58144995dab92c6b96f44c3f4d72286a Cython-0.29.33.tar.gz # Locally computed sha256 checksums sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 LICENSE.txt sha256 e1eb1c49a8508e8173dac30157e4a6439a44ad8846194746c424fbc3fc2b95d7 COPYING.txt diff --git a/package/python-cython/python-cython.mk b/package/python-cython/python-cython.mk index b9fbf7b11a9..b11d75b33d3 100644 --- a/package/python-cython/python-cython.mk +++ b/package/python-cython/python-cython.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CYTHON_VERSION = 0.29.27 +PYTHON_CYTHON_VERSION = 0.29.33 PYTHON_CYTHON_SOURCE = Cython-$(PYTHON_CYTHON_VERSION).tar.gz -PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/eb/46/80dd9e5ad67ebc766ff3229901bde4a7bc82907efe93cd7007c4df458dd5 +PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/dc/f6/e8e302f9942cbebede88b1a0c33d0be3a738c3ac37abae87254d58ffc51c 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 4f53902d3f5..005a9692076 100644 --- a/package/python-daemon/python-daemon.hash +++ b/package/python-daemon/python-daemon.hash @@ -1,6 +1,6 @@ # md5, sha256 https://pypi.org/pypi/python-daemon/json -md5 3ab10a93472201214cd95c05f1923af6 python-daemon-2.2.3.tar.gz -sha256 affeca9e5adfce2666a63890af9d6aff79f670f7511899edaddca7f96593cc25 python-daemon-2.2.3.tar.gz +md5 b7397fe73d516dc14921500a1245b41c python-daemon-2.3.2.tar.gz +sha256 3deeb808e72b6b89f98611889e11cc33754f5b2c1517ecfa1aaf25f402051fb5 python-daemon-2.3.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 600ccf5bf15..aa8019f4be4 100644 --- a/package/python-daemon/python-daemon.mk +++ b/package/python-daemon/python-daemon.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_DAEMON_VERSION = 2.2.3 -PYTHON_DAEMON_SITE = https://pypi.python.org/packages/source/p/python-daemon +PYTHON_DAEMON_VERSION = 2.3.2 +PYTHON_DAEMON_SITE = https://files.pythonhosted.org/packages/d9/3c/727b06abb46fead341a2bdad04ba4a4db5395c44c45d8ba0aa82b517e462 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 diff --git a/package/python-daemonize/python-daemonize.hash b/package/python-daemonize/python-daemonize.hash index aa2c904523d..43b0f43d84e 100644 --- a/package/python-daemonize/python-daemonize.hash +++ b/package/python-daemonize/python-daemonize.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/daemonize/json -md5 3d64e7a0219ad22e3fca62460f893b6a daemonize-2.5.0.tar.gz -sha256 dd026e4ff8d22cb016ed2130bc738b7d4b1da597ef93c074d2adb9e4dea08bc3 daemonize-2.5.0.tar.gz +md5 3d64e7a0219ad22e3fca62460f893b6a daemonize-2.5.0.tar.gz +sha256 dd026e4ff8d22cb016ed2130bc738b7d4b1da597ef93c074d2adb9e4dea08bc3 daemonize-2.5.0.tar.gz # Locally computed sha256 checksums -sha256 248d0d3147d20a09bed8f03da8ed72f47009073606dcc1bab658f942d34b29f8 LICENSE +sha256 248d0d3147d20a09bed8f03da8ed72f47009073606dcc1bab658f942d34b29f8 LICENSE diff --git a/package/python-daphne/0001-remove-pytest-runner-requirement.patch b/package/python-daphne/0001-remove-pytest-runner-requirement.patch index 30acf201d66..70cdb4f19db 100644 --- a/package/python-daphne/0001-remove-pytest-runner-requirement.patch +++ b/package/python-daphne/0001-remove-pytest-runner-requirement.patch @@ -15,13 +15,13 @@ index 64e94f1..4e3abb0 100755 --- a/setup.py +++ b/setup.py @@ -23,7 +23,6 @@ setup( - packages=find_packages() + ["twisted.plugins"], include_package_data=True, - install_requires=["twisted[tls]>=18.7", "autobahn>=0.18", "asgiref~=3.2"], + install_requires=["twisted[tls]>=22.4", "autobahn>=22.4.2", "asgiref>=3.5.2,<4"], + python_requires=">=3.7", - setup_requires=["pytest-runner"], - extras_require={ - "tests": ["hypothesis~=3.88", "pytest~=3.10", "pytest-asyncio~=0.8"] - }, + extras_require={"tests": ["hypothesis", "pytest", "pytest-asyncio", "django"]}, + entry_points={ + "console_scripts": ["daphne = daphne.cli:CommandLineInterface.entrypoint"] -- 2.21.0 diff --git a/package/python-daphne/python-daphne.hash b/package/python-daphne/python-daphne.hash index cdf5e83ebb2..90d053bff6e 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 564353eaed92659e3b113d966a0288f2 daphne-2.4.1.tar.gz0 -sha256 1e41d02d78da373c1f8504835cdca6d447b5d64c2941661d4bd968d412b6c383 daphne-2.4.1.tar.gz -# Locally computed sha256 -sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE +md5 f0dcc0618459ad7d25508704f9505b56 daphne-4.0.0.tar.gz +sha256 cce9afc8f49a4f15d4270b8cfb0e0fe811b770a5cc795474e97e4da287497666 daphne-4.0.0.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 cd4739db194..c08088278e9 100644 --- a/package/python-daphne/python-daphne.mk +++ b/package/python-daphne/python-daphne.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DAPHNE_VERSION = 2.4.1 +PYTHON_DAPHNE_VERSION = 4.0.0 PYTHON_DAPHNE_SOURCE = daphne-$(PYTHON_DAPHNE_VERSION).tar.gz -PYTHON_DAPHNE_SITE = https://files.pythonhosted.org/packages/03/6c/847d1c962f8c45aa2ab0791583c4a41669d158e28fd6369ce940b8ea8417 +PYTHON_DAPHNE_SITE = https://files.pythonhosted.org/packages/d7/77/57b19d5caabf8537879aa4cf3a017b99d0b727f2521ffca7fd9140573509 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 380846e9f16..3edec5cc8c2 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 ce5fd0d37b6d0ca57f144e22cd62bfec DataProperty-0.54.2.tar.gz -sha256 df2fcf00e7a57f0a6089f686f847527eb3c91ded5c419daef6d06ee4bb1187b4 DataProperty-0.54.2.tar.gz +md5 8c8864a1dc456d25456b5c4de99a3fb6 DataProperty-0.55.0.tar.gz +sha256 73ccf10f8b123968210438a1a1aa859ea6d5a16b4e1f4d307da7a81b838e79fa DataProperty-0.55.0.tar.gz # Locally computed sha256 checksums sha256 a93d75bcb0774e2990106380cadad6dcb2de193c55d435ffc56ba345a08b1dc2 LICENSE diff --git a/package/python-dataproperty/python-dataproperty.mk b/package/python-dataproperty/python-dataproperty.mk index 1b07dc1bb78..0feef553103 100644 --- a/package/python-dataproperty/python-dataproperty.mk +++ b/package/python-dataproperty/python-dataproperty.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DATAPROPERTY_VERSION = 0.54.2 +PYTHON_DATAPROPERTY_VERSION = 0.55.0 PYTHON_DATAPROPERTY_SOURCE = DataProperty-$(PYTHON_DATAPROPERTY_VERSION).tar.gz -PYTHON_DATAPROPERTY_SITE = https://files.pythonhosted.org/packages/9a/03/44fb9094c4fb8032f254eaa37b3b07db82fa35779ceca097b3cde8464749 +PYTHON_DATAPROPERTY_SITE = https://files.pythonhosted.org/packages/85/6e/627eba99858c486c5b82468e4aaf60808c2e35d1bb768ee5da712b6fe9be PYTHON_DATAPROPERTY_SETUP_TYPE = setuptools PYTHON_DATAPROPERTY_LICENSE = MIT PYTHON_DATAPROPERTY_LICENSE_FILES = LICENSE diff --git a/package/python-dbus-fast/Config.in b/package/python-dbus-fast/Config.in new file mode 100644 index 00000000000..b7168106d7a --- /dev/null +++ b/package/python-dbus-fast/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_PYTHON_DBUS_FAST + bool "python-dbus-fast" + select BR2_PACKAGE_HOST_PYTHON_CYTHON + select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime + help + A faster version of dbus-next, a DBus library for Python with + asyncio support. + + https://github.com/bluetooth-devices/dbus-fast diff --git a/package/python-dbus-fast/python-dbus-fast.hash b/package/python-dbus-fast/python-dbus-fast.hash new file mode 100644 index 00000000000..e9a3992f8ef --- /dev/null +++ b/package/python-dbus-fast/python-dbus-fast.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/dbus-fast/json +md5 21e3675168e3dbe807c6c8a29267241f dbus_fast-1.84.0.tar.gz +sha256 d64f1b68c1c81268e846471caeb9264a9306a6c6ad356c30d5cdf7d1ecc251a1 dbus_fast-1.84.0.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 new file mode 100644 index 00000000000..9dd88f613f2 --- /dev/null +++ b/package/python-dbus-fast/python-dbus-fast.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# python-dbus-fast +# +################################################################################ + +PYTHON_DBUS_FAST_VERSION = 1.84.0 +PYTHON_DBUS_FAST_SOURCE = dbus_fast-$(PYTHON_DBUS_FAST_VERSION).tar.gz +PYTHON_DBUS_FAST_SITE = https://files.pythonhosted.org/packages/81/67/a83522d6692a72911c3586e2fcd2363ce22d1522a7e17e1012f255a6083b +PYTHON_DBUS_FAST_SETUP_TYPE = setuptools +PYTHON_DBUS_FAST_LICENSE = MIT +PYTHON_DBUS_FAST_LICENSE_FILES = LICENSE +PYTHON_DBUS_FAST_ENV = REQUIRE_CYTHON=1 +PYTHON_DBUS_FAST_DEPENDENCIES = host-python-cython + +$(eval $(python-package)) diff --git a/package/python-decorator/python-decorator.hash b/package/python-decorator/python-decorator.hash index 46ff7206d7d..e12d34e7edd 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 d01585c3ea5b36a209747fcc978a98c8 decorator-5.1.0.tar.gz -sha256 e59913af105b9860aa2c8d3272d9de5a56a4e608db9a2f167a8480b323d529a7 decorator-5.1.0.tar.gz +md5 a6b34700dcac8a4bb04efd55e99626c1 decorator-5.1.1.tar.gz +sha256 637996211036b6385ef91435e4fae22989472f9d571faba8927ba8253acbc330 decorator-5.1.1.tar.gz # Locally computed sha256 checksums sha256 fd11660cabf0532082c45706862fafc294907ec7f8e217818240a4999806782e LICENSE.txt diff --git a/package/python-decorator/python-decorator.mk b/package/python-decorator/python-decorator.mk index a61f045e2a8..5dba8cc9151 100644 --- a/package/python-decorator/python-decorator.mk +++ b/package/python-decorator/python-decorator.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DECORATOR_VERSION = 5.1.0 +PYTHON_DECORATOR_VERSION = 5.1.1 PYTHON_DECORATOR_SOURCE = decorator-$(PYTHON_DECORATOR_VERSION).tar.gz -PYTHON_DECORATOR_SITE = https://files.pythonhosted.org/packages/92/3c/34f8448b61809968052882b830f7d8d9a8e1c07048f70deb039ae599f73c +PYTHON_DECORATOR_SITE = https://files.pythonhosted.org/packages/66/0c/8d907af351aa16b42caae42f9d6aa37b900c67308052d10fdce809f8d952 PYTHON_DECORATOR_LICENSE = BSD-2-Clause PYTHON_DECORATOR_LICENSE_FILES = LICENSE.txt PYTHON_DECORATOR_CPE_ID_VENDOR = python diff --git a/package/python-dialog3/python-dialog3.hash b/package/python-dialog3/python-dialog3.hash index 42a7512e4fb..d66f3286382 100644 --- a/package/python-dialog3/python-dialog3.hash +++ b/package/python-dialog3/python-dialog3.hash @@ -1,5 +1,5 @@ -# md5 from https://pypi.python.org/pypi/pythondialog/json -md5 07e257d91099b804e040c6ea5ec56041 pythondialog-3.5.1.tar.gz -# Locally computed -sha256 34a0687290571f37d7d297514cc36bd4cd044a3a4355271549f91490d3e7ece8 pythondialog-3.5.1.tar.gz +# md5, sha256 from https://pypi.org/pypi/pythondialog/json +md5 94a9236e427de783fa3ee8288834f7f1 pythondialog-3.5.3.tar.gz +sha256 b2a34a8af0a6625ccbdf45cd343b854fc6c1a85231dadc80b8805db836756323 pythondialog-3.5.3.tar.gz +# Locally computed sha256 checksums sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING diff --git a/package/python-dialog3/python-dialog3.mk b/package/python-dialog3/python-dialog3.mk index 60519856406..e936de58112 100644 --- a/package/python-dialog3/python-dialog3.mk +++ b/package/python-dialog3/python-dialog3.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DIALOG3_VERSION = 3.5.1 +PYTHON_DIALOG3_VERSION = 3.5.3 PYTHON_DIALOG3_SOURCE = pythondialog-$(PYTHON_DIALOG3_VERSION).tar.gz -PYTHON_DIALOG3_SITE = https://files.pythonhosted.org/packages/72/3c/26ed0db035f97196704d0197d8b2254b8a6ca93a2d132430b0b0d597aa79 +PYTHON_DIALOG3_SITE = https://files.pythonhosted.org/packages/4e/40/5c84d79f7d536ca2c3722af521eff4faafe54a93797f08c72eb72e68fb68 PYTHON_DIALOG3_LICENSE = LGPL-2.1+ PYTHON_DIALOG3_LICENSE_FILES = COPYING PYTHON_DIALOG3_SETUP_TYPE = setuptools diff --git a/package/python-dicttoxml/python-dicttoxml.hash b/package/python-dicttoxml/python-dicttoxml.hash index 45c9fc8cc49..1c94d3446ac 100644 --- a/package/python-dicttoxml/python-dicttoxml.hash +++ b/package/python-dicttoxml/python-dicttoxml.hash @@ -1,5 +1,5 @@ -# md5 from https://pypi.python.org/pypi/dicttoxml/json -md5 ec5643a048cf32dad3c28db236b923e4 dicttoxml-1.7.4.tar.gz -# Locally computed -sha256 ea44cc4ec6c0f85098c57a431a1ee891b3549347b07b7414c8a24611ecf37e45 dicttoxml-1.7.4.tar.gz +# md5, sha256 from https://pypi.org/pypi/dicttoxml/json +md5 f4853a05c41f9056172447d4e59517b9 dicttoxml-1.7.16.tar.gz +sha256 6f36ce644881db5cd8940bee9b7cb3f3f6b7b327ba8a67d83d3e2caa0538bf9d dicttoxml-1.7.16.tar.gz +# Locally computed sha256 checksums sha256 4514114bd9da0b2fbf8c4fa264c0e6cc80fd41e6ac7f09d7a39a215662951c7c LICENCE.txt diff --git a/package/python-dicttoxml/python-dicttoxml.mk b/package/python-dicttoxml/python-dicttoxml.mk index 537afff601b..c26c16b72a3 100644 --- a/package/python-dicttoxml/python-dicttoxml.mk +++ b/package/python-dicttoxml/python-dicttoxml.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DICTTOXML_VERSION = 1.7.4 +PYTHON_DICTTOXML_VERSION = 1.7.16 PYTHON_DICTTOXML_SOURCE = dicttoxml-$(PYTHON_DICTTOXML_VERSION).tar.gz -PYTHON_DICTTOXML_SITE = https://pypi.python.org/packages/74/36/534db111db9e7610a41641a1f6669a964aacaf51858f466de264cc8dcdd9 +PYTHON_DICTTOXML_SITE = https://files.pythonhosted.org/packages/ee/c9/3132427f9e64d572688e6a1cbe3d542d1a03f676b81fb600f3d1fd7d2ec5 PYTHON_DICTTOXML_SETUP_TYPE = distutils PYTHON_DICTTOXML_LICENSE = GPL-2.0 PYTHON_DICTTOXML_LICENSE_FILES = LICENCE.txt diff --git a/package/python-dicttoxml2/Config.in b/package/python-dicttoxml2/Config.in new file mode 100644 index 00000000000..0bd8068dd64 --- /dev/null +++ b/package/python-dicttoxml2/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_DICTTOXML2 + bool "python-dicttoxml2" + select BR2_PACKAGE_PYTHON3_PYEXPAT + help + Converts a Python dictionary or other native data type into + a valid XML string. + + https://github.com/Ousret/dicttoxml diff --git a/package/python-dicttoxml2/python-dicttoxml2.hash b/package/python-dicttoxml2/python-dicttoxml2.hash new file mode 100644 index 00000000000..4cc92d1d37d --- /dev/null +++ b/package/python-dicttoxml2/python-dicttoxml2.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/dicttoxml2/json +md5 787ea4b80cd6234a41c016e8efa7ff40 dicttoxml2-2.1.0.tar.gz +sha256 67cb729f337dd752808c021b70c8df8a34f84b9e111a5dbaa37e000eeaf4d462 dicttoxml2-2.1.0.tar.gz +# Locally computed +sha256 4514114bd9da0b2fbf8c4fa264c0e6cc80fd41e6ac7f09d7a39a215662951c7c LICENCE.txt diff --git a/package/python-dicttoxml2/python-dicttoxml2.mk b/package/python-dicttoxml2/python-dicttoxml2.mk new file mode 100644 index 00000000000..d2abe638600 --- /dev/null +++ b/package/python-dicttoxml2/python-dicttoxml2.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-dicttoxml2 +# +################################################################################ + +PYTHON_DICTTOXML2_VERSION = 2.1.0 +PYTHON_DICTTOXML2_SOURCE = dicttoxml2-$(PYTHON_DICTTOXML2_VERSION).tar.gz +PYTHON_DICTTOXML2_SITE = https://files.pythonhosted.org/packages/0b/24/7a6d37b2770843e34685e470fd711955cb0f77c354c73d8ca64b02420bce +PYTHON_DICTTOXML2_SETUP_TYPE = setuptools +PYTHON_DICTTOXML2_LICENSE = GPL-2.0 +PYTHON_DICTTOXML2_LICENSE_FILES = LICENCE.txt + +$(eval $(python-package)) diff --git a/package/python-distro/python-distro.hash b/package/python-distro/python-distro.hash index e2b3c0a4448..3d3e4258de9 100644 --- a/package/python-distro/python-distro.hash +++ b/package/python-distro/python-distro.hash @@ -1,3 +1,5 @@ +# From https://pypi.org/pypi/distro/json +md5 a1e81972bbcfc0dc77dd0cde590c22a6 distro-1.8.0.tar.gz +sha256 02e111d1dc6a50abb8eed6bf31c3e48ed8b0830d1ea2a1b78c61765c2513fdd8 distro-1.8.0.tar.gz # Locally computed -sha256 83f5e5a09f9c5f68f60173de572930effbcc0287bb84fdc4426cb4168c088424 distro-1.6.0.tar.gz sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSE diff --git a/package/python-distro/python-distro.mk b/package/python-distro/python-distro.mk index 753e74d0205..e079d8e2654 100644 --- a/package/python-distro/python-distro.mk +++ b/package/python-distro/python-distro.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_DISTRO_VERSION = 1.6.0 -PYTHON_DISTRO_SITE = https://files.pythonhosted.org/packages/a5/26/256fa167fe1bf8b97130b4609464be20331af8a3af190fb636a8a7efd7a2 +PYTHON_DISTRO_VERSION = 1.8.0 +PYTHON_DISTRO_SITE = https://files.pythonhosted.org/packages/4b/89/eaa3a3587ebf8bed93e45aa79be8c2af77d50790d15b53f6dfc85b57f398 PYTHON_DISTRO_SOURCE = distro-$(PYTHON_DISTRO_VERSION).tar.gz PYTHON_DISTRO_LICENSE = Apache-2.0 PYTHON_DISTRO_LICENSE_FILES = LICENSE diff --git a/package/python-django-enumfields/python-django-enumfields.hash b/package/python-django-enumfields/python-django-enumfields.hash index 352fa8d9075..99c6ca5e4c7 100644 --- a/package/python-django-enumfields/python-django-enumfields.hash +++ b/package/python-django-enumfields/python-django-enumfields.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/django-enumfields/json -md5 e06bcaecd583ee40e30d556bfcbf0d66 django-enumfields-2.1.1.tar.gz +md5 e06bcaecd583ee40e30d556bfcbf0d66 django-enumfields-2.1.1.tar.gz sha256 f64841732a9c343f5071220e0abcf5f51c9472c06e3c33d7c6a7ec27b6087561 django-enumfields-2.1.1.tar.gz # Locally computed sha256 checksums sha256 75b9c8c2514f22d66070ffc975c4d3132de01e0cc7b3a9662731bcb46cd2a042 LICENSE diff --git a/package/python-django/Config.in b/package/python-django/Config.in index 8ffceb72756..c236a6dc0b4 100644 --- a/package/python-django/Config.in +++ b/package/python-django/Config.in @@ -2,11 +2,9 @@ config BR2_PACKAGE_PYTHON_DJANGO bool "python-django" select BR2_PACKAGE_PYTHON3_UNICODEDATA select BR2_PACKAGE_PYTHON3_PYEXPAT + select BR2_PACKAGE_PYTHON3_ZLIB # runtime select BR2_PACKAGE_PYTHON_ASGIREF # runtime - select BR2_PACKAGE_PYTHON_PYTZ # runtime - select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime select BR2_PACKAGE_PYTHON_SQLPARSE # runtime - help Django is a high-level Python Web framework that encourages rapid development and clean, pragmatic design. It takes your diff --git a/package/python-django/python-django.hash b/package/python-django/python-django.hash index f78df56c5fc..ee1776b44fe 100644 --- a/package/python-django/python-django.hash +++ b/package/python-django/python-django.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/django/json -md5 a86339c0e87241597afa8744704d9965 Django-4.0.2.tar.gz -sha256 110fb58fb12eca59e072ad59fc42d771cd642dd7a2f2416582aa9da7a8ef954a Django-4.0.2.tar.gz +md5 3720c85a8c25cacbce2f95d345d0f5ad Django-4.1.10.tar.gz +sha256 56343019a9fd839e2e5bf203daf45f25af79d5bffa4c71d56eae4f4404d82ade Django-4.1.10.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-django/python-django.mk b/package/python-django/python-django.mk index 652ca477ce2..61dfd54dcd1 100644 --- a/package/python-django/python-django.mk +++ b/package/python-django/python-django.mk @@ -4,11 +4,10 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 4.0.2 +PYTHON_DJANGO_VERSION = 4.1.10 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/61/84/676c840e8f1188a6c836e3224b97aa8be4c2e6857c690d6c564eb23a4975 - +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/70/d4/eded564fa5928f68771d082ec0eef4d023f9d19dfa1d2923305bc3e62afe PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE PYTHON_DJANGO_CPE_ID_VENDOR = djangoproject diff --git a/package/python-dnspython/0001-Remove-spurious-wheel-build-dependency.patch b/package/python-dnspython/0001-Remove-spurious-wheel-build-dependency.patch new file mode 100644 index 00000000000..b43217edad5 --- /dev/null +++ b/package/python-dnspython/0001-Remove-spurious-wheel-build-dependency.patch @@ -0,0 +1,29 @@ +From 53b989e4ce32c941d748ad33502600497595914a Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Wed, 2 Nov 2022 14:01:58 -0600 +Subject: [PATCH] Remove spurious wheel build dependency + +Wheel isn't a build dependency so it shouldn't be in setup_requires. +Signed-off-by: James Hilliard +[james.hilliard1@gmail.com: backport from upstream commit +53b989e4ce32c941d748ad33502600497595914a] +--- + setup.cfg | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.cfg b/setup.cfg +index 0abd270..2cb3e06 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -46,7 +46,7 @@ packages = + dns.rdtypes.CH + python_requires = >=3.7 + test_suite = tests +-setup_requires = setuptools>=44; wheel; setuptools_scm[toml]>=3.4.3 ++setup_requires = setuptools>=44; setuptools_scm[toml]>=3.4.3 + + [options.extras_require] + DOH = httpx>=0.21.1; h2>=4.1.0; requests; requests-toolbelt +-- +2.34.1 + diff --git a/package/python-dnspython/python-dnspython.hash b/package/python-dnspython/python-dnspython.hash index c9c74c8d750..29441b41ea3 100644 --- a/package/python-dnspython/python-dnspython.hash +++ b/package/python-dnspython/python-dnspython.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/dnspython/json -md5 8a362d7b2358be3117683e2dbf9654fc dnspython-2.1.0.zip -sha256 e4a87f0b573201a0f3727fa18a516b055fd1107e0e5477cded4a2de497df1dd4 dnspython-2.1.0.zip +md5 c7172f4115cd7b60fd5037cfcd8f9408 dnspython-2.2.1.tar.gz +sha256 0f7569a4a6ff151958b64304071d370daa3243d15941a7beedf0c9fe5105603e dnspython-2.2.1.tar.gz # Locally computed sha256 checksums sha256 c3ea3ff5654b329c19d3bc5f7481af623c3dded4a6145585499f843ad3d741cd LICENSE diff --git a/package/python-dnspython/python-dnspython.mk b/package/python-dnspython/python-dnspython.mk index 77e60828075..43030ae476b 100644 --- a/package/python-dnspython/python-dnspython.mk +++ b/package/python-dnspython/python-dnspython.mk @@ -4,24 +4,14 @@ # ################################################################################ -PYTHON_DNSPYTHON_VERSION = 2.1.0 -PYTHON_DNSPYTHON_SOURCE = dnspython-$(PYTHON_DNSPYTHON_VERSION).zip -PYTHON_DNSPYTHON_SITE = https://files.pythonhosted.org/packages/13/27/5277de856f605f3429d752a39af3588e29d10181a3aa2e2ee471d817485a +PYTHON_DNSPYTHON_VERSION = 2.2.1 +PYTHON_DNSPYTHON_SOURCE = dnspython-$(PYTHON_DNSPYTHON_VERSION).tar.gz +PYTHON_DNSPYTHON_SITE = https://files.pythonhosted.org/packages/99/fb/e7cd35bba24295ad41abfdff30f6b4c271fd6ac70d20132fa503c3e768e0 PYTHON_DNSPYTHON_LICENSE = ISC PYTHON_DNSPYTHON_LICENSE_FILES = LICENSE PYTHON_DNSPYTHON_SETUP_TYPE = setuptools - -define PYTHON_DNSPYTHON_EXTRACT_CMDS - $(UNZIP) -d $(@D) $(PYTHON_DNSPYTHON_DL_DIR)/$(PYTHON_DNSPYTHON_SOURCE) - mv $(@D)/dnspython-$(PYTHON_DNSPYTHON_VERSION)/* $(@D) - $(RM) -r $(@D)/dnspython-$(PYTHON_DNSPYTHON_VERSION) -endef - -define HOST_PYTHON_DNSPYTHON_EXTRACT_CMDS - $(UNZIP) -d $(@D) $(HOST_PYTHON_DNSPYTHON_DL_DIR)/$(HOST_PYTHON_DNSPYTHON_SOURCE) - mv $(@D)/dnspython-$(HOST_PYTHON_DNSPYTHON_VERSION)/* $(@D) - $(RM) -r $(@D)/dnspython-$(HOST_PYTHON_DNSPYTHON_VERSION) -endef +PYTHON_DNSPYTHON_DEPENDENCIES = host-python-setuptools-scm +HOST_PYTHON_DNSPYTHON_DEPENDENCIES = host-python-setuptools-scm $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python-docker-pycreds/python-docker-pycreds.hash b/package/python-docker-pycreds/python-docker-pycreds.hash index d93a3a1d318..06f2faf669e 100644 --- a/package/python-docker-pycreds/python-docker-pycreds.hash +++ b/package/python-docker-pycreds/python-docker-pycreds.hash @@ -1,4 +1,4 @@ # md5 and sha256 from https://pypi.python.org/pypi/docker-pycreds/json -md5 322f570cea6b4661c6ac335683988e18 docker-pycreds-0.4.0.tar.gz -sha256 6ce3270bcaf404cc4c3e27e4b6c70d3521deae82fb508767870fdbf772d584d4 docker-pycreds-0.4.0.tar.gz -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE +md5 322f570cea6b4661c6ac335683988e18 docker-pycreds-0.4.0.tar.gz +sha256 6ce3270bcaf404cc4c3e27e4b6c70d3521deae82fb508767870fdbf772d584d4 docker-pycreds-0.4.0.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/python-docker/Config.in b/package/python-docker/Config.in index b2296f42eb9..ae5a7a51819 100644 --- a/package/python-docker/Config.in +++ b/package/python-docker/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_PYTHON_DOCKER bool "python-docker" # docker-engine may be running on another host, so no other dependency select BR2_PACKAGE_PYTHON3_SSL # runtime + select BR2_PACKAGE_PYTHON_PACKAGING # runtime select BR2_PACKAGE_PYTHON_REQUESTS # runtime select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_WEBSOCKET_CLIENT # runtime diff --git a/package/python-docker/python-docker.hash b/package/python-docker/python-docker.hash index 0006a8a7da8..3fc3c4f0f40 100644 --- a/package/python-docker/python-docker.hash +++ b/package/python-docker/python-docker.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/docker/json -md5 e1e8dc73e3220fe9eec1faf80b0290de docker-4.1.0.tar.gz -sha256 6e06c5e70ba4fad73e35f00c55a895a448398f3ada7faae072e2bb01348bafc1 docker-4.1.0.tar.gz +md5 8e85e23ed30a3d07129e197d35e56eb4 docker-6.0.1.tar.gz +sha256 896c4282e5c7af5c45e8b683b0b0c33932974fe6e50fc6906a0a83616ab3da97 docker-6.0.1.tar.gz # Locally computed sha256 checksums -sha256 f2f0b07fa5e492c11d27aa0d2f3f1a0e64b9d17f32d8aa489ae2af9609af33b2 LICENSE +sha256 f2f0b07fa5e492c11d27aa0d2f3f1a0e64b9d17f32d8aa489ae2af9609af33b2 LICENSE diff --git a/package/python-docker/python-docker.mk b/package/python-docker/python-docker.mk index f476a1badd3..4da972e017b 100644 --- a/package/python-docker/python-docker.mk +++ b/package/python-docker/python-docker.mk @@ -4,13 +4,14 @@ # ################################################################################ -PYTHON_DOCKER_VERSION = 4.1.0 +PYTHON_DOCKER_VERSION = 6.0.1 PYTHON_DOCKER_SOURCE = docker-$(PYTHON_DOCKER_VERSION).tar.gz -PYTHON_DOCKER_SITE = https://files.pythonhosted.org/packages/de/54/a822d7116ff2f726f3da2b3e6c87659657bdcb7a36e382860ed505ed5e45 +PYTHON_DOCKER_SITE = https://files.pythonhosted.org/packages/79/26/6609b51ecb418e12d1534d00b888ce7e108f38b47dc6cd589598d5c6aaa2 PYTHON_DOCKER_SETUP_TYPE = setuptools PYTHON_DOCKER_LICENSE = Apache-2.0 PYTHON_DOCKER_LICENSE_FILES = LICENSE PYTHON_DOCKER_CPE_ID_VENDOR = docker PYTHON_DOCKER_CPE_ID_PRODUCT = docker-py +PYTHON_DOCKER_DEPENDENCIES = host-python-setuptools-scm $(eval $(python-package)) diff --git a/package/python-dockerpty/python-dockerpty.hash b/package/python-dockerpty/python-dockerpty.hash index f5ed252bcf1..c934b3475fd 100644 --- a/package/python-dockerpty/python-dockerpty.hash +++ b/package/python-dockerpty/python-dockerpty.hash @@ -1,4 +1,4 @@ # md5 from https://pypi.python.org/pypi/dockerpty/json, sha256 locally computed -md5 028bacb34536f3ee6a2ccd668c27e8e4 dockerpty-0.4.1.tar.gz -sha256 69a9d69d573a0daa31bcd1c0774eeed5c15c295fe719c61aca550ed1393156ce dockerpty-0.4.1.tar.gz -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt +md5 028bacb34536f3ee6a2ccd668c27e8e4 dockerpty-0.4.1.tar.gz +sha256 69a9d69d573a0daa31bcd1c0774eeed5c15c295fe719c61aca550ed1393156ce dockerpty-0.4.1.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/python-docutils/python-docutils.hash b/package/python-docutils/python-docutils.hash index f5e0b82db89..6a36f362e9d 100644 --- a/package/python-docutils/python-docutils.hash +++ b/package/python-docutils/python-docutils.hash @@ -1,4 +1,5 @@ -# md5 from https://pypi.python.org/pypi/docutils/json, sha256 locally computed -md5 ca5827e2432fd58f4c8d74a6591135de docutils-0.18.1.tar.gz -sha256 679987caf361a7539d76e584cbeddc311e3aee937877c87346f31debc63e9d06 docutils-0.18.1.tar.gz -sha256 f20172170ef9aeebbf53adf5d8f7d309f7dc6068e9a3a1b52ea772305686739d COPYING.txt +# md5, sha256 from https://pypi.org/pypi/docutils/json +md5 0afa992a6e93db892107c3f087d0d9df docutils-0.19.tar.gz +sha256 33995a6753c30b7f577febfc2c50411fec6aac7f7ffeb7c4cfe5991072dcf9e6 docutils-0.19.tar.gz +# Locally computed sha256 checksums +sha256 16b78bd9994588326a871ac39f64480969ebeb57ecd46a31874744560e72390a COPYING.txt diff --git a/package/python-docutils/python-docutils.mk b/package/python-docutils/python-docutils.mk index 39a570f5a11..d06521d10f6 100644 --- a/package/python-docutils/python-docutils.mk +++ b/package/python-docutils/python-docutils.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DOCUTILS_VERSION = 0.18.1 +PYTHON_DOCUTILS_VERSION = 0.19 PYTHON_DOCUTILS_SOURCE = docutils-$(PYTHON_DOCUTILS_VERSION).tar.gz -PYTHON_DOCUTILS_SITE = https://files.pythonhosted.org/packages/57/b1/b880503681ea1b64df05106fc7e3c4e3801736cf63deffc6fa7fc5404cf5 +PYTHON_DOCUTILS_SITE = https://files.pythonhosted.org/packages/6b/5c/330ea8d383eb2ce973df34d1239b3b21e91cd8c865d21ff82902d952f91f PYTHON_DOCUTILS_LICENSE = Public Domain, BSD-2-Clause, BSD-3-Clause, Python-2.0, GPL-3.0+ (emacs mode) PYTHON_DOCUTILS_LICENSE_FILES = COPYING.txt PYTHON_DOCUTILS_SETUP_TYPE = setuptools diff --git a/package/python-dominate/python-dominate.hash b/package/python-dominate/python-dominate.hash index 2e77d72a2e1..89293baec60 100644 --- a/package/python-dominate/python-dominate.hash +++ b/package/python-dominate/python-dominate.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/dominate/json -md5 9f714324ca99eee98bb3c3cdbe838de6 dominate-2.6.0.tar.gz -sha256 76ec2cde23700a6fc4fee098168b9dee43b99c2f1dd0ca6a711f683e8eb7e1e4 dominate-2.6.0.tar.gz +md5 77bba29beaaac4dfb657092cd89db033 dominate-2.7.0.tar.gz +sha256 520101360892ebf9d0553f67d37e359ff92403d8a1e33814030503088a05da49 dominate-2.7.0.tar.gz # Locally computed sha256 checksums sha256 9ccf26cfe845e0eb8bb58053e47366e7ab6b697ae010f7650978d4b71b7d1fc1 LICENSE.txt diff --git a/package/python-dominate/python-dominate.mk b/package/python-dominate/python-dominate.mk index 79fc058737b..0f3687de5ff 100644 --- a/package/python-dominate/python-dominate.mk +++ b/package/python-dominate/python-dominate.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DOMINATE_VERSION = 2.6.0 +PYTHON_DOMINATE_VERSION = 2.7.0 PYTHON_DOMINATE_SOURCE = dominate-$(PYTHON_DOMINATE_VERSION).tar.gz -PYTHON_DOMINATE_SITE = https://files.pythonhosted.org/packages/29/23/edf8e470f1053245c1aa99d92c8a3da9e83f6c7d3eb39205486965425be5 +PYTHON_DOMINATE_SITE = https://files.pythonhosted.org/packages/12/d7/5e5f50f5d5bdd4282d2a70b9479c1d91d6628bebd4829e455cdf7366a92e PYTHON_DOMINATE_SETUP_TYPE = setuptools PYTHON_DOMINATE_LICENSE = LGPL-3.0+ PYTHON_DOMINATE_LICENSE_FILES = LICENSE.txt diff --git a/package/python-dpkt/python-dpkt.hash b/package/python-dpkt/python-dpkt.hash index e5e986628c5..7de0d748fc6 100644 --- a/package/python-dpkt/python-dpkt.hash +++ b/package/python-dpkt/python-dpkt.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/dpkt/json -md5 ac3ace1c5ee12a74f12a863ac9082b59 dpkt-1.9.7.2.tar.gz -sha256 80f977667ebbad2b5c4f7b7f45ee8bea6622fb71723f68a9a8fe6274520c853b dpkt-1.9.7.2.tar.gz +md5 0f16de3c0b8caa6ec2261210f08c7b8b dpkt-1.9.8.tar.gz +sha256 43f8686e455da5052835fd1eda2689d51de3670aac9799b1b00cfd203927ee45 dpkt-1.9.8.tar.gz # Locally computed sha256 checksums sha256 4c5ffde575425591cbd51410219a6b98bbbb717e0c5784187e356653da8e5095 LICENSE diff --git a/package/python-dpkt/python-dpkt.mk b/package/python-dpkt/python-dpkt.mk index 87945d67c63..a99a1e86047 100644 --- a/package/python-dpkt/python-dpkt.mk +++ b/package/python-dpkt/python-dpkt.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_DPKT_VERSION = 1.9.7.2 +PYTHON_DPKT_VERSION = 1.9.8 PYTHON_DPKT_SOURCE = dpkt-$(PYTHON_DPKT_VERSION).tar.gz -PYTHON_DPKT_SITE = https://files.pythonhosted.org/packages/95/51/923b370880eff9b62fe4fe965a916da709022a02669c670731da69088e93 +PYTHON_DPKT_SITE = https://files.pythonhosted.org/packages/c9/7d/52f17a794db52a66e46ebb0c7549bf2f035ed61d5a920ba4aaa127dd038e PYTHON_DPKT_SETUP_TYPE = setuptools PYTHON_DPKT_LICENSE = BSD-3-Clause PYTHON_DPKT_LICENSE_FILES = LICENSE diff --git a/package/python-dtschema/Config.in b/package/python-dtschema/Config.in new file mode 100644 index 00000000000..961d0e04b20 --- /dev/null +++ b/package/python-dtschema/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_PYTHON_DTSCHEMA + bool "python-dtschema" + select BR2_PACKAGE_PYTHON_JSONSCHEMA # runtime + select BR2_PACKAGE_PYTHON_PYLIBFDT # runtime + select BR2_PACKAGE_PYTHON_RFC3987 # runtime + select BR2_PACKAGE_PYTHON_RUAMEL_YAML # runtime + help + DeviceTree validation schema and tools. + + https://github.com/devicetree-org/dt-schema diff --git a/package/python-dtschema/python-dtschema.hash b/package/python-dtschema/python-dtschema.hash new file mode 100644 index 00000000000..734ff3f6816 --- /dev/null +++ b/package/python-dtschema/python-dtschema.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/dtschema/json +md5 3fd3ba2d98ad320c06277274ca40d045 dtschema-2022.12.tar.gz +sha256 f532d433a915e507d4b426b7ef57a6730d23c0938b682fb4866f9dfa80a58ec6 dtschema-2022.12.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 new file mode 100644 index 00000000000..dbdf43160cc --- /dev/null +++ b/package/python-dtschema/python-dtschema.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-dtschema +# +################################################################################ + +PYTHON_DTSCHEMA_VERSION = 2022.12 +PYTHON_DTSCHEMA_SOURCE = dtschema-$(PYTHON_DTSCHEMA_VERSION).tar.gz +PYTHON_DTSCHEMA_SITE = https://files.pythonhosted.org/packages/f2/61/7d7e907ea6eed33708ce07766258b961fe476221fbd2e759a1921487e381 +PYTHON_DTSCHEMA_SETUP_TYPE = setuptools +PYTHON_DTSCHEMA_LICENSE = BSD-2-Clause +PYTHON_DTSCHEMA_LICENSE_FILES = LICENSE.txt +PYTHON_DTSCHEMA_DEPENDENCIES = host-python-setuptools-scm + +$(eval $(python-package)) diff --git a/package/python-ecdsa/python-ecdsa.hash b/package/python-ecdsa/python-ecdsa.hash index a082d30b0f6..382cccd47c6 100644 --- a/package/python-ecdsa/python-ecdsa.hash +++ b/package/python-ecdsa/python-ecdsa.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/ecdsa/json -md5 d0dd59c43af0f640a60599551529f5d0 ecdsa-0.17.0.tar.gz -sha256 b9f500bb439e4153d0330610f5d26baaf18d17b8ced1bc54410d189385ea68aa ecdsa-0.17.0.tar.gz +md5 cbca26ec29cc50e32e8b070aa2ec0786 ecdsa-0.18.0.tar.gz +sha256 190348041559e21b22a1d65cee485282ca11a6f81d503fddb84d5017e9ed1e49 ecdsa-0.18.0.tar.gz # Locally computed sha256 checksums sha256 3eca9845773d2e5b8cc9d8c119d345f00a4806e4bd660d4a3d6cdf9c0e9d8bb2 LICENSE diff --git a/package/python-ecdsa/python-ecdsa.mk b/package/python-ecdsa/python-ecdsa.mk index eda35616de3..d3d49c2520b 100644 --- a/package/python-ecdsa/python-ecdsa.mk +++ b/package/python-ecdsa/python-ecdsa.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ECDSA_VERSION = 0.17.0 +PYTHON_ECDSA_VERSION = 0.18.0 PYTHON_ECDSA_SOURCE = ecdsa-$(PYTHON_ECDSA_VERSION).tar.gz -PYTHON_ECDSA_SITE = https://files.pythonhosted.org/packages/bf/3d/3d909532ad541651390bf1321e097404cbd39d1d89c2046f42a460220fb3 +PYTHON_ECDSA_SITE = https://files.pythonhosted.org/packages/ff/7b/ba6547a76c468a0d22de93e89ae60d9561ec911f59532907e72b0d8bc0f1 PYTHON_ECDSA_SETUP_TYPE = setuptools PYTHON_ECDSA_LICENSE = MIT PYTHON_ECDSA_LICENSE_FILES = LICENSE diff --git a/package/python-editables/python-editables.hash b/package/python-editables/python-editables.hash new file mode 100644 index 00000000000..3c28c44cc36 --- /dev/null +++ b/package/python-editables/python-editables.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/editables/json +md5 e91709fbb0ef586cb7b785042068ab67 editables-0.3.tar.gz +sha256 167524e377358ed1f1374e61c268f0d7a4bf7dbd046c656f7b410cde16161b1a editables-0.3.tar.gz +# Locally computed sha256 checksums +sha256 c73e08a04e1557fdb49525fb7a579f73bcab84a254910b9350ee56daf143932d LICENSE.txt diff --git a/package/python-editables/python-editables.mk b/package/python-editables/python-editables.mk new file mode 100644 index 00000000000..db67e7a16d8 --- /dev/null +++ b/package/python-editables/python-editables.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-editables +# +################################################################################ + +PYTHON_EDITABLES_VERSION = 0.3 +PYTHON_EDITABLES_SOURCE = editables-$(PYTHON_EDITABLES_VERSION).tar.gz +PYTHON_EDITABLES_SITE = https://files.pythonhosted.org/packages/01/b0/a2a87db4b6cb8e7d57004b6836faa634e0747e3e39ded126cdbe5a33ba36 +PYTHON_EDITABLES_LICENSE = MIT +PYTHON_EDITABLES_LICENSE_FILES = LICENSE.txt +PYTHON_EDITABLES_SETUP_TYPE = setuptools + +$(eval $(host-python-package)) diff --git a/package/python-engineio/python-engineio.hash b/package/python-engineio/python-engineio.hash index 5762303af0a..651226cc9c7 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 d2bc7184d64e9d5a692bfad29ff73dea python-engineio-4.2.1.tar.gz -sha256 d510329b6d8ed5662547862f58bc73659ae62defa66b66d745ba021de112fa62 python-engineio-4.2.1.tar.gz +md5 cb093c07bc5b5351e6a2edb555b02f33 python-engineio-4.3.4.tar.gz +sha256 d8d8b072799c36cadcdcc2b40d2a560ce09797ab3d2d596b2ad519a5e4df19ae python-engineio-4.3.4.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 81bd49fb64f..388e6691558 100644 --- a/package/python-engineio/python-engineio.mk +++ b/package/python-engineio/python-engineio.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_ENGINEIO_VERSION = 4.2.1 -PYTHON_ENGINEIO_SITE = https://files.pythonhosted.org/packages/74/1e/33e402011bb2fe33ab12762e5a66d66df1d47302a23e9c5e8310e11b1403 +PYTHON_ENGINEIO_VERSION = 4.3.4 +PYTHON_ENGINEIO_SITE = https://files.pythonhosted.org/packages/7e/ff/970c5d084f513fb38108cd7c90497489d7cff8666f9bfabae00a3f4e13d4 PYTHON_ENGINEIO_SETUP_TYPE = setuptools PYTHON_ENGINEIO_LICENSE = MIT PYTHON_ENGINEIO_LICENSE_FILES = LICENSE diff --git a/package/python-entrypoints/python-entrypoints.hash b/package/python-entrypoints/python-entrypoints.hash index c6454521099..a8deb856140 100644 --- a/package/python-entrypoints/python-entrypoints.hash +++ b/package/python-entrypoints/python-entrypoints.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/entrypoints/json -md5 c5c61ea2e46a0c50ea08f4af7955a0b1 entrypoints-0.3.tar.gz -sha256 c70dd71abe5a8c85e55e12c19bd91ccfeec11a6e99044204511f9ed547d48451 entrypoints-0.3.tar.gz +md5 3acd8b72119a8fb1eac7030c24ac6b49 entrypoints-0.4.tar.gz +sha256 b706eddaa9218a19ebcd67b56818f05bb27589b1ca9e8d797b74affad4ccacd4 entrypoints-0.4.tar.gz # Locally computed sha256 checksums -sha256 de5fcd7349cdf399b0707a2a024833c4704743650133c72d6f0ff7561a03a848 LICENSE +sha256 de5fcd7349cdf399b0707a2a024833c4704743650133c72d6f0ff7561a03a848 LICENSE diff --git a/package/python-entrypoints/python-entrypoints.mk b/package/python-entrypoints/python-entrypoints.mk index 7ab1b4d64ab..287b83605dd 100644 --- a/package/python-entrypoints/python-entrypoints.mk +++ b/package/python-entrypoints/python-entrypoints.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_ENTRYPOINTS_VERSION = 0.3 +PYTHON_ENTRYPOINTS_VERSION = 0.4 PYTHON_ENTRYPOINTS_SOURCE = entrypoints-$(PYTHON_ENTRYPOINTS_VERSION).tar.gz -PYTHON_ENTRYPOINTS_SITE = https://files.pythonhosted.org/packages/b4/ef/063484f1f9ba3081e920ec9972c96664e2edb9fdc3d8669b0e3b8fc0ad7c -PYTHON_ENTRYPOINTS_SETUP_TYPE = distutils +PYTHON_ENTRYPOINTS_SITE = https://files.pythonhosted.org/packages/ea/8d/a7121ffe5f402dc015277d2d31eb82d2187334503a011c18f2e78ecbb9b2 +PYTHON_ENTRYPOINTS_SETUP_TYPE = flit PYTHON_ENTRYPOINTS_LICENSE = MIT PYTHON_ENTRYPOINTS_LICENSE_FILES = LICENSE diff --git a/package/python-esptool/Config.in b/package/python-esptool/Config.in index b21ccd72d5b..36243fa89e7 100644 --- a/package/python-esptool/Config.in +++ b/package/python-esptool/Config.in @@ -1,7 +1,10 @@ config BR2_PACKAGE_PYTHON_ESPTOOL bool "python-esptool" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography + select BR2_PACKAGE_PYTHON_BITSTRING # runtime + select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime select BR2_PACKAGE_PYTHON_ECDSA # runtime - select BR2_PACKAGE_PYTHON_PYAES # runtime + select BR2_PACKAGE_PYTHON_REEDSOLO # runtime select BR2_PACKAGE_PYTHON_SERIAL # runtime select BR2_PACKAGE_PYTHON3_ZLIB help diff --git a/package/python-esptool/python-esptool.hash b/package/python-esptool/python-esptool.hash index a916f9a09a5..b7246f97885 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 84aa6ffb4723b1f59a2c83244a9ad918 esptool-3.2.tar.gz -sha256 9638ff11c68e621e08e7c3335d4fd9d70b2ddcf7caae778073cd8cc27be1216f esptool-3.2.tar.gz +md5 92c38551bc33bd5271bdea033aa51610 esptool-4.4.tar.gz +sha256 8acd4dfe70819b1302861ae92894380fb4700b377f5a4739479a4ec276e0b256 esptool-4.4.tar.gz # Locally computed sha256 checksums -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/python-esptool/python-esptool.mk b/package/python-esptool/python-esptool.mk index 77291e252b3..0a71e1a78bb 100644 --- a/package/python-esptool/python-esptool.mk +++ b/package/python-esptool/python-esptool.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ESPTOOL_VERSION = 3.2 +PYTHON_ESPTOOL_VERSION = 4.4 PYTHON_ESPTOOL_SOURCE = esptool-$(PYTHON_ESPTOOL_VERSION).tar.gz -PYTHON_ESPTOOL_SITE = https://files.pythonhosted.org/packages/60/a4/33907f5b735f9179061bd6b6cae7123d4a2d0cdf46c879fa55e66edef24f +PYTHON_ESPTOOL_SITE = https://files.pythonhosted.org/packages/8b/4c/82d7fe5fa0643415bbb90bebff1f861816903c481ee5156fabd6d76dc684 PYTHON_ESPTOOL_SETUP_TYPE = setuptools PYTHON_ESPTOOL_LICENSE = GPL-2.0+ PYTHON_ESPTOOL_LICENSE_FILES = LICENSE diff --git a/package/python-executing/Config.in b/package/python-executing/Config.in new file mode 100644 index 00000000000..e1f8f8efdf2 --- /dev/null +++ b/package/python-executing/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_EXECUTING + bool "python-executing" + help + Get the currently executing AST node of a frame, and other + information. + + https://github.com/alexmojaki/executing diff --git a/package/python-executing/python-executing.hash b/package/python-executing/python-executing.hash new file mode 100644 index 00000000000..40fd43b5fd4 --- /dev/null +++ b/package/python-executing/python-executing.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/executing/json +md5 e6fa9a6abf00555ccc8a6b3524729238 executing-1.2.0.tar.gz +sha256 19da64c18d2d851112f09c287f8d3dbbdf725ab0e569077efb6cdcbd3497c107 executing-1.2.0.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 new file mode 100644 index 00000000000..4c968323ea6 --- /dev/null +++ b/package/python-executing/python-executing.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# python-executing +# +################################################################################ + +PYTHON_EXECUTING_VERSION = 1.2.0 +PYTHON_EXECUTING_SOURCE = executing-$(PYTHON_EXECUTING_VERSION).tar.gz +PYTHON_EXECUTING_SITE = https://files.pythonhosted.org/packages/8f/ac/89ff37d8594b0eef176b7cec742ac868fef853b8e18df0309e3def9f480b +PYTHON_EXECUTING_SETUP_TYPE = setuptools +PYTHON_EXECUTING_LICENSE = MIT +PYTHON_EXECUTING_LICENSE_FILES = LICENSE.txt + +PYTHON_EXECUTING_DEPENDENCIES = host-python-setuptools-scm + +$(eval $(python-package)) diff --git a/package/python-falcon/python-falcon.hash b/package/python-falcon/python-falcon.hash index 979419c25a4..497b5d2b57f 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 4a70cfeeacb453f5fd7eb791bdd3ac01 falcon-3.0.1.tar.gz -sha256 c41d84db325881a870e8b7129d5ecfd972fa4323cf77b7119a1d2a21966ee681 falcon-3.0.1.tar.gz +md5 383673fc6378428d0db5861a416cad0d falcon-3.1.1.tar.gz +sha256 5dd393dbf01cbaf99493893de4832121bd495dc49a46c571915b79c59aad7ef4 falcon-3.1.1.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 1f400f9a1ff..b5ebc399dc7 100644 --- a/package/python-falcon/python-falcon.mk +++ b/package/python-falcon/python-falcon.mk @@ -4,15 +4,12 @@ # ################################################################################ -PYTHON_FALCON_VERSION = 3.0.1 +PYTHON_FALCON_VERSION = 3.1.1 PYTHON_FALCON_SOURCE = falcon-$(PYTHON_FALCON_VERSION).tar.gz -PYTHON_FALCON_SITE = https://files.pythonhosted.org/packages/63/22/6a9009c53ad78e65d88a44db8eccc7f39c6f54fc05fb43b1e9cbbc481d06 +PYTHON_FALCON_SITE = https://files.pythonhosted.org/packages/29/bc/c11c9a14bb5b4d18a024ee51da15b793d1c869d151bb4101e324e0d055a8 PYTHON_FALCON_SETUP_TYPE = setuptools PYTHON_FALCON_LICENSE = Apache-2.0 PYTHON_FALCON_LICENSE_FILES = LICENSE - -ifeq ($(BR2_PACKAGE_HOST_PYTHON_CYTHON),y) PYTHON_FALCON_DEPENDENCIES += host-python-cython -endif $(eval $(python-package)) diff --git a/package/python-fastentrypoints/python-fastentrypoints.hash b/package/python-fastentrypoints/python-fastentrypoints.hash index 71165d61faf..0d505cd1091 100644 --- a/package/python-fastentrypoints/python-fastentrypoints.hash +++ b/package/python-fastentrypoints/python-fastentrypoints.hash @@ -1,4 +1,4 @@ # md5 from https://pypi.org/pypi/fastentrypoints/json, sha256 locally computed -md5 390ad9a9229164a06156a5b1f0ef1b22 fastentrypoints-0.12.tar.gz -sha256 ff284f1469bd65400599807d2c6284d5b251398e6e28811f5f77fd262292410b fastentrypoints-0.12.tar.gz -sha256 d1ce3f6a7bb1a7194c7d826a0ca318176b12e58616d9e3d8f366ad43802787c4 fastentrypoints.py +md5 390ad9a9229164a06156a5b1f0ef1b22 fastentrypoints-0.12.tar.gz +sha256 ff284f1469bd65400599807d2c6284d5b251398e6e28811f5f77fd262292410b fastentrypoints-0.12.tar.gz +sha256 d1ce3f6a7bb1a7194c7d826a0ca318176b12e58616d9e3d8f366ad43802787c4 fastentrypoints.py diff --git a/package/python-filelock/python-filelock.hash b/package/python-filelock/python-filelock.hash index d7cc864668d..4ef7afed00b 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 f8458b5235a9e439fd512dc08947f6b2 filelock-3.3.0.tar.gz -sha256 8c7eab13dc442dc249e95158bcc12dec724465919bdc9831fdbf0660f03d1785 filelock-3.3.0.tar.gz +md5 40eeb4a2963e1b07b8eab12b5db08418 filelock-3.9.0.tar.gz +sha256 7b319f24340b51f55a2bf7a12ac0755a9b03e718311dac567a0f4f7fabd2f5de filelock-3.9.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 00c32b2caab..02759935adc 100644 --- a/package/python-filelock/python-filelock.mk +++ b/package/python-filelock/python-filelock.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_FILELOCK_VERSION = 3.3.0 +PYTHON_FILELOCK_VERSION = 3.9.0 PYTHON_FILELOCK_SOURCE = filelock-$(PYTHON_FILELOCK_VERSION).tar.gz -PYTHON_FILELOCK_SITE = https://files.pythonhosted.org/packages/fd/6e/665a6cb363bee26e40954ee812e4e733fd7cafd84c06e0c7c2357641abd6 -PYTHON_FILELOCK_SETUP_TYPE = setuptools +PYTHON_FILELOCK_SITE = https://files.pythonhosted.org/packages/0b/dc/eac02350f06c6ed78a655ceb04047df01b02c6b7ea3fc02d4df24ca87d24 +PYTHON_FILELOCK_SETUP_TYPE = pep517 PYTHON_FILELOCK_LICENSE = Public Domain PYTHON_FILELOCK_LICENSE_FILES = LICENSE +PYTHON_FILELOCK_DEPENDENCIES = host-python-hatchling host-python-hatch-vcs $(eval $(python-package)) diff --git a/package/python-fire/python-fire.hash b/package/python-fire/python-fire.hash index d86376c52b1..ce44bef96e2 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 799be84cbbd7df2cf159cdcb538ab6f9 fire-0.4.0.tar.gz -sha256 c5e2b8763699d1142393a46d0e3e790c5eb2f0706082df8f647878842c216a62 fire-0.4.0.tar.gz +md5 8b24d579bd2a1b344b4f9670fa49ebc8 fire-0.5.0.tar.gz +sha256 a6b0d49e98c8963910021f92bba66f65ab440da2982b78eb1bbf95a0a34aacc6 fire-0.5.0.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 40631fce867..7a6c31e8a45 100644 --- a/package/python-fire/python-fire.mk +++ b/package/python-fire/python-fire.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FIRE_VERSION = 0.4.0 +PYTHON_FIRE_VERSION = 0.5.0 PYTHON_FIRE_SOURCE = fire-$(PYTHON_FIRE_VERSION).tar.gz -PYTHON_FIRE_SITE = https://files.pythonhosted.org/packages/11/07/a119a1aa04d37bc819940d95ed7e135a7dcca1c098123a3764a6dcace9e7 +PYTHON_FIRE_SITE = https://files.pythonhosted.org/packages/94/ed/3b9a10605163f48517931083aee8364d4d6d3bb1aa9b75eb0a4a5e9fbfc1 PYTHON_FIRE_SETUP_TYPE = setuptools PYTHON_FIRE_LICENSE = Apache-2.0 PYTHON_FIRE_LICENSE_FILES = LICENSE diff --git a/package/python-flask-babel/python-flask-babel.hash b/package/python-flask-babel/python-flask-babel.hash index 46a019c98b5..484af86179d 100644 --- a/package/python-flask-babel/python-flask-babel.hash +++ b/package/python-flask-babel/python-flask-babel.hash @@ -1,6 +1,6 @@ # From: https://pypi.org/project/Flask-Babel/#copy-hash-modal-80f92a70-1c66-4cce-bb3d-8d6f98287e3f md5 50d5e92d96ef58787bf85b5a1b0a5567 Flask-Babel-2.0.0.tar.gz -sha256 f9faf45cdb2e1a32ea2ec14403587d4295108f35017a7821a2b1acb8cfd9257d Flask-Babel-2.0.0.tar.gz +sha256 f9faf45cdb2e1a32ea2ec14403587d4295108f35017a7821a2b1acb8cfd9257d Flask-Babel-2.0.0.tar.gz # License files -sha256 a526100a7047237360a394ba4f70ae801b50ff9b8c9b9e73e7795480a59f6b7e LICENSE +sha256 a526100a7047237360a394ba4f70ae801b50ff9b8c9b9e73e7795480a59f6b7e LICENSE diff --git a/package/python-flask-expects-json/python-flask-expects-json.hash b/package/python-flask-expects-json/python-flask-expects-json.hash index c023222fd71..e465bcb56a1 100644 --- a/package/python-flask-expects-json/python-flask-expects-json.hash +++ b/package/python-flask-expects-json/python-flask-expects-json.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/flask-expects-json/json -md5 c1fb8ede58db312d7923212dc97b8ab4 flask-expects-json-1.5.0.tar.gz -sha256 0087dc3d089f1ac75a1fc0f259f4dbd02bbb9c356e92e1a080f2309e2f75d053 flask-expects-json-1.5.0.tar.gz +md5 3a77c4059f21e6e37e652c9dbbdc2e7c flask-expects-json-1.7.0.tar.gz +sha256 4ef186a86f10572a21af82e549546deda024326628b4a96cd14d3a0f71754d62 flask-expects-json-1.7.0.tar.gz # Locally computed sha256 checksums sha256 06154a99fdc664107294a0a5e7e68f776078d075408dd32bbeaa7340fdd39e73 LICENSE.txt diff --git a/package/python-flask-expects-json/python-flask-expects-json.mk b/package/python-flask-expects-json/python-flask-expects-json.mk index 487f15d4e5b..55c9bc95712 100644 --- a/package/python-flask-expects-json/python-flask-expects-json.mk +++ b/package/python-flask-expects-json/python-flask-expects-json.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FLASK_EXPECTS_JSON_VERSION = 1.5.0 +PYTHON_FLASK_EXPECTS_JSON_VERSION = 1.7.0 PYTHON_FLASK_EXPECTS_JSON_SOURCE = flask-expects-json-$(PYTHON_FLASK_EXPECTS_JSON_VERSION).tar.gz -PYTHON_FLASK_EXPECTS_JSON_SITE = https://files.pythonhosted.org/packages/4c/4a/9d9d050af700fb3feebd1f8466e73d65ce8b4709f27773e07100b0993451 +PYTHON_FLASK_EXPECTS_JSON_SITE = https://files.pythonhosted.org/packages/12/a5/b27cf21d62c2b5a0a32e2f92bde9658e74c34fcc2e004bb0d591f1bf7627 PYTHON_FLASK_EXPECTS_JSON_SETUP_TYPE = setuptools PYTHON_FLASK_EXPECTS_JSON_LICENSE = MIT PYTHON_FLASK_EXPECTS_JSON_LICENSE_FILES = LICENSE.txt diff --git a/package/python-flask-jsonrpc/Config.in b/package/python-flask-jsonrpc/Config.in index c8ecd854b3b..024fbc4b85d 100644 --- a/package/python-flask-jsonrpc/Config.in +++ b/package/python-flask-jsonrpc/Config.in @@ -1,7 +1,8 @@ config BR2_PACKAGE_PYTHON_FLASK_JSONRPC bool "python-flask-jsonrpc" - # runtime dependency - select BR2_PACKAGE_PYTHON_FLASK + select BR2_PACKAGE_PYTHON_FLASK # runtime + select BR2_PACKAGE_PYTHON_TYPEGUARD # runtime + select BR2_PACKAGE_PYTHON_TYPING_INSPECT # runtime help A basic JSON-RPC implementation for your Flask-powered sites. diff --git a/package/python-flask-jsonrpc/python-flask-jsonrpc.hash b/package/python-flask-jsonrpc/python-flask-jsonrpc.hash index 4204f59dd52..d5c0e465959 100644 --- a/package/python-flask-jsonrpc/python-flask-jsonrpc.hash +++ b/package/python-flask-jsonrpc/python-flask-jsonrpc.hash @@ -1,5 +1,6 @@ -# md5 from https://pypi.python.org/pypi/flask-jsonrpc/json -md5 5c0592f53b2f18e34d5be435acee8842 Flask-JSONRPC-0.3.1.tar.gz -# Locally computed -sha256 4d0cc9c20874093306af91f5a48009fb8659a041428dcdb11703598ffbbc97d0 Flask-JSONRPC-0.3.1.tar.gz -sha256 f613b06cbe766fd514b1b619a71a12c353cccaa55fa4f547be55563d9829be6f setup.py +# md5, sha256 from https://pypi.org/pypi/flask-jsonrpc/json +md5 fb6205e6e776802c6000ea7119229066 Flask-JSONRPC-2.2.2.tar.gz +sha256 0cb6ac2804980dc8ac7cbbc3149025f4ec9323227978a4a7ce7b55a9f8263a11 Flask-JSONRPC-2.2.2.tar.gz +# Locally computed sha256 checksums +sha256 5e6175926ba7dde28c7d292a8b0350aa82c40a8c5691a878fe02b0c9c6b43b39 LICENSE +sha256 5e6175926ba7dde28c7d292a8b0350aa82c40a8c5691a878fe02b0c9c6b43b39 COPYING diff --git a/package/python-flask-jsonrpc/python-flask-jsonrpc.mk b/package/python-flask-jsonrpc/python-flask-jsonrpc.mk index dbb37c373c1..c816749085c 100644 --- a/package/python-flask-jsonrpc/python-flask-jsonrpc.mk +++ b/package/python-flask-jsonrpc/python-flask-jsonrpc.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_FLASK_JSONRPC_VERSION = 0.3.1 +PYTHON_FLASK_JSONRPC_VERSION = 2.2.2 PYTHON_FLASK_JSONRPC_SOURCE = Flask-JSONRPC-$(PYTHON_FLASK_JSONRPC_VERSION).tar.gz -PYTHON_FLASK_JSONRPC_SITE = https://pypi.python.org/packages/cb/1f/e6d66e8498609ba04bac76155b2ea884df95531e93501bf4ef009d40a83c +PYTHON_FLASK_JSONRPC_SITE = https://files.pythonhosted.org/packages/a5/7b/8cbd53084a1efb58a1105905a38b0cbefcd3ae13ef2c90c07eedf0fdb6dc PYTHON_FLASK_JSONRPC_LICENSE = BSD-3-Clause -PYTHON_FLASK_JSONRPC_LICENSE_FILES = setup.py +PYTHON_FLASK_JSONRPC_LICENSE_FILES = LICENSE COPYING PYTHON_FLASK_JSONRPC_SETUP_TYPE = setuptools $(eval $(python-package)) diff --git a/package/python-flask-login/python-flask-login.hash b/package/python-flask-login/python-flask-login.hash index 9ff1f82a09c..c88b70f2d54 100644 --- a/package/python-flask-login/python-flask-login.hash +++ b/package/python-flask-login/python-flask-login.hash @@ -1,6 +1,5 @@ -# From https://pypi.org/project/Flask-Login/#copy-hash-modal-8bb2ac58-b80a-4793-84d4-4f32b92976d9 -md5 a2d94aa6ae935345ebc68eb3cbb5fccd Flask-Login-0.5.0.tar.gz -sha256 6d33aef15b5bcead780acc339464aae8a6e28f13c90d8b1cf9de8b549d1c0b4b Flask-Login-0.5.0.tar.gz - -# License files +# md5, sha256 from https://pypi.org/pypi/flask-login/json +md5 8020b22ad7ec6f17034f90117a520633 Flask-Login-0.6.2.tar.gz +sha256 c0a7baa9fdc448cdd3dd6f0939df72eec5177b2f7abe6cb82fc934d29caac9c3 Flask-Login-0.6.2.tar.gz +# Locally computed sha256 checksums sha256 7a9dfb9c5da204ed1370f3b62c13e2992a12da1da707f47e156897eeb4344e5b LICENSE diff --git a/package/python-flask-login/python-flask-login.mk b/package/python-flask-login/python-flask-login.mk index efb63b262be..394fe197e3f 100644 --- a/package/python-flask-login/python-flask-login.mk +++ b/package/python-flask-login/python-flask-login.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FLASK_LOGIN_VERSION = 0.5.0 +PYTHON_FLASK_LOGIN_VERSION = 0.6.2 PYTHON_FLASK_LOGIN_SOURCE = Flask-Login-$(PYTHON_FLASK_LOGIN_VERSION).tar.gz -PYTHON_FLASK_LOGIN_SITE = https://files.pythonhosted.org/packages/f9/01/f6c0a3a654ca125cf9cd273314c03a8bc6a47bf861765c8c1d375e15a28d +PYTHON_FLASK_LOGIN_SITE = https://files.pythonhosted.org/packages/cc/da/eae45ba9ec58af45b46ef94c6ca04fb211ee57c06421b696e894eb11b064 PYTHON_FLASK_LOGIN_LICENSE = MIT PYTHON_FLASK_LOGIN_LICENSE_FILES = LICENSE PYTHON_FLASK_LOGIN_SETUP_TYPE = setuptools diff --git a/package/python-flask-smorest/Config.in b/package/python-flask-smorest/Config.in new file mode 100644 index 00000000000..a8ccfbd9f73 --- /dev/null +++ b/package/python-flask-smorest/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_PYTHON_FLASK_SMOREST + bool "python-flask-smorest" + select BR2_PACKAGE_PYTHON_APISPEC # runtime + select BR2_PACKAGE_PYTHON_FLASK # runtime + select BR2_PACKAGE_PYTHON_MARSHMALLOW # runtime + select BR2_PACKAGE_PYTHON_WEBARGS # runtime + select BR2_PACKAGE_PYTHON_WERKZEUG # runtime + help + Flask/Marshmallow-based REST API framework. + + https://github.com/marshmallow-code/flask-smorest diff --git a/package/python-flask-smorest/python-flask-smorest.hash b/package/python-flask-smorest/python-flask-smorest.hash new file mode 100644 index 00000000000..941535c5033 --- /dev/null +++ b/package/python-flask-smorest/python-flask-smorest.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/flask-smorest/json +md5 1dad52f26c59ca2dcaf0c5d109879605 flask-smorest-0.40.0.tar.gz +sha256 9b46b4937ccf78702d99fed8cfd1cd5c37608ddefd65ff16a86d1ad5c7f7d8c0 flask-smorest-0.40.0.tar.gz +# Locally computed sha256 checksums +sha256 40999ea1d9c1b8202fa44f8e6849a557e22df892481e067abf999879064b9521 LICENSE diff --git a/package/python-flask-smorest/python-flask-smorest.mk b/package/python-flask-smorest/python-flask-smorest.mk new file mode 100644 index 00000000000..069d9244dd7 --- /dev/null +++ b/package/python-flask-smorest/python-flask-smorest.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-flask-smorest +# +################################################################################ + +PYTHON_FLASK_SMOREST_VERSION = 0.40.0 +PYTHON_FLASK_SMOREST_SOURCE = flask-smorest-$(PYTHON_FLASK_SMOREST_VERSION).tar.gz +PYTHON_FLASK_SMOREST_SITE = https://files.pythonhosted.org/packages/e6/b5/1b81ea4f7e377cf8a653aa10c249656a1c73de7a3695b2544d7a713ea3c2 +PYTHON_FLASK_SMOREST_SETUP_TYPE = setuptools +PYTHON_FLASK_SMOREST_LICENSE = MIT +PYTHON_FLASK_SMOREST_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/package/python-flask-sqlalchemy/python-flask-sqlalchemy.hash b/package/python-flask-sqlalchemy/python-flask-sqlalchemy.hash index f1fe9775f55..50ca14371d5 100644 --- a/package/python-flask-sqlalchemy/python-flask-sqlalchemy.hash +++ b/package/python-flask-sqlalchemy/python-flask-sqlalchemy.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/flask-sqlalchemy/json -md5 1f5781cf3e1a2b1aabda47a5b20d2073 Flask-SQLAlchemy-2.4.1.tar.gz -sha256 6974785d913666587949f7c2946f7001e4fa2cb2d19f4e69ead02e4b8f50b33d Flask-SQLAlchemy-2.4.1.tar.gz +md5 cbc5756b7e14683de1a540516159a81a Flask-SQLAlchemy-3.0.2.tar.gz +sha256 16199f5b3ddfb69e0df2f52ae4c76aedbfec823462349dabb21a1b2e0a2b65e9 Flask-SQLAlchemy-3.0.2.tar.gz # Locally computed sha256 checksums -sha256 489a8e1108509ed98a37bb983e11e0f7e1d31f0bd8f99a79c8448e7ff37d07ea LICENSE.rst +sha256 489a8e1108509ed98a37bb983e11e0f7e1d31f0bd8f99a79c8448e7ff37d07ea LICENSE.rst diff --git a/package/python-flask-sqlalchemy/python-flask-sqlalchemy.mk b/package/python-flask-sqlalchemy/python-flask-sqlalchemy.mk index c6d0094b41a..ca6fd0c7933 100644 --- a/package/python-flask-sqlalchemy/python-flask-sqlalchemy.mk +++ b/package/python-flask-sqlalchemy/python-flask-sqlalchemy.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FLASK_SQLALCHEMY_VERSION = 2.4.1 +PYTHON_FLASK_SQLALCHEMY_VERSION = 3.0.2 PYTHON_FLASK_SQLALCHEMY_SOURCE = Flask-SQLAlchemy-$(PYTHON_FLASK_SQLALCHEMY_VERSION).tar.gz -PYTHON_FLASK_SQLALCHEMY_SITE = https://files.pythonhosted.org/packages/52/7a/35bacbedafdc652d5198b80eb22eacccae0c97a49740a45da828b05cc37b +PYTHON_FLASK_SQLALCHEMY_SITE = https://files.pythonhosted.org/packages/0b/b7/05a8f9c3f010775275f8dec53e40ff7ea1ae61bf1cfa4b524caf4d3da982 PYTHON_FLASK_SQLALCHEMY_SETUP_TYPE = setuptools PYTHON_FLASK_SQLALCHEMY_LICENSE = BSD-3-Clause PYTHON_FLASK_SQLALCHEMY_LICENSE_FILES = LICENSE.rst diff --git a/package/python-flask-wtf/python-flask-wtf.hash b/package/python-flask-wtf/python-flask-wtf.hash index 848d6d77834..01e4290950b 100644 --- a/package/python-flask-wtf/python-flask-wtf.hash +++ b/package/python-flask-wtf/python-flask-wtf.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/flask-wtf/json -md5 920a5a476ecfb751952b5048cc05fcf8 Flask-WTF-0.15.1.tar.gz -sha256 ff177185f891302dc253437fe63081e7a46a4e99aca61dfe086fb23e54fff2dc Flask-WTF-0.15.1.tar.gz +md5 d86dbc0befe30fd577a623a51689b900 Flask-WTF-1.0.1.tar.gz +sha256 34fe5c6fee0f69b50e30f81a3b7ea16aa1492a771fe9ad0974d164610c09a6c9 Flask-WTF-1.0.1.tar.gz # Locally computed sha256 checksums -sha256 a075f8d98acfdb05dd98716242b9e2c1b3ab98722926b3c4cf6c916ac14e8350 LICENSE +sha256 d5f19036451578cb36eeef04c99ebf7d7ca2e70dcf043636519bc420e15a7c62 LICENSE.rst diff --git a/package/python-flask-wtf/python-flask-wtf.mk b/package/python-flask-wtf/python-flask-wtf.mk index e2078103f59..97291e1b26e 100644 --- a/package/python-flask-wtf/python-flask-wtf.mk +++ b/package/python-flask-wtf/python-flask-wtf.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_FLASK_WTF_VERSION = 0.15.1 +PYTHON_FLASK_WTF_VERSION = 1.0.1 PYTHON_FLASK_WTF_SOURCE = Flask-WTF-$(PYTHON_FLASK_WTF_VERSION).tar.gz -PYTHON_FLASK_WTF_SITE = https://files.pythonhosted.org/packages/9c/b5/4b48cece7b31aac2beab115330c2978ef4deee3aeb0dd1037c9b7a71b8c3 +PYTHON_FLASK_WTF_SITE = https://files.pythonhosted.org/packages/d9/38/d4798dd05be711d666e1befb08b1d3db57bd146d1a14d15657f60c88b446 PYTHON_FLASK_WTF_LICENSE = BSD-3-Clause -PYTHON_FLASK_WTF_LICENSE_FILES = LICENSE +PYTHON_FLASK_WTF_LICENSE_FILES = LICENSE.rst PYTHON_FLASK_WTF_SETUP_TYPE = setuptools $(eval $(python-package)) diff --git a/package/python-flask/python-flask.hash b/package/python-flask/python-flask.hash index c6ccd633f8b..9b6391750aa 100644 --- a/package/python-flask/python-flask.hash +++ b/package/python-flask/python-flask.hash @@ -1,7 +1,6 @@ -# From https://pypi.org/project/Flask/#copy-hash-modal-911ffb67-fe84-4e25-a1a9-f4c745a0a980 -md5 0da4145d172993cd28a6c619630cc19c Flask-1.1.2.tar.gz -sha256 4efa1ae2d7c9865af48986de8aeb8504bf32c7f3d6fdc9353d34b21f4b127060 Flask-1.1.2.tar.gz - -# License files -sha256 489a8e1108509ed98a37bb983e11e0f7e1d31f0bd8f99a79c8448e7ff37d07ea LICENSE.rst -sha256 0ef3ae025f4a398761079f0d687ff3d66f4fef3a32ac2607318e909c0cba9150 docs/license.rst +# md5, sha256 from https://pypi.org/pypi/flask/json +md5 c0d2276cb7d59a06d62c915da9c77ba6 Flask-2.2.2.tar.gz +sha256 642c450d19c4ad482f96729bd2a8f6d32554aa1e231f4f6b4e7e5264b16cca2b Flask-2.2.2.tar.gz +# Locally computed sha256 checksums +sha256 489a8e1108509ed98a37bb983e11e0f7e1d31f0bd8f99a79c8448e7ff37d07ea LICENSE.rst +sha256 7535eac513edd12fb8e33f203c6a403549629e34b363418cdbd6c6ea5464515d docs/license.rst diff --git a/package/python-flask/python-flask.mk b/package/python-flask/python-flask.mk index 077aa600b8a..1b1ffdf0345 100644 --- a/package/python-flask/python-flask.mk +++ b/package/python-flask/python-flask.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FLASK_VERSION = 1.1.2 +PYTHON_FLASK_VERSION = 2.2.2 PYTHON_FLASK_SOURCE = Flask-$(PYTHON_FLASK_VERSION).tar.gz -PYTHON_FLASK_SITE = https://files.pythonhosted.org/packages/4e/0b/cb02268c90e67545a0e3a37ea1ca3d45de3aca43ceb7dbf1712fb5127d5d +PYTHON_FLASK_SITE = https://files.pythonhosted.org/packages/69/b6/53cfa30eed5aa7343daff36622843688ba8c6fe9829bb2b92e193ab1163f PYTHON_FLASK_SETUP_TYPE = setuptools PYTHON_FLASK_LICENSE = BSD-3-Clause PYTHON_FLASK_LICENSE_FILES = LICENSE.rst docs/license.rst diff --git a/package/python-flatbuffers/python-flatbuffers.hash b/package/python-flatbuffers/python-flatbuffers.hash index a27d94160a9..ccc754f9bef 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 b2ce60d9a7c1f8a2ddac6d49a1b700a4 flatbuffers-2.0.tar.gz -sha256 12158ab0272375eab8db2d663ae97370c33f152b27801fa6024e1d6105fd4dd2 flatbuffers-2.0.tar.gz +md5 3391732d344155cc070892fae5f7166c flatbuffers-2.0.7.tar.gz +sha256 0ae7d69c5b82bf41962ca5fde9cc43033bc9501311d975fd5a25e8a7d29c1245 flatbuffers-2.0.7.tar.gz diff --git a/package/python-flatbuffers/python-flatbuffers.mk b/package/python-flatbuffers/python-flatbuffers.mk index 705dc0ad5a6..65f3d0955cd 100644 --- a/package/python-flatbuffers/python-flatbuffers.mk +++ b/package/python-flatbuffers/python-flatbuffers.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FLATBUFFERS_VERSION = 2.0 +PYTHON_FLATBUFFERS_VERSION = 2.0.7 PYTHON_FLATBUFFERS_SOURCE = flatbuffers-$(PYTHON_FLATBUFFERS_VERSION).tar.gz -PYTHON_FLATBUFFERS_SITE = https://files.pythonhosted.org/packages/10/41/09e9ab2134895b82466fada08b69b800f9a724bc81fcca3d4474ce48ffce +PYTHON_FLATBUFFERS_SITE = https://files.pythonhosted.org/packages/d1/90/0532e737a11e1dc50e9e352c3ccc97338cb75991f83279c2edbc9234e022 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 new file mode 100644 index 00000000000..f63a64ed1b9 --- /dev/null +++ b/package/python-flit-core/python-flit-core.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/flit_core/json +md5 7c41da13273f7787709a24f74e0f5a99 flit_core-3.8.0.tar.gz +sha256 b305b30c99526df5e63d6022dd2310a0a941a187bd3884f4c8ef0418df6c39f3 flit_core-3.8.0.tar.gz +# Locally computed +sha256 35b4f1dec512e617077fd6980dbb43ef8c2887adc5d0185edb4c04da175dd816 LICENSE diff --git a/package/python-flit-core/python-flit-core.mk b/package/python-flit-core/python-flit-core.mk new file mode 100644 index 00000000000..f96191ade68 --- /dev/null +++ b/package/python-flit-core/python-flit-core.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# python-flit-core +# +################################################################################ + +PYTHON_FLIT_CORE_VERSION = 3.8.0 +PYTHON_FLIT_CORE_SOURCE = flit_core-$(PYTHON_FLIT_CORE_VERSION).tar.gz +PYTHON_FLIT_CORE_SITE = https://files.pythonhosted.org/packages/10/e5/be08751d07b30889af130cec20955c987a74380a10058e6e8856e4010afc +PYTHON_FLIT_CORE_LICENSE = BSD-3-Clause +PYTHON_FLIT_CORE_LICENSE_FILES = LICENSE +PYTHON_FLIT_CORE_SETUP_TYPE = flit-bootstrap + +# Use flit built in bootstrap_install for installing host-python-flit-core. +# This is due to host-python-installer depending on host-python-flit-core. +# +HOST_PYTHON_FLIT_CORE_BASE_INSTALL_CMD = -m bootstrap_install dist/* $(HOST_PKG_PYTHON_PEP517_BOOTSTRAP_INSTALL_OPTS) + +$(eval $(host-python-package)) diff --git a/package/python-flup/python-flup.hash b/package/python-flup/python-flup.hash index d544d75e9e3..b28f05acf64 100644 --- a/package/python-flup/python-flup.hash +++ b/package/python-flup/python-flup.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/flup/json -md5 a64e7a6374e043480ee92534c735964e flup-1.0.3.tar.gz -sha256 5eb09f26eb0751f8380d8ac43d1dfb20e1d42eca0fa45ea9289fa532a79cd159 flup-1.0.3.tar.gz +md5 a64e7a6374e043480ee92534c735964e flup-1.0.3.tar.gz +sha256 5eb09f26eb0751f8380d8ac43d1dfb20e1d42eca0fa45ea9289fa532a79cd159 flup-1.0.3.tar.gz # Locally computed sha256 checksums -sha256 66a60ebc732165d199ec018fb9876d9f8168a5a8575375e64cc1b3d78c32b481 PKG-INFO +sha256 66a60ebc732165d199ec018fb9876d9f8168a5a8575375e64cc1b3d78c32b481 PKG-INFO diff --git a/package/python-fonttools/python-fonttools.hash b/package/python-fonttools/python-fonttools.hash index df0bdf980da..4b4751dc822 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 7fc490291991da874911fed1e743362d fonttools-4.29.1.zip -sha256 2b18a172120e32128a80efee04cff487d5d140fe7d817deb648b2eee023a40e4 fonttools-4.29.1.zip +md5 f4775967d29b0da2f29ba499eed34f88 fonttools-4.38.0.zip +sha256 2bb244009f9bf3fa100fc3ead6aeb99febe5985fa20afbfbaa2f8946c2fbdaf1 fonttools-4.38.0.zip # Locally computed sha256 checksums sha256 6787208f83f659ccbc2223b2fde952ffa6f7e8aca62f1a8a2bf5bc51bb1b2383 LICENSE diff --git a/package/python-fonttools/python-fonttools.mk b/package/python-fonttools/python-fonttools.mk index c07011daa0d..d31d3a28898 100644 --- a/package/python-fonttools/python-fonttools.mk +++ b/package/python-fonttools/python-fonttools.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FONTTOOLS_VERSION = 4.29.1 +PYTHON_FONTTOOLS_VERSION = 4.38.0 PYTHON_FONTTOOLS_SOURCE = fonttools-$(PYTHON_FONTTOOLS_VERSION).zip -PYTHON_FONTTOOLS_SITE = https://files.pythonhosted.org/packages/2d/4c/49ba863863502bb9fea19d8bd04a527da336b4a2698c8a0c7129e9cc2716 +PYTHON_FONTTOOLS_SITE = https://files.pythonhosted.org/packages/55/5c/a4a25cf6db42d113d8f626901bb156b2f7cf7c7564a6bbc7b5cd6f7cb484 PYTHON_FONTTOOLS_SETUP_TYPE = setuptools PYTHON_FONTTOOLS_LICENSE = MIT PYTHON_FONTTOOLS_LICENSE_FILES = LICENSE diff --git a/package/python-frozenlist/python-frozenlist.hash b/package/python-frozenlist/python-frozenlist.hash index 034150397b9..04a3a44e894 100644 --- a/package/python-frozenlist/python-frozenlist.hash +++ b/package/python-frozenlist/python-frozenlist.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/frozenlist/json -md5 e65d870bd189ba3c21ab7eb10eab22b7 frozenlist-1.3.0.tar.gz -sha256 ce6f2ba0edb7b0c1d8976565298ad2deba6f8064d2bebb6ffce2ca896eb35b0b frozenlist-1.3.0.tar.gz +md5 14e9ffd849c6a1dfa3c6b1fb1ff77b14 frozenlist-1.3.3.tar.gz +sha256 58bcc55721e8a90b88332d6cd441261ebb22342e238296bb330968952fbb3a6a frozenlist-1.3.3.tar.gz # Locally computed sha256 checksums sha256 6fd5243e92dd7f98ec69c7ac377728e74905709ff527a5bf98d6d0263c04f5b6 LICENSE diff --git a/package/python-frozenlist/python-frozenlist.mk b/package/python-frozenlist/python-frozenlist.mk index ad618971f78..88833b0465a 100644 --- a/package/python-frozenlist/python-frozenlist.mk +++ b/package/python-frozenlist/python-frozenlist.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FROZENLIST_VERSION = 1.3.0 +PYTHON_FROZENLIST_VERSION = 1.3.3 PYTHON_FROZENLIST_SOURCE = frozenlist-$(PYTHON_FROZENLIST_VERSION).tar.gz -PYTHON_FROZENLIST_SITE = https://files.pythonhosted.org/packages/f4/f7/8dfeb76d2a52bcea2b0718427af954ffec98be1d34cd8f282034b3e36829 +PYTHON_FROZENLIST_SITE = https://files.pythonhosted.org/packages/e9/10/d629476346112b85c912527b9080944fd2c39a816c2225413dbc0bb6fcc0 PYTHON_FROZENLIST_SETUP_TYPE = setuptools PYTHON_FROZENLIST_LICENSE = Apache-2.0 PYTHON_FROZENLIST_LICENSE_FILES = LICENSE diff --git a/package/python-future/python-future.hash b/package/python-future/python-future.hash index c43018103ee..3b2bbb02126 100644 --- a/package/python-future/python-future.hash +++ b/package/python-future/python-future.hash @@ -1,5 +1,5 @@ -# md5, sha256 from https://pypi.python.org/pypi/future/json -md5 e4579c836b9c025872efe230f6270349 future-0.18.2.tar.gz -sha256 b1bead90b70cf6ec3f0710ae53a525360fa360d306a86583adc6bf83a4db537d future-0.18.2.tar.gz +# md5, sha256 from https://pypi.org/pypi/future/json +md5 dedcb70d14b23388670d54145aab8be4 future-0.18.3.tar.gz +sha256 34a17436ed1e96697a86f9de3d15a3b0be01d8bc8de9c1dffd59fb8234ed5307 future-0.18.3.tar.gz # Locally computed sha256 checksums -sha256 916e561392d48471b9c23437f56e2652f320cb3b119ceaa162edf41016f746b9 LICENSE.txt +sha256 916e561392d48471b9c23437f56e2652f320cb3b119ceaa162edf41016f746b9 LICENSE.txt diff --git a/package/python-future/python-future.mk b/package/python-future/python-future.mk index 76f32180ac0..57bf13d83bb 100644 --- a/package/python-future/python-future.mk +++ b/package/python-future/python-future.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_FUTURE_VERSION = 0.18.2 +PYTHON_FUTURE_VERSION = 0.18.3 PYTHON_FUTURE_SOURCE = future-$(PYTHON_FUTURE_VERSION).tar.gz -PYTHON_FUTURE_SITE = https://files.pythonhosted.org/packages/45/0b/38b06fd9b92dc2b68d58b75f900e97884c45bedd2ff83203d933cf5851c9 +PYTHON_FUTURE_SITE = https://files.pythonhosted.org/packages/8f/2e/cf6accf7415237d6faeeebdc7832023c90e0282aa16fd3263db0eb4715ec PYTHON_FUTURE_SETUP_TYPE = setuptools PYTHON_FUTURE_LICENSE = MIT PYTHON_FUTURE_LICENSE_FILES = LICENSE.txt diff --git a/package/python-gast/python-gast.hash b/package/python-gast/python-gast.hash new file mode 100644 index 00000000000..f16d001a6a8 --- /dev/null +++ b/package/python-gast/python-gast.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/gast/json +md5 fdff900805e03e9dd76d377eb4cbaed7 gast-0.5.3.tar.gz +sha256 cfbea25820e653af9c7d1807f659ce0a0a9c64f2439421a7bba4f0983f532dea gast-0.5.3.tar.gz +# Locally computed sha256 checksums +sha256 6a04bbabd9b48bea6bf7c0bd3f3a062e1476b3c403a746448fd69b0d902e148f LICENSE diff --git a/package/python-gast/python-gast.mk b/package/python-gast/python-gast.mk new file mode 100644 index 00000000000..e02e87fb23e --- /dev/null +++ b/package/python-gast/python-gast.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-gast +# +################################################################################ + +PYTHON_GAST_VERSION = 0.5.3 +PYTHON_GAST_SOURCE = gast-$(PYTHON_GAST_VERSION).tar.gz +PYTHON_GAST_SITE = https://files.pythonhosted.org/packages/48/a3/0bd844c54ae8141642088b7ae09dd38fec2ec7faa9b7d25bb6a23c1f266f +PYTHON_GAST_SETUP_TYPE = setuptools +PYTHON_GAST_LICENSE = BSD-3-Clause +PYTHON_GAST_LICENSE_FILES = LICENSE + +$(eval $(host-python-package)) diff --git a/package/python-gitdb2/python-gitdb2.hash b/package/python-gitdb2/python-gitdb2.hash index 7d9bf78f70f..7bc187cf53f 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 3f52187435ab0b6e64a15782ffaf29ab gitdb-4.0.7.tar.gz -sha256 96bf5c08b157a666fec41129e6d327235284cca4c81e92109260f353ba138005 gitdb-4.0.7.tar.gz +md5 3f52187435ab0b6e64a15782ffaf29ab gitdb-4.0.7.tar.gz +sha256 96bf5c08b157a666fec41129e6d327235284cca4c81e92109260f353ba138005 gitdb-4.0.7.tar.gz # Locally computed sha256 checksums -sha256 efd29f596a08e8857e68e7694a50bcda72839792da7c3f041bcbff5f18009239 LICENSE +sha256 efd29f596a08e8857e68e7694a50bcda72839792da7c3f041bcbff5f18009239 LICENSE diff --git a/package/python-glslang/python-glslang.hash b/package/python-glslang/python-glslang.hash new file mode 100644 index 00000000000..df9127939ef --- /dev/null +++ b/package/python-glslang/python-glslang.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 592c98aeb03b3e81597ddaf83633c4e63068d14b18a766fd11033bad73127162 python-glslang-11.13.0.tar.gz +sha256 adb783e734e906d1f46db5df29991dbde84bdb0ceab502ac2febb44fe3c2b5f4 LICENSE.txt diff --git a/package/python-glslang/python-glslang.mk b/package/python-glslang/python-glslang.mk new file mode 100644 index 00000000000..94f480e30a1 --- /dev/null +++ b/package/python-glslang/python-glslang.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# python-glslang +# +################################################################################ + +PYTHON_GLSLANG_VERSION = 11.13.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 + +$(eval $(host-cmake-package)) diff --git a/package/python-gnupg/Config.in b/package/python-gnupg/Config.in index 038a940778d..234792977a2 100644 --- a/package/python-gnupg/Config.in +++ b/package/python-gnupg/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_GNUPG bool "python-gnupg" - select BR2_PACKAGE_GNUPG if !BR2_PACKAGE_GNUPG2 # runtime + select BR2_PACKAGE_GNUPG2 if BR2_PACKAGE_GNUPG2_DEPENDS && !BR2_PACKAGE_GNUPG # runtime + select BR2_PACKAGE_GNUPG if !BR2_PACKAGE_GNUPG2_DEPENDS # runtime help A wrapper for the Gnu Privacy Guard (GPG or GnuPG). diff --git a/package/python-gnupg/python-gnupg.hash b/package/python-gnupg/python-gnupg.hash index fa0e8ae6e5c..7886ff7daef 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 02c5d77b8db9dfba0741627560d89bd5 python-gnupg-0.4.8.tar.gz -sha256 b64de1ae5cedf872b437201a566fa2c62ce0c95ea2e30177eb53aee1258507d7 python-gnupg-0.4.8.tar.gz +md5 19cc1aef3a612b7b5f13e388260e65d4 python-gnupg-0.5.0.tar.gz +sha256 70758e387fc0e0c4badbcb394f61acbe68b34970a8fed7e0f7c89469fe17912a python-gnupg-0.5.0.tar.gz # Locally computed sha256 checksums -sha256 9620da3d3afdfca7dea53c4375c1507ab2d3a4af4e706827023acb49a9ec4a5e LICENSE.txt +sha256 4104ca980dbca7603fc553078378eb14566a76f819d033d7bff89fd6a97e181b LICENSE.txt diff --git a/package/python-gnupg/python-gnupg.mk b/package/python-gnupg/python-gnupg.mk index fda264a0edb..b51ac61892e 100644 --- a/package/python-gnupg/python-gnupg.mk +++ b/package/python-gnupg/python-gnupg.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_GNUPG_VERSION = 0.4.8 -PYTHON_GNUPG_SITE = https://files.pythonhosted.org/packages/b1/90/75e15ead9693028c05fc7abd25c756c0d1da27bf04a27d6f5c4139d8ee10 +PYTHON_GNUPG_VERSION = 0.5.0 +PYTHON_GNUPG_SITE = https://files.pythonhosted.org/packages/e3/5c/5ff9877001616912a74f4377cd5f80925b31a678087800beae5b28bdb80e PYTHON_GNUPG_LICENSE = BSD-3-Clause PYTHON_GNUPG_LICENSE_FILES = LICENSE.txt PYTHON_GNUPG_CPE_ID_VENDOR = python diff --git a/package/python-gobject/python-gobject.hash b/package/python-gobject/python-gobject.hash index 100a05c74e8..2fb9d38ab0f 100644 --- a/package/python-gobject/python-gobject.hash +++ b/package/python-gobject/python-gobject.hash @@ -1,3 +1,3 @@ -# from http://ftp.gnome.org/pub/GNOME/sources/pygobject/3.42/pygobject-3.42.0.sha256sum -sha256 9b12616e32cfc792f9dc841d9c472a41a35b85ba67d3a6eb427e307a6fe4367b pygobject-3.42.0.tar.xz +# 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 diff --git a/package/python-gobject/python-gobject.mk b/package/python-gobject/python-gobject.mk index b0a132d0409..a12ce5c107f 100644 --- a/package/python-gobject/python-gobject.mk +++ b/package/python-gobject/python-gobject.mk @@ -5,9 +5,9 @@ ################################################################################ PYTHON_GOBJECT_VERSION_MAJOR = 3.42 -PYTHON_GOBJECT_VERSION = $(PYTHON_GOBJECT_VERSION_MAJOR).0 +PYTHON_GOBJECT_VERSION = $(PYTHON_GOBJECT_VERSION_MAJOR).2 PYTHON_GOBJECT_SOURCE = pygobject-$(PYTHON_GOBJECT_VERSION).tar.xz -PYTHON_GOBJECT_SITE = https://ftp.gnome.org/pub/gnome/sources/pygobject/$(PYTHON_GOBJECT_VERSION_MAJOR) +PYTHON_GOBJECT_SITE = https://download.gnome.org/sources/pygobject/$(PYTHON_GOBJECT_VERSION_MAJOR) PYTHON_GOBJECT_LICENSE = LGPL-2.1+ PYTHON_GOBJECT_LICENSE_FILES = COPYING PYTHON_GOBJECT_INSTALL_STAGING = YES diff --git a/package/python-greenlet/Config.in b/package/python-greenlet/Config.in index c73eeb7b15f..ae092e3ffe8 100644 --- a/package/python-greenlet/Config.in +++ b/package/python-greenlet/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_PYTHON_GREENLET_ARCH_SUPPORTS bool default y if BR2_arm || BR2_armeb default y if BR2_aarch64 - default y if BR2_csky 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 @@ -13,7 +12,12 @@ config BR2_PACKAGE_PYTHON_GREENLET_ARCH_SUPPORTS config BR2_PACKAGE_PYTHON_GREENLET bool "python-greenlet" depends on BR2_PACKAGE_PYTHON_GREENLET_ARCH_SUPPORTS + depends on BR2_INSTALL_LIBSTDCPP help Lightweight in-process concurrent programming. https://github.com/python-greenlet/greenlet + +comment "python-greenlet needs a toolchain w/ C++" + depends on BR2_PACKAGE_PYTHON_GREENLET_ARCH_SUPPORTS + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-greenlet/python-greenlet.hash b/package/python-greenlet/python-greenlet.hash index c1870c886dd..f378436beb5 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 f424fbd9afeed575dd2ba5f0ac66e30b greenlet-1.1.2.tar.gz -sha256 e30f5ea4ae2346e62cedde8794a56858a67b878dd79f7df76a0767e356b1744a greenlet-1.1.2.tar.gz +md5 e6637d59015cba7e86f2111e6aa8168b greenlet-2.0.2.tar.gz +sha256 e7c8dc13af7db097bed64a051d2dd49e9f0af495c26995c00a9ee842690d34c0 greenlet-2.0.2.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 3b1ef7e314c..40f05f667e8 100644 --- a/package/python-greenlet/python-greenlet.mk +++ b/package/python-greenlet/python-greenlet.mk @@ -4,12 +4,13 @@ # ################################################################################ -PYTHON_GREENLET_VERSION = 1.1.2 +PYTHON_GREENLET_VERSION = 2.0.2 PYTHON_GREENLET_SOURCE = greenlet-$(PYTHON_GREENLET_VERSION).tar.gz -PYTHON_GREENLET_SITE = https://files.pythonhosted.org/packages/0c/10/754e21b5bea89d0e73f99d60c83754df7cc64db74f47d98ab187669ce341 +PYTHON_GREENLET_SITE = https://files.pythonhosted.org/packages/1e/1e/632e55a04d732c8184201238d911207682b119c35cecbb9a573a6c566731 PYTHON_GREENLET_SETUP_TYPE = setuptools PYTHON_GREENLET_LICENSE = MIT, PSF-2.0 PYTHON_GREENLET_LICENSE_FILES = LICENSE LICENSE.PSF +PYTHON_GREENLET_ENV = GREENLET_TEST_CPP=no $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python-h11/Config.in b/package/python-h11/Config.in new file mode 100644 index 00000000000..736620d782c --- /dev/null +++ b/package/python-h11/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_H11 + bool "python-h11" + help + A pure-Python, bring-your-own-I/O implementation of + HTTP/1.1. + + https://github.com/python-hyper/h11 diff --git a/package/python-h11/python-h11.hash b/package/python-h11/python-h11.hash new file mode 100644 index 00000000000..0c65a11d00b --- /dev/null +++ b/package/python-h11/python-h11.hash @@ -0,0 +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 +# Locally computed sha256 checksums +sha256 37db5bb85926db28a427a25867f10b1232003aea1be69ccb851138adb8e6f361 LICENSE.txt diff --git a/package/python-h11/python-h11.mk b/package/python-h11/python-h11.mk new file mode 100644 index 00000000000..d7dca5244b8 --- /dev/null +++ b/package/python-h11/python-h11.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-h11 +# +################################################################################ + +PYTHON_H11_VERSION = 0.14.0 +PYTHON_H11_SOURCE = h11-$(PYTHON_H11_VERSION).tar.gz +PYTHON_H11_SITE = https://files.pythonhosted.org/packages/f5/38/3af3d3633a34a3316095b39c8e8fb4853a28a536e55d347bd8d8e9a14b03 +PYTHON_H11_SETUP_TYPE = setuptools +PYTHON_H11_LICENSE = MIT +PYTHON_H11_LICENSE_FILES = LICENSE.txt + +$(eval $(python-package)) 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 new file mode 100644 index 00000000000..1b287072b7f --- /dev/null +++ b/package/python-hatch-fancy-pypi-readme/python-hatch-fancy-pypi-readme.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/hatch_fancy_pypi_readme/json +md5 588776ea8e3608714d4cbba16dffa92b hatch_fancy_pypi_readme-22.8.0.tar.gz +sha256 da91282ca09601c18aded8e378daf8b578c70214866f0971156ee9bb9ce6c26a hatch_fancy_pypi_readme-22.8.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 new file mode 100644 index 00000000000..f28721181a4 --- /dev/null +++ b/package/python-hatch-fancy-pypi-readme/python-hatch-fancy-pypi-readme.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-hatch-fancy-pypi-readme +# +################################################################################ + +PYTHON_HATCH_FANCY_PYPI_README_VERSION = 22.8.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/4e/ab/9b48589d6e3a2f72cc1e8f5221c28ff28fcdf116dbbd6e9beb946054212d +PYTHON_HATCH_FANCY_PYPI_README_LICENSE = MIT +PYTHON_HATCH_FANCY_PYPI_README_LICENSE_FILES = LICENSE.txt +PYTHON_HATCH_FANCY_PYPI_README_SETUP_TYPE = pep517 +HOST_PYTHON_HATCH_FANCY_PYPI_README_DEPENDENCIES = host-python-hatchling + +$(eval $(host-python-package)) diff --git a/package/python-hatch-vcs/python-hatch-vcs.hash b/package/python-hatch-vcs/python-hatch-vcs.hash new file mode 100644 index 00000000000..6e5fe1de135 --- /dev/null +++ b/package/python-hatch-vcs/python-hatch-vcs.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/hatch_vcs/json +md5 c2f2cbe6851b7b2969cb4aa24c4b9b2f hatch_vcs-0.3.0.tar.gz +sha256 cec5107cfce482c67f8bc96f18bbc320c9aa0d068180e14ad317bbee5a153fee hatch_vcs-0.3.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 new file mode 100644 index 00000000000..ef5f6541cd0 --- /dev/null +++ b/package/python-hatch-vcs/python-hatch-vcs.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# python-hatch-vcs +# +################################################################################ + +PYTHON_HATCH_VCS_VERSION = 0.3.0 +PYTHON_HATCH_VCS_SOURCE = hatch_vcs-$(PYTHON_HATCH_VCS_VERSION).tar.gz +PYTHON_HATCH_VCS_SITE = https://files.pythonhosted.org/packages/04/33/b68d68e532392d938472d16a03e4ce0ccd749ea31b42d18f8baa6547cbfd +PYTHON_HATCH_VCS_LICENSE = MIT +PYTHON_HATCH_VCS_LICENSE_FILES = LICENSE.txt +PYTHON_HATCH_VCS_SETUP_TYPE = pep517 +HOST_PYTHON_HATCH_VCS_DEPENDENCIES = \ + host-python-hatchling \ + host-python-setuptools-scm + +$(eval $(host-python-package)) diff --git a/package/python-hatchling/python-hatchling.hash b/package/python-hatchling/python-hatchling.hash new file mode 100644 index 00000000000..154c1fdcac2 --- /dev/null +++ b/package/python-hatchling/python-hatchling.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/hatchling/json +md5 5a6e2fd0c877feea7e71b9d72bbdbed9 hatchling-1.12.2.tar.gz +sha256 8a6d719d96653a0f3901072b12710c9c3cc934f9061b443775c6789b45333495 hatchling-1.12.2.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 new file mode 100644 index 00000000000..61aa1a6c23a --- /dev/null +++ b/package/python-hatchling/python-hatchling.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# python-hatchling +# +################################################################################ + +PYTHON_HATCHLING_VERSION = 1.12.2 +PYTHON_HATCHLING_SOURCE = hatchling-$(PYTHON_HATCHLING_VERSION).tar.gz +PYTHON_HATCHLING_SITE = https://files.pythonhosted.org/packages/f5/ea/3ed5a7ecdd8a8f7e84cffd3b5ec24279a09ce2694c218ff922c35c6f1a77 +PYTHON_HATCHLING_LICENSE = MIT +PYTHON_HATCHLING_LICENSE_FILES = LICENSE.txt +PYTHON_HATCHLING_SETUP_TYPE = pep517 +HOST_PYTHON_HATCHLING_DEPENDENCIES = \ + host-python-editables \ + host-python-packaging \ + host-python-pathspec \ + host-python-pluggy + +$(eval $(host-python-package)) diff --git a/package/python-hkdf/Config.in b/package/python-hkdf/Config.in new file mode 100644 index 00000000000..2add348ca21 --- /dev/null +++ b/package/python-hkdf/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_HKDF + bool "python-hkdf" + help + HMAC-based Extract-and-Expand Key Derivation Function + (HKDF). + + https://github.com/casebeer/python-hkdf diff --git a/package/python-hkdf/python-hkdf.hash b/package/python-hkdf/python-hkdf.hash new file mode 100644 index 00000000000..87702b4582d --- /dev/null +++ b/package/python-hkdf/python-hkdf.hash @@ -0,0 +1,3 @@ +# md5, sha256 from https://pypi.org/pypi/hkdf/json +md5 d10471ad0ec891cdbe165d78282c943e hkdf-0.0.3.tar.gz +sha256 622a31c634bc185581530a4b44ffb731ed208acf4614f9c795bdd70e77991dca hkdf-0.0.3.tar.gz diff --git a/package/python-hkdf/python-hkdf.mk b/package/python-hkdf/python-hkdf.mk new file mode 100644 index 00000000000..8b68c5cc9ff --- /dev/null +++ b/package/python-hkdf/python-hkdf.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# python-hkdf +# +################################################################################ + +PYTHON_HKDF_VERSION = 0.0.3 +PYTHON_HKDF_SOURCE = hkdf-$(PYTHON_HKDF_VERSION).tar.gz +PYTHON_HKDF_SITE = https://files.pythonhosted.org/packages/c3/be/327e072850db181ce56afd51e26ec7aa5659b18466c709fa5ea2548c935f +PYTHON_HKDF_SETUP_TYPE = setuptools +# No license file in the tree, but +# https://github.com/casebeer/python-hkdf/blob/master/LICENSE shows +# it's BSD-2-Clause. Issue already reported upstream: +# https://github.com/casebeer/python-hkdf/issues/6 +PYTHON_HKDF_LICENSE = BSD-2-Clause + +$(eval $(python-package)) diff --git a/package/python-httplib2/python-httplib2.hash b/package/python-httplib2/python-httplib2.hash index 2c5914c5f6c..4da8f26e430 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 de7f5e3a4adb3105889867327bdd39dc httplib2-0.19.1.tar.gz -sha256 0b12617eeca7433d4c396a100eaecfa4b08ee99aa881e6df6e257a7aad5d533d httplib2-0.19.1.tar.gz +md5 b42f508585d988e77eac3980db1fd967 httplib2-0.21.0.tar.gz +sha256 fc144f091c7286b82bec71bdbd9b27323ba709cc612568d3000893bfd9cb4b34 httplib2-0.21.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 a259c33c73c..1093ecab39c 100644 --- a/package/python-httplib2/python-httplib2.mk +++ b/package/python-httplib2/python-httplib2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_HTTPLIB2_VERSION = 0.19.1 +PYTHON_HTTPLIB2_VERSION = 0.21.0 PYTHON_HTTPLIB2_SOURCE = httplib2-$(PYTHON_HTTPLIB2_VERSION).tar.gz -PYTHON_HTTPLIB2_SITE = https://files.pythonhosted.org/packages/ed/cd/533a1e9e04671bcee5d2854b4f651a3fab9586d698de769d93b05ee2bff1 +PYTHON_HTTPLIB2_SITE = https://files.pythonhosted.org/packages/c2/37/a093aaa902f6b2301f0f2cff5285548dbc4ab9b9a29215eb440381cbb32b PYTHON_HTTPLIB2_SETUP_TYPE = setuptools PYTHON_HTTPLIB2_LICENSE = MIT PYTHON_HTTPLIB2_LICENSE_FILES = LICENSE diff --git a/package/python-huepy/0001-fix-import-with-python3.patch b/package/python-huepy/0001-fix-import-with-python3.patch deleted file mode 100644 index e04eacb2285..00000000000 --- a/package/python-huepy/0001-fix-import-with-python3.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/huepy/__init__.py -+++ b/huepy/__init__.py -@@ -1,4 +1,4 @@ --from hue import COMMANDS -+from .hue import COMMANDS - - __all__ = list(COMMANDS.keys()) - __version__ = '1.0.1' diff --git a/package/python-huepy/python-huepy.hash b/package/python-huepy/python-huepy.hash index 5a1a8fc1e3c..74b02864d30 100644 --- a/package/python-huepy/python-huepy.hash +++ b/package/python-huepy/python-huepy.hash @@ -1,4 +1,5 @@ -# Locally computer sha256 checksums -md5 da6514d9d61fb75ac9470f6863ce1aca python-huepy-a9851d5aea10d2299cc62b3f6dce26ac4ef2ea3e.tar.gz -sha256 63147cef5ecae5c1ab38000be91def351710e6bef2c5f67b5303418becf6c0f2 python-huepy-a9851d5aea10d2299cc62b3f6dce26ac4ef2ea3e.tar.gz +# md5, sha256 from https://pypi.org/pypi/huepy/json +md5 394a1072bec18c27097b053c40ddf0ea huepy-1.2.1.tar.gz +sha256 5b29beef797312fb7606188bc5cd98f78ab8f7e01576427a9312f1c9b20b759d huepy-1.2.1.tar.gz +# Locally computed sha256 checksums sha256 8b1ba204bb69a0ade2bfcf65ef294a920f6bb361b317dba43c7ef29d96332b9b LICENSE diff --git a/package/python-huepy/python-huepy.mk b/package/python-huepy/python-huepy.mk index 5c1041205db..cca3c3429e0 100644 --- a/package/python-huepy/python-huepy.mk +++ b/package/python-huepy/python-huepy.mk @@ -4,8 +4,9 @@ # ################################################################################ -PYTHON_HUEPY_VERSION = a9851d5aea10d2299cc62b3f6dce26ac4ef2ea3e -PYTHON_HUEPY_SITE = $(call github,s0md3v,hue,$(PYTHON_HUEPY_VERSION)) +PYTHON_HUEPY_VERSION = 1.2.1 +PYTHON_HUEPY_SOURCE = huepy-$(PYTHON_HUEPY_VERSION).tar.gz +PYTHON_HUEPY_SITE = https://files.pythonhosted.org/packages/d6/4e/2dae447d8858a31158ca6c313f5d1902bc83b8542bb5f10c0307de2973bc PYTHON_HUEPY_LICENSE = GPL-3.0 PYTHON_HUEPY_LICENSE_FILES = LICENSE PYTHON_HUEPY_SETUP_TYPE = setuptools diff --git a/package/python-humanize/python-humanize.hash b/package/python-humanize/python-humanize.hash index 9b2559ab117..871bb9bfa57 100644 --- a/package/python-humanize/python-humanize.hash +++ b/package/python-humanize/python-humanize.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/humanize/json -md5 04f5b334283e1f7f0dfeccf7d5a4b880 humanize-3.11.0.tar.gz -sha256 4160cdc63fcd0daac27d2e1e218a31bb396fc3fe5712d153675d89432a03778f humanize-3.11.0.tar.gz +md5 5e90552713107f756788ecdd8fbe341d humanize-4.4.0.tar.gz +sha256 efb2584565cc86b7ea87a977a15066de34cdedaf341b11c851cfcfd2b964779c humanize-4.4.0.tar.gz # Locally computed sha256 checksums sha256 8ba6c18112a431400ad3c743f70670079b302545d98884fc2f28a91c383a0380 LICENCE diff --git a/package/python-humanize/python-humanize.mk b/package/python-humanize/python-humanize.mk index ea5454d6cc5..04cb0713fc5 100644 --- a/package/python-humanize/python-humanize.mk +++ b/package/python-humanize/python-humanize.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_HUMANIZE_VERSION = 3.11.0 +PYTHON_HUMANIZE_VERSION = 4.4.0 PYTHON_HUMANIZE_SOURCE = humanize-$(PYTHON_HUMANIZE_VERSION).tar.gz -PYTHON_HUMANIZE_SITE = https://files.pythonhosted.org/packages/a6/d0/e06993724937f2aab3e7085d137d453968aaac0f74661ef9c90528a79d61 +PYTHON_HUMANIZE_SITE = https://files.pythonhosted.org/packages/51/19/3e1adf0e7a8c8361496b085edcab2ddcd85410735a2b6fdd044247fc5b75 PYTHON_HUMANIZE_SETUP_TYPE = setuptools PYTHON_HUMANIZE_LICENSE = MIT PYTHON_HUMANIZE_LICENSE_FILES = LICENCE diff --git a/package/python-ibmiotf/python-ibmiotf.hash b/package/python-ibmiotf/python-ibmiotf.hash index 6b60aa52793..9ed99c4f9d9 100644 --- a/package/python-ibmiotf/python-ibmiotf.hash +++ b/package/python-ibmiotf/python-ibmiotf.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/ibmiotf/json -md5 a103427c15b2bc96d72de5e58975638c ibmiotf-0.4.0.tar.gz -sha256 753a29858d48ebd89aff8b73c207028814714d8a004a3c19b436c9bbeaa65ce6 ibmiotf-0.4.0.tar.gz +md5 a103427c15b2bc96d72de5e58975638c ibmiotf-0.4.0.tar.gz +sha256 753a29858d48ebd89aff8b73c207028814714d8a004a3c19b436c9bbeaa65ce6 ibmiotf-0.4.0.tar.gz # Locally computed sha256 checksums -sha256 2c153c48f67e56031036fc28d12f76238a5151494bdfc24b6b81ec734c387a2d LICENSE +sha256 2c153c48f67e56031036fc28d12f76238a5151494bdfc24b6b81ec734c387a2d LICENSE diff --git a/package/python-idna/python-idna.hash b/package/python-idna/python-idna.hash index 27c42c8b593..3a758a6eac1 100644 --- a/package/python-idna/python-idna.hash +++ b/package/python-idna/python-idna.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/idna/json -md5 5856306eac5f25db8249e37a4c6ee3e7 idna-3.3.tar.gz -sha256 9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d idna-3.3.tar.gz +md5 13ea24e076212b6baae1135a116d1e0e idna-3.4.tar.gz +sha256 814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4 idna-3.4.tar.gz # Locally computed sha256 checksums sha256 a2d6e4d940bd24dbe7b9645cde19a9792cc51db7ae0d5acd301ac860caa3e836 LICENSE.md diff --git a/package/python-idna/python-idna.mk b/package/python-idna/python-idna.mk index 6f416156d01..3976cb1518a 100644 --- a/package/python-idna/python-idna.mk +++ b/package/python-idna/python-idna.mk @@ -4,12 +4,12 @@ # ################################################################################ -PYTHON_IDNA_VERSION = 3.3 +PYTHON_IDNA_VERSION = 3.4 PYTHON_IDNA_SOURCE = idna-$(PYTHON_IDNA_VERSION).tar.gz -PYTHON_IDNA_SITE = https://files.pythonhosted.org/packages/62/08/e3fc7c8161090f742f504f40b1bccbfc544d4a4e09eb774bf40aafce5436 +PYTHON_IDNA_SITE = https://files.pythonhosted.org/packages/8b/e1/43beb3d38dba6cb420cefa297822eac205a277ab43e5ba5d5c46faf96438 PYTHON_IDNA_LICENSE = BSD-3-Clause PYTHON_IDNA_LICENSE_FILES = LICENSE.md -PYTHON_IDNA_SETUP_TYPE = setuptools +PYTHON_IDNA_SETUP_TYPE = flit $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python-ifaddr/python-ifaddr.hash b/package/python-ifaddr/python-ifaddr.hash index 57b155caa58..e3c2b13b695 100644 --- a/package/python-ifaddr/python-ifaddr.hash +++ b/package/python-ifaddr/python-ifaddr.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/ifaddr/json -md5 97c4eb7505643b5f1fe17733cb42abd9 ifaddr-0.1.7.tar.gz -sha256 1f9e8a6ca6f16db5a37d3356f07b6e52344f6f9f7e806d618537731669eb1a94 ifaddr-0.1.7.tar.gz +md5 b1cac02b5dc354d68dd6d853bc9565a7 ifaddr-0.2.0.tar.gz +sha256 cc0cbfcaabf765d44595825fb96a99bb12c79716b73b44330ea38ee2b0c4aed4 ifaddr-0.2.0.tar.gz # Locally computed sha256 checksums sha256 8700856576ae2bc80c63bc970250510d9213fb02fed006d5f22742c9ddde24d7 LICENSE.txt diff --git a/package/python-ifaddr/python-ifaddr.mk b/package/python-ifaddr/python-ifaddr.mk index f1154d9de8f..9b7d50d825b 100644 --- a/package/python-ifaddr/python-ifaddr.mk +++ b/package/python-ifaddr/python-ifaddr.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_IFADDR_VERSION = 0.1.7 +PYTHON_IFADDR_VERSION = 0.2.0 PYTHON_IFADDR_SOURCE = ifaddr-$(PYTHON_IFADDR_VERSION).tar.gz -PYTHON_IFADDR_SITE = https://files.pythonhosted.org/packages/3d/fc/4ce147e3997cd0ea470ad27112087545cf83bf85015ddb3054673cb471bb +PYTHON_IFADDR_SITE = https://files.pythonhosted.org/packages/e8/ac/fb4c578f4a3256561548cd825646680edcadb9440f3f68add95ade1eb791 PYTHON_IFADDR_SETUP_TYPE = setuptools PYTHON_IFADDR_LICENSE = MIT PYTHON_IFADDR_LICENSE_FILES = LICENSE.txt diff --git a/package/python-incremental/python-incremental.hash b/package/python-incremental/python-incremental.hash index 47af832f398..456e8ca16d1 100644 --- a/package/python-incremental/python-incremental.hash +++ b/package/python-incremental/python-incremental.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/incremental/json -md5 9f7ad12e0c05a12cee52a7350976c4e3 incremental-21.3.0.tar.gz -sha256 02f5de5aff48f6b9f665d99d48bfc7ec03b6e3943210de7cfc88856d755d6f57 incremental-21.3.0.tar.gz +md5 9fffa2490ca649550c79a78e85ef2eef incremental-22.10.0.tar.gz +sha256 912feeb5e0f7e0188e6f42241d2f450002e11bbc0937c65865045854c24c0bd0 incremental-22.10.0.tar.gz # Locally computed sha256 checksums sha256 d043bc8899b4695de1f4511d8f507b927e11723b981ce600fa3ef7b73954afa5 LICENSE diff --git a/package/python-incremental/python-incremental.mk b/package/python-incremental/python-incremental.mk index 7c6b2a547c9..4b032d26490 100644 --- a/package/python-incremental/python-incremental.mk +++ b/package/python-incremental/python-incremental.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_INCREMENTAL_VERSION = 21.3.0 +PYTHON_INCREMENTAL_VERSION = 22.10.0 PYTHON_INCREMENTAL_SOURCE = incremental-$(PYTHON_INCREMENTAL_VERSION).tar.gz -PYTHON_INCREMENTAL_SITE = https://files.pythonhosted.org/packages/4f/c5/430765c697afc217c8491785de321a21fa4d983dda14bcd82feb965b0593 +PYTHON_INCREMENTAL_SITE = https://files.pythonhosted.org/packages/86/42/9e87f04fa2cd40e3016f27a4b4572290e95899c6dce317e2cdb580f3ff09 PYTHON_INCREMENTAL_SETUP_TYPE = setuptools PYTHON_INCREMENTAL_LICENSE = MIT PYTHON_INCREMENTAL_LICENSE_FILES = LICENSE diff --git a/package/python-influxdb/python-influxdb.hash b/package/python-influxdb/python-influxdb.hash index 7b43091eca9..e86bd8c2ca3 100644 --- a/package/python-influxdb/python-influxdb.hash +++ b/package/python-influxdb/python-influxdb.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/influxdb/json -md5 d528c8ccd8ab40bc608ad1e507e7788a influxdb-5.3.0.tar.gz -sha256 9bcaafd57ac152b9824ab12ed19f204206ef5df8af68404770554c5b55b475f6 influxdb-5.3.0.tar.gz +md5 e5888a7023e9a49d8a372538b625f908 influxdb-5.3.1.tar.gz +sha256 46f85e7b04ee4b3dee894672be6a295c94709003a7ddea8820deec2ac4d8b27a influxdb-5.3.1.tar.gz # Locally computed sha256 checksums sha256 b654917e2c25a69d2bd56e72dddbc6eb29bf7e40384d7c46bb291d5c5185213b LICENSE diff --git a/package/python-influxdb/python-influxdb.mk b/package/python-influxdb/python-influxdb.mk index e5b1aea70fe..d77cb89d2de 100644 --- a/package/python-influxdb/python-influxdb.mk +++ b/package/python-influxdb/python-influxdb.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_INFLUXDB_VERSION = 5.3.0 +PYTHON_INFLUXDB_VERSION = 5.3.1 PYTHON_INFLUXDB_SOURCE = influxdb-$(PYTHON_INFLUXDB_VERSION).tar.gz -PYTHON_INFLUXDB_SITE = https://files.pythonhosted.org/packages/be/8d/85ec8f11299a6dfc115244db71fd8f13e9a69f5e9eb77dc3392f4f959e9a +PYTHON_INFLUXDB_SITE = https://files.pythonhosted.org/packages/86/4f/a9c524576677c1694b149e09d4fd6342e4a1d9a5f409e437168a14d6d150 PYTHON_INFLUXDB_SETUP_TYPE = setuptools PYTHON_INFLUXDB_LICENSE = MIT PYTHON_INFLUXDB_LICENSE_FILES = LICENSE diff --git a/package/python-iniconfig/python-iniconfig.hash b/package/python-iniconfig/python-iniconfig.hash index b2469db99b3..541ae3e3f33 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 0b7f3be87481211c183eae095bcea6f1 iniconfig-1.1.1.tar.gz -sha256 bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32 iniconfig-1.1.1.tar.gz +md5 3c030b3f51dcc3aca585de05635600e4 iniconfig-2.0.0.tar.gz +sha256 2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3 iniconfig-2.0.0.tar.gz # Locally computed sha256 checksums sha256 2af680c39ef493fb82830356d1d3df1acb5a06033cba2dec7a19e21caa77a866 LICENSE diff --git a/package/python-iniconfig/python-iniconfig.mk b/package/python-iniconfig/python-iniconfig.mk index 5c31c699572..99e946f0ab5 100644 --- a/package/python-iniconfig/python-iniconfig.mk +++ b/package/python-iniconfig/python-iniconfig.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_INICONFIG_VERSION = 1.1.1 +PYTHON_INICONFIG_VERSION = 2.0.0 PYTHON_INICONFIG_SOURCE = iniconfig-$(PYTHON_INICONFIG_VERSION).tar.gz -PYTHON_INICONFIG_SITE = https://files.pythonhosted.org/packages/23/a2/97899f6bd0e873fed3a7e67ae8d3a08b21799430fb4da15cfedf10d6e2c2 -PYTHON_INICONFIG_SETUP_TYPE = setuptools +PYTHON_INICONFIG_SITE = https://files.pythonhosted.org/packages/d7/4b/cbd8e699e64a6f16ca3a8220661b5f83792b3017d0f79807cb8708d33913 +PYTHON_INICONFIG_SETUP_TYPE = pep517 PYTHON_INICONFIG_LICENSE = MIT PYTHON_INICONFIG_LICENSE_FILES = LICENSE +PYTHON_INICONFIG_DEPENDENCIES = host-python-hatchling host-python-hatch-vcs $(eval $(python-package)) diff --git a/package/python-iniparse/Config.in.host b/package/python-iniparse/Config.in.host new file mode 100644 index 00000000000..e93022e8153 --- /dev/null +++ b/package/python-iniparse/Config.in.host @@ -0,0 +1,11 @@ +config BR2_PACKAGE_HOST_PYTHON_INIPARSE + bool "host python-iniparse" + select BR2_PACKAGE_HOST_PYTHON_SIX # runtime + help + iniparse is an INI parser for Python which is API compatible + with the standard library's ConfigParser, preserves + structure of INI files (order of sections & options, + indentation, comments, and blank lines are preserved when + data is updated), and is more convenient to use. + + https://pypi.python.org/pypi/iniparse diff --git a/package/python-iniparse/python-iniparse.hash b/package/python-iniparse/python-iniparse.hash index 238d41e06dd..afcfcd2ffbf 100644 --- a/package/python-iniparse/python-iniparse.hash +++ b/package/python-iniparse/python-iniparse.hash @@ -1,5 +1,5 @@ # From https://pypi.org/project/iniparse/#copy-hash-modal-5fdd923b-0592-4d2d-8b49-03472f948290 -md5 2054bab923df21107652d009f2373789 iniparse-0.5.tar.gz +md5 2054bab923df21107652d009f2373789 iniparse-0.5.tar.gz sha256 932e5239d526e7acb504017bb707be67019ac428a6932368e6851691093aa842 iniparse-0.5.tar.gz # sha256 locally computed diff --git a/package/python-iniparse/python-iniparse.mk b/package/python-iniparse/python-iniparse.mk index d31a490bd89..9f00cf73875 100644 --- a/package/python-iniparse/python-iniparse.mk +++ b/package/python-iniparse/python-iniparse.mk @@ -10,5 +10,9 @@ PYTHON_INIPARSE_SITE = https://pypi.python.org/packages/source/i/iniparse PYTHON_INIPARSE_LICENSE = Python-2.0, MIT PYTHON_INIPARSE_LICENSE_FILES = LICENSE-PSF LICENSE PYTHON_INIPARSE_SETUP_TYPE = setuptools +# This is a runtime dependency, but we don't have the concept of +# runtime dependencies for host packages. +HOST_PYTHON_INIPARSE_DEPENDENCIES = host-python-six $(eval $(python-package)) +$(eval $(host-python-package)) diff --git a/package/python-installer/python-installer.hash b/package/python-installer/python-installer.hash index 68af457664b..97d455b87c6 100644 --- a/package/python-installer/python-installer.hash +++ b/package/python-installer/python-installer.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/installer/json -md5 cf7b8f470620c54f2d28167fc80542a7 installer-0.4.0.tar.gz -sha256 17d7ca174039fbd85f268e16042e3132ebb03d91e1bbe0f63b9ec6b40619414a installer-0.4.0.tar.gz +md5 ac5fee994b04f228c151306f5ad96b04 installer-0.6.0.tar.gz +sha256 f3bd36cd261b440a88a1190b1becca0578fee90b4b62decc796932fdd5ae8839 installer-0.6.0.tar.gz # Locally computed sha256 checksums sha256 37b8b9f2569892fa54406383d431169dbb2115980d78b7efba6eeae5664c484f LICENSE diff --git a/package/python-installer/python-installer.mk b/package/python-installer/python-installer.mk index 82739a80032..3430e46b511 100644 --- a/package/python-installer/python-installer.mk +++ b/package/python-installer/python-installer.mk @@ -4,11 +4,13 @@ # ################################################################################ -PYTHON_INSTALLER_VERSION = 0.4.0 +PYTHON_INSTALLER_VERSION = 0.6.0 PYTHON_INSTALLER_SOURCE = installer-$(PYTHON_INSTALLER_VERSION).tar.gz -PYTHON_INSTALLER_SITE = https://files.pythonhosted.org/packages/71/9a/8d7c724b0d51336453e75f76b32de86b336ef26755c64119204f1f5b4388 +PYTHON_INSTALLER_SITE = https://files.pythonhosted.org/packages/c9/ab/a9141dc175ec7b620fffe7e0295251a7b6a0ffb4325d64aeb128dff8c698 PYTHON_INSTALLER_LICENSE = MIT PYTHON_INSTALLER_LICENSE_FILES = LICENSE -PYTHON_INSTALLER_SETUP_TYPE = distutils +PYTHON_INSTALLER_SETUP_TYPE = flit-bootstrap +HOST_PYTHON_INSTALLER_DEPENDENCIES = host-python-flit-core +HOST_PYTHON_INSTALLER_ENV = PYTHONPATH="$(@D)/src" $(eval $(host-python-package)) diff --git a/package/python-iowait/python-iowait.hash b/package/python-iowait/python-iowait.hash index fcaf8cc564a..fc10e180f35 100644 --- a/package/python-iowait/python-iowait.hash +++ b/package/python-iowait/python-iowait.hash @@ -1,4 +1,4 @@ # md5 from https://pypi.python.org/pypi/iowait/json, sha256 locally computed -md5 f49ca7766fe4a67e03a731e575614f87 iowait-0.2.tar.gz -sha256 ab1bc2eb84c22ccf61f17a0024f9fb6df781b39f1852764a66a7769d5adfb299 iowait-0.2.tar.gz +md5 f49ca7766fe4a67e03a731e575614f87 iowait-0.2.tar.gz +sha256 ab1bc2eb84c22ccf61f17a0024f9fb6df781b39f1852764a66a7769d5adfb299 iowait-0.2.tar.gz sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING.LESSER diff --git a/package/python-ipdb/Config.in b/package/python-ipdb/Config.in index a9d6af16845..9259421c6a4 100644 --- a/package/python-ipdb/Config.in +++ b/package/python-ipdb/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_IPDB bool "python-ipdb" - select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime select BR2_PACKAGE_PYTHON_IPYTHON # runtime help IPython-enabled pdb. diff --git a/package/python-ipdb/python-ipdb.hash b/package/python-ipdb/python-ipdb.hash index 7d483e1777a..1e8a45fbd61 100644 --- a/package/python-ipdb/python-ipdb.hash +++ b/package/python-ipdb/python-ipdb.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/ipdb/json -md5 4f5ffb71cd6551319acf8cbceabd8936 ipdb-0.13.9.tar.gz -sha256 951bd9a64731c444fd907a5ce268543020086a697f6be08f7cc2c9a752a278c5 ipdb-0.13.9.tar.gz +md5 e624221cbc9261f68f412b748179d5e2 ipdb-0.13.11.tar.gz +sha256 c23b6736f01fd4586cc2ecbebdf79a5eb454796853e1cd8f2ed3b7b91d4a3e93 ipdb-0.13.11.tar.gz # Locally computed sha256 checksums sha256 4eeb49de04f4894f8ea1f69a04f500799041b750b3d554c06de5ca877258e734 COPYING.txt diff --git a/package/python-ipdb/python-ipdb.mk b/package/python-ipdb/python-ipdb.mk index 7828f83020f..151a3d45a46 100644 --- a/package/python-ipdb/python-ipdb.mk +++ b/package/python-ipdb/python-ipdb.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_IPDB_VERSION = 0.13.9 +PYTHON_IPDB_VERSION = 0.13.11 PYTHON_IPDB_SOURCE = ipdb-$(PYTHON_IPDB_VERSION).tar.gz -PYTHON_IPDB_SITE = https://files.pythonhosted.org/packages/fc/56/9f67dcd4a4b9960373173a31be1b8c47fe351a1c9385677a7bdd82810e57 +PYTHON_IPDB_SITE = https://files.pythonhosted.org/packages/23/b2/c972cc266b0ba8508b42dab7f5dea1be03ea32213258441bf1b00baca555 PYTHON_IPDB_SETUP_TYPE = setuptools PYTHON_IPDB_LICENSE = BSD-3-Clause PYTHON_IPDB_LICENSE_FILES = COPYING.txt diff --git a/package/python-iptables/python-iptables.mk b/package/python-iptables/python-iptables.mk index 0ccf064217d..9cb4285ec34 100644 --- a/package/python-iptables/python-iptables.mk +++ b/package/python-iptables/python-iptables.mk @@ -15,6 +15,7 @@ define PYTHON_IPTABLES_SET_XTABLES_ENV_VARS XTABLES_VERSION=`awk '/XTABLES_VERSION_CODE/ {print $$NF}' $(STAGING_DIR)/usr/include/xtables-version.h`; \ sed -i "s%os.getenv(\"PYTHON_IPTABLES_XTABLES_VERSION\")%$$XTABLES_VERSION%" $(@D)/iptc/xtables.py sed -i "s%os.getenv(\"XTABLES_LIBDIR\")%\"/usr/lib/xtables\"%" $(@D)/iptc/xtables.py + sed -i "s%os.environ.get('IPTABLES_LIBDIR', None)%\"/usr/lib\"%" $(@D)/iptc/util.py endef PYTHON_IPTABLES_PRE_BUILD_HOOKS += PYTHON_IPTABLES_SET_XTABLES_ENV_VARS diff --git a/package/python-ipython-genutils/python-ipython-genutils.hash b/package/python-ipython-genutils/python-ipython-genutils.hash index 579cc764232..fd719c93a0b 100644 --- a/package/python-ipython-genutils/python-ipython-genutils.hash +++ b/package/python-ipython-genutils/python-ipython-genutils.hash @@ -1,5 +1,5 @@ # md5 from https://pypi.python.org/pypi/ipython_genutils/json -md5 5a4f9781f78466da0ea1a648f3e1f79f ipython_genutils-0.2.0.tar.gz +md5 5a4f9781f78466da0ea1a648f3e1f79f ipython_genutils-0.2.0.tar.gz # Locally computed sha256 eb2e116e75ecef9d4d228fdc66af54269afa26ab4463042e33785b887c628ba8 ipython_genutils-0.2.0.tar.gz sha256 f09da6c0f4971485f6fbd6c630d0d6cdd012bfe128b2ebbd014de2f6c7c7e2a6 COPYING.md diff --git a/package/python-ipython/0001-set-correct-python-executable-path.patch b/package/python-ipython/0001-set-correct-python-executable-path.patch deleted file mode 100644 index 0fbd5a1c8e1..00000000000 --- a/package/python-ipython/0001-set-correct-python-executable-path.patch +++ /dev/null @@ -1,15 +0,0 @@ -Set correct Python executable path - -Signed-off-by: Philippe Proulx - ---- python-ipython-2.1.0/setupbase.py 2014-05-21 15:19:12.000000000 -0400 -+++ python-ipython-2.1.0-new/setupbase.py 2014-07-23 23:34:32.892030423 -0400 -@@ -394,7 +394,7 @@ class build_scripts_entrypt(build_script - - mod, func = entrypt.split(':') - with open(outfile, 'w') as f: -- f.write(script_src.format(executable=sys.executable, -+ f.write(script_src.format(executable='/usr/bin/env python', - mod=mod, func=func)) - - return outfiles, outfiles diff --git a/package/python-ipython/Config.in b/package/python-ipython/Config.in index 3de49ae5742..c217efcfd1e 100644 --- a/package/python-ipython/Config.in +++ b/package/python-ipython/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_IPYTHON bool "python-ipython" + select BR2_PACKAGE_PYTHON3_SQLITE # runtime select BR2_PACKAGE_PYTHON_BACKCALL # runtime select BR2_PACKAGE_PYTHON_DECORATOR # runtime select BR2_PACKAGE_PYTHON_JEDI # runtime @@ -7,6 +8,7 @@ config BR2_PACKAGE_PYTHON_IPYTHON select BR2_PACKAGE_PYTHON_PROMPT_TOOLKIT # runtime select BR2_PACKAGE_PYTHON_PYGMENTS # runtime select BR2_PACKAGE_PYTHON_PEXPECT # runtime + select BR2_PACKAGE_PYTHON_STACK_DATA # runtime select BR2_PACKAGE_PYTHON_TRAITLETS # runtime help IPython is a command shell for interactive computing in diff --git a/package/python-ipython/python-ipython.hash b/package/python-ipython/python-ipython.hash index cd18c3d1256..f11ad1e18c5 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 6907b67691ba697173a3befb2c35f7ac ipython-7.31.1.tar.gz -sha256 b5548ec5329a4bcf054a5deed5099b0f9622eb9ea51aaa7104d215fece201d8c ipython-7.31.1.tar.gz +md5 a1ea9b6e43c5568e5031974eb3a6acb0 ipython-8.8.0.tar.gz +sha256 f3bf2c08505ad2c3f4ed5c46ae0331a8547d36bf4b21a451e8ae80c0791db95b ipython-8.8.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 389ebfa8974..aa274314eb9 100644 --- a/package/python-ipython/python-ipython.mk +++ b/package/python-ipython/python-ipython.mk @@ -4,13 +4,15 @@ # ################################################################################ -PYTHON_IPYTHON_VERSION = 7.31.1 +PYTHON_IPYTHON_VERSION = 8.8.0 PYTHON_IPYTHON_SOURCE = ipython-$(PYTHON_IPYTHON_VERSION).tar.gz -PYTHON_IPYTHON_SITE = https://files.pythonhosted.org/packages/fb/39/c1947dc1bb993a35469ca474535cb3214c91f5f9a7752a1fcbd9b6b37dde +PYTHON_IPYTHON_SITE = https://files.pythonhosted.org/packages/f5/39/89664d8c3e4dfb0a73862cbbff8eb4028a1e3d4305da80ab0a493848ed9b PYTHON_IPYTHON_LICENSE = BSD-3-Clause PYTHON_IPYTHON_LICENSE_FILES = COPYING.rst LICENSE PYTHON_IPYTHON_CPE_ID_VENDOR = ipython PYTHON_IPYTHON_CPE_ID_PRODUCT = ipython -PYTHON_IPYTHON_SETUP_TYPE = distutils +# Affects only Windows. Can be dropped once we update to >= 8.10.0 +PYTHON_IPYTHON_IGNORE_CVES += CVE-2023-24816 +PYTHON_IPYTHON_SETUP_TYPE = setuptools $(eval $(python-package)) diff --git a/package/python-iso8601/python-iso8601.hash b/package/python-iso8601/python-iso8601.hash index 76dd5ec4526..7c6d3f3ded0 100644 --- a/package/python-iso8601/python-iso8601.hash +++ b/package/python-iso8601/python-iso8601.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/iso8601/json -md5 d6fe8ccc847aaf8ac965da3b6023e697 iso8601-0.1.14.tar.gz -sha256 8aafd56fa0290496c5edbb13c311f78fa3a241f0853540da09d9363eae3ebd79 iso8601-0.1.14.tar.gz +md5 29dd454d638bd684bd3466583f6724dc iso8601-1.1.0.tar.gz +sha256 32811e7b81deee2063ea6d2e94f8819a86d1f3811e49d23623a41fa832bef03f iso8601-1.1.0.tar.gz # Locally computed sha256 checksums -sha256 116d368d14a8cf0061027c944c60ee20b476ce42814818a7d627396906761f16 LICENSE +sha256 516b02cd11e78c37a04f9effadd85af0483dda7ab1e715eef1cc94f97dc49e13 LICENSE diff --git a/package/python-iso8601/python-iso8601.mk b/package/python-iso8601/python-iso8601.mk index 3f128d15e44..68bf69933a6 100644 --- a/package/python-iso8601/python-iso8601.mk +++ b/package/python-iso8601/python-iso8601.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ISO8601_VERSION = 0.1.14 +PYTHON_ISO8601_VERSION = 1.1.0 PYTHON_ISO8601_SOURCE = iso8601-$(PYTHON_ISO8601_VERSION).tar.gz -PYTHON_ISO8601_SITE = https://files.pythonhosted.org/packages/f9/ed/b97abc7877e5b253eef96a469f47d617b0ebcccc735405fa1a620c7ee833 +PYTHON_ISO8601_SITE = https://files.pythonhosted.org/packages/31/8c/1c342fdd2f4af0857684d16af766201393ef53318c15fa785fcb6c3b7c32 PYTHON_ISO8601_SETUP_TYPE = setuptools PYTHON_ISO8601_LICENSE = MIT PYTHON_ISO8601_LICENSE_FILES = LICENSE diff --git a/package/python-itsdangerous/python-itsdangerous.hash b/package/python-itsdangerous/python-itsdangerous.hash index dad4ec0800e..071544e5bd9 100644 --- a/package/python-itsdangerous/python-itsdangerous.hash +++ b/package/python-itsdangerous/python-itsdangerous.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/itsdangerous/json -md5 996b9763d1b4bd0edd6eb86f0a490629 itsdangerous-2.0.1.tar.gz -sha256 9e724d68fc22902a1435351f84c3fb8623f303fffcc566a4cb952df8c572cff0 itsdangerous-2.0.1.tar.gz +md5 c1bc730ddf53b8374eaa823f24eb6438 itsdangerous-2.1.2.tar.gz +sha256 5dbbc68b317e5e42f327f9021763545dc3fc3bfe22e6deb96aaf1fc38874156a itsdangerous-2.1.2.tar.gz # Locally computed sha256 checksums sha256 63af09891b6be8ad1a4252ed43af0f4efba7fc948e228367bed7f3c5ae0b09d7 LICENSE.rst sha256 c9362a7258a11c84a8f7e825ccbbb5c425c6fc02368d3aee6494533fb99ba1f4 docs/license.rst diff --git a/package/python-itsdangerous/python-itsdangerous.mk b/package/python-itsdangerous/python-itsdangerous.mk index c53bc6b9ba1..d7a1344e0ad 100644 --- a/package/python-itsdangerous/python-itsdangerous.mk +++ b/package/python-itsdangerous/python-itsdangerous.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ITSDANGEROUS_VERSION = 2.0.1 +PYTHON_ITSDANGEROUS_VERSION = 2.1.2 PYTHON_ITSDANGEROUS_SOURCE = itsdangerous-$(PYTHON_ITSDANGEROUS_VERSION).tar.gz -PYTHON_ITSDANGEROUS_SITE = https://files.pythonhosted.org/packages/58/66/d6c5859dcac92b442626427a8c7a42322068c5cd5d4a463ce78b93f730b7 +PYTHON_ITSDANGEROUS_SITE = https://files.pythonhosted.org/packages/7f/a1/d3fb83e7a61fa0c0d3d08ad0a94ddbeff3731c05212617dff3a94e097f08 PYTHON_ITSDANGEROUS_SETUP_TYPE = setuptools PYTHON_ITSDANGEROUS_LICENSE = BSD-3-Clause PYTHON_ITSDANGEROUS_LICENSE_FILES = LICENSE.rst docs/license.rst diff --git a/package/python-jaraco-classes/python-jaraco-classes.hash b/package/python-jaraco-classes/python-jaraco-classes.hash index 6489e8594f9..0e170d58d11 100644 --- a/package/python-jaraco-classes/python-jaraco-classes.hash +++ b/package/python-jaraco-classes/python-jaraco-classes.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/jaraco.classes/json -md5 63d4f5a2df2625ec3979c9633da1505e jaraco.classes-2.0.tar.gz -sha256 dcc2c4a8ca4b344cdbf2e1be7124a5c4f192574cdbb453b62350ae8240a2caf5 jaraco.classes-2.0.tar.gz +md5 a661acdae43995c08500324a8df62f03 jaraco.classes-3.2.3.tar.gz +sha256 89559fa5c1d3c34eff6f631ad80bb21f378dbcbb35dd161fd2c6b93f5be2f98a jaraco.classes-3.2.3.tar.gz # Locally computed sha256 checksums -sha256 a55e2ffe9b44998e621d51d8c094bed09acc4b5236ee73d7df395a33ba3c18fd LICENSE +sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE diff --git a/package/python-jaraco-classes/python-jaraco-classes.mk b/package/python-jaraco-classes/python-jaraco-classes.mk index 7455ed4d44d..4790516330f 100644 --- a/package/python-jaraco-classes/python-jaraco-classes.mk +++ b/package/python-jaraco-classes/python-jaraco-classes.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_JARACO_CLASSES_VERSION = 2.0 +PYTHON_JARACO_CLASSES_VERSION = 3.2.3 PYTHON_JARACO_CLASSES_SOURCE = jaraco.classes-$(PYTHON_JARACO_CLASSES_VERSION).tar.gz -PYTHON_JARACO_CLASSES_SITE = https://files.pythonhosted.org/packages/6e/27/f6ce0863a6ce574922ffe70d63c40b9771aefb686cb595cf435d184f0ca3 +PYTHON_JARACO_CLASSES_SITE = https://files.pythonhosted.org/packages/bf/02/a956c9bfd2dfe60b30c065ed8e28df7fcf72b292b861dca97e951c145ef6 PYTHON_JARACO_CLASSES_LICENSE = MIT PYTHON_JARACO_CLASSES_LICENSE_FILES = LICENSE PYTHON_JARACO_CLASSES_SETUP_TYPE = setuptools diff --git a/package/python-jaraco-functools/python-jaraco-functools.hash b/package/python-jaraco-functools/python-jaraco-functools.hash index 051a39bfcfa..a7cbb3daf1b 100644 --- a/package/python-jaraco-functools/python-jaraco-functools.hash +++ b/package/python-jaraco-functools/python-jaraco-functools.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/jaraco.functools/json -md5 c245ade3e753bc556415f1fec102f232 jaraco.functools-2.0.tar.gz -sha256 35ba944f52b1a7beee8843a5aa6752d1d5b79893eeb7770ea98be6b637bf9345 jaraco.functools-2.0.tar.gz +md5 f25708d7f38b9264459046fcc0afc8c1 jaraco.functools-3.5.2.tar.gz +sha256 45b05c158f3ad28731075556ffd4749bd254ec67f91e1eb367dcfebff1151db4 jaraco.functools-3.5.2.tar.gz # Locally computed sha256 checksums -sha256 a55e2ffe9b44998e621d51d8c094bed09acc4b5236ee73d7df395a33ba3c18fd LICENSE +sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE diff --git a/package/python-jaraco-functools/python-jaraco-functools.mk b/package/python-jaraco-functools/python-jaraco-functools.mk index f062063b0b5..8f64c4687e0 100644 --- a/package/python-jaraco-functools/python-jaraco-functools.mk +++ b/package/python-jaraco-functools/python-jaraco-functools.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_JARACO_FUNCTOOLS_VERSION = 2.0 +PYTHON_JARACO_FUNCTOOLS_VERSION = 3.5.2 PYTHON_JARACO_FUNCTOOLS_SOURCE = jaraco.functools-$(PYTHON_JARACO_FUNCTOOLS_VERSION).tar.gz -PYTHON_JARACO_FUNCTOOLS_SITE = https://files.pythonhosted.org/packages/a9/1e/44f6a5cffef147a3ffd37a748b8f4c2ded9b07ca20a15f17cd9874158f24 +PYTHON_JARACO_FUNCTOOLS_SITE = https://files.pythonhosted.org/packages/b4/ea/9abca360081de9157668fcc52765989158aaf29b4826f26fcb17852d08e6 PYTHON_JARACO_FUNCTOOLS_LICENSE = MIT PYTHON_JARACO_FUNCTOOLS_LICENSE_FILES = LICENSE PYTHON_JARACO_FUNCTOOLS_SETUP_TYPE = setuptools diff --git a/package/python-jedi/python-jedi.hash b/package/python-jedi/python-jedi.hash index d0f083e942b..dee8810e893 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 d8dba4a98a35530f7f5b461c20aff180 jedi-0.18.1.tar.gz -sha256 74137626a64a99c8eb6ae5832d99b3bdd7d29a3850fe2aa80a4126b2a7d949ab jedi-0.18.1.tar.gz +md5 47e89a2b8bedcfeb1527fac37b9ba1b3 jedi-0.18.2.tar.gz +sha256 bae794c30d07f6d910d32a7048af09b5a39ed740918da923c6b780790ebac612 jedi-0.18.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 b0508de7016..40de61f0e8d 100644 --- a/package/python-jedi/python-jedi.mk +++ b/package/python-jedi/python-jedi.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_JEDI_VERSION = 0.18.1 +PYTHON_JEDI_VERSION = 0.18.2 PYTHON_JEDI_SOURCE = jedi-$(PYTHON_JEDI_VERSION).tar.gz -PYTHON_JEDI_SITE = https://files.pythonhosted.org/packages/c2/25/273288df952e07e3190446efbbb30b0e4871a0d63b4246475f3019d4f55e +PYTHON_JEDI_SITE = https://files.pythonhosted.org/packages/15/02/afd43c5066de05f6b3188f3aa74136a3289e6c30e7a45f351546cab0928c 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 ea7fe71a354..2ab343cce61 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 b76ae2f0647abebc81e7c03f5fb7b00f Jinja2-3.0.3.tar.gz -sha256 611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7 Jinja2-3.0.3.tar.gz +md5 d31148abd89c1df1cdb077a55db27d02 Jinja2-3.1.2.tar.gz +sha256 31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852 Jinja2-3.1.2.tar.gz # Locally computed sha256 checksums sha256 3b49dcee4105eb37bac10faf1be260408fe85d252b8e9df2e0979fc1e094437b LICENSE.rst diff --git a/package/python-jinja2/python-jinja2.mk b/package/python-jinja2/python-jinja2.mk index 0503984befb..209ca2e25a0 100644 --- a/package/python-jinja2/python-jinja2.mk +++ b/package/python-jinja2/python-jinja2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_JINJA2_VERSION = 3.0.3 +PYTHON_JINJA2_VERSION = 3.1.2 PYTHON_JINJA2_SOURCE = Jinja2-$(PYTHON_JINJA2_VERSION).tar.gz -PYTHON_JINJA2_SITE = https://files.pythonhosted.org/packages/91/a5/429efc6246119e1e3fbf562c00187d04e83e54619249eb732bb423efa6c6 +PYTHON_JINJA2_SITE = https://files.pythonhosted.org/packages/7a/ff/75c28576a1d900e87eb6335b063fab47a8ef3c8b4d88524c4bf78f670cce PYTHON_JINJA2_SETUP_TYPE = setuptools PYTHON_JINJA2_LICENSE = BSD-3-Clause PYTHON_JINJA2_LICENSE_FILES = LICENSE.rst diff --git a/package/python-jmespath/python-jmespath.hash b/package/python-jmespath/python-jmespath.hash index 986db2e002c..03f64f3b747 100644 --- a/package/python-jmespath/python-jmespath.hash +++ b/package/python-jmespath/python-jmespath.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/jmespath/json -md5 65bdcb5fa5bcf1cc710ffa508e78e408 jmespath-0.10.0.tar.gz -sha256 b85d0567b8666149a93172712e68920734333c0ce7e89b78b3e987f71e5ed4f9 jmespath-0.10.0.tar.gz +md5 2dd28beb22d698f58fe2281bfe5fe3a3 jmespath-1.0.1.tar.gz +sha256 90261b206d6defd58fdd5e85f478bf633a2901798906be2ad389150c5c60edbe jmespath-1.0.1.tar.gz # Locally computed sha256 checksums sha256 66b313cce80ed0623fc7db3f24863a0c80fd83eb341a46b57864158ae74faa56 LICENSE.txt diff --git a/package/python-jmespath/python-jmespath.mk b/package/python-jmespath/python-jmespath.mk index cf11dedb60b..a94a13a2292 100644 --- a/package/python-jmespath/python-jmespath.mk +++ b/package/python-jmespath/python-jmespath.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_JMESPATH_VERSION = 0.10.0 +PYTHON_JMESPATH_VERSION = 1.0.1 PYTHON_JMESPATH_SOURCE = jmespath-$(PYTHON_JMESPATH_VERSION).tar.gz -PYTHON_JMESPATH_SITE = https://files.pythonhosted.org/packages/3c/56/3f325b1eef9791759784aa5046a8f6a1aff8f7c898a2e34506771d3b99d8 +PYTHON_JMESPATH_SITE = https://files.pythonhosted.org/packages/00/2a/e867e8531cf3e36b41201936b7fa7ba7b5702dbef42922193f05c8976cd6 PYTHON_JMESPATH_SETUP_TYPE = setuptools PYTHON_JMESPATH_LICENSE = MIT PYTHON_JMESPATH_LICENSE_FILES = LICENSE.txt diff --git a/package/python-json-schema-validator/python-json-schema-validator.hash b/package/python-json-schema-validator/python-json-schema-validator.hash index 7360abab9aa..94a0235a6d3 100644 --- a/package/python-json-schema-validator/python-json-schema-validator.hash +++ b/package/python-json-schema-validator/python-json-schema-validator.hash @@ -1,3 +1,3 @@ # md5 from https://pypi.python.org/pypi/json-schema-validator/json, sha256 locally computed -md5 7691b41739faaa8b0965279e72889932 json-schema-validator-2.4.1.tar.gz -sha256 1562a21d83e56231cef09b9aa2c06e8f845974bd26f24be293de6cab9a2fac91 json-schema-validator-2.4.1.tar.gz +md5 7691b41739faaa8b0965279e72889932 json-schema-validator-2.4.1.tar.gz +sha256 1562a21d83e56231cef09b9aa2c06e8f845974bd26f24be293de6cab9a2fac91 json-schema-validator-2.4.1.tar.gz diff --git a/package/python-jsonmodels/python-jsonmodels.hash b/package/python-jsonmodels/python-jsonmodels.hash index 16e200b03f2..1b0548fd256 100644 --- a/package/python-jsonmodels/python-jsonmodels.hash +++ b/package/python-jsonmodels/python-jsonmodels.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/jsonmodels/json -md5 96132e252887f840d23792c03fad2039 jsonmodels-2.4.tar.gz -sha256 abc8dc334a1794513e511a75639f77c271ef6a2992b6793f3753c7335dd18775 jsonmodels-2.4.tar.gz +md5 96132e252887f840d23792c03fad2039 jsonmodels-2.4.tar.gz +sha256 abc8dc334a1794513e511a75639f77c271ef6a2992b6793f3753c7335dd18775 jsonmodels-2.4.tar.gz # Locally computed sha256 checksums -sha256 3b1219763eec6924ddd4c4d61dee6a53c5fc9ab62707a9ad763ee363d3050cc5 LICENSE +sha256 3b1219763eec6924ddd4c4d61dee6a53c5fc9ab62707a9ad763ee363d3050cc5 LICENSE diff --git a/package/python-jsonschema/Config.in b/package/python-jsonschema/Config.in index 70026537227..d9508c37051 100644 --- a/package/python-jsonschema/Config.in +++ b/package/python-jsonschema/Config.in @@ -1,5 +1,7 @@ config BR2_PACKAGE_PYTHON_JSONSCHEMA bool "python-jsonschema" + select BR2_PACKAGE_PYTHON_ATTRS # runtime + select BR2_PACKAGE_PYTHON_PYRSISTENT # runtime help An implementation of JSON Schema validation for Python. diff --git a/package/python-jsonschema/python-jsonschema.hash b/package/python-jsonschema/python-jsonschema.hash index c631fe981ea..f7105764619 100644 --- a/package/python-jsonschema/python-jsonschema.hash +++ b/package/python-jsonschema/python-jsonschema.hash @@ -1,6 +1,6 @@ -# md5 from https://pypi.python.org/pypi/jsonschema/json -md5 374e848fdb69a3ce8b7e778b47c30640 jsonschema-2.5.1.tar.gz -# Locally computed -sha256 36673ac378feed3daa5956276a829699056523d7961027911f064b52255ead41 jsonschema-2.5.1.tar.gz +# md5, sha256 from https://pypi.org/pypi/jsonschema/json +md5 7c65ceb8923c83cb1f22c2b5a86d99b0 jsonschema-4.17.3.tar.gz +sha256 0f864437ab8b6076ba6707453ef8f98a6a0d512a80e93f8abdb676f737ecb60d jsonschema-4.17.3.tar.gz +# Locally computed sha256 checksums sha256 4f92a015a13c4d1a040bef018aa13430b4f1bc73b41b16bb846c346766de7439 COPYING sha256 837402bd25fad9b704265801ca3f92566a98157c1f9a7acd6f446299ba1c305a json/LICENSE diff --git a/package/python-jsonschema/python-jsonschema.mk b/package/python-jsonschema/python-jsonschema.mk index 0fb2be869f7..16fc660ec94 100644 --- a/package/python-jsonschema/python-jsonschema.mk +++ b/package/python-jsonschema/python-jsonschema.mk @@ -4,12 +4,15 @@ # ################################################################################ -PYTHON_JSONSCHEMA_VERSION = 2.5.1 +PYTHON_JSONSCHEMA_VERSION = 4.17.3 PYTHON_JSONSCHEMA_SOURCE = jsonschema-$(PYTHON_JSONSCHEMA_VERSION).tar.gz -PYTHON_JSONSCHEMA_SITE = https://pypi.python.org/packages/58/0d/c816f5ea5adaf1293a1d81d32e4cdfdaf8496973aa5049786d7fdb14e7e7 -PYTHON_JSONSCHEMA_SETUP_TYPE = setuptools +PYTHON_JSONSCHEMA_SITE = https://files.pythonhosted.org/packages/36/3d/ca032d5ac064dff543aa13c984737795ac81abc9fb130cd2fcff17cfabc7 +PYTHON_JSONSCHEMA_SETUP_TYPE = pep517 PYTHON_JSONSCHEMA_LICENSE = MIT PYTHON_JSONSCHEMA_LICENSE_FILES = COPYING json/LICENSE -PYTHON_JSONSCHEMA_DEPENDENCIES = host-python-vcversioner +PYTHON_JSONSCHEMA_DEPENDENCIES = \ + host-python-hatchling \ + host-python-hatch-fancy-pypi-readme \ + host-python-hatch-vcs $(eval $(python-package)) diff --git a/package/python-keyring/python-keyring.hash b/package/python-keyring/python-keyring.hash index 159579f79c2..837743f5c2f 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 1eb6d586ee5794de4bf39c1f513a3139 keyring-19.2.0.tar.gz -sha256 91037ccaf0c9a112a76f7740e4a416b9457a69b66c2799421581bee710a974b3 keyring-19.2.0.tar.gz +md5 a0640ab7525b4fe58061b5999cca5026 keyring-23.13.1.tar.gz +sha256 ba2e15a9b35e21908d0aaf4e0a47acc52d6ae33444df0da2b49d41a46ef6d678 keyring-23.13.1.tar.gz # Locally computed sha256 checksums -sha256 a55e2ffe9b44998e621d51d8c094bed09acc4b5236ee73d7df395a33ba3c18fd LICENSE +sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE diff --git a/package/python-keyring/python-keyring.mk b/package/python-keyring/python-keyring.mk index 0e05738605f..766139f5252 100644 --- a/package/python-keyring/python-keyring.mk +++ b/package/python-keyring/python-keyring.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_KEYRING_VERSION = 19.2.0 +PYTHON_KEYRING_VERSION = 23.13.1 PYTHON_KEYRING_SOURCE = keyring-$(PYTHON_KEYRING_VERSION).tar.gz -PYTHON_KEYRING_SITE = https://files.pythonhosted.org/packages/ee/46/77fdb7cd2b0f1f684afbc35a59b3d7ebb6961fe528f97b86900002968914 +PYTHON_KEYRING_SITE = https://files.pythonhosted.org/packages/55/fe/282f4c205add8e8bb3a1635cbbac59d6def2e0891b145aa553a0e40dd2d0 PYTHON_KEYRING_SETUP_TYPE = setuptools PYTHON_KEYRING_LICENSE = MIT PYTHON_KEYRING_LICENSE_FILES = LICENSE diff --git a/package/python-kflash/Config.in.host b/package/python-kflash/Config.in.host new file mode 100644 index 00000000000..0be8c18f15c --- /dev/null +++ b/package/python-kflash/Config.in.host @@ -0,0 +1,7 @@ +config BR2_PACKAGE_HOST_PYTHON_KFLASH + bool "host python-kflash" + depends on BR2_RISCV_64 && !BR2_USE_MMU + help + Kendryte UART ISP Utility - programming code to k210. + + https://github.com/vowstar/kflash.py diff --git a/package/python-kflash/python-kflash.hash b/package/python-kflash/python-kflash.hash new file mode 100644 index 00000000000..a4e5238635d --- /dev/null +++ b/package/python-kflash/python-kflash.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/kflash/json +md5 5b4376ea60f20368852d0c4743e6ed08 kflash-1.1.6.tar.gz +sha256 ec5fbb35ea81a91c89f458d375e24a6dab3d3865c69a7e6250511b2e93f4b695 kflash-1.1.6.tar.gz +# Locally computed sha256 checksums +sha256 c48133d7a08d743c2c01c6190fc1860f7d73777afa2199ed8d0a035b754d8bf9 LICENSE diff --git a/package/python-kflash/python-kflash.mk b/package/python-kflash/python-kflash.mk new file mode 100644 index 00000000000..efc0f52eba4 --- /dev/null +++ b/package/python-kflash/python-kflash.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-kflash +# +################################################################################ + +PYTHON_KFLASH_VERSION = 1.1.6 +PYTHON_KFLASH_SOURCE = kflash-$(PYTHON_KFLASH_VERSION).tar.gz +PYTHON_KFLASH_SITE = https://files.pythonhosted.org/packages/4f/80/d2eaa114bf4434b18fcf8960a907ffce12c9400b08c05902b36007d545b7 +PYTHON_KFLASH_SETUP_TYPE = setuptools +PYTHON_KFLASH_LICENSE = MIT +PYTHON_KFLASH_LICENSE_FILES = LICENSE +HOST_PYTHON_KFLASH_DEPENDENCIES = host-python-pyelftools host-python-serial + +$(eval $(host-python-package)) diff --git a/package/python-kiwisolver/python-kiwisolver.hash b/package/python-kiwisolver/python-kiwisolver.hash index 9cdb27002cf..7f2e263a5bc 100644 --- a/package/python-kiwisolver/python-kiwisolver.hash +++ b/package/python-kiwisolver/python-kiwisolver.hash @@ -1,3 +1,5 @@ -# Locally calculated -sha256 48168c0ace18319c649e31907f6d8586f648e503560f506f128798b99393bcdb python-kiwisolver-1.1.0.tar.gz -sha256 95c32f73d43fa54d8146badbcbd73b83acb7fa2cc81a7cef7784b3cd33b146a0 LICENSE +# md5, sha256 from https://pypi.org/pypi/kiwisolver/json +md5 34796908455c3b23c889439b541e424b kiwisolver-1.4.4.tar.gz +sha256 d41997519fcba4a1e46eb4a2fe31bc12f0ff957b2b81bac28db24744f333e955 kiwisolver-1.4.4.tar.gz +# Locally computed sha256 checksums +sha256 26da8d49744796f2601fb5fe9e5d8b9e8102064ca60a8dc1825b6177cb05450c LICENSE diff --git a/package/python-kiwisolver/python-kiwisolver.mk b/package/python-kiwisolver/python-kiwisolver.mk index 2b99803c0d3..2c5db26dbcb 100644 --- a/package/python-kiwisolver/python-kiwisolver.mk +++ b/package/python-kiwisolver/python-kiwisolver.mk @@ -4,10 +4,12 @@ # ################################################################################ -PYTHON_KIWISOLVER_VERSION = 1.1.0 -PYTHON_KIWISOLVER_SITE = $(call github,nucleic,kiwi,$(PYTHON_KIWISOLVER_VERSION)) +PYTHON_KIWISOLVER_VERSION = 1.4.4 +PYTHON_KIWISOLVER_SOURCE = kiwisolver-$(PYTHON_KIWISOLVER_VERSION).tar.gz +PYTHON_KIWISOLVER_SITE = https://files.pythonhosted.org/packages/5f/5c/272a7dd49a1914f35cd8d6d9f386defa8b047f6fbd06badd6b77b3ba24e7 PYTHON_KIWISOLVER_LICENSE = BSD-3-Clause PYTHON_KIWISOLVER_LICENSE_FILES = LICENSE PYTHON_KIWISOLVER_SETUP_TYPE = setuptools +PYTHON_KIWISOLVER_DEPENDENCIES = host-python-cppy $(eval $(python-package)) diff --git a/package/python-lark/Config.in b/package/python-lark/Config.in new file mode 100644 index 00000000000..1f45690f8d2 --- /dev/null +++ b/package/python-lark/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_LARK + bool "python-lark" + help + Lark is a parsing toolkit for Python, built with a focus + on ergonomics, performance and modularity. + + https://github.com/lark-parser/lark diff --git a/package/python-lark/python-lark.hash b/package/python-lark/python-lark.hash new file mode 100644 index 00000000000..6e192684a88 --- /dev/null +++ b/package/python-lark/python-lark.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/lark/json +md5 b9048974c5ce56997e9e536dda475159 lark-1.1.5.tar.gz +sha256 4b534eae1f9af5b4ea000bea95776350befe1981658eea3820a01c37e504bb4d lark-1.1.5.tar.gz +# Locally computed sha256 checksums +sha256 8263e5652d07cecb3adadf05140b65e70cfa169ecec5f520fe1671479ce12a83 LICENSE diff --git a/package/python-lark/python-lark.mk b/package/python-lark/python-lark.mk new file mode 100644 index 00000000000..c08fc2cabd0 --- /dev/null +++ b/package/python-lark/python-lark.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-lark +# +################################################################################ + +PYTHON_LARK_VERSION = 1.1.5 +PYTHON_LARK_SOURCE = lark-$(PYTHON_LARK_VERSION).tar.gz +PYTHON_LARK_SITE = https://files.pythonhosted.org/packages/a2/25/8e16de418fc83bb00dabaf8c7110bc45a90bf5481a70aa5f1668fcea73bc +PYTHON_LARK_SETUP_TYPE = setuptools +PYTHON_LARK_LICENSE = MIT +PYTHON_LARK_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/package/python-libevdev/Config.in b/package/python-libevdev/Config.in new file mode 100644 index 00000000000..2d6aa49ce01 --- /dev/null +++ b/package/python-libevdev/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_LIBEVDEV + bool "python-libevdev" + select BR2_PACKAGE_LIBEVDEV # runtime + help + Python wrapper for libevdev. + + https://gitlab.freedesktop.org/libevdev/python-libevdev diff --git a/package/python-libevdev/python-libevdev.hash b/package/python-libevdev/python-libevdev.hash new file mode 100644 index 00000000000..2799078cc8e --- /dev/null +++ b/package/python-libevdev/python-libevdev.hash @@ -0,0 +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 +# Locally computed sha256 checksums +sha256 a547b196da4e5bb9588a6e24f1f36ae9e2349ca5375e2cf9c315186e237d9f6d COPYING diff --git a/package/python-libevdev/python-libevdev.mk b/package/python-libevdev/python-libevdev.mk new file mode 100644 index 00000000000..e5256064c90 --- /dev/null +++ b/package/python-libevdev/python-libevdev.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# python-libevdev +# +################################################################################ + +PYTHON_LIBEVDEV_VERSION = 0.11 +PYTHON_LIBEVDEV_SOURCE = libevdev-$(PYTHON_LIBEVDEV_VERSION).tar.gz +PYTHON_LIBEVDEV_SITE = https://files.pythonhosted.org/packages/b0/49/2fe589ce1fa6ca0f05ae0b1717923650f2cc6eec6307c71fbc7789738902 +PYTHON_LIBEVDEV_SETUP_TYPE = setuptools +PYTHON_LIBEVDEV_LICENSE = MIT +PYTHON_LIBEVDEV_LICENSE_FILES = COPYING + +# Requires a kernel built with user level driver support (uinput). +define PYTHON_LIBEVDEV_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_INPUT_MISC) + $(call KCONFIG_ENABLE_OPT,CONFIG_INPUT_UINPUT) +endef + +$(eval $(python-package)) diff --git a/package/python-libusb1/python-libusb1.hash b/package/python-libusb1/python-libusb1.hash index bbbc6e0a741..86dea08c895 100644 --- a/package/python-libusb1/python-libusb1.hash +++ b/package/python-libusb1/python-libusb1.hash @@ -1,4 +1,5 @@ -# md5 from https://pypi.python.org/pypi/libusb1/json, sha256 locally computed -md5 b087646fb0c8c4cf7e8123af72f885b9 libusb1-2.0.1.tar.gz -sha256 d3ba82ecf7ab6a48d21dac6697e26504670cc3522b8e5941bd28fb56cf3f6c46 libusb1-2.0.1.tar.gz -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LESSER +# md5, sha256 from https://pypi.org/pypi/libusb1/json +md5 ffbb02bf9aa49f973a6a58112aed7b06 libusb1-3.0.0.tar.gz +sha256 5792a9defee40f15d330a40d9b1800545c32e47ba7fc66b6f28f133c9fcc8538 libusb1-3.0.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 40a64141af0..48a0b1dea3b 100644 --- a/package/python-libusb1/python-libusb1.mk +++ b/package/python-libusb1/python-libusb1.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_LIBUSB1_VERSION = 2.0.1 +PYTHON_LIBUSB1_VERSION = 3.0.0 PYTHON_LIBUSB1_SOURCE = libusb1-$(PYTHON_LIBUSB1_VERSION).tar.gz -PYTHON_LIBUSB1_SITE = https://files.pythonhosted.org/packages/a9/97/e8afa2af12b6de608ec86c8c4ad57f1248d98946d1b5e1aa0bff926755e9 +PYTHON_LIBUSB1_SITE = https://files.pythonhosted.org/packages/f4/83/59bf75e74e0c4859ea63eae0c7da660c1dcb78b31667d4a5f735d52f5974 PYTHON_LIBUSB1_SETUP_TYPE = setuptools PYTHON_LIBUSB1_LICENSE = LGPL-2.1+ PYTHON_LIBUSB1_LICENSE_FILES = COPYING.LESSER diff --git a/package/python-lmdb/python-lmdb.hash b/package/python-lmdb/python-lmdb.hash index e50c35df676..c8137ce4c0b 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 3c955c49be10a7a07a2fcd54d180c3af lmdb-1.3.0.tar.gz -sha256 60a11efc21aaf009d06518996360eed346f6000bfc9de05114374230879f992e lmdb-1.3.0.tar.gz +md5 230103e2cd8efbca8ee7cf29151afd0d lmdb-1.4.0.tar.gz +sha256 39f6c4ee145d28d17025d350720abb6f95db816514e868db57444fdef51cbb47 lmdb-1.4.0.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 fba168d340f..071106605fa 100644 --- a/package/python-lmdb/python-lmdb.mk +++ b/package/python-lmdb/python-lmdb.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_LMDB_VERSION = 1.3.0 +PYTHON_LMDB_VERSION = 1.4.0 PYTHON_LMDB_SOURCE = lmdb-$(PYTHON_LMDB_VERSION).tar.gz -PYTHON_LMDB_SITE = https://files.pythonhosted.org/packages/ed/61/41f3c7cbd8a67202ef24fad3375ed936093a0547dc645581dd11c09581b7 +PYTHON_LMDB_SITE = https://files.pythonhosted.org/packages/fd/78/4cdc5927d5f3c3c86c4da0108c2eeba544cd67e773232164d59f3e442ff0 PYTHON_LMDB_LICENSE = OLDAP-2.8 PYTHON_LMDB_LICENSE_FILES = LICENSE PYTHON_LMDB_SETUP_TYPE = setuptools diff --git a/package/python-lockfile/python-lockfile.hash b/package/python-lockfile/python-lockfile.hash index ac1b7d2d4d0..641f4b64d39 100644 --- a/package/python-lockfile/python-lockfile.hash +++ b/package/python-lockfile/python-lockfile.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/project/lockfile/#copy-hash-modal-3c1db9ec-dd6e-4d06-8543-91094f428ac0 -md5 a6a1a82957a23afdf44cfdd039b65ff9 lockfile-0.12.2.tar.gz -sha256 6aed02de03cba24efabcd600b30540140634fc06cfa603822d508d5361e9f799 lockfile-0.12.2.tar.gz +md5 a6a1a82957a23afdf44cfdd039b65ff9 lockfile-0.12.2.tar.gz +sha256 6aed02de03cba24efabcd600b30540140634fc06cfa603822d508d5361e9f799 lockfile-0.12.2.tar.gz # Locally computed sha256 -sha256 a26276d53dacb369641f31aa0fe37216028a0d93753f862ae206ce04f54b7b29 LICENSE +sha256 a26276d53dacb369641f31aa0fe37216028a0d93753f862ae206ce04f54b7b29 LICENSE diff --git a/package/python-logbook/python-logbook.hash b/package/python-logbook/python-logbook.hash index 7cbcf6caf0c..d77acad76e7 100644 --- a/package/python-logbook/python-logbook.hash +++ b/package/python-logbook/python-logbook.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/logbook/json -md5 719970ea22dd274797bb4328161d700f Logbook-1.5.3.tar.gz -sha256 66f454ada0f56eae43066f604a222b09893f98c1adc18df169710761b8f32fe8 Logbook-1.5.3.tar.gz +md5 719970ea22dd274797bb4328161d700f Logbook-1.5.3.tar.gz +sha256 66f454ada0f56eae43066f604a222b09893f98c1adc18df169710761b8f32fe8 Logbook-1.5.3.tar.gz # Locally computed sha256 checksums -sha256 2ca266337cc6947578654ab0dd6438de4d01fa78b2e6eb554b09757df1178f98 LICENSE +sha256 2ca266337cc6947578654ab0dd6438de4d01fa78b2e6eb554b09757df1178f98 LICENSE diff --git a/package/python-logstash/python-logstash.hash b/package/python-logstash/python-logstash.hash index ba11c7ffaab..297bb16bf2f 100644 --- a/package/python-logstash/python-logstash.hash +++ b/package/python-logstash/python-logstash.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/python-logstash/json -md5 26fafa0ea306025fb7644d70cb38982a python-logstash-0.4.6.tar.gz -sha256 10943e5df83f592b4d61b63ad1afff855ccc8c9467f78718f0a59809ba1fe68c python-logstash-0.4.6.tar.gz +md5 e2cbc75dd5417cb55acaa3a12bf3afac python-logstash-0.4.8.tar.gz +sha256 d04e1ce11ecc107e4a4f3b807fc57d96811e964a554081b3bbb44732f74ef5f9 python-logstash-0.4.8.tar.gz # Locally computed sha256 checksums -sha256 fea6a5c634ac9d9e047151675adc197c16f45bfba3c26ab113f48fb9fa717fff LICENSE +sha256 fea6a5c634ac9d9e047151675adc197c16f45bfba3c26ab113f48fb9fa717fff LICENSE diff --git a/package/python-logstash/python-logstash.mk b/package/python-logstash/python-logstash.mk index 68930bb1f93..a78b6e6590d 100644 --- a/package/python-logstash/python-logstash.mk +++ b/package/python-logstash/python-logstash.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_LOGSTASH_VERSION = 0.4.6 -PYTHON_LOGSTASH_SITE = https://files.pythonhosted.org/packages/4e/8d/7ff2e8e8e2613e7bb7654790480bb4cf51a55721371adbb631b16cb16dce +PYTHON_LOGSTASH_VERSION = 0.4.8 +PYTHON_LOGSTASH_SITE = https://files.pythonhosted.org/packages/f7/3b/c3a957bbdd23859f07905fc3d1adfe89957217a347478c58409f0315cf1d PYTHON_LOGSTASH_SETUP_TYPE = distutils PYTHON_LOGSTASH_LICENSE = MIT PYTHON_LOGSTASH_LICENSE_FILES = LICENSE diff --git a/package/python-lxml/python-lxml.hash b/package/python-lxml/python-lxml.hash index e33a8f8109c..72df6d02787 100644 --- a/package/python-lxml/python-lxml.hash +++ b/package/python-lxml/python-lxml.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 6e84edecc3a82f90d44ddee2ee2a2630d4994b8471816e226d2b771cda7ac4ca lxml-4.6.5.tar.gz +sha256 2455cfaeb7ac70338b3257f41e21f0724f4b5b0c0e7702da67ee6c3640835b67 lxml-4.9.2.tar.gz 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 8c2e965af69..657622a9620 100644 --- a/package/python-lxml/python-lxml.mk +++ b/package/python-lxml/python-lxml.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_LXML_VERSION = 4.6.5 -PYTHON_LXML_SITE = https://files.pythonhosted.org/packages/e6/e1/34b3ab08553fe9a30e15b2bb9d1803a49d7d907dd9f245638839190042f0 +PYTHON_LXML_VERSION = 4.9.2 +PYTHON_LXML_SITE = https://files.pythonhosted.org/packages/06/5a/e11cad7b79f2cf3dd2ff8f81fa8ca667e7591d3d8451768589996b65dec1 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/0001-Mitigate-the-Bleichenbacher-timing-attacks-in-the-RSA-decryption-API-CVE-2020-25657.patch b/package/python-m2crypto/0001-Mitigate-the-Bleichenbacher-timing-attacks-in-the-RSA-decryption-API-CVE-2020-25657.patch new file mode 100644 index 00000000000..68200b7d9b7 --- /dev/null +++ b/package/python-m2crypto/0001-Mitigate-the-Bleichenbacher-timing-attacks-in-the-RSA-decryption-API-CVE-2020-25657.patch @@ -0,0 +1,174 @@ +From 84c53958def0f510e92119fca14d74f94215827a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= +Date: Tue, 28 Jun 2022 21:17:01 +0200 +Subject: [PATCH] Mitigate the Bleichenbacher timing attacks in the RSA + decryption API (CVE-2020-25657) + +Fixes #282 + +[Retrieved from: +https://gitlab.com/m2crypto/m2crypto/-/commit/84c53958def0f510e92119fca14d74f94215827a] +Signed-off-by: Fabrice Fontaine +--- + src/SWIG/_m2crypto_wrap.c | 20 ++++++++++++-------- + src/SWIG/_rsa.i | 20 ++++++++++++-------- + tests/test_rsa.py | 15 +++++++-------- + 3 files changed, 31 insertions(+), 24 deletions(-) + +diff --git a/src/SWIG/_m2crypto_wrap.c b/src/SWIG/_m2crypto_wrap.c +index aba9eb6d..a9f30da9 100644 +--- a/src/SWIG/_m2crypto_wrap.c ++++ b/src/SWIG/_m2crypto_wrap.c +@@ -7040,9 +7040,10 @@ PyObject *rsa_private_encrypt(RSA *rsa, PyObject *from, int padding) { + tlen = RSA_private_encrypt(flen, (unsigned char *)fbuf, + (unsigned char *)tbuf, rsa, padding); + if (tlen == -1) { +- m2_PyErr_Msg(_rsa_err); ++ ERR_clear_error(); ++ PyErr_Clear(); + PyMem_Free(tbuf); +- return NULL; ++ Py_RETURN_NONE; + } + + ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); +@@ -7070,9 +7071,10 @@ PyObject *rsa_public_decrypt(RSA *rsa, PyObject *from, int padding) { + tlen = RSA_public_decrypt(flen, (unsigned char *)fbuf, + (unsigned char *)tbuf, rsa, padding); + if (tlen == -1) { +- m2_PyErr_Msg(_rsa_err); ++ ERR_clear_error(); ++ PyErr_Clear(); + PyMem_Free(tbuf); +- return NULL; ++ Py_RETURN_NONE; + } + + ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); +@@ -7097,9 +7099,10 @@ PyObject *rsa_public_encrypt(RSA *rsa, PyObject *from, int padding) { + tlen = RSA_public_encrypt(flen, (unsigned char *)fbuf, + (unsigned char *)tbuf, rsa, padding); + if (tlen == -1) { +- m2_PyErr_Msg(_rsa_err); ++ ERR_clear_error(); ++ PyErr_Clear(); + PyMem_Free(tbuf); +- return NULL; ++ Py_RETURN_NONE; + } + + ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); +@@ -7124,9 +7127,10 @@ PyObject *rsa_private_decrypt(RSA *rsa, PyObject *from, int padding) { + tlen = RSA_private_decrypt(flen, (unsigned char *)fbuf, + (unsigned char *)tbuf, rsa, padding); + if (tlen == -1) { +- m2_PyErr_Msg(_rsa_err); ++ ERR_clear_error(); ++ PyErr_Clear(); + PyMem_Free(tbuf); +- return NULL; ++ Py_RETURN_NONE; + } + ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); + +diff --git a/src/SWIG/_rsa.i b/src/SWIG/_rsa.i +index bc714e01..1377b8be 100644 +--- a/src/SWIG/_rsa.i ++++ b/src/SWIG/_rsa.i +@@ -239,9 +239,10 @@ PyObject *rsa_private_encrypt(RSA *rsa, PyObject *from, int padding) { + tlen = RSA_private_encrypt(flen, (unsigned char *)fbuf, + (unsigned char *)tbuf, rsa, padding); + if (tlen == -1) { +- m2_PyErr_Msg(_rsa_err); ++ ERR_clear_error(); ++ PyErr_Clear(); + PyMem_Free(tbuf); +- return NULL; ++ Py_RETURN_NONE; + } + + ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); +@@ -269,9 +270,10 @@ PyObject *rsa_public_decrypt(RSA *rsa, PyObject *from, int padding) { + tlen = RSA_public_decrypt(flen, (unsigned char *)fbuf, + (unsigned char *)tbuf, rsa, padding); + if (tlen == -1) { +- m2_PyErr_Msg(_rsa_err); ++ ERR_clear_error(); ++ PyErr_Clear(); + PyMem_Free(tbuf); +- return NULL; ++ Py_RETURN_NONE; + } + + ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); +@@ -296,9 +298,10 @@ PyObject *rsa_public_encrypt(RSA *rsa, PyObject *from, int padding) { + tlen = RSA_public_encrypt(flen, (unsigned char *)fbuf, + (unsigned char *)tbuf, rsa, padding); + if (tlen == -1) { +- m2_PyErr_Msg(_rsa_err); ++ ERR_clear_error(); ++ PyErr_Clear(); + PyMem_Free(tbuf); +- return NULL; ++ Py_RETURN_NONE; + } + + ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); +@@ -323,9 +326,10 @@ PyObject *rsa_private_decrypt(RSA *rsa, PyObject *from, int padding) { + tlen = RSA_private_decrypt(flen, (unsigned char *)fbuf, + (unsigned char *)tbuf, rsa, padding); + if (tlen == -1) { +- m2_PyErr_Msg(_rsa_err); ++ ERR_clear_error(); ++ PyErr_Clear(); + PyMem_Free(tbuf); +- return NULL; ++ Py_RETURN_NONE; + } + ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); + +diff --git a/tests/test_rsa.py b/tests/test_rsa.py +index 7bb3af75..5e75d681 100644 +--- a/tests/test_rsa.py ++++ b/tests/test_rsa.py +@@ -109,8 +109,9 @@ class RSATestCase(unittest.TestCase): + # The other paddings. + for padding in self.s_padding_nok: + p = getattr(RSA, padding) +- with self.assertRaises(RSA.RSAError): +- priv.private_encrypt(self.data, p) ++ # Exception disabled as a part of mitigation against CVE-2020-25657 ++ # with self.assertRaises(RSA.RSAError): ++ priv.private_encrypt(self.data, p) + # Type-check the data to be encrypted. + with self.assertRaises(TypeError): + priv.private_encrypt(self.gen_callback, RSA.pkcs1_padding) +@@ -127,10 +128,12 @@ class RSATestCase(unittest.TestCase): + self.assertEqual(ptxt, self.data) + + # no_padding +- with six.assertRaisesRegex(self, RSA.RSAError, 'data too small'): +- priv.public_encrypt(self.data, RSA.no_padding) ++ # Exception disabled as a part of mitigation against CVE-2020-25657 ++ # with six.assertRaisesRegex(self, RSA.RSAError, 'data too small'): ++ priv.public_encrypt(self.data, RSA.no_padding) + + # Type-check the data to be encrypted. ++ # Exception disabled as a part of mitigation against CVE-2020-25657 + with self.assertRaises(TypeError): + priv.public_encrypt(self.gen_callback, RSA.pkcs1_padding) + +@@ -146,10 +149,6 @@ class RSATestCase(unittest.TestCase): + b'\000\000\000\003\001\000\001') # aka 65537 aka 0xf4 + with self.assertRaises(RSA.RSAError): + setattr(rsa, 'e', '\000\000\000\003\001\000\001') +- with self.assertRaises(RSA.RSAError): +- rsa.private_encrypt(1) +- with self.assertRaises(RSA.RSAError): +- rsa.private_decrypt(1) + assert rsa.check_key() + + def test_loadpub_bad(self): +-- +GitLab + diff --git a/package/python-m2crypto/python-m2crypto.mk b/package/python-m2crypto/python-m2crypto.mk index 02ad76d3f43..3c28fa3b0de 100644 --- a/package/python-m2crypto/python-m2crypto.mk +++ b/package/python-m2crypto/python-m2crypto.mk @@ -15,4 +15,7 @@ PYTHON_M2CRYPTO_CPE_ID_PRODUCT = m2crypto PYTHON_M2CRYPTO_DEPENDENCIES = openssl host-swig PYTHON_M2CRYPTO_BUILD_OPTS = --openssl=$(STAGING_DIR)/usr +# 0001-Mitigate-the-Bleichenbacher-timing-attacks-in-the-RSA-decryption-API-CVE-2020-25657.patch +PYTHON_M2CRYPTO_IGNORE_CVES += CVE-2020-25657 + $(eval $(python-package)) diff --git a/package/python-m2r/Config.in b/package/python-m2r/Config.in deleted file mode 100644 index 44dafaa464d..00000000000 --- a/package/python-m2r/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PYTHON_M2R - bool "python-m2r" - select BR2_PACKAGE_PYTHON_MISTUNE # runtime - select BR2_PACKAGE_PYTHON_DOCUTILS # runtime - help - Markdown to reStructuredText converter. - - https://github.com/miyakogi/m2r diff --git a/package/python-m2r/python-m2r.hash b/package/python-m2r/python-m2r.hash deleted file mode 100644 index 3c22e9707ae..00000000000 --- a/package/python-m2r/python-m2r.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/m2r/json -md5 8bdb45c19e2b59bb5ffb9a0348e81ad8 m2r-0.2.1.tar.gz -sha256 bf90bad66cda1164b17e5ba4a037806d2443f2a4d5ddc9f6a5554a0322aaed99 m2r-0.2.1.tar.gz -# Locally computed sha256 checksums -sha256 28728ec0ecbd8c171ebaeccebf69e3961282fd81f06abc7424c65546b6ae6f27 LICENSE diff --git a/package/python-m2r/python-m2r.mk b/package/python-m2r/python-m2r.mk deleted file mode 100644 index 47fb154c68b..00000000000 --- a/package/python-m2r/python-m2r.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# python-m2r -# -################################################################################ - -PYTHON_M2R_VERSION = 0.2.1 -PYTHON_M2R_SOURCE = m2r-$(PYTHON_M2R_VERSION).tar.gz -PYTHON_M2R_SITE = https://files.pythonhosted.org/packages/39/e7/9fae11a45f5e1a3a21d8a98d02948e597c4afd7848a0dbe1a1ebd235f13e -PYTHON_M2R_SETUP_TYPE = setuptools -PYTHON_M2R_LICENSE = MIT -PYTHON_M2R_LICENSE_FILES = LICENSE -HOST_PYTHON_M2R_DEPENDENCIES = host-python-docutils host-python-mistune - -$(eval $(python-package)) -$(eval $(host-python-package)) diff --git a/package/python-magic-wormhole-mailbox-server/0001-setup.py-remove-the-U-open-mode-removed-in-Python-3..patch b/package/python-magic-wormhole-mailbox-server/0001-setup.py-remove-the-U-open-mode-removed-in-Python-3..patch new file mode 100644 index 00000000000..8afe7c95465 --- /dev/null +++ b/package/python-magic-wormhole-mailbox-server/0001-setup.py-remove-the-U-open-mode-removed-in-Python-3..patch @@ -0,0 +1,39 @@ +From df6126ee86c1f84c7e0c25fcf69543b83b1b32c6 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Sat, 5 Nov 2022 13:06:07 +0100 +Subject: [PATCH] setup.py: remove the 'U' open mode removed in Python 3.11 + +The 'U' open mode was removed in Python 3.11. See: +https://docs.python.org/3.11/library/functions.html#open + +Installing with Python 3.11 fails with: + + /path/to/python-magic-wormhole-mailbox-server-0.4.1/setup.py", line 20, in + long_description=open('README.md', 'rU').read(), + ^^^^^^^^^^^^^^^^^^^^^^^ + ValueError: invalid mode: 'rU' + +This patch removes the 'U' open mode. + +Upstream: https://github.com/magic-wormhole/magic-wormhole-mailbox-server/commit/df6126ee86c1f84c7e0c25fcf69543b83b1b32c6 +Signed-off-by: Julien Olivain +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 6ef292f..ad9ff5a 100644 +--- a/setup.py ++++ b/setup.py +@@ -17,7 +17,7 @@ trove_classifiers = [ + setup(name="magic-wormhole-mailbox-server", + version=versioneer.get_version(), + description="Securely transfer data between computers", +- long_description=open('README.md', 'rU').read(), ++ long_description=open('README.md', 'r').read(), + long_description_content_type='text/markdown', + author="Brian Warner", + author_email="warner-magic-wormhole@lothar.com", +-- +2.38.1 + diff --git a/package/python-magic-wormhole-mailbox-server/Config.in b/package/python-magic-wormhole-mailbox-server/Config.in new file mode 100644 index 00000000000..a0721e866f5 --- /dev/null +++ b/package/python-magic-wormhole-mailbox-server/Config.in @@ -0,0 +1,16 @@ +config BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER + bool "python-magic-wormhole-mailbox-server" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-autobahn -> python-cryptography + select BR2_PACKAGE_PYTHON3_SQLITE # runtime + select BR2_PACKAGE_PYTHON_ATTRS # runtime + select BR2_PACKAGE_PYTHON_AUTOBAHN # runtime + select BR2_PACKAGE_PYTHON_SIX # runtime + select BR2_PACKAGE_PYTHON_TWISTED # runtime + help + This package is the main server that Magic-Wormhole clients + connect to. The server performs store-and-forward delivery + for small key-exchange and control messages. Bulk data is + sent over a direct TCP connection, or through a + transit-relay. + + https://github.com/magic-wormhole/magic-wormhole-mailbox-server 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 new file mode 100644 index 00000000000..c7147126419 --- /dev/null +++ b/package/python-magic-wormhole-mailbox-server/python-magic-wormhole-mailbox-server.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/magic-wormhole-mailbox-server/json +md5 3da441df1f354a8399a728da3421ac8f magic-wormhole-mailbox-server-0.4.1.tar.gz +sha256 1af10592909caaf519c00e706eac842c5e77f8d4356215fe9c61c7b2258a88fb magic-wormhole-mailbox-server-0.4.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 new file mode 100644 index 00000000000..a3394c7dcd6 --- /dev/null +++ b/package/python-magic-wormhole-mailbox-server/python-magic-wormhole-mailbox-server.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-magic-wormhole-mailbox-server +# +################################################################################ + +PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_VERSION = 0.4.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/5b/ba/cbb211bc8f8bfdf7fb620d33331f07bcd889c7a28e7fd8a0de9029bb5a2f +PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_SETUP_TYPE = setuptools +PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_LICENSE = MIT +PYTHON_MAGIC_WORMHOLE_MAILBOX_SERVER_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/package/python-magic-wormhole-transit-relay/Config.in b/package/python-magic-wormhole-transit-relay/Config.in new file mode 100644 index 00000000000..1a743c10fea --- /dev/null +++ b/package/python-magic-wormhole-transit-relay/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE_TRANSIT_RELAY + bool "python-magic-wormhole-transit-relay" + select BR2_PACKAGE_PYTHON_TWISTED # runtime + help + Transit Relay server for Magic-Wormhole. + + This repository implements the Magic-Wormhole "Transit + Relay", a server that helps clients establish bulk-data + transit connections even when both are behind NAT + boxes. Each side makes a TCP connection to this server and + presents a handshake. Two connections with identical + handshakes are glued together, allowing them to pretend they + have a direct connection. + + https://github.com/magic-wormhole/magic-wormhole-transit-relay diff --git a/package/python-magic-wormhole-transit-relay/python-magic-wormhole-transit-relay.hash b/package/python-magic-wormhole-transit-relay/python-magic-wormhole-transit-relay.hash new file mode 100644 index 00000000000..f131477a403 --- /dev/null +++ b/package/python-magic-wormhole-transit-relay/python-magic-wormhole-transit-relay.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/magic-wormhole-transit-relay/json +md5 aa575a4e22b3d5099674ba88b136a9a2 magic-wormhole-transit-relay-0.2.1.tar.gz +sha256 cb4801b46890eaff97286e0e3fec62d1d52ffe317d140083b6336a1fb4e8fa5e magic-wormhole-transit-relay-0.2.1.tar.gz +# Locally computed sha256 checksums +sha256 d70f6469bb210c2aa4c0dfd74f498ef5f0467a137d8296479088e7243c5884eb LICENSE diff --git a/package/python-magic-wormhole-transit-relay/python-magic-wormhole-transit-relay.mk b/package/python-magic-wormhole-transit-relay/python-magic-wormhole-transit-relay.mk new file mode 100644 index 00000000000..e4ffe6e7a60 --- /dev/null +++ b/package/python-magic-wormhole-transit-relay/python-magic-wormhole-transit-relay.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-magic-wormhole-transit-relay +# +################################################################################ + +PYTHON_MAGIC_WORMHOLE_TRANSIT_RELAY_VERSION = 0.2.1 +PYTHON_MAGIC_WORMHOLE_TRANSIT_RELAY_SOURCE = magic-wormhole-transit-relay-$(PYTHON_MAGIC_WORMHOLE_TRANSIT_RELAY_VERSION).tar.gz +PYTHON_MAGIC_WORMHOLE_TRANSIT_RELAY_SITE = https://files.pythonhosted.org/packages/21/c9/be25bb30e327037e009657960fc594d089b118c0d81cc6a200cad1bb3852 +PYTHON_MAGIC_WORMHOLE_TRANSIT_RELAY_SETUP_TYPE = setuptools +PYTHON_MAGIC_WORMHOLE_TRANSIT_RELAY_LICENSE = MIT +PYTHON_MAGIC_WORMHOLE_TRANSIT_RELAY_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/package/python-magic-wormhole/Config.in b/package/python-magic-wormhole/Config.in new file mode 100644 index 00000000000..e8429d203bc --- /dev/null +++ b/package/python-magic-wormhole/Config.in @@ -0,0 +1,27 @@ +config BR2_PACKAGE_PYTHON_MAGIC_WORMHOLE + bool "python-magic-wormhole" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-autobahn -> python-cryptography + select BR2_PACKAGE_PYTHON_ATTRS # runtime + select BR2_PACKAGE_PYTHON_AUTOBAHN # runtime + select BR2_PACKAGE_PYTHON_AUTOMAT # runtime + select BR2_PACKAGE_PYTHON_CLICK # runtime + select BR2_PACKAGE_PYTHON_HKDF # runtime + select BR2_PACKAGE_PYTHON_HUMANIZE # runtime + select BR2_PACKAGE_PYTHON_PYNACL # runtime + select BR2_PACKAGE_PYTHON_SIX # runtime + select BR2_PACKAGE_PYTHON_SPAKE2 # runtime + select BR2_PACKAGE_PYTHON_TQDM # runtime + select BR2_PACKAGE_PYTHON_TWISTED # runtime + select BR2_PACKAGE_PYTHON_TXTORCON # runtime + help + Securely transfer data between computers. + + This package provides a library and a command-line tool + named "wormhole", which makes it possible to get + arbitrary-sized files and directories (or short pieces of + text) from one computer to another. The two endpoints are + identified by using identical "wormhole codes": in general, + the sending machine generates and displays the code, which + must then be typed into the receiving machine. + + https://github.com/magic-wormhole/magic-wormhole diff --git a/package/python-magic-wormhole/python-magic-wormhole.hash b/package/python-magic-wormhole/python-magic-wormhole.hash new file mode 100644 index 00000000000..5e880d54271 --- /dev/null +++ b/package/python-magic-wormhole/python-magic-wormhole.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/magic-wormhole/json +md5 ca190d92f56fe32ec8dfd4fc5aab8337 magic-wormhole-0.12.0.tar.gz +sha256 1b0fd8a334da978f3dd96b620fa9b9348cabedf26a87f74baac7a37052928160 magic-wormhole-0.12.0.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 new file mode 100644 index 00000000000..91f0f826d50 --- /dev/null +++ b/package/python-magic-wormhole/python-magic-wormhole.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-magic-wormhole +# +################################################################################ + +PYTHON_MAGIC_WORMHOLE_VERSION = 0.12.0 +PYTHON_MAGIC_WORMHOLE_SOURCE = magic-wormhole-$(PYTHON_MAGIC_WORMHOLE_VERSION).tar.gz +PYTHON_MAGIC_WORMHOLE_SITE = https://files.pythonhosted.org/packages/d4/62/5e4a86f7c4b111e016577f1b304063ebe604f430db15465ac58b13993608 +PYTHON_MAGIC_WORMHOLE_SETUP_TYPE = setuptools +PYTHON_MAGIC_WORMHOLE_LICENSE = MIT +PYTHON_MAGIC_WORMHOLE_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/package/python-mako/python-mako.hash b/package/python-mako/python-mako.hash index f5b5daf06d7..a010e8d8f62 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 409bdc38e9ddda5eada61fb092cb12fd Mako-1.1.5.tar.gz -sha256 169fa52af22a91900d852e937400e79f535496191c63712e3b9fda5a9bed6fc3 Mako-1.1.5.tar.gz +md5 651f365616611fcd4f2702a9002e2195 Mako-1.2.4.tar.gz +sha256 d60a3903dc3bb01a18ad6a89cdbe2e4eadc69c0bc8ef1e3773ba53d44c3f7a34 Mako-1.2.4.tar.gz # Locally computed sha256 checksums -sha256 47cd0d41b1092f9161cfb629ed15e5cea185144710ff4633a4281ef088ff5de7 LICENSE +sha256 760f22b3e9ea4a50eb99201bd8dd118869f28108cfb64ccce6d1b305cf9ae9fa LICENSE diff --git a/package/python-mako/python-mako.mk b/package/python-mako/python-mako.mk index 553c4a53394..313fbfcab2f 100644 --- a/package/python-mako/python-mako.mk +++ b/package/python-mako/python-mako.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MAKO_VERSION = 1.1.5 +PYTHON_MAKO_VERSION = 1.2.4 PYTHON_MAKO_SOURCE = Mako-$(PYTHON_MAKO_VERSION).tar.gz -PYTHON_MAKO_SITE = https://files.pythonhosted.org/packages/d1/42/ff293411e980debfc647be9306d89840c8b82ea24571b014f1a35b2ad80f +PYTHON_MAKO_SITE = https://files.pythonhosted.org/packages/05/5f/2ba6e026d33a0e6ddc1dddf9958677f76f5f80c236bd65309d280b166d3e 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 b64ac77be09..66208067cc1 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 b6833c6326e9164ee0c662218a75e7f0 Markdown-3.3.4.tar.gz -sha256 31b5b491868dcc87d6c24b7e3d19a0d730d59d3e46f4eea6430a321bed387a49 Markdown-3.3.4.tar.gz +md5 597656cf4feadf1998b0511201620202 Markdown-3.4.1.tar.gz +sha256 3b809086bb6efad416156e00a0da66fe47618a5d6918dd688f53f40c8e4cfeff Markdown-3.4.1.tar.gz # Locally computed sha256 sha256 6f1193cb634718e65c3a537d6e25ebd614820ec0ef693cfc12248112638d64da LICENSE.md diff --git a/package/python-markdown/python-markdown.mk b/package/python-markdown/python-markdown.mk index 801360d7787..1b9b5562018 100644 --- a/package/python-markdown/python-markdown.mk +++ b/package/python-markdown/python-markdown.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MARKDOWN_VERSION = 3.3.4 +PYTHON_MARKDOWN_VERSION = 3.4.1 PYTHON_MARKDOWN_SOURCE = Markdown-$(PYTHON_MARKDOWN_VERSION).tar.gz -PYTHON_MARKDOWN_SITE = https://files.pythonhosted.org/packages/49/02/37bd82ae255bb4dfef97a4b32d95906187b7a7a74970761fca1360c4ba22 +PYTHON_MARKDOWN_SITE = https://files.pythonhosted.org/packages/85/7e/133e943e97a943d2f1d8bae0c5060f8ac50e6691754eb9dbe036b047a9bb 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 a3e310aacf7..f8582ba5b89 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 6134fce06c4783b3178a90a719fa9d91 markdown2-2.4.1.tar.gz -sha256 ce9265cf179c4e07934e7b6a4b03f3edb7891e66e6d0f7017755f6064bbbe13f markdown2-2.4.1.tar.gz +md5 bb3f451bed011a0d8959e3c1d5850c53 markdown2-2.4.6.tar.gz +sha256 f65b4dbe1e16591b14fd40bc659b8b58d285eab70c1da21f390294fcdec42bb0 markdown2-2.4.6.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 6acfad2ccb3..b1c162e12f4 100644 --- a/package/python-markdown2/python-markdown2.mk +++ b/package/python-markdown2/python-markdown2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MARKDOWN2_VERSION = 2.4.1 +PYTHON_MARKDOWN2_VERSION = 2.4.6 PYTHON_MARKDOWN2_SOURCE = markdown2-$(PYTHON_MARKDOWN2_VERSION).tar.gz -PYTHON_MARKDOWN2_SITE = https://files.pythonhosted.org/packages/fb/10/4f327f4517fa5dda90021618fe174d1f4aff3c4e06abcd7f77685a455511 +PYTHON_MARKDOWN2_SITE = https://files.pythonhosted.org/packages/83/b7/24613765f558afde9f47b61fcd787a9856ac1515b53af38bd11bf2fb3c8c PYTHON_MARKDOWN2_SETUP_TYPE = setuptools PYTHON_MARKDOWN2_LICENSE = MIT PYTHON_MARKDOWN2_LICENSE_FILES = LICENSE.txt diff --git a/package/python-markupsafe/python-markupsafe.hash b/package/python-markupsafe/python-markupsafe.hash index 520bb405fbd..2d1d81c62e0 100644 --- a/package/python-markupsafe/python-markupsafe.hash +++ b/package/python-markupsafe/python-markupsafe.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/markupsafe/json -md5 892e0fefa3c488387e5cc0cad2daa523 MarkupSafe-2.0.1.tar.gz -sha256 594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a MarkupSafe-2.0.1.tar.gz +md5 9809f9fdd98bc835b0c21aa8f79cbf30 MarkupSafe-2.1.1.tar.gz +sha256 7f91197cc9e48f989d12e4e6fbc46495c446636dfc81b9ccf50bb0ec74b91d4b MarkupSafe-2.1.1.tar.gz # Locally computed sha256 checksums sha256 489a8e1108509ed98a37bb983e11e0f7e1d31f0bd8f99a79c8448e7ff37d07ea LICENSE.rst diff --git a/package/python-markupsafe/python-markupsafe.mk b/package/python-markupsafe/python-markupsafe.mk index e0e689f5a18..49bfc0b840e 100644 --- a/package/python-markupsafe/python-markupsafe.mk +++ b/package/python-markupsafe/python-markupsafe.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MARKUPSAFE_VERSION = 2.0.1 +PYTHON_MARKUPSAFE_VERSION = 2.1.1 PYTHON_MARKUPSAFE_SOURCE = MarkupSafe-$(PYTHON_MARKUPSAFE_VERSION).tar.gz -PYTHON_MARKUPSAFE_SITE = https://files.pythonhosted.org/packages/bf/10/ff66fea6d1788c458663a84d88787bae15d45daa16f6b3ef33322a51fc7e +PYTHON_MARKUPSAFE_SITE = https://files.pythonhosted.org/packages/1d/97/2288fe498044284f39ab8950703e88abbac2abbdf65524d576157af70556 PYTHON_MARKUPSAFE_SETUP_TYPE = setuptools PYTHON_MARKUPSAFE_LICENSE = BSD-3-Clause PYTHON_MARKUPSAFE_LICENSE_FILES = LICENSE.rst diff --git a/package/python-marshmallow-sqlalchemy/Config.in b/package/python-marshmallow-sqlalchemy/Config.in new file mode 100644 index 00000000000..f48d27edd62 --- /dev/null +++ b/package/python-marshmallow-sqlalchemy/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_PYTHON_MARSHMALLOW_SQLALCHEMY + bool "python-marshmallow-sqlalchemy" + select BR2_PACKAGE_PYTHON_MARSHMALLOW # runtime + select BR2_PACKAGE_PYTHON_PACKAGING # runtime + select BR2_PACKAGE_PYTHON_SQLALCHEMY # runtime + help + SQLAlchemy integration with the marshmallow + (de)serialization library. + + https://github.com/marshmallow-code/marshmallow-sqlalchemy diff --git a/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.hash b/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.hash new file mode 100644 index 00000000000..6b847de94d1 --- /dev/null +++ b/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/marshmallow-sqlalchemy/json +md5 5e012b07ccf4ad67dbd3f38cc68cb1f4 marshmallow-sqlalchemy-0.28.1.tar.gz +sha256 aa376747296780a56355e3067b9c8bf43a2a1c44ff985de82b3a5d9e161ca2b8 marshmallow-sqlalchemy-0.28.1.tar.gz +# Locally computed sha256 checksums +sha256 625df8e2758a271b4bc90525c0b6161814e0f72cb3504b03ab5206b7abf50072 LICENSE diff --git a/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.mk b/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.mk new file mode 100644 index 00000000000..293ea29be60 --- /dev/null +++ b/package/python-marshmallow-sqlalchemy/python-marshmallow-sqlalchemy.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-marshmallow-sqlalchemy +# +################################################################################ + +PYTHON_MARSHMALLOW_SQLALCHEMY_VERSION = 0.28.1 +PYTHON_MARSHMALLOW_SQLALCHEMY_SOURCE = marshmallow-sqlalchemy-$(PYTHON_MARSHMALLOW_SQLALCHEMY_VERSION).tar.gz +PYTHON_MARSHMALLOW_SQLALCHEMY_SITE = https://files.pythonhosted.org/packages/eb/96/3895bde2247fa653c36d887ff08e439665668aa7c991a3924ae199be88d6 +PYTHON_MARSHMALLOW_SQLALCHEMY_SETUP_TYPE = setuptools +PYTHON_MARSHMALLOW_SQLALCHEMY_LICENSE = MIT +PYTHON_MARSHMALLOW_SQLALCHEMY_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/package/python-marshmallow/Config.in b/package/python-marshmallow/Config.in new file mode 100644 index 00000000000..cc1b42f4651 --- /dev/null +++ b/package/python-marshmallow/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_MARSHMALLOW + bool "python-marshmallow" + select BR2_PACKAGE_PYTHON_PACKAGING # runtime + help + A lightweight library for converting complex datatypes to + and from native Python datatypes. + + https://github.com/marshmallow-code/marshmallow diff --git a/package/python-marshmallow/python-marshmallow.hash b/package/python-marshmallow/python-marshmallow.hash new file mode 100644 index 00000000000..dc277d16e55 --- /dev/null +++ b/package/python-marshmallow/python-marshmallow.hash @@ -0,0 +1,6 @@ +# md5, sha256 from https://pypi.org/pypi/marshmallow/json +md5 3cf5c42917509a199c3105466435c425 marshmallow-3.19.0.tar.gz +sha256 90032c0fd650ce94b6ec6dc8dfeb0e3ff50c144586462c389b81a07205bedb78 marshmallow-3.19.0.tar.gz +# Locally computed sha256 checksums +sha256 759dc79c383ad79340c6e41f712e80407fe0d2cb3cbaad1ed98aa9c3e28a602c LICENSE +sha256 f982e6fd97ba00973e94605b972ff04894b22c4fa937b868828b32ae8f0a7c2e docs/license.rst diff --git a/package/python-marshmallow/python-marshmallow.mk b/package/python-marshmallow/python-marshmallow.mk new file mode 100644 index 00000000000..ba6da6b29cf --- /dev/null +++ b/package/python-marshmallow/python-marshmallow.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# python-marshmallow +# +################################################################################ + +PYTHON_MARSHMALLOW_VERSION = 3.19.0 +PYTHON_MARSHMALLOW_SOURCE = marshmallow-$(PYTHON_MARSHMALLOW_VERSION).tar.gz +PYTHON_MARSHMALLOW_SITE = https://files.pythonhosted.org/packages/5e/59/dd465e5ab0ccb879c410f88c75189a19fd437b12cd9a03b31579aef58709 +PYTHON_MARSHMALLOW_SETUP_TYPE = setuptools +PYTHON_MARSHMALLOW_LICENSE = MIT +PYTHON_MARSHMALLOW_LICENSE_FILES = LICENSE +PYTHON_MARSHMALLOW_CPE_ID_VENDOR = marshmallow_project +PYTHON_MARSHMALLOW_CPE_ID_PRODUCT = marshmallow + +$(eval $(python-package)) diff --git a/package/python-matplotlib/Config.in b/package/python-matplotlib/Config.in index b9367776627..8a9281b8e7f 100644 --- a/package/python-matplotlib/Config.in +++ b/package/python-matplotlib/Config.in @@ -11,6 +11,7 @@ config BR2_PACKAGE_PYTHON_MATPLOTLIB select BR2_PACKAGE_PYTHON_DATEUTIL # runtime select BR2_PACKAGE_PYTHON_KIWISOLVER # runtime select BR2_PACKAGE_PYTHON_NUMPY # runtime + select BR2_PACKAGE_PYTHON_PILLOW # runtime select BR2_PACKAGE_PYTHON_PYPARSING # runtime select BR2_PACKAGE_PYTHON3_ZLIB # runtime select BR2_PACKAGE_QHULL diff --git a/package/python-matplotlib/python-matplotlib.hash b/package/python-matplotlib/python-matplotlib.hash index 81e83ac0dee..0d7117811c5 100644 --- a/package/python-matplotlib/python-matplotlib.hash +++ b/package/python-matplotlib/python-matplotlib.hash @@ -1,4 +1,4 @@ # sha256 from https://pypi.org/project/matplotlib/#files -sha256 fc4f526dfdb31c9bd6b8ca06bf9fab663ca12f3ec9cdf4496fb44bc680140318 matplotlib-3.4.3.tar.gz +sha256 fc4f526dfdb31c9bd6b8ca06bf9fab663ca12f3ec9cdf4496fb44bc680140318 matplotlib-3.4.3.tar.gz # Locally computed sha256 checksums -sha256 5a1a81ea301728c8bba2933da832c0cd62229daf20893a024ab3d53244468dbc LICENSE/LICENSE +sha256 5a1a81ea301728c8bba2933da832c0cd62229daf20893a024ab3d53244468dbc LICENSE/LICENSE diff --git a/package/python-maturin/python-maturin.hash b/package/python-maturin/python-maturin.hash new file mode 100644 index 00000000000..b104b1fbbea --- /dev/null +++ b/package/python-maturin/python-maturin.hash @@ -0,0 +1,5 @@ +# Locally calculated after vendoring +sha256 59157a06c0a482aec750d64746f2b23e556ce3ec62d9cdce74fcb7b4658b722b maturin-0.14.9.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 new file mode 100644 index 00000000000..3484e09d227 --- /dev/null +++ b/package/python-maturin/python-maturin.mk @@ -0,0 +1,24 @@ +################################################################################ +# +# python-maturin +# +################################################################################ + +PYTHON_MATURIN_VERSION = 0.14.9 +PYTHON_MATURIN_SOURCE = maturin-$(PYTHON_MATURIN_VERSION).tar.gz +PYTHON_MATURIN_SITE = https://files.pythonhosted.org/packages/90/f9/f4242c0e8bc5def9a7135c12574449dbb411ecc595cf72202ca97a79c2ad +PYTHON_MATURIN_SETUP_TYPE = setuptools +PYTHON_MATURIN_LICENSE = Apache-2.0 or MIT +PYTHON_MATURIN_LICENSE_FILES = license-apache license-mit +HOST_PYTHON_MATURIN_DEPENDENCIES = \ + host-python-setuptools-rust \ + host-rustc +HOST_PYTHON_MATURIN_ENV = \ + $(HOST_PKG_CARGO_ENV) \ + PYO3_CROSS_LIB_DIR="$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)" +# We need to vendor the Cargo crates at download time +PYTHON_MATURIN_DOWNLOAD_POST_PROCESS = cargo +PYTHON_MATURIN_DOWNLOAD_DEPENDENCIES = host-rustc +HOST_PYTHON_MATURIN_DL_ENV = $(HOST_PKG_CARGO_ENV) + +$(eval $(host-python-package)) diff --git a/package/python-mbstrdecoder/python-mbstrdecoder.hash b/package/python-mbstrdecoder/python-mbstrdecoder.hash index 90b9abb8d67..dd2f412bee4 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 b32ff478a38730a8ab0b884fe162cc41 mbstrdecoder-1.1.0.tar.gz -sha256 f4dfd549e424ad8dfc985e6af8b55cb4ec0c208782f610d57439fe6a9a44c244 mbstrdecoder-1.1.0.tar.gz +md5 62efa113a3cd2d40942359d6699338f7 mbstrdecoder-1.1.1.tar.gz +sha256 0a99413b92bbaddda89d376f496d710dc7131417e98414a756ebcd41374e068d mbstrdecoder-1.1.1.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 63f9af74f5d..f875e4d71d7 100644 --- a/package/python-mbstrdecoder/python-mbstrdecoder.mk +++ b/package/python-mbstrdecoder/python-mbstrdecoder.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MBSTRDECODER_VERSION = 1.1.0 +PYTHON_MBSTRDECODER_VERSION = 1.1.1 PYTHON_MBSTRDECODER_SOURCE = mbstrdecoder-$(PYTHON_MBSTRDECODER_VERSION).tar.gz -PYTHON_MBSTRDECODER_SITE = https://files.pythonhosted.org/packages/6c/10/f82ba5a91489c91bf6adaa0e1aca38a7ab2d1d7d80195a5f6ad8c2ff387a +PYTHON_MBSTRDECODER_SITE = https://files.pythonhosted.org/packages/ba/ac/ba46bb6eb6165541ce25ff230469efe1c04043cf173f856dcc91876c38de PYTHON_MBSTRDECODER_SETUP_TYPE = setuptools PYTHON_MBSTRDECODER_LICENSE = MIT PYTHON_MBSTRDECODER_LICENSE_FILES = LICENSE diff --git a/package/python-memory-profiler/python-memory-profiler.hash b/package/python-memory-profiler/python-memory-profiler.hash index 9ee515b5292..bab9018331e 100644 --- a/package/python-memory-profiler/python-memory-profiler.hash +++ b/package/python-memory-profiler/python-memory-profiler.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/memory-profiler/json -md5 b1d1783064a1198fb21bc877e535ec1b memory_profiler-0.58.0.tar.gz -sha256 01385ac0fec944fcf7969814ec4406c6d8a9c66c079d09276723c5a7680f44e5 memory_profiler-0.58.0.tar.gz +md5 5fe93d5035288095c4f86ef69ee19f37 memory_profiler-0.61.0.tar.gz +sha256 4e5b73d7864a1d1292fb76a03e82a3e78ef934d06828a698d9dada76da2067b0 memory_profiler-0.61.0.tar.gz # Locally computed sha256 checksums sha256 51926ce91b8283532efa9dfb02518582c15f49c105a3ac18cce1f7a4947e96ae COPYING diff --git a/package/python-memory-profiler/python-memory-profiler.mk b/package/python-memory-profiler/python-memory-profiler.mk index 053b0e2d621..c7f84043eb9 100644 --- a/package/python-memory-profiler/python-memory-profiler.mk +++ b/package/python-memory-profiler/python-memory-profiler.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MEMORY_PROFILER_VERSION = 0.58.0 +PYTHON_MEMORY_PROFILER_VERSION = 0.61.0 PYTHON_MEMORY_PROFILER_SOURCE = memory_profiler-$(PYTHON_MEMORY_PROFILER_VERSION).tar.gz -PYTHON_MEMORY_PROFILER_SITE = https://files.pythonhosted.org/packages/8f/fd/d92b3295657f8837e0177e7b48b32d6651436f0293af42b76d134c3bb489 +PYTHON_MEMORY_PROFILER_SITE = https://files.pythonhosted.org/packages/b2/88/e1907e1ca3488f2d9507ca8b0ae1add7b1cd5d3ca2bc8e5b329382ea2c7b PYTHON_MEMORY_PROFILER_SETUP_TYPE = setuptools PYTHON_MEMORY_PROFILER_LICENSE = BSD-3-Clause PYTHON_MEMORY_PROFILER_LICENSE_FILES = COPYING diff --git a/package/python-mimeparse/python-mimeparse.hash b/package/python-mimeparse/python-mimeparse.hash index 9721c5fa0c1..00985841dc2 100644 --- a/package/python-mimeparse/python-mimeparse.hash +++ b/package/python-mimeparse/python-mimeparse.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/python-mimeparse/json -md5 a32ae1df93be1ddb581d1c0fa124bab4 python-mimeparse-1.6.0.tar.gz -sha256 76e4b03d700a641fd7761d3cd4fdbbdcd787eade1ebfac43f877016328334f78 python-mimeparse-1.6.0.tar.gz +md5 a32ae1df93be1ddb581d1c0fa124bab4 python-mimeparse-1.6.0.tar.gz +sha256 76e4b03d700a641fd7761d3cd4fdbbdcd787eade1ebfac43f877016328334f78 python-mimeparse-1.6.0.tar.gz # Locally computed sha256 checksums -sha256 89807acf2309bd285f033404ee78581602f3cd9b819a16ac2f0e5f60ff4a473e LICENSE +sha256 89807acf2309bd285f033404ee78581602f3cd9b819a16ac2f0e5f60ff4a473e LICENSE diff --git a/package/python-minimalmodbus/Config.in b/package/python-minimalmodbus/Config.in new file mode 100644 index 00000000000..fd0f33e0d4b --- /dev/null +++ b/package/python-minimalmodbus/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_MINIMALMODBUS + bool "python-minimalmodbus" + select BR2_PACKAGE_PYTHON_SERIAL # runtime + help + Easy-to-use Modbus RTU and Modbus ASCII implementation. + + https://minimalmodbus.readthedocs.io/ diff --git a/package/python-minimalmodbus/python-minimalmodbus.hash b/package/python-minimalmodbus/python-minimalmodbus.hash new file mode 100644 index 00000000000..b29e83773bc --- /dev/null +++ b/package/python-minimalmodbus/python-minimalmodbus.hash @@ -0,0 +1,4 @@ +# sha256 from https://pypi.org/project/minimalmodbus +sha256 cf873a2530be3f4b86467c3e4d47b5f69fd345d47451baca4adbf59e2ac36d00 minimalmodbus-2.0.1.tar.gz +# Hash for license file +sha256 abe787d472ae2069e935c84eb13fd770518dfb08b92d5f190f3cd7ff6d1f6f32 LICENSE diff --git a/package/python-minimalmodbus/python-minimalmodbus.mk b/package/python-minimalmodbus/python-minimalmodbus.mk new file mode 100644 index 00000000000..b463cf9ffe0 --- /dev/null +++ b/package/python-minimalmodbus/python-minimalmodbus.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-minimalmodbus +# +################################################################################ + +PYTHON_MINIMALMODBUS_VERSION = 2.0.1 +PYTHON_MINIMALMODBUS_SOURCE = minimalmodbus-$(PYTHON_MINIMALMODBUS_VERSION).tar.gz +PYTHON_MINIMALMODBUS_SITE = https://files.pythonhosted.org/packages/78/99/8cd22b4465e697bae2b02fd06aaccd4c5cdfbb18945d728db99f23d71df9 +PYTHON_MINIMALMODBUS_SETUP_TYPE = setuptools +PYTHON_MINIMALMODBUS_LICENSE = Apache-2.0 +PYTHON_MINIMALMODBUS_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/package/python-mistune/python-mistune.hash b/package/python-mistune/python-mistune.hash index f545308f4b9..161f2ed6ff3 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 fb6ab174ece938dea09f8b2adad771e4 mistune-0.8.4.tar.gz -sha256 59a3429db53c50b5c6bcc8a07f8848cb00d7dc8bdb431a4ab41920d201d4756e mistune-0.8.4.tar.gz +md5 a4437edb22cf6519a7c61730fecb1a3f mistune-2.0.4.tar.gz +sha256 9ee0a66053e2267aba772c71e06891fa8f1af6d4b01d5e84e267b4570d4d9808 mistune-2.0.4.tar.gz # Locally computed sha256 checksums -sha256 0c5259c3dd0a7c46f4835221645f62a0638c9b9faa02af08676e8069e1ff964b LICENSE +sha256 539013fd8e19f744f8bf0e27a532bbff54cd689ecef7a800f56ae5dc824be870 LICENSE diff --git a/package/python-mistune/python-mistune.mk b/package/python-mistune/python-mistune.mk index 6beb4258379..1e4bb71903e 100644 --- a/package/python-mistune/python-mistune.mk +++ b/package/python-mistune/python-mistune.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MISTUNE_VERSION = 0.8.4 +PYTHON_MISTUNE_VERSION = 2.0.4 PYTHON_MISTUNE_SOURCE = mistune-$(PYTHON_MISTUNE_VERSION).tar.gz -PYTHON_MISTUNE_SITE = https://files.pythonhosted.org/packages/2d/a4/509f6e7783ddd35482feda27bc7f72e65b5e7dc910eca4ab2164daf9c577 +PYTHON_MISTUNE_SITE = https://files.pythonhosted.org/packages/cd/9b/0f98334812f548a5ee4399b76e33752a74fc7bb976f5efb34d962f03d585 PYTHON_MISTUNE_LICENSE = BSD-3-Clause PYTHON_MISTUNE_LICENSE_FILES = LICENSE PYTHON_MISTUNE_SETUP_TYPE = setuptools diff --git a/package/python-more-itertools/python-more-itertools.hash b/package/python-more-itertools/python-more-itertools.hash index 4e6e7bdfb81..c12d3f5623c 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 9930552c4f7eedc00193673d5f7f0f19 more-itertools-8.10.0.tar.gz -sha256 1debcabeb1df793814859d64a81ad7cb10504c24349368ccf214c664c474f41f more-itertools-8.10.0.tar.gz +md5 58f6fe36c3c94bbc569130df546dcfc9 more-itertools-9.0.0.tar.gz +sha256 5a6257e40878ef0520b1803990e3e22303a41b5714006c32a3fd8304b26ea1ab more-itertools-9.0.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 3b9957b72ed..734d87e057f 100644 --- a/package/python-more-itertools/python-more-itertools.mk +++ b/package/python-more-itertools/python-more-itertools.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_MORE_ITERTOOLS_VERSION = 8.10.0 +PYTHON_MORE_ITERTOOLS_VERSION = 9.0.0 PYTHON_MORE_ITERTOOLS_SOURCE = more-itertools-$(PYTHON_MORE_ITERTOOLS_VERSION).tar.gz -PYTHON_MORE_ITERTOOLS_SITE = https://files.pythonhosted.org/packages/8a/f7/93cf3c81629c95f6f40e509f7cd63985a6ddd829181a66c1c8ef101e55f2 -PYTHON_MORE_ITERTOOLS_SETUP_TYPE = setuptools +PYTHON_MORE_ITERTOOLS_SITE = https://files.pythonhosted.org/packages/13/b3/397aa9668da8b1f0c307bc474608653d46122ae0563d1d32f60e24fa0cbd +PYTHON_MORE_ITERTOOLS_SETUP_TYPE = flit PYTHON_MORE_ITERTOOLS_LICENSE = MIT PYTHON_MORE_ITERTOOLS_LICENSE_FILES = LICENSE diff --git a/package/python-msgfy/python-msgfy.hash b/package/python-msgfy/python-msgfy.hash index c795f7fa5e5..9f5bfe48044 100644 --- a/package/python-msgfy/python-msgfy.hash +++ b/package/python-msgfy/python-msgfy.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/msgfy/json -md5 4a3d8ac9908acd5f661a58b12f9e0d17 msgfy-0.1.0.tar.gz -sha256 474c08302cd56ccee1300ac7976a01ebd1e42716fc9bcd947d39a311a15b7012 msgfy-0.1.0.tar.gz +md5 1727a08a0cf7fb704045168c71993280 msgfy-0.2.0.tar.gz +sha256 37c907cccb19afe73ce44111a21b410b685be92c9c44496bc4381fd93c5ad7b6 msgfy-0.2.0.tar.gz # Locally computed sha256 checksums sha256 fcfe96f8fb1bf3478a51c828e7f7afee01500ce1c2d4345d052edb858be05227 LICENSE diff --git a/package/python-msgfy/python-msgfy.mk b/package/python-msgfy/python-msgfy.mk index c187061d41a..4100a912b2c 100644 --- a/package/python-msgfy/python-msgfy.mk +++ b/package/python-msgfy/python-msgfy.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MSGFY_VERSION = 0.1.0 +PYTHON_MSGFY_VERSION = 0.2.0 PYTHON_MSGFY_SOURCE = msgfy-$(PYTHON_MSGFY_VERSION).tar.gz -PYTHON_MSGFY_SITE = https://files.pythonhosted.org/packages/24/b5/7cc6ba75b6489245f9b75f11a85202b934fa92f6c99a4fa1c639f08d68e8 +PYTHON_MSGFY_SITE = https://files.pythonhosted.org/packages/c6/2a/663ef86625f34ee4165da1eb824442cfb1f676e892946d7fe39a8c775682 PYTHON_MSGFY_SETUP_TYPE = setuptools PYTHON_MSGFY_LICENSE = MIT PYTHON_MSGFY_LICENSE_FILES = LICENSE diff --git a/package/python-msgpack/python-msgpack.hash b/package/python-msgpack/python-msgpack.hash index 382bada4a70..4d0f510883d 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 2dcb4fa618d7890e5a79de6fe44cbb59 msgpack-1.0.3.tar.gz -sha256 51fdc7fb93615286428ee7758cecc2f374d5ff363bdd884c7ea622a7a327a81e msgpack-1.0.3.tar.gz +md5 1822cdb939e7531f7ad0f7f09b434f22 msgpack-1.0.4.tar.gz +sha256 f5d869c18f030202eb412f08b28d2afeea553d6613aee89e200d7aca7ef01f5f msgpack-1.0.4.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 c50b7157a0e..d9304e4def6 100644 --- a/package/python-msgpack/python-msgpack.mk +++ b/package/python-msgpack/python-msgpack.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MSGPACK_VERSION = 1.0.3 +PYTHON_MSGPACK_VERSION = 1.0.4 PYTHON_MSGPACK_SOURCE = msgpack-$(PYTHON_MSGPACK_VERSION).tar.gz -PYTHON_MSGPACK_SITE = https://files.pythonhosted.org/packages/61/3c/2206f39880d38ca7ad8ac1b28d2d5ca81632d163b2d68ef90e46409ca057 +PYTHON_MSGPACK_SITE = https://files.pythonhosted.org/packages/22/44/0829b19ac243211d1d2bd759999aa92196c546518b0be91de9cacc98122a 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 999c8867d06..568c320c538 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 f8230905ad1f50c87e8d9cc6b0bb7ca2 multidict-6.0.2.tar.gz -sha256 5ff3bd75f38e4c43f1f470f2df7a4d430b821c4ce22be384e1459cb57d6bb013 multidict-6.0.2.tar.gz +md5 ec06a613d871dadfb66f2be3a1f2f3fa multidict-6.0.4.tar.gz +sha256 3666906492efb76453c0e7b97f2cf459b0682e7402c0489a95484965dbc1da49 multidict-6.0.4.tar.gz # Locally computed sha256 checksums sha256 06a240ea10ba868fda2de58df859886961df873aa74bbab1e0f13eaf99f92b7b LICENSE diff --git a/package/python-multidict/python-multidict.mk b/package/python-multidict/python-multidict.mk index 1a9aec7ba78..cd35dcb4cb5 100644 --- a/package/python-multidict/python-multidict.mk +++ b/package/python-multidict/python-multidict.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MULTIDICT_VERSION = 6.0.2 +PYTHON_MULTIDICT_VERSION = 6.0.4 PYTHON_MULTIDICT_SOURCE = multidict-$(PYTHON_MULTIDICT_VERSION).tar.gz -PYTHON_MULTIDICT_SITE = https://files.pythonhosted.org/packages/fa/a7/71c253cdb8a1528802bac7503bf82fe674367e4055b09c28846fdfa4ab90 +PYTHON_MULTIDICT_SITE = https://files.pythonhosted.org/packages/4a/15/bd620f7a6eb9aa5112c4ef93e7031bcd071e0611763d8e17706ef8ba65e0 PYTHON_MULTIDICT_SETUP_TYPE = setuptools PYTHON_MULTIDICT_LICENSE = Apache-2.0 PYTHON_MULTIDICT_LICENSE_FILES = LICENSE diff --git a/package/python-munch/Config.in b/package/python-munch/Config.in new file mode 100644 index 00000000000..ceb9fbaf325 --- /dev/null +++ b/package/python-munch/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_PYTHON_MUNCH + bool "python-munch" + select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime + select BR2_PACKAGE_PYTHON_SIX # runtime + help + Munch is a dictionary that supports attribute-style access, + a la JavaScript. + + https://github.com/Infinidat/munch diff --git a/package/python-munch/python-munch.hash b/package/python-munch/python-munch.hash new file mode 100644 index 00000000000..7e322828330 --- /dev/null +++ b/package/python-munch/python-munch.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/munch/json +md5 ed84c3718416c8d4d03d0a6ef46e8e0c munch-2.5.0.tar.gz +sha256 2d735f6f24d4dba3417fa448cae40c6e896ec1fdab6cdb5e6510999758a4dbd2 munch-2.5.0.tar.gz +# Locally computed sha256 checksums +sha256 57ca95c92059c8380625192462979bd32994aae3fcdf902ff6eb1e467eeb0469 LICENSE.txt diff --git a/package/python-munch/python-munch.mk b/package/python-munch/python-munch.mk new file mode 100644 index 00000000000..85f6803f076 --- /dev/null +++ b/package/python-munch/python-munch.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-munch +# +################################################################################ + +PYTHON_MUNCH_VERSION = 2.5.0 +PYTHON_MUNCH_SOURCE = munch-$(PYTHON_MUNCH_VERSION).tar.gz +PYTHON_MUNCH_SITE = https://files.pythonhosted.org/packages/43/a1/ec48010724eedfe2add68eb7592a0d238590e14e08b95a4ffb3c7b2f0808 +PYTHON_MUNCH_SETUP_TYPE = setuptools +PYTHON_MUNCH_LICENSE = MIT +PYTHON_MUNCH_LICENSE_FILES = LICENSE.txt +PYTHON_MUNCH_DEPENDENCIES = host-python-pbr + +$(eval $(python-package)) diff --git a/package/python-mutagen/python-mutagen.hash b/package/python-mutagen/python-mutagen.hash index 0cf25fd5feb..2e1a5889369 100644 --- a/package/python-mutagen/python-mutagen.hash +++ b/package/python-mutagen/python-mutagen.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/mutagen/json -md5 76e1f7fc2386813c0ff2716695fb06e1 mutagen-1.45.1.tar.gz -sha256 6397602efb3c2d7baebd2166ed85731ae1c1d475abca22090b7141ff5034b3e1 mutagen-1.45.1.tar.gz +md5 648c9f38b8ef46ffb0d5135524650b87 mutagen-1.46.0.tar.gz +sha256 6e5f8ba84836b99fe60be5fb27f84be4ad919bbb6b49caa6ae81e70584b55e58 mutagen-1.46.0.tar.gz # Locally computed sha256 checksums sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/python-mutagen/python-mutagen.mk b/package/python-mutagen/python-mutagen.mk index 627ec70e969..07ac9542c6a 100644 --- a/package/python-mutagen/python-mutagen.mk +++ b/package/python-mutagen/python-mutagen.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MUTAGEN_VERSION = 1.45.1 +PYTHON_MUTAGEN_VERSION = 1.46.0 PYTHON_MUTAGEN_SOURCE = mutagen-$(PYTHON_MUTAGEN_VERSION).tar.gz -PYTHON_MUTAGEN_SITE = https://files.pythonhosted.org/packages/f3/d9/2232a4cb9a98e2d2501f7e58d193bc49c956ef23756d7423ba1bd87e386d +PYTHON_MUTAGEN_SITE = https://files.pythonhosted.org/packages/b1/54/d1760a363d0fe345528e37782f6c18123b0e99e8ea755022fd51f1ecd0f9 PYTHON_MUTAGEN_LICENSE = GPL-2.0 PYTHON_MUTAGEN_LICENSE_FILES = COPYING PYTHON_MUTAGEN_SETUP_TYPE = setuptools diff --git a/package/python-mypy-extensions/Config.in b/package/python-mypy-extensions/Config.in new file mode 100644 index 00000000000..cc5b78033e7 --- /dev/null +++ b/package/python-mypy-extensions/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_MYPY_EXTENSIONS + bool "python-mypy-extensions" + help + Experimental type system extensions for programs checked + with the mypy typechecker. + + https://github.com/python/mypy_extensions diff --git a/package/python-mypy-extensions/python-mypy-extensions.hash b/package/python-mypy-extensions/python-mypy-extensions.hash new file mode 100644 index 00000000000..ffe850d7bdc --- /dev/null +++ b/package/python-mypy-extensions/python-mypy-extensions.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/mypy_extensions/json +md5 4163ff73d0db8631c0a78bb55b551c84 mypy_extensions-0.4.3.tar.gz +sha256 2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8 mypy_extensions-0.4.3.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 new file mode 100644 index 00000000000..26dc329a373 --- /dev/null +++ b/package/python-mypy-extensions/python-mypy-extensions.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-mypy-extensions +# +################################################################################ + +PYTHON_MYPY_EXTENSIONS_VERSION = 0.4.3 +PYTHON_MYPY_EXTENSIONS_SOURCE = mypy_extensions-$(PYTHON_MYPY_EXTENSIONS_VERSION).tar.gz +PYTHON_MYPY_EXTENSIONS_SITE = https://files.pythonhosted.org/packages/63/60/0582ce2eaced55f65a4406fc97beba256de4b7a95a0034c6576458c6519f +PYTHON_MYPY_EXTENSIONS_SETUP_TYPE = setuptools +PYTHON_MYPY_EXTENSIONS_LICENSE = MIT +PYTHON_MYPY_EXTENSIONS_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/package/python-nested-dict/python-nested-dict.hash b/package/python-nested-dict/python-nested-dict.hash index 15f0ed8b5f9..e5193e23725 100644 --- a/package/python-nested-dict/python-nested-dict.hash +++ b/package/python-nested-dict/python-nested-dict.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/nested-dict/json -md5 e08e2e8de6d002f9ddda4eea5a4528c2 nested_dict-1.61.tar.gz -sha256 de0fb5bac82ba7bcc23736f09373f18628ea57f92bbaa13480d23f261c41e771 nested_dict-1.61.tar.gz +md5 e08e2e8de6d002f9ddda4eea5a4528c2 nested_dict-1.61.tar.gz +sha256 de0fb5bac82ba7bcc23736f09373f18628ea57f92bbaa13480d23f261c41e771 nested_dict-1.61.tar.gz # Locally computed sha256 checksums -sha256 c84eb6b667b91fd9b8991f500c168354eb51af5b2dd970d8ee51ce336d9aeed1 LICENSE.TXT +sha256 c84eb6b667b91fd9b8991f500c168354eb51af5b2dd970d8ee51ce336d9aeed1 LICENSE.TXT diff --git a/package/python-netaddr/python-netaddr.hash b/package/python-netaddr/python-netaddr.hash index 91b200768f6..d55390aad38 100644 --- a/package/python-netaddr/python-netaddr.hash +++ b/package/python-netaddr/python-netaddr.hash @@ -1,5 +1,5 @@ # md5 from https://pypi.python.org/pypi/netaddr/json -md5 34cad578473b66ad77bc3b2a7613ed4a netaddr-0.8.0.tar.gz +md5 34cad578473b66ad77bc3b2a7613ed4a netaddr-0.8.0.tar.gz # Locally computed -sha256 d6cc57c7a07b1d9d2e917aa8b36ae8ce61c35ba3fcd1b83ca31c5a0ee2b5a243 netaddr-0.8.0.tar.gz +sha256 d6cc57c7a07b1d9d2e917aa8b36ae8ce61c35ba3fcd1b83ca31c5a0ee2b5a243 netaddr-0.8.0.tar.gz sha256 0e53de62547787462f41eefb5cee31a14f7ea767ba0362c6f9304f1742486d47 LICENSE diff --git a/package/python-networkmanager/python-networkmanager.hash b/package/python-networkmanager/python-networkmanager.hash index 6ca94450f0d..d4e21f1d82c 100644 --- a/package/python-networkmanager/python-networkmanager.hash +++ b/package/python-networkmanager/python-networkmanager.hash @@ -1,5 +1,5 @@ -# md5 and sha256 from https://pypi.python.org/pypi/python-networkmanager/json -md5 f638d854a3639fb37c0e06d1092a771e python-networkmanager-2.1.tar.gz -sha256 aef1e34d98d7bec7cc368e0ca0f2e97493f9b5ebe6d7103f8f6460cfca3dc6fc python-networkmanager-2.1.tar.gz -# Locally computed -sha256 be40f44d54bb5e0f0eee28e957ad020a00a6e3adb0290262e92129eba1c044cf COPYING +# md5, sha256 from https://pypi.org/pypi/python-networkmanager/json +md5 7e05d3ca40a4fa50222ba93cda3d0d02 python-networkmanager-2.2.tar.gz +sha256 de6eb921d94aba7549f428ed2b3aa482a5d543ecb6965cbaa0fbb555ab31b9d5 python-networkmanager-2.2.tar.gz +# Locally computed sha256 checksums +sha256 d12bbc105c723d4471b39fe8197d43df822e5b4bda822a8255719d039e701f49 COPYING diff --git a/package/python-networkmanager/python-networkmanager.mk b/package/python-networkmanager/python-networkmanager.mk index de893f757a7..785d2c0d3ec 100644 --- a/package/python-networkmanager/python-networkmanager.mk +++ b/package/python-networkmanager/python-networkmanager.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_NETWORKMANAGER_VERSION = 2.1 -PYTHON_NETWORKMANAGER_SITE = https://files.pythonhosted.org/packages/73/ec/2cc46290cedc99f59df3633d428dfa91d95946ca49af96fdb53514ee195f +PYTHON_NETWORKMANAGER_VERSION = 2.2 +PYTHON_NETWORKMANAGER_SITE = https://files.pythonhosted.org/packages/f2/3d/0924d03117636b80a88af783f857fb101e4c47953a8bb0f733b964d50af4 PYTHON_NETWORKMANAGER_SETUP_TYPE = setuptools PYTHON_NETWORKMANAGER_LICENSE = Zlib PYTHON_NETWORKMANAGER_LICENSE_FILES = COPYING diff --git a/package/python-networkx/Config.in b/package/python-networkx/Config.in index 0f3e86f497d..e2fc6ae478d 100644 --- a/package/python-networkx/Config.in +++ b/package/python-networkx/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_NETWORKX bool "python-networkx" - select BR2_PACKAGE_PYTHON_DECORATOR # runtime help A Python package for the creation, manipulation, and study of the structure, dynamics, and diff --git a/package/python-networkx/python-networkx.hash b/package/python-networkx/python-networkx.hash index ace5c6721a0..96ef9777da7 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 407eb28c54e08725559754ca7ab185e0 networkx-2.6.3.tar.gz -sha256 c0946ed31d71f1b732b5aaa6da5a0388a345019af232ce2f49c766e2d6795c51 networkx-2.6.3.tar.gz +md5 1bfbb5cd184b486feae8345f541a5e50 networkx-3.0.tar.gz +sha256 9a9992345353618ae98339c2b63d8201c381c2944f38a2ab49cb45a4c667e412 networkx-3.0.tar.gz # Locally computed sha256 checksums -sha256 f9c25c92ced5a264a3fe857231205d5eb625ae367935aaf8d61cdd5087dfb90e LICENSE.txt +sha256 50b5a27cb43f7a20cede7aa7b9ab2033552e0412c9a1fde51d38885c1417e95f LICENSE.txt diff --git a/package/python-networkx/python-networkx.mk b/package/python-networkx/python-networkx.mk index 1908ed8f933..d369df1a041 100644 --- a/package/python-networkx/python-networkx.mk +++ b/package/python-networkx/python-networkx.mk @@ -4,15 +4,14 @@ # ################################################################################ -PYTHON_NETWORKX_VERSION = 2.6.3 +PYTHON_NETWORKX_VERSION = 3.0 PYTHON_NETWORKX_SOURCE = networkx-$(PYTHON_NETWORKX_VERSION).tar.gz -PYTHON_NETWORKX_SITE = https://files.pythonhosted.org/packages/97/ae/7497bc5e1c84af95e585e3f98585c9f06c627fac6340984c4243053e8f44 +PYTHON_NETWORKX_SITE = https://files.pythonhosted.org/packages/99/f9/d45c9ecf50a6b67a200e0bbd324201b5cd777dfc0e6c8f6d1620ce5a7ada PYTHON_NETWORKX_LICENSE = BSD-3-Clause PYTHON_NETWORKX_LICENSE_FILES = LICENSE.txt PYTHON_NETWORKX_CPE_ID_VENDOR = python PYTHON_NETWORKX_CPE_ID_PRODUCT = networkx PYTHON_NETWORKX_SETUP_TYPE = setuptools -HOST_PYTHON_NETWORKX_DEPENDENCIES = host-python-decorator $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python-numpy/Config.in b/package/python-numpy/Config.in index a65164d9d55..132c3f7a82e 100644 --- a/package/python-numpy/Config.in +++ b/package/python-numpy/Config.in @@ -16,6 +16,7 @@ config BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS config BR2_PACKAGE_PYTHON_NUMPY bool "python-numpy" depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS + depends on BR2_INSTALL_LIBSTDCPP # python-numpy needs fenv.h which is not provided by uclibc depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL help @@ -27,6 +28,7 @@ config BR2_PACKAGE_PYTHON_NUMPY http://www.numpy.org/ -comment "python-numpy needs glibc or musl" +comment "python-numpy needs a glibc or musl toolchain w/ C++" depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS - depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) + depends on !BR2_INSTALL_LIBSTDCPP || \ + !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) diff --git a/package/python-numpy/python-numpy.hash b/package/python-numpy/python-numpy.hash index 7c111f7bc8d..9ac9280c782 100644 --- a/package/python-numpy/python-numpy.hash +++ b/package/python-numpy/python-numpy.hash @@ -1,8 +1,8 @@ -# Copied from https://github.com/numpy/numpy/releases/tag/v1.21.2 -sha256 76af194fbc117934ec5bbe2ff15177adbd05aeed23f18ee209ed88edcd777e05 numpy-1.21.2.tar.gz +# Copied from https://github.com/numpy/numpy/releases/tag/v1.23.5 +sha256 1b1766d6f397c18153d40015ddfc79ddb715cabadc04d2d228d4e5a8bc4ded1a numpy-1.23.5.tar.gz # License files, locally calculated -sha256 bc1b0af15cdc9415ea26c5f1df352c226ac86425ec0fb9ab38d111018bf1c6f2 LICENSE.txt -sha256 2be6947e0432ecf7950ee8fe38681316749dd06d1de17c9ec4de6d2f55adb3a1 numpy/core/src/multiarray/dragon4.c +sha256 0f88787955e7131224f53a8c3f3e859dc502408e3a539a4dcf61fb7888b5b984 LICENSE.txt +sha256 c27d0a8026bdb8876562b720ab24d1688e3827a89f6083cd6e7e8caa9584aba3 numpy/core/src/multiarray/dragon4.c sha256 fbc539f47d0cf83bc61378080fb873d5c14630126cacbfe754035c3926daa5ec numpy/core/include/numpy/libdivide/LICENSE.txt -sha256 a14cc25e10d40a3aa705b7de2fb764a6535d8ee9b2db4e1724900585457dfd55 numpy/linalg/lapack_lite/LICENSE.txt -sha256 badf51c7e3e7de9c7630bd069780f5c197b846ef7660b342a1e58d5553592d8e tools/npy_tempita/license.txt +sha256 a14cc25e10d40a3aa705b7de2fb764a6535d8ee9b2db4e1724900585457dfd55 numpy/linalg/lapack_lite/LICENSE.txt +sha256 badf51c7e3e7de9c7630bd069780f5c197b846ef7660b342a1e58d5553592d8e tools/npy_tempita/license.txt diff --git a/package/python-numpy/python-numpy.mk b/package/python-numpy/python-numpy.mk index 417fe81f575..812bfdae4ae 100644 --- a/package/python-numpy/python-numpy.mk +++ b/package/python-numpy/python-numpy.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_NUMPY_VERSION = 1.21.2 +PYTHON_NUMPY_VERSION = 1.23.5 PYTHON_NUMPY_SOURCE = numpy-$(PYTHON_NUMPY_VERSION).tar.gz PYTHON_NUMPY_SITE = https://github.com/numpy/numpy/releases/download/v$(PYTHON_NUMPY_VERSION) PYTHON_NUMPY_LICENSE = BSD-3-Clause, MIT, Zlib diff --git a/package/python-oauthlib/python-oauthlib.hash b/package/python-oauthlib/python-oauthlib.hash index e55f0c861d1..6a2ad003e1a 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 9201e30a4eacf3ecfa15503b241ad5e3 oauthlib-3.1.1.tar.gz -sha256 8f0215fcc533dd8dd1bee6f4c412d4f0cd7297307d43ac61666389e3bc3198a3 oauthlib-3.1.1.tar.gz +md5 2f7b898cc1af8c1409cc329e8843ea8f oauthlib-3.2.2.tar.gz +sha256 9859c40929662bec5d64f34d01c99e093149682a3f38915dc0655d5a633dd918 oauthlib-3.2.2.tar.gz # Locally computed sha256 checksums sha256 3d1e12d8ac52c0b6c148af6d291f72400b8720ed16c0ac4a89868b6d14b1c939 LICENSE diff --git a/package/python-oauthlib/python-oauthlib.mk b/package/python-oauthlib/python-oauthlib.mk index 7369768b35f..1e49487d6ae 100644 --- a/package/python-oauthlib/python-oauthlib.mk +++ b/package/python-oauthlib/python-oauthlib.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_OAUTHLIB_VERSION = 3.1.1 +PYTHON_OAUTHLIB_VERSION = 3.2.2 PYTHON_OAUTHLIB_SOURCE = oauthlib-$(PYTHON_OAUTHLIB_VERSION).tar.gz -PYTHON_OAUTHLIB_SITE = https://files.pythonhosted.org/packages/9e/84/001a3f8d9680f3b26d5e7711e13d5ff92e4b511766a72ac6b4a4e5f06796 +PYTHON_OAUTHLIB_SITE = https://files.pythonhosted.org/packages/6d/fa/fbf4001037904031639e6bfbfc02badfc7e12f137a8afa254df6c4c8a670 PYTHON_OAUTHLIB_SETUP_TYPE = setuptools PYTHON_OAUTHLIB_LICENSE = BSD-3-Clause PYTHON_OAUTHLIB_LICENSE_FILES = LICENSE diff --git a/package/python-opcua-asyncio/python-opcua-asyncio.hash b/package/python-opcua-asyncio/python-opcua-asyncio.hash index d8aee272def..21b5794ebf6 100644 --- a/package/python-opcua-asyncio/python-opcua-asyncio.hash +++ b/package/python-opcua-asyncio/python-opcua-asyncio.hash @@ -1,3 +1,5 @@ -# Locally computed -sha256 e5fab37a92162351fe40cab43df09db8a2e9f8b8a2a8f13ed680aa6f6d687ec3 opcua-asyncio-0.8.4.tar.gz +# md5, sha256 from https://pypi.org/pypi/asyncua/json +md5 f67770b896d2ffe975adbaea38c5efc9 asyncua-1.0.1.tar.gz +sha256 515342470022b9c391587dcf526015ff4c7582f566c72406c778c9f9a2757cad asyncua-1.0.1.tar.gz +# Locally computed sha256 checksums sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING diff --git a/package/python-opcua-asyncio/python-opcua-asyncio.mk b/package/python-opcua-asyncio/python-opcua-asyncio.mk index 50b581037b9..52c5d5117eb 100644 --- a/package/python-opcua-asyncio/python-opcua-asyncio.mk +++ b/package/python-opcua-asyncio/python-opcua-asyncio.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_OPCUA_ASYNCIO_VERSION = 0.8.4 -PYTHON_OPCUA_ASYNCIO_SOURCE = opcua-asyncio-$(PYTHON_OPCUA_ASYNCIO_VERSION).tar.gz -PYTHON_OPCUA_ASYNCIO_SITE = $(call github,FreeOpcUa,opcua-asyncio,$(PYTHON_OPCUA_ASYNCIO_VERSION)) +PYTHON_OPCUA_ASYNCIO_VERSION = 1.0.1 +PYTHON_OPCUA_ASYNCIO_SOURCE = asyncua-$(PYTHON_OPCUA_ASYNCIO_VERSION).tar.gz +PYTHON_OPCUA_ASYNCIO_SITE = https://files.pythonhosted.org/packages/9f/88/c32bd5904c92475dd30fa2c3130c4f9170a36343d390e2ce5b002fdf1cee PYTHON_OPCUA_ASYNCIO_SETUP_TYPE = setuptools PYTHON_OPCUA_ASYNCIO_LICENSE = LGPL-3.0+ PYTHON_OPCUA_ASYNCIO_LICENSE_FILES = COPYING diff --git a/package/python-orjson/Config.in b/package/python-orjson/Config.in new file mode 100644 index 00000000000..420e023b0a7 --- /dev/null +++ b/package/python-orjson/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_PYTHON_ORJSON + bool "python-orjson" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + select BR2_PACKAGE_PYTHON_CFFI # runtime + help + orjson is a fast, correct JSON library for Python. It + benchmarks as the fastest Python library for JSON and is more + correct than the standard json library or other third-party + libraries. It serializes dataclass, datetime, numpy, and UUID + instances natively. + + https://github.com/ijl/orjson diff --git a/package/python-orjson/python-orjson.hash b/package/python-orjson/python-orjson.hash new file mode 100644 index 00000000000..f1298c05ced --- /dev/null +++ b/package/python-orjson/python-orjson.hash @@ -0,0 +1,5 @@ +# Locally calculated after vendoring +sha256 b932fc1e43598fb91022b1dc651afeaef650793a2a590ca4fbeef57a3808abf5 orjson-3.8.4.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 new file mode 100644 index 00000000000..8eeadecb3d0 --- /dev/null +++ b/package/python-orjson/python-orjson.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# python-orjson +# +################################################################################ + +PYTHON_ORJSON_VERSION = 3.8.4 +PYTHON_ORJSON_SOURCE = orjson-$(PYTHON_ORJSON_VERSION).tar.gz +PYTHON_ORJSON_SITE = https://files.pythonhosted.org/packages/8f/2d/ae31eddf7e097eec5e25c7da954ef6e944f4dbf79153676f94cea3dc5116 +PYTHON_ORJSON_SETUP_TYPE = pep517 +PYTHON_ORJSON_LICENSE = Apache-2.0 or MIT +PYTHON_ORJSON_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT +PYTHON_ORJSON_DEPENDENCIES = host-python-cffi host-python-maturin +PYTHON_ORJSON_ENV = \ + $(PKG_CARGO_ENV) \ + PYO3_CROSS_LIB_DIR="$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)" +# We need to vendor the Cargo crates at download time +PYTHON_ORJSON_DOWNLOAD_POST_PROCESS = cargo +PYTHON_ORJSON_DOWNLOAD_DEPENDENCIES = host-rustc +PYTHON_ORJSON_DL_ENV = $(PKG_CARGO_ENV) + +$(eval $(python-package)) diff --git a/package/python-outcome/Config.in b/package/python-outcome/Config.in new file mode 100644 index 00000000000..bd51f3daea8 --- /dev/null +++ b/package/python-outcome/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_OUTCOME + bool "python-outcome" + select BR2_PACKAGE_PYTHON_ATTRS # runtime + help + Capture the outcome of Python function calls. + + https://github.com/python-trio/outcome diff --git a/package/python-outcome/python-outcome.hash b/package/python-outcome/python-outcome.hash new file mode 100644 index 00000000000..43796e89ac0 --- /dev/null +++ b/package/python-outcome/python-outcome.hash @@ -0,0 +1,7 @@ +# md5, sha256 from https://pypi.org/pypi/outcome/json +md5 58612ee4407901985f85ad3869dd83b8 outcome-1.2.0.tar.gz +sha256 6f82bd3de45da303cf1f771ecafa1633750a358436a8bb60e06a1ceb745d2672 outcome-1.2.0.tar.gz +# Locally computed sha256 checksums +sha256 652c878488d1456361e08c3f8607fd7ba59892a14103d15cce4ff93c85b5cc8b LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.APACHE2 +sha256 3e6dae555eb92787fc82d1d48355677f454c7f65aeb38d3f9e72bf9a3daf034b LICENSE.MIT diff --git a/package/python-outcome/python-outcome.mk b/package/python-outcome/python-outcome.mk new file mode 100644 index 00000000000..27d7fdede3c --- /dev/null +++ b/package/python-outcome/python-outcome.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-outcome +# +################################################################################ + +PYTHON_OUTCOME_VERSION = 1.2.0 +PYTHON_OUTCOME_SOURCE = outcome-$(PYTHON_OUTCOME_VERSION).tar.gz +PYTHON_OUTCOME_SITE = https://files.pythonhosted.org/packages/dd/91/741e1626e89fdc3664169e16300c59eefa4b23540cc6d6c70450f885098f +PYTHON_OUTCOME_SETUP_TYPE = setuptools +PYTHON_OUTCOME_LICENSE = Apache-2.0 or MIT +PYTHON_OUTCOME_LICENSE_FILES = LICENSE LICENSE.APACHE2 LICENSE.MIT + +$(eval $(python-package)) diff --git a/package/python-packaging/Config.in b/package/python-packaging/Config.in index 12170df84e4..c09dfffe2c6 100644 --- a/package/python-packaging/Config.in +++ b/package/python-packaging/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PACKAGING bool "python-packaging" - select BR2_PACKAGE_PYTHON_PYPARSING # runtime help Core utilities for Python packages. diff --git a/package/python-packaging/python-packaging.hash b/package/python-packaging/python-packaging.hash index 0f353a9e367..e10c11904b8 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 e713c1939f294fd729af4a7be40dd141 packaging-21.3.tar.gz -sha256 dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb packaging-21.3.tar.gz +md5 806414ea4c6f17b029a7911b622062e8 packaging-22.0.tar.gz +sha256 2198ec20bd4c017b8f9717e00f0c8714076fc2fd93816750ab48e2c41de2cfd3 packaging-22.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 74b58035257..c9190ccfee2 100644 --- a/package/python-packaging/python-packaging.mk +++ b/package/python-packaging/python-packaging.mk @@ -4,13 +4,13 @@ # ################################################################################ -PYTHON_PACKAGING_VERSION = 21.3 +PYTHON_PACKAGING_VERSION = 22.0 PYTHON_PACKAGING_SOURCE = packaging-$(PYTHON_PACKAGING_VERSION).tar.gz -PYTHON_PACKAGING_SITE = https://files.pythonhosted.org/packages/df/9e/d1a7217f69310c1db8fdf8ab396229f55a699ce34a203691794c5d1cad0c -PYTHON_PACKAGING_SETUP_TYPE = setuptools +PYTHON_PACKAGING_SITE = https://files.pythonhosted.org/packages/6b/f7/c240d7654ddd2d2f3f328d8468d4f1f876865f6b9038b146bec0a6737c65 +PYTHON_PACKAGING_SETUP_TYPE = flit PYTHON_PACKAGING_LICENSE = Apache-2.0 or BSD-2-Clause PYTHON_PACKAGING_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD -HOST_PYTHON_PACKAGING_DEPENDENCIES = host-python-pyparsing +HOST_PYTHON_PACKAGING_SETUP_TYPE = flit-bootstrap $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python-paho-mqtt/python-paho-mqtt.hash b/package/python-paho-mqtt/python-paho-mqtt.hash index 35afcccedb2..81b9dda81d4 100644 --- a/package/python-paho-mqtt/python-paho-mqtt.hash +++ b/package/python-paho-mqtt/python-paho-mqtt.hash @@ -1,6 +1,5 @@ -# md5 from https://pypi.python.org/pypi/paho-mqtt/json, sha256 locally computed -md5 e3ac29cd5dc247a01083a2a8f3fddd08 paho-mqtt-1.4.0.tar.gz -sha256 e440a052b46d222e184be3be38676378722072fcd4dfd2c8f509fb861a7b0b79 paho-mqtt-1.4.0.tar.gz -sha256 76f13729e84e9222e543303df00f87d1b2c0995b6a505cd859a285667e44babb LICENSE.txt -sha256 e8cf7d54ea46c19aba793983889b7f7425e1ebfcaaccec764a7db091646e203c edl-v10 -sha256 3b9be6b894d0769de796e653571ff6cef494913c0ce78c35a97db939e7d9087c epl-v10 +# locally computed +sha256 6e35c1be242a901fc9c00bad7d37b5cc4a497f398dfceb4ed0d8018a959be650 python-paho-mqtt-1.6.1.tar.gz +sha256 66408b049249c3bdb0ba1ed285f5422ce67e371d40151bebd4d806af454ffe7c LICENSE.txt +sha256 e8cf7d54ea46c19aba793983889b7f7425e1ebfcaaccec764a7db091646e203c edl-v10 +sha256 8c349f80764d0648e645f41ef23772a70c995a0924b5235f735f4a3d09df127c epl-v20 diff --git a/package/python-paho-mqtt/python-paho-mqtt.mk b/package/python-paho-mqtt/python-paho-mqtt.mk index d192749e1e1..f255a7847dd 100644 --- a/package/python-paho-mqtt/python-paho-mqtt.mk +++ b/package/python-paho-mqtt/python-paho-mqtt.mk @@ -4,11 +4,10 @@ # ################################################################################ -PYTHON_PAHO_MQTT_VERSION = 1.4.0 -PYTHON_PAHO_MQTT_SOURCE = paho-mqtt-$(PYTHON_PAHO_MQTT_VERSION).tar.gz -PYTHON_PAHO_MQTT_SITE = https://files.pythonhosted.org/packages/25/63/db25e62979c2a716a74950c9ed658dce431b5cb01fde29eb6cba9489a904 -PYTHON_PAHO_MQTT_LICENSE = EPL-1.0 or EDLv1.0 -PYTHON_PAHO_MQTT_LICENSE_FILES = LICENSE.txt edl-v10 epl-v10 +PYTHON_PAHO_MQTT_VERSION = 1.6.1 +PYTHON_PAHO_MQTT_SITE = $(call github,eclipse,paho.mqtt.python,v$(PYTHON_PAHO_MQTT_VERSION)) +PYTHON_PAHO_MQTT_LICENSE = EPL-2.0, EDLv1.0 +PYTHON_PAHO_MQTT_LICENSE_FILES = LICENSE.txt epl-v20 edl-v10 PYTHON_PAHO_MQTT_SETUP_TYPE = setuptools $(eval $(python-package)) diff --git a/package/python-paramiko/Config.in b/package/python-paramiko/Config.in index a07af19a4b4..aee658c7908 100644 --- a/package/python-paramiko/Config.in +++ b/package/python-paramiko/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_PYTHON_PARAMIKO bool "python-paramiko" - depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography, python-bcrypt select BR2_PACKAGE_PYTHON_BCRYPT # runtime select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime select BR2_PACKAGE_PYTHON_PYNACL # runtime diff --git a/package/python-paramiko/python-paramiko.hash b/package/python-paramiko/python-paramiko.hash index b11acf1dbcb..b327a6b8a95 100644 --- a/package/python-paramiko/python-paramiko.hash +++ b/package/python-paramiko/python-paramiko.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/paramiko/json -md5 44136d79da4cd7619e368018ad022619 paramiko-2.7.2.tar.gz -sha256 7f36f4ba2c0d81d219f4595e35f70d56cc94f9ac40a6acdf51d6ca210ce65035 paramiko-2.7.2.tar.gz +md5 3f49814473cc153a7189fec31cfacfab paramiko-2.12.0.tar.gz +sha256 376885c05c5d6aa6e1f4608aac2a6b5b0548b1add40274477324605903d9cd49 paramiko-2.12.0.tar.gz # Locally computed sha256 checksums sha256 5fa25bf5f395fd26e701c2e1de4ca7d162816986dc791c22f8f4226857ad1bb2 LICENSE diff --git a/package/python-paramiko/python-paramiko.mk b/package/python-paramiko/python-paramiko.mk index 3c135cf9b1f..621176ed410 100644 --- a/package/python-paramiko/python-paramiko.mk +++ b/package/python-paramiko/python-paramiko.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PARAMIKO_VERSION = 2.7.2 +PYTHON_PARAMIKO_VERSION = 2.12.0 PYTHON_PARAMIKO_SOURCE = paramiko-$(PYTHON_PARAMIKO_VERSION).tar.gz -PYTHON_PARAMIKO_SITE = https://files.pythonhosted.org/packages/cf/a1/20d00ce559a692911f11cadb7f94737aca3ede1c51de16e002c7d3a888e0 +PYTHON_PARAMIKO_SITE = https://files.pythonhosted.org/packages/98/75/e78ddbe671a4a59514b59bc6a321263118e4ac3fe88175dd784d1a47a00f PYTHON_PARAMIKO_SETUP_TYPE = setuptools PYTHON_PARAMIKO_LICENSE = LGPL-2.1+ PYTHON_PARAMIKO_LICENSE_FILES = LICENSE diff --git a/package/python-pathpy/python-pathpy.hash b/package/python-pathpy/python-pathpy.hash index 4ff5abb38ba..f2f1880e4d5 100644 --- a/package/python-pathpy/python-pathpy.hash +++ b/package/python-pathpy/python-pathpy.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/path.py/json -md5 307098b1827af6031687edb49ce2c39c path.py-12.0.1.tar.gz -sha256 9f2169633403aa0423f6ec000e8701dd1819526c62465f5043952f92527fea0f path.py-12.0.1.tar.gz +md5 c748063e113914dcb08e3f4eb6cd1de0 path.py-12.5.0.tar.gz +sha256 8d885e8b2497aed005703d94e0fd97943401f035e42a136810308bff034529a8 path.py-12.5.0.tar.gz # Locally computed sha256 checksums -sha256 a55e2ffe9b44998e621d51d8c094bed09acc4b5236ee73d7df395a33ba3c18fd LICENSE +sha256 a55e2ffe9b44998e621d51d8c094bed09acc4b5236ee73d7df395a33ba3c18fd LICENSE diff --git a/package/python-pathpy/python-pathpy.mk b/package/python-pathpy/python-pathpy.mk index 3b7388bdd26..2fd6e931f85 100644 --- a/package/python-pathpy/python-pathpy.mk +++ b/package/python-pathpy/python-pathpy.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PATHPY_VERSION = 12.0.1 +PYTHON_PATHPY_VERSION = 12.5.0 PYTHON_PATHPY_SOURCE = path.py-$(PYTHON_PATHPY_VERSION).tar.gz -PYTHON_PATHPY_SITE = https://files.pythonhosted.org/packages/70/63/c01c1bb2df17db4c78f78cc439a2800f55bec5445cabf1f3579a37909f41 +PYTHON_PATHPY_SITE = https://files.pythonhosted.org/packages/b6/e3/81be70016d58ade0f516191fa80152daba5453d0b07ce648d9daae86a188 PYTHON_PATHPY_SETUP_TYPE = setuptools PYTHON_PATHPY_LICENSE = MIT PYTHON_PATHPY_LICENSE_FILES = LICENSE diff --git a/package/python-pathspec/python-pathspec.hash b/package/python-pathspec/python-pathspec.hash new file mode 100644 index 00000000000..5eb76cb5f92 --- /dev/null +++ b/package/python-pathspec/python-pathspec.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/pathspec/json +md5 d89408b52aff020ac768a14c0ef1c7de pathspec-0.10.3.tar.gz +sha256 56200de4077d9d0791465aa9095a01d421861e405b5096955051deefd697d6f6 pathspec-0.10.3.tar.gz +# Locally computed sha256 checksums +sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 LICENSE diff --git a/package/python-pathspec/python-pathspec.mk b/package/python-pathspec/python-pathspec.mk new file mode 100644 index 00000000000..e88bce231fc --- /dev/null +++ b/package/python-pathspec/python-pathspec.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-pathspec +# +################################################################################ + +PYTHON_PATHSPEC_VERSION = 0.10.3 +PYTHON_PATHSPEC_SOURCE = pathspec-$(PYTHON_PATHSPEC_VERSION).tar.gz +PYTHON_PATHSPEC_SITE = https://files.pythonhosted.org/packages/32/1a/6baf904503c3e943cae9605c9c88a43b964dea5b59785cf956091b341b08 +PYTHON_PATHSPEC_LICENSE = MPL-2.0 +PYTHON_PATHSPEC_LICENSE_FILES = LICENSE +PYTHON_PATHSPEC_SETUP_TYPE = setuptools + +$(eval $(host-python-package)) diff --git a/package/python-pathtools/python-pathtools.hash b/package/python-pathtools/python-pathtools.hash index 6d7b2975dbd..00099af19b9 100644 --- a/package/python-pathtools/python-pathtools.hash +++ b/package/python-pathtools/python-pathtools.hash @@ -1,6 +1,6 @@ # md5 from https://pypi.python.org/pypi/pathtools/json -md5 9a1af5c605768ea5804b03b734ff0f82 pathtools-0.1.2.tar.gz +md5 9a1af5c605768ea5804b03b734ff0f82 pathtools-0.1.2.tar.gz # sha256 calculated by scanpypi -sha256 7c35c5421a39bb82e58018febd90e3b6e5db34c5443aaaf742b3f33d4655f1c0 pathtools-0.1.2.tar.gz +sha256 7c35c5421a39bb82e58018febd90e3b6e5db34c5443aaaf742b3f33d4655f1c0 pathtools-0.1.2.tar.gz # Locally computed sha256 b52d83fba08f61bd1e603fee1b44cbc7ead9fcb512a5ceb8c53fec90ba415ac4 LICENSE diff --git a/package/python-pathvalidate/python-pathvalidate.hash b/package/python-pathvalidate/python-pathvalidate.hash index adf1a75dcad..828236304e6 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 afc0343cd8c4ad732431a8b860d73330 pathvalidate-2.5.0.tar.gz -sha256 119ba36be7e9a405d704c7b7aea4b871c757c53c9adc0ed64f40be1ed8da2781 pathvalidate-2.5.0.tar.gz +md5 541238984572fb21db2da2af1d70a993 pathvalidate-2.5.2.tar.gz +sha256 5ff57d0fabe5ecb7a4f1e4957bfeb5ad8ab5ab4c0fa71f79c6bbc24bd9b7d14d pathvalidate-2.5.2.tar.gz # Locally computed sha256 checksums sha256 a93d75bcb0774e2990106380cadad6dcb2de193c55d435ffc56ba345a08b1dc2 LICENSE diff --git a/package/python-pathvalidate/python-pathvalidate.mk b/package/python-pathvalidate/python-pathvalidate.mk index bb434f36627..6ca8c0f2ad0 100644 --- a/package/python-pathvalidate/python-pathvalidate.mk +++ b/package/python-pathvalidate/python-pathvalidate.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PATHVALIDATE_VERSION = 2.5.0 +PYTHON_PATHVALIDATE_VERSION = 2.5.2 PYTHON_PATHVALIDATE_SOURCE = pathvalidate-$(PYTHON_PATHVALIDATE_VERSION).tar.gz -PYTHON_PATHVALIDATE_SITE = https://files.pythonhosted.org/packages/2e/89/7853a1ea323e848ab1e90c8930733bc19e35a935deb80d78b572c36ea33f +PYTHON_PATHVALIDATE_SITE = https://files.pythonhosted.org/packages/60/f7/ff244fdd8ed98e98d4f9acecfe74a890e5e3245ce55253ef88db51e94652 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 8cf2a18d360..4ca503e9766 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 62565acc6bf3e7e10b082463421f8b46 pbr-5.6.0.tar.gz -sha256 42df03e7797b796625b1029c0400279c7c34fd7df24a7d7818a1abb5b38710dd pbr-5.6.0.tar.gz +md5 99ef94dbe5a00054fdcbbaa87268c3cd pbr-5.11.0.tar.gz +sha256 b97bc6695b2aff02144133c2e7399d5885223d42b7912ffaec2ca3898e673bfe pbr-5.11.0.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 3cc7ab81fad..99f0101e194 100644 --- a/package/python-pbr/python-pbr.mk +++ b/package/python-pbr/python-pbr.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PBR_VERSION = 5.6.0 +PYTHON_PBR_VERSION = 5.11.0 PYTHON_PBR_SOURCE = pbr-$(PYTHON_PBR_VERSION).tar.gz -PYTHON_PBR_SITE = https://files.pythonhosted.org/packages/35/8c/69ed04ae31ad498c9bdea55766ed4c0c72de596e75ac0d70b58aa25e0acf +PYTHON_PBR_SITE = https://files.pythonhosted.org/packages/52/fb/630d52aaca8fc7634a0711b6ae12a0e828b6f9264bd8051225025c3ed075 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-pep517/python-pep517.hash b/package/python-pep517/python-pep517.hash index 4dd4c47fa06..6535e516567 100644 --- a/package/python-pep517/python-pep517.hash +++ b/package/python-pep517/python-pep517.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pep517/json -md5 7ed0adb5f737c316e071d48d66329a5d pep517-0.12.0.tar.gz -sha256 931378d93d11b298cf511dd634cf5ea4cb249a28ef84160b3247ee9afb4e8ab0 pep517-0.12.0.tar.gz +md5 7fd08b11215256601a8a4940c1ba3d34 pep517-0.13.0.tar.gz +sha256 ae69927c5c172be1add9203726d4b84cf3ebad1edcd5f71fcdc746e66e829f59 pep517-0.13.0.tar.gz # Locally computed sha256 checksums sha256 1b22b049b5267d6dfc23a67bf4a84d8ec04b9fdfb1a51d360e42b4342c8b4154 LICENSE diff --git a/package/python-pep517/python-pep517.mk b/package/python-pep517/python-pep517.mk index 99aa62d51da..c43b09faaa8 100644 --- a/package/python-pep517/python-pep517.mk +++ b/package/python-pep517/python-pep517.mk @@ -4,12 +4,11 @@ # ################################################################################ -PYTHON_PEP517_VERSION = 0.12.0 +PYTHON_PEP517_VERSION = 0.13.0 PYTHON_PEP517_SOURCE = pep517-$(PYTHON_PEP517_VERSION).tar.gz -PYTHON_PEP517_SITE = https://files.pythonhosted.org/packages/0a/65/6e656d49c679136edfba25f25791f45ffe1ea4ae2ec1c59fe9c35e061cd1 +PYTHON_PEP517_SITE = https://files.pythonhosted.org/packages/4d/19/e11fcc88288f68ae48e3aa9cf5a6fd092a88e629cb723465666c44d487a0 PYTHON_PEP517_LICENSE = MIT PYTHON_PEP517_LICENSE_FILES = LICENSE -PYTHON_PEP517_SETUP_TYPE = distutils -HOST_PYTHON_PEP517_DEPENDENCIES = host-python-tomli +PYTHON_PEP517_SETUP_TYPE = flit-bootstrap $(eval $(host-python-package)) diff --git a/package/python-pexpect/python-pexpect.hash b/package/python-pexpect/python-pexpect.hash index 87df05d881e..a38c8d5a03b 100644 --- a/package/python-pexpect/python-pexpect.hash +++ b/package/python-pexpect/python-pexpect.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pexpect/json -md5 153eb25184249d6a85fde9acf4804085 pexpect-4.8.0.tar.gz -sha256 fc65a43959d153d0114afe13997d439c22823a27cefceb5ff35c2178c6784c0c pexpect-4.8.0.tar.gz +md5 153eb25184249d6a85fde9acf4804085 pexpect-4.8.0.tar.gz +sha256 fc65a43959d153d0114afe13997d439c22823a27cefceb5ff35c2178c6784c0c pexpect-4.8.0.tar.gz # Locally computed sha256 checksums -sha256 4a483ae1c4dc738a6c8b73feb49074e1835da02ab5aa686f2675029906fa364d LICENSE +sha256 4a483ae1c4dc738a6c8b73feb49074e1835da02ab5aa686f2675029906fa364d LICENSE diff --git a/package/python-pickleshare/python-pickleshare.hash b/package/python-pickleshare/python-pickleshare.hash index 1b6afcc68c2..1b849e17915 100644 --- a/package/python-pickleshare/python-pickleshare.hash +++ b/package/python-pickleshare/python-pickleshare.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pickleshare/json -md5 44ab782615894a812ab96669a122a634 pickleshare-0.7.5.tar.gz -sha256 87683d47965c1da65cdacaf31c8441d12b8044cdec9aca500cd78fc2c683afca pickleshare-0.7.5.tar.gz +md5 44ab782615894a812ab96669a122a634 pickleshare-0.7.5.tar.gz +sha256 87683d47965c1da65cdacaf31c8441d12b8044cdec9aca500cd78fc2c683afca pickleshare-0.7.5.tar.gz # Locally computed sha256 checksums -sha256 db1fefc1789444409514c0cae0bfab7f8e374ff9b78e092cecb1e0aeb6a36d90 LICENSE +sha256 db1fefc1789444409514c0cae0bfab7f8e374ff9b78e092cecb1e0aeb6a36d90 LICENSE diff --git a/package/python-piexif/python-piexif.hash b/package/python-piexif/python-piexif.hash index 9663ed722d8..5ae7f406f8d 100644 --- a/package/python-piexif/python-piexif.hash +++ b/package/python-piexif/python-piexif.hash @@ -1,3 +1,3 @@ # Locally computed sha256 checksums -sha256 abfd9a67795e23d7a76f9407d60841efa68c5d6e43376b295bb821a30602c569 python-piexif-1.1.3.tar.gz -sha256 d517a0940b8eb92ace7fc88f75892d84d260d85b3062d36d9e6445bc5091f697 LICENSE.txt +sha256 abfd9a67795e23d7a76f9407d60841efa68c5d6e43376b295bb821a30602c569 python-piexif-1.1.3.tar.gz +sha256 d517a0940b8eb92ace7fc88f75892d84d260d85b3062d36d9e6445bc5091f697 LICENSE.txt diff --git a/package/python-pillow/python-pillow.hash b/package/python-pillow/python-pillow.hash index f3ca8e60141..d514bdfe561 100644 --- a/package/python-pillow/python-pillow.hash +++ b/package/python-pillow/python-pillow.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/pillow/json -md5 c5af6e413d2fe9247cf16ce25c816b14 Pillow-9.0.0.tar.gz -sha256 ee6e2963e92762923956fe5d3479b1fdc3b76c83f290aad131a2f98c3df0593e Pillow-9.0.0.tar.gz +md5 ee6e9a6c729ed9e9a78ccd3f6e9d7143 Pillow-9.4.0.tar.gz +sha256 a1c2d7780448eb93fbcc3789bf3916aa5720d942e37945f4056680317f1cd23e Pillow-9.4.0.tar.gz # Locally computed sha256 checksums -sha256 a6554cb737ba6c9b47d3301f78de03b4ed0d3f08d6cf9400714f3d4c894f6943 LICENSE +sha256 4e1755595052d843e2f350c930759f945ecf707bf812883948d181016b12dd0f LICENSE diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk index 2f2e817882a..c02968610ff 100644 --- a/package/python-pillow/python-pillow.mk +++ b/package/python-pillow/python-pillow.mk @@ -4,15 +4,18 @@ # ################################################################################ -PYTHON_PILLOW_VERSION = 9.0.0 -PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/b0/43/3e286c93b9fa20e233d53532cc419b5aad8a468d91065dbef4c846058834 +PYTHON_PILLOW_VERSION = 9.4.0 +PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/bc/07/830784e061fb94d67649f3e438ff63cfb902dec6d48ac75aeaaac7c7c30e PYTHON_PILLOW_SOURCE = Pillow-$(PYTHON_PILLOW_VERSION).tar.gz PYTHON_PILLOW_LICENSE = HPND PYTHON_PILLOW_LICENSE_FILES = LICENSE PYTHON_PILLOW_CPE_ID_VENDOR = python PYTHON_PILLOW_CPE_ID_PRODUCT = pillow PYTHON_PILLOW_SETUP_TYPE = setuptools -PYTHON_PILLOW_BUILD_OPTS = --disable-platform-guessing + +PYTHON_PILLOW_DEPENDENCIES = host-pkgconf +PYTHON_PILLOW_BUILD_OPTS = build_ext --disable-platform-guessing +PYTHON_PILLOW_INSTALL_TARGET_OPTS = $(PYTHON_PILLOW_BUILD_OPTS) ifeq ($(BR2_PACKAGE_FREETYPE),y) PYTHON_PILLOW_DEPENDENCIES += freetype @@ -68,22 +71,4 @@ else PYTHON_PILLOW_BUILD_OPTS += --disable-webp --disable-webpmux endif -define PYTHON_PILLOW_BUILD_CMDS - cd $(PYTHON_PILLOW_BUILDDIR); \ - PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ - $(PYTHON_PILLOW_BASE_ENV) $(PYTHON_PILLOW_ENV) \ - $(PYTHON_PILLOW_PYTHON_INTERPRETER) setup.py build_ext \ - $(PYTHON_PILLOW_BASE_BUILD_OPTS) $(PYTHON_PILLOW_BUILD_OPTS) -endef - -define PYTHON_PILLOW_INSTALL_TARGET_CMDS - cd $(PYTHON_PILLOW_BUILDDIR); \ - PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ - $(PYTHON_PILLOW_BASE_ENV) $(PYTHON_PILLOW_ENV) \ - $(PYTHON_PILLOW_PYTHON_INTERPRETER) setup.py build_ext \ - $(PYTHON_PILLOW_BUILD_OPTS) install \ - $(PYTHON_PILLOW_BASE_INSTALL_TARGET_OPTS) \ - $(PYTHON_PILLOW_INSTALL_TARGET_OPTS) -endef - $(eval $(python-package)) diff --git a/package/python-pip/python-pip.hash b/package/python-pip/python-pip.hash index 69214110f87..b41ce47d4ca 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 efbdb4201a5e6383fb4d12e26f78f355 pip-21.2.4.tar.gz -sha256 0eb8a1516c3d138ae8689c0c1a60fde7143310832f9dc77e11d8a4bc62de193b pip-21.2.4.tar.gz +md5 996f58a94fe0b8b82b6795c42bd171ba pip-22.3.1.tar.gz +sha256 65fd48317359f3af8e593943e6ae1506b66325085ea64b706a998c6e83eeaf38 pip-22.3.1.tar.gz # Locally computed sha256 checksums -sha256 23a7361c2b1581028bc623b9da2bd24997abcaa4781ace6ad444a37944f8dae1 LICENSE.txt +sha256 634300a669d49aeae65b12c6c48c924c51a4cdf3d1ff086dc3456dc8bcaa2104 LICENSE.txt diff --git a/package/python-pip/python-pip.mk b/package/python-pip/python-pip.mk index 81fc87d5f0c..fdcb113f0cf 100644 --- a/package/python-pip/python-pip.mk +++ b/package/python-pip/python-pip.mk @@ -4,13 +4,16 @@ # ################################################################################ -PYTHON_PIP_VERSION = 21.2.4 +PYTHON_PIP_VERSION = 22.3.1 PYTHON_PIP_SOURCE = pip-$(PYTHON_PIP_VERSION).tar.gz -PYTHON_PIP_SITE = https://files.pythonhosted.org/packages/52/e1/06c018197d8151383f66ebf6979d951995cf495629fc54149491f5d157d0 +PYTHON_PIP_SITE = https://files.pythonhosted.org/packages/a3/50/c4d2727b99052780aad92c7297465af5fe6eec2dbae490aa9763273ffdc1 PYTHON_PIP_SETUP_TYPE = setuptools PYTHON_PIP_LICENSE = MIT PYTHON_PIP_LICENSE_FILES = LICENSE.txt PYTHON_PIP_CPE_ID_VENDOR = pypa PYTHON_PIP_CPE_ID_PRODUCT = pip +# Disputed CVE: things work as designed, and only affects the +# --extra-index-url option. This CVE will never be fixed. +PYTHON_PIP_IGNORE_CVES += CVE-2018-20225 $(eval $(python-package)) diff --git a/package/python-pluggy/python-pluggy.mk b/package/python-pluggy/python-pluggy.mk index 59382518ed7..6dc6f970eab 100644 --- a/package/python-pluggy/python-pluggy.mk +++ b/package/python-pluggy/python-pluggy.mk @@ -11,5 +11,7 @@ PYTHON_PLUGGY_SETUP_TYPE = setuptools PYTHON_PLUGGY_LICENSE = MIT PYTHON_PLUGGY_LICENSE_FILES = LICENSE PYTHON_PLUGGY_DEPENDENCIES = host-python-setuptools-scm +HOST_PYTHON_PLUGGY_DEPENDENCIES = host-python-setuptools-scm $(eval $(python-package)) +$(eval $(host-python-package)) diff --git a/package/python-ply/python-ply.hash b/package/python-ply/python-ply.hash index 1eba3b0ffeb..88d30d67d7c 100644 --- a/package/python-ply/python-ply.hash +++ b/package/python-ply/python-ply.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/ply/json -md5 6465f602e656455affcd7c5734c638f8 ply-3.11.tar.gz -sha256 00c7c1aaa88358b9c765b6d3000c6eec0ba42abca5351b095321aef446081da3 ply-3.11.tar.gz +md5 6465f602e656455affcd7c5734c638f8 ply-3.11.tar.gz +sha256 00c7c1aaa88358b9c765b6d3000c6eec0ba42abca5351b095321aef446081da3 ply-3.11.tar.gz # Locally computed sha256 checksums -sha256 1095b93b81d2043c5c55e0859875b416f75edb6d5eccb4bf2ace1b5445d1c84f README.md +sha256 1095b93b81d2043c5c55e0859875b416f75edb6d5eccb4bf2ace1b5445d1c84f README.md diff --git a/package/python-portend/python-portend.hash b/package/python-portend/python-portend.hash index 14338df0559..6af3b77792d 100644 --- a/package/python-portend/python-portend.hash +++ b/package/python-portend/python-portend.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/portend/json -md5 0ab51a12b7462a5275946a3645a71e92 portend-2.5.tar.gz -sha256 19dc27bfb3c72471bd30a235a4d5fbefef8a7e31cab367744b5d87a205e7bfd9 portend-2.5.tar.gz +md5 c37d676837505a6fc8dd33185c6d62a7 portend-3.1.0.tar.gz +sha256 239e3116045ea823f6df87d6168107ad75ccc0590e37242af0cc1e98c5d224e4 portend-3.1.0.tar.gz # Locally computed sha256 checksums -sha256 a55e2ffe9b44998e621d51d8c094bed09acc4b5236ee73d7df395a33ba3c18fd LICENSE +sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE diff --git a/package/python-portend/python-portend.mk b/package/python-portend/python-portend.mk index 8d619052c94..4322121e9b0 100644 --- a/package/python-portend/python-portend.mk +++ b/package/python-portend/python-portend.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PORTEND_VERSION = 2.5 +PYTHON_PORTEND_VERSION = 3.1.0 PYTHON_PORTEND_SOURCE = portend-$(PYTHON_PORTEND_VERSION).tar.gz -PYTHON_PORTEND_SITE = https://files.pythonhosted.org/packages/2c/59/948666fc2455ae471efd40cb2a9a990f5f6f2354a9a6b228e29b9fb4a307 +PYTHON_PORTEND_SITE = https://files.pythonhosted.org/packages/6e/0a/42bcc9c97744958ce72d33f526e972379b9e90adede8a151f338818c41d4 PYTHON_PORTEND_LICENSE = MIT PYTHON_PORTEND_LICENSE_FILES = LICENSE PYTHON_PORTEND_SETUP_TYPE = setuptools diff --git a/package/python-posix-ipc/python-posix-ipc.hash b/package/python-posix-ipc/python-posix-ipc.hash index 4258af6348e..427e4c7b55a 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 8c9443859492ecf3aae9182aa6b5c78c posix_ipc-1.0.5.tar.gz -sha256 6cddb1ce2cf4aae383f2a0079c26c69bee257fe2720f372201ef047f8ceb8b97 posix_ipc-1.0.5.tar.gz +md5 523a31c4dbd56e0d4fd677f33e126e5d posix_ipc-1.1.1.tar.gz +sha256 e2456ba0cfb2ee5ba14121450e8d825b3c4a1461fca0761220aab66d4111cbb7 posix_ipc-1.1.1.tar.gz # Locally computed sha256 checksums -sha256 61f0669e70518e6d32f87e485965fe9309de60e4bef938b29cecd068b3db9a98 LICENSE +sha256 2b58f0bf31a8cbd7e56bfef030e9f7f02758ce8a810d073ccf41753bdc2a0747 LICENSE diff --git a/package/python-posix-ipc/python-posix-ipc.mk b/package/python-posix-ipc/python-posix-ipc.mk index 359dee6d7ce..bdd2f1d4af1 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.0.5 +PYTHON_POSIX_IPC_VERSION = 1.1.1 PYTHON_POSIX_IPC_SOURCE = posix_ipc-$(PYTHON_POSIX_IPC_VERSION).tar.gz -PYTHON_POSIX_IPC_SITE = https://files.pythonhosted.org/packages/bc/2f/9a7901aa26fb0e02a671b989ba814d059a0f45af85cea31b9c9eef7e2dda +PYTHON_POSIX_IPC_SITE = https://files.pythonhosted.org/packages/07/7f/b954f224a226960a4aa98b6c5fa3d4f3fafb20bb8461446e41b563aee863 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/Config.in b/package/python-prompt-toolkit/Config.in index ad4f8162de3..81d958884eb 100644 --- a/package/python-prompt-toolkit/Config.in +++ b/package/python-prompt-toolkit/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_PROMPT_TOOLKIT bool "python-prompt-toolkit" - select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_WCWIDTH # runtime select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime help diff --git a/package/python-prompt-toolkit/python-prompt-toolkit.hash b/package/python-prompt-toolkit/python-prompt-toolkit.hash index 5a24634a56e..62ba0c3cfe7 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 ba9e63c3e7e5a4f4ce4e4770a4daba96 prompt_toolkit-3.0.20.tar.gz -sha256 eb71d5a6b72ce6db177af4a7d4d7085b99756bf656d98ffcc4fecd36850eea6c prompt_toolkit-3.0.20.tar.gz +md5 5a2bb559c0bcbc617f507a320c64ba03 prompt_toolkit-3.0.36.tar.gz +sha256 3e163f254bef5a03b146397d7c1963bd3e2812f0964bb9a24e6ec761fd28db63 prompt_toolkit-3.0.36.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 b575783f96c..426fa41e0b0 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.20 +PYTHON_PROMPT_TOOLKIT_VERSION = 3.0.36 PYTHON_PROMPT_TOOLKIT_SOURCE = prompt_toolkit-$(PYTHON_PROMPT_TOOLKIT_VERSION).tar.gz -PYTHON_PROMPT_TOOLKIT_SITE = https://files.pythonhosted.org/packages/b4/56/9ab5868f34ab2657fba7e2192f41316252ab04edbbeb2a8583759960a1a7 +PYTHON_PROMPT_TOOLKIT_SITE = https://files.pythonhosted.org/packages/fb/93/180be2342f89f16543ec4eb3f25083b5b84eba5378f68efff05409fb39a9 PYTHON_PROMPT_TOOLKIT_SETUP_TYPE = setuptools PYTHON_PROMPT_TOOLKIT_LICENSE = BSD-3-Clause PYTHON_PROMPT_TOOLKIT_LICENSE_FILES = LICENSE diff --git a/package/python-protobuf/Config.in b/package/python-protobuf/Config.in index 1af82112b4a..7de463520d7 100644 --- a/package/python-protobuf/Config.in +++ b/package/python-protobuf/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_PYTHON_PROTOBUF bool "python-protobuf" # host-protobuf only builds on certain architectures - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" + depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS select BR2_PACKAGE_PYTHON_SIX # runtime help Python implementation of the Google Protocol Buffers. diff --git a/package/python-protobuf/python-protobuf.hash b/package/python-protobuf/python-protobuf.hash index 2bfef966763..e7af678b97d 100644 --- a/package/python-protobuf/python-protobuf.hash +++ b/package/python-protobuf/python-protobuf.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2286615a3ae3e24c3524d171b6728b77b72cd2f3aab905f6a8d3fcaf6209dd00 protobuf-python-3.19.1.tar.gz +sha256 e2b976e67d6fcf7078f799143a73f2a4d9cf3126ca68a1a6f1bda30fe5f3585c protobuf-python-4.21.12.tar.gz sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d LICENSE diff --git a/package/python-protobuf/python-protobuf.mk b/package/python-protobuf/python-protobuf.mk index b91ba49339d..df902546709 100644 --- a/package/python-protobuf/python-protobuf.mk +++ b/package/python-protobuf/python-protobuf.mk @@ -5,7 +5,7 @@ ################################################################################ PYTHON_PROTOBUF_VERSION = $(PROTOBUF_VERSION) -PYTHON_PROTOBUF_SOURCE = protobuf-python-$(PYTHON_PROTOBUF_VERSION).tar.gz +PYTHON_PROTOBUF_SOURCE = protobuf-python-4.$(PYTHON_PROTOBUF_VERSION).tar.gz PYTHON_PROTOBUF_SITE = $(PROTOBUF_SITE) PYTHON_PROTOBUF_LICENSE = BSD-3-Clause PYTHON_PROTOBUF_LICENSE_FILES = LICENSE diff --git a/package/python-psutil/python-psutil.hash b/package/python-psutil/python-psutil.hash index 552ced55ec0..15927562b16 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 91060da163ef478002a4456dd99cbb4c psutil-5.8.0.tar.gz -sha256 0c9ccb99ab76025f2f0bbecf341d4656e9c1351db8cc8a03ccd62e318ab4b5c6 psutil-5.8.0.tar.gz +md5 f72751d05b781757b7cd9bc375d2e351 psutil-5.9.4.tar.gz +sha256 3d7f9739eb435d4b1338944abe23f49584bde5395f27487d2ee25ad9a8774a62 psutil-5.9.4.tar.gz # Locally computed sha256 checksums sha256 24c12984500caa07ffdce19eebc06396c5e6d244b573bc6c438f4a6ef8e56c1b LICENSE diff --git a/package/python-psutil/python-psutil.mk b/package/python-psutil/python-psutil.mk index 3a2781c2848..e764d1accc9 100644 --- a/package/python-psutil/python-psutil.mk +++ b/package/python-psutil/python-psutil.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PSUTIL_VERSION = 5.8.0 +PYTHON_PSUTIL_VERSION = 5.9.4 PYTHON_PSUTIL_SOURCE = psutil-$(PYTHON_PSUTIL_VERSION).tar.gz -PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/e1/b0/7276de53321c12981717490516b7e612364f2cb372ee8901bd4a66a000d7 +PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/3d/7d/d05864a69e452f003c0d77e728e155a89a2a26b09e64860ddd70ad64fb26 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 ec27d706de1..4aa86c76908 100644 --- a/package/python-psycopg2/Config.in +++ b/package/python-psycopg2/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_PSYCOPG2 bool "python-psycopg2" depends on BR2_USE_WCHAR # postgresql + depends on !BR2_OPTIMIZE_FAST # postgresql select BR2_PACKAGE_POSTGRESQL help Psycopg is the most popular PostgreSQL database adapter for @@ -24,3 +25,6 @@ config BR2_PACKAGE_PYTHON_PSYCOPG2 comment "python-psycopg2 needs a toolchain w/ wchar" depends on !BR2_USE_WCHAR + +comment "python-psycopg2 can't be built with Optimize for fast" + depends on BR2_OPTIMIZE_FAST diff --git a/package/python-psycopg2/python-psycopg2.hash b/package/python-psycopg2/python-psycopg2.hash index d02ffc2ec8c..58f98f9d844 100644 --- a/package/python-psycopg2/python-psycopg2.hash +++ b/package/python-psycopg2/python-psycopg2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/psycopg2/json -md5 182e3e8cf3381c254f65f70cad4976e5 psycopg2-2.9.1.tar.gz -sha256 de5303a6f1d0a7a34b9d40e4d3bef684ccc44a49bbe3eb85e3c0bffb4a131b7c psycopg2-2.9.1.tar.gz +md5 3cec7285f61690633bb070d4bba259c2 psycopg2-2.9.5.tar.gz +sha256 a5246d2e683a972e2187a8714b5c2cf8156c064629f9a9b1a873c1730d9e245a psycopg2-2.9.5.tar.gz # Locally computed sha256 checksums sha256 9614b85dfc9a72c5b2ca33144c1d7e1ed3b1c297459d9fb28a6a5762c2e8d71b LICENSE diff --git a/package/python-psycopg2/python-psycopg2.mk b/package/python-psycopg2/python-psycopg2.mk index de466e2c590..fa23c2814f8 100644 --- a/package/python-psycopg2/python-psycopg2.mk +++ b/package/python-psycopg2/python-psycopg2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PSYCOPG2_VERSION = 2.9.1 +PYTHON_PSYCOPG2_VERSION = 2.9.5 PYTHON_PSYCOPG2_SOURCE = psycopg2-$(PYTHON_PSYCOPG2_VERSION).tar.gz -PYTHON_PSYCOPG2_SITE = https://files.pythonhosted.org/packages/aa/8a/7c80e7e44fb1b4277e89bd9ca509aefdd4dd1b2c547c6f293afe9f7ffd04 +PYTHON_PSYCOPG2_SITE = https://files.pythonhosted.org/packages/89/d6/cd8c46417e0f7a16b4b0fc321f4ab676a59250d08fce5b64921897fb07cc PYTHON_PSYCOPG2_SETUP_TYPE = setuptools PYTHON_PSYCOPG2_LICENSE = LGPL-3.0+ PYTHON_PSYCOPG2_LICENSE_FILES = LICENSE diff --git a/package/python-pudb/python-pudb.hash b/package/python-pudb/python-pudb.hash index fc19f589d91..1ae15ad8a66 100644 --- a/package/python-pudb/python-pudb.hash +++ b/package/python-pudb/python-pudb.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pudb/json -md5 100b955e103b72279604420bbdcd07a5 pudb-2021.1.tar.gz -sha256 309ee82b45a0ffca0bc4c7f521fd3e357589c764f339bdf9dcabb7ad40692d6e pudb-2021.1.tar.gz +md5 cda1c28dc52318162e2b131280f09960 pudb-2022.1.3.tar.gz +sha256 58e83ada9e19ffe92c1fdc78ae5458ef91aeb892a5b8f0e7379e6fa61e0e664a pudb-2022.1.3.tar.gz # Locally computed sha256 checksums sha256 a95343fffff49cde3d9bf33cf6bb71cb3bf0ed83f47d98a7ba04b175d29c79ab LICENSE diff --git a/package/python-pudb/python-pudb.mk b/package/python-pudb/python-pudb.mk index 31df3147d09..a357c34c446 100644 --- a/package/python-pudb/python-pudb.mk +++ b/package/python-pudb/python-pudb.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PUDB_VERSION = 2021.1 +PYTHON_PUDB_VERSION = 2022.1.3 PYTHON_PUDB_SOURCE = pudb-$(PYTHON_PUDB_VERSION).tar.gz -PYTHON_PUDB_SITE = https://files.pythonhosted.org/packages/c7/69/813e93519fc28744457ff68fa2eaac3b4ea30dda1e6994e969fe9d3008d9 +PYTHON_PUDB_SITE = https://files.pythonhosted.org/packages/85/a5/f1fd378f56bd8168b5921fd09d4b84fd8101a90e81402a509796caea2094 PYTHON_PUDB_SETUP_TYPE = setuptools PYTHON_PUDB_LICENSE = MIT PYTHON_PUDB_LICENSE_FILES = LICENSE diff --git a/package/python-pure-eval/Config.in b/package/python-pure-eval/Config.in new file mode 100644 index 00000000000..f6ccd6056dc --- /dev/null +++ b/package/python-pure-eval/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_PURE_EVAL + bool "python-pure-eval" + help + Safely evaluate AST nodes without side effects. + + http://github.com/alexmojaki/pure_eval diff --git a/package/python-pure-eval/python-pure-eval.hash b/package/python-pure-eval/python-pure-eval.hash new file mode 100644 index 00000000000..5bf5dcb749c --- /dev/null +++ b/package/python-pure-eval/python-pure-eval.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/pure_eval/json +md5 212fd27ca2c58d9effddec69748d738a pure_eval-0.2.2.tar.gz +sha256 2b45320af6dfaa1750f543d714b6d1c520a1688dec6fd24d339063ce0aaa9ac3 pure_eval-0.2.2.tar.gz +# Locally computed sha256 checksums +sha256 a476a2cb0ef4c41450340a577a28b91ac4c7f669136b2ee148047fabd5fc4181 LICENSE.txt diff --git a/package/python-pure-eval/python-pure-eval.mk b/package/python-pure-eval/python-pure-eval.mk new file mode 100644 index 00000000000..f139ea270fc --- /dev/null +++ b/package/python-pure-eval/python-pure-eval.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# python-pure-eval +# +################################################################################ + +PYTHON_PURE_EVAL_VERSION = 0.2.2 +PYTHON_PURE_EVAL_SOURCE = pure_eval-$(PYTHON_PURE_EVAL_VERSION).tar.gz +PYTHON_PURE_EVAL_SITE = https://files.pythonhosted.org/packages/97/5a/0bc937c25d3ce4e0a74335222aee05455d6afa2888032185f8ab50cdf6fd +PYTHON_PURE_EVAL_SETUP_TYPE = setuptools +PYTHON_PURE_EVAL_LICENSE = MIT +PYTHON_PURE_EVAL_LICENSE_FILES = LICENSE.txt + +PYTHON_PURE_EVAL_DEPENDENCIES = host-python-setuptools-scm + +$(eval $(python-package)) diff --git a/package/python-py/python-py.hash b/package/python-py/python-py.hash index 2d9928f3768..537fe317738 100644 --- a/package/python-py/python-py.hash +++ b/package/python-py/python-py.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/py/json -md5 5f108bfe00d5468cbdb8071051f86a55 py-1.10.0.tar.gz -sha256 21b81bda15b66ef5e1a777a21c4dcd9c20ad3efd0b3f817e7a809035269e1bd3 py-1.10.0.tar.gz +md5 bde7dcc1cb452a1e10206ef2f811ba88 py-1.11.0.tar.gz +sha256 51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719 py-1.11.0.tar.gz # Locally computed sha256 checksums sha256 2af680c39ef493fb82830356d1d3df1acb5a06033cba2dec7a19e21caa77a866 LICENSE sha256 2af680c39ef493fb82830356d1d3df1acb5a06033cba2dec7a19e21caa77a866 py/_vendored_packages/iniconfig-1.1.1.dist-info/LICENSE diff --git a/package/python-py/python-py.mk b/package/python-py/python-py.mk index d8cb6fa544f..cec02dcfa97 100644 --- a/package/python-py/python-py.mk +++ b/package/python-py/python-py.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PY_VERSION = 1.10.0 +PYTHON_PY_VERSION = 1.11.0 PYTHON_PY_SOURCE = py-$(PYTHON_PY_VERSION).tar.gz -PYTHON_PY_SITE = https://files.pythonhosted.org/packages/0d/8c/50e9f3999419bb7d9639c37e83fa9cdcf0f601a9d407162d6c37ad60be71 +PYTHON_PY_SITE = https://files.pythonhosted.org/packages/98/ff/fec109ceb715d2a6b4c4a85a61af3b40c723a961e8828319fbcb15b868dc PYTHON_PY_DEPENDENCIES = host-python-setuptools-scm PYTHON_PY_SETUP_TYPE = setuptools PYTHON_PY_LICENSE = MIT diff --git a/package/python-pyaes/python-pyaes.hash b/package/python-pyaes/python-pyaes.hash index 25a15f1e198..c9e9a7ea726 100644 --- a/package/python-pyaes/python-pyaes.hash +++ b/package/python-pyaes/python-pyaes.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyaes/json -md5 20fd5c6e29dcfdd08098e85a859a54ec pyaes-1.6.1.tar.gz -sha256 02c1b1405c38d3c370b085fb952dd8bea3fadcee6411ad99f312cc129c536d8f pyaes-1.6.1.tar.gz +md5 20fd5c6e29dcfdd08098e85a859a54ec pyaes-1.6.1.tar.gz +sha256 02c1b1405c38d3c370b085fb952dd8bea3fadcee6411ad99f312cc129c536d8f pyaes-1.6.1.tar.gz # Locally computed sha256 checksums -sha256 1efe6c78b28b4203d397ea9b68bdc9c658d21cd9afaf8ae8223def83f2a7ebbd LICENSE.txt +sha256 1efe6c78b28b4203d397ea9b68bdc9c658d21cd9afaf8ae8223def83f2a7ebbd LICENSE.txt diff --git a/package/python-pyalsa/python-pyalsa.hash b/package/python-pyalsa/python-pyalsa.hash index 655150a649d..d4cfe0d61f8 100644 --- a/package/python-pyalsa/python-pyalsa.hash +++ b/package/python-pyalsa/python-pyalsa.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 327b29bad57b049571e3d1f63281fdd21df27447cb5e2eadf46b737fbcff6e69 pyalsa-1.2.6.tar.bz2 +sha256 67d8f99f1ccf23e7ebdfa2c3be0b09f147949fd9511d1e6748b7f412ef046e1f pyalsa-1.2.7.tar.bz2 diff --git a/package/python-pyalsa/python-pyalsa.mk b/package/python-pyalsa/python-pyalsa.mk index 10d5293c2c5..cc5e2ec9a05 100644 --- a/package/python-pyalsa/python-pyalsa.mk +++ b/package/python-pyalsa/python-pyalsa.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYALSA_VERSION = 1.2.6 +PYTHON_PYALSA_VERSION = 1.2.7 PYTHON_PYALSA_SOURCE = pyalsa-$(PYTHON_PYALSA_VERSION).tar.bz2 -PYTHON_PYALSA_SITE = ftp://ftp.alsa-project.org/pub/pyalsa +PYTHON_PYALSA_SITE = https://www.alsa-project.org/files/pub/pyalsa PYTHON_PYALSA_SETUP_TYPE = distutils PYTHON_PYALSA_LICENSE = LGPL-2.1+ PYTHON_PYALSA_DEPENDENCIES = alsa-lib diff --git a/package/python-pybind/0001-pybind11-commands.py-support-STAGING_DIR.patch b/package/python-pybind/0001-pybind11-commands.py-support-STAGING_DIR.patch index 1c5e7e0bf4c..49c5c715721 100644 --- a/package/python-pybind/0001-pybind11-commands.py-support-STAGING_DIR.patch +++ b/package/python-pybind/0001-pybind11-commands.py-support-STAGING_DIR.patch @@ -1,11 +1,35 @@ ---- a/pybind11/commands.py 2022-07-15 22:47:47.000000000 +0200 -+++ b/pybind11/commands.py 2022-08-05 23:47:31.446268198 +0200 +From bf9f0d619e2e0a424e471a2f9235d26ece5b348c Mon Sep 17 00:00:00 2001 +From: "Arnout Vandecappelle (Essensium/Mind)" +Date: Fri, 7 Jan 2022 19:32:18 +0100 +Subject: [PATCH] pybind11/commands.py: support STAGING_DIR + +In Buildroot, we install build-time python scripts in the host directory +(otherwise they can't be run with host python), but when running +pybind11 --includes it should return the staging directory. + +Patch commands.py to use the STAGING_DIR environment variable instead of +the current directory, if it is set. + +Signed-off-by: Arnout Vandecappelle (Essensium/Mind) +Upstream-Status: N/A, Buildroot specific +Signed-off-by: Guillaume W. Bres +--- + pybind11/commands.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/pybind11/commands.py b/pybind11/commands.py +index a29c8ca..de8a27c 100644 +--- a/pybind11/commands.py ++++ b/pybind11/commands.py @@ -1,6 +1,7 @@ import os - + -DIR = os.path.abspath(os.path.dirname(__file__)) +DIR = os.environ.get('STAGING_DIR') or \ + os.path.abspath(os.path.dirname(__file__)) - - + + def get_include(user: bool = False) -> str: # pylint: disable=unused-argument +-- +2.31.1 + diff --git a/package/python-pybind/Config.in b/package/python-pybind/Config.in index 604cb9ee677..6e03cc62fcf 100644 --- a/package/python-pybind/Config.in +++ b/package/python-pybind/Config.in @@ -1,8 +1,12 @@ config BR2_PACKAGE_PYTHON_PYBIND bool "python-pybind" + depends on BR2_INSTALL_LIBSTDCPP help PyBind is a lightweight header-only library that exposes C++ types in Python and vice versa, mainly to create Python bindings of existing C++ code. http://pybind11.readthedocs.org/en/master + +comment "python-pybind needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-pybind/python-pybind.hash b/package/python-pybind/python-pybind.hash index b4b3ff94d0e..971eceaa075 100644 --- a/package/python-pybind/python-pybind.hash +++ b/package/python-pybind/python-pybind.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 eacf582fa8f696227988d08cfc46121770823839fe9e301a20fbce67e7cd70ec python-pybind-2.10.0.tar.gz +sha256 5d8c4c5dda428d3a944ba3d2a5212cb988c2fae4670d58075a5a49075a6ca315 python-pybind-2.10.3.tar.gz # License files, locally calculated sha256 83965b843b98f670d3a85bd041ed4b372c8ec50d7b4a5995a83ac697ba675dcb LICENSE diff --git a/package/python-pybind/python-pybind.mk b/package/python-pybind/python-pybind.mk index cc3f8a52e53..1fd106b9818 100644 --- a/package/python-pybind/python-pybind.mk +++ b/package/python-pybind/python-pybind.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_PYBIND_VERSION = 2.10.0 +PYTHON_PYBIND_VERSION = 2.10.3 PYTHON_PYBIND_SITE = $(call github,pybind,pybind11,v$(PYTHON_PYBIND_VERSION)) PYTHON_PYBIND_LICENSE = BSD-3-Clause PYTHON_PYBIND_LICENSE_FILES = LICENSE @@ -17,7 +17,7 @@ PYTHON_PYBIND_CONF_OPTS = \ -DPYBIND11_TEST=OFF \ -DPYBIND11_NOPYTHON=ON -PYTHON_PYBIND_INSTALL_PATH = $(HOST_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/pybind11 +PYTHON_PYBIND_INSTALL_PATH = $(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/pybind11 define PYTHON_PYBIND_INSTALL_MODULE mkdir -p $(PYTHON_PYBIND_INSTALL_PATH) diff --git a/package/python-pycairo/python-pycairo.hash b/package/python-pycairo/python-pycairo.hash index c617d8b6014..98bb7f2802b 100644 --- a/package/python-pycairo/python-pycairo.hash +++ b/package/python-pycairo/python-pycairo.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/pycairo/json -md5 59bc5c5d1debc3af0f6791af9d612551 pycairo-1.19.1.tar.gz -sha256 2c143183280feb67f5beb4e543fd49990c28e7df427301ede04fc550d3562e84 pycairo-1.19.1.tar.gz +md5 7a3729d21659098e1b9a411b62e88966 pycairo-1.23.0.tar.gz +sha256 9b61ac818723adc04367301317eb2e814a83522f07bbd1f409af0dada463c44c pycairo-1.23.0.tar.gz # Locally computed sha256 checksums sha256 360b9a526d47c51a7cab7f1ec49ca5893050562d639b742d588934ff84823a72 COPYING sha256 d80c9d084ebfb50ea1ed91bfbc2410d6ce542097a32c43b00781b83adcb8c77f COPYING-LGPL-2.1 diff --git a/package/python-pycairo/python-pycairo.mk b/package/python-pycairo/python-pycairo.mk index c635498d527..f9933df1878 100644 --- a/package/python-pycairo/python-pycairo.mk +++ b/package/python-pycairo/python-pycairo.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYCAIRO_VERSION = 1.19.1 +PYTHON_PYCAIRO_VERSION = 1.23.0 PYTHON_PYCAIRO_SOURCE = pycairo-$(PYTHON_PYCAIRO_VERSION).tar.gz -PYTHON_PYCAIRO_SITE = https://files.pythonhosted.org/packages/e8/9d/c8be300fc6b1298559d37a071c3833b0b251e0fff334d2e4c408d5789162 +PYTHON_PYCAIRO_SITE = https://files.pythonhosted.org/packages/69/ca/9e9fa2e8be0876a9bbf046a1be7ee33e61d4fdfbd1fd25c76c1bdfddf8c4 PYTHON_PYCAIRO_SETUP_TYPE = setuptools PYTHON_PYCAIRO_DEPENDENCIES = cairo PYTHON_PYCAIRO_LICENSE = LGPL-2.1 or MPL-1.1 diff --git a/package/python-pycares/python-pycares.hash b/package/python-pycares/python-pycares.hash index 85e0848b96f..7cdd93dd93a 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 9e66aa767a0afd681e2a797b835cad1d pycares-4.1.2.tar.gz -sha256 03490be0e7b51a0c8073f877bec347eff31003f64f57d9518d419d9369452837 pycares-4.1.2.tar.gz +md5 d11b196cebb45a38caa56e850f4a60d9 pycares-4.3.0.tar.gz +sha256 c542696f6dac978e9d99192384745a65f80a7d9450501151e4a7563e06010d45 pycares-4.3.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 9be295d900a..b1c7dcef506 100644 --- a/package/python-pycares/python-pycares.mk +++ b/package/python-pycares/python-pycares.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYCARES_VERSION = 4.1.2 +PYTHON_PYCARES_VERSION = 4.3.0 PYTHON_PYCARES_SOURCE = pycares-$(PYTHON_PYCARES_VERSION).tar.gz -PYTHON_PYCARES_SITE = https://files.pythonhosted.org/packages/83/61/17bd0cfb9c4dc8c3738484d604b50d47c78fe4fcfe0ca2c58a61a106f578 +PYTHON_PYCARES_SITE = https://files.pythonhosted.org/packages/01/50/e3015e6e03a3cf64113f509e8b86b71af37169b59ccedfcb182f3d031329 PYTHON_PYCARES_SETUP_TYPE = setuptools PYTHON_PYCARES_LICENSE = MIT PYTHON_PYCARES_LICENSE_FILES = LICENSE diff --git a/package/python-pycrate/Config.in b/package/python-pycrate/Config.in new file mode 100644 index 00000000000..193a973f7ea --- /dev/null +++ b/package/python-pycrate/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_PYCRATE + bool "python-pycrate" + help + A software suite to handle various data formats. + + https://github.com/P1sec/pycrate/ diff --git a/package/python-pycrate/python-pycrate.hash b/package/python-pycrate/python-pycrate.hash new file mode 100644 index 00000000000..e37fd6743ac --- /dev/null +++ b/package/python-pycrate/python-pycrate.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/pycrate/json +md5 075622d5d573274cd4dbfe268ca52f7f pycrate-0.5.5.tar.gz +sha256 59f09331890a389a6b98412f19f4fb021c5a75a35ab07bf5ba0d1e299a0967af pycrate-0.5.5.tar.gz +# Locally computed +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 license.txt diff --git a/package/python-pycrate/python-pycrate.mk b/package/python-pycrate/python-pycrate.mk new file mode 100644 index 00000000000..67794335561 --- /dev/null +++ b/package/python-pycrate/python-pycrate.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# python-pycrate +# +################################################################################ + +PYTHON_PYCRATE_VERSION = 0.5.5 +PYTHON_PYCRATE_SOURCE = pycrate-$(PYTHON_PYCRATE_VERSION).tar.gz +PYTHON_PYCRATE_SITE = https://files.pythonhosted.org/packages/25/8f/b3d7e0b541aa04b2f0f7aa694a6946b572bfa2e2627cf1f12b5416d633df +PYTHON_PYCRATE_SETUP_TYPE = setuptools +PYTHON_PYCRATE_EXTRA_DOWNLOADS = https://raw.githubusercontent.com/P1sec/pycrate/$(PYTHON_PYCRATE_VERSION)/license.txt +PYTHON_PYCRATE_LICENSE = LGPL-2.1+ +PYTHON_PYCRATE_LICENSE_FILES = license.txt + +define PYTHON_PYCRATE_ADD_LICENSE_FILE + cp $(PYTHON_PYCRATE_DL_DIR)/license.txt $(@D) +endef +PYTHON_PYCRATE_POST_EXTRACT_HOOKS += PYTHON_PYCRATE_ADD_LICENSE_FILE + +$(eval $(python-package)) diff --git a/package/python-pycryptodomex/python-pycryptodomex.hash b/package/python-pycryptodomex/python-pycryptodomex.hash index 920cec25185..eb011dddb8d 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 18f571832bbfbf0f4516ccef009f2dfb pycryptodomex-3.14.0.tar.gz -sha256 2d8bda8f949b79b78b293706aa7fc1e5c171c62661252bfdd5d12c70acd03282 pycryptodomex-3.14.0.tar.gz +md5 9d27f03c036c89afd3d66970bb49cd06 pycryptodomex-3.16.0.tar.gz +sha256 e9ba9d8ed638733c9e95664470b71d624a6def149e2db6cc52c1aca5a6a2df1d pycryptodomex-3.16.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 e3cc11afda5..b566bdd066d 100644 --- a/package/python-pycryptodomex/python-pycryptodomex.mk +++ b/package/python-pycryptodomex/python-pycryptodomex.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYCRYPTODOMEX_VERSION = 3.14.0 +PYTHON_PYCRYPTODOMEX_VERSION = 3.16.0 PYTHON_PYCRYPTODOMEX_SOURCE = pycryptodomex-$(PYTHON_PYCRYPTODOMEX_VERSION).tar.gz -PYTHON_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/a6/b3/a5e59cd3ad65d4dc470a3a63381d0495885cf1ac7659c83c6bc9e9e79df6 +PYTHON_PYCRYPTODOMEX_SITE = https://files.pythonhosted.org/packages/5d/22/575c7dd7c86843e07a791cfa2143e7292d6b380f5a7cce966a49b9d6c9f4 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 eef00030bd1..c55a17a5457 100644 --- a/package/python-pydal/python-pydal.hash +++ b/package/python-pydal/python-pydal.hash @@ -1,3 +1,5 @@ -# sha256 locally computed -sha256 9634f34a31d4411588b73825c8acc7f73ca69ba8a665bb00d0a9b5baff69498b python-pydal-20210626.3.tar.gz +# md5, sha256 from https://pypi.org/pypi/pydal/json +md5 eeaf44cdcdb6bd2040713c710a4a04be pydal-20221110.1.tar.gz +sha256 7c3e891c70f8d8918e36276f210a1959bb7badf3b276f47191986ffcf5b6a390 pydal-20221110.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 428999f5c13..f55c7fc2c52 100644 --- a/package/python-pydal/python-pydal.mk +++ b/package/python-pydal/python-pydal.mk @@ -4,8 +4,9 @@ # ################################################################################ -PYTHON_PYDAL_VERSION = 20210626.3 -PYTHON_PYDAL_SITE = $(call github,web2py,pydal,v$(PYTHON_PYDAL_VERSION)) +PYTHON_PYDAL_VERSION = 20221110.1 +PYTHON_PYDAL_SOURCE = pydal-$(PYTHON_PYDAL_VERSION).tar.gz +PYTHON_PYDAL_SITE = https://files.pythonhosted.org/packages/73/83/b904c464b6ab060e12b3f406f1fab7deb97bcd9d2021d8c87325e6225c2d PYTHON_PYDAL_LICENSE = BSD-3-Clause PYTHON_PYDAL_LICENSE_FILES = LICENSE.txt PYTHON_PYDAL_SETUP_TYPE = setuptools diff --git a/package/python-pydantic/python-pydantic.hash b/package/python-pydantic/python-pydantic.hash index 215b5d17143..e73a3099a86 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 7845d2f3c8fe8602f73f53ec5b6dfa29 pydantic-1.8.2.tar.gz -sha256 26464e57ccaafe72b7ad156fdaa4e9b9ef051f69e175dbbb463283000c05ab7b pydantic-1.8.2.tar.gz +md5 2e036b5f993b93dd83f6a7009252ae78 pydantic-1.10.4.tar.gz +sha256 b9a3859f24eb4e097502a3be1fb4b2abb79b6103dd9e2e0edb70613a4459a648 pydantic-1.10.4.tar.gz # Locally computed sha256 checksums sha256 9e3946690ac88b6b73e8f001a0586af13568be8852fd514e4393f39761764387 LICENSE diff --git a/package/python-pydantic/python-pydantic.mk b/package/python-pydantic/python-pydantic.mk index b2822415062..a1a4dc9b16f 100644 --- a/package/python-pydantic/python-pydantic.mk +++ b/package/python-pydantic/python-pydantic.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYDANTIC_VERSION = 1.8.2 +PYTHON_PYDANTIC_VERSION = 1.10.4 PYTHON_PYDANTIC_SOURCE = pydantic-$(PYTHON_PYDANTIC_VERSION).tar.gz -PYTHON_PYDANTIC_SITE = https://files.pythonhosted.org/packages/b9/d2/12a808613937a6b98cd50d6467352f01322dc0d8ca9fb5b94441625d6684 +PYTHON_PYDANTIC_SITE = https://files.pythonhosted.org/packages/53/17/34e54e352f6a3d304044e52d5ddd5cd621a62ec8fb7af08cc73af65dd3e1 PYTHON_PYDANTIC_SETUP_TYPE = setuptools PYTHON_PYDANTIC_LICENSE = MIT PYTHON_PYDANTIC_LICENSE_FILES = LICENSE diff --git a/package/python-pydevmem/Config.in b/package/python-pydevmem/Config.in new file mode 100644 index 00000000000..a0e2da9f0ba --- /dev/null +++ b/package/python-pydevmem/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_PYTHON_PYDEVMEM + bool "python-pydevmem" + help + Python DevMem is designed primarily for use with accessing + /dev/mem on OMAP platforms. It should work on other platforms + and work to mmap() files rather then just /dev/mem, but these + use cases aren't well tested. + + https://github.com/kylemanna/pydevmem diff --git a/package/python-pydevmem/python-pydevmem.hash b/package/python-pydevmem/python-pydevmem.hash new file mode 100644 index 00000000000..e9ee18b872c --- /dev/null +++ b/package/python-pydevmem/python-pydevmem.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 1a72db41effeb83e01fc9a422abfe345a92220b0382403a5040b2811e4ee6496 python-pydevmem-600b5d1ef8997c394db3512b735d75d5abc4ad41.tar.gz +sha256 cb013ffd1fd415a348f9a32231ceb133770623b69484a24ad49b6da4904cac2e LICENSE diff --git a/package/python-pydevmem/python-pydevmem.mk b/package/python-pydevmem/python-pydevmem.mk new file mode 100644 index 00000000000..385b123290b --- /dev/null +++ b/package/python-pydevmem/python-pydevmem.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# python-pydevmem +# +################################################################################ + +PYTHON_PYDEVMEM_VERSION = 600b5d1ef8997c394db3512b735d75d5abc4ad41 +PYTHON_PYDEVMEM_SITE = $(call github,kylemanna,pydevmem,$(PYTHON_PYDEVMEM_VERSION)) +PYTHON_PYDEVMEM_SETUP_TYPE = setuptools +PYTHON_PYDEVMEM_LICENSE = MIT +PYTHON_PYDEVMEM_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/package/python-pydyf/python-pydyf.hash b/package/python-pydyf/python-pydyf.hash index 90774457a14..1b37e90e731 100644 --- a/package/python-pydyf/python-pydyf.hash +++ b/package/python-pydyf/python-pydyf.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pydyf/json -md5 f78ee205b0637c92197f5d584d60cb8e pydyf-0.1.2.tar.gz -sha256 1e2f5de48174f505de025a7d1e7cf01bbdd9422ca8ab9451782bf00ee178602c pydyf-0.1.2.tar.gz +md5 6b2a02162a3f4be9464d7b4043953d33 pydyf-0.5.0.tar.gz +sha256 51e751ae1504037c1fc1f4815119137b011802cd5f6c3539db066c455b14a7e1 pydyf-0.5.0.tar.gz # Locally computed sha256 checksums sha256 75461e438973e1ba0f93a7de9e3fe5b2f49e1ab49251d392878a9cdae8ce7e47 LICENSE diff --git a/package/python-pydyf/python-pydyf.mk b/package/python-pydyf/python-pydyf.mk index 7cc0df26431..6327a3efe25 100644 --- a/package/python-pydyf/python-pydyf.mk +++ b/package/python-pydyf/python-pydyf.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_PYDYF_VERSION = 0.1.2 +PYTHON_PYDYF_VERSION = 0.5.0 PYTHON_PYDYF_SOURCE = pydyf-$(PYTHON_PYDYF_VERSION).tar.gz -PYTHON_PYDYF_SITE = https://files.pythonhosted.org/packages/78/ed/2ccc153d50d21a56916fd5c9d367cad798d4ca8a450cef03e7faa3b920c4 -PYTHON_PYDYF_SETUP_TYPE = distutils +PYTHON_PYDYF_SITE = https://files.pythonhosted.org/packages/f4/4c/6d31b36a46714d8206b8ca84b8dc9aaf42093415b1f50471538552abe501 +PYTHON_PYDYF_SETUP_TYPE = flit PYTHON_PYDYF_LICENSE = BSD-3-Clause PYTHON_PYDYF_LICENSE_FILES = LICENSE diff --git a/package/python-pyelftools/python-pyelftools.hash b/package/python-pyelftools/python-pyelftools.hash index a309b90e15e..7cffe2d6465 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 061d67c669a9b1f8d07f28c47fb6a65f pyelftools-0.27.tar.gz -sha256 cde854e662774c5457d688ca41615f6594187ba7067af101232df889a6b7a66b pyelftools-0.27.tar.gz +md5 2afc97cd239c0dea0cca97d00d3dcb42 pyelftools-0.29.tar.gz +sha256 ec761596aafa16e282a31de188737e5485552469ac63b60cfcccf22263fd24ff pyelftools-0.29.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 5bfdcd33ae4..7566f24895e 100644 --- a/package/python-pyelftools/python-pyelftools.mk +++ b/package/python-pyelftools/python-pyelftools.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYELFTOOLS_VERSION = 0.27 +PYTHON_PYELFTOOLS_VERSION = 0.29 PYTHON_PYELFTOOLS_SOURCE = pyelftools-$(PYTHON_PYELFTOOLS_VERSION).tar.gz -PYTHON_PYELFTOOLS_SITE = https://files.pythonhosted.org/packages/6b/b5/f7022f2d950327ba970ec85fb8f85c79244031092c129b6f34ab17514ae0 +PYTHON_PYELFTOOLS_SITE = https://files.pythonhosted.org/packages/0e/35/e76da824595452a5ad07f289ea1737ca0971fc6cc7b6ee9464279be06b5e PYTHON_PYELFTOOLS_LICENSE = Public domain PYTHON_PYELFTOOLS_LICENSE_FILES = LICENSE PYTHON_PYELFTOOLS_SETUP_TYPE = setuptools diff --git a/package/python-pyftpdlib/python-pyftpdlib.hash b/package/python-pyftpdlib/python-pyftpdlib.hash index abbb1261b25..46b5ae63364 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 459dd3e685c4b7dfcf574ca05e5586eb pyftpdlib-1.5.6.tar.gz -sha256 fda655d81f29af52885ca2f8a2704134baed540f16d66a0b26e8fdfafd12db5e pyftpdlib-1.5.6.tar.gz +md5 6d9539aea866d4f959d86ae001cdddf7 pyftpdlib-1.5.7.tar.gz +sha256 7ea3ce4137db8209af1f6b9ea020590f462c63ed7c7a1240bd596e4d3a7b656e pyftpdlib-1.5.7.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 931e2dad060..bd1ada81251 100644 --- a/package/python-pyftpdlib/python-pyftpdlib.mk +++ b/package/python-pyftpdlib/python-pyftpdlib.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYFTPDLIB_VERSION = 1.5.6 +PYTHON_PYFTPDLIB_VERSION = 1.5.7 PYTHON_PYFTPDLIB_SOURCE = pyftpdlib-$(PYTHON_PYFTPDLIB_VERSION).tar.gz -PYTHON_PYFTPDLIB_SITE = https://files.pythonhosted.org/packages/31/61/63ef60aca6de07eba1639d9d47f3f8e29462e8bb49d6a8dce9aeff240646 +PYTHON_PYFTPDLIB_SITE = https://files.pythonhosted.org/packages/2f/bc/f03a15bf807698bbecdcf316041e3d79b25a40fa7b6e071e17702ff7b9d4 PYTHON_PYFTPDLIB_SETUP_TYPE = setuptools PYTHON_PYFTPDLIB_LICENSE = MIT PYTHON_PYFTPDLIB_LICENSE_FILES = LICENSE diff --git a/package/python-pygame/Config.in b/package/python-pygame/Config.in index 0a738527eab..57eb0207425 100644 --- a/package/python-pygame/Config.in +++ b/package/python-pygame/Config.in @@ -41,12 +41,6 @@ config BR2_PACKAGE_PYTHON_PYGAME_MIXER pygame module for loading and playing sounds. Will autoselect sdl_mixer. -config BR2_PACKAGE_PYTHON_PYGAME_MIXER_MUSIC - bool "pygame.mixer.music" - depends on BR2_PACKAGE_PYTHON_PYGAME_MIXER - help - pygame module for controlling streamed audio - config BR2_PACKAGE_PYTHON_PYGAME_SCRAP bool "pygame.scrap" depends on BR2_PACKAGE_SDL_X11 diff --git a/package/python-pygments/python-pygments.hash b/package/python-pygments/python-pygments.hash index 09b47b2bdcf..f7396cb3d6b 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 390a49fa0eb5486a795b2b54b9a7b666 Pygments-2.7.4.tar.gz -sha256 df49d09b498e83c1a73128295860250b0b7edd4c723a32e9bc0d295c7c2ec337 Pygments-2.7.4.tar.gz +md5 447be4afb076c8325a7dc659aff5b931 Pygments-2.14.0.tar.gz +sha256 b3ed06a9e8ac9a9aae5a6f5dbe78a8a58655d17b43b93c078f094ddc476ae297 Pygments-2.14.0.tar.gz # Locally computed sha256 checksums -sha256 c012cf17a2ba79142977c8cc5bb1497a675401bf79c2c9b95a7604e2ddfde8b8 LICENSE +sha256 a9d66f1d526df02e29dce73436d34e56e8632f46c275bbdffc70569e882f9f17 LICENSE diff --git a/package/python-pygments/python-pygments.mk b/package/python-pygments/python-pygments.mk index 781b16353b0..9c4f0be6c89 100644 --- a/package/python-pygments/python-pygments.mk +++ b/package/python-pygments/python-pygments.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYGMENTS_VERSION = 2.7.4 +PYTHON_PYGMENTS_VERSION = 2.14.0 PYTHON_PYGMENTS_SOURCE = Pygments-$(PYTHON_PYGMENTS_VERSION).tar.gz -PYTHON_PYGMENTS_SITE = https://files.pythonhosted.org/packages/e1/86/8059180e8217299079d8719c6e23d674aadaba0b1939e25e0cc15dcf075b +PYTHON_PYGMENTS_SITE = https://files.pythonhosted.org/packages/da/6a/c427c06913204e24de28de5300d3f0e809933f376e0b7df95194b2bb3f71 PYTHON_PYGMENTS_LICENSE = BSD-2-Clause PYTHON_PYGMENTS_LICENSE_FILES = LICENSE PYTHON_PYGMENTS_CPE_ID_VENDOR = pygments diff --git a/package/python-pyhamcrest/python-pyhamcrest.hash b/package/python-pyhamcrest/python-pyhamcrest.hash index b2e84d7d1f1..176079e0f50 100644 --- a/package/python-pyhamcrest/python-pyhamcrest.hash +++ b/package/python-pyhamcrest/python-pyhamcrest.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pyhamcrest/json -md5 7a086f0b067f8d38958ec32f054559b4 PyHamcrest-2.0.2.tar.gz -sha256 412e00137858f04bde0729913874a48485665f2d36fe9ee449f26be864af9316 PyHamcrest-2.0.2.tar.gz +md5 c808291b2fca0991d044927884e6d15e pyhamcrest-2.0.4.tar.gz +sha256 b5d9ce6b977696286cf232ce2adf8969b4d0b045975b0936ac9005e84e67e9c1 pyhamcrest-2.0.4.tar.gz # Locally computed sha256 checksums sha256 71beae6c8151362cfe398cbd350191a1cc52d3d28499839a7830b25f5b50a7fe LICENSE.txt diff --git a/package/python-pyhamcrest/python-pyhamcrest.mk b/package/python-pyhamcrest/python-pyhamcrest.mk index 28979600ddb..de5295e964c 100644 --- a/package/python-pyhamcrest/python-pyhamcrest.mk +++ b/package/python-pyhamcrest/python-pyhamcrest.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYHAMCREST_VERSION = 2.0.2 -PYTHON_PYHAMCREST_SOURCE = PyHamcrest-$(PYTHON_PYHAMCREST_VERSION).tar.gz -PYTHON_PYHAMCREST_SITE = https://files.pythonhosted.org/packages/58/05/7b993fabb44ff0b52a90916d96bfd91a65ecf90b8248e72bba325ba8e438 +PYTHON_PYHAMCREST_VERSION = 2.0.4 +PYTHON_PYHAMCREST_SOURCE = pyhamcrest-$(PYTHON_PYHAMCREST_VERSION).tar.gz +PYTHON_PYHAMCREST_SITE = https://files.pythonhosted.org/packages/b1/9a/588f086b64ace8d2e9843d8551e9068b2570c3c51b06cb49a107303f8700 PYTHON_PYHAMCREST_SETUP_TYPE = setuptools PYTHON_PYHAMCREST_LICENSE = BSD-3-Clause PYTHON_PYHAMCREST_LICENSE_FILES = LICENSE.txt diff --git a/package/python-pyicu/python-pyicu.hash b/package/python-pyicu/python-pyicu.hash index a6ddeb24a66..009b2643365 100644 --- a/package/python-pyicu/python-pyicu.hash +++ b/package/python-pyicu/python-pyicu.hash @@ -1,5 +1,5 @@ -# md5 from https://pypi.python.org/pypi/PyICU/json -md5 7656f5cc53a7c18b40e653d6eefdee14 PyICU-1.9.7.tar.gz -# Locally computed -sha256 db27cd1cc150b879c5465872bec7fdaf340eca140aa922be03891d5b9f855b61 PyICU-1.9.7.tar.gz -sha256 74bbadee4ee3c3a1ac0ecfbd74bc7ce64046de1ceddf4717dc923809ca8ffce3 LICENSE +# md5, sha256 from https://pypi.org/pypi/pyicu/json +md5 4090ebb98702338cac3dbed2d72c2fd7 PyICU-2.10.2.tar.gz +sha256 0c3309eea7fab6857507ace62403515b60fe096cbfb4f90d14f55ff75c5441c1 PyICU-2.10.2.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 c6587c399c0..53e4a15c4f5 100644 --- a/package/python-pyicu/python-pyicu.mk +++ b/package/python-pyicu/python-pyicu.mk @@ -4,12 +4,18 @@ # ################################################################################ -PYTHON_PYICU_VERSION = 1.9.7 +PYTHON_PYICU_VERSION = 2.10.2 PYTHON_PYICU_SOURCE = PyICU-$(PYTHON_PYICU_VERSION).tar.gz -PYTHON_PYICU_SITE = https://pypi.python.org/packages/6e/88/f42a1297909ca6d9113ba37b37067011ae29432fe592fdd98cf52ad23b77 +PYTHON_PYICU_SITE = https://files.pythonhosted.org/packages/64/00/a531e119a97e54601f616f5061879ec2d4bb058d225014f9acf94b2970c3 PYTHON_PYICU_LICENSE = MIT PYTHON_PYICU_LICENSE_FILES = LICENSE PYTHON_PYICU_DEPENDENCIES = icu PYTHON_PYICU_SETUP_TYPE = setuptools +PYTHON_PYICU_ENV += \ + ICU_VERSION="`$(PKG_CONFIG_HOST_BINARY) icu-i18n --modversion`" \ + PYICU_CFLAGS="`$(PKG_CONFIG_HOST_BINARY) icu-i18n --variable=CXXFLAGS`" \ + PYICU_LFLAGS="`$(PKG_CONFIG_HOST_BINARY) icu-i18n --libs-only-L` \ + `$(PKG_CONFIG_HOST_BINARY) icu-i18n --libs-only-l`" + $(eval $(python-package)) diff --git a/package/python-pyjwt/python-pyjwt.hash b/package/python-pyjwt/python-pyjwt.hash index 5ea6c0cd509..cc64be6ccac 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 60cf2d463157bf21eb37be0430521036 PyJWT-2.3.0.tar.gz -sha256 b888b4d56f06f6dcd777210c334e69c737be74755d3e5e9ee3fe67dc18a0ee41 PyJWT-2.3.0.tar.gz +md5 aeed6d3a581ae383b2288a2079fa562d PyJWT-2.6.0.tar.gz +sha256 69285c7e31fc44f68a1feb309e948e0df53259d579295e6cfe2b1792329f05fd PyJWT-2.6.0.tar.gz # Locally computed sha256 checksums -sha256 ec82af815b5f9da8685afb300cc5beb7949e1c22b79b6c1c054796cefdf6cac6 LICENSE +sha256 797a7a20231d4c433e9f1911db1731d06b5828b98f499819a034f7c0f56f5ce5 LICENSE diff --git a/package/python-pyjwt/python-pyjwt.mk b/package/python-pyjwt/python-pyjwt.mk index ba8130e7cae..fe4eeff38a2 100644 --- a/package/python-pyjwt/python-pyjwt.mk +++ b/package/python-pyjwt/python-pyjwt.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYJWT_VERSION = 2.3.0 +PYTHON_PYJWT_VERSION = 2.6.0 PYTHON_PYJWT_SOURCE = PyJWT-$(PYTHON_PYJWT_VERSION).tar.gz -PYTHON_PYJWT_SITE = https://files.pythonhosted.org/packages/1d/8e/01bdcfdbb352daaba8ea406d9df149c5bba7dbf70f908d4fa4c269fe6a08 +PYTHON_PYJWT_SITE = https://files.pythonhosted.org/packages/75/65/db64904a7f23e12dbf0565b53de01db04d848a497c6c9b87e102f74c9304 PYTHON_PYJWT_SETUP_TYPE = setuptools PYTHON_PYJWT_LICENSE = MIT PYTHON_PYJWT_LICENSE_FILES = LICENSE diff --git a/package/python-pylibfdt/Config.in b/package/python-pylibfdt/Config.in new file mode 100644 index 00000000000..8fc1cdb0648 --- /dev/null +++ b/package/python-pylibfdt/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_PYLIBFDT + bool "python-pylibfdt" + help + Python bindings for the Device Tree Compiler (dtc) toolchain. + + https://github.com/devicetree-org/pylibfdt diff --git a/package/python-pylibfdt/python-pylibfdt.hash b/package/python-pylibfdt/python-pylibfdt.hash new file mode 100644 index 00000000000..056fd3a62ec --- /dev/null +++ b/package/python-pylibfdt/python-pylibfdt.hash @@ -0,0 +1,6 @@ +# md5, sha256 from https://pypi.python.org/pypi/pylibfdt/json +md5 5765c20ac6cde517d5b7218503ab707b pylibfdt-1.6.1.tar.gz +sha256 90c667c5adf44c6ab2f13bdc566598897784c7b781bed91064e7373bd270b778 pylibfdt-1.6.1.tar.gz +# Locally computed +sha256 6313108c23efffa36948f8b2cff1560a5935373b527b0e1a837cc77e6ed1bacd BSD-2-Clause +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 GPL diff --git a/package/python-pylibfdt/python-pylibfdt.mk b/package/python-pylibfdt/python-pylibfdt.mk new file mode 100644 index 00000000000..077c60c0932 --- /dev/null +++ b/package/python-pylibfdt/python-pylibfdt.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# python-pylibfdt +# +################################################################################ + +PYTHON_PYLIBFDT_VERSION = 1.6.1 +PYTHON_PYLIBFDT_SOURCE = pylibfdt-$(PYTHON_PYLIBFDT_VERSION).tar.gz +PYTHON_PYLIBFDT_SITE = https://files.pythonhosted.org/packages/15/3c/40b1d6a1df9dbc9d9ba5700a47ad95ca1e984f18daf25ede0da5f67d0cf7 +PYTHON_PYLIBFDT_SETUP_TYPE = setuptools +PYTHON_PYLIBFDT_LICENSE = BSD-2-Clause or GPL-2.0+ +PYTHON_PYLIBFDT_LICENSE_FILES = BSD-2-Clause GPL +PYTHON_PYLIBFDT_DEPENDENCIES = host-python-setuptools-scm host-swig +HOST_PYTHON_PYLIBFDT_DEPENDENCIES = host-python-setuptools-scm host-swig + +$(eval $(python-package)) +$(eval $(host-python-package)) diff --git a/package/python-pylibftdi/python-pylibftdi.hash b/package/python-pylibftdi/python-pylibftdi.hash index 62dac5cbbfd..ee0ba127caa 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 c48e442cef7b1e865b4d96ab92f509ad pylibftdi-0.18.1.tar.gz -sha256 bdd04076933959b20b3c8b4fb8be7882d3362675f259e7eeb23ebff03b81859d pylibftdi-0.18.1.tar.gz +md5 fb43ade3283b809d4ebe92bf4a60d7fc pylibftdi-0.20.0.tar.gz +sha256 f4a87fc4af2c9c7d42badd4192ca9b529f32c9d96fdc8daea7e29c509226df5f pylibftdi-0.20.0.tar.gz # Locally computed sha256 checksums -sha256 0e40132339e1ef7d17d93837fbc273d1e87302e9295162bd19c9161e5700ddcc LICENSE.txt +sha256 0d3f1af06b566a783091422061b60e864fc5d5853418b71643041e254b4ae7f9 LICENSE.txt diff --git a/package/python-pylibftdi/python-pylibftdi.mk b/package/python-pylibftdi/python-pylibftdi.mk index 2f5614867d9..34040b72ac2 100644 --- a/package/python-pylibftdi/python-pylibftdi.mk +++ b/package/python-pylibftdi/python-pylibftdi.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYLIBFTDI_VERSION = 0.18.1 +PYTHON_PYLIBFTDI_VERSION = 0.20.0 PYTHON_PYLIBFTDI_SOURCE = pylibftdi-$(PYTHON_PYLIBFTDI_VERSION).tar.gz -PYTHON_PYLIBFTDI_SITE = https://files.pythonhosted.org/packages/50/9b/1e1cdb9715bacfb83e5eaf5e69f4e2fbd92d61f43c5e185cc3935ec01b28 +PYTHON_PYLIBFTDI_SITE = https://files.pythonhosted.org/packages/b8/03/4f778ce6dceea58dc5bfd555c22fdb265afc922d81d3c4496a791a54c479 PYTHON_PYLIBFTDI_LICENSE = MIT PYTHON_PYLIBFTDI_LICENSE_FILES = LICENSE.txt PYTHON_PYLIBFTDI_DEPENDENCIES = libftdi diff --git a/package/python-pylru/python-pylru.hash b/package/python-pylru/python-pylru.hash index 1962c6015b8..83217a3417a 100644 --- a/package/python-pylru/python-pylru.hash +++ b/package/python-pylru/python-pylru.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pylru/json -md5 8f0050f86d1fa68bb18673de37da543b pylru-1.2.0.tar.gz -sha256 492f934bb98dc6c8b2370c02c95c65516ddc08c8f64d27f70087eb038621d297 pylru-1.2.0.tar.gz +md5 101486c319fa219f147b8811975780d9 pylru-1.2.1.tar.gz +sha256 47ad140a63ab9389648dadfbb4330700e0ffeeb28ec04664ee47d37ed133b0f4 pylru-1.2.1.tar.gz # Locally computed sha256 checksums -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.txt +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.txt diff --git a/package/python-pylru/python-pylru.mk b/package/python-pylru/python-pylru.mk index 98c3945dd00..8658f75ba9f 100644 --- a/package/python-pylru/python-pylru.mk +++ b/package/python-pylru/python-pylru.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYLRU_VERSION = 1.2.0 +PYTHON_PYLRU_VERSION = 1.2.1 PYTHON_PYLRU_SOURCE = pylru-$(PYTHON_PYLRU_VERSION).tar.gz -PYTHON_PYLRU_SITE = https://files.pythonhosted.org/packages/9c/88/30972cd0518452563221c80bffc2a5832499d736648ef8fe492affae15c5 +PYTHON_PYLRU_SITE = https://files.pythonhosted.org/packages/95/8e/2a0d3426738db0b41d69d36243bdd00420ad231e802d09dad8db02005d13 PYTHON_PYLRU_SETUP_TYPE = setuptools PYTHON_PYLRU_LICENSE = GPL-2.0 PYTHON_PYLRU_LICENSE_FILES = LICENSE.txt diff --git a/package/python-pymodbus/python-pymodbus.hash b/package/python-pymodbus/python-pymodbus.hash index 8e60d94e620..d9337ffe842 100644 --- a/package/python-pymodbus/python-pymodbus.hash +++ b/package/python-pymodbus/python-pymodbus.hash @@ -1,4 +1,5 @@ -# sha256 locally computed -sha256 088c7ece2a11cad652939719695c457f26f9148cd7d2f4a79872167925180ad5 pymodbus-2.2.0.tar.gz -# Hash for license file -sha256 796a47993313691ea404d8af7e4c0f9daf1d2760e3900938985b59c9008eee2f doc/LICENSE +# md5, sha256 from https://pypi.org/pypi/pymodbus/json +md5 89da6585b27b8c4b3887eb9f7d1e950b pymodbus-3.0.2.tar.gz +sha256 704cb7fb90631c45f9c3a70b89d0c990fe0e208ac56f14a5c449e21bebd1e201 pymodbus-3.0.2.tar.gz +# Locally computed sha256 checksums +sha256 796a47993313691ea404d8af7e4c0f9daf1d2760e3900938985b59c9008eee2f LICENSE diff --git a/package/python-pymodbus/python-pymodbus.mk b/package/python-pymodbus/python-pymodbus.mk index d96e21a55ca..54879d38e99 100644 --- a/package/python-pymodbus/python-pymodbus.mk +++ b/package/python-pymodbus/python-pymodbus.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_PYMODBUS_VERSION = 2.2.0 +PYTHON_PYMODBUS_VERSION = 3.0.2 PYTHON_PYMODBUS_SOURCE = pymodbus-$(PYTHON_PYMODBUS_VERSION).tar.gz -PYTHON_PYMODBUS_SITE = $(call github,riptideio,pymodbus,v$(PYTHON_PYMODBUS_VERSION)) +PYTHON_PYMODBUS_SITE = https://files.pythonhosted.org/packages/94/f7/6149a1b107fa54378a7adec83db7cd3679bf02216a6f5c83b37f55335897 PYTHON_PYMODBUS_SETUP_TYPE = setuptools PYTHON_PYMODBUS_LICENSE = BSD-3-Clause -PYTHON_PYMODBUS_LICENSE_FILES = doc/LICENSE +PYTHON_PYMODBUS_LICENSE_FILES = LICENSE $(eval $(python-package)) diff --git a/package/python-pymupdf/Config.in b/package/python-pymupdf/Config.in index b3f9565238f..ecaa5496b51 100644 --- a/package/python-pymupdf/Config.in +++ b/package/python-pymupdf/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_PYTHON_PYMUPDF depends on BR2_TOOLCHAIN_HAS_SYNC_4 # mupdf -> harfbuzz depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # mupdf -> harfbuzz depends on BR2_PACKAGE_XORG7 + select BR2_PACKAGE_HOST_SWIG select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_MUPDF select BR2_PACKAGE_ZLIB diff --git a/package/python-pymupdf/python-pymupdf.hash b/package/python-pymupdf/python-pymupdf.hash index ee7a9165191..bda356d9051 100644 --- a/package/python-pymupdf/python-pymupdf.hash +++ b/package/python-pymupdf/python-pymupdf.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pymupdf/json -md5 70d6c2232e531772bbe9a813044262f9 PyMuPDF-1.18.14.tar.gz -sha256 efe85cb80f79cc3f3890aa2ab82b962b8a999ca078e33e9bacc5d0be5c4656dc PyMuPDF-1.18.14.tar.gz -# Locally computed: -sha256 282751b8c98ee9e445346eb57a992c9ecbe25ed8dd554df046777313e19b10f9 COPYING +md5 be10963679ac6d52b7aed2311ca7e3c5 PyMuPDF-1.21.1.tar.gz +sha256 f815741a435c62a0036bbcbf5fa6c533567bd69c5338d413714fc57b22db93e0 PyMuPDF-1.21.1.tar.gz +# Locally computed sha256 checksums +sha256 57c8ff33c9c0cfc3ef00e650a1cc910d7ee479a8bc509f6c9209a7c2a11399d6 COPYING diff --git a/package/python-pymupdf/python-pymupdf.mk b/package/python-pymupdf/python-pymupdf.mk index ceeeb0a55b4..03fc8bc4fbb 100644 --- a/package/python-pymupdf/python-pymupdf.mk +++ b/package/python-pymupdf/python-pymupdf.mk @@ -5,14 +5,14 @@ ################################################################################ # python-pymupdf's version must match mupdf's version -PYTHON_PYMUPDF_VERSION = 1.18.14 +PYTHON_PYMUPDF_VERSION = 1.21.1 PYTHON_PYMUPDF_SOURCE = PyMuPDF-$(PYTHON_PYMUPDF_VERSION).tar.gz -PYTHON_PYMUPDF_SITE = https://files.pythonhosted.org/packages/41/f6/dbefe3d6949fa81fb7bcac9141e4345330d272724718ac5a6af78297498b +PYTHON_PYMUPDF_SITE = https://files.pythonhosted.org/packages/30/44/9fce79689e5df7deebe2d17cb2b9b2a6b888439c241e71296e732aefa649 PYTHON_PYMUPDF_SETUP_TYPE = setuptools -PYTHON_PYMUPDF_LICENSE = GPL-3.0, AGPL-3.0+ (code generated from mupdf) +PYTHON_PYMUPDF_LICENSE = AGPL-3.0+ PYTHON_PYMUPDF_LICENSE_FILES = COPYING # No license file included in pip, but it's present on github -PYTHON_PYMUPDF_DEPENDENCIES = freetype mupdf zlib +PYTHON_PYMUPDF_DEPENDENCIES = freetype host-swig mupdf zlib PYTHON_PYMUPDF_ENV = CFLAGS="-I$(STAGING_DIR)/usr/include/mupdf -I$(STAGING_DIR)/usr/include/freetype2" diff --git a/package/python-pyopenssl/Config.in b/package/python-pyopenssl/Config.in index 1a6fbd21478..56f38f58881 100644 --- a/package/python-pyopenssl/Config.in +++ b/package/python-pyopenssl/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_PYTHON_PYOPENSSL bool "python-pyopenssl" depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime - select BR2_PACKAGE_PYTHON_SIX # runtime help Python wrapper module around the OpenSSL library. diff --git a/package/python-pyopenssl/python-pyopenssl.hash b/package/python-pyopenssl/python-pyopenssl.hash index 5a3bc5dde9a..f9b1e4a86bd 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 2ec707d15b4e92f5ca5e46e5aab2f4ca pyOpenSSL-21.0.0.tar.gz -sha256 5e2d8c5e46d0d865ae933bef5230090bdaf5506281e9eec60fa250ee80600cb3 pyOpenSSL-21.0.0.tar.gz +md5 1be2c02bf3c0c4e5e7c51b9ac90ebd72 pyOpenSSL-23.0.0.tar.gz +sha256 c1cc5f86bcacefc84dada7d31175cae1b1518d5f60d3d0bb595a67822a868a6f pyOpenSSL-23.0.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 2ba8c2e73da..1d89f5b6962 100644 --- a/package/python-pyopenssl/python-pyopenssl.mk +++ b/package/python-pyopenssl/python-pyopenssl.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYOPENSSL_VERSION = 21.0.0 +PYTHON_PYOPENSSL_VERSION = 23.0.0 PYTHON_PYOPENSSL_SOURCE = pyOpenSSL-$(PYTHON_PYOPENSSL_VERSION).tar.gz -PYTHON_PYOPENSSL_SITE = https://files.pythonhosted.org/packages/54/9a/2a43c5dbf4507f86f7c43cba4195d5e25a81c988fd7b0ea779dfc9c6973f +PYTHON_PYOPENSSL_SITE = https://files.pythonhosted.org/packages/af/6e/0706d5e0eac08fcff586366f5198c9bf0a8b46f0f45b1858324e0d94c295 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 c7daedc6b31..4c02ee1dce2 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 ec3dbe55359ee735b45766b30dfad877 build-0.7.0.tar.gz -sha256 1aaadcd69338252ade4f7ec1265e1a19184bf916d84c9b7df095f423948cb89f build-0.7.0.tar.gz +md5 f2dc1823b0eff7037e19be18e354b2f1 build-0.9.0.tar.gz +sha256 1a07724e891cbd898923145eb7752ee7653674c511378eb9c7691aab1612bc3c build-0.9.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 dc8363f59e4..adc124b0747 100644 --- a/package/python-pypa-build/python-pypa-build.mk +++ b/package/python-pypa-build/python-pypa-build.mk @@ -4,15 +4,14 @@ # ################################################################################ -PYTHON_PYPA_BUILD_VERSION = 0.7.0 +PYTHON_PYPA_BUILD_VERSION = 0.9.0 PYTHON_PYPA_BUILD_SOURCE = build-$(PYTHON_PYPA_BUILD_VERSION).tar.gz -PYTHON_PYPA_BUILD_SITE = https://files.pythonhosted.org/packages/f0/62/c73b775216bb1f34962beaf005f38460c6161177fef6e068a7a0c30a1597 +PYTHON_PYPA_BUILD_SITE = https://files.pythonhosted.org/packages/0f/61/aaf43fbb36cc4308be8ac8088f52db9622b0dbf1f0880c1016ae6aa03f46 PYTHON_PYPA_BUILD_LICENSE = MIT PYTHON_PYPA_BUILD_LICENSE_FILES = LICENSE PYTHON_PYPA_BUILD_SETUP_TYPE = setuptools HOST_PYTHON_PYPA_BUILD_DEPENDENCIES = \ host-python-packaging \ - host-python-pep517 \ - host-python-tomli + host-python-pep517 $(eval $(host-python-package)) diff --git a/package/python-pyparsing/python-pyparsing.hash b/package/python-pyparsing/python-pyparsing.hash index 1e56e878a1d..90242bb2e20 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 9d38774991175444e21a3dfa865876cc pyparsing-3.0.7.tar.gz -sha256 18ee9022775d270c55187733956460083db60b37d0d0fb357445f3094eed3eea pyparsing-3.0.7.tar.gz +md5 fadc2f3bf5872bf6310576a86c3566e0 pyparsing-3.0.9.tar.gz +sha256 2b020ecf7d21b687f219b71ecad3631f644a47f01403fa1d1036b0c6416d70fb pyparsing-3.0.9.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 2fb705bc7ae..55516c3ce89 100644 --- a/package/python-pyparsing/python-pyparsing.mk +++ b/package/python-pyparsing/python-pyparsing.mk @@ -4,12 +4,13 @@ # ################################################################################ -PYTHON_PYPARSING_VERSION = 3.0.7 +PYTHON_PYPARSING_VERSION = 3.0.9 PYTHON_PYPARSING_SOURCE = pyparsing-$(PYTHON_PYPARSING_VERSION).tar.gz -PYTHON_PYPARSING_SITE = https://files.pythonhosted.org/packages/d6/60/9bed18f43275b34198eb9720d4c1238c68b3755620d20df0afd89424d32b +PYTHON_PYPARSING_SITE = https://files.pythonhosted.org/packages/71/22/207523d16464c40a0310d2d4d8926daffa00ac1f5b1576170a32db749636 PYTHON_PYPARSING_LICENSE = MIT PYTHON_PYPARSING_LICENSE_FILES = LICENSE -PYTHON_PYPARSING_SETUP_TYPE = setuptools +PYTHON_PYPARSING_SETUP_TYPE = flit +HOST_PYTHON_PYPARSING_SETUP_TYPE = flit-bootstrap $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python-pyparted/python-pyparted.hash b/package/python-pyparted/python-pyparted.hash index 0c3e4a15fd3..a13276ce799 100644 --- a/package/python-pyparted/python-pyparted.hash +++ b/package/python-pyparted/python-pyparted.hash @@ -1,3 +1,5 @@ -# Locally computed -sha256 d214288ae1a70b5925861ce01b3352378eb6b1419aa3b786f509e9ef2a501c02 python-pyparted-3.11.6.tar.gz +# md5, sha256 from https://pypi.org/pypi/pyparted/json +md5 97df779564210100ea3e4eda0d33f7b9 pyparted-3.12.0.tar.gz +sha256 da985e116beb733371feb605b174db9eec8bd0eedffc8f739f8e603f51b521e7 pyparted-3.12.0.tar.gz +# Locally computed sha256 checksums sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING diff --git a/package/python-pyparted/python-pyparted.mk b/package/python-pyparted/python-pyparted.mk index 9d48fd93514..5e12995e2ee 100644 --- a/package/python-pyparted/python-pyparted.mk +++ b/package/python-pyparted/python-pyparted.mk @@ -4,9 +4,10 @@ # ################################################################################ -PYTHON_PYPARTED_VERSION = 3.11.6 -PYTHON_PYPARTED_SITE = $(call github,rhinstaller,pyparted,v$(PYTHON_PYPARTED_VERSION)) -PYTHON_PYPARTED_SETUP_TYPE = distutils +PYTHON_PYPARTED_VERSION = 3.12.0 +PYTHON_PYPARTED_SOURCE = pyparted-$(PYTHON_PYPARTED_VERSION).tar.gz +PYTHON_PYPARTED_SITE = https://files.pythonhosted.org/packages/c2/d0/d32aa5758d6567eef620075f5c84f475c93bb1bf8da9d17051ce3ef055db +PYTHON_PYPARTED_SETUP_TYPE = setuptools PYTHON_PYPARTED_LICENSE = GPL-2.0+ PYTHON_PYPARTED_LICENSE_FILES = COPYING PYTHON_PYPARTED_DEPENDENCIES = parted diff --git a/package/python-pyphen/python-pyphen.hash b/package/python-pyphen/python-pyphen.hash index 75ee9093511..39af62e0851 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 f8ec095e4fe30dc2b518a918788b33ed pyphen-0.11.0.tar.gz -sha256 e2c3ed82c3a04317df5102addafe89652b0876bc6c6265f5dd4c3efaf02315e8 pyphen-0.11.0.tar.gz +md5 a5039d1a4d8d4bad784cb864927f83f8 pyphen-0.13.2.tar.gz +sha256 847f57a043a58408f24670ae0184ff6edfb5fd5731743208228c028ddc514438 pyphen-0.13.2.tar.gz # Locally computed sha256 checksums sha256 9f0bffde4fbbbbc61c46f6577b6f472919dba9fdffabe74e8a7e44ac5dbef7a2 LICENSE sha256 2233a3eecf299bc271f1a9f57f0b3198343ad4ab16571d70320133002c51496b COPYING.GPL diff --git a/package/python-pyphen/python-pyphen.mk b/package/python-pyphen/python-pyphen.mk index 80f67c77c77..9ca064c293c 100644 --- a/package/python-pyphen/python-pyphen.mk +++ b/package/python-pyphen/python-pyphen.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_PYPHEN_VERSION = 0.11.0 +PYTHON_PYPHEN_VERSION = 0.13.2 PYTHON_PYPHEN_SOURCE = pyphen-$(PYTHON_PYPHEN_VERSION).tar.gz -PYTHON_PYPHEN_SITE = https://files.pythonhosted.org/packages/9a/f8/af869a4983c1b3159945479510260985714265d48baf27d61f72b1ec8cbf -PYTHON_PYPHEN_SETUP_TYPE = distutils +PYTHON_PYPHEN_SITE = https://files.pythonhosted.org/packages/46/12/aeb28a1e1a3f3cede967cea98ef3a1da844418ab8296a4bb9513f232736c +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-pyqrcode/python-pyqrcode.hash b/package/python-pyqrcode/python-pyqrcode.hash index b54b4aad270..c946ba9d9bd 100644 --- a/package/python-pyqrcode/python-pyqrcode.hash +++ b/package/python-pyqrcode/python-pyqrcode.hash @@ -1,5 +1,5 @@ # md5 from https://pypi.python.org/pypi/pyqrcode/json -md5 371f29f4b03bd2830c6e0319258b1259 PyQRCode-1.2.1.tar.gz +md5 371f29f4b03bd2830c6e0319258b1259 PyQRCode-1.2.1.tar.gz # Locally computed -sha256 fdbf7634733e56b72e27f9bce46e4550b75a3a2c420414035cae9d9d26b234d5 PyQRCode-1.2.1.tar.gz +sha256 fdbf7634733e56b72e27f9bce46e4550b75a3a2c420414035cae9d9d26b234d5 PyQRCode-1.2.1.tar.gz sha256 bef0c3595451da5132dea99e288fb5dafcbc469e0643f993a4ba0a69980f5ec9 setup.py diff --git a/package/python-pyqt5/0001-configure-skip-qtdetail.patch b/package/python-pyqt5/0001-configure-skip-qtdetail.patch index 2e7b331ed66..b82f89e0049 100644 --- a/package/python-pyqt5/0001-configure-skip-qtdetail.patch +++ b/package/python-pyqt5/0001-configure-skip-qtdetail.patch @@ -1,4 +1,8 @@ -Do not run qtdetail +From 7ed5e15f2de747e383ba7eee66b646a7a66e6654 Mon Sep 17 00:00:00 2001 +From: Sergey Kostanbaev +Date: Wed, 29 Dec 2021 12:30:12 -0800 +Subject: [PATCH] Do not run qtdetail + qtdetail is a tool that generates qtdetail.out. Since this program is cross-compiled, it's not possible to run it on the host. @@ -11,19 +15,24 @@ file is kept, and that qtdetail is not executed. Signed-off-by: Gwenhael Goavec-Merou Signed-off-by: Sergey Kostanbaev ---- -Index: PyQt5_gpl-5.7/configure.py -=================================================================== ---- PyQt5_gpl-5.7.orig/configure.py -+++ PyQt5_gpl-5.7/configure.py -@@ -672,10 +672,6 @@ int main(int argc, char **argv) - if cmd is None: - error("Failed to determine the detail of your Qt installation. Try again using the --verbose flag to see more detail about the problem.") +Signed-off-by: Adam Duskett +Refresh for 5.15.6 + +diff --git a/configure.py b/configure.py +index daa0f94..32f5b21 100644 +--- a/configure.py ++++ b/configure.py +@@ -2455,10 +2455,6 @@ def run_test_program(mname, test, verbose): -- # Create the output file, first making sure it doesn't exist. -- remove_file(out_file) -- run_command(cmd, verbose) + out_file = 'cfgtest_' + mname + '.out' + +- # Create the output file, first making sure it doesn't exist. +- remove_file(out_file) +- run_command(test + ' ' + out_file, verbose) - - if not os.access(out_file, os.F_OK): - error("%s failed to create %s. Make sure your Qt installation is correct." % (cmd, out_file)) + if not os.access(out_file, os.F_OK): + error("%s failed to create %s. Make sure your Qt installation is correct." % (test, out_file)) +-- +2.33.1 + diff --git a/package/python-pyqt5/0002-fix-QtCoremod.sip-syntax-error.patch b/package/python-pyqt5/0002-fix-QtCoremod.sip-syntax-error.patch new file mode 100644 index 00000000000..d83c5e525a3 --- /dev/null +++ b/package/python-pyqt5/0002-fix-QtCoremod.sip-syntax-error.patch @@ -0,0 +1,29 @@ +From d004e17cd92f660cb386d91e14729a03cab087d4 Mon Sep 17 00:00:00 2001 +From: Adam Duskett +Date: Sun, 22 May 2022 13:23:27 -0700 +Subject: [PATCH] fix QtCoremod.sip syntax error + +Fixes PyQt5/bindings/QtCore/QtCoremod.sip:23: syntax error from the +python-sip-4 package. + +Signed-off-by: Adam Duskett +--- + sip/QtCore/QtCoremod.sip | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sip/QtCore/QtCoremod.sip b/sip/QtCore/QtCoremod.sip +index b525bc5..1e2b8ba 100644 +--- a/sip/QtCore/QtCoremod.sip ++++ b/sip/QtCore/QtCoremod.sip +@@ -20,7 +20,7 @@ + // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. + + +-%Module(name=PyQt5.QtCore, call_super_init=True, default_VirtualErrorHandler=PyQt5, keyword_arguments="Optional", use_limited_api=True, py_ssize_t_clean=True) ++%Module(name=PyQt5.QtCore, call_super_init=True, default_VirtualErrorHandler=PyQt5, keyword_arguments="Optional", use_limited_api=True) + + %Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_6_2 Qt_5_6_3 Qt_5_6_4 Qt_5_6_5 Qt_5_6_6 Qt_5_6_7 Qt_5_6_8 Qt_5_6_9 Qt_5_7_0 Qt_5_7_1 Qt_5_8_0 Qt_5_8_1 Qt_5_9_0 Qt_5_9_1 Qt_5_9_2 Qt_5_9_3 Qt_5_9_4 Qt_5_9_5 Qt_5_9_6 Qt_5_9_7 Qt_5_9_8 Qt_5_9_9 Qt_5_10_0 Qt_5_10_1 Qt_5_11_0 Qt_5_11_1 Qt_5_11_2 Qt_5_11_3 Qt_5_12_0 Qt_5_12_1 Qt_5_12_2 Qt_5_12_3 Qt_5_12_4 Qt_5_13_0 Qt_5_14_0 Qt_5_15_0} + +-- +2.36.1 + diff --git a/package/python-pyqt5/0002-fix-qt-5.6.2.patch b/package/python-pyqt5/0002-fix-qt-5.6.2.patch deleted file mode 100644 index fd2f9d90699..00000000000 --- a/package/python-pyqt5/0002-fix-qt-5.6.2.patch +++ /dev/null @@ -1,28 +0,0 @@ -Fix the build with Qt 5.6.{2,3} - -Building PyQt 5.7 with versions of Qt older than Qt 5.7 is supposed to -work, but currently fails in practice. In fact, this is due to the -fact that the %Timeline variable in QtCoremod.sip didn't contain the -5.6.{2,3} Qt versions, so if this version was used, PyQt was assuming it -was the later version 5.7, and therefore started enabling APIs only -available in Qt 5.7, causing build failures when building against Qt -5.6.{2,3}. - -Adding Qt_5_6_2 and Qt_5_6_3 to the timeline fixes this problem. This -fix was suggested by Phil Thompson . - -Signed-off-by: Thomas Petazzoni - -Index: PyQt5_gpl-5.7/sip/QtCore/QtCoremod.sip -=================================================================== ---- PyQt5_gpl-5.7.orig/sip/QtCore/QtCoremod.sip 2016-07-25 15:55:37.000000000 +0200 -+++ PyQt5_gpl-5.7/sip/QtCore/QtCoremod.sip 2016-10-26 15:45:43.577153825 +0200 -@@ -22,7 +22,7 @@ - - %Module(name=PyQt5.QtCore, call_super_init=True, default_VirtualErrorHandler=PyQt5, keyword_arguments="Optional", version=1) - --%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_7_0} -+%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_6_2 Qt_5_6_3 Qt_5_7_0} - - %Platforms {WS_X11 WS_WIN WS_MACX} - diff --git a/package/python-pyqt5/0003-remove-WindowOkButtonHint-and-WindowCancelButtonHint.patch b/package/python-pyqt5/0003-remove-WindowOkButtonHint-and-WindowCancelButtonHint.patch deleted file mode 100644 index 146cce03480..00000000000 --- a/package/python-pyqt5/0003-remove-WindowOkButtonHint-and-WindowCancelButtonHint.patch +++ /dev/null @@ -1,27 +0,0 @@ -From bb7cbdede46f72468bbb1b9bbefd43a1dbad21c0 Mon Sep 17 00:00:00 2001 -From: Zoltan Gyarmati -Date: Mon, 30 Jan 2017 18:28:15 +0100 -Subject: [PATCH] remove WindowOkButtonHint and WindowCancelButtonHint from - qnamespace.sip as they are removed from qt5.8 - -Signed-off-by: Zoltan Gyarmati ---- - sip/QtCore/qnamespace.sip | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/sip/QtCore/qnamespace.sip b/sip/QtCore/qnamespace.sip -index 2db83b7..559f410 100644 ---- a/sip/QtCore/qnamespace.sip -+++ b/sip/QtCore/qnamespace.sip -@@ -209,8 +209,6 @@ namespace Qt - WindowContextHelpButtonHint, - WindowShadeButtonHint, - WindowStaysOnTopHint, -- WindowOkButtonHint, -- WindowCancelButtonHint, - WindowStaysOnBottomHint, - WindowCloseButtonHint, - MacWindowToolBarButtonHint, --- -2.7.4 - diff --git a/package/python-pyqt5/0004-drop-qttest-qtestmouse-waitforevents.patch b/package/python-pyqt5/0004-drop-qttest-qtestmouse-waitforevents.patch deleted file mode 100644 index 352be9aee04..00000000000 --- a/package/python-pyqt5/0004-drop-qttest-qtestmouse-waitforevents.patch +++ /dev/null @@ -1,32 +0,0 @@ -Drop waitForEvents() method from qtestmouse - -This method was dropped in Qt 5.11: - - https://github.com/qt/qtbase/commit/75e583b3fcbdbbb999633eb5f2267720dd695cfa - -However, Python PyQt5 still generates a wrapper for it, causing a -build failure. The upstream PyQt5 maintainers have not kept -waitForEvents() support for older Qt versions, and instead entirely -dropped it unconditionally. This can be verified by diffing PyQt 5.10 -and PyQt 5.11. We take the same approach, and drop waitForEvents() -unconditionally, even when PyQt5 is built against the older Qt 5.6. - -Fedora is using a similar solution: -https://src.fedoraproject.org/rpms/python-qt5/c/47fb7fdc5d16582772f9c3fc8a6a674a41a7f605?branch=master. - -This patch can be dropped when PyQt5 is bumped to its 5.11 version. - -Signed-off-by: Thomas Petazzoni - -Index: b/sip/QtTest/qtestmouse.sip -=================================================================== ---- a/sip/QtTest/qtestmouse.sip -+++ b/sip/QtTest/qtestmouse.sip -@@ -41,7 +41,6 @@ - void mousePress(QWidget *widget, Qt::MouseButton button, Qt::KeyboardModifiers modifier = 0, QPoint pos = QPoint(), int delay = -1); - void mouseRelease(QWidget *widget, Qt::MouseButton button, Qt::KeyboardModifiers modifier = 0, QPoint pos = QPoint(), int delay = -1); - void mouseEvent(QTest::MouseAction action, QWidget *widget, Qt::MouseButton button, Qt::KeyboardModifiers modifier, QPoint pos, int delay = -1); -- void waitForEvents() /ReleaseGIL/; - void mouseEvent(QTest::MouseAction action, QWindow *window, Qt::MouseButton button, Qt::KeyboardModifiers modifier, QPoint pos, int delay = -1); - void mousePress(QWindow *window, Qt::MouseButton button, Qt::KeyboardModifiers modifier = Qt::KeyboardModifiers(), QPoint pos = QPoint(), int delay = -1); - void mouseRelease(QWindow *window, Qt::MouseButton button, Qt::KeyboardModifiers modifier = Qt::KeyboardModifiers(), QPoint pos = QPoint(), int delay = -1); diff --git a/package/python-pyqt5/python-pyqt5.hash b/package/python-pyqt5/python-pyqt5.hash index 8ef467a27b8..d1b7adf8c15 100644 --- a/package/python-pyqt5/python-pyqt5.hash +++ b/package/python-pyqt5/python-pyqt5.hash @@ -1,6 +1,6 @@ -# md5 from http://http://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-5.7, sha256 locally computed -md5 e3dc21f31fd714659f0688e1eb31bacf PyQt5_gpl-5.7.tar.gz -sha256 892693ba5f79989abb2061dad2d5c4e6f127e9dd3240f73f8220c7152cd35b05 PyQt5_gpl-5.7.tar.gz +# From https://pypi.org/pypi/PyQt5/json +md5 0c7fca60aa6ee13c235f68576d9c7bed PyQt5-5.15.6.tar.gz -# Hash for license file -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE +# Locally calculated +sha256 80343bcab95ffba619f2ed2467fd828ffeb0a251ad7225be5fc06dcc333af452 PyQt5-5.15.6.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE diff --git a/package/python-pyqt5/python-pyqt5.mk b/package/python-pyqt5/python-pyqt5.mk index af32f637962..54b7f201b80 100644 --- a/package/python-pyqt5/python-pyqt5.mk +++ b/package/python-pyqt5/python-pyqt5.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYQT5_VERSION = 5.7 -PYTHON_PYQT5_SOURCE = PyQt5_gpl-$(PYTHON_PYQT5_VERSION).tar.gz -PYTHON_PYQT5_SITE = http://downloads.sourceforge.net/project/pyqt/PyQt5/PyQt-$(PYTHON_PYQT5_VERSION) +PYTHON_PYQT5_VERSION = 5.15.6 +PYTHON_PYQT5_SOURCE = PyQt5-$(PYTHON_PYQT5_VERSION).tar.gz +PYTHON_PYQT5_SITE = https://files.pythonhosted.org/packages/3b/27/fd81188a35f37be9b3b4c2db1654d9439d1418823916fe702ac3658c9c41 PYTHON_PYQT5_LICENSE = GPL-3.0 PYTHON_PYQT5_LICENSE_FILES = LICENSE @@ -91,13 +91,6 @@ PYTHON_PYQT5_DEPENDENCIES += qt5webchannel PYTHON_PYQT5_MODULES += QtWebChannel endif -ifeq ($(BR2_PACKAGE_QT5WEBENGINE),y) -PYTHON_PYQT5_DEPENDENCIES += qt5webengine -PYTHON_PYQT5_MODULES += \ - QtWebEngineCore \ - $(if $(BR2_PACKAGE_QT5BASE_WIDGETS),QtWebEngineWidgets) -endif - ifeq ($(BR2_PACKAGE_QT5WEBKIT),y) PYTHON_PYQT5_DEPENDENCIES += qt5webkit PYTHON_PYQT5_MODULES += \ @@ -120,27 +113,27 @@ PYTHON_PYQT5_DEPENDENCIES += qt5xmlpatterns PYTHON_PYQT5_MODULES += QtXmlPatterns endif -PYTHON_PYQT5_QTDETAIL_LICENSE = Open Source +PYTHON_PYQT5_QTCORE_LICENSE = Open Source -PYTHON_PYQT5_QTDETAIL_TYPE = shared +PYTHON_PYQT5_QTCORE_TYPE = shared # Turn off features that aren't available in current qt configuration -PYTHON_PYQT5_QTDETAIL_DISABLE_FEATURES += $(if $(BR2_PACKAGE_QT5BASE_OPENGL),,PyQt_OpenGL) -PYTHON_PYQT5_QTDETAIL_DISABLE_FEATURES += $(if $(BR2_PACKAGE_QT5BASE_OPENGL_DESKTOP),,PyQt_Desktop_OpenGL) -PYTHON_PYQT5_QTDETAIL_DISABLE_FEATURES += $(if $(BR2_PACKAGE_OPENSSL),,PyQt_SSL) +PYTHON_PYQT5_QTCORE_DISABLE_FEATURES += $(if $(BR2_PACKAGE_QT5BASE_OPENGL),,PyQt_OpenGL) +PYTHON_PYQT5_QTCORE_DISABLE_FEATURES += $(if $(BR2_PACKAGE_QT5BASE_OPENGL_DESKTOP),,PyQt_Desktop_OpenGL) +PYTHON_PYQT5_QTCORE_DISABLE_FEATURES += $(if $(BR2_PACKAGE_OPENSSL),,PyQt_SSL) -define PYTHON_PYQT5_QTDETAIL - echo $(1) >> $(2)/qtdetail.out +define PYTHON_PYQT5_QTCORE + echo $(1) >> $(2)/cfgtest_QtCore.out endef -# Since we can't run generate qtdetail.out by running qtdetail on target device +# Since we can't run generate cfgtest_QtCore.out by running qtdetail on target device # we must generate the configuration. -define PYTHON_PYQT5_GENERATE_QTDETAIL - $(RM) -f $(1)/qtdetail.out - $(call PYTHON_PYQT5_QTDETAIL,$(PYTHON_PYQT5_QTDETAIL_LICENSE),$(1)) - $(call PYTHON_PYQT5_QTDETAIL,$(PYTHON_PYQT5_QTDETAIL_TYPE),$(1)) - $(foreach f,$(PYTHON_PYQT5_QTDETAIL_DISABLE_FEATURES), - $(call PYTHON_PYQT5_QTDETAIL,$(f),$(1)) \ +define PYTHON_PYQT5_GENERATE_QTCORE + $(RM) -f $(1)/cfgtest_QtCore.out + $(call PYTHON_PYQT5_QTCORE,$(PYTHON_PYQT5_QTCORE_LICENSE),$(1)) + $(call PYTHON_PYQT5_QTCORE,$(PYTHON_PYQT5_QTCORE_TYPE),$(1)) + $(foreach f,$(PYTHON_PYQT5_QTCORE_DISABLE_FEATURES), + $(call PYTHON_PYQT5_QTCORE,$(f),$(1)) \ ) endef @@ -158,10 +151,11 @@ PYTHON_PYQT5_CONF_OPTS = \ --no-designer-plugin \ --no-docstrings \ --no-sip-files \ + --assume-shared \ $(foreach module,$(PYTHON_PYQT5_MODULES),--enable=$(module)) define PYTHON_PYQT5_CONFIGURE_CMDS - $(call PYTHON_PYQT5_GENERATE_QTDETAIL,$(@D)) + $(call PYTHON_PYQT5_GENERATE_QTCORE,$(@D)) (cd $(@D); \ $(TARGET_MAKE_ENV) \ $(TARGET_CONFIGURE_OPTS) \ @@ -177,7 +171,8 @@ endef # __init__.py is needed to import PyQt5 # __init__.pyc is needed if BR2_PACKAGE_PYTHON_PYC_ONLY is set define PYTHON_PYQT5_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) install + # Parallel install is not supported. + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE1) -C $(@D) install touch $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/PyQt5/__init__.py $(RM) -rf $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/PyQt5/uic/port_v2 endef diff --git a/package/python-pyratemp/python-pyratemp.hash b/package/python-pyratemp/python-pyratemp.hash index 91738321a97..376f9786e58 100644 --- a/package/python-pyratemp/python-pyratemp.hash +++ b/package/python-pyratemp/python-pyratemp.hash @@ -1,5 +1,5 @@ #md5 from https://pypi.python.org/pypi?:action=show_md5&digest=e4bbe5d4a98016efef882b2b2f47defb -md5 e4bbe5d4a98016efef882b2b2f47defb pyratemp-0.3.2.tgz +md5 e4bbe5d4a98016efef882b2b2f47defb pyratemp-0.3.2.tgz # Locally calculated: sha256 c45ed656ada482a02fe780495f37a695e7671accb04f918f7e7f18abf877bc71 pyratemp-0.3.2.tgz sha256 3de57a97f9c8492808867ae2ac2b33b422a8a34d29d0ea981b9e85c0963462db LICENSE diff --git a/package/python-pyroute2/python-pyroute2.hash b/package/python-pyroute2/python-pyroute2.hash index 35f397b14a0..bac8809f2da 100644 --- a/package/python-pyroute2/python-pyroute2.hash +++ b/package/python-pyroute2/python-pyroute2.hash @@ -1,7 +1,7 @@ # md5, sha256 from https://pypi.org/pypi/pyroute2/json -md5 371683b62314211b8bc9807ac8ef1144 pyroute2-0.5.7.tar.gz -sha256 963fce07da2841456d39e3b932b071f6de28d23dadfae014022d67a752916f98 pyroute2-0.5.7.tar.gz +md5 caaef93e32f2c3aee305aefba7c8ad21 pyroute2-0.7.3.tar.gz +sha256 7041040db1c2d187fbccd151485b1244c41d758be821785847946370eb6bb706 pyroute2-0.7.3.tar.gz # Locally computed sha256 -sha256 4739b32a2478e9c204bf010bad5d565d188e59ff905e3c8f71fe3398098b7093 LICENSE.Apache.v2 -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL.v2 -sha256 e329111754f1340de20b6084cae4d264b7b4fc8fb48964173f8ee0cb7440a51c README.license.md +sha256 4739b32a2478e9c204bf010bad5d565d188e59ff905e3c8f71fe3398098b7093 LICENSE.Apache-2.0 +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL-2.0-or-later +sha256 cbd229e4525bd162dd51f53b2e972d0383f0d0bd5277a10387a57ab9bff97c9f README.license.rst diff --git a/package/python-pyroute2/python-pyroute2.mk b/package/python-pyroute2/python-pyroute2.mk index 44c42d10331..fb4a1cbe5d6 100644 --- a/package/python-pyroute2/python-pyroute2.mk +++ b/package/python-pyroute2/python-pyroute2.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_PYROUTE2_VERSION = 0.5.7 +PYTHON_PYROUTE2_VERSION = 0.7.3 PYTHON_PYROUTE2_SOURCE = pyroute2-$(PYTHON_PYROUTE2_VERSION).tar.gz -PYTHON_PYROUTE2_SITE = https://files.pythonhosted.org/packages/6b/94/2a5f6c11369a21efd27a0b4cb92adf5012da7acdbce7e78055710986ca23 +PYTHON_PYROUTE2_SITE = https://files.pythonhosted.org/packages/9c/e6/8d163b1aea84223696fef8f8c55566adf166b79d614d602469d64af00226 PYTHON_PYROUTE2_LICENSE = Apache-2.0 or GPL-2.0+ -PYTHON_PYROUTE2_LICENSE_FILES = LICENSE.Apache.v2 LICENSE.GPL.v2 README.license.md -PYTHON_PYROUTE2_SETUP_TYPE = distutils +PYTHON_PYROUTE2_LICENSE_FILES = LICENSE.Apache-2.0 LICENSE.GPL-2.0-or-later README.license.rst +PYTHON_PYROUTE2_SETUP_TYPE = setuptools $(eval $(python-package)) diff --git a/package/python-pyrsistent/Config.in b/package/python-pyrsistent/Config.in new file mode 100644 index 00000000000..49f97a00d99 --- /dev/null +++ b/package/python-pyrsistent/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_PYRSISTENT + bool "python-pyrsistent" + help + Persistent/Functional/Immutable data structures. + + http://github.com/tobgu/pyrsistent/ diff --git a/package/python-pyrsistent/python-pyrsistent.hash b/package/python-pyrsistent/python-pyrsistent.hash new file mode 100644 index 00000000000..d5c9a22656e --- /dev/null +++ b/package/python-pyrsistent/python-pyrsistent.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/pyrsistent/json +md5 761266eab1f9dc9280cdb0a6d2dedb08 pyrsistent-0.19.3.tar.gz +sha256 1a2994773706bbb4995c31a97bc94f1418314923bd1048c6d964837040376440 pyrsistent-0.19.3.tar.gz +# Locally computed sha256 checksums +sha256 3ea56753cbd0cc897d3f4414a902f5694991db7c1b3abb8230216381185f9112 LICENSE.mit diff --git a/package/python-pyrsistent/python-pyrsistent.mk b/package/python-pyrsistent/python-pyrsistent.mk new file mode 100644 index 00000000000..f3457feebe9 --- /dev/null +++ b/package/python-pyrsistent/python-pyrsistent.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-pyrsistent +# +################################################################################ + +PYTHON_PYRSISTENT_VERSION = 0.19.3 +PYTHON_PYRSISTENT_SOURCE = pyrsistent-$(PYTHON_PYRSISTENT_VERSION).tar.gz +PYTHON_PYRSISTENT_SITE = https://files.pythonhosted.org/packages/bf/90/445a7dbd275c654c268f47fa9452152709134f61f09605cf776407055a89 +PYTHON_PYRSISTENT_SETUP_TYPE = setuptools +PYTHON_PYRSISTENT_LICENSE = MIT +PYTHON_PYRSISTENT_LICENSE_FILES = LICENSE.mit + +$(eval $(python-package)) diff --git a/package/python-pysmb/Config.in b/package/python-pysmb/Config.in index 61d7c2a03e4..bb935dddf17 100644 --- a/package/python-pysmb/Config.in +++ b/package/python-pysmb/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_PYTHON_PYSMB bool "python-pysmb" depends on BR2_INSTALL_LIBSTDCPP select BR2_PACKAGE_PYTHON_PYASN1 + select BR2_PACKAGE_PYTHON_TQDM help pysmb is an experimental SMB/CIFS library written in Python. It implements the client-side SMB/CIFS protocol (SMB1 and diff --git a/package/python-pysmb/python-pysmb.hash b/package/python-pysmb/python-pysmb.hash index 03713837fcf..87b1edf5957 100644 --- a/package/python-pysmb/python-pysmb.hash +++ b/package/python-pysmb/python-pysmb.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 af9db2e99eaa01e87b0ebc10f87db7c630cc880c7ae3d9dd06f1e5313e82d5a2 pysmb-1.2.7.tar.gz +sha256 30558c11ba141e9ad26e5edb1b85b94813a335ed5c0fe11df8046942b0c7e813 pysmb-1.2.9.tar.gz sha256 8c487d5c10f024e44a9cf1df21d1fd28a80bd2dfddd9f1dcd109a47d721f497f LICENSE diff --git a/package/python-pysmb/python-pysmb.mk b/package/python-pysmb/python-pysmb.mk index 89ff08e958f..394a9d806cb 100644 --- a/package/python-pysmb/python-pysmb.mk +++ b/package/python-pysmb/python-pysmb.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_PYSMB_VERSION = 1.2.7 +PYTHON_PYSMB_VERSION = 1.2.9 PYTHON_PYSMB_SOURCE = pysmb-$(PYTHON_PYSMB_VERSION).tar.gz PYTHON_PYSMB_SITE = https://miketeo.net/files/Projects/pysmb PYTHON_PYSMB_LICENSE = Libpng diff --git a/package/python-pysmi/python-pysmi.hash b/package/python-pysmi/python-pysmi.hash index b0c7a5d2707..bb13f0ef004 100644 --- a/package/python-pysmi/python-pysmi.hash +++ b/package/python-pysmi/python-pysmi.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pysmi/json -md5 10a9dd140ad512eed9f37344df83ce9d pysmi-0.3.4.tar.gz -sha256 bd15a15020aee8376cab5be264c26330824a8b8164ed0195bd402dd59e4e8f7c pysmi-0.3.4.tar.gz +md5 10a9dd140ad512eed9f37344df83ce9d pysmi-0.3.4.tar.gz +sha256 bd15a15020aee8376cab5be264c26330824a8b8164ed0195bd402dd59e4e8f7c pysmi-0.3.4.tar.gz # Locally computed sha256 checksums -sha256 c43704eafcfa2bc33e56168f2b498c3c34a1d7865855626a52b5af411fc5837f LICENSE.rst +sha256 c43704eafcfa2bc33e56168f2b498c3c34a1d7865855626a52b5af411fc5837f LICENSE.rst diff --git a/package/python-pysnmp-mibs/python-pysnmp-mibs.hash b/package/python-pysnmp-mibs/python-pysnmp-mibs.hash index 22d8dcb47ee..52a507f4b37 100644 --- a/package/python-pysnmp-mibs/python-pysnmp-mibs.hash +++ b/package/python-pysnmp-mibs/python-pysnmp-mibs.hash @@ -1,5 +1,5 @@ # md5 from https://pypi.python.org/pypi/pysnmp-mibs/json -md5 01845c4595d87d3c3485c0449616cbda pysnmp-mibs-0.1.6.tar.gz +md5 01845c4595d87d3c3485c0449616cbda pysnmp-mibs-0.1.6.tar.gz # Locally computed -sha256 00fa321ca598e8a14c0ad98702bf10fb5e9d57b7d06bb99dc818fea07683720c pysnmp-mibs-0.1.6.tar.gz +sha256 00fa321ca598e8a14c0ad98702bf10fb5e9d57b7d06bb99dc818fea07683720c pysnmp-mibs-0.1.6.tar.gz sha256 361eda483f7fac1f8cca4e16c340fa07a1cad2bf1200577a01075745233b406c LICENSE.txt diff --git a/package/python-pysnmp/python-pysnmp.hash b/package/python-pysnmp/python-pysnmp.hash index 582f9d66615..3b0af1af620 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 2222880259daf6e2cb322e938c818276 pysnmp-4.4.12.tar.gz -sha256 0c3dbef2f958caca96071fe5c19de43e9c1b0484ab02a0cf08b190bcee768ba9 pysnmp-4.4.12.tar.gz +md5 2222880259daf6e2cb322e938c818276 pysnmp-4.4.12.tar.gz +sha256 0c3dbef2f958caca96071fe5c19de43e9c1b0484ab02a0cf08b190bcee768ba9 pysnmp-4.4.12.tar.gz # Locally computed sha256 checksums -sha256 d0b2edd772164395320fc5ad7dfaa9806fa038fb29762b347c549891d7a79237 LICENSE.rst +sha256 d0b2edd772164395320fc5ad7dfaa9806fa038fb29762b347c549891d7a79237 LICENSE.rst diff --git a/package/python-pysocks/python-pysocks.hash b/package/python-pysocks/python-pysocks.hash index dc61bfbc5c1..2c1f13d681d 100644 --- a/package/python-pysocks/python-pysocks.hash +++ b/package/python-pysocks/python-pysocks.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pysocks/json -md5 89b1a6865c61bae67a32417517612ee6 PySocks-1.7.1.tar.gz -sha256 3f8804571ebe159c380ac6de37643bb4685970655d3bba243530d6558b799aa0 PySocks-1.7.1.tar.gz +md5 89b1a6865c61bae67a32417517612ee6 PySocks-1.7.1.tar.gz +sha256 3f8804571ebe159c380ac6de37643bb4685970655d3bba243530d6558b799aa0 PySocks-1.7.1.tar.gz # Locally computed sha256 checksums -sha256 7027e214e014eb78b7adcc1ceda5aca713a79fc4f6a0c52c9da5b3e707e6ffe9 LICENSE +sha256 7027e214e014eb78b7adcc1ceda5aca713a79fc4f6a0c52c9da5b3e707e6ffe9 LICENSE diff --git a/package/python-pyspnego/Config.in b/package/python-pyspnego/Config.in new file mode 100644 index 00000000000..7533b725ec0 --- /dev/null +++ b/package/python-pyspnego/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_PYSPNEGO + bool "python-pyspnego" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography + select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime + help + Windows Negotiate Authentication Client and Server. + + https://github.com/jborean93/pyspnego diff --git a/package/python-pyspnego/python-pyspnego.hash b/package/python-pyspnego/python-pyspnego.hash new file mode 100644 index 00000000000..0ae6cf1d4ed --- /dev/null +++ b/package/python-pyspnego/python-pyspnego.hash @@ -0,0 +1,6 @@ +# md5, sha256 from https://pypi.org/pypi/pyspnego/json +md5 93ab1a088d65e6a7c97efdb567ba37b0 pyspnego-0.7.0.tar.gz +sha256 da78096fd7c9f40e716f6fbe3e30d913103d75fd676f839f98fc3a6fee92fbe3 pyspnego-0.7.0.tar.gz + +# Locally computed +sha256 286517c93031c343f809f64b38563a783614b762e1367242af6cdd4107335471 LICENSE diff --git a/package/python-pyspnego/python-pyspnego.mk b/package/python-pyspnego/python-pyspnego.mk new file mode 100644 index 00000000000..2fbb779d98f --- /dev/null +++ b/package/python-pyspnego/python-pyspnego.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-pyspnego +# +################################################################################ + +PYTHON_PYSPNEGO_VERSION = 0.7.0 +PYTHON_PYSPNEGO_SOURCE = pyspnego-$(PYTHON_PYSPNEGO_VERSION).tar.gz +PYTHON_PYSPNEGO_SITE = https://files.pythonhosted.org/packages/97/f3/bdf3cd5f4c5a1bf9e1d4bb771c133850ee08241c18cafd90a6d872937a9f +PYTHON_PYSPNEGO_SETUP_TYPE = setuptools +PYTHON_PYSPNEGO_LICENSE = MIT +PYTHON_PYSPNEGO_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/package/python-pytablereader/python-pytablereader.hash b/package/python-pytablereader/python-pytablereader.hash index fb873caf715..2034cfd61ea 100644 --- a/package/python-pytablereader/python-pytablereader.hash +++ b/package/python-pytablereader/python-pytablereader.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pytablereader/json -md5 23ba6121e2f916dfbf4015516779dfcd pytablereader-0.26.1.tar.gz -sha256 f2e1477de8886267b765af7861baacc65606761bfabb0689f118cc5d27861f26 pytablereader-0.26.1.tar.gz +md5 8d732b706186666a4c28d14927c26754 pytablereader-0.31.3.tar.gz +sha256 e292b81ecd96546fe0f53d9c83e716a4682d07d7ead6d9be8beb14ab0591df11 pytablereader-0.31.3.tar.gz # Locally computed sha256 checksums -sha256 7fcef461a93fea587224132a865d1285969c9bec15baf59caeb7a8c7638a8744 LICENSE +sha256 7588265082eed5e9f4afd5090c57e610b740ec547b16aaaab739ba07c5eefb15 LICENSE diff --git a/package/python-pytablereader/python-pytablereader.mk b/package/python-pytablereader/python-pytablereader.mk index 0f9e4c593a1..daa484d3934 100644 --- a/package/python-pytablereader/python-pytablereader.mk +++ b/package/python-pytablereader/python-pytablereader.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYTABLEREADER_VERSION = 0.26.1 +PYTHON_PYTABLEREADER_VERSION = 0.31.3 PYTHON_PYTABLEREADER_SOURCE = pytablereader-$(PYTHON_PYTABLEREADER_VERSION).tar.gz -PYTHON_PYTABLEREADER_SITE = https://files.pythonhosted.org/packages/1e/bc/f60da8a733cd87215d8533f28536f8149eca3b898bbca346b37b6c915d8d +PYTHON_PYTABLEREADER_SITE = https://files.pythonhosted.org/packages/b5/c8/67590578e27cb1716c7b71291946d685b5bf63fbfe7a254a7cb3f6f8aeab PYTHON_PYTABLEREADER_SETUP_TYPE = setuptools PYTHON_PYTABLEREADER_LICENSE = MIT PYTHON_PYTABLEREADER_LICENSE_FILES = LICENSE diff --git a/package/python-pytablewriter/python-pytablewriter.hash b/package/python-pytablewriter/python-pytablewriter.hash index 8933fe37d5c..f082542dfbb 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 4909dcdba8c6df35e14dbecbc6c94b6c pytablewriter-0.46.1.tar.gz -sha256 9d52ecc84bb89197c312e193b4ff04a3c934b914f3c32e4826d44a0acbc7764f pytablewriter-0.46.1.tar.gz +md5 0eaa4a2429d22389b5e4b8c5f5135bbb pytablewriter-0.64.2.tar.gz +sha256 99409d401d6ef5f06d1bc40f265a8e3053afe4cbfbaf709f71124076afb40dbb pytablewriter-0.64.2.tar.gz # Locally computed sha256 checksums -sha256 a93d75bcb0774e2990106380cadad6dcb2de193c55d435ffc56ba345a08b1dc2 LICENSE +sha256 a93d75bcb0774e2990106380cadad6dcb2de193c55d435ffc56ba345a08b1dc2 LICENSE diff --git a/package/python-pytablewriter/python-pytablewriter.mk b/package/python-pytablewriter/python-pytablewriter.mk index a63f7f8a2ac..d865a89330e 100644 --- a/package/python-pytablewriter/python-pytablewriter.mk +++ b/package/python-pytablewriter/python-pytablewriter.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYTABLEWRITER_VERSION = 0.46.1 +PYTHON_PYTABLEWRITER_VERSION = 0.64.2 PYTHON_PYTABLEWRITER_SOURCE = pytablewriter-$(PYTHON_PYTABLEWRITER_VERSION).tar.gz -PYTHON_PYTABLEWRITER_SITE = https://files.pythonhosted.org/packages/bb/86/d5f3dfec35d2d7583c9f3f1d731adf729851d1fe01011f07a747eb8c7df0 +PYTHON_PYTABLEWRITER_SITE = https://files.pythonhosted.org/packages/a6/e1/50c1cd9734a9edc1386913b178f9e4757c1bc37665c1855a6596c25957d6 PYTHON_PYTABLEWRITER_SETUP_TYPE = setuptools PYTHON_PYTABLEWRITER_LICENSE = MIT PYTHON_PYTABLEWRITER_LICENSE_FILES = LICENSE diff --git a/package/python-pytest-asyncio/python-pytest-asyncio.hash b/package/python-pytest-asyncio/python-pytest-asyncio.hash index 4949919ecb9..051670aa512 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 8940c41c342b5bafe2ebb0d6e5c320ec pytest-asyncio-0.15.1.tar.gz -sha256 2564ceb9612bbd560d19ca4b41347b54e7835c2f792c504f698e05395ed63f6f pytest-asyncio-0.15.1.tar.gz +md5 dce438c7b0081d7f580b5a79d7105570 pytest-asyncio-0.20.3.tar.gz +sha256 83cbf01169ce3e8eb71c6c278ccb0574d1a7a3bb8eaaf5e50e0ad342afb33b36 pytest-asyncio-0.20.3.tar.gz # Locally computed sha256 checksums -sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSE +sha256 a8ad31b1c3f40dca5a84119351b8fa8ddc868edd77fad8a8ebf6d8f2d16fa4ae LICENSE diff --git a/package/python-pytest-asyncio/python-pytest-asyncio.mk b/package/python-pytest-asyncio/python-pytest-asyncio.mk index bd2e0083a9e..c94c9ea8765 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.15.1 +PYTHON_PYTEST_ASYNCIO_VERSION = 0.20.3 PYTHON_PYTEST_ASYNCIO_SOURCE = pytest-asyncio-$(PYTHON_PYTEST_ASYNCIO_VERSION).tar.gz -PYTHON_PYTEST_ASYNCIO_SITE = https://files.pythonhosted.org/packages/de/c1/b2b0119e30f61f7ec8b44f129f6fde46a1a7329de17110f124639aa8896b +PYTHON_PYTEST_ASYNCIO_SITE = https://files.pythonhosted.org/packages/6e/06/38b0ca5d53582bb49697626975b5540435ea064762d852b5c66646c729e9 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 c3956c76d2b..9bbc9ea2d2c 100644 --- a/package/python-pytest/Config.in +++ b/package/python-pytest/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_PYTHON_PYTEST select BR2_PACKAGE_PYTHON_PACKAGING # runtime select BR2_PACKAGE_PYTHON_PLUGGY # runtime select BR2_PACKAGE_PYTHON_PY # runtime - select BR2_PACKAGE_PYTHON_TOML # runtime select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime help pytest is a framework that makes building simple and scalable diff --git a/package/python-pytest/python-pytest.hash b/package/python-pytest/python-pytest.hash index 060dc6189e4..2ae1e61ed40 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 8bc467ebd5d571778dc51dd87ff09513 pytest-6.2.5.tar.gz -sha256 131b36680866a76e6781d13f101efb86cf674ebb9762eb70d3082b6f29889e89 pytest-6.2.5.tar.gz +md5 49decbade40109f9c6970df60c22a230 pytest-7.2.0.tar.gz +sha256 c4014eb40e10f11f355ad4e3c2fb2c6c6d1919c73f3b5a433de4708202cade59 pytest-7.2.0.tar.gz # Locally computer sha256 -sha256 7898b9b164d4f93fd9a562fd0f592935518b48c4745303964110eb7f7fe64faf LICENSE +sha256 ca836a5f9ecca3b2f350230faa20a48fb8b145653b5568d784862df864706b9b LICENSE diff --git a/package/python-pytest/python-pytest.mk b/package/python-pytest/python-pytest.mk index 5aa9ebca6ed..1794582dd3e 100644 --- a/package/python-pytest/python-pytest.mk +++ b/package/python-pytest/python-pytest.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYTEST_VERSION = 6.2.5 +PYTHON_PYTEST_VERSION = 7.2.0 PYTHON_PYTEST_SOURCE = pytest-$(PYTHON_PYTEST_VERSION).tar.gz -PYTHON_PYTEST_SITE = https://files.pythonhosted.org/packages/4b/24/7d1f2d2537de114bdf1e6875115113ca80091520948d370c964b88070af2 +PYTHON_PYTEST_SITE = https://files.pythonhosted.org/packages/0b/21/055f39bf8861580b43f845f9e8270c7786fe629b2f8562ff09007132e2e7 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 new file mode 100644 index 00000000000..08348a5ccf7 --- /dev/null +++ b/package/python-pythran/python-pythran.hash @@ -0,0 +1,6 @@ +# md5, sha256 from https://pypi.org/pypi/pythran/json +md5 d2961ece35b4b9f44a84ef31df1b21ff pythran-0.12.0.tar.gz +sha256 eff3dd0d3eebe57372f0d14f82985525e9bcdfb5b1d1010e1932cf9207060f9f pythran-0.12.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 new file mode 100644 index 00000000000..0d946be28ac --- /dev/null +++ b/package/python-pythran/python-pythran.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# python-pythran +# +################################################################################ + +PYTHON_PYTHRAN_VERSION = 0.12.0 +PYTHON_PYTHRAN_SOURCE = pythran-$(PYTHON_PYTHRAN_VERSION).tar.gz +PYTHON_PYTHRAN_SITE = https://files.pythonhosted.org/packages/99/e0/ed0e81de05cfa4ecbcbceec6603d175387d8bc7a6332cbfd155d09958ccf +PYTHON_PYTHRAN_SETUP_TYPE = setuptools +PYTHON_PYTHRAN_LICENSE = BSD-3-Clause +PYTHON_PYTHRAN_LICENSE_FILES = LICENSE docs/LICENSE.rst +HOST_PYTHON_PYTHRAN_DEPENDENCIES = \ + host-python-beniget \ + host-python-gast \ + host-python-numpy \ + host-python-ply + +$(eval $(host-python-package)) diff --git a/package/python-pytz/python-pytz.hash b/package/python-pytz/python-pytz.hash index e0f253902c6..6d6e1b606c1 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 d7b7060bbac4970afa2050c139c9fcb6 pytz-2021.3.tar.gz -sha256 acad2d8b20a1af07d4e4c9d2e9285c5ed9104354062f275f3fcd88dcef4f1326 pytz-2021.3.tar.gz +md5 3b9356e4dcd441df922cc01e8eb15983 pytz-2022.7.tar.gz +sha256 7ccfae7b4b2c067464a6733c6261673fdb8fd1be905460396b97a073e9fa683a pytz-2022.7.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 d6067506991..057a3ef1737 100644 --- a/package/python-pytz/python-pytz.mk +++ b/package/python-pytz/python-pytz.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_PYTZ_VERSION = 2021.3 +PYTHON_PYTZ_VERSION = 2022.7 PYTHON_PYTZ_SOURCE = pytz-$(PYTHON_PYTZ_VERSION).tar.gz -PYTHON_PYTZ_SITE = https://files.pythonhosted.org/packages/e3/8e/1cde9d002f48a940b9d9d38820aaf444b229450c0854bdf15305ce4a3d1a +PYTHON_PYTZ_SITE = https://files.pythonhosted.org/packages/6d/37/54f2d7c147e42dc85ffbc6910862bb4f141fb3fc14d9a88efaa1a76c7df2 PYTHON_PYTZ_SETUP_TYPE = setuptools PYTHON_PYTZ_LICENSE = MIT PYTHON_PYTZ_LICENSE_FILES = LICENSE.txt $(eval $(python-package)) +$(eval $(host-python-package)) 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 d798f836a59..26f1ef63904 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 @@ -24,9 +24,9 @@ index 9dffb3c..aa9942f 100644 --- a/src/pyudev/_ctypeslib/utils.py +++ b/src/pyudev/_ctypeslib/utils.py @@ -28,7 +28,7 @@ - from __future__ import print_function - from __future__ import unicode_literals + """ + # isort: STDLIB -from ctypes import CDLL +from ctypes import cdll, CDLL from ctypes.util import find_library @@ -41,7 +41,7 @@ index 9dffb3c..aa9942f 100644 + try: + lib = cdll.LoadLibrary('lib%s.so' % name) + except OSError: - raise ImportError('No library named %s' % name) + raise ImportError("No library named %s" % 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 def10542fa5..014bf209330 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 377eda61186c91e9440f01d76dbb4206 pyudev-0.22.0.tar.gz -sha256 69bb1beb7ac52855b6d1b9fe909eefb0017f38d917cba9939602c6880035b276 pyudev-0.22.0.tar.gz +md5 17c0a41f0e4dfc016350806a0a60f630 pyudev-0.24.0.tar.gz +sha256 b2a3afe1c99ea751f8296652557eac559874da2a1b1ec0625178706ec5a345f3 pyudev-0.24.0.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 42d5c7000b5..5d48cd4f7cb 100644 --- a/package/python-pyudev/python-pyudev.mk +++ b/package/python-pyudev/python-pyudev.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYUDEV_VERSION = 0.22.0 +PYTHON_PYUDEV_VERSION = 0.24.0 PYTHON_PYUDEV_SOURCE = pyudev-$(PYTHON_PYUDEV_VERSION).tar.gz -PYTHON_PYUDEV_SITE = https://files.pythonhosted.org/packages/72/c8/4660d815a79b1d42c409012aaa10ebd6b07a47529b4cb6880f27a24bd646 +PYTHON_PYUDEV_SITE = https://files.pythonhosted.org/packages/00/8d/810750cb2fc64d7e0dbefc106a9137b157616a95be3f0ea51ca3cf6c762a PYTHON_PYUDEV_LICENSE = LGPL-2.1+ PYTHON_PYUDEV_LICENSE_FILES = COPYING PYTHON_PYUDEV_SETUP_TYPE = setuptools diff --git a/package/python-pyxb/python-pyxb.hash b/package/python-pyxb/python-pyxb.hash index 0cfce576186..f24cd42e5a8 100644 --- a/package/python-pyxb/python-pyxb.hash +++ b/package/python-pyxb/python-pyxb.hash @@ -1,4 +1,4 @@ # md5 from https://pypi.python.org/pypi/PyXB/json, sha256 locally computed -md5 4303573fc7094ce4664c5b71cd4bdb48 PyXB-1.2.6.tar.gz -sha256 2a00f38dd1d87b88f92d79bc5a09718d730419b88e814545f472bbd5a3bf27b4 PyXB-1.2.6.tar.gz +md5 4303573fc7094ce4664c5b71cd4bdb48 PyXB-1.2.6.tar.gz +sha256 2a00f38dd1d87b88f92d79bc5a09718d730419b88e814545f472bbd5a3bf27b4 PyXB-1.2.6.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/python-pyyaml/Config.in.host b/package/python-pyyaml/Config.in.host new file mode 100644 index 00000000000..1e8382ef5e1 --- /dev/null +++ b/package/python-pyyaml/Config.in.host @@ -0,0 +1,6 @@ +config BR2_PACKAGE_HOST_PYTHON_PYYAML + bool "host python-pyyaml" + help + The host PyYAML package contains binding to the libyaml API. + + http://pyyaml.org/ diff --git a/package/python-pyzmq/0001-detect.py-fix-the-ZMQ-version-check-to-the-ZMQ-versi.patch b/package/python-pyzmq/0001-detect.py-fix-the-ZMQ-version-check-to-the-ZMQ-versi.patch new file mode 100644 index 00000000000..18553582f45 --- /dev/null +++ b/package/python-pyzmq/0001-detect.py-fix-the-ZMQ-version-check-to-the-ZMQ-versi.patch @@ -0,0 +1,67 @@ +From 8eae1193457f72899f9cc2254ae1489026df9bb6 Mon Sep 17 00:00:00 2001 +From: Michael Rommel +Date: Sat, 10 Aug 2013 00:44:35 +0200 +Subject: [PATCH] detect.py: fix the ZMQ version check to the ZMQ version of + the buildroot + +The setup.py script tries to compile a test C program and runs it, to +retrieve a version string for the installed ZMQ library, but if the cross +compiler links it together, the result cannot be run on the host, due to +different architectures and libraries. + +And if the host compiler would compile/link it, it would not link with +the library version inside buildroot but with the library from the +host, possibly returning a wrong version number. + +Instead of trying to run the compiled test program to get the version +dynamically, return the version of the buildroot environment. + +Written by Michael Rommel, modified for version 16.0.2 by Lionel +Flandrin. + +Modified for version 18.0.2 by Asaf Kahlon + +Modified for version 24.0.1 by James Hilliard + +Signed-off-by: Michael Rommel +Signed-off-by: Lionel Flandrin +Signed-off-by: Asaf Kahlon +Signed-off-by: James Hilliard +--- + buildutils/detect.py | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +diff --git a/buildutils/detect.py b/buildutils/detect.py +index 842e3b14..e2eca744 100644 +--- a/buildutils/detect.py ++++ b/buildutils/detect.py +@@ -120,18 +120,20 @@ def detect_zmq(basedir, compiler, **compiler_attrs): + + cc = get_compiler(compiler=compiler, **compiler_attrs) + efile = test_compilation(cfile, compiler=cc, **compiler_attrs) +- patch_lib_paths(efile, cc.library_dirs) ++ #patch_lib_paths(efile, cc.library_dirs) + + # add library dirs to %PATH% for windows + env = os.environ.copy() + if sys.platform.startswith("win"): + env["PATH"] = os.pathsep.join([env["PATH"]] + cc.library_dirs) + +- rc, so, se = get_output_error([efile], env=env) +- if rc: +- msg = f"Error running version detection script:\n{so}\n{se}" +- logging.error(msg) +- raise OSError(msg) ++ #rc, so, se = get_output_error([efile], env=env) ++ #if rc: ++ # msg = f"Error running version detection script:\n{so}\n{se}" ++ # logging.error(msg) ++ # raise OSError(msg) ++ ++ so = "vers: ##ZEROMQ_VERSION##" + + handlers = {'vers': lambda val: tuple(int(v) for v in val.split('.'))} + +-- +2.34.1 + diff --git a/package/python-pyzmq/0001-use-buildroot-zmq-version-instead-of-detect.patch b/package/python-pyzmq/0001-use-buildroot-zmq-version-instead-of-detect.patch deleted file mode 100644 index 315c8c8bb2a..00000000000 --- a/package/python-pyzmq/0001-use-buildroot-zmq-version-instead-of-detect.patch +++ /dev/null @@ -1,54 +0,0 @@ -detect.py: fix the ZMQ version check to the ZMQ version of the buildroot - -The setup.py script tries to compile a test C program and runs it, to -retrieve a version string for the installed ZMQ library, but if the cross -compiler links it together, the result cannot be run on the host, due to -different architectures and libraries. - -And if the host compiler would compile/link it, it would not link with -the library version inside buildroot but with the library from the -host, possibly returning a wrong version number. - -Instead of trying to run the compiled test program to get the version -dynamically, return the version of the buildroot environment. - -Written by Michael Rommel, modified for version 16.0.2 by Lionel -Flandrin. - -Modified for version 18.0.2 by Asaf Kahlon - -Signed-off-by: Lionel Flandrin -Signed-off-by: Asaf Kahlon ---- - buildutils/detect.py | 14 ++++++++------ - 1 file changed, 8 insertions(+), 6 deletions(-) - -diff --git a/buildutils/detect.py b/buildutils/detect.py -index d1380fe..4a91351 100644 ---- a/buildutils/detect.py -+++ b/buildutils/detect.py -@@ -120,13 +120,15 @@ def detect_zmq(basedir, compiler=None, **compiler_attrs): - - cc = get_compiler(compiler=compiler, **compiler_attrs) - efile = test_compilation(cfile, compiler=cc, **compiler_attrs) -- patch_lib_paths(efile, cc.library_dirs) -+ #patch_lib_paths(efile, cc.library_dirs) - -- rc, so, se = get_output_error([efile]) -- if rc: -- msg = "Error running version detection script:\n%s\n%s" % (so,se) -- logging.error(msg) -- raise IOError(msg) -+ #rc, so, se = get_output_error([efile]) -+ # if rc: -+ # msg = "Error running version detection script:\n%s\n%s" % (so,se) -+ # logging.error(msg) -+ # raise IOError(msg) -+ -+ so = "vers: ##ZEROMQ_VERSION##" - - handlers = {'vers': lambda val: tuple(int(v) for v in val.split('.'))} - --- -2.20.1 - diff --git a/package/python-pyzmq/python-pyzmq.hash b/package/python-pyzmq/python-pyzmq.hash index ecf64892492..efbc91d83c3 100644 --- a/package/python-pyzmq/python-pyzmq.hash +++ b/package/python-pyzmq/python-pyzmq.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/pyzmq/json -md5 200abc1a75bdcfff7adf61304f46f55e pyzmq-19.0.2.tar.gz -sha256 296540a065c8c21b26d63e3cea2d1d57902373b16e4256afe46422691903a438 pyzmq-19.0.2.tar.gz +md5 f10b7c3dee2c03557e2c5d00b73dfc7f pyzmq-24.0.1.tar.gz +sha256 216f5d7dbb67166759e59b0479bca82b8acf9bed6015b526b8eb10143fb08e77 pyzmq-24.0.1.tar.gz # Locally computed sha256 checksums sha256 aef3b80570351d44e29c22d080d4e9e106b34f3fdbc5cdf9636994474c72b1a2 COPYING.BSD sha256 44b23767df3c0fe27f88981f09bc7f50a1695cec4b24252fa5f55f03e76bcd6d COPYING.LESSER diff --git a/package/python-pyzmq/python-pyzmq.mk b/package/python-pyzmq/python-pyzmq.mk index d1f4314a1e2..5792957eaf0 100644 --- a/package/python-pyzmq/python-pyzmq.mk +++ b/package/python-pyzmq/python-pyzmq.mk @@ -4,14 +4,14 @@ # ################################################################################ -PYTHON_PYZMQ_VERSION = 19.0.2 +PYTHON_PYZMQ_VERSION = 24.0.1 PYTHON_PYZMQ_SOURCE = pyzmq-$(PYTHON_PYZMQ_VERSION).tar.gz -PYTHON_PYZMQ_SITE = https://files.pythonhosted.org/packages/05/77/7483975d84fe1fd24cc67881ba7810e0e7b3ee6c2a0e002a5d6703cca49b +PYTHON_PYZMQ_SITE = https://files.pythonhosted.org/packages/46/0d/b06cf99a64d4187632f4ac9ddf6be99cd35de06fe72d75140496a8e0eef5 PYTHON_PYZMQ_LICENSE = LGPL-3.0+, BSD-3-Clause, Apache-2.0 # Apache license only online: http://www.apache.org/licenses/LICENSE-2.0 PYTHON_PYZMQ_LICENSE_FILES = COPYING.LESSER COPYING.BSD -PYTHON_PYZMQ_DEPENDENCIES = zeromq -PYTHON_PYZMQ_SETUP_TYPE = distutils +PYTHON_PYZMQ_DEPENDENCIES = host-python-packaging zeromq +PYTHON_PYZMQ_SETUP_TYPE = setuptools PYTHON_PYZMQ_BUILD_OPTS = --zmq=$(STAGING_DIR)/usr # Due to issues with cross-compiling, hardcode to the zeromq in BR diff --git a/package/python-qrcode/Config.in b/package/python-qrcode/Config.in new file mode 100644 index 00000000000..9a17cc1f081 --- /dev/null +++ b/package/python-qrcode/Config.in @@ -0,0 +1,18 @@ +config BR2_PACKAGE_PYTHON_QRCODE + bool "python-qrcode" + help + Pure python QR Code generator + + https://github.com/lincolnloop/python-qrcode + +if BR2_PACKAGE_PYTHON_QRCODE + +config BR2_PACKAGE_PYTHON_QRCODE_SVG + bool "SVG support" + select BR2_PACKAGE_PYTHON3_PYEXPAT + +config BR2_PACKAGE_PYTHON_QRCODE_PIL + bool "PIL support" + select BR2_PACKAGE_PYTHON_PILLOW + +endif diff --git a/package/python-qrcode/python-qrcode.hash b/package/python-qrcode/python-qrcode.hash new file mode 100644 index 00000000000..1ab84dd355a --- /dev/null +++ b/package/python-qrcode/python-qrcode.hash @@ -0,0 +1,5 @@ +# md5 from https://pypi.python.org/pypi/qrcode/json +md5 124103c685e96ba3b7a1616760f31c11 qrcode-7.3.1.tar.gz +sha256 375a6ff240ca9bd41adc070428b5dfc1dcfbb0f2507f1ac848f6cded38956578 qrcode-7.3.1.tar.gz +# Locally computed +sha256 40dfb903c94ee3f789500131311186548ecba5cefd3557623d7700e2522ab994 LICENSE diff --git a/package/python-qrcode/python-qrcode.mk b/package/python-qrcode/python-qrcode.mk new file mode 100644 index 00000000000..23e7dd3b885 --- /dev/null +++ b/package/python-qrcode/python-qrcode.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-qrcode +# +################################################################################ + +PYTHON_QRCODE_VERSION = 7.3.1 +PYTHON_QRCODE_SOURCE = qrcode-$(PYTHON_QRCODE_VERSION).tar.gz +PYTHON_QRCODE_SITE = https://files.pythonhosted.org/packages/94/9f/31f33cdf3cf8f98e64c42582fb82f39ca718264df61957f28b0bbb09b134 +PYTHON_QRCODE_SETUP_TYPE = setuptools +PYTHON_QRCODE_LICENSE = BSD-3-Clause +PYTHON_QRCODE_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/package/python-raven/python-raven.hash b/package/python-raven/python-raven.hash index 6f264193ecb..7f6fc5b1163 100644 --- a/package/python-raven/python-raven.hash +++ b/package/python-raven/python-raven.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/raven/json -md5 3676f31dadfa61526444dd0245c78a38 raven-6.10.0.tar.gz -sha256 3fa6de6efa2493a7c827472e984ce9b020797d0da16f1db67197bcc23c8fae54 raven-6.10.0.tar.gz +md5 3676f31dadfa61526444dd0245c78a38 raven-6.10.0.tar.gz +sha256 3fa6de6efa2493a7c827472e984ce9b020797d0da16f1db67197bcc23c8fae54 raven-6.10.0.tar.gz # Locally computed sha256 checksums -sha256 5ce9459bc19ced99cc9eb135d4f559ed01e336354bdf16dd998be85aa688c233 LICENSE +sha256 5ce9459bc19ced99cc9eb135d4f559ed01e336354bdf16dd998be85aa688c233 LICENSE diff --git a/package/python-redis/python-redis.hash b/package/python-redis/python-redis.hash index 57c71dabfa7..209ff35b78a 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 7a00d4540374f34e152a33faa1fcee5f redis-3.5.3.tar.gz -sha256 0e7e0cfca8660dea8b7d5cd8c4f6c5e29e11f31158c0b0ae91a397f00e5a05a2 redis-3.5.3.tar.gz +md5 4ab691af57ac346c2e630ce2787a424f redis-4.4.0.tar.gz +sha256 7b8c87d19c45d3f1271b124858d2a5c13160c4e74d4835e28273400fa34d5228 redis-4.4.0.tar.gz # Locally computed sha256 checksums -sha256 790148d8c12f8a38b2707a74be2343316bad126995ff54801a181b8b231ba124 LICENSE +sha256 7801a39e3a1aec58a7ea7c9f4dc1238cf0922c36a1fc8eff0bb7d684ff6dd354 LICENSE diff --git a/package/python-redis/python-redis.mk b/package/python-redis/python-redis.mk index 98c1a165998..bbbd6f1df23 100644 --- a/package/python-redis/python-redis.mk +++ b/package/python-redis/python-redis.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_REDIS_VERSION = 3.5.3 +PYTHON_REDIS_VERSION = 4.4.0 PYTHON_REDIS_SOURCE = redis-$(PYTHON_REDIS_VERSION).tar.gz -PYTHON_REDIS_SITE = https://files.pythonhosted.org/packages/b3/17/1e567ff78c83854e16b98694411fe6e08c3426af866ad11397cddceb80d3 +PYTHON_REDIS_SITE = https://files.pythonhosted.org/packages/7a/05/671367bb466b3301bc4543fdad6ac107214ca327c8d97165b30246d87e88 PYTHON_REDIS_SETUP_TYPE = setuptools PYTHON_REDIS_LICENSE = MIT PYTHON_REDIS_LICENSE_FILES = LICENSE diff --git a/package/python-reedsolo/Config.in b/package/python-reedsolo/Config.in new file mode 100644 index 00000000000..6482b1e98ce --- /dev/null +++ b/package/python-reedsolo/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_REEDSOLO + bool "python-reedsolo" + help + Pure-Python Reed Solomon encoder/decoder. + + https://github.com/tomerfiliba/reedsolomon diff --git a/package/python-reedsolo/python-reedsolo.hash b/package/python-reedsolo/python-reedsolo.hash new file mode 100644 index 00000000000..fdafc89f495 --- /dev/null +++ b/package/python-reedsolo/python-reedsolo.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/reedsolo/json +md5 b67a04027a1825c63a63b6793ec660a3 reedsolo-1.6.0.tar.gz +sha256 4e290d3b0a7207ac7aac186790766c752b5fcdf5e0b04dfd260349579052bbac reedsolo-1.6.0.tar.gz +# Locally computed sha256 checksums +sha256 0babd7b573efc3dcf5bb3c28b583150726f775d3dd8d54d6cd062834735b3d73 LICENSE diff --git a/package/python-reedsolo/python-reedsolo.mk b/package/python-reedsolo/python-reedsolo.mk new file mode 100644 index 00000000000..2a7fd42a053 --- /dev/null +++ b/package/python-reedsolo/python-reedsolo.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-reedsolo +# +################################################################################ + +PYTHON_REEDSOLO_VERSION = 1.6.0 +PYTHON_REEDSOLO_SOURCE = reedsolo-$(PYTHON_REEDSOLO_VERSION).tar.gz +PYTHON_REEDSOLO_SITE = https://files.pythonhosted.org/packages/9b/10/28d1492cc82a103bc06f18cb9a9dbb3a9168ab2e4068801fa0aa0c76b231 +PYTHON_REEDSOLO_SETUP_TYPE = setuptools +PYTHON_REEDSOLO_LICENSE = Public Domain +PYTHON_REEDSOLO_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/package/python-reentry/python-reentry.hash b/package/python-reentry/python-reentry.hash index 522b936118e..1d6ff0e2172 100644 --- a/package/python-reentry/python-reentry.hash +++ b/package/python-reentry/python-reentry.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/reentry/json -md5 398c1e5bbda657aa645c8d2d38afb63f reentry-1.3.2.tar.gz -sha256 c6667e59aeabbb4d122aadc2170102a270e6a811d16a5431c5c3b91fabd7cf02 reentry-1.3.2.tar.gz +md5 30b57a189bb3c319c0552a2f3105d34d reentry-1.3.3.tar.gz +sha256 6343d83245e5047c9f8db0702ec1a7fa8210bd553f0ab643212572f6fce2c3ff reentry-1.3.3.tar.gz # Locally computed sha256 checksums sha256 4ae7f3216208a7e2327236e95bcd2397b2495f1c2298c708986c893bea608509 LICENSE diff --git a/package/python-reentry/python-reentry.mk b/package/python-reentry/python-reentry.mk index ec33c174528..5808eee4a24 100644 --- a/package/python-reentry/python-reentry.mk +++ b/package/python-reentry/python-reentry.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_REENTRY_VERSION = 1.3.2 +PYTHON_REENTRY_VERSION = 1.3.3 PYTHON_REENTRY_SOURCE = reentry-$(PYTHON_REENTRY_VERSION).tar.gz -PYTHON_REENTRY_SITE = https://files.pythonhosted.org/packages/a0/88/eb0c107c19227a2292ed11711034a3d80c0dc1368d2b3ebeb3fe7b936a8e +PYTHON_REENTRY_SITE = https://files.pythonhosted.org/packages/95/20/e820a29014f1cb662423d7001dc09a9ea5280083ea300f0c5efe5cae238b PYTHON_REENTRY_SETUP_TYPE = setuptools PYTHON_REENTRY_LICENSE = MIT PYTHON_REENTRY_LICENSE_FILES = LICENSE diff --git a/package/python-regex/python-regex.hash b/package/python-regex/python-regex.hash index b0f5bb05da2..11a5765e412 100644 --- a/package/python-regex/python-regex.hash +++ b/package/python-regex/python-regex.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/regex/json -md5 cd206281327b4c087bb20bf93cee4ab9 regex-2021.4.4.tar.gz -sha256 52ba3d3f9b942c49d7e4bc105bb28551c44065f139a65062ab7912bef10c9afb regex-2021.4.4.tar.gz +md5 a85ced10be8bfe76fed4f30c42d32d5c regex-2022.10.31.tar.gz +sha256 a3a98921da9a1bf8457aeee6a551948a83601689e5ecdd736894ea9bbec77e83 regex-2022.10.31.tar.gz # Locally computed sha256 checksums sha256 bff55ef4cdcc8c14ce259f8e8ab60e264418440d6335f4dc138273fbd506144d LICENSE.txt diff --git a/package/python-regex/python-regex.mk b/package/python-regex/python-regex.mk index bb8fdf3e485..81bd460ecc1 100644 --- a/package/python-regex/python-regex.mk +++ b/package/python-regex/python-regex.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_REGEX_VERSION = 2021.4.4 +PYTHON_REGEX_VERSION = 2022.10.31 PYTHON_REGEX_SOURCE = regex-$(PYTHON_REGEX_VERSION).tar.gz -PYTHON_REGEX_SITE = https://files.pythonhosted.org/packages/38/3f/4c42a98c9ad7d08c16e7d23b2194a0e4f3b2914662da8bc88986e4e6de1f +PYTHON_REGEX_SITE = https://files.pythonhosted.org/packages/27/b5/92d404279fd5f4f0a17235211bb0f5ae7a0d9afb7f439086ec247441ed28 PYTHON_REGEX_SETUP_TYPE = setuptools PYTHON_REGEX_LICENSE = Apache-2.0 PYTHON_REGEX_LICENSE_FILES = LICENSE.txt diff --git a/package/python-remi/python-remi.hash b/package/python-remi/python-remi.hash index 4e1786a952e..e7937c3914e 100644 --- a/package/python-remi/python-remi.hash +++ b/package/python-remi/python-remi.hash @@ -1,2 +1,4 @@ # sha256 from https://pypi.org/pypi/remi/json -sha256 c8691f007dc30b91013131b6aded3521c17ef8ec9fdd152a0ad481b8cb793f14 remi-2021.3.2.tar.gz +sha256 542df88e174bbd58fe763c49e5c2116f2c8413c1a934731069ed8c17bb9cd64c remi-2022.7.27.tar.gz +# Locally computed sha256 +sha256 3df7d3ad8904d7e99fc0810366483a7cbe5a43c13f7f913f1d7e5023f2ff7657 LICENSE diff --git a/package/python-remi/python-remi.mk b/package/python-remi/python-remi.mk index 609e127cf03..419a3441a7f 100644 --- a/package/python-remi/python-remi.mk +++ b/package/python-remi/python-remi.mk @@ -4,10 +4,12 @@ # ################################################################################ -PYTHON_REMI_VERSION = 2021.3.2 +PYTHON_REMI_VERSION = 2022.7.27 PYTHON_REMI_SOURCE = remi-$(PYTHON_REMI_VERSION).tar.gz -PYTHON_REMI_SITE = https://files.pythonhosted.org/packages/c0/99/94bd825cf8baee369b959f76c802a51ccc69d4d62ec113e26db4835f710c +PYTHON_REMI_SITE = https://files.pythonhosted.org/packages/b7/5c/fca9d9273fc9d5f4ca0bc2f387ca19f8ba9979dcb75617d094e575dc2337 + PYTHON_REMI_LICENSE = Apache-2.0 +PYTHON_REMI_LICENSE_FILES = LICENSE PYTHON_REMI_SETUP_TYPE = setuptools $(eval $(python-package)) diff --git a/package/python-requests-oauthlib/python-requests-oauthlib.hash b/package/python-requests-oauthlib/python-requests-oauthlib.hash index d33cabfefc9..08c19ab1f6b 100644 --- a/package/python-requests-oauthlib/python-requests-oauthlib.hash +++ b/package/python-requests-oauthlib/python-requests-oauthlib.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/requests-oauthlib/json -md5 1ebcd55f1b1b9281940b4bc33010e2ba requests-oauthlib-1.3.0.tar.gz -sha256 b4261601a71fd721a8bd6d7aa1cc1d6a8a93b4a9f5e96626f8e4d91e8beeaa6a requests-oauthlib-1.3.0.tar.gz +md5 c4f3b4ecdb72a56a13675e5a3302852a requests-oauthlib-1.3.1.tar.gz +sha256 75beac4a47881eeb94d5ea5d6ad31ef88856affe2332b9aafb52c6452ccf0d7a requests-oauthlib-1.3.1.tar.gz # Locally computed sha256 checksums sha256 ae01846afad8a8291fe6a08966f3015af9a8ff675d84b981f9793c122f7876e8 LICENSE diff --git a/package/python-requests-oauthlib/python-requests-oauthlib.mk b/package/python-requests-oauthlib/python-requests-oauthlib.mk index 9fe5b186b0a..cdd334fb9a9 100644 --- a/package/python-requests-oauthlib/python-requests-oauthlib.mk +++ b/package/python-requests-oauthlib/python-requests-oauthlib.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_REQUESTS_OAUTHLIB_VERSION = 1.3.0 +PYTHON_REQUESTS_OAUTHLIB_VERSION = 1.3.1 PYTHON_REQUESTS_OAUTHLIB_SOURCE = requests-oauthlib-$(PYTHON_REQUESTS_OAUTHLIB_VERSION).tar.gz -PYTHON_REQUESTS_OAUTHLIB_SITE = https://files.pythonhosted.org/packages/23/eb/68fc8fa86e0f5789832f275c8289257d8dc44dbe93fce7ff819112b9df8f +PYTHON_REQUESTS_OAUTHLIB_SITE = https://files.pythonhosted.org/packages/95/52/531ef197b426646f26b53815a7d2a67cb7a331ef098bb276db26a68ac49f PYTHON_REQUESTS_OAUTHLIB_SETUP_TYPE = setuptools PYTHON_REQUESTS_OAUTHLIB_LICENSE = ISC PYTHON_REQUESTS_OAUTHLIB_LICENSE_FILES = LICENSE diff --git a/package/python-requests-toolbelt/python-requests-toolbelt.hash b/package/python-requests-toolbelt/python-requests-toolbelt.hash index 1b733fd7eb4..28abf2c6283 100644 --- a/package/python-requests-toolbelt/python-requests-toolbelt.hash +++ b/package/python-requests-toolbelt/python-requests-toolbelt.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/requests-toolbelt/json -md5 b1509735c4b4cf95df2619facbc3672e requests-toolbelt-0.9.1.tar.gz -sha256 968089d4584ad4ad7c171454f0a5c6dac23971e9472521ea3b6d49d610aa6fc0 requests-toolbelt-0.9.1.tar.gz +md5 636d226d03632d013269aebbc85f4f4b requests-toolbelt-0.10.1.tar.gz +sha256 62e09f7ff5ccbda92772a29f394a49c3ad6cb181d568b1337626b2abb628a63d requests-toolbelt-0.10.1.tar.gz # Locally computed sha256 checksums -sha256 3a1a3cffa7abc000cbd726a664f56c33c532a55480f9e056dfe941cf93b7c37f LICENSE +sha256 1f8cf8bdacd98ed6d36d0fec0c07f7765acebd6e81205962ab5146023b3c858d LICENSE diff --git a/package/python-requests-toolbelt/python-requests-toolbelt.mk b/package/python-requests-toolbelt/python-requests-toolbelt.mk index 119c402785d..8c141e3aa9c 100644 --- a/package/python-requests-toolbelt/python-requests-toolbelt.mk +++ b/package/python-requests-toolbelt/python-requests-toolbelt.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_REQUESTS_TOOLBELT_VERSION = 0.9.1 +PYTHON_REQUESTS_TOOLBELT_VERSION = 0.10.1 PYTHON_REQUESTS_TOOLBELT_SOURCE = requests-toolbelt-$(PYTHON_REQUESTS_TOOLBELT_VERSION).tar.gz -PYTHON_REQUESTS_TOOLBELT_SITE = https://files.pythonhosted.org/packages/28/30/7bf7e5071081f761766d46820e52f4b16c8a08fef02d2eb4682ca7534310 +PYTHON_REQUESTS_TOOLBELT_SITE = https://files.pythonhosted.org/packages/0c/4c/07f01c6ac44f7784fa399137fbc8d0cdc1b5d35304e8c0f278ad82105b58 PYTHON_REQUESTS_TOOLBELT_SETUP_TYPE = setuptools PYTHON_REQUESTS_TOOLBELT_LICENSE = Apache-2.0 PYTHON_REQUESTS_TOOLBELT_LICENSE_FILES = LICENSE diff --git a/package/python-requests/python-requests.hash b/package/python-requests/python-requests.hash index 1e4cbaff7b4..c4aeabb25da 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 bcc01b73974a305cc7c5b092e7d07004 requests-2.27.1.tar.gz -sha256 68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61 requests-2.27.1.tar.gz +md5 941e175c276cd7d39d098092c56679a4 requests-2.31.0.tar.gz +sha256 942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1 requests-2.31.0.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 9613a2c47ce..2c74db37113 100644 --- a/package/python-requests/python-requests.mk +++ b/package/python-requests/python-requests.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_REQUESTS_VERSION = 2.27.1 +PYTHON_REQUESTS_VERSION = 2.31.0 PYTHON_REQUESTS_SOURCE = requests-$(PYTHON_REQUESTS_VERSION).tar.gz -PYTHON_REQUESTS_SITE = https://files.pythonhosted.org/packages/60/f3/26ff3767f099b73e0efa138a9998da67890793bfa475d8278f84a30fec77 +PYTHON_REQUESTS_SITE = https://files.pythonhosted.org/packages/9d/be/10918a2eac4ae9f02f6cfe6414b7a155ccd8f7f9d4380d62fd5b955065c3 PYTHON_REQUESTS_SETUP_TYPE = setuptools PYTHON_REQUESTS_LICENSE = Apache-2.0 PYTHON_REQUESTS_LICENSE_FILES = LICENSE diff --git a/package/python-rfc3987/Config.in b/package/python-rfc3987/Config.in new file mode 100644 index 00000000000..3cd74f53143 --- /dev/null +++ b/package/python-rfc3987/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_RFC3987 + bool "python-rfc3987" + help + Parsing and validation of URIs (RFC 3986) and IRIs (RFC + 3987). + + http://pypi.python.org/pypi/rfc3987 diff --git a/package/python-rfc3987/python-rfc3987.hash b/package/python-rfc3987/python-rfc3987.hash new file mode 100644 index 00000000000..013cee61611 --- /dev/null +++ b/package/python-rfc3987/python-rfc3987.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/rfc3987/json +md5 b6c4028acdc788a9ba697e1c1d6b896c rfc3987-1.3.8.tar.gz +sha256 d3c4d257a560d544e9826b38bc81db676890c79ab9d7ac92b39c7a253d5ca733 rfc3987-1.3.8.tar.gz +# Locally computed sha256 checksums +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.txt diff --git a/package/python-rfc3987/python-rfc3987.mk b/package/python-rfc3987/python-rfc3987.mk new file mode 100644 index 00000000000..cad17e8de2b --- /dev/null +++ b/package/python-rfc3987/python-rfc3987.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-rfc3987 +# +################################################################################ + +PYTHON_RFC3987_VERSION = 1.3.8 +PYTHON_RFC3987_SOURCE = rfc3987-$(PYTHON_RFC3987_VERSION).tar.gz +PYTHON_RFC3987_SITE = https://files.pythonhosted.org/packages/14/bb/f1395c4b62f251a1cb503ff884500ebd248eed593f41b469f89caa3547bd +PYTHON_RFC3987_SETUP_TYPE = setuptools +PYTHON_RFC3987_LICENSE = GPL-3.0+ +PYTHON_RFC3987_LICENSE_FILES = COPYING.txt + +$(eval $(python-package)) diff --git a/package/python-rpi-gpio/0001-fix-build-with-gcc-10.x.patch b/package/python-rpi-gpio/0001-fix-build-with-gcc-10.x.patch deleted file mode 100644 index 95892f997fc..00000000000 --- a/package/python-rpi-gpio/0001-fix-build-with-gcc-10.x.patch +++ /dev/null @@ -1,147 +0,0 @@ -Description: This patch fixes the "multiple definition of" errors with gcc10 - -Signed-off-by: Michael Fischer - -diff -purN python-rpi-gpio.org/source/common.c python-rpi-gpio/source/common.c ---- python-rpi-gpio.org/source/common.c 2019-07-21 14:41:22.000000000 +0200 -+++ python-rpi-gpio/source/common.c 2020-08-07 09:31:33.948575964 +0200 -@@ -28,6 +28,9 @@ - const int pin_to_gpio_rev1[41] = {-1, -1, -1, 0, -1, 1, -1, 4, 14, -1, 15, 17, 18, 21, -1, 22, 23, -1, 24, 10, -1, 9, 25, 11, 8, -1, 7, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }; - const int pin_to_gpio_rev2[41] = {-1, -1, -1, 2, -1, 3, -1, 4, 14, -1, 15, 17, 18, 27, -1, 22, 23, -1, 24, 10, -1, 9, 25, 11, 8, -1, 7, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }; - const int pin_to_gpio_rev3[41] = {-1, -1, -1, 2, -1, 3, -1, 4, 14, -1, 15, 17, 18, 27, -1, 22, 23, -1, 24, 10, -1, 9, 25, 11, 8, -1, 7, -1, -1, 5, -1, 6, 12, 13, -1, 19, 16, 26, 20, -1, 21 }; -+const int (*pin_to_gpio)[41]; -+int gpio_direction[54]; -+rpi_info rpiinfo; - int setup_error = 0; - int module_setup = 0; - -diff -purN python-rpi-gpio.org/source/common.h python-rpi-gpio/source/common.h ---- python-rpi-gpio.org/source/common.h 2019-07-21 14:41:22.000000000 +0200 -+++ python-rpi-gpio/source/common.h 2020-08-07 09:31:33.948575964 +0200 -@@ -30,14 +30,14 @@ SOFTWARE. - #define I2C 42 - #define PWM 43 - --int gpio_mode; --const int pin_to_gpio_rev1[41]; --const int pin_to_gpio_rev2[41]; --const int pin_to_gpio_rev3[41]; --const int (*pin_to_gpio)[41]; --int gpio_direction[54]; --rpi_info rpiinfo; --int setup_error; --int module_setup; -+extern int gpio_mode; -+extern const int pin_to_gpio_rev1[41]; -+extern const int pin_to_gpio_rev2[41]; -+extern const int pin_to_gpio_rev3[41]; -+extern const int (*pin_to_gpio)[41]; -+extern int gpio_direction[54]; -+extern rpi_info rpiinfo; -+extern int setup_error; -+extern int module_setup; - int check_gpio_priv(void); - int get_gpio_number(int channel, unsigned int *gpio); -diff -purN python-rpi-gpio.org/source/constants.c python-rpi-gpio/source/constants.c ---- python-rpi-gpio.org/source/constants.c 2019-07-21 14:41:22.000000000 +0200 -+++ python-rpi-gpio/source/constants.c 2020-08-07 09:32:15.522196618 +0200 -@@ -21,6 +21,7 @@ - */ - - #include "Python.h" -+#define CONSTANTS_C - #include "constants.h" - #include "common.h" - #include "c_gpio.h" -diff -purN python-rpi-gpio.org/source/constants.h python-rpi-gpio/source/constants.h ---- python-rpi-gpio.org/source/constants.h 2019-07-21 14:41:22.000000000 +0200 -+++ python-rpi-gpio/source/constants.h 2020-08-07 09:32:15.522196618 +0200 -@@ -23,22 +23,28 @@ SOFTWARE. - #define PY_PUD_CONST_OFFSET 20 - #define PY_EVENT_CONST_OFFSET 30 - --PyObject *high; --PyObject *low; --PyObject *input; --PyObject *output; --PyObject *pwm; --PyObject *serial; --PyObject *i2c; --PyObject *spi; --PyObject *unknown; --PyObject *board; --PyObject *bcm; --PyObject *pud_off; --PyObject *pud_up; --PyObject *pud_down; --PyObject *rising_edge; --PyObject *falling_edge; --PyObject *both_edge; -+#ifdef CONSTANTS_C -+#define MAYBE_EXTERN -+#else -+#define MAYBE_EXTERN extern -+#endif -+ -+MAYBE_EXTERN PyObject *high; -+MAYBE_EXTERN PyObject *low; -+MAYBE_EXTERN PyObject *input; -+MAYBE_EXTERN PyObject *output; -+MAYBE_EXTERN PyObject *pwm; -+MAYBE_EXTERN PyObject *serial; -+MAYBE_EXTERN PyObject *i2c; -+MAYBE_EXTERN PyObject *spi; -+MAYBE_EXTERN PyObject *unknown; -+MAYBE_EXTERN PyObject *board; -+MAYBE_EXTERN PyObject *bcm; -+MAYBE_EXTERN PyObject *pud_off; -+MAYBE_EXTERN PyObject *pud_up; -+MAYBE_EXTERN PyObject *pud_down; -+MAYBE_EXTERN PyObject *rising_edge; -+MAYBE_EXTERN PyObject *falling_edge; -+MAYBE_EXTERN PyObject *both_edge; - - void define_constants(PyObject *module); -diff -purN python-rpi-gpio.org/source/event_gpio.c python-rpi-gpio/source/event_gpio.c ---- python-rpi-gpio.org/source/event_gpio.c 2019-07-21 14:41:22.000000000 +0200 -+++ python-rpi-gpio/source/event_gpio.c 2020-08-07 09:42:05.564483136 +0200 -@@ -57,7 +57,7 @@ struct callback - }; - struct callback *callbacks = NULL; - --pthread_t threads; -+static pthread_t threads; - int event_occurred[54] = { 0 }; - int thread_running = 0; - int epfd_thread = -1; -diff -purN python-rpi-gpio.org/source/py_pwm.h python-rpi-gpio/source/py_pwm.h ---- python-rpi-gpio.org/source/py_pwm.h 2019-07-21 14:41:22.000000000 +0200 -+++ python-rpi-gpio/source/py_pwm.h 2020-08-07 09:38:49.445646807 +0200 -@@ -20,5 +20,5 @@ OUT OF OR IN CONNECTION WITH THE SOFTWAR - SOFTWARE. - */ - --PyTypeObject PWMType; -+extern PyTypeObject PWMType; - PyTypeObject *PWM_init_PWMType(void); -diff -purN python-rpi-gpio.org/source/soft_pwm.c python-rpi-gpio/source/soft_pwm.c ---- python-rpi-gpio.org/source/soft_pwm.c 2019-07-21 14:41:22.000000000 +0200 -+++ python-rpi-gpio/source/soft_pwm.c 2020-08-07 09:42:40.753160437 +0200 -@@ -25,7 +25,7 @@ SOFTWARE. - #include - #include "c_gpio.h" - #include "soft_pwm.h" --pthread_t threads; -+static pthread_t threads; - - struct pwm - { -diff -purN python-rpi-gpio.org/source/soft_pwm.h python-rpi-gpio/source/soft_pwm.h ---- python-rpi-gpio.org/source/soft_pwm.h 2019-07-21 14:41:22.000000000 +0200 -+++ python-rpi-gpio/source/soft_pwm.h 2020-08-07 09:39:25.916811352 +0200 -@@ -26,4 +26,4 @@ void pwm_set_duty_cycle(unsigned int gpi - void pwm_set_frequency(unsigned int gpio, float freq); - void pwm_start(unsigned int gpio); - void pwm_stop(unsigned int gpio); --int pwm_exists(unsigned int gpio); -+extern int pwm_exists(unsigned int gpio); diff --git a/package/python-rpi-gpio/Config.in b/package/python-rpi-gpio/Config.in index 4f59ebdb066..f3c0928c626 100644 --- a/package/python-rpi-gpio/Config.in +++ b/package/python-rpi-gpio/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_PYTHON_RPI_GPIO bool "python-rpi-gpio" - depends on BR2_arm + depends on BR2_arm || BR2_aarch64 help A Python module to control the GPIO on a Raspberry Pi. diff --git a/package/python-rpi-gpio/python-rpi-gpio.hash b/package/python-rpi-gpio/python-rpi-gpio.hash index 620efd27ad3..22bcaebdcb8 100644 --- a/package/python-rpi-gpio/python-rpi-gpio.hash +++ b/package/python-rpi-gpio/python-rpi-gpio.hash @@ -1,6 +1,5 @@ -# md5 from https://pypi.python.org/pypi/rpi_gpio/json -# sha256 from https://pypi.python.org/pypi/rpi_gpio/json -md5 777617f9dea9a1680f9af43db0cf150e RPi.GPIO-0.7.0.tar.gz -sha256 7424bc6c205466764f30f666c18187a0824077daf20b295c42f08aea2cb87d3f RPi.GPIO-0.7.0.tar.gz +# md5, sha256 from https://pypi.org/pypi/rpi_gpio/json +md5 22704930a4e674a3d35342bde6d69fe5 RPi.GPIO-0.7.1.tar.gz +sha256 cd61c4b03c37b62bba4a5acfea9862749c33c618e0295e7e90aa4713fb373b70 RPi.GPIO-0.7.1.tar.gz # Locally computed -sha256 a668b3edecb3e69e81ec25987257008208ffcba9d6c43682033b8060c5f2f994 LICENCE.txt +sha256 1ccf039a03088da42bdb218a446a564330b881ec71f7022a9fb1930f3fb65d8a LICENCE.txt diff --git a/package/python-rpi-gpio/python-rpi-gpio.mk b/package/python-rpi-gpio/python-rpi-gpio.mk index dfc59c882e9..4e62e07533a 100644 --- a/package/python-rpi-gpio/python-rpi-gpio.mk +++ b/package/python-rpi-gpio/python-rpi-gpio.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_RPI_GPIO_VERSION = 0.7.0 +PYTHON_RPI_GPIO_VERSION = 0.7.1 PYTHON_RPI_GPIO_SOURCE = RPi.GPIO-$(PYTHON_RPI_GPIO_VERSION).tar.gz -PYTHON_RPI_GPIO_SITE = https://sourceforge.net/projects/raspberry-gpio-python/files +PYTHON_RPI_GPIO_SITE = https://files.pythonhosted.org/packages/c4/0f/10b524a12b3445af1c607c27b2f5ed122ef55756e29942900e5c950735f2 PYTHON_RPI_GPIO_LICENSE = MIT PYTHON_RPI_GPIO_LICENSE_FILES = LICENCE.txt -PYTHON_RPI_GPIO_SETUP_TYPE = distutils +PYTHON_RPI_GPIO_SETUP_TYPE = setuptools $(eval $(python-package)) diff --git a/package/python-rpi-ws281x/python-rpi-ws281x.hash b/package/python-rpi-ws281x/python-rpi-ws281x.hash index 06b2d18607d..ffdd826b6f9 100644 --- a/package/python-rpi-ws281x/python-rpi-ws281x.hash +++ b/package/python-rpi-ws281x/python-rpi-ws281x.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/rpi-ws281x/json -md5 333dacfc58058d5f485f9af74551c70e rpi_ws281x-4.3.0.tar.gz -sha256 0b9549687ab7117acbc4bac0e92742fd2c8290fd204514d72fed91c06ba2e805 rpi_ws281x-4.3.0.tar.gz +md5 016e1f03f9168ef03d4baf074aa60f03 rpi_ws281x-4.3.4.tar.gz +sha256 072eff1787e579d1710381b27c467709e3aab28ac579c7a47d7cc87398496f28 rpi_ws281x-4.3.4.tar.gz # Locally computed sha256 checksums sha256 7bbf6337c1eee7169579e6acd398f31ea274dfa3a1689ab7e654ca3585d5a8a9 LICENSE sha256 7bbf6337c1eee7169579e6acd398f31ea274dfa3a1689ab7e654ca3585d5a8a9 lib/LICENSE diff --git a/package/python-rpi-ws281x/python-rpi-ws281x.mk b/package/python-rpi-ws281x/python-rpi-ws281x.mk index b7110396153..73befeb56e9 100644 --- a/package/python-rpi-ws281x/python-rpi-ws281x.mk +++ b/package/python-rpi-ws281x/python-rpi-ws281x.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_RPI_WS281X_VERSION = 4.3.0 +PYTHON_RPI_WS281X_VERSION = 4.3.4 PYTHON_RPI_WS281X_SOURCE = rpi_ws281x-$(PYTHON_RPI_WS281X_VERSION).tar.gz -PYTHON_RPI_WS281X_SITE = https://files.pythonhosted.org/packages/cd/b3/eb7ac93376952f165577707ec756f40c9537ed53c59fcbc3290c357370e0 +PYTHON_RPI_WS281X_SITE = https://files.pythonhosted.org/packages/e2/d4/75fcc4f3412b9b16e39e6cd6156f2e171fe7b2e79057be17d1acf38fded4 PYTHON_RPI_WS281X_SETUP_TYPE = setuptools PYTHON_RPI_WS281X_LICENSE = BSD-2-Clause PYTHON_RPI_WS281X_LICENSE_FILES = LICENSE lib/LICENSE diff --git a/package/python-rsa/python-rsa.hash b/package/python-rsa/python-rsa.hash index 9fbbf0ac888..0e2b3a9119f 100644 --- a/package/python-rsa/python-rsa.hash +++ b/package/python-rsa/python-rsa.hash @@ -1,5 +1,5 @@ -# From https://pypi.org/project/rsa/ -sha256 9d689e6ca1b3038bc82bf8d23e944b6b6037bc02301a574935b2dd946e0353b9 rsa-4.7.2.tar.gz - -# Locally computed -sha256 073f28b7d389c8fe74f607e17c27f81eaa5ace69edc43a884f23f41b41c5c726 LICENSE +# md5, sha256 from https://pypi.org/pypi/rsa/json +md5 26a1efb79164a95c363e550c3eefe683 rsa-4.9.tar.gz +sha256 e38464a49c6c85d7f1351b0126661487a7e0a14a50f1675ec50eb34d4f20ef21 rsa-4.9.tar.gz +# Locally computed sha256 checksums +sha256 073f28b7d389c8fe74f607e17c27f81eaa5ace69edc43a884f23f41b41c5c726 LICENSE diff --git a/package/python-rsa/python-rsa.mk b/package/python-rsa/python-rsa.mk index a3d4bb82356..01b5c49b50f 100644 --- a/package/python-rsa/python-rsa.mk +++ b/package/python-rsa/python-rsa.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_RSA_VERSION = 4.7.2 +PYTHON_RSA_VERSION = 4.9 PYTHON_RSA_SOURCE = rsa-$(PYTHON_RSA_VERSION).tar.gz -PYTHON_RSA_SITE = https://files.pythonhosted.org/packages/db/b5/475c45a58650b0580421746504b680cd2db4e81bc941e94ca53785250269 +PYTHON_RSA_SITE = https://files.pythonhosted.org/packages/aa/65/7d973b89c4d2351d7fb232c2e452547ddfa243e93131e7cfa766da627b52 PYTHON_RSA_SETUP_TYPE = setuptools PYTHON_RSA_LICENSE = Apache-2.0 PYTHON_RSA_LICENSE_FILES = LICENSE diff --git a/package/python-rtoml/Config.in b/package/python-rtoml/Config.in new file mode 100644 index 00000000000..410976f138b --- /dev/null +++ b/package/python-rtoml/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_RTOML + bool "python-rtoml" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + help + A better TOML library for python implemented in rust. + + https://github.com/samuelcolvin/rtoml diff --git a/package/python-rtoml/python-rtoml.hash b/package/python-rtoml/python-rtoml.hash new file mode 100644 index 00000000000..04d22ed1a44 --- /dev/null +++ b/package/python-rtoml/python-rtoml.hash @@ -0,0 +1,4 @@ +# Locally calculated after vendoring +sha256 821a430ab6587bdaaf7cb95044e8e0d99c77c6aed0adce5a370045b270f7ee20 rtoml-0.8.0.tar.gz +# Locally computed sha256 checksums +sha256 cd5ffde80e6d3286a2e2e5f02fb2cb07b823931ca368e7c735a6c5f5aebe7103 LICENSE diff --git a/package/python-rtoml/python-rtoml.mk b/package/python-rtoml/python-rtoml.mk new file mode 100644 index 00000000000..9afe8c03150 --- /dev/null +++ b/package/python-rtoml/python-rtoml.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# python-rtoml +# +################################################################################ + +PYTHON_RTOML_VERSION = 0.8.0 +PYTHON_RTOML_SOURCE = rtoml-$(PYTHON_RTOML_VERSION).tar.gz +PYTHON_RTOML_SITE = https://files.pythonhosted.org/packages/33/a6/b42d8e0e28bec9fd7fdbafb2d76db3f8578f151a669eba564d422756d909 +PYTHON_RTOML_SETUP_TYPE = setuptools +PYTHON_RTOML_LICENSE = MIT +PYTHON_RTOML_LICENSE_FILES = LICENSE +PYTHON_RTOML_DEPENDENCIES = host-python-setuptools-rust host-rustc +PYTHON_RTOML_ENV = \ + $(PKG_CARGO_ENV) \ + PYO3_CROSS_LIB_DIR="$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)" +# We need to vendor the Cargo crates at download time +PYTHON_RTOML_DOWNLOAD_POST_PROCESS = cargo +PYTHON_RTOML_DOWNLOAD_DEPENDENCIES = host-rustc +PYTHON_RTOML_DL_ENV = $(PKG_CARGO_ENV) + +$(eval $(python-package)) diff --git a/package/python-ruamel-yaml/Config.in b/package/python-ruamel-yaml/Config.in new file mode 100644 index 00000000000..afde3d53d4b --- /dev/null +++ b/package/python-ruamel-yaml/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_RUAMEL_YAML + bool "python-ruamel-yaml" + help + ruamel.yaml is a YAML parser/emitter that supports roundtrip + preservation of comments, seq/map flow style, and map key + order. + + https://sourceforge.net/projects/ruamel-yaml/ diff --git a/package/python-ruamel-yaml/python-ruamel-yaml.hash b/package/python-ruamel-yaml/python-ruamel-yaml.hash new file mode 100644 index 00000000000..29852a51ed7 --- /dev/null +++ b/package/python-ruamel-yaml/python-ruamel-yaml.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/rfc3987/json +md5 206bda0f33ab2c2f63777636200748b7 ruamel.yaml-0.17.21.tar.gz +sha256 8b7ce697a2f212752a35c1ac414471dc16c424c9573be4926b56ff3f5d23b7af ruamel.yaml-0.17.21.tar.gz +# Locally computed sha256 checksums +sha256 ab837b032c5aae84503fc0c733a116a26fd272e90dc4402fa68d3c9e51aed3b0 LICENSE diff --git a/package/python-ruamel-yaml/python-ruamel-yaml.mk b/package/python-ruamel-yaml/python-ruamel-yaml.mk new file mode 100644 index 00000000000..a6fed3bc2c8 --- /dev/null +++ b/package/python-ruamel-yaml/python-ruamel-yaml.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# python-ruamel-yaml +# +################################################################################ + +PYTHON_RUAMEL_YAML_VERSION = 0.17.21 +PYTHON_RUAMEL_YAML_SOURCE = ruamel.yaml-$(PYTHON_RUAMEL_YAML_VERSION).tar.gz +PYTHON_RUAMEL_YAML_SITE = https://files.pythonhosted.org/packages/46/a9/6ed24832095b692a8cecc323230ce2ec3480015fbfa4b79941bd41b23a3c +PYTHON_RUAMEL_YAML_SETUP_TYPE = setuptools +PYTHON_RUAMEL_YAML_LICENSE = MIT +PYTHON_RUAMEL_YAML_LICENSE_FILES = LICENSE +PYTHON_RUAMEL_YAML_CPE_ID_VENDOR = ruamel.yaml_project +PYTHON_RUAMEL_YAML_CPE_ID_PRODUCT = ruamel.yaml + +$(eval $(python-package)) diff --git a/package/python-s3transfer/python-s3transfer.hash b/package/python-s3transfer/python-s3transfer.hash index b8f4a57ab88..16f0face72b 100644 --- a/package/python-s3transfer/python-s3transfer.hash +++ b/package/python-s3transfer/python-s3transfer.hash @@ -1,5 +1,4 @@ -# md5, sha256 from https://pypi.org/pypi/s3transfer/json -md5 9416d1c7d33506501a8627bb1f7baf66 s3transfer-0.5.0.tar.gz -sha256 50ed823e1dc5868ad40c8dc92072f757aa0e653a192845c94a3b676f4a62da4c s3transfer-0.5.0.tar.gz +# sha256 from https://pypi.org/pypi/s3transfer/json +sha256 2ed07d3866f523cc561bf4a00fc5535827981b117dd7876f036b0c1aca42c947 s3transfer-0.6.0.tar.gz # Locally computed sha256 checksums -sha256 8c6db340475136df3c1201d458fa5755698eace76e510471ecc9d857d6083dac LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/python-s3transfer/python-s3transfer.mk b/package/python-s3transfer/python-s3transfer.mk index 8b8e02db575..60a72da7295 100644 --- a/package/python-s3transfer/python-s3transfer.mk +++ b/package/python-s3transfer/python-s3transfer.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_S3TRANSFER_VERSION = 0.5.0 +PYTHON_S3TRANSFER_VERSION = 0.6.0 PYTHON_S3TRANSFER_SOURCE = s3transfer-$(PYTHON_S3TRANSFER_VERSION).tar.gz -PYTHON_S3TRANSFER_SITE = https://files.pythonhosted.org/packages/88/ef/4d1b3f52ae20a7e72151fde5c9f254cd83f8a49047351f34006e517e1655 +PYTHON_S3TRANSFER_SITE = https://files.pythonhosted.org/packages/e1/eb/e57c93d5cd5edf8c1d124c831ef916601540db70acd96fa21fe60cef1365 PYTHON_S3TRANSFER_SETUP_TYPE = setuptools PYTHON_S3TRANSFER_LICENSE = Apache-2.0 PYTHON_S3TRANSFER_LICENSE_FILES = LICENSE.txt diff --git a/package/python-scandir/python-scandir.hash b/package/python-scandir/python-scandir.hash index 5c01701ef31..1547c592a23 100644 --- a/package/python-scandir/python-scandir.hash +++ b/package/python-scandir/python-scandir.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/scandir/json -md5 f8378f4d9f95a6a78e97ab01aa900c1d scandir-1.10.0.tar.gz -sha256 4d4631f6062e658e9007ab3149a9b914f3548cb38bfb021c64f39a025ce578ae scandir-1.10.0.tar.gz +md5 f8378f4d9f95a6a78e97ab01aa900c1d scandir-1.10.0.tar.gz +sha256 4d4631f6062e658e9007ab3149a9b914f3548cb38bfb021c64f39a025ce578ae scandir-1.10.0.tar.gz # Locally computed sha256 checksums -sha256 a5e2fbdc239744419d29407cdbc92793c4d9c1d956c174f7cb7f96fa6d058c86 LICENSE.txt +sha256 a5e2fbdc239744419d29407cdbc92793c4d9c1d956c174f7cb7f96fa6d058c86 LICENSE.txt diff --git a/package/python-scapy/python-scapy.hash b/package/python-scapy/python-scapy.hash index 4dccffd39ac..7b21e6cb306 100644 --- a/package/python-scapy/python-scapy.hash +++ b/package/python-scapy/python-scapy.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/scapy/json -md5 54072af118e9291b6c7898b4ea87cdaf scapy-2.4.5.tar.gz -sha256 bc707e3604784496b6665a9e5b2a69c36cc9fb032af4864b29051531b24c8593 scapy-2.4.5.tar.gz +md5 f546b1c82c2c98e0dae1a436219dd042 scapy-2.5.0.tar.gz +sha256 5b260c2b754fd8d409ba83ee7aee294ecdbb2c235f9f78fe90bc11cb6e5debc2 scapy-2.5.0.tar.gz # Locally computed sha256 checksums sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/python-scapy/python-scapy.mk b/package/python-scapy/python-scapy.mk index 9cf17db6711..a2c6cc6872f 100644 --- a/package/python-scapy/python-scapy.mk +++ b/package/python-scapy/python-scapy.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SCAPY_VERSION = 2.4.5 +PYTHON_SCAPY_VERSION = 2.5.0 PYTHON_SCAPY_SOURCE = scapy-$(PYTHON_SCAPY_VERSION).tar.gz -PYTHON_SCAPY_SITE = https://files.pythonhosted.org/packages/85/47/c919432ca258f354bb2c1e645623f891603f185bfc7563d4a21f6432e7ed +PYTHON_SCAPY_SITE = https://files.pythonhosted.org/packages/67/a1/2a60d5b6f0fed297dd0c0311c887d5e8a30ba1250506585b897e5a662f4c PYTHON_SCAPY_SETUP_TYPE = setuptools PYTHON_SCAPY_LICENSE = GPL-2.0 PYTHON_SCAPY_LICENSE_FILES = LICENSE diff --git a/package/python-scipy/0001-build-sh4-FE.patch b/package/python-scipy/0001-build-sh4-FE.patch new file mode 100644 index 00000000000..d50dd84462e --- /dev/null +++ b/package/python-scipy/0001-build-sh4-FE.patch @@ -0,0 +1,36 @@ +From aae8b63ddffe014e9353c3e8d2604628433eb7d7 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 4 Dec 2022 14:14:21 +0100 +Subject: [PATCH] build sh4 FE + +ensures FE_UPWARD and FE_DOWNWARD are defined for sh4 architecture. + +Closes: #1007769. + +[Retrieved from: +https://salsa.debian.org/python-team/packages/scipy/-/blob/master/debian/patches/build_sh4_FE.patch] +Signed-off-by: Fabrice Fontaine +--- + scipy/special/_round.h | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/scipy/special/_round.h b/scipy/special/_round.h +index 013a25620..c321a1939 100644 +--- a/scipy/special/_round.h ++++ b/scipy/special/_round.h +@@ -69,5 +69,12 @@ int fegetround() + + #endif + ++/* SH4 is not C99 compliant, see https://github.com/scipy/scipy/issues/15584 */ ++#ifndef FE_UPWARD ++#define FE_UPWARD -1 ++#endif ++#ifndef FE_DOWNWARD ++#define FE_DOWNWARD -1 ++#endif + + #endif /* _round.h */ +-- +2.38.1 + diff --git a/package/python-scipy/Config.in b/package/python-scipy/Config.in new file mode 100644 index 00000000000..229b5997ad2 --- /dev/null +++ b/package/python-scipy/Config.in @@ -0,0 +1,25 @@ +config BR2_PACKAGE_PYTHON_SCIPY + bool "python-scipy" + depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS # python-numpy + depends on BR2_PACKAGE_LAPACK_ARCH_SUPPORTS # lapack + depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy + depends on BR2_TOOLCHAIN_HAS_FORTRAN # lapack + depends on BR2_INSTALL_LIBSTDCPP + select BR2_PACKAGE_LAPACK + select BR2_PACKAGE_PYTHON3_ZLIB # runtime scipy::io + select BR2_PACKAGE_PYTHON_NUMPY # runtime + select BR2_PACKAGE_PYTHON_PYBIND + help + The SciPy library is one of the core packages that make up the + SciPy stack. It provides many user-friendly and efficient + numerical routines such as routines for numerical integration, + interpolation, optimization, linear algebra and statistics. + + https://www.scipy.org/scipylib/ + +comment "python-scipy needs toolchain w/ fortran and c++ and glibc or musl" + depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS + depends on BR2_PACKAGE_LAPACK_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_HAS_FORTRAN || \ + !BR2_INSTALL_LIBSTDCPP || \ + (!BR2_TOOLCHAIN_USES_GLIBC && !BR2_TOOLCHAIN_USES_MUSL) diff --git a/package/python-scipy/python-scipy.hash b/package/python-scipy/python-scipy.hash new file mode 100644 index 00000000000..0274679c431 --- /dev/null +++ b/package/python-scipy/python-scipy.hash @@ -0,0 +1,9 @@ +# Locally generated +sha256 0140dd24d14ce194fdb3df496c2190f0896ca84ac98bf5d69c3b3fb7bde1a1e9 scipy-1.8.1.tar.xz +sha256 96599f8ec69a2cc609265eed13fc75090aacb28742260e55ce623788a33da19c LICENSE.txt +sha256 37e64a498894ac7c3b070023e3689e954a8ecf8a23b90968d09a455f1b4f7b35 scipy/linalg/src/lapack_deprecations/LICENSE +sha256 606209a000716c5f66e33e180ce08434b96ed17db4975ab9723c6b5fbcc89609 scipy/ndimage/LICENSE.txt +sha256 3df9207af2fdb861af0ae3b22026f163b9bcfab4e525dc4943afe2ffa3f77624 scipy/optimize/tnc/LICENSE +sha256 f0cedf52503b2d42b83411a0a16e6fefac346dfad8fddc66f50050150123470c scipy/sparse/linalg/_dsolve/SuperLU/License.txt +sha256 0926566f9f406178d1214f8cc796e166b1213dd7c05e0c5b461a8b8ac9e50bbe scipy/sparse/linalg/_eigen/arpack/ARPACK/COPYING +sha256 34db0c0c4f931861d720555c9cd7a2e228d1290ba29af0f2ee80c41bb2038afb scipy/spatial/qhull_src/COPYING.txt diff --git a/package/python-scipy/python-scipy.mk b/package/python-scipy/python-scipy.mk new file mode 100644 index 00000000000..a8c23c6c888 --- /dev/null +++ b/package/python-scipy/python-scipy.mk @@ -0,0 +1,58 @@ +################################################################################ +# +# python-scipy +# +################################################################################ + +PYTHON_SCIPY_VERSION = 1.8.1 +PYTHON_SCIPY_SOURCE = scipy-$(PYTHON_SCIPY_VERSION).tar.xz +PYTHON_SCIPY_SITE = https://github.com/scipy/scipy/releases/download/v$(PYTHON_SCIPY_VERSION) +PYTHON_SCIPY_LICENSE = \ + BSD-3-Clause, \ + BSD-2-Clause, \ + BSD, \ + BSD-Style, \ + MIT, \ + Qhull +PYTHON_SCIPY_LICENSE_FILES = \ + LICENSE.txt \ + scipy/linalg/src/lapack_deprecations/LICENSE \ + scipy/ndimage/LICENSE.txt \ + scipy/optimize/tnc/LICENSE \ + scipy/sparse/linalg/_dsolve/SuperLU/License.txt \ + scipy/sparse/linalg/_eigen/arpack/ARPACK/COPYING \ + scipy/spatial/qhull_src/COPYING.txt +PYTHON_SCIPY_CPE_ID_VENDOR = scipy +PYTHON_SCIPY_CPE_ID_PRODUCT = scipy +PYTHON_SCIPY_DEPENDENCIES += \ + host-python-numpy \ + host-python-pythran \ + zlib \ + lapack \ + python-numpy \ + python-pybind +PYTHON_SCIPY_INSTALL_STAGING = YES + +PYTHON_SCIPY_SETUP_TYPE = setuptools +PYTHON_SCIPY_BUILD_OPTS = config_fc --fcompiler=gnu95 + +PYTHON_SCIPY_LDFLAGS = $(TARGET_LDFLAGS) -shared \ + -L$(PYTHON3_PATH)/site-packages/numpy/core/lib +# -lnpyrandom localization +PYTHON_SCIPY_LDFLAGS += \ + -L$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/numpy/random/lib + +PYTHON_SCIPY_ENV = \ + F90=$(TARGET_FC) \ + LDFLAGS="$(PYTHON_SCIPY_LDFLAGS)" + +# Provide system configuration options to numpy distutils extensions, telling +# to find all include files and libraries in staging directory. +define PYTHON_SCIPY_CONFIGURE_CMDS + -rm -f $(@D)/site.cfg + echo "[DEFAULT]" >> $(@D)/site.cfg + echo "library_dirs = $(STAGING_DIR)/usr/lib" >> $(@D)/site.cfg + echo "include_dirs = $(STAGING_DIR)/usr/include" >> $(@D)/site.cfg +endef + +$(eval $(python-package)) diff --git a/package/python-sdnotify/python-sdnotify.hash b/package/python-sdnotify/python-sdnotify.hash index b4106418ef0..6d5bd1466cc 100644 --- a/package/python-sdnotify/python-sdnotify.hash +++ b/package/python-sdnotify/python-sdnotify.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/sdnotify/json -md5 749ddca1c70be1697fecc443fb1fdb16 sdnotify-0.3.2.tar.gz -sha256 73977fc746b36cc41184dd43c3fe81323e7b8b06c2bb0826c4f59a20c56bb9f1 sdnotify-0.3.2.tar.gz +md5 749ddca1c70be1697fecc443fb1fdb16 sdnotify-0.3.2.tar.gz +sha256 73977fc746b36cc41184dd43c3fe81323e7b8b06c2bb0826c4f59a20c56bb9f1 sdnotify-0.3.2.tar.gz # Locally computed sha256 checksums -sha256 038351c6f544a386576da41d5fe1320437ed211507565dd9c334c8290055b88e LICENSE.txt +sha256 038351c6f544a386576da41d5fe1320437ed211507565dd9c334c8290055b88e LICENSE.txt diff --git a/package/python-secretstorage/python-secretstorage.hash b/package/python-secretstorage/python-secretstorage.hash index a8e535f8927..ae0a5be3479 100644 --- a/package/python-secretstorage/python-secretstorage.hash +++ b/package/python-secretstorage/python-secretstorage.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/secretstorage/json -md5 c2a8c0e08e5da198fc38c379b98c28f1 SecretStorage-3.1.2.tar.gz -sha256 15da8a989b65498e29be338b3b279965f1b8f09b9668bd8010da183024c8bff6 SecretStorage-3.1.2.tar.gz +md5 c6ff1cc866d2f1d274b75c6490726b1b SecretStorage-3.3.3.tar.gz +sha256 2403533ef369eca6d2ba81718576c5e0f564d5cca1b58f73a8b23e7d4eeebd77 SecretStorage-3.3.3.tar.gz # Locally computed sha256 checksums sha256 70f6bfca77633c35efa218328eda5486d7054c2914d61820980e378797520a25 LICENSE diff --git a/package/python-secretstorage/python-secretstorage.mk b/package/python-secretstorage/python-secretstorage.mk index 4c209bf513e..81487aa8fbf 100644 --- a/package/python-secretstorage/python-secretstorage.mk +++ b/package/python-secretstorage/python-secretstorage.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SECRETSTORAGE_VERSION = 3.1.2 +PYTHON_SECRETSTORAGE_VERSION = 3.3.3 PYTHON_SECRETSTORAGE_SOURCE = SecretStorage-$(PYTHON_SECRETSTORAGE_VERSION).tar.gz -PYTHON_SECRETSTORAGE_SITE = https://files.pythonhosted.org/packages/fd/9f/36197c75d9a09b1ab63f56cb985af6cd858ca3fc41fd9cd890ce69bae5b9 +PYTHON_SECRETSTORAGE_SITE = https://files.pythonhosted.org/packages/53/a4/f48c9d79cb507ed1373477dbceaba7401fd8a23af63b837fa61f1dcd3691 PYTHON_SECRETSTORAGE_SETUP_TYPE = setuptools PYTHON_SECRETSTORAGE_LICENSE = BSD-3-Clause PYTHON_SECRETSTORAGE_LICENSE_FILES = LICENSE diff --git a/package/python-see/python-see.hash b/package/python-see/python-see.hash index c48ee88b8bd..de63b101bde 100644 --- a/package/python-see/python-see.hash +++ b/package/python-see/python-see.hash @@ -1,4 +1,4 @@ # md5 from https://pypi.python.org/pypi/see/json, sha256 locally computed -md5 cb3bf4d314f73a8f7a2fd3d2d99aab54 see-1.4.1.tar.gz -sha256 14f8f8a88a909a7d7dea81f0016e3fdfabd3b5d335992e102a382e1a71672bd1 see-1.4.1.tar.gz +md5 cb3bf4d314f73a8f7a2fd3d2d99aab54 see-1.4.1.tar.gz +sha256 14f8f8a88a909a7d7dea81f0016e3fdfabd3b5d335992e102a382e1a71672bd1 see-1.4.1.tar.gz sha256 dccbd040a7deacee7f05e5e46a8eba6e786ac319f0cb94c36f92d789585911a6 LICENSE diff --git a/package/python-selenium/Config.in b/package/python-selenium/Config.in new file mode 100644 index 00000000000..30820f07f8a --- /dev/null +++ b/package/python-selenium/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_PYTHON_SELENIUM + bool "python-selenium" + select BR2_PACKAGE_PYTHON_CERTIFI # runtime + select BR2_PACKAGE_PYTHON_PYSOCKS # runtime + select BR2_PACKAGE_PYTHON_TRIO # runtime + select BR2_PACKAGE_PYTHON_TRIO_WEBSOCKET # runtime + select BR2_PACKAGE_PYTHON_URLLIB3 # runtime + help + Python language bindings for Selenium WebDriver. + + https://www.selenium.dev diff --git a/package/python-selenium/python-selenium.hash b/package/python-selenium/python-selenium.hash new file mode 100644 index 00000000000..d462abc62b7 --- /dev/null +++ b/package/python-selenium/python-selenium.hash @@ -0,0 +1,3 @@ +# md5, sha256 from https://pypi.org/pypi/selenium/json +md5 e9054eb95920bb2a1d594090f0773f61 selenium-4.8.0.tar.gz +sha256 fee36724d6cf0b18c73781bb8ec7be4a35ab1e2564e64e64e64da75e50e052af selenium-4.8.0.tar.gz diff --git a/package/python-selenium/python-selenium.mk b/package/python-selenium/python-selenium.mk new file mode 100644 index 00000000000..6dbea6fb7e6 --- /dev/null +++ b/package/python-selenium/python-selenium.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# python-selenium +# +################################################################################ + +PYTHON_SELENIUM_VERSION = 4.8.0 +PYTHON_SELENIUM_SOURCE = selenium-$(PYTHON_SELENIUM_VERSION).tar.gz +PYTHON_SELENIUM_SITE = https://files.pythonhosted.org/packages/2e/3d/492cf1a6823c48369328572c6bc63b7a957ba25c0009ee6bdb507cd9a6a4 +PYTHON_SELENIUM_SETUP_TYPE = setuptools +PYTHON_SELENIUM_LICENSE = Apache-2.0 + +$(eval $(python-package)) diff --git a/package/python-semantic-version/python-semantic-version.hash b/package/python-semantic-version/python-semantic-version.hash index 692905ec29e..49e28c429ab 100644 --- a/package/python-semantic-version/python-semantic-version.hash +++ b/package/python-semantic-version/python-semantic-version.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/semantic-version/json -md5 76d7364def7ee487b6153d40b13de904 semantic_version-2.8.5.tar.gz -sha256 d2cb2de0558762934679b9a104e82eca7af448c9f4974d1f3eeccff651df8a54 semantic_version-2.8.5.tar.gz +md5 e48abef93ba69abcd4eaf4640edfc38b semantic_version-2.10.0.tar.gz +sha256 bdabb6d336998cbb378d4b9db3a4b56a1e3235701dc05ea2690d9a997ed5041c semantic_version-2.10.0.tar.gz # Locally computed sha256 checksums sha256 a85e7ef2fbc670d26781ed6844cd31a7e8ada65d21328f75a0b02402faae37ea LICENSE diff --git a/package/python-semantic-version/python-semantic-version.mk b/package/python-semantic-version/python-semantic-version.mk index 2352690e26e..76a65e734f5 100644 --- a/package/python-semantic-version/python-semantic-version.mk +++ b/package/python-semantic-version/python-semantic-version.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SEMANTIC_VERSION_VERSION = 2.8.5 +PYTHON_SEMANTIC_VERSION_VERSION = 2.10.0 PYTHON_SEMANTIC_VERSION_SOURCE = semantic_version-$(PYTHON_SEMANTIC_VERSION_VERSION).tar.gz -PYTHON_SEMANTIC_VERSION_SITE = https://files.pythonhosted.org/packages/d4/52/3be868c7ed1f408cb822bc92ce17ffe4e97d11c42caafce0589f05844dd0 +PYTHON_SEMANTIC_VERSION_SITE = https://files.pythonhosted.org/packages/7d/31/f2289ce78b9b473d582568c234e104d2a342fd658cc288a7553d83bb8595 PYTHON_SEMANTIC_VERSION_SETUP_TYPE = setuptools PYTHON_SEMANTIC_VERSION_LICENSE = BSD-2-Clause PYTHON_SEMANTIC_VERSION_LICENSE_FILES = LICENSE diff --git a/package/python-sentry-sdk/python-sentry-sdk.hash b/package/python-sentry-sdk/python-sentry-sdk.hash index e9fda822aef..38ae3380a8b 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 6dc8c7586d95f7679c7bf7f749336cf8 sentry-sdk-1.4.3.tar.gz -sha256 b9844751e40710e84a457c5bc29b21c383ccb2b63d76eeaad72f7f1c808c8828 sentry-sdk-1.4.3.tar.gz +md5 ea2d728c847879f66c3d24cfbade2026 sentry-sdk-1.12.1.tar.gz +sha256 5bbe4b72de22f9ac1e67f2a4e6efe8fbd595bb59b7b223443f50fe5802a5551c sentry-sdk-1.12.1.tar.gz # Locally computed sha256 checksums sha256 59404d4c854e579097d41bfccd5006afde9d6d70e646cf55074cdbfead5ecf1c LICENSE diff --git a/package/python-sentry-sdk/python-sentry-sdk.mk b/package/python-sentry-sdk/python-sentry-sdk.mk index 9238b7fb1c2..c3092a5184f 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 = 1.4.3 +PYTHON_SENTRY_SDK_VERSION = 1.12.1 PYTHON_SENTRY_SDK_SOURCE = sentry-sdk-$(PYTHON_SENTRY_SDK_VERSION).tar.gz -PYTHON_SENTRY_SDK_SITE = https://files.pythonhosted.org/packages/a7/30/1d967b2e0cac2fa388344b2968fa57e69d5382b922e57cda43af54b9063a +PYTHON_SENTRY_SDK_SITE = https://files.pythonhosted.org/packages/32/03/496a7c8313658dec419303e8add969f314b7538c29f4ec5ebe6d86fb8ce2 PYTHON_SENTRY_SDK_SETUP_TYPE = setuptools PYTHON_SENTRY_SDK_LICENSE = BSD-2-Clause PYTHON_SENTRY_SDK_LICENSE_FILES = LICENSE diff --git a/package/python-serial/python-serial.mk b/package/python-serial/python-serial.mk index 249ea9d5a36..87cd9392f1e 100644 --- a/package/python-serial/python-serial.mk +++ b/package/python-serial/python-serial.mk @@ -12,3 +12,4 @@ PYTHON_SERIAL_LICENSE_FILES = LICENSE.txt PYTHON_SERIAL_SETUP_TYPE = setuptools $(eval $(python-package)) +$(eval $(host-python-package)) diff --git a/package/python-service-identity/Config.in b/package/python-service-identity/Config.in index aa6d0fe7155..278900971eb 100644 --- a/package/python-service-identity/Config.in +++ b/package/python-service-identity/Config.in @@ -2,12 +2,11 @@ config BR2_PACKAGE_PYTHON_SERVICE_IDENTITY bool "python-service-identity" # python-pyopenssl -> python-cryptography depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS - # python-pyopenssl -> python-cryptography select BR2_PACKAGE_PYTHON_ATTRS # runtime - select BR2_PACKAGE_PYTHON_CHARACTERISTIC # runtime select BR2_PACKAGE_PYTHON_PYASN1 # runtime select BR2_PACKAGE_PYTHON_PYASN1_MODULES # runtime select BR2_PACKAGE_PYTHON_PYOPENSSL # runtime + select BR2_PACKAGE_PYTHON_SIX # runtime help Service identity verification for pyOpenSSL. diff --git a/package/python-service-identity/python-service-identity.hash b/package/python-service-identity/python-service-identity.hash index 9a20d089251..f648918dbd8 100644 --- a/package/python-service-identity/python-service-identity.hash +++ b/package/python-service-identity/python-service-identity.hash @@ -1,5 +1,5 @@ -# md5, sha256 from https://pypi.org/pypi/service_identity/json -md5 c6b8bac93e7d899a1da313a19cc6570a service_identity-18.1.0.tar.gz -sha256 0858a54aabc5b459d1aafa8a518ed2081a285087f349fe3e55197989232e2e2d service_identity-18.1.0.tar.gz +# md5, sha256 from https://pypi.org/pypi/service-identity/json +md5 5e5c195d8fcedc72f9068be2ad9b5a13 service-identity-21.1.0.tar.gz +sha256 6e6c6086ca271dc11b033d17c3a8bea9f24ebff920c587da090afc9519419d34 service-identity-21.1.0.tar.gz # Locally computed sha256 checksums -sha256 c5075126e1272b176504e36af369781a95c5c1124239da8e4f61b0f9c15a56cf LICENSE +sha256 c5075126e1272b176504e36af369781a95c5c1124239da8e4f61b0f9c15a56cf LICENSE diff --git a/package/python-service-identity/python-service-identity.mk b/package/python-service-identity/python-service-identity.mk index 5330239e484..e4ae8e68893 100644 --- a/package/python-service-identity/python-service-identity.mk +++ b/package/python-service-identity/python-service-identity.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SERVICE_IDENTITY_VERSION = 18.1.0 -PYTHON_SERVICE_IDENTITY_SOURCE = service_identity-$(PYTHON_SERVICE_IDENTITY_VERSION).tar.gz -PYTHON_SERVICE_IDENTITY_SITE = https://files.pythonhosted.org/packages/9a/3d/9eb0563e066ea0540cf580695593ab079376e920016d4d1b3ff2fd8abf4b +PYTHON_SERVICE_IDENTITY_VERSION = 21.1.0 +PYTHON_SERVICE_IDENTITY_SOURCE = service-identity-$(PYTHON_SERVICE_IDENTITY_VERSION).tar.gz +PYTHON_SERVICE_IDENTITY_SITE = https://files.pythonhosted.org/packages/09/2e/26ade69944773df4748c19d3053e025b282f48de02aad84906d34a29d28b PYTHON_SERVICE_IDENTITY_LICENSE = MIT PYTHON_SERVICE_IDENTITY_LICENSE_FILES = LICENSE PYTHON_SERVICE_IDENTITY_SETUP_TYPE = setuptools diff --git a/package/python-setproctitle/python-setproctitle.hash b/package/python-setproctitle/python-setproctitle.hash index 88e4453277a..ac8fed986aa 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 9898587a1668f1c53f6699ca5d35256d setproctitle-1.2.2.tar.gz -sha256 7dfb472c8852403d34007e01d6e3c68c57eb66433fb8a5c77b13b89a160d97df setproctitle-1.2.2.tar.gz +md5 fa9771540422a59a8dee1331ad6fd3a9 setproctitle-1.3.2.tar.gz +sha256 b9fb97907c830d260fa0658ed58afd48a86b2b88aac521135c352ff7fd3477fd setproctitle-1.3.2.tar.gz # Locally computed -sha256 85bd836337aa702e0a4e2a54676c6ae046ffb357dbf4a990189595a60fcd1648 COPYRIGHT +sha256 4ace14d0836da75079088cfc5cef6f2ddc8ce16f600609b36ee1bf10f8101f61 COPYRIGHT diff --git a/package/python-setproctitle/python-setproctitle.mk b/package/python-setproctitle/python-setproctitle.mk index 13e9e261be9..7055920c085 100644 --- a/package/python-setproctitle/python-setproctitle.mk +++ b/package/python-setproctitle/python-setproctitle.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SETPROCTITLE_VERSION = 1.2.2 +PYTHON_SETPROCTITLE_VERSION = 1.3.2 PYTHON_SETPROCTITLE_SOURCE = setproctitle-$(PYTHON_SETPROCTITLE_VERSION).tar.gz -PYTHON_SETPROCTITLE_SITE = https://files.pythonhosted.org/packages/a1/7f/a1d4f4c7b66f0fc02f35dc5c85f45a8b4e4a7988357a29e61c14e725ef86 +PYTHON_SETPROCTITLE_SITE = https://files.pythonhosted.org/packages/b5/47/ac709629ddb9779fee29b7d10ae9580f60a4b37e49bce72360ddf9a79cdc PYTHON_SETPROCTITLE_LICENSE = BSD-3-Clause PYTHON_SETPROCTITLE_LICENSE_FILES = COPYRIGHT PYTHON_SETPROCTITLE_SETUP_TYPE = setuptools diff --git a/package/python-setuptools-rust/python-setuptools-rust.hash b/package/python-setuptools-rust/python-setuptools-rust.hash index 6bb42d918c4..ff1b9a127f9 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 479fcd267ff48929bec9a7270e1a96d7 setuptools-rust-1.1.2.tar.gz -sha256 a0adb9b503c0ffc4e8fe80b7c617898cefa78049983aaaea7f747e153a3e65d1 setuptools-rust-1.1.2.tar.gz +md5 fd3412ca77ffd6e06e2e83d0e9636084 setuptools-rust-1.5.2.tar.gz +sha256 d8daccb14dc0eae1b6b6eb3ecef79675bd37b4065369f79c35393dd5c55652c7 setuptools-rust-1.5.2.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 394789b056c..7f19ece1a3a 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.1.2 +PYTHON_SETUPTOOLS_RUST_VERSION = 1.5.2 PYTHON_SETUPTOOLS_RUST_SOURCE = setuptools-rust-$(PYTHON_SETUPTOOLS_RUST_VERSION).tar.gz -PYTHON_SETUPTOOLS_RUST_SITE = https://files.pythonhosted.org/packages/67/08/e1aa2c582c62ac76e4d60f8e454bd3bba933781a06a88b4e38797445822a +PYTHON_SETUPTOOLS_RUST_SITE = https://files.pythonhosted.org/packages/99/db/e4ecb483ffa194d632ed44bda32cb740e564789fed7e56c2be8e2a0e2aa6 PYTHON_SETUPTOOLS_RUST_SETUP_TYPE = setuptools PYTHON_SETUPTOOLS_RUST_LICENSE = MIT PYTHON_SETUPTOOLS_RUST_LICENSE_FILES = LICENSE diff --git a/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.hash b/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.hash index e4f169ed9d6..40b4b0e7f78 100644 --- a/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.hash +++ b/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/setuptools-scm-git-archive/json -md5 1c9351fa5cebd12e76488737a7c78f2e setuptools_scm_git_archive-1.1.tar.gz -sha256 6026f61089b73fa1b5ee737e95314f41cb512609b393530385ed281d0b46c062 setuptools_scm_git_archive-1.1.tar.gz +md5 df3933d33c49c5d9aca06715b4c65370 setuptools_scm_git_archive-1.4.tar.gz +sha256 b048b27b32e1e76ec865b0caa4bb85df6ddbf4697d6909f567ac36709f6ef2f0 setuptools_scm_git_archive-1.4.tar.gz # Locally computed sha256 checksums -sha256 89807acf2309bd285f033404ee78581602f3cd9b819a16ac2f0e5f60ff4a473e LICENSE +sha256 89807acf2309bd285f033404ee78581602f3cd9b819a16ac2f0e5f60ff4a473e LICENSE diff --git a/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk b/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk index 032e2d3fc90..278fc972e5b 100644 --- a/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk +++ b/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_VERSION = 1.1 +PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_VERSION = 1.4 PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_SOURCE = setuptools_scm_git_archive-$(PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_VERSION).tar.gz -PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_SITE = https://files.pythonhosted.org/packages/7e/2c/0c15b29a1b5940250bfdc4a4f53272e35cd7cf8a34159291b6b4ec9eb291 +PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_SITE = https://files.pythonhosted.org/packages/69/5f/7135eec07395c51d3dd6899251b277405ecc2f8f7a80ef80a483e3c5a2bd PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_SETUP_TYPE = setuptools PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_LICENSE = MIT PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_LICENSE_FILES = LICENSE diff --git a/package/python-setuptools-scm/python-setuptools-scm.hash b/package/python-setuptools-scm/python-setuptools-scm.hash index 934c5054424..8cfe07d1d93 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 b4e02bf8e62ed49142ea7b42a68671d7 setuptools_scm-6.4.2.tar.gz -sha256 6833ac65c6ed9711a4d5d2266f8024cfa07c533a0e55f4c12f6eff280a5a9e30 setuptools_scm-6.4.2.tar.gz +md5 158dc741637fb4fa4b955c62bd2c08be setuptools_scm-7.1.0.tar.gz +sha256 6c508345a771aad7d56ebff0e70628bf2b0ec7573762be9960214730de278f27 setuptools_scm-7.1.0.tar.gz # sha256 locally computed sha256 89807acf2309bd285f033404ee78581602f3cd9b819a16ac2f0e5f60ff4a473e LICENSE diff --git a/package/python-setuptools-scm/python-setuptools-scm.mk b/package/python-setuptools-scm/python-setuptools-scm.mk index 132eb398aaf..5a35c35a1f6 100644 --- a/package/python-setuptools-scm/python-setuptools-scm.mk +++ b/package/python-setuptools-scm/python-setuptools-scm.mk @@ -4,12 +4,15 @@ # ################################################################################ -PYTHON_SETUPTOOLS_SCM_VERSION = 6.4.2 +PYTHON_SETUPTOOLS_SCM_VERSION = 7.1.0 PYTHON_SETUPTOOLS_SCM_SOURCE = setuptools_scm-$(PYTHON_SETUPTOOLS_SCM_VERSION).tar.gz -PYTHON_SETUPTOOLS_SCM_SITE = https://files.pythonhosted.org/packages/4a/18/477d3d9eb2f88230ff2a41de9d8ffa3554b706352787d289f57f76bfba0b +PYTHON_SETUPTOOLS_SCM_SITE = https://files.pythonhosted.org/packages/98/12/2c1e579bb968759fc512391473340d0661b1a8c96a59fb7c65b02eec1321 PYTHON_SETUPTOOLS_SCM_LICENSE = MIT PYTHON_SETUPTOOLS_SCM_LICENSE_FILES = LICENSE PYTHON_SETUPTOOLS_SCM_SETUP_TYPE = setuptools -HOST_PYTHON_SETUPTOOLS_SCM_DEPENDENCIES = host-python-packaging host-python-tomli + +HOST_PYTHON_SETUPTOOLS_SCM_DEPENDENCIES = \ + host-python-packaging \ + host-python-typing-extensions $(eval $(host-python-package)) diff --git a/package/python-setuptools/python-setuptools.hash b/package/python-setuptools/python-setuptools.hash index 8df7155d4cf..76ad1ba1ce3 100644 --- a/package/python-setuptools/python-setuptools.hash +++ b/package/python-setuptools/python-setuptools.hash @@ -1,4 +1,4 @@ # From https://pypi.org/pypi/setuptools/json -md5 082637e8fbc2e1fd9c637665d8fcccd8 setuptools-60.7.0.tar.gz -sha256 b83cf328a4f6a987c95610e76b29a30778db05174eef71f771776c48f8f25d1b setuptools-60.7.0.tar.gz +md5 1fd8bd04b0bed95ad6c81f03b1c080bc setuptools-65.6.3.tar.gz +sha256 a7620757bf984b58deaf32fc8a4577a9bbc0850cf92c20e1ce41c38c19e5fb75 setuptools-65.6.3.tar.gz sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk index 584f83f7a0e..226ef2b479f 100644 --- a/package/python-setuptools/python-setuptools.mk +++ b/package/python-setuptools/python-setuptools.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SETUPTOOLS_VERSION = 60.7.0 +PYTHON_SETUPTOOLS_VERSION = 65.6.3 PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).tar.gz -PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/29/dd/48d662bb93e5e51e72265ef612f869947d4ae4126328d7156824cd50d440 +PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/b6/21/cb9a8d0b2c8597c83fce8e9c02884bce3d4951e41e807fc35791c6b23d9a 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 13a0207de92..a31aacdee19 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 33becadcb5214afd00b9eec05fa98c06 sh-1.14.2.tar.gz -sha256 9d7bd0334d494b2a4609fe521b2107438cdb21c0e469ffeeb191489883d6fe0d sh-1.14.2.tar.gz -# Locally computed +md5 d60498172876f35aef6303a9cbb8eb11 sh-1.14.3.tar.gz +sha256 e4045b6c732d9ce75d571c79f5ac2234edd9ae4f5fa9d59b09705082bdca18c7 sh-1.14.3.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 d2d8b14c8bb..781de88ab15 100644 --- a/package/python-sh/python-sh.mk +++ b/package/python-sh/python-sh.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SH_VERSION = 1.14.2 +PYTHON_SH_VERSION = 1.14.3 PYTHON_SH_SOURCE = sh-$(PYTHON_SH_VERSION).tar.gz -PYTHON_SH_SITE = https://files.pythonhosted.org/packages/80/39/ed280d183c322453e276a518605b2435f682342f2c3bcf63228404d36375 +PYTHON_SH_SITE = https://files.pythonhosted.org/packages/b7/09/89c28aaf2a49f226fef8587c90c6386bd2cc03a0295bc4ff7fc6ee43c01d PYTHON_SH_SETUP_TYPE = setuptools PYTHON_SH_LICENSE = MIT PYTHON_SH_LICENSE_FILES = LICENSE.txt diff --git a/package/python-shutilwhich/python-shutilwhich.hash b/package/python-shutilwhich/python-shutilwhich.hash index b1a2c7854f2..ddf3cefdaa2 100644 --- a/package/python-shutilwhich/python-shutilwhich.hash +++ b/package/python-shutilwhich/python-shutilwhich.hash @@ -1,3 +1,3 @@ # md5 from https://pypi.python.org/pypi?:action=show_md5&digest=915947c5cdae7afd748ac715ee547adb, sha256 locally computed. -md5 915947c5cdae7afd748ac715ee547adb shutilwhich-1.1.0.tar.gz -sha256 db1f39c6461e42f630fa617bb8c79090f7711c9ca493e615e43d0610ecb64dc6 shutilwhich-1.1.0.tar.gz +md5 915947c5cdae7afd748ac715ee547adb shutilwhich-1.1.0.tar.gz +sha256 db1f39c6461e42f630fa617bb8c79090f7711c9ca493e615e43d0610ecb64dc6 shutilwhich-1.1.0.tar.gz diff --git a/package/python-simplegeneric/python-simplegeneric.hash b/package/python-simplegeneric/python-simplegeneric.hash index 24f652c8e7a..1dc42d35e2b 100644 --- a/package/python-simplegeneric/python-simplegeneric.hash +++ b/package/python-simplegeneric/python-simplegeneric.hash @@ -1,3 +1,3 @@ # md5 from https://pypi.python.org/pypi/simplegeneric, sha256 locally computed -md5 f9c1fab00fd981be588fc32759f474e3 simplegeneric-0.8.1.zip -sha256 dc972e06094b9af5b855b3df4a646395e43d1c9d0d39ed345b7393560d0b9173 simplegeneric-0.8.1.zip +md5 f9c1fab00fd981be588fc32759f474e3 simplegeneric-0.8.1.zip +sha256 dc972e06094b9af5b855b3df4a646395e43d1c9d0d39ed345b7393560d0b9173 simplegeneric-0.8.1.zip diff --git a/package/python-simplejson/python-simplejson.hash b/package/python-simplejson/python-simplejson.hash index bb44bdfc791..a8b946b2c4c 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 1756427859454004e90e028d263cf23e simplejson-3.17.5.tar.gz -sha256 91cfb43fb91ff6d1e4258be04eee84b51a4ef40a28d899679b9ea2556322fb50 simplejson-3.17.5.tar.gz +md5 ecd07fca7a7fa0bcc9acdf9d82e41eb1 simplejson-3.18.1.tar.gz +sha256 746086e3ef6d74b53599df31b491d88a355abf2e31c837137dd90f8c4561cafa simplejson-3.18.1.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 5bed8d20a95..5782626387d 100644 --- a/package/python-simplejson/python-simplejson.mk +++ b/package/python-simplejson/python-simplejson.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SIMPLEJSON_VERSION = 3.17.5 +PYTHON_SIMPLEJSON_VERSION = 3.18.1 PYTHON_SIMPLEJSON_SOURCE = simplejson-$(PYTHON_SIMPLEJSON_VERSION).tar.gz -PYTHON_SIMPLEJSON_SITE = https://files.pythonhosted.org/packages/01/52/41c71718f941c9a5abebfaa24e3c14e3c0229327b7ebd21348989845ed8f +PYTHON_SIMPLEJSON_SITE = https://files.pythonhosted.org/packages/0f/a0/79d2bec499cb53678bc20d41f9706ca02777f0876efa9b29a69fb3d55dfd 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 7b4a91de0c2..06edbfab3d3 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 f1d4f2ec14e2c782a62e451587477598 SimpleSQLite-0.45.2.tar.gz -sha256 0b19c99c36b63173a715649f94a2fc3aee8deb9b70c683d584bca85e5930244b SimpleSQLite-0.45.2.tar.gz +md5 11f2ef73243fb0d677ed00d22f1441b2 SimpleSQLite-1.3.0.tar.gz +sha256 f7e862bec5982059e665cc73b6fdb4c8340a1f565ba3497387c3c48f10d43bf8 SimpleSQLite-1.3.0.tar.gz # Locally computed sha256 checksums -sha256 98799b7c99b561c5ffa3ac86600e501f761afa8e72af8a2515026445fe134105 LICENSE +sha256 a93d75bcb0774e2990106380cadad6dcb2de193c55d435ffc56ba345a08b1dc2 LICENSE diff --git a/package/python-simplesqlite/python-simplesqlite.mk b/package/python-simplesqlite/python-simplesqlite.mk index 88ffcd4d459..ea60cefc16e 100644 --- a/package/python-simplesqlite/python-simplesqlite.mk +++ b/package/python-simplesqlite/python-simplesqlite.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SIMPLESQLITE_VERSION = 0.45.2 +PYTHON_SIMPLESQLITE_VERSION = 1.3.0 PYTHON_SIMPLESQLITE_SOURCE = SimpleSQLite-$(PYTHON_SIMPLESQLITE_VERSION).tar.gz -PYTHON_SIMPLESQLITE_SITE = https://files.pythonhosted.org/packages/b3/d1/bc3668ed7d90ee70d556124b8b5b3329505d72b5290bb393626f1afe714d +PYTHON_SIMPLESQLITE_SITE = https://files.pythonhosted.org/packages/a0/2c/39a9e7dc4af46d101f48753086c686982790ecc2bdf5e9fa88f85f027e7a PYTHON_SIMPLESQLITE_SETUP_TYPE = setuptools PYTHON_SIMPLESQLITE_LICENSE = MIT PYTHON_SIMPLESQLITE_LICENSE_FILES = LICENSE diff --git a/package/python-sip/0001-remove-join-from-sip-h-files-string.patch b/package/python-sip/0001-remove-join-from-sip-h-files-string.patch new file mode 100644 index 00000000000..e7a0d606e94 --- /dev/null +++ b/package/python-sip/0001-remove-join-from-sip-h-files-string.patch @@ -0,0 +1,33 @@ +From 009e5cf0750134ed5403aae23ef53a177764ca04 Mon Sep 17 00:00:00 2001 +From: Adam Duskett +Date: Wed, 29 Dec 2021 13:49:15 -0800 +Subject: [PATCH] remove join from sip_h.files string + +When cross compiling, the configure system appends the hosts /usr/ directory +to the path of which to find files that python-sip will install. This leads to +python-sip attempting to install everything under the hosts /usr directory into +the targets /usr/include/python directory. + +Remove the .join() in the sip_h.files string to prevent the above issue. + +Signed-off-by: Adam Duskett +--- + configure.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.py b/configure.py +index 25bcaa7..fc8f2dc 100644 +--- a/configure.py ++++ b/configure.py +@@ -408,7 +408,7 @@ def create_makefiles(macros): + # There will only be one element. + files, path = gen_installs[0] + pro.write("\n") +- pro.write("sip_h.files = %s\n" % " ".join(files)) ++ pro.write("sip_h.files = %s\n" % files) + pro.write("sip_h.path = %s\n" % quote(path)) + pro.write("INSTALLS += sip_h\n") + +-- +2.33.1 + diff --git a/package/python-sip/python-sip.hash b/package/python-sip/python-sip.hash index 6adf44d410b..0108924cdcf 100644 --- a/package/python-sip/python-sip.hash +++ b/package/python-sip/python-sip.hash @@ -1,7 +1,5 @@ -# From https://sourceforge.net/projects/pyqt/files/sip/sip-4.18/ -md5 78724bf2a79878201c3bc81a1d8248ea sip-4.18.tar.gz # Locally calculated: -sha256 f1dc5c81c07a9ad97edcd4a0af964a41e420024ba7ca165afd2b351efd249cb6 sip-4.18.tar.gz -sha256 accecbfda71ad4497bce0d451796706e734e405e5ecf3b3f9ee0cc68300a3d9c LICENSE -sha256 7ebb61006e46b9e9340dd135d5f4afbbcb1d1d6c6709f74473b35929007b9aeb LICENSE-GPL2 -sha256 63cb5f5c1ea39b732c495f354f971e40f6db84c567ca5573a68bb65af07741f8 LICENSE-GPL3 +sha256 b39d93e937647807bac23579edbff25fe46d16213f708370072574ab1f1b4211 sip-4.19.25.tar.gz +sha256 accecbfda71ad4497bce0d451796706e734e405e5ecf3b3f9ee0cc68300a3d9c LICENSE +sha256 7ebb61006e46b9e9340dd135d5f4afbbcb1d1d6c6709f74473b35929007b9aeb LICENSE-GPL2 +sha256 63cb5f5c1ea39b732c495f354f971e40f6db84c567ca5573a68bb65af07741f8 LICENSE-GPL3 diff --git a/package/python-sip/python-sip.mk b/package/python-sip/python-sip.mk index 01ccb1ddd5d..3e015fa16c8 100644 --- a/package/python-sip/python-sip.mk +++ b/package/python-sip/python-sip.mk @@ -4,12 +4,11 @@ # ################################################################################ -PYTHON_SIP_VERSION = 4.18 +PYTHON_SIP_VERSION = 4.19.25 PYTHON_SIP_SOURCE = sip-$(PYTHON_SIP_VERSION).tar.gz -PYTHON_SIP_SITE = http://downloads.sourceforge.net/project/pyqt/sip/sip-$(PYTHON_SIP_VERSION) +PYTHON_SIP_SITE = https://www.riverbankcomputing.com/static/Downloads/sip/$(PYTHON_SIP_VERSION) PYTHON_SIP_LICENSE = SIP license or GPL-2.0 or GPL-3.0 PYTHON_SIP_LICENSE_FILES = LICENSE LICENSE-GPL2 LICENSE-GPL3 - PYTHON_SIP_DEPENDENCIES = python3 qt5base HOST_PYTHON_SIP_DEPENDENCIES = host-python3 @@ -34,6 +33,7 @@ define PYTHON_SIP_CONFIGURE_CMDS --incdir $(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \ --sipdir $(TARGET_DIR)/usr/share/sip \ --sysroot $(STAGING_DIR)/usr \ + --no-stubs \ --use-qmake && \ $(HOST_DIR)/bin/qmake) endef diff --git a/package/python-smbprotocol/Config.in b/package/python-smbprotocol/Config.in new file mode 100644 index 00000000000..ae58a7d9a1d --- /dev/null +++ b/package/python-smbprotocol/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_PYTHON_SMBPROTOCOL + bool "python-smbprotocol" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography + select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime + select BR2_PACKAGE_PYTHON_PYSPNEGO # runtime + help + Interact with a server using the SMB 2/3 Protocol. + + https://github.com/jborean93/smbprotocol diff --git a/package/python-smbprotocol/python-smbprotocol.hash b/package/python-smbprotocol/python-smbprotocol.hash new file mode 100644 index 00000000000..a46f9f635bd --- /dev/null +++ b/package/python-smbprotocol/python-smbprotocol.hash @@ -0,0 +1,6 @@ +# md5, sha256 from https://pypi.org/pypi/smbprotocol/json +md5 a7474ab4cf8912dffaab56ad5067f429 smbprotocol-1.10.1.tar.gz +sha256 b5bc9d4930ec947d42c21089a4d373b97e3f6488fd15d32d27189312fd8a04c9 smbprotocol-1.10.1.tar.gz + +# Locally computed +sha256 4c3c550abc2b04c507ed0d641dd7e524eaff5bd06c7862af957301836d496d15 LICENSE diff --git a/package/python-smbprotocol/python-smbprotocol.mk b/package/python-smbprotocol/python-smbprotocol.mk new file mode 100644 index 00000000000..17c2b17dbcf --- /dev/null +++ b/package/python-smbprotocol/python-smbprotocol.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-smbprotocol +# +################################################################################ + +PYTHON_SMBPROTOCOL_VERSION = 1.10.1 +PYTHON_SMBPROTOCOL_SOURCE = smbprotocol-$(PYTHON_SMBPROTOCOL_VERSION).tar.gz +PYTHON_SMBPROTOCOL_SITE = https://files.pythonhosted.org/packages/13/1a/73ad1883beebe4f6f47879cb9880690944faa00681141920c7a2219f6152 +PYTHON_SMBPROTOCOL_SETUP_TYPE = setuptools +PYTHON_SMBPROTOCOL_LICENSE = MIT +PYTHON_SMBPROTOCOL_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/package/python-smbus-cffi/python-smbus-cffi.hash b/package/python-smbus-cffi/python-smbus-cffi.hash index ed851eb6fae..4474d0b9a3b 100644 --- a/package/python-smbus-cffi/python-smbus-cffi.hash +++ b/package/python-smbus-cffi/python-smbus-cffi.hash @@ -1,5 +1,5 @@ # md5 from https://pypi.python.org/pypi?:action=show_md5&digest=f621c871bd658ee665751ad78e3b2df9 -md5 f621c871bd658ee665751ad78e3b2df9 smbus-cffi-0.5.1.tar.gz +md5 f621c871bd658ee665751ad78e3b2df9 smbus-cffi-0.5.1.tar.gz # Locally computed sha256 fb4195aaabfc01586863f60d3190b5cb1bf8f12622fd597e23e48768dad6bde8 smbus-cffi-0.5.1.tar.gz sha256 d54f57bf73bd1ff19a424b6deab6ff08f6089a2469c8de360b167f755e4ecb4c LICENSE diff --git a/package/python-smmap2/python-smmap2.hash b/package/python-smmap2/python-smmap2.hash index 9ae758fc62a..424fa58e8c9 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 61882572be57023980c36f5493523077 smmap-4.0.0.tar.gz -sha256 7e65386bd122d45405ddf795637b7f7d2b532e7e401d46bbe3fb49b9986d5182 smmap-4.0.0.tar.gz +md5 82b22288dcabfe257d4c1f04c83c7fdd smmap-5.0.0.tar.gz +sha256 c840e62059cd3be204b0c9c9f74be2c09d5648eddd4580d9314c3ecde0b30936 smmap-5.0.0.tar.gz # Locally computed sha256 checksums -sha256 88e9d93f708d110b328a834302dd1d5c6afbda530e7721d15d80b3511d86f235 LICENSE +sha256 88e9d93f708d110b328a834302dd1d5c6afbda530e7721d15d80b3511d86f235 LICENSE diff --git a/package/python-smmap2/python-smmap2.mk b/package/python-smmap2/python-smmap2.mk index bcf20206ce2..489cf0f758f 100644 --- a/package/python-smmap2/python-smmap2.mk +++ b/package/python-smmap2/python-smmap2.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SMMAP2_VERSION = 4.0.0 +PYTHON_SMMAP2_VERSION = 5.0.0 PYTHON_SMMAP2_SOURCE = smmap-$(PYTHON_SMMAP2_VERSION).tar.gz -PYTHON_SMMAP2_SITE = https://files.pythonhosted.org/packages/dd/d4/2b4f196171674109f0fbb3951b8beab06cd0453c1b247ec0c4556d06648d +PYTHON_SMMAP2_SITE = https://files.pythonhosted.org/packages/21/2d/39c6c57032f786f1965022563eec60623bb3e1409ade6ad834ff703724f3 PYTHON_SMMAP2_SETUP_TYPE = setuptools PYTHON_SMMAP2_LICENSE = BSD-3-Clause PYTHON_SMMAP2_LICENSE_FILES = LICENSE diff --git a/package/python-snappy/python-snappy.hash b/package/python-snappy/python-snappy.hash index 1e0f96054f1..c4dbc72077b 100644 --- a/package/python-snappy/python-snappy.hash +++ b/package/python-snappy/python-snappy.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/python-snappy/json -md5 82e09ffd44204096fc70d6de14d0ea2f python-snappy-0.5.4.tar.gz -sha256 d9c26532cfa510f45e8d135cde140e8a5603d3fb254cfec273ebc0ecf9f668e2 python-snappy-0.5.4.tar.gz +md5 fc84cfa3526fba06d66f0d0b2e764300 python-snappy-0.6.1.tar.gz +sha256 b6a107ab06206acc5359d4c5632bd9b22d448702a79b3169b0c62e0fb808bb2a python-snappy-0.6.1.tar.gz # Locally computed sha256 checksums -sha256 d007cb05f143d99d16d5cd0d1bf291daf037adb36800344e440ec26edb938f9a LICENSE +sha256 d007cb05f143d99d16d5cd0d1bf291daf037adb36800344e440ec26edb938f9a LICENSE diff --git a/package/python-snappy/python-snappy.mk b/package/python-snappy/python-snappy.mk index d087c83b103..e80aa861df7 100644 --- a/package/python-snappy/python-snappy.mk +++ b/package/python-snappy/python-snappy.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_SNAPPY_VERSION = 0.5.4 -PYTHON_SNAPPY_SITE = https://files.pythonhosted.org/packages/45/35/65d9f8cc537129894b4b32647d80212d1fa342877581c5b8a69872cea8be +PYTHON_SNAPPY_VERSION = 0.6.1 +PYTHON_SNAPPY_SITE = https://files.pythonhosted.org/packages/98/7a/44a24bad98335b2c72e4cadcdecf79f50197d1bab9f22f863a274f104b96 PYTHON_SNAPPY_SETUP_TYPE = setuptools PYTHON_SNAPPY_LICENSE = BSD-3-Clause PYTHON_SNAPPY_LICENSE_FILES = LICENSE diff --git a/package/python-sniffio/Config.in b/package/python-sniffio/Config.in new file mode 100644 index 00000000000..6f3947afe65 --- /dev/null +++ b/package/python-sniffio/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_SNIFFIO + bool "python-sniffio" + help + Sniff out which async library your code is running under. + + https://github.com/python-trio/sniffio diff --git a/package/python-sniffio/python-sniffio.hash b/package/python-sniffio/python-sniffio.hash new file mode 100644 index 00000000000..00af7c58bb6 --- /dev/null +++ b/package/python-sniffio/python-sniffio.hash @@ -0,0 +1,7 @@ +# md5, sha256 from https://pypi.org/pypi/sniffio/json +md5 abb96bcda81817d6c632915c53ac29c8 sniffio-1.3.0.tar.gz +sha256 e60305c5e5d314f5389259b7f22aaa33d8f7dee49763119234af3755c55b9101 sniffio-1.3.0.tar.gz +# Locally computed sha256 checksums +sha256 652c878488d1456361e08c3f8607fd7ba59892a14103d15cce4ff93c85b5cc8b LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.APACHE2 +sha256 3e6dae555eb92787fc82d1d48355677f454c7f65aeb38d3f9e72bf9a3daf034b LICENSE.MIT diff --git a/package/python-sniffio/python-sniffio.mk b/package/python-sniffio/python-sniffio.mk new file mode 100644 index 00000000000..fa369a0e2fd --- /dev/null +++ b/package/python-sniffio/python-sniffio.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-sniffio +# +################################################################################ + +PYTHON_SNIFFIO_VERSION = 1.3.0 +PYTHON_SNIFFIO_SOURCE = sniffio-$(PYTHON_SNIFFIO_VERSION).tar.gz +PYTHON_SNIFFIO_SITE = https://files.pythonhosted.org/packages/cd/50/d49c388cae4ec10e8109b1b833fd265511840706808576df3ada99ecb0ac +PYTHON_SNIFFIO_SETUP_TYPE = setuptools +PYTHON_SNIFFIO_LICENSE = Apache-2.0 or MIT +PYTHON_SNIFFIO_LICENSE_FILES = LICENSE LICENSE.APACHE2 LICENSE.MIT + +$(eval $(python-package)) diff --git a/package/python-socketio/python-socketio.hash b/package/python-socketio/python-socketio.hash index 40e74cef963..abdcc3a5b74 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 0507825ca4bd6527cbaed81ec5767bfe python-socketio-5.4.0.tar.gz -sha256 ca807c9e1f168e96dea412d64dd834fb47c470d27fd83da0504aa4b248ba2544 python-socketio-5.4.0.tar.gz +md5 e63369252a9d383cbfc503337b864733 python-socketio-5.7.2.tar.gz +sha256 92395062d9db3c13d30e7cdedaa0e1330bba78505645db695415f9a3c628d097 python-socketio-5.7.2.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 f23342b776d..aecff55ef4a 100644 --- a/package/python-socketio/python-socketio.mk +++ b/package/python-socketio/python-socketio.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_SOCKETIO_VERSION = 5.4.0 -PYTHON_SOCKETIO_SITE = https://files.pythonhosted.org/packages/72/70/9b992f4b8adfcbf0724c079c18629d83f20b36fb0eb64d4fdf874054becf +PYTHON_SOCKETIO_VERSION = 5.7.2 +PYTHON_SOCKETIO_SITE = https://files.pythonhosted.org/packages/ee/56/294629986bf6cea96e0edb3933a7f2fac7a079d12909e893903a2effc670 PYTHON_SOCKETIO_SETUP_TYPE = setuptools PYTHON_SOCKETIO_LICENSE = MIT PYTHON_SOCKETIO_LICENSE_FILES = LICENSE diff --git a/package/python-soupsieve/python-soupsieve.hash b/package/python-soupsieve/python-soupsieve.hash index 699cb9581a2..cf348d441f0 100644 --- a/package/python-soupsieve/python-soupsieve.hash +++ b/package/python-soupsieve/python-soupsieve.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/soupsieve/json -md5 73ff6ce22ba973fe2d47197834e0f728 soupsieve-2.2.1.tar.gz -sha256 052774848f448cf19c7e959adf5566904d525f33a3f8b6ba6f6f8f26ec7de0cc soupsieve-2.2.1.tar.gz +md5 4c824620563604cbf783de149c8b8889 soupsieve-2.3.2.post1.tar.gz +sha256 fc53893b3da2c33de295667a0e19f078c14bf86544af307354de5fcf12a3f30d soupsieve-2.3.2.post1.tar.gz # Locally computed sha256 checksums -sha256 e34a760fe8bb3e3c1ffaa88abe495cf76e56f8ae3c7a6dde0e4b41cd013c41d4 LICENSE.md +sha256 bc66234cadd3f6e7aaf7160faf165f3f869ffc8a11b6b0d6c44a2e2a83314dd0 LICENSE.md diff --git a/package/python-soupsieve/python-soupsieve.mk b/package/python-soupsieve/python-soupsieve.mk index dd2ddebbb12..ebf2ada7acf 100644 --- a/package/python-soupsieve/python-soupsieve.mk +++ b/package/python-soupsieve/python-soupsieve.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_SOUPSIEVE_VERSION = 2.2.1 +PYTHON_SOUPSIEVE_VERSION = 2.3.2.post1 PYTHON_SOUPSIEVE_SOURCE = soupsieve-$(PYTHON_SOUPSIEVE_VERSION).tar.gz -PYTHON_SOUPSIEVE_SITE = https://files.pythonhosted.org/packages/c8/3f/e71d92e90771ac2d69986aa0e81cf0dfda6271e8483698f4847b861dd449 -PYTHON_SOUPSIEVE_SETUP_TYPE = setuptools +PYTHON_SOUPSIEVE_SITE = https://files.pythonhosted.org/packages/f3/03/bac179d539362319b4779a00764e95f7542f4920084163db6b0fd4742d38 +PYTHON_SOUPSIEVE_SETUP_TYPE = pep517 PYTHON_SOUPSIEVE_LICENSE = MIT PYTHON_SOUPSIEVE_LICENSE_FILES = LICENSE.md +PYTHON_SOUPSIEVE_DEPENDENCIES = host-python-hatchling $(eval $(python-package)) diff --git a/package/python-spake2/Config.in b/package/python-spake2/Config.in new file mode 100644 index 00000000000..1c2e3a49af3 --- /dev/null +++ b/package/python-spake2/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_PYTHON_SPAKE2 + bool "python-spake2" + select BR2_PACKAGE_PYTHON_HKDF # runtime + help + SPAKE2 password-authenticated key exchange (in pure python). + + This library implements the SPAKE2 password-authenticated + key exchange ("PAKE") algorithm. This allows two parties, + who share a weak password, to safely derive a strong shared + secret (and therefore build an encrypted+authenticated + channel). + + https://github.com/warner/python-spake2 diff --git a/package/python-spake2/python-spake2.hash b/package/python-spake2/python-spake2.hash new file mode 100644 index 00000000000..30052b1b368 --- /dev/null +++ b/package/python-spake2/python-spake2.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/spake2/json +md5 0155bad518bb49c39994fe0b7d9fb32c spake2-0.8.tar.gz +sha256 c17a614b29ee4126206e22181f70a406c618d3c6c62ca6d6779bce95e9c926f4 spake2-0.8.tar.gz +# Locally computed sha256 checksums +sha256 2a8a1200c3a2769d1815727f3b4439bd800f3bc88163118a36ff30b007d30031 LICENSE diff --git a/package/python-spake2/python-spake2.mk b/package/python-spake2/python-spake2.mk new file mode 100644 index 00000000000..99ce7dae13a --- /dev/null +++ b/package/python-spake2/python-spake2.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-spake2 +# +################################################################################ + +PYTHON_SPAKE2_VERSION = 0.8 +PYTHON_SPAKE2_SOURCE = spake2-$(PYTHON_SPAKE2_VERSION).tar.gz +PYTHON_SPAKE2_SITE = https://files.pythonhosted.org/packages/60/0b/bb5eca8e18c38a10b1c207bbe6103df091e5cf7b3e5fdc0efbcad7b85b60 +PYTHON_SPAKE2_SETUP_TYPE = setuptools +PYTHON_SPAKE2_LICENSE = MIT +PYTHON_SPAKE2_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/package/python-spidev/python-spidev.hash b/package/python-spidev/python-spidev.hash index 13128ee3e55..cd8a24eb729 100644 --- a/package/python-spidev/python-spidev.hash +++ b/package/python-spidev/python-spidev.hash @@ -1,5 +1,5 @@ -# sha256 from https://pypi.org/project/spidev -sha256 8a7f5c289f161ea2ac4697fa8a10918232c990678dd0053084b3c43b1363910d spidev-3.5.tar.gz - -# locally computed -sha256 153a6f02f41aebe292cf3307f973a80b4fb0c988d8d3e7d126c7a66c20b1cc27 README.md +# md5, sha256 from https://pypi.org/pypi/spidev/json +md5 83a73279d6e823a9030c4315577bfae3 spidev-3.6.tar.gz +sha256 14dbc37594a4aaef85403ab617985d3c3ef464d62bc9b769ef552db53701115b spidev-3.6.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 e1065610a74..f48b5b08327 100644 --- a/package/python-spidev/python-spidev.mk +++ b/package/python-spidev/python-spidev.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_SPIDEV_VERSION = 3.5 +PYTHON_SPIDEV_VERSION = 3.6 PYTHON_SPIDEV_SOURCE = spidev-$(PYTHON_SPIDEV_VERSION).tar.gz -PYTHON_SPIDEV_SITE = https://files.pythonhosted.org/packages/62/56/de649e7d95f9fcfaf965a6eb937b4a46bc77ef21487c99cde1a7a0546040 +PYTHON_SPIDEV_SITE = https://files.pythonhosted.org/packages/c7/d9/401c0a7be089e02826cf2c201f489876b601f15be100fe391ef9c2faed83 PYTHON_SPIDEV_SETUP_TYPE = setuptools PYTHON_SPIDEV_LICENSE = MIT -PYTHON_SPIDEV_LICENSE_FILES = README.md +PYTHON_SPIDEV_LICENSE_FILES = LICENSE $(eval $(python-package)) diff --git a/package/python-sqlalchemy/python-sqlalchemy.hash b/package/python-sqlalchemy/python-sqlalchemy.hash index 991293b5a93..9f479d8f7b6 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 af9722657ba51131703dbe75f24b054a SQLAlchemy-1.3.10.tar.gz -sha256 0f0768b5db594517e1f5e1572c73d14cf295140756431270d89496dc13d5e46c SQLAlchemy-1.3.10.tar.gz +md5 52318b83e8931c5f5a459f54fe4be3e8 SQLAlchemy-1.4.42.tar.gz +sha256 177e41914c476ed1e1b77fd05966ea88c094053e17a85303c4ce007f88eff363 SQLAlchemy-1.4.42.tar.gz # Locally computed sha256 checksums -sha256 0acffa15f3427e94014235e3c44376f6fe5df0ff461a93a9116eebcce74c056e LICENSE +sha256 859ded25da34c1eb73e6e736df4c5f8ce3ed2ed5290663176f06e7720d9c9a20 LICENSE diff --git a/package/python-sqlalchemy/python-sqlalchemy.mk b/package/python-sqlalchemy/python-sqlalchemy.mk index d6829853fcf..a94b9eca92b 100644 --- a/package/python-sqlalchemy/python-sqlalchemy.mk +++ b/package/python-sqlalchemy/python-sqlalchemy.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SQLALCHEMY_VERSION = 1.3.10 +PYTHON_SQLALCHEMY_VERSION = 1.4.42 PYTHON_SQLALCHEMY_SOURCE = SQLAlchemy-$(PYTHON_SQLALCHEMY_VERSION).tar.gz -PYTHON_SQLALCHEMY_SITE = https://files.pythonhosted.org/packages/14/0e/487f7fc1e432cec50d2678f94e4133f2b9e9356e35bacc30d73e8cb831fc +PYTHON_SQLALCHEMY_SITE = https://files.pythonhosted.org/packages/e4/56/8ea85eaab7d93b58f9c213ad8fc5882838189a29fc8cc401d80710a12969 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 e60bd64325d..d5fe6e7af12 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 4fb0130e7cc60d92be468091fbfc3d51 sqliteschema-1.2.1.tar.gz -sha256 dde195bd7bc70d5841bc01dff20ec23bd43be87d760d2dfc7c7f2e5fd3808ef3 sqliteschema-1.2.1.tar.gz +md5 46da4f7575a0cc6c1d92377a279e5188 sqliteschema-1.3.0.tar.gz +sha256 1acdd5087cab54a099135a5623bb1960019816e2e3042b889c637901a832d3c3 sqliteschema-1.3.0.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 5c52e351112..c399ebd6f6c 100644 --- a/package/python-sqliteschema/python-sqliteschema.mk +++ b/package/python-sqliteschema/python-sqliteschema.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SQLITESCHEMA_VERSION = 1.2.1 +PYTHON_SQLITESCHEMA_VERSION = 1.3.0 PYTHON_SQLITESCHEMA_SOURCE = sqliteschema-$(PYTHON_SQLITESCHEMA_VERSION).tar.gz -PYTHON_SQLITESCHEMA_SITE = https://files.pythonhosted.org/packages/85/f8/be54d4bebf551cb533d1dea11c3bf165a1a408c2a1cceb1f9724aadd9967 +PYTHON_SQLITESCHEMA_SITE = https://files.pythonhosted.org/packages/3d/ff/91cfff0c96f9ba2bddc27d6855db4907af77551a267b86740c8842beeb78 PYTHON_SQLITESCHEMA_SETUP_TYPE = setuptools PYTHON_SQLITESCHEMA_LICENSE = MIT PYTHON_SQLITESCHEMA_LICENSE_FILES = LICENSE diff --git a/package/python-sqlparse/python-sqlparse.hash b/package/python-sqlparse/python-sqlparse.hash index a03abe342b4..c78fd2edc3f 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 2ce34181d6b7b234c9f3c0ecd1ffb93e sqlparse-0.3.0.tar.gz -sha256 7c3dca29c022744e95b547e867cee89f4fce4373f3549ccd8797d8eb52cdb873 sqlparse-0.3.0.tar.gz +md5 180fb4e11a3f79b119868d7c102d7816 sqlparse-0.4.3.tar.gz +sha256 69ca804846bb114d2ec380e4360a8a340db83f0ccf3afceeb1404df028f57268 sqlparse-0.4.3.tar.gz # Locally computed sha256 checksums -sha256 c1938235b80d39e93138eae89edc3af67e18ecbc40d266529fa57b2dce426310 LICENSE +sha256 c1938235b80d39e93138eae89edc3af67e18ecbc40d266529fa57b2dce426310 LICENSE diff --git a/package/python-sqlparse/python-sqlparse.mk b/package/python-sqlparse/python-sqlparse.mk index 22111dfc418..23b1338e496 100644 --- a/package/python-sqlparse/python-sqlparse.mk +++ b/package/python-sqlparse/python-sqlparse.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SQLPARSE_VERSION = 0.3.0 +PYTHON_SQLPARSE_VERSION = 0.4.3 PYTHON_SQLPARSE_SOURCE = sqlparse-$(PYTHON_SQLPARSE_VERSION).tar.gz -PYTHON_SQLPARSE_SITE = https://files.pythonhosted.org/packages/63/c8/229dfd2d18663b375975d953e2bdc06d0eed714f93dcb7732f39e349c438 +PYTHON_SQLPARSE_SITE = https://files.pythonhosted.org/packages/ba/fa/5b7662b04b69f3a34b8867877e4dbf2a37b7f2a5c0bbb5a9eed64efd1ad1 PYTHON_SQLPARSE_SETUP_TYPE = setuptools PYTHON_SQLPARSE_LICENSE = BSD-3-Clause PYTHON_SQLPARSE_LICENSE_FILES = LICENSE diff --git a/package/python-stack-data/Config.in b/package/python-stack-data/Config.in new file mode 100644 index 00000000000..508eb9cf132 --- /dev/null +++ b/package/python-stack-data/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_PYTHON_STACK_DATA + bool "python-stack-data" + select BR2_PACKAGE_PYTHON_ASTTOKENS # runtime + select BR2_PACKAGE_PYTHON_EXECUTING # runtime + select BR2_PACKAGE_PYTHON_PURE_EVAL # runtime + help + Extract data from python stack frames and tracebacks + for informative displays. + + http://github.com/alexmojaki/stack_data diff --git a/package/python-stack-data/python-stack-data.hash b/package/python-stack-data/python-stack-data.hash new file mode 100644 index 00000000000..6decd3ca8eb --- /dev/null +++ b/package/python-stack-data/python-stack-data.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/stack_data/json +md5 bf86c3c81a0158e1e7f3979da5a0033b stack_data-0.6.2.tar.gz +sha256 32d2dd0376772d01b6cb9fc996f3c8b57a357089dec328ed4b6553d037eaf815 stack_data-0.6.2.tar.gz +# Locally computed sha256 checksums +sha256 a476a2cb0ef4c41450340a577a28b91ac4c7f669136b2ee148047fabd5fc4181 LICENSE.txt diff --git a/package/python-stack-data/python-stack-data.mk b/package/python-stack-data/python-stack-data.mk new file mode 100644 index 00000000000..494ce8f4546 --- /dev/null +++ b/package/python-stack-data/python-stack-data.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-stack-data +# +################################################################################ + +PYTHON_STACK_DATA_VERSION = 0.6.2 +PYTHON_STACK_DATA_SOURCE = stack_data-$(PYTHON_STACK_DATA_VERSION).tar.gz +PYTHON_STACK_DATA_SITE = https://files.pythonhosted.org/packages/db/18/aa7f2b111aeba2cd83503254d9133a912d7f61f459a0c8561858f0d72a56 +PYTHON_STACK_DATA_SETUP_TYPE = setuptools +PYTHON_STACK_DATA_LICENSE = MIT +PYTHON_STACK_DATA_LICENSE_FILES = LICENSE.txt + +$(eval $(python-package)) diff --git a/package/python-systemd/python-systemd.hash b/package/python-systemd/python-systemd.hash index 1e5cee5cecd..789b48590de 100644 --- a/package/python-systemd/python-systemd.hash +++ b/package/python-systemd/python-systemd.hash @@ -1,5 +1,5 @@ # md5 from https://pypi.python.org/pypi/systemd-python/ -md5 5071ea5bcb976186e92a3f5e75df221d systemd-python-234.tar.gz +md5 5071ea5bcb976186e92a3f5e75df221d systemd-python-234.tar.gz # Locally computed sha256 fd0e44bf70eadae45aadc292cb0a7eb5b0b6372cd1b391228047d33895db83e7 systemd-python-234.tar.gz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.txt diff --git a/package/python-tempora/python-tempora.hash b/package/python-tempora/python-tempora.hash index e9592461386..ac6483b77f3 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 f8b2b0df1adf3f83b829a85e31bddb2d tempora-1.14.1.tar.gz -sha256 cb60b1d2b1664104e307f8e5269d7f4acdb077c82e35cd57246ae14a3427d2d6 tempora-1.14.1.tar.gz +md5 87fc0d99edd557323e61a16017707a8b tempora-5.2.0.tar.gz +sha256 af82eb016decda8daf566d1e4836f94f7f8ba8c7153637460156e081aadc64df tempora-5.2.0.tar.gz # Locally computed sha256 checksums -sha256 a55e2ffe9b44998e621d51d8c094bed09acc4b5236ee73d7df395a33ba3c18fd LICENSE +sha256 db3f0246b1f9278f15845b99fec478b8b506eb76487993722f8c6e254285faf8 LICENSE diff --git a/package/python-tempora/python-tempora.mk b/package/python-tempora/python-tempora.mk index b2f1b6b309e..3074ad0de25 100644 --- a/package/python-tempora/python-tempora.mk +++ b/package/python-tempora/python-tempora.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TEMPORA_VERSION = 1.14.1 +PYTHON_TEMPORA_VERSION = 5.2.0 PYTHON_TEMPORA_SOURCE = tempora-$(PYTHON_TEMPORA_VERSION).tar.gz -PYTHON_TEMPORA_SITE = https://files.pythonhosted.org/packages/2f/b5/5b0464385454c5ca93a39a1c6acefdf574aeb10ef45fa8958b3832cc7d96 +PYTHON_TEMPORA_SITE = https://files.pythonhosted.org/packages/97/70/5cf5031a83ca6d0431a53459b2a98aa387ba23d06710a5e48d681ff3956f PYTHON_TEMPORA_LICENSE = MIT PYTHON_TEMPORA_LICENSE_FILES = LICENSE PYTHON_TEMPORA_SETUP_TYPE = setuptools diff --git a/package/python-termcolor/python-termcolor.hash b/package/python-termcolor/python-termcolor.hash index 7cccc3ec974..9be0ad00c8c 100644 --- a/package/python-termcolor/python-termcolor.hash +++ b/package/python-termcolor/python-termcolor.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/termcolor/json -md5 043e89644f8909d462fbbfa511c768df termcolor-1.1.0.tar.gz -sha256 1d6d69ce66211143803fbc56652b41d73b4a400a2891d7bf7a1cdf4c02de613b termcolor-1.1.0.tar.gz +md5 ba0af4ee713cd0030c2d436091af4241 termcolor-2.2.0.tar.gz +sha256 dfc8ac3f350788f23b2947b3e6cfa5a53b630b612e6cd8965a015a776020b99a termcolor-2.2.0.tar.gz # Locally computed sha256 checksums -sha256 497b3272b67b94a7aa58fa3748d21b62b29ccb783b1cda816f594e3932590bbf COPYING.txt +sha256 e79b6bd82962c1330caaa7c42278567b08667777673f8e2371a624d5715d4c0e COPYING.txt diff --git a/package/python-termcolor/python-termcolor.mk b/package/python-termcolor/python-termcolor.mk index ccdff4c0d76..5cbedfb3964 100644 --- a/package/python-termcolor/python-termcolor.mk +++ b/package/python-termcolor/python-termcolor.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_TERMCOLOR_VERSION = 1.1.0 +PYTHON_TERMCOLOR_VERSION = 2.2.0 PYTHON_TERMCOLOR_SOURCE = termcolor-$(PYTHON_TERMCOLOR_VERSION).tar.gz -PYTHON_TERMCOLOR_SITE = https://files.pythonhosted.org/packages/8a/48/a76be51647d0eb9f10e2a4511bf3ffb8cc1e6b14e9e4fab46173aa79f981 -PYTHON_TERMCOLOR_SETUP_TYPE = distutils +PYTHON_TERMCOLOR_SITE = https://files.pythonhosted.org/packages/e5/4e/b2a54a21092ad2d5d70b0140e4080811bee06a39cc8481651579fe865c89 +PYTHON_TERMCOLOR_SETUP_TYPE = pep517 PYTHON_TERMCOLOR_LICENSE = MIT PYTHON_TERMCOLOR_LICENSE_FILES = COPYING.txt +PYTHON_TERMCOLOR_DEPENDENCIES = host-python-hatchling host-python-hatch-vcs $(eval $(python-package)) diff --git a/package/python-texttable/python-texttable.hash b/package/python-texttable/python-texttable.hash index a769e91772a..560749b238a 100644 --- a/package/python-texttable/python-texttable.hash +++ b/package/python-texttable/python-texttable.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/texttable/json -md5 15faadc07ba44d337cc1675ea6092a02 texttable-1.6.4.tar.gz -sha256 42ee7b9e15f7b225747c3fa08f43c5d6c83bc899f80ff9bae9319334824076e9 texttable-1.6.4.tar.gz +md5 83eb15fb541dd857ff051a8d0c979b9c texttable-1.6.7.tar.gz +sha256 290348fb67f7746931bcdfd55ac7584ecd4e5b0846ab164333f0794b121760f2 texttable-1.6.7.tar.gz # Locally computed sha256 checksums sha256 4ba7bdab54504a3bc44eb33ecca873a26a63ab902822101a87bb46235da63594 LICENSE diff --git a/package/python-texttable/python-texttable.mk b/package/python-texttable/python-texttable.mk index 59df5f6ff5b..c63fb5786ca 100644 --- a/package/python-texttable/python-texttable.mk +++ b/package/python-texttable/python-texttable.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TEXTTABLE_VERSION = 1.6.4 +PYTHON_TEXTTABLE_VERSION = 1.6.7 PYTHON_TEXTTABLE_SOURCE = texttable-$(PYTHON_TEXTTABLE_VERSION).tar.gz -PYTHON_TEXTTABLE_SITE = https://files.pythonhosted.org/packages/d5/78/dbc2a5eab57a01fedaf975f2c16f04e76f09336dbeadb9994258aa0a2b1a +PYTHON_TEXTTABLE_SITE = https://files.pythonhosted.org/packages/e4/84/4686ee611bb020038375c5f11fe7b6b3bb94ee78614a1faba45effe51591 PYTHON_TEXTTABLE_SETUP_TYPE = setuptools PYTHON_TEXTTABLE_LICENSE = MIT PYTHON_TEXTTABLE_LICENSE_FILES = LICENSE diff --git a/package/python-thrift/python-thrift.hash b/package/python-thrift/python-thrift.hash index 1d1d6289085..0907a6e88f0 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 c3bc8d9a910d2c9ce26f2ad1f7c96762 thrift-0.13.0.tar.gz -sha256 9af1c86bf73433afc6010ed376a6c6aca2b54099cc0d61895f640870a9ae7d89 thrift-0.13.0.tar.gz +md5 486887192acd558636a1528dfddf918c thrift-0.16.0.tar.gz +sha256 2b5b6488fcded21f9d312aa23c9ff6a0195d0f6ae26ddbd5ad9e3e25dfc14408 thrift-0.16.0.tar.gz # Locally computed sha256 checksums -sha256 c13578ae9d0529d0252e1c7375b917bacf58723dce1fcd40c7ed59183401b468 LICENSE +sha256 35e2508f171c3ac2529f402c123c12f3b2ac91643f2e52b334f71f8c861be321 README.md diff --git a/package/python-thrift/python-thrift.mk b/package/python-thrift/python-thrift.mk index 3a908ca91c8..23a2ad0476e 100644 --- a/package/python-thrift/python-thrift.mk +++ b/package/python-thrift/python-thrift.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_THRIFT_VERSION = 0.13.0 +PYTHON_THRIFT_VERSION = 0.16.0 PYTHON_THRIFT_SOURCE = thrift-$(PYTHON_THRIFT_VERSION).tar.gz -PYTHON_THRIFT_SITE = https://files.pythonhosted.org/packages/97/1e/3284d19d7be99305eda145b8aa46b0c33244e4a496ec66440dac19f8274d +PYTHON_THRIFT_SITE = https://files.pythonhosted.org/packages/e4/23/dd951c9883cb49a73b750bdfe91e39d78e8a3f1f7175608634f381a197d5 PYTHON_THRIFT_SETUP_TYPE = setuptools PYTHON_THRIFT_LICENSE = Apache-2.0 -PYTHON_THRIFT_LICENSE_FILES = LICENSE +PYTHON_THRIFT_LICENSE_FILES = README.md $(eval $(python-package)) diff --git a/package/python-tinycss2/Config.in b/package/python-tinycss2/Config.in index a34717e002b..4d6dcca6639 100644 --- a/package/python-tinycss2/Config.in +++ b/package/python-tinycss2/Config.in @@ -3,3 +3,5 @@ config BR2_PACKAGE_PYTHON_TINYCSS2 select BR2_PACKAGE_PYTHON_WEBENCODINGS # runtime help A tiny CSS parser. + + https://www.courtbouillon.org/tinycss2 diff --git a/package/python-tinycss2/python-tinycss2.hash b/package/python-tinycss2/python-tinycss2.hash index eeb37547521..f9b638df6ce 100644 --- a/package/python-tinycss2/python-tinycss2.hash +++ b/package/python-tinycss2/python-tinycss2.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/tinycss2/json -md5 7caf513c4e87fc2449dcfbf407a8416f tinycss2-1.1.0.tar.gz -sha256 fbdcac3044d60eb85fdb2aa840ece43cf7dbe798e373e6ee0be545d4d134e18a tinycss2-1.1.0.tar.gz +md5 e8a06102e7f42ca791463f11ce7b814d tinycss2-1.2.1.tar.gz +sha256 8cff3a8f066c2ec677c06dbc7b45619804a6938478d9d73c284b29d14ecb0627 tinycss2-1.2.1.tar.gz # Locally computed sha256 checksums sha256 6b94acee20ec9f2709333134f3ba70322535fb420af0ce8c1455d9cbe297f1d5 LICENSE diff --git a/package/python-tinycss2/python-tinycss2.mk b/package/python-tinycss2/python-tinycss2.mk index 4bf5b977669..de26639587e 100644 --- a/package/python-tinycss2/python-tinycss2.mk +++ b/package/python-tinycss2/python-tinycss2.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_TINYCSS2_VERSION = 1.1.0 +PYTHON_TINYCSS2_VERSION = 1.2.1 PYTHON_TINYCSS2_SOURCE = tinycss2-$(PYTHON_TINYCSS2_VERSION).tar.gz -PYTHON_TINYCSS2_SITE = https://files.pythonhosted.org/packages/ce/d3/ece7a98d5826bd134e269a3a3030153d30482194fca71d95a3041812aab8 -PYTHON_TINYCSS2_SETUP_TYPE = distutils +PYTHON_TINYCSS2_SITE = https://files.pythonhosted.org/packages/75/be/24179dfaa1d742c9365cbd0e3f0edc5d3aa3abad415a2327c5a6ff8ca077 +PYTHON_TINYCSS2_SETUP_TYPE = flit PYTHON_TINYCSS2_LICENSE = BSD-3-Clause PYTHON_TINYCSS2_LICENSE_FILES = LICENSE diff --git a/package/python-tomako/python-tomako.hash b/package/python-tomako/python-tomako.hash index 65576f4196e..e2d56536a18 100644 --- a/package/python-tomako/python-tomako.hash +++ b/package/python-tomako/python-tomako.hash @@ -1,5 +1,5 @@ # md5 from https://pypi.python.org/pypi/tomako/json -md5 a2e9e99be4ddf2263ed441ddc3dfcf96 tomako-0.1.0.post1.tar.gz +md5 a2e9e99be4ddf2263ed441ddc3dfcf96 tomako-0.1.0.post1.tar.gz # Locally computed -sha256 2d8ec113199408eb16ec00361aac6f10b716925779b6331083f304d01dafd150 tomako-0.1.0.post1.tar.gz +sha256 2d8ec113199408eb16ec00361aac6f10b716925779b6331083f304d01dafd150 tomako-0.1.0.post1.tar.gz sha256 2b55167354e331f089d5f7a9a9ef4149b0baa95abd6860b6390a04001e1f2bb8 LICENSE diff --git a/package/python-tomli/python-tomli.hash b/package/python-tomli/python-tomli.hash index 1a274c8a402..8368f9ee13f 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 2ecbc7a23b8c8dc2fe96f588f88463d9 tomli-1.2.0.tar.gz -sha256 d60e681734099207a6add7a10326bc2ddd1fdc36c1b0f547d00ef73ac63739c2 tomli-1.2.0.tar.gz +md5 d4341621d423a7ca6822e23d6d52bb9a tomli-2.0.1.tar.gz +sha256 de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f tomli-2.0.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 b8c20ca736d..5d259f71a3a 100644 --- a/package/python-tomli/python-tomli.mk +++ b/package/python-tomli/python-tomli.mk @@ -4,12 +4,12 @@ # ################################################################################ -PYTHON_TOMLI_VERSION = 1.2.0 +PYTHON_TOMLI_VERSION = 2.0.1 PYTHON_TOMLI_SOURCE = tomli-$(PYTHON_TOMLI_VERSION).tar.gz -PYTHON_TOMLI_SITE = https://files.pythonhosted.org/packages/ec/38/8eccdc662c61aed187d5f5b168c18b1d2de3827976c3691e4da8be7375aa -PYTHON_TOMLI_SETUP_TYPE = distutils +PYTHON_TOMLI_SITE = https://files.pythonhosted.org/packages/c0/3f/d7af728f075fb08564c5949a9c95e44352e23dee646869fa104a3b2060a3 PYTHON_TOMLI_LICENSE = MIT PYTHON_TOMLI_LICENSE_FILES = LICENSE +PYTHON_TOMLI_SETUP_TYPE = flit $(eval $(python-package)) $(eval $(host-python-package)) diff --git a/package/python-tornado/0001-web-Fix-an-open-redirect-in-StaticFileHandler.patch b/package/python-tornado/0001-web-Fix-an-open-redirect-in-StaticFileHandler.patch new file mode 100644 index 00000000000..357c6f2f129 --- /dev/null +++ b/package/python-tornado/0001-web-Fix-an-open-redirect-in-StaticFileHandler.patch @@ -0,0 +1,42 @@ +From ac79778c91bd9a4a92111f7e06d4b12674571113 Mon Sep 17 00:00:00 2001 +From: Ben Darnell +Date: Sat, 13 May 2023 20:58:52 -0400 +Subject: [PATCH] web: Fix an open redirect in StaticFileHandler + +Under some configurations the default_filename redirect could be exploited +to redirect to an attacker-controlled site. This change refuses to redirect +to URLs that could be misinterpreted. + +A test case for the specific vulnerable configuration will follow after the +patch has been available. + +Upstream: https://github.com/tornadoweb/tornado/commit/32ad07c54e607839273b4e1819c347f5c8976b2f +[Thomas: backported to fix CVE-2023-28370] +Signed-off-by: Thomas Petazzoni +--- + tornado/web.py | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/tornado/web.py b/tornado/web.py +index cd6a81b4..05b571eb 100644 +--- a/tornado/web.py ++++ b/tornado/web.py +@@ -2806,6 +2806,15 @@ class StaticFileHandler(RequestHandler): + # but there is some prefix to the path that was already + # trimmed by the routing + if not self.request.path.endswith("/"): ++ if self.request.path.startswith("//"): ++ # A redirect with two initial slashes is a "protocol-relative" URL. ++ # This means the next path segment is treated as a hostname instead ++ # of a part of the path, making this effectively an open redirect. ++ # Reject paths starting with two slashes to prevent this. ++ # This is only reachable under certain configurations. ++ raise HTTPError( ++ 403, "cannot redirect path with two initial slashes" ++ ) + self.redirect(self.request.path + "/", permanent=True) + return None + absolute_path = os.path.join(absolute_path, self.default_filename) +-- +2.41.0 + diff --git a/package/python-tornado/python-tornado.hash b/package/python-tornado/python-tornado.hash index e9fbbedf654..f30a6bb136c 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 cf39425f3d7eba9a54287f3e795a2f23 tornado-6.0.4.tar.gz -sha256 0fe2d45ba43b00a41cd73f8be321a44936dc1aba233dee979f17a042b83eb6dc tornado-6.0.4.tar.gz +md5 32fbad606b439c3e1bf4e79d4e872741 tornado-6.2.tar.gz +sha256 9b630419bde84ec666bfd7ea0a4cb2a8a651c2d5cccdbdd1972a0c859dfc3c13 tornado-6.2.tar.gz # Locally computed sha256 checksums -sha256 3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5 LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/python-tornado/python-tornado.mk b/package/python-tornado/python-tornado.mk index c05a7d65d3e..f4a4c97d2a2 100644 --- a/package/python-tornado/python-tornado.mk +++ b/package/python-tornado/python-tornado.mk @@ -4,13 +4,15 @@ # ################################################################################ -PYTHON_TORNADO_VERSION = 6.0.4 +PYTHON_TORNADO_VERSION = 6.2 PYTHON_TORNADO_SOURCE = tornado-$(PYTHON_TORNADO_VERSION).tar.gz -PYTHON_TORNADO_SITE = https://files.pythonhosted.org/packages/95/84/119a46d494f008969bf0c775cb2c6b3579d3c4cc1bb1b41a022aa93ee242 +PYTHON_TORNADO_SITE = https://files.pythonhosted.org/packages/f3/9e/225a41452f2d9418d89be5e32cf824c84fe1e639d350d6e8d49db5b7f73a PYTHON_TORNADO_LICENSE = Apache-2.0 PYTHON_TORNADO_LICENSE_FILES = LICENSE PYTHON_TORNADO_CPE_ID_VENDOR = tornadoweb PYTHON_TORNADO_CPE_ID_PRODUCT = tornado PYTHON_TORNADO_SETUP_TYPE = setuptools +# 0001-web-Fix-an-open-redirect-in-StaticFileHandler.patch +PYTHON_TORNADO_IGNORE_CVES += CVE-2023-28370 $(eval $(python-package)) diff --git a/package/python-tqdm/python-tqdm.hash b/package/python-tqdm/python-tqdm.hash index 8a61b29ad7a..4be54de7de4 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/project/tqdm -md5 285af1f905f4c375f03a86a667047950 tqdm-4.40.1.tar.gz -sha256 e405d16c98fcf30725d0c9d493ed07302a18846b5452de5253030ccd18996f87 tqdm-4.40.1.tar.gz +md5 5822af464d77ea156ad1167c23e1bdac tqdm-4.64.1.tar.gz +sha256 5f4f682a004951c1b450bc753c710e9280c5746ce6ffedee253ddbcbf54cf1e4 tqdm-4.64.1.tar.gz # Locally computed sha256 checksums -sha256 1bbf12d09d437844527b3cdaba01d379dac651b5cbb5ebb0d764274684d2680b LICENCE +sha256 a0fc1785a8f2a200a3124d703d49550601b7741ccffc861713c2ddaa07a537dd LICENCE diff --git a/package/python-tqdm/python-tqdm.mk b/package/python-tqdm/python-tqdm.mk index 5ceddde14c4..a6296bd0f5b 100644 --- a/package/python-tqdm/python-tqdm.mk +++ b/package/python-tqdm/python-tqdm.mk @@ -4,13 +4,14 @@ # ################################################################################ -PYTHON_TQDM_VERSION = 4.40.1 +PYTHON_TQDM_VERSION = 4.64.1 PYTHON_TQDM_SOURCE = tqdm-$(PYTHON_TQDM_VERSION).tar.gz -PYTHON_TQDM_SITE = https://files.pythonhosted.org/packages/4c/45/830c5c4bfaba60ef7d356a53c7751a86c81d148a16fda0daf3ac5ca8e288 +PYTHON_TQDM_SITE = https://files.pythonhosted.org/packages/c1/c2/d8a40e5363fb01806870e444fc1d066282743292ff32a9da54af51ce36a2 PYTHON_TQDM_SETUP_TYPE = setuptools PYTHON_TQDM_LICENSE = MPL-2.0, MIT PYTHON_TQDM_LICENSE_FILES = LICENCE PYTHON_TQDM_CPE_ID_VENDOR = tqdm_project PYTHON_TQDM_CPE_ID_PRODUCT = tqdm +PYTHON_TQDM_DEPENDENCIES = host-python-setuptools-scm $(eval $(python-package)) diff --git a/package/python-traitlets/python-traitlets.hash b/package/python-traitlets/python-traitlets.hash index 01e2bf8e305..80fa8d4d440 100644 --- a/package/python-traitlets/python-traitlets.hash +++ b/package/python-traitlets/python-traitlets.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/traitlets/json -md5 19483ec0685e837912cff128209aa845 traitlets-5.1.0.tar.gz -sha256 bd382d7ea181fbbcce157c133db9a829ce06edffe097bcf3ab945b435452b46d traitlets-5.1.0.tar.gz +md5 95b21c721316bbc06922df9d97af5158 traitlets-5.8.0.tar.gz +sha256 6cc57d6dc28c85d5365961726ffd19b538739347749e13ebe34e03323a0e8f84 traitlets-5.8.0.tar.gz # Locally computed sha256 checksums -sha256 71c89129039b870cc92309466c4fbe8f285a82fa0ea36f0e840fa83979cbe31f COPYING.md +sha256 3dcd47086529bf178cf7d10f35a8c188a1e9710391acecceef700898a4cf099b COPYING.md diff --git a/package/python-traitlets/python-traitlets.mk b/package/python-traitlets/python-traitlets.mk index 5f41f6ee8f9..7054557a486 100644 --- a/package/python-traitlets/python-traitlets.mk +++ b/package/python-traitlets/python-traitlets.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_TRAITLETS_VERSION = 5.1.0 +PYTHON_TRAITLETS_VERSION = 5.8.0 PYTHON_TRAITLETS_SOURCE = traitlets-$(PYTHON_TRAITLETS_VERSION).tar.gz -PYTHON_TRAITLETS_SITE = https://files.pythonhosted.org/packages/d5/bc/37d490908e7ac949614d62767db3c86f37bc5adb6129d378c35859a75b87 +PYTHON_TRAITLETS_SITE = https://files.pythonhosted.org/packages/56/48/0eb99357330a02974d537be8e4096bc58cfac1089e3153570119ccea7a40 PYTHON_TRAITLETS_LICENSE = BSD-3-Clause PYTHON_TRAITLETS_LICENSE_FILES = COPYING.md -PYTHON_TRAITLETS_SETUP_TYPE = distutils +PYTHON_TRAITLETS_SETUP_TYPE = pep517 +PYTHON_TRAITLETS_DEPENDENCIES = host-python-hatchling $(eval $(python-package)) diff --git a/package/python-treq/Config.in b/package/python-treq/Config.in index 7c02a35638a..5d76a5cdd65 100644 --- a/package/python-treq/Config.in +++ b/package/python-treq/Config.in @@ -3,9 +3,9 @@ config BR2_PACKAGE_PYTHON_TREQ # twisted TLS -> python-{pyopenssl,service-identity} depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS select BR2_PACKAGE_PYTHON_ATTRS # runtime + select BR2_PACKAGE_PYTHON_HYPERLINK # runtime select BR2_PACKAGE_PYTHON_INCREMENTAL # runtime select BR2_PACKAGE_PYTHON_REQUESTS # runtime - select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_TWISTED # runtime select BR2_PACKAGE_PYTHON_TWISTED_TLS # runtime help diff --git a/package/python-treq/python-treq.hash b/package/python-treq/python-treq.hash index 288279cbd87..aecf71aad89 100644 --- a/package/python-treq/python-treq.hash +++ b/package/python-treq/python-treq.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/treq/json -md5 b75f6c89fd481989a9cfdec8d61a6d84 treq-20.3.0.tar.gz -sha256 a72d7587d6f81c7a32620b00175825b4334bafbde73d37098d139ac7b11dca98 treq-20.3.0.tar.gz +md5 43892086d556e7596392134f1e10bdef treq-22.2.0.tar.gz +sha256 df757e3f141fc782ede076a604521194ffcb40fa2645cf48e5a37060307f52ec treq-22.2.0.tar.gz # Locally computed sha256 checksums sha256 7cc1b65e1937b1cc07052bb864ec96d8e5fd413400c0842e5b89a8201a600293 LICENSE diff --git a/package/python-treq/python-treq.mk b/package/python-treq/python-treq.mk index 320f57b6f26..57dc50ee744 100644 --- a/package/python-treq/python-treq.mk +++ b/package/python-treq/python-treq.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TREQ_VERSION = 20.3.0 +PYTHON_TREQ_VERSION = 22.2.0 PYTHON_TREQ_SOURCE = treq-$(PYTHON_TREQ_VERSION).tar.gz -PYTHON_TREQ_SITE = https://files.pythonhosted.org/packages/98/09/25064d7224efde9fd51e8865353d516c53306e476eab27ab21fb258cf7d4 +PYTHON_TREQ_SITE = https://files.pythonhosted.org/packages/cd/c8/b68ab17d994133baf6edbcb5551ba81e1494bdc6d5e21a9d4f3bc4315140 PYTHON_TREQ_LICENSE = MIT PYTHON_TREQ_LICENSE_FILES = LICENSE PYTHON_TREQ_SETUP_TYPE = setuptools diff --git a/package/python-trio-websocket/Config.in b/package/python-trio-websocket/Config.in new file mode 100644 index 00000000000..7d35fd02968 --- /dev/null +++ b/package/python-trio-websocket/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_PYTHON_TRIO_WEBSOCKET + bool "python-trio-websocket" + select BR2_PACKAGE_PYTHON_ASYNC_GENERATOR # runtime + select BR2_PACKAGE_PYTHON_TRIO # runtime + select BR2_PACKAGE_PYTHON_WSPROTO # runtime + help + WebSocket library for Trio. + + https://github.com/HyperionGray/trio-websocket diff --git a/package/python-trio-websocket/python-trio-websocket.hash b/package/python-trio-websocket/python-trio-websocket.hash new file mode 100644 index 00000000000..3e6e832d900 --- /dev/null +++ b/package/python-trio-websocket/python-trio-websocket.hash @@ -0,0 +1,3 @@ +# md5, sha256 from https://pypi.org/pypi/trio-websocket/json +md5 37b141910bdafa3c9b6731aa16646acc trio-websocket-0.9.2.tar.gz +sha256 a3d34de8fac26023eee701ed1e7bf4da9a8326b61a62934ec9e53b64970fd8fe trio-websocket-0.9.2.tar.gz diff --git a/package/python-trio-websocket/python-trio-websocket.mk b/package/python-trio-websocket/python-trio-websocket.mk new file mode 100644 index 00000000000..4522b87c9c2 --- /dev/null +++ b/package/python-trio-websocket/python-trio-websocket.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# python-trio-websocket +# +################################################################################ + +PYTHON_TRIO_WEBSOCKET_VERSION = 0.9.2 +PYTHON_TRIO_WEBSOCKET_SOURCE = trio-websocket-$(PYTHON_TRIO_WEBSOCKET_VERSION).tar.gz +PYTHON_TRIO_WEBSOCKET_SITE = https://files.pythonhosted.org/packages/75/91/44a0a016025794ba9fef530a6fbe59987153e2cbea7e11fe2f3d8c618740 +PYTHON_TRIO_WEBSOCKET_SETUP_TYPE = setuptools +PYTHON_TRIO_WEBSOCKET_LICENSE = MIT + +$(eval $(python-package)) diff --git a/package/python-trio/Config.in b/package/python-trio/Config.in new file mode 100644 index 00000000000..0aa53c90cae --- /dev/null +++ b/package/python-trio/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_PYTHON_TRIO + bool "python-trio" + select BR2_PACKAGE_PYTHON_ASYNC_GENERATOR # runtime + select BR2_PACKAGE_PYTHON_ATTRS # runtime + select BR2_PACKAGE_PYTHON_IDNA # runtime + select BR2_PACKAGE_PYTHON_OUTCOME # runtime + select BR2_PACKAGE_PYTHON_SNIFFIO # runtime + select BR2_PACKAGE_PYTHON_SORTEDCONTAINERS # runtime + help + A friendly Python library for async concurrency and I/O. + + https://github.com/python-trio/trio diff --git a/package/python-trio/python-trio.hash b/package/python-trio/python-trio.hash new file mode 100644 index 00000000000..487194662ed --- /dev/null +++ b/package/python-trio/python-trio.hash @@ -0,0 +1,7 @@ +# md5, sha256 from https://pypi.org/pypi/trio/json +md5 f7dbfa6a8722065f09da188641d8ed93 trio-0.22.0.tar.gz +sha256 ce68f1c5400a47b137c5a4de72c7c901bd4e7a24fbdebfe9b41de8c6c04eaacf trio-0.22.0.tar.gz +# Locally computed sha256 checksums +sha256 418d025e1284311f2690263e6efa6bf51585e5741818ece63e5862487e505bb9 LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.APACHE2 +sha256 faa301d72dcc023b432bd77dc08a773ca3449e5c27440b9d66eb46fb8500b430 LICENSE.MIT diff --git a/package/python-trio/python-trio.mk b/package/python-trio/python-trio.mk new file mode 100644 index 00000000000..80da203c159 --- /dev/null +++ b/package/python-trio/python-trio.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-trio +# +################################################################################ + +PYTHON_TRIO_VERSION = 0.22.0 +PYTHON_TRIO_SOURCE = trio-$(PYTHON_TRIO_VERSION).tar.gz +PYTHON_TRIO_SITE = https://files.pythonhosted.org/packages/0b/b8/1b81d2149c3e2c25900d40b8e6c8d3ca502a3cc844b90c962b0854aaf3f3 +PYTHON_TRIO_SETUP_TYPE = setuptools +PYTHON_TRIO_LICENSE = Apache-2.0 or MIT +PYTHON_TRIO_LICENSE_FILES = LICENSE LICENSE.APACHE2 LICENSE.MIT + +$(eval $(python-package)) diff --git a/package/python-twisted/Config.in b/package/python-twisted/Config.in index 8596025e9c8..1f3baf57e2e 100644 --- a/package/python-twisted/Config.in +++ b/package/python-twisted/Config.in @@ -29,4 +29,16 @@ config BR2_PACKAGE_PYTHON_TWISTED_TLS select BR2_PACKAGE_PYTHON_PYOPENSSL # runtime select BR2_PACKAGE_PYTHON_SERVICE_IDENTITY # runtime +config BR2_PACKAGE_PYTHON_TWISTED_CONCH + bool "Conch support" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography, python-bcrypt + select BR2_PACKAGE_PYTHON_APPDIRS # runtime + select BR2_PACKAGE_PYTHON_BCRYPT # runtime + select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime + select BR2_PACKAGE_PYTHON_PYASN1 # runtime + +config BR2_PACKAGE_PYTHON_TWISTED_SERIAL + bool "Serial support" + select BR2_PACKAGE_PYTHON_SERIAL # runtime + endif diff --git a/package/python-twisted/python-twisted.hash b/package/python-twisted/python-twisted.hash index 8f0935e4f09..36612ff5e72 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 c818cb1ab241dc249517442e5a0e0412 Twisted-22.1.0.tar.gz -sha256 b7971ec9805b0f80e1dcb1a3721d7bfad636d5f909de687430ce373979d67b61 Twisted-22.1.0.tar.gz +md5 c9a5dad0813512fabd9de502738c0bf8 Twisted-22.10.0.tar.gz +sha256 32acbd40a94f5f46e7b42c109bfae2b302250945561783a8b7a059048f2d4d31 Twisted-22.10.0.tar.gz # Locally computed sha256 sha256 686f6426a775450eb3afd00bc3a5c2621f305ddb9c8478ee9bf28a368ef2dece LICENSE diff --git a/package/python-twisted/python-twisted.mk b/package/python-twisted/python-twisted.mk index 8e867cfb58b..398baed2a87 100644 --- a/package/python-twisted/python-twisted.mk +++ b/package/python-twisted/python-twisted.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TWISTED_VERSION = 22.1.0 +PYTHON_TWISTED_VERSION = 22.10.0 PYTHON_TWISTED_SOURCE = Twisted-$(PYTHON_TWISTED_VERSION).tar.gz -PYTHON_TWISTED_SITE = https://files.pythonhosted.org/packages/77/b8/8108806ebf2b33654989fd1511281dc94a49fa7e03326d84fe5498ecfae4 +PYTHON_TWISTED_SITE = https://files.pythonhosted.org/packages/b2/ce/cbb56597127b1d51905b0cddcc3f314cc769769efc5e9a8a67f4617f7bca PYTHON_TWISTED_SETUP_TYPE = setuptools PYTHON_TWISTED_LICENSE = MIT PYTHON_TWISTED_LICENSE_FILES = LICENSE diff --git a/package/python-txaio/python-txaio.hash b/package/python-txaio/python-txaio.hash index 5e05f02d3ad..f06c14b21f9 100644 --- a/package/python-txaio/python-txaio.hash +++ b/package/python-txaio/python-txaio.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/txaio/json -md5 7e80b80ed7797245a5eef803043bdede txaio-21.2.1.tar.gz -sha256 7d6f89745680233f1c4db9ddb748df5e88d2a7a37962be174c0fd04c8dba1dc8 txaio-21.2.1.tar.gz +md5 9b692af4c4fce73cadd36374c138936b txaio-22.2.1.tar.gz +sha256 2e4582b70f04b2345908254684a984206c0d9b50e3074a24a4c55aba21d24d01 txaio-22.2.1.tar.gz # Locally computed sha256 checksums sha256 0387eefce570453daaa60633f28676003731eeca28b2d0a0071c628e3a0004ef LICENSE diff --git a/package/python-txaio/python-txaio.mk b/package/python-txaio/python-txaio.mk index 750d9e3d3da..1a8a8889630 100644 --- a/package/python-txaio/python-txaio.mk +++ b/package/python-txaio/python-txaio.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TXAIO_VERSION = 21.2.1 +PYTHON_TXAIO_VERSION = 22.2.1 PYTHON_TXAIO_SOURCE = txaio-$(PYTHON_TXAIO_VERSION).tar.gz -PYTHON_TXAIO_SITE = https://files.pythonhosted.org/packages/c5/39/2e715062283f8443d8ceeea32276db71741664d78d43c3edd3675498e926 +PYTHON_TXAIO_SITE = https://files.pythonhosted.org/packages/6d/4b/28313388dfb2bdedb71b35b900459c56ba08ccb7ad2885487df037808c06 PYTHON_TXAIO_LICENSE = MIT PYTHON_TXAIO_LICENSE_FILES = LICENSE PYTHON_TXAIO_SETUP_TYPE = setuptools diff --git a/package/python-txdbus/Config.in b/package/python-txdbus/Config.in index f3ea4c78d6b..e299596611b 100644 --- a/package/python-txdbus/Config.in +++ b/package/python-txdbus/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_PYTHON_TXDBUS bool "python-txdbus" # python-twisted -> python-cryptography depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS - # python-twisted -> python-cryptography select BR2_PACKAGE_PYTHON_TWISTED # runtime select BR2_PACKAGE_PYTHON_SIX # runtime help diff --git a/package/python-txtorcon/python-txtorcon.hash b/package/python-txtorcon/python-txtorcon.hash index af542c7f2ed..9c8e3599ea1 100644 --- a/package/python-txtorcon/python-txtorcon.hash +++ b/package/python-txtorcon/python-txtorcon.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/txtorcon/json -md5 dbb53821a3ce3e921e09c5de4f722fdb txtorcon-21.1.0.tar.gz -sha256 aebf0b9ec6c69a029f6b61fd534e785692e28fdcd2fd003ce3cc132b9393b7d6 txtorcon-21.1.0.tar.gz +md5 17a84954a4ba13fa6ee443129bdc401a txtorcon-22.0.0.tar.gz +sha256 89a1b65e32a4b369d67e6c166387fbc468cc5d05227448d239a5e7e9718aa053 txtorcon-22.0.0.tar.gz # Locally computed sha256 checksums -sha256 3ada1c32ef38c23d96d7f4e8f4a226c527f51e0202883c7543b06f9cc5228a2b LICENSE +sha256 3ada1c32ef38c23d96d7f4e8f4a226c527f51e0202883c7543b06f9cc5228a2b LICENSE diff --git a/package/python-txtorcon/python-txtorcon.mk b/package/python-txtorcon/python-txtorcon.mk index acf586cb8c0..c17d5da0740 100644 --- a/package/python-txtorcon/python-txtorcon.mk +++ b/package/python-txtorcon/python-txtorcon.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TXTORCON_VERSION = 21.1.0 +PYTHON_TXTORCON_VERSION = 22.0.0 PYTHON_TXTORCON_SOURCE = txtorcon-$(PYTHON_TXTORCON_VERSION).tar.gz -PYTHON_TXTORCON_SITE = https://files.pythonhosted.org/packages/eb/43/2426009377cef519c53bdc8969590cb100e9fd745846859963c881c6d176 +PYTHON_TXTORCON_SITE = https://files.pythonhosted.org/packages/47/ca/7941660345c769637a97bdbaf25202460fbab35eead55c538fb1fe61b71e PYTHON_TXTORCON_SETUP_TYPE = setuptools PYTHON_TXTORCON_LICENSE = MIT PYTHON_TXTORCON_LICENSE_FILES = LICENSE diff --git a/package/python-typeguard/Config.in b/package/python-typeguard/Config.in new file mode 100644 index 00000000000..6fd83515704 --- /dev/null +++ b/package/python-typeguard/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_TYPEGUARD + bool "python-typeguard" + help + Run-time type checker for Python. + + https://github.com/agronholm/typeguard diff --git a/package/python-typeguard/python-typeguard.hash b/package/python-typeguard/python-typeguard.hash new file mode 100644 index 00000000000..76394bcb195 --- /dev/null +++ b/package/python-typeguard/python-typeguard.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/typeguard/json +md5 22d49971f62f3baa3525349b1e03723d typeguard-2.13.3.tar.gz +sha256 00edaa8da3a133674796cf5ea87d9f4b4c367d77476e185e80251cc13dfbb8c4 typeguard-2.13.3.tar.gz +# Locally computed sha256 checksums +sha256 6163f7987dfb38d6bc320ce2b70b2f02b862bc41126516d552ef1cd43247e758 LICENSE diff --git a/package/python-typeguard/python-typeguard.mk b/package/python-typeguard/python-typeguard.mk new file mode 100644 index 00000000000..8471f2e4fdc --- /dev/null +++ b/package/python-typeguard/python-typeguard.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-typeguard +# +################################################################################ + +PYTHON_TYPEGUARD_VERSION = 2.13.3 +PYTHON_TYPEGUARD_SOURCE = typeguard-$(PYTHON_TYPEGUARD_VERSION).tar.gz +PYTHON_TYPEGUARD_SITE = https://files.pythonhosted.org/packages/3a/38/c61bfcf62a7b572b5e9363a802ff92559cb427ee963048e1442e3aef7490 +PYTHON_TYPEGUARD_SETUP_TYPE = setuptools +PYTHON_TYPEGUARD_LICENSE = MIT +PYTHON_TYPEGUARD_LICENSE_FILES = LICENSE +PYTHON_TYPEGUARD_DEPENDENCIES = host-python-setuptools-scm + +$(eval $(python-package)) diff --git a/package/python-typing-extensions/python-typing-extensions.hash b/package/python-typing-extensions/python-typing-extensions.hash index abaac77d345..249bb63a42b 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 ed80ecc8eac5cb15840535ca54eb43f3 typing_extensions-3.10.0.2.tar.gz -sha256 49f75d16ff11f1cd258e1b988ccff82a3ca5570217d7ad8c5f48205dd99a677e typing_extensions-3.10.0.2.tar.gz +md5 5cfcb56ea6fc4972c3600c0030f4d136 typing_extensions-4.4.0.tar.gz +sha256 1511434bb92bf8dd198c12b1cc812e800d4181cfcb867674e0f8279cc93087aa typing_extensions-4.4.0.tar.gz # Locally computed sha256 checksums -sha256 ff17ce94e102024deb68773eb1cc74ca76da4e658f373531f0ac22d68a6bb1ad LICENSE +sha256 c7afb65e755707b9fb90487389a176d3ed3d0031d5131afde45c23715ff5e891 LICENSE diff --git a/package/python-typing-extensions/python-typing-extensions.mk b/package/python-typing-extensions/python-typing-extensions.mk index 668071e0250..fd7d0bd93af 100644 --- a/package/python-typing-extensions/python-typing-extensions.mk +++ b/package/python-typing-extensions/python-typing-extensions.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_TYPING_EXTENSIONS_VERSION = 3.10.0.2 +PYTHON_TYPING_EXTENSIONS_VERSION = 4.4.0 PYTHON_TYPING_EXTENSIONS_SOURCE = typing_extensions-$(PYTHON_TYPING_EXTENSIONS_VERSION).tar.gz -PYTHON_TYPING_EXTENSIONS_SITE = https://files.pythonhosted.org/packages/ed/12/c5079a15cf5c01d7f4252b473b00f7e68ee711be605b9f001528f0298b98 -PYTHON_TYPING_EXTENSIONS_SETUP_TYPE = setuptools +PYTHON_TYPING_EXTENSIONS_SITE = https://files.pythonhosted.org/packages/e3/a7/8f4e456ef0adac43f452efc2d0e4b242ab831297f1bac60ac815d37eb9cf +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-inspect/Config.in b/package/python-typing-inspect/Config.in new file mode 100644 index 00000000000..dda057a19c6 --- /dev/null +++ b/package/python-typing-inspect/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_TYPING_INSPECT + bool "python-typing-inspect" + select BR2_PACKAGE_PYTHON_MYPY_EXTENSIONS # runtime + help + Runtime inspection utilities for typing module. + + https://github.com/ilevkivskyi/typing_inspect diff --git a/package/python-typing-inspect/python-typing-inspect.hash b/package/python-typing-inspect/python-typing-inspect.hash new file mode 100644 index 00000000000..737373d609d --- /dev/null +++ b/package/python-typing-inspect/python-typing-inspect.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/typing-inspect/json +md5 d56c8277a55d0bf061275df1ea3785d5 typing_inspect-0.8.0.tar.gz +sha256 8b1ff0c400943b6145df8119c41c244ca8207f1f10c9c057aeed1560e4806e3d typing_inspect-0.8.0.tar.gz +# Locally computed sha256 checksums +sha256 f9d3567d00ca2337f769fb28c553cc590213ecefed4ed599110c10ded2ea0117 LICENSE diff --git a/package/python-typing-inspect/python-typing-inspect.mk b/package/python-typing-inspect/python-typing-inspect.mk new file mode 100644 index 00000000000..8573bb1c273 --- /dev/null +++ b/package/python-typing-inspect/python-typing-inspect.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-typing-inspect +# +################################################################################ + +PYTHON_TYPING_INSPECT_VERSION = 0.8.0 +PYTHON_TYPING_INSPECT_SOURCE = typing_inspect-$(PYTHON_TYPING_INSPECT_VERSION).tar.gz +PYTHON_TYPING_INSPECT_SITE = https://files.pythonhosted.org/packages/72/23/bed3ea644bcd77ffe9a7f591eb058c00739747e33ab94d80cc4319ddee8e +PYTHON_TYPING_INSPECT_SETUP_TYPE = setuptools +PYTHON_TYPING_INSPECT_LICENSE = MIT +PYTHON_TYPING_INSPECT_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/package/python-u-msgpack/python-u-msgpack.hash b/package/python-u-msgpack/python-u-msgpack.hash index 0891783985e..0ec23855339 100644 --- a/package/python-u-msgpack/python-u-msgpack.hash +++ b/package/python-u-msgpack/python-u-msgpack.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/u-msgpack-python/json -md5 8691cea6bc7b44bce6e2115260a54323 u-msgpack-python-2.7.1.tar.gz -sha256 b7e7d433cab77171a4c752875d91836f3040306bab5063fb6dbe11f64ea69551 u-msgpack-python-2.7.1.tar.gz +md5 6c4fbe9e1df1c1563ecc9e435b82fdcb u-msgpack-python-2.7.2.tar.gz +sha256 e86f7ac6aa0ef4c6c49f004b4fd435bce99c23e2dd5d73003f3f9816024c2bd8 u-msgpack-python-2.7.2.tar.gz # Locally computed sha256 checksums -sha256 268ae7b7efbf67cd7bc0a9efea844fcf448d03f9cc6b8c79e8fe311815985030 LICENSE +sha256 f938fe2d3b7b329005d4b2851f106fd4351ca55f0836335acbe52386312f7f31 LICENSE diff --git a/package/python-u-msgpack/python-u-msgpack.mk b/package/python-u-msgpack/python-u-msgpack.mk index e0a3b3f297e..372c5a8d457 100644 --- a/package/python-u-msgpack/python-u-msgpack.mk +++ b/package/python-u-msgpack/python-u-msgpack.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_U_MSGPACK_VERSION = 2.7.1 +PYTHON_U_MSGPACK_VERSION = 2.7.2 PYTHON_U_MSGPACK_SOURCE = u-msgpack-python-$(PYTHON_U_MSGPACK_VERSION).tar.gz -PYTHON_U_MSGPACK_SITE = https://files.pythonhosted.org/packages/62/94/a4f485b628310534d377b3e7cb6f85b8066dc823dbff0e4421fb4227fb7e +PYTHON_U_MSGPACK_SITE = https://files.pythonhosted.org/packages/44/a7/1cb4f059bbf72ea24364f9ba3ef682725af09969e29df988aa5437f0044e PYTHON_U_MSGPACK_SETUP_TYPE = setuptools PYTHON_U_MSGPACK_LICENSE = MIT PYTHON_U_MSGPACK_LICENSE_FILES = LICENSE diff --git a/package/python-uhid/Config.in b/package/python-uhid/Config.in new file mode 100644 index 00000000000..6fdff951445 --- /dev/null +++ b/package/python-uhid/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_UHID + bool "python-uhid" + help + Pure Python typed UHID wrapper. + + https://github.com/FFY00/python-uhid diff --git a/package/python-uhid/python-uhid.hash b/package/python-uhid/python-uhid.hash new file mode 100644 index 00000000000..3faf6d9f23a --- /dev/null +++ b/package/python-uhid/python-uhid.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/uhid/json +md5 1c62bbefe10923545bbdf42355d9be07 uhid-0.0.1.tar.gz +sha256 3c782489890dbf33621fb2c30d1ac81fbc1b3ef1911ae7d4c73907cdc0f59aab uhid-0.0.1.tar.gz +# Locally computed sha256 checksums +sha256 106a8f7c2c26bd2acc597c79a36a2fe3979f98a14dc14c6065b7dc9c58b27f33 LICENSE diff --git a/package/python-uhid/python-uhid.mk b/package/python-uhid/python-uhid.mk new file mode 100644 index 00000000000..215545b60f8 --- /dev/null +++ b/package/python-uhid/python-uhid.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# python-uhid +# +################################################################################ + +PYTHON_UHID_VERSION = 0.0.1 +PYTHON_UHID_SOURCE = uhid-$(PYTHON_UHID_VERSION).tar.gz +PYTHON_UHID_SITE = https://files.pythonhosted.org/packages/cb/44/6ebe9dceadc028507d16603e2bb542557a4c70c6032ef8ee507c3ce51283 +PYTHON_UHID_SETUP_TYPE = setuptools +PYTHON_UHID_LICENSE = MIT +PYTHON_UHID_LICENSE_FILES = LICENSE + +define PYTHON_UHID_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_INPUT) + $(call KCONFIG_ENABLE_OPT,CONFIG_HID) + $(call KCONFIG_ENABLE_OPT,CONFIG_UHID) +endef + +$(eval $(python-package)) diff --git a/package/python-ujson/0001-Add-support-for-aarch64_be-or1k-and-microblazebe.patch b/package/python-ujson/0001-Add-support-for-aarch64_be-or1k-and-microblazebe.patch deleted file mode 100644 index b43eb54dcd6..00000000000 --- a/package/python-ujson/0001-Add-support-for-aarch64_be-or1k-and-microblazebe.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 768a445f0c28311bf88685bf0bb990505c12fd4c Mon Sep 17 00:00:00 2001 -From: Florian Loitsch -Date: Sat, 8 Sep 2018 18:18:15 +0200 -Subject: [PATCH] Add support for aarch64_be, or1k and microblazebe. - -Fixes #73. - -[Retrieved from: -https://github.com/google/double-conversion/commit/768a445f0c28311bf88685bf0bb990505c12fd4c] -Signed-off-by: Fabrice Fontaine ---- - double-conversion/utils.h | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/deps/double-conversion/ouble-conversion/utils.h b/deps/double-conversion/double-conversion/utils.h -index 98a2a11..492bc97 100644 ---- a/deps/double-conversion/double-conversion/utils.h -+++ b/deps/double-conversion/double-conversion/utils.h -@@ -76,8 +76,9 @@ inline void abort_noreturn() { abort(); } - defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ - defined(__SH4__) || defined(__alpha__) || \ - defined(_MIPS_ARCH_MIPS32R2) || \ -- defined(__AARCH64EL__) || defined(__aarch64__) || \ -- defined(__riscv) -+ defined(__AARCH64EL__) || defined(__aarch64__) || defined(__AARCH64EB__) || \ -+ defined(__riscv) || \ -+ defined(__or1k__) - #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 - #elif defined(__mc68000__) || \ - defined(__pnacl__) || defined(__native_client__) diff --git a/package/python-ujson/0002-Add-support-of-ARC-architecture.patch b/package/python-ujson/0002-Add-support-of-ARC-architecture.patch deleted file mode 100644 index d38b24f5fc5..00000000000 --- a/package/python-ujson/0002-Add-support-of-ARC-architecture.patch +++ /dev/null @@ -1,36 +0,0 @@ -From eafa625a34fd5d8bec18eddfccbca55ce77b4849 Mon Sep 17 00:00:00 2001 -From: Alexey Brodkin -Date: Thu, 1 Nov 2018 17:36:17 +0200 -Subject: [PATCH] Add support of ARC architecture (#82) - -More info about ARC architecture is here: [1] & [2]. -We need ARC supported here for many things like: - - ICU (see [3]) - - Qt5 etc - -[1] https://www.synopsys.com/designware-ip/processor-solutions/arc-processors.html -[2] https://en.wikipedia.org/wiki/ARC_(processor) -[3] https://unicode-org.atlassian.net/browse/ICU-20155 - -Fixes #81 - -[Retrieved from: -https://github.com/google/double-conversion/commit/eafa625a34fd5d8bec18eddfccbca55ce77b4849] -Signed-off-by: Fabrice Fontaine ---- - double-conversion/utils.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/deps/double-conversion/double-conversion/utils.h b/deps/double-conversion/double-conversion/utils.h -index 41c5b02..2e1be0d 100644 ---- a/deps/double-conversion/double-conversion/utils.h -+++ b/deps/double-conversion/double-conversion/utils.h -@@ -94,7 +94,7 @@ int main(int argc, char** argv) { - defined(_MIPS_ARCH_MIPS32R2) || \ - defined(__AARCH64EL__) || defined(__aarch64__) || defined(__AARCH64EB__) || \ - defined(__riscv) || \ -- defined(__or1k__) -+ defined(__or1k__) || defined(__arc__) - #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 - #elif defined(__mc68000__) || \ - defined(__pnacl__) || defined(__native_client__) diff --git a/package/python-ujson/0003-Add-support-for-microblaze.patch b/package/python-ujson/0003-Add-support-for-microblaze.patch deleted file mode 100644 index 14fd52eb98f..00000000000 --- a/package/python-ujson/0003-Add-support-for-microblaze.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 5cc233e98b74c5c370de888198a2b35200d55468 Mon Sep 17 00:00:00 2001 -From: Florian Loitsch -Date: Sat, 12 Oct 2019 14:35:52 +0200 -Subject: [PATCH] Add support for microblaze. - -Really fixes #73. -[Retrieved (and backported) from: -https://github.com/google/double-conversion/commit/5cc233e98b74c5c370de888198a2b35200d55468] -Signed-off-by: Fabrice Fontaine ---- - Changelog | 4 ++++ - double-conversion/utils.h | 1 + - 2 files changed, 5 insertions(+) - -diff --git a/deps/idouble-conversion/double-conversion/utils.h b/deps/double-conversion/double-conversion/utils.h -index 1a71df0..221467f 100644 ---- a/deps/doyble-conversion/double-conversion/utils.h -+++ b/deps/double-conversion/double-conversion/utils.h -@@ -102,6 +102,7 @@ int main(int argc, char** argv) { - defined(__AARCH64EL__) || defined(__aarch64__) || defined(__AARCH64EB__) || \ - defined(__riscv) || \ -- defined(__or1k__) || defined(__arc__) -+ defined(__or1k__) || defined(__arc__) || \ -+ defined(__microblaze__) - #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 - #elif defined(__mc68000__) - #undef DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS diff --git a/package/python-ujson/0004-Pseiderer-add-nios2-and-xtensa-001.patch b/package/python-ujson/0004-Pseiderer-add-nios2-and-xtensa-001.patch deleted file mode 100644 index 8648f93c1a9..00000000000 --- a/package/python-ujson/0004-Pseiderer-add-nios2-and-xtensa-001.patch +++ /dev/null @@ -1,95 +0,0 @@ -From a54561be5588ac9b16d3c20760b9b554168bb8aa Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 31 Oct 2019 21:26:27 +0100 -Subject: [PATCH] Pseiderer/add nios2 and xtensa 001 (#119) - -* double-conversion: enable for nios2 - -Nios2 supports double conversion, tested using qemu: - -./main || echo "correct" -correct -uname -a -Linux buildroot 4.19.16 #4 Sat Aug 3 14:46:48 CEST 2019 nios2 GNU/Linux - -Solves build error - -In file included from double-conversion.h:42:0, - from number_decimalquantity.cpp:19: -double-conversion-utils.h:119:2: error: #error Target architecture was not detected as supported by Double-Conversion. - #error Target architecture was not detected as supported by Double-Conversion. - -detected by buildroot autobuilders: -http://autobuild.buildroot.net/results/91e/91eaec34708d91f8a05af189243be0b7cabce31b/ - -Patch sent upstream: https://github.com/unicode-org/icu/pull/725 -Bug report: https://unicode-org.atlassian.net/browse/ICU-20751 - -[Bernd: Fixed path] -Signed-off-by: Bernd Kuhls -[Added Changelog entry] -Signed-off-by: Peter Seiderer - -* double-conversion: enable for xtensa - -Signed-off-by: Peter Seiderer - -[Retrieved (dand backported) from: -https://github.com/google/double-conversion/commit/a54561be5588ac9b16d3c20760b9b554168bb8aa] -Signed-off-by: Fabrice Fontaine ---- -Note: - -Double-conversion tested with: - - $ cat div.c -double Div_double(double x, double y) { return x / y; } - - $ cat main.c -double Div_double(double x, double y); - -int main(int argc, char** argv) { - double result = Div_double(89255.0, 1e22); - if (result == 89255e-22) { - printf("correct result %e\n", result); - return 1; - } else { - printf("wrong result %e\n", result); - return 0; - } -} - -Tested for xtensa (using qemu_xtensa_lx60_defconfig plus BR2_PACKAGE_HOST_QEMU_LINUX_USER_MODE): - - $ ./host/bin/xtensa-buildroot-linux-uclibc-gcc -c div.c - $ ./host/bin/xtensa-buildroot-linux-uclibc-gcc -c main.c - $ ./host/bin/xtensa-buildroot-linux-uclibc-gcc -o main main.o div.o - - $ ./host/bin/qemu-xtensa -L staging main -correct result 8.925500e-18 ---- - Changelog | 4 ++++ - double-conversion/utils.h | 3 ++- - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/deps/double-conversion/double-conversion/utils.h b/deps/double-conversion/double-conversion/utils.h -index 221467f..98ec28b 100644 ---- a/deps/double-conversion/double-conversion/utils.h -+++ b/deps/double-conversion/double-conversion/utils.h -@@ -94,6 +94,7 @@ int main(int argc, char** argv) { - defined(__ARMEL__) || defined(__avr32__) || defined(_M_ARM) || defined(_M_ARM64) || \ - defined(__hppa__) || defined(__ia64__) || \ - defined(__mips__) || \ -+ defined(__nios2__) || \ - defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || \ - defined(_POWER) || defined(_ARCH_PPC) || defined(_ARCH_PPC64) || \ - defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ -@@ -102,7 +103,7 @@ int main(int argc, char** argv) { - defined(__AARCH64EL__) || defined(__aarch64__) || defined(__AARCH64EB__) || \ - defined(__riscv) || defined(__e2k__) || \ - defined(__or1k__) || defined(__arc__) || \ -- defined(__microblaze__) -+ defined(__microblaze__) || defined(__XTENSA__) - #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 - #elif defined(__mc68000__) - #undef DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS diff --git a/package/python-ujson/Config.in b/package/python-ujson/Config.in index 81d1bc457c0..31b4d484d83 100644 --- a/package/python-ujson/Config.in +++ b/package/python-ujson/Config.in @@ -1,7 +1,12 @@ config BR2_PACKAGE_PYTHON_UJSON bool "python-ujson" + depends on BR2_INSTALL_LIBSTDCPP # double-conversion + select BR2_PACKAGE_DOUBLE_CONVERSION help UltraJSON is an ultra fast JSON encoder and decoder written in pure C with bindings for Python 3. https://pypi.python.org/pypi/ujson + +comment "python-ujson needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-ujson/python-ujson.hash b/package/python-ujson/python-ujson.hash index fc897c381bd..759cafc2501 100644 --- a/package/python-ujson/python-ujson.hash +++ b/package/python-ujson/python-ujson.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/ujson/json -md5 9a90e2e9f1d465c2121b8d10f837f53a ujson-4.2.0.tar.gz -sha256 fffe509f556861c7343c6cba57ed05fe7bcf4b48a934a5b946ccb45428cf8883 ujson-4.2.0.tar.gz +md5 f93bd7aa33e3e6ed41c9e3782abe7b48 ujson-5.7.0.tar.gz +sha256 e788e5d5dcae8f6118ac9b45d0b891a0d55f7ac480eddcb7f07263f2bcf37b23 ujson-5.7.0.tar.gz # Locally computed sha256 checksums sha256 6a00a8f8b4050303368b694147bde1aed9c96bdff869c181dbbf3ccb784a1501 LICENSE.txt diff --git a/package/python-ujson/python-ujson.mk b/package/python-ujson/python-ujson.mk index 68781c61709..3afd33cb5a0 100644 --- a/package/python-ujson/python-ujson.mk +++ b/package/python-ujson/python-ujson.mk @@ -4,12 +4,16 @@ # ################################################################################ -PYTHON_UJSON_VERSION = 4.2.0 +PYTHON_UJSON_VERSION = 5.7.0 PYTHON_UJSON_SOURCE = ujson-$(PYTHON_UJSON_VERSION).tar.gz -PYTHON_UJSON_SITE = https://files.pythonhosted.org/packages/df/69/e8f615e1a779e2d2d23d29d56dc55bbb1db2a828f0ef36d10bc697d63968 +PYTHON_UJSON_SITE = https://files.pythonhosted.org/packages/43/1a/b0a027144aa5c8f4ea654f4afdd634578b450807bb70b9f8bad00d6f6d3c PYTHON_UJSON_SETUP_TYPE = setuptools PYTHON_UJSON_LICENSE = BSD-3-Clause PYTHON_UJSON_LICENSE_FILES = LICENSE.txt -PYTHON_UJSON_DEPENDENCIES = host-python-setuptools-scm +PYTHON_UJSON_DEPENDENCIES = host-python-setuptools-scm double-conversion +PYTHON_UJSON_ENV = \ + UJSON_BUILD_DC_INCLUDES="$(STAGING_DIR)/usr/include/double-conversion" \ + UJSON_BUILD_DC_LIBS="-ldouble-conversion" \ + UJSON_BUILD_NO_STRIP=1 $(eval $(python-package)) diff --git a/package/python-unittest-xml-reporting/python-unittest-xml-reporting.hash b/package/python-unittest-xml-reporting/python-unittest-xml-reporting.hash index 9db3a09d38e..674a533e6a3 100644 --- a/package/python-unittest-xml-reporting/python-unittest-xml-reporting.hash +++ b/package/python-unittest-xml-reporting/python-unittest-xml-reporting.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/unittest-xml-reporting/json -md5 474cd89f9609828ef6039a0f00afd9db unittest-xml-reporting-3.0.4.tar.gz -sha256 984cebba69e889401bfe3adb9088ca376b3a1f923f0590d005126c1bffd1a695 unittest-xml-reporting-3.0.4.tar.gz -# Locally calculated +md5 f12aeab63ff44e295526e103313d66c8 unittest-xml-reporting-3.2.0.tar.gz +sha256 edd8d3170b40c3a81b8cf910f46c6a304ae2847ec01036d02e9c0f9b85762d28 unittest-xml-reporting-3.2.0.tar.gz +# Locally computed sha256 checksums sha256 0596648105bee470f9cafd62753b931efe52392096439d88e2564cf7d7cf0e68 LICENSE diff --git a/package/python-unittest-xml-reporting/python-unittest-xml-reporting.mk b/package/python-unittest-xml-reporting/python-unittest-xml-reporting.mk index 5744c50a7cd..05bbed79a84 100644 --- a/package/python-unittest-xml-reporting/python-unittest-xml-reporting.mk +++ b/package/python-unittest-xml-reporting/python-unittest-xml-reporting.mk @@ -4,20 +4,11 @@ # ################################################################################ -PYTHON_UNITTEST_XML_REPORTING_VERSION = 3.0.4 +PYTHON_UNITTEST_XML_REPORTING_VERSION = 3.2.0 PYTHON_UNITTEST_XML_REPORTING_SOURCE = unittest-xml-reporting-$(PYTHON_UNITTEST_XML_REPORTING_VERSION).tar.gz -PYTHON_UNITTEST_XML_REPORTING_SITE = https://files.pythonhosted.org/packages/bc/09/677086169c8e302b614de7d4a97c45c4446a382f31cc010fb31177258508 -# License file missing in Pypi tarball, download separately. Issue -# reported at -# https://github.com/xmlrunner/unittest-xml-reporting/issues/259 -PYTHON_UNITTEST_XML_REPORTING_EXTRA_DOWNLOADS = https://raw.githubusercontent.com/xmlrunner/unittest-xml-reporting/$(PYTHON_UNITTEST_XML_REPORTING_VERSION)/LICENSE +PYTHON_UNITTEST_XML_REPORTING_SITE = https://files.pythonhosted.org/packages/ed/40/3bf1afc96e93c7322520981ac4593cbb29daa21b48d32746f05ab5563dca PYTHON_UNITTEST_XML_REPORTING_SETUP_TYPE = setuptools PYTHON_UNITTEST_XML_REPORTING_LICENSE = BSD-2-Clause PYTHON_UNITTEST_XML_REPORTING_LICENSE_FILES = LICENSE -define PYTHON_UNITTEST_XML_REPORTING_ADD_LICENSE_FILE - $(INSTALL) -D -m 0644 $(PYTHON_UNITTEST_XML_REPORTING_DL_DIR)/LICENSE $(@D)/LICENSE -endef -PYTHON_UNITTEST_XML_REPORTING_POST_EXTRACT_HOOKS += PYTHON_UNITTEST_XML_REPORTING_ADD_LICENSE_FILE - $(eval $(python-package)) diff --git a/package/python-urllib3/python-urllib3.hash b/package/python-urllib3/python-urllib3.hash index 2415f241998..963967332e3 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 50831ca7b19bbe2781abb0a4c2d51760 urllib3-1.26.8.tar.gz -sha256 0e7c33d9a63e7ddfcb86780aac87befc2fbddf46c58dbb487e0855f7ceec283c urllib3-1.26.8.tar.gz +md5 38f7d1589aa9720101316d07fcbd05c8 urllib3-1.26.13.tar.gz +sha256 c083dd0dce68dbfbe1129d5271cb90f9447dea7d52097c6e0126120c521ddea8 urllib3-1.26.13.tar.gz # Locally computed sha256 checksums sha256 c37bf186e27cf9dbe9619e55edfe3cea7b30091ceb3da63c7dacbe0e6d77907b LICENSE.txt diff --git a/package/python-urllib3/python-urllib3.mk b/package/python-urllib3/python-urllib3.mk index d94c97b4ed9..5868927440b 100644 --- a/package/python-urllib3/python-urllib3.mk +++ b/package/python-urllib3/python-urllib3.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_URLLIB3_VERSION = 1.26.8 +PYTHON_URLLIB3_VERSION = 1.26.13 PYTHON_URLLIB3_SOURCE = urllib3-$(PYTHON_URLLIB3_VERSION).tar.gz -PYTHON_URLLIB3_SITE = https://files.pythonhosted.org/packages/b0/b1/7bbf5181f8e3258efae31702f5eab87d8a74a72a0aa78bc8c08c1466e243 +PYTHON_URLLIB3_SITE = https://files.pythonhosted.org/packages/c2/51/32da03cf19d17d46cce5c731967bf58de9bd71db3a379932f53b094deda4 PYTHON_URLLIB3_LICENSE = MIT PYTHON_URLLIB3_LICENSE_FILES = LICENSE.txt PYTHON_URLLIB3_CPE_ID_VENDOR = python diff --git a/package/python-uvloop/python-uvloop.hash b/package/python-uvloop/python-uvloop.hash index 39951b50bb7..69834d52431 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 79f9a7f3cfe154daf0aade23555dc9d4 uvloop-0.16.0.tar.gz -sha256 f74bc20c7b67d1c27c72601c78cf95be99d5c2cdd4514502b4f3eb0933ff1228 uvloop-0.16.0.tar.gz +md5 bc5e841a1c3f6e8935eeaf9d82b5ee29 uvloop-0.17.0.tar.gz +sha256 0ddf6baf9cf11a1a22c71487f39f15b2cf78eb5bde7e5b45fbb99e8a9d91b9e1 uvloop-0.17.0.tar.gz # Locally computed sha256 checksums -sha256 2fdc436a67077941295c58647f521fbef8f50e46db0970552fa1a4dd8ae261c6 LICENSE-APACHE -sha256 9185f3c77e9f6ef8859a6ba4c94128ac1329876be3e813aad32d7645e51ae409 LICENSE-MIT +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 cfd9b1a66f3..147062cf7b1 100644 --- a/package/python-uvloop/python-uvloop.mk +++ b/package/python-uvloop/python-uvloop.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_UVLOOP_VERSION = 0.16.0 +PYTHON_UVLOOP_VERSION = 0.17.0 PYTHON_UVLOOP_SOURCE = uvloop-$(PYTHON_UVLOOP_VERSION).tar.gz -PYTHON_UVLOOP_SITE = https://files.pythonhosted.org/packages/ab/d9/22bbffa8f8d7e075ccdb29e8134107adfb4710feb10039f9d357db8b589c +PYTHON_UVLOOP_SITE = https://files.pythonhosted.org/packages/ba/86/6dda1760481abf244cbd3908b79a4520d757040ca9ec37a79fc0fd01e2a0 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/Config.in b/package/python-validators/Config.in index e7003699107..8a2ddb49fba 100644 --- a/package/python-validators/Config.in +++ b/package/python-validators/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_VALIDATORS bool "python-validators" - select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_DECORATOR # runtime help Python Data Validation for Humans. diff --git a/package/python-validators/python-validators.hash b/package/python-validators/python-validators.hash index 2845a2e8c05..4f4e1c21f81 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 2f0446f2a15aa694be0cfd8728eb4444 validators-0.15.0.tar.gz -sha256 31e8bb01b48b48940a021b8a9576b840f98fa06b91762ef921d02cb96d38727a validators-0.15.0.tar.gz +md5 f03b5acb91079450bae664726ae01948 validators-0.20.0.tar.gz +sha256 24148ce4e64100a2d5e267233e23e7afeb55316b47d30faae7eb6e7292bc226a validators-0.20.0.tar.gz # Locally computed sha256 checksums sha256 a7fd9d761c7ca1c6508b9baf030f6e21f5752d1caea3e49a270634aa9ef01e6f LICENSE diff --git a/package/python-validators/python-validators.mk b/package/python-validators/python-validators.mk index 5bed051911c..731aca11f63 100644 --- a/package/python-validators/python-validators.mk +++ b/package/python-validators/python-validators.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_VALIDATORS_VERSION = 0.15.0 +PYTHON_VALIDATORS_VERSION = 0.20.0 PYTHON_VALIDATORS_SOURCE = validators-$(PYTHON_VALIDATORS_VERSION).tar.gz -PYTHON_VALIDATORS_SITE = https://files.pythonhosted.org/packages/c4/4a/4f9c892f9a9f08ee5f99c32bbd4297499099c2c5f7eff8c617a57d31a7d8 +PYTHON_VALIDATORS_SITE = https://files.pythonhosted.org/packages/95/14/ed0af6865d378cfc3c504aed0d278a890cbefb2f1934bf2dbe92ecf9d6b1 PYTHON_VALIDATORS_SETUP_TYPE = setuptools PYTHON_VALIDATORS_LICENSE = MIT PYTHON_VALIDATORS_LICENSE_FILES = LICENSE diff --git a/package/python-vcversioner/python-vcversioner.hash b/package/python-vcversioner/python-vcversioner.hash index 58573a18b33..1f982cd4554 100644 --- a/package/python-vcversioner/python-vcversioner.hash +++ b/package/python-vcversioner/python-vcversioner.hash @@ -1,3 +1,3 @@ # md5 from https://pypi.python.org/pypi/vcversioner/json, sha256 locally computed -md5 aab6ef5e0cf8614a1b1140ed5b7f107d vcversioner-2.16.0.0.tar.gz -sha256 dae60c17a479781f44a4010701833f1829140b1eeccd258762a74974aa06e19b vcversioner-2.16.0.0.tar.gz +md5 aab6ef5e0cf8614a1b1140ed5b7f107d vcversioner-2.16.0.0.tar.gz +sha256 dae60c17a479781f44a4010701833f1829140b1eeccd258762a74974aa06e19b vcversioner-2.16.0.0.tar.gz diff --git a/package/python-visitor/python-visitor.hash b/package/python-visitor/python-visitor.hash index 6e0cffbd951..a6f0ec710ed 100644 --- a/package/python-visitor/python-visitor.hash +++ b/package/python-visitor/python-visitor.hash @@ -1,4 +1,4 @@ # md5 from https://pypi.python.org/pypi/visitor/json, sha256 locally computed -md5 94a024ed0ec1b02b4497c15267d319ca visitor-0.1.3.tar.gz -sha256 2c737903b2b6864ebc6167eef7cf3b997126f1aa94bdf590f90f1436d23e480a visitor-0.1.3.tar.gz -sha256 184d1ebb65da97ada36447f3c028f2fd4890b874f17b18c023ce200dd96639af LICENSE +md5 94a024ed0ec1b02b4497c15267d319ca visitor-0.1.3.tar.gz +sha256 2c737903b2b6864ebc6167eef7cf3b997126f1aa94bdf590f90f1436d23e480a visitor-0.1.3.tar.gz +sha256 184d1ebb65da97ada36447f3c028f2fd4890b874f17b18c023ce200dd96639af LICENSE diff --git a/package/python-watchdog/python-watchdog.hash b/package/python-watchdog/python-watchdog.hash index 3b633f9156c..0653787110c 100644 --- a/package/python-watchdog/python-watchdog.hash +++ b/package/python-watchdog/python-watchdog.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/watchdog/json -md5 6aac660b0f3358c63658806a0579b832 watchdog-2.1.6.tar.gz -sha256 a36e75df6c767cbf46f61a91c70b3ba71811dfa0aca4a324d9407a06a8b7a2e7 watchdog-2.1.6.tar.gz +md5 04cda210c7ffd04582d2466328ee7368 watchdog-2.2.1.tar.gz +sha256 cdcc23c9528601a8a293eb4369cbd14f6b4f34f07ae8769421252e9c22718b6f watchdog-2.2.1.tar.gz # Locally computed sha256 checksums sha256 02c8760f988a76e92a9d6cb525456a86f7b0fd1953870dd491de5955cb974d41 COPYING sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/python-watchdog/python-watchdog.mk b/package/python-watchdog/python-watchdog.mk index 2dafef97e16..9c058e38ad4 100644 --- a/package/python-watchdog/python-watchdog.mk +++ b/package/python-watchdog/python-watchdog.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WATCHDOG_VERSION = 2.1.6 +PYTHON_WATCHDOG_VERSION = 2.2.1 PYTHON_WATCHDOG_SOURCE = watchdog-$(PYTHON_WATCHDOG_VERSION).tar.gz -PYTHON_WATCHDOG_SITE = https://files.pythonhosted.org/packages/e8/a8/fc4edd7d768361b00ea850e5310211d157df6b5a1db6148dd434e787d898 +PYTHON_WATCHDOG_SITE = https://files.pythonhosted.org/packages/11/6f/0396d373e039b89c60e23a1a9025edc6dd203121fe0af7d1427e85d5ec98 PYTHON_WATCHDOG_SETUP_TYPE = setuptools PYTHON_WATCHDOG_LICENSE = Apache-2.0 PYTHON_WATCHDOG_LICENSE_FILES = LICENSE COPYING diff --git a/package/python-wcwidth/python-wcwidth.hash b/package/python-wcwidth/python-wcwidth.hash index ed1d2cd61f8..216182c2ed0 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 b32584cd6084b4a8c81df13a2a6b4351 wcwidth-0.1.9.tar.gz -sha256 ee73862862a156bf77ff92b09034fc4825dd3af9cf81bc5b360668d425f3c5f1 wcwidth-0.1.9.tar.gz -# Locally computed -sha256 0eddcc52cd3ef5d30798b8d43a14d3f0f1dcf0a6e4c1d0f2e177c44ce85bb69c LICENSE.txt +md5 a07a75f99d316e14838ac760c831ea37 wcwidth-0.2.5.tar.gz +sha256 c4d647b99872929fdb7bdcaa4fbe7f01413ed3d98077df798530e5b04f116c83 wcwidth-0.2.5.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 ccbd0e99ca1..a170a8e395d 100644 --- a/package/python-wcwidth/python-wcwidth.mk +++ b/package/python-wcwidth/python-wcwidth.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_WCWIDTH_VERSION = 0.1.9 +PYTHON_WCWIDTH_VERSION = 0.2.5 PYTHON_WCWIDTH_SOURCE = wcwidth-$(PYTHON_WCWIDTH_VERSION).tar.gz -PYTHON_WCWIDTH_SITE = https://pypi.python.org/packages/25/9d/0acbed6e4a4be4fc99148f275488580968f44ddb5e69b8ceb53fc9df55a0 +PYTHON_WCWIDTH_SITE = https://files.pythonhosted.org/packages/89/38/459b727c381504f361832b9e5ace19966de1a235d73cdbdea91c771a1155 PYTHON_WCWIDTH_SETUP_TYPE = setuptools PYTHON_WCWIDTH_LICENSE = MIT -PYTHON_WCWIDTH_LICENSE_FILES = LICENSE.txt +PYTHON_WCWIDTH_LICENSE_FILES = LICENSE $(eval $(python-package)) diff --git a/package/python-weasyprint/Config.in b/package/python-weasyprint/Config.in index 4a7e5a513d5..18d72d742eb 100644 --- a/package/python-weasyprint/Config.in +++ b/package/python-weasyprint/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_WEASYPRINT bool "python-weasyprint" + depends on BR2_INSTALL_LIBSTDCPP # python-brotli, python-zopfli select BR2_PACKAGE_PYTHON_BROTLI # runtime select BR2_PACKAGE_PYTHON_CFFI # runtime select BR2_PACKAGE_PYTHON_CSSSELECT2 # runtime @@ -14,3 +15,6 @@ config BR2_PACKAGE_PYTHON_WEASYPRINT The Awesome Document Factory. https://www.courtbouillon.org/weasyprint + +comment "python-weasyprint needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-weasyprint/python-weasyprint.hash b/package/python-weasyprint/python-weasyprint.hash index 8d231c50ba7..d6026cf034a 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 a90fd2d5a581a0e218943af3a8b64a31 weasyprint-53.4.tar.gz -sha256 10ccb17d55c73096bdf1edd3efe58cb855b07e4c307d9bad4ebc9a3f13ff4580 weasyprint-53.4.tar.gz +md5 497030cecafffca06bae2b161846b461 weasyprint-57.2.tar.gz +sha256 b8e9ef2dcbcfbc82e99215acfd68f947b2b5f1999b5b156db75fabe380ba7e9a weasyprint-57.2.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 0a944825bb4..27b07226d9f 100644 --- a/package/python-weasyprint/python-weasyprint.mk +++ b/package/python-weasyprint/python-weasyprint.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_WEASYPRINT_VERSION = 53.4 +PYTHON_WEASYPRINT_VERSION = 57.2 PYTHON_WEASYPRINT_SOURCE = weasyprint-$(PYTHON_WEASYPRINT_VERSION).tar.gz -PYTHON_WEASYPRINT_SITE = https://files.pythonhosted.org/packages/72/25/336e274fde0e48cf9979d44667411fbcfa55d323fd7672068807b6de2f89 -PYTHON_WEASYPRINT_SETUP_TYPE = distutils +PYTHON_WEASYPRINT_SITE = https://files.pythonhosted.org/packages/b1/88/335dd6cb71a9d58584c975bf1db0ab9a3a9f15f9bffef1cbfac0fb1ee72e +PYTHON_WEASYPRINT_SETUP_TYPE = flit PYTHON_WEASYPRINT_LICENSE = BSD-3-Clause PYTHON_WEASYPRINT_LICENSE_FILES = LICENSE diff --git a/package/python-web2py/python-web2py.hash b/package/python-web2py/python-web2py.hash index 2ef52b0a5ca..c0ce0cc3520 100644 --- a/package/python-web2py/python-web2py.hash +++ b/package/python-web2py/python-web2py.hash @@ -1,3 +1,3 @@ # sha256 locally computed -sha256 44556376468139de874e9c29c9ef56e60ecd5f7536c7bee46d74b1f9d4178825 python-web2py-2.21.1.tar.gz -sha256 2aae96826184a492bc799add49aed7b29036e7aba2d2294fb65053bd30fe55fe LICENSE +sha256 f4066d76290b333bc1bb1cf4c23b612eebde712b7112e90a72e7609a14690d2c python-web2py-2.23.1.tar.gz +sha256 2aae96826184a492bc799add49aed7b29036e7aba2d2294fb65053bd30fe55fe LICENSE diff --git a/package/python-web2py/python-web2py.mk b/package/python-web2py/python-web2py.mk index 3e453282a95..2a666cae174 100644 --- a/package/python-web2py/python-web2py.mk +++ b/package/python-web2py/python-web2py.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_WEB2PY_VERSION = 2.21.1 +PYTHON_WEB2PY_VERSION = 2.23.1 PYTHON_WEB2PY_SITE = $(call github,web2py,web2py,v$(PYTHON_WEB2PY_VERSION)) PYTHON_WEB2PY_LICENSE = LGPL-3.0 PYTHON_WEB2PY_LICENSE_FILES = LICENSE diff --git a/package/python-webargs/Config.in b/package/python-webargs/Config.in new file mode 100644 index 00000000000..f2332d3b707 --- /dev/null +++ b/package/python-webargs/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_PYTHON_WEBARGS + bool "python-webargs" + select BR2_PACKAGE_PYTHON_MARSHMALLOW # runtime + select BR2_PACKAGE_PYTHON_PACKAGING # runtime + help + Declarative parsing and validation of HTTP request objects, + with built-in support for popular web frameworks, including + Flask, Django, Bottle, Tornado, Pyramid, Falcon, and + aiohttp. + + https://github.com/marshmallow-code/webargs diff --git a/package/python-webargs/python-webargs.hash b/package/python-webargs/python-webargs.hash new file mode 100644 index 00000000000..10bb3651f08 --- /dev/null +++ b/package/python-webargs/python-webargs.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/webargs/json +md5 9fff29294a5db748eca791da2b93e370 webargs-8.2.0.tar.gz +sha256 99d68940c452e07726485a15fef43f12f8ae6c0c5b391bcba76065d4527fb85d webargs-8.2.0.tar.gz +# Locally computed sha256 checksums +sha256 5973e5dcc20b65e4eb4b4acdf273bb78a18522914ab626f496f1b070f7e6294d LICENSE diff --git a/package/python-webargs/python-webargs.mk b/package/python-webargs/python-webargs.mk new file mode 100644 index 00000000000..ce270842c13 --- /dev/null +++ b/package/python-webargs/python-webargs.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# python-webargs +# +################################################################################ + +PYTHON_WEBARGS_VERSION = 8.2.0 +PYTHON_WEBARGS_SOURCE = webargs-$(PYTHON_WEBARGS_VERSION).tar.gz +PYTHON_WEBARGS_SITE = https://files.pythonhosted.org/packages/4b/7d/fece8e6547b3edde8953b1c84a63da02e1a88efcb9d7d485e4d1b25d9c47 +PYTHON_WEBARGS_SETUP_TYPE = setuptools +PYTHON_WEBARGS_LICENSE = MIT +PYTHON_WEBARGS_LICENSE_FILES = LICENSE +PYTHON_WEBARGS_CPE_ID_VENDOR = webargs_project +PYTHON_WEBARGS_CPE_ID_PRODUCT = webargs + +$(eval $(python-package)) diff --git a/package/python-webencodings/python-webencodings.hash b/package/python-webencodings/python-webencodings.hash index 90f5e662642..47577a6d3eb 100644 --- a/package/python-webencodings/python-webencodings.hash +++ b/package/python-webencodings/python-webencodings.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/webencodings/json -md5 32f6e261d52e57bf7e1c4d41546d15b8 webencodings-0.5.1.tar.gz -sha256 b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923 webencodings-0.5.1.tar.gz +md5 32f6e261d52e57bf7e1c4d41546d15b8 webencodings-0.5.1.tar.gz +sha256 b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923 webencodings-0.5.1.tar.gz # Locally computed sha256 checksumms -sha256 c27693b0174d6d04dafd0242857ae72763f5404b675972c777fd865bc3c0abe1 PKG-INFO +sha256 c27693b0174d6d04dafd0242857ae72763f5404b675972c777fd865bc3c0abe1 PKG-INFO diff --git a/package/python-webpy/python-webpy.hash b/package/python-webpy/python-webpy.hash index 6af6abeff15..540771a2448 100644 --- a/package/python-webpy/python-webpy.hash +++ b/package/python-webpy/python-webpy.hash @@ -1,5 +1,3 @@ # md5, sha256 from https://pypi.org/pypi/web.py/json -md5 4e7ec89e7ae1e938d01fff01ba752606 web.py-0.40.tar.gz -sha256 dc5e42ffbc42d77d07f75b7acca9975a3368ae609774e49ddebb497a784131f3 web.py-0.40.tar.gz -# Locally computed sha256 checksums -sha256 791bf6e9419435f114a19fc6519ff33738021eb3c41b18490943230ab0894df9 LICENSE.txt +md5 cd2c0296ceffa1acb96ae5315214eb42 web.py-0.62.tar.gz +sha256 5ce684caa240654cae5950da8b4b7bc178812031e08f990518d072bd44ab525e web.py-0.62.tar.gz diff --git a/package/python-webpy/python-webpy.mk b/package/python-webpy/python-webpy.mk index 187a4812861..06d4ae039b4 100644 --- a/package/python-webpy/python-webpy.mk +++ b/package/python-webpy/python-webpy.mk @@ -4,11 +4,10 @@ # ################################################################################ -PYTHON_WEBPY_VERSION = 0.40 +PYTHON_WEBPY_VERSION = 0.62 PYTHON_WEBPY_SOURCE = web.py-$(PYTHON_WEBPY_VERSION).tar.gz -PYTHON_WEBPY_SITE = https://files.pythonhosted.org/packages/e3/23/ed84b174add09153329c6357984c8433e2f350de91c3859fa48c3cdbf7dc +PYTHON_WEBPY_SITE = https://files.pythonhosted.org/packages/cd/6e/338a060bb5b52ee8229bdada422eaa5f71b13f8d33467f37f870ed2cae4b PYTHON_WEBPY_SETUP_TYPE = setuptools PYTHON_WEBPY_LICENSE = Public Domain -PYTHON_WEBPY_LICENSE_FILES = LICENSE.txt $(eval $(python-package)) diff --git a/package/python-websocket-client/Config.in b/package/python-websocket-client/Config.in index 519e5066155..f9159054004 100644 --- a/package/python-websocket-client/Config.in +++ b/package/python-websocket-client/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_PYTHON_WEBSOCKET_CLIENT bool "python-websocket-client" - select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON3_SSL # runtime help WebSocket client for python. hybi13 is supported. diff --git a/package/python-websocket-client/python-websocket-client.hash b/package/python-websocket-client/python-websocket-client.hash index 1e745dc1d59..5da778027b0 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 8fc86b13dc97dc032855c6257f9168df websocket_client-0.58.0.tar.gz -sha256 63509b41d158ae5b7f67eb4ad20fecbb4eee99434e73e140354dc3ff8e09716f websocket_client-0.58.0.tar.gz +md5 26d1d8db59c9417570d8ec73ace1687b websocket-client-1.4.2.tar.gz +sha256 d6e8f90ca8e2dd4e8027c4561adeb9456b54044312dba655e7cae652ceb9ae59 websocket-client-1.4.2.tar.gz # Locally computed sha256 checksums -sha256 7c6699c75f87b52bdc542db26d6b1b92892577cda46e20eceb79e2790a1c291b LICENSE +sha256 638eb70dcc4af2e6d8388de0636ced399f7c24716e11b8573a6b06f879e80691 LICENSE diff --git a/package/python-websocket-client/python-websocket-client.mk b/package/python-websocket-client/python-websocket-client.mk index d2873e3601f..79cde7e590b 100644 --- a/package/python-websocket-client/python-websocket-client.mk +++ b/package/python-websocket-client/python-websocket-client.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_WEBSOCKET_CLIENT_VERSION = 0.58.0 -PYTHON_WEBSOCKET_CLIENT_SOURCE = websocket_client-$(PYTHON_WEBSOCKET_CLIENT_VERSION).tar.gz -PYTHON_WEBSOCKET_CLIENT_SITE = https://files.pythonhosted.org/packages/4a/df/112c278ba1ead96786d24d973429ce1e1a2c86b9843183d9f8ef8c6330d7 +PYTHON_WEBSOCKET_CLIENT_VERSION = 1.4.2 +PYTHON_WEBSOCKET_CLIENT_SOURCE = websocket-client-$(PYTHON_WEBSOCKET_CLIENT_VERSION).tar.gz +PYTHON_WEBSOCKET_CLIENT_SITE = https://files.pythonhosted.org/packages/75/af/1d13b93e7a21aca7f8ab8645fcfcfad21fc39716dc9dce5dc2a97f73ff78 PYTHON_WEBSOCKET_CLIENT_SETUP_TYPE = setuptools -PYTHON_WEBSOCKET_CLIENT_LICENSE = LGPL-2.1+ +PYTHON_WEBSOCKET_CLIENT_LICENSE = Apache-2.0 PYTHON_WEBSOCKET_CLIENT_LICENSE_FILES = LICENSE $(eval $(python-package)) diff --git a/package/python-websockets/python-websockets.hash b/package/python-websockets/python-websockets.hash index cec1d1599cc..62c7cb8467e 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 ebb9e4930bf2c35cd3723be0dfa83d89 websockets-10.0.tar.gz -sha256 c4fc9a1d242317892590abe5b61a9127f1a61740477bfb121743f290b8054002 websockets-10.0.tar.gz +md5 d6b1a2cb5e194ae43f849c125b71c8db websockets-10.4.tar.gz +sha256 eef610b23933c54d5d921c92578ae5f89813438fded840c2e9809d378dc765d3 websockets-10.4.tar.gz # Locally computed sha256 checksums sha256 daeca11bf3608da35e546ea0c32be18958a8be1441fa3de9cbd20e4c8bc718e6 LICENSE diff --git a/package/python-websockets/python-websockets.mk b/package/python-websockets/python-websockets.mk index 9f4c5f1da7e..7f721220a5a 100644 --- a/package/python-websockets/python-websockets.mk +++ b/package/python-websockets/python-websockets.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WEBSOCKETS_VERSION = 10.0 +PYTHON_WEBSOCKETS_VERSION = 10.4 PYTHON_WEBSOCKETS_SOURCE = websockets-$(PYTHON_WEBSOCKETS_VERSION).tar.gz -PYTHON_WEBSOCKETS_SITE = https://files.pythonhosted.org/packages/1c/f4/61aee1eb4baadf8477fb7f3bc6b04a50fe683ef8ad2f60282806821e4b3b +PYTHON_WEBSOCKETS_SITE = https://files.pythonhosted.org/packages/85/dc/549a807a53c13fd4a8dac286f117a7a71260defea9ec0c05d6027f2ae273 PYTHON_WEBSOCKETS_SETUP_TYPE = setuptools PYTHON_WEBSOCKETS_LICENSE = BSD-3-Clause PYTHON_WEBSOCKETS_LICENSE_FILES = LICENSE diff --git a/package/python-werkzeug/python-werkzeug.hash b/package/python-werkzeug/python-werkzeug.hash index 1d6de8a0c7c..0b60a400669 100644 --- a/package/python-werkzeug/python-werkzeug.hash +++ b/package/python-werkzeug/python-werkzeug.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/werkzeug/json -md5 5d499cfdd30de5d9c946994783772efd Werkzeug-1.0.1.tar.gz -sha256 6c80b1e5ad3665290ea39320b91e1be1e0d5f60652b964a3070216de83d2e47c Werkzeug-1.0.1.tar.gz +md5 28c3ec6a4b1ce8f06c85612c1dfa351a Werkzeug-2.2.3.tar.gz +sha256 2e1ccc9417d4da358b9de6f174e3ac094391ea1d4fbef2d667865d819dfd0afe Werkzeug-2.2.3.tar.gz # Locally computed sha256 checksums sha256 3b49dcee4105eb37bac10faf1be260408fe85d252b8e9df2e0979fc1e094437b LICENSE.rst diff --git a/package/python-werkzeug/python-werkzeug.mk b/package/python-werkzeug/python-werkzeug.mk index fe9b87af1d2..0dd27d145fe 100644 --- a/package/python-werkzeug/python-werkzeug.mk +++ b/package/python-werkzeug/python-werkzeug.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WERKZEUG_VERSION = 1.0.1 +PYTHON_WERKZEUG_VERSION = 2.2.3 PYTHON_WERKZEUG_SOURCE = Werkzeug-$(PYTHON_WERKZEUG_VERSION).tar.gz -PYTHON_WERKZEUG_SITE = https://files.pythonhosted.org/packages/10/27/a33329150147594eff0ea4c33c2036c0eadd933141055be0ff911f7f8d04 +PYTHON_WERKZEUG_SITE = https://files.pythonhosted.org/packages/02/3c/baaebf3235c87d61d6593467056d5a8fba7c75ac838b8d100a5e64eba7a0 PYTHON_WERKZEUG_SETUP_TYPE = setuptools PYTHON_WERKZEUG_LICENSE = BSD-3-Clause PYTHON_WERKZEUG_LICENSE_FILES = LICENSE.rst diff --git a/package/python-whoosh/python-whoosh.hash b/package/python-whoosh/python-whoosh.hash index c615beb9c35..a1eced0e390 100644 --- a/package/python-whoosh/python-whoosh.hash +++ b/package/python-whoosh/python-whoosh.hash @@ -1,5 +1,5 @@ # md5 from https://pypi.python.org/pypi/whoosh/json -md5 c2710105f20b3e29936bd2357383c325 Whoosh-2.7.4.tar.gz +md5 c2710105f20b3e29936bd2357383c325 Whoosh-2.7.4.tar.gz # Locally computed sha256 7ca5633dbfa9e0e0fa400d3151a8a0c4bec53bd2ecedc0a67705b17565c31a83 Whoosh-2.7.4.tar.gz sha256 464ef68037a0e5545e4716b4ff99f3f85ca89cf9e9a7ecfd7a02039ba1c34a90 LICENSE.txt diff --git a/package/python-wrapt/python-wrapt.hash b/package/python-wrapt/python-wrapt.hash index 63dae991ebf..cb62e19aa70 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 6d56ed0de4336462a73350341462f45e wrapt-1.12.1.tar.gz -sha256 b62ffa81fb85f4332a4f609cab4ac40709470da05643a082ec1eb88e6d9b97d7 wrapt-1.12.1.tar.gz +md5 6e7340264f038efdefcba707250c91c2 wrapt-1.14.1.tar.gz +sha256 380a85cf89e0e69b7cfbe2ea9f765f004ff419f34194018a6827ac0e3edfed4d wrapt-1.14.1.tar.gz # Locally computed sha256 checksums -sha256 e37c13f84fb3c9a54161b0fcf75f4d302fb86ce42cd6106147bda79e4197d9f2 LICENSE +sha256 77d2a9159cffe12473f539a71a3e741f35117e61bfd005ebd60c3a1778e2c1f1 LICENSE diff --git a/package/python-wrapt/python-wrapt.mk b/package/python-wrapt/python-wrapt.mk index 32d8a24c144..406f6c3aa1b 100644 --- a/package/python-wrapt/python-wrapt.mk +++ b/package/python-wrapt/python-wrapt.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_WRAPT_VERSION = 1.12.1 +PYTHON_WRAPT_VERSION = 1.14.1 PYTHON_WRAPT_SOURCE = wrapt-$(PYTHON_WRAPT_VERSION).tar.gz -PYTHON_WRAPT_SITE = https://files.pythonhosted.org/packages/82/f7/e43cefbe88c5fd371f4cf0cf5eb3feccd07515af9fd6cf7dbf1d1793a797 -PYTHON_WRAPT_SETUP_TYPE = distutils +PYTHON_WRAPT_SITE = https://files.pythonhosted.org/packages/11/eb/e06e77394d6cf09977d92bff310cb0392930c08a338f99af6066a5a98f92 +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 109768d28ed..1e809fee0ad 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 68e0cfae9659dd059ff7e7a8218af548 ws4py-0.5.1.tar.gz +sha256 29d073d7f2e006373e6a848b1d00951a1107eb81f3742952be905429dc5a5483 ws4py-0.5.1.tar.gz # Locally computed sha256 checksums -sha256 3c98d9e820de01b1ae3be846419700ab9cefa22b09aa0ef441b3bfd5613c3ba1 LICENSE +sha256 3c98d9e820de01b1ae3be846419700ab9cefa22b09aa0ef441b3bfd5613c3ba1 LICENSE diff --git a/package/python-wsaccel/python-wsaccel.hash b/package/python-wsaccel/python-wsaccel.hash index 9d0002d41d3..b388c3cc7cb 100644 --- a/package/python-wsaccel/python-wsaccel.hash +++ b/package/python-wsaccel/python-wsaccel.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/wsaccel/json -md5 973168711818dd98b8b28a4c2db77a27 wsaccel-0.6.3.tar.gz -sha256 fdb27866bb6b6e7a29e45222778ff97938782a0ce92eff07dfb20af8fb9301c4 wsaccel-0.6.3.tar.gz +md5 73bdc70035813ded14f9a4b81e82622a wsaccel-0.6.4.tar.gz +sha256 cbf66a88bcaf6c6ad16d50ea29215891526b6e993c4bc7ed44b044ee6fe3ad3d wsaccel-0.6.4.tar.gz # Locally computed sha256 checksums sha256 b6982974cb838b985b54b663d1780d280735086249c2e28015f25dd455df25da LICENSE diff --git a/package/python-wsaccel/python-wsaccel.mk b/package/python-wsaccel/python-wsaccel.mk index 7c78951f2f3..ce41d431ffb 100644 --- a/package/python-wsaccel/python-wsaccel.mk +++ b/package/python-wsaccel/python-wsaccel.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WSACCEL_VERSION = 0.6.3 +PYTHON_WSACCEL_VERSION = 0.6.4 PYTHON_WSACCEL_SOURCE = wsaccel-$(PYTHON_WSACCEL_VERSION).tar.gz -PYTHON_WSACCEL_SITE = https://files.pythonhosted.org/packages/f5/d1/3e99875a764d0d6ec94a74977ed72dd3022a7f31d036622da9cff8fc072f +PYTHON_WSACCEL_SITE = https://files.pythonhosted.org/packages/77/0b/a44df15382a76b6768184630d483b8363d65b9f70d1aacf76153d496bbb9 PYTHON_WSACCEL_LICENSE = Apache-2.0 PYTHON_WSACCEL_LICENSE_FILES = LICENSE PYTHON_WSACCEL_SETUP_TYPE = setuptools diff --git a/package/python-wsproto/Config.in b/package/python-wsproto/Config.in new file mode 100644 index 00000000000..0610348b8d1 --- /dev/null +++ b/package/python-wsproto/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_WSPROTO + bool "python-wsproto" + select BR2_PACKAGE_PYTHON_H11 # runtime + help + WebSockets state-machine based protocol implementation. + + https://github.com/python-hyper/wsproto/ diff --git a/package/python-wsproto/python-wsproto.hash b/package/python-wsproto/python-wsproto.hash new file mode 100644 index 00000000000..4eb31957850 --- /dev/null +++ b/package/python-wsproto/python-wsproto.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/wsproto/json +md5 f64973434117e23d2079460ed64b05c3 wsproto-1.2.0.tar.gz +sha256 ad565f26ecb92588a3e43bc3d96164de84cd9902482b130d0ddbaa9664a85065 wsproto-1.2.0.tar.gz +# Locally computed sha256 checksums +sha256 c0329a8dbf3437b095f7f5cf4257d6bb855e07120cae8786586073ff7a699959 LICENSE diff --git a/package/python-wsproto/python-wsproto.mk b/package/python-wsproto/python-wsproto.mk new file mode 100644 index 00000000000..629f4431b44 --- /dev/null +++ b/package/python-wsproto/python-wsproto.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-wsproto +# +################################################################################ + +PYTHON_WSPROTO_VERSION = 1.2.0 +PYTHON_WSPROTO_SOURCE = wsproto-$(PYTHON_WSPROTO_VERSION).tar.gz +PYTHON_WSPROTO_SITE = https://files.pythonhosted.org/packages/c9/4a/44d3c295350d776427904d73c189e10aeae66d7f555bb2feee16d1e4ba5a +PYTHON_WSPROTO_SETUP_TYPE = setuptools +PYTHON_WSPROTO_LICENSE = MIT +PYTHON_WSPROTO_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/package/python-wtforms/python-wtforms.hash b/package/python-wtforms/python-wtforms.hash index ed9bfd1a23c..12b980de028 100644 --- a/package/python-wtforms/python-wtforms.hash +++ b/package/python-wtforms/python-wtforms.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/wtforms/json -md5 2b6ea167a71c6becf20f0934417fd06c WTForms-2.3.3.tar.gz -sha256 81195de0ac94fbc8368abbaf9197b88c4f3ffd6c2719b5bf5fc9da744f3d829c WTForms-2.3.3.tar.gz +md5 509a985769df13938c8307b55a614773 WTForms-3.0.1.tar.gz +sha256 6b351bbb12dd58af57ffef05bc78425d08d1914e0fd68ee14143b7ade023c5bc WTForms-3.0.1.tar.gz # Locally computed sha256 checksums sha256 cf40d60ff34f6b2b68a53d220f8b66567b5ac8dd1119b37b62fd15e9518fe59b LICENSE.rst sha256 c9362a7258a11c84a8f7e825ccbbb5c425c6fc02368d3aee6494533fb99ba1f4 docs/license.rst diff --git a/package/python-wtforms/python-wtforms.mk b/package/python-wtforms/python-wtforms.mk index 23280a6fe5d..65b5748b6bf 100644 --- a/package/python-wtforms/python-wtforms.mk +++ b/package/python-wtforms/python-wtforms.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_WTFORMS_VERSION = 2.3.3 +PYTHON_WTFORMS_VERSION = 3.0.1 PYTHON_WTFORMS_SOURCE = WTForms-$(PYTHON_WTFORMS_VERSION).tar.gz -PYTHON_WTFORMS_SITE = https://files.pythonhosted.org/packages/dd/3f/f25d26b1c66896e2876124a12cd8be8f606abf4e1890a20f3ca04e4a1555 +PYTHON_WTFORMS_SITE = https://files.pythonhosted.org/packages/9a/7d/d4aa68f5bfcb91dd61a7faf0e862512ae7b3d531c41f24c217910aec0559 PYTHON_WTFORMS_SETUP_TYPE = setuptools PYTHON_WTFORMS_LICENSE = BSD-3-Clause PYTHON_WTFORMS_LICENSE_FILES = LICENSE.rst docs/license.rst +PYTHON_WTFORMS_DEPENDENCIES = host-python-babel $(eval $(python-package)) diff --git a/package/python-xlib/python-xlib.hash b/package/python-xlib/python-xlib.hash index c6a446b6bf9..066f450416f 100644 --- a/package/python-xlib/python-xlib.hash +++ b/package/python-xlib/python-xlib.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/python-xlib/json -md5 3a87f81bff4cb4f8a52881097ba51a49 python-xlib-0.27.tar.bz2 -sha256 a90667c70905c6ef0754c8a09fa61acbc1e1b7ddb946d527831800d7cbfe9348 python-xlib-0.27.tar.bz2 +md5 ba31623fb64a1e5a0b1ae1f6495c3bf6 python-xlib-0.32.tar.gz +sha256 20e1382f8a98d8ed0facfa45415c46fd0c8eeb6f9996e58c22d3382a4ed6e37b python-xlib-0.32.tar.gz # Locally computed sha256 checksums -sha256 06eb1c441443cf15ac84f309003f4c43c62246939d37c75fc3e056c2d34cd300 LICENSE +sha256 06eb1c441443cf15ac84f309003f4c43c62246939d37c75fc3e056c2d34cd300 LICENSE diff --git a/package/python-xlib/python-xlib.mk b/package/python-xlib/python-xlib.mk index ae8ca1653b1..32f16e5d66a 100644 --- a/package/python-xlib/python-xlib.mk +++ b/package/python-xlib/python-xlib.mk @@ -4,9 +4,8 @@ # ################################################################################ -PYTHON_XLIB_VERSION = 0.27 -PYTHON_XLIB_SOURCE = python-xlib-$(PYTHON_XLIB_VERSION).tar.bz2 -PYTHON_XLIB_SITE = https://files.pythonhosted.org/packages/e8/fa/a61ef33df117de4c57d11b4ba0b624f5352f21aa2e1eda404860155e8855 +PYTHON_XLIB_VERSION = 0.32 +PYTHON_XLIB_SITE = https://files.pythonhosted.org/packages/4d/cf/a29ecb43a5c84a65ffd726e3b28806f56b3bc5e796ddb533ff52af107dcf PYTHON_XLIB_SETUP_TYPE = setuptools PYTHON_XLIB_LICENSE = LGPL-2.1+ PYTHON_XLIB_LICENSE_FILES = LICENSE diff --git a/package/python-xlsxwriter/python-xlsxwriter.hash b/package/python-xlsxwriter/python-xlsxwriter.hash index 7c9698067ba..4a4b946fcbc 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 5f759dccf222e8f2a9924e90c4afaf84 XlsxWriter-3.0.1.tar.gz -sha256 3f39bf581c55f3ad1438bc170d7f4c4649cee8b6b7a80d21f79508118eeea52a XlsxWriter-3.0.1.tar.gz +md5 3df433a1b6427d40af6e7cac36f0b5c4 XlsxWriter-3.0.6.tar.gz +sha256 2f9e5ea13343fe85486e349d4e5fdf746bb69dc7bc1dedfa9b5fae2bb48c0795 XlsxWriter-3.0.6.tar.gz # Locally computed sha256 checksums -sha256 8fbb9b28ef0afac1c7d999102fd2634f347448d069c8c821976f3dbd2b3f812c LICENSE.txt +sha256 b3b494c7e7456dad12ac1b3e61c60e850d60d3ce865fa056c4ce0ae680c03677 LICENSE.txt diff --git a/package/python-xlsxwriter/python-xlsxwriter.mk b/package/python-xlsxwriter/python-xlsxwriter.mk index 4c8a5120861..f05b10670c4 100644 --- a/package/python-xlsxwriter/python-xlsxwriter.mk +++ b/package/python-xlsxwriter/python-xlsxwriter.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_XLSXWRITER_VERSION = 3.0.1 +PYTHON_XLSXWRITER_VERSION = 3.0.6 PYTHON_XLSXWRITER_SOURCE = XlsxWriter-$(PYTHON_XLSXWRITER_VERSION).tar.gz -PYTHON_XLSXWRITER_SITE = https://files.pythonhosted.org/packages/5d/36/e943d07af9d26cc2f11861955dbf0031e891f77f3d55f70217fd6a0f4d9f +PYTHON_XLSXWRITER_SITE = https://files.pythonhosted.org/packages/d4/b5/cef6fadeaf316a3bbe82a506252081f2e6533cdf4b69ed64f8831ac01fb0 PYTHON_XLSXWRITER_SETUP_TYPE = setuptools PYTHON_XLSXWRITER_LICENSE = BSD-2-Clause PYTHON_XLSXWRITER_LICENSE_FILES = LICENSE.txt diff --git a/package/python-xlutils/python-xlutils.hash b/package/python-xlutils/python-xlutils.hash index aa507883a62..908aa4d680b 100644 --- a/package/python-xlutils/python-xlutils.hash +++ b/package/python-xlutils/python-xlutils.hash @@ -1,6 +1,6 @@ # md5 from https://pypi.python.org/pypi/xlutils/json -md5 7a6a339ddaacabce244341582ee61353 xlutils-2.0.0.tar.gz +md5 7a6a339ddaacabce244341582ee61353 xlutils-2.0.0.tar.gz # sha256 calculated by scanpypi -sha256 7e0e2c233bd185fecf5e2bd3f4e9469ca4a3bd87da64c82cfe5b2af27e7f9e54 xlutils-2.0.0.tar.gz +sha256 7e0e2c233bd185fecf5e2bd3f4e9469ca4a3bd87da64c82cfe5b2af27e7f9e54 xlutils-2.0.0.tar.gz # Locally computed sha256 28907976ee86414cc720fafc966563b16eeb6a6aeb1da5f5ed40bac3a8808bcf xlutils/license.txt diff --git a/package/python-xlwt/python-xlwt.hash b/package/python-xlwt/python-xlwt.hash index 8b0511fdaec..826643d5689 100644 --- a/package/python-xlwt/python-xlwt.hash +++ b/package/python-xlwt/python-xlwt.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/xlwt/json -md5 4b1ca8a3cef3261f4b4dc3f138e383a8 xlwt-1.3.0.tar.gz -sha256 c59912717a9b28f1a3c2a98fd60741014b06b043936dcecbc113eaaada156c88 xlwt-1.3.0.tar.gz +md5 4b1ca8a3cef3261f4b4dc3f138e383a8 xlwt-1.3.0.tar.gz +sha256 c59912717a9b28f1a3c2a98fd60741014b06b043936dcecbc113eaaada156c88 xlwt-1.3.0.tar.gz # Locally computed sha256 7f7b66f23fdac4f68fe3b342dd16b329d511017a901784a5ceb83f505f2de7c6 docs/licenses.rst diff --git a/package/python-xmltodict/python-xmltodict.hash b/package/python-xmltodict/python-xmltodict.hash index 16422d78c94..48fb5265f66 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 ddb2bd078cef4f7e3021a578034ad941 xmltodict-0.12.0.tar.gz -sha256 50d8c638ed7ecb88d90561beedbf720c9b4e851a9fa6c47ebd64e99d166d8a21 xmltodict-0.12.0.tar.gz +md5 1ece0a5bbd494bac414058405606475e xmltodict-0.13.0.tar.gz +sha256 341595a488e3e01a85a9d8911d8912fd922ede5fecc4dce437eb4b6c8d037e56 xmltodict-0.13.0.tar.gz # Locally computed sha256 checksums -sha256 d66d5eb8f83a0ba21d3dd04318b8817588e8764daabea852d1035e3f07ffda55 LICENSE +sha256 d66d5eb8f83a0ba21d3dd04318b8817588e8764daabea852d1035e3f07ffda55 LICENSE diff --git a/package/python-xmltodict/python-xmltodict.mk b/package/python-xmltodict/python-xmltodict.mk index 05be4b3c6c9..9201bc15070 100644 --- a/package/python-xmltodict/python-xmltodict.mk +++ b/package/python-xmltodict/python-xmltodict.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_XMLTODICT_VERSION = 0.12.0 +PYTHON_XMLTODICT_VERSION = 0.13.0 PYTHON_XMLTODICT_SOURCE = xmltodict-$(PYTHON_XMLTODICT_VERSION).tar.gz -PYTHON_XMLTODICT_SITE = https://files.pythonhosted.org/packages/58/40/0d783e14112e064127063fbf5d1fe1351723e5dfe9d6daad346a305f6c49 +PYTHON_XMLTODICT_SITE = https://files.pythonhosted.org/packages/39/0d/40df5be1e684bbaecdb9d1e0e40d5d482465de6b00cbb92b84ee5d243c7f PYTHON_XMLTODICT_SETUP_TYPE = setuptools PYTHON_XMLTODICT_LICENSE = MIT PYTHON_XMLTODICT_LICENSE_FILES = LICENSE diff --git a/package/python-yarl/python-yarl.hash b/package/python-yarl/python-yarl.hash index bf971e9a9a3..9725e0058bd 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 acd3eb25a9c46b10a699a3bee5fb9777 yarl-1.7.2.tar.gz -sha256 45399b46d60c253327a460e99856752009fcee5f5d3c80b2f7c0cae1c38d56dd yarl-1.7.2.tar.gz +md5 57c82725b9f4895eecee45faf5e61a54 yarl-1.8.2.tar.gz +sha256 49d43402c6e3013ad0978602bf6bf5328535c48d192304b91b97a3c6790b1562 yarl-1.8.2.tar.gz # Locally computed sha256 checksums sha256 56d6ac6c8105c0a51304c21db060e361af9a8ea0af9a75c239c28b5d13693838 LICENSE diff --git a/package/python-yarl/python-yarl.mk b/package/python-yarl/python-yarl.mk index 175aaa7a35e..77e0c91383b 100644 --- a/package/python-yarl/python-yarl.mk +++ b/package/python-yarl/python-yarl.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_YARL_VERSION = 1.7.2 +PYTHON_YARL_VERSION = 1.8.2 PYTHON_YARL_SOURCE = yarl-$(PYTHON_YARL_VERSION).tar.gz -PYTHON_YARL_SITE = https://files.pythonhosted.org/packages/f6/da/46d1b3d69a9a0835dabf9d59c7eb0f1600599edd421a4c5a15ab09f527e0 +PYTHON_YARL_SITE = https://files.pythonhosted.org/packages/c4/1e/1b204050c601d5cd82b45d5c8f439cb6f744a2ce0c0a6f83be0ddf0dc7b2 PYTHON_YARL_LICENSE = Apache-2.0 PYTHON_YARL_LICENSE_FILES = LICENSE PYTHON_YARL_SETUP_TYPE = setuptools diff --git a/package/python-yatl/python-yatl.hash b/package/python-yatl/python-yatl.hash index 8ce192bf951..61391f63702 100644 --- a/package/python-yatl/python-yatl.hash +++ b/package/python-yatl/python-yatl.hash @@ -1,3 +1,3 @@ # md5, sha256 from https://pypi.org/pypi/yatl/json -md5 551136eba4c5551c01b051341b190641 yatl-20211217.1.tar.gz -sha256 d22bf7abe40d9bdd16bd15824d2df65e65e405df6ecb8601fdc7c233bf6b3004 yatl-20211217.1.tar.gz +md5 f02b367e1c56af94eafd5bd1019c03be yatl-20220907.1.tar.gz +sha256 67d43ad79e1f58d8552718018470856a2ad210bdfeec42e978b28b1b21560d00 yatl-20220907.1.tar.gz diff --git a/package/python-yatl/python-yatl.mk b/package/python-yatl/python-yatl.mk index 12a80398919..0c33971b895 100644 --- a/package/python-yatl/python-yatl.mk +++ b/package/python-yatl/python-yatl.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_YATL_VERSION = 20211217.1 +PYTHON_YATL_VERSION = 20220907.1 PYTHON_YATL_SOURCE = yatl-$(PYTHON_YATL_VERSION).tar.gz -PYTHON_YATL_SITE = https://files.pythonhosted.org/packages/03/05/0be8164e8151fd8c96caeb2560f955dc2dc1a969f0868f48c046cd863fe6 +PYTHON_YATL_SITE = https://files.pythonhosted.org/packages/09/68/0c9d0a1192fdad5f3d38db096106c5adabb9b26c9ae107897997f56d1788 PYTHON_YATL_SETUP_TYPE = setuptools PYTHON_YATL_LICENSE = BSD-3-Clause diff --git a/package/python-zc-lockfile/python-zc-lockfile.hash b/package/python-zc-lockfile/python-zc-lockfile.hash index 4a9c194885e..181adda1bb2 100644 --- a/package/python-zc-lockfile/python-zc-lockfile.hash +++ b/package/python-zc-lockfile/python-zc-lockfile.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/zc.lockfile/json -md5 3895445752278ddcc4578658c3c9a492 zc.lockfile-2.0.tar.gz -sha256 307ad78227e48be260e64896ec8886edc7eae22d8ec53e4d528ab5537a83203b zc.lockfile-2.0.tar.gz +md5 3895445752278ddcc4578658c3c9a492 zc.lockfile-2.0.tar.gz +sha256 307ad78227e48be260e64896ec8886edc7eae22d8ec53e4d528ab5537a83203b zc.lockfile-2.0.tar.gz # Locally computed sha256 checksums -sha256 3e671db11df687516cc1db5b3d65e4aa383eaca3c20cea3faf53a0f7335d0a3c LICENSE.txt +sha256 3e671db11df687516cc1db5b3d65e4aa383eaca3c20cea3faf53a0f7335d0a3c LICENSE.txt diff --git a/package/python-zeroconf/Config.in b/package/python-zeroconf/Config.in index 1570674f59a..69ea81d93a4 100644 --- a/package/python-zeroconf/Config.in +++ b/package/python-zeroconf/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_ZEROCONF bool "python-zeroconf" + select BR2_PACKAGE_PYTHON_ASYNC_TIMEOUT # runtime select BR2_PACKAGE_PYTHON_IFADDR # runtime help Pure Python Multicast DNS Service Discovery Library diff --git a/package/python-zeroconf/python-zeroconf.hash b/package/python-zeroconf/python-zeroconf.hash index be91b590483..13e1d16cdef 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 98e683a247fe9915a5d4845c38b37ff3 zeroconf-0.29.0.tar.gz -sha256 7aefbb658b452b1fd7e51124364f938c6f5e42d6ea893fa2557bea8c06c540af zeroconf-0.29.0.tar.gz +md5 f85fb9d239397b53836495fd49b85e5f zeroconf-0.39.4.tar.gz +sha256 701e4d697f89fe952aa9c13a512ed6bf472dcf4f0a6d275e71085604b3882295 zeroconf-0.39.4.tar.gz # Locally computed sha256 checksums -sha256 bb117c0fbd7f57f64170b690285d7df07c2371b578e3b3cd3aa2e1155ef461a0 COPYING +sha256 35e4136e96aace60757a8b939741959d8627c4bc1fce62af99df325395276c56 COPYING diff --git a/package/python-zeroconf/python-zeroconf.mk b/package/python-zeroconf/python-zeroconf.mk index 67bfa72e034..d939b2e5aee 100644 --- a/package/python-zeroconf/python-zeroconf.mk +++ b/package/python-zeroconf/python-zeroconf.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ZEROCONF_VERSION = 0.29.0 +PYTHON_ZEROCONF_VERSION = 0.39.4 PYTHON_ZEROCONF_SOURCE = zeroconf-$(PYTHON_ZEROCONF_VERSION).tar.gz -PYTHON_ZEROCONF_SITE = https://files.pythonhosted.org/packages/ca/77/eb6137997adc60811c6c46b28b00abac5c16daf14383f61d8a0180326b38 +PYTHON_ZEROCONF_SITE = https://files.pythonhosted.org/packages/f5/4f/c47cea73d7ae5467b63de3999d7207fd5b14d70cb2f35ce81c4ab7d7a52e PYTHON_ZEROCONF_SETUP_TYPE = setuptools PYTHON_ZEROCONF_LICENSE = LGPL-2.1+ PYTHON_ZEROCONF_LICENSE_FILES = COPYING diff --git a/package/python-zlmdb/Config.in b/package/python-zlmdb/Config.in new file mode 100644 index 00000000000..8eba2d79460 --- /dev/null +++ b/package/python-zlmdb/Config.in @@ -0,0 +1,24 @@ +config BR2_PACKAGE_PYTHON_ZLMDB + bool "python-zlmdb" + depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS # python-numpy + depends on BR2_INSTALL_LIBSTDCPP # python-numpy + depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy + select BR2_PACKAGE_PYTHON_CBOR2 # runtime + select BR2_PACKAGE_PYTHON_CFFI # runtime + select BR2_PACKAGE_PYTHON_CLICK # runtime + select BR2_PACKAGE_PYTHON_FLATBUFFERS # runtime + select BR2_PACKAGE_PYTHON_LMDB # runtime + select BR2_PACKAGE_PYTHON_NUMPY # runtime + select BR2_PACKAGE_PYTHON_PYNACL # runtime + select BR2_PACKAGE_PYTHON_PYYAML # runtime + select BR2_PACKAGE_PYTHON_TXAIO # runtime + help + Object-relational zero-copy in-memory database layer for + LMDB. + + https://github.com/crossbario/zlmdb + +comment "python-zlmdb needs a glibc or musl toolchain w/ C++" + depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS + depends on !BR2_INSTALL_LIBSTDCPP || \ + !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) diff --git a/package/python-zlmdb/python-zlmdb.hash b/package/python-zlmdb/python-zlmdb.hash new file mode 100644 index 00000000000..1ae5d72efa8 --- /dev/null +++ b/package/python-zlmdb/python-zlmdb.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/zlmdb/json +md5 1e217f3228cb4c2303f06461b79e593e zlmdb-22.6.1.tar.gz +sha256 aff353121c2eed3c18e53c82358c41932a21bf882995ee3a79c6eb1ae4c95397 zlmdb-22.6.1.tar.gz +# Locally computed sha256 checksums +sha256 8a139bf325dcca11e0e476ce537bf791a6cfbeed8899a9b6ddc55238e180d230 LICENSE diff --git a/package/python-zlmdb/python-zlmdb.mk b/package/python-zlmdb/python-zlmdb.mk new file mode 100644 index 00000000000..d20ac9e016c --- /dev/null +++ b/package/python-zlmdb/python-zlmdb.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-zlmdb +# +################################################################################ + +PYTHON_ZLMDB_VERSION = 22.6.1 +PYTHON_ZLMDB_SOURCE = zlmdb-$(PYTHON_ZLMDB_VERSION).tar.gz +PYTHON_ZLMDB_SITE = https://files.pythonhosted.org/packages/97/15/992e61a18cb64b573814c9d92676b22d522f2cc2ea79ff78b834bd392b80 +PYTHON_ZLMDB_SETUP_TYPE = setuptools +PYTHON_ZLMDB_LICENSE = MIT +PYTHON_ZLMDB_LICENSE_FILES = LICENSE + +$(eval $(python-package)) diff --git a/package/python-zope-interface/python-zope-interface.hash b/package/python-zope-interface/python-zope-interface.hash index f7fa673e245..7052f77899c 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 c58b31da83449631efb499de13c68c6a zope.interface-5.4.0.tar.gz -sha256 5dba5f530fec3f0988d83b78cc591b58c0b6eb8431a85edd1569a0539a8a5a0e zope.interface-5.4.0.tar.gz +md5 5a383d71156ce6f89f59a86d957a8d65 zope.interface-5.5.2.tar.gz +sha256 bfee1f3ff62143819499e348f5b8a7f3aa0259f9aca5e0ddae7391d059dce671 zope.interface-5.5.2.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 beacfb4f5e1..2bada3a7d42 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 = 5.4.0 +PYTHON_ZOPE_INTERFACE_VERSION = 5.5.2 PYTHON_ZOPE_INTERFACE_SOURCE = zope.interface-$(PYTHON_ZOPE_INTERFACE_VERSION).tar.gz -PYTHON_ZOPE_INTERFACE_SITE = https://files.pythonhosted.org/packages/ae/58/e0877f58daa69126a5fb325d6df92b20b77431cd281e189c5ec42b722f58 +PYTHON_ZOPE_INTERFACE_SITE = https://files.pythonhosted.org/packages/38/6f/fbfb7dde38be7e5644bb342c4c7cdc444cd5e2ffbd70d091263b3858a8cb PYTHON_ZOPE_INTERFACE_SETUP_TYPE = setuptools PYTHON_ZOPE_INTERFACE_LICENSE = ZPL-2.1 PYTHON_ZOPE_INTERFACE_LICENSE_FILES = LICENSE.txt diff --git a/package/python-zopfli/Config.in b/package/python-zopfli/Config.in index 0b1ebca85cb..dc68a2fef03 100644 --- a/package/python-zopfli/Config.in +++ b/package/python-zopfli/Config.in @@ -1,6 +1,10 @@ config BR2_PACKAGE_PYTHON_ZOPFLI bool "python-zopfli" + depends on BR2_INSTALL_LIBSTDCPP help Zopfli module for python. https://github.com/fonttools/py-zopfli + +comment "python-zopfli needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-zopfli/python-zopfli.hash b/package/python-zopfli/python-zopfli.hash index 92b51bdf182..29bdfe5e5b0 100644 --- a/package/python-zopfli/python-zopfli.hash +++ b/package/python-zopfli/python-zopfli.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/zopfli/json -md5 f66b6f4132533b9b0ab8b0af757237bf zopfli-0.1.9.zip -sha256 78de3cc08a8efaa8013d61528907d91ac4d6cc014ffd8a41cc10ee75e9e60d7b zopfli-0.1.9.zip +md5 0c1e41e5403524e0180f3ed9aaa356ec zopfli-0.2.2.zip +sha256 2d49db7540d9991976af464ebc1b9ed12988c04d90691bcb51dc4a373a9e2afc zopfli-0.2.2.zip # Locally computed sha256 checksums sha256 018b1cb87efdf7a04c2fcc13d57ed63f62149113fb207b27ea13430d64f13513 COPYING diff --git a/package/python-zopfli/python-zopfli.mk b/package/python-zopfli/python-zopfli.mk index 95a0067b052..d6af6e4b5fb 100644 --- a/package/python-zopfli/python-zopfli.mk +++ b/package/python-zopfli/python-zopfli.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_ZOPFLI_VERSION = 0.1.9 +PYTHON_ZOPFLI_VERSION = 0.2.2 PYTHON_ZOPFLI_SOURCE = zopfli-$(PYTHON_ZOPFLI_VERSION).zip -PYTHON_ZOPFLI_SITE = https://files.pythonhosted.org/packages/10/7d/278fd896401b0ef76e06cd42c3ce1541572d83b1c713b6786795c60a1bbe +PYTHON_ZOPFLI_SITE = https://files.pythonhosted.org/packages/9a/ed/d004d5737f9546167eecf0ecd995ee1a796703e512deb2f2ea26cdbe4b3e PYTHON_ZOPFLI_SETUP_TYPE = setuptools PYTHON_ZOPFLI_LICENSE = Apache-2.0 PYTHON_ZOPFLI_LICENSE_FILES = COPYING 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 d3b53689036..92aa7274ba2 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 322724e166d7ec0393aec577c12fdf6ef2b61e1d Mon Sep 17 00:00:00 2001 +From 51ed7f93cc0333efa8fccd9b88db713c48993df9 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 @@ -15,10 +15,10 @@ Signed-off-by: Andrey Smirnov 2 files changed, 8 insertions(+) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 77f91e72b1..0c809f3d8a 100644 +index 8fbcd7ac17..2957c8e5a1 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1600,6 +1600,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c +@@ -2078,6 +2078,7 @@ libinstall: all $(srcdir)/Modules/xxmodule.c $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \ $(DESTDIR)$(LIBDEST)/distutils/tests ; \ fi @@ -26,7 +26,7 @@ index 77f91e72b1..0c809f3d8a 100644 -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \ -j0 -d $(LIBDEST) -f \ -@@ -1627,6 +1628,7 @@ libinstall: build_all $(srcdir)/Modules/xxmodule.c +@@ -2105,6 +2106,7 @@ libinstall: all $(srcdir)/Modules/xxmodule.c $(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \ -j0 -d $(LIBDEST)/site-packages -f \ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages @@ -35,10 +35,10 @@ index 77f91e72b1..0c809f3d8a 100644 $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ diff --git a/configure.ac b/configure.ac -index d60f05251a..1ee5a09588 100644 +index ab5e1de6fa..0cf89ed641 100644 --- a/configure.ac +++ b/configure.ac -@@ -1110,6 +1110,12 @@ fi +@@ -1441,6 +1441,12 @@ fi AC_MSG_CHECKING(LDLIBRARY) @@ -52,5 +52,5 @@ index d60f05251a..1ee5a09588 100644 # 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.25.1 +2.34.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 index 411b8dae4ef..5389cb5d151 100644 --- a/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch +++ b/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch @@ -1,4 +1,4 @@ -From 72e20220f3a592b3ab9f440fbe74efa9f9e82d49 Mon Sep 17 00:00:00 2001 +From b180ab302e2a82be239af334382436628b81381e 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 @@ -10,18 +10,18 @@ Signed-off-by: Vanya Sergeev 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 1ee5a09588..c2445edc88 100644 +index 0cf89ed641..830885fcb3 100644 --- a/configure.ac +++ b/configure.ac -@@ -4230,7 +4230,7 @@ fi +@@ -5086,7 +5086,7 @@ fi])) + dnl if ac_cv_func_getaddrinfo + ]) - AC_MSG_RESULT($ac_cv_buggy_getaddrinfo) - --if test $have_getaddrinfo = no || test "$ac_cv_buggy_getaddrinfo" = yes -+if test $have_getaddrinfo = no || test "$cross_compiling" != "yes" -a "$ac_cv_buggy_getaddrinfo" = yes +-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 - if test $ipv6 = yes - then + AS_VAR_IF([ipv6], [yes], [ + AC_MSG_ERROR([m4_normalize([ -- -2.25.1 +2.34.1 diff --git a/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch b/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch index 7ac0f39d066..5b3911374e8 100644 --- a/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch +++ b/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch @@ -1,4 +1,4 @@ -From df7c95b4ceecf390b961d843a556c470ac9080b2 Mon Sep 17 00:00:00 2001 +From 8e02cebdac536dfb6748da2c50656a26f70d9da7 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 16:33:22 -0800 Subject: [PATCH] Add infrastructure to disable the build of certain extensions @@ -44,10 +44,10 @@ Signed-off-by: Andrey Smirnov 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 0c809f3d8a..7c3dde8dd4 100644 +index 2957c8e5a1..c1cfb96767 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -218,6 +218,8 @@ FILEMODE= 644 +@@ -239,6 +239,8 @@ FILEMODE= 644 # configure script arguments CONFIG_ARGS= @CONFIG_ARGS@ @@ -56,18 +56,18 @@ index 0c809f3d8a..7c3dde8dd4 100644 # Subdirectories with code SRCDIRS= @SRCDIRS@ -@@ -628,6 +630,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o +@@ -739,6 +741,7 @@ sharedmods: $(PYTHON_FOR_BUILD_DEPS) pybuilddir.txt @LIBMPDEC_INTERNAL@ @LIBEXPA + *) quiet="";; \ esac; \ echo "$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ - _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \ + DISABLED_EXTENSIONS="$(DISABLED_EXTENSIONS)" \ $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build"; \ $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ - _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \ -@@ -1748,7 +1751,8 @@ libainstall: @DEF_MAKE_RULE@ python-config + $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build +@@ -2228,7 +2231,8 @@ libainstall: all python-config # Install the dynamically loadable modules # This goes into $(exec_prefix) - sharedinstall: sharedmods + sharedinstall: all - $(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \ + $(RUNSHARED) DISABLED_EXTENSIONS="$(DISABLED_EXTENSIONS)" \ + $(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \ @@ -75,12 +75,12 @@ index 0c809f3d8a..7c3dde8dd4 100644 --install-scripts=$(BINDIR) \ --install-platlib=$(DESTSHARED) \ diff --git a/configure.ac b/configure.ac -index c2445edc88..73d66167de 100644 +index 830885fcb3..5a6a1fe608 100644 --- a/configure.ac +++ b/configure.ac -@@ -3091,6 +3091,8 @@ LIBS="$withval $LIBS" - - PKG_PROG_PKG_CONFIG +@@ -3562,6 +3562,8 @@ LIBS="$withval $LIBS" + ], + [AC_MSG_RESULT(no)]) +AC_SUBST(DISABLED_EXTENSIONS) + @@ -88,11 +88,11 @@ index c2445edc88..73d66167de 100644 AC_MSG_CHECKING(for --with-system-expat) AC_ARG_WITH(system_expat, diff --git a/setup.py b/setup.py -index 770866bca7..b6c829b3a5 100644 +index 15d0d4576a..e496ee34c2 100644 --- a/setup.py +++ b/setup.py -@@ -58,7 +58,10 @@ with warnings.catch_warnings(): - TEST_EXTENSIONS = (sysconfig.get_config_var('TEST_MODULES') == 'yes') +@@ -56,7 +56,10 @@ + # This global variable is used to hold the list of modules to be disabled. -DISABLED_MODULE_LIST = [] @@ -104,5 +104,5 @@ index 770866bca7..b6c829b3a5 100644 # --list-module-names option used by Tools/scripts/generate_module_names.py LIST_MODULE_NAMES = False -- -2.25.1 +2.34.1 diff --git a/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch b/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch index 03113484051..9a55d2582d8 100644 --- a/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch +++ b/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch @@ -1,4 +1,4 @@ -From 61af65485f1dade4aa08d0cf2b24082aeda24c51 Mon Sep 17 00:00:00 2001 +From 132b9dca3bb4d4682f7e318648ce11e1abb31b62 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:33:14 +0100 Subject: [PATCH] Adjust library/header paths for cross-compilation @@ -23,10 +23,10 @@ Refresh for 3.10.0 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py -index 1a9bd12..3cf7d67 100644 +index f287b34998..298234d6a1 100644 --- a/Lib/distutils/command/build_ext.py +++ b/Lib/distutils/command/build_ext.py -@@ -234,7 +234,10 @@ class build_ext(Command): +@@ -234,7 +234,10 @@ def finalize_options(self): if (sysconfig.get_config_var('Py_ENABLE_SHARED')): if not sysconfig.python_build: # building third party extensions @@ -39,10 +39,10 @@ index 1a9bd12..3cf7d67 100644 # building python standard extensions self.library_dirs.append('.') diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py -index 95b48f6..9fb1956 100644 +index ebe3711827..6328ec41af 100644 --- a/Lib/sysconfig.py +++ b/Lib/sysconfig.py -@@ -123,10 +123,17 @@ _SCHEME_KEYS = ('stdlib', 'platstdlib', 'purelib', 'platlib', 'include', +@@ -168,10 +168,17 @@ def joinuser(*args): _PY_VERSION = sys.version.split()[0] _PY_VERSION_SHORT = f'{sys.version_info[0]}.{sys.version_info[1]}' _PY_VERSION_SHORT_NO_DOT = f'{sys.version_info[0]}{sys.version_info[1]}' @@ -65,5 +65,5 @@ index 95b48f6..9fb1956 100644 _USER_BASE = None -- -2.30.2 +2.34.1 diff --git a/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch b/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch index 3e224995a58..78b3ae596d1 100644 --- a/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch +++ b/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch @@ -1,4 +1,4 @@ -From 60d71e37d167ea89445250be436170a6cfee84e7 Mon Sep 17 00:00:00 2001 +From 5d13e384b30a2c0b1c7b65718590b7fb0c3ba55e Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:36:00 +0100 Subject: [PATCH] Don't look in /usr/lib/termcap for libraries @@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/setup.py b/setup.py -index 66d372a..e632b6f 100644 +index e496ee34c2..1904898165 100644 --- a/setup.py +++ b/setup.py -@@ -1147,12 +1147,9 @@ class PyBuildExt(build_ext): +@@ -1107,12 +1107,9 @@ def detect_readline_curses(self): pass # Issue 7384: Already linked against curses or tinfo. elif curses_library: readline_libs.append(curses_library) @@ -23,9 +23,9 @@ index 66d372a..e632b6f 100644 readline_libs.append('termcap') self.add(Extension('readline', ['readline.c'], - library_dirs=['/usr/lib/termcap'], - extra_link_args=readline_extra_link_args, libraries=readline_libs)) else: + self.missing.append('readline') -- -2.25.1 +2.34.1 diff --git a/package/python3/0006-Don-t-add-multiarch-paths.patch b/package/python3/0006-Don-t-add-multiarch-paths.patch index 48d8cc790eb..749e295df1f 100644 --- a/package/python3/0006-Don-t-add-multiarch-paths.patch +++ b/package/python3/0006-Don-t-add-multiarch-paths.patch @@ -1,4 +1,4 @@ -From f5933b8f973cd11698b52d535a10d0474e49f5a5 Mon Sep 17 00:00:00 2001 +From ad463b5d58ae79f69b011fb048861bd874d34369 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:36:27 +0100 Subject: [PATCH] Don't add multiarch paths @@ -17,10 +17,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index ec3ba60607..e27620035c 100644 +index 1904898165..32294546b6 100644 --- a/setup.py +++ b/setup.py -@@ -830,10 +830,10 @@ class PyBuildExt(build_ext): +@@ -852,10 +852,10 @@ def configure_compiler(self): if not CROSS_COMPILING: add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') @@ -33,5 +33,5 @@ index ec3ba60607..e27620035c 100644 def init_inc_lib_dirs(self): -- -2.25.1 +2.34.1 diff --git a/package/python3/0007-Abort-on-failed-module-build.patch b/package/python3/0007-Abort-on-failed-module-build.patch index 32e2261a055..a4738961279 100644 --- a/package/python3/0007-Abort-on-failed-module-build.patch +++ b/package/python3/0007-Abort-on-failed-module-build.patch @@ -1,4 +1,4 @@ -From 188c0ebfdb71f5252fa7701013b8d1209f28aef7 Mon Sep 17 00:00:00 2001 +From 60b1664a7acebadb1a3d6df871145147f33b5afe Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:43:24 +0100 Subject: [PATCH] Abort on failed module build @@ -14,10 +14,10 @@ Signed-off-by: Thomas Petazzoni 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py -index e27620035c..d3f0e663f2 100644 +index 32294546b6..0e04944ce0 100644 --- a/setup.py +++ b/setup.py -@@ -561,6 +561,7 @@ class PyBuildExt(build_ext): +@@ -579,6 +579,7 @@ def print_three_column(lst): print("Failed to build these modules:") print_three_column(failed) print() @@ -26,5 +26,5 @@ index e27620035c..d3f0e663f2 100644 if self.failed_on_import: failed = self.failed_on_import[:] -- -2.25.1 +2.34.1 diff --git a/package/python3/0008-Serial-ioctl-workaround.patch b/package/python3/0008-Serial-ioctl-workaround.patch index df31cd62200..7722a04f389 100644 --- a/package/python3/0008-Serial-ioctl-workaround.patch +++ b/package/python3/0008-Serial-ioctl-workaround.patch @@ -1,4 +1,4 @@ -From 9e6211b0d6d4610e5fb7d2c7e1152eb7c64d968b Mon Sep 17 00:00:00 2001 +From 90f3075b629d90d942da1d22ef7563f7149f4f6c Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 23 Dec 2015 11:44:02 +0100 Subject: [PATCH] Serial ioctl() workaround @@ -15,7 +15,7 @@ Signed-off-by: Baruch Siach 1 file changed, 2 insertions(+) diff --git a/Modules/termios.c b/Modules/termios.c -index 75e5e52320..eefbddfe69 100644 +index 354e5ca18d..c08957c500 100644 --- a/Modules/termios.c +++ b/Modules/termios.c @@ -15,7 +15,9 @@ @@ -29,5 +29,5 @@ index 75e5e52320..eefbddfe69 100644 /* HP-UX requires that this be included to pick up MDCD, MCTS, MDSR, * MDTR, MRI, and MRTS (apparently used internally by some things -- -2.25.1 +2.34.1 diff --git a/package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch b/package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch index 8a77fe3708f..eff8fc7694c 100644 --- a/package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch +++ b/package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch @@ -1,4 +1,4 @@ -From cb595a591c71e0bf7c63a3706b0be45ac6a642e3 Mon Sep 17 00:00:00 2001 +From 2439bd2ed5dbdd7e5fda15adefd0f6f1b047ec1b Mon Sep 17 00:00:00 2001 From: Christophe Vu-Brugier Date: Wed, 23 Dec 2015 11:44:30 +0100 Subject: [PATCH] Do not adjust the shebang of Python scripts for @@ -21,7 +21,7 @@ diff --git a/Lib/distutils/command/build_scripts.py b/Lib/distutils/command/buil index ccc70e6465..d6d54195c1 100644 --- a/Lib/distutils/command/build_scripts.py +++ b/Lib/distutils/command/build_scripts.py -@@ -91,7 +91,7 @@ class build_scripts(Command): +@@ -91,7 +91,7 @@ def copy_scripts(self): adjust = True post_interp = match.group(1) or b'' @@ -31,5 +31,5 @@ index ccc70e6465..d6d54195c1 100644 self.build_dir) updated_files.append(outfile) -- -2.25.1 +2.34.1 diff --git a/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch b/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch index a1f9ab6cd93..f26ee85b61a 100644 --- a/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch +++ b/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch @@ -1,4 +1,4 @@ -From eb51497e4b5799f8ab0277426d3e54414acb9d4b Mon Sep 17 00:00:00 2001 +From 55ef5552e4ee60266e3299f253bec3b13785e585 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 20 Nov 2014 13:24:59 +0100 Subject: [PATCH] Misc/python-config.sh.in: ensure sed invocations only match @@ -63,5 +63,5 @@ index 2602fe24c0..a1bc3cd5f7 100644 PYTHONFRAMEWORK="@PYTHONFRAMEWORK@" INCDIR="-I$includedir/python${VERSION}${ABIFLAGS}" -- -2.25.1 +2.34.1 diff --git a/package/python3/0011-Add-an-option-to-disable-pydoc.patch b/package/python3/0011-Add-an-option-to-disable-pydoc.patch new file mode 100644 index 00000000000..f7bfd437bbe --- /dev/null +++ b/package/python3/0011-Add-an-option-to-disable-pydoc.patch @@ -0,0 +1,100 @@ +From 38b7f7949258aeadf8bc45525be91340bb732a2a 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 + +It removes 0.5 MB of data from the target plus the pydoc script +itself. + +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 +--- + Makefile.pre.in | 7 ++++++- + configure.ac | 6 ++++++ + setup.py | 9 +++++++-- + 3 files changed, 19 insertions(+), 3 deletions(-) + +diff --git a/Makefile.pre.in b/Makefile.pre.in +index c1cfb96767..403380e181 100644 +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -1864,7 +1864,9 @@ bininstall: 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 \ +@@ -1915,7 +1917,6 @@ LIBSUBDIRS= asyncio \ + lib2to3 lib2to3/fixes lib2to3/pgen2 \ + logging \ + multiprocessing multiprocessing/dummy \ +- pydoc_data \ + re \ + site-packages \ + sqlite3 \ +@@ -2008,6 +2009,10 @@ TESTSUBDIRS= ctypes/test \ + tkinter/test/test_ttk \ + unittest/test unittest/test/testmock + ++ifeq (@PYDOC@,yes) ++LIBSUBDIRS += pydoc_data ++endif ++ + TEST_MODULES=@TEST_MODULES@ + libinstall: all $(srcdir)/Modules/xxmodule.c + @for i in $(SCRIPTDIR) $(LIBDEST); \ +diff --git a/configure.ac b/configure.ac +index 5a6a1fe608..f68ea72321 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4171,6 +4171,12 @@ AS_VAR_IF([posix_threads], [stub], [ + AC_DEFINE([HAVE_PTHREAD_STUBS], [1], [Define if platform requires stubbed pthreads support]) + ]) + ++AC_SUBST(PYDOC) ++ ++AC_ARG_ENABLE(pydoc, ++ AS_HELP_STRING([--disable-pydoc], [disable pydoc]), ++ [ PYDOC="${enableval}" ], [ PYDOC=yes ]) ++ + # Check for enable-ipv6 + AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified]) + AC_MSG_CHECKING([if --enable-ipv6 is specified]) +diff --git a/setup.py b/setup.py +index 0e04944ce0..3e55f5b2e0 100644 +--- a/setup.py ++++ b/setup.py +@@ -1593,6 +1593,12 @@ class DummyProcess: + # turn off warnings when deprecated modules are imported + import warnings + warnings.filterwarnings("ignore",category=DeprecationWarning) ++ ++ scripts = ['Tools/scripts/idle3', 'Tools/scripts/2to3', ++ 'Lib/smtpd.py'] ++ if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"): ++ scripts += [ 'Tools/scripts/pydoc3' ] ++ + setup(# PyPI Metadata (PEP 301) + name = "Python", + version = sys.version.split()[0], +@@ -1617,8 +1623,7 @@ class DummyProcess: + # If you change the scripts installed here, you also need to + # check the PyBuildScripts command above, and change the links + # created by the bininstall target in Makefile.pre.in +- scripts = ["Tools/scripts/pydoc3", "Tools/scripts/idle3", +- "Tools/scripts/2to3"] ++ scripts = scripts + ) + + # --install-platlib +-- +2.34.1 + diff --git a/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch b/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch deleted file mode 100644 index 4d021d86a42..00000000000 --- a/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch +++ /dev/null @@ -1,39 +0,0 @@ -From e4ae670e3489544a49dabd1618c32fe73504a7ba Mon Sep 17 00:00:00 2001 -From: Samuel Cabrero -Date: Wed, 23 Dec 2015 11:45:48 +0100 -Subject: [PATCH] Override system locale and set to default when adding gcc - paths - -Forces the use of the default locale in the function -add_gcc_paths, which is called when cross compiling to add the -include and library paths. This is necessary because otherwise -the gcc output is localized and the output parsing fails, which -results in no paths added and detect_modules not able to find -any system library (eg. libz, libssl, etc.) - -[Thomas: patch taken from https://bugs.python.org/issue23767.] - -Signed-off-by: Samuel Cabrero -Signed-off-by: Thomas Petazzoni -[james.hilliard1@gmail.com: adapt to python 3.9] -Signed-off-by: James Hilliard ---- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index d3f0e663f2..926c16f58f 100644 ---- a/setup.py -+++ b/setup.py -@@ -761,7 +761,7 @@ class PyBuildExt(build_ext): - tmpfile = os.path.join(self.build_temp, 'ccpaths') - if not os.path.exists(self.build_temp): - os.makedirs(self.build_temp) -- ret = run_command('%s -E -v - %s 1>/dev/null' % (CC, tmpfile)) -+ ret = run_command('LC_ALL=C %s -E -v - %s 1>/dev/null' % (CC, tmpfile)) - is_gcc = False - is_clang = False - in_incdirs = False --- -2.25.1 - diff --git a/package/python3/0012-Add-an-option-to-disable-lib2to3.patch b/package/python3/0012-Add-an-option-to-disable-lib2to3.patch new file mode 100644 index 00000000000..228b86a90ba --- /dev/null +++ b/package/python3/0012-Add-an-option-to-disable-lib2to3.patch @@ -0,0 +1,122 @@ +From 0e4f0a525ea0a68f6d4c5349c301da2e9b0c8ac9 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 +--- + Makefile.pre.in | 17 ++++++++++++----- + configure.ac | 6 ++++++ + setup.py | 6 +++--- + 3 files changed, 21 insertions(+), 8 deletions(-) + +diff --git a/Makefile.pre.in b/Makefile.pre.in +index 403380e181..f5d0573067 100644 +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -1868,7 +1868,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)) \ +@@ -1914,7 +1916,6 @@ LIBSUBDIRS= asyncio \ + idlelib idlelib/Icons \ + importlib importlib/resources importlib/metadata \ + json \ +- lib2to3 lib2to3/fixes lib2to3/pgen2 \ + logging \ + multiprocessing multiprocessing/dummy \ + re \ +@@ -1934,10 +1935,6 @@ LIBSUBDIRS= asyncio \ + TESTSUBDIRS= ctypes/test \ + distutils/tests \ + idlelib/idle_test \ +- lib2to3/tests \ +- lib2to3/tests/data \ +- lib2to3/tests/data/fixers \ +- lib2to3/tests/data/fixers/myfixes \ + test \ + test/audiodata \ + test/capath \ +@@ -2013,6 +2010,14 @@ ifeq (@PYDOC@,yes) + LIBSUBDIRS += pydoc_data + endif + ++ifeq (@LIB2TO3@,yes) ++LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2 ++TESTSUBDIRS += lib2to3/tests \ ++ lib2to3/tests/data \ ++ lib2to3/tests/data/fixers \ ++ lib2to3/tests/data/fixers/myfixes ++endif ++ + TEST_MODULES=@TEST_MODULES@ + libinstall: all $(srcdir)/Modules/xxmodule.c + @for i in $(SCRIPTDIR) $(LIBDEST); \ +@@ -2115,10 +2120,12 @@ ifeq (@PYC_BUILD@,yes) + -j0 -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. +diff --git a/configure.ac b/configure.ac +index f68ea72321..d8e10cf2b2 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -7078,6 +7078,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(Makefile.pre Misc/python.pc Misc/python-embed.pc Misc/python-config.sh) + AC_CONFIG_FILES([Modules/Setup.bootstrap Modules/Setup.stdlib]) +diff --git a/setup.py b/setup.py +index 3e55f5b2e0..c490b0b08f 100644 +--- a/setup.py ++++ b/setup.py +@@ -1594,11 +1594,11 @@ class DummyProcess: + import warnings + warnings.filterwarnings("ignore",category=DeprecationWarning) + +- scripts = ['Tools/scripts/idle3', 'Tools/scripts/2to3', +- 'Lib/smtpd.py'] ++ scripts = ['Tools/scripts/idle3', 'Lib/smtpd.py'] + if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"): + scripts += [ 'Tools/scripts/pydoc3' ] +- ++ if not '--disable-lib2to3' in sysconfig.get_config_var("CONFIG_ARGS"): ++ scripts += [ 'Tools/scripts/2to3' ] + setup(# PyPI Metadata (PEP 301) + name = "Python", + version = sys.version.split()[0], +-- +2.34.1 + diff --git a/package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch b/package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch deleted file mode 100644 index b18f94ab4ec..00000000000 --- a/package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch +++ /dev/null @@ -1,105 +0,0 @@ -From e2ea659eac1849db471d3c01a0d0af9d6fca2e9a Mon Sep 17 00:00:00 2001 -From: Christophe Vu-Brugier -Date: Wed, 22 Feb 2017 16:48:49 -0800 -Subject: [PATCH] Add importlib fix for PEP 3147 issue - -Python 3 has a new standard for installing .pyc file, called PEP -3147. Unfortunately, this standard requires both the .py and .pyc -files to be installed for a Python module to be found. This is quite -annoying on space-constrained embedded systems, since the .py file is -technically not required for execution. - -This patch changes cache_from_source() and source_from_cache() in -importlib to get rid of the "__pycache__" directory. -This effectively disables PEP 3147 for: - -* The python standard library -* Packages built with distutils or setuptools -* Packages built with automake that use the `py-compile` helper - -Signed-off-by: Christophe Vu-Brugier -[ Andrey Smirnov: ported to Python 3.6 ] -Signed-off-by: Andrey Smirnov ---- - Lib/importlib/_bootstrap_external.py | 44 ++++------------------------ - 1 file changed, 5 insertions(+), 39 deletions(-) - -diff --git a/Lib/importlib/_bootstrap_external.py b/Lib/importlib/_bootstrap_external.py -index 25a3f8c0e0..2cb9a9aa52 100644 ---- a/Lib/importlib/_bootstrap_external.py -+++ b/Lib/importlib/_bootstrap_external.py -@@ -392,8 +392,6 @@ def cache_from_source(path, debug_override=None, *, optimization=None): - a True value is the same as setting 'optimization' to the empty string - while a False value is equivalent to setting 'optimization' to '1'. - -- If sys.implementation.cache_tag is None then NotImplementedError is raised. -- - """ - if debug_override is not None: - _warnings.warn('the debug_override parameter is deprecated; use ' -@@ -405,10 +403,7 @@ def cache_from_source(path, debug_override=None, *, optimization=None): - path = _os.fspath(path) - head, tail = _path_split(path) - base, sep, rest = tail.rpartition('.') -- tag = sys.implementation.cache_tag -- if tag is None: -- raise NotImplementedError('sys.implementation.cache_tag is None') -- almost_filename = ''.join([(base if base else rest), sep, tag]) -+ almost_filename = ''.join([(base if base else rest)]) - if optimization is None: - if sys.flags.optimize == 0: - optimization = '' -@@ -445,46 +440,17 @@ def cache_from_source(path, debug_override=None, *, optimization=None): - head.lstrip(path_separators), - filename, - ) -- return _path_join(head, _PYCACHE, filename) -+ return _path_join(head, filename) - - - def source_from_cache(path): - """Given the path to a .pyc. file, return the path to its .py file. - - The .pyc file does not need to exist; this simply returns the path to -- the .py file calculated to correspond to the .pyc file. If path does -- not conform to PEP 3147/488 format, ValueError will be raised. If -- sys.implementation.cache_tag is None then NotImplementedError is raised. -- -+ the .py file calculated to correspond to the .pyc file. - """ -- if sys.implementation.cache_tag is None: -- raise NotImplementedError('sys.implementation.cache_tag is None') -- path = _os.fspath(path) -- head, pycache_filename = _path_split(path) -- found_in_pycache_prefix = False -- if sys.pycache_prefix is not None: -- stripped_path = sys.pycache_prefix.rstrip(path_separators) -- if head.startswith(stripped_path + path_sep): -- head = head[len(stripped_path):] -- found_in_pycache_prefix = True -- if not found_in_pycache_prefix: -- head, pycache = _path_split(head) -- if pycache != _PYCACHE: -- raise ValueError(f'{_PYCACHE} not bottom-level directory in ' -- f'{path!r}') -- dot_count = pycache_filename.count('.') -- if dot_count not in {2, 3}: -- raise ValueError(f'expected only 2 or 3 dots in {pycache_filename!r}') -- elif dot_count == 3: -- optimization = pycache_filename.rsplit('.', 2)[-2] -- if not optimization.startswith(_OPT): -- raise ValueError("optimization portion of filename does not start " -- f"with {_OPT!r}") -- opt_level = optimization[len(_OPT):] -- if not opt_level.isalnum(): -- raise ValueError(f"optimization level {optimization!r} is not an " -- "alphanumeric value") -- base_filename = pycache_filename.partition('.')[0] -+ head, filename = _path_split(path) -+ base_filename = filename.partition('.')[0] - return _path_join(head, base_filename + SOURCE_SUFFIXES[0]) - - --- -2.25.1 - diff --git a/package/python3/0013-Add-an-option-to-disable-pydoc.patch b/package/python3/0013-Add-an-option-to-disable-pydoc.patch deleted file mode 100644 index a843c8c1265..00000000000 --- a/package/python3/0013-Add-an-option-to-disable-pydoc.patch +++ /dev/null @@ -1,100 +0,0 @@ -From a65e5d3caf8e076d531191164c23c6240461f675 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 - -It removes 0.5 MB of data from the target plus the pydoc script -itself. - -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 ---- - Makefile.pre.in | 7 ++++++- - configure.ac | 6 ++++++ - setup.py | 9 +++++++-- - 3 files changed, 19 insertions(+), 3 deletions(-) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index c0d5511..32b3df7 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -1391,7 +1391,9 @@ bininstall: 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 \ -@@ -1442,7 +1444,6 @@ LIBSUBDIRS= asyncio \ - lib2to3 lib2to3/fixes lib2to3/pgen2 \ - logging \ - multiprocessing multiprocessing/dummy \ -- pydoc_data \ - site-packages \ - sqlite3 \ - tkinter \ -@@ -1530,6 +1531,10 @@ TESTSUBDIRS= ctypes/test \ - tkinter/test/test_ttk \ - unittest/test unittest/test/testmock - -+ifeq (@PYDOC@,yes) -+LIBSUBDIRS += pydoc_data -+endif -+ - TEST_MODULES=@TEST_MODULES@ - libinstall: build_all $(srcdir)/Modules/xxmodule.c - @for i in $(SCRIPTDIR) $(LIBDEST); \ -diff --git a/configure.ac b/configure.ac -index 083a12d..9079531 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3373,6 +3373,12 @@ if test "$posix_threads" = "yes"; then - AC_CHECK_FUNCS(pthread_getcpuclockid) - fi - -+AC_SUBST(PYDOC) -+ -+AC_ARG_ENABLE(pydoc, -+ AS_HELP_STRING([--disable-pydoc], [disable pydoc]), -+ [ PYDOC="${enableval}" ], [ PYDOC=yes ]) -+ - - # Check for enable-ipv6 - AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified]) -diff --git a/setup.py b/setup.py -index d00d389..d23f148 100644 ---- a/setup.py -+++ b/setup.py -@@ -2721,6 +2721,12 @@ def main(): - # turn off warnings when deprecated modules are imported - import warnings - warnings.filterwarnings("ignore",category=DeprecationWarning) -+ -+ scripts = ['Tools/scripts/idle3', 'Tools/scripts/2to3', -+ 'Lib/smtpd.py'] -+ if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"): -+ scripts += [ 'Tools/scripts/pydoc3' ] -+ - setup(# PyPI Metadata (PEP 301) - name = "Python", - version = sys.version.split()[0], -@@ -2746,8 +2752,7 @@ def main(): - # If you change the scripts installed here, you also need to - # check the PyBuildScripts command above, and change the links - # created by the bininstall target in Makefile.pre.in -- scripts = ["Tools/scripts/pydoc3", "Tools/scripts/idle3", -- "Tools/scripts/2to3"] -+ scripts = scripts - ) - - # --install-platlib --- -2.30.2 - diff --git a/package/python3/0013-Add-option-to-disable-the-sqlite3-module.patch b/package/python3/0013-Add-option-to-disable-the-sqlite3-module.patch new file mode 100644 index 00000000000..795ea3b898b --- /dev/null +++ b/package/python3/0013-Add-option-to-disable-the-sqlite3-module.patch @@ -0,0 +1,62 @@ +From ef8c030e01b1be8be582e90c31298a5863094858 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Wed, 22 Feb 2017 17:20:45 -0800 +Subject: [PATCH] Add option to disable the sqlite3 module + +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 +--- + Makefile.pre.in | 5 ++++- + configure.ac | 9 +++++++++ + 2 files changed, 13 insertions(+), 1 deletion(-) + +diff --git a/Makefile.pre.in b/Makefile.pre.in +index f5d0573067..9f4cdf14cf 100644 +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -1920,7 +1920,6 @@ LIBSUBDIRS= asyncio \ + multiprocessing multiprocessing/dummy \ + re \ + site-packages \ +- sqlite3 \ + tkinter \ + tomllib \ + turtledemo \ +@@ -2018,6 +2017,10 @@ TESTSUBDIRS += lib2to3/tests \ + lib2to3/tests/data/fixers/myfixes + endif + ++ifeq (@SQLITE3@,yes) ++LIBSUBDIRS += sqlite3 ++endif ++ + TEST_MODULES=@TEST_MODULES@ + libinstall: all $(srcdir)/Modules/xxmodule.c + @for i in $(SCRIPTDIR) $(LIBDEST); \ +diff --git a/configure.ac b/configure.ac +index d8e10cf2b2..4cc0951ab9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4171,6 +4171,15 @@ AS_VAR_IF([posix_threads], [stub], [ + AC_DEFINE([HAVE_PTHREAD_STUBS], [1], [Define if platform requires stubbed pthreads support]) + ]) + ++AC_SUBST(SQLITE3) ++AC_ARG_ENABLE(sqlite3, ++ AS_HELP_STRING([--disable-sqlite3], [disable sqlite3]), ++ [ SQLITE3="${enableval}" ], [ SQLITE3=yes ]) ++ ++if test "$SQLITE3" = "no" ; then ++ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3" ++fi ++ + AC_SUBST(PYDOC) + + AC_ARG_ENABLE(pydoc, +-- +2.34.1 + diff --git a/package/python3/0014-Add-an-option-to-disable-lib2to3.patch b/package/python3/0014-Add-an-option-to-disable-lib2to3.patch deleted file mode 100644 index c8f2e528bfc..00000000000 --- a/package/python3/0014-Add-an-option-to-disable-lib2to3.patch +++ /dev/null @@ -1,119 +0,0 @@ -From f034b1b0f33a7bd4dde23f0bc1fa8e00e3518c9d 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 ---- - Makefile.pre.in | 17 ++++++++++++----- - configure.ac | 5 +++++ - setup.py | 6 +++--- - 3 files changed, 20 insertions(+), 8 deletions(-) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index 28cf88e..63fa9fb 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -1395,7 +1395,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)) \ -@@ -1441,7 +1443,6 @@ LIBSUBDIRS= asyncio \ - idlelib idlelib/Icons \ - importlib importlib/metadata \ - json \ -- lib2to3 lib2to3/fixes lib2to3/pgen2 \ - logging \ - multiprocessing multiprocessing/dummy \ - site-packages \ -@@ -1458,10 +1459,6 @@ LIBSUBDIRS= asyncio \ - TESTSUBDIRS= ctypes/test \ - distutils/tests \ - idlelib/idle_test \ -- lib2to3/tests \ -- lib2to3/tests/data \ -- lib2to3/tests/data/fixers \ -- lib2to3/tests/data/fixers/myfixes \ - sqlite3/test \ - test test/audiodata \ - test/capath test/cjkencodings \ -@@ -1535,6 +1532,14 @@ ifeq (@PYDOC@,yes) - LIBSUBDIRS += pydoc_data - endif - -+ifeq (@LIB2TO3@,yes) -+LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2 -+TESTSUBDIRS += lib2to3/tests \ -+ lib2to3/tests/data \ -+ lib2to3/tests/data/fixers \ -+ lib2to3/tests/data/fixers/myfixes -+endif -+ - TEST_MODULES=@TEST_MODULES@ - libinstall: build_all $(srcdir)/Modules/xxmodule.c - @for i in $(SCRIPTDIR) $(LIBDEST); \ -@@ -1637,10 +1642,12 @@ ifeq (@PYC_BUILD@,yes) - -j0 -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. -diff --git a/configure.ac b/configure.ac -index 9079531..34c2ba9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -6014,6 +6014,11 @@ else - fi - AC_SUBST(TEST_MODULES) - -+AC_SUBST(LIB2TO3) -+ -+AC_ARG_ENABLE(lib2to3, -+ AS_HELP_STRING([--disable-lib2to3], [disable lib2to3]), -+ [ LIB2TO3="${enableval}" ], [ LIB2TO3=yes ]) - - # generate output files - AC_CONFIG_FILES(Makefile.pre Misc/python.pc Misc/python-embed.pc Misc/python-config.sh) -diff --git a/setup.py b/setup.py -index d23f148..663fd44 100644 ---- a/setup.py -+++ b/setup.py -@@ -2722,11 +2722,11 @@ def main(): - import warnings - warnings.filterwarnings("ignore",category=DeprecationWarning) - -- scripts = ['Tools/scripts/idle3', 'Tools/scripts/2to3', -- 'Lib/smtpd.py'] -+ scripts = ['Tools/scripts/idle3', 'Lib/smtpd.py'] - if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"): - scripts += [ 'Tools/scripts/pydoc3' ] -- -+ if not '--disable-lib2to3' in sysconfig.get_config_var("CONFIG_ARGS"): -+ scripts += [ 'Tools/scripts/2to3' ] - setup(# PyPI Metadata (PEP 301) - name = "Python", - version = sys.version.split()[0], --- -2.30.2 - diff --git a/package/python3/0014-Add-an-option-to-disable-the-tk-module.patch b/package/python3/0014-Add-an-option-to-disable-the-tk-module.patch new file mode 100644 index 00000000000..b89e1d27bce --- /dev/null +++ b/package/python3/0014-Add-an-option-to-disable-the-tk-module.patch @@ -0,0 +1,77 @@ +From bbbfe699d648a5cb191203b16e1786e8cf4ea908 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 + +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 +--- + Makefile.pre.in | 10 +++++++--- + configure.ac | 9 +++++++++ + 2 files changed, 16 insertions(+), 3 deletions(-) + +diff --git a/Makefile.pre.in b/Makefile.pre.in +index 9f4cdf14cf..4f83911200 100644 +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -1920,7 +1920,6 @@ LIBSUBDIRS= asyncio \ + multiprocessing multiprocessing/dummy \ + re \ + site-packages \ +- tkinter \ + tomllib \ + turtledemo \ + unittest \ +@@ -2038,9 +2038,6 @@ + test/xmltestdata \ + test/xmltestdata/c14n-20 \ + test/ziptestdata \ +- tkinter/test \ +- tkinter/test/test_tkinter \ +- tkinter/test/test_ttk \ + unittest/test \ + unittest/test/testmock + ifeq (@PYDOC@,yes) +@@ -2021,6 +2018,13 @@ ifeq (@SQLITE3@,yes) + LIBSUBDIRS += sqlite3 + endif + ++ifeq (@TK@,yes) ++LIBSUBDIRS += tkinter ++TESTSUBDIRS += tkinter/test tkinter/test/test_tkinter \ ++ tkinter/test/test_ttk ++endif ++ ++ + TEST_MODULES=@TEST_MODULES@ + libinstall: all $(srcdir)/Modules/xxmodule.c + @for i in $(SCRIPTDIR) $(LIBDEST); \ +diff --git a/configure.ac b/configure.ac +index 4cc0951ab9..f4ce506801 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4180,6 +4180,15 @@ if test "$SQLITE3" = "no" ; then + DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3" + fi + ++AC_SUBST(TK) ++AC_ARG_ENABLE(tk, ++ AS_HELP_STRING([--disable-tk], [disable tk]), ++ [ TK="${enableval}" ], [ TK=yes ]) ++ ++if test "$TK" = "no"; then ++ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter" ++fi ++ + AC_SUBST(PYDOC) + + AC_ARG_ENABLE(pydoc, +-- +2.34.1 + diff --git a/package/python3/0015-Add-an-option-to-disable-the-curses-module.patch b/package/python3/0015-Add-an-option-to-disable-the-curses-module.patch new file mode 100644 index 00000000000..da6f891104b --- /dev/null +++ b/package/python3/0015-Add-an-option-to-disable-the-curses-module.patch @@ -0,0 +1,61 @@ +From 03e28cdd46dac1b7e4e9c8bbd2ea44b09e514205 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 + +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 +--- + Makefile.pre.in | 4 +++- + configure.ac | 9 +++++++++ + 2 files changed, 12 insertions(+), 1 deletion(-) + +diff --git a/Makefile.pre.in b/Makefile.pre.in +index 4f83911200..8e879b35c6 100644 +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -1905,7 +1905,6 @@ LIBSUBDIRS= asyncio \ + concurrent concurrent/futures \ + csv \ + ctypes ctypes/macholib \ +- curses \ + dbm \ + distutils distutils/command \ + email email/mime \ +@@ -2024,6 +2023,9 @@ TESTSUBDIRS += tkinter/test tkinter/test/test_tkinter \ + tkinter/test/test_ttk + endif + ++ifeq (@CURSES@,yes) ++LIBSUBDIRS += curses ++endif + + TEST_MODULES=@TEST_MODULES@ + libinstall: all $(srcdir)/Modules/xxmodule.c +diff --git a/configure.ac b/configure.ac +index f4ce506801..0ae9863cd6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4189,6 +4189,15 @@ if test "$TK" = "no"; then + DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter" + fi + ++AC_SUBST(CURSES) ++AC_ARG_ENABLE(curses, ++ AS_HELP_STRING([--disable-curses], [disable curses]), ++ [ CURSES="${enableval}" ], [ CURSES=yes ]) ++ ++if test "$CURSES" = "no"; then ++ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _curses _curses_panel" ++fi ++ + AC_SUBST(PYDOC) + + AC_ARG_ENABLE(pydoc, +-- +2.34.1 + diff --git a/package/python3/0015-Add-option-to-disable-the-sqlite3-module.patch b/package/python3/0015-Add-option-to-disable-the-sqlite3-module.patch deleted file mode 100644 index 81fa52bb73c..00000000000 --- a/package/python3/0015-Add-option-to-disable-the-sqlite3-module.patch +++ /dev/null @@ -1,71 +0,0 @@ -From dd2722dec08eb9c72c36313e93661eeca3ad64d8 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 22 Feb 2017 17:20:45 -0800 -Subject: [PATCH] Add option to disable the sqlite3 module - -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 ---- - Makefile.pre.in | 7 +++++-- - configure.ac | 9 +++++++++ - 2 files changed, 14 insertions(+), 2 deletions(-) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index 5847029..5628860 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -1446,7 +1446,6 @@ LIBSUBDIRS= asyncio \ - logging \ - multiprocessing multiprocessing/dummy \ - site-packages \ -- sqlite3 \ - tkinter \ - turtledemo \ - unittest \ -@@ -1459,7 +1458,6 @@ LIBSUBDIRS= asyncio \ - TESTSUBDIRS= ctypes/test \ - distutils/tests \ - idlelib/idle_test \ -- sqlite3/test \ - test test/audiodata \ - test/capath test/cjkencodings \ - test/data test/decimaltestdata \ -@@ -1540,6 +1538,11 @@ TESTSUBDIRS += lib2to3/tests \ - lib2to3/tests/data/fixers/myfixes - endif - -+ifeq (@SQLITE3@,yes) -+LIBSUBDIRS += sqlite3 -+TESTSUBDIRS += sqlite3/test -+endif -+ - TEST_MODULES=@TEST_MODULES@ - libinstall: build_all $(srcdir)/Modules/xxmodule.c - @for i in $(SCRIPTDIR) $(LIBDEST); \ -diff --git a/configure.ac b/configure.ac -index 34c2ba9..dfee472 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3373,6 +3373,15 @@ if test "$posix_threads" = "yes"; then - AC_CHECK_FUNCS(pthread_getcpuclockid) - fi - -+AC_SUBST(SQLITE3) -+AC_ARG_ENABLE(sqlite3, -+ AS_HELP_STRING([--disable-sqlite3], [disable sqlite3]), -+ [ SQLITE3="${enableval}" ], [ SQLITE3=yes ]) -+ -+if test "$SQLITE3" = "no" ; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3" -+fi -+ - AC_SUBST(PYDOC) - - AC_ARG_ENABLE(pydoc, --- -2.30.2 - diff --git a/package/python3/0016-Add-an-option-to-disable-expat.patch b/package/python3/0016-Add-an-option-to-disable-expat.patch new file mode 100644 index 00000000000..c30740762a1 --- /dev/null +++ b/package/python3/0016-Add-an-option-to-disable-expat.patch @@ -0,0 +1,82 @@ +From c9a2ea3edacf57746517600ccc11c254a9fd6c48 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 + +This patch replaces the existing --with-system-expat option with a +--with-expat={system,builtin,none} option, which allows to tell Python +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). + +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 +--- + Makefile.pre.in | 5 ++++- + configure.ac | 20 ++++++++++++++------ + 2 files changed, 18 insertions(+), 7 deletions(-) + +diff --git a/Makefile.pre.in b/Makefile.pre.in +index 8e879b35c6..80d617cf7f 100644 +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -1925,7 +1925,6 @@ LIBSUBDIRS= asyncio \ + urllib \ + venv venv/scripts venv/scripts/common venv/scripts/posix \ + wsgiref \ +- $(XMLLIBSUBDIRS) \ + xmlrpc \ + zoneinfo \ + __phello__ +@@ -2027,6 +2026,10 @@ ifeq (@CURSES@,yes) + LIBSUBDIRS += curses + endif + ++ifeq (@EXPAT@,yes) ++LIBSUBDIRS += $(XMLLIBSUBDIRS) ++endif ++ + TEST_MODULES=@TEST_MODULES@ + libinstall: all $(srcdir)/Modules/xxmodule.c + @for i in $(SCRIPTDIR) $(LIBDEST); \ +diff --git a/configure.ac b/configure.ac +index 0ae9863cd6..201cad0bfc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3565,15 +3565,23 @@ LIBS="$withval $LIBS" + AC_SUBST(DISABLED_EXTENSIONS) + + # Check for use of the system expat library +-AC_MSG_CHECKING(for --with-system-expat) +-AC_ARG_WITH(system_expat, +- AS_HELP_STRING([--with-system-expat], [build pyexpat module using an installed expat library, see Doc/library/pyexpat.rst (default is no)]), ++AC_MSG_CHECKING(for --with-expat) ++AC_ARG_WITH(expat, ++ AS_HELP_STRING([--with-expat], [select which expat version to use: system, builtin, none]), + [], +- [with_system_expat="no"]) ++ [with_expat="builtin"]) + +-AC_MSG_RESULT($with_system_expat) ++AC_MSG_RESULT($with_expat) + +-AS_VAR_IF([with_system_expat], [yes], [ ++if test "$with_expat" != "none"; then ++ EXPAT=yes ++else ++ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} pyexpat" ++ EXPAT=no ++fi ++AC_SUBST(EXPAT) ++ ++AS_VAR_IF([with_expat], [system], [ + LIBEXPAT_CFLAGS=${LIBEXPAT_CFLAGS-""} + LIBEXPAT_LDFLAGS=${LIBEXPAT_LDFLAGS-"-lexpat"} + LIBEXPAT_INTERNAL= +-- +2.34.1 + diff --git a/package/python3/0016-Add-an-option-to-disable-the-tk-module.patch b/package/python3/0016-Add-an-option-to-disable-the-tk-module.patch deleted file mode 100644 index db79f5691fa..00000000000 --- a/package/python3/0016-Add-an-option-to-disable-the-tk-module.patch +++ /dev/null @@ -1,74 +0,0 @@ -From ad6b66b34f71ff6b60b3be5f6fd3e781cdeecd59 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 - -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 ---- - Makefile.pre.in | 10 +++++++--- - configure.ac | 9 +++++++++ - 2 files changed, 16 insertions(+), 3 deletions(-) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index 5628860..c968113 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -1446,7 +1446,6 @@ LIBSUBDIRS= asyncio \ - logging \ - multiprocessing multiprocessing/dummy \ - site-packages \ -- tkinter \ - turtledemo \ - unittest \ - urllib \ -@@ -1522,8 +1521,6 @@ TESTSUBDIRS= ctypes/test \ - test/tracedmodules \ - test/xmltestdata test/xmltestdata/c14n-20 \ - test/ziptestdata \ -- tkinter/test tkinter/test/test_tkinter \ -- tkinter/test/test_ttk \ - unittest/test unittest/test/testmock - - ifeq (@PYDOC@,yes) -@@ -1543,6 +1540,13 @@ LIBSUBDIRS += sqlite3 - TESTSUBDIRS += sqlite3/test - endif - -+ifeq (@TK@,yes) -+LIBSUBDIRS += tkinter -+TESTSUBDIRS += tkinter/test tkinter/test/test_tkinter \ -+ tkinter/test/test_ttk -+endif -+ -+ - TEST_MODULES=@TEST_MODULES@ - libinstall: build_all $(srcdir)/Modules/xxmodule.c - @for i in $(SCRIPTDIR) $(LIBDEST); \ -diff --git a/configure.ac b/configure.ac -index dfee472..dc76dff 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3382,6 +3382,15 @@ if test "$SQLITE3" = "no" ; then - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3" - fi - -+AC_SUBST(TK) -+AC_ARG_ENABLE(tk, -+ AS_HELP_STRING([--disable-tk], [disable tk]), -+ [ TK="${enableval}" ], [ TK=yes ]) -+ -+if test "$TK" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter" -+fi -+ - AC_SUBST(PYDOC) - - AC_ARG_ENABLE(pydoc, --- -2.30.2 - diff --git a/package/python3/0017-Add-an-option-to-disable-CJK-codecs.patch b/package/python3/0017-Add-an-option-to-disable-CJK-codecs.patch new file mode 100644 index 00000000000..63a07fb514f --- /dev/null +++ b/package/python3/0017-Add-an-option-to-disable-CJK-codecs.patch @@ -0,0 +1,30 @@ +From d8ef6a7a9f2b954cf1c1e37fc3c35055b42af0f5 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Wed, 23 Dec 2015 11:49:55 +0100 +Subject: [PATCH] Add an option to disable CJK codecs + +Signed-off-by: Thomas Petazzoni +--- + configure.ac | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 201cad0bfc..ecdd7dbc07 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4188,6 +4188,12 @@ if test "$SQLITE3" = "no" ; then + DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3" + fi + ++AC_ARG_ENABLE(codecs-cjk, ++ AS_HELP_STRING([--disable-codecs-cjk], [disable CJK codecs]), ++ [ if test "$enableval" = "no"; then ++ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk _codecs_iso2022" ++ fi]) ++ + AC_SUBST(TK) + AC_ARG_ENABLE(tk, + AS_HELP_STRING([--disable-tk], [disable tk]), +-- +2.34.1 + diff --git a/package/python3/0017-Add-an-option-to-disable-the-curses-module.patch b/package/python3/0017-Add-an-option-to-disable-the-curses-module.patch deleted file mode 100644 index 35d92fb7d1a..00000000000 --- a/package/python3/0017-Add-an-option-to-disable-the-curses-module.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 962deb43f5f340a8472d432ae8e6d61186f9040e 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 - -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 ---- - Makefile.pre.in | 4 +++- - configure.ac | 9 +++++++++ - 2 files changed, 12 insertions(+), 1 deletion(-) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index c968113..f89f155 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -1432,7 +1432,6 @@ LIBSUBDIRS= asyncio \ - concurrent concurrent/futures \ - csv \ - ctypes ctypes/macholib \ -- curses \ - dbm \ - distutils distutils/command \ - email email/mime \ -@@ -1546,6 +1545,9 @@ TESTSUBDIRS += tkinter/test tkinter/test/test_tkinter \ - tkinter/test/test_ttk - endif - -+ifeq (@CURSES@,yes) -+LIBSUBDIRS += curses -+endif - - TEST_MODULES=@TEST_MODULES@ - libinstall: build_all $(srcdir)/Modules/xxmodule.c -diff --git a/configure.ac b/configure.ac -index dc76dff..4f1cda5 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3391,6 +3391,15 @@ if test "$TK" = "no"; then - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter" - fi - -+AC_SUBST(CURSES) -+AC_ARG_ENABLE(curses, -+ AS_HELP_STRING([--disable-curses], [disable curses]), -+ [ CURSES="${enableval}" ], [ CURSES=yes ]) -+ -+if test "$CURSES" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _curses _curses_panel" -+fi -+ - AC_SUBST(PYDOC) - - AC_ARG_ENABLE(pydoc, --- -2.30.2 - diff --git a/package/python3/0018-Add-an-option-to-disable-NIS.patch b/package/python3/0018-Add-an-option-to-disable-NIS.patch new file mode 100644 index 00000000000..977955d1cbf --- /dev/null +++ b/package/python3/0018-Add-an-option-to-disable-NIS.patch @@ -0,0 +1,33 @@ +From 09fc9f72ebe60bb65e80732a6bd4f12a84159f6d Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Wed, 23 Dec 2015 11:50:11 +0100 +Subject: [PATCH] Add an option to disable NIS + +NIS is not necessarily available in uClibc, so we need an option to +not compile support for it. + +Signed-off-by: Thomas Petazzoni +--- + configure.ac | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/configure.ac b/configure.ac +index ecdd7dbc07..1bdde7f69d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4194,6 +4194,12 @@ AC_ARG_ENABLE(codecs-cjk, + DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk _codecs_iso2022" + fi]) + ++AC_ARG_ENABLE(nis, ++ AS_HELP_STRING([--disable-nis], [disable NIS]), ++ [ if test "$enableval" = "no"; then ++ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis" ++ fi]) ++ + AC_SUBST(TK) + AC_ARG_ENABLE(tk, + AS_HELP_STRING([--disable-tk], [disable tk]), +-- +2.34.1 + diff --git a/package/python3/0018-Add-an-option-to-disable-expat.patch b/package/python3/0018-Add-an-option-to-disable-expat.patch deleted file mode 100644 index 83c89e1f68a..00000000000 --- a/package/python3/0018-Add-an-option-to-disable-expat.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 7e0e7dc25f50acd6922493ae620ee5cbf107a79a 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 - -This patch replaces the existing --with-system-expat option with a ---with-expat={system,builtin,none} option, which allows to tell Python -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). - -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 ---- - Makefile.pre.in | 5 ++++- - configure.ac | 18 +++++++++++++----- - setup.py | 2 +- - 3 files changed, 18 insertions(+), 7 deletions(-) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index f89f155..08c5e8a 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -1450,7 +1450,6 @@ LIBSUBDIRS= asyncio \ - urllib \ - venv venv/scripts venv/scripts/common venv/scripts/posix \ - wsgiref \ -- $(XMLLIBSUBDIRS) \ - xmlrpc \ - zoneinfo - TESTSUBDIRS= ctypes/test \ -@@ -1549,6 +1548,10 @@ ifeq (@CURSES@,yes) - LIBSUBDIRS += curses - endif - -+ifeq (@EXPAT@,yes) -+LIBSUBDIRS += $(XMLLIBSUBDIRS) -+endif -+ - TEST_MODULES=@TEST_MODULES@ - libinstall: build_all $(srcdir)/Modules/xxmodule.c - @for i in $(SCRIPTDIR) $(LIBDEST); \ -diff --git a/configure.ac b/configure.ac -index 4f1cda5..e99a174 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3094,13 +3094,21 @@ PKG_PROG_PKG_CONFIG - AC_SUBST(DISABLED_EXTENSIONS) - - # Check for use of the system expat library --AC_MSG_CHECKING(for --with-system-expat) --AC_ARG_WITH(system_expat, -- AS_HELP_STRING([--with-system-expat], [build pyexpat module using an installed expat library, see Doc/library/pyexpat.rst (default is no)]), -+AC_MSG_CHECKING(for --with-expat) -+AC_ARG_WITH(expat, -+ AS_HELP_STRING([--with-expat], [select which expat version to use: system, builtin, none]), - [], -- [with_system_expat="no"]) -+ [with_expat="builtin"]) - --AC_MSG_RESULT($with_system_expat) -+AC_MSG_RESULT($with_expat) -+ -+if test "$with_expat" != "none"; then -+ EXPAT=yes -+else -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} pyexpat" -+ EXPAT=no -+fi -+AC_SUBST(EXPAT) - - # Check for use of the system libffi library - AC_MSG_CHECKING(for --with-system-ffi) -diff --git a/setup.py b/setup.py -index 663fd44..e30ed52 100644 ---- a/setup.py -+++ b/setup.py -@@ -1764,7 +1764,7 @@ class PyBuildExt(build_ext): - # - # More information on Expat can be found at www.libexpat.org. - # -- if '--with-system-expat' in sysconfig.get_config_var("CONFIG_ARGS"): -+ if '--with-expat=system' in sysconfig.get_config_var("CONFIG_ARGS"): - expat_inc = [] - define_macros = [] - extra_compile_args = [] --- -2.30.2 - diff --git a/package/python3/0019-Add-an-option-to-disable-CJK-codecs.patch b/package/python3/0019-Add-an-option-to-disable-CJK-codecs.patch deleted file mode 100644 index 2afcf4526d1..00000000000 --- a/package/python3/0019-Add-an-option-to-disable-CJK-codecs.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 2c0d31bb91fc7f94283c3ab632925fbbe24e94d6 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 23 Dec 2015 11:49:55 +0100 -Subject: [PATCH] Add an option to disable CJK codecs - -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 9ef0ecd42f..18e6fd70a0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3390,6 +3390,12 @@ if test "$SQLITE3" = "no" ; then - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3" - fi - -+AC_ARG_ENABLE(codecs-cjk, -+ AS_HELP_STRING([--disable-codecs-cjk], [disable CJK codecs]), -+ [ if test "$enableval" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk _codecs_iso2022" -+ fi]) -+ - AC_SUBST(TK) - AC_ARG_ENABLE(tk, - AS_HELP_STRING([--disable-tk], [disable tk]), --- -2.25.1 - diff --git a/package/python3/0019-Add-an-option-to-disable-unicodedata.patch b/package/python3/0019-Add-an-option-to-disable-unicodedata.patch new file mode 100644 index 00000000000..74702b67a50 --- /dev/null +++ b/package/python3/0019-Add-an-option-to-disable-unicodedata.patch @@ -0,0 +1,30 @@ +From 4fe7f375a3d171d294caebdd7b7ce49bbc9ad9f3 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Wed, 23 Dec 2015 11:50:27 +0100 +Subject: [PATCH] Add an option to disable unicodedata + +Signed-off-by: Thomas Petazzoni +--- + configure.ac | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 1bdde7f69d..ba4b0e0c1c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4200,6 +4200,12 @@ AC_ARG_ENABLE(nis, + DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis" + fi]) + ++AC_ARG_ENABLE(unicodedata, ++ AS_HELP_STRING([--disable-unicodedata], [disable unicodedata]), ++ [ if test "$enableval" = "no"; then ++ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} unicodedata" ++ fi]) ++ + AC_SUBST(TK) + AC_ARG_ENABLE(tk, + AS_HELP_STRING([--disable-tk], [disable tk]), +-- +2.34.1 + diff --git a/package/python3/0020-Add-an-option-to-disable-IDLE.patch b/package/python3/0020-Add-an-option-to-disable-IDLE.patch new file mode 100644 index 00000000000..09b5f13cdbd --- /dev/null +++ b/package/python3/0020-Add-an-option-to-disable-IDLE.patch @@ -0,0 +1,92 @@ +From 2c9dbd6d49744aa8da8ebf8d0187d6b06f93c2b5 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 + +IDLE is an IDE embedded into python, written using Tk, so it doesn't make +much sense to have it into our build. + +Signed-off-by: Maxime Ripard +[ 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 +--- + Makefile.pre.in | 7 ++++++- + configure.ac | 6 ++++++ + setup.py | 5 ++++- + 3 files changed, 16 insertions(+), 2 deletions(-) + +diff --git a/Makefile.pre.in b/Makefile.pre.in +index 80d617cf7f..8d1ba1356c 100644 +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -1862,7 +1862,9 @@ bininstall: 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 ++ifeq (@IDLE@,yes) + (cd $(DESTDIR)$(BINDIR); $(LN) -s idle$(VERSION) idle3) ++endif + -rm -f $(DESTDIR)$(BINDIR)/pydoc3 + ifeq (@PYDOC@,yes) + (cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3) +@@ -1912,7 +1914,6 @@ LIBSUBDIRS= asyncio \ + ensurepip ensurepip/_bundled \ + html \ + http \ +- idlelib idlelib/Icons \ + importlib importlib/resources importlib/metadata \ + json \ + logging \ +@@ -2030,6 +2031,10 @@ ifeq (@EXPAT@,yes) + LIBSUBDIRS += $(XMLLIBSUBDIRS) + endif + ++ifeq (@IDLE@,yes) ++LIBSUBDIRS += idlelib idlelib/Icons ++endif ++ + TEST_MODULES=@TEST_MODULES@ + libinstall: all $(srcdir)/Modules/xxmodule.c + @for i in $(SCRIPTDIR) $(LIBDEST); \ +diff --git a/configure.ac b/configure.ac +index ba4b0e0c1c..5e6d72f7db 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -7137,6 +7137,12 @@ AC_ARG_ENABLE(lib2to3, + AS_HELP_STRING([--disable-lib2to3], [disable lib2to3]), + [ LIB2TO3="${enableval}" ], [ LIB2TO3=yes ]) + ++AC_SUBST(IDLE) ++ ++AC_ARG_ENABLE(idle3, ++ AS_HELP_STRING([--disable-idle3], [disable idle3 IDE]), ++ [ IDLE="${enableval}" ], [ IDLE=yes ]) ++ + # generate output files + AC_CONFIG_FILES(Makefile.pre Misc/python.pc Misc/python-embed.pc Misc/python-config.sh) + AC_CONFIG_FILES([Modules/Setup.bootstrap Modules/Setup.stdlib]) +diff --git a/setup.py b/setup.py +index c490b0b08f..4d49a792f7 100644 +--- a/setup.py ++++ b/setup.py +@@ -1594,11 +1594,14 @@ class DummyProcess: + import warnings + warnings.filterwarnings("ignore",category=DeprecationWarning) + +- scripts = ['Tools/scripts/idle3', 'Lib/smtpd.py'] ++ scripts = [ 'Lib/smtpd.py'] + if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"): + scripts += [ 'Tools/scripts/pydoc3' ] + if not '--disable-lib2to3' in sysconfig.get_config_var("CONFIG_ARGS"): + scripts += [ 'Tools/scripts/2to3' ] ++ if not '--disable-idle3' in sysconfig.get_config_var("CONFIG_ARGS"): ++ scripts += [ 'Tools/scripts/idle3' ] ++ + setup(# PyPI Metadata (PEP 301) + name = "Python", + version = sys.version.split()[0], +-- +2.34.1 + diff --git a/package/python3/0020-Add-an-option-to-disable-NIS.patch b/package/python3/0020-Add-an-option-to-disable-NIS.patch deleted file mode 100644 index d8fe3616c08..00000000000 --- a/package/python3/0020-Add-an-option-to-disable-NIS.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 2041d0c8dba87991edaf088b16e37b5189a3466d Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 23 Dec 2015 11:50:11 +0100 -Subject: [PATCH] Add an option to disable NIS - -NIS is not necessarily available in uClibc, so we need an option to -not compile support for it. - -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 18e6fd70a0..46d2a8131e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3396,6 +3396,12 @@ AC_ARG_ENABLE(codecs-cjk, - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk _codecs_iso2022" - fi]) - -+AC_ARG_ENABLE(nis, -+ AS_HELP_STRING([--disable-nis], [disable NIS]), -+ [ if test "$enableval" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis" -+ fi]) -+ - AC_SUBST(TK) - AC_ARG_ENABLE(tk, - AS_HELP_STRING([--disable-tk], [disable tk]), --- -2.25.1 - diff --git a/package/python3/0021-Add-an-option-to-disable-decimal.patch b/package/python3/0021-Add-an-option-to-disable-decimal.patch new file mode 100644 index 00000000000..d683565f94d --- /dev/null +++ b/package/python3/0021-Add-an-option-to-disable-decimal.patch @@ -0,0 +1,54 @@ +From 7091fdf77f612425c178a75148560f9c3514e8b8 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Wed, 23 Dec 2015 11:51:31 +0100 +Subject: [PATCH] Add an option to disable decimal + +This patch replaces the existing --with-system-libmpdec option with a +--with-libmpdec={system,builtin,none} option, which allows to tell +Python whether we want to use the system libmpdec (already installed), +the libmpdec builtin the Python sources, or no libmpdec at all. + +Signed-off-by: Thomas Petazzoni +[aduskett@gmail.com: Update for python 3.7.0] +Signed-off-by: Adam Duskett +[james.hilliard1@gmail.com: adapt to python 3.9] +Signed-off-by: James Hilliard +--- + configure.ac | 19 +++++++++++++------ + 1 file changed, 13 insertions(+), 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 5e6d72f7db..e6b1f1e9de 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3630,14 +3630,21 @@ fi + AC_SUBST(LIBFFI_INCLUDEDIR) + + # Check for use of the system libmpdec library +-AC_MSG_CHECKING(for --with-system-libmpdec) +-AC_ARG_WITH(system_libmpdec, +- AS_HELP_STRING([--with-system-libmpdec], [build _decimal module using an installed libmpdec library, see Doc/library/decimal.rst (default is no)]), ++AC_MSG_CHECKING(for --with-libmpdec) ++AC_ARG_WITH(libmpdec, ++ AS_HELP_STRING([--with-libmpdec], [select which libmpdec version to use: system, builtin, none]), + [], +- [with_system_libmpdec="no"]) +-AC_MSG_RESULT($with_system_libmpdec) ++ [with_libmpdec="builtin"]) ++AC_MSG_RESULT($with_libmpdec) ++if test "$with_libmpdec" != "none"; then ++ MPDEC=yes ++else ++ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _decimal" ++ MPDEC=no ++fi ++AC_SUBST(MPDEC) + +-AS_VAR_IF([with_system_libmpdec], [yes], [ ++AS_VAR_IF([with_libmpdec], [system], [ + LIBMPDEC_CFLAGS=${LIBMPDEC_CFLAGS-""} + LIBMPDEC_LDFLAGS=${LIBMPDEC_LDFLAGS-"-lmpdec"} + LIBMPDEC_INTERNAL= +-- +2.34.1 + diff --git a/package/python3/0021-Add-an-option-to-disable-unicodedata.patch b/package/python3/0021-Add-an-option-to-disable-unicodedata.patch deleted file mode 100644 index 3519377b5e8..00000000000 --- a/package/python3/0021-Add-an-option-to-disable-unicodedata.patch +++ /dev/null @@ -1,30 +0,0 @@ -From dd82a401ff6ba4ba116bf4d520e981a1808ed443 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 23 Dec 2015 11:50:27 +0100 -Subject: [PATCH] Add an option to disable unicodedata - -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 46d2a8131e..5844e3b73f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3402,6 +3402,12 @@ AC_ARG_ENABLE(nis, - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis" - fi]) - -+AC_ARG_ENABLE(unicodedata, -+ AS_HELP_STRING([--disable-unicodedata], [disable unicodedata]), -+ [ if test "$enableval" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} unicodedata" -+ fi]) -+ - AC_SUBST(TK) - AC_ARG_ENABLE(tk, - AS_HELP_STRING([--disable-tk], [disable tk]), --- -2.25.1 - diff --git a/package/python3/0022-Add-an-option-to-disable-IDLE.patch b/package/python3/0022-Add-an-option-to-disable-IDLE.patch deleted file mode 100644 index f09037f7db0..00000000000 --- a/package/python3/0022-Add-an-option-to-disable-IDLE.patch +++ /dev/null @@ -1,92 +0,0 @@ -From f1b15834045d0641c43014b970721df066fa71f7 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 - -IDLE is an IDE embedded into python, written using Tk, so it doesn't make -much sense to have it into our build. - -Signed-off-by: Maxime Ripard -[ 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 ---- - Makefile.pre.in | 7 ++++++- - configure.ac | 6 ++++++ - setup.py | 5 ++++- - 3 files changed, 16 insertions(+), 2 deletions(-) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index 08c5e8a..461c5e3 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -1389,7 +1389,9 @@ bininstall: 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 -+ifeq (@IDLE@,yes) - (cd $(DESTDIR)$(BINDIR); $(LN) -s idle$(VERSION) idle3) -+endif - -rm -f $(DESTDIR)$(BINDIR)/pydoc3 - ifeq (@PYDOC@,yes) - (cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3) -@@ -1439,7 +1441,6 @@ LIBSUBDIRS= asyncio \ - ensurepip ensurepip/_bundled \ - html \ - http \ -- idlelib idlelib/Icons \ - importlib importlib/metadata \ - json \ - logging \ -@@ -1552,6 +1553,10 @@ ifeq (@EXPAT@,yes) - LIBSUBDIRS += $(XMLLIBSUBDIRS) - endif - -+ifeq (@IDLE@,yes) -+LIBSUBDIRS += idlelib idlelib/Icons -+endif -+ - TEST_MODULES=@TEST_MODULES@ - libinstall: build_all $(srcdir)/Modules/xxmodule.c - @for i in $(SCRIPTDIR) $(LIBDEST); \ -diff --git a/configure.ac b/configure.ac -index e99a174..baaa743 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -6073,6 +6073,12 @@ AC_ARG_ENABLE(lib2to3, - AS_HELP_STRING([--disable-lib2to3], [disable lib2to3]), - [ LIB2TO3="${enableval}" ], [ LIB2TO3=yes ]) - -+AC_SUBST(IDLE) -+ -+AC_ARG_ENABLE(idle3, -+ AS_HELP_STRING([--disable-idle3], [disable idle3 IDE]), -+ [ IDLE="${enableval}" ], [ IDLE=yes ]) -+ - # generate output files - AC_CONFIG_FILES(Makefile.pre Misc/python.pc Misc/python-embed.pc Misc/python-config.sh) - AC_CONFIG_FILES([Modules/ld_so_aix], [chmod +x Modules/ld_so_aix]) -diff --git a/setup.py b/setup.py -index e30ed52..4dff249 100644 ---- a/setup.py -+++ b/setup.py -@@ -2722,11 +2722,14 @@ def main(): - import warnings - warnings.filterwarnings("ignore",category=DeprecationWarning) - -- scripts = ['Tools/scripts/idle3', 'Lib/smtpd.py'] -+ scripts = [ 'Lib/smtpd.py'] - if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"): - scripts += [ 'Tools/scripts/pydoc3' ] - if not '--disable-lib2to3' in sysconfig.get_config_var("CONFIG_ARGS"): - scripts += [ 'Tools/scripts/2to3' ] -+ if not '--disable-idle3' in sysconfig.get_config_var("CONFIG_ARGS"): -+ scripts += [ 'Tools/scripts/idle3' ] -+ - setup(# PyPI Metadata (PEP 301) - name = "Python", - version = sys.version.split()[0], --- -2.30.2 - diff --git a/package/python3/0022-Add-an-option-to-disable-the-ossaudiodev-module.patch b/package/python3/0022-Add-an-option-to-disable-the-ossaudiodev-module.patch new file mode 100644 index 00000000000..56713a7f8fe --- /dev/null +++ b/package/python3/0022-Add-an-option-to-disable-the-ossaudiodev-module.patch @@ -0,0 +1,30 @@ +From d48d9da534cec7891ae444b4ab94a76ac67f5daa Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Wed, 23 Dec 2015 11:51:58 +0100 +Subject: [PATCH] Add an option to disable the ossaudiodev module + +Signed-off-by: Thomas Petazzoni +--- + configure.ac | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/configure.ac b/configure.ac +index e6b1f1e9de..db33d567ad 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3678,6 +3678,12 @@ fi + + AC_MSG_RESULT($with_decimal_contextvar) + ++AC_ARG_ENABLE(ossaudiodev, ++ AS_HELP_STRING([--disable-ossaudiodev], [disable OSSAUDIODEV]), ++ [ if test "$enableval" = "no"; then ++ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ossaudiodev" ++ fi]) ++ + # Check for libmpdec machine flavor + AC_MSG_CHECKING(for decimal libmpdec machine) + AS_CASE([$ac_sys_system], +-- +2.34.1 + diff --git a/package/python3/0023-Add-an-option-to-disable-decimal.patch b/package/python3/0023-Add-an-option-to-disable-decimal.patch deleted file mode 100644 index fd1887d603f..00000000000 --- a/package/python3/0023-Add-an-option-to-disable-decimal.patch +++ /dev/null @@ -1,66 +0,0 @@ -From d5fe81cbd51da2a84ed89d1e4c80d921d4efce26 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 23 Dec 2015 11:51:31 +0100 -Subject: [PATCH] Add an option to disable decimal - -This patch replaces the existing --with-system-libmpdec option with a ---with-libmpdec={system,builtin,none} option, which allows to tell -Python whether we want to use the system libmpdec (already installed), -the libmpdec builtin the Python sources, or no libmpdec at all. - -Signed-off-by: Thomas Petazzoni -[aduskett@gmail.com: Update for python 3.7.0] -Signed-off-by: Adam Duskett -[james.hilliard1@gmail.com: adapt to python 3.9] -Signed-off-by: James Hilliard ---- - configure.ac | 17 ++++++++++++----- - setup.py | 2 +- - 2 files changed, 13 insertions(+), 6 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 7bd4623ccd..e513ef6a20 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3145,13 +3145,20 @@ fi - AC_SUBST(LIBFFI_INCLUDEDIR) - - # Check for use of the system libmpdec library --AC_MSG_CHECKING(for --with-system-libmpdec) --AC_ARG_WITH(system_libmpdec, -- AS_HELP_STRING([--with-system-libmpdec], [build _decimal module using an installed libmpdec library, see Doc/library/decimal.rst (default is no)]), -+AC_MSG_CHECKING(for --with-libmpdec) -+AC_ARG_WITH(libmpdec, -+ AS_HELP_STRING([--with-libmpdec], [select which libmpdec version to use: system, builtin, none]), - [], -- [with_system_libmpdec="no"]) -+ [with_libmpdec="builtin"]) - --AC_MSG_RESULT($with_system_libmpdec) -+AC_MSG_RESULT($with_libmpdec) -+if test "$with_libmpdec" != "none"; then -+ MPDEC=yes -+else -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _decimal" -+ MPDEC=no -+fi -+AC_SUBST(MPDEC) - - # Check whether _decimal should use a coroutine-local or thread-local context - AC_MSG_CHECKING(for --with-decimal-contextvar) -diff --git a/setup.py b/setup.py -index c4ee989ba3..3d0c74bb7f 100644 ---- a/setup.py -+++ b/setup.py -@@ -2321,7 +2321,7 @@ class PyBuildExt(build_ext): - # Stefan Krah's _decimal module - extra_compile_args = [] - undef_macros = [] -- if '--with-system-libmpdec' in sysconfig.get_config_var("CONFIG_ARGS"): -+ if '--with-libmpdec=system' in sysconfig.get_config_var("CONFIG_ARGS"): - include_dirs = [] - libraries = ['mpdec'] - sources = ['_decimal/_decimal.c'] --- -2.25.1 - diff --git a/package/python3/0023-Add-an-option-to-disable-openssl-support.patch b/package/python3/0023-Add-an-option-to-disable-openssl-support.patch new file mode 100644 index 00000000000..d4c9fd43be3 --- /dev/null +++ b/package/python3/0023-Add-an-option-to-disable-openssl-support.patch @@ -0,0 +1,30 @@ +From 25c900e81a2fc0bbe35e7c94e2e5028cfbf6582a Mon Sep 17 00:00:00 2001 +From: Nicolas Cavallari +Date: Wed, 22 Feb 2017 17:55:59 -0800 +Subject: [PATCH] Add an option to disable openssl support. + +Signed-off-by: Nicolas Cavallari +--- + configure.ac | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/configure.ac b/configure.ac +index db33d567ad..42fe6c8f5a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4219,6 +4219,12 @@ AC_ARG_ENABLE(unicodedata, + DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} unicodedata" + fi]) + ++AC_ARG_ENABLE(openssl, ++ AS_HELP_STRING([--disable-openssl], [disable openssl support]), ++ [ if test "$enableval" = "no"; then ++ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ssl _ssl _hashlib" ++ fi]) ++ + AC_SUBST(TK) + AC_ARG_ENABLE(tk, + AS_HELP_STRING([--disable-tk], [disable tk]), +-- +2.34.1 + diff --git a/package/python3/0024-Add-an-option-to-disable-the-ossaudiodev-module.patch b/package/python3/0024-Add-an-option-to-disable-the-ossaudiodev-module.patch deleted file mode 100644 index 0459b5a14da..00000000000 --- a/package/python3/0024-Add-an-option-to-disable-the-ossaudiodev-module.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 9bedc56d2a4b8856162650a11c1fcb6ec38f160b Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 23 Dec 2015 11:51:58 +0100 -Subject: [PATCH] Add an option to disable the ossaudiodev module - -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/configure.ac b/configure.ac -index e513ef6a20..c07505e89e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3175,6 +3175,12 @@ fi - - AC_MSG_RESULT($with_decimal_contextvar) - -+AC_ARG_ENABLE(ossaudiodev, -+ AS_HELP_STRING([--disable-ossaudiodev], [disable OSSAUDIODEV]), -+ [ if test "$enableval" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ossaudiodev" -+ fi]) -+ - # Check for support for loadable sqlite extensions - AC_MSG_CHECKING(for --enable-loadable-sqlite-extensions) - AC_ARG_ENABLE(loadable-sqlite-extensions, --- -2.25.1 - diff --git a/package/python3/0024-Add-an-option-to-disable-the-readline-module.patch b/package/python3/0024-Add-an-option-to-disable-the-readline-module.patch new file mode 100644 index 00000000000..9250007daed --- /dev/null +++ b/package/python3/0024-Add-an-option-to-disable-the-readline-module.patch @@ -0,0 +1,30 @@ +From 9082468ca620db77b670ccf568a96bbabb865f80 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Tue, 7 Mar 2017 23:29:05 +0100 +Subject: [PATCH] Add an option to disable the readline module + +Signed-off-by: Thomas Petazzoni +--- + configure.ac | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 42fe6c8f5a..19875d7d30 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4225,6 +4225,12 @@ AC_ARG_ENABLE(openssl, + DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ssl _ssl _hashlib" + fi]) + ++AC_ARG_ENABLE(readline, ++ AS_HELP_STRING([--disable-readline], [disable readline]), ++ [ if test "$enableval" = "no"; then ++ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} readline" ++ fi]) ++ + AC_SUBST(TK) + AC_ARG_ENABLE(tk, + AS_HELP_STRING([--disable-tk], [disable tk]), +-- +2.34.1 + diff --git a/package/python3/0025-Add-an-option-to-disable-openssl-support.patch b/package/python3/0025-Add-an-option-to-disable-openssl-support.patch deleted file mode 100644 index 4801a273002..00000000000 --- a/package/python3/0025-Add-an-option-to-disable-openssl-support.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 90ed5c692b8b5596ca0b3ae1436276c8181251d8 Mon Sep 17 00:00:00 2001 -From: Nicolas Cavallari -Date: Wed, 22 Feb 2017 17:55:59 -0800 -Subject: [PATCH] Add an option to disable openssl support. - -Signed-off-by: Nicolas Cavallari ---- - configure.ac | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 08c148c..a81a24c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3421,6 +3421,12 @@ AC_ARG_ENABLE(unicodedata, - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} unicodedata" - fi]) - -+AC_ARG_ENABLE(openssl, -+ AS_HELP_STRING([--disable-openssl], [disable openssl support]), -+ [ if test "$enableval" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ssl _ssl _hashlib" -+ fi]) -+ - AC_SUBST(TK) - AC_ARG_ENABLE(tk, - AS_HELP_STRING([--disable-tk], [disable tk]), --- -2.30.2 - diff --git a/package/python3/0025-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch b/package/python3/0025-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch new file mode 100644 index 00000000000..70a0d6cd15e --- /dev/null +++ b/package/python3/0025-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch @@ -0,0 +1,42 @@ +From 988a335cb34b5fc25ea345ba04ff5ddffe2e946c Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Tue, 7 Mar 2017 23:31:11 +0100 +Subject: [PATCH] Add options to disable zlib, bzip2 and xz modules + +Signed-off-by: Thomas Petazzoni +--- + configure.ac | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 19875d7d30..ca6c16491a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4231,6 +4231,24 @@ AC_ARG_ENABLE(readline, + DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} readline" + fi]) + ++AC_ARG_ENABLE(bzip2, ++ AS_HELP_STRING([--disable-bzip2], [disable bzip2]), ++ [ if test "$enableval" = "no"; then ++ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _bz2" ++ fi]) ++ ++AC_ARG_ENABLE(zlib, ++ AS_HELP_STRING([--disable-zlib], [disable zlib]), ++ [ if test "$enableval" = "no"; then ++ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} zlib" ++ fi]) ++ ++AC_ARG_ENABLE(xz, ++ AS_HELP_STRING([--disable-xz], [disable xz]), ++ [ if test "$enableval" = "no"; then ++ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _lzma" ++ fi]) ++ + AC_SUBST(TK) + AC_ARG_ENABLE(tk, + AS_HELP_STRING([--disable-tk], [disable tk]), +-- +2.34.1 + diff --git a/package/python3/0026-Add-an-option-to-disable-the-readline-module.patch b/package/python3/0026-Add-an-option-to-disable-the-readline-module.patch deleted file mode 100644 index adb04d69ead..00000000000 --- a/package/python3/0026-Add-an-option-to-disable-the-readline-module.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 049e7a51e1ffd0d28d6608c707ab4b54e816d338 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 7 Mar 2017 23:29:05 +0100 -Subject: [PATCH] Add an option to disable the readline module - -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/configure.ac b/configure.ac -index a81a24c..41a21ff 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3427,6 +3427,12 @@ AC_ARG_ENABLE(openssl, - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ssl _ssl _hashlib" - fi]) - -+AC_ARG_ENABLE(readline, -+ AS_HELP_STRING([--disable-readline], [disable readline]), -+ [ if test "$enableval" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} readline" -+ fi]) -+ - AC_SUBST(TK) - AC_ARG_ENABLE(tk, - AS_HELP_STRING([--disable-tk], [disable tk]), --- -2.30.2 - diff --git a/package/python3/0026-python-config.sh-don-t-reassign-prefix.patch b/package/python3/0026-python-config.sh-don-t-reassign-prefix.patch new file mode 100644 index 00000000000..b6bfb010a0a --- /dev/null +++ b/package/python3/0026-python-config.sh-don-t-reassign-prefix.patch @@ -0,0 +1,53 @@ +From 755fb526a62df2a73560f42184db8aadb6899bb0 Mon Sep 17 00:00:00 2001 +From: Matt Weber +Date: Fri, 6 Oct 2017 09:54:15 -0500 +Subject: [PATCH] python-config.sh: don't reassign ${prefix} + +When prefix is set to a path like /usr during crossbuild +the sed operations end up executing twice, once for the prefix +reassignment and another for includedir if it is set as a string +including the ${prefix} variable. This results in an issue +when the build directory is under /usr. + +This patch updates the remaining location which uses the prefix +variable to also sed and update to use the real path. + +Upstream bug report: +https://bugs.python.org/issue31713 + +Buildroot bug: +https://bugs.busybox.net/show_bug.cgi?id=10361 + +Fixes failures like the following: +dbus-python-1.2.4 | NOK | http://autobuild.buildroot.net/results/758858efa97b6273c1b470513f5492258a6d8853 + +Signed-off-by: Matthew Weber +--- + Misc/python-config.sh.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Misc/python-config.sh.in b/Misc/python-config.sh.in +index a1bc3cd5f7..164d2d3603 100644 +--- a/Misc/python-config.sh.in ++++ b/Misc/python-config.sh.in +@@ -31,7 +31,7 @@ prefix_real=$(installed_prefix "$0") + # locations. Keep prefix & exec_prefix using their original values in case + # they are referenced in other configure variables, to prevent double + # substitution, issue #22140. +-prefix=$(echo "$prefix_build" | sed "s#^$prefix_build#$prefix_real#") ++prefix=$prefix_build + exec_prefix=$(echo "$exec_prefix_build" | sed "s#^$exec_prefix_build#$prefix_real#") + exec_prefix_real=${prefix_real} + includedir=$(echo "@includedir@" | sed "s#^$prefix_build#$prefix_real#") +@@ -49,7 +49,7 @@ LDLIBRARY="@LDLIBRARY@" + OPT="@OPT@" + PY_ENABLE_SHARED="@PY_ENABLE_SHARED@" + LDVERSION="@LDVERSION@" +-LIBDEST=${prefix_real}/lib/python${VERSION} ++LIBDEST=$( echo "${prefix}/lib/python${VERSION}" | sed "s#^$prefix_build#$prefix_real#") + LIBPL=$(echo "@LIBPL@" | sed "s#^$prefix_build#$prefix_real#") + SO="@EXT_SUFFIX@" + PYTHONFRAMEWORK="@PYTHONFRAMEWORK@" +-- +2.34.1 + diff --git a/package/python3/0027-Add-an-option-to-disable-uuid-module.patch b/package/python3/0027-Add-an-option-to-disable-uuid-module.patch new file mode 100644 index 00000000000..a9501ec189d --- /dev/null +++ b/package/python3/0027-Add-an-option-to-disable-uuid-module.patch @@ -0,0 +1,33 @@ +From 58027d25c3cabcf654cb0b31a61d7cbd53dc68c0 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sat, 18 Aug 2018 10:54:56 +0200 +Subject: [PATCH] Add an option to disable uuid module + +Signed-off-by: Thomas Petazzoni +--- + configure.ac | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/configure.ac b/configure.ac +index ca6c16491a..ed03b27fb1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4267,6 +4267,15 @@ if test "$CURSES" = "no"; then + DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _curses _curses_panel" + fi + ++AC_SUBST(UUID) ++AC_ARG_ENABLE(uuid, ++ AS_HELP_STRING([--disable-uuid], [disable uuid]), ++ [ UUID="${enableval}" ], [ UUID=yes ]) ++ ++if test "$UUID" = "no"; then ++ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _uuid" ++fi ++ + AC_SUBST(PYDOC) + + AC_ARG_ENABLE(pydoc, +-- +2.34.1 + diff --git a/package/python3/0027-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch b/package/python3/0027-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch deleted file mode 100644 index d466bc3a763..00000000000 --- a/package/python3/0027-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 146730a04dfe98e3d7971ebf5410801ceae88e11 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 7 Mar 2017 23:31:11 +0100 -Subject: [PATCH] Add options to disable zlib, bzip2 and xz modules - -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 18 ++++++++++++++++++ - 1 file changed, 18 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 41a21ff..fa81bc7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3433,6 +3433,24 @@ AC_ARG_ENABLE(readline, - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} readline" - fi]) - -+AC_ARG_ENABLE(bzip2, -+ AS_HELP_STRING([--disable-bzip2], [disable bzip2]), -+ [ if test "$enableval" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _bz2" -+ fi]) -+ -+AC_ARG_ENABLE(zlib, -+ AS_HELP_STRING([--disable-zlib], [disable zlib]), -+ [ if test "$enableval" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} zlib" -+ fi]) -+ -+AC_ARG_ENABLE(xz, -+ AS_HELP_STRING([--disable-xz], [disable xz]), -+ [ if test "$enableval" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _lzma" -+ fi]) -+ - AC_SUBST(TK) - AC_ARG_ENABLE(tk, - AS_HELP_STRING([--disable-tk], [disable tk]), --- -2.30.2 - diff --git a/package/python3/0028-fix-building-on-older-distributions.patch b/package/python3/0028-fix-building-on-older-distributions.patch new file mode 100644 index 00000000000..4541b31c5fd --- /dev/null +++ b/package/python3/0028-fix-building-on-older-distributions.patch @@ -0,0 +1,47 @@ +From e52e2c5e3df4bc3d2ff07ecb3b8e2a9099ea1631 Mon Sep 17 00:00:00 2001 +From: Adam Duskett +Date: Thu, 16 Aug 2018 14:52:37 -0700 +Subject: [PATCH] fix building on older distributions + +Python > 3.6.3 calls os.replace in the update_file.py script, during the +regen-importlib phase of the build process. + +According to Doc/whatsnew/3.3.rst line 1631, os.replace acts in the same +way as os.rename, however, it is now cross-platform compatible for Windows. + +Because BuildRoot is guaranteed only to be built in POSIX environment, it is +safe to change os.replace back to os.rename. + +This change fixes building on older systems such as CentOS7, that only come +with python 2. + +Signed-off-by: Adam Duskett +--- + Tools/scripts/update_file.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Tools/scripts/update_file.py b/Tools/scripts/update_file.py +index b4182c1d0c..ab443cb1a6 100644 +--- a/Tools/scripts/update_file.py ++++ b/Tools/scripts/update_file.py +@@ -53,7 +53,7 @@ def update_file_with_tmpfile(filename, tmpfile, *, create=False): + if not create: + raise # re-raise + outcome = 'created' +- os.replace(tmpfile, filename) ++ os.rename(tmpfile, filename) + else: + with targetfile: + old_contents = targetfile.read() +@@ -62,7 +62,7 @@ def update_file_with_tmpfile(filename, tmpfile, *, create=False): + # Now compare! + if old_contents != new_contents: + outcome = 'updated' +- os.replace(tmpfile, filename) ++ os.rename(tmpfile, filename) + else: + outcome = 'same' + os.unlink(tmpfile) +-- +2.34.1 + diff --git a/package/python3/0028-python-config.sh-don-t-reassign-prefix.patch b/package/python3/0028-python-config.sh-don-t-reassign-prefix.patch deleted file mode 100644 index 814a9d42e50..00000000000 --- a/package/python3/0028-python-config.sh-don-t-reassign-prefix.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 106d9378c61e7fa9cad0a63ba068668d54cd11b8 Mon Sep 17 00:00:00 2001 -From: Matt Weber -Date: Fri, 6 Oct 2017 09:54:15 -0500 -Subject: [PATCH] python-config.sh: don't reassign ${prefix} - -When prefix is set to a path like /usr during crossbuild -the sed operations end up executing twice, once for the prefix -reassignment and another for includedir if it is set as a string -including the ${prefix} variable. This results in an issue -when the build directory is under /usr. - -This patch updates the remaining location which uses the prefix -variable to also sed and update to use the real path. - -Upstream bug report: -https://bugs.python.org/issue31713 - -Buildroot bug: -https://bugs.busybox.net/show_bug.cgi?id=10361 - -Fixes failures like the following: -dbus-python-1.2.4 | NOK | http://autobuild.buildroot.net/results/758858efa97b6273c1b470513f5492258a6d8853 - -Signed-off-by: Matthew Weber ---- - Misc/python-config.sh.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Misc/python-config.sh.in b/Misc/python-config.sh.in -index a1bc3cd..164d2d3 100644 ---- a/Misc/python-config.sh.in -+++ b/Misc/python-config.sh.in -@@ -31,7 +31,7 @@ prefix_real=$(installed_prefix "$0") - # locations. Keep prefix & exec_prefix using their original values in case - # they are referenced in other configure variables, to prevent double - # substitution, issue #22140. --prefix=$(echo "$prefix_build" | sed "s#^$prefix_build#$prefix_real#") -+prefix=$prefix_build - exec_prefix=$(echo "$exec_prefix_build" | sed "s#^$exec_prefix_build#$prefix_real#") - exec_prefix_real=${prefix_real} - includedir=$(echo "@includedir@" | sed "s#^$prefix_build#$prefix_real#") -@@ -49,7 +49,7 @@ LDLIBRARY="@LDLIBRARY@" - OPT="@OPT@" - PY_ENABLE_SHARED="@PY_ENABLE_SHARED@" - LDVERSION="@LDVERSION@" --LIBDEST=${prefix_real}/lib/python${VERSION} -+LIBDEST=$( echo "${prefix}/lib/python${VERSION}" | sed "s#^$prefix_build#$prefix_real#") - LIBPL=$(echo "@LIBPL@" | sed "s#^$prefix_build#$prefix_real#") - SO="@EXT_SUFFIX@" - PYTHONFRAMEWORK="@PYTHONFRAMEWORK@" --- -2.30.2 - diff --git a/package/python3/0029-Fix-cross-compiling-the-uuid-module.patch b/package/python3/0029-Fix-cross-compiling-the-uuid-module.patch deleted file mode 100644 index d19aedb6c10..00000000000 --- a/package/python3/0029-Fix-cross-compiling-the-uuid-module.patch +++ /dev/null @@ -1,43 +0,0 @@ -From d7b90b157eddefbd0ed59e35c90b083c0c03b644 Mon Sep 17 00:00:00 2001 -From: Adam Duskett -Date: Fri, 20 Jul 2018 10:17:39 -0400 -Subject: [PATCH] Fix cross compiling the uuid module - -Python 3.7 has a new _uuid module, however, the include directory -search path for uuid.h is hardcoded to /usr/include/uuid, which should -not be used when cross-compiling. - -To fix this, use the same solution as the one used by the NIS -detection: append "uuid" to each of the include directories in -"inc_dirs", instead of hardcoding /usr/include/uuid. - -Signed-off-by: Adam Duskett -[Thomas: drop STAGING_DIR based solution, use a solution similar to -the one used for the NIS detection.] -Signed-off-by: Thomas Petazzoni ---- - setup.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 3d0c74bb7f..c7be85f352 100644 ---- a/setup.py -+++ b/setup.py -@@ -1866,10 +1866,10 @@ class PyBuildExt(build_ext): - - def detect_uuid(self): - # Build the _uuid module if possible -- uuid_h = sysconfig.get_config_var("HAVE_UUID_H") -- uuid_uuid_h = sysconfig.get_config_var("HAVE_UUID_UUID_H") -- if uuid_h or uuid_uuid_h: -- if sysconfig.get_config_var("HAVE_LIBUUID"): -+ uuid_h = find_file("uuid.h", self.inc_dirs, -+ [os.path.join(inc_dir, 'uuid') for inc_dir in self.inc_dirs]) -+ if uuid_h is not None: -+ if self.compiler.find_library_file(self.lib_dirs, 'uuid'): - uuid_libs = ["uuid"] - else: - uuid_libs = [] --- -2.25.1 - diff --git a/package/python3/0029-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch b/package/python3/0029-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch new file mode 100644 index 00000000000..5253076d909 --- /dev/null +++ b/package/python3/0029-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch @@ -0,0 +1,51 @@ +From 07b950aadd570b9f96a1f128505a959b32f40962 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] +--- + configure.ac | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index ed03b27fb1..841fd6732c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1086,7 +1086,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/0030-Add-an-option-to-disable-the-berkeleydb-module.patch b/package/python3/0030-Add-an-option-to-disable-the-berkeleydb-module.patch new file mode 100644 index 00000000000..5fb436db59c --- /dev/null +++ b/package/python3/0030-Add-an-option-to-disable-the-berkeleydb-module.patch @@ -0,0 +1,30 @@ +From 67e9793d070ac5c8e83abbe95b9208533ffeadd0 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sat, 11 Apr 2020 22:01:40 +0200 +Subject: [PATCH] Add an option to disable the berkeleydb module + +Signed-off-by: Bernd Kuhls +--- + configure.ac | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 841fd6732c..06c9a81f95 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4280,6 +4280,12 @@ if test "$UUID" = "no"; then + DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _uuid" + fi + ++AC_ARG_ENABLE(berkeleydb, ++ AS_HELP_STRING([--disable-berkeleydb], [disable berkeleydb]), ++ [ if test "$enableval" = "no"; then ++ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _dbm" ++ fi]) ++ + AC_SUBST(PYDOC) + + AC_ARG_ENABLE(pydoc, +-- +2.34.1 + diff --git a/package/python3/0030-Add-an-option-to-disable-uuid-module.patch b/package/python3/0030-Add-an-option-to-disable-uuid-module.patch deleted file mode 100644 index fc4b64dc64d..00000000000 --- a/package/python3/0030-Add-an-option-to-disable-uuid-module.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 3bb693408eda77dda145ec5fecee56ea73031e9f Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 18 Aug 2018 10:54:56 +0200 -Subject: [PATCH] Add an option to disable uuid module - -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/configure.ac b/configure.ac -index fa81bc7..4e733f6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3469,6 +3469,15 @@ if test "$CURSES" = "no"; then - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _curses _curses_panel" - fi - -+AC_SUBST(UUID) -+AC_ARG_ENABLE(uuid, -+ AS_HELP_STRING([--disable-uuid], [disable uuid]), -+ [ UUID="${enableval}" ], [ UUID=yes ]) -+ -+if test "$UUID" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _uuid" -+fi -+ - AC_SUBST(PYDOC) - - AC_ARG_ENABLE(pydoc, --- -2.30.2 - diff --git a/package/python3/0031-fix-building-on-older-distributions.patch b/package/python3/0031-fix-building-on-older-distributions.patch deleted file mode 100644 index fb59e593f49..00000000000 --- a/package/python3/0031-fix-building-on-older-distributions.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 94c62f96ca61f1a28124c837d7ec5ed0b9ae8786 Mon Sep 17 00:00:00 2001 -From: Adam Duskett -Date: Thu, 16 Aug 2018 14:52:37 -0700 -Subject: [PATCH] fix building on older distributions - -Python > 3.6.3 calls os.replace in the update_file.py script, during the -regen-importlib phase of the build process. - -According to Doc/whatsnew/3.3.rst line 1631, os.replace acts in the same -way as os.rename, however, it is now cross-platform compatible for Windows. - -Because BuildRoot is guaranteed only to be built in POSIX environment, it is -safe to change os.replace back to os.rename. - -This change fixes building on older systems such as CentOS7, that only come -with python 2. - -Signed-off-by: Adam Duskett ---- - Tools/scripts/update_file.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Tools/scripts/update_file.py b/Tools/scripts/update_file.py -index 224585c69b..ef458c0c63 100644 ---- a/Tools/scripts/update_file.py -+++ b/Tools/scripts/update_file.py -@@ -16,7 +16,7 @@ def main(old_path, new_path): - with open(new_path, 'rb') as f: - new_contents = f.read() - if old_contents != new_contents: -- os.replace(new_path, old_path) -+ os.rename(new_path, old_path) - else: - os.unlink(new_path) - --- -2.25.1 - diff --git a/package/python3/0031-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch b/package/python3/0031-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch new file mode 100644 index 00000000000..712fd08fb15 --- /dev/null +++ b/package/python3/0031-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch @@ -0,0 +1,42 @@ +From 3edeed879871a10acbe802f4a68cff3d4869dbde Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Thu, 12 Nov 2020 00:16:18 +0100 +Subject: [PATCH] lib/crypt: uClibc-ng doesn't set errno when encryption method + is not available + +Since commit [1] in cpython, an exception is raised when an encryption method +is not available. This eception is handled only if errno is set to EINVAL by +crypt() but uClibc-ng doesn't set errno in crypt() [2]. + +Fixes: +https://gitlab.com/buildroot.org/buildroot/-/jobs/830981961 +https://gitlab.com/buildroot.org/buildroot/-/jobs/830981979 + +[1] https://github.com/python/cpython/commit/0d3fe8ae4961bf551e7d5e42559e2ede1a08fd7c +[2] https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/tree/libcrypt/crypt.c?h=v1.0.36#n29 + +Signed-off-by: Romain Naour +[Daniel: updated for 3.10.7] +Signed-off-by: Daniel Lang +--- + Lib/crypt.py | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/Lib/crypt.py b/Lib/crypt.py +index de4a14a388..ba482487a7 100644 +--- a/Lib/crypt.py ++++ b/Lib/crypt.py +@@ -98,7 +98,9 @@ def _add_method(name, *args, rounds=None): + result = crypt('', salt) + except OSError as e: + # Not all libc libraries support all encryption methods. +- if e.errno in {errno.EINVAL, errno.EPERM, errno.ENOSYS}: ++ # Not all libc libraries set errno when encryption method is not ++ # available. ++ if e.errno in {errno.EINVAL, errno.EPERM, errno.ENOSYS} or e.errno == 0: + return False + raise + if result and len(result) == method.total_size: +-- +2.34.1 + diff --git a/package/python3/0032-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch b/package/python3/0032-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch deleted file mode 100644 index eff010fa22f..00000000000 --- a/package/python3/0032-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch +++ /dev/null @@ -1,51 +0,0 @@ -From d009b0142f77881dd75ff760fec728dbc8581a03 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] ---- - configure.ac | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 913051c276..aba03f3779 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -876,7 +876,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.20.1 - diff --git a/package/python3/0033-Add-an-option-to-disable-the-berkeleydb-module.patch b/package/python3/0033-Add-an-option-to-disable-the-berkeleydb-module.patch deleted file mode 100644 index 0c0d51a7eb8..00000000000 --- a/package/python3/0033-Add-an-option-to-disable-the-berkeleydb-module.patch +++ /dev/null @@ -1,30 +0,0 @@ -From cf4d7fd9f7cb6c1ced32ee323b2b5755640051b7 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sat, 11 Apr 2020 22:01:40 +0200 -Subject: [PATCH] Add an option to disable the berkeleydb module - -Signed-off-by: Bernd Kuhls ---- - configure.ac | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 4e733f6..1e52f30 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3480,6 +3480,12 @@ if test "$UUID" = "no"; then - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _uuid" - fi - -+AC_ARG_ENABLE(berkeleydb, -+ AS_HELP_STRING([--disable-berkeleydb], [disable berkeleydb]), -+ [ if test "$enableval" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _dbm" -+ fi]) -+ - AC_SUBST(PYDOC) - - AC_ARG_ENABLE(pydoc, --- -2.30.2 - diff --git a/package/python3/0034-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch b/package/python3/0034-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch deleted file mode 100644 index 880277eb1d7..00000000000 --- a/package/python3/0034-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 3c83eedcc2df3ecf6c4a17953ca24dff60c1378e Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Thu, 12 Nov 2020 00:16:18 +0100 -Subject: [PATCH] lib/crypt: uClibc-ng doesn't set errno when encryption method - is not available - -Since commit [1] in cpython, an exception is raised when an encryption method -is not available. This eception is handled only if errno is set to EINVAL by -crypt() but uClibc-ng doesn't set errno in crypt() [2]. - -Fixes: -https://gitlab.com/buildroot.org/buildroot/-/jobs/830981961 -https://gitlab.com/buildroot.org/buildroot/-/jobs/830981979 - -[1] https://github.com/python/cpython/commit/0d3fe8ae4961bf551e7d5e42559e2ede1a08fd7c -[2] https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/tree/libcrypt/crypt.c?h=v1.0.36#n29 - -Signed-off-by: Romain Naour ---- - Lib/crypt.py | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/Lib/crypt.py b/Lib/crypt.py -index 33dbc46bb3..4692a5270c 100644 ---- a/Lib/crypt.py -+++ b/Lib/crypt.py -@@ -94,7 +94,9 @@ def _add_method(name, *args, rounds=None): - result = crypt('', salt) - except OSError as e: - # Not all libc libraries support all encryption methods. -- if e.errno == errno.EINVAL: -+ # Not all libc libraries set errno when encryption method is not -+ # available. -+ if e.errno == errno.EINVAL or e.errno == 0: - return False - raise - if result and len(result) == method.total_size: --- -2.25.4 - diff --git a/package/python3/Config.in b/package/python3/Config.in index 61470c29445..38f0580aa4e 100644 --- a/package/python3/Config.in +++ b/package/python3/Config.in @@ -48,6 +48,7 @@ config BR2_PACKAGE_PYTHON3_2TO3 config BR2_PACKAGE_PYTHON3_BERKELEYDB bool "berkeleydb" select BR2_PACKAGE_BERKELEYDB + select BR2_PACKAGE_BERKELEYDB_DBM help berkeleydb module for Python3 @@ -89,7 +90,8 @@ config BR2_PACKAGE_PYTHON3_READLINE config BR2_PACKAGE_PYTHON3_SSL bool "ssl" select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_LIBOPENSSL_ENABLE_BLAKE2 if BR2_PACKAGE_LIBOPENSSL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_BLAKE2 help _ssl module for Python3 (required for https in urllib etc). diff --git a/package/python3/python3.hash b/package/python3/python3.hash index 97f46534906..1a0fee3290e 100644 --- a/package/python3/python3.hash +++ b/package/python3/python3.hash @@ -1,5 +1,5 @@ -# From https://www.python.org/downloads/release/python-3102/ -md5 14e8c22458ed7779a1957b26cde01db9 Python-3.10.2.tar.xz +# From https://www.python.org/downloads/release/python-3115/ +md5 393856f1b7713aa8bba4b642ab9985d3 Python-3.11.5.tar.xz # Locally computed -sha256 17de3ac7da9f2519aa9d64378c603a73a0e9ad58dffa8812e45160c086de64c7 Python-3.10.2.tar.xz -sha256 f03e17cd594c2085f66a454e695c7ebe5b4d3c0eff534f4f194abc2fd164621b LICENSE +sha256 85cd12e9cf1d6d5a45f17f7afe1cebe7ee628d3282281c492e86adf636defa3f Python-3.11.5.tar.xz +sha256 3b2f81fe21d181c499c59a256c8e1968455d6689d269aa85373bfb6af41da3bf LICENSE diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 3a334fb28d8..cfe5e1ee6e0 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON3_VERSION_MAJOR = 3.10 -PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).2 +PYTHON3_VERSION_MAJOR = 3.11 +PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).5 PYTHON3_SOURCE = Python-$(PYTHON3_VERSION).tar.xz PYTHON3_SITE = https://python.org/ftp/python/$(PYTHON3_VERSION) PYTHON3_LICENSE = Python-2.0, others @@ -28,6 +28,7 @@ HOST_PYTHON3_CONF_OPTS += \ --enable-unicodedata \ --disable-test-modules \ --disable-idle3 \ + --disable-uuid \ --disable-ossaudiodev # Make sure that LD_LIBRARY_PATH overrides -rpath. @@ -41,7 +42,12 @@ HOST_PYTHON3_CONF_ENV += \ PYTHON3_DEPENDENCIES = host-python3 libffi -HOST_PYTHON3_DEPENDENCIES = host-autoconf-archive host-expat host-zlib host-libffi +HOST_PYTHON3_DEPENDENCIES = \ + host-autoconf-archive \ + host-expat \ + host-libffi \ + host-pkgconf \ + host-zlib ifeq ($(BR2_PACKAGE_HOST_PYTHON3_BZIP2),y) HOST_PYTHON3_DEPENDENCIES += host-bzip2 @@ -103,6 +109,7 @@ endif ifeq ($(BR2_PACKAGE_PYTHON3_SSL),y) PYTHON3_DEPENDENCIES += openssl +PYTHON3_CONF_OPTS += --with-openssl=$(STAGING_DIR)/usr else PYTHON3_CONF_OPTS += --disable-openssl endif @@ -173,6 +180,7 @@ endif PYTHON3_CONF_OPTS += \ --without-ensurepip \ --without-cxx-main \ + --with-build-python=$(HOST_DIR)/bin/python3 \ --with-system-ffi \ --disable-pydoc \ --disable-test-modules \ @@ -181,47 +189,6 @@ PYTHON3_CONF_OPTS += \ --disable-idle3 \ --disable-pyc-build -# -# Some of CPython's source code is generated using Python interpreter -# and some helper tools such as "Programs/_freeze_importlib" or -# "Parser/pgen" (look for regen-* targets in Makefile.pre.in for more -# info). Normally CPython codebase ships with those files -# pre-generated, so just regular "make" with no additional steps -# should be sufficient for a succesfull build, however due to -# Buildroot's "Add importlib fix for PEP 3147 issue" custom patch we -# end up modifying "Lib/importlib/_bootstrap_external.py" which means -# we have to do "regen-importlib" step before building CPython -# (Importlib is a builtin module that needs to be "frozen"/converted -# to a C array of bytecode using "Programs/_freeze_importlib") -# -# To achive that we add pre-build steps to host-python3 as well as -# python3 that execute "regen-importlib" target. -# -# Unfortunately, for the target Python, "Programs/_freeze_importlib" -# is built for the target, while we need to run them at build time. So -# when installing host-python3, we copy them to $(HOST_DIR)/bin... -# -define HOST_PYTHON3_MAKE_REGEN_IMPORTLIB - $(HOST_MAKE_ENV) $(PYTHON3_CONF_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) regen-importlib - cp $(@D)/Programs/_freeze_importlib $(HOST_DIR)/bin/python-freeze-importlib -endef - -HOST_PYTHON3_PRE_BUILD_HOOKS += HOST_PYTHON3_MAKE_REGEN_IMPORTLIB -# -# ... And then, when building the target python we first buid -# 'Programs/_freeze_importlib' to force GNU Make to update all of the -# prerequisites of 'Programs/_freeze_importlib', then copy our stashed -# "host-usable" version over the one that was just build and then -# build "regen-importlib" target -# -define PYTHON3_MAKE_REGEN_IMPORTLIB - $(TARGET_MAKE_ENV) $(PYTHON3_CONF_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) Programs/_freeze_importlib - cp $(HOST_DIR)/bin/python-freeze-importlib $(@D)/Programs/_freeze_importlib - $(TARGET_MAKE_ENV) $(PYTHON3_CONF_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) regen-importlib -endef - -PYTHON3_PRE_BUILD_HOOKS += PYTHON3_MAKE_REGEN_IMPORTLIB - # # Remove useless files. In the config/ directory, only the Makefile # and the pyconfig.h files are needed at runtime. @@ -291,9 +258,11 @@ define PYTHON3_CREATE_PYC_FILES $(PYTHON3_FIX_TIME) PYTHONPATH="$(PYTHON3_PATH)" \ $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) \ - $(TOPDIR)/support/scripts/pycompile.py \ - $(if $(VERBOSE),--verbose) \ - --strip-root $(TARGET_DIR) \ + $(PYTHON3_DIR)/Lib/compileall.py \ + $(if $(VERBOSE),,-q) \ + $(if $(BR2_PACKAGE_PYTHON3_PYC_ONLY),-b) \ + -s $(TARGET_DIR) \ + -p / \ $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR) endef diff --git a/package/qcom-db410c-firmware/qcom-db410c-firmware.mk b/package/qcom-db410c-firmware/qcom-db410c-firmware.mk index 9ef32cc9d4d..cf4b59b72e5 100644 --- a/package/qcom-db410c-firmware/qcom-db410c-firmware.mk +++ b/package/qcom-db410c-firmware/qcom-db410c-firmware.mk @@ -8,7 +8,7 @@ QCOM_DB410C_FIRMWARE_VERSION = 1034.2.1 QCOM_DB410C_FIRMWARE_BASE = linux-board-support-package-r$(QCOM_DB410C_FIRMWARE_VERSION) QCOM_DB410C_FIRMWARE_SOURCE = $(QCOM_DB410C_FIRMWARE_BASE).zip QCOM_DB410C_FIRMWARE_SITE = https://releases.linaro.org/96boards/dragonboard410c/qualcomm/firmware -QCOM_DB410C_FIRMWARE_LICENCE = Qualcomm firmware license +QCOM_DB410C_FIRMWARE_LICENSE = Qualcomm firmware license QCOM_DB410C_FIRMWARE_LICENSE_FILES = LICENSE QCOM_DB410C_FIRMWARE_DEPENDENCIES = host-mtools diff --git a/package/qdecoder/qdecoder.hash b/package/qdecoder/qdecoder.hash index e3fb8375979..05337777b45 100644 --- a/package/qdecoder/qdecoder.hash +++ b/package/qdecoder/qdecoder.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3911576ad8766697a9c8c767458edc953ae686eb53cd31d21e38edd7831ed9aa qdecoder-12.0.8.tar.gz -sha256 17e647523e5c5c75fd02861dcf3ea91a146d918ab303460ee58135c9dd70904e COPYING +sha256 edd32bd5119d276afa9e01cd54a1c23049cad4e96dc6a8e48ac324580e085ebb qdecoder-12.1.0.tar.gz +sha256 41f34ba1ed6e5d8d3488992311f474cd3f614b82bada88ae53216946026cfae7 COPYING diff --git a/package/qdecoder/qdecoder.mk b/package/qdecoder/qdecoder.mk index 8cb5d3bc972..c465617e260 100644 --- a/package/qdecoder/qdecoder.mk +++ b/package/qdecoder/qdecoder.mk @@ -4,10 +4,11 @@ # ################################################################################ -QDECODER_VERSION = 12.0.8 +QDECODER_VERSION = 12.1.0 QDECODER_SITE = $(call github,wolkykim,qdecoder,v$(QDECODER_VERSION)) QDECODER_LICENSE = BSD-2-Clause QDECODER_LICENSE_FILES = COPYING +QDECODER_CPE_ID_VENDOR = qdecoder_project QDECODER_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' QDECODER_INSTALL_STAGING = YES diff --git a/package/qemu/0001-tests-fp-disable-fp-bench-build-by-default.patch b/package/qemu/0001-tests-fp-disable-fp-bench-build-by-default.patch index 9bc8d43d591..60518bcfa32 100644 --- a/package/qemu/0001-tests-fp-disable-fp-bench-build-by-default.patch +++ b/package/qemu/0001-tests-fp-disable-fp-bench-build-by-default.patch @@ -1,4 +1,4 @@ -From f82238299d3c4cd23ca60cfc0cf4271f5c860873 Mon Sep 17 00:00:00 2001 +From 83d976d6d7f0357659d5daa0f01c52048a609e88 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 25 Aug 2021 21:55:53 +0200 Subject: [PATCH] tests/fp: disable fp-bench build by default @@ -12,10 +12,10 @@ Signed-off-by: Romain Naour 1 file changed, 1 insertion(+) diff --git a/tests/fp/meson.build b/tests/fp/meson.build -index 07e2cdc8d2..c96460b7f1 100644 +index 8bd0979f67..2fe019d2c6 100644 --- a/tests/fp/meson.build +++ b/tests/fp/meson.build -@@ -631,6 +631,7 @@ fpbench = executable( +@@ -636,6 +636,7 @@ fpbench = executable( dependencies: [qemuutil], include_directories: [sfinc, include_directories(tfdir)], c_args: fpcflags, @@ -24,5 +24,5 @@ index 07e2cdc8d2..c96460b7f1 100644 fptestlog2 = executable( -- -2.31.1 +2.35.1 diff --git a/package/qemu/0002-softmmu-qemu-seccomp.c-add-missing-header-for-CLONE_.patch b/package/qemu/0002-softmmu-qemu-seccomp.c-add-missing-header-for-CLONE_.patch new file mode 100644 index 00000000000..91506b14d9a --- /dev/null +++ b/package/qemu/0002-softmmu-qemu-seccomp.c-add-missing-header-for-CLONE_.patch @@ -0,0 +1,42 @@ +From df07d3754bdf15e0efac244cfee290c9bac86352 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Mon, 2 May 2022 23:17:46 +0200 +Subject: [PATCH] softmmu/qemu-seccomp.c: add missing header for CLONE_NEWGROUP +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +With seccomp support enabled Qemu 7.0.0 fail to build with the +following error: + +../softmmu/qemu-seccomp.c:116:19: error: ‘CLONE_NEWCGROUP’ undeclared here (not in a function) + 116 | FORBID_CLONE_FLAG(CLONE_NEWCGROUP); + | ^~~~~~~~~~~~~~~ +../softmmu/qemu-seccomp.c:73:18: note: in definition of macro ‘FORBID_CLONE_FLAG’ + 73 | .datum_a = flag, .datum_b = flag } } + | ^~~~ + +CLONE_NEWCGROUP has been added in Qemu 7.0.0 by commit [1]. + +[1] https://git.qemu.org/?p=qemu.git;a=commitdiff;h=5a2f693f07a1e93ada5277b2fb1530b2698be0fa + +Signed-off-by: Romain Naour +--- + softmmu/qemu-seccomp.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/softmmu/qemu-seccomp.c b/softmmu/qemu-seccomp.c +index deaf8a4ef5..96c83e121f 100644 +--- a/softmmu/qemu-seccomp.c ++++ b/softmmu/qemu-seccomp.c +@@ -21,6 +21,7 @@ + #include + #include + #include "sysemu/seccomp.h" ++#include + #include + + /* For some architectures (notably ARM) cacheflush is not supported until +-- +2.35.1 + diff --git a/package/qemu/0003-Revert-linux-user-add-more-compat-ioctl-definitions.patch b/package/qemu/0003-Revert-linux-user-add-more-compat-ioctl-definitions.patch new file mode 100644 index 00000000000..2d303cd0127 --- /dev/null +++ b/package/qemu/0003-Revert-linux-user-add-more-compat-ioctl-definitions.patch @@ -0,0 +1,73 @@ +From 274f00f33411caee51973a9f7701daf194da5a0a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= +Date: Tue, 10 Jan 2023 12:49:00 -0500 +Subject: [PATCH] Revert "linux-user: add more compat ioctl definitions" +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This reverts commit c5495f4ecb0cdaaf2e9dddeb48f1689cdb520ca0. + +glibc has fixed (in 2.36.9000-40-g774058d729) the problem +that caused a clash when both sys/mount.h annd linux/mount.h +are included, and backported this to the 2.36 stable release +too: + + https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E + +It is saner for QEMU to remove the workaround it applied for +glibc 2.36 and expect distros to ship the 2.36 maint release +with the fix. This avoids needing to add a further workaround +to QEMU to deal with the fact that linux/brtfs.h now also pulls +in linux/mount.h via linux/fs.h since Linux 6.1 + +Signed-off-by: Daniel P. Berrangé +Reviewed-by: Marc-André Lureau +Message-Id: <20230110174901.2580297-2-berrange@redhat.com> +Signed-off-by: Laurent Vivier + +Upstream: https://gitlab.com/qemu-project/qemu/-/commit/9f0246539ae84a5e21efd1cc4516fc343f08115a +Signed-off-by: Peter Seiderer +--- + linux-user/syscall.c | 25 ------------------------- + 1 file changed, 25 deletions(-) + +diff --git a/linux-user/syscall.c b/linux-user/syscall.c +index 24b25759be..10af5e0d8e 100644 +--- a/linux-user/syscall.c ++++ b/linux-user/syscall.c +@@ -111,31 +111,6 @@ + #define FS_IOC32_SETFLAGS _IOW('f', 2, int) + #define FS_IOC32_GETVERSION _IOR('v', 1, int) + #define FS_IOC32_SETVERSION _IOW('v', 2, int) +- +-#define BLKGETSIZE64 _IOR(0x12,114,size_t) +-#define BLKDISCARD _IO(0x12,119) +-#define BLKIOMIN _IO(0x12,120) +-#define BLKIOOPT _IO(0x12,121) +-#define BLKALIGNOFF _IO(0x12,122) +-#define BLKPBSZGET _IO(0x12,123) +-#define BLKDISCARDZEROES _IO(0x12,124) +-#define BLKSECDISCARD _IO(0x12,125) +-#define BLKROTATIONAL _IO(0x12,126) +-#define BLKZEROOUT _IO(0x12,127) +- +-#define FIBMAP _IO(0x00,1) +-#define FIGETBSZ _IO(0x00,2) +- +-struct file_clone_range { +- __s64 src_fd; +- __u64 src_offset; +- __u64 src_length; +- __u64 dest_offset; +-}; +- +-#define FICLONE _IOW(0x94, 9, int) +-#define FICLONERANGE _IOW(0x94, 13, struct file_clone_range) +- + #else + #include + #endif +-- +2.25.1 + diff --git a/package/qemu/0004-Revert-linux-user-fix-compat-with-glibc-2.36-sys-mou.patch b/package/qemu/0004-Revert-linux-user-fix-compat-with-glibc-2.36-sys-mou.patch new file mode 100644 index 00000000000..2a36a5cbb41 --- /dev/null +++ b/package/qemu/0004-Revert-linux-user-fix-compat-with-glibc-2.36-sys-mou.patch @@ -0,0 +1,82 @@ +From e07973ca745958da739f8ece80273da48f94f031 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= +Date: Tue, 10 Jan 2023 12:49:01 -0500 +Subject: [PATCH] Revert "linux-user: fix compat with glibc >= 2.36 + sys/mount.h" +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This reverts commit 3cd3df2a9584e6f753bb62a0028bd67124ab5532. + +glibc has fixed (in 2.36.9000-40-g774058d729) the problem +that caused a clash when both sys/mount.h annd linux/mount.h +are included, and backported this to the 2.36 stable release +too: + + https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E + +It is saner for QEMU to remove the workaround it applied for +glibc 2.36 and expect distros to ship the 2.36 maint release +with the fix. This avoids needing to add a further workaround +to QEMU to deal with the fact that linux/brtfs.h now also pulls +in linux/mount.h via linux/fs.h since Linux 6.1 + +Signed-off-by: Daniel P. Berrangé +Reviewed-by: Marc-André Lureau +Message-Id: <20230110174901.2580297-3-berrange@redhat.com> +Signed-off-by: Laurent Vivier + +Upstream: https://gitlab.com/qemu-project/qemu/-/commit/6003159ce18faad4e1bc7bf9c85669019cd4950e +Signed-off-by: Peter Seiderer +--- + linux-user/syscall.c | 18 ------------------ + meson.build | 2 -- + 2 files changed, 20 deletions(-) + +diff --git a/linux-user/syscall.c b/linux-user/syscall.c +index 10af5e0d8e..d974c76b60 100644 +--- a/linux-user/syscall.c ++++ b/linux-user/syscall.c +@@ -95,25 +95,7 @@ + #include + #include + #include +- +-#ifdef HAVE_SYS_MOUNT_FSCONFIG +-/* +- * glibc >= 2.36 linux/mount.h conflicts with sys/mount.h, +- * which in turn prevents use of linux/fs.h. So we have to +- * define the constants ourselves for now. +- */ +-#define FS_IOC_GETFLAGS _IOR('f', 1, long) +-#define FS_IOC_SETFLAGS _IOW('f', 2, long) +-#define FS_IOC_GETVERSION _IOR('v', 1, long) +-#define FS_IOC_SETVERSION _IOW('v', 2, long) +-#define FS_IOC_FIEMAP _IOWR('f', 11, struct fiemap) +-#define FS_IOC32_GETFLAGS _IOR('f', 1, int) +-#define FS_IOC32_SETFLAGS _IOW('f', 2, int) +-#define FS_IOC32_GETVERSION _IOR('v', 1, int) +-#define FS_IOC32_SETVERSION _IOW('v', 2, int) +-#else + #include +-#endif + #include + #if defined(CONFIG_FIEMAP) + #include +diff --git a/meson.build b/meson.build +index b88867ca9d..39e83bbafe 100644 +--- a/meson.build ++++ b/meson.build +@@ -2032,8 +2032,6 @@ config_host_data.set('HAVE_OPTRESET', + cc.has_header_symbol('getopt.h', 'optreset')) + config_host_data.set('HAVE_IPPROTO_MPTCP', + cc.has_header_symbol('netinet/in.h', 'IPPROTO_MPTCP')) +-config_host_data.set('HAVE_SYS_MOUNT_FSCONFIG', +- cc.has_header_symbol('sys/mount.h', 'FSCONFIG_SET_FLAG')) + + # has_member + config_host_data.set('HAVE_SIGEV_NOTIFY_THREAD_ID', +-- +2.25.1 + diff --git a/package/qemu/Config.in b/package/qemu/Config.in index 7bb203a1776..de6475e7197 100644 --- a/package/qemu/Config.in +++ b/package/qemu/Config.in @@ -1,9 +1,15 @@ config BR2_PACKAGE_QEMU_ARCH_SUPPORTS_TARGET bool # Only tested on these architectures - default y if BR2_aarch64 || BR2_i386 || BR2_mips || BR2_mipsel \ - || BR2_x86_64 || BR2_arm \ - || BR2_powerpc64 || BR2_powerpc64le + default y if BR2_aarch64 + default y if BR2_arm && !BR2_ARM_CPU_ARMV4 && !BR2_ARM_CPU_ARMV5 + default y if BR2_i386 + default y if BR2_mips + default y if BR2_mipsel + default y if BR2_powerpc64 + default y if BR2_powerpc64le + default y if BR2_riscv + default y if BR2_x86_64 comment "QEMU requires a toolchain with wchar, threads, gcc >= 8" depends on BR2_PACKAGE_QEMU_ARCH_SUPPORTS_TARGET @@ -11,7 +17,7 @@ comment "QEMU requires a toolchain with wchar, threads, gcc >= 8" depends on !(BR2_TOOLCHAIN_HAS_THREADS && BR2_USE_WCHAR) || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_8 -config BR2_PACKAGE_QEMU +menuconfig BR2_PACKAGE_QEMU bool "QEMU" depends on BR2_PACKAGE_QEMU_ARCH_SUPPORTS_TARGET depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 @@ -19,8 +25,8 @@ config BR2_PACKAGE_QEMU depends on BR2_USE_WCHAR # gettext depends on BR2_USE_MMU # fork() select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_PIXMAN select BR2_PACKAGE_ZLIB + select BR2_PACKAGE_QEMU_TOOLS if !BR2_PACKAGE_QEMU_SYSTEM && !BR2_PACKAGE_QEMU_LINUX_USER help QEMU is a generic and open source machine emulator and virtualizer. @@ -37,26 +43,21 @@ config BR2_PACKAGE_QEMU Linux. When using KVM, QEMU can virtualize x86, server and embedded PowerPC, and S390 guests. - http://qemu.org/ + https://www.qemu.org/ if BR2_PACKAGE_QEMU comment "Emulators selection" -config BR2_PACKAGE_QEMU_CUSTOM_TARGETS - string "Enable specific targets" +config BR2_PACKAGE_QEMU_SYSTEM + bool "Enable systems emulation" + depends on !BR2_STATIC_LIBS # dtc + select BR2_PACKAGE_PIXMAN + select BR2_PACKAGE_QEMU_FDT if !BR2_PACKAGE_QEMU_CHOOSE_TARGETS help - Enter here the list of QEMU targets you want to build. For - example: + Say 'y' to build system emulators/virtualisers. - System emulation | User-land emulation - ----------------------+----------------------- - i386-softmmu | i386-linux-user - arm-softmmu | ppc-linux-user - x86_64-softmmu | sparc-bsd-user - ... | ... - -comment "Networking options" +if BR2_PACKAGE_QEMU_SYSTEM config BR2_PACKAGE_QEMU_SLIRP bool "Enable user mode networking (SLIRP)" @@ -81,69 +82,265 @@ config BR2_PACKAGE_QEMU_SLIRP Notice that this option does not disable other networking modes. -if BR2_PACKAGE_QEMU_CUSTOM_TARGETS = "" - -comment "... or you can select emulator families to enable, below:" +config BR2_PACKAGE_QEMU_SDL + bool "Enable SDL frontend" + select BR2_PACKAGE_SDL2 + help + Say 'y' to enable the SDL frontend, that is, a graphical + window presenting the VM's display. -config BR2_PACKAGE_QEMU_SYSTEM - bool "Enable all systems emulation" - depends on !BR2_STATIC_LIBS # dtc - select BR2_PACKAGE_QEMU_FDT +config BR2_PACKAGE_QEMU_FDT + bool "Enable FDT" + select BR2_PACKAGE_DTC help - Say 'y' to build all system emulators/virtualisers that QEMU - supports. + Say 'y' here to have QEMU capable of constructing Device + Trees, and passing them to the VMs. + +endif # BR2_PACKAGE_QEMU_SYSTEM comment "systems emulation needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS config BR2_PACKAGE_QEMU_LINUX_USER - bool "Enable all Linux user-land emulation" + bool "Enable Linux user-land emulation" # Incompatible "struct sigevent" definition on musl depends on !BR2_TOOLCHAIN_USES_MUSL help - Say 'y' to build all Linux user-land emulators that QEMU - supports. + Say 'y' to build Linux user-land emulators. # Note: bsd-user can not be build on Linux comment "Linux user-land emulation needs a glibc or uClibc toolchain" depends on BR2_TOOLCHAIN_USES_MUSL -endif # BR2_PACKAGE_QEMU_CUSTOM_TARGETS == "" +config BR2_PACKAGE_QEMU_CHOOSE_TARGETS + bool "Select individual emulator targets" + depends on BR2_PACKAGE_QEMU_SYSTEM || BR2_PACKAGE_QEMU_LINUX_USER + help + By default, all targets (system and/or user, subject to the + corresponding options, above) are built. If you only need a + subset of the emulated targets, say 'y' here and enable at + least one target, below. -config BR2_PACKAGE_QEMU_HAS_EMULS - def_bool y - depends on BR2_PACKAGE_QEMU_SYSTEM || BR2_PACKAGE_QEMU_LINUX_USER || BR2_PACKAGE_QEMU_CUSTOM_TARGETS != "" +if BR2_PACKAGE_QEMU_CHOOSE_TARGETS -if BR2_PACKAGE_QEMU_HAS_EMULS +config BR2_PACKAGE_QEMU_TARGET_AARCH64 + bool "aarch64" + select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM + help + ARM 64-bit architecture. -comment "Frontends" +config BR2_PACKAGE_QEMU_TARGET_AARCH64_BE + bool "aarch64_be (linux-user, only)" + depends on BR2_PACKAGE_QEMU_LINUX_USER + help + ARM 64-bit architecture, big-endian. -config BR2_PACKAGE_QEMU_SDL - bool "Enable SDL frontend" - depends on !BR2_STATIC_LIBS # sdl2 - select BR2_PACKAGE_SDL2 +config BR2_PACKAGE_QEMU_TARGET_ALPHA + bool "alpha" help - Say 'y' to enable the SDL frontend, that is, a graphical - window presenting the VM's display. + DEC Alpha 64-bit RISC architecture. -comment "SDL frontend needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS +config BR2_PACKAGE_QEMU_TARGET_ARM + bool "arm" + select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM + help + ARM EABI architecture, little-endian. -comment "Misc. features" +config BR2_PACKAGE_QEMU_TARGET_ARMEB + bool "armeb (linux-user, only)" + depends on BR2_PACKAGE_QEMU_LINUX_USER + help + ARM EABI architecture, big-endian. -config BR2_PACKAGE_QEMU_FDT - bool "Enable FDT" - depends on !BR2_STATIC_LIBS # dtc - select BR2_PACKAGE_DTC +config BR2_PACKAGE_QEMU_TARGET_AVR + bool "avr (system, only)" + depends on BR2_PACKAGE_QEMU_SYSTEM help - Say 'y' here to have QEMU capable of constructing Device - Trees, and passing them to the VMs. + AVR 8-bit microcontroller architecture. -comment "FDT support needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS +config BR2_PACKAGE_QEMU_TARGET_CRIS + bool "cris" + help + ETRAX CRIS microcontroller architecture. + +config BR2_PACKAGE_QEMU_TARGET_HEXAGON + bool "hexagon (linux-user, only)" + depends on BR2_PACKAGE_QEMU_LINUX_USER + help + Qualcomm's Hexagon VLSI DSP architecture. + +config BR2_PACKAGE_QEMU_TARGET_HPPA + bool "hppa" + help + HP PA-RISC architecture. + +config BR2_PACKAGE_QEMU_TARGET_I386 + bool "i386" + select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM + help + Intel i386 32-bit architecture. + +config BR2_PACKAGE_QEMU_TARGET_LOONGARCH64 + bool "loongarch64" + select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM + help + Loongson 64-bit RISC architecture. + +config BR2_PACKAGE_QEMU_TARGET_M68K + bool "m68k" + help + Motorola 68000 architecture. + +config BR2_PACKAGE_QEMU_TARGET_MICROBLAZE + bool "microblaze" + select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM + help + Xilinix 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. + +config BR2_PACKAGE_QEMU_TARGET_MIPS + bool "mips" + help + MIPS 32-bit architecture. + +config BR2_PACKAGE_QEMU_TARGET_MIPSEL + bool "mipsel" + help + MIPS 32-bit architecture, little-endian. + +config BR2_PACKAGE_QEMU_TARGET_MIPS64 + bool "mips64" + help + MIPS 64-bit architecture. + +config BR2_PACKAGE_QEMU_TARGET_MIPS64EL + bool "mips64el" + select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM + help + MIPS 64-bit architecture, little-endian. + +config BR2_PACKAGE_QEMU_TARGET_MIPSN32 + bool "mipsn32 (linux-user, only)" + depends on BR2_PACKAGE_QEMU_LINUX_USER + help + MIPS N32 architecture. + +config BR2_PACKAGE_QEMU_TARGET_MIPSN32EL + bool "mipsn32el (linux-user, only)" + depends on BR2_PACKAGE_QEMU_LINUX_USER + help + MIPS N32 architecture, little-endian. + +config BR2_PACKAGE_QEMU_TARGET_NIOS2 + bool "nios2" + help + Nios II architecture. + +config BR2_PACKAGE_QEMU_TARGET_OR1K + bool "or1k" + select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM + help + OpenRISC 1000 architecture. + +config BR2_PACKAGE_QEMU_TARGET_PPC + bool "ppc" + select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM + help + PoewerPC 32-bit architecture. + +config BR2_PACKAGE_QEMU_TARGET_PPC64 + bool "ppc64" + select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM + help + PoewerPC 64-bit architecture. + +config BR2_PACKAGE_QEMU_TARGET_PPC64LE + bool "ppc64le (linux-user, only)" + depends on BR2_PACKAGE_QEMU_LINUX_USER + help + PoewerPC 64-bit architecture, little-endian. + +config BR2_PACKAGE_QEMU_TARGET_RISCV32 + bool "riscv32" + select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM + help + RISC-V 33-bit architecture. + +config BR2_PACKAGE_QEMU_TARGET_RISCV64 + bool "riscv64" + select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM + help + RISC-V 64-bit architecture. + +config BR2_PACKAGE_QEMU_TARGET_RX + bool "rx (system-only)" + depends on BR2_PACKAGE_QEMU_SYSTEM + select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM + help + Renesas Electronics RX 32-bit architecture. + +config BR2_PACKAGE_QEMU_TARGET_S390X + bool "s390x" + help + IBM z/Architecture 64-bit mainframe (s390x) + +config BR2_PACKAGE_QEMU_TARGET_SH4 + bool "sh4" + help + Super-H 32-bit RISC architecture. + +config BR2_PACKAGE_QEMU_TARGET_SH4EB + bool "sh4eb" + help + Super-H EB 32-bit RISC architecture. + +config BR2_PACKAGE_QEMU_TARGET_SPARC + bool "sparc" + help + SPARC 32-bit RISC architecture. + +config BR2_PACKAGE_QEMU_TARGET_SPARC32PLUS + bool "sparc32plus (linux-user, only)" + depends on BR2_PACKAGE_QEMU_LINUX_USER + help + SPARC 32-bit RISC architecture (Sun's v8plus). + +config BR2_PACKAGE_QEMU_TARGET_SPARC64 + bool "sparc64" + help + SPARC 64-bit RISC architecture. + +config BR2_PACKAGE_QEMU_TARGET_TRICORE + bool "tricore (system, only)" + depends on BR2_PACKAGE_QEMU_SYSTEM + help + Infineon TriCore 32-bit RISC architecture. + +config BR2_PACKAGE_QEMU_TARGET_X86_64 + bool "x86_64" + select BR2_PACKAGE_QEMU_FDT if BR2_PACKAGE_QEMU_SYSTEM + help + Intel x86 64-bit architecture. + +config BR2_PACKAGE_QEMU_TARGET_XTENSA + bool "xtensa" + help + Xtensa 32-bit RISC architecture. + +config BR2_PACKAGE_QEMU_TARGET_XTENSAEB + bool "xtensaeb" + help + Xtensa 32-bit RISC architecture, big-endian. + +endif # BR2_PACKAGE_QEMU_CHOOSE_TARGETS -endif # BR2_PACKAGE_QEMU_HAS_EMULS +comment "Tools selection" config BR2_PACKAGE_QEMU_TOOLS bool "Enable tools" diff --git a/package/qemu/Config.in.host b/package/qemu/Config.in.host index f9cdb9b7037..8dd0c7d11b0 100644 --- a/package/qemu/Config.in.host +++ b/package/qemu/Config.in.host @@ -34,6 +34,11 @@ config BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORTS bool default y if BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS +comment "host-qemu needs a host gcc >= 8" + depends on BR2_PACKAGE_HOST_QEMU_SYSTEM_ARCH_SUPPORTS || \ + BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORT + depends on !BR2_HOST_GCC_AT_LEAST_8 + config BR2_PACKAGE_HOST_QEMU bool "host qemu" depends on BR2_PACKAGE_HOST_QEMU_SYSTEM_ARCH_SUPPORTS || BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORTS @@ -50,11 +55,6 @@ config BR2_PACKAGE_HOST_QEMU http://www.qemu.org -comment "host-qemu needs a host gcc >= 8" - depends on BR2_PACKAGE_HOST_QEMU_SYSTEM_ARCH_SUPPORTS || \ - BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORT - depends on !BR2_HOST_GCC_AT_LEAST_8 - if BR2_PACKAGE_HOST_QEMU comment "Emulators selection" diff --git a/package/qemu/qemu.hash b/package/qemu/qemu.hash index 9411832384b..93f7c98f1c2 100644 --- a/package/qemu/qemu.hash +++ b/package/qemu/qemu.hash @@ -1,4 +1,4 @@ # Locally computed, tarball verified with GPG signature -sha256 68e15d8e45ac56326e0b9a4afa8b49a3dfe8aba3488221d098c84698bca65b45 qemu-6.2.0.tar.xz +sha256 8c85699acf9d7a43a5fe29a64cdd56370b0c2d1ad074baf7098a824d17aad73b qemu-7.2.1.tar.xz sha256 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index e69e813059d..72a0160f866 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -4,9 +4,11 @@ # ################################################################################ -QEMU_VERSION = 6.2.0 +# When updating the version, check whether the list of supported targets +# needs to be updated. +QEMU_VERSION = 7.2.1 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz -QEMU_SITE = http://download.qemu.org +QEMU_SITE = https://download.qemu.org QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c QEMU_LICENSE_FILES = COPYING COPYING.LIB # NOTE: there is no top-level license file for non-(L)GPL licenses; @@ -20,7 +22,12 @@ QEMU_CPE_ID_VENDOR = qemu # However, building is still done with configure and make as in previous versions of QEMU. # Target-qemu -QEMU_DEPENDENCIES = host-meson host-pkgconf libglib2 zlib pixman host-python3 +QEMU_DEPENDENCIES = \ + host-meson \ + host-pkgconf \ + host-python3 \ + libglib2 \ + zlib # Need the LIBS variable because librt and libm are # not automatically pulled. :-( @@ -30,30 +37,98 @@ QEMU_OPTS = QEMU_VARS = LIBTOOL=$(HOST_DIR)/bin/libtool -# If we want to specify only a subset of targets, we must still enable all -# of them, so that QEMU properly builds its list of default targets, from -# which it then checks if the specified sub-set is valid. That's what we -# do in the first part of the if-clause. -# Otherwise, if we do not want to pass a sub-set of targets, we then need -# to either enable or disable -user and/or -system emulation appropriately. -# That's what we do in the else-clause. -ifneq ($(call qstrip,$(BR2_PACKAGE_QEMU_CUSTOM_TARGETS)),) -QEMU_OPTS += --enable-system --enable-linux-user -QEMU_OPTS += --target-list="$(call qstrip,$(BR2_PACKAGE_QEMU_CUSTOM_TARGETS))" -else +# If we want to build all emulation targets, we just need to either enable -user +# and/or -system emulation appropriately. +# Otherwise, if we want only a subset of targets, we must still enable all of +# them, so that QEMU properly builds a list of default targets from which it +# checks if the specified sub-set is valid. ifeq ($(BR2_PACKAGE_QEMU_SYSTEM),y) +QEMU_DEPENDENCIES += pixman QEMU_OPTS += --enable-system +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_AARCH64) += aarch64-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_ALPHA) += alpha-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_ARM) += arm-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_AVR) += avr-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_CRIS) += cris-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_HPPA) += hppa-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_I386) += i386-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_LOONGARCH64) += loongarch64-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_M68K) += m68k-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MICROBLAZE) += microblaze-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MICROBLAZEEL) += microblazeel-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MIPS) += mips-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MIPS64) += mips64-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MIPS64EL) += mips64el-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MIPSEL) += mipsel-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_NIOS2) += nios2-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_OR1K) += or1k-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_PPC) += ppc-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_PPC64) += ppc64-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_RISCV32) += riscv32-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_RISCV64) += riscv64-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_RX) += rx-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_S390X) += s390x-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_SH4) += sh4-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_SH4EB) += sh4eb-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_SPARC) += sparc-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_SPARC64) += sparc64-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_TRICORE) += tricore-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_X86_64) += x86_64-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_XTENSA) += xtensa-softmmu +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_XTENSAEB) += xtensaeb-softmmu else QEMU_OPTS += --disable-system endif ifeq ($(BR2_PACKAGE_QEMU_LINUX_USER),y) QEMU_OPTS += --enable-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_AARCH64) += aarch64-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_AARCH64_BE) += aarch64_be-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_ALPHA) += alpha-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_ARM) += arm-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_ARMEB) += armeb-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_CRIS) += cris-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_HEXAGON) += hexagon-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_HPPA) += hppa-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_I386) += i386-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_LOONGARCH64) += loongarch64-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_M68K) += m68k-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MICROBLAZE) += microblaze-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MICROBLAZEEL) += microblazeel-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MIPS) += mips-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MIPS64) += mips64-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MIPS64EL) += mips64el-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MIPSEL) += mipsel-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MIPSN32) += mipsn32-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_MIPSN32EL) += mipsn32el-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_NIOS2) += nios2-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_OR1K) += or1k-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_PPC) += ppc-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_PPC64) += ppc64-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_PPC64LE) += ppc64le-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_RISCV32) += riscv32-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_RISCV64) += riscv64-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_S390X) += s390x-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_SH4) += sh4-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_SH4EB) += sh4eb-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_SPARC) += sparc-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_SPARC32PLUS) += sparc32plus-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_SPARC64) += sparc64-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_X86_64) += x86_64-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_XTENSA) += xtensa-linux-user +QEMU_TARGET_LIST_$(BR2_PACKAGE_QEMU_TARGET_XTENSAEB) += xtensaeb-linux-user else QEMU_OPTS += --disable-linux-user endif +# Build the list of desired targets, if any. +ifeq ($(BR2_PACKAGE_QEMU_CHOOSE_TARGETS),y) +QEMU_TARGET_LIST = $(strip $(QEMU_TARGET_LIST_y)) +ifeq ($(BR_BUILDING).$(QEMU_TARGET_LIST),y.) +$(error "No emulator target has ben chosen") +endif +QEMU_OPTS += --target-list="$(QEMU_TARGET_LIST)" endif ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) @@ -63,7 +138,7 @@ QEMU_OPTS += --enable-vhost-user endif ifeq ($(BR2_PACKAGE_QEMU_SLIRP),y) -QEMU_OPTS += --enable-slirp=system +QEMU_OPTS += --enable-slirp QEMU_DEPENDENCIES += slirp else QEMU_OPTS += --disable-slirp @@ -72,7 +147,7 @@ endif ifeq ($(BR2_PACKAGE_QEMU_SDL),y) QEMU_OPTS += --enable-sdl QEMU_DEPENDENCIES += sdl2 -QEMU_VARS += SDL2_CONFIG=$(BR2_STAGING_DIR)/usr/bin/sdl2-config +QEMU_VARS += SDL2_CONFIG=$(STAGING_DIR)/usr/bin/sdl2-config else QEMU_OPTS += --disable-sdl endif @@ -124,10 +199,10 @@ QEMU_OPTS += \ --disable-vnc-sasl QEMU_DEPENDENCIES += libvncserver ifeq ($(BR2_PACKAGE_LIBPNG),y) -QEMU_OPTS += --enable-vnc-png +QEMU_OPTS += --enable-png QEMU_DEPENDENCIES += libpng else -QEMU_OPTS += --disable-vnc-png +QEMU_OPTS += --disable-png endif ifeq ($(BR2_PACKAGE_JPEG),y) QEMU_OPTS += --enable-vnc-jpeg @@ -197,12 +272,12 @@ define QEMU_CONFIGURE_CMDS --disable-coreaudio \ --disable-curl \ --disable-curses \ + --disable-dbus-display \ --disable-docs \ --disable-dsound \ --disable-hvf \ --disable-jack \ --disable-libiscsi \ - --disable-libxml2 \ --disable-linux-aio \ --disable-linux-io-uring \ --disable-malloc-trim \ @@ -246,7 +321,14 @@ $(eval $(generic-package)) #------------------------------------------------------------- # Host-qemu -HOST_QEMU_DEPENDENCIES = host-meson host-pkgconf host-zlib host-libglib2 host-pixman host-python3 +HOST_QEMU_DEPENDENCIES = \ + host-libglib2 \ + host-meson \ + host-pixman \ + host-pkgconf \ + host-python3 \ + host-slirp \ + host-zlib # BR ARCH qemu # ------- ---- @@ -277,6 +359,9 @@ HOST_QEMU_DEPENDENCIES = host-meson host-pkgconf host-zlib host-libglib2 host-pi # xtensa xtensa HOST_QEMU_ARCH = $(ARCH) +ifeq ($(HOST_QEMU_ARCH),armeb) +HOST_QEMU_SYS_ARCH = arm +endif ifeq ($(HOST_QEMU_ARCH),i486) HOST_QEMU_ARCH = i386 endif @@ -369,6 +454,7 @@ define HOST_QEMU_CONFIGURE_CMDS --disable-containers \ --disable-coreaudio \ --disable-curl \ + --disable-dbus-display \ --disable-docs \ --disable-dsound \ --disable-jack \ @@ -384,8 +470,11 @@ define HOST_QEMU_CONFIGURE_CMDS --disable-vhost-user-blk-server \ --disable-virtiofsd \ --disable-vnc-jpeg \ - --disable-vnc-png \ + --disable-png \ --disable-vnc-sasl \ + --enable-slirp \ + --enable-tools \ + --disable-guest-agent \ $(HOST_QEMU_OPTS) endef @@ -399,6 +488,14 @@ define HOST_QEMU_INSTALL_CMDS $(HOST_MAKE_ENV) $(MAKE) -C $(@D) install endef +# install symlink to qemu-system +ifeq ($(BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE),y) +define HOST_QEMU_POST_INSTALL_SYMLINK + ln -sf ./qemu-system-$(HOST_QEMU_ARCH) $(HOST_DIR)/bin/qemu-system +endef +HOST_QEMU_POST_INSTALL_HOOKS += HOST_QEMU_POST_INSTALL_SYMLINK +endif + $(eval $(host-generic-package)) # variable used by other packages diff --git a/package/qlibc/qlibc.hash b/package/qlibc/qlibc.hash index 6abb16b2742..9b2af1a4e3e 100644 --- a/package/qlibc/qlibc.hash +++ b/package/qlibc/qlibc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e195c97453c260acea4421146ba992d9a4d89732eac345b3765c43cc3326d2ad qlibc-2.4.5.tar.gz +sha256 ddb27da8ee6f3bf558e5d1d21d3d392c8a6f12d25767c5f70f4e757d814900c9 qlibc-2.4.7.tar.gz sha256 7c9d03656af4c0acf0a35e29459086498dd64080eac6d2945bc1c064aaf18132 LICENSE diff --git a/package/qlibc/qlibc.mk b/package/qlibc/qlibc.mk index 6cce8201bd6..838ba687469 100644 --- a/package/qlibc/qlibc.mk +++ b/package/qlibc/qlibc.mk @@ -4,7 +4,7 @@ # ################################################################################ -QLIBC_VERSION = 2.4.5 +QLIBC_VERSION = 2.4.7 QLIBC_SITE = $(call github,wolkykim,qlibc,v$(QLIBC_VERSION)) QLIBC_LICENSE = BSD-2-Clause QLIBC_LICENSE_FILES = LICENSE 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 89aaf1d71bc..6e5c761463d 100644 --- a/package/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.hash +++ b/package/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.hash @@ -1,3 +1,5 @@ # Locally calculated -sha256 5871c5717be32f14a59624d5699d405e8ce9ae2e9c9ef86fd16e13d264a40e58 firmware-cadence-lsdk1909.bin -sha256 d55f024af2bfff714b90de596f6d0399124b999e8c18a86b13a3b507bae6f561 COPYING +sha256 e267655a47fbe118f6960bca7994bd6b8986ef955344fe006a424be96f868602 firmware-cadence-lsdk2012.bin +sha256 9c16421e7c702f56756650b8ac954d34556327e598a8666e6e8f4eb3a1aa95f1 COPYING +sha256 72edc2072c86d93aa1993d15d4d19d96270af3749b0108995ad50c81d1461f52 EULA +sha256 53e3eb0b2bd81c171fa04c17514e20b39b7bb1fe1224c593f7717f615fb9d52b EULA.txt 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 23643d24e0f..4f75287269a 100644 --- a/package/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.mk +++ b/package/qoriq-cadence-dp-firmware/qoriq-cadence-dp-firmware.mk @@ -4,42 +4,23 @@ # ################################################################################ -QORIQ_CADENCE_DP_FIRMWARE_VERSION = lsdk1909 +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_LICENSE = NXP-Binary-EULA -QORIQ_CADENCE_DP_FIRMWARE_LICENSE_FILES = COPYING +QORIQ_CADENCE_DP_FIRMWARE_LICENSE = NXP Semiconductor Software License Agreement +QORIQ_CADENCE_DP_FIRMWARE_LICENSE_FILES = COPYING EULA EULA.txt QORIQ_CADENCE_DP_FIRMWARE_REDISTRIBUTE = NO QORIQ_CADENCE_DP_FIRMWARE_INSTALL_IMAGES = YES +ifeq ($(BR2_LINUX_KERNEL_INSTALL_TARGET),) QORIQ_CADENCE_DP_FIRMWARE_INSTALL_TARGET = NO +endif -# Helper for self-extracting binaries distributed by NXP. -# -# The --force option makes sure it doesn't fail if the source -# directory already exists. The --auto-accept skips the license check, -# as it is not needed in Buildroot because we have legal-info. Since -# there's a EULA in the binary file, we extract it in this macro, and -# it should therefore be added to the LICENSE_FILES variable of -# packages using this macro. Also, remember to set REDISTRIBUTE to -# "NO". Indeed, this is a legal minefield: the EULA specifies that the -# Board Support Package includes software and hardware (sic!) for -# which a separate license is needed... -# -# $(1): full path to the archive file -# -define QORIQ_CADENCE_DP_FIRMWARE_EXTRACT_HELPER - awk 'BEGIN { start = 0; } \ - /^EOEULA/ { start = 0; } \ - { if (start) print; } \ - /< $(@D)/EULA - cd $(@D) && sh $(1) --force --auto-accept - find $(@D)/$(basename $(notdir $(1))) -mindepth 1 -maxdepth 1 -exec mv {} $(@D) \; - rmdir $(@D)/$(basename $(notdir $(1))) +define QORIQ_CADENCE_DP_FIRMWARE_EXTRACT_CMDS + $(call NXP_EXTRACT_HELPER,$(QORIQ_CADENCE_DP_FIRMWARE_DL_DIR)/$(QORIQ_CADENCE_DP_FIRMWARE_SOURCE)) endef -define QORIQ_CADENCE_DP_FIRMWARE_EXTRACT_CMDS - $(call QORIQ_CADENCE_DP_FIRMWARE_EXTRACT_HELPER,$(QORIQ_CADENCE_DP_FIRMWARE_DL_DIR)/$(QORIQ_CADENCE_DP_FIRMWARE_SOURCE)) +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 endef define QORIQ_CADENCE_DP_FIRMWARE_INSTALL_IMAGES_CMDS diff --git a/package/qoriq-rcw/Config.in.host b/package/qoriq-rcw/Config.in.host index 08fc83acd04..58c16d495b5 100644 --- a/package/qoriq-rcw/Config.in.host +++ b/package/qoriq-rcw/Config.in.host @@ -9,7 +9,7 @@ config BR2_PACKAGE_HOST_QORIQ_RCW $(HOST_DIR)/share/rcw. Either a SDK or post scripts can then use this toolset and examples. - https://source.codeaurora.org/external/qoriq/qoriq-components/rcw/ + https://github.com/nxp-qoriq/rcw if BR2_PACKAGE_HOST_QORIQ_RCW diff --git a/package/qoriq-rcw/qoriq-rcw.hash b/package/qoriq-rcw/qoriq-rcw.hash index 5848799a0c2..2a887d57d45 100644 --- a/package/qoriq-rcw/qoriq-rcw.hash +++ b/package/qoriq-rcw/qoriq-rcw.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 bbb595f0b68beb114620f7aeaff073b90938329e10cd6b36daa9f2087f3119a0 qoriq-rcw-LSDK-20.12-br1.tar.gz +sha256 f199c10e50bd18d7bed0d60f5b68194240dea4f1aa164cec98332723727a4796 qoriq-rcw-LSDK-21.08.tar.gz sha256 68f4b15ecc085729419bc60ca6eeadca5af0237bbfec791e8a79da9c943d42e9 LICENSE diff --git a/package/qoriq-rcw/qoriq-rcw.mk b/package/qoriq-rcw/qoriq-rcw.mk index 93e660b1ddb..b9c9e99222b 100644 --- a/package/qoriq-rcw/qoriq-rcw.mk +++ b/package/qoriq-rcw/qoriq-rcw.mk @@ -4,9 +4,8 @@ # ################################################################################ -QORIQ_RCW_VERSION = LSDK-20.12 -QORIQ_RCW_SITE = https://source.codeaurora.org/external/qoriq/qoriq-components/rcw -QORIQ_RCW_SITE_METHOD = git +QORIQ_RCW_VERSION = LSDK-21.08 +QORIQ_RCW_SITE = $(call github,nxp-qoriq,rcw,$(QORIQ_RCW_VERSION)) QORIQ_RCW_LICENSE = BSD-3-Clause QORIQ_RCW_LICENSE_FILES = LICENSE @@ -60,7 +59,6 @@ endef else ifneq ($(QORIQ_RCW_INTREE),) QORIQ_RCW_PLATFORM = $(firstword $(subst /, ,$(QORIQ_RCW_INTREE))) -QORIQ_RCW_FILE_BIN = $(lastword $(subst /, ,$(QORIQ_RCW_INTREE))) define HOST_QORIQ_RCW_BUILD_CMDS $(MAKE) -C $(@D)/$(QORIQ_RCW_PLATFORM) diff --git a/package/qpdf/qpdf.mk b/package/qpdf/qpdf.mk index 8e0769059d3..a58781f4f10 100644 --- a/package/qpdf/qpdf.mk +++ b/package/qpdf/qpdf.mk @@ -32,4 +32,8 @@ else QPDF_CONF_OPTS += --disable-crypto-openssl endif +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +QPDF_CONF_ENV += LIBS=-latomic +endif + $(eval $(autotools-package)) diff --git a/package/qpid-proton/Config.in b/package/qpid-proton/Config.in index b49a2afa7eb..adddc6eca08 100644 --- a/package/qpid-proton/Config.in +++ b/package/qpid-proton/Config.in @@ -1,6 +1,8 @@ config BR2_PACKAGE_QPID_PROTON bool "qpid-proton" + depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_STATIC_LIBS # build a shared library + depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBUUID help @@ -13,5 +15,6 @@ config BR2_PACKAGE_QPID_PROTON https://qpid.apache.org/proton/ -comment "qpid-proton needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS +comment "qpid-proton needs a toolchain w/ C++, dynamic library, threads" + depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/qpid-proton/qpid-proton.mk b/package/qpid-proton/qpid-proton.mk index 103cf9fd31e..fae6ecc413b 100644 --- a/package/qpid-proton/qpid-proton.mk +++ b/package/qpid-proton/qpid-proton.mk @@ -23,6 +23,7 @@ QPID_PROTON_DEPENDENCIES = \ # go language binding is enabled when host-go is present # For now, disable all of them. QPID_PROTON_CONF_OPTS = \ + -DBUILD_CPP=ON \ -DBUILD_GO=OFF \ -DBUILD_PYTHON=OFF \ -DBUILD_RUBY=OFF \ @@ -31,20 +32,6 @@ QPID_PROTON_CONF_OPTS = \ -DENABLE_WARNING_ERROR=OFF \ -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 -# epoll proactor unconditionally uses pthread and cpp (C++) bindings -# unconditionally use proactor -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) -ifeq ($(BR2_INSTALL_LIBSTDCPP),y) -QPID_PROTON_CONF_OPTS += -DBUILD_CPP=ON -else -QPID_PROTON_CONF_OPTS += -DBUILD_CPP=OFF -endif -else -QPID_PROTON_CONF_OPTS += \ - -DBUILD_CPP=OFF \ - -DPROACTOR=none -endif - ifeq ($(BR2_PACKAGE_JSONCPP),y) QPID_PROTON_DEPENDENCIES += jsoncpp QPID_PROTON_CONF_OPTS += -DENABLE_JSONCPP=ON diff --git a/package/qt5/Config.in b/package/qt5/Config.in index 5751d6cb70b..f1b16ff39bb 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -7,13 +7,12 @@ config BR2_PACKAGE_QT5_JSCORE_AVAILABLE bool default y # Javascript engine is only available on certain architectures - depends on BR2_arm || BR2_aarch64 || BR2_i386 || BR2_x86_64 || BR2_mipsel + depends on BR2_arm || BR2_aarch64 || BR2_i386 || BR2_x86_64 || BR2_mipsel || BR2_arc # ARM needs BLX, so v5t+ depends on !BR2_ARM_CPU_ARMV4 comment "Qt5 needs host g++ >= 5.0, and a toolchain w/ gcc >= 5.0, wchar, NPTL, C++, dynamic library" depends on !BR2_ARM_CPU_ARMV4 - depends on !BR2_arc depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS || \ !BR2_HOST_GCC_AT_LEAST_5 || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 @@ -26,8 +25,6 @@ menuconfig BR2_PACKAGE_QT5 depends on BR2_HOST_GCC_AT_LEAST_5 # Full C++11 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++11, GCC_BUG_57694 depends on !BR2_ARM_CPU_ARMV4 # needs ARMv5+ - # no built-in double-conversion support - depends on !BR2_arc depends on !BR2_STATIC_LIBS select BR2_PACKAGE_QT5BASE help @@ -43,6 +40,7 @@ source "package/qt5/qt5charts/Config.in" source "package/qt5/qt5coap/Config.in" source "package/qt5/qt5connectivity/Config.in" source "package/qt5/qt5declarative/Config.in" +source "package/qt5/qt5doc/Config.in" source "package/qt5/qt5enginio/Config.in" source "package/qt5/qt5graphicaleffects/Config.in" source "package/qt5/qt5imageformats/Config.in" @@ -61,6 +59,7 @@ source "package/qt5/qt5scxml/Config.in" source "package/qt5/qt5sensors/Config.in" source "package/qt5/qt5serialbus/Config.in" source "package/qt5/qt5serialport/Config.in" +source "package/qt5/qt5speech/Config.in" source "package/qt5/qt5svg/Config.in" source "package/qt5/qt5tools/Config.in" source "package/qt5/qt5virtualkeyboard/Config.in" @@ -68,6 +67,8 @@ source "package/qt5/qt5wayland/Config.in" source "package/qt5/qt5webchannel/Config.in" source "package/qt5/qt5webkit/Config.in" source "package/qt5/qt5webengine/Config.in" +source "package/qt5/qt5webengine-chromium/Config.in" +source "package/qt5/qt5webengine-chromium-catapult/Config.in" source "package/qt5/qt5websockets/Config.in" source "package/qt5/qt5webview/Config.in" source "package/qt5/qt5x11extras/Config.in" diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk index 656e3067dc5..0706c3548dc 100644 --- a/package/qt5/qt5.mk +++ b/package/qt5/qt5.mk @@ -6,7 +6,6 @@ QT5_VERSION_MAJOR = 5.15 QT5_VERSION = $(QT5_VERSION_MAJOR).8 -QT5_SOURCE_TARBALL_PREFIX = everywhere-src QT5_SITE = https://invent.kde.org/qt/qt include $(sort $(wildcard package/qt5/*/*.mk)) diff --git a/package/qt5/qt53d/qt53d.hash b/package/qt5/qt53d/qt53d.hash index 32d36756193..0f63aab72a0 100644 --- a/package/qt5/qt53d/qt53d.hash +++ b/package/qt5/qt53d/qt53d.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 4c40260d4298b3e71a9879b43530b1e0b3f235a680bb0e7be76a375f4ae24696 qt3d-dba14d48611b9e9d59576172658779ab4a39b416.tar.bz2 +sha256 44955f90a9af19d80136cb51a929f330ba9e3319d30d1f5d0c2bb4adc7fd7173 qt3d-5fd3906445ac95bf1cca6e7a7e0aeb6e3bcf5016.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPL diff --git a/package/qt5/qt53d/qt53d.mk b/package/qt5/qt53d/qt53d.mk index 9a07d189bdd..4b748a49727 100644 --- a/package/qt5/qt53d/qt53d.mk +++ b/package/qt5/qt53d/qt53d.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT53D_VERSION = dba14d48611b9e9d59576172658779ab4a39b416 +QT53D_VERSION = 5fd3906445ac95bf1cca6e7a7e0aeb6e3bcf5016 QT53D_SITE = $(QT5_SITE)/qt3d/-/archive/$(QT53D_VERSION) QT53D_SOURCE = qt3d-$(QT53D_VERSION).tar.bz2 QT53D_DEPENDENCIES = qt5declarative diff --git a/package/qt5/qt5base/0007-Fix-build-on-riscv32.patch b/package/qt5/qt5base/0006-Fix-build-on-riscv32.patch similarity index 100% rename from package/qt5/qt5base/0007-Fix-build-on-riscv32.patch rename to package/qt5/qt5base/0006-Fix-build-on-riscv32.patch diff --git a/package/qt5/qt5base/0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch b/package/qt5/qt5base/0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch deleted file mode 100644 index 16e0f20200f..00000000000 --- a/package/qt5/qt5base/0006-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 856d11f695fb6effe26a359f9ad0efdf24067085 Mon Sep 17 00:00:00 2001 -From: Eirik Aavitsland -Date: Fri, 23 Jul 2021 15:53:56 +0200 -Subject: [PATCH] Improve fix for avoiding huge number of tiny dashes -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Some pathological cases were not caught by the previous fix. - -Fixes: QTBUG-95239 -Pick-to: 6.2 6.1 5.15 -Change-Id: I0337ee3923ff93ccb36c4d7b810a9c0667354cc5 -Reviewed-by: Robert Löhning -(cherry picked from commit 6b400e3147dcfd8cc3a393ace1bd118c93762e0c) -[Retrieved from: https://invent.kde.org/qt/qt/qtbase/-/commit/fed5713eeba5bf8e0ee413cb4e77109bfa7c2bce] -Signed-off-by: Quentin Schulz ---- - src/gui/painting/qpaintengineex.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp -index 55fdb0c2a0..19e4b23423 100644 ---- a/src/gui/painting/qpaintengineex.cpp -+++ b/src/gui/painting/qpaintengineex.cpp -@@ -426,7 +426,7 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen) - patternLength *= pen.widthF(); - if (qFuzzyIsNull(patternLength)) { - pen.setStyle(Qt::NoPen); -- } else if (extent / patternLength > 10000) { -+ } else if (qFuzzyIsNull(extent) || extent / patternLength > 10000) { - // approximate stream of tiny dashes with semi-transparent solid line - pen.setStyle(Qt::SolidLine); - QColor color(pen.color()); --- -2.34.1 - diff --git a/package/qt5/qt5base/0007-src-corelib-configure.json-fix-atomicfptr-detection.patch b/package/qt5/qt5base/0007-src-corelib-configure.json-fix-atomicfptr-detection.patch new file mode 100644 index 00000000000..5f0f81a4bd7 --- /dev/null +++ b/package/qt5/qt5base/0007-src-corelib-configure.json-fix-atomicfptr-detection.patch @@ -0,0 +1,48 @@ +From e9d1f80dffb4e29e44fc0b0627704af15cdd281a Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 13 Mar 2022 12:05:04 +0100 +Subject: [PATCH] src/corelib/configure.json: fix atomicfptr detection + +Fix atomicfptr detection on sparc v8 by linking with libatomic if needed +to avoid the following build failure: + +/sysroot -std=gnu++11 -w -fPIC -I. -I/home/peko/autobuild/instance-0/output-1/build/qt5base-d16bf02a11953dcac01dca73e6f3778f293adefe/mkspecs/devices/linux-buildroot-g++ -o main.o main.cpp +> /home/peko/autobuild/instance-0/output-1/host/bin/sparc-linux-g++ --sysroot=/home/peko/autobuild/instance-0/output-1/host/sparc-buildroot-linux-uclibc/sysroot --sysroot=/home/peko/autobuild/instance-0/output-1/host/sparc-buildroot-linux-uclibc/sysroot -Wl,-O1 -o atomicfptr main.o -lexecinfo -lrt -lpthread -ldl +> /home/peko/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/10.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: main.o: in function `test(std::atomic volatile&)': +> main.cpp:(.text+0x40): undefined reference to `__atomic_compare_exchange_4' +> collect2: error: ld returned 1 exit status +> make[1]: *** [Makefile:69: atomicfptr] Error 1 + +[...] + +ERROR: detected a std::atomic implementation that fails for function pointers. +Please apply the patch corresponding to your Standard Library vendor, found in + qtbase/config.tests/atomicfptr + +Fixes: + - http://autobuild.buildroot.org/results/5a20e984a5536165056b3fbd93b8712e8ddbeed4 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://invent.kde.org/qt/qt/qtbase/-/merge_requests/138] +--- + src/corelib/configure.json | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/corelib/configure.json b/src/corelib/configure.json +index 9b5d19d41b..ac88f5856c 100644 +--- a/src/corelib/configure.json ++++ b/src/corelib/configure.json +@@ -309,7 +309,8 @@ + "test(fptr);" + ], + "qmake": "CONFIG += c++11" +- } ++ }, ++ "use": "libatomic" + }, + "clock-monotonic": { + "label": "POSIX monotonic clock", +-- +2.34.1 + diff --git a/package/qt5/qt5base/0008-eglconvenience-add-missing-QList-include.patch b/package/qt5/qt5base/0008-eglconvenience-add-missing-QList-include.patch new file mode 100644 index 00000000000..c7127291e4b --- /dev/null +++ b/package/qt5/qt5base/0008-eglconvenience-add-missing-QList-include.patch @@ -0,0 +1,37 @@ +From f681f428477812e54484f631b0da332cc2e00eaa Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Wed, 16 Mar 2022 19:08:55 +0100 +Subject: [PATCH] eglconvenience: add missing QList include +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes: + + qeglconvenience.cpp:418:23: error: variable ‘QList extensions’ has initializer but incomplete type + 418 | QList extensions = + | ^~~~~~~~~~ + qeglconvenience.cpp:420:65: error: invalid use of incomplete type ‘class QList’ + 420 | (eglQueryString(display, EGL_EXTENSIONS))).split(' '); + | ^ + +Signed-off-by: Peter Seiderer +--- + src/platformsupport/eglconvenience/qeglconvenience.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/platformsupport/eglconvenience/qeglconvenience.cpp b/src/platformsupport/eglconvenience/qeglconvenience.cpp +index 5303d37c..daceeb8b 100644 +--- a/src/platformsupport/eglconvenience/qeglconvenience.cpp ++++ b/src/platformsupport/eglconvenience/qeglconvenience.cpp +@@ -38,6 +38,7 @@ + ****************************************************************************/ + + #include ++#include + #include + + #ifdef Q_OS_LINUX +-- +2.35.1 + diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in index 601438d2fe0..b876f1948ed 100644 --- a/package/qt5/qt5base/Config.in +++ b/package/qt5/qt5base/Config.in @@ -74,6 +74,7 @@ config BR2_PACKAGE_QT5BASE_PSQL depends on BR2_USE_MMU # postgresql depends on !BR2_STATIC_LIBS depends on BR2_USE_WCHAR # postgresql + depends on !BR2_OPTIMIZE_FAST # postgresql select BR2_PACKAGE_POSTGRESQL help Build PostgreSQL plugin @@ -83,6 +84,9 @@ comment "PostgreSQL plugin needs a toolchain w/ wchar, dynamic library" depends on BR2_USE_MMU depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR +comment "PostgreSQL plugin can't be built with Optimize for fast" + depends on BR2_OPTIMIZE_FAST + choice prompt "SQLite 3 support" default BR2_PACKAGE_QT5BASE_SQLITE_NONE diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash index 396f5044ff1..27d2b99c34c 100644 --- a/package/qt5/qt5base/qt5base.hash +++ b/package/qt5/qt5base/qt5base.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 269ae20ed74cb949420ac3abac0bdef3b65501ea47c9312c01e8f9073baf24fe qtbase-53a047c212af7fbded6505651f648172f9d7a34d.tar.bz2 +sha256 ecff8cf42af98c2294f7c99eb8c41564892f470382adaf8f4048c85252849808 qtbase-2ffb7ad8a1079a0444b9c72affe3d19b089b60de.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index ef38d032538..efa0e16e9a2 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5BASE_VERSION = 53a047c212af7fbded6505651f648172f9d7a34d +QT5BASE_VERSION = 2ffb7ad8a1079a0444b9c72affe3d19b089b60de QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION) QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2 @@ -12,9 +12,14 @@ QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib QT5BASE_INSTALL_STAGING = YES QT5BASE_SYNC_QT_HEADERS = YES -# 0010-Avoid-processing-intensive-painting-of-high-number-o.patch -# 0011-Improve-fix-for-avoiding-huge-number-of-tiny-dashes.patch +# 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 @@ -169,9 +174,13 @@ QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_LINUXFB),--enable-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 +QT5BASE_DEPENDENCIES += libxkbcommon +endif + ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) QT5BASE_CONFIGURE_OPTS += -xcb -QT5BASE_CONFIGURE_OPTS += -xkbcommon QT5BASE_DEPENDENCIES += \ libxcb \ @@ -179,8 +188,7 @@ QT5BASE_DEPENDENCIES += \ xcb-util-image \ xcb-util-keysyms \ xcb-util-renderutil \ - xlib_libX11 \ - libxkbcommon + xlib_libX11 ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS),y) QT5BASE_DEPENDENCIES += xlib_libXext endif @@ -201,6 +209,19 @@ endif QT5BASE_DEFAULT_QPA = $(call qstrip,$(BR2_PACKAGE_QT5BASE_DEFAULT_QPA)) QT5BASE_CONFIGURE_OPTS += $(if $(QT5BASE_DEFAULT_QPA),-qpa $(QT5BASE_DEFAULT_QPA)) +ifeq ($(BR2_arc),y) +# In case of -Os (which is default in BR) gcc will use millicode implementation +# from libgcc. That along with performance degradation may lead to issues during +# linkage stage. In case of QtWebkit exactly that happens - millicode functions +# get put way too far from caller functions and so linker fails. +# To solve that problem we explicitly disable millicode call generation for Qt. +# Also due to some Qt5 libs being really huge (the best example is QtWebKit) +# it's good to firce compiler to not assume short or even medium-length calls +# could be used. I.e. always use long jump instaructions. +# Otherwise there's a high risk of hitting link-time failures. +QT5BASE_CFLAGS += -mno-millicode -mlong-calls +endif + ifeq ($(BR2_PACKAGE_QT5BASE_EGLFS),y) QT5BASE_CONFIGURE_OPTS += -eglfs QT5BASE_DEPENDENCIES += libegl @@ -208,8 +229,8 @@ else QT5BASE_CONFIGURE_OPTS += -no-eglfs endif -QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_OPENSSL),-openssl,-no-openssl) -QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_OPENSSL),openssl) +QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_LIBOPENSSL),-openssl,-no-openssl) +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBOPENSSL),openssl) QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_FONTCONFIG),-fontconfig,-no-fontconfig) QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_FONTCONFIG),fontconfig) @@ -297,9 +318,14 @@ endef endif # This allows to use ccache when available +ifeq ($(BR2_CCACHE),y) +QT5BASE_CONFIGURE_OPTS += -ccache +endif + +# Ensure HOSTCC/CXX is used define QT5BASE_CONFIGURE_HOSTCC - $(SED) 's,^QMAKE_CC\s*=.*,QMAKE_CC = $(HOSTCC),' $(@D)/mkspecs/common/g++-base.conf - $(SED) 's,^QMAKE_CXX\s*=.*,QMAKE_CXX = $(HOSTCXX),' $(@D)/mkspecs/common/g++-base.conf + $(SED) 's,^QMAKE_CC\s*=.*,QMAKE_CC = $(HOSTCC_NOCCACHE),' $(@D)/mkspecs/common/g++-base.conf + $(SED) 's,^QMAKE_CXX\s*=.*,QMAKE_CXX = $(HOSTCXX_NOCCACHE),' $(@D)/mkspecs/common/g++-base.conf endef # Must be last so can override all options set by Buildroot diff --git a/package/qt5/qt5charts/qt5charts.hash b/package/qt5/qt5charts/qt5charts.hash index 021d4ea19f2..ba22e29996c 100644 --- a/package/qt5/qt5charts/qt5charts.hash +++ b/package/qt5/qt5charts/qt5charts.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 60f973c79aa059981347864ca26ef361ac38bc835286ac5875f6c7c1248a9b21 qtcharts-130463160b4923069eb98da49edaf7d93180f4f8.tar.bz2 +sha256 32119f7ac88c250b24835b91a71510bf673f1cede6e572fd1059debf8325d7ff qtcharts-16c2a8821135bf89369c4e3c5a1bdff8b05ffdb5.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5charts/qt5charts.mk b/package/qt5/qt5charts/qt5charts.mk index 24e635b93bc..0028c9f8cb6 100644 --- a/package/qt5/qt5charts/qt5charts.mk +++ b/package/qt5/qt5charts/qt5charts.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5CHARTS_VERSION = 130463160b4923069eb98da49edaf7d93180f4f8 +QT5CHARTS_VERSION = 16c2a8821135bf89369c4e3c5a1bdff8b05ffdb5 QT5CHARTS_SITE = $(QT5_SITE)/qtcharts/-/archive/$(QT5CHARTS_VERSION) QT5CHARTS_SOURCE = qtcharts-$(QT5CHARTS_VERSION).tar.bz2 QT5CHARTS_INSTALL_STAGING = YES diff --git a/package/qt5/qt5coap/qt5coap.mk b/package/qt5/qt5coap/qt5coap.mk index a50f19d7f22..5feb1e5bc26 100644 --- a/package/qt5/qt5coap/qt5coap.mk +++ b/package/qt5/qt5coap/qt5coap.mk @@ -5,7 +5,7 @@ ################################################################################ QT5COAP_VERSION = 5.15.2 -QT5COAP_SITE = https://code.qt.io/cgit/qt/qtcoap.git +QT5COAP_SITE = https://code.qt.io/qt/qtcoap.git QT5COAP_SITE_METHOD = git QT5COAP_INSTALL_STAGING = YES QT5COAP_LICENSE = GPL-3.0, GFDL-1.3 diff --git a/package/qt5/qt5connectivity/qt5connectivity.hash b/package/qt5/qt5connectivity/qt5connectivity.hash index 12e9d637b25..1252a73247a 100644 --- a/package/qt5/qt5connectivity/qt5connectivity.hash +++ b/package/qt5/qt5connectivity/qt5connectivity.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 216e9f6b1be00897ac1ce12f0ea4d1733eb70acd49ec3a83d01cd472b2fb5450 qtconnectivity-5e9ca5d36d65dadb98ef90013a1dcf15fbd7ae26.tar.bz2 +sha256 ec1d91fc35d8b4a333209fb5fd85e00ab77345bff48b60b4e43b804a59f60979 qtconnectivity-c5f35f89e975c2ad58c83c6b606d40ba41057f15.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5connectivity/qt5connectivity.mk b/package/qt5/qt5connectivity/qt5connectivity.mk index a4c79be10b7..72797de1a03 100644 --- a/package/qt5/qt5connectivity/qt5connectivity.mk +++ b/package/qt5/qt5connectivity/qt5connectivity.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5CONNECTIVITY_VERSION = 5e9ca5d36d65dadb98ef90013a1dcf15fbd7ae26 +QT5CONNECTIVITY_VERSION = c5f35f89e975c2ad58c83c6b606d40ba41057f15 QT5CONNECTIVITY_SITE = $(QT5_SITE)/qtconnectivity/-/archive/$(QT5CONNECTIVITY_VERSION) QT5CONNECTIVITY_SOURCE = qtconnectivity-$(QT5CONNECTIVITY_VERSION).tar.bz2 QT5CONNECTIVITY_INSTALL_STAGING = YES diff --git a/package/qt5/qt5declarative/qt5declarative.hash b/package/qt5/qt5declarative/qt5declarative.hash index adda7e03baa..00c9a044324 100644 --- a/package/qt5/qt5declarative/qt5declarative.hash +++ b/package/qt5/qt5declarative/qt5declarative.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 14a4b9640a2cd94771108dc3658a77c04c680f3d6444750d55e313b20774ce00 qtdeclarative-9349f3975d26632befc036fc9f2ea6e03aee2182.tar.bz2 +sha256 0dd6b29bb19ad419d47d1fb612b39b1834d675fd1c58b80cd85c7d3da98b40bf qtdeclarative-51efb2ed2f071beda188270a23ac450fe4b318f7.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk index e63a78021a2..cece8e476bb 100644 --- a/package/qt5/qt5declarative/qt5declarative.mk +++ b/package/qt5/qt5declarative/qt5declarative.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5DECLARATIVE_VERSION = 9349f3975d26632befc036fc9f2ea6e03aee2182 +QT5DECLARATIVE_VERSION = 51efb2ed2f071beda188270a23ac450fe4b318f7 QT5DECLARATIVE_SITE = $(QT5_SITE)/qtdeclarative/-/archive/$(QT5DECLARATIVE_VERSION) QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5DECLARATIVE_VERSION).tar.bz2 QT5DECLARATIVE_INSTALL_STAGING = YES diff --git a/package/qt5/qt5doc/Config.in b/package/qt5/qt5doc/Config.in new file mode 100644 index 00000000000..e9685a4d504 --- /dev/null +++ b/package/qt5/qt5doc/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_QT5DOC + bool "qt5doc (includes quick demos)" + depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative + select BR2_PACKAGE_QT5BASE_EXAMPLES + select BR2_PACKAGE_QT5DECLARATIVE + select BR2_PACKAGE_QT5DECLARATIVE_QUICK + help + Qt is a cross-platform application and UI framework for + developers using C++. + + Qtdoc contains the main Qt Reference Documentation, which + includes overviews, Qt topics, and examples not specific to + any Qt module. The configuration files are located in + qtdoc/doc/config and the articles in qtdoc/doc/src. Note that + QDoc itself is located in qtbase. + + https://doc.qt.io/qt-5/overviews.html diff --git a/package/qt5/qt5doc/qt5doc.hash b/package/qt5/qt5doc/qt5doc.hash new file mode 100644 index 00000000000..ec84ecdcb5b --- /dev/null +++ b/package/qt5/qt5doc/qt5doc.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 87ef0ba72ede78148dfae8fbe78c839f0e9966e1ab4a58d7725041144c0de70f qtdoc-897e90fe304d844beaf694b82a93a50237fa8b9e.tar.bz2 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/package/qt5/qt5doc/qt5doc.mk b/package/qt5/qt5doc/qt5doc.mk new file mode 100644 index 00000000000..77845a347f7 --- /dev/null +++ b/package/qt5/qt5doc/qt5doc.mk @@ -0,0 +1,28 @@ +################################################################################ +# +# qt5doc +# +################################################################################ + +QT5DOC_VERSION = 897e90fe304d844beaf694b82a93a50237fa8b9e +QT5DOC_SITE = $(QT5_SITE)/qtdoc/-/archive/$(QT5DOC_VERSION) +QT5DOC_SOURCE = qtdoc-$(QT5DOC_VERSION).tar.bz2 +QT5DOC_DEPENDENCIES = qt5declarative +QT5DOC_INSTALL_STAGING = YES + +ifeq ($(BR2_PACKAGE_QT5QUICKCONTROLS),y) +QT5DOC_DEPENDENCIES += qt5quickcontrols +endif + +ifeq ($(BR2_PACKAGE_QT5QUICKCONTROLS2),y) +QT5DOC_DEPENDENCIES += qt5quickcontrols2 +endif + +ifeq ($(BR2_PACKAGE_QT5XMLPATTERNS),y) +QT5DOC_DEPENDENCIES += qt5xmlpatterns +endif + +QT5DOC_LICENSE = GFDL-1.3 +QT5DOC_LICENSE_FILES = LICENSE.FDL + +$(eval $(qmake-package)) diff --git a/package/qt5/qt5enginio/Config.in b/package/qt5/qt5enginio/Config.in index b738f0db7cd..a1ac6f8ca03 100644 --- a/package/qt5/qt5enginio/Config.in +++ b/package/qt5/qt5enginio/Config.in @@ -1,6 +1,8 @@ config BR2_PACKAGE_QT5ENGINIO bool "qt5enginio" select BR2_PACKAGE_OPENSSL + # Only openssl is supported by qt5 + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL select BR2_PACKAGE_QT5BASE_GUI select BR2_PACKAGE_QT5BASE_NETWORK help diff --git a/package/qt5/qt5enginio/qt5enginio.hash b/package/qt5/qt5enginio/qt5enginio.hash index 8849620905b..f1ad364ca3f 100644 --- a/package/qt5/qt5enginio/qt5enginio.hash +++ b/package/qt5/qt5enginio/qt5enginio.hash @@ -1,5 +1,5 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtenginio-opensource-src-1.6.3.tar.xz.mirrorlist -sha256 d907060b355512ceb7a8c3f6980e3979c20d54320b6804303b6c5e8ed42d3912 qtenginio-opensource-src-1.6.3.tar.xz +sha256 d907060b355512ceb7a8c3f6980e3979c20d54320b6804303b6c5e8ed42d3912 qtenginio-opensource-src-1.6.3.tar.xz # Hashes for license files: sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash index e755f0848b4..5de13a176db 100644 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 3035f0a07a0c0a0627ecd082de4b39bbe91521314f11bb63bf4ce81347b855f9 qtgraphicaleffects-c36998dc1581167b12cc3de8e4ac68c2a5d9f76e.tar.bz2 +sha256 83ee3888473fb786c1615c4b98320a9b1eeeb66dbc1ef9743b8339718594e48e qtgraphicaleffects-4c6ec38635aa22cf0854df8e710733c529f4ec02.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk index 542eb4de902..e4c464b8c7a 100644 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5GRAPHICALEFFECTS_VERSION = c36998dc1581167b12cc3de8e4ac68c2a5d9f76e +QT5GRAPHICALEFFECTS_VERSION = 4c6ec38635aa22cf0854df8e710733c529f4ec02 QT5GRAPHICALEFFECTS_SITE = $(QT5_SITE)/qtgraphicaleffects/-/archive/$(QT5GRAPHICALEFFECTS_VERSION) QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-$(QT5GRAPHICALEFFECTS_VERSION).tar.bz2 QT5GRAPHICALEFFECTS_DEPENDENCIES = qt5declarative diff --git a/package/qt5/qt5imageformats/qt5imageformats.hash b/package/qt5/qt5imageformats/qt5imageformats.hash index 49690de3bb3..9b8a788cae0 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.hash +++ b/package/qt5/qt5imageformats/qt5imageformats.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 f2ff68c0d7192443e2fbcfdec73ee6a6bb160461b7757539906d9ad0c7f600d9 qtimageformats-cb82c74310837fe4e832c8ab72176a5d63e4355f.tar.bz2 +sha256 4ce1982ccf3232d25187286ca4893bcf00b149cf9f6706f06f60d908fab480a0 qtimageformats-b43e31b9f31ec482ddea2066fda7ca9315512815.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk index 506cd123a83..2cc8e0f17b1 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.mk +++ b/package/qt5/qt5imageformats/qt5imageformats.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5IMAGEFORMATS_VERSION = cb82c74310837fe4e832c8ab72176a5d63e4355f +QT5IMAGEFORMATS_VERSION = b43e31b9f31ec482ddea2066fda7ca9315512815 QT5IMAGEFORMATS_SITE = $(QT5_SITE)/qtimageformats/-/archive/$(QT5IMAGEFORMATS_VERSION) QT5IMAGEFORMATS_SOURCE = qtimageformats-$(QT5IMAGEFORMATS_VERSION).tar.bz2 QT5IMAGEFORMATS_INSTALL_STAGING = YES diff --git a/package/qt5/qt5knx/qt5knx.mk b/package/qt5/qt5knx/qt5knx.mk index 412e31c6529..91b99aaa87b 100644 --- a/package/qt5/qt5knx/qt5knx.mk +++ b/package/qt5/qt5knx/qt5knx.mk @@ -5,7 +5,7 @@ ################################################################################ QT5KNX_VERSION = 5.15.2 -QT5KNX_SITE = https://code.qt.io/cgit/qt/qtknx.git +QT5KNX_SITE = https://code.qt.io/qt/qtknx.git QT5KNX_SITE_METHOD = git QT5KNX_INSTALL_STAGING = YES QT5KNX_LICENSE = GPL-3.0 with exception diff --git a/package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch b/package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch deleted file mode 100644 index 98e65df202c..00000000000 --- a/package/qt5/qt5location/0002-fix-compilation-for-no-opengl-builds.patch +++ /dev/null @@ -1,528 +0,0 @@ -From 4bcacd0dc8f73de7b9e5e5f5fa2129fd88bdff3b Mon Sep 17 00:00:00 2001 -From: Michal Klocek -Date: Mon, 11 Jan 2021 16:02:14 +0100 -Subject: [PATCH] Fix compilation for no opengl builds - -Disables experimental labs qml plugin, which -since a4469cad40 depends heavily on opengl backend. - -Fix warnings with msvc when compiling without experimental -plugin. - -Task-number: QTBUG-91623 -Fixes: QTBUG-88017 -Change-Id: I53c5da915981bd05f39134ba57f585d0a0786aa8 - -Signed-off-by: Michal Klocek -Signed-off-by: Alex Blasche - -[Retrieved from: https://codereview.qt-project.org/c/qt/qtlocation/+/340353] -Signed-off-by: Adam Duskett ---- - src/location/configure.json | 1 + - .../qdeclarativecirclemapitem.cpp | 20 +++++++++++-- - .../qdeclarativecirclemapitem_p_p.h | 2 ++ - .../qdeclarativepolygonmapitem.cpp | 27 +++++++++++++---- - .../qdeclarativepolygonmapitem_p_p.h | 6 ++++ - .../qdeclarativepolylinemapitem.cpp | 30 +++++++++++++++---- - .../qdeclarativepolylinemapitem_p.h | 2 ++ - .../qdeclarativepolylinemapitem_p_p.h | 5 +++- - .../qdeclarativerectanglemapitem.cpp | 17 +++++++++-- - .../qdeclarativerectanglemapitem_p_p.h | 2 ++ - src/location/location.pro | 9 +++++- - .../itemsoverlay/qgeomapitemsoverlay.cpp | 9 +++++- - 12 files changed, 109 insertions(+), 21 deletions(-) - -diff --git a/src/location/configure.json b/src/location/configure.json -index 62ab029..6d01a9a 100644 ---- a/src/location/configure.json -+++ b/src/location/configure.json -@@ -9,6 +9,7 @@ - "label": "Qt.labs.location experimental QML plugin", - "purpose": "Provides experimental QtLocation QML types", - "section": "Location", -+ "condition": "config.opengl", - "output": [ "privateFeature" ] - }, - "geoservices_osm": { -diff --git a/src/location/declarativemaps/qdeclarativecirclemapitem.cpp b/src/location/declarativemaps/qdeclarativecirclemapitem.cpp -index 841c29a..955de2c 100644 ---- a/src/location/declarativemaps/qdeclarativecirclemapitem.cpp -+++ b/src/location/declarativemaps/qdeclarativecirclemapitem.cpp -@@ -446,6 +446,7 @@ void QDeclarativeCircleMapItem::updatePolish() - */ - void QDeclarativeCircleMapItem::possiblySwitchBackend(const QGeoCoordinate &oldCenter, qreal oldRadius, const QGeoCoordinate &newCenter, qreal newRadius) - { -+#if QT_CONFIG(opengl) - if (m_backend != QDeclarativeCircleMapItem::OpenGL) - return; - -@@ -459,6 +460,9 @@ void QDeclarativeCircleMapItem::possiblySwitchBackend(const QGeoCoordinate &oldC - QScopedPointer d(static_cast(new QDeclarativeCircleMapItemPrivateOpenGL(*this))); - m_d.swap(d); - } -+#else -+ return; -+#endif - } - - /*! -@@ -534,9 +538,17 @@ void QDeclarativeCircleMapItem::setBackend(QDeclarativeCircleMapItem::Backend b) - if (b == m_backend) - return; - m_backend = b; -- QScopedPointer d((m_backend == Software) -- ? static_cast(new QDeclarativeCircleMapItemPrivateCPU(*this)) -- : static_cast(new QDeclarativeCircleMapItemPrivateOpenGL(*this))); -+ QScopedPointer d( -+ (m_backend == Software) ? static_cast( -+ new QDeclarativeCircleMapItemPrivateCPU(*this)) -+#if QT_CONFIG(opengl) -+ : static_cast( -+ new QDeclarativeCircleMapItemPrivateOpenGL(*this))); -+#else -+ : nullptr); -+ qFatal("Requested non software rendering backend, but source code is compiled wihtout opengl " -+ "support"); -+#endif - m_d.swap(d); - m_d->onGeoGeometryChanged(); - emit backendChanged(); -@@ -565,7 +577,9 @@ QDeclarativeCircleMapItemPrivate::~QDeclarativeCircleMapItemPrivate() {} - - QDeclarativeCircleMapItemPrivateCPU::~QDeclarativeCircleMapItemPrivateCPU() {} - -+#if QT_CONFIG(opengl) - QDeclarativeCircleMapItemPrivateOpenGL::~QDeclarativeCircleMapItemPrivateOpenGL() {} -+#endif - - bool QDeclarativeCircleMapItemPrivate::preserveCircleGeometry (QList &path, - const QGeoCoordinate ¢er, qreal distance, const QGeoProjectionWebMercator &p) -diff --git a/src/location/declarativemaps/qdeclarativecirclemapitem_p_p.h b/src/location/declarativemaps/qdeclarativecirclemapitem_p_p.h -index 4cf4217..dbe6c8b 100644 ---- a/src/location/declarativemaps/qdeclarativecirclemapitem_p_p.h -+++ b/src/location/declarativemaps/qdeclarativecirclemapitem_p_p.h -@@ -275,6 +275,7 @@ public: - MapPolygonNode *m_node = nullptr; - }; - -+#if QT_CONFIG(opengl) - class Q_LOCATION_PRIVATE_EXPORT QDeclarativeCircleMapItemPrivateOpenGL: public QDeclarativeCircleMapItemPrivate - { - public: -@@ -443,6 +444,7 @@ public: - MapPolygonNodeGL *m_node = nullptr; - MapPolylineNodeOpenGLExtruded *m_polylinenode = nullptr; - }; -+#endif // QT_CONFIG(opengl) - - QT_END_NAMESPACE - -diff --git a/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp b/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp -index fa6ee17..af4f55e 100644 ---- a/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp -+++ b/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp -@@ -334,6 +334,7 @@ void QGeoMapPolygonGeometry::updateScreenPoints(const QGeoMap &map, qreal stroke - this->translate(QPointF(strokeWidth, strokeWidth)); - } - -+#if QT_CONFIG(opengl) - QGeoMapPolygonGeometryOpenGL::QGeoMapPolygonGeometryOpenGL(){ - } - -@@ -344,6 +345,7 @@ void QGeoMapPolygonGeometryOpenGL::updateSourcePoints(const QGeoMap &map, const - geopath.append(QWebMercator::mercatorToCoord(c)); - updateSourcePoints(map, geopath); - } -+#endif - - // wrapPath always preserves the geometry - // This one handles holes -@@ -452,6 +454,7 @@ static void cutPathEars(const QList &wrappedPath, - screenIndices << quint32(i); - } - -+#if QT_CONFIG(opengl) - /*! - \internal - */ -@@ -594,7 +597,7 @@ void QGeoMapPolygonGeometryOpenGL::updateQuickGeometry(const QGeoProjectionWebMe - sourceBounds_.setWidth(brect.width()); - sourceBounds_.setHeight(brect.height()); - } -- -+#endif // QT_CONFIG(opengl) - /* - * QDeclarativePolygonMapItem Private Implementations - */ -@@ -603,8 +606,9 @@ QDeclarativePolygonMapItemPrivate::~QDeclarativePolygonMapItemPrivate() {} - - QDeclarativePolygonMapItemPrivateCPU::~QDeclarativePolygonMapItemPrivateCPU() {} - -+#if QT_CONFIG(opengl) - QDeclarativePolygonMapItemPrivateOpenGL::~QDeclarativePolygonMapItemPrivateOpenGL() {} -- -+#endif - /* - * QDeclarativePolygonMapItem Implementation - */ -@@ -689,9 +693,17 @@ void QDeclarativePolygonMapItem::setBackend(QDeclarativePolygonMapItem::Backend - if (b == m_backend) - return; - m_backend = b; -- QScopedPointer d((m_backend == Software) -- ? static_cast(new QDeclarativePolygonMapItemPrivateCPU(*this)) -- : static_cast(new QDeclarativePolygonMapItemPrivateOpenGL(*this))); -+ QScopedPointer d( -+ (m_backend == Software) ? static_cast( -+ new QDeclarativePolygonMapItemPrivateCPU(*this)) -+#if QT_CONFIG(opengl) -+ : static_cast( -+ new QDeclarativePolygonMapItemPrivateOpenGL(*this))); -+#else -+ : nullptr); -+ qFatal("Requested non software rendering backend, but source code is compiled wihtout opengl " -+ "support"); -+#endif - m_d.swap(d); - m_d->onGeoGeometryChanged(); - emit backendChanged(); -@@ -898,6 +910,7 @@ void QDeclarativePolygonMapItem::geometryChanged(const QRectF &newGeometry, cons - - ////////////////////////////////////////////////////////////////////// - -+#if QT_CONFIG(opengl) - QSGMaterialShader *MapPolygonMaterial::createShader() const - { - return new MapPolygonShader(); -@@ -916,6 +929,7 @@ QSGMaterialType *MapPolygonMaterial::type() const - static QSGMaterialType type; - return &type; - } -+#endif - - MapPolygonNode::MapPolygonNode() : - border_(new MapPolylineNode()), -@@ -967,6 +981,7 @@ void MapPolygonNode::update(const QColor &fillColor, const QColor &borderColor, - } - } - -+#if QT_CONFIG(opengl) - MapPolygonNodeGL::MapPolygonNodeGL() : - //fill_material_(this), - fill_material_(), -@@ -1052,5 +1067,5 @@ void MapPolygonShader::updateState(const QSGMaterialShader::RenderState &state, - program()->setUniformValue(m_center_lowpart_id, vecCenter_lowpart); - program()->setUniformValue(m_wrapOffset_id, float(newMaterial->wrapOffset())); - } -- -+#endif // QT_CONFIG(opengl) - QT_END_NAMESPACE -diff --git a/src/location/declarativemaps/qdeclarativepolygonmapitem_p_p.h b/src/location/declarativemaps/qdeclarativepolygonmapitem_p_p.h -index 8d566e6..5e75deb 100644 ---- a/src/location/declarativemaps/qdeclarativepolygonmapitem_p_p.h -+++ b/src/location/declarativemaps/qdeclarativepolygonmapitem_p_p.h -@@ -89,6 +89,7 @@ protected: - bool assumeSimple_; - }; - -+#if QT_CONFIG(opengl) - class Q_LOCATION_PRIVATE_EXPORT QGeoMapPolygonGeometryOpenGL : public QGeoMapItemGeometry - { - public: -@@ -197,6 +198,7 @@ private: - int m_color_id; - int m_wrapOffset_id; - }; -+#endif // QT_CONFIG(opengl) - - class Q_LOCATION_PRIVATE_EXPORT MapPolygonMaterial : public QSGFlatColorMaterial - { -@@ -269,6 +271,7 @@ private: - QSGGeometry geometry_; - }; - -+#if QT_CONFIG(opengl) - class Q_LOCATION_PRIVATE_EXPORT MapPolygonNodeGL : public MapItemGeometryNode - { - -@@ -284,6 +287,7 @@ public: - MapPolygonMaterial fill_material_; - QSGGeometry geometry_; - }; -+#endif // QT_CONFIG(opengl) - - class Q_LOCATION_PRIVATE_EXPORT QDeclarativePolygonMapItemPrivate - { -@@ -479,6 +483,7 @@ public: - MapPolygonNode *m_node = nullptr; - }; - -+#if QT_CONFIG(opengl) - class Q_LOCATION_PRIVATE_EXPORT QDeclarativePolygonMapItemPrivateOpenGL: public QDeclarativePolygonMapItemPrivate - { - public: -@@ -662,6 +667,7 @@ public: - MapPolygonNodeGL *m_node = nullptr; - MapPolylineNodeOpenGLExtruded *m_polylinenode = nullptr; - }; -+#endif // QT_CONFIG(opengl) - - QT_END_NAMESPACE - -diff --git a/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp b/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp -index d59704d..83d253f 100644 ---- a/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp -+++ b/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp -@@ -769,6 +769,7 @@ bool QGeoMapPolylineGeometry::contains(const QPointF &point) const - return false; - } - -+#if QT_CONFIG(opengl) - void QGeoMapPolylineGeometryOpenGL::updateSourcePoints(const QGeoMap &map, const QGeoPolygon &poly) - { - if (!sourceDirty_) -@@ -921,6 +922,7 @@ void QGeoMapPolylineGeometryOpenGL::updateQuickGeometry(const QGeoProjectionWebM - sourceBounds_.setWidth(brect.width() + strokeWidth); - sourceBounds_.setHeight(brect.height() + strokeWidth); - } -+#endif // QT_CONFIG(opengl) - - /* - * QDeclarativePolygonMapItem Private Implementations -@@ -928,12 +930,13 @@ void QGeoMapPolylineGeometryOpenGL::updateQuickGeometry(const QGeoProjectionWebM - - QDeclarativePolylineMapItemPrivate::~QDeclarativePolylineMapItemPrivate() {} - -- - QDeclarativePolylineMapItemPrivateCPU::~QDeclarativePolylineMapItemPrivateCPU() {} - -+#if QT_CONFIG(opengl) - QDeclarativePolylineMapItemPrivateOpenGLLineStrip::~QDeclarativePolylineMapItemPrivateOpenGLLineStrip() {} - - QDeclarativePolylineMapItemPrivateOpenGLExtruded::~QDeclarativePolylineMapItemPrivateOpenGLExtruded() {} -+#endif - - /* - * QDeclarativePolygonMapItem Implementation -@@ -941,10 +944,12 @@ QDeclarativePolylineMapItemPrivateOpenGLExtruded::~QDeclarativePolylineMapItemPr - - struct PolylineBackendSelector - { -+#if QT_CONFIG(opengl) - PolylineBackendSelector() - { - backend = (qgetenv("QTLOCATION_OPENGL_ITEMS").toInt()) ? QDeclarativePolylineMapItem::OpenGLExtruded : QDeclarativePolylineMapItem::Software; - } -+#endif - QDeclarativePolylineMapItem::Backend backend = QDeclarativePolylineMapItem::Software; - }; - -@@ -1236,11 +1241,22 @@ void QDeclarativePolylineMapItem::setBackend(QDeclarativePolylineMapItem::Backen - if (b == m_backend) - return; - m_backend = b; -- QScopedPointer d((m_backend == Software) -- ? static_cast(new QDeclarativePolylineMapItemPrivateCPU(*this)) -- : ((m_backend == OpenGLExtruded) -- ? static_cast(new QDeclarativePolylineMapItemPrivateOpenGLExtruded(*this)) -- : static_cast(new QDeclarativePolylineMapItemPrivateOpenGLLineStrip(*this)))); -+ QScopedPointer d( -+ (m_backend == Software) -+ ? static_cast( -+ new QDeclarativePolylineMapItemPrivateCPU(*this)) -+#if QT_CONFIG(opengl) -+ : ((m_backend == OpenGLExtruded) -+ ? static_cast( -+ new QDeclarativePolylineMapItemPrivateOpenGLExtruded(*this)) -+ : static_cast( -+ new QDeclarativePolylineMapItemPrivateOpenGLLineStrip( -+ *this)))); -+#else -+ : nullptr); -+ qFatal("Requested non software rendering backend, but source code is compiled wihtout opengl " -+ "support"); -+#endif - m_d.swap(d); - m_d->onGeoGeometryChanged(); - emit backendChanged(); -@@ -1477,6 +1493,7 @@ void MapPolylineNode::update(const QColor &fillColor, - } - } - -+#if QT_CONFIG(opengl) - MapPolylineNodeOpenGLLineStrip::MapPolylineNodeOpenGLLineStrip() - : geometry_(QSGGeometry::defaultAttributes_Point2D(), 0) - { -@@ -2080,5 +2097,6 @@ unsigned int QGeoMapItemLODGeometry::zoomForLOD(unsigned int zoom) - return res; - return res + 1; // give more resolution when closing in - } -+#endif // QT_CONFIG(opengl) - - QT_END_NAMESPACE -diff --git a/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h b/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h -index 9cd20ea..d3d0ebd 100644 ---- a/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h -+++ b/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h -@@ -97,8 +97,10 @@ class Q_LOCATION_PRIVATE_EXPORT QDeclarativePolylineMapItem : public QDeclarativ - public: - enum Backend { - Software = 0, -+#if QT_CONFIG(opengl) - OpenGLLineStrip = 1, - OpenGLExtruded = 2, -+#endif - }; - - explicit QDeclarativePolylineMapItem(QQuickItem *parent = 0); -diff --git a/src/location/declarativemaps/qdeclarativepolylinemapitem_p_p.h b/src/location/declarativemaps/qdeclarativepolylinemapitem_p_p.h -index 2a921e2..e184391 100644 ---- a/src/location/declarativemaps/qdeclarativepolylinemapitem_p_p.h -+++ b/src/location/declarativemaps/qdeclarativepolylinemapitem_p_p.h -@@ -213,6 +213,7 @@ protected: - QSGGeometry geometry_; - }; - -+#if QT_CONFIG(opengl) - class Q_LOCATION_PRIVATE_EXPORT QGeoMapItemLODGeometry - { - public: -@@ -566,6 +567,7 @@ protected: - MapPolylineMaterialExtruded fill_material_; - QSGGeometry m_geometryTriangulating; - }; -+#endif // QT_CONFIG(opengl) - - class Q_LOCATION_PRIVATE_EXPORT QDeclarativePolylineMapItemPrivate - { -@@ -720,6 +722,7 @@ public: - MapPolylineNode *m_node = nullptr; - }; - -+#if QT_CONFIG(opengl) - class Q_LOCATION_PRIVATE_EXPORT QDeclarativePolylineMapItemPrivateOpenGLLineStrip: public QDeclarativePolylineMapItemPrivate - { - public: -@@ -884,7 +887,7 @@ public: - - MapPolylineNodeOpenGLExtruded *m_nodeTri = nullptr; - }; -- -+#endif // QT_CONFIG(opengl) - QT_END_NAMESPACE - - #endif // QDECLARATIVEPOLYLINEMAPITEM_P_P_H -diff --git a/src/location/declarativemaps/qdeclarativerectanglemapitem.cpp b/src/location/declarativemaps/qdeclarativerectanglemapitem.cpp -index 74d2cc1..6192be0 100644 ---- a/src/location/declarativemaps/qdeclarativerectanglemapitem.cpp -+++ b/src/location/declarativemaps/qdeclarativerectanglemapitem.cpp -@@ -185,9 +185,18 @@ void QDeclarativeRectangleMapItem::setBackend(QDeclarativeRectangleMapItem::Back - if (b == m_backend) - return; - m_backend = b; -- QScopedPointer d((m_backend == Software) -- ? static_cast(new QDeclarativeRectangleMapItemPrivateCPU(*this)) -- : static_cast(new QDeclarativeRectangleMapItemPrivateOpenGL(*this))); -+ QScopedPointer d( -+ (m_backend == Software) ? static_cast( -+ new QDeclarativeRectangleMapItemPrivateCPU(*this)) -+#if QT_CONFIG(opengl) -+ : static_cast( -+ new QDeclarativeRectangleMapItemPrivateOpenGL(*this))); -+#else -+ : nullptr); -+ qFatal("Requested non software rendering backend, but source code is compiled wihtout opengl " -+ "support"); -+#endif -+ - m_d.swap(d); - m_d->onGeoGeometryChanged(); - emit backendChanged(); -@@ -397,6 +406,8 @@ QDeclarativeRectangleMapItemPrivate::~QDeclarativeRectangleMapItemPrivate() {} - - QDeclarativeRectangleMapItemPrivateCPU::~QDeclarativeRectangleMapItemPrivateCPU() {} - -+#if QT_CONFIG(opengl) - QDeclarativeRectangleMapItemPrivateOpenGL::~QDeclarativeRectangleMapItemPrivateOpenGL() {} -+#endif - - QT_END_NAMESPACE -diff --git a/src/location/declarativemaps/qdeclarativerectanglemapitem_p_p.h b/src/location/declarativemaps/qdeclarativerectanglemapitem_p_p.h -index 65d2f61..f7ecd2a 100644 ---- a/src/location/declarativemaps/qdeclarativerectanglemapitem_p_p.h -+++ b/src/location/declarativemaps/qdeclarativerectanglemapitem_p_p.h -@@ -244,6 +244,7 @@ public: - MapPolygonNode *m_node = nullptr; - }; - -+#if QT_CONFIG(opengl) - class Q_LOCATION_PRIVATE_EXPORT QDeclarativeRectangleMapItemPrivateOpenGL: public QDeclarativeRectangleMapItemPrivate - { - public: -@@ -410,6 +411,7 @@ public: - MapPolygonNodeGL *m_node = nullptr; - MapPolylineNodeOpenGLExtruded *m_polylinenode = nullptr; - }; -+#endif // QT_CONFIG(opengl) - - QT_END_NAMESPACE - -diff --git a/src/location/location.pro b/src/location/location.pro -index b0e2c3f..ae20271 100644 ---- a/src/location/location.pro -+++ b/src/location/location.pro -@@ -39,7 +39,14 @@ include(maps/maps.pri) - include(places/places.pri) - include(declarativemaps/declarativemaps.pri) - include(declarativeplaces/declarativeplaces.pri) --qtConfig(location-labs-plugin):include(labs/labs.pri) -+qtConfig(location-labs-plugin) { -+ include(labs/labs.pri) -+} else { -+ # FIXME: this should be moved out of plugin source code, geojson is referenced from other places -+ # within codebase,however compilation of location-labs-plugin is optional -+ PRIVATE_HEADERS += labs/qgeojson_p.h -+ SOURCES += labs/qgeojson.cpp -+} - - HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS - -diff --git a/src/plugins/geoservices/itemsoverlay/qgeomapitemsoverlay.cpp b/src/plugins/geoservices/itemsoverlay/qgeomapitemsoverlay.cpp -index 1ebad08..a764438 100644 ---- a/src/plugins/geoservices/itemsoverlay/qgeomapitemsoverlay.cpp -+++ b/src/plugins/geoservices/itemsoverlay/qgeomapitemsoverlay.cpp -@@ -103,6 +103,7 @@ QGeoMap::Capabilities QGeoMapItemsOverlay::capabilities() const - bool QGeoMapItemsOverlay::createMapObjectImplementation(QGeoMapObject *obj) - { - #ifndef LOCATIONLABS -+ Q_UNUSED(obj); - return false; - #else - Q_D(QGeoMapItemsOverlay); -@@ -132,7 +133,9 @@ QSGNode *QGeoMapItemsOverlay::updateSceneGraph(QSGNode *node, QQuickWindow *wind - - void QGeoMapItemsOverlay::removeMapObject(QGeoMapObject *obj) - { --#ifdef LOCATIONLABS -+#ifndef LOCATIONLABS -+ Q_UNUSED(obj); -+#else - Q_D(QGeoMapItemsOverlay); - d->removeMapObject(obj); - #endif -@@ -169,7 +172,11 @@ QRectF QGeoMapItemsOverlayPrivate::visibleArea() const - QGeoMapItemsOverlayPrivate::QGeoMapItemsOverlayPrivate(QGeoMappingManagerEngineItemsOverlay *engine, QGeoMapItemsOverlay *map) - : QGeoMapPrivate(engine, new QGeoProjectionWebMercator) - { -+#ifndef LOCATIONLABS -+ Q_UNUSED(map); -+#else - m_qsgSupport.m_map = map; -+#endif - } - - QGeoMapItemsOverlayPrivate::~QGeoMapItemsOverlayPrivate() --- -2.33.1 - diff --git a/package/qt5/qt5location/qt5location.hash b/package/qt5/qt5location/qt5location.hash index 17da2bb9ad6..e41b20fd9b2 100644 --- a/package/qt5/qt5location/qt5location.hash +++ b/package/qt5/qt5location/qt5location.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 11cf8320598821c97f853635c529451503917895f11e664dfdd0b63bf48c8a46 qt5location-861e372b6ad81570d4f496e42fb25a6699b72f2f-br1.tar.gz +sha256 f9673cb1e5b88b4c43d663d7b9b666ff82d6843bf2b445805367cf537839a782 qt5location-db3b6bc6afed6477e6ab2d8465e41efee30fb6d5-br1.tar.gz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5location/qt5location.mk b/package/qt5/qt5location/qt5location.mk index b1d19d78114..a61994fa530 100644 --- a/package/qt5/qt5location/qt5location.mk +++ b/package/qt5/qt5location/qt5location.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5LOCATION_VERSION = 861e372b6ad81570d4f496e42fb25a6699b72f2f +QT5LOCATION_VERSION = db3b6bc6afed6477e6ab2d8465e41efee30fb6d5 QT5LOCATION_SITE = $(QT5_SITE)/qtlocation QT5LOCATION_SITE_METHOD = git QT5LOCATION_GIT_SUBMODULES = YES diff --git a/package/qt5/qt5lottie/qt5lottie.hash b/package/qt5/qt5lottie/qt5lottie.hash index 46ab3f60df3..c5c71ddf6c1 100644 --- a/package/qt5/qt5lottie/qt5lottie.hash +++ b/package/qt5/qt5lottie/qt5lottie.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 edbf1270733e385189dbcdad67ecec24c9e372168215873eadb31735d0947de1 qtlottie-fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4.tar.bz2 +sha256 7e006b7a3608f0737f41682352819c404db4c1506d9ebe82eb4af7b1ae652d14 qtlottie-ccba2b00bd7f10558edb8664d6b9a95e9fafe6ac.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5lottie/qt5lottie.mk b/package/qt5/qt5lottie/qt5lottie.mk index e9614fbecfb..d02d693401b 100644 --- a/package/qt5/qt5lottie/qt5lottie.mk +++ b/package/qt5/qt5lottie/qt5lottie.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5LOTTIE_VERSION = fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4 +QT5LOTTIE_VERSION = ccba2b00bd7f10558edb8664d6b9a95e9fafe6ac QT5LOTTIE_SITE = $(QT5_SITE)/qtlottie/-/archive/$(QT5LOTTIE_VERSION) QT5LOTTIE_SOURCE = qtlottie-$(QT5LOTTIE_VERSION).tar.bz2 QT5LOTTIE_DEPENDENCIES = qt5declarative diff --git a/package/qt5/qt5mqtt/qt5mqtt.mk b/package/qt5/qt5mqtt/qt5mqtt.mk index 0b62cf1bed5..824d58d1d12 100644 --- a/package/qt5/qt5mqtt/qt5mqtt.mk +++ b/package/qt5/qt5mqtt/qt5mqtt.mk @@ -5,7 +5,7 @@ ################################################################################ QT5MQTT_VERSION = 5.15.2 -QT5MQTT_SITE = https://code.qt.io/cgit/qt/qtmqtt.git +QT5MQTT_SITE = https://code.qt.io/qt/qtmqtt.git QT5MQTT_SITE_METHOD = git QT5MQTT_INSTALL_STAGING = YES QT5MQTT_LICENSE = GPL-3.0 with exception diff --git a/package/qt5/qt5multimedia/qt5multimedia.hash b/package/qt5/qt5multimedia/qt5multimedia.hash index 1c4d9302488..527e3948b86 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.hash +++ b/package/qt5/qt5multimedia/qt5multimedia.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 95e94b016f256b57b2df3f1df7d02d6f077c600faa4312561f02121623dfecef qtmultimedia-bd29c87027637a013f2c5e3b549fcda84e4d7545.tar.bz2 +sha256 b6a17deafe7ea7ad44e2852a92ea73b0089beaf9f24cb3434d018db9b8170ee6 qtmultimedia-dc0ee181d4c56ff66c989bd3292dad7cc35e234b.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk index 66953690630..bf2126b285b 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.mk +++ b/package/qt5/qt5multimedia/qt5multimedia.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5MULTIMEDIA_VERSION = bd29c87027637a013f2c5e3b549fcda84e4d7545 +QT5MULTIMEDIA_VERSION = dc0ee181d4c56ff66c989bd3292dad7cc35e234b QT5MULTIMEDIA_SITE = $(QT5_SITE)/qtmultimedia/-/archive/$(QT5MULTIMEDIA_VERSION) QT5MULTIMEDIA_SOURCE = qtmultimedia-$(QT5MULTIMEDIA_VERSION).tar.bz2 QT5MULTIMEDIA_INSTALL_STAGING = YES diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash index 2138b3e3137..45af81c99fc 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 7df0648d9b8fdde1ea27abd9d6eb3ff170e8e666872ea97c07e1bb5ac241be4b qtquickcontrols-cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420.tar.bz2 +sha256 c2ddcf9c524ef12a0786c410ac4b3c6d4be9aa17db71f2ea8c57ff615fda62dd qtquickcontrols-d405bf6a29bc9d6da6e3dcefbd1b88f5ed70fb1b.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk index c2b5ae182e7..5903e6d69c7 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5QUICKCONTROLS_VERSION = cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420 +QT5QUICKCONTROLS_VERSION = d405bf6a29bc9d6da6e3dcefbd1b88f5ed70fb1b QT5QUICKCONTROLS_SITE = $(QT5_SITE)/qtquickcontrols/-/archive/$(QT5QUICKCONTROLS_VERSION) QT5QUICKCONTROLS_SOURCE = qtquickcontrols-$(QT5QUICKCONTROLS_VERSION).tar.bz2 QT5QUICKCONTROLS_DEPENDENCIES = qt5declarative diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash index 766fd690778..7d81b614073 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 f0315b0f0301fdb16d6ee78c57e3cd600121884c1356ca1160ace96a57ac17bc qtquickcontrols2-d8d6b14b9907adbc6ce307d52be34aaa761a58fa.tar.bz2 +sha256 0c4204257be906c13f863b9481bb20ad616c9a80a074b6f160f863ac046dad27 qtquickcontrols2-0d3d39e821ea7634c174a29910c18d7101bce6f7.tar.bz2 # Hashes for license files: sha256 d2cfc059acb4abd8e513cd0a73cd8489f34cbafa7bc34d5d31fb3210821cf8ca LICENSE.GPLv3 diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk index ff1a49a9ce9..f847ec95ab3 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5QUICKCONTROLS2_VERSION = d8d6b14b9907adbc6ce307d52be34aaa761a58fa +QT5QUICKCONTROLS2_VERSION = 0d3d39e821ea7634c174a29910c18d7101bce6f7 QT5QUICKCONTROLS2_SITE = $(QT5_SITE)/qtquickcontrols2/-/archive/$(QT5QUICKCONTROLS2_VERSION) QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-$(QT5QUICKCONTROLS2_VERSION).tar.bz2 QT5QUICKCONTROLS2_DEPENDENCIES = qt5declarative diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash index c2d0b11f2bd..e68f66edd8a 100644 --- a/package/qt5/qt5quicktimeline/qt5quicktimeline.hash +++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 4d88f7f70c8a983378cb9702bf1551c6a150fb283d0540bd43a120d953e077e3 qtquicktimeline-67503cdadea43b95ddad0de1a04951aff0ce1a07.tar.bz2 +sha256 ab113ead993206de4025c78fd2babea69824f52ff88fa78451b6bbcb932a6ab6 qtquicktimeline-2ce816fa5822bcc1c47678447405b2e5dc1312c1.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk index 49d0cb330bc..70cca38ff45 100644 --- a/package/qt5/qt5quicktimeline/qt5quicktimeline.mk +++ b/package/qt5/qt5quicktimeline/qt5quicktimeline.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5QUICKTIMELINE_VERSION = 67503cdadea43b95ddad0de1a04951aff0ce1a07 +QT5QUICKTIMELINE_VERSION = 2ce816fa5822bcc1c47678447405b2e5dc1312c1 QT5QUICKTIMELINE_SITE = $(QT5_SITE)/qtquicktimeline/-/archive/$(QT5QUICKTIMELINE_VERSION) QT5QUICKTIMELINE_SOURCE = qtquicktimeline-$(QT5QUICKTIMELINE_VERSION).tar.bz2 QT5QUICKTIMELINE_DEPENDENCIES = qt5declarative diff --git a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash index a2573a018a3..980101c7fb5 100644 --- a/package/qt5/qt5remoteobjects/qt5remoteobjects.hash +++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 43c876d475228a0b727d2b2ae47cecc8cbd665d1574ad4db61b209c08a488b90 qtremoteobjects-4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735.tar.bz2 +sha256 f51631a142ac47a03266496dae9d07c734f092a0afe8c4e18cd78b7cf9c17b38 qtremoteobjects-809412e1cc2151c21f843796ef67705600f6aafb.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk index b7dee4f2f33..984f392dda1 100644 --- a/package/qt5/qt5remoteobjects/qt5remoteobjects.mk +++ b/package/qt5/qt5remoteobjects/qt5remoteobjects.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5REMOTEOBJECTS_VERSION = 4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735 +QT5REMOTEOBJECTS_VERSION = 809412e1cc2151c21f843796ef67705600f6aafb QT5REMOTEOBJECTS_SITE = $(QT5_SITE)/qtremoteobjects/-/archive/$(QT5REMOTEOBJECTS_VERSION) QT5REMOTEOBJECTS_SOURCE = qtremoteobjects-$(QT5REMOTEOBJECTS_VERSION).tar.bz2 QT5REMOTEOBJECTS_DEPENDENCIES = qt5base diff --git a/package/qt5/qt5script/qt5script.hash b/package/qt5/qt5script/qt5script.hash index 0b34ff3e8fe..b3e10491fd4 100644 --- a/package/qt5/qt5script/qt5script.hash +++ b/package/qt5/qt5script/qt5script.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 bd748330ad08ea504875b9e0a316c0ecc01e6990e16d3bec61f5f55b9e291011 qtscript-5be95f966aabc5170f0aacfd4b0a46217241bfd6.tar.bz2 +sha256 fc625c1682d7ee5d1092255408cbaf08d5cac52eb45bacd3ab52937dc84d91f2 qtscript-5cec94b2c1503f106f4ef4778d016410ebb86211.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5script/qt5script.mk b/package/qt5/qt5script/qt5script.mk index 4e51eacfc38..313895f11b3 100644 --- a/package/qt5/qt5script/qt5script.mk +++ b/package/qt5/qt5script/qt5script.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5SCRIPT_VERSION = 5be95f966aabc5170f0aacfd4b0a46217241bfd6 +QT5SCRIPT_VERSION = 5cec94b2c1503f106f4ef4778d016410ebb86211 QT5SCRIPT_SITE = $(QT5_SITE)/qtscript/-/archive/$(QT5SCRIPT_VERSION) QT5SCRIPT_SOURCE = qtscript-$(QT5SCRIPT_VERSION).tar.bz2 QT5SCRIPT_INSTALL_STAGING = YES diff --git a/package/qt5/qt5scxml/qt5scxml.hash b/package/qt5/qt5scxml/qt5scxml.hash index 85e72f53780..1c11ae5853f 100644 --- a/package/qt5/qt5scxml/qt5scxml.hash +++ b/package/qt5/qt5scxml/qt5scxml.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 6ce28e969efae2ab74fe3eda61a5d90fcfc4bf734cd9f36942a6968189530e69 qtscxml-7a15000f42c7a3171719727cd056f82a78244ed7.tar.bz2 +sha256 5fc3e6166ab3588242864c5d8f18235a45f5c3396482ccfeb8590fe67d0cd549 qtscxml-dcbd73cf3e8a07dbfa249d7db2257caafa83781b.tar.bz2 # Hashes for license files: sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT diff --git a/package/qt5/qt5scxml/qt5scxml.mk b/package/qt5/qt5scxml/qt5scxml.mk index d5d26536a38..af18b84e9db 100644 --- a/package/qt5/qt5scxml/qt5scxml.mk +++ b/package/qt5/qt5scxml/qt5scxml.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5SCXML_VERSION = 7a15000f42c7a3171719727cd056f82a78244ed7 +QT5SCXML_VERSION = dcbd73cf3e8a07dbfa249d7db2257caafa83781b QT5SCXML_SITE = $(QT5_SITE)/qtscxml/-/archive/$(QT5SCXML_VERSION) QT5SCXML_SOURCE = qtscxml-$(QT5SCXML_VERSION).tar.bz2 QT5SCXML_DEPENDENCIES = qt5declarative diff --git a/package/qt5/qt5sensors/qt5sensors.hash b/package/qt5/qt5sensors/qt5sensors.hash index 6be87e8cf95..559f02e7f6e 100644 --- a/package/qt5/qt5sensors/qt5sensors.hash +++ b/package/qt5/qt5sensors/qt5sensors.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 1db8f6093595b574217eaec98da874d5eb46bb80343ddaa0a5bff0f6b45c5498 qtsensors-921a31375f29e429e95352b08b2b9dbfea663cb1.tar.bz2 +sha256 fa0ffba89fed2086d06dab84074cdd789acbfb89da6f64c40a64fc3bc067832e qtsensors-1ab8d6c7257f9ec060739b648704be1cf1c16b05.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5sensors/qt5sensors.mk b/package/qt5/qt5sensors/qt5sensors.mk index eebda912a96..299fab3db02 100644 --- a/package/qt5/qt5sensors/qt5sensors.mk +++ b/package/qt5/qt5sensors/qt5sensors.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5SENSORS_VERSION = 921a31375f29e429e95352b08b2b9dbfea663cb1 +QT5SENSORS_VERSION = 1ab8d6c7257f9ec060739b648704be1cf1c16b05 QT5SENSORS_SITE = $(QT5_SITE)/qtsensors/-/archive/$(QT5SENSORS_VERSION) QT5SENSORS_SOURCE = qtsensors-$(QT5SENSORS_VERSION).tar.bz2 QT5SENSORS_INSTALL_STAGING = YES diff --git a/package/qt5/qt5serialbus/qt5serialbus.hash b/package/qt5/qt5serialbus/qt5serialbus.hash index 8b560a8a83d..b8f96cf0c09 100644 --- a/package/qt5/qt5serialbus/qt5serialbus.hash +++ b/package/qt5/qt5serialbus/qt5serialbus.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 77056fba2ea313241c4780d959d8a3d916add816ced4cd5c95138e331a178d6b qtserialbus-8884c5e43df846deac5a0c7c290eeb633d6bfe32.tar.bz2 +sha256 caaccfdabdf502c3aacf9fa842ed31ed7682cab6ada69b06be1ba49273fb1f1c qtserialbus-e34053fbda8d687e3dc294fbd5e3a88bf94a7a66.tar.bz2 # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5serialbus/qt5serialbus.mk b/package/qt5/qt5serialbus/qt5serialbus.mk index fc62c853184..70f23ce407e 100644 --- a/package/qt5/qt5serialbus/qt5serialbus.mk +++ b/package/qt5/qt5serialbus/qt5serialbus.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5SERIALBUS_VERSION = 8884c5e43df846deac5a0c7c290eeb633d6bfe32 +QT5SERIALBUS_VERSION = e34053fbda8d687e3dc294fbd5e3a88bf94a7a66 QT5SERIALBUS_SITE = $(QT5_SITE)/qtserialbus/-/archive/$(QT5SERIALBUS_VERSION) QT5SERIALBUS_SOURCE = qtserialbus-$(QT5SERIALBUS_VERSION).tar.bz2 QT5SERIALBUS_DEPENDENCIES = qt5serialport diff --git a/package/qt5/qt5serialport/qt5serialport.hash b/package/qt5/qt5serialport/qt5serialport.hash index 6d821c387f7..d25b2193e79 100644 --- a/package/qt5/qt5serialport/qt5serialport.hash +++ b/package/qt5/qt5serialport/qt5serialport.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 fb618df447132364cabf75e36b5a1d74ae7664a604662366711b58e10d1ce075 qtserialport-941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4.tar.bz2 +sha256 83abb0c5b9c435a031abf1a36d6d44f8e3f5e2fc16150bdc78c6d33b25386bb6 qtserialport-191e67e428522a0e2e1e8d2f3440607a9760d441.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5serialport/qt5serialport.mk b/package/qt5/qt5serialport/qt5serialport.mk index 370093f6f81..cd96df20074 100644 --- a/package/qt5/qt5serialport/qt5serialport.mk +++ b/package/qt5/qt5serialport/qt5serialport.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5SERIALPORT_VERSION = 941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4 +QT5SERIALPORT_VERSION = 191e67e428522a0e2e1e8d2f3440607a9760d441 QT5SERIALPORT_SITE = $(QT5_SITE)/qtserialport/-/archive/$(QT5SERIALPORT_VERSION) QT5SERIALPORT_SOURCE = qtserialport-$(QT5SERIALPORT_VERSION).tar.bz2 QT5SERIALPORT_INSTALL_STAGING = YES diff --git a/package/qt5/qt5speech/Config.in b/package/qt5/qt5speech/Config.in new file mode 100644 index 00000000000..cebd06057ec --- /dev/null +++ b/package/qt5/qt5speech/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_QT5SPEECH + bool "qt5speech" + help + Qt is a cross-platform application and UI framework for + developers using C++. + + Qt Speech enables support for accessibility features such as + text-to-speech. + + For output optional enable flite or speechd. + + https://doc.qt.io/qt-5/qtspeech-index.html diff --git a/package/qt5/qt5speech/qt5speech.hash b/package/qt5/qt5speech/qt5speech.hash new file mode 100644 index 00000000000..595aac9f22a --- /dev/null +++ b/package/qt5/qt5speech/qt5speech.hash @@ -0,0 +1,7 @@ +# Locally calculated +sha256 6d0794ab9d5286d04fbac2db44c00ed3306e569c876f84cfd91ac0e79c834b1e qtspeech-d32f4a479d38a11f547598004b975f4356424a16.tar.bz2 + +# Hashes for license files: +sha256 6c3f3c31b93985f1b93bfbb35fb609d37281697d0efc220c9f91cf4b59eaabde LICENSE.GPLv2 +sha256 75d800e60c8d58c2e7f0338e8552ea6123a9ce7e5dd8e1cdf2095e013b737488 LICENSE.LGPLv3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/package/qt5/qt5speech/qt5speech.mk b/package/qt5/qt5speech/qt5speech.mk new file mode 100644 index 00000000000..8cf6fe19c1e --- /dev/null +++ b/package/qt5/qt5speech/qt5speech.mk @@ -0,0 +1,23 @@ +################################################################################ +# +# qt5speech +# +################################################################################ + +QT5SPEECH_VERSION = d32f4a479d38a11f547598004b975f4356424a16 +QT5SPEECH_SITE = $(QT5_SITE)/qtspeech/-/archive/$(QT5SPEECH_VERSION) +QT5SPEECH_SOURCE = qtspeech-$(QT5SPEECH_VERSION).tar.bz2 +QT5SPEECH_INSTALL_STAGING = YES +QT5SPEECH_LICENSE = GPL-2.0+ or LGPL-3.0, GFDL-1.3 (docs) +QT5SPEECH_LICENSE_FILES = LICENSE.GPLv2 LICENSE.LGPLv3 LICENSE.FDL +QT5SPEECH_SYNC_QT_HEADERS = YES + +ifeq ($(BR2_PACKAGE_FLITE),y) +QT5SPEECH_DEPENDENCIES += flite +endif + +ifeq ($(BR2_PACKAGE_SPEECHD),y) +QT5SPEECH_DEPENDENCIES += speechd +endif + +$(eval $(qmake-package)) diff --git a/package/qt5/qt5svg/qt5svg.hash b/package/qt5/qt5svg/qt5svg.hash index 1e4dc54c671..424891ac2c0 100644 --- a/package/qt5/qt5svg/qt5svg.hash +++ b/package/qt5/qt5svg/qt5svg.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 7f45cc161ede4e918a4f3236af7e81d63404199529460cf74b620565dfce6d9e qtsvg-728012f7762ecd5762d493f8796907c6456f31e7.tar.bz2 +sha256 eeb4175f0b2c3299abf0ca9d751886612dad5ecd212c954f9801b28b4696f4f7 qtsvg-23b8cf7d833c335d7735855570c05e9e0893a9b7.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5svg/qt5svg.mk b/package/qt5/qt5svg/qt5svg.mk index 849a2b7f1bf..3072fd7a187 100644 --- a/package/qt5/qt5svg/qt5svg.mk +++ b/package/qt5/qt5svg/qt5svg.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5SVG_VERSION = 728012f7762ecd5762d493f8796907c6456f31e7 +QT5SVG_VERSION = 23b8cf7d833c335d7735855570c05e9e0893a9b7 QT5SVG_SITE = $(QT5_SITE)/qtsvg/-/archive/$(QT5SVG_VERSION) QT5SVG_SOURCE = qtsvg-$(QT5SVG_VERSION).tar.bz2 QT5SVG_INSTALL_STAGING = YES diff --git a/package/qt5/qt5tools/Config.in b/package/qt5/qt5tools/Config.in index 428413d5e25..46585e1e043 100644 --- a/package/qt5/qt5tools/Config.in +++ b/package/qt5/qt5tools/Config.in @@ -23,12 +23,13 @@ config BR2_PACKAGE_QT5TOOLS_QDOC_TOOL # currently supported in Buildroot, unless the target is # already supported by llvm. depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS # llvm, clang - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # llvm, clang + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # llvm, clang depends on BR2_TOOLCHAIN_HAS_THREADS # llvm, clang depends on BR2_INSTALL_LIBSTDCPP # llvm, clang depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # llvm, clang depends on !BR2_STATIC_LIBS # llvm, clang depends on BR2_USE_WCHAR # llvm, clang + depends on BR2_HOST_GCC_AT_LEAST_5 # llvm, clang help This option enables the qdoc host tool. diff --git a/package/qt5/qt5tools/qt5tools.hash b/package/qt5/qt5tools/qt5tools.hash index a5638019978..58ed752b9bf 100644 --- a/package/qt5/qt5tools/qt5tools.hash +++ b/package/qt5/qt5tools/qt5tools.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 e5ee14a50d5be68ba53e11c76c6e90cc7d7023eab5050447869e7f5e472478a8 qttools-33693a928986006d79c1ee743733cde5966ac402.tar.bz2 +sha256 76052a183a41fcddfd4446ffba6a99c3e77a21453fe629cf67379ffa617a0d53 qttools-53ee43a51b5a3de2877dafffc78e71ff55926708.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5tools/qt5tools.mk b/package/qt5/qt5tools/qt5tools.mk index e2385080ce8..e87c9b50a55 100644 --- a/package/qt5/qt5tools/qt5tools.mk +++ b/package/qt5/qt5tools/qt5tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5TOOLS_VERSION = 33693a928986006d79c1ee743733cde5966ac402 +QT5TOOLS_VERSION = 53ee43a51b5a3de2877dafffc78e71ff55926708 QT5TOOLS_SITE = $(QT5_SITE)/qttools/-/archive/$(QT5TOOLS_VERSION) QT5TOOLS_SOURCE = qttools-$(QT5TOOLS_VERSION).tar.bz2 diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash index 432e3099c33..1cdd8f0386b 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 a91024f241df0d24ee398c262b61d126d451c70f05ef109901cfb483d1201538 qtvirtualkeyboard-98d1fd864cbb6c7c012c4139118808af110fb8f0.tar.bz2 +sha256 6ef14ba8bb5eb287320b6c0d6e61c5c2916a94ef754bb8a2d89c123043485d67 qtvirtualkeyboard-e8ae4757dd32e8dbf69a7c57f2bc5c1e238416db.tar.bz2 # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk index 8e997a24263..3fefdc874d0 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5VIRTUALKEYBOARD_VERSION = 98d1fd864cbb6c7c012c4139118808af110fb8f0 +QT5VIRTUALKEYBOARD_VERSION = e8ae4757dd32e8dbf69a7c57f2bc5c1e238416db QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE)/qtvirtualkeyboard/-/archive/$(QT5VIRTUALKEYBOARD_VERSION) QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5VIRTUALKEYBOARD_VERSION).tar.bz2 QT5VIRTUALKEYBOARD_DEPENDENCIES = qt5declarative qt5svg @@ -16,7 +16,7 @@ QT5VIRTUALKEYBOARD_LICENSE_FILES = LICENSE.GPL3 QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS = $(call qstrip,$(BR2_PACKAGE_QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS)) ifneq ($(strip $(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS)),) -QT5VIRTUALKEYBOARD_QMAKEFLAGS += CONFIG+="$(foreach lang,$(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS),lang-$(lang))" +QT5VIRTUALKEYBOARD_CONF_OPTS += CONFIG+="$(foreach lang,$(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS),lang-$(lang))" ifneq ($(filter ja_JP all,$(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS)),) QT5VIRTUALKEYBOARD_LICENSE += , Apache-2.0 (openwnn) diff --git a/package/qt5/qt5wayland/0001-Add-missing-define-guards.patch b/package/qt5/qt5wayland/0001-Add-missing-define-guards.patch new file mode 100644 index 00000000000..adad3768b23 --- /dev/null +++ b/package/qt5/qt5wayland/0001-Add-missing-define-guards.patch @@ -0,0 +1,35 @@ +From 05658e127dedfff65789860415537c6920ec574d Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Thu, 22 Apr 2021 15:29:56 +0300 +Subject: [PATCH] Add missing define guards + +Ammend cca1b94190a094b5d1d7ce492b6533e2d330c5e8 to use m_composeState +only if xcbcommon is available. + +Pick-to: 5.15 +Change-Id: I48332b15def3282c5bda3e1c7c393ea7e9849cbe +Reviewed-by: Aleix Pol Gonzalez +[Backported from: 05658e127dedfff65789860415537c6920ec574d] +Signed-off-by: Quentin Schulz +--- + src/client/qwaylandinputcontext.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/client/qwaylandinputcontext.cpp b/src/client/qwaylandinputcontext.cpp +index 16e03ea1..cbf63cde 100644 +--- a/src/client/qwaylandinputcontext.cpp ++++ b/src/client/qwaylandinputcontext.cpp +@@ -408,8 +408,10 @@ bool QWaylandInputContext::isValid() const + void QWaylandInputContext::reset() + { + qCDebug(qLcQpaInputMethods) << Q_FUNC_INFO; ++#if QT_CONFIG(xkbcommon) + if (m_composeState) + xkb_compose_state_reset(m_composeState); ++#endif + + QPlatformInputContext::reset(); + +-- +2.35.1 + diff --git a/package/qt5/qt5wayland/qt5wayland.hash b/package/qt5/qt5wayland/qt5wayland.hash index 1a7400de679..58935ceadcb 100644 --- a/package/qt5/qt5wayland/qt5wayland.hash +++ b/package/qt5/qt5wayland/qt5wayland.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 a29d52c7b12987ed56d922455e0776e161075392969f7c6a8b141b00bd3dd46b qtwayland-b6d85c2a75f5618e87267f5b5c361455be257a17.tar.bz2 +sha256 bfe9bce353c036356dc7bca04e634f03c7c924381062ce89627a88df0ae7484e qtwayland-36659e6130ed3fc2b3f0c91423408ef5ecb7b991.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5wayland/qt5wayland.mk b/package/qt5/qt5wayland/qt5wayland.mk index bcc4915022c..63fa1f21c0b 100644 --- a/package/qt5/qt5wayland/qt5wayland.mk +++ b/package/qt5/qt5wayland/qt5wayland.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5WAYLAND_VERSION = b6d85c2a75f5618e87267f5b5c361455be257a17 +QT5WAYLAND_VERSION = 36659e6130ed3fc2b3f0c91423408ef5ecb7b991 QT5WAYLAND_SITE = $(QT5_SITE)/qtwayland/-/archive/$(QT5WAYLAND_VERSION) QT5WAYLAND_SOURCE = qtwayland-$(QT5WAYLAND_VERSION).tar.bz2 QT5WAYLAND_DEPENDENCIES = wayland diff --git a/package/qt5/qt5webchannel/qt5webchannel.hash b/package/qt5/qt5webchannel/qt5webchannel.hash index af195b32b3a..b5e9f1a043c 100644 --- a/package/qt5/qt5webchannel/qt5webchannel.hash +++ b/package/qt5/qt5webchannel/qt5webchannel.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 cc75d29ca38d512b79f2bfbcdb641cdb02dd3a1024f2c9c530abec00418effbf qtwebchannel-fa8b07105b5e274daaa8adcc129fa4aa0447f9f7.tar.bz2 +sha256 a281a053471f5c480d7c2679caa0a759e8628f6eafc07c1781f1eb8bb97ee37d qtwebchannel-8c842152da613f941892481d62267c73c4a4f006.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5webchannel/qt5webchannel.mk b/package/qt5/qt5webchannel/qt5webchannel.mk index 042a28fca9b..54e6a70ddb1 100644 --- a/package/qt5/qt5webchannel/qt5webchannel.mk +++ b/package/qt5/qt5webchannel/qt5webchannel.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5WEBCHANNEL_VERSION = fa8b07105b5e274daaa8adcc129fa4aa0447f9f7 +QT5WEBCHANNEL_VERSION = 8c842152da613f941892481d62267c73c4a4f006 QT5WEBCHANNEL_SITE = $(QT5_SITE)/qtwebchannel/-/archive/$(QT5WEBCHANNEL_VERSION) QT5WEBCHANNEL_SOURCE = qtwebchannel-$(QT5WEBCHANNEL_VERSION).tar.bz2 QT5WEBCHANNEL_DEPENDENCIES = qt5websockets diff --git a/package/qt5/qt5webengine-chromium-catapult/Config.in b/package/qt5/qt5webengine-chromium-catapult/Config.in new file mode 100644 index 00000000000..471c2a2dbc9 --- /dev/null +++ b/package/qt5/qt5webengine-chromium-catapult/Config.in @@ -0,0 +1,4 @@ +# Not user-selectable, it is only needed to be copied +# into the chromium source tree. +config BR2_PACKAGE_QT5WEBENGINE_CHROMIUM_CATAPULT + bool diff --git a/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.hash b/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.hash new file mode 100644 index 00000000000..8190a6dd5d9 --- /dev/null +++ b/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 66b8593e665c4236f7b1c487548d41d3826eddbf486ff985dbdfd01cddcaa1a8 qt5webengine-chromium-catapult-5eedfe23148a234211ba477f76fc2ea2e8529189-br1.tar.gz +sha256 f0df289ba9d03d857ad1c2f5918861376b1510b71588ffc60eff5c7a7bfedb09 LICENSE diff --git a/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.mk b/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.mk new file mode 100644 index 00000000000..5d0db1e7903 --- /dev/null +++ b/package/qt5/qt5webengine-chromium-catapult/qt5webengine-chromium-catapult.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# qt5webengine-chromium-catapult +# +################################################################################ + +QT5WEBENGINE_CHROMIUM_CATAPULT_VERSION = 5eedfe23148a234211ba477f76fc2ea2e8529189 +QT5WEBENGINE_CHROMIUM_CATAPULT_SITE = https://chromium.googlesource.com/catapult.git +QT5WEBENGINE_CHROMIUM_CATAPULT_SITE_METHOD = git +QT5WEBENGINE_CHROMIUM_CATAPULT_LICENSE = BSD-3-Clause +QT5WEBENGINE_CHROMIUM_CATAPULT_LICENSE_FILES = LICENSE +QT5WEBENGINE_CHROMIUM_CATAPULT_INSTALL_TARGET = NO + +$(eval $(generic-package)) diff --git a/package/qt5/qt5webengine-chromium/0001-Add-python3-build-support.patch b/package/qt5/qt5webengine-chromium/0001-Add-python3-build-support.patch new file mode 100644 index 00000000000..cc9726418ee --- /dev/null +++ b/package/qt5/qt5webengine-chromium/0001-Add-python3-build-support.patch @@ -0,0 +1,1858 @@ +From bf94b834e9beb4e7bc25dbc4c61f5e2db39e7cdc Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Fri, 4 Feb 2022 15:43:35 -0700 +Subject: [PATCH] Add python3 build support + +Adapted from: +https://github.com/archlinux/svntogit-packages/blob/6edf5f1aaea952d046aff89a2e0175258fe77361/trunk/qt5-webengine-chromium-python3.patch + +Signed-off-by: James Hilliard +--- + .../protobufs/binary_proto_generator.py | 8 +- + .../tracing/generate_trace_viewer_grd.py | 2 +- + chromium/mojo/public/tools/bindings/BUILD.gn | 2 + + .../tools/bindings/gen_data_files_list.py | 8 +- + .../generators/mojom_java_generator.py | 4 + + .../tools/mojom/mojom/generate/generator.py | 14 ++-- + .../tools/mojom/mojom/generate/module.py | 3 +- + .../mojom/mojom/generate/template_expander.py | 12 +-- + .../scripts/bind_gen/blink_v8_bridge.py | 6 +- + .../scripts/bind_gen/callback_interface.py | 2 +- + .../bindings/scripts/bind_gen/code_node.py | 10 +-- + .../bindings/scripts/bind_gen/codegen_expr.py | 15 ++-- + .../scripts/bind_gen/codegen_format.py | 2 +- + .../scripts/bind_gen/codegen_utils.py | 2 +- + .../bindings/scripts/bind_gen/dictionary.py | 2 +- + .../bindings/scripts/bind_gen/interface.py | 82 +++++++++++-------- + .../scripts/bind_gen/mako_renderer.py | 2 +- + .../bindings/scripts/bind_gen/style_format.py | 9 +- + .../bindings/scripts/bind_gen/task_queue.py | 5 +- + .../bindings/scripts/code_generator.py | 10 +++ + .../scripts/generate_origin_trial_features.py | 4 +- + .../bindings/scripts/idl_definitions.py | 8 +- + .../renderer/bindings/scripts/idl_reader.py | 4 +- + .../renderer/bindings/scripts/idl_types.py | 2 +- + .../renderer/bindings/scripts/utilities.py | 28 +++---- + .../renderer/bindings/scripts/v8_interface.py | 9 +- + .../renderer/bindings/scripts/v8_methods.py | 4 + + .../renderer/bindings/scripts/v8_utilities.py | 2 +- + .../scripts/web_idl/callback_interface.py | 12 +-- + .../bindings/scripts/web_idl/database.py | 2 +- + .../bindings/scripts/web_idl/exposure.py | 5 +- + .../bindings/scripts/web_idl/function_like.py | 28 +++---- + .../bindings/scripts/web_idl/idl_compiler.py | 21 ++--- + .../bindings/scripts/web_idl/interface.py | 45 +++++----- + .../bindings/scripts/web_idl/ir_builder.py | 29 ++++--- + .../bindings/scripts/web_idl/make_copy.py | 7 ++ + .../bindings/scripts/web_idl/namespace.py | 12 +-- + .../bindings/templates/dictionary_v8.cc.tmpl | 8 +- + .../scripts/core/css/make_style_shorthands.py | 23 +++--- + .../properties/make_css_property_instances.py | 4 +- + .../blink/renderer/build/scripts/gperf.py | 2 +- + .../blink/renderer/build/scripts/in_file.py | 2 +- + .../renderer/build/scripts/in_generator.py | 5 ++ + .../build/scripts/make_runtime_features.py | 2 +- + .../scripts/templates/element_factory.cc.tmpl | 4 +- + .../templates/element_type_helpers.cc.tmpl | 4 +- + .../templates/element_type_helpers.h.tmpl | 2 +- + .../build/scripts/templates/macros.tmpl | 4 +- + .../templates/make_qualified_names.h.tmpl | 4 +- + .../dawn/generator/generator_lib.py | 4 + + .../devtools-frontend/src/BUILD.gn | 2 + + .../scripts/build/build_inspector_overlay.py | 3 +- + .../build/build_release_applications.py | 9 +- + .../scripts/build/generate_devtools_grd.py | 4 +- + .../src/scripts/build/modular_build.py | 6 +- + chromium/third_party/jinja2/tests.py | 2 +- + chromium/tools/metrics/ukm/gen_builders.py | 5 +- + .../ui/ozone/generate_constructor_list.py | 13 ++- + .../ui/ozone/generate_ozone_platform_list.py | 26 ++++-- + 59 files changed, 331 insertions(+), 229 deletions(-) + +diff --git a/chromium/components/resources/protobufs/binary_proto_generator.py b/chromium/components/resources/protobufs/binary_proto_generator.py +index 7422ead9697..16365515f26 100755 +--- a/chromium/components/resources/protobufs/binary_proto_generator.py ++++ b/chromium/components/resources/protobufs/binary_proto_generator.py +@@ -7,7 +7,7 @@ + Converts a given ASCII proto into a binary resource. + + """ +- ++from __future__ import print_function + import abc + import imp + import optparse +@@ -196,12 +196,12 @@ class BinaryProtoGenerator: + self._ImportProtoModules(opts.path) + + if not self.VerifyArgs(opts): +- print "Wrong arguments" ++ print("Wrong arguments") + return 1 + + try: + self._GenerateBinaryProtos(opts) + except Exception as e: +- print "ERROR: Failed to render binary version of %s:\n %s\n%s" % ( +- opts.infile, str(e), traceback.format_exc()) ++ print("ERROR: Failed to render binary version of %s:\n %s\n%s" % ++ (opts.infile, str(e), traceback.format_exc())) + return 1 +diff --git a/chromium/content/browser/tracing/generate_trace_viewer_grd.py b/chromium/content/browser/tracing/generate_trace_viewer_grd.py +index 037f9497dc2..be393d21f90 100755 +--- a/chromium/content/browser/tracing/generate_trace_viewer_grd.py ++++ b/chromium/content/browser/tracing/generate_trace_viewer_grd.py +@@ -74,7 +74,7 @@ def main(argv): + for filename in parsed_args.source_files: + add_file_to_grd(doc, os.path.basename(filename)) + +- with open(parsed_args.output_filename, 'w') as output_file: ++ with open(parsed_args.output_filename, 'wb') as output_file: + output_file.write(doc.toxml(encoding='UTF-8')) + + +diff --git a/chromium/mojo/public/tools/bindings/BUILD.gn b/chromium/mojo/public/tools/bindings/BUILD.gn +index fc04b5dd0b1..708958e438b 100644 +--- a/chromium/mojo/public/tools/bindings/BUILD.gn ++++ b/chromium/mojo/public/tools/bindings/BUILD.gn +@@ -2,9 +2,11 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import("//build/config/python.gni") + import("//mojo/public/tools/bindings/mojom.gni") + import("//third_party/jinja2/jinja2.gni") + ++# TODO(crbug.com/1194274): Investigate nondeterminism in Py3 builds. + action("precompile_templates") { + sources = mojom_generator_sources + sources += [ +diff --git a/chromium/mojo/public/tools/bindings/gen_data_files_list.py b/chromium/mojo/public/tools/bindings/gen_data_files_list.py +index 79c9e50efce..8b78d092418 100644 +--- a/chromium/mojo/public/tools/bindings/gen_data_files_list.py ++++ b/chromium/mojo/public/tools/bindings/gen_data_files_list.py +@@ -18,7 +18,6 @@ import os + import re + import sys + +-from cStringIO import StringIO + from optparse import OptionParser + + sys.path.insert( +@@ -41,12 +40,9 @@ def main(): + pattern = re.compile(options.pattern) + files = [f for f in os.listdir(options.directory) if pattern.match(f)] + +- stream = StringIO() +- for f in files: +- print(f, file=stream) ++ contents = '\n'.join(f for f in files) + '\n' ++ WriteFile(contents, options.output) + +- WriteFile(stream.getvalue(), options.output) +- stream.close() + + if __name__ == '__main__': + sys.exit(main()) +diff --git a/chromium/mojo/public/tools/bindings/generators/mojom_java_generator.py b/chromium/mojo/public/tools/bindings/generators/mojom_java_generator.py +index 96b2fdfae0c..00b9dccd00c 100644 +--- a/chromium/mojo/public/tools/bindings/generators/mojom_java_generator.py ++++ b/chromium/mojo/public/tools/bindings/generators/mojom_java_generator.py +@@ -25,6 +25,10 @@ sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir, + 'build', 'android', 'gyp')) + from util import build_utils + ++# TODO(crbug.com/1174969): Remove this once Python2 is obsoleted. ++if sys.version_info.major != 2: ++ basestring = str ++ long = int + + GENERATOR_PREFIX = 'java' + +diff --git a/chromium/mojo/public/tools/mojom/mojom/generate/generator.py b/chromium/mojo/public/tools/mojom/mojom/generate/generator.py +index de62260a5c9..4a1c73fcf82 100644 +--- a/chromium/mojo/public/tools/mojom/mojom/generate/generator.py ++++ b/chromium/mojo/public/tools/mojom/mojom/generate/generator.py +@@ -136,9 +136,14 @@ class Stylizer(object): + + def WriteFile(contents, full_path): + # If |contents| is same with the file content, we skip updating. ++ if not isinstance(contents, bytes): ++ data = contents.encode('utf8') ++ else: ++ data = contents ++ + if os.path.isfile(full_path): + with open(full_path, 'rb') as destination_file: +- if destination_file.read() == contents: ++ if destination_file.read() == data: + return + + # Make sure the containing directory exists. +@@ -146,11 +151,8 @@ def WriteFile(contents, full_path): + fileutil.EnsureDirectoryExists(full_dir) + + # Dump the data to disk. +- with open(full_path, "wb") as f: +- if not isinstance(contents, bytes): +- f.write(contents.encode('utf-8')) +- else: +- f.write(contents) ++ with open(full_path, 'wb') as f: ++ f.write(data) + + + def AddComputedData(module): +diff --git a/chromium/mojo/public/tools/mojom/mojom/generate/module.py b/chromium/mojo/public/tools/mojom/mojom/generate/module.py +index ebbc9b322ea..3d026429bbc 100644 +--- a/chromium/mojo/public/tools/mojom/mojom/generate/module.py ++++ b/chromium/mojo/public/tools/mojom/mojom/generate/module.py +@@ -398,7 +398,8 @@ class Field(object): + + + class StructField(Field): +- pass ++ def __hash__(self): ++ return super(Field, self).__hash__() + + + class UnionField(Field): +diff --git a/chromium/mojo/public/tools/mojom/mojom/generate/template_expander.py b/chromium/mojo/public/tools/mojom/mojom/generate/template_expander.py +index 7a300560246..8d9e26fb7f6 100644 +--- a/chromium/mojo/public/tools/mojom/mojom/generate/template_expander.py ++++ b/chromium/mojo/public/tools/mojom/mojom/generate/template_expander.py +@@ -75,9 +75,9 @@ def PrecompileTemplates(generator_modules, output_dir): + os.path.dirname(module.__file__), generator.GetTemplatePrefix()) + ])) + jinja_env.filters.update(generator.GetFilters()) +- jinja_env.compile_templates( +- os.path.join(output_dir, "%s.zip" % generator.GetTemplatePrefix()), +- extensions=["tmpl"], +- zip="stored", +- py_compile=True, +- ignore_errors=False) ++ jinja_env.compile_templates(os.path.join( ++ output_dir, "%s.zip" % generator.GetTemplatePrefix()), ++ extensions=["tmpl"], ++ zip="stored", ++ py_compile=sys.version_info.major < 3, ++ ignore_errors=False) +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/blink_v8_bridge.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/blink_v8_bridge.py +index 3225ecca6e4..fc078d31b55 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/blink_v8_bridge.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/blink_v8_bridge.py +@@ -344,7 +344,7 @@ def make_default_value_expr(idl_type, default_value): + """ + assert default_value.is_type_compatible_with(idl_type) + +- class DefaultValueExpr: ++ class DefaultValueExpr(object): + _ALLOWED_SYMBOLS_IN_DEPS = ("isolate") + + def __init__(self, initializer_expr, initializer_deps, +@@ -502,7 +502,7 @@ def make_v8_to_blink_value(blink_var_name, + assert isinstance(blink_var_name, str) + assert isinstance(v8_value_expr, str) + assert isinstance(idl_type, web_idl.IdlType) +- assert (argument_index is None or isinstance(argument_index, (int, long))) ++ assert (argument_index is None or isinstance(argument_index, int)) + assert (default_value is None + or isinstance(default_value, web_idl.LiteralConstant)) + +@@ -622,7 +622,7 @@ def make_v8_to_blink_value_variadic(blink_var_name, v8_array, + """ + assert isinstance(blink_var_name, str) + assert isinstance(v8_array, str) +- assert isinstance(v8_array_start_index, (int, long)) ++ assert isinstance(v8_array_start_index, int) + assert isinstance(idl_type, web_idl.IdlType) + + pattern = ("auto&& ${{{_1}}} = " +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/callback_interface.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/callback_interface.py +index 4a6df513068..8b51f23a409 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/callback_interface.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/callback_interface.py +@@ -177,7 +177,7 @@ def generate_callback_interface(callback_interface_identifier): + prop_install_mode=PropInstallMode.UNCONDITIONAL, + trampoline_var_name=None, + attribute_entries=[], +- constant_entries=filter(is_unconditional, constant_entries), ++ constant_entries=list(filter(is_unconditional, constant_entries)), + exposed_construct_entries=[], + operation_entries=[]) + (install_interface_template_decl, install_interface_template_def, +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/code_node.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/code_node.py +index 52972fefe20..e5ae9d9629e 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/code_node.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/code_node.py +@@ -503,13 +503,13 @@ class CompositeNode(CodeNode): + gensym_kwargs = {} + template_vars = {} + for arg in args: +- assert isinstance(arg, (CodeNode, int, long, str)) ++ assert isinstance(arg, (CodeNode, int, str)) + gensym = CodeNode.gensym() + gensym_args.append("${{{}}}".format(gensym)) + template_vars[gensym] = arg + for key, value in kwargs.items(): +- assert isinstance(key, (int, long, str)) +- assert isinstance(value, (CodeNode, int, long, str)) ++ assert isinstance(key, (int, str)) ++ assert isinstance(value, (CodeNode, int, str)) + gensym = CodeNode.gensym() + gensym_kwargs[key] = "${{{}}}".format(gensym) + template_vars[gensym] = value +@@ -602,7 +602,7 @@ class ListNode(CodeNode): + def insert(self, index, node): + if node is None: + return +- assert isinstance(index, (int, long)) ++ assert isinstance(index, int) + assert isinstance(node, CodeNode) + assert node.outer is None and node.prev is None + +@@ -721,7 +721,7 @@ class SymbolScopeNode(SequenceNode): + if not scope_chains: + return counts + +- self_index = iter(scope_chains).next().index(self) ++ self_index = next(iter(scope_chains)).index(self) + scope_chains = map( + lambda scope_chain: scope_chain[self_index + 1:], scope_chains) + scope_to_likeliness = {} +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_expr.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_expr.py +index a229a6c71c9..5fa288dabf2 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_expr.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_expr.py +@@ -109,7 +109,7 @@ def expr_and(terms): + + if any(term.is_always_false for term in terms): + return _Expr(False) +- terms = filter(lambda x: not x.is_always_true, terms) ++ terms = list(filter(lambda x: not x.is_always_true, terms)) + if not terms: + return _Expr(True) + if len(terms) == 1: +@@ -124,7 +124,7 @@ def expr_or(terms): + + if any(term.is_always_true for term in terms): + return _Expr(True) +- terms = filter(lambda x: not x.is_always_false, terms) ++ terms = list(filter(lambda x: not x.is_always_false, terms)) + if not terms: + return _Expr(False) + if len(terms) == 1: +@@ -222,7 +222,7 @@ def expr_from_exposure(exposure, + elif exposure.only_in_secure_contexts is False: + secure_context_term = _Expr(True) + else: +- terms = map(ref_enabled, exposure.only_in_secure_contexts) ++ terms = list(map(ref_enabled, exposure.only_in_secure_contexts)) + secure_context_term = expr_or( + [_Expr("${is_in_secure_context}"), + expr_not(expr_and(terms))]) +@@ -275,10 +275,11 @@ def expr_from_exposure(exposure, + + # [ContextEnabled] + if exposure.context_enabled_features: +- terms = map( +- lambda feature: _Expr( +- "${{context_feature_settings}}->is{}Enabled()".format( +- feature)), exposure.context_enabled_features) ++ terms = list( ++ map( ++ lambda feature: _Expr( ++ "${{context_feature_settings}}->is{}Enabled()".format( ++ feature)), exposure.context_enabled_features)) + context_enabled_terms.append( + expr_and([_Expr("${context_feature_settings}"), + expr_or(terms)])) +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_format.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_format.py +index 87d26eec3ca..f3e9d38247e 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_format.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_format.py +@@ -23,7 +23,7 @@ class _TemplateFormatter(string.Formatter): + self._template_formatter_indexing_count_ = 0 + + def get_value(self, key, args, kwargs): +- if isinstance(key, (int, long)): ++ if isinstance(key, int): + return args[key] + assert isinstance(key, str) + if not key: +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_utils.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_utils.py +index 2bcc4fed49a..e72282aa696 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_utils.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_utils.py +@@ -116,4 +116,4 @@ def write_code_node_to_file(code_node, filepath): + # stderr=format_result.error_message)) + # + # web_idl.file_io.write_to_file_if_changed(filepath, format_result.contents) +- web_idl.file_io.write_to_file_if_changed(filepath, rendered_text) ++ web_idl.file_io.write_to_file_if_changed(filepath, rendered_text.encode('utf-8')) +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/dictionary.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/dictionary.py +index b39f0100410..4d68202296b 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/dictionary.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/dictionary.py +@@ -993,7 +993,7 @@ def make_dict_trace_func(cg_context): + _2 = _blink_member_name(member).value_var + return TextNode(_format(pattern, _1=_1, _2=_2)) + +- body.extend(map(make_trace_member_node, own_members)) ++ body.extend(list(map(make_trace_member_node, own_members))) + body.append(TextNode("BaseClass::Trace(visitor);")) + + return func_decl, func_def +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py +index 10ff30656ad..bfdf7128aac 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/interface.py +@@ -582,7 +582,7 @@ def _make_blink_api_call(code_node, + overriding_args=None): + assert isinstance(code_node, SymbolScopeNode) + assert isinstance(cg_context, CodeGenContext) +- assert num_of_args is None or isinstance(num_of_args, (int, long)) ++ assert num_of_args is None or isinstance(num_of_args, int) + assert (overriding_args is None + or (isinstance(overriding_args, (list, tuple)) + and all(isinstance(arg, str) for arg in overriding_args))) +@@ -1196,8 +1196,10 @@ def make_overload_dispatcher(cg_context): + did_use_break = did_use_break or can_fail + + conditional = expr_or( +- map(lambda item: expr_from_exposure(item.function_like.exposure), +- items)) ++ list( ++ map( ++ lambda item: expr_from_exposure(item.function_like.exposure ++ ), items))) + if not conditional.is_always_true: + node = CxxUnlikelyIfNode(cond=conditional, body=node) + +@@ -4642,7 +4644,7 @@ class _PropEntryConstructorGroup(_PropEntryBase): + def __init__(self, is_context_dependent, exposure_conditional, world, + constructor_group, ctor_callback_name, ctor_func_length): + assert isinstance(ctor_callback_name, str) +- assert isinstance(ctor_func_length, (int, long)) ++ assert isinstance(ctor_func_length, int) + + _PropEntryBase.__init__(self, is_context_dependent, + exposure_conditional, world, constructor_group) +@@ -4670,7 +4672,7 @@ class _PropEntryOperationGroup(_PropEntryBase): + op_func_length, + no_alloc_direct_callback_name=None): + assert isinstance(op_callback_name, str) +- assert isinstance(op_func_length, (int, long)) ++ assert isinstance(op_func_length, int) + + _PropEntryBase.__init__(self, is_context_dependent, + exposure_conditional, world, operation_group) +@@ -5175,9 +5177,9 @@ def make_install_interface_template(cg_context, function_name, class_name, api_c + ]) + + if class_like.identifier == "CSSStyleDeclaration": +- css_properties = filter( +- lambda attr: "CSSProperty" in attr.extended_attributes, +- class_like.attributes) ++ css_properties = list( ++ filter(lambda attr: "CSSProperty" in attr.extended_attributes, ++ class_like.attributes)) + if css_properties: + prop_name_list = "".join( + map(lambda attr: "\"{}\", ".format(attr.identifier), +@@ -5567,8 +5569,8 @@ ${instance_object} = ${v8_context}->Global()->GetPrototype().As();\ + "V8DOMConfiguration::InstallConstants(${isolate}, " + "${interface_template}, ${prototype_template}, " + "kConstantCallbackTable, base::size(kConstantCallbackTable));") +- constant_callback_entries = filter(lambda entry: entry.const_callback_name, +- constant_entries) ++ constant_callback_entries = list(filter(lambda entry: entry.const_callback_name, ++ constant_entries)) + install_properties(table_name, constant_callback_entries, + _make_constant_callback_registration_table, + installer_call_text) +@@ -5584,8 +5586,8 @@ ${instance_object} = ${v8_context}->Global()->GetPrototype().As();\ + "V8DOMConfiguration::InstallConstants(${isolate}, " + "${interface_template}, ${prototype_template}, " + "kConstantValueTable, base::size(kConstantValueTable));") +- constant_value_entries = filter( +- lambda entry: not entry.const_callback_name, constant_entries) ++ constant_value_entries = list(filter( ++ lambda entry: not entry.const_callback_name, constant_entries)) + install_properties(table_name, constant_value_entries, + _make_constant_value_registration_table, + installer_call_text) +@@ -6336,8 +6338,8 @@ def make_v8_context_snapshot_api(cg_context, component, attribute_entries, + assert isinstance(component, web_idl.Component) + + derived_interfaces = cg_context.interface.deriveds +- derived_names = map(lambda interface: interface.identifier, +- derived_interfaces) ++ derived_names = list( ++ map(lambda interface: interface.identifier, derived_interfaces)) + derived_names.append(cg_context.interface.identifier) + if not ("Window" in derived_names or "HTMLDocument" in derived_names): + return None, None +@@ -6411,9 +6413,11 @@ def _make_v8_context_snapshot_get_reference_table_function( + collect_callbacks(named_properties_object_callback_defs) + collect_callbacks(cross_origin_property_callback_defs) + +- entry_nodes = map( +- lambda name: TextNode("reinterpret_cast({}),".format(name)), +- filter(None, callback_names)) ++ entry_nodes = list( ++ map( ++ lambda name: TextNode("reinterpret_cast({}),".format(name ++ )), ++ filter(None, callback_names))) + table_node = ListNode([ + TextNode("using namespace ${class_name}Callbacks;"), + TextNode("static const intptr_t kReferenceTable[] = {"), +@@ -6451,10 +6455,11 @@ def _make_v8_context_snapshot_install_props_per_context_function( + class_name=None, + prop_install_mode=PropInstallMode.V8_CONTEXT_SNAPSHOT, + trampoline_var_name=None, +- attribute_entries=filter(selector, attribute_entries), +- constant_entries=filter(selector, constant_entries), +- exposed_construct_entries=filter(selector, exposed_construct_entries), +- operation_entries=filter(selector, operation_entries)) ++ attribute_entries=list(filter(selector, attribute_entries)), ++ constant_entries=list(filter(selector, constant_entries)), ++ exposed_construct_entries=list( ++ filter(selector, exposed_construct_entries)), ++ operation_entries=list(filter(selector, operation_entries))) + + return func_decl, func_def + +@@ -6810,11 +6815,11 @@ def generate_interface(interface_identifier): + class_name=impl_class_name, + prop_install_mode=PropInstallMode.UNCONDITIONAL, + trampoline_var_name=tp_install_unconditional_props, +- attribute_entries=filter(is_unconditional, attribute_entries), +- constant_entries=filter(is_unconditional, constant_entries), +- exposed_construct_entries=filter(is_unconditional, +- exposed_construct_entries), +- operation_entries=filter(is_unconditional, operation_entries)) ++ attribute_entries=list(filter(is_unconditional, attribute_entries)), ++ constant_entries=list(filter(is_unconditional, constant_entries)), ++ exposed_construct_entries=list( ++ filter(is_unconditional, exposed_construct_entries)), ++ operation_entries=list(filter(is_unconditional, operation_entries))) + (install_context_independent_props_decl, + install_context_independent_props_def, + install_context_independent_props_trampoline) = make_install_properties( +@@ -6823,11 +6828,14 @@ def generate_interface(interface_identifier): + class_name=impl_class_name, + prop_install_mode=PropInstallMode.CONTEXT_INDEPENDENT, + trampoline_var_name=tp_install_context_independent_props, +- attribute_entries=filter(is_context_independent, attribute_entries), +- constant_entries=filter(is_context_independent, constant_entries), +- exposed_construct_entries=filter(is_context_independent, +- exposed_construct_entries), +- operation_entries=filter(is_context_independent, operation_entries)) ++ attribute_entries=list( ++ filter(is_context_independent, attribute_entries)), ++ constant_entries=list(filter(is_context_independent, ++ constant_entries)), ++ exposed_construct_entries=list( ++ filter(is_context_independent, exposed_construct_entries)), ++ operation_entries=list( ++ filter(is_context_independent, operation_entries))) + (install_context_dependent_props_decl, install_context_dependent_props_def, + install_context_dependent_props_trampoline) = make_install_properties( + cg_context, +@@ -6835,11 +6843,13 @@ def generate_interface(interface_identifier): + class_name=impl_class_name, + prop_install_mode=PropInstallMode.CONTEXT_DEPENDENT, + trampoline_var_name=tp_install_context_dependent_props, +- attribute_entries=filter(is_context_dependent, attribute_entries), +- constant_entries=filter(is_context_dependent, constant_entries), +- exposed_construct_entries=filter(is_context_dependent, +- exposed_construct_entries), +- operation_entries=filter(is_context_dependent, operation_entries)) ++ attribute_entries=list(filter(is_context_dependent, ++ attribute_entries)), ++ constant_entries=list(filter(is_context_dependent, constant_entries)), ++ exposed_construct_entries=list( ++ filter(is_context_dependent, exposed_construct_entries)), ++ operation_entries=list(filter(is_context_dependent, ++ operation_entries))) + (install_interface_template_decl, install_interface_template_def, + install_interface_template_trampoline) = make_install_interface_template( + cg_context, +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/mako_renderer.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/mako_renderer.py +index b4c70553863..f3a2fcd772d 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/mako_renderer.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/mako_renderer.py +@@ -105,7 +105,7 @@ class MakoRenderer(object): + on_error = self._caller_stack_on_error + if (len(current) <= len(on_error) + and all(current[i] == on_error[i] +- for i in xrange(len(current)))): ++ for i in range(len(current)))): + pass # Error happened in a deeper caller. + else: + self._caller_stack_on_error = list(self._caller_stack) +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py +index dc3493cc394..017d3d47bb3 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/style_format.py +@@ -70,8 +70,13 @@ def gn_format(contents, filename=None): + + + def _invoke_format_command(command_line, filename, contents): +- proc = subprocess.Popen( +- command_line, stdin=subprocess.PIPE, stdout=subprocess.PIPE) ++ kwargs = {} ++ if sys.version_info.major != 2: ++ kwargs['encoding'] = 'utf-8' ++ proc = subprocess.Popen(command_line, ++ stdin=subprocess.PIPE, ++ stdout=subprocess.PIPE, ++ **kwargs) + stdout_output, stderr_output = proc.communicate(input=contents) + exit_code = proc.wait() + +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/task_queue.py b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/task_queue.py +index 0d8f4c0f303..e666a9b668e 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/task_queue.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/bind_gen/task_queue.py +@@ -2,6 +2,7 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import functools + import multiprocessing + + from .package_initializer import package_initializer +@@ -76,7 +77,7 @@ class TaskQueue(object): + if not report_progress: + return + +- done_count = reduce( ++ done_count = functools.reduce( + lambda count, worker_task: count + bool(worker_task.ready()), + self._worker_tasks, 0) + report_progress(len(self._worker_tasks), done_count) +@@ -85,4 +86,4 @@ class TaskQueue(object): + def _task_queue_run_tasks(tasks): + for task in tasks: + func, args, kwargs = task +- apply(func, args, kwargs) ++ func(*args, **kwargs) +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/code_generator.py b/chromium/third_party/blink/renderer/bindings/scripts/code_generator.py +index e8280be7213..e49e6eb965e 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/code_generator.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/code_generator.py +@@ -13,6 +13,7 @@ import re + import sys + + from idl_types import set_ancestors, IdlType ++from itertools import groupby + from v8_globals import includes + from v8_interface import constant_filters + from v8_types import set_component_dirs +@@ -43,6 +44,7 @@ TEMPLATES_DIR = os.path.normpath( + # after path[0] == invoking script dir + sys.path.insert(1, THIRD_PARTY_DIR) + import jinja2 ++from jinja2.filters import make_attrgetter, environmentfilter + + + def generate_indented_conditional(code, conditional): +@@ -88,6 +90,13 @@ def runtime_enabled_if(code, name): + return generate_indented_conditional(code, function) + + ++@environmentfilter ++def do_stringify_key_group_by(environment, value, attribute): ++ expr = make_attrgetter(environment, attribute) ++ key = lambda item: '' if expr(item) is None else str(expr(item)) ++ return groupby(sorted(value, key=key), expr) ++ ++ + def initialize_jinja_env(cache_dir): + jinja_env = jinja2.Environment( + loader=jinja2.FileSystemLoader(TEMPLATES_DIR), +@@ -117,6 +126,7 @@ def initialize_jinja_env(cache_dir): + }) + jinja_env.filters.update(constant_filters()) + jinja_env.filters.update(method_filters()) ++ jinja_env.filters["stringifykeygroupby"] = do_stringify_key_group_by + return jinja_env + + +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/generate_origin_trial_features.py b/chromium/third_party/blink/renderer/bindings/scripts/generate_origin_trial_features.py +index 130004eae83..04c0fabcef2 100755 +--- a/chromium/third_party/blink/renderer/bindings/scripts/generate_origin_trial_features.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/generate_origin_trial_features.py +@@ -80,7 +80,7 @@ def read_idl_file(reader, idl_filename): + assert len(interfaces) == 1, ( + "Expected one interface in file %r, found %d" % + (idl_filename, len(interfaces))) +- return (interfaces.values()[0], includes) ++ return (list(interfaces.values())[0], includes) + + + def interface_is_global(interface): +@@ -281,7 +281,7 @@ def main(): + + info_provider = create_component_info_provider( + os.path.normpath(options.info_dir), options.target_component) +- idl_filenames = map(str.strip, open(options.idl_files_list)) ++ idl_filenames = list(map(str.strip, open(options.idl_files_list))) + + generate_origin_trial_features(info_provider, options, idl_filenames) + return 0 +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/idl_definitions.py b/chromium/third_party/blink/renderer/bindings/scripts/idl_definitions.py +index 14e6e9d3f87..b027818aef2 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/idl_definitions.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/idl_definitions.py +@@ -394,7 +394,8 @@ class IdlInterface(object): + else: + raise ValueError('Unrecognized node class: %s' % child_class) + +- if len(filter(None, [self.iterable, self.maplike, self.setlike])) > 1: ++ if len(list(filter(None, ++ [self.iterable, self.maplike, self.setlike]))) > 1: + raise ValueError( + 'Interface can only have one of iterable<>, maplike<> and setlike<>.' + ) +@@ -512,6 +513,9 @@ class IdlAttribute(TypedObject): + def accept(self, visitor): + visitor.visit_attribute(self) + ++ def __lt__(self, other): ++ return self.name < other.name ++ + + ################################################################################ + # Constants +@@ -852,7 +856,7 @@ class IdlIncludes(object): + ################################################################################ + + +-class Exposure: ++class Exposure(object): + """An Exposure holds one Exposed or RuntimeEnabled condition. + Each exposure has two properties: exposed and runtime_enabled. + Exposure(e, r) corresponds to [Exposed(e r)]. Exposure(e) corresponds to +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/idl_reader.py b/chromium/third_party/blink/renderer/bindings/scripts/idl_reader.py +index 8d72865a6ca..b80eebdcd61 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/idl_reader.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/idl_reader.py +@@ -55,8 +55,8 @@ def validate_blink_idl_definitions(idl_filename, idl_file_basename, + definitions. There is no filename convention in this case. + - Otherwise, an IDL file is invalid. + """ +- targets = ( +- definitions.interfaces.values() + definitions.dictionaries.values()) ++ targets = (list(definitions.interfaces.values()) + ++ list(definitions.dictionaries.values())) + number_of_targets = len(targets) + if number_of_targets > 1: + raise Exception( +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/idl_types.py b/chromium/third_party/blink/renderer/bindings/scripts/idl_types.py +index cd4f0c3513b..ab95e9c0b08 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/idl_types.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/idl_types.py +@@ -349,7 +349,7 @@ class IdlUnionType(IdlTypeBase): + return True + + def single_matching_member_type(self, predicate): +- matching_types = filter(predicate, self.flattened_member_types) ++ matching_types = list(filter(predicate, self.flattened_member_types)) + if len(matching_types) > 1: + raise ValueError('%s is ambiguous.' % self.name) + return matching_types[0] if matching_types else None +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/utilities.py b/chromium/third_party/blink/renderer/bindings/scripts/utilities.py +index e1677ee7bd6..3c5006f064f 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/utilities.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/utilities.py +@@ -196,8 +196,9 @@ class ComponentInfoProviderModules(ComponentInfoProvider): + + @property + def callback_functions(self): +- return dict(self._component_info_core['callback_functions'].items() + +- self._component_info_modules['callback_functions'].items()) ++ return dict( ++ list(self._component_info_core['callback_functions'].items()) + ++ list(self._component_info_modules['callback_functions'].items())) + + @property + def specifier_for_export(self): +@@ -209,8 +210,8 @@ class ComponentInfoProviderModules(ComponentInfoProvider): + + + def load_interfaces_info_overall_pickle(info_dir): +- with open(os.path.join(info_dir, +- 'interfaces_info.pickle')) as interface_info_file: ++ with open(os.path.join(info_dir, 'interfaces_info.pickle'), ++ mode='rb') as interface_info_file: + return pickle.load(interface_info_file) + + +@@ -236,23 +237,20 @@ def merge_dict_recursively(target, diff): + + def create_component_info_provider_core(info_dir): + interfaces_info = load_interfaces_info_overall_pickle(info_dir) +- with open( +- os.path.join(info_dir, 'core', +- 'component_info_core.pickle')) as component_info_file: ++ with open(os.path.join(info_dir, 'core', 'component_info_core.pickle'), ++ mode='rb') as component_info_file: + component_info = pickle.load(component_info_file) + return ComponentInfoProviderCore(interfaces_info, component_info) + + + def create_component_info_provider_modules(info_dir): + interfaces_info = load_interfaces_info_overall_pickle(info_dir) +- with open( +- os.path.join(info_dir, 'core', +- 'component_info_core.pickle')) as component_info_file: ++ with open(os.path.join(info_dir, 'core', 'component_info_core.pickle'), ++ mode='rb') as component_info_file: + component_info_core = pickle.load(component_info_file) +- with open( +- os.path.join( +- info_dir, 'modules', +- 'component_info_modules.pickle')) as component_info_file: ++ with open(os.path.join(info_dir, 'modules', ++ 'component_info_modules.pickle'), ++ mode='rb') as component_info_file: + component_info_modules = pickle.load(component_info_file) + return ComponentInfoProviderModules(interfaces_info, component_info_core, + component_info_modules) +@@ -356,7 +354,7 @@ def write_pickle_file(pickle_filename, data): + pickle_filename = abs(pickle_filename) + # If |data| is same with the file content, we skip updating. + if os.path.isfile(pickle_filename): +- with open(pickle_filename) as pickle_file: ++ with open(pickle_filename, 'rb') as pickle_file: + try: + if pickle.load(pickle_file) == data: + return +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/v8_interface.py b/chromium/third_party/blink/renderer/bindings/scripts/v8_interface.py +index a43260414db..a85b03abe75 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/v8_interface.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/v8_interface.py +@@ -189,7 +189,7 @@ def context_enabled_features(attributes): + return sorted([ + member for member in members + if member.get(KEY) and not member.get('exposed_test') +- ]) ++ ], key=lambda item: item['name']) + + def member_filter_by_name(members, name): + return [member for member in members if member[KEY] == name] +@@ -612,7 +612,8 @@ def interface_context(interface, interfaces, component_info): + sorted( + origin_trial_features(interface, context['constants'], + context['attributes'], context['methods']) + +- context_enabled_features(context['attributes'])), ++ context_enabled_features(context['attributes']), ++ key=lambda item: item['name']), + }) + if context['optional_features']: + includes.add('platform/bindings/v8_per_context_data.h') +@@ -1356,9 +1357,9 @@ def resolution_tests_methods(effective_overloads): + + # Extract argument and IDL type to simplify accessing these in each loop. + arguments = [method['arguments'][index] for method in methods] +- arguments_methods = zip(arguments, methods) ++ arguments_methods = list(zip(arguments, methods)) + idl_types = [argument['idl_type_object'] for argument in arguments] +- idl_types_methods = zip(idl_types, methods) ++ idl_types_methods = list(zip(idl_types, methods)) + + # We can’t do a single loop through all methods or simply sort them, because + # a method may be listed in multiple steps of the resolution algorithm, and +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/v8_methods.py b/chromium/third_party/blink/renderer/bindings/scripts/v8_methods.py +index 5f1f89a3def..6ee8a407798 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/v8_methods.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/v8_methods.py +@@ -46,6 +46,10 @@ import v8_types + import v8_utilities + from v8_utilities import (has_extended_attribute_value, is_unforgeable) + ++# TODO: Remove this once Python2 is obsoleted. ++if sys.version_info.major != 2: ++ basestring = str ++ + + def method_is_visible(method, interface_is_partial): + if 'overloads' in method: +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/v8_utilities.py b/chromium/third_party/blink/renderer/bindings/scripts/v8_utilities.py +index 2ecd6923320..fcfc48371b1 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/v8_utilities.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/v8_utilities.py +@@ -271,7 +271,7 @@ EXPOSED_WORKERS = set([ + ]) + + +-class ExposureSet: ++class ExposureSet(object): + """An ExposureSet is a collection of Exposure instructions.""" + + def __init__(self, exposures=None): +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/callback_interface.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/callback_interface.py +index 13fb7c7068d..b73b7710687 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/callback_interface.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/callback_interface.py +@@ -91,11 +91,13 @@ class CallbackInterface(UserDefinedType, WithExtendedAttributes, + for operation_ir in ir.operations + ]) + self._operation_groups = tuple([ +- OperationGroup( +- operation_group_ir, +- filter(lambda x: x.identifier == operation_group_ir.identifier, +- self._operations), +- owner=self) for operation_group_ir in ir.operation_groups ++ OperationGroup(operation_group_ir, ++ list( ++ filter( ++ lambda x: x.identifier == operation_group_ir ++ .identifier, self._operations)), ++ owner=self) ++ for operation_group_ir in ir.operation_groups + ]) + + @property +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/database.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/database.py +index c92cf48eb2a..f5d59129449 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/database.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/database.py +@@ -156,4 +156,4 @@ class Database(object): + return self._view_by_kind(Database._Kind.UNION) + + def _view_by_kind(self, kind): +- return self._impl.find_by_kind(kind).values() ++ return list(self._impl.find_by_kind(kind).values()) +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/exposure.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/exposure.py +index abaeef39c30..e36cf7439ae 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/exposure.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/exposure.py +@@ -8,8 +8,11 @@ from .runtime_enabled_features import RuntimeEnabledFeatures + class _Feature(str): + """Represents a runtime-enabled feature.""" + ++ def __new__(cls, value): ++ return str.__new__(cls, value) ++ + def __init__(self, value): +- str.__init__(self, value) ++ str.__init__(self) + self._is_context_dependent = ( + RuntimeEnabledFeatures.is_context_dependent(self)) + +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/function_like.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/function_like.py +index 648c70d803d..1712f19c672 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/function_like.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/function_like.py +@@ -71,8 +71,9 @@ class FunctionLike(WithIdentifier): + def num_of_required_arguments(self): + """Returns the number of required arguments.""" + return len( +- filter(lambda arg: not (arg.is_optional or arg.is_variadic), +- self.arguments)) ++ list( ++ filter(lambda arg: not (arg.is_optional or arg.is_variadic), ++ self.arguments))) + + + class OverloadGroup(WithIdentifier): +@@ -171,8 +172,7 @@ class OverloadGroup(WithIdentifier): + Returns the effective overload set. + https://heycam.github.io/webidl/#compute-the-effective-overload-set + """ +- assert argument_count is None or isinstance(argument_count, +- (int, long)) ++ assert argument_count is None or isinstance(argument_count, int) + + N = argument_count + S = [] +@@ -188,21 +188,21 @@ class OverloadGroup(WithIdentifier): + + S.append( + OverloadGroup.EffectiveOverloadItem( +- X, map(lambda arg: arg.idl_type, X.arguments), +- map(lambda arg: arg.optionality, X.arguments))) ++ X, list(map(lambda arg: arg.idl_type, X.arguments)), ++ list(map(lambda arg: arg.optionality, X.arguments)))) + + if X.is_variadic: +- for i in xrange(n, max(maxarg, N)): +- t = map(lambda arg: arg.idl_type, X.arguments) +- o = map(lambda arg: arg.optionality, X.arguments) +- for _ in xrange(n, i + 1): ++ for i in range(n, max(maxarg, N)): ++ t = list(map(lambda arg: arg.idl_type, X.arguments)) ++ o = list(map(lambda arg: arg.optionality, X.arguments)) ++ for _ in range(n, i + 1): + t.append(X.arguments[-1].idl_type) + o.append(X.arguments[-1].optionality) + S.append(OverloadGroup.EffectiveOverloadItem(X, t, o)) + +- t = map(lambda arg: arg.idl_type, X.arguments) +- o = map(lambda arg: arg.optionality, X.arguments) +- for i in xrange(n - 1, -1, -1): ++ t = list(map(lambda arg: arg.idl_type, X.arguments)) ++ o = list(map(lambda arg: arg.optionality, X.arguments)) ++ for i in range(n - 1, -1, -1): + if X.arguments[i].optionality == IdlType.Optionality.REQUIRED: + break + S.append(OverloadGroup.EffectiveOverloadItem(X, t[:i], o[:i])) +@@ -222,7 +222,7 @@ class OverloadGroup(WithIdentifier): + for item in items) + assert len(items) > 1 + +- for index in xrange(len(items[0].type_list)): ++ for index in range(len(items[0].type_list)): + # Assume that the given items are valid, and we only need to test + # the two types. + if OverloadGroup.are_distinguishable_types( +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/idl_compiler.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/idl_compiler.py +index c5ee2bd8a3d..58315072480 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/idl_compiler.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/idl_compiler.py +@@ -149,8 +149,8 @@ class IdlCompiler(object): + for old_ir in old_irs: + new_ir = make_copy(old_ir) + self._ir_map.add(new_ir) +- new_ir.attributes = filter(not_disabled, new_ir.attributes) +- new_ir.operations = filter(not_disabled, new_ir.operations) ++ new_ir.attributes = list(filter(not_disabled, new_ir.attributes)) ++ new_ir.operations = list(filter(not_disabled, new_ir.operations)) + + def _record_defined_in_partial_and_mixin(self): + old_irs = self._ir_map.irs_of_kinds( +@@ -231,7 +231,7 @@ class IdlCompiler(object): + only_to_members_of_partial_or_mixin=False) + propagate_to_exposure(propagate) + +- map(process_member_like, ir.iter_all_members()) ++ list(map(process_member_like, ir.iter_all_members())) + + def process_member_like(ir): + propagate = functools.partial(propagate_extattr, ir=ir) +@@ -257,7 +257,7 @@ class IdlCompiler(object): + + self._ir_map.move_to_new_phase() + +- map(process_interface_like, old_irs) ++ list(map(process_interface_like, old_irs)) + + def _determine_blink_headers(self): + irs = self._ir_map.irs_of_kinds( +@@ -422,9 +422,9 @@ class IdlCompiler(object): + assert not new_interface.deriveds + derived_set = identifier_to_derived_set.get( + new_interface.identifier, set()) +- new_interface.deriveds = map( +- lambda id_: self._ref_to_idl_def_factory.create(id_), +- sorted(derived_set)) ++ new_interface.deriveds = list( ++ map(lambda id_: self._ref_to_idl_def_factory.create(id_), ++ sorted(derived_set))) + + def _supplement_missing_html_constructor_operation(self): + # Temporary mitigation of misuse of [HTMLConstructor] +@@ -553,7 +553,8 @@ class IdlCompiler(object): + self._ir_map.add(new_ir) + + for group in new_ir.iter_all_overload_groups(): +- exposures = map(lambda overload: overload.exposure, group) ++ exposures = list(map(lambda overload: overload.exposure, ++ group)) + + # [Exposed] + if any(not exposure.global_names_and_features +@@ -653,8 +654,8 @@ class IdlCompiler(object): + constructs = set() + for global_name in global_names: + constructs.update(exposed_map.get(global_name, [])) +- new_ir.exposed_constructs = map( +- self._ref_to_idl_def_factory.create, sorted(constructs)) ++ new_ir.exposed_constructs = list( ++ map(self._ref_to_idl_def_factory.create, sorted(constructs))) + + assert not new_ir.legacy_window_aliases + if new_ir.identifier != 'Window': +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/interface.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/interface.py +index 65d24e529d1..067ef2eb0b2 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/interface.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/interface.py +@@ -180,8 +180,9 @@ class Interface(UserDefinedType, WithExtendedAttributes, WithCodeGeneratorInfo, + self._constructor_groups = tuple([ + ConstructorGroup( + group_ir, +- filter(lambda x: x.identifier == group_ir.identifier, +- self._constructors), ++ list( ++ filter(lambda x: x.identifier == group_ir.identifier, ++ self._constructors)), + owner=self) for group_ir in ir.constructor_groups + ]) + assert len(self._constructor_groups) <= 1 +@@ -192,8 +193,9 @@ class Interface(UserDefinedType, WithExtendedAttributes, WithCodeGeneratorInfo, + self._named_constructor_groups = tuple([ + ConstructorGroup( + group_ir, +- filter(lambda x: x.identifier == group_ir.identifier, +- self._named_constructors), ++ list( ++ filter(lambda x: x.identifier == group_ir.identifier, ++ self._named_constructors)), + owner=self) for group_ir in ir.named_constructor_groups + ]) + self._operations = tuple([ +@@ -203,22 +205,23 @@ class Interface(UserDefinedType, WithExtendedAttributes, WithCodeGeneratorInfo, + self._operation_groups = tuple([ + OperationGroup( + group_ir, +- filter(lambda x: x.identifier == group_ir.identifier, +- self._operations), ++ list( ++ filter(lambda x: x.identifier == group_ir.identifier, ++ self._operations)), + owner=self) for group_ir in ir.operation_groups + ]) + self._exposed_constructs = tuple(ir.exposed_constructs) + self._legacy_window_aliases = tuple(ir.legacy_window_aliases) + self._indexed_and_named_properties = None +- indexed_and_named_property_operations = filter( +- lambda x: x.is_indexed_or_named_property_operation, +- self._operations) ++ indexed_and_named_property_operations = list( ++ filter(lambda x: x.is_indexed_or_named_property_operation, ++ self._operations)) + if indexed_and_named_property_operations: + self._indexed_and_named_properties = IndexedAndNamedProperties( + indexed_and_named_property_operations, owner=self) + self._stringifier = None +- stringifier_operation_irs = filter(lambda x: x.is_stringifier, +- ir.operations) ++ stringifier_operation_irs = list( ++ filter(lambda x: x.is_stringifier, ir.operations)) + if stringifier_operation_irs: + assert len(stringifier_operation_irs) == 1 + op_ir = make_copy(stringifier_operation_irs[0]) +@@ -231,8 +234,9 @@ class Interface(UserDefinedType, WithExtendedAttributes, WithCodeGeneratorInfo, + attribute = None + if operation.stringifier_attribute: + attr_id = operation.stringifier_attribute +- attributes = filter(lambda x: x.identifier == attr_id, +- self._attributes) ++ attributes = list( ++ filter(lambda x: x.identifier == attr_id, ++ self._attributes)) + assert len(attributes) == 1 + attribute = attributes[0] + self._stringifier = Stringifier(operation, attribute, owner=self) +@@ -578,8 +582,9 @@ class Iterable(WithDebugInfo): + self._operation_groups = tuple([ + OperationGroup( + group_ir, +- filter(lambda x: x.identifier == group_ir.identifier, +- self._operations), ++ list( ++ filter(lambda x: x.identifier == group_ir.identifier, ++ self._operations)), + owner=owner) for group_ir in ir.operation_groups + ]) + +@@ -666,8 +671,9 @@ class Maplike(WithDebugInfo): + self._operation_groups = tuple([ + OperationGroup( + group_ir, +- filter(lambda x: x.identifier == group_ir.identifier, +- self._operations), ++ list( ++ filter(lambda x: x.identifier == group_ir.identifier, ++ self._operations)), + owner=owner) for group_ir in ir.operation_groups + ]) + +@@ -755,8 +761,9 @@ class Setlike(WithDebugInfo): + self._operation_groups = tuple([ + OperationGroup( + group_ir, +- filter(lambda x: x.identifier == group_ir.identifier, +- self._operations), ++ list( ++ filter(lambda x: x.identifier == group_ir.identifier, ++ self._operations)), + owner=owner) for group_ir in ir.operation_groups + ]) + +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/ir_builder.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/ir_builder.py +index e9aeff4ab82..d80554d603e 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/ir_builder.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/ir_builder.py +@@ -2,6 +2,8 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import sys ++ + from .argument import Argument + from .ast_group import AstGroup + from .attribute import Attribute +@@ -30,6 +32,11 @@ from .operation import Operation + from .typedef import Typedef + + ++# TODO: Remove this once Python2 is obsoleted. ++if sys.version_info.major != 2: ++ long = int ++ ++ + def load_and_register_idl_definitions(filepaths, register_ir, + create_ref_to_idl_def, idl_type_factory): + """ +@@ -160,7 +167,7 @@ class _IRBuilder(object): + child_nodes = list(node.GetChildren()) + extended_attributes = self._take_extended_attributes(child_nodes) + +- members = map(self._build_interface_member, child_nodes) ++ members = list(map(self._build_interface_member, child_nodes)) + attributes = [] + constants = [] + operations = [] +@@ -302,7 +309,7 @@ class _IRBuilder(object): + child_nodes = list(node.GetChildren()) + inherited = self._take_inheritance(child_nodes) + extended_attributes = self._take_extended_attributes(child_nodes) +- own_members = map(self._build_dictionary_member, child_nodes) ++ own_members = list(map(self._build_dictionary_member, child_nodes)) + + return Dictionary.IR( + identifier=Identifier(node.GetName()), +@@ -336,7 +343,7 @@ class _IRBuilder(object): + + child_nodes = list(node.GetChildren()) + extended_attributes = self._take_extended_attributes(child_nodes) +- members = map(self._build_interface_member, child_nodes) ++ members = list(map(self._build_interface_member, child_nodes)) + constants = [] + operations = [] + for member in members: +@@ -456,8 +463,8 @@ class _IRBuilder(object): + assert len(child_nodes) == 1 + child = child_nodes[0] + if child.GetClass() == 'Arguments': +- arguments = map(build_extattr_argument, +- child.GetChildren()) ++ arguments = list( ++ map(build_extattr_argument, child.GetChildren())) + elif child.GetClass() == 'Call': + assert len(child.GetChildren()) == 1 + grand_child = child.GetChildren()[0] +@@ -486,7 +493,9 @@ class _IRBuilder(object): + + assert node.GetClass() == 'ExtAttributes' + return ExtendedAttributes( +- filter(None, map(build_extended_attribute, node.GetChildren()))) ++ list( ++ filter(None, map(build_extended_attribute, ++ node.GetChildren())))) + + def _build_inheritance(self, node): + assert node.GetClass() == 'Inherit' +@@ -506,7 +515,7 @@ class _IRBuilder(object): + + def _build_iterable(self, node): + assert node.GetClass() == 'Iterable' +- types = map(self._build_type, node.GetChildren()) ++ types = list(map(self._build_type, node.GetChildren())) + assert len(types) == 1 or len(types) == 2 + if len(types) == 1: # value iterator + key_type, value_type = (None, types[0]) +@@ -584,7 +593,7 @@ class _IRBuilder(object): + def _build_maplike(self, node, interface_identifier): + assert node.GetClass() == 'Maplike' + assert isinstance(interface_identifier, Identifier) +- types = map(self._build_type, node.GetChildren()) ++ types = list(map(self._build_type, node.GetChildren())) + assert len(types) == 2 + key_type, value_type = types + is_readonly = bool(node.GetProperty('READONLY')) +@@ -676,7 +685,7 @@ class _IRBuilder(object): + def _build_setlike(self, node, interface_identifier): + assert node.GetClass() == 'Setlike' + assert isinstance(interface_identifier, Identifier) +- types = map(self._build_type, node.GetChildren()) ++ types = list(map(self._build_type, node.GetChildren())) + assert len(types) == 1 + value_type = types[0] + is_readonly = bool(node.GetProperty('READONLY')) +@@ -838,7 +847,7 @@ class _IRBuilder(object): + + def build_union_type(node, extended_attributes): + return self._idl_type_factory.union_type( +- member_types=map(self._build_type, node.GetChildren()), ++ member_types=list(map(self._build_type, node.GetChildren())), + is_optional=is_optional, + extended_attributes=extended_attributes, + debug_info=self._build_debug_info(node)) +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/make_copy.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/make_copy.py +index a7a2b11f3f0..2f6b61300ff 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/make_copy.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/make_copy.py +@@ -3,6 +3,13 @@ + # found in the LICENSE file. + + ++import sys ++ ++# TODO: Remove this once Python2 is obsoleted. ++if sys.version_info.major != 2: ++ long = int ++ basestring = str ++ + def make_copy(obj, memo=None): + """ + Creates a copy of the given object, which should be an IR or part of IR. +diff --git a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/namespace.py b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/namespace.py +index eeabef97cbe..bd7e98907f3 100644 +--- a/chromium/third_party/blink/renderer/bindings/scripts/web_idl/namespace.py ++++ b/chromium/third_party/blink/renderer/bindings/scripts/web_idl/namespace.py +@@ -107,11 +107,13 @@ class Namespace(UserDefinedType, WithExtendedAttributes, WithCodeGeneratorInfo, + for operation_ir in ir.operations + ]) + self._operation_groups = tuple([ +- OperationGroup( +- operation_group_ir, +- filter(lambda x: x.identifier == operation_group_ir.identifier, +- self._operations), +- owner=self) for operation_group_ir in ir.operation_groups ++ OperationGroup(operation_group_ir, ++ list( ++ filter( ++ lambda x: x.identifier == operation_group_ir ++ .identifier, self._operations)), ++ owner=self) ++ for operation_group_ir in ir.operation_groups + ]) + + @property +diff --git a/chromium/third_party/blink/renderer/bindings/templates/dictionary_v8.cc.tmpl b/chromium/third_party/blink/renderer/bindings/templates/dictionary_v8.cc.tmpl +index 0add9c45a38..dc910f6d227 100644 +--- a/chromium/third_party/blink/renderer/bindings/templates/dictionary_v8.cc.tmpl ++++ b/chromium/third_party/blink/renderer/bindings/templates/dictionary_v8.cc.tmpl +@@ -59,9 +59,9 @@ void {{v8_class}}::ToImpl(v8::Isolate* isolate, v8::Local v8_value, { + DCHECK(executionContext); + {% endif %}{# has_origin_trial_members #} + {% endif %}{# members #} +- {% for origin_trial_test, origin_trial_member_list in members | groupby('origin_trial_feature_name') %} ++ {% for origin_trial_test, origin_trial_member_list in members | stringifykeygroupby('origin_trial_feature_name') %} + {% filter origin_trial_enabled(origin_trial_test, "executionContext") %} +- {% for feature_name, member_list in origin_trial_member_list | groupby('runtime_enabled_feature_name') %} ++ {% for feature_name, member_list in origin_trial_member_list | stringifykeygroupby('runtime_enabled_feature_name') %} + {% filter runtime_enabled(feature_name) %} + {% for member in member_list %} + v8::Local {{member.v8_value}}; +@@ -147,9 +147,9 @@ bool toV8{{cpp_class}}(const {{cpp_class}}* impl, v8::Local dictiona + DCHECK(executionContext); + {% endif %}{# has_origin_trial_members #} + {% endif %}{# members #} +- {% for origin_trial_test, origin_trial_member_list in members | groupby('origin_trial_feature_name') %} ++ {% for origin_trial_test, origin_trial_member_list in members | stringifykeygroupby('origin_trial_feature_name') %} + {% filter origin_trial_enabled(origin_trial_test, "executionContext") %} +- {% for feature_name, member_list in origin_trial_member_list | groupby('runtime_enabled_feature_name') %} ++ {% for feature_name, member_list in origin_trial_member_list | stringifykeygroupby('runtime_enabled_feature_name') %} + {% filter runtime_enabled(feature_name) %} + {% for member in member_list %} + v8::Local {{member.v8_value}}; +diff --git a/chromium/third_party/blink/renderer/build/scripts/core/css/make_style_shorthands.py b/chromium/third_party/blink/renderer/build/scripts/core/css/make_style_shorthands.py +index 1799cd5a153..5f43ffabc26 100755 +--- a/chromium/third_party/blink/renderer/build/scripts/core/css/make_style_shorthands.py ++++ b/chromium/third_party/blink/renderer/build/scripts/core/css/make_style_shorthands.py +@@ -71,7 +71,7 @@ class Expansion(object): + def enabled_longhands(self): + include = lambda longhand: not longhand[ + 'runtime_flag'] or self.is_enabled(longhand['runtime_flag']) +- return filter(include, self._longhands) ++ return list(filter(include, self._longhands)) + + @property + def index(self): +@@ -87,8 +87,9 @@ class Expansion(object): + + def create_expansions(longhands): + flags = collect_runtime_flags(longhands) +- expansions = map(lambda mask: Expansion(longhands, flags, mask), +- range(1 << len(flags))) ++ expansions = list( ++ map(lambda mask: Expansion(longhands, flags, mask), ++ range(1 << len(flags)))) + assert len(expansions) > 0 + # We generate 2^N expansions for N flags, so enforce some limit. + assert len(flags) <= 4, 'Too many runtime flags for a single shorthand' +@@ -114,14 +115,14 @@ class StylePropertyShorthandWriter(json5_generator.Writer): + + self._longhand_dictionary = defaultdict(list) + for property_ in json5_properties.shorthands: +- property_['longhand_enum_keys'] = map(enum_key_for_css_property, +- property_['longhands']) +- property_['longhand_property_ids'] = map(id_for_css_property, +- property_['longhands']) +- +- longhands = map( +- lambda name: json5_properties.properties_by_name[name], +- property_['longhands']) ++ property_['longhand_enum_keys'] = list( ++ map(enum_key_for_css_property, property_['longhands'])) ++ property_['longhand_property_ids'] = list( ++ map(id_for_css_property, property_['longhands'])) ++ ++ longhands = list( ++ map(lambda name: json5_properties.properties_by_name[name], ++ property_['longhands'])) + property_['expansions'] = create_expansions(longhands) + for longhand_enum_key in property_['longhand_enum_keys']: + self._longhand_dictionary[longhand_enum_key].append(property_) +diff --git a/chromium/third_party/blink/renderer/build/scripts/core/css/properties/make_css_property_instances.py b/chromium/third_party/blink/renderer/build/scripts/core/css/properties/make_css_property_instances.py +index 75030ac577e..f72aadee17d 100755 +--- a/chromium/third_party/blink/renderer/build/scripts/core/css/properties/make_css_property_instances.py ++++ b/chromium/third_party/blink/renderer/build/scripts/core/css/properties/make_css_property_instances.py +@@ -42,8 +42,8 @@ class CSSPropertyInstancesWriter(json5_generator.Writer): + aliases = self._css_properties.aliases + + # Lists of PropertyClassData. +- self._property_classes_by_id = map(self.get_class, properties) +- self._alias_classes_by_id = map(self.get_class, aliases) ++ self._property_classes_by_id = list(map(self.get_class, properties)) ++ self._alias_classes_by_id = list(map(self.get_class, aliases)) + + # Sort by enum value. + self._property_classes_by_id.sort(key=lambda t: t.enum_value) +diff --git a/chromium/third_party/blink/renderer/build/scripts/gperf.py b/chromium/third_party/blink/renderer/build/scripts/gperf.py +index 5ee49056be4..db72660d471 100644 +--- a/chromium/third_party/blink/renderer/build/scripts/gperf.py ++++ b/chromium/third_party/blink/renderer/build/scripts/gperf.py +@@ -95,7 +95,7 @@ def main(): + + open(args.output_file, 'wb').write( + generate_gperf(gperf_path, +- open(infile).read(), gperf_args)) ++ open(infile).read(), gperf_args).encode('utf-8')) + + + if __name__ == '__main__': +diff --git a/chromium/third_party/blink/renderer/build/scripts/in_file.py b/chromium/third_party/blink/renderer/build/scripts/in_file.py +index 28adc050f1e..58113483e57 100644 +--- a/chromium/third_party/blink/renderer/build/scripts/in_file.py ++++ b/chromium/third_party/blink/renderer/build/scripts/in_file.py +@@ -66,7 +66,7 @@ class InFile(object): + self._defaults = defaults + self._valid_values = copy.deepcopy( + valid_values if valid_values else {}) +- self._parse(map(str.strip, lines)) ++ self._parse(list(map(str.strip, lines))) + + @classmethod + def load_from_files(self, file_paths, defaults, valid_values, +diff --git a/chromium/third_party/blink/renderer/build/scripts/in_generator.py b/chromium/third_party/blink/renderer/build/scripts/in_generator.py +index e46740a2e85..ab1981ad1e3 100644 +--- a/chromium/third_party/blink/renderer/build/scripts/in_generator.py ++++ b/chromium/third_party/blink/renderer/build/scripts/in_generator.py +@@ -32,10 +32,15 @@ import os + import os.path + import shlex + import shutil ++import sys + import optparse + + from in_file import InFile + ++# TODO: Remove this once Python2 is obsoleted. ++if sys.version_info.major != 2: ++ basestring = str ++ + + ######################################################### + # This is now deprecated - use json5_generator.py instead +diff --git a/chromium/third_party/blink/renderer/build/scripts/make_runtime_features.py b/chromium/third_party/blink/renderer/build/scripts/make_runtime_features.py +index cafe8d94a8e..6925a4fa580 100755 +--- a/chromium/third_party/blink/renderer/build/scripts/make_runtime_features.py ++++ b/chromium/third_party/blink/renderer/build/scripts/make_runtime_features.py +@@ -138,7 +138,7 @@ class RuntimeFeatureWriter(BaseRuntimeFeatureWriter): + except Exception: + # If trouble unpickling, overwrite + pass +- with open(os.path.abspath(file_name), 'w') as pickle_file: ++ with open(os.path.abspath(file_name), 'wb') as pickle_file: + pickle.dump(features_map, pickle_file) + + def _template_inputs(self): +diff --git a/chromium/third_party/blink/renderer/build/scripts/templates/element_factory.cc.tmpl b/chromium/third_party/blink/renderer/build/scripts/templates/element_factory.cc.tmpl +index dc3f44c5b10..3eefcf9f0ee 100644 +--- a/chromium/third_party/blink/renderer/build/scripts/templates/element_factory.cc.tmpl ++++ b/chromium/third_party/blink/renderer/build/scripts/templates/element_factory.cc.tmpl +@@ -26,7 +26,7 @@ using {{namespace}}FunctionMap = HashMapGetExecutionContext())) { +diff --git a/chromium/third_party/blink/renderer/build/scripts/templates/element_type_helpers.h.tmpl b/chromium/third_party/blink/renderer/build/scripts/templates/element_type_helpers.h.tmpl +index 1b5297d52dc..edecc81d9d4 100644 +--- a/chromium/third_party/blink/renderer/build/scripts/templates/element_type_helpers.h.tmpl ++++ b/chromium/third_party/blink/renderer/build/scripts/templates/element_type_helpers.h.tmpl +@@ -15,7 +15,7 @@ namespace blink { + class Document; + + // Type checking. +-{% for tag in tags|sort if not tag.multipleTagNames and not tag.noTypeHelpers %} ++{% for tag in tags|sort(attribute='name') if not tag.multipleTagNames and not tag.noTypeHelpers %} + class {{tag.interface}}; + template <> + inline bool IsElementOfType(const Node& node) { +diff --git a/chromium/third_party/blink/renderer/build/scripts/templates/macros.tmpl b/chromium/third_party/blink/renderer/build/scripts/templates/macros.tmpl +index 0244433af2e..dcdbb02a56c 100644 +--- a/chromium/third_party/blink/renderer/build/scripts/templates/macros.tmpl ++++ b/chromium/third_party/blink/renderer/build/scripts/templates/macros.tmpl +@@ -25,7 +25,7 @@ + + + {% macro trie_leaf(index, object, return_macro, lowercase_data) %} +-{% set name, value = object.items()[0] %} ++{% set name, value = (object.items()|list)[0] %} + {% if name|length %} + if ( + {%- for c in name -%} +@@ -45,7 +45,7 @@ return {{ return_macro(value) }}; + + + {% macro trie_switch(trie, index, return_macro, lowercase_data) %} +-{% if trie|length == 1 and trie.values()[0] is string %} ++{% if trie|length == 1 and (trie.values()|list)[0] is string %} + {{ trie_leaf(index, trie, return_macro, lowercase_data) -}} + {% else %} + {% if lowercase_data %} +diff --git a/chromium/third_party/blink/renderer/build/scripts/templates/make_qualified_names.h.tmpl b/chromium/third_party/blink/renderer/build/scripts/templates/make_qualified_names.h.tmpl +index cb05c6c4315..bd5566b03e7 100644 +--- a/chromium/third_party/blink/renderer/build/scripts/templates/make_qualified_names.h.tmpl ++++ b/chromium/third_party/blink/renderer/build/scripts/templates/make_qualified_names.h.tmpl +@@ -24,12 +24,12 @@ namespace {{cpp_namespace}} { + {{symbol_export}}extern const WTF::AtomicString& {{namespace_prefix}}NamespaceURI; + + // Tags +-{% for tag in tags|sort %} ++{% for tag in tags|sort(attribute='name') %} + {{symbol_export}}extern const blink::{{namespace}}QualifiedName& {{tag|symbol}}Tag; + {% endfor %} + + // Attributes +-{% for attr in attrs|sort %} ++{% for attr in attrs|sort(attribute='name') %} + {{symbol_export}}extern const blink::QualifiedName& {{attr|symbol}}Attr; + {% endfor %} + +diff --git a/chromium/third_party/dawn/generator/generator_lib.py b/chromium/third_party/dawn/generator/generator_lib.py +index 5e3734d7833..e3d46bd194f 100644 +--- a/chromium/third_party/dawn/generator/generator_lib.py ++++ b/chromium/third_party/dawn/generator/generator_lib.py +@@ -201,6 +201,10 @@ def _compute_python_dependencies(root_dir=None): + + paths = set() + for path in module_paths: ++ # Builtin/namespaced modules may return None for the file path. ++ if not path: ++ continue ++ + path = os.path.abspath(path) + + if not path.startswith(root_dir): +diff --git a/chromium/third_party/devtools-frontend/src/BUILD.gn b/chromium/third_party/devtools-frontend/src/BUILD.gn +index cd488e88b60..ea1dc3d9a79 100644 +--- a/chromium/third_party/devtools-frontend/src/BUILD.gn ++++ b/chromium/third_party/devtools-frontend/src/BUILD.gn +@@ -2,6 +2,8 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import("//build/config/python.gni") ++ + import("//third_party/blink/public/public_features.gni") + import("./all_devtools_files.gni") + import("./all_devtools_modules.gni") +diff --git a/chromium/third_party/devtools-frontend/src/scripts/build/build_inspector_overlay.py b/chromium/third_party/devtools-frontend/src/scripts/build/build_inspector_overlay.py +index d6666e8b74f..0f7a661e632 100644 +--- a/chromium/third_party/devtools-frontend/src/scripts/build/build_inspector_overlay.py ++++ b/chromium/third_party/devtools-frontend/src/scripts/build/build_inspector_overlay.py +@@ -45,7 +45,8 @@ def rollup(input_path, output_path, filename, max_size, rollup_plugin): + ['--format', 'iife', '-n', 'InspectorOverlay'] + ['--input', target] + + ['--plugin', rollup_plugin], + stdout=subprocess.PIPE, +- stderr=subprocess.PIPE) ++ stderr=subprocess.PIPE, ++ text=True) + out, error = rollup_process.communicate() + if not out: + raise Exception("rollup failed: " + error) +diff --git a/chromium/third_party/devtools-frontend/src/scripts/build/build_release_applications.py b/chromium/third_party/devtools-frontend/src/scripts/build/build_release_applications.py +index fa8e73d34af..7d0b84b2171 100644 +--- a/chromium/third_party/devtools-frontend/src/scripts/build/build_release_applications.py ++++ b/chromium/third_party/devtools-frontend/src/scripts/build/build_release_applications.py +@@ -10,7 +10,7 @@ Builds applications in release mode: + and the application loader into a single script. + """ + +-from cStringIO import StringIO ++from io import StringIO + from os import path + from os.path import join + import copy +@@ -145,8 +145,7 @@ class ReleaseBuilder(object): + resource_content = read_file(path.join(self.application_dir, resource_name)) + if not (resource_name.endswith('.html') + or resource_name.endswith('md')): +- resource_content += resource_source_url(resource_name).encode( +- 'utf-8') ++ resource_content += resource_source_url(resource_name) + resource_content = resource_content.replace('\\', '\\\\') + resource_content = resource_content.replace('\n', '\\n') + resource_content = resource_content.replace('"', '\\"') +@@ -173,7 +172,9 @@ class ReleaseBuilder(object): + def _concatenate_application_script(self, output): + output.write('Root.allDescriptors.push(...%s);' % self._release_module_descriptors()) + if self.descriptors.extends: +- output.write('Root.applicationDescriptor.modules.push(...%s);' % json.dumps(self.descriptors.application.values())) ++ output.write( ++ 'Root.applicationDescriptor.modules.push(...%s);' % ++ json.dumps(list(self.descriptors.application.values()))) + else: + output.write('Root.applicationDescriptor = %s;' % self.descriptors.application_json()) + +diff --git a/chromium/third_party/devtools-frontend/src/scripts/build/generate_devtools_grd.py b/chromium/third_party/devtools-frontend/src/scripts/build/generate_devtools_grd.py +index be510c48d76..c6a59c90298 100644 +--- a/chromium/third_party/devtools-frontend/src/scripts/build/generate_devtools_grd.py ++++ b/chromium/third_party/devtools-frontend/src/scripts/build/generate_devtools_grd.py +@@ -123,7 +123,7 @@ def main(argv): + + try: + os.makedirs(path.join(output_directory, 'Images')) +- except OSError, e: ++ except OSError as e: + if e.errno != errno.EEXIST: + raise e + +@@ -147,7 +147,7 @@ def main(argv): + shutil.copy(path.join(dirname, filename), path.join(output_directory, 'Images')) + add_file_to_grd(doc, path.join('Images', filename)) + +- with open(parsed_args.output_filename, 'w') as output_file: ++ with open(parsed_args.output_filename, 'wb') as output_file: + output_file.write(doc.toxml(encoding='UTF-8')) + + +diff --git a/chromium/third_party/devtools-frontend/src/scripts/build/modular_build.py b/chromium/third_party/devtools-frontend/src/scripts/build/modular_build.py +index 0ba695d3810..bb1da2f9f8d 100644 +--- a/chromium/third_party/devtools-frontend/src/scripts/build/modular_build.py ++++ b/chromium/third_party/devtools-frontend/src/scripts/build/modular_build.py +@@ -7,6 +7,8 @@ + Utilities for the modular DevTools build. + """ + ++from __future__ import print_function ++ + import collections + from os import path + import os +@@ -40,7 +42,7 @@ def load_and_parse_json(filename): + try: + return json.loads(read_file(filename)) + except: +- print 'ERROR: Failed to parse %s' % filename ++ print('ERROR: Failed to parse %s' % filename) + raise + + class Descriptors: +@@ -57,7 +59,7 @@ class Descriptors: + + def application_json(self): + result = dict() +- result['modules'] = self.application.values() ++ result['modules'] = list(self.application.values()) + return json.dumps(result) + + def all_compiled_files(self): +diff --git a/chromium/third_party/jinja2/tests.py b/chromium/third_party/jinja2/tests.py +index 0adc3d4dbcb..b14f85ff148 100644 +--- a/chromium/third_party/jinja2/tests.py ++++ b/chromium/third_party/jinja2/tests.py +@@ -10,7 +10,7 @@ + """ + import operator + import re +-from collections import Mapping ++from collections.abc import Mapping + from jinja2.runtime import Undefined + from jinja2._compat import text_type, string_types, integer_types + import decimal +diff --git a/chromium/tools/metrics/ukm/gen_builders.py b/chromium/tools/metrics/ukm/gen_builders.py +index f9f61d90a56..44e46fae8cc 100755 +--- a/chromium/tools/metrics/ukm/gen_builders.py ++++ b/chromium/tools/metrics/ukm/gen_builders.py +@@ -48,9 +48,10 @@ def ReadFilteredData(path): + data = ukm_model.UKM_XML_TYPE.Parse(ukm_file.read()) + event_tag = ukm_model._EVENT_TYPE.tag + metric_tag = ukm_model._METRIC_TYPE.tag +- data[event_tag] = filter(ukm_model.IsNotObsolete, data[event_tag]) ++ data[event_tag] = list(filter(ukm_model.IsNotObsolete, data[event_tag])) + for event in data[event_tag]: +- event[metric_tag] = filter(ukm_model.IsNotObsolete, event[metric_tag]) ++ event[metric_tag] = list( ++ filter(ukm_model.IsNotObsolete, event[metric_tag])) + return data + + +diff --git a/chromium/ui/ozone/generate_constructor_list.py b/chromium/ui/ozone/generate_constructor_list.py +index 8d800636c97..04fa18e93df 100755 +--- a/chromium/ui/ozone/generate_constructor_list.py ++++ b/chromium/ui/ozone/generate_constructor_list.py +@@ -45,12 +45,15 @@ Example Output: ./ui/ozone/generate_constructor_list.py \ + } // namespace ui + """ + ++try: ++ from StringIO import StringIO # for Python 2 ++except ImportError: ++ from io import StringIO # for Python 3 + import optparse + import os + import collections + import re + import sys +-import string + + + def GetTypedefName(typename): +@@ -68,7 +71,7 @@ def GetConstructorName(typename, platform): + This is just "Create" + typename + platform. + """ + +- return 'Create' + typename + string.capitalize(platform) ++ return 'Create' + typename + platform.capitalize() + + + def GenerateConstructorList(out, namespace, export, typenames, platforms, +@@ -163,12 +166,14 @@ def main(argv): + sys.exit(1) + + # Write to standard output or file specified by --output_cc. +- out_cc = sys.stdout ++ out_cc = getattr(sys.stdout, 'buffer', sys.stdout) + if options.output_cc: + out_cc = open(options.output_cc, 'wb') + +- GenerateConstructorList(out_cc, options.namespace, options.export, ++ out_cc_str = StringIO() ++ GenerateConstructorList(out_cc_str, options.namespace, options.export, + typenames, platforms, includes, usings) ++ out_cc.write(out_cc_str.getvalue().encode('utf-8')) + + if options.output_cc: + out_cc.close() +diff --git a/chromium/ui/ozone/generate_ozone_platform_list.py b/chromium/ui/ozone/generate_ozone_platform_list.py +index d47c398259b..2702b68b9bd 100755 +--- a/chromium/ui/ozone/generate_ozone_platform_list.py ++++ b/chromium/ui/ozone/generate_ozone_platform_list.py +@@ -49,12 +49,15 @@ Example Output: ./generate_ozone_platform_list.py --default wayland dri wayland + + """ + ++try: ++ from StringIO import StringIO # for Python 2 ++except ImportError: ++ from io import StringIO # for Python 3 + import optparse + import os + import collections + import re + import sys +-import string + + + def GetConstantName(name): +@@ -63,7 +66,7 @@ def GetConstantName(name): + We just capitalize the platform name and prepend "CreateOzonePlatform". + """ + +- return 'kPlatform' + string.capitalize(name) ++ return 'kPlatform' + name.capitalize() + + + def GeneratePlatformListText(out, platforms): +@@ -149,9 +152,9 @@ def main(argv): + platforms.insert(0, options.default) + + # Write to standard output or file specified by --output_{cc,h}. +- out_cc = sys.stdout +- out_h = sys.stdout +- out_txt = sys.stdout ++ out_cc = getattr(sys.stdout, 'buffer', sys.stdout) ++ out_h = getattr(sys.stdout, 'buffer', sys.stdout) ++ out_txt = getattr(sys.stdout, 'buffer', sys.stdout) + if options.output_cc: + out_cc = open(options.output_cc, 'wb') + if options.output_h: +@@ -159,9 +162,16 @@ def main(argv): + if options.output_txt: + out_txt = open(options.output_txt, 'wb') + +- GeneratePlatformListText(out_txt, platforms) +- GeneratePlatformListHeader(out_h, platforms) +- GeneratePlatformListSource(out_cc, platforms) ++ out_txt_str = StringIO() ++ out_h_str = StringIO() ++ out_cc_str = StringIO() ++ ++ GeneratePlatformListText(out_txt_str, platforms) ++ out_txt.write(out_txt_str.getvalue().encode('utf-8')) ++ GeneratePlatformListHeader(out_h_str, platforms) ++ out_h.write(out_h_str.getvalue().encode('utf-8')) ++ GeneratePlatformListSource(out_cc_str, platforms) ++ out_cc.write(out_cc_str.getvalue().encode('utf-8')) + + if options.output_cc: + out_cc.close() +-- +2.25.1 + diff --git a/package/qt5/qt5webengine-chromium/0002-Don-t-rebase-sysroot-path.patch b/package/qt5/qt5webengine-chromium/0002-Don-t-rebase-sysroot-path.patch new file mode 100644 index 00000000000..c39f008a3d2 --- /dev/null +++ b/package/qt5/qt5webengine-chromium/0002-Don-t-rebase-sysroot-path.patch @@ -0,0 +1,32 @@ +From bfc520671693587a0b81842018326da35aa97f80 Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Thu, 3 Feb 2022 20:41:08 -0700 +Subject: [PATCH] Don't rebase sysroot path + +Just use the actual sysroot as rebase_path will generate an invalid +sysroot path. + +Fixes: +/home/buildroot/buildroot/output/per-package/qt5webengine/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-buildroot-linux-gnu/10.3.0/../../../../aarch64-buildroot-linux-gnu/bin/ld: cannot find crti.o: No such file or directory + +Signed-off-by: James Hilliard +--- + chromium/build/config/posix/BUILD.gn | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/chromium/build/config/posix/BUILD.gn b/chromium/build/config/posix/BUILD.gn +index e61554c5656..dc957225869 100644 +--- a/chromium/build/config/posix/BUILD.gn ++++ b/chromium/build/config/posix/BUILD.gn +@@ -27,7 +27,7 @@ config("runtime_library") { + + if (!is_apple && sysroot != "") { + # Pass the sysroot to all C compiler variants, the assembler, and linker. +- sysroot_flags = [ "--sysroot=" + rebase_path(sysroot, root_build_dir) ] ++ sysroot_flags = [ "--sysroot=" + sysroot ] + if (is_linux || is_chromeos) { + # This is here so that all files get recompiled after a sysroot roll and + # when turning the sysroot on or off. (defines are passed via the command +-- +2.25.1 + diff --git a/package/qt5/qt5webengine-chromium/Config.in b/package/qt5/qt5webengine-chromium/Config.in new file mode 100644 index 00000000000..8ba9ad7135e --- /dev/null +++ b/package/qt5/qt5webengine-chromium/Config.in @@ -0,0 +1,5 @@ +# Not user-selectable, it is only needed to be copied +# into the qt5webengine source tree. +config BR2_PACKAGE_QT5WEBENGINE_CHROMIUM + bool + select BR2_PACKAGE_QT5WEBENGINE_CHROMIUM_CATAPULT diff --git a/package/qt5/qt5webengine-chromium/chromium-latest.inc b/package/qt5/qt5webengine-chromium/chromium-latest.inc new file mode 100644 index 00000000000..ced431c9e9a --- /dev/null +++ b/package/qt5/qt5webengine-chromium/chromium-latest.inc @@ -0,0 +1,1257 @@ +# (echo "QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \\" ; \ +# find * -type f \ +# \( -iname 'license*' -o -iname 'copying*' -o -name 'APPLE_LICENSE' -o -name 'Copyright' -o -path '*/license_texts/*' -o -path '*/licenses/*' \) \ +# -a -not -name '*.cc' -not -name '*.py' -not -name '*.pyc' -not -name '*.h' -not -name 'LICENSE.sha1' -not -name 'licensecheck.pl*' -not -name 'license.after' -not -name 'license.before' -not -path 'chromium/third_party/catapult/*' | \ +# sort | sed 's%^\(.*\)$%\t\1 \\%') > package/qt5/qt5webengine-chromium/chromium-latest.inc +QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ + chromium/base/third_party/cityhash/COPYING \ + chromium/base/third_party/double_conversion/LICENSE \ + chromium/base/third_party/dynamic_annotations/LICENSE \ + chromium/base/third_party/icu/LICENSE \ + chromium/base/third_party/libevent/LICENSE \ + chromium/base/third_party/nspr/LICENSE \ + chromium/base/third_party/superfasthash/LICENSE \ + chromium/base/third_party/symbolize/LICENSE \ + chromium/base/third_party/valgrind/LICENSE \ + chromium/base/third_party/xdg_mime/LICENSE \ + chromium/base/third_party/xdg_user_dirs/LICENSE \ + chromium/buildtools/LICENSE \ + chromium/LICENSE \ + chromium/LICENSE.chromium_os \ + chromium/mojo/public/LICENSE \ + chromium/net/third_party/mozilla_security_manager/LICENSE \ + chromium/net/third_party/nss/LICENSE \ + chromium/net/third_party/quiche/src/LICENSE \ + chromium/net/third_party/uri_template/LICENSE \ + chromium/ppapi/LICENSE \ + chromium/third_party/abseil-cpp/LICENSE \ + chromium/third_party/angle/LICENSE \ + chromium/third_party/angle/src/common/third_party/smhasher/LICENSE \ + chromium/third_party/angle/src/common/third_party/xxhash/LICENSE \ + chromium/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/third_party/ffx_spd/LICENSE \ + chromium/third_party/angle/src/third_party/compiler/LICENSE \ + chromium/third_party/angle/src/third_party/libXNVCtrl/LICENSE \ + chromium/third_party/angle/src/third_party/volk/LICENSE.md \ + chromium/third_party/angle/third_party/rapidjson/src/bin/jsonschema/LICENSE \ + chromium/third_party/angle/third_party/rapidjson/src/contrib/natvis/LICENSE \ + chromium/third_party/angle/third_party/rapidjson/src/license.txt \ + chromium/third_party/angle/third_party/vulkan-headers/src/LICENSE.txt \ + chromium/third_party/angle/third_party/vulkan-loader/src/LICENSE.txt \ + chromium/third_party/angle/third_party/vulkan-tools/src/LICENSE.txt \ + chromium/third_party/angle/tools/flex-bison/third_party/m4sugar/LICENSE \ + chromium/third_party/angle/tools/flex-bison/third_party/skeletons/LICENSE \ + chromium/third_party/angle/util/windows/third_party/StackWalker/LICENSE \ + chromium/third_party/apple_apsl/LICENSE \ + chromium/third_party/arcore-android-sdk-client/LICENSE \ + chromium/third_party/arcore-android-sdk/LICENSE \ + chromium/third_party/axe-core/LICENSE \ + chromium/third_party/bazel/LICENSE \ + chromium/third_party/blanketjs/LICENSE \ + chromium/third_party/blink/LICENSE_FOR_ABOUT_CREDITS \ + chromium/third_party/blink/renderer/core/LICENSE-APPLE \ + chromium/third_party/blink/renderer/core/LICENSE-LGPL-2 \ + chromium/third_party/blink/renderer/core/LICENSE-LGPL-2.1 \ + chromium/third_party/blink/renderer/platform/testing/data/third_party/Noto/LICENSE_OFL.txt \ + chromium/third_party/blink/renderer/platform/testing/data/third_party/Roboto/LICENSE.txt \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/LICENSE.md \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/atomicwrites/LICENSE \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/enum/enum/LICENSE \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/h2/LICENSE \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hpack/LICENSE \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/html5lib/LICENSE \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hyperframe/LICENSE \ + chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/six/LICENSE \ + chromium/third_party/boringssl/src/LICENSE \ + chromium/third_party/boringssl/src/third_party/fiat/LICENSE \ + chromium/third_party/boringssl/src/third_party/googletest/LICENSE \ + chromium/third_party/boringssl/src/third_party/wycheproof_testvectors/LICENSE \ + chromium/third_party/bouncycastle/LICENSE \ + chromium/third_party/breakpad/breakpad/LICENSE \ + chromium/third_party/breakpad/breakpad/src/third_party/curl/COPYING \ + chromium/third_party/breakpad/breakpad/src/third_party/libdisasm/LICENSE \ + chromium/third_party/breakpad/LICENSE \ + chromium/third_party/brotli/LICENSE \ + chromium/third_party/bspatch/LICENSE \ + chromium/third_party/byte_buddy/LICENSE \ + chromium/third_party/ced/LICENSE \ + chromium/third_party/ced/src/LICENSE \ + chromium/third_party/chaijs/LICENSE \ + chromium/third_party/checkstyle/LICENSE \ + chromium/third_party/checkstyle/LICENSE.apache20 \ + chromium/third_party/cld_3/LICENSE \ + chromium/third_party/cld_3/src/LICENSE \ + chromium/third_party/closure_compiler/compiler/COPYING \ + chromium/third_party/closure_compiler/LICENSE \ + chromium/third_party/crashpad/crashpad/LICENSE \ + chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE \ + chromium/third_party/crashpad/crashpad/third_party/cpp-httplib/cpp-httplib/LICENSE \ + chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE \ + chromium/third_party/crashpad/crashpad/third_party/glibc/COPYING.LIB \ + chromium/third_party/crashpad/crashpad/third_party/xnu/APPLE_LICENSE \ + chromium/third_party/crc32c/src/LICENSE \ + chromium/third_party/cros_system_api/LICENSE \ + chromium/third_party/d3/src/LICENSE \ + chromium/third_party/dav1d/libdav1d/COPYING \ + chromium/third_party/dav1d/LICENSE \ + chromium/third_party/dawn/LICENSE \ + chromium/third_party/decklink/LICENSE \ + chromium/third_party/devscripts/COPYING \ + chromium/third_party/devtools-frontend/src/front_end/cm_modes/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/dagre_layout/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/sdk/wasm_source_map/LICENSES.deps \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-logical-assignment/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-logical-assignment/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-loose/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-loose/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-numeric-separator/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-numeric-separator/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/acorn/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/axe-core/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/codemirror/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/codemirror/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/fabricjs/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/i18n/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/intl-messageformat/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/intl-messageformat/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/lighthouse/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/lodash-isequal/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/lodash-isequal/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/marked/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/marked/package/LICENSE.md \ + chromium/third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/wasmparser/LICENSE \ + chromium/third_party/devtools-frontend/src/front_end/third_party/wasmparser/package/LICENSE \ + chromium/third_party/devtools-frontend/src/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/abbrev/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/accepts/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/acorn-jsx/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ajv/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ansi-colors/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/license \ + chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/node_modules/type-fest/license \ + chromium/third_party/devtools-frontend/src/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/ansi-styles/license \ + chromium/third_party/devtools-frontend/src/node_modules/anymatch/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/argparse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-find-index/license \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/es-abstract/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/es-to-primitive/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/is-callable/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/is-regex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/object-inspect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/string.prototype.trimleft/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/string.prototype.trimright/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/es-abstract/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/es-to-primitive/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/is-callable/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/is-regex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/object-inspect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/string.prototype.trimleft/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/string.prototype.trimright/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array.prototype.map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/array-union/license \ + chromium/third_party/devtools-frontend/src/node_modules/arrify/license \ + chromium/third_party/devtools-frontend/src/node_modules/asap/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/astral-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/ast-types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/async/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/async-limiter/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/autoprefixer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/generator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/helper-function-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/helper-get-function-arity/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/helper-split-export-declaration/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/template/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/traverse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/convert-source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/resolve/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/safe-buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-member-expression-to-functions/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-member-expression-to-functions/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-imports/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-imports/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/helper-split-export-declaration/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/template/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-optimise-call-expression/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-optimise-call-expression/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/generator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-function-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-get-function-arity/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-split-export-declaration/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/template/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/traverse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/template/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/generator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/helper-function-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/helper-get-function-arity/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/helper-split-export-declaration/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/template/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/traverse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-validator-identifier/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/bail/license \ + chromium/third_party/devtools-frontend/src/node_modules/balanced-match/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/base64-arraybuffer/LICENSE-MIT \ + chromium/third_party/devtools-frontend/src/node_modules/base64id/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/base64-js/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/binary-extensions/license \ + chromium/third_party/devtools-frontend/src/node_modules/bl/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/blob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/body-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/brace-expansion/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/braces/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/browserslist/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/browser-stdout/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/buffer-crc32/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/buffer-from/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/bytes/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/callsites/license \ + chromium/third_party/devtools-frontend/src/node_modules/camelcase-keys/license \ + chromium/third_party/devtools-frontend/src/node_modules/camelcase/license \ + chromium/third_party/devtools-frontend/src/node_modules/caniuse-lite/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ccount/license \ + chromium/third_party/devtools-frontend/src/node_modules/chai/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/chalk/license \ + chromium/third_party/devtools-frontend/src/node_modules/character-entities-html4/license \ + chromium/third_party/devtools-frontend/src/node_modules/character-entities-legacy/license \ + chromium/third_party/devtools-frontend/src/node_modules/character-entities/license \ + chromium/third_party/devtools-frontend/src/node_modules/character-reference-invalid/license \ + chromium/third_party/devtools-frontend/src/node_modules/chardet/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/check-error/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/chokidar/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/fsevents/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/readdirp/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/chownr/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/cli-cursor/license \ + chromium/third_party/devtools-frontend/src/node_modules/cliui/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/emoji-regex/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/cli-width/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/clone-regexp/license \ + chromium/third_party/devtools-frontend/src/node_modules/collapse-white-space/license \ + chromium/third_party/devtools-frontend/src/node_modules/color-convert/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/color-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/colors/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/commander/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/commondir/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/component-emitter/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/concat-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/connect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/contains-path/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/content-type/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/cookie/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/cosmiconfig/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/cosmiconfig/node_modules/parse-json/license \ + chromium/third_party/devtools-frontend/src/node_modules/cross-spawn/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/cssesc/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/custom-event/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/date-format/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/debuglog/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/decamelize-keys/license \ + chromium/third_party/devtools-frontend/src/node_modules/decamelize-keys/node_modules/map-obj/license \ + chromium/third_party/devtools-frontend/src/node_modules/decamelize/license \ + chromium/third_party/devtools-frontend/src/node_modules/deep-eql/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/deep-is/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/define-properties/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/depd/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/devtools-protocol/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/dezalgo/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/diff/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/di/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/dir-glob/license \ + chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.closure-compiler \ + chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.esprima \ + chromium/third_party/devtools-frontend/src/node_modules/domelementtype/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/domhandler/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/dom-serializer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/dom-serializer/node_modules/domelementtype/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/dom-serializer/node_modules/entities/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/domutils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ee-first/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/electron-to-chromium/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/emoji-regex/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/encodeurl/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/end-of-stream/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/engine.io-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/entities/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ent/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/error-ex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-abstract/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-abstract/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-abstract/node_modules/string.prototype.trimend/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-abstract/node_modules/string.prototype.trimstart/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-array-method-boxes-properly/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/escape-html/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/escape-string-regexp/license \ + chromium/third_party/devtools-frontend/src/node_modules/escodegen/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/escodegen/node_modules/esprima/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/es-get-iterator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-get-iterator/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/es-get-iterator/node_modules/isarray/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/node_modules/resolve/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-module-utils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-module-utils/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-module-utils/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/globals/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/optionator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/semver/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/strip-json-comments/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/memo-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/LICENSE.closure-compiler \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/LICENSE.esprima \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/load-json-file/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/path-type/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/pify/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/p-limit/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/p-try/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/read-pkg/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/read-pkg-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/resolve/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-mocha/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-rulesdir/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-scope/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-utils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/eslint-visitor-keys/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/espree/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/espree/node_modules/acorn/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/esquery/license.txt \ + chromium/third_party/devtools-frontend/src/node_modules/esquery/node_modules/estraverse/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/es-to-primitive/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/estraverse/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/esutils/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/eventemitter3/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/execall/license \ + chromium/third_party/devtools-frontend/src/node_modules/extend/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/external-editor/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/extract-zip/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fast-deep-equal/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fast-glob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fast-glob/node_modules/picomatch/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fast-json-stable-stringify/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fast-levenshtein/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/fastq/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fd-slicer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/figures/license \ + chromium/third_party/devtools-frontend/src/node_modules/file-entry-cache/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fill-range/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/finalhandler/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/find-up/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/flat-cache/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/flat-cache/node_modules/rimraf/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/flat/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/flatted/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fs-constants/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fs-extra/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/fs.realpath/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/functional-red-black-tree/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/function-bind/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/gensync/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/get-caller-file/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/get-func-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/get-stdin/license \ + chromium/third_party/devtools-frontend/src/node_modules/get-stream/license \ + chromium/third_party/devtools-frontend/src/node_modules/global-modules/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/global-prefix/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/globals/license \ + chromium/third_party/devtools-frontend/src/node_modules/globby/license \ + chromium/third_party/devtools-frontend/src/node_modules/globby/node_modules/ignore/LICENSE-MIT \ + chromium/third_party/devtools-frontend/src/node_modules/globby/node_modules/slash/license \ + chromium/third_party/devtools-frontend/src/node_modules/globjoin/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/glob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/glob-parent/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/graceful-fs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/hard-rejection/license \ + chromium/third_party/devtools-frontend/src/node_modules/has-binary2/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/has-flag/license \ + chromium/third_party/devtools-frontend/src/node_modules/has/LICENSE-MIT \ + chromium/third_party/devtools-frontend/src/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/he/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/hosted-git-info/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/html-escaper/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/htmlparser2/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/html-tags/license \ + chromium/third_party/devtools-frontend/src/node_modules/http-errors/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/http-errors/node_modules/inherits/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/http-proxy/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/iconv-lite/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ieee754/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ignore/LICENSE-MIT \ + chromium/third_party/devtools-frontend/src/node_modules/import-fresh/license \ + chromium/third_party/devtools-frontend/src/node_modules/import-lazy/license \ + chromium/third_party/devtools-frontend/src/node_modules/indent-string/license \ + chromium/third_party/devtools-frontend/src/node_modules/indexes-of/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/inflight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/inherits/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ini/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-styles/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/chalk/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/color-convert/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/color-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/has-flag/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/is-fullwidth-code-point/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-alphabetical/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-alphanumerical/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-alphanumeric/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-arguments/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-arrayish/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/isbinaryfile/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/is-binary-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-callable/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-date-object/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-decimal/license \ + chromium/third_party/devtools-frontend/src/node_modules/isexe/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-extglob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-fullwidth-code-point/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-glob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-hexadecimal/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-number/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-plain-obj/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-promise/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-regex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-regex/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-regexp/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-set/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-string/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-symbol/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@istanbuljs/schema/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/is-typedarray/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/is-whitespace-character/license \ + chromium/third_party/devtools-frontend/src/node_modules/is-word-character/license \ + chromium/third_party/devtools-frontend/src/node_modules/iterate-iterator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/iterate-value/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/jest-worker/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/jest-worker/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/jsesc/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/json5/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/json5/node_modules/minimist/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/jsonfile/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/json-parse-better-errors/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/json-schema-traverse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/json-stable-stringify-without-jsonify/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/js-tokens/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/js-yaml/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/js-yaml/node_modules/esprima/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/karma-chai/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-chrome-launcher/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/code-frame/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/generator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/helper-function-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/helper-get-function-arity/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/helper-split-export-declaration/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/highlight/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/template/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/traverse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/types/node_modules/@babel/helper-validator-identifier/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/has-flag/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-coverage/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-instrument/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-report/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-source-maps/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-source-maps/node_modules/source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-reports/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/make-dir/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/semver/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/ansi-styles/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/cliui/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/color-convert/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/color-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/is-fullwidth-code-point/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/rimraf/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/wrap-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/yargs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/yargs-parser/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/karma-sourcemap-loader/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/kind-of/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/known-css-properties/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/leven/license \ + chromium/third_party/devtools-frontend/src/node_modules/levn/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/license-checker/bin/license-checker \ + chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license-files.js \ + chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license.js \ + chromium/third_party/devtools-frontend/src/node_modules/license-checker/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/nopt/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/lines-and-columns/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/lodash/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/log4js/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/log-symbols/license \ + chromium/third_party/devtools-frontend/src/node_modules/longest-streak/license \ + chromium/third_party/devtools-frontend/src/node_modules/magic-string/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/map-obj/license \ + chromium/third_party/devtools-frontend/src/node_modules/markdown-escapes/license \ + chromium/third_party/devtools-frontend/src/node_modules/markdown-table/license \ + chromium/third_party/devtools-frontend/src/node_modules/mathml-tag-names/license \ + chromium/third_party/devtools-frontend/src/node_modules/mdast-util-compact/license \ + chromium/third_party/devtools-frontend/src/node_modules/media-typer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/meow/license \ + chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/camelcase/license \ + chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/type-fest/license \ + chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/yargs-parser/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/yargs-parser/node_modules/camelcase/license \ + chromium/third_party/devtools-frontend/src/node_modules/merge2/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/merge-stream/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/micromatch/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mime-db/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mime/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mime-types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mimic-fn/license \ + chromium/third_party/devtools-frontend/src/node_modules/minimatch/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/minimist/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/minimist-options/license \ + chromium/third_party/devtools-frontend/src/node_modules/minimist-options/node_modules/arrify/license \ + chromium/third_party/devtools-frontend/src/node_modules/minimist-options/node_modules/is-plain-obj/license \ + chromium/third_party/devtools-frontend/src/node_modules/min-indent/license \ + chromium/third_party/devtools-frontend/src/node_modules/mkdirp-classic/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mkdirp/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mkdirp/node_modules/minimist/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/emoji-regex/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/glob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/has-flag/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/serialize-javascript/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/which/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/yargs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/yargs/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/mute-stream/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/negotiator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/nice-try/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@nodelib/fs.scandir/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@nodelib/fs.stat/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@nodelib/fs.walk/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/node-releases/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/node_modules/resolve/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/normalize-path/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/normalize-range/license \ + chromium/third_party/devtools-frontend/src/node_modules/num2fraction/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.assign/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object-inspect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object-keys/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/es-abstract/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/es-to-primitive/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/is-callable/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/is-regex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/object-inspect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/string.prototype.trimleft/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/string.prototype.trimright/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/once/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/onetime/license \ + chromium/third_party/devtools-frontend/src/node_modules/on-finished/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/optionator/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/osenv/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/os-homedir/license \ + chromium/third_party/devtools-frontend/src/node_modules/os-tmpdir/license \ + chromium/third_party/devtools-frontend/src/node_modules/parent-module/license \ + chromium/third_party/devtools-frontend/src/node_modules/parse-entities/license \ + chromium/third_party/devtools-frontend/src/node_modules/parse-json/license \ + chromium/third_party/devtools-frontend/src/node_modules/parseqs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/parseuri/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/parseurl/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/path-is-absolute/license \ + chromium/third_party/devtools-frontend/src/node_modules/path-key/license \ + chromium/third_party/devtools-frontend/src/node_modules/path-parse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/path-type/license \ + chromium/third_party/devtools-frontend/src/node_modules/pathval/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/pend/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/picomatch/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/p-limit/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/p-try/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/p-limit/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/p-try/license \ + chromium/third_party/devtools-frontend/src/node_modules/p-limit/license \ + chromium/third_party/devtools-frontend/src/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-html/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-less/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-reporter/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-reporter/node_modules/log-symbols/license \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-resolve-nested-selector/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-safe-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-sass/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-scss/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-selector-parser/LICENSE-MIT \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-syntax/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/postcss-value-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/prelude-ls/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/private/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/progress/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/promise.allsettled/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/proxy-from-env/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/p-try/license \ + chromium/third_party/devtools-frontend/src/node_modules/pump/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/punycode/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/puppeteer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/pkg-dir/license \ + chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/ws/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/qs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/quick-lru/license \ + chromium/third_party/devtools-frontend/src/node_modules/ramda/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/range-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/raw-body/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/readable-stream/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/readdir-scoped-modules/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/read-installed/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/read-package-json/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg/node_modules/parse-json/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg/node_modules/type-fest/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/recast/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/recast/node_modules/esprima/LICENSE.BSD \ + chromium/third_party/devtools-frontend/src/node_modules/redent/license \ + chromium/third_party/devtools-frontend/src/node_modules/regexpp/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/repeat-string/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/replace-ext/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/require-directory/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/require-main-filename/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/requires-port/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/resolve-from/license \ + chromium/third_party/devtools-frontend/src/node_modules/resolve/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/restore-cursor/license \ + chromium/third_party/devtools-frontend/src/node_modules/reusify/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/rfdc/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/rimraf/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/rollup/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/rollup/node_modules/fsevents/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@rollup/plugin-commonjs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/rollup-plugin-terser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/node_modules/picomatch/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/node_modules/@types/estree/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/run-async/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/run-parallel/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm2015/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm5/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/rxjs/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/rxjs/src/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/safe-buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/safer-buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/semver/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/serialize-javascript/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/set-blocking/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/setprototypeof/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/shebang-command/license \ + chromium/third_party/devtools-frontend/src/node_modules/shebang-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/signal-exit/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/slice-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/slide/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-adapter/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/ms/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/sourcemap-codec/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/source-map/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/source-map-support/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/spdx-compare/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/spdx-correct/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/spdx-expression-parse/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/spdx-ranges/LICENSE.md \ + chromium/third_party/devtools-frontend/src/node_modules/spdx-satisfies/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/specificity/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/sprintf-js/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/state-toggle/license \ + chromium/third_party/devtools-frontend/src/node_modules/statuses/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/streamroller/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/streamroller/node_modules/debug/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string_decoder/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/stringify-entities/license \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/es-abstract/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/es-to-primitive/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/is-callable/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/is-regex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/object-inspect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/string.prototype.trimleft/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/string.prototype.trimright/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/es-abstract/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/es-to-primitive/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/has-symbols/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/is-callable/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/is-regex/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/object-inspect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/string.prototype.trimleft/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/string.prototype.trimright/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/strip-bom/license \ + chromium/third_party/devtools-frontend/src/node_modules/strip-indent/license \ + chromium/third_party/devtools-frontend/src/node_modules/strip-json-comments/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint-config-recommended/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint-config-standard/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/ansi-styles/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/chalk/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/color-convert/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/color-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/has-flag/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/ignore/LICENSE-MIT \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/is-fullwidth-code-point/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/log-symbols/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/resolve-from/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/slash/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/@stylelint/postcss-css-in-js/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@stylelint/postcss-markdown/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/style-search/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/sugarss/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/supports-color/license \ + chromium/third_party/devtools-frontend/src/node_modules/svg-tags/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/table/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/emoji-regex/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/tar-fs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/tar-stream/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/terser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/text-table/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.APACHE2 \ + chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.MIT \ + chromium/third_party/devtools-frontend/src/node_modules/tmp/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/to-fast-properties/license \ + chromium/third_party/devtools-frontend/src/node_modules/toidentifier/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/to-regex-range/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/treeify/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/trim-newlines/license \ + chromium/third_party/devtools-frontend/src/node_modules/trim-trailing-lines/license \ + chromium/third_party/devtools-frontend/src/node_modules/trough/license \ + chromium/third_party/devtools-frontend/src/node_modules/tslib/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/tsutils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/type-check/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/typedarray-to-buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/type-detect/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/type-fest/license \ + chromium/third_party/devtools-frontend/src/node_modules/type-is/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/chai/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/codemirror/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/color-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/regexpp/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/semver/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-utils/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/parser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/glob/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/semver/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/types/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/visitor-keys/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/typescript/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/@types/eslint-visitor-keys/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/estree/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/filesystem/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/json-schema/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/mocha/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/node/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/normalize-package-data/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/parse-json/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/puppeteer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/tern/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/unist/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/@types/yauzl/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ua-parser-js/license.md \ + chromium/third_party/devtools-frontend/src/node_modules/ultron/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/unbzip2-stream/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/unherit/license \ + chromium/third_party/devtools-frontend/src/node_modules/unified/license \ + chromium/third_party/devtools-frontend/src/node_modules/uniq/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/unist-util-find-all-after/license \ + chromium/third_party/devtools-frontend/src/node_modules/unist-util-is/license \ + chromium/third_party/devtools-frontend/src/node_modules/unist-util-remove-position/license \ + chromium/third_party/devtools-frontend/src/node_modules/unist-util-stringify-position/license \ + chromium/third_party/devtools-frontend/src/node_modules/unist-util-visit/license \ + chromium/third_party/devtools-frontend/src/node_modules/unist-util-visit-parents/license \ + chromium/third_party/devtools-frontend/src/node_modules/universalify/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/unpipe/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/util-deprecate/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/util-extend/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/utils-merge/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/v8-compile-cache/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/validate-npm-package-license/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/vfile/license \ + chromium/third_party/devtools-frontend/src/node_modules/vfile-location/license \ + chromium/third_party/devtools-frontend/src/node_modules/vfile-message/license \ + chromium/third_party/devtools-frontend/src/node_modules/void-elements/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/which/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/which-module/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/wide-align/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/word-wrap/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/wordwrap/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/workerpool/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/emoji-regex/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/wrappy/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/write-file-atomic/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/write/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ws/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/ws/node_modules/safe-buffer/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/xmlhttprequest-ssl/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/xtend/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/y18n/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yaml/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-styles/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/cliui/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-convert/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-name/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/is-fullwidth-code-point/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/path-exists/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/wrap-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/yargs-parser/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/LICENSE.txt \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/ansi-regex/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/emoji-regex/LICENSE-MIT.txt \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/find-up/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/locate-path/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/p-locate/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/string-width/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/strip-ansi/license \ + chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yauzl/LICENSE \ + chromium/third_party/devtools-frontend/src/node_modules/yeast/LICENSE \ + chromium/third_party/devtools-frontend/src/scripts/closure/COPYING \ + chromium/third_party/devtools-frontend/src/third_party/i18n/LICENSE \ + chromium/third_party/devtools-frontend/src/third_party/pyjson5/src/LICENSE \ + chromium/third_party/dom_distiller_js/LICENSE \ + chromium/third_party/dpkg-shlibdeps/LICENSE \ + chromium/third_party/emoji-segmenter/LICENSE \ + chromium/third_party/emoji-segmenter/src/LICENSE \ + chromium/third_party/espresso/LICENSE \ + chromium/third_party/expat/src/expat/COPYING \ + chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt \ + chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt \ + chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt \ + chromium/third_party/ffmpeg/chromium/scripts/license_texts/oggparse_ahlberg_rullgayrd_2005.txt \ + chromium/third_party/ffmpeg/COPYING.GPLv2 \ + chromium/third_party/ffmpeg/COPYING.GPLv3 \ + chromium/third_party/ffmpeg/COPYING.LGPLv2.1 \ + chromium/third_party/ffmpeg/COPYING.LGPLv3 \ + chromium/third_party/ffmpeg/LICENSE.md \ + chromium/third_party/flac/COPYING.FDL \ + chromium/third_party/flac/COPYING.GPL \ + chromium/third_party/flac/COPYING.LGPL \ + chromium/third_party/flac/COPYING.Xiph \ + chromium/third_party/flatbuffers/LICENSE \ + chromium/third_party/flatbuffers/src/dart/LICENSE \ + chromium/third_party/flatbuffers/src/LICENSE.txt \ + chromium/third_party/fontconfig/LICENSE \ + chromium/third_party/fontconfig/src/COPYING \ + chromium/third_party/freetype/src/docs/LICENSE.TXT \ + chromium/third_party/fusejs/LICENSE \ + chromium/third_party/gif_player/LICENSE \ + chromium/third_party/glfw/src/LICENSE.md \ + chromium/third_party/glslang/LICENSE \ + chromium/third_party/glslang/src/license-checker.cfg \ + chromium/third_party/glslang/src/LICENSE.txt \ + chromium/third_party/google-closure-library/closure-deps/LICENSE \ + chromium/third_party/google-closure-library/doc/LICENSE \ + chromium/third_party/google-closure-library/LICENSE \ + chromium/third_party/googletest/src/googlemock/LICENSE \ + chromium/third_party/googletest/src/googlemock/scripts/generator/LICENSE \ + chromium/third_party/googletest/src/googletest/LICENSE \ + chromium/third_party/googletest/src/LICENSE \ + chromium/third_party/google-truth/LICENSE \ + chromium/third_party/guava/LICENSE \ + chromium/third_party/gvr-android-keyboard/LICENSE \ + chromium/third_party/gvr-android-sdk/LICENSE \ + chromium/third_party/hamcrest/LICENSE \ + chromium/third_party/harfbuzz-ng/src/COPYING \ + chromium/third_party/harfbuzz-ng/src/src/ms-use/COPYING \ + chromium/third_party/hunspell/COPYING \ + chromium/third_party/hunspell/COPYING.LESSER \ + chromium/third_party/hunspell/COPYING.MPL \ + chromium/third_party/hyphenation-patterns/LICENSE \ + chromium/third_party/hyphenation-patterns/src/pt/LICENSE \ + chromium/third_party/iaccessible2/LICENSE \ + chromium/third_party/iccjpeg/LICENSE \ + chromium/third_party/icu4j/LICENSE \ + chromium/third_party/icu/LICENSE \ + chromium/third_party/icu/license.html \ + chromium/third_party/icu/scripts/LICENSE \ + chromium/third_party/ijar/LICENSE \ + chromium/third_party/ink/LICENSE \ + chromium/third_party/inspector_protocol/LICENSE \ + chromium/third_party/isimpledom/LICENSE \ + chromium/third_party/jacoco/LICENSE \ + chromium/third_party/javalang/LICENSE \ + chromium/third_party/jetifier_standalone/LICENSE \ + chromium/third_party/jinja2/LICENSE \ + chromium/third_party/jsoncpp/LICENSE \ + chromium/third_party/jsoncpp/source/LICENSE \ + chromium/third_party/jstemplate/COPYING \ + chromium/third_party/khronos/LICENSE \ + chromium/third_party/leveldatabase/src/LICENSE \ + chromium/third_party/libaddressinput/LICENSE \ + chromium/third_party/libaddressinput/src/cpp/LICENSE.chromium \ + chromium/third_party/libaddressinput/src/LICENSE \ + chromium/third_party/libaom/source/libaom/LICENSE \ + chromium/third_party/libaom/source/libaom/third_party/fastfeat/LICENSE \ + chromium/third_party/libaom/source/libaom/third_party/googletest/src/googletest/LICENSE \ + chromium/third_party/libaom/source/libaom/third_party/libwebm/LICENSE.TXT \ + chromium/third_party/libaom/source/libaom/third_party/vector/LICENSE \ + chromium/third_party/libaom/source/libaom/third_party/x86inc/LICENSE \ + chromium/third_party/libavif/LICENSE \ + chromium/third_party/libavif/src/LICENSE \ + chromium/third_party/libbrlapi/LICENSE \ + chromium/third_party/libgav1/src/LICENSE \ + chromium/third_party/libgifcodec/LICENSE.md \ + chromium/third_party/libipp/LICENSE \ + chromium/third_party/libjingle_xmpp/LICENSE \ + chromium/third_party/libjpeg_turbo/LICENSE.md \ + chromium/third_party/libovr/LICENSE \ + chromium/third_party/libpng/LICENSE \ + chromium/third_party/libprotobuf-mutator/src/LICENSE \ + chromium/third_party/libsecret/LICENSE \ + chromium/third_party/libsrtp/LICENSE \ + chromium/third_party/libsync/LICENSE \ + chromium/third_party/libudev/LICENSE \ + chromium/third_party/libusb/src/COPYING \ + chromium/third_party/libvpx/source/libvpx/LICENSE \ + chromium/third_party/libvpx/source/libvpx/third_party/googletest/src/LICENSE \ + chromium/third_party/libvpx/source/libvpx/third_party/libwebm/LICENSE.TXT \ + chromium/third_party/libvpx/source/libvpx/third_party/libyuv/LICENSE \ + chromium/third_party/libvpx/source/libvpx/third_party/x86inc/LICENSE \ + chromium/third_party/libwebm/source/LICENSE.TXT \ + chromium/third_party/libwebp/LICENSE \ + chromium/third_party/libxml/src/Copyright \ + chromium/third_party/libXNVCtrl/LICENSE \ + chromium/third_party/libxslt/src/Copyright \ + chromium/third_party/libyuv/LICENSE \ + chromium/third_party/lottie/LICENSE \ + chromium/third_party/lzma_sdk/LICENSE \ + chromium/third_party/mako/LICENSE \ + chromium/third_party/markupsafe/LICENSE \ + chromium/third_party/material_design_icons/LICENSE \ + chromium/third_party/mesa_headers/LICENSE \ + chromium/third_party/metrics_proto/LICENSE \ + chromium/third_party/microsoft_webauthn/LICENSE \ + chromium/third_party/minigbm/LICENSE \ + chromium/third_party/minigbm/src/LICENSE \ + chromium/third_party/minizip/src/lib/bzip2/LICENSE \ + chromium/third_party/minizip/src/LICENSE \ + chromium/third_party/mocha/LICENSE \ + chromium/third_party/mockito/LICENSE \ + chromium/third_party/modp_b64/LICENSE \ + chromium/third_party/motemplate/LICENSE \ + chromium/third_party/mozilla/LICENSE \ + chromium/third_party/nasm/LICENSE \ + chromium/third_party/nearby/LICENSE \ + chromium/third_party/nearby/src/LICENSE \ + chromium/third_party/netty4/LICENSE \ + chromium/third_party/netty-tcnative/LICENSE \ + chromium/third_party/node/LICENSE \ + chromium/third_party/objenesis/LICENSE \ + chromium/third_party/ocmock/License.txt \ + chromium/third_party/one_euro_filter/LICENSE \ + chromium/third_party/opencv/src/LICENSE \ + chromium/third_party/openh264/src/LICENSE \ + chromium/third_party/openscreen/src/LICENSE \ + chromium/third_party/openscreen/src/third_party/mozilla/LICENSE.txt \ + chromium/third_party/openscreen/src/third_party/tinycbor/src/LICENSE \ + chromium/third_party/opus/src/COPYING \ + chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt \ + chromium/third_party/ots/LICENSE \ + chromium/third_party/ow2_asm/LICENSE \ + chromium/third_party/pdfium/LICENSE \ + chromium/third_party/pdfium/third_party/bigint/LICENSE \ + chromium/third_party/pdfium/third_party/libpng16/LICENSE \ + chromium/third_party/pdfium/third_party/pymock/LICENSE.txt \ + chromium/third_party/perfetto/LICENSE \ + chromium/third_party/perfetto/src/trace_processor/python/LICENSE \ + chromium/third_party/pexpect/LICENSE \ + chromium/third_party/pffft/LICENSE \ + chromium/third_party/ply/LICENSE \ + chromium/third_party/ply/license.patch \ + chromium/third_party/polymer/LICENSE.polymer \ + chromium/third_party/polymer/v1_0/components-chromium/polymer2/LICENSE.txt \ + chromium/third_party/polymer/v3_0/components-chromium/polymer/LICENSE.txt \ + chromium/third_party/private-join-and-compute/src/crypto/LICENSE \ + chromium/third_party/private-join-and-compute/src/LICENSE \ + chromium/third_party/private-join-and-compute/src/util/LICENSE \ + chromium/third_party/private_membership/LICENSE \ + chromium/third_party/proguard/LICENSE \ + chromium/third_party/protobuf/LICENSE \ + chromium/third_party/pycoverage/LICENSE \ + chromium/third_party/pyelftools/elftools/construct/LICENSE \ + chromium/third_party/pyelftools/LICENSE \ + chromium/third_party/pyjson5/src/LICENSE \ + chromium/third_party/pystache/LICENSE \ + chromium/third_party/Python-Markdown/LICENSE.md \ + chromium/third_party/pywebsocket3/src/LICENSE \ + chromium/third_party/qcms/src/COPYING \ + chromium/third_party/quic_trace/src/LICENSE \ + chromium/third_party/quic_trace/src/third_party/fonts/LICENSE \ + chromium/third_party/quic_trace/src/third_party/glew/LICENSE.txt \ + chromium/third_party/qunit/LICENSE \ + chromium/third_party/r8/LICENSE \ + chromium/third_party/re2/LICENSE \ + chromium/third_party/re2/src/LICENSE \ + chromium/third_party/requests/LICENSE \ + chromium/third_party/rnnoise/COPYING \ + chromium/third_party/robolectric/LICENSE \ + chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt \ + chromium/third_party/robolectric/licenses/javolution.license.txt \ + chromium/third_party/robolectric/licenses/pivotal.labs.license.txt \ + chromium/third_party/s2cellid/LICENSE \ + chromium/third_party/schema_org/LICENSE \ + chromium/third_party/securemessage/LICENSE \ + chromium/third_party/securemessage/src/LICENSE \ + chromium/third_party/shaderc/src/kokoro/linux/license_check_docker.sh \ + chromium/third_party/shaderc/src/kokoro/linux/license_check.sh \ + chromium/third_party/shaderc/src/LICENSE \ + chromium/third_party/shaderc/src/license-checker.cfg \ + chromium/third_party/shaderc/src/third_party/LICENSE.glslang \ + chromium/third_party/shaderc/src/third_party/LICENSE.spirv-tools \ + chromium/third_party/shaka-player/LICENSE \ + chromium/third_party/shell-encryption/src/glog/LICENSE \ + chromium/third_party/shell-encryption/src/LICENSE \ + chromium/third_party/shell-encryption/src/prng/LICENSE \ + chromium/third_party/shell-encryption/src/testing/LICENSE \ + chromium/third_party/simplejson/LICENSE.txt \ + chromium/third_party/sinonjs/LICENSE \ + chromium/third_party/six/LICENSE \ + chromium/third_party/six/src/LICENSE \ + chromium/third_party/skia/include/third_party/skcms/LICENSE \ + chromium/third_party/skia/include/third_party/vulkan/LICENSE \ + chromium/third_party/skia/LICENSE \ + chromium/third_party/skia/modules/canvaskit/canvaskit/LICENSE \ + chromium/third_party/skia/modules/pathkit/npm-asmjs/LICENSE \ + chromium/third_party/skia/modules/pathkit/npm-wasm/LICENSE \ + chromium/third_party/skia/third_party/etc1/LICENSE \ + chromium/third_party/skia/third_party/skcms/LICENSE \ + chromium/third_party/skia/third_party/vulkanmemoryallocator/include/LICENSE.txt \ + chromium/third_party/skia/third_party/vulkanmemoryallocator/LICENSE \ + chromium/third_party/skia/third_party/wuffs/LICENSE \ + chromium/third_party/smhasher/LICENSE \ + chromium/third_party/snappy/src/COPYING \ + chromium/third_party/spirv-cross/spirv-cross/LICENSE \ + chromium/third_party/spirv-headers/LICENSE \ + chromium/third_party/spirv-headers/src/LICENSE \ + chromium/third_party/SPIRV-Tools/LICENSE \ + chromium/third_party/SPIRV-Tools/src/LICENSE \ + chromium/third_party/SPIRV-Tools/src/utils/vscode/src/lsp/LICENSE \ + chromium/third_party/sqlite4java/LICENSE \ + chromium/third_party/sqlite/LICENSE \ + chromium/third_party/sqlite/src/autoconf/tea/license.terms \ + chromium/third_party/sqlite/src/LICENSE.md \ + chromium/third_party/subresource-filter-ruleset/LICENSE \ + chromium/third_party/sudden_motion_sensor/LICENSE \ + chromium/third_party/swiftshader/LICENSE.txt \ + chromium/third_party/tcmalloc/LICENSE \ + chromium/third_party/tcmalloc/vendor/COPYING \ + chromium/third_party/test_fonts/LICENSE \ + chromium/third_party/text-fragments-polyfill/LICENSE \ + chromium/third_party/tint/LICENSE \ + chromium/third_party/tint/src/LICENSE \ + chromium/third_party/tlslite/LICENSE \ + chromium/third_party/turbine/LICENSE \ + chromium/third_party/ub-uiautomator/LICENSE \ + chromium/third_party/ukey2/LICENSE \ + chromium/third_party/ukey2/src/LICENSE \ + chromium/third_party/unrar/LICENSE \ + chromium/third_party/unrar/src/license.txt \ + chromium/third_party/usb_ids/LICENSE \ + chromium/third_party/usrsctp/LICENSE \ + chromium/third_party/usrsctp/usrsctplib/LICENSE.md \ + chromium/third_party/v4l-utils/COPYING.libv4l \ + chromium/third_party/vulkan_headers/LICENSE.txt \ + chromium/third_party/vulkan_memory_allocator/LICENSE.txt \ + chromium/third_party/vulkan_memory_allocator/premake/LICENSE.txt \ + chromium/third_party/wds/LICENSE \ + chromium/third_party/wds/src/COPYING \ + chromium/third_party/web-animations-js/LICENSE \ + chromium/third_party/web-animations-js/sources/COPYING \ + chromium/third_party/webdriver/COPYING \ + chromium/third_party/webdriver/LICENSE \ + chromium/third_party/webgpu-cts/src/LICENSE.txt \ + chromium/third_party/webgpu-cts/src/standalone/third_party/jquery/LICENSE.txt \ + chromium/third_party/webpagereplay/LICENSE \ + chromium/third_party/webrtc/common_audio/third_party/ooura/LICENSE \ + chromium/third_party/webrtc/common_audio/third_party/spl_sqrt_floor/LICENSE \ + chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE \ + chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md \ + chromium/third_party/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE \ + chromium/third_party/webrtc/LICENSE \ + chromium/third_party/webrtc/license_template.txt \ + chromium/third_party/webrtc/modules/third_party/fft/LICENSE \ + chromium/third_party/webrtc/modules/third_party/g711/LICENSE \ + chromium/third_party/webrtc/modules/third_party/g722/LICENSE \ + chromium/third_party/webrtc/modules/third_party/portaudio/LICENSE \ + chromium/third_party/webrtc/rtc_base/third_party/base64/LICENSE \ + chromium/third_party/webrtc/rtc_base/third_party/sigslot/LICENSE \ + chromium/third_party/webxr_test_pages/LICENSE \ + chromium/third_party/webxr_test_pages/webxr-samples/js/cottontail/LICENSE.md \ + chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/dat.gui/LICENSE \ + chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/gl-matrix/LICENSE \ + chromium/third_party/webxr_test_pages/webxr-samples/LICENSE.md \ + chromium/third_party/weston/LICENSE \ + chromium/third_party/weston/src/COPYING \ + chromium/third_party/weston/src/data/COPYING \ + chromium/third_party/widevine/LICENSE \ + chromium/third_party/woff2/LICENSE \ + chromium/third_party/wuffs/LICENSE \ + chromium/third_party/wuffs/src/LICENSE \ + chromium/third_party/xcbproto/src/COPYING \ + chromium/third_party/xdg-utils/LICENSE \ + chromium/third_party/xstream/LICENSE \ + chromium/third_party/zlib/LICENSE \ + chromium/third_party/zxcvbn-cpp/LICENSE.txt \ + chromium/tools/grit/third_party/six/LICENSE \ + chromium/tools/origin_trials/third_party/ed25519/LICENSE \ + chromium/tools/page_cycler/acid3/LICENSE \ + chromium/tools/win/ChromeDebug/ChromeDebug/LICENSE \ + chromium/url/third_party/mozilla/LICENSE.txt \ + chromium/v8/LICENSE \ + chromium/v8/LICENSE.fdlibm \ + chromium/v8/LICENSE.strongtalk \ + chromium/v8/LICENSE.v8 \ + chromium/v8/src/third_party/siphash/LICENSE \ + chromium/v8/src/third_party/utf8-decoder/LICENSE \ + chromium/v8/src/third_party/valgrind/LICENSE \ + chromium/v8/src/third_party/vtune/LICENSE \ + chromium/v8/third_party/colorama/LICENSE \ + chromium/v8/third_party/inspector_protocol/LICENSE \ + chromium/v8/third_party/jsoncpp/LICENSE \ + chromium/v8/third_party/v8/builtins/LICENSE \ + chromium/v8/third_party/wasm-api/LICENSE \ + gn/base/third_party/icu/LICENSE \ + gn/LICENSE \ + ninja/COPYING \ diff --git a/package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash b/package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash new file mode 100644 index 00000000000..103e27d8892 --- /dev/null +++ b/package/qt5/qt5webengine-chromium/qt5webengine-chromium.hash @@ -0,0 +1,1256 @@ +# Locally calculated +sha256 14c0654d046fd1faf0204b79e33c091012a8f4df972777e5691875aa75d29a65 qtwebengine-chromium-0ad2814370799a2161057d92231fe3ee00e2fe98.tar.bz2 + +# Locally calculated with: +# for i in $(find * -type f \( -iname 'license*' -o -iname 'copying*' -o -name 'APPLE_LICENSE' -o -name 'Copyright' -o -path '*/license_texts/*' -o -path '*/licenses/*' \) -a -not -name '*.cc' -not -name '*.py' -not -name '*.pyc' -not -name '*.h' -not -name 'LICENSE.sha1' -not -name 'licensecheck.pl*' -not -name 'license.after' -not -name 'license.before' -not -path 'chromium/third_party/catapult/*') ; do echo -n "sha256 " ; sha256sum $i ; done | sort --key=3 +sha256 3ed00dd93c75655599456c83cba2f69c6824fd53f24fc24206ba27b65057709d chromium/base/third_party/cityhash/COPYING +sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca chromium/base/third_party/double_conversion/LICENSE +sha256 96e7ccbf8d17e319dd77c4ebd4965b64a820bbcc3142a2478fbf95af77417b6a chromium/base/third_party/dynamic_annotations/LICENSE +sha256 5d85142a5609ad177a2d7a2e7cae060b886b8b42f25c5b9803cf0cb5ee04ad2f chromium/base/third_party/icu/LICENSE +sha256 9ad1d4223b80349f3d3ab9cec92f93431b9da14a1b5d41de468ce054a28cf8aa chromium/base/third_party/libevent/LICENSE +sha256 d55a403514532af12dc2fbfb2e41900090a5dd6c7c76c8e4d9b20bcc737eac35 chromium/base/third_party/nspr/LICENSE +sha256 90b2201c340cee36b40a443f949d9eb416f0a0d204c32d350aff87fedeb67ae8 chromium/base/third_party/superfasthash/LICENSE +sha256 538edc6f52c563cf06eca1bac8dd785ff60ef5a371a950265700d5d40386db6e chromium/base/third_party/symbolize/LICENSE +sha256 79955cd80438f041387eb080f2675394e36a806b8b17eca63a4bc568d839509e chromium/base/third_party/valgrind/LICENSE +sha256 c45766baef552c59eeb1fdfbbc690e52e4cd5b135dfd325f21bdfe8ddfe28ce6 chromium/base/third_party/xdg_mime/LICENSE +sha256 18351de3d7e2dc469cc83e77d38a3e25d010251e34eb348bbd1a76275e313997 chromium/base/third_party/xdg_user_dirs/LICENSE +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 chromium/buildtools/LICENSE +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 chromium/LICENSE +sha256 212c5a071f61512786b5e5840b3d70c85e017f3f82939ad4d4a870fc48b33477 chromium/LICENSE.chromium_os +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 chromium/mojo/public/LICENSE +sha256 bed70fc84f1bea2b4b144564b9a0f9a5a3bc7b0d78f6e62092aeb689cac56bdd chromium/net/third_party/mozilla_security_manager/LICENSE +sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 chromium/net/third_party/nss/LICENSE +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 chromium/net/third_party/quiche/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/net/third_party/uri_template/LICENSE +sha256 834ee20e8fc3235722ed801bae30cc539c2775be656ff9cc2810fe674e53d5ec chromium/ppapi/LICENSE +sha256 c79a7fea0e3cac04cd43f20e7b648e5a0ff8fa5344e644b0ee09ca1162b62747 chromium/third_party/abseil-cpp/LICENSE +sha256 bf4da21bd20bcfb5b60b7ecc67fa864a79be049e21d6178076887f178dd6c71a chromium/third_party/angle/LICENSE +sha256 3f6f1b520bc53e878ccbb698ad0bacef3752a5f4e4b50a26552bd70f60b40748 chromium/third_party/angle/src/common/third_party/smhasher/LICENSE +sha256 86ec6953794503942b70fcd4f35b565d44f63f703b7037ce44dad965c4aaae91 chromium/third_party/angle/src/common/third_party/xxhash/LICENSE +sha256 09a7c3fbc0b4ae6a9ccc4ffdcbfa511c14b8647a24f24783838862cf6c226d4e chromium/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/third_party/ffx_spd/LICENSE +sha256 a08ba10adec47027ef8078848729837b1c5a42f140718d7afd65c23f1eeec392 chromium/third_party/angle/src/third_party/compiler/LICENSE +sha256 31346421254a3e6e12687cf17f19f6357ee73a617fa7b3d3ccefdcbabe49bdd3 chromium/third_party/angle/src/third_party/libXNVCtrl/LICENSE +sha256 336f505f8d5aa73ea40b4d798dde86953e9c1f6525757f1d7f18120fea09bb1d chromium/third_party/angle/src/third_party/volk/LICENSE.md +sha256 837402bd25fad9b704265801ca3f92566a98157c1f9a7acd6f446299ba1c305a chromium/third_party/angle/third_party/rapidjson/src/bin/jsonschema/LICENSE +sha256 394faaedb93c1da8ecbd61322518834908fee64381117e01a611bf9fac20baa6 chromium/third_party/angle/third_party/rapidjson/src/contrib/natvis/LICENSE +sha256 a140e5d46fe734a1c78f1a3c3ef207871dd75648be71fdda8e309b23ab8b1f32 chromium/third_party/angle/third_party/rapidjson/src/license.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/angle/third_party/vulkan-headers/src/LICENSE.txt +sha256 43c0a37e6a0fa7ff3c843b3ec5a4fac84b712558ddac103fbd4c1649662a9ece chromium/third_party/angle/third_party/vulkan-loader/src/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/angle/third_party/vulkan-tools/src/LICENSE.txt +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 chromium/third_party/angle/tools/flex-bison/third_party/m4sugar/LICENSE +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 chromium/third_party/angle/tools/flex-bison/third_party/skeletons/LICENSE +sha256 bfec18debedcb337f8af53f143ccf0b1575d0b7c30deaee137f10397eca0d353 chromium/third_party/angle/util/windows/third_party/StackWalker/LICENSE +sha256 b23e682fda7310afe43505ed6041919ccff8f9e0c6799ebd7542cbcef11102e3 chromium/third_party/apple_apsl/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/arcore-android-sdk-client/LICENSE +sha256 584e795ba5833279c327245594d6dc216fc664144fa3626a0bdf136bc00af76c chromium/third_party/arcore-android-sdk/LICENSE +sha256 af175b9d96ee93c21a036152e1b905b0b95304d4ae8c2c921c7609100ba8df7e chromium/third_party/axe-core/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/bazel/LICENSE +sha256 0518cf49c09398259d54fcfff0b5fd36456162c6439886660e53627b3073ef22 chromium/third_party/blanketjs/LICENSE +sha256 a661d10f8f194b1963a75bb4d308f17b078cc064624313a556902d89705f6876 chromium/third_party/blink/LICENSE_FOR_ABOUT_CREDITS +sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 chromium/third_party/blink/renderer/core/LICENSE-APPLE +sha256 7555fa34bc131a75ca56d65c40cc1ea8f9515d23e353d4c15d58573a042f7805 chromium/third_party/blink/renderer/core/LICENSE-LGPL-2 +sha256 f2b3bd09663381deb99721109d22b47af1213bb43007a8b56a06c6375c8050ce chromium/third_party/blink/renderer/core/LICENSE-LGPL-2.1 +sha256 6a73f9541c2de74158c0e7cf6b0a58ef774f5a780bf191f2d7ec9cc53efe2bf2 chromium/third_party/blink/renderer/platform/testing/data/third_party/Noto/LICENSE_OFL.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/blink/renderer/platform/testing/data/third_party/Roboto/LICENSE.txt +sha256 5a7b465d39b5e018bc40cc34162176269f7c476989cb4dbcf0ec0b81701545a7 chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/LICENSE.md +sha256 878329f0bd878ad015129ce8bda82f481e86ec2e80831e909c0d67171d922e73 chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/atomicwrites/LICENSE +sha256 88ec6a6c8eafa3b9757e745783938bef3f5e4d5e3c76b1db576aa3ab520e5e1d chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/enum/enum/LICENSE +sha256 663f9253e13519b82ab4a6b1caab6bed05aada70517f28cd0254be8a9fa19ed6 chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/h2/LICENSE +sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hpack/LICENSE +sha256 16a39991619e92f18680932da2a9199fdf7d95df3ecaedc52ea06218aabafd6f chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/html5lib/LICENSE +sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hyperframe/LICENSE +sha256 b7529b8c07171a78a8c36c3283905528e4812945d977d125eb926e8ccbf245b6 chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/six/LICENSE +sha256 60bd7c54856bf9387221bde5ab55d516d7cea15870d0fed69406bcd1c8ec7c9d chromium/third_party/boringssl/src/LICENSE +sha256 0c125a4dab5ab869473e6491db22f6c0a7f8a4de58588d03bb2b16c0c8ebd7de chromium/third_party/boringssl/src/third_party/fiat/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 chromium/third_party/boringssl/src/third_party/googletest/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd chromium/third_party/boringssl/src/third_party/wycheproof_testvectors/LICENSE +sha256 5740985669353ef52e0f320413ff68dc62b6c23a596cd78b6d6b80764f1c50ab chromium/third_party/bouncycastle/LICENSE +sha256 8d5d1311342ed55b486d778a6763f54a26002698ac0cbab64026b98033300dfd chromium/third_party/breakpad/breakpad/LICENSE +sha256 4d03f91b94e0db3bdc9ddaf0060dd41cc94a2096094fbc1417713a2f059658c7 chromium/third_party/breakpad/breakpad/src/third_party/curl/COPYING +sha256 d8eaba95b8d03c5912da9b5823de2c920e84a993133039a22fc8100f9edb33a1 chromium/third_party/breakpad/breakpad/src/third_party/libdisasm/LICENSE +sha256 015b2d5cedb3024339446a63963d073fa831544cf253c5ddd713fccc8d83e939 chromium/third_party/breakpad/LICENSE +sha256 3d180008e36922a4e8daec11c34c7af264fed5962d07924aea928c38e8663c94 chromium/third_party/brotli/LICENSE +sha256 98f8746a39f9a42da35df7046a15b56d0e2f4f76eefc352d67f1bf76e85360b4 chromium/third_party/bspatch/LICENSE +sha256 b5730da9a26472a405b0b1c61d3d166714d9d654ab3282e54e4a01a5f66316c3 chromium/third_party/byte_buddy/LICENSE +sha256 ef5b39dfcafe08323262e3f51a3a9de649978a55ed8ef8eef3c451f2c1e78a53 chromium/third_party/ced/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/ced/src/LICENSE +sha256 3d1d2669d0ba87069b5e202f106193c4eb0e140a2aead31dca9670a0581dd979 chromium/third_party/chaijs/LICENSE +sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 chromium/third_party/checkstyle/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/checkstyle/LICENSE.apache20 +sha256 c2d13ec3b431617beb314705c0f42d17ca579eed00032ed8a13dbcd23fc9bdd5 chromium/third_party/cld_3/LICENSE +sha256 c2d13ec3b431617beb314705c0f42d17ca579eed00032ed8a13dbcd23fc9bdd5 chromium/third_party/cld_3/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/closure_compiler/compiler/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/closure_compiler/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/crashpad/crashpad/LICENSE +sha256 212846e0145aa50fb3a5aef254a370311a93acf6c1e792e47e0068d64c8c3885 chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE +sha256 4b45cbe16d7b71b89ae6127e26e0d90a029198ca5e958ad8e3d0b8bbed364d8b chromium/third_party/crashpad/crashpad/third_party/cpp-httplib/cpp-httplib/LICENSE +sha256 f40ee07401827b6ac9cf0aee1aaffb00e42a3f2c729f9c83f96a3daafef5d944 chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 chromium/third_party/crashpad/crashpad/third_party/glibc/COPYING.LIB +sha256 e5881019d8766c1e88a5fe1dbca4ba40c78011d41fcb18f6e9f50df60182685b chromium/third_party/crashpad/crashpad/third_party/xnu/APPLE_LICENSE +sha256 a1f30b77c01e0995fa32a00119e00749e8731ee8a3c4c3549bce74083c72b0b6 chromium/third_party/crc32c/src/LICENSE +sha256 e9427cf6abc4eaeda0bcd094fca46af4067970079f426b65d5cbacb87bff6366 chromium/third_party/cros_system_api/LICENSE +sha256 7a3cb0e5055874e67db9aa2d5fe26de23204fa994ffbad198901ffe9c812a717 chromium/third_party/d3/src/LICENSE +sha256 b327887de263238deaa80c34cdd2ff3e0ba1d35db585ce14a37ce3e74ee389e9 chromium/third_party/dav1d/libdav1d/COPYING +sha256 2da4494d2a8b5c742afbb905b10621e40129284c977ac138e3081ed0d9d83aed chromium/third_party/dav1d/LICENSE +sha256 b77e952e3feaebd807d27784988b19fb60f83f9fc9a0c03e6aedbbffd5d6f8ee chromium/third_party/dawn/LICENSE +sha256 43452b94e6aa0c2d076ad25b87f580c11571689d52f3aa1a1f7bdcab31a0bd15 chromium/third_party/decklink/LICENSE +sha256 5a2ed53cc5975569e9fa146c4245eaf53377dc1a88bdcb923da6487e53cba55e chromium/third_party/devscripts/COPYING +sha256 13110d66c514a7890c4b388a353bc08fa094fe13d5ed7f3a222cc0a0caa3fd17 chromium/third_party/devtools-frontend/src/front_end/cm_modes/LICENSE +sha256 9fea307fe830918e12b6822f943f4b59bd7715614efb68e834a141ca758bd5f2 chromium/third_party/devtools-frontend/src/front_end/dagre_layout/LICENSE +sha256 f734f7708439c275f3599e2df7de84cd9f360bd13620a30ab376af6c9deb213b chromium/third_party/devtools-frontend/src/front_end/sdk/wasm_source_map/LICENSES.deps +sha256 bdab450fad7ee5d78d9a02d840983f4bccf525a6ded619e1a8fc3e2044256626 chromium/third_party/devtools-frontend/src/front_end/third_party/acorn/LICENSE +sha256 a1930df5d7444dc71fb103d9c58768de1c2c13b96a83e58b7ed6b2eee6621744 chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-logical-assignment/LICENSE +sha256 a1930df5d7444dc71fb103d9c58768de1c2c13b96a83e58b7ed6b2eee6621744 chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-logical-assignment/package/LICENSE +sha256 bdab450fad7ee5d78d9a02d840983f4bccf525a6ded619e1a8fc3e2044256626 chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-loose/LICENSE +sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-loose/package/LICENSE +sha256 e56a1e867a6ebc064c9d027e022ae15d1878b32f9e546b2373cdb591788cd3fe chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-numeric-separator/LICENSE +sha256 e56a1e867a6ebc064c9d027e022ae15d1878b32f9e546b2373cdb591788cd3fe chromium/third_party/devtools-frontend/src/front_end/third_party/acorn-numeric-separator/package/LICENSE +sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c chromium/third_party/devtools-frontend/src/front_end/third_party/acorn/package/LICENSE +sha256 af175b9d96ee93c21a036152e1b905b0b95304d4ae8c2c921c7609100ba8df7e chromium/third_party/devtools-frontend/src/front_end/third_party/axe-core/LICENSE +sha256 298d10e24bcd783b150fc07cd64ad175f5084f3615ba0e7c579aa95c55f22eac chromium/third_party/devtools-frontend/src/front_end/third_party/codemirror/LICENSE +sha256 a3f2fe2ac6b471aa80c737c5d283dd049bdc903a73835ee6d4d2cac02fdd53bf chromium/third_party/devtools-frontend/src/front_end/third_party/codemirror/package/LICENSE +sha256 b60e9b66bf4f9ab3aa5d1d20b18410a632fd624cf4ce3aa1eb839087caf35958 chromium/third_party/devtools-frontend/src/front_end/third_party/fabricjs/LICENSE +sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 chromium/third_party/devtools-frontend/src/front_end/third_party/i18n/LICENSE +sha256 0212e9ffd60f4c2e05426ac172b91266256b9ff4c0f0156e85b761a1d6f5e17f chromium/third_party/devtools-frontend/src/front_end/third_party/intl-messageformat/LICENSE +sha256 fdd0dd22e95c4c8634fe28674547e55e6dad144433ca09493e59ed0f95902f10 chromium/third_party/devtools-frontend/src/front_end/third_party/intl-messageformat/package/LICENSE +sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 chromium/third_party/devtools-frontend/src/front_end/third_party/lighthouse/LICENSE +sha256 55efdea1a9fe503ed3cd89c2776d3d2131795defaebea421754b428333fbfba3 chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/LICENSE +sha256 1a5ae5ab221af81b68f4f4c156c0d2e044851272c5e2e6c07d685946557878ea chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/package/LICENSE +sha256 1b3235c9a9833dee5fcce1ac27d76157584dce78f1ca846bf217439323080234 chromium/third_party/devtools-frontend/src/front_end/third_party/lodash-isequal/LICENSE +sha256 e159c6d48c989185448658f276375bfb2300362ec6d4ae5525a2d49c4bcb947d chromium/third_party/devtools-frontend/src/front_end/third_party/lodash-isequal/package/LICENSE +sha256 91968bf678e8c3d94ebf8596e98ca9cb5fca1c6555b53f721a940cb50f1b3d66 chromium/third_party/devtools-frontend/src/front_end/third_party/marked/LICENSE +sha256 f6b8d4d6f4aff1b6744730b6943ac6e8b96315954e436f032cfaa5cbdcb07ff3 chromium/third_party/devtools-frontend/src/front_end/third_party/marked/package/LICENSE.md +sha256 a1e4522979cd422b42d0b464072eb7d0d218651659f56bf09f8c147384e3f105 chromium/third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/devtools-frontend/src/front_end/third_party/wasmparser/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/devtools-frontend/src/front_end/third_party/wasmparser/package/LICENSE +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 chromium/third_party/devtools-frontend/src/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/abbrev/LICENSE +sha256 71f83c4c0621102a56d9853812777b85751bce7e9726f686f5b056c1f8a4b0e6 chromium/third_party/devtools-frontend/src/node_modules/accepts/LICENSE +sha256 cfa72b62b9ae173078823a3796b25c027a9071046a263beddf966df67018ce06 chromium/third_party/devtools-frontend/src/node_modules/acorn-jsx/LICENSE +sha256 e85e131fa4ed25538ff1f4962ced1fb6f68b079bd9164a790597a0f30b8fd030 chromium/third_party/devtools-frontend/src/node_modules/ajv/LICENSE +sha256 94e1923e52409cfd50e97988d9772c0de15f65700097e3227fec367a39e82b94 chromium/third_party/devtools-frontend/src/node_modules/ansi-colors/LICENSE +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/node_modules/type-fest/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/ansi-regex/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/ansi-styles/license +sha256 5a3b0007c4203f10fe11b3fe8747253eb994f135e10b73e1f88ada941af09c6e chromium/third_party/devtools-frontend/src/node_modules/anymatch/LICENSE +sha256 c8442419dc614089ea022b3da6bfc089b41a58fb7b9030d1e651f2f36189dce2 chromium/third_party/devtools-frontend/src/node_modules/argparse/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/array-find-index/license +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/array-includes/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/es-abstract/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/es-to-primitive/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/has-symbols/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/is-callable/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/is-regex/LICENSE +sha256 bd40cc437e28a3ad7bef2ad34e6b72e757b182e67bda1acadbab4ef0476f8232 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/object-inspect/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/string.prototype.trimleft/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array-includes/node_modules/string.prototype.trimright/LICENSE +sha256 567b1f5e84afcfc97685f3c7fce4c7502e1ac7a91e79cf10980ecd6a9ad38583 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/es-abstract/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/es-to-primitive/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/has-symbols/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/is-callable/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/is-regex/LICENSE +sha256 bd40cc437e28a3ad7bef2ad34e6b72e757b182e67bda1acadbab4ef0476f8232 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/object-inspect/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/string.prototype.trimleft/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/array.prototype.flat/node_modules/string.prototype.trimright/LICENSE +sha256 cfc3f455254c0af0655cc3ff46a41ed644b67599f6043346169d285bf2b3cf3b chromium/third_party/devtools-frontend/src/node_modules/array.prototype.map/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/array-union/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/arrify/license +sha256 e80373b1ed0f33cecc47173b4b0c6afe0d0318b32dbd84116a1a957e3f7f43a8 chromium/third_party/devtools-frontend/src/node_modules/asap/LICENSE.md +sha256 69dee148a2cc470554dfa7142e830662062394d0fe67cddd379aba90dc60d6b3 chromium/third_party/devtools-frontend/src/node_modules/astral-regex/license +sha256 a374b737c41b30b1ec04c5fcc17d1b853f008f217cc43a9dbea441abd9afde70 chromium/third_party/devtools-frontend/src/node_modules/ast-types/LICENSE +sha256 d9fed24f132985934fca621c4dc1dfb53e03377a24d0568d424383d7eaa9c0ac chromium/third_party/devtools-frontend/src/node_modules/async/LICENSE +sha256 e5a57cdd72e279910183799153134d0e749a5664fc459c8eacbecf72532b7db3 chromium/third_party/devtools-frontend/src/node_modules/async-limiter/LICENSE +sha256 c4630ac8b89cb317ac5bdd60ac5e4e185eab9bd5151a0c7b3afa41aa83d7ec9b chromium/third_party/devtools-frontend/src/node_modules/autoprefixer/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/generator/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/helper-function-name/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/helper-get-function-arity/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/helper-split-export-declaration/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/highlight/LICENSE +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/parser/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/template/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/traverse/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/@babel/types/LICENSE +sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/convert-source-map/LICENSE +sha256 60acd7711e6c138e6041836e32d922705254cc1568a30fdf16aa8f59bb87aeaa chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/resolve/LICENSE +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/safe-buffer/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd chromium/third_party/devtools-frontend/src/node_modules/@babel/core/node_modules/source-map/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-member-expression-to-functions/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-member-expression-to-functions/node_modules/@babel/types/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-imports/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-imports/node_modules/@babel/types/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/helper-split-export-declaration/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/highlight/LICENSE +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/parser/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/template/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-module-transforms/node_modules/@babel/types/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-optimise-call-expression/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-optimise-call-expression/node_modules/@babel/types/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/generator/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-function-name/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-get-function-arity/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/helper-split-export-declaration/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/highlight/LICENSE +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/parser/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/template/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/traverse/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/@babel/types/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-replace-supers/node_modules/source-map/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/highlight/LICENSE +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/parser/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/template/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-simple-access/node_modules/@babel/types/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/generator/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/helper-function-name/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/helper-get-function-arity/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/helper-split-export-declaration/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/highlight/LICENSE +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/parser/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/template/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/traverse/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/@babel/types/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd chromium/third_party/devtools-frontend/src/node_modules/@babel/helpers/node_modules/source-map/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-validator-identifier/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/@babel/highlight/LICENSE +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/bail/license +sha256 a1bd5deadb6a06dd74efa852c1b8b23f63b67f2214fbe9c8bd591da51da69268 chromium/third_party/devtools-frontend/src/node_modules/balanced-match/LICENSE.md +sha256 f3eca6ff762533fa5a77caf954a143e48afa204668cf97dce758c45a9e006be3 chromium/third_party/devtools-frontend/src/node_modules/base64-arraybuffer/LICENSE-MIT +sha256 de6059eadd0c1327f30a22663392e57d36b97b0ac9bb48f4875c8008ba823c30 chromium/third_party/devtools-frontend/src/node_modules/base64id/LICENSE +sha256 5b37224c080cdcc97c871ada971c224e9926370fe74f11b539aa1cf9f3b1aca1 chromium/third_party/devtools-frontend/src/node_modules/base64-js/LICENSE +sha256 85fe65eefab89e2a683232b96e6f689279821a0bd3b351e9ab6a6ebd19dea567 chromium/third_party/devtools-frontend/src/node_modules/binary-extensions/license +sha256 9377db95383c8befacf05c6e465d969d756edf178487ca1344fdf3ba147c596f chromium/third_party/devtools-frontend/src/node_modules/bl/LICENSE.md +sha256 7d3e0d8d5604632b94ff9aea3001153c506566cd1c6c7bb37000acdb1fb37417 chromium/third_party/devtools-frontend/src/node_modules/blob/LICENSE +sha256 23d466b1b134b415b66fa50c6526b4cf3e7b9258554da88d3abb371721e7ce68 chromium/third_party/devtools-frontend/src/node_modules/body-parser/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/ms/license.md +sha256 68f12f6e2c33688699249c01d8f9623c534da20aa71989c57b061b7bc1676d14 chromium/third_party/devtools-frontend/src/node_modules/brace-expansion/LICENSE +sha256 e70ff771504ba41f2be55de812a017ff46433d7a250c862e38fc419159e44500 chromium/third_party/devtools-frontend/src/node_modules/braces/LICENSE +sha256 f25bf9bf3ae8984bcd43bf7fb8f78e7eec8d577081fb8d0989cfa7c67ecebb8e chromium/third_party/devtools-frontend/src/node_modules/browserslist/LICENSE +sha256 fd595a25dd3c90492a8cc3b888aa9ae47630173181efed17f71b4c689d99d0ec chromium/third_party/devtools-frontend/src/node_modules/browser-stdout/LICENSE +sha256 14895b82e3367b66bdb127fe91505f8615491f2a23eb1c0b7d8f7c54be67f57a chromium/third_party/devtools-frontend/src/node_modules/buffer-crc32/LICENSE +sha256 14275f5c8139d02054c5259d52a88ccbba662a86af18c30f071c8d082dc6004c chromium/third_party/devtools-frontend/src/node_modules/buffer-from/LICENSE +sha256 06bafa45fdad2579ba0e43b0c9b2c6290287c99c4203c300254a462b38a307f6 chromium/third_party/devtools-frontend/src/node_modules/buffer/LICENSE +sha256 e3b44af066615de2ea48d18d852d0762f18c0b2efcea714fa48a6f729d405b85 chromium/third_party/devtools-frontend/src/node_modules/bytes/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/callsites/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/camelcase-keys/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/camelcase/license +sha256 fd3a263fe19ed8faa9068b43abaebafc02c77897b0c6fc09abc04bb592e5f16e chromium/third_party/devtools-frontend/src/node_modules/caniuse-lite/LICENSE +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/ccount/license +sha256 b181da80336ff9dd1043fc8be1a764d7382363433319aa872e4d2cb5ce2a3066 chromium/third_party/devtools-frontend/src/node_modules/chai/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/chalk/license +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/character-entities-html4/license +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/character-entities-legacy/license +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/character-entities/license +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/character-reference-invalid/license +sha256 7df1d6cf5b4112cbe277a84269e02ae631603a9a3a21b8328a34c30b8c3dd1ab chromium/third_party/devtools-frontend/src/node_modules/chardet/LICENSE +sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 chromium/third_party/devtools-frontend/src/node_modules/check-error/LICENSE +sha256 db9ba183d4cbfbaf6c27db2effddbb84b46340c33ed32a066bc0b144a3ea1298 chromium/third_party/devtools-frontend/src/node_modules/chokidar/LICENSE +sha256 99de4c30f4643c00d4895d9c6ade0af4ec43d301449c191f5fbe41b53bb6a13a chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/fsevents/LICENSE +sha256 dffec71d93f273d2af7b54c6c7e7e70b3289c632ec0d7253210ec21ac336d5ac chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/readdirp/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/chownr/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/cli-cursor/license +sha256 2dc0465729366c3a7890dfa9e972a1ba7048a26c02116fb8b419a6a1ac110149 chromium/third_party/devtools-frontend/src/node_modules/cliui/LICENSE.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/ansi-regex/license +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/cliui/node_modules/strip-ansi/license +sha256 33fa5470b2195e410b075a32516b6ad27784b8a8ff74ae90cfd60c14b76e6644 chromium/third_party/devtools-frontend/src/node_modules/cli-width/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/clone-regexp/license +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/collapse-white-space/license +sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 chromium/third_party/devtools-frontend/src/node_modules/color-convert/LICENSE +sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 chromium/third_party/devtools-frontend/src/node_modules/color-name/LICENSE +sha256 77ffe84006509949525fd57df06f4a6a80ad862c5314b66ab5bb6ac4cee6280b chromium/third_party/devtools-frontend/src/node_modules/colors/LICENSE +sha256 04512a63dce4d2d506ad612dc0bd7681ccf6e3655f7b6eaef7dfac8323d1ec0b chromium/third_party/devtools-frontend/src/node_modules/commander/LICENSE +sha256 8bb16db1b047019e4395965f2cf3611b06c34bf86dc2d0210b3c3f91b53c21fe chromium/third_party/devtools-frontend/src/node_modules/commondir/LICENSE +sha256 0f0b408b8b871d983e767528c6dc51e0ad7efaa022890c449fe2b2e1ee24dbb7 chromium/third_party/devtools-frontend/src/node_modules/component-emitter/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/concat-map/LICENSE +sha256 9913ff70f23424d49fda2b05902cfb72f17ae1e48aaf898c349a284289a74751 chromium/third_party/devtools-frontend/src/node_modules/connect/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/ms/license.md +sha256 0798f37cff4a3f438c071316e41f94ffe110116a313ab0fc4f8caa07218f1f0f chromium/third_party/devtools-frontend/src/node_modules/contains-path/LICENSE +sha256 257aed98914108e91a337912727b6a802eef218248507f74b76faffaff517a38 chromium/third_party/devtools-frontend/src/node_modules/content-type/LICENSE +sha256 c02110eedc16c7114f1a9bdc026c65626ce1d9c7e27fd51a8e0feee8a48a6858 chromium/third_party/devtools-frontend/src/node_modules/cookie/LICENSE +sha256 8e714750725e75c8b31172ef84c0805f94873f86e3b5cfca8a948553f0778fa1 chromium/third_party/devtools-frontend/src/node_modules/cosmiconfig/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/cosmiconfig/node_modules/parse-json/license +sha256 aaa78451b6fecd1b9c4594c796c133c0e90cad100372ff8bc6de615e9ef9adf1 chromium/third_party/devtools-frontend/src/node_modules/cross-spawn/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/cssesc/LICENSE-MIT.txt +sha256 53ecc31e1632c07980cb0c97dcaf3d1d20323d21194b92150987a4fecf517b3c chromium/third_party/devtools-frontend/src/node_modules/custom-event/LICENSE +sha256 9660914267128b5f96a102bd7f6268c249110a39cb7c4bb7f536d856445d739c chromium/third_party/devtools-frontend/src/node_modules/date-format/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/debug/LICENSE +sha256 5f9e03a50e10f262f7bd356fe323b12f461f14dae6762611285a0d7479340ae7 chromium/third_party/devtools-frontend/src/node_modules/debuglog/LICENSE +sha256 840c00ea351c8aab93f37ff132bc87e58711aac287baeaed5788132970aca500 chromium/third_party/devtools-frontend/src/node_modules/decamelize-keys/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/decamelize-keys/node_modules/map-obj/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/decamelize/license +sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 chromium/third_party/devtools-frontend/src/node_modules/deep-eql/LICENSE +sha256 f2042f3634c4136d06b5139c9c6aefb81a3a462b514548bc1845953233dfba98 chromium/third_party/devtools-frontend/src/node_modules/deep-is/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/define-properties/LICENSE +sha256 bd47ce7b88c7759630d1e2b9fcfa170a0f1fde522be09e13fb1581a79d090400 chromium/third_party/devtools-frontend/src/node_modules/depd/LICENSE +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 chromium/third_party/devtools-frontend/src/node_modules/devtools-protocol/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/dezalgo/LICENSE +sha256 152f0fb43e953fcf5c56c5bfa4c834bb96b1603e4026319c613dd3e734f305cf chromium/third_party/devtools-frontend/src/node_modules/diff/LICENSE +sha256 545278991ee5f1fb4372f913ec44837cff9395175140f8f21118074330a659cb chromium/third_party/devtools-frontend/src/node_modules/di/LICENSE +sha256 69dee148a2cc470554dfa7142e830662062394d0fe67cddd379aba90dc60d6b3 chromium/third_party/devtools-frontend/src/node_modules/dir-glob/license +sha256 5c272e206669b79ee20fa89fa8fa888d5b56186f16c55a5614753ad3412e2ae9 chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.closure-compiler +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.esprima +sha256 cb992345949ccd6e8394b2cd6c465f7b897c864f845937dbf64e8997f389e164 chromium/third_party/devtools-frontend/src/node_modules/domelementtype/LICENSE +sha256 cb992345949ccd6e8394b2cd6c465f7b897c864f845937dbf64e8997f389e164 chromium/third_party/devtools-frontend/src/node_modules/domhandler/LICENSE +sha256 94cfe87de9b178e8fee313a19178e625129e2ce559db32e772e7bd95114ee6ff chromium/third_party/devtools-frontend/src/node_modules/dom-serializer/LICENSE +sha256 cb992345949ccd6e8394b2cd6c465f7b897c864f845937dbf64e8997f389e164 chromium/third_party/devtools-frontend/src/node_modules/dom-serializer/node_modules/domelementtype/LICENSE +sha256 cb992345949ccd6e8394b2cd6c465f7b897c864f845937dbf64e8997f389e164 chromium/third_party/devtools-frontend/src/node_modules/dom-serializer/node_modules/entities/LICENSE +sha256 cb992345949ccd6e8394b2cd6c465f7b897c864f845937dbf64e8997f389e164 chromium/third_party/devtools-frontend/src/node_modules/domutils/LICENSE +sha256 965ef284f7f4c176842ec2e87fa13e79feed777d56d7a21a5a3b38f1bb6dc288 chromium/third_party/devtools-frontend/src/node_modules/ee-first/LICENSE +sha256 25ba5c59dad3e0dd8f9540beaa0f0a86a10e3aec35af5fdc8e88c5f6a5c0d8c6 chromium/third_party/devtools-frontend/src/node_modules/electron-to-chromium/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 7585ea7bba616ccbbe43cb54ecb67956688c3c5641bb84f3099a652a73193afe chromium/third_party/devtools-frontend/src/node_modules/encodeurl/LICENSE +sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 chromium/third_party/devtools-frontend/src/node_modules/end-of-stream/LICENSE +sha256 bb996a5665c8e18041251e833e52b590f0da5050c1878aa3e3a47f71bb16fa6d chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/ms/license.md +sha256 8e0349070612cb59fc604588974e193d8363f0a08752caf31d3f270a609d346a chromium/third_party/devtools-frontend/src/node_modules/engine.io/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/ms/license.md +sha256 2a190271977c2ad47c85a9e08cc05d078fe9293643061d466d2ae89ce8e5c2f1 chromium/third_party/devtools-frontend/src/node_modules/engine.io-parser/LICENSE +sha256 cb992345949ccd6e8394b2cd6c465f7b897c864f845937dbf64e8997f389e164 chromium/third_party/devtools-frontend/src/node_modules/entities/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/ent/LICENSE +sha256 92b07a2e5b0e051d37dde85042c736d6d551cfcbc0983f39d7ef903b3986bbc1 chromium/third_party/devtools-frontend/src/node_modules/error-ex/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/es-abstract/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/es-abstract/node_modules/has-symbols/LICENSE +sha256 a5e49293b629194f16e08c965807b34a4a8f45aa2735658a3b0e3c1478a34b30 chromium/third_party/devtools-frontend/src/node_modules/es-abstract/node_modules/string.prototype.trimend/LICENSE +sha256 a5e49293b629194f16e08c965807b34a4a8f45aa2735658a3b0e3c1478a34b30 chromium/third_party/devtools-frontend/src/node_modules/es-abstract/node_modules/string.prototype.trimstart/LICENSE +sha256 cfc3f455254c0af0655cc3ff46a41ed644b67599f6043346169d285bf2b3cf3b chromium/third_party/devtools-frontend/src/node_modules/es-array-method-boxes-properly/LICENSE +sha256 255aa557a1f55224ce522f311629c0bf20854740a67955cefd798fbd1d3d1ded chromium/third_party/devtools-frontend/src/node_modules/escape-html/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/escape-string-regexp/license +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 chromium/third_party/devtools-frontend/src/node_modules/escodegen/LICENSE.BSD +sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 chromium/third_party/devtools-frontend/src/node_modules/escodegen/node_modules/esprima/LICENSE.BSD +sha256 cfc3f455254c0af0655cc3ff46a41ed644b67599f6043346169d285bf2b3cf3b chromium/third_party/devtools-frontend/src/node_modules/es-get-iterator/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/es-get-iterator/node_modules/has-symbols/LICENSE +sha256 68f12f6e2c33688699249c01d8f9623c534da20aa71989c57b061b7bc1676d14 chromium/third_party/devtools-frontend/src/node_modules/es-get-iterator/node_modules/isarray/LICENSE +sha256 7829efc4266fad5f57f7fc489429a3b35d0c62183c0bd617ef6591f64c980c92 chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/node_modules/ms/license.md +sha256 60acd7711e6c138e6041836e32d922705254cc1568a30fdf16aa8f59bb87aeaa chromium/third_party/devtools-frontend/src/node_modules/eslint-import-resolver-node/node_modules/resolve/LICENSE +sha256 db83f2ede67f36cfab1ea0721ea2ee97515863e9a65346881f305e430451cc91 chromium/third_party/devtools-frontend/src/node_modules/eslint/LICENSE +sha256 7829efc4266fad5f57f7fc489429a3b35d0c62183c0bd617ef6591f64c980c92 chromium/third_party/devtools-frontend/src/node_modules/eslint-module-utils/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/eslint-module-utils/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/eslint-module-utils/node_modules/ms/license.md +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/ansi-regex/license +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/globals/license +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/optionator/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/semver/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/eslint/node_modules/strip-json-comments/license +sha256 7829efc4266fad5f57f7fc489429a3b35d0c62183c0bd617ef6591f64c980c92 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/LICENSE +sha256 7829efc4266fad5f57f7fc489429a3b35d0c62183c0bd617ef6591f64c980c92 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/memo-parser/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/debug/LICENSE +sha256 1925669fabfda8475cb886afc52ad90d518fcdc5ca415d086f88db70bb1232eb chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/LICENSE.BSD +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/LICENSE.closure-compiler +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/doctrine/LICENSE.esprima +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/find-up/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/load-json-file/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/locate-path/license +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/ms/license.md +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/path-exists/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/path-type/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/pify/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/p-limit/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/p-locate/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/p-try/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/read-pkg/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/read-pkg-up/license +sha256 60acd7711e6c138e6041836e32d922705254cc1568a30fdf16aa8f59bb87aeaa chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-import/node_modules/resolve/LICENSE +sha256 b67ae8fe5f32d0e6164655de53075cba04bb69c23e7d11efcfed6a0fa265ef64 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-mocha/LICENSE +sha256 541c415066b6139f0fb6ad55f633abbc62f0ba6b54543f1ff00c762e76a90239 chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-rulesdir/LICENSE.md +sha256 d3a724e2ed749f172ff70b62a1d0631b7d4b0ea273782365a3464d4e2d6b6dbd chromium/third_party/devtools-frontend/src/node_modules/eslint-scope/LICENSE +sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b chromium/third_party/devtools-frontend/src/node_modules/eslint-utils/LICENSE +sha256 d8bf34ff6d190640a01e7704ad78253fc181bc128949d71273fbbaa12f33c0b4 chromium/third_party/devtools-frontend/src/node_modules/eslint-visitor-keys/LICENSE +sha256 6273faa0d14a54972c0341a724010eb8cd928ee486745a9eea8cf80680ba5098 chromium/third_party/devtools-frontend/src/node_modules/espree/LICENSE +sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c chromium/third_party/devtools-frontend/src/node_modules/espree/node_modules/acorn/LICENSE +sha256 ac68116ae73740de4190892f334992e449a124600924ec761e64319d3aac9e6e chromium/third_party/devtools-frontend/src/node_modules/esquery/license.txt +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 chromium/third_party/devtools-frontend/src/node_modules/esquery/node_modules/estraverse/LICENSE.BSD +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/es-to-primitive/LICENSE +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 chromium/third_party/devtools-frontend/src/node_modules/estraverse/LICENSE.BSD +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 chromium/third_party/devtools-frontend/src/node_modules/esutils/LICENSE.BSD +sha256 3aecc12b1cb28832b5f65ab64291de96568c3f236a74d646281b4491f7bcadbf chromium/third_party/devtools-frontend/src/node_modules/eventemitter3/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/execall/license +sha256 97af7428f93afbab9bf79cd09254da1357161794f4255eb1b4599f04dd2d2e7c chromium/third_party/devtools-frontend/src/node_modules/extend/LICENSE +sha256 e33b7bc13a0e5ea9ed6718e12e99a5b0b60276162f0195aa7f342397f4b0155d chromium/third_party/devtools-frontend/src/node_modules/external-editor/LICENSE +sha256 77b2de947c65f3062fb347118ca198ca50898ead84a8509d8153fa65741f029b chromium/third_party/devtools-frontend/src/node_modules/extract-zip/LICENSE +sha256 7bf9b2de73a6b356761c948d0e9eeb4be6c1270bd04c79cd489c1e400ffdfc1a chromium/third_party/devtools-frontend/src/node_modules/fast-deep-equal/LICENSE +sha256 9363d160bf41d46d83901a5d24fc3fe2094c2afc17b4a2378914b273977ee2de chromium/third_party/devtools-frontend/src/node_modules/fast-glob/LICENSE +sha256 d0cd141b0c322fded5dfad1d4645bb2fedfc05b7321fe1009469638190d59ef9 chromium/third_party/devtools-frontend/src/node_modules/fast-glob/node_modules/picomatch/LICENSE +sha256 a833d366242c298cf1b10263516572fb8dcbe68eb5072cdcac2b4546e2b4eb36 chromium/third_party/devtools-frontend/src/node_modules/fast-json-stable-stringify/LICENSE +sha256 942a98cb8846a6354266193f173c1354615827fbb7d67f68399599dff12c4d6a chromium/third_party/devtools-frontend/src/node_modules/fast-levenshtein/LICENSE.md +sha256 c3367f6d01a79d368fc4fbb41b3615fcd92f243d6597ab96742f6f976f9325af chromium/third_party/devtools-frontend/src/node_modules/fastq/LICENSE +sha256 176d95320d565cb034d8323797b6cd6160238f625453687f98aad2085c46c3b3 chromium/third_party/devtools-frontend/src/node_modules/fd-slicer/LICENSE +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/figures/license +sha256 c8c8324aff32c44f9e501aac5b3b97540c26af7d6dd6af8bce5e34300596e27d chromium/third_party/devtools-frontend/src/node_modules/file-entry-cache/LICENSE +sha256 35bdd8a44339719441900fb50fbefc5e2dca1ca662cbaed7a687de842c8b70f2 chromium/third_party/devtools-frontend/src/node_modules/fill-range/LICENSE +sha256 24973d5320410e565ec92f18f73f12af7d97c634d414ba170d119fe3f98904c8 chromium/third_party/devtools-frontend/src/node_modules/finalhandler/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/ms/license.md +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/find-up/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/find-up/node_modules/path-exists/license +sha256 c8c8324aff32c44f9e501aac5b3b97540c26af7d6dd6af8bce5e34300596e27d chromium/third_party/devtools-frontend/src/node_modules/flat-cache/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/flat-cache/node_modules/rimraf/LICENSE +sha256 95a61f61553614db5421a2cefb17c22ff6b2b4b2206f5bc8913d04f72a22b033 chromium/third_party/devtools-frontend/src/node_modules/flat/LICENSE +sha256 5097efeab30293dd7e26d6960b6b94f1aeca958d22f1eca3535c482a891e95a9 chromium/third_party/devtools-frontend/src/node_modules/flatted/LICENSE +sha256 bfa8a54bb952ccda79f0f1889721d108f5b605babbb2b8a3705ffb52f4132eb7 chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/node_modules/debug/LICENSE +sha256 2281f2db407bdbb54f069eec38128b2dee2c0c952f52b786ef1faecb81767b3c chromium/third_party/devtools-frontend/src/node_modules/fs-constants/LICENSE +sha256 1e76029602ae9b21cc4e612db2496d92febed882ba13ba745f8b3309e85f9d39 chromium/third_party/devtools-frontend/src/node_modules/fs-extra/LICENSE +sha256 8465b04b67f473341171b5c9c8b2c741a4a395b3f6ed58339b3a4f4db3db7472 chromium/third_party/devtools-frontend/src/node_modules/fs.realpath/LICENSE +sha256 e67aed7df22dc8031e4fcf5338fe91cb33e3817e5c58a99a2a2802eea9069791 chromium/third_party/devtools-frontend/src/node_modules/functional-red-black-tree/LICENSE +sha256 773e131a7684726005a7e4688a80b4620033bc08499bc1404dd1a1eb3bca725e chromium/third_party/devtools-frontend/src/node_modules/function-bind/LICENSE +sha256 e3a956681ee067f971ac413994171b3d90ca801ec6324e76c9c55366cfe31cb0 chromium/third_party/devtools-frontend/src/node_modules/gensync/LICENSE +sha256 902dbb4154679fb2b8d7c33878183f45b268d01eae5e5033dddaa8852d45f213 chromium/third_party/devtools-frontend/src/node_modules/get-caller-file/LICENSE.md +sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 chromium/third_party/devtools-frontend/src/node_modules/get-func-name/LICENSE +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/get-stdin/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/get-stream/license +sha256 e7d1fee7347ffddccc5fd03327ffdb50f8c112be0d5016d62388a92c4ae6e7a9 chromium/third_party/devtools-frontend/src/node_modules/global-modules/LICENSE +sha256 e7d1fee7347ffddccc5fd03327ffdb50f8c112be0d5016d62388a92c4ae6e7a9 chromium/third_party/devtools-frontend/src/node_modules/global-prefix/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/globals/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/globby/license +sha256 9c94db23dc4b1e9aaee5d195668b916afc71efed54af226b66cf0ccc4389c1c0 chromium/third_party/devtools-frontend/src/node_modules/globby/node_modules/ignore/LICENSE-MIT +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/globby/node_modules/slash/license +sha256 5947e11f30ab8264c45332a7d767447a71a52510ba467062cf3918e34cc67bff chromium/third_party/devtools-frontend/src/node_modules/globjoin/LICENSE +sha256 6236fa0b88a4a0cce3dda0367979491b2052b3c8d6b1c10b3668de083e86a7f0 chromium/third_party/devtools-frontend/src/node_modules/glob/LICENSE +sha256 2c46f1325bd3822a33c1e2c1e49c18d13127ac00f9c8b3b79196c7a126f73cd9 chromium/third_party/devtools-frontend/src/node_modules/glob-parent/LICENSE +sha256 2fc5460f1526810979054ecd18cd01349b57f38ea56d1e920afdea34d104540c chromium/third_party/devtools-frontend/src/node_modules/graceful-fs/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/hard-rejection/license +sha256 dc1fcc41f783463ed272ada875a7d3d1baf6c6279e5efada2c4ef2ca72db39e1 chromium/third_party/devtools-frontend/src/node_modules/has-binary2/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/has-flag/license +sha256 4fe5fd7b3318def0b74f8bf8c9276403f01da628fa8888822661519d80f237d3 chromium/third_party/devtools-frontend/src/node_modules/has/LICENSE-MIT +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/has-symbols/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/he/LICENSE-MIT.txt +sha256 c1476ec53119cd4c8370f91f5152ac76312a29b4fae2d49b5e0e0970fe0fa5ee chromium/third_party/devtools-frontend/src/node_modules/hosted-git-info/LICENSE +sha256 27d06bbb2eb031be8aa376868a2e1f11b6acba938d4cc8e1234b66b9739c54a3 chromium/third_party/devtools-frontend/src/node_modules/html-escaper/LICENSE.txt +sha256 204cfa747341660e4da64cd23e8c876c6b20279d247f48564993d3fc4a2eab47 chromium/third_party/devtools-frontend/src/node_modules/htmlparser2/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/html-tags/license +sha256 dcb94ff9b1e037a847bc20589dc81a1066d041fd4c16deb18b0fa968c66cf395 chromium/third_party/devtools-frontend/src/node_modules/http-errors/LICENSE +sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b chromium/third_party/devtools-frontend/src/node_modules/http-errors/node_modules/inherits/LICENSE +sha256 589850dfc0a1d39a97c592d618d5772f84aec2b11c6898e020acb985299f3bab chromium/third_party/devtools-frontend/src/node_modules/http-proxy/LICENSE +sha256 ac779f7314c74f232ef847ea86e714abe25cf6eeb5cc97b69451b74e2af6492d chromium/third_party/devtools-frontend/src/node_modules/iconv-lite/LICENSE +sha256 18d45466ba3253deae04667e267a91ea8de8548f18c1125264d1c9db28194cc1 chromium/third_party/devtools-frontend/src/node_modules/ieee754/LICENSE +sha256 9c94db23dc4b1e9aaee5d195668b916afc71efed54af226b66cf0ccc4389c1c0 chromium/third_party/devtools-frontend/src/node_modules/ignore/LICENSE-MIT +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/import-fresh/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/import-lazy/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/indent-string/license +sha256 715f1f0f2eb7688e53e4e958acdc7fc9e365ae3eaf26efc2604b93cc65fdc3f5 chromium/third_party/devtools-frontend/src/node_modules/indexes-of/LICENSE +sha256 05dc4d785ac3a488676d3ed10e901b75ad89dafcc63f8e66610fd4a39cc5c7e8 chromium/third_party/devtools-frontend/src/node_modules/inflight/LICENSE +sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b chromium/third_party/devtools-frontend/src/node_modules/inherits/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/ini/LICENSE +sha256 e6c3f1bc47f97cdeef953f6c109b6392be0d059ae94659faf550e61b7a75ebc7 chromium/third_party/devtools-frontend/src/node_modules/inquirer/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-regex/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-styles/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/chalk/license +sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/color-convert/LICENSE +sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/color-name/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/has-flag/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/is-fullwidth-code-point/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/supports-color/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/is-alphabetical/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/is-alphanumerical/license +sha256 3a4909999d4cb5e4caee48395d9ac13085f4a8cb92245eef41526073601aaec8 chromium/third_party/devtools-frontend/src/node_modules/is-alphanumeric/license +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/is-arguments/LICENSE +sha256 92b07a2e5b0e051d37dde85042c736d6d551cfcbc0983f39d7ef903b3986bbc1 chromium/third_party/devtools-frontend/src/node_modules/is-arrayish/LICENSE +sha256 2eedc70f2242aaf269e86e2c85eabeb875dc524d187d5953016b24091d26a843 chromium/third_party/devtools-frontend/src/node_modules/isbinaryfile/LICENSE.txt +sha256 85fe65eefab89e2a683232b96e6f689279821a0bd3b351e9ab6a6ebd19dea567 chromium/third_party/devtools-frontend/src/node_modules/is-binary-path/license +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac chromium/third_party/devtools-frontend/src/node_modules/is-buffer/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/is-callable/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/is-date-object/LICENSE +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/is-decimal/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/isexe/LICENSE +sha256 73b5283588baa142c5baaef5f56d3e8fdea7a30b214e8c5737e87640f882453a chromium/third_party/devtools-frontend/src/node_modules/is-extglob/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/is-fullwidth-code-point/license +sha256 4cd903859549d4b20b571041f96dfae1136ed079c476126268f9d7cc1b611150 chromium/third_party/devtools-frontend/src/node_modules/is-glob/LICENSE +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/is-hexadecimal/license +sha256 5a26e47b9d7020848f061bcad66f8e73cab95f529dab5c02588b21e57c4f876c chromium/third_party/devtools-frontend/src/node_modules/is-map/LICENSE +sha256 35bdd8a44339719441900fb50fbefc5e2dca1ca662cbaed7a687de842c8b70f2 chromium/third_party/devtools-frontend/src/node_modules/is-number/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/is-plain-obj/license +sha256 44191656d296391e0ec97e32f5385f0d02b6f2992694082d22ea04ba0f66f9e4 chromium/third_party/devtools-frontend/src/node_modules/is-promise/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/is-regex/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/is-regex/node_modules/has-symbols/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/is-regexp/license +sha256 5a26e47b9d7020848f061bcad66f8e73cab95f529dab5c02588b21e57c4f876c chromium/third_party/devtools-frontend/src/node_modules/is-set/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/is-string/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/is-symbol/LICENSE +sha256 5a547aafe7b171c859ec64de1dd3c3363689f830133f508d043c83da12a6d0a2 chromium/third_party/devtools-frontend/src/node_modules/@istanbuljs/schema/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/is-typedarray/LICENSE.md +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/is-whitespace-character/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/is-word-character/license +sha256 39c5ec504cf6bd5cd782a7c695828e09189df79f5d94840e4f08feb97b9fd416 chromium/third_party/devtools-frontend/src/node_modules/iterate-iterator/LICENSE +sha256 cfc3f455254c0af0655cc3ff46a41ed644b67599f6043346169d285bf2b3cf3b chromium/third_party/devtools-frontend/src/node_modules/iterate-value/LICENSE +sha256 52412d7bc7ce4157ea628bbaacb8829e0a9cb3c58f57f99176126bc8cf2bfc85 chromium/third_party/devtools-frontend/src/node_modules/jest-worker/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/jest-worker/node_modules/supports-color/license +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/jsesc/LICENSE-MIT.txt +sha256 53e59feb13058722d977c699eb0407c7bce2f93c949b681bbd2ff31698535927 chromium/third_party/devtools-frontend/src/node_modules/json5/LICENSE.md +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/json5/node_modules/minimist/LICENSE +sha256 a9801fb52ba22ef808682a094da8a7a480584b7ed0dfd0d888ab543616335031 chromium/third_party/devtools-frontend/src/node_modules/jsonfile/LICENSE +sha256 6cf2891dd0e66460f7d2ed83e1e3fe4b4b4c1a8c1f1f96c222a3466ad12ff197 chromium/third_party/devtools-frontend/src/node_modules/json-parse-better-errors/LICENSE.md +sha256 7bf9b2de73a6b356761c948d0e9eeb4be6c1270bd04c79cd489c1e400ffdfc1a chromium/third_party/devtools-frontend/src/node_modules/json-schema-traverse/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/json-stable-stringify-without-jsonify/LICENSE +sha256 2213d91c606205c71eb051a199478cdc2adde945893404d7f1421436dd6d5cc1 chromium/third_party/devtools-frontend/src/node_modules/js-tokens/LICENSE +sha256 a07bc24468b9654ce76a547d47a2db282d07733b715db4c73a98bd63961f9550 chromium/third_party/devtools-frontend/src/node_modules/js-yaml/LICENSE +sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 chromium/third_party/devtools-frontend/src/node_modules/js-yaml/node_modules/esprima/LICENSE.BSD +sha256 e3d4ed2aa50e7583730b1531034331ba9093c8bef7414234c7c9306db3858913 chromium/third_party/devtools-frontend/src/node_modules/karma-chai/LICENSE +sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c chromium/third_party/devtools-frontend/src/node_modules/karma-chrome-launcher/LICENSE +sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/code-frame/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/generator/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/helper-function-name/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/helper-get-function-arity/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/helper-split-export-declaration/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/highlight/LICENSE +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/parser/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/template/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/traverse/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/types/LICENSE +sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/@babel/types/node_modules/@babel/helper-validator-identifier/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/has-flag/license +sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-coverage/LICENSE +sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-instrument/LICENSE +sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-report/LICENSE +sha256 b661867c1d66a1b71ee3a6109159874334cd5c182a80d1bcc7353b5a4c6823c6 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-source-maps/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-lib-source-maps/node_modules/source-map/LICENSE +sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/istanbul-reports/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/make-dir/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/semver/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/source-map/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/supports-color/license +sha256 6e4e577107740b24ebd73cb813be506861d706129e502ca7160683a5cea4c129 chromium/third_party/devtools-frontend/src/node_modules/karma/LICENSE +sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/ansi-regex/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/ansi-styles/license +sha256 2dc0465729366c3a7890dfa9e972a1ba7048a26c02116fb8b419a6a1ac110149 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/cliui/LICENSE.txt +sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/color-convert/LICENSE +sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/color-name/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/find-up/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/is-fullwidth-code-point/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/locate-path/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/path-exists/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/p-locate/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/rimraf/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/wrap-ansi/license +sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/yargs/LICENSE +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/yargs-parser/LICENSE.txt +sha256 2b3adc1e55676b9443f76bdb17e42371de98a4be6abd3ae6e5f3590f6f3e4f6f chromium/third_party/devtools-frontend/src/node_modules/karma-sourcemap-loader/LICENSE +sha256 4cd903859549d4b20b571041f96dfae1136ed079c476126268f9d7cc1b611150 chromium/third_party/devtools-frontend/src/node_modules/kind-of/LICENSE +sha256 81294ebf877cb41ed610fa0566c6cf81cd62d47e9ae26e1b0870c9c532b11191 chromium/third_party/devtools-frontend/src/node_modules/known-css-properties/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/leven/license +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c chromium/third_party/devtools-frontend/src/node_modules/levn/LICENSE +sha256 150d7707d4532d57bdb5718637ff62fff1f075921c5ffaa084df27f900bfea76 chromium/third_party/devtools-frontend/src/node_modules/license-checker/bin/license-checker +sha256 455629980585dfdadbdcbaf846659b65da3dd092ac9bfd10b07717a0e2f84ef5 chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license-files.js +sha256 37932d5f93a7f9e762346358ae427e703d69fdaae6e7cd67158b35eea91c9eec chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license.js +sha256 adeb5a7f7d027ec14c3698be7a0f248978516ab39ccec4fb70689ba4753cdd67 chromium/third_party/devtools-frontend/src/node_modules/license-checker/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/debug/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/nopt/LICENSE +sha256 456fe85ad3e71db9523313cf7437b0f90c392d8a48c869908e46716b26d2cf53 chromium/third_party/devtools-frontend/src/node_modules/lines-and-columns/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/locate-path/license +sha256 f71e8ed126b46346494aad5486874cd8f0aafe95092ed67d2e3cb6110f939abc chromium/third_party/devtools-frontend/src/node_modules/lodash/LICENSE +sha256 66da8b277e527c270de6abc57727c58032267d161a81dbac02c3eed45fd13366 chromium/third_party/devtools-frontend/src/node_modules/log4js/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/log-symbols/license +sha256 9f084fac69d8cf1e6ce983ba5a3499c7695ed74a26ec625c38f0fd19fddd5e10 chromium/third_party/devtools-frontend/src/node_modules/longest-streak/license +sha256 1cbe51b907662f6cb1492b16c359384a595180bf0e4d101603ed525e75c4e484 chromium/third_party/devtools-frontend/src/node_modules/magic-string/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/map-obj/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/markdown-escapes/license +sha256 9966260ba3ea9d6a5f839297dca80ddc99735a34b4ae82811cac7b956d2e3afd chromium/third_party/devtools-frontend/src/node_modules/markdown-table/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/mathml-tag-names/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/mdast-util-compact/license +sha256 74d8054d56d522bdaa340d3d71130cb204997d523a5292c85ac1264dd77c8d06 chromium/third_party/devtools-frontend/src/node_modules/media-typer/LICENSE +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/meow/license +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/camelcase/license +sha256 64a93ffc0a06a2266dbb57ed7ebe3b56ba66ab337b6347fabdbf86c76819fbae chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/type-fest/license +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/yargs-parser/LICENSE.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/yargs-parser/node_modules/camelcase/license +sha256 23d150eb1337116025fbb4de7cd2a757540feec928eef5ae30c91f9f500a4dbc chromium/third_party/devtools-frontend/src/node_modules/merge2/LICENSE +sha256 2cee71bf4612fc2efe1c6261e3f2b21f3c7259ef8a4f3593b095ae7a7bd65ad9 chromium/third_party/devtools-frontend/src/node_modules/merge-stream/LICENSE +sha256 35bdd8a44339719441900fb50fbefc5e2dca1ca662cbaed7a687de842c8b70f2 chromium/third_party/devtools-frontend/src/node_modules/micromatch/LICENSE +sha256 965ef284f7f4c176842ec2e87fa13e79feed777d56d7a21a5a3b38f1bb6dc288 chromium/third_party/devtools-frontend/src/node_modules/mime-db/LICENSE +sha256 8f2658c03422c408b2b2ce4d151decc3b1a6fd3d86e5ca9433777bccdcdf75a2 chromium/third_party/devtools-frontend/src/node_modules/mime/LICENSE +sha256 71f83c4c0621102a56d9853812777b85751bce7e9726f686f5b056c1f8a4b0e6 chromium/third_party/devtools-frontend/src/node_modules/mime-types/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mimic-fn/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/minimatch/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/minimist/LICENSE +sha256 6158b1bc31ab9c05c0be562cf57a0590a1dc86a4ce8b8a48a5e73df6c259ed61 chromium/third_party/devtools-frontend/src/node_modules/minimist-options/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/minimist-options/node_modules/arrify/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/minimist-options/node_modules/is-plain-obj/license +sha256 9638fa87f845af6cecc56fab498c1f74f4a98522d3b53377bedcbdb44b5a8dcc chromium/third_party/devtools-frontend/src/node_modules/min-indent/license +sha256 a255b85c1a510ecfe660c4d442ecdbc1e9d07f4b4d3d7f90443f7e5570591e0a chromium/third_party/devtools-frontend/src/node_modules/mkdirp-classic/LICENSE +sha256 05991c2e8f070b69ec5b656c2c12fd07cd0153dd157d39b050b82af59b319a01 chromium/third_party/devtools-frontend/src/node_modules/mkdirp/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/mkdirp/node_modules/minimist/LICENSE +sha256 88597c9a3af6b6ae2fa6225a52344c7ddc705883d6fe1f2b3a95fdc72d2d1a20 chromium/third_party/devtools-frontend/src/node_modules/mocha/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ansi-regex/license +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/debug/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 6236fa0b88a4a0cce3dda0367979491b2052b3c8d6b1c10b3668de083e86a7f0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/glob/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/has-flag/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/locate-path/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/p-locate/license +sha256 d3dfa68a3c80e64eb10e46cef10e4208502da5ffb1387b11db00e42a507ab8f7 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/serialize-javascript/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/supports-color/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/which/LICENSE +sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/yargs/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/yargs/node_modules/find-up/license +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/ms/license.md +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/mute-stream/LICENSE +sha256 553d4d20029a24e315b428a1a54a9e109eaa340f2e958a4f50a92362c2c4070b chromium/third_party/devtools-frontend/src/node_modules/negotiator/LICENSE +sha256 bd220c219b05e6c22b7c23613ca926f60932d07c9fe141dd6e04b80dbc4b4e52 chromium/third_party/devtools-frontend/src/node_modules/nice-try/LICENSE +sha256 9363d160bf41d46d83901a5d24fc3fe2094c2afc17b4a2378914b273977ee2de chromium/third_party/devtools-frontend/src/node_modules/@nodelib/fs.scandir/LICENSE +sha256 9363d160bf41d46d83901a5d24fc3fe2094c2afc17b4a2378914b273977ee2de chromium/third_party/devtools-frontend/src/node_modules/@nodelib/fs.stat/LICENSE +sha256 9363d160bf41d46d83901a5d24fc3fe2094c2afc17b4a2378914b273977ee2de chromium/third_party/devtools-frontend/src/node_modules/@nodelib/fs.walk/LICENSE +sha256 3706296ed611888111ceccc1dff4712844dea4bde0b185c82d718c3b69895abe chromium/third_party/devtools-frontend/src/node_modules/node-releases/LICENSE +sha256 d16b2b8c511d9f2bef8bbf49f0e2a94f032b6b8d181f71c83912c34c116a02e1 chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/LICENSE +sha256 60acd7711e6c138e6041836e32d922705254cc1568a30fdf16aa8f59bb87aeaa chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/node_modules/resolve/LICENSE +sha256 e70ff771504ba41f2be55de812a017ff46433d7a250c862e38fc419159e44500 chromium/third_party/devtools-frontend/src/node_modules/normalize-path/LICENSE +sha256 0b61ac8491c66669491fdb328200203822b91d2a0461f5cd898fe0944ea97e41 chromium/third_party/devtools-frontend/src/node_modules/normalize-range/license +sha256 65155820306c6f73fe67358bf14c2e1eb24e29e9d0cad280b8f0f7be3319e434 chromium/third_party/devtools-frontend/src/node_modules/num2fraction/LICENSE +sha256 a596744eec6b05682ed972bf93937668bbc8da2caed93fbf6510389de019b5c0 chromium/third_party/devtools-frontend/src/node_modules/object.assign/LICENSE +sha256 bd40cc437e28a3ad7bef2ad34e6b72e757b182e67bda1acadbab4ef0476f8232 chromium/third_party/devtools-frontend/src/node_modules/object-inspect/LICENSE +sha256 5640e5cbe2e9f57f6ccfdd8dbfbeadb875495bdbcb69d2666ce3177ccd0942e4 chromium/third_party/devtools-frontend/src/node_modules/object-keys/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/object.values/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/es-abstract/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/es-to-primitive/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/has-symbols/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/is-callable/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/is-regex/LICENSE +sha256 bd40cc437e28a3ad7bef2ad34e6b72e757b182e67bda1acadbab4ef0476f8232 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/object-inspect/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/string.prototype.trimleft/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/object.values/node_modules/string.prototype.trimright/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/once/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/onetime/license +sha256 8089bcc08845ec143e5761f4a101a65b8c792a0dedbfeeb90a15560c0b77f768 chromium/third_party/devtools-frontend/src/node_modules/on-finished/LICENSE +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c chromium/third_party/devtools-frontend/src/node_modules/optionator/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/osenv/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/os-homedir/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/os-tmpdir/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/parent-module/license +sha256 9f084fac69d8cf1e6ce983ba5a3499c7695ed74a26ec625c38f0fd19fddd5e10 chromium/third_party/devtools-frontend/src/node_modules/parse-entities/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/parse-json/license +sha256 a41d7b212c43bf90af534ec5d73d24a65e3a8cf17941b6d10e9398346a179698 chromium/third_party/devtools-frontend/src/node_modules/parseqs/LICENSE +sha256 15c35ddf8c82a5fc84e3801db12e279b744605d6ad810e1b52ad09832fc71806 chromium/third_party/devtools-frontend/src/node_modules/parseuri/LICENSE +sha256 11d017c3b9f1ee3f44caf7203035f0461d5b57e0db8ce1bc03a9af34fa7d3f6b chromium/third_party/devtools-frontend/src/node_modules/parseurl/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/path-exists/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/path-is-absolute/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/path-key/license +sha256 3f4609137f65070541b9214300ea0d640af8192857de0eeb2b03403003d9228a chromium/third_party/devtools-frontend/src/node_modules/path-parse/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/path-type/license +sha256 5d45910e7ed82fecc3e29b40a5b3a17ceb609fda19f860aa2ec180d87f4f9d4a chromium/third_party/devtools-frontend/src/node_modules/pathval/LICENSE +sha256 7e64acffcb0d20d33f5a86949ffd4a99ae045b10c7332a9c3a58635876c16880 chromium/third_party/devtools-frontend/src/node_modules/pend/LICENSE +sha256 d0cd141b0c322fded5dfad1d4645bb2fedfc05b7321fe1009469638190d59ef9 chromium/third_party/devtools-frontend/src/node_modules/picomatch/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/find-up/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/locate-path/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/path-exists/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/p-limit/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/p-locate/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-dir/node_modules/p-try/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-up/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/find-up/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/locate-path/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/p-limit/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/p-locate/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/pkg-up/node_modules/p-try/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/p-limit/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/p-locate/license +sha256 2db459b0f45bd3b3836c374c6ef9ff5b2b2a31628e09f3c803e18f6c629b56b1 chromium/third_party/devtools-frontend/src/node_modules/postcss-html/LICENSE +sha256 ce4ef9c48a45bbfc480671256a45a191ece0622d78061599b09b0ee60cf517d6 chromium/third_party/devtools-frontend/src/node_modules/postcss-less/LICENSE +sha256 c4630ac8b89cb317ac5bdd60ac5e4e185eab9bd5151a0c7b3afa41aa83d7ec9b chromium/third_party/devtools-frontend/src/node_modules/postcss/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/postcss/node_modules/supports-color/license +sha256 8e714750725e75c8b31172ef84c0805f94873f86e3b5cfca8a948553f0778fa1 chromium/third_party/devtools-frontend/src/node_modules/postcss-reporter/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/postcss-reporter/node_modules/log-symbols/license +sha256 d060f91dafa4f2daaeb5a87bdaab60217a5beb87a31eb0c480420710368ebf15 chromium/third_party/devtools-frontend/src/node_modules/postcss-resolve-nested-selector/LICENSE +sha256 c4630ac8b89cb317ac5bdd60ac5e4e185eab9bd5151a0c7b3afa41aa83d7ec9b chromium/third_party/devtools-frontend/src/node_modules/postcss-safe-parser/LICENSE +sha256 e695904c289dbc8a8bca514639c4ec26e695cf21c3c1f12a917d325b26396917 chromium/third_party/devtools-frontend/src/node_modules/postcss-sass/LICENSE +sha256 c4630ac8b89cb317ac5bdd60ac5e4e185eab9bd5151a0c7b3afa41aa83d7ec9b chromium/third_party/devtools-frontend/src/node_modules/postcss-scss/LICENSE +sha256 2998094b38f7ace25f141fb36f334d8338f65a1812978d618b1161f4d77ae10e chromium/third_party/devtools-frontend/src/node_modules/postcss-selector-parser/LICENSE-MIT +sha256 2db459b0f45bd3b3836c374c6ef9ff5b2b2a31628e09f3c803e18f6c629b56b1 chromium/third_party/devtools-frontend/src/node_modules/postcss-syntax/LICENSE +sha256 3687447039151857a6ba378db062172c7f33d4aa70a615c87a43a9c50e990485 chromium/third_party/devtools-frontend/src/node_modules/postcss-value-parser/LICENSE +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c chromium/third_party/devtools-frontend/src/node_modules/prelude-ls/LICENSE +sha256 f4bbb78fa28677ad9b9c0a4b7a255e23c0b24e619c873ed66a11d47c16c88114 chromium/third_party/devtools-frontend/src/node_modules/private/LICENSE +sha256 d7d2a7786de7c7cfd96f920c6f12927d74e1d2a861ca4498bf465c3bc3f4c21c chromium/third_party/devtools-frontend/src/node_modules/progress/LICENSE +sha256 cfc3f455254c0af0655cc3ff46a41ed644b67599f6043346169d285bf2b3cf3b chromium/third_party/devtools-frontend/src/node_modules/promise.allsettled/LICENSE +sha256 f55828df4b8752c48e765a806465b76a103e3cb363379c569b15a1df2ba2d79e chromium/third_party/devtools-frontend/src/node_modules/proxy-from-env/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/p-try/license +sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 chromium/third_party/devtools-frontend/src/node_modules/pump/LICENSE +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/punycode/LICENSE-MIT.txt +sha256 a27ca07269b3518550b2e83aed13eadd7d14d924b5864e14889b40cf227530ca chromium/third_party/devtools-frontend/src/node_modules/puppeteer/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/pkg-dir/license +sha256 3de284c8e6fa7e8437eff6f53695471e0332129a5b42a79361e17b7637de94b3 chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/ws/LICENSE +sha256 d2f9d2835eb09ccf673e118e4fdc372075437c1787e66c2202912fbe3e5ee9e1 chromium/third_party/devtools-frontend/src/node_modules/qs/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/quick-lru/license +sha256 f0606775704212c0b49fb4df8193f7ec190d057551fc857d9f3aaa482b878e29 chromium/third_party/devtools-frontend/src/node_modules/ramda/LICENSE.txt +sha256 f655e6291356ec0de7a8f0e69f294961a2cea86678ec94588be1e6a492e278ab chromium/third_party/devtools-frontend/src/node_modules/range-parser/LICENSE +sha256 c8e6bca7230689d536a3bd7158f66e9c4f89f95d0748743a0370ac229e9023ad chromium/third_party/devtools-frontend/src/node_modules/raw-body/LICENSE +sha256 ec62dc96da0099b87f4511736c87309335527fb7031639493e06c95728dc8c54 chromium/third_party/devtools-frontend/src/node_modules/readable-stream/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/readdir-scoped-modules/LICENSE +sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b chromium/third_party/devtools-frontend/src/node_modules/read-installed/LICENSE +sha256 69be713b3d6c33e0dba76c4d23d986d568593abca04ce47d75162af255d6a345 chromium/third_party/devtools-frontend/src/node_modules/read-package-json/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg/node_modules/parse-json/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg/node_modules/type-fest/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/find-up/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/locate-path/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/path-exists/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/node_modules/p-locate/license +sha256 6ca87d1dce5b82873603e566fd83dabe8771fb169013337d4a14bb9bbf794687 chromium/third_party/devtools-frontend/src/node_modules/recast/LICENSE +sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 chromium/third_party/devtools-frontend/src/node_modules/recast/node_modules/esprima/LICENSE.BSD +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/redent/license +sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b chromium/third_party/devtools-frontend/src/node_modules/regexpp/LICENSE +sha256 3672fb6ef1c214578dfee689643516c2685f61ab08d130517ca8ea24f383a840 chromium/third_party/devtools-frontend/src/node_modules/repeat-string/LICENSE +sha256 dcb55717e2528ce8ffcff58a26dbc456d03929422ef59b6efdabbb931ef09aea chromium/third_party/devtools-frontend/src/node_modules/replace-ext/LICENSE +sha256 a92e52eb1fa7cd746e3827bf01d3a3589bbc8e1e51348b1da042aad165525ad1 chromium/third_party/devtools-frontend/src/node_modules/require-directory/LICENSE +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d chromium/third_party/devtools-frontend/src/node_modules/require-main-filename/LICENSE.txt +sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 chromium/third_party/devtools-frontend/src/node_modules/requires-port/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/resolve-from/license +sha256 60acd7711e6c138e6041836e32d922705254cc1568a30fdf16aa8f59bb87aeaa chromium/third_party/devtools-frontend/src/node_modules/resolve/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/restore-cursor/license +sha256 db0054e6418412e4a265236c94d1d8935057c67f367240b01bb2b0b2f9091812 chromium/third_party/devtools-frontend/src/node_modules/reusify/LICENSE +sha256 1ce941682a96c7b898ecd125d0f2e22319758ea6f3adbf498a65d649b0f3f7dd chromium/third_party/devtools-frontend/src/node_modules/rfdc/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/rimraf/LICENSE +sha256 d6a61720669b71b4920ead9792298c3b4e27ce776282053c9df3b781fc8480ca chromium/third_party/devtools-frontend/src/node_modules/rollup/LICENSE.md +sha256 99de4c30f4643c00d4895d9c6ade0af4ec43d301449c191f5fbe41b53bb6a13a chromium/third_party/devtools-frontend/src/node_modules/rollup/node_modules/fsevents/LICENSE +sha256 7b8136f76c483d03597500bfa991aae9be68d4629e1121cbf9b93aa727efe305 chromium/third_party/devtools-frontend/src/node_modules/@rollup/plugin-commonjs/LICENSE +sha256 a361479777395f33fb109bd77c7888663f5dc6f3a18ddaba812cf81be29e0cc3 chromium/third_party/devtools-frontend/src/node_modules/rollup-plugin-terser/LICENSE +sha256 7b8136f76c483d03597500bfa991aae9be68d4629e1121cbf9b93aa727efe305 chromium/third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/LICENSE +sha256 d0cd141b0c322fded5dfad1d4645bb2fedfc05b7321fe1009469638190d59ef9 chromium/third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/node_modules/picomatch/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@rollup/pluginutils/node_modules/@types/estree/LICENSE +sha256 e5c1364118b39fa98b959138ce4aa4d0e68cfbee12d115e69730579fecb1dc1b chromium/third_party/devtools-frontend/src/node_modules/run-async/LICENSE +sha256 d4c2065e2b936e62a4eb400efb4576edec9ca1388a9f78aa288e147275e7bc8b chromium/third_party/devtools-frontend/src/node_modules/run-parallel/LICENSE +sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm2015/LICENSE.txt +sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm5/LICENSE.txt +sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade chromium/third_party/devtools-frontend/src/node_modules/rxjs/LICENSE.txt +sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade chromium/third_party/devtools-frontend/src/node_modules/rxjs/src/LICENSE.txt +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac chromium/third_party/devtools-frontend/src/node_modules/safe-buffer/LICENSE +sha256 4bc935e71be198c67ddf3c2b5fddb195f6edc182bfc155a96a6db61b44b494b9 chromium/third_party/devtools-frontend/src/node_modules/safer-buffer/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/semver/LICENSE +sha256 d3dfa68a3c80e64eb10e46cef10e4208502da5ffb1387b11db00e42a507ab8f7 chromium/third_party/devtools-frontend/src/node_modules/serialize-javascript/LICENSE +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d chromium/third_party/devtools-frontend/src/node_modules/set-blocking/LICENSE.txt +sha256 76d6d1ea0c268da37dd3c961b4fcfb23dee8417fff9e8786d4d44c585b781b69 chromium/third_party/devtools-frontend/src/node_modules/setprototypeof/LICENSE +sha256 e6fdf7ac2af533b4436d99aa75df32aa78690510f7d68a3e73e8576967298d2f chromium/third_party/devtools-frontend/src/node_modules/shebang-command/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/shebang-regex/license +sha256 e05b1eaf5b5f99b7ad75cd1f38858ff9a311780b97715ead67936d60bf96aa7e chromium/third_party/devtools-frontend/src/node_modules/signal-exit/LICENSE.txt +sha256 3dc3b3d3a284d871f7f307655c90fb101d73abbf87bbddeefd2f67883353bdbc chromium/third_party/devtools-frontend/src/node_modules/slice-ansi/license +sha256 05dc4d785ac3a488676d3ed10e901b75ad89dafcc63f8e66610fd4a39cc5c7e8 chromium/third_party/devtools-frontend/src/node_modules/slide/LICENSE +sha256 56b7b228fde8d638cc7f1c3d0022cf111764083ac4f803b7a50a90388dce3788 chromium/third_party/devtools-frontend/src/node_modules/socket.io-adapter/LICENSE +sha256 62e2032a1e1458b1d92a62f5fc51be48e08b95062295c91a9f3bd3686809d37e chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/ms/license.md +sha256 c10d192d935165dac336ae245f9eef4c42bb37e7c6f5c5f6f7663db778122df1 chromium/third_party/devtools-frontend/src/node_modules/socket.io/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/ms/license.md +sha256 56b7b228fde8d638cc7f1c3d0022cf111764083ac4f803b7a50a90388dce3788 chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/debug/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/ms/license.md +sha256 1c632a84f7ba5a7b32d9c15e707f419b2393e7ad7de362bd9c837b5e435a197b chromium/third_party/devtools-frontend/src/node_modules/sourcemap-codec/LICENSE +sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd chromium/third_party/devtools-frontend/src/node_modules/source-map/LICENSE +sha256 3a7d3bb198e909ed642bd68bd29a7d7c09a636d27a51ec663d35f00c4760ec42 chromium/third_party/devtools-frontend/src/node_modules/source-map-support/LICENSE.md +sha256 c5ca60a739543ef97683dfa0a94773b214c86c826c76a27b8f8e6eb38148cbce chromium/third_party/devtools-frontend/src/node_modules/spdx-compare/LICENSE.md +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/devtools-frontend/src/node_modules/spdx-correct/LICENSE +sha256 7edb57f7065309027de249642341292a5b21410d5773cc55bba73ff9cf01060e chromium/third_party/devtools-frontend/src/node_modules/spdx-expression-parse/LICENSE +sha256 c5ca60a739543ef97683dfa0a94773b214c86c826c76a27b8f8e6eb38148cbce chromium/third_party/devtools-frontend/src/node_modules/spdx-ranges/LICENSE.md +sha256 a21ab121cef9bed38553faad40e49b27ae3d2578d07a70956664e681021c9875 chromium/third_party/devtools-frontend/src/node_modules/spdx-satisfies/LICENSE +sha256 b2aeda654259630ed67b54e9134623c38cfb11d26201730cdc6d311d3c7c78ed chromium/third_party/devtools-frontend/src/node_modules/specificity/LICENSE +sha256 a4cdda44b5adea4731d53dcae78fb5124f8fd853e994f01e25d8c33a7daf818b chromium/third_party/devtools-frontend/src/node_modules/sprintf-js/LICENSE +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/state-toggle/license +sha256 512cfa4d5e7a7569c7ae4dd95241cb6ae2aaf648ef9ebd080c01bd24868d26e9 chromium/third_party/devtools-frontend/src/node_modules/statuses/LICENSE +sha256 9660914267128b5f96a102bd7f6268c249110a39cb7c4bb7f536d856445d739c chromium/third_party/devtools-frontend/src/node_modules/streamroller/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 chromium/third_party/devtools-frontend/src/node_modules/streamroller/node_modules/debug/LICENSE +sha256 11f2aafb37d06b3ee5bdaf06e9811141d0da05263c316f3d627f45c20d43261b chromium/third_party/devtools-frontend/src/node_modules/string_decoder/LICENSE +sha256 9f084fac69d8cf1e6ce983ba5a3499c7695ed74a26ec625c38f0fd19fddd5e10 chromium/third_party/devtools-frontend/src/node_modules/stringify-entities/license +sha256 a5e49293b629194f16e08c965807b34a4a8f45aa2735658a3b0e3c1478a34b30 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/es-abstract/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/es-to-primitive/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/has-symbols/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/is-callable/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/is-regex/LICENSE +sha256 bd40cc437e28a3ad7bef2ad34e6b72e757b182e67bda1acadbab4ef0476f8232 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/object-inspect/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/string.prototype.trimleft/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimend/node_modules/string.prototype.trimright/LICENSE +sha256 a5e49293b629194f16e08c965807b34a4a8f45aa2735658a3b0e3c1478a34b30 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/LICENSE +sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/es-abstract/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/es-to-primitive/LICENSE +sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/has-symbols/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/is-callable/LICENSE +sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/is-regex/LICENSE +sha256 bd40cc437e28a3ad7bef2ad34e6b72e757b182e67bda1acadbab4ef0476f8232 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/object-inspect/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/string.prototype.trimleft/LICENSE +sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimstart/node_modules/string.prototype.trimright/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/strip-ansi/license +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c chromium/third_party/devtools-frontend/src/node_modules/strip-bom/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/strip-indent/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/strip-json-comments/license +sha256 fef84a79e6f9d8ada80ddbdb877a2c48c5c89ace72d4684c7af57991f119006d chromium/third_party/devtools-frontend/src/node_modules/stylelint-config-recommended/LICENSE +sha256 5745227ba0bbe3fadd255f420c5f87b4f12fee5e442e6ee46e80c3c567102316 chromium/third_party/devtools-frontend/src/node_modules/stylelint-config-standard/LICENSE +sha256 75d7a49cb407946d65586e81b72265fbf5c87d5e4a7e03f9dcb4034ae3aba725 chromium/third_party/devtools-frontend/src/node_modules/stylelint/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/ansi-regex/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/ansi-styles/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/chalk/license +sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/color-convert/LICENSE +sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/color-name/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/has-flag/license +sha256 9c94db23dc4b1e9aaee5d195668b916afc71efed54af226b66cf0ccc4389c1c0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/ignore/LICENSE-MIT +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/is-fullwidth-code-point/license +sha256 5c932d88256b4ab958f64a856fa48e8bd1f55bc1d96b8149c65689e0c61789d3 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/log-symbols/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/resolve-from/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/slash/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/stylelint/node_modules/supports-color/license +sha256 2db459b0f45bd3b3836c374c6ef9ff5b2b2a31628e09f3c803e18f6c629b56b1 chromium/third_party/devtools-frontend/src/node_modules/@stylelint/postcss-css-in-js/LICENSE +sha256 2db459b0f45bd3b3836c374c6ef9ff5b2b2a31628e09f3c803e18f6c629b56b1 chromium/third_party/devtools-frontend/src/node_modules/@stylelint/postcss-markdown/LICENSE +sha256 9fb0656e79b3f61b6f49e2bf0cc19e667192d57344b91f91a8ce464659c620f7 chromium/third_party/devtools-frontend/src/node_modules/style-search/LICENSE +sha256 f20adb7ae92bfb7fde52791839ff1714564b4ea60a4cd031d77208a521592a4e chromium/third_party/devtools-frontend/src/node_modules/sugarss/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/supports-color/license +sha256 4fa26a349d96c6bf268296011d84a70d18a1e85dfbef9a3c3f785c97e28d1f5d chromium/third_party/devtools-frontend/src/node_modules/svg-tags/LICENSE +sha256 37b6932865726cf59cbfb8b32a5c9fd82c834c2deba4d53aa4a6b433ae69cdda chromium/third_party/devtools-frontend/src/node_modules/table/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/ansi-regex/license +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/strip-ansi/license +sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 chromium/third_party/devtools-frontend/src/node_modules/tar-fs/LICENSE +sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 chromium/third_party/devtools-frontend/src/node_modules/tar-stream/LICENSE +sha256 68335488ef8f917c0feb901ace385f8c919bc81b0b60448a92928a3769fcec8f chromium/third_party/devtools-frontend/src/node_modules/terser/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/text-table/LICENSE +sha256 e8734448285a2dd773d40136ed5d5e8163a70701dd540cdc796cfca232f67d55 chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.APACHE2 +sha256 d72dea1a8cdf3f4dfa2f594253d0c5b37baefc76e806f5ecb0e426393edcd505 chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.MIT +sha256 162413c61e0982abe89a06bf7a02ec760dc49a7364d838bd9f01daebb5b95954 chromium/third_party/devtools-frontend/src/node_modules/tmp/LICENSE +sha256 61b82d27e63b14eabc706960aabf6caa1b27d044eb00d7908f92e68085301c3a chromium/third_party/devtools-frontend/src/node_modules/to-fast-properties/license +sha256 a832d679750e49ab433626ab196350b89964b60eb0d3edd3341887c7d5f4c128 chromium/third_party/devtools-frontend/src/node_modules/toidentifier/LICENSE +sha256 e7d1fee7347ffddccc5fd03327ffdb50f8c112be0d5016d62388a92c4ae6e7a9 chromium/third_party/devtools-frontend/src/node_modules/to-regex-range/LICENSE +sha256 83927d1555a8e1d5ed9896991fbb2b4cdfb64f45f5e12b7446c3bff5cea538d3 chromium/third_party/devtools-frontend/src/node_modules/treeify/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/trim-newlines/license +sha256 9f084fac69d8cf1e6ce983ba5a3499c7695ed74a26ec625c38f0fd19fddd5e10 chromium/third_party/devtools-frontend/src/node_modules/trim-trailing-lines/license +sha256 6c03fd41cfd7c92d8aa8a2fa521b94b2683f059123281dcf921ddea9216b6254 chromium/third_party/devtools-frontend/src/node_modules/trough/license +sha256 a5e9f9b1575301c7a7a03508fdaa2e05a918cc17fd21c6e898096a96d6a34f61 chromium/third_party/devtools-frontend/src/node_modules/tslib/LICENSE.txt +sha256 ed0ff5ab79bc82703690fde4644e352c9ce73e9b890b87ea68b1a1fc5805792b chromium/third_party/devtools-frontend/src/node_modules/tsutils/LICENSE +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c chromium/third_party/devtools-frontend/src/node_modules/type-check/LICENSE +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac chromium/third_party/devtools-frontend/src/node_modules/typedarray-to-buffer/LICENSE +sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 chromium/third_party/devtools-frontend/src/node_modules/type-detect/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/type-fest/license +sha256 23d466b1b134b415b66fa50c6526b4cf3e7b9258554da88d3abb371721e7ce68 chromium/third_party/devtools-frontend/src/node_modules/type-is/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/chai/LICENSE +sha256 c2cfccb812fe482101a8f04597dfc5a9991a6b2748266c47ac91b6a5aae15383 chromium/third_party/devtools-frontend/src/node_modules/@types/codemirror/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/color-name/LICENSE +sha256 5938d4fe4890c79ad14e02e643c385b25b8b6c7bbb97ab08996034b586512df5 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/LICENSE +sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/regexpp/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/semver/LICENSE +sha256 5938d4fe4890c79ad14e02e643c385b25b8b6c7bbb97ab08996034b586512df5 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/LICENSE +sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-utils/LICENSE +sha256 e2fc706570305bcb7dfadb1cac951d5934ce0d7331a7a7ff1bbc254dbe1d9ef8 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/parser/LICENSE +sha256 635818d8f39384751c8a5f3f3e735022f07afb3ccdb26eb17ff8eca28428f888 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/LICENSE +sha256 6236fa0b88a4a0cce3dda0367979491b2052b3c8d6b1c10b3668de083e86a7f0 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/glob/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/semver/LICENSE +sha256 5938d4fe4890c79ad14e02e643c385b25b8b6c7bbb97ab08996034b586512df5 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/types/LICENSE +sha256 5938d4fe4890c79ad14e02e643c385b25b8b6c7bbb97ab08996034b586512df5 chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/visitor-keys/LICENSE +sha256 a5e9f9b1575301c7a7a03508fdaa2e05a918cc17fd21c6e898096a96d6a34f61 chromium/third_party/devtools-frontend/src/node_modules/typescript/LICENSE.txt +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/eslint-visitor-keys/LICENSE +sha256 c2cfccb812fe482101a8f04597dfc5a9991a6b2748266c47ac91b6a5aae15383 chromium/third_party/devtools-frontend/src/node_modules/@types/estree/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/filesystem/LICENSE +sha256 c2cfccb812fe482101a8f04597dfc5a9991a6b2748266c47ac91b6a5aae15383 chromium/third_party/devtools-frontend/src/node_modules/@types/json-schema/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/mocha/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/node/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/normalize-package-data/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/parse-json/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/puppeteer/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/tern/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/unist/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/devtools-frontend/src/node_modules/@types/yauzl/LICENSE +sha256 c427692fb89dcb92bb0cc0905a650f986a7736e4ef90f9e5356a4dfdcf243b9e chromium/third_party/devtools-frontend/src/node_modules/ua-parser-js/license.md +sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 chromium/third_party/devtools-frontend/src/node_modules/ultron/LICENSE +sha256 81ae93d537c22c0baf10928b8ee5e13d5addc50433e12cf52f1f8292ed70d108 chromium/third_party/devtools-frontend/src/node_modules/unbzip2-stream/LICENSE +sha256 05811400116ed61f1a7693b78fe8ca6598c155a12f3978e609db4df648a4cb3d chromium/third_party/devtools-frontend/src/node_modules/unherit/license +sha256 05811400116ed61f1a7693b78fe8ca6598c155a12f3978e609db4df648a4cb3d chromium/third_party/devtools-frontend/src/node_modules/unified/license +sha256 e67aed7df22dc8031e4fcf5338fe91cb33e3817e5c58a99a2a2802eea9069791 chromium/third_party/devtools-frontend/src/node_modules/uniq/LICENSE +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/unist-util-find-all-after/license +sha256 82974dbf2639d13edab95c32ed9cb6c0867ede272cd2e07ce47ce8548fe55c05 chromium/third_party/devtools-frontend/src/node_modules/unist-util-is/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/unist-util-remove-position/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/unist-util-stringify-position/license +sha256 63cb98b3f6abfb3c3592c16f88253c1bdc834087bf52671e8ce5609e4eb693cf chromium/third_party/devtools-frontend/src/node_modules/unist-util-visit/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/unist-util-visit-parents/license +sha256 3fda5977c0904e226190b4e21d64340c1731e2142d6fe5f3dee0090a216b8b63 chromium/third_party/devtools-frontend/src/node_modules/universalify/LICENSE +sha256 1a526fbe8d8577f5a4b1c2821842b55b7c0e18862531c62ae4ce69c9b19b74b6 chromium/third_party/devtools-frontend/src/node_modules/unpipe/LICENSE +sha256 0154425673db15cdfa80ecba2c9b1f1a867f7197a006764712849bfc3a93cbb7 chromium/third_party/devtools-frontend/src/node_modules/util-deprecate/LICENSE +sha256 6239c6144c31e58cf925c34483606969c555574d64ffa96518ab5d7f45c75d43 chromium/third_party/devtools-frontend/src/node_modules/util-extend/LICENSE +sha256 6e7d699cdd1e4fa837ba7718ea49841aa67201b449ea8b3f9cf274be15974a64 chromium/third_party/devtools-frontend/src/node_modules/utils-merge/LICENSE +sha256 c77674258a3fdf3036a5d13d2aecd30d7a25aa6191cb0a9a7dd45b975dc7fe69 chromium/third_party/devtools-frontend/src/node_modules/v8-compile-cache/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/devtools-frontend/src/node_modules/validate-npm-package-license/LICENSE +sha256 05811400116ed61f1a7693b78fe8ca6598c155a12f3978e609db4df648a4cb3d chromium/third_party/devtools-frontend/src/node_modules/vfile/license +sha256 ca4662cb5d1b738fbe5350c0d5485ba11773b4b7208974082ae6e129a52d631d chromium/third_party/devtools-frontend/src/node_modules/vfile-location/license +sha256 d8fc337aaf98fc7a0f5498edc18b47a9df8cdfcc1a0f013519105905722c7a4c chromium/third_party/devtools-frontend/src/node_modules/vfile-message/license +sha256 405a272eaef556691ad7dda96db3237c9544afe18725842a1a5b3ec308960222 chromium/third_party/devtools-frontend/src/node_modules/void-elements/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/which/LICENSE +sha256 852bf81203aa93aa89afc9f881ebb035322dc7334aaceff435c557634c94a815 chromium/third_party/devtools-frontend/src/node_modules/which-module/LICENSE +sha256 0cef05dfff8b6aa7f35596984f5709f0d17c2582924a751efa471a76de7cdc11 chromium/third_party/devtools-frontend/src/node_modules/wide-align/LICENSE +sha256 f4a48aa8354a257785aa534bab2ac5ff2c2a98cd59cdf4a637bb68ee185683f7 chromium/third_party/devtools-frontend/src/node_modules/word-wrap/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b chromium/third_party/devtools-frontend/src/node_modules/wordwrap/LICENSE +sha256 6dc0e068dcf3a5bc8e054205b85b7720e1d49265bbc64bf515d2cf79197df69a chromium/third_party/devtools-frontend/src/node_modules/workerpool/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/ansi-regex/license +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/strip-ansi/license +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b chromium/third_party/devtools-frontend/src/node_modules/wrappy/LICENSE +sha256 ea7f376fe7a1fc28572b83ac8f806d92effb31852b9981bc9ba9d5266caa6b28 chromium/third_party/devtools-frontend/src/node_modules/write-file-atomic/LICENSE +sha256 0ead7e8cd8b0bc66a981ee69acaf1297ffa838cfce1b156a039bb24f997c0a27 chromium/third_party/devtools-frontend/src/node_modules/write/LICENSE +sha256 3de284c8e6fa7e8437eff6f53695471e0332129a5b42a79361e17b7637de94b3 chromium/third_party/devtools-frontend/src/node_modules/ws/LICENSE +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac chromium/third_party/devtools-frontend/src/node_modules/ws/node_modules/safe-buffer/LICENSE +sha256 a5f35901ee8b2039a7431144c23dd10bd47c1d07bcee0cd3a536421d86412214 chromium/third_party/devtools-frontend/src/node_modules/xmlhttprequest-ssl/LICENSE +sha256 82e67379203d5794e7c44549847d8d64ae6904591381682360470898bd306821 chromium/third_party/devtools-frontend/src/node_modules/xtend/LICENSE +sha256 2034cce3b6fafcddd642c4175e01d3ddfc332a53b9f20fdc46b1466dc89ac469 chromium/third_party/devtools-frontend/src/node_modules/y18n/LICENSE +sha256 0f10bab9eedc5d50183a6dbce9f76e8db974103bfd32d64674406dfeb7654ee7 chromium/third_party/devtools-frontend/src/node_modules/yaml/LICENSE +sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 chromium/third_party/devtools-frontend/src/node_modules/yargs/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-regex/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-styles/license +sha256 2dc0465729366c3a7890dfa9e972a1ba7048a26c02116fb8b419a6a1ac110149 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/cliui/LICENSE.txt +sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-convert/LICENSE +sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-name/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/find-up/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/is-fullwidth-code-point/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/locate-path/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/path-exists/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/p-locate/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/strip-ansi/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/wrap-ansi/license +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/yargs-parser/LICENSE.txt +sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/LICENSE.txt +sha256 30877d17f7e38530d46b49fb375ee98ce2e8b085b3ee72d4c2888710416ef139 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/ansi-regex/license +sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/emoji-regex/LICENSE-MIT.txt +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/find-up/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/locate-path/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/p-locate/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/string-width/license +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/strip-ansi/license +sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs/LICENSE +sha256 b303783d5eb7ca50b853ffa5f145e4e7998fab339831d848f507ca6cd970577a chromium/third_party/devtools-frontend/src/node_modules/yauzl/LICENSE +sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 chromium/third_party/devtools-frontend/src/node_modules/yeast/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/devtools-frontend/src/scripts/closure/COPYING +sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 chromium/third_party/devtools-frontend/src/third_party/i18n/LICENSE +sha256 a8ad31b1c3f40dca5a84119351b8fa8ddc868edd77fad8a8ebf6d8f2d16fa4ae chromium/third_party/devtools-frontend/src/third_party/pyjson5/src/LICENSE +sha256 4f5753ce8acf3feafc758599058746d30bda07bc0d4cc3a6a1eb8e039fdba1dc chromium/third_party/dom_distiller_js/LICENSE +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 chromium/third_party/dpkg-shlibdeps/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/emoji-segmenter/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/emoji-segmenter/src/LICENSE +sha256 9021fdb5341ebbb2eb5c771ac5cfac527790673179d3b21a42de1ab2798ec30f chromium/third_party/espresso/LICENSE +sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec chromium/third_party/expat/src/expat/COPYING +sha256 d9c904abd0ead61b3fbaef0a609285548076ff9c3f814cc1cf019c5d7150736d chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt +sha256 a8579e3fc40c11ab147bc299257733eb749cd455010385f7c117f70d7aef24e4 chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt +sha256 857d5f537af3aa164e7a27eda60147d34195e5781abe7b1d358d9fb01e222ae0 chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt +sha256 b4c85cce2b772f27d83f4562c20787057dc6949fcecc820a82c1d2e7047e89c3 chromium/third_party/ffmpeg/chromium/scripts/license_texts/oggparse_ahlberg_rullgayrd_2005.txt +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 chromium/third_party/ffmpeg/COPYING.GPLv2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 chromium/third_party/ffmpeg/COPYING.GPLv3 +sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe chromium/third_party/ffmpeg/COPYING.LGPLv2.1 +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 chromium/third_party/ffmpeg/COPYING.LGPLv3 +sha256 cb48bf09a11f5fb576cddb0431c8f5ed0a60157a9ec942adffc13907cbe083f2 chromium/third_party/ffmpeg/LICENSE.md +sha256 f45cc81b400a048b56c9edbd4c3317f7a8958463dfd55aa96f268ecfd6baa12c chromium/third_party/flac/COPYING.FDL +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 chromium/third_party/flac/COPYING.GPL +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a chromium/third_party/flac/COPYING.LGPL +sha256 946b733afbaa20a192c8dc022b4e43090e78f28fd293494d1b307f7301552c9b chromium/third_party/flac/COPYING.Xiph +sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 chromium/third_party/flatbuffers/LICENSE +sha256 3112ebbfc0fe10ad40a97672f5590c4292536a28cbfe3506820b15dec70b2258 chromium/third_party/flatbuffers/src/dart/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/flatbuffers/src/LICENSE.txt +sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 chromium/third_party/fontconfig/LICENSE +sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 chromium/third_party/fontconfig/src/COPYING +sha256 fd056de4196903a676208ef58cfddafc7d583d1f28fa2e44c309cf84a59e62fb chromium/third_party/freetype/src/docs/LICENSE.TXT +sha256 cc807e3caa26cdee316bab2ff6fdb508a2f619b74959fe59e513ef6e61635ebe chromium/third_party/fusejs/LICENSE +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 chromium/third_party/gif_player/LICENSE +sha256 8ea14fdc7efee7fe53c79101b97049bd547dc6686cfa05df4f0686146a561423 chromium/third_party/glfw/src/LICENSE.md +sha256 23353f4505b1c8ce4f8f72fc3b11dc74b4a8a7bf95921d93ff77f227c171a710 chromium/third_party/glslang/LICENSE +sha256 7ddbbe34e0371fb18be6ac34cae3424f091901dfe2bebd935b0795a4e7718ebb chromium/third_party/glslang/src/license-checker.cfg +sha256 130b2e98901db02a83e5e83c132b22d22d9279155feb53c49d6471b75af3c352 chromium/third_party/glslang/src/LICENSE.txt +sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 chromium/third_party/google-closure-library/closure-deps/LICENSE +sha256 a7fd1637f41b8f56a911c8d11fd6b6b68619879f67256874232ff83c0c63a090 chromium/third_party/google-closure-library/doc/LICENSE +sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 chromium/third_party/google-closure-library/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 chromium/third_party/googletest/src/googlemock/LICENSE +sha256 5e0df8c845c742e76f2f64d2d9ce1b7e74a2422fddbc577ae6a56319083de0bf chromium/third_party/googletest/src/googlemock/scripts/generator/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 chromium/third_party/googletest/src/googletest/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 chromium/third_party/googletest/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/google-truth/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/guava/LICENSE +sha256 ca382aa537f8923d6c0991fb976d184a2009eb76080313bf10dcecdc9311f0dd chromium/third_party/gvr-android-keyboard/LICENSE +sha256 f54c49d3ff865458c5d3c68c3367a1f6e0d7b3f686f8c88a6a563ef90f84ad9e chromium/third_party/gvr-android-sdk/LICENSE +sha256 96e5bbd81970983d666e702fa56f67dfd2fdaa363b8a4266e8d98847374cd7c8 chromium/third_party/hamcrest/LICENSE +sha256 beb3f017ceb41387667f78237a7cecf84defa0ed257c505894663d6a9f13211b chromium/third_party/harfbuzz-ng/src/COPYING +sha256 c2cfccb812fe482101a8f04597dfc5a9991a6b2748266c47ac91b6a5aae15383 chromium/third_party/harfbuzz-ng/src/src/ms-use/COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 chromium/third_party/hunspell/COPYING +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 chromium/third_party/hunspell/COPYING.LESSER +sha256 53692a2ed6c6a2c6ec9b32dd0b820dfae91e0a1fcdf625ca9ed0bdf8705fcc4f chromium/third_party/hunspell/COPYING.MPL +sha256 b794aa78066400af1be3d3fb3f89c4dddc680786f14dc4e3d23a0b2848054984 chromium/third_party/hyphenation-patterns/LICENSE +sha256 a03fed9ab6321742903f3f0095b389ce811c4cfeb3f671ddc8d33da57dc92493 chromium/third_party/hyphenation-patterns/src/pt/LICENSE +sha256 610809f1586ee4d22468f1e97c256153cea8be7a662193db70d6ca424e0f17c8 chromium/third_party/iaccessible2/LICENSE +sha256 a412a53925efc6b50800bf8519a2e033949243d5a5a8c5422bae8a5007ad09c8 chromium/third_party/iccjpeg/LICENSE +sha256 d18e75f216f177d41304f5e94c2cba7d1bf9f8f8583a0777cceb5cca0c5ad137 chromium/third_party/icu4j/LICENSE +sha256 25e21013a7bc2fad735e28c5278a120e4c7f1c327c8c8b9b4df1751748cddbb2 chromium/third_party/icu/LICENSE +sha256 c62d7697c03979f5056d28b338fafc7a1152820f7b379adf4a9d88cd37160f96 chromium/third_party/icu/license.html +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 chromium/third_party/icu/scripts/LICENSE +sha256 8c6db340475136df3c1201d458fa5755698eace76e510471ecc9d857d6083dac chromium/third_party/ijar/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/ink/LICENSE +sha256 b9be92f13356083392d97da13cab8ae543c7911f44eff5289b693da8b17b9e08 chromium/third_party/inspector_protocol/LICENSE +sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 chromium/third_party/isimpledom/LICENSE +sha256 ed8d7a24769ac9d57d08769b5f8be27519dd8811d06b0995dbe8ca6714e96d08 chromium/third_party/jacoco/LICENSE +sha256 33b6816eb449962d307495946519ed78cef8743819f6f1d60e8b3d4e86c38b1c chromium/third_party/javalang/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/jetifier_standalone/LICENSE +sha256 7975c0027cfa5d08253fbb6ff4676acc38248bd5e046d0dbab3d810971e97970 chromium/third_party/jinja2/LICENSE +sha256 76c45ece83a26117f86f4e349e7df118708e061e87225328fb478ce1e8b3eb86 chromium/third_party/jsoncpp/LICENSE +sha256 95039d77a20e75b428207740d9a8f97b2dce3c89da4b21f1ad862b5997160e0a chromium/third_party/jsoncpp/source/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/jstemplate/COPYING +sha256 71a19392a0eb3255ab2055ed978bb0f93865cea84d31a3510eaffb74d8981e7f chromium/third_party/khronos/LICENSE +sha256 ccc19f1da0798ed666609b65a5b44dd8b3abe6fc08b9c0592eb76e82e174db19 chromium/third_party/leveldatabase/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/libaddressinput/LICENSE +sha256 c9a5bd7c8cc1267ddacdc5228c68ecd811cf6d74286e9141bc80d8af2eb1a025 chromium/third_party/libaddressinput/src/cpp/LICENSE.chromium +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/libaddressinput/src/LICENSE +sha256 4764a286d8b2faeaf42f4418e7d7a28d58fc8fd4d00a3d0a7f44b0a4099de7f2 chromium/third_party/libaom/source/libaom/LICENSE +sha256 043dcfd059386f9facd376351b2bd79325778744aa442177390cdfcca54babed chromium/third_party/libaom/source/libaom/third_party/fastfeat/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 chromium/third_party/libaom/source/libaom/third_party/googletest/src/googletest/LICENSE +sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf chromium/third_party/libaom/source/libaom/third_party/libwebm/LICENSE.TXT +sha256 ff6c857ce2708e87701323078aef115c1872a1f80a9649f86dc899b48083bc60 chromium/third_party/libaom/source/libaom/third_party/vector/LICENSE +sha256 719d8fa235f2068e0ae6d6a7dceb0a7720d7840f0f0ebed29957989e6ded3cd8 chromium/third_party/libaom/source/libaom/third_party/x86inc/LICENSE +sha256 0b711483921350723ddef8dd3e52b10eb79e4877817a2ccf9a48dd2deb7947aa chromium/third_party/libavif/LICENSE +sha256 e0ba04d4885bf25b03e20c8078e5f4b241bfe6a941d4a9bcc14cab09e2c27e62 chromium/third_party/libavif/src/LICENSE +sha256 d80c9d084ebfb50ea1ed91bfbc2410d6ce542097a32c43b00781b83adcb8c77f chromium/third_party/libbrlapi/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/libgav1/src/LICENSE +sha256 d56bafdaeaa793331a29e9766b7efe66524c98533da798a57201e291863ef625 chromium/third_party/libgifcodec/LICENSE.md +sha256 37d8bfba91b745693ea58f846f2f1276229745adf532974b73c1911cfd144241 chromium/third_party/libipp/LICENSE +sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 chromium/third_party/libjingle_xmpp/LICENSE +sha256 7d8683a7f048e715e08b4cada8b7f0d9a6ab8afad88ed09c1143ef764ecbc0f2 chromium/third_party/libjpeg_turbo/LICENSE.md +sha256 3bf128851aff9f392953276ea8ade3e41da0f40b853fde58ec21034aa91ccc31 chromium/third_party/libovr/LICENSE +sha256 bf5e22b9dce8464064ae17a48ea1133c3369ac9e1d80ef9e320e5219aa14ea9b chromium/third_party/libpng/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/libprotobuf-mutator/src/LICENSE +sha256 a1a33180d02960ab1c5de36cf20b1a2f0fe9888d83826ad263da5db52f1b183b chromium/third_party/libsecret/LICENSE +sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae chromium/third_party/libsrtp/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/libsync/LICENSE +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 chromium/third_party/libudev/LICENSE +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a chromium/third_party/libusb/src/COPYING +sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 chromium/third_party/libvpx/source/libvpx/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 chromium/third_party/libvpx/source/libvpx/third_party/googletest/src/LICENSE +sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf chromium/third_party/libvpx/source/libvpx/third_party/libwebm/LICENSE.TXT +sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f chromium/third_party/libvpx/source/libvpx/third_party/libyuv/LICENSE +sha256 719d8fa235f2068e0ae6d6a7dceb0a7720d7840f0f0ebed29957989e6ded3cd8 chromium/third_party/libvpx/source/libvpx/third_party/x86inc/LICENSE +sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf chromium/third_party/libwebm/source/LICENSE.TXT +sha256 6de6fe48ff7b249a51ec5522d1af618dd50effc6f030fd24e17878566ad2ca5d chromium/third_party/libwebp/LICENSE +sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd chromium/third_party/libxml/src/Copyright +sha256 31346421254a3e6e12687cf17f19f6357ee73a617fa7b3d3ccefdcbabe49bdd3 chromium/third_party/libXNVCtrl/LICENSE +sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 chromium/third_party/libxslt/src/Copyright +sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f chromium/third_party/libyuv/LICENSE +sha256 0d4077a7055ead389c4c5a9a6ac4bb8b784fc6e9e37be2caf544fcceed26cb16 chromium/third_party/lottie/LICENSE +sha256 6e3e0a978f1e136cb3efb89702f4314671581a0c70c9a52447669e00f7b129e8 chromium/third_party/lzma_sdk/LICENSE +sha256 c3b124673c93872156757a934c75b498d68eec09510e25e549d9dc2013776499 chromium/third_party/mako/LICENSE +sha256 0bbe88228fd63d20ec097f64e58d5a0a465123ae139140a18d406c60b48824b5 chromium/third_party/markupsafe/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd chromium/third_party/material_design_icons/LICENSE +sha256 536284e40c611f371f6ce5d74efac37a20d993cd3af96259b9b9e20b1669ff1e chromium/third_party/mesa_headers/LICENSE +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 chromium/third_party/metrics_proto/LICENSE +sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 chromium/third_party/microsoft_webauthn/LICENSE +sha256 83bb6bd9ccd2cf5230cb1807ed16258289768dc4d9cb80069a814e04415a1275 chromium/third_party/minigbm/LICENSE +sha256 8610954adbca6c6b85d8b1ae5613b44b0014e437d32fcad6683bb27541411686 chromium/third_party/minigbm/src/LICENSE +sha256 4919cfb14a73cd64fcef67b107613970cf1659a09aa675dba31314f373bc7204 chromium/third_party/minizip/src/lib/bzip2/LICENSE +sha256 87642305968765a4030fd202ff7006afa67274da7f9bde84506e51ae58ecc2b4 chromium/third_party/minizip/src/LICENSE +sha256 bd5663836feb58ffb7d0e6b9e62010f4c3399f2bb0a4cf6514a15d597bbdd577 chromium/third_party/mocha/LICENSE +sha256 380893a2f01aea5c3328b1a8b08cdc488bf236916abac3af0d1f1a5d2634c31a chromium/third_party/mockito/LICENSE +sha256 d47e8390fb0d7ad4a18f26aedd6283c7ab6b5b4fabab536ccb4db7f9f6d90c08 chromium/third_party/modp_b64/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/motemplate/LICENSE +sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 chromium/third_party/mozilla/LICENSE +sha256 1563996c52e220e15ef2418e67d39488255aa8c28c89e617074d3afe3ee329e0 chromium/third_party/nasm/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/nearby/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/nearby/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/netty4/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/netty-tcnative/LICENSE +sha256 0cd1bd4b934ffdc5e7f1bcfa9d08bd17295e5414bdca99c06b1036278b01f0b1 chromium/third_party/node/LICENSE +sha256 b5730da9a26472a405b0b1c61d3d166714d9d654ab3282e54e4a01a5f66316c3 chromium/third_party/objenesis/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/ocmock/License.txt +sha256 8bed129a6a15e631c93a624985e631eb62a55f7e072b78f4e1c3dde7c745283d chromium/third_party/one_euro_filter/LICENSE +sha256 a5a7cf90fe5ac9763baad852cf69cf9d9b89bff934a679fdc5c8fcecaeba9a25 chromium/third_party/opencv/src/LICENSE +sha256 dd5c1c9668512530fa5a96e4c29ac4033d70a7eeb0eed7a42fddb6dd794ebdbb chromium/third_party/openh264/src/LICENSE +sha256 34a5c58db7cc4d3265d14a9aa26e38067fe114311d8bec31f909d1c240e626c4 chromium/third_party/openscreen/src/LICENSE +sha256 284545e873c704952e5b1b39d457dd83a3b115a51d9f1eb5175137bd69b8fa1b chromium/third_party/openscreen/src/third_party/mozilla/LICENSE.txt +sha256 3c6ba0b5bfa7830505301ffb336a17b0748e0d61c4d34216e9dc98f10e40395e chromium/third_party/openscreen/src/third_party/tinycbor/src/LICENSE +sha256 8338ce8d922bb4416ce3dd1e5680173332435e3f0755007ac7801ccd674fe682 chromium/third_party/opus/src/COPYING +sha256 7efb4989e0cd1b256229bdf2f09300c5d14e35db0e7476bfb87fac243498273d chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt +sha256 0d74de3c3cd3196a9ed1bc612cfd5f81d7509d66c4be34a50f99d61bd1ad00d4 chromium/third_party/ots/LICENSE +sha256 9dd8d2fb95ba862a5d166a167682c1c67a209acd3bf09b6fd03f76d3579729bc chromium/third_party/ow2_asm/LICENSE +sha256 76621fcfb65adfd6602b700708b74c8e20f3325b32f1a54bec83a5cf7c679f53 chromium/third_party/pdfium/LICENSE +sha256 32759d1397d8f7b9e15ece146e4038b22b90e93b4935b5a840bcef4d2ba5ea55 chromium/third_party/pdfium/third_party/bigint/LICENSE +sha256 bf5e22b9dce8464064ae17a48ea1133c3369ac9e1d80ef9e320e5219aa14ea9b chromium/third_party/pdfium/third_party/libpng16/LICENSE +sha256 c5b14f5a3814d2e57b9bb9520dcf57a2c3817b65c4f989e5c82e332c82af1038 chromium/third_party/pdfium/third_party/pymock/LICENSE.txt +sha256 00564d497642465d7f96d109f38ff144997f0abc04ef167410f6b172ad5e92cd chromium/third_party/perfetto/LICENSE +sha256 80f13607677e9932bf08e5f0bc025f8d77bde813d62bf3d5465c709025710d3d chromium/third_party/perfetto/src/trace_processor/python/LICENSE +sha256 9f98bab33648b77578d85ac0f1d1c3941a72aa6d7e65015ba181f2fe804bb85d chromium/third_party/pexpect/LICENSE +sha256 a46200592eb193853527250da098e6bb0c75424e7a2c7db8da526c4f301c3d88 chromium/third_party/pffft/LICENSE +sha256 dd4930c619afd8527591353c7d3d1c1d7f4bf62ed1cb411f4f507dbdee7738a2 chromium/third_party/ply/LICENSE +sha256 d6c873c08a8806f08fdafe1aa00ba38837f6ac29f91d6b26510614b0df2001e0 chromium/third_party/ply/license.patch +sha256 24699c6858472311aa9acc6c2b7112ff9de6e7792569158ba9e439deb0529ef6 chromium/third_party/polymer/LICENSE.polymer +sha256 a5adc2955c0dd848c97aa6afb14e0047a610f0fcfa6ce0011efad01a0e051406 chromium/third_party/polymer/v1_0/components-chromium/polymer2/LICENSE.txt +sha256 a5adc2955c0dd848c97aa6afb14e0047a610f0fcfa6ce0011efad01a0e051406 chromium/third_party/polymer/v3_0/components-chromium/polymer/LICENSE.txt +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd chromium/third_party/private-join-and-compute/src/crypto/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd chromium/third_party/private-join-and-compute/src/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd chromium/third_party/private-join-and-compute/src/util/LICENSE +sha256 432959ed8cca3b44d8dd8dda9c8bf84ef982aa0cfdf9782ad9cdedc4e1146f8b chromium/third_party/private_membership/LICENSE +sha256 294f58267c6f473c4ce7270bf5c8d34b2003cb43804552459654c36553431276 chromium/third_party/proguard/LICENSE +sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d chromium/third_party/protobuf/LICENSE +sha256 2ab28b982a7f3150e1597befaa87e1636b9973c80aef3752597945d270c4c4e4 chromium/third_party/pycoverage/LICENSE +sha256 f8d0c347a0dcc6ebe1671640dfae8d2411b6ded892e06a6764f8208b218b2af4 chromium/third_party/pyelftools/elftools/construct/LICENSE +sha256 f8c8ccecdbb044fd6fa1a586c596a055fb2b14fb3e335d8ed282db58d80b7410 chromium/third_party/pyelftools/LICENSE +sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 chromium/third_party/pyjson5/src/LICENSE +sha256 318cea263a2fb726d767e2777771a431a3220008e6940dd5138a235a1fc498fc chromium/third_party/pystache/LICENSE +sha256 956c3b678228a216142df38d039bba56ee6509d3298e7a4b8dd5bc3eaa80fe33 chromium/third_party/Python-Markdown/LICENSE.md +sha256 5a2954f05e7fcc1bf240a3b58534f974760b5aae02438ce875c9c7fe0bdb4cf9 chromium/third_party/pywebsocket3/src/LICENSE +sha256 c903100da706172066fa1b6f02eba60f202fea63036492d2c4a01267e32aa7a8 chromium/third_party/qcms/src/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/quic_trace/src/LICENSE +sha256 38751245389e1e23f73e6f5384b5cbe7fa972cc4410c5adc9c04b082a0b9561a chromium/third_party/quic_trace/src/third_party/fonts/LICENSE +sha256 8991cd11befec7c6a63662700f03c0cc42e864b6e77c7e70b80297c951a7f0ff chromium/third_party/quic_trace/src/third_party/glew/LICENSE.txt +sha256 f98f3db81b4dd3873d8672117e409286142cfae9b7673ab6d7aab4bae1527d20 chromium/third_party/qunit/LICENSE +sha256 68834f116f8ff545f05d14753357b620748156d60ee36b26beab4cb3f317efe4 chromium/third_party/r8/LICENSE +sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 chromium/third_party/re2/LICENSE +sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 chromium/third_party/re2/src/LICENSE +sha256 e479bcdfa777738226b4282bf8536cc5416a25cec3100cbe210b8be4d1e2ed84 chromium/third_party/requests/LICENSE +sha256 e2f59ff41d9d03adc3dcf3deff170f8c8cf4a6eb4a9b174762a7656d23200ffa chromium/third_party/rnnoise/COPYING +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/robolectric/LICENSE +sha256 19c9b910bec5a4f2c420747d1bf81e975ffdb1377ad91c5d9b1e8dd3e38f4c17 chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt +sha256 a7436c952fa2dc0701860cf4187d1e8e8e6de6720dec0ae9e0b641bc50eebced chromium/third_party/robolectric/licenses/javolution.license.txt +sha256 5b6ac717e37db4f6d17bda7791f4ce3f99947aeb21e6e72b705aa3d1ee2de480 chromium/third_party/robolectric/licenses/pivotal.labs.license.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/s2cellid/LICENSE +sha256 3f941b3b89cf7b8370ceb83cc76d2120d471b58735d8ca60238a751a48d7f72f chromium/third_party/schema_org/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/securemessage/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/securemessage/src/LICENSE +sha256 2534ec1a8b4d0c28c4fc8e4712dec2c693681e3261241d35302d0fd9abe02ea7 chromium/third_party/shaderc/src/kokoro/linux/license_check_docker.sh +sha256 5f832ba83b10050e308cdd072b5de1d873a25b4248c0ab58a0c52420276e06d2 chromium/third_party/shaderc/src/kokoro/linux/license_check.sh +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 chromium/third_party/shaderc/src/LICENSE +sha256 085e979c8a83de3843aeaa49d57c74327c0e35da177339b54b353e32e63b0ca9 chromium/third_party/shaderc/src/license-checker.cfg +sha256 b5a00e94f058edc87e05978329b55730d8689abe61205d9018443d03de4f07da chromium/third_party/shaderc/src/third_party/LICENSE.glslang +sha256 47e20ce182bc68fab1a0cfb129b03c326aaf4f2b6b7905aa9d376d31018bd29f chromium/third_party/shaderc/src/third_party/LICENSE.spirv-tools +sha256 f1e9c0fdbee5f3a99152331418fd2ff44c08800486896667c1912ca5edf76f9e chromium/third_party/shaka-player/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd chromium/third_party/shell-encryption/src/glog/LICENSE +sha256 bcf29b4fd3ec2cb5f9d40a0866da446f6da62170d2ccedf4aeca9cf9406dd20c chromium/third_party/shell-encryption/src/LICENSE +sha256 bcf29b4fd3ec2cb5f9d40a0866da446f6da62170d2ccedf4aeca9cf9406dd20c chromium/third_party/shell-encryption/src/prng/LICENSE +sha256 bcf29b4fd3ec2cb5f9d40a0866da446f6da62170d2ccedf4aeca9cf9406dd20c chromium/third_party/shell-encryption/src/testing/LICENSE +sha256 33c9a2fe619e1200937629f318895898ffcd1bf7d0ddd39adc382c030925e61e chromium/third_party/simplejson/LICENSE.txt +sha256 b25948e48c44312d04ffc626a9d52cae7c04539a1a8e0c1be47b7bfa0da03e1d chromium/third_party/sinonjs/LICENSE +sha256 8bb850c565aa389fdc16f3a46965ad23d82adff60f2393fc2762b63185e8e6c9 chromium/third_party/six/LICENSE +sha256 8bb850c565aa389fdc16f3a46965ad23d82adff60f2393fc2762b63185e8e6c9 chromium/third_party/six/src/LICENSE +sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 chromium/third_party/skia/include/third_party/skcms/LICENSE +sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 chromium/third_party/skia/include/third_party/vulkan/LICENSE +sha256 5f787c1dee3c56547f09ccc2906ab5f5293c4d8dd6c8654e573216c38e908dbd chromium/third_party/skia/LICENSE +sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 chromium/third_party/skia/modules/canvaskit/canvaskit/LICENSE +sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 chromium/third_party/skia/modules/pathkit/npm-asmjs/LICENSE +sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 chromium/third_party/skia/modules/pathkit/npm-wasm/LICENSE +sha256 5366e97b4478f15a1e2fd7e6094337426597df28de50cd9fed3f2e7e87f1229e chromium/third_party/skia/third_party/etc1/LICENSE +sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 chromium/third_party/skia/third_party/skcms/LICENSE +sha256 e21477eed484b07902a861a1b18d1e4ecd3e6f22fa81e2410f0770cfb67290e8 chromium/third_party/skia/third_party/vulkanmemoryallocator/include/LICENSE.txt +sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 chromium/third_party/skia/third_party/vulkanmemoryallocator/LICENSE +sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 chromium/third_party/skia/third_party/wuffs/LICENSE +sha256 3f6f1b520bc53e878ccbb698ad0bacef3752a5f4e4b50a26552bd70f60b40748 chromium/third_party/smhasher/LICENSE +sha256 55172044f7e241207117448a4d9d6ba1d0925c8ad66b5d4c08c70adfa9cc3de6 chromium/third_party/snappy/src/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/spirv-cross/spirv-cross/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/spirv-headers/LICENSE +sha256 9b243f6f0bf44e295ff411a0f7b7642d1d0dff7cdc42507e9f7206f439e51b5a chromium/third_party/spirv-headers/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/SPIRV-Tools/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/SPIRV-Tools/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/SPIRV-Tools/src/utils/vscode/src/lsp/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/sqlite4java/LICENSE +sha256 06545a6ec25fbbff6c62f205f94a35be49e38f33bea827a8cfb07d7b82e4b083 chromium/third_party/sqlite/LICENSE +sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 chromium/third_party/sqlite/src/autoconf/tea/license.terms +sha256 9c6479123f32a1ed50d9a0af203dfe8972e65035b0cdeef436b5f8d0924517fe chromium/third_party/sqlite/src/LICENSE.md +sha256 033d0150b3bd78b36894c88fcc68da0c3f2e661d3b3485e8cc9a61b2c2bf7895 chromium/third_party/subresource-filter-ruleset/LICENSE +sha256 28113a6e9e2fd7584187c738a7c5484452a1c383307a1741bec50a73262fac08 chromium/third_party/sudden_motion_sensor/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/swiftshader/LICENSE.txt +sha256 ad4672b403488876635d2b455918f74b829d478da868ffc0c621a00fc99195f5 chromium/third_party/tcmalloc/LICENSE +sha256 81ebf38708899097aacaac9723679b3ffa17640c14cd3193c46b75197de18b2c chromium/third_party/tcmalloc/vendor/COPYING +sha256 81e32dadf795edf077c0e567963e598b64f3c6b1ffa8ebac907bf01d3e7b2c1a chromium/third_party/test_fonts/LICENSE +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 chromium/third_party/text-fragments-polyfill/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/tint/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/tint/src/LICENSE +sha256 bb04dd22ee55fe3c24ee2a3c82bd1efdebbd965f7c178224a2977edc2457bb2f chromium/third_party/tlslite/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/turbine/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/ub-uiautomator/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/ukey2/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/ukey2/src/LICENSE +sha256 0a90947436dc17f047f8c95b64593e2cc9a2b6d4ff6618f2f0beba5a9b568c14 chromium/third_party/unrar/LICENSE +sha256 6ecc1687808b7d66b24f874755abfed7464d9751ed0001cd4e8e5d9bf397ff8a chromium/third_party/unrar/src/license.txt +sha256 6629d6edceffa9c68f4245b817137d2265fdab1e98068893420edb6689ccce9e chromium/third_party/usb_ids/LICENSE +sha256 7a4a31e05391919c05a996f09fc20ffc80c69af72cb3e69ac71b70c825fbdd1d chromium/third_party/usrsctp/LICENSE +sha256 fa53711b25af4b9a9b8dadfea3cb38166ec4b96760c8d62b284055554537d9ef chromium/third_party/usrsctp/usrsctplib/LICENSE.md +sha256 5a7f623a50e384aaf6d2ced068339ddf93d0a50d3a0ecbe86f125b07804ecc78 chromium/third_party/v4l-utils/COPYING.libv4l +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/vulkan_headers/LICENSE.txt +sha256 2a2f96ba4c477fde4c90bb294c5ff9141b0a6ae51989261837e63124b9fd5313 chromium/third_party/vulkan_memory_allocator/LICENSE.txt +sha256 602cb6e9e4c2697d1c5b25f8e55485b596a704d834d477b49b76795074210d9c chromium/third_party/vulkan_memory_allocator/premake/LICENSE.txt +sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 chromium/third_party/wds/LICENSE +sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 chromium/third_party/wds/src/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/web-animations-js/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 chromium/third_party/web-animations-js/sources/COPYING +sha256 d51b39e7ed0391e75e0add75d1a162fdf4a0d6b49fba7635ed0ac4e16f324773 chromium/third_party/webdriver/COPYING +sha256 6d83e980b9b843cf6fe24cb94714d00f9b0cf69cb00d0e3b0bed018d49d6f24f chromium/third_party/webdriver/LICENSE +sha256 fec8eb2896784d7b9ef5bcb1c64b97156455a3c88df4fdd36538fb55c0decac4 chromium/third_party/webgpu-cts/src/LICENSE.txt +sha256 e30fbe869f1fa489901bb08888a919c5d50ddb5be6d16b9e4a2cb226263dd7db chromium/third_party/webgpu-cts/src/standalone/third_party/jquery/LICENSE.txt +sha256 18aab5821763cc13966eb59d4026fdb8f9f4e846fefbb429d43da0cb133dd2c4 chromium/third_party/webpagereplay/LICENSE +sha256 25b7731b70c77ecd5f3bb19303fbaa99be18860f81d44f71da670fdcd04829db chromium/third_party/webrtc/common_audio/third_party/ooura/LICENSE +sha256 41d791701e3e1c1073470403de7e342442d1e6a2af72681023b13a2f45f2125c chromium/third_party/webrtc/common_audio/third_party/spl_sqrt_floor/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE +sha256 26d2d16d48825edf1194cb3907c5c0b7d01f9c5527eb0fefb949c51f304635e9 chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md +sha256 21a742dd8cceebb1d5df7c6f945c75ccf1ad4f0d4c17e404517500c1a7de86a4 chromium/third_party/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE +sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 chromium/third_party/webrtc/LICENSE +sha256 1f7a086c17fa2bdbe27d3eb6424a64b9bea9d7db89a4e220fef52ca24addb9e9 chromium/third_party/webrtc/license_template.txt +sha256 6fdbabd2c95c5efc6f1e46175278239afb9343120a3022ed0e0cb04267a6aeb3 chromium/third_party/webrtc/modules/third_party/fft/LICENSE +sha256 b29c8f13f91feb2dab7d6655444369fa9f29c0d7121a52dab90ff97e40343a85 chromium/third_party/webrtc/modules/third_party/g711/LICENSE +sha256 61862327fd00d6a4deb2c1276577782c2500f4fe103e072018fc369d8e37e876 chromium/third_party/webrtc/modules/third_party/g722/LICENSE +sha256 641007ea2810c4cfc10a5d1a44db33983ec1409305e953c7119cc2457ec5c536 chromium/third_party/webrtc/modules/third_party/portaudio/LICENSE +sha256 a508773ebf00f8c777a910e941e5fd0072195843e1b72a90eb8787d26d4ab1d7 chromium/third_party/webrtc/rtc_base/third_party/base64/LICENSE +sha256 905bc5ab1c66eea2669aee6cb5185488508264df6492f71ae1a6595180ff8c2b chromium/third_party/webrtc/rtc_base/third_party/sigslot/LICENSE +sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 chromium/third_party/webxr_test_pages/LICENSE +sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 chromium/third_party/webxr_test_pages/webxr-samples/js/cottontail/LICENSE.md +sha256 47754d3064047c300714af25258efa782e144fdf1e835bfd1edbeb7f8f4ef9e4 chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/dat.gui/LICENSE +sha256 71819b5a0a080b6a3d35b3579817c2c558abcf3c92bb5abc052145a7c106573e chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/gl-matrix/LICENSE +sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 chromium/third_party/webxr_test_pages/webxr-samples/LICENSE.md +sha256 88d855a8e07a39df758fe9964f5d04d5c2fab39416e566e9d91588e254ca27dc chromium/third_party/weston/LICENSE +sha256 fdb65868f65d0fbdb05c2d3b779e10ce9969fa0c4b9262ba4f260e87086ab860 chromium/third_party/weston/src/COPYING +sha256 a34730970264d619f352598bf30295ad505a60fc3a493add8aa851645ce3ea47 chromium/third_party/weston/src/data/COPYING +sha256 20de375707692099b3132084695377ce5fec0aec05813dedcce094b8eda44386 chromium/third_party/widevine/LICENSE +sha256 d42a3e363d99da22b860ab760faa37dfa9781d74c9f3ed634d05109081616513 chromium/third_party/woff2/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/wuffs/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 chromium/third_party/wuffs/src/LICENSE +sha256 c5ffbfeaa501071ceeb97b7de2c0d703fdaa35de01c0fb6cbac1c28453a3e9fd chromium/third_party/xcbproto/src/COPYING +sha256 b244f73c3d21edaf44ec253b9a7c389ec43313c417f52f8b71914b0c40d87325 chromium/third_party/xdg-utils/LICENSE +sha256 1cf71700f3403ca26f002e2dc1d1861dcb3d2af9bb9d98d529a903be9d7f06fc chromium/third_party/xstream/LICENSE +sha256 942755efa272dbfbcd7afea7a38556801e36c16dcad002d572378367094a2593 chromium/third_party/zlib/LICENSE +sha256 1744e977d24e20e77b1e97d745fe43779430a1b84247b6c0e89d16e116e7ff92 chromium/third_party/zxcvbn-cpp/LICENSE.txt +sha256 a4c8c5abf82b36c22f8c9f8bd6229584f32eb9f7a2429dd9664dda43e63e9fda chromium/tools/grit/third_party/six/LICENSE +sha256 63f0c0039b477857e54708d9501ed91b7a46e828ac3c623bedbc318129ceb174 chromium/tools/origin_trials/third_party/ed25519/LICENSE +sha256 f5b244982699ca9fe5cc8fa8a7c08cf5dee5d3a0c8896892899e5df13316e1b7 chromium/tools/page_cycler/acid3/LICENSE +sha256 7389900fb68d920c6cb21b70702a2bc240523472a3fd091023d6135cf01d1c5c chromium/tools/win/ChromeDebug/ChromeDebug/LICENSE +sha256 284545e873c704952e5b1b39d457dd83a3b115a51d9f1eb5175137bd69b8fa1b chromium/url/third_party/mozilla/LICENSE.txt +sha256 f10a1808e442ae7dbfecf6b54ae4de84193a768770e189a67d5f397730acdbc9 chromium/v8/LICENSE +sha256 e7115e18444dae09d17f361ddc365fb1d342640fe500796209c63f7c80dfae10 chromium/v8/LICENSE.fdlibm +sha256 6a585a9f466654abc8fc0829d56b1bc987e3a073d31faa03bba37d33640a23cd chromium/v8/LICENSE.strongtalk +sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca chromium/v8/LICENSE.v8 +sha256 36ffd9dc085d529a7e60e1276d73ae5a030b020313e6c5408593a6ae2af39673 chromium/v8/src/third_party/siphash/LICENSE +sha256 3f712e5fbdfdbd5ee7d9b8c8152580220df55de47f4eba2f26c95c4de19ad096 chromium/v8/src/third_party/utf8-decoder/LICENSE +sha256 ebf25b8ce59c9e8883acd1ca75b6fc121937ca034f666c4077d2be739d2e1622 chromium/v8/src/third_party/valgrind/LICENSE +sha256 cfe7599e45f340a35b4635090382897ca1526bc49b5e1889047f0168d131c415 chromium/v8/src/third_party/vtune/LICENSE +sha256 15137d6c822e3ab097093a33c3a39a9df699f373f6438867ad534ff60762a947 chromium/v8/third_party/colorama/LICENSE +sha256 b9be92f13356083392d97da13cab8ae543c7911f44eff5289b693da8b17b9e08 chromium/v8/third_party/inspector_protocol/LICENSE +sha256 76c45ece83a26117f86f4e349e7df118708e061e87225328fb478ce1e8b3eb86 chromium/v8/third_party/jsoncpp/LICENSE +sha256 b9a6d9320b8f2693e8d41e496ce56caadacaddcca9be2a64a61749278f425cf2 chromium/v8/third_party/v8/builtins/LICENSE +sha256 c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08 chromium/v8/third_party/wasm-api/LICENSE +sha256 5d85142a5609ad177a2d7a2e7cae060b886b8b42f25c5b9803cf0cb5ee04ad2f gn/base/third_party/icu/LICENSE +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 gn/LICENSE +sha256 eb7e9ab9690124c5c9f42bdc81383d886a3dede26345b6ed15bbad7caf81f7ea ninja/COPYING diff --git a/package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk b/package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk new file mode 100644 index 00000000000..2b061815b5c --- /dev/null +++ b/package/qt5/qt5webengine-chromium/qt5webengine-chromium.mk @@ -0,0 +1,23 @@ +################################################################################ +# +# qt5webengine-chromium +# +################################################################################ + +QT5WEBENGINE_CHROMIUM_VERSION = 0ad2814370799a2161057d92231fe3ee00e2fe98 +QT5WEBENGINE_CHROMIUM_SITE = $(QT5_SITE)/qtwebengine-chromium/-/archive/$(QT5WEBENGINE_CHROMIUM_VERSION) +QT5WEBENGINE_CHROMIUM_SOURCE = qtwebengine-chromium-$(QT5WEBENGINE_CHROMIUM_VERSION).tar.bz2 +QT5WEBENGINE_CHROMIUM_PATCH_DEPENDENCIES = qt5webengine-chromium-catapult +QT5WEBENGINE_CHROMIUM_INSTALL_TARGET = NO + +include package/qt5/qt5webengine-chromium/chromium-latest.inc + +QT5WEBENGINE_CHROMIUM_LICENSE = BSD-3-Clause, GPL-2.0 or LGPL-3.0 or GPL-3.0 or GPL-3.0 with exception + +define QT5WEBENGINE_CHROMIUM_COPY_CATAPULT + rm -rf $(@D)/chromium/third_party/catapult + cp -a $(QT5WEBENGINE_CHROMIUM_CATAPULT_DIR) $(@D)/chromium/third_party/catapult +endef +QT5WEBENGINE_CHROMIUM_POST_PATCH_HOOKS += QT5WEBENGINE_CHROMIUM_COPY_CATAPULT + +$(eval $(generic-package)) diff --git a/package/qt5/qt5webengine/0002-Add-python3-build-support.patch b/package/qt5/qt5webengine/0002-Add-python3-build-support.patch new file mode 100644 index 00000000000..18fc1c1de02 --- /dev/null +++ b/package/qt5/qt5webengine/0002-Add-python3-build-support.patch @@ -0,0 +1,168 @@ +From 1e299a6c9eeb08555208b76623e453d8ab96b6e3 Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Fri, 4 Feb 2022 16:16:35 -0700 +Subject: [PATCH] Add python3 build support + +Adapted from: +https://github.com/archlinux/svntogit-packages/blob/6edf5f1aaea952d046aff89a2e0175258fe77361/trunk/qt5-webengine-python3.patch + +Signed-off-by: James Hilliard +--- + configure.pri | 13 ++++++------- + mkspecs/features/functions.prf | 6 +++--- + src/buildtools/config/support.pri | 10 +++++----- + src/buildtools/configure.json | 18 +++++++++--------- + 4 files changed, 23 insertions(+), 24 deletions(-) + +diff --git a/configure.pri b/configure.pri +index e072961f..6fec7b20 100644 +--- a/configure.pri ++++ b/configure.pri +@@ -13,8 +13,7 @@ defineTest(isPythonVersionSupported) { + python_version = $$split(python_version, ',') + python_major_version = $$first(python_version) + greaterThan(python_major_version, 2) { +- qtLog("Python version 3 is not supported by Chromium.") +- return(false) ++ return(true) + } + python_minor_version = $$member(python_version, 1) + python_patch_version = $$member(python_version, 2) +@@ -52,10 +51,10 @@ defineTest(qtConfReport_jumboBuild) { + qtConfReportPadded($${1}, $$mergeLimit) + } + +-defineTest(qtConfTest_detectPython2) { +- python = $$qtConfFindInPath("python2$$EXE_SUFFIX") ++defineTest(qtConfTest_detectPython) { ++ python = $$qtConfFindInPath("python$$EXE_SUFFIX") + isEmpty(python) { +- qtLog("'python2$$EXE_SUFFIX' not found in PATH. Checking for 'python$$EXE_SUFFIX'.") ++ qtLog("'python$$EXE_SUFFIX' not found in PATH. Checking for 'python$$EXE_SUFFIX'.") + python = $$qtConfFindInPath("python$$EXE_SUFFIX") + } + isEmpty(python) { +@@ -63,11 +62,11 @@ defineTest(qtConfTest_detectPython2) { + return(false) + } + !isPythonVersionSupported($$python) { +- qtLog("A suitable Python 2 executable could not be located.") ++ qtLog("A suitable Python executable could not be located.") + return(false) + } + +- # Make tests.python2.location available in configure.json. ++ # Make tests.python.location available in configure.json. + $${1}.location = $$clean_path($$python) + export($${1}.location) + $${1}.cache += location +diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf +index 2750d707..9fda13d0 100644 +--- a/mkspecs/features/functions.prf ++++ b/mkspecs/features/functions.prf +@@ -39,11 +39,11 @@ defineReplace(which) { + + # Returns the unquoted path to the python executable. + defineReplace(pythonPath) { +- isEmpty(QMAKE_PYTHON2) { ++ isEmpty(QMAKE_PYTHON) { + # Fallback for building QtWebEngine with Qt < 5.8 +- QMAKE_PYTHON2 = python ++ QMAKE_PYTHON = python + } +- return($$QMAKE_PYTHON2) ++ return($$QMAKE_PYTHON) + } + + # Returns the python executable for use with shell / make targets. +diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri +index e7f869a1..1bf2c5d7 100644 +--- a/src/buildtools/config/support.pri ++++ b/src/buildtools/config/support.pri +@@ -21,7 +21,7 @@ defineReplace(qtwebengine_checkWebEngineCoreError) { + !qtwebengine_checkForGperf(QtWebEngine):return(false) + !qtwebengine_checkForBison(QtWebEngine):return(false) + !qtwebengine_checkForFlex(QtWebEngine):return(false) +- !qtwebengine_checkForPython2(QtWebEngine):return(false) ++ !qtwebengine_checkForPython(QtWebEngine):return(false) + !qtwebengine_checkForNodejs(QtWebEngine):return(false) + !qtwebengine_checkForSanitizer(QtWebEngine):return(false) + linux:!qtwebengine_checkForPkgCfg(QtWebEngine):return(false) +@@ -51,7 +51,7 @@ defineReplace(qtwebengine_checkPdfError) { + !qtwebengine_checkForGperf(QtPdf):return(false) + !qtwebengine_checkForBison(QtPdf):return(false) + !qtwebengine_checkForFlex(QtPdf):return(false) +- !qtwebengine_checkForPython2(QtPdf):return(false) ++ !qtwebengine_checkForPython(QtPdf):return(false) + !qtwebengine_checkForSanitizer(QtPdf):return(false) + linux:!qtwebengine_checkForPkgCfg(QtPdf):return(false) + linux:!qtwebengine_checkForHostPkgCfg(QtPdf):return(false) +@@ -143,10 +143,10 @@ defineTest(qtwebengine_checkForFlex) { + return(true) + } + +-defineTest(qtwebengine_checkForPython2) { ++defineTest(qtwebengine_checkForPython) { + module = $$1 +- !qtConfig(webengine-python2) { +- qtwebengine_skipBuild("Python version 2 (2.7.5 or later) is required to build $${module}.") ++ !qtConfig(webengine-python) { ++ qtwebengine_skipBuild("Python is required to build $${module}.") + return(false) + } + return(true) +diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json +index 88d1790c..032aa665 100644 +--- a/src/buildtools/configure.json ++++ b/src/buildtools/configure.json +@@ -295,9 +295,9 @@ + "label": "system ninja", + "type": "detectNinja" + }, +- "webengine-python2": { +- "label": "python2", +- "type": "detectPython2", ++ "webengine-python": { ++ "label": "python", ++ "type": "detectPython", + "log": "location" + }, + "webengine-winversion": { +@@ -374,7 +374,7 @@ + && features.webengine-gperf + && features.webengine-bison + && features.webengine-flex +- && features.webengine-python2 ++ && features.webengine-python + && features.webengine-nodejs + && (!config.sanitizer || features.webengine-sanitizer) + && (!config.linux || features.pkg-config) +@@ -400,7 +400,7 @@ + && features.webengine-gperf + && features.webengine-bison + && features.webengine-flex +- && features.webengine-python2 ++ && features.webengine-python + && (!config.sanitizer || features.webengine-sanitizer) + && (!config.linux || features.pkg-config) + && (!config.linux || features.webengine-host-pkg-config) +@@ -423,12 +423,12 @@ + "autoDetect": "features.private_tests", + "output": [ "privateFeature" ] + }, +- "webengine-python2": { +- "label": "python2", +- "condition": "tests.webengine-python2", ++ "webengine-python": { ++ "label": "python", ++ "condition": "tests.webengine-python", + "output": [ + "privateFeature", +- { "type": "varAssign", "name": "QMAKE_PYTHON2", "value": "tests.webengine-python2.location" } ++ { "type": "varAssign", "name": "QMAKE_PYTHON", "value": "tests.webengine-python.location" } + ] + }, + "webengine-gperf": { +-- +2.25.1 + diff --git a/package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch b/package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch deleted file mode 100644 index 44a6424c7de..00000000000 --- a/package/qt5/qt5webengine/0002-chromium-breakpad-fix-build-with-glibc-2.34.patch +++ /dev/null @@ -1,76 +0,0 @@ -From a3bc792bdc116806a50e022d9102914c8daf6210 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Wed, 4 Aug 2021 19:11:06 +0200 -Subject: [PATCH] chromium: breakpad: fix build with glibc-2.34 - -* fixes: -[218/24061] CXX obj/third_party/breakpad/client/exception_handler.o -FAILED: obj/third_party/breakpad/client/exception_handler.o -/OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.15.4+gitAUTOINC+dd7f7a9166_555f348ae8-r0/recipe-sysroot-native/usr/bin/x86_64-webos-linux/x86_64-webos-linux-g++ -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -Wdate-time --sysroot=/OE/build/luneos-honister/webos-ports/tmp-glibc/work/core2-64-webos-linux/qtwebengine/5.15.4+gitAUTOINC+dd7f7a9166_555f348ae8-r0/recipe-sysroot -MMD -MF obj/third_party/breakpad/client/exception_handler.o.d -DUSE_UDEV -DUSE_AURA=1 -DUSE_NSS_CERTS=1 -DUSE_OZONE=1 -DOFFICIAL_BUILD -DTOOLKIT_QT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DNO_UNWIND_TABLES -DCR_SYSROOT_HASH=5f64b417e1018dcf8fcc81dc2714e0f264b9b911 -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -I../../../../git/src/3rdparty/chromium/third_party/breakpad -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/linux/include -Igen -I../../../../git/src/3rdparty/chromium -I../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src -fno-strict-aliasing --param=ssp-buffer-size=4 -fstack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fPIC -pipe -pthread -m64 -O2 -fno-ident -fdata-sections -ffunction-sections -fno-omit-frame-pointer -g1 -fvisibility=hidden -Wno-unused-local-typedefs -Wno-maybe-uninitialized -Wno-deprecated-declarations -fno-delete-null-pointer-checks -Wno-comments -Wno-packed-not-aligned -Wno-dangling-else -Wno-missing-field-initializers -Wno-unused-parameter -std=gnu++14 -fno-exceptions -fno-rtti --sysroot=../../../../recipe-sysroot -fvisibility-inlines-hidden -Wno-narrowing -Wno-class-memaccess -Wno-attributes -Wno-class-memaccess -Wno-subobject-linkage -Wno-invalid-offsetof -Wno-return-type -Wno-deprecated-copy -c ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc -o obj/third_party/breakpad/client/exception_handler.o -../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc: In function 'void google_breakpad::{anonymous}::InstallAlternateStackLocked()': -../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: error: no matching function for call to 'max(int, long int)' - 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); - | ~~~~~~~~^~~~~~~~~~~~~~~~~ -In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/char_traits.h:39, - from ../../../../recipe-sysroot/usr/include/c++/11.2.0/string:40, - from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h:38, - from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:66: -../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:254:5: note: candidate: 'template constexpr const _Tp& std::max(const _Tp&, const _Tp&)' - 254 | max(const _Tp& __a, const _Tp& __b) - | ^~~ -../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:254:5: note: template argument deduction/substitution failed: -../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: deduced conflicting types for parameter 'const _Tp' ('int' and 'long int') - 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); - | ~~~~~~~~^~~~~~~~~~~~~~~~~ -In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/char_traits.h:39, - from ../../../../recipe-sysroot/usr/include/c++/11.2.0/string:40, - from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h:38, - from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:66: -../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:300:5: note: candidate: 'template constexpr const _Tp& std::max(const _Tp&, const _Tp&, _Compare)' - 300 | max(const _Tp& __a, const _Tp& __b, _Compare __comp) - | ^~~ -../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algobase.h:300:5: note: template argument deduction/substitution failed: -../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: deduced conflicting types for parameter 'const _Tp' ('int' and 'long int') - 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); - | ~~~~~~~~^~~~~~~~~~~~~~~~~ -In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:62, - from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:85: -../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3461:5: note: candidate: 'template constexpr _Tp std::max(std::initializer_list<_Tp>)' - 3461 | max(initializer_list<_Tp> __l) - | ^~~ -../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3461:5: note: template argument deduction/substitution failed: -../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: mismatched types 'std::initializer_list<_Tp>' and 'int' - 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); - | ~~~~~~~~^~~~~~~~~~~~~~~~~ -In file included from ../../../../recipe-sysroot/usr/include/c++/11.2.0/algorithm:62, - from ../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:85: -../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3467:5: note: candidate: 'template constexpr _Tp std::max(std::initializer_list<_Tp>, _Compare)' - 3467 | max(initializer_list<_Tp> __l, _Compare __comp) - | ^~~ -../../../../recipe-sysroot/usr/include/c++/11.2.0/bits/stl_algo.h:3467:5: note: template argument deduction/substitution failed: -../../../../git/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc:141:49: note: mismatched types 'std::initializer_list<_Tp>' and 'int' - 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); - | ~~~~~~~~^~~~~~~~~~~~~~~~~ - -Adapted from: -https://github.com/meta-qt5/meta-qt5/blob/2a38fca150f065f869ed530fffe1a07beec80692/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-breakpad-fix-build-with-glibc-2.34.patch - -Signed-off-by: Martin Jansa -Signed-off-by: James Hilliard ---- - .../breakpad/src/client/linux/handler/exception_handler.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc -index ca353c40997..2e43ba6fc04 100644 ---- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc -+++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc -@@ -138,7 +138,7 @@ void InstallAlternateStackLocked() { - // SIGSTKSZ may be too small to prevent the signal handlers from overrunning - // the alternative stack. Ensure that the size of the alternative stack is - // large enough. -- static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); -+ static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); - - // Only set an alternative stack if there isn't already one, or if the current - // one is too small. diff --git a/package/qt5/qt5webengine/Config.in b/package/qt5/qt5webengine/Config.in index 5d537cdf844..542f212dfc4 100644 --- a/package/qt5/qt5webengine/Config.in +++ b/package/qt5/qt5webengine/Config.in @@ -32,24 +32,36 @@ config BR2_PACKAGE_QT5WEBENGINE depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative, qt5base-eglfs depends on BR2_PACKAGE_HAS_LIBEGL # qt5base-eglfs depends on BR2_PACKAGE_HAS_UDEV + select BR2_PACKAGE_HOST_NODEJS # v8 (a chromium 3rd-party) compiles its internal host-tools with the # same word size as the target. For 32-bits targets, it adds the -m32 # flag (for 64-bits, it adds the -m64 flag). # https://github.com/v8/v8/blob/5.6.326.55/gypfiles/toolchain.gypi#L1036-L1037 select BR2_HOSTARCH_NEEDS_IA32_COMPILER if !BR2_ARCH_IS_64 # v8/chromium select BR2_PACKAGE_FFMPEG + select BR2_PACKAGE_LCMS2 + select BR2_PACKAGE_LIBEVENT select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBNSS select BR2_PACKAGE_LIBVPX select BR2_PACKAGE_LIBXKBCOMMON + select BR2_PACKAGE_LIBXML2 + select BR2_PACKAGE_LIBXSLT + select BR2_PACKAGE_MINIZIP select BR2_PACKAGE_OPUS + select BR2_PACKAGE_RE2 + select BR2_PACKAGE_SNAPPY select BR2_PACKAGE_WEBP select BR2_PACKAGE_WEBP_DEMUX + select BR2_PACKAGE_WEBP_MUX select BR2_PACKAGE_QT5BASE_DBUS select BR2_PACKAGE_QT5BASE_EGLFS select BR2_PACKAGE_QT5BASE_FONTCONFIG + select BR2_PACKAGE_QT5BASE_HARFBUZZ + select BR2_PACKAGE_QT5BASE_JPEG select BR2_PACKAGE_QT5BASE_ICU select BR2_PACKAGE_QT5BASE_GUI + select BR2_PACKAGE_QT5BASE_PNG select BR2_PACKAGE_QT5BASE_WIDGETS select BR2_PACKAGE_QT5DECLARATIVE select BR2_PACKAGE_QT5DECLARATIVE_QUICK @@ -57,9 +69,11 @@ config BR2_PACKAGE_QT5WEBENGINE select BR2_PACKAGE_QT5QUICKCONTROLS2 select BR2_PACKAGE_QT5SVG if BR2_PACKAGE_QT5BASE_EXAMPLES select BR2_PACKAGE_QT5WEBCHANNEL + select BR2_PACKAGE_QT5WEBENGINE_CHROMIUM select BR2_PACKAGE_XLIB_LIBXCOMPOSITE if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXCURSOR if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXI if BR2_PACKAGE_QT5BASE_XCB + select BR2_PACKAGE_XLIB_LIBXKBFILE if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXRANDR if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXSCRNSAVER if BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XLIB_LIBXTST if BR2_PACKAGE_QT5BASE_XCB diff --git a/package/qt5/qt5webengine/host-python-wrapper.in b/package/qt5/qt5webengine/host-python-wrapper.in new file mode 100644 index 00000000000..3400be1d069 --- /dev/null +++ b/package/qt5/qt5webengine/host-python-wrapper.in @@ -0,0 +1,3 @@ +#!/bin/sh +LD_LIBRARY_PATH="@HOST_DIR@/lib" \ +exec @HOST_DIR@/bin/python "$@" diff --git a/package/qt5/qt5webengine/qt5webengine.hash b/package/qt5/qt5webengine/qt5webengine.hash index 6a631c0feb1..1d2b70c4f6d 100644 --- a/package/qt5/qt5webengine/qt5webengine.hash +++ b/package/qt5/qt5webengine/qt5webengine.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebengine-everywhere-src-5.15.2.tar.xz.sha256 -sha256 c8afca0e43d84f7bd595436fbe4d13a5bbdb81ec5104d605085d07545b6f91e0 qtwebengine-everywhere-src-5.15.2.tar.xz +# Locally calculated +sha256 fb7abcf88d4336d55565627e18b33df1855fefb0f12e24931b6a7decbe60913b qtwebengine-v5.15.8-lts.tar.bz2 # Locally calculated sha256 f34787ef0342c614b667186a6ec2f5d6b9d650e30142a2788a589a89743e88e9 LICENSE.Chromium @@ -8,1000 +8,3 @@ sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENS sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 sha256 9ae1959e86bd49b9680f78e0b49d4e52ae88a3f234d497e175e42a7e8ed59216 LICENSE.LGPL3 - -# Locally calculated with: -# for i in $(find src/3rdparty/ -type f \( -iname 'license*' -o -iname 'copying*' -o -name 'APPLE_LICENSE' -o -name 'Copyright' -o -path '*/license_texts/*' -o -path '*/licenses/*' \) -a -not -name '*.cc' -not -name '*.py' -not -name '*.pyc' -not -name '*.h' -not -name 'LICENSE.sha1' -not -name 'licensecheck.pl*' -not -name 'license.after' -not -name 'license.before') ; do echo -n "sha256 " ; sha256sum $i ; done | sort --key=3 -sha256 3ed00dd93c75655599456c83cba2f69c6824fd53f24fc24206ba27b65057709d src/3rdparty/chromium/base/third_party/cityhash/COPYING -sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca src/3rdparty/chromium/base/third_party/double_conversion/LICENSE -sha256 96e7ccbf8d17e319dd77c4ebd4965b64a820bbcc3142a2478fbf95af77417b6a src/3rdparty/chromium/base/third_party/dynamic_annotations/LICENSE -sha256 5d85142a5609ad177a2d7a2e7cae060b886b8b42f25c5b9803cf0cb5ee04ad2f src/3rdparty/chromium/base/third_party/icu/LICENSE -sha256 9ad1d4223b80349f3d3ab9cec92f93431b9da14a1b5d41de468ce054a28cf8aa src/3rdparty/chromium/base/third_party/libevent/LICENSE -sha256 d55a403514532af12dc2fbfb2e41900090a5dd6c7c76c8e4d9b20bcc737eac35 src/3rdparty/chromium/base/third_party/nspr/LICENSE -sha256 90b2201c340cee36b40a443f949d9eb416f0a0d204c32d350aff87fedeb67ae8 src/3rdparty/chromium/base/third_party/superfasthash/LICENSE -sha256 538edc6f52c563cf06eca1bac8dd785ff60ef5a371a950265700d5d40386db6e src/3rdparty/chromium/base/third_party/symbolize/LICENSE -sha256 79955cd80438f041387eb080f2675394e36a806b8b17eca63a4bc568d839509e src/3rdparty/chromium/base/third_party/valgrind/LICENSE -sha256 c45766baef552c59eeb1fdfbbc690e52e4cd5b135dfd325f21bdfe8ddfe28ce6 src/3rdparty/chromium/base/third_party/xdg_mime/LICENSE -sha256 18351de3d7e2dc469cc83e77d38a3e25d010251e34eb348bbd1a76275e313997 src/3rdparty/chromium/base/third_party/xdg_user_dirs/LICENSE -sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/buildtools/LICENSE -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/LICENSE -sha256 212c5a071f61512786b5e5840b3d70c85e017f3f82939ad4d4a870fc48b33477 src/3rdparty/chromium/LICENSE.chromium_os -sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/mojo/public/LICENSE -sha256 bed70fc84f1bea2b4b144564b9a0f9a5a3bc7b0d78f6e62092aeb689cac56bdd src/3rdparty/chromium/net/third_party/mozilla_security_manager/LICENSE -sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 src/3rdparty/chromium/net/third_party/nss/LICENSE -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/net/third_party/quiche/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/net/third_party/uri_template/LICENSE -sha256 834ee20e8fc3235722ed801bae30cc539c2775be656ff9cc2810fe674e53d5ec src/3rdparty/chromium/ppapi/LICENSE -sha256 c79a7fea0e3cac04cd43f20e7b648e5a0ff8fa5344e644b0ee09ca1162b62747 src/3rdparty/chromium/third_party/abseil-cpp/LICENSE -sha256 bf4da21bd20bcfb5b60b7ecc67fa864a79be049e21d6178076887f178dd6c71a src/3rdparty/chromium/third_party/angle/LICENSE -sha256 3f6f1b520bc53e878ccbb698ad0bacef3752a5f4e4b50a26552bd70f60b40748 src/3rdparty/chromium/third_party/angle/src/common/third_party/smhasher/LICENSE -sha256 86ec6953794503942b70fcd4f35b565d44f63f703b7037ce44dad965c4aaae91 src/3rdparty/chromium/third_party/angle/src/common/third_party/xxhash/LICENSE -sha256 a08ba10adec47027ef8078848729837b1c5a42f140718d7afd65c23f1eeec392 src/3rdparty/chromium/third_party/angle/src/third_party/compiler/LICENSE -sha256 31346421254a3e6e12687cf17f19f6357ee73a617fa7b3d3ccefdcbabe49bdd3 src/3rdparty/chromium/third_party/angle/src/third_party/libXNVCtrl/LICENSE -sha256 336f505f8d5aa73ea40b4d798dde86953e9c1f6525757f1d7f18120fea09bb1d src/3rdparty/chromium/third_party/angle/src/third_party/volk/LICENSE.md -sha256 837402bd25fad9b704265801ca3f92566a98157c1f9a7acd6f446299ba1c305a src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/bin/jsonschema/LICENSE -sha256 394faaedb93c1da8ecbd61322518834908fee64381117e01a611bf9fac20baa6 src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/contrib/natvis/LICENSE -sha256 a140e5d46fe734a1c78f1a3c3ef207871dd75648be71fdda8e309b23ab8b1f32 src/3rdparty/chromium/third_party/angle/third_party/rapidjson/src/license.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/angle/third_party/vulkan-headers/src/LICENSE.txt -sha256 43c0a37e6a0fa7ff3c843b3ec5a4fac84b712558ddac103fbd4c1649662a9ece src/3rdparty/chromium/third_party/angle/third_party/vulkan-loader/src/LICENSE.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/angle/third_party/vulkan-tools/src/LICENSE.txt -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 src/3rdparty/chromium/third_party/angle/tools/flex-bison/third_party/m4sugar/LICENSE -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/angle/tools/flex-bison/third_party/skeletons/LICENSE -sha256 bfec18debedcb337f8af53f143ccf0b1575d0b7c30deaee137f10397eca0d353 src/3rdparty/chromium/third_party/angle/util/windows/third_party/StackWalker/LICENSE -sha256 b23e682fda7310afe43505ed6041919ccff8f9e0c6799ebd7542cbcef11102e3 src/3rdparty/chromium/third_party/apple_apsl/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/arcore-android-sdk-client/LICENSE -sha256 584e795ba5833279c327245594d6dc216fc664144fa3626a0bdf136bc00af76c src/3rdparty/chromium/third_party/arcore-android-sdk/LICENSE -sha256 af175b9d96ee93c21a036152e1b905b0b95304d4ae8c2c921c7609100ba8df7e src/3rdparty/chromium/third_party/axe-core/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/bazel/LICENSE -sha256 0518cf49c09398259d54fcfff0b5fd36456162c6439886660e53627b3073ef22 src/3rdparty/chromium/third_party/blanketjs/LICENSE -sha256 a661d10f8f194b1963a75bb4d308f17b078cc064624313a556902d89705f6876 src/3rdparty/chromium/third_party/blink/LICENSE_FOR_ABOUT_CREDITS -sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-APPLE -sha256 7555fa34bc131a75ca56d65c40cc1ea8f9515d23e353d4c15d58573a042f7805 src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-LGPL-2 -sha256 f2b3bd09663381deb99721109d22b47af1213bb43007a8b56a06c6375c8050ce src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-LGPL-2.1 -sha256 6a73f9541c2de74158c0e7cf6b0a58ef774f5a780bf191f2d7ec9cc53efe2bf2 src/3rdparty/chromium/third_party/blink/renderer/platform/testing/data/third_party/Noto/LICENSE_OFL.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/blink/renderer/platform/testing/data/third_party/Roboto/LICENSE.txt -sha256 5a7b465d39b5e018bc40cc34162176269f7c476989cb4dbcf0ec0b81701545a7 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/LICENSE.md -sha256 88ec6a6c8eafa3b9757e745783938bef3f5e4d5e3c76b1db576aa3ab520e5e1d src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/enum/enum/LICENSE -sha256 663f9253e13519b82ab4a6b1caab6bed05aada70517f28cd0254be8a9fa19ed6 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/h2/LICENSE -sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hpack/LICENSE -sha256 16a39991619e92f18680932da2a9199fdf7d95df3ecaedc52ea06218aabafd6f src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/html5lib/LICENSE -sha256 763a9342a04df62046c9dc748a5287934eb0a5331c6863b3ca0aee20e18cb4ed src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/hyperframe/LICENSE -sha256 b7529b8c07171a78a8c36c3283905528e4812945d977d125eb926e8ccbf245b6 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/six/LICENSE -sha256 df336397e09e764416fc33b555703b1cdddd3a0cfea8a013ad1cad565c8be2f5 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/wptserve/LICENSE -sha256 60bd7c54856bf9387221bde5ab55d516d7cea15870d0fed69406bcd1c8ec7c9d src/3rdparty/chromium/third_party/boringssl/src/LICENSE -sha256 0c125a4dab5ab869473e6491db22f6c0a7f8a4de58588d03bb2b16c0c8ebd7de src/3rdparty/chromium/third_party/boringssl/src/third_party/fiat/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/boringssl/src/third_party/googletest/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/boringssl/src/third_party/wycheproof_testvectors/LICENSE -sha256 5740985669353ef52e0f320413ff68dc62b6c23a596cd78b6d6b80764f1c50ab src/3rdparty/chromium/third_party/bouncycastle/LICENSE -sha256 f9752a0a4ac5215eaa3a4f0ec29cd52563c883de5d7870525cc0bc3a21cb8e15 src/3rdparty/chromium/third_party/breakpad/breakpad/LICENSE -sha256 4d03f91b94e0db3bdc9ddaf0060dd41cc94a2096094fbc1417713a2f059658c7 src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/curl/COPYING -sha256 d8eaba95b8d03c5912da9b5823de2c920e84a993133039a22fc8100f9edb33a1 src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/libdisasm/LICENSE -sha256 015b2d5cedb3024339446a63963d073fa831544cf253c5ddd713fccc8d83e939 src/3rdparty/chromium/third_party/breakpad/LICENSE -sha256 3d180008e36922a4e8daec11c34c7af264fed5962d07924aea928c38e8663c94 src/3rdparty/chromium/third_party/brotli/LICENSE -sha256 98f8746a39f9a42da35df7046a15b56d0e2f4f76eefc352d67f1bf76e85360b4 src/3rdparty/chromium/third_party/bspatch/LICENSE -sha256 b5730da9a26472a405b0b1c61d3d166714d9d654ab3282e54e4a01a5f66316c3 src/3rdparty/chromium/third_party/byte_buddy/LICENSE -sha256 0154852797380b35195ecd829582f1efd00bfe244eab427a6bbf1e3f3dd57b1f src/3rdparty/chromium/third_party/catapult/common/eslint/LICENSE -sha256 65d4ed698fb5cbcd1d44c78bc6a02c5bf1da00df5395d2d6ac43bdafe6bc20dc src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rcssmin/bench/LICENSE.cssmin -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rcssmin/LICENSE -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/third_party/rjsmin/LICENSE -sha256 984fb04a16a9f1e0145ffd891125dc366a01cd921f58c9b0369be400c720790d src/3rdparty/chromium/third_party/catapult/third_party/polymer/components/polymer/LICENSE.txt -sha256 f77133324f35589f9f170473456321fe76aa35b750293cb8a475e26afa8f2bac src/3rdparty/chromium/third_party/catapult/tracing/LICENSE -sha256 17afb4516438c26ee15213c5a082206340d976a68472b8eab2499d7bce4debec src/3rdparty/chromium/third_party/catapult/tracing/third_party/chai/LICENSE -sha256 1920d2326ebbad34dcbd9681b4fe4926f113aa5e7dc9a92fceb456d859ee142e src/3rdparty/chromium/third_party/catapult/tracing/third_party/d3/LICENSE -sha256 5a2ed53cc5975569e9fa146c4245eaf53377dc1a88bdcb923da6487e53cba55e src/3rdparty/chromium/third_party/catapult/tracing/third_party/devscripts/COPYING -sha256 e8b80a53d0f95a3cf0f992f8cfc6b3911a7f32f47e0e4a8d4fd66582eeae9484 src/3rdparty/chromium/third_party/catapult/tracing/third_party/gl-matrix/LICENSE.md -sha256 be3fd324066af702fad2a9ef05664ce9665495ebc1824fd7b28960802ec7891e src/3rdparty/chromium/third_party/catapult/tracing/third_party/jpeg-js/LICENSE -sha256 aae03c510d63d96de72d37ce5650fbbac63b322d09ac0ee0df50b8950329e840 src/3rdparty/chromium/third_party/catapult/tracing/third_party/jszip/LICENSE.markdown -sha256 1f194a987fa1dc60e4bcf5e04e0fc03fff8f2ee587c52136adb2cebb397250b8 src/3rdparty/chromium/third_party/catapult/tracing/third_party/mocha/LICENSE -sha256 a04665b3b2de56c66730c1f720f528175739e4104f79073614aa611da1e85539 src/3rdparty/chromium/third_party/catapult/tracing/third_party/pako/LICENSE -sha256 ef5b39dfcafe08323262e3f51a3a9de649978a55ed8ef8eef3c451f2c1e78a53 src/3rdparty/chromium/third_party/ced/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/ced/src/LICENSE -sha256 3d1d2669d0ba87069b5e202f106193c4eb0e140a2aead31dca9670a0581dd979 src/3rdparty/chromium/third_party/chaijs/LICENSE -sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 src/3rdparty/chromium/third_party/checkstyle/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/checkstyle/LICENSE.apache20 -sha256 c2d13ec3b431617beb314705c0f42d17ca579eed00032ed8a13dbcd23fc9bdd5 src/3rdparty/chromium/third_party/cld_3/LICENSE -sha256 c2d13ec3b431617beb314705c0f42d17ca579eed00032ed8a13dbcd23fc9bdd5 src/3rdparty/chromium/third_party/cld_3/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/closure_compiler/compiler/COPYING -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/closure_compiler/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/crashpad/crashpad/LICENSE -sha256 212846e0145aa50fb3a5aef254a370311a93acf6c1e792e47e0068d64c8c3885 src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE -sha256 4b45cbe16d7b71b89ae6127e26e0d90a029198ca5e958ad8e3d0b8bbed364d8b src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/cpp-httplib/cpp-httplib/LICENSE -sha256 f40ee07401827b6ac9cf0aee1aaffb00e42a3f2c729f9c83f96a3daafef5d944 src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/glibc/COPYING.LIB -sha256 e5881019d8766c1e88a5fe1dbca4ba40c78011d41fcb18f6e9f50df60182685b src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/xnu/APPLE_LICENSE -sha256 a1f30b77c01e0995fa32a00119e00749e8731ee8a3c4c3549bce74083c72b0b6 src/3rdparty/chromium/third_party/crc32c/src/LICENSE -sha256 e9427cf6abc4eaeda0bcd094fca46af4067970079f426b65d5cbacb87bff6366 src/3rdparty/chromium/third_party/cros_system_api/LICENSE -sha256 09e8a9bcec8067104652c168685ab0931e7868f9c8284b66f5ae6edae5f1130b src/3rdparty/chromium/third_party/custom_tabs_client/LICENSE -sha256 7a3cb0e5055874e67db9aa2d5fe26de23204fa994ffbad198901ffe9c812a717 src/3rdparty/chromium/third_party/d3/src/LICENSE -sha256 b327887de263238deaa80c34cdd2ff3e0ba1d35db585ce14a37ce3e74ee389e9 src/3rdparty/chromium/third_party/dav1d/libdav1d/COPYING -sha256 2da4494d2a8b5c742afbb905b10621e40129284c977ac138e3081ed0d9d83aed src/3rdparty/chromium/third_party/dav1d/LICENSE -sha256 b77e952e3feaebd807d27784988b19fb60f83f9fc9a0c03e6aedbbffd5d6f8ee src/3rdparty/chromium/third_party/dawn/LICENSE -sha256 43452b94e6aa0c2d076ad25b87f580c11571689d52f3aa1a1f7bdcab31a0bd15 src/3rdparty/chromium/third_party/decklink/LICENSE -sha256 5a2ed53cc5975569e9fa146c4245eaf53377dc1a88bdcb923da6487e53cba55e src/3rdparty/chromium/third_party/devscripts/COPYING -sha256 a3f2fe2ac6b471aa80c737c5d283dd049bdc903a73835ee6d4d2cac02fdd53bf src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm/LICENSE -sha256 c6daa4e8737d15aa7140b4f7eb82b9d4829bd2fd27132c43e282203b9c67dfc4 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm/LICENSE_python -sha256 13110d66c514a7890c4b388a353bc08fa094fe13d5ed7f3a222cc0a0caa3fd17 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/cm_modes/LICENSE -sha256 9fea307fe830918e12b6822f943f4b59bd7715614efb68e834a141ca758bd5f2 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/dagre_layout/LICENSE -sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/formatter_worker/acorn/LICENSE -sha256 f734f7708439c275f3599e2df7de84cd9f360bd13620a30ab376af6c9deb213b src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/sdk/wasm_source_map/LICENSES.deps -sha256 b60e9b66bf4f9ab3aa5d1d20b18410a632fd624cf4ce3aa1eb839087caf35958 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/fabricjs/LICENSE -sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lighthouse/LICENSE -sha256 55efdea1a9fe503ed3cd89c2776d3d2131795defaebea421754b428333fbfba3 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/LICENSE -sha256 1a5ae5ab221af81b68f4f4c156c0d2e044851272c5e2e6c07d685946557878ea src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/lit-html/package/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/devtools-frontend/src/front_end/third_party/wasmparser/LICENSE -sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/third_party/devtools-frontend/src/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/abbrev/LICENSE -sha256 71f83c4c0621102a56d9853812777b85751bce7e9726f686f5b056c1f8a4b0e6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/accepts/LICENSE -sha256 cfa72b62b9ae173078823a3796b25c027a9071046a263beddf966df67018ce06 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn-jsx/LICENSE -sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn/LICENSE -sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/acorn-walk/LICENSE -sha256 e85e131fa4ed25538ff1f4962ced1fb6f68b079bd9164a790597a0f30b8fd030 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ajv/LICENSE -sha256 ea97081f183590d87376f5fe73b7150c79863a73167f47ed87c41e191f89eb0b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/amdefine/LICENSE -sha256 10e7818a114cf8b702a2263ad424b3cd9d34254df6039e47bb3f412000b0ae00 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-colors/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-escapes/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-regex/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-styles/license -sha256 0798f37cff4a3f438c071316e41f94ffe110116a313ab0fc4f8caa07218f1f0f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ansi-wrap/LICENSE -sha256 5a3b0007c4203f10fe11b3fe8747253eb994f135e10b73e1f88ada941af09c6e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/anymatch/LICENSE -sha256 0b61ac8491c66669491fdb328200203822b91d2a0461f5cd898fe0944ea97e41 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/append-transform/license -sha256 c8442419dc614089ea022b3da6bfc089b41a58fb7b9030d1e651f2f36189dce2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/argparse/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/array-find-index/license -sha256 f4a48aa8354a257785aa534bab2ac5ff2c2a98cd59cdf4a637bb68ee185683f7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/arr-diff/LICENSE -sha256 3672fb6ef1c214578dfee689643516c2685f61ab08d130517ca8ea24f383a840 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/arr-union/LICENSE -sha256 e80373b1ed0f33cecc47173b4b0c6afe0d0318b32dbd84116a1a957e3f7f43a8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/asap/LICENSE.md -sha256 6239c6144c31e58cf925c34483606969c555574d64ffa96518ab5d7f45c75d43 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/assert/LICENSE -sha256 0798f37cff4a3f438c071316e41f94ffe110116a313ab0fc4f8caa07218f1f0f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/assign-symbols/LICENSE -sha256 69dee148a2cc470554dfa7142e830662062394d0fe67cddd379aba90dc60d6b3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/astral-regex/license -sha256 a374b737c41b30b1ec04c5fcc17d1b853f008f217cc43a9dbea441abd9afde70 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ast-types/LICENSE -sha256 d9fed24f132985934fca621c4dc1dfb53e03377a24d0568d424383d7eaa9c0ac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/async/LICENSE -sha256 e5a57cdd72e279910183799153134d0e749a5664fc459c8eacbecf72532b7db3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/async-limiter/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/code-frame/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/generator/LICENSE -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/generator/node_modules/source-map/LICENSE -sha256 4e32449bd377d3dbced215dfd66dc234994c28e561aef73dbd29d6b5a1a00484 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-function-name/LICENSE -sha256 517913953e6a69da35bccb95c2d801f70d73e8f267cdad1a1615bfe8974ad3ad src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-get-function-arity/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/helper-split-export-declaration/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/highlight/LICENSE -sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/parser/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/template/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/traverse/LICENSE -sha256 117da2af0d4ce0fe1c8e19b5cff9dcd806adf973d328d27b11d4448c4ff24f76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@babel/types/LICENSE -sha256 a1bd5deadb6a06dd74efa852c1b8b23f63b67f2214fbe9c8bd591da51da69268 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/balanced-match/LICENSE.md -sha256 f3eca6ff762533fa5a77caf954a143e48afa204668cf97dce758c45a9e006be3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64-arraybuffer/LICENSE-MIT -sha256 de6059eadd0c1327f30a22663392e57d36b97b0ac9bb48f4875c8008ba823c30 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64id/LICENSE -sha256 5b37224c080cdcc97c871ada971c224e9926370fe74f11b539aa1cf9f3b1aca1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/base64-js/LICENSE -sha256 85fe65eefab89e2a683232b96e6f689279821a0bd3b351e9ab6a6ebd19dea567 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/binary-extensions/license -sha256 150d7707d4532d57bdb5718637ff62fff1f075921c5ffaa084df27f900bfea76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/.bin/license-checker -sha256 7d3e0d8d5604632b94ff9aea3001153c506566cd1c6c7bb37000acdb1fb37417 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/blob/LICENSE -sha256 87092fe7ffd1e92eba5d1dd39b73a73fdb4fdd4df3474beacc3d9f6b08ece82c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/bluebird/LICENSE -sha256 23d466b1b134b415b66fa50c6526b4cf3e7b9258554da88d3abb371721e7ce68 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/body-parser/node_modules/ms/license.md -sha256 68f12f6e2c33688699249c01d8f9623c534da20aa71989c57b061b7bc1676d14 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/brace-expansion/LICENSE -sha256 e70ff771504ba41f2be55de812a017ff46433d7a250c862e38fc419159e44500 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/braces/LICENSE -sha256 82ba430b068b75a41438568e1e4ed1f96e02699c9b51735154af03e9b59d6b0d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-aes/LICENSE -sha256 dc09aa476634db0dbae1a296f099d5bd39e27c96b876d4d20b236fa565002bb6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-cipher/LICENSE -sha256 e54f1a2edadb1d8d3a482bcd0712acad2947337ae35e40ca34b22eb77940863f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-des/license -sha256 672eb2c2ad92bee7ef6c894f1431a66d7e8fdd7965cfdca5aa4fc206951a7c9c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-rsa/LICENSE -sha256 a0e06d86a5a17341fa6134ee30ef18d73251cf32b8a577cdfd6aad6ad34af61d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-sign/LICENSE -sha256 ddd770379e07bf0574dfaa4485be80a23b3248b36d09f33ec79276c09b829daf src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browserify-zlib/LICENSE -sha256 0e91be39cb38da2972a6e0649dcd4e8a49595996b3ab4b04e72ef9ea71de9079 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browser-resolve/LICENSE -sha256 fd595a25dd3c90492a8cc3b888aa9ae47630173181efed17f71b4c689d99d0ec src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/browser-stdout/LICENSE -sha256 14275f5c8139d02054c5259d52a88ccbba662a86af18c30f071c8d082dc6004c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer-from/LICENSE -sha256 06bafa45fdad2579ba0e43b0c9b2c6290287c99c4203c300254a462b38a307f6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer/LICENSE -sha256 51ad9defd71911dbe413daf277bcb2e1077743f5ee5ae48d0a3b90a5b7486f55 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/buffer-xor/LICENSE -sha256 f057f36739d53d228a746de4440c1e0c644ecde06d6beab45337d39c9d12a393 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/builtin-status-codes/license -sha256 e3b44af066615de2ea48d18d852d0762f18c0b2efcea714fa48a6f729d405b85 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/bytes/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/callsites/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/camelcase-keys/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/camelcase/license -sha256 b181da80336ff9dd1043fc8be1a764d7382363433319aa872e4d2cb5ce2a3066 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chai/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chalk/license -sha256 7df1d6cf5b4112cbe277a84269e02ae631603a9a3a21b8328a34c30b8c3dd1ab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chardet/LICENSE -sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/check-error/LICENSE -sha256 db9ba183d4cbfbaf6c27db2effddbb84b46340c33ed32a066bc0b144a3ea1298 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chokidar/LICENSE -sha256 2c46f1325bd3822a33c1e2c1e49c18d13127ac00f9c8b3b79196c7a126f73cd9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/chokidar/node_modules/glob-parent/LICENSE -sha256 cf93ad78cfd5f3523248675aeb2a46e003367596883d4fa26a0c38d553ab0f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cipher-base/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cli-cursor/license -sha256 2dc0465729366c3a7890dfa9e972a1ba7048a26c02116fb8b419a6a1ac110149 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cliui/LICENSE.txt -sha256 33fa5470b2195e410b075a32516b6ad27784b8a8ff74ae90cfd60c14b76e6644 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cli-width/LICENSE -sha256 3fb0857ef0133928cf72c88dfc464e931486e88778961eedec25585e2321507f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/clone/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/code-point-at/license -sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/color-convert/LICENSE -sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/color-name/LICENSE -sha256 77ffe84006509949525fd57df06f4a6a80ad862c5314b66ab5bb6ac4cee6280b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/colors/LICENSE -sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/LICENSE -sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/node_modules/convert-source-map/LICENSE -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/combine-source-map/node_modules/source-map/LICENSE -sha256 04512a63dce4d2d506ad612dc0bd7681ccf6e3655f7b6eaef7dfac8323d1ec0b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/commander/LICENSE -sha256 d682394bef4a34d279b0237feecf145abadd6ec1e41cbb094592b8cc9fc2f34b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/compare-versions/LICENSE -sha256 0f0b408b8b871d983e767528c6dc51e0ad7efaa022890c449fe2b2e1ee24dbb7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/component-emitter/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-map/LICENSE -sha256 96b29c9aaa611a05349b362d48c2ffce0966fe408401a2d1a157be312c035b5f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/LICENSE -sha256 ec62dc96da0099b87f4511736c87309335527fb7031639493e06c95728dc8c54 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/readable-stream/LICENSE -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/safe-buffer/LICENSE -sha256 11f2aafb37d06b3ee5bdaf06e9811141d0da05263c316f3d627f45c20d43261b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/concat-stream/node_modules/string_decoder/LICENSE -sha256 9913ff70f23424d49fda2b05902cfb72f17ae1e48aaf898c349a284289a74751 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/connect/node_modules/ms/license.md -sha256 257aed98914108e91a337912727b6a802eef218248507f74b76faffaff517a38 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/content-type/LICENSE -sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/convert-source-map/LICENSE -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/convert-source-map/node_modules/safe-buffer/LICENSE -sha256 c02110eedc16c7114f1a9bdc026c65626ce1d9c7e27fd51a8e0feee8a48a6858 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cookie/LICENSE -sha256 722e1193901ad1ed4460753dded483d68ca2ad0528c67f86f76abc46b9aa25f5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/core-js/LICENSE -sha256 33b734d60042d0fe0c92dd1fc1e874193a1c899ec3e276a2eb935d2d0bf5b710 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/core-util-is/LICENSE -sha256 d4ad87ad0bb7d57c17ae73b46e064243b972edc3036c38c222172c9600a20b56 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-ecdh/LICENSE -sha256 cf93ad78cfd5f3523248675aeb2a46e003367596883d4fa26a0c38d553ab0f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-hash/LICENSE -sha256 cf93ad78cfd5f3523248675aeb2a46e003367596883d4fa26a0c38d553ab0f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/create-hmac/LICENSE -sha256 aaa78451b6fecd1b9c4594c796c133c0e90cad100372ff8bc6de615e9ef9adf1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/cross-spawn/LICENSE -sha256 6134c69bc22c8289252e70de3af20bd67071233459055be74d83acfcc4865e7e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/crypto-browserify/LICENSE -sha256 0b61ac8491c66669491fdb328200203822b91d2a0461f5cd898fe0944ea97e41 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/currently-unhandled/license -sha256 53ecc31e1632c07980cb0c97dcaf3d1d20323d21194b92150987a4fecf517b3c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/custom-event/LICENSE -sha256 9660914267128b5f96a102bd7f6268c249110a39cb7c4bb7f536d856445d739c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/date-format/LICENSE -sha256 e38ad5868b1e32ab44c63da6e58b8b58604d8d1dd90c40d171f2feaa756b088b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/dateformat/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/debug/LICENSE -sha256 5f9e03a50e10f262f7bd356fe323b12f461f14dae6762611285a0d7479340ae7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/debuglog/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/decamelize/license -sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/deep-eql/LICENSE -sha256 f2042f3634c4136d06b5139c9c6aefb81a3a462b514548bc1845953233dfba98 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/deep-is/LICENSE -sha256 d7c67af00ef4ecd9bee06e010bb1fcd8d5f0ecb02fa1b73fe3ef030a88800d4b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/default-require-extensions/license -sha256 b568428993e6acff80c1214dcc4f7195241772d5b3d23d92ee6bf5406a102896 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/defaults/LICENSE -sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/define-properties/LICENSE -sha256 bd47ce7b88c7759630d1e2b9fcfa170a0f1fde522be09e13fb1581a79d090400 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/depd/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/dezalgo/LICENSE -sha256 db6109f994692150ed82cd904bb053c73b97b23678bf52047f747bfec11e1934 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diffie-hellman/LICENSE -sha256 152f0fb43e953fcf5c56c5bfa4c834bb96b1603e4026319c613dd3e734f305cf src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diff/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/diff-match-patch/LICENSE -sha256 545278991ee5f1fb4372f913ec44837cff9395175140f8f21118074330a659cb src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/di/LICENSE -sha256 5c272e206669b79ee20fa89fa8fa888d5b56186f16c55a5614753ad3412e2ae9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.closure-compiler -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/doctrine/LICENSE.esprima -sha256 8ffaa1b117e1c280023c8ef997a84a461133b972c8bade4579050e3e41835902 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/domain-browser/LICENSE.md -sha256 965ef284f7f4c176842ec2e87fa13e79feed777d56d7a21a5a3b38f1bb6dc288 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ee-first/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/emoji-regex/LICENSE-MIT.txt -sha256 7585ea7bba616ccbbe43cb54ecb67956688c3c5641bb84f3099a652a73193afe src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/encodeurl/LICENSE -sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/end-of-stream/LICENSE -sha256 bb996a5665c8e18041251e833e52b590f0da5050c1878aa3e3a47f71bb16fa6d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-client/node_modules/ms/license.md -sha256 8e0349070612cb59fc604588974e193d8363f0a08752caf31d3f270a609d346a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io/node_modules/ms/license.md -sha256 2a190271977c2ad47c85a9e08cc05d078fe9293643061d466d2ae89ce8e5c2f1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/engine.io-parser/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ent/LICENSE -sha256 92b07a2e5b0e051d37dde85042c736d6d551cfcbc0983f39d7ef903b3986bbc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/error-ex/LICENSE -sha256 c2c31e096c312163e9a7a908a5209f335eb4c3381d6c404dd1e1b91fe65707fc src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es6-object-assign/LICENSE -sha256 da852e222c72bc04a0a9046aac35f2e5d33775a8ea9f1d8f59b1cfd195ef9bb0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es6-promise/LICENSE -sha256 00d402c2bbe7c67369bd01ce2c16b8ed46ccc949a1ee2d6bb8f9606afa8c7434 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es-abstract/LICENSE -sha256 255aa557a1f55224ce522f311629c0bf20854740a67955cefd798fbd1d3d1ded src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escape-html/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escape-string-regexp/license -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escodegen/LICENSE.BSD -sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/escodegen/node_modules/esprima/LICENSE.BSD -sha256 db83f2ede67f36cfab1ea0721ea2ee97515863e9a65346881f305e430451cc91 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint/LICENSE -sha256 b67ae8fe5f32d0e6164655de53075cba04bb69c23e7d11efcfed6a0fa265ef64 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-mocha/LICENSE -sha256 541c415066b6139f0fb6ad55f633abbc62f0ba6b54543f1ff00c762e76a90239 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-plugin-rulesdir/LICENSE.md -sha256 d3a724e2ed749f172ff70b62a1d0631b7d4b0ea273782365a3464d4e2d6b6dbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-scope/LICENSE -sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-utils/LICENSE -sha256 d8bf34ff6d190640a01e7704ad78253fc181bc128949d71273fbbaa12f33c0b4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eslint-visitor-keys/LICENSE -sha256 6273faa0d14a54972c0341a724010eb8cd928ee486745a9eea8cf80680ba5098 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/espree/LICENSE -sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esprima/LICENSE.BSD -sha256 ac68116ae73740de4190892f334992e449a124600924ec761e64319d3aac9e6e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esquery/license.txt -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/es-to-primitive/LICENSE -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/estraverse/LICENSE.BSD -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/esutils/LICENSE.BSD -sha256 3aecc12b1cb28832b5f65ab64291de96568c3f236a74d646281b4491f7bcadbf src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/eventemitter3/LICENSE -sha256 631987b7616a325a5b97566c232418481ddf7dbb5ecadefb991e791876cc2599 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/events/LICENSE -sha256 cf93ad78cfd5f3523248675aeb2a46e003367596883d4fa26a0c38d553ab0f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/evp_bytestokey/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/execa/license -sha256 97af7428f93afbab9bf79cd09254da1357161794f4255eb1b4599f04dd2d2e7c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extend/LICENSE -sha256 9580cc528a1c38d1560a9d36e34404fe1ea9d8e6f44c596dac2a3104ef63cdab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extend-shallow/LICENSE -sha256 e33b7bc13a0e5ea9ed6718e12e99a5b0b60276162f0195aa7f342397f4b0155d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/external-editor/LICENSE -sha256 77b2de947c65f3062fb347118ca198ca50898ead84a8509d8153fa65741f029b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/extract-zip/node_modules/ms/license.md -sha256 7bf9b2de73a6b356761c948d0e9eeb4be6c1270bd04c79cd489c1e400ffdfc1a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-deep-equal/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-json-stable-stringify/LICENSE -sha256 942a98cb8846a6354266193f173c1354615827fbb7d67f68399599dff12c4d6a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fast-levenshtein/LICENSE.md -sha256 176d95320d565cb034d8323797b6cd6160238f625453687f98aad2085c46c3b3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fd-slicer/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/figures/license -sha256 c8c8324aff32c44f9e501aac5b3b97540c26af7d6dd6af8bce5e34300596e27d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/file-entry-cache/LICENSE -sha256 99513010b6a19894e01864cba86bf98291bef8251a302d90ab1a572d91ebacc8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fileset/LICENSE-MIT -sha256 35bdd8a44339719441900fb50fbefc5e2dca1ca662cbaed7a687de842c8b70f2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fill-range/LICENSE -sha256 24973d5320410e565ec92f18f73f12af7d97c634d414ba170d119fe3f98904c8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/finalhandler/node_modules/ms/license.md -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/find-up/license -sha256 c8c8324aff32c44f9e501aac5b3b97540c26af7d6dd6af8bce5e34300596e27d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat-cache/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat-cache/node_modules/rimraf/LICENSE -sha256 95a61f61553614db5421a2cefb17c22ff6b2b4b2206f5bc8913d04f72a22b033 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flat/LICENSE -sha256 5097efeab30293dd7e26d6960b6b94f1aeca958d22f1eca3535c482a891e95a9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/flatted/LICENSE -sha256 bfa8a54bb952ccda79f0f1889721d108f5b605babbb2b8a3705ffb52f4132eb7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/follow-redirects/node_modules/debug/LICENSE -sha256 99de4c30f4643c00d4895d9c6ade0af4ec43d301449c191f5fbe41b53bb6a13a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fsevents/LICENSE -sha256 1e76029602ae9b21cc4e612db2496d92febed882ba13ba745f8b3309e85f9d39 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fs-extra/LICENSE -sha256 8465b04b67f473341171b5c9c8b2c741a4a395b3f6ed58339b3a4f4db3db7472 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/fs.realpath/LICENSE -sha256 e67aed7df22dc8031e4fcf5338fe91cb33e3817e5c58a99a2a2802eea9069791 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/functional-red-black-tree/LICENSE -sha256 773e131a7684726005a7e4688a80b4620033bc08499bc1404dd1a1eb3bca725e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/function-bind/LICENSE -sha256 902dbb4154679fb2b8d7c33878183f45b268d01eae5e5033dddaa8852d45f213 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-caller-file/LICENSE.md -sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-func-name/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/get-stream/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/globals/license -sha256 6236fa0b88a4a0cce3dda0367979491b2052b3c8d6b1c10b3668de083e86a7f0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob/LICENSE -sha256 a2a19c04f527f7582fb2e58887f0a90f403732fc6accd7322287f0f5949b489e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob-parent/LICENSE -sha256 3672fb6ef1c214578dfee689643516c2685f61ab08d130517ca8ea24f383a840 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/glob-parent/node_modules/is-glob/LICENSE -sha256 2fc5460f1526810979054ecd18cd01349b57f38ea56d1e920afdea34d104540c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/graceful-fs/LICENSE -sha256 8a48a335d7dcc06e3da2bea89220cfe978394b1bc84a3e628e60bc4864917915 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/handlebars/LICENSE -sha256 dc1fcc41f783463ed272ada875a7d3d1baf6c6279e5efada2c4ef2ca72db39e1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-binary2/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-flag/license -sha256 898f204abbbbde58c6230a31842c59aeb8040fbcffa924db28e6d0b1d7631a3a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/hash-base/LICENSE -sha256 4fe5fd7b3318def0b74f8bf8c9276403f01da628fa8888822661519d80f237d3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has/LICENSE-MIT -sha256 206c1adcf206dc0031b11232f5b054ec5f1662407ab1ca415247921cab2068ab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/has-symbols/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/he/LICENSE-MIT.txt -sha256 c1476ec53119cd4c8370f91f5152ac76312a29b4fae2d49b5e0e0970fe0fa5ee src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/hosted-git-info/LICENSE -sha256 dcb94ff9b1e037a847bc20589dc81a1066d041fd4c16deb18b0fa968c66cf395 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-errors/LICENSE -sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-errors/node_modules/inherits/LICENSE -sha256 589850dfc0a1d39a97c592d618d5772f84aec2b11c6898e020acb985299f3bab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/http-proxy/LICENSE -sha256 ff151c00207c908581639851dd8504ce4255be0650b2b236edec2aa90342b0cd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/https-browserify/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/https-proxy-agent/node_modules/debug/LICENSE -sha256 ac779f7314c74f232ef847ea86e714abe25cf6eeb5cc97b69451b74e2af6492d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/iconv-lite/LICENSE -sha256 18d45466ba3253deae04667e267a91ea8de8548f18c1125264d1c9db28194cc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ieee754/LICENSE -sha256 9c94db23dc4b1e9aaee5d195668b916afc71efed54af226b66cf0ccc4389c1c0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ignore/LICENSE-MIT -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/import-fresh/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/indent-string/license -sha256 05dc4d785ac3a488676d3ed10e901b75ad89dafcc63f8e66610fd4a39cc5c7e8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inflight/LICENSE -sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inherits/LICENSE -sha256 1fa6ee8bb95a81ae3d73a5bd074a3ac380ffec13697051063ca1a601921b91db src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inline-source-map/LICENSE -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inline-source-map/node_modules/source-map/LICENSE -sha256 e6c3f1bc47f97cdeef953f6c109b6392be0d059ae94659faf550e61b7a75ebc7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/ansi-regex/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/inquirer/node_modules/strip-ansi/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/invert-kv/license -sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-arguments/LICENSE -sha256 92b07a2e5b0e051d37dde85042c736d6d551cfcbc0983f39d7ef903b3986bbc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-arrayish/LICENSE -sha256 628a0b082ba17df4f4bcb7946d41988891d2b410b25927b995c2f632a0829676 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isbinaryfile/LICENSE.txt -sha256 85fe65eefab89e2a683232b96e6f689279821a0bd3b351e9ab6a6ebd19dea567 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-binary-path/license -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-buffer/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-callable/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-date-object/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isexe/LICENSE -sha256 4922620a5741e9d1bb43dde132021a982ae7c545eed1c6e00b555d6fe978005f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-extendable/LICENSE -sha256 73b5283588baa142c5baaef5f56d3e8fdea7a30b214e8c5737e87640f882453a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-extglob/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-finite/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-fullwidth-code-point/license -sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-generator-function/LICENSE -sha256 4cd903859549d4b20b571041f96dfae1136ed079c476126268f9d7cc1b611150 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-glob/LICENSE -sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-nan/LICENSE -sha256 35bdd8a44339719441900fb50fbefc5e2dca1ca662cbaed7a687de842c8b70f2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-number/LICENSE -sha256 0ead7e8cd8b0bc66a981ee69acaf1297ffa838cfce1b156a039bb24f997c0a27 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/isobject/LICENSE -sha256 4cd903859549d4b20b571041f96dfae1136ed079c476126268f9d7cc1b611150 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-plain-object/LICENSE -sha256 44191656d296391e0ec97e32f5385f0d02b6f2992694082d22ea04ba0f66f9e4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-promise/LICENSE -sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-regex/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-stream/license -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-symbol/LICENSE -sha256 b661867c1d66a1b71ee3a6109159874334cd5c182a80d1bcc7353b5a4c6823c6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-api/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-diff/node_modules/minimist/LICENSE -sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-coverage/LICENSE -sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-hook/LICENSE -sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-instrument/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-instrument/node_modules/semver/LICENSE -sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-report/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-report/node_modules/supports-color/license -sha256 b661867c1d66a1b71ee3a6109159874334cd5c182a80d1bcc7353b5a4c6823c6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-source-maps/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-lib-source-maps/node_modules/rimraf/LICENSE -sha256 d38a14ec66572a5588bba501f05eef0874e3ce929f0ddcb749c7557f4fdcb905 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/LICENSE -sha256 4d3083ec594b158fd6adfdc6c9423ffe0746d2d93cebfb98f1a35b69da78051e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/async/LICENSE -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/escodegen/LICENSE.BSD -sha256 c9d85a24226fa4dd8c0756961de362cee34f6e9b1d19938bd480239950ad9a93 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/escodegen/LICENSE.source-map -sha256 4193a099a2c3ba864dd6b94f37e2fd80757d50796999d65adbca6a8c0f3a8e0a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/esprima/LICENSE.BSD -sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/estraverse/LICENSE.BSD -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/glob/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/has-flag/license -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/source-map/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul/node_modules/supports-color/license -sha256 e09f9b52c6ce5c17ba8103cd0cbf446c33b5448b0c1d01d711b36a1f15a501ba src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/istanbul-reports/LICENSE -sha256 f481fe414a74f72c6b37890ad65e1d0b7c3f51be175b6d3e992fdcdb66882bd4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/is-utf8/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/jsesc/LICENSE-MIT.txt -sha256 a9801fb52ba22ef808682a094da8a7a480584b7ed0dfd0d888ab543616335031 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/jsonfile/LICENSE -sha256 6cf2891dd0e66460f7d2ed83e1e3fe4b4b4c1a8c1f1f96c222a3466ad12ff197 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-parse-better-errors/LICENSE.md -sha256 7bf9b2de73a6b356761c948d0e9eeb4be6c1270bd04c79cd489c1e400ffdfc1a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-schema-traverse/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-stable-stringify-without-jsonify/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/json-stringify-safe/LICENSE -sha256 2213d91c606205c71eb051a199478cdc2adde945893404d7f1421436dd6d5cc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-tokens/LICENSE -sha256 a07bc24468b9654ce76a547d47a2db282d07733b715db4c73a98bd63961f9550 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-yaml/LICENSE -sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/js-yaml/node_modules/esprima/LICENSE.BSD -sha256 e3d4ed2aa50e7583730b1531034331ba9093c8bef7414234c7c9306db3858913 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-chai/LICENSE -sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-chrome-launcher/LICENSE -sha256 be13520ed43fa818f7bbe9d3a2beccaf1931421d818d35b42bdae3c127241ed3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage-istanbul-instrumenter/LICENSE -sha256 55c6f6d52a0b60393333dd4e9d385957c7e784517daa9cfbf5b09ec812811eec src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage-istanbul-reporter/LICENSE -sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE -sha256 d38a14ec66572a5588bba501f05eef0874e3ce929f0ddcb749c7557f4fdcb905 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/LICENSE-istanbul -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-coverage/node_modules/source-map/LICENSE -sha256 6e4e577107740b24ebd73cb813be506861d706129e502ca7160683a5cea4c129 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma/LICENSE -sha256 296b9a3c5e4eb7b79a6f1dca9a27ee31e48fe5c9d48a32ec31ac924b65ff287c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-mocha/node_modules/minimist/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma/node_modules/rimraf/LICENSE -sha256 2b3adc1e55676b9443f76bdb17e42371de98a4be6abd3ae6e5f3590f6f3e4f6f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-sourcemap-loader/LICENSE -sha256 3c50a3d2df1468f5e7b723d4c931c1c7ba6775740aa1ef9fa49586ddb7b168fd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/LICENSE -sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/acorn/LICENSE -sha256 d9fed24f132985934fca621c4dc1dfb53e03377a24d0568d424383d7eaa9c0ac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/async/LICENSE -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/source-map/LICENSE -sha256 162413c61e0982abe89a06bf7a02ec760dc49a7364d838bd9f01daebb5b95954 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/tmp/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/karma-typescript/node_modules/tmp/node_modules/rimraf/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lcid/license -sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/levn/LICENSE -sha256 150d7707d4532d57bdb5718637ff62fff1f075921c5ffaa084df27f900bfea76 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/bin/license-checker -sha256 455629980585dfdadbdcbaf846659b65da3dd092ac9bfd10b07717a0e2f84ef5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license-files.js -sha256 37932d5f93a7f9e762346358ae427e703d69fdaae6e7cd67158b35eea91c9eec src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/lib/license.js -sha256 adeb5a7f7d027ec14c3698be7a0f248978516ab39ccec4fb70689ba4753cdd67 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/debug/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/license-checker/node_modules/nopt/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/node_modules/pify/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/load-json-file/node_modules/strip-bom/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/locate-path/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/locate-path/node_modules/path-exists/license -sha256 d778ae0088806b771424967d88efb68f3adb3705c31c3b7c0a052fe2eebd5268 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash-deep/LICENSE -sha256 f71e8ed126b46346494aad5486874cd8f0aafe95092ed67d2e3cb6110f939abc src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash/LICENSE -sha256 90df9e2220f682e1f77e24b1c0f72d2de18b818096c957a65698e74c41a4826f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lodash.memoize/LICENSE.txt -sha256 66da8b277e527c270de6abc57727c58032267d161a81dbac02c3eed45fd13366 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/log4js/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/log-symbols/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/loud-rejection/license -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/lru-cache/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/make-dir/license -sha256 3d3fba5375126ff321d3a51938899d744b1189896618e0f2d088d9e1ebf2822a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/map-age-cleaner/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/map-obj/license -sha256 898f204abbbbde58c6230a31842c59aeb8040fbcffa924db28e6d0b1d7631a3a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/md5.js/LICENSE -sha256 74d8054d56d522bdaa340d3d71130cb204997d523a5292c85ac1264dd77c8d06 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/media-typer/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mem/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mem/node_modules/mimic-fn/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/meow/license -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/meow/node_modules/minimist/LICENSE -sha256 965ef284f7f4c176842ec2e87fa13e79feed777d56d7a21a5a3b38f1bb6dc288 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime-db/LICENSE -sha256 8f2658c03422c408b2b2ce4d151decc3b1a6fd3d86e5ca9433777bccdcdf75a2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime/LICENSE -sha256 71f83c4c0621102a56d9853812777b85751bce7e9726f686f5b056c1f8a4b0e6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mime-types/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mimic-fn/license -sha256 136fee1129ea96ce18b41c26a72f5d4ba196ee41bfd73b55d0b8509cdda148e9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimalistic-assert/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimatch/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/minimist/LICENSE -sha256 05991c2e8f070b69ec5b656c2c12fd07cd0153dd157d39b050b82af59b319a01 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mkdirp/LICENSE -sha256 bd5663836feb58ffb7d0e6b9e62010f4c3399f2bb0a4cf6514a15d597bbdd577 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/LICENSE -sha256 94e1923e52409cfd50e97988d9772c0de15f65700097e3227fec367a39e82b94 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ansi-colors/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/debug/LICENSE -sha256 152f0fb43e953fcf5c56c5bfa4c834bb96b1603e4026319c613dd3e734f305cf src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/diff/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/find-up/license -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/glob/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/ms/license.md -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mocha/node_modules/supports-color/license -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ms/license.md -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/mute-stream/LICENSE -sha256 553d4d20029a24e315b428a1a54a9e109eaa340f2e958a4f50a92362c2c4070b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/negotiator/LICENSE -sha256 811238ba7d85f6fe6b820703a32f92705bcf77bc352ddc3476783491c64a129a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/neo-async/LICENSE -sha256 bd220c219b05e6c22b7c23613ca926f60932d07c9fe141dd6e04b80dbc4b4e52 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/nice-try/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/nopt/LICENSE -sha256 d16b2b8c511d9f2bef8bbf49f0e2a94f032b6b8d181f71c83912c34c116a02e1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/LICENSE -sha256 60acd7711e6c138e6041836e32d922705254cc1568a30fdf16aa8f59bb87aeaa src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-package-data/node_modules/resolve/LICENSE -sha256 e70ff771504ba41f2be55de812a017ff46433d7a250c862e38fc419159e44500 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/normalize-path/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/npm-run-path/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/number-is-nan/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-assign/license -sha256 a596744eec6b05682ed972bf93937668bbc8da2caed93fbf6510389de019b5c0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.assign/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.entries/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object.getownpropertydescriptors/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-inspect/LICENSE -sha256 dc0fe5a22d9336f345ee984f9bf56f11f22877a3aa5fd16a1db9a8ca0e23a5d1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-is/LICENSE -sha256 5640e5cbe2e9f57f6ccfdd8dbfbeadb875495bdbcb69d2666ce3177ccd0942e4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/object-keys/LICENSE -sha256 30792070c6ec188caccbadc5ee32c3e33fdc5e9044c2f08cb1d01213e5a01084 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/omit-deep-lodash/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/once/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/onetime/license -sha256 8089bcc08845ec143e5761f4a101a65b8c792a0dedbfeeb90a15560c0b77f768 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/on-finished/LICENSE -sha256 05991c2e8f070b69ec5b656c2c12fd07cd0153dd157d39b050b82af59b319a01 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optimist/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optimist/node_modules/wordwrap/LICENSE -sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/optionator/LICENSE -sha256 d25d1d6d28c35cb6f358e2833e405c4e53fec2fa24d156323ddea5cd438d3407 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-browserify/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/osenv/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-homedir/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-locale/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/os-tmpdir/license -sha256 a6859a1cdfa7b6ebcdd52505c41bb72e747675b3e7fe0b908c0ac09280f0ba93 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pad/LICENSE -sha256 a04665b3b2de56c66730c1f720f528175739e4104f79073614aa611da1e85539 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pako/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parent-module/license -sha256 bc5ed4eed738303bf403ec3b7e0a8e76760ef60664ad050a0ff61db23da77e66 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parse-asn1/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parse-json/license -sha256 a41d7b212c43bf90af534ec5d73d24a65e3a8cf17941b6d10e9398346a179698 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseqs/LICENSE -sha256 15c35ddf8c82a5fc84e3801db12e279b744605d6ad810e1b52ad09832fc71806 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseuri/LICENSE -sha256 11d017c3b9f1ee3f44caf7203035f0461d5b57e0db8ce1bc03a9af34fa7d3f6b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/parseurl/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-browserify/LICENSE -sha256 9c791b69df62b2264d0a846786f82b00bd6943200a0b10eba66a1ba7a7785fc8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-dirname/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-exists/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-is-absolute/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-key/license -sha256 3f4609137f65070541b9214300ea0d640af8192857de0eeb2b03403003d9228a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-parse/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-type/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/path-type/node_modules/pify/license -sha256 5d45910e7ed82fecc3e29b40a5b3a17ceb609fda19f860aa2ec180d87f4f9d4a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pathval/LICENSE -sha256 a9667a8bf55e7f20cf894cb47774f94ebd4eb366408aafb980f1f6547bcdc10a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pbkdf2/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-defer/license -sha256 7e64acffcb0d20d33f5a86949ffd4a99ae045b10c7332a9c3a58635876c16880 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pend/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-finally/license -sha256 d0cd141b0c322fded5dfad1d4645bb2fedfc05b7321fe1009469638190d59ef9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/picomatch/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pify/license -sha256 6ee0feb1f6ef996ff5a68600f8cf98909cf412d39ef3cdceaefd87d636fa1b7f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pinkie/license -sha256 6ee0feb1f6ef996ff5a68600f8cf98909cf412d39ef3cdceaefd87d636fa1b7f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pinkie-promise/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-is-promise/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-limit/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-locate/license -sha256 f476f01d5da0d8124355eeb79b42b95d2ad2a88d229dbe02b815628760a8cb43 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/plugin-error/LICENSE -sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/prelude-ls/LICENSE -sha256 f4bbb78fa28677ad9b9c0a4b7a255e23c0b24e619c873ed66a11d47c16c88114 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/private/LICENSE -sha256 59a400d04c5078579acc27ddd6452c1bdf763f9506e01364700935fbb1a7c91b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/process/LICENSE -sha256 ecdccbcf39024f624ded480c01c0b25458e1eca8f26ecf040933865ce56d9a4f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/process-nextick-args/license.md -sha256 d7d2a7786de7c7cfd96f920c6f12927d74e1d2a861ca4498bf465c3bc3f4c21c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/progress/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pseudomap/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/p-try/license -sha256 db6109f994692150ed82cd904bb053c73b97b23678bf52047f747bfec11e1934 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/public-encrypt/LICENSE -sha256 3fe8d55a98dbf260eace67c00cf9bc53edb46234e840098a0b93df3096b97fb6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/pump/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/punycode/LICENSE-MIT.txt -sha256 a1e4522979cd422b42d0b464072eb7d0d218651659f56bf09f8c147384e3f105 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/rimraf/LICENSE -sha256 3de284c8e6fa7e8437eff6f53695471e0332129a5b42a79361e17b7637de94b3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/puppeteer/node_modules/ws/LICENSE -sha256 d2f9d2835eb09ccf673e118e4fdc372075437c1787e66c2202912fbe3e5ee9e1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/qs/LICENSE -sha256 cb72d9714ddc21e758d63f423be0caddf909d23ccbb10a2f5201a870818e4f57 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/querystring-es3/License.md -sha256 cb72d9714ddc21e758d63f423be0caddf909d23ccbb10a2f5201a870818e4f57 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/querystring/License.md -sha256 f0606775704212c0b49fb4df8193f7ec190d057551fc857d9f3aaa482b878e29 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ramda/LICENSE.txt -sha256 ddc0dd5947bd2966b9a4cfde098566b011de0acfbe7814536955636ce9e3eced src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/randombytes/LICENSE -sha256 ddc0dd5947bd2966b9a4cfde098566b011de0acfbe7814536955636ce9e3eced src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/randomfill/LICENSE -sha256 f655e6291356ec0de7a8f0e69f294961a2cea86678ec94588be1e6a492e278ab src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/range-parser/LICENSE -sha256 c8e6bca7230689d536a3bd7158f66e9c4f89f95d0748743a0370ac229e9023ad src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/raw-body/LICENSE -sha256 ec62dc96da0099b87f4511736c87309335527fb7031639493e06c95728dc8c54 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readable-stream/LICENSE -sha256 dffec71d93f273d2af7b54c6c7e7e70b3289c632ec0d7253210ec21ac336d5ac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readdirp/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/readdir-scoped-modules/LICENSE -sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-installed/LICENSE -sha256 69be713b3d6c33e0dba76c4d23d986d568593abca04ce47d75162af255d6a345 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-package-json/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-pkg/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/read-pkg-up/license -sha256 6ca87d1dce5b82873603e566fd83dabe8771fb169013337d4a14bb9bbf794687 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/recast/LICENSE -sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/recast/node_modules/esprima/LICENSE.BSD -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/redent/license -sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/regexpp/LICENSE -sha256 aac9937f6a8dbc3328d2b90ab19691333ec4931634ea808673c897e623a9efc1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/remap-istanbul/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/repeating/license -sha256 a92e52eb1fa7cd746e3827bf01d3a3589bbc8e1e51348b1da042aad165525ad1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/require-directory/LICENSE -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/require-main-filename/LICENSE.txt -sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/requires-port/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/resolve-from/license -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/resolve/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/restore-cursor/license -sha256 1ce941682a96c7b898ecd125d0f2e22319758ea6f3adbf498a65d649b0f3f7dd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rfdc/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rimraf/LICENSE -sha256 4847d2fd9ed54cc006dd79f5a14fa5dd35eb8274dca511418166e195e277c05b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ripemd160/LICENSE -sha256 cc9426fe569f331f48fd3134b3a03b5bbe3fc7bd25d604be0006bd55a6134cf5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rollup/LICENSE.md -sha256 e5c1364118b39fa98b959138ce4aa4d0e68cfbee12d115e69730579fecb1dc1b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/run-async/LICENSE -sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm2015/LICENSE.txt -sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/_esm5/LICENSE.txt -sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/LICENSE.txt -sha256 81c407ac717813b0e3795402960e04003c7bba8ba59b621624707028531c9ade src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/rxjs/src/LICENSE.txt -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/safe-buffer/LICENSE -sha256 4bc935e71be198c67ddf3c2b5fddb195f6edc182bfc155a96a6db61b44b494b9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/safer-buffer/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/semver/LICENSE -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/set-blocking/LICENSE.txt -sha256 c4b4ad3a5746f1f5249a6dd90396ec519264e1bb02e01e48a6522c48a3a97cb4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/setimmediate/LICENSE.txt -sha256 76d6d1ea0c268da37dd3c961b4fcfb23dee8417fff9e8786d4d44c585b781b69 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/setprototypeof/LICENSE -sha256 58dcf38be1438f739412b87eb70d64bf00e9976d529bb119f700d8b3167924f0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/sha.js/LICENSE -sha256 e6fdf7ac2af533b4436d99aa75df32aa78690510f7d68a3e73e8576967298d2f src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/shebang-command/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/shebang-regex/license -sha256 e05b1eaf5b5f99b7ad75cd1f38858ff9a311780b97715ead67936d60bf96aa7e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/signal-exit/LICENSE.txt -sha256 3dc3b3d3a284d871f7f307655c90fb101d73abbf87bbddeefd2f67883353bdbc src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/slice-ansi/license -sha256 05dc4d785ac3a488676d3ed10e901b75ad89dafcc63f8e66610fd4a39cc5c7e8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/slide/LICENSE -sha256 56b7b228fde8d638cc7f1c3d0022cf111764083ac4f803b7a50a90388dce3788 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-adapter/LICENSE -sha256 62e2032a1e1458b1d92a62f5fc51be48e08b95062295c91a9f3bd3686809d37e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-client/node_modules/ms/license.md -sha256 c10d192d935165dac336ae245f9eef4c42bb37e7c6f5c5f6f7663db778122df1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io/node_modules/ms/license.md -sha256 56b7b228fde8d638cc7f1c3d0022cf111764083ac4f803b7a50a90388dce3788 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/debug/LICENSE -sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/socket.io-parser/node_modules/ms/license.md -sha256 6cb0631f71c7749763fd3dd1d5bee52dd1070ec17f2edc1710079ad070bd2fbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/source-map/LICENSE -sha256 c5ca60a739543ef97683dfa0a94773b214c86c826c76a27b8f8e6eb38148cbce src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-compare/LICENSE.md -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-correct/LICENSE -sha256 7edb57f7065309027de249642341292a5b21410d5773cc55bba73ff9cf01060e src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-expression-parse/LICENSE -sha256 c5ca60a739543ef97683dfa0a94773b214c86c826c76a27b8f8e6eb38148cbce src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-ranges/LICENSE.md -sha256 a21ab121cef9bed38553faad40e49b27ae3d2578d07a70956664e681021c9875 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/spdx-satisfies/LICENSE -sha256 a4cdda44b5adea4731d53dcae78fb5124f8fd853e994f01e25d8c33a7daf818b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/sprintf-js/LICENSE -sha256 512cfa4d5e7a7569c7ae4dd95241cb6ae2aaf648ef9ebd080c01bd24868d26e9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/statuses/LICENSE -sha256 ff151c00207c908581639851dd8504ce4255be0650b2b236edec2aa90342b0cd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/LICENSE -sha256 ec62dc96da0099b87f4511736c87309335527fb7031639493e06c95728dc8c54 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/readable-stream/LICENSE -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/safe-buffer/LICENSE -sha256 11f2aafb37d06b3ee5bdaf06e9811141d0da05263c316f3d627f45c20d43261b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-browserify/node_modules/string_decoder/LICENSE -sha256 a0e6357a5e8ea65827addeb383e0948a1874d2f46bc7feaf6349b7a376ed6e98 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/stream-http/LICENSE -sha256 9660914267128b5f96a102bd7f6268c249110a39cb7c4bb7f536d856445d739c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/streamroller/LICENSE -sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/streamroller/node_modules/debug/LICENSE -sha256 11f2aafb37d06b3ee5bdaf06e9811141d0da05263c316f3d627f45c20d43261b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string_decoder/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimleft/LICENSE -sha256 c61652db3d2808f667b48af0a358f0d85fd07ad4a0d0b1a50882dec3b764c522 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string.prototype.trimright/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/string-width/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-ansi/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-bom/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-eof/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-indent/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/strip-json-comments/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/supports-color/license -sha256 37b6932865726cf59cbfb8b32a5c9fd82c834c2deba4d53aa4a6b433ae69cdda src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/ansi-regex/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/string-width/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/table/node_modules/strip-ansi/license -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/text-table/LICENSE -sha256 faae57631e1c7d641c3b6f9b110c2a7a28c8b383d08d7796ac472c509f075850 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through2/LICENSE.md -sha256 e8734448285a2dd773d40136ed5d5e8163a70701dd540cdc796cfca232f67d55 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.APACHE2 -sha256 d72dea1a8cdf3f4dfa2f594253d0c5b37baefc76e806f5ecb0e426393edcd505 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/through/LICENSE.MIT -sha256 d5f14c3258420dfe5a3b641a143d6e6dd90eabb5962244d937e25699c3a45ec9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/timers-browserify/LICENSE.md -sha256 162413c61e0982abe89a06bf7a02ec760dc49a7364d838bd9f01daebb5b95954 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tmp/LICENSE -sha256 61b82d27e63b14eabc706960aabf6caa1b27d044eb00d7908f92e68085301c3a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/to-fast-properties/license -sha256 a832d679750e49ab433626ab196350b89964b60eb0d3edd3341887c7d5f4c128 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/toidentifier/LICENSE -sha256 e7d1fee7347ffddccc5fd03327ffdb50f8c112be0d5016d62388a92c4ae6e7a9 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/to-regex-range/LICENSE -sha256 83927d1555a8e1d5ed9896991fbb2b4cdfb64f45f5e12b7446c3bff5cea538d3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/treeify/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/trim-newlines/license -sha256 a5e9f9b1575301c7a7a03508fdaa2e05a918cc17fd21c6e898096a96d6a34f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tslib/LICENSE.txt -sha256 ed0ff5ab79bc82703690fde4644e352c9ce73e9b890b87ea68b1a1fc5805792b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tsutils/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/tty-browserify/LICENSE -sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-check/LICENSE -sha256 26181ebee1063f3dc6766a3b6d05999a0da058f172eadf2ca5d15105ffd9735a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/typedarray/LICENSE -sha256 e5aee0714b6ecc416454b968d1017570ef609f20d8722ab84b07acd550b78198 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-detect/LICENSE -sha256 23d466b1b134b415b66fa50c6526b4cf3e7b9258554da88d3abb371721e7ce68 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/type-is/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/chai/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/color-name/LICENSE -sha256 5938d4fe4890c79ad14e02e643c385b25b8b6c7bbb97ab08996034b586512df5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/LICENSE -sha256 fcf6eabf68ca96988a6b506b4fdc6cc32535d80eb2e11c79724af5ac6f50262b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/eslint-plugin/node_modules/regexpp/LICENSE -sha256 5938d4fe4890c79ad14e02e643c385b25b8b6c7bbb97ab08996034b586512df5 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/LICENSE -sha256 d3a724e2ed749f172ff70b62a1d0631b7d4b0ea273782365a3464d4e2d6b6dbd src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/experimental-utils/node_modules/eslint-scope/LICENSE -sha256 e2fc706570305bcb7dfadb1cac951d5934ce0d7331a7a7ff1bbc254dbe1d9ef8 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/parser/LICENSE -sha256 635818d8f39384751c8a5f3f3e735022f07afb3ccdb26eb17ff8eca28428f888 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/LICENSE -sha256 6236fa0b88a4a0cce3dda0367979491b2052b3c8d6b1c10b3668de083e86a7f0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/glob/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@typescript-eslint/typescript-estree/node_modules/semver/LICENSE -sha256 a5e9f9b1575301c7a7a03508fdaa2e05a918cc17fd21c6e898096a96d6a34f61 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/typescript/LICENSE.txt -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/eslint-visitor-keys/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/estree/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/filesystem/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/json-schema/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/mocha/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/node/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/@types/puppeteer/LICENSE -sha256 b00ae96f0815ae8fa49c09044467306e98cd89d6770c535fb596ccbd350c6ab4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/uglify-js/LICENSE -sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ultron/LICENSE -sha256 3fda5977c0904e226190b4e21d64340c1731e2142d6fe5f3dee0090a216b8b63 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/universalify/LICENSE -sha256 1a526fbe8d8577f5a4b1c2821842b55b7c0e18862531c62ae4ce69c9b19b74b6 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/unpipe/LICENSE -sha256 97f780d3c79a42236f2b3435860f284c0ac6b958622f6bc9f1ac43fd49689b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/url/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/url/node_modules/punycode/LICENSE-MIT.txt -sha256 1da14af109d9baaa8dee3094add5cc65a7772487dd94c8d2adfd36935b678c49 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/useragent/LICENSE -sha256 0154425673db15cdfa80ecba2c9b1f1a867f7197a006764712849bfc3a93cbb7 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util-deprecate/LICENSE -sha256 6239c6144c31e58cf925c34483606969c555574d64ffa96518ab5d7f45c75d43 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util-extend/LICENSE -sha256 6239c6144c31e58cf925c34483606969c555574d64ffa96518ab5d7f45c75d43 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/util/LICENSE -sha256 6e7d699cdd1e4fa837ba7718ea49841aa67201b449ea8b3f9cf274be15974a64 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/utils-merge/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/validate-npm-package-license/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/vm-browserify/LICENSE -sha256 405a272eaef556691ad7dda96db3237c9544afe18725842a1a5b3ec308960222 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/void-elements/LICENSE -sha256 6294da0e0a201bbe1de254445c9d07133a9448af05e4e44d0a2364747d114368 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wcwidth/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/which/LICENSE -sha256 852bf81203aa93aa89afc9f881ebb035322dc7334aaceff435c557634c94a815 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/which-module/LICENSE -sha256 0cef05dfff8b6aa7f35596984f5709f0d17c2582924a751efa471a76de7cdc11 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wide-align/LICENSE -sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wordwrap/LICENSE -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/ansi-regex/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/is-fullwidth-code-point/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/string-width/license -sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrap-ansi/node_modules/strip-ansi/license -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/wrappy/LICENSE -sha256 0ead7e8cd8b0bc66a981ee69acaf1297ffa838cfce1b156a039bb24f997c0a27 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/write/LICENSE -sha256 3de284c8e6fa7e8437eff6f53695471e0332129a5b42a79361e17b7637de94b3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ws/LICENSE -sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/ws/node_modules/safe-buffer/LICENSE -sha256 a5f35901ee8b2039a7431144c23dd10bd47c1d07bcee0cd3a536421d86412214 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/xmlhttprequest-ssl/LICENSE -sha256 82e67379203d5794e7c44549847d8d64ae6904591381682360470898bd306821 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/xtend/LICENSE -sha256 2034cce3b6fafcddd642c4175e01d3ddfc332a53b9f20fdc46b1466dc89ac469 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/y18n/LICENSE -sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yallist/LICENSE -sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-regex/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/ansi-styles/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/camelcase/license -sha256 2dc0465729366c3a7890dfa9e972a1ba7048a26c02116fb8b419a6a1ac110149 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/cliui/LICENSE.txt -sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-convert/LICENSE -sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/color-name/LICENSE -sha256 483acb265f182907d1caf6cff9c16c96f31325ed23792832cc5d8b12d5f88c8a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/emoji-regex/LICENSE-MIT.txt -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/find-up/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/is-fullwidth-code-point/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/locate-path/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/path-exists/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/p-locate/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/string-width/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/strip-ansi/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/wrap-ansi/license -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs/node_modules/yargs-parser/LICENSE.txt -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/LICENSE.txt -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-parser/node_modules/camelcase/license -sha256 30877d17f7e38530d46b49fb375ee98ce2e8b085b3ee72d4c2888710416ef139 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/LICENSE -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/camelcase/license -sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/find-up/license -sha256 902dbb4154679fb2b8d7c33878183f45b268d01eae5e5033dddaa8852d45f213 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/get-caller-file/LICENSE.md -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/require-main-filename/LICENSE.txt -sha256 fe71524a15f30aab0f39af7165d38fc64a4269b7d2a0caffebc907355aec9c92 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs/LICENSE -sha256 365496ca1f56da40b23c9815fc40fa9005847b2f8f8fd1c1a4929ef25ec8cd1d src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yargs-unparser/node_modules/yargs-parser/LICENSE.txt -sha256 b303783d5eb7ca50b853ffa5f145e4e7998fab339831d848f507ca6cd970577a src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yauzl/LICENSE -sha256 3b2a6a268aa815dec121d614245e03b5c68db1f044d5b525e36db7d5dc7fb9c3 src/3rdparty/chromium/third_party/devtools-frontend/src/node_modules/yeast/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/closure/COPYING -sha256 af175b9d96ee93c21a036152e1b905b0b95304d4ae8c2c921c7609100ba8df7e src/3rdparty/chromium/third_party/devtools-frontend/src/third_party/axe-core/LICENSE -sha256 a8ad31b1c3f40dca5a84119351b8fa8ddc868edd77fad8a8ebf6d8f2d16fa4ae src/3rdparty/chromium/third_party/devtools-frontend/src/third_party/pyjson5/src/LICENSE -sha256 4f5753ce8acf3feafc758599058746d30bda07bc0d4cc3a6a1eb8e039fdba1dc src/3rdparty/chromium/third_party/dom_distiller_js/LICENSE -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 src/3rdparty/chromium/third_party/dpkg-shlibdeps/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/emoji-segmenter/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/emoji-segmenter/src/LICENSE -sha256 9021fdb5341ebbb2eb5c771ac5cfac527790673179d3b21a42de1ab2798ec30f src/3rdparty/chromium/third_party/espresso/LICENSE -sha256 46336ab2fec900803e2f1a4253e325ac01d998efb09bc6906651f7259e636f76 src/3rdparty/chromium/third_party/expat/src/expat/COPYING -sha256 d9c904abd0ead61b3fbaef0a609285548076ff9c3f814cc1cf019c5d7150736d src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt -sha256 a8579e3fc40c11ab147bc299257733eb749cd455010385f7c117f70d7aef24e4 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt -sha256 857d5f537af3aa164e7a27eda60147d34195e5781abe7b1d358d9fb01e222ae0 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt -sha256 b4c85cce2b772f27d83f4562c20787057dc6949fcecc820a82c1d2e7047e89c3 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/oggparse_ahlberg_rullgayrd_2005.txt -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv2 -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv3 -sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv2.1 -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv3 -sha256 cb48bf09a11f5fb576cddb0431c8f5ed0a60157a9ec942adffc13907cbe083f2 src/3rdparty/chromium/third_party/ffmpeg/LICENSE.md -sha256 f45cc81b400a048b56c9edbd4c3317f7a8958463dfd55aa96f268ecfd6baa12c src/3rdparty/chromium/third_party/flac/COPYING.FDL -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 src/3rdparty/chromium/third_party/flac/COPYING.GPL -sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a src/3rdparty/chromium/third_party/flac/COPYING.LGPL -sha256 946b733afbaa20a192c8dc022b4e43090e78f28fd293494d1b307f7301552c9b src/3rdparty/chromium/third_party/flac/COPYING.Xiph -sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 src/3rdparty/chromium/third_party/flatbuffers/LICENSE -sha256 3112ebbfc0fe10ad40a97672f5590c4292536a28cbfe3506820b15dec70b2258 src/3rdparty/chromium/third_party/flatbuffers/src/dart/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/flatbuffers/src/LICENSE.txt -sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 src/3rdparty/chromium/third_party/fontconfig/LICENSE -sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 src/3rdparty/chromium/third_party/fontconfig/src/COPYING -sha256 fd056de4196903a676208ef58cfddafc7d583d1f28fa2e44c309cf84a59e62fb src/3rdparty/chromium/third_party/freetype/src/docs/LICENSE.TXT -sha256 56e67061ab590046b09876a084478ea87c4ece1579deb194347096e61c2537dd src/3rdparty/chromium/third_party/fuchsia-sdk/LICENSE -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/gif_player/LICENSE -sha256 8ea14fdc7efee7fe53c79101b97049bd547dc6686cfa05df4f0686146a561423 src/3rdparty/chromium/third_party/glfw/src/LICENSE.md -sha256 23353f4505b1c8ce4f8f72fc3b11dc74b4a8a7bf95921d93ff77f227c171a710 src/3rdparty/chromium/third_party/glslang/LICENSE -sha256 d3cbc77d99642114bc925cce51eda84b48ae4879947ac89941a2e2aa4150db76 src/3rdparty/chromium/third_party/glslang/src/LICENSE.txt -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/googletest/src/googlemock/LICENSE -sha256 5e0df8c845c742e76f2f64d2d9ce1b7e74a2422fddbc577ae6a56319083de0bf src/3rdparty/chromium/third_party/googletest/src/googlemock/scripts/generator/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/googletest/src/googletest/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/googletest/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/google-truth/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/guava/LICENSE -sha256 ca382aa537f8923d6c0991fb976d184a2009eb76080313bf10dcecdc9311f0dd src/3rdparty/chromium/third_party/gvr-android-keyboard/LICENSE -sha256 f54c49d3ff865458c5d3c68c3367a1f6e0d7b3f686f8c88a6a563ef90f84ad9e src/3rdparty/chromium/third_party/gvr-android-sdk/LICENSE -sha256 96e5bbd81970983d666e702fa56f67dfd2fdaa363b8a4266e8d98847374cd7c8 src/3rdparty/chromium/third_party/hamcrest/LICENSE -sha256 beb3f017ceb41387667f78237a7cecf84defa0ed257c505894663d6a9f13211b src/3rdparty/chromium/third_party/harfbuzz-ng/src/COPYING -sha256 c2cfccb812fe482101a8f04597dfc5a9991a6b2748266c47ac91b6a5aae15383 src/3rdparty/chromium/third_party/harfbuzz-ng/src/src/ms-use/COPYING -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/hunspell/COPYING -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 src/3rdparty/chromium/third_party/hunspell/COPYING.LESSER -sha256 53692a2ed6c6a2c6ec9b32dd0b820dfae91e0a1fcdf625ca9ed0bdf8705fcc4f src/3rdparty/chromium/third_party/hunspell/COPYING.MPL -sha256 610809f1586ee4d22468f1e97c256153cea8be7a662193db70d6ca424e0f17c8 src/3rdparty/chromium/third_party/iaccessible2/LICENSE -sha256 a412a53925efc6b50800bf8519a2e033949243d5a5a8c5422bae8a5007ad09c8 src/3rdparty/chromium/third_party/iccjpeg/LICENSE -sha256 d18e75f216f177d41304f5e94c2cba7d1bf9f8f8583a0777cceb5cca0c5ad137 src/3rdparty/chromium/third_party/icu4j/LICENSE -sha256 6a18c5fac70d7860b57f5b72b4e2c9a1ba6b3d2741eef7ff9767c5379364f10d src/3rdparty/chromium/third_party/icu/LICENSE -sha256 c62d7697c03979f5056d28b338fafc7a1152820f7b379adf4a9d88cd37160f96 src/3rdparty/chromium/third_party/icu/license.html -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/third_party/icu/scripts/LICENSE -sha256 8c6db340475136df3c1201d458fa5755698eace76e510471ecc9d857d6083dac src/3rdparty/chromium/third_party/ijar/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/ink/LICENSE -sha256 b9be92f13356083392d97da13cab8ae543c7911f44eff5289b693da8b17b9e08 src/3rdparty/chromium/third_party/inspector_protocol/LICENSE -sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 src/3rdparty/chromium/third_party/isimpledom/LICENSE -sha256 ed8d7a24769ac9d57d08769b5f8be27519dd8811d06b0995dbe8ca6714e96d08 src/3rdparty/chromium/third_party/jacoco/LICENSE -sha256 33b6816eb449962d307495946519ed78cef8743819f6f1d60e8b3d4e86c38b1c src/3rdparty/chromium/third_party/javalang/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/jetifier_standalone/LICENSE -sha256 7975c0027cfa5d08253fbb6ff4676acc38248bd5e046d0dbab3d810971e97970 src/3rdparty/chromium/third_party/jinja2/LICENSE -sha256 76c45ece83a26117f86f4e349e7df118708e061e87225328fb478ce1e8b3eb86 src/3rdparty/chromium/third_party/jsoncpp/LICENSE -sha256 95039d77a20e75b428207740d9a8f97b2dce3c89da4b21f1ad862b5997160e0a src/3rdparty/chromium/third_party/jsoncpp/source/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/jstemplate/COPYING -sha256 71a19392a0eb3255ab2055ed978bb0f93865cea84d31a3510eaffb74d8981e7f src/3rdparty/chromium/third_party/khronos/LICENSE -sha256 ccc19f1da0798ed666609b65a5b44dd8b3abe6fc08b9c0592eb76e82e174db19 src/3rdparty/chromium/third_party/leveldatabase/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libaddressinput/LICENSE -sha256 c9a5bd7c8cc1267ddacdc5228c68ecd811cf6d74286e9141bc80d8af2eb1a025 src/3rdparty/chromium/third_party/libaddressinput/src/cpp/LICENSE.chromium -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libaddressinput/src/LICENSE -sha256 4764a286d8b2faeaf42f4418e7d7a28d58fc8fd4d00a3d0a7f44b0a4099de7f2 src/3rdparty/chromium/third_party/libaom/source/libaom/LICENSE -sha256 043dcfd059386f9facd376351b2bd79325778744aa442177390cdfcca54babed src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/fastfeat/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/googletest/src/googletest/LICENSE -sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/libwebm/LICENSE.TXT -sha256 ff6c857ce2708e87701323078aef115c1872a1f80a9649f86dc899b48083bc60 src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/vector/LICENSE -sha256 719d8fa235f2068e0ae6d6a7dceb0a7720d7840f0f0ebed29957989e6ded3cd8 src/3rdparty/chromium/third_party/libaom/source/libaom/third_party/x86inc/LICENSE -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/libcxx-pretty-printers/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libgav1/src/LICENSE -sha256 d56bafdaeaa793331a29e9766b7efe66524c98533da798a57201e291863ef625 src/3rdparty/chromium/third_party/libgifcodec/LICENSE.md -sha256 37d8bfba91b745693ea58f846f2f1276229745adf532974b73c1911cfd144241 src/3rdparty/chromium/third_party/libipp/LICENSE -sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 src/3rdparty/chromium/third_party/libjingle_xmpp/LICENSE -sha256 8412238c5ad95965cf3c3197791e9dea8b5fae505d133449e33ee2fa754fe61e src/3rdparty/chromium/third_party/libjpeg_turbo/LICENSE.md -sha256 3bf128851aff9f392953276ea8ade3e41da0f40b853fde58ec21034aa91ccc31 src/3rdparty/chromium/third_party/libovr/LICENSE -sha256 bf5e22b9dce8464064ae17a48ea1133c3369ac9e1d80ef9e320e5219aa14ea9b src/3rdparty/chromium/third_party/libpng/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libprotobuf-mutator/src/LICENSE -sha256 a1a33180d02960ab1c5de36cf20b1a2f0fe9888d83826ad263da5db52f1b183b src/3rdparty/chromium/third_party/libsecret/LICENSE -sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae src/3rdparty/chromium/third_party/libsrtp/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libsync/LICENSE -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 src/3rdparty/chromium/third_party/libudev/LICENSE -sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a src/3rdparty/chromium/third_party/libusb/src/COPYING -sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 src/3rdparty/chromium/third_party/libvpx/source/libvpx/LICENSE -sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/googletest/src/LICENSE -sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libwebm/LICENSE.TXT -sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libyuv/LICENSE -sha256 719d8fa235f2068e0ae6d6a7dceb0a7720d7840f0f0ebed29957989e6ded3cd8 src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/x86inc/LICENSE -sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf src/3rdparty/chromium/third_party/libwebm/source/LICENSE.TXT -sha256 6de6fe48ff7b249a51ec5522d1af618dd50effc6f030fd24e17878566ad2ca5d src/3rdparty/chromium/third_party/libwebp/LICENSE -sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd src/3rdparty/chromium/third_party/libxml/src/COPYING -sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd src/3rdparty/chromium/third_party/libxml/src/Copyright -sha256 31346421254a3e6e12687cf17f19f6357ee73a617fa7b3d3ccefdcbabe49bdd3 src/3rdparty/chromium/third_party/libXNVCtrl/LICENSE -sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 src/3rdparty/chromium/third_party/libxslt/linux/COPYING -sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 src/3rdparty/chromium/third_party/libxslt/src/Copyright -sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f src/3rdparty/chromium/third_party/libyuv/LICENSE -sha256 0d4077a7055ead389c4c5a9a6ac4bb8b784fc6e9e37be2caf544fcceed26cb16 src/3rdparty/chromium/third_party/lottie/LICENSE -sha256 6e3e0a978f1e136cb3efb89702f4314671581a0c70c9a52447669e00f7b129e8 src/3rdparty/chromium/third_party/lzma_sdk/LICENSE -sha256 c3b124673c93872156757a934c75b498d68eec09510e25e549d9dc2013776499 src/3rdparty/chromium/third_party/mako/LICENSE -sha256 0bbe88228fd63d20ec097f64e58d5a0a465123ae139140a18d406c60b48824b5 src/3rdparty/chromium/third_party/markupsafe/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/material_design_icons/LICENSE -sha256 536284e40c611f371f6ce5d74efac37a20d993cd3af96259b9b9e20b1669ff1e src/3rdparty/chromium/third_party/mesa_headers/LICENSE -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/third_party/metrics_proto/LICENSE -sha256 27ebda9d51f0a56b7e281ccd8230a27236dcb51c05f64b07869ecf6e965d68b0 src/3rdparty/chromium/third_party/microsoft_webauthn/LICENSE -sha256 83bb6bd9ccd2cf5230cb1807ed16258289768dc4d9cb80069a814e04415a1275 src/3rdparty/chromium/third_party/minigbm/LICENSE -sha256 8610954adbca6c6b85d8b1ae5613b44b0014e437d32fcad6683bb27541411686 src/3rdparty/chromium/third_party/minigbm/src/LICENSE -sha256 4919cfb14a73cd64fcef67b107613970cf1659a09aa675dba31314f373bc7204 src/3rdparty/chromium/third_party/minizip/src/lib/bzip2/LICENSE -sha256 87642305968765a4030fd202ff7006afa67274da7f9bde84506e51ae58ecc2b4 src/3rdparty/chromium/third_party/minizip/src/LICENSE -sha256 bd5663836feb58ffb7d0e6b9e62010f4c3399f2bb0a4cf6514a15d597bbdd577 src/3rdparty/chromium/third_party/mocha/LICENSE -sha256 380893a2f01aea5c3328b1a8b08cdc488bf236916abac3af0d1f1a5d2634c31a src/3rdparty/chromium/third_party/mockito/LICENSE -sha256 d47e8390fb0d7ad4a18f26aedd6283c7ab6b5b4fabab536ccb4db7f9f6d90c08 src/3rdparty/chromium/third_party/modp_b64/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/motemplate/LICENSE -sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 src/3rdparty/chromium/third_party/mozilla/LICENSE -sha256 1563996c52e220e15ef2418e67d39488255aa8c28c89e617074d3afe3ee329e0 src/3rdparty/chromium/third_party/nasm/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/netty4/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/netty-tcnative/LICENSE -sha256 0cd1bd4b934ffdc5e7f1bcfa9d08bd17295e5414bdca99c06b1036278b01f0b1 src/3rdparty/chromium/third_party/node/LICENSE -sha256 b5730da9a26472a405b0b1c61d3d166714d9d654ab3282e54e4a01a5f66316c3 src/3rdparty/chromium/third_party/objenesis/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/ocmock/License.txt -sha256 8bed129a6a15e631c93a624985e631eb62a55f7e072b78f4e1c3dde7c745283d src/3rdparty/chromium/third_party/one_euro_filter/LICENSE -sha256 dd5c1c9668512530fa5a96e4c29ac4033d70a7eeb0eed7a42fddb6dd794ebdbb src/3rdparty/chromium/third_party/openh264/src/LICENSE -sha256 34a5c58db7cc4d3265d14a9aa26e38067fe114311d8bec31f909d1c240e626c4 src/3rdparty/chromium/third_party/openscreen/src/LICENSE -sha256 284545e873c704952e5b1b39d457dd83a3b115a51d9f1eb5175137bd69b8fa1b src/3rdparty/chromium/third_party/openscreen/src/third_party/mozilla/LICENSE.txt -sha256 f56ff606104d4ef18e617921a75c73ad73b5a1a1d70c69590c29de16919e04ad src/3rdparty/chromium/third_party/openvr/src/LICENSE -sha256 8338ce8d922bb4416ce3dd1e5680173332435e3f0755007ac7801ccd674fe682 src/3rdparty/chromium/third_party/opus/src/COPYING -sha256 7efb4989e0cd1b256229bdf2f09300c5d14e35db0e7476bfb87fac243498273d src/3rdparty/chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt -sha256 0d74de3c3cd3196a9ed1bc612cfd5f81d7509d66c4be34a50f99d61bd1ad00d4 src/3rdparty/chromium/third_party/ots/LICENSE -sha256 9dd8d2fb95ba862a5d166a167682c1c67a209acd3bf09b6fd03f76d3579729bc src/3rdparty/chromium/third_party/ow2_asm/LICENSE -sha256 76621fcfb65adfd6602b700708b74c8e20f3325b32f1a54bec83a5cf7c679f53 src/3rdparty/chromium/third_party/pdfium/LICENSE -sha256 32759d1397d8f7b9e15ece146e4038b22b90e93b4935b5a840bcef4d2ba5ea55 src/3rdparty/chromium/third_party/pdfium/third_party/bigint/LICENSE -sha256 bf5e22b9dce8464064ae17a48ea1133c3369ac9e1d80ef9e320e5219aa14ea9b src/3rdparty/chromium/third_party/pdfium/third_party/libpng16/LICENSE -sha256 c5b14f5a3814d2e57b9bb9520dcf57a2c3817b65c4f989e5c82e332c82af1038 src/3rdparty/chromium/third_party/pdfium/third_party/pymock/LICENSE.txt -sha256 e323929b7c2178e2efc9ac70e62166670274bd772f90a8d83a90300c5f60002c src/3rdparty/chromium/third_party/perfetto/LICENSE -sha256 9f98bab33648b77578d85ac0f1d1c3941a72aa6d7e65015ba181f2fe804bb85d src/3rdparty/chromium/third_party/pexpect/LICENSE -sha256 a46200592eb193853527250da098e6bb0c75424e7a2c7db8da526c4f301c3d88 src/3rdparty/chromium/third_party/pffft/LICENSE -sha256 dd4930c619afd8527591353c7d3d1c1d7f4bf62ed1cb411f4f507dbdee7738a2 src/3rdparty/chromium/third_party/ply/LICENSE -sha256 d6c873c08a8806f08fdafe1aa00ba38837f6ac29f91d6b26510614b0df2001e0 src/3rdparty/chromium/third_party/ply/license.patch -sha256 24699c6858472311aa9acc6c2b7112ff9de6e7792569158ba9e439deb0529ef6 src/3rdparty/chromium/third_party/polymer/LICENSE.polymer -sha256 a5adc2955c0dd848c97aa6afb14e0047a610f0fcfa6ce0011efad01a0e051406 src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer2/LICENSE.txt -sha256 984fb04a16a9f1e0145ffd891125dc366a01cd921f58c9b0369be400c720790d src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer/LICENSE.txt -sha256 a5adc2955c0dd848c97aa6afb14e0047a610f0fcfa6ce0011efad01a0e051406 src/3rdparty/chromium/third_party/polymer/v3_0/components-chromium/polymer/LICENSE.txt -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/private-join-and-compute/src/crypto/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/private-join-and-compute/src/LICENSE -sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/private-join-and-compute/src/util/LICENSE -sha256 294f58267c6f473c4ce7270bf5c8d34b2003cb43804552459654c36553431276 src/3rdparty/chromium/third_party/proguard/LICENSE -sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d src/3rdparty/chromium/third_party/protobuf/LICENSE -sha256 2ab28b982a7f3150e1597befaa87e1636b9973c80aef3752597945d270c4c4e4 src/3rdparty/chromium/third_party/pycoverage/LICENSE -sha256 f8d0c347a0dcc6ebe1671640dfae8d2411b6ded892e06a6764f8208b218b2af4 src/3rdparty/chromium/third_party/pyelftools/elftools/construct/LICENSE -sha256 f8c8ccecdbb044fd6fa1a586c596a055fb2b14fb3e335d8ed282db58d80b7410 src/3rdparty/chromium/third_party/pyelftools/LICENSE -sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 src/3rdparty/chromium/third_party/pyjson5/src/LICENSE -sha256 c5b14f5a3814d2e57b9bb9520dcf57a2c3817b65c4f989e5c82e332c82af1038 src/3rdparty/chromium/third_party/pymock/LICENSE.txt -sha256 318cea263a2fb726d767e2777771a431a3220008e6940dd5138a235a1fc498fc src/3rdparty/chromium/third_party/pystache/LICENSE -sha256 956c3b678228a216142df38d039bba56ee6509d3298e7a4b8dd5bc3eaa80fe33 src/3rdparty/chromium/third_party/Python-Markdown/LICENSE.md -sha256 5a2954f05e7fcc1bf240a3b58534f974760b5aae02438ce875c9c7fe0bdb4cf9 src/3rdparty/chromium/third_party/pywebsocket3/src/LICENSE -sha256 c903100da706172066fa1b6f02eba60f202fea63036492d2c4a01267e32aa7a8 src/3rdparty/chromium/third_party/qcms/src/COPYING -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/quic_trace/src/LICENSE -sha256 38751245389e1e23f73e6f5384b5cbe7fa972cc4410c5adc9c04b082a0b9561a src/3rdparty/chromium/third_party/quic_trace/src/third_party/fonts/LICENSE -sha256 8991cd11befec7c6a63662700f03c0cc42e864b6e77c7e70b80297c951a7f0ff src/3rdparty/chromium/third_party/quic_trace/src/third_party/glew/LICENSE.txt -sha256 f98f3db81b4dd3873d8672117e409286142cfae9b7673ab6d7aab4bae1527d20 src/3rdparty/chromium/third_party/qunit/LICENSE -sha256 68834f116f8ff545f05d14753357b620748156d60ee36b26beab4cb3f317efe4 src/3rdparty/chromium/third_party/r8/LICENSE -sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 src/3rdparty/chromium/third_party/re2/LICENSE -sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 src/3rdparty/chromium/third_party/re2/src/LICENSE -sha256 e479bcdfa777738226b4282bf8536cc5416a25cec3100cbe210b8be4d1e2ed84 src/3rdparty/chromium/third_party/requests/LICENSE -sha256 e2f59ff41d9d03adc3dcf3deff170f8c8cf4a6eb4a9b174762a7656d23200ffa src/3rdparty/chromium/third_party/rnnoise/COPYING -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/robolectric/LICENSE -sha256 19c9b910bec5a4f2c420747d1bf81e975ffdb1377ad91c5d9b1e8dd3e38f4c17 src/3rdparty/chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt -sha256 a7436c952fa2dc0701860cf4187d1e8e8e6de6720dec0ae9e0b641bc50eebced src/3rdparty/chromium/third_party/robolectric/licenses/javolution.license.txt -sha256 5b6ac717e37db4f6d17bda7791f4ce3f99947aeb21e6e72b705aa3d1ee2de480 src/3rdparty/chromium/third_party/robolectric/licenses/pivotal.labs.license.txt -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/s2cellid/LICENSE -sha256 3f941b3b89cf7b8370ceb83cc76d2120d471b58735d8ca60238a751a48d7f72f src/3rdparty/chromium/third_party/schema_org/LICENSE -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/shaderc/src/LICENSE -sha256 b5a00e94f058edc87e05978329b55730d8689abe61205d9018443d03de4f07da src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.glslang -sha256 47e20ce182bc68fab1a0cfb129b03c326aaf4f2b6b7905aa9d376d31018bd29f src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.spirv-tools -sha256 33c9a2fe619e1200937629f318895898ffcd1bf7d0ddd39adc382c030925e61e src/3rdparty/chromium/third_party/simplejson/LICENSE.txt -sha256 b25948e48c44312d04ffc626a9d52cae7c04539a1a8e0c1be47b7bfa0da03e1d src/3rdparty/chromium/third_party/sinonjs/LICENSE -sha256 8bb850c565aa389fdc16f3a46965ad23d82adff60f2393fc2762b63185e8e6c9 src/3rdparty/chromium/third_party/six/LICENSE -sha256 8bb850c565aa389fdc16f3a46965ad23d82adff60f2393fc2762b63185e8e6c9 src/3rdparty/chromium/third_party/six/src/LICENSE -sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 src/3rdparty/chromium/third_party/skia/include/third_party/skcms/LICENSE -sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 src/3rdparty/chromium/third_party/skia/include/third_party/vulkan/LICENSE -sha256 5f787c1dee3c56547f09ccc2906ab5f5293c4d8dd6c8654e573216c38e908dbd src/3rdparty/chromium/third_party/skia/LICENSE -sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/modules/canvaskit/canvaskit/LICENSE -sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/modules/pathkit/npm-asmjs/LICENSE -sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/modules/pathkit/npm-wasm/LICENSE -sha256 5366e97b4478f15a1e2fd7e6094337426597df28de50cd9fed3f2e7e87f1229e src/3rdparty/chromium/third_party/skia/third_party/etc1/LICENSE -sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 src/3rdparty/chromium/third_party/skia/third_party/skcms/LICENSE -sha256 e21477eed484b07902a861a1b18d1e4ecd3e6f22fa81e2410f0770cfb67290e8 src/3rdparty/chromium/third_party/skia/third_party/vulkanmemoryallocator/include/LICENSE.txt -sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/third_party/vulkanmemoryallocator/LICENSE -sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 src/3rdparty/chromium/third_party/skia/third_party/wuffs/LICENSE -sha256 3f6f1b520bc53e878ccbb698ad0bacef3752a5f4e4b50a26552bd70f60b40748 src/3rdparty/chromium/third_party/smhasher/LICENSE -sha256 55172044f7e241207117448a4d9d6ba1d0925c8ad66b5d4c08c70adfa9cc3de6 src/3rdparty/chromium/third_party/snappy/src/COPYING -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/spirv-cross/spirv-cross/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/spirv-headers/LICENSE -sha256 9b243f6f0bf44e295ff411a0f7b7642d1d0dff7cdc42507e9f7206f439e51b5a src/3rdparty/chromium/third_party/spirv-headers/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/SPIRV-Tools/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/SPIRV-Tools/src/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/SPIRV-Tools/src/utils/vscode/src/lsp/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/sqlite4java/LICENSE -sha256 06545a6ec25fbbff6c62f205f94a35be49e38f33bea827a8cfb07d7b82e4b083 src/3rdparty/chromium/third_party/sqlite/LICENSE -sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 src/3rdparty/chromium/third_party/sqlite/src/autoconf/tea/license.terms -sha256 9c6479123f32a1ed50d9a0af203dfe8972e65035b0cdeef436b5f8d0924517fe src/3rdparty/chromium/third_party/sqlite/src/LICENSE.md -sha256 033d0150b3bd78b36894c88fcc68da0c3f2e661d3b3485e8cc9a61b2c2bf7895 src/3rdparty/chromium/third_party/subresource-filter-ruleset/LICENSE -sha256 28113a6e9e2fd7584187c738a7c5484452a1c383307a1741bec50a73262fac08 src/3rdparty/chromium/third_party/sudden_motion_sensor/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/swiftshader/LICENSE.txt -sha256 ad4672b403488876635d2b455918f74b829d478da868ffc0c621a00fc99195f5 src/3rdparty/chromium/third_party/tcmalloc/LICENSE -sha256 81ebf38708899097aacaac9723679b3ffa17640c14cd3193c46b75197de18b2c src/3rdparty/chromium/third_party/tcmalloc/vendor/COPYING -sha256 d600ff20c150a675461dde76752e35f4cc3be6e7d8e70b8da3e775ea7e5ec4aa src/3rdparty/chromium/third_party/test_fonts/LICENSE -sha256 bb04dd22ee55fe3c24ee2a3c82bd1efdebbd965f7c178224a2977edc2457bb2f src/3rdparty/chromium/third_party/tlslite/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/turbine/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/ub-uiautomator/LICENSE -sha256 0a90947436dc17f047f8c95b64593e2cc9a2b6d4ff6618f2f0beba5a9b568c14 src/3rdparty/chromium/third_party/unrar/LICENSE -sha256 6ecc1687808b7d66b24f874755abfed7464d9751ed0001cd4e8e5d9bf397ff8a src/3rdparty/chromium/third_party/unrar/src/license.txt -sha256 6629d6edceffa9c68f4245b817137d2265fdab1e98068893420edb6689ccce9e src/3rdparty/chromium/third_party/usb_ids/LICENSE -sha256 7a4a31e05391919c05a996f09fc20ffc80c69af72cb3e69ac71b70c825fbdd1d src/3rdparty/chromium/third_party/usrsctp/LICENSE -sha256 fa53711b25af4b9a9b8dadfea3cb38166ec4b96760c8d62b284055554537d9ef src/3rdparty/chromium/third_party/usrsctp/usrsctplib/LICENSE.md -sha256 5a7f623a50e384aaf6d2ced068339ddf93d0a50d3a0ecbe86f125b07804ecc78 src/3rdparty/chromium/third_party/v4l-utils/COPYING.libv4l -sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 src/3rdparty/chromium/third_party/wds/LICENSE -sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 src/3rdparty/chromium/third_party/wds/src/COPYING -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/web-animations-js/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/web-animations-js/sources/COPYING -sha256 d51b39e7ed0391e75e0add75d1a162fdf4a0d6b49fba7635ed0ac4e16f324773 src/3rdparty/chromium/third_party/webdriver/COPYING -sha256 6d83e980b9b843cf6fe24cb94714d00f9b0cf69cb00d0e3b0bed018d49d6f24f src/3rdparty/chromium/third_party/webdriver/LICENSE -sha256 fec8eb2896784d7b9ef5bcb1c64b97156455a3c88df4fdd36538fb55c0decac4 src/3rdparty/chromium/third_party/webgpu-cts/src/LICENSE.txt -sha256 e30fbe869f1fa489901bb08888a919c5d50ddb5be6d16b9e4a2cb226263dd7db src/3rdparty/chromium/third_party/webgpu-cts/src/third_party/jquery/LICENSE.txt -sha256 25b7731b70c77ecd5f3bb19303fbaa99be18860f81d44f71da670fdcd04829db src/3rdparty/chromium/third_party/webrtc/common_audio/third_party/fft4g/LICENSE -sha256 41d791701e3e1c1073470403de7e342442d1e6a2af72681023b13a2f45f2125c src/3rdparty/chromium/third_party/webrtc/common_audio/third_party/spl_sqrt_floor/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE -sha256 26d2d16d48825edf1194cb3907c5c0b7d01f9c5527eb0fefb949c51f304635e9 src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md -sha256 21a742dd8cceebb1d5df7c6f945c75ccf1ad4f0d4c17e404517500c1a7de86a4 src/3rdparty/chromium/third_party/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE -sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 src/3rdparty/chromium/third_party/webrtc/LICENSE -sha256 1f7a086c17fa2bdbe27d3eb6424a64b9bea9d7db89a4e220fef52ca24addb9e9 src/3rdparty/chromium/third_party/webrtc/license_template.txt -sha256 6fdbabd2c95c5efc6f1e46175278239afb9343120a3022ed0e0cb04267a6aeb3 src/3rdparty/chromium/third_party/webrtc/modules/third_party/fft/LICENSE -sha256 b29c8f13f91feb2dab7d6655444369fa9f29c0d7121a52dab90ff97e40343a85 src/3rdparty/chromium/third_party/webrtc/modules/third_party/g711/LICENSE -sha256 61862327fd00d6a4deb2c1276577782c2500f4fe103e072018fc369d8e37e876 src/3rdparty/chromium/third_party/webrtc/modules/third_party/g722/LICENSE -sha256 641007ea2810c4cfc10a5d1a44db33983ec1409305e953c7119cc2457ec5c536 src/3rdparty/chromium/third_party/webrtc/modules/third_party/portaudio/LICENSE -sha256 a508773ebf00f8c777a910e941e5fd0072195843e1b72a90eb8787d26d4ab1d7 src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/LICENSE -sha256 905bc5ab1c66eea2669aee6cb5185488508264df6492f71ae1a6595180ff8c2b src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/sigslot/LICENSE -sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 src/3rdparty/chromium/third_party/webxr_test_pages/LICENSE -sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/cottontail/LICENSE.md -sha256 47754d3064047c300714af25258efa782e144fdf1e835bfd1edbeb7f8f4ef9e4 src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/dat.gui/LICENSE -sha256 71819b5a0a080b6a3d35b3579817c2c558abcf3c92bb5abc052145a7c106573e src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/js/third-party/gl-matrix/LICENSE -sha256 eb077b108bac4c81abe7410274af0930456790add09a6fe5316910e2b936c0f9 src/3rdparty/chromium/third_party/webxr_test_pages/webxr-samples/LICENSE.md -sha256 88d855a8e07a39df758fe9964f5d04d5c2fab39416e566e9d91588e254ca27dc src/3rdparty/chromium/third_party/weston/LICENSE -sha256 fdb65868f65d0fbdb05c2d3b779e10ce9969fa0c4b9262ba4f260e87086ab860 src/3rdparty/chromium/third_party/weston/src/COPYING -sha256 a34730970264d619f352598bf30295ad505a60fc3a493add8aa851645ce3ea47 src/3rdparty/chromium/third_party/weston/src/data/COPYING -sha256 20de375707692099b3132084695377ce5fec0aec05813dedcce094b8eda44386 src/3rdparty/chromium/third_party/widevine/LICENSE -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/woff2/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/wuffs/LICENSE -sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/wuffs/src/LICENSE -sha256 b244f73c3d21edaf44ec253b9a7c389ec43313c417f52f8b71914b0c40d87325 src/3rdparty/chromium/third_party/xdg-utils/LICENSE -sha256 1cf71700f3403ca26f002e2dc1d1861dcb3d2af9bb9d98d529a903be9d7f06fc src/3rdparty/chromium/third_party/xstream/LICENSE -sha256 795f8d76eade6130129b680ac72ea81cb3e143467a65ea1f5f64946151d7fa20 src/3rdparty/chromium/third_party/yasm/source/patched-yasm/COPYING -sha256 942755efa272dbfbcd7afea7a38556801e36c16dcad002d572378367094a2593 src/3rdparty/chromium/third_party/zlib/LICENSE -sha256 a4c8c5abf82b36c22f8c9f8bd6229584f32eb9f7a2429dd9664dda43e63e9fda src/3rdparty/chromium/tools/grit/third_party/six/LICENSE -sha256 63f0c0039b477857e54708d9501ed91b7a46e828ac3c623bedbc318129ceb174 src/3rdparty/chromium/tools/origin_trials/third_party/ed25519/LICENSE -sha256 f5b244982699ca9fe5cc8fa8a7c08cf5dee5d3a0c8896892899e5df13316e1b7 src/3rdparty/chromium/tools/page_cycler/acid3/LICENSE -sha256 7389900fb68d920c6cb21b70702a2bc240523472a3fd091023d6135cf01d1c5c src/3rdparty/chromium/tools/win/ChromeDebug/ChromeDebug/LICENSE -sha256 284545e873c704952e5b1b39d457dd83a3b115a51d9f1eb5175137bd69b8fa1b src/3rdparty/chromium/url/third_party/mozilla/LICENSE.txt -sha256 f10a1808e442ae7dbfecf6b54ae4de84193a768770e189a67d5f397730acdbc9 src/3rdparty/chromium/v8/LICENSE -sha256 e7115e18444dae09d17f361ddc365fb1d342640fe500796209c63f7c80dfae10 src/3rdparty/chromium/v8/LICENSE.fdlibm -sha256 6a585a9f466654abc8fc0829d56b1bc987e3a073d31faa03bba37d33640a23cd src/3rdparty/chromium/v8/LICENSE.strongtalk -sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca src/3rdparty/chromium/v8/LICENSE.v8 -sha256 cae8c00ca6e90a682c321ec11e7a5a345d0d317aa0b8f038e03ef03a18095b2f src/3rdparty/chromium/v8/LICENSE.valgrind -sha256 36ffd9dc085d529a7e60e1276d73ae5a030b020313e6c5408593a6ae2af39673 src/3rdparty/chromium/v8/src/third_party/siphash/LICENSE -sha256 3f712e5fbdfdbd5ee7d9b8c8152580220df55de47f4eba2f26c95c4de19ad096 src/3rdparty/chromium/v8/src/third_party/utf8-decoder/LICENSE -sha256 ebf25b8ce59c9e8883acd1ca75b6fc121937ca034f666c4077d2be739d2e1622 src/3rdparty/chromium/v8/src/third_party/valgrind/LICENSE -sha256 cfe7599e45f340a35b4635090382897ca1526bc49b5e1889047f0168d131c415 src/3rdparty/chromium/v8/src/third_party/vtune/LICENSE -sha256 15137d6c822e3ab097093a33c3a39a9df699f373f6438867ad534ff60762a947 src/3rdparty/chromium/v8/third_party/colorama/LICENSE -sha256 b9be92f13356083392d97da13cab8ae543c7911f44eff5289b693da8b17b9e08 src/3rdparty/chromium/v8/third_party/inspector_protocol/LICENSE -sha256 b9a6d9320b8f2693e8d41e496ce56caadacaddcca9be2a64a61749278f425cf2 src/3rdparty/chromium/v8/third_party/v8/builtins/LICENSE -sha256 c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08 src/3rdparty/chromium/v8/third_party/wasm-api/LICENSE -sha256 5d85142a5609ad177a2d7a2e7cae060b886b8b42f25c5b9803cf0cb5ee04ad2f src/3rdparty/gn/base/third_party/icu/LICENSE -sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/gn/LICENSE -sha256 eb7e9ab9690124c5c9f42bdc81383d886a3dede26345b6ed15bbad7caf81f7ea src/3rdparty/ninja/COPYING diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk index cebd6d0fe23..836ba621899 100644 --- a/package/qt5/qt5webengine/qt5webengine.mk +++ b/package/qt5/qt5webengine/qt5webengine.mk @@ -4,64 +4,176 @@ # ################################################################################ -QT5WEBENGINE_VERSION_MAJOR = 5.15 -QT5WEBENGINE_VERSION = $(QT5WEBENGINE_VERSION_MAJOR).2 -QT5WEBENGINE_SITE = https://download.qt.io/archive/qt/$(QT5WEBENGINE_VERSION_MAJOR)/$(QT5WEBENGINE_VERSION)/submodules -QT5WEBENGINE_SOURCE = qtwebengine-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBENGINE_VERSION).tar.xz -QT5WEBENGINE_DEPENDENCIES = ffmpeg libglib2 libvpx libxkbcommon opus webp \ - qt5declarative qt5webchannel host-bison host-flex host-gperf \ - host-pkgconf host-python +QT5WEBENGINE_VERSION = $(QT5_VERSION) +QT5WEBENGINE_SITE = $(QT5_SITE)/qtwebengine/-/archive/v$(QT5WEBENGINE_VERSION)-lts +QT5WEBENGINE_SOURCE = qtwebengine-v$(QT5WEBENGINE_VERSION)-lts.tar.bz2 +QT5WEBENGINE_DEPENDENCIES = qt5declarative qt5webchannel +QT5WEBENGINE_PATCH_DEPENDENCIES = qt5webengine-chromium QT5WEBENGINE_INSTALL_STAGING = YES - -include package/qt5/qt5webengine/chromium-latest.inc +QT5WEBENGINE_SYNC_QT_HEADERS = YES QT5WEBENGINE_LICENSE = GPL-2.0 or LGPL-3.0 or GPL-3.0 or GPL-3.0 with exception QT5WEBENGINE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT \ - LICENSE.GPLv3 LICENSE.LGPL3 $(QT5WEBENGINE_CHROMIUM_LICENSE_FILES) + LICENSE.GPLv3 LICENSE.LGPL3 + +# command line argument separator +QT5WEBENGINE_CONF_OPTS = -- ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5WEBENGINE_DEPENDENCIES += qt5svg endif ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) -QT5WEBENGINE_DEPENDENCIES += xlib_libXScrnSaver xlib_libXcomposite \ - xlib_libXcursor xlib_libXi xlib_libXrandr xlib_libXtst +QT5WEBENGINE_DEPENDENCIES += \ + xlib_libXcomposite \ + xlib_libXcursor \ + xlib_libXi \ + xlib_libxkbfile \ + xlib_libXrandr \ + xlib_libXScrnSaver \ + xlib_libXtst +QT5WEBENGINE_CONF_OPTS += \ + -feature-webengine-ozone \ + -feature-webengine-system-libdrm \ + -feature-webengine-system-x11 \ + -feature-webengine-system-xkbfile \ + -feature-webengine-system-xcomposite \ + -feature-webengine-system-xcursor \ + -feature-webengine-system-xi \ + -feature-webengine-system-xproto-gl \ + -feature-webengine-system-xtst +else +QT5WEBENGINE_CONF_OPTS += \ + -no-feature-webengine-ozone \ + -no-feature-webengine-system-libdrm \ + -no-feature-webengine-system-x11 \ + -no-feature-webengine-system-xkbfile \ + -no-feature-webengine-system-xcomposite \ + -no-feature-webengine-system-xcursor \ + -no-feature-webengine-system-xi \ + -no-feature-webengine-system-xproto-gl \ + -no-feature-webengine-system-xtst endif -QT5WEBENGINE_DEPENDENCIES += host-libpng host-libnss libnss +QT5WEBENGINE_DEPENDENCIES += \ + host-bison \ + host-flex \ + host-freetype \ + host-gperf \ + host-harfbuzz \ + host-icu \ + host-ninja \ + host-nodejs \ + host-pkgconf \ + host-libjpeg \ + host-libnss \ + host-libpng \ + host-python3 \ + host-webp \ + host-zlib \ + ffmpeg \ + freetype \ + jpeg \ + lcms2 \ + libevent \ + libnss \ + libvpx \ + libxml2 \ + libxslt \ + re2 \ + snappy \ + webp -QT5WEBENGINE_CONF_OPTS += WEBENGINE_CONFIG+=use_system_ffmpeg +QT5WEBENGINE_CONF_OPTS += \ + -webengine-embedded-build \ + -webengine-ffmpeg \ + -webengine-icu \ + -webengine-opus \ + -webengine-webchannel \ + -webengine-webp \ + -feature-build-qtwebengine-core \ + -feature-webengine-core-support \ + -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 \ + -feature-webengine-system-libvpx \ + -feature-webengine-system-libxml2 \ + -feature-webengine-system-ninja \ + -feature-webengine-system-nss \ + -feature-webengine-system-png \ + -feature-webengine-system-re2 \ + -feature-webengine-system-snappy \ + -feature-webengine-system-zlib + +QT5WEBENGINE_CONF_OPTS += \ + -no-webengine-geolocation \ + -no-webengine-kerberos \ + -no-webengine-pepper-plugins \ + -no-webengine-printing-and-pdf \ + -no-webengine-spellchecker \ + -no-webengine-webrtc \ + -no-webengine-webrtc-pipewire \ + -no-feature-webengine-developer-build \ + -no-feature-webengine-full-debug-info \ + -no-feature-webengine-native-spellchecker \ + -no-feature-webengine-noexecstack \ + -no-feature-webengine-system-minizip \ + -no-feature-webengine-system-gn ifeq ($(BR2_PACKAGE_QT5WEBENGINE_PROPRIETARY_CODECS),y) -QT5WEBENGINE_CONF_OPTS += WEBENGINE_CONFIG+=use_proprietary_codecs +QT5WEBENGINE_CONF_OPTS += -webengine-proprietary-codecs +else +QT5WEBENGINE_CONF_OPTS += -no-webengine-proprietary-codecs endif ifeq ($(BR2_PACKAGE_QT5WEBENGINE_ALSA),y) QT5WEBENGINE_DEPENDENCIES += alsa-lib +QT5WEBENGINE_CONF_OPTS += -webengine-alsa else -QT5WEBENGINE_CONF_OPTS += QT_CONFIG-=alsa +QT5WEBENGINE_CONF_OPTS += -no-webengine-alsa +endif + +ifeq ($(BR2_PACKAGE_PULSEAUDIO),y) +QT5WEBENGINE_DEPENDENCIES += pulseaudio +QT5WEBENGINE_CONF_OPTS += -webengine-pulseaudio +else +QT5WEBENGINE_CONF_OPTS += -no-webengine-pulseaudio endif -# QtWebengine's build system uses python, but only supports python2. We work -# around this by forcing python2 early in the PATH, via a python->python2 -# symlink. QT5WEBENGINE_ENV = \ PATH=$(@D)/host-bin:$(BR_PATH) \ - PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig -define QT5WEBENGINE_PYTHON2_SYMLINK + PKG_CONFIG_SYSROOT_DIR="/" +define QT5WEBENGINE_CREATE_HOST_PYTHON_WRAPPER mkdir -p $(@D)/host-bin - ln -sf $(HOST_DIR)/bin/python2 $(@D)/host-bin/python + sed s%@HOST_DIR@%$(HOST_DIR)%g $(QT5WEBENGINE_PKGDIR)/host-python-wrapper.in > $(@D)/host-bin/python + chmod +x $(@D)/host-bin/python endef -QT5WEBENGINE_PRE_CONFIGURE_HOOKS += QT5WEBENGINE_PYTHON2_SYMLINK +QT5WEBENGINE_PRE_CONFIGURE_HOOKS += QT5WEBENGINE_CREATE_HOST_PYTHON_WRAPPER QT5WEBENGINE_ENV += NINJAFLAGS="-j$(PARALLEL_JOBS)" +define QT5WEBENGINE_COPY_CHROMIUM + rm -rf $(@D)/src/3rdparty + cp -a $(QT5WEBENGINE_CHROMIUM_DIR) $(@D)/src/3rdparty +endef +QT5WEBENGINE_POST_PATCH_HOOKS += QT5WEBENGINE_COPY_CHROMIUM + define QT5WEBENGINE_CREATE_HOST_PKG_CONFIG + mkdir -p $(@D)/host-bin sed s%@HOST_DIR@%$(HOST_DIR)%g $(QT5WEBENGINE_PKGDIR)/host-pkg-config.in > $(@D)/host-bin/host-pkg-config chmod +x $(@D)/host-bin/host-pkg-config endef QT5WEBENGINE_PRE_CONFIGURE_HOOKS += QT5WEBENGINE_CREATE_HOST_PKG_CONFIG -QT5WEBENGINE_ENV += GN_PKG_CONFIG_HOST=$(@D)/host-bin/host-pkg-config +QT5WEBENGINE_ENV += \ + GN_PKG_CONFIG_HOST=$(@D)/host-bin/host-pkg-config \ + GN_HOST_TOOLCHAIN_EXTRA_CPPFLAGS="$(HOST_CPPFLAGS)" QT5WEBENGINE_CONF_ENV = $(QT5WEBENGINE_ENV) QT5WEBENGINE_MAKE_ENV = $(QT5WEBENGINE_ENV) diff --git a/package/qt5/qt5webkit/0005-Add-support-for-ARC-processors.patch b/package/qt5/qt5webkit/0005-Add-support-for-ARC-processors.patch new file mode 100644 index 00000000000..92f023eab6a --- /dev/null +++ b/package/qt5/qt5webkit/0005-Add-support-for-ARC-processors.patch @@ -0,0 +1,93 @@ +From 8da574cf8f30f69e47f76705aa2eb07000540aeb Mon Sep 17 00:00:00 2001 +From: Alexey Brodkin +Date: Mon, 21 Feb 2022 18:28:00 +0300 +Subject: [PATCH] Add support for ARC processors + +Signed-off-by: Alexey Brodkin +--- + CMakeLists.txt | 4 +++- + Source/JavaScriptCore/CMakeLists.txt | 3 ++- + Source/WTF/wtf/Platform.h | 8 ++++++++ + Source/WTF/wtf/dtoa/utils.h | 2 +- + Source/cmake/OptionsQt.cmake | 4 ++++ + 5 files changed, 18 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 31a2ea1fd..f0dfbda5b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -57,7 +57,9 @@ if (MSVC_CXX_ARCHITECTURE_ID) + else () + string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} LOWERCASE_CMAKE_SYSTEM_PROCESSOR) + endif () +-if (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") ++if (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^arc") ++ set(WTF_CPU_ARC 1) ++elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") + set(WTF_CPU_ARM 1) + elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64") + set(WTF_CPU_ARM64 1) +diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt +index 937b3ed00..205dde288 100644 +--- a/Source/JavaScriptCore/CMakeLists.txt ++++ b/Source/JavaScriptCore/CMakeLists.txt +@@ -1275,7 +1275,8 @@ if (ENABLE_WEB_REPLAY) + list(APPEND JavaScriptCore_HEADERS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/JSReplayInputs.h) + endif () + +-if (WTF_CPU_ARM) ++if (WTF_CPU_ARC) ++elseif (WTF_CPU_ARM) + elseif (WTF_CPU_ARM64) + elseif (WTF_CPU_ALPHA) + elseif (WTF_CPU_HPPA) +diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h +index 5717f3ea1..b327ed693 100644 +--- a/Source/WTF/wtf/Platform.h ++++ b/Source/WTF/wtf/Platform.h +@@ -349,6 +349,14 @@ + + #endif /* ARM */ + ++/* CPU(ARC) - ARC */ ++#if defined(__arc__) ++#define WTF_CPU_ARC 1 ++#if defined(__BIG_ENDIAN__) ++#define WTF_CPU_BIG_ENDIAN 1 ++#endif ++#endif ++ + #if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(ALPHA) || CPU(HPPA) + #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1 + #endif +diff --git a/Source/WTF/wtf/dtoa/utils.h b/Source/WTF/wtf/dtoa/utils.h +index 889642cee..8f1e9933e 100644 +--- a/Source/WTF/wtf/dtoa/utils.h ++++ b/Source/WTF/wtf/dtoa/utils.h +@@ -49,7 +49,7 @@ + defined(__ARMEL__) || \ + defined(_MIPS_ARCH_MIPS32R2) + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 +-#elif CPU(MIPS) || CPU(MIPS64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA) ++#elif CPU(MIPS) || CPU(MIPS64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA) || CPU(ARC) + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 + #elif defined(_M_IX86) || defined(__i386__) + #if defined(_WIN32) +diff --git a/Source/cmake/OptionsQt.cmake b/Source/cmake/OptionsQt.cmake +index ec6081de0..e1a5efc1e 100644 +--- a/Source/cmake/OptionsQt.cmake ++++ b/Source/cmake/OptionsQt.cmake +@@ -365,6 +365,10 @@ if (MINGW AND CMAKE_SIZEOF_VOID_P EQUAL 8) + WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_JIT PRIVATE OFF) + endif () + ++if (WTF_CPU_ARC) ++ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_JIT PRIVATE OFF) ++endif () ++ + WEBKIT_OPTION_CONFLICT(USE_GSTREAMER USE_QT_MULTIMEDIA) + WEBKIT_OPTION_CONFLICT(USE_GSTREAMER USE_MEDIA_FOUNDATION) + WEBKIT_OPTION_CONFLICT(USE_QT_MULTIMEDIA USE_MEDIA_FOUNDATION) +-- +2.25.1 + diff --git a/package/qt5/qt5webkit/0006-Warnings-due-to-AppSinkCallbacks-struct-growth-https.patch b/package/qt5/qt5webkit/0006-Warnings-due-to-AppSinkCallbacks-struct-growth-https.patch new file mode 100644 index 00000000000..610d99e35d7 --- /dev/null +++ b/package/qt5/qt5webkit/0006-Warnings-due-to-AppSinkCallbacks-struct-growth-https.patch @@ -0,0 +1,39 @@ +From 53d5bbf4d597a2fcb26149fab3185a3db09529af Mon Sep 17 00:00:00 2001 +From: Philippe Normand +Date: Fri, 23 Jul 2021 15:38:29 +0000 +Subject: [PATCH] Warnings due to AppSinkCallbacks struct growth + https://bugs.webkit.org/show_bug.cgi?id=228229 + +Patch by Philippe Normand on 2021-07-23 +Reviewed by Xabier Rodriguez-Calvar. + +A new callback was added, for event notifications. + +Canonical link: https://commits.webkit.org/239911@main +git-svn-id: https://svn.webkit.org/repository/webkit/trunk@280243268f45cc-cd09-0410-ab3c-d52691b4dbfc +[Thomas: backported from upstream, only the part touching +Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp +as other parts are not relevant] +Signed-off-by: Thomas Petazzoni +--- + .../platform/audio/gstreamer/AudioFileReaderGStreamer.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp b/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp +index 2f24c0cf5..dd9d91cf3 100644 +--- a/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp ++++ b/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp +@@ -230,6 +230,10 @@ void AudioFileReader::handleNewDeinterleavePad(GstPad* pad) + [](GstAppSink* sink, gpointer userData) -> GstFlowReturn { + return static_cast(userData)->handleSample(sink); + }, ++#if GST_CHECK_VERSION(1, 19, 1) ++ // new_event ++ nullptr, ++#endif + { nullptr } + }; + gst_app_sink_set_callbacks(GST_APP_SINK(sink), &callbacks, this, 0); +-- +2.37.1 + diff --git a/package/qt5/qt5webkit/Config.in b/package/qt5/qt5webkit/Config.in index 26c3897d1d3..9b84ac5f96a 100644 --- a/package/qt5/qt5webkit/Config.in +++ b/package/qt5/qt5webkit/Config.in @@ -16,6 +16,8 @@ config BR2_PACKAGE_QT5WEBKIT select BR2_PACKAGE_LEVELDB select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_OPENSSL + # Only openssl is supported by qt5 + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL select BR2_PACKAGE_QT5BASE_ICU select BR2_PACKAGE_QT5BASE_GUI select BR2_PACKAGE_QT5BASE_WIDGETS diff --git a/package/qt5/qt5websockets/qt5websockets.hash b/package/qt5/qt5websockets/qt5websockets.hash index 3cc87865dc2..72fbb4a5990 100644 --- a/package/qt5/qt5websockets/qt5websockets.hash +++ b/package/qt5/qt5websockets/qt5websockets.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 0f59abfa0172e1d4f7cddc3ed457b71faa3bba1cc25b02a06aa79b5ba0c68653 qtwebsockets-b13b56904b76e96ea52d0efe56395acc94b17d96.tar.bz2 +sha256 00a6d312f2e0ec8c64c12f6a178681d5936ec65bc7f1b85948b58cdb5021a8b6 qtwebsockets-6a4991250793cd38efa5e8db858cd49c82439130.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5websockets/qt5websockets.mk b/package/qt5/qt5websockets/qt5websockets.mk index d222f025ee3..4eafb0b2124 100644 --- a/package/qt5/qt5websockets/qt5websockets.mk +++ b/package/qt5/qt5websockets/qt5websockets.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5WEBSOCKETS_VERSION = b13b56904b76e96ea52d0efe56395acc94b17d96 +QT5WEBSOCKETS_VERSION = 6a4991250793cd38efa5e8db858cd49c82439130 QT5WEBSOCKETS_SITE = $(QT5_SITE)/qtwebsockets/-/archive/$(QT5WEBSOCKETS_VERSION) QT5WEBSOCKETS_SOURCE = qtwebsockets-$(QT5WEBSOCKETS_VERSION).tar.bz2 QT5WEBSOCKETS_INSTALL_STAGING = YES diff --git a/package/qt5/qt5webview/qt5webview.hash b/package/qt5/qt5webview/qt5webview.hash index 51d0fb0d7a8..fe129509293 100644 --- a/package/qt5/qt5webview/qt5webview.hash +++ b/package/qt5/qt5webview/qt5webview.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 0fd949c35355bbde613c9daa61e32a3d8ed4a7b3e9fc0e3acf92981cc8bf16c3 qtwebview-920de5f1cd9f9001cfef1bfd2c19e6720793362f.tar.bz2 +sha256 6b84aab9bc8292f299b249840218e9e69a1dbbff42e08c5da7cb659cff8bc37d qtwebview-826d2a33929c69807917536d48b7861e7682001e.tar.bz2 # Hashes for license files: sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL diff --git a/package/qt5/qt5webview/qt5webview.mk b/package/qt5/qt5webview/qt5webview.mk index ed1cfe50656..54da733e7b7 100644 --- a/package/qt5/qt5webview/qt5webview.mk +++ b/package/qt5/qt5webview/qt5webview.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5WEBVIEW_VERSION = 920de5f1cd9f9001cfef1bfd2c19e6720793362f +QT5WEBVIEW_VERSION = 826d2a33929c69807917536d48b7861e7682001e QT5WEBVIEW_SITE = $(QT5_SITE)/qtwebview/-/archive/$(QT5WEBVIEW_VERSION) QT5WEBVIEW_SOURCE = qtwebview-$(QT5WEBVIEW_VERSION).tar.bz2 QT5WEBVIEW_DEPENDENCIES = qt5webengine diff --git a/package/qt5/qt5x11extras/qt5x11extras.hash b/package/qt5/qt5x11extras/qt5x11extras.hash index b854cedcb65..7b369b0a02f 100644 --- a/package/qt5/qt5x11extras/qt5x11extras.hash +++ b/package/qt5/qt5x11extras/qt5x11extras.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 b562bc8b81e35d71df5530be07522b50065f177fb744782e4fc7536970c5d9da qtx11extras-3898f5484fd4864b047729bfeda9a1222f32364f.tar.bz2 +sha256 fde322c017bee349d56f73f402ca67ad986e0c43a592e3ee032313aa194406da qtx11extras-51b0a5a2e3e35f4cb17da1e7cb4babef6294bfb4.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5x11extras/qt5x11extras.mk b/package/qt5/qt5x11extras/qt5x11extras.mk index 7b1e32df17f..fb6650e84a1 100644 --- a/package/qt5/qt5x11extras/qt5x11extras.mk +++ b/package/qt5/qt5x11extras/qt5x11extras.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5X11EXTRAS_VERSION = 3898f5484fd4864b047729bfeda9a1222f32364f +QT5X11EXTRAS_VERSION = 51b0a5a2e3e35f4cb17da1e7cb4babef6294bfb4 QT5X11EXTRAS_SITE = $(QT5_SITE)/qtx11extras/-/archive/$(QT5X11EXTRAS_VERSION) QT5X11EXTRAS_SOURCE = qtx11extras-$(QT5X11EXTRAS_VERSION).tar.bz2 QT5X11EXTRAS_INSTALL_STAGING = YES diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash index c0e3caa407f..a1dbb401546 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 20363267cd8dc93622a0f444708eb83f0ed6d9d9bceaf13c5db806d96b00cf09 qtxmlpatterns-189e28d0aff1f3d7960228ba318b83e3cadac98c.tar.bz2 +sha256 6243e6334c0d1467e3e5bdecd981d7e673f4cc99cf2cee3b99597be4218a4bd2 qtxmlpatterns-dfcae10dec8c1c2c544ad0cd303cea113b0af51d.tar.bz2 # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk index 27818ecb78a..6711e9bf70a 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk @@ -4,7 +4,7 @@ # ################################################################################ -QT5XMLPATTERNS_VERSION = 189e28d0aff1f3d7960228ba318b83e3cadac98c +QT5XMLPATTERNS_VERSION = dfcae10dec8c1c2c544ad0cd303cea113b0af51d QT5XMLPATTERNS_SITE = $(QT5_SITE)/qtxmlpatterns/-/archive/$(QT5XMLPATTERNS_VERSION) QT5XMLPATTERNS_SOURCE = qtxmlpatterns-$(QT5XMLPATTERNS_VERSION).tar.bz2 QT5XMLPATTERNS_INSTALL_STAGING = YES @@ -20,4 +20,8 @@ ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) QT5XMLPATTERNS_LICENSE += , BSD-3-Clause (examples) endif +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_90620),y) +QT5XMLPATTERNS_CONF_OPTS += "QMAKE_CXXFLAGS+=-O0" +endif + $(eval $(qmake-package)) diff --git a/package/qt6/Config.in b/package/qt6/Config.in new file mode 100644 index 00000000000..655fa8392a3 --- /dev/null +++ b/package/qt6/Config.in @@ -0,0 +1,50 @@ +# based on src/corelib/global/qprocessordetection.h +config BR2_PACKAGE_QT6_ARCH_SUPPORTS + bool + # no support for ARMv4 + default y if BR2_ARM_CPU_ARMV5 || BR2_ARM_CPU_ARMV6 || BR2_ARM_CPU_ARMV7A || BR2_ARM_CPU_ARMV8A + default y if BR2_i386 + default y if BR2_x86_64 + default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el + default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le + # sparc 32-bit is supposedly supported, but has issues due to + # the need of libatomic + default y if BR2_sparc64 + depends on BR2_USE_MMU + +config BR2_PACKAGE_QT6_GL_SUPPORTS + bool + default y + depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES + +comment "qt6 needs a toolchain w/ C++, threads, wchar, dynamic library, gcc >= 8, host gcc >= 8" + depends on !BR2_PACKAGE_QT5 + depends on BR2_PACKAGE_QT6_ARCH_SUPPORTS + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_8 || \ + !BR2_HOST_GCC_AT_LEAST_8 || !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_STATIC_LIBS || !BR2_USE_WCHAR + +menuconfig BR2_PACKAGE_QT6 + bool "Qt6" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 + depends on BR2_HOST_GCC_AT_LEAST_8 + depends on BR2_PACKAGE_QT6_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_STATIC_LIBS + depends on BR2_USE_WCHAR + depends on !BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT6BASE + help + This option enables the Qt6 framework. Sub-options allow to + select which modules should be built. + + http://qt.io + +if BR2_PACKAGE_QT6 + +source "package/qt6/qt6base/Config.in" +source "package/qt6/qt6serialbus/Config.in" +source "package/qt6/qt6serialport/Config.in" + +endif diff --git a/package/qt6/qt6.mk b/package/qt6/qt6.mk new file mode 100644 index 00000000000..1edb252c967 --- /dev/null +++ b/package/qt6/qt6.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# qt6 +# +################################################################################ + +QT6_VERSION_MAJOR = 6.4 +QT6_VERSION = $(QT6_VERSION_MAJOR).3 +QT6_SOURCE_TARBALL_PREFIX = everywhere-src +QT6_SITE = https://download.qt.io/archive/qt/$(QT6_VERSION_MAJOR)/$(QT6_VERSION)/submodules + +include $(sort $(wildcard package/qt6/*/*.mk)) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in new file mode 100644 index 00000000000..f9fb2a2ad05 --- /dev/null +++ b/package/qt6/qt6base/Config.in @@ -0,0 +1,239 @@ +config BR2_PACKAGE_QT6BASE + bool "qt6base" + select BR2_PACKAGE_DOUBLE_CONVERSION + select BR2_PACKAGE_LIBB2 + select BR2_PACKAGE_PCRE2 + select BR2_PACKAGE_PCRE2_16 + select BR2_PACKAGE_ZLIB + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package corresponds to the qt6base module, which + contains the base Qt libraries: QtCore, QtNetwork, QtGui, + QtWidgets, etc. + + http://qt.io + +if BR2_PACKAGE_QT6BASE + +config BR2_PACKAGE_QT6BASE_CONCURRENT + bool "concurrent module" + help + This options enables the Qt6Concurrent library. + +config BR2_PACKAGE_QT6BASE_DBUS + bool "DBus module" + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_MMU + select BR2_PACKAGE_DBUS + help + This option enables the D-Bus module. + +config BR2_PACKAGE_QT6BASE_GUI + bool "gui module" + select BR2_PACKAGE_FREETYPE + # At least one graphic backend must be enabled, so enable + # linuxfb if nothing is enabled. + select BR2_PACKAGE_QT6BASE_LINUXFB if \ + !BR2_PACKAGE_QT6BASE_XCB && \ + !BR2_PACKAGE_QT6BASE_EGLFS + help + This option enables the Qt6Gui library. + +if BR2_PACKAGE_QT6BASE_GUI + +config BR2_PACKAGE_QT6BASE_LINUXFB + bool "linuxfb support" + +config BR2_PACKAGE_QT6BASE_XCB + bool "X.org XCB support" + depends on BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBX11 + select BR2_PACKAGE_LIBXCB + select BR2_PACKAGE_XCB_UTIL_IMAGE + select BR2_PACKAGE_XCB_UTIL_KEYSYMS + select BR2_PACKAGE_XCB_UTIL_RENDERUTIL + select BR2_PACKAGE_XCB_UTIL_WM + select BR2_PACKAGE_LIBXKBCOMMON + +comment "X.org XCB backend available if X.org is enabled" + depends on !BR2_PACKAGE_XORG7 + +config BR2_PACKAGE_QT6BASE_EGLFS + bool "eglfs support" + depends on BR2_PACKAGE_HAS_LIBEGL + depends on BR2_PACKAGE_HAS_LIBGBM + depends on BR2_PACKAGE_QT6_GL_SUPPORTS + select BR2_PACKAGE_QT6BASE_OPENGL + +config BR2_PACKAGE_QT6BASE_DEFAULT_QPA + string "Default graphical platform" + help + Choose the default platform abstraction to use for graphical + applications (e.g xcb, linuxfb, eglfs, ...). If this is + empty, the default for your architecture will be used + (usually this is eglfs). + + You can get a list of supported platforms by running a Qt + application with the option "-platform help" on your + target. You can choose a different platform at runtime with + the -platform option. + +config BR2_PACKAGE_QT6BASE_OPENGL + bool "OpenGL support" + depends on BR2_PACKAGE_QT6_GL_SUPPORTS + help + This option enables OpenGL support. + +comment "OpenGL support needs an OpenGL-capable backend" + depends on !BR2_PACKAGE_QT6_GL_SUPPORTS + +if BR2_PACKAGE_QT6BASE_OPENGL + +choice + prompt "OpenGL API" + help + Select OpenGL API. + +config BR2_PACKAGE_QT6BASE_OPENGL_DESKTOP + bool "Desktop OpenGL" + depends on BR2_PACKAGE_HAS_LIBGL + help + Use desktop OpenGL. + +config BR2_PACKAGE_QT6BASE_OPENGL_ES2 + bool "OpenGL ES 2.0+" + depends on BR2_PACKAGE_HAS_LIBGLES + help + Use OpenGL ES 2.0 and later versions. + +endchoice + +endif + +config BR2_PACKAGE_QT6BASE_FONTCONFIG + bool "fontconfig support" + select BR2_PACKAGE_FONTCONFIG + help + This option enables Fontconfig support using the system + fontconfig library. + +config BR2_PACKAGE_QT6BASE_HARFBUZZ + bool "harfbuzz support" + select BR2_PACKAGE_HARFBUZZ if \ + BR2_TOOLCHAIN_HAS_SYNC_4 && \ + BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + help + This option enables HarfBuzz support (either system harfbuzz + if the toolchain supports __sync for 4 bytes, or the qt + provided one which avoids this dependency by using QAtomic). + +config BR2_PACKAGE_QT6BASE_GIF + bool "GIF support" + help + This compiles and installs the plugin for GIF reading support. + +config BR2_PACKAGE_QT6BASE_JPEG + bool "JPEG support" + select BR2_PACKAGE_JPEG + help + This option enables JPEG support using the system libjpeg + library. + +config BR2_PACKAGE_QT6BASE_PNG + bool "PNG support" + select BR2_PACKAGE_LIBPNG + help + This option enables PNG support using the system libpng + library. + +config BR2_PACKAGE_QT6BASE_WIDGETS + bool "widgets module" + help + This option enables the Qt6Widgets library. + +config BR2_PACKAGE_QT6BASE_PRINTSUPPORT + bool "printing support" + # yes, print support needs widgets + depends on BR2_PACKAGE_QT6BASE_WIDGETS + help + This option enables printing support, optionally using CUPS + if available. + +endif + +config BR2_PACKAGE_QT6BASE_NETWORK + bool "network module" + select BR2_PACKAGE_LIBOPENSSL_ENABLE_PSK if BR2_PACKAGE_LIBOPENSSL + help + This options enables the Qt6Network library. + +config BR2_PACKAGE_QT6BASE_SQL + bool "sql module" + help + This options enables the Qt6Sql library. + +if BR2_PACKAGE_QT6BASE_SQL +config BR2_PACKAGE_QT6BASE_MYSQL + bool "MySQL Plugin" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_MYSQL + help + Build MySQL plugin + +comment "MySQL plugin needs a toolchain w/ C++, threads" + depends on BR2_USE_MMU + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_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 + select BR2_PACKAGE_POSTGRESQL + help + Build PostgreSQL plugin + +comment "PostgreSQL plugin needs a toolchain w/ wchar, dynamic library" + depends on BR2_USE_MMU + depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR + +comment "PostgreSQL plugin can't be built with optimize for fast" + depends on BR2_USE_MMU + depends on BR2_OPTIMIZE_FAST + +config BR2_PACKAGE_QT6BASE_SQLITE + bool "SQLite plugin" + select BR2_PACKAGE_SQLITE + select BR2_PACKAGE_SQLITE_ENABLE_COLUMN_METADATA + help + Build SQLite plugin + +endif + +config BR2_PACKAGE_QT6BASE_SYSLOG + bool "syslog support" + help + Logs to the standard UNIX logging mechanism. + +config BR2_PACKAGE_QT6BASE_TEST + bool "test module" + help + This options enables the Qt6Test library. + +config BR2_PACKAGE_QT6BASE_TSLIB + bool "Enable Tslib support" + select BR2_PACKAGE_TSLIB + help + This options enables the Tslib plugin + +config BR2_PACKAGE_QT6BASE_XML + bool "XML module" + help + This options enables the Qt6Xml library. + +endif diff --git a/package/qt6/qt6base/qt6base.hash b/package/qt6/qt6base/qt6base.hash new file mode 100644 index 00000000000..cb111bd405f --- /dev/null +++ b/package/qt6/qt6base/qt6base.hash @@ -0,0 +1,14 @@ +# Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.3/submodules/qtbase-everywhere-src-6.4.3.tar.xz.sha256 +sha256 5087c9e5b0165e7bc3c1a4ab176b35d0cd8f52636aea903fa377bdba00891a60 qtbase-everywhere-src-6.4.3.tar.xz + +# Hashes for license files +sha256 e3ba223bb1423f0aad8c3dfce0fe3148db48926d41e6fbc3afbbf5ff9e1c89cb LICENSES/Apache-2.0.txt +sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt +sha256 3abd6471b9a9a08d65ce771143f8e278bb4c1aeb10c1c2d476935a6b049653f5 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 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 diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk new file mode 100644 index 00000000000..e6cf4f14bbb --- /dev/null +++ b/package/qt6/qt6base/qt6base.mk @@ -0,0 +1,385 @@ +################################################################################ +# +# qt6base +# +################################################################################ + +QT6BASE_VERSION = $(QT6_VERSION) +QT6BASE_SITE = $(QT6_SITE) +QT6BASE_SOURCE = qtbase-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6BASE_VERSION).tar.xz + +QT6BASE_LICENSE = \ + GPL-2.0+ or LGPL-3.0, \ + GPL-3.0 with exception (tools), \ + GFDL-1.3 (docs), \ + Apache-2.0, \ + BSD-3-Clause, \ + BSL-1.0, \ + MIT + +QT6BASE_LICENSE_FILES = \ + LICENSES/Apache-2.0.txt \ + LICENSES/BSD-3-Clause.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/LGPL-3.0-only.txt \ + LICENSES/MIT.txt \ + LICENSES/Qt-GPL-exception-1.0.txt + +QT6BASE_DEPENDENCIES = \ + host-ninja \ + host-qt6base \ + double-conversion \ + libb2 \ + pcre2 \ + zlib +QT6BASE_INSTALL_STAGING = YES + +QT6BASE_CONF_OPTS = \ + -GNinja \ + -DQT_HOST_PATH=$(HOST_DIR) \ + -DFEATURE_concurrent=OFF \ + -DFEATURE_xml=OFF \ + -DFEATURE_sql=OFF \ + -DFEATURE_testlib=OFF \ + -DFEATURE_network=OFF \ + -DFEATURE_dbus=OFF \ + -DFEATURE_icu=OFF \ + -DFEATURE_glib=OFF \ + -DFEATURE_system_doubleconversion=ON \ + -DFEATURE_system_pcre2=ON \ + -DFEATURE_system_zlib=ON \ + -DFEATURE_system_libb2=ON + +# x86 optimization options. While we have a BR2_X86_CPU_HAS_AVX512, it +# is not clear yet how it maps to all the avx512* options of Qt, so we +# for now keeps them disabled. +QT6BASE_CONF_OPTS += \ + -DFEATURE_sse2=$(if $(BR2_X86_CPU_HAS_SSE2),ON,OFF) \ + -DFEATURE_sse3=$(if $(BR2_X86_CPU_HAS_SSE3),ON,OFF) \ + -DFEATURE_sse4_1=$(if $(BR2_X86_CPU_HAS_SSE4),ON,OFF) \ + -DFEATURE_sse4_2=$(if $(BR2_X86_CPU_HAS_SSE42),ON,OFF) \ + -DFEATURE_ssse3=$(if $(BR2_X86_CPU_HAS_SSSE3),ON,OFF) \ + -DFEATURE_avx=$(if $(BR2_X86_CPU_HAS_AVX),ON,OFF) \ + -DFEATURE_avx2=$(if $(BR2_X86_CPU_HAS_AVX2),ON,OFF) \ + -DFEATURE_avx512bw=OFF \ + -DFEATURE_avx512cd=OFF \ + -DFEATURE_avx512dq=OFF \ + -DFEATURE_avx512er=OFF \ + -DFEATURE_avx512f=OFF \ + -DFEATURE_avx512ifma=OFF \ + -DFEATURE_avx512pf=OFF \ + -DFEATURE_avx512vbmi=OFF \ + -DFEATURE_avx512vbmi2=OFF \ + -DFEATURE_avx512vl=OFF \ + -DFEATURE_vaes=OFF + +define QT6BASE_BUILD_CMDS + $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(QT6BASE_BUILDDIR) +endef + +define QT6BASE_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(QT6BASE_BUILDDIR) +endef + +define QT6BASE_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(QT6BASE_BUILDDIR) +endef + +HOST_QT6BASE_DEPENDENCIES = \ + host-ninja \ + host-double-conversion \ + host-libb2 \ + host-pcre2 \ + host-zlib +HOST_QT6BASE_CONF_OPTS = \ + -GNinja \ + -DFEATURE_gui=OFF \ + -DFEATURE_concurrent=OFF \ + -DFEATURE_xml=ON \ + -DFEATURE_sql=OFF \ + -DFEATURE_testlib=OFF \ + -DFEATURE_network=OFF \ + -DFEATURE_dbus=OFF \ + -DFEATURE_icu=OFF \ + -DFEATURE_glib=OFF \ + -DFEATURE_system_doubleconversion=ON \ + -DFEATURE_system_libb2=ON \ + -DFEATURE_system_pcre2=ON \ + -DFEATURE_system_zlib=ON + +define HOST_QT6BASE_BUILD_CMDS + $(HOST_MAKE_ENV) $(BR2_CMAKE) --build $(HOST_QT6BASE_BUILDDIR) +endef + +define HOST_QT6BASE_INSTALL_CMDS + $(HOST_MAKE_ENV) $(BR2_CMAKE) --install $(HOST_QT6BASE_BUILDDIR) +endef + +# Conditional blocks below are ordered by alphabetic ordering of the +# BR2_PACKAGE_* option. + +ifeq ($(BR2_PACKAGE_HAS_UDEV),y) +QT6BASE_CONF_OPTS += -DFEATURE_libudev=ON +QT6BASE_DEPENDENCIES += udev +else +QT6BASE_CONF_OPTS += -DFEATURE_libudev=OFF +endif + +ifeq ($(BR2_PACKAGE_ICU),y) +QT6BASE_CONF_OPTS += -DFEATURE_icu=ON +QT6BASE_DEPENDENCIES += icu +else +QT6BASE_CONF_OPTS += -DFEATURE_icu=OFF +endif + +ifeq ($(BR2_PACKAGE_LIBGLIB2),y) +QT6BASE_CONF_OPTS += -DFEATURE_glib=ON +QT6BASE_DEPENDENCIES += libglib2 +else +QT6BASE_CONF_OPTS += -DFEATURE_glib=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_GUI),y) +QT6BASE_CONF_OPTS += \ + -DFEATURE_gui=ON \ + -DFEATURE_freetype=ON \ + -DFEATURE_vulkan=OFF +QT6BASE_DEPENDENCIES += freetype + +ifeq ($(BR2_PACKAGE_QT6BASE_LINUXFB),y) +QT6BASE_CONF_OPTS += -DFEATURE_linuxfb=ON +else +QT6BASE_CONF_OPTS += -DFEATURE_linuxfb=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_XCB),y) +QT6BASE_CONF_OPTS += \ + -DFEATURE_xcb=ON \ + -DFEATURE_xcb_xlib=ON \ + -DFEATURE_xkbcommon=ON \ + -DFEATURE_xkbcommon_x11=ON +QT6BASE_DEPENDENCIES += \ + libxcb \ + libxkbcommon \ + xcb-util-wm \ + xcb-util-image \ + xcb-util-keysyms \ + xcb-util-renderutil \ + xlib_libX11 +else +QT6BASE_CONF_OPTS += -DFEATURE_xcb=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_HARFBUZZ),y) +QT6BASE_CONF_OPTS += -DFEATURE_harfbuzz=ON +ifeq ($(BR2_TOOLCHAIN_HAS_SYNC_4),y) +# system harfbuzz in case __sync for 4 bytes is supported +QT6BASE_CONF_OPTS += -DQT_USE_BUNDLED_BundledHarfbuzz=OFF +QT6BASE_DEPENDENCIES += harfbuzz +else #BR2_TOOLCHAIN_HAS_SYNC_4 +# qt harfbuzz otherwise (using QAtomic instead) +QT6BASE_CONF_OPTS += -DQT_USE_BUNDLED_BundledHarfbuzz=ON +QT6BASE_LICENSE += , MIT (harfbuzz) +QT6BASE_LICENSE_FILES += src/3rdparty/harfbuzz-ng/COPYING +endif +else +QT6BASE_CONF_OPTS += -DFEATURE_harfbuzz=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_PNG),y) +QT6BASE_CONF_OPTS += -DFEATURE_png=ON -DFEATURE_system_png=ON +QT6BASE_DEPENDENCIES += libpng +else +QT6BASE_CONF_OPTS += -DFEATURE_png=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_GIF),y) +QT6BASE_CONF_OPTS += -DFEATURE_gif=ON +else +QT6BASE_CONF_OPTS += -DFEATURE_gif=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_JPEG),y) +QT6BASE_CONF_OPTS += -DFEATURE_jpeg=ON +QT6BASE_DEPENDENCIES += jpeg +else +QT6BASE_CONF_OPTS += -DFEATURE_jpeg=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_PRINTSUPPORT),y) +QT6BASE_CONF_OPTS += -DFEATURE_printsupport=ON +ifeq ($(BR2_PACKAGE_CUPS),y) +QT6BASE_CONF_OPTS += -DFEATURE_cups=ON +QT6BASE_DEPENDENCIES += cups +else +QT6BASE_CONF_OPTS += -DFEATURE_cups=OFF +endif +else +QT6BASE_CONF_OPTS += -DFEATURE_printsupport=OFF +endif + +ifeq ($(BR2_PACKAGE_LIBDRM),y) +QT6BASE_CONF_OPTS += -DFEATURE_kms=ON +QT6BASE_DEPENDENCIES += libdrm +else +QT6BASE_CONF_OPTS += -DFEATURE_kms=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_FONTCONFIG),y) +QT6BASE_CONF_OPTS += -DFEATURE_fontconfig=ON +QT6BASE_DEPENDENCIES += fontconfig +else +QT6BASE_CONF_OPTS += -DFEATURE_fontconfig=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_WIDGETS),y) +QT6BASE_CONF_OPTS += -DFEATURE_widgets=ON + +# only enable gtk support if libgtk3 X11 backend is enabled +ifeq ($(BR2_PACKAGE_LIBGTK3)$(BR2_PACKAGE_LIBGTK3_X11),yy) +QT6BASE_CONF_OPTS += -DFEATURE_gtk3=ON +QT6BASE_DEPENDENCIES += libgtk3 +else +QT6BASE_CONF_OPTS += -DFEATURE_gtk3=OFF +endif + +else +QT6BASE_CONF_OPTS += -DFEATURE_widgets=OFF +endif + +ifeq ($(BR2_PACKAGE_LIBINPUT),y) +QT6BASE_CONF_OPTS += -DFEATURE_libinput=ON +QT6BASE_DEPENDENCIES += libinput +else +QT6BASE_CONF_OPTS += -DFEATURE_libinput=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_TSLIB),y) +QT6BASE_CONF_OPTS += -DFEATURE_tslib=ON +QT6BASE_DEPENDENCIES += tslib +else +QT6BASE_CONF_OPTS += -DFEATURE_tslib=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_EGLFS),y) +QT6BASE_CONF_OPTS += -DFEATURE_egl=ON -DFEATURE_eglfs=ON +QT6BASE_DEPENDENCIES += libegl libgbm +else +QT6BASE_CONF_OPTS += -DFEATURE_eglfs=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_OPENGL_DESKTOP),y) +QT6BASE_CONF_OPTS += -DFEATURE_opengl=ON -DFEATURE_opengl_desktop=ON +QT6BASE_DEPENDENCIES += libgl +else ifeq ($(BR2_PACKAGE_QT6BASE_OPENGL_ES2),y) +QT6BASE_CONF_OPTS += -DFEATURE_opengl=ON -DFEATURE_opengles2=ON +QT6BASE_DEPENDENCIES += libgles +else +QT6BASE_CONF_OPTS += -DFEATURE_opengl=OFF -DINPUT_opengl=no +endif + +else +QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF +endif + +QT6BASE_DEFAULT_QPA = $(call qstrip,$(BR2_PACKAGE_QT6BASE_DEFAULT_QPA)) +QT6BASE_CONF_OPTS += $(if $(QT6BASE_DEFAULT_QPA),-DQT_QPA_DEFAULT_PLATFORM=$(QT6BASE_DEFAULT_QPA)) + +ifeq ($(BR2_PACKAGE_OPENSSL),y) +QT6BASE_CONF_OPTS += -DINPUT_openssl=yes +QT6BASE_DEPENDENCIES += openssl +else +QT6BASE_CONF_OPTS += -DINPUT_openssl=no +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_CONCURRENT),y) +QT6BASE_CONF_OPTS += -DFEATURE_concurrent=ON +else +QT6BASE_CONF_OPTS += -DFEATURE_concurrent=OFF +endif + +# We need host-qt6base with D-Bus support, otherwise: "the tool +# "Qt6::qdbuscpp2xml" was not found in the Qt6DBusTools package." +ifeq ($(BR2_PACKAGE_QT6BASE_DBUS),y) +QT6BASE_CONF_OPTS += -DFEATURE_dbus=ON -DINPUT_dbus=linked +QT6BASE_DEPENDENCIES += dbus +HOST_QT6BASE_CONF_OPTS += -DFEATURE_dbus=ON +HOST_QT6BASE_DEPENDENCIES += host-dbus +else +QT6BASE_CONF_OPTS += -DFEATURE_dbus=OFF +HOST_QT6BASE_CONF_OPTS += -DFEATURE_dbus=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_NETWORK),y) +QT6BASE_CONF_OPTS += -DFEATURE_network=ON +else +QT6BASE_CONF_OPTS += -DFEATURE_network=OFF +endif + +# Qt6 SQL Plugins +ifeq ($(BR2_PACKAGE_QT6BASE_SQL),y) +QT6BASE_CONF_OPTS += -DFEATURE_sql=ON +QT6BASE_CONF_OPTS += -DFEATURE_sql_db2=OFF -DFEATURE_sql_ibase=OFF -DFEATURE_sql_oci=OFF -DFEATURE_sql_odbc=OFF + +ifeq ($(BR2_PACKAGE_QT6BASE_MYSQL),y) +QT6BASE_CONF_OPTS += -DFEATURE_sql_mysql=ON +QT6BASE_DEPENDENCIES += mysql +else +QT6BASE_CONF_OPTS += -DFEATURE_sql_mysql=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_PSQL),y) +QT6BASE_CONF_OPTS += -DFEATURE_sql_psql=ON +QT6BASE_DEPENDENCIES += postgresql +else +QT6BASE_CONF_OPTS += -DFEATURE_sql_psql=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_SQLITE),y) +QT6BASE_CONF_OPTS += -DFEATURE_sql_sqlite=ON -DFEATURE_system_sqlite=ON +QT6BASE_DEPENDENCIES += sqlite +else +QT6BASE_CONF_OPTS += -DFEATURE_sql_sqlite=OFF +endif + +else +QT6BASE_CONF_OPTS += -DFEATURE_sql=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_SYSLOG),y) +QT6BASE_CONF_OPTS += -DFEATURE_syslog=ON +else +QT6BASE_CONF_OPTS += -DFEATURE_syslog=OFF +endif + +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +QT6BASE_CONF_OPTS += -DFEATURE_journald=ON +QT6BASE_DEPENDENCIES += systemd +else +QT6BASE_CONF_OPTS += -DFEATURE_journald=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_TEST),y) +QT6BASE_CONF_OPTS += -DFEATURE_testlib=ON +else +QT6BASE_CONF_OPTS += -DFEATURE_testlib=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_XML),y) +QT6BASE_CONF_OPTS += -DFEATURE_xml=ON +else +QT6BASE_CONF_OPTS += -DFEATURE_xml=OFF +endif + +ifeq ($(BR2_PACKAGE_ZSTD),y) +QT6BASE_CONF_OPTS += -DFEATURE_zstd=ON +QT6BASE_DEPENDENCIES += zstd +else +QT6BASE_CONF_OPTS += -DFEATURE_zstd=OFF +endif + +$(eval $(cmake-package)) +$(eval $(host-cmake-package)) diff --git a/package/qt6/qt6serialbus/Config.in b/package/qt6/qt6serialbus/Config.in new file mode 100644 index 00000000000..1f24310e611 --- /dev/null +++ b/package/qt6/qt6serialbus/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_QT6SERIALBUS + bool "qt6serialbus" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6 # CAN FD + select BR2_PACKAGE_QT6SERIALPORT + select BR2_PACKAGE_QT6BASE_NETWORK + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package corresponds to the qt6serialbus module. + + https://doc.qt.io/qt-6/qtserialbus-index.html + +comment "qt6serialbus needs headers >= 3.6" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6 diff --git a/package/qt6/qt6serialbus/qt6serialbus.hash b/package/qt6/qt6serialbus/qt6serialbus.hash new file mode 100644 index 00000000000..98c89319626 --- /dev/null +++ b/package/qt6/qt6serialbus/qt6serialbus.hash @@ -0,0 +1,11 @@ +# Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.3/submodules/qtserialbus-everywhere-src-6.4.3.tar.xz.sha256 +sha256 b6446a7516d1f04e561c00f9c50ce4d39dad72150f067722ba759f00b4b34366 qtserialbus-everywhere-src-6.4.3.tar.xz + +# Hashes for license files: +sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.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 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSES/LGPL-3.0-only.txt +sha256 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt +sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt diff --git a/package/qt6/qt6serialbus/qt6serialbus.mk b/package/qt6/qt6serialbus/qt6serialbus.mk new file mode 100644 index 00000000000..07177363879 --- /dev/null +++ b/package/qt6/qt6serialbus/qt6serialbus.mk @@ -0,0 +1,45 @@ +################################################################################ +# +# qt6serialbus +# +################################################################################ + +QT6SERIALBUS_VERSION = $(QT6_VERSION) +QT6SERIALBUS_SITE = $(QT6_SITE) +QT6SERIALBUS_SOURCE = qtserialbus-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6SERIALBUS_VERSION).tar.xz +QT6SERIALBUS_INSTALL_STAGING = YES +QT6SERIALBUS_SUPPORTS_IN_SOURCE_BUILD = NO + +QT6SERIALBUS_LICENSE = \ + GPL-2.0+ or LGPL-3.0, \ + GPL-3.0, GFDL-1.3 no invariants (docs) + +QT6SERIALBUS_LICENSE_FILES = \ + LICENSES/GPL-2.0-only.txt \ + LICENSES/GPL-3.0-only.txt \ + LICENSES/LGPL-3.0-only.txt \ + LICENSES/GFDL-1.3-no-invariants-only.txt + +QT6SERIALBUS_CONF_OPTS = \ + -GNinja \ + -DQT_HOST_PATH=$(HOST_DIR) \ + -DBUILD_WITH_PCH=OFF \ + -DQT_BUILD_EXAMPLES=OFF \ + -DQT_BUILD_TESTS=OFF + +QT6SERIALBUS_DEPENDENCIES = \ + qt6serialport + +define QT6SERIALBUS_BUILD_CMDS + $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(QT6SERIALBUS_BUILDDIR) +endef + +define QT6SERIALBUS_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(QT6SERIALBUS_BUILDDIR) +endef + +define QT6SERIALBUS_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(QT6SERIALBUS_BUILDDIR) +endef + +$(eval $(cmake-package)) diff --git a/package/qt6/qt6serialport/Config.in b/package/qt6/qt6serialport/Config.in new file mode 100644 index 00000000000..f1fd844f567 --- /dev/null +++ b/package/qt6/qt6serialport/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_QT6SERIALPORT + bool "qt6serialport" + help + Qt is a cross-platform application and UI framework for + developers using C++. + + Qt Serial Port provides the basic functionality, which + includes configuring, I/O operations, getting and setting + the control signals of the RS-232 pinouts. + + https://doc.qt.io/qt-6/qserialport.html diff --git a/package/qt6/qt6serialport/qt6serialport.hash b/package/qt6/qt6serialport/qt6serialport.hash new file mode 100644 index 00000000000..9341978d862 --- /dev/null +++ b/package/qt6/qt6serialport/qt6serialport.hash @@ -0,0 +1,10 @@ +# Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.3/submodules/qtserialport-everywhere-src-6.4.3.tar.xz.sha256 +sha256 5f97ad9067efa39a8a2a39fbbc1e03d2191f305733d9c2f3060f8017ecfc95de qtserialport-everywhere-src-6.4.3.tar.xz + +# Hashes for license files: +sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.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 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 new file mode 100644 index 00000000000..497719d4ec7 --- /dev/null +++ b/package/qt6/qt6serialport/qt6serialport.mk @@ -0,0 +1,51 @@ +################################################################################ +# +# qt6serialport +# +################################################################################ + +QT6SERIALPORT_VERSION = $(QT6_VERSION) +QT6SERIALPORT_SITE = $(QT6_SITE) +QT6SERIALPORT_SOURCE = qtserialport-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6SERIALPORT_VERSION).tar.xz +QT6SERIALPORT_INSTALL_STAGING = YES +QT6SERIALPORT_SUPPORTS_IN_SOURCE_BUILD = NO + +QT6SERIALPORT_LICENSE = \ + GPL-2.0+ or LGPL-3.0, \ + GPL-3.0 with exception (tools), \ + GFDL-1.3 (docs), \ + BSD-3-Clause + +QT6SERIALPORT_LICENSE_FILES = \ + LICENSES/BSD-3-Clause.txt \ + 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 + +QT6SERIALPORT_CONF_OPTS = \ + -GNinja \ + -DQT_HOST_PATH=$(HOST_DIR) \ + -DBUILD_WITH_PCH=OFF \ + -DQT_BUILD_EXAMPLES=OFF \ + -DQT_BUILD_TESTS=OFF + +QT6SERIALPORT_DEPENDENCIES = \ + host-pkgconf \ + host-ninja \ + qt6base + +define QT6SERIALPORT_BUILD_CMDS + $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(QT6SERIALPORT_BUILDDIR) +endef + +define QT6SERIALPORT_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(QT6SERIALPORT_BUILDDIR) +endef + +define QT6SERIALPORT_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(QT6SERIALPORT_BUILDDIR) +endef + +$(eval $(cmake-package)) diff --git a/package/quagga/quagga.hash b/package/quagga/quagga.hash index 293cee4d594..d63908ad8ff 100644 --- a/package/quagga/quagga.hash +++ b/package/quagga/quagga.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 e364c082c3309910e1eb7b068bf39ee298e2f2f3f31a6431a5c115193bd653d3 quagga-1.2.4.tar.gz +sha256 e364c082c3309910e1eb7b068bf39ee298e2f2f3f31a6431a5c115193bd653d3 quagga-1.2.4.tar.gz # Hash for license file -sha256 b39c1bad4e51e2a3389cd25fc4addebe41a3ae7c11100795683f9330de1536e5 COPYING +sha256 b39c1bad4e51e2a3389cd25fc4addebe41a3ae7c11100795683f9330de1536e5 COPYING diff --git a/package/quazip/Config.in b/package/quazip/Config.in index e9802975587..bba5eddf3d4 100644 --- a/package/quazip/Config.in +++ b/package/quazip/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_QUAZIP bool "quazip" depends on BR2_PACKAGE_QT5 select BR2_PACKAGE_ZLIB + select BR2_PACKAGE_ZLIB_FORCE_LIBZLIB help QuaZIP is a simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package that can be used to access ZIP diff --git a/package/quazip/quazip.hash b/package/quazip/quazip.hash index 5eff5cfb3dc..16d299fdf4d 100644 --- a/package/quazip/quazip.hash +++ b/package/quazip/quazip.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 54edce9c11371762bd4f0003c2937b5d8806a2752dd9c0fd9085e90792612ad0 quazip-1.1.tar.gz -sha256 3aab586a5bdc8ffbbf033c7106550fd3e849fd8888e33cbc9bfd30a433c4b1cb COPYING +sha256 c1239559cd6860cab80a0fd81f4204e606f9324f702dab6166b0960676ee1754 quazip-1.3.tar.gz +sha256 b455b21b0d31d6e51993f1fb7e0694c75fa0eb0519a9ea62e4815fcf48b140b0 COPYING diff --git a/package/quazip/quazip.mk b/package/quazip/quazip.mk index 44645ec9b99..70534b63b37 100644 --- a/package/quazip/quazip.mk +++ b/package/quazip/quazip.mk @@ -4,7 +4,7 @@ # ################################################################################ -QUAZIP_VERSION = 1.1 +QUAZIP_VERSION = 1.3 QUAZIP_SITE = $(call github,stachenov,quazip,v$(QUAZIP_VERSION)) QUAZIP_INSTALL_STAGING = YES QUAZIP_DEPENDENCIES = \ @@ -12,5 +12,6 @@ QUAZIP_DEPENDENCIES = \ qt5base QUAZIP_LICENSE = LGPL-2.1 QUAZIP_LICENSE_FILES = COPYING +QUAZIP_CPE_ID_VENDOR = quazip_project $(eval $(cmake-package)) diff --git a/package/quickjs/Config.in b/package/quickjs/Config.in index dc466241bac..fd174bc6573 100644 --- a/package/quickjs/Config.in +++ b/package/quickjs/Config.in @@ -1,6 +1,8 @@ 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. depends on !BR2_TOOLCHAIN_USES_UCLIBC @@ -15,7 +17,9 @@ config BR2_PACKAGE_QUICKJS https://bellard.org/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 || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_HOST_GCC_AT_LEAST_4_9 diff --git a/package/quickjs/quickjs.mk b/package/quickjs/quickjs.mk index a026eec4f00..ff392091002 100644 --- a/package/quickjs/quickjs.mk +++ b/package/quickjs/quickjs.mk @@ -9,6 +9,7 @@ QUICKJS_SOURCE = quickjs-$(QUICKJS_VERSION).tar.xz QUICKJS_SITE = https://bellard.org/quickjs QUICKJS_LICENSE = MIT QUICKJS_LICENSE_FILES = LICENSE +QUICKJS_CPE_ID_VENDOR = quickjs_project QUICKJS_INSTALL_STAGING = YES ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) diff --git a/package/quota/0001-quota-Use-realloc-3-instead-of-reallocarray-3.patch b/package/quota/0001-quota-Use-realloc-3-instead-of-reallocarray-3.patch deleted file mode 100644 index 093d7cc8211..00000000000 --- a/package/quota/0001-quota-Use-realloc-3-instead-of-reallocarray-3.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 02b222a335527f1031cc9495d8c5ebc1bc5b1d4e Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 11 Nov 2020 15:00:47 +0100 -Subject: [PATCH] quota: Use realloc(3) instead of reallocarray(3) - -reallocarray(3) has been added to glibc relatively recently (version -2.26, from 2017) and apparently not all users run new enough glibc. Just -use realloc(3) for now since in this case there's no real risk of -overflow. - -Signed-off-by: Fabrice Fontaine -Signed-off-by: Jan Kara -[Retrieved from: -https://sourceforge.net/p/linuxquota/code/ci/02b222a335527f1031cc9495d8c5ebc1bc5b1d4e] ---- - quota.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/quota.c b/quota.c -index a6ed61f..a60de12 100644 ---- a/quota.c -+++ b/quota.c -@@ -385,7 +385,7 @@ int main(int argc, char **argv) - break; - case 259: - fscount++; -- fsnames = reallocarray(fsnames, fscount, sizeof(char *)); -+ fsnames = realloc(fsnames, fscount * sizeof(char *)); - if (!fsnames) - die(1, _("Not enough memory for filesystem names")); - fsnames[fscount - 1] = optarg; --- -2.28.0 - diff --git a/package/quota/quota.hash b/package/quota/quota.hash index 354a3e2de44..5b083c911c8 100644 --- a/package/quota/quota.hash +++ b/package/quota/quota.hash @@ -1,7 +1,7 @@ -# From http://sourceforge.net/projects/linuxquota/files/quota-tools/4.06/ (click on info button) -md5 aef94648438832b684978d46fdf75110 quota-4.06.tar.gz -sha1 98288699cc14da42f762301c2b6731ec7c777681 quota-4.06.tar.gz +# 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 # Locally calculated -sha256 2f3e03039f378d4f0d97acdb49daf581dcaad64d2e1ddf129495fd579fbd268d quota-4.06.tar.gz +sha256 9cdaca154bc92afc3117f0e5f5b3208dd5f84583af1cf061c39baa0a2bb142f9 quota-4.09.tar.gz sha256 32a5fd41e7a257f7f0373988ea8d45cebdbf376060703c242c11c000751b1203 COPYING diff --git a/package/quota/quota.mk b/package/quota/quota.mk index 0c751d44367..1b6a4b19750 100644 --- a/package/quota/quota.mk +++ b/package/quota/quota.mk @@ -4,7 +4,7 @@ # ################################################################################ -QUOTA_VERSION = 4.06 +QUOTA_VERSION = 4.09 QUOTA_SITE = http://downloads.sourceforge.net/project/linuxquota/quota-tools/$(QUOTA_VERSION) QUOTA_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) host-nfs-utils QUOTA_LICENSE = GPL-2.0+ diff --git a/package/quotatool/quotatool.hash b/package/quotatool/quotatool.hash index 45b477830e0..d41fd4ed1b3 100644 --- a/package/quotatool/quotatool.hash +++ b/package/quotatool/quotatool.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 e53adc480d54ae873d160dc0e88d78095f95d9131e528749fd982245513ea090 quotatool-1.6.2.tar.gz +sha256 e53adc480d54ae873d160dc0e88d78095f95d9131e528749fd982245513ea090 quotatool-1.6.2.tar.gz # Hash for license files: -sha256 94686eeb98a40edc64106c6f8644068d8a08816a510a3cde75e50f1bf470564d COPYING +sha256 94686eeb98a40edc64106c6f8644068d8a08816a510a3cde75e50f1bf470564d COPYING diff --git a/package/rabbitmq-server/Config.in b/package/rabbitmq-server/Config.in deleted file mode 100644 index b3b7639e28e..00000000000 --- a/package/rabbitmq-server/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_RABBITMQ_SERVER - bool "rabbitmq-server" - depends on BR2_PACKAGE_ERLANG - select BR2_PACKAGE_LIBXSLT - select BR2_PACKAGE_OPENSSL # Required to build Erlang's crypto and ssl - # applications - help - High-performance AMQP-compliant message broker written in - Erlang. - - http://www.rabbitmq.com - -comment "rabbitmq-server needs erlang" - depends on !BR2_PACKAGE_ERLANG diff --git a/package/rabbitmq-server/S50rabbitmq-server b/package/rabbitmq-server/S50rabbitmq-server deleted file mode 100644 index 35f78448600..00000000000 --- a/package/rabbitmq-server/S50rabbitmq-server +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# Start/stop rabbitmq-server -# - -INSTALLUSER=rabbitmq -RUNDIR=/var/run/rabbitmq -LOGDIR=/var/log/rabbitmq - -case "$1" in - start) - install -d -o "$INSTALLUSER" -g "$INSTALLUSER" "$RUNDIR" || exit 1 - install -d -o "$INSTALLUSER" -g "$INSTALLUSER" "$LOGDIR" || exit 1 - printf "Starting rabbitmq-server: " - su -c "/usr/sbin/rabbitmq-server -detached" - "$INSTALLUSER" 2>/dev/null - [ $? = 0 ] && echo "OK" || echo "FAIL" - ;; - stop) - printf "Stopping rabbitmq-server: " - su -c "/usr/sbin/rabbitmqctl stop" - "$INSTALLUSER" - [ $? = 0 ] && echo "OK" || echo "FAIL" - ;; - restart|reload) - "$0" stop || true - "$0" start - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac diff --git a/package/rabbitmq-server/rabbitmq-server.hash b/package/rabbitmq-server/rabbitmq-server.hash deleted file mode 100644 index 693ab208ece..00000000000 --- a/package/rabbitmq-server/rabbitmq-server.hash +++ /dev/null @@ -1,25 +0,0 @@ -# Locally computed -sha256 8c6729b985cb21bab13363b1c806cfa15845b046be9e641ab1496bd5a1eaf19d rabbitmq-server-3.8.2.tar.xz -sha256 a96b7ed2e7def9c86d84d9ca0e79e4a55fc8e6e202ac89caa4f9791ccb9cf2a3 LICENSE -sha256 acd82bfce369b066e7e612197206da4fa38b8614486658775d0b6f66ac30114a LICENSE-APACHE2 -sha256 aac73b3148f6d1d7111dbca32099f68d26c644c6813ae1e4f05f6579aa2663fe LICENSE-APACHE2-excanvas -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE-APACHE2-ExplorerCanvas -sha256 b04c8850fdf64d17233f0acbe4eb632f03bd663094233c949bdbe788858bb841 LICENSE-APL2-Stomp-Websocket -sha256 3c69f8327beaaa45d2f3d7831edf211d0f37d1d9c7754267478320697e1882e9 LICENSE-BSD-base64js -sha256 af7b5cdf5e16446c64d6e755b2a6386e38c56500ae27587edcd94c96d330ee35 LICENSE-BSD-recon -sha256 7615ea96ccddc822655cb48a9d2a5cac2f176fca7fe28131af934ce21f48cbc8 LICENSE-erlcloud -sha256 c69d6e3fc8c51730a706aba5dcd5df978cb0c7b20c7bfe788e063cbc7fc1b234 LICENSE-httpc_aws -sha256 c0e940d13f488849c27963e7d87f3fc27a2f5843cfd49148029a558251014689 LICENSE-ISC-cowboy -sha256 af399cded8f343407fb68eeb51755676e9700c65c380f073376afd8d20f428a1 LICENSE-MIT-EJS -sha256 b2614726fe57ee8267324ecfdebe6e578e5aaa5a77a7f84b9d26463c058147d1 LICENSE-MIT-EJS10 -sha256 0f26e121a7a1dab675bd8474cdc517428863036a668260033467c7278f488cd4 LICENSE-MIT-Erlware-Commons -sha256 52cb566b16d84314b92b91361ed072eaaf166e8d3dfa3d0fd3577613925f205c LICENSE-MIT-Flot -sha256 8cb9a8ff8cafd6a085fd4f086e797b719c334a621df19354dc286591003da3f5 LICENSE-MIT-jQuery -sha256 44f25d51c90aa55dd4b3ba7f3d6e9a594073fcbefe651e16e74cabd48005b476 LICENSE-MIT-jQuery164 -sha256 fc93cc7361401413887f4c1349e4b0be4bcef936eaafbcc7485038abe197c692 LICENSE-MIT-Mochi -sha256 b80081a5bb527dbe6b79f18a40f44b4ba6303e4856cadd249672c97b90e6dd7c LICENSE-MIT-Sammy -sha256 cfc50fa0d7ee02c2d71c8866ef211a4814e8c89c50b725d27e8bdf550291a9ed LICENSE-MIT-Sammy060 -sha256 c008551400c9629d5f35a4f4fb6a671cf574d41cb365ae57e3d90341e51b3bdd LICENSE-MPL -sha256 c008551400c9629d5f35a4f4fb6a671cf574d41cb365ae57e3d90341e51b3bdd LICENSE-MPL-RabbitMQ -sha256 66a3107d5ad6a058aab753eaac2047ccb2ed0e39465dd0fe5844da3e300d5172 LICENSE-MPL2 -sha256 c69d6e3fc8c51730a706aba5dcd5df978cb0c7b20c7bfe788e063cbc7fc1b234 LICENSE-rabbitmq_aws diff --git a/package/rabbitmq-server/rabbitmq-server.mk b/package/rabbitmq-server/rabbitmq-server.mk deleted file mode 100644 index 33c3359429b..00000000000 --- a/package/rabbitmq-server/rabbitmq-server.mk +++ /dev/null @@ -1,69 +0,0 @@ -################################################################################ -# -# rabbitmq-server -# -################################################################################ - -RABBITMQ_SERVER_VERSION = 3.8.2 -RABBITMQ_SERVER_SITE = https://github.com/rabbitmq/rabbitmq-server/releases/download/v$(RABBITMQ_SERVER_VERSION) -RABBITMQ_SERVER_SOURCE = rabbitmq-server-$(RABBITMQ_SERVER_VERSION).tar.xz -RABBITMQ_SERVER_LICENSE = MPL-1.1, Apache-2.0, BSD-3-Clause, BSD-2-Clause, MIT, MPL-2.0, ISC -RABBITMQ_SERVER_LICENSE_FILES = \ - LICENSE \ - LICENSE-APACHE2 \ - LICENSE-APACHE2-excanvas \ - LICENSE-APACHE2-ExplorerCanvas \ - LICENSE-APL2-Stomp-Websocket \ - LICENSE-BSD-base64js \ - LICENSE-BSD-recon \ - LICENSE-erlcloud \ - LICENSE-httpc_aws \ - LICENSE-ISC-cowboy \ - LICENSE-MIT-EJS \ - LICENSE-MIT-EJS10 \ - LICENSE-MIT-Erlware-Commons \ - LICENSE-MIT-Flot \ - LICENSE-MIT-jQuery \ - LICENSE-MIT-jQuery164 \ - LICENSE-MIT-Mochi \ - LICENSE-MIT-Sammy \ - LICENSE-MIT-Sammy060 \ - LICENSE-MPL \ - LICENSE-MPL-RabbitMQ \ - LICENSE-MPL2 \ - LICENSE-rabbitmq_aws -RABBITMQ_SERVER_CPE_ID_VENDOR = pivotal_software -RABBITMQ_SERVER_CPE_ID_PRODUCT = rabbitmq -RABBITMQ_SERVER_SELINUX_MODULES = rabbitmq - -RABBITMQ_SERVER_DEPENDENCIES = host-elixir host-libxslt host-zip erlang libxslt -RABBITMQ_SERVER_TARGET_BINS = rabbitmq-plugins rabbitmq-server rabbitmqctl rabbitmq-env rabbitmq-defaults - -define RABBITMQ_SERVER_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define RABBITMQ_SERVER_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) PREFIX=$(TARGET_DIR)/usr -C $(@D) install - - for bin in $(RABBITMQ_SERVER_TARGET_BINS); do \ - ln -sf ../lib/erlang/lib/rabbitmq_server-$(RABBITMQ_SERVER_VERSION)/sbin/$$bin \ - $(TARGET_DIR)/usr/sbin/$$bin; \ - done -endef - -define RABBITMQ_SERVER_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 0644 package/rabbitmq-server/rabbitmq-server.service \ - $(TARGET_DIR)/usr/lib/systemd/system/rabbitmq-server.service -endef - -define RABBITMQ_SERVER_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 package/rabbitmq-server/S50rabbitmq-server \ - $(TARGET_DIR)/etc/init.d/S50rabbitmq-server -endef - -define RABBITMQ_SERVER_USERS - rabbitmq -1 rabbitmq -1 * /var/lib/rabbitmq /bin/sh - rabbitmq-server daemon -endef - -$(eval $(generic-package)) diff --git a/package/rabbitmq-server/rabbitmq-server.service b/package/rabbitmq-server/rabbitmq-server.service deleted file mode 100644 index f69b33d455a..00000000000 --- a/package/rabbitmq-server/rabbitmq-server.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=RabbitMQ Messaging Server -After=syslog.target network.target - -[Service] -Type=simple -User=rabbitmq -Group=rabbitmq -Environment=HOME=/var/lib/rabbitmq -WorkingDirectory=/var/lib/rabbitmq -LogsDirectory=/var/log/rabbitmq -ExecStart=/usr/sbin/rabbitmq-server -ExecStop=/usr/sbin/rabbitmqctl stop - -[Install] -WantedBy=multi-user.target diff --git a/package/ragel/ragel.hash b/package/ragel/ragel.hash new file mode 100644 index 00000000000..332f5874329 --- /dev/null +++ b/package/ragel/ragel.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 5f156edb65d20b856d638dd9ee2dfb43285914d9aa2b6ec779dac0270cd56c3f ragel-6.10.tar.gz +sha256 05a87975accb539399d0c8a4f4402ac27a6762fb1e4f31d04d455a8bee3e3693 COPYING diff --git a/package/ragel/ragel.mk b/package/ragel/ragel.mk new file mode 100644 index 00000000000..56afcd72367 --- /dev/null +++ b/package/ragel/ragel.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# ragel +# +################################################################################ + +RAGEL_VERSION = 6.10 +RAGEL_SITE = https://www.colm.net/files/ragel/ +RAGEL_LICENSE = GPL-2.0 +RAGEL_LICENSE_FILES = COPYING +RAGEL_CONF_OPTS = \ + --disable-silent-rules \ + --disable-manual \ + --disable-dependency-tracking + +$(eval $(host-autotools-package)) diff --git a/package/ramspeed/Config.in b/package/ramspeed/Config.in index b236329a84d..bd0438ffe1e 100644 --- a/package/ramspeed/Config.in +++ b/package/ramspeed/Config.in @@ -1,5 +1,9 @@ +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. diff --git a/package/ranger/ranger.mk b/package/ranger/ranger.mk index aaca43862c8..91b30f216e0 100644 --- a/package/ranger/ranger.mk +++ b/package/ranger/ranger.mk @@ -19,7 +19,7 @@ define RANGER_DO_NOT_GENERATE_BYTECODE_AT_RUNTIME $(SED) 's%/usr/bin/python -O%/usr/bin/python%g' $(@D)/scripts/ranger endef -ifeq ($(BR2_PACKAGE_PYTHON3_PYC_ONLY)$(BR2_PACKAGE_PYTHON_PYC_ONLY),y) +ifeq ($(BR2_PACKAGE_PYTHON3_PYC_ONLY),y) RANGER_POST_PATCH_HOOKS += RANGER_DO_NOT_GENERATE_BYTECODE_AT_RUNTIME endif diff --git a/package/rapidjson/rapidjson.hash b/package/rapidjson/rapidjson.hash index e8b2c4d5473..3c16abee602 100644 --- a/package/rapidjson/rapidjson.hash +++ b/package/rapidjson/rapidjson.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d7dd4039d0787f8bed98e rapidjson-1.1.0.tar.gz -sha256 a140e5d46fe734a1c78f1a3c3ef207871dd75648be71fdda8e309b23ab8b1f32 license.txt +sha256 bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d7dd4039d0787f8bed98e rapidjson-1.1.0.tar.gz +sha256 a140e5d46fe734a1c78f1a3c3ef207871dd75648be71fdda8e309b23ab8b1f32 license.txt diff --git a/package/rapidxml/rapidxml.hash b/package/rapidxml/rapidxml.hash index 398bc147c25..292901f4c20 100644 --- a/package/rapidxml/rapidxml.hash +++ b/package/rapidxml/rapidxml.hash @@ -1,6 +1,6 @@ # From https://sourceforge.net/projects/rapidxml/files/rapidxml/rapidxml%201.13/ -sha1 f5fd4fbc5ad7e96045313697811d65ea8089a950 rapidxml-1.13.zip -md5 7b4b42c9331c90aded23bb55dc725d6a rapidxml-1.13.zip +sha1 f5fd4fbc5ad7e96045313697811d65ea8089a950 rapidxml-1.13.zip +md5 7b4b42c9331c90aded23bb55dc725d6a rapidxml-1.13.zip # Locally calculated sha256 c3f0b886374981bb20fabcf323d755db4be6dba42064599481da64a85f5b3571 rapidxml-1.13.zip diff --git a/package/raptor/0003-XML-Writer-compare-namespace-declarations-correctly.patch b/package/raptor/0003-XML-Writer-compare-namespace-declarations-correctly.patch new file mode 100644 index 00000000000..a48a583cb1e --- /dev/null +++ b/package/raptor/0003-XML-Writer-compare-namespace-declarations-correctly.patch @@ -0,0 +1,33 @@ +From 4f5dbbffcc1c6cf0398bd03450453289a0979dea Mon Sep 17 00:00:00 2001 +From: Dave Beckett +Date: Sat, 18 Sep 2021 17:40:00 -0700 +Subject: [PATCH] XML Writer : compare namespace declarations correctly + +Apply patch from +0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch.1 +that fixes Issue#0000650 https://bugs.librdf.org/mantis/view.php?id=650 +which overwrote heap during XML writing in parse type literal +content. This was detected with clang asan. + +Thanks to Michael Stahl / mst2 for the fix. + +[Retrieved from: +https://github.com/dajobe/raptor/commit/4f5dbbffcc1c6cf0398bd03450453289a0979dea] +Signed-off-by: Fabrice Fontaine +--- + src/raptor_xml_writer.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/raptor_xml_writer.c b/src/raptor_xml_writer.c +index 56993dc3..4426d38c 100644 +--- a/src/raptor_xml_writer.c ++++ b/src/raptor_xml_writer.c +@@ -227,7 +227,7 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer, + + /* check it wasn't an earlier declaration too */ + for(j = 0; j < nspace_declarations_count; j++) +- if(nspace_declarations[j].nspace == element->attributes[j]->nspace) { ++ if(nspace_declarations[j].nspace == element->attributes[i]->nspace) { + declare_me = 0; + break; + } diff --git a/package/raptor/raptor.mk b/package/raptor/raptor.mk index 6d21fad58e6..69ac121300e 100644 --- a/package/raptor/raptor.mk +++ b/package/raptor/raptor.mk @@ -20,6 +20,9 @@ RAPTOR_AUTORECONF = YES # 0002-Calcualte-max-nspace-declarations-correctly-for-XML-.patch RAPTOR_IGNORE_CVES += CVE-2017-18926 +# 0003-XML-Writer-compare-namespace-declarations-correctly.patch +RAPTOR_IGNORE_CVES += CVE-2020-25713 + RAPTOR_CONF_OPTS =\ --with-xml2-config=$(STAGING_DIR)/usr/bin/xml2-config \ --with-xslt-config=$(STAGING_DIR)/usr/bin/xslt-config diff --git a/package/raspi-gpio/raspi-gpio.hash b/package/raspi-gpio/raspi-gpio.hash index 41d885f3179..c3d9540f455 100644 --- a/package/raspi-gpio/raspi-gpio.hash +++ b/package/raspi-gpio/raspi-gpio.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2526dcec1e5a171b13c44b1fb6f2faed5ec849f08021278e2be09bc18264a2fd raspi-gpio-4edfde183ff3ac9ed66cdc015ae25e45f3a5502d.tar.gz -sha256 6e02227e1fb942687163996678d94add7911890c50025912d0ae7ee66d256bb2 LICENSE +sha256 2526dcec1e5a171b13c44b1fb6f2faed5ec849f08021278e2be09bc18264a2fd raspi-gpio-4edfde183ff3ac9ed66cdc015ae25e45f3a5502d.tar.gz +sha256 6e02227e1fb942687163996678d94add7911890c50025912d0ae7ee66d256bb2 LICENSE diff --git a/package/rauc/Config.in b/package/rauc/Config.in index b4f7b819489..7451b29a55f 100644 --- a/package/rauc/Config.in +++ b/package/rauc/Config.in @@ -25,6 +25,14 @@ config BR2_PACKAGE_RAUC_DBUS This option enables support for controlling rauc through D-Bus. +config BR2_PACKAGE_RAUC_GPT + bool "GPT support" + select BR2_PACKAGE_UTIL_LINUX + select BR2_PACKAGE_UTIL_LINUX_LIBS + select BR2_PACKAGE_UTIL_LINUX_LIBFDISK + help + This option enables support for GPT partition tables. + config BR2_PACKAGE_RAUC_NETWORK bool "network support" select BR2_PACKAGE_LIBCURL @@ -32,6 +40,16 @@ config BR2_PACKAGE_RAUC_NETWORK This option enables support for updating firmware over the network using libcurl. +if BR2_PACKAGE_RAUC_NETWORK + +config BR2_PACKAGE_RAUC_STREAMING + bool "streaming update support" + select BR2_PACKAGE_LIBNL + help + This option enables support for streaming update mode. + +endif + config BR2_PACKAGE_RAUC_JSON bool "JSON output support" select BR2_PACKAGE_JSON_GLIB diff --git a/package/rauc/rauc.hash b/package/rauc/rauc.hash index f6c1446de40..8351d0266e8 100644 --- a/package/rauc/rauc.hash +++ b/package/rauc/rauc.hash @@ -1,4 +1,3 @@ -# Locally calculated, after verifying against -# https://github.com/rauc/rauc/releases/download/v1.6/rauc-1.6.tar.xz.asc -sha256 86013788dd02321b7c3f913ad3a1f8802afbc784ec076fa278524a9e1ef9e7b0 rauc-1.6.tar.xz +# Locally calculated +sha256 d233247c1763b1c56c851d0adef2094b7aa2fcd72decf524a8ac0419188e0978 rauc-1.8.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/rauc/rauc.mk b/package/rauc/rauc.mk index 7a10470cf28..0c81a6cc35c 100644 --- a/package/rauc/rauc.mk +++ b/package/rauc/rauc.mk @@ -4,7 +4,7 @@ # ################################################################################ -RAUC_VERSION = 1.6 +RAUC_VERSION = 1.8 RAUC_SITE = https://github.com/rauc/rauc/releases/download/v$(RAUC_VERSION) RAUC_SOURCE = rauc-$(RAUC_VERSION).tar.xz RAUC_LICENSE = LGPL-2.1 @@ -31,6 +31,13 @@ else RAUC_CONF_OPTS += --disable-service endif +ifeq ($(BR2_PACKAGE_RAUC_GPT),y) +RAUC_CONF_OPTS += --enable-gpt +RAUC_DEPENDENCIES += util-linux-libs +else +RAUC_CONF_OPTS += --disable-gpt +endif + ifeq ($(BR2_PACKAGE_RAUC_NETWORK),y) RAUC_CONF_OPTS += --enable-network RAUC_DEPENDENCIES += libcurl @@ -45,6 +52,13 @@ else RAUC_CONF_OPTS += --disable-json endif +ifeq ($(BR2_PACKAGE_RAUC_STREAMING),y) +RAUC_CONF_OPTS += --enable-streaming +RAUC_DEPENDENCIES += libnl +else +RAUC_CONF_OPTS += --disable-streaming +endif + HOST_RAUC_DEPENDENCIES = \ host-pkgconf \ host-openssl \ diff --git a/package/rcw-smarc-sal28/rcw-smarc-sal28.hash b/package/rcw-smarc-sal28/rcw-smarc-sal28.hash index 6ca5df77cda..17562137bad 100644 --- a/package/rcw-smarc-sal28/rcw-smarc-sal28.hash +++ b/package/rcw-smarc-sal28/rcw-smarc-sal28.hash @@ -1,3 +1,3 @@ # locally computed -sha256 8c1c3e26407141ee8d8bd16a43c16c0459b01a60e6e25ca47e22c7499b3e4e65 rcw-smarc-sal28-11.tar.gz -sha256 803c65088eed36a6697ca9f03f4379bbad24e276dc8da7fef5eb4dc4008415a1 COPYING +sha256 8c1c3e26407141ee8d8bd16a43c16c0459b01a60e6e25ca47e22c7499b3e4e65 rcw-smarc-sal28-11.tar.gz +sha256 803c65088eed36a6697ca9f03f4379bbad24e276dc8da7fef5eb4dc4008415a1 COPYING diff --git a/package/rdma-core/Config.in b/package/rdma-core/Config.in new file mode 100644 index 00000000000..3360e6873d0 --- /dev/null +++ b/package/rdma-core/Config.in @@ -0,0 +1,20 @@ +config BR2_PACKAGE_RDMA_CORE + bool "rdma-core" + depends on BR2_USE_MMU # fork() used in rstream example + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # iproute2 + depends on !BR2_STATIC_LIBS # dlopen() + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_PACKAGE_IPROUTE2 # runtime + select BR2_PACKAGE_LIBNL + help + This is the userspace components for the Linux Kernel's + drivers/infiniband subsystem. + + https://github.com/linux-rdma/rdma-core + +comment "rdma-core needs a toolchain w/ headers >= 3.4, NPTL, dynamic library" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 \ + || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS diff --git a/package/rdma-core/rdma-core.hash b/package/rdma-core/rdma-core.hash new file mode 100644 index 00000000000..1aff44f7f4e --- /dev/null +++ b/package/rdma-core/rdma-core.hash @@ -0,0 +1,5 @@ +# Locally calculated +sha256 4a2eec55b37ac25f25e7680a372f71c1781c23808542bd31fb68dc0448b8cba2 rdma-core-44.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 new file mode 100644 index 00000000000..885821bf985 --- /dev/null +++ b/package/rdma-core/rdma-core.mk @@ -0,0 +1,24 @@ +################################################################################ +# +# rdma-core +# +################################################################################ + +RDMA_CORE_VERSION = 44.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 +RDMA_CORE_DEPENDENCIES = libnl +RDMA_CORE_INSTALL_STAGING = YES + +RDMA_CORE_CONF_OPTS = \ + -DNO_MAN_PAGES=1 \ + -DNO_PYVERBS=1 + +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +RDMA_CORE_CONF_OPTS += \ + -DCMAKE_EXE_LINKER_FLAGS=-latomic \ + -DCMAKE_SHARED_LINKER_FLAGS=-latomic +endif + +$(eval $(cmake-package)) diff --git a/package/rdma-core/readme.txt b/package/rdma-core/readme.txt new file mode 100644 index 00000000000..9a95226ef48 --- /dev/null +++ b/package/rdma-core/readme.txt @@ -0,0 +1,75 @@ +Testing rdma-core userspace tools +================================= + +Testing rdma-core using Linux software RoCE implementation: +https://en.wikipedia.org/wiki/RDMA_over_Converged_Ethernet + +Using two systems with working TCP/IP configuration, for example: +- Server IP: 192.168.123.10 +- Client IP: 192.168.123.20 + +Make sure firewall configurations are appropriate. Routable RoCE v2 +uses udp/4791. ibv_rc_pingpong uses tcp/18515 for initial +synchronization. + +Note: this test can be executed in two qemu virtual machines with +bridged networking. + + +Kernel configuration +-------------------- + +The Linux Kernel needs some InfiniBand configuration. In this example +the kernel "rdma_rxe" driver is needed (CONFIG_RDMA_RXE=y). The Kernel +config fragment file used for package test can be used as a starting +point. See: + + support/testing/tests/package/test_rdma_core/linux-rdma.fragment + + +Buildroot package configuration +------------------------------- + +For setting up a software RoCE link, the "rdma" program is needed. It +is provided by the "iproute2" package, when "libmnl" is also +selected. Make sure to have in your Buildroot configuration: + + BR2_PACKAGE_IPROUTE2=y + BR2_PACKAGE_LIBMNL=y + BR2_PACKAGE_RDMA_CORE=y + + +Setting up the rdma link +------------------------ + +On both server and client: + + modprobe rdma_rxe + rdma link add rxe0 type rxe netdev eth0 + + +Testing with rping +------------------ + +On the server side, run the command: + + rping -s -v + +On the client side, run the command: + + rping -c -v -a 192.168.123.10 + + +Testing with ibv_rc_pingpong +---------------------------- + +To test with the pingpong example using the reliable connected (RC) +transport: + +On the server side, run the command: + + ibv_rc_pingpong -d rxe0 -g 1 + +On the client side, run the command: + + ibv_rc_pingpong -d rxe0 -g 1 192.168.123.10 diff --git a/package/re2/re2.hash b/package/re2/re2.hash index 7cfece5d5e3..a39dece7a98 100644 --- a/package/re2/re2.hash +++ b/package/re2/re2.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 9c1e6acfd0fed71f40b025a7a1dabaf3ee2ebb74d64ced1f9ee1b0b01d22fd27 re2-2022-02-01.tar.gz +sha256 cbce8b7803e856827201a132862e41af386e7afd9cc6d9a9bc7a4fa4d8ddbdde re2-2023-02-01.tar.gz sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 LICENSE diff --git a/package/re2/re2.mk b/package/re2/re2.mk index 30791a68e52..5587366b1f0 100644 --- a/package/re2/re2.mk +++ b/package/re2/re2.mk @@ -4,7 +4,7 @@ # ################################################################################ -RE2_VERSION = 2022-02-01 +RE2_VERSION = 2023-02-01 RE2_SITE = $(call github,google,re2,$(RE2_VERSION)) RE2_LICENSE = BSD-3-Clause RE2_LICENSE_FILES = LICENSE 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 new file mode 100644 index 00000000000..c2c2d812600 --- /dev/null +++ b/package/readline/0002-Readline-8.2-patch-1-fix-crash-when-readline-is-star.patch @@ -0,0 +1,41 @@ +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 b0530a2d729..627746d8214 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.1.2.tar.gz.sig -sha256 7589a2381a8419e68654a47623ce7dfcb756815c8fee726b98f90bf668af7bc6 readline-8.1.2.tar.gz +# https://ftp.gnu.org/gnu/readline/readline-8.2.tar.gz.sig +sha256 3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35 readline-8.2.tar.gz # Hash for license file sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/readline/readline.mk b/package/readline/readline.mk index b1fd181b784..66812dee77c 100644 --- a/package/readline/readline.mk +++ b/package/readline/readline.mk @@ -4,7 +4,7 @@ # ################################################################################ -READLINE_VERSION = 8.1.2 +READLINE_VERSION = 8.2 READLINE_SITE = $(BR2_GNU_MIRROR)/readline READLINE_INSTALL_STAGING = YES READLINE_DEPENDENCIES = ncurses host-autoconf diff --git a/package/reaver/reaver.hash b/package/reaver/reaver.hash index 780e6ac86d2..cb01e52099c 100644 --- a/package/reaver/reaver.hash +++ b/package/reaver/reaver.hash @@ -1,3 +1,3 @@ # locally computed -sha256 73189782b208d12b8dddc4f29d32e1f72b1f3609e573c9ea9510deebec394583 reaver-1.6.6.tar.gz -sha256 bb40cfd5e9ca6e8465ea3c236f3f2293e8300af1bfe87e72fabe482ae6cc995a docs/LICENSE +sha256 73189782b208d12b8dddc4f29d32e1f72b1f3609e573c9ea9510deebec394583 reaver-1.6.6.tar.gz +sha256 bb40cfd5e9ca6e8465ea3c236f3f2293e8300af1bfe87e72fabe482ae6cc995a docs/LICENSE diff --git a/package/redis/redis.hash b/package/redis/redis.hash index 74a9392a63b..69bfc1475fc 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 5b2b8b7a50111ef395bf1c1d5be11e6e167ac018125055daa8b5c2317ae131ab redis-6.2.6.tar.gz +sha256 ce250d1fba042c613de38a15d40889b78f7cb6d5461a27e35017ba39b07221e3 redis-7.0.11.tar.gz # Locally calculated sha256 97f0a15b7bbae580d2609dad2e11f1956ae167be296ab60f4691ab9c30ee9828 COPYING diff --git a/package/redis/redis.mk b/package/redis/redis.mk index f3c030d68c0..e5d3de8eb9b 100644 --- a/package/redis/redis.mk +++ b/package/redis/redis.mk @@ -4,7 +4,7 @@ # ################################################################################ -REDIS_VERSION = 6.2.6 +REDIS_VERSION = 7.0.11 REDIS_SITE = http://download.redis.io/releases REDIS_LICENSE = BSD-3-Clause (core); MIT and BSD family licenses (Bundled components) REDIS_LICENSE_FILES = COPYING diff --git a/package/refpolicy/refpolicy.mk b/package/refpolicy/refpolicy.mk index 44c50af2782..f11b72755ae 100644 --- a/package/refpolicy/refpolicy.mk +++ b/package/refpolicy/refpolicy.mk @@ -30,7 +30,7 @@ endif # Cannot use multiple threads to build the reference policy REFPOLICY_MAKE = \ - PYTHON=$(HOST_DIR)/usr/bin/python3 \ + PYTHON=$(HOST_DIR)/bin/python3 \ XMLLINT=$(LIBXML2_HOST_BINARY) \ TEST_TOOLCHAIN=$(HOST_DIR) \ $(TARGET_MAKE_ENV) \ diff --git a/package/reproc/Config.in b/package/reproc/Config.in new file mode 100644 index 00000000000..a4e9c893b11 --- /dev/null +++ b/package/reproc/Config.in @@ -0,0 +1,14 @@ +config BR2_PACKAGE_REPROC + bool "reproc" + depends on BR2_USE_MMU # fork() + depends on BR2_USE_WCHAR # uses wchar_t + depends on BR2_TOOLCHAIN_HAS_THREADS # pthread + help + reproc is a cross-platform C/C++ library that simplifies + starting, stopping and communicating with external programs. + + https://github.com/DaanDeMeyer/reproc + +comment "reproc needs a toolchain w/ threads, wchar" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/reproc/reproc.hash b/package/reproc/reproc.hash new file mode 100644 index 00000000000..6da6d0a0bb1 --- /dev/null +++ b/package/reproc/reproc.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 55c780f7faa5c8cabd83ebbb84b68e5e0e09732de70a129f6b3c801e905415dd reproc-14.2.4.tar.gz +sha256 8f91afbe266bebac2cf1b220e0e67ace4cb9a97d2b21940abef20eb6691cfa91 LICENSE diff --git a/package/reproc/reproc.mk b/package/reproc/reproc.mk new file mode 100644 index 00000000000..3167911c4df --- /dev/null +++ b/package/reproc/reproc.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# reproc +# +################################################################################ + +REPROC_VERSION = 14.2.4 +REPROC_SITE = $(call github,DaanDeMeyer,reproc,v$(REPROC_VERSION)) +REPROC_LICENSE = MIT +REPROC_LICENSE_FILES = LICENSE +REPROC_INSTALL_STAGING = YES + +ifeq ($(BR2_INSTALL_LIBSTDCPP)$(BR2_TOOLCHAIN_GCC_AT_LEAST_4_8),yy) # C++11 +REPROC_CONF_OPTS += -DREPROC++=ON +endif + +$(eval $(cmake-package)) diff --git a/package/rhash/rhash.hash b/package/rhash/rhash.hash index e0555af3c29..355b5c275bf 100644 --- a/package/rhash/rhash.hash +++ b/package/rhash/rhash.hash @@ -1,5 +1,5 @@ -# From https://sourceforge.net/projects/rhash/files/rhash/1.4.2/ -sha1 fdb0b0c16f3ba3eba734b3adf9f2fc4c427ff987 rhash-1.4.2-src.tar.gz +# From https://sourceforge.net/projects/rhash/files/rhash/1.4.3/ +sha1 6e698e6d5b13aeac55076d6a53dc4dab55f2114e rhash-1.4.3-src.tar.gz # Locally calculated -sha256 600d00f5f91ef04194d50903d3c79412099328c42f28ff43a0bdb777b00bec62 rhash-1.4.2-src.tar.gz +sha256 1e40fa66966306920f043866cbe8612f4b939b033ba5e2708c3f41be257c8a3e rhash-1.4.3-src.tar.gz sha256 953e55838353335148c90b5a38a4894292680b1d4c37228ffddddbf18ce54bf5 COPYING diff --git a/package/rhash/rhash.mk b/package/rhash/rhash.mk index 02af0aa57bb..1f7456e4e7c 100644 --- a/package/rhash/rhash.mk +++ b/package/rhash/rhash.mk @@ -4,7 +4,7 @@ # ################################################################################ -RHASH_VERSION = 1.4.2 +RHASH_VERSION = 1.4.3 RHASH_SOURCE = rhash-$(RHASH_VERSION)-src.tar.gz RHASH_SITE = https://sourceforge.net/projects/rhash/files/rhash/$(RHASH_VERSION) RHASH_LICENSE = 0BSD @@ -12,7 +12,6 @@ RHASH_LICENSE_FILES = COPYING RHASH_CPE_ID_VENDOR = rhash_project RHASH_INSTALL_STAGING = YES RHASH_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) -RHASH_ADDLDFLAGS = $(TARGET_NLS_LIBS) ifeq ($(BR2_SYSTEM_ENABLE_NLS),y) RHASH_CONF_OPTS += --enable-gettext diff --git a/package/riemann-c-client/Config.in b/package/riemann-c-client/Config.in index e9982b2fb02..6c3c35caf80 100644 --- a/package/riemann-c-client/Config.in +++ b/package/riemann-c-client/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_RIEMANN_C_CLIENT bool "riemann-c-client" depends on BR2_INSTALL_LIBSTDCPP # protobuf-c depends on BR2_TOOLCHAIN_HAS_THREADS # protobuf-c - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" # protobuf-c + depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS # protobuf-c select BR2_PACKAGE_PROTOBUF_C help Riemann-c-client is a C client library for the Riemann @@ -14,4 +14,4 @@ config BR2_PACKAGE_RIEMANN_C_CLIENT comment "riemann-c-client needs a toolchain w/ C++, threads" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" + depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS diff --git a/package/riemann-c-client/riemann-c-client.hash b/package/riemann-c-client/riemann-c-client.hash index 6d4d634d755..43d4cd45c47 100644 --- a/package/riemann-c-client/riemann-c-client.hash +++ b/package/riemann-c-client/riemann-c-client.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 334874f0b9a507a8abbc7138df719cba4f28f12c02c39d5e55090b8edb86f9d2 riemann-c-client-1.10.4.tar.gz -sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE +sha256 568416d854d1c1e5eac743c9f56db6fa0d6a8144daa74a799d0556bb6b50e679 riemann-c-client-1.10.5.tar.gz +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE diff --git a/package/riemann-c-client/riemann-c-client.mk b/package/riemann-c-client/riemann-c-client.mk index 6fbb3caf5ca..f942d560c8b 100644 --- a/package/riemann-c-client/riemann-c-client.mk +++ b/package/riemann-c-client/riemann-c-client.mk @@ -4,7 +4,7 @@ # ################################################################################ -RIEMANN_C_CLIENT_VERSION = 1.10.4 +RIEMANN_C_CLIENT_VERSION = 1.10.5 RIEMANN_C_CLIENT_SITE = \ $(call github,algernon,riemann-c-client,riemann-c-client-$(RIEMANN_C_CLIENT_VERSION)) RIEMANN_C_CLIENT_LICENSE = LGPL-3.0+ diff --git a/package/rings/rings.hash b/package/rings/rings.hash index c9a758b54df..f1377d5a9f1 100644 --- a/package/rings/rings.hash +++ b/package/rings/rings.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 627ac55d4a420fab766e6870fcd82cb39da12fb4ec8efddc7220b188a4ad4bc3 rings-1.3.0-1.src.rock -sha256 f582a0c43737391070827ef273df0145b594b095ad2f49595701368b729e024f rings-v_1_3_0/doc/us/license.html +sha256 627ac55d4a420fab766e6870fcd82cb39da12fb4ec8efddc7220b188a4ad4bc3 rings-1.3.0-1.src.rock +sha256 f582a0c43737391070827ef273df0145b594b095ad2f49595701368b729e024f rings-v_1_3_0/doc/us/license.html diff --git a/package/ripgrep/ripgrep.hash b/package/ripgrep/ripgrep.hash index cd2dbedfb41..71e74e1bcf5 100644 --- a/package/ripgrep/ripgrep.hash +++ b/package/ripgrep/ripgrep.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6f1d4a8b653ce48d59ad777288b1257cbda607db29db19d031b7e622c60526f8 ripgrep-af6b6c543b224d348a8876f0c06245d9ea7929c5.tar.gz -sha256 0f96a83840e146e43c0ec96a22ec1f392e0680e6c1226e6f3ba87e0740af850f LICENSE-MIT +sha256 6f1d4a8b653ce48d59ad777288b1257cbda607db29db19d031b7e622c60526f8 ripgrep-af6b6c543b224d348a8876f0c06245d9ea7929c5.tar.gz +sha256 0f96a83840e146e43c0ec96a22ec1f392e0680e6c1226e6f3ba87e0740af850f LICENSE-MIT diff --git a/package/rng-tools/0001-Adding-ability-to-detect-non-posix-extensions-for-pthreads.patch b/package/rng-tools/0001-Adding-ability-to-detect-non-posix-extensions-for-pthreads.patch deleted file mode 100644 index ba6cf63d7cb..00000000000 --- a/package/rng-tools/0001-Adding-ability-to-detect-non-posix-extensions-for-pthreads.patch +++ /dev/null @@ -1,43 +0,0 @@ -From d1840e54a15fc454936cada10cce7fd91d06232b Mon Sep 17 00:00:00 2001 -From: Neil Horman -Date: Thu, 15 Jul 2021 08:43:01 -0400 -Subject: [PATCH] Adding ability to detect non-posix extensions for pthreads - -Theres a desire to build rngd with musl, which doesn't have all the gnu -extensions (but it has some). So test for those. Note, this requires -the addition of the USE_EXTENSIONS macro to enable -d_GNU_SOURCE - -Signed-off-by: Neil Horman - -[Retrieved from: -https://github.com/nhorman/rng-tools/commit/d1840e54a15fc454936cada10cce7fd91d06232b] -Signed-off-by: Fabrice Fontaine ---- - configure.ac | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 0fe06fc..de7dca3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -25,6 +25,7 @@ AC_CANONICAL_TARGET dnl required for broken AX_PTHREAD - AM_INIT_AUTOMAKE([foreign]) - AC_CONFIG_HEADERS([rng-tools-config.h]) - AC_CONFIG_MACRO_DIRS([m4]) -+AC_USE_SYSTEM_EXTENSIONS - - dnl Parse options - -@@ -100,6 +101,12 @@ AS_IF( - ], [AC_MSG_NOTICE([Disabling JITTER entropy source])] - ) - -+AC_CHECK_DECL(pthread_attr_setaffinity_np, -+ [AC_DEFINE([HAVE_PTHREAD_ATTR_SETAFFINITY], 1,[Set ATTR_SETAFFINITY])], -+ [ AC_CHECK_DECL(pthread_setaffinity_np, -+ [AC_DEFINE([HAVE_PTHREAD_SETAFFINITY],1, [Set PTHREAD_SETAFFINITY])], [ AC_MSG_ERROR([Neither pthread_setaffinity_np nor pthread_attr_setaffinity_np found])],[[#include ]]) -+ ], [[#include ]]) -+ - AS_IF( - [ test "x$with_nistbeacon" != "xno"], - [ diff --git a/package/rng-tools/0002-Allow-for-use-of-either-pthread-affinity-set-methods.patch b/package/rng-tools/0002-Allow-for-use-of-either-pthread-affinity-set-methods.patch deleted file mode 100644 index 17285baa6a4..00000000000 --- a/package/rng-tools/0002-Allow-for-use-of-either-pthread-affinity-set-methods.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 5caa086dc14cecf68d1a5c31e87ba1efb2c00893 Mon Sep 17 00:00:00 2001 -From: Neil Horman -Date: Thu, 15 Jul 2021 08:48:10 -0400 -Subject: [PATCH] Allow for use of either pthread affinity set methods - -musl has support for pthread_setaffinity_np, but not -pthread_attr_setaffinity_np. so check for hte existence of either -function in configure, and use the appropriate one. - -Signed-off-by: Neil Horman - -[Retrieved from: -https://github.com/nhorman/rng-tools/commit/5caa086dc14cecf68d1a5c31e87ba1efb2c00893] -Signed-off-by: Fabrice Fontaine ---- - rngd_jitter.c | 15 ++++++++++++++- - 1 file changed, 14 insertions(+), 1 deletion(-) - -diff --git a/rngd_jitter.c b/rngd_jitter.c -index ea29436..5c7e09e 100644 ---- a/rngd_jitter.c -+++ b/rngd_jitter.c -@@ -67,12 +67,25 @@ static int rngd_notime_start(void *ctx, - for(i=i-1;i>=0;i--) { - CPU_SET(i,cpus); - } -- pthread_attr_setaffinity_np(&thread_ctx->notime_pthread_attr, cpusize, cpus); - -+ /* -+ * Note that only one of: -+ * HAVE_PTHREAD_ATTR_SETAFFINITY -+ * and -+ * HAVE_PTHREAD_SETAFFINITY -+ * Will ever be set, as per the configure.ac logic -+ */ -+#ifdef HAVE_PTHREAD_ATTR_SETAFFINITY -+ pthread_attr_setaffinity_np(&thread_ctx->notime_pthread_attr, cpusize, cpus); -+#endif - ret = -pthread_create(&thread_ctx->notime_thread_id, - &thread_ctx->notime_pthread_attr, - start_routine, arg); - -+#ifdef HAVE_PTHREAD_SETAFFINITY -+ pthread_setaffinity_np(&thread_ctx->notime_thread_id, cpusize, cpus); -+#endif -+ - CPU_FREE(cpus); - return ret; - } diff --git a/package/rng-tools/Config.in b/package/rng-tools/Config.in index 0dd269c818d..be3f078a0bc 100644 --- a/package/rng-tools/Config.in +++ b/package/rng-tools/Config.in @@ -2,7 +2,9 @@ config BR2_PACKAGE_RNG_TOOLS bool "rng-tools" # pthread_setaffinity_np depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL + depends on BR2_USE_MMU # libcap select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL + select BR2_PACKAGE_LIBCAP select BR2_PACKAGE_OPENSSL help Daemon to use hardware random number generators. @@ -35,7 +37,21 @@ config BR2_PACKAGE_RNG_TOOLS_NISTBEACON never be used for cryptographic purposes, or any use case in which random data should be known only by a single entity. +config BR2_PACKAGE_RNG_TOOLS_QRYPT + bool "Qrypt Entropy Beacon support" + select BR2_PACKAGE_JANSSON + select BR2_PACKAGE_LIBCURL + help + Enable Qrypt NIST-Beacon like entropy support. + + Entropy gathered from Qrypt server based entropy beacons. Like + NIST, it should likely not be used directly in cryptographic + operation, as the entropy may be intercepted over a network, + but can provide copius amounts of entropy for non-crypto + purposes. + endif comment "rng-tools needs a toolchain w/ NPTL" + depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL diff --git a/package/rng-tools/rng-tools.hash b/package/rng-tools/rng-tools.hash index 6806a99fc61..4c867912672 100644 --- a/package/rng-tools/rng-tools.hash +++ b/package/rng-tools/rng-tools.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4dd86f6ae37d917a8489f44070d39d7feddcc622429b95efd7aa85a1f3cfdf81 rng-tools-6.14.tar.gz +sha256 17666c4745fb635d91df293be188daf94b9e465d51d8503c0195fa3beb390894 rng-tools-6.16.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/rng-tools/rng-tools.mk b/package/rng-tools/rng-tools.mk index 8db97569d4b..3e565103e41 100644 --- a/package/rng-tools/rng-tools.mk +++ b/package/rng-tools/rng-tools.mk @@ -4,14 +4,14 @@ # ################################################################################ -RNG_TOOLS_VERSION = 6.14 +RNG_TOOLS_VERSION = 6.16 RNG_TOOLS_SITE = $(call github,nhorman,$(RNG_TOOLS_NAME),v$(RNG_TOOLS_VERSION)) RNG_TOOLS_LICENSE = GPL-2.0 RNG_TOOLS_LICENSE_FILES = COPYING RNG_TOOLS_CPE_ID_VENDOR = rng-tools_project RNG_TOOLS_SELINUX_MODULES = rngd -RNG_TOOLS_DEPENDENCIES = host-pkgconf openssl +RNG_TOOLS_DEPENDENCIES = host-pkgconf libcap openssl # From git RNG_TOOLS_AUTORECONF = YES @@ -20,8 +20,8 @@ RNG_TOOLS_CONF_OPTS = --without-pkcs11 # Work around for uClibc or musl toolchains which lack argp_*() # functions. ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y) -RNG_TOOLS_CONF_ENV += LIBS="-largp" -RNG_TOOLS_DEPENDENCIES += argp-standalone +RNG_TOOLS_CONF_ENV += LIBS="-largp $(TARGET_NLS_LIBS)" +RNG_TOOLS_DEPENDENCIES += argp-standalone $(TARGET_NLS_DEPENDENCIES) endif ifeq ($(BR2_PACKAGE_LIBRTLSDR),y) @@ -45,6 +45,13 @@ else RNG_TOOLS_CONF_OPTS += --without-nistbeacon endif +ifeq ($(BR2_PACKAGE_RNG_TOOLS_QRYPT),y) +RNG_TOOLS_DEPENDENCIES += jansson libcurl +RNG_TOOLS_CONF_OPTS += --with-qrypt +else +RNG_TOOLS_CONF_OPTS += --without-qrypt +endif + define RNG_TOOLS_INSTALL_INIT_SYSV $(INSTALL) -D -m 755 package/rng-tools/S21rngd \ $(TARGET_DIR)/etc/init.d/S21rngd diff --git a/package/rockchip-mali/Config.in b/package/rockchip-mali/Config.in index 2a8cd786be5..5a23954af32 100644 --- a/package/rockchip-mali/Config.in +++ b/package/rockchip-mali/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_ROCKCHIP_MALI bool "rockchip-mali" + depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_ARM_EABIHF || BR2_aarch64 # lidbrm. This would normally need a Config.in comment, but @@ -14,7 +15,7 @@ config BR2_PACKAGE_ROCKCHIP_MALI select BR2_PACKAGE_MALI_DRIVER if BR2_LINUX_KERNEL help Install the binary user-space libraries for the ARM Mali GPU - suitable for Rockchip platforrms. This package requires a + suitable for Rockchip platforms. This package requires a kernel with the ARM Mali GPU kernel driver enabled, as found in the 'mali-driver' package. @@ -30,3 +31,8 @@ config BR2_PACKAGE_PROVIDES_LIBGBM default "rockchip-mali" endif + +comment "rockchip-mali needs a glibc toolchain w/ C++, threads" + depends on BR2_ARM_EABIHF || BR2_aarch64 + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_USES_GLIBC || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/rockchip-mali/rockchip-mali.hash b/package/rockchip-mali/rockchip-mali.hash index 38efcb3077a..446bf9ac65e 100644 --- a/package/rockchip-mali/rockchip-mali.hash +++ b/package/rockchip-mali/rockchip-mali.hash @@ -1,2 +1,2 @@ -sha256 ee440d859e9d7dfdf29b9a00c7a633337913c407be567d3651c29c12eb75fd9c rockchip-mali-721653b5b3b525a4f80d15aa7e2f9df7b7e60427.tar.gz -sha256 a78acc73de9909efb879800d4daa4640c4aaa55cd751238a133954aba15e4285 END_USER_LICENCE_AGREEMENT.txt +sha256 ee440d859e9d7dfdf29b9a00c7a633337913c407be567d3651c29c12eb75fd9c rockchip-mali-721653b5b3b525a4f80d15aa7e2f9df7b7e60427.tar.gz +sha256 a78acc73de9909efb879800d4daa4640c4aaa55cd751238a133954aba15e4285 END_USER_LICENCE_AGREEMENT.txt diff --git a/package/rockchip-mali/rockchip-mali.mk b/package/rockchip-mali/rockchip-mali.mk index 6200191a73f..5c8e5543468 100644 --- a/package/rockchip-mali/rockchip-mali.mk +++ b/package/rockchip-mali/rockchip-mali.mk @@ -5,7 +5,7 @@ ################################################################################ ROCKCHIP_MALI_VERSION = 721653b5b3b525a4f80d15aa7e2f9df7b7e60427 -ROCKCHIP_MALI_SITE = $(call github,rockchip-linux,libmali,$(ROCKCHIP_MALI_VERSION)) +ROCKCHIP_MALI_SITE = $(call github,JeffyCN,mirrors,$(ROCKCHIP_MALI_VERSION)) ROCKCHIP_MALI_LICENSE = Proprietary ROCKCHIP_MALI_LICENSE_FILES = END_USER_LICENCE_AGREEMENT.txt ROCKCHIP_MALI_INSTALL_STAGING = YES @@ -14,7 +14,7 @@ ROCKCHIP_MALI_PROVIDES = libegl libgles libgbm ROCKCHIP_MALI_LIB = libmali-bifrost-g31-rxp0$(ROCKCHIP_MALI_SUFFIX).so ROCKCHIP_MALI_PKGCONFIG_FILES = egl gbm glesv2 mali -ROCKCHIP_MALI_ARCH_DIR = $(if $(BR2_arm),arm-linux-gnueabihf,aarch64-linux-gnu) +ROCKCHIP_MALI_ARCH_DIR = $(if $(BR2_arm)$(BR2_armeb),arm-linux-gnueabihf,aarch64-linux-gnu) ROCKCHIP_MALI_HEADERS = EGL FBDEV GLES GLES2 GLES3 KHR gbm.h # We need to create: diff --git a/package/rocksdb/rocksdb.mk b/package/rocksdb/rocksdb.mk index c355d0012db..bed0634134b 100644 --- a/package/rocksdb/rocksdb.mk +++ b/package/rocksdb/rocksdb.mk @@ -69,7 +69,7 @@ else ROCKSDB_MAKE_OPTS += ROCKSDB_DISABLE_ZSTD=1 endif -ifeq ($(BR2_GCC_ENABLE_LTO),y) +ifeq ($(BR2_ENABLE_LTO),y) ROCKSDB_MAKE_OPTS += USE_LTO=1 else ROCKSDB_MAKE_OPTS += USE_LTO=0 diff --git a/package/rp-pppoe/Config.in b/package/rp-pppoe/Config.in index 2ac81cbb2d1..6ff005a1e13 100644 --- a/package/rp-pppoe/Config.in +++ b/package/rp-pppoe/Config.in @@ -9,7 +9,7 @@ config BR2_PACKAGE_RP_PPPOE select BR2_PACKAGE_PPPD help An implementation of the Point-to-point protocol over - Ethernet. Has userspace client and server deamons. You + Ethernet. Has userspace client and server daemons. You likely only need this package if you are implementing the pppoe server that will service other pppoe client devices. Otherwise the normal client functionality already diff --git a/package/rpcbind/rpcbind.hash b/package/rpcbind/rpcbind.hash index 6ab7d892653..b5f117db54d 100644 --- a/package/rpcbind/rpcbind.hash +++ b/package/rpcbind/rpcbind.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 5613746489cae5ae23a443bb85c05a11741a5f12c8f55d2bb5e83b9defeee8de rpcbind-1.2.6.tar.bz2 -sha256 2b9477d2f4ab277b29702958f0058546edc120aae4b5fb8b8d1a9652104e1ba3 COPYING +sha256 5613746489cae5ae23a443bb85c05a11741a5f12c8f55d2bb5e83b9defeee8de rpcbind-1.2.6.tar.bz2 +sha256 2b9477d2f4ab277b29702958f0058546edc120aae4b5fb8b8d1a9652104e1ba3 COPYING diff --git a/package/rpi-firmware/Config.in b/package/rpi-firmware/Config.in index 8070dc30196..a9aeaed745c 100644 --- a/package/rpi-firmware/Config.in +++ b/package/rpi-firmware/Config.in @@ -69,6 +69,13 @@ config BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE Path to a file stored as config.txt in the boot partiton of the generated SD card image. +config BR2_PACKAGE_RPI_FIRMWARE_CMDLINE_FILE + string "Path to a file stored as boot/cmdline.txt" + default "board/raspberrypi/cmdline.txt" # legacy + help + Path to a file stored as cmdline.txt in the boot partiton + of the generated SD card image. + config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTBS bool "Install Device Tree Blobs (DTBs)" default y diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk index b46a7f52709..53d6d8ca069 100644 --- a/package/rpi-firmware/rpi-firmware.mk +++ b/package/rpi-firmware/rpi-firmware.mk @@ -35,6 +35,14 @@ define RPI_FIRMWARE_INSTALL_CONFIG endef endif +RPI_FIRMWARE_CMDLINE_FILE = $(call qstrip,$(BR2_PACKAGE_RPI_FIRMWARE_CMDLINE_FILE)) +ifneq ($(RPI_FIRMWARE_CMDLINE_FILE),) +define RPI_FIRMWARE_INSTALL_CMDLINE + $(INSTALL) -D -m 0644 $(RPI_FIRMWARE_CMDLINE_FILE) \ + $(BINARIES_DIR)/rpi-firmware/cmdline.txt +endef +endif + ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTBS),y) define RPI_FIRMWARE_INSTALL_DTB $(foreach dtb,$(wildcard $(@D)/boot/*.dtb), \ @@ -48,6 +56,8 @@ define RPI_FIRMWARE_INSTALL_DTB_OVERLAYS $(foreach ovldtb,$(wildcard $(@D)/boot/overlays/*.dtbo), \ $(INSTALL) -D -m 0644 $(ovldtb) $(BINARIES_DIR)/rpi-firmware/overlays/$(notdir $(ovldtb)) ) + $(INSTALL) -D -m 0644 $(@D)/boot/overlays/overlay_map.dtb $(BINARIES_DIR)/rpi-firmware/overlays/ + touch $(BINARIES_DIR)/rpi-firmware/overlays/README endef else # Still create the directory, so a genimage.cfg can include it independently of @@ -78,9 +88,9 @@ endef endif # INSTALL_VCDBG define RPI_FIRMWARE_INSTALL_IMAGES_CMDS - $(INSTALL) -D -m 0644 package/rpi-firmware/cmdline.txt $(BINARIES_DIR)/rpi-firmware/cmdline.txt $(RPI_FIRMWARE_INSTALL_BIN) $(RPI_FIRMWARE_INSTALL_CONFIG) + $(RPI_FIRMWARE_INSTALL_CMDLINE) $(RPI_FIRMWARE_INSTALL_DTB) $(RPI_FIRMWARE_INSTALL_DTB_OVERLAYS) endef diff --git a/package/rpi-userland/0006-interface-vcos-pthreads-CMakeLists.txt-fix-build-wit.patch b/package/rpi-userland/0006-interface-vcos-pthreads-CMakeLists.txt-fix-build-wit.patch new file mode 100644 index 00000000000..6c596395f92 --- /dev/null +++ b/package/rpi-userland/0006-interface-vcos-pthreads-CMakeLists.txt-fix-build-wit.patch @@ -0,0 +1,45 @@ +From c8270cea98bcce0d22ddc8e2f86eae2c9989efd4 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 25 Feb 2022 19:21:06 +0100 +Subject: [PATCH] interface/vcos/pthreads/CMakeLists.txt: fix build with + libexecinfo + +interface/vcos/glibc/vcos_backtrace.c uses execinfo.h which can be +provided by libexecinfo on uclibc or musl so link with it if needed to +avoid the following build failure: + +/home/peko/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: ../../build/lib/libvcos.so: undefined reference to `backtrace_symbols' + +Fixes: + - http://autobuild.buildroot.org/results/93d3b8cc2ac5dfa9d4b44946c0b4d8171e8f52a1 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/raspberrypi/userland/pull/719] +--- + interface/vcos/pthreads/CMakeLists.txt | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/interface/vcos/pthreads/CMakeLists.txt b/interface/vcos/pthreads/CMakeLists.txt +index 1d81ca3..100207f 100644 +--- a/interface/vcos/pthreads/CMakeLists.txt ++++ b/interface/vcos/pthreads/CMakeLists.txt +@@ -33,12 +33,14 @@ set (SOURCES + ../generic/vcos_generic_blockpool.c + ) + ++find_library (EXECINFO_LIBRARY execinfo) ++ + if (VCOS_PTHREADS_BUILD_SHARED) + add_library (vcos SHARED ${SOURCES}) +- target_link_libraries (vcos pthread dl rt) ++ target_link_libraries (vcos pthread dl rt $<$:${EXECINFO_LIBRARY}>) + else () + add_library (vcos ${SOURCES}) +- target_link_libraries (vcos pthread rt) ++ target_link_libraries (vcos pthread rt $<$:${EXECINFO_LIBRARY}>) + endif () + + +-- +2.35.1 + diff --git a/package/rpi-userland/0007-GLES2-gl2ext.h-add-GLint64-GLuint64-and-GLsync-typed.patch b/package/rpi-userland/0007-GLES2-gl2ext.h-add-GLint64-GLuint64-and-GLsync-typed.patch new file mode 100644 index 00000000000..6dca2e7b8ab --- /dev/null +++ b/package/rpi-userland/0007-GLES2-gl2ext.h-add-GLint64-GLuint64-and-GLsync-typed.patch @@ -0,0 +1,99 @@ +From ffb8eafe2d745ddf2f44101ffc4e6599ed096e69 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Mon, 10 May 2021 19:15:48 +0200 +Subject: [PATCH] GLES2/gl2ext.h: add GLint64, GLuint64 and GLsync typedefs +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes: + +.../host/arm-linucleus-linux-gnueabihf/sysroot/usr/include/gstreamer-1.0/gst/gl/glprototypes/gstgl_compat.h:40:18: error: conflicting declaration ‘typedef void* GLsync’ + 40 | typedef gpointer GLsync; + | ^~~~~~ + +.../host/arm-linucleus-linux-gnueabihf/sysroot/usr/include/qt5/QtGui/qopengles2ext.h:24:26: note: previous declaration as ‘typedef struct __GLsync* GLsync’ + 24 | typedef struct __GLsync *GLsync; + | ^~~~~~ + +File gstgl_compat.h: + + 39 #if !GST_GL_HAVE_GLSYNC + 40 typedef gpointer GLsync; + 41 #endif + +File qopengles2ext.h: + + 1 #ifndef __gles2_gl2ext_h_ + 2 #define __gles2_gl2ext_h_ 1 + 3 + 4 #if 0 + 5 #pragma qt_no_master_include + 6 #pragma qt_sync_skip_header_check + 7 #pragma qt_sync_stop_processing + 8 #endif + 9 + 10 #ifdef __cplusplus + 11 extern "C" { + 12 #endif + 13 + 14 #ifndef __gl3_h_ + 15 /* These types are defined with reference to + 16 * in the Apple extension spec, but here we use the Khronos + 17 * portable types in khrplatform.h, and assume those types + 18 * are always defined. + 19 * If any other extensions using these types are defined, + 20 * the typedefs must move out of this block and be shared. + 21 */ + 22 typedef khronos_int64_t GLint64; + 23 typedef khronos_uint64_t GLuint64; + 24 typedef struct __GLsync *GLsync; + 25 #endif + +The problem is that rpi-userland doesn't define GLsync, and both +GStreamer and Qt have their own definition of GLsync in this case, but +they are not the same. + +We reported this issue to: + + * rpi-userland, to get the headers updated: + https://github.com/raspberrypi/userland/issues/469#issuecomment-1193864294 + + * gstreamer, to get their bogus definition of GLsync fixed: + https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/issues/973 + +In the mean time, fix this by adding the missing definitions to +rpi-userland, so that GStreamer and Qt don't try to provide their own. + +Signed-off-by: Peter Seiderer +--- + interface/khronos/include/GLES2/gl2ext.h | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +diff --git a/interface/khronos/include/GLES2/gl2ext.h b/interface/khronos/include/GLES2/gl2ext.h +index 4eacf7f..96e87ec 100644 +--- a/interface/khronos/include/GLES2/gl2ext.h ++++ b/interface/khronos/include/GLES2/gl2ext.h +@@ -33,6 +33,19 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + extern "C" { + #endif + ++#ifndef __gl3_h_ ++/* These types are defined with reference to ++ * in the Apple extension spec, but here we use the Khronos ++ * portable types in khrplatform.h, and assume those types ++ * are always defined. ++ * If any other extensions using these types are defined, ++ * the typedefs must move out of this block and be shared. ++ */ ++typedef khronos_int64_t GLint64; ++typedef khronos_uint64_t GLuint64; ++typedef struct __GLsync *GLsync; ++#endif ++ + /* We want this */ + #ifndef GL_GLEXT_PROTOTYPES + #define GL_GLEXT_PROTOTYPES +-- +2.31.1 + diff --git a/package/rpi-userland/Config.in b/package/rpi-userland/Config.in index 342faf26e36..4219bdb9c41 100644 --- a/package/rpi-userland/Config.in +++ b/package/rpi-userland/Config.in @@ -1,13 +1,13 @@ config BR2_PACKAGE_RPI_USERLAND bool "rpi-userland" - depends on BR2_arm + depends on BR2_arm || BR2_aarch64 depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_HAS_LIBEGL - select BR2_PACKAGE_HAS_LIBGLES - select BR2_PACKAGE_HAS_LIBOPENVG - select BR2_PACKAGE_HAS_LIBOPENMAX + select BR2_PACKAGE_HAS_LIBEGL if BR2_arm + select BR2_PACKAGE_HAS_LIBGLES if BR2_arm + select BR2_PACKAGE_HAS_LIBOPENVG if BR2_arm + select BR2_PACKAGE_HAS_LIBOPENMAX if BR2_arm help Raspberry Pi Userland contains the necessary library to use the VideoCore driver. @@ -18,7 +18,7 @@ config BR2_PACKAGE_RPI_USERLAND https://github.com/raspberrypi/userland/ -if BR2_PACKAGE_RPI_USERLAND +if BR2_PACKAGE_RPI_USERLAND && BR2_arm config BR2_PACKAGE_PROVIDES_LIBEGL default "rpi-userland" @@ -40,6 +40,6 @@ config BR2_PACKAGE_RPI_USERLAND_HELLO endif comment "rpi-userland needs a toolchain w/ C++, threads, dynamic library" - depends on BR2_arm + depends on BR2_arm || BR2_aarch64 depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ BR2_STATIC_LIBS diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk index 84050b6df3b..cb08945156c 100644 --- a/package/rpi-userland/rpi-userland.mk +++ b/package/rpi-userland/rpi-userland.mk @@ -11,7 +11,17 @@ RPI_USERLAND_LICENSE_FILES = LICENCE RPI_USERLAND_INSTALL_STAGING = YES RPI_USERLAND_CONF_OPTS = -DVMCS_INSTALL_PREFIX=/usr +ifeq ($(BR2_arm),y) RPI_USERLAND_PROVIDES = libegl libgles libopenmax libopenvg +endif + +ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) +RPI_USERLAND_DEPENDENCIES += libexecinfo +endif + +ifeq ($(BR2_aarch64),y) +RPI_USERLAND_CONF_OPTS += -DARM64=ON +endif ifeq ($(BR2_PACKAGE_RPI_USERLAND_HELLO),y) @@ -21,6 +31,9 @@ define RPI_USERLAND_EXTRA_LIBS_TARGET $(INSTALL) -m 0644 -D \ $(@D)/build/lib/libilclient.so \ $(TARGET_DIR)/usr/lib/libilclient.so + $(INSTALL) -m 0644 -D \ + $(@D)/build/lib/librevision.so \ + $(TARGET_DIR)/usr/lib/librevision.so endef RPI_USERLAND_POST_INSTALL_TARGET_HOOKS += RPI_USERLAND_EXTRA_LIBS_TARGET @@ -28,6 +41,9 @@ define RPI_USERLAND_EXTRA_LIBS_STAGING $(INSTALL) -m 0644 -D \ $(@D)/build/lib/libilclient.so \ $(STAGING_DIR)/usr/lib/libilclient.so + $(INSTALL) -m 0644 -D \ + $(@D)/build/lib/librevision.so \ + $(STAGING_DIR)/usr/lib/librevision.so endef RPI_USERLAND_POST_INSTALL_STAGING_HOOKS += RPI_USERLAND_EXTRA_LIBS_STAGING diff --git a/package/rpm/0001-fix-var-declare-in-label-error.patch b/package/rpm/0001-fix-var-declare-in-label-error.patch new file mode 100644 index 00000000000..648040c6630 --- /dev/null +++ b/package/rpm/0001-fix-var-declare-in-label-error.patch @@ -0,0 +1,40 @@ +From b960c0b43a080287a7c13533eeb2d9f288db1414 Mon Sep 17 00:00:00 2001 +From: Florian Festi +Date: Thu, 16 Mar 2023 19:05:04 +0100 +Subject: [PATCH] Fix compiler error on clang + +Turns out variable declarations are not allowed after a label, even in +C99. And while some compilers don't seem to care others do. + +Moving the declaration of mayopen to the start of the function to avoid +this problem. + +Resolves: #2435 + +Upstream: b960c0b43a080287a7c13533eeb2d9f288db1414 +Signed-off-by: James Knight +--- + lib/fsm.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/lib/fsm.c b/lib/fsm.c +index 5671ac642d..183293edb0 100644 +--- a/lib/fsm.c ++++ b/lib/fsm.c +@@ -879,6 +879,7 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files, + int nodigest = (rpmtsFlags(ts) & RPMTRANS_FLAG_NOFILEDIGEST) ? 1 : 0; + int nofcaps = (rpmtsFlags(ts) & RPMTRANS_FLAG_NOCAPS) ? 1 : 0; + int firstlinkfile = -1; ++ int mayopen = 0; + char *tid = NULL; + struct filedata_s *fdata = xcalloc(fc, sizeof(*fdata)); + struct filedata_s *firstlink = NULL; +@@ -1016,7 +1017,7 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files, + + setmeta: + /* Special files require path-based ops */ +- int mayopen = S_ISREG(fp->sb.st_mode) || S_ISDIR(fp->sb.st_mode); ++ mayopen = S_ISREG(fp->sb.st_mode) || S_ISDIR(fp->sb.st_mode); + if (!rc && fd == -1 && mayopen) { + int flags = O_RDONLY; + /* Only follow safe symlinks, and never on temporary files */ diff --git a/package/rpm/rpm.hash b/package/rpm/rpm.hash index 19b6dd91763..fd03f062bc7 100644 --- a/package/rpm/rpm.hash +++ b/package/rpm/rpm.hash @@ -1,5 +1,5 @@ -# From https://rpm.org/wiki/Releases/4.17.0.html -sha256 2e0d220b24749b17810ed181ac1ed005a56bbb6bc8ac429c21f314068dc65e6a rpm-4.17.0.tar.bz2 +# From https://rpm.org/wiki/Releases/4.18.1.html +sha256 37f3b42c0966941e2ad3f10fde3639824a6591d07197ba8fd0869ca0779e1f56 rpm-4.18.1.tar.bz2 # Hash for license file sha256 171d94d9f1641316bff7f157a903237dc69cdb5fca405fed8c832c76ed8370f9 COPYING diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk index 5c04d47f102..2b289fcc9f8 100644 --- a/package/rpm/rpm.mk +++ b/package/rpm/rpm.mk @@ -4,8 +4,8 @@ # ################################################################################ -RPM_VERSION_MAJOR = 4.17 -RPM_VERSION = $(RPM_VERSION_MAJOR).0 +RPM_VERSION_MAJOR = 4.18 +RPM_VERSION = $(RPM_VERSION_MAJOR).1 RPM_SOURCE = rpm-$(RPM_VERSION).tar.bz2 RPM_SITE = http://ftp.rpm.org/releases/rpm-$(RPM_VERSION_MAJOR).x RPM_DEPENDENCIES = \ @@ -29,7 +29,10 @@ RPM_SELINUX_MODULES = rpm RPM_CONF_OPTS = \ --disable-python \ --disable-rpath \ - --with-gnu-ld + --with-gnu-ld \ + --without-fapolicyd \ + --without-fsverity \ + --without-imaevm ifeq ($(BR2_PACKAGE_ACL),y) RPM_DEPENDENCIES += acl @@ -104,7 +107,6 @@ endif # ac_cv_prog_cc_c99: RPM uses non-standard GCC extensions (ex. `asm`). RPM_CONF_ENV = \ ac_cv_prog_cc_c99='-std=gnu99' \ - CFLAGS="$(TARGET_CFLAGS) $(RPM_CFLAGS)" \ LIBS=$(TARGET_NLS_LIBS) $(eval $(autotools-package)) diff --git a/package/rrdtool/rrdtool.hash b/package/rrdtool/rrdtool.hash index 6418c25a5cd..5266e5b7a1a 100644 --- a/package/rrdtool/rrdtool.hash +++ b/package/rrdtool/rrdtool.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 a199faeb7eff7cafc46fac253e682d833d08932f3db93a550a4a5af180ca58db rrdtool-1.7.2.tar.gz -sha256 ab6b4646e9e01f1ec287c29c351c886c4cb7f945c11efc0a1be9f6e5e6cc5320 COPYRIGHT -sha256 d8c320ffc0030d1b096ae4732b50d2b811cf95e9a9b7377c1127b2563e0a0388 LICENSE +sha256 a199faeb7eff7cafc46fac253e682d833d08932f3db93a550a4a5af180ca58db rrdtool-1.7.2.tar.gz +sha256 ab6b4646e9e01f1ec287c29c351c886c4cb7f945c11efc0a1be9f6e5e6cc5320 COPYRIGHT +sha256 d8c320ffc0030d1b096ae4732b50d2b811cf95e9a9b7377c1127b2563e0a0388 LICENSE diff --git a/package/rs485conf/rs485conf.hash b/package/rs485conf/rs485conf.hash index 315f90a3751..d2fc1916738 100644 --- a/package/rs485conf/rs485conf.hash +++ b/package/rs485conf/rs485conf.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f163f81cd50aae6fa39cbb4f6408a3699da7a87a56649c4b96d6f168c9be6a7d rs485conf-5c8d00cf70950fab3454549b81dea843d844492a.tar.gz -sha256 3e5c80d50879a9572ac9e463215a942490a67b56dfd8a3e27004d7c62e0493c8 LICENSE +sha256 f163f81cd50aae6fa39cbb4f6408a3699da7a87a56649c4b96d6f168c9be6a7d rs485conf-5c8d00cf70950fab3454549b81dea843d844492a.tar.gz +sha256 3e5c80d50879a9572ac9e463215a942490a67b56dfd8a3e27004d7c62e0493c8 LICENSE diff --git a/package/rsync/0001-rsync-ssl-Verify-the-hostname-in-the-certificate-when-using-openssl.patch b/package/rsync/0001-rsync-ssl-Verify-the-hostname-in-the-certificate-when-using-openssl.patch deleted file mode 100644 index 13edeff9448..00000000000 --- a/package/rsync/0001-rsync-ssl-Verify-the-hostname-in-the-certificate-when-using-openssl.patch +++ /dev/null @@ -1,29 +0,0 @@ -From c3f7414c450faaf6a8281cc4a4403529aeb7d859 Mon Sep 17 00:00:00 2001 -From: Matt McCutchen -Date: Wed, 26 Aug 2020 12:16:08 -0400 -Subject: [PATCH] rsync-ssl: Verify the hostname in the certificate when using - openssl. - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://git.samba.org/?p=rsync.git;a=commitdiff;h=c3f7414c450faaf6a8281cc4a4403529aeb7d859] ---- - rsync-ssl | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/rsync-ssl b/rsync-ssl -index 8101975a..46701af1 100755 ---- a/rsync-ssl -+++ b/rsync-ssl -@@ -129,7 +129,7 @@ function rsync_ssl_helper { - fi - - if [[ $RSYNC_SSL_TYPE == openssl ]]; then -- exec $RSYNC_SSL_OPENSSL s_client $caopt $certopt -quiet -verify_quiet -servername $hostname -connect $hostname:$port -+ exec $RSYNC_SSL_OPENSSL s_client $caopt $certopt -quiet -verify_quiet -servername $hostname -verify_hostname $hostname -connect $hostname:$port - elif [[ $RSYNC_SSL_TYPE == gnutls ]]; then - exec $RSYNC_SSL_GNUTLS --logfile=/dev/null $gnutls_cert_opt $gnutls_opts $hostname:$port - else --- -2.25.1 - diff --git a/package/rsync/Config.in b/package/rsync/Config.in index b952974efbc..b572c701ec6 100644 --- a/package/rsync/Config.in +++ b/package/rsync/Config.in @@ -7,4 +7,4 @@ config BR2_PACKAGE_RSYNC help File transfer program to keep remote files in sync. - http://rsync.samba.org/ + https://rsync.samba.org/ diff --git a/package/rsync/rsync.hash b/package/rsync/rsync.hash index 92f6156ba84..842b5c099f4 100644 --- a/package/rsync/rsync.hash +++ b/package/rsync/rsync.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://download.samba.org/pub/rsync/src/rsync-3.2.3.tar.gz.asc -sha256 becc3c504ceea499f4167a260040ccf4d9f2ef9499ad5683c179a697146ce50e rsync-3.2.3.tar.gz +# https://rsync.samba.org/ftp/rsync/src/rsync-3.2.7.tar.gz.asc +sha256 4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb rsync-3.2.7.tar.gz # Locally calculated -sha256 0d33aa97d302cb9df27f99dfa28d58001c2479a02317956f1a7a890f3937a976 COPYING +sha256 85c19ea50a224c2d0067a69c083584e5717b40b76610ec1218f91385775067dd COPYING diff --git a/package/rsync/rsync.mk b/package/rsync/rsync.mk index 5b51ca1df79..3fd2ef257ea 100644 --- a/package/rsync/rsync.mk +++ b/package/rsync/rsync.mk @@ -4,25 +4,25 @@ # ################################################################################ -RSYNC_VERSION = 3.2.3 -RSYNC_SITE = http://rsync.samba.org/ftp/rsync/src +RSYNC_VERSION = 3.2.7 +RSYNC_SITE = https://rsync.samba.org/ftp/rsync/src RSYNC_LICENSE = GPL-3.0+ with exceptions RSYNC_LICENSE_FILES = COPYING RSYNC_CPE_ID_VENDOR = samba RSYNC_SELINUX_MODULES = rsync RSYNC_DEPENDENCIES = zlib popt +# We know that our C library is modern enough for C99 vsnprintf(). Since +# configure can't detect this, we tell configure that vsnprintf() is safe. +RSYNC_CONF_ENV = rsync_cv_HAVE_C99_VSNPRINTF=yes RSYNC_CONF_OPTS = \ --with-included-zlib=no \ --with-included-popt=no \ - --disable-simd \ - --disable-openssl \ - --disable-xxhash \ - --disable-zstd \ - --disable-lz4 \ - --disable-asm + --disable-roll-simd \ + --disable-md5-asm -# 0001-rsync-ssl-Verify-the-hostname-in-the-certificate-when-using-openssl.patch -RSYNC_IGNORE_CVES += CVE-2020-14387 +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +RSYNC_CONF_ENV += LIBS=-latomic +endif ifeq ($(BR2_PACKAGE_ACL),y) RSYNC_DEPENDENCIES += acl @@ -30,4 +30,32 @@ else RSYNC_CONF_OPTS += --disable-acl-support endif +ifeq ($(BR2_PACKAGE_LZ4),y) +RSYNC_DEPENDENCIES += lz4 +RSYNC_CONF_OPTS += --enable-lz4 +else +RSYNC_CONF_OPTS += --disable-lz4 +endif + +ifeq ($(BR2_PACKAGE_OPENSSL),y) +RSYNC_DEPENDENCIES += openssl +RSYNC_CONF_OPTS += --enable-openssl +else +RSYNC_CONF_OPTS += --disable-openssl +endif + +ifeq ($(BR2_PACKAGE_XXHASH),y) +RSYNC_DEPENDENCIES += xxhash +RSYNC_CONF_OPTS += --enable-xxhash +else +RSYNC_CONF_OPTS += --disable-xxhash +endif + +ifeq ($(BR2_PACKAGE_ZSTD),y) +RSYNC_DEPENDENCIES += zstd +RSYNC_CONF_OPTS += --enable-zstd +else +RSYNC_CONF_OPTS += --disable-zstd +endif + $(eval $(autotools-package)) diff --git a/package/rsyslog/Config.in b/package/rsyslog/Config.in index 8c024e69c77..3ba326191a2 100644 --- a/package/rsyslog/Config.in +++ b/package/rsyslog/Config.in @@ -8,6 +8,7 @@ config BR2_PACKAGE_RSYSLOG # even though rsyslog already depends on threads for itself: depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_THREADS depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS + select BR2_PACKAGE_APR_UTIL if BR2_PACKAGE_CIVETWEB_LIB select BR2_PACKAGE_ZLIB select BR2_PACKAGE_LIBESTR select BR2_PACKAGE_LIBLOGGING diff --git a/package/rsyslog/rsyslog.hash b/package/rsyslog/rsyslog.hash index f4040984396..4049590bb85 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 19b232f765c4ba7a35b91ef1f5f9af775f6ff78ef56bb7737a2ce79ccbb32b98 rsyslog-8.2010.0.tar.gz +sha256 a6d731e46ad3d64f6ad4b19bbf1bf56ca4760a44a24bb96823189dc2e71f7028 rsyslog-8.2204.1.tar.gz # Locally calculated sha256 054b3a047d9232376a46b87356b19b0c0c2924cb5e6911ab96a01fc4b515f083 COPYING diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk index afd1a5557ec..84fd2d2e5e5 100644 --- a/package/rsyslog/rsyslog.mk +++ b/package/rsyslog/rsyslog.mk @@ -4,7 +4,7 @@ # ################################################################################ -RSYSLOG_VERSION = 8.2010.0 +RSYSLOG_VERSION = 8.2204.1 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 @@ -53,12 +53,19 @@ RSYSLOG_CONF_OPTS += \ endif ifeq ($(BR2_PACKAGE_CIVETWEB_LIB),y) -RSYSLOG_DEPENDENCIES += civetweb +RSYSLOG_DEPENDENCIES += apr-util civetweb RSYSLOG_CONF_OPTS += --enable-imhttp else RSYSLOG_CONF_OPTS += --disable-imhttp endif +ifeq ($(BR2_PACKAGE_CZMQ),y) +RSYSLOG_DEPENDENCIES += czmq +RSYSLOG_CONF_OPTS += --enable-imczmq --enable-omczmq +else +RSYSLOG_CONF_OPTS += --disable-imczmq --disable-omczmq +endif + ifeq ($(BR2_PACKAGE_GNUTLS),y) RSYSLOG_DEPENDENCIES += gnutls RSYSLOG_CONF_OPTS += --enable-gnutls @@ -66,8 +73,11 @@ else RSYSLOG_CONF_OPTS += --disable-gnutls endif -ifeq ($(BR2_PACKAGE_LIBEE),y) -RSYSLOG_DEPENDENCIES += libee +ifeq ($(BR2_PACKAGE_HIREDIS),y) +RSYSLOG_DEPENDENCIES += hiredis +RSYSLOG_CONF_OPTS += --enable-omhiredis +else +RSYSLOG_CONF_OPTS += --disable-omhiredis endif ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) @@ -78,6 +88,13 @@ else RSYSLOG_CONF_OPTS += --disable-libgcrypt endif +ifeq ($(BR2_PACKAGE_LIBMAXMINDDB),y) +RSYSLOG_DEPENDENCIES += libmaxminddb +RSYSLOG_CONF_OPTS += --enable-mmdblookup +else +RSYSLOG_CONF_OPTS += --disable-mmdblookup +endif + ifeq ($(BR2_PACKAGE_LIBPCAP),y) RSYSLOG_DEPENDENCIES += libpcap RSYSLOG_CONF_OPTS += --enable-impcap @@ -101,6 +118,20 @@ else RSYSLOG_CONF_OPTS += --disable-pgsql endif +ifeq ($(BR2_PACKAGE_QPID_PROTON),y) +RSYSLOG_DEPENDENCIES += qpid-proton +RSYSLOG_CONF_OPTS += --enable-omamqp1 +else +RSYSLOG_CONF_OPTS += --disable-omamqp1 +endif + +ifeq ($(BR2_PACKAGE_RABBITMQ_C),y) +RSYSLOG_DEPENDENCIES += rabbitmq-c +RSYSLOG_CONF_OPTS += --enable-omrabbitmq +else +RSYSLOG_CONF_OPTS += --disable-omrabbitmq +endif + ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) RSYSLOG_DEPENDENCIES += util-linux RSYSLOG_CONF_OPTS += --enable-uuid @@ -121,7 +152,7 @@ RSYSLOG_CONF_OPTS += \ endif define RSYSLOG_INSTALL_INIT_SYSTEMD - $(INSTALL) -m 0755 -D package/rsyslog/rsyslog.service \ + $(INSTALL) -m 0644 -D package/rsyslog/rsyslog.service \ $(TARGET_DIR)/usr/lib/systemd/system/rsyslog.service endef diff --git a/package/rt-tests/Config.in b/package/rt-tests/Config.in index 47fa7cd8407..ccfa040d701 100644 --- a/package/rt-tests/Config.in +++ b/package/rt-tests/Config.in @@ -1,5 +1,7 @@ config BR2_PACKAGE_RT_TESTS bool "rt-tests" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # __sync_*_4 intrisics + depends on BR2_TOOLCHAIN_HAS_ATOMIC # numactl depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_5 depends on BR2_USE_MMU # fork(), numactl @@ -30,6 +32,8 @@ comment "rt-tests may not work on MIPS with an external uClibc toolchain" depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el comment "rt-tests needs a uClibc or glibc toolchain w/ NPTL, headers >= 4.5, dynamic library" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS \ || BR2_TOOLCHAIN_USES_MUSL || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_5 depends on BR2_USE_MMU diff --git a/package/rt-tests/rt-tests.hash b/package/rt-tests/rt-tests.hash index 4f84e0d0cad..49df8313f9f 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 b5e7959bcb5c703b2743030751af975ea4e04962e29fc1118f4b605987585735 rt-tests-2.3.tar.xz +sha256 393457f0c91cce57e82b876ecb9b672871f898e6cecafc751548079512bcc808 rt-tests-2.4.tar.xz # locally computed hash -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/rt-tests/rt-tests.mk b/package/rt-tests/rt-tests.mk index 056a4a6723f..74290211ce3 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 RT_TESTS_SOURCE = rt-tests-$(RT_TESTS_VERSION).tar.xz -RT_TESTS_VERSION = 2.3 +RT_TESTS_VERSION = 2.4 RT_TESTS_LICENSE = GPL-2.0+ RT_TESTS_LICENSE_FILES = COPYING diff --git a/package/rtai/rtai.hash b/package/rtai/rtai.hash index f0afafbd7c5..f2eb7f33ade 100644 --- a/package/rtai/rtai.hash +++ b/package/rtai/rtai.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 13669da744a0ba411bdb8e47fa47b6e19171646ae42c8dbb2735d12e555fb1a3 rtai-4.0.1.tar.bz2 +sha256 57acd3ad46cc8f1e01dc21089a24587c59e7328cbac06abb62bb0152de0b9df7 rtai-5.3.tar.bz2 diff --git a/package/rtai/rtai.mk b/package/rtai/rtai.mk index 90f2cc4c8dc..6b309ebf85e 100644 --- a/package/rtai/rtai.mk +++ b/package/rtai/rtai.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTAI_VERSION = 4.0.1 +RTAI_VERSION = 5.3 RTAI_SOURCE = rtai-$(RTAI_VERSION).tar.bz2 RTAI_SITE = https://www.rtai.org/userfiles/downloads/RTAI RTAI_INSTALL_STAGING = YES diff --git a/package/rtc-tools/rtc-tools.mk b/package/rtc-tools/rtc-tools.mk index 2ef850a81f6..2882c88575d 100644 --- a/package/rtc-tools/rtc-tools.mk +++ b/package/rtc-tools/rtc-tools.mk @@ -5,7 +5,8 @@ ################################################################################ RTC_TOOLS_VERSION = 33ef4aa1c92b0c92a351284d93d1ac5570de9cc7 -RTC_TOOLS_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/rtc-tools.git +RTC_TOOLS_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/abelloni/rtc-tools.git +RTC_TOOLS_SITE_METHOD = git RTC_TOOLS_LICENSE = GPL-2.0 RTC_TOOLS_LICENSE_FILES = COPYING diff --git a/package/rtl8188eu/Config.in b/package/rtl8188eu/Config.in index 9263802e09a..76d90852976 100644 --- a/package/rtl8188eu/Config.in +++ b/package/rtl8188eu/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_RTL8188EU bool "rtl8188eu" + depends on !BR2_s390x depends on BR2_LINUX_KERNEL help A standalone driver for the RTL8188EU USB Wi-Fi adapter. @@ -16,4 +17,5 @@ config BR2_PACKAGE_RTL8188EU https://github.com/lwfinger/rtl8188eu comment "rtl8188eu needs a Linux kernel to be built" + depends on !BR2_s390x depends on !BR2_LINUX_KERNEL diff --git a/package/rtl8188eu/rtl8188eu.hash b/package/rtl8188eu/rtl8188eu.hash index 37767f5d160..29ce0e32c28 100644 --- a/package/rtl8188eu/rtl8188eu.hash +++ b/package/rtl8188eu/rtl8188eu.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b2b06c842bccd730d68a26b1c1b5a24f18373401e907147bf5e775fa42a36bbb rtl8188eu-60cb0b5a3cfc95e3f2e6fc294a28d987096b0559.tar.gz +sha256 c573529862861a7a75534a4f2bc34ba7e3b116125298b5bc0d432b3065bd7df6 rtl8188eu-f4af53305cb1e9a0d8d9957a042f7c01b7121bfc.tar.gz sha256 af8067302947c01fd9eee72befa54c7e3ef8a48fecde7fd71277f2290b2bf0f7 COPYING diff --git a/package/rtl8188eu/rtl8188eu.mk b/package/rtl8188eu/rtl8188eu.mk index b2066080f31..3698115d3c7 100644 --- a/package/rtl8188eu/rtl8188eu.mk +++ b/package/rtl8188eu/rtl8188eu.mk @@ -4,12 +4,20 @@ # ################################################################################ -RTL8188EU_VERSION = 60cb0b5a3cfc95e3f2e6fc294a28d987096b0559 +RTL8188EU_VERSION = f4af53305cb1e9a0d8d9957a042f7c01b7121bfc RTL8188EU_SITE = $(call github,lwfinger,rtl8188eu,$(RTL8188EU_VERSION)) RTL8188EU_LICENSE = GPL-2.0, proprietary (rtl8188eufw.bin firmware blob) RTL8188EU_LICENSE_FILES = COPYING RTL8188EU_MODULE_MAKE_OPTS = CONFIG_RTL8188EU=m +define RTL8188EU_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) +endef + define RTL8188EU_INSTALL_FIRMWARE $(INSTALL) -D -m 644 $(@D)/rtl8188eufw.bin \ $(TARGET_DIR)/lib/firmware/rtlwifi/rtl8188eufw.bin diff --git a/package/rtl8189es/0001-Fix-build-failure-on-PowerPC64.patch b/package/rtl8189es/0001-Fix-build-failure-on-PowerPC64.patch new file mode 100644 index 00000000000..8c876f16ee4 --- /dev/null +++ b/package/rtl8189es/0001-Fix-build-failure-on-PowerPC64.patch @@ -0,0 +1,113 @@ +From c7bf7590bc0d7252005fd0496898ad420a85e1ae Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Mon, 27 Feb 2023 09:12:39 +0100 +Subject: [PATCH] Fix build failure on PowerPC64 + +get_ra() is defined in Linux kernel for PowerPC64 architecture and it +conflicts with local get_ra() definition so let's rename local definition +as rtl_get_ra(). + +Signed-off-by: Giulio Benetti +--- + core/rtw_odm.c | 6 +++--- + core/rtw_recv.c | 4 ++-- + hal/hal_com.c | 2 +- + include/wifi.h | 2 +- + os_dep/linux/ioctl_cfg80211.c | 2 +- + 5 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/core/rtw_odm.c b/core/rtw_odm.c +index 8a35816..d74e134 100644 +--- a/core/rtw_odm.c ++++ b/core/rtw_odm.c +@@ -273,7 +273,7 @@ void rtw_odm_parse_rx_phy_status_chinfo(union recv_frame *rframe, u8 *phys) + RTW_PRINT("phys_t%u ta="MAC_FMT" %s, %s(band:%u, ch:%u, l_rxsc:%u)\n" + , *phys & 0xf + , MAC_ARG(get_ta(wlanhdr)) +- , is_broadcast_mac_addr(get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(get_ra(wlanhdr)) ? "MC" : "UC" ++ , is_broadcast_mac_addr(rtl_get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(rtl_get_ra(wlanhdr)) ? "MC" : "UC" + , HDATA_RATE(attrib->data_rate) + , phys_t0->band, phys_t0->channel, phys_t0->rxsc + ); +@@ -383,7 +383,7 @@ type1_end: + RTW_PRINT("phys_t%u ta="MAC_FMT" %s, %s(band:%u, ch:%u, rf_mode:%u, l_rxsc:%u, ht_rxsc:%u) => %u,%u\n" + , *phys & 0xf + , MAC_ARG(get_ta(wlanhdr)) +- , is_broadcast_mac_addr(get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(get_ra(wlanhdr)) ? "MC" : "UC" ++ , is_broadcast_mac_addr(rtl_get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(rtl_get_ra(wlanhdr)) ? "MC" : "UC" + , HDATA_RATE(attrib->data_rate) + , phys_t1->band, phys_t1->channel, phys_t1->rf_mode, phys_t1->l_rxsc, phys_t1->ht_rxsc + , pkt_cch, pkt_bw +@@ -401,7 +401,7 @@ type1_end: + RTW_PRINT("phys_t%u ta="MAC_FMT" %s, %s(band:%u, ch:%u, l_rxsc:%u, ht_rxsc:%u)\n" + , *phys & 0xf + , MAC_ARG(get_ta(wlanhdr)) +- , is_broadcast_mac_addr(get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(get_ra(wlanhdr)) ? "MC" : "UC" ++ , is_broadcast_mac_addr(rtl_get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(rtl_get_ra(wlanhdr)) ? "MC" : "UC" + , HDATA_RATE(attrib->data_rate) + , phys_t2->band, phys_t2->channel, phys_t2->l_rxsc, phys_t2->ht_rxsc + ); +diff --git a/core/rtw_recv.c b/core/rtw_recv.c +index dc65adf..a5a65f9 100644 +--- a/core/rtw_recv.c ++++ b/core/rtw_recv.c +@@ -4678,7 +4678,7 @@ void rx_query_phy_status( + wlanhdr = get_recvframe_data(precvframe); + + ta = get_ta(wlanhdr); +- ra = get_ra(wlanhdr); ++ ra = rtl_get_ra(wlanhdr); + is_ra_bmc = IS_MCAST(ra); + + if (_rtw_memcmp(adapter_mac_addr(padapter), ta, ETH_ALEN) == _TRUE) { +@@ -4818,7 +4818,7 @@ s32 pre_recv_entry(union recv_frame *precvframe, u8 *pphy_status) + { + s32 ret = _SUCCESS; + u8 *pbuf = precvframe->u.hdr.rx_data; +- u8 *pda = get_ra(pbuf); ++ u8 *pda = rtl_get_ra(pbuf); + u8 ra_is_bmc = IS_MCAST(pda); + _adapter *primary_padapter = precvframe->u.hdr.adapter; + #ifdef CONFIG_CONCURRENT_MODE +diff --git a/hal/hal_com.c b/hal/hal_com.c +index c28ae39..27b0825 100644 +--- a/hal/hal_com.c ++++ b/hal/hal_com.c +@@ -13406,7 +13406,7 @@ void rtw_store_phy_info(_adapter *padapter, union recv_frame *prframe) + + /*RTW_INFO("=>%s WIFI_DATA_TYPE or WIFI_QOS_DATA_TYPE\n", __FUNCTION__);*/ + if (psta) { +- if (IS_MCAST(get_ra(get_recvframe_data(prframe)))) ++ if (IS_MCAST(rtl_get_ra(get_recvframe_data(prframe)))) + psta_dframe_info = &psta->sta_dframe_info_bmc; + else + psta_dframe_info = &psta->sta_dframe_info; +diff --git a/include/wifi.h b/include/wifi.h +index def77a4..c2e7afb 100644 +--- a/include/wifi.h ++++ b/include/wifi.h +@@ -456,7 +456,7 @@ __inline static int IS_MCAST(const u8 *da) + return _FALSE; + } + +-__inline static unsigned char *get_ra(unsigned char *pframe) ++__inline static unsigned char *rtl_get_ra(unsigned char *pframe) + { + unsigned char *ra; + ra = GetAddr1Ptr(pframe); +diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c +index 4e810e5..e744d69 100644 +--- a/os_dep/linux/ioctl_cfg80211.c ++++ b/os_dep/linux/ioctl_cfg80211.c +@@ -6347,7 +6347,7 @@ void rtw_cfg80211_rx_p2p_action_public(_adapter *adapter, union recv_frame *rfra + indicate: + #endif + #if defined(RTW_DEDICATED_P2P_DEVICE) +- if (rtw_cfg80211_redirect_pd_wdev(dvobj_to_wiphy(dvobj), get_ra(frame), &wdev)) ++ if (rtw_cfg80211_redirect_pd_wdev(dvobj_to_wiphy(dvobj), rtl_get_ra(frame), &wdev)) + if (0) + RTW_INFO("redirect to pd_wdev:%p\n", wdev); + #endif +-- +2.34.1 + diff --git a/package/rtl8189es/Config.in b/package/rtl8189es/Config.in index 2e3474e5e1d..11dd225436f 100644 --- a/package/rtl8189es/Config.in +++ b/package/rtl8189es/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_RTL8189ES bool "rtl8189es" + depends on !BR2_s390x depends on BR2_LINUX_KERNEL help Wireless driver rtl8189es. @@ -7,4 +8,5 @@ config BR2_PACKAGE_RTL8189ES https://github.com/jwrdegoede/rtl8189ES_linux.git comment "rtl8189es needs a Linux kernel to be built" + depends on !BR2_s390x depends on !BR2_LINUX_KERNEL diff --git a/package/rtl8189es/rtl8189es.hash b/package/rtl8189es/rtl8189es.hash index 624c51ac0df..44d73e60f09 100644 --- a/package/rtl8189es/rtl8189es.hash +++ b/package/rtl8189es/rtl8189es.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 bf972b6494844c66885dc6846228994fac6075477cf9a7122ffd521e25ac791c rtl8189es-2c8d44ae26485052f39d933a3a132b3ff395803a.tar.gz +sha256 96347dbfedd95a217fb89b7b295fe417b711dbad3db896ef0c2fa733c6d150fd rtl8189es-e58bd86c9d9408c648b1246a0dd76b16856ec172.tar.gz diff --git a/package/rtl8189es/rtl8189es.mk b/package/rtl8189es/rtl8189es.mk index 9e4053ae835..c2ee77f9229 100644 --- a/package/rtl8189es/rtl8189es.mk +++ b/package/rtl8189es/rtl8189es.mk @@ -4,14 +4,22 @@ # ################################################################################ -RTL8189ES_VERSION = 2c8d44ae26485052f39d933a3a132b3ff395803a +RTL8189ES_VERSION = e58bd86c9d9408c648b1246a0dd76b16856ec172 RTL8189ES_SITE = $(call github,jwrdegoede,rtl8189ES_linux,$(RTL8189ES_VERSION)) RTL8189ES_LICENSE = GPL-2.0 RTL8189ES_MODULE_MAKE_OPTS = \ CONFIG_RTL8189ES=m \ KVER=$(LINUX_VERSION_PROBED) \ - KSRC=$(LINUX_DIR) + KSRC=$(LINUX_DIR) \ + USER_EXTRA_CFLAGS="-Wno-error" + +define RTL8189ES_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_MMC) +endef $(eval $(kernel-module)) $(eval $(generic-package)) diff --git a/package/rtl8189fs/0001-Makefile-move-EXTRA_CFLAGS-USER_EXTRA_CFLAGS-at-the-.patch b/package/rtl8189fs/0001-Makefile-move-EXTRA_CFLAGS-USER_EXTRA_CFLAGS-at-the-.patch new file mode 100644 index 00000000000..f9e2d6845d7 --- /dev/null +++ b/package/rtl8189fs/0001-Makefile-move-EXTRA_CFLAGS-USER_EXTRA_CFLAGS-at-the-.patch @@ -0,0 +1,41 @@ +From f48d99fab8b79e573850067a3ff2d8c16aa95ce1 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Wed, 28 Sep 2022 21:17:17 +0200 +Subject: [PATCH] Makefile: move 'EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS)' at the + end of EXTRA_FLAGS assignment + +At the moment USER_EXTRA_CFLAGS can't override local Makfile EXTRA_CFLAGS +since it's assigned at the beginning of the Makefile. For example it's not +possible to undefine the hardcoded CONFIG_LITTLE_ENDIAN and this doesn't +allow to build these modules for big endian architectures. So let's move +the assignment of USER_EXTRA_CFLAGS to EXTRA_CFLAGS after the last +EXTRA_CFLAGS assignment. + +Upstream: https://github.com/jwrdegoede/rtl8189ES_linux/pull/101 + +Signed-off-by: Giulio Benetti +--- + Makefile | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index dfca305..6f91d0a 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,4 +1,3 @@ +-EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS) + EXTRA_CFLAGS += -O1 + #EXTRA_CFLAGS += -O3 + #EXTRA_CFLAGS += -Wall +@@ -2208,6 +2207,8 @@ ifneq ($(USER_MODULE_NAME),) + MODULE_NAME := $(USER_MODULE_NAME) + endif + ++EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS) ++ + ifneq ($(KERNELRELEASE),) + + ########### this part for *.mk ############################ +-- +2.34.1 + diff --git a/package/rtl8189fs/0001-include-disable-debug-messages.patch b/package/rtl8189fs/0001-include-disable-debug-messages.patch deleted file mode 100644 index 532982b1d3c..00000000000 --- a/package/rtl8189fs/0001-include-disable-debug-messages.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 5d3a44ff1aeb8ace6e08df3cad16102aaac1ef09 Mon Sep 17 00:00:00 2001 -From: Sergey Matyukevich -Date: Sun, 13 Jun 2021 15:51:51 +0300 -Subject: [PATCH] include: disable debug messages - -Disable debug messages to make rtl8189fs driver less noisy. - -Signed-off-by: Sergey Matyukevich ---- - include/autoconf.h | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/include/autoconf.h b/include/autoconf.h -index 44efe42..b5df57b 100644 ---- a/include/autoconf.h -+++ b/include/autoconf.h -@@ -224,8 +224,6 @@ - /* - * Debug Related Config - */ --#define CONFIG_DEBUG /* DBG_871X, etc... */ -- - #ifdef CONFIG_DEBUG - #define DBG 1 // for ODM & BTCOEX debug - //#define CONFIG_DEBUG_RTL871X /* RT_TRACE, RT_PRINT_DATA, _func_enter_, _func_exit_ */ --- -2.32.0 - diff --git a/package/rtl8189fs/Config.in b/package/rtl8189fs/Config.in index ae69b792356..78eeed1a4fb 100644 --- a/package/rtl8189fs/Config.in +++ b/package/rtl8189fs/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_RTL8189FS bool "rtl8189fs" + depends on !BR2_s390x depends on BR2_LINUX_KERNEL help Wireless driver rtl8189fs. @@ -7,4 +8,5 @@ config BR2_PACKAGE_RTL8189FS https://github.com/jwrdegoede/rtl8189ES_linux.git comment "rtl8189fs needs a Linux kernel to be built" + depends on !BR2_s390x depends on !BR2_LINUX_KERNEL diff --git a/package/rtl8189fs/rtl8189fs.hash b/package/rtl8189fs/rtl8189fs.hash index a7c36418414..377812fba81 100644 --- a/package/rtl8189fs/rtl8189fs.hash +++ b/package/rtl8189fs/rtl8189fs.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 2350a15f866ac82a33c11f9505f2deb0f4aa819b9ac1f4809f8d6893412e73fd rtl8189fs-e10294d2ded27586149fedee1f834d75477b8b40.tar.gz +sha256 9ff7aa9ee8cd7a8f386531d3b009e7bcbce1ff71bb676c187c40e538755eb8b5 rtl8189fs-75a566a830037c7d1309c5a9fe411562772a1cf2.tar.gz diff --git a/package/rtl8189fs/rtl8189fs.mk b/package/rtl8189fs/rtl8189fs.mk index 83c7f3ee0d7..bd294692422 100644 --- a/package/rtl8189fs/rtl8189fs.mk +++ b/package/rtl8189fs/rtl8189fs.mk @@ -4,14 +4,30 @@ # ################################################################################ -RTL8189FS_VERSION = e10294d2ded27586149fedee1f834d75477b8b40 +RTL8189FS_VERSION = 75a566a830037c7d1309c5a9fe411562772a1cf2 RTL8189FS_SITE = $(call github,jwrdegoede,rtl8189ES_linux,$(RTL8189FS_VERSION)) RTL8189FS_LICENSE = GPL-2.0 +RTL8189FS_USER_EXTRA_CFLAGS = \ + -UCONFIG_LITTLE_ENDIAN \ + -DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN + RTL8189FS_MODULE_MAKE_OPTS = \ CONFIG_RTL8189FS=m \ KVER=$(LINUX_VERSION_PROBED) \ - KSRC=$(LINUX_DIR) + KSRC=$(LINUX_DIR) \ + USER_EXTRA_CFLAGS="$(RTL8189FS_USER_EXTRA_CFLAGS)" + +ifeq ($(BR2_ENABLE_RUNTIME_DEBUG),) +RTL8189FS_MODULE_MAKE_OPTS += CONFIG_RTW_DEBUG=n +endif + +define RTL8189FS_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_WIRELESS) + $(call KCONFIG_ENABLE_OPT,CONFIG_CFG80211) + $(call KCONFIG_ENABLE_OPT,CONFIG_MAC80211) + $(call KCONFIG_ENABLE_OPT,CONFIG_MMC) +endef $(eval $(kernel-module)) $(eval $(generic-package)) diff --git a/package/rtl8192eu/0001-Fix-build-failure-due-to-redefition-of-local-sha256-.patch b/package/rtl8192eu/0001-Fix-build-failure-due-to-redefition-of-local-sha256-.patch new file mode 100644 index 00000000000..52ef8c90055 --- /dev/null +++ b/package/rtl8192eu/0001-Fix-build-failure-due-to-redefition-of-local-sha256-.patch @@ -0,0 +1,108 @@ +From 1f968bd58656f200347bd398b34aa9f1b6393302 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Wed, 28 Dec 2022 18:54:48 +0100 +Subject: [PATCH] Fix build failure due to redefition of local sha256 data + types and functions + +Linux provides sha256_init() and 'struct sha256_state' in file +include/crypto/sha2.h so this leads to a build failure due to redefinition. +To avoid this let's prepend to all local exposed functions and data types +rtl_. sha256_process() and sha256_done() are not required to be renamed but +let's change them for consistency. + +[Upstream status: https://github.com/clnhub/rtl8192eu-linux/pull/69] +Signed-off-by: Giulio Benetti +--- + core/crypto/sha256-internal.c | 16 ++++++++-------- + core/crypto/sha256_i.h | 8 ++++---- + 2 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/core/crypto/sha256-internal.c b/core/crypto/sha256-internal.c +index 4d61cb1..537bb2e 100644 +--- a/core/crypto/sha256-internal.c ++++ b/core/crypto/sha256-internal.c +@@ -26,17 +26,17 @@ + int sha256_vector(size_t num_elem, const u8 *addr[], const size_t *len, + u8 *mac) + { +- struct sha256_state ctx; ++ struct rtl_sha256_state ctx; + size_t i; + + if (TEST_FAIL()) + return -1; + +- sha256_init(&ctx); ++ rtl_sha256_init(&ctx); + for (i = 0; i < num_elem; i++) +- if (sha256_process(&ctx, addr[i], len[i])) ++ if (rtl_sha256_process(&ctx, addr[i], len[i])) + return -1; +- if (sha256_done(&ctx, mac)) ++ if (rtl_sha256_done(&ctx, mac)) + return -1; + return 0; + } +@@ -82,7 +82,7 @@ static const unsigned long K[64] = { + #endif + + /* compress 512-bits */ +-static int sha256_compress(struct sha256_state *md, unsigned char *buf) ++static int sha256_compress(struct rtl_sha256_state *md, unsigned char *buf) + { + u32 S[8], W[64], t0, t1; + u32 t; +@@ -125,7 +125,7 @@ static int sha256_compress(struct sha256_state *md, unsigned char *buf) + + + /* Initialize the hash state */ +-void sha256_init(struct sha256_state *md) ++void rtl_sha256_init(struct rtl_sha256_state *md) + { + md->curlen = 0; + md->length = 0; +@@ -146,7 +146,7 @@ void sha256_init(struct sha256_state *md) + @param inlen The length of the data (octets) + @return CRYPT_OK if successful + */ +-int sha256_process(struct sha256_state *md, const unsigned char *in, ++int rtl_sha256_process(struct rtl_sha256_state *md, const unsigned char *in, + unsigned long inlen) + { + unsigned long n; +@@ -186,7 +186,7 @@ int sha256_process(struct sha256_state *md, const unsigned char *in, + @param out [out] The destination of the hash (32 bytes) + @return CRYPT_OK if successful + */ +-int sha256_done(struct sha256_state *md, unsigned char *out) ++int rtl_sha256_done(struct rtl_sha256_state *md, unsigned char *out) + { + int i; + +diff --git a/core/crypto/sha256_i.h b/core/crypto/sha256_i.h +index a502d2b..93a8858 100644 +--- a/core/crypto/sha256_i.h ++++ b/core/crypto/sha256_i.h +@@ -11,15 +11,15 @@ + + #define SHA256_BLOCK_SIZE 64 + +-struct sha256_state { ++struct rtl_sha256_state { + u64 length; + u32 state[8], curlen; + u8 buf[SHA256_BLOCK_SIZE]; + }; + +-void sha256_init(struct sha256_state *md); +-int sha256_process(struct sha256_state *md, const unsigned char *in, ++void rtl_sha256_init(struct rtl_sha256_state *md); ++int rtl_sha256_process(struct rtl_sha256_state *md, const unsigned char *in, + unsigned long inlen); +-int sha256_done(struct sha256_state *md, unsigned char *out); ++int rtl_sha256_done(struct rtl_sha256_state *md, unsigned char *out); + + #endif /* SHA256_I_H */ +-- +2.34.1 + diff --git a/package/rtl8192eu/0002-Fix-conflicting-get_ra-on-PowerPC.patch b/package/rtl8192eu/0002-Fix-conflicting-get_ra-on-PowerPC.patch new file mode 100644 index 00000000000..dbc4ddd2e81 --- /dev/null +++ b/package/rtl8192eu/0002-Fix-conflicting-get_ra-on-PowerPC.patch @@ -0,0 +1,124 @@ +From 4a7e9c3c02a759d818a68c5d23ad7623d8b82ee6 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Sat, 11 Mar 2023 19:26:32 +0100 +Subject: [PATCH] Fix conflicting get_ra() on PowerPC + +In PowerPc Linux only get_ra() exists[0] and conflicts with local get_ra() +that has a completely different purpose. So let's rename local get_ra() +to rtl_get_ra() to make it different from Linux's get_ra(). + +[0]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/powerpc/include/asm/disassemble.h?h=v6.1-rc7#n49 + +Signed-off-by: Giulio Benetti +--- + core/rtw_odm.c | 6 +++--- + core/rtw_recv.c | 6 +++--- + hal/hal_com.c | 2 +- + include/wifi.h | 2 +- + os_dep/linux/ioctl_cfg80211.c | 2 +- + 5 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/core/rtw_odm.c b/core/rtw_odm.c +index 750598c..18e0222 100644 +--- a/core/rtw_odm.c ++++ b/core/rtw_odm.c +@@ -258,7 +258,7 @@ void rtw_odm_parse_rx_phy_status_chinfo(union recv_frame *rframe, u8 *phys) + RTW_PRINT("phys_t%u ta="MAC_FMT" %s, %s(band:%u, ch:%u, l_rxsc:%u)\n" + , *phys & 0xf + , MAC_ARG(get_ta(wlanhdr)) +- , is_broadcast_mac_addr(get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(get_ra(wlanhdr)) ? "MC" : "UC" ++ , is_broadcast_mac_addr(rtl_get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(rtl_get_ra(wlanhdr)) ? "MC" : "UC" + , HDATA_RATE(attrib->data_rate) + , phys_t0->band, phys_t0->channel, phys_t0->rxsc + ); +@@ -368,7 +368,7 @@ type1_end: + RTW_PRINT("phys_t%u ta="MAC_FMT" %s, %s(band:%u, ch:%u, rf_mode:%u, l_rxsc:%u, ht_rxsc:%u) => %u,%u\n" + , *phys & 0xf + , MAC_ARG(get_ta(wlanhdr)) +- , is_broadcast_mac_addr(get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(get_ra(wlanhdr)) ? "MC" : "UC" ++ , is_broadcast_mac_addr(rtl_get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(rtl_get_ra(wlanhdr)) ? "MC" : "UC" + , HDATA_RATE(attrib->data_rate) + , phys_t1->band, phys_t1->channel, phys_t1->rf_mode, phys_t1->l_rxsc, phys_t1->ht_rxsc + , pkt_cch, pkt_bw +@@ -386,7 +386,7 @@ type1_end: + RTW_PRINT("phys_t%u ta="MAC_FMT" %s, %s(band:%u, ch:%u, l_rxsc:%u, ht_rxsc:%u)\n" + , *phys & 0xf + , MAC_ARG(get_ta(wlanhdr)) +- , is_broadcast_mac_addr(get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(get_ra(wlanhdr)) ? "MC" : "UC" ++ , is_broadcast_mac_addr(rtl_get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(rtl_get_ra(wlanhdr)) ? "MC" : "UC" + , HDATA_RATE(attrib->data_rate) + , phys_t2->band, phys_t2->channel, phys_t2->l_rxsc, phys_t2->ht_rxsc + ); +diff --git a/core/rtw_recv.c b/core/rtw_recv.c +index 63ecbc6..d52a7bb 100755 +--- a/core/rtw_recv.c ++++ b/core/rtw_recv.c +@@ -4245,7 +4245,7 @@ int recv_func(_adapter *padapter, union recv_frame *rframe) + + if (check_fwstate(mlmepriv, WIFI_MONITOR_STATE) + #ifdef RTW_SIMPLE_CONFIG +- || (check_fwstate(mlmepriv, WIFI_AP_STATE) && padapter->rtw_simple_config == _TRUE && IS_MCAST(get_ra(ptr))) ++ || (check_fwstate(mlmepriv, WIFI_AP_STATE) && padapter->rtw_simple_config == _TRUE && IS_MCAST(rtl_get_ra(ptr))) + #endif + ) { + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24)) +@@ -4598,7 +4598,7 @@ void rx_query_phy_status( + wlanhdr = get_recvframe_data(precvframe); + + ta = get_ta(wlanhdr); +- ra = get_ra(wlanhdr); ++ ra = rtl_get_ra(wlanhdr); + is_ra_bmc = IS_MCAST(ra); + + if (_rtw_memcmp(adapter_mac_addr(padapter), ta, ETH_ALEN) == _TRUE) { +@@ -4746,7 +4746,7 @@ s32 pre_recv_entry(union recv_frame *precvframe, u8 *pphy_status) + { + s32 ret = _SUCCESS; + u8 *pbuf = precvframe->u.hdr.rx_data; +- u8 *ra = get_ra(pbuf); ++ u8 *ra = rtl_get_ra(pbuf); + u8 ra_is_bmc = IS_MCAST(ra); + bool phy_queried = 0; + _adapter *primary_padapter = precvframe->u.hdr.adapter; +diff --git a/hal/hal_com.c b/hal/hal_com.c +index 96c7ade..fe5b156 100755 +--- a/hal/hal_com.c ++++ b/hal/hal_com.c +@@ -13590,7 +13590,7 @@ void rtw_store_phy_info(_adapter *padapter, union recv_frame *prframe) + + /*RTW_INFO("=>%s WIFI_DATA_TYPE or WIFI_QOS_DATA_TYPE\n", __FUNCTION__);*/ + if (psta) { +- if (IS_MCAST(get_ra(get_recvframe_data(prframe)))) ++ if (IS_MCAST(rtl_get_ra(get_recvframe_data(prframe)))) + psta_dframe_info = &psta->sta_dframe_info_bmc; + else + psta_dframe_info = &psta->sta_dframe_info; +diff --git a/include/wifi.h b/include/wifi.h +index 322cfba..dd289f2 100644 +--- a/include/wifi.h ++++ b/include/wifi.h +@@ -459,7 +459,7 @@ __inline static int IS_MCAST(const u8 *da) + return _FALSE; + } + +-__inline static unsigned char *get_ra(unsigned char *pframe) ++__inline static unsigned char *rtl_get_ra(unsigned char *pframe) + { + unsigned char *ra; + ra = GetAddr1Ptr(pframe); +diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c +index 942971f..f36c77a 100755 +--- a/os_dep/linux/ioctl_cfg80211.c ++++ b/os_dep/linux/ioctl_cfg80211.c +@@ -7076,7 +7076,7 @@ void rtw_cfg80211_rx_p2p_action_public(_adapter *adapter, union recv_frame *rfra + indicate: + #endif + #if defined(RTW_DEDICATED_P2P_DEVICE) +- if (rtw_cfg80211_redirect_pd_wdev(dvobj_to_wiphy(dvobj), get_ra(frame), &wdev)) ++ if (rtw_cfg80211_redirect_pd_wdev(dvobj_to_wiphy(dvobj), rtl_get_ra(frame), &wdev)) + if (0) + RTW_INFO("redirect to pd_wdev:%p\n", wdev); + #endif +-- +2.34.1 + diff --git a/package/rtl8192eu/Config.in b/package/rtl8192eu/Config.in new file mode 100644 index 00000000000..969ba090cee --- /dev/null +++ b/package/rtl8192eu/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_RTL8192EU + bool "rtl8192eu" + depends on !BR2_s390x + depends on BR2_LINUX_KERNEL + help + A standalone driver for the RTL8192EU USB Wi-Fi adapter. + + Make sure your target kernel has the CONFIG_WIRELESS_EXT + config option enabled. + + https://github.com/clnhub/rtl8192eu-linux + +comment "rtl8192eu needs a Linux kernel to be built" + depends on !BR2_s390x + depends on !BR2_LINUX_KERNEL diff --git a/package/rtl8192eu/rtl8192eu.hash b/package/rtl8192eu/rtl8192eu.hash new file mode 100644 index 00000000000..0cb9961345e --- /dev/null +++ b/package/rtl8192eu/rtl8192eu.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 827e9592336744cbcfca5de988d8f4e14a62690302d3cabf72aa4bedebded2b7 rtl8192eu-94bce7798bbb18de6d8b1646dedb2511f24867d3.tar.gz diff --git a/package/rtl8192eu/rtl8192eu.mk b/package/rtl8192eu/rtl8192eu.mk new file mode 100644 index 00000000000..d967db90b85 --- /dev/null +++ b/package/rtl8192eu/rtl8192eu.mk @@ -0,0 +1,30 @@ +################################################################################ +# +# rtl8192eu +# +################################################################################ + +RTL8192EU_VERSION = 94bce7798bbb18de6d8b1646dedb2511f24867d3 +RTL8192EU_SITE = $(call github,clnhub,rtl8192eu-linux,$(RTL8192EU_VERSION)) +RTL8192EU_LICENSE = GPL-2.0 + +RTL8192EU_USER_EXTRA_CFLAGS = -DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN \ + -DCONFIG_IOCTL_CFG80211 \ + -DRTW_USE_CFG80211_STA_EVENT \ + -Wno-error + +RTL8192EU_MODULE_MAKE_OPTS = \ + CONFIG_PLATFORM_I386_PC=n \ + CONFIG_RTL8192EU=m \ + USER_EXTRA_CFLAGS="$(RTL8192EU_USER_EXTRA_CFLAGS)" + +define RTL8192EU_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) +endef + +$(eval $(kernel-module)) +$(eval $(generic-package)) diff --git a/package/rtl8723bs/0001-rtl8723bs-add-debug-level-modparam.patch b/package/rtl8723bs/0001-rtl8723bs-add-debug-level-modparam.patch deleted file mode 100644 index 0443c1f9952..00000000000 --- a/package/rtl8723bs/0001-rtl8723bs-add-debug-level-modparam.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 9f70428f506ac9d5af325004c01c59c62669d7eb Mon Sep 17 00:00:00 2001 -From: Jason Abele -Date: Sat, 15 Aug 2015 18:20:54 -0700 -Subject: [PATCH] rtl8723bs: add debug level modparam - -For ease of controlling debug printk verbosity, add a module parameter -which sets debug level at module load. - -Signed-off-by: Jason Abele -[Fixed to apply on current version] -Signed-off-by: Ariel D'Alessandro ---- - os_dep/os_intfs.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/os_dep/os_intfs.c b/os_dep/os_intfs.c -index b30c2a0..eeb8946 100644 ---- a/os_dep/os_intfs.c -+++ b/os_dep/os_intfs.c -@@ -231,6 +231,10 @@ module_param(rtw_decrypt_phy_file, int, 0644); - MODULE_PARM_DESC(rtw_decrypt_phy_file,"Enable Decrypt PHY File"); - #endif - -+int rtw_debug_level = _drv_err_; -+module_param(rtw_debug_level, int, 0644); -+MODULE_PARM_DESC(rtw_debug_level,"Set Driver Debug Verbosity"); -+ - int _netdev_open(struct net_device *pnetdev); - int netdev_open (struct net_device *pnetdev); - static int netdev_close (struct net_device *pnetdev); -@@ -347,6 +351,7 @@ static uint loadparam(struct adapter *padapter, _nic_hdl pnetdev) - registry_par->qos_opt_enable = (u8)rtw_qos_opt_enable; - - registry_par->hiq_filter = (u8)rtw_hiq_filter; -+ GlobalDebugLevel = rtw_debug_level; - return status; - } - --- -2.8.3 - diff --git a/package/rtl8723bs/Config.in b/package/rtl8723bs/Config.in deleted file mode 100644 index 3d5dea40b58..00000000000 --- a/package/rtl8723bs/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_RTL8723BS - bool "rtl8723bs" - depends on BR2_LINUX_KERNEL - help - rtl8723bs wifi driver - - https://github.com/hadess/rtl8723bs - -comment "rtl8723bs needs a Linux kernel to be built" - depends on !BR2_LINUX_KERNEL diff --git a/package/rtl8723bs/rtl8723bs.mk b/package/rtl8723bs/rtl8723bs.mk deleted file mode 100644 index 4c6303c2ef7..00000000000 --- a/package/rtl8723bs/rtl8723bs.mk +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# -# rtl8723bs -# -################################################################################ - -RTL8723BS_VERSION = 11ab92d8ccd71c80f0102828366b14ef6b676fb2 -RTL8723BS_SITE = $(call github,hadess,rtl8723bs,$(RTL8723BS_VERSION)) -RTL8723BS_LICENSE = GPL-2.0, proprietary (*.bin firmware blobs) - -RTL8723BS_MODULE_MAKE_OPTS = \ - CONFIG_RTL8723BS=m \ - KVER=$(LINUX_VERSION_PROBED) \ - KSRC=$(LINUX_DIR) - -RTL8723BS_BINS = rtl8723bs_ap_wowlan.bin rtl8723bs_wowlan.bin \ - rtl8723bs_bt.bin rtl8723bs_nic.bin - -define RTL8723BS_INSTALL_FIRMWARE - $(foreach bin, $(RTL8723BS_BINS), \ - $(INSTALL) -D -m 644 $(@D)/$(bin) $(TARGET_DIR)/lib/firmware/rtlwifi/$(bin) - ) -endef -RTL8723BS_POST_INSTALL_TARGET_HOOKS += RTL8723BS_INSTALL_FIRMWARE - -$(eval $(kernel-module)) -$(eval $(generic-package)) diff --git a/package/rtl8723bu/Config.in b/package/rtl8723bu/Config.in index 266a794a7d9..7c624fc4d4d 100644 --- a/package/rtl8723bu/Config.in +++ b/package/rtl8723bu/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_RTL8723BU bool "rtl8723bu" + depends on !BR2_s390x depends on BR2_LINUX_KERNEL help rtl8723bu wifi driver @@ -7,4 +8,5 @@ config BR2_PACKAGE_RTL8723BU https://github.com/lwfinger/rtl8723bu comment "rtl8723bu needs a Linux kernel to be built" + depends on !BR2_s390x depends on !BR2_LINUX_KERNEL diff --git a/package/rtl8723bu/rtl8723bu.hash b/package/rtl8723bu/rtl8723bu.hash index 1dad7154b41..bc3b8fc7273 100644 --- a/package/rtl8723bu/rtl8723bu.hash +++ b/package/rtl8723bu/rtl8723bu.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 1cd658742ce10b21c92877e09cecc98880680d5f150de3845553005abc542977 rtl8723bu-19b4bdc05483a1e79a4f955a80f8f72cdd5dedc3.tar.gz +sha256 d0db523f256795d8f3284fa2ec03855f231747ede8337e878bc096325b965654 rtl8723bu-92c19318cb54ef96c2cfb4a22b2c98eb512812d8.tar.gz diff --git a/package/rtl8723bu/rtl8723bu.mk b/package/rtl8723bu/rtl8723bu.mk index 838bbedb749..ad9bb9a4625 100644 --- a/package/rtl8723bu/rtl8723bu.mk +++ b/package/rtl8723bu/rtl8723bu.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8723BU_VERSION = 19b4bdc05483a1e79a4f955a80f8f72cdd5dedc3 +RTL8723BU_VERSION = 92c19318cb54ef96c2cfb4a22b2c98eb512812d8 RTL8723BU_SITE = $(call github,lwfinger,rtl8723bu,$(RTL8723BU_VERSION)) RTL8723BU_LICENSE = GPL-2.0, proprietary (*.bin firmware blobs) @@ -12,6 +12,14 @@ RTL8723BU_MODULE_MAKE_OPTS = \ KVER=$(LINUX_VERSION_PROBED) \ KSRC=$(LINUX_DIR) +define RTL8723BU_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) +endef + define RTL8723BU_INSTALL_TARGET_CMDS $(INSTALL) -D -m 644 $(@D)/rtl8723b_fw.bin $(TARGET_DIR)/lib/firmware/rtl_bt/rtl8723b_fw.bin endef diff --git a/package/rtl8723ds-bt/Config.in b/package/rtl8723ds-bt/Config.in new file mode 100644 index 00000000000..0a604310c0a --- /dev/null +++ b/package/rtl8723ds-bt/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_RTL8723DS_BT + bool "rtl8723ds-bt" + help + rtl8723ds UART attached Bluetooth module firmware. + + https://github.com/wsyco/RTL8723DS_BT_Linux diff --git a/package/rtl8723ds-bt/rtl8723ds-bt.hash b/package/rtl8723ds-bt/rtl8723ds-bt.hash new file mode 100644 index 00000000000..1ec4e350f9b --- /dev/null +++ b/package/rtl8723ds-bt/rtl8723ds-bt.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 9e70a981946abeeb6437d9a27d8437cea15aa4df72f8d56ded0ae28af484d2f4 rtl8723ds-bt-14cedf3a9fec1aa8c500fa52f3e3acc433cbcf08.tar.gz diff --git a/package/rtl8723ds-bt/rtl8723ds-bt.mk b/package/rtl8723ds-bt/rtl8723ds-bt.mk new file mode 100644 index 00000000000..423ad74df5f --- /dev/null +++ b/package/rtl8723ds-bt/rtl8723ds-bt.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# rtl8723ds-bt +# +################################################################################ + +RTL8723DS_BT_VERSION = 14cedf3a9fec1aa8c500fa52f3e3acc433cbcf08 +RTL8723DS_BT_SITE = $(call github,wsyco,RTL8723DS_BT_Linux,$(RTL8723DS_BT_VERSION)) +RTL8723DS_BT_LICENSE = PROPRIETARY + +define RTL8723DS_BT_INSTALL_TARGET_CMDS + $(INSTALL) -m 644 -D $(@D)/8723D/rtl8723d_fw \ + $(TARGET_DIR)/lib/firmware/rtl_bt/rtl8723ds_fw.bin + $(INSTALL) -m 644 -D $(@D)/8723D/rtl8723d_config \ + $(TARGET_DIR)/lib/firmware/rtl_bt/rtl8723ds_config.bin +endef + +$(eval $(generic-package)) diff --git a/package/rtl8723ds/Config.in b/package/rtl8723ds/Config.in new file mode 100644 index 00000000000..e5123a2aaed --- /dev/null +++ b/package/rtl8723ds/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_RTL8723DS + bool "rtl8723ds" + depends on !BR2_s390x + depends on BR2_LINUX_KERNEL + help + rtl8723bs wifi driver + + https://github.com/lwfinger/rtl8723ds + +comment "rtl8723ds needs a Linux kernel to be built" + depends on !BR2_s390x + depends on !BR2_LINUX_KERNEL diff --git a/package/rtl8723ds/rtl8723ds.hash b/package/rtl8723ds/rtl8723ds.hash new file mode 100644 index 00000000000..e94a7b40ef5 --- /dev/null +++ b/package/rtl8723ds/rtl8723ds.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 672787c3f3d1f795b750cd74de8ca34bb661b8ae60f5aa50fb279ec08ff3f05f rtl8723ds-ec85dc6b9f72bfe413bff464ed01a272e29c8dbe.tar.gz +sha256 cd5c66af63b509ccd75ec85fee41b6e5cbb77cd6bf9392a54900acc0f02be4a6 COPYING diff --git a/package/rtl8723ds/rtl8723ds.mk b/package/rtl8723ds/rtl8723ds.mk new file mode 100644 index 00000000000..f62ce2bf6c7 --- /dev/null +++ b/package/rtl8723ds/rtl8723ds.mk @@ -0,0 +1,33 @@ +################################################################################ +# +# rtl8723ds +# +################################################################################ + +RTL8723DS_VERSION = ec85dc6b9f72bfe413bff464ed01a272e29c8dbe +RTL8723DS_SITE = $(call github,lwfinger,rtl8723ds,$(RTL8723DS_VERSION)) +RTL8723DS_LICENSE = GPL-2.0 +RTL8723DS_LICENSE_FILES = COPYING + +RTL8723DS_USER_EXTRA_CFLAGS = \ + -DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN \ + -DCONFIG_IOCTL_CFG80211 \ + -DRTW_USE_CFG80211_STA_EVENT \ + -Wno-error + +RTL8723DS_MODULE_MAKE_OPTS = \ + CONFIG_PLATFORM_I386_PC=n \ + CONFIG_RTL8723DS=m \ + KVER=$(LINUX_VERSION_PROBED) \ + KSRC=$(LINUX_DIR) \ + USER_EXTRA_CFLAGS="$(RTL8723DS_USER_EXTRA_CFLAGS)" + +define RTL8723DS_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_MMC) +endef + +$(eval $(kernel-module)) +$(eval $(generic-package)) diff --git a/package/rtl8812au-aircrack-ng/0001-Fix-build-failure-on-PowerPC64.patch b/package/rtl8812au-aircrack-ng/0001-Fix-build-failure-on-PowerPC64.patch new file mode 100644 index 00000000000..488c21a4fc1 --- /dev/null +++ b/package/rtl8812au-aircrack-ng/0001-Fix-build-failure-on-PowerPC64.patch @@ -0,0 +1,114 @@ +From d78bda8e60ad6382c1e5832d83d8e40c923628fa Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Tue, 14 Mar 2023 13:21:11 +0100 +Subject: [PATCH] Fix build failure on PowerPC64 + +get_ra() is defined in Linux kernel for PowerPC64 architecture and it +conflicts with local get_ra() definition so let's rename local definition +as rtl_get_ra(). + +[Upstream status: https://github.com/aircrack-ng/rtl8812au/pull/1054] +Signed-off-by: Giulio Benetti +--- + core/rtw_odm.c | 6 +++--- + core/rtw_recv.c | 4 ++-- + hal/hal_com.c | 2 +- + include/wifi.h | 2 +- + os_dep/linux/ioctl_cfg80211.c | 2 +- + 5 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/core/rtw_odm.c b/core/rtw_odm.c +index 7204181..a9a7604 100644 +--- a/core/rtw_odm.c ++++ b/core/rtw_odm.c +@@ -273,7 +273,7 @@ void rtw_odm_parse_rx_phy_status_chinfo(union recv_frame *rframe, u8 *phys) + RTW_PRINT("phys_t%u ta="MAC_FMT" %s, %s(band:%u, ch:%u, l_rxsc:%u)\n" + , *phys & 0xf + , MAC_ARG(get_ta(wlanhdr)) +- , is_broadcast_mac_addr(get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(get_ra(wlanhdr)) ? "MC" : "UC" ++ , is_broadcast_mac_addr(rtl_get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(rtl_get_ra(wlanhdr)) ? "MC" : "UC" + , HDATA_RATE(attrib->data_rate) + , phys_t0->band, phys_t0->channel, phys_t0->rxsc + ); +@@ -389,7 +389,7 @@ type1_end: + RTW_PRINT("phys_t%u ta="MAC_FMT" %s, %s(band:%u, ch:%u, rf_mode:%u, l_rxsc:%u, ht_rxsc:%u) => %u,%u\n" + , *phys & 0xf + , MAC_ARG(get_ta(wlanhdr)) +- , is_broadcast_mac_addr(get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(get_ra(wlanhdr)) ? "MC" : "UC" ++ , is_broadcast_mac_addr(rtl_get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(rtl_get_ra(wlanhdr)) ? "MC" : "UC" + , HDATA_RATE(attrib->data_rate) + , phys_t1->band, phys_t1->channel, phys_t1->rf_mode, phys_t1->l_rxsc, phys_t1->ht_rxsc + , pkt_cch, pkt_bw +@@ -407,7 +407,7 @@ type1_end: + RTW_PRINT("phys_t%u ta="MAC_FMT" %s, %s(band:%u, ch:%u, l_rxsc:%u, ht_rxsc:%u)\n" + , *phys & 0xf + , MAC_ARG(get_ta(wlanhdr)) +- , is_broadcast_mac_addr(get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(get_ra(wlanhdr)) ? "MC" : "UC" ++ , is_broadcast_mac_addr(rtl_get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(rtl_get_ra(wlanhdr)) ? "MC" : "UC" + , HDATA_RATE(attrib->data_rate) + , phys_t2->band, phys_t2->channel, phys_t2->l_rxsc, phys_t2->ht_rxsc + ); +diff --git a/core/rtw_recv.c b/core/rtw_recv.c +index ffd1ff9..05bede9 100644 +--- a/core/rtw_recv.c ++++ b/core/rtw_recv.c +@@ -4851,7 +4851,7 @@ void rx_query_phy_status( + wlanhdr = get_recvframe_data(precvframe); + + ta = get_ta(wlanhdr); +- ra = get_ra(wlanhdr); ++ ra = rtl_get_ra(wlanhdr); + is_ra_bmc = IS_MCAST(ra); + + if (_rtw_memcmp(adapter_mac_addr(padapter), ta, ETH_ALEN) == _TRUE) { +@@ -4991,7 +4991,7 @@ s32 pre_recv_entry(union recv_frame *precvframe, u8 *pphy_status) + { + s32 ret = _SUCCESS; + u8 *pbuf = precvframe->u.hdr.rx_data; +- u8 *pda = get_ra(pbuf); ++ u8 *pda = rtl_get_ra(pbuf); + u8 ra_is_bmc = IS_MCAST(pda); + _adapter *primary_padapter = precvframe->u.hdr.adapter; + #ifdef CONFIG_CONCURRENT_MODE +diff --git a/hal/hal_com.c b/hal/hal_com.c +index dcf8edf..07b8a5e 100644 +--- a/hal/hal_com.c ++++ b/hal/hal_com.c +@@ -12569,7 +12569,7 @@ void rtw_store_phy_info(_adapter *padapter, union recv_frame *prframe) + + /*RTW_INFO("=>%s WIFI_DATA_TYPE or WIFI_QOS_DATA_TYPE\n", __FUNCTION__);*/ + if (psta) { +- if (IS_MCAST(get_ra(get_recvframe_data(prframe)))) ++ if (IS_MCAST(rtl_get_ra(get_recvframe_data(prframe)))) + psta_dframe_info = &psta->sta_dframe_info_bmc; + else + psta_dframe_info = &psta->sta_dframe_info; +diff --git a/include/wifi.h b/include/wifi.h +index f071dd0..b349bb9 100644 +--- a/include/wifi.h ++++ b/include/wifi.h +@@ -454,7 +454,7 @@ __inline static int IS_MCAST(const u8 *da) + return _FALSE; + } + +-__inline static unsigned char *get_ra(unsigned char *pframe) ++__inline static unsigned char *rtl_get_ra(unsigned char *pframe) + { + unsigned char *ra; + ra = GetAddr1Ptr(pframe); +diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c +index 03f6240..a54125a 100644 +--- a/os_dep/linux/ioctl_cfg80211.c ++++ b/os_dep/linux/ioctl_cfg80211.c +@@ -6468,7 +6468,7 @@ void rtw_cfg80211_rx_p2p_action_public(_adapter *adapter, union recv_frame *rfra + + indicate: + #if defined(RTW_DEDICATED_P2P_DEVICE) +- if (rtw_cfg80211_redirect_pd_wdev(dvobj_to_wiphy(dvobj), get_ra(frame), &wdev)) ++ if (rtw_cfg80211_redirect_pd_wdev(dvobj_to_wiphy(dvobj), rtl_get_ra(frame), &wdev)) + if (0) + RTW_INFO("redirect to pd_wdev:%p\n", wdev); + #endif +-- +2.34.1 + diff --git a/package/rtl8812au-aircrack-ng/Config.in b/package/rtl8812au-aircrack-ng/Config.in index 70cbd152213..d903ab2b3ff 100644 --- a/package/rtl8812au-aircrack-ng/Config.in +++ b/package/rtl8812au-aircrack-ng/Config.in @@ -1,8 +1,10 @@ comment "rtl8812au-aircrack-ng needs a Linux kernel to be built" + depends on !BR2_s390x depends on !BR2_LINUX_KERNEL config BR2_PACKAGE_RTL8812AU_AIRCRACK_NG bool "rtl8812au-aircrack-ng" + depends on !BR2_s390x depends on BR2_LINUX_KERNEL help rtl8812au wifi driver (aircrack-ng repository) diff --git a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash index ed1921d1c2d..cdf5f3b4e2f 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 acae758c3834196c71f4ee58f53a3c1b29ffd984f63ff2f40f2b080c8785c49f rtl8812au-aircrack-ng-3a6402e9e79802891f1531b435be54f4d8b71f0b.tar.gz +sha256 69891a35724a6c30fcb29d9eba783879e0bee3f5f7847341fce06101a7542f5f rtl8812au-aircrack-ng-d98018d038a5db96066e79f26ed4a72f2fe1774e.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 2bbca88cfb1..ab3ebe20777 100644 --- a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk +++ b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk @@ -4,15 +4,32 @@ # ################################################################################ -RTL8812AU_AIRCRACK_NG_VERSION = 3a6402e9e79802891f1531b435be54f4d8b71f0b +RTL8812AU_AIRCRACK_NG_VERSION = d98018d038a5db96066e79f26ed4a72f2fe1774e 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 +RTL8812AU_AIRCRACK_NG_EXTRA_CFLAGS = \ + -DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN \ + -DCONFIG_IOCTL_CFG80211 \ + -DRTW_USE_CFG80211_STA_EVENT \ + -Wno-error=address \ + -Wno-error=array-bounds \ + -Wno-error=cast-function-type + RTL8812AU_AIRCRACK_NG_MODULE_MAKE_OPTS = \ + CONFIG_PLATFORM_I386_PC=n \ CONFIG_88XXAU=m \ KVER=$(LINUX_VERSION_PROBED) \ - USER_EXTRA_CFLAGS="-DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN" + USER_EXTRA_CFLAGS="$(RTL8812AU_AIRCRACK_NG_EXTRA_CFLAGS)" + +define RTL8812AU_AIRCRACK_NG_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) +endef $(eval $(kernel-module)) $(eval $(generic-package)) diff --git a/package/rtl8821au/0001-Fix-implicit-fallthrough-comments-for-kernel-5.3.patch b/package/rtl8821au/0001-Fix-implicit-fallthrough-comments-for-kernel-5.3.patch deleted file mode 100644 index 00e801b6b1c..00000000000 --- a/package/rtl8821au/0001-Fix-implicit-fallthrough-comments-for-kernel-5.3.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 99f1e8bd7172ddf9613db3531a8b37921ed73351 Mon Sep 17 00:00:00 2001 -From: Jesper Skov -Date: Fri, 25 Oct 2019 10:05:41 +0200 -Subject: [PATCH] Fix implicit fallthrough comments for kernel 5.3 - -[Upstream: https://github.com/abperiasamy/rtl8812AU_8821AU_linux/commit/e8a30a4c5a80efbbd5b1dbfe11b22916df4492f9.patch] -Signed-off-by: Peter Seiderer -Signed-off-by: Christian Stewart ---- - core/rtw_mlme_ext.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/core/rtw_mlme_ext.c b/core/rtw_mlme_ext.c -index 24565ea..380f507 100644 ---- a/core/rtw_mlme_ext.c -+++ b/core/rtw_mlme_ext.c -@@ -758,7 +758,9 @@ void mgt_dispatcher(_adapter *padapter, union recv_frame *precv_frame) - else - ptable->func = &OnAuthClient; - //pass through -+ //fallthrough - case WIFI_ASSOCREQ: -+ //fallthrough - case WIFI_REASSOCREQ: - _mgt_dispatcher(padapter, ptable, precv_frame); - #ifdef CONFIG_HOSTAPD_MLME --- -2.28.0 - diff --git a/package/rtl8821au/0002-Fix-kernel-5.3-driver-crashes-from-aircrack-ng-rtl88.patch b/package/rtl8821au/0002-Fix-kernel-5.3-driver-crashes-from-aircrack-ng-rtl88.patch deleted file mode 100644 index 213ea806b0f..00000000000 --- a/package/rtl8821au/0002-Fix-kernel-5.3-driver-crashes-from-aircrack-ng-rtl88.patch +++ /dev/null @@ -1,169 +0,0 @@ -From cde2dbf6e94e00fcf198422b03de01d3090675d9 Mon Sep 17 00:00:00 2001 -From: Jesper Skov -Date: Fri, 25 Oct 2019 10:10:29 +0200 -Subject: [PATCH] Fix kernel 5.3 driver crashes, from aircrack-ng/rtl8812au#421 - -[Upstream: https://github.com/abperiasamy/rtl8812AU_8821AU_linux/commit/822b485d36d6f72304a219c3be228f40968b542b.patch] -Signed-off-by: Peter Seiderer -Signed-off-by: Christian Stewart ---- - os_dep/linux/rtw_cfgvendor.c | 45 ++++++++++++++++++++++++++++++++++++ - 1 file changed, 45 insertions(+) - -diff --git a/os_dep/linux/rtw_cfgvendor.c b/os_dep/linux/rtw_cfgvendor.c -index e7ba90a..81fc8af 100644 ---- a/os_dep/linux/rtw_cfgvendor.c -+++ b/os_dep/linux/rtw_cfgvendor.c -@@ -1173,6 +1173,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { - .subcmd = BRCM_VENDOR_SCMD_PRIV_STR - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) -+ .policy = VENDOR_CMD_RAW_DATA, -+#endif - .doit = wl_cfgvendor_priv_string_handler - }, - #if defined(GSCAN_SUPPORT) && 0 -@@ -1182,6 +1185,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { - .subcmd = GSCAN_SUBCMD_GET_CAPABILITIES - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) -+ .policy = VENDOR_CMD_RAW_DATA, -+#endif - .doit = wl_cfgvendor_gscan_get_capabilities - }, - { -@@ -1190,6 +1196,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { - .subcmd = GSCAN_SUBCMD_SET_CONFIG - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) -+ .policy = VENDOR_CMD_RAW_DATA, -+#endif - .doit = wl_cfgvendor_set_scan_cfg - }, - { -@@ -1198,6 +1207,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { - .subcmd = GSCAN_SUBCMD_SET_SCAN_CONFIG - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) -+ .policy = VENDOR_CMD_RAW_DATA, -+#endif - .doit = wl_cfgvendor_set_batch_scan_cfg - }, - { -@@ -1206,6 +1218,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { - .subcmd = GSCAN_SUBCMD_ENABLE_GSCAN - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) -+ .policy = VENDOR_CMD_RAW_DATA, -+#endif - .doit = wl_cfgvendor_initiate_gscan - }, - { -@@ -1214,6 +1229,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { - .subcmd = GSCAN_SUBCMD_ENABLE_FULL_SCAN_RESULTS - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) -+ .policy = VENDOR_CMD_RAW_DATA, -+#endif - .doit = wl_cfgvendor_enable_full_scan_result - }, - { -@@ -1222,6 +1240,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { - .subcmd = GSCAN_SUBCMD_SET_HOTLIST - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) -+ .policy = VENDOR_CMD_RAW_DATA, -+#endif - .doit = wl_cfgvendor_hotlist_cfg - }, - { -@@ -1230,6 +1251,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { - .subcmd = GSCAN_SUBCMD_SET_SIGNIFICANT_CHANGE_CONFIG - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) -+ .policy = VENDOR_CMD_RAW_DATA, -+#endif - .doit = wl_cfgvendor_significant_change_cfg - }, - { -@@ -1238,6 +1262,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { - .subcmd = GSCAN_SUBCMD_GET_SCAN_RESULTS - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) -+ .policy = VENDOR_CMD_RAW_DATA, -+#endif - .doit = wl_cfgvendor_gscan_get_batch_results - }, - { -@@ -1246,6 +1273,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { - .subcmd = GSCAN_SUBCMD_GET_CHANNEL_LIST - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) -+ .policy = VENDOR_CMD_RAW_DATA, -+#endif - .doit = wl_cfgvendor_gscan_get_channel_list - }, - #endif /* GSCAN_SUPPORT */ -@@ -1256,6 +1286,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { - .subcmd = RTT_SUBCMD_SET_CONFIG - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) -+ .policy = VENDOR_CMD_RAW_DATA, -+#endif - .doit = wl_cfgvendor_rtt_set_config - }, - { -@@ -1264,6 +1297,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { - .subcmd = RTT_SUBCMD_CANCEL_CONFIG - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) -+ .policy = VENDOR_CMD_RAW_DATA, -+#endif - .doit = wl_cfgvendor_rtt_cancel_config - }, - { -@@ -1272,6 +1308,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { - .subcmd = RTT_SUBCMD_GETCAPABILITY - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) -+ .policy = VENDOR_CMD_RAW_DATA, -+#endif - .doit = wl_cfgvendor_rtt_get_capability - }, - #endif /* RTT_SUPPORT */ -@@ -1281,6 +1320,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { - .subcmd = ANDR_WIFI_SUBCMD_GET_FEATURE_SET - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) -+ .policy = VENDOR_CMD_RAW_DATA, -+#endif - .doit = rtw_cfgvendor_get_feature_set - }, - { -@@ -1289,6 +1331,9 @@ static const struct wiphy_vendor_command rtw_vendor_cmds [] = { - .subcmd = ANDR_WIFI_SUBCMD_GET_FEATURE_SET_MATRIX - }, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,3,0) -+ .policy = VENDOR_CMD_RAW_DATA, -+#endif - .doit = rtw_cfgvendor_get_feature_set_matrix - } - }; --- -2.28.0 - diff --git a/package/rtl8821au/0003-Fix-using-sprintf-for-extending-string-which-causes-.patch b/package/rtl8821au/0003-Fix-using-sprintf-for-extending-string-which-causes-.patch deleted file mode 100644 index 2c4b595c379..00000000000 --- a/package/rtl8821au/0003-Fix-using-sprintf-for-extending-string-which-causes-.patch +++ /dev/null @@ -1,339 +0,0 @@ -From 5b6641978e8fa68bca05d224a61f8513b010eda8 Mon Sep 17 00:00:00 2001 -From: Coleman -Date: Fri, 17 Jul 2020 08:53:00 +0800 -Subject: [PATCH] Fix using sprintf for extending string, which causes - undefined behavior - -[Upstream: https://github.com/abperiasamy/rtl8812AU_8821AU_linux/commit/be57045a0933d64e958878696883e9cf998e1bf3.patch] -Signed-off-by: Coleman -Signed-off-by: Christian Stewart ---- - core/rtw_mp.c | 2 +- - os_dep/linux/ioctl_linux.c | 108 ++++++++++++++++++------------------- - 2 files changed, 55 insertions(+), 55 deletions(-) - -diff --git a/core/rtw_mp.c b/core/rtw_mp.c -index c2e400d..989bb3e 100644 ---- a/core/rtw_mp.c -+++ b/core/rtw_mp.c -@@ -1871,7 +1871,7 @@ u32 mp_query_psd(PADAPTER pAdapter, u8 *data) - } else { - psd_data = rtw_GetPSDData(pAdapter, i); - } -- sprintf(data, "%s%x ", data, psd_data); -+ sprintf(data + strlen(data), "%x ", psd_data); - i++; - } - -diff --git a/os_dep/linux/ioctl_linux.c b/os_dep/linux/ioctl_linux.c -index c74a153..9543fa3 100644 ---- a/os_dep/linux/ioctl_linux.c -+++ b/os_dep/linux/ioctl_linux.c -@@ -9080,19 +9080,19 @@ static int rtw_mp_efuse_get(struct net_device *dev, - sprintf(extra, "\n"); - for (i = 0; i < EFUSE_MAP_SIZE; i += 16) { - // DBG_871X("0x%02x\t", i); -- sprintf(extra, "%s0x%02x\t", extra, i); -+ sprintf(extra + strlen(extra), "0x%02x\t", i); - for (j=0; j<8; j++) { - // DBG_871X("%02X ", data[i+j]); -- sprintf(extra, "%s%02X ", extra, PROMContent[i+j]); -+ sprintf(extra + strlen(extra), "%02X ", PROMContent[i+j]); - } - // DBG_871X("\t"); -- sprintf(extra, "%s\t", extra); -+ sprintf(extra + strlen(extra), "\t"); - for (; j<16; j++) { - // DBG_871X("%02X ", data[i+j]); -- sprintf(extra, "%s%02X ", extra, PROMContent[i+j]); -+ sprintf(extra + strlen(extra), "%02X ", PROMContent[i+j]); - } - // DBG_871X("\n"); -- sprintf(extra,"%s\n",extra); -+ sprintf(extra + strlen(extra), "\n"); - } - // DBG_871X("\n"); - } else if (strcmp(tmp[0], "realmap") == 0) { -@@ -9107,19 +9107,19 @@ static int rtw_mp_efuse_get(struct net_device *dev, - sprintf(extra, "\n"); - for (i = 0; i < EFUSE_MAP_SIZE; i += 16) { - // DBG_871X("0x%02x\t", i); -- sprintf(extra, "%s0x%02x\t", extra, i); -+ sprintf(extra + strlen(extra), "0x%02x\t", i); - for (j=0; j<8; j++) { - // DBG_871X("%02X ", data[i+j]); -- sprintf(extra, "%s%02X ", extra, pEfuseHal->fakeEfuseInitMap[i+j]); -+ sprintf(extra + strlen(extra), "%02X ", pEfuseHal->fakeEfuseInitMap[i+j]); - } - // DBG_871X("\t"); -- sprintf(extra, "%s\t", extra); -+ sprintf(extra + strlen(extra), "\t"); - for (; j<16; j++) { - // DBG_871X("%02X ", data[i+j]); -- sprintf(extra, "%s%02X ", extra, pEfuseHal->fakeEfuseInitMap[i+j]); -+ sprintf(extra + strlen(extra), "%02X ", pEfuseHal->fakeEfuseInitMap[i+j]); - } - // DBG_871X("\n"); -- sprintf(extra,"%s\n",extra); -+ sprintf(extra + strlen(extra), "\n"); - } - // DBG_871X("\n"); - } else if (strcmp(tmp[0], "rmap") == 0) { -@@ -9158,7 +9158,7 @@ static int rtw_mp_efuse_get(struct net_device *dev, - *extra = 0; - for (i=0; iBTEfuseInitMap[i+j]); -- sprintf(extra, "%s%02X ", extra, pEfuseHal->BTEfuseInitMap[i+j]); -+ sprintf(extra + strlen(extra), "%02X ", pEfuseHal->BTEfuseInitMap[i+j]); - } - // DBG_871X("\t"); -- sprintf(extra,"%s\t",extra); -+ sprintf(extra + strlen(extra), "\t"); - for (; j<16; j++) { - // DBG_871X("%02X ", pEfuseHal->BTEfuseInitMap[i+j]); -- sprintf(extra, "%s%02X ", extra, pEfuseHal->BTEfuseInitMap[i+j]); -+ sprintf(extra + strlen(extra), "%02X ", pEfuseHal->BTEfuseInitMap[i+j]); - } - // DBG_871X("\n"); -- sprintf(extra, "%s\n", extra); -+ sprintf(extra + strlen(extra), "\n"); - } - // DBG_871X("\n"); - } else if (strcmp(tmp[0],"btbmap") == 0) { -@@ -9384,19 +9384,19 @@ static int rtw_mp_efuse_get(struct net_device *dev, - sprintf(extra, "\n"); - for (i=512; i<1024 ; i+=16) { - // DBG_871X("0x%03x\t", i); -- sprintf(extra, "%s0x%03x\t", extra, i); -+ sprintf(extra + strlen(extra), "0x%03x\t", i); - for (j=0; j<8; j++) { - // DBG_871X("%02X ", data[i+j]); -- sprintf(extra, "%s%02X ", extra, pEfuseHal->BTEfuseInitMap[i+j]); -+ sprintf(extra + strlen(extra), "%02X ", pEfuseHal->BTEfuseInitMap[i+j]); - } - // DBG_871X("\t"); -- sprintf(extra,"%s\t",extra); -+ sprintf(extra + strlen(extra), "\t"); - for (; j<16; j++) { - // DBG_871X("%02X ", data[i+j]); -- sprintf(extra, "%s%02X ", extra, pEfuseHal->BTEfuseInitMap[i+j]); -+ sprintf(extra + strlen(extra), "%02X ", pEfuseHal->BTEfuseInitMap[i+j]); - } - // DBG_871X("\n"); -- sprintf(extra, "%s\n", extra); -+ sprintf(extra + strlen(extra), "\n"); - } - // DBG_871X("\n"); - } else if (strcmp(tmp[0],"btrmap") == 0) { -@@ -9436,7 +9436,7 @@ static int rtw_mp_efuse_get(struct net_device *dev, - // DBG_871X("%s: bt efuse data={", __FUNCTION__); - for (i=0; ifakeBTEfuseModifiedMap[i+j]); -- sprintf(extra, "%s%02X ", extra, pEfuseHal->fakeBTEfuseModifiedMap[i+j]); -+ sprintf(extra + strlen(extra), "%02X ", pEfuseHal->fakeBTEfuseModifiedMap[i+j]); - } - // DBG_871X("\t"); -- sprintf(extra, "%s\t", extra); -+ sprintf(extra + strlen(extra), "\t"); - for (; j<16; j++) { - // DBG_871X("%02X ", pEfuseHal->fakeBTEfuseModifiedMap[i+j]); -- sprintf(extra, "%s%02X ", extra, pEfuseHal->fakeBTEfuseModifiedMap[i+j]); -+ sprintf(extra + strlen(extra), "%02X ", pEfuseHal->fakeBTEfuseModifiedMap[i+j]); - } - // DBG_871X("\n"); -- sprintf(extra, "%s\n", extra); -+ sprintf(extra + strlen(extra), "\n"); - } - // DBG_871X("\n"); - } else if (strcmp(tmp[0],"btbfake") == 0) { -@@ -9465,19 +9465,19 @@ static int rtw_mp_efuse_get(struct net_device *dev, - sprintf(extra, "\n"); - for (i=512; i<1024; i+=16) { - // DBG_871X("0x%03x\t", i); -- sprintf(extra, "%s0x%03x\t", extra, i); -+ sprintf(extra + strlen(extra), "0x%03x\t", i); - for (j=0; j<8; j++) { - // DBG_871X("%02X ", pEfuseHal->fakeBTEfuseModifiedMap[i+j]); -- sprintf(extra, "%s%02X ", extra, pEfuseHal->fakeBTEfuseModifiedMap[i+j]); -+ sprintf(extra + strlen(extra), "%02X ", pEfuseHal->fakeBTEfuseModifiedMap[i+j]); - } - // DBG_871X("\t"); -- sprintf(extra, "%s\t", extra); -+ sprintf(extra + strlen(extra), "\t"); - for (; j<16; j++) { - // DBG_871X("%02X ", pEfuseHal->fakeBTEfuseModifiedMap[i+j]); -- sprintf(extra, "%s%02X ", extra, pEfuseHal->fakeBTEfuseModifiedMap[i+j]); -+ sprintf(extra + strlen(extra), "%02X ", pEfuseHal->fakeBTEfuseModifiedMap[i+j]); - } - // DBG_871X("\n"); -- sprintf(extra, "%s\n", extra); -+ sprintf(extra + strlen(extra), "\n"); - } - // DBG_871X("\n"); - } else if (strcmp(tmp[0],"wlrfkmap")== 0) { -@@ -9485,19 +9485,19 @@ static int rtw_mp_efuse_get(struct net_device *dev, - sprintf(extra, "\n"); - for (i=0; ifakeEfuseModifiedMap[i+j]); -- sprintf(extra, "%s%02X ", extra, pEfuseHal->fakeEfuseModifiedMap[i+j]); -+ sprintf(extra + strlen(extra), "%02X ", pEfuseHal->fakeEfuseModifiedMap[i+j]); - } - // DBG_871X("\t"); -- sprintf(extra, "%s\t", extra); -+ sprintf(extra + strlen(extra), "\t"); - for (; j<16; j++) { - // DBG_871X("%02X ", pEfuseHal->fakeEfuseModifiedMap[i+j]); -- sprintf(extra, "%s %02X", extra, pEfuseHal->fakeEfuseModifiedMap[i+j]); -+ sprintf(extra + strlen(extra), " %02X", pEfuseHal->fakeEfuseModifiedMap[i+j]); - } - // DBG_871X("\n"); -- sprintf(extra, "%s\n", extra); -+ sprintf(extra + strlen(extra), "\n"); - } - // DBG_871X("\n"); - -@@ -9523,7 +9523,7 @@ static int rtw_mp_efuse_get(struct net_device *dev, - *extra = 0; - for (i=0; ifakeEfuseModifiedMap[addr+i]); -- sprintf(extra, "%s0x%02X ", extra, pEfuseHal->fakeEfuseModifiedMap[addr+i]); -+ sprintf(extra + strlen(extra), "0x%02X ", pEfuseHal->fakeEfuseModifiedMap[addr+i]); - } - } else if (strcmp(tmp[0],"btrfkrmap")== 0) { - if ((tmp[1]==NULL) || (tmp[2]==NULL)) { -@@ -9547,7 +9547,7 @@ static int rtw_mp_efuse_get(struct net_device *dev, - *extra = 0; - for (i=0; ifakeBTEfuseModifiedMap[addr+i]); -- sprintf(extra, "%s0x%02X ", extra, pEfuseHal->fakeBTEfuseModifiedMap[addr+i]); -+ sprintf(extra + strlen(extra), "0x%02X ", pEfuseHal->fakeBTEfuseModifiedMap[addr+i]); - } - } else { - sprintf(extra, "Command not found!"); -@@ -10409,7 +10409,7 @@ static int rtw_mp_read_reg(struct net_device *dev, - pnext++; - if ( *pnext != '\0' ) { - strtout = simple_strtoul (pnext , &ptmp, 16); -- sprintf( extra, "%s %d" ,extra ,strtout ); -+ sprintf(extra + strlen(extra), " %d" ,strtout ); - } else { - break; - } -@@ -10443,7 +10443,7 @@ static int rtw_mp_read_reg(struct net_device *dev, - pnext++; - if ( *pnext != '\0' ) { - strtout = simple_strtoul (pnext , &ptmp, 16); -- sprintf( extra, "%s %d" ,extra ,strtout ); -+ sprintf(extra + strlen(extra), " %d" ,strtout ); - } else { - break; - } -@@ -10566,7 +10566,7 @@ static int rtw_mp_read_rf(struct net_device *dev, - pnext++; - if ( *pnext != '\0' ) { - strtou = simple_strtoul (pnext , &ptmp, 16); -- sprintf( extra, "%s %d" ,extra ,strtou ); -+ sprintf(extra + strlen(extra), " %d" ,strtou ); - } else { - break; - } -@@ -12155,14 +12155,14 @@ todo: - goto exit; - - #ifdef CONFIG_RTL8723A -- sprintf(extra, "%s %d ", extra, (pMptCtx->mptOutBuf[i]& 0x3f)); -+ sprintf(extra + strlen(extra), " %d ", (pMptCtx->mptOutBuf[i]& 0x3f)); - #else -- sprintf(extra, "%s %d ", extra, (pMptCtx->mptOutBuf[i]& 0x1f)); -+ sprintf(extra + strlen(extra), " %d ", (pMptCtx->mptOutBuf[i]& 0x1f)); - #endif - } - } else { - for (i=4; imptOutLen; i++) { -- sprintf(extra, "%s 0x%x ", extra, pMptCtx->mptOutBuf[i]); -+ sprintf(extra + strlen(extra), " 0x%x ", pMptCtx->mptOutBuf[i]); - } - } - --- -2.28.0 - diff --git a/package/rtl8821au/0004-rename-sha256_state-to-rtl_sha256_state-to-avoid-nam.patch b/package/rtl8821au/0004-rename-sha256_state-to-rtl_sha256_state-to-avoid-nam.patch deleted file mode 100644 index 41cee2b2476..00000000000 --- a/package/rtl8821au/0004-rename-sha256_state-to-rtl_sha256_state-to-avoid-nam.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 19aee91e45788d594615a9be58fa5d0879ec816a Mon Sep 17 00:00:00 2001 -From: youcai -Date: Tue, 18 Aug 2020 00:43:16 +0800 -Subject: [PATCH] rename sha256_state to rtl_sha256_state to avoid name - conflict with crypto - -[Upstream: https://github.com/abperiasamy/rtl8812AU_8821AU_linux/pull/338/commits/af6f6c1578f16145478326a939bb7593bbcdb4e7.patch] -Signed-off-by: Coleman -Signed-off-by: Christian Stewart ---- - core/rtw_security.c | 10 +++++----- - include/rtw_security.h | 2 +- - 2 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/core/rtw_security.c b/core/rtw_security.c -index d54e6af..de2d91f 100644 ---- a/core/rtw_security.c -+++ b/core/rtw_security.c -@@ -2200,7 +2200,7 @@ BIP_exit: - - #ifndef PLATFORM_FREEBSD - /* compress 512-bits */ --static int sha256_compress(struct sha256_state *md, unsigned char *buf) -+static int sha256_compress(struct rtl_sha256_state *md, unsigned char *buf) - { - u32 S[8], W[64], t0, t1; - u32 t; -@@ -2249,7 +2249,7 @@ static int sha256_compress(struct sha256_state *md, unsigned char *buf) - } - - /* Initialize the hash state */ --static void sha256_init(struct sha256_state *md) -+static void sha256_init(struct rtl_sha256_state *md) - { - md->curlen = 0; - md->length = 0; -@@ -2270,7 +2270,7 @@ static void sha256_init(struct sha256_state *md) - @param inlen The length of the data (octets) - @return CRYPT_OK if successful - */ --static int sha256_process(struct sha256_state *md, unsigned char *in, -+static int sha256_process(struct rtl_sha256_state *md, unsigned char *in, - unsigned long inlen) - { - unsigned long n; -@@ -2311,7 +2311,7 @@ static int sha256_process(struct sha256_state *md, unsigned char *in, - @param out [out] The destination of the hash (32 bytes) - @return CRYPT_OK if successful - */ --static int sha256_done(struct sha256_state *md, unsigned char *out) -+static int sha256_done(struct rtl_sha256_state *md, unsigned char *out) - { - int i; - -@@ -2363,7 +2363,7 @@ static int sha256_done(struct sha256_state *md, unsigned char *out) - static int sha256_vector(size_t num_elem, u8 *addr[], size_t *len, - u8 *mac) - { -- struct sha256_state ctx; -+ struct rtl_sha256_state ctx; - size_t i; - - sha256_init(&ctx); -diff --git a/include/rtw_security.h b/include/rtw_security.h -index d41014e..98feb69 100644 ---- a/include/rtw_security.h -+++ b/include/rtw_security.h -@@ -233,7 +233,7 @@ struct security_priv { - #endif /* DBG_SW_SEC_CNT */ - }; - --struct sha256_state { -+struct rtl_sha256_state { - u64 length; - u32 state[8], curlen; - u8 buf[64]; --- -2.28.0 - diff --git a/package/rtl8821au/0005-disable-rtw_mgmt_frame_register-on-kernel-5.8.0.patch b/package/rtl8821au/0005-disable-rtw_mgmt_frame_register-on-kernel-5.8.0.patch deleted file mode 100644 index 6d09153b825..00000000000 --- a/package/rtl8821au/0005-disable-rtw_mgmt_frame_register-on-kernel-5.8.0.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 9421b0763e5f20babb2c0fd437979a71fbac1739 Mon Sep 17 00:00:00 2001 -From: Christian Stewart -Date: Tue, 8 Sep 2020 22:46:45 -0700 -Subject: [PATCH] disable rtw_mgmt_frame_register on kernel 5.8.0 - -rtl8812au: fix build for kernel 5.8 - -[Source: https://github.com/lwfinger/rtl8812au/commit/ec1591b90dd323185717fa42887f96444cca5921.patch] -Signed-off-by: Larry Finger -Signed-off-by: Christian Stewart ---- - os_dep/linux/ioctl_cfg80211.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c -index 019daf9..13238cb 100644 ---- a/os_dep/linux/ioctl_cfg80211.c -+++ b/os_dep/linux/ioctl_cfg80211.c -@@ -5177,6 +5177,7 @@ exit: - return ret; - } - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0) - static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy, - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)) - struct wireless_dev *wdev, -@@ -5205,6 +5206,7 @@ static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy, - exit: - return; - } -+#endif - - #if defined(CONFIG_TDLS) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)) - static int cfg80211_rtw_tdls_mgmt(struct wiphy *wiphy, -@@ -6021,7 +6023,9 @@ static struct cfg80211_ops rtw_cfg80211_ops = { - - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE) - .mgmt_tx = cfg80211_rtw_mgmt_tx, -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0) - .mgmt_frame_register = cfg80211_rtw_mgmt_frame_register, -+#endif - #elif (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,34) && LINUX_VERSION_CODE<=KERNEL_VERSION(2,6,35)) - .action = cfg80211_rtw_mgmt_tx, - #endif --- -2.28.0 - diff --git a/package/rtl8821au/0006-rtw_proc-convert-file_operations-to-proc_ops-for-5.6.patch b/package/rtl8821au/0006-rtw_proc-convert-file_operations-to-proc_ops-for-5.6.patch deleted file mode 100644 index 30595ec695a..00000000000 --- a/package/rtl8821au/0006-rtw_proc-convert-file_operations-to-proc_ops-for-5.6.patch +++ /dev/null @@ -1,110 +0,0 @@ -From e0ed05200e6e4b86e26e092dc1f16fc8fc1e2b67 Mon Sep 17 00:00:00 2001 -From: Christian Stewart -Date: Tue, 8 Sep 2020 23:08:39 -0700 -Subject: [PATCH] rtw_proc: convert file_operations to proc_ops for 5.6.x - compat - -Signed-off-by: Christian Stewart -[Fix < 5.6.x compile - missing semicolon] -Signed-off-by: Peter Seiderer ---- - os_dep/linux/rtw_proc.c | 40 ++++++++++++++++++++++++++++++++++++++-- - 1 file changed, 38 insertions(+), 2 deletions(-) - -diff --git a/os_dep/linux/rtw_proc.c b/os_dep/linux/rtw_proc.c -index 048080a..6295f66 100644 ---- a/os_dep/linux/rtw_proc.c -+++ b/os_dep/linux/rtw_proc.c -@@ -65,9 +65,15 @@ inline struct proc_dir_entry *rtw_proc_create_dir(const char *name, struct proc_ - } - - inline struct proc_dir_entry *rtw_proc_create_entry(const char *name, struct proc_dir_entry *parent, -- const struct file_operations *fops, void * data) -+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 0)) -+ const struct file_operations *fops, -+ #else -+ const struct proc_ops *fops, -+ #endif -+ void * data -+ ) - { -- struct proc_dir_entry *entry; -+ struct proc_dir_entry *entry; - - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)) - entry = proc_create_data(name, S_IFREG|S_IRUGO|S_IWUGO, parent, fops, data); -@@ -167,6 +173,7 @@ static ssize_t rtw_drv_proc_write(struct file *file, const char __user *buffer, - return -EROFS; - } - -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 0)) - static const struct file_operations rtw_drv_proc_fops = { - .owner = THIS_MODULE, - .open = rtw_drv_proc_open, -@@ -175,6 +182,15 @@ static const struct file_operations rtw_drv_proc_fops = { - .release = single_release, - .write = rtw_drv_proc_write, - }; -+#else -+static const struct proc_ops rtw_drv_proc_fops = { -+ .proc_open = rtw_drv_proc_open, -+ .proc_read = seq_read, -+ .proc_lseek = seq_lseek, -+ .proc_release = seq_release, -+ .proc_write = rtw_drv_proc_write, -+}; -+#endif - - int rtw_drv_proc_init(void) - { -@@ -776,6 +792,7 @@ static ssize_t rtw_adapter_proc_write(struct file *file, const char __user *buff - return -EROFS; - } - -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 0)) - static const struct file_operations rtw_adapter_proc_fops = { - .owner = THIS_MODULE, - .open = rtw_adapter_proc_open, -@@ -784,6 +801,15 @@ static const struct file_operations rtw_adapter_proc_fops = { - .release = single_release, - .write = rtw_adapter_proc_write, - }; -+#else -+static const struct proc_ops rtw_adapter_proc_fops = { -+ .proc_open = rtw_adapter_proc_open, -+ .proc_read = seq_read, -+ .proc_lseek = seq_lseek, -+ .proc_release = single_release, -+ .proc_write = rtw_adapter_proc_write, -+}; -+#endif - - int proc_get_odm_dbg_comp(struct seq_file *m, void *v) - { -@@ -1030,6 +1056,7 @@ static ssize_t rtw_odm_proc_write(struct file *file, const char __user *buffer, - return -EROFS; - } - -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 0)) - static const struct file_operations rtw_odm_proc_fops = { - .owner = THIS_MODULE, - .open = rtw_odm_proc_open, -@@ -1038,6 +1065,15 @@ static const struct file_operations rtw_odm_proc_fops = { - .release = single_release, - .write = rtw_odm_proc_write, - }; -+#else -+static const struct proc_ops rtw_odm_proc_fops = { -+ .proc_open = rtw_odm_proc_open, -+ .proc_read = seq_read, -+ .proc_lseek = seq_lseek, -+ .proc_release = single_release, -+ .proc_write = rtw_odm_proc_write, -+}; -+#endif - - struct proc_dir_entry *rtw_odm_proc_init(struct net_device *dev) - { --- -2.29.0 - diff --git a/package/rtl8821au/Config.in b/package/rtl8821au/Config.in index 87c191b22ab..3d7bbf643d1 100644 --- a/package/rtl8821au/Config.in +++ b/package/rtl8821au/Config.in @@ -1,8 +1,10 @@ comment "rtl8821au needs a Linux kernel to be built" + depends on !BR2_s390x depends on !BR2_LINUX_KERNEL config BR2_PACKAGE_RTL8821AU bool "rtl8821au" + depends on !BR2_s390x depends on BR2_LINUX_KERNEL help rtl8821au wifi driver diff --git a/package/rtl8821au/rtl8821au.hash b/package/rtl8821au/rtl8821au.hash index de84332f72d..b19cb93bf6c 100644 --- a/package/rtl8821au/rtl8821au.hash +++ b/package/rtl8821au/rtl8821au.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9c8e127dcf2b4d87df546f7f51afdbca0a0561cdba9bcc2689722e1090c46204 rtl8821au-4235b0ec7d7220a6364586d8e25b1e8cb99c36f1.tar.gz -sha256 6d66dec8f6c253a1af2ffd858167c722b1ce3218215446172c81355d0a49e7fc LICENSE +sha256 9dfb2b12c52fe759e4978cbd7a0fb90f0605ae9146a6d0186f2869bbfb6d13fd rtl8821au-0cab870ff635ba038705ab29363b0cbbedd5c258.tar.gz +sha256 640d90f6ee401241ff62834d0d1b33f83049e99b8bfdfa04ed1b0a1635dde3e7 LICENSE diff --git a/package/rtl8821au/rtl8821au.mk b/package/rtl8821au/rtl8821au.mk index 5f4ba3eb769..6bb77de81f2 100644 --- a/package/rtl8821au/rtl8821au.mk +++ b/package/rtl8821au/rtl8821au.mk @@ -4,11 +4,19 @@ # ################################################################################ -RTL8821AU_VERSION = 4235b0ec7d7220a6364586d8e25b1e8cb99c36f1 -RTL8821AU_SITE = $(call github,abperiasamy,rtl8812AU_8821AU_linux,$(RTL8821AU_VERSION)) +RTL8821AU_VERSION = 0cab870ff635ba038705ab29363b0cbbedd5c258 +RTL8821AU_SITE = $(call github,lwfinger,rtl8812au,$(RTL8821AU_VERSION)) RTL8821AU_LICENSE = GPL-2.0 RTL8821AU_LICENSE_FILES = LICENSE +define RTL8821AU_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) +endef + RTL8821AU_MODULE_MAKE_OPTS = \ CONFIG_RTL8812AU_8821AU=m \ KVER=$(LINUX_VERSION_PROBED) \ diff --git a/package/rtl8821cu/Config.in b/package/rtl8821cu/Config.in new file mode 100644 index 00000000000..00a41b5196b --- /dev/null +++ b/package/rtl8821cu/Config.in @@ -0,0 +1,12 @@ +comment "rtl8821cu needs a Linux kernel to be built" + depends on !BR2_s390x + depends on !BR2_LINUX_KERNEL + +config BR2_PACKAGE_RTL8821CU + bool "rtl8821cu" + depends on !BR2_s390x + depends on BR2_LINUX_KERNEL + help + rtl8821cu wifi driver + + https://github.com/brektrou/rtl8821CU diff --git a/package/rtl8821cu/rtl8821cu.hash b/package/rtl8821cu/rtl8821cu.hash new file mode 100644 index 00000000000..e2d83adc0f9 --- /dev/null +++ b/package/rtl8821cu/rtl8821cu.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 1d090da292c3f9322603846467a80278670211fcde3354dcabfe32c449992493 rtl8821cu-69c903b75bde36293c66b25c051916a74dbadf58.tar.gz +sha256 af54d00efc57cfce664171ac8be2a20c0f290b1b5c1a67bb2eba7b6380276c4e LICENSE diff --git a/package/rtl8821cu/rtl8821cu.mk b/package/rtl8821cu/rtl8821cu.mk new file mode 100644 index 00000000000..5a93376c20b --- /dev/null +++ b/package/rtl8821cu/rtl8821cu.mk @@ -0,0 +1,33 @@ +################################################################################ +# +# rtl8821cu +# +################################################################################ + +RTL8821CU_VERSION = 69c903b75bde36293c66b25c051916a74dbadf58 +RTL8821CU_SITE = $(call github,morrownr,8821cu-20210916,$(RTL8821CU_VERSION)) +RTL8821CU_LICENSE = GPL-2.0 +RTL8821CU_LICENSE_FILES = LICENSE + +define RTL8821CU_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) +endef + +RTL8821CU_USER_EXTRA_CFLAGS = \ + -DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN \ + -DCONFIG_IOCTL_CFG80211 \ + -DRTW_USE_CFG80211_STA_EVENT \ + -Wno-error + +RTL8821CU_MODULE_MAKE_OPTS = \ + CONFIG_PLATFORM_AUTODETECT=n \ + CONFIG_RTL8821CU=m \ + KVER=$(LINUX_VERSION_PROBED) \ + USER_EXTRA_CFLAGS="$(RTL8821CU_USER_EXTRA_CFLAGS)" + +$(eval $(kernel-module)) +$(eval $(generic-package)) diff --git a/package/rtl_433/0001-CMakeLists.txt-use-pkg-config-to-detect-openssl-when.patch b/package/rtl_433/0001-CMakeLists.txt-use-pkg-config-to-detect-openssl-when.patch new file mode 100644 index 00000000000..00858c8ff91 --- /dev/null +++ b/package/rtl_433/0001-CMakeLists.txt-use-pkg-config-to-detect-openssl-when.patch @@ -0,0 +1,42 @@ +From b860de9e207d8fe2ea37dad28fdd014493d87703 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 27 Dec 2022 16:29:16 +0100 +Subject: [PATCH] build: Fix CMake to use pkg-config openssl when possible + (#2290) + +In order to take into account the libraries used by openssl when +building statically, using pkg-config is recommended. This patch +therefore improves the CMakeLists.txt to use pkg-config to detect +openssl when pkg-config is available. This will avoid +static build failure when openssl needs to link with -latomic. + +Fixes: + - http://autobuild.buildroot.org/results/417c86963ffe038aa052ea3cf19fd52c3e9b7396 + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/merbanan/rtl_433/commit/b860de9e207d8fe2ea37dad28fdd014493d87703] +--- + CMakeLists.txt | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d47a3eda2..cf30d8be2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -175,7 +175,14 @@ set(ENABLE_OPENSSL AUTO CACHE STRING "Enable OpenSSL TLS support") + set_property(CACHE ENABLE_OPENSSL PROPERTY STRINGS AUTO ON OFF) + if(ENABLE_OPENSSL) # AUTO / ON + +-find_package(OpenSSL) ++find_package(PkgConfig) ++if(PKG_CONFIG_FOUND) ++ pkg_check_modules(OPENSSL openssl) ++ set(OPENSSL_LIBRARIES ${OPENSSL_LINK_LIBRARIES}) ++ set(OPENSSL_INCLUDE_DIR ${OPENSSL_INCLUDE_DIRS}) ++else() ++ find_package(OpenSSL) ++endif() + if(OPENSSL_FOUND) + message(STATUS "OpenSSL TLS support will be compiled. Found version ${OPENSSL_VERSION}") + include_directories(${OPENSSL_INCLUDE_DIR}) diff --git a/package/rtl_433/0001-minor-Fix-a-compiler-flag-needs-GCC-7.patch b/package/rtl_433/0001-minor-Fix-a-compiler-flag-needs-GCC-7.patch deleted file mode 100644 index dd3debf7ee2..00000000000 --- a/package/rtl_433/0001-minor-Fix-a-compiler-flag-needs-GCC-7.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 2010e8f949ab7b4555b99dbf184e149a3f33df46 Mon Sep 17 00:00:00 2001 -From: "Christian W. Zuckschwerdt" -Date: Fri, 24 Dec 2021 11:03:06 +0100 -Subject: [PATCH] minor: Fix a compiler flag needs GCC 7 - -[Retrieved from: -https://github.com/merbanan/rtl_433/commit/2010e8f949ab7b4555b99dbf184e149a3f33df46] -Signed-off-by: Fabrice Fontaine ---- - CMakeLists.txt | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a3f11ac99..bfa6595ca 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -74,7 +74,9 @@ if(("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C_COMPILER_ID}" MATCHES - ADD_DEFINITIONS(-pedantic) - ADD_DEFINITIONS(-Wshadow) - ADD_DEFINITIONS(-Wmissing-prototypes) -- ADD_DEFINITIONS(-Wimplicit-fallthrough) -+ if("${CMAKE_C_COMPILER_ID}" MATCHES "Clang" OR NOT "7.0.0" VERSION_GREATER CMAKE_C_COMPILER_VERSION) -+ ADD_DEFINITIONS(-Wimplicit-fallthrough) -+ endif() - #ADD_DEFINITIONS(-Wfloat-equal) - #ADD_DEFINITIONS(-Wbad-function-cast) - #ADD_DEFINITIONS(-Wdocumentation) diff --git a/package/rtl_433/0002-minor-Fix-mongoose-build-without-threads.patch b/package/rtl_433/0002-minor-Fix-mongoose-build-without-threads.patch new file mode 100644 index 00000000000..85bc45147ae --- /dev/null +++ b/package/rtl_433/0002-minor-Fix-mongoose-build-without-threads.patch @@ -0,0 +1,42 @@ +From 707b51ecbc5598eed2fb67962232bf3fe0e96f81 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 27 Dec 2022 21:30:54 +0100 +Subject: [PATCH] minor: Fix mongoose build without threads (#2291) + +Fix the following build failure without threads: + +In file included from /home/buildroot/autobuild/instance-3/output-1/build/rtl_433-22.11/src/data_tag.c:17: +/home/buildroot/autobuild/instance-3/output-1/build/rtl_433-22.11/include/mongoose.h:407:10: fatal error: pthread.h: No such file or directory + 407 | #include + | ^~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/9f1677fc5a4568be0b9c121060c5d821ac2ae21b + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/merbanan/rtl_433/commit/707b51ecbc5598eed2fb67962232bf3fe0e96f81] +--- + include/mongoose.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/mongoose.h b/include/mongoose.h +index 1173b3fc7..b111ea34e 100644 +--- a/include/mongoose.h ++++ b/include/mongoose.h +@@ -404,7 +404,6 @@ unsigned int sleep(unsigned int seconds); + #include + #include + #include +-#include + #include + #include + #include +@@ -4658,6 +4657,7 @@ size_t mg_fwrite(const void *ptr, size_t size, size_t count, FILE *f); + #endif /* MG_ENABLE_FILESYSTEM */ + + #if MG_ENABLE_THREADS ++#include + /* + * Starts a new detached thread. + * Arguments and semantics are the same as pthead's `pthread_create()`. diff --git a/package/rtl_433/0002-src-optparse.c-fix-build-without-__has_attribute.patch b/package/rtl_433/0002-src-optparse.c-fix-build-without-__has_attribute.patch deleted file mode 100644 index 683754845f3..00000000000 --- a/package/rtl_433/0002-src-optparse.c-fix-build-without-__has_attribute.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 1b74826f155406f86846d5c97b3534aab87cf6da Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 26 Dec 2021 15:21:39 +0100 -Subject: [PATCH] src/optparse.c: fix build without __has_attribute - -Fix build failure without __has_attribute (e.g. gcc 4.8) which is raised -since -https://github.com/merbanan/rtl_433/commit/6c8af75c757712bd58b169317795484a72e9a16c - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/merbanan/rtl_433/pull/1918] ---- - src/optparse.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/optparse.c b/src/optparse.c -index aa3d0b53..b5e2d37e 100644 ---- a/src/optparse.c -+++ b/src/optparse.c -@@ -232,9 +232,11 @@ int atoi_time(char const *str, char const *error_hint) - } - // intentional fallthrough - #if defined(__GNUC__) || defined(__clang__) -+#if defined __has_attribute - #if __has_attribute(fallthrough) - __attribute__((fallthrough)); - #endif -+#endif - #endif - case ':': - ++colons; --- -2.33.0 - diff --git a/package/rtl_433/Config.in b/package/rtl_433/Config.in index 5664227c824..01c1e2f5cdd 100644 --- a/package/rtl_433/Config.in +++ b/package/rtl_433/Config.in @@ -1,8 +1,6 @@ config BR2_PACKAGE_RTL_433 bool "rtl_433" depends on BR2_USE_MMU # fork() - depends on !BR2_STATIC_LIBS - depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_LIBOPENSSL_ENABLE_PSK if BR2_PACKAGE_LIBOPENSSL help rtl_433 (despite the name) is a generic data receiver, mainly @@ -10,7 +8,3 @@ config BR2_PACKAGE_RTL_433 MHz ISM bands. https://github.com/merbanan/rtl_433 - -comment "rtl_433 needs a toolchain w/ dynamic library, threads" - depends on BR2_USE_MMU - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/rtl_433/rtl_433.hash b/package/rtl_433/rtl_433.hash index fd479dfd21e..51fb29c78e5 100644 --- a/package/rtl_433/rtl_433.hash +++ b/package/rtl_433/rtl_433.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 b362ef3410adec64aee7ad8e6d4d74875f1b3d59ef6fb4856e96adc03876dc65 rtl_433-21.12.tar.gz +sha256 61a9163d69cc4b1da46aebbcaf969bd180a055a6b90f42ad281218cc4fbefb86 rtl_433-22.11.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 a5139ddae60..e3be0e5ecf2 100644 --- a/package/rtl_433/rtl_433.mk +++ b/package/rtl_433/rtl_433.mk @@ -4,10 +4,11 @@ # ################################################################################ -RTL_433_VERSION = 21.12 +RTL_433_VERSION = 22.11 RTL_433_SITE = $(call github,merbanan,rtl_433,$(RTL_433_VERSION)) RTL_433_LICENSE = GPL-2.0+ RTL_433_LICENSE_FILES = COPYING +RTL_433_CPE_ID_VENDOR = rtl_433_project # Force Release build to remove ASAN. RTL_433_CONF_OPTS = \ @@ -31,4 +32,10 @@ else RTL_433_CONF_OPTS += -DENABLE_OPENSSL=OFF endif +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +RTL_433_CONF_OPTS += -DENABLE_THREADS=ON +else +RTL_433_CONF_OPTS += -DENABLE_THREADS=OFF +endif + $(eval $(cmake-package)) diff --git a/package/rtmpdump/rtmpdump.mk b/package/rtmpdump/rtmpdump.mk index db79a796dca..fb381d0e104 100644 --- a/package/rtmpdump/rtmpdump.mk +++ b/package/rtmpdump/rtmpdump.mk @@ -5,7 +5,8 @@ ################################################################################ RTMPDUMP_VERSION = c5f04a58fc2aeea6296ca7c44ee4734c18401aa3 -RTMPDUMP_SITE = git://git.ffmpeg.org/rtmpdump +RTMPDUMP_SITE = https://git.ffmpeg.org/rtmpdump +RTMPDUMP_SITE_METHOD = git RTMPDUMP_INSTALL_STAGING = YES # Note that rtmpdump is GPL-2.0 but librtmp has its own license and since we only # care about librtmp, it's LGPL-2.1+ diff --git a/package/rtorrent/rtorrent.hash b/package/rtorrent/rtorrent.hash index a20e63782b6..0403664639c 100644 --- a/package/rtorrent/rtorrent.hash +++ b/package/rtorrent/rtorrent.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9edf0304bf142215d3bc85a0771446b6a72d0ad8218efbe184b41e4c9c7542af rtorrent-0.9.8.tar.gz -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING +sha256 9edf0304bf142215d3bc85a0771446b6a72d0ad8218efbe184b41e4c9c7542af rtorrent-0.9.8.tar.gz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/rtptools/rtptools.hash b/package/rtptools/rtptools.hash index 11c8c2ab4b3..6988483b81b 100644 --- a/package/rtptools/rtptools.hash +++ b/package/rtptools/rtptools.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2c76b2a423fb943820c91194372133a44cbdc456ebf69c51616ec50eeb068c28 rtptools-1.22.tar.gz -sha256 f864592065e232c0b444ae9682a7a1a2c6aafe96712999f794bec24d4441a6a9 LICENSE +sha256 2c76b2a423fb943820c91194372133a44cbdc456ebf69c51616ec50eeb068c28 rtptools-1.22.tar.gz +sha256 f864592065e232c0b444ae9682a7a1a2c6aafe96712999f794bec24d4441a6a9 LICENSE diff --git a/package/rtty/0001-CMakeLists.txt-prefer-pkg_check_modules.patch b/package/rtty/0001-CMakeLists.txt-prefer-pkg_check_modules.patch new file mode 100644 index 00000000000..37140504456 --- /dev/null +++ b/package/rtty/0001-CMakeLists.txt-prefer-pkg_check_modules.patch @@ -0,0 +1,40 @@ +From 565c003ac412c9b0fa39d208d4a911f4300477c3 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 26 Feb 2023 20:39:11 +0100 +Subject: [PATCH] CMakeLists.txt: prefer pkg_check_modules + +Prefer pkg_check_modules over find_package to avoid the following static +build failure with openssl and -latomic: + +/home/autobuild/autobuild/instance-8/output-1/host/lib/gcc/sparc-buildroot-linux-uclibc/10.4.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: /home/autobuild/autobuild/instance-8/output-1/host/sparc-buildroot-linux-uclibc/sysroot/usr/lib/libssl.a(ssl_cert.o): in function `ssl_cert_free': +ssl_cert.c:(.text+0x53c): undefined reference to `__atomic_fetch_sub_4' + +Fixes: + - http://autobuild.buildroot.org/results/f606bb15bf4f88ba29ef0795413e13acc9cd0976 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/zhaojh329/ssl/pull/4] +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/ssl/CMakeLists.txt b/src/ssl/CMakeLists.txt +index 4868bf7..36488c7 100644 +--- a/src/ssl/CMakeLists.txt ++++ b/src/ssl/CMakeLists.txt +@@ -14,10 +14,10 @@ endif() + + find_package(PkgConfig QUIET) + +-find_package(OpenSSL) ++pkg_check_modules(OPENSSL openssl) + + if (NOT OPENSSL_FOUND) +- pkg_check_modules(OPENSSL openssl) ++ find_package(OpenSSL) + endif() + + find_package(WolfSSL) +-- +2.39.1 + diff --git a/package/rtty/rtty.hash b/package/rtty/rtty.hash index b2e9db24361..a6ccb5c2e67 100644 --- a/package/rtty/rtty.hash +++ b/package/rtty/rtty.hash @@ -1,2 +1,2 @@ -sha256 9bc5d30dfa9bd664a62711b6229f47505b83adb364907f24e3a404aad52a4802 rtty-7.4.0.tar.gz +sha256 e634939bae62bf3d52ceebae5df00179629d214634b93464eeb2294406512b30 rtty-8.1.0.tar.gz sha256 99efed4bbc0b62f96f999ef23399e38234fb91651af734fd389a52b033a85b55 LICENSE diff --git a/package/rtty/rtty.mk b/package/rtty/rtty.mk index 4ec220394cc..964ec04ec4b 100644 --- a/package/rtty/rtty.mk +++ b/package/rtty/rtty.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTTY_VERSION = 7.4.0 +RTTY_VERSION = 8.1.0 RTTY_SITE = https://github.com/zhaojh329/rtty/releases/download/v$(RTTY_VERSION) RTTY_LICENSE = MIT RTTY_LICENSE_FILES = LICENSE @@ -13,26 +13,26 @@ RTTY_DEPENDENCIES = libev ifeq ($(BR2_PACKAGE_MBEDTLS),y) RTTY_DEPENDENCIES += mbedtls RTTY_CONF_OPTS += \ - -DRTTY_SSL_SUPPORT=ON \ - -DRTTY_USE_MBEDTLS=ON \ - -DRTTY_USE_OPENSSL=OFF \ - -DRTTY_USE_WOLFSSL=OFF + -DSSL_SUPPORT=ON \ + -DUSE_MBEDTLS=ON \ + -DUSE_OPENSSL=OFF \ + -DUSE_WOLFSSL=OFF else ifeq ($(BR2_PACKAGE_OPENSSL),y) RTTY_DEPENDENCIES += host-pkgconf openssl RTTY_CONF_OPTS += \ - -DRTTY_SSL_SUPPORT=ON \ - -DRTTY_USE_MBEDTLS=OFF \ - -DRTTY_USE_OPENSSL=ON \ - -DRTTY_USE_WOLFSSL=OFF + -DSSL_SUPPORT=ON \ + -DUSE_MBEDTLS=OFF \ + -DUSE_OPENSSL=ON \ + -DUSE_WOLFSSL=OFF else ifeq ($(BR2_PACKAGE_WOLFSSL),y) RTTY_DEPENDENCIES += wolfssl RTTY_CONF_OPTS += \ - -DRTTY_SSL_SUPPORT=ON \ - -DRTTY_USE_MBEDTLS=OFF \ - -DRTTY_USE_OPENSSL=OFF \ - -DRTTY_USE_WOLFSSL=ON + -DSSL_SUPPORT=ON \ + -DUSE_MBEDTLS=OFF \ + -DUSE_OPENSSL=OFF \ + -DUSE_WOLFSSL=ON else -RTTY_CONF_OPTS += -DRTTY_SSL_SUPPORT=OFF +RTTY_CONF_OPTS += -DSSL_SUPPORT=OFF endif $(eval $(cmake-package)) diff --git a/package/rubix/rubix.hash b/package/rubix/rubix.hash index 3992110c32b..8ff5431824f 100644 --- a/package/rubix/rubix.hash +++ b/package/rubix/rubix.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ccff4c98373f76c6bab751f5f5a60df7ad8691c79b56157e4aba2dd76f501a87 rubix-1.0.6.tar.bz2 -sha256 429d04118c02bc92d834c430601f8c0c8df1ab27e3617ec73ad3f66c5953475d LICENCE +sha256 ccff4c98373f76c6bab751f5f5a60df7ad8691c79b56157e4aba2dd76f501a87 rubix-1.0.6.tar.bz2 +sha256 429d04118c02bc92d834c430601f8c0c8df1ab27e3617ec73ad3f66c5953475d LICENCE diff --git a/package/ruby/0001-Fix-build-with-LibreSSL-3-5.patch b/package/ruby/0001-Fix-build-with-LibreSSL-3-5.patch new file mode 100644 index 00000000000..805dfd2f898 --- /dev/null +++ b/package/ruby/0001-Fix-build-with-LibreSSL-3-5.patch @@ -0,0 +1,25 @@ +From e25fb0d0d86da5a9398ebdc9216b2ea89f80fa3d Mon Sep 17 00:00:00 2001 +From: Jeremy Evans +Date: Fri, 25 Mar 2022 13:11:31 -0700 +Subject: [PATCH] Fix build with LibreSSL 3.5 + +[Retrieved from: +https://github.com/ruby/openssl/commit/e25fb0d0d86da5a9398ebdc9216b2ea89f80fa3d] +Signed-off-by: Fabrice Fontaine +--- + ext/openssl/ossl_pkey.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ext/openssl/ossl_pkey.c b/ext/openssl/ossl_pkey.c +index 2a4835a2..24d0da46 100644 +--- a/ext/openssl/ossl_pkey.c ++++ b/ext/openssl/ossl_pkey.c +@@ -710,7 +710,7 @@ ossl_pkey_export_traditional(int argc, VALUE *argv, VALUE self, int to_der) + } + } + else { +-#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER) ++#if OSSL_OPENSSL_PREREQ(1, 1, 0) || OSSL_LIBRESSL_PREREQ(3, 5, 0) + if (!PEM_write_bio_PrivateKey_traditional(bio, pkey, enc, NULL, 0, + ossl_pem_passwd_cb, + (void *)pass)) { diff --git a/package/ruby/ruby.hash b/package/ruby/ruby.hash index 90e7627a97d..42d8a2497fa 100644 --- a/package/ruby/ruby.hash +++ b/package/ruby/ruby.hash @@ -1,5 +1,6 @@ -# https://www.ruby-lang.org/en/news/2021/12/25/ruby-3-1-0-released/ -sha512 a2bb6b5e62d5fa06dd9c30cf84ddcb2c27cb87fbaaffd2309a44391a6b110e1dde6b7b0d8c659b56387ee3c9b4264003f3532d5a374123a7c187ebba9293f320 ruby-3.1.0.tar.xz +# https://www.ruby-lang.org/en/news/2022/11/24/ruby-3-1-3-released/ +sha512 4b0fd334ae56132ba98b8a69adad54bdcf7f7aeabd5eba5b0f0399a3868e2054f9026ca1b1cb2dbb197a9e9b0610b263481949c0623a62071546bc5adff8ca69 ruby-3.1.3.tar.xz + # License files, Locally calculated sha256 794c384f94396ab07e3e6f53a9f8be093facb7eb4193266024302b93b29e12dc LEGAL sha256 967586d538a28955ec2541910cf63c5ac345fcdea94bfb1f1705a1f6eb36bcbb COPYING diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk index 4f3b94f83b8..28b1ec13efc 100644 --- a/package/ruby/ruby.mk +++ b/package/ruby/ruby.mk @@ -5,7 +5,7 @@ ################################################################################ RUBY_VERSION_MAJOR = 3.1 -RUBY_VERSION = $(RUBY_VERSION_MAJOR).0 +RUBY_VERSION = $(RUBY_VERSION_MAJOR).3 RUBY_VERSION_EXT = 3.1.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/Config.in b/package/runc/Config.in index 66203896a8e..fe527b19548 100644 --- a/package/runc/Config.in +++ b/package/runc/Config.in @@ -6,7 +6,7 @@ config BR2_PACKAGE_RUNC depends on !BR2_TOOLCHAIN_USES_UCLIBC # no fexecve help runC is a CLI tool for spawning and running containers - according to the OCP specification. + according to the OCI specification. https://github.com/opencontainers/runc diff --git a/package/runc/Config.in.host b/package/runc/Config.in.host new file mode 100644 index 00000000000..4b2555e029b --- /dev/null +++ b/package/runc/Config.in.host @@ -0,0 +1,8 @@ +config BR2_PACKAGE_HOST_RUNC + bool "host runc" + depends on BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS + help + runC is a CLI tool for spawning and running containers + according to the OCI specification. + + https://github.com/opencontainers/runc diff --git a/package/runc/runc.hash b/package/runc/runc.hash index 38d9f52510e..1a68b74ccb6 100644 --- a/package/runc/runc.hash +++ b/package/runc/runc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a8de57edbf0ff741ea798ccdd99ac0e1b79914f552871bd7cd92b0569f200964 runc-1.1.0.tar.gz +sha256 f1885d6dfa188f8112328ac2355e5d67346174a2e2e795ec514a972bcbfcc2fa runc-1.1.7.tar.gz sha256 552a739c3b25792263f731542238b92f6f8d07e9a488eae27e6c4690038a8243 LICENSE diff --git a/package/runc/runc.mk b/package/runc/runc.mk index a40075544e6..805ff23964f 100644 --- a/package/runc/runc.mk +++ b/package/runc/runc.mk @@ -4,7 +4,7 @@ # ################################################################################ -RUNC_VERSION = 1.1.0 +RUNC_VERSION = 1.1.7 RUNC_SITE = $(call github,opencontainers,runc,v$(RUNC_VERSION)) RUNC_LICENSE = Apache-2.0, LGPL-2.1 (libseccomp) RUNC_LICENSE_FILES = LICENSE @@ -23,4 +23,8 @@ RUNC_TAGS += seccomp RUNC_DEPENDENCIES += libseccomp host-pkgconf endif +HOST_RUNC_LDFLAGS = $(RUNC_LDFLAGS) +HOST_RUNC_TAGS = cgo static_build + $(eval $(golang-package)) +$(eval $(host-golang-package)) diff --git a/package/rust-bin/rust-bin.hash b/package/rust-bin/rust-bin.hash index 9f8788a2953..11cfae5e9b1 100644 --- a/package/rust-bin/rust-bin.hash +++ b/package/rust-bin/rust-bin.hash @@ -1,102 +1,129 @@ -# From https://static.rust-lang.org/dist/rust-1.58.1-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.58.1-i686-unknown-linux-gnu.tar.xz.asc -sha256 110ca4967351d8535f3d39e24f40e2941c20346c5765d3530270e134ae50568e rust-1.58.1-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.58.1-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.58.1-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 f71b077caf0becbd0af9fd22bc1fa31c4fdf7a21fe046da8a15a7bde1286da25 rust-1.58.1-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.58.1-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 c7a016ac63aeb5481d661ee3e680b57d35d5ccb902c605c32937a047a02cff49 rust-std-1.58.1-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.58.1-aarch64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-aarch64-unknown-linux-musl.tar.xz.asc -sha256 4c8d9774fb1f6cfa616f2c43395f438e887a38f0cd901a3886056cc1c1b84c30 rust-std-1.58.1-aarch64-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.58.1-arm-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-arm-unknown-linux-gnueabi.tar.xz.asc -sha256 eb58c2b72e9bbe50c80e9f2981e14d737198f7e17a4cad524d00baefdfa3bc1d rust-std-1.58.1-arm-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.58.1-arm-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-arm-unknown-linux-gnueabihf.tar.xz.asc -sha256 58e3f4905c3e7028811971219a3222640f947062fb93dbe51c1674551e9b06a6 rust-std-1.58.1-arm-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.58.1-arm-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-arm-unknown-linux-musleabihf.tar.xz.asc -sha256 b354f0ad28d8cc7d5996d46c3a310c80aa6486ac7b89abcd1eeef7f13435e0ff rust-std-1.58.1-arm-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.58.1-arm-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-arm-unknown-linux-musleabi.tar.xz.asc -sha256 705fba2a50835354112ab86d1ee8889c39f3c7265d7ca26f1dffebaa463600a6 rust-std-1.58.1-arm-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.58.1-armv5te-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-armv5te-unknown-linux-gnueabi.tar.xz.asc -sha256 0505759fa8b26c902a701f266db4bfbfe496de71c5c6548a55c562fe9d386485 rust-std-1.58.1-armv5te-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.58.1-armv5te-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-armv5te-unknown-linux-musleabi.tar.xz.asc -sha256 9ca8adb43b4e75556a99b6c7a9bc1d9aab894bbe109736c34582169ec81aee14 rust-std-1.58.1-armv5te-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.58.1-armv7-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-armv7-unknown-linux-gnueabihf.tar.xz.asc -sha256 9f38bc3220d659ff482db9a0ace9dcb7051991d471149fad7bbb62fce8314e04 rust-std-1.58.1-armv7-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.58.1-armv7-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-armv7-unknown-linux-gnueabi.tar.xz.asc -sha256 1511c675d17033737ab2bd1e87b525aaf59e0455f5a717ab0a91fd849949164f rust-std-1.58.1-armv7-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.58.1-armv7-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-armv7-unknown-linux-musleabihf.tar.xz.asc -sha256 2cf8a8cc2441a1bb4b45b690c87fff4df975fac077240706c08594e26f901bdc rust-std-1.58.1-armv7-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.58.1-armv7-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-armv7-unknown-linux-musleabi.tar.xz.asc -sha256 db86e823484f210884d7d815ffcd7dae355bba86e18151b0838ec06544bb8126 rust-std-1.58.1-armv7-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.58.1-i586-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-i586-unknown-linux-gnu.tar.xz.asc -sha256 02bce02f929114cc60126410fceeab6c0bcc8b96c394de9516d8f449880cb585 rust-std-1.58.1-i586-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.58.1-i586-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-i586-unknown-linux-musl.tar.xz.asc -sha256 e80d5769f042a00388546dbd26cb40c045d5dddc84e5da3f98d174027ed9eaaa rust-std-1.58.1-i586-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.58.1-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-i686-unknown-linux-gnu.tar.xz.asc -sha256 d7f2bc431db551ea9019a6d50d4e3f11e14fabbea3abec1478ac72a281309152 rust-std-1.58.1-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.58.1-i686-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-i686-unknown-linux-musl.tar.xz.asc -sha256 c70fbb13aedfb88cfec8098355a155a4edce3d52f9b099bc033b7c7ac45aab00 rust-std-1.58.1-i686-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.58.1-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-mips-unknown-linux-gnu.tar.xz.asc -sha256 b678ac0282cbb1965f9a7485a1f56b01d0229f91ddff5a18a9628f86970f5902 rust-std-1.58.1-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.58.1-mips-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-mips-unknown-linux-musl.tar.xz.asc -sha256 2f571f4c9b4e86e278539e811f495fb84f44898d4333b983a3d95ef5d2c0fdd8 rust-std-1.58.1-mips-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.58.1-mips64-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-mips64-unknown-linux-gnuabi64.tar.xz.asc -sha256 7f2f613606f039eec83239753a83c227b1d3c39b6474647234e7788a1541e850 rust-std-1.58.1-mips64-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.58.1-mips64-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-mips64-unknown-linux-muslabi64.tar.xz.asc -sha256 7283539843df5c8abd06b0ce3830efeab0d673447b45d3b6636d2eb296d28681 rust-std-1.58.1-mips64-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.58.1-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-mips64el-unknown-linux-gnuabi64.tar.xz.asc -sha256 3d2935e0979a7150cc271481f5f06569005ee27f0a7ef7ed1a5393c3e34b1974 rust-std-1.58.1-mips64el-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.58.1-mips64el-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-mips64el-unknown-linux-muslabi64.tar.xz.asc -sha256 33078d23ea70ca405b5938e5a2a74fbf4ec7dc41b729e4991e3e01d4c8370028 rust-std-1.58.1-mips64el-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.58.1-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 fdade0d00dac3524348041ec915a5a96208c9c1929ce746ab6352d0d2897a3a7 rust-std-1.58.1-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.58.1-mipsel-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-mipsel-unknown-linux-musl.tar.xz.asc -sha256 c747a00ac9a6ee70793002e6db2fbce3b2cd60eda277729468d18369736c6c8e rust-std-1.58.1-mipsel-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.58.1-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 7813f825e5d10aac0ded4b3f785970c69c25464b4edcf9c2b83eff0e55ee95f3 rust-std-1.58.1-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.58.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 c68d93de3a46ec709788fee2c38a298a261d4254d299299195ab3474b316a59b rust-std-1.58.1-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.58.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 a85f5f42918e8b140d7093ba49fc46a21625863538c95d2db03f831cc445f025 rust-std-1.58.1-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.58.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 2d7276fe261478c377913177dcec3e0aeed84f2c567db0ae8e415efee7bb9ce0 rust-std-1.58.1-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.58.1-sparc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-sparc64-unknown-linux-gnu.tar.xz.asc -sha256 7a7cd002c63179f3f47d64b1140c180986322a7cc0d31de61d7c4728cedacba0 rust-std-1.58.1-sparc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.58.1-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 e72367c15906f021f46801652181c917cd3328be022b93bb30506724f7b56256 rust-std-1.58.1-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.58.1-x86_64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.58.1-x86_64-unknown-linux-musl.tar.xz.asc -sha256 b0d3e03c9b1eff6e241383913b02653ba80776626ca7c4a93f36c2ad829ba989 rust-std-1.58.1-x86_64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 b7b8e8b70cae457092661894efa5a4861ef4f0e20f2f617d05d6f17b1f780a68 rust-1.67.1-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-i686-unknown-linux-gnu.tar.xz.asc +sha256 b686a2d0d1648e1b84def715dd65a85a3d2802b33ecf65808bdb2ed639aec7d3 rust-1.67.1-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-mips-unknown-linux-gnu.tar.xz.asc +sha256 c9df968487707eb63207f63086daed4fe1484829fb6221bd9414de2700424995 rust-1.67.1-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 4f56194a354b1413fb973d25f1c895aaa8e85211d316755508d6848e3a4fe18b rust-1.67.1-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 852e5a714ea8d2737f2cd5b0d6a12ecfa712b75238c643ba8138b490fc39fc43 rust-1.67.1-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 0a5bc85383d5d9d077dccaad1fb213d9498b6137112aaaabced6eb079fe12c9e rust-1.67.1-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 574851ff8503df9cb0dd04e6a1cd0ce5d709b5ea8b9c1265b314b9e182c818da rust-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 50e98fefef58218bd2c09c826308d43abe11b05f528b08ecca3d2657d7996630 rust-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-s390x-unknown-linux-gnu.tar.xz.asc +sha256 6e8629ace0c1b9cc0c2bc6225e6716df852370e5c7e907815ff8e6241e427699 rust-1.67.1-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 7dbb718bdb09adad7e36b9a413e571863913682495527f7f2d6507ea2c068542 rust-1.67.1-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 35027409400faaaa38ea2855b92dea6b553b2e656dff735da730f67ac02e57e6 rust-std-1.67.1-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-aarch64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-aarch64-unknown-linux-musl.tar.xz.asc +sha256 dcd3926c151cdd33d4de2860f021c86a18556809c4d06cbddebc1b377638710a rust-std-1.67.1-aarch64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-gnueabi.tar.xz.asc +sha256 da42d5b07984dac9a41719511eeb47cbb6c5e70b32a6eacba96c9f860ced0307 rust-std-1.67.1-arm-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-gnueabihf.tar.xz.asc +sha256 3b95c9595db3e10077c4eca8f63d80414bf3a50c1f0f6b2ac33f1992ee0940db rust-std-1.67.1-arm-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-musleabihf.tar.xz.asc +sha256 767761d99846174dfb7dfb579e2e2be63800478858a82f3f7050cc9555209a89 rust-std-1.67.1-arm-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-musleabi.tar.xz.asc +sha256 1e53306124de9f282452bd6085e86918e5e9f6f1940fc79809a1b284272e2d2b rust-std-1.67.1-arm-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv5te-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv5te-unknown-linux-gnueabi.tar.xz.asc +sha256 3e8bb4265c8c6d8984b69eeefe015131ea140148a58179b3abec5653d93bea7d rust-std-1.67.1-armv5te-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv5te-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv5te-unknown-linux-musleabi.tar.xz.asc +sha256 cbfce327b623e341c1243f0d29ef2f60e5fb205d406c79eb8be1433652c3c9a5 rust-std-1.67.1-armv5te-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-gnueabihf.tar.xz.asc +sha256 b6d00c4e338744ce1bf5b314f1056472acf1eb416f65057a8b3ca0a992fb04df rust-std-1.67.1-armv7-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-gnueabi.tar.xz.asc +sha256 8a7e46b15adb0718b4e4ee33cd46529117411e8d73c29043778b05e7412c2b46 rust-std-1.67.1-armv7-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-musleabihf.tar.xz.asc +sha256 6102f98617dd37874f3d755d0a325b45d47c6e1715c39d5e9bc037992e4d3cd6 rust-std-1.67.1-armv7-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-musleabi.tar.xz.asc +sha256 720958bc039c9ff00e7e399adf45f044484c5695a71bde0d07e0c895a819fe74 rust-std-1.67.1-armv7-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-i586-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-i586-unknown-linux-gnu.tar.xz.asc +sha256 22cbbf0b22d9b0894cfbd6e1dd6b95b71c7ad02cee4e477d375dcf81af8d1337 rust-std-1.67.1-i586-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-i586-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-i586-unknown-linux-musl.tar.xz.asc +sha256 49beb678732f34a0bfc22f94900c3d4a17ec05effdb7377864042df73b2a2819 rust-std-1.67.1-i586-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-i686-unknown-linux-gnu.tar.xz.asc +sha256 aab2d7aa76793e78c9c8810e93ed8978f6422843b1277e9c60337b0f943a4409 rust-std-1.67.1-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-i686-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-i686-unknown-linux-musl.tar.xz.asc +sha256 a2c6e55a8a2987d0c306d2c164347a70ab7a6a18f6562039a772b33e25934972 rust-std-1.67.1-i686-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips-unknown-linux-gnu.tar.xz.asc +sha256 048b3da190212b742f7a052618b57683dc96ee2b6c25fc7f5ae751143cb79bad rust-std-1.67.1-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips-unknown-linux-musl.tar.xz.asc +sha256 b9ef413b764a92d42e07a2e588268ece09994d2cd1ab2a93858c27f85a250349 rust-std-1.67.1-mips-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips64-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips64-unknown-linux-gnuabi64.tar.xz.asc +sha256 ef7fe3160de629f0d38788f2c270f87b0631480e5b0d848595b460528de719e4 rust-std-1.67.1-mips64-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips64-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips64-unknown-linux-muslabi64.tar.xz.asc +sha256 15fdb3e8b39c8a122e9beee0c4c909ee8ec356e57aaaaae5f2b9e94f58d73c87 rust-std-1.67.1-mips64-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips64el-unknown-linux-gnuabi64.tar.xz.asc +sha256 6ccfd98fd920cc2f1199bcf9a842430c27f6fcd2cc46c18421e487309ff7811e rust-std-1.67.1-mips64el-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips64el-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips64el-unknown-linux-muslabi64.tar.xz.asc +sha256 78477c45f5b848b156adaf0e0f6f2954ae73e2903321d1636c155020175eaaf5 rust-std-1.67.1-mips64el-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 94410897626546dde806a114299c3c32abb6b4b294af5daea5c4d136751fe063 rust-std-1.67.1-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mipsel-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mipsel-unknown-linux-musl.tar.xz.asc +sha256 b3f1a338e69428f1611f059c67b8afafa78ce5c7ed0799f8a90795390261d3a4 rust-std-1.67.1-mipsel-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 26efe78c09ed36da34964c0d023cf9aa404766ab790a94d9becd373b8879cb5a rust-std-1.67.1-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 135f5e6ab6d8f077a14521d387d3f31831abdb840ca4e6a15b6f0d0d5b7dbc81 rust-std-1.67.1-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 364c47ed22e4268edf238d221c40007d7d8792a66ca325d3937596a9c911ea48 rust-std-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 63a7e6a6c889a3d01bb3c66a3def3e41963511ea52e13906669da5b29b2fd9da rust-std-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-s390x-unknown-linux-gnu.tar.xz.asc +sha256 04573298d9e815c1e8c47a2f9548ea55d4a2afc538eceaa6a704d44a5e1f7e3e rust-std-1.67.1-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-sparc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-sparc64-unknown-linux-gnu.tar.xz.asc +sha256 addf0b0beb1966787e599f32849f18c28d5cb65515272b7d9608d4a1dddee2e7 rust-std-1.67.1-sparc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 f4dc8468dfc1dbd86f865b10f06e0e4b4e76f5a3a1cc27317a520ab1660844e9 rust-std-1.67.1-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-x86_64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-x86_64-unknown-linux-musl.tar.xz.asc +sha256 89741cd2ac00c3a3f565bcccdf442cc1f9ec58ea419f1f0d09e911be0ff86c87 rust-std-1.67.1-x86_64-unknown-linux-musl.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust-bin/rust-bin.mk b/package/rust-bin/rust-bin.mk index d4cb8f50ea8..bb66de5ec59 100644 --- a/package/rust-bin/rust-bin.mk +++ b/package/rust-bin/rust-bin.mk @@ -4,7 +4,9 @@ # ################################################################################ -RUST_BIN_VERSION = 1.58.1 +# When updating this version, check whether support/download/cargo-post-process +# still generates the same archives. +RUST_BIN_VERSION = 1.67.1 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/rust.hash b/package/rust/rust.hash index 7eb8f59603f..1b4b08ceccd 100644 --- a/package/rust/rust.hash +++ b/package/rust/rust.hash @@ -1,6 +1,6 @@ -# From https://static.rust-lang.org/dist/rustc-1.58.1-src.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rustc-1.58.1-src.tar.xz.asc -sha256 2b3643a48e7087053b0268971ec4154350342508922a8acb0707aaf94deb4469 rustc-1.58.1-src.tar.xz +# From https://static.rust-lang.org/dist/rustc-1.67.1-src.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rustc-1.67.1-src.tar.xz.asc +sha256 77e0615011f887d9533d5374bf9c15c590c3caf32bbb035b392d1c2ae502a682 rustc-1.67.1-src.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust/rust.mk b/package/rust/rust.mk index 46487fe4b70..814a3c1dd43 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -4,7 +4,9 @@ # ################################################################################ -RUST_VERSION = 1.58.1 +# When updating this version, check whether support/download/cargo-post-process +# still generates the same archives. +RUST_VERSION = 1.67.1 RUST_SOURCE = rustc-$(RUST_VERSION)-src.tar.xz RUST_SITE = https://static.rust-lang.org/dist RUST_LICENSE = Apache-2.0 or MIT @@ -14,6 +16,7 @@ HOST_RUST_PROVIDES = host-rustc HOST_RUST_DEPENDENCIES = \ toolchain \ + host-pkgconf \ host-python3 \ host-rust-bin \ host-openssl \ @@ -56,6 +59,7 @@ define HOST_RUST_CONFIGURE_CMDS echo 'sysconfdir = "$(HOST_DIR)/etc"'; \ echo '[rust]'; \ echo 'channel = "stable"'; \ + echo 'musl-root = "$(STAGING_DIR)"' ; \ echo '[target.$(RUSTC_TARGET_NAME)]'; \ echo 'cc = "$(TARGET_CROSS)gcc"'; \ echo '[llvm]'; \ @@ -67,9 +71,26 @@ define HOST_RUST_BUILD_CMDS cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py build endef +HOST_RUST_INSTALL_OPTS = \ + --prefix=$(HOST_DIR) \ + --disable-ldconfig + +define HOST_RUST_INSTALL_RUSTC + cd $(@D)/build/tmp/tarball/rust/$(RUSTC_HOST_NAME)/rust-$(RUST_VERSION)-$(RUSTC_HOST_NAME); \ + ./install.sh $(HOST_RUST_INSTALL_OPTS) --components=rustc,cargo,rust-std-$(RUSTC_HOST_NAME) +endef + +ifeq ($(BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS),y) +define HOST_RUST_INSTALL_LIBSTD_TARGET + cd $(@D)/build/tmp/tarball/rust-std/$(RUSTC_TARGET_NAME)/rust-std-$(RUST_VERSION)-$(RUSTC_TARGET_NAME); \ + ./install.sh $(HOST_RUST_INSTALL_OPTS) +endef +endif + define HOST_RUST_INSTALL_CMDS cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py dist - cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py install + $(HOST_RUST_INSTALL_RUSTC) + $(HOST_RUST_INSTALL_LIBSTD_TARGET) endef $(eval $(host-generic-package)) diff --git a/package/rustc/Config.in.host b/package/rustc/Config.in.host index 80d1d1a3d8a..822de68dbb6 100644 --- a/package/rustc/Config.in.host +++ b/package/rustc/Config.in.host @@ -1,7 +1,16 @@ # All host rust packages should depend on this option config BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS bool - default y if BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" + default y if BR2_HOSTARCH = "aarch64" + default y if BR2_HOSTARCH = "mips" + default y if BR2_HOSTARCH = "mipsel" + default y if BR2_HOSTARCH = "powerpc" + default y if BR2_HOSTARCH = "powerpc64" + default y if BR2_HOSTARCH = "powerpc64le" + default y if BR2_HOSTARCH = "riscv64" + default y if BR2_HOSTARCH = "s390x" + default y if BR2_HOSTARCH = "x86" + default y if BR2_HOSTARCH = "x86_64" # The pre-built Rust standard library is only available for a number # of architectures/C libraries combinations, with different levels of @@ -16,7 +25,7 @@ config BR2_PACKAGE_HOST_RUSTC_TARGET_TIER1_PLATFORMS # aarch64-unknown-linux-gnu default y if BR2_aarch64 && BR2_TOOLCHAIN_USES_GLIBC # i686-unknown-linux-gnu - default y if (BR2_i686 || BR2_x86_pentiumpro || BR2_X86_CPU_HAS_MMX) && BR2_TOOLCHAIN_USES_GLIBC + default y if (BR2_x86_i686 || BR2_x86_pentiumpro || BR2_X86_CPU_HAS_MMX) && BR2_TOOLCHAIN_USES_GLIBC # x86_64-unknown-linux-gnu default y if BR2_x86_64 && BR2_TOOLCHAIN_USES_GLIBC @@ -33,6 +42,9 @@ config BR2_PACKAGE_HOST_RUSTC_TARGET_TIER2_HOST_TOOLS_PLATFORMS default y if BR2_ARM_CPU_ARMV6 && BR2_ARM_EABIHF && BR2_TOOLCHAIN_USES_GLIBC # armv7-unknown-linux-gnueabihf default y if BR2_ARM_CPU_ARMV7A && BR2_ARM_EABIHF && BR2_TOOLCHAIN_USES_GLIBC + # armv7-unknown-linux-gnueabihf for armv8 hardware with 32-bit + # userspace + default y if BR2_arm && BR2_ARM_CPU_ARMV8A && BR2_ARM_EABIHF && BR2_TOOLCHAIN_USES_GLIBC # mips-unknown-linux-gnu default y if BR2_mips && BR2_TOOLCHAIN_USES_GLIBC && !BR2_MIPS_CPU_MIPS32R6 # mips64-unknown-linux-gnuabi64 @@ -53,6 +65,8 @@ config BR2_PACKAGE_HOST_RUSTC_TARGET_TIER2_HOST_TOOLS_PLATFORMS BR2_RISCV_ISA_RVA && BR2_RISCV_ISA_RVF && \ BR2_RISCV_ISA_RVD && BR2_RISCV_ISA_RVC && \ BR2_TOOLCHAIN_USES_GLIBC + # s390x-unknown-linux-gnu + default y if BR2_s390x && BR2_TOOLCHAIN_USES_GLIBC # x86_64-unknown-linux-musl default y if BR2_x86_64 && BR2_TOOLCHAIN_USES_MUSL @@ -75,12 +89,15 @@ config BR2_PACKAGE_HOST_RUSTC_TARGET_TIER2_PLATFORMS default y if BR2_ARM_CPU_ARMV7A && BR2_ARM_EABI && BR2_TOOLCHAIN_USES_MUSL # armv7-unknown-linux-musleabihf default y if BR2_ARM_CPU_ARMV7A && BR2_ARM_EABIHF && BR2_TOOLCHAIN_USES_MUSL + # armv7-unknown-linux-musleabihf for armv8 hardware with 32-bit + # userspace + default y if BR2_arm && BR2_ARM_CPU_ARMV8A && BR2_ARM_EABIHF && BR2_TOOLCHAIN_USES_MUSL # i586-unknown-linux-gnu - default y if BR2_i586 && BR2_TOOLCHAIN_USES_GLIBC + default y if BR2_x86_i586 && BR2_TOOLCHAIN_USES_GLIBC # i586-unknown-linux-musl - default y if BR2_i586 && BR2_TOOLCHAIN_USES_MUSL + default y if BR2_x86_i586 && BR2_TOOLCHAIN_USES_MUSL # i686-unknown-linux-musl - default y if (BR2_i686 || BR2_x86_pentiumpro || BR2_X86_CPU_HAS_MMX) && BR2_TOOLCHAIN_USES_MUSL + default y if (BR2_x86_i686 || BR2_x86_pentiumpro || BR2_X86_CPU_HAS_MMX) && BR2_TOOLCHAIN_USES_MUSL # mips-unknown-linux-musl default y if BR2_mips && BR2_TOOLCHAIN_USES_MUSL && !BR2_MIPS_CPU_MIPS32R6 # mips64-unknown-linux-muslabi64 @@ -93,17 +110,23 @@ config BR2_PACKAGE_HOST_RUSTC_TARGET_TIER2_PLATFORMS default y if BR2_sparc64 && BR2_TOOLCHAIN_USES_GLIBC # All target rust packages should depend on this option +# Note: With musl based toolchain, we need a C++ cross compiler to +# build host-rust some target libraries (libunwind) from llvm source +# code bundled in rust sources. config BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS bool default y if BR2_PACKAGE_HOST_RUSTC_TARGET_TIER1_PLATFORMS default y if BR2_PACKAGE_HOST_RUSTC_TARGET_TIER2_HOST_TOOLS_PLATFORMS default y if BR2_PACKAGE_HOST_RUSTC_TARGET_TIER2_PLATFORMS + depends on BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_USES_MUSL depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS config BR2_PACKAGE_HOST_RUSTC_ARCH string default "armv5te" if BR2_ARM_CPU_ARMV5 + default "arm" if BR2_ARM_CPU_ARMV6 default "armv7" if BR2_ARM_CPU_ARMV7A + default "armv7" if BR2_ARM_CPU_ARMV7A || (BR2_arm && BR2_ARM_CPU_ARMV8A) default "riscv64gc" if BR2_RISCV_64 default BR2_ARCH diff --git a/package/rustc/rustc.mk b/package/rustc/rustc.mk index 0513dd0b40b..b2cc131ee9f 100644 --- a/package/rustc/rustc.mk +++ b/package/rustc/rustc.mk @@ -11,7 +11,9 @@ ifeq ($(BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS),y) RUSTC_TARGET_NAME = $(RUSTC_ARCH)-unknown-linux-$(LIBC)$(RUSTC_ABI) endif -ifeq ($(HOSTARCH),x86) +ifeq ($(HOSTARCH),riscv64) +RUSTC_HOST_ARCH = riscv64gc +else ifeq ($(HOSTARCH),x86) RUSTC_HOST_ARCH = i686 else RUSTC_HOST_ARCH = $(HOSTARCH) diff --git a/package/rygel/0002-meson.build-fix-g_ir_compiler-calls.patch b/package/rygel/0002-meson.build-fix-g_ir_compiler-calls.patch new file mode 100644 index 00000000000..3961ad05644 --- /dev/null +++ b/package/rygel/0002-meson.build-fix-g_ir_compiler-calls.patch @@ -0,0 +1,84 @@ +From bed9e2effae60f7d736731e93d9e699cb173f04e Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 15 Mar 2022 19:20:33 +0100 +Subject: [PATCH] meson.build: fix g_ir_compiler calls + +Fix the following build failure when cross-compiling which is raised +because rygel is using a custom_target target instead of the standard +gnome.generate_gir: + +[108/298] Generating src/librygel-core/RygelCore-2.6.typelib with a custom command +FAILED: src/librygel-core/RygelCore-2.6.typelib +/home/giuliobenetti/autobuild/run/instance-3/output-1/host/nios2-buildroot-linux-gnu/sysroot/usr/bin/g-ir-compiler --output src/librygel-core/RygelCore-2.6.typelib /home/giuliobenetti/autobuild/run/instance-3/output-1/build/rygel-0.40.2/build/src/librygel-core/RygelCore-2.6.gir +Could not find GIR file 'GUPnP-1.2.gir'; check XDG_DATA_DIRS or use --includedir +error parsing file /home/giuliobenetti/autobuild/run/instance-3/output-1/build/rygel-0.40.2/build/src/librygel-core/RygelCore-2.6.gir: Failed to parse included gir GUPnP-1.2 + +Indeed, the custom_target command is unable to retrieve the correct +--includedir from glib-2.0.pc so add an ugly hack to custom_target calls + +Fixes: + - http://autobuild.buildroot.org/results/2b8956818f03f66a53480f7ed5fc0abb4f05288d + +Signed-off-by: Fabrice Fontaine +[Upstream status: probably not upstreamable] +--- + src/librygel-core/meson.build | 4 +++- + src/librygel-renderer-gst/meson.build | 1 + + src/librygel-renderer/meson.build | 1 + + src/librygel-server/meson.build | 1 + + 4 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/src/librygel-core/meson.build b/src/librygel-core/meson.build +index fd43bebe..e6be2b5e 100644 +--- a/src/librygel-core/meson.build ++++ b/src/librygel-core/meson.build +@@ -70,7 +70,9 @@ core_gir = custom_target('RygelCore-2.6.gir', + # so we depend on the custom_target from that step and pass the input through + # commandline. + custom_target('RygelCore-2.6.typelib', +- command: [g_ir_compiler, '--output', '@OUTPUT@', join_paths(meson.current_build_dir(), 'RygelCore-2.6.gir')], ++ command: [g_ir_compiler, '--output', '@OUTPUT@', ++ '--includedir', meson.get_external_property('sys_root') + get_option('prefix') + '/' + gir_dir, ++ join_paths(meson.current_build_dir(), 'RygelCore-2.6.gir')], + output: 'RygelCore-2.6.typelib', + depends: [ core_lib, core_gir ], + install: true, +diff --git a/src/librygel-renderer-gst/meson.build b/src/librygel-renderer-gst/meson.build +index ad98a3a7..e8baefe1 100644 +--- a/src/librygel-renderer-gst/meson.build ++++ b/src/librygel-renderer-gst/meson.build +@@ -36,6 +36,7 @@ custom_target('RygelRendererGst-2.6.typelib', + '--output', '@OUTPUT@', + '--includedir', core_girdir, + '--includedir', renderer_girdir, ++ '--includedir', meson.get_external_property('sys_root') + get_option('prefix') + '/' + gir_dir, + join_paths(meson.current_build_dir(), 'RygelRendererGst-2.6.gir')], + output: 'RygelRendererGst-2.6.typelib', + depends: [renderer_gst_lib, renderer_lib, renderer_gst_gir, renderer_gir], +diff --git a/src/librygel-renderer/meson.build b/src/librygel-renderer/meson.build +index 5f401527..821273ff 100644 +--- a/src/librygel-renderer/meson.build ++++ b/src/librygel-renderer/meson.build +@@ -43,6 +43,7 @@ custom_target('RygelRenderer-2.6.typelib', + command: [g_ir_compiler, + '--output', '@OUTPUT@', + '--includedir', core_girdir, ++ '--includedir', meson.get_external_property('sys_root') + get_option('prefix') + '/' + gir_dir, + join_paths(meson.current_build_dir(), 'RygelRenderer-2.6.gir')], + output: 'RygelRenderer-2.6.typelib', + depends: [ renderer_lib, renderer_gir, core_gir ], +diff --git a/src/librygel-server/meson.build b/src/librygel-server/meson.build +index a3bd77d9..6b084eb6 100644 +--- a/src/librygel-server/meson.build ++++ b/src/librygel-server/meson.build +@@ -122,6 +122,7 @@ custom_target('RygelServer-2.6.typelib', + command: [g_ir_compiler, + '--output', '@OUTPUT@', + '--includedir', core_girdir, ++ '--includedir', meson.get_external_property('sys_root') + get_option('prefix') + '/' + gir_dir, + join_paths(meson.current_build_dir(), 'RygelServer-2.6.gir')], + output: 'RygelServer-2.6.typelib', + depends: [ server_lib, server_gir, core_gir ], +-- +2.35.1 + diff --git a/package/rygel/Config.in b/package/rygel/Config.in index 30e84305370..e160068a556 100644 --- a/package/rygel/Config.in +++ b/package/rygel/Config.in @@ -52,12 +52,12 @@ comment "gstreamer1 needs gst1-editing-services" endchoice -comment "rygel needs a glibc toolchain w/ wchar, threads, gcc >= 4.9, host gcc >= 8" +endif # BR2_PACKAGE_RYGEL + +comment "rygel needs python3 and a glibc toolchain w/ wchar, threads, gcc >= 4.9, host gcc >= 8" depends on BR2_USE_MMU depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_USES_GLIBC || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ - !BR2_HOST_GCC_AT_LEAST_8 - -endif # BR2_PACKAGE_RYGEL + !BR2_HOST_GCC_AT_LEAST_8 || !BR2_PACKAGE_PYTHON3 diff --git a/package/rygel/rygel.hash b/package/rygel/rygel.hash index 04b11ff54a0..8bda1c2af77 100644 --- a/package/rygel/rygel.hash +++ b/package/rygel/rygel.hash @@ -1,4 +1,4 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/rygel/0.40/rygel-0.40.2.sha256sum: +# Hash from: https://download.gnome.org/sources/rygel/0.40/rygel-0.40.2.sha256sum: sha256 c9e8c736296d22c4defe959727a29d31437bbd2b7aa0c6470d6be24011050697 rygel-0.40.2.tar.xz # Locally calculated diff --git a/package/rygel/rygel.mk b/package/rygel/rygel.mk index e05297456d0..81d35be8334 100644 --- a/package/rygel/rygel.mk +++ b/package/rygel/rygel.mk @@ -7,7 +7,7 @@ RYGEL_VERSION_MAJOR = 0.40 RYGEL_VERSION = $(RYGEL_VERSION_MAJOR).2 RYGEL_SOURCE = rygel-$(RYGEL_VERSION).tar.xz -RYGEL_SITE = http://ftp.gnome.org/pub/gnome/sources/rygel/$(RYGEL_VERSION_MAJOR) +RYGEL_SITE = https://download.gnome.org/sources/rygel/$(RYGEL_VERSION_MAJOR) RYGEL_LICENSE = LGPL-2.1+, CC-BY-SA-3.0 (logo) RYGEL_LICENSE_FILES = COPYING COPYING.logo RYGEL_DEPENDENCIES = \ diff --git a/package/s390-tools/0004-zipl-boot-Makefile-no-pie-is-not-a-valid-ld-flag.patch b/package/s390-tools/0004-zipl-boot-Makefile-no-pie-is-not-a-valid-ld-flag.patch deleted file mode 100644 index fcdf06088a8..00000000000 --- a/package/s390-tools/0004-zipl-boot-Makefile-no-pie-is-not-a-valid-ld-flag.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 9fd3c733c645be13a2e39a3bae3983f88530b48d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Lukas=20M=C3=A4rdian?= -Date: Thu, 7 Jan 2021 12:46:22 +0100 -Subject: [PATCH] zipl/boot/Makefile: -no-pie is not a valid ld flag - -The "-no-pie" option never has been a valid flag of ld. It breaks the build with newer binutils. -See: -https://sourceware.org/bugzilla/show_bug.cgi?id=27050 -https://bugs.launchpad.net/ubuntu/+source/s390-tools/+bug/1907789 - -[Retrieved from: https://github.com/ibm-s390-linux/s390-tools/pull/106] -Signed-off-by: Fabrice Fontaine ---- - zipl/boot/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/zipl/boot/Makefile b/zipl/boot/Makefile -index a2e5f190..b81df778 100644 ---- a/zipl/boot/Makefile -+++ b/zipl/boot/Makefile -@@ -109,7 +109,7 @@ stage3.bin: stage3.exec - $< $@ - - data.o: $(FILES) -- $(LD) $(NO_PIE_LDFLAGS) -r -b binary -o data.o $(FILES) -+ $(LD) -r -b binary -o data.o $(FILES) - - data.h: data.o - rm -f data.h diff --git a/package/s390-tools/s390-tools.hash b/package/s390-tools/s390-tools.hash index 13c68fbf52f..37b67c5cb18 100644 --- a/package/s390-tools/s390-tools.hash +++ b/package/s390-tools/s390-tools.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 17dc163e6a1e940f895c64955c130058600e1df834e1ab134410be7266ef724a s390-tools-2.19.0.tar.gz +sha256 da81c55fb11d84923c0ebaed703f557052eb1a273495f60ebe3d20a74627303e s390-tools-2.26.0.tar.gz sha256 cca17a9a944ebec769adee4aebd805c912c357785ff2705a99ffe68563021f75 LICENSE diff --git a/package/s390-tools/s390-tools.mk b/package/s390-tools/s390-tools.mk index 328986bcb37..ec01a18cb07 100644 --- a/package/s390-tools/s390-tools.mk +++ b/package/s390-tools/s390-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -S390_TOOLS_VERSION = 2.19.0 +S390_TOOLS_VERSION = 2.26.0 S390_TOOLS_SITE = $(call github,ibm-s390-linux,s390-tools,v$(S390_TOOLS_VERSION)) S390_TOOLS_LICENSE = MIT S390_TOOLS_LICENSE_FILES = LICENSE @@ -12,11 +12,9 @@ S390_TOOLS_DEPENDENCIES = zlib S390_TOOLS_MAKE_OPTS = \ ARCH=$(BR2_ARCH) \ - CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" \ - LINK="$(TARGET_CC)" \ - LINKXX="$(TARGET_CXX)" + CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" -ifeq ($(BR2_PACKAGE_LIBCURL),y) +ifeq ($(BR2_PACKAGE_LIBCURL_OPENSSL),y) S390_TOOLS_DEPENDENCIES += libcurl S390_TOOLS_MAKE_OPTS += \ CURL_CONFIG=$(STAGING_DIR)/usr/bin/curl-config \ @@ -79,8 +77,8 @@ else S390_TOOLS_MAKE_OPTS += HAVE_PFM=0 endif -ifeq ($(BR2_PACKAGE_LIBFUSE),y) -S390_TOOLS_DEPENDENCIES += libfuse +ifeq ($(BR2_PACKAGE_LIBFUSE3),y) +S390_TOOLS_DEPENDENCIES += libfuse3 S390_TOOLS_MAKE_OPTS += HAVE_FUSE=1 else S390_TOOLS_MAKE_OPTS += HAVE_FUSE=0 @@ -95,6 +93,20 @@ else S390_TOOLS_MAKE_OPTS += HAVE_SNMP=0 endif +ifeq ($(BR2_PACKAGE_LIBLOCKFILE),y) +S390_TOOLS_DEPENDENCIES += liblockfile +S390_TOOLS_MAKE_OPTS += HAVE_LOCKFILE=1 +else +S390_TOOLS_MAKE_OPTS += HAVE_LOCKFILE=0 +endif + +ifeq ($(BR2_PACKAGE_HAS_UDEV),y) +S390_TOOLS_DEPENDENCIES += udev +S390_TOOLS_MAKE_OPTS += HAVE_LIBUDEV=1 +else +S390_TOOLS_MAKE_OPTS += HAVE_LIBUDEV=0 +endif + define S390_TOOLS_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ $(S390_TOOLS_MAKE_OPTS) diff --git a/package/s6-dns/s6-dns.hash b/package/s6-dns/s6-dns.hash index c63e96e1292..50830245209 100644 --- a/package/s6-dns/s6-dns.hash +++ b/package/s6-dns/s6-dns.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 0c1d50e5d7bc65cbf59b6f37fbd7f6f5645694224bb8c4dc1943d7921bc74f63 s6-dns-2.3.5.1.tar.gz -sha256 adecb8bedfaae27fcfe65ecb3ef0e2e71aa2a2b49dc21886a200bc677d93e6ec COPYING +sha256 76af222472c4754f83cdc59ad354255ce1b1e6f6833a059328463f8e51f4db43 s6-dns-2.3.5.4.tar.gz +sha256 35126cb8f2ff2a6e359f7bfec46c49004ead6304d8248ba67dcdebcc7d377754 COPYING diff --git a/package/s6-dns/s6-dns.mk b/package/s6-dns/s6-dns.mk index dfde2c29f19..1b7d65570f1 100644 --- a/package/s6-dns/s6-dns.mk +++ b/package/s6-dns/s6-dns.mk @@ -4,7 +4,7 @@ # ################################################################################ -S6_DNS_VERSION = 2.3.5.1 +S6_DNS_VERSION = 2.3.5.4 S6_DNS_SITE = http://skarnet.org/software/s6-dns S6_DNS_LICENSE = ISC S6_DNS_LICENSE_FILES = COPYING diff --git a/package/s6-linux-init/s6-linux-init.hash b/package/s6-linux-init/s6-linux-init.hash index 23f02d5359c..f70a4f87b5b 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 29e368516b1a3c61a6d1f8680645cc122a2e02127debec91738f170a3b93b8c5 s6-linux-init-1.0.6.3.tar.gz -sha256 4a5e44a69d649f0c37b29d7f6e5df1bb292b09898247be07f0c97814dac4b15d COPYING +sha256 92055a7964cf66604066ad964a2c2392ee7c5e64821be03146c1341e0d8c3dc6 s6-linux-init-1.0.8.0.tar.gz +sha256 1898df1e8703bd9c1350d2ec3397880b9b4c1451038a9ce5e1c4b2e58622da39 COPYING diff --git a/package/s6-linux-init/s6-linux-init.mk b/package/s6-linux-init/s6-linux-init.mk index 95595368de3..6aec220de41 100644 --- a/package/s6-linux-init/s6-linux-init.mk +++ b/package/s6-linux-init/s6-linux-init.mk @@ -4,7 +4,7 @@ # ################################################################################ -S6_LINUX_INIT_VERSION = 1.0.6.3 +S6_LINUX_INIT_VERSION = 1.0.8.0 S6_LINUX_INIT_SITE = http://skarnet.org/software/s6-linux-init S6_LINUX_INIT_LICENSE = ISC S6_LINUX_INIT_LICENSE_FILES = COPYING diff --git a/package/s6-linux-utils/0001-src-s6-linux-utils-rngseed.c-fix-build-with-glibc.patch b/package/s6-linux-utils/0001-src-s6-linux-utils-rngseed.c-fix-build-with-glibc.patch new file mode 100644 index 00000000000..2df8a997001 --- /dev/null +++ b/package/s6-linux-utils/0001-src-s6-linux-utils-rngseed.c-fix-build-with-glibc.patch @@ -0,0 +1,39 @@ +From 3ab8bdc1c657f91a2a96f4e6db308d17098de0c4 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 23 Feb 2023 12:09:11 +0100 +Subject: [PATCH] src/s6-linux-utils/rngseed.c: fix build with glibc < + +getrandom and sys/random.h are only available since glibc 2.25 resulting +in the following build failure since version 2.6.0.0 and +https://github.com/skarnet/s6-linux-utils/commit/ad5973028c42d947440cdae5e4f106152c3dda28: + +src/minutils/rngseed.c:15:24: fatal error: sys/random.h: No such file or directory + #include + ^ + +Fixes: + - http://autobuild.buildroot.org/results/214bcecfc389cb412b68627c831300478d614a3a + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/skarnet/s6-linux-utils/pull/2] +--- + src/s6-linux-utils/rngseed.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/minutils/rngseed.c b/src/minutils/rngseed.c +index 2b1772c..223f50a 100644 +--- a/src/minutils/rngseed.c ++++ b/src/minutils/rngseed.c +@@ -12,7 +12,9 @@ + #include + #include + #include ++#ifdef SKALIBS_HASGETRANDOM + #include ++#endif + #include + + #include +-- +2.39.1 + diff --git a/package/s6-linux-utils/s6-linux-utils.hash b/package/s6-linux-utils/s6-linux-utils.hash index 27e7eb7b7a8..c932a4363ae 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 c300dbf36b533083f82c6827830c55ce34bfc6cd493c782f207d199669a345ba s6-linux-utils-2.5.1.5.tar.gz -sha256 adecb8bedfaae27fcfe65ecb3ef0e2e71aa2a2b49dc21886a200bc677d93e6ec COPYING +sha256 6c7132734a0c8287002ee6910c469f175a97d766a8023c0c33af8ba92643ed59 s6-linux-utils-2.6.0.0.tar.gz +sha256 35126cb8f2ff2a6e359f7bfec46c49004ead6304d8248ba67dcdebcc7d377754 COPYING diff --git a/package/s6-linux-utils/s6-linux-utils.mk b/package/s6-linux-utils/s6-linux-utils.mk index 995ff1b855d..ffa3ffac5b2 100644 --- a/package/s6-linux-utils/s6-linux-utils.mk +++ b/package/s6-linux-utils/s6-linux-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -S6_LINUX_UTILS_VERSION = 2.5.1.5 +S6_LINUX_UTILS_VERSION = 2.6.0.0 S6_LINUX_UTILS_SITE = http://skarnet.org/software/s6-linux-utils S6_LINUX_UTILS_LICENSE = ISC S6_LINUX_UTILS_LICENSE_FILES = COPYING diff --git a/package/s6-networking/s6-networking.hash b/package/s6-networking/s6-networking.hash index 9e333866d3c..1890f95221a 100644 --- a/package/s6-networking/s6-networking.hash +++ b/package/s6-networking/s6-networking.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 a3fbca789dc5c82b3055fdbd2f55110902198f3136447617ce8f8b79fa8aa554 s6-networking-2.4.1.1.tar.gz -sha256 adecb8bedfaae27fcfe65ecb3ef0e2e71aa2a2b49dc21886a200bc677d93e6ec COPYING +sha256 7ac79d4de3d9c13532e444ab7497c4e04ad0fa7229d502984d9dc7d48aa64418 s6-networking-2.5.1.1.tar.gz +sha256 35126cb8f2ff2a6e359f7bfec46c49004ead6304d8248ba67dcdebcc7d377754 COPYING diff --git a/package/s6-networking/s6-networking.mk b/package/s6-networking/s6-networking.mk index 03807f06523..f740f22635b 100644 --- a/package/s6-networking/s6-networking.mk +++ b/package/s6-networking/s6-networking.mk @@ -4,7 +4,7 @@ # ################################################################################ -S6_NETWORKING_VERSION = 2.4.1.1 +S6_NETWORKING_VERSION = 2.5.1.1 S6_NETWORKING_SITE = http://skarnet.org/software/s6-networking S6_NETWORKING_LICENSE = ISC S6_NETWORKING_LICENSE_FILES = COPYING diff --git a/package/s6-portable-utils/s6-portable-utils.hash b/package/s6-portable-utils/s6-portable-utils.hash index dd9f7df4bd3..aa38c8b5daa 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 6627a2d3ea263539e83512a36f10a587fa0dd5e899bc3612187e9e3b9faf769c s6-portable-utils-2.2.3.2.tar.gz -sha256 adecb8bedfaae27fcfe65ecb3ef0e2e71aa2a2b49dc21886a200bc677d93e6ec COPYING +sha256 ebb39f8934fd36f25d31352e61bbd94dc02b1e9f04411850d2fd9658bd916e36 s6-portable-utils-2.2.5.0.tar.gz +sha256 35126cb8f2ff2a6e359f7bfec46c49004ead6304d8248ba67dcdebcc7d377754 COPYING diff --git a/package/s6-portable-utils/s6-portable-utils.mk b/package/s6-portable-utils/s6-portable-utils.mk index fb910320ea4..8cdb4fa9656 100644 --- a/package/s6-portable-utils/s6-portable-utils.mk +++ b/package/s6-portable-utils/s6-portable-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -S6_PORTABLE_UTILS_VERSION = 2.2.3.2 +S6_PORTABLE_UTILS_VERSION = 2.2.5.0 S6_PORTABLE_UTILS_SITE = http://skarnet.org/software/s6-portable-utils S6_PORTABLE_UTILS_LICENSE = ISC S6_PORTABLE_UTILS_LICENSE_FILES = COPYING diff --git a/package/s6-rc/s6-rc.hash b/package/s6-rc/s6-rc.hash index 8978d68ba61..0a84345e368 100644 --- a/package/s6-rc/s6-rc.hash +++ b/package/s6-rc/s6-rc.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 2a8d1cd455c05c8502b34517cfe79841aa46d08ad969076b37a15d3910617f89 s6-rc-0.5.2.2.tar.gz -sha256 4a5e44a69d649f0c37b29d7f6e5df1bb292b09898247be07f0c97814dac4b15d COPYING +sha256 4f24a4966a4aa353d2bd1a8afca9b88c7b7bd29c46b3a1a7f5305686b9d6e038 s6-rc-0.5.3.2.tar.gz +sha256 1898df1e8703bd9c1350d2ec3397880b9b4c1451038a9ce5e1c4b2e58622da39 COPYING diff --git a/package/s6-rc/s6-rc.mk b/package/s6-rc/s6-rc.mk index 05d79897356..85b047883ba 100644 --- a/package/s6-rc/s6-rc.mk +++ b/package/s6-rc/s6-rc.mk @@ -4,7 +4,7 @@ # ################################################################################ -S6_RC_VERSION = 0.5.2.2 +S6_RC_VERSION = 0.5.3.2 S6_RC_SITE = http://skarnet.org/software/s6-rc S6_RC_LICENSE = ISC S6_RC_LICENSE_FILES = COPYING diff --git a/package/s6/s6.hash b/package/s6/s6.hash index a829700d975..3c5ce4265af 100644 --- a/package/s6/s6.hash +++ b/package/s6/s6.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 1d21373151704150df0e8ed199f097f6ee5d2befb9a68aca4f20f3862e5d8757 s6-2.10.0.3.tar.gz -sha256 adecb8bedfaae27fcfe65ecb3ef0e2e71aa2a2b49dc21886a200bc677d93e6ec COPYING +sha256 6c1474be3e889dac392cee307abe015cd4be0c85c725c84ea7f184f0e34503a2 s6-2.11.1.2.tar.gz +sha256 35126cb8f2ff2a6e359f7bfec46c49004ead6304d8248ba67dcdebcc7d377754 COPYING diff --git a/package/s6/s6.mk b/package/s6/s6.mk index ead82d7eaf3..78962ed1593 100644 --- a/package/s6/s6.mk +++ b/package/s6/s6.mk @@ -4,7 +4,7 @@ # ################################################################################ -S6_VERSION = 2.10.0.3 +S6_VERSION = 2.11.1.2 S6_SITE = http://skarnet.org/software/s6 S6_LICENSE = ISC S6_LICENSE_FILES = COPYING diff --git a/package/sam-ba/Config.in.host b/package/sam-ba/Config.in.host index b96e377e79d..cd11e8633e5 100644 --- a/package/sam-ba/Config.in.host +++ b/package/sam-ba/Config.in.host @@ -1,11 +1,10 @@ config BR2_PACKAGE_HOST_SAM_BA bool "host sam-ba" depends on BR2_HOSTARCH = "x86_64" - select BR2_HOSTARCH_NEEDS_IA32_LIBS help Atmel SAM-BA software provides an open set of tools for programming the Atmel SAM3, SAM7 and SAM9 ARM-based microcontrollers. - http://www.at91.com/linux4sam/bin/view/Linux4SAM/SoftwareTools + https://www.linux4sam.org/bin/view/Linux4SAM/SoftwareTools https://www.microchip.com/en-us/development-tool/SAM-BA-IN-SYSTEM-PROGRAMMER diff --git a/package/sam-ba/sam-ba.hash b/package/sam-ba/sam-ba.hash index 10b95c9c0e7..252a60dbb87 100644 --- a/package/sam-ba/sam-ba.hash +++ b/package/sam-ba/sam-ba.hash @@ -1,3 +1,3 @@ # sha256 locally computed -sha256 f66e431f0401b197e80599156ea93aa3aab050bc4d16523c95fae1107ef9101c sam-ba_3.5-linux_x86_64.tar.gz +sha256 d295567701914e21318f4c48ff3a57374c7c91f65f0814158e84bb07dd4d07c2 sam-ba_v3.7-linux_x86_64.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.txt diff --git a/package/sam-ba/sam-ba.mk b/package/sam-ba/sam-ba.mk index 10bea8ef705..0928c8f9ca6 100644 --- a/package/sam-ba/sam-ba.mk +++ b/package/sam-ba/sam-ba.mk @@ -4,9 +4,9 @@ # ################################################################################ -SAM_BA_VERSION = 3.5 -SAM_BA_SITE = https://www.microchip.com/content/dam/mchp/documents/MPU32/ProductDocuments/SoftwareTools -SAM_BA_SOURCE = sam-ba_$(SAM_BA_VERSION)-linux_x86_64.tar.gz +SAM_BA_VERSION = 3.7 +SAM_BA_SITE = https://ww1.microchip.com/downloads/aemDocuments/documents/MPU32/ProductDocuments/SoftwareLibraries/Firmware +SAM_BA_SOURCE = sam-ba_v$(SAM_BA_VERSION)-linux_x86_64.tar.gz SAM_BA_LICENSE = GPLv2 SAM_BA_LICENSE_FILES = LICENSE.txt diff --git a/package/samba4/0001-libreplace-disable-libbsd-support.patch b/package/samba4/0001-libreplace-disable-libbsd-support.patch index 79216860dd8..8259e91fc65 100644 --- a/package/samba4/0001-libreplace-disable-libbsd-support.patch +++ b/package/samba4/0001-libreplace-disable-libbsd-support.patch @@ -19,7 +19,7 @@ diff --git a/lib/replace/wscript b/lib/replace/wscript index 240d730cbee..c6d8df43c74 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript -@@ -406,21 +406,6 @@ def configure(conf): +@@ -436,21 +436,6 @@ def configure(conf): strlcpy_in_bsd = False diff --git a/package/samba4/0002-build-find-pre-built-heimdal-build-tools-in-case-of-.patch b/package/samba4/0002-build-find-pre-built-heimdal-build-tools-in-case-of-.patch index 484e6722ea2..1c4de6a02ef 100644 --- a/package/samba4/0002-build-find-pre-built-heimdal-build-tools-in-case-of-.patch +++ b/package/samba4/0002-build-find-pre-built-heimdal-build-tools-in-case-of-.patch @@ -1,4 +1,4 @@ -From e002d2ef2688d5433d2bd03aa4d77a0ec5ac4e63 Mon Sep 17 00:00:00 2001 +From 2e53f331104b29db7caf1641a30d3e9316b57184 Mon Sep 17 00:00:00 2001 From: Uri Simchoni Date: Sun, 20 Oct 2019 00:03:14 +0300 Subject: [PATCH] build: find pre-built heimdal build tools in case of embedded @@ -33,18 +33,20 @@ 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] +[Bernd: rebased for version 4.11.13 & 4.17.7] --- wscript_configure_embedded_heimdal | 11 +++++++++++ wscript_configure_system_heimdal | 11 ----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/wscript_configure_embedded_heimdal b/wscript_configure_embedded_heimdal -index 8c55ae2a938..4fdae8062c5 100644 +index 8c55ae2..4fdae80 100644 --- a/wscript_configure_embedded_heimdal +++ b/wscript_configure_embedded_heimdal -@@ -1 +1,12 @@ - conf.RECURSE('source4/heimdal_build') +@@ -6,3 +6,14 @@ + + conf.define('USING_EMBEDDED_HEIMDAL', 1) + conf.RECURSE('third_party/heimdal_build') + +def check_system_heimdal_binary(name): + if conf.LIB_MAY_BE_BUNDLED(name): @@ -56,34 +58,6 @@ index 8c55ae2a938..4fdae8062c5 100644 + +check_system_heimdal_binary("compile_et") +check_system_heimdal_binary("asn1_compile") -diff --git a/wscript_configure_system_heimdal b/wscript_configure_system_heimdal -index 0ff6dad2f55..f77c177442f 100644 ---- a/wscript_configure_system_heimdal -+++ b/wscript_configure_system_heimdal -@@ -37,14 +37,6 @@ def check_system_heimdal_lib(name, functions='', headers='', onlyif=None): - conf.define('USING_SYSTEM_%s' % name.upper(), 1) - return True - --def check_system_heimdal_binary(name): -- if conf.LIB_MAY_BE_BUNDLED(name): -- return False -- if not conf.find_program(name, var=name.upper()): -- return False -- conf.define('USING_SYSTEM_%s' % name.upper(), 1) -- return True -- - check_system_heimdal_lib("com_err", "com_right_r com_err", "com_err.h") - - if check_system_heimdal_lib("roken", "rk_socket_set_reuseaddr", "roken.h"): -@@ -96,9 +88,6 @@ - #if conf.CHECK_BUNDLED_SYSTEM('tommath', checkfunctions='mp_init', headers='tommath.h'): - # conf.define('USING_SYSTEM_TOMMATH', 1) - --check_system_heimdal_binary("compile_et") --check_system_heimdal_binary("asn1_compile") -- - conf.env.KRB5_VENDOR = 'heimdal' - conf.define('USING_SYSTEM_KRB5', 1) - conf.define('USING_SYSTEM_HEIMDAL', 1) -- 2.20.1 + diff --git a/package/samba4/0004-3rdparty-heindal-Use-perl-module-JSON-part-of-core-i.patch b/package/samba4/0004-3rdparty-heindal-Use-perl-module-JSON-part-of-core-i.patch new file mode 100644 index 00000000000..aa55c098915 --- /dev/null +++ b/package/samba4/0004-3rdparty-heindal-Use-perl-module-JSON-part-of-core-i.patch @@ -0,0 +1,41 @@ +From bd8fc19c8383914b518a9d56f4c08fba3baeb967 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Sun, 7 May 2023 11:02:26 +0200 +Subject: [PATCH] 3rdparty/heimdal: Use perl module JSON:PP, part of core, instead + of JSON package + +Downloaded from +https://github.com/openwrt/packages/blob/master/net/samba4/patches/105-perl-json-pp.patch + +Signed-off-by: Bernd Kuhls +Signed-off-by: Yann E. MORIN +Upstream: https://github.com/heimdal/heimdal/pull/1176 +--- + third_party/heimdal/cf/make-proto.pl | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/third_party/heimdal/cf/make-proto.pl b/third_party/heimdal/cf/make-proto.pl +index 36a040ce6c0..ad21dbad9e1 100644 +--- a/third_party/heimdal/cf/make-proto.pl ++++ b/third_party/heimdal/cf/make-proto.pl +@@ -4,7 +4,7 @@ + use Getopt::Std; + use File::Compare; + +-use JSON; ++use JSON::PP; + + my $comment = 0; + my $doxygen = 0; +@@ -70,7 +70,7 @@ if($opt_x) { + my $EXP; + local $/; + open(EXP, '<', $opt_x) || die "open ${opt_x}"; +- my $obj = JSON->new->utf8->decode(); ++ my $obj = JSON::PP->new->utf8->decode(); + close $EXP; + + foreach my $x (keys %$obj) { +-- +2.25.1 + diff --git a/package/samba4/0004-lib-util-Add-signal.h-include.patch b/package/samba4/0004-lib-util-Add-signal.h-include.patch deleted file mode 100644 index 838a8fa6d75..00000000000 --- a/package/samba4/0004-lib-util-Add-signal.h-include.patch +++ /dev/null @@ -1,37 +0,0 @@ -From d1732a79dbf30c41802245909d0250ebe2b9d92e Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sun, 12 Dec 2021 10:27:42 +0100 -Subject: [PATCH] lib/util: Add signal.h include -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes build error with samba-4.15.3 and uClibc: - -../../source3/printing/samba-bgqd.c: In function ‘main’: -../../source3/printing/samba-bgqd.c:340:21: error: ‘SIGPIPE’ undeclared (first use in this function); did you mean ‘EPIPE’? -../../source3/printing/samba-bgqd.c:384:14: error: ‘SIGTERM’ undeclared (first use in this function) - -Patch sent upstream: -https://gitlab.com/samba-team/samba/-/merge_requests/2296 - -Signed-off-by: Bernd Kuhls ---- - lib/util/signal.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/util/signal.h b/lib/util/signal.h -index 0663af6ab94..f662ee110d6 100644 ---- a/lib/util/signal.h -+++ b/lib/util/signal.h -@@ -21,6 +21,7 @@ - #ifndef _SAMBA_UTIL_SIGNAL_H_ - #define _SAMBA_UTIL_SIGNAL_H_ - -+#include - #include - - /** --- -2.30.2 - diff --git a/package/samba4/Config.in b/package/samba4/Config.in index e114a7e13f8..5907bdc4788 100644 --- a/package/samba4/Config.in +++ b/package/samba4/Config.in @@ -16,6 +16,7 @@ config BR2_PACKAGE_SAMBA4 select BR2_PACKAGE_CMOCKA select BR2_PACKAGE_E2FSPROGS select BR2_PACKAGE_GNUTLS + select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC select BR2_PACKAGE_POPT select BR2_PACKAGE_ZLIB diff --git a/package/samba4/samba4-cache.txt b/package/samba4/samba4-cache.txt index ba849b7c6e7..d95776a03e6 100644 --- a/package/samba4/samba4-cache.txt +++ b/package/samba4/samba4-cache.txt @@ -44,3 +44,4 @@ Checking value of GNUTLS_CIPHER_AES_128_CFB8: 29 Checking value of GNUTLS_MAC_AES_CMAC_128: 203 Checking whether fcntl supports flags to send direct I/O availability signals: OK Checking for gnutls fips mode support: NO +Checking for readlink breakage: NO diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index 503ec2ce37c..fb278c11240 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.15.5.tar.asc -sha256 69115e33831937ba5151be0247943147765aece658ba743f44741672ad68d17f samba-4.15.5.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.18.6.tar.asc +sha256 284c8a994ce989c87cd6808c390fcb9d00c36b21a0dc1a8a75474b67c9e715e7 samba-4.18.6.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 0ad3c2f742f..7b9e320012e 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.15.5 +SAMBA4_VERSION = 4.18.6 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES @@ -39,6 +39,11 @@ else SAMBA4_CONF_OPTS += --disable-python endif +ifeq ($(BR2_PACKAGE_LIBICONV),y) +SAMBA4_DEPENDENCIES += libiconv +SAMBA4_LDFLAGS += -liconv +endif + ifeq ($(BR2_PACKAGE_LIBTIRPC),y) SAMBA4_CFLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags libtirpc` SAMBA4_LDFLAGS += `$(PKG_CONFIG_HOST_BINARY) --libs libtirpc` @@ -88,6 +93,13 @@ else SAMBA4_CONF_OPTS += --without-libarchive endif +ifeq ($(BR2_PACKAGE_LIBUNWIND),y) +SAMBA4_CONF_OPTS += --with-libunwind +SAMBA4_DEPENDENCIES += libunwind +else +SAMBA4_CONF_OPTS += --without-libunwind +endif + ifeq ($(BR2_PACKAGE_NCURSES),y) SAMBA4_CONF_ENV += NCURSES_CONFIG="$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS)" SAMBA4_DEPENDENCIES += ncurses @@ -115,7 +127,7 @@ define SAMBA4_CONFIGURE_CMDS PERL="$(HOST_DIR)/bin/perl" \ $(TARGET_CONFIGURE_OPTS) \ $(SAMBA4_CONF_ENV) \ - ./buildtools/bin/waf configure \ + ./configure \ --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/package/sane-backends/0002-genesys-fix-gcc-4.8-compile.patch b/package/sane-backends/0002-genesys-fix-gcc-4.8-compile.patch deleted file mode 100644 index 80346596cbf..00000000000 --- a/package/sane-backends/0002-genesys-fix-gcc-4.8-compile.patch +++ /dev/null @@ -1,50 +0,0 @@ -From f67cfd6a534e9faaca83afebd61a6d77d7837174 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Mon, 15 Mar 2021 20:53:55 +0100 -Subject: [PATCH] genesys: fix gcc-4.8 compile - -Fixes: - - genesys/utilities.h:229:23: error: invalid initialization of non-const reference of type 'std::basic_ios&' from an rvalue of type '' - stream_{stream} - ^ - genesys/image_pipeline.cpp:715:19: error: invalid initialization of non-const reference of type 'genesys::ImagePipelineNode&' from an rvalue of type '' - source_{source} - ^ - -[Upstream: https://gitlab.com/sane-project/backends/-/merge_requests/609] -Signed-off-by: Peter Seiderer ---- - backend/genesys/image_pipeline.cpp | 2 +- - backend/genesys/utilities.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/backend/genesys/image_pipeline.cpp b/backend/genesys/image_pipeline.cpp -index 4161e95..14e2f8d 100644 ---- a/backend/genesys/image_pipeline.cpp -+++ b/backend/genesys/image_pipeline.cpp -@@ -712,7 +712,7 @@ ImagePipelineNodeCalibrate::ImagePipelineNodeCalibrate(ImagePipelineNode& source - const std::vector& bottom, - const std::vector& top, - std::size_t x_start) : -- source_{source} -+ source_(source) - { - std::size_t size = 0; - if (bottom.size() >= x_start && top.size() >= x_start) { -diff --git a/backend/genesys/utilities.h b/backend/genesys/utilities.h -index 6e637d0..2ef2ddd 100644 ---- a/backend/genesys/utilities.h -+++ b/backend/genesys/utilities.h -@@ -226,7 +226,7 @@ class BasicStreamStateSaver - { - public: - explicit BasicStreamStateSaver(std::basic_ios& stream) : -- stream_{stream} -+ stream_(stream) - { - flags_ = stream_.flags(); - width_ = stream_.width(); --- -2.30.1 - diff --git a/package/sane-backends/0003-genesys-use-usleep-instead-of-std-this_thread-sleep_.patch b/package/sane-backends/0003-genesys-use-usleep-instead-of-std-this_thread-sleep_.patch deleted file mode 100644 index 348b73e3fbc..00000000000 --- a/package/sane-backends/0003-genesys-use-usleep-instead-of-std-this_thread-sleep_.patch +++ /dev/null @@ -1,46 +0,0 @@ -From b6e21e3cd0825e7ec2b3b7e6401d25b901deeed2 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Wed, 31 Mar 2021 22:51:03 +0200 -Subject: [PATCH] genesys: use usleep instead of std::this_thread::sleep_for to - re-enable thread less compile -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes: - - genesys/scanner_interface_usb.cpp: In member function ‘virtual void genesys::ScannerInterfaceUsb::sleep_us(unsigned int)’: - genesys/scanner_interface_usb.cpp:484:10: error: ‘std::this_thread’ has not been declared - 484 | std::this_thread::sleep_for(std::chrono::microseconds{microseconds}); - | ^~~~~~~~~~~ - -[Upstream: https://gitlab.com/sane-project/backends/-/merge_requests/619] -Signed-off-by: Peter Seiderer ---- - backend/genesys/scanner_interface_usb.cpp | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/backend/genesys/scanner_interface_usb.cpp b/backend/genesys/scanner_interface_usb.cpp -index 117297c..2ca78ab 100644 ---- a/backend/genesys/scanner_interface_usb.cpp -+++ b/backend/genesys/scanner_interface_usb.cpp -@@ -43,7 +43,6 @@ - - #include "scanner_interface_usb.h" - #include "low.h" --#include - - namespace genesys { - -@@ -481,7 +480,7 @@ void ScannerInterfaceUsb::sleep_us(unsigned microseconds) - if (sanei_usb_is_replay_mode_enabled()) { - return; - } -- std::this_thread::sleep_for(std::chrono::microseconds{microseconds}); -+ usleep(microseconds); - } - - void ScannerInterfaceUsb::record_progress_message(const char* msg) --- -2.30.2 - diff --git a/package/sane-backends/0004-backend-microtek-fix-uclibc-compile-include-stdarg.h.patch b/package/sane-backends/0004-backend-microtek-fix-uclibc-compile-include-stdarg.h.patch deleted file mode 100644 index c5af162469d..00000000000 --- a/package/sane-backends/0004-backend-microtek-fix-uclibc-compile-include-stdarg.h.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 145e16008e7479ea58278e55f71d6dfcd4db714b Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Fri, 18 Jun 2021 19:51:45 +0200 -Subject: [PATCH] backend/microtek: fix uclibc compile (include stdarg.h for - va_list/va_start/va_end) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes: - - microtek.c: In function ‘MDBG_INIT’: - microtek.c:163:3: error: unknown type name ‘va_list’ - 163 | va_list ap; - | ^~~~~~~ - microtek.c:78:1: note: ‘va_list’ is defined in header ‘’; did you forget to ‘#include ’? - 77 | #include "microtek.h" - +++ |+#include - 78 | - microtek.c:164:3: warning: implicit declaration of function ‘va_start’; did you mean ‘sane_start’? [-Wimplicit-function-declaration] - 164 | va_start(ap, format); - | ^~~~~~~~ - | sane_start - microtek.c:165:54: warning: passing argument 4 of ‘vsnprintf’ makes pointer from integer without a cast [-Wint-conversion] - 165 | vsnprintf(_mdebug_string, MAX_MDBG_LENGTH, format, ap); - | ^~ - | | - | int - In file included from ../include/sane/sanei_config.h:50, - from microtek.c:70: - .../host/x86_64-buildroot-linux-uclibc/sysroot/usr/include/stdio.h:359:57: note: expected ‘__va_list_tag *’ but argument is of type ‘int’ - 359 | const char *__restrict __format, __gnuc_va_list __arg) - | ~~~~~~~~~~~~~~~^~~~~ - microtek.c:166:3: warning: implicit declaration of function ‘va_end’ [-Wimplicit-function-declaration] - 166 | va_end(ap); - | ^~~~~~ - -[Upstream: https://gitlab.com/sane-project/backends/-/merge_requests/638] -Signed-off-by: Peter Seiderer ---- - backend/microtek.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/backend/microtek.c b/backend/microtek.c -index 200a69c1a..63560179c 100644 ---- a/backend/microtek.c -+++ b/backend/microtek.c -@@ -57,6 +57,7 @@ - - #include "../include/sane/config.h" - -+#include - #include - #include - #include --- -2.31.1 - diff --git a/package/sane-backends/0005-backend-sm3600-scanutil-fix-uclibc-compile-include-s.patch b/package/sane-backends/0005-backend-sm3600-scanutil-fix-uclibc-compile-include-s.patch deleted file mode 100644 index 0ea9de245ec..00000000000 --- a/package/sane-backends/0005-backend-sm3600-scanutil-fix-uclibc-compile-include-s.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 7dafc52dda96fa68f39058b10eec3d822fd5ea9d Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Fri, 18 Jun 2021 19:56:56 +0200 -Subject: [PATCH] backend/sm3600-scanutil: fix uclibc compile (include stdarg.h - for va_list/va_start/va_end) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes: - - sm3600-scanutil.c: In function ‘debug_printf’: - sm3600-scanutil.c:69:3: error: unknown type name ‘va_list’ - 69 | va_list ap; - | ^~~~~~~ - sm3600-scanutil.c:48:1: note: ‘va_list’ is defined in header ‘’; did you forget to ‘#include ’? - 47 | #include "sm3600-scantool.h" - +++ |+#include - 48 | - sm3600-scanutil.c:75:3: warning: implicit declaration of function ‘va_start’; did you mean ‘sane_start’? [-Wimplicit-function-declaration] - 75 | va_start(ap,szFormat); - | ^~~~~~~~ - | sane_start - sm3600-scanutil.c:76:28: warning: passing argument 3 of ‘vfprintf’ makes pointer from integer without a cast [-Wint-conversion] - 76 | vfprintf(stderr,szFormat,ap); - | ^~ - | | - | int - In file included from ../include/sane/sanei_config.h:50, - from sm3600.c:70: - .../host/x86_64-buildroot-linux-uclibc/sysroot/usr/include/stdio.h:339:23: note: expected ‘__va_list_tag *’ but argument is of type ‘int’ - 339 | __gnuc_va_list __arg); - | ~~~~~~~~~~~~~~~^~~~~ - In file included from sm3600.c:94: - sm3600-scanutil.c:77:3: warning: implicit declaration of function ‘va_end’ [-Wimplicit-function-declaration] - 77 | va_end(ap); - | ^~~~~~ - -[Upstream: https://gitlab.com/sane-project/backends/-/merge_requests/638] -Signed-off-by: Peter Seiderer ---- - backend/sm3600-scanutil.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/backend/sm3600-scanutil.c b/backend/sm3600-scanutil.c -index 6fe67ed0c..616bf3f4c 100644 ---- a/backend/sm3600-scanutil.c -+++ b/backend/sm3600-scanutil.c -@@ -43,6 +43,7 @@ Userspace scan tool for the Microtek 3600 scanner - - ====================================================================== */ - -+#include - #include - #include "sm3600-scantool.h" - --- -2.31.1 - diff --git a/package/sane-backends/sane-backends.hash b/package/sane-backends/sane-backends.hash index e382aacef25..4282798d65d 100644 --- a/package/sane-backends/sane-backends.hash +++ b/package/sane-backends/sane-backends.hash @@ -1,5 +1,5 @@ -# From https://gitlab.com/sane-project/backends/uploads/a705aadf854ca0dc8bf66df937308861/sane-backends-1.0.32.sha256.txt -sha256 3a28c237c0a72767086202379f6dc92dbb63ec08dfbab22312cba80e238bb114 sane-backends-1.0.32.tar.gz +# From https://gitlab.com/sane-project/backends/uploads/d7cf858db3e2abb8fad09cf6b944fc10/sane-backends-1.1.1.sha512.txt +sha512 25bd9f90d550cfe6a6d01c48e83716a53f4b0e3a294287e455ecb5e5b80c8fe1699f45c6c87f694475cceb85745c70597e18a7b1094669d5091c5fb183dfe94d sane-backends-1.1.1.tar.gz # Hash for license file sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/sane-backends/sane-backends.mk b/package/sane-backends/sane-backends.mk index a8f7466f706..83c40e684f7 100644 --- a/package/sane-backends/sane-backends.mk +++ b/package/sane-backends/sane-backends.mk @@ -4,9 +4,9 @@ # ################################################################################ -SANE_BACKENDS_VERSION = 1.0.32 +SANE_BACKENDS_VERSION = 1.1.1 SANE_BACKENDS_SITE = \ - https://gitlab.com/sane-project/backends/uploads/104f09c07d35519cc8e72e604f11643f + https://gitlab.com/sane-project/backends/uploads/7d30fab4e115029d91027b6a58d64b43 SANE_BACKENDS_CONFIG_SCRIPTS = sane-config SANE_BACKENDS_LICENSE = GPL-2.0+ SANE_BACKENDS_LICENSE_FILES = COPYING diff --git a/package/sbc/0001-sbc_primitives-Fix-build-on-non-x86.patch b/package/sbc/0001-sbc_primitives-Fix-build-on-non-x86.patch deleted file mode 100644 index 3ed73ebd889..00000000000 --- a/package/sbc/0001-sbc_primitives-Fix-build-on-non-x86.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 909a9bdf7ab143e1f0baaf9736baebd3cd79aacf Mon Sep 17 00:00:00 2001 -From: Marius Bakke -Date: Tue, 22 Dec 2020 11:04:26 +0000 -Subject: [PATCH] sbc_primitives: Fix build on non-x86. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Don't call __builtin_cpu_init unless targeting i386 or x86_64. -Otherwise we get an error at link time: - - CC sbc/sbc_primitives.lo -sbc/sbc_primitives.c: In function ‘sbc_init_primitives_x86’: -sbc/sbc_primitives.c:596:2: warning: implicit declaration of function ‘__builtin_cpu_init’; did you mean ‘__builtin_irint’? [-Wimplicit-function-declaration] -[...] - CCLD src/sbcdec -ld: sbc/.libs/libsbc-private.a(sbc_primitives.o): in function `sbc_init_primitives': -sbc_primitives.c:(.text+0x3a30): undefined reference to `__builtin_cpu_init' - -Signed-off-by: Pierre-Jean Texier -[Upstream status: backport from upstream commit 909a9bdf7ab143e1f0baaf9736baebd3cd79aacf] - ---- - sbc/sbc_primitives.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/sbc/sbc_primitives.c b/sbc/sbc_primitives.c -index 97a75be..09c214a 100644 ---- a/sbc/sbc_primitives.c -+++ b/sbc/sbc_primitives.c -@@ -593,6 +593,7 @@ static int sbc_calc_scalefactors_j( - - static void sbc_init_primitives_x86(struct sbc_encoder_state *state) - { -+#if defined(__x86_64__) || defined(__i386__) - __builtin_cpu_init(); - - #ifdef SBC_BUILD_WITH_MMX_SUPPORT -@@ -604,6 +605,7 @@ static void sbc_init_primitives_x86(struct sbc_encoder_state *state) - if (__builtin_cpu_supports("sse4.2")) - sbc_init_primitives_sse(state); - #endif -+#endif - } - - /* --- -2.17.1 - diff --git a/package/sbc/Config.in b/package/sbc/Config.in index f1dbc0ec2c5..4d1f6297f77 100644 --- a/package/sbc/Config.in +++ b/package/sbc/Config.in @@ -1,8 +1,17 @@ config BR2_PACKAGE_SBC bool "sbc" - select BR2_PACKAGE_LIBSNDFILE help An audio codec to connect bluetooth high quality audio devices like headphones or loudspeakers. http://www.bluez.org/ + +if BR2_PACKAGE_SBC + +config BR2_PACKAGE_SBC_TOOLS + bool "tools" + select BR2_PACKAGE_LIBSNDFILE + help + Build the command-line SBC tools as well as the library. + +endif diff --git a/package/sbc/sbc.hash b/package/sbc/sbc.hash index beb3b232a8c..b080c062054 100644 --- a/package/sbc/sbc.hash +++ b/package/sbc/sbc.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc -sha256 0cbad69823a99e8421fe0700e8cf9eeb8fa0c1ad28e8dbc2182b3353507931d2 sbc-1.5.tar.xz +sha256 8f12368e1dbbf55e14536520473cfb338c84b392939cc9b64298360fd4a07992 sbc-2.0.tar.xz # sha256 locally computed sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING diff --git a/package/sbc/sbc.mk b/package/sbc/sbc.mk index af5cf291a3d..7a37a99643f 100644 --- a/package/sbc/sbc.mk +++ b/package/sbc/sbc.mk @@ -4,12 +4,20 @@ # ################################################################################ -SBC_VERSION = 1.5 +SBC_VERSION = 2.0 SBC_SOURCE = sbc-$(SBC_VERSION).tar.xz SBC_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth SBC_INSTALL_STAGING = YES -SBC_DEPENDENCIES = libsndfile host-pkgconf -SBC_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (library) +SBC_DEPENDENCIES = host-pkgconf +SBC_LICENSE := LGPL-2.1+ (library) SBC_LICENSE_FILES = COPYING COPYING.LIB +ifeq ($(BR2_PACKAGE_SBC_TOOLS),y) +SBC_DEPENDENCIES += libsndfile +SBC_CONF_OPTS += --enable-tools --enable-tester +SBC_LICENSE += , GPL-2.0+ (programs) +else +SBC_CONF_OPTS += --disable-tools --disable-tester +endif + $(eval $(autotools-package)) diff --git a/package/sconeserver/0001-sconex-Descriptor.cpp-fix-build-with-gcc-11.patch b/package/sconeserver/0001-sconex-Descriptor.cpp-fix-build-with-gcc-11.patch deleted file mode 100644 index 335be82f7d0..00000000000 --- a/package/sconeserver/0001-sconex-Descriptor.cpp-fix-build-with-gcc-11.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 5e4cb613d9bb287e9f54da86f99a51d0338b1faa Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 10 Aug 2021 10:36:53 +0200 -Subject: [PATCH] sconex/Descriptor.cpp: fix build with gcc 11 - -Fix the following build failure with gcc 11: - -In file included from ../sconex/sconex.h:229, - from ../sconex/Descriptor.h:63, - from Descriptor.cpp:22: -Descriptor.cpp: In member function 'void scx::Descriptor::add_stream(scx::Stream*)': -Descriptor.cpp:150:22: error: ordered comparison of pointer with integer zero ('scx::Stream*' and 'int') - 150 | DEBUG_ASSERT(stream>=0,"add_stream() Invalid stream"); - | ~~~~~~^~~ - | ^~~~ -Descriptor.cpp: In member function 'bool scx::Descriptor::remove_stream(scx::Stream*)': -Descriptor.cpp:204:22: error: ordered comparison of pointer with integer zero ('scx::Stream*' and 'int') - 204 | DEBUG_ASSERT(stream>=0,"remove_stream() Invalid stream"); - | ~~~~~~^~~ - -Fixes: - - http://autobuild.buildroot.org/results/ccc9562e83fd2bd312d21b3124be42dfe4b7e850 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/sconemad/sconeserver/pull/4] ---- - sconex/Descriptor.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/sconex/Descriptor.cpp b/sconex/Descriptor.cpp -index 590adba..4adfd86 100644 ---- a/sconex/Descriptor.cpp -+++ b/sconex/Descriptor.cpp -@@ -147,7 +147,7 @@ bool Descriptor::dup(int d) - //============================================================================= - void Descriptor::add_stream(Stream* stream) - { -- DEBUG_ASSERT(stream>=0,"add_stream() Invalid stream"); -+ DEBUG_ASSERT(stream!=0,"add_stream() Invalid stream"); - - m_streams.push_back(stream); - stream->set_endpoint(this); -@@ -201,7 +201,7 @@ void Descriptor::add_stream_after(Stream* stream,const Stream* after) - //============================================================================= - bool Descriptor::remove_stream(Stream* stream) - { -- DEBUG_ASSERT(stream>=0,"remove_stream() Invalid stream"); -+ DEBUG_ASSERT(stream!=0,"remove_stream() Invalid stream"); - - std::list::iterator it = m_streams.begin(); - while (it != m_streams.end()) { --- -2.30.2 - diff --git a/package/sconeserver/0002-CMake-ify.patch b/package/sconeserver/0002-CMake-ify.patch deleted file mode 100644 index 810c8034695..00000000000 --- a/package/sconeserver/0002-CMake-ify.patch +++ /dev/null @@ -1,173 +0,0 @@ -From 0cb655721d7f8aa5d6d14fc1dfce18c518ce2419 Mon Sep 17 00:00:00 2001 -From: Andrew Wedgbury -Date: Mon, 19 Aug 2019 21:12:59 +0000 -Subject: [PATCH] CMake-ify - -[Retrieve (and updated to only keep fix on sconex.cpp) from: -https://github.com/sconemad/sconeserver/commit/0cb655721d7f8aa5d6d14fc1dfce18c518ce2419] -Signed-off-by: Fabrice Fontaine ---- - .gitignore | 5 + - CMakeLists.txt | 52 ++++ - Makefile.am | 58 ---- - autogen.sh | 8 - - bluetooth/CMakeLists.txt | 16 + - bluetooth/Makefile.am | 22 -- - config.h.in | 335 +-------------------- - configure.in | 451 ---------------------------- - debian/rules | 10 +- - debian/sconeserver-base.install | 2 +- - debian/sconeserver-dev.install | 4 +- - examples/Makefile.am | 4 - - examples/rot13/CMakeLists.txt | 9 + - examples/rot13/Makefile.am | 24 -- - examples/tuesdayonly/CMakeLists.txt | 7 + - examples/tuesdayonly/Makefile.am | 18 -- - exec/CMakeLists.txt | 9 + - exec/Makefile.am | 24 -- - forward/CMakeLists.txt | 8 + - forward/Makefile.am | 19 -- - http/CMakeLists.txt | 51 ++++ - http/Makefile.am | 58 ---- - image/CMakeLists.txt | 12 + - image/Makefile.am | 20 -- - ip/CMakeLists.txt | 9 + - ip/Makefile.am | 21 -- - ip6/CMakeLists.txt | 9 + - ip6/Makefile.am | 21 -- - local/CMakeLists.txt | 9 + - local/Makefile.am | 21 -- - location/CMakeLists.txt | 11 + - location/Makefile.am | 18 -- - main.cpp | 4 +- - markdown/CMakeLists.txt | 20 ++ - markdown/Makefile.am | 21 -- - maths/CMakeLists.txt | 32 ++ - maths/Makefile.am | 33 -- - mime/CMakeLists.txt | 8 + - mime/Makefile.am | 19 -- - mysql/CMakeLists.txt | 16 + - mysql/Makefile.am | 25 -- - rss/CMakeLists.txt | 15 + - rss/Makefile.am | 23 -- - sconeserver.cmake | 31 ++ - sconesite/CMakeLists.txt | 42 +++ - sconesite/Makefile.am | 79 ----- - sconex/Base64.cpp | 2 +- - sconex/CMakeLists.txt | 97 ++++++ - sconex/Database.cpp | 2 +- - sconex/FileDir.h | 4 +- - sconex/Makefile.am | 156 ---------- - sconex/ModuleLoader.cpp | 2 +- - sconex/Process.cpp | 8 - - sconex/RegExp.cpp | 4 - - sconex/RegExp.h | 4 +- - sconex/ScriptContext.cpp | 7 +- - sconex/ScriptTypes.cpp | 2 +- - sconex/TermBuffer.cpp | 7 +- - sconex/sconex.cpp | 4 +- - sconex/sconex.h | 176 +++-------- - sconex/utils.cpp | 4 - - server/CMakeLists.txt | 19 ++ - server/Makefile.am | 26 -- - simple/CMakeLists.txt | 15 + - simple/Makefile.am | 21 -- - smtp/CMakeLists.txt | 15 + - smtp/Makefile.am | 21 -- - sqlite/CMakeLists.txt | 23 ++ - sqlite/Makefile.am | 25 -- - ssl/CMakeLists.txt | 23 ++ - ssl/Makefile.am | 30 -- - stat/CMakeLists.txt | 17 ++ - stat/Makefile.am | 23 -- - test/CMakeLists.txt | 13 + - test/Makefile.am | 53 ---- - testbuilder/CMakeLists.txt | 23 ++ - testbuilder/Makefile.am | 36 --- - tftp/CMakeLists.txt | 17 ++ - tftp/Makefile.am | 23 -- - upstart | 13 - - 80 files changed, 695 insertions(+), 1933 deletions(-) - create mode 100644 CMakeLists.txt - delete mode 100644 Makefile.am - delete mode 100755 autogen.sh - create mode 100644 bluetooth/CMakeLists.txt - delete mode 100644 bluetooth/Makefile.am - delete mode 100644 configure.in - delete mode 100644 examples/Makefile.am - create mode 100644 examples/rot13/CMakeLists.txt - delete mode 100644 examples/rot13/Makefile.am - create mode 100644 examples/tuesdayonly/CMakeLists.txt - delete mode 100644 examples/tuesdayonly/Makefile.am - create mode 100644 exec/CMakeLists.txt - delete mode 100644 exec/Makefile.am - create mode 100644 forward/CMakeLists.txt - delete mode 100644 forward/Makefile.am - create mode 100644 http/CMakeLists.txt - delete mode 100644 http/Makefile.am - create mode 100644 image/CMakeLists.txt - delete mode 100644 image/Makefile.am - create mode 100644 ip/CMakeLists.txt - delete mode 100644 ip/Makefile.am - create mode 100644 ip6/CMakeLists.txt - delete mode 100644 ip6/Makefile.am - create mode 100644 local/CMakeLists.txt - delete mode 100644 local/Makefile.am - create mode 100644 location/CMakeLists.txt - delete mode 100644 location/Makefile.am - create mode 100644 markdown/CMakeLists.txt - delete mode 100644 markdown/Makefile.am - create mode 100644 maths/CMakeLists.txt - delete mode 100644 maths/Makefile.am - create mode 100644 mime/CMakeLists.txt - delete mode 100644 mime/Makefile.am - create mode 100644 mysql/CMakeLists.txt - delete mode 100644 mysql/Makefile.am - create mode 100644 rss/CMakeLists.txt - delete mode 100644 rss/Makefile.am - create mode 100644 sconeserver.cmake - create mode 100644 sconesite/CMakeLists.txt - delete mode 100644 sconesite/Makefile.am - create mode 100644 sconex/CMakeLists.txt - delete mode 100644 sconex/Makefile.am - create mode 100644 server/CMakeLists.txt - delete mode 100644 server/Makefile.am - create mode 100644 simple/CMakeLists.txt - delete mode 100644 simple/Makefile.am - create mode 100644 smtp/CMakeLists.txt - delete mode 100644 smtp/Makefile.am - create mode 100644 sqlite/CMakeLists.txt - delete mode 100644 sqlite/Makefile.am - create mode 100644 ssl/CMakeLists.txt - delete mode 100644 ssl/Makefile.am - create mode 100644 stat/CMakeLists.txt - delete mode 100644 stat/Makefile.am - create mode 100644 test/CMakeLists.txt - delete mode 100644 test/Makefile.am - create mode 100644 testbuilder/CMakeLists.txt - delete mode 100644 testbuilder/Makefile.am - create mode 100644 tftp/CMakeLists.txt - delete mode 100644 tftp/Makefile.am - delete mode 100644 upstart - -diff --git a/sconex/sconex.cpp b/sconex/sconex.cpp -index 1b9fc97..a0ba8c1 100644 ---- a/sconex/sconex.cpp -+++ b/sconex/sconex.cpp -@@ -35,7 +35,7 @@ VersionTag& version() - const std::string& sconex_copyright() - { - static std::string s_copyright = -- "Copyright (c) 2000-2017 Andrew Wedgbury "; -+ "Copyright (c) 2000-2018 Andrew Wedgbury "; - return s_copyright; - } - -@@ -49,7 +49,7 @@ const std::string& build_type() - //========================================================================= - Date& build_time() - { -- static Date s_build_time(__DATE__" "__TIME__,true); -+ static Date s_build_time( __DATE__ " " __TIME__ ,true); - return s_build_time; - } diff --git a/package/sconeserver/Config.in b/package/sconeserver/Config.in index d46ba85fbcd..0e8a9950905 100644 --- a/package/sconeserver/Config.in +++ b/package/sconeserver/Config.in @@ -3,6 +3,7 @@ menuconfig BR2_PACKAGE_SCONESERVER depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on !BR2_STATIC_LIBS # dlopen() + select BR2_PACKAGE_PCRE select BR2_PACKAGE_ZLIB help Sconeserver is a modular, object-orientated and extremely @@ -15,24 +16,6 @@ if BR2_PACKAGE_SCONESERVER comment "Sconeserver modules" -config BR2_PACKAGE_SCONESERVER_EXAMPLES - bool "examples" - help - Example modules for Sconeserver - -config BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE - bool "http::sconesite" - select BR2_PACKAGE_LIBXML2 - help - http::sconesite module for Sconeserver - -config BR2_PACKAGE_SCONESERVER_MYSQL - bool "mysql" - depends on BR2_USE_MMU # mysql - select BR2_PACKAGE_MYSQL - help - MySQL module for Sconeserver - config BR2_PACKAGE_SCONESERVER_BLUETOOTH bool "bluetooth" depends on BR2_USE_WCHAR # bluez5_utils -> libglib2 @@ -51,11 +34,16 @@ comment "bluetooth support needs a toolchain w/ wchar, threads, dynamic library, depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 -config BR2_PACKAGE_SCONESERVER_RSS - bool "rss" +config BR2_PACKAGE_SCONESERVER_EXAMPLES + bool "examples" + help + Example modules for Sconeserver + +config BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE + bool "http::sconesite" select BR2_PACKAGE_LIBXML2 help - RSS module for Sconeserver + http::sconesite module for Sconeserver config BR2_PACKAGE_SCONESERVER_LOCATION bool "location" @@ -68,7 +56,7 @@ config BR2_PACKAGE_SCONESERVER_LOCATION comment "location support needs a toolchain w/ theads, dynamic library" depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBRARY + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS config BR2_PACKAGE_SCONESERVER_MATHS bool "maths" @@ -76,6 +64,25 @@ config BR2_PACKAGE_SCONESERVER_MATHS help Mathematics module for Sconeserver +config BR2_PACKAGE_SCONESERVER_MYSQL + bool "mysql" + depends on BR2_USE_MMU # mysql + select BR2_PACKAGE_MYSQL + help + MySQL module for Sconeserver + +config BR2_PACKAGE_SCONESERVER_RSS + bool "rss" + select BR2_PACKAGE_LIBXML2 + help + RSS module for Sconeserver + +config BR2_PACKAGE_SCONESERVER_SQLITE + bool "sqlite" + select BR2_PACKAGE_SQLITE + help + SQLite module for Sconeserver + config BR2_PACKAGE_SCONESERVER_TESTBUILDER bool "testbuilder" help diff --git a/package/sconeserver/sconeserver.hash b/package/sconeserver/sconeserver.hash index e1ff4486bc3..ba86e44ae71 100644 --- a/package/sconeserver/sconeserver.hash +++ b/package/sconeserver/sconeserver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 dfdbbcd29c089eeb341dd3bbd434cca97fefaa97f94c91525e5953d3ab0a2d9a sconeserver-6b932d7d8dbb700b830205e7111e469cefff490c.tar.gz -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING +sha256 47552b20579678e49150abe071d9eb55cf23bd13f7f6e4fa085d0612bf6a3431 sconeserver-8d1935919a2013358993a8e9dfa992cbde56e503.tar.gz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/sconeserver/sconeserver.mk b/package/sconeserver/sconeserver.mk index 2b28f8015cd..89abc8d3b29 100644 --- a/package/sconeserver/sconeserver.mk +++ b/package/sconeserver/sconeserver.mk @@ -4,97 +4,89 @@ # ################################################################################ -SCONESERVER_VERSION = 6b932d7d8dbb700b830205e7111e469cefff490c +SCONESERVER_VERSION = 8d1935919a2013358993a8e9dfa992cbde56e503 SCONESERVER_SITE = $(call github,sconemad,sconeserver,$(SCONESERVER_VERSION)) SCONESERVER_LICENSE = GPL-2.0+ SCONESERVER_LICENSE_FILES = COPYING -# fetching from Git, we need to generate the configure script -SCONESERVER_AUTORECONF = YES SCONESERVER_DEPENDENCIES = \ host-pkgconf \ - $(if $(BR2_PACKAGE_PCRE),pcre) \ + pcre \ zlib # disable image as it fails to build with ImageMagick # disable markdown module because its git submodule cmark # https://github.com/sconemad/sconeserver/tree/master/markdown # has no cross-compile support provided by the sconeserver build system SCONESERVER_CONF_OPTS += \ - --with-ip \ - --with-local \ - --with-ip6 \ - --without-image \ - --without-markdown - -# Sconeserver configure script fails to find the libxml2 headers. -ifeq ($(BR2_PACKAGE_LIBXML2),y) -SCONESERVER_CONF_OPTS += \ - --with-xml2-config="$(STAGING_DIR)/usr/bin/xml2-config" -# Needed to fix build failure when icu is enabled in libxml2 -SCONESERVER_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" -endif + -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -std=c++11" \ + -DWITH_IMAGE=OFF \ + -DWITH_MARKDOWN=OFF ifeq ($(BR2_PACKAGE_OPENSSL),y) SCONESERVER_DEPENDENCIES += openssl -SCONESERVER_CONF_OPTS += --with-ssl +SCONESERVER_CONF_OPTS += -DWITH_SSL=ON +else +SCONESERVER_CONF_OPTS += -DWITH_SSL=OFF +endif + +ifeq ($(BR2_PACKAGE_SCONESERVER_BLUETOOTH),y) +SCONESERVER_DEPENDENCIES += bluez5_utils +SCONESERVER_CONF_OPTS += -DWITH_BLUETOOTH=ON else -SCONESERVER_CONF_OPTS += --without-ssl +SCONESERVER_CONF_OPTS += -DWITH_BLUETOOTH=OFF endif ifeq ($(BR2_PACKAGE_SCONESERVER_EXAMPLES),y) -SCONESERVER_CONF_OPTS += --with-examples +SCONESERVER_CONF_OPTS += -DWITH_EXAMPLES=ON else -SCONESERVER_CONF_OPTS += --without-examples +SCONESERVER_CONF_OPTS += -DWITH_EXAMPLES=OFF endif ifeq ($(BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE),y) SCONESERVER_DEPENDENCIES += libxml2 -SCONESERVER_CONF_OPTS += --with-sconesite +SCONESERVER_CONF_OPTS += -DWITH_SCONESITE=ON else -SCONESERVER_CONF_OPTS += --without-sconesite +SCONESERVER_CONF_OPTS += -DWITH_SCONESITE=OFF endif -ifeq ($(BR2_PACKAGE_SCONESERVER_MYSQL),y) -SCONESERVER_DEPENDENCIES += mysql -SCONESERVER_CONF_OPTS += \ - --with-mysql \ - --with-mysql_config="$(STAGING_DIR)/usr/bin/mysql_config" \ - LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib/mysql" +ifeq ($(BR2_PACKAGE_SCONESERVER_LOCATION),y) +SCONESERVER_DEPENDENCIES += gpsd +SCONESERVER_CONF_OPTS += -DWITH_LOCATION=ON else -SCONESERVER_CONF_OPTS += --without-mysql +SCONESERVER_CONF_OPTS += -DWITH_LOCATION=OFF endif -ifeq ($(BR2_PACKAGE_SCONESERVER_BLUETOOTH),y) -SCONESERVER_DEPENDENCIES += bluez5_utils -SCONESERVER_CONF_OPTS += --with-bluetooth +ifeq ($(BR2_PACKAGE_SCONESERVER_MATHS),y) +SCONESERVER_DEPENDENCIES += mpfr +SCONESERVER_CONF_OPTS += -DWITH_MATHS=ON else -SCONESERVER_CONF_OPTS += --without-bluetooth +SCONESERVER_CONF_OPTS += -DWITH_MATHS=OFF endif -ifeq ($(BR2_PACKAGE_SCONESERVER_RSS),y) -SCONESERVER_DEPENDENCIES += libxml2 -SCONESERVER_CONF_OPTS += --with-rss +ifeq ($(BR2_PACKAGE_SCONESERVER_MYSQL),y) +SCONESERVER_DEPENDENCIES += mysql +SCONESERVER_CONF_OPTS += -DWITH_MYSQL=ON else -SCONESERVER_CONF_OPTS += --without-rss +SCONESERVER_CONF_OPTS += -DWITH_MYSQL=OFF endif -ifeq ($(BR2_PACKAGE_SCONESERVER_LOCATION),y) -SCONESERVER_DEPENDENCIES += gpsd -SCONESERVER_CONF_OPTS += --with-location +ifeq ($(BR2_PACKAGE_SCONESERVER_RSS),y) +SCONESERVER_DEPENDENCIES += libxml2 +SCONESERVER_CONF_OPTS += -DWITH_RSS=ON else -SCONESERVER_CONF_OPTS += --without-location +SCONESERVER_CONF_OPTS += -DWITH_RSS=OFF endif -ifeq ($(BR2_PACKAGE_SCONESERVER_MATHS),y) -SCONESERVER_DEPENDENCIES += mpfr -SCONESERVER_CONF_OPTS += --with-maths +ifeq ($(BR2_PACKAGE_SCONESERVER_SQLITE),y) +SCONESERVER_DEPENDENCIES += sqlite +SCONESERVER_CONF_OPTS += -DWITH_SQLITE=ON else -SCONESERVER_CONF_OPTS += --without-maths +SCONESERVER_CONF_OPTS += -DWITH_SQLITE=OFF endif ifeq ($(BR2_PACKAGE_SCONESERVER_TESTBUILDER),y) -SCONESERVER_CONF_OPTS += --with-testbuilder +SCONESERVER_CONF_OPTS += -DWITH_TESTBUILDER=ON else -SCONESERVER_CONF_OPTS += --without-testbuilder +SCONESERVER_CONF_OPTS += -DWITH_TESTBUILDER=OFF endif -$(eval $(autotools-package)) +$(eval $(cmake-package)) diff --git a/package/screen/0001-Do-not-use-memcpy-as-an-alternative-for-bcopy-memmov.patch b/package/screen/0001-Do-not-use-memcpy-as-an-alternative-for-bcopy-memmov.patch new file mode 100644 index 00000000000..ab002701d7e --- /dev/null +++ b/package/screen/0001-Do-not-use-memcpy-as-an-alternative-for-bcopy-memmov.patch @@ -0,0 +1,133 @@ +From 545875ad0b6c9697fae41ae8770e95d117fe3cca Mon Sep 17 00:00:00 2001 +From: Maarten ter Huurne +Date: Sat, 13 Sep 2014 11:37:59 +0200 +Subject: [PATCH] Do not use memcpy as an alternative for bcopy/memmove + +The configure script runs a small test program to check whether +memcpy can handle overlapping memory areas. However, it is not valid +to conclude that if a single case of overlapping memory is handled +correctly, all cases will be handled correctly. + +Since screen already has its own bcopy implementation as a fallback +for the case that bcopy and memmove are unusable, removing the memcpy +option should not break any systems. + +Signed-off-by: Maarten ter Huurne +[Ricardo: rebase on top of 4.3.1] +Signed-off-by: Ricardo Martincoski +[Bernd: rebase on top of 4.7.0] +Signed-off-by: Bernd Kuhls +[Julien: rebase on top of 4.9.1] +Signed-off-by: Julien Olivain +--- + acconfig.h | 3 +-- + configure.ac | 22 +--------------------- + os.h | 8 ++------ + osdef.h.in | 10 +--------- + 4 files changed, 5 insertions(+), 38 deletions(-) + +diff --git a/acconfig.h b/acconfig.h +index 46d62b0..f83572c 100644 +--- a/acconfig.h ++++ b/acconfig.h +@@ -476,7 +476,7 @@ + #undef GETTTYENT + + /* +- * Define USEBCOPY if the bcopy/memcpy from your system's C library ++ * Define USEBCOPY if the bcopy from your system's C library + * supports the overlapping of source and destination blocks. When + * undefined, screen uses its own (probably slower) version of bcopy(). + * +@@ -487,7 +487,6 @@ + * Their memove fails the test in the configure script. Sigh. (Juergen) + */ + #undef USEBCOPY +-#undef USEMEMCPY + #undef USEMEMMOVE + + /* +diff --git a/configure.ac b/configure.ac +index 1a12c04..6f6c2da 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1278,7 +1278,7 @@ AC_TRY_LINK([ + fdwalk(NULL, NULL); + ],AC_DEFINE(HAVE_FDWALK)) + +-AC_CHECKING(whether memcpy/memmove/bcopy handles overlapping arguments) ++AC_CHECKING(whether memmove/bcopy handles overlapping arguments) + AC_TRY_RUN([ + #include + #include +@@ -1319,26 +1319,6 @@ main() { + }], AC_DEFINE(USEMEMMOVE),, + AC_NOTE(- skipping check because we are cross compiling; use memmove) AC_DEFINE(USEMEMMOVE)) + +-AC_TRY_RUN([ +-#include +-#include +- +-#define bcopy(s,d,l) memcpy(d,s,l) +- +-int +-main() { +- char buf[10]; +- strcpy(buf, "abcdefghi"); +- bcopy(buf, buf + 2, 3); +- if (strncmp(buf, "ababcf", 6)) +- return 1; +- strcpy(buf, "abcdefghi"); +- bcopy(buf + 2, buf, 3); +- if (strncmp(buf, "cdedef", 6)) +- return 1; +- return 0; /* libc version works properly. */ +-}], AC_DEFINE(USEMEMCPY),,:) +- + AC_SYS_LONG_FILE_NAMES + + AC_MSG_CHECKING(for vsprintf) +diff --git a/os.h b/os.h +index 2a1c2ca..d1ac87e 100644 +--- a/os.h ++++ b/os.h +@@ -142,12 +142,8 @@ extern int errno; + # ifdef USEMEMMOVE + # define bcopy(s,d,len) memmove(d,s,len) + # else +-# ifdef USEMEMCPY +-# define bcopy(s,d,len) memcpy(d,s,len) +-# else +-# define NEED_OWN_BCOPY +-# define bcopy xbcopy +-# endif ++# define NEED_OWN_BCOPY ++# define bcopy xbcopy + # endif + #endif + +diff --git a/osdef.h.in b/osdef.h.in +index 6ddbd66..abdacf7 100644 +--- a/osdef.h.in ++++ b/osdef.h.in +@@ -58,16 +58,8 @@ extern int bcmp __P((char *, char *, int)); + extern int killpg __P((int, int)); + #endif + +-#ifndef USEBCOPY +-# ifdef USEMEMCPY +-extern void memcpy __P((char *, char *, int)); +-# else +-# ifdef USEMEMMOVE ++#if defined(USEMEMMOVE) && !defined(USEBCOPY) + extern void memmove __P((char *, char *, int)); +-# else +-extern void bcopy __P((char *, char *, int)); +-# endif +-# endif + #else + extern void bcopy __P((char *, char *, int)); + #endif +-- +2.41.0 + diff --git a/package/screen/0001-no-memcpy-fallback.patch b/package/screen/0001-no-memcpy-fallback.patch deleted file mode 100644 index 2137907199c..00000000000 --- a/package/screen/0001-no-memcpy-fallback.patch +++ /dev/null @@ -1,126 +0,0 @@ -From: Maarten ter Huurne -Date: Sat, 13 Sep 2014 11:37:59 +0200 -Subject: Do not use memcpy as an alternative for bcopy/memmove - -The configure script runs a small test program to check whether -memcpy can handle overlapping memory areas. However, it is not valid -to conclude that if a single case of overlapping memory is handled -correctly, all cases will be handled correctly. - -Since screen already has its own bcopy implementation as a fallback -for the case that bcopy and memmove are unusable, removing the memcpy -option should not break any systems. - -Signed-off-by: Maarten ter Huurne -[Ricardo: rebase on top of 4.3.1] -Signed-off-by: Ricardo Martincoski -[Bernd: rebase on top of 4.7.0] -Signed-off-by: Bernd Kuhls ---- - acconfig.h | 3 +-- - configure.ac | 18 +----------------- - os.h | 8 ++------ - osdef.h.in | 10 +--------- - 4 files changed, 5 insertions(+), 34 deletions(-) - -diff --git a/acconfig.h b/acconfig.h -index 2e46985..9b0b9d4 100644 ---- a/acconfig.h -+++ b/acconfig.h -@@ -476,7 +476,7 @@ - #undef GETTTYENT - - /* -- * Define USEBCOPY if the bcopy/memcpy from your system's C library -+ * Define USEBCOPY if the bcopy from your system's C library - * supports the overlapping of source and destination blocks. When - * undefined, screen uses its own (probably slower) version of bcopy(). - * -@@ -487,7 +487,6 @@ - * Their memove fails the test in the configure script. Sigh. (Juergen) - */ - #undef USEBCOPY --#undef USEMEMCPY - #undef USEMEMMOVE - - /* -diff --git a/configure.ac b/configure.ac -index 27690a6..b8e3bec 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1145,7 +1145,7 @@ AC_TRY_LINK(,[getttyent();], AC_DEFINE(GETTTYENT)) - AC_CHECKING(fdwalk) - AC_TRY_LINK([#include ], [fdwalk(NULL, NULL);],AC_DEFINE(HAVE_FDWALK)) - --AC_CHECKING(whether memcpy/memmove/bcopy handles overlapping arguments) -+AC_CHECKING(whether memmove/bcopy handles overlapping arguments) - AC_TRY_RUN([ - main() { - char buf[10]; -@@ -1175,22 +1175,6 @@ main() { - exit(0); /* libc version works properly. */ - }], AC_DEFINE(USEMEMMOVE)) - -- --AC_TRY_RUN([ --#define bcopy(s,d,l) memcpy(d,s,l) --main() { -- char buf[10]; -- strcpy(buf, "abcdefghi"); -- bcopy(buf, buf + 2, 3); -- if (strncmp(buf, "ababcf", 6)) -- exit(1); -- strcpy(buf, "abcdefghi"); -- bcopy(buf + 2, buf, 3); -- if (strncmp(buf, "cdedef", 6)) -- exit(1); -- exit(0); /* libc version works properly. */ --}], AC_DEFINE(USEMEMCPY),,:) -- - AC_SYS_LONG_FILE_NAMES - - AC_MSG_CHECKING(for vsprintf) -diff --git a/os.h b/os.h -index e827ac9..0b41fb9 100644 ---- a/os.h -+++ b/os.h -@@ -142,12 +142,8 @@ extern int errno; - # ifdef USEMEMMOVE - # define bcopy(s,d,len) memmove(d,s,len) - # else --# ifdef USEMEMCPY --# define bcopy(s,d,len) memcpy(d,s,len) --# else --# define NEED_OWN_BCOPY --# define bcopy xbcopy --# endif -+# define NEED_OWN_BCOPY -+# define bcopy xbcopy - # endif - #endif - -diff --git a/osdef.h.in b/osdef.h.in -index 8687b60..e4057a0 100644 ---- a/osdef.h.in -+++ b/osdef.h.in -@@ -58,16 +58,8 @@ extern int bcmp __P((char *, char *, int)); - extern int killpg __P((int, int)); - #endif - --#ifndef USEBCOPY --# ifdef USEMEMCPY --extern void memcpy __P((char *, char *, int)); --# else --# ifdef USEMEMMOVE -+#if defined(USEMEMMOVE) && !defined(USEBCOPY) - extern void memmove __P((char *, char *, int)); --# else --extern void bcopy __P((char *, char *, int)); --# endif --# endif - #else - extern void bcopy __P((char *, char *, int)); - #endif --- -1.8.4.5 - diff --git a/package/screen/0002-Do-not-create-backup-of-old-installed-binary.patch b/package/screen/0002-Do-not-create-backup-of-old-installed-binary.patch new file mode 100644 index 00000000000..ef82cd3e76d --- /dev/null +++ b/package/screen/0002-Do-not-create-backup-of-old-installed-binary.patch @@ -0,0 +1,44 @@ +From 86b5c7677c5bef780bd4c28cbbdaa97eda938230 Mon Sep 17 00:00:00 2001 +From: Maarten ter Huurne +Date: Sun, 14 Sep 2014 23:58:34 +0200 +Subject: [PATCH] Do not create backup of old installed binary + +This is a rather unusual feature that packagers will not expect. + +Signed-off-by: Maarten ter Huurne +[baruch: update for 4.6.2] +Signed-off-by: Baruch Siach +[Julien: rebase on top of 4.9.1] +Signed-off-by: Julien Olivain +--- + Makefile.in | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 26ec404..3efbbfd 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -83,12 +83,9 @@ screen: $(OFILES) + $(OPTIONS) $(CFLAGS) $< + + install_bin: .version screen installdirs +- -if [ -f $(DESTDIR)$(bindir)/$(SCREEN) ] && [ ! -f $(DESTDIR)$(bindir)/$(SCREEN).old ]; \ +- then mv $(DESTDIR)$(bindir)/$(SCREEN) $(DESTDIR)$(bindir)/$(SCREEN).old; fi + $(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN) + -chown root $(DESTDIR)$(bindir)/$(SCREEN) && chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN) + # This doesn't work if $(bindir)/screen is a symlink +- -if [ -f $(DESTDIR)$(bindir)/screen ] && [ ! -f $(DESTDIR)$(bindir)/screen.old ]; then mv $(DESTDIR)$(bindir)/screen $(DESTDIR)$(bindir)/screen.old; fi + rm -f $(DESTDIR)$(bindir)/screen + (cd $(DESTDIR)$(bindir) && ln -f -s $(SCREEN) screen) + cp $(srcdir)/utf8encodings/?? $(DESTDIR)$(SCREENENCODINGS) +@@ -113,7 +110,6 @@ installdirs: + uninstall: .version + rm -f $(DESTDIR)$(bindir)/$(SCREEN) + rm -f $(DESTDIR)$(bindir)/screen +- -mv $(DESTDIR)$(bindir)/screen.old $(DESTDIR)$(bindir)/screen + rm -f $(DESTDIR)$(ETCSCREENRC) + cd doc; $(MAKE) uninstall + +-- +2.41.0 + diff --git a/package/screen/0002-install-no-backup-binary.patch b/package/screen/0002-install-no-backup-binary.patch deleted file mode 100644 index 7842662b576..00000000000 --- a/package/screen/0002-install-no-backup-binary.patch +++ /dev/null @@ -1,41 +0,0 @@ -From: Maarten ter Huurne -Date: Sun, 14 Sep 2014 23:58:34 +0200 -Subject: Do not create backup of old installed binary - -This is a rather unusual feature that packagers will not expect. - -Signed-off-by: Maarten ter Huurne -[baruch: update for 4.6.2] -Signed-off-by: Baruch Siach ---- - Makefile.in | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 187a69b..65549e9 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -83,12 +83,9 @@ screen: $(OFILES) - $(OPTIONS) $(CFLAGS) $< - - install_bin: .version screen installdirs -- -if [ -f $(DESTDIR)$(bindir)/$(SCREEN) ] && [ ! -f $(DESTDIR)$(bindir)/$(SCREEN).old ]; \ -- then mv $(DESTDIR)$(bindir)/$(SCREEN) $(DESTDIR)$(bindir)/$(SCREEN).old; fi - $(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN) - -chown root $(DESTDIR)$(bindir)/$(SCREEN) && chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN) - # This doesn't work if $(bindir)/screen is a symlink -- -if [ -f $(DESTDIR)$(bindir)/screen ] && [ ! -f $(DESTDIR)$(bindir)/screen.old ]; then mv $(DESTDIR)$(bindir)/screen $(DESTDIR)$(bindir)/screen.old; fi - rm -f $(DESTDIR)$(bindir)/screen - (cd $(DESTDIR)$(bindir) && ln -f -s $(SCREEN) screen) - cp $(srcdir)/utf8encodings/?? $(DESTDIR)$(SCREENENCODINGS) -@@ -113,7 +110,6 @@ installdirs: - uninstall: .version - rm -f $(DESTDIR)$(bindir)/$(SCREEN) - rm -f $(DESTDIR)$(bindir)/screen -- -mv $(DESTDIR)$(bindir)/screen.old $(DESTDIR)$(bindir)/screen - rm -f $(DESTDIR)$(ETCSCREENRC) - cd doc; $(MAKE) uninstall - --- -1.8.4.5 - diff --git a/package/screen/0003-Change-binary-permission-flags-even-if-chown-fails.patch b/package/screen/0003-Change-binary-permission-flags-even-if-chown-fails.patch new file mode 100644 index 00000000000..bc3f676af3c --- /dev/null +++ b/package/screen/0003-Change-binary-permission-flags-even-if-chown-fails.patch @@ -0,0 +1,32 @@ +From 4231969c47a8379f9113e0c9c9586bcfdd545c37 Mon Sep 17 00:00:00 2001 +From: Maarten ter Huurne +Date: Mon, 15 Sep 2014 00:03:05 +0200 +Subject: [PATCH] Change binary permission flags even if chown fails + +Typically when creating a package, the build is not run as root, so +the chown will fail. But the chmod can still be done. + +Signed-off-by: Maarten ter Huurne +[Julien: rebase on top of 4.9.1] +Signed-off-by: Julien Olivain +--- + Makefile.in | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Makefile.in b/Makefile.in +index 3efbbfd..0315fde 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -84,7 +84,8 @@ screen: $(OFILES) + + install_bin: .version screen installdirs + $(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN) +- -chown root $(DESTDIR)$(bindir)/$(SCREEN) && chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN) ++ -chown root $(DESTDIR)$(bindir)/$(SCREEN) ++ -chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN) + # This doesn't work if $(bindir)/screen is a symlink + rm -f $(DESTDIR)$(bindir)/screen + (cd $(DESTDIR)$(bindir) && ln -f -s $(SCREEN) screen) +-- +2.41.0 + diff --git a/package/screen/0003-install-always-chmod.patch b/package/screen/0003-install-always-chmod.patch deleted file mode 100644 index 0aa7690b086..00000000000 --- a/package/screen/0003-install-always-chmod.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: Maarten ter Huurne -Date: Mon, 15 Sep 2014 00:03:05 +0200 -Subject: Change binary permission flags even if chown fails - -Typically when creating a package, the build is not run as root, so -the chown will fail. But the chmod can still be done. - -Signed-off-by: Maarten ter Huurne ---- - Makefile.in | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Makefile.in b/Makefile.in -index 65549e9..3c12fdb 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -84,7 +84,8 @@ screen: $(OFILES) - - install_bin: .version screen - $(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN) -- -chown root $(DESTDIR)$(bindir)/$(SCREEN) && chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN) -+ -chown root $(DESTDIR)$(bindir)/$(SCREEN) -+ -chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN) - # This doesn't work if $(bindir)/screen is a symlink - rm -f $(DESTDIR)$(bindir)/screen - (cd $(DESTDIR)$(bindir) && ln -f -s $(SCREEN) screen) --- -1.8.4.5 - diff --git a/package/screen/0004-Support-overriding-SCREEN-to-get-a-non-versioned-bin.patch b/package/screen/0004-Support-overriding-SCREEN-to-get-a-non-versioned-bin.patch new file mode 100644 index 00000000000..15795874ae2 --- /dev/null +++ b/package/screen/0004-Support-overriding-SCREEN-to-get-a-non-versioned-bin.patch @@ -0,0 +1,34 @@ +From 07d6e4d9da8bc7c6ed31aa9b643410ea093d164f Mon Sep 17 00:00:00 2001 +From: Maarten ter Huurne +Date: Mon, 15 Sep 2014 00:06:20 +0200 +Subject: [PATCH] Support overriding SCREEN to get a non-versioned binary + +If a packager runs "make install SCREEN=screen", do not create +"screen" as a symlink to itself. + +Signed-off-by: Maarten ter Huurne +[Julien: rebase on top of 4.9.1] +Signed-off-by: Julien Olivain +--- + Makefile.in | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Makefile.in b/Makefile.in +index 0315fde..4718f08 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -86,9 +86,11 @@ install_bin: .version screen installdirs + $(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN) + -chown root $(DESTDIR)$(bindir)/$(SCREEN) + -chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN) ++ifneq (${SCREEN},screen) + # This doesn't work if $(bindir)/screen is a symlink + rm -f $(DESTDIR)$(bindir)/screen + (cd $(DESTDIR)$(bindir) && ln -f -s $(SCREEN) screen) ++endif + cp $(srcdir)/utf8encodings/?? $(DESTDIR)$(SCREENENCODINGS) + + ############################################################################### +-- +2.41.0 + diff --git a/package/screen/0004-install-nonversioned-binary.patch b/package/screen/0004-install-nonversioned-binary.patch deleted file mode 100644 index ecbbd651975..00000000000 --- a/package/screen/0004-install-nonversioned-binary.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: Maarten ter Huurne -Date: Mon, 15 Sep 2014 00:06:20 +0200 -Subject: Support overriding SCREEN to get a non-versioned binary - -If a packager runs "make install SCREEN=screen", do not create -"screen" as a symlink to itself. - -Signed-off-by: Maarten ter Huurne ---- - Makefile.in | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/Makefile.in b/Makefile.in -index 3c12fdb..860f351 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -86,9 +86,11 @@ install_bin: .version screen - $(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN) - -chown root $(DESTDIR)$(bindir)/$(SCREEN) - -chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN) -+ifneq (${SCREEN},screen) - # This doesn't work if $(bindir)/screen is a symlink - rm -f $(DESTDIR)$(bindir)/screen - (cd $(DESTDIR)$(bindir) && ln -f -s $(SCREEN) screen) -+endif - cp $(srcdir)/utf8encodings/?? $(DESTDIR)$(SCREENENCODINGS) - - ############################################################################### --- -1.8.4.5 - diff --git a/package/screen/0005-Renamed-sched.h-to-eventqueue.h.patch b/package/screen/0005-Renamed-sched.h-to-eventqueue.h.patch new file mode 100644 index 00000000000..24df05de8c4 --- /dev/null +++ b/package/screen/0005-Renamed-sched.h-to-eventqueue.h.patch @@ -0,0 +1,39 @@ +From 8b066a777b61600ff2c60cad0725f2089299ff56 Mon Sep 17 00:00:00 2001 +From: Maarten ter Huurne +Date: Mon, 15 Sep 2014 00:24:41 +0200 +Subject: [PATCH] Renamed sched.h to eventqueue.h + +There is a system header that got shadowed by "sched.h". +While Screen itself doesn't include , other system headers +might include it indirectly. This broke the build when using uClibc +with pthread support. + +Signed-off-by: Maarten ter Huurne +[Julien: rebase on top of 4.9.1] +Signed-off-by: Julien Olivain +--- + sched.h => eventqueue.h | 0 + screen.h | 2 +- + 2 files changed, 1 insertion(+), 1 deletion(-) + rename sched.h => eventqueue.h (100%) + +diff --git a/sched.h b/eventqueue.h +similarity index 100% +rename from sched.h +rename to eventqueue.h +diff --git a/screen.h b/screen.h +index 4823efb..2d51788 100644 +--- a/screen.h ++++ b/screen.h +@@ -43,7 +43,7 @@ + #include "osdef.h" + + #include "ansi.h" +-#include "sched.h" ++#include "eventqueue.h" + #include "acls.h" + #include "comm.h" + #include "layer.h" +-- +2.41.0 + diff --git a/package/screen/0005-rename-sched_h.patch b/package/screen/0005-rename-sched_h.patch deleted file mode 100644 index 9b29b76e071..00000000000 --- a/package/screen/0005-rename-sched_h.patch +++ /dev/null @@ -1,142 +0,0 @@ -From: Maarten ter Huurne -Date: Mon, 15 Sep 2014 00:24:41 +0200 -Subject: Renamed sched.h to eventqueue.h - -There is a system header that got shadowed by "sched.h". -While Screen itself doesn't include , other system headers -might include it indirectly. This broke the build when using uClibc -with pthread support. - -Signed-off-by: Maarten ter Huurne ---- - eventqueue.h | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ - sched.h | 48 ------------------------------------------------ - screen.h | 2 +- - 3 files changed, 49 insertions(+), 49 deletions(-) - create mode 100644 eventqueue.h - delete mode 100644 sched.h - -diff --git a/eventqueue.h b/eventqueue.h -new file mode 100644 -index 0000000..fdc3fc4 ---- /dev/null -+++ b/eventqueue.h -@@ -0,0 +1,48 @@ -+/* Copyright (c) 2008, 2009 -+ * Juergen Weigert (jnweiger@immd4.informatik.uni-erlangen.de) -+ * Michael Schroeder (mlschroe@immd4.informatik.uni-erlangen.de) -+ * Micah Cowan (micah@cowan.name) -+ * Sadrul Habib Chowdhury (sadrul@users.sourceforge.net) -+ * Copyright (c) 1993-2002, 2003, 2005, 2006, 2007 -+ * Juergen Weigert (jnweiger@immd4.informatik.uni-erlangen.de) -+ * Michael Schroeder (mlschroe@immd4.informatik.uni-erlangen.de) -+ * Copyright (c) 1987 Oliver Laumann -+ * -+ * 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 3, 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 (see the file COPYING); if not, see -+ * https://www.gnu.org/licenses/, or contact Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA -+ * -+ **************************************************************** -+ * $Id$ GNU -+ */ -+ -+struct event -+{ -+ struct event *next; -+ void (*handler) __P((struct event *, char *)); -+ char *data; -+ int fd; -+ int type; -+ int pri; -+ struct timeval timeout; -+ int queued; /* in evs queue */ -+ int active; /* in fdset */ -+ int *condpos; /* only active if condpos - condneg > 0 */ -+ int *condneg; -+}; -+ -+#define EV_TIMEOUT 0 -+#define EV_READ 1 -+#define EV_WRITE 2 -+#define EV_ALWAYS 3 -diff --git a/sched.h b/sched.h -deleted file mode 100644 -index fdc3fc4..0000000 ---- a/sched.h -+++ /dev/null -@@ -1,48 +0,0 @@ --/* Copyright (c) 2008, 2009 -- * Juergen Weigert (jnweiger@immd4.informatik.uni-erlangen.de) -- * Michael Schroeder (mlschroe@immd4.informatik.uni-erlangen.de) -- * Micah Cowan (micah@cowan.name) -- * Sadrul Habib Chowdhury (sadrul@users.sourceforge.net) -- * Copyright (c) 1993-2002, 2003, 2005, 2006, 2007 -- * Juergen Weigert (jnweiger@immd4.informatik.uni-erlangen.de) -- * Michael Schroeder (mlschroe@immd4.informatik.uni-erlangen.de) -- * Copyright (c) 1987 Oliver Laumann -- * -- * 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 3, 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 (see the file COPYING); if not, see -- * https://www.gnu.org/licenses/, or contact Free Software Foundation, Inc., -- * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA -- * -- **************************************************************** -- * $Id$ GNU -- */ -- --struct event --{ -- struct event *next; -- void (*handler) __P((struct event *, char *)); -- char *data; -- int fd; -- int type; -- int pri; -- struct timeval timeout; -- int queued; /* in evs queue */ -- int active; /* in fdset */ -- int *condpos; /* only active if condpos - condneg > 0 */ -- int *condneg; --}; -- --#define EV_TIMEOUT 0 --#define EV_READ 1 --#define EV_WRITE 2 --#define EV_ALWAYS 3 -diff --git a/screen.h b/screen.h -index 603ca3f..34238c8 100644 ---- a/screen.h -+++ b/screen.h -@@ -43,7 +43,7 @@ - #include "osdef.h" - - #include "ansi.h" --#include "sched.h" -+#include "eventqueue.h" - #include "acls.h" - #include "comm.h" - #include "layer.h" --- -1.8.4.5 - diff --git a/package/screen/0006-comm-h-now-depends-on-term-h.patch b/package/screen/0006-comm-h-now-depends-on-term-h.patch deleted file mode 100644 index 6ff6f3da0be..00000000000 --- a/package/screen/0006-comm-h-now-depends-on-term-h.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 39c5f1c76f1fcef4b5958bf828a63f53426b6984 Mon Sep 17 00:00:00 2001 -From: Mike Gerwitz -Date: Tue, 24 Dec 2013 22:16:31 -0500 -Subject: comm.h now depends on term.h - -Signed-off-by: Fabrice Fontaine -[Patch retrieved and updated from: -http://git.savannah.gnu.org/cgit/screen.git/commit/?id=39c5f1c] ---- - src/Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.in b/Makefile.in -index e791e79..d4f7c0b 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -113,7 +113,7 @@ term.h: term.c term.sh - - kmapdef.c: term.h - --comm.h: comm.c comm.sh config.h -+comm.h: comm.c comm.sh config.h term.h - AWK=$(AWK) CC="$(CC) $(CFLAGS)" srcdir=${srcdir} sh $(srcdir)/comm.sh - - docs: --- -cgit v1.0-41-gc330 - diff --git a/package/screen/0006-comm.h-now-depends-on-term.h.patch b/package/screen/0006-comm.h-now-depends-on-term.h.patch new file mode 100644 index 00000000000..088dfb340c9 --- /dev/null +++ b/package/screen/0006-comm.h-now-depends-on-term.h.patch @@ -0,0 +1,30 @@ +From 23a8ca6be87ad374d66854cee66ab758880cc651 Mon Sep 17 00:00:00 2001 +From: Mike Gerwitz +Date: Tue, 24 Dec 2013 22:16:31 -0500 +Subject: [PATCH] comm.h now depends on term.h + +Signed-off-by: Fabrice Fontaine +[Patch retrieved and updated from: +http://git.savannah.gnu.org/cgit/screen.git/commit/?id=39c5f1c] +[Julien: rebase on top of 4.9.1] +Signed-off-by: Julien Olivain +--- + Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.in b/Makefile.in +index 4718f08..7082a3e 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -132,7 +132,7 @@ kmapdef.c: term.h + tty.c: tty.sh + sh $(srcdir)/tty.sh tty.c + +-comm.h: comm.c comm.sh config.h ++comm.h: comm.c comm.sh config.h term.h + AWK=$(AWK) CC="$(CC) $(CFLAGS)" srcdir=${srcdir} sh $(srcdir)/comm.sh + + osdef.h: osdef.sh config.h osdef.h.in +-- +2.41.0 + diff --git a/package/screen/0007-comm.h-needed-for-list_-display-generic-.o.patch b/package/screen/0007-comm.h-needed-for-list_-display-generic-.o.patch index f406a1afac6..d46bf723b80 100644 --- a/package/screen/0007-comm.h-needed-for-list_-display-generic-.o.patch +++ b/package/screen/0007-comm.h-needed-for-list_-display-generic-.o.patch @@ -1,4 +1,4 @@ -From b719314d201a3e9e1e57c65746a468c47bfc847f Mon Sep 17 00:00:00 2001 +From 8d8899b3ffd26d5049f8a9ccf12ff9ac65c352b4 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 3 Oct 2018 22:29:32 +0200 Subject: [PATCH] comm.h needed for list_{display,generic}.o @@ -12,15 +12,17 @@ Fixes: Signed-off-by: Fabrice Fontaine [Upstream status: https://savannah.gnu.org/bugs/index.php?54776] +[Julien: rebase on top of 4.9.1] +Signed-off-by: Julien Olivain --- Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in -index af5938b..e6d5247 100644 +index 7082a3e..cd363b7 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -265,7 +265,7 @@ braille.h +@@ -349,7 +349,7 @@ layout.o: layout.h viewport.h canvas.h layout.c config.h screen.h os.h osdef.h a viewport.o: layout.h viewport.h canvas.h viewport.c config.h screen.h os.h osdef.h ansi.h acls.h \ comm.h layer.h term.h image.h display.h window.h extern.h \ braille.h @@ -31,5 +33,5 @@ index af5938b..e6d5247 100644 list_window.o: list_generic.h list_window.c window.h layer.h screen.h osdef.h comm.h -- -2.17.1 +2.41.0 diff --git a/package/screen/0008-CVE-2021-26937.patch b/package/screen/0008-CVE-2021-26937.patch deleted file mode 100644 index df7efa02941..00000000000 --- a/package/screen/0008-CVE-2021-26937.patch +++ /dev/null @@ -1,68 +0,0 @@ -Description: [CVE-2021-26937] Fix out of bounds array access -Author: Michael Schröder -Bug-Debian: https://bugs.debian.org/982435 -Bug: https://savannah.gnu.org/bugs/?60030 -Bug: https://lists.gnu.org/archive/html/screen-devel/2021-02/msg00000.html -Bug-OSS-Security: https://www.openwall.com/lists/oss-security/2021/02/09/3 -Origin: https://lists.gnu.org/archive/html/screen-devel/2021-02/msg00010.html - -Downloaded from Debian: -https://sources.debian.org/data/main/s/screen/4.8.0-5/debian/patches/99_CVE-2021-26937.patch - -Signed-off-by: Peter Korsgaard ---- a/encoding.c -+++ b/encoding.c -@@ -43,7 +43,7 @@ - # ifdef UTF8 - static int recode_char __P((int, int, int)); - static int recode_char_to_encoding __P((int, int)); --static void comb_tofront __P((int, int)); -+static void comb_tofront __P((int)); - # ifdef DW_CHARS - static int recode_char_dw __P((int, int *, int, int)); - static int recode_char_dw_to_encoding __P((int, int *, int)); -@@ -1263,6 +1263,8 @@ - {0x30000, 0x3FFFD}, - }; - -+ if (c >= 0xdf00 && c <= 0xdfff) -+ return 1; /* dw combining sequence */ - return ((bisearch(c, wide, sizeof(wide) / sizeof(struct interval) - 1)) || - (cjkwidth && - bisearch(c, ambiguous, -@@ -1330,11 +1332,12 @@ - } - - static void --comb_tofront(root, i) --int root, i; -+comb_tofront(i) -+int i; - { - for (;;) - { -+ int root = i >= 0x700 ? 0x801 : 0x800; - debug1("bring to front: %x\n", i); - combchars[combchars[i]->prev]->next = combchars[i]->next; - combchars[combchars[i]->next]->prev = combchars[i]->prev; -@@ -1396,9 +1399,9 @@ - { - /* full, recycle old entry */ - if (c1 >= 0xd800 && c1 < 0xe000) -- comb_tofront(root, c1 - 0xd800); -+ comb_tofront(c1 - 0xd800); - i = combchars[root]->prev; -- if (c1 == i + 0xd800) -+ if (i == 0x800 || i == 0x801 || c1 == i + 0xd800) - { - /* completely full, can't recycle */ - debug("utf8_handle_comp: completely full!\n"); -@@ -1422,7 +1425,7 @@ - mc->font = (i >> 8) + 0xd8; - mc->fontx = 0; - debug3("combinig char %x %x -> %x\n", c1, c, i + 0xd800); -- comb_tofront(root, i); -+ comb_tofront(i); - } - - #else /* !UTF8 */ diff --git a/package/screen/screen.hash b/package/screen/screen.hash index ca74ba89130..ef32eb0696b 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-4.8.0.tar.gz.sig -sha256 6e11b13d8489925fde25dfb0935bf6ed71f9eb47eff233a181e078fde5655aa1 screen-4.8.0.tar.gz +# https://ftp.gnu.org/gnu/screen/screen-4.9.1.tar.gz.sig +sha256 26cef3e3c42571c0d484ad6faf110c5c15091fbf872b06fa7aa4766c7405ac69 screen-4.9.1.tar.gz # Locally calculated -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/screen/screen.mk b/package/screen/screen.mk index 843c71fc2a2..d4052b11915 100644 --- a/package/screen/screen.mk +++ b/package/screen/screen.mk @@ -4,7 +4,7 @@ # ################################################################################ -SCREEN_VERSION = 4.8.0 +SCREEN_VERSION = 4.9.1 SCREEN_SITE = $(BR2_GNU_MIRROR)/screen SCREEN_LICENSE = GPL-3.0+ SCREEN_LICENSE_FILES = COPYING @@ -16,9 +16,6 @@ SCREEN_CONF_ENV = CFLAGS="$(TARGET_CFLAGS)" SCREEN_CONF_OPTS = --enable-colors256 SCREEN_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) SCREEN=screen install_bin -# 0008_CVE-2021-26937.patch -SCREEN_IGNORE_CVES += CVE-2021-26937 - ifeq ($(BR2_PACKAGE_LINUX_PAM),y) SCREEN_DEPENDENCIES += linux-pam SCREEN_CONF_OPTS += --enable-pam diff --git a/package/screenfetch/0001-Detect-which-awk-to-use.patch b/package/screenfetch/0001-Detect-which-awk-to-use.patch new file mode 100644 index 00000000000..86e51e55115 --- /dev/null +++ b/package/screenfetch/0001-Detect-which-awk-to-use.patch @@ -0,0 +1,783 @@ +From 39b6eec51f0c2fa5f2b0e876b14dcfc9c1febf97 Mon Sep 17 00:00:00 2001 +From: Nicolas Boichat +Date: Fri, 4 Aug 2023 12:55:36 +0000 +Subject: [PATCH] Detect which awk to use + +Some embedded distributions (e.g. buildroot) may only provide mawk, +without a symlink to awk. + +At first glance, awk scripts to appear to work fine with either +gawk or mawk. + +Signed-off-by: Nicolas Boichat +Upstream: https://github.com/KittyKatt/screenFetch/commit/b49a2334b8ba806dbc532219e86363886a85d9c8 +[rebased on 3.9.1] +--- + screenfetch-dev | 245 +++++++++++++++++++++++++----------------------- + 1 file changed, 130 insertions(+), 115 deletions(-) + +diff --git a/screenfetch-dev b/screenfetch-dev +index 1e53b2c..765930f 100755 +--- a/screenfetch-dev ++++ b/screenfetch-dev +@@ -352,9 +352,9 @@ colorNumberToCode () { + + detectColors () { + my_colors=$(sed 's/^,/na,/;s/,$/,na/;s/,/ /' <<< "${OPTARG}") +- my_lcolor=$(awk -F' ' '{print $1}' <<< "${my_colors}") ++ my_lcolor=$("${AWK}" -F' ' '{print $1}' <<< "${my_colors}") + my_lcolor=$(colorNumberToCode "${my_lcolor}") +- my_hcolor=$(awk -F' ' '{print $2}' <<< "${my_colors}") ++ my_hcolor=$("${AWK}" -F' ' '{print $2}' <<< "${my_colors}") + my_hcolor=$(colorNumberToCode "${my_hcolor}") + } + +@@ -462,7 +462,22 @@ case $1 in + --version) displayVersion; exit 0;; + esac + ++# Detect which awk to use (unless already specified in environment) ++if [[ -z "${AWK}" ]]; then ++ for awk in awk gawk mawk; do ++ if command -v "${awk}" > /dev/null; then ++ AWK="${awk}" ++ break ++ fi ++ done ++fi ++ ++if ! command -v "${AWK}" > /dev/null; then ++ errorOut "No awk interpreter available (AWK=\"${AWK}\")." ++ exit 1 ++fi + ++# Parse the rest of the flags (some of these functions require awk) + while getopts ":hsu:evVEnLNtlS:A:D:o:c:d:pa:w" flags; do + case $flags in + h) displayHelp; exit 0 ;; +@@ -608,8 +623,8 @@ detectdistro () { + "Debian") + if [[ -f /etc/crunchbang-lsb-release || -f /etc/lsb-release-crunchbang ]]; then + distro="CrunchBang" +- distro_release=$(awk -F'=' '/^DISTRIB_RELEASE=/ {print $2}' /etc/lsb-release-crunchbang) +- distro_codename=$(awk -F'=' '/^DISTRIB_DESCRIPTION=/ {print $2}' /etc/lsb-release-crunchbang) ++ distro_release=$("${AWK}" -F'=' '/^DISTRIB_RELEASE=/ {print $2}' /etc/lsb-release-crunchbang) ++ distro_codename=$("${AWK}" -F'=' '/^DISTRIB_DESCRIPTION=/ {print $2}' /etc/lsb-release-crunchbang) + elif [[ -f /etc/siduction-version ]]; then + distro="Siduction" + distro_release="(Debian Sid)" +@@ -620,10 +635,10 @@ detectdistro () { + elif [[ -f /etc/os-release ]]; then + if grep -q -i 'Raspbian' /etc/os-release ; then + distro="Raspbian" +- distro_release=$(awk -F'=' '/^PRETTY_NAME=/ {print $2}' /etc/os-release) ++ distro_release=$("${AWK}" -F'=' '/^PRETTY_NAME=/ {print $2}' /etc/os-release) + elif grep -q -i 'BlankOn' /etc/os-release ; then + distro='BlankOn' +- distro_release=$(awk -F'=' '/^PRETTY_NAME=/ {print $2}' /etc/os-release) ++ distro_release=$("${AWK}" -F'=' '/^PRETTY_NAME=/ {print $2}' /etc/os-release) + else + distro="Debian" + fi +@@ -639,7 +654,7 @@ detectdistro () { + ;; + "Sulin") + distro="Sulin" +- distro_release=$(awk -F'=' '/^ID_LIKE=/ {print $2}' /etc/os-release) ++ distro_release=$("${AWK}" -F'=' '/^ID_LIKE=/ {print $2}' /etc/os-release) + distro_codename="Roolling donkey" # this is not wrong :D + ;; + "KaOS"|"kaos") +@@ -718,7 +733,7 @@ detectdistro () { + if grep -q 'SailfishOS' /etc/os-release; then + distro="SailfishOS" + distro_codename="$(grep 'VERSION=' /etc/os-release | cut -d '(' -f2 | cut -d ')' -f1)" +- distro_release="$(awk -F'=' '/^VERSION=/ {print $2}' /etc/os-release)" ++ distro_release="$("${AWK}" -F'=' '/^VERSION=/ {print $2}' /etc/os-release)" + fi + fi + ;; +@@ -753,7 +768,7 @@ detectdistro () { + if grep -q -i 'SUSE Linux Enterprise' /etc/os-release ; then + distro="SUSE Linux Enterprise" + distro_codename="n/a" +- distro_release=$(awk -F'=' '/^VERSION_ID=/ {print $2}' /etc/os-release | tr -d '"') ++ distro_release=$("${AWK}" -F'=' '/^VERSION_ID=/ {print $2}' /etc/os-release | tr -d '"') + fi + fi + if [[ "${distro_codename}" == "Tumbleweed" ]]; then +@@ -789,7 +804,7 @@ detectdistro () { + distro="SailfishOS" + if [[ -f /etc/os-release ]]; then + distro_codename="$(grep 'VERSION=' /etc/os-release | cut -d '(' -f2 | cut -d ')' -f1)" +- distro_release="$(awk -F'=' '/^VERSION=/ {print $2}' /etc/os-release)" ++ distro_release="$("${AWK}" -F'=' '/^VERSION=/ {print $2}' /etc/os-release)" + fi + ;; + "Sparky"|"SparkyLinux") +@@ -863,12 +878,12 @@ detectdistro () { + ;; + "Haiku") + distro="Haiku" +- distro_more="$(uname -v | awk '/^hrev/ {print $1}')" ++ distro_more="$(uname -v | "${AWK}" '/^hrev/ {print $1}')" + ;; + "GNU/Linux") + if type -p crux >/dev/null 2>&1; then + distro="CRUX" +- distro_more="$(crux | awk '{print $3}')" ++ distro_more="$(crux | "${AWK}" '{print $3}')" + fi + if type -p nixos-version >/dev/null 2>&1; then + distro="NixOS" +@@ -944,7 +959,7 @@ detectdistro () { + [[ "${distro}" == "Neon" ]] && distro="KDE neon" + [[ "${distro}" == "SLED" || "${distro}" == "sled" || "${distro}" == "SLES" || "${distro}" == "sles" ]] && distro="SUSE Linux Enterprise" + if [[ "${distro}" == "SUSE Linux Enterprise" && -f /etc/os-release ]]; then +- distro_more="$(awk -F'=' '/^VERSION_ID=/ {print $2}' /etc/os-release | tr -d '"')" ++ distro_more="$("${AWK}" -F'=' '/^VERSION_ID=/ {print $2}' /etc/os-release | tr -d '"')" + fi + if [[ "${distro}" == "Debian" && -f /usr/bin/pveversion ]]; then + distro="Proxmox VE" +@@ -955,7 +970,7 @@ detectdistro () { + + if [[ "${distro}" == "Unknown" && "${OSTYPE}" =~ "linux" && -f /etc/lsb-release ]]; then + LSB_RELEASE=$(/dev/null; then + distro="Mac OS X" + elif [[ -f /var/run/dmesg.boot ]]; then +- distro=$(awk 'BEGIN { ++ distro=$("${AWK}" 'BEGIN { + distro = "Unknown" + } + { +@@ -1080,7 +1095,7 @@ detectdistro () { + + if [[ "${distro}" == "Unknown" ]] && [[ "${OSTYPE}" =~ "linux" || "${OSTYPE}" == "gnu" ]]; then + if [[ -f /etc/issue ]]; then +- distro=$(awk 'BEGIN { ++ distro=$("${AWK}" 'BEGIN { + distro = "Unknown" + } + { +@@ -1123,8 +1138,8 @@ detectdistro () { + fi + elif [[ -f /etc/lsb-release ]]; then + if grep -q -i 'CHROMEOS_RELEASE_NAME' /etc/lsb-release; then +- distro="$(awk -F'=' '/^CHROMEOS_RELEASE_NAME=/ {print $2}' /etc/lsb-release)" +- distro_more="$(awk -F'=' '/^CHROMEOS_RELEASE_VERSION=/ {print $2}' /etc/lsb-release)" ++ distro="$("${AWK}" -F'=' '/^CHROMEOS_RELEASE_NAME=/ {print $2}' /etc/lsb-release)" ++ distro_more="$("${AWK}" -F'=' '/^CHROMEOS_RELEASE_VERSION=/ {print $2}' /etc/lsb-release)" + fi + fi + fi +@@ -1301,7 +1316,7 @@ detectuptime () { + now=$(date +%s) + uptime=$((now - boot)) + elif [[ "${distro}" == "Haiku" ]]; then +- uptime=$(uptime | awk -F', up ' '{gsub(/ *hours?,/, "h"); gsub(/ *minutes?/, "m"); print $2;}') ++ uptime=$(uptime | "${AWK}" -F', up ' '{gsub(/ *hours?,/, "h"); gsub(/ *minutes?/, "m"); print $2;}') + else + if [[ -f /proc/uptime ]]; then + uptime=$( /dev/null | awk '/OpenGL renderer string/ { sub(/OpenGL renderer string: /,""); print }') ++ gpu=$(glxinfo 2> /dev/null | "${AWK}" '/OpenGL renderer string/ { sub(/OpenGL renderer string: /,""); print }') + elif [[ "${distro}" == "Mac OS X" ]]; then +- gpu=$(system_profiler SPDisplaysDataType | awk -F': ' '/^ *Chipset Model:/ {print $2}' | awk '{ printf "%s / ", $0 }' | sed -e 's/\/ $//g') ++ gpu=$(system_profiler SPDisplaysDataType | "${AWK}" -F': ' '/^ *Chipset Model:/ {print $2}' | "${AWK}" '{ printf "%s / ", $0 }' | sed -e 's/\/ $//g') + elif [[ "${distro}" == "Cygwin" || "${distro}" == "Msys" ]]; then + gpu=$(wmic path Win32_VideoController get caption | sed -n '2p') + elif [[ "${distro}" == "Haiku" ]]; then +- gpu="$(listdev | grep -A2 -e 'device Display controller' | awk -F': ' '/^ +device/ {print $2}')" ++ gpu="$(listdev | grep -A2 -e 'device Display controller' | "${AWK}" -F': ' '/^ +device/ {print $2}')" + else + if [[ -n "$(PATH="/opt/bin:$PATH" type -p nvidia-smi)" ]]; then +- gpu=$($(PATH="/opt/bin:$PATH" type -p nvidia-smi | cut -f1) -q | awk -F':' '/Product Name/ {gsub(/: /,":"); print $2}' | sed ':a;N;$!ba;s/\n/, /g') ++ gpu=$($(PATH="/opt/bin:$PATH" type -p nvidia-smi | cut -f1) -q | "${AWK}" -F':' '/Product Name/ {gsub(/: /,":"); print $2}' | sed ':a;N;$!ba;s/\n/, /g') + elif [[ -n "$(PATH="/usr/sbin:$PATH" type -p glxinfo)" && -z "${gpu}" ]]; then + gpu_info=$($(PATH="/usr/sbin:$PATH" type -p glxinfo | cut -f1) 2>/dev/null) + gpu=$(grep "OpenGL renderer string" <<< "${gpu_info}" | cut -d ':' -f2 | sed -n -e '1h;2,$H;${g;s/\n/, /g' -e 'p' -e '}') +@@ -1650,12 +1665,12 @@ detectgpu () { + # Run it only on Intel Processors if GPU is unknown + DetectIntelGPU() { + if [ -r /proc/fb ]; then +- gpu=$(awk 'BEGIN {ORS = " &"} {$1="";print}' /proc/fb | sed -r s/'^\s+|\s*&$'//g) ++ gpu=$("${AWK}" 'BEGIN {ORS = " &"} {$1="";print}' /proc/fb | sed -r s/'^\s+|\s*&$'//g) + fi + + case $gpu in + *mfb) +- gpu=$(lspci | grep -i vga | awk -F ": " '{print $2}') ++ gpu=$(lspci | grep -i vga | "${AWK}" -F ": " '{print $2}') + ;; + *intel*) + gpu="intel" +@@ -1667,7 +1682,7 @@ DetectIntelGPU() { + + if [[ "$gpu" = "intel" ]]; then + #Detect CPU +- local CPU=$(uname -p | awk '{print $3}') ++ local CPU=$(uname -p | "${AWK}" '{print $3}') + CPU=${CPU#*'-'}; #Detect CPU number + + #Detect Intel GPU +@@ -1710,7 +1725,7 @@ detectdisk () { + if [[ "${distro}" =~ (Free|Net|DragonFly)BSD ]]; then + totaldisk=$(df -h -c 2>/dev/null | tail -1) + elif [[ "${distro}" == "OpenBSD" ]]; then +- totaldisk=$(df -Pk 2> /dev/null | awk ' ++ totaldisk=$(df -Pk 2> /dev/null | "${AWK}" ' + /^\// {total+=$2; used+=$3; avail+=$4} + END{printf("total %.1fG %.1fG %.1fG %d%%\n", total/1048576, used/1048576, avail/1048576, used*100/total)}') + elif [[ "${distro}" == "Mac OS X" ]]; then +@@ -1718,9 +1733,9 @@ detectdisk () { + else + totaldisk=$(df -h -x aufs -x tmpfs -x overlay --total 2>/dev/null | tail -1) + fi +- disktotal=$(awk '{print $2}' <<< "${totaldisk}") +- diskused=$(awk '{print $3}' <<< "${totaldisk}") +- diskusedper=$(awk '{print $5}' <<< "${totaldisk}") ++ disktotal=$("${AWK}" '{print $2}' <<< "${totaldisk}") ++ diskused=$("${AWK}" '{print $3}' <<< "${totaldisk}") ++ diskusedper=$("${AWK}" '{print $5}' <<< "${totaldisk}") + diskusage="${diskused} / ${disktotal} (${diskusedper})" + diskusage_verbose=$(sed 's/%/%%/' <<< "$diskusage") + fi +@@ -1733,17 +1748,17 @@ detectdisk () { + detectmem () { + if [ "$distro" == "Mac OS X" ]; then + totalmem=$(echo "$(sysctl -n hw.memsize)" / 1024^2 | bc) +- wiredmem=$(vm_stat | grep wired | awk '{ print $4 }' | sed 's/\.//') +- activemem=$(vm_stat | grep ' active' | awk '{ print $3 }' | sed 's/\.//') +- compressedmem=$(vm_stat | grep occupied | awk '{ print $5 }' | sed 's/\.//') ++ wiredmem=$(vm_stat | grep wired | "${AWK}" '{ print $4 }' | sed 's/\.//') ++ activemem=$(vm_stat | grep ' active' | "${AWK}" '{ print $3 }' | sed 's/\.//') ++ compressedmem=$(vm_stat | grep occupied | "${AWK}" '{ print $5 }' | sed 's/\.//') + if [[ ! -z "$compressedmem | tr -d" ]]; then # FIXME: is this line correct? + compressedmem=0 + fi + usedmem=$(((wiredmem + activemem + compressedmem) * 4 / 1024)) + elif [[ "${distro}" == "Cygwin" || "${distro}" == "Msys" ]]; then +- total_mem=$(awk '/MemTotal/ { print $2 }' /proc/meminfo) ++ total_mem=$("${AWK}" '/MemTotal/ { print $2 }' /proc/meminfo) + totalmem=$((total_mem / 1024)) +- free_mem=$(awk '/MemFree/ { print $2 }' /proc/meminfo) ++ free_mem=$("${AWK}" '/MemFree/ { print $2 }' /proc/meminfo) + used_mem=$((total_mem - free_mem)) + usedmem=$((used_mem / 1024)) + elif [[ "$distro" == "FreeBSD" || "$distro" == "DragonFlyBSD" ]]; then +@@ -1769,21 +1784,21 @@ detectmem () { + usedmem=$((used_mem / 1024 / 1024)) + elif [ "$distro" == "OpenBSD" ]; then + totalmem=$(($(sysctl -n hw.physmem) / 1024 / 1024)) +- usedmem=$(vmstat | awk '!/[a-z]/{gsub("M",""); print $3}') ++ usedmem=$(vmstat | "${AWK}" '!/[a-z]/{gsub("M",""); print $3}') + elif [ "$distro" == "NetBSD" ]; then +- phys_mem=$(awk '/MemTotal/ { print $2 }' /proc/meminfo) ++ phys_mem=$("${AWK}" '/MemTotal/ { print $2 }' /proc/meminfo) + totalmem=$((phys_mem / 1024)) + if grep -q 'Cached' /proc/meminfo; then +- cache=$(awk '/Cached/ {print $2}' /proc/meminfo) ++ cache=$("${AWK}" '/Cached/ {print $2}' /proc/meminfo) + usedmem=$((cache / 1024)) + else +- free_mem=$(awk '/MemFree/ { print $2 }' /proc/meminfo) ++ free_mem=$("${AWK}" '/MemFree/ { print $2 }' /proc/meminfo) + used_mem=$((phys_mem - free_mem)) + usedmem=$((used_mem / 1024)) + fi + elif [ "$distro" == "Haiku" ]; then +- totalmem=$(sysinfo -mem | awk 'NR == 1 {gsub(/[\(\)\/]/, ""); printf("%d", $6/1024**2)}') +- usedmem=$(sysinfo -mem | awk 'NR == 1 {gsub(/[\(\)\/]/, ""); printf("%d", $5/1024**2)}') ++ totalmem=$(sysinfo -mem | "${AWK}" 'NR == 1 {gsub(/[\(\)\/]/, ""); printf("%d", $6/1024**2)}') ++ usedmem=$(sysinfo -mem | "${AWK}" 'NR == 1 {gsub(/[\(\)\/]/, ""); printf("%d", $5/1024**2)}') + else + # MemUsed = Memtotal + Shmem - MemFree - Buffers - Cached - SReclaimable + # Source: https://github.com/dylanaraps/neofetch/pull/391/files#diff-e863270127ca6116fd30e708cdc582fc +@@ -1798,7 +1813,7 @@ detectmem () { + #done + #usedmem=$((usedmem / 1024)) + #totalmem=$((totalmem / 1024)) +- mem=$(free -b | awk 'NR==2{print $2"-"$7}') ++ mem=$(free -b | "${AWK}" 'NR==2{print $2"-"$7}') + usedmem=$((mem / 1024 / 1024)) + totalmem=$((${mem//-*} / 1024 / 1024)) + fi +@@ -1823,7 +1838,7 @@ detectshell_ver () { + esac + + if [[ -n $version_data ]];then +- version=$(awk ' ++ version=$("${AWK}" ' + BEGIN { + IGNORECASE=1 + } +@@ -1842,7 +1857,7 @@ detectshell () { + if [[ ! "${shell_type}" ]]; then + if [[ "${distro}" == "Cygwin" || "${distro}" == "Msys" || "${distro}" == "Haiku" || "${distro}" == "Alpine Linux" || + "${distro}" == "Mac OS X" || "${distro}" == "TinyCore" || "${distro}" == "Raspbian" || "${OSTYPE}" == "gnu" ]]; then +- shell_type=$(echo "$SHELL" | awk -F'/' '{print $NF}') ++ shell_type=$(echo "$SHELL" | "${AWK}" -F'/' '{print $NF}') + elif readlink -f "$SHELL" 2>&1 | grep -q -i 'busybox'; then + shell_type="BusyBox" + else +@@ -1851,7 +1866,7 @@ detectshell () { + elif [[ "${distro}" =~ "BSD" ]]; then + shell_type=$(ps -p $PPID -o command | tail -1) + else +- shell_type=$(ps -p "$(ps -p $PPID | awk '$1 !~ /PID/ {print $1}')" | awk 'FNR>1 {print $1}') ++ shell_type=$(ps -p "$(ps -p $PPID | "${AWK}" '$1 !~ /PID/ {print $1}')" | "${AWK}" 'FNR>1 {print $1}') + fi + shell_type=${shell_type/-} + shell_type=${shell_type//*\/} +@@ -1881,7 +1896,7 @@ detectshell () { + shell_version_data=$( detectshell_ver "$shell_type" "^zsh" "2" ) + ;; + fish) +- shell_version_data=$( fish --version | awk '{print $3}' ) ++ shell_version_data=$( fish --version | "${AWK}" '{print $3}' ) + ;; + esac + +@@ -1899,17 +1914,17 @@ detectshell () { + detectres () { + xResolution="No X Server" + if [[ ${distro} == "Mac OS X" ]]; then +- xResolution=$(system_profiler SPDisplaysDataType | awk '/Resolution:/ {print $2"x"$4" "}') ++ xResolution=$(system_profiler SPDisplaysDataType | "${AWK}" '/Resolution:/ {print $2"x"$4" "}') + if [[ "$(echo "$xResolution" | wc -l)" -ge 1 ]]; then + xResolution=$(echo "$xResolution" | tr "\\n" "," | sed 's/\(.*\),/\1/') + fi + elif [[ "${distro}" == "Cygwin" || "${distro}" == "Msys" ]]; then +- xResolution=$(wmic path Win32_VideoController get CurrentHorizontalResolution,CurrentVerticalResolution | awk 'NR==2 {print $1"x"$2}') ++ xResolution=$(wmic path Win32_VideoController get CurrentHorizontalResolution,CurrentVerticalResolution | "${AWK}" 'NR==2 {print $1"x"$2}') + elif [[ "${distro}" == "Haiku" ]]; then +- xResolution="$(screenmode | grep Resolution | awk '{gsub(/,/,""); print $2"x"$3}')" ++ xResolution="$(screenmode | grep Resolution | "${AWK}" '{gsub(/,/,""); print $2"x"$3}')" + elif [[ -n ${DISPLAY} ]]; then + if type -p xdpyinfo >/dev/null 2>&1; then +- xResolution=$(xdpyinfo | awk '/^ +dimensions/ {print $2}') ++ xResolution=$(xdpyinfo | "${AWK}" '/^ +dimensions/ {print $2}') + fi + fi + verboseOut "Finding current resolution(s)...found as '$xResolution'" +@@ -1937,7 +1952,7 @@ detectde () { + if type -p xprop >/dev/null 2>&1;then + xprop_root="$(xprop -root 2>/dev/null)" + if [[ -n ${xprop_root} ]]; then +- DE=$(echo "${xprop_root}" | awk 'BEGIN { ++ DE=$(echo "${xprop_root}" | "${AWK}" 'BEGIN { + de = "Not Present" + } + { +@@ -2099,7 +2114,7 @@ detectde () { + elif [[ ${KDE_FULL_SESSION} == 'true' ]]; then + DE="KDE" + DEver_data=$(kded --version 2>/dev/null) +- DEver=$(grep -si '^KDE:' <<< "$DEver_data" | awk '{print $2}') ++ DEver=$(grep -si '^KDE:' <<< "$DEver_data" | "${AWK}" '{print $2}') + fi + fi + fi +@@ -2154,7 +2169,7 @@ detectde () { + fi + elif [[ ${DE} == "LXQt" ]]; then + if type -p lxqt-about >/dev/null 2>&1; then +- DEver=$(lxqt-about --version | awk '/^liblxqt/ {print $2}') ++ DEver=$(lxqt-about --version | "${AWK}" '/^liblxqt/ {print $2}') + DE="${DE} ${DEver}" + fi + elif [[ ${DE} == "MATE" ]]; then +@@ -2169,12 +2184,12 @@ detectde () { + fi + elif [[ ${DE} == "Deepin" ]]; then + if [[ -f /etc/deepin-version ]]; then +- DEver="$(awk -F '=' '/Version/ {print $2}' /etc/deepin-version)" ++ DEver="$("${AWK}" -F '=' '/Version/ {print $2}' /etc/deepin-version)" + DE="${DE} ${DEver//* }" + fi + elif [[ ${DE} == "Trinity" ]]; then + if type -p tde-config >/dev/null 2>&1; then +- DEver="$(tde-config --version | awk -F ' ' '/TDE:/ {print $2}')" ++ DEver="$(tde-config --version | "${AWK}" -F ' ' '/TDE:/ {print $2}')" + DE="${DE} ${DEver//* }" + fi + fi +@@ -2418,7 +2433,7 @@ detectwmtheme () { + else + themeFile="$(reg query 'HKCU\Software\Microsoft\Windows\CurrentVersion\Themes' /v 'CurrentTheme')" + fi +- Win_theme=$(echo "$themeFile" | awk -F"\\" '{print $NF}' | sed 's|\.theme$||') ++ Win_theme=$(echo "$themeFile" | "${AWK}" -F"\\" '{print $NF}' | sed 's|\.theme$||') + fi + else + case $WM in +@@ -2433,7 +2448,7 @@ detectwmtheme () { + ;; + 'BlackBox') + if [ -f "$HOME/.blackboxrc" ]; then +- Win_theme="$(awk -F"/" '/styleFile/ {print $NF}' "$HOME/.blackboxrc")" ++ Win_theme="$("${AWK}" -F"/" '/styleFile/ {print $NF}' "$HOME/.blackboxrc")" + fi + ;; + 'BudgieWM') +@@ -2465,11 +2480,11 @@ detectwmtheme () { + fi + ;; + 'E16') +- Win_theme="$(awk -F"= " '/theme.name/ {print $2}' "$HOME/.e16/e_config--0.0.cfg")" ++ Win_theme="$("${AWK}" -F"= " '/theme.name/ {print $2}' "$HOME/.e16/e_config--0.0.cfg")" + ;; + 'E17'|'Enlightenment') + if [ "$(which eet 2>/dev/null)" ]; then +- econfig="$(eet -d "$HOME/.e/e/config/standard/e.cfg" config | awk '/value \"file\" string.*.edj/{ print $4 }')" ++ econfig="$(eet -d "$HOME/.e/e/config/standard/e.cfg" config | "${AWK}" '/value \"file\" string.*.edj/{ print $4 }')" + econfigend="${econfig##*/}" + Win_theme=${econfigend%.*} + elif [ -n "${E_CONF_PROFILE}" ]; then +@@ -2485,12 +2500,12 @@ detectwmtheme () { + ;; + 'FluxBox'|'Fluxbox') + if [ -f "$HOME/.fluxbox/init" ]; then +- Win_theme="$(awk -F"/" '/styleFile/ {print $NF}' "$HOME/.fluxbox/init")" ++ Win_theme="$("${AWK}" -F"/" '/styleFile/ {print $NF}' "$HOME/.fluxbox/init")" + fi + ;; + 'IceWM') + if [ -f "$HOME/.icewm/theme" ]; then +- Win_theme="$(awk -F"[\",/]" '!/#/ {print $2}' "$HOME/.icewm/theme")" ++ Win_theme="$("${AWK}" -F"[\",/]" '!/#/ {print $2}' "$HOME/.icewm/theme")" + fi + ;; + 'KWin'*) +@@ -2507,14 +2522,14 @@ detectwmtheme () { + Win_theme="Not Applicable" + KDE_CONFIG_DIR=${KDE_CONFIG_DIR%/} + if [[ -f $KDE_CONFIG_DIR/share/config/kwinrc ]]; then +- Win_theme="$(awk '/PluginLib=kwin3_/{gsub(/PluginLib=kwin3_/,"",$0); print $0; exit}' "$KDE_CONFIG_DIR/share/config/kwinrc")" ++ Win_theme="$("${AWK}" '/PluginLib=kwin3_/{gsub(/PluginLib=kwin3_/,"",$0); print $0; exit}' "$KDE_CONFIG_DIR/share/config/kwinrc")" + if [[ -z "$Win_theme" ]]; then + Win_theme="Not Applicable" + fi + fi + if [[ "$Win_theme" == "Not Applicable" ]]; then + if [[ -f $KDE_CONFIG_DIR/share/config/kdebugrc ]]; then +- Win_theme="$(awk '/(decoration)/ {gsub(/\[/,"",$1); print $1; exit}' "$KDE_CONFIG_DIR/share/config/kdebugrc")" ++ Win_theme="$("${AWK}" '/(decoration)/ {gsub(/\[/,"",$1); print $1; exit}' "$KDE_CONFIG_DIR/share/config/kdebugrc")" + if [[ -z "$Win_theme" ]]; then + Win_theme="Not Applicable" + fi +@@ -2522,7 +2537,7 @@ detectwmtheme () { + fi + if [[ "$Win_theme" == "Not Applicable" ]]; then + if [[ -f $KDE_CONFIG_DIR/share/config/kdeglobals ]]; then +- Win_theme="$(awk '/\[General\]/ {flag=1;next} /^$/{flag=0} flag {print}' "$KDE_CONFIG_DIR/share/config/kdeglobals" | grep -oP 'Name=\K.*')" ++ Win_theme="$("${AWK}" '/\[General\]/ {flag=1;next} /^$/{flag=0} flag {print}' "$KDE_CONFIG_DIR/share/config/kdeglobals" | grep -oP 'Name=\K.*')" + if [[ -z "$Win_theme" ]]; then + Win_theme="Not Applicable" + fi +@@ -2552,20 +2567,20 @@ detectwmtheme () { + ;; + 'OpenBox'|'Openbox') + if [ -f "${XDG_CONFIG_HOME:-${HOME}/.config}/openbox/rc.xml" ]; then +- Win_theme="$(awk -F"[<,>]" '/]" '/]" '/]" '//dev/null 2>&1; then + gtk2Theme=$(xfconf-query -c xsettings -p /Net/ThemeName 2>/dev/null) +@@ -2779,15 +2794,15 @@ detectgtk () { + fi + + if grep -q 'sNet\/ThemeName' "${config_home}${lxdeconf}" 2>/dev/null; then +- gtk2Theme=$(awk -F'=' '/sNet\/ThemeName/ {print $2}' "${config_home}${lxdeconf}") ++ gtk2Theme=$("${AWK}" -F'=' '/sNet\/ThemeName/ {print $2}' "${config_home}${lxdeconf}") + fi + + if grep -q 'IconThemeName' "${config_home}${lxdeconf}" 2>/dev/null; then +- gtkIcons=$(awk -F'=' '/sNet\/IconThemeName/ {print $2}' "${config_home}${lxdeconf}") ++ gtkIcons=$("${AWK}" -F'=' '/sNet\/IconThemeName/ {print $2}' "${config_home}${lxdeconf}") + fi + + if grep -q 'FontName' "${config_home}${lxdeconf}" 2>/dev/null; then +- gtkFont=$(awk -F'=' '/sGtk\/FontName/ {print $2}' "${config_home}${lxdeconf}") ++ gtkFont=$("${AWK}" -F'=' '/sGtk\/FontName/ {print $2}' "${config_home}${lxdeconf}") + fi + ;; + +@@ -2796,15 +2811,15 @@ detectgtk () { + *) # Lightweight or No DE Found + if [ -f "$HOME/.gtkrc-2.0" ]; then + if grep -q 'gtk-theme' "$HOME/.gtkrc-2.0"; then +- gtk2Theme=$(awk -F'"' '/^gtk-theme/ {print $2}' "$HOME/.gtkrc-2.0") ++ gtk2Theme=$("${AWK}" -F'"' '/^gtk-theme/ {print $2}' "$HOME/.gtkrc-2.0") + fi + + if grep -q 'icon-theme' "$HOME/.gtkrc-2.0"; then +- gtkIcons=$(awk -F'"' '/^gtk-icon-theme/ {print $2}' "$HOME/.gtkrc-2.0") ++ gtkIcons=$("${AWK}" -F'"' '/^gtk-icon-theme/ {print $2}' "$HOME/.gtkrc-2.0") + fi + + if grep -q 'font' "$HOME/.gtkrc-2.0"; then +- gtkFont=$(awk -F'"' '/^gtk-font-name/ {print $2}' "$HOME/.gtkrc-2.0") ++ gtkFont=$("${AWK}" -F'"' '/^gtk-font-name/ {print $2}' "$HOME/.gtkrc-2.0") + fi + fi + # $HOME/.gtkrc.mine theme detect only +@@ -2815,37 +2830,37 @@ detectgtk () { + fi + if [ -f "$minegtkrc" ]; then + if grep -q '^include' "$minegtkrc"; then +- gtk2Theme=$(grep '^include.*gtkrc' "$minegtkrc" | awk -F "/" '{ print $5 }') ++ gtk2Theme=$(grep '^include.*gtkrc' "$minegtkrc" | "${AWK}" -F "/" '{ print $5 }') + fi + if grep -q '^gtk-icon-theme-name' "$minegtkrc"; then +- gtkIcons=$(grep '^gtk-icon-theme-name' "$minegtkrc" | awk -F '"' '{print $2}') ++ gtkIcons=$(grep '^gtk-icon-theme-name' "$minegtkrc" | "${AWK}" -F '"' '{print $2}') + fi + fi + # /etc/gtk-2.0/gtkrc compatibility + if [[ -f /etc/gtk-2.0/gtkrc && ! -f "$HOME/.gtkrc-2.0" && ! -f "$HOME/.gtkrc.mine" && ! -f "$HOME/.gtkrc-2.0.mine" ]]; then + if grep -q 'gtk-theme-name' /etc/gtk-2.0/gtkrc; then +- gtk2Theme=$(awk -F'"' '/^gtk-theme-name/ {print $2}' /etc/gtk-2.0/gtkrc) ++ gtk2Theme=$("${AWK}" -F'"' '/^gtk-theme-name/ {print $2}' /etc/gtk-2.0/gtkrc) + fi + if grep -q 'gtk-fallback-theme-name' /etc/gtk-2.0/gtkrc && ! [ "x$gtk2Theme" = "x" ]; then +- gtk2Theme=$(awk -F'"' '/^gtk-fallback-theme-name/ {print $2}' /etc/gtk-2.0/gtkrc) ++ gtk2Theme=$("${AWK}" -F'"' '/^gtk-fallback-theme-name/ {print $2}' /etc/gtk-2.0/gtkrc) + fi + + if grep -q 'icon-theme' /etc/gtk-2.0/gtkrc; then +- gtkIcons=$(awk -F'"' '/^icon-theme/ {print $2}' /etc/gtk-2.0/gtkrc) ++ gtkIcons=$("${AWK}" -F'"' '/^icon-theme/ {print $2}' /etc/gtk-2.0/gtkrc) + fi + if grep -q 'gtk-fallback-icon-theme' /etc/gtk-2.0/gtkrc && ! [ "x$gtkIcons" = "x" ]; then +- gtkIcons=$(awk -F'"' '/^gtk-fallback-icon-theme/ {print $2}' /etc/gtk-2.0/gtkrc) ++ gtkIcons=$("${AWK}" -F'"' '/^gtk-fallback-icon-theme/ {print $2}' /etc/gtk-2.0/gtkrc) + fi + + if grep -q 'font' /etc/gtk-2.0/gtkrc; then +- gtkFont=$(awk -F'"' '/^gtk-font-name/ {print $2}' /etc/gtk-2.0/gtkrc) ++ gtkFont=$("${AWK}" -F'"' '/^gtk-font-name/ {print $2}' /etc/gtk-2.0/gtkrc) + fi + fi + + # EXPERIMENTAL gtk3 Theme detection + if [[ "$gtk3Theme" = "Not Found" && -f "$HOME/.config/gtk-3.0/settings.ini" ]]; then + if grep -q 'gtk-theme-name' "$HOME/.config/gtk-3.0/settings.ini"; then +- gtk3Theme=$(awk -F'=' '/^gtk-theme-name/ {print $2}' "$HOME/.config/gtk-3.0/settings.ini") ++ gtk3Theme=$("${AWK}" -F'=' '/^gtk-theme-name/ {print $2}' "$HOME/.config/gtk-3.0/settings.ini") + fi + fi + +@@ -2859,7 +2874,7 @@ detectgtk () { + + # ROX-Filer icon detect only + if [ -a "${XDG_CONFIG_HOME:-${HOME}/.config}/rox.sourceforge.net/ROX-Filer/Options" ]; then +- gtkIcons=$(awk -F'[>,<]' '/icon_theme/ {print $3}' "${XDG_CONFIG_HOME:-${HOME}/.config}/rox.sourceforge.net/ROX-Filer/Options") ++ gtkIcons=$("${AWK}" -F'[>,<]' '/icon_theme/ {print $3}' "${XDG_CONFIG_HOME:-${HOME}/.config}/rox.sourceforge.net/ROX-Filer/Options") + fi + + # E17 detection +@@ -2872,10 +2887,10 @@ detectgtk () { + # Background Detection (feh, nitrogen) + if [ "$background_detect" == "1" ]; then + if [ -a "$HOME/.fehbg" ]; then +- gtkBackgroundFull=$(awk -F"'" '/feh --bg/{print $2}' "$HOME/.fehbg" 2>/dev/null) +- gtkBackground=$(echo "$gtkBackgroundFull" | awk -F"/" '{print $NF}') ++ gtkBackgroundFull=$("${AWK}" -F"'" '/feh --bg/{print $2}' "$HOME/.fehbg" 2>/dev/null) ++ gtkBackground=$(echo "$gtkBackgroundFull" | "${AWK}" -F"/" '{print $NF}') + elif [ -a "${XDG_CONFIG_HOME:-${HOME}/.config}/nitrogen/bg-saved.cfg" ]; then +- gtkBackground=$(awk -F"/" '/file=/ {print $NF}' "${XDG_CONFIG_HOME:-${HOME}/.config}/nitrogen/bg-saved.cfg") ++ gtkBackground=$("${AWK}" -F"/" '/file=/ {print $NF}' "${XDG_CONFIG_HOME:-${HOME}/.config}/nitrogen/bg-saved.cfg") + fi + fi + +@@ -2910,7 +2925,7 @@ detectdroid () { + rom=$(getprop ro.build.display.id) + fi + baseband=$(getprop ro.baseband) +- cpu=$(awk -F': ' '/^Processor/ {P=$2} /^Hardware/ {H=$2} END {print H != "" ? H : P}' /proc/cpuinfo) ++ cpu=$("${AWK}" -F': ' '/^Processor/ {P=$2} /^Hardware/ {H=$2} END {print H != "" ? H : P}' /proc/cpuinfo) + } + + +@@ -6032,7 +6047,7 @@ asciiText () { + #n=${#fulloutput[*]} + for ((i=0; i<${#fulloutput[*]}; i++)); do + # echo "${out_array[@]}" +- case $(awk 'BEGIN{srand();print int(rand()*(1000-1))+1 }') in ++ case $("${AWK}" 'BEGIN{srand();print int(rand()*(1000-1))+1 }') in + 411|188|15|166|609) + f_size=${#fulloutput[*]} + o_size=${#out_array[*]} +-- +2.41.0.640.ga95def55d0-goog + diff --git a/package/sdbus-cpp/sdbus-cpp.hash b/package/sdbus-cpp/sdbus-cpp.hash index 3a0e863a86f..169fad28076 100644 --- a/package/sdbus-cpp/sdbus-cpp.hash +++ b/package/sdbus-cpp/sdbus-cpp.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 35e939fdd9c796522702c9c8762dd59b5c47f3440c01ba9feb9921c042780b55 v1.1.0.tar.gz +sha256 7f7231904abb6a996b8c18ddc5fb50078ef5dff5191649abf9f127aff41d24e9 v1.2.0.tar.gz sha256 20c17d8b8c48a600800dfd14f95d5cb9ff47066a9641ddeab48dc54aec96e331 COPYING sha256 be43debbf06a38325616054a39e44ed5afde4ed21b99de197488a4a306d47e39 COPYING-LGPL-Exception diff --git a/package/sdbus-cpp/sdbus-cpp.mk b/package/sdbus-cpp/sdbus-cpp.mk index e0fbc5c8569..0e8d74cfcd4 100644 --- a/package/sdbus-cpp/sdbus-cpp.mk +++ b/package/sdbus-cpp/sdbus-cpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDBUS_CPP_VERSION = 1.1.0 +SDBUS_CPP_VERSION = 1.2.0 SDBUS_CPP_SOURCE = v$(SDBUS_CPP_VERSION).tar.gz SDBUS_CPP_SITE = $(call github,Kistler-Group,sdbus-cpp,v$(SDBUS_CPP_VERSION)) SDBUS_CPP_INSTALL_STAGING = YES diff --git a/package/sdl/0003-SDL_x11yuv.c-fix-possible-use-after-free.patch b/package/sdl/0003-SDL_x11yuv.c-fix-possible-use-after-free.patch new file mode 100644 index 00000000000..d7858d0f961 --- /dev/null +++ b/package/sdl/0003-SDL_x11yuv.c-fix-possible-use-after-free.patch @@ -0,0 +1,28 @@ +From d7e00208738a0bc6af302723fe64908ac35b777b 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 +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.30.2 + diff --git a/package/sdl/sdl.hash b/package/sdl/sdl.hash index 2c46975dc37..6154541a493 100644 --- a/package/sdl/sdl.hash +++ b/package/sdl/sdl.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 d6d316a793e5e348155f0dd93b979798933fb98aa1edebcc108829d6474aad00 SDL-1.2.15.tar.gz +sha256 d6d316a793e5e348155f0dd93b979798933fb98aa1edebcc108829d6474aad00 SDL-1.2.15.tar.gz # Locally computed -sha256 bb117c0fbd7f57f64170b690285d7df07c2371b578e3b3cd3aa2e1155ef461a0 COPYING +sha256 bb117c0fbd7f57f64170b690285d7df07c2371b578e3b3cd3aa2e1155ef461a0 COPYING diff --git a/package/sdl/sdl.mk b/package/sdl/sdl.mk index 7389cd3edb8..462600debb3 100644 --- a/package/sdl/sdl.mk +++ b/package/sdl/sdl.mk @@ -13,6 +13,9 @@ SDL_CPE_ID_VENDOR = libsdl SDL_CPE_ID_PRODUCT = simple_directmedia_layer SDL_INSTALL_STAGING = YES +# 0003-SDL_x11yuv.c-fix-possible-use-after-free.patch +SDL_IGNORE_CVES += CVE-2022-34568 + # we're patching configure.in, but package cannot autoreconf with our version of # autotools, so we have to do it manually instead of setting SDL_AUTORECONF = YES define SDL_RUN_AUTOGEN diff --git a/package/sdl2/Config.in b/package/sdl2/Config.in index 2ad45e4d008..7c8258fe73b 100644 --- a/package/sdl2/Config.in +++ b/package/sdl2/Config.in @@ -31,14 +31,19 @@ comment "X11 video driver needs X.org" config BR2_PACKAGE_SDL2_KMSDRM bool "KMS/DRM video driver" - depends on BR2_PACKAGE_LIBDRM - depends on BR2_PACKAGE_MESA3D_GBM + depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm + depends on BR2_PACKAGE_HAS_LIBGBM + depends on BR2_PACKAGE_HAS_LIBEGL + depends on BR2_PACKAGE_SDL2_OPENGL || BR2_PACKAGE_SDL2_OPENGLES + select BR2_PACKAGE_LIBDRM -comment "KMS/DRM video driver needs libdrm" - depends on !BR2_PACKAGE_LIBDRM +comment "KMS/DRM video driver needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS -comment "KMS/DRM video driver needs mesa3d w/ GBM" - depends on !BR2_PACKAGE_MESA3D_GBM +comment "KMS/DRM video driver needs a GBM provider, and OpenGL or OpenGLES+EGL" + depends on !BR2_PACKAGE_HAS_LIBGBM || \ + !BR2_PACKAGE_HAS_LIBEGL || \ + !(BR2_PACKAGE_SDL2_OPENGL || BR2_PACKAGE_SDL2_OPENGLES) config BR2_PACKAGE_SDL2_OPENGL bool "OpenGL (GLX)" diff --git a/package/sdl2/sdl2.hash b/package/sdl2/sdl2.hash index 26b7ce41026..0c7bdf7fa10 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.0.20.tar.gz.sig -sha256 c56aba1d7b5b0e7e999e4a7698c70b63a3394ff9704b5f6e1c57e0c16f04dd06 SDL2-2.0.20.tar.gz +# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.26.5.tar.gz.sig +sha256 ad8fea3da1be64c83c45b1d363a6b4ba8fd60f5bde3b23ec73855709ec5eabf7 SDL2-2.26.5.tar.gz # Locally calculated -sha256 fcb07e07ac6bc8b2fcf047b50431ef4ebe5b619d7ca7c82212018309a9067426 LICENSE.txt +sha256 9928507f684c1965d07f2b6ef4b4723d5efc2f6b4ab731f743a413c51c319927 LICENSE.txt diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index e0a817e2490..5f2e1e0ed18 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDL2_VERSION = 2.0.20 +SDL2_VERSION = 2.26.5 SDL2_SOURCE = SDL2-$(SDL2_VERSION).tar.gz SDL2_SITE = http://www.libsdl.org/release SDL2_LICENSE = Zlib @@ -20,7 +20,24 @@ SDL2_CONF_OPTS += \ --disable-esd \ --disable-dbus \ --disable-pulseaudio \ - --disable-video-wayland + --disable-video-vivante \ + --disable-video-cocoa \ + --disable-video-metal \ + --disable-video-wayland \ + --disable-video-dummy \ + --disable-video-offscreen \ + --disable-video-vulkan \ + --disable-ime \ + --disable-ibus \ + --disable-fcitx \ + --disable-joystick-mfi \ + --disable-directx \ + --disable-xinput \ + --disable-wasapi \ + --disable-hidapi-joystick \ + --disable-hidapi-libusb \ + --disable-joystick-virtual \ + --disable-render-d3d # We are using autotools build system for sdl2, so the sdl2-config.cmake # include path are not resolved like for sdl2-config script. @@ -138,10 +155,16 @@ SDL2_CONF_OPTS += --disable-video-opengl endif ifeq ($(BR2_PACKAGE_SDL2_OPENGLES),y) -SDL2_CONF_OPTS += --enable-video-opengles +SDL2_CONF_OPTS += \ + --enable-video-opengles \ + --enable-video-opengles1 \ + --enable-video-opengles2 SDL2_DEPENDENCIES += libgles else -SDL2_CONF_OPTS += --disable-video-opengles +SDL2_CONF_OPTS += \ + --disable-video-opengles \ + --disable-video-opengles1 \ + --disable-video-opengles2 endif ifeq ($(BR2_PACKAGE_ALSA_LIB),y) @@ -152,7 +175,7 @@ SDL2_CONF_OPTS += --disable-alsa endif ifeq ($(BR2_PACKAGE_SDL2_KMSDRM),y) -SDL2_DEPENDENCIES += libdrm mesa3d +SDL2_DEPENDENCIES += libdrm libgbm libegl SDL2_CONF_OPTS += --enable-video-kmsdrm else SDL2_CONF_OPTS += --disable-video-kmsdrm diff --git a/package/sdl2_image/sdl2_image.hash b/package/sdl2_image/sdl2_image.hash index 621a9202198..e1efa4debe6 100644 --- a/package/sdl2_image/sdl2_image.hash +++ b/package/sdl2_image/sdl2_image.hash @@ -1,3 +1,3 @@ -# Locally calculated -sha256 bdd5f6e026682f7d7e1be0b6051b209da2f402a2dd8bd1c4bd9c25ad263108d0 SDL2_image-2.0.5.tar.gz -sha256 45079362e2230154205413a6940544ca94e3479ccf76205c71c4f542a6815d25 COPYING.txt +# Locally calculated after checking https://www.libsdl.org/projects/SDL_image/release/SDL2_image-2.6.2.tar.gz.sig +sha256 48355fb4d8d00bac639cd1c4f4a7661c4afef2c212af60b340e06b7059814777 SDL2_image-2.6.2.tar.gz +sha256 28aabfed22b3cb0b7e23ef40385e4f66297c960082f029c96d073cc1d4e008d5 LICENSE.txt diff --git a/package/sdl2_image/sdl2_image.mk b/package/sdl2_image/sdl2_image.mk index 13de7b12686..953742de28a 100644 --- a/package/sdl2_image/sdl2_image.mk +++ b/package/sdl2_image/sdl2_image.mk @@ -4,12 +4,12 @@ # ################################################################################ -SDL2_IMAGE_VERSION = 2.0.5 +SDL2_IMAGE_VERSION = 2.6.2 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 SDL2_IMAGE_LICENSE = Zlib -SDL2_IMAGE_LICENSE_FILES = COPYING.txt +SDL2_IMAGE_LICENSE_FILES = LICENSE.txt SDL2_IMAGE_CPE_ID_VENDOR = libsdl SDL2_IMAGE_CPE_ID_PRODUCT = sdl_image diff --git a/package/sdl2_mixer/sdl2_mixer.hash b/package/sdl2_mixer/sdl2_mixer.hash index f3bab151f22..4592014d7f3 100644 --- a/package/sdl2_mixer/sdl2_mixer.hash +++ b/package/sdl2_mixer/sdl2_mixer.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b4cf5a382c061cd75081cf246c2aa2f9df8db04bdda8dcdc6b6cca55bede2419 SDL2_mixer-2.0.4.tar.gz -sha256 113727180e7956cb9718b03b41da85b63ea54743a33047071a623bf672895a10 COPYING.txt +sha256 7a6ba86a478648ce617e3a5e9277181bc67f7ce9876605eea6affd4a0d6eea8f SDL2_mixer-2.6.3.tar.gz +sha256 1852c8549e3d154687197d46abababd3e8faae035f19991b2ca850fa3a43ad57 LICENSE.txt diff --git a/package/sdl2_mixer/sdl2_mixer.mk b/package/sdl2_mixer/sdl2_mixer.mk index f349b8ca80c..074e2822054 100644 --- a/package/sdl2_mixer/sdl2_mixer.mk +++ b/package/sdl2_mixer/sdl2_mixer.mk @@ -4,11 +4,11 @@ # ################################################################################ -SDL2_MIXER_VERSION = 2.0.4 +SDL2_MIXER_VERSION = 2.6.3 SDL2_MIXER_SOURCE = SDL2_mixer-$(SDL2_MIXER_VERSION).tar.gz SDL2_MIXER_SITE = http://www.libsdl.org/projects/SDL_mixer/release SDL2_MIXER_LICENSE = Zlib -SDL2_MIXER_LICENSE_FILES = COPYING.txt +SDL2_MIXER_LICENSE_FILES = LICENSE.txt SDL2_MIXER_INSTALL_STAGING = YES SDL2_MIXER_DEPENDENCIES = sdl2 host-pkgconf diff --git a/package/sdl2_ttf/sdl2_ttf.hash b/package/sdl2_ttf/sdl2_ttf.hash index a490b002b6f..3313b341f9e 100644 --- a/package/sdl2_ttf/sdl2_ttf.hash +++ b/package/sdl2_ttf/sdl2_ttf.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7234eb8883514e019e7747c703e4a774575b18d435c22a4a29d068cb768a2251 SDL2_ttf-2.0.18.tar.gz -sha256 e211dfe7e2c36e64048be886fe3f2bbba8732ce4dd77b596a355d3abbec775a4 COPYING.txt +sha256 78cdad51f3cc3ada6932b1bb6e914b33798ab970a1e817763f22ddbfd97d0c57 SDL2_ttf-2.20.1.tar.gz +sha256 28aabfed22b3cb0b7e23ef40385e4f66297c960082f029c96d073cc1d4e008d5 LICENSE.txt diff --git a/package/sdl2_ttf/sdl2_ttf.mk b/package/sdl2_ttf/sdl2_ttf.mk index 54e76815f17..f859d097fff 100644 --- a/package/sdl2_ttf/sdl2_ttf.mk +++ b/package/sdl2_ttf/sdl2_ttf.mk @@ -4,14 +4,14 @@ # ################################################################################ -SDL2_TTF_VERSION = 2.0.18 +SDL2_TTF_VERSION = 2.20.1 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 -SDL2_TTF_LICENSE_FILES = COPYING.txt +SDL2_TTF_LICENSE_FILES = LICENSE.txt SDL2_TTF_INSTALL_STAGING = YES SDL2_TTF_DEPENDENCIES = sdl2 freetype host-pkgconf -SDL2_TTF_CONF_OPTS = --disable-freetype-builtin +SDL2_TTF_CONF_OPTS = --disable-freetype-builtin --disable-harfbuzz-builtin ifeq ($(BR2_PACKAGE_HARFBUZZ),y) SDL2_TTF_DEPENDENCIES += harfbuzz diff --git a/package/sdl_gfx/sdl_gfx.hash b/package/sdl_gfx/sdl_gfx.hash index afd46536671..6e94b238da4 100644 --- a/package/sdl_gfx/sdl_gfx.hash +++ b/package/sdl_gfx/sdl_gfx.hash @@ -1,6 +1,6 @@ # From http://sourceforge.net/projects/sdlgfx/files/ -md5 fcc3c4f2d1b4943409bf7e67dd65d03a SDL_gfx-2.0.23.tar.gz -sha1 aae60e7fed539f3f8a0a0bd6da3bbcf625642596 SDL_gfx-2.0.23.tar.gz +md5 fcc3c4f2d1b4943409bf7e67dd65d03a SDL_gfx-2.0.23.tar.gz +sha1 aae60e7fed539f3f8a0a0bd6da3bbcf625642596 SDL_gfx-2.0.23.tar.gz # Locally computed sha256 4f5df842266c59b2d7e6ef35b53d7f37b13795d93baf3ed211f502c216f7bc89 COPYING sha256 5f3bc98e0bd2de83279bd62868d4bc0c2b4f811ab828b036d36a4a6d1cd5672d LICENSE diff --git a/package/seatd/seatd.hash b/package/seatd/seatd.hash index 88793b6dd54..7500036e5b1 100644 --- a/package/seatd/seatd.hash +++ b/package/seatd/seatd.hash @@ -1,5 +1,5 @@ # Calculated locally -sha256 3d4ac288114219ba7721239cafee7bfbeb7cf8e1e7fd653602a369e4ad050bd8 0.6.4.tar.gz +sha256 210ddf8efa1149cde4dd35908bef8e9e63c2edaa0cdb5435f2e6db277fafff3c 0.7.0.tar.gz # License files sha256 282a494803d666616bd726e0279636b5f6a31387ae19a707459074050f2600d3 LICENSE diff --git a/package/seatd/seatd.mk b/package/seatd/seatd.mk index 5382cad39b8..dbe9ac31544 100644 --- a/package/seatd/seatd.mk +++ b/package/seatd/seatd.mk @@ -4,7 +4,7 @@ # ################################################################################ -SEATD_VERSION = 0.6.4 +SEATD_VERSION = 0.7.0 SEATD_SOURCE = $(SEATD_VERSION).tar.gz SEATD_SITE = https://git.sr.ht/~kennylevinsen/seatd/archive SEATD_LICENSE = MIT @@ -17,7 +17,7 @@ SEATD_CONF_OPTS += \ -Dwerror=false ifeq ($(BR2_PACKAGE_SYSTEMD_LOGIND),y) -SEATD_CONF_OPTS += -Dlibseat-logind=enabled +SEATD_CONF_OPTS += -Dlibseat-logind=systemd SEATD_DEPENDENCIES += systemd else SEATD_CONF_OPTS += -Dlibseat-logind=disabled @@ -33,7 +33,7 @@ ifeq ($(BR2_PACKAGE_SEATD_DAEMON),y) SEATD_CONF_OPTS += -Dlibseat-seatd=enabled -Dserver=enabled define SEATD_USERS - - - video -1 - - - - - + - - seat -1 - - - - - endef define SEATD_INSTALL_INIT_SYSV diff --git a/package/sed/sed.hash b/package/sed/sed.hash index bb481285267..10e2c36d8f9 100644 --- a/package/sed/sed.hash +++ b/package/sed/sed.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/sed/sed-4.8.tar.xz.sig +# https://ftp.gnu.org/gnu/sed/sed-4.9.tar.xz.sig # with the key 155D3FC500C834486D1EEA677FD9FCCB000BEEEE -sha256 f79b0cfea71b37a8eeec8490db6c5f7ae7719c35587f21edb0617f370eeff633 sed-4.8.tar.xz +sha256 6e226b732e1cd739464ad6862bd1a1aba42d7982922da7a53519631d24975181 sed-4.9.tar.xz # Locally calculated -sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b COPYING +sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING diff --git a/package/sed/sed.mk b/package/sed/sed.mk index 64fb2035b0c..81650836583 100644 --- a/package/sed/sed.mk +++ b/package/sed/sed.mk @@ -4,7 +4,7 @@ # ################################################################################ -SED_VERSION = 4.8 +SED_VERSION = 4.9 SED_SOURCE = sed-$(SED_VERSION).tar.xz SED_SITE = $(BR2_GNU_MIRROR)/sed SED_LICENSE = GPL-3.0 diff --git a/package/sedutil/Config.in b/package/sedutil/Config.in index f3452b60fb7..e695f2bed71 100644 --- a/package/sedutil/Config.in +++ b/package/sedutil/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_SEDUTIL_ARCH_SUPPORTS bool # no big endian support - default y if BR2_arcle || BR2_arm || BR2_aarch64 || BR2_csky \ + default y if BR2_arcle || BR2_arm || BR2_aarch64 \ || BR2_i386 || BR2_microblazeel || BR2_mipsel \ || BR2_mips64el || BR2_nios2 || BR2_powerpc64le \ || BR2_sh4 || BR2_sh4a || BR2_x86_64 \ diff --git a/package/sedutil/sedutil.hash b/package/sedutil/sedutil.hash index 9db10113795..2ceb5db659c 100644 --- a/package/sedutil/sedutil.hash +++ b/package/sedutil/sedutil.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9259466b4f73af276153c5245834a56f48f8721ea7263611b5d5e8326bc43d9e sedutil-1.15.1.tar.gz -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 Common/LICENSE.txt +sha256 88016b93cbbef98fa6f5c4e6f58e6c871662b6a7f1fc8dc788c8599fa37a44f3 sedutil-1.20.0.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 Common/LICENSE.txt diff --git a/package/sedutil/sedutil.mk b/package/sedutil/sedutil.mk index c80e43448dd..566ed4fae8d 100644 --- a/package/sedutil/sedutil.mk +++ b/package/sedutil/sedutil.mk @@ -4,7 +4,7 @@ # ################################################################################ -SEDUTIL_VERSION = 1.15.1 +SEDUTIL_VERSION = 1.20.0 SEDUTIL_SITE = $(call github,Drive-Trust-Alliance,sedutil,$(SEDUTIL_VERSION)) SEDUTIL_LICENSE = GPL-3.0+ SEDUTIL_LICENSE_FILES = Common/LICENSE.txt diff --git a/package/sentry-cli/sentry-cli.hash b/package/sentry-cli/sentry-cli.hash index 73f818125f9..3562199a829 100644 --- a/package/sentry-cli/sentry-cli.hash +++ b/package/sentry-cli/sentry-cli.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 d687336379fd96c4ee73f24bd062d31672bd7453af53311b72977be3c8c78fef sentry-cli-1.59.0.tar.gz +sha256 fa06f9f47782713eef8a4f10b674e2375b9439360ab34b37558ec4b30ec84861 sentry-cli-2.8.0.tar.gz sha256 9503def7b54ceb6e3cd182fd59bc05d3a30d7eae481e65aaba4b495133c83c14 LICENSE diff --git a/package/sentry-cli/sentry-cli.mk b/package/sentry-cli/sentry-cli.mk index 58f5f1e3252..15094c2d01b 100644 --- a/package/sentry-cli/sentry-cli.mk +++ b/package/sentry-cli/sentry-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -SENTRY_CLI_VERSION = 1.59.0 +SENTRY_CLI_VERSION = 2.8.0 SENTRY_CLI_SITE = $(call github,getsentry,sentry-cli,$(SENTRY_CLI_VERSION)) SENTRY_CLI_LICENSE = BSD-3-clause SENTRY_CLI_LICENSE_FILES = LICENSE diff --git a/package/ser2net/Config.in b/package/ser2net/Config.in index 3d110b70f23..1859d42c8f2 100644 --- a/package/ser2net/Config.in +++ b/package/ser2net/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_SER2NET bool "ser2net" depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_HAS_ATOMIC # gensio select BR2_PACKAGE_GENSIO select BR2_PACKAGE_LIBYAML help diff --git a/package/ser2net/ser2net.hash b/package/ser2net/ser2net.hash index 31a7518428b..50a2efdee85 100644 --- a/package/ser2net/ser2net.hash +++ b/package/ser2net/ser2net.hash @@ -1,6 +1,6 @@ # From https://sourceforge.net/projects/ser2net/files/ser2net/ -md5 e6d88a440852e28b8e2978003b00e154 ser2net-4.3.4.tar.gz -sha1 74d02c19c2eef219b59a47fbc61b4fb09cf608d3 ser2net-4.3.4.tar.gz +md5 73b4ccc7e9d89034f1a1a20a780b9da9 ser2net-4.3.8.tar.gz +sha1 d1597d88d154489cb08bac69bb1772712d30cbcd ser2net-4.3.8.tar.gz # Locally computed: -sha256 c714d6777849100b2ca3f216d1cfc36d4573639ececc91d5c7809dfe27c8428e ser2net-4.3.4.tar.gz +sha256 e5620975523059a38709bb53c0567600adbbcb8011066a2d2fe1b4db9efe0ba3 ser2net-4.3.8.tar.gz sha256 501f3108e6c03e5a0a5585ebaaa369171aead5319cd0a7a4dc1f66211c1f09f1 COPYING diff --git a/package/ser2net/ser2net.mk b/package/ser2net/ser2net.mk index bec2a9c2024..679aaec29aa 100644 --- a/package/ser2net/ser2net.mk +++ b/package/ser2net/ser2net.mk @@ -4,7 +4,7 @@ # ################################################################################ -SER2NET_VERSION = 4.3.4 +SER2NET_VERSION = 4.3.8 SER2NET_SITE = https://downloads.sourceforge.net/project/ser2net/ser2net SER2NET_LICENSE = GPL-2.0+ SER2NET_LICENSE_FILES = COPYING diff --git a/package/serd/serd.hash b/package/serd/serd.hash index d64a2aa2714..c8a45a08315 100644 --- a/package/serd/serd.hash +++ b/package/serd/serd.hash @@ -1,4 +1,4 @@ # Locally calculated after checking signature -# http://download.drobilla.net/serd-0.30.10.tar.bz2.sig -sha256 affa80deec78921f86335e6fc3f18b80aefecf424f6a5755e9f2fa0eb0710edf serd-0.30.10.tar.bz2 -sha256 e06562d6bcf0341b2ac2ad0f0ca36801d2ebf388d5ef297011625e4c36e963f0 COPYING +# http://download.drobilla.net/serd-0.30.14.tar.xz.sig +sha256 a14137d47b11d6ad431e78da341ca9737998d9eaccf6a49263d4c8d79fd856e3 serd-0.30.14.tar.xz +sha256 13b62d3705cabee6a21730eb24f773249271c2d95e9ecbab16069e729d4ae147 COPYING diff --git a/package/serd/serd.mk b/package/serd/serd.mk index 85b16f68661..7922e777c8f 100644 --- a/package/serd/serd.mk +++ b/package/serd/serd.mk @@ -4,17 +4,13 @@ # ################################################################################ -SERD_VERSION = 0.30.10 +SERD_VERSION = 0.30.14 SERD_SITE = https://download.drobilla.net -SERD_SOURCE = serd-$(SERD_VERSION).tar.bz2 +SERD_SOURCE = serd-$(SERD_VERSION).tar.xz SERD_LICENSE = ISC SERD_LICENSE_FILES = COPYING SERD_INSTALL_STAGING = YES -SERD_CONF_OPTS += --largefile --no-coverage +SERD_CONF_OPTS += -Ddocs=disabled -Dstatic=false -Dtests=disabled -ifeq ($(BR2_STATIC_LIBS),y) -SERD_CONF_OPTS += --static --no-shared --static-progs -endif - -$(eval $(waf-package)) +$(eval $(meson-package)) diff --git a/package/setools/setools.hash b/package/setools/setools.hash index 74428a177c7..fdb0919f117 100644 --- a/package/setools/setools.hash +++ b/package/setools/setools.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 202eac5f857475937bee8136cff278aa2b4a4b94a0dec63fbbbe18c9eb644a4e setools-4.4.0.tar.gz -sha256 2f7547e10f76a382c24c053595f38a5cc6dda9347f508f254ca490e0046a9624 COPYING -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL +sha256 202eac5f857475937bee8136cff278aa2b4a4b94a0dec63fbbbe18c9eb644a4e setools-4.4.0.tar.gz +sha256 2f7547e10f76a382c24c053595f38a5cc6dda9347f508f254ca490e0046a9624 COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL diff --git a/package/sexpect/Config.in b/package/sexpect/Config.in new file mode 100644 index 00000000000..e558af26f0a --- /dev/null +++ b/package/sexpect/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_SEXPECT + bool "sexpect" + depends on BR2_USE_MMU # fork() + help + sexpect is another implementation of Expect which is + specifically designed for Shell scripts + (sh, bash, ksh, zsh, ...) + + https://github.com/clarkwang/sexpect diff --git a/package/sexpect/sexpect.hash b/package/sexpect/sexpect.hash new file mode 100644 index 00000000000..d5121176269 --- /dev/null +++ b/package/sexpect/sexpect.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 f6801c8b979d56eec54aedd7ede06e2342f382cee291beea88b52869186c557c sexpect-2.3.14.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE diff --git a/package/sexpect/sexpect.mk b/package/sexpect/sexpect.mk new file mode 100644 index 00000000000..7b878600e41 --- /dev/null +++ b/package/sexpect/sexpect.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# sexpect +# +################################################################################ + +SEXPECT_VERSION = 2.3.14 +SEXPECT_SITE = $(call github,clarkwang,sexpect,v$(SEXPECT_VERSION)) +SEXPECT_LICENSE = GPL-3.0 +SEXPECT_LICENSE_FILES = LICENSE +SEXPECT_SUPPORTS_IN_SOURCE_BUILD = NO + +$(eval $(cmake-package)) diff --git a/package/sg3_utils/sg3_utils.mk b/package/sg3_utils/sg3_utils.mk index e357fc1ddef..b291bd69d9e 100644 --- a/package/sg3_utils/sg3_utils.mk +++ b/package/sg3_utils/sg3_utils.mk @@ -24,6 +24,14 @@ ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) SG3_UTILS_CONF_ENV += LIBS="-latomic" endif +SG3_UTILS_CFLAGS = $(TARGET_CFLAGS) + +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_104028),y) +SG3_UTILS_CFLAGS += -O0 +endif + +SG3_UTILS_CONF_ENV += CFLAGS="$(SG3_UTILS_CFLAGS)" + ifeq ($(BR2_PACKAGE_SG3_UTILS_PROGS),) define SG3_UTILS_REMOVE_PROGS for prog in \ diff --git a/package/shadowsocks-libev/0002-fix-maybe-uninitialized-errors.patch b/package/shadowsocks-libev/0002-fix-maybe-uninitialized-errors.patch new file mode 100644 index 00000000000..5275323e659 --- /dev/null +++ b/package/shadowsocks-libev/0002-fix-maybe-uninitialized-errors.patch @@ -0,0 +1,93 @@ +From 0c23224e926463b1097414979367655a27fa6d60 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 7 Apr 2022 18:27:58 +0200 +Subject: [PATCH] fix maybe-uninitialized errors + +Set {listen,server}_sock to -1 when needed as already done in +src/manager.c by commit ecf1fcc84594b09ed2d61e3677cd8e62bd897ccb to +avoid the following build failure: + +local.c: In function 'create_and_bind': +local.c:218:12: error: 'listen_sock' may be used uninitialized in this function [-Werror=maybe-uninitialized] + 218 | return listen_sock; + | ^~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/27471a878ff52a972ac087d534e44fb0c50808f6 + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/shadowsocks/shadowsocks-libev/commit/0c23224e926463b1097414979367655a27fa6d60] +--- + src/local.c | 2 +- + src/redir.c | 2 +- + src/server.c | 2 +- + src/tunnel.c | 2 +- + src/udprelay.c | 2 +- + 5 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/local.c b/src/local.c +index b1ab040bb..47d634ce5 100644 +--- a/src/local.c ++++ b/src/local.c +@@ -168,7 +168,7 @@ create_and_bind(const char *addr, const char *port) + { + struct addrinfo hints; + struct addrinfo *result, *rp; +- int s, listen_sock; ++ int s, listen_sock = -1; + + memset(&hints, 0, sizeof(struct addrinfo)); + hints.ai_family = AF_UNSPEC; /* Return IPv4 and IPv6 choices */ +diff --git a/src/redir.c b/src/redir.c +index 4a5a489f0..e60bd4870 100644 +--- a/src/redir.c ++++ b/src/redir.c +@@ -147,7 +147,7 @@ create_and_bind(const char *addr, const char *port) + { + struct addrinfo hints; + struct addrinfo *result, *rp; +- int s, listen_sock; ++ int s, listen_sock = -1; + + memset(&hints, 0, sizeof(struct addrinfo)); + hints.ai_family = AF_UNSPEC; /* Return IPv4 and IPv6 choices */ +diff --git a/src/server.c b/src/server.c +index e9cdc2619..073e38b22 100644 +--- a/src/server.c ++++ b/src/server.c +@@ -550,7 +550,7 @@ create_and_bind(const char *host, const char *port, int mptcp) + { + struct addrinfo hints; + struct addrinfo *result, *rp, *ipv4v6bindall; +- int s, listen_sock; ++ int s, listen_sock = -1; + + memset(&hints, 0, sizeof(struct addrinfo)); + hints.ai_family = AF_UNSPEC; /* Return IPv4 and IPv6 choices */ +diff --git a/src/tunnel.c b/src/tunnel.c +index e0886bdb9..6641fe62a 100644 +--- a/src/tunnel.c ++++ b/src/tunnel.c +@@ -129,7 +129,7 @@ create_and_bind(const char *addr, const char *port) + { + struct addrinfo hints; + struct addrinfo *result, *rp; +- int s, listen_sock; ++ int s, listen_sock = -1; + + memset(&hints, 0, sizeof(struct addrinfo)); + hints.ai_family = AF_UNSPEC; /* Return IPv4 and IPv6 choices */ +diff --git a/src/udprelay.c b/src/udprelay.c +index 23a042497..580ad4bd8 100644 +--- a/src/udprelay.c ++++ b/src/udprelay.c +@@ -446,7 +446,7 @@ create_server_socket(const char *host, const char *port) + { + struct addrinfo hints; + struct addrinfo *result, *rp, *ipv4v6bindall; +- int s, server_sock; ++ int s, server_sock = -1; + + memset(&hints, 0, sizeof(struct addrinfo)); + hints.ai_family = AF_UNSPEC; /* Return IPv4 and IPv6 choices */ diff --git a/package/shadowsocks-libev/0003-lib-Makefile.am-remove-static-from-LDFLAGS.patch b/package/shadowsocks-libev/0003-lib-Makefile.am-remove-static-from-LDFLAGS.patch new file mode 100644 index 00000000000..aebdb2305b2 --- /dev/null +++ b/package/shadowsocks-libev/0003-lib-Makefile.am-remove-static-from-LDFLAGS.patch @@ -0,0 +1,61 @@ +From e8ba4d6fd11ce795d9ed7b7a2c0ee0f6bf50f352 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sat, 23 Jul 2022 18:20:00 +0200 +Subject: [PATCH] lib*/Makefile.am: remove -static from LDFLAGS + +The libbloom, libcork and libipset libraries are "convenience +libraries" in libtool speak, and their code ends up being used in a +shared library, so building them with -static does not work as it +causes the code to be built without fPIC. + +https://www.gnu.org/software/libtool/manual/html_node/Static-libraries.html +explains: + +""" +If you omit both -rpath and -static, libtool will create a convenience +library that can be used to create other libtool libraries, even +shared ones. Just like in the static case, the library behaves as an +alias to a set of object files and dependency libraries, but in this +case the object files are suitable for inclusion in shared libraries. +""" + +Signed-off-by: Thomas Petazzoni +--- + libbloom/Makefile.am | 2 -- + libcork/Makefile.am | 2 -- + libipset/Makefile.am | 2 -- + 3 files changed, 6 deletions(-) + +diff --git a/libbloom/Makefile.am b/libbloom/Makefile.am +index 17c0761..6b2eddd 100644 +--- a/libbloom/Makefile.am ++++ b/libbloom/Makefile.am +@@ -2,5 +2,3 @@ noinst_LTLIBRARIES = libbloom.la + + libbloom_la_SOURCES = bloom.c murmur2/MurmurHash2.c + libbloom_la_CFLAGS = -I$(top_srcdir)/libbloom -I$(top_srcdir)/libbloom/murmur2 +- +-libbloom_la_LDFLAGS = -static +diff --git a/libcork/Makefile.am b/libcork/Makefile.am +index 82ce062..e466a68 100644 +--- a/libcork/Makefile.am ++++ b/libcork/Makefile.am +@@ -17,5 +17,3 @@ endif + + libcork_la_SOURCES = $(cli_src) $(core_src) $(ds_src) $(pthreads_src) $(posix_src) + libcork_la_CFLAGS = -I$(top_srcdir)/libcork/include -DCORK_API=CORK_LOCAL +- +-libcork_la_LDFLAGS = -static +diff --git a/libipset/Makefile.am b/libipset/Makefile.am +index 3edfde6..bee8493 100644 +--- a/libipset/Makefile.am ++++ b/libipset/Makefile.am +@@ -23,5 +23,3 @@ set_src = src/libipset/set/allocation.c \ + + libipset_la_SOURCES = src/libipset/general.c ${bdd_src} ${map_src} ${set_src} + libipset_la_CFLAGS = -I$(top_srcdir)/libipset/include -I$(top_srcdir)/libcork/include +- +-libipset_la_LDFLAGS = -static +-- +2.37.1 + diff --git a/package/shairport-sync/shairport-sync.mk b/package/shairport-sync/shairport-sync.mk index 487e0c05e55..4430014ec98 100644 --- a/package/shairport-sync/shairport-sync.mk +++ b/package/shairport-sync/shairport-sync.mk @@ -59,6 +59,14 @@ endif ifeq ($(BR2_PACKAGE_SHAIRPORT_SYNC_DBUS),y) SHAIRPORT_SYNC_DEPENDENCIES += libglib2 SHAIRPORT_SYNC_CONF_OPTS += --with-dbus-interface --with-mpris-interface +define SHAIRPORT_SYNC_INSTALL_DBUS + $(INSTALL) -m 0644 -D \ + $(@D)/scripts/shairport-sync-dbus-policy.conf \ + $(TARGET_DIR)/etc/dbus-1/system.d/shairport-sync-dbus.conf + $(INSTALL) -m 0644 -D \ + $(@D)/scripts/shairport-sync-mpris-policy.conf \ + $(TARGET_DIR)/etc/dbus-1/system.d/shairport-sync-mpris.conf +endef else SHAIRPORT_SYNC_CONF_OPTS += --without-dbus-interface --without-mpris-interface endif @@ -82,6 +90,7 @@ define SHAIRPORT_SYNC_INSTALL_TARGET_CMDS $(TARGET_DIR)/usr/bin/shairport-sync $(INSTALL) -D -m 0644 $(@D)/scripts/shairport-sync.conf \ $(TARGET_DIR)/etc/shairport-sync.conf + $(SHAIRPORT_SYNC_INSTALL_DBUS) endef define SHAIRPORT_SYNC_INSTALL_INIT_SYSV diff --git a/package/shapelib/0001-Remove-double-free-in-contrib-shpsrt.patch b/package/shapelib/0001-Remove-double-free-in-contrib-shpsrt.patch new file mode 100644 index 00000000000..a565874b8cd --- /dev/null +++ b/package/shapelib/0001-Remove-double-free-in-contrib-shpsrt.patch @@ -0,0 +1,26 @@ +From c75b9281a5b9452d92e1682bdfe6019a13ed819f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Albin=20Eldst=C3=A5l-Ahrens?= +Date: Mon, 3 Jan 2022 12:34:41 +0100 +Subject: [PATCH] Remove double free() in contrib/shpsrt, issue #39 + +This fixes issue #39 + +[Retrieved from: +https://github.com/OSGeo/shapelib/commit/c75b9281a5b9452d92e1682bdfe6019a13ed819f] +Signed-off-by: Fabrice Fontaine +--- + contrib/shpsort.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/contrib/shpsort.c b/contrib/shpsort.c +index e21e9e0..920cd8c 100644 +--- a/contrib/shpsort.c ++++ b/contrib/shpsort.c +@@ -113,7 +113,6 @@ static char ** split(const char *arg, const char *delim) { + free(result[--i]); + } + free(result); +- free(copy); + return NULL; + } + result = tmp; diff --git a/package/shapelib/shapelib.hash b/package/shapelib/shapelib.hash index d1f6fa9777d..b016fef5cf1 100644 --- a/package/shapelib/shapelib.hash +++ b/package/shapelib/shapelib.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 1fc0a480982caef9e7b9423070b47750ba34cd0ba82668f2e638fab1d07adae1 shapelib-1.5.0.tar.gz -sha256 7eb803a70990017a1c4e38a8342d7413c5dfeec3ed1ac407e15ae2c274e560ff COPYING -sha256 a638278f7f1cb7d0cdc73b47a6c87261b882e356a8e79922e90d44d7ef1dd2c7 web/license.html +sha256 1fc0a480982caef9e7b9423070b47750ba34cd0ba82668f2e638fab1d07adae1 shapelib-1.5.0.tar.gz +sha256 7eb803a70990017a1c4e38a8342d7413c5dfeec3ed1ac407e15ae2c274e560ff COPYING +sha256 a638278f7f1cb7d0cdc73b47a6c87261b882e356a8e79922e90d44d7ef1dd2c7 web/license.html diff --git a/package/shapelib/shapelib.mk b/package/shapelib/shapelib.mk index bedd15dc355..37d2d9ae644 100644 --- a/package/shapelib/shapelib.mk +++ b/package/shapelib/shapelib.mk @@ -8,6 +8,10 @@ SHAPELIB_VERSION = 1.5.0 SHAPELIB_SITE = http://download.osgeo.org/shapelib SHAPELIB_LICENSE = MIT or LGPL-2.0 SHAPELIB_LICENSE_FILES = web/license.html COPYING +SHAPELIB_CPE_ID_VENDOR = osgeo SHAPELIB_INSTALL_STAGING = YES +# 0001-Remove-double-free-in-contrib-shpsrt.patch +SHAPELIB_IGNORE_CVES += CVE-2022-0699 + $(eval $(autotools-package)) diff --git a/package/shared-mime-info/shared-mime-info.hash b/package/shared-mime-info/shared-mime-info.hash index b86499cd58a..062d76da3cf 100644 --- a/package/shared-mime-info/shared-mime-info.hash +++ b/package/shared-mime-info/shared-mime-info.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 18b2f0fe07ed0d6f81951a5fd5ece44de9c8aeb4dc5bb20d4f595f6cc6bd403e shared-mime-info-1.12.tar.xz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 18b2f0fe07ed0d6f81951a5fd5ece44de9c8aeb4dc5bb20d4f595f6cc6bd403e shared-mime-info-1.12.tar.xz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/shellinabox/shellinabox.hash b/package/shellinabox/shellinabox.hash index 634aa734545..6bbaf73c16c 100644 --- a/package/shellinabox/shellinabox.hash +++ b/package/shellinabox/shellinabox.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 27a5ec6c3439f87aee238c47cc56e7357a6249e5ca9ed0f044f0057ef389d81e shellinabox-2.20.tar.gz -sha256 04ef60ab9b83cde6f0862ea18474454477efb34c52ebce1f8d8260a398a39362 COPYING -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 GPL-2 +sha256 27a5ec6c3439f87aee238c47cc56e7357a6249e5ca9ed0f044f0057ef389d81e shellinabox-2.20.tar.gz +sha256 04ef60ab9b83cde6f0862ea18474454477efb34c52ebce1f8d8260a398a39362 COPYING +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 GPL-2 diff --git a/package/signal-estimator/Config.in b/package/signal-estimator/Config.in new file mode 100644 index 00000000000..30c6e966ab2 --- /dev/null +++ b/package/signal-estimator/Config.in @@ -0,0 +1,17 @@ +comment "signal-estimator needs a toochain w/ C++, threads, gcc >= 7" + depends on !BR2_INSTALL_LIBSTDCPP \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 \ + || !BR2_TOOLCHAIN_HAS_THREADS + +config BR2_PACKAGE_SIGNAL_ESTIMATOR + bool "signal-estimator" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 + depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib + select BR2_PACKAGE_ALSA_LIB + help + signal-estimator is a small command-line and GUI tool allowing + to measure different characteristics of the signal looped back + from audio output to audio input. + + https://github.com/gavv/signal-estimator diff --git a/package/signal-estimator/signal-estimator.hash b/package/signal-estimator/signal-estimator.hash new file mode 100644 index 00000000000..c10aa16d509 --- /dev/null +++ b/package/signal-estimator/signal-estimator.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 6256b881bd9285fdcf133628cf6dd6b0e2758c08bada231e44b2684a3cf7898f signal-estimator-v0.0.4-br1.tar.gz +sha256 e836fc784cb6ed2d160f1c1ecdf1303ed57436a86f66f97e5406a1b79e6db55e LICENSE diff --git a/package/signal-estimator/signal-estimator.mk b/package/signal-estimator/signal-estimator.mk new file mode 100644 index 00000000000..cb1594b58d0 --- /dev/null +++ b/package/signal-estimator/signal-estimator.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# signal-estimator +# +################################################################################ + +SIGNAL_ESTIMATOR_VERSION = v0.0.4 +SIGNAL_ESTIMATOR_SITE = https://github.com/gavv/signal-estimator +SIGNAL_ESTIMATOR_SITE_METHOD = git +SIGNAL_ESTIMATOR_GIT_SUBMODULES = YES + +SIGNAL_ESTIMATOR_LICENSE = MIT +SIGNAL_ESTIMATOR_LICENSE_FILES = LICENSE + +SIGNAL_ESTIMATOR_DEPENDENCIES = alsa-lib + +SIGNAL_ESTIMATOR_CONF_OPTS += -DBUILD_GUI=OFF + +$(eval $(cmake-package)) diff --git a/package/skalibs/skalibs.hash b/package/skalibs/skalibs.hash index 48e4028edc0..dd202b97fb2 100644 --- a/package/skalibs/skalibs.hash +++ b/package/skalibs/skalibs.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 b780b0ae650dda0c3ec5f8975174998af2d24c2a2e2be669b1bab46e73b1464d skalibs-2.10.0.3.tar.gz -sha256 adecb8bedfaae27fcfe65ecb3ef0e2e71aa2a2b49dc21886a200bc677d93e6ec COPYING +sha256 3e228f72f18d88c17f6c4e0a66881d6d3779427b7e7e889f3142b6f26da30285 skalibs-2.12.0.1.tar.gz +sha256 35126cb8f2ff2a6e359f7bfec46c49004ead6304d8248ba67dcdebcc7d377754 COPYING diff --git a/package/skalibs/skalibs.mk b/package/skalibs/skalibs.mk index 77db57de96d..0ff449a5bad 100644 --- a/package/skalibs/skalibs.mk +++ b/package/skalibs/skalibs.mk @@ -4,7 +4,7 @@ # ################################################################################ -SKALIBS_VERSION = 2.10.0.3 +SKALIBS_VERSION = 2.12.0.1 SKALIBS_SITE = http://skarnet.org/software/skalibs SKALIBS_LICENSE = ISC SKALIBS_LICENSE_FILES = COPYING diff --git a/package/systemd/fakeroot_tmpfiles.sh b/package/skeleton-init-systemd/fakeroot_tmpfiles.sh similarity index 100% rename from package/systemd/fakeroot_tmpfiles.sh rename to package/skeleton-init-systemd/fakeroot_tmpfiles.sh diff --git a/package/skeleton-init-systemd/skeleton-init-systemd.mk b/package/skeleton-init-systemd/skeleton-init-systemd.mk index 795a1718098..fb15552f99e 100644 --- a/package/skeleton-init-systemd/skeleton-init-systemd.mk +++ b/package/skeleton-init-systemd/skeleton-init-systemd.mk @@ -23,21 +23,21 @@ endef else +define SKELETON_INIT_SYSTEMD_ROOT_RO_OR_RW + echo "/dev/root / auto ro 0 1" >$(TARGET_DIR)/etc/fstab +endef + # On a R/O rootfs, /var is a tmpfs filesystem. So, at build time, we # redirect /var to the "factory settings" location. Just before the # filesystem gets created, the /var symlink will be replaced with # a real (but empty) directory, and the "factory files" will be copied # back there by the tmpfiles.d mechanism. -define SKELETON_INIT_SYSTEMD_ROOT_RO_OR_RW - mkdir -p $(TARGET_DIR)/etc/systemd/tmpfiles.d - echo "/dev/root / auto ro 0 1" >$(TARGET_DIR)/etc/fstab - echo "tmpfs /var tmpfs mode=1777 0 0" >>$(TARGET_DIR)/etc/fstab -endef - +ifeq ($(BR2_INIT_SYSTEMD_VAR_FACTORY),y) define SKELETON_INIT_SYSTEMD_PRE_ROOTFS_VAR rm -rf $(TARGET_DIR)/usr/share/factory/var mv $(TARGET_DIR)/var $(TARGET_DIR)/usr/share/factory/var mkdir -p $(TARGET_DIR)/var + mkdir -p $(TARGET_DIR)/usr/lib/tmpfiles.d for i in $(TARGET_DIR)/usr/share/factory/var/* \ $(TARGET_DIR)/usr/share/factory/var/lib/* \ $(TARGET_DIR)/usr/share/factory/var/lib/systemd/*; do \ @@ -51,11 +51,21 @@ define SKELETON_INIT_SYSTEMD_PRE_ROOTFS_VAR printf "C! %s - - - -\n" "$${j}" \ || exit 1; \ fi; \ - done >$(TARGET_DIR)/etc/tmpfiles.d/var-factory.conf + done >$(TARGET_DIR)/usr/lib/tmpfiles.d/00-buildroot-var.conf + $(INSTALL) -D -m 0644 $(SKELETON_INIT_SYSTEMD_PKGDIR)/var.mount \ + $(TARGET_DIR)/usr/lib/systemd/system/var.mount endef SKELETON_INIT_SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SKELETON_INIT_SYSTEMD_PRE_ROOTFS_VAR +endif # BR2_INIT_SYSTEMD_VAR_FACTORY +endif # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW -endif +ifeq ($(BR2_INIT_SYSTEMD_POPULATE_TMPFILES),y) +define SKELETON_INIT_SYSTEMD_CREATE_TMPFILES_HOOK + HOST_SYSTEMD_TMPFILES=$(HOST_DIR)/bin/systemd-tmpfiles \ + $(SKELETON_INIT_SYSTEMD_PKGDIR)/fakeroot_tmpfiles.sh $(TARGET_DIR) +endef +SKELETON_INIT_SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SKELETON_INIT_SYSTEMD_CREATE_TMPFILES_HOOK +endif # BR2_INIT_SYSTEMD_POPULATE_TMPFILES define SKELETON_INIT_SYSTEMD_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/home diff --git a/package/skeleton-init-systemd/var.mount b/package/skeleton-init-systemd/var.mount new file mode 100644 index 00000000000..e97accef939 --- /dev/null +++ b/package/skeleton-init-systemd/var.mount @@ -0,0 +1,15 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +# Modelled after systemd's tmp.mount + +[Unit] +Description=Buildroot /var tmpfs +DefaultDependencies=no +Conflicts=umount.target +Before=local-fs.target umount.target +After=swap.target + +[Mount] +What=tmpfs +Where=/var +Type=tmpfs +Options=mode=1777,strictatime,nosuid,nodev,size=50%%,nr_inodes=1m diff --git a/package/slang/0001-slsh-libs.patch b/package/slang/0001-slsh-libs.patch index 211cb4a0e08..fad16d1b2f0 100644 --- a/package/slang/0001-slsh-libs.patch +++ b/package/slang/0001-slsh-libs.patch @@ -5,6 +5,8 @@ probably Diego Pettenò. Signed-off-by: Gustavo Zacarias [Bernd: rebased against 2.3.1a] Signed-off-by: Bernd Kuhls +[Fabrice: rebased against 2.3.3] +Signed-off-by: Fabrice Fontaine --- a/slsh/Makefile.in +++ b/slsh/Makefile.in @@ -12,8 +14,8 @@ Signed-off-by: Bernd Kuhls $(OBJDIR)/slsh_exe: $(OBJDIR)/slsh.o $(OBJDIR)/readline.o $(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh_exe $(LDFLAGS) $(DLINK_FLAGS) $(SRC_LIBS) $(OBJDIR)/slsh: $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -- $(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh $(LDFLAGS) $(DLINK_FLAGS) $(INST_LIBS) -+ $(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh $(LDFLAGS) $(DLINK_FLAGS) $(SRC_LIBS) +- $(CC) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh $(LDFLAGS) $(DLINK_FLAGS) $(INST_LIBS) ++ $(CC) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh $(LDFLAGS) $(DLINK_FLAGS) $(SRC_LIBS) $(OBJDIR)/slsh.o: $(OBJDIR_TSTAMP) slsh.c slsh.h config.h Makefile cd $(OBJDIR) && $(CC) $(SLANG_SRCINC) $(CFLAGS) -c $(DEFS) $(SRCDIR)/slsh.c $(OBJDIR)/readline.o: $(OBJDIR_TSTAMP) readline.c slsh.h config.h Makefile diff --git a/package/slang/Config.in b/package/slang/Config.in index a500ff5b7d7..0b2c987f733 100644 --- a/package/slang/Config.in +++ b/package/slang/Config.in @@ -5,3 +5,12 @@ config BR2_PACKAGE_SLANG Multi-platform console display library. http://www.jedsoft.org/slang/index.html + +if BR2_PACKAGE_SLANG + +config BR2_PACKAGE_SLANG_SLSH + bool "enable slsh" + help + Enable the S-lang interpreter + +endif diff --git a/package/slang/slang.hash b/package/slang/slang.hash index faa34c8207f..563117b48a4 100644 --- a/package/slang/slang.hash +++ b/package/slang/slang.hash @@ -1,6 +1,6 @@ # sha1 from http://www.jedsoft.org/releases/slang/, sha256 locally computed -sha1 bbf7f2dcc14e7c7fca40868fd4b411a2bd9e2655 slang-2.3.2.tar.bz2 -sha256 fc9e3b0fc4f67c3c1f6d43c90c16a5c42d117b8e28457c5b46831b8b5d3ae31a slang-2.3.2.tar.bz2 +sha1 38d9b8e80e4336f76dff3e1d85761d2d0f713595 slang-2.3.3.tar.bz2 +sha256 f9145054ae131973c61208ea82486d5dd10e3c5cdad23b7c4a0617743c8f5a18 slang-2.3.3.tar.bz2 # License file, locally computed -sha256 ff05a90962e7773f8bdc47b2a9585130526039102759b524c1dffbd57cfe469b COPYING +sha256 ff05a90962e7773f8bdc47b2a9585130526039102759b524c1dffbd57cfe469b COPYING diff --git a/package/slang/slang.mk b/package/slang/slang.mk index 44a0148088e..2b3cbdf27a2 100644 --- a/package/slang/slang.mk +++ b/package/slang/slang.mk @@ -4,7 +4,7 @@ # ################################################################################ -SLANG_VERSION = 2.3.2 +SLANG_VERSION = 2.3.3 SLANG_SOURCE = slang-$(SLANG_VERSION).tar.bz2 SLANG_SITE = http://www.jedsoft.org/releases/slang SLANG_LICENSE = GPL-2.0+ @@ -60,4 +60,13 @@ SLANG_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) install-static SLANG_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-static endif +ifeq ($(BR2_PACKAGE_SLANG_SLSH),) +define SLANG_REMOVE_SLSH + rm -rf $(TARGET_DIR)/etc/slsh.rc \ + $(TARGET_DIR)/usr/share/slsh \ + $(TARGET_DIR)/usr/bin/slsh +endef +SLANG_POST_INSTALL_TARGET_HOOKS += SLANG_REMOVE_SLSH +endif + $(eval $(autotools-package)) diff --git a/package/slirp/slirp.hash b/package/slirp/slirp.hash index 326b2ad2461..3f7abdee5a0 100644 --- a/package/slirp/slirp.hash +++ b/package/slirp/slirp.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 b8a22ac4d601ba16122a67827c0f4361785d4d283f21ff8ed48d4aa1e7693477 libslirp-4.6.1.tar.xz +sha256 358ce8b6ea59ec9deac937cc754f0115b992839e7b0cddf30ffb8f77dc21da82 libslirp-v4.7.0.tar.bz2 sha256 b28aecf4796a6a22054167f0a976de13d9db335669d37afd2dc7ea4c335e1e13 COPYRIGHT diff --git a/package/slirp/slirp.mk b/package/slirp/slirp.mk index 43d2c520e98..2ad71f13d9d 100644 --- a/package/slirp/slirp.mk +++ b/package/slirp/slirp.mk @@ -4,9 +4,9 @@ # ################################################################################ -SLIRP_VERSION = 4.6.1 -SLIRP_SOURCE = libslirp-$(SLIRP_VERSION).tar.xz -SLIRP_SITE = https://gitlab.freedesktop.org/slirp/libslirp/uploads/83b199ea6fcdfc0c243dfde8546ee4c9 +SLIRP_VERSION = 4.7.0 +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 SLIRP_LICENSE_FILES = COPYRIGHT SLIRP_CPE_ID_VENDOR = libslirp_project @@ -14,4 +14,7 @@ SLIRP_CPE_ID_PRODUCT = libslirp SLIRP_INSTALL_STAGING = YES SLIRP_DEPENDENCIES = libglib2 +HOST_SLIRP_DEPENDENCIES = host-libglib2 + $(eval $(meson-package)) +$(eval $(host-meson-package)) diff --git a/package/slirp4netns/Config.in b/package/slirp4netns/Config.in new file mode 100644 index 00000000000..22414dfbc97 --- /dev/null +++ b/package/slirp4netns/Config.in @@ -0,0 +1,20 @@ +config BR2_PACKAGE_SLIRP4NETNS + bool "slirp4netns" + depends on BR2_USE_MMU # libcap, libglib2, slirp + depends on BR2_USE_WCHAR # libglib2, slirp + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2, slirp + depends on BR2_PACKAGE_LIBSECCOMP_ARCH_SUPPORTS # libseccomp + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 # libseccomp + select BR2_PACKAGE_LIBCAP + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_LIBSECCOMP + select BR2_PACKAGE_SLIRP + help + User-mode networking for unprivileged network namespaces. + + https://github.com/rootless-containers/slirp4netns + +comment "slirp4netns needs a toolchain w/ wchar, threads, headers >= 3.17" + depends on BR2_USE_MMU + depends on BR2_PACKAGE_LIBSECCOMP_ARCH_SUPPORTS + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 diff --git a/package/slirp4netns/slirp4netns.hash b/package/slirp4netns/slirp4netns.hash new file mode 100644 index 00000000000..e3115c1be0a --- /dev/null +++ b/package/slirp4netns/slirp4netns.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 b584edde686d3cfbac210cbdb93c4b0ba5d8cc0a6a4d92b9dfc3c5baec99c727 slirp4netns-1.2.0.tar.gz +sha256 58db3cfabf8ec806bc060e54ab5466a31de4a3ae80fe4a8aa02fb6b1c053c93f COPYING diff --git a/package/slirp4netns/slirp4netns.mk b/package/slirp4netns/slirp4netns.mk new file mode 100644 index 00000000000..7ff594cc442 --- /dev/null +++ b/package/slirp4netns/slirp4netns.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# slirp4netns +# +################################################################################ + +SLIRP4NETNS_VERSION = 1.2.0 +SLIRP4NETNS_SITE = $(call github,rootless-containers,slirp4netns,v$(SLIRP4NETNS_VERSION)) +SLIRP4NETNS_LICENSE = GPL-2.0 +SLIRP4NETNS_LICENSE_FILES = COPYING +SLIRP4NETNS_DEPENDENCIES = libcap libglib2 libseccomp slirp + +SLIRP4NETNS_AUTORECONF = YES + +$(eval $(autotools-package)) diff --git a/package/smartmontools/smartmontools.hash b/package/smartmontools/smartmontools.hash index 3c5535b29a2..e48e955d011 100644 --- a/package/smartmontools/smartmontools.hash +++ b/package/smartmontools/smartmontools.hash @@ -1,7 +1,7 @@ -# From http://sourceforge.net/projects/smartmontools/files/smartmontools/7.2/ -md5 e8d134c69ae4959a05cb56b31172ffb1 smartmontools-7.2.tar.gz -sha1 8d68241096f6ed5b1bbcd8b427fa4a881c1f3e33 smartmontools-7.2.tar.gz +# From http://sourceforge.net/projects/smartmontools/files/smartmontools/7.3/ +md5 7a71d388124e3cd43abf6586a43cb1ff smartmontools-7.3.tar.gz +sha1 5ce7adb606119148d725b91a00652d427ca0adc2 smartmontools-7.3.tar.gz # Locally computed -sha256 5cd98a27e6393168bc6aaea070d9e1cd551b0f898c52f66b2ff2e5d274118cd6 smartmontools-7.2.tar.gz +sha256 a544f8808d0c58cfb0e7424ca1841cb858a974922b035d505d4e4c248be3a22b smartmontools-7.3.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/smartmontools/smartmontools.mk b/package/smartmontools/smartmontools.mk index 2e2bbcd4e25..d24f008df4e 100644 --- a/package/smartmontools/smartmontools.mk +++ b/package/smartmontools/smartmontools.mk @@ -4,7 +4,7 @@ # ################################################################################ -SMARTMONTOOLS_VERSION = 7.2 +SMARTMONTOOLS_VERSION = 7.3 SMARTMONTOOLS_SITE = http://downloads.sourceforge.net/project/smartmontools/smartmontools/$(SMARTMONTOOLS_VERSION) SMARTMONTOOLS_LICENSE = GPL-2.0+ SMARTMONTOOLS_LICENSE_FILES = COPYING diff --git a/package/smcroute/smcroute.hash b/package/smcroute/smcroute.hash index ea4c449c42a..b472dfbc042 100644 --- a/package/smcroute/smcroute.hash +++ b/package/smcroute/smcroute.hash @@ -1,5 +1,5 @@ -# Upstream .sha256 from GitHub -sha256 2569cd97fa2047df14203a7144be53a1b32928cb460421a302bbcce381b42bc3 smcroute-2.5.5.tar.gz +# Hash from https://github.com/troglobit/smcroute/releases/download/2.5.6/smcroute-2.5.6.tar.gz.sha256 +sha256 0be38f617e322daafaa941c02423239f5c117b940cf0f45bacadb6733c4b3916 smcroute-2.5.6.tar.gz # Locally generated -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/smcroute/smcroute.mk b/package/smcroute/smcroute.mk index e6114c9a8c4..0c4f88ab1b1 100644 --- a/package/smcroute/smcroute.mk +++ b/package/smcroute/smcroute.mk @@ -4,7 +4,7 @@ # ################################################################################ -SMCROUTE_VERSION = 2.5.5 +SMCROUTE_VERSION = 2.5.6 SMCROUTE_SITE = https://github.com/troglobit/smcroute/releases/download/$(SMCROUTE_VERSION) SMCROUTE_LICENSE = GPL-2.0+ SMCROUTE_LICENSE_FILES = COPYING diff --git a/package/smstools3/smstools3.hash b/package/smstools3/smstools3.hash index 27eda2af962..83831160e6a 100644 --- a/package/smstools3/smstools3.hash +++ b/package/smstools3/smstools3.hash @@ -1,5 +1,5 @@ # From http://smstools3.kekekasvi.com/packages/ -md5 6a9f038fb38a49cc3a4f8f14a88fb8af smstools-3.1.21.tar.gz +md5 6a9f038fb38a49cc3a4f8f14a88fb8af smstools-3.1.21.tar.gz sha256 a26ba4c02b16f6cf13177bffca6c9230dc5fefaeba8e3030cd4e4905f6a92084 smstools3-3.1.21.tar.gz # Hash for license files diff --git a/package/sngrep/sngrep.hash b/package/sngrep/sngrep.hash index 33fa91ef5e5..c9b9c8be8df 100644 --- a/package/sngrep/sngrep.hash +++ b/package/sngrep/sngrep.hash @@ -1,6 +1,6 @@ -# From https://github.com/irontec/sngrep/releases/download/v1.4.7/sngrep-1.4.7.tar.gz.md5sum -md5 78fe753e24f36ddaf627bc2b734f45ba sngrep-1.4.7.tar.gz +# 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 # Locally computed -sha256 3c96aadd8b8c6b7adb5552d6fb4234f2000f15109b0f6c5feb632c81306cc49b sngrep-1.4.7.tar.gz +sha256 2e5ba3a4d6486ea00bd73d2cceff383ba162dcd6d0170ae74cfa3b1c206e2cb1 sngrep-1.7.0.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE diff --git a/package/sngrep/sngrep.mk b/package/sngrep/sngrep.mk index 841a7bb9919..b86d7e83f0a 100644 --- a/package/sngrep/sngrep.mk +++ b/package/sngrep/sngrep.mk @@ -4,10 +4,12 @@ # ################################################################################ -SNGREP_VERSION = 1.4.7 -SNGREP_SITE = $(call github,irontec,sngrep,v$(SNGREP_VERSION)) +SNGREP_VERSION = 1.7.0 +SNGREP_SITE = \ + https://github.com/irontec/sngrep/releases/download/v$(SNGREP_VERSION) SNGREP_LICENSE = GPL-3.0+ SNGREP_LICENSE_FILES = LICENSE +SNGREP_CPE_ID_VENDOR = irontec SNGREP_AUTORECONF = YES SNGREP_DEPENDENCIES = libpcap ncurses host-pkgconf @@ -29,11 +31,21 @@ else SNGREP_CONF_OPTS += --without-gnutls --without-openssl endif -ifeq ($(BR2_PACKAGE_PCRE),y) +ifeq ($(BR2_PACKAGE_PCRE2),y) +SNGREP_DEPENDENCIES += pcre2 +SNGREP_CONF_OPTS += --without-pcre --with-pcre2 +else ifeq ($(BR2_PACKAGE_PCRE),y) SNGREP_DEPENDENCIES += pcre -SNGREP_CONF_OPTS += --with-pcre +SNGREP_CONF_OPTS += --with-pcre --without-pcre2 else -SNGREP_CONF_OPTS += --without-pcre +SNGREP_CONF_OPTS += --without-pcre --without-pcre2 +endif + +ifeq ($(BR2_PACKAGE_ZLIB),y) +SNGREP_DEPENDENCIES += zlib +SNGREP_CONF_OPTS += --with-zlib +else +SNGREP_CONF_OPTS += --without-zlib endif $(eval $(autotools-package)) diff --git a/package/snmpclitools/snmpclitools.hash b/package/snmpclitools/snmpclitools.hash index 4dcbdcb6e01..575bfbced85 100644 --- a/package/snmpclitools/snmpclitools.hash +++ b/package/snmpclitools/snmpclitools.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/snmpclitools/json -md5 132b100f5e7b80715e6c1d424e89687c snmpclitools-0.6.4.tar.gz -sha256 820c45de419bf355c845a96610a395ec18a15176ac0362d388da7740266ea1ac snmpclitools-0.6.4.tar.gz +md5 132b100f5e7b80715e6c1d424e89687c snmpclitools-0.6.4.tar.gz +sha256 820c45de419bf355c845a96610a395ec18a15176ac0362d388da7740266ea1ac snmpclitools-0.6.4.tar.gz # Locally computed sha256 checksums -sha256 ed5561a0f5b75e93aa026c1b9fdef58e7ccbf6b2e9a2458be732afc288209d23 PKG-INFO +sha256 ed5561a0f5b75e93aa026c1b9fdef58e7ccbf6b2e9a2458be732afc288209d23 PKG-INFO diff --git a/package/snmppp/0001-fix-build-without-v3.patch b/package/snmppp/0001-fix-build-without-v3.patch new file mode 100644 index 00000000000..4e81f7bfc15 --- /dev/null +++ b/package/snmppp/0001-fix-build-without-v3.patch @@ -0,0 +1,43 @@ +fix build without v3 + +Fix the following build failure without version3 raised since version +3.5.0: + +msgqueue.cpp: In member function 'int Snmp_pp::CSNMPMessage::ResendMessage()': +msgqueue.cpp:263:34: error: 'version3' was not declared in this scope; did you mean 'version1'? + 263 | if (m_target->get_version() == version3) { + | ^~~~~~~~ + | version1 + +Fixes: + - http://autobuild.buildroot.org/results/8ef3e4407a51c53c15e530606227338761dd905b + +Signed-off-by: Fabrice Fontaine +[Upstream status: sent to katz.agentpp.com@magenta.de] + +diff -Nura snmp++-3.5.0.orig/src/msgqueue.cpp snmp++-3.5.0/src/msgqueue.cpp +--- snmp++-3.5.0.orig/src/msgqueue.cpp 2023-03-20 10:49:30.629000853 +0100 ++++ snmp++-3.5.0/src/msgqueue.cpp 2023-03-20 10:51:36.880664304 +0100 +@@ -260,18 +260,20 @@ + m_target->set_retry(m_target->get_retry() - 1); + SetSendTime(); + int status; +- if (m_target->get_version() == version3) { + #ifdef _SNMPv3 ++ if (m_target->get_version() == version3) { + // delete entry in cache + if (m_snmp->get_mpv3()) + m_snmp->get_mpv3()->delete_from_cache(m_pdu.get_request_id()); +-#endif + status = m_snmp->snmp_engine(m_pdu, m_pdu.get_error_status(), m_pdu.get_error_index(), + *m_target, m_callBack, m_callData, m_socket, 0, this); + } + else { ++#endif + status = send_snmp_request(m_socket, m_rawPdu, m_rawPduLen, *m_address); ++#ifdef _SNMPv3 + } ++#endif + if (status != 0) + return SNMP_CLASS_TL_FAILED; + diff --git a/package/snmppp/Config.in b/package/snmppp/Config.in index 1f05f53f9fc..f3a076714d1 100644 --- a/package/snmppp/Config.in +++ b/package/snmppp/Config.in @@ -6,7 +6,7 @@ config BR2_PACKAGE_SNMPPP help SNMP++v3.x is a C++ API which supports SNMP v1, v2c, and v3. - http://www.agentpp.com/snmp_pp3_x/snmp_pp3_x.html + https://www.agentpp.com/api/cpp/snmp_pp.html if BR2_PACKAGE_SNMPPP diff --git a/package/snmppp/snmppp.hash b/package/snmppp/snmppp.hash index 2dcf836fc7f..74c6a3e98f2 100644 --- a/package/snmppp/snmppp.hash +++ b/package/snmppp/snmppp.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 a3eb75e2310c315d9b2c2094154c7cd9b46684adb80a4b36b8957dcc09af4041 snmp++-3.4.2.tar.gz -sha256 f6fd4321c7eb6e51a272f91f964aea7f53039bb2b55f690d5a9d042f3a5d79b9 src/v3.cpp +sha256 43a433bd5f6fd67add5a26add6521ca664c41aead438405658ed57483664b4bf snmp++-3.5.0.tar.gz +sha256 61337e799c8274e596e5783b22607beea8073ee296c6b27fc5c7487296e56851 src/v3.cpp diff --git a/package/snmppp/snmppp.mk b/package/snmppp/snmppp.mk index 601e28e207c..9f1916dd662 100644 --- a/package/snmppp/snmppp.mk +++ b/package/snmppp/snmppp.mk @@ -4,7 +4,7 @@ # ################################################################################ -SNMPPP_VERSION = 3.4.2 +SNMPPP_VERSION = 3.5.0 SNMPPP_SOURCE = snmp++-$(SNMPPP_VERSION).tar.gz SNMPPP_SITE = http://www.agentpp.com/download SNMPPP_DEPENDENCIES = host-pkgconf diff --git a/package/snort/0008-Fix-NO-OPTIMIZE.patch b/package/snort/0008-Fix-NO-OPTIMIZE.patch new file mode 100644 index 00000000000..936973fdd64 --- /dev/null +++ b/package/snort/0008-Fix-NO-OPTIMIZE.patch @@ -0,0 +1,24 @@ +Fix NO_OPTIMIZE + +Fix the following build failure when NO_OPTIMIZE is enabled (e.g. on +sparc) and -Ofast: + +cc1: error: argument to '-O' should be a non-negative integer, 'g', 's' or 'fast' + +Fixes: + - http://autobuild.buildroot.org/results/e1a330e1a899fcdf4900e9156d62c90813321e30 + +Signed-off-by: Fabrice Fontaine + +diff -Nura snort-2.9.19.orig/configure.in snort-2.9.19/configure.in +--- snort-2.9.19.orig/configure.in 2022-08-09 20:21:00.236777320 +0200 ++++ snort-2.9.19/configure.in 2022-08-09 20:29:02.260993315 +0200 +@@ -1694,7 +1694,7 @@ + + # Set to no optimization regardless of what user or autostuff set + if test "x$NO_OPTIMIZE" = "xyes"; then +- CFLAGS=`echo $CFLAGS | sed -e "s/-O./-O0/"` ++ CFLAGS=`echo $CFLAGS | sed -e "s/-O[0-9a-z]*/-O0/"` + + # in case user override doesn't include -O + if echo $CFLAGS | grep -qve -O0 ; then diff --git a/package/snort/snort.hash b/package/snort/snort.hash index ac098564aa5..a807d051d97 100644 --- a/package/snort/snort.hash +++ b/package/snort/snort.hash @@ -1,8 +1,8 @@ # From https://www.snort.org/downloads/snort/md5s -md5 b0350425e0c1e9c044c25aa13b47edf8 snort-2.9.19.tar.gz +md5 b52cdf14e97ef953c800c3ef123beaa5 snort-2.9.20.tar.gz # Locally computed: -sha256 b12fc6db72afb58987a2bf1954b8f45bde02047c235513c7663857b9506369c7 snort-2.9.19.tar.gz +sha256 29400e13f53b1831e0b8b10ec1224a1cbaa6dc1533a5322a20dd80bb84b4981c snort-2.9.20.tar.gz # Hash for license files: sha256 f98260a6d3e5ef4ede8a2a6b698e5ac91d64c09243f7171e1c5b17b920a835c7 LICENSE diff --git a/package/snort/snort.mk b/package/snort/snort.mk index 41f450541f8..8ce8ed5fa64 100644 --- a/package/snort/snort.mk +++ b/package/snort/snort.mk @@ -4,7 +4,7 @@ # ################################################################################ -SNORT_VERSION = 2.9.19 +SNORT_VERSION = 2.9.20 SNORT_SITE = https://www.snort.org/downloads/snort SNORT_LICENSE = GPL-2.0 SNORT_LICENSE_FILES = LICENSE COPYING diff --git a/package/snort3/Config.in b/package/snort3/Config.in index dcc29b820a5..9b96e7cb589 100644 --- a/package/snort3/Config.in +++ b/package/snort3/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_SNORT3 bool "snort3" + depends on !BR2_PACKAGE_LUA # luajit depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS # luajit depends on !(BR2_PACKAGE_DAQ || BR2_PACKAGE_SNORT) depends on BR2_USE_MMU # fork() @@ -34,6 +35,7 @@ config BR2_PACKAGE_SNORT3 https://www.snort.org/snort3 comment "snort3 needs a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 4.9" + depends on !BR2_PACKAGE_LUA depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS depends on !(BR2_PACKAGE_DAQ || BR2_PACKAGE_SNORT) depends on BR2_USE_MMU diff --git a/package/snort3/snort3.hash b/package/snort3/snort3.hash index 0ba4505a830..7746547d18d 100644 --- a/package/snort3/snort3.hash +++ b/package/snort3/snort3.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 6e45c16b1815d832b5d6edcd2b705e7838e25c76bfd54b3e86c55ecba6de420a snort3-3.1.18.0.tar.gz +sha256 d787d954f21d4cd6a048e10b8c53c78cb6287ec448108fc573b951639c8947b3 snort3-3.1.40.0.tar.gz # Hash for license files: sha256 3f1cbfb20bb2c608e1a474421880d08b8cba6abb00ab7736d22c481d71656a6d COPYING diff --git a/package/snort3/snort3.mk b/package/snort3/snort3.mk index 6f15ce3c92c..a76b8318382 100644 --- a/package/snort3/snort3.mk +++ b/package/snort3/snort3.mk @@ -4,7 +4,7 @@ # ################################################################################ -SNORT3_VERSION = 3.1.18.0 +SNORT3_VERSION = 3.1.40.0 SNORT3_SITE = $(call github,snort3,snort3,$(SNORT3_VERSION)) SNORT3_LICENSE = GPL-2.0 SNORT3_LICENSE_FILES = COPYING LICENSE @@ -17,13 +17,6 @@ SNORT3_CONF_OPTS = \ -DENABLE_STATIC_DAQ=OFF \ -DMAKE_DOC=OFF -ifeq ($(BR2_PACKAGE_FLATBUFFERS),y) -SNORT3_DEPENDENCIES += flatbuffers -SNORT3_CONF_OPTS += -DHAVE_FLATBUFFERS=ON -else -SNORT3_CONF_OPTS += -DHAVE_FLATBUFFERS=OFF -endif - ifeq ($(BR2_PACKAGE_LIBICONV),y) SNORT3_DEPENDENCIES += libiconv SNORT3_CONF_OPTS += -DHAVE_ICONV=ON diff --git a/package/socat/0003-configure.ac-correct-the-getprotobynumber_r-test.patch b/package/socat/0003-configure.ac-correct-the-getprotobynumber_r-test.patch deleted file mode 100644 index de954055319..00000000000 --- a/package/socat/0003-configure.ac-correct-the-getprotobynumber_r-test.patch +++ /dev/null @@ -1,43 +0,0 @@ -From d56a11beb9b181fd91a70a6d703dfbdfe887122a Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Thu, 13 Jan 2022 17:56:10 +0200 -Subject: [PATCH] configure.ac: correct the getprotobynumber_r test - -The AC_TRY_COMPILE test succeeds even when libc does not provide the -tested symbol. The compiler produces a warning, but exits successfully. -Use AC_TRY_LINK that will only succeeds if libc provides the symbol. - -This fixes build with musl libc that does not support -getprotobynumber_r(). - -Signed-off-by: Baruch Siach ---- -Upstream status: sent to socat@dest-unreach.org - - configure.ac | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index d4acc9e7e6f5..973a7f2218c9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -137,13 +137,13 @@ AC_MSG_RESULT($sc_cv_have_prototype_hstrerror) - # getprotobynumber_r() is not standardized - AC_MSG_CHECKING(for getprotobynumber_r() variant) - AC_CACHE_VAL(sc_cv_getprotobynumber_r, --[AC_TRY_COMPILE([#include -+[AC_TRY_LINK([#include - #include ],[getprotobynumber_r(1,NULL,NULL,1024,NULL);], - [sc_cv_getprotobynumber_r=1; tmp_bynum_variant=Linux], -- [AC_TRY_COMPILE([#include -+ [AC_TRY_LINK([#include - #include ],[getprotobynumber_r(1,NULL,NULL,1024);], - [sc_cv_getprotobynumber_r=2; tmp_bynum_variant=Solaris], -- [AC_TRY_COMPILE([#include -+ [AC_TRY_LINK([#include - #include ],[getprotobynumber_r(1,NULL,NULL);], - [sc_cv_getprotobynumber_r=3; tmp_bynum_variant=AIX], - --- -2.34.1 - diff --git a/package/socat/socat.hash b/package/socat/socat.hash index 4f7ff5328e2..2113e1b3a48 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 5c28dd258ba928326d0716fcb4895cc2 socat-1.7.4.3.tar.bz2 +md5 a605d3779465f42c07fc507cfbfb08f9 socat-1.7.4.4.tar.bz2 # From http://www.dest-unreach.org/socat/download.sha256sum -sha256 d47318104415077635119dfee44bcfb41de3497374a9a001b1aff6e2f0858007 socat-1.7.4.3.tar.bz2 +sha256 fbd42bd2f0e54a3af6d01bdf15385384ab82dbc0e4f1a5e153b3e0be1b6380ac socat-1.7.4.4.tar.bz2 # Locally calculated -sha256 432aebfec164bedcaada7cdf2849e1f003fa00a91a0a1ed34d7cf4abe980f5fb README +sha256 3555c6bc2779ff0f9a7145d1e3cd1d8fde59548bcd3364a23b907de21eec5aa8 README sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 fd9e48ca316a5032069b9521f4f4b4d9b1c60365012bae1e62286bcd5bd2e761 COPYING.OpenSSL diff --git a/package/socat/socat.mk b/package/socat/socat.mk index e20577492d8..f958f26522f 100644 --- a/package/socat/socat.mk +++ b/package/socat/socat.mk @@ -4,13 +4,21 @@ # ################################################################################ -SOCAT_VERSION = 1.7.4.3 +SOCAT_VERSION = 1.7.4.4 SOCAT_SOURCE = socat-$(SOCAT_VERSION).tar.bz2 SOCAT_SITE = http://www.dest-unreach.org/socat/download SOCAT_LICENSE = GPL-2.0 with OpenSSL exception SOCAT_LICENSE_FILES = README COPYING COPYING.OpenSSL SOCAT_CPE_ID_VENDOR = dest-unreach +SOCAT_CONF_ENV = ac_cv_have_c99_snprintf=yes + +ifeq ($(BR2_TOOLCHAIN_USES_GLIBC)$(BR2_TOOLCHAIN_USES_UCLIBC),y) +SOCAT_CONF_ENV += ac_cv_have_z_modifier=yes +else +SOCAT_CONF_ENV += ac_cv_have_z_modifier=no +endif + ifeq ($(BR2_powerpc)$(BR2_powerpc64)$(BR2_powerpc64le),y) SOCAT_CONF_ENV += \ sc_cv_sys_crdly_shift=12 \ @@ -31,7 +39,7 @@ SOCAT_DEPENDENCIES = host-autoconf # incompatibile license (GPL-3.0+) SOCAT_CONF_OPTS = --disable-readline -ifeq ($(BR2_PACKAGE_OPENSSL),y) +ifeq ($(BR2_PACKAGE_LIBOPENSSL):$(BR2_STATIC_LIBS),y:) SOCAT_DEPENDENCIES += openssl else SOCAT_CONF_OPTS += --disable-openssl diff --git a/package/sofia-sip/sofia-sip.hash b/package/sofia-sip/sofia-sip.hash index 6f6ff6d0526..f7293bd262d 100644 --- a/package/sofia-sip/sofia-sip.hash +++ b/package/sofia-sip/sofia-sip.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 d39a3287038f1c9a747c1abc94a1379a726a9dfaf969285f955141883f7b810f sofia-sip-1.13.6-4152840260.tar.gz +sha256 846b3d5eef57702e8d18967070b538030252116af1500f4baa78ad068c5fdd64 sofia-sip-1.13.15.tar.gz sha256 e1c0890440efe31b6cd2ee2abf895eb917c787799f079133f5809414d90d5d60 COPYING sha256 b402ae58cf355b33be8fa023f704a039e3d41ecaccd2bbcda43ca31d703e4556 COPYRIGHTS diff --git a/package/sofia-sip/sofia-sip.mk b/package/sofia-sip/sofia-sip.mk index 2bac4805427..9734da5020c 100644 --- a/package/sofia-sip/sofia-sip.mk +++ b/package/sofia-sip/sofia-sip.mk @@ -4,12 +4,15 @@ # ################################################################################ -SOFIA_SIP_VERSION = 1.13.6-4152840260 -SOFIA_SIP_SITE = https://files.freeswitch.org/downloads/libs/sofia-sip +SOFIA_SIP_VERSION = 1.13.15 +SOFIA_SIP_SITE = $(call github,freeswitch,sofia-sip,v$(SOFIA_SIP_VERSION)) SOFIA_SIP_INSTALL_STAGING = YES +# Fetched from github, no pre-generated configure script provided +SOFIA_SIP_AUTORECONF = YES SOFIA_SIP_DEPENDENCIES = host-pkgconf SOFIA_SIP_LICENSE = LGPL-2.1+ SOFIA_SIP_LICENSE_FILES = COPYING COPYRIGHTS +SOFIA_SIP_CPE_ID_VENDOR = signalwire SOFIA_SIP_CONF_OPTS = --with-doxygen=no ifeq ($(BR2_PACKAGE_LIBGLIB2),y) diff --git a/package/softether/softether.hash b/package/softether/softether.hash index 01bdc629f09..41bd845372e 100644 --- a/package/softether/softether.hash +++ b/package/softether/softether.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f579fa938f6d5d0622f23b3c163b3de5dc171e30175e44511bf269b3bb9fb1fc softether-4.30-9700-beta.tar.gz -sha256 5da6241ddb987c4543bf1cbba6b40a3cd3ecb624dbd4a63daf04440911656bde LICENSE +sha256 f579fa938f6d5d0622f23b3c163b3de5dc171e30175e44511bf269b3bb9fb1fc softether-4.30-9700-beta.tar.gz +sha256 5da6241ddb987c4543bf1cbba6b40a3cd3ecb624dbd4a63daf04440911656bde LICENSE diff --git a/package/sord/0001-wscript-add-no-threads-option.patch b/package/sord/0001-wscript-add-no-threads-option.patch deleted file mode 100644 index 750ea8f4ade..00000000000 --- a/package/sord/0001-wscript-add-no-threads-option.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 82ab045a45c06187dca5e9d2a9a4003fcfbfa830 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 22 Feb 2022 21:22:31 +0100 -Subject: [PATCH] wscript: add -no-threads option - -Add -no-threads options to avoid the following build failure on embedded -toolchains without threads support: - -/home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: cannot find -lpthread - -Fixes: - - http://autobuild.buildroot.org/results/170d0114987b39a2b9ea173df7a5e806bd270fd8 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/drobilla/sord/pull/3] ---- - wscript | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/wscript b/wscript -index fd8578e..d71d78c 100644 ---- a/wscript -+++ b/wscript -@@ -35,6 +35,7 @@ def options(ctx): - {'no-utils': 'do not build command line utilities', - 'static': 'build static library', - 'no-shared': 'do not build shared library', -+ 'no-threads': 'disable threads', - 'static-progs': 'build programs as static binaries'}) - - opt.add_option('--dump', type='string', default='', dest='dump', -@@ -55,6 +56,7 @@ def configure(conf): - - conf.env.BUILD_UTILS = not Options.options.no_utils - conf.env.BUILD_SHARED = not Options.options.no_shared -+ conf.env.ENABLE_THREADS = not Options.options.no_threads - conf.env.STATIC_PROGS = Options.options.static_progs - conf.env.BUILD_STATIC = (Options.options.static or - Options.options.static_progs) -@@ -124,7 +126,7 @@ def configure(conf): - conf.check_pkg('serd-0 >= 0.30.0', uselib_store='SERD') - conf.check_pkg('libpcre', uselib_store='PCRE', mandatory=False) - -- if conf.env.HAVE_PCRE: -+ if conf.env.HAVE_PCRE and conf.env.ENABLE_THREADS: - if conf.check(cflags=['-pthread'], mandatory=False): - conf.env.PTHREAD_CFLAGS = ['-pthread'] - if conf.env.CC_NAME != 'clang': -@@ -160,6 +162,7 @@ def configure(conf): - conf, - {'Static library': bool(conf.env.BUILD_STATIC), - 'Shared library': bool(conf.env.BUILD_SHARED), -+ 'Threads': bool(conf.env.ENABLE_THREADS), - 'Utilities': bool(conf.env.BUILD_UTILS), - 'Unit tests': bool(conf.env.BUILD_TESTS), - 'Debug dumping': dump}) --- -2.34.1 - diff --git a/package/sord/sord.hash b/package/sord/sord.hash index af175f91f01..ec5c88a43c2 100644 --- a/package/sord/sord.hash +++ b/package/sord/sord.hash @@ -1,4 +1,4 @@ # Locally calculated after checking signature -# https://download.drobilla.net/sord-0.16.8.tar.bz2.asc -sha256 7c289d2eaabf82fa6ac219107ce632d704672dcfb966e1a7ff0bbc4ce93f5e14 sord-0.16.8.tar.bz2 +# https://download.drobilla.net/sord-0.16.12.tar.xz.sig +sha256 fde269893cb24b2ab7b75708d7a349c6e760c47a0d967aeca5b1c651294ff9f2 sord-0.16.12.tar.xz sha256 e06562d6bcf0341b2ac2ad0f0ca36801d2ebf388d5ef297011625e4c36e963f0 COPYING diff --git a/package/sord/sord.mk b/package/sord/sord.mk index c06ef9c55c8..9fcf98858ae 100644 --- a/package/sord/sord.mk +++ b/package/sord/sord.mk @@ -4,9 +4,9 @@ # ################################################################################ -SORD_VERSION = 0.16.8 +SORD_VERSION = 0.16.12 SORD_SITE = https://download.drobilla.net -SORD_SOURCE = sord-$(SORD_VERSION).tar.bz2 +SORD_SOURCE = sord-$(SORD_VERSION).tar.xz SORD_LICENSE = ISC SORD_LICENSE_FILES = COPYING SORD_DEPENDENCIES = host-pkgconf serd @@ -16,14 +16,6 @@ ifeq ($(BR2_PACKAGE_PCRE),y) SORD_DEPENDENCIES += pcre endif -SORD_CONF_OPTS += --no-coverage +SORD_CONF_OPTS += -Ddocs=disabled -Dtests=disabled -ifeq ($(BR2_STATIC_LIBS),y) -SORD_CONF_OPTS += --static --no-shared --static-progs -endif - -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) -SORD_CONF_OPTS += --no-threads -endif - -$(eval $(waf-package)) +$(eval $(meson-package)) diff --git a/package/sound-theme-borealis/sound-theme-borealis.hash b/package/sound-theme-borealis/sound-theme-borealis.hash index 7a4d3e1313c..575cf31c8c4 100644 --- a/package/sound-theme-borealis/sound-theme-borealis.hash +++ b/package/sound-theme-borealis/sound-theme-borealis.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 dd80a9c6317de29d42786ba7d95b114b64d06ec6c0c17dd18df853a5c668e727 Borealis_sound_theme_ogg-0.9a.tar.bz2 +sha256 dd80a9c6317de29d42786ba7d95b114b64d06ec6c0c17dd18df853a5c668e727 Borealis_sound_theme_ogg-0.9a.tar.bz2 diff --git a/package/sound-theme-freedesktop/sound-theme-freedesktop.hash b/package/sound-theme-freedesktop/sound-theme-freedesktop.hash index cde02ca3e67..55b6993e6d5 100644 --- a/package/sound-theme-freedesktop/sound-theme-freedesktop.hash +++ b/package/sound-theme-freedesktop/sound-theme-freedesktop.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 e6595afb02b76099ef6df42c2ac7c4f9680c21c3f26b2a7ca0943d1fdbbd9aef sound-theme-freedesktop-0.7.tar.bz2 +sha256 e6595afb02b76099ef6df42c2ac7c4f9680c21c3f26b2a7ca0943d1fdbbd9aef sound-theme-freedesktop-0.7.tar.bz2 diff --git a/package/sox/sox.mk b/package/sox/sox.mk index 4b09b94bc3e..d0329bf50d2 100644 --- a/package/sox/sox.mk +++ b/package/sox/sox.mk @@ -5,7 +5,7 @@ ################################################################################ SOX_VERSION = 7524160b29a476f7e87bc14fddf12d349f9a3c5e -SOX_SITE = git://git.code.sf.net/p/sox/code +SOX_SITE = https://git.code.sf.net/p/sox/code SOX_SITE_METHOD = git SOX_DEPENDENCIES = host-autoconf-archive host-pkgconf SOX_LICENSE = GPL-2.0+ (sox binary), LGPL-2.1+ (libraries) @@ -26,6 +26,14 @@ SOX_CONF_OPTS = \ --with-distro="Buildroot" \ --disable-stack-protector +SOX_CFLAGS = $(TARGET_CFLAGS) + +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_68485),y) +SOX_CFLAGS += -O0 +endif + +SOX_CONF_ENV += CFLAGS="$(SOX_CFLAGS)" + ifeq ($(BR2_PACKAGE_ALSA_LIB_PCM),y) SOX_DEPENDENCIES += alsa-lib SOX_CONF_OPTS += --enable-alsa diff --git a/package/spdlog/spdlog.hash b/package/spdlog/spdlog.hash index 02756fc98cb..af89ba4e84b 100644 --- a/package/spdlog/spdlog.hash +++ b/package/spdlog/spdlog.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6fff9215f5cb81760be4cc16d033526d1080427d236e86d70bb02994f85e3d38 spdlog-1.9.2.tar.gz +sha256 ca5cae8d6cac15dae0ec63b21d6ad3530070650f68076f3a4a862ca293a858bb spdlog-1.11.0.tar.gz sha256 a7241a379cb98d37788f82c2fc2e484c3ae85dae881fd3406f0637644850926f LICENSE diff --git a/package/spdlog/spdlog.mk b/package/spdlog/spdlog.mk index b5dfc0c7b4b..32a0265484f 100644 --- a/package/spdlog/spdlog.mk +++ b/package/spdlog/spdlog.mk @@ -4,7 +4,7 @@ # ################################################################################ -SPDLOG_VERSION = 1.9.2 +SPDLOG_VERSION = 1.11.0 SPDLOG_SITE = $(call github,gabime,spdlog,v$(SPDLOG_VERSION)) SPDLOG_LICENSE = MIT SPDLOG_LICENSE_FILES = LICENSE diff --git a/package/speechd/0001-add-disable-doc.patch b/package/speechd/0001-add-disable-doc.patch new file mode 100644 index 00000000000..dd17b10e4fe --- /dev/null +++ b/package/speechd/0001-add-disable-doc.patch @@ -0,0 +1,78 @@ +From d88557d3c29c33f76af20cb7a6eb798f6f598c23 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 19 Feb 2023 15:18:35 +0100 +Subject: [PATCH] add --disable-doc + +Allow the user to disable documentation through --disable-doc to avoid +the following build failure without makeinfo: + +make[3]: Entering directory '/home/buildroot/autobuild/instance-2/output-1/build/speechd-0.11.4/doc' + MAKEINFO ssip.info + MAKEINFO spd-say.info +/home/buildroot/autobuild/instance-2/output-1/build/speechd-0.11.4/missing: line 81: makeinfo: command not found +/home/buildroot/autobuild/instance-2/output-1/build/speechd-0.11.4/missing: line 81: makeinfo: command not found +WARNING: 'makeinfo' is missing on your system. + You should only need it if you modified a '.texi' file, or + any other file indirectly affecting the aspect of the manual. + You might want to install the Texinfo package: + + The spurious makeinfo call might also be the consequence of + using a buggy 'make' (AIX, DU, IRIX), in which case you might + want to install GNU make: + +WARNING: 'makeinfo' is missing on your system. + You should only need it if you modified a '.texi' file, or + any other file indirectly affecting the aspect of the manual. + You might want to install the Texinfo package: + + The spurious makeinfo call might also be the consequence of + using a buggy 'make' (AIX, DU, IRIX), in which case you might + want to install GNU make: + +make[3]: *** [Makefile:492: ssip.info] Error 127 + +Fixes: + - http://autobuild.buildroot.org/results/d4f193545eb31864a9bac5a9d05bba39d3c7ff3e + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/brailcom/speechd/pull/810] +--- + Makefile.am | 6 +++++- + configure.ac | 4 ++++ + 2 files changed, 9 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 26617c78..480eb50e 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -22,7 +22,11 @@ pkgconfig_DATA = speech-dispatcher.pc + + BUILT_SOURCES = $(top_srcdir)/.version + +-SUBDIRS= include locale src config doc po ++SUBDIRS= include locale src config po ++ ++if ENABLE_DOC ++SUBDIRS += doc ++endif + + EXTRA_DIST= config.rpath COPYING.LGPL COPYING.GPL-2 COPYING.GPL-3 ANNOUNCE BUGS FAQ README.md README.packagers README.translators README.overview.md README.style.md build.sh speech-dispatcherd.service.in speech-dispatcher.socket speech-dispatcher.service.in po/Makevars.in po/README + +diff --git a/configure.ac b/configure.ac +index faaa8629..4f2af908 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -168,6 +168,10 @@ AC_SUBST([EXTRA_SOCKET_LIBS]) + AC_SUBST([ERROR_CFLAGS]) + AC_SUBST([RDYNAMIC]) + ++AC_ARG_ENABLE([doc], ++ [AC_HELP_STRING([--disable-doc], [turn off documentation])]) ++AM_CONDITIONAL(ENABLE_DOC, test "$enable_doc" != "no") ++ + # Check for python support. + # Python 3 or greater required + AC_ARG_ENABLE([python], +-- +2.39.0 + diff --git a/package/speechd/Config.in b/package/speechd/Config.in new file mode 100644 index 00000000000..8fdc452d192 --- /dev/null +++ b/package/speechd/Config.in @@ -0,0 +1,20 @@ +config BR2_PACKAGE_SPEECHD + bool "speechd" + depends on BR2_USE_WCHAR # libglib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + depends on BR2_USE_MMU # libglib2 + depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_DOTCONF + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_LIBSNDFILE + help + Speech Dispatcher project provides a high-level device + independent layer for access to speech synthesis through + a simple, stable and well documented interface. + + https://freebsoft.org/speechd + +comment "speechd needs a toolchain w/ wchar, threads, dynamic library" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_STATIC_LIBS diff --git a/package/speechd/speechd.hash b/package/speechd/speechd.hash new file mode 100644 index 00000000000..4eb4cd09d2c --- /dev/null +++ b/package/speechd/speechd.hash @@ -0,0 +1,5 @@ +# Locally calculated +sha256 628d4446894b47f0df099123924c1070180b5b5b09c5b637ebe80d8578fba92f speechd-0.11.4.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL-2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.GPL-3 +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL diff --git a/package/speechd/speechd.mk b/package/speechd/speechd.mk new file mode 100644 index 00000000000..5944ea3a286 --- /dev/null +++ b/package/speechd/speechd.mk @@ -0,0 +1,52 @@ +################################################################################ +# +# speechd +# +################################################################################ + +SPEECHD_VERSION = 0.11.4 +SPEECHD_SITE = $(call github,brailcom,speechd,$(SPEECHD_VERSION)) +SPEECHD_LICENSE = GPL-2.0+, GPL-3.0+ (buildsystem), LGPL-2.1+ +SPEECHD_LICENSE_FILES = COPYING.GPL-2 COPYING.GPL-3 COPYING.LGPL +SPEECHD_INSTALL_STAGING = YES +# speechd source code is released without configure script +SPEECHD_AUTORECONF = YES +SPEECHD_GETTEXTIZE = YES +SPEECHD_DEPENDENCIES = host-pkgconf dotconf libglib2 libsndfile +SPEECHD_CONF_ENV = ac_cv_prog_HELP2MAN="" +SPEECHD_CONF_OPTS = \ + --disable-python \ + --without-espeak \ + --without-espeak-ng \ + --without-flite \ + --without-ibmtts \ + --without-voxin \ + --without-ivona \ + --without-pico \ + --without-baratinoo \ + --without-kali \ + --without-pulse \ + --without-libao \ + --without-alsa \ + --with-oss \ + --without-nas + +# fix missing config.rpath (needed for autoreconf) in the codebase +define SPEECHD_TOUCH_CONFIG_RPATH + touch $(@D)/config.rpath +endef +SPEECHD_PRE_CONFIGURE_HOOKS += SPEECHD_TOUCH_CONFIG_RPATH + +ifeq ($(BR2_PACKAGE_LIBTOOL),y) +SPEECHD_DEPENDENCIES += libtool +SPEECHD_CONF_OPTS += --enable-ltdl +else +SPEECHD_CONF_OPTS += --disable-ltdl +endif + +define SPEECHD_INSTALL_INIT_SYSTEMD + $(INSTALL) -D -m 644 $(@D)/speech-dispatcherd.service \ + $(TARGET_DIR)/usr/lib/systemd/system/speech-dispatcherd.service +endef + +$(eval $(autotools-package)) diff --git a/package/speex/speex.hash b/package/speex/speex.hash index f5235d62627..5a2f942e824 100644 --- a/package/speex/speex.hash +++ b/package/speex/speex.hash @@ -1,6 +1,4 @@ # From https://downloads.xiph.org/releases/speex/SHA256SUMS.txt -sha256 eaae8af0ac742dc7d542c9439ac72f1f385ce838392dc849cae4536af9210094 speex-1.2.0.tar.gz -# From https://downloads.xiph.org/releases/speex/MD5SUMS -md5 8ab7bb2589110dfaf0ed7fa7757dc49c speex-1.2.0.tar.gz +sha256 4b44d4f2b38a370a2d98a78329fefc56a0cf93d1c1be70029217baae6628feea speex-1.2.1.tar.gz # Locally computed -sha256 671bb5d8fd3c6b05a2e831d90f978ac27965c92bd8ea6d16b3df76e3440c0e9f COPYING +sha256 2654a4264b2bfe298dedc508748d140111840c315cc8eb646a3a68c13fa75b01 COPYING diff --git a/package/speex/speex.mk b/package/speex/speex.mk index 674be78ff84..0bbcb2bde2f 100644 --- a/package/speex/speex.mk +++ b/package/speex/speex.mk @@ -4,7 +4,7 @@ # ################################################################################ -SPEEX_VERSION = 1.2.0 +SPEEX_VERSION = 1.2.1 SPEEX_SITE = https://downloads.xiph.org/releases/speex SPEEX_LICENSE = BSD-3-Clause SPEEX_LICENSE_FILES = COPYING @@ -26,6 +26,10 @@ ifeq ($(BR2_PACKAGE_SPEEX_ARM5E),y) SPEEX_CONF_OPTS += --enable-arm5e-asm endif +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +SPEEX_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" +endif + define SPEEX_LIBTOOL_FIXUP $(SED) 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' $(@D)/libtool $(SED) 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' $(@D)/libtool diff --git a/package/speexdsp/speexdsp.hash b/package/speexdsp/speexdsp.hash index 82e054d4d43..b46df791b4f 100644 --- a/package/speexdsp/speexdsp.hash +++ b/package/speexdsp/speexdsp.hash @@ -1,3 +1,5 @@ +# From https://ftp.osuosl.org/pub/xiph/releases/speex/SHA256SUMS.txt +sha256 8c777343e4a6399569c72abc38a95b24db56882c83dbdb6c6424a5f4aeb54d3d speexdsp-1.2.1.tar.gz + # Locally computed -sha256 0fe0e31be215f820bed0f9c913c673997773fce3a03a4555658e7b73a54eed7b speexdsp-SpeexDSP-1.2.0.tar.bz2 -sha256 671bb5d8fd3c6b05a2e831d90f978ac27965c92bd8ea6d16b3df76e3440c0e9f COPYING +sha256 2654a4264b2bfe298dedc508748d140111840c315cc8eb646a3a68c13fa75b01 COPYING diff --git a/package/speexdsp/speexdsp.mk b/package/speexdsp/speexdsp.mk index 8e886b2b219..8edad7c0d27 100644 --- a/package/speexdsp/speexdsp.mk +++ b/package/speexdsp/speexdsp.mk @@ -4,13 +4,11 @@ # ################################################################################ -SPEEXDSP_VERSION = 1.2.0 -SPEEXDSP_SOURCE = speexdsp-SpeexDSP-$(SPEEXDSP_VERSION).tar.bz2 -SPEEXDSP_SITE = https://gitlab.xiph.org/xiph/speexdsp/-/archive/SpeexDSP-$(SPEEXDSP_VERSION) +SPEEXDSP_VERSION = 1.2.1 +SPEEXDSP_SITE = https://downloads.xiph.org/releases/speex SPEEXDSP_LICENSE = BSD-3-Clause SPEEXDSP_LICENSE_FILES = COPYING SPEEXDSP_INSTALL_STAGING = YES SPEEXDSP_DEPENDENCIES = host-pkgconf -SPEEXDSP_AUTORECONF = YES $(eval $(autotools-package)) diff --git a/package/spi-tools/spi-tools.hash b/package/spi-tools/spi-tools.hash index 1595cd3d2ce..7a840b91554 100644 --- a/package/spi-tools/spi-tools.hash +++ b/package/spi-tools/spi-tools.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 81bb9f7218123f86c3644d92ad2c427343758df2143ee5da38e6f743f18714fd spi-tools-1.0.1.tar.gz +sha256 f6a93ae4f729d42e9200ba491cf9088202b63cb88e011cf6bcb0a7d12432cdc4 spi-tools-1.0.2.tar.gz sha256 a01259a1b522cf0de95824f9860613b453153eebac468e96196d5d7dba84786c LICENSE diff --git a/package/spi-tools/spi-tools.mk b/package/spi-tools/spi-tools.mk index d623babf48a..c3732fcb866 100644 --- a/package/spi-tools/spi-tools.mk +++ b/package/spi-tools/spi-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -SPI_TOOLS_VERSION = 1.0.1 +SPI_TOOLS_VERSION = 1.0.2 SPI_TOOLS_SITE = $(call github,cpb-,spi-tools,$(SPI_TOOLS_VERSION)) # autoreconf must be run as specified in package documentation SPI_TOOLS_AUTORECONF = YES diff --git a/package/spice-protocol/spice-protocol.hash b/package/spice-protocol/spice-protocol.hash index f02cf7f0e2e..cd74c84ec78 100644 --- a/package/spice-protocol/spice-protocol.hash +++ b/package/spice-protocol/spice-protocol.hash @@ -1,5 +1,5 @@ -# From https://www.spice-space.org/download/releases/spice-protocol-0.14.3.tar.xz.sha256sum -sha256 f986e5bc2a1598532c4897f889afb0df9257ac21c160c083703ae7c8de99487a spice-protocol-0.14.3.tar.xz +# From https://www.spice-space.org/download/releases/spice-protocol-0.14.4.tar.xz.sha256sum +sha256 04ffba610d9fd441cfc47dfaa135d70096e60b1046d2119d8db2f8ea0d17d912 spice-protocol-0.14.4.tar.xz # Hash for license file sha256 eb55ea746be694c449224c7ddce6340648b075fd377281712a19094e7fb7ef92 COPYING diff --git a/package/spice-protocol/spice-protocol.mk b/package/spice-protocol/spice-protocol.mk index 172d45687da..dbeeb90b1db 100644 --- a/package/spice-protocol/spice-protocol.mk +++ b/package/spice-protocol/spice-protocol.mk @@ -4,7 +4,7 @@ # ################################################################################ -SPICE_PROTOCOL_VERSION = 0.14.3 +SPICE_PROTOCOL_VERSION = 0.14.4 SPICE_PROTOCOL_SOURCE = spice-protocol-$(SPICE_PROTOCOL_VERSION).tar.xz SPICE_PROTOCOL_SITE = http://www.spice-space.org/download/releases SPICE_PROTOCOL_LICENSE = BSD-3-Clause diff --git a/package/spice/Config.in b/package/spice/Config.in index 2241b55b3d8..ca5c562ca15 100644 --- a/package/spice/Config.in +++ b/package/spice/Config.in @@ -1,12 +1,14 @@ -comment "spice server needs a toolchain w/ wchar, threads" +comment "spice server needs a toolchain w/ wchar, threads, C++" depends on BR2_i386 || BR2_x86_64 - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_INSTALL_LIBSTDCPP config BR2_PACKAGE_SPICE bool "spice server" depends on BR2_i386 || BR2_x86_64 depends on BR2_USE_WCHAR # libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + depends on BR2_INSTALL_LIBSTDCPP select BR2_PACKAGE_JPEG select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_OPENSSL diff --git a/package/spidev_test/Config.in b/package/spidev_test/Config.in index 44990c66b65..abfa885b736 100644 --- a/package/spidev_test/Config.in +++ b/package/spidev_test/Config.in @@ -9,8 +9,8 @@ config BR2_PACKAGE_SPIDEV_TEST proper operation of 'spidev_test'. The version used is based on your toolchain headers version, - if it's older than 3.15 then 3.0 is used, otherwise 3.15 - is used. + if it's older than 3.15 then 3.0 is used, up to headers 5.7 + version 4.10 is used and otherwise version 5.8. This means you won't have quad-pumped SPI support if your toolchain is too old. diff --git a/package/spidev_test/spidev_test.hash b/package/spidev_test/spidev_test.hash index 7bc4a27e450..867920fc78b 100644 --- a/package/spidev_test/spidev_test.hash +++ b/package/spidev_test/spidev_test.hash @@ -1,3 +1,4 @@ # Locally calculated -sha256 80471c330d8c0bf5ba6479c434a54a54bdd2dc59a703b9c76c2541ec04cfb8c3 spidev_test.c?id=v3.0 -sha256 3cf76b15d9a8644f3f5cbc0387cc02a7d4a392ade39788cbc6367cce98552e2f spidev_test.c?id=v4.10 +sha256 80471c330d8c0bf5ba6479c434a54a54bdd2dc59a703b9c76c2541ec04cfb8c3 spidev_test.c?id=v3.0 +sha256 3cf76b15d9a8644f3f5cbc0387cc02a7d4a392ade39788cbc6367cce98552e2f spidev_test.c?id=v4.10 +sha256 87329094ea3010eae9e65ad7ea2d2309e044845942414aa0ca8f1a7095b80178 spidev_test.c?id=v5.8 diff --git a/package/spidev_test/spidev_test.mk b/package/spidev_test/spidev_test.mk index bd2fcf6db36..bd138b01428 100644 --- a/package/spidev_test/spidev_test.mk +++ b/package/spidev_test/spidev_test.mk @@ -10,7 +10,10 @@ # If you need quad-pumped spi support you need to upgrade your toolchain. # Note that the location of spidev_test.c changes from v4.5 onwards. -ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15),y) +ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_8),y) +SPIDEV_TEST_VERSION = 5.8 +SPIDEV_TEST_PATH = tools/spi +else ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15),y) SPIDEV_TEST_VERSION = 4.10 SPIDEV_TEST_PATH = tools/spi else diff --git a/package/spirv-llvm-translator/spirv-llvm-translator.hash b/package/spirv-llvm-translator/spirv-llvm-translator.hash new file mode 100644 index 00000000000..edfca1ea026 --- /dev/null +++ b/package/spirv-llvm-translator/spirv-llvm-translator.hash @@ -0,0 +1,3 @@ +# locally calculated +sha256 bdd7cb677b9fcaaff1cce2153de9d69298f136edecaef3631915614bb5db09a1 spirv-llvm-translator-v11.0.0-297-ga619b34bce55360d79fea9058a93ded04919f2b2.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 new file mode 100644 index 00000000000..159f7d3b524 --- /dev/null +++ b/package/spirv-llvm-translator/spirv-llvm-translator.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# spirv-llvm-translator +# +################################################################################ + +# Generate version string using: +# git describe --tags --match 'v11*' --abbrev=40 origin/llvm_release_110 +SPIRV_LLVM_TRANSLATOR_VERSION = v11.0.0-297-ga619b34bce55360d79fea9058a93ded04919f2b2 +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 +HOST_SPIRV_LLVM_TRANSLATOR_DEPENDENCIES = host-clang host-llvm +HOST_SPIRV_LLVM_TRANSLATOR_CONF_OPTS = \ + -DLLVM_BUILD_TOOLS=ON \ + -DLLVM_DIR=$(HOST_DIR)/lib/cmake/llvm \ + -DLLVM_SPIRV_BUILD_EXTERNAL=YES \ + -DLLVM_SPIRV_INCLUDE_TESTS=OFF + +$(eval $(host-cmake-package)) diff --git a/package/sqlcipher/sqlcipher.hash b/package/sqlcipher/sqlcipher.hash index f831e615d8a..c6551651722 100644 --- a/package/sqlcipher/sqlcipher.hash +++ b/package/sqlcipher/sqlcipher.hash @@ -1,3 +1,3 @@ # locally computed -sha256 20c46a855c47d5a0a159fdcaa8491ec7bdbaa706a734ee52bc76188b929afb14 sqlcipher-4.5.0.tar.gz +sha256 023499516ef2ade14fbcdbe93fb81cc69458ae6cb3544614df8dbef34835b406 sqlcipher-4.5.1.tar.gz sha256 3eee3c7964a9becc94d747bd36703d31fc86eb994680b06a61bfd4f2661eaac8 LICENSE diff --git a/package/sqlcipher/sqlcipher.mk b/package/sqlcipher/sqlcipher.mk index c47aa484292..c0c53acdd20 100644 --- a/package/sqlcipher/sqlcipher.mk +++ b/package/sqlcipher/sqlcipher.mk @@ -4,7 +4,7 @@ # ################################################################################ -SQLCIPHER_VERSION = 4.5.0 +SQLCIPHER_VERSION = 4.5.1 SQLCIPHER_SITE = $(call github,sqlcipher,sqlcipher,v$(SQLCIPHER_VERSION)) SQLCIPHER_LICENSE = BSD-3-Clause SQLCIPHER_LICENSE_FILES = LICENSE diff --git a/package/sqlite/sqlite.hash b/package/sqlite/sqlite.hash index deb8d4c14c1..36f6907fbc4 100644 --- a/package/sqlite/sqlite.hash +++ b/package/sqlite/sqlite.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4089a8d9b467537b3f246f217b84cd76e00b1d1a971fe5aca1e30e230e46b2d8 sqlite-autoconf-3370200.tar.gz +sha256 2c5dea207fa508d765af1ef620b637dcb06572afa6f01f0815bd5bbf864b33d9 sqlite-autoconf-3400100.tar.gz sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 tea/license.terms diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index b702139f6c3..789eddfa0aa 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -4,8 +4,8 @@ # ################################################################################ -SQLITE_VERSION = 3.37.2 -SQLITE_TAR_VERSION = 3370200 +SQLITE_VERSION = 3.40.1 +SQLITE_TAR_VERSION = 3400100 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_TAR_VERSION).tar.gz SQLITE_SITE = https://www.sqlite.org/2022 SQLITE_LICENSE = Public domain diff --git a/package/squashfs/0001-Avoid-use-of-INSTALL_DIR-for-symlink-targets.patch b/package/squashfs/0001-Avoid-use-of-INSTALL_DIR-for-symlink-targets.patch deleted file mode 100644 index 997719e63ab..00000000000 --- a/package/squashfs/0001-Avoid-use-of-INSTALL_DIR-for-symlink-targets.patch +++ /dev/null @@ -1,37 +0,0 @@ -From f5c908e92d4c055859be2fddbda266d9e3bfd415 Mon Sep 17 00:00:00 2001 -From: Patrick McCarty -Date: Mon, 26 Jul 2021 11:38:43 -0700 -Subject: [PATCH] Avoid use of INSTALL_DIR for symlink targets - -In case INSTALL_DIR is overridden with a staged install location, using -INSTALL_DIR for the symlink target path prefix will yield an incorrect location -for the final installation. - -Because the symlink itself is already installed to INSTALL_DIR, simply removing -the INSTALL_DIR prefix suffices as a fix. - -Note that using $DESTDIR/$INSTALL_DIR where appropriate can avoid this type of -issue, but that can be considered a future enhancement. - -Signed-off-by: Patrick McCarty -Upstream: f5c908e92d4c055859be2fddbda266d9e3bfd415 -Signed-off-by: Thomas Petazzoni ---- - squashfs-tools/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/squashfs-tools/Makefile b/squashfs-tools/Makefile -index f5a55f1..7262a2e 100755 ---- a/squashfs-tools/Makefile -+++ b/squashfs-tools/Makefile -@@ -406,5 +406,5 @@ install: mksquashfs unsquashfs - mkdir -p $(INSTALL_DIR) - cp mksquashfs $(INSTALL_DIR) - cp unsquashfs $(INSTALL_DIR) -- ln -fs $(INSTALL_DIR)/unsquashfs $(INSTALL_DIR)/sqfscat -- ln -fs $(INSTALL_DIR)/mksquashfs $(INSTALL_DIR)/sqfstar -+ ln -fs unsquashfs $(INSTALL_DIR)/sqfscat -+ ln -fs mksquashfs $(INSTALL_DIR)/sqfstar --- -2.31.1 - diff --git a/package/squashfs/squashfs.hash b/package/squashfs/squashfs.hash index 09a2bae364f..13d5aed71f9 100644 --- a/package/squashfs/squashfs.hash +++ b/package/squashfs/squashfs.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 b9e16188e6dc1857fe312633920f7d71cc36b0162eb50f3ecb1f0040f02edddd squashfs-4.5.tar.gz +sha256 277b6e7f75a4a57f72191295ae62766a10d627a4f5e5f19eadfbc861378deea7 squashfs-4.5.1.tar.gz # License files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/squashfs/squashfs.mk b/package/squashfs/squashfs.mk index f64d441c9b4..323908d94e6 100644 --- a/package/squashfs/squashfs.mk +++ b/package/squashfs/squashfs.mk @@ -4,7 +4,7 @@ # ################################################################################ -SQUASHFS_VERSION = 4.5 +SQUASHFS_VERSION = 4.5.1 SQUASHFS_SITE = $(call github,plougher,squashfs-tools,$(SQUASHFS_VERSION)) SQUASHFS_LICENSE = GPL-2.0+ SQUASHFS_LICENSE_FILES = COPYING @@ -75,7 +75,8 @@ endef define SQUASHFS_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(SQUASHFS_MAKE_ARGS) \ - -C $(@D)/squashfs-tools/ INSTALL_DIR=$(TARGET_DIR)/usr/bin install + -C $(@D)/squashfs-tools/ INSTALL_DIR=$(TARGET_DIR)/usr/bin \ + INSTALL_MANPAGES_DIR="" install endef define HOST_SQUASHFS_BUILD_CMDS @@ -89,7 +90,8 @@ endef define HOST_SQUASHFS_INSTALL_CMDS $(HOST_MAKE_ENV) $(MAKE) $(HOST_SQUASHFS_MAKE_ARGS) \ - -C $(@D)/squashfs-tools/ INSTALL_DIR=$(HOST_DIR)/bin install + -C $(@D)/squashfs-tools/ INSTALL_DIR=$(HOST_DIR)/bin \ + INSTALL_MANPAGES_DIR="" install endef $(eval $(generic-package)) diff --git a/package/squeezelite/squeezelite.hash b/package/squeezelite/squeezelite.hash index 0b21d861b9d..67ed4c8797e 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 7f0342f4943d3c3498d930060f5a1e8d63ccb7282b9c21f964926e310449d592 squeezelite-71c012ad9ba102feb95823b7b9dc17e5305689c7.tar.gz +sha256 dc01c3da33fea11ed918f9e437b88baa59c70401aab0dad747e33dd9e8035706 LICENSE.txt diff --git a/package/squid/squid.hash b/package/squid/squid.hash index e18ed8961e2..b00d14011e1 100644 --- a/package/squid/squid.hash +++ b/package/squid/squid.hash @@ -1,6 +1,6 @@ -# From http://www.squid-cache.org/Versions/v5/squid-5.3.tar.xz.asc -md5 9249f30169ab6600e53b4f9b8129b3b0 squid-5.3.tar.xz -sha1 d3a8310c725616fa7565d60f3bf8fdf5fa20b15a squid-5.3.tar.xz +# From http://www.squid-cache.org/Versions/v5/squid-5.7.tar.xz.asc +md5 7a3764a3c5833631a779d7827901cda7 squid-5.7.tar.xz +sha1 141e8007d6b1cfee34654127a9ca025125b37b58 squid-5.7.tar.xz # Locally calculated -sha256 45178588df1311ded41ebadd632840c4d93a8d7f5f60e38e74acf2f1ae2f1715 squid-5.3.tar.xz +sha256 6b0753aaba4c9c4efd333e67124caecf7ad6cc2d38581f19d2f0321f5b7ecd81 squid-5.7.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/squid/squid.mk b/package/squid/squid.mk index 3847fb49dcd..355af0b9027 100644 --- a/package/squid/squid.mk +++ b/package/squid/squid.mk @@ -4,7 +4,7 @@ # ################################################################################ -SQUID_VERSION = 5.3 +SQUID_VERSION = 5.7 SQUID_SOURCE = squid-$(SQUID_VERSION).tar.xz SQUID_SITE = http://www.squid-cache.org/Versions/v5 SQUID_LICENSE = GPL-2.0+ diff --git a/package/sratom/sratom.hash b/package/sratom/sratom.hash index 64d460b2eab..3b8fa653007 100644 --- a/package/sratom/sratom.hash +++ b/package/sratom/sratom.hash @@ -1,4 +1,4 @@ # Locally calculated after checking signature -# https://download.drobilla.net/sratom-0.6.8.tar.bz2.asc -sha256 3acb32b1adc5a2b7facdade2e0818bcd6c71f23f84a1ebc17815bb7a0d2d02df sratom-0.6.8.tar.bz2 -sha256 3fc429d6b944fa20306357196a28bb4dd7c25e2d67edebec771f44de5bd7f9e8 COPYING +# https://download.drobilla.net/sratom-0.6.14.tar.xz.sig +sha256 9982faf40db83aedd9b3850e499fecd6852b8b4ba6dede514013655cffaca1e6 sratom-0.6.14.tar.xz +sha256 97742aacc982d8bb10d4450e3ce71dd02a9f26ba73a0eb822ef3356a74525597 COPYING diff --git a/package/sratom/sratom.mk b/package/sratom/sratom.mk index e1e0f4e0335..25e7a091b33 100644 --- a/package/sratom/sratom.mk +++ b/package/sratom/sratom.mk @@ -4,18 +4,14 @@ # ################################################################################ -SRATOM_VERSION = 0.6.8 +SRATOM_VERSION = 0.6.14 SRATOM_SITE = https://download.drobilla.net -SRATOM_SOURCE = sratom-$(SRATOM_VERSION).tar.bz2 +SRATOM_SOURCE = sratom-$(SRATOM_VERSION).tar.xz SRATOM_LICENSE = ISC SRATOM_LICENSE_FILES = COPYING SRATOM_DEPENDENCIES = host-pkgconf lv2 serd sord SRATOM_INSTALL_STAGING = YES -SRATOM_CONF_OPTS += --no-coverage +SRATOM_CONF_OPTS += -Ddocs=disabled -Dtests=disabled -ifeq ($(BR2_STATIC_LIBS),y) -SRATOM_CONF_OPTS += --static --no-shared -endif - -$(eval $(waf-package)) +$(eval $(meson-package)) diff --git a/package/sscep/0001-Fix-getopt-linking-error.patch b/package/sscep/0001-Fix-getopt-linking-error.patch new file mode 100644 index 00000000000..9427593cc3e --- /dev/null +++ b/package/sscep/0001-Fix-getopt-linking-error.patch @@ -0,0 +1,57 @@ +From 65561b53344b834877e6b63320066a1e26038a3c Mon Sep 17 00:00:00 2001 +From: Dario Binacchi +Date: Fri, 9 Dec 2022 18:18:27 +0100 +Subject: [PATCH] Fix getopt linking error + +The buildroot project, to which the sscep application was added, has +configurations that raise the following linking error: +buildroot/output/host/lib/gcc/arc-buildroot-linux-uclibc/11.3.0/../../../../arc-buildroot-linux-uclibc/bin/ld: buildroot/output/host/bin/../arc-buildroot-linux-uclibc/sysroot/usr/lib/libc.a(getopt.os):(.data+0x8): multiple definition of `optind'; src/getopt.o:(.data+0x0): first defined here +buildroot/output/host/lib/gcc/arc-buildroot-linux-uclibc/11.3.0/../../../../arc-buildroot-linux-uclibc/bin/ld: buildroot/output/host/bin/../arc-buildroot-linux-uclibc/sysroot/usr/lib/libc.a(getopt.os): in function `__GI_getopt': +getopt.c:(.text+0x5a4): multiple definition of `getopt'; src/getopt.o:getopt.c:(.text+0x0): first defined here +buildroot/output/host/lib/gcc/arc-buildroot-linux-uclibc/11.3.0/../../../../arc-buildroot-linux-uclibc/bin/ld: buildroot/output/host/bin/../arc-buildroot-linux-uclibc/sysroot/usr/lib/libc.a(getopt.os): in function `getopt_long': +getopt.c:(.text+0x5b0): multiple definition of `getopt_long'; src/getopt.o:getopt.c:(.text+0x128): first defined here +collect2: error: ld returned 1 exit status +make[2]: *** [Makefile:507: sscep] Error 1 +make[1]: *** [package/pkg-generic.mk:293: buildroot/output/build/sscep-0.10.0/.stamp_built] Error 2 + +The patch re-added a check that commit +81f56f635259b9 ("Replaced GNU getopt by a BSD licensed alternative") +removed. + +Signed-off-by: Dario Binacchi +[yann.morin.1998@free.fr: make that an actual backport] +Signed-off-by: Yann E. MORIN +--- + src/getopt.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/src/getopt.c b/src/getopt.c +index eae36a6..0109406 100644 +--- a/src/getopt.c ++++ b/src/getopt.c +@@ -31,6 +31,16 @@ + #include + #include + ++#define GETOPT_INTERFACE_VERSION 2 ++#if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2 ++# include ++# if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION ++# define ELIDE_CODE ++# endif ++#endif ++ ++#ifndef ELIDE_CODE ++ + char* optarg; + int optopt; + /* The variable optind [...] shall be initialized to 1 by the system. */ +@@ -226,3 +236,5 @@ int getopt_long(int argc, char* const argv[], const char* optstring, + ++optind; + return retval; + } ++ ++#endif /* Not ELIDE_CODE. */ +-- +2.25.1 + diff --git a/package/sscep/Config.in b/package/sscep/Config.in new file mode 100644 index 00000000000..549c65274b4 --- /dev/null +++ b/package/sscep/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_SSCEP + bool "sscep" + select BR2_PACKAGE_LIBOPENSSL_ENABLE_BLOWFISH if BR2_PACKAGE_LIBOPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL + select BR2_PACKAGE_OPENSSL + help + SSCEP is a client-only implementation of the SCEP + (Cisco System's Simple Certificate Enrollment Protocol). + + https://github.com/certnanny/sscep diff --git a/package/sscep/sscep.hash b/package/sscep/sscep.hash new file mode 100644 index 00000000000..549c63b9185 --- /dev/null +++ b/package/sscep/sscep.hash @@ -0,0 +1,3 @@ +# locally computed +sha256 489cc8e093986776eb3f15082bf766778f707176f3cd604bf0ef1008da06b8e5 sscep-0.10.0.tar.gz +sha256 e1328c292102a22c10e8dcfbfda33740f603767c73f8c5b5189c5513eb6b4dea COPYING diff --git a/package/sscep/sscep.mk b/package/sscep/sscep.mk new file mode 100644 index 00000000000..782bd358ed0 --- /dev/null +++ b/package/sscep/sscep.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# sscep +# +################################################################################ + +SSCEP_VERSION = 0.10.0 +SSCEP_SITE = $(call github,certnanny,sscep,v$(SSCEP_VERSION)) +SSCEP_LICENSE = BSD-2-Clause, OpenSSL, OpenOSP +SSCEP_LICENSE_FILES = COPYING +SSCEP_AUTORECONF = YES +SSCEP_DEPENDENCIES = host-pkgconf openssl + +$(eval $(autotools-package)) diff --git a/package/ssdp-responder/Config.in b/package/ssdp-responder/Config.in index df57546eedb..8b5dfe67a69 100644 --- a/package/ssdp-responder/Config.in +++ b/package/ssdp-responder/Config.in @@ -7,14 +7,16 @@ config BR2_PACKAGE_SSDP_RESPONDER targeted more at embedded systems that need to announce themselves to Windows systems. - ssdpd is a stand-alone UNIX, no external dependencies but the - standard C library. It has a built-in web server for serving - the UPnP XML description which Windows use to present the - icon, by default an InternetGatewayDevice is announced. + The project consists of ssdpd and ssdp-scan. The former is a + stand-alone UNIX daemon, it has no dependencies but a standard + C library. It comes with built-in web server for serving the + UPnP XML description on port 1901, the XML is used by Windows + to present the icon, by default an InternetGatewayDevice is + announced. - Also included is ssdp-scan, a tool similar to mdns-scan, which - continuously scans for SSDP capable hosts on the network. - Take care only to use for debugging since it scans the network - quite aggressively. + ssdp-scan is a tool, similar to mdns-scan, to find other SSDP + capable hosts on the network. Take care to only use it for + debugging, or quicker device discovery operations, since it + scans the network quite aggressively. https://github.com/troglobit/ssdp-responder/ diff --git a/package/ssdp-responder/S50ssdpd b/package/ssdp-responder/S50ssdpd old mode 100755 new mode 100644 index e33992be918..8654de4f263 --- a/package/ssdp-responder/S50ssdpd +++ b/package/ssdp-responder/S50ssdpd @@ -1,25 +1,32 @@ #!/bin/sh -NAME=ssdpd -PIDFILE=/var/run/$NAME.pid -DAEMON=/usr/sbin/$NAME -CFGFILE=/etc/default/$NAME +DAEMON=ssdpd +PIDFILE=/var/run/$DAEMON.pid +CFGFILE=/etc/default/$DAEMON DAEMON_ARGS="" # Read configuration variable file if it is present -[ -f $CFGFILE ] && . $CFGFILE +# shellcheck source=/dev/null +[ -r "$CFGFILE" ] && . "$CFGFILE" +# shellcheck disable=SC2086 start() { - printf 'Starting %s: ' "$NAME" - start-stop-daemon -S -q -p $PIDFILE -x $DAEMON -- $DAEMON_ARGS - [ $? = 0 ] && echo "OK" || echo "FAIL" + printf 'Starting %s: ' "$DAEMON" + if start-stop-daemon -S -q -p "$PIDFILE" -x "$DAEMON" -- $DAEMON_ARGS; then + echo "OK" + else + echo "FAIL" + fi } stop() { - printf 'Stopping %s: ' "$NAME" - start-stop-daemon -K -q -p $PIDFILE -x $DAEMON - [ $? = 0 ] && echo "OK" || echo "FAIL" + printf 'Stopping %s: ' "$DAEMON" + if start-stop-daemon -K -q -p "$PIDFILE" -x "$DAEMON"; then + echo "OK" + else + echo "FAIL" + fi } restart() { @@ -28,15 +35,15 @@ restart() { } case "$1" in - start|stop|restart) - "$1" - ;; - reload) - restart - ;; - *) - echo "Usage: $0 {start|stop|restart|reload}" - exit 1 + start|stop|restart) + "$1" + ;; + reload) + restart + ;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 esac exit $? diff --git a/package/ssdp-responder/ssdp-responder.hash b/package/ssdp-responder/ssdp-responder.hash index e8cbbb4a1f4..425ad86e08a 100644 --- a/package/ssdp-responder/ssdp-responder.hash +++ b/package/ssdp-responder/ssdp-responder.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7ae49229e7c7a55fed9e36598b12e2173eecef0fffe0a386b6a10fad30f3c79f ssdp-responder-1.8.tar.gz -sha256 e17dc0bc91bf499d8cca5e016c22c6d2a4770e3cc1a43756a7973375a83ddb90 LICENSE +sha256 974c244abd4ba8c87532867a84756182a1460c99072ffb1eb91c5a1f73311d89 ssdp-responder-1.9.tar.gz +sha256 68d6fdc22e337f725fe719bf9ae6d92b1d8d0ca4cff8219b303ab76706670a8d LICENSE diff --git a/package/ssdp-responder/ssdp-responder.mk b/package/ssdp-responder/ssdp-responder.mk index 3fee4c20064..51939669081 100644 --- a/package/ssdp-responder/ssdp-responder.mk +++ b/package/ssdp-responder/ssdp-responder.mk @@ -4,7 +4,7 @@ # ################################################################################ -SSDP_RESPONDER_VERSION = 1.8 +SSDP_RESPONDER_VERSION = 1.9 SSDP_RESPONDER_SITE = https://github.com/troglobit/ssdp-responder/releases/download/v$(SSDP_RESPONDER_VERSION) SSDP_RESPONDER_LICENSE = ISC SSDP_RESPONDER_LICENSE_FILES = LICENSE @@ -25,9 +25,4 @@ define SSDP_RESPONDER_INSTALL_INIT_SYSV $(TARGET_DIR)/etc/init.d/S50ssdpd endef -define SSDP-RESPONDER_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 $(@D)/ssdp-responder.service \ - $(TARGET_DIR)/usr/lib/systemd/system/ssdp-responder.service -endef - $(eval $(autotools-package)) diff --git a/package/sshfs/sshfs.hash b/package/sshfs/sshfs.hash index 106f06f09ff..9372e471c25 100644 --- a/package/sshfs/sshfs.hash +++ b/package/sshfs/sshfs.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 fe5d3436d61b46974889e0c4515899c21a9d67851e3793c209989f72353d7750 sshfs-3.7.1.tar.xz +sha256 5218ce7bdd2ce0a34137a0d7798e0f6d09f0e6d21b1e98ee730a18b0699c2e99 sshfs-3.7.3.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/sshfs/sshfs.mk b/package/sshfs/sshfs.mk index 6759f6ab3be..61f11af55f8 100644 --- a/package/sshfs/sshfs.mk +++ b/package/sshfs/sshfs.mk @@ -4,7 +4,7 @@ # ################################################################################ -SSHFS_VERSION = 3.7.1 +SSHFS_VERSION = 3.7.3 SSHFS_SOURCE = sshfs-$(SSHFS_VERSION).tar.xz SSHFS_SITE = https://github.com/libfuse/sshfs/releases/download/sshfs-$(SSHFS_VERSION) SSHFS_LICENSE = GPL-2.0 diff --git a/package/startup-notification/Config.in b/package/startup-notification/Config.in index 88d18174bcc..606276e4849 100644 --- a/package/startup-notification/Config.in +++ b/package/startup-notification/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_STARTUP_NOTIFICATION bool "startup-notification" depends on BR2_PACKAGE_XORG7 depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_XCB_UTIL select BR2_PACKAGE_XLIB_LIBX11 help Startup-notification is a library used to monitor diff --git a/package/startup-notification/startup-notification.hash b/package/startup-notification/startup-notification.hash index 474c8bd92c6..9c5713213bd 100644 --- a/package/startup-notification/startup-notification.hash +++ b/package/startup-notification/startup-notification.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c2fa09f9a49d8b319e79638e49e967c682df8726006e03059b1ffca5ab82099c startup-notification-0.9.tar.gz +sha256 3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a startup-notification-0.12.tar.gz sha256 29935974beae046f50da806b5f4e54532401dd7bcfbc696a0b645f4cbcce9dbb COPYING diff --git a/package/startup-notification/startup-notification.mk b/package/startup-notification/startup-notification.mk index b3314087f5c..4a9e33e5ed9 100644 --- a/package/startup-notification/startup-notification.mk +++ b/package/startup-notification/startup-notification.mk @@ -4,10 +4,10 @@ # ################################################################################ -STARTUP_NOTIFICATION_VERSION = 0.9 +STARTUP_NOTIFICATION_VERSION = 0.12 STARTUP_NOTIFICATION_SITE = http://freedesktop.org/software/startup-notification/releases STARTUP_NOTIFICATION_INSTALL_STAGING = YES -STARTUP_NOTIFICATION_DEPENDENCIES = xlib_libX11 +STARTUP_NOTIFICATION_DEPENDENCIES = xcb-util xlib_libX11 STARTUP_NOTIFICATION_CONF_ENV = lf_cv_sane_realloc=yes STARTUP_NOTIFICATION_CONF_OPTS = --with-x \ --x-includes="$(STAGING_DIR)/usr/include/X11" \ diff --git a/package/stb/Config.in b/package/stb/Config.in new file mode 100644 index 00000000000..41014d242bd --- /dev/null +++ b/package/stb/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_STB + bool "stb" + help + Single-file image and audio processing libraries for C/C++. + + https://github.com/nothings/stb diff --git a/package/stb/stb.hash b/package/stb/stb.hash new file mode 100644 index 00000000000..097ad3424f7 --- /dev/null +++ b/package/stb/stb.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 c47cf5abe21e1d620afccd159c23fe71dfa86eb270015a7646a4f79e9bfd5503 stb-8b5f1f37b5b75829fc72d38e7b5d4bcbf8a26d55.tar.gz +sha256 bebfe904b14301657e4e5d655c811d51fd31b97c455b9cc2d8600d6bac6cff63 LICENSE diff --git a/package/stb/stb.mk b/package/stb/stb.mk new file mode 100644 index 00000000000..59358aec26a --- /dev/null +++ b/package/stb/stb.mk @@ -0,0 +1,21 @@ +################################################################################ +# +# stb +# +################################################################################ + +STB_VERSION = 8b5f1f37b5b75829fc72d38e7b5d4bcbf8a26d55 +STB_SITE = $(call github,nothings,stb,$(STB_VERSION)) +STB_LICENSE = Public Domain or MIT +STB_LICENSE_FILES = LICENSE +STB_INSTALL_STAGING = YES +STB_INSTALL_TARGET = NO + +define STB_INSTALL_STAGING_CMDS + mkdir -p $(STAGING_DIR)/usr/include/stb + $(INSTALL) -m 0644 $(@D)/*.h $(STAGING_DIR)/usr/include/stb + $(INSTALL) -D -m 0644 $(STB_PKGDIR)/stb.pc \ + $(STAGING_DIR)/usr/lib/pkgconfig/stb.pc +endef + +$(eval $(generic-package)) diff --git a/package/stb/stb.pc b/package/stb/stb.pc new file mode 100644 index 00000000000..165b6da94a7 --- /dev/null +++ b/package/stb/stb.pc @@ -0,0 +1,8 @@ +prefix=/usr +libdir=${prefix}/lib +includedir=${prefix}/include + +Name: stb +Description: single-file image and audio processing libraries for C/C++ +Version: 0.0 +Cflags: -I${includedir}/stb diff --git a/package/stella/0001-configure-add-CC.patch b/package/stella/0001-configure-add-CC.patch deleted file mode 100644 index d4b29e39b5d..00000000000 --- a/package/stella/0001-configure-add-CC.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 143cf9fa13a07b827de7065a5e919631406b0941 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 12 Dec 2021 22:46:52 +0100 -Subject: [PATCH] configure: add CC (#854) - -Add CC to fix the following build failure when cross-compiling which is -raised since -https://github.com/stella-emu/stella/commit/771b5b44e31de1b81a552ee47b65014fbc338776: - -out/src/sqlite/sqlite3.o: file not recognized: file format not recognized - -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/stella-emu/stella/commit/143cf9fa13a07b827de7065a5e919631406b0941] ---- - configure | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/configure b/configure -index df666b377..0101d2567 100755 ---- a/configure -+++ b/configure -@@ -899,6 +899,7 @@ echo "Creating config.mak" - cat > config.mak << EOF - # -------- Generated by configure ----------- - -+CC := $CC - CXX := $CXX - CXXFLAGS := $CXXFLAGS - LD := $LD diff --git a/package/stella/stella.hash b/package/stella/stella.hash index 8aa51181650..17d059226cf 100644 --- a/package/stella/stella.hash +++ b/package/stella/stella.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 d481efc6d27b5294565dfcc10983de2dbc4db8a59932a678ffdb4d2404b8c207 stella-6.6-src.tar.xz -sha256 d5e5897578c2590e48328986cebd950ff215653f7f506ef93accf981870366a6 Copyright.txt +sha256 babfcbb39abbd1a992cb1e6d3b2f508df7ed19cb9d0b5b5d624828bb98f97267 stella-6.7-src.tar.xz +sha256 e82dd017fea2c70a16726aa1d7c05c5b7597e10f7229511c1b110bf84cb507c0 Copyright.txt sha256 58530d09b6fcb91ae27071be0081af90e6c2d7fdf991d34a29e234a2a5e75455 License.txt diff --git a/package/stella/stella.mk b/package/stella/stella.mk index 198a1134dc7..aa5da1996e1 100644 --- a/package/stella/stella.mk +++ b/package/stella/stella.mk @@ -4,7 +4,7 @@ # ################################################################################ -STELLA_VERSION = 6.6 +STELLA_VERSION = 6.7 STELLA_SOURCE = stella-$(STELLA_VERSION)-src.tar.xz STELLA_SITE = https://github.com/stella-emu/stella/releases/download/$(STELLA_VERSION) STELLA_LICENSE = GPL-2.0+ diff --git a/package/stellarium/0001-add-missing-include.patch b/package/stellarium/0001-add-missing-include.patch new file mode 100644 index 00000000000..822fc50367a --- /dev/null +++ b/package/stellarium/0001-add-missing-include.patch @@ -0,0 +1,32 @@ +From f36ce55e7a0fbba11fb7e1d4107ef61a79dc95d3 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sun, 25 Dec 2022 20:38:17 +0100 +Subject: [PATCH] add missing include + +Fixes build error: + +stellarium-1.2/plugins/MeteorShowers/src/MeteorShowersMgr.hpp:331:12: + error: field 'm_lastUpdate' has incomplete type 'QDateTime' + +Patch sent upstream: https://github.com/Stellarium/stellarium/pull/2933 + +Signed-off-by: Bernd Kuhls +--- + plugins/MeteorShowers/src/MeteorShowersMgr.hpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/plugins/MeteorShowers/src/MeteorShowersMgr.hpp b/plugins/MeteorShowers/src/MeteorShowersMgr.hpp +index 8096856b6d..17716a68b0 100644 +--- a/plugins/MeteorShowers/src/MeteorShowersMgr.hpp ++++ b/plugins/MeteorShowers/src/MeteorShowersMgr.hpp +@@ -20,6 +20,7 @@ + #ifndef METEORSHOWERSMGR_HPP + #define METEORSHOWERSMGR_HPP + ++#include + #include + #include + +-- +2.34.1 + diff --git a/package/stellarium/Config.in b/package/stellarium/Config.in index 5922162d44a..566f8edc834 100644 --- a/package/stellarium/Config.in +++ b/package/stellarium/Config.in @@ -9,6 +9,7 @@ config BR2_PACKAGE_STELLARIUM select BR2_PACKAGE_QT5BASE_OPENGL select BR2_PACKAGE_QT5BASE_PRINTSUPPORT select BR2_PACKAGE_QT5BASE_WIDGETS + select BR2_PACKAGE_QT5CHARTS select BR2_PACKAGE_QT5LOCATION select BR2_PACKAGE_QT5MULTIMEDIA select BR2_PACKAGE_ZLIB diff --git a/package/stellarium/stellarium.hash b/package/stellarium/stellarium.hash index c3f2e0e8d43..2488b611a45 100644 --- a/package/stellarium/stellarium.hash +++ b/package/stellarium/stellarium.hash @@ -1,5 +1,4 @@ # From https://github.com/Stellarium/stellarium/releases -sha1 a3396c403050e073c592da695faeb048c1d5e19b stellarium-0.21.3.tar.gz -sha256 8ac6c054d12f136fe0d5c0deaaa8d7b69dd2a462be1711a187364574aef97e7f stellarium-0.21.3.tar.gz +sha256 802a0e8231cae41ec04f697f70105c291d9719aa6e7fd8cbe1f15068c3324e09 stellarium-1.2.tar.xz # Locally computed sha256 3aeeb5bb98bf7041ab82cffe15efa28ac58ee2bdf162b71301f5c192be631259 COPYING diff --git a/package/stellarium/stellarium.mk b/package/stellarium/stellarium.mk index ca5c07b2a71..fe7aaf6ac96 100644 --- a/package/stellarium/stellarium.mk +++ b/package/stellarium/stellarium.mk @@ -4,18 +4,25 @@ # ################################################################################ -STELLARIUM_VERSION = 0.21.3 +STELLARIUM_VERSION = 1.2 +STELLARIUM_SOURCE = stellarium-$(STELLARIUM_VERSION).tar.xz STELLARIUM_SITE = https://github.com/Stellarium/stellarium/releases/download/v$(STELLARIUM_VERSION) STELLARIUM_LICENSE = GPL-2.0+ STELLARIUM_LICENSE_FILES = COPYING STELLARIUM_DEPENDENCIES = \ qt5base \ + qt5charts \ qt5location \ qt5multimedia \ zlib STELLARIUM_CONF_OPTS = \ -DENABLE_MEDIA=ON \ -DENABLE_NLS=OFF \ + -DENABLE_SHOWMYSKY=OFF \ + -DENABLE_QTWEBENGINE=OFF \ + -DENABLE_QT6=OFF \ + -DENABLE_XLSX=OFF \ + -DUSE_PLUGIN_TELESCOPECONTROL=OFF \ -DUSE_SYSTEM_ZLIB=ON ifeq ($(BR2_PACKAGE_QT5SCRIPT),y) @@ -30,13 +37,9 @@ STELLARIUM_DEPENDENCIES += qt5serialport ifeq ($(BR2_PACKAGE_GPSD),y) STELLARIUM_DEPENDENCIES += gpsd endif -STELLARIUM_CONF_OPTS += \ - -DENABLE_GPS=ON \ - -DUSE_PLUGIN_TELESCOPECONTROL=ON +STELLARIUM_CONF_OPTS += -DENABLE_GPS=ON else -STELLARIUM_CONF_OPTS += \ - -DENABLE_GPS=OFF \ - -DUSE_PLUGIN_TELESCOPECONTROL=OFF +STELLARIUM_CONF_OPTS += -DENABLE_GPS=OFF endif $(eval $(cmake-package)) diff --git a/package/stm32flash/stm32flash.hash b/package/stm32flash/stm32flash.hash index 7039f06eec1..afffbc68ac8 100644 --- a/package/stm32flash/stm32flash.hash +++ b/package/stm32flash/stm32flash.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 ee9b40d4d3e5cd28b993e08ae2a2c3c559b6bea8730cd7e1d40727dedb1dda09 stm32flash-0.6.tar.gz +sha256 c4c9cd8bec79da63b111d15713ef5cc2cd947deca411d35d6e3065e227dc414a stm32flash-0.7.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 gpl-2.0.txt diff --git a/package/stm32flash/stm32flash.mk b/package/stm32flash/stm32flash.mk index 6e38e09d981..1fff27df767 100644 --- a/package/stm32flash/stm32flash.mk +++ b/package/stm32flash/stm32flash.mk @@ -4,7 +4,7 @@ # ################################################################################ -STM32FLASH_VERSION = 0.6 +STM32FLASH_VERSION = 0.7 STM32FLASH_SITE = http://downloads.sourceforge.net/project/stm32flash STM32FLASH_LICENSE = GPL-2.0+ STM32FLASH_LICENSE_FILES = gpl-2.0.txt diff --git a/package/strace/Config.in b/package/strace/Config.in index c394d4c398a..dc245c7297b 100644 --- a/package/strace/Config.in +++ b/package/strace/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_STRACE 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 - depends on !BR2_nds32 && !BR2_RISCV_32 + depends on !BR2_RISCV_32 help A useful diagnostic, instructional, and debugging tool. Allows you to track what system calls a program makes diff --git a/package/strace/strace.hash b/package/strace/strace.hash index 30c90e8e394..9478fbd4597 100644 --- a/package/strace/strace.hash +++ b/package/strace/strace.hash @@ -1,5 +1,5 @@ # Locally calculated after checking signature with RSA key 0xA8041FA839E16E36 -# https://strace.io/files/5.16/strace-5.16.tar.xz.asc -sha256 dc7db230ff3e57c249830ba94acab2b862da1fcaac55417e9b85041a833ca285 strace-5.16.tar.xz +# https://strace.io/files/6.1/strace-6.1.tar.xz.asc +sha256 2579e9cec37dbb786f6ea0bebd15f40dd561ef2bde2a2a2ecdce5963b01859fd strace-6.1.tar.xz sha256 d92f973d08c8466993efff1e500453add0c038c20b4d2cbce3297938a296aea9 COPYING sha256 7c379436436a562834aa7d2f5dcae1f80a25230fa74201046ca1fba4367d39aa LGPL-2.1-or-later diff --git a/package/strace/strace.mk b/package/strace/strace.mk index c8c3590f6e5..cbb574559e6 100644 --- a/package/strace/strace.mk +++ b/package/strace/strace.mk @@ -4,9 +4,9 @@ # ################################################################################ -STRACE_VERSION = 5.16 +STRACE_VERSION = 6.1 STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz -STRACE_SITE = https://strace.io/files/$(STRACE_VERSION) +STRACE_SITE = https://github.com/strace/strace/releases/download/v$(STRACE_VERSION) STRACE_LICENSE = LGPL-2.1+ STRACE_LICENSE_FILES = COPYING LGPL-2.1-or-later STRACE_CPE_ID_VENDOR = strace_project diff --git a/package/stress-ng/0001-Makefile-fix-build-with-kernel-5.6.patch b/package/stress-ng/0001-Makefile-fix-build-with-kernel-5.6.patch new file mode 100644 index 00000000000..4c62da32413 --- /dev/null +++ b/package/stress-ng/0001-Makefile-fix-build-with-kernel-5.6.patch @@ -0,0 +1,60 @@ +From 5d419c790e648c7a2f96f34ed1b93b326f725545 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 13 Aug 2022 17:17:05 +0200 +Subject: [PATCH] Makefile: fix build with kernel < 5.6 + +Fix the following build failure with kernel >= 5.1 and < 5.5 (i.e. +before +https://github.com/torvalds/linux/commit/9e3aa61ae3e01ce1ce6361a41ef725e1f4d1d2bf) +raised since version 0.11.21 and +https://github.com/ColinIanKing/stress-ng/commit/3d6fccdbe53d0cbcb75dd4b91571aaaae7ee1ad4: + +In file included from stress-io-uring.c:26: +io-uring.h:1:9: error: macro names must be identifiers + 1 | #define #define HAVE_IORING_OP_NOP 0 + | ^ + +Moreover, IORING_OP_FALLOCATE is not available before kernel 5.6 and +https://github.com/torvalds/linux/commit/d63d1b5edb7b832210bfde587ba9e7549fa064eb + +Fixes: + - http://autobuild.buildroot.org/results/1bf3f2bbc849bdce531d56b1024fa87f0c1ae667 + +Signed-off-by: Fabrice Fontaine +[Retrieved (and backported) from +https://github.com/ColinIanKing/stress-ng/commit/5d419c790e648c7a2f96f34ed1b93b326f725545] +--- + Makefile | 2 +- + stress-io-uring.c | 6 +++++- + 2 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 2f9cc9918..ee17ae08b 100644 +--- a/Makefile ++++ b/Makefile +@@ -528,7 +528,7 @@ stress-personality.c: personality.h + # + io-uring.h: + $(V)$(CPP) $(CFLAGS) core-io-uring.c | $(GREP) IORING_OP | sed 's/,//' | \ +- sed 's/IORING_OP_/#define HAVE_IORING_OP_/' > io-uring.h ++ sed 's/.*\(IORING_OP_.*\)/#define HAVE_\1/' > io-uring.h + $(Q)echo "MK io-uring.h" + + stress-io-uring.c: io-uring.h +diff --git a/stress-io-uring.c b/stress-io-uring.c +index ab9fd0749..84f463611 100644 +--- a/stress-io-uring.c ++++ b/stress-io-uring.c +@@ -311,7 +311,11 @@ static inline int stress_io_uring_complete( + break; + + cqe = &cring->cqes[head & *submit->cq_ring.ring_mask]; +- if ((cqe->res < 0) && (opcode != IORING_OP_FALLOCATE)) { ++ if ((cqe->res < 0) ++#ifdef HAVE_IORING_OP_FALLOCATE ++ && (opcode != IORING_OP_FALLOCATE) ++#endif ++ ) { + const int err = abs(cqe->res); + + /* Silently ignore EOPNOTSUPP completion errors */ diff --git a/package/stress/Config.in b/package/stress/Config.in index b22c3f19bb5..32a3e264bce 100644 --- a/package/stress/Config.in +++ b/package/stress/Config.in @@ -6,4 +6,4 @@ config BR2_PACKAGE_STRESS It imposes a configurable amount of CPU, memory, I/O, and disk stress on the system. - http://people.seas.harvard.edu/~apw/stress/ + https://github.com/resurrecting-open-source-projects/stress/ diff --git a/package/stress/stress.hash b/package/stress/stress.hash index 8d14d053fb2..dc1785b6c7e 100644 --- a/package/stress/stress.hash +++ b/package/stress/stress.hash @@ -1,4 +1,3 @@ -# Locally calculated after checking pgp signature -sha256 057e4fc2a7706411e1014bf172e4f94b63a12f18412378fca8684ca92408825b stress-1.0.4.tar.gz # Locally computed +sha256 1798e49ca365d928fb194ba1b8e8d1e09963b49e9edb0a78bcbba15750bb5027 stress-1.0.5.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/stress/stress.mk b/package/stress/stress.mk index 4d2d4cb838a..99a50f349e5 100644 --- a/package/stress/stress.mk +++ b/package/stress/stress.mk @@ -4,10 +4,12 @@ # ################################################################################ -STRESS_VERSION = 1.0.4 -STRESS_SITE = http://people.seas.harvard.edu/~apw/stress +STRESS_VERSION = 1.0.5 +STRESS_SITE = $(call github,resurrecting-open-source-projects,stress,$(STRESS_VERSION)) STRESS_LICENSE = GPL-2.0+ STRESS_LICENSE_FILES = COPYING +# From git +STRESS_AUTORECONF = YES # Stress is linked statically if the --enable-static is specified. # However, this option is always specified in the global diff --git a/package/strongswan/Config.in b/package/strongswan/Config.in index 430625a1020..f2e597e0163 100644 --- a/package/strongswan/Config.in +++ b/package/strongswan/Config.in @@ -108,9 +108,13 @@ config BR2_PACKAGE_STRONGSWAN_EAP_SIM_FILE config BR2_PACKAGE_STRONGSWAN_EAP_SIM_PCSC bool "Enable EAP-SIM smart card backend" 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_STRONGSWAN_EAP_SIM +comment "EAP-SIM smart backend needs a toolchain w/ dynamic library, gcc >= 4.9" + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + config BR2_PACKAGE_STRONGSWAN_EAP_AKA bool "Enable EAP-AKA" default y if BR2_PACKAGE_STRONGSWAN_EAP # legacy @@ -191,6 +195,9 @@ config BR2_PACKAGE_STRONGSWAN_SQL bool "Enable SQL database configuration backend" depends on BR2_PACKAGE_SQLITE || BR2_PACKAGE_MYSQL +config BR2_PACKAGE_STRONGSWAN_BYPASS_LAN + bool "Enable BYPASS-LAN plugin" + endif config BR2_PACKAGE_STRONGSWAN_PKI diff --git a/package/strongswan/strongswan.hash b/package/strongswan/strongswan.hash index aca7ddf5cd0..de8f18747a0 100644 --- a/package/strongswan/strongswan.hash +++ b/package/strongswan/strongswan.hash @@ -1,7 +1,7 @@ -# From http://download.strongswan.org/strongswan-5.9.5.tar.bz2.md5 -md5 53005324e3cba8592f1fb958b1c2d0e5 strongswan-5.9.5.tar.bz2 +# From http://download.strongswan.org/strongswan-5.9.11.tar.bz2.md5 +md5 673e194cd256af77b46928179f2c81ad strongswan-5.9.11.tar.bz2 # Calculated based on the hash above -sha256 983e4ef4a4c6c9d69f5fe6707c7fe0b2b9a9291943bbf4e008faab6bf91c0bdd strongswan-5.9.5.tar.bz2 +sha256 ddf53f1f26ad26979d5f55e8da95bd389552f5de3682e35593f9a70b2584ed2d strongswan-5.9.11.tar.bz2 # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 2292e21797754548dccdef9eef6aee7584e552fbd890fa914e1de8d3577d23f0 LICENSE diff --git a/package/strongswan/strongswan.mk b/package/strongswan/strongswan.mk index 95079aceb30..60586316960 100644 --- a/package/strongswan/strongswan.mk +++ b/package/strongswan/strongswan.mk @@ -4,7 +4,7 @@ # ################################################################################ -STRONGSWAN_VERSION = 5.9.5 +STRONGSWAN_VERSION = 5.9.11 STRONGSWAN_SOURCE = strongswan-$(STRONGSWAN_VERSION).tar.bz2 STRONGSWAN_SITE = http://download.strongswan.org STRONGSWAN_LICENSE = GPL-2.0+ @@ -57,6 +57,7 @@ STRONGSWAN_CONF_OPTS += \ --enable-eap-tnc=$(if $(BR2_PACKAGE_STRONGSWAN_EAP_TNC),yes,no) \ --enable-eap-dynamic=$(if $(BR2_PACKAGE_STRONGSWAN_EAP_DYNAMIC),yes,no) \ --enable-eap-radius=$(if $(BR2_PACKAGE_STRONGSWAN_EAP_RADIUS),yes,no) \ + --enable-bypass-lan=$(if $(BR2_PACKAGE_STRONGSWAN_BYPASS_LAN),yes,no) \ --with-ipseclibdir=/usr/lib \ --with-plugindir=/usr/lib/ipsec/plugins \ --with-imcvdir=/usr/lib/ipsec/imcvs \ diff --git a/package/stunnel/Config.in b/package/stunnel/Config.in index 087fecd930f..a46e2f03160 100644 --- a/package/stunnel/Config.in +++ b/package/stunnel/Config.in @@ -2,7 +2,8 @@ config BR2_PACKAGE_STUNNEL bool "stunnel" depends on BR2_USE_MMU # fork() select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES help Stunnel is a program that wraps any TCP connection with an SSL connection. diff --git a/package/stunnel/stunnel.hash b/package/stunnel/stunnel.hash index b8cc62be13d..19633b3c188 100644 --- a/package/stunnel/stunnel.hash +++ b/package/stunnel/stunnel.hash @@ -1,5 +1,5 @@ -# From https://www.stunnel.org/downloads/stunnel-5.60.tar.gz.sha256 -sha256 c45d765b1521861fea9b03b425b9dd7d48b3055128c0aec673bba5ef9b8f787d stunnel-5.60.tar.gz +# From https://www.stunnel.org/downloads/stunnel-5.65.tar.gz.sha256 +sha256 60c500063bd1feff2877f5726e38278c086f96c178f03f09d264a2012d6bf7fc stunnel-5.65.tar.gz # Locally calculated -sha256 28b55d0157efd5ceb63640faeebb50fda13b1f49aec0b9c1240b9a3ea9f0eb4c COPYING.md +sha256 f10bcd7ee7b722dce40c9c674761ddb37e7e29a76a6e413e961cd52e361c5d7a COPYING.md sha256 62f171d4d8b6726df61f18a6bbc0a70f79c4bc2134d837d35c81fc6289a2d84d COPYRIGHT.md diff --git a/package/stunnel/stunnel.mk b/package/stunnel/stunnel.mk index cc56eb39a87..95a1530eb8b 100644 --- a/package/stunnel/stunnel.mk +++ b/package/stunnel/stunnel.mk @@ -5,7 +5,7 @@ ################################################################################ STUNNEL_VERSION_MAJOR = 5 -STUNNEL_VERSION = $(STUNNEL_VERSION_MAJOR).60 +STUNNEL_VERSION = $(STUNNEL_VERSION_MAJOR).65 STUNNEL_SITE = http://www.usenix.org.uk/mirrors/stunnel/archive/$(STUNNEL_VERSION_MAJOR).x STUNNEL_DEPENDENCIES = host-pkgconf openssl STUNNEL_CONF_OPTS = --with-ssl=$(STAGING_DIR)/usr --with-threads=fork \ diff --git a/package/subversion/0001-workaround-ac-run-ifelse.patch b/package/subversion/0001-workaround-ac-run-ifelse.patch deleted file mode 100644 index 4f229dc49b3..00000000000 --- a/package/subversion/0001-workaround-ac-run-ifelse.patch +++ /dev/null @@ -1,23 +0,0 @@ -build/ac-macros/macosx.m4: workaround AC_RUN_IFELSE - -The SVN_LIB_MACHO_ITERATE macro contains an AC_RUN_IFELSE test that -doesn't work when cross-compiling. However, this macro is related to -testing Mac OS X APIs, so in the context of Buildroot, we don't care, -and the test program is not even going to build. So we simply -workaround this by turning the test into an AC_COMPILE_IFELSE. - -Signed-off-by: Thomas Petazzoni - -Index: b/build/ac-macros/macosx.m4 -=================================================================== ---- a/build/ac-macros/macosx.m4 -+++ b/build/ac-macros/macosx.m4 -@@ -24,7 +24,7 @@ - AC_DEFUN(SVN_LIB_MACHO_ITERATE, - [ - AC_MSG_CHECKING([for Mach-O dynamic module iteration functions]) -- AC_RUN_IFELSE([AC_LANG_PROGRAM([[ -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include - #include - ]],[[ diff --git a/package/subversion/subversion.hash b/package/subversion/subversion.hash index 534d5965145..d2239b1b5b3 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.1.tar.bz2.sha512 -sha512 0a70c7152b77cdbcb810a029263e4b3240b6ef41d1c19714e793594088d3cca758d40dfbc05622a806b06463becb73207df249393924ce591026b749b875fcdd subversion-1.14.1.tar.bz2 +# From https://www.apache.org/dist/subversion/subversion-1.14.2.tar.bz2.sha512 +sha512 20ada4688ca07d9fb8da4b7d53b5084568652a3b9418c65e688886bae950a16a3ff37710fcfc9c29ef14a89e75b2ceec4e9cf35d5876a7896ebc2b512cfb9ecc subversion-1.14.2.tar.bz2 # Locally calculated sha256 484aff0cfbb81155a10f903ed756e27e9fc65578c245a295bae295c4bb51eaad LICENSE diff --git a/package/subversion/subversion.mk b/package/subversion/subversion.mk index d4cc7175364..b27058c024c 100644 --- a/package/subversion/subversion.mk +++ b/package/subversion/subversion.mk @@ -4,7 +4,7 @@ # ################################################################################ -SUBVERSION_VERSION = 1.14.1 +SUBVERSION_VERSION = 1.14.2 SUBVERSION_SOURCE = subversion-$(SUBVERSION_VERSION).tar.bz2 SUBVERSION_SITE = https://downloads.apache.org/subversion SUBVERSION_LICENSE = Apache-2.0 @@ -20,7 +20,6 @@ SUBVERSION_DEPENDENCIES = \ zlib \ sqlite \ $(TARGET_NLS_DEPENDENCIES) -SUBVERSION_AUTORECONF = YES SUBVERSION_CONF_OPTS = \ --with-expat=$(STAGING_DIR)/usr/include:$(STAGING_DIR)/usr/lib: \ --with-apr=$(STAGING_DIR)/usr \ diff --git a/package/sudo/0001-configure.ac-fix-openssl-static-build.patch b/package/sudo/0001-configure.ac-fix-openssl-static-build.patch new file mode 100644 index 00000000000..dc91af61191 --- /dev/null +++ b/package/sudo/0001-configure.ac-fix-openssl-static-build.patch @@ -0,0 +1,47 @@ +From 1fed5adc166d5f2190a6b6ad048ec2d803316327 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 22 Feb 2023 10:13:30 +0100 +Subject: [PATCH] configure.ac: fix openssl static build + +Do not use AX_APPEND_FLAG as it will break static builds by removing +duplicates such as -lz or -latomic which are needed by -lssl and +-lcrypto. This will fix the following build failure with sparc which +needs -latomic: + +Checking for X509_STORE_CTX_get0_cert +configure:21215: /home/thomas/autobuild/instance-3/output-1/host/bin/sparc-buildroot-linux-uclibc-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -static -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DZLIB_CONST -static conftest.c -L/home/thomas/autobuild/instance-3/output-1/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/lib -lssl -lz -pthread -latomic -lcrypto >&5 +/home/thomas/autobuild/instance-3/output-1/host/lib/gcc/sparc-buildroot-linux-uclibc/10.4.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: /home/thomas/autobuild/instance-3/output-1/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/lib/libcrypto.a(x509cset.o): in function `X509_CRL_up_ref': +x509cset.c:(.text+0x108): undefined reference to `__atomic_fetch_add_4' + +[...] + +In file included from ./hostcheck.c:38: +../../include/sudo_compat.h:342:41: error: conflicting types for 'ASN1_STRING_data' + 342 | # define ASN1_STRING_get0_data(x) ASN1_STRING_data(x) + | ^~~~~~~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/8be59dd94e4916f9457cb435104e36e62a28373b + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/sudo-project/sudo/commit/1fed5adc166d5f2190a6b6ad048ec2d803316327] +--- + m4/openssl.m4 | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/m4/openssl.m4 b/m4/openssl.m4 +index a2e4941ae8..b4cbd821db 100644 +--- a/m4/openssl.m4 ++++ b/m4/openssl.m4 +@@ -44,7 +44,9 @@ AC_DEFUN([SUDO_CHECK_OPENSSL], [ + SUDO_APPEND_LIBPATH([LIBTLS], [$f]) + ;; + *) +- AX_APPEND_FLAG([$f], [LIBTLS]) ++ # Do not use AX_APPEND_FLAG as it will break static builds by removing ++ # duplicates such as -lz or -latomic which are needed by -lssl and -lcrypto ++ LIBTLS="$LIBTLS $f" + ;; + esac + done diff --git a/package/sudo/Config.in b/package/sudo/Config.in index cbef15d67b6..ee5ea542abf 100644 --- a/package/sudo/Config.in +++ b/package/sudo/Config.in @@ -8,4 +8,4 @@ config BR2_PACKAGE_SUDO basic philosophy is to give as few privileges as possible but still allow people to get their work done. - http://www.sudo.ws/sudo/ + https://www.sudo.ws/sudo/ diff --git a/package/sudo/sudo.hash b/package/sudo/sudo.hash index 1b494af69c6..720b21d849c 100644 --- a/package/sudo/sudo.hash +++ b/package/sudo/sudo.hash @@ -1,4 +1,4 @@ -# From: http://www.sudo.ws/download.html -sha256 9e3b8b8da7def43b6e60c257abe80467205670fd0f7c081de1423c414b680f2d sudo-1.9.8p2.tar.gz +# From: https://www.sudo.ws/getting/download/ +sha256 92334a12bb93e0c056b09f53e255ccb7d6f67c6350e2813cd9593ceeca78560b sudo-1.9.13p3.tar.gz # Locally calculated -sha256 b678438594f04a7070a5fd125f7edffc871e13234baad318690b647bfc60705d doc/LICENSE +sha256 ea33b3971e8e4d9657cd6794a952aaa71b22bd16745f1645455b6ead010e0a28 LICENSE.md diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk index a752217123a..e70e8bd31f0 100644 --- a/package/sudo/sudo.mk +++ b/package/sudo/sudo.mk @@ -4,18 +4,22 @@ # ################################################################################ -SUDO_VERSION_MAJOR = 1.9.8 -SUDO_VERSION_MINOR = p2 +SUDO_VERSION_MAJOR = 1.9.13 +SUDO_VERSION_MINOR = p3 SUDO_VERSION = $(SUDO_VERSION_MAJOR)$(SUDO_VERSION_MINOR) SUDO_SITE = https://www.sudo.ws/sudo/dist SUDO_LICENSE = ISC, BSD-3-Clause -SUDO_LICENSE_FILES = doc/LICENSE +SUDO_LICENSE_FILES = LICENSE.md SUDO_CPE_ID_VERSION = $(SUDO_VERSION_MAJOR) SUDO_CPE_ID_UPDATE = $(SUDO_VERSION_MINOR) SUDO_SELINUX_MODULES = sudo +# We're patching m4/openssl.m4 +SUDO_AUTORECONF = YES # This is to avoid sudo's make install from chown()ing files which fails SUDO_INSTALL_TARGET_OPTS = INSTALL_OWNER="" DESTDIR="$(TARGET_DIR)" install SUDO_CONF_OPTS = \ + --with-tzdir=$(if $(BR2_PACKAGE_TZDATA),/usr/share/zoneinfo,no) \ + --enable-tmpfiles.d=$(if $(BR2_PACKAGE_SYSTEMD),/usr/lib/tmpfiles.d,no) \ --without-lecture \ --without-sendmail \ --without-umask \ @@ -80,7 +84,7 @@ define SUDO_USERS endef define SUDO_ENABLE_SUDO_GROUP_RULE - $(SED) '/^# \%sudo\tALL=(ALL) ALL/s/^# //' $(TARGET_DIR)/etc/sudoers + $(SED) '/^# \%sudo\tALL=(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 244283f44d0..ba4d1919ce4 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/mripard/sunxi-mali/blob/master/README.md + https://github.com/giuliobenetti/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 4b276fecb7c..fd874f1f0a1 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 0197271dbf503e866dd4873091f61bb3de1f2c3031701aac1ba205d1e2f267ac sunxi-mali-utgard-driver-e4a91c95096bb31450b556fcb13f3c4ba79f60b4.tar.gz +sha256 4b66f20272c63ce8ea769bf1c95f9923ed6facabe0c14a8c7644b302b9f23b58 sunxi-mali-utgard-driver-73a80d550f2f181b5fc7fc2d859e15d077d845e4.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 5f9090f492d..15d660e49dd 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 = e4a91c95096bb31450b556fcb13f3c4ba79f60b4 -SUNXI_MALI_UTGARD_DRIVER_SITE = $(call github,mripard,sunxi-mali,$(SUNXI_MALI_UTGARD_DRIVER_VERSION)) +SUNXI_MALI_UTGARD_DRIVER_VERSION = 73a80d550f2f181b5fc7fc2d859e15d077d845e4 +SUNXI_MALI_UTGARD_DRIVER_SITE = $(call github,giuliobenetti,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/sunxi-mali-utgard/Config.in b/package/sunxi-mali-utgard/Config.in index ff49ea03f17..59ac21f5ab1 100644 --- a/package/sunxi-mali-utgard/Config.in +++ b/package/sunxi-mali-utgard/Config.in @@ -20,6 +20,8 @@ config BR2_PACKAGE_PROVIDES_LIBGLES choice prompt "Version" + default BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 if BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2 # legacy + default BR2_PACKAGE_SUNXI_MALI_UTGARD_R8P1 if BR2_PACKAGE_SUNXI_MALI_MAINLINE_R8P1 # legacy default BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2 help Select the version of the userspace module. diff --git a/package/supertuxkart/Config.in b/package/supertuxkart/Config.in index 1dd5dcf0581..319415754a0 100644 --- a/package/supertuxkart/Config.in +++ b/package/supertuxkart/Config.in @@ -24,7 +24,7 @@ config BR2_PACKAGE_SUPERTUXKART select BR2_PACKAGE_SDL2 select BR2_PACKAGE_XLIB_LIBXRANDR select BR2_PACKAGE_ZLIB - select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID if BR2_PACKAGE_BLUEZ5_UTILS # runtime + select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID if BR2_PACKAGE_BLUEZ5_UTILS && BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # runtime help Karts. Nitro. Action! SuperTuxKart is a free 3D arcade kart racer with multiple karts, tracks and modes you can play. diff --git a/package/supertuxkart/supertuxkart.hash b/package/supertuxkart/supertuxkart.hash index 306634d28ec..446a9de8ec9 100644 --- a/package/supertuxkart/supertuxkart.hash +++ b/package/supertuxkart/supertuxkart.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 eeabeb0d9801688a218f6f0a76ea3546a46a322ccaca9a258148ecacfe083ffd SuperTuxKart-1.3-src.tar.xz -sha256 d27207a5213f746aac53893e9ecc18456e9595d3ffa662bd1ec9eb10787c214a COPYING +sha256 9890392419baf4715313f14d5ad60746f276eed36eb580636caf44e2532c0f03 SuperTuxKart-1.4-src.tar.xz +sha256 d27207a5213f746aac53893e9ecc18456e9595d3ffa662bd1ec9eb10787c214a COPYING diff --git a/package/supertuxkart/supertuxkart.mk b/package/supertuxkart/supertuxkart.mk index 8ec366f7921..6bdd512eac0 100644 --- a/package/supertuxkart/supertuxkart.mk +++ b/package/supertuxkart/supertuxkart.mk @@ -4,7 +4,7 @@ # ################################################################################ -SUPERTUXKART_VERSION = 1.3 +SUPERTUXKART_VERSION = 1.4 SUPERTUXKART_SOURCE = SuperTuxKart-$(SUPERTUXKART_VERSION)-src.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. @@ -44,6 +44,7 @@ SUPERTUXKART_CONF_OPTS = -DBUILD_SHARED_LIBS=OFF \ ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS),y) SUPERTUXKART_DEPENDENCIES += bluez5_utils SUPERTUXKART_CONF_OPTS += -DUSE_WIIUSE=ON -DUSE_SYSTEM_WIIUSE=ON +SUPERTUXKART_SUPPORTS_IN_SOURCE_BUILD = NO else # Wiimote support relies on bluez5. SUPERTUXKART_CONF_OPTS += -DUSE_WIIUSE=OFF diff --git a/package/suricata/suricata.hash b/package/suricata/suricata.hash index 098740e7698..38ab5e9cd3e 100644 --- a/package/suricata/suricata.hash +++ b/package/suricata/suricata.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 a8f197e33d1678689ebbf7bc1abe84934c465d22c504c47c2c7e9b74aa042d0d suricata-6.0.4.tar.gz +sha256 00173634fa76aee636e38a90b1c02616c903e42173107d47b4114960b5fbe839 suricata-6.0.6.tar.gz # Hash for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/suricata/suricata.mk b/package/suricata/suricata.mk index 86d89701787..72b72cc94dc 100644 --- a/package/suricata/suricata.mk +++ b/package/suricata/suricata.mk @@ -4,7 +4,7 @@ # ################################################################################ -SURICATA_VERSION = 6.0.4 +SURICATA_VERSION = 6.0.6 SURICATA_SITE = https://www.openinfosecfoundation.org/download SURICATA_LICENSE = GPL-2.0 SURICATA_LICENSE_FILES = COPYING LICENSE @@ -29,7 +29,7 @@ SURICATA_DEPENDENCIES = \ SURICATA_CONF_ENV = \ ac_cv_path_HAVE_SPHINXBUILD=no \ - CARGO_HOME=$(HOST_DIR)/share/cargo \ + CARGO_HOME=$(BR_CARGO_HOME) \ RUST_TARGET=$(RUSTC_TARGET_NAME) SURICATA_CONF_OPTS = \ diff --git a/package/sway/Config.in b/package/sway/Config.in new file mode 100644 index 00000000000..f8d073520f1 --- /dev/null +++ b/package/sway/Config.in @@ -0,0 +1,42 @@ +config BR2_PACKAGE_SWAY + bool "sway" + depends on BR2_PACKAGE_SYSTEMD # is required by the sd-bus provider + depends on !BR2_STATIC_LIBS # wlroots + depends on BR2_TOOLCHAIN_HAS_THREADS # wlroots + depends on BR2_PACKAGE_HAS_LIBEGL # wlroots + depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND # wlroots + depends on BR2_PACKAGE_HAS_LIBGLES # wlroots + depends on BR2_PACKAGE_HAS_UDEV # wlroots + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c + depends on BR2_USE_WCHAR # pango + depends on BR2_TOOLCHAIN_HAS_THREADS # pango + depends on BR2_USE_MMU # pango + depends on BR2_INSTALL_LIBSTDCPP # pango + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango + select BR2_PACKAGE_WLROOTS + select BR2_PACKAGE_JSON_C + select BR2_PACKAGE_PCRE + select BR2_PACKAGE_CAIRO + select BR2_PACKAGE_CAIRO_PNG + select BR2_PACKAGE_PANGO + help + i3-compatible Wayland compositor + + https://github.com/swaywm/sway + +comment "sway needs systemd, udev, EGL w/ Wayland backend and OpenGL ES support" + depends on !BR2_PACKAGE_SYSTEMD || \ + !BR2_PACKAGE_HAS_UDEV || \ + !BR2_PACKAGE_HAS_LIBEGL || \ + !BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \ + !BR2_PACKAGE_HAS_LIBGLES + +comment "sway 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_USE_WCHAR || \ + !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_INSTALL_LIBSTDCPP || \ + BR2_STATIC_LIBS diff --git a/package/sway/sway.hash b/package/sway/sway.hash new file mode 100644 index 00000000000..6dfa71730f9 --- /dev/null +++ b/package/sway/sway.hash @@ -0,0 +1,3 @@ +# Locally computed, tarball verified with GPG signature +sha256 0c64536fb2883ec518e75cfb119f9300115fb49b084e3fde62b794fe2c6c8d84 sway-1.7.tar.gz +sha256 bd35722bff46327f5eded1d211207277bbe043d2a22048b282c42ef801593b8b LICENSE diff --git a/package/sway/sway.mk b/package/sway/sway.mk new file mode 100644 index 00000000000..802371c8272 --- /dev/null +++ b/package/sway/sway.mk @@ -0,0 +1,37 @@ +################################################################################ +# +# sway +# +################################################################################ + +SWAY_VERSION = 1.7 +SWAY_SITE = $(call github,swaywm,sway,v$(SWAY_VERSION)) +SWAY_LICENSE = MIT +SWAY_LICENSE_FILES = LICENSE +SWAY_DEPENDENCIES = systemd host-pkgconf wlroots json-c pcre cairo pango +SWAY_CONF_OPTS = \ + -Dwerror=false \ + -Ddefault-wallpaper=false \ + -Dzsh-completions=false \ + -Dbash-completions=false \ + -Dfish-completions=false \ + -Dswaybar=false \ + -Dswaynag=false \ + -Dtray=disabled \ + -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 +else +SWAY_CONF_OPTS += -Dgdk-pixbuf=disabled +endif + +$(eval $(meson-package)) diff --git a/package/swig/Config.in.host b/package/swig/Config.in.host index fd2049d30af..4c0deebc589 100644 --- a/package/swig/Config.in.host +++ b/package/swig/Config.in.host @@ -5,4 +5,4 @@ config BR2_PACKAGE_HOST_SWIG written in C and C++ with a variety of high-level programming languages. - http://www.swig.org/ + https://www.swig.org/ diff --git a/package/swig/swig.hash b/package/swig/swig.hash index 08b2b5a1efa..21590c422a7 100644 --- a/package/swig/swig.hash +++ b/package/swig/swig.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 d53be9730d8d58a16bf0cbd1f8ac0c0c3e1090573168bfa151b01eb47fa906fc swig-4.0.2.tar.gz -sha256 f53abaeed775018d519a1b9615f0ca17894772bd9ca21c2a156bf340ac41c13e LICENSE -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE-GPL -sha256 7f50d942373a871211c5efee03f3db2f9efd1cff1002b0ef8e3748baa611a5c2 LICENSE-UNIVERSITIES +sha256 2af08aced8fcd65cdb5cc62426768914bedc735b1c250325203716f78e39ac9b swig-4.1.1.tar.gz +sha256 f53abaeed775018d519a1b9615f0ca17894772bd9ca21c2a156bf340ac41c13e LICENSE +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE-GPL +sha256 7f50d942373a871211c5efee03f3db2f9efd1cff1002b0ef8e3748baa611a5c2 LICENSE-UNIVERSITIES diff --git a/package/swig/swig.mk b/package/swig/swig.mk index 437cf448be0..ad585c3f976 100644 --- a/package/swig/swig.mk +++ b/package/swig/swig.mk @@ -4,10 +4,10 @@ # ################################################################################ -SWIG_VERSION_MAJOR = 4.0 -SWIG_VERSION = $(SWIG_VERSION_MAJOR).2 +SWIG_VERSION_MAJOR = 4.1 +SWIG_VERSION = $(SWIG_VERSION_MAJOR).1 SWIG_SITE = http://downloads.sourceforge.net/project/swig/swig/swig-$(SWIG_VERSION) -HOST_SWIG_DEPENDENCIES = host-bison host-pcre +HOST_SWIG_DEPENDENCIES = host-bison host-pcre2 HOST_SWIG_CONF_OPTS = \ --with-pcre \ --disable-ccache \ diff --git a/package/swupdate/swupdate-usb@.service b/package/swupdate/swupdate-usb@.service index eda9d1539c0..df1a4084217 100644 --- a/package/swupdate/swupdate-usb@.service +++ b/package/swupdate/swupdate-usb@.service @@ -1,5 +1,6 @@ [Unit] Description=usb media swupdate service +Requires=swupdate.service Requires=swupdate-progress.service [Service] diff --git a/package/swupdate/swupdate.hash b/package/swupdate/swupdate.hash index e431ecf40ba..1b26f9e5e22 100644 --- a/package/swupdate/swupdate.hash +++ b/package/swupdate/swupdate.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 4d078e57bb91e17025ee8cb1bb54c25532e8d2dbe329bba6a7a0328ac34a07e3 swupdate-2021.11.tar.gz +sha256 e6335e87812a98a87f1c55df03c9f4e4ef042789570002c5db120b09f64b0d86 swupdate-2022.12.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 065ae772ba9..11a39467531 100644 --- a/package/swupdate/swupdate.mk +++ b/package/swupdate/swupdate.mk @@ -4,7 +4,7 @@ # ################################################################################ -SWUPDATE_VERSION = 2021.11 +SWUPDATE_VERSION = 2022.12 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 \ @@ -17,6 +17,7 @@ SWUPDATE_LICENSE_FILES = LICENSES/BSD-1-Clause.txt \ LICENSES/LGPL-2.1-or-later.txt \ LICENSES/MIT.txt \ LICENSES/OFL-1.1.txt +SWUPDATE_INSTALL_STAGING = YES # swupdate uses $CROSS-cc instead of $CROSS-gcc, which is not # available in all external toolchains, and use CC for linking. Ensure @@ -32,13 +33,6 @@ else SWUPDATE_MAKE_ENV += HAVE_LIBEXT2FS=n endif -ifeq ($(BR2_PACKAGE_EFIBOOTMGR),y) -SWUPDATE_DEPENDENCIES += efibootmgr -SWUPDATE_MAKE_ENV += HAVE_LIBEBGENV=y -else -SWUPDATE_MAKE_ENV += HAVE_LIBEBGENV=n -endif - ifeq ($(BR2_PACKAGE_JSON_C),y) SWUPDATE_DEPENDENCIES += json-c SWUPDATE_MAKE_ENV += HAVE_JSON_C=y @@ -88,6 +82,10 @@ else SWUPDATE_MAKE_ENV += HAVE_LIBGPIOD=n endif +ifeq ($(BR2_PACKAGE_LIBUBOOTENV),y) +SWUPDATE_DEPENDENCIES += libubootenv +endif + ifeq ($(BR2_PACKAGE_LIBURIPARSER),y) SWUPDATE_DEPENDENCIES += liburiparser SWUPDATE_MAKE_ENV += HAVE_URIPARSER=y @@ -158,13 +156,6 @@ define SWUPDATE_SET_SYSTEMD endef endif -ifeq ($(BR2_PACKAGE_LIBUBOOTENV),y) -SWUPDATE_DEPENDENCIES += libubootenv -SWUPDATE_MAKE_ENV += HAVE_LIBUBOOTENV=y -else -SWUPDATE_MAKE_ENV += HAVE_LIBUBOOTENV=n -endif - ifeq ($(BR2_PACKAGE_WOLFSSL),y) SWUPDATE_DEPENDENCIES += wolfssl SWUPDATE_MAKE_ENV += HAVE_WOLFSSL=y @@ -217,12 +208,11 @@ define SWUPDATE_SET_WEBSERVER endef endif -SWUPDATE_BUILD_CONFIG = $(@D)/.config - SWUPDATE_KCONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_SWUPDATE_CONFIG)) SWUPDATE_KCONFIG_EDITORS = menuconfig xconfig gconfig nconfig SWUPDATE_MAKE_OPTS = \ + SWU_VER="$(SWUPDATE_VERSION) (Buildroot $(BR2_VERSION_FULL))" \ CROSS_COMPILE="$(TARGET_CROSS)" \ CONFIG_EXTRA_CFLAGS="$(TARGET_CFLAGS)" \ CONFIG_EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" @@ -237,6 +227,12 @@ define SWUPDATE_BUILD_CMDS $(TARGET_MAKE_ENV) $(SWUPDATE_MAKE_ENV) $(MAKE) -C $(@D) $(SWUPDATE_MAKE_OPTS) endef +define SWUPDATE_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(SWUPDATE_MAKE_ENV) $(MAKE) -C $(@D) \ + $(SWUPDATE_MAKE_OPTS) DESTDIR=$(STAGING_DIR) \ + INCLUDEDIR=/usr/include/swupdate install +endef + define SWUPDATE_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(SWUPDATE_MAKE_ENV) $(MAKE) -C $(@D) \ $(SWUPDATE_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install diff --git a/package/swupdate/swupdate.service b/package/swupdate/swupdate.service index a3d8d1939e0..94d4526acf2 100644 --- a/package/swupdate/swupdate.service +++ b/package/swupdate/swupdate.service @@ -4,6 +4,7 @@ Documentation=https://github.com/sbabic/swupdate Documentation=https://sbabic.github.io/swupdate [Service] +Type=notify ExecStart=/usr/lib/swupdate/swupdate.sh KillMode=mixed diff --git a/package/sylpheed/sylpheed.hash b/package/sylpheed/sylpheed.hash index 08a5d0a2217..39fa76612d1 100644 --- a/package/sylpheed/sylpheed.hash +++ b/package/sylpheed/sylpheed.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 0d6bc5eb46f5d0a463757c62bc80b00d219b294b3c3662840e4540f6db2e3e49 sylpheed-3.7.0.tar.xz -sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 COPYING -sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB +sha256 0d6bc5eb46f5d0a463757c62bc80b00d219b294b3c3662840e4540f6db2e3e49 sylpheed-3.7.0.tar.xz +sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 COPYING +sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB diff --git a/package/synergy/synergy.hash b/package/synergy/synergy.hash index 8a053cf9410..248fd9dce7d 100644 --- a/package/synergy/synergy.hash +++ b/package/synergy/synergy.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 06d1cb1d43251b0b624212652e9c0ab2657d124ac4f7e7d0c7f3e448c953c2a8 synergy-2.0.12-beta.tar.gz -sha256 4921009cd76e7d38a8e873c362b25dbaf032c320bbb36a40dec775ddbdcbe1d8 LICENSE +sha256 06d1cb1d43251b0b624212652e9c0ab2657d124ac4f7e7d0c7f3e448c953c2a8 synergy-2.0.12-beta.tar.gz +sha256 4921009cd76e7d38a8e873c362b25dbaf032c320bbb36a40dec775ddbdcbe1d8 LICENSE diff --git a/package/sysdig/Config.in b/package/sysdig/Config.in index 06d20c7f7b6..c0a631bd491 100644 --- a/package/sysdig/Config.in +++ b/package/sysdig/Config.in @@ -1,21 +1,19 @@ config BR2_PACKAGE_SYSDIG bool "sysdig" - depends on BR2_LINUX_KERNEL - depends on BR2_INSTALL_LIBSTDCPP # jsoncpp - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 - depends on BR2_TOOLCHAIN_HAS_THREADS # elfutils, jq - depends on !BR2_STATIC_LIBS # elfutils - depends on BR2_USE_WCHAR # elfutils - depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils - depends on BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1 - select BR2_PACKAGE_ELFUTILS - select BR2_PACKAGE_JQ - select BR2_PACKAGE_JSONCPP - select BR2_PACKAGE_LIBB64 - select BR2_PACKAGE_LIBCURL + depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS # falcosecurity-libs + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # falcosecurity-libs + depends on BR2_LINUX_KERNEL # falcosecurity-libs + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # falcosecurity-libs + depends on BR2_TOOLCHAIN_HAS_THREADS # falcosecurity-libs + depends on !BR2_STATIC_LIBS # falcosecurity-libs + depends on BR2_TOOLCHAIN_USES_GLIBC # falcosecurity-libs + depends on BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1 # falcosecurity-libs + depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC # falcosecurity-libs + select BR2_PACKAGE_FALCOSECURITY_LIBS select BR2_PACKAGE_NCURSES - select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_ZLIB + select BR2_PACKAGE_JSON_FOR_MODERN_CPP + select BR2_PACKAGE_YAML_CPP help Sysdig is open source, system-level exploration: capture system state and activity from a running Linux @@ -25,9 +23,12 @@ config BR2_PACKAGE_SYSDIG https://github.com/draios/sysdig/wiki -comment "sysdig needs a glibc or uclibc toolchain w/ C++, threads, gcc >= 4.8, dynamic library, a Linux kernel, and luajit or lua 5.1 to be built" +comment "sysdig needs a glibc toolchain w/ C++, threads, gcc >= 5, dynamic library, a Linux kernel, and luajit or lua 5.1 to be built" + depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS + depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC depends on !BR2_LINUX_KERNEL || !BR2_INSTALL_LIBSTDCPP \ || !BR2_TOOLCHAIN_HAS_THREADS \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || BR2_STATIC_LIBS \ - || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) \ - || !BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1 + || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_USES_GLIBC \ + || !BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION_5_1 diff --git a/package/sysdig/sysdig.hash b/package/sysdig/sysdig.hash index 565b1e9828b..cda3de5e7ca 100644 --- a/package/sysdig/sysdig.hash +++ b/package/sysdig/sysdig.hash @@ -1,3 +1,3 @@ # sha256 locally computed -sha256 57d5b713b875eba35546a1408bf3f20c2703904a17d956be115ee55272db4cfa sysdig-0.23.1.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 6b96797859002ab69a2bed4fdba1c7fe8064ecf8661621ae7d8fbf8599ffa636 sysdig-0.29.3.tar.gz +sha256 a88fbf820b38b1c7fabc6efe291b8259e02ae21326f56fe31c6c9adf374b2702 COPYING diff --git a/package/sysdig/sysdig.mk b/package/sysdig/sysdig.mk index 08d93750ae6..bafe534a160 100644 --- a/package/sysdig/sysdig.mk +++ b/package/sysdig/sysdig.mk @@ -4,44 +4,35 @@ # ################################################################################ -SYSDIG_VERSION = 0.23.1 +SYSDIG_VERSION = 0.29.3 SYSDIG_SITE = $(call github,draios,sysdig,$(SYSDIG_VERSION)) -SYSDIG_LICENSE = GPL-2.0 +SYSDIG_LICENSE = Apache-2.0 SYSDIG_LICENSE_FILES = COPYING SYSDIG_CPE_ID_VENDOR = sysdig -SYSDIG_CONF_OPTS = -DENABLE_DKMS=OFF -DUSE_BUNDLED_DEPS=OFF +SYSDIG_CONF_OPTS = \ + -DENABLE_DKMS=OFF \ + -DUSE_BUNDLED_DEPS=OFF \ + -DCREATE_TEST_TARGETS=OFF SYSDIG_SUPPORTS_IN_SOURCE_BUILD = NO SYSDIG_DEPENDENCIES = \ - elfutils \ - jq \ - jsoncpp \ - libb64 \ - libcurl \ - luainterpreter \ + falcosecurity-libs \ ncurses \ - openssl \ - zlib + json-for-modern-cpp \ + yaml-cpp -# sysdig creates the module Makefile from a template, which contains a -# single place-holder, KBUILD_FLAGS, wich is only replaced with two -# things: -# - debug flags, which we don't care about here, -# - 'sysdig-feature' flags, which are never set, so always empty -# So, just replace the place-holder with the only meaningful value: nothing. -define SYSDIG_MODULE_GEN_MAKEFILE - $(INSTALL) -m 0644 $(@D)/driver/Makefile.in $(@D)/driver/Makefile - $(SED) 's/@KBUILD_FLAGS@//;' $(@D)/driver/Makefile - $(SED) 's/@PROBE_NAME@/sysdig-probe/;' $(@D)/driver/Makefile -endef -SYSDIG_POST_PATCH_HOOKS += SYSDIG_MODULE_GEN_MAKEFILE +# Don't build the driver as part of the 'standard' procedure, it has been built +# by falcosecurity-libs.mk. +# grpc_cpp_plugin is needed to build falcosecurity libs, so we give the host +# one there. +SYSDIG_CONF_OPTS += -DFALCOSECURITY_LIBS_SOURCE_DIR=$(FALCOSECURITY_LIBS_SRCDIR) \ + -DBUILD_DRIVER=OFF \ + -DGRPC_CPP_PLUGIN=$(HOST_DIR)/bin/grpc_cpp_plugin \ + -DDRIVER_NAME=$(FALCOSECURITY_LIBS_DRIVER_NAME) \ + -DENABLE_DKMS=OFF \ + -DUSE_BUNDLED_DEPS=OFF \ + -DWITH_CHISEL=ON \ + -DVALIJSON_INCLUDE=$(BUILD_DIR)/valijson-0.6/include/valijson \ + -DSYSDIG_VERSION=$(SYSDIG_VERSION) -# Don't build the driver as part of the 'standard' procedure, we'll -# build it on our own with the kernel-module infra. -SYSDIG_CONF_OPTS += -DBUILD_DRIVER=OFF - -SYSDIG_MODULE_SUBDIRS = driver -SYSDIG_MODULE_MAKE_OPTS = KERNELDIR=$(LINUX_DIR) - -$(eval $(kernel-module)) $(eval $(cmake-package)) diff --git a/package/sysklogd/sysklogd.hash b/package/sysklogd/sysklogd.hash index 19405a98771..e370716bd93 100644 --- a/package/sysklogd/sysklogd.hash +++ b/package/sysklogd/sysklogd.hash @@ -1,5 +1,5 @@ # Upstream .sha256 from GitHub -sha256 9a410b484713d9600c820d8113f2d80cb14708328c908b1a28e8b7b31fd54f57 sysklogd-2.3.0.tar.gz +sha256 01f25931d1508c3e6be4e182f49356c993abc7d035d5835db35f9b61d5085549 sysklogd-2.4.4.tar.gz # Locally calculated sha256 7a71d7603a7c4456df441463e54da35acf151c1be0879246de63544f1f34f477 LICENSE diff --git a/package/sysklogd/sysklogd.mk b/package/sysklogd/sysklogd.mk index 20ce9d60e3d..68023c9ae20 100644 --- a/package/sysklogd/sysklogd.mk +++ b/package/sysklogd/sysklogd.mk @@ -4,10 +4,11 @@ # ################################################################################ -SYSKLOGD_VERSION = 2.3.0 +SYSKLOGD_VERSION = 2.4.4 SYSKLOGD_SITE = https://github.com/troglobit/sysklogd/releases/download/v$(SYSKLOGD_VERSION) SYSKLOGD_LICENSE = BSD-3-Clause SYSKLOGD_LICENSE_FILES = LICENSE +SYSKLOGD_INSTALL_STAGING = YES SYSKLOGD_CPE_ID_VENDOR = sysklogd_project # Busybox install logger in /usr/bin, and syslogd in /sbin, so install in diff --git a/package/syslog-ng/syslog-ng.conf b/package/syslog-ng/syslog-ng.conf index 55d01501cb8..69db9b4b78b 100644 --- a/package/syslog-ng/syslog-ng.conf +++ b/package/syslog-ng/syslog-ng.conf @@ -1,4 +1,4 @@ -@version: 3.34 +@version: 3.38 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 99ed363eca4..6fce7be9969 100644 --- a/package/syslog-ng/syslog-ng.hash +++ b/package/syslog-ng/syslog-ng.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 cece39ec1c68c88d493705e0a528b83d038da384e89d4838393ccc75f62a2d4c syslog-ng-3.34.1.tar.gz -sha256 e912cf1e1c09b81d61c0154eb6c179588622c31ad07bfb4a90c612d07ff09d9b COPYING +sha256 5491f686d0b829b69b2e0fc0d66a62f51991aafaee005475bfa38fab399441f7 syslog-ng-3.38.1.tar.gz +sha256 c75dcbfc17ccf742f12042a370f825a40951085d2352dfc9d07e715dae3ca9bd 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 c05ec9785c4..a7176ad1295 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 = 3.34.1 +SYSLOG_NG_VERSION = 3.38.1 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 @@ -17,6 +17,13 @@ SYSLOG_NG_DEPENDENCIES = host-bison host-flex host-pkgconf \ SYSLOG_NG_AUTORECONF = YES SYSLOG_NG_CONF_OPTS = --disable-manpages --localstatedir=/var/run \ --disable-java --disable-java-modules --disable-mongodb +SYSLOG_NG_CFLAGS = $(TARGET_CFLAGS) + +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_101915),y) +SYSLOG_NG_CFLAGS += -O0 +endif + +SYSLOG_NG_CONF_ENV = CFLAGS="$(SYSLOG_NG_CFLAGS)" ifeq ($(BR2_PACKAGE_GEOIP),y) SYSLOG_NG_DEPENDENCIES += geoip diff --git a/package/sysrepo/0001-sysrepo-BUGFIX-build-with-musl-libc-fails-due-to-unk.patch b/package/sysrepo/0001-sysrepo-BUGFIX-build-with-musl-libc-fails-due-to-unk.patch deleted file mode 100644 index 784cfb14454..00000000000 --- a/package/sysrepo/0001-sysrepo-BUGFIX-build-with-musl-libc-fails-due-to-unk.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 896dc6aee38898fe1c6822ee6a4a4989d21c650b Mon Sep 17 00:00:00 2001 -From: Heiko Thiery -Date: Thu, 25 Nov 2021 12:18:06 +0100 -Subject: [PATCH] sysrepo BUGFIX build with musl libc fails due to unknown type - name 'mode_t' - -When building against the musl libc the build will fail due to the -missing sys/type.h include. - -Signed-off-by: Heiko Thiery ---- - src/plugins_datastore.h | 1 + - src/plugins_notification.h | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/src/plugins_datastore.h b/src/plugins_datastore.h -index a64e4131..d577e929 100644 ---- a/src/plugins_datastore.h -+++ b/src/plugins_datastore.h -@@ -18,6 +18,7 @@ - #define _SYSREPO_PLUGINS_DATASTORE_H - - #include -+#include - - #include - -diff --git a/src/plugins_notification.h b/src/plugins_notification.h -index 2099db62..f410e8d9 100644 ---- a/src/plugins_notification.h -+++ b/src/plugins_notification.h -@@ -18,6 +18,7 @@ - #define _SYSREPO_PLUGINS_NOTIFICATION_H - - #include -+#include - - #include - --- -2.30.2 - diff --git a/package/sysrepo/sysrepo.hash b/package/sysrepo/sysrepo.hash index b382c160360..6a5e98f41bb 100644 --- a/package/sysrepo/sysrepo.hash +++ b/package/sysrepo/sysrepo.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 fe09da5f40fb53e3fb97268a134cc0ed3003f0018d0d117c73e81e1553a11f30 sysrepo-2.0.53.tar.gz +sha256 bebb7901682eb23bf4c73d086d0a45c124ec751a67793a66024f1d4203425730 sysrepo-2.2.36.tar.gz sha256 88f1b7e5c64d2c113e07105aa9c0fb80639b40287565be1c2afd0949df83d826 LICENSE diff --git a/package/sysrepo/sysrepo.mk b/package/sysrepo/sysrepo.mk index acb30520239..6b031ae6f9e 100644 --- a/package/sysrepo/sysrepo.mk +++ b/package/sysrepo/sysrepo.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSREPO_VERSION = 2.0.53 +SYSREPO_VERSION = 2.2.36 SYSREPO_SITE = $(call github,sysrepo,sysrepo,v$(SYSREPO_VERSION)) SYSREPO_INSTALL_STAGING = YES SYSREPO_LICENSE = BSD-3-Clause @@ -12,6 +12,10 @@ SYSREPO_LICENSE_FILES = LICENSE SYSREPO_DEPENDENCIES = libyang pcre2 host-sysrepo HOST_SYSREPO_DEPENDENCIES = host-libyang host-pcre2 +ifeq ($(BR2_INIT_SYSTEMD),y) +SYSREPO_DEPENDENCIES += systemd +endif + SYSREPO_CONF_OPTS = \ -DBUILD_EXAMPLES=$(if $(BR2_PACKAGE_SYSREPO_EXAMPLES),ON,OFF) \ -DENABLE_TESTS=OFF \ diff --git a/package/sysstat/sysstat.hash b/package/sysstat/sysstat.hash index b573f312c6d..b47f000e57f 100644 --- a/package/sysstat/sysstat.hash +++ b/package/sysstat/sysstat.hash @@ -1,5 +1,5 @@ # From: http://sebastien.godard.pagesperso-orange.fr/download.html -sha1 1e38bc029979def730ae1fb1e39f631bd1a3bc73 sysstat-12.4.2.tar.xz +sha1 a730982e0c2d4964a0022c1509f3ea0a345402bc sysstat-12.6.1.tar.xz # Locally calculated -sha256 3701b2c1883d50eb384d7b95ce5b6df0a71fdcb3c23f96cb58098d1bcffa018f sysstat-12.4.2.tar.xz +sha256 18ff5a4e149e2568e43385637f72437fe6bafcc1322a93d13d1981e9464a0342 sysstat-12.6.1.tar.xz sha256 db296f2f7f35bca3a174efb0eb392b3b17bd94b341851429a3dff411b1c2fc73 COPYING diff --git a/package/sysstat/sysstat.mk b/package/sysstat/sysstat.mk index 6948f6b3906..377396d986b 100644 --- a/package/sysstat/sysstat.mk +++ b/package/sysstat/sysstat.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSSTAT_VERSION = 12.4.2 +SYSSTAT_VERSION = 12.6.1 SYSSTAT_SOURCE = sysstat-$(SYSSTAT_VERSION).tar.xz SYSSTAT_SITE = http://pagesperso-orange.fr/sebastien.godard SYSSTAT_CONF_OPTS = --disable-file-attr diff --git a/package/systemd/0001-missing-syscall-define-MOVE_MOUNT_T_EMPTY_PATH-if-mi.patch b/package/systemd/0001-missing-syscall-define-MOVE_MOUNT_T_EMPTY_PATH-if-mi.patch deleted file mode 100644 index 0934886acb3..00000000000 --- a/package/systemd/0001-missing-syscall-define-MOVE_MOUNT_T_EMPTY_PATH-if-mi.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 16c132a6a0389e0eaea70c4ad95dbfd1637ec5ba Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 7 Jan 2022 22:25:23 +0100 -Subject: [PATCH] missing-syscall: define MOVE_MOUNT_T_EMPTY_PATH if missing - -MOVE_MOUNT_T_EMPTY_PATH has been added to systemd 250 by [1] -but it's defined in kernel headers since version 5.2. - -[1] c7bf079bbc19e3b409acc0c7acc3e14749211fe2 - -Signed-off-by: Romain Naour ---- - src/basic/missing_syscall.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h -index 8267b1a90c..793d111c55 100644 ---- a/src/basic/missing_syscall.h -+++ b/src/basic/missing_syscall.h -@@ -569,6 +569,10 @@ static inline int missing_open_tree( - #define MOVE_MOUNT_F_EMPTY_PATH 0x00000004 /* Empty from path permitted */ - #endif - -+#ifndef MOVE_MOUNT_T_EMPTY_PATH -+#define MOVE_MOUNT_T_EMPTY_PATH 0x00000040 /* Empty to path permitted */ -+#endif -+ - static inline int missing_move_mount( - int from_dfd, - const char *from_pathname, --- -2.31.1 - diff --git a/package/systemd/Config.in b/package/systemd/Config.in index cc0736561e1..bea717a4560 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -22,11 +22,11 @@ menuconfig BR2_PACKAGE_SYSTEMD depends on !BR2_STATIC_LIBS # kmod depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_TOOLCHAIN_HAS_SSP - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13 + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 depends on BR2_HOST_GCC_AT_LEAST_5 # host-systemd select BR2_PACKAGE_HAS_UDEV - select BR2_PACKAGE_DBUS # runtime dependency only + select BR2_PACKAGE_DBUS if !BR2_PACKAGE_DBUS_BROKER # runtime select BR2_PACKAGE_LIBCAP select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBS @@ -51,7 +51,11 @@ menuconfig BR2_PACKAGE_SYSTEMD an elaborate transactional dependency-based service control logic. It can work as a drop-in replacement for sysvinit. - Systemd requires a Linux kernel >= 3.13 with the following + Kernel versions below 4.15 ("recommended baseline") have + significant gaps in functionality and are not recommended + for use with this version of systemd. + + Systemd requires a Linux kernel >= 3.15 with the following options enabled: - CONFIG_DEVTMPFS @@ -66,9 +70,11 @@ menuconfig BR2_PACKAGE_SYSTEMD - CONFIG_PROC_FS - CONFIG_FHANDLE (libudev, mount and bind mount handling) - - CONFIG_NET_NS (needed by PrivateNetwork=, used in some + - CONFIG_NET_NS (Required for PrivateNetwork=, used in some systemd units) + - CONFIG_USER_NS (Required for PrivateUsers=) + - CONFIG_AUTOFS_FS / CONFIG_AUTOFS4_FS - CONFIG_TMPFS_POSIX_ACL - CONFIG_TMPFS_XATTR @@ -94,7 +100,7 @@ menuconfig BR2_PACKAGE_SYSTEMD the apropriate ones (e.g. e2fsck, from the e2fsprogs package) according to the system configuration. - http://freedesktop.org/wiki/Software/systemd + https://freedesktop.org/wiki/Software/systemd/ if BR2_PACKAGE_SYSTEMD @@ -179,7 +185,7 @@ config BR2_PACKAGE_SYSTEMD_BACKLIGHT systemd-backlight is a service that restores the display backlight brightness at early boot and saves it at shutdown. - http://www.freedesktop.org/software/systemd/man/systemd-backlight@.service.html + https://www.freedesktop.org/software/systemd/man/systemd-backlight@.service.html config BR2_PACKAGE_SYSTEMD_BINFMT bool "enable binfmt tool" @@ -196,7 +202,7 @@ config BR2_PACKAGE_SYSTEMD_COREDUMP kernel when a user space program receives a fatal signal and dumps core. - http://www.freedesktop.org/software/systemd/man/systemd-coredump.html + https://www.freedesktop.org/software/systemd/man/systemd-coredump.html config BR2_PACKAGE_SYSTEMD_PSTORE bool "enable pstore support" @@ -214,7 +220,7 @@ config BR2_PACKAGE_SYSTEMD_FIRSTBOOT systemd-firstboot initializes the most basic system settings interactively on the first boot. - http://www.freedesktop.org/software/systemd/man/systemd-firstboot.html + https://www.freedesktop.org/software/systemd/man/systemd-firstboot.html config BR2_PACKAGE_SYSTEMD_HIBERNATE bool "enable hibernation support" @@ -223,7 +229,7 @@ config BR2_PACKAGE_SYSTEMD_HIBERNATE When this features is enabled, additional tools and services are built to support suspending and resuming the system. - http://www.freedesktop.org/software/systemd/man/systemd-sleep.html + https://www.freedesktop.org/software/systemd/man/systemd-sleep.html config BR2_PACKAGE_SYSTEMD_HOMED bool "enable home daemon" @@ -234,6 +240,7 @@ config BR2_PACKAGE_SYSTEMD_HOMED depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 # fscrypt_key select BR2_PACKAGE_CRYPTSETUP select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL select BR2_PACKAGE_UTIL_LINUX_LIBFDISK help systemd-homed is a system service that may be used to create, @@ -254,7 +261,7 @@ config BR2_PACKAGE_SYSTEMD_HOSTNAMED systemd-hostnamed is a system service that may be used as a mechanism to change the system's hostname. - http://www.freedesktop.org/software/systemd/man/systemd-hostnamed.service.html + https://www.freedesktop.org/software/systemd/man/systemd-hostnamed.service.html config BR2_PACKAGE_SYSTEMD_HWDB bool "enable hwdb installation" @@ -279,7 +286,7 @@ config BR2_PACKAGE_SYSTEMD_IMPORTD machine and container images for systemd-machined and machinectl. - http://www.freedesktop.org/software/systemd/man/machinectl.html#Image%20Transfer%20Commands + https://www.freedesktop.org/software/systemd/man/machinectl.html#Image%20Transfer%20Commands config BR2_PACKAGE_SYSTEMD_CATALOGDB bool "enable journal catalog database installation" @@ -302,14 +309,14 @@ config BR2_PACKAGE_SYSTEMD_LOCALED mechanism to change the system locale settings, as well as the console key mapping and default X11 key mapping. - http://www.freedesktop.org/software/systemd/man/systemd-localed.service.html + https://www.freedesktop.org/software/systemd/man/systemd-localed.service.html config BR2_PACKAGE_SYSTEMD_LOGIND bool "enable login daemon" help systemd-logind is a system service that manages user logins. - http://www.freedesktop.org/software/systemd/man/systemd-logind.service.html + https://www.freedesktop.org/software/systemd/man/systemd-logind.service.html config BR2_PACKAGE_SYSTEMD_MACHINED bool "enable machine daemon" @@ -318,7 +325,7 @@ config BR2_PACKAGE_SYSTEMD_MACHINED virtual machines and containers, and processes belonging to them. - http://www.freedesktop.org/software/systemd/man/systemd-machined.service.html + https://www.freedesktop.org/software/systemd/man/systemd-machined.service.html config BR2_PACKAGE_SYSTEMD_MYHOSTNAME bool "enable myhostname NSS plugin" @@ -329,7 +336,7 @@ config BR2_PACKAGE_SYSTEMD_MYHOSTNAME primarily providing hostname resolution for the locally configured system hostname as returned by gethostname(2). - http://www.freedesktop.org/software/systemd/man/nss-myhostname.html + https://www.freedesktop.org/software/systemd/man/nss-myhostname.html config BR2_PACKAGE_SYSTEMD_NETWORKD bool "enable network manager" @@ -342,7 +349,7 @@ config BR2_PACKAGE_SYSTEMD_NETWORKD This simple network configuration solution is an alternative to dhcpcd or ISC dhcp. - http://www.freedesktop.org/software/systemd/man/systemd-networkd.html + https://www.freedesktop.org/software/systemd/man/systemd-networkd.html config BR2_PACKAGE_SYSTEMD_OOMD bool "enable out-of-memory killer" @@ -358,6 +365,7 @@ config BR2_PACKAGE_SYSTEMD_POLKIT depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # polkit -> c++17 depends on BR2_TOOLCHAIN_HAS_THREADS # polkit depends on BR2_USE_WCHAR # libglib2 + depends on !BR2_OPTIMIZE_FAST # polkit -> duktape select BR2_PACKAGE_POLKIT help If enabled, systemd is built with polkit support and policy @@ -365,12 +373,15 @@ config BR2_PACKAGE_SYSTEMD_POLKIT useful for allowing unprivileged processes to speak to systemd's many privileged processes. - http://wiki.freedesktop.org/www/Software/polkit/ + https://wiki.freedesktop.org/www/Software/polkit/ comment "polkit support needs a toolchain with threads, wchar, gcc >= 7" depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ !BR2_TOOLCHAIN_HAS_THREADS +comment "polkit support can't be built with Optimize for fast" + depends on BR2_OPTIMIZE_FAST + config BR2_PACKAGE_SYSTEMD_PORTABLED bool "enable portable services" help @@ -397,7 +408,7 @@ config BR2_PACKAGE_SYSTEMD_QUOTACHECK file systems are mounted. It is pulled in only if at least one file system has quotas enabled. - http://www.freedesktop.org/software/systemd/man/systemd-quotacheck.service.html + https://www.freedesktop.org/software/systemd/man/systemd-quotacheck.service.html config BR2_PACKAGE_SYSTEMD_RANDOMSEED bool "enable random-seed support" @@ -407,11 +418,12 @@ config BR2_PACKAGE_SYSTEMD_RANDOMSEED shutdown. Saving/restoring the random seed across boots increases the amount of available entropy early at boot. - http://www.freedesktop.org/software/systemd/man/systemd-random-seed.service.html + https://www.freedesktop.org/software/systemd/man/systemd-random-seed.service.html config BR2_PACKAGE_SYSTEMD_REPART bool "enable repart support" select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL select BR2_PACKAGE_UTIL_LINUX_LIBFDISK help systemd-repart grows and adds partitions to a partition table, @@ -428,7 +440,7 @@ config BR2_PACKAGE_SYSTEMD_RESOLVED caching and validating DNS/DNSSEC stub resolver, as well as an LLMNR resolver and responder. - http://www.freedesktop.org/software/systemd/man/systemd-resolved.html + https://www.freedesktop.org/software/systemd/man/systemd-resolved.html config BR2_PACKAGE_SYSTEMD_RFKILL bool "enable rfkill tools" @@ -436,7 +448,7 @@ config BR2_PACKAGE_SYSTEMD_RFKILL systemd-rfkill is a service that restores the RF kill switch state at early boot and saves it at shutdown. - http://www.freedesktop.org/software/systemd/man/systemd-rfkill@.service.html + https://www.freedesktop.org/software/systemd/man/systemd-rfkill.service.html config BR2_PACKAGE_SYSTEMD_SMACK_SUPPORT bool "enable SMACK support" @@ -469,13 +481,29 @@ config BR2_PACKAGE_SYSTEMD_SYSEXT https://www.freedesktop.org/software/systemd/man/systemd-sysext.html +config BR2_PACKAGE_SYSTEMD_SYSUPDATE + bool "enable sysupdate support" + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL + select BR2_PACKAGE_UTIL_LINUX_LIBFDISK + help + systemd-sysupdate atomically updates the host OS, container + images, portable service images or other sources, based on + the transfer configuration files described in sysupdate.d. + + Note that the bootloader must be configured specifically to + support the A/B update mechanism defined by sysupdate. Only + systemd-boot does this out of the box. + + https://www.freedesktop.org/software/systemd/man/systemd-sysupdate.html + config BR2_PACKAGE_SYSTEMD_SYSUSERS bool "enable sysusers support" help systemd-sysusers creates system users and groups, based on the file format and location specified in sysusers.d(5). - http://www.freedesktop.org/software/systemd/man/systemd-sysusers.html + https://www.freedesktop.org/software/systemd/man/systemd-sysusers.html config BR2_PACKAGE_SYSTEMD_TIMEDATED bool "enable timedate daemon" @@ -485,7 +513,7 @@ config BR2_PACKAGE_SYSTEMD_TIMEDATED mechanism to change the system clock and timezone, as well as to enable/disable NTP time synchronization. - http://www.freedesktop.org/software/systemd/man/systemd-timedated.service.html + https://www.freedesktop.org/software/systemd/man/systemd-timedated.service.html config BR2_PACKAGE_SYSTEMD_TIMESYNCD bool "enable timesync daemon" @@ -498,7 +526,7 @@ config BR2_PACKAGE_SYSTEMD_TIMESYNCD This simple NTP solution is an alternative to sntp/ntpd from the ntp package. - http://www.freedesktop.org/software/systemd/man/systemd-timesyncd.html + https://www.freedesktop.org/software/systemd/man/systemd-timesyncd.html config BR2_PACKAGE_SYSTEMD_USERDB bool "enable userdb daemon" @@ -512,6 +540,26 @@ config BR2_PACKAGE_SYSTEMD_USERDB https://www.freedesktop.org/software/systemd/man/systemd-userdbd.service.html +config BR2_PACKAGE_SYSTEMD_UTMP + bool "enable utmp support" + help + systemd-update-utmp-runlevel.service is a service that writes + SysV runlevel changes to utmp and wtmp, as well as the audit + logs, as they occur. systemd-update-utmp.service does the + same for system reboots and shutdown requests. + + https://www.freedesktop.org/software/systemd/man/systemd-update-utmp.service.html + + Utmp keeps track of what users do on the system (where they + logged from, on which terminal, ...) along with a general + status of the system (list of reboots, current uptime, current + number of users logged in). + + You should only enable this if your system will have actual + users who log in. + + https://man7.org/linux/man-pages/man5/utmp.5.html + config BR2_PACKAGE_SYSTEMD_VCONSOLE bool "enable vconsole tool" default y @@ -519,6 +567,6 @@ config BR2_PACKAGE_SYSTEMD_VCONSOLE systemd-vconsole-setup is an early boot service that configures the virtual console font and console keymap. - http://www.freedesktop.org/software/systemd/man/systemd-vconsole-setup.service.html + https://www.freedesktop.org/software/systemd/man/systemd-vconsole-setup.service.html endif diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash index 81f51eac206..00c08edcd96 100644 --- a/package/systemd/systemd.hash +++ b/package/systemd/systemd.hash @@ -1,5 +1,5 @@ # sha256 locally computed -sha256 87b0eee7b6e5aaab2ab56d158f9536daa6bfd5de011f2a5fc6ccdd81ee1e7a24 systemd-250.3.tar.gz +sha256 cf2d27e67663d599a045101c7178cf0ec63d9df2962a54adf7de0d0357724f00 systemd-252.4.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 sha256 e5a8645ad94aab24e312dd0c6be2aa54236eb9374480b1b14ea5c61598874fd5 LICENSES/BSD-2-Clause.txt @@ -8,7 +8,8 @@ sha256 a2010f343487d3f7618affe54f789f5487602331c0a8d03f49e9a7c547cf0499 LICENS sha256 61778e80a2fd85955b626b29aa2bcf06144c714277bded65633e4a81479d9fb3 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 11801e931f252252a16eac8299465510d0a82c36bfd9ac8aea9b202b76d2f82b LICENSES/README.md +sha256 da9b2c7b8cd10516fd2c4279b82496ea61787148f13e899c62fc8988c5fac34f LICENSES/README.md diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index b07fac27d4a..d2352568679 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 = 250.3 +SYSTEMD_VERSION = 252.4 SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) SYSTEMD_LICENSE = \ LGPL-2.1+, \ @@ -29,6 +29,7 @@ SYSTEMD_LICENSE = \ BSD-3-Clause (tools/chromiumos), \ CC0-1.0 (few source files, see LICENSES/README.md), \ GPL-2.0 with Linux-syscall-note (linux kernel headers), \ + MIT-0 (few source files, see LICENSES/README.md), \ MIT (few source files, see LICENSES/README.md), \ OFL-1.1 (Heebo fonts) SYSTEMD_LICENSE_FILES = \ @@ -40,11 +41,12 @@ SYSTEMD_LICENSE_FILES = \ LICENSES/LGPL-2.0-or-later.txt \ LICENSES/Linux-syscall-note.txt \ LICENSES/lookup3-public-domain.txt \ + LICENSES/MIT-0.txt \ LICENSES/MIT.txt \ LICENSES/murmurhash2-public-domain.txt \ LICENSES/OFL-1.1.txt \ LICENSES/README.md -SYSTEMD_CPE_ID_VENDOR = freedesktop +SYSTEMD_CPE_ID_VENDOR = systemd_project SYSTEMD_INSTALL_STAGING = YES SYSTEMD_DEPENDENCIES = \ $(BR2_COREUTILS_HOST_DEPENDENCY) \ @@ -61,7 +63,13 @@ SYSTEMD_SELINUX_MODULES = systemd udev xdg SYSTEMD_PROVIDES = udev SYSTEMD_CONF_OPTS += \ + -Ddbus=false \ + -Ddbus-interfaces-dir=no \ + -Ddefault-compression='auto' \ -Ddefault-hierarchy=unified \ + -Ddefault-locale='C.UTF-8' \ + -Ddefault-user-shell=/bin/sh \ + -Dfirst-boot-full-preset=false \ -Didn=true \ -Dima=false \ -Dkexec-path=/usr/sbin/kexec \ @@ -72,6 +80,7 @@ SYSTEMD_CONF_OPTS += \ -Dman=false \ -Dmount-path=/usr/bin/mount \ -Dmode=release \ + -Dnspawn-locale='C.UTF-8' \ -Dnss-systemd=true \ -Dquotacheck-path=/usr/sbin/quotacheck \ -Dquotaon-path=/usr/sbin/quotaon \ @@ -87,8 +96,12 @@ SYSTEMD_CONF_OPTS += \ -Dtelinit-path= \ -Dtests=false \ -Dtmpfiles=true \ - -Dumount-path=/usr/bin/umount \ - -Dutmp=false + -Dumount-path=/usr/bin/umount + +SYSTEMD_CFLAGS = $(TARGET_CFLAGS) +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 @@ -232,9 +245,9 @@ endif ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) SYSTEMD_DEPENDENCIES += libgcrypt -SYSTEMD_CONF_OPTS += -Ddefault-dnssec=allow-downgrade -Dgcrypt=true +SYSTEMD_CONF_OPTS += -Dgcrypt=true else -SYSTEMD_CONF_OPTS += -Ddefault-dnssec=no -Dgcrypt=false +SYSTEMD_CONF_OPTS += -Dgcrypt=false endif ifeq ($(BR2_PACKAGE_P11_KIT),y) @@ -304,16 +317,24 @@ else SYSTEMD_CONF_OPTS += -Dselinux=false endif +ifneq ($(BR2_PACKAGE_LIBGCRYPT)$(BR2_PACKAGE_LIBOPENSSL),) +SYSTEMD_CONF_OPTS += -Ddefault-dnssec=allow-downgrade +else +SYSTEMD_CONF_OPTS += -Ddefault-dnssec=no +endif + ifeq ($(BR2_PACKAGE_SYSTEMD_HWDB),y) SYSTEMD_CONF_OPTS += -Dhwdb=true define SYSTEMD_BUILD_HWDB - $(HOST_DIR)/bin/udevadm hwdb --update --root $(TARGET_DIR) + $(HOST_DIR)/bin/systemd-hwdb update --root $(TARGET_DIR) --strict --usr endef SYSTEMD_TARGET_FINALIZE_HOOKS += SYSTEMD_BUILD_HWDB -define SYSTEMD_RM_HWDB_SRV - rm -rf $(TARGET_DIR)/$(HOST_EUDEV_SYSCONFDIR)/udev/hwdb.d/ +define SYSTEMD_RM_HWBD_UPDATE_SERVICE + rm -rf $(TARGET_DIR)/usr/lib/systemd/system/systemd-hwdb-update.service \ + $(TARGET_DIR)/usr/lib/systemd/system/*/systemd-hwdb-update.service \ + $(TARGET_DIR)/usr/bin/systemd-hwdb endef -SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_RM_HWDB_SRV +SYSTEMD_POST_INSTALL_TARGET_HOOKS += SYSTEMD_RM_HWBD_UPDATE_SERVICE else SYSTEMD_CONF_OPTS += -Dhwdb=false endif @@ -324,6 +345,12 @@ else SYSTEMD_CONF_OPTS += -Dbinfmt=false endif +ifeq ($(BR2_PACKAGE_SYSTEMD_UTMP),y) +SYSTEMD_CONF_OPTS += -Dutmp=true +else +SYSTEMD_CONF_OPTS += -Dutmp=false +endif + ifeq ($(BR2_PACKAGE_SYSTEMD_VCONSOLE),y) SYSTEMD_CONF_OPTS += -Dvconsole=true else @@ -472,6 +499,12 @@ else SYSTEMD_CONF_OPTS += -Dsysext=false endif +ifeq ($(BR2_PACKAGE_SYSTEMD_SYSUPDATE),y) +SYSTEMD_CONF_OPTS += -Dsysupdate=true +else +SYSTEMD_CONF_OPTS += -Dsysupdate=false +endif + ifeq ($(BR2_PACKAGE_SYSTEMD_NETWORKD),y) SYSTEMD_CONF_OPTS += -Dnetworkd=true SYSTEMD_NETWORKD_USER = systemd-network -1 systemd-network -1 * - - - systemd Network Management @@ -498,7 +531,7 @@ else SYSTEMD_CONF_OPTS += -Dnss-resolve=false -Dresolve=false endif -ifeq ($(BR2_PACKAGE_OPENSSL),y) +ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) SYSTEMD_CONF_OPTS += \ -Dgnutls=false \ -Dopenssl=true \ @@ -546,7 +579,6 @@ SYSTEMD_DEPENDENCIES += gnu-efi SYSTEMD_CONF_OPTS += \ -Defi=true \ -Dgnu-efi=true \ - -Defi-cc=$(TARGET_CC) \ -Defi-ld=bfd \ -Defi-libdir=$(STAGING_DIR)/usr/lib \ -Defi-includedir=$(STAGING_DIR)/usr/include/efi @@ -570,17 +602,20 @@ ifneq ($(SYSTEMD_FALLBACK_HOSTNAME),) SYSTEMD_CONF_OPTS += -Dfallback-hostname=$(SYSTEMD_FALLBACK_HOSTNAME) endif +SYSTEMD_DEFAULT_TARGET = $(call qstrip,$(BR2_PACKAGE_SYSTEMD_DEFAULT_TARGET)) +ifneq ($(SYSTEMD_DEFAULT_TARGET),) define SYSTEMD_INSTALL_INIT_HOOK - ln -fs multi-user.target \ + ln -fs "$(SYSTEMD_DEFAULT_TARGET)" \ $(TARGET_DIR)/usr/lib/systemd/system/default.target endef +SYSTEMD_POST_INSTALL_TARGET_HOOKS += SYSTEMD_INSTALL_INIT_HOOK +endif define SYSTEMD_INSTALL_MACHINEID_HOOK touch $(TARGET_DIR)/etc/machine-id endef SYSTEMD_POST_INSTALL_TARGET_HOOKS += \ - SYSTEMD_INSTALL_INIT_HOOK \ SYSTEMD_INSTALL_MACHINEID_HOOK define SYSTEMD_INSTALL_IMAGES_CMDS @@ -603,6 +638,8 @@ endef define SYSTEMD_USERS # udev user groups + - - render -1 * - - - DRI rendering nodes + - - sgx -1 * - - - SGX device nodes # systemd user groups - - systemd-journal -1 * - - - Journal $(SYSTEMD_REMOTE_USER) @@ -633,9 +670,9 @@ SYSTEMD_TARGET_FINALIZE_HOOKS += \ SYSTEMD_INSTALL_RESOLVCONF_HOOK ifneq ($(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT)),) -# systemd provides multiple units to autospawn getty as neede +# systemd provides multiple units to autospawn getty as needed # * getty@.service to start a getty on normal TTY -# * sertial-getty@.service to start a getty on serial lines +# * serial-getty@.service to start a getty on serial lines # * console-getty.service for generic /dev/console # * container-getty@.service for a getty on /dev/pts/* # @@ -643,18 +680,18 @@ ifneq ($(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT)),) # * read the console= kernel command line parameter # * enable one of the above units depending on what it finds # -# Systemd defaults to enablinb getty@tty1.service +# Systemd defaults to enabling getty@tty1.service # # What we want to do -# * Enable a getty on $BR2_TARGET_GENERIC_TTY_PATH +# * Enable a getty on $BR2_TARGET_GENERIC_GETTY_PORT # * Set the baudrate for all units according to BR2_TARGET_GENERIC_GETTY_BAUDRATE # * Always enable a getty on the console using systemd-getty-generator # (backward compatibility with previous releases of buildroot) # # What we do # * disable getty@tty1 (enabled by upstream systemd) -# * enable getty@xxx if $BR2_TARGET_GENERIC_TTY_PATH is a tty -# * enable serial-getty@xxx for other $BR2_TARGET_GENERIC_TTY_PATH +# * enable getty@xxx if $BR2_TARGET_GENERIC_GETTY_PORT is a tty +# * enable serial-getty@xxx for other $BR2_TARGET_GENERIC_GETTY_PORT # * rewrite baudrates if a baudrate is provided define SYSTEMD_INSTALL_SERVICE_TTY mkdir -p $(TARGET_DIR)/usr/lib/systemd/system/getty@.service.d; \ @@ -732,12 +769,6 @@ define SYSTEMD_RM_CATALOG_UPDATE_SERVICE endef SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_RM_CATALOG_UPDATE_SERVICE -define SYSTEMD_CREATE_TMPFILES_HOOK - HOST_SYSTEMD_TMPFILES=$(HOST_DIR)/bin/systemd-tmpfiles \ - $(SYSTEMD_PKGDIR)/fakeroot_tmpfiles.sh $(TARGET_DIR) -endef -SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SYSTEMD_CREATE_TMPFILES_HOOK - define SYSTEMD_PRESET_ALL $(HOST_DIR)/bin/systemctl --root=$(TARGET_DIR) preset-all endef @@ -787,6 +818,8 @@ HOST_SYSTEMD_CONF_OPTS = \ -Dbinfmt=false \ -Drepart=false \ -Dcoredump=false \ + -Ddbus=false \ + -Ddbus-interfaces-dir=no \ -Dpstore=false \ -Doomd=false \ -Dlogind=false \ @@ -795,6 +828,7 @@ HOST_SYSTEMD_CONF_OPTS = \ -Dmachined=false \ -Dportabled=false \ -Dsysext=false \ + -Dsysupdate=false \ -Duserdb=false \ -Dhomed=false \ -Dnetworkd=false \ @@ -814,7 +848,7 @@ HOST_SYSTEMD_CONF_OPTS = \ -Dsysusers=false \ -Dtmpfiles=true \ -Dimportd=false \ - -Dhwdb=false \ + -Dhwdb=true \ -Drfkill=false \ -Dman=false \ -Dhtml=false \ diff --git a/package/sysvinit/sysvinit.hash b/package/sysvinit/sysvinit.hash index 5b3c7837e2f..f81e55fc446 100644 --- a/package/sysvinit/sysvinit.hash +++ b/package/sysvinit/sysvinit.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 b05c3677bb698afe64c997968b00c49b2a9bd320ce963523230ee7ea41197757 sysvinit-2.99.tar.xz +sha256 b05c3677bb698afe64c997968b00c49b2a9bd320ce963523230ee7ea41197757 sysvinit-2.99.tar.xz # Hash for license files: -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/szip/szip.hash b/package/szip/szip.hash index 3b582d901d2..5d3ee042f95 100644 --- a/package/szip/szip.hash +++ b/package/szip/szip.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 21ee958b4f2d4be2c9cabfa5e1a94877043609ce86fde5f286f105f7ff84d412 szip-2.1.1.tar.gz -sha256 98cc66747133b26563fefc4630ad4c8c7848c722c7b8a60ecd4afbc4c7d7eb01 COPYING +sha256 21ee958b4f2d4be2c9cabfa5e1a94877043609ce86fde5f286f105f7ff84d412 szip-2.1.1.tar.gz +sha256 98cc66747133b26563fefc4630ad4c8c7848c722c7b8a60ecd4afbc4c7d7eb01 COPYING diff --git a/package/taglib/0001-Fix-error-duplicate-volatile-on-systems-without-HAVE_GCC_ATOMIC.patch b/package/taglib/0001-Fix-error-duplicate-volatile-on-systems-without-HAVE_GCC_ATOMIC.patch deleted file mode 100644 index d8af73cb083..00000000000 --- a/package/taglib/0001-Fix-error-duplicate-volatile-on-systems-without-HAVE_GCC_ATOMIC.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 1d24bd3399f2284104cbe87d017f87325b1797ab Mon Sep 17 00:00:00 2001 -From: Oleg Antonyan -Date: Thu, 13 May 2021 16:41:35 +0200 -Subject: [PATCH] =?UTF-8?q?Fix=20"error:=20duplicate=20=E2=80=98volatile?= - =?UTF-8?q?=E2=80=99"=20on=20systems=20without=20HAVE=5FGCC=5FATOMIC=20in?= - =?UTF-8?q?=201.12=20(#1012)?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -* fix error: duplicate volatile - -* fix volatile ATOMIC_INT in constructor - -[Retrieved from: -https://github.com/taglib/taglib/commit/1d24bd3399f2284104cbe87d017f87325b1797ab] -Signed-off-by: Fabrice Fontaine ---- - taglib/toolkit/trefcounter.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/taglib/toolkit/trefcounter.cpp b/taglib/toolkit/trefcounter.cpp -index 18cb596c0..5b089abf9 100644 ---- a/taglib/toolkit/trefcounter.cpp -+++ b/taglib/toolkit/trefcounter.cpp -@@ -52,7 +52,7 @@ - # define ATOMIC_INC(x) __sync_add_and_fetch(&x, 1) - # define ATOMIC_DEC(x) __sync_sub_and_fetch(&x, 1) - #else --# define ATOMIC_INT volatile int -+# define ATOMIC_INT int - # define ATOMIC_INC(x) (++x) - # define ATOMIC_DEC(x) (--x) - #endif diff --git a/package/taglib/taglib.hash b/package/taglib/taglib.hash index 38a44b41a56..e83aa451f33 100644 --- a/package/taglib/taglib.hash +++ b/package/taglib/taglib.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 7fccd07669a523b07a15bd24c8da1bbb92206cb19e9366c3692af3d79253b703 taglib-1.12.tar.gz +sha256 c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b taglib-1.13.1.tar.gz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL sha256 53692a2ed6c6a2c6ec9b32dd0b820dfae91e0a1fcdf625ca9ed0bdf8705fcc4f COPYING.MPL diff --git a/package/taglib/taglib.mk b/package/taglib/taglib.mk index 9513e0d0e15..9bdf05b85d4 100644 --- a/package/taglib/taglib.mk +++ b/package/taglib/taglib.mk @@ -4,7 +4,7 @@ # ################################################################################ -TAGLIB_VERSION = 1.12 +TAGLIB_VERSION = 1.13.1 TAGLIB_SITE = http://taglib.github.io/releases TAGLIB_INSTALL_STAGING = YES TAGLIB_LICENSE = LGPL-2.1 or MPL-1.1 @@ -13,6 +13,9 @@ TAGLIB_CPE_ID_VENDOR = taglib ifeq ($(BR2_PACKAGE_ZLIB),y) TAGLIB_DEPENDENCIES += zlib +TAGLIB_CONF_OPTS += -DWITH_ZLIB=ON +else +TAGLIB_CONF_OPTS += -DWITH_ZLIB=OFF endif define TAGLIB_REMOVE_DEVFILE diff --git a/package/tar/tar.mk b/package/tar/tar.mk index 80d7495b005..690a5952ba0 100644 --- a/package/tar/tar.mk +++ b/package/tar/tar.mk @@ -13,8 +13,6 @@ TAR_CONF_OPTS = --exec-prefix=/ TAR_LICENSE = GPL-3.0+ TAR_LICENSE_FILES = COPYING TAR_CPE_ID_VENDOR = gnu -# only tar <= 1.16 -TAR_IGNORE_CVES += CVE-2007-4476 ifeq ($(BR2_PACKAGE_ACL),y) TAR_DEPENDENCIES += acl diff --git a/package/taskd/taskd.hash b/package/taskd/taskd.hash index 63bb87c1b6b..d3f8bb250e5 100644 --- a/package/taskd/taskd.hash +++ b/package/taskd/taskd.hash @@ -1,5 +1,5 @@ # From http://taskwarrior.org/download/ -sha1 ded339deeee65277e4712f71a9159502f8b20b52 taskd-1.1.0.tar.gz +sha1 ded339deeee65277e4712f71a9159502f8b20b52 taskd-1.1.0.tar.gz # Locally calculated sha256 7b8488e687971ae56729ff4e2e5209ff8806cf8cd57718bfd7e521be130621b4 taskd-1.1.0.tar.gz sha256 84d1a8c2e6e306864ff350857a36b6c74756e61e2eae6822cf2fa88212720f68 COPYING diff --git a/package/tbb/0001-Musl-linux-can-not-use-RTLD_DEEPBIND.patch b/package/tbb/0001-Musl-linux-can-not-use-RTLD_DEEPBIND.patch new file mode 100644 index 00000000000..82182ce1090 --- /dev/null +++ b/package/tbb/0001-Musl-linux-can-not-use-RTLD_DEEPBIND.patch @@ -0,0 +1,33 @@ +From 883c2e5245c39624b3b5d6d56d5b203cf09eac38 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 15 Dec 2021 08:08:07 -0800 +Subject: [PATCH] Musl/linux can not use RTLD_DEEPBIND (#684) + +Exclude non-glibc linux systems along with android +Fixes +src/tbb/dynamic_link.cpp:417:29: error: use + of undeclared identifier 'RTLD_DEEPBIND' | flags = flags | RTLD_DEEPBIND; +| ^ + +Signed-off-by: Khem Raj + +[Retrieved from: +https://github.com/oneapi-src/oneTBB/commit/883c2e5245c39624b3b5d6d56d5b203cf09eac38] +Signed-off-by: Fabrice Fontaine +--- + src/tbb/dynamic_link.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/tbb/dynamic_link.cpp b/src/tbb/dynamic_link.cpp +index 3f1342503..5330d7107 100644 +--- a/src/tbb/dynamic_link.cpp ++++ b/src/tbb/dynamic_link.cpp +@@ -413,7 +413,7 @@ namespace r1 { + int flags = RTLD_NOW; + if (local_binding) { + flags = flags | RTLD_LOCAL; +-#if __linux__ && !__ANDROID__ && !__TBB_USE_SANITIZERS ++#if (__linux__ && __GLIBC__) && !__TBB_USE_SANITIZERS + flags = flags | RTLD_DEEPBIND; + #endif + } else { diff --git a/package/tbb/0002-mallinfo-is-only-defined-on-glibc-and-android.patch b/package/tbb/0002-mallinfo-is-only-defined-on-glibc-and-android.patch new file mode 100644 index 00000000000..9b397cac416 --- /dev/null +++ b/package/tbb/0002-mallinfo-is-only-defined-on-glibc-and-android.patch @@ -0,0 +1,42 @@ +From 3a7f96db56cc9821055cbc769d3065db86b8b4c9 Mon Sep 17 00:00:00 2001 +From: Julien Voisin +Date: Mon, 7 Feb 2022 07:56:15 +0100 +Subject: [PATCH] mallinfo is only defined on glibc and android (#764) + +It currently prevents compilation under musl: + +``` +[ 90%] Building CXX object src/tbbmalloc_proxy/CMakeFiles/tbbmalloc_proxy.dir/proxy.cpp.o +/__w/mimalloc-bench/mimalloc-bench/extern/tbb/src/tbbmalloc_proxy/proxy.cpp:263:26: error: return type 'struct mallinfo' is incomplete + 263 | struct mallinfo mallinfo() __THROW + | ^ +compilation terminated due to -Wfatal-errors. +`` + +[Retrieved from: +https://github.com/oneapi-src/oneTBB/commit/3a7f96db56cc9821055cbc769d3065db86b8b4c9] +Signed-off-by: Fabrice Fontaine +--- + src/tbbmalloc_proxy/proxy.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/tbbmalloc_proxy/proxy.cpp b/src/tbbmalloc_proxy/proxy.cpp +index e58e55e0b..23b9c19c1 100644 +--- a/src/tbbmalloc_proxy/proxy.cpp ++++ b/src/tbbmalloc_proxy/proxy.cpp +@@ -260,6 +260,7 @@ int mallopt(int /*param*/, int /*value*/) __THROW + return 1; + } + ++#if defined(__GLIBC__) || defined(__ANDROID__) + struct mallinfo mallinfo() __THROW + { + struct mallinfo m; +@@ -267,6 +268,7 @@ struct mallinfo mallinfo() __THROW + + return m; + } ++#endif + + #if __ANDROID__ + // Android doesn't have malloc_usable_size, provide it to be compatible diff --git a/package/tbb/0003-Define-ITT_ARCH_IA64-when-undefiend.patch b/package/tbb/0003-Define-ITT_ARCH_IA64-when-undefiend.patch new file mode 100644 index 00000000000..5b7f0024995 --- /dev/null +++ b/package/tbb/0003-Define-ITT_ARCH_IA64-when-undefiend.patch @@ -0,0 +1,27 @@ +From 6fad69889da67bc4d4baff4afa94f77da45e006d Mon Sep 17 00:00:00 2001 +From: Felix Yan +Date: Thu, 7 Oct 2021 14:16:16 +0800 +Subject: [PATCH] Define ITT_ARCH_IA64 when undefiend (#550) + +[Retrieved from: +https://github.com/oneapi-src/oneTBB/commit/6fad69889da67bc4d4baff4afa94f77da45e006d] +Signed-off-by: Fabrice Fontaine +--- + src/tbb/tools_api/ittnotify_config.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/tbb/tools_api/ittnotify_config.h b/src/tbb/tools_api/ittnotify_config.h +index 8ecc23781..f904a8e9d 100644 +--- a/src/tbb/tools_api/ittnotify_config.h ++++ b/src/tbb/tools_api/ittnotify_config.h +@@ -147,6 +147,10 @@ + # define ITT_ARCH_IA32E 2 + #endif /* ITT_ARCH_IA32E */ + ++#ifndef ITT_ARCH_IA64 ++# define ITT_ARCH_IA64 3 ++#endif /* ITT_ARCH_IA64 */ ++ + #ifndef ITT_ARCH_ARM + # define ITT_ARCH_ARM 4 + #endif /* ITT_ARCH_ARM */ diff --git a/package/tbb/Config.in b/package/tbb/Config.in new file mode 100644 index 00000000000..b2e97829b5a --- /dev/null +++ b/package/tbb/Config.in @@ -0,0 +1,22 @@ +config BR2_PACKAGE_TBB + bool "tbb" + # tbb needs fenv.h which is not provided by uclibc + depends on !BR2_TOOLCHAIN_USES_UCLIBC + depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_INSTALL_LIBSTDCPP + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr + help + Intel(R) Threading Building Blocks (Intel(R) TBB) lets you + easily write parallel C++ programs that take full advantage + of multicore performance, that are portable, composable and + have future-proof scalability. + + https://www.threadingbuildingblocks.org/ + +comment "tbb needs a glibc or musl toolchain w/ dynamic library, threads, C++" + depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP + +comment "tbb needs exception_ptr" + depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 diff --git a/package/tbb/tbb.hash b/package/tbb/tbb.hash new file mode 100644 index 00000000000..9992fb3c4f7 --- /dev/null +++ b/package/tbb/tbb.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 e5b57537c741400cf6134b428fc1689a649d7d38d9bb9c1b6d64f092ea28178a tbb-2021.5.0.tar.gz +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE.txt diff --git a/package/tbb/tbb.mk b/package/tbb/tbb.mk new file mode 100644 index 00000000000..fc720fd2f5c --- /dev/null +++ b/package/tbb/tbb.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# tbb +# +################################################################################ + +TBB_VERSION = 2021.5.0 +TBB_SITE = $(call github,01org,tbb,v$(TBB_VERSION)) +TBB_INSTALL_STAGING = YES +TBB_LICENSE = Apache-2.0 +TBB_LICENSE_FILES = LICENSE.txt +TBB_CPE_ID_VENDOR = intel +TBB_CPE_ID_PRODUCT = threading_building_blocks + +TBB_CONF_OPTS = \ + -DCMAKE_BUILD_TYPE=Release \ + -DTBB_STRICT=OFF \ + -DTBB_TEST=OFF + +$(eval $(cmake-package)) diff --git a/package/tcf-agent/Config.in b/package/tcf-agent/Config.in index 50e58642b0a..8c7aab0c0bb 100644 --- a/package/tcf-agent/Config.in +++ b/package/tcf-agent/Config.in @@ -27,7 +27,7 @@ config BR2_PACKAGE_TCF_AGENT_ARCH default "i686" if BR2_i386 && BR2_ARCH="i686" default "i386" if BR2_i386 && !BR2_ARCH="i686" default "x86_64" if BR2_x86_64 - default "powerpc" if BR2_powerpc || BR2_powerpcle + default "powerpc" if BR2_powerpc default "ppc64" if BR2_powerpc64 || BR2_powerpc64le default "microblaze" if BR2_microblaze || BR2_microblazeel diff --git a/package/tcl/0001-Disable-tcl-compatibility-layers.patch b/package/tcl/0001-Disable-tcl-compatibility-layers.patch new file mode 100644 index 00000000000..b7b776ad5dd --- /dev/null +++ b/package/tcl/0001-Disable-tcl-compatibility-layers.patch @@ -0,0 +1,35 @@ +From c829552921f0c7c8e522f911135ee100742b441b Mon Sep 17 00:00:00 2001 +From: Andrew Ruder +Date: Tue, 8 Apr 2014 15:54:04 -0500 +Subject: [PATCH] Disable tcl compatibility layers + +Turn off building compatibility layers for old/broken versions of +standard functions (strstr, strtoul, strtod) with the assumption that +anything buildroot is using as a standard C library will be good enough +to not have broken behavior. + +Signed-off-by: Andrew Ruder +[Fabrice: Update for 8.6.12] +Signed-off-by: Fabrice Fontaine +[Julien: Update for 8.6.13] +Signed-off-by: Julien Olivain +--- + unix/tcl.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/unix/tcl.m4 b/unix/tcl.m4 +index ca94abd4ad..42eb58d384 100644 +--- a/unix/tcl.m4 ++++ b/unix/tcl.m4 +@@ -2646,7 +2646,7 @@ AC_DEFUN([SC_TCL_CHECK_BROKEN_FUNC],[ + #include + #include + int main() {]$2[}]]])],[tcl_cv_$1_unbroken=ok], +- [tcl_cv_$1_unbroken=broken],[tcl_cv_$1_unbroken=unknown])) ++ [tcl_cv_$1_unbroken=broken],[tcl_cv_$1_unbroken=ok])) + if test ["$tcl_cv_]$1[_unbroken"] = "ok"; then + tcl_ok=1 + else +-- +2.41.0 + diff --git a/package/tcl/0001-dont-build-compat.patch b/package/tcl/0001-dont-build-compat.patch deleted file mode 100644 index 7a7d959cd25..00000000000 --- a/package/tcl/0001-dont-build-compat.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Andrew Ruder -Subject: [PATCH] Disable tcl compatibility layers - -Turn off building compatibility layers for old/broken versions of -standard functions (strstr, strtoul, strtod) with the assumption that -anything buildroot is using as a standard C library will be good enough -to not have broken behavior. - -Signed-off-by: Andrew Ruder -[Fabrice: Update for 8.6.12] -Signed-off-by: Fabrice Fontaine ---- - -diff --git a/unix/tcl.m4 b/unix/tcl.m4 ---- a/unix/tcl.m4 -+++ b/unix/tcl.m4 -@@ -2725,7 +2725,7 @@ AC_DEFUN([SC_TCL_CHECK_BROKEN_FUNC],[ - #include - #include - int main() {]$2[}]]])],[tcl_cv_$1_unbroken=ok], -- [tcl_cv_$1_unbroken=broken],[tcl_cv_$1_unbroken=unknown])) -+ [tcl_cv_$1_unbroken=broken],[tcl_cv_$1_unbroken=unknown])) - if test ["$tcl_cv_]$1[_unbroken"] = "ok"; then - tcl_ok=1 - else diff --git a/package/tcl/Config.in b/package/tcl/Config.in index f1fa0541a1b..adb9f224883 100644 --- a/package/tcl/Config.in +++ b/package/tcl/Config.in @@ -10,6 +10,7 @@ config BR2_PACKAGE_TCL # See this mailing list thread: # http://lists.busybox.net/pipermail/buildroot/2015-March/121198.html depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_ZLIB help TCL (Tool Command Language) is a simple textual language. diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk index 97754b63d02..0d8fe17c0e7 100644 --- a/package/tcl/tcl.mk +++ b/package/tcl/tcl.mk @@ -75,7 +75,8 @@ TCL_POST_INSTALL_TARGET_HOOKS += TCL_REMOVE_EXTRA TCL_DEPENDENCIES = $(if $(BR2_PACKAGE_SQLITE),sqlite) \ $(if $(BR2_PACKAGE_MYSQL),mysql) \ - $(if $(BR2_PACKAGE_POSTGRESQL),postgresql) + $(if $(BR2_PACKAGE_POSTGRESQL),postgresql) \ + zlib $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/package/tclap/Config.in b/package/tclap/Config.in index 560cf331742..64b0b74c8a2 100644 --- a/package/tclap/Config.in +++ b/package/tclap/Config.in @@ -8,7 +8,7 @@ config BR2_PACKAGE_TCLAP This is a small, flexible library that provides a simple interface for defining and accessing command line arguments. It was initially inspired by the user friendly - CLAP libary. The difference is that this library is + CLAP library. The difference is that this library is templatized, so the argument class is type independent. Type independence avoids identical-except-for-type objects, such as IntArg, FloatArg, and StringArg. While the library is not diff --git a/package/tcpdump/Config.in b/package/tcpdump/Config.in index 8b54c603dfa..74294713624 100644 --- a/package/tcpdump/Config.in +++ b/package/tcpdump/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_TCPDUMP help A tool for network monitoring and data acquisition. - http://www.tcpdump.org/ + https://www.tcpdump.org/ if BR2_PACKAGE_TCPDUMP diff --git a/package/tcpdump/tcpdump.hash b/package/tcpdump/tcpdump.hash index 1990aa797bc..1a22889851c 100644 --- a/package/tcpdump/tcpdump.hash +++ b/package/tcpdump/tcpdump.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature at -# https://www.tcpdump.org/release/tcpdump-4.99.1.tar.gz.sig +# https://www.tcpdump.org/release/tcpdump-4.99.3.tar.gz.sig # using key 1F166A5742ABB9E0249A8D30E089DEF1D9C15D0D -sha256 79b36985fb2703146618d87c4acde3e068b91c553fb93f021a337f175fd10ebe tcpdump-4.99.1.tar.gz +sha256 0232231bb2f29d6bf2426e70a08a7e0c63a0d59a9b44863b7f5e2357a6e49fea tcpdump-4.99.4.tar.gz sha256 8a54594d257e14a5260ac770f1633516cb51e3fc28c40136ce2697014eda7afd LICENSE diff --git a/package/tcpdump/tcpdump.mk b/package/tcpdump/tcpdump.mk index 7741c3b58ed..91643e7beaa 100644 --- a/package/tcpdump/tcpdump.mk +++ b/package/tcpdump/tcpdump.mk @@ -4,7 +4,7 @@ # ################################################################################ -TCPDUMP_VERSION = 4.99.1 +TCPDUMP_VERSION = 4.99.4 TCPDUMP_SITE = https://www.tcpdump.org/release TCPDUMP_LICENSE = BSD-3-Clause TCPDUMP_LICENSE_FILES = LICENSE diff --git a/package/tcping/tcping.hash b/package/tcping/tcping.hash index 49f6e5ba0be..c97c0fa2a4c 100644 --- a/package/tcping/tcping.hash +++ b/package/tcping/tcping.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a731f0e48ff931d7b2a0e896e4db40867043740fe901dd225780f2164fdbdcf3 tcping-1.3.6.tar.gz -sha256 4a35620e27ddb8de27898e4206c8f93633d877c1e128e98e95a035f760d94428 LICENSE +sha256 a731f0e48ff931d7b2a0e896e4db40867043740fe901dd225780f2164fdbdcf3 tcping-1.3.6.tar.gz +sha256 4a35620e27ddb8de27898e4206c8f93633d877c1e128e98e95a035f760d94428 LICENSE diff --git a/package/tcpreplay/Config.in b/package/tcpreplay/Config.in index 5e36452cf40..9e5509114e5 100644 --- a/package/tcpreplay/Config.in +++ b/package/tcpreplay/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_TCPREPLAY bool "tcpreplay" depends on BR2_USE_MMU # fork() select BR2_PACKAGE_LIBPCAP + select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC help Tcpreplay is a tool for replaying network traffic from files saved with tcpdump or other tools which write pcap(3) files. diff --git a/package/tcpreplay/tcpreplay.hash b/package/tcpreplay/tcpreplay.hash index 8bcdae958c5..97c2e7ee342 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.3.4/tcpreplay-4.3.4.tar.xz.asc +# https://github.com/appneta/tcpreplay/releases/download/v4.4.2/tcpreplay-4.4.2.tar.xz.asc # using key 84E4FA215C934A7D97DC76D5E9E2149793BDE17E -sha256 42c055106e55852c29d94bb6e1b9e001a0723349f2985eb893a47d384c85002b tcpreplay-4.3.4.tar.xz +sha256 91585c247b108ed3c10d3546d18f6a467d44229c9988c97736f953af69a6f438 tcpreplay-4.4.2.tar.xz sha256 07cf5e92d475287a7d1663b33097f40cae5adf03ed8920fcd4374e3dfb48c8ad docs/LICENSE diff --git a/package/tcpreplay/tcpreplay.mk b/package/tcpreplay/tcpreplay.mk index ef654039740..65eb9089323 100644 --- a/package/tcpreplay/tcpreplay.mk +++ b/package/tcpreplay/tcpreplay.mk @@ -4,21 +4,27 @@ # ################################################################################ -TCPREPLAY_VERSION = 4.3.4 +TCPREPLAY_VERSION = 4.4.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 TCPREPLAY_LICENSE_FILES = docs/LICENSE -TCPREPLAY_CPE_ID_VENDOR = tcpreplay +TCPREPLAY_CPE_ID_VENDOR = broadcom TCPREPLAY_CONF_ENV = \ - ac_cv_path_ac_pt_PCAP_CONFIG="$(STAGING_DIR)/usr/bin/pcap-config" + ac_cv_path_ac_pt_PCAP_CONFIG="$(STAGING_DIR)/usr/bin/pcap-config" \ + LIBS="$(TCPREPLAY_LIBS)" TCPREPLAY_CONF_OPTS = --with-libpcap=$(STAGING_DIR)/usr \ --enable-pcapconfig TCPREPLAY_DEPENDENCIES = libpcap +ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),) +TCPREPLAY_DEPENDENCIES += musl-fts +TCPREPLAY_LIBS += -lfts +endif + ifeq ($(BR2_STATIC_LIBS),y) TCPREPLAY_CONF_OPTS += --enable-dynamic-link=no -TCPREPLAY_CONF_ENV += LIBS="`$(STAGING_DIR)/usr/bin/pcap-config --static --libs`" +TCPREPLAY_LIBS += `$(STAGING_DIR)/usr/bin/pcap-config --static --libs` endif ifeq ($(BR2_PACKAGE_LIBDNET),y) diff --git a/package/tealdeer/Config.in b/package/tealdeer/Config.in new file mode 100644 index 00000000000..662a937ce13 --- /dev/null +++ b/package/tealdeer/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_TEALDEER + bool "tealdeer" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + # Crypto dependency (ring) not available for mips, PowerPC, Sparc, s390x + depends on !(BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el) + depends on !(BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le) + depends on !(BR2_sparc || BR2_sparc64) + depends on !BR2_s390x + select BR2_PACKAGE_HOST_RUSTC + help + A fast and full-featured tldr client. tldr pages are + simplified and community-driven man pages, see + https://tldr.sh/ for more information. + + https://github.com/dbrgn/tealdeer/ diff --git a/package/tealdeer/tealdeer.hash b/package/tealdeer/tealdeer.hash new file mode 100644 index 00000000000..1d9eb7bf255 --- /dev/null +++ b/package/tealdeer/tealdeer.hash @@ -0,0 +1,4 @@ +# Locally generated +sha256 90690d3a6e2f6c7444c281865bd5b0787e0afa599f06b52b4283bea4541e1e77 tealdeer-1.6.1.tar.gz +sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE +sha256 a313b5e62b80a08f3aae0fa62ff3de8482ef55247299eb352ab44f87ef456b1b LICENSE-MIT diff --git a/package/tealdeer/tealdeer.mk b/package/tealdeer/tealdeer.mk new file mode 100644 index 00000000000..aabfe2983ce --- /dev/null +++ b/package/tealdeer/tealdeer.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# tealdeer +# +################################################################################ + +TEALDEER_VERSION = 1.6.1 +TEALDEER_SITE = $(call github,dbrgn,tealdeer,v$(TEALDEER_VERSION)) +TEALDEER_LICENSE = Apache-2.0 or MIT +TEALDEER_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT + +$(eval $(cargo-package)) diff --git a/package/tekui/tekui.mk b/package/tekui/tekui.mk index 13000edd3ea..3cb7ff51e52 100644 --- a/package/tekui/tekui.mk +++ b/package/tekui/tekui.mk @@ -59,11 +59,11 @@ endif endif define TEKUI_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TEKUI_MAKE_OPTS) PREFIX="/usr" -C $(@D) all + $(TARGET_MAKE_ENV) $(TEKUI_MAKE) $(TEKUI_MAKE_OPTS) PREFIX="/usr" -C $(@D) all endef define TEKUI_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TEKUI_MAKE_OPTS) PREFIX="$(TARGET_DIR)/usr" -C $(@D) install + $(TARGET_MAKE_ENV) $(TEKUI_MAKE) $(TEKUI_MAKE_OPTS) PREFIX="$(TARGET_DIR)/usr" -C $(@D) install endef $(eval $(generic-package)) diff --git a/package/termcolor/Config.in b/package/termcolor/Config.in new file mode 100644 index 00000000000..979ad61d81f --- /dev/null +++ b/package/termcolor/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_TERMCOLOR + bool "termcolor" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + help + Termcolor is a header-only C++ library for printing colored + messages to the terminal. + + https://github.com/ikalnytskyi/termcolor + +comment "termcolor needs a toolchain w/ C++, gcc >= 4.8" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/package/termcolor/termcolor.hash b/package/termcolor/termcolor.hash new file mode 100644 index 00000000000..dede06c9b0b --- /dev/null +++ b/package/termcolor/termcolor.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 435994c32557674469404cb1527c283fdcf45746f7df75fd2996bb200d6a759f termcolor-2.1.0.tar.gz +sha256 bab0f53c36b248df22e2298ddf9eeea14b28783f187fcbff6a38f2c47b3a3a7d LICENSE diff --git a/package/termcolor/termcolor.mk b/package/termcolor/termcolor.mk new file mode 100644 index 00000000000..0374ce8b734 --- /dev/null +++ b/package/termcolor/termcolor.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# termcolor +# +################################################################################ + +TERMCOLOR_VERSION = 2.1.0 +TERMCOLOR_SITE = $(call github,ikalnytskyi,termcolor,v$(TERMCOLOR_VERSION)) +TERMCOLOR_LICENSE = BSD-3-Clause +TERMCOLOR_LICENSE_FILES = LICENSE +TERMCOLOR_INSTALL_STAGING = YES +TERMCOLOR_INSTALL_TARGET = NO + +$(eval $(cmake-package)) diff --git a/package/tesseract-ocr/0002-configure.ac-fix-build-on-aarch64_be.patch b/package/tesseract-ocr/0002-configure.ac-fix-build-on-aarch64_be.patch new file mode 100644 index 00000000000..20b8d5ce766 --- /dev/null +++ b/package/tesseract-ocr/0002-configure.ac-fix-build-on-aarch64_be.patch @@ -0,0 +1,32 @@ +From cffb8a36a987cd0d013d73501dd20c553ff69c77 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 21 Aug 2022 10:21:43 +0200 +Subject: [PATCH] configure.ac: fix build on aarch64_be + +Fix the following build failure on aarch64_be: + +/home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/aarch64_be-none-linux-gnu/10.3.1/../../../../aarch64_be-none-linux-gnu/bin/ld: ./.libs/libtesseract.so: undefined reference to `tesseract::IntSimdMatrix::intSimdMatrixNEON' + +Fixes: + - http://autobuild.buildroot.org/results/b9246a37fcf6be4fabfc491daddadfb09e0a320a + +Signed-off-by: Fabrice Fontaine +[Retrieved (and backported) from: +https://github.com/tesseract-ocr/tesseract/commit/cffb8a36a987cd0d013d73501dd20c553ff69c77] +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 63579c954f..2b05052395 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -170,7 +170,7 @@ case "${host_cpu}" in + + ;; + +- aarch64) ++ aarch64*) + + # ARMv8 always has NEON and does not need special compiler flags. + AM_CONDITIONAL([HAVE_NEON], true) diff --git a/package/tesseract-ocr/tesseract-ocr.mk b/package/tesseract-ocr/tesseract-ocr.mk index a7498931fb8..abe3d39ab66 100644 --- a/package/tesseract-ocr/tesseract-ocr.mk +++ b/package/tesseract-ocr/tesseract-ocr.mk @@ -11,6 +11,8 @@ TESSERACT_OCR_LICENSE = Apache-2.0 TESSERACT_OCR_LICENSE_FILES = LICENSE # Source from github, no configure script provided +# 0001-Check-if-platform-supports-feenableexcept.patch +# 0002-configure.ac-fix-build-on-aarch64_be.patch TESSERACT_OCR_AUTORECONF = YES # cairo, pango and icu are optional dependencies, but only needed for @@ -39,7 +41,7 @@ ifeq ($(BR2_PACKAGE_TESSERACT_OCR_LANG_FRA),y) TESSERACT_OCR_DATA_FILES += fra.traineddata endif -ifeq ($(BR2_PACKAGE_TESSERACT_OCR_LANG_DEU),y) +ifeq ($(BR2_PACKAGE_TESSERACT_OCR_LANG_GER),y) TESSERACT_OCR_DATA_FILES += deu.traineddata endif diff --git a/package/tftpd/S80tftpd-hpa b/package/tftpd/S80tftpd-hpa index 4e8361faa77..8ae15150a1d 100644 --- a/package/tftpd/S80tftpd-hpa +++ b/package/tftpd/S80tftpd-hpa @@ -11,6 +11,8 @@ DAEMON=/usr/sbin/$NAME PIDFILE=/var/run/$NAME.pid SCRIPTNAME=/etc/init.d/S80tftpd-hpa +[ -r "/etc/default/$NAME" ] && . "/etc/default/$NAME" + # # Function that starts the daemon/service. # diff --git a/package/tftpd/tftpd.mk b/package/tftpd/tftpd.mk index 42b5f17821a..ceac24119eb 100644 --- a/package/tftpd/tftpd.mk +++ b/package/tftpd/tftpd.mk @@ -5,7 +5,8 @@ ################################################################################ TFTPD_VERSION = b2b34cecc8cbc18ff6f1fc00bda6ae6e9011e6c7 -TFTPD_SITE = git://git.kernel.org/pub/scm/network/tftp/tftp-hpa.git +TFTPD_SITE = https://git.kernel.org/pub/scm/network/tftp/tftp-hpa.git +TFTPD_SITE_METHOD = git TFTPD_CONF_OPTS = --without-tcpwrappers TFTPD_LICENSE = BSD-4-Clause TFTPD_LICENSE_FILES = tftpd/tftpd.c diff --git a/package/thermald/Config.in b/package/thermald/Config.in index e5e15b9b8dd..353ce31a7a4 100644 --- a/package/thermald/Config.in +++ b/package/thermald/Config.in @@ -4,7 +4,6 @@ config BR2_PACKAGE_THERMALD depends on BR2_USE_MMU # uses fork() depends on BR2_USE_WCHAR # upower -> libgudev depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # upower -> libusb depends on BR2_TOOLCHAIN_HAS_THREADS # dbus-glib -> glib2, dbus, upower depends on BR2_USE_WCHAR # dbus-glib -> glib2 depends on BR2_PACKAGE_HAS_UDEV # upower @@ -22,11 +21,11 @@ config BR2_PACKAGE_THERMALD https://github.com/intel/thermal_daemon -comment "thermald needs a toolchain w/ C++, wchar, threads, gcc >= 4.9" +comment "thermald needs a toolchain w/ C++, wchar, threads" depends on BR2_i386 || BR2_x86_64 depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + !BR2_INSTALL_LIBSTDCPP comment "thermald needs udev /dev management" depends on BR2_i386 || BR2_x86_64 diff --git a/package/thermald/thermald.hash b/package/thermald/thermald.hash index 3a7c0f69523..9693813ca9f 100644 --- a/package/thermald/thermald.hash +++ b/package/thermald/thermald.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 3e5a5033339c021de41ed4f946dd39e13f79f722fb5bd98d798e83658184c39b thermald-2.4.8.tar.gz +sha256 75c165df45b3d09c904d314c8c19789158e9538f46e3d2b606457dc631eb3af5 thermald-2.5.1.tar.gz sha256 e98be8bc482e038a14bfbc01caf800bbd0024fff275ef14cd999db6560254a8d COPYING diff --git a/package/thermald/thermald.mk b/package/thermald/thermald.mk index 4e432771284..fd0246745f8 100644 --- a/package/thermald/thermald.mk +++ b/package/thermald/thermald.mk @@ -4,7 +4,7 @@ # ################################################################################ -THERMALD_VERSION = 2.4.8 +THERMALD_VERSION = 2.5.1 THERMALD_SITE = $(call github,intel,thermal_daemon,v$(THERMALD_VERSION)) # fetched from Github, with no configure script THERMALD_AUTORECONF = YES diff --git a/package/thttpd/thttpd.hash b/package/thttpd/thttpd.hash index 4bdd7fe74b5..a29b9b2dcbf 100644 --- a/package/thttpd/thttpd.hash +++ b/package/thttpd/thttpd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 99c09f47da326b1e7b5295c45549d2b65534dce27c44812cf7eef1441681a397 thttpd-2.29.tar.gz -sha256 be059e6b8219d5bb5480fa6a2864bbb34892f56951d03d08b356bc1fa8c81a01 thttpd.c +sha256 99c09f47da326b1e7b5295c45549d2b65534dce27c44812cf7eef1441681a397 thttpd-2.29.tar.gz +sha256 be059e6b8219d5bb5480fa6a2864bbb34892f56951d03d08b356bc1fa8c81a01 thttpd.c diff --git a/package/ti-cgt-pru/ti-cgt-pru.hash b/package/ti-cgt-pru/ti-cgt-pru.hash index 4dee3218388..f71ae0cfe71 100644 --- a/package/ti-cgt-pru/ti-cgt-pru.hash +++ b/package/ti-cgt-pru/ti-cgt-pru.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 1f1405167214f2c0ef848591b17a7799fdcd9f55f11bc90db9ace3490d426215 ti_cgt_pru_2.3.3_linux_installer_x86.bin -sha256 913cb4ab564f874b7c9a11726a16c4ccdc7ecc60be2738201281a1e28dc93641 PRU_Code_Generation_Tools_2.3.x_manifest.html -sha256 5e198df9782c63cedc8363f0e298b241a9a8084398a925f6e1003dbcb60801cb pru_rts_2_3_0_82167478-F8C9-49b2-82BD-12F8550770F9.spdx +sha256 1f1405167214f2c0ef848591b17a7799fdcd9f55f11bc90db9ace3490d426215 ti_cgt_pru_2.3.3_linux_installer_x86.bin +sha256 913cb4ab564f874b7c9a11726a16c4ccdc7ecc60be2738201281a1e28dc93641 PRU_Code_Generation_Tools_2.3.x_manifest.html +sha256 5e198df9782c63cedc8363f0e298b241a9a8084398a925f6e1003dbcb60801cb pru_rts_2_3_0_82167478-F8C9-49b2-82BD-12F8550770F9.spdx diff --git a/package/ti-gfx/Config.in b/package/ti-gfx/Config.in index 76aabcb8c43..40f46335a3b 100644 --- a/package/ti-gfx/Config.in +++ b/package/ti-gfx/Config.in @@ -45,7 +45,7 @@ config BR2_PACKAGE_TI_GFX_DEMOS config BR2_PACKAGE_TI_GFX_EGLIMAGE bool "install eglimage version of libraries" help - Installs OpenGL libaries which support the eglimage api. + Installs OpenGL libraries which support the eglimage api. choice prompt "Target" diff --git a/package/tiff/0001-tiffset-fix-global-buffer-overflow-for-ASCII-tags.patch b/package/tiff/0001-tiffset-fix-global-buffer-overflow-for-ASCII-tags.patch deleted file mode 100644 index ba1487782e8..00000000000 --- a/package/tiff/0001-tiffset-fix-global-buffer-overflow-for-ASCII-tags.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 03047a26952a82daaa0792957ce211e0aa51bc64 Mon Sep 17 00:00:00 2001 -From: 4ugustus -Date: Tue, 25 Jan 2022 16:25:28 +0000 -Subject: [PATCH] tiffset: fix global-buffer-overflow for ASCII tags where - count is required (fixes #355) - -[Retrieved from: -https://gitlab.com/libtiff/libtiff/-/commit/03047a26952a82daaa0792957ce211e0aa51bc64] -Signed-off-by: Fabrice Fontaine ---- - tools/tiffset.c | 16 +++++++++++++--- - 1 file changed, 13 insertions(+), 3 deletions(-) - -diff --git a/tools/tiffset.c b/tools/tiffset.c -index 8c9e23c5..e7a88c09 100644 ---- a/tools/tiffset.c -+++ b/tools/tiffset.c -@@ -146,9 +146,19 @@ main(int argc, char* argv[]) - - arg_index++; - if (TIFFFieldDataType(fip) == TIFF_ASCII) { -- if (TIFFSetField(tiff, TIFFFieldTag(fip), argv[arg_index]) != 1) -- fprintf( stderr, "Failed to set %s=%s\n", -- TIFFFieldName(fip), argv[arg_index] ); -+ if(TIFFFieldPassCount( fip )) { -+ size_t len; -+ len = strlen(argv[arg_index]) + 1; -+ if (len > UINT16_MAX || TIFFSetField(tiff, TIFFFieldTag(fip), -+ (uint16_t)len, argv[arg_index]) != 1) -+ fprintf( stderr, "Failed to set %s=%s\n", -+ TIFFFieldName(fip), argv[arg_index] ); -+ } else { -+ if (TIFFSetField(tiff, TIFFFieldTag(fip), -+ argv[arg_index]) != 1) -+ fprintf( stderr, "Failed to set %s=%s\n", -+ TIFFFieldName(fip), argv[arg_index] ); -+ } - } else if (TIFFFieldWriteCount(fip) > 0 - || TIFFFieldWriteCount(fip) == TIFF_VARIABLE) { - int ret = 1; --- -GitLab - diff --git a/package/tiff/Config.in b/package/tiff/Config.in index f842c2ead80..d1004d6668d 100644 --- a/package/tiff/Config.in +++ b/package/tiff/Config.in @@ -11,6 +11,11 @@ config BR2_PACKAGE_TIFF_CCITT bool "CCITT Group 3 & 4 support" default y +config BR2_PACKAGE_TIFF_LIBDEFLATE + bool "Libdeflate usage (still requires Zlib)" + select BR2_PACKAGE_LIBDEFLATE + select BR2_PACKAGE_TIFF_ZLIB + config BR2_PACKAGE_TIFF_PACKBITS bool "Macintosh PackBits algorithm" default y @@ -67,4 +72,8 @@ config BR2_PACKAGE_TIFF_UTILITIES help Install all tiff utilities. +config BR2_PACKAGE_TIFF_ZSTD + bool "ZSTD compression" + select BR2_PACKAGE_ZSTD + endif diff --git a/package/tiff/tiff.hash b/package/tiff/tiff.hash index ea08a1fc92e..0fa503a02a9 100644 --- a/package/tiff/tiff.hash +++ b/package/tiff/tiff.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 0e46e5acb087ce7d1ac53cf4f56a09b221537fc86dfc5daaad1c2e89e1b37ac8 tiff-4.3.0.tar.gz -sha256 fbd6fed7938541d2c809c0826225fc85e551fdbfa8732b10f0c87e0847acafd7 COPYRIGHT +sha256 d7f38b6788e4a8f5da7940c5ac9424f494d8a79eba53d555f4a507167dca5e2b tiff-4.5.1.tar.gz +sha256 0780558a8bfba0af1160ec1ff11ade4f41c0d7deafd6ecfc796b492a788e380d LICENSE.md diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index f80ab7ac553..0006f461a02 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -4,19 +4,20 @@ # ################################################################################ -TIFF_VERSION = 4.3.0 +TIFF_VERSION = 4.5.1 TIFF_SITE = http://download.osgeo.org/libtiff TIFF_LICENSE = tiff license -TIFF_LICENSE_FILES = COPYRIGHT +TIFF_LICENSE_FILES = LICENSE.md TIFF_CPE_ID_VENDOR = libtiff TIFF_CPE_ID_PRODUCT = libtiff TIFF_INSTALL_STAGING = YES -# 0001-tiffset-fix-global-buffer-overflow-for-ASCII-tags.patch -TIFF_IGNORE_CVES += CVE-2022-22844 - +# 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 = \ - --disable-cxx \ + --disable-contrib \ + --disable-tests \ + --disable-webp \ --without-x TIFF_DEPENDENCIES = host-pkgconf @@ -25,14 +26,31 @@ HOST_TIFF_CONF_OPTS = \ --disable-cxx \ --without-x \ --disable-zlib \ + --disable-libdeflate \ --disable-lzma \ - --disable-jpeg + --disable-jpeg \ + --disable-tests \ + --disable-webp \ + --disable-zstd HOST_TIFF_DEPENDENCIES = host-pkgconf +ifeq ($(BR2_INSTALL_LIBSTDCPP),y) +TIFF_CONF_OPTS += --enable-cxx +else +TIFF_CONF_OPTS += --disable-cxx +endif + ifneq ($(BR2_PACKAGE_TIFF_CCITT),y) TIFF_CONF_OPTS += --disable-ccitt endif +ifeq ($(BR2_PACKAGE_TIFF_LIBDEFLATE),y) +TIFF_CONF_OPTS += --enable-libdeflate +TIFF_DEPENDENCIES += libdeflate +else +TIFF_CONF_OPTS += --disable-libdeflate +endif + ifneq ($(BR2_PACKAGE_TIFF_PACKBITS),y) TIFF_CONF_OPTS += --disable-packbits endif @@ -87,12 +105,18 @@ ifneq ($(BR2_PACKAGE_TIFF_JBIG),y) TIFF_CONF_OPTS += --disable-jbig endif -TIFF_SUBDIRS = port libtiff ifeq ($(BR2_PACKAGE_TIFF_UTILITIES),y) -TIFF_SUBDIRS += tools +TIFF_CONF_OPTS += --enable-tools +else +TIFF_CONF_OPTS += --disable-tools endif -TIFF_MAKE = $(MAKE) SUBDIRS="$(TIFF_SUBDIRS)" +ifeq ($(BR2_PACKAGE_TIFF_ZSTD),y) +TIFF_CONF_OPTS += --enable-zstd +TIFF_DEPENDENCIES += zstd +else +TIFF_CONF_OPTS += --disable-zstd +endif $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/package/time/time.hash b/package/time/time.hash index cea57dc2540..3afa036321b 100644 --- a/package/time/time.hash +++ b/package/time/time.hash @@ -1,5 +1,5 @@ # From https://lists.gnu.org/archive/html/info-gnu/2018-03/msg00004.html -sha1 75068c26abbed3ad3980685bae21d7202d288317 time-1.9.tar.gz -sha256 fbacf0c81e62429df3e33bda4cee38756604f18e01d977338e23306a3e3b521e time-1.9.tar.gz +sha1 75068c26abbed3ad3980685bae21d7202d288317 time-1.9.tar.gz +sha256 fbacf0c81e62429df3e33bda4cee38756604f18e01d977338e23306a3e3b521e time-1.9.tar.gz # Locally calculated -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/timescaledb/timescaledb.hash b/package/timescaledb/timescaledb.hash index 5690ce65b37..2fd14e6c1a1 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 58a34a7a3a571339a019c0ae999b4ebb9f93e1e0cb828501e32bb073e0a25eac timescaledb-2.5.1.tar.gz +sha256 ff0820891646a772aceab19ee0f7da0a5343dc53b9a72c965ab70f723d231d5c timescaledb-2.9.3.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index b1e4342fe94..e3c94ed2fe2 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,10 +4,11 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.5.1 +TIMESCALEDB_VERSION = 2.9.3 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE +TIMESCALEDB_CPE_ID_VENDOR = timescale TIMESCALEDB_DEPENDENCIES = postgresql diff --git a/package/tinc/tinc.hash b/package/tinc/tinc.hash index 5bd7aa2b1f2..4e12a290405 100644 --- a/package/tinc/tinc.hash +++ b/package/tinc/tinc.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 40f73bb3facc480effe0e771442a706ff0488edea7a5f2505d4ccb2aa8163108 tinc-1.0.36.tar.gz -sha256 3b37ffbf3459f2aceeef169aa65ee8b111ac1f8ba24a2a1b90b079678a9c7faa COPYING -sha256 9bf76a8aa304d807df20bf3d221c21d259764be63e39b58f299b80ba3ac14b5b COPYING.README +sha256 40f73bb3facc480effe0e771442a706ff0488edea7a5f2505d4ccb2aa8163108 tinc-1.0.36.tar.gz +sha256 3b37ffbf3459f2aceeef169aa65ee8b111ac1f8ba24a2a1b90b079678a9c7faa COPYING +sha256 9bf76a8aa304d807df20bf3d221c21d259764be63e39b58f299b80ba3ac14b5b COPYING.README diff --git a/package/tinycompress/0001-wave-add-time.h-missing-header-inclusion.patch b/package/tinycompress/0001-wave-add-time.h-missing-header-inclusion.patch new file mode 100644 index 00000000000..4068a54074f --- /dev/null +++ b/package/tinycompress/0001-wave-add-time.h-missing-header-inclusion.patch @@ -0,0 +1,39 @@ +From 7d3b8ac47789545af5a4cd2fc1cf9bcfb91ae3b0 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Sat, 29 Oct 2022 12:51:17 +0200 +Subject: [PATCH] wave: add missing header inclusion + +When compiling tinycompress with some libc other than glibc +(e.g. musl libc), compilation fails with the following error: + + In file included from wave.c:11:0: + /path/to/gcc/sysroot/usr/include/sound/asound.h:404:18: error: field 'trigger_tstamp' has incomplete type + struct timespec trigger_tstamp; /* time when stream was started/stopped/paused */ + [...] + +According to POSIX, "struct timespec" is defined in . See: +https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/time.h.html + +This patch fixes this build failure by including prior +. + +Signed-off-by: Julien Olivain +--- + src/utils/wave.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/utils/wave.c b/src/utils/wave.c +index a74149a..d17f66a 100644 +--- a/src/utils/wave.c ++++ b/src/utils/wave.c +@@ -8,6 +8,7 @@ + #include + #include + #include ++#include + #include + + #include "tinycompress/tinywave.h" +-- +2.38.1 + diff --git a/package/tinycompress/Config.in b/package/tinycompress/Config.in new file mode 100644 index 00000000000..aff1943c785 --- /dev/null +++ b/package/tinycompress/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_TINYCOMPRESS + bool "tinycompress" + depends on !BR2_STATIC_LIBS # dlfcn.h + help + tinycompress is a library for compress audio offload in alsa. + + https://www.alsa-project.org/ + +comment "tinycompress needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/package/tinycompress/tinycompress.hash b/package/tinycompress/tinycompress.hash new file mode 100644 index 00000000000..164f3a36c30 --- /dev/null +++ b/package/tinycompress/tinycompress.hash @@ -0,0 +1,5 @@ +# Locally calculated after checking pgp signature +sha256 2f897e5112cd3bca6790b5cecfda6e0662c8bc5ee0fbab972b247a0cc620d66c tinycompress-1.2.8.tar.bz2 + +# Locally calculated +sha256 912ea37a4435594a3b3c35f04efa4b5b7af2e68a05f5319c16c881711a31e4b7 COPYING diff --git a/package/tinycompress/tinycompress.mk b/package/tinycompress/tinycompress.mk new file mode 100644 index 00000000000..c9cfbb574bd --- /dev/null +++ b/package/tinycompress/tinycompress.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# tinycompress +# +################################################################################ + +TINYCOMPRESS_VERSION = 1.2.8 +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 +TINYCOMPRESS_LICENSE_FILES = COPYING +TINYCOMPRESS_INSTALL_STAGING = YES + +$(eval $(autotools-package)) diff --git a/package/tinymembench/tinymembench.hash b/package/tinymembench/tinymembench.hash index c0b767e9390..04dbd30f814 100644 --- a/package/tinymembench/tinymembench.hash +++ b/package/tinymembench/tinymembench.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e37a2682065b2778f2fa7f22bd59472f5ca2191be48503952ae020b8f023f23d tinymembench-0.4.tar.gz -sha256 8ba473aced4630aee2808efe17b53e904a9d68a9b3361de491717f9a4e75da39 LICENSE +sha256 e37a2682065b2778f2fa7f22bd59472f5ca2191be48503952ae020b8f023f23d tinymembench-0.4.tar.gz +sha256 8ba473aced4630aee2808efe17b53e904a9d68a9b3361de491717f9a4e75da39 LICENSE diff --git a/package/tinyproxy/0001-prevent-junk-from-showing-up-in-error-page-in-invalid-requests.patch b/package/tinyproxy/0001-prevent-junk-from-showing-up-in-error-page-in-invalid-requests.patch new file mode 100644 index 00000000000..da9c21a41a1 --- /dev/null +++ b/package/tinyproxy/0001-prevent-junk-from-showing-up-in-error-page-in-invalid-requests.patch @@ -0,0 +1,32 @@ +From 3764b8551463b900b5b4e3ec0cd9bb9182191cb7 Mon Sep 17 00:00:00 2001 +From: rofl0r +Date: Thu, 8 Sep 2022 15:18:04 +0000 +Subject: [PATCH] prevent junk from showing up in error page in invalid + requests + +fixes #457 + +[Retrieved from: +https://github.com/tinyproxy/tinyproxy/commit/3764b8551463b900b5b4e3ec0cd9bb9182191cb7] +Signed-off-by: Fabrice Fontaine +--- + src/reqs.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/reqs.c b/src/reqs.c +index bce69819..45db118d 100644 +--- a/src/reqs.c ++++ b/src/reqs.c +@@ -343,8 +343,12 @@ static struct request_s *process_request (struct conn_s *connptr, + goto fail; + } + ++ /* zero-terminate the strings so they don't contain junk in error page */ ++ request->method[0] = url[0] = request->protocol[0] = 0; ++ + ret = sscanf (connptr->request_line, "%[^ ] %[^ ] %[^ ]", + request->method, url, request->protocol); ++ + if (ret == 2 && !strcasecmp (request->method, "GET")) { + request->protocol[0] = 0; + diff --git a/package/tinyproxy/tinyproxy.hash b/package/tinyproxy/tinyproxy.hash index 8c58b98ca2f..84e98a84ce7 100644 --- a/package/tinyproxy/tinyproxy.hash +++ b/package/tinyproxy/tinyproxy.hash @@ -1,4 +1,4 @@ -# From https://github.com/tinyproxy/tinyproxy/releases/tag/1.11.0 -sha256 c1ec81cfc4c551d2c24e0227a5aeeaad8723bd9a39b61cd729e516b82eaa3f32 tinyproxy-1.11.0.tar.xz +# From https://github.com/tinyproxy/tinyproxy/releases/tag/1.11.1 +sha512 2e3435bbfece3797c11ccce222eef494ed92e00dd82bea2c40a54e454b7e03c8abc8e09b244f2da7192209c39047369439d08974b79eebc996fb3095230d0374 tinyproxy-1.11.1.tar.xz # locally computed sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/tinyproxy/tinyproxy.mk b/package/tinyproxy/tinyproxy.mk index 3930e90d720..e91a886888a 100644 --- a/package/tinyproxy/tinyproxy.mk +++ b/package/tinyproxy/tinyproxy.mk @@ -4,11 +4,14 @@ # ################################################################################ -TINYPROXY_VERSION = 1.11.0 +TINYPROXY_VERSION = 1.11.1 TINYPROXY_SITE = https://github.com/tinyproxy/tinyproxy/releases/download/$(TINYPROXY_VERSION) TINYPROXY_SOURCE = tinyproxy-$(TINYPROXY_VERSION).tar.xz TINYPROXY_LICENSE = GPL-2.0+ TINYPROXY_LICENSE_FILES = COPYING TINYPROXY_CPE_ID_VENDOR = tinyproxy_project +# 0001-prevent-junk-from-showing-up-in-error-page-in-invalid-requests.patch +TINYPROXY_IGNORE_CVES += CVE-2022-40468 + $(eval $(autotools-package)) diff --git a/package/tinyssh/tinyssh.hash b/package/tinyssh/tinyssh.hash index 30b5d13419b..462ffb90023 100644 --- a/package/tinyssh/tinyssh.hash +++ b/package/tinyssh/tinyssh.hash @@ -1,3 +1,3 @@ # locally computed -sha256 2a051437878998c7782d9d38ef13e5e7a76435ae6b9c3e9ec492c3a567bd6314 tinyssh-20210601.tar.gz +sha256 234656fc8d369608eb5d0f3a26280e0e38e2e6b134cfc610b6e24bce176acd4f tinyssh-20220801.tar.gz sha256 b5dc19477e29f4111e1c16cd89ec0782f5a07b1a30e3bdb7c155425b81b12c46 LICENCE diff --git a/package/tinyssh/tinyssh.mk b/package/tinyssh/tinyssh.mk index 05716bcfe16..1472f7ead13 100644 --- a/package/tinyssh/tinyssh.mk +++ b/package/tinyssh/tinyssh.mk @@ -4,7 +4,7 @@ # ################################################################################ -TINYSSH_VERSION = 20210601 +TINYSSH_VERSION = 20220801 TINYSSH_SITE = $(call github,janmojzis,tinyssh,$(TINYSSH_VERSION)) TINYSSH_LICENSE = Public Domain, CC0-1.0 TINYSSH_LICENSE_FILES = LICENCE diff --git a/package/tinyxml/tinyxml.hash b/package/tinyxml/tinyxml.hash index 650a3b227e0..9e9a4f72204 100644 --- a/package/tinyxml/tinyxml.hash +++ b/package/tinyxml/tinyxml.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8164c9ad48b9028667768a584d62f7760cfbfb90d0dd6214ad174403058da10c tinyxml-2.6.2_2.tar.gz -sha256 a65b8363834ccbe31ab7b49dcba723ed204622df30326793e0121435624c1a8d README +sha256 8164c9ad48b9028667768a584d62f7760cfbfb90d0dd6214ad174403058da10c tinyxml-2.6.2_2.tar.gz +sha256 a65b8363834ccbe31ab7b49dcba723ed204622df30326793e0121435624c1a8d README diff --git a/package/tinyxml/tinyxml.mk b/package/tinyxml/tinyxml.mk index d173254e31b..8e706f1a1e6 100644 --- a/package/tinyxml/tinyxml.mk +++ b/package/tinyxml/tinyxml.mk @@ -12,7 +12,7 @@ TINYXML_AUTORECONF = YES TINYXML_INSTALL_STAGING = YES TINYXML_LICENSE = Zlib TINYXML_LICENSE_FILES = README -TINYXML_CPE_ID_VENDOT = tinyxml_project +TINYXML_CPE_ID_VENDOR = tinyxml_project # 0001-In-stamp-always-advance-the-pointer-if-p-0xef.patch TINYXML_IGNORE_CVES += CVE-2021-42260 diff --git a/package/tio/Config.in b/package/tio/Config.in index d5d619100eb..a84daf8a244 100644 --- a/package/tio/Config.in +++ b/package/tio/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_TIO bool "tio" depends on !BR2_sparc64 && !BR2_sparc + select BR2_PACKAGE_INIH help "tio" is a simple TTY terminal application which features a straightforward commandline interface to easily connect to diff --git a/package/tio/tio.hash b/package/tio/tio.hash index 3053bd1bf08..cb0311a752e 100644 --- a/package/tio/tio.hash +++ b/package/tio/tio.hash @@ -1,5 +1,5 @@ -# Locally computed: -sha256 a8f5ed6994cacb96780baa416b19e5a6d7d67e8c162a8ea4fd9eccd64984ae44 tio-1.32.tar.xz +# From https://github.com/tio/tio/releases/download/v1.47/tio-1.47.tar.xz.sha256sum: +sha256 6f39ac582de747feb9a64c14e6b378c61cb0c3bfa6639e62050022c1b7f5c544 tio-1.47.tar.xz # Hash for license files: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 9248dee77ee136321f24556a96e07ff8f90461013941884a9defd0ac825ef131 LICENSE diff --git a/package/tio/tio.mk b/package/tio/tio.mk index 31f1dfb5a80..0035ce445ee 100644 --- a/package/tio/tio.mk +++ b/package/tio/tio.mk @@ -4,10 +4,11 @@ # ################################################################################ -TIO_VERSION = 1.32 +TIO_VERSION = 1.47 TIO_SOURCE = tio-$(TIO_VERSION).tar.xz TIO_SITE = https://github.com/tio/tio/releases/download/v$(TIO_VERSION) TIO_LICENSE = GPL-2.0+ -TIO_LICENSE_FILES = COPYING +TIO_LICENSE_FILES = LICENSE +TIO_DEPENDENCIES = inih -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/package/tl-expected/Config.in b/package/tl-expected/Config.in new file mode 100644 index 00000000000..92758ffee55 --- /dev/null +++ b/package/tl-expected/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_TL_EXPECTED + bool "tl-expected" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + help + C++11/14/17 std::expected with functional-style extensions and + reference support. + + https://github.com/TartanLlama/expected + +comment "tl-expected needs a toolchain w/ C++, gcc >= 4.8" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/package/tl-expected/tl-expected.hash b/package/tl-expected/tl-expected.hash new file mode 100644 index 00000000000..e5c9cc2a3e0 --- /dev/null +++ b/package/tl-expected/tl-expected.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 2611769546cedcaef233ef587e71420d1f079a794eb7bb19b888dedf991ace7c tl-expected-v1.0.0-br1.tar.gz +sha256 a2010f343487d3f7618affe54f789f5487602331c0a8d03f49e9a7c547cf0499 COPYING diff --git a/package/tl-expected/tl-expected.mk b/package/tl-expected/tl-expected.mk new file mode 100644 index 00000000000..8d62c75feaa --- /dev/null +++ b/package/tl-expected/tl-expected.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# tl-expected +# +################################################################################ + +TL_EXPECTED_VERSION = v1.0.0 +TL_EXPECTED_SITE = https://github.com/TartanLlama/expected +TL_EXPECTED_SITE_METHOD = git +TL_EXPECTED_GIT_SUBMODULES = YES +TL_EXPECTED_LICENSE = CC0-1.0 +TL_EXPECTED_LICENSE_FILES = COPYING +TL_EXPECTED_INSTALL_STAGING = YES +TL_EXPECTED_INSTALL_TARGET = NO +TL_EXPECTED_CONF_OPTS = \ + -DCMAKE_MODULE_PATH=$(TL_EXPECTED_DIR)/cmake/tl-cmake \ + -DEXPECTED_ENABLE_TESTS=OFF \ + -DFETCHCONTENT_FULLY_DISCONNECTED=ON + +$(eval $(cmake-package)) diff --git a/package/tmux/tmux.hash b/package/tmux/tmux.hash index 75538e09ae3..b5c0fe58d08 100644 --- a/package/tmux/tmux.hash +++ b/package/tmux/tmux.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 918f7220447bef33a1902d4faff05317afd9db4ae1c9971bef5c787ac6c88386 tmux-3.1c.tar.gz +sha256 e4fd347843bd0772c4f48d6dde625b0b109b7a380ff15db21e97c11a4dcdf93f tmux-3.3a.tar.gz sha256 c031bd37f464c534277814f6aa38686fa023d094261d57fd2545ad592bb53ccd COPYING diff --git a/package/tmux/tmux.mk b/package/tmux/tmux.mk index 281b7d8ee63..af06c8570b3 100644 --- a/package/tmux/tmux.mk +++ b/package/tmux/tmux.mk @@ -4,13 +4,33 @@ # ################################################################################ -TMUX_VERSION = 3.1c +TMUX_VERSION = 3.3a TMUX_SITE = https://github.com/tmux/tmux/releases/download/$(TMUX_VERSION) TMUX_LICENSE = ISC TMUX_LICENSE_FILES = COPYING TMUX_CPE_ID_VENDOR = tmux_project TMUX_DEPENDENCIES = libevent ncurses host-pkgconf +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +TMUX_DEPENDENCIES += systemd +TMUX_CONF_OPTS += --enable-systemd +else +TMUX_CONF_OPTS += --disable-systemd +endif + +ifeq ($(BR2_PACKAGE_UTF8PROC),y) +TMUX_DEPENDENCIES += utf8proc +TMUX_CONF_OPTS += --enable-utf8proc +else +TMUX_CONF_OPTS += --disable-utf8proc +endif + +# tmux uses custom --enable-static option, instead of standard libtool +# directive resulting in a build failure with systemd or utf8proc +ifeq ($(BR2_SHARED_STATIC_LIBS),y) +TMUX_CONF_OPTS += --disable-static +endif + # Add /usr/bin/tmux to /etc/shells otherwise some login tools like dropbear # can reject the user connection. See man shells. define TMUX_ADD_TMUX_TO_SHELLS diff --git a/package/tor/0001-Fix-static-linking-with-OpenSSL.patch b/package/tor/0001-Fix-static-linking-with-OpenSSL.patch deleted file mode 100644 index 26ed6fe8191..00000000000 --- a/package/tor/0001-Fix-static-linking-with-OpenSSL.patch +++ /dev/null @@ -1,94 +0,0 @@ -From ba6b8ee5b6dee19493a150c3715b0e202440d206 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Thu, 24 Jan 2019 18:19:51 +0100 -Subject: [PATCH] Fix static linking with OpenSSL - -Adjust link order of libz to solve bug with static linking -and remove host paths when looking for openssl. - -[Vincent: - - Adapt the patch to make it apply on the new version.] -[Bernd: rebased for tor-0.2.7.6, 0.2.8.10, 0.2.9.9, 0.3.1.7, 0.3.2.10, - 0.3.4.8, 0.3.5.7, 0.4.4.5, 0.4.5.6 & 0.4.6.7] -[Fabrice: fix detection of openssl functions in 0.3.5.8] -Signed-off-by: Vicente Olivert Riera -Signed-off-by: Bernd Kuhls -Signed-off-by: Fabrice Fontaine ---- - configure.ac | 4 ++-- - src/test/include.am | 8 ++++---- - src/tools/include.am | 4 ++-- - 4 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 05e1392cf..580befa6b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1074,7 +1074,7 @@ AC_ARG_WITH(ssl-dir, - ]) - - AC_MSG_NOTICE([Now, we'll look for OpenSSL >= 1.0.1]) --TOR_SEARCH_LIBRARY(openssl, $tryssldir, [-lssl -lcrypto $TOR_LIB_GDI $TOR_LIB_WS32 $TOR_LIB_CRYPT32], -+TOR_SEARCH_LIBRARY(openssl, $tryssldir, [-lssl -lcrypto -lz $TOR_LIB_GDI $TOR_LIB_WS32 $TOR_LIB_CRYPT32], - [#include - char *getenv(const char *);], - [struct ssl_cipher_st; -@@ -1104,7 +1104,7 @@ dnl Now check for particular openssl functions. - save_LIBS="$LIBS" - save_LDFLAGS="$LDFLAGS" - save_CPPFLAGS="$CPPFLAGS" --LIBS="$TOR_OPENSSL_LIBS $LIBS" -+LIBS="$TOR_OPENSSL_LIBS -lz $LIBS" - LDFLAGS="$TOR_LDFLAGS_openssl $LDFLAGS" - CPPFLAGS="$TOR_CPPFLAGS_openssl $CPPFLAGS" - -diff --git a/src/test/include.am b/src/test/include.am -index ecb768957..39a622e88 100644 ---- a/src/test/include.am -+++ b/src/test/include.am -@@ -399,8 +399,8 @@ src_test_test_ntor_cl_LDFLAGS = @TOR_LDFLAGS_zlib@ $(TOR_LDFLAGS_CRYPTLIB) - src_test_test_ntor_cl_LDADD = \ - libtor.a \ - $(rust_ldadd) \ -- @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ \ -- $(TOR_LIBS_CRYPTLIB) @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_SHLWAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ -+ @TOR_LIB_MATH@ \ -+ $(TOR_LIBS_CRYPTLIB) @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_SHLWAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ - @CURVE25519_LIBS@ @TOR_LZMA_LIBS@ @TOR_TRACE_LIBS@ - src_test_test_ntor_cl_AM_CPPFLAGS = \ - $(AM_CPPFLAGS) -@@ -409,8 +409,8 @@ - src_test_test_hs_ntor_cl_LDFLAGS = @TOR_LDFLAGS_zlib@ $(TOR_LDFLAGS_CRYPTLIB) - src_test_test_hs_ntor_cl_LDADD = \ - libtor.a \ -- @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ \ -- $(TOR_LIBS_CRYPTLIB) @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_SHLWAPI@ @TOR_LIB_GDI@ \ -+ @TOR_LIB_MATH@ \ -+ $(TOR_LIBS_CRYPTLIB) @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_SHLWAPI@ @TOR_LIB_GDI@ \ - @CURVE25519_LIBS@ @TOR_TRACE_LIBS@ - src_test_test_hs_ntor_cl_AM_CPPFLAGS = \ - $(AM_CPPFLAGS) -diff --git a/src/tools/include.am b/src/tools/include.am -index f7aa7e0d1..4c4e8aa7a 100644 ---- a/src/tools/include.am -+++ b/src/tools/include.am -@@ -35,7 +35,7 @@ src_tools_tor_gencert_LDADD = \ - $(TOR_CRYPTO_LIBS) \ - $(TOR_UTIL_LIBS) \ - $(rust_ldadd) \ -- @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ $(TOR_LIBS_CRYPTLIB) \ -+ @TOR_LIB_MATH@ $(TOR_LIBS_CRYPTLIB) @TOR_ZLIB_LIBS@ \ - @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_SHLWAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ @CURVE25519_LIBS@ - endif - -@@ -45,7 +45,7 @@ src_tools_tor_print_ed_signing_cert_LDADD = \ - src/trunnel/libor-trunnel.a \ - $(TOR_CRYPTO_LIBS) \ - $(TOR_UTIL_LIBS) \ -- @TOR_LIB_MATH@ $(TOR_LIBS_CRYPTLIB) \ -+ @TOR_LIB_MATH@ $(TOR_LIBS_CRYPTLIB) @TOR_ZLIB_LIBS@ \ - @TOR_LIB_WS32@ @TOR_LIB_USERENV@ @TOR_LIB_SHLWAPI@ @TOR_LIB_GDI@ - - if USE_NSS --- -2.20.1 diff --git a/package/tor/0001-patch-src_lib_crypt_ops_crypto_dh_openssl_c.patch b/package/tor/0001-patch-src_lib_crypt_ops_crypto_dh_openssl_c.patch new file mode 100644 index 00000000000..2df7c6b6a78 --- /dev/null +++ b/package/tor/0001-patch-src_lib_crypt_ops_crypto_dh_openssl_c.patch @@ -0,0 +1,67 @@ +Fix build with opaque structs in LibreSSL 3.5 + +Downloaded from OpenBSD ports: +http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/net/tor/patches/patch-src_lib_crypt_ops_crypto_dh_openssl_c?rev=1.2&content-type=text/x-cvsweb-markup + +Patch series was sent upstream: +https://forum.torproject.net/t/tor-relays-openbsd-stable-net-tor-and-0-4-7-7/3244 + +Signed-off-by: Bernd Kuhls + +Index: src/lib/crypt_ops/crypto_dh_openssl.c +--- a/src/lib/crypt_ops/crypto_dh_openssl.c.orig ++++ b/src/lib/crypt_ops/crypto_dh_openssl.c +@@ -60,7 +60,7 @@ crypto_validate_dh_params(const BIGNUM *p, const BIGNU + /* Copy into a temporary DH object, just so that DH_check() can be called. */ + if (!(dh = DH_new())) + goto out; +-#ifdef OPENSSL_1_1_API ++#if defined(OPENSSL_1_1_API) || defined(LIBRESSL_VERSION_NUMBER) + BIGNUM *dh_p, *dh_g; + if (!(dh_p = BN_dup(p))) + goto out; +@@ -223,7 +223,7 @@ new_openssl_dh_from_params(BIGNUM *p, BIGNUM *g) + goto err; + } + +-#ifdef OPENSSL_1_1_API ++#if defined(OPENSSL_1_1_API) || defined(LIBRESSL_VERSION_NUMBER) + + if (!DH_set0_pqg(res_dh, dh_p, NULL, dh_g)) { + goto err; +@@ -276,7 +276,7 @@ crypto_dh_get_bytes(crypto_dh_t *dh) + int + crypto_dh_generate_public(crypto_dh_t *dh) + { +-#ifndef OPENSSL_1_1_API ++#if !defined(OPENSSL_1_1_API) && !defined(LIBRESSL_VERSION_NUMBER) + again: + #endif + if (!DH_generate_key(dh->dh)) { +@@ -286,7 +286,7 @@ crypto_dh_generate_public(crypto_dh_t *dh) + return -1; + /* LCOV_EXCL_STOP */ + } +-#ifdef OPENSSL_1_1_API ++#if defined(OPENSSL_1_1_API) || defined(LIBRESSL_VERSION_NUMBER) + /* OpenSSL 1.1.x doesn't appear to let you regenerate a DH key, without + * recreating the DH object. I have no idea what sort of aliasing madness + * can occur here, so do the check, and just bail on failure. +@@ -327,7 +327,7 @@ crypto_dh_get_public(crypto_dh_t *dh, char *pubkey, si + + const BIGNUM *dh_pub; + +-#ifdef OPENSSL_1_1_API ++#if defined(OPENSSL_1_1_API) || defined(LIBRESSL_VERSION_NUMBER) + const BIGNUM *dh_priv; + DH_get0_key(dh->dh, &dh_pub, &dh_priv); + #else +@@ -338,7 +338,7 @@ crypto_dh_get_public(crypto_dh_t *dh, char *pubkey, si + if (crypto_dh_generate_public(dh)<0) + return -1; + else { +-#ifdef OPENSSL_1_1_API ++#if defined(OPENSSL_1_1_API) || defined(LIBRESSL_VERSION_NUMBER) + DH_get0_key(dh->dh, &dh_pub, &dh_priv); + #else + dh_pub = dh->dh->pub_key; diff --git a/package/tor/0002-patch-src_lib_crypt_ops_crypto_rsa_openssl_c.patch b/package/tor/0002-patch-src_lib_crypt_ops_crypto_rsa_openssl_c.patch new file mode 100644 index 00000000000..1354a4221e0 --- /dev/null +++ b/package/tor/0002-patch-src_lib_crypt_ops_crypto_rsa_openssl_c.patch @@ -0,0 +1,58 @@ +Fix build with opaque structs in LibreSSL 3.5 + +Downloaded from OpenBSD ports: +http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/net/tor/patches/patch-src_lib_crypt_ops_crypto_rsa_openssl_c?rev=1.2&content-type=text/x-cvsweb-markup + +Patch series was sent upstream: +https://forum.torproject.net/t/tor-relays-openbsd-stable-net-tor-and-0-4-7-7/3244 + +Signed-off-by: Bernd Kuhls + +Index: src/lib/crypt_ops/crypto_rsa_openssl.c +--- a/src/lib/crypt_ops/crypto_rsa_openssl.c.orig ++++ b/src/lib/crypt_ops/crypto_rsa_openssl.c +@@ -47,7 +47,7 @@ struct crypto_pk_t + int + crypto_pk_key_is_private(const crypto_pk_t *k) + { +-#ifdef OPENSSL_1_1_API ++#if defined(OPENSSL_1_1_API) || defined(LIBRESSL_VERSION_NUMBER) + if (!k || !k->key) + return 0; + +@@ -212,7 +212,7 @@ crypto_pk_public_exponent_ok(const crypto_pk_t *env) + + const BIGNUM *e; + +-#ifdef OPENSSL_1_1_API ++#if defined(OPENSSL_1_1_API) || defined(LIBRESSL_VERSION_NUMBER) + const BIGNUM *n, *d; + RSA_get0_key(env->key, &n, &e, &d); + #else +@@ -242,7 +242,7 @@ crypto_pk_cmp_keys(const crypto_pk_t *a, const crypto_ + const BIGNUM *a_n, *a_e; + const BIGNUM *b_n, *b_e; + +-#ifdef OPENSSL_1_1_API ++#if defined(OPENSSL_1_1_API) || defined(LIBRESSL_VERSION_NUMBER) + const BIGNUM *a_d, *b_d; + RSA_get0_key(a->key, &a_n, &a_e, &a_d); + RSA_get0_key(b->key, &b_n, &b_e, &b_d); +@@ -279,7 +279,7 @@ crypto_pk_num_bits(crypto_pk_t *env) + tor_assert(env); + tor_assert(env->key); + +-#ifdef OPENSSL_1_1_API ++#if defined(OPENSSL_1_1_API) || defined(LIBRESSL_VERSION_NUMBER) + /* It's so stupid that there's no other way to check that n is valid + * before calling RSA_bits(). + */ +@@ -572,7 +572,7 @@ static bool + rsa_private_key_too_long(RSA *rsa, int max_bits) + { + const BIGNUM *n, *e, *p, *q, *d, *dmp1, *dmq1, *iqmp; +-#ifdef OPENSSL_1_1_API ++#if defined(OPENSSL_1_1_API) || defined(LIBRESSL_VERSION_NUMBER) + + #if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,1) + n = RSA_get0_n(rsa); diff --git a/package/tor/0003-patch-src_lib_tls_x509_openssl_c.patch b/package/tor/0003-patch-src_lib_tls_x509_openssl_c.patch new file mode 100644 index 00000000000..fe8586357a6 --- /dev/null +++ b/package/tor/0003-patch-src_lib_tls_x509_openssl_c.patch @@ -0,0 +1,22 @@ +Fix build with opaque structs in LibreSSL 3.5 + +Downloaded from OpenBSD ports: +http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/net/tor/patches/patch-src_lib_tls_x509_openssl_c?rev=1.2&content-type=text/x-cvsweb-markup + +Patch series was sent upstream: +https://forum.torproject.net/t/tor-relays-openbsd-stable-net-tor-and-0-4-7-7/3244 + +Signed-off-by: Bernd Kuhls + +Index: src/lib/tls/x509_openssl.c +--- a/src/lib/tls/x509_openssl.c.orig ++++ b/src/lib/tls/x509_openssl.c +@@ -329,7 +329,7 @@ tor_tls_cert_is_valid(int severity, + cert_key = X509_get_pubkey(cert->cert); + if (check_rsa_1024 && cert_key) { + RSA *rsa = EVP_PKEY_get1_RSA(cert_key); +-#ifdef OPENSSL_1_1_API ++#if defined(OPENSSL_1_1_API) || defined(LIBRESSL_VERSION_NUMBER) + if (rsa && RSA_bits(rsa) == 1024) { + #else + if (rsa && BN_num_bits(rsa->n) == 1024) { diff --git a/package/tor/tor.hash b/package/tor/tor.hash index 16e01c80a9f..a6b5f27c402 100644 --- a/package/tor/tor.hash +++ b/package/tor/tor.hash @@ -1,3 +1,4 @@ +# From https://dist.torproject.org/tor-0.4.7.14.tar.gz.sha256sum +sha256 a5ac67f6466380fc05e8043d01c581e4e8a2b22fe09430013473e71065e65df8 tor-0.4.7.14.tar.gz # Locally computed -sha256 94ccd60e04e558f33be73032bc84ea241660f92f58cfb88789bda6893739e31c tor-0.4.6.10.tar.gz sha256 47b54ed17e8fdcab3c44729a1789a09b208f9a63a845a7e50def9df729eebad0 LICENSE diff --git a/package/tor/tor.mk b/package/tor/tor.mk index d16b3541ebb..b794296c6a3 100644 --- a/package/tor/tor.mk +++ b/package/tor/tor.mk @@ -4,14 +4,13 @@ # ################################################################################ -TOR_VERSION = 0.4.6.10 +TOR_VERSION = 0.4.7.14 TOR_SITE = https://dist.torproject.org TOR_LICENSE = BSD-3-Clause TOR_LICENSE_FILES = LICENSE TOR_CPE_ID_VENDOR = torproject TOR_SELINUX_MODULES = tor TOR_DEPENDENCIES = libevent openssl zlib -TOR_AUTORECONF = YES TOR_CONF_OPTS = \ --disable-gcc-hardening \ @@ -64,8 +63,12 @@ endif TOR_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -TOR_CONF_ENV += LIBS=-latomic +TOR_LIBS += -latomic endif +ifeq ($(BR2_STATIC_LIBS),y) +TOR_LIBS += -lz +endif +TOR_CONF_ENV += LIBS="$(TOR_LIBS)" define TOR_INSTALL_CONF $(INSTALL) -D -m 644 $(@D)/src/config/torrc.minimal \ diff --git a/package/tovid/Config.in b/package/tovid/Config.in index 3dbb0e229e0..c263acdd62b 100644 --- a/package/tovid/Config.in +++ b/package/tovid/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_TOVID bool "tovid" depends on BR2_USE_MMU # fork() - depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # mpv depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR depends on BR2_PACKAGE_PYTHON3 @@ -29,12 +29,12 @@ config BR2_PACKAGE_TOVID http://tovid.wikia.com/wiki/Installing_tovid -comment "tovid needs a toolchain w/ threads, C++, wchar, gcc >= 4.9" +comment "tovid needs a toolchain w/ NPTL, C++, wchar, gcc >= 4.9" depends on BR2_USE_MMU depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_TOOLCHAIN_HAS_THREADS \ + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL \ || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 \ || !BR2_INSTALL_LIBSTDCPP \ || !BR2_USE_WCHAR @@ -45,6 +45,6 @@ comment "tovid depends on python3" depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 depends on !BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC diff --git a/package/tovid/tovid.hash b/package/tovid/tovid.hash index 89d0461a986..430ea52c1ba 100644 --- a/package/tovid/tovid.hash +++ b/package/tovid/tovid.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c03a746a3592a656bab0be4045da114a4231eb0f858d6c18503dac64049fbe48 tovid-87c676f4aadb7303d2cd921380b054bafa4b85bb.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 c03a746a3592a656bab0be4045da114a4231eb0f858d6c18503dac64049fbe48 tovid-87c676f4aadb7303d2cd921380b054bafa4b85bb.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/tpm-tools/tpm-tools.hash b/package/tpm-tools/tpm-tools.hash index a2da230a7ef..bfbdfb83555 100644 --- a/package/tpm-tools/tpm-tools.hash +++ b/package/tpm-tools/tpm-tools.hash @@ -1,7 +1,7 @@ # http://sourceforge.net/projects/trousers/files/tpm-tools/1.3.9.1/ -sha1 c35cb031c6b5220dd1c8a03995654fdd12aa3031 tpm-tools-1.3.9.1.tar.gz -md5 1532293aa632a0eaa7e60df87c779855 tpm-tools-1.3.9.1.tar.gz +sha1 c35cb031c6b5220dd1c8a03995654fdd12aa3031 tpm-tools-1.3.9.1.tar.gz +md5 1532293aa632a0eaa7e60df87c779855 tpm-tools-1.3.9.1.tar.gz # Locally calculated -sha256 9cb714e2650826e2e932f65bc0ba9d61b927dc5fea47f2c2a2b64f0fdfcbfa68 tpm-tools-1.3.9.1.tar.gz -sha256 7b47225a5b77cb7825efc6a4d7e0ac57864c790542cf92f5080ec2bf310c00e5 LICENSE +sha256 9cb714e2650826e2e932f65bc0ba9d61b927dc5fea47f2c2a2b64f0fdfcbfa68 tpm-tools-1.3.9.1.tar.gz +sha256 7b47225a5b77cb7825efc6a4d7e0ac57864c790542cf92f5080ec2bf310c00e5 LICENSE diff --git a/package/tpm2-pkcs11/tpm2-pkcs11.hash b/package/tpm2-pkcs11/tpm2-pkcs11.hash index 1d5bcc7a546..b027bad72aa 100644 --- a/package/tpm2-pkcs11/tpm2-pkcs11.hash +++ b/package/tpm2-pkcs11/tpm2-pkcs11.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 078a445ed0e9f5009675a162b4b7b88f3520436cfbc791bb2249f37bd1f475bd tpm2-pkcs11-1.7.0.tar.gz +sha256 79f28899047defd6b4b72b7268dd56abf27774954022315f818c239af33e05bd tpm2-pkcs11-1.8.0.tar.gz sha256 793aa007f793458434d7cc60b1c827053a399308658b32fcaa6023802adc22e1 LICENSE diff --git a/package/tpm2-pkcs11/tpm2-pkcs11.mk b/package/tpm2-pkcs11/tpm2-pkcs11.mk index adb5a46f56c..9d613407754 100644 --- a/package/tpm2-pkcs11/tpm2-pkcs11.mk +++ b/package/tpm2-pkcs11/tpm2-pkcs11.mk @@ -4,14 +4,15 @@ # ################################################################################ -TPM2_PKCS11_VERSION = 1.7.0 +TPM2_PKCS11_VERSION = 1.8.0 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 TPM2_PKCS11_DEPENDENCIES = host-pkgconf libyaml openssl sqlite tpm2-tss TPM2_PKCS11_CONF_OPTS += \ - --disable-hardening + --disable-hardening \ + --disable-ptool-checks # Fix tpm.c:746:5: error: 'for' loop initial declarations are only allowed in C99 mode # Fix implicit declaration of function 'strnlen' diff --git a/package/tpm2-tools/Config.in b/package/tpm2-tools/Config.in index 1a6698570af..0dcf176dfda 100644 --- a/package/tpm2-tools/Config.in +++ b/package/tpm2-tools/Config.in @@ -21,6 +21,18 @@ config BR2_PACKAGE_TPM2_TOOLS https://github.com/tpm2-software/tpm2-tools +if BR2_PACKAGE_TPM2_TOOLS + +config BR2_PACKAGE_TPM2_TOOLS_FAPI + bool "fapi tools" + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + select BR2_PACKAGE_TPM2_TSS_FAPI + help + This option enables Feature API (FAPI) support in + tpm2-tools. The FAPI tools are prefixed with tss2_. + +endif + comment "tpm2-tools needs a glibc or musl toolchain w/ dynamic library, wchar" depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || \ !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) diff --git a/package/tpm2-tools/tpm2-tools.mk b/package/tpm2-tools/tpm2-tools.mk index 86753448058..01b029d9427 100644 --- a/package/tpm2-tools/tpm2-tools.mk +++ b/package/tpm2-tools/tpm2-tools.mk @@ -20,4 +20,10 @@ TPM2_TOOLS_CONF_OPTS = --disable-hardening # do not build man pages TPM2_TOOLS_CONF_ENV += ac_cv_prog_PANDOC='' +ifeq ($(BR2_PACKAGE_TPM2_TOOLS_FAPI),y) +TPM2_TOOLS_CONF_OPTS += --enable-fapi +else +TPM2_TOOLS_CONF_OPTS += --disable-fapi +endif + $(eval $(autotools-package)) diff --git a/package/tpm2-totp/tpm2-totp.hash b/package/tpm2-totp/tpm2-totp.hash index a3fcb394cf1..f7cf06162c3 100644 --- a/package/tpm2-totp/tpm2-totp.hash +++ b/package/tpm2-totp/tpm2-totp.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 0b2b63cc7ea74f5a6952f2cd689896c08f6b94ee6865f48af609f9a8ac247dc1 tpm2-totp-0.2.1.tar.gz -sha256 67bc21a0bff2b0890307cfaa883bd3f5337f461eb6d8a612a015cea6d704e9ed LICENSE +sha256 0b2b63cc7ea74f5a6952f2cd689896c08f6b94ee6865f48af609f9a8ac247dc1 tpm2-totp-0.2.1.tar.gz +sha256 67bc21a0bff2b0890307cfaa883bd3f5337f461eb6d8a612a015cea6d704e9ed LICENSE diff --git a/package/tpm2-tss/tpm2-tss.hash b/package/tpm2-tss/tpm2-tss.hash index b6eb3c1f976..c9fa4e6ae0f 100644 --- a/package/tpm2-tss/tpm2-tss.hash +++ b/package/tpm2-tss/tpm2-tss.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 8900a6603f74310b749b65f23c3461cde6e2a23a5f61058b21004c25f9cf19e8 tpm2-tss-3.1.0.tar.gz +sha256 ba9e52117f254f357ff502e7d60fce652b3bfb26327d236bbf5ab634235e40f1 tpm2-tss-3.2.2.tar.gz sha256 18c1bf4b1ba1fb2c4ffa7398c234d83c0d55475298e470ae1e5e3a8a8bd2e448 LICENSE diff --git a/package/tpm2-tss/tpm2-tss.mk b/package/tpm2-tss/tpm2-tss.mk index 060883c377e..10d605fc65c 100644 --- a/package/tpm2-tss/tpm2-tss.mk +++ b/package/tpm2-tss/tpm2-tss.mk @@ -4,7 +4,7 @@ # ################################################################################ -TPM2_TSS_VERSION = 3.1.0 +TPM2_TSS_VERSION = 3.2.2 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 @@ -26,7 +26,8 @@ TPM2_TSS_CONF_OPTS = \ ac_cv_prog_result_setfacl=yes \ ac_cv_prog_systemd_sysusers=no \ ac_cv_prog_systemd_tmpfiles=no \ - ac_cv_prog_result_useradd=yes \ + ac_cv_prog_useradd=yes \ + ac_cv_prog_groupadd=yes \ --with-crypto=ossl \ --disable-doxygen-doc \ --disable-defaultflags diff --git a/package/trace-cmd/Config.in b/package/trace-cmd/Config.in index 574541c571e..2d0accd7aea 100644 --- a/package/trace-cmd/Config.in +++ b/package/trace-cmd/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_TRACE_CMD bool "trace-cmd" - depends on BR2_TOOLCHAIN_HAS_THREADS + # pthread_setaffinity_np + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_USE_MMU # fork() depends on !BR2_STATIC_LIBS # dlopen() help @@ -13,6 +14,6 @@ config BR2_PACKAGE_TRACE_CMD http://git.kernel.org/cgit/linux/kernel/git/rostedt/trace-cmd.git -comment "trace-cmd needs a toolchain w/ threads, dynamic library" +comment "trace-cmd needs a toolchain w/ NPTL, dynamic library" depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS diff --git a/package/trace-cmd/trace-cmd.hash b/package/trace-cmd/trace-cmd.hash index 00cecc7828a..4d39e4d5ea3 100644 --- a/package/trace-cmd/trace-cmd.hash +++ b/package/trace-cmd/trace-cmd.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 45924a763376a700221f64b4034f87263e4038ec88b120a0abfb5743d051d068 trace-cmd-v2.9.6.tar.gz +sha256 a74d9ade2633b88d0ad199360d51996427e23f4835594133e456cd6e3bd3a651 trace-cmd-v2.9.7.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 fe0cd71ec44..52bb99036c4 100644 --- a/package/trace-cmd/trace-cmd.mk +++ b/package/trace-cmd/trace-cmd.mk @@ -4,7 +4,7 @@ # ################################################################################ -TRACE_CMD_VERSION = 2.9.6 +TRACE_CMD_VERSION = 2.9.7 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 b9525487417..83791c18a43 100644 --- a/package/traceroute/traceroute.hash +++ b/package/traceroute/traceroute.hash @@ -1,6 +1,6 @@ # Locally computed: -sha256 3669d22a34d3f38ed50caba18cd525ba55c5c00d5465f2d20d7472e5d81603b6 traceroute-2.1.0.tar.gz +sha256 3669d22a34d3f38ed50caba18cd525ba55c5c00d5465f2d20d7472e5d81603b6 traceroute-2.1.0.tar.gz # Hash for license files: -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/tree/tree.hash b/package/tree/tree.hash index 6bffaa5ec01..298153c89c5 100644 --- a/package/tree/tree.hash +++ b/package/tree/tree.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 715d5d4b434321ce74706d0dd067505bb60c5ea83b5f0b3655dae40aa6f9b7c2 tree-1.8.0.tgz -sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 LICENSE +sha256 7d693a1d88d3c4e70a73e03b8dbbdc12c2945d482647494f2f5bd83a479eeeaf tree-2.0.2.tgz +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 LICENSE diff --git a/package/tree/tree.mk b/package/tree/tree.mk index b6c63c0244e..da0acbae49b 100644 --- a/package/tree/tree.mk +++ b/package/tree/tree.mk @@ -4,14 +4,15 @@ # ################################################################################ -TREE_VERSION = 1.8.0 +TREE_VERSION = 2.0.2 TREE_SOURCE = tree-$(TREE_VERSION).tgz TREE_SITE = http://mama.indstate.edu/users/ice/tree/src TREE_LICENSE = GPL-2.0+ TREE_LICENSE_FILES = LICENSE define TREE_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) + $(MAKE) $(TARGET_CONFIGURE_OPTS) CFLAGS="$(TARGET_CFLAGS) -std=c99" \ + -C $(@D) endef define TREE_INSTALL_TARGET_CMDS diff --git a/package/trinity/0003-Use-fcntl-h-for-dev_t-mode_t.patch b/package/trinity/0003-Use-fcntl-h-for-dev_t-mode_t.patch new file mode 100644 index 00000000000..c4d9811b8af --- /dev/null +++ b/package/trinity/0003-Use-fcntl-h-for-dev_t-mode_t.patch @@ -0,0 +1,46 @@ +From b1a0aef9978d4a41e7e601c277d4fb1b0cfbed89 Mon Sep 17 00:00:00 2001 +From: Dave Jones +Date: Thu, 26 Aug 2021 11:17:34 -0400 +Subject: [PATCH] Use fcntl.h for dev_t & mode_t +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Should fix: + +In file included from /usr/include/bits/statx.h:31, + from /usr/include/sys/stat.h:446, + from include/files.h:3, + from include/shm.h:6, + from syscalls/x86/modify_ldt.c:12: +/usr/include/linux/stat.h:57:2: error: unknown type name ‘__s64’ + __s64 tv_sec; + ^~~~~ +/usr/include/linux/stat.h:58:2: error: unknown type name ‘__u32’ + __u32 tv_nsec; + ^~~~~ +/usr/include/linux/stat.h:59:2: error: unknown type name ‘__s32’ + __s32 __reserved; + ^~~~~ +/usr/include/linux/stat.h:101:2: error: unknown type name ‘__u32’ + __u32 stx_mask; /* What results were written [uncond] */ + +[Retrieved from: +https://github.com/kernelslacker/trinity/commit/b1a0aef9978d4a41e7e601c277d4fb1b0cfbed89] +Signed-off-by: Fabrice Fontaine +--- + include/files.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/files.h b/include/files.h +index 2a8e0e2d..ba3cc98f 100644 +--- a/include/files.h ++++ b/include/files.h +@@ -1,6 +1,6 @@ + #pragma once + +-#include ++#include + #include "fd.h" + + unsigned long get_o_flags(void); diff --git a/package/trinity/0004-drop-decnet.patch b/package/trinity/0004-drop-decnet.patch new file mode 100644 index 00000000000..15ba7f8e824 --- /dev/null +++ b/package/trinity/0004-drop-decnet.patch @@ -0,0 +1,130 @@ +From ec8dcc7faf13c57f5f6d785e4429818f1239a058 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 8 Jan 2023 20:50:18 +0100 +Subject: [PATCH] drop decnet + +Drop decnet as it has been removed since kernel 6.1 and +https://github.com/torvalds/linux/commit/1202cdd665315c525b5237e96e0bedc76d7e754f +resulting in the following build failure: + +net/proto-decnet.c:5:10: fatal error: linux/dn.h: No such file or directory + 5 | #include + | ^~~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/47e0a5e0b6fcf33ab4f9848d5d8c2be9e5283950 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/kernelslacker/trinity/pull/41] +--- + include/net.h | 1 - + net/proto-decnet.c | 59 ---------------------------------------------- + net/proto-unix.c | 1 - + net/protocols.c | 1 - + 4 files changed, 62 deletions(-) + delete mode 100644 net/proto-decnet.c + +diff --git a/include/net.h b/include/net.h +index 99d55363..791e8090 100644 +--- a/include/net.h ++++ b/include/net.h +@@ -80,7 +80,6 @@ extern const struct netproto proto_atmpvc; + extern const struct netproto proto_atmsvc; + extern const struct netproto proto_x25; + extern const struct netproto proto_rose; +-extern const struct netproto proto_decnet; + extern const struct netproto proto_llc; + extern const struct netproto proto_netlink; + extern const struct netproto proto_packet; +diff --git a/net/proto-decnet.c b/net/proto-decnet.c +deleted file mode 100644 +index 7711cf00..00000000 +--- a/net/proto-decnet.c ++++ /dev/null +@@ -1,59 +0,0 @@ +-#include +-#include +-#include +-#include +-#include +-#include +-#include "net.h" +-#include "random.h" +-#include "utils.h" // RAND_ARRAY +-#include "compat.h" +- +-static void decnet_gen_sockaddr(struct sockaddr **addr, socklen_t *addrlen) +-{ +- struct sockaddr_dn *dn; +- unsigned int i; +- +- dn = zmalloc(sizeof(struct sockaddr_dn)); +- +- dn->sdn_family = PF_DECnet; +- dn->sdn_flags = rnd(); +- dn->sdn_objnum = rnd(); +- dn->sdn_objnamel = rnd() % 16; +- for (i = 0; i < dn->sdn_objnamel; i++) +- dn->sdn_objname[i] = rnd(); +- dn->sdn_add.a_len = RAND_BOOL(); +- dn->sdn_add.a_addr[0] = rnd(); +- dn->sdn_add.a_addr[1] = rnd(); +- *addr = (struct sockaddr *) dn; +- *addrlen = sizeof(struct sockaddr_dn); +-} +- +-static const unsigned int decnet_opts[] = { +- SO_CONDATA, SO_CONACCESS, SO_PROXYUSR, SO_LINKINFO, +- DSO_CONDATA, DSO_DISDATA, DSO_CONACCESS, DSO_ACCEPTMODE, +- DSO_CONACCEPT, DSO_CONREJECT, DSO_LINKINFO, DSO_STREAM, +- DSO_SEQPACKET, DSO_MAXWINDOW, DSO_NODELAY, DSO_CORK, +- DSO_SERVICES, DSO_INFO +-}; +- +-static void decnet_setsockopt(struct sockopt *so, __unused__ struct socket_triplet *triplet) +-{ +- so->level = SOL_DECNET; +- so->optname = RAND_ARRAY(decnet_opts); +- +- // TODO: set optlen correctly +-} +- +-static struct socket_triplet decnet_triplets[] = { +- { .family = PF_DECnet, .protocol = DNPROTO_NSP, .type = SOCK_SEQPACKET }, +- { .family = PF_DECnet, .protocol = DNPROTO_NSP, .type = SOCK_STREAM }, +-}; +- +-const struct netproto proto_decnet = { +- .name = "decnet", +- .setsockopt = decnet_setsockopt, +- .gen_sockaddr = decnet_gen_sockaddr, +- .valid_triplets = decnet_triplets, +- .nr_triplets = ARRAY_SIZE(decnet_triplets), +-}; +diff --git a/net/proto-unix.c b/net/proto-unix.c +index f7427a22..119c1429 100644 +--- a/net/proto-unix.c ++++ b/net/proto-unix.c +@@ -2,7 +2,6 @@ + #include + #include + #include +-#include + #include + #include "net.h" + #include "random.h" +diff --git a/net/protocols.c b/net/protocols.c +index ea64d5f5..278f08b5 100644 +--- a/net/protocols.c ++++ b/net/protocols.c +@@ -18,7 +18,6 @@ const struct protoptr net_protocols[TRINITY_PF_MAX] = { + #ifdef USE_IPV6 + [PF_INET6] = { .proto = &proto_inet6 }, + #endif +- [PF_DECnet] = { .proto = &proto_decnet }, + [PF_PACKET] = { .proto = &proto_packet }, + #ifdef USE_NETECONET + [PF_ECONET] = { .proto = &proto_econet }, +-- +2.39.0 + diff --git a/package/trinity/trinity.hash b/package/trinity/trinity.hash index f7522514e19..24da8ea6846 100644 --- a/package/trinity/trinity.hash +++ b/package/trinity/trinity.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7e0da953c2cc6fb3907d1f37d35f61836433fb50e97117a72eef113abb783dc6 trinity-1.9.tar.xz -sha256 35e3fc68c89fd7b8f72fd910b521cb3292f859e9181f3c26bd0df84d144bc1d4 COPYING +sha256 7e0da953c2cc6fb3907d1f37d35f61836433fb50e97117a72eef113abb783dc6 trinity-1.9.tar.xz +sha256 35e3fc68c89fd7b8f72fd910b521cb3292f859e9181f3c26bd0df84d144bc1d4 COPYING diff --git a/package/trousers/0003-Fix-build-with-LibreSSL-2-7.patch b/package/trousers/0003-Fix-build-with-LibreSSL-2-7.patch new file mode 100644 index 00000000000..65da979f227 --- /dev/null +++ b/package/trousers/0003-Fix-build-with-LibreSSL-2-7.patch @@ -0,0 +1,24 @@ +Fix build with LibreSSL 2.7 + +LibreSSL 2.7 implemented OpenSSL 1.1 API + +See also: https://reviews.freebsd.org/D14849#change-KhYbRXBMIBod + +Cheers, +Bernard Spil (brnrd@FreeBSD.org) + +[Retrieved (and backported) from: +https://sourceforge.net/p/trousers/bugs/234] +Signed-off-by: Fabrice Fontaine + +--- ./src/trspi/crypto/openssl/rsa.c.orig 2016-11-23 12:26:19 UTC ++++ ./src/trspi/crypto/openssl/rsa.c +@@ -38,7 +38,7 @@ + #define DEBUG_print_openssl_errors() + #endif + +-#if (OPENSSL_VERSION_NUMBER < 0x10100001L) || defined(LIBRESSL_VERSION_NUMBER) ++#if (OPENSSL_VERSION_NUMBER < 0x10100001L) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) + static int + RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d) + { diff --git a/package/ts4900-fpga/Config.in b/package/ts4900-fpga/Config.in index 7aa94e26f23..9f704fbc8c9 100644 --- a/package/ts4900-fpga/Config.in +++ b/package/ts4900-fpga/Config.in @@ -8,4 +8,4 @@ config BR2_PACKAGE_TS4900_FPGA It is loaded by U-Boot during the boot sequence, the default U-boot script expects to find it in the /boot folder. - http://wiki.embeddedarm.com/wiki/TS-4900#FPGA_Changelog + https://docs.embeddedts.com/TS-4900#FPGA_Changelog diff --git a/package/ts4900-fpga/ts4900-fpga.hash b/package/ts4900-fpga/ts4900-fpga.hash index 2147aeb3c2e..1d3c62bfd11 100644 --- a/package/ts4900-fpga/ts4900-fpga.hash +++ b/package/ts4900-fpga/ts4900-fpga.hash @@ -1,5 +1,5 @@ -# From ftp://ftp.embeddedarm.com/ts-socket-macrocontrollers/ts-4900-linux/fpga/ts4900-fpga-20150930.bin.md5 -md5 bf93c03ef914cf008287c8cd60781cc8 ts4900-fpga-20150930.bin +# From https://files.embeddedts.com/ts-socket-macrocontrollers/ts-4900-linux/fpga//ts4900-fpga-20170510.bin.md5 +md5 86c7c3d7fb9c607af1ef55e1222b4416 ts4900-fpga-20170510.bin # Locally calculated -sha256 242ac6a90bea9a95c937ea8952cdc9b02f543cea24a0359bed66a408a6dd8bf9 ts4900-fpga-20150930.bin +sha256 f15edd6813ee5e93e7f380d85df2dc31e764ebca465093fb9006d56ee15b476b ts4900-fpga-20170510.bin diff --git a/package/ts4900-fpga/ts4900-fpga.mk b/package/ts4900-fpga/ts4900-fpga.mk index 7bb62a39849..73e7a28e31f 100644 --- a/package/ts4900-fpga/ts4900-fpga.mk +++ b/package/ts4900-fpga/ts4900-fpga.mk @@ -4,11 +4,11 @@ # ################################################################################ -TS4900_FPGA_VERSION = 20150930 +TS4900_FPGA_VERSION = 20170510 TS4900_FPGA_SOURCE = ts4900-fpga-$(TS4900_FPGA_VERSION).bin -TS4900_FPGA_SITE = ftp://ftp.embeddedarm.com/ts-socket-macrocontrollers/ts-4900-linux/fpga +TS4900_FPGA_SITE = https://files.embeddedts.com/ts-socket-macrocontrollers/ts-4900-linux/fpga # No license file provided, Yocto recipe from the vendor claims MIT. -# https://github.com/embeddedarm/meta-ts/blob/f31860f1204b64f765a5380d3b93a2cf18234f90/recipes-extras/ts4900-fpga/ts4900-fpga.bb#L6 +# https://github.com/embeddedTS/meta-ts/blob/f31860f1204b64f765a5380d3b93a2cf18234f90/recipes-extras/ts4900-fpga/ts4900-fpga.bb#L6 define TS4900_FPGA_EXTRACT_CMDS cp $(TS4900_FPGA_DL_DIR)/$(TS4900_FPGA_SOURCE) $(@D) diff --git a/package/tstools/tstools.hash b/package/tstools/tstools.hash index 9b0f1c7cea8..54f4ecc89de 100644 --- a/package/tstools/tstools.hash +++ b/package/tstools/tstools.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 3d2b2375e2874933f9aa59d4f25bb6b334747219eb0d7a076974e61222d59bf6 tstools-08f6be304040e7b84760ac3920bcff4a563b6cd2.tar.gz +sha256 3d2b2375e2874933f9aa59d4f25bb6b334747219eb0d7a076974e61222d59bf6 tstools-08f6be304040e7b84760ac3920bcff4a563b6cd2.tar.gz diff --git a/package/ttyd/ttyd.hash b/package/ttyd/ttyd.hash index c4263d6e941..85bd71ba2d8 100644 --- a/package/ttyd/ttyd.hash +++ b/package/ttyd/ttyd.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 1116419527edfe73717b71407fb6e06f46098fc8a8e6b0bb778c4c75dc9f64b9 ttyd-1.6.3.tar.gz -sha256 711762f081c180ade3d09d7b0b7537eaf35eca8d1671e47bc66eaa39376edb12 LICENSE +sha256 c9cf5eece52d27c5d728000f11315d36cb400c6948d1964a34a7eae74b454099 ttyd-1.7.3.tar.gz +sha256 8b7e100f8311cb428c57609164d93099bada2599f948359045d1ac876a7a625b LICENSE diff --git a/package/ttyd/ttyd.mk b/package/ttyd/ttyd.mk index 856270a88da..d17e21d60ba 100644 --- a/package/ttyd/ttyd.mk +++ b/package/ttyd/ttyd.mk @@ -4,7 +4,7 @@ # ################################################################################ -TTYD_VERSION = 1.6.3 +TTYD_VERSION = 1.7.3 TTYD_SITE = $(call github,tsl0922,ttyd,$(TTYD_VERSION)) TTYD_LICENSE = MIT TTYD_LICENSE_FILES = LICENSE diff --git a/package/turbolua/turbolua.hash b/package/turbolua/turbolua.hash index b095f5aaa9c..12c41c6e5c7 100644 --- a/package/turbolua/turbolua.hash +++ b/package/turbolua/turbolua.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4dbfbe4919118977c2ca40a4da81054ffe407d09f38bf5420eec5ae1449299d3 turbolua-2.1.3.tar.gz -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE +sha256 4dbfbe4919118977c2ca40a4da81054ffe407d09f38bf5420eec5ae1449299d3 turbolua-2.1.3.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/tvheadend/0002-configure-add-execinfo-option.patch b/package/tvheadend/0002-configure-add-execinfo-option.patch deleted file mode 100644 index c55d127d58f..00000000000 --- a/package/tvheadend/0002-configure-add-execinfo-option.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 04c01e631cb1bf47dd50b1ef92a086308e380eff Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 1 Jan 2022 16:53:29 +0100 -Subject: [PATCH] configure: add execinfo option - -Add execinfo option to allow the user to disable the feature even if -execinfo.h is found on the system - -Signed-off-by: Fabrice Fontaine -[Upsteam status: https://github.com/tvheadend/tvheadend/pull/1431] ---- - configure | 17 +++++++++++++++-- - 1 file changed, 15 insertions(+), 2 deletions(-) - -diff --git a/configure b/configure -index 4dad024c4..c087502bf 100755 ---- a/configure -+++ b/configure -@@ -75,6 +75,7 @@ OPTIONS=( - "ddci:yes" - "cclang_threadsan:no" - "gperftools:no" -+ "execinfo:auto" - ) - - # -@@ -150,11 +151,23 @@ if [ ${PLATFORM} = "freebsd" ]; then - # If we don't have libunwind then fallback to execinfo. - if ! enabled libunwind - then -- check_cc_header execinfo -+ if enabled_or_auto execinfo; then -+ if check_cc_header execinfo; then -+ enable execinfo -+ else -+ die "execinfo.h not found (use --disable-execinfo)" -+ fi -+ fi - fi - - else -- check_cc_header execinfo -+ if enabled_or_auto execinfo; then -+ if check_cc_header execinfo; then -+ enable execinfo -+ else -+ die "execinfo.h not found (use --disable-execinfo)" -+ fi -+ fi - fi - check_cc_option mmx - check_cc_option sse2 --- -2.33.0 - diff --git a/package/tvheadend/Config.in b/package/tvheadend/Config.in index c033b298196..99a24ec0110 100644 --- a/package/tvheadend/Config.in +++ b/package/tvheadend/Config.in @@ -66,7 +66,8 @@ config BR2_PACKAGE_TVHEADEND_TRANSCODING select BR2_PACKAGE_FFMPEG_AVRESAMPLE select BR2_PACKAGE_FFMPEG_GPL # needed for x264 support select BR2_PACKAGE_FFMPEG_SWSCALE - select BR2_PACKAGE_LIBVPX + # vp8 encoder needs c++ + select BR2_PACKAGE_LIBVPX if BR2_INSTALL_LIBSTDCPP select BR2_PACKAGE_X264 help Enable transcoding support. diff --git a/package/tvheadend/tvheadend.hash b/package/tvheadend/tvheadend.hash index db06af53b76..45c8bd62b0f 100644 --- a/package/tvheadend/tvheadend.hash +++ b/package/tvheadend/tvheadend.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 11eeca461e74fbe8306916933cab96d35a99fa89d81e26126e194875c41b6fad tvheadend-b8710206eb073c72b142bce95846b77a0ffa34a6.tar.gz +sha256 06c6d33a8e9d1d645cea9c63a06f6bddb309e5546177966d7b9285f68313bf5b tvheadend-c9a156a25a07f1f84c2f48a1b03b481430c8257d.tar.gz sha256 54dc3cbc00bf126bcba43e2af7f3ad1dc00f335985da1409fa943c7b7256d942 LICENSE.md diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk index 58ebdcb0545..0ca8f46dc54 100644 --- a/package/tvheadend/tvheadend.mk +++ b/package/tvheadend/tvheadend.mk @@ -4,7 +4,7 @@ # ################################################################################ -TVHEADEND_VERSION = b8710206eb073c72b142bce95846b77a0ffa34a6 +TVHEADEND_VERSION = c9a156a25a07f1f84c2f48a1b03b481430c8257d TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION)) TVHEADEND_LICENSE = GPL-3.0+ TVHEADEND_LICENSE_FILES = LICENSE.md @@ -47,6 +47,12 @@ TVHEADEND_DEPENDENCIES += rpi-userland else TVHEADEND_CONF_OPTS += --disable-omx endif +ifeq ($(BR2_PACKAGE_LIBVPX)$(BR2_INSTALL_LIBSTDCPP),yy) +TVHEADEND_CONF_OPTS += --enable-libvpx +TVHEADEND_DEPENDENCIES += libvpx +else +TVHEADEND_CONF_OPTS += --disable-libvpx +endif ifeq ($(BR2_PACKAGE_X265),y) TVHEADEND_CONF_OPTS += --enable-libx265 TVHEADEND_DEPENDENCIES += x265 @@ -59,6 +65,7 @@ TVHEADEND_CONF_OPTS += \ --disable-libopus \ --disable-omx \ --disable-vaapi \ + --disable-libvpx \ --disable-libx264 \ --disable-libx265 endif diff --git a/package/tzdata/Config.in b/package/tzdata/Config.in index 1e6cc0fc641..31071afb03f 100644 --- a/package/tzdata/Config.in +++ b/package/tzdata/Config.in @@ -6,4 +6,4 @@ config BR2_PACKAGE_TZDATA help Time zone database - http://www.iana.org/time-zones/repository/tz-link.html + https://data.iana.org/time-zones/tz-link.html diff --git a/package/tzdata/tzdata.hash b/package/tzdata/tzdata.hash index 55346539ab5..5488625ddd2 100644 --- a/package/tzdata/tzdata.hash +++ b/package/tzdata/tzdata.hash @@ -1,4 +1,4 @@ -# From https://mm.icann.org/pipermail/tz-announce/2021-October/000069.html -sha512 c1e8d04e049157ed5d4af0868855bbd75517e3d7e1db9c41d5283ff260109de46b6fac6be94828201d093e163d868044ac2a9db2bf0aeab800e264d0c73a9119 tzdata2021e.tar.gz +# From https://mm.icann.org/pipermail/tz-announce/2023-March/000079.html +sha512 608bd286ebcbd0004cfdc1da183273f08aff61f90c8867661154453d77a05d421e4c46ad6d066a1fe2e87d5c82ec0f1c0224667a3b35f3180a3eb7f6ff84cbf5 tzdata2023c.tar.gz # Locally computed: sha256 0613408568889f5739e5ae252b722a2659c02002839ad970a63dc5e9174b27cf LICENSE diff --git a/package/tzdata/tzdata.mk b/package/tzdata/tzdata.mk index 9cf8c2ea45f..08f3c83bd1f 100644 --- a/package/tzdata/tzdata.mk +++ b/package/tzdata/tzdata.mk @@ -4,7 +4,7 @@ # ################################################################################ -TZDATA_VERSION = 2021e +TZDATA_VERSION = 2023c TZDATA_SOURCE = tzdata$(TZDATA_VERSION).tar.gz TZDATA_SITE = https://www.iana.org/time-zones/repository/releases TZDATA_STRIP_COMPONENTS = 0 @@ -59,7 +59,7 @@ endef define HOST_TZDATA_INSTALL_CMDS $(INSTALL) -d -m 0755 $(HOST_DIR)/share/zoneinfo - cp -a $(@D)/_output/* $(@D)/*.tab $(HOST_DIR)/share/zoneinfo + cp -a $(@D)/_output/* $(@D)/*.tab $(@D)/leap-seconds.list $(HOST_DIR)/share/zoneinfo endef $(eval $(generic-package)) diff --git a/package/uacme/Config.in b/package/uacme/Config.in index d6934361155..2c6864871ca 100644 --- a/package/uacme/Config.in +++ b/package/uacme/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_UACME depends on BR2_USE_MMU # fork() select BR2_PACKAGE_OPENSSL if !(BR2_PACKAGE_GNUTLS || BR2_PACKAGE_MBEDTLS) select BR2_PACKAGE_LIBCURL + select BR2_PACKAGE_LIBCURL_FORCE_TLS help uacme is a client for the ACMEv2 protocol described in RFC8555, written in plain C with minimal dependencies @@ -19,8 +20,9 @@ if BR2_PACKAGE_UACME config BR2_PACKAGE_UACME_UALPN bool "enable ualpn" depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_PACKAGE_OPENSSL || BR2_PACKAGE_GNUTLS select BR2_PACKAGE_LIBEV + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL \ + if !(BR2_PACKAGE_GNUTLS || BR2_PACKAGE_MBEDTLS) help Build and install ualpn, the transparent proxying tls-alpn-01 challenge responder. @@ -28,7 +30,4 @@ config BR2_PACKAGE_UACME_UALPN comment "ualpn needs a toolchain w/ threads" depends on !BR2_TOOLCHAIN_HAS_THREADS -comment "ualpn needs either OpenSSL or GnuTLS" - depends on !(BR2_PACKAGE_OPENSSL || BR2_PACKAGE_GNUTLS) - endif diff --git a/package/uacme/uacme.hash b/package/uacme/uacme.hash index 4ae85c1c5c8..063b0b57ac3 100644 --- a/package/uacme/uacme.hash +++ b/package/uacme/uacme.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 36027a587256cbaa86650cec2a5b3eb000480e1150bd83941565661b392625ac uacme-1.7.1.tar.gz +sha256 a638fe0878dba8fdda62f89e7a284243edbcd31b92c11b5cfdc7d3efd9547bca uacme-1.7.4.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/uacme/uacme.mk b/package/uacme/uacme.mk index 2be96d534e3..9b2360937b3 100644 --- a/package/uacme/uacme.mk +++ b/package/uacme/uacme.mk @@ -4,7 +4,7 @@ # ################################################################################ -UACME_VERSION = 1.7.1 +UACME_VERSION = 1.7.4 # 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 @@ -18,12 +18,12 @@ UACME_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' ifeq ($(BR2_PACKAGE_GNUTLS),y) UACME_CONF_OPTS += --with-gnutls UACME_DEPENDENCIES += gnutls -else ifeq ($(BR2_PACKAGE_OPENSSL),y) -UACME_CONF_OPTS += --with-openssl -UACME_DEPENDENCIES += openssl else ifeq ($(BR2_PACKAGE_MBEDTLS),y) UACME_CONF_OPTS += --with-mbedtls UACME_DEPENDENCIES += mbedtls +else ifeq ($(BR2_PACKAGE_OPENSSL),y) +UACME_CONF_OPTS += --with-openssl +UACME_DEPENDENCIES += openssl endif ifeq ($(BR2_PACKAGE_UACME_UALPN),y) diff --git a/package/uboot-tools/Config.in.host b/package/uboot-tools/Config.in.host index 431cc8631d1..622070405db 100644 --- a/package/uboot-tools/Config.in.host +++ b/package/uboot-tools/Config.in.host @@ -45,7 +45,7 @@ config BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE Generate a valid binary environment image from a text file describing the key=value pairs of the environment. - This option can be useful to build enviornment configurations + This option can be useful to build environment configurations as part of a Linux / rootfs only defconfig instead of using post scripts. This supports a hardware use case of a single bootloader only defconfig but multiple Linux / rootfs @@ -81,8 +81,8 @@ config BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_REDUNDANT Some platforms define in their U-Boot configuration that the U-Boot environment should be duplicated in two locations (for extra safety). Check your U-Boot configuration for the - CONFIG_ENV_ADDR_REDUND and CONFIG_ENV_SIZE_REDUND settings to - see if this is the case for your platform. + CONFIG_ENV_ADDR_REDUND and CONFIG_ENV_OFFSET_REDUND settings + to see if this is the case for your platform. If it is the case, then you should enable this option to ensure that the U-Boot environment image generated by diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk index 26450b7adf3..d884a010fb8 100644 --- a/package/uboot-tools/uboot-tools.mk +++ b/package/uboot-tools/uboot-tools.mk @@ -22,6 +22,7 @@ define UBOOT_TOOLS_CONFIGURE_CMDS 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 mkdir -p $(@D)/include/asm touch $(@D)/include/asm/linkage.h endef @@ -111,6 +112,7 @@ define HOST_UBOOT_TOOLS_CONFIGURE_CMDS 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 mkdir -p $(@D)/include/asm touch $(@D)/include/asm/linkage.h endef @@ -203,6 +205,7 @@ endif #BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT define HOST_UBOOT_TOOLS_BUILD_CMDS $(BR2_MAKE1) -C $(@D) $(HOST_UBOOT_TOOLS_MAKE_OPTS) tools-only + $(BR2_MAKE1) -C $(@D) $(HOST_UBOOT_TOOLS_MAKE_OPTS) envtools no-dot-config-targets=envtools $(HOST_UBOOT_TOOLS_GENERATE_ENVIMAGE) $(HOST_UBOOT_TOOLS_GENERATE_BOOT_SCRIPT) endef @@ -212,6 +215,8 @@ define HOST_UBOOT_TOOLS_INSTALL_CMDS $(INSTALL) -m 0755 -D $(@D)/tools/mkeficapsule $(HOST_DIR)/bin/mkeficapsule $(INSTALL) -m 0755 -D $(@D)/tools/mkenvimage $(HOST_DIR)/bin/mkenvimage $(INSTALL) -m 0755 -D $(@D)/tools/dumpimage $(HOST_DIR)/bin/dumpimage + $(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 $(HOST_UBOOT_TOOLS_INSTALL_ENVIMAGE) $(HOST_UBOOT_TOOLS_INSTALL_BOOT_SCRIPT) endef diff --git a/package/uccp420wlan/Config.in b/package/uccp420wlan/Config.in deleted file mode 100644 index ef6a9db8653..00000000000 --- a/package/uccp420wlan/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_UCCP420WLAN - bool "uccp420wlan" - depends on BR2_LINUX_KERNEL - help - SoftMAC (mac80211) based WiFi driver for Imagination's - Explorer RPU uccp420. This supports Dual Band WiFi with - 2.4GHz - 2x2 b/g/n 40MHz, 5GHz - 2x2 a/n/11ac 80MHz modes - - Used in creator ci40 board. - - This module needs a Linux kernel >= v4.2. - - https://github.com/CreatorDev/uccp420wlan - -comment "uccp420wlan needs a Linux kernel >= 4.2 to be built" - depends on !BR2_LINUX_KERNEL diff --git a/package/uccp420wlan/uccp420wlan.hash b/package/uccp420wlan/uccp420wlan.hash deleted file mode 100644 index 905fa4299d2..00000000000 --- a/package/uccp420wlan/uccp420wlan.hash +++ /dev/null @@ -1,4 +0,0 @@ -# locally computed hash -sha256 1d4de62fc842dbab739708cf0d9ebce270fcdf63c1c13ac676cbc253acdaa3bb uccp420wlan-6.9.1.tar.gz -sha256 af8067302947c01fd9eee72befa54c7e3ef8a48fecde7fd71277f2290b2bf0f7 COPYING -sha256 9ac431585fddfe624b08cf7464876a5e96061047ff26a9e926da3d89d21a2a73 firmware/LICENSE.imagination diff --git a/package/uccp420wlan/uccp420wlan.mk b/package/uccp420wlan/uccp420wlan.mk deleted file mode 100644 index 7256b92774d..00000000000 --- a/package/uccp420wlan/uccp420wlan.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# uccp420wlan -# -################################################################################ - -UCCP420WLAN_VERSION = 6.9.1 -UCCP420WLAN_SITE = $(call github,CreatorDev,uccp420wlan,v$(UCCP420WLAN_VERSION)) -UCCP420WLAN_LICENSE = GPL-2.0 (kernel module), proprietary (firmware blob) -UCCP420WLAN_LICENSE_FILES = COPYING firmware/LICENSE.imagination - -define UCCP420WLAN_INSTALL_TARGET_CMDS - mkdir -p $(TARGET_DIR)/lib/firmware/img/uccp420wlan - cp $(@D)/firmware/*.ldr $(TARGET_DIR)/lib/firmware/img/uccp420wlan -endef - -$(eval $(kernel-module)) -$(eval $(generic-package)) diff --git a/package/ucl/ucl.hash b/package/ucl/ucl.hash deleted file mode 100644 index 0252f692974..00000000000 --- a/package/ucl/ucl.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 b865299ffd45d73412293369c9754b07637680e5c826915f097577cd27350348 ucl-1.03.tar.gz -sha256 70439f6e2b47057a408d2390ed6663b9875f5a08066a06a060a357ef1df89a8c COPYING diff --git a/package/ucl/ucl.mk b/package/ucl/ucl.mk deleted file mode 100644 index aac068ef607..00000000000 --- a/package/ucl/ucl.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# ucl -# -################################################################################ - -UCL_VERSION = 1.03 -UCL_SITE = http://www.oberhumer.com/opensource/ucl/download -UCL_LICENSE = GPL-2.0+ -UCL_LICENSE_FILES = COPYING - -# Fix ACC conformance test failure for host gcc 6.x -HOST_UCL_CONF_ENV += CPPFLAGS="$(HOST_CPPFLAGS) -std=iso9899:1990" - -$(eval $(host-autotools-package)) diff --git a/package/uclibc-ng-test/uclibc-ng-test.hash b/package/uclibc-ng-test/uclibc-ng-test.hash index 37660b04c34..4028bada4c0 100644 --- a/package/uclibc-ng-test/uclibc-ng-test.hash +++ b/package/uclibc-ng-test/uclibc-ng-test.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f731307c0547ce4bbd3f5025972f64e9b22208a147e34e5745000b54d4d3aa98 uclibc-ng-test-0844445e7358eb10e716155b55b0fb23e88d644a-br1.tar.gz +sha256 655c9d9732cf24d8230defac7ef4d6bd92ad05c070ab02fe99c1fb47c7a40039 uclibc-ng-test-6790eafe897b3a8c19a2caf50a5ecccf06647adf-br1.tar.gz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING.LIB diff --git a/package/uclibc-ng-test/uclibc-ng-test.mk b/package/uclibc-ng-test/uclibc-ng-test.mk index ea5f2242190..a678bcf7f00 100644 --- a/package/uclibc-ng-test/uclibc-ng-test.mk +++ b/package/uclibc-ng-test/uclibc-ng-test.mk @@ -4,7 +4,7 @@ # ################################################################################ -UCLIBC_NG_TEST_VERSION = 0844445e7358eb10e716155b55b0fb23e88d644a +UCLIBC_NG_TEST_VERSION = 6790eafe897b3a8c19a2caf50a5ecccf06647adf UCLIBC_NG_TEST_SITE = git://uclibc-ng.org/git/uclibc-ng-test UCLIBC_NG_TEST_LICENSE = LGPL-2.1+ UCLIBC_NG_TEST_LICENSE_FILES = COPYING.LIB @@ -39,7 +39,7 @@ ifeq ($(BR2_STATIC_LIBS),y) UCLIBC_NG_TEST_MAKE_ENV += NO_TLS=1 NO_NPTL=1 NO_DL=1 endif # no TLS macros available -ifeq ($(BR2_nds32)$(BR2_s390x),y) +ifeq ($(BR2_s390x),y) UCLIBC_NG_TEST_MAKE_ENV += NO_TLS=1 endif diff --git a/package/uclibc/0001-aarch64-add-hwcap-header-file.patch b/package/uclibc/0001-aarch64-add-hwcap-header-file.patch new file mode 100644 index 00000000000..058e3242f94 --- /dev/null +++ b/package/uclibc/0001-aarch64-add-hwcap-header-file.patch @@ -0,0 +1,163 @@ +From becd0cbc4168534e311f47dda6f67450ad0006b5 Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb +Date: Tue, 8 Aug 2023 13:47:27 +0200 +Subject: [PATCH] aarch64: add hwcap header file + +Signed-off-by: Waldemar Brodkorb +Upstream: https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?id=becd0cbc4168534e311f47dda6f67450ad0006b5 +--- + include/sys/auxv.h | 1 + + libc/sysdeps/linux/aarch64/bits/hwcap.h | 99 +++++++++++++++++++++++++ + libc/sysdeps/linux/common/bits/hwcap.h | 22 ++++++ + 3 files changed, 122 insertions(+) + create mode 100644 libc/sysdeps/linux/aarch64/bits/hwcap.h + create mode 100644 libc/sysdeps/linux/common/bits/hwcap.h + +diff --git a/include/sys/auxv.h b/include/sys/auxv.h +index f35196423..b07026457 100644 +--- a/include/sys/auxv.h ++++ b/include/sys/auxv.h +@@ -20,6 +20,7 @@ + + #include + #include ++#include + + __BEGIN_DECLS + +diff --git a/libc/sysdeps/linux/aarch64/bits/hwcap.h b/libc/sysdeps/linux/aarch64/bits/hwcap.h +new file mode 100644 +index 000000000..20061f5d1 +--- /dev/null ++++ b/libc/sysdeps/linux/aarch64/bits/hwcap.h +@@ -0,0 +1,99 @@ ++/* Defines for bits in AT_HWCAP. AArch64 Linux version. ++ Copyright (C) 2016-2023 Free Software Foundation, Inc. ++ ++ The GNU C 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.1 of the License, or (at your option) any later version. ++ ++ The GNU C 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 the GNU C Library; if not, see ++ . */ ++ ++#if !defined (_SYS_AUXV_H) ++# error "Never include directly; use instead." ++#endif ++ ++/* The following must match the kernel's and update the ++ list together with sysdeps/unix/sysv/linux/aarch64/dl-procinfo.c. */ ++#define HWCAP_FP (1 << 0) ++#define HWCAP_ASIMD (1 << 1) ++#define HWCAP_EVTSTRM (1 << 2) ++#define HWCAP_AES (1 << 3) ++#define HWCAP_PMULL (1 << 4) ++#define HWCAP_SHA1 (1 << 5) ++#define HWCAP_SHA2 (1 << 6) ++#define HWCAP_CRC32 (1 << 7) ++#define HWCAP_ATOMICS (1 << 8) ++#define HWCAP_FPHP (1 << 9) ++#define HWCAP_ASIMDHP (1 << 10) ++#define HWCAP_CPUID (1 << 11) ++#define HWCAP_ASIMDRDM (1 << 12) ++#define HWCAP_JSCVT (1 << 13) ++#define HWCAP_FCMA (1 << 14) ++#define HWCAP_LRCPC (1 << 15) ++#define HWCAP_DCPOP (1 << 16) ++#define HWCAP_SHA3 (1 << 17) ++#define HWCAP_SM3 (1 << 18) ++#define HWCAP_SM4 (1 << 19) ++#define HWCAP_ASIMDDP (1 << 20) ++#define HWCAP_SHA512 (1 << 21) ++#define HWCAP_SVE (1 << 22) ++#define HWCAP_ASIMDFHM (1 << 23) ++#define HWCAP_DIT (1 << 24) ++#define HWCAP_USCAT (1 << 25) ++#define HWCAP_ILRCPC (1 << 26) ++#define HWCAP_FLAGM (1 << 27) ++#define HWCAP_SSBS (1 << 28) ++#define HWCAP_SB (1 << 29) ++#define HWCAP_PACA (1 << 30) ++#define HWCAP_PACG (1UL << 31) ++ ++#define HWCAP2_DCPODP (1 << 0) ++#define HWCAP2_SVE2 (1 << 1) ++#define HWCAP2_SVEAES (1 << 2) ++#define HWCAP2_SVEPMULL (1 << 3) ++#define HWCAP2_SVEBITPERM (1 << 4) ++#define HWCAP2_SVESHA3 (1 << 5) ++#define HWCAP2_SVESM4 (1 << 6) ++#define HWCAP2_FLAGM2 (1 << 7) ++#define HWCAP2_FRINT (1 << 8) ++#define HWCAP2_SVEI8MM (1 << 9) ++#define HWCAP2_SVEF32MM (1 << 10) ++#define HWCAP2_SVEF64MM (1 << 11) ++#define HWCAP2_SVEBF16 (1 << 12) ++#define HWCAP2_I8MM (1 << 13) ++#define HWCAP2_BF16 (1 << 14) ++#define HWCAP2_DGH (1 << 15) ++#define HWCAP2_RNG (1 << 16) ++#define HWCAP2_BTI (1 << 17) ++#define HWCAP2_MTE (1 << 18) ++#define HWCAP2_ECV (1 << 19) ++#define HWCAP2_AFP (1 << 20) ++#define HWCAP2_RPRES (1 << 21) ++#define HWCAP2_MTE3 (1 << 22) ++#define HWCAP2_SME (1 << 23) ++#define HWCAP2_SME_I16I64 (1 << 24) ++#define HWCAP2_SME_F64F64 (1 << 25) ++#define HWCAP2_SME_I8I32 (1 << 26) ++#define HWCAP2_SME_F16F32 (1 << 27) ++#define HWCAP2_SME_B16F32 (1 << 28) ++#define HWCAP2_SME_F32F32 (1 << 29) ++#define HWCAP2_SME_FA64 (1 << 30) ++#define HWCAP2_WFXT (1UL << 31) ++#define HWCAP2_EBF16 (1UL << 32) ++#define HWCAP2_SVE_EBF16 (1UL << 33) ++#define HWCAP2_CSSC (1UL << 34) ++#define HWCAP2_RPRFM (1UL << 35) ++#define HWCAP2_SVE2P1 (1UL << 36) ++#define HWCAP2_SME2 (1UL << 37) ++#define HWCAP2_SME2P1 (1UL << 38) ++#define HWCAP2_SME_I16I32 (1UL << 39) ++#define HWCAP2_SME_BI32I32 (1UL << 40) ++#define HWCAP2_SME_B16B16 (1UL << 41) ++#define HWCAP2_SME_F16F16 (1UL << 42) +diff --git a/libc/sysdeps/linux/common/bits/hwcap.h b/libc/sysdeps/linux/common/bits/hwcap.h +new file mode 100644 +index 000000000..e7b899df0 +--- /dev/null ++++ b/libc/sysdeps/linux/common/bits/hwcap.h +@@ -0,0 +1,22 @@ ++/* Defines for bits in AT_HWCAP. ++ Copyright (C) 2012-2023 Free Software Foundation, Inc. ++ ++ The GNU C 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.1 of the License, or (at your option) any later version. ++ ++ The GNU C 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 the GNU C Library; if not, see ++ . */ ++ ++#ifndef _SYS_AUXV_H ++# error "Never include directly; use instead." ++#endif ++ ++/* No bits defined for this architecture. */ +-- +2.30.2 + diff --git a/package/uclibc/0002-fcntl.h-declare-f_owner_ex-for-all-architectures.patch b/package/uclibc/0002-fcntl.h-declare-f_owner_ex-for-all-architectures.patch new file mode 100644 index 00000000000..da0135a5e30 --- /dev/null +++ b/package/uclibc/0002-fcntl.h-declare-f_owner_ex-for-all-architectures.patch @@ -0,0 +1,85 @@ +From 98576ab8de710507419b016fbcfc82ed7c57f9c3 Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb +Date: Wed, 9 Aug 2023 10:31:28 +0200 +Subject: [PATCH] fcntl.h: declare f_owner_ex for all architectures + +Signed-off-by: Waldemar Brodkorb +Upstream: https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?id=98576ab8de710507419b016fbcfc82ed7c57f9c3 +--- + include/fcntl.h | 20 ++++++++++++++++++++ + libc/sysdeps/linux/aarch64/bits/fcntl.h | 21 --------------------- + 2 files changed, 20 insertions(+), 21 deletions(-) + +diff --git a/include/fcntl.h b/include/fcntl.h +index 136f64d70..ce15ceaf6 100644 +--- a/include/fcntl.h ++++ b/include/fcntl.h +@@ -296,6 +296,26 @@ int name_to_handle_at(int dirfd, const char *pathname, + int open_by_handle_at(int mount_fd, struct file_handle *handle, int flags); + #endif + ++#ifdef __USE_GNU ++# define F_SETOWN_EX 15 /* Get owner (thread receiving SIGIO). */ ++# define F_GETOWN_EX 16 /* Set owner (thread receiving SIGIO). */ ++/* Owner types. */ ++enum __pid_type ++ { ++ F_OWNER_TID = 0, /* Kernel thread. */ ++ F_OWNER_PID, /* Process. */ ++ F_OWNER_PGRP, /* Process group. */ ++ F_OWNER_GID = F_OWNER_PGRP /* Alternative, obsolete name. */ ++ }; ++ ++/* Structure to use with F_GETOWN_EX and F_SETOWN_EX. */ ++struct f_owner_ex ++ { ++ enum __pid_type type; /* Owner type of ID. */ ++ __pid_t pid; /* ID of owner. */ ++ }; ++#endif ++ + __END_DECLS + + #endif /* fcntl.h */ +diff --git a/libc/sysdeps/linux/aarch64/bits/fcntl.h b/libc/sysdeps/linux/aarch64/bits/fcntl.h +index c143ba9c9..dbe929351 100644 +--- a/libc/sysdeps/linux/aarch64/bits/fcntl.h ++++ b/libc/sysdeps/linux/aarch64/bits/fcntl.h +@@ -94,8 +94,6 @@ + #ifdef __USE_GNU + # define F_SETSIG 10 /* Set number of signal to be sent. */ + # define F_GETSIG 11 /* Get number of signal to be sent. */ +-# define F_SETOWN_EX 15 /* Get owner (thread receiving SIGIO). */ +-# define F_GETOWN_EX 16 /* Set owner (thread receiving SIGIO). */ + #endif + + +@@ -170,25 +168,6 @@ struct flock64 + }; + #endif + +- +-#ifdef __USE_GNU +-/* Owner types. */ +-enum __pid_type +- { +- F_OWNER_TID = 0, /* Kernel thread. */ +- F_OWNER_PID, /* Process. */ +- F_OWNER_PGRP, /* Process group. */ +- F_OWNER_GID = F_OWNER_PGRP /* Alternative, obsolete name. */ +- }; +- +-/* Structure to use with F_GETOWN_EX and F_SETOWN_EX. */ +-struct f_owner_ex +- { +- enum __pid_type type; /* Owner type of ID. */ +- __pid_t pid; /* ID of owner. */ +- }; +-#endif +- + /* Define some more compatibility macros to be backward compatible with + BSD systems which did not managed to hide these kernel macros. */ + #ifdef __USE_BSD +-- +2.30.2 + diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in index 2091166b625..2555487f06d 100644 --- a/package/uclibc/Config.in +++ b/package/uclibc/Config.in @@ -1,3 +1,32 @@ +config BR2_PACKAGE_UCLIBC_ARCH_SUPPORTS + bool + default y if BR2_aarch64 + default y if BR2_aarch64_be + default y if BR2_arcle + default y if BR2_arceb + default y if BR2_arm + default y if BR2_armeb + default y if BR2_i386 + default y if BR2_m68k + default y if BR2_microblaze + default y if BR2_mips + default y if BR2_mipsel + default y if BR2_mips64 + default y if BR2_mips64el + default y if BR2_or1k + default y if BR2_powerpc + # see libc/sysdeps/linux/riscv64/sys/asm.h + default y if BR2_RISCV_64 && (BR2_RISCV_ABI_LP64 || BR2_RISCV_ABI_LP64D) + default y if BR2_sh4 + default y if BR2_sh4eb + default y if BR2_sparc + default y if BR2_xtensa + default y if BR2_x86_64 + +config BR2_PACKAGE_UCLIBC_SUPPORTS + bool + default y if BR2_PACKAGE_UCLIBC_ARCH_SUPPORTS + if BR2_TOOLCHAIN_BUILDROOT_UCLIBC comment "uClibc Options" @@ -95,6 +124,7 @@ config BR2_UCLIBC_INSTALL_UTILS # uClibc architecture names. config BR2_UCLIBC_TARGET_ARCH string + default "aarch64" if BR2_aarch64 || BR2_aarch64_be default "arc" if BR2_arcle || BR2_arceb default "arm" if BR2_arm || BR2_armeb default "m68k" if BR2_m68k @@ -124,14 +154,12 @@ config BR2_UCLIBC_MIPS_NAN config BR2_UCLIBC_SH_TYPE string - default "SH2A" if BR2_sh2a default "SH4" if BR2_sh4 || BR2_sh4eb depends on BR2_UCLIBC_TARGET_ARCH = "sh" config BR2_UCLIBC_SPARC_TYPE string - default "V7" if BR2_sparc_v7 || BR2_sparc_sparchfleon || BR2_sparc_sparcsfleon - default "V8" if BR2_sparc_v8 || BR2_sparc_sparchfleonv8 || BR2_sparc_sparcsfleonv8 + default "V8" if BR2_sparc_v8 depends on BR2_UCLIBC_TARGET_ARCH = "sparc" config BR2_UCLIBC_POWERPC_TYPE diff --git a/package/uclibc/uclibc.hash b/package/uclibc/uclibc.hash index 989c9d887a8..8d87c043836 100644 --- a/package/uclibc/uclibc.hash +++ b/package/uclibc/uclibc.hash @@ -1,4 +1,4 @@ -# From https://downloads.uclibc-ng.org/releases/1.0.40/uClibc-ng-1.0.40.tar.xz.sha256 -sha256 d863f01815a64174d5019c73475e8aff5b60848a13876e79daf5d3d83ce7f889 uClibc-ng-1.0.40.tar.xz +# From https://downloads.uclibc-ng.org/releases/1.0.44/uClibc-ng-1.0.44.tar.xz.sha256 +sha256 7df9d987955827382f1c2400da513456becbb6f868bdfd37737265f1cbeec994 uClibc-ng-1.0.44.tar.xz # Locally calculated sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING.LIB diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index d79eaa1d0d3..4e7d8de6438 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -4,7 +4,7 @@ # ################################################################################ -UCLIBC_VERSION = 1.0.40 +UCLIBC_VERSION = 1.0.44 UCLIBC_SOURCE = uClibc-ng-$(UCLIBC_VERSION).tar.xz UCLIBC_SITE = https://downloads.uclibc-ng.org/releases/$(UCLIBC_VERSION) UCLIBC_LICENSE = LGPL-2.1+ @@ -22,6 +22,7 @@ UCLIBC_DEPENDENCIES = host-gcc-initial linux-headers # specifying UCLIBC_CONFIG_FILE on the command-line overrides the .config # setting. +# check-package disable Ifdef ifndef UCLIBC_CONFIG_FILE UCLIBC_CONFIG_FILE = $(call qstrip,$(BR2_UCLIBC_CONFIG)) endif @@ -73,6 +74,18 @@ define UCLIBC_BINFMT_CONFIG endef endif +# +# AArch64 definitions +# + +ifeq ($(UCLIBC_TARGET_ARCH),aarch64) +UCLIBC_ARM64_PAGE_SIZE = CONFIG_AARCH64_PAGE_SIZE_$(call qstrip,$(BR2_ARM64_PAGE_SIZE)) +define UCLIBC_AARCH64_PAGE_SIZE_CONFIG + $(SED) '/CONFIG_AARCH64_PAGE_SIZE_*/d' $(@D)/.config + $(call KCONFIG_ENABLE_OPT,$(UCLIBC_ARM64_PAGE_SIZE)) +endef +endif # aarch64 + # # ARC definitions # @@ -204,7 +217,7 @@ endif # # Debug # -ifeq ($(BR2_ENABLE_DEBUG),y) +ifeq ($(BR2_ENABLE_RUNTIME_DEBUG),y) define UCLIBC_DEBUG_CONFIG $(call KCONFIG_ENABLE_OPT,DODEBUG) endef @@ -362,7 +375,7 @@ endif # Commands # -UCLIBC_EXTRA_CFLAGS = $(TARGET_ABI) +UCLIBC_EXTRA_CFLAGS = $(TARGET_ABI) $(TARGET_DEBUGGING) # uClibc-ng does not build with LTO, so explicitly disable it # when using a compiler that may have support for LTO @@ -384,8 +397,10 @@ define UCLIBC_KCONFIG_FIXUP_CMDS $(call KCONFIG_SET_OPT,RUNTIME_PREFIX,"/") $(call KCONFIG_SET_OPT,DEVEL_PREFIX,"/usr") $(call KCONFIG_SET_OPT,SHARED_LIB_LOADER_PREFIX,"/lib") + $(call KCONFIG_DISABLE_OPT,DOSTRIP) $(UCLIBC_MMU_CONFIG) $(UCLIBC_BINFMT_CONFIG) + $(UCLIBC_AARCH64_PAGE_SIZE_CONFIG) $(UCLIBC_ARC_PAGE_SIZE_CONFIG) $(UCLIBC_ARC_ATOMICS_CONFIG) $(UCLIBC_ARM_ABI_CONFIG) diff --git a/package/udev-gentoo-scripts/udev-gentoo-scripts.hash b/package/udev-gentoo-scripts/udev-gentoo-scripts.hash index 60563baae02..99e6a9fe22a 100644 --- a/package/udev-gentoo-scripts/udev-gentoo-scripts.hash +++ b/package/udev-gentoo-scripts/udev-gentoo-scripts.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b206f72c93cd2e51ed59061931918a9c23c3c1f7e6caffacc9d4f8915a42c30a udev-gentoo-scripts-33.tar.bz2 -sha256 329f95829088b95650b9012ae688f09baa1637985425a7964d33683363f48702 init.d/udev-settle +sha256 b206f72c93cd2e51ed59061931918a9c23c3c1f7e6caffacc9d4f8915a42c30a udev-gentoo-scripts-33.tar.bz2 +sha256 329f95829088b95650b9012ae688f09baa1637985425a7964d33683363f48702 init.d/udev-settle diff --git a/package/udev/udev.mk b/package/udev/udev.mk index 05b35b21f0b..d70d13ebb3d 100644 --- a/package/udev/udev.mk +++ b/package/udev/udev.mk @@ -4,10 +4,9 @@ # ################################################################################ -# Required by default rules for input devices +# Required by default rules define UDEV_USERS - - input -1 * - - - Input device group - - - render -1 * - - - DRI rendering nodes - - kvm -1 * - - - kvm nodes endef diff --git a/package/udisks/Config.in b/package/udisks/Config.in index 82f11ae7de4..b1d02a31b2c 100644 --- a/package/udisks/Config.in +++ b/package/udisks/Config.in @@ -1,12 +1,13 @@ config BR2_PACKAGE_UDISKS bool "udisks" - depends on BR2_ENABLE_LOCALE # parted + depends on BR2_ENABLE_LOCALE # libblockdev, parted depends on BR2_PACKAGE_HAS_UDEV depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # polkit -> C++17 depends on BR2_TOOLCHAIN_HAS_THREADS # polkit depends on BR2_USE_WCHAR # dbus-glib -> glib2 depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libblockdev -> cryptsetup -> json-c depends on !BR2_STATIC_LIBS # polkit -> duktape + depends on !BR2_OPTIMIZE_FAST # polkit -> duktape select BR2_PACKAGE_DBUS select BR2_PACKAGE_DBUS_GLIB select BR2_PACKAGE_LIBATASMART @@ -30,8 +31,8 @@ config BR2_PACKAGE_UDISKS interfaces that can be used to query and manipulate storage devices. - o a command-line tool, udisks(1), that can be used to query - and use the daemon + o a command-line tool, udisksctl(1), that can be used to + query and use the daemon http://www.freedesktop.org/wiki/Software/udisks @@ -45,3 +46,16 @@ comment "udisks needs a toolchain with dynamic library, locale, wchar, threads, depends on BR2_STATIC_LIBS || !BR2_ENABLE_LOCALE || \ !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_7 + +comment "udisks can't be built with Optimize for fast" + depends on BR2_OPTIMIZE_FAST + +if BR2_PACKAGE_UDISKS + +config BR2_PACKAGE_UDISKS_FHS_MEDIA + bool "Mount devices in /media instead of /run/media" + help + Support mounting in /media for compatibility with the + Filesystem Hierarchy Standard (FHS) + +endif diff --git a/package/udisks/udisks.mk b/package/udisks/udisks.mk index 2bf519a2ccf..840f552b045 100644 --- a/package/udisks/udisks.mk +++ b/package/udisks/udisks.mk @@ -10,6 +10,7 @@ UDISKS_SITE = https://github.com/storaged-project/udisks/releases/download/udisk UDISKS_LICENSE = GPL-2.0+ UDISKS_LICENSE_FILES = COPYING UDISKS_CPE_ID_VENDOR = freedesktop +UDISKS_INSTALL_STAGING = YES UDISKS_DEPENDENCIES = \ host-pkgconf \ @@ -28,7 +29,6 @@ UDISKS_CONF_OPTS = \ --disable-acl \ --disable-bcache \ --disable-btrfs \ - --disable-fhs-media \ --disable-introspection \ --disable-iscsi \ --disable-lsm \ @@ -39,4 +39,10 @@ UDISKS_CONF_OPTS = \ --disable-vdo \ --disable-zram +ifeq ($(BR2_PACKAGE_UDISKS_FHS_MEDIA),y) +UDISKS_CONF_OPTS += --enable-fhs-media +else +UDISKS_CONF_OPTS += --disable-fhs-media +endif + $(eval $(autotools-package)) diff --git a/package/udpcast/0001-fix-musl-build.patch b/package/udpcast/0001-fix-musl-build.patch new file mode 100644 index 00000000000..0e213b27934 --- /dev/null +++ b/package/udpcast/0001-fix-musl-build.patch @@ -0,0 +1,31 @@ +fix musl build + +Fix the following musl build failure: + +receivedata.c: In function 'findSlice': +receivedata.c:348:2: error: unknown type name 'ptrdiff_t' + 348 | ptrdiff_t pos = slice - clst->slices; + | ^~~~~~~~~ +receivedata.c:17:1: note: 'ptrdiff_t' is defined in header ''; did you forget to '#include '? + 16 | #include "fec.h" + +++ |+#include + 17 | + +Fixes: + - http://autobuild.buildroot.org/results/30208c6f175967fed6de690447a09e0c86547b24 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://udpcast.linux.lu/mailman3/hyperkitty/list/udpcast@udpcast.linux.lu/thread/4MBES2CPUSUNIZTC7NXCQYS2GAE4DQSG/] + +diff '--color=auto' -Nura udpcast-20211207.orig/receivedata.c udpcast-20211207/receivedata.c +--- udpcast-20211207.orig/receivedata.c 2022-08-13 21:48:06.226588614 +0200 ++++ udpcast-20211207/receivedata.c 2022-08-13 21:48:40.242992238 +0200 +@@ -1,6 +1,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/package/udpcast/Config.in b/package/udpcast/Config.in index ef94b30a99e..cc38c6e57c5 100644 --- a/package/udpcast/Config.in +++ b/package/udpcast/Config.in @@ -6,6 +6,8 @@ config BR2_PACKAGE_UDPCAST bool "udpcast" depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() + select BR2_PACKAGE_UDPCAST_SENDER \ + if !BR2_PACKAGE_UDPCAST_RECEIVER help A multicast protocol implementation which happens to be very handy for imaging drives over the network. diff --git a/package/udpcast/udpcast.hash b/package/udpcast/udpcast.hash index 9cdce0a2863..9ce91330fd8 100644 --- a/package/udpcast/udpcast.hash +++ b/package/udpcast/udpcast.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 9c19eebaa6e2f78127f0d59e95d0ce003b687d61e283b5963a1da6b8ac41f21a udpcast-20200328.tar.gz +sha256 a3cebee7a87ecf1bca0645f125be78fbd7b37846a4da82fecef96b92cc64d050 udpcast-20211207.tar.gz sha256 422befd3503b1f39a6027017f639874c1f274e37ec60ba3174894646b584ccbc COPYING diff --git a/package/udpcast/udpcast.mk b/package/udpcast/udpcast.mk index 34ebddd2d57..4ea73e20c75 100644 --- a/package/udpcast/udpcast.mk +++ b/package/udpcast/udpcast.mk @@ -4,28 +4,20 @@ # ################################################################################ -UDPCAST_VERSION = 20200328 +UDPCAST_VERSION = 20211207 UDPCAST_SITE = http://www.udpcast.linux.lu/download UDPCAST_DEPENDENCIES = host-m4 UDPCAST_LICENSE = BSD-2-Clause, GPL-2.0+ UDPCAST_LICENSE_FILES = COPYING +UDPCAST_TARGETS = \ + $(if $(BR2_PACKAGE_UDPCAST_RECEIVER),udp-receiver) \ + $(if $(BR2_PACKAGE_UDPCAST_SENDER),udp-sender) +UDPCAST_MAKE_OPTS = $(UDPCAST_TARGETS) -define UDPCAST_REMOVE_UDP_SENDER - rm -f $(TARGET_DIR)/usr/sbin/udp-sender - rm -f $(TARGET_DIR)/usr/sbin/udp-sender.1 +define UDPCAST_INSTALL_TARGET_CMDS + $(foreach f,$(UDPCAST_TARGETS),\ + $(INSTALL) -D -m 755 $(@D)/$(f) $(TARGET_DIR)/usr/sbin/$(f) + ) endef -ifneq ($(BR2_PACKAGE_UDPCAST_SENDER),y) -UDPCAST_POST_INSTALL_TARGET_HOOKS += UDPCAST_REMOVE_UDP_SENDER -endif - -define UDPCAST_REMOVE_UDP_RECEIVER - rm -f $(TARGET_DIR)/usr/sbin/udp-receiver - rm -f $(TARGET_DIR)/usr/sbin/udp-receiver.1 -endef - -ifneq ($(BR2_PACKAGE_UDPCAST_RECEIVER),y) -UDPCAST_POST_INSTALL_TARGET_HOOKS += UDPCAST_REMOVE_UDP_RECEIVER -endif - $(eval $(autotools-package)) diff --git a/package/uftp/uftp.hash b/package/uftp/uftp.hash index aaebcad0142..e47cba93940 100644 --- a/package/uftp/uftp.hash +++ b/package/uftp/uftp.hash @@ -1,3 +1,3 @@ # Locally computed sha256 -sha256 562f71ea5a24b615eb491f5744bad01e9c2e58244c1d6252d5ae98d320d308e0 uftp-5.0.tar.gz +sha256 f0435fbc8e9ffa125e05600cb6c7fc933d7d587f5bae41b257267be4f2ce0e61 uftp-5.0.1.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.txt diff --git a/package/uftp/uftp.mk b/package/uftp/uftp.mk index 1c36cb0ce63..ce865c20ec4 100644 --- a/package/uftp/uftp.mk +++ b/package/uftp/uftp.mk @@ -4,7 +4,7 @@ # ################################################################################ -UFTP_VERSION = 5.0 +UFTP_VERSION = 5.0.1 UFTP_SITE = http://sourceforge.net/projects/uftp-multicast/files/source-tar UFTP_LICENSE = GPL-3.0+ UFTP_LICENSE_FILES = LICENSE.txt diff --git a/package/uftrace/0002-arch-arm-mcount-support.c-define-EF_ARM_VFP_FLOAT-wh.patch b/package/uftrace/0002-arch-arm-mcount-support.c-define-EF_ARM_VFP_FLOAT-wh.patch deleted file mode 100644 index 03fba886936..00000000000 --- a/package/uftrace/0002-arch-arm-mcount-support.c-define-EF_ARM_VFP_FLOAT-wh.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 4e543097e62eb052650433d1d4c9c5996d30f242 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Fri, 23 Apr 2021 23:06:01 +0200 -Subject: [PATCH] arch/arm/mcount-support.c: define EF_ARM_VFP_FLOAT when not - available - -uClibc-ng doesn't define EF_ARM_VFP_FLOAT, so let's define it. - -Signed-off-by: Thomas Petazzoni ---- - arch/arm/mcount-support.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/arch/arm/mcount-support.c b/arch/arm/mcount-support.c -index 8d23460b..51331740 100644 ---- a/arch/arm/mcount-support.c -+++ b/arch/arm/mcount-support.c -@@ -3,6 +3,10 @@ - #include - #include - -+#ifndef EF_ARM_VFP_FLOAT -+# define EF_ARM_VFP_FLOAT 0x400 -+#endif -+ - #ifndef EF_ARM_ABI_FLOAT_HARD - # define EF_ARM_ABI_FLOAT_HARD EF_ARM_VFP_FLOAT - #endif --- -2.30.2 - diff --git a/package/uftrace/Config.in b/package/uftrace/Config.in index 98ddb7cbfbe..8f8c5d25fde 100644 --- a/package/uftrace/Config.in +++ b/package/uftrace/Config.in @@ -8,7 +8,7 @@ config BR2_PACKAGE_UFTRACE_ARCH_SUPPORTS config BR2_PACKAGE_UFTRACE bool "uftrace" depends on BR2_PACKAGE_UFTRACE_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # pthread_setname_np() depends on !BR2_STATIC_LIBS select BR2_PACKAGE_ARGP_STANDALONE if \ BR2_TOOLCHAIN_USES_UCLIBC || \ @@ -23,6 +23,6 @@ config BR2_PACKAGE_UFTRACE https://github.com/namhyung/uftrace -comment "uftrace needs a toolchain w/ threads, dynamic library" +comment "uftrace needs a toolchain w/ NPTL, dynamic library" depends on BR2_PACKAGE_UFTRACE_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS diff --git a/package/uftrace/uftrace.hash b/package/uftrace/uftrace.hash index 43831d72a72..195f0605c8b 100644 --- a/package/uftrace/uftrace.hash +++ b/package/uftrace/uftrace.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b8b56d540ea95c3eafe56440d6a998e0a140d53ca2584916b6ca82702795bbd9 uftrace-0.10.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 2aad01f27d4f18717b681824c7a28ac3e1efd5e7bbed3ec888a3ea5af60e3700 uftrace-0.12.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/uftrace/uftrace.mk b/package/uftrace/uftrace.mk index b487b306954..d36c3bd8f53 100644 --- a/package/uftrace/uftrace.mk +++ b/package/uftrace/uftrace.mk @@ -4,7 +4,7 @@ # ################################################################################ -UFTRACE_VERSION = 0.10 +UFTRACE_VERSION = 0.12 UFTRACE_SITE = $(call github,namhyung,uftrace,v$(UFTRACE_VERSION)) UFTRACE_LICENSE = GPL-2.0 UFTRACE_LICENSE_FILES = COPYING diff --git a/package/uhd/0001-host-CMakeLists-add-boost-unit_test_framework-requir.patch b/package/uhd/0001-host-CMakeLists-add-boost-unit_test_framework-requir.patch index a79b650bed3..4c455d28fca 100644 --- a/package/uhd/0001-host-CMakeLists-add-boost-unit_test_framework-requir.patch +++ b/package/uhd/0001-host-CMakeLists-add-boost-unit_test_framework-requir.patch @@ -9,8 +9,10 @@ when ENABLE_TESTS=ON. This PR suppress unit_test_framework to the default list and append UHD_BOOST_REQUIRED_COMPONENTS when this library is needed -[backported from https://github.com/EttusResearch/uhd/pull/341] Signed-off-by: Gwenhael Goavec-Merou +[Fabrice: updated for 4.3.0.0] +Signed-off-by: Fabrice Fontaine +[Upstream status: reverted (https://github.com/EttusResearch/uhd/commit/1a00949b19eaecb84af0f27c370400dc71a9fd84)] --- host/CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) @@ -19,15 +21,13 @@ diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt index 8f72ece76..a7731ffbd 100644 --- a/host/CMakeLists.txt +++ b/host/CMakeLists.txt -@@ -291,10 +291,14 @@ set(UHD_BOOST_REQUIRED_COMPONENTS - filesystem - program_options +@@ -291,9 +291,12 @@ set(UHD_BOOST_REQUIRED_COMPONENTS system -- unit_test_framework serialization thread +- unit_test_framework ) -+ + +if(ENABLE_TESTS) + list(APPEND UHD_BOOST_REQUIRED_COMPONENTS unit_test_framework) +endif(ENABLE_TESTS) diff --git a/package/uhd/0002-host-fix-build-boost-173.patch b/package/uhd/0002-host-fix-build-boost-173.patch deleted file mode 100644 index b685b5f8a75..00000000000 --- a/package/uhd/0002-host-fix-build-boost-173.patch +++ /dev/null @@ -1,577 +0,0 @@ -From 13caaf001061db3c01082c4574a5e326c4969ab6 Mon Sep 17 00:00:00 2001 -From: Martin Braun -Date: Thu, 16 Jul 2020 13:07:34 +0200 -Subject: [PATCH] boost: Include bind.hpp where used, add - BOOST_BIND_GLOBAL_PLACEHOLDERS - -Consists of two changes: -- Grepped for files that use boost::bind, but don't include - boost/bind.hpp. Changed all of those to include bind.hpp -- Add BOOST_BIND_GLOBAL_PLACEHOLDERS so that Boost doesn't complain - about using bind placeholders in the global namespace. - -Background: boost/bind.hpp is a convenience header that pulls the Boost -bind placeholders into the global namespace, but that's deprecated -behaviour. For UHD 3.15, we'll keep the deprecated behaviour (modern UHD -no longer uses Boost.Bind), so this fixes build failures with modern -Boost, and related warnings. - -Patch retrieved from -https://github.com/EttusResearch/uhd/commit/13caaf001061db3c01082c4574a5e326c4969ab6 - -Signed-off-by: Martin Braun -Signed-off-by: Gwenhael Goavec-Merou ---- - host/cmake/Modules/UHDBoost.cmake | 3 +++ - host/examples/network_relay.cpp | 1 + - host/examples/rfnoc_rx_to_file.cpp | 1 + - host/examples/test_clock_synch.cpp | 1 + - host/examples/txrx_loopback_to_file.cpp | 1 + - host/lib/rfnoc/dma_fifo_block_ctrl_impl.cpp | 1 + - host/lib/rfnoc/legacy_compat.cpp | 1 + - host/lib/transport/xport_benchmarker.cpp | 1 + - host/lib/usrp/b100/b100_impl.cpp | 1 + - host/lib/usrp/b200/b200_iface.cpp | 1 + - host/lib/usrp/b200/b200_impl.cpp | 1 + - host/lib/usrp/cores/rx_dsp_core_3000.cpp | 1 + - host/lib/usrp/cores/tx_dsp_core_3000.cpp | 1 + - host/lib/usrp/dboard/db_cbx.cpp | 1 + - host/lib/usrp/dboard/db_dbsrx.cpp | 1 + - host/lib/usrp/dboard/db_dbsrx2.cpp | 1 + - host/lib/usrp/dboard/db_sbx_common.cpp | 1 + - host/lib/usrp/dboard/db_sbx_version3.cpp | 1 + - host/lib/usrp/dboard/db_sbx_version4.cpp | 1 + - host/lib/usrp/dboard/db_tvrx.cpp | 1 + - host/lib/usrp/dboard/db_tvrx2.cpp | 1 + - host/lib/usrp/dboard/db_twinrx.cpp | 1 + - host/lib/usrp/dboard/db_ubx.cpp | 1 + - host/lib/usrp/dboard/db_wbx_common.cpp | 1 + - host/lib/usrp/dboard/db_wbx_simple.cpp | 1 + - host/lib/usrp/dboard/db_wbx_version2.cpp | 1 + - host/lib/usrp/dboard/db_wbx_version3.cpp | 1 + - host/lib/usrp/dboard/db_wbx_version4.cpp | 1 + - host/lib/usrp/dboard/db_xcvr2450.cpp | 1 + - host/lib/usrp/dboard/eiscat/eiscat_radio_ctrl_impl.cpp | 1 + - host/lib/usrp/multi_usrp.cpp | 1 + - host/lib/usrp/n230/n230_resource_manager.cpp | 1 + - host/lib/usrp/n230/n230_uart.cpp | 1 + - host/lib/usrp/usrp1/soft_time_ctrl.cpp | 1 + - host/lib/usrp/usrp1/usrp1_impl.cpp | 1 + - host/lib/usrp/x300/x300_radio_ctrl_impl.cpp | 1 + - host/lib/usrp_clock/octoclock/octoclock_impl.cpp | 1 + - host/lib/utils/ihex.cpp | 1 + - host/lib/utils/tasks.cpp | 1 + - host/utils/uhd_cal_rx_iq_balance.cpp | 1 + - host/utils/uhd_cal_tx_dc_offset.cpp | 1 + - host/utils/uhd_cal_tx_iq_balance.cpp | 1 + - 42 files changed, 44 insertions(+) - -diff --git a/host/cmake/Modules/UHDBoost.cmake b/host/cmake/Modules/UHDBoost.cmake -index 5ebb4acef..e3ee42b50 100644 ---- a/host/cmake/Modules/UHDBoost.cmake -+++ b/host/cmake/Modules/UHDBoost.cmake -@@ -259,6 +259,9 @@ else() - # disable Boost's use of std::experimental::string_view - # works for Boost 1.67.0 and newer & doesn't hurt older - add_definitions(-DBOOST_ASIO_DISABLE_STD_EXPERIMENTAL_STRING_VIEW) -+ # UHD 3.15 still uses global placeholders (_1, _2, ...) from Boost which -+ # need to be enabled explicitly for some Boost versions -+ add_definitions(-DBOOST_BIND_GLOBAL_PLACEHOLDERS) - - # Boost 1.70.0's find cmake scripts don't always set the expected - # return variables. Replicate the commit that fixes that issue here: -diff --git a/host/examples/network_relay.cpp b/host/examples/network_relay.cpp -index bf2ac9255..9a9f56eb5 100644 ---- a/host/examples/network_relay.cpp -+++ b/host/examples/network_relay.cpp -@@ -8,6 +8,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/host/examples/rfnoc_rx_to_file.cpp b/host/examples/rfnoc_rx_to_file.cpp -index 5bb9985ae..cbd35cbe8 100644 ---- a/host/examples/rfnoc_rx_to_file.cpp -+++ b/host/examples/rfnoc_rx_to_file.cpp -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/host/examples/test_clock_synch.cpp b/host/examples/test_clock_synch.cpp -index 8556063d7..ec071f7c7 100644 ---- a/host/examples/test_clock_synch.cpp -+++ b/host/examples/test_clock_synch.cpp -@@ -12,6 +12,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/host/examples/txrx_loopback_to_file.cpp b/host/examples/txrx_loopback_to_file.cpp -index 271d249f6..a2f0427c9 100644 ---- a/host/examples/txrx_loopback_to_file.cpp -+++ b/host/examples/txrx_loopback_to_file.cpp -@@ -13,6 +13,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/host/lib/rfnoc/dma_fifo_block_ctrl_impl.cpp b/host/lib/rfnoc/dma_fifo_block_ctrl_impl.cpp -index a80e2ef53..b78635002 100644 ---- a/host/lib/rfnoc/dma_fifo_block_ctrl_impl.cpp -+++ b/host/lib/rfnoc/dma_fifo_block_ctrl_impl.cpp -@@ -11,6 +11,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/host/lib/rfnoc/legacy_compat.cpp b/host/lib/rfnoc/legacy_compat.cpp -index 91de361df..f93fe871a 100644 ---- a/host/lib/rfnoc/legacy_compat.cpp -+++ b/host/lib/rfnoc/legacy_compat.cpp -@@ -19,6 +19,7 @@ - #include - #include - #include -+#include - #include - #include - -diff --git a/host/lib/transport/xport_benchmarker.cpp b/host/lib/transport/xport_benchmarker.cpp -index 67582ff2c..7abd4c5fd 100644 ---- a/host/lib/transport/xport_benchmarker.cpp -+++ b/host/lib/transport/xport_benchmarker.cpp -@@ -6,6 +6,7 @@ - // - - #include "xport_benchmarker.hpp" -+#include - #include - #include - -diff --git a/host/lib/usrp/b100/b100_impl.cpp b/host/lib/usrp/b100/b100_impl.cpp -index cd4319803..08006ae32 100644 ---- a/host/lib/usrp/b100/b100_impl.cpp -+++ b/host/lib/usrp/b100/b100_impl.cpp -@@ -15,6 +15,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/host/lib/usrp/b200/b200_iface.cpp b/host/lib/usrp/b200/b200_iface.cpp -index 082be071c..cdf88f69b 100644 ---- a/host/lib/usrp/b200/b200_iface.cpp -+++ b/host/lib/usrp/b200/b200_iface.cpp -@@ -12,6 +12,7 @@ - #include - #include - -+#include - #include - #include - #include -diff --git a/host/lib/usrp/b200/b200_impl.cpp b/host/lib/usrp/b200/b200_impl.cpp -index 1be8c263b..c0f8ee1ac 100644 ---- a/host/lib/usrp/b200/b200_impl.cpp -+++ b/host/lib/usrp/b200/b200_impl.cpp -@@ -17,6 +17,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/host/lib/usrp/cores/rx_dsp_core_3000.cpp b/host/lib/usrp/cores/rx_dsp_core_3000.cpp -index 46fce3f69..ff7caf105 100644 ---- a/host/lib/usrp/cores/rx_dsp_core_3000.cpp -+++ b/host/lib/usrp/cores/rx_dsp_core_3000.cpp -@@ -13,6 +13,7 @@ - #include - #include - #include -+#include - #include - #include //thread sleep - #include -diff --git a/host/lib/usrp/cores/tx_dsp_core_3000.cpp b/host/lib/usrp/cores/tx_dsp_core_3000.cpp -index be7593841..b76a74b1c 100644 ---- a/host/lib/usrp/cores/tx_dsp_core_3000.cpp -+++ b/host/lib/usrp/cores/tx_dsp_core_3000.cpp -@@ -12,6 +12,7 @@ - #include - #include - #include -+#include - #include - #include //sleep - #include -diff --git a/host/lib/usrp/dboard/db_cbx.cpp b/host/lib/usrp/dboard/db_cbx.cpp -index dd0640d00..f5c7f2399 100644 ---- a/host/lib/usrp/dboard/db_cbx.cpp -+++ b/host/lib/usrp/dboard/db_cbx.cpp -@@ -7,6 +7,7 @@ - - #include "db_sbx_common.hpp" - #include -+#include - #include - - using namespace uhd; -diff --git a/host/lib/usrp/dboard/db_dbsrx.cpp b/host/lib/usrp/dboard/db_dbsrx.cpp -index 587158470..dc82b60f9 100644 ---- a/host/lib/usrp/dboard/db_dbsrx.cpp -+++ b/host/lib/usrp/dboard/db_dbsrx.cpp -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/host/lib/usrp/dboard/db_dbsrx2.cpp b/host/lib/usrp/dboard/db_dbsrx2.cpp -index e2505dfd7..da4da4148 100644 ---- a/host/lib/usrp/dboard/db_dbsrx2.cpp -+++ b/host/lib/usrp/dboard/db_dbsrx2.cpp -@@ -18,6 +18,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/host/lib/usrp/dboard/db_sbx_common.cpp b/host/lib/usrp/dboard/db_sbx_common.cpp -index b6eaedc3d..95aff96b4 100644 ---- a/host/lib/usrp/dboard/db_sbx_common.cpp -+++ b/host/lib/usrp/dboard/db_sbx_common.cpp -@@ -6,6 +6,7 @@ - // - - #include "db_sbx_common.hpp" -+#include - - using namespace uhd; - using namespace uhd::usrp; -diff --git a/host/lib/usrp/dboard/db_sbx_version3.cpp b/host/lib/usrp/dboard/db_sbx_version3.cpp -index 369315b2e..fb829cf34 100644 ---- a/host/lib/usrp/dboard/db_sbx_version3.cpp -+++ b/host/lib/usrp/dboard/db_sbx_version3.cpp -@@ -9,6 +9,7 @@ - #include "db_sbx_common.hpp" - #include - #include -+#include - - using namespace uhd; - using namespace uhd::usrp; -diff --git a/host/lib/usrp/dboard/db_sbx_version4.cpp b/host/lib/usrp/dboard/db_sbx_version4.cpp -index d1c76287b..e1adebf99 100644 ---- a/host/lib/usrp/dboard/db_sbx_version4.cpp -+++ b/host/lib/usrp/dboard/db_sbx_version4.cpp -@@ -9,6 +9,7 @@ - #include "db_sbx_common.hpp" - #include - #include -+#include - - using namespace uhd; - using namespace uhd::usrp; -diff --git a/host/lib/usrp/dboard/db_tvrx.cpp b/host/lib/usrp/dboard/db_tvrx.cpp -index 8bf377c4d..5fbbf5bee 100644 ---- a/host/lib/usrp/dboard/db_tvrx.cpp -+++ b/host/lib/usrp/dboard/db_tvrx.cpp -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/host/lib/usrp/dboard/db_tvrx2.cpp b/host/lib/usrp/dboard/db_tvrx2.cpp -index 5dba83551..e1623487d 100644 ---- a/host/lib/usrp/dboard/db_tvrx2.cpp -+++ b/host/lib/usrp/dboard/db_tvrx2.cpp -@@ -55,6 +55,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/host/lib/usrp/dboard/db_twinrx.cpp b/host/lib/usrp/dboard/db_twinrx.cpp -index de1cd3f33..aa9da8adf 100644 ---- a/host/lib/usrp/dboard/db_twinrx.cpp -+++ b/host/lib/usrp/dboard/db_twinrx.cpp -@@ -19,6 +19,7 @@ - #include - #include - #include "dboard_ctor_args.hpp" -+#include - #include - #include - #include -diff --git a/host/lib/usrp/dboard/db_ubx.cpp b/host/lib/usrp/dboard/db_ubx.cpp -index 305a69c52..e78f9db75 100644 ---- a/host/lib/usrp/dboard/db_ubx.cpp -+++ b/host/lib/usrp/dboard/db_ubx.cpp -@@ -20,6 +20,7 @@ - #include - #include - -+#include - #include - #include - #include -diff --git a/host/lib/usrp/dboard/db_wbx_common.cpp b/host/lib/usrp/dboard/db_wbx_common.cpp -index 41f323d19..fd7b2481a 100644 ---- a/host/lib/usrp/dboard/db_wbx_common.cpp -+++ b/host/lib/usrp/dboard/db_wbx_common.cpp -@@ -12,6 +12,7 @@ - #include - #include - #include -+#include - - using namespace uhd; - using namespace uhd::usrp; -diff --git a/host/lib/usrp/dboard/db_wbx_simple.cpp b/host/lib/usrp/dboard/db_wbx_simple.cpp -index 390c5c47a..e3a5667c7 100644 ---- a/host/lib/usrp/dboard/db_wbx_simple.cpp -+++ b/host/lib/usrp/dboard/db_wbx_simple.cpp -@@ -17,6 +17,7 @@ - #include - #include - #include -+#include - - using namespace uhd; - using namespace uhd::usrp; -diff --git a/host/lib/usrp/dboard/db_wbx_version2.cpp b/host/lib/usrp/dboard/db_wbx_version2.cpp -index 775ee4467..f1bf7dacc 100644 ---- a/host/lib/usrp/dboard/db_wbx_version2.cpp -+++ b/host/lib/usrp/dboard/db_wbx_version2.cpp -@@ -16,6 +16,7 @@ - - #include - #include -+#include - #include - #include - #include -diff --git a/host/lib/usrp/dboard/db_wbx_version3.cpp b/host/lib/usrp/dboard/db_wbx_version3.cpp -index 41979f8ef..b755d09a2 100644 ---- a/host/lib/usrp/dboard/db_wbx_version3.cpp -+++ b/host/lib/usrp/dboard/db_wbx_version3.cpp -@@ -15,6 +15,7 @@ - - #include - #include -+#include - #include - #include - #include -diff --git a/host/lib/usrp/dboard/db_wbx_version4.cpp b/host/lib/usrp/dboard/db_wbx_version4.cpp -index 8b3d13b37..f2976d3a7 100644 ---- a/host/lib/usrp/dboard/db_wbx_version4.cpp -+++ b/host/lib/usrp/dboard/db_wbx_version4.cpp -@@ -15,6 +15,7 @@ - - #include - #include -+#include - #include - #include - #include -diff --git a/host/lib/usrp/dboard/db_xcvr2450.cpp b/host/lib/usrp/dboard/db_xcvr2450.cpp -index 9e1c9f2b0..8f95dbb1c 100644 ---- a/host/lib/usrp/dboard/db_xcvr2450.cpp -+++ b/host/lib/usrp/dboard/db_xcvr2450.cpp -@@ -49,6 +49,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/host/lib/usrp/dboard/eiscat/eiscat_radio_ctrl_impl.cpp b/host/lib/usrp/dboard/eiscat/eiscat_radio_ctrl_impl.cpp -index 73851656b..717fa144f 100644 ---- a/host/lib/usrp/dboard/eiscat/eiscat_radio_ctrl_impl.cpp -+++ b/host/lib/usrp/dboard/eiscat/eiscat_radio_ctrl_impl.cpp -@@ -11,6 +11,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/host/lib/usrp/multi_usrp.cpp b/host/lib/usrp/multi_usrp.cpp -index 49ffec698..13cb03cf9 100644 ---- a/host/lib/usrp/multi_usrp.cpp -+++ b/host/lib/usrp/multi_usrp.cpp -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/host/lib/usrp/n230/n230_resource_manager.cpp b/host/lib/usrp/n230/n230_resource_manager.cpp -index 22f8ddedb..df3c9fb15 100644 ---- a/host/lib/usrp/n230/n230_resource_manager.cpp -+++ b/host/lib/usrp/n230/n230_resource_manager.cpp -@@ -14,6 +14,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/host/lib/usrp/n230/n230_uart.cpp b/host/lib/usrp/n230/n230_uart.cpp -index 8689335c8..26fafde94 100644 ---- a/host/lib/usrp/n230/n230_uart.cpp -+++ b/host/lib/usrp/n230/n230_uart.cpp -@@ -13,6 +13,7 @@ - #include - #include - #include -+#include - - using namespace uhd; - using namespace uhd::transport; -diff --git a/host/lib/usrp/usrp1/soft_time_ctrl.cpp b/host/lib/usrp/usrp1/soft_time_ctrl.cpp -index 7f39caf8a..9a84ee188 100644 ---- a/host/lib/usrp/usrp1/soft_time_ctrl.cpp -+++ b/host/lib/usrp/usrp1/soft_time_ctrl.cpp -@@ -8,6 +8,7 @@ - #include "soft_time_ctrl.hpp" - #include - #include -+#include - #include - #include - #include -diff --git a/host/lib/usrp/usrp1/usrp1_impl.cpp b/host/lib/usrp/usrp1/usrp1_impl.cpp -index 2134f8182..1e83ce3fc 100644 ---- a/host/lib/usrp/usrp1/usrp1_impl.cpp -+++ b/host/lib/usrp/usrp1/usrp1_impl.cpp -@@ -14,6 +14,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/host/lib/usrp/x300/x300_radio_ctrl_impl.cpp b/host/lib/usrp/x300/x300_radio_ctrl_impl.cpp -index 8d967ae15..de36379ea 100644 ---- a/host/lib/usrp/x300/x300_radio_ctrl_impl.cpp -+++ b/host/lib/usrp/x300/x300_radio_ctrl_impl.cpp -@@ -17,6 +17,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/host/lib/usrp_clock/octoclock/octoclock_impl.cpp b/host/lib/usrp_clock/octoclock/octoclock_impl.cpp -index f3cf3f4ea..4c11788d2 100644 ---- a/host/lib/usrp_clock/octoclock/octoclock_impl.cpp -+++ b/host/lib/usrp_clock/octoclock/octoclock_impl.cpp -@@ -9,6 +9,7 @@ - - #include - #include -+#include - #include - #include - #include -diff --git a/host/lib/utils/ihex.cpp b/host/lib/utils/ihex.cpp -index 6bb0ba9d4..7fb605627 100644 ---- a/host/lib/utils/ihex.cpp -+++ b/host/lib/utils/ihex.cpp -@@ -7,6 +7,7 @@ - - #include - #include -+#include - #include - #include - #include -diff --git a/host/lib/utils/tasks.cpp b/host/lib/utils/tasks.cpp -index 888a5a8f1..e5195fcf1 100644 ---- a/host/lib/utils/tasks.cpp -+++ b/host/lib/utils/tasks.cpp -@@ -10,6 +10,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/host/utils/uhd_cal_rx_iq_balance.cpp b/host/utils/uhd_cal_rx_iq_balance.cpp -index c68c96173..3f5fa1788 100644 ---- a/host/utils/uhd_cal_rx_iq_balance.cpp -+++ b/host/utils/uhd_cal_rx_iq_balance.cpp -@@ -11,6 +11,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/host/utils/uhd_cal_tx_dc_offset.cpp b/host/utils/uhd_cal_tx_dc_offset.cpp -index f47b5e913..2cb65d3f5 100644 ---- a/host/utils/uhd_cal_tx_dc_offset.cpp -+++ b/host/utils/uhd_cal_tx_dc_offset.cpp -@@ -11,6 +11,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/host/utils/uhd_cal_tx_iq_balance.cpp b/host/utils/uhd_cal_tx_iq_balance.cpp -index 2e7229fd3..ace93462e 100644 ---- a/host/utils/uhd_cal_tx_iq_balance.cpp -+++ b/host/utils/uhd_cal_tx_iq_balance.cpp -@@ -8,6 +8,7 @@ - #include "usrp_cal_utils.hpp" - #include - #include -+#include - #include - #include - #include --- -2.26.2 - diff --git a/package/uhd/0003-add-RISC-V-endian-detection.patch b/package/uhd/0003-add-RISC-V-endian-detection.patch deleted file mode 100644 index fb1168ba3e3..00000000000 --- a/package/uhd/0003-add-RISC-V-endian-detection.patch +++ /dev/null @@ -1,113 +0,0 @@ -From d4717a38d2287c2f583fefb2a0ed273337a92bb6 Mon Sep 17 00:00:00 2001 -From: Gwenhael Goavec-Merou -Date: Mon, 11 Jan 2021 18:18:26 +0100 -Subject: [PATCH] msgpack/predef: add riscV support - -When the target CPU is riscV, msgpack is unable to detect endianness with a list of errors like: - -uhd/host/lib/deps/rpclib/include/rpc/msgpack/pack.hpp:190:2: error: #error msgpack-c supports only big endian and little endian - 190 | #error msgpack-c supports only big endian and little endian - | ^~~~~ - -and with subsequent errors: - -uhd0/host/lib/deps/rpclib/include/rpc/msgpack/pack.hpp:236:46: error: there are no arguments to 'take8_8' that depend on a template parameter, so a declaration of 'take8_8' must be available [-fpermissive] - 236 | char buf[2] = {static_cast(0xccu), take8_8(d)}; - | - -This is due to a missing support for this architecture in msgpack. -This patch adapt commit from https://github.com/boostorg/predef - -[backported from https://github.com/EttusResearch/uhd/pull/400] - -Signed-off-by: Gwenhael Goavec-Merou ---- - .../include/rpc/msgpack/predef/architecture.h | 1 + - .../rpc/msgpack/predef/architecture/riscv.h | 48 +++++++++++++++++++ - .../include/rpc/msgpack/predef/other/endian.h | 3 +- - 3 files changed, 51 insertions(+), 1 deletion(-) - create mode 100644 host/lib/deps/rpclib/include/rpc/msgpack/predef/architecture/riscv.h - -diff --git a/host/lib/deps/rpclib/include/rpc/msgpack/predef/architecture.h b/host/lib/deps/rpclib/include/rpc/msgpack/predef/architecture.h -index 4a0ce2749..1bd998c59 100644 ---- a/host/lib/deps/rpclib/include/rpc/msgpack/predef/architecture.h -+++ b/host/lib/deps/rpclib/include/rpc/msgpack/predef/architecture.h -@@ -18,6 +18,7 @@ http://www.boost.org/LICENSE_1_0.txt) - #include - #include - #include -+#include - #include - #include - #include -diff --git a/host/lib/deps/rpclib/include/rpc/msgpack/predef/architecture/riscv.h b/host/lib/deps/rpclib/include/rpc/msgpack/predef/architecture/riscv.h -new file mode 100644 -index 000000000..8b819d77e ---- /dev/null -+++ b/host/lib/deps/rpclib/include/rpc/msgpack/predef/architecture/riscv.h -@@ -0,0 +1,48 @@ -+/* -+Copyright Andreas Schwab 2019 -+Distributed under the Boost Software License, Version 1.0. -+(See accompanying file LICENSE_1_0.txt or copy at -+http://www.boost.org/LICENSE_1_0.txt) -+*/ -+ -+#ifndef BOOST_PREDEF_ARCHITECTURE_RISCV_H -+#define BOOST_PREDEF_ARCHITECTURE_RISCV_H -+ -+#include -+#include -+ -+/* tag::reference[] -+= `BOOST_ARCH_RISCV` -+ -+http://en.wikipedia.org/wiki/RISC-V[RISC-V] architecture. -+ -+[options="header"] -+|=== -+| {predef_symbol} | {predef_version} -+ -+| `+__riscv+` | {predef_detection} -+|=== -+*/ // end::reference[] -+ -+#define BOOST_ARCH_RISCV BOOST_VERSION_NUMBER_NOT_AVAILABLE -+ -+#if defined(__riscv) -+# undef BOOST_ARCH_RISCV -+# define BOOST_ARCH_RISCV BOOST_VERSION_NUMBER_AVAILABLE -+#endif -+ -+#if BOOST_ARCH_RISCV -+# define BOOST_ARCH_RISCV_AVAILABLE -+#endif -+ -+#if BOOST_ARCH_RISCV -+# undef BOOST_ARCH_WORD_BITS_32 -+# define BOOST_ARCH_WORD_BITS_32 BOOST_VERSION_NUMBER_AVAILABLE -+#endif -+ -+#define BOOST_ARCH_RISCV_NAME "RISC-V" -+ -+#endif -+ -+#include -+BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_RISCV,BOOST_ARCH_RISCV_NAME) -diff --git a/host/lib/deps/rpclib/include/rpc/msgpack/predef/other/endian.h b/host/lib/deps/rpclib/include/rpc/msgpack/predef/other/endian.h -index 3f367b3d4..a7c1fb4dc 100644 ---- a/host/lib/deps/rpclib/include/rpc/msgpack/predef/other/endian.h -+++ b/host/lib/deps/rpclib/include/rpc/msgpack/predef/other/endian.h -@@ -127,7 +127,8 @@ information and acquired knowledge: - defined(__AARCH64EL__) || \ - defined(_MIPSEL) || \ - defined(__MIPSEL) || \ -- defined(__MIPSEL__) -+ defined(__MIPSEL__) || \ -+ defined(__riscv) - # undef MSGPACK_ENDIAN_LITTLE_BYTE - # define MSGPACK_ENDIAN_LITTLE_BYTE MSGPACK_VERSION_NUMBER_AVAILABLE - # endif --- -2.26.2 - diff --git a/package/uhd/0004-lib-Fix-missing-includes-in-rpc-hpp.patch b/package/uhd/0004-lib-Fix-missing-includes-in-rpc-hpp.patch deleted file mode 100644 index b287beec719..00000000000 --- a/package/uhd/0004-lib-Fix-missing-includes-in-rpc-hpp.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 9c4d9d826a6f40f199c526afd5ec168d5d088591 Mon Sep 17 00:00:00 2001 -From: Martin Braun -Date: Fri, 29 Jan 2021 12:23:50 +0100 -Subject: [PATCH] lib: Fix missing includes in rpc.hpp - -[Retrieved from: -https://github.com/EttusResearch/uhd/commit/9c4d9d826a6f40f199c526afd5ec168d5d088591] -Signed-off-by: Fabrice Fontaine ---- - host/lib/include/uhdlib/utils/rpc.hpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/host/lib/include/uhdlib/utils/rpc.hpp b/host/lib/include/uhdlib/utils/rpc.hpp -index e87a2ee324..ca89c10547 100644 ---- a/host/lib/include/uhdlib/utils/rpc.hpp -+++ b/host/lib/include/uhdlib/utils/rpc.hpp -@@ -12,7 +12,11 @@ - #include - #include - #include -+#include - #include -+#include -+#include -+#include - - namespace { - diff --git a/package/uhd/0005-core-remove-boost-math-in-favor-of-std-cmath.patch b/package/uhd/0005-core-remove-boost-math-in-favor-of-std-cmath.patch deleted file mode 100644 index 9530b0213f0..00000000000 --- a/package/uhd/0005-core-remove-boost-math-in-favor-of-std-cmath.patch +++ /dev/null @@ -1,105 +0,0 @@ -From dc187b5597779b14d0de4087db4aa54752a15d07 Mon Sep 17 00:00:00 2001 -From: Michael Dickens -Date: Fri, 2 Jul 2021 16:43:41 -0400 -Subject: [PATCH] core: remove boost::math in favor of std cmath - -YA Boost removal!!! - -Justification ---- -const int if_freq_sign = boost::math::sign(fe_conn.get_if_freq()); -_dsp_freq_offset = if_freq * (-if_freq_sign); -// boost::math::sign : 1 if x > 0, -1 if x < 0, and 0 if x is zero. -// ==> if if_freq_sign > 0 then * by -1 else +1 (effectively) - -// std::signbit : true if arg is negative, false otherwise -// ==> need 'not' of input argument to invert for same result as prior algorithm -double fe_if_freq = fe_conn.get_if_freq(); -if (!std::signbit(fe_if_freq)) { - if_freq *= -1.0; -} ---- -The above should result in the same algorithm except possibly -if fe_if_freq is exactly 0.0 in which case the results might be -off by the sign (+0.0 versus -0.0). - -[Retrieved from: -https://github.com/EttusResearch/uhd/commit/dc187b5597779b14d0de4087db4aa54752a15d07] -Signed-off-by: Fabrice Fontaine ---- - host/lib/usrp/cores/rx_dsp_core_3000.cpp | 15 ++++++++------- - host/lib/usrp/cores/rx_frontend_core_3000.cpp | 14 ++++++++------ - 2 files changed, 16 insertions(+), 13 deletions(-) - -diff --git a/host/lib/usrp/cores/rx_dsp_core_3000.cpp b/host/lib/usrp/cores/rx_dsp_core_3000.cpp -index 879748fa2..1c15180ae 100644 ---- a/host/lib/usrp/cores/rx_dsp_core_3000.cpp -+++ b/host/lib/usrp/cores/rx_dsp_core_3000.cpp -@@ -8,7 +8,6 @@ - #include - #include - #include --#include - #include - #include - #include -@@ -81,19 +80,21 @@ class rx_dsp_core_3000_impl : public rx_dsp_core_3000 - _iface->poke32(REG_DSP_RX_MUX, reg_val); - - if (fe_conn.get_sampling_mode() == uhd::usrp::fe_connection_t::HETERODYNE) { -- // 1. Remember the sign of the IF frequency. -- // It will be discarded in the next step -- int if_freq_sign = boost::math::sign(fe_conn.get_if_freq()); -+ // 1. Remember the IF frequency -+ const double fe_if_freq = fe_conn.get_if_freq(); - // 2. Map IF frequency to the range [0, _tick_rate) -- double if_freq = std::abs(std::fmod(fe_conn.get_if_freq(), _tick_rate)); -- // 3. Map IF frequency to the range [-_tick_rate/2, _tick_rate/2) -+ double if_freq = std::abs(std::fmod(fe_if_freq, _tick_rate)); -+ // 3. Map IF frequency to the range [-_tick_rate/2, _tick_rate/2] - // This is the aliased frequency - if (if_freq > (_tick_rate / 2.0)) { - if_freq -= _tick_rate; - } - // 4. Set DSP offset to spin the signal in the opposite - // direction as the aliased frequency -- _dsp_freq_offset = if_freq * (-if_freq_sign); -+ if (!std::signbit(fe_if_freq)) { -+ if_freq *= -1.0; -+ } -+ _dsp_freq_offset = if_freq; - } else { - _dsp_freq_offset = 0.0; - } -diff --git a/host/lib/usrp/cores/rx_frontend_core_3000.cpp b/host/lib/usrp/cores/rx_frontend_core_3000.cpp -index eef25f27d..b9d908534 100644 ---- a/host/lib/usrp/cores/rx_frontend_core_3000.cpp -+++ b/host/lib/usrp/cores/rx_frontend_core_3000.cpp -@@ -119,19 +119,21 @@ class rx_frontend_core_3000_impl : public rx_frontend_core_3000 - - UHD_ASSERT_THROW(_adc_rate != 0.0) - if (fe_conn.get_sampling_mode() == fe_connection_t::HETERODYNE) { -- // 1. Remember the sign of the IF frequency. -- // It will be discarded in the next step -- const int if_freq_sign = boost::math::sign(fe_conn.get_if_freq()); -+ // 1. Remember the IF frequency -+ const double fe_if_freq = fe_conn.get_if_freq(); - // 2. Map IF frequency to the range [0, _adc_rate) -- double if_freq = std::abs(std::fmod(fe_conn.get_if_freq(), _adc_rate)); -- // 3. Map IF frequency to the range [-_adc_rate/2, _adc_rate/2) -+ double if_freq = std::abs(std::fmod(fe_if_freq, _adc_rate)); -+ // 3. Map IF frequency to the range [-_adc_rate/2, _adc_rate/2] - // This is the aliased frequency - if (if_freq > (_adc_rate / 2.0)) { - if_freq -= _adc_rate; - } - // 4. Set DSP offset to spin the signal in the opposite - // direction as the aliased frequency -- const double cordic_freq = if_freq * (-if_freq_sign); -+ if (!std::signbit(fe_if_freq)) { -+ if_freq *= -1.0; -+ } -+ const double cordic_freq = if_freq; - UHD_ASSERT_THROW(uhd::math::fp_compare::fp_compare_epsilon(4.0) - == std::abs(_adc_rate / cordic_freq)); - diff --git a/package/uhd/0006-usrp2-Replace-boost-math-iround-math-sign-with-std-l.patch b/package/uhd/0006-usrp2-Replace-boost-math-iround-math-sign-with-std-l.patch deleted file mode 100644 index b0cbffc2451..00000000000 --- a/package/uhd/0006-usrp2-Replace-boost-math-iround-math-sign-with-std-l.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 3796175f32f0cc24c16809d8175d423bc7053de9 Mon Sep 17 00:00:00 2001 -From: StefanBruens -Date: Wed, 5 May 2021 18:24:58 +0200 -Subject: [PATCH] usrp2: Replace boost::math::iround/math::sign with std::lround - -Instead of multiplying zone with the sign repeatedly just make -the zone a signed value. - -See #437, #438 - -Signed-off-by: Aaron Rossetto -[gwenhael.goavec-merou@trabucayre.com: backport from upstream] -Signed-off-by: Gwenhael Goavec-Merou ---- - host/lib/usrp/usrp2/usrp2_impl.cpp | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/host/lib/usrp/usrp2/usrp2_impl.cpp b/host/lib/usrp/usrp2/usrp2_impl.cpp -index 1be4c7339..c0719a316 100644 ---- a/host/lib/usrp/usrp2/usrp2_impl.cpp -+++ b/host/lib/usrp/usrp2/usrp2_impl.cpp -@@ -22,6 +22,7 @@ - #include - #include //used for htonl and ntohl - #include -+#include - - using namespace uhd; - using namespace uhd::usrp; -@@ -844,20 +845,19 @@ double usrp2_impl::set_tx_dsp_freq( - _tree->access("/mboards/"+mb+"/tick_rate").get(); - - //calculate the DAC shift (multiples of rate) -- const int sign = boost::math::sign(new_freq); -- const int zone = std::min(boost::math::iround(new_freq/tick_rate), 2); -- const double dac_shift = sign*zone*tick_rate; -+ const int zone = std::max(std::min(std::lround(new_freq / tick_rate), 2), -2); -+ const double dac_shift = zone * tick_rate; - new_freq -= dac_shift; //update FPGA DSP target freq - UHD_LOG_TRACE("USRP2", - "DSP Tuning: Requested " + std::to_string(freq_/1e6) + " MHz, Using " -- "Nyquist zone " + std::to_string(sign*zone) + ", leftover DSP tuning: " -+ "Nyquist zone " + std::to_string(zone) + ", leftover DSP tuning: " - + std::to_string(new_freq/1e6) + " MHz."); - - //set the DAC shift (modulation mode) - if (zone == 0) { - _mbc[mb].codec->set_tx_mod_mode(0); //no shift - } else { -- _mbc[mb].codec->set_tx_mod_mode(sign*4/zone); //DAC interp = 4 -+ _mbc[mb].codec->set_tx_mod_mode(4 / zone); // DAC interp = 4 - } - - return _mbc[mb].tx_dsp->set_freq(new_freq) + dac_shift; //actual freq --- -2.32.0 - diff --git a/package/uhd/0007-usrp2-Use-explicit-template-type-for-std-min-T.patch b/package/uhd/0007-usrp2-Use-explicit-template-type-for-std-min-T.patch deleted file mode 100644 index c5d303cd0a6..00000000000 --- a/package/uhd/0007-usrp2-Use-explicit-template-type-for-std-min-T.patch +++ /dev/null @@ -1,28 +0,0 @@ -From d1c6290fe9c8b01068abfca6f272e2a1e031b9de Mon Sep 17 00:00:00 2001 -From: StefanBruens -Date: Wed, 5 May 2021 18:49:40 +0200 -Subject: [PATCH] usrp2: Use explicit template type for std::min - -Signed-off-by: Aaron Rossetto -[gwenhael.goavec-merou@trabucayre.com: backport from upstream] -Signed-off-by: Gwenhael Goavec-Merou ---- - host/lib/usrp/usrp2/usrp2_impl.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/host/lib/usrp/usrp2/usrp2_impl.cpp b/host/lib/usrp/usrp2/usrp2_impl.cpp -index 59fd9849c..e82a9fa71 100644 ---- a/host/lib/usrp/usrp2/usrp2_impl.cpp -+++ b/host/lib/usrp/usrp2/usrp2_impl.cpp -@@ -845,7 +845,7 @@ double usrp2_impl::set_tx_dsp_freq( - _tree->access("/mboards/"+mb+"/tick_rate").get(); - - //calculate the DAC shift (multiples of rate) -- const int zone = std::max(std::min(std::lround(new_freq / tick_rate), 2), -2); -+ const int zone = std::max(std::min(std::lround(new_freq / tick_rate), 2), -2); - const double dac_shift = zone * tick_rate; - new_freq -= dac_shift; //update FPGA DSP target freq - UHD_LOG_TRACE("USRP2", --- -2.32.0 - diff --git a/package/uhd/Config.in b/package/uhd/Config.in index 248e309dd5e..75554259d0e 100644 --- a/package/uhd/Config.in +++ b/package/uhd/Config.in @@ -23,7 +23,6 @@ config BR2_PACKAGE_UHD select BR2_PACKAGE_BOOST_FILESYSTEM select BR2_PACKAGE_BOOST_MATH select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS - select BR2_PACKAGE_BOOST_REGEX select BR2_PACKAGE_BOOST_SERIALIZATION select BR2_PACKAGE_BOOST_SYSTEM select BR2_PACKAGE_BOOST_THREAD @@ -76,11 +75,6 @@ config BR2_PACKAGE_UHD_MPMD help enable MPMD support -config BR2_PACKAGE_UHD_N230 - bool "N230 support" - help - enable N230 support - config BR2_PACKAGE_UHD_N300 bool "N300 support" select BR2_PACKAGE_UHD_MPMD @@ -113,11 +107,6 @@ config BR2_PACKAGE_UHD_PYTHON help enable python API support -config BR2_PACKAGE_UHD_RFNOC - bool "RFNoC support" - help - enable RFNoC support - config BR2_PACKAGE_UHD_USB bool "USB support" depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb diff --git a/package/uhd/uhd.hash b/package/uhd/uhd.hash index cfd1f3f6415..3af1bc9251b 100644 --- a/package/uhd/uhd.hash +++ b/package/uhd/uhd.hash @@ -1,4 +1,5 @@ # Locally calculated: -sha256 eed4a77d75faafff56be78985950039f8d9d1eb9fcbd58b8862e481dd49825cd uhd-3.15.0.0.tar.gz -sha256 8fc99820c2419d0de6bbbd319ff935d54960b37b716d0b4bb1c75de493f3e1fd LICENSE.md +sha256 8695800d593c58b557cbf9905b02bbf65a74ca68674e8c8c8c28bb6e203635ad uhd-4.3.0.0.tar.gz +sha256 94cc36ada2641d037980bf6c2418a750ac10a115ae11de5a5cda6177769dbd4c LICENSE.md sha256 70bf7e79c8cd73a81f97ce81745ea0719a617eebe299a61868165daeae71fff2 host/LICENSE +sha256 206adc03412b6c5b71b9c9df9c1f2e60e11833e89393877d5031fd11d332b1d4 fpga/usrp3/LICENSE.md diff --git a/package/uhd/uhd.mk b/package/uhd/uhd.mk index e8f197f9dd3..a9d711acd4b 100644 --- a/package/uhd/uhd.mk +++ b/package/uhd/uhd.mk @@ -4,10 +4,10 @@ # ################################################################################ -UHD_VERSION = 3.15.0.0 +UHD_VERSION = 4.3.0.0 UHD_SITE = $(call github,EttusResearch,uhd,v$(UHD_VERSION)) -UHD_LICENSE = GPL-3.0+ -UHD_LICENSE_FILES = LICENSE.md host/LICENSE +UHD_LICENSE = GPL-3.0+, LGPL-3.0+ (fpga/usrp3) +UHD_LICENSE_FILES = LICENSE.md host/LICENSE fpga/usrp3/LICENSE.md UHD_SUPPORTS_IN_SOURCE_BUILD = NO UHD_SUBDIR = host @@ -36,7 +36,6 @@ ifeq ($(BR2_ARM_CPU_HAS_NEON),y) UHD_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -mfpu=neon" UHD_CONF_OPTS += -DNEON_SIMD_ENABLE=ON else -UHD_CONF_OPTS += -Dhave_mfpu_neon=0 UHD_CONF_OPTS += -DNEON_SIMD_ENABLE=OFF endif @@ -80,12 +79,6 @@ else UHD_CONF_OPTS += -DENABLE_MPMD=OFF endif -ifeq ($(BR2_PACKAGE_UHD_N230),y) -UHD_CONF_OPTS += -DENABLE_N230=ON -else -UHD_CONF_OPTS += -DENABLE_N230=OFF -endif - ifeq ($(BR2_PACKAGE_UHD_N300),y) UHD_CONF_OPTS += -DENABLE_N300=ON else @@ -104,12 +97,6 @@ else UHD_CONF_OPTS += -DENABLE_OCTOCLOCK=OFF endif -ifeq ($(BR2_PACKAGE_UHD_RFNOC),y) -UHD_CONF_OPTS += -DENABLE_RFNOC=ON -else -UHD_CONF_OPTS += -DENABLE_RFNOC=OFF -endif - ifeq ($(BR2_PACKAGE_UHD_PYTHON),y) UHD_DEPENDENCIES += host-python-numpy host-python-requests \ python-numpy python-requests diff --git a/package/uhubctl/uhubctl.hash b/package/uhubctl/uhubctl.hash index c696d70f6cd..8a4581b84ce 100644 --- a/package/uhubctl/uhubctl.hash +++ b/package/uhubctl/uhubctl.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 391f24fd1f89cacce801df38ecc289b34c3627bc08ee69eec515af7e1a283d97 uhubctl-2.4.0.tar.gz -sha256 2d3aa0737e8db9dfd710f9a282b446cb7b15b2b3eecac383f0c45c64d736eea0 LICENSE +sha256 d4452252f7862f7a45dd9c62f2ea7cd3a57ab5f5ab0e54a857d4c695699bbba3 uhubctl-2.5.0.tar.gz +sha256 5eb09049fafa91347386daf769223ba2ee6914cb26ab95b86854ad6edea49b5d LICENSE sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/uhubctl/uhubctl.mk b/package/uhubctl/uhubctl.mk index 3429d7d151e..f9815409ae6 100644 --- a/package/uhubctl/uhubctl.mk +++ b/package/uhubctl/uhubctl.mk @@ -4,7 +4,7 @@ # ################################################################################ -UHUBCTL_VERSION = 2.4.0 +UHUBCTL_VERSION = 2.5.0 UHUBCTL_SITE = $(call github,mvp,uhubctl,v$(UHUBCTL_VERSION)) UHUBCTL_LICENSE = GPL-2.0 UHUBCTL_LICENSE_FILES = LICENSE COPYING diff --git a/package/ulogd/0001-ulogd-fix-build-with-musl-libc.patch b/package/ulogd/0001-ulogd-fix-build-with-musl-libc.patch deleted file mode 100644 index af6e13648c8..00000000000 --- a/package/ulogd/0001-ulogd-fix-build-with-musl-libc.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 675e762091380590f78ff07a94a25caa459b786b Mon Sep 17 00:00:00 2001 -From: Cameron Norman -Date: Sat, 27 Oct 2018 13:05:45 -0700 -Subject: ulogd: fix build with musl libc - -The attached patch fixes building ulogd2 with musl libc. It is being -used on Void Linux right now. - -Closes: https://bugzilla.netfilter.org/show_bug.cgi?id=1278 -Signed-off-by: Pablo Neira Ayuso -Signed-off-by: Fabrice Fontaine -[Retrrieved from: -https://git.netfilter.org/ulogd2/commit/?id=675e762091380590f78ff07a94a25caa459b786b] ---- - src/ulogd.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/ulogd.c b/src/ulogd.c -index b8bc57c..9cd64e8 100644 ---- a/src/ulogd.c -+++ b/src/ulogd.c -@@ -65,6 +65,7 @@ - #include - #include - #include -+#include - #include - #include - #ifdef DEBUG --- -cgit v1.2.1 - diff --git a/package/ulogd/ulogd.hash b/package/ulogd/ulogd.hash index aef69262f77..35b518b9ced 100644 --- a/package/ulogd/ulogd.hash +++ b/package/ulogd/ulogd.hash @@ -1,7 +1,5 @@ -# From ftp://ftp.netfilter.org/pub/ulogd/ulogd-2.0.7.tar.bz2.{md5sum,sha1sum} -md5 2bb2868cf51acbb90c35763c9f995f31 ulogd-2.0.7.tar.bz2 -sha1 f2d90469e2842e2bfbe19c55cf6d56ac107aa4b9 ulogd-2.0.7.tar.bz2 +# From ftp://ftp.netfilter.org/pub/ulogd/ulogd-2.0.8.tar.bz2.sha256sum +sha256 4ead6c3970c3f57fa1e89fe2d7cc483ba6fe2bd1b08701521e0b3afd667df291 ulogd-2.0.8.tar.bz2 # Locally calculated -sha256 990a05494d9c16029ba0a83f3b7294fc05c756546b8d60d1c1572dc25249a92b ulogd-2.0.7.tar.bz2 -sha256 b8a2f73f743dc1a51aff23f1aacbca4b868564db52496fa3c0caba755bfd1eaf COPYING +sha256 b8a2f73f743dc1a51aff23f1aacbca4b868564db52496fa3c0caba755bfd1eaf COPYING diff --git a/package/ulogd/ulogd.mk b/package/ulogd/ulogd.mk index c00a53f3d52..033acb06c2f 100644 --- a/package/ulogd/ulogd.mk +++ b/package/ulogd/ulogd.mk @@ -4,10 +4,9 @@ # ################################################################################ -ULOGD_VERSION = 2.0.7 +ULOGD_VERSION = 2.0.8 ULOGD_SOURCE = ulogd-$(ULOGD_VERSION).tar.bz2 ULOGD_SITE = http://www.netfilter.org/projects/ulogd/files -ULOGD_CONF_OPTS = --without-dbi ULOGD_DEPENDENCIES = host-pkgconf \ libmnl libnetfilter_acct libnetfilter_conntrack libnetfilter_log \ libnfnetlink @@ -17,40 +16,52 @@ ULOGD_SELINUX_MODULES = ulogd # DB backends need threads ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +ifeq ($(BR2_PACKAGE_LIBDBI),y) +ULOGD_CONF_OPTS += --enable-dbi +ULOGD_DEPENDENCIES += libdbi +else +ULOGD_CONF_OPTS += --disable-dbi +endif ifeq ($(BR2_PACKAGE_MYSQL),y) -ULOGD_CONF_OPTS += --with-mysql=$(STAGING_DIR)/usr +ULOGD_CONF_OPTS += \ + --enable-mysql \ + --with-mysql-config=$(STAGING_DIR)/usr/bin/mysql_config ULOGD_DEPENDENCIES += mysql else -ULOGD_CONF_OPTS += --without-mysql +ULOGD_CONF_OPTS += --disable-mysql endif ifeq ($(BR2_PACKAGE_POSTGRESQL),y) -ULOGD_CONF_OPTS += --with-pgsql +ULOGD_CONF_OPTS += --enable-pgsql ULOGD_DEPENDENCIES += postgresql else -ULOGD_CONF_OPTS += --without-pgsql +ULOGD_CONF_OPTS += --disable-pgsql endif ifeq ($(BR2_PACKAGE_SQLITE),y) -ULOGD_CONF_OPTS += --with-sqlite +ULOGD_CONF_OPTS += --enable-sqlite3 ULOGD_DEPENDENCIES += sqlite else -ULOGD_CONF_OPTS += --without-sqlite +ULOGD_CONF_OPTS += --disable-sqlite3 endif else -ULOGD_CONF_OPTS += --without-mysql --without-pgsql --without-sqlite +ULOGD_CONF_OPTS += \ + --disable-dbi \ + --disable-mysql \ + --disable-pgsql \ + --disable-sqlite3 endif ifeq ($(BR2_PACKAGE_LIBPCAP),y) -ULOGD_CONF_OPTS += --with-pcap +ULOGD_CONF_OPTS += --enable-pcap ULOGD_DEPENDENCIES += libpcap else -ULOGD_CONF_OPTS += --without-pcap +ULOGD_CONF_OPTS += --disable-pcap endif ifeq ($(BR2_PACKAGE_JANSSON),y) -ULOGD_CONF_OPTS += --with-jansson +ULOGD_CONF_OPTS += --enable-json ULOGD_DEPENDENCIES += jansson else -ULOGD_CONF_OPTS += --without-jansson +ULOGD_CONF_OPTS += --disable-json endif $(eval $(autotools-package)) diff --git a/package/umtprd/0001-Fix-output_dir-make-dependency.patch b/package/umtprd/0001-Fix-output_dir-make-dependency.patch new file mode 100644 index 00000000000..fcbca6b000e --- /dev/null +++ b/package/umtprd/0001-Fix-output_dir-make-dependency.patch @@ -0,0 +1,46 @@ +From d84216a678edaca81c0899318231cdcca2100d38 Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Mon, 17 Oct 2022 16:39:56 -0600 +Subject: [PATCH] Fix output_dir make dependency + +Object file targets need to depend on the output_dir target. + +Fixes: +make --shuffle=reverse -j1 +cc -o obj/mtp_op_truncateobject.o src/mtp_operations/mtp_op_truncateobject.c -c -I./inc -lpthread -Wall -O3 +Assembler messages: +Fatal error: can't create obj/mtp_op_truncateobject.o: No such file or directory +make: *** [Makefile:19: obj/mtp_op_truncateobject.o] Error 1 shuffle=reverse + +[paul@crapouillou.net: Backport from upstream commit d84216a] +Signed-off-by: Paul Cercueil +--- + Makefile | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index 7c98b63..c28e186 100644 +--- a/Makefile ++++ b/Makefile +@@ -7,15 +7,15 @@ objects := $(sources:src/%.c=obj/%.o) + ops_sources := $(wildcard src/mtp_operations/*.c) + ops_objects := $(ops_sources:src/mtp_operations/%.c=obj/%.o) + +-all: output_dir umtprd ++all: umtprd + + umtprd: $(objects) $(ops_objects) + ${CC} -o $@ $^ $(LDFLAGS) -lpthread + +-$(objects): obj/%.o: src/%.c ++$(objects): obj/%.o: src/%.c | output_dir + ${CC} -o $@ $^ -c $(CPPFLAGS) $(CFLAGS) + +-$(ops_objects): obj/%.o: src/mtp_operations/%.c ++$(ops_objects): obj/%.o: src/mtp_operations/%.c | output_dir + ${CC} -o $@ $^ -c $(CPPFLAGS) $(CFLAGS) + + output_dir: +-- +2.35.1 + diff --git a/package/unbound/unbound.hash b/package/unbound/unbound.hash index ca6fe174e0e..91e1d82dd29 100644 --- a/package/unbound/unbound.hash +++ b/package/unbound/unbound.hash @@ -1,5 +1,5 @@ -# From https://nlnetlabs.nl/downloads/unbound/unbound-1.14.0.tar.gz.sha256 -sha256 6ef91cbf02d5299eab39328c0857393de7b4885a2fe7233ddfe3c124ff5a89c8 unbound-1.14.0.tar.gz +# From https://nlnetlabs.nl/downloads/unbound/unbound-1.17.1.tar.gz.sha256 +sha256 ee4085cecce12584e600f3d814a28fa822dfaacec1f94c84bfd67f8a5571a5f4 unbound-1.17.1.tar.gz # Locally calculated sha256 8eb9a16cbfb8703090bbfa3a2028fd46bb351509a2f90dc1001e51fbe6fd45db LICENSE diff --git a/package/unbound/unbound.mk b/package/unbound/unbound.mk index 61fdc5389b1..fa7884e9371 100644 --- a/package/unbound/unbound.mk +++ b/package/unbound/unbound.mk @@ -4,8 +4,9 @@ # ################################################################################ -UNBOUND_VERSION = 1.14.0 +UNBOUND_VERSION = 1.17.1 UNBOUND_SITE = https://www.unbound.net/downloads +UNBOUND_INSTALL_STAGING = YES UNBOUND_DEPENDENCIES = host-pkgconf expat libevent openssl UNBOUND_LICENSE = BSD-3-Clause UNBOUND_LICENSE_FILES = LICENSE @@ -17,6 +18,7 @@ UNBOUND_CONF_OPTS = \ --with-pidfile=/var/run/unbound.pid \ --with-rootkey-file=/etc/unbound/root.key \ --enable-tfo-server \ + --with-libevent=$(STAGING_DIR)/usr \ --with-libexpat=$(STAGING_DIR)/usr \ --with-ssl=$(STAGING_DIR)/usr @@ -34,7 +36,7 @@ else UNBOUND_CONF_OPTS += --without-pthreads endif -ifeq ($(BR2_GCC_ENABLE_LTO),y) +ifeq ($(BR2_ENABLE_LTO),y) UNBOUND_CONF_OPTS += --enable-flto else UNBOUND_CONF_OPTS += --disable-flto diff --git a/package/unclutter-xfixes/unclutter-xfixes.hash b/package/unclutter-xfixes/unclutter-xfixes.hash index 785825da7a1..b0bd5532efc 100644 --- a/package/unclutter-xfixes/unclutter-xfixes.hash +++ b/package/unclutter-xfixes/unclutter-xfixes.hash @@ -1,3 +1,3 @@ # locally calculated -sha256 35c75ad24be989dd6708db1d9ce9b2a2f814b80638c0633cdb075c6df090ed11 unclutter-xfixes-1.5.tar.gz -sha256 33e94693849b57fdb34987c95fd0076b4aa4b70fcd9a3152313d00b86a3f7bf7 LICENSE +sha256 6f7f248f16b7d4ec7cb144b6bc5a66bd49078130513a184f4dc16c498d457db9 unclutter-xfixes-1.6.tar.gz +sha256 33e94693849b57fdb34987c95fd0076b4aa4b70fcd9a3152313d00b86a3f7bf7 LICENSE diff --git a/package/unclutter-xfixes/unclutter-xfixes.mk b/package/unclutter-xfixes/unclutter-xfixes.mk index 713a84bca6a..6da607b660a 100644 --- a/package/unclutter-xfixes/unclutter-xfixes.mk +++ b/package/unclutter-xfixes/unclutter-xfixes.mk @@ -4,7 +4,7 @@ # ################################################################################ -UNCLUTTER_XFIXES_VERSION = 1.5 +UNCLUTTER_XFIXES_VERSION = 1.6 UNCLUTTER_XFIXES_SITE = $(call github,Airblader,unclutter-xfixes,v$(UNCLUTTER_XFIXES_VERSION)) UNCLUTTER_XFIXES_LICENSE = MIT UNCLUTTER_XFIXES_LICENSE_FILES = LICENSE diff --git a/package/unifdef/0001-Makefile-fix-error-on-install.patch b/package/unifdef/0001-Makefile-fix-error-on-install.patch new file mode 100644 index 00000000000..c959a41c5a1 --- /dev/null +++ b/package/unifdef/0001-Makefile-fix-error-on-install.patch @@ -0,0 +1,31 @@ +From b5e4229918c13bc0c11a523105cdb3a464337b37 Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Mon, 12 Dec 2022 12:59:59 +0100 +Subject: [PATCH] Makefile: fix error on install + +ln: failed to create symbolic link '/home/thomas/Documents/buildroot/output/host/share/man/man1/unifdefall.1': File exists + +Seen while trying to add this package to buildroot.org. + +(upstream: https://github.com/fanf2/unifdef/pull/16) +Signed-off-by: Thomas Devoogdt +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 36c7028..485927a 100644 +--- a/Makefile ++++ b/Makefile +@@ -28,7 +28,7 @@ install: unifdef unifdefall.sh unifdef.1 + : manual + install -m 755 -d ${man1dest} + install -m 644 unifdef.1 ${man1dest}/ +- ln -s unifdef.1 ${man1dest}/unifdefall.1 ++ ln -f -s unifdef.1 ${man1dest}/unifdefall.1 + + clean: + rm -f unifdef version.h +-- +2.38.1 + diff --git a/package/unifdef/unifdef.hash b/package/unifdef/unifdef.hash new file mode 100644 index 00000000000..c3a6b7465c7 --- /dev/null +++ b/package/unifdef/unifdef.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 fba564a24db7b97ebe9329713ac970627b902e5e9e8b14e19e024eb6e278d10b unifdef-2.12.tar.gz +sha256 37ed46a39446b15b08af418fda23b75c27a769d5aad236d817ee7522cc9caeee COPYING diff --git a/package/unifdef/unifdef.mk b/package/unifdef/unifdef.mk new file mode 100644 index 00000000000..7d10595d1b7 --- /dev/null +++ b/package/unifdef/unifdef.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# unifdef +# +################################################################################ + +UNIFDEF_VERSION = 2.12 +UNIFDEF_SITE = https://dotat.at/prog/unifdef +UNIFDEF_LICENSE = BSD-2-Clause +UNIFDEF_LICENSE_FILES = COPYING + +define HOST_UNIFDEF_BUILD_CMDS + $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) +endef + +define HOST_UNIFDEF_INSTALL_CMDS + $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) prefix=$(HOST_DIR) install +endef + +$(eval $(host-generic-package)) diff --git a/package/unixodbc/0001-DriverManager-drivermanager.h-fix-build-without-thre.patch b/package/unixodbc/0001-DriverManager-drivermanager.h-fix-build-without-thre.patch new file mode 100644 index 00000000000..9d54bbf5efd --- /dev/null +++ b/package/unixodbc/0001-DriverManager-drivermanager.h-fix-build-without-thre.patch @@ -0,0 +1,34 @@ +From 119cab666646cd9210439d4696a4bfa18343a2c6 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 12 Jul 2022 00:29:28 +0200 +Subject: [PATCH] DriverManager/drivermanager.h: fix build without threads + +Fix the following build failure without threads raised since version +2.3.10 and commit 6df155fb213896b9507b421c58856e4376647ae1: + +/home/buildroot/autobuild/run/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: ../DriverManager/.libs/libodbc.so: undefined reference to `pool_timedwait' +/home/buildroot/autobuild/run/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: ../DriverManager/.libs/libodbc.so: undefined reference to `pool_signal' + +Fixes: + - http://autobuild.buildroot.org/results/131eafaddfc956c7d54c81ed72a31baf28ab1ab6 + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/lurcher/unixODBC/commit/119cab666646cd9210439d4696a4bfa18343a2c6] +--- + DriverManager/drivermanager.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/DriverManager/drivermanager.h b/DriverManager/drivermanager.h +index 9528fae..abd324b 100644 +--- a/DriverManager/drivermanager.h ++++ b/DriverManager/drivermanager.h +@@ -808,6 +808,8 @@ void pool_signal(); + + #define thread_protect(a,b) + #define thread_release(a,b) ++#define pool_timedwait(a) ++#define pool_signal() + + #endif + diff --git a/package/unixodbc/unixodbc.hash b/package/unixodbc/unixodbc.hash index ba094f76270..9e5401c2b38 100644 --- a/package/unixodbc/unixodbc.hash +++ b/package/unixodbc/unixodbc.hash @@ -1,6 +1,4 @@ -# From ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-2.3.9.tar.gz.md5 -md5 06f76e034bb41df5233554abe961a16f unixODBC-2.3.9.tar.gz # Locally computed -sha256 52833eac3d681c8b0c9a5a65f2ebd745b3a964f208fc748f977e44015a31b207 unixODBC-2.3.9.tar.gz +sha256 d9e55c8e7118347e3c66c87338856dad1516b490fb7c756c1562a2c267c73b5c unixODBC-2.3.11.tar.gz sha256 a6b9aa1e9bfade121164c06fd975e9b913a8e38bf33d25ff967dfa3ed07d12f8 COPYING sha256 1e594f4c7fd6d099eca4bd1340b39d871ce0298331d8ebd4b68935548ee45cf4 exe/COPYING diff --git a/package/unixodbc/unixodbc.mk b/package/unixodbc/unixodbc.mk index b447cf5ff0d..650e3b3b366 100644 --- a/package/unixodbc/unixodbc.mk +++ b/package/unixodbc/unixodbc.mk @@ -4,9 +4,9 @@ # ################################################################################ -UNIXODBC_VERSION = 2.3.9 +UNIXODBC_VERSION = 2.3.11 UNIXODBC_SOURCE = unixODBC-$(UNIXODBC_VERSION).tar.gz -UNIXODBC_SITE = ftp://ftp.unixodbc.org/pub/unixODBC +UNIXODBC_SITE = http://www.unixodbc.org UNIXODBC_INSTALL_STAGING = YES UNIXODBC_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (programs) UNIXODBC_LICENSE_FILES = COPYING exe/COPYING diff --git a/package/unrar/unrar.hash b/package/unrar/unrar.hash index e354753bb2b..40e05a1a320 100644 --- a/package/unrar/unrar.hash +++ b/package/unrar/unrar.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 d05022442009202a792e588bec58921c123ff046fc755f7f2272871a5bd79636 unrarsrc-6.1.3.tar.gz +sha256 de75b6136958173fdfc530d38a0145b72342cf0d3842bf7bb120d336602d88ed unrarsrc-6.1.7.tar.gz sha256 6ecc1687808b7d66b24f874755abfed7464d9751ed0001cd4e8e5d9bf397ff8a license.txt diff --git a/package/unrar/unrar.mk b/package/unrar/unrar.mk index 69236601539..fee9fb753bb 100644 --- a/package/unrar/unrar.mk +++ b/package/unrar/unrar.mk @@ -4,7 +4,7 @@ # ################################################################################ -UNRAR_VERSION = 6.1.3 +UNRAR_VERSION = 6.1.7 UNRAR_SOURCE = unrarsrc-$(UNRAR_VERSION).tar.gz UNRAR_SITE = https://www.rarlab.com/rar UNRAR_LICENSE = unrar diff --git a/package/unzip/unzip.hash b/package/unzip/unzip.hash index 8b3f275533a..bbf4f7d71f0 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 sha256 036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37 unzip_6.0.orig.tar.gz -sha256 88cb7c0f1fd13252b662dfd224b64b352f9e75cd86389557fcb23fa6d2638599 unzip_6.0-26.debian.tar.xz +sha256 67bde7c71d52afd61aa936d4415c8d12fd90ca26e9637a3cd67cae9b71298c12 unzip_6.0-27.debian.tar.xz # Locally computed: sha256 7469b81d5d29ac4fd670f7c86ba0cb9fa34f137a2d4d5198437d92ddf918984b LICENSE diff --git a/package/unzip/unzip.mk b/package/unzip/unzip.mk index e8c9366a1b8..14ccedd48fd 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)-26.debian.tar.xz -UNZIP_SITE = https://snapshot.debian.org/archive/debian/20210110T204103Z/pool/main/u/unzip +UNZIP_PATCH = unzip_$(UNZIP_VERSION)-27.debian.tar.xz +UNZIP_SITE = https://snapshot.debian.org/archive/debian/20220916T090657Z/pool/main/u/unzip UNZIP_LICENSE = Info-ZIP UNZIP_LICENSE_FILES = LICENSE UNZIP_CPE_ID_VENDOR = unzip_project -# unzip_$(UNZIP_VERSION)-26.debian.tar.xz has patches to fix: +# unzip_$(UNZIP_VERSION)-27.debian.tar.xz has patches to fix: UNZIP_IGNORE_CVES = \ CVE-2014-8139 \ CVE-2014-8140 \ @@ -24,6 +24,22 @@ UNZIP_IGNORE_CVES = \ CVE-2016-9844 \ CVE-2018-18384 \ CVE-2018-1000035 \ - CVE-2019-13232 + CVE-2019-13232 \ + CVE-2022-0529 \ + CVE-2022-0530 + +# unzip already defines _LARGEFILE_SOURCE and _LARGEFILE64_SOURCE when +# necessary, redefining it on the command line causes some warnings. +UNZIP_TARGET_CFLAGS = \ + $(filter-out -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE,$(TARGET_CFLAGS)) + +# unzip already defines _LARGEFILE_SOURCE and _LARGEFILE64_SOURCE when +# necessary, redefining it on the command line causes some warnings. +UNZIP_TARGET_CXXFLAGS = \ + $(filter-out -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE,$(TARGET_CXXFLAGS)) + +UNZIP_CONF_OPTS += \ + -DCMAKE_C_FLAGS="$(UNZIP_TARGET_CFLAGS) -DLARGE_FILE_SUPPORT" \ + -DCMAKE_CXX_FLAGS="$(UNZIP_TARGET_CXXFLAGS) -DLARGE_FILE_SUPPORT" $(eval $(cmake-package)) diff --git a/package/upower/Config.in b/package/upower/Config.in index 612a2b74b9c..e2bcdd12c3f 100644 --- a/package/upower/Config.in +++ b/package/upower/Config.in @@ -1,12 +1,10 @@ config BR2_PACKAGE_UPOWER bool "upower" depends on BR2_PACKAGE_HAS_UDEV - depends on BR2_TOOLCHAIN_HAS_THREADS # libgudev, libusb - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb + depends on BR2_TOOLCHAIN_HAS_THREADS # libgudev depends on BR2_USE_MMU # libgudev depends on BR2_USE_WCHAR # libgudev select BR2_PACKAGE_LIBGUDEV - select BR2_PACKAGE_LIBUSB help UPower is an abstraction for enumerating power devices, listening to device events and querying history and @@ -23,7 +21,6 @@ comment "upower needs udev /dev management" depends on BR2_USE_MMU depends on !BR2_PACKAGE_HAS_UDEV -comment "upower needs a toolchain w/ threads, wchar, gcc >= 4.9" +comment "upower needs a toolchain w/ threads, wchar" depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/upower/upower.hash b/package/upower/upower.hash index e69ad20cbc1..cabce1f558e 100644 --- a/package/upower/upower.hash +++ b/package/upower/upower.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 64b5ffbfccd5bdb15d925777979a4dbee1a957f9eaeb158dc76175267eddbdef upower-0.99.11.tar.xz -sha256 c1753877db41d798d63369a825ad9225bbeb5e10a407be5fcd8de96182f1c50d COPYING +sha256 e5bda2f5837ee311f5b7b6ec9549b029c88f4958011c6a8f5550b54408ee06ae upower-v0.99.19.tar.bz2 +sha256 c1753877db41d798d63369a825ad9225bbeb5e10a407be5fcd8de96182f1c50d COPYING diff --git a/package/upower/upower.mk b/package/upower/upower.mk index 8989ca9f5d8..49aac8c7a2b 100644 --- a/package/upower/upower.mk +++ b/package/upower/upower.mk @@ -4,9 +4,9 @@ # ################################################################################ -UPOWER_VERSION = 0.99.11 -UPOWER_SOURCE = upower-$(UPOWER_VERSION).tar.xz -UPOWER_SITE = https://upower.freedesktop.org/releases +UPOWER_VERSION = 0.99.19 +UPOWER_SOURCE = upower-v$(UPOWER_VERSION).tar.bz2 +UPOWER_SITE = https://gitlab.freedesktop.org/upower/upower/-/archive/v$(UPOWER_VERSION) UPOWER_LICENSE = GPL-2.0+ UPOWER_LICENSE_FILES = COPYING @@ -17,9 +17,20 @@ UPOWER_DEPENDENCIES = \ $(TARGET_NLS_DEPENDENCIES) \ host-pkgconf \ libgudev \ - libusb \ udev -UPOWER_CONF_OPTS = --disable-man-pages --disable-tests +UPOWER_CONF_OPTS = \ + -Dgtk-doc=false \ + -Dman=false \ + -Dsystemdsystemunitdir=/usr/lib/systemd/system \ + -Dudevhwdbdir=/lib/udev/hwdb.d \ + -Dudevrulesdir=/lib/udev/rules.d -$(eval $(autotools-package)) +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +UPOWER_CONF_OPTS += -Dintrospection=enabled +UPOWER_DEPENDENCIES += gobject-introspection +else +UPOWER_CONF_OPTS += -Dintrospection=disabled +endif + +$(eval $(meson-package)) diff --git a/package/upx/0001-Check-DT_REL-DT_RELA-DT_RELSZ-DT_RELASZ.patch b/package/upx/0001-Check-DT_REL-DT_RELA-DT_RELSZ-DT_RELASZ.patch deleted file mode 100644 index 6fae9cac0ee..00000000000 --- a/package/upx/0001-Check-DT_REL-DT_RELA-DT_RELSZ-DT_RELASZ.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 3781df9da23840e596d5e9e8493f22666802fe6c Mon Sep 17 00:00:00 2001 -From: John Reiser -Date: Fri, 11 Dec 2020 13:38:18 -0800 -Subject: [PATCH] Check DT_REL/DT_RELA, DT_RELSZ/DT_RELASZ - -https://github.com/upx/upx/issues/421 - modified: p_lx_elf.cpp - -[Retrieved from: -https://github.com/upx/upx/commit/3781df9da23840e596d5e9e8493f22666802fe6c] -Signed-off-by: Fabrice Fontaine ---- - src/p_lx_elf.cpp | 34 +++++++++++++++++++++++++++++----- - 1 file changed, 29 insertions(+), 5 deletions(-) - -diff --git a/src/p_lx_elf.cpp b/src/p_lx_elf.cpp -index 182db192f..3a4101cf7 100644 ---- a/src/p_lx_elf.cpp -+++ b/src/p_lx_elf.cpp -@@ -2222,8 +2222,20 @@ bool PackLinuxElf32::canPack() - int z_rsz = dt_table[Elf32_Dyn::DT_RELSZ]; - if (z_rel && z_rsz) { - unsigned rel_off = get_te32(&dynseg[-1+ z_rel].d_val); -+ if ((unsigned)file_size <= rel_off) { -+ char msg[70]; snprintf(msg, sizeof(msg), -+ "bad Elf32_Dynamic[DT_REL] %#x\n", -+ rel_off); -+ throwCantPack(msg); -+ } - Elf32_Rel *rp = (Elf32_Rel *)&file_image[rel_off]; - unsigned relsz = get_te32(&dynseg[-1+ z_rsz].d_val); -+ if ((unsigned)file_size <= relsz) { -+ char msg[70]; snprintf(msg, sizeof(msg), -+ "bad Elf32_Dynamic[DT_RELSZ] %#x\n", -+ relsz); -+ throwCantPack(msg); -+ } - Elf32_Rel *last = (Elf32_Rel *)(relsz + (char *)rp); - for (; rp < last; ++rp) { - unsigned r_va = get_te32(&rp->r_offset); -@@ -2562,14 +2574,26 @@ PackLinuxElf64::canPack() - int z_rel = dt_table[Elf64_Dyn::DT_RELA]; - int z_rsz = dt_table[Elf64_Dyn::DT_RELASZ]; - if (z_rel && z_rsz) { -- unsigned rel_off = get_te64(&dynseg[-1+ z_rel].d_val); -+ upx_uint64_t rel_off = get_te64(&dynseg[-1+ z_rel].d_val); -+ if ((u64_t)file_size <= rel_off) { -+ char msg[70]; snprintf(msg, sizeof(msg), -+ "bad Elf64_Dynamic[DT_RELA] %#llx\n", -+ rel_off); -+ throwCantPack(msg); -+ } - Elf64_Rela *rp = (Elf64_Rela *)&file_image[rel_off]; -- unsigned relsz = get_te64(&dynseg[-1+ z_rsz].d_val); -+ upx_uint64_t relsz = get_te64(&dynseg[-1+ z_rsz].d_val); -+ if ((u64_t)file_size <= relsz) { -+ char msg[70]; snprintf(msg, sizeof(msg), -+ "bad Elf64_Dynamic[DT_RELASZ] %#llx\n", -+ relsz); -+ throwCantPack(msg); -+ } - Elf64_Rela *last = (Elf64_Rela *)(relsz + (char *)rp); - for (; rp < last; ++rp) { -- unsigned r_va = get_te64(&rp->r_offset); -+ upx_uint64_t r_va = get_te64(&rp->r_offset); - if (r_va == user_init_ava) { // found the Elf64_Rela -- unsigned r_info = get_te64(&rp->r_info); -+ upx_uint64_t r_info = get_te64(&rp->r_info); - unsigned r_type = ELF64_R_TYPE(r_info); - if (Elf64_Ehdr::EM_AARCH64 == e_machine - && R_AARCH64_RELATIVE == r_type) { -@@ -2581,7 +2605,7 @@ PackLinuxElf64::canPack() - } - else { - char msg[50]; snprintf(msg, sizeof(msg), -- "bad relocation %#x DT_INIT_ARRAY[0]", -+ "bad relocation %#llx DT_INIT_ARRAY[0]", - r_info); - throwCantPack(msg); - } diff --git a/package/upx/upx.hash b/package/upx/upx.hash index 7f3698ca0dc..7c249061524 100644 --- a/package/upx/upx.hash +++ b/package/upx/upx.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 47774df5c958f2868ef550fb258b97c73272cb1f44fe776b798e393465993714 upx-3.96-src.tar.xz +sha256 1221e725b1a89e06739df27fae394d6bc88aedbe12f137c630ec772522cbc76f upx-4.0.2-src.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/upx/upx.mk b/package/upx/upx.mk index e693a70db1d..6018b0a63d3 100644 --- a/package/upx/upx.mk +++ b/package/upx/upx.mk @@ -4,28 +4,12 @@ # ################################################################################ -UPX_VERSION = 3.96 +UPX_VERSION = 4.0.2 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_VENDOR = upx_project +UPX_SUPPORTS_IN_SOURCE_BUILD = NO -# 0001-Check-DT_REL-DT_RELA-DT_RELSZ-DT_RELASZ.patch -UPX_IGNORE_CVES += CVE-2021-20285 - -HOST_UPX_DEPENDENCIES = host-ucl host-zlib - -# We need to specify all, otherwise the default target only prints a message -# stating to "please choose a target for 'make'"... :-( -define HOST_UPX_BUILD_CMDS - $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \ - UPX_UCLDIR=$(HOST_DIR) CXXFLAGS_WERROR= -C $(@D) all -endef - -# UPX has no install procedure, so install it manually. -define HOST_UPX_INSTALL_CMDS - $(INSTALL) -D -m 0755 $(@D)/src/upx.out $(HOST_DIR)/bin/upx -endef - -$(eval $(host-generic-package)) +$(eval $(host-cmake-package)) diff --git a/package/uqmi/0001-uqmi-avoid-gcc-12.x-false-error-reporting-storing-th.patch b/package/uqmi/0001-uqmi-avoid-gcc-12.x-false-error-reporting-storing-th.patch new file mode 100644 index 00000000000..e2199228b9a --- /dev/null +++ b/package/uqmi/0001-uqmi-avoid-gcc-12.x-false-error-reporting-storing-th.patch @@ -0,0 +1,57 @@ +From 63ab887be90c7fe37d537ea75e60eb95d6d87d3f Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Sun, 5 Mar 2023 22:08:13 +0100 +Subject: [PATCH] uqmi: avoid gcc-12.x false error reporting (storing the + address of local variable 'complete' in '*req.complete') + +Avoid gcc-12.x false error reporting (req->complete is later reset to NULL +in case of use of local complete): + + dev.c:217:23: error: storing the address of local variable 'complete' in '*req.complete' [-Werror=dangling-pointer=] + 217 | req->complete = &complete; + | ~~~~~~~~~~~~~~^~~~~~~~~~~ + +Signed-off-by: Peter Seiderer +[Upstream: http://lists.openwrt.org/pipermail/openwrt-devel/2023-March/040667.html] +Signed-off-by: Peter Seiderer +--- +Changes v1 -> v2: + - apply pragma ignored only for gcc >= 12.x (as the warning + '-Wdangling-pointer' was introduced with gcc-12.x) +--- + dev.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/dev.c b/dev.c +index bd10207..dbd42d4 100644 +--- a/dev.c ++++ b/dev.c +@@ -203,6 +203,15 @@ void qmi_request_cancel(struct qmi_dev *qmi, struct qmi_request *req) + __qmi_request_complete(qmi, req, NULL); + } + ++/* avoid gcc-12.x false error reporting: ++ * dev.c:217:23: error: storing the address of local variable ‘complete’ in ‘*req.complete’ [-Werror=dangling-pointer=] ++ * 217 | req->complete = &complete; ++ * | ~~~~~~~~~~~~~~^~~~~~~~~~~ ++ */ ++#if __GNUC__ >= 12 ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wdangling-pointer" ++#endif + int qmi_request_wait(struct qmi_dev *qmi, struct qmi_request *req) + { + bool complete = false; +@@ -231,6 +240,9 @@ int qmi_request_wait(struct qmi_dev *qmi, struct qmi_request *req) + + return req->ret; + } ++#if __GNUC__ >= 12 ++#pragma GCC diagnostic pop ++#endif + + struct qmi_connect_request { + struct qmi_request req; +-- +2.39.2 + diff --git a/package/urandom-scripts/Config.in b/package/urandom-scripts/Config.in index 987e442e222..6b4a609f953 100644 --- a/package/urandom-scripts/Config.in +++ b/package/urandom-scripts/Config.in @@ -1,10 +1,7 @@ config BR2_PACKAGE_URANDOM_SCRIPTS bool "urandom-initscripts" default y if BR2_PACKAGE_INITSCRIPTS + depends on BR2_PACKAGE_BUSYBOX depends on !BR2_PACKAGE_SYSTEMD help Initscript to preserve the random seed between reboots. - - WARNING: this is a poor fit to try and get high-quality - entropy at boot. There are better ways, like haveged, or - rng-tools. diff --git a/package/urandom-scripts/S20seedrng b/package/urandom-scripts/S20seedrng new file mode 100644 index 00000000000..0fea0bea833 --- /dev/null +++ b/package/urandom-scripts/S20seedrng @@ -0,0 +1,40 @@ +#! /bin/sh +# +# Preserve the random seed between reboots. See urandom(4). +# +# This script can be called multiple times during operation (e.g. with +# "reload" argument) to refresh the seed. + +# The following arguments can be added to SEEDRNG_ARGS in +# /etc/default/seedrng: +# --seed-dir=/path/to/seed/directory +# Path to the directory where the seed and the lock files are stored. +# for optimal operation, this should be a persistent, writeable +# location. Default is /var/lib/seedrng +# +# --skip-credit +# Set this to true only if you do not want seed files to actually +# credit the RNG, for example if you plan to replicate this file +# system image and do not have the wherewithal to first delete the +# contents of /var/lib/seedrng. +# +# Example: +# SEEDRNG_ARGS="--seed-dir=/data/seedrng --skip-credit" +# + +DAEMON="seedrng" +SEEDRNG_ARGS="" + +# shellcheck source=/dev/null +[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" + +case "$1" in + start|stop|restart|reload) + # Never fail, as this isn't worth making a fuss + # over if it doesn't go as planned. + # shellcheck disable=SC2086 # we need the word splitting + seedrng $SEEDRNG_ARGS || true;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 +esac diff --git a/package/urandom-scripts/S20urandom b/package/urandom-scripts/S20urandom deleted file mode 100644 index e4fd1257215..00000000000 --- a/package/urandom-scripts/S20urandom +++ /dev/null @@ -1,74 +0,0 @@ -#! /bin/sh -# -# Preserve the random seed between reboots. See urandom(4). -# - -# Quietly do nothing if /dev/urandom does not exist -[ -c /dev/urandom ] || exit 0 - -URANDOM_SEED="/var/lib/random-seed" - -# shellcheck source=/dev/null -[ -r "/etc/default/urandom" ] && . "/etc/default/urandom" - -if pool_bits=$(cat /proc/sys/kernel/random/poolsize 2> /dev/null); then - pool_size=$((pool_bits/8)) -else - pool_size=512 -fi - -check_file_size() { - [ -f "$URANDOM_SEED" ] || return 1 - # Try to read two blocks but exactly one will be read if the file has - # the correct size. - size=$(dd if="$URANDOM_SEED" bs="$pool_size" count=2 2> /dev/null | wc -c) - test "$size" -eq "$pool_size" -} - -init_rng() { - if check_file_size; then - printf 'Initializing random number generator: ' - dd if="$URANDOM_SEED" bs="$pool_size" of=/dev/urandom count=1 2> /dev/null - status=$? - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - return "$status" - fi -} - -save_random_seed() { - printf 'Saving random seed: ' - if touch "$URANDOM_SEED" 2> /dev/null; then - old_umask=$(umask) - umask 077 - dd if=/dev/urandom of="$URANDOM_SEED" bs="$pool_size" count=1 2> /dev/null - status=$? - umask "$old_umask" - if [ "$status" -eq 0 ]; then - echo "OK" - else - echo "FAIL" - fi - else - status=$? - echo "SKIP (read-only file system detected)" - fi - return "$status" -} - -case "$1" in - start|restart|reload) - # Carry a random seed from start-up to start-up - # Load and then save the whole entropy pool - init_rng && save_random_seed;; - stop) - # Carry a random seed from shut-down to start-up - # Save the whole entropy pool - save_random_seed;; - *) - echo "Usage: $0 {start|stop|restart|reload}" - exit 1 -esac diff --git a/package/urandom-scripts/urandom-scripts.mk b/package/urandom-scripts/urandom-scripts.mk index 2c09728c465..32f3e09343d 100644 --- a/package/urandom-scripts/urandom-scripts.mk +++ b/package/urandom-scripts/urandom-scripts.mk @@ -5,8 +5,8 @@ ################################################################################ define URANDOM_SCRIPTS_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 $(URANDOM_SCRIPTS_PKGDIR)/S20urandom \ - $(TARGET_DIR)/etc/init.d/S20urandom + $(INSTALL) -D -m 0755 $(URANDOM_SCRIPTS_PKGDIR)/S20seedrng \ + $(TARGET_DIR)/etc/init.d/S20seedrng endef $(eval $(generic-package)) diff --git a/package/urg/urg.hash b/package/urg/urg.hash index f2c5f14304e..363504d2efb 100644 --- a/package/urg/urg.hash +++ b/package/urg/urg.hash @@ -1,6 +1,6 @@ # from http://pkgs.fedoraproject.org/repo/pkgs/urg/urg-0.8.18.zip/ -md5 93f90d2ccc36e784407c5282ef6bd2cb urg-0.8.18.zip +md5 93f90d2ccc36e784407c5282ef6bd2cb urg-0.8.18.zip # Locally calculated -sha256 b2cab7e539c90c60fc99a2350a42b5d5390ff952b694b196c3cbb54623cfee7f urg-0.8.18.zip +sha256 b2cab7e539c90c60fc99a2350a42b5d5390ff952b694b196c3cbb54623cfee7f urg-0.8.18.zip # License files, locally calculated -sha256 9ccf26cfe845e0eb8bb58053e47366e7ab6b697ae010f7650978d4b71b7d1fc1 COPYING +sha256 9ccf26cfe845e0eb8bb58053e47366e7ab6b697ae010f7650978d4b71b7d1fc1 COPYING diff --git a/package/usb_modeswitch/0001-fix-systemd-detection.patch b/package/usb_modeswitch/0001-fix-systemd-detection.patch new file mode 100644 index 00000000000..d0b3e80aeb3 --- /dev/null +++ b/package/usb_modeswitch/0001-fix-systemd-detection.patch @@ -0,0 +1,18 @@ +Modify the Makefile to include '$(PREFIX)/bin/systemctl' in the list of paths. +This makes the udev intgeration work as intended when using systemd. + +Signed-off-by: Sol Bekic + +diff --git a/Makefile b/Makefile +index 22bd0e0..72321a4 100755 +--- a/Makefile ++++ b/Makefile +@@ -62,7 +62,7 @@ + install -D --mode=755 usb_modeswitch_dispatcher $(SBINDIR)/usb_modeswitch_dispatcher + install -d $(DESTDIR)/var/lib/usb_modeswitch + test -d $(UPSDIR) -a -e /sbin/initctl && install --mode=644 usb-modeswitch-upstart.conf $(UPSDIR) || test 1 +- test -d $(SYSDIR) -a \( -e /usr/bin/systemctl -o -e /bin/systemctl \) && install --mode=644 usb_modeswitch@.service $(SYSDIR) || test 1 ++ test -d $(SYSDIR) -a \( -e /usr/bin/systemctl -o -e /bin/systemctl -o -e $(PREFIX)/bin/systemctl \) && install --mode=644 usb_modeswitch@.service $(SYSDIR) || test 1 + + install: install-script + diff --git a/package/usb_modeswitch_data/usb_modeswitch_data.hash b/package/usb_modeswitch_data/usb_modeswitch_data.hash index 922913b27d5..9071a72490b 100644 --- a/package/usb_modeswitch_data/usb_modeswitch_data.hash +++ b/package/usb_modeswitch_data/usb_modeswitch_data.hash @@ -1,5 +1,5 @@ # From http://www.draisberghof.de/usb_modeswitch/ -md5 e8fce7eb949cbe16c61fb71bade4cc17 usb-modeswitch-data-20191128.tar.bz2 +md5 e8fce7eb949cbe16c61fb71bade4cc17 usb-modeswitch-data-20191128.tar.bz2 # Locally calculated -sha256 3f039b60791c21c7cb15c7986cac89650f076dc274798fa242231b910785eaf9 usb-modeswitch-data-20191128.tar.bz2 -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING +sha256 3f039b60791c21c7cb15c7986cac89650f076dc274798fa242231b910785eaf9 usb-modeswitch-data-20191128.tar.bz2 +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/usbguard/Config.in b/package/usbguard/Config.in index ca6d52034b6..f207fa68263 100644 --- a/package/usbguard/Config.in +++ b/package/usbguard/Config.in @@ -3,9 +3,8 @@ 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_4_8 # protobuf + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # C++17 filesystem depends on !BR2_STATIC_LIBS # libqb, protobuf - depends on !BR2_TOOLCHAIN_USES_MUSL depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::future select BR2_PACKAGE_PROTOBUF select BR2_PACKAGE_LIBQB @@ -19,10 +18,9 @@ config BR2_PACKAGE_USBGUARD https://usbguard.github.io/ -comment "usbguard needs a glibc or uClibc toolchain w/ C++, threads, dynamic library, gcc >= 4.8" +comment "usbguard 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_TOOLCHAIN_USES_MUSL + || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_8 depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS comment "usbguard needs a toolchain not affected by GCC bug 64735" diff --git a/package/usbguard/usbguard.hash b/package/usbguard/usbguard.hash index fd77acc75a8..6c10dc9d3e7 100644 --- a/package/usbguard/usbguard.hash +++ b/package/usbguard/usbguard.hash @@ -1,3 +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 + # Locally calculated -sha256 5617986cd5dd1a2d311041648a1977d836cf4e33a4121d7f82599f21496abc42 usbguard-1.0.0.tar.gz -sha256 a45d0bb572ed792ed34627a72621834b3ba92aab6e2cc4e04301dee7a728d753 LICENSE +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/usbguard/usbguard.mk b/package/usbguard/usbguard.mk index c16a7529a96..60b69df3be1 100644 --- a/package/usbguard/usbguard.mk +++ b/package/usbguard/usbguard.mk @@ -4,11 +4,13 @@ # ################################################################################ -USBGUARD_VERSION = 1.0.0 +USBGUARD_VERSION = 1.1.2 USBGUARD_SITE = https://github.com/USBGuard/usbguard/releases/download/usbguard-$(USBGUARD_VERSION) USBGUARD_LICENSE = GPL-2.0+ USBGUARD_LICENSE_FILES = LICENSE +USBGUARD_CPE_ID_VENDOR = usbguard_project USBGUARD_SELINUX_MODULES = usbguard +USBGUARD_CONF_ENV = ac_cv_prog_A2X="" USBGUARD_CONF_OPTS = \ --with-bundled-catch \ --with-bundled-pegtl \ diff --git a/package/usbredir/Config.in b/package/usbredir/Config.in index 8ce180a8847..6de6227e5c2 100644 --- a/package/usbredir/Config.in +++ b/package/usbredir/Config.in @@ -15,18 +15,26 @@ config BR2_PACKAGE_USBREDIR protocol. Note: only the library is installed, not the utilities. Say - 'y' below if you want the server too. + 'y' below if you want the tools too. http://www.spice-space.org/page/UsbRedir if BR2_PACKAGE_USBREDIR -config BR2_PACKAGE_USBREDIR_SERVER - bool "usbredirserver on target" +config BR2_PACKAGE_USBREDIR_TOOLS + bool "enable tools" + depends on BR2_USE_MMU # libglib2 + depends on BR2_USE_WCHAR # libglib2 + select BR2_PACKAGE_LIBGLIB2 help If you want to serve usbredir requests on your target, say - 'y' here to have the usbredir server on the target. + 'y' here to have the tools built and installed on the target + (including usbredirect binary). - Note: the server is not required to use the library. + Note: the tools are not required to use the library. + +comment "tools needs a toolchain w/ wchar" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR endif diff --git a/package/usbredir/usbredir.hash b/package/usbredir/usbredir.hash index f738c366909..577e08efbad 100644 --- a/package/usbredir/usbredir.hash +++ b/package/usbredir/usbredir.hash @@ -1,5 +1,5 @@ -# https://spice-space.org/download/usbredir/usbredir-0.12.0.tar.xz.sha256sum -sha256 fbb44025bf55e1ce8d84afc7596bfa47c8a36cd603c6fa440f9102c1c9761e6d usbredir-0.12.0.tar.xz +# https://spice-space.org/download/usbredir/usbredir-0.13.0.tar.xz.sha256sum +sha256 4ba6faa02c0ae6deeb4c53883d66ab54b3a5899bead42ce4ded9568b9a7dc46e usbredir-0.13.0.tar.xz # Hash for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/usbredir/usbredir.mk b/package/usbredir/usbredir.mk index 6792a3e7583..325e7313aa4 100644 --- a/package/usbredir/usbredir.mk +++ b/package/usbredir/usbredir.mk @@ -4,7 +4,7 @@ # ################################################################################ -USBREDIR_VERSION = 0.12.0 +USBREDIR_VERSION = 0.13.0 USBREDIR_SOURCE = usbredir-$(USBREDIR_VERSION).tar.xz USBREDIR_SITE = http://spice-space.org/download/usbredir USBREDIR_LICENSE = LGPL-2.1+ (libraries) @@ -14,21 +14,15 @@ USBREDIR_DEPENDENCIES = host-pkgconf libusb USBREDIR_CONF_OPTS = \ -Dgit_werror=disabled \ -Dstack_protector=disabled \ - -Dtests=disabled \ - -Dtools=disabled - -ifeq ($(BR2_PACKAGE_USBREDIR_SERVER),y) + -Dtests=disabled +ifeq ($(BR2_PACKAGE_USBREDIR_TOOLS),y) USBREDIR_LICENSE += , GPL-2.0+ (program) USBREDIR_LICENSE_FILES += COPYING - -else # BR2_PACKAGE_USBREDIR_SERVER != y - -define USBREDIR_POST_INSTALL_TARGET_RM_SERVER - rm -f $(TARGET_DIR)/usr/sbin/usbredirserver -endef -USBREDIR_POST_INSTALL_TARGET_HOOKS += USBREDIR_POST_INSTALL_TARGET_RM_SERVER - -endif # BR2_PACKAGE_USBREDIR_SERVER +USBREDIR_DEPENDENCIES += libglib2 +USBREDIR_CONF_OPTS += -Dtools=enabled +else +USBREDIR_CONF_OPTS += -Dtools=disabled +endif $(eval $(meson-package)) diff --git a/package/usbutils/usbutils.hash b/package/usbutils/usbutils.hash index f5d55bb4a0a..caedf5fd807 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 3a079cfad60560227b67192482d7813bf96326fcbb66c04254839715f276fc69 usbutils-014.tar.xz +sha256 c3b451bb1f4ff9f6356cac5a6956a9ac8e85d81651af56a29e689f94fa6fda6e usbutils-015.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 50b1a5a0ccb..84a6a625cfa 100644 --- a/package/usbutils/usbutils.mk +++ b/package/usbutils/usbutils.mk @@ -4,7 +4,7 @@ # ################################################################################ -USBUTILS_VERSION = 014 +USBUTILS_VERSION = 015 USBUTILS_SOURCE = usbutils-$(USBUTILS_VERSION).tar.xz USBUTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/usb/usbutils USBUTILS_DEPENDENCIES = host-pkgconf libusb udev diff --git a/package/ussp-push/ussp-push.hash b/package/ussp-push/ussp-push.hash index 36c79cfa5db..58874ab181a 100644 --- a/package/ussp-push/ussp-push.hash +++ b/package/ussp-push/ussp-push.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 bb2748eaed6164812555b4a1e186c4f2820c5ef9ce30f12d7aac28a452719bbd ussp-push-0.11.tar.gz +sha256 bb2748eaed6164812555b4a1e186c4f2820c5ef9ce30f12d7aac28a452719bbd ussp-push-0.11.tar.gz # License files, locally calculated -sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING +sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING diff --git a/package/utf8proc/utf8proc.hash b/package/utf8proc/utf8proc.hash index acc73903c83..658ffa1f7c2 100644 --- a/package/utf8proc/utf8proc.hash +++ b/package/utf8proc/utf8proc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4bb121e297293c0fd55f08f83afab6d35d48f0af4ecc07523ad8ec99aa2b12a1 utf8proc-2.7.0.tar.gz +sha256 a0a60a79fe6f6d54e7d411facbfcc867a6e198608f2cd992490e46f04b1bcecc utf8proc-2.8.0.tar.gz sha256 3b510150d34f248a221bb88e1d811238d6c6c18b51231822c42974c39bb07256 LICENSE.md diff --git a/package/utf8proc/utf8proc.mk b/package/utf8proc/utf8proc.mk index 707e5535611..b08c6e71098 100644 --- a/package/utf8proc/utf8proc.mk +++ b/package/utf8proc/utf8proc.mk @@ -4,7 +4,7 @@ # ################################################################################ -UTF8PROC_VERSION = 2.7.0 +UTF8PROC_VERSION = 2.8.0 UTF8PROC_SITE = $(call github,JuliaStrings,utf8proc,v$(UTF8PROC_VERSION)) UTF8PROC_LICENSE = MIT UTF8PROC_LICENSE_FILES = LICENSE.md diff --git a/package/util-linux/0001-libuuid-include-c-h-to-cover-restrict-keyword.patch b/package/util-linux/0001-libuuid-include-c-h-to-cover-restrict-keyword.patch deleted file mode 100644 index 3b4f5109202..00000000000 --- a/package/util-linux/0001-libuuid-include-c-h-to-cover-restrict-keyword.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 5f9b88f43ba7f98f81bde3538d5f4e5cd1a6c01c Mon Sep 17 00:00:00 2001 -From: Karel Zak -Date: Thu, 5 Aug 2021 09:46:21 +0200 -Subject: libuuid: include c.h to cover restrict keyword - -References: https://github.com/karelzak/util-linux/issues/1405 -Signed-off-by: Karel Zak - -[Retrieved from: -https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/commit/?id=5f9b88f43ba7f98f81bde3538d5f4e5cd1a6c01c] -Signed-off-by: Fabrice Fontaine ---- - libuuid/src/unparse.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libuuid/src/unparse.c b/libuuid/src/unparse.c -index f9a5e4315..ffeed2ed6 100644 ---- a/libuuid/src/unparse.c -+++ b/libuuid/src/unparse.c -@@ -33,6 +33,7 @@ - */ - - #include -+#include "c.h" - - #include "uuidP.h" - --- -cgit 1.2.3-1.el7 - diff --git a/package/util-linux/0001-lsns-improve-dependence-on-NS_GET_-ioctls.patch b/package/util-linux/0001-lsns-improve-dependence-on-NS_GET_-ioctls.patch new file mode 100644 index 00000000000..8e79b8d4d39 --- /dev/null +++ b/package/util-linux/0001-lsns-improve-dependence-on-NS_GET_-ioctls.patch @@ -0,0 +1,34 @@ +From fc686823b008bc95e2ebe904c706a117a03e2754 Mon Sep 17 00:00:00 2001 +From: Karel Zak +Date: Wed, 6 Apr 2022 10:38:43 +0200 +Subject: lsns: improve dependence on NS_GET_ ioctls + +Fixes: http://autobuild.buildroot.org/results/572ecf8e37ac733a4e4265f4f78f35230337278e +Reported-by: Fabrice Fontaine +Signed-off-by: Karel Zak + +[Retrieved from: +https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/commit/?id=fc686823b008bc95e2ebe904c706a117a03e2754] +Signed-off-by: Fabrice Fontaine +--- + sys-utils/lsns.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/sys-utils/lsns.c b/sys-utils/lsns.c +index 1a7e9f333..75625b3a6 100644 +--- a/sys-utils/lsns.c ++++ b/sys-utils/lsns.c +@@ -40,7 +40,9 @@ + + #ifdef HAVE_LINUX_NSFS_H + # include +-# define USE_NS_GET_API 1 ++# if defined(NS_GET_NSTYPE) && defined(NS_GET_OWNER_UID) ++# define USE_NS_GET_API 1 ++# endif + #endif + + #include "pathnames.h" +-- +cgit + diff --git a/package/util-linux/0002-libblkid-don-t-mark-cache-as-probed-if-sys-not-available.patch b/package/util-linux/0002-libblkid-don-t-mark-cache-as-probed-if-sys-not-available.patch deleted file mode 100644 index bfc8f60834b..00000000000 --- a/package/util-linux/0002-libblkid-don-t-mark-cache-as-probed-if-sys-not-available.patch +++ /dev/null @@ -1,141 +0,0 @@ -From 84d38ae3eca523ef990cb848563cc63de25266e6 Mon Sep 17 00:00:00 2001 -From: Karel Zak -Date: Fri, 19 Nov 2021 14:19:03 +0100 -Subject: [PATCH] libblkid: don't mark cache as "probed" if /sys not available - -For "mount --all" we need to read the cache more than once in a short -time. The library checks the delay between probes, and if the delay is -too short, it does not read devices. This is a problem on boot when there -are no /sys, and the cache is empty. In this case, we need to check -for /sys until it's available constantly. - -https://github.com/util-linux/util-linux/issues/1492 -Signed-off-by: Karel Zak - -[Retrieved from: -https://github.com/util-linux/util-linux/commit/84d38ae3eca523ef990cb848563cc63de25266e6] -Signed-off-by: Fabrice Fontaine ---- - libblkid/src/devname.c | 26 +++++++++++++++++--------- - libblkid/src/resolve.c | 2 +- - libblkid/src/tag.c | 8 +++++--- - 3 files changed, 23 insertions(+), 13 deletions(-) - -diff --git a/libblkid/src/devname.c b/libblkid/src/devname.c -index 90a8245fc9..9a173e3489 100644 ---- a/libblkid/src/devname.c -+++ b/libblkid/src/devname.c -@@ -429,6 +429,8 @@ sysfs_probe_all(blkid_cache cache, int only_if_new, int only_removable) - if (!sysfs) - return -BLKID_ERR_SYSFS; - -+ DBG(DEVNAME, ul_debug(" probe /sys/block")); -+ - /* scan /sys/block */ - while ((dev = xreaddir(sysfs))) { - DIR *dir = NULL; -@@ -533,14 +535,18 @@ sysfs_probe_all(blkid_cache cache, int only_if_new, int only_removable) - /* - * Read the device data for all available block devices in the system. - */ --static int probe_all(blkid_cache cache, int only_if_new) -+static int probe_all(blkid_cache cache, int only_if_new, int update_interval) - { -+ int rc; -+ - if (!cache) - return -BLKID_ERR_PARAM; - - if (cache->bic_flags & BLKID_BIC_FL_PROBED && -- time(NULL) - cache->bic_time < BLKID_PROBE_INTERVAL) -+ time(NULL) - cache->bic_time < BLKID_PROBE_INTERVAL) { -+ DBG(PROBE, ul_debug("don't re-probe [delay < %d]", BLKID_PROBE_INTERVAL)); - return 0; -+ } - - blkid_read_cache(cache); - #ifdef VG_DIR -@@ -548,7 +554,13 @@ static int probe_all(blkid_cache cache, int only_if_new) - #endif - ubi_probe_all(cache, only_if_new); - -- sysfs_probe_all(cache, only_if_new, 0); -+ rc = sysfs_probe_all(cache, only_if_new, 0); -+ -+ /* Don't mark the change as "probed" if /sys not avalable */ -+ if (update_interval && rc == 0) { -+ cache->bic_time = time(NULL); -+ cache->bic_flags |= BLKID_BIC_FL_PROBED; -+ } - - blkid_flush_cache(cache); - return 0; -@@ -567,11 +579,7 @@ int blkid_probe_all(blkid_cache cache) - int ret; - - DBG(PROBE, ul_debug("Begin blkid_probe_all()")); -- ret = probe_all(cache, 0); -- if (ret == 0) { -- cache->bic_time = time(NULL); -- cache->bic_flags |= BLKID_BIC_FL_PROBED; -- } -+ ret = probe_all(cache, 0, 1); - DBG(PROBE, ul_debug("End blkid_probe_all() [rc=%d]", ret)); - return ret; - } -@@ -589,7 +597,7 @@ int blkid_probe_all_new(blkid_cache cache) - int ret; - - DBG(PROBE, ul_debug("Begin blkid_probe_all_new()")); -- ret = probe_all(cache, 1); -+ ret = probe_all(cache, 1, 0); - DBG(PROBE, ul_debug("End blkid_probe_all_new() [rc=%d]", ret)); - return ret; - } -diff --git a/libblkid/src/resolve.c b/libblkid/src/resolve.c -index 641b022860..16653fa8e1 100644 ---- a/libblkid/src/resolve.c -+++ b/libblkid/src/resolve.c -@@ -32,7 +32,7 @@ char *blkid_get_tag_value(blkid_cache cache, const char *tagname, - blkid_cache c = cache; - char *ret = NULL; - -- DBG(TAG, ul_debug("looking for %s on %s", tagname, devname)); -+ DBG(TAG, ul_debug("looking for tag %s on %s device", tagname, devname)); - - if (!devname) - return NULL; -diff --git a/libblkid/src/tag.c b/libblkid/src/tag.c -index 390a648648..178336505f 100644 ---- a/libblkid/src/tag.c -+++ b/libblkid/src/tag.c -@@ -326,14 +326,14 @@ blkid_dev blkid_find_dev_with_tag(blkid_cache cache, - blkid_dev dev; - int pri; - struct list_head *p; -- int probe_new = 0; -+ int probe_new = 0, probe_all = 0; - - if (!cache || !type || !value) - return NULL; - - blkid_read_cache(cache); - -- DBG(TAG, ul_debug("looking for %s=%s in cache", type, value)); -+ DBG(TAG, ul_debug("looking for tag %s=%s in cache", type, value)); - - try_again: - pri = -1; -@@ -366,9 +366,11 @@ blkid_dev blkid_find_dev_with_tag(blkid_cache cache, - goto try_again; - } - -- if (!dev && !(cache->bic_flags & BLKID_BIC_FL_PROBED)) { -+ if (!dev && !probe_all -+ && !(cache->bic_flags & BLKID_BIC_FL_PROBED)) { - if (blkid_probe_all(cache) < 0) - return NULL; -+ probe_all++; - goto try_again; - } - return dev; diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in index 9e9b8933e50..b5d8cad15bd 100644 --- a/package/util-linux/Config.in +++ b/package/util-linux/Config.in @@ -146,6 +146,11 @@ config BR2_PACKAGE_UTIL_LINUX_HWCLOCK help Query or set the hardware clock (RTC) +config BR2_PACKAGE_UTIL_LINUX_IPCMK + bool "ipcmk" + help + Make various IPC resources + config BR2_PACKAGE_UTIL_LINUX_IPCRM bool "ipcrm" help @@ -156,6 +161,14 @@ config BR2_PACKAGE_UTIL_LINUX_IPCS help Show information on IPC facilities +config BR2_PACKAGE_UTIL_LINUX_IRQTOP + bool "irqtop" + depends on BR2_USE_MMU # libsmartcols + select BR2_PACKAGE_NCURSES + select BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS + help + Show information on IRQs + config BR2_PACKAGE_UTIL_LINUX_KILL bool "kill" help @@ -198,6 +211,18 @@ config BR2_PACKAGE_UTIL_LINUX_LOSETUP help Set up and control loop devices +config BR2_PACKAGE_UTIL_LINUX_LSFD + bool "lsfd" + depends on BR2_USE_MMU # libsmartcols + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_19 + select BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS + help + List file descriptors (modern replacement for lsof) + +comment "lsfd needs a toolchain w/ headers >= 3.19" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_19 + config BR2_PACKAGE_UTIL_LINUX_LSLOGINS bool "lslogins" depends on BR2_USE_MMU # libsmartcols diff --git a/package/util-linux/util-linux-libs/0001-libuuid-include-c-h-to-cover-restrict-keyword.patch b/package/util-linux/util-linux-libs/0001-libuuid-include-c-h-to-cover-restrict-keyword.patch deleted file mode 120000 index beecc3a48f1..00000000000 --- a/package/util-linux/util-linux-libs/0001-libuuid-include-c-h-to-cover-restrict-keyword.patch +++ /dev/null @@ -1 +0,0 @@ -../0001-libuuid-include-c-h-to-cover-restrict-keyword.patch \ No newline at end of file diff --git a/package/util-linux/util-linux-libs/0002-libblkid-don-t-mark-cache-as-probed-if-sys-not-available.patch b/package/util-linux/util-linux-libs/0002-libblkid-don-t-mark-cache-as-probed-if-sys-not-available.patch deleted file mode 120000 index 2f3c4821445..00000000000 --- a/package/util-linux/util-linux-libs/0002-libblkid-don-t-mark-cache-as-probed-if-sys-not-available.patch +++ /dev/null @@ -1 +0,0 @@ -../0002-libblkid-don-t-mark-cache-as-probed-if-sys-not-available.patch \ No newline at end of file diff --git a/package/util-linux/util-linux.hash b/package/util-linux/util-linux.hash index 748a36e0be3..6f1bb74ecbb 100644 --- a/package/util-linux/util-linux.hash +++ b/package/util-linux/util-linux.hash @@ -1,5 +1,5 @@ -# From https://www.kernel.org/pub/linux/utils/util-linux/v2.37/sha256sums.asc -sha256 634e6916ad913366c3536b6468e7844769549b99a7b2bf80314de78ab5655b83 util-linux-2.37.4.tar.xz +# From https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.38/sha256sums.asc +sha256 6d111cbe4d55b336db2f1fbeffbc65b89908704c01136371d32aa9bec373eb64 util-linux-2.38.tar.xz # License files, locally calculated sha256 869660b5269f4f40a8a679da7f403ea3a6e71d46087aab5e14871b09bcb55955 README.licensing sha256 9b718a9460fed5952466421235bc79eb49d4e9eacc920d7a9dd6285ab8fd6c6d Documentation/licenses/COPYING.BSD-3-Clause diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 891c17d1d9e..87ec3c19d73 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.37 -UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).4 +UTIL_LINUX_VERSION_MAJOR = 2.38 +UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR) 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) @@ -35,13 +35,6 @@ UTIL_LINUX_CONF_OPTS += \ UTIL_LINUX_LINK_LIBS = $(TARGET_NLS_LIBS) -# workaround missing disk-utils/raw.8 file in util-linux-2.37.3 -# release download package -define UTIL_LINUX_FIX_DISK_UTILS_COMPILE - touch $(@D)/disk-utils/raw.8 -endef -UTIL_LINUX_POST_PATCH_HOOKS += UTIL_LINUX_FIX_DISK_UTILS_COMPILE - HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf # We also don't want the host-python dependency @@ -140,8 +133,10 @@ UTIL_LINUX_CONF_OPTS += \ $(if $(BR2_PACKAGE_UTIL_LINUX_FSCK),--enable-fsck,--disable-fsck) \ $(if $(BR2_PACKAGE_UTIL_LINUX_HARDLINK),--enable-hardlink,--disable-hardlink) \ $(if $(BR2_PACKAGE_UTIL_LINUX_HWCLOCK),--enable-hwclock --disable-hwclock-gplv3,--disable-hwclock) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_IPCMK),--enable-ipcmk,--disable-ipcmk) \ $(if $(BR2_PACKAGE_UTIL_LINUX_IPCRM),--enable-ipcrm,--disable-ipcrm) \ $(if $(BR2_PACKAGE_UTIL_LINUX_IPCS),--enable-ipcs,--disable-ipcs) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_IRQTOP),--enable-irqtop,--disable-irqtop) \ $(if $(BR2_PACKAGE_UTIL_LINUX_KILL),--enable-kill,--disable-kill) \ $(if $(BR2_PACKAGE_UTIL_LINUX_LAST),--enable-last,--disable-last) \ $(if $(BR2_PACKAGE_UTIL_LINUX_LIBBLKID),--enable-libblkid,--disable-libblkid) \ @@ -153,6 +148,7 @@ UTIL_LINUX_CONF_OPTS += \ $(if $(BR2_PACKAGE_UTIL_LINUX_LOGGER),--enable-logger,--disable-logger) \ $(if $(BR2_PACKAGE_UTIL_LINUX_LOGIN),--enable-login,--disable-login) \ $(if $(BR2_PACKAGE_UTIL_LINUX_LOSETUP),--enable-losetup,--disable-losetup) \ + $(if $(BR2_PACKAGE_UTIL_LINUX_LSFD),--enable-lsfd,--disable-lsfd) \ $(if $(BR2_PACKAGE_UTIL_LINUX_LSLOGINS),--enable-lslogins,--disable-lslogins) \ $(if $(BR2_PACKAGE_UTIL_LINUX_LSMEM),--enable-lsmem,--disable-lsmem) \ $(if $(BR2_PACKAGE_UTIL_LINUX_MESG),--enable-mesg,--disable-mesg) \ @@ -214,7 +210,9 @@ HOST_UTIL_LINUX_CONF_OPTS += \ --disable-agetty \ --disable-chfn-chsh \ --disable-chmem \ + --disable-ipcmk \ --disable-login \ + --disable-lsfd \ --disable-lslogins \ --disable-mesg \ --disable-more \ diff --git a/package/utp_com/utp_com.hash b/package/utp_com/utp_com.hash index bc25be209fc..9a680f27537 100644 --- a/package/utp_com/utp_com.hash +++ b/package/utp_com/utp_com.hash @@ -1,3 +1,3 @@ # locally computed -sha256 8b5ba0058a78de69faf6822bb10b457fff2f9e55dc112ccb81c35214b061c6e6 utp_com-dee512ced1e9367d223d22f10797fbf9aeacfab6.tar.gz -sha256 a45d0bb572ed792ed34627a72621834b3ba92aab6e2cc4e04301dee7a728d753 LICENSE +sha256 8b5ba0058a78de69faf6822bb10b457fff2f9e55dc112ccb81c35214b061c6e6 utp_com-dee512ced1e9367d223d22f10797fbf9aeacfab6.tar.gz +sha256 a45d0bb572ed792ed34627a72621834b3ba92aab6e2cc4e04301dee7a728d753 LICENSE diff --git a/package/uuu/Config.in.host b/package/uuu/Config.in.host new file mode 100644 index 00000000000..0ed064feb6e --- /dev/null +++ b/package/uuu/Config.in.host @@ -0,0 +1,18 @@ +config BR2_PACKAGE_HOST_UUU + bool "host uuu" + depends on BR2_HOST_GCC_AT_LEAST_4_9 # host-libusb + help + UUU (Universal Update Utility) is Freescale/NXP I.MX Chip + image deploy tool. UUU is an evolution of MFGTools + (aka MFGTools v3). + + To be able to run uuu without root privileges, execute the + following steps: + + sudo sh -c "uuu -udev >> /etc/udev/rules.d/70-uuu.rules" + sudo udevadm control --reload + + https://github.com/NXPmicro/mfgtools + +comment "host uuu needs a toolchain w/ host gcc >= 4.9" + depends on !BR2_HOST_GCC_AT_LEAST_4_9 diff --git a/package/uuu/readme.txt b/package/uuu/readme.txt new file mode 100644 index 00000000000..80dd90b9338 --- /dev/null +++ b/package/uuu/readme.txt @@ -0,0 +1,13 @@ +uuu Howto +========= + +Running uuu without root privileges +----------------------------------- + +Accessing USB devices on Linux requires root privileges by default. +To be able to run uuu without root priviles, execute the following +steps: + + sudo sh -c "uuu -udev >> /etc/udev/rules.d/70-uuu.rules" + sudo udevadm control --reload + diff --git a/package/uuu/uuu.hash b/package/uuu/uuu.hash new file mode 100644 index 00000000000..a5b665620c6 --- /dev/null +++ b/package/uuu/uuu.hash @@ -0,0 +1,4 @@ +# locally computed +sha256 e89d3665af499ab71360d948176cf64619b082f8272a994d1fbfc000e67c0f14 uuu_source-1.5.21.tar.gz +sha256 cc8d47f7b9260f6669ecd41c24554c552f17581d81ee8fc602c6d23edb8bf495 LICENSE +sha256 584bfbb18b4c08b872d48b80419dd453307212a144134fb516bd6ddc0700c2e8 README.md diff --git a/package/uuu/uuu.mk b/package/uuu/uuu.mk new file mode 100644 index 00000000000..1a5f84ce4d7 --- /dev/null +++ b/package/uuu/uuu.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# uuu +# +################################################################################ + +UUU_VERSION = 1.5.21 +UUU_SOURCE = uuu_source-$(UUU_VERSION).tar.gz +UUU_SITE = https://github.com/NXPmicro/mfgtools/releases/download/uuu_$(UUU_VERSION) +UUU_LICENSE = BSD 3-Clause "New" or "Revised" License +UUU_LICENSE_FILES = LICENSE README.md +HOST_UUU_DEPENDENCIES = host-bzip2 host-openssl host-zlib host-libusb host-zstd + +$(eval $(host-cmake-package)) diff --git a/package/uvw/uvw.hash b/package/uvw/uvw.hash index 5f7521c8b31..a0c74bbe052 100644 --- a/package/uvw/uvw.hash +++ b/package/uvw/uvw.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 30b0ba97a94d5e652490c6b1b32c95e608263f21cf3bc606308d09b3e3a114bf uvw-2.10.0_libuv_v1.42.tar.gz -sha256 5de32af2469480cf3261c9781962e0887366666ba8ee1f4a32c386c77fc50c88 LICENSE +sha256 3460842778e91e7d2fae4201e49e4521e9d94fbbf3891ae6c52d3c9fc0673598 uvw-2.12.1_libuv_v1.44.tar.gz +sha256 1e3b8fb895c0396aaa2138ff82c02968524e220645b21b0a4ac765858a898732 LICENSE diff --git a/package/uvw/uvw.mk b/package/uvw/uvw.mk index 9c15d536cbf..b6c2135d6f0 100644 --- a/package/uvw/uvw.mk +++ b/package/uvw/uvw.mk @@ -4,7 +4,7 @@ # ################################################################################ -UVW_VERSION = 2.10.0_libuv_v1.42 +UVW_VERSION = 2.12.1_libuv_v1.44 UVW_SITE = $(call github,skypjack,uvw,v$(UVW_VERSION)) UVW_INSTALL_STAGING = YES UVW_INSTALL_TARGET = NO diff --git a/package/v4l2loopback/v4l2loopback.hash b/package/v4l2loopback/v4l2loopback.hash index f4491e02d03..d897fd48ffd 100644 --- a/package/v4l2loopback/v4l2loopback.hash +++ b/package/v4l2loopback/v4l2loopback.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e152cd6df6a8add172fb74aca3a9188264823efa5a2317fe960d45880b9406ae v4l2loopback-0.12.5.tar.gz +sha256 e0782b8abe8f2235e2734f725dc1533a0729e674c4b7834921ade43b9f04939b v4l2loopback-0.12.7.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/v4l2loopback/v4l2loopback.mk b/package/v4l2loopback/v4l2loopback.mk index 7701bc3a306..84e1927ce32 100644 --- a/package/v4l2loopback/v4l2loopback.mk +++ b/package/v4l2loopback/v4l2loopback.mk @@ -4,10 +4,12 @@ # ################################################################################ -V4L2LOOPBACK_VERSION = 0.12.5 +V4L2LOOPBACK_VERSION = 0.12.7 V4L2LOOPBACK_SITE = $(call github,umlaeute,v4l2loopback,v$(V4L2LOOPBACK_VERSION)) V4L2LOOPBACK_LICENSE = GPL-2.0+ V4L2LOOPBACK_LICENSE_FILES = COPYING +V4L2LOOPBACK_CPE_ID_VENDOR = v4l2loopback_project +V4L2LOOPBACK_CPE_ID_PREFIX = cpe:2.3:o ifeq ($(BR2_PACKAGE_V4L2LOOPBACK_UTILS),y) define V4L2LOOPBACK_INSTALL_TARGET_CMDS @@ -15,5 +17,15 @@ define V4L2LOOPBACK_INSTALL_TARGET_CMDS endef endif +# CONFIG_MEDIA_SUPPORT depends on CONFIG_HAS_IOMEM, which is only +# available when CONFIG_PCI=y on S390. CONFIG_VIDEO_DEV needs +# CONFIG_I2C since Linux 5.18. +define V4L2LOOPBACK_LINUX_CONFIG_FIXUPS + $(if $(BR2_s390x),$(call KCONFIG_ENABLE_OPT,CONFIG_PCI)) + $(call KCONFIG_ENABLE_OPT,CONFIG_MEDIA_SUPPORT) + $(call KCONFIG_ENABLE_OPT,CONFIG_I2C) + $(call KCONFIG_ENABLE_OPT,CONFIG_VIDEO_DEV) +endef + $(eval $(kernel-module)) $(eval $(generic-package)) diff --git a/package/valgrind/0003-coregrind-fix-compilation-for-uclibc.patch b/package/valgrind/0003-coregrind-fix-compilation-for-uclibc.patch new file mode 100644 index 00000000000..ff8dc974d83 --- /dev/null +++ b/package/valgrind/0003-coregrind-fix-compilation-for-uclibc.patch @@ -0,0 +1,65 @@ +From 9c9fd9ae24b45f915f0759d32f662835c26d37c3 Mon Sep 17 00:00:00 2001 +From: Dario Binacchi +Date: Fri, 8 Apr 2022 12:36:33 +0200 +Subject: [PATCH] coregrind: fix compilation for uclibc + +It fixes a known iusse whose details are described at [1] and more +generally it guarantees that Valgrind is properly compiled for ulibc. + +[1] https://www.mail-archive.com/valgrind-users@lists.sourceforge.net/msg05295.html + +Suggested-by Michael Trimarchi +Co-developed-by: Michael Trimarchi +Signed-off-by: Dario Binacchi +--- + configure.ac | 2 ++ + coregrind/m_debuginfo/minilzo-inl.c | 4 ++++ + coregrind/vg_preloaded.c | 4 ++++ + 3 files changed, 10 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 6f51dfd9f8fb..c627a9c17a4a 100755 +--- a/configure.ac ++++ b/configure.ac +@@ -1204,6 +1204,8 @@ AC_SUBST(DEFAULT_SUPP) + AC_CHECK_HEADER([features.h]) + + if test x$ac_cv_header_features_h = xyes; then ++ AC_DEFINE([HAVE_HEADER_FEATURES_H], 1, ++ [Define to 1 if you have the `features.h' header.]) + rm -f conftest.$ac_ext + cat <<_ACEOF >conftest.$ac_ext + #include +diff --git a/coregrind/m_debuginfo/minilzo-inl.c b/coregrind/m_debuginfo/minilzo-inl.c +index 153d008fd44f..b45ec92eaa85 100644 +--- a/coregrind/m_debuginfo/minilzo-inl.c ++++ b/coregrind/m_debuginfo/minilzo-inl.c +@@ -1875,6 +1875,10 @@ extern "C" { + + #endif + ++#ifdef HAVE_HEADER_FEATURES_H ++#include ++#endif ++ + #undef LZO_HAVE_CONFIG_H + #include "minilzo.h" + +diff --git a/coregrind/vg_preloaded.c b/coregrind/vg_preloaded.c +index 5e2098390847..3809811aede7 100644 +--- a/coregrind/vg_preloaded.c ++++ b/coregrind/vg_preloaded.c +@@ -45,6 +45,10 @@ + #include "pub_core_debuginfo.h" // Needed for pub_core_redir.h + #include "pub_core_redir.h" // For VG_NOTIFY_ON_LOAD + ++#ifdef HAVE_HEADER_FEATURES_H ++#include ++#endif ++ + #if defined(VGO_linux) || defined(VGO_solaris) || defined(VGO_freebsd) + + /* --------------------------------------------------------------------- +-- +2.32.0 + diff --git a/package/valgrind/Config.in b/package/valgrind/Config.in index 56e4af21fa7..700849130fc 100644 --- a/package/valgrind/Config.in +++ b/package/valgrind/Config.in @@ -7,14 +7,15 @@ config BR2_PACKAGE_VALGRIND_ARCH_SUPPORTS default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le depends on !BR2_MIPS_SOFT_FLOAT -comment "valgrind needs a toolchain w/ dynamic library" +comment "valgrind needs a toolchain w/ dynamic library, threads" depends on BR2_PACKAGE_VALGRIND_ARCH_SUPPORTS - depends on BR2_STATIC_LIBS + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS config BR2_PACKAGE_VALGRIND bool "valgrind" depends on BR2_PACKAGE_VALGRIND_ARCH_SUPPORTS depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_THREADS help Tool for debugging and profiling Linux programs. diff --git a/package/valgrind/valgrind.hash b/package/valgrind/valgrind.hash index 748fc3eb82a..8487c07e42c 100644 --- a/package/valgrind/valgrind.hash +++ b/package/valgrind/valgrind.hash @@ -1,7 +1,7 @@ # From https://valgrind.org/downloads/current.html -md5 de56a5532b0c81781db677ca712c585a valgrind-3.18.1.tar.bz2 +md5 4687a4990585a038c52f842448ef4e63 valgrind-3.19.0.tar.bz2 # locally computed -sha256 00859aa13a772eddf7822225f4b46ee0d39afbe071d32778da4d99984081f7f5 valgrind-3.18.1.tar.bz2 +sha256 dd5e34486f1a483ff7be7300cc16b4d6b24690987877c3278d797534d6738f02 valgrind-3.19.0.tar.bz2 # License files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/valgrind/valgrind.mk b/package/valgrind/valgrind.mk index 52f2a04ffa1..17b131c3ec6 100644 --- a/package/valgrind/valgrind.mk +++ b/package/valgrind/valgrind.mk @@ -4,7 +4,7 @@ # ################################################################################ -VALGRIND_VERSION = 3.18.1 +VALGRIND_VERSION = 3.19.0 VALGRIND_SITE = https://sourceware.org/pub/valgrind VALGRIND_SOURCE = valgrind-$(VALGRIND_VERSION).tar.bz2 VALGRIND_LICENSE = GPL-2.0, GFDL-1.2 @@ -14,6 +14,8 @@ VALGRIND_CONF_OPTS = \ --disable-ubsan \ --without-mpicc VALGRIND_INSTALL_STAGING = YES +# 0003-coregrind-fix-compilation-for-uclibc.patch +VALGRIND_AUTORECONF=YES # Valgrind must be compiled with no stack protection, so forcefully # pass -fno-stack-protector to override what Buildroot may have in @@ -50,7 +52,7 @@ VALGRIND_CONF_OPTS += \ --host=$(patsubst arm-%,armv7-%,$(GNU_TARGET_NAME)) endif -ifeq ($(BR2_GCC_ENABLE_LTO),y) +ifeq ($(BR2_ENABLE_LTO),y) VALGRIND_CONF_OPTS += --enable-lto else VALGRIND_CONF_OPTS += --disable-lto diff --git a/package/valijson/Config.in b/package/valijson/Config.in index 10721b37036..07706cd9634 100644 --- a/package/valijson/Config.in +++ b/package/valijson/Config.in @@ -1,10 +1,6 @@ config BR2_PACKAGE_VALIJSON bool "valijson" - depends on BR2_USE_WCHAR depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_BOOST - select BR2_PACKAGE_BOOST_REGEX help Valijson is a header-only JSON Schema Validation library for C++. Valijson provides a simple validation API that allows @@ -14,5 +10,5 @@ config BR2_PACKAGE_VALIJSON https://github.com/tristanpenman/valijson -comment "valijson needs a toolchain w/ C++, threads, wchar support" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR +comment "valijson needs a toolchain w/ C++" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/valijson/valijson.hash b/package/valijson/valijson.hash index e184ccb7c0f..aacdf7dedcd 100644 --- a/package/valijson/valijson.hash +++ b/package/valijson/valijson.hash @@ -1,3 +1,3 @@ # Locally Computed: -sha256 2ac881a36f90810b41b66511502dea1e7886137ad31bcfb4e917d929c5028c35 valijson-0.3.tar.gz +sha256 bc24736709acfb252a5fdcb5145f1f2670c7aecaba3356f6f8ba54903800fa5c valijson-0.7.tar.gz sha256 1a0f99926a2dbec30eba3db820236d9953fbe3048976923ac24980e655fbe991 LICENSE diff --git a/package/valijson/valijson.mk b/package/valijson/valijson.mk index e425757d26b..51a93539609 100644 --- a/package/valijson/valijson.mk +++ b/package/valijson/valijson.mk @@ -4,14 +4,13 @@ # ################################################################################ -VALIJSON_VERSION = 0.3 +VALIJSON_VERSION = 0.7 VALIJSON_SITE = $(call github,tristanpenman,valijson,v$(VALIJSON_VERSION)) VALIJSON_LICENSE = BSD-2-Clause VALIJSON_LICENSE_FILES = LICENSE VALIJSON_CPE_ID_VENDOR = valijson_project VALIJSON_INSTALL_STAGING = YES VALIJSON_INSTALL_TARGET = NO -VALIJSON_DEPENDENCIES = boost VALIJSON_CONF_OPTS = -Dvalijson_INSTALL_HEADERS=TRUE -Dvalijson_BUILD_TESTS=FALSE $(eval $(cmake-package)) diff --git a/package/vde2/0003-vde_l3-Add-static-to-inline-functions.patch b/package/vde2/0003-vde_l3-Add-static-to-inline-functions.patch new file mode 100644 index 00000000000..7f771dfc7eb --- /dev/null +++ b/package/vde2/0003-vde_l3-Add-static-to-inline-functions.patch @@ -0,0 +1,37 @@ +vde_l3: Add static to inline functions + +Add static to inline functions to avoid the following build failure +with BR2_OPTIMIZE_0: + +/home/autobuild/autobuild/instance-11/output-1/host/lib/gcc/mips64-buildroot-linux-uclibc/10.3.0/../../../../mips64-buildroot-linux-uclibc/bin/ld: vde_l3.o: in function `ip_output_ready': +vde_l3.c:(.text+0xb30): undefined reference to `iphead' + +Fixes: + - http://autobuild.buildroot.org/results/5eeefcdac0b8974a424a885fdc2e82f7cb4b617d + +Signed-off-by: Fabrice Fontaine + +diff -Nura vde2-2.3.2.orig/src/vde_l3/vde_l3.c vde2-2.3.2/src/vde_l3/vde_l3.c +--- vde2-2.3.2.orig/src/vde_l3/vde_l3.c 2022-04-21 11:05:17.393452698 +0200 ++++ vde2-2.3.2/src/vde_l3/vde_l3.c 2022-04-21 11:10:36.509804404 +0200 +@@ -100,17 +100,17 @@ + }; + + +-inline struct vde_ethernet_header *ethhead(struct vde_buff *vdb) ++static inline struct vde_ethernet_header *ethhead(struct vde_buff *vdb) + { + return (struct vde_ethernet_header*)(vdb->data); + } + +-inline struct iphdr *iphead(struct vde_buff *vdb) ++static inline struct iphdr *iphead(struct vde_buff *vdb) + { + return (struct iphdr*)(vdb->data + 14); + } + +-inline void *payload(struct vde_buff *vdb) ++static inline void *payload(struct vde_buff *vdb) + { + return (uint8_t*)(vdb->data + 14 + sizeof(struct iphdr)); + } diff --git a/package/vdr-plugin-vnsiserver/vdr-plugin-vnsiserver.hash b/package/vdr-plugin-vnsiserver/vdr-plugin-vnsiserver.hash index 21c62fae1d0..b31ba70ad9f 100644 --- a/package/vdr-plugin-vnsiserver/vdr-plugin-vnsiserver.hash +++ b/package/vdr-plugin-vnsiserver/vdr-plugin-vnsiserver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d5989461541a91fe4de4ca9c396d4e7b2f4a8663fc9d6155d0830d2b143fce4d vdr-plugin-vnsiserver-1.8.0.tar.gz -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 d5989461541a91fe4de4ca9c396d4e7b2f4a8663fc9d6155d0830d2b143fce4d vdr-plugin-vnsiserver-1.8.0.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/vdr/0001-getloadavg.patch b/package/vdr/0001-getloadavg.patch index 9e6316e2842..f6ba84c9e51 100644 --- a/package/vdr/0001-getloadavg.patch +++ b/package/vdr/0001-getloadavg.patch @@ -14,7 +14,7 @@ diff -uwNr vdr-2.3.1.org/skinlcars.c vdr-2.3.1/skinlcars.c +/* uclibc and dietlibc do not have this junk -ReneR */ +#if defined (__UCLIBC__) || defined (__dietlibc__) -+static int getloadavg (double loadavg[], int nelem) ++int getloadavg (double loadavg[], int nelem) +{ + int fd; + diff --git a/package/vdr/0002-Fix-musl-build.patch b/package/vdr/0002-Fix-musl-build.patch new file mode 100644 index 00000000000..8c0b8d663bc --- /dev/null +++ b/package/vdr/0002-Fix-musl-build.patch @@ -0,0 +1,159 @@ +From fb44386acc2497ac250364bc08cebc26ded816cf Mon Sep 17 00:00:00 2001 +From: Carlo Landmeter +Date: Tue, 16 May 2023 19:57:39 +0200 +Subject: [PATCH] Fix musl build + +Downloaded from +https://git.alpinelinux.org/aports/tree/community/vdr/musl-compat.patch + +Initial commit: +https://git.alpinelinux.org/aports/commit/?id=140248605cee4a0160f80b47ce77a823be2f740a + +Upstream: https://www.linuxtv.org/pipermail/vdr/2023-May/029744.html + +Signed-off-by: Bernd Kuhls +--- + i18n.h | 2 +- + osd.c | 2 +- + thread.c | 4 +++- + tools.c | 4 ++-- + tools.h | 14 ++++++++++++-- + vdr.c | 6 ++++++ + 6 files changed, 25 insertions(+), 7 deletions(-) + +diff --git a/i18n.h b/i18n.h +index 03deb6f2..85ce4077 100644 +--- a/i18n.h ++++ b/i18n.h +@@ -46,7 +46,7 @@ const cStringList *I18nLanguages(void); + ///< have an actual locale installed. The rest are just dummy entries + ///< to allow having three letter language codes for other languages + ///< that have no actual locale on this system. +-const char *I18nTranslate(const char *s, const char *Plugin = NULL) __attribute_format_arg__(1); ++const char *I18nTranslate(const char *s, const char *Plugin = NULL) __attribute__((__format_arg__ (1))); + ///< Translates the given string (with optional Plugin context) into + ///< the current language. If no translation is available, the original + ///< string will be returned. +diff --git a/osd.c b/osd.c +index 47bda686..0d360c81 100644 +--- a/osd.c ++++ b/osd.c +@@ -12,7 +12,7 @@ + #include + #include + #include +-#include ++#include + #include "device.h" + #include "tools.h" + +diff --git a/thread.c b/thread.c +index 93eb8c0d..6e854541 100644 +--- a/thread.c ++++ b/thread.c +@@ -160,7 +160,9 @@ cRwLock::cRwLock(bool PreferWriter) + writeLockThreadId = 0; + pthread_rwlockattr_t attr; + pthread_rwlockattr_init(&attr); ++#if defined(__GLIBC__) + pthread_rwlockattr_setkind_np(&attr, PreferWriter ? PTHREAD_RWLOCK_PREFER_WRITER_NP : PTHREAD_RWLOCK_PREFER_READER_NP); ++#endif + pthread_rwlock_init(&rwlock, &attr); + } + +@@ -210,7 +212,7 @@ cMutex::cMutex(void) + locked = 0; + pthread_mutexattr_t attr; + pthread_mutexattr_init(&attr); +- pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK_NP); ++ pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK); + pthread_mutex_init(&mutex, &attr); + } + +diff --git a/tools.c b/tools.c +index d04033b1..8b161eec 100644 +--- a/tools.c ++++ b/tools.c +@@ -672,7 +672,7 @@ char *ReadLink(const char *FileName) + { + if (!FileName) + return NULL; +- char *TargetName = canonicalize_file_name(FileName); ++ char *TargetName = realpath(FileName, NULL); + if (!TargetName) { + if (errno == ENOENT) // file doesn't exist + TargetName = strdup(FileName); +@@ -1562,7 +1562,7 @@ cReadDir::~cReadDir() + struct dirent *cReadDir::Next(void) + { + if (directory) { +-#if !__GLIBC_PREREQ(2, 24) // readdir_r() is deprecated as of GLIBC 2.24 ++#if __GLIBC__ + while (readdir_r(directory, &u.d, &result) == 0 && result) { + #else + while ((result = readdir(directory)) != NULL) { +diff --git a/tools.h b/tools.h +index ff6169ee..60eda179 100644 +--- a/tools.h ++++ b/tools.h +@@ -28,6 +28,16 @@ + #include + #include "thread.h" + ++#ifndef ACCESSPERMS ++# define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO) /* 0777 */ ++#endif ++#ifndef ALLPERMS ++# define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO)/* 07777 */ ++#endif ++#ifndef DEFFILEMODE ++# define DEFFILEMODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)/* 0666*/ ++#endif ++ + typedef unsigned char uchar; + + extern int SysLogLevel; +@@ -444,7 +454,7 @@ class cReadDir { + private: + DIR *directory; + struct dirent *result; +-#if !__GLIBC_PREREQ(2, 24) // readdir_r() is deprecated as of GLIBC 2.24 ++#if __GLIBC__ + union { // according to "The GNU C Library Reference Manual" + struct dirent d; + char b[offsetof(struct dirent, d_name) + NAME_MAX + 1]; +@@ -818,7 +828,7 @@ public: + data[i] = T(0); + size = 0; + } +- void Sort(__compar_fn_t Compare) ++ void Sort(int (*Compare)(const void *, const void *)) + { + qsort(data, size, sizeof(T), Compare); + } +diff --git a/vdr.c b/vdr.c +index 1bdc51ab..0f426e61 100644 +--- a/vdr.c ++++ b/vdr.c +@@ -661,12 +661,18 @@ int main(int argc, char *argv[]) + } + } + else if (Terminal) { ++#ifdef __GLIBC__ + // Claim new controlling terminal + stdin = freopen(Terminal, "r", stdin); + stdout = freopen(Terminal, "w", stdout); + stderr = freopen(Terminal, "w", stderr); + HasStdin = true; + tcgetattr(STDIN_FILENO, &savedTm); ++#else ++ // stdin, stdout, stderr are declared FILE const* by musl C library ++ fprintf(stderr, "Option '-t' is only supported if VDR has been built against glibc.\n"); ++ return 2; ++#endif + } + + // Set user id in case we were started as root: +-- +2.39.2 + diff --git a/package/vdr/0002-musl-compat.patch b/package/vdr/0002-musl-compat.patch deleted file mode 100644 index b6f8f414a96..00000000000 --- a/package/vdr/0002-musl-compat.patch +++ /dev/null @@ -1,140 +0,0 @@ -Fix musl build - -Downloaded from -https://git.alpinelinux.org/aports/tree/community/vdr/musl-compat.patch - -Signed-off-by: Bernd Kuhls - -diff --git a/i18n.h b/i18n.h -index f8ad9de..b002bbf 100644 ---- a/i18n.h -+++ b/i18n.h -@@ -46,7 +46,7 @@ const cStringList *I18nLanguages(void); - ///< have an actual locale installed. The rest are just dummy entries - ///< to allow having three letter language codes for other languages - ///< that have no actual locale on this system. --const char *I18nTranslate(const char *s, const char *Plugin = NULL) __attribute_format_arg__(1); -+const char *I18nTranslate(const char *s, const char *Plugin = NULL) __attribute__((__format_arg__ (1))); - ///< Translates the given string (with optional Plugin context) into - ///< the current language. If no translation is available, the original - ///< string will be returned. -diff --git a/osd.c b/osd.c -index 524700a..ef975f5 100644 ---- a/osd.c -+++ b/osd.c -@@ -12,7 +12,7 @@ - #include - #include - #include --#include -+#include - #include "device.h" - #include "tools.h" - -diff --git a/thread.c b/thread.c -index 47eb977..58dba43 100644 ---- a/thread.c -+++ b/thread.c -@@ -155,7 +155,9 @@ cRwLock::cRwLock(bool PreferWriter) - writeLockThreadId = 0; - pthread_rwlockattr_t attr; - pthread_rwlockattr_init(&attr); -+#if defined(__GLIBC__) - pthread_rwlockattr_setkind_np(&attr, PreferWriter ? PTHREAD_RWLOCK_PREFER_WRITER_NP : PTHREAD_RWLOCK_PREFER_READER_NP); -+#endif - pthread_rwlock_init(&rwlock, &attr); - } - -@@ -205,7 +207,7 @@ cMutex::cMutex(void) - locked = 0; - pthread_mutexattr_t attr; - pthread_mutexattr_init(&attr); -- pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK_NP); -+ pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK); - pthread_mutex_init(&mutex, &attr); - } - -diff --git a/tools.c b/tools.c -index 754673d..fef9d2d 100644 ---- a/tools.c -+++ b/tools.c -@@ -640,7 +640,7 @@ char *ReadLink(const char *FileName) - { - if (!FileName) - return NULL; -- char *TargetName = canonicalize_file_name(FileName); -+ char *TargetName = realpath(FileName, NULL); - if (!TargetName) { - if (errno == ENOENT) // file doesn't exist - TargetName = strdup(FileName); -@@ -1528,7 +1528,7 @@ - struct dirent *cReadDir::Next(void) - { - if (directory) { --#if !__GLIBC_PREREQ(2, 24) // readdir_r() is deprecated as of GLIBC 2.24 -+#if __GLIBC__ - while (readdir_r(directory, &u.d, &result) == 0 && result) { - #else - while ((result = readdir(directory)) != NULL) { -diff --git a/tools.h b/tools.h -index 73cca5a..03f5fd1 100644 ---- a/tools.h -+++ b/tools.h -@@ -28,6 +28,16 @@ - #include - #include "thread.h" - -+#ifndef ACCESSPERMS -+# define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO) /* 0777 */ -+#endif -+#ifndef ALLPERMS -+# define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO)/* 07777 */ -+#endif -+#ifndef DEFFILEMODE -+# define DEFFILEMODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)/* 0666*/ -+#endif -+ - typedef unsigned char uchar; - - extern int SysLogLevel; -@@ -400,7 +410,7 @@ - private: - DIR *directory; - struct dirent *result; --#if !__GLIBC_PREREQ(2, 24) // readdir_r() is deprecated as of GLIBC 2.24 -+#if __GLIBC__ - union { // according to "The GNU C Library Reference Manual" - struct dirent d; - char b[offsetof(struct dirent, d_name) + NAME_MAX + 1]; -@@ -738,7 +748,7 @@ public: - data[i] = T(0); - size = 0; - } -- void Sort(__compar_fn_t Compare) -+ void Sort(int (*Compare)(const void *, const void *)) - { - qsort(data, size, sizeof(T), Compare); - } -diff --git a/vdr.c b/vdr.c -index 8a49471..c2a82aa 100644 ---- a/vdr.c -+++ b/vdr.c -@@ -670,12 +670,18 @@ int main(int argc, char *argv[]) - } - } - else if (Terminal) { -+#ifdef __GLIBC__ - // Claim new controlling terminal - stdin = freopen(Terminal, "r", stdin); - stdout = freopen(Terminal, "w", stdout); - stderr = freopen(Terminal, "w", stderr); - HasStdin = true; - tcgetattr(STDIN_FILENO, &savedTm); -+#else -+ // stdin, stdout, stderr are declared FILE const* by musl C library -+ fprintf(stderr, "Option '-t' is only supported if VDR has been built against glibc.\n"); -+ return 2; -+#endif - } - - isyslog("VDR version %s started", VDRVERSION); diff --git a/package/vdr/0003-Include-limits.h.patch b/package/vdr/0003-Include-limits.h.patch new file mode 100644 index 00000000000..7ddfd1703c5 --- /dev/null +++ b/package/vdr/0003-Include-limits.h.patch @@ -0,0 +1,51 @@ +From a4a3d9b012c12cd8aaa2526f0eacdcffcdd9f8f1 Mon Sep 17 00:00:00 2001 +From: Roberto Oliveira +Date: Tue, 16 May 2023 20:01:18 +0200 +Subject: [PATCH] Include limits.h + +vdr package uses some macros like HOST_NAME_MAX, NAME_MAX, which are defined +in limits.h. +Needs to be explicitly included on ppc64le and for all archs for debug build. + +Downloaded from +https://git.alpinelinux.org/aports/tree/community/vdr/include-missing-limits.patch + +Initial commits: +https://git.alpinelinux.org/aports/commit/?id=c9d8942ccf4825fd734b5f37157a49fc4f0b4339 +https://git.alpinelinux.org/aports/commit/?id=47965644c390b1be1117769b1e08b31858267e9a + +Upstream: https://www.linuxtv.org/pipermail/vdr/2023-May/029743.html + +Signed-off-by: Bernd Kuhls +--- + config.h | 1 + + tools.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/config.h b/config.h +index 72dd3d2a..b9ea769f 100644 +--- a/config.h ++++ b/config.h +@@ -19,6 +19,7 @@ + #include "i18n.h" + #include "font.h" + #include "tools.h" ++#include + + // VDR's own version number: + +diff --git a/tools.c b/tools.c +index 8b161eec..56a2e0dd 100644 +--- a/tools.c ++++ b/tools.c +@@ -27,6 +27,7 @@ extern "C" { + #include + #include "i18n.h" + #include "thread.h" ++#include + + int SysLogLevel = 3; + +-- +2.39.2 + diff --git a/package/vdr/0003-include-missing-limits.patch b/package/vdr/0003-include-missing-limits.patch deleted file mode 100644 index c2efe291e6a..00000000000 --- a/package/vdr/0003-include-missing-limits.patch +++ /dev/null @@ -1,30 +0,0 @@ -vdr package uses some macros like HOST_NAME_MAX, NAME_MAX, which are defined -in limits.h. -Needs to be explicitly included on ppc64le and for all archs for debug build. - -Downloaded from -https://git.alpinelinux.org/aports/tree/community/vdr/include-missing-limits.patch - -Signed-off-by: Bernd Kuhls ----- - ---- a/config.h -+++ b/config.h -@@ -19,6 +19,7 @@ - #include "i18n.h" - #include "font.h" - #include "tools.h" -+#include - - // VDR's own version number: - ---- a/tools.c -+++ b/tools.c -@@ -27,6 +27,7 @@ - #include - #include "i18n.h" - #include "thread.h" -+#include - - int SysLogLevel = 3; - diff --git a/package/vdr/0004-i18n.c-_nl_msg_cat_cntr-is-an-internal-symbol-of-som.patch b/package/vdr/0004-i18n.c-_nl_msg_cat_cntr-is-an-internal-symbol-of-som.patch index 9cc45a96c16..7b1a4c2c05e 100644 --- a/package/vdr/0004-i18n.c-_nl_msg_cat_cntr-is-an-internal-symbol-of-som.patch +++ b/package/vdr/0004-i18n.c-_nl_msg_cat_cntr-is-an-internal-symbol-of-som.patch @@ -10,6 +10,8 @@ anything because musl has a basic NLS implementation. Even gettext-tiny defines _nl_msg_cat_cntr as a dummy symbol in its stub libintl-musl implementation. +Upstream: https://www.linuxtv.org/pipermail/vdr/2023-May/029745.html + Signed-off-by: Thomas Petazzoni --- i18n.c | 2 ++ diff --git a/package/vdr/0005-Fix-musl-build.patch b/package/vdr/0005-Fix-musl-build.patch new file mode 100644 index 00000000000..390e78eab56 --- /dev/null +++ b/package/vdr/0005-Fix-musl-build.patch @@ -0,0 +1,37 @@ +From 075472ec580e03cc89971f0c118cb363776a304d Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Tue, 16 May 2023 20:22:12 +0200 +Subject: [PATCH] Fix musl build + +malloc_trim is a GNU extension and therefore not present in non-glibc C +libraries such as musl. Wrapping this in an ifdef fixes musl builds. + +Upstream: https://www.linuxtv.org/pipermail/vdr/2023-May/029742.html + +Signed-off-by: Bernd Kuhls +--- + vdr.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/vdr.c b/vdr.c +index 0f426e61..bc4902de 100644 +--- a/vdr.c ++++ b/vdr.c +@@ -1588,12 +1588,14 @@ int main(int argc, char *argv[]) + cSchedules::Cleanup(); + // Plugins housekeeping: + PluginManager.Housekeeping(); ++#if defined(__GLIBC__) + // Memory cleanup: + static time_t LastMemoryCleanup = 0; + if ((Now - LastMemoryCleanup) > MEMCLEANUPDELTA) { + malloc_trim(0); + LastMemoryCleanup = Now; + } ++#endif + } + } + +-- +2.39.2 + diff --git a/package/vdr/vdr.hash b/package/vdr/vdr.hash index d8f1cb192eb..1b7ced0b773 100644 --- a/package/vdr/vdr.hash +++ b/package/vdr/vdr.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a8e9940d593c41a42eb69db56d1a659e15deb31e131090d8c146a6e25501825a vdr-2.6.0.tar.gz +sha256 70352c7558d627202c02e80d88c83d25d9df4c5e49a010f7d1d9ae631bd54ad0 vdr-2.6.3.tar.gz sha256 ddb9db7630752f8fdc6898f7c99a99eaeeac5213627ecb093df9c82f56175dc7 COPYING diff --git a/package/vdr/vdr.mk b/package/vdr/vdr.mk index bb7b1e22c07..a44e1ff5122 100644 --- a/package/vdr/vdr.mk +++ b/package/vdr/vdr.mk @@ -4,7 +4,7 @@ # ################################################################################ -VDR_VERSION = 2.6.0 +VDR_VERSION = 2.6.3 VDR_SITE = $(call github,vdr-projects,vdr,$(VDR_VERSION)) VDR_LICENSE = GPL-2.0+ VDR_LICENSE_FILES = COPYING diff --git a/package/versal-firmware/Config.in b/package/versal-firmware/Config.in new file mode 100644 index 00000000000..b4b63282d84 --- /dev/null +++ b/package/versal-firmware/Config.in @@ -0,0 +1,24 @@ +config BR2_PACKAGE_VERSAL_FIRMWARE + bool "versal-firmware" + depends on BR2_aarch64 + help + Pre-built firmware files for Xilinx Versal boards. + + https://github.com/nealfrager/buildroot-firmware + +if BR2_PACKAGE_VERSAL_FIRMWARE + +config BR2_PACKAGE_VERSAL_FIRMWARE_VERSION + string "firmware version" + default "2022.2_br_1" + help + Release version of Versal firmware. + +config BR2_PACKAGE_VERSAL_FIRMWARE_BOARD + string "board name" + default "vck190" + help + Name of Versal target board. + Used for installing the appropriate firmware. + +endif # BR2_PACKAGE_VERSAL_FIRMWARE diff --git a/package/versal-firmware/versal-firmware.mk b/package/versal-firmware/versal-firmware.mk new file mode 100644 index 00000000000..0bc5a00bc66 --- /dev/null +++ b/package/versal-firmware/versal-firmware.mk @@ -0,0 +1,21 @@ +################################################################################ +# +# versal-firmware +# +################################################################################ + +VERSAL_FIRMWARE_VERSION = $(call qstrip,$(BR2_PACKAGE_VERSAL_FIRMWARE_VERSION)) +VERSAL_FIRMWARE_SITE = $(call github,Xilinx,ubuntu-firmware,$(VERSAL_FIRMWARE_VERSION)) +VERSAL_FIRMWARE_LICENSE = Xilinx-Binary-Only +VERSAL_FIRMWARE_LICENSE_FILES = LICENSE +VERSAL_FIRMWARE_INSTALL_TARGET = NO +VERSAL_FIRMWARE_INSTALL_IMAGES = YES + +define VERSAL_FIRMWARE_INSTALL_IMAGES_CMDS + $(foreach f,plm.elf psmfw.elf vpl_gen_fixed.pdi,\ + $(INSTALL) -D -m 0755 $(@D)/$(BR2_PACKAGE_VERSAL_FIRMWARE_BOARD)/$(BR2_PACKAGE_VERSAL_FIRMWARE_BOARD)_$(f) \ + $(BINARIES_DIR)/$(BR2_PACKAGE_VERSAL_FIRMWARE_BOARD)_$(f) + ) +endef + +$(eval $(generic-package)) diff --git a/package/vim/vim.hash b/package/vim/vim.hash index 8b60b7461f1..024c014bc9e 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 b0a5acbe83bbdd4b1412abd9dc2ae2e3593c6cff8ff11c551fda3e6e2a87ec81 vim-8.2.4450.tar.gz -sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE -sha256 96970b67f9cb38b0e759946cff22562a3c4b11ce78f62f2117d5e7ecded9ab4d README.txt +sha256 ba769f8513f2f75d71518f817f945809a5cb1310fd58cd86daca96e658cccf7d vim-9.0.1903.tar.gz +sha256 0b3f1f330cb1b179bb17c7c687d4cec601e0aa3462bc7f890ad4c3888d37d720 LICENSE +sha256 b475d5d3f8c855dc1a84813bbe45c44054d7f7aee20c800950bf89d5958873de README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index 28fd33c8ef6..b8b50cb91a4 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 8.2.4450 +VIM_VERSION = 9.0.1903 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src diff --git a/package/vis-network/Config.in b/package/vis-network/Config.in new file mode 100644 index 00000000000..39e8ac54c55 --- /dev/null +++ b/package/vis-network/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_VIS_NETWORK + bool "vis-network" + help + Display dynamic, automatically organised, customizable network + views. Network uses HTML canvas for rendering. + + http://visjs.github.io/vis-network/ diff --git a/package/vis-network/vis-network.hash b/package/vis-network/vis-network.hash new file mode 100644 index 00000000000..56f141f5f70 --- /dev/null +++ b/package/vis-network/vis-network.hash @@ -0,0 +1,4 @@ +# Locally computed +sha256 a9f7325cbe28147318476c63f09c1d5c894d2239bfa4b4dd2dfb3dbebb0705d3 vis-network-9.1.0.tgz +sha256 1509904280a272780fd69c04b858f512cf216f8e3464a0dd98d8f34416feced9 LICENSE-APACHE-2.0 +sha256 1f65085e54c036645082257618db2c7b787e68c3b02485e214ecd09e0834ee8f LICENSE-MIT diff --git a/package/vis-network/vis-network.mk b/package/vis-network/vis-network.mk new file mode 100644 index 00000000000..4a8def37e0a --- /dev/null +++ b/package/vis-network/vis-network.mk @@ -0,0 +1,21 @@ +################################################################################ +# +# vis-network +# +################################################################################ + +VIS_NETWORK_VERSION = 9.1.0 +VIS_NETWORK_SOURCE = vis-network-$(VIS_NETWORK_VERSION).tgz +VIS_NETWORK_SITE = https://registry.npmjs.org/vis-network/- +VIS_NETWORK_LICENSE = Apache-2.0 or MIT +VIS_NETWORK_LICENSE_FILES = LICENSE-APACHE-2.0 LICENSE-MIT + +# Install .min.js and .min.css as .js and .css, respectively. +define VIS_NETWORK_INSTALL_TARGET_CMDS + $(INSTALL) -m 644 -D $(@D)/dist/vis-network.min.js \ + $(TARGET_DIR)/var/www/vis-network.js + $(INSTALL) -m 644 -D $(@D)/dist/dist/vis-network.min.css \ + $(TARGET_DIR)/var/www/vis-network.css +endef + +$(eval $(generic-package)) diff --git a/package/vlc/0010-modules-access-live555.cpp-fix-build-with-live555-20.patch b/package/vlc/0010-modules-access-live555.cpp-fix-build-with-live555-20.patch deleted file mode 100644 index 5f046648d44..00000000000 --- a/package/vlc/0010-modules-access-live555.cpp-fix-build-with-live555-20.patch +++ /dev/null @@ -1,36 +0,0 @@ -From eba390d13ec4089cd6b9d8687ab3f8905b9d3ac8 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 22 May 2021 22:56:04 +0200 -Subject: [PATCH] modules/access/live555.cpp: fix build with live555 >= - 2020.12.11 - -Since live555-2020.12.11, connectionEndpointAddress() member function -use a "struct sockaddr_storage" in preparation for eventual support of -IPv6: http://www.live555.com/liveMedia/public/changelog.txt - -Fixes: - - http://autobuild.buildroot.org/results/83170984f96238756c45bf1f4e542363afafd45f - -Signed-off-by: Fabrice Fontaine ---- - modules/access/live555.cpp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/modules/access/live555.cpp b/modules/access/live555.cpp -index 9d6e01ae32..32a6c294eb 100644 ---- a/modules/access/live555.cpp -+++ b/modules/access/live555.cpp -@@ -850,7 +850,9 @@ static int SessionsSetup( demux_t *p_demux ) - if( !p_sys->b_multicast ) - { - /* We need different rollover behaviour for multicast */ -- p_sys->b_multicast = IsMulticastAddress( sub->connectionEndpointAddress() ); -+ struct sockaddr_storage tempAddr; -+ sub->getConnectionEndpointAddress( tempAddr ); -+ p_sys->b_multicast = IsMulticastAddress( tempAddr ); - } - - tk = (live_track_t*)malloc( sizeof( live_track_t ) ); --- -2.30.2 - diff --git a/package/vlc/0010-opengl-missing-library-check.patch b/package/vlc/0010-opengl-missing-library-check.patch new file mode 100644 index 00000000000..3a28fe34e34 --- /dev/null +++ b/package/vlc/0010-opengl-missing-library-check.patch @@ -0,0 +1,57 @@ +From 4ab41404cb85684125d73977cadebf83bbc246f5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= +Date: Sat, 22 Jan 2022 11:34:38 +0200 +Subject: [PATCH] opengl: missing library check + +Traditionally the presence of the header file was not considered +sufficient, though this was somewhat forgotten with the prevalence of +pkg-config. + +However most libraries have portable headers, while the shared library +is platform-dependent. It is common for the header to be present while +the library is absent with "multilib" installations (i.e. Linux +installation with multiple architectures). + +Downloaded from upstream commit: +https://code.videolan.org/videolan/vlc/-/commit/4ab41404cb85684125d73977cadebf83bbc246f5 + +Signed-off-by: Bernd Kuhls +--- + configure.ac | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 2f50808d597..0d57fadbf8b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3169,7 +3169,6 @@ have_gl="no" + PKG_CHECK_MODULES([GL], [gl], [ + have_gl="yes" + ], [ +- AC_MSG_CHECKING([for OpenGL]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #ifdef _WIN32 + # include +@@ -3179,13 +3178,17 @@ PKG_CHECK_MODULES([GL], [gl], [ + [int t0 = GL_TEXTURE0;]]) + ], [ + GL_CFLAGS="" +- have_gl="yes" + AS_IF([test "${SYS}" != "mingw32"], [ +- GL_LIBS="-lGL" ++ AC_CHECK_LIB([GL], [glTexture2D], [ ++ have_gl="yes" ++ GL_LIBS="-lGL" ++ ]) + ], [ ++ have_gl="yes" + GL_LIBS="-lopengl32" + ]) + ]) ++ AC_MSG_CHECKING([for OpenGL]) + AC_MSG_RESULT([${have_gl}]) + ]) + AM_CONDITIONAL([HAVE_GL], [test "${have_gl}" = "yes"]) +-- +GitLab + diff --git a/package/vlc/vlc.hash b/package/vlc/vlc.hash index 468ec7df356..4b9940df33f 100644 --- a/package/vlc/vlc.hash +++ b/package/vlc/vlc.hash @@ -1,7 +1,7 @@ -# From https://get.videolan.org/vlc/3.0.16/vlc-3.0.16.tar.xz.sha256 -sha256 ffae35fc64f625c175571d2346bc5f6207be99762517f15423e74f18399410f6 vlc-3.0.16.tar.xz -# From https://get.videolan.org/vlc/3.0.16/vlc-3.0.16.tar.xz.sha1 -sha1 e22ac839a09b5ead8992ae6aa8ea886364283e6a vlc-3.0.16.tar.xz +# From https://get.videolan.org/vlc/3.0.18/vlc-3.0.18.tar.xz.sha256 +sha256 57094439c365d8aa8b9b41fa3080cc0eef2befe6025bb5cef722accc625aedec vlc-3.0.18.tar.xz +# From https://get.videolan.org/vlc/3.0.18/vlc-3.0.18.tar.xz.sha1 +sha1 b11ccaa0f5ee15a550564817d60458eb0946f80e vlc-3.0.18.tar.xz # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk index b793e0efe01..c6ae46f4694 100644 --- a/package/vlc/vlc.mk +++ b/package/vlc/vlc.mk @@ -4,7 +4,7 @@ # ################################################################################ -VLC_VERSION = 3.0.16 +VLC_VERSION = 3.0.18 VLC_SITE = https://get.videolan.org/vlc/$(VLC_VERSION) VLC_SOURCE = vlc-$(VLC_VERSION).tar.xz VLC_LICENSE = GPL-2.0+, LGPL-2.1+ diff --git a/package/vmtouch/vmtouch.hash b/package/vmtouch/vmtouch.hash index 451bf56868a..197794f4f68 100644 --- a/package/vmtouch/vmtouch.hash +++ b/package/vmtouch/vmtouch.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 d57b7b3ae1146c4516429ab7d6db6f2122401db814ddd9cdaad10980e9c8428c vmtouch-1.3.1.tar.gz +sha256 d57b7b3ae1146c4516429ab7d6db6f2122401db814ddd9cdaad10980e9c8428c vmtouch-1.3.1.tar.gz # Hash for license files: -sha256 13258709ed29c17394e0a3ba8c8b9360af35b85231db514f11a0ba385cecd08e LICENSE +sha256 13258709ed29c17394e0a3ba8c8b9360af35b85231db514f11a0ba385cecd08e LICENSE diff --git a/package/vnstat/vnstat.hash b/package/vnstat/vnstat.hash index 191dc4ec0b7..bad4325d90f 100644 --- a/package/vnstat/vnstat.hash +++ b/package/vnstat/vnstat.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 03f858a7abf6bd85bb8cd595f3541fc3bd31f8f400ec092ef3034825ccb77c25 vnstat-2.8.tar.gz +sha256 a9c61744e5cd8c366e2db4d282badc74021ddb614bd65b41240937997e457d25 vnstat-2.10.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/vnstat/vnstat.mk b/package/vnstat/vnstat.mk index 91f0233f561..3b2951b8c90 100644 --- a/package/vnstat/vnstat.mk +++ b/package/vnstat/vnstat.mk @@ -4,7 +4,7 @@ # ################################################################################ -VNSTAT_VERSION = 2.8 +VNSTAT_VERSION = 2.10 VNSTAT_SITE = http://humdi.net/vnstat VNSTAT_LICENSE = GPL-2.0 VNSTAT_LICENSE_FILES = COPYING diff --git a/package/volk/Config.in b/package/volk/Config.in index 608c713e636..6a343e07517 100644 --- a/package/volk/Config.in +++ b/package/volk/Config.in @@ -1,34 +1,28 @@ -# requirements copied from gnuradio -# some of these might not apply for volk comment "volk needs a toolchain w/ C++, NPTL, wchar, dynamic library" depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS -comment "volk needs a toolchain not affected by GCC bug 64735" - depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 - config BR2_PACKAGE_VOLK bool "volk" depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_USE_MMU # use fork() - depends on BR2_USE_WCHAR # boost - depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-atomic - depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # boost-thread - select BR2_PACKAGE_BOOST - select BR2_PACKAGE_BOOST_ATOMIC - select BR2_PACKAGE_BOOST_DATE_TIME - select BR2_PACKAGE_BOOST_FILESYSTEM - select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS - select BR2_PACKAGE_BOOST_REGEX - select BR2_PACKAGE_BOOST_SYSTEM - select BR2_PACKAGE_BOOST_THREAD - select BR2_PACKAGE_LOG4CPP - select BR2_PACKAGE_GMP help - The Vector Optimized Library of Kernels + VOLK is the Vector-Optimized Library of Kernels. It is a + library that contains kernels of hand-written SIMD code + for different mathematical operations. Since each SIMD + architecture can be very different and no compiler has yet + come along to handle vectorization properly or highly + efficiently, VOLK approaches the problem differently. + + For each architecture or platform that a developer wishes + to vectorize for, a new proto-kernel is added to VOLK. At + runtime, VOLK will select the correct proto-kernel. In this + way, the users of VOLK call a kernel for performing the + operation that is platform/architecture agnostic. This + allows us to write portable SIMD code. - https://www.libvolk.org + https://www.libvolk.org/ diff --git a/package/volk/volk.hash b/package/volk/volk.hash new file mode 100644 index 00000000000..4c62c6d3151 --- /dev/null +++ b/package/volk/volk.hash @@ -0,0 +1,4 @@ +# Locally computed +sha256 eff53206cd1ec3314755e0b2bde3c7aaea21dd0f0ad8d753bff07d98e93ddee2 volk-2.5.2.tar.xz +sha256 6dcdafa9e750545f5f65c2e6f53820184822db728ac2b8bfe1d4a47da09ec0d6 COPYING +sha256 258f450f060a161fb9f9e2e7c07c6b1ee73e5142297e6792dc1ee76b028cf0ca COPYING-LGPL diff --git a/package/volk/volk.mk b/package/volk/volk.mk index e5df17aaaf1..af5bd4306b5 100644 --- a/package/volk/volk.mk +++ b/package/volk/volk.mk @@ -4,12 +4,27 @@ # ################################################################################ -VOLK_VERSION = 2.5.0 +VOLK_VERSION = 2.5.2 VOLK_SITE = https://github.com/gnuradio/volk/releases/download/v$(VOLK_VERSION) -VOLK_LICENSE = GPL-3.0+ -VOLK_LICENSE_FILES = COPYING +VOLK_SOURCE = volk-$(VOLK_VERSION).tar.xz +# See https://github.com/gnuradio/volk/tree/v2.5.1#license for some +# details on the licensing. +VOLK_LICENSE = GPL-3.0+, LGPL-3.0+ +VOLK_LICENSE_FILES = COPYING COPYING-LGPL -# For third-party blocks, volk is mandatory at +VOLK_SUPPORTS_IN_SOURCE_BUILD = NO + +# host-python-mako are needed for volk to compile +VOLK_DEPENDENCIES = host-python3 host-python-mako + +VOLK_CONF_OPTS = \ + -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 \ + -DENABLE_MODTOOL=OFF \ + -DENABLE_TESTING=OFF \ + -DENABLE_PROFILING=OFF \ + -DVOLK_PYTHON_DIR=lib/python$(PYTHON3_VERSION_MAJOR)/site-packages + +# For third-party blocks, the volk library is mandatory at # compile time. VOLK_INSTALL_STAGING = YES @@ -17,4 +32,11 @@ ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) VOLK_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic endif +ifeq ($(BR2_PACKAGE_ORC),y) +VOLK_DEPENDENCIES += orc +VOLK_CONF_OPTS += -DENABLE_ORC=ON +else +VOLK_CONF_OPTS += -DENABLE_ORC=OFF +endif + $(eval $(cmake-package)) diff --git a/package/vte/vte.hash b/package/vte/vte.hash index 90818d31f39..8c84dfce1aa 100644 --- a/package/vte/vte.hash +++ b/package/vte/vte.hash @@ -1,4 +1,4 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/vte/0.66/vte-0.66.2.sha256sum +# Hash from: https://download.gnome.org/sources/vte/0.66/vte-0.66.2.sha256sum sha256 e89974673a72a0a06edac6d17830b82bb124decf0cb3b52cebc92ec3ff04d976 vte-0.66.2.tar.xz # Hash for license file: diff --git a/package/vte/vte.mk b/package/vte/vte.mk index ceb2f09d678..a68d96aa120 100644 --- a/package/vte/vte.mk +++ b/package/vte/vte.mk @@ -7,7 +7,7 @@ VTE_VERSION_MAJOR = 0.66 VTE_VERSION = $(VTE_VERSION_MAJOR).2 VTE_SOURCE = vte-$(VTE_VERSION).tar.xz -VTE_SITE = http://ftp.gnome.org/pub/gnome/sources/vte/$(VTE_VERSION_MAJOR) +VTE_SITE = https://download.gnome.org/sources/vte/$(VTE_VERSION_MAJOR) VTE_DEPENDENCIES = host-pkgconf libgtk3 pcre2 $(TARGET_NLS_DEPENDENCIES) VTE_LICENSE = LGPL-3.0+ VTE_LICENSE_FILES = COPYING.LGPL3 diff --git a/package/vtun/vtun.hash b/package/vtun/vtun.hash index 363c980987e..b69b987becb 100644 --- a/package/vtun/vtun.hash +++ b/package/vtun/vtun.hash @@ -1,6 +1,6 @@ # From https://sourceforge.net/projects/vtun/files/vtun/3.0.4/ -md5 f952c5895ae8f40235aaad9a8f41a4bd vtun-3.0.4.tar.gz -sha1 2335c21b56fadf9ce851dd7f342fb0ed4f522c47 vtun-3.0.4.tar.gz +md5 f952c5895ae8f40235aaad9a8f41a4bd vtun-3.0.4.tar.gz +sha1 2335c21b56fadf9ce851dd7f342fb0ed4f522c47 vtun-3.0.4.tar.gz # Locally computed: -sha256 abf8df6b15e3febeaaeae2ce24ead7105eb1537ad4ec0d830c83cbb684fd98b9 vtun-3.0.4.tar.gz -sha256 5692a9a69dc5abc1aa9cbc54899d114b65c4cefbd9d7fcecc304316a2f26ced3 README.OpenSSL +sha256 abf8df6b15e3febeaaeae2ce24ead7105eb1537ad4ec0d830c83cbb684fd98b9 vtun-3.0.4.tar.gz +sha256 5692a9a69dc5abc1aa9cbc54899d114b65c4cefbd9d7fcecc304316a2f26ced3 README.OpenSSL diff --git a/package/vuejs-router/vuejs-router.hash b/package/vuejs-router/vuejs-router.hash index 13ce97d32c1..b48e59ef48b 100644 --- a/package/vuejs-router/vuejs-router.hash +++ b/package/vuejs-router/vuejs-router.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 baf5e9dfb0a1e344f0f460a5cd521e17fd3842386ce36b8e6d53c1053d49cf1e vue-router-4.0.12.tgz -sha256 9c0015250f592a09d7787efc07152afcf661fff6bda2554359f6d00987828c02 LICENSE +sha256 437558a84b99d0d89743d4897ec16a90a96a1d3a6786e697a8808a044bcb9b8f vue-router-4.1.6.tgz +sha256 91a2845c4db44e7497b514b98634a674c737986ad0db81599307cf733bf850b2 LICENSE diff --git a/package/vuejs-router/vuejs-router.mk b/package/vuejs-router/vuejs-router.mk index 9c7dcc76bf7..de7e9c30c51 100644 --- a/package/vuejs-router/vuejs-router.mk +++ b/package/vuejs-router/vuejs-router.mk @@ -4,7 +4,7 @@ # ################################################################################ -VUEJS_ROUTER_VERSION = 4.0.12 +VUEJS_ROUTER_VERSION = 4.1.6 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 9dd0fb548b6..e66bee06d3f 100644 --- a/package/vuejs/vuejs.hash +++ b/package/vuejs/vuejs.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 770ff74851f7454977f084becd76b05b3fad4d52f048df5405d41849c125956c vue-3.2.22.tgz +sha256 968e71a707a4a1961faa6e513b6bba162ef04c3413d7edaba0abc1a5996ae71b vue-3.2.45.tgz sha256 1bb85cc9b13b81ef41c81c51866172fc345e0503c86726a6755b796590b70175 LICENSE diff --git a/package/vuejs/vuejs.mk b/package/vuejs/vuejs.mk index b74002e9328..8f7d0cd3d41 100644 --- a/package/vuejs/vuejs.mk +++ b/package/vuejs/vuejs.mk @@ -4,7 +4,7 @@ # ################################################################################ -VUEJS_VERSION = 3.2.22 +VUEJS_VERSION = 3.2.45 VUEJS_SOURCE = vue-$(VUEJS_VERSION).tgz VUEJS_SITE = https://registry.npmjs.org/vue/- VUEJS_LICENSE = MIT diff --git a/package/waf/waf.hash b/package/waf/waf.hash index 21f47f76d86..c8d464ebfbf 100644 --- a/package/waf/waf.hash +++ b/package/waf/waf.hash @@ -1,7 +1,7 @@ # Locally computed -sha1 89b24f9c19328339c2c8103796755474b66f3a8d waf-2.0.23 -sha256 28a2e4583314a162cfcbffefb8a9202c1d7869040d30b5852da479b76d9c0491 waf-2.0.23 +sha1 9cc6db88ecda57067024f368722ecbf48a3bba1a waf-2.0.24 +sha256 93909bca823a675f9f40af7c65b24887c3a3c0efdf411ff1978ba827194bdeb0 waf-2.0.24 # 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 28a2e4583314a162cfcbffefb8a9202c1d7869040d30b5852da479b76d9c0491 waf +sha256 93909bca823a675f9f40af7c65b24887c3a3c0efdf411ff1978ba827194bdeb0 waf diff --git a/package/waf/waf.mk b/package/waf/waf.mk index 2b1808ace49..d98ab489ca5 100644 --- a/package/waf/waf.mk +++ b/package/waf/waf.mk @@ -4,7 +4,7 @@ # ################################################################################ -WAF_VERSION = 2.0.23 +WAF_VERSION = 2.0.24 WAF_SOURCE = waf-$(WAF_VERSION) WAF_SITE = https://waf.io WAF_LICENSE = BSD-3-Clause diff --git a/package/waffle/0001-cmake-forward-cflags-from-.pc-files-to-waffle-cflags.patch b/package/waffle/0001-cmake-forward-cflags-from-.pc-files-to-waffle-cflags.patch index 126aa93300a..b2a1294f24d 100644 --- a/package/waffle/0001-cmake-forward-cflags-from-.pc-files-to-waffle-cflags.patch +++ b/package/waffle/0001-cmake-forward-cflags-from-.pc-files-to-waffle-cflags.patch @@ -12,6 +12,8 @@ since CFLAGS defined by pc files are not used. EGL_NO_X11 is defined in CFLAGS from egl.pc. Signed-off-by: Romain Naour +[Upstream status: +https://gitlab.freedesktop.org/mesa/waffle/-/merge_requests/111] --- src/waffle/CMakeLists.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/waffle/0002-wayland-fix-build-against-version-1-20.patch b/package/waffle/0002-wayland-fix-build-against-version-1-20.patch new file mode 100644 index 00000000000..d3b66180ec4 --- /dev/null +++ b/package/waffle/0002-wayland-fix-build-against-version-1-20.patch @@ -0,0 +1,59 @@ +From 2c33597245bb74f19104f0a858cd40e80b26991d Mon Sep 17 00:00:00 2001 +From: Philipp Zabel +Date: Fri, 17 Dec 2021 13:46:40 +0100 +Subject: [PATCH] wayland: fix build against version 1.20 + +Wayland 1.20 introduces two new symbols wl_proxy_marshal_flags and +wl_proxy_marshal_array_flags, which need to be wrapped as well. + +Closes: https://gitlab.freedesktop.org/mesa/waffle/-/issues/76 +Signed-off-by: Philipp Zabel +[Retrieved from: +https://gitlab.freedesktop.org/mesa/waffle/-/commit/2c33597245bb74f19104f0a858cd40e80b26991d] +Signed-off-by: Fabrice Fontaine +--- + src/waffle/wayland/wayland_sym.h | 18 ++++++++++++++++++ + src/waffle/wayland/wayland_wrapper.h | 2 ++ + 2 files changed, 20 insertions(+) + +diff --git a/src/waffle/wayland/wayland_sym.h b/src/waffle/wayland/wayland_sym.h +index 3d48625..4c6ac8d 100644 +--- a/src/waffle/wayland/wayland_sym.h ++++ b/src/waffle/wayland/wayland_sym.h +@@ -26,3 +26,21 @@ WAFFLE_WAYLAND_SYM(struct wl_proxy *, wl_proxy_marshal_constructor, + WAFFLE_WAYLAND_SYM(struct wl_proxy *, wl_proxy_marshal_constructor_versioned, + (struct wl_proxy *proxy, uint32_t opcode, + const struct wl_interface *interface, uint32_t version, ...)) ++ ++WAFFLE_WAYLAND_SYM(struct wl_proxy *, ++ wl_proxy_marshal_flags, ++ (struct wl_proxy * p, ++ uint32_t opcode, ++ const struct wl_interface *interface, ++ uint32_t version, ++ uint32_t flags, ++ ...)) ++ ++WAFFLE_WAYLAND_SYM(struct wl_proxy *, ++ wl_proxy_marshal_array_flags, ++ (struct wl_proxy * p, ++ uint32_t opcode, ++ const struct wl_interface *interface, ++ uint32_t version, ++ uint32_t flags, ++ union wl_argument *args)) +diff --git a/src/waffle/wayland/wayland_wrapper.h b/src/waffle/wayland/wayland_wrapper.h +index 4af2f64..6addf4f 100644 +--- a/src/waffle/wayland/wayland_wrapper.h ++++ b/src/waffle/wayland/wayland_wrapper.h +@@ -65,5 +65,7 @@ struct wl_display; + #define wl_proxy_marshal (*wfl_wl_proxy_marshal) + #define wl_proxy_marshal_constructor (*wfl_wl_proxy_marshal_constructor) + #define wl_proxy_marshal_constructor_versioned (*wfl_wl_proxy_marshal_constructor_versioned) ++#define wl_proxy_marshal_flags (*wfl_wl_proxy_marshal_flags) ++#define wl_proxy_marshal_array_flags (*wfl_wl_proxy_marshal_array_flags) + + #include +-- +GitLab + diff --git a/package/waffle/0003-drop-C-dependency.patch b/package/waffle/0003-drop-C-dependency.patch new file mode 100644 index 00000000000..89c0cd09f20 --- /dev/null +++ b/package/waffle/0003-drop-C-dependency.patch @@ -0,0 +1,46 @@ +From a54a5d086c5f7e0751f68ac1a2942d8077922ebc Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 7 Aug 2022 16:18:22 +0200 +Subject: [PATCH] drop C++ dependency + +C++ dependency has been added for nacl backend which has been added by +https://gitlab.freedesktop.org/mesa/waffle/-/commit/6ca943584e593aec2bd4f9c66d91859e63e02d61 +and dropped by +https://gitlab.freedesktop.org/mesa/waffle/-/commit/a7c7152b054e6d2b9af36ed9db9a0df44731b279 + +Signed-off-by: Fabrice Fontaine +[Upstream status: not sent yet] +--- + CMakeLists.txt | 2 +- + src/waffle/CMakeLists.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index acece86..04ea68c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -23,7 +23,7 @@ + # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +-project(waffle1 C CXX) ++project(waffle1 C) + + cmake_minimum_required(VERSION 2.8.12) + +diff --git a/src/waffle/CMakeLists.txt b/src/waffle/CMakeLists.txt +index 8014b51..276f276 100644 +--- a/src/waffle/CMakeLists.txt ++++ b/src/waffle/CMakeLists.txt +@@ -238,7 +238,7 @@ include_directories( + ${XCB_INCLUDE_DIRS} + ) + +-add_library(${waffle_libname} SHARED ${waffle_sources} ${waffle_cxx_sources}) ++add_library(${waffle_libname} SHARED ${waffle_sources}) + + # Debian's packaging system emits warnings if wflinfo directly links to any + # library that it doesn't directly use. Silence the warnings by annotating +-- +2.35.1 + diff --git a/package/waffle/waffle.hash b/package/waffle/waffle.hash index 84821312c11..8968dd6fd36 100644 --- a/package/waffle/waffle.hash +++ b/package/waffle/waffle.hash @@ -1,3 +1,5 @@ +# 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 234e65bdd2dd8f7d3bc8e9ad1a7cc80fce78a1deed3a04fe7f1d2c2edac0cd8a waffle-v1.6.1.tar.bz2 sha256 630844d1911c8a1b7b888a1de9097c4860b7e381362fd5aa64141d58ab7ecc9b LICENSE.txt diff --git a/package/waffle/waffle.mk b/package/waffle/waffle.mk index 3340dc1c609..87d44c4217b 100644 --- a/package/waffle/waffle.mk +++ b/package/waffle/waffle.mk @@ -4,9 +4,9 @@ # ################################################################################ -WAFFLE_VERSION = 1.6.1 -WAFFLE_SOURCE = waffle-v$(WAFFLE_VERSION).tar.bz2 -WAFFLE_SITE = https://gitlab.freedesktop.org/mesa/waffle/-/archive/v$(WAFFLE_VERSION) +WAFFLE_VERSION = 1.7.0 +WAFFLE_SOURCE = waffle-$(WAFFLE_VERSION).tar.xz +WAFFLE_SITE = https://gitlab.freedesktop.org/mesa/waffle/uploads/9eaadda4ec2ed1d8a26ddefd2cfd16be WAFFLE_INSTALL_STAGING = YES WAFFLE_LICENSE = BSD-2-Clause WAFFLE_LICENSE_FILES = LICENSE.txt diff --git a/package/watchdogd/watchdogd.hash b/package/watchdogd/watchdogd.hash index 09a34d6b470..4ff1a3485b9 100644 --- a/package/watchdogd/watchdogd.hash +++ b/package/watchdogd/watchdogd.hash @@ -1,5 +1,5 @@ # Upstream .sha256 from GitHub -sha256 33ec4edc8cb4ada7a4d8324a27d897d33aae5e83257ed64d3d37508825c11237 watchdogd-3.5.tar.gz +sha256 33ec4edc8cb4ada7a4d8324a27d897d33aae5e83257ed64d3d37508825c11237 watchdogd-3.5.tar.gz # Locally calculated -sha256 fd685e20931174308c45a26418a7ce34d66704c4e4b92ab1d8299deb255cd676 LICENSE +sha256 fd685e20931174308c45a26418a7ce34d66704c4e4b92ab1d8299deb255cd676 LICENSE diff --git a/package/watchdogd/watchdogd.mk b/package/watchdogd/watchdogd.mk index 1a9d04d9384..ea033b4e715 100644 --- a/package/watchdogd/watchdogd.mk +++ b/package/watchdogd/watchdogd.mk @@ -9,6 +9,7 @@ WATCHDOGD_SITE = https://github.com/troglobit/watchdogd/releases/download/$(WATC WATCHDOGD_LICENSE = ISC WATCHDOGD_LICENSE_FILES = LICENSE WATCHDOGD_CPE_ID_VENDOR = troglobit +WATCHDOGD_INSTALL_STAGING = YES WATCHDOGD_DEPENDENCIES = host-pkgconf libconfuse libite libuev WATCHDOGD_CONF_OPTS = --disable-compat --disable-examples --disable-test-mode WATCHDOGD_SELINUX_MODULES = watchdog diff --git a/package/wavemon/0001-iw_if.h-don-t-include-linux-if.h.patch b/package/wavemon/0001-iw_if.h-don-t-include-linux-if.h.patch new file mode 100644 index 00000000000..95f54e4b7ff --- /dev/null +++ b/package/wavemon/0001-iw_if.h-don-t-include-linux-if.h.patch @@ -0,0 +1,41 @@ +From 4ac1482bb40376e47805c3737dfed60abb1dd3b4 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 22 Dec 2021 00:39:35 +0100 +Subject: [PATCH] iw_if.h: don't include linux/if.h (#109) + +Don't include linux/if.h to avoid the following build failure: + +In file included from iw_if.h:31:0, + from conf.c:19: +/home/buildroot/autobuild/instance-3/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/include/linux/if.h: At top level: +/home/buildroot/autobuild/instance-3/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/include/linux/if.h:143:8: error: redefinition of 'struct ifmap' + struct ifmap { + ^ +In file included from iw_if.h:26:0, + from conf.c:19: +/home/buildroot/autobuild/instance-3/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/include/net/if.h:111:8: note: originally defined here + struct ifmap + ^ + +Fixes: + - http://autobuild.buildroot.org/results/a6ee162cf04b70b144b54e1ca4b7b2421071c50c + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/uoaerg/wavemon/commit/4ac1482bb40376e47805c3737dfed60abb1dd3b4] +--- + iw_if.h | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/iw_if.h b/iw_if.h +index 9e7fa89..6607e0b 100644 +--- a/iw_if.h ++++ b/iw_if.h +@@ -28,7 +28,6 @@ + #include + #include + #include +-#include + + /* Definitions from linux/ieee80211.h (not necessarily part of distro headers) */ + #define WLAN_CAPABILITY_ESS (1<<0) diff --git a/package/wavpack/wavpack.hash b/package/wavpack/wavpack.hash index abc9ab69059..021703df74d 100644 --- a/package/wavpack/wavpack.hash +++ b/package/wavpack/wavpack.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 4bde6a6b2a86614a6bd2579e60dcc974e2c8f93608d2281110a717c1b3c28b79 wavpack-5.4.0.tar.xz -sha256 f38defde000d62c4ff158f1445cb85a0c2f67cbc1d3cfa34ed882f439f6e3b43 COPYING +sha256 ef749d98df46925bc2916993e601cc7ee9114d99653e63e0e304f031ba73b8e6 wavpack-5.5.0.tar.xz +sha256 275d65ec11a78d552d078b9c26d950e3075892bca895a415ceaaec33bcfabff9 COPYING diff --git a/package/wavpack/wavpack.mk b/package/wavpack/wavpack.mk index 485ab9b2ae4..a3d952e29b0 100644 --- a/package/wavpack/wavpack.mk +++ b/package/wavpack/wavpack.mk @@ -4,7 +4,7 @@ # ################################################################################ -WAVPACK_VERSION = 5.4.0 +WAVPACK_VERSION = 5.5.0 WAVPACK_SITE = \ https://github.com/dbry/WavPack/releases/download/$(WAVPACK_VERSION) WAVPACK_SOURCE = wavpack-$(WAVPACK_VERSION).tar.xz diff --git a/package/wayland-protocols/wayland-protocols.hash b/package/wayland-protocols/wayland-protocols.hash index 1262f0f9d70..45c62a396b7 100644 --- a/package/wayland-protocols/wayland-protocols.hash +++ b/package/wayland-protocols/wayland-protocols.hash @@ -1,5 +1,4 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2022-January/042102.html -md5 0c192bf32de09ec30de4a82d1c65329c wayland-protocols-1.25.tar.xz -sha1 275298332d124e40e345aa82bc8f48ef8cad3480 wayland-protocols-1.25.tar.xz -sha256 f1ff0f7199d0a0da337217dd8c99979967808dc37731a1e759e822b75b571460 wayland-protocols-1.25.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2022-November/042524.html +sha256 a07fa722ed87676ec020d867714bc9a2f24c464da73912f39706eeef5219e238 wayland-protocols-1.31.tar.xz +sha512 402ce1915300e29afe554d77965ee0a28a5f22fdb5b901c4c640e59b9f3a9c11094e1edae87eea1e76eea557f6faf0c34a0c28ee7f6babb4dc3719329c4e25bf wayland-protocols-1.31.tar.xz sha256 f1a2b233e8a9a71c40f4aa885be08a0842ac85bb8588703c1dd7e6e6502e3124 COPYING diff --git a/package/wayland-protocols/wayland-protocols.mk b/package/wayland-protocols/wayland-protocols.mk index 746d82e3082..54f9ed8a3a6 100644 --- a/package/wayland-protocols/wayland-protocols.mk +++ b/package/wayland-protocols/wayland-protocols.mk @@ -4,8 +4,8 @@ # ################################################################################ -WAYLAND_PROTOCOLS_VERSION = 1.25 -WAYLAND_PROTOCOLS_SITE = https://wayland.freedesktop.org/releases +WAYLAND_PROTOCOLS_VERSION = 1.31 +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 diff --git a/package/wayland-utils/0001-wayland-info-Fix-build-without-libdrm.patch b/package/wayland-utils/0001-wayland-info-Fix-build-without-libdrm.patch new file mode 100644 index 00000000000..2d4591f785a --- /dev/null +++ b/package/wayland-utils/0001-wayland-info-Fix-build-without-libdrm.patch @@ -0,0 +1,46 @@ +From 3657a11d45f133776b50c716d99f37965eb07ed1 Mon Sep 17 00:00:00 2001 +From: Olivier Fourdan +Date: Wed, 14 Sep 2022 09:07:10 +0200 +Subject: [PATCH] wayland-info: Fix build without libdrm + +wayland-info can optionally use libdrm to provide a description of the +dmabuf format modifiers. + +When not using libdrm however, the build fails because "dev_t" is not +defined. + +The definition of "dev_t" comes from which is included +from , which is not included without libdrm support, hence the +build failure. + +Simply include unconditionally to make sure "dev_t" is +defined regardless of libdrm support, to fix the build failure. + +Closes: https://gitlab.freedesktop.org/wayland/wayland-utils/-/issues/6 +Signed-off-by: Olivier Fourdan +Fixes: 240cb739 - "Add support for linux_dmabuf version 4" +Reviewed-by: Simon Ser +Reviewed-by: Pekka Paalanen +(cherry picked from commit baa65ba9f62e6a05c32b9202b524158a21f24245) +Signed-off-by: James Hilliard +[james.hilliard1@gmail.com: backport from upstream commit +3657a11d45f133776b50c716d99f37965eb07ed1] +--- + wayland-info/wayland-info.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/wayland-info/wayland-info.c b/wayland-info/wayland-info.c +index 53cd04b..98ff205 100644 +--- a/wayland-info/wayland-info.c ++++ b/wayland-info/wayland-info.c +@@ -34,6 +34,7 @@ + #include + #include + #include ++#include + + #include + #if HAVE_HUMAN_FORMAT_MODIFIER +-- +2.34.1 + diff --git a/package/wayland-utils/wayland-utils.hash b/package/wayland-utils/wayland-utils.hash index 00b6da4033b..c9b16e05350 100644 --- a/package/wayland-utils/wayland-utils.hash +++ b/package/wayland-utils/wayland-utils.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2020-July/041565.html -md5 714875aefb10e7f683cde24e58d033ad wayland-utils-1.0.0.tar.xz -sha1 b5b8d498a892866d56ffbe862039d7c97acbe7bc wayland-utils-1.0.0.tar.xz -sha256 64fecc4c58e87ae9b302901abe10c2e8af69c7503c221a96ecd0700e0aa268c0 wayland-utils-1.0.0.tar.xz -sha512 4c6f1822435b36b3acd361c0c54e56150e8a2697a9c4b2c20a149fcfaafe237e45807df3471884ddf594d89558001099e2d938e3f48988ba6950a0f1e3538db2 wayland-utils-1.0.0.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2022-September/042399.html +md5 1a398cbb75c3ac1ac231b2a8f84bd6d6 wayland-utils-1.1.0.tar.xz +sha1 38e5c37f5b35b86a84289659b4b0796811eb66cd wayland-utils-1.1.0.tar.xz +sha256 9e685863025b4feade36d53bbc8e31b43e26498be743dea84c7a84912959410a wayland-utils-1.1.0.tar.xz +sha512 5b841ecb9b534a9b353e104dda9410961495495380fa65e32ef40855750609b03942a87c2fd66339aab57c05b3b8699e2bee055cfd44151f9609a5f6c53349df wayland-utils-1.1.0.tar.xz sha256 1eba39c11640014a5841dd3017e5245fc31f47e1cf43a3287a286dd6a8de8a1a COPYING diff --git a/package/wayland-utils/wayland-utils.mk b/package/wayland-utils/wayland-utils.mk index 30a33b61d6c..bc648a69040 100644 --- a/package/wayland-utils/wayland-utils.mk +++ b/package/wayland-utils/wayland-utils.mk @@ -4,11 +4,18 @@ # ################################################################################ -WAYLAND_UTILS_VERSION = 1.0.0 -WAYLAND_UTILS_SITE = https://wayland.freedesktop.org/releases +WAYLAND_UTILS_VERSION = 1.1.0 +WAYLAND_UTILS_SITE = https://gitlab.freedesktop.org/wayland/wayland-utils/-/releases/$(WAYLAND_UTILS_VERSION)/downloads WAYLAND_UTILS_SOURCE = wayland-utils-$(WAYLAND_UTILS_VERSION).tar.xz WAYLAND_UTILS_LICENSE = MIT WAYLAND_UTILS_LICENSE_FILES = COPYING WAYLAND_UTILS_DEPENDENCIES = host-pkgconf wayland wayland-protocols +ifeq ($(BR2_PACKAGE_LIBDRM),y) +WAYLAND_UTILS_DEPENDENCIES += libdrm +WAYLAND_UTILS_CONF_OPTS += -Ddrm=enabled +else +WAYLAND_UTILS_CONF_OPTS += -Ddrm=disabled +endif + $(eval $(meson-package)) diff --git a/package/wayland/0001-build-add-option-to-disable-tests.patch b/package/wayland/0001-build-add-option-to-disable-tests.patch deleted file mode 100644 index 5ecf100d647..00000000000 --- a/package/wayland/0001-build-add-option-to-disable-tests.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 88f1605a826ca0c2ff02be6f4cf9ecabf68e8341 Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Tue, 3 Mar 2020 15:27:51 -0700 -Subject: [PATCH] build: add option to disable tests - -When building for a product, tests are not needed. - -Besides, one test requires a C++ compiler, which is not always -available. - -So, add an option to configure to disable building tests altogether. - -Signed-off-by: "Yann E. MORIN" -Signed-off-by: Alexey Brodkin -Signed-off-by: James Hilliard -[Upstream status: -https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/66] -Signed-off-by: Adrian Perez de Castro -[yann.morin.1998@free.fr: backport from upstream] -Signed-off-by: Yann E. MORIN ---- - meson.build | 4 +++- - meson_options.txt | 4 ++++ - 2 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index cdb66bc..714a86d 100644 ---- a/meson.build -+++ b/meson.build -@@ -84,7 +84,9 @@ subdir('src') - if get_option('libraries') - subdir('cursor') - subdir('egl') -- subdir('tests') -+ if get_option('tests') -+ subdir('tests') -+ endif - if get_option('documentation') - subdir('doc') - endif -diff --git a/meson_options.txt b/meson_options.txt -index de588d1..4433fa0 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -6,6 +6,10 @@ option('scanner', - description: 'Compile wayland-scanner binary', - type: 'boolean', - value: 'true') -+option('tests', -+ description: 'Compile Wayland tests', -+ type: 'boolean', -+ value: 'true') - option('documentation', - description: 'Build the documentation (requires Doxygen, dot, xmlto, xsltproc)', - type: 'boolean', --- -2.25.1 - diff --git a/package/wayland/0002-meson-only-require-cpp-for-tests.patch b/package/wayland/0002-meson-only-require-cpp-for-tests.patch deleted file mode 100644 index 84d0e4cf6f4..00000000000 --- a/package/wayland/0002-meson-only-require-cpp-for-tests.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 4c2105312379b62dc84f6eaaf26e2ab293d51b92 Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Fri, 16 Apr 2021 02:32:38 -0600 -Subject: [PATCH] meson: only require cpp for tests - -Signed-off-by: James Hilliard -[Upstream status: -https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/130] -Signed-off-by: Adrian Perez de Castro -[yann.morin.1998@free.fr: backport from upstream] -Signed-off-by: Yann E. MORIN ---- - meson.build | 2 +- - tests/meson.build | 16 +++++++++------- - 2 files changed, 10 insertions(+), 8 deletions(-) - -diff --git a/meson.build b/meson.build -index 12b4641..cdb66bc 100644 ---- a/meson.build -+++ b/meson.build -@@ -1,5 +1,5 @@ - project( -- 'wayland', 'c', 'cpp', -+ 'wayland', 'c', - version: '1.19.0', - license: 'MIT', - meson_version: '>= 0.52.1', -diff --git a/tests/meson.build b/tests/meson.build -index a32ac50..2e11af4 100644 ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -64,15 +64,17 @@ executable( - dependencies: test_runner_dep - ) - --test( -- 'cpp-compile-test', -- executable( -+if add_languages('cpp') -+ test( - 'cpp-compile-test', -- 'cpp-compile-test.cpp', -- wayland_server_protocol_h, -- include_directories: src_inc -+ executable( -+ 'cpp-compile-test', -+ 'cpp-compile-test.cpp', -+ wayland_server_protocol_h, -+ include_directories: src_inc -+ ) - ) --) -+endif - - sed_path = find_program('sed').path() - --- -2.31.1 - diff --git a/package/wayland/wayland.hash b/package/wayland/wayland.hash index e9dcb63a90a..1c7fe705e16 100644 --- a/package/wayland/wayland.hash +++ b/package/wayland/wayland.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2021-January/041692.html -sha256 baccd902300d354581cd5ad3cc49daa4921d55fb416a5883e218750fef166d15 wayland-1.19.0.tar.xz -sha512 d8a86f5e23e4a88e7c84b82fdb51eb350419086afe462ecb2f4d5c3ba9290ede310cbbcffd60215219ddccf5bad4adec21a5ebfbef6577200f66ac7a1b64a5ef wayland-1.19.0.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2022-June/042268.html +sha256 6dc64d7fc16837a693a51cfdb2e568db538bfdc9f457d4656285bb9594ef11ac wayland-1.21.0.tar.xz +sha512 5575216d30fdf5c63caa6bcad071e15f2a4f3acb12df776806073f65db37a50b5b5b3cc7957c5497636f4ac01893e2eaab26e453ded44b287acde01762f5fdc3 wayland-1.21.0.tar.xz # Locally calculated sha256 6eefcb023622a463168a5c20add95fd24a38c7482622a9254a23b99b7c153061 COPYING diff --git a/package/wayland/wayland.mk b/package/wayland/wayland.mk index ecfe95d68a3..0a6e5e9ec77 100644 --- a/package/wayland/wayland.mk +++ b/package/wayland/wayland.mk @@ -4,8 +4,8 @@ # ################################################################################ -WAYLAND_VERSION = 1.19.0 -WAYLAND_SITE = https://wayland.freedesktop.org/releases +WAYLAND_VERSION = 1.21.0 +WAYLAND_SITE = https://gitlab.freedesktop.org/wayland/wayland/-/releases/$(WAYLAND_VERSION)/downloads WAYLAND_SOURCE = wayland-$(WAYLAND_VERSION).tar.xz WAYLAND_LICENSE = MIT WAYLAND_LICENSE_FILES = COPYING diff --git a/package/webkitgtk/0001-Fix-build-failure-when-gstreamer-support-is-disabled.patch b/package/webkitgtk/0001-Fix-build-failure-when-gstreamer-support-is-disabled.patch new file mode 100644 index 00000000000..3fa23b215bd --- /dev/null +++ b/package/webkitgtk/0001-Fix-build-failure-when-gstreamer-support-is-disabled.patch @@ -0,0 +1,36 @@ +From 9b31965cdf362768e86f7e592e59e68fb3351261 Mon Sep 17 00:00:00 2001 +From: Matt Turner +Date: Tue, 8 Aug 2023 16:51:25 -0700 +Subject: [PATCH] Fix build failure when gstreamer support is disabled + https://bugs.webkit.org/show_bug.cgi?id=259931 https://bugs.gentoo.org/911663 + +Reviewed by Carlos Alberto Lopez Perez. + +* Source/WebCore/loader/MixedContentChecker.cpp: + +Canonical link: https://commits.webkit.org/260527.429@fix-build + +(cherry picked from commit f5ceef5bf2e3c4d7203a37b9e2d2fdd9b1bb2732) + +Upstream: https://github.com/WebKit/WebKit/commit/f5ceef5bf2e3c4d7203a37b9e2d2fdd9b1bb2732 +Signed-off-by: Thomas Devoogdt +--- + Source/WebCore/loader/MixedContentChecker.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Source/WebCore/loader/MixedContentChecker.cpp b/Source/WebCore/loader/MixedContentChecker.cpp +index 9b4c7fe62020..ac4733bc08bc 100644 +--- a/Source/WebCore/loader/MixedContentChecker.cpp ++++ b/Source/WebCore/loader/MixedContentChecker.cpp +@@ -33,6 +33,8 @@ + #include "ContentSecurityPolicy.h" + #include "Document.h" + #include "Frame.h" ++#include "FrameLoader.h" ++#include "FrameLoaderClient.h" + #include "SecurityOrigin.h" + + namespace WebCore { +-- +2.42.0 + diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in index bc8207d93b6..23c0bf41db8 100644 --- a/package/webkitgtk/Config.in +++ b/package/webkitgtk/Config.in @@ -7,17 +7,21 @@ config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS # Disabled on MIPS big endian due to sigbus default y if BR2_mipsel || BR2_mips64el # Disabled on PowerPC pending runtime testing + # RISC-V needs the g/imafd ISA. + default y if BR2_riscv && BR2_RISCV_ISA_RVI \ + && BR2_RISCV_ISA_RVM && BR2_RISCV_ISA_RVA \ + && BR2_RISCV_ISA_RVF && BR2_RISCV_ISA_RVD # Disabled on SuperH because of segfault depends on BR2_USE_MMU # libglib2 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 >= 7, host gcc >= 4.9" +comment "webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 8, 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_7 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_8 || \ !BR2_HOST_GCC_AT_LEAST_4_9 depends on BR2_USE_MMU @@ -28,7 +32,7 @@ config BR2_PACKAGE_WEBKITGTK 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, libsoup - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 depends on BR2_USE_WCHAR # icu, libsoup depends on BR2_PACKAGE_LIBGTK3 depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS @@ -91,17 +95,19 @@ config BR2_PACKAGE_WEBKITGTK_MULTIMEDIA bool "multimedia support" select BR2_PACKAGE_GSTREAMER1 select BR2_PACKAGE_GST1_PLUGINS_BAD + select BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DEBUGUTILS select BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGTSDEMUX + select BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SUBENC select BR2_PACKAGE_GST1_PLUGINS_BASE select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ALSA select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_APP select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOCONVERT select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORESAMPLE select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PLAYBACK - select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT - select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERTSCALE select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME select BR2_PACKAGE_GST1_PLUGINS_GOOD + select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUDIOFX select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUTODETECT select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ISOMP4 select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MATROSKA diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash index 82c210c8f90..7f50f1aa7b2 100644 --- a/package/webkitgtk/webkitgtk.hash +++ b/package/webkitgtk/webkitgtk.hash @@ -1,7 +1,6 @@ -# From https://webkitgtk.org/releases/webkitgtk-2.34.6.tar.xz.sums -md5 a5eeedd02f5b4bba8bd891b92dc743d4 webkitgtk-2.34.6.tar.xz -sha1 bb82517289baf9c858fa406d1d845274f81e25cb webkitgtk-2.34.6.tar.xz -sha256 6bc8fd034aad0432a2459ce4fc7ee25ad65a4924c618bf8d93b52b0c1a84c1f6 webkitgtk-2.34.6.tar.xz +# From https://www.webkitgtk.org/releases/webkitgtk-2.40.5.tar.xz.sums +sha1 2f4d06b021115eb4106177f7d5f534f45b5d3b2e webkitgtk-2.40.5.tar.xz +sha256 7de051a263668621d91a61a5eb1c3771d1a7cec900043d4afef06c326c16037f webkitgtk-2.40.5.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 36e4b8943b3..d5e983e4033 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.34.6 +WEBKITGTK_VERSION = 2.40.5 WEBKITGTK_SITE = https://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES @@ -13,23 +13,22 @@ WEBKITGTK_LICENSE_FILES = \ Source/WebCore/LICENSE-APPLE \ Source/WebCore/LICENSE-LGPL-2.1 WEBKITGTK_CPE_ID_VENDOR = webkitgtk -WEBKITGTK_DEPENDENCIES = host-ruby host-python3 host-gperf \ +WEBKITGTK_DEPENDENCIES = host-ruby host-python3 host-gperf host-unifdef \ enchant harfbuzz icu jpeg libgcrypt libgtk3 libsecret libsoup \ libtasn1 libxml2 libxslt openjpeg sqlite webp woff2 WEBKITGTK_CONF_OPTS = \ -DENABLE_API_TESTS=OFF \ - -DENABLE_GAMEPAD=OFF \ + -DENABLE_DOCUMENTATION=OFF \ -DENABLE_GEOLOCATION=OFF \ - -DENABLE_GTKDOC=OFF \ -DENABLE_MINIBROWSER=ON \ -DENABLE_SPELLCHECK=ON \ + -DENABLE_WEB_RTC=OFF \ -DPORT=GTK \ - -DUSE_LIBNOTIFY=OFF \ + -DUSE_AVIF=OFF \ -DUSE_LIBHYPHEN=OFF \ -DUSE_OPENJPEG=ON \ -DUSE_SOUP2=ON \ - -DUSE_WOFF2=ON \ - -DUSE_WPE_RENDERER=OFF + -DUSE_WOFF2=ON ifeq ($(BR2_PACKAGE_WEBKITGTK_SANDBOX),y) WEBKITGTK_CONF_OPTS += \ @@ -72,6 +71,13 @@ else WEBKITGTK_CONF_OPTS += -DENABLE_INTROSPECTION=OFF endif +ifeq ($(BR2_PACKAGE_LIBMANETTE),y) +WEBKITGTK_CONF_OPTS += -DENABLE_GAMEPAD=ON +WEBKITGTK_DEPENDENCIES += libmanette +else +WEBKITGTK_CONF_OPTS += -DENABLE_GAMEPAD=OFF +endif + # Only one target platform can be built, assume X11 > Wayland # GTK3-X11 target gives OpenGL from newer libgtk3 versions @@ -79,18 +85,10 @@ endif # 2D CANVAS acceleration requires OpenGL proper with cairo-gl ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) WEBKITGTK_CONF_OPTS += \ - -DENABLE_ACCELERATED_2D_CANVAS=ON \ -DENABLE_GLES2=OFF \ -DENABLE_X11_TARGET=ON WEBKITGTK_DEPENDENCIES += libgl \ xlib_libXcomposite xlib_libXdamage xlib_libXrender xlib_libXt -# It can use libgtk2 for npapi plugins -ifeq ($(BR2_PACKAGE_LIBGTK2),y) -WEBKITGTK_CONF_OPTS += -DENABLE_PLUGIN_PROCESS_GTK2=ON -WEBKITGTK_DEPENDENCIES += libgtk2 -else -WEBKITGTK_CONF_OPTS += -DENABLE_PLUGIN_PROCESS_GTK2=OFF -endif else # !X11 # GTK3-BROADWAY/WAYLAND needs at least EGL WEBKITGTK_DEPENDENCIES += libegl @@ -108,6 +106,13 @@ WEBKITGTK_CONF_OPTS += -DENABLE_WAYLAND_TARGET=ON endif endif +ifeq ($(BR2_PACKAGE_LIBGTK3_WAYLAND)$(BR2_PACKAGE_WPEBACKEND_FDO),yy) +WEBKITGTK_CONF_OPTS += -DUSE_WPE_RENDERER=ON +WEBKITGTK_DEPENDENCIES += wpebackend-fdo +else +WEBKITGTK_CONF_OPTS += -DUSE_WPE_RENDERER=OFF +endif + ifeq ($(BR2_PACKAGE_WEBKITGTK_USE_GSTREAMER_GL),y) WEBKITGTK_CONF_OPTS += -DUSE_GSTREAMER_GL=ON else @@ -115,10 +120,10 @@ WEBKITGTK_CONF_OPTS += -DUSE_GSTREAMER_GL=OFF endif ifeq ($(BR2_INIT_SYSTEMD),y) -WEBKITGTK_CONF_OPTS += -DUSE_SYSTEMD=ON +WEBKITGTK_CONF_OPTS += -DENABLE_JOURNALD_LOG=ON WEBKITGTK_DEPENDENCIES += systemd else -WEBKITGTK_CONF_OPTS += -DUSE_SYSTEMD=OFF +WEBKITGTK_CONF_OPTS += -DENABLE_JOURNALD_LOG=OFF endif # JIT is not supported for MIPS r6, but the WebKit build system does not @@ -135,4 +140,23 @@ ifeq ($(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV6)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS WEBKITGTK_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON -DENABLE_SAMPLING_PROFILER=OFF endif +# webkitgtk needs cmake >= 3.20 when not building with ninja, which is +# above our minimal version in +# support/dependencies/check-host-cmake.mk, so use the ninja backend: +# https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f +WEBKITGTK_CONF_OPTS += -GNinja +WEBKITGTK_DEPENDENCIES += host-ninja + +define WEBKITGTK_BUILD_CMDS + $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(WEBKITGTK_BUILDDIR) +endef + +define WEBKITGTK_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(WEBKITGTK_BUILDDIR) +endef + +define WEBKITGTK_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(WEBKITGTK_BUILDDIR) +endef + $(eval $(cmake-package)) diff --git a/package/webp/webp.hash b/package/webp/webp.hash index cf7b1dc9de3..adc543059b6 100644 --- a/package/webp/webp.hash +++ b/package/webp/webp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 808b98d2f5b84e9b27fdef6c5372dac769c3bda4502febbfa5031bd3c4d7d018 libwebp-1.2.1.tar.gz +sha256 2a499607df669e40258e53d0ade8035ba4ec0175244869d1025d460562aa09b4 libwebp-1.3.2.tar.gz sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf COPYING diff --git a/package/webp/webp.mk b/package/webp/webp.mk index f23e1c92e18..33cb4bd5072 100644 --- a/package/webp/webp.mk +++ b/package/webp/webp.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBP_VERSION = 1.2.1 +WEBP_VERSION = 1.3.2 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/webrtc-audio-processing.hash b/package/webrtc-audio-processing/webrtc-audio-processing.hash index 1376054f208..18b8ea6410a 100644 --- a/package/webrtc-audio-processing/webrtc-audio-processing.hash +++ b/package/webrtc-audio-processing/webrtc-audio-processing.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a0fdd938fd85272d67e81572c5a4d9e200a0c104753cb3c209ded175ce3c5dbf webrtc-audio-processing-0.3.1.tar.xz -sha256 9b79539028e216e813e152d45f5c1ed5fdd0554426ad50270fb03134e7082dac COPYING +sha256 a0fdd938fd85272d67e81572c5a4d9e200a0c104753cb3c209ded175ce3c5dbf webrtc-audio-processing-0.3.1.tar.xz +sha256 9b79539028e216e813e152d45f5c1ed5fdd0554426ad50270fb03134e7082dac COPYING diff --git a/package/weston/Config.in b/package/weston/Config.in index 6ad8241caae..d5dbf27bbd2 100644 --- a/package/weston/Config.in +++ b/package/weston/Config.in @@ -109,16 +109,28 @@ comment "X11 (nested) compositor needs X.org enabled" config BR2_PACKAGE_WESTON_XWAYLAND bool "XWayland support" - depends on BR2_PACKAGE_XORG7 depends on BR2_PACKAGE_LIBEPOXY + depends on BR2_PACKAGE_XORG7 # xwayland + depends on BR2_USE_MMU # xwayland + depends on !BR2_STATIC_LIBS # xwayland + depends on BR2_TOOLCHAIN_HAS_THREADS # xwayland + depends on !BR2_RISCV_32 # xwayland -> xlib_libxshmfence + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # xwayland -> xlib_libxshmfence select BR2_PACKAGE_CAIRO select BR2_PACKAGE_LIBXCB select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXCURSOR + select BR2_PACKAGE_XWAYLAND comment "XWayland support needs libepoxy and X.org enabled" depends on !BR2_PACKAGE_XORG7 || !BR2_PACKAGE_LIBEPOXY +comment "XWayland support needs a toolchain w/ threads, dynamic library" + depends on BR2_USE_MMU + depends on !BR2_RISCV_32 + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + # Weston needs at least one shell; this can be one of the bundled ones, # below, of from a third-party package, which should then select this. config BR2_PACKAGE_WESTON_HAS_SHELL @@ -147,6 +159,7 @@ config BR2_PACKAGE_WESTON_DEMO_CLIENTS bool "demo clients" depends on BR2_USE_MMU # pango depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango depends on BR2_INSTALL_LIBSTDCPP # pango depends on BR2_TOOLCHAIN_HAS_THREADS # pango depends on BR2_USE_WCHAR # pango @@ -156,11 +169,11 @@ config BR2_PACKAGE_WESTON_DEMO_CLIENTS help This enables the installation of Weston's demo clients. -comment "demo clients needs an OpenGL ES provider, an OpenEGL-capable Wayland backend and a toolchain w/ wchar, threads, C++" +comment "demo clients needs an OpenGL ES provider, an OpenEGL-capable Wayland backend 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_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_USE_WCHAR || !BR2_PACKAGE_HAS_LIBGLES || \ - !BR2_PACKAGE_HAS_LIBEGL_WAYLAND + !BR2_PACKAGE_HAS_LIBEGL_WAYLAND || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 endif diff --git a/package/weston/weston.hash b/package/weston/weston.hash index b78a7c75508..d58ca1ef70b 100644 --- a/package/weston/weston.hash +++ b/package/weston/weston.hash @@ -1,6 +1,4 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2022-February/042103.html -md5 bc4abe2ee6904a4890a0c641c6257f91 weston-10.0.0.tar.xz -sha1 b1a51e3bb7ee1d75bbf728c8071771e07fc97fdd weston-10.0.0.tar.xz -sha256 5c23964112b90238bed39e5dd1e41cd71a79398813cdc3bbb15a9fdc94e547ae weston-10.0.0.tar.xz -sha512 77e05530751e4f743eebf015ab5b78a1fcc66b774713b5e296cfffc488be84e459f811c85ac4280b7b63eebf4ff5c958dd7306376ab343e6b80feae16c8c35a4 weston-10.0.0.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2022-June/042260.html +sha256 8a9e52506a865a7410981b04f8341b89b84106db8531ab1f9fdd37b5dc034115 weston-10.0.1.tar.xz +sha512 688d843096a95b463161b98e85ca3443b31ba2ee49fc8d456a2780cc96f576e9d097054e9f361997a66e9cc8373cf29e406a742dae3884b3b50b26acf1710c8c weston-10.0.1.tar.xz sha256 fdb65868f65d0fbdb05c2d3b779e10ce9969fa0c4b9262ba4f260e87086ab860 COPYING diff --git a/package/weston/weston.mk b/package/weston/weston.mk index 90cf160688c..01f84178b29 100644 --- a/package/weston/weston.mk +++ b/package/weston/weston.mk @@ -4,12 +4,13 @@ # ################################################################################ -WESTON_VERSION = 10.0.0 -WESTON_SITE = https://wayland.freedesktop.org/releases +WESTON_VERSION = 10.0.1 +WESTON_SITE = https://gitlab.freedesktop.org/wayland/weston/-/releases/$(WESTON_VERSION)/downloads WESTON_SOURCE = weston-$(WESTON_VERSION).tar.xz WESTON_LICENSE = MIT WESTON_LICENSE_FILES = COPYING WESTON_CPE_ID_VENDOR = wayland +WESTON_INSTALL_STAGING = YES WESTON_DEPENDENCIES = host-pkgconf wayland wayland-protocols \ libxkbcommon pixman libpng udev cairo libinput libdrm @@ -35,6 +36,13 @@ else WESTON_CONF_OPTS += -Dlauncher-logind=false endif +ifeq ($(BR2_PACKAGE_SEATD),y) +WESTON_CONF_OPTS += -Dlauncher-libseat=true +WESTON_DEPENDENCIES += seatd +else +WESTON_CONF_OPTS += -Dlauncher-libseat=false +endif + ifeq ($(BR2_PACKAGE_JPEG),y) WESTON_CONF_OPTS += -Dimage-jpeg=true WESTON_DEPENDENCIES += jpeg @@ -115,7 +123,7 @@ WESTON_CONF_OPTS += -Dbackend-default=$(call qstrip,$(BR2_PACKAGE_WESTON_DEFAULT ifeq ($(BR2_PACKAGE_WESTON_XWAYLAND),y) WESTON_CONF_OPTS += -Dxwayland=true -WESTON_DEPENDENCIES += cairo libepoxy libxcb xlib_libX11 xlib_libXcursor +WESTON_DEPENDENCIES += cairo libepoxy libxcb xlib_libX11 xlib_libXcursor xwayland else WESTON_CONF_OPTS += -Dxwayland=false endif diff --git a/package/wf111/wf111.hash b/package/wf111/wf111.hash index e3a5c484f7e..604ce79ef02 100644 --- a/package/wf111/wf111.hash +++ b/package/wf111/wf111.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 33de265d28702ce32bb292f29a43e9e946382a1e31f1e4feae0f4753cf18b4f4 wf111-linux-driver_5.2.2-r4_armv7-a.tar.gz -sha256 fbe86a30e4025b9f510feb4cb8f846aca82f8f3e8f6c8a28a74baf45c87f6e96 wf111-linux-driver_5.2.2-r4_armv5te.tar.gz -sha256 37983d73f60bab9768eb02a89695448f27cd1964e23cf462e76657344a9c67ac wf111-linux-driver-5-2-2-r3-x86.tar.gz +sha256 33de265d28702ce32bb292f29a43e9e946382a1e31f1e4feae0f4753cf18b4f4 wf111-linux-driver_5.2.2-r4_armv7-a.tar.gz +sha256 fbe86a30e4025b9f510feb4cb8f846aca82f8f3e8f6c8a28a74baf45c87f6e96 wf111-linux-driver_5.2.2-r4_armv5te.tar.gz +sha256 37983d73f60bab9768eb02a89695448f27cd1964e23cf462e76657344a9c67ac wf111-linux-driver-5-2-2-r3-x86.tar.gz diff --git a/package/wget/wget.hash b/package/wget/wget.hash index 7f89bedb88d..22674650a27 100644 --- a/package/wget/wget.hash +++ b/package/wget/wget.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/wget/wget-1.21.2.tar.lz.sig +# https://ftp.gnu.org/gnu/wget/wget-1.21.3.tar.lz.sig # with key 6B98F637D879C5236E277C5C64FF90AAE8C70AF9 -sha256 1727a330a86acacb3e57615ce268f5f29978bf7adec4abe6a30d370207bc91b3 wget-1.21.2.tar.lz +sha256 dbd2fb5e47149d4752d0eaa0dac68cc49cf20d46df4f8e326ffc8f18b2af4ea5 wget-1.21.3.tar.lz # Locally calculated sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b COPYING diff --git a/package/wget/wget.mk b/package/wget/wget.mk index f30fa399176..455faaed126 100644 --- a/package/wget/wget.mk +++ b/package/wget/wget.mk @@ -4,7 +4,7 @@ # ################################################################################ -WGET_VERSION = 1.21.2 +WGET_VERSION = 1.21.3 WGET_SOURCE = wget-$(WGET_VERSION).tar.lz WGET_SITE = $(BR2_GNU_MIRROR)/wget WGET_DEPENDENCIES = host-pkgconf @@ -12,6 +12,13 @@ WGET_LICENSE = GPL-3.0+ WGET_LICENSE_FILES = COPYING WGET_CPE_ID_VENDOR = gnu +ifeq ($(BR2_PACKAGE_LIBPSL),y) +WGET_CONF_OPTS += --with-libpsl +WGET_DEPENDENCIES += libpsl +else +WGET_CONF_OPTS += --without-libpsl +endif + ifeq ($(BR2_PACKAGE_GNUTLS),y) WGET_CONF_OPTS += --with-ssl=gnutls WGET_DEPENDENCIES += gnutls @@ -26,15 +33,19 @@ ifeq ($(BR2_PACKAGE_LIBICONV),y) WGET_DEPENDENCIES += libiconv endif -ifeq ($(BR2_PACKAGE_LIBIDN2),y) -WGET_CONF_OPTS += --with-libidn +# BR2_ENABLE_LOCALE and BR2_PACKAGE_LIBICONV are mutually exclusive +ifeq ($(BR2_ENABLE_LOCALE)$(BR2_PACKAGE_LIBICONV)$(BR2_PACKAGE_LIBIDN2),yy) +WGET_CONF_OPTS += --enable-iri WGET_DEPENDENCIES += libidn2 else -WGET_CONF_OPTS += --without-libidn +WGET_CONF_OPTS += --disable-iri endif ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) +WGET_CONF_OPTS += --with-libuuid WGET_DEPENDENCIES += util-linux +else +WGET_CONF_OPTS += --without-libuuid endif ifeq ($(BR2_PACKAGE_ZLIB),y) @@ -44,6 +55,13 @@ else WGET_CONF_OPTS += --without-zlib endif +ifeq ($(BR2_PACKAGE_C_ARES),y) +WGET_CONF_OPTS += --with-cares +WGET_DEPENDENCIES += c-ares +else +WGET_CONF_OPTS += --without-cares +endif + ifeq ($(BR2_PACKAGE_PCRE2),y) WGET_CONF_OPTS += --disable-pcre --enable-pcre2 WGET_DEPENDENCIES += pcre2 diff --git a/package/whetstone/whetstone.hash b/package/whetstone/whetstone.hash index db9bbb45489..3f1dc63f30e 100644 --- a/package/whetstone/whetstone.hash +++ b/package/whetstone/whetstone.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 333e4ceca042c146f63eec605573d16ae8b07166cbc44a17bec1ea97c6f1efbf whetstone.c +sha256 333e4ceca042c146f63eec605573d16ae8b07166cbc44a17bec1ea97c6f1efbf whetstone.c diff --git a/package/whois/whois.hash b/package/whois/whois.hash index 4bdfd74b201..fb140fa198e 100644 --- a/package/whois/whois.hash +++ b/package/whois/whois.hash @@ -1,5 +1,5 @@ -# From http://snapshot.debian.org/archive/debian/20220103T215446Z/pool/main/w/whois/whois_5.5.11.dsc -sha256 966281eb8301c14a1acc17e46c70061f73179d80e370aef43065c22f0947fb87 whois_5.5.11.tar.xz +# 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 # Hash for license file: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/whois/whois.mk b/package/whois/whois.mk index 544cb9c2f72..5a85bea358a 100644 --- a/package/whois/whois.mk +++ b/package/whois/whois.mk @@ -4,8 +4,8 @@ # ################################################################################ -WHOIS_VERSION = 5.5.11 -WHOIS_SITE = http://snapshot.debian.org/archive/debian/20220103T215446Z/pool/main/w/whois +WHOIS_VERSION = 5.5.14 +WHOIS_SITE = http://snapshot.debian.org/archive/debian/20221017T031443Z/pool/main/w/whois WHOIS_SOURCE = whois_$(WHOIS_VERSION).tar.xz WHOIS_DEPENDENCIES = \ host-pkgconf \ diff --git a/package/wilc-driver/0001-cfg80211.c-fix-missing-prandom_u32-with-Linux-6.1.0.patch b/package/wilc-driver/0001-cfg80211.c-fix-missing-prandom_u32-with-Linux-6.1.0.patch new file mode 100644 index 00000000000..2f106273017 --- /dev/null +++ b/package/wilc-driver/0001-cfg80211.c-fix-missing-prandom_u32-with-Linux-6.1.0.patch @@ -0,0 +1,34 @@ +From f80e4343fa0a4d8b22933d1704c85a771fe234a4 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Wed, 28 Dec 2022 19:56:46 +0100 +Subject: [PATCH] cfg80211.c: fix missing prandom_u32() with Linux >= 6.1.0 + +prandom_u32() previously was only calling get_random_u32() so it's been +dropped with Linux 6.1.0. So let's directly call get_random_u32() if Linux +version >= 6.1.0. + +[Upstream status: https://github.com/embeddedTS/wilc3000-external-module/pull/2] +Signed-off-by: Giulio Benetti +--- + cfg80211.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/cfg80211.c b/cfg80211.c +index 016aa06..41edd02 100644 +--- a/cfg80211.c ++++ b/cfg80211.c +@@ -1422,7 +1422,11 @@ static int mgmt_tx(struct wiphy *wiphy, + const u8 *vendor_ie; + int ret = 0; + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) ++ *cookie = get_random_u32(); ++#else + *cookie = prandom_u32(); ++#endif + priv->tx_cookie = *cookie; + mgmt = (const struct ieee80211_mgmt *)buf; + +-- +2.34.1 + diff --git a/package/wilc-driver/0002-spi.c-fix-build-failure-on-remove-callback.patch b/package/wilc-driver/0002-spi.c-fix-build-failure-on-remove-callback.patch new file mode 100644 index 00000000000..87306dfa12c --- /dev/null +++ b/package/wilc-driver/0002-spi.c-fix-build-failure-on-remove-callback.patch @@ -0,0 +1,44 @@ +From a88819bd63f977b5a33d72a2b9e264ce104726bd Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Wed, 28 Dec 2022 21:02:12 +0100 +Subject: [PATCH] spi.c: fix build failure on remove callback + +Starting from Linux 5.18 remove callback returns void, so let's deal with +it depending on Linux version >= 5.18. + +[Upstream status: https://github.com/embeddedTS/wilc3000-external-module/pull/2] +Signed-off-by: Giulio Benetti +--- + spi.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/spi.c b/spi.c +index 96c51fe..f7b43e2 100644 +--- a/spi.c ++++ b/spi.c +@@ -211,7 +211,11 @@ free: + return ret; + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,18,0)) ++static void wilc_bus_remove(struct spi_device *spi) ++#else + static int wilc_bus_remove(struct spi_device *spi) ++#endif + { + struct wilc *wilc = spi_get_drvdata(spi); + +@@ -220,7 +224,10 @@ static int wilc_bus_remove(struct spi_device *spi) + + wilc_netdev_cleanup(wilc); + wilc_bt_deinit(); ++ ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0)) + return 0; ++#endif + } + + static int wilc_spi_suspend(struct device *dev) +-- +2.34.1 + diff --git a/package/wilc-driver/0003-cfg80211.c-fix-build-failure-with-Linux-5.19-and-6.1.patch b/package/wilc-driver/0003-cfg80211.c-fix-build-failure-with-Linux-5.19-and-6.1.patch new file mode 100644 index 00000000000..785b8904b2f --- /dev/null +++ b/package/wilc-driver/0003-cfg80211.c-fix-build-failure-with-Linux-5.19-and-6.1.patch @@ -0,0 +1,98 @@ +From a608cdd7903505217529317c04b5b58cb7e25081 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Wed, 28 Dec 2022 21:06:43 +0100 +Subject: [PATCH] cfg80211.c: fix build failure with Linux 5.19 and 6.1 + +Starting from Linux 5.19 stop_ap() requires unsigned int link_id as +parameter. Then from Linux 6.1 on lot of other cfg80211 APIs require +int link_id to deal with MLO, so let's add that parameter too. + +[Upstream status: https://github.com/embeddedTS/wilc3000-external-module/pull/2] +Signed-off-by: Giulio Benetti +--- + cfg80211.c | 35 +++++++++++++++++++++++++++++------ + 1 file changed, 29 insertions(+), 6 deletions(-) + +diff --git a/cfg80211.c b/cfg80211.c +index 41edd02..57c777d 100644 +--- a/cfg80211.c ++++ b/cfg80211.c +@@ -674,8 +674,12 @@ static int wilc_wfi_cfg_copy_wpa_info(struct wilc_wfi_key *key_info, + return 0; + } + +-static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index, +- bool pairwise, const u8 *mac_addr, struct key_params *params) ++static int add_key(struct wiphy *wiphy, struct net_device *netdev, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0)) ++ int link_id, ++#endif ++ u8 key_index, bool pairwise, const u8 *mac_addr, ++ struct key_params *params) + + { + int ret = 0, keylen = params->key_len, seqlen = params->seq_len; +@@ -792,6 +796,9 @@ static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index, + } + + static int del_key(struct wiphy *wiphy, struct net_device *netdev, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0)) ++ int link_id, ++#endif + u8 key_index, + bool pairwise, + const u8 *mac_addr) +@@ -833,9 +840,13 @@ static int del_key(struct wiphy *wiphy, struct net_device *netdev, + return ret; + } + +-static int get_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index, +- bool pairwise, const u8 *mac_addr, void *cookie, +- void (*callback)(void *cookie, struct key_params *)) ++static int get_key(struct wiphy *wiphy, struct net_device *netdev, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0)) ++ int link_id, ++#endif ++ u8 key_index, bool pairwise, const u8 *mac_addr, ++ void *cookie, void (*callback)(void *cookie, ++ struct key_params *)) + { + struct wilc_vif *vif = netdev_priv(netdev); + struct wilc_priv *priv = &vif->priv; +@@ -877,12 +888,18 @@ static int get_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index, + + /* wiphy_new() will WARN if not present*/ + static int set_default_key(struct wiphy *wiphy, struct net_device *netdev, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0)) ++ int link_id, ++#endif + u8 key_index, bool unicast, bool multicast) + { + return 0; + } + + static int set_default_mgmt_key (struct wiphy *wiphy,struct net_device *netdev, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0)) ++ int link_id, ++#endif + u8 key_index) + { + return 0; +@@ -1814,7 +1831,13 @@ static int change_beacon(struct wiphy *wiphy, struct net_device *dev, + return wilc_add_beacon(vif, 0, 0, beacon); + } + +-static int stop_ap(struct wiphy *wiphy, struct net_device *dev) ++static int stop_ap(struct wiphy *wiphy, struct net_device *dev ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,19,0)) ++ , unsigned int link_id ++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0)) ++ , int link_id ++#endif ++ ) + { + int ret; + struct wilc_vif *vif = netdev_priv(dev); +-- +2.34.1 + diff --git a/package/wilc-driver/0004-Fix-struct-station_parameters-Linux-6.1-build-failur.patch b/package/wilc-driver/0004-Fix-struct-station_parameters-Linux-6.1-build-failur.patch new file mode 100644 index 00000000000..faee805b5a7 --- /dev/null +++ b/package/wilc-driver/0004-Fix-struct-station_parameters-Linux-6.1-build-failur.patch @@ -0,0 +1,216 @@ +From 5f022c4d3be32493d500be82f51032ef4fb3cdc0 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Wed, 28 Dec 2022 21:08:45 +0100 +Subject: [PATCH] Fix struct station_parameters Linux 6.1 build failure + +Starting from Linux 6.1 struct station_parameters has changed by moving +some member to its child struct link_station_parameters. Let's extract the +values of the needed members into local values at the beginning of +functions and substitute the member access with the local variables. + +[Upstream status: https://github.com/embeddedTS/wilc3000-external-module/pull/2] +Signed-off-by: Giulio Benetti +--- + cfg80211.c | 48 ++++++++++++++++++++++++++++++++---------------- + hif.c | 44 ++++++++++++++++++++++++++++++++------------ + 2 files changed, 64 insertions(+), 28 deletions(-) + +diff --git a/cfg80211.c b/cfg80211.c +index 57c777d..bdd480c 100644 +--- a/cfg80211.c ++++ b/cfg80211.c +@@ -1866,6 +1866,14 @@ static int add_station(struct wiphy *wiphy, struct net_device *dev, + struct wilc_vif *vif = netdev_priv(dev); + struct wilc_priv *priv = &vif->priv; + u8 *assoc_bss = priv->assoc_stainfo.sta_associated_bss[params->aid]; ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) ++ struct link_station_parameters *link_sta_params = ¶ms->link_sta_params; ++ const struct ieee80211_ht_cap *ht_capa = link_sta_params->ht_capa; ++ u8 supported_rates_len = link_sta_params->supported_rates_len; ++#else ++ const struct ieee80211_ht_cap *ht_capa = params->ht_capa; ++ u8 supported_rates_len = params->supported_rates_len; ++#endif + + if (vif->iftype == WILC_AP_MODE || vif->iftype == WILC_GO_MODE) { + memcpy(assoc_bss, mac, ETH_ALEN); +@@ -1879,27 +1887,27 @@ static int add_station(struct wiphy *wiphy, struct net_device *dev, + params->aid); + PRINT_INFO(vif->ndev, HOSTAPD_DBG, + "Number of supported rates = %d\n", +- params->supported_rates_len); ++ supported_rates_len); + + PRINT_INFO(vif->ndev, CFG80211_DBG, "IS HT supported = %d\n", +- (!params->ht_capa) ? false : true); ++ (!ht_capa) ? false : true); + +- if (params->ht_capa) { ++ if (ht_capa) { + PRINT_INFO(vif->ndev, CFG80211_DBG, + "Capability Info = %d\n", +- params->ht_capa->cap_info); ++ ht_capa->cap_info); + PRINT_INFO(vif->ndev, CFG80211_DBG, + "AMPDU Params = %d\n", +- params->ht_capa->ampdu_params_info); ++ ht_capa->ampdu_params_info); + PRINT_INFO(vif->ndev, CFG80211_DBG, + "HT Extended params= %d\n", +- params->ht_capa->extended_ht_cap_info); ++ ht_capa->extended_ht_cap_info); + PRINT_INFO(vif->ndev, CFG80211_DBG, + "Tx Beamforming Cap= %d\n", +- params->ht_capa->tx_BF_cap_info); ++ ht_capa->tx_BF_cap_info); + PRINT_INFO(vif->ndev, CFG80211_DBG, + "Antenna selection info = %d\n", +- params->ht_capa->antenna_selection_info); ++ ht_capa->antenna_selection_info); + } + + PRINT_INFO(vif->ndev, CFG80211_DBG, "Flag Mask = %d\n", +@@ -1966,6 +1974,14 @@ static int change_station(struct wiphy *wiphy, struct net_device *dev, + { + int ret = 0; + struct wilc_vif *vif = netdev_priv(dev); ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) ++ struct link_station_parameters *link_sta_params = ¶ms->link_sta_params; ++ const struct ieee80211_ht_cap *ht_capa = link_sta_params->ht_capa; ++ u8 supported_rates_len = link_sta_params->supported_rates_len; ++#else ++ const struct ieee80211_ht_cap *ht_capa = params->ht_capa; ++ u8 supported_rates_len = params->supported_rates_len; ++#endif + + PRINT_D(vif->ndev, CFG80211_DBG, "Change station parameters\n"); + +@@ -1976,25 +1992,25 @@ static int change_station(struct wiphy *wiphy, struct net_device *dev, + params->aid); + PRINT_INFO(vif->ndev, CFG80211_DBG, + "Number of supported rates = %d\n", +- params->supported_rates_len); ++ supported_rates_len); + PRINT_INFO(vif->ndev, CFG80211_DBG, "IS HT supported = %d\n", +- (!params->ht_capa) ? false : true); +- if (params->ht_capa) { ++ (!ht_capa) ? false : true); ++ if (ht_capa) { + PRINT_INFO(vif->ndev, CFG80211_DBG, + "Capability Info = %d\n", +- params->ht_capa->cap_info); ++ ht_capa->cap_info); + PRINT_INFO(vif->ndev, CFG80211_DBG, + "AMPDU Params = %d\n", +- params->ht_capa->ampdu_params_info); ++ ht_capa->ampdu_params_info); + PRINT_INFO(vif->ndev, CFG80211_DBG, + "HT Extended params= %d\n", +- params->ht_capa->extended_ht_cap_info); ++ ht_capa->extended_ht_cap_info); + PRINT_INFO(vif->ndev, CFG80211_DBG, + "Tx Beamforming Cap= %d\n", +- params->ht_capa->tx_BF_cap_info); ++ ht_capa->tx_BF_cap_info); + PRINT_INFO(vif->ndev, CFG80211_DBG, + "Antenna selection info = %d\n", +- params->ht_capa->antenna_selection_info); ++ ht_capa->antenna_selection_info); + } + PRINT_INFO(vif->ndev, CFG80211_DBG, "Flag Mask = %d\n", + params->sta_flags_mask); +diff --git a/hif.c b/hif.c +index 3f672a0..1a7365b 100644 +--- a/hif.c ++++ b/hif.c +@@ -2249,6 +2249,16 @@ int wilc_add_station(struct wilc_vif *vif, const u8 *mac, + int result; + struct host_if_msg *msg; + struct add_sta_param *sta_params; ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) ++ struct link_station_parameters *link_sta_params = ¶ms->link_sta_params; ++ const struct ieee80211_ht_cap *ht_capa = link_sta_params->ht_capa; ++ u8 supported_rates_len = link_sta_params->supported_rates_len; ++ const u8 *supported_rates = link_sta_params->supported_rates; ++#else ++ const struct ieee80211_ht_cap *ht_capa = params->ht_capa; ++ u8 supported_rates_len = params->supported_rates_len; ++ const u8 *supported_rates = params->supported_rates; ++#endif + + PRINT_INFO(vif->ndev, HOSTINF_DBG, + "Setting adding station message queue params\n"); +@@ -2260,20 +2270,20 @@ int wilc_add_station(struct wilc_vif *vif, const u8 *mac, + sta_params = &msg->body.add_sta_info; + memcpy(sta_params->bssid, mac, ETH_ALEN); + sta_params->aid = params->aid; +- if (!params->ht_capa) { ++ if (!ht_capa) { + sta_params->ht_supported = false; + } else { + sta_params->ht_supported = true; +- memcpy(&sta_params->ht_capa, params->ht_capa, ++ memcpy(&sta_params->ht_capa, ht_capa, + sizeof(struct ieee80211_ht_cap)); + } + sta_params->flags_mask = params->sta_flags_mask; + sta_params->flags_set = params->sta_flags_set; + +- sta_params->supported_rates_len = params->supported_rates_len; +- if (params->supported_rates_len > 0) { +- sta_params->supported_rates = kmemdup(params->supported_rates, +- params->supported_rates_len, ++ sta_params->supported_rates_len = supported_rates_len; ++ if (supported_rates_len > 0) { ++ sta_params->supported_rates = kmemdup(supported_rates, ++ supported_rates_len, + GFP_KERNEL); + if (!sta_params->supported_rates) { + kfree(msg); +@@ -2397,6 +2407,16 @@ int wilc_edit_station(struct wilc_vif *vif, const u8 *mac, + int result; + struct host_if_msg *msg; + struct add_sta_param *sta_params; ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) ++ struct link_station_parameters *link_sta_params = ¶ms->link_sta_params; ++ const struct ieee80211_ht_cap *ht_capa = link_sta_params->ht_capa; ++ u8 supported_rates_len = link_sta_params->supported_rates_len; ++ const u8 *supported_rates = link_sta_params->supported_rates; ++#else ++ const struct ieee80211_ht_cap *ht_capa = params->ht_capa; ++ u8 supported_rates_len = params->supported_rates_len; ++ const u8 *supported_rates = params->supported_rates; ++#endif + + PRINT_INFO(vif->ndev, HOSTINF_DBG, + "Setting editing station message queue params\n"); +@@ -2408,20 +2428,20 @@ int wilc_edit_station(struct wilc_vif *vif, const u8 *mac, + sta_params = &msg->body.edit_sta_info; + memcpy(sta_params->bssid, mac, ETH_ALEN); + sta_params->aid = params->aid; +- if (!params->ht_capa) { ++ if (!ht_capa) { + sta_params->ht_supported = false; + } else { + sta_params->ht_supported = true; +- memcpy(&sta_params->ht_capa, params->ht_capa, ++ memcpy(&sta_params->ht_capa, ht_capa, + sizeof(struct ieee80211_ht_cap)); + } + sta_params->flags_mask = params->sta_flags_mask; + sta_params->flags_set = params->sta_flags_set; + +- sta_params->supported_rates_len = params->supported_rates_len; +- if (params->supported_rates_len > 0) { +- sta_params->supported_rates = kmemdup(params->supported_rates, +- params->supported_rates_len, ++ sta_params->supported_rates_len = supported_rates_len; ++ if (supported_rates_len > 0) { ++ sta_params->supported_rates = kmemdup(supported_rates, ++ supported_rates_len, + GFP_KERNEL); + if (!sta_params->supported_rates) { + kfree(msg); +-- +2.34.1 + diff --git a/package/wilc-driver/0005-Fix-cast-warnings.patch b/package/wilc-driver/0005-Fix-cast-warnings.patch new file mode 100644 index 00000000000..713a15e667e --- /dev/null +++ b/package/wilc-driver/0005-Fix-cast-warnings.patch @@ -0,0 +1,43 @@ +From ebd083223883d479b2dd6f8a0da272797f90d236 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Sat, 31 Dec 2022 18:38:33 +0100 +Subject: [PATCH] Fix cast warnings + +Signed-off-by: Giulio Benetti +--- + cfg80211.c | 2 +- + netdev.c | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/cfg80211.c b/cfg80211.c +index 016aa06..2f40c9d 100644 +--- a/cfg80211.c ++++ b/cfg80211.c +@@ -1794,7 +1794,7 @@ static int start_ap(struct wiphy *wiphy, struct net_device *dev, + if (ret != 0) + netdev_err(dev, "Error in setting channel\n"); + +- wilc_wlan_set_bssid(dev, dev->dev_addr, WILC_AP_MODE); ++ wilc_wlan_set_bssid(dev, (u8 *)dev->dev_addr, WILC_AP_MODE); + + return wilc_add_beacon(vif, settings->beacon_interval, + settings->dtim_period, &settings->beacon); +diff --git a/netdev.c b/netdev.c +index 824afea..5a1a51d 100644 +--- a/netdev.c ++++ b/netdev.c +@@ -899,9 +899,9 @@ static int wilc_mac_open(struct net_device *ndev) + vif->idx); + + if (is_valid_ether_addr(ndev->dev_addr)) +- wilc_set_mac_address(vif, ndev->dev_addr); ++ wilc_set_mac_address(vif, (u8 *)ndev->dev_addr); + else +- wilc_get_mac_address(vif, ndev->dev_addr); ++ wilc_get_mac_address(vif, (u8 *)ndev->dev_addr); + netdev_dbg(ndev, "Mac address: %pM\n", ndev->dev_addr); + + if (!is_valid_ether_addr(ndev->dev_addr)) { +-- +2.34.1 + diff --git a/package/wilc-driver/Config.in b/package/wilc-driver/Config.in new file mode 100644 index 00000000000..7f970bd38b2 --- /dev/null +++ b/package/wilc-driver/Config.in @@ -0,0 +1,64 @@ +config BR2_PACKAGE_WILC_DRIVER + bool "wilc kernel module" + depends on !BR2_s390x + depends on BR2_LINUX_KERNEL + help + External kernel module for WILC1000/3000 devices. + + wilc kernel driver source as found in Microchip's at91-linux + kernel tree with added Kbuild file to be built as a generic + external module. + + The wilc1000 driver currently maintained in Linux kernel does + not support BLE of the WILC3000 hardware. This package is + meant to bridge that gap until Microchip can get WILC3000 + support upstream. + + Supports both SDIO and SPI modes. + + https://github.com/embeddedTS/wilc3000-external-module + +if BR2_PACKAGE_WILC_DRIVER + +config BR2_PACKAGE_WILC_DRIVER_SPI + bool "SPI" + help + This module adds support for the SPI interface of adapters + using WILC1000/3000 chipset. The WILC1000/3000 has a Serial + Peripheral Interface (SPI) that operates as an SPI slave. + This SPI interface can be used for control and for serial + I/O of 802.11 data. The SPI is a full-duplex slave + synchronous serial interface that is available immediately + following reset when pin 9 (SDIO_SPI_CFG) is tied to VDDIO. + Select this if your platform is using the SPI bus. + +config BR2_PACKAGE_WILC_DRIVER_SDIO + bool "SDIO" + help + This module adds support for the SDIO interface of adapters + using WILC1000/3000 chipset. The WILC1000/3000 SDIO is a full + speed interface. It meets SDIO card specification version 2.0. + The interface supports the 1-bit/4-bit SD transfer mode at the + clock range of 0-50 MHz. The host can use this interface to + read and write from any register within the chip as well as + configure the WILC1000/3000 for data DMA. To use this + interface, pin9 (SDIO_SPI_CFG) must be grounded. Select this + if your platform is using the SDIO bus. + +if BR2_PACKAGE_WILC_DRIVER_SDIO + +config BR2_PACKAGE_WILC_DRIVER_SDIO_OOB + bool "Enable out-of-band interrupt" + help + This option enables out-of-band interrupt support for the + WILC1000/3000 chipset. This OOB interrupt is intended to + provide a faster interrupt mechanism for SDIO host controllers + that don't support SDIO interrupt. Select this option If the + SDIO host controller in your platform doesn't support SDIO + time division interrupt. +endif +endif + +comment "wilc kernel module needs a Linux kernel to be built" + depends on !BR2_s390x + depends on !BR2_LINUX_KERNEL diff --git a/package/wilc-driver/wilc-driver.hash b/package/wilc-driver/wilc-driver.hash new file mode 100644 index 00000000000..4ada813ed8d --- /dev/null +++ b/package/wilc-driver/wilc-driver.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 4796b1a53781f8702a335b0146d488a9422b71dab39f6f154f955b0ad1711199 wilc-driver-linux4microchip-2021.10-1.tar.gz +sha256 f6b78c087c3ebdf0f3c13415070dd480a3f35d8fc76f3d02180a407c1c812f79 LICENSE diff --git a/package/wilc-driver/wilc-driver.mk b/package/wilc-driver/wilc-driver.mk new file mode 100644 index 00000000000..a7a902b6db4 --- /dev/null +++ b/package/wilc-driver/wilc-driver.mk @@ -0,0 +1,45 @@ +################################################################################ +# +# wilc-driver +# +################################################################################ + +WILC_DRIVER_VERSION = linux4microchip-2021.10-1 +WILC_DRIVER_SITE = $(call github,embeddedTS,wilc3000-external-module,$(WILC_DRIVER_VERSION)) + +WILC_DRIVER_LICENSE = GPL-2.0 +WILC_DRIVER_LICENSE_FILES = LICENSE + +ifeq ($(BR2_PACKAGE_WILC_DRIVER_SPI),y) +WILC_DRIVER_MODULE_MAKE_OPTS += \ + CONFIG_WILC_SPI=m +define WILC_DRIVER_SPI_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_SPI) +endef +endif + +ifeq ($(BR2_PACKAGE_WILC_DRIVER_SDIO),y) +WILC_DRIVER_MODULE_MAKE_OPTS += \ + CONFIG_WILC_SDIO=m +define WILC_DRIVER_SDIO_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_MMC) +endef +endif + +ifeq ($(BR2_PACKAGE_WILC_DRIVER_SDIO_OOB),y) +WILC_DRIVER_MODULE_MAKE_OPTS += \ + CONFIG_WILC_HW_OOB_INTR=y +endif + +define WILC_DRIVER_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_CRC_ITU_T) + $(call KCONFIG_ENABLE_OPT,CONFIG_CRC7) + $(WILC_DRIVER_SPI_LINUX_CONFIG_FIXUPS) + $(WILC_DRIVER_SDIO_LINUX_CONFIG_FIXUPS) +endef + +$(eval $(kernel-module)) +$(eval $(generic-package)) diff --git a/package/wilc-firmware/Config.in b/package/wilc-firmware/Config.in new file mode 100644 index 00000000000..72a9c73206d --- /dev/null +++ b/package/wilc-firmware/Config.in @@ -0,0 +1,34 @@ +config BR2_PACKAGE_WILC_FIRMWARE + bool + help + Provider package for WILC1000_FIRMWARE & WILC3000_FIRMWARE + +config BR2_PACKAGE_WILC1000_FIRMWARE + bool "wilc1000-firmware" + select BR2_PACKAGE_WILC_FIRMWARE + help + Firmware for Microchip WILC1000 wireless device + + These binary blobs are provided directly from Microchip. + Ideally, the firmware version should match driver version. + Generally, the latest firmware would be acceptible regardless + of driver version. + + These will be installed to /lib/firmware/mchp/ + + https://github.com/linux4wilc/firmware + +config BR2_PACKAGE_WILC3000_FIRMWARE + bool "wilc3000-firmware" + select BR2_PACKAGE_WILC_FIRMWARE + help + Firmware for Microchip WILC3000 wireless device + + These binary blobs are provided directly from Microchip. + Ideally, the firmware version should match driver version. + Generally, the latest firmware would be acceptible regardless + of driver version. + + These will be installed to /lib/firmware/mchp/ + + https://github.com/linux4wilc/firmware diff --git a/package/wilc-firmware/wilc-firmware.hash b/package/wilc-firmware/wilc-firmware.hash new file mode 100644 index 00000000000..802cb4f9b18 --- /dev/null +++ b/package/wilc-firmware/wilc-firmware.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 a06a6a46e03ca00d35da220f7a9f353cc650e5e5657a7988ea732913ad26d9a0 wilc-firmware-wilc_linux_16_1.tar.gz +sha256 71355eee947a312594dbdaac039827544f93d23949b65c356b7b0ce09e2600fb LICENSE.wilc_fw diff --git a/package/wilc-firmware/wilc-firmware.mk b/package/wilc-firmware/wilc-firmware.mk new file mode 100644 index 00000000000..12c825cf92e --- /dev/null +++ b/package/wilc-firmware/wilc-firmware.mk @@ -0,0 +1,35 @@ +################################################################################ +# +# wilc-firmware +# +################################################################################ + +WILC_FIRMWARE_VERSION = wilc_linux_16_1 +WILC_FIRMWARE_SITE = $(call github,linux4wilc,firmware,$(WILC_FIRMWARE_VERSION)) + +WILC_FIRMWARE_LICENSE = PROPRIETARY +WILC_FIRMWARE_LICENSE_FILES = LICENSE.wilc_fw + +ifeq ($(BR2_PACKAGE_WILC1000_FIRMWARE),y) +WILC_FIRMWARE_FILES += \ + wilc1000_wifi_firmware.bin +endif + +ifeq ($(BR2_PACKAGE_WILC3000_FIRMWARE),y) +WILC_FIRMWARE_FILES += \ + wilc3000_ble_firmware.bin \ + wilc3000_wifi_firmware.bin +endif + +define WILC_FIRMWARE_INSTALL_FILES + cd $(@D) && \ + $(TAR) cf install.tar $(sort $(WILC_FIRMWARE_FILES)) && \ + $(TAR) xf install.tar -C $(TARGET_DIR)/lib/firmware/mchp +endef + +define WILC_FIRMWARE_INSTALL_TARGET_CMDS + $(INSTALL) -d -m 0755 $(TARGET_DIR)/lib/firmware/mchp/ + $(WILC_FIRMWARE_INSTALL_FILES) +endef + +$(eval $(generic-package)) diff --git a/package/wilc1000-firmware/Config.in b/package/wilc1000-firmware/Config.in deleted file mode 100644 index df8a7a6b605..00000000000 --- a/package/wilc1000-firmware/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_WILC1000_FIRMWARE - bool "wilc1000-firmware" - help - Firmware for Atmel Wilc1000 wireless device - - https://github.com/linux4sc/wireless-firmware.git diff --git a/package/wilc1000-firmware/wilc1000-firmware.hash b/package/wilc1000-firmware/wilc1000-firmware.hash deleted file mode 100644 index 5344efe5179..00000000000 --- a/package/wilc1000-firmware/wilc1000-firmware.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 a2e7a327dd545ba2051946f7613005cbde88fdd952afb8eecdd1dacda7e767d2 v14.1_Firmware.zip diff --git a/package/wilc1000-firmware/wilc1000-firmware.mk b/package/wilc1000-firmware/wilc1000-firmware.mk deleted file mode 100644 index 6f504d67a01..00000000000 --- a/package/wilc1000-firmware/wilc1000-firmware.mk +++ /dev/null @@ -1,24 +0,0 @@ -################################################################################ -# -# wilc1000-firmware -# -################################################################################ - -WILC1000_FIRMWARE_VERSION = 14.1 -WILC1000_FIRMWARE_SITE = https://github.com/linux4sc/wireless-firmware/archive -WILC1000_FIRMWARE_SOURCE = v$(WILC1000_FIRMWARE_VERSION)_Firmware.zip - -WILC1000_FIRMWARE_LICENSE = PROPRIETARY - -define WILC1000_FIRMWARE_EXTRACT_CMDS - $(UNZIP) -d $(BUILD_DIR) $(WILC1000_FIRMWARE_DL_DIR)/$(WILC1000_FIRMWARE_SOURCE) - mv $(BUILD_DIR)/wireless-firmware-$(WILC1000_FIRMWARE_VERSION)_Firmware/* $(@D) - rmdir $(BUILD_DIR)/wireless-firmware-$(WILC1000_FIRMWARE_VERSION)_Firmware -endef - -define WILC1000_FIRMWARE_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0644 $(@D)/wilc1003_firmware.bin \ - $(TARGET_DIR)/lib/firmware/atmel/wilc1003_firmware.bin -endef - -$(eval $(generic-package)) diff --git a/package/wilink-bt-firmware/wilink-bt-firmware.mk b/package/wilink-bt-firmware/wilink-bt-firmware.mk index 722c4655cd7..a5f3a826090 100644 --- a/package/wilink-bt-firmware/wilink-bt-firmware.mk +++ b/package/wilink-bt-firmware/wilink-bt-firmware.mk @@ -5,7 +5,7 @@ ################################################################################ WILINK_BT_FIRMWARE_VERSION = 43fca73c6a98c63fcb98f82af5bf83761778e005 -WILINK_BT_FIRMWARE_SITE = git://git.ti.com/ti-bt/service-packs.git +WILINK_BT_FIRMWARE_SITE = https://git.ti.com/git/ti-bt/service-packs.git WILINK_BT_FIRMWARE_SITE_METHOD = git WILINK_BT_FIRMWARE_LICENSE = PROPRIETARY WILINK_BT_FIRMWARE_LICENSE_FILES = LICENSE diff --git a/package/wine/0001-l3codeca-avoid-mpg123-functions-with-suffix.patch b/package/wine/0001-l3codeca-avoid-mpg123-functions-with-suffix.patch new file mode 100644 index 00000000000..8332db4b381 --- /dev/null +++ b/package/wine/0001-l3codeca-avoid-mpg123-functions-with-suffix.patch @@ -0,0 +1,21 @@ +commit 75b70efdaa2d4baa064271098878b79f66df155f +Author: André Zwing +Date: Sat May 21 17:53:07 2022 +0200 + + l3codeca.acm: Avoid mpg123 functions with suffix. + +[Upstream commit: https://source.winehq.org/git/wine.git/commit/75b70efdaa2d4baa064271098878b79f66df155f] +Signed-off-by: André Zwing + +diff --git a/dlls/l3codeca.acm/Makefile.in b/dlls/l3codeca.acm/Makefile.in +index 451794b2624..31765766d4e 100644 +--- a/dlls/l3codeca.acm/Makefile.in ++++ b/dlls/l3codeca.acm/Makefile.in +@@ -1,6 +1,7 @@ + MODULE = l3codeca.acm + IMPORTS = $(MPG123_PE_LIBS) winmm user32 kernelbase + EXTRAINCL = $(MPG123_PE_CFLAGS) ++EXTRADEFS = -DMPG123_NO_LARGENAME + + C_SRCS = \ + mpegl3.c diff --git a/package/wine/0002-mp3dmod-avoid-mpg123-functions-with-suffix.patch b/package/wine/0002-mp3dmod-avoid-mpg123-functions-with-suffix.patch new file mode 100644 index 00000000000..16f2ba2898c --- /dev/null +++ b/package/wine/0002-mp3dmod-avoid-mpg123-functions-with-suffix.patch @@ -0,0 +1,21 @@ +commit 8d441659f7c7ae359e06a99e7abaae57792356a0 +Author: André Zwing +Date: Sat May 21 17:53:07 2022 +0200 + + mp3dmod: Avoid mpg123 functions with suffix. + +[Upstream commit: https://source.winehq.org/git/wine.git/commit/8d441659f7c7ae359e06a99e7abaae57792356a0] +Signed-off-by: André Zwing + +diff --git a/dlls/mp3dmod/Makefile.in b/dlls/mp3dmod/Makefile.in +index dabbb1dfeae..3ba343a4d34 100644 +--- a/dlls/mp3dmod/Makefile.in ++++ b/dlls/mp3dmod/Makefile.in +@@ -1,6 +1,7 @@ + MODULE = mp3dmod.dll + IMPORTS = $(MPG123_PE_LIBS) dmoguids msdmo ole32 uuid wmcodecdspuuid kernelbase + EXTRAINCL = $(MPG123_PE_CFLAGS) ++EXTRADEFS = -DMPG123_NO_LARGENAME + + C_SRCS = \ + mp3dmod.c diff --git a/package/wine/Config.in b/package/wine/Config.in index 9de8cf0f6d8..db3b1570ef4 100644 --- a/package/wine/Config.in +++ b/package/wine/Config.in @@ -13,6 +13,10 @@ config BR2_PACKAGE_WINE depends on BR2_PACKAGE_WINE_ARCH_SUPPORTS # Wine unconditionally builds shared libraries depends on !BR2_STATIC_LIBS + # pthread_attr_setstack + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL + select BR2_PACKAGE_ALSA_LIB_SEQ if BR2_PACKAGE_ALSA_LIB + select BR2_PACKAGE_ALSA_LIB_RAWMIDI if BR2_PACKAGE_ALSA_LIB help Wine is a compatibility layer capable of running Windows applications on Linux. Instead of simulating internal @@ -23,6 +27,6 @@ config BR2_PACKAGE_WINE http://www.winehq.org -comment "wine needs a toolchain w/ dynamic library" +comment "wine needs a toolchain w/ dynamic library, NPTL" depends on BR2_PACKAGE_WINE_ARCH_SUPPORTS - depends on BR2_STATIC_LIBS + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS_NPTL diff --git a/package/wine/wine.hash b/package/wine/wine.hash index 083e3dd3eba..9a7a1c342af 100644 --- a/package/wine/wine.hash +++ b/package/wine/wine.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 b493065f2f83ee429c62e2ec58698a3cf63ef78722e1b20765823152e8582c56 wine-6.0.tar.xz +sha256 5b43e27d5c085cb18f97394e46180310d5eef7c1d91c6895432a3889b2de086b wine-7.0.tar.xz # Locally calculated sha256 e237fa56668030e928551ddd60f05df5fe957f75eab874bbd017e085ed722e7c COPYING.LIB -sha256 111398f1be25b1ae1f124512fe61569e6b4555408e2feb9bc82f9fe57d39b302 LICENSE +sha256 7c360930e51d56c8fa12fe1df8ed348ac77a9ad73f9582a303919469399b3ce4 LICENSE diff --git a/package/wine/wine.mk b/package/wine/wine.mk index c925a58632a..a1c65bef4e0 100644 --- a/package/wine/wine.mk +++ b/package/wine/wine.mk @@ -4,9 +4,9 @@ # ################################################################################ -WINE_VERSION = 6.0 +WINE_VERSION = 7.0 WINE_SOURCE = wine-$(WINE_VERSION).tar.xz -WINE_SITE = https://dl.winehq.org/wine/source/6.0 +WINE_SITE = https://dl.winehq.org/wine/source/7.0 WINE_LICENSE = LGPL-2.1+ WINE_LICENSE_FILES = COPYING.LIB LICENSE WINE_CPE_ID_VENDOR = winehq @@ -21,12 +21,9 @@ WINE_CONF_OPTS = \ --disable-win64 \ --without-capi \ --without-coreaudio \ - --without-faudio \ --without-gettext \ --without-gettextpo \ --without-gphoto \ - --without-gsm \ - --without-hal \ --without-mingw \ --without-opencl \ --without-oss \ @@ -44,7 +41,7 @@ ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y) WINE_CONF_OPTS += TARGETFLAGS="-b $(TOOLCHAIN_EXTERNAL_PREFIX)" endif -ifeq ($(BR2_PACKAGE_ALSA_LIB)$(BR2_PACKAGE_ALSA_LIB_SEQ)$(BR2_PACKAGE_ALSA_LIB_RAWMIDI),yyy) +ifeq ($(BR2_PACKAGE_ALSA_LIB),y) WINE_CONF_OPTS += --with-alsa WINE_DEPENDENCIES += alsa-lib else @@ -99,20 +96,6 @@ else WINE_CONF_OPTS += --without-gstreamer endif -ifeq ($(BR2_PACKAGE_JPEG),y) -WINE_CONF_OPTS += --with-jpeg -WINE_DEPENDENCIES += jpeg -else -WINE_CONF_OPTS += --without-jpeg -endif - -ifeq ($(BR2_PACKAGE_LCMS2),y) -WINE_CONF_OPTS += --with-cms -WINE_DEPENDENCIES += lcms2 -else -WINE_CONF_OPTS += --without-cms -endif - ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) WINE_CONF_OPTS += --with-opengl WINE_DEPENDENCIES += libgl @@ -134,13 +117,6 @@ else WINE_CONF_OPTS += --without-pcap endif -ifeq ($(BR2_PACKAGE_LIBPNG),y) -WINE_CONF_OPTS += --with-png -WINE_DEPENDENCIES += libpng -else -WINE_CONF_OPTS += --without-png -endif - ifeq ($(BR2_PACKAGE_LIBUSB),y) WINE_CONF_OPTS += --with-usb WINE_DEPENDENCIES += libusb @@ -155,29 +131,6 @@ else WINE_CONF_OPTS += --without-v4l2 endif -ifeq ($(BR2_PACKAGE_LIBXML2),y) -WINE_CONF_OPTS += --with-xml -WINE_DEPENDENCIES += libxml2 -WINE_CONF_ENV += XML2_CONFIG=$(STAGING_DIR)/usr/bin/xml2-config -else -WINE_CONF_OPTS += --without-xml -endif - -ifeq ($(BR2_PACKAGE_LIBXSLT),y) -WINE_CONF_OPTS += --with-xslt -WINE_DEPENDENCIES += libxslt -WINE_CONF_ENV += XSLT_CONFIG=$(STAGING_DIR)/usr/bin/xslt-config -else -WINE_CONF_OPTS += --without-xslt -endif - -ifeq ($(BR2_PACKAGE_MPG123),y) -WINE_CONF_OPTS += --with-mpg123 -WINE_DEPENDENCIES += mpg123 -else -WINE_CONF_OPTS += --without-mpg123 -endif - ifeq ($(BR2_PACKAGE_OPENAL),y) WINE_CONF_OPTS += --with-openal WINE_DEPENDENCIES += openal @@ -228,13 +181,6 @@ else WINE_CONF_OPTS += --without-sdl endif -ifeq ($(BR2_PACKAGE_TIFF),y) -WINE_CONF_OPTS += --with-tiff -WINE_DEPENDENCIES += tiff -else -WINE_CONF_OPTS += --without-tiff -endif - ifeq ($(BR2_PACKAGE_HAS_UDEV),y) WINE_CONF_OPTS += --with-udev WINE_DEPENDENCIES += udev @@ -349,23 +295,17 @@ HOST_WINE_CONF_OPTS += \ --disable-win16 \ --without-alsa \ --without-capi \ - --without-cms \ --without-coreaudio \ - --without-faudio \ --without-cups \ --without-dbus \ --without-fontconfig \ --without-gphoto \ --without-gnutls \ - --without-gsm \ --without-gssapi \ --without-gstreamer \ - --without-hal \ - --without-jpeg \ --without-krb5 \ --without-ldap \ --without-mingw \ - --without-mpg123 \ --without-netapi \ --without-openal \ --without-opencl \ @@ -374,10 +314,8 @@ HOST_WINE_CONF_OPTS += \ --without-oss \ --without-pcap \ --without-pulse \ - --without-png \ --without-sane \ --without-sdl \ - --without-tiff \ --without-usb \ --without-v4l2 \ --without-vkd3d \ @@ -388,12 +326,10 @@ HOST_WINE_CONF_OPTS += \ --without-xinerama \ --without-xinput \ --without-xinput2 \ - --without-xml \ --without-xrandr \ --without-xrender \ --without-xshape \ --without-xshm \ - --without-xslt \ --without-xxf86vm $(eval $(autotools-package)) diff --git a/package/wireguard-linux-compat/wireguard-linux-compat.hash b/package/wireguard-linux-compat/wireguard-linux-compat.hash index e18bd10cf73..0f5713fc344 100644 --- a/package/wireguard-linux-compat/wireguard-linux-compat.hash +++ b/package/wireguard-linux-compat/wireguard-linux-compat.hash @@ -1,4 +1,4 @@ -# https://lists.zx2c4.com/pipermail/wireguard/2021-June/006781.html -sha256 3f5d990006e6eabfd692d925ec314fff2c5ee7dcdb869a6510d579acfdd84ec0 wireguard-linux-compat-1.0.20210606.tar.xz +# https://lists.zx2c4.com/pipermail/wireguard/2022-June/007660.html +sha256 362d412693c8fe82de00283435818d5c5def7f15e2433a07a9fe99d0518f63c0 wireguard-linux-compat-1.0.20220627.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/wireguard-linux-compat/wireguard-linux-compat.mk b/package/wireguard-linux-compat/wireguard-linux-compat.mk index 1b7ec941db0..258e1847653 100644 --- a/package/wireguard-linux-compat/wireguard-linux-compat.mk +++ b/package/wireguard-linux-compat/wireguard-linux-compat.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIREGUARD_LINUX_COMPAT_VERSION = 1.0.20210606 +WIREGUARD_LINUX_COMPAT_VERSION = 1.0.20220627 WIREGUARD_LINUX_COMPAT_SITE = https://git.zx2c4.com/wireguard-linux-compat/snapshot WIREGUARD_LINUX_COMPAT_SOURCE = wireguard-linux-compat-$(WIREGUARD_LINUX_COMPAT_VERSION).tar.xz WIREGUARD_LINUX_COMPAT_LICENSE = GPL-2.0 diff --git a/package/wireless-regdb/wireless-regdb.hash b/package/wireless-regdb/wireless-regdb.hash index 91fcb320d20..b4e8dcaf544 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 8828c25a4ee25020044004f57374bb9deac852809fad70f8d3d01770bf9ac97f wireless-regdb-2022.02.18.tar.xz +sha256 f254d08ab3765aeae2b856222e11a95d44aef519a6663877c71ef68fae4c8c12 wireless-regdb-2023.05.03.tar.xz # Locally computed sha256 678b0df753c86198fc496d1f1033429bbd57f101472132ee7eaaf9f5e0a7fae1 LICENSE diff --git a/package/wireless-regdb/wireless-regdb.mk b/package/wireless-regdb/wireless-regdb.mk index 35a8c6686d2..db9c7f42d56 100644 --- a/package/wireless-regdb/wireless-regdb.mk +++ b/package/wireless-regdb/wireless-regdb.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRELESS_REGDB_VERSION = 2022.02.18 +WIRELESS_REGDB_VERSION = 2023.05.03 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/wireless_tools/wireless_tools.hash b/package/wireless_tools/wireless_tools.hash index 50a3f62b84f..8ca73ef2d1d 100644 --- a/package/wireless_tools/wireless_tools.hash +++ b/package/wireless_tools/wireless_tools.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 abd9c5c98abf1fdd11892ac2f8a56737544fe101e1be27c6241a564948f34c63 wireless_tools.30.pre9.tar.gz -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING +sha256 abd9c5c98abf1fdd11892ac2f8a56737544fe101e1be27c6241a564948f34c63 wireless_tools.30.pre9.tar.gz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/wireplumber/0001-fix-non-x86_64-architectures.patch b/package/wireplumber/0001-fix-non-x86_64-architectures.patch new file mode 100644 index 00000000000..19c34e4e1a1 --- /dev/null +++ b/package/wireplumber/0001-fix-non-x86_64-architectures.patch @@ -0,0 +1,215 @@ +From e429db7e8c266045aee25e153fb2308bd61fe233 Mon Sep 17 00:00:00 2001 +From: Julian Bouzas +Date: Wed, 9 Feb 2022 07:59:59 -0500 +Subject: [PATCH] spa-json: fix va_list APIs for different architectures + +The va_list type might not always be a pointer in some architectures, so we +cannot guarantee it will be modified after using it for a second time in another +function. This fixes the issue by using macros so args does not get copied, and +always gets modified when using it more than once. + +Signed-off-by: Théo Lebrun +Upstream: https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/e429db7e8c266045aee25e153fb2308bd61fe233 +--- + lib/wp/spa-json.c | 156 ++++++++++++++++++++++++---------------------- + 1 file changed, 80 insertions(+), 76 deletions(-) + +diff --git a/lib/wp/spa-json.c b/lib/wp/spa-json.c +index f14f395d..c5e59a3e 100644 +--- a/lib/wp/spa-json.c ++++ b/lib/wp/spa-json.c +@@ -363,33 +363,33 @@ wp_spa_json_new_string (const gchar *value) + wp_spa_json_builder_new_formatted ("\"%s\"", value)); + } + +-static void +-wp_spa_json_builder_add_value (WpSpaJsonBuilder *self, const gchar *fmt, +- va_list args) +-{ +- switch (*fmt) { +- case 'n': +- wp_spa_json_builder_add_null (self); +- break; +- case 'b': +- wp_spa_json_builder_add_boolean (self, va_arg(args, gboolean)); +- break; +- case 'i': +- wp_spa_json_builder_add_int (self, va_arg(args, gint)); +- break; +- case 'f': +- wp_spa_json_builder_add_float (self, (float)va_arg(args, double)); +- break; +- case 's': +- wp_spa_json_builder_add_string (self, va_arg(args, const gchar *)); +- break; +- case 'J': +- wp_spa_json_builder_add_json (self, va_arg(args, WpSpaJson *)); +- break; +- default: +- return; +- } +-} ++/* Args is not a pointer in some architectures, so this needs to be a macro to ++ * avoid args being copied */ ++#define wp_spa_json_builder_add_value(self,fmt,args) \ ++do { \ ++ switch (*fmt) { \ ++ case 'n': \ ++ wp_spa_json_builder_add_null (self); \ ++ break; \ ++ case 'b': \ ++ wp_spa_json_builder_add_boolean (self, va_arg(args, gboolean)); \ ++ break; \ ++ case 'i': \ ++ wp_spa_json_builder_add_int (self, va_arg(args, gint)); \ ++ break; \ ++ case 'f': \ ++ wp_spa_json_builder_add_float (self, (float)va_arg(args, double)); \ ++ break; \ ++ case 's': \ ++ wp_spa_json_builder_add_string (self, va_arg(args, const gchar *)); \ ++ break; \ ++ case 'J': \ ++ wp_spa_json_builder_add_json (self, va_arg(args, WpSpaJson *)); \ ++ break; \ ++ default: \ ++ break; \ ++ } \ ++} while(false) + + /*! + * \brief Creates a spa json of type array +@@ -724,48 +724,46 @@ wp_spa_json_parse_object_valist (WpSpaJson *self, va_list args) + return res; + } + +-static gboolean +-wp_spa_json_parse_value (const gchar *data, int len, const gchar *fmt, +- va_list args) +-{ +- switch (*fmt) { +- case 'n': +- if (!spa_json_is_null (data, len)) +- return FALSE; +- break; +- case 'b': +- if (!wp_spa_json_parse_boolean_internal (data, len, +- va_arg(args, gboolean *))) +- return FALSE; +- break; +- case 'i': +- if (spa_json_parse_int (data, len, va_arg(args, gint *)) < 0) +- return FALSE; +- break; +- case 'f': +- if (spa_json_parse_float (data, len, +- (float *)va_arg(args, double *)) < 0) +- return FALSE; +- break; +- case 's': { +- gchar *str = wp_spa_json_parse_string_internal (data, len); +- if (!str) +- return FALSE; +- *va_arg(args, gchar **) = str; +- break; +- } +- case 'J': { +- WpSpaJson *j = wp_spa_json_new (data, len); +- if (!j) +- return FALSE; +- *va_arg(args, WpSpaJson **) = j; +- break; +- } +- default: +- return FALSE; +- } +- return TRUE; +-} ++/* Args is not a pointer in some architectures, so this needs to be a macro to ++ * avoid args being copied */ ++#define wp_spa_json_parse_value(data,len,fmt,args) \ ++do { \ ++ switch (*fmt) { \ ++ case 'n': \ ++ if (!spa_json_is_null (data, len)) \ ++ return FALSE; \ ++ break; \ ++ case 'b': \ ++ if (!wp_spa_json_parse_boolean_internal (data, len, \ ++ va_arg(args, gboolean *))) \ ++ return FALSE; \ ++ break; \ ++ case 'i': \ ++ if (spa_json_parse_int (data, len, va_arg(args, gint *)) < 0) \ ++ return FALSE; \ ++ break; \ ++ case 'f': \ ++ if (spa_json_parse_float (data, len, va_arg(args, float *)) < 0) \ ++ return FALSE; \ ++ break; \ ++ case 's': { \ ++ gchar *str = wp_spa_json_parse_string_internal (data, len); \ ++ if (!str) \ ++ return FALSE; \ ++ *va_arg(args, gchar **) = str; \ ++ break; \ ++ } \ ++ case 'J': { \ ++ WpSpaJson *j = wp_spa_json_new (data, len); \ ++ if (!j) \ ++ return FALSE; \ ++ *va_arg(args, WpSpaJson **) = j; \ ++ break; \ ++ } \ ++ default: \ ++ return FALSE; \ ++ } \ ++} while(false) + + /*! + * \brief Parses the object property values of a spa json object +@@ -827,8 +825,7 @@ wp_spa_json_object_get_valist (WpSpaJson *self, va_list args) + value = g_value_get_boxed (&item); + + if (g_strcmp0 (key_str, lookup_key) == 0) { +- if (!wp_spa_json_parse_value (value->data, value->size, lookup_fmt, args)) +- return FALSE; ++ wp_spa_json_parse_value (value->data, value->size, lookup_fmt, args); + lookup_key = va_arg(args, const gchar *); + if (!lookup_key) + return TRUE; +@@ -1366,9 +1363,12 @@ gboolean + wp_spa_json_parser_get_value (WpSpaJsonParser *self, const gchar *fmt, + va_list args) + { +- return wp_spa_json_parser_advance (self) && +- wp_spa_json_parse_value (self->curr.cur, +- self->curr.end - self->curr.cur, fmt, args); ++ if (wp_spa_json_parser_advance (self)) { ++ wp_spa_json_parse_value (self->curr.cur, self->curr.end - self->curr.cur, ++ fmt, args); ++ return TRUE; ++ } ++ return FALSE; + } + + /*! +@@ -1419,9 +1419,13 @@ wp_spa_json_parser_get_valist (WpSpaJsonParser *self, va_list args) + if (!format) + return TRUE; + +- /* parse value */ +- if (!wp_spa_json_parser_get_value (self, format, args)) ++ /* advance */ ++ if (!wp_spa_json_parser_advance (self)) + return FALSE; ++ ++ /* parse value */ ++ wp_spa_json_parse_value (self->curr.cur, self->curr.end - self->curr.cur, ++ format, args); + } while (TRUE); + + return FALSE; +-- +GitLab + diff --git a/package/wireplumber/wireplumber.hash b/package/wireplumber/wireplumber.hash index 561fcc2e5ec..206d7d15af9 100644 --- a/package/wireplumber/wireplumber.hash +++ b/package/wireplumber/wireplumber.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 41f174eaae5a630e195001fdd580918fa5143a71edceb050b320f85a8e65e53b wireplumber-0.4.2.tar.bz2 +sha256 6429e8a95e355ce21b4c4f1a5ebc769f037e8dbeec51905ad909ce609a38d0ce wireplumber-0.4.8.tar.bz2 sha256 ff2eb9af5b05d92ac3a38cffcad27582ef555a31ff1781e1c1d4e087f77c9c81 LICENSE diff --git a/package/wireplumber/wireplumber.mk b/package/wireplumber/wireplumber.mk index 2dab6042ea4..763e3d7639c 100644 --- a/package/wireplumber/wireplumber.mk +++ b/package/wireplumber/wireplumber.mk @@ -4,20 +4,24 @@ # ################################################################################ -WIREPLUMBER_VERSION = 0.4.2 +WIREPLUMBER_VERSION = 0.4.8 WIREPLUMBER_SOURCE = wireplumber-$(WIREPLUMBER_VERSION).tar.bz2 WIREPLUMBER_SITE = https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/$(WIREPLUMBER_VERSION) WIREPLUMBER_LICENSE = MIT WIREPLUMBER_LICENSE_FILES = LICENSE -WIREPLUMBER_DEPENDENCIES = host-pkgconf dbus pipewire libglib2 lua +WIREPLUMBER_DEPENDENCIES = host-pkgconf pipewire libglib2 lua WIREPLUMBER_CONF_OPTS = \ -Ddoc=disabled \ -Dsystem-lua=true \ -Dsystem-lua-version= +ifeq ($(BR2_PACKAGE_DBUS),y) +WIREPLUMBER_DEPENDENCIES += dbus +endif + ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) -WIREPLUMBER_DEPENDENCIES += gobject-introspection +WIREPLUMBER_DEPENDENCIES += host-doxygen host-python-lxml gobject-introspection WIREPLUMBER_CONF_OPTS += -Dintrospection=enabled else WIREPLUMBER_CONF_OPTS += -Dintrospection=disabled diff --git a/package/wireshark/Config.in b/package/wireshark/Config.in index 95fc9b38f3b..8b05599ecb2 100644 --- a/package/wireshark/Config.in +++ b/package/wireshark/Config.in @@ -5,10 +5,12 @@ config BR2_PACKAGE_WIRESHARK depends on BR2_USE_MMU # fork(), glib2 depends on BR2_USE_WCHAR # glib2 depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 + depends on BR2_INSTALL_LIBSTDCPP select BR2_PACKAGE_C_ARES select BR2_PACKAGE_LIBPCAP select BR2_PACKAGE_LIBGCRYPT select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_PCRE2 select BR2_PACKAGE_SPEEXDSP help Network traffic sniffer and protocol decoder. @@ -24,7 +26,6 @@ config BR2_PACKAGE_WIRESHARK_GUI depends on BR2_HOST_GCC_AT_LEAST_5 # qt5 depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # qt5 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # qt5 - depends on !BR2_arc # qt5 depends on BR2_PACKAGE_HAS_UDEV # qt5 input select BR2_PACKAGE_QT5 select BR2_PACKAGE_QT5BASE_FONTCONFIG # runtime @@ -38,15 +39,14 @@ config BR2_PACKAGE_WIRESHARK_GUI Enable Qt5 GUI comment "Qt5 GUI needs a udev /dev management and a toolchain w/ C++, NPTL, host gcc >= 5.0, gcc >= 5.0" - depends on !BR2_arc depends on !BR2_PACKAGE_HAS_UDEV || !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || \ !BR2_HOST_GCC_AT_LEAST_5 endif # BR2_PACKAGE_WIRESHARK -comment "wireshark needs a toolchain w/ wchar, threads, dynamic library" +comment "wireshark needs a toolchain w/ wchar, threads, dynamic library, C++" depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS + BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP diff --git a/package/wireshark/wireshark.hash b/package/wireshark/wireshark.hash index db1f71e9ef2..f044f99483b 100644 --- a/package/wireshark/wireshark.hash +++ b/package/wireshark/wireshark.hash @@ -1,6 +1,7 @@ -# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-3.4.12.txt -sha1 91ca69b0029e58b9c824266237ab392a62f0a248 wireshark-3.4.12.tar.xz -sha256 881a13303e263b7dc7fe337534c8a541d4914552287879bed30bbe76c5bf68ca wireshark-3.4.12.tar.xz +# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-4.0.8.txt +sha1 8ca1cc4471d0cb835cd5216833c393fa23bc154f wireshark-4.0.8.tar.xz +sha256 16663585c0ffefd5593a6628d4a20cc8241b9703b11283cfe71ead2b750888c8 wireshark-4.0.8.tar.xz # Locally calculated -sha256 7cdbed2b697efaa45576a033f1ac0e73cd045644a91c79bbf41d4a7d81dac7bf COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 fce67c1558e448fac784ce9a30cb47956488bc3ef6ec16316c38b0668b3cad2e README.md diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index a5ca4b1f73a..500bdbb77a9 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -4,11 +4,11 @@ # ################################################################################ -WIRESHARK_VERSION = 3.4.12 +WIRESHARK_VERSION = 4.0.8 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license -WIRESHARK_LICENSE_FILES = COPYING +WIRESHARK_LICENSE_FILES = COPYING README.md WIRESHARK_CPE_ID_VENDOR = wireshark WIRESHARK_SELINUX_MODULES = wireshark WIRESHARK_DEPENDENCIES = \ @@ -18,20 +18,22 @@ WIRESHARK_DEPENDENCIES = \ libgcrypt \ libglib2 \ libpcap \ + pcre2 \ speexdsp WIRESHARK_CONF_OPTS = \ - -DDISABLE_WERROR=ON \ -DENABLE_ILBC=OFF \ -DENABLE_PCAP=ON \ -DENABLE_SMI=OFF \ - -DLEMON_C_COMPILER=$(HOSTCC) + -DENABLE_WERROR=OFF \ + -DHAVE_C99_VSNPRINTF=ON \ + -DLEMON_C_COMPILER=$(HOSTCC_NOCCACHE) ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) WIRESHARK_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic endif -ifeq ($(BR2_GCC_ENABLE_LTO),y) +ifeq ($(BR2_ENABLE_LTO),y) WIRESHARK_CONF_OPTS += -DENABLE_LTO=ON else WIRESHARK_CONF_OPTS += -DENABLE_LTO=OFF @@ -65,6 +67,13 @@ else WIRESHARK_CONF_OPTS += -DENABLE_GNUTLS=OFF endif +ifeq ($(BR2_PACKAGE_LIBCAP),y) +WIRESHARK_CONF_OPTS += -DENABLE_CAP=ON +WIRESHARK_DEPENDENCIES += libcap +else +WIRESHARK_CONF_OPTS += -DENABLE_CAP=OFF +endif + ifeq ($(BR2_PACKAGE_LIBKRB5),y) WIRESHARK_CONF_OPTS += -DENABLE_KERBEROS=ON WIRESHARK_DEPENDENCIES += libkrb5 @@ -115,6 +124,13 @@ else WIRESHARK_CONF_OPTS += -DENABLE_LZ4=OFF endif +ifeq ($(BR2_PACKAGE_MINIZIP_ZLIB),y) +WIRESHARK_CONF_OPTS += -DENABLE_MINIZIP=ON +WIRESHARK_DEPENDENCIES += minizip-zlib +else +WIRESHARK_CONF_OPTS += -DENABLE_MINIZIP=OFF +endif + ifeq ($(BR2_PACKAGE_NGHTTP2),y) WIRESHARK_CONF_OPTS += -DENABLE_NGHTTP2=ON WIRESHARK_DEPENDENCIES += nghttp2 @@ -157,6 +173,13 @@ else WIRESHARK_CONF_OPTS += -DBUILD_sdjournal=OFF endif +ifeq ($(BR2_PACKAGE_ZLIB),y) +WIRESHARK_CONF_OPTS += -DENABLE_ZLIB=ON +WIRESHARK_DEPENDENCIES += zlib +else +WIRESHARK_CONF_OPTS += -DENABLE_ZLIB=OFF +endif + ifeq ($(BR2_PACKAGE_ZSTD),y) WIRESHARK_CONF_OPTS += -DENABLE_ZSTD=ON WIRESHARK_DEPENDENCIES += zstd diff --git a/package/wlroots/Config.in b/package/wlroots/Config.in index 8d485992f50..fb23e9069c4 100644 --- a/package/wlroots/Config.in +++ b/package/wlroots/Config.in @@ -27,7 +27,7 @@ config BR2_PACKAGE_WLROOTS wlroots is a modular Wayland library for building compositors which implements many of their common features. - https://github.com/swaywm/wlroots + https://gitlab.freedesktop.org/wlroots/wlroots if BR2_PACKAGE_WLROOTS @@ -41,4 +41,27 @@ config BR2_PACKAGE_WLROOTS_X11 help Support Wayland sessions nested inside a X11 window +config BR2_PACKAGE_WLROOTS_XWAYLAND + bool "XWayland support" + depends on BR2_PACKAGE_XORG7 # libxcb, xcb-util-wm, xwayland + depends on BR2_USE_MMU # xwayland + depends on !BR2_STATIC_LIBS # xwayland + depends on BR2_TOOLCHAIN_HAS_THREADS # xwayland + depends on !BR2_RISCV_32 # xwayland -> xlib_libxshmfence + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # xwayland -> xlib_libxshmfence + select BR2_PACKAGE_LIBXCB + select BR2_PACKAGE_XCB_UTIL_WM + select BR2_PACKAGE_XWAYLAND + help + Support for running X11 applications under wayland + +comment "XWayland support needs X.org enabled" + depends on !BR2_PACKAGE_XORG7 + +comment "XWayland support needs a toolchain w/ threads, dynamic library" + depends on BR2_USE_MMU + depends on !BR2_RISCV_32 + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + endif diff --git a/package/wlroots/wlroots.hash b/package/wlroots/wlroots.hash index fdebe1ef684..04bbd65e430 100644 --- a/package/wlroots/wlroots.hash +++ b/package/wlroots/wlroots.hash @@ -1,5 +1,5 @@ -# Generated locally, after checking https://github.com/swaywm/wlroots/releases/download/0.14.1/wlroots-0.14.1.tar.gz.sig -sha256 448a83d579ac280357c8a4e902b9477bacbab81cc4d9c140e443642d458869db wlroots-0.14.1.tar.gz +# Generated locally, after checking https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/0.15.1/downloads/wlroots-0.15.1.tar.gz.sig +sha256 5b92f11a52d978919ed1306e0d54c9d59f1762b28d44f0a2da3ef3b351305373 wlroots-0.15.1.tar.gz # Hashes for license files: sha256 ffd3737a478b83a8b51b42757d3bf909ef36694508355879722e11fc1fa6736b LICENSE diff --git a/package/wlroots/wlroots.mk b/package/wlroots/wlroots.mk index 89d50241762..5b930a51be9 100644 --- a/package/wlroots/wlroots.mk +++ b/package/wlroots/wlroots.mk @@ -4,8 +4,8 @@ # ################################################################################ -WLROOTS_VERSION = 0.14.1 -WLROOTS_SITE = https://github.com/swaywm/wlroots/releases/download/$(WLROOTS_VERSION) +WLROOTS_VERSION = 0.15.1 +WLROOTS_SITE = https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/$(WLROOTS_VERSION)/downloads WLROOTS_LICENSE = MIT WLROOTS_LICENSE_FILES = LICENSE WLROOTS_INSTALL_STAGING = YES @@ -23,21 +23,30 @@ WLROOTS_DEPENDENCIES = \ wayland \ wayland-protocols -WLROOTS_CONF_OPTS = -Dexamples=false -Dxcb-errors=disabled -Drenderers=gles2 +WLROOTS_CONF_OPTS = -Dexamples=false -Dxcb-errors=disabled -ifeq ($(BR2_PACKAGE_FFMPEG),y) -WLROOTS_DEPENDENCIES += ffmpeg -endif - -ifeq ($(BR2_PACKAGE_LIBPNG),y) -WLROOTS_DEPENDENCIES += libpng -endif +WLROOTS_RENDERERS = gles2 +WLROOTS_BACKENDS = libinput drm ifeq ($(BR2_PACKAGE_WLROOTS_X11),y) -WLROOTS_CONF_OPTS += -Dx11-backend=enabled -Dxwayland=enabled +WLROOTS_BACKENDS += x11 WLROOTS_DEPENDENCIES += libxcb xcb-util-wm xcb-util-renderutil xlib_libX11 +endif + +ifeq ($(BR2_PACKAGE_WLROOTS_XWAYLAND),y) +WLROOTS_CONF_OPTS += -Dxwayland=enabled +WLROOTS_DEPENDENCIES += libxcb xcb-util-wm xwayland else -WLROOTS_CONF_OPTS += -Dx11-backend=disabled -Dxwayland=disabled +WLROOTS_CONF_OPTS += -Dxwayland=disabled +endif + +ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER),y) +WLROOTS_RENDERERS += vulkan +WLROOTS_DEPENDENCIES += mesa3d endif +WLROOTS_CONF_OPTS += \ + -Dbackends=$(subst $(space),$(comma),$(strip $(WLROOTS_BACKENDS))) \ + -Drenderers=$(subst $(space),$(comma),$(strip $(WLROOTS_RENDERERS))) + $(eval $(meson-package)) diff --git a/package/woff2/woff2.hash b/package/woff2/woff2.hash index 469071e3c2b..0812dabcf12 100644 --- a/package/woff2/woff2.hash +++ b/package/woff2/woff2.hash @@ -1,5 +1,5 @@ # Locally generated: -sha512 c788bba1530aec463e755e901f9342f4b599e3a07f54645fef1dc388ab5d5c30625535e5dd38e9e792e04a640574baa50eeefb6b7338ab403755f4a4e0c3044d v1.0.2.tar.gz +sha512 c788bba1530aec463e755e901f9342f4b599e3a07f54645fef1dc388ab5d5c30625535e5dd38e9e792e04a640574baa50eeefb6b7338ab403755f4a4e0c3044d woff2-1.0.2.tar.gz # Hash for license files: sha512 8ee924da3fb5d16135adcf6a8fbe9e2e8f3d2d80468617e72ca4fa059a60f8455c9a5f68a8dc381b1297c8bf39c887a912d0f69246d2604ada74d3da9e8e490b LICENSE diff --git a/package/woff2/woff2.mk b/package/woff2/woff2.mk index b2ff33fe989..937e8cf7360 100644 --- a/package/woff2/woff2.mk +++ b/package/woff2/woff2.mk @@ -5,8 +5,7 @@ ################################################################################ WOFF2_VERSION = 1.0.2 -WOFF2_SOURCE = v$(WOFF2_VERSION).tar.gz -WOFF2_SITE = https://github.com/google/woff2/archive +WOFF2_SITE = $(call github,google,woff2,v$(WOFF2_VERSION)) WOFF2_LICENSE = MIT WOFF2_LICENSE_FILES = LICENSE WOFF2_INSTALL_STAGING = YES diff --git a/package/wolfssl/Config.in b/package/wolfssl/Config.in index 3c6d68f592f..9d173412fed 100644 --- a/package/wolfssl/Config.in +++ b/package/wolfssl/Config.in @@ -1,3 +1,15 @@ +config BR2_PACKAGE_WOLFSSL_ASM_SUPPORTS + bool + default y if BR2_aarch64 + default y if (BR2_arm || BR2_armeb) && !BR2_ARM_CPU_ARMV4 # clz + default y if BR2_powerpc + default y if BR2_powerpc64 || BR2_powerpc64le + default y if BR2_mips64 && !BR2_MIPS_CPU_MIPS32R6 + default y if BR2_mips64el && !BR2_MIPS_CPU_MIPS32R6 + default y if BR2_mips || BR2_mipsel + default y if BR2_riscv && BR2_RISCV_ISA_RVM + default y if BR2_s390x + config BR2_PACKAGE_WOLFSSL bool "wolfssl" depends on BR2_TOOLCHAIN_HAS_THREADS @@ -13,9 +25,13 @@ if BR2_PACKAGE_WOLFSSL config BR2_PACKAGE_WOLFSSL_ALL bool "enable all features, except SSLv3" + depends on !BR2_STATIC_LIBS help Enable all wolfSSL features, except SSL version 3.0 support. +comment "all features, except SSLv3 needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS + config BR2_PACKAGE_WOLFSSL_SSLV3 bool "enable SSLv3" help diff --git a/package/wolfssl/wolfssl.hash b/package/wolfssl/wolfssl.hash index 63eebf93bb4..08262113a0b 100644 --- a/package/wolfssl/wolfssl.hash +++ b/package/wolfssl/wolfssl.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 409b4646c5f54f642de0e9f3544c3b83de7238134f5b1ff93fb44527bf119d05 wolfssl-5.2.0.tar.gz +sha256 fd3135b8657d09fb96a8aad16585da850b96ea420ae8ce5ac4d5fdfc614c2683 wolfssl-5.5.3.tar.gz # Hash for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/wolfssl/wolfssl.mk b/package/wolfssl/wolfssl.mk index bfb54445e4c..9f06bb1b4b5 100644 --- a/package/wolfssl/wolfssl.mk +++ b/package/wolfssl/wolfssl.mk @@ -4,14 +4,14 @@ # ################################################################################ -WOLFSSL_VERSION = 5.2.0 +WOLFSSL_VERSION = 5.5.3 WOLFSSL_SITE = $(call github,wolfSSL,wolfssl,v$(WOLFSSL_VERSION)-stable) WOLFSSL_INSTALL_STAGING = YES WOLFSSL_LICENSE = GPL-2.0+ WOLFSSL_LICENSE_FILES = COPYING LICENSING WOLFSSL_CPE_ID_VENDOR = wolfssl - +WOLFSSL_CONFIG_SCRIPTS = wolfssl-config WOLFSSL_DEPENDENCIES = host-pkgconf # wolfssl's source code is released without a configure @@ -32,17 +32,25 @@ else WOLFSSL_CONF_OPTS += --disable-sslv3 endif +ifeq ($(BR2_PACKAGE_WOLFSSL_ASM_SUPPORTS),y) +WOLFSSL_CONF_OPTS += --enable-asm +else +WOLFSSL_CONF_OPTS += --disable-asm +endif + # enable ARMv8 hardware acceleration -ifeq ($(BR2_ARM_CPU_ARMV8A),y) +ifeq ($(BR2_aarch64),y) WOLFSSL_CONF_OPTS += --enable-armasm # the flag -mstrict-align is needed to prevent build errors caused by # some inline assembly in parts of the AES structure using the "m" # constraint -ifeq ($(BR2_aarch64),y) WOLFSSL_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -mstrict-align" -endif else WOLFSSL_CONF_OPTS += --disable-armasm endif +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +WOLFSSL_CONF_OPTS += --with-arm-target=thumb +endif + $(eval $(autotools-package)) diff --git a/package/wolftpm/Config.in b/package/wolftpm/Config.in new file mode 100644 index 00000000000..4ed1853bde2 --- /dev/null +++ b/package/wolftpm/Config.in @@ -0,0 +1,46 @@ +config BR2_PACKAGE_WOLFTPM + bool "wolftpm" + help + wolfTPM is a portable, open-source TPM 2.0 stack with + backward API compatibility, designed for embedded use. + No external dependencies, compact code size with low + resource usage. + + https://www.wolfssl.com/ + +if BR2_PACKAGE_WOLFTPM + +config BR2_PACKAGE_WOLFTPM_WOLFCRYPT + bool "wolfCrypt hooks" + default y + depends on BR2_TOOLCHAIN_HAS_THREADS # wolfssl + depends on !BR2_STATIC_LIBS # wolfssl-all + select BR2_PACKAGE_WOLFSSL + # not mandatory, but needed to get all features + select BR2_PACKAGE_WOLFSSL_ALL + help + Enable wolfCrypt hooks for RNG, Auth Sessions and Parameter + encryption. Disabling this option is not recommended as it + could create a security breach in most environments. + +comment "wolfCrypt hooks need a toolchain w/ threads, dynamic library" + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + +config BR2_PACKAGE_WOLFTPM_ST33 + bool "ST33 extra functionality" + help + Enable support of TPM 2.0 extra functionality offered by the + STMicroelectronics ST33 chip. + +config BR2_PACKAGE_WOLFTPM_NUVOTON + bool "NPCT750 extra functionality" + help + Enable support of TPM 2.0 extra functionality offered by the + Nuvoton NPCT750 chip. + +config BR2_PACKAGE_WOLFTPM_DEBUG + bool "Debug output" + help + Enable debug messages in wolfTPM. + +endif diff --git a/package/wolftpm/wolftpm.hash b/package/wolftpm/wolftpm.hash new file mode 100644 index 00000000000..3329528095f --- /dev/null +++ b/package/wolftpm/wolftpm.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 d8e06e77893f104be7eb9421cac50518552ad9c5fc7fe8a9c1cdfaf4f11b92df wolftpm-2.7.0.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/wolftpm/wolftpm.mk b/package/wolftpm/wolftpm.mk new file mode 100644 index 00000000000..db332712f50 --- /dev/null +++ b/package/wolftpm/wolftpm.mk @@ -0,0 +1,56 @@ +################################################################################ +# +# wolftpm +# +################################################################################ + +WOLFTPM_VERSION = 2.7.0 +WOLFTPM_SITE = $(call github,wolfSSL,wolfTPM,v$(WOLFTPM_VERSION)) +WOLFTPM_INSTALL_STAGING = YES +WOLFTPM_LICENSE = GPL-2.0+ +WOLFTPM_LICENSE_FILES = LICENSE +WOLFTPM_CONFIG_SCRIPTS = wolftpm-config + +# wolfTPM's source code is released without a configure script, +# therefore we need autoreconf +WOLFTPM_AUTORECONF = YES + +WOLFTPM_CONF_OPTS = \ + --disable-examples \ + --enable-devtpm + +# Fix for missing config.rpath in the codebase +define WOLFTPM_TOUCH_CONFIG_RPATH + mkdir -p $(@D)/build-aux + touch $(@D)/build-aux/config.rpath +endef +WOLFTPM_PRE_CONFIGURE_HOOKS += WOLFTPM_TOUCH_CONFIG_RPATH + +ifeq ($(BR2_PACKAGE_WOLFTPM_WOLFCRYPT),y) +WOLFTPM_CONF_OPTS += \ + --enable-wolfcrypt \ + --with-wolfcrypt=$(STAGING_DIR)/usr +WOLFTPM_DEPENDENCIES += wolfssl +else +WOLFTPM_CONF_OPTS += --disable-wolfcrypt +endif + +ifeq ($(BR2_PACKAGE_WOLFTPM_ST33),y) +WOLFTPM_CONF_OPTS += --enable-st33 +else +WOLFTPM_CONF_OPTS += --disable-st33 +endif + +ifeq ($(BR2_PACKAGE_WOLFTPM_NUVOTON),y) +WOLFTPM_CONF_OPTS += --enable-nuvoton +else +WOLFTPM_CONF_OPTS += --disable-nuvoton +endif + +ifeq ($(BR2_PACKAGE_WOLFTPM_DEBUG),y) +WOLFTPM_CONF_OPTS += --enable-debug +else +WOLFTPM_CONF_OPTS += --disable-debug +endif + +$(eval $(autotools-package)) diff --git a/package/wpa_supplicant/0002-wpa_supplicant-use-a-less-generic-name-for-IEEE802.1.patch b/package/wpa_supplicant/0002-wpa_supplicant-use-a-less-generic-name-for-IEEE802.1.patch new file mode 100644 index 00000000000..a8637111bb5 --- /dev/null +++ b/package/wpa_supplicant/0002-wpa_supplicant-use-a-less-generic-name-for-IEEE802.1.patch @@ -0,0 +1,79 @@ +From c8af2e431b47d7d900e0c7359705aaa1096d302a Mon Sep 17 00:00:00 2001 +From: Sergey Matyukevich +Date: Fri, 16 Sep 2022 23:18:50 +0300 +Subject: [PATCH] wpa_supplicant: use a less generic name for IEEE802.11 CRC-32 routine + +Hostapd uses 'crc32' name for IEEE802.11 CRC-32 routine. This name is +too generic. Buildroot autobuilder detected build configuration that +failed to build due to the naming conflict: static linking with openssl +using zlib-ng as a zlib provider, e.g. see: +- http://autobuild.buildroot.net/results/9901df820d3afa4cde78e8ad6d62cb8ce7e69fdb/ +- http://autobuild.buildroot.net/results/ac19975f0bf77f4a8ca574c374092ba81cd5a332/ + +Use a less generic name ieee80211_crc32 for IEEE802.11 CRC-32 routine +to avoid such naming conflicts. + +Upstream: https://w1.fi/cgit/hostap/commit/?id=0c7b3814ca6070a8e930dea09fde08b4058a4ca6 +Signed-off-by: Sergey Matyukevich +--- + src/ap/hostapd.c | 3 ++- + src/ap/neighbor_db.c | 2 +- + src/utils/crc32.c | 2 +- + src/utils/crc32.h | 2 +- + 4 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c +index 4b88641a2..56c8fb90e 100644 +--- a/src/ap/hostapd.c ++++ b/src/ap/hostapd.c +@@ -1230,7 +1230,8 @@ static int hostapd_setup_bss(struct hostapd_data *hapd, int first) + * Short SSID calculation is identical to FCS and it is defined in + * IEEE P802.11-REVmd/D3.0, 9.4.2.170.3 (Calculating the Short-SSID). + */ +- conf->ssid.short_ssid = crc32(conf->ssid.ssid, conf->ssid.ssid_len); ++ conf->ssid.short_ssid = ieee80211_crc32(conf->ssid.ssid, ++ conf->ssid.ssid_len); + + if (!hostapd_drv_none(hapd)) { + wpa_printf(MSG_DEBUG, "Using interface %s with hwaddr " MACSTR +diff --git a/src/ap/neighbor_db.c b/src/ap/neighbor_db.c +index 229edd2a9..ef17634c3 100644 +--- a/src/ap/neighbor_db.c ++++ b/src/ap/neighbor_db.c +@@ -136,7 +136,7 @@ int hostapd_neighbor_set(struct hostapd_data *hapd, const u8 *bssid, + + os_memcpy(entry->bssid, bssid, ETH_ALEN); + os_memcpy(&entry->ssid, ssid, sizeof(entry->ssid)); +- entry->short_ssid = crc32(ssid->ssid, ssid->ssid_len); ++ entry->short_ssid = ieee80211_crc32(ssid->ssid, ssid->ssid_len); + + entry->nr = wpabuf_dup(nr); + if (!entry->nr) +diff --git a/src/utils/crc32.c b/src/utils/crc32.c +index 12d9e2a70..371254994 100644 +--- a/src/utils/crc32.c ++++ b/src/utils/crc32.c +@@ -72,7 +72,7 @@ static const u32 crc32_table[256] = { + }; + + +-u32 crc32(const u8 *frame, size_t frame_len) ++u32 ieee80211_crc32(const u8 *frame, size_t frame_len) + { + size_t i; + u32 crc; +diff --git a/src/utils/crc32.h b/src/utils/crc32.h +index dc31399be..71a19dc5f 100644 +--- a/src/utils/crc32.h ++++ b/src/utils/crc32.h +@@ -9,6 +9,6 @@ + #ifndef CRC32_H + #define CRC32_H + +-u32 crc32(const u8 *frame, size_t frame_len); ++u32 ieee80211_crc32(const u8 *frame, size_t frame_len); + + #endif /* CRC32_H */ +-- +2.37.1 + diff --git a/package/wpa_supplicant/0003-Include-HMAC-SHA384-512-KDF-for-SAE-if-SHA384-512-is.patch b/package/wpa_supplicant/0003-Include-HMAC-SHA384-512-KDF-for-SAE-if-SHA384-512-is.patch new file mode 100644 index 00000000000..98df56e5406 --- /dev/null +++ b/package/wpa_supplicant/0003-Include-HMAC-SHA384-512-KDF-for-SAE-if-SHA384-512-is.patch @@ -0,0 +1,64 @@ +From c7f71fb8679c4cdd2607dbaac467a1d5efe9f0f9 Mon Sep 17 00:00:00 2001 +From: Jouni Malinen +Date: Sun, 17 Apr 2022 12:28:41 +0300 +Subject: [PATCH] Include HMAC-SHA384/512 KDF for SAE if SHA384/512 is included + +It was possible to miss the HMAC functions if some other build +configuration parameters ended up setting NEED_SHA384/512=y. + +Upstream: https://w1.fi/cgit/hostap/commit/?id=c7f71fb8679c4cdd2607dbaac467a1d5efe9f0f9 + +Signed-off-by: Jouni Malinen +Signed-off-by: Sergey Matyukevich +--- + wpa_supplicant/Android.mk | 11 +++++++++++ + wpa_supplicant/Makefile | 11 +++++++++++ + 2 files changed, 22 insertions(+) + +diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk +index 0e0ce467c..bcdbd6c90 100644 +--- a/wpa_supplicant/Android.mk ++++ b/wpa_supplicant/Android.mk +@@ -1361,6 +1361,17 @@ endif + endif + endif + ++ifdef CONFIG_SAE ++ifdef NEED_SHA384 ++# Need to add HMAC-SHA384 KDF as well, if SHA384 was enabled. ++NEED_HMAC_SHA384_KDF=y ++endif ++ifdef NEED_SHA512 ++# Need to add HMAC-SHA512 KDF as well, if SHA512 was enabled. ++NEED_HMAC_SHA512_KDF=y ++endif ++endif ++ + SHA256OBJS = # none by default + L_CFLAGS += -DCONFIG_SHA256 + ifneq ($(CONFIG_TLS), openssl) +diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile +index ed49aa972..69c80121c 100644 +--- a/wpa_supplicant/Makefile ++++ b/wpa_supplicant/Makefile +@@ -1475,6 +1475,17 @@ endif + endif + endif + ++ifdef CONFIG_SAE ++ifdef NEED_SHA384 ++# Need to add HMAC-SHA384 KDF as well, if SHA384 was enabled. ++NEED_HMAC_SHA384_KDF=y ++endif ++ifdef NEED_SHA512 ++# Need to add HMAC-SHA512 KDF as well, if SHA512 was enabled. ++NEED_HMAC_SHA512_KDF=y ++endif ++endif ++ + SHA256OBJS = # none by default + CFLAGS += -DCONFIG_SHA256 + ifneq ($(CONFIG_TLS), openssl) +-- +2.39.2 + diff --git a/package/wpa_supplicant/Config.in b/package/wpa_supplicant/Config.in index 8f095cdf2d2..92953f69f07 100644 --- a/package/wpa_supplicant/Config.in +++ b/package/wpa_supplicant/Config.in @@ -41,12 +41,21 @@ config BR2_PACKAGE_WPA_SUPPLICANT_WEXT config BR2_PACKAGE_WPA_SUPPLICANT_WIRED bool "Enable wired support" + depends on BR2_TOOLCHAIN_HAS_THREADS # libnl + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_6 + select BR2_PACKAGE_LIBNL select BR2_PACKAGE_WPA_SUPPLICANT_EAP help Include the "wired" driver, so the internal IEEE 802.1x supplicant can be used with Ethernet. This also enables support for MACSEC. +comment "wired macsec support needs a toolchain w/ headers >= 4.6" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_6 + +comment "wired support needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS + comment "wpa_supplicant will be useless without at least one driver" depends on !BR2_PACKAGE_WPA_SUPPLICANT_NL80211 && \ !BR2_PACKAGE_WPA_SUPPLICANT_WEXT && \ @@ -84,6 +93,13 @@ config BR2_PACKAGE_WPA_SUPPLICANT_MESH_NETWORKING Enable support for open and secured mesh networking (IEEE 802.11s) +config BR2_PACKAGE_WPA_SUPPLICANT_OVERRIDES + bool "Enable HT/VHT/HE overrides" + help + Enable wpa_supplicant overrides for HT, VHT and HE (disable + HT/HT40, mask MCS rates, etc.) in wpa_supplicant + configuration file. + config BR2_PACKAGE_WPA_SUPPLICANT_AUTOSCAN bool "Enable autoscan" help diff --git a/package/wpa_supplicant/ifupdown.sh b/package/wpa_supplicant/ifupdown.sh new file mode 100755 index 00000000000..569344b683d --- /dev/null +++ b/package/wpa_supplicant/ifupdown.sh @@ -0,0 +1,49 @@ +#!/bin/sh + +# This file is executed by ifupdown in pre-up, post-up, pre-down and +# post-down phases of network interface configuration. + +WPA_SUP_BIN="/usr/sbin/wpa_supplicant" + +# run this script only for interfaces which have wpa-conf option +[ -z "$IF_WPA_CONF" ] && exit 0 + +# Allow wpa_supplicant interface to be specified via wpa-iface +# useful for starting wpa_supplicant on one interface of a bridge +if [ -n "$IF_WPA_IFACE" ]; then + WPA_IFACE="$IF_WPA_IFACE" +else + WPA_IFACE="$IFACE" +fi + +WPA_SUP_PIDFILE="/run/wpa_supplicant.${WPA_IFACE}.pid" + +do_start () { + if [ ! -s "$IF_WPA_CONF" ]; then + echo "cannot read contents of $IF_WPA_CONF" + exit 1 + fi + WPA_SUP_CONF="-c $IF_WPA_CONF" +} + +case "$MODE" in + start) + do_start + case "$PHASE" in + post-up) + start-stop-daemon -S -q -x ${WPA_SUP_BIN} \ + -- -B -i ${WPA_IFACE} ${WPA_SUP_CONF} -P ${WPA_SUP_PIDFILE} + ;; + esac + ;; + + stop) + case "$PHASE" in + pre-down) + start-stop-daemon -K -p ${WPA_SUP_PIDFILE} + ;; + esac + ;; +esac + +exit 0 diff --git a/package/wpa_supplicant/wpa_supplicant.conf b/package/wpa_supplicant/wpa_supplicant.conf index 1994a6c7394..20e9f7f842e 100644 --- a/package/wpa_supplicant/wpa_supplicant.conf +++ b/package/wpa_supplicant/wpa_supplicant.conf @@ -1,4 +1,4 @@ -ctrl_interface=/var/run/wpa_supplicant +#ctrl_interface=/var/run/wpa_supplicant ap_scan=1 network={ diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk index f0eb36e083d..42c6f772acb 100644 --- a/package/wpa_supplicant/wpa_supplicant.mk +++ b/package/wpa_supplicant/wpa_supplicant.mk @@ -13,7 +13,6 @@ WPA_SUPPLICANT_CONFIG = $(WPA_SUPPLICANT_DIR)/wpa_supplicant/.config WPA_SUPPLICANT_SUBDIR = wpa_supplicant WPA_SUPPLICANT_DBUS_SERVICE = fi.w1.wpa_supplicant1 WPA_SUPPLICANT_CFLAGS = $(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libnl3/ -WPA_SUPPLICANT_LDFLAGS = $(TARGET_LDFLAGS) WPA_SUPPLICANT_SELINUX_MODULES = networkmanager # install the wpa_client library @@ -63,11 +62,18 @@ WPA_SUPPLICANT_CONFIG_DISABLE += \ CONFIG_FILS endif -ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_WIRED),) +ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_WIRED),y) +WPA_SUPPLICANT_DEPENDENCIES += host-pkgconf libnl +WPA_SUPPLICANT_CONFIG_ENABLE += \ + CONFIG_LIBNL32 \ + CONFIG_DRIVER_WIRED \ + CONFIG_MACSEC \ + CONFIG_DRIVER_MACSEC_LINUX +else WPA_SUPPLICANT_CONFIG_DISABLE += \ CONFIG_DRIVER_WIRED \ CONFIG_MACSEC \ - CONFIG_DRIVER_MACSEC + CONFIG_DRIVER_MACSEC_LINUX endif ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_HOTSPOT),) @@ -98,6 +104,18 @@ else WPA_SUPPLICANT_CONFIG_DISABLE += CONFIG_MESH endif +ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_OVERRIDES),y) +WPA_SUPPLICANT_CONFIG_ENABLE += \ + CONFIG_HT_OVERRIDES \ + CONFIG_VHT_OVERRIDES \ + CONFIG_HE_OVERRIDES +else +WPA_SUPPLICANT_CONFIG_DISABLE += \ + CONFIG_HT_OVERRIDES \ + CONFIG_VHT_OVERRIDES \ + CONFIG_HE_OVERRIDES +endif + ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_AUTOSCAN),y) WPA_SUPPLICANT_CONFIG_ENABLE += \ CONFIG_AUTOSCAN_EXPONENTIAL \ @@ -112,11 +130,13 @@ ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_WPA3),y) WPA_SUPPLICANT_CONFIG_ENABLE += \ CONFIG_DPP \ CONFIG_SAE \ + CONFIG_SAE_PK \ CONFIG_OWE else WPA_SUPPLICANT_CONFIG_DISABLE += \ CONFIG_DPP \ CONFIG_SAE \ + CONFIG_SAE_PK \ CONFIG_OWE endif @@ -136,9 +156,6 @@ endif ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_DBUS),y) WPA_SUPPLICANT_DEPENDENCIES += host-pkgconf dbus -WPA_SUPPLICANT_MAKE_ENV = \ - PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \ - PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_CTRL_IFACE_DBUS_NEW define WPA_SUPPLICANT_INSTALL_DBUS_NEW $(INSTALL) -m 0644 -D \ @@ -163,6 +180,12 @@ WPA_SUPPLICANT_DEPENDENCIES += readline WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_READLINE 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_WPA_CLIENT_SO),y) WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_BUILD_WPA_CLIENT_SO define WPA_SUPPLICANT_INSTALL_WPA_CLIENT_SO @@ -229,6 +252,16 @@ define WPA_SUPPLICANT_INSTALL_STAGING_CMDS $(WPA_SUPPLICANT_INSTALL_STAGING_WPA_CLIENT_SO) endef +ifeq ($(BR2_PACKAGE_IFUPDOWN_SCRIPTS),y) +define WPA_SUPPLICANT_INSTALL_IFUP_SCRIPTS + $(INSTALL) -m 0755 -D package/wpa_supplicant/ifupdown.sh \ + $(TARGET_DIR)/etc/network/if-up.d/wpasupplicant + mkdir -p $(TARGET_DIR)/etc/network/if-down.d + ln -sf ../if-up.d/wpasupplicant \ + $(TARGET_DIR)/etc/network/if-down.d/wpasupplicant +endef +endif + define WPA_SUPPLICANT_INSTALL_TARGET_CMDS $(INSTALL) -m 0755 -D $(@D)/$(WPA_SUPPLICANT_SUBDIR)/wpa_supplicant \ $(TARGET_DIR)/usr/sbin/wpa_supplicant @@ -238,6 +271,8 @@ define WPA_SUPPLICANT_INSTALL_TARGET_CMDS $(WPA_SUPPLICANT_INSTALL_PASSPHRASE) $(WPA_SUPPLICANT_INSTALL_DBUS) $(WPA_SUPPLICANT_INSTALL_WPA_CLIENT_SO) + $(WPA_SUPPLICANT_INSTALL_IFUP_SCRIPTS) + $(WPA_SUPPLICANT_ENABLE_CTRL_IFACE) endef define WPA_SUPPLICANT_INSTALL_INIT_SYSTEMD diff --git a/package/wpan-tools/wpan-tools.hash b/package/wpan-tools/wpan-tools.hash index c9f0df2c1bb..814e3b0f7a1 100644 --- a/package/wpan-tools/wpan-tools.hash +++ b/package/wpan-tools/wpan-tools.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3e509d9ed838df1247cc9a0c6ca483cb356ae778851817bd7410044687b655e2 wpan-tools-0.9.tar.gz -sha256 fe8e595c24d821a60885eb259619df5e5e3976c48465fde0be29fcd78530798f COPYING +sha256 3e509d9ed838df1247cc9a0c6ca483cb356ae778851817bd7410044687b655e2 wpan-tools-0.9.tar.gz +sha256 fe8e595c24d821a60885eb259619df5e5e3976c48465fde0be29fcd78530798f COPYING diff --git a/package/wpebackend-fdo/wpebackend-fdo.hash b/package/wpebackend-fdo/wpebackend-fdo.hash index 06289900b0d..26ba1217271 100644 --- a/package/wpebackend-fdo/wpebackend-fdo.hash +++ b/package/wpebackend-fdo/wpebackend-fdo.hash @@ -1,7 +1,6 @@ -# From https://wpewebkit.org/releases/wpebackend-fdo-1.12.0.tar.xz.sums -md5 c43b34a4b4933bcd80068ae5776ee346 wpebackend-fdo-1.12.0.tar.xz -sha1 e2576d564bd6d9a86737a4cd31dd5827ebc00fdf wpebackend-fdo-1.12.0.tar.xz -sha256 6239c9c15523410798d66315de6b491712ab30009ba180f3e0dd076d9b0074ac wpebackend-fdo-1.12.0.tar.xz +# From https://wpewebkit.org/releases/wpebackend-fdo-1.14.2.tar.xz.sums +sha1 f453f8d77e93f4ac6ac81c1874d4d6bdcb45c253 wpebackend-fdo-1.14.2.tar.xz +sha256 93c9766ae9864eeaeaee2b0a74f22cbca08df42c1a1bdb55b086f2528e380d38 wpebackend-fdo-1.14.2.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 5fe9c5397fd..7ef347b6221 100644 --- a/package/wpebackend-fdo/wpebackend-fdo.mk +++ b/package/wpebackend-fdo/wpebackend-fdo.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEBACKEND_FDO_VERSION = 1.12.0 +WPEBACKEND_FDO_VERSION = 1.14.2 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-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch b/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch new file mode 100644 index 00000000000..ea1676abb61 --- /dev/null +++ b/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch @@ -0,0 +1,328 @@ +From da159b0150cba0e5e5251e4cc6a090440f73cb7c Mon Sep 17 00:00:00 2001 +From: Adrian Perez de Castro +Date: Thu, 2 Jun 2022 11:19:06 +0300 +Subject: [PATCH] FELightningNEON.cpp fails to build, NEON fast path seems + unused https://bugs.webkit.org/show_bug.cgi?id=241182 + +Reviewed by NOBODY (OOPS!). + +Move the NEON fast path for the SVG lighting filter effects into +FELightingSoftwareApplier, and arrange to actually use them by +forwarding calls to applyPlatformGeneric() into applyPlatformNeon(). + +Some changes were needed to adapt platformApplyNeon() to the current +state of filters after r286140. This was not detected because the code +bitrotted due to it being guarded with CPU(ARM_TRADITIONAL), which does +not get used much these days: CPU(ARM_THUMB2) is more common. It should +be possible to use the NEON fast paths also in Thumb mode, but that is +left for a follow-up fix. + +* Source/WebCore/Sources.txt: +* Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp: +(WebCore::FELightingSoftwareApplier::platformApplyNeonWorker): +(WebCore::FELightingSoftwareApplier::getPowerCoefficients): +(WebCore::FELighting::platformApplyNeonWorker): Deleted. +(WebCore::FELighting::getPowerCoefficients): Deleted. +* Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h: +(WebCore::FELightingSoftwareApplier::applyPlatformNeon): +(WebCore::FELighting::platformApplyNeon): Deleted. +* Source/WebCore/platform/graphics/filters/DistantLightSource.h: +* Source/WebCore/platform/graphics/filters/FELighting.h: +* Source/WebCore/platform/graphics/filters/PointLightSource.h: +* Source/WebCore/platform/graphics/filters/SpotLightSource.h: +* Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h: + +Signed-off-by: Adrian Perez de Castro +[Upstream status: https://bugs.webkit.org/show_bug.cgi?id=241182] +--- + Source/WebCore/Sources.txt | 1 + + .../cpu/arm/filters/FELightingNEON.cpp | 4 +- + .../graphics/cpu/arm/filters/FELightingNEON.h | 54 +++++++++---------- + .../graphics/filters/DistantLightSource.h | 4 ++ + .../platform/graphics/filters/FELighting.h | 7 --- + .../graphics/filters/PointLightSource.h | 4 ++ + .../graphics/filters/SpotLightSource.h | 4 ++ + .../software/FELightingSoftwareApplier.h | 16 ++++++ + 8 files changed, 58 insertions(+), 36 deletions(-) + +diff --git a/Source/WebCore/Sources.txt b/Source/WebCore/Sources.txt +index 8ce3510fe1a8..efd56bcb8746 100644 +--- a/Source/WebCore/Sources.txt ++++ b/Source/WebCore/Sources.txt +@@ -2136,6 +2136,7 @@ platform/graphics/WebMResourceClient.cpp + platform/graphics/WOFFFileFormat.cpp + platform/graphics/WidthIterator.cpp + platform/graphics/cpu/arm/filters/FEBlendNeonApplier.cpp ++platform/graphics/cpu/arm/filters/FELightingNEON.cpp + platform/graphics/displaylists/DisplayList.cpp + platform/graphics/displaylists/DisplayListDrawingContext.cpp + platform/graphics/displaylists/DisplayListItems.cpp +diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp +index f6ff8c20a5a8..42a97ffc5372 100644 +--- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp ++++ b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp +@@ -49,7 +49,7 @@ short* feLightingConstantsForNeon() + return s_FELightingConstantsForNeon; + } + +-void FELighting::platformApplyNeonWorker(FELightingPaintingDataForNeon* parameters) ++void FELightingSoftwareApplier::platformApplyNeonWorker(FELightingPaintingDataForNeon* parameters) + { + neonDrawLighting(parameters); + } +@@ -464,7 +464,7 @@ TOSTRING(neonDrawLighting) ":" NL + "b .lightStrengthCalculated" NL + ); // NOLINT + +-int FELighting::getPowerCoefficients(float exponent) ++int FELightingSoftwareApplier::getPowerCoefficients(float exponent) + { + // Calling a powf function from the assembly code would require to save + // and reload a lot of NEON registers. Since the base is in range [0..1] +diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h +index b17c603d40d3..c6d17f573eca 100644 +--- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h ++++ b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h +@@ -24,14 +24,15 @@ + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +-#ifndef FELightingNEON_h +-#define FELightingNEON_h ++#pragma once + + #if CPU(ARM_NEON) && CPU(ARM_TRADITIONAL) && COMPILER(GCC_COMPATIBLE) + +-#include "FELighting.h" ++#include "FELightingSoftwareApplier.h" ++#include "ImageBuffer.h" + #include "PointLightSource.h" + #include "SpotLightSource.h" ++#include + #include + + namespace WebCore { +@@ -93,14 +94,14 @@ extern "C" { + void neonDrawLighting(FELightingPaintingDataForNeon*); + } + +-inline void FELighting::platformApplyNeon(const LightingData& data, const LightSource::PaintingData& paintingData) ++inline void FELightingSoftwareApplier::applyPlatformNeon(const FELightingSoftwareApplier::LightingData& data, const LightSource::PaintingData& paintingData) + { +- alignas(16) FELightingFloatArgumentsForNeon floatArguments; +- FELightingPaintingDataForNeon neonData = { +- data.pixels->data(), ++ WebCore::FELightingFloatArgumentsForNeon alignas(16) floatArguments; ++ WebCore::FELightingPaintingDataForNeon neonData = { ++ data.pixels->bytes(), + 1, +- data.widthDecreasedByOne - 1, +- data.heightDecreasedByOne - 1, ++ data.width - 2, ++ data.height - 2, + 0, + 0, + 0, +@@ -111,23 +112,23 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS + // Set light source arguments. + floatArguments.constOne = 1; + +- auto color = m_lightingColor.toColorTypeLossy>().resolved(); ++ auto color = data.lightingColor.toColorTypeLossy>().resolved(); + + floatArguments.colorRed = color.red; + floatArguments.colorGreen = color.green; + floatArguments.colorBlue = color.blue; + floatArguments.padding4 = 0; + +- if (m_lightSource->type() == LS_POINT) { ++ if (data.lightSource->type() == LS_POINT) { + neonData.flags |= FLAG_POINT_LIGHT; +- PointLightSource& pointLightSource = static_cast(m_lightSource.get()); ++ const auto& pointLightSource = *static_cast(data.lightSource); + floatArguments.lightX = pointLightSource.position().x(); + floatArguments.lightY = pointLightSource.position().y(); + floatArguments.lightZ = pointLightSource.position().z(); + floatArguments.padding2 = 0; +- } else if (m_lightSource->type() == LS_SPOT) { ++ } else if (data.lightSource->type() == LS_SPOT) { + neonData.flags |= FLAG_SPOT_LIGHT; +- SpotLightSource& spotLightSource = static_cast(m_lightSource.get()); ++ const auto& spotLightSource = *static_cast(data.lightSource); + floatArguments.lightX = spotLightSource.position().x(); + floatArguments.lightY = spotLightSource.position().y(); + floatArguments.lightZ = spotLightSource.position().z(); +@@ -145,7 +146,7 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS + if (spotLightSource.specularExponent() == 1) + neonData.flags |= FLAG_CONE_EXPONENT_IS_1; + } else { +- ASSERT(m_lightSource->type() == LS_DISTANT); ++ ASSERT(data.lightSource->type() == LS_DISTANT); + floatArguments.lightX = paintingData.initialLightingData.lightVector.x(); + floatArguments.lightY = paintingData.initialLightingData.lightVector.y(); + floatArguments.lightZ = paintingData.initialLightingData.lightVector.z(); +@@ -155,38 +156,39 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS + // Set lighting arguments. + floatArguments.surfaceScale = data.surfaceScale; + floatArguments.minusSurfaceScaleDividedByFour = -data.surfaceScale / 4; +- if (m_lightingType == FELighting::DiffuseLighting) +- floatArguments.diffuseConstant = m_diffuseConstant; ++ if (data.filterType == FilterEffect::Type::FEDiffuseLighting) ++ floatArguments.diffuseConstant = data.diffuseConstant; + else { + neonData.flags |= FLAG_SPECULAR_LIGHT; +- floatArguments.diffuseConstant = m_specularConstant; +- neonData.specularExponent = getPowerCoefficients(m_specularExponent); +- if (m_specularExponent == 1) ++ floatArguments.diffuseConstant = data.specularConstant; ++ neonData.specularExponent = getPowerCoefficients(data.specularExponent); ++ if (data.specularExponent == 1) + neonData.flags |= FLAG_SPECULAR_EXPONENT_IS_1; + } + if (floatArguments.diffuseConstant == 1) + neonData.flags |= FLAG_DIFFUSE_CONST_IS_1; + +- int optimalThreadNumber = ((data.widthDecreasedByOne - 1) * (data.heightDecreasedByOne - 1)) / s_minimalRectDimension; ++ static constexpr int minimalRectDimension = 100 * 100; // Empirical data limit for parallel jobs ++ int optimalThreadNumber = ((data.width - 2) * (data.height - 2)) / minimalRectDimension; + if (optimalThreadNumber > 1) { + // Initialize parallel jobs +- ParallelJobs parallelJobs(&WebCore::FELighting::platformApplyNeonWorker, optimalThreadNumber); ++ ParallelJobs parallelJobs(&FELightingSoftwareApplier::platformApplyNeonWorker, optimalThreadNumber); + + // Fill the parameter array + int job = parallelJobs.numberOfJobs(); + if (job > 1) { + int yStart = 1; +- int yStep = (data.heightDecreasedByOne - 1) / job; ++ int yStep = (data.height - 2) / job; + for (--job; job >= 0; --job) { + FELightingPaintingDataForNeon& params = parallelJobs.parameter(job); + params = neonData; + params.yStart = yStart; +- params.pixels += (yStart - 1) * (data.widthDecreasedByOne + 1) * 4; ++ params.pixels += (yStart - 1) * data.width * 4; + if (job > 0) { + params.absoluteHeight = yStep; + yStart += yStep; + } else +- params.absoluteHeight = data.heightDecreasedByOne - yStart; ++ params.absoluteHeight = (data.height - 1) - yStart; + } + parallelJobs.execute(); + return; +@@ -199,5 +201,3 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS + } // namespace WebCore + + #endif // CPU(ARM_NEON) && COMPILER(GCC_COMPATIBLE) +- +-#endif // FELightingNEON_h +diff --git a/Source/WebCore/platform/graphics/filters/DistantLightSource.h b/Source/WebCore/platform/graphics/filters/DistantLightSource.h +index 0660143fc1cf..2b1e86d99fa4 100644 +--- a/Source/WebCore/platform/graphics/filters/DistantLightSource.h ++++ b/Source/WebCore/platform/graphics/filters/DistantLightSource.h +@@ -25,6 +25,10 @@ + #include "LightSource.h" + #include + ++namespace WTF { ++class TextStream; ++} // namespace WTF ++ + namespace WebCore { + + class DistantLightSource : public LightSource { +diff --git a/Source/WebCore/platform/graphics/filters/FELighting.h b/Source/WebCore/platform/graphics/filters/FELighting.h +index 0c073bc13f8c..e0db00545c17 100644 +--- a/Source/WebCore/platform/graphics/filters/FELighting.h ++++ b/Source/WebCore/platform/graphics/filters/FELighting.h +@@ -35,8 +35,6 @@ + + namespace WebCore { + +-struct FELightingPaintingDataForNeon; +- + class FELighting : public FilterEffect { + public: + const Color& lightingColor() const { return m_lightingColor; } +@@ -67,11 +65,6 @@ protected: + + std::unique_ptr createSoftwareApplier() const override; + +-#if CPU(ARM_NEON) && CPU(ARM_TRADITIONAL) && COMPILER(GCC_COMPATIBLE) +- static int getPowerCoefficients(float exponent); +- inline void platformApplyNeon(const LightingData&, const LightSource::PaintingData&); +-#endif +- + Color m_lightingColor; + float m_surfaceScale; + float m_diffuseConstant; +diff --git a/Source/WebCore/platform/graphics/filters/PointLightSource.h b/Source/WebCore/platform/graphics/filters/PointLightSource.h +index 126b3b2350f6..d906db21aa9c 100644 +--- a/Source/WebCore/platform/graphics/filters/PointLightSource.h ++++ b/Source/WebCore/platform/graphics/filters/PointLightSource.h +@@ -26,6 +26,10 @@ + #include "LightSource.h" + #include + ++namespace WTF { ++class TextStream; ++} // namespace WTF ++ + namespace WebCore { + + class PointLightSource : public LightSource { +diff --git a/Source/WebCore/platform/graphics/filters/SpotLightSource.h b/Source/WebCore/platform/graphics/filters/SpotLightSource.h +index 641b205f986d..64380d9b6eb8 100644 +--- a/Source/WebCore/platform/graphics/filters/SpotLightSource.h ++++ b/Source/WebCore/platform/graphics/filters/SpotLightSource.h +@@ -26,6 +26,10 @@ + #include "LightSource.h" + #include + ++namespace WTF { ++class TextStream; ++} // namespace WTF ++ + namespace WebCore { + + class SpotLightSource : public LightSource { +diff --git a/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h b/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h +index c974d92115ff..e2896660cfbd 100644 +--- a/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h ++++ b/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h +@@ -36,6 +36,7 @@ + namespace WebCore { + + class FELighting; ++struct FELightingPaintingDataForNeon; + + class FELightingSoftwareApplier final : public FilterEffectConcreteApplier { + WTF_MAKE_FAST_ALLOCATED; +@@ -132,8 +133,23 @@ private: + + static void applyPlatformGenericPaint(const LightingData&, const LightSource::PaintingData&, int startY, int endY); + static void applyPlatformGenericWorker(ApplyParameters*); ++ ++#if CPU(ARM_NEON) && CPU(ARM_TRADITIONAL) && COMPILER(GCC_COMPATIBLE) ++ static int getPowerCoefficients(float exponent); ++ static void platformApplyNeonWorker(FELightingPaintingDataForNeon*); ++ inline static void applyPlatformNeon(const LightingData&, const LightSource::PaintingData&); ++ ++ inline static void applyPlatformGeneric(const LightingData& data, const LightSource::PaintingData& paintingData) ++ { ++ applyPlatformNeon(data, paintingData); ++ } ++#else + static void applyPlatformGeneric(const LightingData&, const LightSource::PaintingData&); ++#endif ++ + static void applyPlatform(const LightingData&); + }; + + } // namespace WebCore ++ ++#include "FELightingNEON.h" +-- +2.37.3 + diff --git a/package/wpewebkit/Config.in b/package/wpewebkit/Config.in index 36523bdb414..7a8dc557c36 100644 --- a/package/wpewebkit/Config.in +++ b/package/wpewebkit/Config.in @@ -7,6 +7,10 @@ config BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS # Disabled on MIPS big endian due to sigbus default y if BR2_mipsel || BR2_mips64el # Disabled on PowerPC pending runtime testing + # RISC-V needs the g/imafd ISA. + default y if BR2_riscv && BR2_RISCV_ISA_RVI \ + && BR2_RISCV_ISA_RVM && BR2_RISCV_ISA_RVA \ + && BR2_RISCV_ISA_RVF && BR2_RISCV_ISA_RVD # Disabled on SuperH because of segfault depends on BR2_USE_MMU # libglib2 depends on BR2_TOOLCHAIN_HAS_SYNC_4 @@ -84,17 +88,19 @@ config BR2_PACKAGE_WPEWEBKIT_MULTIMEDIA bool "multimedia support" select BR2_PACKAGE_GSTREAMER1 select BR2_PACKAGE_GST1_PLUGINS_BAD + select BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DEBUGUTILS select BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGTSDEMUX + select BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SUBENC select BR2_PACKAGE_GST1_PLUGINS_BASE select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ALSA select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_APP select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOCONVERT select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORESAMPLE select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PLAYBACK - select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT - select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERTSCALE select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME select BR2_PACKAGE_GST1_PLUGINS_GOOD + select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUDIOFX select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUTODETECT select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ISOMP4 select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MATROSKA diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash index 231bbc447dc..aaeea2bcda7 100644 --- a/package/wpewebkit/wpewebkit.hash +++ b/package/wpewebkit/wpewebkit.hash @@ -1,7 +1,6 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.34.6.tar.xz.sums -md5 c9705270b342474cca28cf51632ccbbe wpewebkit-2.34.6.tar.xz -sha1 44ae95de1b5ebf0a2b0ea3630b3677153c597402 wpewebkit-2.34.6.tar.xz -sha256 301e895c8ed08ce7dccef3192b972f2ccfc2020463244c64069a636f2b05265f wpewebkit-2.34.6.tar.xz +# From https://wpewebkit.org/releases/wpewebkit-2.40.3.tar.xz.sums +sha1 c840bd76b2c86cb8ca0d68b56598cb0abbafc727 wpewebkit-2.40.3.tar.xz +sha256 05b6a9cb1d7d03485e0dc41b2a8e6f99a36aea23d32ba3ecb38d0d6860747ada wpewebkit-2.40.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 aa04e78623e..c13a7201e67 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -4,8 +4,8 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.34.6 -WPEWEBKIT_SITE = http://www.wpewebkit.org/releases +WPEWEBKIT_VERSION = 2.40.3 +WPEWEBKIT_SITE = https://wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES WPEWEBKIT_LICENSE = LGPL-2.1+, BSD-2-Clause @@ -14,7 +14,7 @@ WPEWEBKIT_LICENSE_FILES = \ Source/WebCore/LICENSE-LGPL-2.1 WPEWEBKIT_CPE_ID_VENDOR = wpewebkit WPEWEBKIT_CPE_ID_PRODUCT = wpe_webkit -WPEWEBKIT_DEPENDENCIES = host-gperf host-python3 host-ruby \ +WPEWEBKIT_DEPENDENCIES = host-gperf host-python3 host-ruby host-unifdef \ harfbuzz cairo icu jpeg libepoxy libgcrypt libgles libsoup libtasn1 \ libpng libxslt openjpeg wayland-protocols webp wpebackend-fdo @@ -22,9 +22,12 @@ WPEWEBKIT_CONF_OPTS = \ -DPORT=WPE \ -DENABLE_ACCESSIBILITY=OFF \ -DENABLE_API_TESTS=OFF \ + -DENABLE_DOCUMENTATION=OFF \ + -DENABLE_INTROSPECTION=OFF \ -DENABLE_MINIBROWSER=OFF \ - -DUSE_SOUP2=ON \ - -DSILENCE_CROSS_COMPILATION_NOTICES=ON + -DENABLE_WEB_RTC=OFF \ + -DUSE_AVIF=OFF \ + -DUSE_SOUP2=ON ifeq ($(BR2_PACKAGE_WPEWEBKIT_SANDBOX),y) WPEWEBKIT_CONF_OPTS += \ @@ -81,10 +84,10 @@ WPEWEBKIT_CONF_OPTS += -DUSE_WOFF2=OFF endif ifeq ($(BR2_INIT_SYSTEMD),y) -WPEWEBKIT_CONF_OPTS += -DUSE_SYSTEMD=ON +WPEWEBKIT_CONF_OPTS += -DENABLE_JOURNALD_LOG=ON WPEWEBKIT_DEPENDENCIES += systemd else -WPEWEBKIT_CONF_OPTS += -DUSE_SYSTEMD=OFF +WPEWEBKIT_CONF_OPTS += -DENABLE_JOURNALD_LOG=OFF endif # JIT is not supported for MIPS r6, but the WebKit build system does not @@ -101,4 +104,23 @@ ifeq ($(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV6)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS WPEWEBKIT_CONF_OPTS += -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON -DENABLE_SAMPLING_PROFILER=OFF endif +# wpewebkit needs cmake >= 3.20 when building with the make backend, which is +# above our minimal version in +# support/dependencies/check-host-cmake.mk, so use the ninja backend: +# https://github.com/WebKit/WebKit/commit/6cd89696b5d406c1a3d9a7a9bbb18fda9284fa1f +WPEWEBKIT_CONF_OPTS += -GNinja +WPEWEBKIT_DEPENDENCIES += host-ninja + +define WPEWEBKIT_BUILD_CMDS + $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(WPEWEBKIT_BUILDDIR) +endef + +define WPEWEBKIT_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(WPEWEBKIT_BUILDDIR) +endef + +define WPEWEBKIT_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(WPEWEBKIT_BUILDDIR) +endef + $(eval $(cmake-package)) diff --git a/package/wsapi-fcgi/wsapi-fcgi.hash b/package/wsapi-fcgi/wsapi-fcgi.hash index 0e3e5933ca4..591a76a96d5 100644 --- a/package/wsapi-fcgi/wsapi-fcgi.hash +++ b/package/wsapi-fcgi/wsapi-fcgi.hash @@ -1,4 +1,4 @@ # computed by luarocks/buildroot -sha256 14b77861638a5e863fd10d60ad460a961dc108ea5b915f71461a18d5e6be8e4e wsapi-fcgi-1.7-1.src.rock -sha256 6aa14e3febf7a9e810ce672b015f5a5514241ce5d1c3a6a48f921f089d270159 wsapi/doc/us/license.html -sha256 c7bf3061d00a96d10cb9dbc3a737d0af22594e2ef8f788842d7ab92eeaa864f2 wsapi/doc/us/license.md +sha256 14b77861638a5e863fd10d60ad460a961dc108ea5b915f71461a18d5e6be8e4e wsapi-fcgi-1.7-1.src.rock +sha256 6aa14e3febf7a9e810ce672b015f5a5514241ce5d1c3a6a48f921f089d270159 wsapi/doc/us/license.html +sha256 c7bf3061d00a96d10cb9dbc3a737d0af22594e2ef8f788842d7ab92eeaa864f2 wsapi/doc/us/license.md diff --git a/package/wsapi-xavante/wsapi-xavante.hash b/package/wsapi-xavante/wsapi-xavante.hash index 6045117b9ba..aa089f7cd1e 100644 --- a/package/wsapi-xavante/wsapi-xavante.hash +++ b/package/wsapi-xavante/wsapi-xavante.hash @@ -1,4 +1,4 @@ # computed by luarocks/buildroot -sha256 01211bb80dab92f87cece6e31854d73ae4a2ce06af7c48423a54313d72adf9fb wsapi-xavante-1.7-1.src.rock -sha256 6aa14e3febf7a9e810ce672b015f5a5514241ce5d1c3a6a48f921f089d270159 wsapi/doc/us/license.html -sha256 c7bf3061d00a96d10cb9dbc3a737d0af22594e2ef8f788842d7ab92eeaa864f2 wsapi/doc/us/license.md +sha256 01211bb80dab92f87cece6e31854d73ae4a2ce06af7c48423a54313d72adf9fb wsapi-xavante-1.7-1.src.rock +sha256 6aa14e3febf7a9e810ce672b015f5a5514241ce5d1c3a6a48f921f089d270159 wsapi/doc/us/license.html +sha256 c7bf3061d00a96d10cb9dbc3a737d0af22594e2ef8f788842d7ab92eeaa864f2 wsapi/doc/us/license.md diff --git a/package/wsapi/wsapi.hash b/package/wsapi/wsapi.hash index a89853de2e4..81895c713b1 100644 --- a/package/wsapi/wsapi.hash +++ b/package/wsapi/wsapi.hash @@ -1,4 +1,4 @@ # computed by luarocks/buildroot -sha256 1a0829dffd6bdbf99f5c4278d504cda5ede9344d5089bdcf5216c9eb2999ae22 wsapi-1.7-1.src.rock -sha256 6aa14e3febf7a9e810ce672b015f5a5514241ce5d1c3a6a48f921f089d270159 wsapi/doc/us/license.html -sha256 c7bf3061d00a96d10cb9dbc3a737d0af22594e2ef8f788842d7ab92eeaa864f2 wsapi/doc/us/license.md +sha256 1a0829dffd6bdbf99f5c4278d504cda5ede9344d5089bdcf5216c9eb2999ae22 wsapi-1.7-1.src.rock +sha256 6aa14e3febf7a9e810ce672b015f5a5514241ce5d1c3a6a48f921f089d270159 wsapi/doc/us/license.html +sha256 c7bf3061d00a96d10cb9dbc3a737d0af22594e2ef8f788842d7ab92eeaa864f2 wsapi/doc/us/license.md diff --git a/package/wtfutil/Config.in b/package/wtfutil/Config.in new file mode 100644 index 00000000000..8c3efcea5dd --- /dev/null +++ b/package/wtfutil/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_WTFUTIL + bool "wtfutil" + depends on BR2_USE_MMU # fork() + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + help + WTF is the personal information dashboard for your terminal. + + https://wtfutil.com/ diff --git a/package/wtfutil/wtfutil.hash b/package/wtfutil/wtfutil.hash new file mode 100644 index 00000000000..deb162794ea --- /dev/null +++ b/package/wtfutil/wtfutil.hash @@ -0,0 +1,2 @@ +sha256 d15b2e8833d31d5b1ad7b4317777dc7aa045124d1d91994f02c9b5709f09fef3 wtfutil-0.41.0.tar.gz +sha256 b59f3dbd83c6aa4e003b6eafa80bc53f0629e4d164e8b125c56869c2603dbc8f LICENSE.md diff --git a/package/wtfutil/wtfutil.mk b/package/wtfutil/wtfutil.mk new file mode 100644 index 00000000000..54fea09574f --- /dev/null +++ b/package/wtfutil/wtfutil.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# wtfutil +# +################################################################################ + +WTFUTIL_VERSION = 0.41.0 +WTFUTIL_SITE = $(call github,wtfutil,wtf,v$(WTFUTIL_VERSION)) +WTFUTIL_LICENSE = MPL-2.0 +WTFUTIL_LICENSE_FILES = LICENSE.md +WTFUTIL_CPE_ID_VENDOR = wtfutil +WTFUTIL_CPE_ID_PRODUCT = wtf + +$(eval $(golang-package)) diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in index 63259e88da1..4de8922e0d5 100644 --- a/package/x11r7/Config.in +++ b/package/x11r7/Config.in @@ -12,6 +12,7 @@ menuconfig BR2_PACKAGE_XORG7 if BR2_PACKAGE_XORG7 menu "X11R7 Servers" source package/x11r7/xserver_xorg-server/Config.in + source package/x11r7/xwayland/Config.in endmenu menu "X11R7 Libraries" source package/x11r7/libxcb/Config.in @@ -149,7 +150,6 @@ if BR2_PACKAGE_XORG7 menu "X11R7 Drivers" source package/x11r7/xdriver_xf86-input-evdev/Config.in source package/x11r7/xdriver_xf86-input-joystick/Config.in - source package/x11r7/xdriver_xf86-input-keyboard/Config.in source package/x11r7/xdriver_xf86-input-libinput/Config.in source package/x11r7/xdriver_xf86-input-mouse/Config.in source package/x11r7/xdriver_xf86-input-synaptics/Config.in @@ -164,10 +164,8 @@ if BR2_PACKAGE_XORG7 source package/x11r7/xdriver_xf86-video-fbdev/Config.in source package/x11r7/xdriver_xf86-video-fbturbo/Config.in source package/x11r7/xdriver_xf86-video-geode/Config.in - source package/x11r7/xdriver_xf86-video-glint/Config.in source package/x11r7/xdriver_xf86-video-i128/Config.in source package/x11r7/xdriver_xf86-video-imx/Config.in - source package/x11r7/xdriver_xf86-video-imx-viv/Config.in source package/x11r7/xdriver_xf86-video-intel/Config.in source package/x11r7/xdriver_xf86-video-mach64/Config.in source package/x11r7/xdriver_xf86-video-mga/Config.in @@ -181,7 +179,6 @@ if BR2_PACKAGE_XORG7 source package/x11r7/xdriver_xf86-video-siliconmotion/Config.in source package/x11r7/xdriver_xf86-video-sis/Config.in source package/x11r7/xdriver_xf86-video-tdfx/Config.in - source package/x11r7/xdriver_xf86-video-tga/Config.in source package/x11r7/xdriver_xf86-video-trident/Config.in source package/x11r7/xdriver_xf86-video-vesa/Config.in source package/x11r7/xdriver_xf86-video-vmware/Config.in diff --git a/package/x11r7/libxcb/libxcb.hash b/package/x11r7/libxcb/libxcb.hash index 1861ef8a6b5..2e2179e8dae 100644 --- a/package/x11r7/libxcb/libxcb.hash +++ b/package/x11r7/libxcb/libxcb.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2020-February/003039.html -sha256 a55ed6db98d43469801262d81dc2572ed124edc3db31059d4e9916eb9f844c34 libxcb-1.14.tar.xz -sha512 b90a23204b0d2c29d8b115577edb01df0465e02d6a8876550fecd62375d24a5d5f872ddd5946772ddba077cadce75b12c7a6d218469dc30b5b92bc82188e8bc6 libxcb-1.14.tar.xz +# From https://lists.x.org/archives/xorg-announce/2022-May/003164.html +sha256 cc38744f817cf6814c847e2df37fcb8997357d72fa4bcbc228ae0fe47219a059 libxcb-1.15.tar.xz +sha512 f6c7d766b7cf9cab6abe948ee424cbae6951dbfe2f76fa58a109cdc05b0f0919dcc4e38176a22ff4b95fc1e38596115317e32ba33b24cae0035a4e30dbcbdad9 libxcb-1.15.tar.xz # Locally computed -sha256 c5ffbfeaa501071ceeb97b7de2c0d703fdaa35de01c0fb6cbac1c28453a3e9fd COPYING +sha256 c5ffbfeaa501071ceeb97b7de2c0d703fdaa35de01c0fb6cbac1c28453a3e9fd COPYING diff --git a/package/x11r7/libxcb/libxcb.mk b/package/x11r7/libxcb/libxcb.mk index 4cbd9cf62f9..4b293f9801c 100644 --- a/package/x11r7/libxcb/libxcb.mk +++ b/package/x11r7/libxcb/libxcb.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBXCB_VERSION = 1.14 +LIBXCB_VERSION = 1.15 LIBXCB_SOURCE = libxcb-$(LIBXCB_VERSION).tar.xz LIBXCB_SITE = http://xcb.freedesktop.org/dist LIBXCB_LICENSE = MIT diff --git a/package/x11r7/xapp_appres/xapp_appres.hash b/package/x11r7/xapp_appres/xapp_appres.hash index 8750e2d14c6..17190e60e7b 100644 --- a/package/x11r7/xapp_appres/xapp_appres.hash +++ b/package/x11r7/xapp_appres/xapp_appres.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002847.html -md5 f544e701043249d2bb3deed48314bc55 appres-1.0.5.tar.bz2 -sha1 5e5dbffd0a125732bb8bb8a202e04555a9604089 appres-1.0.5.tar.bz2 -sha256 ffad893712c81943b919e3cbfe46fc65259cc0d9eb96d5e658670e3fbb265928 appres-1.0.5.tar.bz2 -sha512 70825563cd80f0f433c48ab2fdae888072939c1b22fb22340b70b9444c97916275ed92c9e5bf9a06bb76c32a5371b89ff7c0211a9a47a227c88311078c2c4137 appres-1.0.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-April/003141.html +sha256 8b2257e2a0a1ad8330323aec23f07c333075d7fe4e6efd88e0c18fba8223590b appres-1.0.6.tar.xz +sha512 6d14f6a2ad5c83a4d42d4c51ec9a9f32652dfe7624881f1f41c0b1f4946904e7e5ca81a2fd9f4f4824488ce1bd2a4047f92320626bf33b0f1afc5e6b89d3e2b9 appres-1.0.6.tar.xz # Locally computed -sha256 5969302729a9621fd526a7f9942a51a29b858e0b682ffd28eeda5fc4dfaddf55 COPYING +sha256 5969302729a9621fd526a7f9942a51a29b858e0b682ffd28eeda5fc4dfaddf55 COPYING diff --git a/package/x11r7/xapp_appres/xapp_appres.mk b/package/x11r7/xapp_appres/xapp_appres.mk index 4159332bd3a..9beada295c0 100644 --- a/package/x11r7/xapp_appres/xapp_appres.mk +++ b/package/x11r7/xapp_appres/xapp_appres.mk @@ -4,8 +4,8 @@ # ################################################################################ -XAPP_APPRES_VERSION = 1.0.5 -XAPP_APPRES_SOURCE = appres-$(XAPP_APPRES_VERSION).tar.bz2 +XAPP_APPRES_VERSION = 1.0.6 +XAPP_APPRES_SOURCE = appres-$(XAPP_APPRES_VERSION).tar.xz XAPP_APPRES_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_APPRES_LICENSE = MIT XAPP_APPRES_LICENSE_FILES = COPYING diff --git a/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.hash b/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.hash index 614d54382bc..0596b65e492 100644 --- a/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.hash +++ b/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.hash @@ -1,8 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2017-November/002821.html -md5 2a455d3c02390597feb9cefb3fe97a45 bdftopcf-1.1.tar.bz2 -sha1 48a783337a5aa49ebc102c9788ff0f43ea35c5c4 bdftopcf-1.1.tar.bz2 -sha256 4b4df05fc53f1e98993638d6f7e178d95b31745c4568cee407e167491fd311a2 bdftopcf-1.1.tar.bz2 -sha512 7b790e8d512ca2812ac889c156ef91c48798b4744a6857e5b17e0128764b5afa8c5426fe5de05a9819d64745116718db4221b3e657e3c2633465e87179c44bec bdftopcf-1.1.tar.bz2 - +# From https://lists.x.org/archives/xorg-announce/2022-October/003223.html +sha256 11c953d53c0f3ed349d0198dfb0a40000b5121df7eef09f2615a262892fed908 bdftopcf-1.1.1.tar.xz +sha512 257dc9ae29f2cf1496aad91ccba534348d87f881d75431aa6611a8154cb817d17588c464ab6c6c6bc51e6060baa8dcfcb9fd8c037cdaea8d18287651fa6b7ea9 bdftopcf-1.1.1.tar.xz # Locally calculated -sha256 a437fb5272ba507c2977b2ef623bb391270f521b2a20271ed044785f4eaa5dbc COPYING +sha256 a437fb5272ba507c2977b2ef623bb391270f521b2a20271ed044785f4eaa5dbc COPYING diff --git a/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk b/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk index 7ee618d6415..d47f5c02ce2 100644 --- a/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk +++ b/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_BDFTOPCF_VERSION = 1.1 -XAPP_BDFTOPCF_SOURCE = bdftopcf-$(XAPP_BDFTOPCF_VERSION).tar.bz2 -XAPP_BDFTOPCF_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_BDFTOPCF_VERSION = 1.1.1 +XAPP_BDFTOPCF_SOURCE = bdftopcf-$(XAPP_BDFTOPCF_VERSION).tar.xz +XAPP_BDFTOPCF_SITE = https://xorg.freedesktop.org/archive/individual/util XAPP_BDFTOPCF_LICENSE = MIT XAPP_BDFTOPCF_LICENSE_FILES = COPYING XAPP_BDFTOPCF_DEPENDENCIES = xlib_libXfont diff --git a/package/x11r7/xapp_beforelight/xapp_beforelight.hash b/package/x11r7/xapp_beforelight/xapp_beforelight.hash index 00aff75779b..f5b0cb21a41 100644 --- a/package/x11r7/xapp_beforelight/xapp_beforelight.hash +++ b/package/x11r7/xapp_beforelight/xapp_beforelight.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2013-January/002131.html -sha256 8fcab6f15148ca680c0d3da8de7dcb41f8e6a076f442cf8bdcf272be9e348166 beforelight-1.0.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-January/003317.html +sha256 53f0bf085b7272ebbf626d1b9b0ad320d1a07bc1fe7f3ae260c86a71a857ad28 beforelight-1.0.6.tar.xz +sha512 48a165d151676f6d213883bee98b34007403a77e025253c8649f9a0f5ea258b09381ab523a5e906030ac9fc8245fce2c6beaf9ad0f81116e302d51ad4a0fad5a beforelight-1.0.6.tar.xz # Locally computed -sha256 27d8cbdcde7a0bd062ce49cdf8c672201452a64e3e6823f09b1beffe2c4b8eff COPYING +sha256 3909739fae1ee37c3c7167a91f53d29317965aaf932813e16ef733f033619a7b COPYING diff --git a/package/x11r7/xapp_beforelight/xapp_beforelight.mk b/package/x11r7/xapp_beforelight/xapp_beforelight.mk index 7dcb715ef38..6b753833f75 100644 --- a/package/x11r7/xapp_beforelight/xapp_beforelight.mk +++ b/package/x11r7/xapp_beforelight/xapp_beforelight.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_BEFORELIGHT_VERSION = 1.0.5 -XAPP_BEFORELIGHT_SOURCE = beforelight-$(XAPP_BEFORELIGHT_VERSION).tar.bz2 -XAPP_BEFORELIGHT_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_BEFORELIGHT_VERSION = 1.0.6 +XAPP_BEFORELIGHT_SOURCE = beforelight-$(XAPP_BEFORELIGHT_VERSION).tar.xz +XAPP_BEFORELIGHT_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_BEFORELIGHT_LICENSE = MIT XAPP_BEFORELIGHT_LICENSE_FILES = COPYING XAPP_BEFORELIGHT_DEPENDENCIES = xlib_libX11 xlib_libXScrnSaver xlib_libXaw xlib_libXt diff --git a/package/x11r7/xapp_bitmap/xapp_bitmap.hash b/package/x11r7/xapp_bitmap/xapp_bitmap.hash index f632bce3c50..8953bfc5f78 100644 --- a/package/x11r7/xapp_bitmap/xapp_bitmap.hash +++ b/package/x11r7/xapp_bitmap/xapp_bitmap.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-February/002941.html -md5 b94172053ffa282bd88274f1e6a677f1 bitmap-1.0.9.tar.bz2 -sha1 26ba3130b14a2db81b427f2353ac21301c5d2527 bitmap-1.0.9.tar.bz2 -sha256 e0f3afad5272d796f54c33fa1b5bd1fb3f62843a54b28c87196d06a35123e5f5 bitmap-1.0.9.tar.bz2 -sha512 873c626c72a0f4025fe8c8aeedbf3fe4ee5657fb487ad7410406a20da518c0358041dc45c2549926cc10e1d031977073b9d1ddb32830fdce95b716a52fe44456 bitmap-1.0.9.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-April/003162.html +sha256 8e86879c2feeece3f10e189330479cf51da0dd268355d1e3ee8a8497ab833690 bitmap-1.1.0.tar.xz +sha512 3d6c94675f10772daeb71598c3e0ddcb51569b1bfc4771159e9df89599bfeb8bf49f464c24fef54d30a8f737af32136f859f844be03e088d24ed962f88381193 bitmap-1.1.0.tar.xz # Locally computed -sha256 03be44611edac06827bd13c0815a67ecd37ffe8fb1b9e210d6545d79bec89a3a COPYING +sha256 03be44611edac06827bd13c0815a67ecd37ffe8fb1b9e210d6545d79bec89a3a COPYING diff --git a/package/x11r7/xapp_bitmap/xapp_bitmap.mk b/package/x11r7/xapp_bitmap/xapp_bitmap.mk index 6bc0dbde0d0..ccc438560d4 100644 --- a/package/x11r7/xapp_bitmap/xapp_bitmap.mk +++ b/package/x11r7/xapp_bitmap/xapp_bitmap.mk @@ -4,8 +4,8 @@ # ################################################################################ -XAPP_BITMAP_VERSION = 1.0.9 -XAPP_BITMAP_SOURCE = bitmap-$(XAPP_BITMAP_VERSION).tar.bz2 +XAPP_BITMAP_VERSION = 1.1.0 +XAPP_BITMAP_SOURCE = bitmap-$(XAPP_BITMAP_VERSION).tar.xz XAPP_BITMAP_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_BITMAP_LICENSE = MIT XAPP_BITMAP_LICENSE_FILES = COPYING diff --git a/package/x11r7/xapp_editres/xapp_editres.hash b/package/x11r7/xapp_editres/xapp_editres.hash index 15367955152..a1a8ab9005e 100644 --- a/package/x11r7/xapp_editres/xapp_editres.hash +++ b/package/x11r7/xapp_editres/xapp_editres.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002846.html -md5 526cf79edc0c5e379aefb21539243f96 editres-1.0.7.tar.bz2 -sha1 389e953ebb5080564a6780cb34b72bafae7f5540 editres-1.0.7.tar.bz2 -sha256 089ad34628e55a779b97e369f55fb12caefc96d684b508d9022eb9e12b775c11 editres-1.0.7.tar.bz2 -sha512 b9c928b556116bf50cf4b6ea779bdc9fedf29f5db3e6a8cc75c122578c92e1cc530a81b226ec24aad183b8ebc2de570f200314b0d9ce7883b6e3306007365b32 editres-1.0.7.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-April/003139.html +sha256 83cf5dffb1883635fd9c6a8dc48ff9e560f6c6d8ce1a0e929d5f409cba18b6f9 editres-1.0.8.tar.xz +sha512 9a007ed7a02abf61af8b65a163a7289a1e960db390db401bdfad162aa642e0eb887ecf85be14093efd8567c68f5e01450bb8321403a203a00065fa21985c7922 editres-1.0.8.tar.xz # Locally computed -sha256 b1049cf96db2c00428b8313541ab333ec4e06f102955f3edd44f88ec43b0acd6 COPYING +sha256 b1049cf96db2c00428b8313541ab333ec4e06f102955f3edd44f88ec43b0acd6 COPYING diff --git a/package/x11r7/xapp_editres/xapp_editres.mk b/package/x11r7/xapp_editres/xapp_editres.mk index 108a0ec3510..bd1bce732c3 100644 --- a/package/x11r7/xapp_editres/xapp_editres.mk +++ b/package/x11r7/xapp_editres/xapp_editres.mk @@ -4,8 +4,8 @@ # ################################################################################ -XAPP_EDITRES_VERSION = 1.0.7 -XAPP_EDITRES_SOURCE = editres-$(XAPP_EDITRES_VERSION).tar.bz2 +XAPP_EDITRES_VERSION = 1.0.8 +XAPP_EDITRES_SOURCE = editres-$(XAPP_EDITRES_VERSION).tar.xz XAPP_EDITRES_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_EDITRES_LICENSE = MIT XAPP_EDITRES_LICENSE_FILES = COPYING diff --git a/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.hash b/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.hash index 1a7985f9a52..20573576c96 100644 --- a/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.hash +++ b/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2014-December/002510.html -sha256 f1ed55093356b78daec2678d22f52d42ec11fe88575562d734396962e626d7f6 fslsfonts-1.0.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-September/003210.html +sha256 01cb0c5a7dbddadef846ca3b52c2ab9c60f2c32c3f16584cd97a6c7f293341ee fslsfonts-1.0.6.tar.xz +sha512 1181a8e6cc820410d1deac98b3e5097506e4168c6515307b6b9aaf705cb57193a009cb331a51d46ce68e9548712f122b5c942d5a1bc1e01bdd191b7b1beab09e fslsfonts-1.0.6.tar.xz # Locally computed sha256 fbdfcafb5755565ad688bf3f7f808109d358040ec83ed3de496155105451fdf4 COPYING diff --git a/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk b/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk index 27786a55c19..1b8d6301243 100644 --- a/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk +++ b/package/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_FSLSFONTS_VERSION = 1.0.5 -XAPP_FSLSFONTS_SOURCE = fslsfonts-$(XAPP_FSLSFONTS_VERSION).tar.bz2 -XAPP_FSLSFONTS_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_FSLSFONTS_VERSION = 1.0.6 +XAPP_FSLSFONTS_SOURCE = fslsfonts-$(XAPP_FSLSFONTS_VERSION).tar.xz +XAPP_FSLSFONTS_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_FSLSFONTS_LICENSE = MIT XAPP_FSLSFONTS_LICENSE_FILES = COPYING XAPP_FSLSFONTS_DEPENDENCIES = xlib_libFS xlib_libX11 diff --git a/package/x11r7/xapp_fstobdf/xapp_fstobdf.hash b/package/x11r7/xapp_fstobdf/xapp_fstobdf.hash index a2f1425afb8..956c3ef0e38 100644 --- a/package/x11r7/xapp_fstobdf/xapp_fstobdf.hash +++ b/package/x11r7/xapp_fstobdf/xapp_fstobdf.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2014-December/002511.html -sha256 66cf550326c993e7043f260a8ec4a533a3bf9d8f0e7397a6fe9cca803732e92e fstobdf-1.0.6.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003215.html +sha256 2624cbf071ccca89c2a6dadd65004784f478b2ba1c62b8209e03909954f36b50 fstobdf-1.0.7.tar.xz +sha512 b303cc2060e8ccaa139e855a7d377d28877158efa1087eeeebf9f30f7c9962764eceab5c4044b4b508890413cf38546da9b26756dd27a142b806dcd6fdb6ba59 fstobdf-1.0.7.tar.xz # Locally computed sha256 b76125d919ac2bfbff96955dec98b90729633b2df5fbfa2ad3f2e4376164febb COPYING diff --git a/package/x11r7/xapp_fstobdf/xapp_fstobdf.mk b/package/x11r7/xapp_fstobdf/xapp_fstobdf.mk index e897514c80b..989883d42ea 100644 --- a/package/x11r7/xapp_fstobdf/xapp_fstobdf.mk +++ b/package/x11r7/xapp_fstobdf/xapp_fstobdf.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_FSTOBDF_VERSION = 1.0.6 -XAPP_FSTOBDF_SOURCE = fstobdf-$(XAPP_FSTOBDF_VERSION).tar.bz2 -XAPP_FSTOBDF_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_FSTOBDF_VERSION = 1.0.7 +XAPP_FSTOBDF_SOURCE = fstobdf-$(XAPP_FSTOBDF_VERSION).tar.xz +XAPP_FSTOBDF_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_FSTOBDF_LICENSE = MIT XAPP_FSTOBDF_LICENSE_FILES = COPYING XAPP_FSTOBDF_DEPENDENCIES = xlib_libFS xlib_libX11 diff --git a/package/x11r7/xapp_iceauth/xapp_iceauth.hash b/package/x11r7/xapp_iceauth/xapp_iceauth.hash index f1ea73a7af7..694b6beaa19 100644 --- a/package/x11r7/xapp_iceauth/xapp_iceauth.hash +++ b/package/x11r7/xapp_iceauth/xapp_iceauth.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002850.html -md5 3b9b79fa0f9928161f4bad94273de7ae iceauth-1.0.8.tar.bz2 -sha1 2ce23c40a17d98badeb8ce70d26e81a5ac0e178c iceauth-1.0.8.tar.bz2 -sha256 e6ee213a217265cc76050e4293ea70b98c32dce6505c6421227efbda62ab60c6 iceauth-1.0.8.tar.bz2 -sha512 9d4520adf951b16a3e784349dbb70d5d8176b74b956f8adc63abf55d049745c113b03ccfa60a281fc39b487db3742302dc6287c9985ce83a0157bf4674df2af1 iceauth-1.0.8.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-April/003140.html +sha256 2cb9dfcb545683af77fb1029bea3fc52dcc8a0666f7b8b2d7373b6ed4c408c05 iceauth-1.0.9.tar.xz +sha512 16b2f58008587cf1544037ca8b1c76dbb75eb043b3048b3064e66ba6b147962233f1453c2cf18bfb136dd6dd21d3e27b5219e17e1ab7b81dbe93fb6aff801a72 iceauth-1.0.9.tar.xz # Locally computed -sha256 fdd9ba8ccb92af2f31f542e7b7a18c27257e6cdce147d231bc9ba3654ad84976 COPYING +sha256 fdd9ba8ccb92af2f31f542e7b7a18c27257e6cdce147d231bc9ba3654ad84976 COPYING diff --git a/package/x11r7/xapp_iceauth/xapp_iceauth.mk b/package/x11r7/xapp_iceauth/xapp_iceauth.mk index 0e0e0017054..ba1f5229112 100644 --- a/package/x11r7/xapp_iceauth/xapp_iceauth.mk +++ b/package/x11r7/xapp_iceauth/xapp_iceauth.mk @@ -4,8 +4,8 @@ # ################################################################################ -XAPP_ICEAUTH_VERSION = 1.0.8 -XAPP_ICEAUTH_SOURCE = iceauth-$(XAPP_ICEAUTH_VERSION).tar.bz2 +XAPP_ICEAUTH_VERSION = 1.0.9 +XAPP_ICEAUTH_SOURCE = iceauth-$(XAPP_ICEAUTH_VERSION).tar.xz XAPP_ICEAUTH_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_ICEAUTH_LICENSE = MIT XAPP_ICEAUTH_LICENSE_FILES = COPYING diff --git a/package/x11r7/xapp_ico/xapp_ico.hash b/package/x11r7/xapp_ico/xapp_ico.hash index 693aff65f7d..0258537fd55 100644 --- a/package/x11r7/xapp_ico/xapp_ico.hash +++ b/package/x11r7/xapp_ico/xapp_ico.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002880.html -md5 7895f2d109f4206b6d2db37257e07d12 ico-1.0.5.tar.bz2 -sha1 8759ec954375f3a1b37dc920a12790bfbfb0cad3 ico-1.0.5.tar.bz2 -sha256 d73b62f29eb98d850f16b76d759395180b860b613fbe1686b18eee99a6e3773f ico-1.0.5.tar.bz2 -sha512 93a94a66d4a41b39d4b3657050e58f8269d352dae5d5916c9ecdda1cb14f23b9d159d67c50fdfa654b4b1c2ad11434bed140ace70703c82b05d3fe8686aab8f6 ico-1.0.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-August/003205.html +sha256 38f369d431e753280fde70fa489cc94ce204f9f8eabd2f49fc7d32afa69f4405 ico-1.0.6.tar.xz +sha512 0ada451b8026ea10d1a5633f847b7bf833292e4cd01e3f1079d82c91fd142c06c6c4005b7146900ee34ac7acc8fd981db37ada9052dff49c2cfce995b9146c8c ico-1.0.6.tar.xz # Locally computed -sha256 97ef3a622f2f385cabfc8ab7aff13dc46468c10a5520670b5edfa33f2c3999eb COPYING +sha256 97ef3a622f2f385cabfc8ab7aff13dc46468c10a5520670b5edfa33f2c3999eb COPYING diff --git a/package/x11r7/xapp_ico/xapp_ico.mk b/package/x11r7/xapp_ico/xapp_ico.mk index 8b0d4f90f3a..56dbd64b384 100644 --- a/package/x11r7/xapp_ico/xapp_ico.mk +++ b/package/x11r7/xapp_ico/xapp_ico.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_ICO_VERSION = 1.0.5 -XAPP_ICO_SOURCE = ico-$(XAPP_ICO_VERSION).tar.bz2 -XAPP_ICO_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_ICO_VERSION = 1.0.6 +XAPP_ICO_SOURCE = ico-$(XAPP_ICO_VERSION).tar.xz +XAPP_ICO_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_ICO_LICENSE = MIT XAPP_ICO_LICENSE_FILES = COPYING XAPP_ICO_DEPENDENCIES = xlib_libX11 diff --git a/package/x11r7/xapp_listres/xapp_listres.hash b/package/x11r7/xapp_listres/xapp_listres.hash index 1e1c11953a9..30fccec9d3e 100644 --- a/package/x11r7/xapp_listres/xapp_listres.hash +++ b/package/x11r7/xapp_listres/xapp_listres.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002848.html -md5 24e05349f2881aaa58cbe160e49223ac listres-1.0.4.tar.bz2 -sha1 903857c7a9ec3d8edc8a88101aef33cd27796649 listres-1.0.4.tar.bz2 -sha256 6a1229f478796e141d6658762f432ebbe1f6083b27550847d52239b3f7ec2b10 listres-1.0.4.tar.bz2 -sha512 925bceab6ff96fcf91f58ba2f858905d6e2eff7074ba29cfc02def7c19fb493545837884f1070dc004422451f749cd459000c01e8c9bb51a7cce7f7ab4067b8a listres-1.0.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-April/003142.html +sha256 ce2a00bbe7d2eb8d75177006f343c80443a22d52570c48a43c6fe70ea074dc9d listres-1.0.5.tar.xz +sha512 caa3626773031fbf6d8bcc1f697afe6add64fe4a8d1d766c42d5c2346050869dd23a26a1718411134ab05c75835facf0786cab5595721a16df423cdc54dd813d listres-1.0.5.tar.xz # Locally computed -sha256 aefb540c54bc95c68702cd2ae668c559e63cc1a84f55ae5c0e78547e7d75d2d5 COPYING +sha256 aefb540c54bc95c68702cd2ae668c559e63cc1a84f55ae5c0e78547e7d75d2d5 COPYING diff --git a/package/x11r7/xapp_listres/xapp_listres.mk b/package/x11r7/xapp_listres/xapp_listres.mk index b4ac3e1de82..e0d7487f68d 100644 --- a/package/x11r7/xapp_listres/xapp_listres.mk +++ b/package/x11r7/xapp_listres/xapp_listres.mk @@ -4,8 +4,8 @@ # ################################################################################ -XAPP_LISTRES_VERSION = 1.0.4 -XAPP_LISTRES_SOURCE = listres-$(XAPP_LISTRES_VERSION).tar.bz2 +XAPP_LISTRES_VERSION = 1.0.5 +XAPP_LISTRES_SOURCE = listres-$(XAPP_LISTRES_VERSION).tar.xz XAPP_LISTRES_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_LISTRES_LICENSE = MIT XAPP_LISTRES_LICENSE_FILES = COPYING diff --git a/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.hash b/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.hash index cbcdb1700bf..cad6c113651 100644 --- a/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.hash +++ b/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-March/002988.html -md5 215940de158b1a3d8b3f8b442c606e2f mkfontscale-1.2.1.tar.bz2 -sha1 fb9d0458a4476a237609b676f9cebcc64b0a8a85 mkfontscale-1.2.1.tar.bz2 -sha256 ca0495eb974a179dd742bfa6199d561bda1c8da4a0c5a667f21fd82aaab6bac7 mkfontscale-1.2.1.tar.bz2 -sha512 4d243160e1f7f8dfa6a8f53349c1a42a55fc99426455ebdef58352c5e951fce8b4f1fbd1061a76c9a148095b002eac372db1ae5e2647d2ccb4886635b317b18c mkfontscale-1.2.1.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-April/003144.html +sha256 8ae3fb5b1fe7436e1f565060acaa3e2918fe745b0e4979b5593968914fe2d5c4 mkfontscale-1.2.2.tar.xz +sha512 4c846816325347c91008d76b3a5610c1e58a8414fd55117e7ccf51310db4b20b8397ecf6c9177ff77322e27ee088bf034fd175c9210465c50b094bab8dada4b3 mkfontscale-1.2.2.tar.xz # Locally computed -sha256 80df6f5b759f7775042313e4586506db60f26fd15b98b532cf518bd8cf1e8488 COPYING +sha256 80df6f5b759f7775042313e4586506db60f26fd15b98b532cf518bd8cf1e8488 COPYING diff --git a/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk b/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk index 11d9cc952fa..23b2e2283ae 100644 --- a/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk +++ b/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk @@ -4,8 +4,8 @@ # ################################################################################ -XAPP_MKFONTSCALE_VERSION = 1.2.1 -XAPP_MKFONTSCALE_SOURCE = mkfontscale-$(XAPP_MKFONTSCALE_VERSION).tar.bz2 +XAPP_MKFONTSCALE_VERSION = 1.2.2 +XAPP_MKFONTSCALE_SOURCE = mkfontscale-$(XAPP_MKFONTSCALE_VERSION).tar.xz XAPP_MKFONTSCALE_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_MKFONTSCALE_LICENSE = MIT XAPP_MKFONTSCALE_LICENSE_FILES = COPYING diff --git a/package/x11r7/xapp_oclock/xapp_oclock.hash b/package/x11r7/xapp_oclock/xapp_oclock.hash index b345b448f9a..20e899b8809 100644 --- a/package/x11r7/xapp_oclock/xapp_oclock.hash +++ b/package/x11r7/xapp_oclock/xapp_oclock.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002856.html -md5 973f6d25a6f0990720b98a15c9436b92 oclock-1.0.4.tar.bz2 -sha1 0bc8f3f44290950f60af894e20e0ceb0c5e8e862 oclock-1.0.4.tar.bz2 -sha256 cc20cfc1c0d5128d89e1eecd9ba52e58f111075be163e0aeda5690dbaafbaefe oclock-1.0.4.tar.bz2 -sha512 6e0d36a84572a153226b2929f2253cb7adc3c9e5e3af168aeaf8c487ade2e43517b271a8e9cdb2a2c4a67ca56ed0b99c194ca63a4a822b68bfc72ca6518335e7 oclock-1.0.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-August/003206.html +sha256 8f09979655e889d056b7a1e50b57f38b32529453e756b53ec659070fb3c3965c oclock-1.0.5.tar.xz +sha512 a87e89afdb25a91c36077e030b05c3907ddc063c6bdc0715a01bfc16edef8730b3b5a0347399ef4c8b2a13e70e068cba9ec5fe8d411f08548c0aa790a1873aff oclock-1.0.5.tar.xz # Locally computed -sha256 f6cae4b0c603ef5bd76da2df96b38aa43aa7547e482adb8cb8b83f09af35e4a2 COPYING +sha256 f6cae4b0c603ef5bd76da2df96b38aa43aa7547e482adb8cb8b83f09af35e4a2 COPYING diff --git a/package/x11r7/xapp_oclock/xapp_oclock.mk b/package/x11r7/xapp_oclock/xapp_oclock.mk index 0f94cf8c13a..4f70df4cbf2 100644 --- a/package/x11r7/xapp_oclock/xapp_oclock.mk +++ b/package/x11r7/xapp_oclock/xapp_oclock.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_OCLOCK_VERSION = 1.0.4 -XAPP_OCLOCK_SOURCE = oclock-$(XAPP_OCLOCK_VERSION).tar.bz2 -XAPP_OCLOCK_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_OCLOCK_VERSION = 1.0.5 +XAPP_OCLOCK_SOURCE = oclock-$(XAPP_OCLOCK_VERSION).tar.xz +XAPP_OCLOCK_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_OCLOCK_LICENSE = MIT XAPP_OCLOCK_LICENSE_FILES = COPYING XAPP_OCLOCK_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXmu diff --git a/package/x11r7/xapp_rgb/xapp_rgb.hash b/package/x11r7/xapp_rgb/xapp_rgb.hash index ce05454ce9b..11b2a839054 100644 --- a/package/x11r7/xapp_rgb/xapp_rgb.hash +++ b/package/x11r7/xapp_rgb/xapp_rgb.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2014-November/002494.html -sha256 bbca7c6aa59939b9f6a0fb9fff15dfd62176420ffd4ae30c8d92a6a125fbe6b0 rgb-1.0.6.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003245.html +sha256 fc03d7f56e5b2a617668167f8927948cce54f93097e7ccd9f056077f479ed37b rgb-1.1.0.tar.xz +sha512 640888d64b2d328fff4a1652ba1299436e348bc3cbc90710d79c635acfa7f2fce0018adb818123b41ca008197ff1cbf87aab60501de36c163bed2d80d8556008 rgb-1.1.0.tar.xz # Locally computed sha256 1d08eb3384f5dedc7735bcfae1aa58cb64643ca9389edce3312b1c3cefbfdaa7 COPYING diff --git a/package/x11r7/xapp_rgb/xapp_rgb.mk b/package/x11r7/xapp_rgb/xapp_rgb.mk index b2d5d77744e..4b6399fc761 100644 --- a/package/x11r7/xapp_rgb/xapp_rgb.mk +++ b/package/x11r7/xapp_rgb/xapp_rgb.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_RGB_VERSION = 1.0.6 -XAPP_RGB_SOURCE = rgb-$(XAPP_RGB_VERSION).tar.bz2 -XAPP_RGB_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_RGB_VERSION = 1.1.0 +XAPP_RGB_SOURCE = rgb-$(XAPP_RGB_VERSION).tar.xz +XAPP_RGB_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_RGB_LICENSE = MIT XAPP_RGB_LICENSE_FILES = COPYING XAPP_RGB_DEPENDENCIES = xorgproto host-pkgconf diff --git a/package/x11r7/xapp_rstart/xapp_rstart.hash b/package/x11r7/xapp_rstart/xapp_rstart.hash index e87424cb455..70b8ab5451a 100644 --- a/package/x11r7/xapp_rstart/xapp_rstart.hash +++ b/package/x11r7/xapp_rstart/xapp_rstart.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2013-February/002168.html -sha256 29134e9fdffc8d6ac6904c293b392ba6a493ce571fbd2015485b19a8e4d0ffeb rstart-1.0.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-April/003145.html +sha256 50273196a005615c9f242f029a92b3aabc01520145f6b2c61eabf9774972b20f rstart-1.0.6.tar.xz +sha512 8c0840f172c9efade4557e9a28de19e76e510bd17f1e964936a957dde5ada3d9ae8b2fa0502f61da15cdfc0c69d3308599253ee03571017086a45e4e83958e8f rstart-1.0.6.tar.xz # Locally computed sha256 7561fa083e87cd511669d8725ebe89dde6cd4f72cdea35b817262dc6ad6fbe9a COPYING diff --git a/package/x11r7/xapp_rstart/xapp_rstart.mk b/package/x11r7/xapp_rstart/xapp_rstart.mk index 2bcc2923aca..eb6b712a7eb 100644 --- a/package/x11r7/xapp_rstart/xapp_rstart.mk +++ b/package/x11r7/xapp_rstart/xapp_rstart.mk @@ -4,8 +4,8 @@ # ################################################################################ -XAPP_RSTART_VERSION = 1.0.5 -XAPP_RSTART_SOURCE = rstart-$(XAPP_RSTART_VERSION).tar.bz2 +XAPP_RSTART_VERSION = 1.0.6 +XAPP_RSTART_SOURCE = rstart-$(XAPP_RSTART_VERSION).tar.xz XAPP_RSTART_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_RSTART_LICENSE = MIT XAPP_RSTART_LICENSE_FILES = COPYING diff --git a/package/x11r7/xapp_sessreg/xapp_sessreg.hash b/package/x11r7/xapp_sessreg/xapp_sessreg.hash index 12a7d3689a7..1f1b54b877f 100644 --- a/package/x11r7/xapp_sessreg/xapp_sessreg.hash +++ b/package/x11r7/xapp_sessreg/xapp_sessreg.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-June/002994.html -md5 92be564d4be7d8aa7b5024057b715210 sessreg-1.1.2.tar.bz2 -sha1 169c1ff9fb152b4b4ca0cfbd3e1aee33af042016 sessreg-1.1.2.tar.bz2 -sha256 dfcb9e954273ace63879aec053c7880466f8755752a35aa9ced3fa5f04fd2c33 sessreg-1.1.2.tar.bz2 -sha512 7e3c2bdcadb7133aace463b58d8c6108d315ec95d2a42509073eeddc7f02644092a4b3168bd3b426c041736a016291092e0bf8368acd620dbeff96d53d12f98c sessreg-1.1.2.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003246.html +sha256 022acd5de8077dddc4f919961f79e102ecd5f3228a333681af5cd0e7344facc2 sessreg-1.1.3.tar.xz +sha512 bc1e83afc598ac5b4c6ab0861799b6c8727c123ee662c1fb9cbdd9ee926973b7a00cc62e32f6b4e462c0da3516f8b824337d9cf17587ebabd3f4753502641a60 sessreg-1.1.3.tar.xz # Locally computed -sha256 ac8f5cc696e6c473aea4caaf18650316dc8912fcf0f370cae1df5f395cea8631 COPYING +sha256 ac8f5cc696e6c473aea4caaf18650316dc8912fcf0f370cae1df5f395cea8631 COPYING diff --git a/package/x11r7/xapp_sessreg/xapp_sessreg.mk b/package/x11r7/xapp_sessreg/xapp_sessreg.mk index 7f488e24232..b196bb947ec 100644 --- a/package/x11r7/xapp_sessreg/xapp_sessreg.mk +++ b/package/x11r7/xapp_sessreg/xapp_sessreg.mk @@ -4,8 +4,8 @@ # ################################################################################ -XAPP_SESSREG_VERSION = 1.1.2 -XAPP_SESSREG_SOURCE = sessreg-$(XAPP_SESSREG_VERSION).tar.bz2 +XAPP_SESSREG_VERSION = 1.1.3 +XAPP_SESSREG_SOURCE = sessreg-$(XAPP_SESSREG_VERSION).tar.xz XAPP_SESSREG_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_SESSREG_LICENSE = MIT XAPP_SESSREG_LICENSE_FILES = COPYING diff --git a/package/x11r7/xapp_setxkbmap/Config.in b/package/x11r7/xapp_setxkbmap/Config.in index 2b1389c7536..add50813f0d 100644 --- a/package/x11r7/xapp_setxkbmap/Config.in +++ b/package/x11r7/xapp_setxkbmap/Config.in @@ -2,5 +2,6 @@ config BR2_PACKAGE_XAPP_SETXKBMAP bool "setxkbmap" select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXKBFILE + select BR2_PACKAGE_XLIB_LIBXRANDR help Controls the keyboard layout of a running X server. diff --git a/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.hash b/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.hash index 4f963593cb7..a57d7cc7374 100644 --- a/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.hash +++ b/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-July/003007.html -md5 93e736c98fb75856ee8227a0c49a128d setxkbmap-1.3.2.tar.bz2 -sha1 44783734bc58fca93165a20da0bb3eca1ccb9ad9 setxkbmap-1.3.2.tar.bz2 -sha256 8ff27486442725e50b02d7049152f51d125ecad71b7ce503cfa09d5d8ceeb9f5 setxkbmap-1.3.2.tar.bz2 -sha512 bfa8015dee0d8d3fdbbd89afbd71c8606ce168d6edca8521d5ed05a00fecbea39bc4bfcce84b71458bdeb34c60bd80a5df27e0691ccee3966443ecdc937faf38 setxkbmap-1.3.2.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-April/003146.html +sha256 b560c678da6930a0da267304fa3a41cc5df39a96a5e23d06f14984c87b6f587b setxkbmap-1.3.3.tar.xz +sha512 208f07a7f7bce47b573099d4cd8c941a3a4d74b456720bc3ca1cbba298381a2ab98c7500d6e6cd6d5dd61840b7c42cf6521da754ec395f266f8158102a55ad58 setxkbmap-1.3.3.tar.xz # Locally computed -sha256 afb8ce58340b6a6b85b73e256425263ce46f5a427279785e275991cb660cce82 COPYING +sha256 afb8ce58340b6a6b85b73e256425263ce46f5a427279785e275991cb660cce82 COPYING diff --git a/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk b/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk index 8b69747593f..4d48a3fbc19 100644 --- a/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk +++ b/package/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk @@ -4,11 +4,11 @@ # ################################################################################ -XAPP_SETXKBMAP_VERSION = 1.3.2 -XAPP_SETXKBMAP_SOURCE = setxkbmap-$(XAPP_SETXKBMAP_VERSION).tar.bz2 +XAPP_SETXKBMAP_VERSION = 1.3.3 +XAPP_SETXKBMAP_SOURCE = setxkbmap-$(XAPP_SETXKBMAP_VERSION).tar.xz XAPP_SETXKBMAP_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_SETXKBMAP_LICENSE = MIT XAPP_SETXKBMAP_LICENSE_FILES = COPYING -XAPP_SETXKBMAP_DEPENDENCIES = xlib_libX11 xlib_libxkbfile +XAPP_SETXKBMAP_DEPENDENCIES = xlib_libX11 xlib_libxkbfile xlib_libXrandr $(eval $(autotools-package)) diff --git a/package/x11r7/xapp_showfont/xapp_showfont.hash b/package/x11r7/xapp_showfont/xapp_showfont.hash index ff35e9c9ebe..7bec4e87285 100644 --- a/package/x11r7/xapp_showfont/xapp_showfont.hash +++ b/package/x11r7/xapp_showfont/xapp_showfont.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2014-December/002513.html -sha256 e9735c1c530b8a52edfab7415cc0fd7f8d2889095114f4cb689a27476461ac89 showfont-1.0.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-August/003207.html +sha256 2b9b9f06e65e095ed76ce560b701b9fc47fa63310ee706b54c8787af061d0e56 showfont-1.0.6.tar.xz +sha512 21a318519492f4ba46a8bcb3590097fc5f96fe01fdb557257ae56bae813671952a2aad6c0df8cd69659e06708571c398e6d97969224cf692e22c8a35c8e6c363 showfont-1.0.6.tar.xz # Locally computed sha256 c32217021e0507207e2ee6da3fcee3d9e32816003a7153b3357c08cdc97934a8 COPYING diff --git a/package/x11r7/xapp_showfont/xapp_showfont.mk b/package/x11r7/xapp_showfont/xapp_showfont.mk index c0b8c9a3a2c..a805f35231d 100644 --- a/package/x11r7/xapp_showfont/xapp_showfont.mk +++ b/package/x11r7/xapp_showfont/xapp_showfont.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_SHOWFONT_VERSION = 1.0.5 -XAPP_SHOWFONT_SOURCE = showfont-$(XAPP_SHOWFONT_VERSION).tar.bz2 -XAPP_SHOWFONT_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_SHOWFONT_VERSION = 1.0.6 +XAPP_SHOWFONT_SOURCE = showfont-$(XAPP_SHOWFONT_VERSION).tar.xz +XAPP_SHOWFONT_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_SHOWFONT_LICENSE = MIT XAPP_SHOWFONT_LICENSE_FILES = COPYING XAPP_SHOWFONT_DEPENDENCIES = xlib_libFS diff --git a/package/x11r7/xapp_smproxy/xapp_smproxy.hash b/package/x11r7/xapp_smproxy/xapp_smproxy.hash index db9dd27af38..587864baf75 100644 --- a/package/x11r7/xapp_smproxy/xapp_smproxy.hash +++ b/package/x11r7/xapp_smproxy/xapp_smproxy.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002564.html -sha256 6cf19155a2752237f36dbf8bc4184465ea190d2652f887faccb4e2a6ebf77266 smproxy-1.0.6.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003218.html +sha256 4aa99237cc9dab7d87ce9bc7cca4116674a853b5f08dfe3f9db1bb2b2cf9f305 smproxy-1.0.7.tar.xz +sha512 cd6a6933b74f76ae65fb16504e57871724bc1102eae1d02e801e99c3fe73fe44e27f87cef3fbf9f75f369d18197b53bb677d637d94cc8185b55acae0cbd44f21 smproxy-1.0.7.tar.xz # Locally computed sha256 92dce6d8a1fcc0c6b5e56dc44e431e7f73bfa2ed5e83295662aa314067a671d8 COPYING diff --git a/package/x11r7/xapp_smproxy/xapp_smproxy.mk b/package/x11r7/xapp_smproxy/xapp_smproxy.mk index f51c1ec0909..f76752941c0 100644 --- a/package/x11r7/xapp_smproxy/xapp_smproxy.mk +++ b/package/x11r7/xapp_smproxy/xapp_smproxy.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_SMPROXY_VERSION = 1.0.6 -XAPP_SMPROXY_SOURCE = smproxy-$(XAPP_SMPROXY_VERSION).tar.bz2 -XAPP_SMPROXY_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_SMPROXY_VERSION = 1.0.7 +XAPP_SMPROXY_SOURCE = smproxy-$(XAPP_SMPROXY_VERSION).tar.xz +XAPP_SMPROXY_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_SMPROXY_LICENSE = MIT XAPP_SMPROXY_LICENSE_FILES = COPYING XAPP_SMPROXY_DEPENDENCIES = xlib_libXmu xlib_libXt diff --git a/package/x11r7/xapp_twm/xapp_twm.hash b/package/x11r7/xapp_twm/xapp_twm.hash index 26661f1fbde..75d89a99845 100644 --- a/package/x11r7/xapp_twm/xapp_twm.hash +++ b/package/x11r7/xapp_twm/xapp_twm.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2020-June/003047.html -sha256 f4e8a842dec410e79741f25ed4dfac09df080835d0bba2e3983b5914569b68c7 twm-1.0.11.tar.xz -sha512 948034bba23e6b6c4412fcd2e46bb11a9980297601218a54a5055165ab0229a44dde0d50f338b24e82d76f390597e2fa09d11ff7f3fe1b1d736b10083c7da20d twm-1.0.11.tar.xz +# From https://lists.x.org/archives/xorg-announce/2022-April/003135.html +sha256 aaf201d4de04c1bb11eed93de4bee0147217b7bdf61b7b761a56b2fdc276afe4 twm-1.0.12.tar.xz +sha512 f3d68df7e06516f6b74f19181efcfd9db2479c8ea0c72c3a6ed0dc1b222405b40d81a2dea17b662955e0c1783e87d0d3eb067c3b6e7c6eed8c0d38d03d362260 twm-1.0.12.tar.xz # Locally computed sha256 4809ffc9656bc9a704e19ab467d1cedc97c48c9d1f9a4018e6d99d2e61f75945 COPYING diff --git a/package/x11r7/xapp_twm/xapp_twm.mk b/package/x11r7/xapp_twm/xapp_twm.mk index 46d4ca331d6..b2228304972 100644 --- a/package/x11r7/xapp_twm/xapp_twm.mk +++ b/package/x11r7/xapp_twm/xapp_twm.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_TWM_VERSION = 1.0.11 +XAPP_TWM_VERSION = 1.0.12 XAPP_TWM_SOURCE = twm-$(XAPP_TWM_VERSION).tar.xz XAPP_TWM_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_TWM_LICENSE = MIT diff --git a/package/x11r7/xapp_viewres/xapp_viewres.hash b/package/x11r7/xapp_viewres/xapp_viewres.hash index 9b40c0a5333..a662f4ef2eb 100644 --- a/package/x11r7/xapp_viewres/xapp_viewres.hash +++ b/package/x11r7/xapp_viewres/xapp_viewres.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-August/003020.html -md5 38e6568271d8098327706c5cf855dbc7 viewres-1.0.6.tar.bz2 -sha1 f1d12e5b4e1180916edb44234599a486b025b480 viewres-1.0.6.tar.bz2 -sha256 11c15db02066c1d5fc3febf9b185d16c1112f87e37c4b101a484dcefffb80934 viewres-1.0.6.tar.bz2 -sha512 3f4cfc61608bc6c9b35ef66ceb473661ca01946d3306d54040d32803e8e0eec506a0ce37ea22bfe514544a6ba9645fd30f39b20c063aff696b3c0fda3fe95dff viewres-1.0.6.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003219.html +sha256 b15a62085b1a10f55ae1cf17b7ded75b72b21be240c68071685db377c4afc628 viewres-1.0.7.tar.xz +sha512 75878faee001163891adf8472c79b31273f794e23dd775c80b33acdd1ce76df708eb27a49c20f79b7101ad676e1d50d9c857c2e2e0930c6209eeb7af8a11397c viewres-1.0.7.tar.xz # Locally computed -sha256 aefb540c54bc95c68702cd2ae668c559e63cc1a84f55ae5c0e78547e7d75d2d5 COPYING +sha256 aefb540c54bc95c68702cd2ae668c559e63cc1a84f55ae5c0e78547e7d75d2d5 COPYING diff --git a/package/x11r7/xapp_viewres/xapp_viewres.mk b/package/x11r7/xapp_viewres/xapp_viewres.mk index 2e05a6e7d98..49933d7af61 100644 --- a/package/x11r7/xapp_viewres/xapp_viewres.mk +++ b/package/x11r7/xapp_viewres/xapp_viewres.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_VIEWRES_VERSION = 1.0.6 -XAPP_VIEWRES_SOURCE = viewres-$(XAPP_VIEWRES_VERSION).tar.bz2 -XAPP_VIEWRES_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_VIEWRES_VERSION = 1.0.7 +XAPP_VIEWRES_SOURCE = viewres-$(XAPP_VIEWRES_VERSION).tar.xz +XAPP_VIEWRES_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_VIEWRES_LICENSE = MIT XAPP_VIEWRES_LICENSE_FILES = COPYING XAPP_VIEWRES_DEPENDENCIES = xlib_libXaw diff --git a/package/x11r7/xapp_x11perf/xapp_x11perf.hash b/package/x11r7/xapp_x11perf/xapp_x11perf.hash index b472c21b1fe..3370d7df539 100644 --- a/package/x11r7/xapp_x11perf/xapp_x11perf.hash +++ b/package/x11r7/xapp_x11perf/xapp_x11perf.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-March/002983.html -md5 e96b56756990c56c24d2d02c2964456b x11perf-1.6.1.tar.bz2 -sha1 c54ebef80b6cb565397fe2e3069e0d7470027e5a x11perf-1.6.1.tar.bz2 -sha256 1c7e0b8ffc2794b4ccf11e04d551823abe0ea47b4f7db0637390db6fbe817c34 x11perf-1.6.1.tar.bz2 -sha512 b386151bfe3d7c04ab9953ae1882f3c5b627d6d1afb9a8cfe87c58236a88883fc11bbadb2226b9aa61df84b4fce625a1c9e3d146a124ac17e8d7d605b35d9c0b x11perf-1.6.1.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003242.html +sha256 5a0e7cea47716ad07ceca38bbd07ae06459ee4d837b9c9dfc21ccb94e3e24fcc x11perf-1.6.2.tar.xz +sha512 5be9e601071a42d103adbab5f30c1900a3779a5b2c06c709df99a85487c9790d36b835d43f5c6d74cc7d950cc3ad06927210d7b1f58939cfd0b4a6f3e5e32112 x11perf-1.6.2.tar.xz # Locally computed -sha256 f467ff659142e2eb4cb7275c48c789d249af398b09a405d3e181dcc339b3b922 COPYING +sha256 f467ff659142e2eb4cb7275c48c789d249af398b09a405d3e181dcc339b3b922 COPYING diff --git a/package/x11r7/xapp_x11perf/xapp_x11perf.mk b/package/x11r7/xapp_x11perf/xapp_x11perf.mk index ec10590b731..3a1d5799394 100644 --- a/package/x11r7/xapp_x11perf/xapp_x11perf.mk +++ b/package/x11r7/xapp_x11perf/xapp_x11perf.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_X11PERF_VERSION = 1.6.1 -XAPP_X11PERF_SOURCE = x11perf-$(XAPP_X11PERF_VERSION).tar.bz2 -XAPP_X11PERF_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_X11PERF_VERSION = 1.6.2 +XAPP_X11PERF_SOURCE = x11perf-$(XAPP_X11PERF_VERSION).tar.xz +XAPP_X11PERF_SITE = https://xorg.freedesktop.org/archive/individual/test XAPP_X11PERF_LICENSE = MIT XAPP_X11PERF_LICENSE_FILES = COPYING XAPP_X11PERF_DEPENDENCIES = xlib_libX11 xlib_libXmu xlib_libXft diff --git a/package/x11r7/xapp_xauth/xapp_xauth.hash b/package/x11r7/xapp_xauth/xapp_xauth.hash index 22ea4cadfdb..966c3ba0285 100644 --- a/package/x11r7/xapp_xauth/xapp_xauth.hash +++ b/package/x11r7/xapp_xauth/xapp_xauth.hash @@ -1,6 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2021-November/003118.html -sha256 164ea0a29137b284a47b886ef2affcb0a74733bf3aad04f9b106b1a6c82ebd92 xauth-1.1.1.tar.bz2 -sha512 998c3158378fff50d368959c29335173b8d98e02591cb3d7b2f9534b5a44b19deb4cb7da9bf291ca5a37f69f833d72839b2c6611723306d10c1b4968ae4d4120 xauth-1.1.1.tar.bz2 - +# From https://lists.x.org/archives/xorg-announce/2022-April/003158.html +sha256 78ba6afd19536ced1dddb3276cba6e9555a211b468a06f95f6a97c62ff8ee200 xauth-1.1.2.tar.xz +sha512 ac23fcd166b45abf7b030994ff3332c9906023dc1ddfa9b9d3000e6a914dc5e0213c4a2aa409cb3ddb93e1f9f4f6374376109241a95ef8c36af842de1f6f76e8 xauth-1.1.2.tar.xz # Locally computed -sha256 dcdf5fa36a652efbe61a21def1301739b0010334ae3f049f1cff433221a8c7a5 COPYING +sha256 dcdf5fa36a652efbe61a21def1301739b0010334ae3f049f1cff433221a8c7a5 COPYING diff --git a/package/x11r7/xapp_xauth/xapp_xauth.mk b/package/x11r7/xapp_xauth/xapp_xauth.mk index 64b064d3bd7..248a66e3a0c 100644 --- a/package/x11r7/xapp_xauth/xapp_xauth.mk +++ b/package/x11r7/xapp_xauth/xapp_xauth.mk @@ -4,8 +4,8 @@ # ################################################################################ -XAPP_XAUTH_VERSION = 1.1.1 -XAPP_XAUTH_SOURCE = xauth-$(XAPP_XAUTH_VERSION).tar.bz2 +XAPP_XAUTH_VERSION = 1.1.2 +XAPP_XAUTH_SOURCE = xauth-$(XAPP_XAUTH_VERSION).tar.xz XAPP_XAUTH_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XAUTH_LICENSE = MIT XAPP_XAUTH_LICENSE_FILES = COPYING diff --git a/package/x11r7/xapp_xbacklight/xapp_xbacklight.hash b/package/x11r7/xapp_xbacklight/xapp_xbacklight.hash index 12d20525c29..bda5c32cde8 100644 --- a/package/x11r7/xapp_xbacklight/xapp_xbacklight.hash +++ b/package/x11r7/xapp_xbacklight/xapp_xbacklight.hash @@ -1,7 +1,7 @@ # From https://lists.x.org/archives/xorg-announce/2019-July/003008.html -md5 5b6405973db69c0443be2fba8e1a8ab7 xbacklight-1.2.3.tar.bz2 -sha1 f0a6163738143ec23542b459aef567309a119e0c xbacklight-1.2.3.tar.bz2 -sha256 3a27f324777ae99fee476cfb2f064576fb8cba4eb77f97cda37adda1c1d39ade xbacklight-1.2.3.tar.bz2 -sha512 717c87ce24634892fc4ac54fc59dcc0a5bc8f206aaf1d13410f95f7e4fe6e3dbc7ff8d951bcd8ea8c5e955357a00fea6ceadd4559e60b1a632e40f71290e12c7 xbacklight-1.2.3.tar.bz2 +md5 5b6405973db69c0443be2fba8e1a8ab7 xbacklight-1.2.3.tar.bz2 +sha1 f0a6163738143ec23542b459aef567309a119e0c xbacklight-1.2.3.tar.bz2 +sha256 3a27f324777ae99fee476cfb2f064576fb8cba4eb77f97cda37adda1c1d39ade xbacklight-1.2.3.tar.bz2 +sha512 717c87ce24634892fc4ac54fc59dcc0a5bc8f206aaf1d13410f95f7e4fe6e3dbc7ff8d951bcd8ea8c5e955357a00fea6ceadd4559e60b1a632e40f71290e12c7 xbacklight-1.2.3.tar.bz2 # Locally computed -sha256 c9fbf1f272215babef31808c1235de8e4f7641ca5edfc4fc615b6556054b2b04 COPYING +sha256 c9fbf1f272215babef31808c1235de8e4f7641ca5edfc4fc615b6556054b2b04 COPYING diff --git a/package/x11r7/xapp_xbiff/xapp_xbiff.hash b/package/x11r7/xapp_xbiff/xapp_xbiff.hash index 9c646785d49..690c932e379 100644 --- a/package/x11r7/xapp_xbiff/xapp_xbiff.hash +++ b/package/x11r7/xapp_xbiff/xapp_xbiff.hash @@ -1,7 +1,7 @@ # From https://lists.x.org/archives/xorg-announce/2019-July/003009.html -md5 66dd3ebd6351b1911b831b89b2dba8ec xbiff-1.0.4.tar.bz2 -sha1 193c0a2be1f7f374bb9d32217a198c92a63619e8 xbiff-1.0.4.tar.bz2 -sha256 e1e1a39628a5678585008ef7fb1ff2864edaaa0e062989c2331f8c74e0fec971 xbiff-1.0.4.tar.bz2 -sha512 0fb920a08640ec59f23d8a8a47bd244565dfbaff7a21c38a8a2abe1edb5eacabc970b5dbdc409163fc444fde5b75a2dc4e0114312938efec5b77228f3bf785ac xbiff-1.0.4.tar.bz2 +md5 66dd3ebd6351b1911b831b89b2dba8ec xbiff-1.0.4.tar.bz2 +sha1 193c0a2be1f7f374bb9d32217a198c92a63619e8 xbiff-1.0.4.tar.bz2 +sha256 e1e1a39628a5678585008ef7fb1ff2864edaaa0e062989c2331f8c74e0fec971 xbiff-1.0.4.tar.bz2 +sha512 0fb920a08640ec59f23d8a8a47bd244565dfbaff7a21c38a8a2abe1edb5eacabc970b5dbdc409163fc444fde5b75a2dc4e0114312938efec5b77228f3bf785ac xbiff-1.0.4.tar.bz2 # Locally computed -sha256 9b840f2e1900889124cc999f3158da2b6b07bf6d0d77bdbb01ce65d2e702dc83 COPYING +sha256 9b840f2e1900889124cc999f3158da2b6b07bf6d0d77bdbb01ce65d2e702dc83 COPYING diff --git a/package/x11r7/xapp_xcalc/xapp_xcalc.hash b/package/x11r7/xapp_xcalc/xapp_xcalc.hash index d7fac37ea6f..12633a41a92 100644 --- a/package/x11r7/xapp_xcalc/xapp_xcalc.hash +++ b/package/x11r7/xapp_xcalc/xapp_xcalc.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-June/002996.html -md5 3b566e47c76356cecaa71eb431767ae1 xcalc-1.1.0.tar.bz2 -sha1 0537f7ee56558cf80133c6b49c4757c1166aaeb6 xcalc-1.1.0.tar.bz2 -sha256 d5d746954465afc3da1f355d721882806568fb04b4d059c027702c0d16a3b5eb xcalc-1.1.0.tar.bz2 -sha512 877aab7bb08f409a21c26b841f4d91eb6993914ed0d26512e47d6b3d2b3e0b231158901415a106cfb45de43f03f253bf2a8733f986538d4ee810afe0e54f98d5 xcalc-1.1.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-May/003391.html +sha256 8578dfa1457e94289f6d6ed6146714307d8a73a1b54d2f42af1321b625fc1cd4 xcalc-1.1.2.tar.xz +sha512 51da677dc88bcd7299ed8d678cb26b048fdb82a1983e1496a06253ee2dceefca4ac87d1a74432b4a76dcc11921a61339bb3d292607be46228164140b430bbad2 xcalc-1.1.2.tar.xz # Locally computed -sha256 8dd69dbec37866a41d3040c5c478aca46e0b50c30319f178064d5e2ed9d3f912 COPYING +sha256 8dd69dbec37866a41d3040c5c478aca46e0b50c30319f178064d5e2ed9d3f912 COPYING diff --git a/package/x11r7/xapp_xcalc/xapp_xcalc.mk b/package/x11r7/xapp_xcalc/xapp_xcalc.mk index b917d9e98eb..ffb724e39cf 100644 --- a/package/x11r7/xapp_xcalc/xapp_xcalc.mk +++ b/package/x11r7/xapp_xcalc/xapp_xcalc.mk @@ -4,8 +4,8 @@ # ################################################################################ -XAPP_XCALC_VERSION = 1.1.0 -XAPP_XCALC_SOURCE = xcalc-$(XAPP_XCALC_VERSION).tar.bz2 +XAPP_XCALC_VERSION = 1.1.2 +XAPP_XCALC_SOURCE = xcalc-$(XAPP_XCALC_VERSION).tar.xz XAPP_XCALC_SITE = https://xorg.freedesktop.org/releases/individual/app XAPP_XCALC_LICENSE = MIT XAPP_XCALC_LICENSE_FILES = COPYING diff --git a/package/x11r7/xapp_xclipboard/xapp_xclipboard.hash b/package/x11r7/xapp_xclipboard/xapp_xclipboard.hash index ef45b928916..d848a473421 100644 --- a/package/x11r7/xapp_xclipboard/xapp_xclipboard.hash +++ b/package/x11r7/xapp_xclipboard/xapp_xclipboard.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2013-September/002299.html -sha256 9c0e0a1f4f1d49f73c6cf3ccd27b5ca0e18afc63679f1a1ee466b1d82446ebb5 xclipboard-1.1.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-July/003171.html +sha256 f43d4560d1464e8ff58e850212f6bdb703989b66d599fb61f351b5f9e077f253 xclipboard-1.1.4.tar.xz +sha512 efa7800e0c4fb0242362c4263d80182d591bded07d1064a36b157b6202b15b0c82f083658ced2b82392eca905fb57c04a537d67e75c1237a1667ed2ce0cb09fe xclipboard-1.1.4.tar.xz # Locally computed sha256 f0a362fc1b8e788845b1c0ad7ba9ade58fdfb73da750c3b9780db5d70b947657 COPYING diff --git a/package/x11r7/xapp_xclipboard/xapp_xclipboard.mk b/package/x11r7/xapp_xclipboard/xapp_xclipboard.mk index d77ac986217..c76d5ded3c4 100644 --- a/package/x11r7/xapp_xclipboard/xapp_xclipboard.mk +++ b/package/x11r7/xapp_xclipboard/xapp_xclipboard.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XCLIPBOARD_VERSION = 1.1.3 -XAPP_XCLIPBOARD_SOURCE = xclipboard-$(XAPP_XCLIPBOARD_VERSION).tar.bz2 -XAPP_XCLIPBOARD_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XCLIPBOARD_VERSION = 1.1.4 +XAPP_XCLIPBOARD_SOURCE = xclipboard-$(XAPP_XCLIPBOARD_VERSION).tar.xz +XAPP_XCLIPBOARD_SITE = https://xorg.freedesktop.org/releases/individual/app XAPP_XCLIPBOARD_LICENSE = MIT XAPP_XCLIPBOARD_LICENSE_FILES = COPYING XAPP_XCLIPBOARD_DEPENDENCIES = xlib_libXaw xlib_libXmu xlib_libXt diff --git a/package/x11r7/xapp_xclock/xapp_xclock.hash b/package/x11r7/xapp_xclock/xapp_xclock.hash index 881b40154d5..0bc011732ff 100644 --- a/package/x11r7/xapp_xclock/xapp_xclock.hash +++ b/package/x11r7/xapp_xclock/xapp_xclock.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-July/003010.html -md5 437522a96f424f68fc64ed34ece9b211 xclock-1.0.9.tar.bz2 -sha1 774c711cf7ee3f601f7209bbb01ce3f0d5ddbde6 xclock-1.0.9.tar.bz2 -sha256 cf461fb2c6f2ac42c54d8429ee2010fdb9a1442a370adfbfe8a7bfaf33c123bb xclock-1.0.9.tar.bz2 -sha512 fcbac0b4ab1cea4ae0751ce1c0c6302048e5d98d459873c7580e4ca786ec49fa27f73e5831bdfe135abb5cfeabe886456276e9d01351ea7905c606f40f84522d xclock-1.0.9.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-April/003156.html +sha256 df7ceabf8f07044a2fde4924d794554996811640a45de40cb12c2cf1f90f742c xclock-1.1.1.tar.xz +sha512 059ea986bc7537c2796e8855676e8357bd8a7852fbac0839b3f8a9e3ffa088de41bc4e4961973353f0a7b7293366b81bc764d74f3dc4e90e361da06185d976e7 xclock-1.1.1.tar.xz # Locally computed -sha256 ee1f19f46801ef00e70498603e74df644d0b93fc82f06b55ce64c3a2c9f16e71 COPYING +sha256 ee1f19f46801ef00e70498603e74df644d0b93fc82f06b55ce64c3a2c9f16e71 COPYING diff --git a/package/x11r7/xapp_xclock/xapp_xclock.mk b/package/x11r7/xapp_xclock/xapp_xclock.mk index 77cc7011d37..852ae5dbae4 100644 --- a/package/x11r7/xapp_xclock/xapp_xclock.mk +++ b/package/x11r7/xapp_xclock/xapp_xclock.mk @@ -4,8 +4,8 @@ # ################################################################################ -XAPP_XCLOCK_VERSION = 1.0.9 -XAPP_XCLOCK_SOURCE = xclock-$(XAPP_XCLOCK_VERSION).tar.bz2 +XAPP_XCLOCK_VERSION = 1.1.1 +XAPP_XCLOCK_SOURCE = xclock-$(XAPP_XCLOCK_VERSION).tar.xz XAPP_XCLOCK_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XCLOCK_LICENSE = MIT XAPP_XCLOCK_LICENSE_FILES = COPYING diff --git a/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.hash b/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.hash index 75a07f36abf..7590580d889 100644 --- a/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.hash +++ b/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002567.html -sha256 e5585361bb8b6a05bb814a8d0e444ee93e0f00180881d3070aff4571e97f67c6 xcmsdb-1.0.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-July/003172.html +sha256 3c77eec4537d5942bb0966973b787bfdaf7121f3125ffa81bb1c9708d4cf4f55 xcmsdb-1.0.6.tar.xz +sha512 e47d9498ce496effbc44a66e70af91d9fe65c344a17916fd4990a4c84fa8879aa09b6695aeb6ef595f475c16a13c7c31d4c48449234564de7de38d7436764fae xcmsdb-1.0.6.tar.xz # Locally computed sha256 c3bd4ac91beb08fee5272b17a3ddee8d2791cc5eaee5bce5271042a45fa4fa6a COPYING diff --git a/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk b/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk index 3cccacc0b43..4af341a0275 100644 --- a/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk +++ b/package/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XCMSDB_VERSION = 1.0.5 -XAPP_XCMSDB_SOURCE = xcmsdb-$(XAPP_XCMSDB_VERSION).tar.bz2 -XAPP_XCMSDB_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XCMSDB_VERSION = 1.0.6 +XAPP_XCMSDB_SOURCE = xcmsdb-$(XAPP_XCMSDB_VERSION).tar.xz +XAPP_XCMSDB_SITE = https://xorg.freedesktop.org/releases/individual/app XAPP_XCMSDB_LICENSE = MIT XAPP_XCMSDB_LICENSE_FILES = COPYING XAPP_XCMSDB_DEPENDENCIES = xlib_libX11 diff --git a/package/x11r7/xapp_xcompmgr/xapp_xcompmgr.hash b/package/x11r7/xapp_xcompmgr/xapp_xcompmgr.hash index b893d01802a..b9675a5ecf3 100644 --- a/package/x11r7/xapp_xcompmgr/xapp_xcompmgr.hash +++ b/package/x11r7/xapp_xcompmgr/xapp_xcompmgr.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-March/002989.html -md5 ef8c7d4140c11efb8de4141b3968208c xcompmgr-1.1.8.tar.bz2 -sha1 7bb28329b4bb687763df2d2c1723cb6ecb20945a xcompmgr-1.1.8.tar.bz2 -sha256 0b89daf4f060fa3fa83cca862c45d531fef7121b5d06552c1d73d396ad9a7243 xcompmgr-1.1.8.tar.bz2 -sha512 ccf29426ffb0797a53653d1ce152de5eee0cec284811fed4b8e634ea0d948180531e4619d96f47e4f9594432c57322624fe0fdaee2c9200efac427fc0904953d xcompmgr-1.1.8.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-November/003254.html +sha256 4875b6698672d01eb3a5080bde6eac9a989d486a82226a2d5e23624f1527a6f0 xcompmgr-1.1.9.tar.xz +sha512 699117492af7fd84b36d317dcbf422d5ec86a7f21e29370caa737cd940d8ff866a5c8704ba2e7bd17a64e085d77fd23b628263d619813dead85cd669ff5b860e xcompmgr-1.1.9.tar.xz # Locally computed -sha256 c843545f72771b3ff95eb88defc2e3ed8f9a1802d9bb6c32c196bb5eec3d3a5d COPYING +sha256 c843545f72771b3ff95eb88defc2e3ed8f9a1802d9bb6c32c196bb5eec3d3a5d COPYING diff --git a/package/x11r7/xapp_xcompmgr/xapp_xcompmgr.mk b/package/x11r7/xapp_xcompmgr/xapp_xcompmgr.mk index 24ebad7bdaa..c754ea37b38 100644 --- a/package/x11r7/xapp_xcompmgr/xapp_xcompmgr.mk +++ b/package/x11r7/xapp_xcompmgr/xapp_xcompmgr.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XCOMPMGR_VERSION = 1.1.8 -XAPP_XCOMPMGR_SOURCE = xcompmgr-$(XAPP_XCOMPMGR_VERSION).tar.bz2 -XAPP_XCOMPMGR_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XCOMPMGR_VERSION = 1.1.9 +XAPP_XCOMPMGR_SOURCE = xcompmgr-$(XAPP_XCOMPMGR_VERSION).tar.xz +XAPP_XCOMPMGR_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XCOMPMGR_LICENSE = MIT XAPP_XCOMPMGR_LICENSE_FILES = COPYING XAPP_XCOMPMGR_DEPENDENCIES = \ diff --git a/package/x11r7/xapp_xconsole/xapp_xconsole.hash b/package/x11r7/xapp_xconsole/xapp_xconsole.hash index 5d6c2ac82fe..59d4a671944 100644 --- a/package/x11r7/xapp_xconsole/xapp_xconsole.hash +++ b/package/x11r7/xapp_xconsole/xapp_xconsole.hash @@ -1,4 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2017-January/002774.html -sha256 d1144882df207378381bc83927906559defbf7b83a01d52c50ad44234c5851e0 xconsole-1.0.7.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-July/003173.html +sha256 7b4a6af068e40e2e6a4521d6f35c9253ec152c287d025fff9cc4c99f2586bba4 xconsole-1.0.8.tar.xz +sha512 93fd8527abed4faaf0f6a3804ab08dbcb926b0aaf67fd814c003b6b1102e2f643be5362a020c7028ae928925ffd423df6eb456d4ed48cf30a4c5f00a7ce648fa xconsole-1.0.8.tar.xz # Locally computed sha256 a29ea5dbcde7ba1695c95949be6303d1ca1de0b7786a38b60f33eccf03506f9d COPYING diff --git a/package/x11r7/xapp_xconsole/xapp_xconsole.mk b/package/x11r7/xapp_xconsole/xapp_xconsole.mk index ddec4cfaa3e..57ece561904 100644 --- a/package/x11r7/xapp_xconsole/xapp_xconsole.mk +++ b/package/x11r7/xapp_xconsole/xapp_xconsole.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XCONSOLE_VERSION = 1.0.7 -XAPP_XCONSOLE_SOURCE = xconsole-$(XAPP_XCONSOLE_VERSION).tar.bz2 -XAPP_XCONSOLE_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XCONSOLE_VERSION = 1.0.8 +XAPP_XCONSOLE_SOURCE = xconsole-$(XAPP_XCONSOLE_VERSION).tar.xz +XAPP_XCONSOLE_SITE = https://xorg.freedesktop.org/releases/individual/app XAPP_XCONSOLE_LICENSE = MIT XAPP_XCONSOLE_LICENSE_FILES = COPYING XAPP_XCONSOLE_DEPENDENCIES = \ diff --git a/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.hash b/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.hash index 51031d62bc0..45bff55ed27 100644 --- a/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.hash +++ b/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-January/002936.html -md5 25cc7ca1ce5dcbb61c2b471c55e686b5 xcursorgen-1.0.7.tar.bz2 -sha1 109367eb23b0ad52cf5de15f50c02ebe872698ae xcursorgen-1.0.7.tar.bz2 -sha256 35b6f844b24f1776e9006c880a745728800764dbe3b327a128772b4610d8eb3d xcursorgen-1.0.7.tar.bz2 -sha512 bd13ad23691d3daa2d5dcdc5902cf62e3dcb97a0289aff362e6cd85866a1d8cafb64f98800a75bfb4cf1f3c76244ca20201847dff594543d136d0abaec7011d2 xcursorgen-1.0.7.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003264.html +sha256 32b33ce27b4e285e64ff375731806bb7988cc626ff10915c65f1dc4da640cc9b xcursorgen-1.0.8.tar.xz +sha512 dede5b9e1e09f9253365bbb83fdab26c681641913f3586cef52d4802db9cecc7e252344911cd969a873c3a5c5ebbd4b862f786de263f92ea1bcb2df90236f9c4 xcursorgen-1.0.8.tar.xz # Locally computed -sha256 8c773336b654442ac8018715a52be1a8254895c57c898d5387016e9488cc2009 COPYING +sha256 8c773336b654442ac8018715a52be1a8254895c57c898d5387016e9488cc2009 COPYING diff --git a/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk b/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk index bcc696b01c8..318cd562db6 100644 --- a/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk +++ b/package/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XCURSORGEN_VERSION = 1.0.7 -XAPP_XCURSORGEN_SOURCE = xcursorgen-$(XAPP_XCURSORGEN_VERSION).tar.bz2 -XAPP_XCURSORGEN_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XCURSORGEN_VERSION = 1.0.8 +XAPP_XCURSORGEN_SOURCE = xcursorgen-$(XAPP_XCURSORGEN_VERSION).tar.xz +XAPP_XCURSORGEN_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XCURSORGEN_LICENSE = MIT XAPP_XCURSORGEN_LICENSE_FILES = COPYING XAPP_XCURSORGEN_DEPENDENCIES = libpng xlib_libX11 xlib_libXcursor diff --git a/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.hash b/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.hash index 88b8438218c..ad862c6e3a9 100644 --- a/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.hash +++ b/package/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.hash @@ -1,4 +1,4 @@ # From http://lists.x.org/archives/xorg-announce/2010-October/001514.html -sha1 281bee72116311e2d8393ae53ea832e9d267eded xdbedizzy-1.1.0.tar.bz2 +sha1 281bee72116311e2d8393ae53ea832e9d267eded xdbedizzy-1.1.0.tar.bz2 # Locally computed sha256 27d8cbdcde7a0bd062ce49cdf8c672201452a64e3e6823f09b1beffe2c4b8eff COPYING diff --git a/package/x11r7/xapp_xditview/xapp_xditview.hash b/package/x11r7/xapp_xditview/xapp_xditview.hash index 0eb3a13ff72..dbaf5e42b7c 100644 --- a/package/x11r7/xapp_xditview/xapp_xditview.hash +++ b/package/x11r7/xapp_xditview/xapp_xditview.hash @@ -1,7 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002570.html -md5 3a909116a3b2abe3845215cf49e09fa5 xditview-1.0.5.tar.bz2 -sha1 f06f65bca31168c86bcebd7f92dbbda08817a5cc xditview-1.0.5.tar.bz2 -sha256 eecb1ed51ab4edc7f454476d1248cfb7799a17c5679b3dd834e8b4658331c04b xditview-1.0.5.tar.bz2 -sha512 e20c903f38394b496111267e142d84d11e69a3b89f91869652d1f2ee5c997a13f90bfa2966651b42cd3979a330b348a6e397cc6a74c45b1f3f91643e7c06765d xditview-1.0.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003220.html +sha256 517700df205d4fdf65db182698157c959f1e7c10597670a7f45b1fcb2319819f xditview-1.0.6.tar.xz +sha512 249769d27980e9a69ac8f056f329dfa514f3ab6267d6ed69814c5695f315d2a7021c560a0e26fdd2568290a071793d7f2eafdd92f9981ed556047deb244ebf5a xditview-1.0.6.tar.xz # Locally computed -sha256 023d879308a49249181f78bbb567e93c45138ad847fe969d191e4802e7a1a005 COPYING +sha256 023d879308a49249181f78bbb567e93c45138ad847fe969d191e4802e7a1a005 COPYING diff --git a/package/x11r7/xapp_xditview/xapp_xditview.mk b/package/x11r7/xapp_xditview/xapp_xditview.mk index 388710034cd..8655bd3e92a 100644 --- a/package/x11r7/xapp_xditview/xapp_xditview.mk +++ b/package/x11r7/xapp_xditview/xapp_xditview.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XDITVIEW_VERSION = 1.0.5 -XAPP_XDITVIEW_SOURCE = xditview-$(XAPP_XDITVIEW_VERSION).tar.bz2 -XAPP_XDITVIEW_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XDITVIEW_VERSION = 1.0.6 +XAPP_XDITVIEW_SOURCE = xditview-$(XAPP_XDITVIEW_VERSION).tar.xz +XAPP_XDITVIEW_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XDITVIEW_LICENSE = MIT XAPP_XDITVIEW_LICENSE_FILES = COPYING XAPP_XDITVIEW_DEPENDENCIES = xlib_libXaw diff --git a/package/x11r7/xapp_xdm/Config.in b/package/x11r7/xapp_xdm/Config.in index af816a13498..1ac15ce3687 100644 --- a/package/x11r7/xapp_xdm/Config.in +++ b/package/x11r7/xapp_xdm/Config.in @@ -8,7 +8,6 @@ config BR2_PACKAGE_XAPP_XDM select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXAW select BR2_PACKAGE_XLIB_LIBXDMCP - select BR2_PACKAGE_XLIB_LIBXINERAMA select BR2_PACKAGE_XLIB_LIBXT select BR2_PACKAGE_XORGPROTO help diff --git a/package/x11r7/xapp_xdm/xapp_xdm.hash b/package/x11r7/xapp_xdm/xapp_xdm.hash index 605be9debca..daf1b0852ff 100644 --- a/package/x11r7/xapp_xdm/xapp_xdm.hash +++ b/package/x11r7/xapp_xdm/xapp_xdm.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-March/002959.html -md5 47c4c3bf8d59b64b64d134df8b5e5ec5 xdm-1.1.12.tar.bz2 -sha1 5cc5590e40837949b1a63cb030878f8ceebd4d85 xdm-1.1.12.tar.bz2 -sha256 0dd283f72dda098d09e2925b9278c95e21551e693a5802ab442d1b577d8327f4 xdm-1.1.12.tar.bz2 -sha512 1a4be0a070ced5db8fda6fc74794c9f9ed0cb37fa440fda6a3a7652aff62dfc3d7ba68b9facf054671ebf0f4db2a0eec29d0aa3716e3407ccd5529bac3553bdb xdm-1.1.12.tar.bz2 +# 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 # Locally computed -sha256 b33b4bebbd6511b3e15315e8e29d67f25334ee45da8b7da6e6e97c53a70c6923 COPYING +sha256 b33b4bebbd6511b3e15315e8e29d67f25334ee45da8b7da6e6e97c53a70c6923 COPYING diff --git a/package/x11r7/xapp_xdm/xapp_xdm.mk b/package/x11r7/xapp_xdm/xapp_xdm.mk index 3c91e215791..035f2e9484a 100644 --- a/package/x11r7/xapp_xdm/xapp_xdm.mk +++ b/package/x11r7/xapp_xdm/xapp_xdm.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XDM_VERSION = 1.1.12 -XAPP_XDM_SOURCE = xdm-$(XAPP_XDM_VERSION).tar.bz2 -XAPP_XDM_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XDM_VERSION = 1.1.14 +XAPP_XDM_SOURCE = xdm-$(XAPP_XDM_VERSION).tar.xz +XAPP_XDM_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XDM_LICENSE = MIT XAPP_XDM_LICENSE_FILES = COPYING XAPP_XDM_CONF_ENV = ac_cv_file__dev_urandom=yes @@ -16,7 +16,6 @@ XAPP_XDM_DEPENDENCIES = \ xlib_libX11 \ xlib_libXaw \ xlib_libXdmcp \ - xlib_libXinerama \ xlib_libXt \ xorgproto XAPP_XDM_CONF_OPTS = \ @@ -24,6 +23,13 @@ XAPP_XDM_CONF_OPTS = \ --with-utmp-file=/var/adm/utmpx \ --with-wtmp-file=/var/adm/wtmpx +ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y) +XAPP_XDM_CONF_OPTS += --with-xinerama +XAPP_XDM_DEPENDENCIES += xlib_libXinerama +else +XAPP_XDM_CONF_OPTS += --without-xinerama +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_xdpyinfo/xapp_xdpyinfo.hash b/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.hash index eb02eaeda7c..b0afdc15acd 100644 --- a/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.hash +++ b/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002569.html -sha256 30238ed915619e06ceb41721e5f747d67320555cc38d459e954839c189ccaf51 xdpyinfo-1.3.2.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-April/003388.html +sha256 a8ada581dbd7266440d7c3794fa89edf6b99b8857fc2e8c31042684f3af4822b xdpyinfo-1.3.4.tar.xz +sha512 9ef9f5c10e15a40895e8f008896b960fdd438277657c7159d16f05db79cd2374cfaca4af2f4e59335824bfd2f74a045ef89dd99ea4130ed436ea59fbbb1cbe12 xdpyinfo-1.3.4.tar.xz # Locally computed sha256 49733ead65fdfa1da0d176f9b965cc08dae74d73d66c9606488d52f6fc036abf COPYING diff --git a/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk b/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk index cf94f70bcf3..a198fc44c36 100644 --- a/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk +++ b/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XDPYINFO_VERSION = 1.3.2 -XAPP_XDPYINFO_SOURCE = xdpyinfo-$(XAPP_XDPYINFO_VERSION).tar.bz2 -XAPP_XDPYINFO_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XDPYINFO_VERSION = 1.3.4 +XAPP_XDPYINFO_SOURCE = xdpyinfo-$(XAPP_XDPYINFO_VERSION).tar.xz +XAPP_XDPYINFO_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XDPYINFO_LICENSE = MIT XAPP_XDPYINFO_LICENSE_FILES = COPYING XAPP_XDPYINFO_CONF_OPTS = --without-xf86misc # not in BR diff --git a/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.hash b/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.hash index 80a4ac48f41..ce11d069777 100644 --- a/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.hash +++ b/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002858.html -md5 480e63cd365f03eb2515a6527d5f4ca6 xdriinfo-1.0.6.tar.bz2 -sha1 11682ae1f04a311b832651d78bbf4c6ac77f0ed9 xdriinfo-1.0.6.tar.bz2 -sha256 d9ccd2c3e87899417acc9ea1f3e319a4198112babe1dc711273584f607449d51 xdriinfo-1.0.6.tar.bz2 -sha512 7ddd9e19abaef93e4d85004293528ec3814ef84c470d496dbb8dc8313d804bb7520406de8d33d2bc2b3af942bd0a5d5032a109b2726438a966af63ea680a102f xdriinfo-1.0.6.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003308.html +sha256 dd838bae9d2b19ddd71fe6d30ed33abc7c85e19d223e79d35600db3fa44bf734 xdriinfo-1.0.7.tar.xz +sha512 a368cf32c606ca78f3a23bc5d88fb57b9c1a3827d0fec3e48cee153703135e47cecd3db8ee0eba93f309d7f03b4306c3f2e7f46f36d0d2970671c5e5b78093ad xdriinfo-1.0.7.tar.xz # Locally computed -sha256 de2fbb160bbb64c48975d7a3ebe3636a312b73227df1efe37488a8cecb9c1932 COPYING +sha256 de2fbb160bbb64c48975d7a3ebe3636a312b73227df1efe37488a8cecb9c1932 COPYING diff --git a/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk b/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk index 7f7aac9e154..7672dc88997 100644 --- a/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk +++ b/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XDRIINFO_VERSION = 1.0.6 -XAPP_XDRIINFO_SOURCE = xdriinfo-$(XAPP_XDRIINFO_VERSION).tar.bz2 -XAPP_XDRIINFO_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XDRIINFO_VERSION = 1.0.7 +XAPP_XDRIINFO_SOURCE = xdriinfo-$(XAPP_XDRIINFO_VERSION).tar.xz +XAPP_XDRIINFO_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XDRIINFO_LICENSE = MIT XAPP_XDRIINFO_LICENSE_FILES = COPYING XAPP_XDRIINFO_DEPENDENCIES = libgl xlib_libX11 xorgproto diff --git a/package/x11r7/xapp_xedit/xapp_xedit.hash b/package/x11r7/xapp_xedit/xapp_xedit.hash index e521e00821a..d550dbc8c62 100644 --- a/package/x11r7/xapp_xedit/xapp_xedit.hash +++ b/package/x11r7/xapp_xedit/xapp_xedit.hash @@ -1,5 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2015-February/002535.html -sha1 f37b5d0f8ec461955f0419dbb1890d8cf63d179d xedit-1.2.2.tar.bz2 -sha256 69aa42885dfc06332ca22eb01cc7187e49206e6d65b74113a8ee4cc345fc2927 xedit-1.2.2.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-April/003149.html +sha256 bdd33afeeca881622e55d2cf28f07b4a98f083d0a2573c0b9048f25bdd62db2f xedit-1.2.3.tar.xz +sha512 1089c35ef961e53f74cc7d892960e1ee7f0da17529e3173e7f7764b0eb4ee94d1e068cb177d8502ca55c1dd6808962d4b1427e303adc7e6db80be8828557f45a xedit-1.2.3.tar.xz # Locally computed sha256 6d3e4092277ea08fc6b3180dba061120ea53ee965afb84fce16f8ab3d35bb47a COPYING diff --git a/package/x11r7/xapp_xedit/xapp_xedit.mk b/package/x11r7/xapp_xedit/xapp_xedit.mk index 1cb99dc6f40..5aae798f05c 100644 --- a/package/x11r7/xapp_xedit/xapp_xedit.mk +++ b/package/x11r7/xapp_xedit/xapp_xedit.mk @@ -4,8 +4,8 @@ # ################################################################################ -XAPP_XEDIT_VERSION = 1.2.2 -XAPP_XEDIT_SOURCE = xedit-$(XAPP_XEDIT_VERSION).tar.bz2 +XAPP_XEDIT_VERSION = 1.2.3 +XAPP_XEDIT_SOURCE = xedit-$(XAPP_XEDIT_VERSION).tar.xz XAPP_XEDIT_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XEDIT_LICENSE = MIT XAPP_XEDIT_LICENSE_FILES = COPYING diff --git a/package/x11r7/xapp_xev/xapp_xev.hash b/package/x11r7/xapp_xev/xapp_xev.hash index 8b9a006c462..94497813608 100644 --- a/package/x11r7/xapp_xev/xapp_xev.hash +++ b/package/x11r7/xapp_xev/xapp_xev.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2020-July/003048.html -sha256 d700e08bfe751ed2dbf802baa204b056d0e49348b6eb3c6f9cb035d8ae4885e2 xev-1.2.4.tar.bz2 -sha512 383472ddbfad639ba46a69080ecdd11a514a0578fd32c463fae18da02e0265c944589eebf12a858994f5fd601c02a0d51517e9b3ff61c6afe740d374f02781ca xev-1.2.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-July/003185.html +sha256 c9461a4389714e0f33974f9e75934bdc38d836a0f059b8dc089c7cbf2ce36ec1 xev-1.2.5.tar.xz +sha512 9fbfb78c9547974c2256a678948bf4a694a40b1c2bd5c5dec5f365a713e6d938c6039f055a9629f49de27f02f3d7cb912f07c035df129798a4b2ddc20febe66a xev-1.2.5.tar.xz # Locally computed sha256 9b840f2e1900889124cc999f3158da2b6b07bf6d0d77bdbb01ce65d2e702dc83 COPYING diff --git a/package/x11r7/xapp_xev/xapp_xev.mk b/package/x11r7/xapp_xev/xapp_xev.mk index 7d5f3cbb82a..0f29a731e70 100644 --- a/package/x11r7/xapp_xev/xapp_xev.mk +++ b/package/x11r7/xapp_xev/xapp_xev.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XEV_VERSION = 1.2.4 -XAPP_XEV_SOURCE = xev-$(XAPP_XEV_VERSION).tar.bz2 -XAPP_XEV_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XEV_VERSION = 1.2.5 +XAPP_XEV_SOURCE = xev-$(XAPP_XEV_VERSION).tar.xz +XAPP_XEV_SITE = https://xorg.freedesktop.org/releases/individual/app XAPP_XEV_LICENSE = MIT XAPP_XEV_LICENSE_FILES = COPYING XAPP_XEV_DEPENDENCIES = xlib_libX11 xlib_libXrandr diff --git a/package/x11r7/xapp_xf86dga/xapp_xf86dga.hash b/package/x11r7/xapp_xf86dga/xapp_xf86dga.hash index 1a82db9ffe0..1f898b8b21b 100644 --- a/package/x11r7/xapp_xf86dga/xapp_xf86dga.hash +++ b/package/x11r7/xapp_xf86dga/xapp_xf86dga.hash @@ -1,4 +1,4 @@ # From http://lists.x.org/archives/xorg-announce/2010-October/001515.html -sha1 030659e3728f5f7142e1cf727f147aceeabe4b9e xf86dga-1.0.3.tar.bz2 +sha1 030659e3728f5f7142e1cf727f147aceeabe4b9e xf86dga-1.0.3.tar.bz2 # Locally computed sha256 27d8cbdcde7a0bd062ce49cdf8c672201452a64e3e6823f09b1beffe2c4b8eff COPYING diff --git a/package/x11r7/xapp_xfd/xapp_xfd.hash b/package/x11r7/xapp_xfd/xapp_xfd.hash index d1f5c454328..59659588283 100644 --- a/package/x11r7/xapp_xfd/xapp_xfd.hash +++ b/package/x11r7/xapp_xfd/xapp_xfd.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-March/002968.html -md5 f9c9f2b101a96d4b50c2a4ab9b5ab5b1 xfd-1.1.3.tar.bz2 -sha1 ca6dbe2027b205992a52c6bb717a43508f12a8c4 xfd-1.1.3.tar.bz2 -sha256 192f938ba5830e84cc807d8ead2ad9655b43eaed6500c830f3e083aad10ed958 xfd-1.1.3.tar.bz2 -sha512 68e2d4ce5e24215353b6f3231191d69639c4dd90a703e03ccf152bbfe4012da071c387ba289f918fb0336a3be9ee49dc05cbec7273fa85f5e476ead7e10795f0 xfd-1.1.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003266.html +sha256 d5470ffb66fd45a1e1b03d6df01f12d4caf0cf675cde0345cda237243e9076fd xfd-1.1.4.tar.xz +sha512 fa1f8a7b5d89be20fb2b1e3e0e8f4d7f9463e91fd385d21e1403a398c2e263112043b568417c420c5ee33bec60e06658498dd55df6d7ac19da3af0844f932209 xfd-1.1.4.tar.xz # Locally computed -sha256 57ae10f24fc110dafb3b8d7735cf26b1905ff74e716745b2520e4ccd7751095c COPYING +sha256 57ae10f24fc110dafb3b8d7735cf26b1905ff74e716745b2520e4ccd7751095c COPYING diff --git a/package/x11r7/xapp_xfd/xapp_xfd.mk b/package/x11r7/xapp_xfd/xapp_xfd.mk index 149e24b79aa..1ef1d69db30 100644 --- a/package/x11r7/xapp_xfd/xapp_xfd.mk +++ b/package/x11r7/xapp_xfd/xapp_xfd.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XFD_VERSION = 1.1.3 -XAPP_XFD_SOURCE = xfd-$(XAPP_XFD_VERSION).tar.bz2 -XAPP_XFD_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XFD_VERSION = 1.1.4 +XAPP_XFD_SOURCE = xfd-$(XAPP_XFD_VERSION).tar.xz +XAPP_XFD_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XFD_LICENSE = MIT XAPP_XFD_LICENSE_FILES = COPYING XAPP_XFD_DEPENDENCIES = \ diff --git a/package/x11r7/xapp_xfontsel/xapp_xfontsel.hash b/package/x11r7/xapp_xfontsel/xapp_xfontsel.hash index a09df5585b2..8d7e546bbaa 100644 --- a/package/x11r7/xapp_xfontsel/xapp_xfontsel.hash +++ b/package/x11r7/xapp_xfontsel/xapp_xfontsel.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002861.html -md5 13150ff98846bf6d9a14bee00697fa47 xfontsel-1.0.6.tar.bz2 -sha1 3fd8d78cc270030b41298170c3e5222065dd1cfd xfontsel-1.0.6.tar.bz2 -sha256 25aa0b7c4262f5e99c07c2b96e00e4eb25b7e53f94fa803942af9d0e8da3001c xfontsel-1.0.6.tar.bz2 -sha512 2f6bc51549a302404cdaf9a5a825add383953fcbb2a0c7076691cefd4dd7e4a3c772c047be74101c8486f75d03ce0bd3e65ede14e91732cf2a932810441c9099 xfontsel-1.0.6.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-July/003174.html +sha256 17052c3357bbfe44b8468675ae3d099c2427ba9fcac10540aef524ae4d77d1b4 xfontsel-1.1.0.tar.xz +sha512 be67d223668431c9b5dd2ef74032d2f087be5f8f0ccc427bc7ee43e7ce42214edddb07d8c3d6d6de93ea35314392d384f1ab1ae5c48b2cfbce418610e3945a52 xfontsel-1.1.0.tar.xz # Locally computed -sha256 a27097bcc5cdf4fa5d761dd4e5cea1f41911c51b0a7d9da6e3a48f69d9fd0c09 COPYING +sha256 a27097bcc5cdf4fa5d761dd4e5cea1f41911c51b0a7d9da6e3a48f69d9fd0c09 COPYING diff --git a/package/x11r7/xapp_xfontsel/xapp_xfontsel.mk b/package/x11r7/xapp_xfontsel/xapp_xfontsel.mk index 9dea4299b33..ac12f9c5094 100644 --- a/package/x11r7/xapp_xfontsel/xapp_xfontsel.mk +++ b/package/x11r7/xapp_xfontsel/xapp_xfontsel.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XFONTSEL_VERSION = 1.0.6 -XAPP_XFONTSEL_SOURCE = xfontsel-$(XAPP_XFONTSEL_VERSION).tar.bz2 -XAPP_XFONTSEL_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XFONTSEL_VERSION = 1.1.0 +XAPP_XFONTSEL_SOURCE = xfontsel-$(XAPP_XFONTSEL_VERSION).tar.xz +XAPP_XFONTSEL_SITE = https://xorg.freedesktop.org/releases/individual/app XAPP_XFONTSEL_LICENSE = MIT XAPP_XFONTSEL_LICENSE_FILES = COPYING XAPP_XFONTSEL_DEPENDENCIES = xlib_libXaw diff --git a/package/x11r7/xapp_xfs/xapp_xfs.hash b/package/x11r7/xapp_xfs/xapp_xfs.hash index 22ec25a1b43..ed802f86a06 100644 --- a/package/x11r7/xapp_xfs/xapp_xfs.hash +++ b/package/x11r7/xapp_xfs/xapp_xfs.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2017-November/002826.html -md5 b4d2e644bfb35cae8858d2411501b07e xfs-1.2.0.tar.bz2 -sha1 00848fcc2915ed8b00e75ac311c4727327324f57 xfs-1.2.0.tar.bz2 -sha256 db2212115783498f8eeaaee1349461d6c4e9d2005e142bacd3a984fe57269860 xfs-1.2.0.tar.bz2 -sha512 557b08aa07919239ce345d60b288b886640200bb1a59649fc890c3ccaa8559cc6745189614e696ab1b390ec024b393be5493787b7b0d2b3545b342d743c2e0ef xfs-1.2.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-July/003175.html +sha256 3d8ac3e8add7eeb1dc199dff6c59f90a2dbe7aa4332c1e12192350f2cda1c1e6 xfs-1.2.1.tar.xz +sha512 0f8b019e0d922b3d859110154e0ec58493f66507f9787cd41a6c03ad7a05b3293f088f1004e4aaa81e017a524c06d23915669f91ed5e1c2679b33c43de15e70d xfs-1.2.1.tar.xz # Locally computed -sha256 0314ea37f40eff3c9ffe44b3924b2a768422f006a754e8286bfd1c73203d225e COPYING +sha256 0314ea37f40eff3c9ffe44b3924b2a768422f006a754e8286bfd1c73203d225e COPYING diff --git a/package/x11r7/xapp_xfs/xapp_xfs.mk b/package/x11r7/xapp_xfs/xapp_xfs.mk index 9177a65b9c7..50a04121812 100644 --- a/package/x11r7/xapp_xfs/xapp_xfs.mk +++ b/package/x11r7/xapp_xfs/xapp_xfs.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XFS_VERSION = 1.2.0 -XAPP_XFS_SOURCE = xfs-$(XAPP_XFS_VERSION).tar.bz2 -XAPP_XFS_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XFS_VERSION = 1.2.1 +XAPP_XFS_SOURCE = xfs-$(XAPP_XFS_VERSION).tar.xz +XAPP_XFS_SITE = https://xorg.freedesktop.org/releases/individual/app XAPP_XFS_LICENSE = MIT XAPP_XFS_LICENSE_FILES = COPYING XAPP_XFS_DEPENDENCIES = xlib_libFS xlib_libXfont2 xorgproto diff --git a/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.hash b/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.hash index 67480a51aab..7d5976473dd 100644 --- a/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.hash +++ b/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-February/002949.html -md5 0060d6151427d9e570e54fc52a88e7d7 xfsinfo-1.0.6.tar.bz2 -sha1 cbfe7470179f1ab5eecf992226dc1b28902c6b4c xfsinfo-1.0.6.tar.bz2 -sha256 8a3e8b9b9ae6ed571989d04e1846d39b9043e28f7623b500ebe1d47762c9b1d6 xfsinfo-1.0.6.tar.bz2 -sha512 901fc3817d7c95f2ba75ed0c51de91abd8efa67bbb93ad6b7d66e56a2f721af9db364e92f9ef2e719835fd48e934a5ea7402e5565c0ccd9b6b82633e869dc57b xfsinfo-1.0.6.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003238.html +sha256 92f3ca451cba7717eed15f80de3c123aa56c82a1ee7d6e9116ba513021b98874 xfsinfo-1.0.7.tar.xz +sha512 1914916bf995c08a520bd009ddfa57c7e4a997a829380232d359f9bf68852c67650efb8f1fe3cc8a11889b2ec067f50ac38df711ffaf4536802a0b530dc1789c xfsinfo-1.0.7.tar.xz # Locally computed -sha256 bae01fa08f30f21f9cfb75e8339d081b34e5e03d12677177f85a55b0ca41d0db COPYING +sha256 bae01fa08f30f21f9cfb75e8339d081b34e5e03d12677177f85a55b0ca41d0db COPYING diff --git a/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk b/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk index bef9787ffef..29e9fc75c4f 100644 --- a/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk +++ b/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XFSINFO_VERSION = 1.0.6 -XAPP_XFSINFO_SOURCE = xfsinfo-$(XAPP_XFSINFO_VERSION).tar.bz2 -XAPP_XFSINFO_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XFSINFO_VERSION = 1.0.7 +XAPP_XFSINFO_SOURCE = xfsinfo-$(XAPP_XFSINFO_VERSION).tar.xz +XAPP_XFSINFO_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XFSINFO_LICENSE = MIT XAPP_XFSINFO_LICENSE_FILES = COPYING XAPP_XFSINFO_DEPENDENCIES = xlib_libFS xlib_libX11 diff --git a/package/x11r7/xapp_xgamma/xapp_xgamma.hash b/package/x11r7/xapp_xgamma/xapp_xgamma.hash index 0031450c4d5..17efe0a9756 100644 --- a/package/x11r7/xapp_xgamma/xapp_xgamma.hash +++ b/package/x11r7/xapp_xgamma/xapp_xgamma.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002574.html -sha256 0ef1c35b5c18b1b22317f455c8df13c0a471a8efad63c89c98ae3ce8c2b222d3 xgamma-1.0.6.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003267.html +sha256 1c79dae85a8953a15f4fe5c2895a033307b43b8613456c87ec47b374b113bc8f xgamma-1.0.7.tar.xz +sha512 9eeee9b537dcae9e4d153774eb632a6a5e8dd32bebadc9bbd897a773e5b56f76848f32a1699b8c921d3094760c42b5083365d853b89ab31fd85c7a0d46feeceb xgamma-1.0.7.tar.xz # Locally computed sha256 78d354d348feaaab8d67a220e84137ec24fece04af4dface2e67132c72e216a2 COPYING diff --git a/package/x11r7/xapp_xgamma/xapp_xgamma.mk b/package/x11r7/xapp_xgamma/xapp_xgamma.mk index a73a29e5a2d..f2e9e91efb8 100644 --- a/package/x11r7/xapp_xgamma/xapp_xgamma.mk +++ b/package/x11r7/xapp_xgamma/xapp_xgamma.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XGAMMA_VERSION = 1.0.6 -XAPP_XGAMMA_SOURCE = xgamma-$(XAPP_XGAMMA_VERSION).tar.bz2 -XAPP_XGAMMA_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XGAMMA_VERSION = 1.0.7 +XAPP_XGAMMA_SOURCE = xgamma-$(XAPP_XGAMMA_VERSION).tar.xz +XAPP_XGAMMA_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XGAMMA_LICENSE = MIT XAPP_XGAMMA_LICENSE_FILES = COPYING XAPP_XGAMMA_DEPENDENCIES = xlib_libXxf86vm diff --git a/package/x11r7/xapp_xgc/xapp_xgc.hash b/package/x11r7/xapp_xgc/xapp_xgc.hash index 50e1362b64d..7664e311864 100644 --- a/package/x11r7/xapp_xgc/xapp_xgc.hash +++ b/package/x11r7/xapp_xgc/xapp_xgc.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002575.html -sha256 14828d9bda358ad57efc0206bc416ee33ba542091edb186485cca5389adc2f5e xgc-1.0.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003221.html +sha256 7b87bbdbce4ec858738a3b81b8a3943aff01036001e2a1d00bb5384392a8b240 xgc-1.0.6.tar.xz +sha512 f449b9b2d313aeba1fe9bf33fef90291776403f1fdf4afc507c4b973045c97fc8ded65ddec4f8c58727e7e4c7c4ad6a65ae79581eb4bdfe9c79a5f909dbc0a1f xgc-1.0.6.tar.xz # Locally computed sha256 13ebeb3e59e406064d46e94a707ed5ec5d8d2bf840971265dd46db0850d22d02 COPYING diff --git a/package/x11r7/xapp_xgc/xapp_xgc.mk b/package/x11r7/xapp_xgc/xapp_xgc.mk index 41d42c461e1..fc055f57dd7 100644 --- a/package/x11r7/xapp_xgc/xapp_xgc.mk +++ b/package/x11r7/xapp_xgc/xapp_xgc.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XGC_VERSION = 1.0.5 -XAPP_XGC_SOURCE = xgc-$(XAPP_XGC_VERSION).tar.bz2 -XAPP_XGC_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XGC_VERSION = 1.0.6 +XAPP_XGC_SOURCE = xgc-$(XAPP_XGC_VERSION).tar.xz +XAPP_XGC_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XGC_LICENSE = MIT XAPP_XGC_LICENSE_FILES = COPYING XAPP_XGC_DEPENDENCIES = xlib_libXaw diff --git a/package/x11r7/xapp_xhost/xapp_xhost.hash b/package/x11r7/xapp_xhost/xapp_xhost.hash index 0c3879441bc..fea2588c6d2 100644 --- a/package/x11r7/xapp_xhost/xapp_xhost.hash +++ b/package/x11r7/xapp_xhost/xapp_xhost.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-February/002950.html -md5 a48c72954ae6665e0616f6653636da8c xhost-1.0.8.tar.bz2 -sha1 971670858a464d4f8eeb6f4e182f9fcd94149790 xhost-1.0.8.tar.bz2 -sha256 a2dc3c579e13674947395ef8ccc1b3763f89012a216c2cc6277096489aadc396 xhost-1.0.8.tar.bz2 -sha512 55581f9bc45a70a73b13fe718ca83c4cb0a6116d26addc0f07659ebeb5bf7d2379e84cab5a1702ae77a298a66f42ae03f41ddc7d5acd61c6f18448e58ad7cb6b xhost-1.0.8.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003301.html +sha256 ea86b531462035b19a2e5e01ef3d9a35cca7d984086645e2fc844d8f0e346645 xhost-1.0.9.tar.xz +sha512 d281a0df0a036d693ce7dbe0d1d53839110d203f42454bf4d33a49fbfddec078149969b6ad76641e40e207ddc8317ea563088c59025fc57d8245e5ed27f79818 xhost-1.0.9.tar.xz # Locally computed -sha256 7e69bed6fcfff05ecf454d7e4b29cd265172385833f1978f04b638f92f2cfecf COPYING +sha256 d3106697fb05dea4e9899b9e782ae7c3c17086d5b3dc7966494fc83fda9e468e COPYING diff --git a/package/x11r7/xapp_xhost/xapp_xhost.mk b/package/x11r7/xapp_xhost/xapp_xhost.mk index e9fb155216a..55f7ca5cc73 100644 --- a/package/x11r7/xapp_xhost/xapp_xhost.mk +++ b/package/x11r7/xapp_xhost/xapp_xhost.mk @@ -4,11 +4,12 @@ # ################################################################################ -XAPP_XHOST_VERSION = 1.0.8 -XAPP_XHOST_SOURCE = xhost-$(XAPP_XHOST_VERSION).tar.bz2 -XAPP_XHOST_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XHOST_VERSION = 1.0.9 +XAPP_XHOST_SOURCE = xhost-$(XAPP_XHOST_VERSION).tar.xz +XAPP_XHOST_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XHOST_LICENSE = MIT XAPP_XHOST_LICENSE_FILES = COPYING -XAPP_XHOST_DEPENDENCIES = xlib_libX11 xlib_libXmu +XAPP_XHOST_DEPENDENCIES = xlib_libX11 xlib_libXmu $(TARGET_NLS_DEPENDENCIES) +XAPP_XHOST_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) $(eval $(autotools-package)) diff --git a/package/x11r7/xapp_xinit/xapp_xinit.hash b/package/x11r7/xapp_xinit/xapp_xinit.hash index 076bd64758e..4b7d8feb5df 100644 --- a/package/x11r7/xapp_xinit/xapp_xinit.hash +++ b/package/x11r7/xapp_xinit/xapp_xinit.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-March/002962.html -md5 6d506ab2efc17a08e87778654e099d37 xinit-1.4.1.tar.bz2 -sha1 d874a2eecf2c30291e327851b151fdab8183260c xinit-1.4.1.tar.bz2 -sha256 de9b8f617b68a70f6caf87da01fcf0ebd2b75690cdcba9c921d0ef54fa54abb9 xinit-1.4.1.tar.bz2 -sha512 6cbc5d025a891c419f3f4493381b2fca57a67d78df866d2f16a83426f86bad6eca7f240fac12b25cbcc63df0fec41f625407184e044898602d66483715315340 xinit-1.4.1.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003268.html +sha256 b7d8dc8d22ef9f15985a10b606ee4f2aad6828befa437359934647e88d331f23 xinit-1.4.2.tar.xz +sha512 4b62c2edd97b40133577cbba88b3f31b36c5634b4eb667ef0c302e8358dc1c55a255abe42aaadc910d8aa9ea0e3add157a12a301382f1cdbe091df4e1215fae0 xinit-1.4.2.tar.xz # Locally computed -sha256 c47001aa217d4ae7787121d80634db4bdba564e49a0ecab8d48b1bdc4edee1c7 COPYING +sha256 c47001aa217d4ae7787121d80634db4bdba564e49a0ecab8d48b1bdc4edee1c7 COPYING diff --git a/package/x11r7/xapp_xinit/xapp_xinit.mk b/package/x11r7/xapp_xinit/xapp_xinit.mk index 86a4d926748..795a1b541b2 100644 --- a/package/x11r7/xapp_xinit/xapp_xinit.mk +++ b/package/x11r7/xapp_xinit/xapp_xinit.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XINIT_VERSION = 1.4.1 -XAPP_XINIT_SOURCE = xinit-$(XAPP_XINIT_VERSION).tar.bz2 -XAPP_XINIT_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XINIT_VERSION = 1.4.2 +XAPP_XINIT_SOURCE = xinit-$(XAPP_XINIT_VERSION).tar.xz +XAPP_XINIT_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XINIT_DEPENDENCIES = xapp_xauth xlib_libX11 XAPP_XINIT_LICENSE = MIT XAPP_XINIT_LICENSE_FILES = COPYING diff --git a/package/x11r7/xapp_xinput/xapp_xinput.hash b/package/x11r7/xapp_xinput/xapp_xinput.hash index 456a58c7020..d3a6a66902a 100644 --- a/package/x11r7/xapp_xinput/xapp_xinput.hash +++ b/package/x11r7/xapp_xinput/xapp_xinput.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-July/003013.html -md5 ac6b7432726008b2f50eba82b0e2dbe4 xinput-1.6.3.tar.bz2 -sha1 92ea7dfb3d8465921b0dca85da7d5b01cedae6c8 xinput-1.6.3.tar.bz2 -sha256 35a281dd3b9b22ea85e39869bb7670ba78955d5fec17c6ef7165d61e5aeb66ed xinput-1.6.3.tar.bz2 -sha512 cb2fef866ac5a71dbca3e23b4ecadaca38e65dc1b30f8bb024bad92486554fafc472706619a1af04c746a4f53ce6aea827d694b9f4f0c7d0d46bb1da81984076 xinput-1.6.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-April/003389.html +sha256 ad04d00d656884d133110eeddc34e9c69e626ebebbbab04dc95791c2907057c8 xinput-1.6.4.tar.xz +sha512 6734860852715e5cb9d26259a173e42413fc037546ed7fa4173ffa802c2619ee0322bed228a28cd1911be759d860070867d9b89b115f37323cca1c9ef75354b9 xinput-1.6.4.tar.xz # Locally computed -sha256 bbd35c7a8e8c5cb073935e84b29b0c53f7131a4ef1ce737dc2be5616941e07e1 COPYING +sha256 bbd35c7a8e8c5cb073935e84b29b0c53f7131a4ef1ce737dc2be5616941e07e1 COPYING diff --git a/package/x11r7/xapp_xinput/xapp_xinput.mk b/package/x11r7/xapp_xinput/xapp_xinput.mk index 0d6c0deffe4..614b62fe773 100644 --- a/package/x11r7/xapp_xinput/xapp_xinput.mk +++ b/package/x11r7/xapp_xinput/xapp_xinput.mk @@ -4,8 +4,8 @@ # ################################################################################ -XAPP_XINPUT_VERSION = 1.6.3 -XAPP_XINPUT_SOURCE = xinput-$(XAPP_XINPUT_VERSION).tar.bz2 +XAPP_XINPUT_VERSION = 1.6.4 +XAPP_XINPUT_SOURCE = xinput-$(XAPP_XINPUT_VERSION).tar.xz XAPP_XINPUT_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XINPUT_LICENSE = MIT XAPP_XINPUT_LICENSE_FILES = COPYING diff --git a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.hash b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.hash index bccaae6f57b..b626e502369 100644 --- a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.hash +++ b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.hash @@ -1,6 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2021-March/003075.html -sha256 6851086c4244b6fd0cc562880d8ff193fb2bbf1e141c73632e10731b31d4b05e xkbcomp-1.4.5.tar.bz2 -sha512 2e84f8d6b083e2e818cb95e5d2a184da00e50d71b280e92d1a71465a9a4348f922f4ddccb42cfeee6f76705bbfc8580ef67aedd0d958aaa1ae6bbcc66ccd8154 xkbcomp-1.4.5.tar.bz2 - +# From https://lists.x.org/archives/xorg-announce/2022-December/003283.html +sha256 fa50d611ef41e034487af7bd8d8c718df53dd18002f591cca16b0384afc58e98 xkbcomp-1.4.6.tar.xz +sha512 90e69dd1c78c28f77a5acc7821b43afec1b9ac4895bc6f3462b4902baaadc26f3869da69e3bd023b4bc74adb5f1be0c43ca24b3dab37ac9a479c5622684baa81 xkbcomp-1.4.6.tar.xz # Locally computed sha256 6b833fdc05906ce57f016dc791db86830d49ee4da2861ce45806c50b3f4dda9e COPYING diff --git a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk index b52f5e6850c..61922c7cc90 100644 --- a/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk +++ b/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk @@ -4,8 +4,8 @@ # ################################################################################ -XAPP_XKBCOMP_VERSION = 1.4.5 -XAPP_XKBCOMP_SOURCE = xkbcomp-$(XAPP_XKBCOMP_VERSION).tar.bz2 +XAPP_XKBCOMP_VERSION = 1.4.6 +XAPP_XKBCOMP_SOURCE = xkbcomp-$(XAPP_XKBCOMP_VERSION).tar.xz XAPP_XKBCOMP_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XKBCOMP_LICENSE = MIT XAPP_XKBCOMP_LICENSE_FILES = COPYING diff --git a/package/x11r7/xapp_xkbevd/xapp_xkbevd.hash b/package/x11r7/xapp_xkbevd/xapp_xkbevd.hash index c3cf2f32b25..40b813fcf2a 100644 --- a/package/x11r7/xapp_xkbevd/xapp_xkbevd.hash +++ b/package/x11r7/xapp_xkbevd/xapp_xkbevd.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002577.html -sha256 2430a2e5302a4cb4a5530c1df8cb3721a149bbf8eb377a2898921a145197f96a xkbevd-1.1.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-November/003255.html +sha256 38357b702de9d3457c4ff75053390f457b84c4accc7f088101255c37c684926b xkbevd-1.1.5.tar.xz +sha512 9e4a56484771e5eb5444fbd11e7d0bb952a2746eea79b84298e2000ada96896d501b886727c4ef08c120b5dcce550fca2d3e3dd762f4ca0327c38d9609961c5b xkbevd-1.1.5.tar.xz # Locally computed sha256 38c6dbf8f88b1c920561ff3a4d1ffdb85c069c664f5f8b64a9adb477ef347b7c COPYING diff --git a/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk b/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk index 7a9a8fb18fb..5b99e6967f6 100644 --- a/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk +++ b/package/x11r7/xapp_xkbevd/xapp_xkbevd.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XKBEVD_VERSION = 1.1.4 -XAPP_XKBEVD_SOURCE = xkbevd-$(XAPP_XKBEVD_VERSION).tar.bz2 -XAPP_XKBEVD_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XKBEVD_VERSION = 1.1.5 +XAPP_XKBEVD_SOURCE = xkbevd-$(XAPP_XKBEVD_VERSION).tar.xz +XAPP_XKBEVD_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XKBEVD_LICENSE = MIT XAPP_XKBEVD_LICENSE_FILES = COPYING XAPP_XKBEVD_DEPENDENCIES = xlib_libxkbfile diff --git a/package/x11r7/xapp_xkbprint/xapp_xkbprint.hash b/package/x11r7/xapp_xkbprint/xapp_xkbprint.hash index c7e0747f062..8ca7656b5cb 100644 --- a/package/x11r7/xapp_xkbprint/xapp_xkbprint.hash +++ b/package/x11r7/xapp_xkbprint/xapp_xkbprint.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-November/003030.html -md5 9c34da77363dc3d0f616980da87244bf xkbprint-1.0.5.tar.bz2 -sha1 e707caffb3c680b3a869a776aa3f80caeac9e9c3 xkbprint-1.0.5.tar.bz2 -sha256 5b58fe834f0822f06d63d283fac404098c6d3f6acce61888b81016f1c41023fa xkbprint-1.0.5.tar.bz2 -sha512 ac3870352f3a595b5b8a8cb64f39e9bea81b17572c73cfbf72482477a2f576d0ffcdcf735cb3c66b8a88a7fe0f7aece6738cbac87df5641e44fae1ab9b97111f xkbprint-1.0.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003222.html +sha256 99cc9404f7b90289ae04944c0d98a208cc8b158492ad6481386e31d4d09aa7b0 xkbprint-1.0.6.tar.xz +sha512 a1c2401b2a2ef4c6bd2efc18923ecb176adcf38b6c5dfdce25f22f1f5ab21e25f494b25dac25b1765fb9a0f6acc24d191cd41b9a098a9e3c6eaf9a9df490be29 xkbprint-1.0.6.tar.xz # Locally computed -sha256 79b32f28f7f5063054a564e1fdeee56f82a525b6516303704a1f70e55fe7197e COPYING +sha256 79b32f28f7f5063054a564e1fdeee56f82a525b6516303704a1f70e55fe7197e COPYING diff --git a/package/x11r7/xapp_xkbprint/xapp_xkbprint.mk b/package/x11r7/xapp_xkbprint/xapp_xkbprint.mk index 8643cb42760..f374c18daea 100644 --- a/package/x11r7/xapp_xkbprint/xapp_xkbprint.mk +++ b/package/x11r7/xapp_xkbprint/xapp_xkbprint.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XKBPRINT_VERSION = 1.0.5 -XAPP_XKBPRINT_SOURCE = xkbprint-$(XAPP_XKBPRINT_VERSION).tar.bz2 -XAPP_XKBPRINT_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XKBPRINT_VERSION = 1.0.6 +XAPP_XKBPRINT_SOURCE = xkbprint-$(XAPP_XKBPRINT_VERSION).tar.xz +XAPP_XKBPRINT_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XKBPRINT_LICENSE = MIT XAPP_XKBPRINT_LICENSE_FILES = COPYING XAPP_XKBPRINT_DEPENDENCIES = xlib_libxkbfile diff --git a/package/x11r7/xapp_xkbutils/xapp_xkbutils.hash b/package/x11r7/xapp_xkbutils/xapp_xkbutils.hash index 2f8dbc7c1e2..95287956a86 100644 --- a/package/x11r7/xapp_xkbutils/xapp_xkbutils.hash +++ b/package/x11r7/xapp_xkbutils/xapp_xkbutils.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2013-February/002162.html -sha256 d2a18ab90275e8bca028773c44264d2266dab70853db4321bdbc18da75148130 xkbutils-1.0.4.tar.bz2 +# 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 # Locally computed sha256 3d67b53c085de6d475705b60855b9277afac5d4c4ec531d0ffd1ef0d00571594 COPYING diff --git a/package/x11r7/xapp_xkbutils/xapp_xkbutils.mk b/package/x11r7/xapp_xkbutils/xapp_xkbutils.mk index 96ca8a40933..90501908e66 100644 --- a/package/x11r7/xapp_xkbutils/xapp_xkbutils.mk +++ b/package/x11r7/xapp_xkbutils/xapp_xkbutils.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XKBUTILS_VERSION = 1.0.4 -XAPP_XKBUTILS_SOURCE = xkbutils-$(XAPP_XKBUTILS_VERSION).tar.bz2 -XAPP_XKBUTILS_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XKBUTILS_VERSION = 1.0.5 +XAPP_XKBUTILS_SOURCE = xkbutils-$(XAPP_XKBUTILS_VERSION).tar.xz +XAPP_XKBUTILS_SITE = https://xorg.freedesktop.org/releases/individual/app XAPP_XKBUTILS_LICENSE = MIT XAPP_XKBUTILS_LICENSE_FILES = COPYING XAPP_XKBUTILS_DEPENDENCIES = xlib_libXaw xlib_libxkbfile diff --git a/package/x11r7/xapp_xkill/xapp_xkill.hash b/package/x11r7/xapp_xkill/xapp_xkill.hash index 06029717059..8cee05d8711 100644 --- a/package/x11r7/xapp_xkill/xapp_xkill.hash +++ b/package/x11r7/xapp_xkill/xapp_xkill.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002864.html -md5 938177e4472c346cf031c1aefd8934fc xkill-1.0.5.tar.bz2 -sha1 c5ee06b33adb252a41e4f737be6bd47651ff582a xkill-1.0.5.tar.bz2 -sha256 c5f0bb6a95e1ac7c4def8a657496d5d2f21ccd41eb47ef2c9ccb03fb6d6aff6b xkill-1.0.5.tar.bz2 -sha512 4603a1794f114f5cea2c885020c9d073c8421d1e785c99ff6b936ae97139c8dac8020a187b5bbd0fa6d56ed6fab879441b42ba900cc5f2f5a534dafdc86b9249 xkill-1.0.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-November/003256.html +sha256 e5a8aa78c475677b11504646da8d93dacc30744258076a2ca418a24438aeb907 xkill-1.0.6.tar.xz +sha512 a755a8db51d7860b9942161776390007b9b530c2f7fcf8ddb3383311d36d185a6f08a44c5f6f7735576b146902e66aca21cbd7e746c1289d035e79332e8173b6 xkill-1.0.6.tar.xz # Locally computed -sha256 13306c3890e4c8710bc468dee0eba7f9677cd94c7a67d2d81fa932d4f635b21f COPYING +sha256 13306c3890e4c8710bc468dee0eba7f9677cd94c7a67d2d81fa932d4f635b21f COPYING diff --git a/package/x11r7/xapp_xkill/xapp_xkill.mk b/package/x11r7/xapp_xkill/xapp_xkill.mk index 64ddbca6949..84dad0b5c7a 100644 --- a/package/x11r7/xapp_xkill/xapp_xkill.mk +++ b/package/x11r7/xapp_xkill/xapp_xkill.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XKILL_VERSION = 1.0.5 -XAPP_XKILL_SOURCE = xkill-$(XAPP_XKILL_VERSION).tar.bz2 -XAPP_XKILL_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XKILL_VERSION = 1.0.6 +XAPP_XKILL_SOURCE = xkill-$(XAPP_XKILL_VERSION).tar.xz +XAPP_XKILL_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XKILL_LICENSE = MIT XAPP_XKILL_LICENSE_FILES = COPYING XAPP_XKILL_DEPENDENCIES = xlib_libX11 xlib_libXmu diff --git a/package/x11r7/xapp_xload/xapp_xload.hash b/package/x11r7/xapp_xload/xapp_xload.hash index 99d9cabb0ea..9716fe1500c 100644 --- a/package/x11r7/xapp_xload/xapp_xload.hash +++ b/package/x11r7/xapp_xload/xapp_xload.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002865.html -md5 29afafdffe97f809d43a41db9dd63f25 xload-1.1.3.tar.bz2 -sha1 fd5053d38551883309863c2a43de2ceffa908a50 xload-1.1.3.tar.bz2 -sha256 f34e4803871d771325cfe52bebd98cc5b6040d3f065184ec73de436f9a375907 xload-1.1.3.tar.bz2 -sha512 8dbc4f0cee7b30d7381be819152b27653d9b0049266e59bde2e2c972a88c4f2bdea766fc407bbdfef15d0aab30fedc756189a1048170a812853133a5094fe7a5 xload-1.1.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-April/003150.html +sha256 8346b99120db24e0f42920f7f12e23e9b1b407d3a66ce419990387b608373031 xload-1.1.4.tar.xz +sha512 114babe4e5a60f4713f9e4627ee0a1bbb2f1f238cb46f24c38aecff67f25e6b0f58cbd554c71095ddc2b01398adbfa379550a34c23c413db52157648028554f2 xload-1.1.4.tar.xz # Locally computed -sha256 a09b31d26e4d2781eef1e71f39789f86cad6d81153e72064f45875910fa6258f COPYING +sha256 a09b31d26e4d2781eef1e71f39789f86cad6d81153e72064f45875910fa6258f COPYING diff --git a/package/x11r7/xapp_xload/xapp_xload.mk b/package/x11r7/xapp_xload/xapp_xload.mk index 9f491ccdc6e..f2193594477 100644 --- a/package/x11r7/xapp_xload/xapp_xload.mk +++ b/package/x11r7/xapp_xload/xapp_xload.mk @@ -4,8 +4,8 @@ # ################################################################################ -XAPP_XLOAD_VERSION = 1.1.3 -XAPP_XLOAD_SOURCE = xload-$(XAPP_XLOAD_VERSION).tar.bz2 +XAPP_XLOAD_VERSION = 1.1.4 +XAPP_XLOAD_SOURCE = xload-$(XAPP_XLOAD_VERSION).tar.xz XAPP_XLOAD_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XLOAD_LICENSE = MIT XAPP_XLOAD_LICENSE_FILES = COPYING diff --git a/package/x11r7/xapp_xlogo/xapp_xlogo.hash b/package/x11r7/xapp_xlogo/xapp_xlogo.hash index a4aada48c8c..58f2ac40283 100644 --- a/package/x11r7/xapp_xlogo/xapp_xlogo.hash +++ b/package/x11r7/xapp_xlogo/xapp_xlogo.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-March/002963.html -md5 e9d21de1dc8c8b9f854509a26a985cd7 xlogo-1.0.5.tar.bz2 -sha1 f025a0ad30c45cbec1c2f3b1610bff94fb4e9f33 xlogo-1.0.5.tar.bz2 -sha256 633d7a3aa5df61e4e643b740e5799664741ab1a0ba40593e54fcd15dc30f378e xlogo-1.0.5.tar.bz2 -sha512 0d78e269b0be3c5de71de7f362b896bfd9934ecd9d0361b3302399b1269e029c4a9f35418d792121a1edc34405d753f9d69c996cc3a69ac717f2b0d1f736406b xlogo-1.0.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-November/003257.html +sha256 c16ae461a7f7ea275f55c82acf3ee86ce0eb5e406f3a91ab2bb4d332693f32a0 xlogo-1.0.6.tar.xz +sha512 f0c921e0e34d2c0959d95ca0fcb7488395043280b8b35bcad4e8a528224f2b38581fbf60e82239d06760ecd637692cb29c3b1c0c46ac7f269f692a139d954ea0 xlogo-1.0.6.tar.xz # Locally computed -sha256 972b454b6c0da17cec61225ab9dfd4afc69fd8e7e4c629497197c6f79adc6fb0 COPYING +sha256 972b454b6c0da17cec61225ab9dfd4afc69fd8e7e4c629497197c6f79adc6fb0 COPYING diff --git a/package/x11r7/xapp_xlogo/xapp_xlogo.mk b/package/x11r7/xapp_xlogo/xapp_xlogo.mk index 455469e160b..27d693bec9d 100644 --- a/package/x11r7/xapp_xlogo/xapp_xlogo.mk +++ b/package/x11r7/xapp_xlogo/xapp_xlogo.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XLOGO_VERSION = 1.0.5 -XAPP_XLOGO_SOURCE = xlogo-$(XAPP_XLOGO_VERSION).tar.bz2 -XAPP_XLOGO_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XLOGO_VERSION = 1.0.6 +XAPP_XLOGO_SOURCE = xlogo-$(XAPP_XLOGO_VERSION).tar.xz +XAPP_XLOGO_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XLOGO_LICENSE = MIT XAPP_XLOGO_LICENSE_FILES = COPYING XAPP_XLOGO_DEPENDENCIES = \ diff --git a/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.hash b/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.hash index de7eabe3be9..be9ed6f0b49 100644 --- a/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.hash +++ b/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-February/002951.html -md5 61671fee12535347db24ec3a715032a7 xlsatoms-1.1.3.tar.bz2 -sha1 9fdb1e8df6bb08529a812ac90f63d500bf5174cc xlsatoms-1.1.3.tar.bz2 -sha256 57868f958c263976727881f3078e55b86b4a109dc578d2b92f5c6d690850a382 xlsatoms-1.1.3.tar.bz2 -sha512 c267ccfdc5a83e834bfb5c3b144e22642badcadef4eb146eeec2df6fe6f85e9379500ae4219912c70fa2e535036a1a96cf496381f5d814e79af075e03c975f30 xlsatoms-1.1.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-November/003258.html +sha256 f4bfa15f56c066d326a5d5b292646708f25b9247506840b9047cd2687dcc71b7 xlsatoms-1.1.4.tar.xz +sha512 82f0d1e17850770537eac82947eff4514639f8122bd864e02685ede49db110a4c90c7782702ffb677a2b581f3eacd10dba80e63e29e7a1ed1c9255ee163fe0c4 xlsatoms-1.1.4.tar.xz # Locally computed -sha256 f0a362fc1b8e788845b1c0ad7ba9ade58fdfb73da750c3b9780db5d70b947657 COPYING +sha256 f0a362fc1b8e788845b1c0ad7ba9ade58fdfb73da750c3b9780db5d70b947657 COPYING diff --git a/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk b/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk index a3230fc2dcd..2ef09ef2d59 100644 --- a/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk +++ b/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XLSATOMS_VERSION = 1.1.3 -XAPP_XLSATOMS_SOURCE = xlsatoms-$(XAPP_XLSATOMS_VERSION).tar.bz2 -XAPP_XLSATOMS_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XLSATOMS_VERSION = 1.1.4 +XAPP_XLSATOMS_SOURCE = xlsatoms-$(XAPP_XLSATOMS_VERSION).tar.xz +XAPP_XLSATOMS_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XLSATOMS_LICENSE = MIT XAPP_XLSATOMS_LICENSE_FILES = COPYING XAPP_XLSATOMS_DEPENDENCIES = xlib_libX11 xlib_libXmu diff --git a/package/x11r7/xapp_xlsclients/xapp_xlsclients.hash b/package/x11r7/xapp_xlsclients/xapp_xlsclients.hash index a465c3cee36..ac172acceb3 100644 --- a/package/x11r7/xapp_xlsclients/xapp_xlsclients.hash +++ b/package/x11r7/xapp_xlsclients/xapp_xlsclients.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002866.html -md5 4fa92377e0ddc137cd226a7a87b6b29a xlsclients-1.1.4.tar.bz2 -sha1 175af1c216a1db3de5023ecd6cce186e7693c6e4 xlsclients-1.1.4.tar.bz2 -sha256 773f2af49c7ea2c44fba4213bee64325875c1b3c9bc4bbcd8dac9261751809c1 xlsclients-1.1.4.tar.bz2 -sha512 42fd848d88d3cf31168a37fed63f9f5b60ddc4f36be2956b354e574c93129d75f29e005d6631784380bcef27860b54c64f419ca18ad77f092f4520dec47b10f4 xlsclients-1.1.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-November/003259.html +sha256 68baee57e70250ac4a7759fb78221831f97d88bc8e51dcc2e64eb3f8ca56bae3 xlsclients-1.1.5.tar.xz +sha512 3896643378603876438772475e89ad5c066f98c16593245db5fa066418ff793798247f976d2bf7aa401d2590fc9807b80c9758bcbcc91566f02ceb856d9702bf xlsclients-1.1.5.tar.xz # Locally computed -sha256 716d6f1d18cb97cdd4a2ef7b101d944a250ca9de57578a490c038b9aaf950648 COPYING +sha256 716d6f1d18cb97cdd4a2ef7b101d944a250ca9de57578a490c038b9aaf950648 COPYING diff --git a/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk b/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk index 167748b3389..a179e06713a 100644 --- a/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk +++ b/package/x11r7/xapp_xlsclients/xapp_xlsclients.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XLSCLIENTS_VERSION = 1.1.4 -XAPP_XLSCLIENTS_SOURCE = xlsclients-$(XAPP_XLSCLIENTS_VERSION).tar.bz2 -XAPP_XLSCLIENTS_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XLSCLIENTS_VERSION = 1.1.5 +XAPP_XLSCLIENTS_SOURCE = xlsclients-$(XAPP_XLSCLIENTS_VERSION).tar.xz +XAPP_XLSCLIENTS_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XLSCLIENTS_LICENSE = MIT XAPP_XLSCLIENTS_LICENSE_FILES = COPYING XAPP_XLSCLIENTS_DEPENDENCIES = xlib_libX11 xlib_libXmu libxcb xcb-util diff --git a/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.hash b/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.hash index f76369f97ea..cd8ae4f3687 100644 --- a/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.hash +++ b/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002867.html -md5 5774fd4f518b3f338f2b28f270e04bfc xlsfonts-1.0.6.tar.bz2 -sha1 bf95e46e0897dcb9d197ce20d4fa024b8ace5148 xlsfonts-1.0.6.tar.bz2 -sha256 89b80b3a030006ab6cef717be286c12f2477894b227158b1e6133274f6ebd368 xlsfonts-1.0.6.tar.bz2 -sha512 052a3b1dec23cb20fdfacd4500cb836feb3b888bf568a548ea71deb58a4ba10a1ad5392d658e95272c6d4a1832edf1f19c3de2498b78dca82c43ee52800a30c0 xlsfonts-1.0.6.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-April/003151.html +sha256 7b726945a967b44c35cddee5edd74802907a239ce2e2e515730b8a32c8e50465 xlsfonts-1.0.7.tar.xz +sha512 ec82be0a97500a9e64fb5a6adbbec470b249b1267c3081c2bd44cd3e7148107517d1234c1da2f81b0405230ab03ad2943ea53756c3380f4d561665b38d0cedc0 xlsfonts-1.0.7.tar.xz # Locally computed -sha256 dcdf5fa36a652efbe61a21def1301739b0010334ae3f049f1cff433221a8c7a5 COPYING +sha256 dcdf5fa36a652efbe61a21def1301739b0010334ae3f049f1cff433221a8c7a5 COPYING diff --git a/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk b/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk index 0ccd4ea6b08..f8a35e56380 100644 --- a/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk +++ b/package/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk @@ -4,8 +4,8 @@ # ################################################################################ -XAPP_XLSFONTS_VERSION = 1.0.6 -XAPP_XLSFONTS_SOURCE = xlsfonts-$(XAPP_XLSFONTS_VERSION).tar.bz2 +XAPP_XLSFONTS_VERSION = 1.0.7 +XAPP_XLSFONTS_SOURCE = xlsfonts-$(XAPP_XLSFONTS_VERSION).tar.xz XAPP_XLSFONTS_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XLSFONTS_LICENSE = MIT XAPP_XLSFONTS_LICENSE_FILES = COPYING diff --git a/package/x11r7/xapp_xmag/xapp_xmag.hash b/package/x11r7/xapp_xmag/xapp_xmag.hash index 55a9d479d00..c0cfbcfa68a 100644 --- a/package/x11r7/xapp_xmag/xapp_xmag.hash +++ b/package/x11r7/xapp_xmag/xapp_xmag.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002581.html -sha256 87a2bc23b251e2d8f8370d3283a4d6c8dac98a30cb5749a04336cdb55c14e161 xmag-1.0.6.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-July/003191.html +sha256 009936cc5a2706084079127b26cf55c713767650a34cb69e5682d60e33ce7461 xmag-1.0.7.tar.xz +sha512 d35ac5d977b9f3bd03fb919bf178f68bdbc6ef2a57915b407d836fce0582f5cb78d0b79043bb6f8d015464ca113deb09469c3b724aed03901a4c3fc4a9982984 xmag-1.0.7.tar.xz # Locally computed sha256 ef8744e617719339c4934579f8558ee4a5aec4396bebd6af02562b63a7c16d27 COPYING diff --git a/package/x11r7/xapp_xmag/xapp_xmag.mk b/package/x11r7/xapp_xmag/xapp_xmag.mk index 113c328e2dc..0e8831d25b3 100644 --- a/package/x11r7/xapp_xmag/xapp_xmag.mk +++ b/package/x11r7/xapp_xmag/xapp_xmag.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XMAG_VERSION = 1.0.6 -XAPP_XMAG_SOURCE = xmag-$(XAPP_XMAG_VERSION).tar.bz2 -XAPP_XMAG_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XMAG_VERSION = 1.0.7 +XAPP_XMAG_SOURCE = xmag-$(XAPP_XMAG_VERSION).tar.xz +XAPP_XMAG_SITE = https://xorg.freedesktop.org/releases/individual/app XAPP_XMAG_LICENSE = MIT XAPP_XMAG_LICENSE_FILES = COPYING XAPP_XMAG_DEPENDENCIES = xlib_libXaw diff --git a/package/x11r7/xapp_xman/xapp_xman.hash b/package/x11r7/xapp_xman/xapp_xman.hash index e4a93d170cf..4436ca31117 100644 --- a/package/x11r7/xapp_xman/xapp_xman.hash +++ b/package/x11r7/xapp_xman/xapp_xman.hash @@ -1,7 +1,7 @@ # From https://lists.x.org/archives/xorg-announce/2019-July/003011.html -md5 629436867b202098967636b17c8d303c xman-1.1.5.tar.bz2 -sha1 ec76dbd010f68974e05dfe8bc4b91731a3b7285b xman-1.1.5.tar.bz2 -sha256 4e3c2c7497e9734a6d3c8e1b6a364612892bb31e9f33076c9fdae7177ab60978 xman-1.1.5.tar.bz2 -sha512 f6b2be424a79f298bf1a81edce4172572195c9efc9454e5b7b7046f344ed08154c77ccaa763ccdf3f1a30b64aa4802783bf813ee637437ccb1fba434fc5d4400 xman-1.1.5.tar.bz2 +md5 629436867b202098967636b17c8d303c xman-1.1.5.tar.bz2 +sha1 ec76dbd010f68974e05dfe8bc4b91731a3b7285b xman-1.1.5.tar.bz2 +sha256 4e3c2c7497e9734a6d3c8e1b6a364612892bb31e9f33076c9fdae7177ab60978 xman-1.1.5.tar.bz2 +sha512 f6b2be424a79f298bf1a81edce4172572195c9efc9454e5b7b7046f344ed08154c77ccaa763ccdf3f1a30b64aa4802783bf813ee637437ccb1fba434fc5d4400 xman-1.1.5.tar.bz2 # Locally computed -sha256 4c3d6d6fc5661c64285931a0871728f3745d962d877477235dc66e4043db3d36 COPYING +sha256 4c3d6d6fc5661c64285931a0871728f3745d962d877477235dc66e4043db3d36 COPYING diff --git a/package/x11r7/xapp_xmessage/xapp_xmessage.hash b/package/x11r7/xapp_xmessage/xapp_xmessage.hash index b668edf6a1f..07952220d06 100644 --- a/package/x11r7/xapp_xmessage/xapp_xmessage.hash +++ b/package/x11r7/xapp_xmessage/xapp_xmessage.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002868.html -md5 e50ffae17eeb3943079620cb78f5ce0b xmessage-1.0.5.tar.bz2 -sha1 d3eca72c7173d0d9547c676a16bcec51ca1213a2 xmessage-1.0.5.tar.bz2 -sha256 373dfb81e7a6f06d3d22485a12fcde6e255d58c6dee1bbaeb00c7d0caa9b2029 xmessage-1.0.5.tar.bz2 -sha512 a8423c3986b1576fa67800c315a605a527bb9a8f594ac269a736ae7b91eed0d4d83deb89148197dc3cd3f0e51894146958ce2979f78e97dcdb99c5326e34dabe xmessage-1.0.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-July/003187.html +sha256 d2eac545f137156b960877e052fcc8e29795ed735c02f7690fd7b439e6846a12 xmessage-1.0.6.tar.xz +sha512 89deb7a81bd047027f99cb92cd16a47f94479c61a6f9fbac4638e6d642037b3e9bbac2313db59ac8c5544175947c693f6a210537c6df2b88dc3de1c67498cba8 xmessage-1.0.6.tar.xz # Locally computed -sha256 dfd5427188bd6d6647ad1a9a0644428403c6239f6aa7f9d1a17629d8cc0a4ecd COPYING +sha256 dfd5427188bd6d6647ad1a9a0644428403c6239f6aa7f9d1a17629d8cc0a4ecd COPYING diff --git a/package/x11r7/xapp_xmessage/xapp_xmessage.mk b/package/x11r7/xapp_xmessage/xapp_xmessage.mk index 9d426974bd6..52a9f32631c 100644 --- a/package/x11r7/xapp_xmessage/xapp_xmessage.mk +++ b/package/x11r7/xapp_xmessage/xapp_xmessage.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XMESSAGE_VERSION = 1.0.5 -XAPP_XMESSAGE_SOURCE = xmessage-$(XAPP_XMESSAGE_VERSION).tar.bz2 -XAPP_XMESSAGE_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XMESSAGE_VERSION = 1.0.6 +XAPP_XMESSAGE_SOURCE = xmessage-$(XAPP_XMESSAGE_VERSION).tar.xz +XAPP_XMESSAGE_SITE = https://xorg.freedesktop.org/releases/individual/app XAPP_XMESSAGE_LICENSE = MIT XAPP_XMESSAGE_LICENSE_FILES = COPYING XAPP_XMESSAGE_DEPENDENCIES = xlib_libXaw diff --git a/package/x11r7/xapp_xmh/xapp_xmh.hash b/package/x11r7/xapp_xmh/xapp_xmh.hash index 1dadc34586c..f0c9fa9567e 100644 --- a/package/x11r7/xapp_xmh/xapp_xmh.hash +++ b/package/x11r7/xapp_xmh/xapp_xmh.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002582.html -sha256 b92f4f912a5fb6346d52cc2b639aea087b347f3b2e4e1a4fc7a165b1345f5689 xmh-1.0.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-August/003208.html +sha256 e82c425a4c4156eee2e344d2e952f3fd816e03973005cd656ec1e9acf6f329db xmh-1.0.4.tar.xz +sha512 03bba7d3e7c2070b03378335aed0188dd0fd0a488f19dc5ad3f26674a9b38e6599377d082328041dd3ab72123ed60acae32cff19d7149517545b80e1339db26a xmh-1.0.4.tar.xz # Locally computed sha256 27d8cbdcde7a0bd062ce49cdf8c672201452a64e3e6823f09b1beffe2c4b8eff COPYING diff --git a/package/x11r7/xapp_xmh/xapp_xmh.mk b/package/x11r7/xapp_xmh/xapp_xmh.mk index c18bbfe5da0..db6102eb75e 100644 --- a/package/x11r7/xapp_xmh/xapp_xmh.mk +++ b/package/x11r7/xapp_xmh/xapp_xmh.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XMH_VERSION = 1.0.3 -XAPP_XMH_SOURCE = xmh-$(XAPP_XMH_VERSION).tar.bz2 -XAPP_XMH_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XMH_VERSION = 1.0.4 +XAPP_XMH_SOURCE = xmh-$(XAPP_XMH_VERSION).tar.xz +XAPP_XMH_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XMH_LICENSE = MIT XAPP_XMH_LICENSE_FILES = COPYING XAPP_XMH_DEPENDENCIES = xlib_libXaw xdata_xbitmaps diff --git a/package/x11r7/xapp_xmodmap/xapp_xmodmap.hash b/package/x11r7/xapp_xmodmap/xapp_xmodmap.hash index 4925ec00a3f..db3d8f33cde 100644 --- a/package/x11r7/xapp_xmodmap/xapp_xmodmap.hash +++ b/package/x11r7/xapp_xmodmap/xapp_xmodmap.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-February/002952.html -md5 51f1d30a525e9903280ffeea2744b1f6 xmodmap-1.0.10.tar.bz2 -sha1 69e041f8a8c501bd1feb68805a0880633a685bc8 xmodmap-1.0.10.tar.bz2 -sha256 473f0941d7439d501bb895ff358832b936ec34c749b9704c37a15e11c318487c xmodmap-1.0.10.tar.bz2 -sha512 324c7dcef843186088f16b3bc47485eb3c9b4331e56ce43b692deb4bb3d4f4f27512480e91a379cceac8383df920dc5e37cd825246b50b6343291cec48134c04 xmodmap-1.0.10.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-July/003176.html +sha256 9a2f8168f7b0bc382828847403902cb6bf175e17658b36189eac87edda877e81 xmodmap-1.0.11.tar.xz +sha512 a78f916f048d2017f079733becc99232c087c360ece61ec6c4fa4b5b130b96a1b10c4ce1b64a15bdcab7ea05de3c7f16035503d5be6f8ce1a7612ce71d558510 xmodmap-1.0.11.tar.xz # Locally computed -sha256 c149563cf2cb0ecfb1148b6eb8f604c62bed43452a0d0fbafb97286a97840f5c COPYING +sha256 c149563cf2cb0ecfb1148b6eb8f604c62bed43452a0d0fbafb97286a97840f5c COPYING diff --git a/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk b/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk index f3a458b7b52..8fcb4716a85 100644 --- a/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk +++ b/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XMODMAP_VERSION = 1.0.10 -XAPP_XMODMAP_SOURCE = xmodmap-$(XAPP_XMODMAP_VERSION).tar.bz2 -XAPP_XMODMAP_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XMODMAP_VERSION = 1.0.11 +XAPP_XMODMAP_SOURCE = xmodmap-$(XAPP_XMODMAP_VERSION).tar.xz +XAPP_XMODMAP_SITE = https://xorg.freedesktop.org/releases/individual/app XAPP_XMODMAP_LICENSE = MIT XAPP_XMODMAP_LICENSE_FILES = COPYING XAPP_XMODMAP_DEPENDENCIES = xlib_libX11 diff --git a/package/x11r7/xapp_xmore/xapp_xmore.hash b/package/x11r7/xapp_xmore/xapp_xmore.hash index cd777831fa8..960a1e5f92e 100644 --- a/package/x11r7/xapp_xmore/xapp_xmore.hash +++ b/package/x11r7/xapp_xmore/xapp_xmore.hash @@ -1,7 +1,7 @@ # From https://lists.x.org/archives/xorg-announce/2019-March/002964.html -md5 8e1279352192e4142740c21db58f9be9 xmore-1.0.3.tar.bz2 -sha1 b57b92afd783d28c4c505e0c95556939f24c3ec9 xmore-1.0.3.tar.bz2 -sha256 644a1e0d5182d7708d413722d0579a587dc56b9a8cb60640df076d302e09251b xmore-1.0.3.tar.bz2 -sha512 e3e44831cd87a54bb585f80ef0d87f69dc35f6c834a73241aad9f6e2b0999b53c51a0a3f915a94ae4d6dc9bdfb9f60b6576f0bdcec441443abd98efa6c51b1d3 xmore-1.0.3.tar.bz2 +md5 8e1279352192e4142740c21db58f9be9 xmore-1.0.3.tar.bz2 +sha1 b57b92afd783d28c4c505e0c95556939f24c3ec9 xmore-1.0.3.tar.bz2 +sha256 644a1e0d5182d7708d413722d0579a587dc56b9a8cb60640df076d302e09251b xmore-1.0.3.tar.bz2 +sha512 e3e44831cd87a54bb585f80ef0d87f69dc35f6c834a73241aad9f6e2b0999b53c51a0a3f915a94ae4d6dc9bdfb9f60b6576f0bdcec441443abd98efa6c51b1d3 xmore-1.0.3.tar.bz2 # Locally computed -sha256 27d8cbdcde7a0bd062ce49cdf8c672201452a64e3e6823f09b1beffe2c4b8eff COPYING +sha256 27d8cbdcde7a0bd062ce49cdf8c672201452a64e3e6823f09b1beffe2c4b8eff COPYING diff --git a/package/x11r7/xapp_xpr/xapp_xpr.hash b/package/x11r7/xapp_xpr/xapp_xpr.hash index 0a1b4f81b98..28ebd77810b 100644 --- a/package/x11r7/xapp_xpr/xapp_xpr.hash +++ b/package/x11r7/xapp_xpr/xapp_xpr.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002869.html -md5 eaac255076ea351fd08d76025788d9f9 xpr-1.0.5.tar.bz2 -sha1 0632c7d8632ac9d23f285811aaea805a2956e155 xpr-1.0.5.tar.bz2 -sha256 b936e0f1f8d63f5ad097a0bbdce2e67c34f5d49b7263f32a832ff62d394d1e1f xpr-1.0.5.tar.bz2 -sha512 d5dfb936ec4ad0067d02654dec8e862fe337ff6a2c2f974b2b3a612a829c2e728a0d51e7aba00ed2a94dc96dc50cc69f2c59f522e0635013f5f4f5bb3f4ab967 xpr-1.0.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-July/003177.html +sha256 a0bbb11475366622632440b1c6f16d19964b4516483232fe5f46c169528557c5 xpr-1.1.0.tar.xz +sha512 53eb896cf1844036a13b1018ffcecbc6a0a56eebe0d7cb6331dbe691207498d2c41f3791655b7fc081acfef2ed9904987f363b710bf0eeff6c8d33f819a951cb xpr-1.1.0.tar.xz # Locally computed -sha256 5e8ff9b5d3fc86b5d0bc5957c9ee0aa1a6d0fb9a6b116aae70762b628a0d5069 COPYING +sha256 5e8ff9b5d3fc86b5d0bc5957c9ee0aa1a6d0fb9a6b116aae70762b628a0d5069 COPYING diff --git a/package/x11r7/xapp_xpr/xapp_xpr.mk b/package/x11r7/xapp_xpr/xapp_xpr.mk index b77c5b48446..4db4cd33099 100644 --- a/package/x11r7/xapp_xpr/xapp_xpr.mk +++ b/package/x11r7/xapp_xpr/xapp_xpr.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XPR_VERSION = 1.0.5 -XAPP_XPR_SOURCE = xpr-$(XAPP_XPR_VERSION).tar.bz2 -XAPP_XPR_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XPR_VERSION = 1.1.0 +XAPP_XPR_SOURCE = xpr-$(XAPP_XPR_VERSION).tar.xz +XAPP_XPR_SITE = https://xorg.freedesktop.org/releases/individual/app XAPP_XPR_LICENSE = MIT XAPP_XPR_LICENSE_FILES = COPYING XAPP_XPR_DEPENDENCIES = xlib_libX11 xlib_libXmu diff --git a/package/x11r7/xapp_xprop/xapp_xprop.hash b/package/x11r7/xapp_xprop/xapp_xprop.hash index 43eed80ba40..9db2fb9125b 100644 --- a/package/x11r7/xapp_xprop/xapp_xprop.hash +++ b/package/x11r7/xapp_xprop/xapp_xprop.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2020-November/003064.html -sha256 9b92ed0316bf2486121d8bac88bd1878f16b43bd335f18009b1f941f1eca93a1 xprop-1.2.5.tar.bz2 -sha512 93cfa621fa76ca6e8e780a252c508380b6dc9db39b67bfca16bb9800f0d39110f5d18189409a8577ef79e98bf5eece17f5e23f2218ca72ae8bb04ee7b429d559 xprop-1.2.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003269.html +sha256 580b8525b12ecc0144aa16c88b0aafa76d2e799b44c8c6c50f9ce92788b5586e xprop-1.2.6.tar.xz +sha512 ab25d4b8bf9de8fb37149060ad4870ffed4d6846ac3b31903a42c36301fcb0d50d3ba15949fdd9079507db97d3f05d4bbd11711d825e5470482cc30772cc3f25 xprop-1.2.6.tar.xz # Locally computed -sha256 f19ff982936cca133b9593a6561c3817512207e0b4c951d0e4eb5956d30d4415 COPYING +sha256 f19ff982936cca133b9593a6561c3817512207e0b4c951d0e4eb5956d30d4415 COPYING diff --git a/package/x11r7/xapp_xprop/xapp_xprop.mk b/package/x11r7/xapp_xprop/xapp_xprop.mk index 75f0d37cdc2..888e9d3a69c 100644 --- a/package/x11r7/xapp_xprop/xapp_xprop.mk +++ b/package/x11r7/xapp_xprop/xapp_xprop.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XPROP_VERSION = 1.2.5 -XAPP_XPROP_SOURCE = xprop-$(XAPP_XPROP_VERSION).tar.bz2 -XAPP_XPROP_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XPROP_VERSION = 1.2.6 +XAPP_XPROP_SOURCE = xprop-$(XAPP_XPROP_VERSION).tar.xz +XAPP_XPROP_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XPROP_LICENSE = MIT XAPP_XPROP_LICENSE_FILES = COPYING XAPP_XPROP_DEPENDENCIES = xlib_libX11 xlib_libXmu diff --git a/package/x11r7/xapp_xrandr/xapp_xrandr.hash b/package/x11r7/xapp_xrandr/xapp_xrandr.hash index 408b070dd9c..a407326bb81 100644 --- a/package/x11r7/xapp_xrandr/xapp_xrandr.hash +++ b/package/x11r7/xapp_xrandr/xapp_xrandr.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-August/003018.html -md5 fe40f7a4fd39dd3a02248d3e0b1972e4 xrandr-1.5.1.tar.xz -sha1 9f72957e0d2a26ece509336ea7e1529cc9ea881e xrandr-1.5.1.tar.xz -sha256 7bc76daf9d72f8aff885efad04ce06b90488a1a169d118dea8a2b661832e8762 xrandr-1.5.1.tar.xz -sha512 3d0d37e974b9dffb996276ee7fd676327fd0956e5f5f572dd142a651a35d3cdfa2f6dd415cf27bf87f306981957aba4cc014c12baebefcabaa5d66b78a114922 xrandr-1.5.1.tar.xz +# From https://lists.x.org/archives/xorg-announce/2022-December/003270.html +sha256 c8bee4790d9058bacc4b6246456c58021db58a87ddda1a9d0139bf5f18f1f240 xrandr-1.5.2.tar.xz +sha512 b536e8f1e04094894aa52ae496725c58691b043860b3327c41d737b07b642a939733321b62f698032b11ba857208a6177600a3ca3295ff1be6ade4341cdc2747 xrandr-1.5.2.tar.xz # Locally computed -sha256 0dd9a3d62c48dd7b87790029e39fb5e11756d33fded3bc1644e11585c87b2038 COPYING +sha256 0dd9a3d62c48dd7b87790029e39fb5e11756d33fded3bc1644e11585c87b2038 COPYING diff --git a/package/x11r7/xapp_xrandr/xapp_xrandr.mk b/package/x11r7/xapp_xrandr/xapp_xrandr.mk index 8586c6feb36..d6b39b51d0f 100644 --- a/package/x11r7/xapp_xrandr/xapp_xrandr.mk +++ b/package/x11r7/xapp_xrandr/xapp_xrandr.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XRANDR_VERSION = 1.5.1 +XAPP_XRANDR_VERSION = 1.5.2 XAPP_XRANDR_SOURCE = xrandr-$(XAPP_XRANDR_VERSION).tar.xz -XAPP_XRANDR_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XRANDR_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XRANDR_LICENSE = MIT XAPP_XRANDR_LICENSE_FILES = COPYING XAPP_XRANDR_DEPENDENCIES = xlib_libXrandr xlib_libX11 diff --git a/package/x11r7/xapp_xrefresh/xapp_xrefresh.hash b/package/x11r7/xapp_xrefresh/xapp_xrefresh.hash index 8eae8ed1bbd..a83bc849407 100644 --- a/package/x11r7/xapp_xrefresh/xapp_xrefresh.hash +++ b/package/x11r7/xapp_xrefresh/xapp_xrefresh.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002872.html -md5 c56fa4adbeed1ee5173f464a4c4a61a6 xrefresh-1.0.6.tar.bz2 -sha1 11eb5b3f905631281d2cedd86a0b666bab0d9bdc xrefresh-1.0.6.tar.bz2 -sha256 287dfb9bb7e8d780d07e672e3252150850869cb550958ed5f8401f0835cd6353 xrefresh-1.0.6.tar.bz2 -sha512 361e97fecfc2706d5eeab69df0d4dd4baa55b6783cfddabf51d8561b7c930d71ce6c217e0512c6564208d69b04f89c69ea8c0bfb2e4f6cc25b062b55e4db3674 xrefresh-1.0.6.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-July/003188.html +sha256 a9f1d635f2f42283d0174e94d09ab69190c227faa5ab542bfe15ed9607771b1e xrefresh-1.0.7.tar.xz +sha512 8fcbb01aa368944ca536f050ab194b21bbd6b2a56265a7ed5807882e5c2f9660105283cdba0ea35b3e4a17a015586aeb82906e081da030332dfc49169a191c31 xrefresh-1.0.7.tar.xz # Locally computed -sha256 4f51c9a91cd277697cbea6604bf4cb240c1ed14cdba82550cb9cac8f1286f663 COPYING +sha256 4f51c9a91cd277697cbea6604bf4cb240c1ed14cdba82550cb9cac8f1286f663 COPYING diff --git a/package/x11r7/xapp_xrefresh/xapp_xrefresh.mk b/package/x11r7/xapp_xrefresh/xapp_xrefresh.mk index 36a4feaad1d..9affbd468e7 100644 --- a/package/x11r7/xapp_xrefresh/xapp_xrefresh.mk +++ b/package/x11r7/xapp_xrefresh/xapp_xrefresh.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XREFRESH_VERSION = 1.0.6 -XAPP_XREFRESH_SOURCE = xrefresh-$(XAPP_XREFRESH_VERSION).tar.bz2 -XAPP_XREFRESH_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XREFRESH_VERSION = 1.0.7 +XAPP_XREFRESH_SOURCE = xrefresh-$(XAPP_XREFRESH_VERSION).tar.xz +XAPP_XREFRESH_SITE = https://xorg.freedesktop.org/releases/individual/app XAPP_XREFRESH_LICENSE = MIT XAPP_XREFRESH_LICENSE_FILES = COPYING XAPP_XREFRESH_DEPENDENCIES = xlib_libX11 diff --git a/package/x11r7/xapp_xset/xapp_xset.hash b/package/x11r7/xapp_xset/xapp_xset.hash index 62f951ba701..dea34a1a136 100644 --- a/package/x11r7/xapp_xset/xapp_xset.hash +++ b/package/x11r7/xapp_xset/xapp_xset.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002873.html -md5 70ea7bc7bacf1a124b1692605883f620 xset-1.2.4.tar.bz2 -sha1 41a857f30ff5bb0dfbda1549bb703984344ea228 xset-1.2.4.tar.bz2 -sha256 e4fd95280df52a88e9b0abc1fee11dcf0f34fc24041b9f45a247e52df941c957 xset-1.2.4.tar.bz2 -sha512 f24714c9a82081a09d3054bbad98553de9366992f22eaf3e2bcadbb58fad1d3dad2547fef6fa9898d8a9df064573c29df9d82a5c801fa92248604c95f65dc83d xset-1.2.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003271.html +sha256 9f692d55635b3862cd63633b1222a87680ec283c7a8e8ed6dd698a3147f75e2f xset-1.2.5.tar.xz +sha512 12b53d7cd6b7ccf6515c03f68151490fce6b2629e99b8d85ac5d760f4ed93394a457213c3947533809fbbb04acd1ed260aeea1256099a10397660eef3088150d xset-1.2.5.tar.xz # Locally computed -sha256 6bfc619b6d37dd0e6ca575edcb3a05194136e04d1d9989b8e14e6f7850587382 COPYING +sha256 6bfc619b6d37dd0e6ca575edcb3a05194136e04d1d9989b8e14e6f7850587382 COPYING diff --git a/package/x11r7/xapp_xset/xapp_xset.mk b/package/x11r7/xapp_xset/xapp_xset.mk index 9ead55a20ff..498e6a123c4 100644 --- a/package/x11r7/xapp_xset/xapp_xset.mk +++ b/package/x11r7/xapp_xset/xapp_xset.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XSET_VERSION = 1.2.4 -XAPP_XSET_SOURCE = xset-$(XAPP_XSET_VERSION).tar.bz2 -XAPP_XSET_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XSET_VERSION = 1.2.5 +XAPP_XSET_SOURCE = xset-$(XAPP_XSET_VERSION).tar.xz +XAPP_XSET_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XSET_LICENSE = MIT XAPP_XSET_LICENSE_FILES = COPYING XAPP_XSET_DEPENDENCIES = xlib_libXmu diff --git a/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.hash b/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.hash index 8167f3d17aa..c7550eae556 100644 --- a/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.hash +++ b/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.hash @@ -1,6 +1,6 @@ # From https://lists.freedesktop.org/archives/xorg-announce/2006-November/000150.html -md5 9e5bcbeda4aaf02bfa095e41d30baee4 xsetpointer-1.0.1.tar.bz2 -sha1 a8b01c6f27625a6f6943f9be17b1e5511f69d710 xsetpointer-1.0.1.tar.bz2 +md5 9e5bcbeda4aaf02bfa095e41d30baee4 xsetpointer-1.0.1.tar.bz2 +sha1 a8b01c6f27625a6f6943f9be17b1e5511f69d710 xsetpointer-1.0.1.tar.bz2 # locally computed -sha256 495d88871eb5081e98bbae55f813f73cb3ce4145d6ca3e8f2826800166c04571 xsetpointer-1.0.1.tar.bz2 -sha256 8f22998f14924220f0f530660811d24e5371a8d7672287c9d22f1eafb7256863 COPYING +sha256 495d88871eb5081e98bbae55f813f73cb3ce4145d6ca3e8f2826800166c04571 xsetpointer-1.0.1.tar.bz2 +sha256 8f22998f14924220f0f530660811d24e5371a8d7672287c9d22f1eafb7256863 COPYING diff --git a/package/x11r7/xapp_xsetroot/xapp_xsetroot.hash b/package/x11r7/xapp_xsetroot/xapp_xsetroot.hash index 7cbabb5ceff..43f7cd66d0e 100644 --- a/package/x11r7/xapp_xsetroot/xapp_xsetroot.hash +++ b/package/x11r7/xapp_xsetroot/xapp_xsetroot.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002874.html -md5 5fe769c8777a6e873ed1305e4ce2c353 xsetroot-1.1.2.tar.bz2 -sha1 42ab81761823b44974feab86477007c49dbace50 xsetroot-1.1.2.tar.bz2 -sha256 10c442ba23591fb5470cea477a0aa5f679371f4f879c8387a1d9d05637ae417c xsetroot-1.1.2.tar.bz2 -sha512 0b9df1b72305e5c24f1e1664578aa4411a5ffcdc5d318458117594e641f01c34700205b0d16c08abf4a8106d36128ccdbe1ea1f1035fce9018d6b52801a8b72b xsetroot-1.1.2.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003240.html +sha256 6081b45a9eb4426e045d259d1e144b32417fb635e5b96aa90647365ac96638d1 xsetroot-1.1.3.tar.xz +sha512 f333d1bfd92bb943044da36331ae2cf68a811c8f3891719d9ebc1749e2dd0c67068f86face0794c3c4ae584c4dd189bad4998dccb38fe1ac37a8921e5713e7c0 xsetroot-1.1.3.tar.xz # Locally computed -sha256 48e9c9572e0dc1c14b93b753542f780e7751dd7f035816374d8a8be0211a4520 COPYING +sha256 48e9c9572e0dc1c14b93b753542f780e7751dd7f035816374d8a8be0211a4520 COPYING diff --git a/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk b/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk index 98ba344cfa8..1ffbb2b6b0a 100644 --- a/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk +++ b/package/x11r7/xapp_xsetroot/xapp_xsetroot.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XSETROOT_VERSION = 1.1.2 -XAPP_XSETROOT_SOURCE = xsetroot-$(XAPP_XSETROOT_VERSION).tar.bz2 -XAPP_XSETROOT_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XSETROOT_VERSION = 1.1.3 +XAPP_XSETROOT_SOURCE = xsetroot-$(XAPP_XSETROOT_VERSION).tar.xz +XAPP_XSETROOT_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XSETROOT_LICENSE = MIT XAPP_XSETROOT_LICENSE_FILES = COPYING XAPP_XSETROOT_DEPENDENCIES = xlib_libX11 xlib_libXmu xlib_libXcursor xdata_xbitmaps diff --git a/package/x11r7/xapp_xsm/xapp_xsm.hash b/package/x11r7/xapp_xsm/xapp_xsm.hash index eda231fe931..9568836bbc7 100644 --- a/package/x11r7/xapp_xsm/xapp_xsm.hash +++ b/package/x11r7/xapp_xsm/xapp_xsm.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002875.html -md5 bd32c14f09d58f46084b6a8f20e6e8f1 xsm-1.0.4.tar.bz2 -sha1 dd41234e276fe8b2d0a853879568f73b6d98812a xsm-1.0.4.tar.bz2 -sha256 9934b6893a4e52cf7435368fc8d425c371b5e32d96e420ead30166eb82d64425 xsm-1.0.4.tar.bz2 -sha512 d4e4da7c309a4eae126d2b58a13684f4dbc06b09f76dde9c89c707375df2843614f3d83bc44f9cd02f239200db3397abd86796dca0dbafc69f60482b0af5a176 xsm-1.0.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-April/003152.html +sha256 9c30fdaa3fc132e4ff201cfc478669056e6e15502e77df88df11fb94e4e6fb2d xsm-1.0.5.tar.xz +sha512 df3777b3aab813ec8aa906f5a03f93b8ca645978970290cf7baf732e175c36c00ae19baeb45ea7404d35838c21e6f8fca28f0da3e2f398d17adac5f2acb7b351 xsm-1.0.5.tar.xz # Locally computed -sha256 27d8cbdcde7a0bd062ce49cdf8c672201452a64e3e6823f09b1beffe2c4b8eff COPYING +sha256 5531d18cfcc944dab39991f63f182cbbce3fe493ba0c7cf08a25c0d01ee84482 COPYING diff --git a/package/x11r7/xapp_xsm/xapp_xsm.mk b/package/x11r7/xapp_xsm/xapp_xsm.mk index 6d752b4d156..1c73f5c65cb 100644 --- a/package/x11r7/xapp_xsm/xapp_xsm.mk +++ b/package/x11r7/xapp_xsm/xapp_xsm.mk @@ -4,8 +4,8 @@ # ################################################################################ -XAPP_XSM_VERSION = 1.0.4 -XAPP_XSM_SOURCE = xsm-$(XAPP_XSM_VERSION).tar.bz2 +XAPP_XSM_VERSION = 1.0.5 +XAPP_XSM_SOURCE = xsm-$(XAPP_XSM_VERSION).tar.xz XAPP_XSM_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XSM_LICENSE = MIT XAPP_XSM_LICENSE_FILES = COPYING diff --git a/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.hash b/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.hash index fc067850b0d..028980bdcad 100644 --- a/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.hash +++ b/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-February/002954.html -md5 da67142c128d18386ff145882e0afc66 xstdcmap-1.0.4.tar.bz2 -sha1 a5eff72ba31625e5b11506add800140019a39636 xstdcmap-1.0.4.tar.bz2 -sha256 06898b3f1eaad0b205ff3c75bdefa3207868b889d4cb37b32b8267b2bbfe6f8b xstdcmap-1.0.4.tar.bz2 -sha512 2adbb0aec1766341e04090efa962241ff6c9e32c612851b7221cec0ee16852107d406a08ec5251070f39df882c13e3c8c9edcd88f278187a9f373e1727643a8f xstdcmap-1.0.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003272.html +sha256 365847e379398499ec9ad9a299cc47a0d6e7feba9546dfd4e5b422204b5ac180 xstdcmap-1.0.5.tar.xz +sha512 3f2047af1d328a34d38ededc13de00298db3300eab1d1dbdff7d2aa4a3cd543a79305bfbd2e6424c5e023cf866a4f7a70aa9a3014444d543268d2f812a322a49 xstdcmap-1.0.5.tar.xz # Locally computed -sha256 f0a362fc1b8e788845b1c0ad7ba9ade58fdfb73da750c3b9780db5d70b947657 COPYING +sha256 f0a362fc1b8e788845b1c0ad7ba9ade58fdfb73da750c3b9780db5d70b947657 COPYING diff --git a/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk b/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk index dd5b0ee3490..60825556e7d 100644 --- a/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk +++ b/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XSTDCMAP_VERSION = 1.0.4 -XAPP_XSTDCMAP_SOURCE = xstdcmap-$(XAPP_XSTDCMAP_VERSION).tar.bz2 -XAPP_XSTDCMAP_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XSTDCMAP_VERSION = 1.0.5 +XAPP_XSTDCMAP_SOURCE = xstdcmap-$(XAPP_XSTDCMAP_VERSION).tar.xz +XAPP_XSTDCMAP_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XSTDCMAP_LICENSE = MIT XAPP_XSTDCMAP_LICENSE_FILES = COPYING XAPP_XSTDCMAP_DEPENDENCIES = xlib_libX11 xlib_libXmu diff --git a/package/x11r7/xapp_xvidtune/xapp_xvidtune.hash b/package/x11r7/xapp_xvidtune/xapp_xvidtune.hash index ecf7d0330bb..0e7e2313835 100644 --- a/package/x11r7/xapp_xvidtune/xapp_xvidtune.hash +++ b/package/x11r7/xapp_xvidtune/xapp_xvidtune.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2013-January/002129.html -sha256 24e5e103933a04bfb2e1d18562619ed74031ab515e7343eb546bacdbcbeecf01 xvidtune-1.0.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-February/003319.html +sha256 0d4eecd54e440cc11f1bdaaa23180fcf890f003444343f533f639086b05b2cc5 xvidtune-1.0.4.tar.xz +sha512 747d5358f4f7d3d7db508c3f034711ce4b9dd278160d35312e9c4d1604623e84a2438d039b536546fd2df7db8c5ea1907e8a6101985fad2932b6dee5a62c7b80 xvidtune-1.0.4.tar.xz # Locally computed sha256 f3da8eaed19e27e4f67e6f076d4ebdb8d649e15a8ad33a415fb65a23de1b6689 COPYING diff --git a/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk b/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk index d7c4d5bf562..cc40d39098e 100644 --- a/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk +++ b/package/x11r7/xapp_xvidtune/xapp_xvidtune.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XVIDTUNE_VERSION = 1.0.3 -XAPP_XVIDTUNE_SOURCE = xvidtune-$(XAPP_XVIDTUNE_VERSION).tar.bz2 -XAPP_XVIDTUNE_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XVIDTUNE_VERSION = 1.0.4 +XAPP_XVIDTUNE_SOURCE = xvidtune-$(XAPP_XVIDTUNE_VERSION).tar.xz +XAPP_XVIDTUNE_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XVIDTUNE_LICENSE = MIT XAPP_XVIDTUNE_LICENSE_FILES = COPYING XAPP_XVIDTUNE_DEPENDENCIES = xlib_libXaw xlib_libXxf86vm diff --git a/package/x11r7/xapp_xvinfo/xapp_xvinfo.hash b/package/x11r7/xapp_xvinfo/xapp_xvinfo.hash index 405fc36ea6e..7dd5820c084 100644 --- a/package/x11r7/xapp_xvinfo/xapp_xvinfo.hash +++ b/package/x11r7/xapp_xvinfo/xapp_xvinfo.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-February/002955.html -md5 b13afec137b9b331814a9824ab03ec80 xvinfo-1.1.4.tar.bz2 -sha1 136a70a72b23c81f4fe8f4c8cb7073316be16b44 xvinfo-1.1.4.tar.bz2 -sha256 0353220d6606077ba42363db65f50410759f9815352f77adc799e2adfa76e73f xvinfo-1.1.4.tar.bz2 -sha512 85e1f936c5c826f0fdde3670bd77d5cde8641c6e8e7849e42142e91b5aa01d7e0e60d2b064eb6fef4f5666321813ca2dc9f9656756ccbe6dcda37b119ee8a63e xvinfo-1.1.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003273.html +sha256 3ede71ecb26d9614ccbc6916720285e95a2c7e0c5e19b8570eaaf72ad7c5c404 xvinfo-1.1.5.tar.xz +sha512 18467161b248c68f6bde15e1c1b4b8cf812daf46777602558aee5fb7cb4d2649218de88fa93842fea4f316d954440f03a37d71fa4fda92eda3c7d80970e19cbb xvinfo-1.1.5.tar.xz # Locally computed -sha256 7725b0484faa1832534814ecb577f5a86acc74f1bcce25f92c55dfc1b693717d COPYING +sha256 7725b0484faa1832534814ecb577f5a86acc74f1bcce25f92c55dfc1b693717d COPYING diff --git a/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk b/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk index 7b3b97f0731..6fa392f0180 100644 --- a/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk +++ b/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XVINFO_VERSION = 1.1.4 -XAPP_XVINFO_SOURCE = xvinfo-$(XAPP_XVINFO_VERSION).tar.bz2 -XAPP_XVINFO_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XVINFO_VERSION = 1.1.5 +XAPP_XVINFO_SOURCE = xvinfo-$(XAPP_XVINFO_VERSION).tar.xz +XAPP_XVINFO_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XVINFO_LICENSE = MIT XAPP_XVINFO_LICENSE_FILES = COPYING XAPP_XVINFO_DEPENDENCIES = xlib_libX11 xlib_libXv diff --git a/package/x11r7/xapp_xwininfo/xapp_xwininfo.hash b/package/x11r7/xapp_xwininfo/xapp_xwininfo.hash index 163d5cc4047..bbf2e37328a 100644 --- a/package/x11r7/xapp_xwininfo/xapp_xwininfo.hash +++ b/package/x11r7/xapp_xwininfo/xapp_xwininfo.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-July/003012.html -md5 26d46f7ef0588d3392da3ad5802be420 xwininfo-1.1.5.tar.bz2 -sha1 9f67b1eb07c5824d437bf577cf6198962af1aeb7 xwininfo-1.1.5.tar.bz2 -sha256 7a405441dfc476666c744f5fcd1bc8a75abf8b5b1d85db7b88b370982365080e xwininfo-1.1.5.tar.bz2 -sha512 a3268bbeeeeafac94e589fdd47554a965910d40df7cc3d9c36c7c24fa4f5dd49615484d5916ccb41efca9cd4cf9d8981a4c60953b921220b3f4f57f9cce0e1a6 xwininfo-1.1.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-April/003379.html +sha256 3518897c17448df9ba99ad6d9bb1ca0f17bc0ed7c0fd61281b34ceed29a9253f xwininfo-1.1.6.tar.xz +sha512 c6df4ed3dcf97772450612f2786ecab8313a43bb78e0b8020cc9ec228b3f466f55090313ad02c8159a73a6892d117322ad85e28d9d76e38bb84c9750712c20bc xwininfo-1.1.6.tar.xz # Locally computed -sha256 443d675237c023a47e4886506b72796afbb2633394812027f91d6e8fa433b2af COPYING +sha256 1be1f0763a5efd08e48089c52728a822bf769b690a2fd82fbab456cfffee822f COPYING diff --git a/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk b/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk index 9652487aae5..196b73c83d2 100644 --- a/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk +++ b/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk @@ -4,8 +4,8 @@ # ################################################################################ -XAPP_XWININFO_VERSION = 1.1.5 -XAPP_XWININFO_SOURCE = xwininfo-$(XAPP_XWININFO_VERSION).tar.bz2 +XAPP_XWININFO_VERSION = 1.1.6 +XAPP_XWININFO_SOURCE = xwininfo-$(XAPP_XWININFO_VERSION).tar.xz XAPP_XWININFO_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XWININFO_LICENSE = MIT XAPP_XWININFO_LICENSE_FILES = COPYING diff --git a/package/x11r7/xapp_xwud/xapp_xwud.hash b/package/x11r7/xapp_xwud/xapp_xwud.hash index e42057819d9..c47d6d881e9 100644 --- a/package/x11r7/xapp_xwud/xapp_xwud.hash +++ b/package/x11r7/xapp_xwud/xapp_xwud.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002878.html -md5 79972093bb0766fcd0223b2bd6d11932 xwud-1.0.5.tar.bz2 -sha1 a85d84a1b81f8e667ea6ac126d447590c93eb079 xwud-1.0.5.tar.bz2 -sha256 99997051f8a892313f22edf41dab45864e86e7062ee9012d5dbb6a40fc6b10a9 xwud-1.0.5.tar.bz2 -sha512 27a0ce7481978ae6cd94b0d94374af72185e270d68f2496620e148bb00945427c4827138d9efc48745e6382e3da3390ed0cdff7dbd02dcf9706e8ecccae97184 xwud-1.0.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-July/003179.html +sha256 64048cd15eba3cd9a3d2e3280650391259ebf6b529f2101d1a20f441038c1afe xwud-1.0.6.tar.xz +sha512 a7b964d9ef13e4726b2ef84dcc1040cdf510c8031c3e6e1dc1c711e65d9e56f1fc5921a7af3dbbd898b861c79e9da6242da23c2e73816e39152ae719052293e9 xwud-1.0.6.tar.xz # Locally computed -sha256 be3db9aa060c462490a8c1ed44a4d059b32bba359f4688b1ecf3f794d363539e COPYING +sha256 be3db9aa060c462490a8c1ed44a4d059b32bba359f4688b1ecf3f794d363539e COPYING diff --git a/package/x11r7/xapp_xwud/xapp_xwud.mk b/package/x11r7/xapp_xwud/xapp_xwud.mk index 2c2e1ad497e..0ad001d970e 100644 --- a/package/x11r7/xapp_xwud/xapp_xwud.mk +++ b/package/x11r7/xapp_xwud/xapp_xwud.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XWUD_VERSION = 1.0.5 -XAPP_XWUD_SOURCE = xwud-$(XAPP_XWUD_VERSION).tar.bz2 -XAPP_XWUD_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XWUD_VERSION = 1.0.6 +XAPP_XWUD_SOURCE = xwud-$(XAPP_XWUD_VERSION).tar.xz +XAPP_XWUD_SITE = https://xorg.freedesktop.org/releases/individual/app XAPP_XWUD_LICENSE = MIT XAPP_XWUD_LICENSE_FILES = COPYING XAPP_XWUD_DEPENDENCIES = xlib_libX11 diff --git a/package/x11r7/xcb-proto/xcb-proto.hash b/package/x11r7/xcb-proto/xcb-proto.hash index e6bc2379bfa..1a49710d7a1 100644 --- a/package/x11r7/xcb-proto/xcb-proto.hash +++ b/package/x11r7/xcb-proto/xcb-proto.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2020-October/003061.html -sha256 f04add9a972ac334ea11d9d7eb4fc7f8883835da3e4859c9afa971efdf57fcc3 xcb-proto-1.14.1.tar.xz -sha512 140fbf48483bacc7f6b70fdcf76f9e4ff0e87df9cb3a071cea47d8fe4574407cdefcfbd674099014d297e5fc010748e71d8609fca4cc32e8b25c634f928b727d xcb-proto-1.14.1.tar.xz +# From https://lists.x.org/archives/xorg-announce/2022-June/003170.html +sha256 7072beb1f680a2fe3f9e535b797c146d22528990c72f63ddb49d2f350a3653ed xcb-proto-1.15.2.tar.xz +sha512 9d0b2f0a4dbbf2d64e32ff4658d1663e13d7e5f1bffc1e8d45be7b9dd5bab46e29fc1c2f6e66a7a569e374ba6756faf3c39b0b5e5560df6d7f8b68beec97659d xcb-proto-1.15.2.tar.xz # Locally computed sha256 c5ffbfeaa501071ceeb97b7de2c0d703fdaa35de01c0fb6cbac1c28453a3e9fd COPYING diff --git a/package/x11r7/xcb-proto/xcb-proto.mk b/package/x11r7/xcb-proto/xcb-proto.mk index 64190c817fb..324b29427dd 100644 --- a/package/x11r7/xcb-proto/xcb-proto.mk +++ b/package/x11r7/xcb-proto/xcb-proto.mk @@ -4,7 +4,7 @@ # ################################################################################ -XCB_PROTO_VERSION = 1.14.1 +XCB_PROTO_VERSION = 1.15.2 XCB_PROTO_SOURCE = xcb-proto-$(XCB_PROTO_VERSION).tar.xz XCB_PROTO_SITE = https://xorg.freedesktop.org/archive/individual/proto XCB_PROTO_LICENSE = MIT diff --git a/package/x11r7/xcb-util-cursor/xcb-util-cursor.hash b/package/x11r7/xcb-util-cursor/xcb-util-cursor.hash index 1964624dc54..ca316d3ce87 100644 --- a/package/x11r7/xcb-util-cursor/xcb-util-cursor.hash +++ b/package/x11r7/xcb-util-cursor/xcb-util-cursor.hash @@ -1,4 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2016-May/002691.html -sha1 26562eb6d4151307f7b6a53453d360ecfc0563ac xcb-util-cursor-0.1.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003230.html +sha256 28dcfe90bcab7b3561abe0dd58eb6832aa9cc77cfe42fcdfa4ebe20d605231fb xcb-util-cursor-0.1.4.tar.xz +sha512 d27dd59a4d7ded9994dca77774421dd9533e3ee823b880af35d3219bd7340c89fbc61d1d0fa10e2991de2cac9e6395e09497769d7b8728eedc691e76649107b1 xcb-util-cursor-0.1.4.tar.xz # Locally computed sha256 0dde91ae1d443105dc9e13cbaed6674c36683b7095836ad9ddfce26be270aad5 COPYING diff --git a/package/x11r7/xcb-util-cursor/xcb-util-cursor.mk b/package/x11r7/xcb-util-cursor/xcb-util-cursor.mk index 07b37c5e479..0fb131693b3 100644 --- a/package/x11r7/xcb-util-cursor/xcb-util-cursor.mk +++ b/package/x11r7/xcb-util-cursor/xcb-util-cursor.mk @@ -4,9 +4,9 @@ # ################################################################################ -XCB_UTIL_CURSOR_VERSION = 0.1.3 -XCB_UTIL_CURSOR_SITE = http://xcb.freedesktop.org/dist -XCB_UTIL_CURSOR_SOURCE = xcb-util-cursor-$(XCB_UTIL_CURSOR_VERSION).tar.bz2 +XCB_UTIL_CURSOR_VERSION = 0.1.4 +XCB_UTIL_CURSOR_SITE = https://xorg.freedesktop.org/archive/individual/lib +XCB_UTIL_CURSOR_SOURCE = xcb-util-cursor-$(XCB_UTIL_CURSOR_VERSION).tar.xz XCB_UTIL_CURSOR_LICENSE = MIT XCB_UTIL_CURSOR_LICENSE_FILES = COPYING XCB_UTIL_CURSOR_INSTALL_STAGING = YES diff --git a/package/x11r7/xcb-util-image/xcb-util-image.hash b/package/x11r7/xcb-util-image/xcb-util-image.hash index a9a2eaab502..e200853e47e 100644 --- a/package/x11r7/xcb-util-image/xcb-util-image.hash +++ b/package/x11r7/xcb-util-image/xcb-util-image.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2014-October/002489.html -sha256 2db96a37d78831d643538dd1b595d7d712e04bdccf8896a5e18ce0f398ea2ffc xcb-util-image-0.4.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003231.html +sha256 ccad8ee5dadb1271fd4727ad14d9bd77a64e505608766c4e98267d9aede40d3d xcb-util-image-0.4.1.tar.xz +sha512 9b47ba38b91196d76541b6ccabeaf291d3b91036f15422909cd6a79b3fd1a9786d5b1728e411bc41cfdf3d60a253485f4ef7c65ffa6ae646fa93439ec782746e xcb-util-image-0.4.1.tar.xz # License file, locally calculated -sha256 19672c6153d8c4870abe734fa4dd2197481a311f4788d02ad729be07e116b26b COPYING +sha256 19672c6153d8c4870abe734fa4dd2197481a311f4788d02ad729be07e116b26b COPYING diff --git a/package/x11r7/xcb-util-image/xcb-util-image.mk b/package/x11r7/xcb-util-image/xcb-util-image.mk index 8ddb0be86dd..446d545ef25 100644 --- a/package/x11r7/xcb-util-image/xcb-util-image.mk +++ b/package/x11r7/xcb-util-image/xcb-util-image.mk @@ -4,9 +4,9 @@ # ################################################################################ -XCB_UTIL_IMAGE_VERSION = 0.4.0 -XCB_UTIL_IMAGE_SITE = http://xcb.freedesktop.org/dist -XCB_UTIL_IMAGE_SOURCE = xcb-util-image-$(XCB_UTIL_IMAGE_VERSION).tar.bz2 +XCB_UTIL_IMAGE_VERSION = 0.4.1 +XCB_UTIL_IMAGE_SITE = https://xorg.freedesktop.org/archive/individual/lib +XCB_UTIL_IMAGE_SOURCE = xcb-util-image-$(XCB_UTIL_IMAGE_VERSION).tar.xz XCB_UTIL_IMAGE_INSTALL_STAGING = YES XCB_UTIL_IMAGE_LICENSE = MIT XCB_UTIL_IMAGE_LICENSE_FILES = COPYING diff --git a/package/x11r7/xcb-util-keysyms/xcb-util-keysyms.hash b/package/x11r7/xcb-util-keysyms/xcb-util-keysyms.hash index a25a263d22b..20a341ca226 100644 --- a/package/x11r7/xcb-util-keysyms/xcb-util-keysyms.hash +++ b/package/x11r7/xcb-util-keysyms/xcb-util-keysyms.hash @@ -1,2 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2014-October/002485.html -sha256 0ef8490ff1dede52b7de533158547f8b454b241aa3e4dcca369507f66f216dd9 xcb-util-keysyms-0.4.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003233.html +sha256 7c260a5294412aed429df1da2f8afd3bd07b7cba3fec772fba15a613a6d5c638 xcb-util-keysyms-0.4.1.tar.xz +sha512 dd53a36b52647f22bf0da8cded4b2974a51899eaac799797017ed8534f14bc2d2d339a14fa5ef387ae4528b7d9a5d31920bb0c71b09ca34f58e5081e768e2bbf xcb-util-keysyms-0.4.1.tar.xz +# Locally computed +sha256 d499c1bf2c2a5f0a0498e5204d998388e308dcf2273dfbe2250a5b9a73f66537 COPYING diff --git a/package/x11r7/xcb-util-keysyms/xcb-util-keysyms.mk b/package/x11r7/xcb-util-keysyms/xcb-util-keysyms.mk index 9036b06fe88..364dc5b6dad 100644 --- a/package/x11r7/xcb-util-keysyms/xcb-util-keysyms.mk +++ b/package/x11r7/xcb-util-keysyms/xcb-util-keysyms.mk @@ -4,13 +4,11 @@ # ################################################################################ -XCB_UTIL_KEYSYMS_VERSION = 0.4.0 -XCB_UTIL_KEYSYMS_SOURCE = xcb-util-keysyms-$(XCB_UTIL_KEYSYMS_VERSION).tar.bz2 -XCB_UTIL_KEYSYMS_SITE = http://xcb.freedesktop.org/dist - -# unfortunately, no license file +XCB_UTIL_KEYSYMS_VERSION = 0.4.1 +XCB_UTIL_KEYSYMS_SOURCE = xcb-util-keysyms-$(XCB_UTIL_KEYSYMS_VERSION).tar.xz +XCB_UTIL_KEYSYMS_SITE = https://xorg.freedesktop.org/archive/individual/lib XCB_UTIL_KEYSYMS_LICENSE = MIT - +XCB_UTIL_KEYSYMS_LICENSE_FILES = COPYING XCB_UTIL_KEYSYMS_INSTALL_STAGING = YES XCB_UTIL_KEYSYMS_DEPENDENCIES = host-pkgconf libxcb diff --git a/package/x11r7/xcb-util-renderutil/xcb-util-renderutil.hash b/package/x11r7/xcb-util-renderutil/xcb-util-renderutil.hash index 19ed9d46409..cb3ed55ceaf 100644 --- a/package/x11r7/xcb-util-renderutil/xcb-util-renderutil.hash +++ b/package/x11r7/xcb-util-renderutil/xcb-util-renderutil.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2014-June/002446.html -sha256 c6e97e48fb1286d6394dddb1c1732f00227c70bd1bedb7d1acabefdd340bea5b xcb-util-renderutil-0.3.9.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003234.html +sha256 3e15d4f0e22d8ddbfbb9f5d77db43eacd7a304029bf25a6166cc63caa96d04ba xcb-util-renderutil-0.3.10.tar.xz +sha512 9cfa9201be2df7c0b832e1e1fe506e7c7a1e0f2b1b1d4a4b58620eadc241190a36478fa3ea27c32047fa79bf199f17dcd0b106853dbf5eda8cd584f3fc2b0c15 xcb-util-renderutil-0.3.10.tar.xz # Locally computed sha256 271169dd66674e9c396697af0b4822d1c59ccd2342b7740864d667a02963068b COPYING diff --git a/package/x11r7/xcb-util-renderutil/xcb-util-renderutil.mk b/package/x11r7/xcb-util-renderutil/xcb-util-renderutil.mk index 9e6683bf3af..d15d19f7e2b 100644 --- a/package/x11r7/xcb-util-renderutil/xcb-util-renderutil.mk +++ b/package/x11r7/xcb-util-renderutil/xcb-util-renderutil.mk @@ -4,9 +4,9 @@ # ################################################################################ -XCB_UTIL_RENDERUTIL_VERSION = 0.3.9 -XCB_UTIL_RENDERUTIL_SITE = http://xcb.freedesktop.org/dist -XCB_UTIL_RENDERUTIL_SOURCE = xcb-util-renderutil-$(XCB_UTIL_RENDERUTIL_VERSION).tar.bz2 +XCB_UTIL_RENDERUTIL_VERSION = 0.3.10 +XCB_UTIL_RENDERUTIL_SITE = https://xorg.freedesktop.org/archive/individual/lib +XCB_UTIL_RENDERUTIL_SOURCE = xcb-util-renderutil-$(XCB_UTIL_RENDERUTIL_VERSION).tar.xz XCB_UTIL_RENDERUTIL_LICENSE = MIT XCB_UTIL_RENDERUTIL_LICENSE_FILES = COPYING XCB_UTIL_RENDERUTIL_INSTALL_STAGING = YES diff --git a/package/x11r7/xcb-util-wm/xcb-util-wm.hash b/package/x11r7/xcb-util-wm/xcb-util-wm.hash index e31228fce0c..7383f015f22 100644 --- a/package/x11r7/xcb-util-wm/xcb-util-wm.hash +++ b/package/x11r7/xcb-util-wm/xcb-util-wm.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2014-February/002401.html -sha256 28bf8179640eaa89276d2b0f1ce4285103d136be6c98262b6151aaee1d3c2a3f xcb-util-wm-0.4.1.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003235.html +sha256 62c34e21d06264687faea7edbf63632c9f04d55e72114aa4a57bb95e4f888a0b xcb-util-wm-0.4.2.tar.xz +sha512 eab6588e6a47d28a3b25ecd13b5018529419db6b49c74458c093699b60a194933be1e1f6f7799abf03344f7ebc7af88586ff2935938d53644bdd5c763a7fa9b0 xcb-util-wm-0.4.2.tar.xz # License file, locally calculated -sha256 12ab3559977a4b22ae3030b90c64a386e6ec51ab0e4eab1ff530f81a2639400a COPYING +sha256 12ab3559977a4b22ae3030b90c64a386e6ec51ab0e4eab1ff530f81a2639400a COPYING diff --git a/package/x11r7/xcb-util-wm/xcb-util-wm.mk b/package/x11r7/xcb-util-wm/xcb-util-wm.mk index 37df3fd92d8..0c4f6e86fa3 100644 --- a/package/x11r7/xcb-util-wm/xcb-util-wm.mk +++ b/package/x11r7/xcb-util-wm/xcb-util-wm.mk @@ -4,9 +4,9 @@ # ################################################################################ -XCB_UTIL_WM_VERSION = 0.4.1 -XCB_UTIL_WM_SITE = http://xcb.freedesktop.org/dist -XCB_UTIL_WM_SOURCE = xcb-util-wm-$(XCB_UTIL_WM_VERSION).tar.bz2 +XCB_UTIL_WM_VERSION = 0.4.2 +XCB_UTIL_WM_SITE = https://xorg.freedesktop.org/archive/individual/lib +XCB_UTIL_WM_SOURCE = xcb-util-wm-$(XCB_UTIL_WM_VERSION).tar.xz XCB_UTIL_WM_INSTALL_STAGING = YES XCB_UTIL_WM_LICENSE = MIT XCB_UTIL_WM_LICENSE_FILES = COPYING diff --git a/package/x11r7/xcb-util/xcb-util.hash b/package/x11r7/xcb-util/xcb-util.hash index c088a62bab0..b9d66877525 100644 --- a/package/x11r7/xcb-util/xcb-util.hash +++ b/package/x11r7/xcb-util/xcb-util.hash @@ -1,3 +1,5 @@ +# From https://lists.x.org/archives/xorg-announce/2022-December/003306.html +sha256 5abe3bbbd8e54f0fa3ec945291b7e8fa8cfd3cccc43718f8758430f94126e512 xcb-util-0.4.1.tar.xz +sha512 da67f2f017d2a1788dcf35f28d6956e171303a622a1dd085cd3d69fdb2ed77965d83c557cc926ebf9b32e905eb2cbb5921987250192d78a2f5edc4d437ed7d2b xcb-util-0.4.1.tar.xz # locally computed -sha256 46e49469cb3b594af1d33176cd7565def2be3fa8be4371d62271fabb5eae50e9 xcb-util-0.4.0.tar.bz2 sha256 325b64f0b0284e08bbb7a78ae3e55c1edc2a7cd77f603225ae4b8ffc35423e37 COPYING diff --git a/package/x11r7/xcb-util/xcb-util.mk b/package/x11r7/xcb-util/xcb-util.mk index bb73530f944..793c3dc7f25 100644 --- a/package/x11r7/xcb-util/xcb-util.mk +++ b/package/x11r7/xcb-util/xcb-util.mk @@ -4,9 +4,9 @@ # ################################################################################ -XCB_UTIL_VERSION = 0.4.0 -XCB_UTIL_SOURCE = xcb-util-$(XCB_UTIL_VERSION).tar.bz2 -XCB_UTIL_SITE = http://xcb.freedesktop.org/dist +XCB_UTIL_VERSION = 0.4.1 +XCB_UTIL_SOURCE = xcb-util-$(XCB_UTIL_VERSION).tar.xz +XCB_UTIL_SITE = https://xorg.freedesktop.org/archive/individual/lib XCB_UTIL_LICENSE = MIT XCB_UTIL_LICENSE_FILES = COPYING XCB_UTIL_INSTALL_STAGING = YES diff --git a/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.hash b/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.hash index 05d37288ad9..c9a3956686e 100644 --- a/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.hash +++ b/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002881.html -md5 cedeef095918aca86da79a2934e03daf xbitmaps-1.1.2.tar.bz2 -sha1 1cb0e485a66280e9a64b48426140b8a0de9cf169 xbitmaps-1.1.2.tar.bz2 -sha256 b9f0c71563125937776c8f1f25174ae9685314cbd130fb4c2efce811981e07ee xbitmaps-1.1.2.tar.bz2 -sha512 eed5e2fce9fc6c532984e6ed1262e440591e311ca6c61a7fe7a5c877df84bfc2d7aff388fb9c894fc098785b8e5352f0bd7c918252247a040cf123874847450d xbitmaps-1.1.2.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-February/003333.html +sha256 ad6cad54887832a17d86c2ccfc5e52a1dfab090f8307b152c78b0e1529cd0f7a xbitmaps-1.1.3.tar.xz +sha512 b9a7340385fcce2dcd0204f14a462685b14b72ff58f3ec53cd76695bef2b02af902bdac809622dcb27fd4075d5ba13587b5d059530aff502cd5288d161352814 xbitmaps-1.1.3.tar.xz # Locally computed -sha256 e121ec6605558ee021674d33b1ab9306e16b9ea7d30453df42286556247be17a COPYING +sha256 e121ec6605558ee021674d33b1ab9306e16b9ea7d30453df42286556247be17a COPYING diff --git a/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk b/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk index e9545abaec6..c8b64458291 100644 --- a/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk +++ b/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDATA_XBITMAPS_VERSION = 1.1.2 -XDATA_XBITMAPS_SOURCE = xbitmaps-$(XDATA_XBITMAPS_VERSION).tar.bz2 -XDATA_XBITMAPS_SITE = http://xorg.freedesktop.org/releases/individual/data +XDATA_XBITMAPS_VERSION = 1.1.3 +XDATA_XBITMAPS_SOURCE = xbitmaps-$(XDATA_XBITMAPS_VERSION).tar.xz +XDATA_XBITMAPS_SITE = https://xorg.freedesktop.org/archive/individual/data XDATA_XBITMAPS_LICENSE = MIT XDATA_XBITMAPS_LICENSE_FILES = COPYING diff --git a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.hash b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.hash index dd8d2ad26d4..1bb3831c91e 100644 --- a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.hash +++ b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-February/002945.html -md5 aea14eabf40528ec4db18f1cfcf5c458 xcursor-themes-1.0.6.tar.bz2 -sha1 b56fd5bf5b1ada0532a85c27db0d296e392168c5 xcursor-themes-1.0.6.tar.bz2 -sha256 ee1ec574741293abcf66ac14ce7e74add7ac6be7deb8b38179ef010d22354999 xcursor-themes-1.0.6.tar.bz2 -sha512 2ad3586a5571a5ddc0001187362b54b839644916164834213af98e58698044aec4392dd6e1e42f1794fda85c8fedf259b09214a9636bd0e71a1629c710f198d3 xcursor-themes-1.0.6.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-February/003332.html +sha256 95bae8f48823d894a05bf42dfbf453674ab7dbdeb11e2bc079e8525ad47378c8 xcursor-themes-1.0.7.tar.xz +sha512 910925dd17c576028ae0d9dfe5683888648b941806b53cd9ff74ed18ff2de537664b07ab4c647a55290aeba37f6051f322b29e8ecd54f348e32abe2ccea1c902 xcursor-themes-1.0.7.tar.xz # Locally computed -sha256 e437aed89c3440a9fe7e19968a3f2eeb97041ef6c9616837a3fd42d0874fc0e6 COPYING +sha256 e437aed89c3440a9fe7e19968a3f2eeb97041ef6c9616837a3fd42d0874fc0e6 COPYING diff --git a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk index c3c5f388e90..e5bf1e502f4 100644 --- a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk +++ b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDATA_XCURSOR_THEMES_VERSION = 1.0.6 -XDATA_XCURSOR_THEMES_SOURCE = xcursor-themes-$(XDATA_XCURSOR_THEMES_VERSION).tar.bz2 -XDATA_XCURSOR_THEMES_SITE = http://xorg.freedesktop.org/releases/individual/data +XDATA_XCURSOR_THEMES_VERSION = 1.0.7 +XDATA_XCURSOR_THEMES_SOURCE = xcursor-themes-$(XDATA_XCURSOR_THEMES_VERSION).tar.xz +XDATA_XCURSOR_THEMES_SITE = https://xorg.freedesktop.org/archive/individual/data XDATA_XCURSOR_THEMES_LICENSE = MIT XDATA_XCURSOR_THEMES_LICENSE_FILES = COPYING diff --git a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.hash b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.hash index eb4cb6599c3..c80eaeb9fa2 100644 --- a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.hash +++ b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.hash @@ -1,7 +1,7 @@ # From https://lists.x.org/archives/xorg-announce/2018-May/002898.html -md5 e8bd1edc6751f92e425cae7eba3c61eb xf86-input-evdev-2.10.6.tar.bz2 -sha1 660de292d5a40e2b8f385965c6a4e149c981ba59 xf86-input-evdev-2.10.6.tar.bz2 -sha256 8726073e81861bc7b2321e76272cbdbd33c7e1a121535a9827977265b9033ec0 xf86-input-evdev-2.10.6.tar.bz2 -sha512 560b0a6491d50a46913a5890a35c0367e59f550670993493bd9712d712a9747ddaa6fe5086daabf2fcafa24b0159383787eb273da4a2a60c089bfc0a77ad2ad1 xf86-input-evdev-2.10.6.tar.bz2 +md5 e8bd1edc6751f92e425cae7eba3c61eb xf86-input-evdev-2.10.6.tar.bz2 +sha1 660de292d5a40e2b8f385965c6a4e149c981ba59 xf86-input-evdev-2.10.6.tar.bz2 +sha256 8726073e81861bc7b2321e76272cbdbd33c7e1a121535a9827977265b9033ec0 xf86-input-evdev-2.10.6.tar.bz2 +sha512 560b0a6491d50a46913a5890a35c0367e59f550670993493bd9712d712a9747ddaa6fe5086daabf2fcafa24b0159383787eb273da4a2a60c089bfc0a77ad2ad1 xf86-input-evdev-2.10.6.tar.bz2 # Locally computed -sha256 f6b9b4732932434cad03b29cb3151d20edcf7d6e5681f40ee3c47f03dbd92dc9 COPYING +sha256 f6b9b4732932434cad03b29cb3151d20edcf7d6e5681f40ee3c47f03dbd92dc9 COPYING diff --git a/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.hash b/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.hash index d2384d6c150..0d7911bf96d 100644 --- a/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.hash +++ b/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.hash @@ -1,4 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2016-November/002742.html -sha256 9e7669ecf0f23b8e5dc39d5397cf28296f692aa4c0e4255f5e02816612c18eab xf86-input-joystick-1.6.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003290.html +sha256 905ec485fabc699b1cb21518cbd152246776fa83570e09c5822ca0973733ccd2 xf86-input-joystick-1.6.4.tar.xz +sha512 4e9127f125543060f9e6bc4b0aa384bc98a92acc52bfb240c9a114c565e0b24d2e9dcbc0e866845abc8aeb1e1a6c78cd5e3f0c0f22007aa93460b6a1910d67ef xf86-input-joystick-1.6.4.tar.xz # Locally calculated sha256 460cf612147407317a3911ce03a215707d8d6d5f3e604a53fefa6e54974ad07e COPYING diff --git a/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk b/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk index 0ec4be5e53f..0573f439496 100644 --- a/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk +++ b/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDRIVER_XF86_INPUT_JOYSTICK_VERSION = 1.6.3 -XDRIVER_XF86_INPUT_JOYSTICK_SOURCE = xf86-input-joystick-$(XDRIVER_XF86_INPUT_JOYSTICK_VERSION).tar.bz2 -XDRIVER_XF86_INPUT_JOYSTICK_SITE = http://xorg.freedesktop.org/releases/individual/driver +XDRIVER_XF86_INPUT_JOYSTICK_VERSION = 1.6.4 +XDRIVER_XF86_INPUT_JOYSTICK_SOURCE = xf86-input-joystick-$(XDRIVER_XF86_INPUT_JOYSTICK_VERSION).tar.xz +XDRIVER_XF86_INPUT_JOYSTICK_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_INPUT_JOYSTICK_LICENSE = MIT XDRIVER_XF86_INPUT_JOYSTICK_LICENSE_FILES = COPYING XDRIVER_XF86_INPUT_JOYSTICK_DEPENDENCIES = xserver_xorg-server xorgproto diff --git a/package/x11r7/xdriver_xf86-input-keyboard/Config.in b/package/x11r7/xdriver_xf86-input-keyboard/Config.in deleted file mode 100644 index ee23033b978..00000000000 --- a/package/x11r7/xdriver_xf86-input-keyboard/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XDRIVER_XF86_INPUT_KEYBOARD - bool "xf86-input-keyboard" - select BR2_PACKAGE_XORGPROTO - help - Keyboard input driver diff --git a/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.hash b/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.hash deleted file mode 100644 index 66e2c3ed95e..00000000000 --- a/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From https://lists.x.org/archives/xorg-announce/2016-November/002739.html -sha256 f7c900f21752683402992b288d5a2826de7a6c0c0abac2aadd7e8a409e170388 xf86-input-keyboard-1.9.0.tar.bz2 -# Locally calculated -sha256 b91b17c53724c79685e3025a38028b7d48c966fdd239e0efe2d98874d3c139a0 COPYING diff --git a/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk b/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk deleted file mode 100644 index fb1e2896434..00000000000 --- a/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# xdriver_xf86-input-keyboard -# -################################################################################ - -XDRIVER_XF86_INPUT_KEYBOARD_VERSION = 1.9.0 -XDRIVER_XF86_INPUT_KEYBOARD_SOURCE = xf86-input-keyboard-$(XDRIVER_XF86_INPUT_KEYBOARD_VERSION).tar.bz2 -XDRIVER_XF86_INPUT_KEYBOARD_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_INPUT_KEYBOARD_LICENSE = MIT -XDRIVER_XF86_INPUT_KEYBOARD_LICENSE_FILES = COPYING -XDRIVER_XF86_INPUT_KEYBOARD_DEPENDENCIES = xserver_xorg-server xorgproto -XDRIVER_XF86_INPUT_KEYBOARD_CONF_OPTS = --disable-selective-werror - -$(eval $(autotools-package)) diff --git a/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash b/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash index a2f295d6b5d..480886b295d 100644 --- a/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash +++ b/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash @@ -1,6 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2021-September/003110.html -sha256 f80da3c514fe1cbf57fa1b1bd6ff97f6b0a1f87466ad89247bac59cd0a5869f6 xf86-input-libinput-1.2.0.tar.bz2 -sha512 ebff9490d33fd7495df2e03203060a76b3274f0e638bc92f3d95257fac57cdb9dac308e90e54006fe9522b6de3b1f1c38fd5f0b0b75b7051e5422290f43de52d xf86-input-libinput-1.2.0.tar.bz2 - +# From https://lists.x.org/archives/xorg-announce/2022-January/003129.html +sha256 8151db5b9ddb317c0ce92dcb62da9a8db5079e5b8a95b60abc854da21e7e971b xf86-input-libinput-1.2.1.tar.xz +sha512 3decf694861d1aa3c02d090e66c5ed5513818cb18e9863f1790e0c8122a972230fb903705062b8291e1709db9098623f1205c63ccfb68e552e104813414589c7 xf86-input-libinput-1.2.1.tar.xz # Locally computed sha256 4114220b281561e80f3422f0e7ae8d3e1fc85131ffc2e3b6265119e66f1adb27 COPYING diff --git a/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk b/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk index 21d962aa522..d1f93ffb5b9 100644 --- a/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk +++ b/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDRIVER_XF86_INPUT_LIBINPUT_VERSION = 1.2.0 -XDRIVER_XF86_INPUT_LIBINPUT_SOURCE = xf86-input-libinput-$(XDRIVER_XF86_INPUT_LIBINPUT_VERSION).tar.bz2 -XDRIVER_XF86_INPUT_LIBINPUT_SITE = https://xorg.freedesktop.org/releases/individual/driver +XDRIVER_XF86_INPUT_LIBINPUT_VERSION = 1.2.1 +XDRIVER_XF86_INPUT_LIBINPUT_SOURCE = xf86-input-libinput-$(XDRIVER_XF86_INPUT_LIBINPUT_VERSION).tar.xz +XDRIVER_XF86_INPUT_LIBINPUT_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_INPUT_LIBINPUT_LICENSE = MIT XDRIVER_XF86_INPUT_LIBINPUT_LICENSE_FILES = COPYING XDRIVER_XF86_INPUT_LIBINPUT_DEPENDENCIES = libinput xserver_xorg-server xorgproto diff --git a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.hash b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.hash index 551ff9d844b..d654c362a94 100644 --- a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.hash +++ b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-June/002903.html -md5 a2104693bbcfe1413397f7905eecd3dc xf86-input-mouse-1.9.3.tar.bz2 -sha1 b3982998808ba43117fc066c4ecc94ce67c5818e xf86-input-mouse-1.9.3.tar.bz2 -sha256 93ecb350604d05be98b7d4e5db3b8155a44890069a7d8d6b800c0bea79c85cc5 xf86-input-mouse-1.9.3.tar.bz2 -sha512 d99f5b4b1ef1aa4cbf1a92549e412f54f121bc804e4d6643248ad7ea18081b38b958bd289dc8476ebc0f6ef5f7424c2f2a8abcfaa30cae5378829549af6b148f xf86-input-mouse-1.9.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-May/003392.html +sha256 4fde8ae9b44352e2a208584c36528ee3ed13cf5fe4417208a9785daccefd9968 xf86-input-mouse-1.9.5.tar.xz +sha512 ed9bd9cb9a05dac0ff1bfb4e4704cb2e94117afb400aa9e0b7ccdbb102bc6db1b0d3af7cb6f99d0892f8fc306f1643286291c0fa7114af8e65864412bd6c1afa xf86-input-mouse-1.9.5.tar.xz # Locally computed -sha256 472ff645ead9bf3ffb48d42c596376ffc595897e0c0993a071a7ada0da1f4f10 COPYING +sha256 5b066654bdb61a1ef41f38cceda752897bbddb6e60e20f5889cab436a9b7b813 COPYING diff --git a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk index 3886fa7aa15..25e25ab93de 100644 --- a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk +++ b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDRIVER_XF86_INPUT_MOUSE_VERSION = 1.9.3 -XDRIVER_XF86_INPUT_MOUSE_SOURCE = xf86-input-mouse-$(XDRIVER_XF86_INPUT_MOUSE_VERSION).tar.bz2 -XDRIVER_XF86_INPUT_MOUSE_SITE = http://xorg.freedesktop.org/releases/individual/driver +XDRIVER_XF86_INPUT_MOUSE_VERSION = 1.9.5 +XDRIVER_XF86_INPUT_MOUSE_SOURCE = xf86-input-mouse-$(XDRIVER_XF86_INPUT_MOUSE_VERSION).tar.xz +XDRIVER_XF86_INPUT_MOUSE_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_INPUT_MOUSE_LICENSE = MIT XDRIVER_XF86_INPUT_MOUSE_LICENSE_FILES = COPYING XDRIVER_XF86_INPUT_MOUSE_DEPENDENCIES = xserver_xorg-server xorgproto diff --git a/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.hash b/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.hash index b482a1db3b0..97d55f2e2d8 100644 --- a/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.hash +++ b/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-May/002899.html -md5 cfb79d3c975151f9bbf30b727c260cb9 xf86-input-synaptics-1.9.1.tar.bz2 -sha1 07eeef716820105cae959bbc3aa103e2fcfd0084 xf86-input-synaptics-1.9.1.tar.bz2 -sha256 7af83526eff1c76e8b9e1553b34245c203d029028d8044dd9dcf71eef1001576 xf86-input-synaptics-1.9.1.tar.bz2 -sha512 978eddd456aa7361047bc3d72e5127b24b13de29b0dddb6a0acc9f9da93931baa2b22fb5d1e6be164f629a11e5d97d753b835426435396b45b1af5eb8d546c3f xf86-input-synaptics-1.9.1.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-July/003181.html +sha256 b8fa4aab913fc63754bbd6439e020658c412743a055201ddf212760593962c38 xf86-input-synaptics-1.9.2.tar.xz +sha512 6fd46505f22bba79f612fbd48dddd4818f7d874cc29caac71840744de27f1d224c68861e3a18d2a866b78178924d2f093f5260e27b221aa1fb17dbc09d66b649 xf86-input-synaptics-1.9.2.tar.xz # Locally computed -sha256 e14dc9a27158cadaeea8bcc2c70069762f05adb29030a444336bfde268751dc7 COPYING +sha256 e14dc9a27158cadaeea8bcc2c70069762f05adb29030a444336bfde268751dc7 COPYING diff --git a/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk b/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk index c8ef98f8e4d..888f60b2fb4 100644 --- a/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk +++ b/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDRIVER_XF86_INPUT_SYNAPTICS_VERSION = 1.9.1 -XDRIVER_XF86_INPUT_SYNAPTICS_SOURCE = xf86-input-synaptics-$(XDRIVER_XF86_INPUT_SYNAPTICS_VERSION).tar.bz2 -XDRIVER_XF86_INPUT_SYNAPTICS_SITE = http://xorg.freedesktop.org/releases/individual/driver +XDRIVER_XF86_INPUT_SYNAPTICS_VERSION = 1.9.2 +XDRIVER_XF86_INPUT_SYNAPTICS_SOURCE = xf86-input-synaptics-$(XDRIVER_XF86_INPUT_SYNAPTICS_VERSION).tar.xz +XDRIVER_XF86_INPUT_SYNAPTICS_SITE = https://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_SYNAPTICS_LICENSE = MIT XDRIVER_XF86_INPUT_SYNAPTICS_LICENSE_FILES = COPYING XDRIVER_XF86_INPUT_SYNAPTICS_DEPENDENCIES = libevdev xserver_xorg-server xorgproto mtdev diff --git a/package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.hash b/package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.hash index d2c1d8ed6dd..dca54571e00 100644 --- a/package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.hash +++ b/package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.hash @@ -1,5 +1,5 @@ # https://github.com/merge/xf86-input-tslib/releases/download/1.1.1/xf86-input-tslib-1.1.1.tar.bz2.sha256 -sha256 8b6a9f2ad73598a3619e66e252bd54b1792c4deba0213101fa4d272b5e9217ec xf86-input-tslib-1.1.1.tar.bz2 +sha256 8b6a9f2ad73598a3619e66e252bd54b1792c4deba0213101fa4d272b5e9217ec xf86-input-tslib-1.1.1.tar.bz2 # Locally computed sha256 edfc46c9b91499699fc54d39e986756a2dcce8a919c6066be177123441532856 COPYING diff --git a/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.hash b/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.hash index fd6221fa236..2a221a4c12d 100644 --- a/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.hash +++ b/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2015-June/002616.html -sha256 0af558957ac1be1b2863712c2475de8f4d7f14921fd01ded2e2fde4921b19319 xf86-input-vmmouse-13.1.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003217.html +sha256 56f077580ab8f02e2f40358c5c46b0ae3e1828fc77744526b24adf1ceea339b8 xf86-input-vmmouse-13.2.0.tar.xz +sha512 26a01347a679db058abdc7cbd9a363bb4fccd1a727dc18e279d15b8a0dce71f67af5ff54df28b908391da8d2fc311d8c1813f26dcded4e9a2668db7b55ca5687 xf86-input-vmmouse-13.2.0.tar.xz # Locally calculated sha256 804737a1582428fdde4e2bfd1e9f3ca07971fc3bdce20ba2d06cc2bba6c84a9e COPYING diff --git a/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk b/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk index b8c77de5f67..178e1344b21 100644 --- a/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk +++ b/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDRIVER_XF86_INPUT_VMMOUSE_VERSION = 13.1.0 -XDRIVER_XF86_INPUT_VMMOUSE_SOURCE = xf86-input-vmmouse-$(XDRIVER_XF86_INPUT_VMMOUSE_VERSION).tar.bz2 -XDRIVER_XF86_INPUT_VMMOUSE_SITE = http://xorg.freedesktop.org/releases/individual/driver +XDRIVER_XF86_INPUT_VMMOUSE_VERSION = 13.2.0 +XDRIVER_XF86_INPUT_VMMOUSE_SOURCE = xf86-input-vmmouse-$(XDRIVER_XF86_INPUT_VMMOUSE_VERSION).tar.xz +XDRIVER_XF86_INPUT_VMMOUSE_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_INPUT_VMMOUSE_LICENSE = MIT XDRIVER_XF86_INPUT_VMMOUSE_LICENSE_FILES = COPYING XDRIVER_XF86_INPUT_VMMOUSE_DEPENDENCIES = xserver_xorg-server xorgproto diff --git a/package/x11r7/xdriver_xf86-video-amdgpu/Config.in b/package/x11r7/xdriver_xf86-video-amdgpu/Config.in index c42255f55ce..fb23fc1fdf9 100644 --- a/package/x11r7/xdriver_xf86-video-amdgpu/Config.in +++ b/package/x11r7/xdriver_xf86-video-amdgpu/Config.in @@ -1,8 +1,7 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_AMDGPU bool "xf86-video-amdgpu" depends on BR2_USE_MMU # libdrm - depends on BR2_PACKAGE_MESA3D_DRI_DRIVER - depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # gbm + depends on BR2_PACKAGE_HAS_LIBGBM select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_LIBDRM_AMDGPU select BR2_PACKAGE_LIBEPOXY @@ -11,7 +10,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_AMDGPU help AMD GPU video driver -comment "xf86-video-amdgpu needs egl/opengl support from mesa3d" +comment "xf86-video-amdgpu needs GBM" depends on BR2_USE_MMU - depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL || \ - !BR2_PACKAGE_MESA3D_DRI_DRIVER + depends on !BR2_PACKAGE_HAS_LIBGBM diff --git a/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.hash b/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.hash index 4bbfb0de71f..c45ae59ee43 100644 --- a/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.hash +++ b/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-October/003026.html -md5 55ad19b858e186a2cf4e91ed832c05e7 xf86-video-amdgpu-19.1.0.tar.bz2 -sha1 044a97ea2f36dd3d2d4844bb503dd4e2b2854d56 xf86-video-amdgpu-19.1.0.tar.bz2 -sha256 4f0ea4e0ae61995ac2b7c72433d31deab63b60c78763020aaa1b28696124fe5d xf86-video-amdgpu-19.1.0.tar.bz2 -sha512 ccdaa2378492da1a2f3d18fedacd1318c4708da534a8a959276a82730d5420619d83ad1ec8d7835c55655fe56123cd9bffb44e6223c5a97033c01f598af4a173 xf86-video-amdgpu-19.1.0.tar.bz2 +# From https://lists.x.org/archives/xorg/2022-February/060928.html +sha256 9d23fb602915dc3ccde92aa4d1e9485e7e54eaae2f41f485e55eb20761778266 xf86-video-amdgpu-22.0.0.tar.xz +sha512 95c64e3fef7729ced6e7adc5e81c60cc218f6d8b6604f7b290e86ff52c917426b5102decbf8be8a66c9181ccde6e5dff7083dca8cc0c493a39e82625b5c7cb2a xf86-video-amdgpu-22.0.0.tar.xz # Locally computed -sha256 58847c8e97190c401afa84b3f0b8b147379c876a184e99af2cb51bfd40ac8936 COPYING +sha256 58847c8e97190c401afa84b3f0b8b147379c876a184e99af2cb51bfd40ac8936 COPYING diff --git a/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk b/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk index e7196956a34..ba4ab43db29 100644 --- a/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk +++ b/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk @@ -4,17 +4,24 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_AMDGPU_VERSION = 19.1.0 -XDRIVER_XF86_VIDEO_AMDGPU_SOURCE = xf86-video-amdgpu-$(XDRIVER_XF86_VIDEO_AMDGPU_VERSION).tar.bz2 +XDRIVER_XF86_VIDEO_AMDGPU_VERSION = 22.0.0 +XDRIVER_XF86_VIDEO_AMDGPU_SOURCE = xf86-video-amdgpu-$(XDRIVER_XF86_VIDEO_AMDGPU_VERSION).tar.xz XDRIVER_XF86_VIDEO_AMDGPU_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_AMDGPU_LICENSE = MIT XDRIVER_XF86_VIDEO_AMDGPU_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_AMDGPU_DEPENDENCIES = \ libdrm \ + libgbm \ xlib_libXcomposite \ xorgproto \ xserver_xorg-server +ifeq ($(BR2_PACKAGE_HAS_LIBEGL)$(BR2_PACKAGE_HAS_LIBGL)$(BR2_PACKAGE_LIBEPOXY),yyy) +XDRIVER_XF86_VIDEO_AMDGPU_CONF_OPTS += --enable-glamor +else +XDRIVER_XF86_VIDEO_AMDGPU_CONF_OPTS += --disable-glamor +endif + # xdriver_xf86-video-amdgpu requires O_CLOEXEC XDRIVER_XF86_VIDEO_AMDGPU_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" diff --git a/package/x11r7/xdriver_xf86-video-ark/0001-mibstore.patch b/package/x11r7/xdriver_xf86-video-ark/0001-mibstore.patch deleted file mode 100644 index fa3e68596aa..00000000000 --- a/package/x11r7/xdriver_xf86-video-ark/0001-mibstore.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 3a3eb72baec46f48e6cf15a834271c3d3386deac Mon Sep 17 00:00:00 2001 -From: Gaetan Nadon -Date: Tue, 17 Sep 2013 19:55:37 +0000 -Subject: Remove usage of mibstore.h (removed from server) - -The module had a compile error for this missing header file. - -Changes similar to vmware commit -23d87c92b7211cc5249eefe4ab3a2c7f370e279e - -Reviewed-by: Alex Deucher -Signed-off-by: Gaetan Nadon ---- -Fetch from: -http://cgit.freedesktop.org/xorg/driver/xf86-video-ark/commit/?id=3a3eb72baec46f48e6cf15a834271c3d3386deac - -Signed-off-by: Bernd Kuhls - -diff --git a/src/ark_driver.c b/src/ark_driver.c -index b7c287c..65cfe84 100644 ---- a/src/ark_driver.c -+++ b/src/ark_driver.c -@@ -39,7 +39,6 @@ - #include "compiler.h" - #include "mipointer.h" - #include "micmap.h" --#include "mibstore.h" - #include "fb.h" - #include "ark.h" - -@@ -538,7 +537,6 @@ static Bool ARKScreenInit(SCREEN_INIT_ARGS_DECL) - - fbPictureInit (pScreen, 0, 0); - -- miInitializeBackingStore(pScreen); - xf86SetBackingStore(pScreen); - - if (!pARK->NoAccel) { --- -cgit v0.9.0.2-2-gbebe diff --git a/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.hash b/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.hash index 2e2e9536763..68131fdb38a 100644 --- a/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.hash +++ b/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2012-July/002007.html -sha256 c690e046f34a393aac1c8d9616b4790e93cda60a460b00b9597d322175dbe51e xf86-video-ark-0.7.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-February/003328.html +sha256 5acc9e78122ff6f4390787b2d0d44df81379bd613b6245983cc4bf3f325d085d xf86-video-ark-0.7.6.tar.xz +sha512 a52623e07eef6fa12d77b1afc55bb74b21662b850515b3a32bbf5988dcea2e787b4eddf4e020279aa4e4ddba436505ca9298548406913031e0ed5edaac835491 xf86-video-ark-0.7.6.tar.xz # Locally calculated sha256 8ba9850fb0ecd9033bb1d25c1be85625cb53ca56ce76b71f78f4a034f7310bda COPYING diff --git a/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk b/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk index 3f2a63609e1..6301a97300f 100644 --- a/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk +++ b/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_ARK_VERSION = 0.7.5 -XDRIVER_XF86_VIDEO_ARK_SOURCE = xf86-video-ark-$(XDRIVER_XF86_VIDEO_ARK_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_ARK_SITE = http://xorg.freedesktop.org/releases/individual/driver +XDRIVER_XF86_VIDEO_ARK_VERSION = 0.7.6 +XDRIVER_XF86_VIDEO_ARK_SOURCE = xf86-video-ark-$(XDRIVER_XF86_VIDEO_ARK_VERSION).tar.xz +XDRIVER_XF86_VIDEO_ARK_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_VIDEO_ARK_LICENSE = MIT XDRIVER_XF86_VIDEO_ARK_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_ARK_DEPENDENCIES = xserver_xorg-server xorgproto diff --git a/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.hash b/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.hash index 2988db98af8..12ad79e4b4d 100644 --- a/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.hash +++ b/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.hash @@ -1,4 +1,5 @@ -# Locally computed -sha256 1edbbc55d47d3fd71dec99b15c2483e22738c642623a0fb86ef4a81a9067a2de xf86-video-ast-1.1.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003291.html +sha256 75754fa9c7f9a94fcc706d32cc118942d16c71934d88110442443a143b930daf xf86-video-ast-1.1.6.tar.xz +sha512 8482fec8d6be577f293cb820e623544475163f713fd74ec415f899bf5e9cf9453ffe4f96e141da3671437ebf616b47395d30d4b10858053c5893f5f5b7575ef1 xf86-video-ast-1.1.6.tar.xz # Locally calculated sha256 1cdd3d57e2fdcbd21b8a7b788ffbe6f809216a9bdd36b2225cff6c4b4404a170 COPYING diff --git a/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk b/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk index b39bbf9a15a..f29dc29f0b5 100644 --- a/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk +++ b/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_AST_VERSION = 1.1.5 -XDRIVER_XF86_VIDEO_AST_SOURCE = xf86-video-ast-$(XDRIVER_XF86_VIDEO_AST_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_AST_SITE = http://xorg.freedesktop.org/releases/individual/driver +XDRIVER_XF86_VIDEO_AST_VERSION = 1.1.6 +XDRIVER_XF86_VIDEO_AST_SOURCE = xf86-video-ast-$(XDRIVER_XF86_VIDEO_AST_VERSION).tar.xz +XDRIVER_XF86_VIDEO_AST_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_VIDEO_AST_LICENSE = MIT XDRIVER_XF86_VIDEO_AST_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_AST_DEPENDENCIES = xorgproto xserver_xorg-server diff --git a/package/x11r7/xdriver_xf86-video-ati/0004-Only-include-dri-h-with-older-versions-of-xserver.patch b/package/x11r7/xdriver_xf86-video-ati/0004-Only-include-dri-h-with-older-versions-of-xserver.patch new file mode 100644 index 00000000000..a969d61913c --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-ati/0004-Only-include-dri-h-with-older-versions-of-xserver.patch @@ -0,0 +1,32 @@ +From 5eba006e4129e8015b822f9e1d2f1e613e252cda Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Michel=20D=C3=A4nzer?= +Date: Tue, 2 Feb 2021 12:45:54 +0100 +Subject: [PATCH] Only include dri.h with older versions of xserver + +Not needed anymore with current versions. + +Downloaded from upstream commit +https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati/-/commit/5eba006e4129e8015b822f9e1d2f1e613e252cda + +Signed-off-by: Bernd Kuhls +--- + src/drmmode_display.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/drmmode_display.c b/src/drmmode_display.c +index 3099a729..a58f24dd 100644 +--- a/src/drmmode_display.c ++++ b/src/drmmode_display.c +@@ -45,7 +45,9 @@ + #include "radeon_glamor.h" + #include "radeon_reg.h" + ++#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,19,99,1,0) + #include ++#endif + + #include "drmmode_display.h" + +-- +GitLab + diff --git a/package/x11r7/xdriver_xf86-video-ati/Config.in b/package/x11r7/xdriver_xf86-video-ati/Config.in index 1246014dca5..81255d5a4cf 100644 --- a/package/x11r7/xdriver_xf86-video-ati/Config.in +++ b/package/x11r7/xdriver_xf86-video-ati/Config.in @@ -1,15 +1,14 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_ATI bool "xf86-video-ati" depends on BR2_i386 || BR2_x86_64 # DRI radeon r100 driver - depends on BR2_PACKAGE_MESA3D + depends on BR2_PACKAGE_HAS_LIBGBM select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_LIBDRM_RADEON - select BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON select BR2_PACKAGE_XLIB_LIBXCOMPOSITE select BR2_PACKAGE_XORGPROTO help ATI video driver -comment "xf86-video-ati needs mesa3d" +comment "xf86-video-ati needs GBM" depends on BR2_i386 || BR2_x86_64 - depends on !BR2_PACKAGE_MESA3D + depends on !BR2_PACKAGE_HAS_LIBGBM diff --git a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.hash b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.hash index c6f8c53ef93..1e7376cbfc8 100644 --- a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.hash +++ b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.hash @@ -1,7 +1,7 @@ # From https://lists.x.org/archives/xorg-announce/2019-October/003027.html -md5 6e49d3c2839582af415ceded76e626e6 xf86-video-ati-19.1.0.tar.bz2 -sha1 aea1d11c05531b03f2eb67c6785cddf6d7f30e5f xf86-video-ati-19.1.0.tar.bz2 -sha256 659f5a1629eea5f5334d9b39b18e6807a63aa1efa33c1236d9cc53acbb223c49 xf86-video-ati-19.1.0.tar.bz2 -sha512 73a81f6c492daf2e89067fb52b3033dc0fe6841f109627ddca1aee54a45a738c8c134443753a2a2aaa2c131e1d560057ebc76351ff2304c16407df3ff568fcd6 xf86-video-ati-19.1.0.tar.bz2 +md5 6e49d3c2839582af415ceded76e626e6 xf86-video-ati-19.1.0.tar.bz2 +sha1 aea1d11c05531b03f2eb67c6785cddf6d7f30e5f xf86-video-ati-19.1.0.tar.bz2 +sha256 659f5a1629eea5f5334d9b39b18e6807a63aa1efa33c1236d9cc53acbb223c49 xf86-video-ati-19.1.0.tar.bz2 +sha512 73a81f6c492daf2e89067fb52b3033dc0fe6841f109627ddca1aee54a45a738c8c134443753a2a2aaa2c131e1d560057ebc76351ff2304c16407df3ff568fcd6 xf86-video-ati-19.1.0.tar.bz2 # Locally computed -sha256 58847c8e97190c401afa84b3f0b8b147379c876a184e99af2cb51bfd40ac8936 COPYING +sha256 58847c8e97190c401afa84b3f0b8b147379c876a184e99af2cb51bfd40ac8936 COPYING diff --git a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk index edb8b11add8..e7f5852811c 100644 --- a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk +++ b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk @@ -11,6 +11,7 @@ XDRIVER_XF86_VIDEO_ATI_LICENSE = MIT XDRIVER_XF86_VIDEO_ATI_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_ATI_DEPENDENCIES = \ libdrm \ + libgbm \ xlib_libXcomposite \ xorgproto \ xserver_xorg-server diff --git a/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.hash b/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.hash index 0600bce16e0..98de98c065a 100644 --- a/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.hash +++ b/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2015-May/002600.html -sha256 edc87b20a55259126b5239b5c1ef913419eab7ded0ed12ae9ae989460d7351ab xf86-video-cirrus-1.5.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-July/003182.html +sha256 0ef3fa0083de3d9a040f11b3af38598d8405f1165b908fdd6712c30038326401 xf86-video-cirrus-1.6.0.tar.xz +sha512 d18260bdc486fbadf619e41a9e9d9ad08bda2434b877ab7504ba13aa1fdeb1f87bb397d9090d5cf0883325ad08799115d5f0ce098b5f75088a06b0a96894ed76 xf86-video-cirrus-1.6.0.tar.xz # Locally calculated sha256 a113cf02dcfa523593727790a17172080ac87d8de16e766bda4cbbe73dd8dc62 COPYING diff --git a/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk b/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk index fa776a24d64..d953b2239d8 100644 --- a/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk +++ b/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_CIRRUS_VERSION = 1.5.3 -XDRIVER_XF86_VIDEO_CIRRUS_SOURCE = xf86-video-cirrus-$(XDRIVER_XF86_VIDEO_CIRRUS_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_CIRRUS_SITE = http://xorg.freedesktop.org/releases/individual/driver +XDRIVER_XF86_VIDEO_CIRRUS_VERSION = 1.6.0 +XDRIVER_XF86_VIDEO_CIRRUS_SOURCE = xf86-video-cirrus-$(XDRIVER_XF86_VIDEO_CIRRUS_VERSION).tar.xz +XDRIVER_XF86_VIDEO_CIRRUS_SITE = https://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_CIRRUS_LICENSE = MIT XDRIVER_XF86_VIDEO_CIRRUS_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_CIRRUS_DEPENDENCIES = xserver_xorg-server xorgproto diff --git a/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.hash b/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.hash index 3eac3840ef2..6d7d0b4bc20 100644 --- a/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.hash +++ b/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.hash @@ -1,4 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2016-December/002751.html -sha256 3712bb869307233491e4c570732d6073c0dc3d99adfdb9977396a3fdf84e95b9 xf86-video-dummy-0.3.8.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-May/003394.html +sha256 351920a7fd0f759a3ac972a5999b3ffed46f07fb52a99f319bfb5b6a59d3dfaf xf86-video-dummy-0.4.1.tar.xz +sha512 ff7fd8b668e5e9f40a5d27f82599b7a455a8162fc1a247195335c17980f00ce10ae6b2c062239cbaa67d8684c86174f85b398dd7f7065d36f69294bd6f2469de xf86-video-dummy-0.4.1.tar.xz # Locally calculated -sha256 e29aa81e74563d14e5633963107c030e74e8352ea7dafee1a9d7e19b7d0e887b COPYING +sha256 e29aa81e74563d14e5633963107c030e74e8352ea7dafee1a9d7e19b7d0e887b COPYING diff --git a/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk b/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk index 3127f6cb1b9..f7f05c7c418 100644 --- a/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk +++ b/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk @@ -4,8 +4,8 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_DUMMY_VERSION = 0.3.8 -XDRIVER_XF86_VIDEO_DUMMY_SOURCE = xf86-video-dummy-$(XDRIVER_XF86_VIDEO_DUMMY_VERSION).tar.bz2 +XDRIVER_XF86_VIDEO_DUMMY_VERSION = 0.4.1 +XDRIVER_XF86_VIDEO_DUMMY_SOURCE = xf86-video-dummy-$(XDRIVER_XF86_VIDEO_DUMMY_VERSION).tar.xz XDRIVER_XF86_VIDEO_DUMMY_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_DUMMY_LICENSE = MIT XDRIVER_XF86_VIDEO_DUMMY_LICENSE_FILES = COPYING diff --git a/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.hash b/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.hash index dd3a9c3895f..0b38a9b41b7 100644 --- a/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.hash +++ b/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.hash @@ -1,4 +1,4 @@ # From http://lists.x.org/archives/xorg-announce/2013-September/002324.html -sha256 dcc3d85f378022180e437a9ec00a59b6cb7680ff79c40394d695060af2374699 xf86-video-fbdev-0.5.0.tar.bz2 +sha256 dcc3d85f378022180e437a9ec00a59b6cb7680ff79c40394d695060af2374699 xf86-video-fbdev-0.5.0.tar.bz2 # Locally calculated sha256 e437aed89c3440a9fe7e19968a3f2eeb97041ef6c9616837a3fd42d0874fc0e6 COPYING diff --git a/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.hash b/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.hash index 7a66c28b52b..7dcb99fe2a8 100644 --- a/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.hash +++ b/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.hash @@ -1,3 +1,5 @@ +# From https://lists.x.org/archives/xorg-announce/2023-May/003393.html +sha256 8256ac3f14117324d00b7bfa8053645ca92562fe837c542489a502adbb5f9f1e xf86-video-geode-2.11.21.tar.xz +sha512 e12f74268ab7d16b57644a9465b4be1ca28d250625a31b8810e19a1f94a17e47e0a258455155fd8f336fa59fd78160cdf3763aa94b85c6ccc2c42edf3b65bc61 xf86-video-geode-2.11.21.tar.xz # Locally calculated -sha256 f497d0bfb09f36c72e3467e2d701f57f6b03ab8992c5d570e66582f714f84d64 xf86-video-geode-2.11.20.tar.bz2 sha256 3994ef7cee54f0935a4b57b1c34efd904da567931dd9e1a2d9390d22c8332ea2 COPYING diff --git a/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk b/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk index dbeae1aa659..8f84e4863ff 100644 --- a/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk +++ b/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_GEODE_VERSION = 2.11.20 -XDRIVER_XF86_VIDEO_GEODE_SOURCE = xf86-video-geode-$(XDRIVER_XF86_VIDEO_GEODE_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_GEODE_SITE = http://xorg.freedesktop.org/releases/individual/driver +XDRIVER_XF86_VIDEO_GEODE_VERSION = 2.11.21 +XDRIVER_XF86_VIDEO_GEODE_SOURCE = xf86-video-geode-$(XDRIVER_XF86_VIDEO_GEODE_VERSION).tar.xz +XDRIVER_XF86_VIDEO_GEODE_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_VIDEO_GEODE_LICENSE = MIT XDRIVER_XF86_VIDEO_GEODE_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_GEODE_DEPENDENCIES = xserver_xorg-server xorgproto diff --git a/package/x11r7/xdriver_xf86-video-glint/Config.in b/package/x11r7/xdriver_xf86-video-glint/Config.in deleted file mode 100644 index c474f6c9128..00000000000 --- a/package/x11r7/xdriver_xf86-video-glint/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_XDRIVER_XF86_VIDEO_GLINT - bool "xf86-video-glint" - depends on BR2_PACKAGE_MESA3D - select BR2_PACKAGE_LIBDRM - select BR2_PACKAGE_XORGPROTO - help - GLINT/Permedia video driver - -comment "xf86-video-glint needs mesa3d" - depends on !BR2_PACKAGE_MESA3D diff --git a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.hash b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.hash deleted file mode 100644 index 40474ebc7be..00000000000 --- a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From https://lists.x.org/archives/xorg-announce/2017-January/002759.html -sha256 852833ab2ea9ce519195dfd061a6c7aa5945a093cdc19546d1e9e69df7d577d2 xf86-video-glint-1.2.9.tar.bz2 -# Locally calculated -sha256 6ca8e1a7e1d491f3618d3f14df1be64dbc8adefae7bbaf11d4920240dfb12f6e COPYING diff --git a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk deleted file mode 100644 index fba00307571..00000000000 --- a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xdriver_xf86-video-glint -# -################################################################################ - -XDRIVER_XF86_VIDEO_GLINT_VERSION = 1.2.9 -XDRIVER_XF86_VIDEO_GLINT_SOURCE = xf86-video-glint-$(XDRIVER_XF86_VIDEO_GLINT_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_GLINT_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_VIDEO_GLINT_LICENSE = MIT -XDRIVER_XF86_VIDEO_GLINT_LICENSE_FILES = COPYING -XDRIVER_XF86_VIDEO_GLINT_DEPENDENCIES = xserver_xorg-server libdrm xorgproto - -$(eval $(autotools-package)) diff --git a/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.hash b/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.hash index 325e754fb35..96bd42ac365 100644 --- a/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.hash +++ b/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.hash @@ -1,7 +1,7 @@ # From https://lists.x.org/archives/xorg-announce/2018-December/002932.html md5 a980f1b8532ccfe81932580bc4e0f2a0 xf86-video-i128-1.4.0.tar.bz2 -sha1 56d5b897b2695222c13e59d2ade74620a99e1011 xf86-video-i128-1.4.0.tar.bz2 -sha256 8f2c0a6bf5a169dad3fc07c6dd4537b492d0e44489e4a1297311e617c3bed0ea xf86-video-i128-1.4.0.tar.bz2 -sha512 d58baee3f20b3ad2ece6853da0ff20a6d54b984c6e3289bad2715cc003b277a0b44d20ded25cfc116400468df552390bdb5d80fbd3fb60861488ee5d027664b2 xf86-video-i128-1.4.0.tar.bz2 +sha1 56d5b897b2695222c13e59d2ade74620a99e1011 xf86-video-i128-1.4.0.tar.bz2 +sha256 8f2c0a6bf5a169dad3fc07c6dd4537b492d0e44489e4a1297311e617c3bed0ea xf86-video-i128-1.4.0.tar.bz2 +sha512 d58baee3f20b3ad2ece6853da0ff20a6d54b984c6e3289bad2715cc003b277a0b44d20ded25cfc116400468df552390bdb5d80fbd3fb60861488ee5d027664b2 xf86-video-i128-1.4.0.tar.bz2 # Locally computed -sha256 7677424d79633dbf255a81bd4e05dd621931b89997af33c31522269ec2ed391e COPYING +sha256 7677424d79633dbf255a81bd4e05dd621931b89997af33c31522269ec2ed391e COPYING diff --git a/package/x11r7/xdriver_xf86-video-imx-viv/Config.in b/package/x11r7/xdriver_xf86-video-imx-viv/Config.in deleted file mode 100644 index 13cee14deb5..00000000000 --- a/package/x11r7/xdriver_xf86-video-imx-viv/Config.in +++ /dev/null @@ -1,40 +0,0 @@ -config BR2_PACKAGE_XDRIVER_XF86_VIDEO_IMX_VIV - bool "xf86-video-imx-viv" - depends on BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 - depends on BR2_PACKAGE_IMX_GPU_G2D - depends on BR2_TOOLCHAIN_HAS_SYNC_1 # mesa3d - select BR2_PACKAGE_MESA3D # Needed in order to compile xorg with glx/dri - select BR2_PACKAGE_MESA3D_DRI_DRIVER - select BR2_PACKAGE_LIBDRM - select BR2_PACKAGE_XORGPROTO - help - X.Org driver for iMX6 GPU (Vivante) - - Notice EGL and GLes2 APIs are correctly supported. This - driver should also be able to provide Desktop OpenGL - implementation but, this feature seems broken since quite - some time. - - To use this driver, add correct configuration to your - /etc/X11/xorg.conf: - - Section "Device" - [...] - Driver "vivante" - Option "vivante_fbdev" "/dev/fbX" - EndSection - - Don't forget to load galcore.ko and create /dev/galcore - before using this driver (else, Xorg will exit with an - obscur message like "Segmentation fault at address 0xc"). - -comment "xf86-video-imx-viv depends on imx-gpu-viv with X11 output" - depends on BR2_arm - depends on !BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 - depends on BR2_TOOLCHAIN_HAS_SYNC_1 - -comment "xf86-video-imx-viv depends on imx-gpu-g2d" - depends on BR2_arm - depends on !BR2_PACKAGE_IMX_GPU_G2D - depends on BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 - depends on BR2_TOOLCHAIN_HAS_SYNC_1 diff --git a/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash b/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash deleted file mode 100644 index 5873b4b11ce..00000000000 --- a/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 638a8aa8b64f860900d003527529689bc342d18ff5e41a9e1750884544898e67 xdriver_xf86-video-imx-viv-rel_imx_4.9.x_1.0.0_ga-br1.tar.gz -sha256 9d3e373f0440cc0c58853e963636a7c1ffda9308ec5f30ebe9adfb9c16a8a1e4 COPYING-MIT diff --git a/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk b/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk deleted file mode 100644 index 09134275424..00000000000 --- a/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk +++ /dev/null @@ -1,35 +0,0 @@ -################################################################################ -# -# xdriver_xf86-video-imx-viv -# -################################################################################ - -XDRIVER_XF86_VIDEO_IMX_VIV_VERSION = rel_imx_4.9.x_1.0.0_ga -XDRIVER_XF86_VIDEO_IMX_VIV_SITE = https://source.codeaurora.org/external/imx/xf86-video-imx-vivante -XDRIVER_XF86_VIDEO_IMX_VIV_SITE_METHOD = git -XDRIVER_XF86_VIDEO_IMX_VIV_DEPENDENCIES = imx-gpu-viv imx-gpu-g2d xserver_xorg-server \ - xorgproto libdrm -XDRIVER_XF86_VIDEO_IMX_VIV_LICENSE = MIT -XDRIVER_XF86_VIDEO_IMX_VIV_LICENSE_FILES = COPYING-MIT -XDRIVER_XF86_VIDEO_IMX_VIV_INSTALL_STAGING = YES -XDRIVER_XF86_VIDEO_IMX_VIV_MAKE_CMD = $(TARGET_CONFIGURE_OPTS) $(MAKE1) -C $(@D)/EXA/src -f makefile.linux - -define XDRIVER_XF86_VIDEO_IMX_VIV_BUILD_CMDS - $(XDRIVER_XF86_VIDEO_IMX_VIV_MAKE_CMD) sysroot=$(STAGING_DIR) \ - BUSID_HAS_NUMBER=1 BUILD_IN_YOCTO=1 XSERVER_GREATER_THAN_13=1 \ - CFLAGS="$(TARGET_CFLAGS)" -endef - -define XDRIVER_XF86_VIDEO_IMX_VIV_INSTALL_STAGING_CMDS - $(XDRIVER_XF86_VIDEO_IMX_VIV_MAKE_CMD) prefix=$(STAGING_DIR)/usr install - $(INSTALL) -D -m 644 $(@D)/EXA/src/vivante_gal/vivante_priv.h \ - $(STAGING_DIR)/usr/include/vivante_priv.h - $(INSTALL) -D -m 644 $(@D)/EXA/src/vivante_gal/vivante_gal.h \ - $(STAGING_DIR)/usr/include/vivante_gal.h -endef - -define XDRIVER_XF86_VIDEO_IMX_VIV_INSTALL_TARGET_CMDS - $(XDRIVER_XF86_VIDEO_IMX_VIV_MAKE_CMD) prefix=$(TARGET_DIR)/usr install -endef - -$(eval $(generic-package)) 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 d911234c924..879abdd74d6 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 @@ -31,12 +31,17 @@ XDRIVER_XF86_VIDEO_INTEL_DEPENDENCIES = \ xorgproto \ xserver_xorg-server -# X.org server support for DRI depends on a Mesa3D DRI driver -ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),y) +# DRI support is provided by xserver_xorg-server if libgl is enabled +ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) XDRIVER_XF86_VIDEO_INTEL_CONF_OPTS += \ --enable-dri2 \ --enable-dri3 \ --enable-uxa +else +XDRIVER_XF86_VIDEO_INTEL_CONF_OPTS += \ + --disable-dri2 \ + --disable-dri3 \ + --disable-uxa endif $(eval $(autotools-package)) diff --git a/package/x11r7/xdriver_xf86-video-mach64/0002-Rename-bool-to-boolean-for-OptionInfoRec.patch b/package/x11r7/xdriver_xf86-video-mach64/0002-Rename-bool-to-boolean-for-OptionInfoRec.patch deleted file mode 100644 index fe3e21f8c2a..00000000000 --- a/package/x11r7/xdriver_xf86-video-mach64/0002-Rename-bool-to-boolean-for-OptionInfoRec.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 3ab2c144ef34199ceaf95115538a67f932e76f7d Mon Sep 17 00:00:00 2001 -From: Josselin Poiret -Date: Thu, 18 Nov 2021 13:18:25 +0000 -Subject: [PATCH] Rename bool to boolean for OptionInfoRec. - -* src/aticonfig.c: Change uses of .value.bool to .value.boolean - -Downloaded from upstream commit -https://gitlab.freedesktop.org/xorg/driver/xf86-video-mach64/-/commit/3ab2c144ef34199ceaf95115538a67f932e76f7d - -Signed-off-by: Bernd Kuhls ---- - src/aticonfig.c | 38 +++++++++++++++++++------------------- - 1 file changed, 19 insertions(+), 19 deletions(-) - -diff --git a/src/aticonfig.c b/src/aticonfig.c -index bad6474..6995b9a 100644 ---- a/src/aticonfig.c -+++ b/src/aticonfig.c -@@ -311,42 +311,42 @@ ATIProcessOptions - - (void)memcpy(PublicOption, ATIPublicOptions, ATIPublicOptionSize); - --# define ProbeSparse PublicOption[ATI_OPTION_PROBE_SPARSE].value.bool --# define Accel PublicOption[ATI_OPTION_ACCEL].value.bool --# define BIOSDisplay PrivateOption[ATI_OPTION_BIOS_DISPLAY].value.bool --# define Blend PrivateOption[ATI_OPTION_BLEND].value.bool --# define CRTDisplay PublicOption[ATI_OPTION_CRT_DISPLAY].value.bool --# define CRTScreen PrivateOption[ATI_OPTION_CRT_SCREEN].value.bool --# define CSync PublicOption[ATI_OPTION_CSYNC].value.bool --# define Devel PrivateOption[ATI_OPTION_DEVEL].value.bool --# define HWCursor PublicOption[ATI_OPTION_HWCURSOR].value.bool -+# define ProbeSparse PublicOption[ATI_OPTION_PROBE_SPARSE].value.boolean -+# define Accel PublicOption[ATI_OPTION_ACCEL].value.boolean -+# define BIOSDisplay PrivateOption[ATI_OPTION_BIOS_DISPLAY].value.boolean -+# define Blend PrivateOption[ATI_OPTION_BLEND].value.boolean -+# define CRTDisplay PublicOption[ATI_OPTION_CRT_DISPLAY].value.boolean -+# define CRTScreen PrivateOption[ATI_OPTION_CRT_SCREEN].value.boolean -+# define CSync PublicOption[ATI_OPTION_CSYNC].value.boolean -+# define Devel PrivateOption[ATI_OPTION_DEVEL].value.boolean -+# define HWCursor PublicOption[ATI_OPTION_HWCURSOR].value.boolean - - #ifdef XF86DRI_DEVEL - --# define IsPCI PublicOption[ATI_OPTION_IS_PCI].value.bool -+# define IsPCI PublicOption[ATI_OPTION_IS_PCI].value.boolean - # define DMAMode PublicOption[ATI_OPTION_DMA_MODE].value.str - # define AGPMode PublicOption[ATI_OPTION_AGP_MODE].value.num - # define AGPSize PublicOption[ATI_OPTION_AGP_SIZE].value.num --# define LocalTex PublicOption[ATI_OPTION_LOCAL_TEXTURES].value.bool -+# define LocalTex PublicOption[ATI_OPTION_LOCAL_TEXTURES].value.boolean - # define BufferSize PublicOption[ATI_OPTION_BUFFER_SIZE].value.num - - #endif /* XF86DRI_DEVEL */ - - #ifdef TV_OUT - --# define TvOut PublicOption[ATI_OPTION_TV_OUT].value.bool -+# define TvOut PublicOption[ATI_OPTION_TV_OUT].value.boolean - # define TvStd PublicOption[ATI_OPTION_TV_STD].value.str - - #endif /* TV_OUT */ - --# define CacheMMIO PublicOption[ATI_OPTION_MMIO_CACHE].value.bool --# define TestCacheMMIO PublicOption[ATI_OPTION_TEST_MMIO_CACHE].value.bool --# define PanelDisplay PublicOption[ATI_OPTION_PANEL_DISPLAY].value.bool --# define ShadowFB PublicOption[ATI_OPTION_SHADOW_FB].value.bool --# define SWCursor PublicOption[ATI_OPTION_SWCURSOR].value.bool -+# define CacheMMIO PublicOption[ATI_OPTION_MMIO_CACHE].value.boolean -+# define TestCacheMMIO PublicOption[ATI_OPTION_TEST_MMIO_CACHE].value.boolean -+# define PanelDisplay PublicOption[ATI_OPTION_PANEL_DISPLAY].value.boolean -+# define ShadowFB PublicOption[ATI_OPTION_SHADOW_FB].value.boolean -+# define SWCursor PublicOption[ATI_OPTION_SWCURSOR].value.boolean - # define AccelMethod PublicOption[ATI_OPTION_ACCELMETHOD].value.str --# define RenderAccel PublicOption[ATI_OPTION_RENDER_ACCEL].value.bool --# define LCDSync PrivateOption[ATI_OPTION_LCDSYNC].value.bool -+# define RenderAccel PublicOption[ATI_OPTION_RENDER_ACCEL].value.boolean -+# define LCDSync PrivateOption[ATI_OPTION_LCDSYNC].value.boolean - - # define ReferenceClock \ - PublicOption[ATI_OPTION_REFERENCE_CLOCK].value.freq.freq --- -GitLab - diff --git a/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.hash b/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.hash index 55acd746522..e33036f4c9d 100644 --- a/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.hash +++ b/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-May/002896.html -md5 0e12f9a3b5659e1e27e03adc42b04d99 xf86-video-mach64-6.9.6.tar.bz2 -sha1 1fdf0c3488ab88cb46b563efee166a5d54a01932 xf86-video-mach64-6.9.6.tar.bz2 -sha256 7a0707c71bb522430f83bb5e9d9ee697e661e35534a3a2d10834f86b327a3c9c xf86-video-mach64-6.9.6.tar.bz2 -sha512 687f6ac60491b704d5c4788463763d2f4bf725611e10bd2163156963fe0a8fdbffe0a1b7c737eff131f01759e43b5ec3544a7dabe66a67e85b286dcb969da2f1 xf86-video-mach64-6.9.6.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-July/003183.html +sha256 50d78abffa7c8227e6f187976f23a244ae2095e97f08de275529b70fba9481ba xf86-video-mach64-6.9.7.tar.xz +sha512 a511525ceb8eab95d28e815f462897ead8b99ac455c548598cc061907636e1acff8cad66621feeb33558dbfdbf59ca0648422aae8edaab7d1dcd7e386348177b xf86-video-mach64-6.9.7.tar.xz # Locally computed -sha256 a7d68021893bced0d709338a59a137c74b11e624880e110e4a2f14ccef475120 COPYING +sha256 a7d68021893bced0d709338a59a137c74b11e624880e110e4a2f14ccef475120 COPYING diff --git a/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk b/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk index eee8fec2e80..2e41208ab41 100644 --- a/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk +++ b/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk @@ -4,15 +4,17 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_MACH64_VERSION = 6.9.6 -XDRIVER_XF86_VIDEO_MACH64_SOURCE = xf86-video-mach64-$(XDRIVER_XF86_VIDEO_MACH64_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_MACH64_SITE = http://xorg.freedesktop.org/releases/individual/driver +XDRIVER_XF86_VIDEO_MACH64_VERSION = 6.9.7 +XDRIVER_XF86_VIDEO_MACH64_SOURCE = xf86-video-mach64-$(XDRIVER_XF86_VIDEO_MACH64_VERSION).tar.xz +XDRIVER_XF86_VIDEO_MACH64_SITE = https://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_MACH64_LICENSE = MIT XDRIVER_XF86_VIDEO_MACH64_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_MACH64_AUTORECONF = YES XDRIVER_XF86_VIDEO_MACH64_DEPENDENCIES = xserver_xorg-server xorgproto -ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) +ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) +XDRIVER_XF86_VIDEO_MACH64_CONF_OPTS += --enable-dri +else XDRIVER_XF86_VIDEO_MACH64_CONF_OPTS += --disable-dri endif diff --git a/package/x11r7/xdriver_xf86-video-mga/0001-misc-fixes.patch b/package/x11r7/xdriver_xf86-video-mga/0001-misc-fixes.patch deleted file mode 100644 index 5707bd1b3a1..00000000000 --- a/package/x11r7/xdriver_xf86-video-mga/0001-misc-fixes.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- xf86-video-mga-1.4.9/configure.ac.orig 2007-06-10 11:55:24.000000000 +0200 -+++ xf86-video-mga-1.4.9/configure.ac 2007-06-10 12:00:37.000000000 +0200 -@@ -77,12 +77,18 @@ - AC_HEADER_STDC - - if test "x$DRI" != xno; then -+ if test "$cross_compiling" = no; then - AC_CHECK_FILE([${sdkdir}/dri.h], - [have_dri_h="yes"], [have_dri_h="no"]) - AC_CHECK_FILE([${sdkdir}/sarea.h], - [have_sarea_h="yes"], [have_sarea_h="no"]) - AC_CHECK_FILE([${sdkdir}/dristruct.h], - [have_dristruct_h="yes"], [have_dristruct_h="no"]) -+ else -+ have_dri_h="yes" -+ have_sarea_h="yes" -+ have_dristruct_h="yes" -+ fi - fi - - AC_MSG_CHECKING([whether to include DRI support]) diff --git a/package/x11r7/xdriver_xf86-video-mga/Config.in b/package/x11r7/xdriver_xf86-video-mga/Config.in index 15fb3b9f87a..bac5e624423 100644 --- a/package/x11r7/xdriver_xf86-video-mga/Config.in +++ b/package/x11r7/xdriver_xf86-video-mga/Config.in @@ -1,10 +1,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_MGA bool "xf86-video-mga" - depends on BR2_PACKAGE_MESA3D select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_XORGPROTO help Matrox video driver - -comment "xf86-video-mga needs mesa3d" - depends on !BR2_PACKAGE_MESA3D diff --git a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.hash b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.hash index 218e52e19c2..813429789bd 100644 --- a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.hash +++ b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-December/002933.html -md5 b8fc99b4adea8bfe80156b13df4b6c9c xf86-video-mga-2.0.0.tar.bz2 -sha1 833f2710a1fd7b3f2db3700b2ad055527da5033b xf86-video-mga-2.0.0.tar.bz2 -sha256 268946e1a13e9d80e4f724a0740df9e6e8c8bad37697fcbf456924e9fdbb5d79 xf86-video-mga-2.0.0.tar.bz2 -sha512 b92006486aef815ff4399f291d610c65d88c0b32a9dae97658c644715ff62b221b01495b5c7a2311745e26f699c1c1f753b81c7bf54cf75567af9f78ac015540 xf86-video-mga-2.0.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-July/003184.html +sha256 27a33b70837965bb4a5f27fd260be085ca5bba837a4e62907f093c2f205603ab xf86-video-mga-2.0.1.tar.xz +sha512 d9a0abedb71f3354788c2f91b770bc00c4118cfa2c99072dea82c28f025bc87bb88ebaf969962a8f0e97e1ff7938aebd9c682b730b0e07d5174dd9e8dc2cdfb6 xf86-video-mga-2.0.1.tar.xz # Locally computed -sha256 6c567575e381478c7616eedff3ea2ae5228a5b54fbdd22d4070ebae312fa085c COPYING +sha256 f69c2f4fd11ec4de7fcc23146187836eed1755aade3fef28b9204ea1a4adf61b COPYING diff --git a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk index 3c668a5c988..4841a643bc8 100644 --- a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk +++ b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk @@ -4,15 +4,16 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_MGA_VERSION = 2.0.0 -XDRIVER_XF86_VIDEO_MGA_SOURCE = xf86-video-mga-$(XDRIVER_XF86_VIDEO_MGA_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_MGA_SITE = http://xorg.freedesktop.org/archive/individual/driver +XDRIVER_XF86_VIDEO_MGA_VERSION = 2.0.1 +XDRIVER_XF86_VIDEO_MGA_SOURCE = xf86-video-mga-$(XDRIVER_XF86_VIDEO_MGA_VERSION).tar.xz +XDRIVER_XF86_VIDEO_MGA_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_VIDEO_MGA_LICENSE = MIT XDRIVER_XF86_VIDEO_MGA_LICENSE_FILES = COPYING -XDRIVER_XF86_VIDEO_MGA_AUTORECONF = YES XDRIVER_XF86_VIDEO_MGA_DEPENDENCIES = xserver_xorg-server libdrm xorgproto -ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) +ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) +XDRIVER_XF86_VIDEO_MGA_CONF_OPTS += --enable-dri +else XDRIVER_XF86_VIDEO_MGA_CONF_OPTS += --disable-dri endif diff --git a/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.hash b/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.hash index 55996f5b0d1..b5a139fdacd 100644 --- a/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.hash +++ b/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-December/002934.html -md5 349d5254d09eb46f2a1f151cd423b89a xf86-video-neomagic-1.3.0.tar.bz2 -sha1 6bccfa15ea05d5264120cd96ccf13687642e8f6d xf86-video-neomagic-1.3.0.tar.bz2 -sha256 93833950fae7757088eb6abb125e15e8c245e5e25681c19c3ad4213ec7319064 xf86-video-neomagic-1.3.0.tar.bz2 -sha512 25d019a2556e52aeb4e25942f444437a921e76d527c10ddd420f16aa7d85bf2b8a51612c382a2a7e3e407bb1e8d610d063101184eea0889c3e1a69bfb3b37735 xf86-video-neomagic-1.3.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-April/003380.html +sha256 b61fac7ec32971e92e34cfd51f88fef169e272a210455e0e1a0faa0d30fc7494 xf86-video-neomagic-1.3.1.tar.xz +sha512 b2425c4e9b8e6e816cbb6fa436da12bd242acf55c3c615352fc80ea072b1822abdb40838c2adcc3c450e429ec6e3b5112d194e739cf5d8ac22d430e273d5378b xf86-video-neomagic-1.3.1.tar.xz # Locally computed -sha256 95063ce9aa09850025dd317549ce688519079a8d3cf66ceb3d882cb2bafcced9 COPYING +sha256 95063ce9aa09850025dd317549ce688519079a8d3cf66ceb3d882cb2bafcced9 COPYING diff --git a/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk b/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk index 8dd2777ff9c..8c7beeed6e9 100644 --- a/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk +++ b/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_NEOMAGIC_VERSION = 1.3.0 -XDRIVER_XF86_VIDEO_NEOMAGIC_SOURCE = xf86-video-neomagic-$(XDRIVER_XF86_VIDEO_NEOMAGIC_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_NEOMAGIC_SITE = http://xorg.freedesktop.org/releases/individual/driver +XDRIVER_XF86_VIDEO_NEOMAGIC_VERSION = 1.3.1 +XDRIVER_XF86_VIDEO_NEOMAGIC_SOURCE = xf86-video-neomagic-$(XDRIVER_XF86_VIDEO_NEOMAGIC_VERSION).tar.xz +XDRIVER_XF86_VIDEO_NEOMAGIC_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_VIDEO_NEOMAGIC_LICENSE = MIT XDRIVER_XF86_VIDEO_NEOMAGIC_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_NEOMAGIC_DEPENDENCIES = xserver_xorg-server xorgproto diff --git a/package/x11r7/xdriver_xf86-video-nouveau/Config.in b/package/x11r7/xdriver_xf86-video-nouveau/Config.in index c9fd2e3d2f2..5b266b1b4ab 100644 --- a/package/x11r7/xdriver_xf86-video-nouveau/Config.in +++ b/package/x11r7/xdriver_xf86-video-nouveau/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_NOUVEAU bool "xf86-video-nouveau" - depends on BR2_PACKAGE_MESA3D - select BR2_PACKAGE_MESA3D_DRI_DRIVER_NOUVEAU + depends on BR2_PACKAGE_HAS_LIBGL select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_LIBDRM_NOUVEAU select BR2_PACKAGE_XORGPROTO @@ -10,5 +9,5 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_NOUVEAU http://nouveau.freedesktop.org -comment "xf86-video-nouveau needs mesa3d" - depends on !BR2_PACKAGE_MESA3D +comment "xf86-video-nouveau needs an OpenGL backend" + depends on !BR2_PACKAGE_HAS_LIBGL diff --git a/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.hash b/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.hash index e1835687aac..ec7d198c18e 100644 --- a/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.hash +++ b/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.hash @@ -1,4 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2017-January/002761.html -sha256 1f98649e6ff0e8214b9d5dcac661f1d004be8e73823d8247b9c7025fd81db32d xf86-video-nv-2.1.21.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-July/003196.html +sha256 6218932db5c389878d853b11b8fbb667c321b65276f55aa6842a56fb1a30d288 xf86-video-nv-2.1.22.tar.xz +sha512 a54767e9060404cafbb028ea36e582e8cfb7431a746cfc1d698c435fa73e41c4dfc12f84e50d002a582ac61e2d4c377f4defdf407250ee9e8656e5ff989b3cda xf86-video-nv-2.1.22.tar.xz # Locally calculated sha256 10d10e1ec37594d481c3de8dda22a40b731ebd43be7ccd462baaa7394738a9f3 COPYING diff --git a/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk b/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk index 1e5fc26ddb9..2aab60aaf93 100644 --- a/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk +++ b/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_NV_VERSION = 2.1.21 -XDRIVER_XF86_VIDEO_NV_SOURCE = xf86-video-nv-$(XDRIVER_XF86_VIDEO_NV_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_NV_SITE = http://xorg.freedesktop.org/releases/individual/driver +XDRIVER_XF86_VIDEO_NV_VERSION = 2.1.22 +XDRIVER_XF86_VIDEO_NV_SOURCE = xf86-video-nv-$(XDRIVER_XF86_VIDEO_NV_VERSION).tar.xz +XDRIVER_XF86_VIDEO_NV_SITE = https://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_NV_LICENSE = MIT XDRIVER_XF86_VIDEO_NV_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_NV_DEPENDENCIES = xserver_xorg-server xorgproto diff --git a/package/x11r7/xdriver_xf86-video-openchrome/Config.in b/package/x11r7/xdriver_xf86-video-openchrome/Config.in index a93d14376b6..f95e959f690 100644 --- a/package/x11r7/xdriver_xf86-video-openchrome/Config.in +++ b/package/x11r7/xdriver_xf86-video-openchrome/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_OPENCHROME bool "xf86-video-openchrome" - depends on BR2_PACKAGE_MESA3D_DRI_DRIVER + depends on BR2_PACKAGE_HAS_LIBGL select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXCOMPOSITE @@ -12,5 +12,5 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_OPENCHROME https://www.freedesktop.org/wiki/Openchrome/ -comment "xf86-video-openchrome needs a DRI driver from mesa3d" - depends on !BR2_PACKAGE_MESA3D_DRI_DRIVER +comment "xf86-video-openchrome needs an OpenGL backend" + depends on !BR2_PACKAGE_HAS_LIBGL diff --git a/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.hash b/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.hash index 57cc9aca9cc..d8cc080a323 100644 --- a/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.hash +++ b/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.hash @@ -1,6 +1,3 @@ -# From https://lists.x.org/archives/xorg-announce/2017-March/002781.html -md5 c87f164739729b00f7e1a9934420c22d xf86-video-openchrome-0.6.0.tar.bz2 -sha1 2077181ded4d86e9cbe6d3e9b1245339692e848d xf86-video-openchrome-0.6.0.tar.bz2 -sha256 da2975c6379358de52c1257710c67eb59139a7f0a1cd28d00cc64cc3e1c02f75 xf86-video-openchrome-0.6.0.tar.bz2 # Locally computed -sha256 1fde58bce5cff8c32e9a0a80bfa3e60213a2767954e30a367127d5afa2884ca2 COPYING +sha256 037bebbe31bcca2b4f3adeefccd2a64a30e2924946a6c6646c5829f7362212ec xdriver_xf86-video-openchrome-ab03de703b91c7e0fd3e4d1ca06ad5add7f077a1-br1.tar.gz +sha256 1fde58bce5cff8c32e9a0a80bfa3e60213a2767954e30a367127d5afa2884ca2 COPYING diff --git a/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk b/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk index db9e11f6da9..e8001004bcf 100644 --- a/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk +++ b/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk @@ -4,11 +4,12 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_OPENCHROME_VERSION = 0.6.0 -XDRIVER_XF86_VIDEO_OPENCHROME_SOURCE = xf86-video-openchrome-$(XDRIVER_XF86_VIDEO_OPENCHROME_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_OPENCHROME_SITE = http://xorg.freedesktop.org/archive/individual/driver +XDRIVER_XF86_VIDEO_OPENCHROME_VERSION = ab03de703b91c7e0fd3e4d1ca06ad5add7f077a1 +XDRIVER_XF86_VIDEO_OPENCHROME_SITE = https://anongit.freedesktop.org/git/openchrome/xf86-video-openchrome.git +XDRIVER_XF86_VIDEO_OPENCHROME_SITE_METHOD = git XDRIVER_XF86_VIDEO_OPENCHROME_LICENSE = MIT XDRIVER_XF86_VIDEO_OPENCHROME_LICENSE_FILES = COPYING +XDRIVER_XF86_VIDEO_OPENCHROME_AUTORECONF = YES XDRIVER_XF86_VIDEO_OPENCHROME_DEPENDENCIES = \ xserver_xorg-server \ diff --git a/package/x11r7/xdriver_xf86-video-qxl/0001-Fix-a-build-error-with-Xorg-master.patch b/package/x11r7/xdriver_xf86-video-qxl/0001-Fix-a-build-error-with-Xorg-master.patch deleted file mode 100644 index d3257fba204..00000000000 --- a/package/x11r7/xdriver_xf86-video-qxl/0001-Fix-a-build-error-with-Xorg-master.patch +++ /dev/null @@ -1,106 +0,0 @@ -From 4e1963a812f2c1777ba5d56ea9e939a3e40a0496 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zolt=C3=A1n=20B=C3=B6sz=C3=B6rm=C3=A9nyi?= - -Date: Sat, 28 Aug 2021 15:38:40 +0200 -Subject: [PATCH] Fix a build error with Xorg master -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Use xf86ReturnOptValBool() in get_bool_option() instead of -options[option_index].value.bool to fix a compiler error with -current Xorg xserver master branch. - -Also use xf86GetOptValInteger() in get_int_option() and -xf86GetOptValString() in get_str_option() for consistency. - -The change causes a slight performance drop during option parsing -because the passed-in index_value is no longer used as an index -into the options array. - -Instead, it's used as a token now for the standard option getter -functions which works since the index_value to the get_*_option() -functions are identical to the value of options[n].token in the -passed-in OptionInfoRec array. - -Also rename "int option_index" to "int token" for clarity in all -three functions. - -Signed-off-by: Zoltán Böszörményi - -Downloaded from upstream commit -https://gitlab.freedesktop.org/xorg/driver/xf86-video-qxl/-/commit/4e1963a812f2c1777ba5d56ea9e939a3e40a0496 - -Signed-off-by: Bernd Kuhls ---- - src/qxl_option_helpers.c | 13 +++++++------ - src/qxl_option_helpers.h | 6 +++--- - 2 files changed, 10 insertions(+), 9 deletions(-) - -diff --git a/src/qxl_option_helpers.c b/src/qxl_option_helpers.c -index 2aba677..7707b7c 100644 ---- a/src/qxl_option_helpers.c -+++ b/src/qxl_option_helpers.c -@@ -10,31 +10,32 @@ - - #include "qxl_option_helpers.h" - --int get_int_option(OptionInfoPtr options, int option_index, -+int get_int_option(OptionInfoPtr options, int token, - const char *env_name) - { -+ int value; - if (env_name && getenv(env_name)) { - return atoi(getenv(env_name)); - } -- return options[option_index].value.num; -+ return xf86GetOptValInteger(options, token, &value) ? value : 0; - } - --const char *get_str_option(OptionInfoPtr options, int option_index, -+const char *get_str_option(OptionInfoPtr options, int token, - const char *env_name) - { - if (getenv(env_name)) { - return getenv(env_name); - } -- return options[option_index].value.str; -+ return xf86GetOptValString(options, token); - } - --int get_bool_option(OptionInfoPtr options, int option_index, -+int get_bool_option(OptionInfoPtr options, int token, - const char *env_name) - { - const char* value = getenv(env_name); - - if (!value) { -- return options[option_index].value.bool; -+ return xf86ReturnOptValBool(options, token, FALSE); - } - if (strcmp(value, "0") == 0 || - strcasecmp(value, "off") == 0 || -diff --git a/src/qxl_option_helpers.h b/src/qxl_option_helpers.h -index 7c54c72..66d0a17 100644 ---- a/src/qxl_option_helpers.h -+++ b/src/qxl_option_helpers.h -@@ -4,13 +4,13 @@ - #include - #include - --int get_int_option(OptionInfoPtr options, int option_index, -+int get_int_option(OptionInfoPtr options, int token, - const char *env_name); - --const char *get_str_option(OptionInfoPtr options, int option_index, -+const char *get_str_option(OptionInfoPtr options, int token, - const char *env_name); - --int get_bool_option(OptionInfoPtr options, int option_index, -+int get_bool_option(OptionInfoPtr options, int token, - const char *env_name); - - #endif // OPTION_HELPERS_H --- -GitLab - diff --git a/package/x11r7/xdriver_xf86-video-qxl/Config.in b/package/x11r7/xdriver_xf86-video-qxl/Config.in index 40f61fd69fd..0c6b13eda28 100644 --- a/package/x11r7/xdriver_xf86-video-qxl/Config.in +++ b/package/x11r7/xdriver_xf86-video-qxl/Config.in @@ -9,4 +9,4 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_QXL help QEMU QXL paravirt video driver - http://www.spice-space.org/page/XorgQXL + https://gitlab.freedesktop.org/xorg/driver/xf86-video-qxl diff --git a/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.hash b/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.hash index fdf0cc434d3..2d728a7c03c 100644 --- a/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.hash +++ b/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.hash @@ -1,4 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2016-December/002753.html -sha256 b18682e04503c6326f7bf7190f3ee50a3d4d69758a2a3cc9af102a6b3f114c92 xf86-video-qxl-0.1.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-January/003316.html +sha256 2ad39558db47a8fcc036e290e0b084671e58d43344a57b279abd870c4c67965f xf86-video-qxl-0.1.6.tar.xz +sha512 f6a42355915d2e8f8a842dc24fe6d012d123aa6d23eedea1a4771fb08f88e0298d76741755b88304d76c66b3aae15f9fca74d062be395e499a82ee8f4507c7e0 xf86-video-qxl-0.1.6.tar.xz # Locally calculated sha256 83f3bf7be3fbf5e66174b8184bd837a6b44264f8e340126ea4d9e9ce956a1866 COPYING 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 ffbac05ec1c..db0bbbaf65f 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 @@ -4,9 +4,9 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_QXL_VERSION = 0.1.5 -XDRIVER_XF86_VIDEO_QXL_SOURCE = xf86-video-qxl-$(XDRIVER_XF86_VIDEO_QXL_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_QXL_SITE = http://xorg.freedesktop.org/releases/individual/driver +XDRIVER_XF86_VIDEO_QXL_VERSION = 0.1.6 +XDRIVER_XF86_VIDEO_QXL_SOURCE = xf86-video-qxl-$(XDRIVER_XF86_VIDEO_QXL_VERSION).tar.xz +XDRIVER_XF86_VIDEO_QXL_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_VIDEO_QXL_LICENSE = MIT XDRIVER_XF86_VIDEO_QXL_LICENSE_FILES = COPYING diff --git a/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.hash b/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.hash index eee2865094d..cf9b21ebe86 100644 --- a/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.hash +++ b/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-October/002926.html -md5 105ebcfe1bac06fe84645ac3def91184 xf86-video-r128-6.12.0.tar.bz2 -sha1 7cfa41d386fa43b5d30299203e4845d8afba4899 xf86-video-r128-6.12.0.tar.bz2 -sha256 801c86882cbd2bbb3084d471dcc5cfee2c1754dcbfb4dc446676d58a6bd9e057 xf86-video-r128-6.12.0.tar.bz2 -sha512 0e667e2cfa8a87a00846361d86528c93754c403c812b66798953fa4c857b2143b2c4c44885da467e7f910d8cb910b69492cdcb6f25e2197bae6617364d152e38 xf86-video-r128-6.12.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003275.html +sha256 7d023c2b171f1664e43d12a1d21674079d8065536f82bb95b448bfce4981c741 xf86-video-r128-6.12.1.tar.xz +sha512 18b2408fe68161c32f84c7147717f8e6c6377e81e9d59e2f098843c54cd0ae757aab5059568da8c71ef38100807d56ee22447417c236c1b3deea292bb676e700 xf86-video-r128-6.12.1.tar.xz # Locally computed -sha256 69f7c71859dc8f51aabdbe7a9ee915a480933eb81658f8af2bf4c918e65afe8b COPYING +sha256 69f7c71859dc8f51aabdbe7a9ee915a480933eb81658f8af2bf4c918e65afe8b COPYING diff --git a/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk b/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk index 690041d4c62..49514e3d3ab 100644 --- a/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk +++ b/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk @@ -4,14 +4,16 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_R128_VERSION = 6.12.0 -XDRIVER_XF86_VIDEO_R128_SOURCE = xf86-video-r128-$(XDRIVER_XF86_VIDEO_R128_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_R128_SITE = http://xorg.freedesktop.org/releases/individual/driver +XDRIVER_XF86_VIDEO_R128_VERSION = 6.12.1 +XDRIVER_XF86_VIDEO_R128_SOURCE = xf86-video-r128-$(XDRIVER_XF86_VIDEO_R128_VERSION).tar.xz +XDRIVER_XF86_VIDEO_R128_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_VIDEO_R128_LICENSE = MIT XDRIVER_XF86_VIDEO_R128_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_R128_DEPENDENCIES = xserver_xorg-server xorgproto -ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) +ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) +XDRIVER_XF86_VIDEO_R128_CONF_OPTS += --enable-dri +else XDRIVER_XF86_VIDEO_R128_CONF_OPTS += --disable-dri endif diff --git a/package/x11r7/xdriver_xf86-video-savage/Config.in b/package/x11r7/xdriver_xf86-video-savage/Config.in index bc6ca523704..ab6fd89845c 100644 --- a/package/x11r7/xdriver_xf86-video-savage/Config.in +++ b/package/x11r7/xdriver_xf86-video-savage/Config.in @@ -1,10 +1,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SAVAGE bool "xf86-video-savage" - depends on BR2_PACKAGE_MESA3D select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_XORGPROTO help S3 Savage video driver - -comment "xf86-video-savage needs mesa3d" - depends on !BR2_PACKAGE_MESA3D diff --git a/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk b/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk index 102aa2c48e9..9e5bf61997f 100644 --- a/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk +++ b/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk @@ -12,7 +12,9 @@ XDRIVER_XF86_VIDEO_SAVAGE_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_SAVAGE_AUTORECONF = YES XDRIVER_XF86_VIDEO_SAVAGE_DEPENDENCIES = xserver_xorg-server libdrm xorgproto -ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) +ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) +XDRIVER_XF86_VIDEO_SAVAGE_CONF_OPTS += --enable-dri +else XDRIVER_XF86_VIDEO_SAVAGE_CONF_OPTS += --disable-dri endif diff --git a/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.hash b/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.hash index dc9a3503607..eeff39fed12 100644 --- a/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.hash +++ b/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.hash @@ -1,4 +1,4 @@ # From https://lists.x.org/archives/xorg-announce/2017-January/002763.html -sha256 d0f3c691e71108d27a061beb62bf78b36ec35bd755905692734dd68cfb3359bc xf86-video-siliconmotion-1.7.9.tar.bz2 +sha256 d0f3c691e71108d27a061beb62bf78b36ec35bd755905692734dd68cfb3359bc xf86-video-siliconmotion-1.7.9.tar.bz2 # Locally calculated -sha256 e1e3ce7ce1f63fff96444206e09c8490ad7a4af7457c81ea6cdee4f1fee1f960 COPYING +sha256 e1e3ce7ce1f63fff96444206e09c8490ad7a4af7457c81ea6cdee4f1fee1f960 COPYING diff --git a/package/x11r7/xdriver_xf86-video-sis/Config.in b/package/x11r7/xdriver_xf86-video-sis/Config.in index db01cf2afe3..8e00589a76a 100644 --- a/package/x11r7/xdriver_xf86-video-sis/Config.in +++ b/package/x11r7/xdriver_xf86-video-sis/Config.in @@ -1,10 +1,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SIS bool "xf86-video-sis" - depends on BR2_PACKAGE_MESA3D select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_XORGPROTO help SiS and XGI video driver - -comment "xf86-video-sis needs mesa3d" - depends on !BR2_PACKAGE_MESA3D diff --git a/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.hash b/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.hash index f6709527024..b2215383d6c 100644 --- a/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.hash +++ b/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.hash @@ -1,7 +1,7 @@ # From https://lists.x.org/archives/xorg-announce/2019-December/003033.html md5 b8ec9c21758043b1480f11baec296f5d xf86-video-sis-0.12.0.tar.bz2 -sha1 d22f0d0081e222a62f9e788f5e73246c6d339f80 xf86-video-sis-0.12.0.tar.bz2 -sha256 119d3f17d53c862ec4bf891ed696a6f1d32cdf8bd11d944a9f0ad24625333a5b xf86-video-sis-0.12.0.tar.bz2 -sha512 5aa101e5217f15667f2c94f7a76f4afcf47717b61f5d206ce65efe35dc3f674ca294f98ca8586971c6467f31decdd94d8255ebfc7dc220fac0179afc61995952 xf86-video-sis-0.12.0.tar.bz2 +sha1 d22f0d0081e222a62f9e788f5e73246c6d339f80 xf86-video-sis-0.12.0.tar.bz2 +sha256 119d3f17d53c862ec4bf891ed696a6f1d32cdf8bd11d944a9f0ad24625333a5b xf86-video-sis-0.12.0.tar.bz2 +sha512 5aa101e5217f15667f2c94f7a76f4afcf47717b61f5d206ce65efe35dc3f674ca294f98ca8586971c6467f31decdd94d8255ebfc7dc220fac0179afc61995952 xf86-video-sis-0.12.0.tar.bz2 # Locally computed -sha256 e7958f9497a4daa3ae5aeaf885e4565520af2c540b6e4e04b52bf95d41d56c39 COPYING +sha256 e7958f9497a4daa3ae5aeaf885e4565520af2c540b6e4e04b52bf95d41d56c39 COPYING diff --git a/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk b/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk index f96b0a9d0eb..0417f8ae714 100644 --- a/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk +++ b/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk @@ -11,7 +11,9 @@ XDRIVER_XF86_VIDEO_SIS_LICENSE = MIT XDRIVER_XF86_VIDEO_SIS_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_SIS_DEPENDENCIES = xserver_xorg-server libdrm xorgproto -ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) +ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) +XDRIVER_XF86_VIDEO_SIS_CONF_OPTS += --enable-dri +else XDRIVER_XF86_VIDEO_SIS_CONF_OPTS += --disable-dri endif diff --git a/package/x11r7/xdriver_xf86-video-tdfx/Config.in b/package/x11r7/xdriver_xf86-video-tdfx/Config.in index 959dc31049e..14b8f0ad9ec 100644 --- a/package/x11r7/xdriver_xf86-video-tdfx/Config.in +++ b/package/x11r7/xdriver_xf86-video-tdfx/Config.in @@ -1,10 +1,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_TDFX bool "xf86-video-tdfx" - depends on BR2_PACKAGE_MESA3D select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_XORGPROTO help 3Dfx video driver - -comment "xf86-video-tdfx needs mesa3d" - depends on !BR2_PACKAGE_MESA3D diff --git a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.hash b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.hash index 5e9a88fbde1..9602cb2c7e4 100644 --- a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.hash +++ b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.hash @@ -1,7 +1,7 @@ # From https://lists.x.org/archives/xorg-announce/2019-February/002944.html -md5 4697f0cc69ff1ff90bc770863c158d29 xf86-video-tdfx-1.5.0.tar.bz2 -sha1 8042dd0c2bc5a396b2cfeb5418b03059a089be25 xf86-video-tdfx-1.5.0.tar.bz2 -sha256 2f4580e1f66901dd578d6e1f73df8150fd4b8480eb0c9653d4c5d8e0f8e78561 xf86-video-tdfx-1.5.0.tar.bz2 -sha512 eca3359c7db56183a1cfcce7295e41ccc349005ee1cbcf75209f1e4e8e04e887ba511712ef35efc11c940713c8327b0b8ab8b6c86facf02062b3e84c0b1af5ff xf86-video-tdfx-1.5.0.tar.bz2 +md5 4697f0cc69ff1ff90bc770863c158d29 xf86-video-tdfx-1.5.0.tar.bz2 +sha1 8042dd0c2bc5a396b2cfeb5418b03059a089be25 xf86-video-tdfx-1.5.0.tar.bz2 +sha256 2f4580e1f66901dd578d6e1f73df8150fd4b8480eb0c9653d4c5d8e0f8e78561 xf86-video-tdfx-1.5.0.tar.bz2 +sha512 eca3359c7db56183a1cfcce7295e41ccc349005ee1cbcf75209f1e4e8e04e887ba511712ef35efc11c940713c8327b0b8ab8b6c86facf02062b3e84c0b1af5ff xf86-video-tdfx-1.5.0.tar.bz2 # Locally computed -sha256 5bb3d3baff0b7bbef885215ca9c12a5be1a42c848c96601b699637557fbb41ec COPYING +sha256 5bb3d3baff0b7bbef885215ca9c12a5be1a42c848c96601b699637557fbb41ec COPYING diff --git a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk index 14c40e4d897..e6878768437 100644 --- a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk +++ b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk @@ -15,7 +15,9 @@ XDRIVER_XF86_VIDEO_TDFX_DEPENDENCIES = \ xorgproto \ xserver_xorg-server -ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) +ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) +XDRIVER_XF86_VIDEO_TDFX_CONF_OPTS += --enable-dri +else XDRIVER_XF86_VIDEO_TDFX_CONF_OPTS += --disable-dri endif diff --git a/package/x11r7/xdriver_xf86-video-tga/0001-mibstore.patch b/package/x11r7/xdriver_xf86-video-tga/0001-mibstore.patch deleted file mode 100644 index 07bcd04f25c..00000000000 --- a/package/x11r7/xdriver_xf86-video-tga/0001-mibstore.patch +++ /dev/null @@ -1,47 +0,0 @@ -From b7022db0559cd1b6cd3eb6b5abf6896a607b478d Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Tue, 25 Sep 2012 12:55:00 +0000 -Subject: Remove mibstore.h - -Signed-off-by: Adam Jackson ---- -Fetch from: -http://cgit.freedesktop.org/xorg/driver/xf86-video-tga/commit/?id=b7022db0559cd1b6cd3eb6b5abf6896a607b478d - -Signed-off-by: Bernd Kuhls - -diff --git a/src/tga_accel.c b/src/tga_accel.c -index 35af1a4..b414df5 100644 ---- a/src/tga_accel.c -+++ b/src/tga_accel.c -@@ -37,7 +37,6 @@ - #include "xf86cmap.h" - #include "mipointer.h" - --#include "mibstore.h" - #include "miline.h" - - #include "tga_regs.h" -diff --git a/src/tga_driver.c b/src/tga_driver.c -index dd4f3e6..90d2660 100644 ---- a/src/tga_driver.c -+++ b/src/tga_driver.c -@@ -46,8 +46,6 @@ - - /* software cursor */ - #include "mipointer.h" --/* backing store */ --#include "mibstore.h" - - /* #include "mibank.h" */ - /* colormap manipulation */ -@@ -1451,7 +1449,6 @@ TGAScreenInit(SCREEN_INIT_ARGS_DECL) - - fbPictureInit (pScreen, 0, 0); - -- miInitializeBackingStore(pScreen); - xf86SetBackingStore(pScreen); - xf86SetSilkenMouse(pScreen); - --- -cgit v0.9.0.2-2-gbebe diff --git a/package/x11r7/xdriver_xf86-video-tga/Config.in b/package/x11r7/xdriver_xf86-video-tga/Config.in deleted file mode 100644 index 7c75661accb..00000000000 --- a/package/x11r7/xdriver_xf86-video-tga/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XDRIVER_XF86_VIDEO_TGA - bool "xf86-video-tga" - select BR2_PACKAGE_XORGPROTO - help - X.Org driver for tga cards diff --git a/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.hash b/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.hash deleted file mode 100644 index 4f8c10965c2..00000000000 --- a/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2012-July/002025.html -sha256 2023818000200eb50a59476e36d59b07a361b110e73b1d9cc526beb669306131 xf86-video-tga-1.2.2.tar.bz2 -# Locally calculated -sha256 92e36c6b7c99c8335e5823d53686e58ebd82ee8051a6360f60c8c0fb05745954 COPYING diff --git a/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk b/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk deleted file mode 100644 index 421b09be22e..00000000000 --- a/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xdriver_xf86-video-tga -# -################################################################################ - -XDRIVER_XF86_VIDEO_TGA_VERSION = 1.2.2 -XDRIVER_XF86_VIDEO_TGA_SOURCE = xf86-video-tga-$(XDRIVER_XF86_VIDEO_TGA_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_TGA_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_VIDEO_TGA_LICENSE = MIT -XDRIVER_XF86_VIDEO_TGA_LICENSE_FILES = COPYING -XDRIVER_XF86_VIDEO_TGA_DEPENDENCIES = xserver_xorg-server xorgproto - -$(eval $(autotools-package)) diff --git a/package/x11r7/xdriver_xf86-video-trident/0001-Remove-ramdac.patch b/package/x11r7/xdriver_xf86-video-trident/0001-Remove-ramdac.patch deleted file mode 100644 index 38ca9afebfe..00000000000 --- a/package/x11r7/xdriver_xf86-video-trident/0001-Remove-ramdac.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 07a5c4732f1c28ffcb873ee04500e3cb813c50b4 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 7 Dec 2021 22:28:04 +0100 -Subject: [PATCH] Remove ramdac - -ramdac drivers have been removed from xserver since version 21.0.99.1 -and -https://gitlab.freedesktop.org/xorg/xserver/-/commit/f0385fb420158ac3bc1c4c325431ffc5c62344bb -resulting in the following build failure: - -In file included from trident_bank.c:37: -trident.h:41:10: fatal error: xf86RamDac.h: No such file or directory - 41 | #include "xf86RamDac.h" - | ^~~~~~~~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/c81ac8075af257e8626d9d097270be7a7b4a1496 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.freedesktop.org/xorg/driver/xf86-video-trident/-/merge_requests/1] ---- - src/trident.h | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/src/trident.h b/src/trident.h -index 5cadf52..c82de4c 100644 ---- a/src/trident.h -+++ b/src/trident.h -@@ -38,7 +38,6 @@ - #include "xaa.h" - #endif - #include "xf86fbman.h" --#include "xf86RamDac.h" - #include "compiler.h" - #include "vgaHW.h" - #include "xf86i2c.h" -@@ -103,7 +102,6 @@ typedef struct { - int useEXA; - int Chipset; - int DACtype; -- int RamDac; - int ChipRev; - int HwBpp; - int BppShift; -@@ -169,7 +167,6 @@ typedef struct { - CARD32 BltScanDirection; - CARD32 DrawFlag; - CARD16 LinePattern; -- RamDacRecPtr RamDacRec; - int CursorOffset; - xf86CursorInfoPtr CursorInfoRec; - xf86Int10InfoPtr Int10; --- -2.33.0 - diff --git a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.hash b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.hash index 8f47bac2046..2ef664487ce 100644 --- a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.hash +++ b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.hash @@ -1,4 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2017-January/002762.html -sha256 9e5119d974c3e2221994542d35e3a0b3426a441869ddd6dd08a84f324856ac3f xf86-video-trident-1.3.8.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-February/003326.html +sha256 7f76219ca7d7dc6061aa3c2aa59bc2a63895b8e6217e413ce315949f57b0189b xf86-video-trident-1.4.0.tar.xz +sha512 86f349ccfcf7c704e77a95882f63ac92f55819a3a00388f294777762fed04dde2197dd6124cded9e787af1982fecc43ad4d0af34307845e616a73d5a2ba750b9 xf86-video-trident-1.4.0.tar.xz # Locally calculated -sha256 4f065198c49eac1513b915bc4478152c21119f31a97919a6ea8f3e1d10133d15 COPYING +sha256 4f065198c49eac1513b915bc4478152c21119f31a97919a6ea8f3e1d10133d15 COPYING diff --git a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk index 20ec4bbc24c..53fe150420f 100644 --- a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk +++ b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_TRIDENT_VERSION = 1.3.8 -XDRIVER_XF86_VIDEO_TRIDENT_SOURCE = xf86-video-trident-$(XDRIVER_XF86_VIDEO_TRIDENT_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_TRIDENT_SITE = http://xorg.freedesktop.org/releases/individual/driver +XDRIVER_XF86_VIDEO_TRIDENT_VERSION = 1.4.0 +XDRIVER_XF86_VIDEO_TRIDENT_SOURCE = xf86-video-trident-$(XDRIVER_XF86_VIDEO_TRIDENT_VERSION).tar.xz +XDRIVER_XF86_VIDEO_TRIDENT_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_VIDEO_TRIDENT_LICENSE = MIT XDRIVER_XF86_VIDEO_TRIDENT_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_TRIDENT_DEPENDENCIES = xserver_xorg-server xorgproto diff --git a/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.hash b/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.hash index d179228a748..3e32249f12b 100644 --- a/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.hash +++ b/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2020-September/003060.html -sha256 1f1624f3c73906801ad1bc98335a2cb5676a7a4d18e5374d9a1d18464e54c659 xf86-video-vesa-2.5.0.tar.bz2 -sha512 36fd921f54f33eb25966b5f9ea1e1b3e9009965c012c8b9c676686b472111719921b80cf62dafc746058878253e21f0ef341a2ff2d650df22ca1e35e81716a8b xf86-video-vesa-2.5.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003297.html +sha256 10082771b1a8f659c60b3d9b70456a4b59948a75b3cade2dfa33b8b05e549bb1 xf86-video-vesa-2.6.0.tar.xz +sha512 494e117c1e6e0ce4c66ac7798de54667862c62605bfd76dd9373447d40dcd0521100810c9285cbe9c159440e217954c0cad6d5219c5894e075509c7c0bc353c7 xf86-video-vesa-2.6.0.tar.xz # Locally computed sha256 bda49ba1e860501c20fd444423bc790f6da4f769561b69acc0cbe5abff9409b6 COPYING diff --git a/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk b/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk index b08bab4ec88..8a5a5ebf582 100644 --- a/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk +++ b/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_VESA_VERSION = 2.5.0 -XDRIVER_XF86_VIDEO_VESA_SOURCE = xf86-video-vesa-$(XDRIVER_XF86_VIDEO_VESA_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_VESA_SITE = http://xorg.freedesktop.org/releases/individual/driver +XDRIVER_XF86_VIDEO_VESA_VERSION = 2.6.0 +XDRIVER_XF86_VIDEO_VESA_SOURCE = xf86-video-vesa-$(XDRIVER_XF86_VIDEO_VESA_VERSION).tar.xz +XDRIVER_XF86_VIDEO_VESA_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_VIDEO_VESA_LICENSE = MIT XDRIVER_XF86_VIDEO_VESA_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_VESA_DEPENDENCIES = xserver_xorg-server xorgproto diff --git a/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.hash b/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.hash index f07e0614787..a6415703be0 100644 --- a/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.hash +++ b/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-May/002895.html -md5 08d66d062055080ff699ab4869726ea2 xf86-video-vmware-13.3.0.tar.bz2 -sha1 f01335fe6bdb507e749571bfcd69163aed97312a xf86-video-vmware-13.3.0.tar.bz2 -sha256 47971924659e51666a757269ad941a059ef5afe7a47b5101c174a6022ac4066c xf86-video-vmware-13.3.0.tar.bz2 -sha512 c318de893cae7b2b11e11c1b389ee47478b7c8d1f52c27099dbe453efec28f3e9da449217307a8c2251999eada66312f766996be1a6ead413b8b6dedc42c68ca xf86-video-vmware-13.3.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-January/003315.html +sha256 aed31ee5ed5ecc6e2226705383e7ad06f7602c1376a295305f376b17af3eb81a xf86-video-vmware-13.4.0.tar.xz +sha512 7cacde21a490501dd9c2e9121040274c1f6ef64e6dc0ef49946b400f6297fab73a6e9548e45fe8930cee9028e65e45aaff9ba489dd69ac75a5133114726bf55d xf86-video-vmware-13.4.0.tar.xz # Locally computed -sha256 7e59b8ca2a161855a60561f27ada8dfdbb678733eacdb23423fff6d21f9ad43b COPYING +sha256 7e59b8ca2a161855a60561f27ada8dfdbb678733eacdb23423fff6d21f9ad43b COPYING diff --git a/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk b/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk index 5f0cb77bf88..37c2d67c198 100644 --- a/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk +++ b/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_VMWARE_VERSION = 13.3.0 -XDRIVER_XF86_VIDEO_VMWARE_SOURCE = xf86-video-vmware-$(XDRIVER_XF86_VIDEO_VMWARE_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_VMWARE_SITE = http://xorg.freedesktop.org/releases/individual/driver +XDRIVER_XF86_VIDEO_VMWARE_VERSION = 13.4.0 +XDRIVER_XF86_VIDEO_VMWARE_SOURCE = xf86-video-vmware-$(XDRIVER_XF86_VIDEO_VMWARE_VERSION).tar.xz +XDRIVER_XF86_VIDEO_VMWARE_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_VIDEO_VMWARE_LICENSE = MIT XDRIVER_XF86_VIDEO_VMWARE_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_VMWARE_DEPENDENCIES = mesa3d xserver_xorg-server xorgproto diff --git a/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.hash b/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.hash new file mode 100644 index 00000000000..1220ec6c2fc --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.hash @@ -0,0 +1,5 @@ +# From https://lists.x.org/archives/xorg-announce/2022-December/003298.html +sha256 622973f03ac0bd0c854794ebeac268f15f4f831ec0dbe36e6cfa2b65042af602 xf86-video-voodoo-1.2.6.tar.xz +sha512 c889d79044438d6b15efceda07f63874063a2faa24a86d048e62c8ad1364efdfec04ff7ec662ad0749d2a7263abb14edb74e7d5ebf9a1aa880edb2b341a80a31 xf86-video-voodoo-1.2.6.tar.xz +# Locally computed +sha256 59ed98e3f6c6d0358d75183cf18a295d807acf2c3ea489197dd0a287b6e39bf1 COPYING diff --git a/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk b/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk index d6deaa7974d..33264a0bb70 100644 --- a/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk +++ b/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk @@ -4,11 +4,11 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_VOODOO_VERSION = 9172ae566a0e85313fc80ab62b4455393eefe593 -XDRIVER_XF86_VIDEO_VOODOO_SITE = git://anongit.freedesktop.org/xorg/driver/xf86-video-voodoo +XDRIVER_XF86_VIDEO_VOODOO_VERSION = 1.2.6 +XDRIVER_XF86_VIDEO_VOODOO_SOURCE = xf86-video-voodoo-$(XDRIVER_XF86_VIDEO_VOODOO_VERSION).tar.xz +XDRIVER_XF86_VIDEO_VOODOO_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_VIDEO_VOODOO_LICENSE = MIT XDRIVER_XF86_VIDEO_VOODOO_LICENSE_FILES = COPYING -XDRIVER_XF86_VIDEO_VOODOO_AUTORECONF = YES XDRIVER_XF86_VIDEO_VOODOO_DEPENDENCIES = xserver_xorg-server xorgproto $(eval $(autotools-package)) diff --git a/package/x11r7/xfont_encodings/xfont_encodings.hash b/package/x11r7/xfont_encodings/xfont_encodings.hash index 30dc92760be..80d4a48c406 100644 --- a/package/x11r7/xfont_encodings/xfont_encodings.hash +++ b/package/x11r7/xfont_encodings/xfont_encodings.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-June/002998.html -md5 bbae4f247b88ccde0e85ed6a403da22a encodings-1.0.5.tar.bz2 -sha1 7ffec76dba1cfd5040c5b43ccfae930c83ddf92e encodings-1.0.5.tar.bz2 -sha256 bd96e16143a044b19e87f217cf6a3763a70c561d1076aad6f6d862ec41774a31 encodings-1.0.5.tar.bz2 -sha512 920e49f0b3545f181a1574ca3280ac9adef1e68fe27566c195dd7013f728d355c0d759132789357fcf8fa7391fcbe1e17edf2bd85aa5611df5a4d99740011008 encodings-1.0.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-February/003355.html +sha256 3a39a9f43b16521cdbd9f810090952af4f109b44fa7a865cd555f8febcea70a4 encodings-1.0.7.tar.xz +sha512 dc72982b14e5d89fe1eff1ab11f308796c89255a06337d8cd6bf65757f11dd0a5478b41d844793213db8fe9638389734f148abe9df9fb05027ea563dacde6ba8 encodings-1.0.7.tar.xz # Locally computed -sha256 13b4a0f9431f0fdd6ee36ed386e0b7d1eb429c5cb88df73353896078cbb5a137 COPYING +sha256 13b4a0f9431f0fdd6ee36ed386e0b7d1eb429c5cb88df73353896078cbb5a137 COPYING diff --git a/package/x11r7/xfont_encodings/xfont_encodings.mk b/package/x11r7/xfont_encodings/xfont_encodings.mk index 06d9973813e..7825f4117e1 100644 --- a/package/x11r7/xfont_encodings/xfont_encodings.mk +++ b/package/x11r7/xfont_encodings/xfont_encodings.mk @@ -4,9 +4,9 @@ # ################################################################################ -XFONT_ENCODINGS_VERSION = 1.0.5 -XFONT_ENCODINGS_SOURCE = encodings-$(XFONT_ENCODINGS_VERSION).tar.bz2 -XFONT_ENCODINGS_SITE = https://xorg.freedesktop.org/releases/individual/font +XFONT_ENCODINGS_VERSION = 1.0.7 +XFONT_ENCODINGS_SOURCE = encodings-$(XFONT_ENCODINGS_VERSION).tar.xz +XFONT_ENCODINGS_SITE = https://xorg.freedesktop.org/archive/individual/font XFONT_ENCODINGS_LICENSE = Public Domain XFONT_ENCODINGS_LICENSE_FILES = COPYING diff --git a/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.hash b/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.hash index 05063726bad..c9b01efc7ad 100644 --- a/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.hash +++ b/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.hash @@ -1,4 +1,4 @@ # From http://lists.x.org/archives/xorg-announce/2010-November/001537.html -sha1 f42ebd527096011040a312e0f9cdf78d64177419 font-bh-ttf-1.0.3.tar.bz2 +sha1 f42ebd527096011040a312e0f9cdf78d64177419 font-bh-ttf-1.0.3.tar.bz2 # Locally computed sha256 27d47d50006773f1c0bd97661252ae27bb8cfd6951f253bd9d3ef81ed1243934 COPYING diff --git a/package/x11r7/xfont_font-util/xfont_font-util.hash b/package/x11r7/xfont_font-util/xfont_font-util.hash index 55beba89f38..a7664efec20 100644 --- a/package/x11r7/xfont_font-util/xfont_font-util.hash +++ b/package/x11r7/xfont_font-util/xfont_font-util.hash @@ -1,8 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-August/003019.html -md5 3d6adb76fdd072db8c8fae41b40855e8 font-util-1.3.2.tar.bz2 -sha1 1b36275c174b64a9c16da5c902c91546789a67ef font-util-1.3.2.tar.bz2 -sha256 3ad880444123ac06a7238546fa38a2a6ad7f7e0cc3614de7e103863616522282 font-util-1.3.2.tar.bz2 -sha512 7cac529b12ae71185b89c72c1569b9826f52eeaecc1c76010338e7c42c4078ae339f18220b580bbd68fb5dc09df6ecf169a47c32e6104d8ee53bd443fa21d167 font-util-1.3.2.tar.bz2 - +# From https://lists.x.org/archives/xorg-announce/2022-July/003190.html +sha256 e791c890779c40056ab63aaed5e031bb6e2890a98418ca09c534e6261a2eebd2 font-util-1.3.3.tar.xz +sha512 5e1cb8af44fe0bea72b1a6a4e455f50ca49b7531c2f4b605800c0b2b7578b9826ccf17fa195c505ab1d6339fd4ad697c01ba3b9777616f354ab62b23434d47c9 font-util-1.3.3.tar.xz # Locally calculated -sha256 ce16c3ee6f2a38db6870b66bdb54fce9dcf24acd1161840789e321f6faa1251c COPYING +sha256 ce16c3ee6f2a38db6870b66bdb54fce9dcf24acd1161840789e321f6faa1251c COPYING diff --git a/package/x11r7/xfont_font-util/xfont_font-util.mk b/package/x11r7/xfont_font-util/xfont_font-util.mk index cd2ae81cc36..b864dce23cc 100644 --- a/package/x11r7/xfont_font-util/xfont_font-util.mk +++ b/package/x11r7/xfont_font-util/xfont_font-util.mk @@ -4,9 +4,9 @@ # ################################################################################ -XFONT_FONT_UTIL_VERSION = 1.3.2 -XFONT_FONT_UTIL_SOURCE = font-util-$(XFONT_FONT_UTIL_VERSION).tar.bz2 -XFONT_FONT_UTIL_SITE = http://xorg.freedesktop.org/releases/individual/font +XFONT_FONT_UTIL_VERSION = 1.3.3 +XFONT_FONT_UTIL_SOURCE = font-util-$(XFONT_FONT_UTIL_VERSION).tar.xz +XFONT_FONT_UTIL_SITE = https://xorg.freedesktop.org/releases/individual/font XFONT_FONT_UTIL_LICENSE = MIT/BSD-2-Clause XFONT_FONT_UTIL_LICENSE_FILES = COPYING diff --git a/package/x11r7/xkeyboard-config/xkeyboard-config.hash b/package/x11r7/xkeyboard-config/xkeyboard-config.hash index a5ae7a70397..08e36da1d0c 100644 --- a/package/x11r7/xkeyboard-config/xkeyboard-config.hash +++ b/package/x11r7/xkeyboard-config/xkeyboard-config.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b321d27686ee7e6610ffe7b56e28d5bbf60625a1f595124cd320c0caa717b8ce xkeyboard-config-2.34.tar.bz2 +sha256 eb1383a5ac4b6210d7c7302b9d6fab052abdf51c5d2c9b55f1f779997ba68c6c xkeyboard-config-2.37.tar.xz sha256 6ca90f4b67dced4062894d6d77f4cc39343df9e359fc12f5e5d3c89ef2a3ef6d COPYING diff --git a/package/x11r7/xkeyboard-config/xkeyboard-config.mk b/package/x11r7/xkeyboard-config/xkeyboard-config.mk index fe46dae3b7d..b82c15a23a1 100644 --- a/package/x11r7/xkeyboard-config/xkeyboard-config.mk +++ b/package/x11r7/xkeyboard-config/xkeyboard-config.mk @@ -4,8 +4,8 @@ # ################################################################################ -XKEYBOARD_CONFIG_VERSION = 2.34 -XKEYBOARD_CONFIG_SOURCE = xkeyboard-config-$(XKEYBOARD_CONFIG_VERSION).tar.bz2 +XKEYBOARD_CONFIG_VERSION = 2.37 +XKEYBOARD_CONFIG_SOURCE = xkeyboard-config-$(XKEYBOARD_CONFIG_VERSION).tar.xz XKEYBOARD_CONFIG_SITE = https://www.x.org/releases/individual/data/xkeyboard-config XKEYBOARD_CONFIG_LICENSE = MIT XKEYBOARD_CONFIG_LICENSE_FILES = COPYING @@ -18,6 +18,4 @@ XKEYBOARD_CONFIG_DEPENDENCIES = \ # xkeyboard-config.pc XKEYBOARD_CONFIG_INSTALL_STAGING = YES -XKEYBOARD_CONFIG_CONF_OPTS = --disable-runtime-deps - -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/package/x11r7/xlib_libFS/xlib_libFS.hash b/package/x11r7/xlib_libFS/xlib_libFS.hash index c6f168576a3..6ca152ac4aa 100644 --- a/package/x11r7/xlib_libFS/xlib_libFS.hash +++ b/package/x11r7/xlib_libFS/xlib_libFS.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-March/002970.html -md5 4e1196275aa743d6ebd3d3d5ec1dff9c libFS-1.0.8.tar.bz2 -sha1 70173cc15a7a55defb7b22b00a9387901acad634 libFS-1.0.8.tar.bz2 -sha256 c8e13727149b2ddfe40912027459b2522042e3844c5cd228c3300fe5eef6bd0f libFS-1.0.8.tar.bz2 -sha512 466198ae5c0b83e3579713d86ddfd0b039f5c5b511cf6d5dc0e9664ee2d40aec9e8929445c8e97394d85faf76a7cf2f81bddb13d23de7ce19919e3b1e36ba56f libFS-1.0.8.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-August/003200.html +sha256 597379438b3242ccc7d7b0fc432dc6c844eca0d4a82a7b82518bfeb203fc208a libFS-1.0.9.tar.xz +sha512 7d012e62736c6d567931bad982eec221199d296f0fe41e1e7fde5575b8b928e9a8c644aa8746242bdfe72393635320b58774d9a519285765bd26d633588092b8 libFS-1.0.9.tar.xz # Locally computed -sha256 5386724e7475b89394dd836b954a6688f875efab99e43e8eb7e8775f5b99a341 COPYING +sha256 5386724e7475b89394dd836b954a6688f875efab99e43e8eb7e8775f5b99a341 COPYING diff --git a/package/x11r7/xlib_libFS/xlib_libFS.mk b/package/x11r7/xlib_libFS/xlib_libFS.mk index 9d9aecb74fe..0fbf453ca44 100644 --- a/package/x11r7/xlib_libFS/xlib_libFS.mk +++ b/package/x11r7/xlib_libFS/xlib_libFS.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBFS_VERSION = 1.0.8 -XLIB_LIBFS_SOURCE = libFS-$(XLIB_LIBFS_VERSION).tar.bz2 -XLIB_LIBFS_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBFS_VERSION = 1.0.9 +XLIB_LIBFS_SOURCE = libFS-$(XLIB_LIBFS_VERSION).tar.xz +XLIB_LIBFS_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBFS_LICENSE = MIT XLIB_LIBFS_LICENSE_FILES = COPYING XLIB_LIBFS_CPE_ID_VENDOR = x diff --git a/package/x11r7/xlib_libICE/xlib_libICE.hash b/package/x11r7/xlib_libICE/xlib_libICE.hash index 426ada32a44..4a58f976989 100644 --- a/package/x11r7/xlib_libICE/xlib_libICE.hash +++ b/package/x11r7/xlib_libICE/xlib_libICE.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-July/003006.html -md5 76d77499ee7120a56566891ca2c0dbcf libICE-1.0.10.tar.bz2 -sha1 5b5eb125d4f43a3ab8153b0f850963ee6c982c24 libICE-1.0.10.tar.bz2 -sha256 6f86dce12cf4bcaf5c37dddd8b1b64ed2ddf1ef7b218f22b9942595fb747c348 libICE-1.0.10.tar.bz2 -sha512 2f1ef2c32c833c71894a08fa7e7ed53f301f6c7bd22485d71c12884d8e8b36b99f362ec886349dcc84d08edc81c8b2cea035320831d64974edeba021b433c468 libICE-1.0.10.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003288.html +sha256 03e77afaf72942c7ac02ccebb19034e6e20f456dcf8dddadfeb572aa5ad3e451 libICE-1.1.1.tar.xz +sha512 2f7833a25f31cc743ca95cb88f9a8403b50e19ffb5bf43bfef87ba405857d359789daaa9ec2391351237d958f16d35dbf082adb76d301e46d3a54162a6b452d3 libICE-1.1.1.tar.xz # Locally computed -sha256 60105b7ea93cb07a67fee8443b092b727e3db7f0dff4fbe05bc6cd7747fb53c8 COPYING +sha256 60105b7ea93cb07a67fee8443b092b727e3db7f0dff4fbe05bc6cd7747fb53c8 COPYING diff --git a/package/x11r7/xlib_libICE/xlib_libICE.mk b/package/x11r7/xlib_libICE/xlib_libICE.mk index 2b56aaab984..d92e81c0ab8 100644 --- a/package/x11r7/xlib_libICE/xlib_libICE.mk +++ b/package/x11r7/xlib_libICE/xlib_libICE.mk @@ -4,8 +4,8 @@ # ################################################################################ -XLIB_LIBICE_VERSION = 1.0.10 -XLIB_LIBICE_SOURCE = libICE-$(XLIB_LIBICE_VERSION).tar.bz2 +XLIB_LIBICE_VERSION = 1.1.1 +XLIB_LIBICE_SOURCE = libICE-$(XLIB_LIBICE_VERSION).tar.xz XLIB_LIBICE_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBICE_LICENSE = MIT XLIB_LIBICE_LICENSE_FILES = COPYING diff --git a/package/x11r7/xlib_libSM/xlib_libSM.hash b/package/x11r7/xlib_libSM/xlib_libSM.hash index 1653dc6d76b..3068c85b93d 100644 --- a/package/x11r7/xlib_libSM/xlib_libSM.hash +++ b/package/x11r7/xlib_libSM/xlib_libSM.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-October/002922.html -md5 87c7fad1c1813517979184c8ccd76628 libSM-1.2.3.tar.bz2 -sha1 437d7b13fa2eba325df3a106f177df46ccec6546 libSM-1.2.3.tar.bz2 -sha256 2d264499dcb05f56438dee12a1b4b71d76736ce7ba7aa6efbf15ebb113769cbb libSM-1.2.3.tar.bz2 -sha512 74c42e27029db78475e62025b4711dbac5e22d2f8e8a24be98a1c31b03c0fc4afe859928f851800ea0b76854f12147900dc4f27bbfd3d8ea45daaaf24b70a903 libSM-1.2.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003307.html +sha256 fdcbe51e4d1276b1183da77a8a4e74a137ca203e0bcfb20972dd5f3347e97b84 libSM-1.2.4.tar.xz +sha512 7f1d41b7b6c5dd456c49ccad7740c3ba9791a2793fa50fd94814a4164ce2e20c4a0a0ad42a87708e494ed5c23f611be6d3ccd9ef1e9add6d46ac545e2b0f6f86 libSM-1.2.4.tar.xz # Locally computed -sha256 af7926a14d85ad367622688636e8c9c6f7807c8a6867536af1c530b5c262bfba COPYING +sha256 af7926a14d85ad367622688636e8c9c6f7807c8a6867536af1c530b5c262bfba COPYING diff --git a/package/x11r7/xlib_libSM/xlib_libSM.mk b/package/x11r7/xlib_libSM/xlib_libSM.mk index 708224e2d19..8e5c90127af 100644 --- a/package/x11r7/xlib_libSM/xlib_libSM.mk +++ b/package/x11r7/xlib_libSM/xlib_libSM.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBSM_VERSION = 1.2.3 -XLIB_LIBSM_SOURCE = libSM-$(XLIB_LIBSM_VERSION).tar.bz2 -XLIB_LIBSM_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBSM_VERSION = 1.2.4 +XLIB_LIBSM_SOURCE = libSM-$(XLIB_LIBSM_VERSION).tar.xz +XLIB_LIBSM_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBSM_LICENSE = MIT XLIB_LIBSM_LICENSE_FILES = COPYING XLIB_LIBSM_INSTALL_STAGING = YES diff --git a/package/x11r7/xlib_libX11/xlib_libX11.hash b/package/x11r7/xlib_libX11/xlib_libX11.hash index 126be07f031..f443d947a47 100644 --- a/package/x11r7/xlib_libX11/xlib_libX11.hash +++ b/package/x11r7/xlib_libX11/xlib_libX11.hash @@ -1,6 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2021-December/003121.html -sha256 2ffd417266fb875028fdc0ef349694f63dbcd76d0b0cfacfb52e6151f4b60989 libX11-1.7.3.1.tar.xz -sha512 a2620076db4bf35ab94706c8ab714e9c3fecbdd533cf99cdffeabaf49a1a1d30a233eb2dc76da51b01d50c43f11780aa3b2936668d982a33fa7d5008be44e25b libX11-1.7.3.1.tar.xz - +# From https://lists.x.org/archives/xorg-announce/2023-June/003407.html +sha256 59535b7cc6989ba806a022f7e8533b28c4397b9d86e9d07b6df0c0703fa25cc9 libX11-1.8.6.tar.xz +sha512 b94a578003078a42cea43d80fae2c54a3aaa30f706088bb3546331e9abfc180131cafb37887117abcc5b6116992e299974981eef96ecfcf883cc8a1aba4d1ade libX11-1.8.6.tar.xz # Locally computed -sha256 2daec087a88e7c9b8082557cdeebad5bbb8155a4137472f0b22e269cd99d0c1e COPYING +sha256 2e7012a140f000735a7172674a2d314398d79622444fba65d108b029b29ab283 COPYING diff --git a/package/x11r7/xlib_libX11/xlib_libX11.mk b/package/x11r7/xlib_libX11/xlib_libX11.mk index a8dc7f3668d..75199f1a3d6 100644 --- a/package/x11r7/xlib_libX11/xlib_libX11.mk +++ b/package/x11r7/xlib_libX11/xlib_libX11.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBX11_VERSION = 1.7.3.1 +XLIB_LIBX11_VERSION = 1.8.6 XLIB_LIBX11_SOURCE = libX11-$(XLIB_LIBX11_VERSION).tar.xz XLIB_LIBX11_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBX11_LICENSE = MIT diff --git a/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.hash b/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.hash index 266840114f5..a32997e1fef 100644 --- a/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.hash +++ b/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-July/002906.html -md5 eeea9d5af3e6c143d0ea1721d27a5e49 libXScrnSaver-1.2.3.tar.bz2 -sha1 70c791c5755a298ecf1a0823e239a24fa4b2b42f libXScrnSaver-1.2.3.tar.bz2 -sha256 f917075a1b7b5a38d67a8b0238eaab14acd2557679835b154cf2bca576e89bf8 libXScrnSaver-1.2.3.tar.bz2 -sha512 7ea628324a11b25ee82c7b11c6bf98f37de219354de51c1e29467b5de422669ba1ab121f3b9dc674093c8f3960e93c5d5428122f5539092f79bc8451c768354a libXScrnSaver-1.2.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003279.html +sha256 75cd2859f38e207a090cac980d76bc71e9da99d48d09703584e00585abc920fe libXScrnSaver-1.2.4.tar.xz +sha512 e4395af85f8496618afb23ffdaca1a75f5e3d213478d8dc73249cbc9840d7b993ba7513dbf6015cb38b48fe3f2223496365158a148dd5e1ac7475c5ee569e28c libXScrnSaver-1.2.4.tar.xz # Locally computed -sha256 5cf3e16f5dd753a4c0853e8227134ab65f5562d9ef89b1a2d7681f5c8ac9feb5 COPYING +sha256 5cf3e16f5dd753a4c0853e8227134ab65f5562d9ef89b1a2d7681f5c8ac9feb5 COPYING diff --git a/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk b/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk index 92abb902ebe..55ae7a6801c 100644 --- a/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk +++ b/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXSCRNSAVER_VERSION = 1.2.3 -XLIB_LIBXSCRNSAVER_SOURCE = libXScrnSaver-$(XLIB_LIBXSCRNSAVER_VERSION).tar.bz2 -XLIB_LIBXSCRNSAVER_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXSCRNSAVER_VERSION = 1.2.4 +XLIB_LIBXSCRNSAVER_SOURCE = libXScrnSaver-$(XLIB_LIBXSCRNSAVER_VERSION).tar.xz +XLIB_LIBXSCRNSAVER_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXSCRNSAVER_LICENSE = MIT XLIB_LIBXSCRNSAVER_LICENSE_FILES = COPYING XLIB_LIBXSCRNSAVER_INSTALL_STAGING = YES diff --git a/package/x11r7/xlib_libXau/xlib_libXau.hash b/package/x11r7/xlib_libXau/xlib_libXau.hash index a78d7f0fead..8d2a6ff43c5 100644 --- a/package/x11r7/xlib_libXau/xlib_libXau.hash +++ b/package/x11r7/xlib_libXau/xlib_libXau.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-February/002942.html -md5 c5f16288f2da9f071b29111d68797480 libXau-1.0.9.tar.bz2 -sha1 ef9b1ad00f958c8b6e30a1bbc11fdfac311c9733 libXau-1.0.9.tar.bz2 -sha256 ccf8cbf0dbf676faa2ea0a6d64bcc3b6746064722b606c8c52917ed00dcb73ec libXau-1.0.9.tar.bz2 -sha512 3ca454ba466a807ea28b0f715066d73dc76ad312697b121d43e4d5766215052e9b7ffb8fe3ed3e496fa3f2a13f164ac692ff85cc428e26731b679f0f06a1d562 libXau-1.0.9.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003284.html +sha256 f3fa3282f5570c3f6bd620244438dbfbdd580fc80f02f549587a0f8ab329bbeb libXau-1.0.11.tar.xz +sha512 f56abba3bef3fdd4739dfa69367a4251b5fab7c89194c9aece9efa66b9ebbf0736690cc9bd654aab19d9db377e4b9a5268c9c020b3d293bb5351bff5fe75a4dd libXau-1.0.11.tar.xz # Locally computed -sha256 56abe29bb1d9806a9e04fa9f80fed2c0f18027594df3f098148d814aef6bddfa COPYING +sha256 56abe29bb1d9806a9e04fa9f80fed2c0f18027594df3f098148d814aef6bddfa COPYING diff --git a/package/x11r7/xlib_libXau/xlib_libXau.mk b/package/x11r7/xlib_libXau/xlib_libXau.mk index bac10818f1c..0e9f79d38d5 100644 --- a/package/x11r7/xlib_libXau/xlib_libXau.mk +++ b/package/x11r7/xlib_libXau/xlib_libXau.mk @@ -4,8 +4,8 @@ # ################################################################################ -XLIB_LIBXAU_VERSION = 1.0.9 -XLIB_LIBXAU_SOURCE = libXau-$(XLIB_LIBXAU_VERSION).tar.bz2 +XLIB_LIBXAU_VERSION = 1.0.11 +XLIB_LIBXAU_SOURCE = libXau-$(XLIB_LIBXAU_VERSION).tar.xz XLIB_LIBXAU_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXAU_LICENSE = MIT XLIB_LIBXAU_LICENSE_FILES = COPYING diff --git a/package/x11r7/xlib_libXaw/xlib_libXaw.hash b/package/x11r7/xlib_libXaw/xlib_libXaw.hash index f289e661530..ce2ec4a3e15 100644 --- a/package/x11r7/xlib_libXaw/xlib_libXaw.hash +++ b/package/x11r7/xlib_libXaw/xlib_libXaw.hash @@ -1,6 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2021-March/003077.html -sha256 76aef98ea3df92615faec28004b5ce4e5c6855e716fa16de40c32030722a6f8e libXaw-1.0.14.tar.bz2 -sha512 29d1c151369523ae6cb418e636b0b7b39ccccc35462a0b394dbeb46d5b6d780badd2eb872a55d9fbba1ee1af034e76c0463f40f8d8a7be2c336d08b3b1bf81d4 libXaw-1.0.14.tar.bz2 - +# From https://lists.x.org/archives/xorg-announce/2023-March/003372.html +sha256 ab35f70fde9fb02cc71b342f654846a74328b74cb3a0703c02d20eddb212754a libXaw-1.0.15.tar.xz +sha512 8edbf280b7b24b9040c291545053c1251d6af7e7f56da43a6065a1848245863eb52bdfc28c2f18dbb6597a4064394a44f4df5d8596a1a467549ccc9ce50a7821 libXaw-1.0.15.tar.xz # Locally calculated sha256 9f5adb26952f93b3e4650285b94ec6c61a27aab5a21088bfb6694001be1b360d COPYING diff --git a/package/x11r7/xlib_libXaw/xlib_libXaw.mk b/package/x11r7/xlib_libXaw/xlib_libXaw.mk index 6b615a8de5e..f81a7b4a889 100644 --- a/package/x11r7/xlib_libXaw/xlib_libXaw.mk +++ b/package/x11r7/xlib_libXaw/xlib_libXaw.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXAW_VERSION = 1.0.14 -XLIB_LIBXAW_SOURCE = libXaw-$(XLIB_LIBXAW_VERSION).tar.bz2 -XLIB_LIBXAW_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXAW_VERSION = 1.0.15 +XLIB_LIBXAW_SOURCE = libXaw-$(XLIB_LIBXAW_VERSION).tar.xz +XLIB_LIBXAW_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXAW_LICENSE = MIT XLIB_LIBXAW_LICENSE_FILES = COPYING XLIB_LIBXAW_INSTALL_STAGING = YES diff --git a/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.hash b/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.hash index 37e9c72117b..62b5ea92765 100644 --- a/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.hash +++ b/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-March/002971.html -md5 3fa0841ea89024719b20cd702a9b54e0 libXcomposite-0.4.5.tar.bz2 -sha1 902631efb55a798c81086e5ff90b60349839db40 libXcomposite-0.4.5.tar.bz2 -sha256 b3218a2c15bab8035d16810df5b8251ffc7132ff3aa70651a1fba0bfe9634e8f libXcomposite-0.4.5.tar.bz2 -sha512 502fd51fd9097bb3ca72174ac5b25b9d3b1ff240d32c4765199df03d89337d94b4ddea49e90b177b370862430089d966ce9c38988337156352cfeae911c2d3d5 libXcomposite-0.4.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003276.html +sha256 fe40bcf0ae1a09070eba24088a5eb9810efe57453779ec1e20a55080c6dc2c87 libXcomposite-0.4.6.tar.xz +sha512 f35a0da8f9f22fd788eee01209557fe3a1b1abdc9744f76330ba42b21b6e3af5464ca4451c33415856417c30da5aa5624e3707980c644327249bfeda5a62a59b libXcomposite-0.4.6.tar.xz # Locally computed -sha256 efa0219ed8485ac555c1a3fb82daf34539b2e0dcf4dadc99c01f1e39c69a4a68 COPYING +sha256 efa0219ed8485ac555c1a3fb82daf34539b2e0dcf4dadc99c01f1e39c69a4a68 COPYING diff --git a/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk b/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk index 80e94fe37ca..c296ee6c6ce 100644 --- a/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk +++ b/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXCOMPOSITE_VERSION = 0.4.5 -XLIB_LIBXCOMPOSITE_SOURCE = libXcomposite-$(XLIB_LIBXCOMPOSITE_VERSION).tar.bz2 -XLIB_LIBXCOMPOSITE_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXCOMPOSITE_VERSION = 0.4.6 +XLIB_LIBXCOMPOSITE_SOURCE = libXcomposite-$(XLIB_LIBXCOMPOSITE_VERSION).tar.xz +XLIB_LIBXCOMPOSITE_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXCOMPOSITE_LICENSE = MIT XLIB_LIBXCOMPOSITE_LICENSE_FILES = COPYING XLIB_LIBXCOMPOSITE_INSTALL_STAGING = YES diff --git a/package/x11r7/xlib_libXcursor/xlib_libXcursor.hash b/package/x11r7/xlib_libXcursor/xlib_libXcursor.hash index 3a12253d40c..11575edbf50 100644 --- a/package/x11r7/xlib_libXcursor/xlib_libXcursor.hash +++ b/package/x11r7/xlib_libXcursor/xlib_libXcursor.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-March/002972.html -md5 9b9be0e289130fb820aedf67705fc549 libXcursor-1.2.0.tar.bz2 -sha1 cca0b34955d3c2f657f05a2a2c40f75353ddd912 libXcursor-1.2.0.tar.bz2 -sha256 3ad3e9f8251094af6fe8cb4afcf63e28df504d46bfa5a5529db74a505d628782 libXcursor-1.2.0.tar.bz2 -sha512 2b12d0fd17e311ce269dbba58588698885815eb07aa44d48525ed5cd9e5f379bb90138a792a191e2f74888ab10b3ca9a4f507f21de0984ed79748973ab927a03 libXcursor-1.2.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-April/003136.html +sha256 46c143731610bafd2070159a844571b287ac26192537d047a39df06155492104 libXcursor-1.2.1.tar.xz +sha512 ebb42a39855aab86d0c11fe6ad33d011cf56a6dc5c309bef643460319c03df239b7e09fe88777bb25c0e9ff8aceac6bf66e51cc04a2d5ee463b3bc3bbf1674e3 libXcursor-1.2.1.tar.xz # Locally computed -sha256 1f1588aff23eec0cb6bb9cfe02f8a75abbe43faf3d9b1eff54b7fbc42774b3ad COPYING +sha256 ad2e9d279088c5d612fb0e506ea8bb7d9f01b411e7f4b97b64589c3cd48a68f1 COPYING diff --git a/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk b/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk index 79d99040109..4a1ffcce9e0 100644 --- a/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk +++ b/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk @@ -4,8 +4,8 @@ # ################################################################################ -XLIB_LIBXCURSOR_VERSION = 1.2.0 -XLIB_LIBXCURSOR_SOURCE = libXcursor-$(XLIB_LIBXCURSOR_VERSION).tar.bz2 +XLIB_LIBXCURSOR_VERSION = 1.2.1 +XLIB_LIBXCURSOR_SOURCE = libXcursor-$(XLIB_LIBXCURSOR_VERSION).tar.xz XLIB_LIBXCURSOR_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXCURSOR_LICENSE = MIT XLIB_LIBXCURSOR_LICENSE_FILES = COPYING diff --git a/package/x11r7/xlib_libXdamage/xlib_libXdamage.hash b/package/x11r7/xlib_libXdamage/xlib_libXdamage.hash index 120d3e026aa..41a809ad233 100644 --- a/package/x11r7/xlib_libXdamage/xlib_libXdamage.hash +++ b/package/x11r7/xlib_libXdamage/xlib_libXdamage.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-March/002973.html -md5 e3f554267a7a04b042dc1f6352bd6d99 libXdamage-1.1.5.tar.bz2 -sha1 719ae6ab8c1b972c6386b654976c479255af5572 libXdamage-1.1.5.tar.bz2 -sha256 b734068643cac3b5f3d2c8279dd366b5bf28c7219d9e9d8717e1383995e0ea45 libXdamage-1.1.5.tar.bz2 -sha512 a3ca6cc33b1727f717a3e2aa5593f660508a81a47918a0aa949e9e8fba105e303fe5071983b48caac92feea0fe6e8e01620805e4d19b41f21f20d837b191c124 libXdamage-1.1.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003277.html +sha256 52733c1f5262fca35f64e7d5060c6fcd81a880ba8e1e65c9621cf0727afb5d11 libXdamage-1.1.6.tar.xz +sha512 624dcefa1c79064569df952892f7f1351dc19ad338ce73d1a57041e406cb3e18abe531bab352b93d1f0f5c9b5c6b2652cc84a8f1fbfcbba648343812695a8acb libXdamage-1.1.6.tar.xz # Locally computed -sha256 33effe928634be12e668465c3935c5570ff2787b970b15d9243d69df42302c57 COPYING +sha256 33effe928634be12e668465c3935c5570ff2787b970b15d9243d69df42302c57 COPYING diff --git a/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk b/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk index cc5493ff6c4..dba0862211a 100644 --- a/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk +++ b/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXDAMAGE_VERSION = 1.1.5 -XLIB_LIBXDAMAGE_SOURCE = libXdamage-$(XLIB_LIBXDAMAGE_VERSION).tar.bz2 -XLIB_LIBXDAMAGE_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXDAMAGE_VERSION = 1.1.6 +XLIB_LIBXDAMAGE_SOURCE = libXdamage-$(XLIB_LIBXDAMAGE_VERSION).tar.xz +XLIB_LIBXDAMAGE_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXDAMAGE_LICENSE = MIT XLIB_LIBXDAMAGE_LICENSE_FILES = COPYING XLIB_LIBXDAMAGE_INSTALL_STAGING = YES diff --git a/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.hash b/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.hash index 0dbea635f23..83609413fdb 100644 --- a/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.hash +++ b/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-March/002974.html -md5 115c5c12ecce0e749cd91d999a5fd160 libXdmcp-1.1.3.tar.bz2 -sha1 0a8f8a274f829331efb1e8e2027c38631b204dd0 libXdmcp-1.1.3.tar.bz2 -sha256 20523b44aaa513e17c009e873ad7bbc301507a3224c232610ce2e099011c6529 libXdmcp-1.1.3.tar.bz2 -sha512 cb1d4650f97d66e73acd2465ec7d757b9b797cce2f85e301860a44997a461837eea845ec9bd5b639ec5ca34c804f8bdd870697a5ce3f4e270b687c9ef74f25ec libXdmcp-1.1.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-November/003260.html +sha256 2dce5cc317f8f0b484ec347d87d81d552cdbebb178bd13c5d8193b6b7cd6ad00 libXdmcp-1.1.4.tar.xz +sha512 83b384d43bfb034c395f83f97d1c6e73aa3d5faa8f8756b08e697c0b9c3c87189651b51e8213fbd1f5f9cbc2d8136cbf143627481744345d78cfe0ff2ad074a9 libXdmcp-1.1.4.tar.xz # Locally computed -sha256 8a3c3f35b0dbcb60a4e242b9e4394a352a65bb27deb2938ea1e2e62a626e16e9 COPYING +sha256 8a3c3f35b0dbcb60a4e242b9e4394a352a65bb27deb2938ea1e2e62a626e16e9 COPYING diff --git a/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk b/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk index 51db9908e5f..a79e2615dba 100644 --- a/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk +++ b/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXDMCP_VERSION = 1.1.3 -XLIB_LIBXDMCP_SOURCE = libXdmcp-$(XLIB_LIBXDMCP_VERSION).tar.bz2 -XLIB_LIBXDMCP_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXDMCP_VERSION = 1.1.4 +XLIB_LIBXDMCP_SOURCE = libXdmcp-$(XLIB_LIBXDMCP_VERSION).tar.xz +XLIB_LIBXDMCP_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXDMCP_LICENSE = MIT XLIB_LIBXDMCP_LICENSE_FILES = COPYING XLIB_LIBXDMCP_CPE_ID_VENDOR = x.org diff --git a/package/x11r7/xlib_libXext/xlib_libXext.hash b/package/x11r7/xlib_libXext/xlib_libXext.hash index 45810d5d148..2ab509598bc 100644 --- a/package/x11r7/xlib_libXext/xlib_libXext.hash +++ b/package/x11r7/xlib_libXext/xlib_libXext.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-March/002975.html -md5 f5b48bb76ba327cd2a8dc7a383532a95 libXext-1.3.4.tar.bz2 -sha1 14e2451162e8766173b5b14c73e94a22b1fcab55 libXext-1.3.4.tar.bz2 -sha256 59ad6fcce98deaecc14d39a672cf218ca37aba617c9a0f691cac3bcd28edf82b libXext-1.3.4.tar.bz2 -sha512 09146397d95f80c04701be1cc0a9c580ab5a085842ac31d17dfb6d4c2e42b4253b89cba695e54444e520be359883a76ffd02f42484c9e2ba2c33a5a40c29df4a libXext-1.3.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003241.html +sha256 db14c0c895c57ea33a8559de8cb2b93dc76c42ea4a39e294d175938a133d7bca libXext-1.3.5.tar.xz +sha512 fd9805982dabfb14b1526c0cb71f94508003fa3fcd60560d387465afd891c1dca61927ae86278436d53f4b840cacd1f412071fdc3dce1d6f730610a9c163d59b libXext-1.3.5.tar.xz # Locally computed -sha256 80767ac915f2f0f94de9efb15f0197a59b6f1e609cae85059f8703272dc3e146 COPYING +sha256 fd62910be4b13829d94e76c1447cf840953f0e225c4dc6c79349c84dd0557f22 COPYING diff --git a/package/x11r7/xlib_libXext/xlib_libXext.mk b/package/x11r7/xlib_libXext/xlib_libXext.mk index 6002e59e0dd..0bb3efa31ff 100644 --- a/package/x11r7/xlib_libXext/xlib_libXext.mk +++ b/package/x11r7/xlib_libXext/xlib_libXext.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXEXT_VERSION = 1.3.4 -XLIB_LIBXEXT_SOURCE = libXext-$(XLIB_LIBXEXT_VERSION).tar.bz2 -XLIB_LIBXEXT_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXEXT_VERSION = 1.3.5 +XLIB_LIBXEXT_SOURCE = libXext-$(XLIB_LIBXEXT_VERSION).tar.xz +XLIB_LIBXEXT_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXEXT_LICENSE = MIT XLIB_LIBXEXT_LICENSE_FILES = COPYING XLIB_LIBXEXT_CPE_ID_VENDOR = x diff --git a/package/x11r7/xlib_libXfixes/xlib_libXfixes.hash b/package/x11r7/xlib_libXfixes/xlib_libXfixes.hash index f40c5229038..03de9062453 100644 --- a/package/x11r7/xlib_libXfixes/xlib_libXfixes.hash +++ b/package/x11r7/xlib_libXfixes/xlib_libXfixes.hash @@ -1,6 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2021-May/003086.html -sha256 a7c1a24da53e0b46cac5aea79094b4b2257321c621b258729bc3139149245b4c libXfixes-6.0.0.tar.bz2 -sha512 1985ef156f382e9a7e1cc7e044e0f626de1e4c82557a511cbcf6431994c0ac25b1f8b3a0293bd3089331593db8ce01d3a71ddec68f19b5fe6029d5082fb6885d libXfixes-6.0.0.tar.bz2 - +# From https://lists.x.org/archives/xorg-announce/2023-April/003382.html +sha256 b695f93cd2499421ab02d22744458e650ccc88c1d4c8130d60200213abc02d58 libXfixes-6.0.1.tar.xz +sha512 b46deffb30cd73ec8a127390d99f2ba2f3ab78f334fdba227f1f461441644a0c169b0d13ffa47576fa458780e7a6db664ff8b93e9195fb217262efd8128f1ffe libXfixes-6.0.1.tar.xz # Locally calculated -sha256 d64e671ffeb483d4543f98c842788ab34c77427e27d83d6b082065a4438d4885 COPYING +sha256 a07d8a5a6972638a745a03983207a1052881c24eea29021fdca7794bea8d7774 COPYING diff --git a/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk b/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk index c0229b57d2e..3f535fc1d49 100644 --- a/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk +++ b/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXFIXES_VERSION = 6.0.0 -XLIB_LIBXFIXES_SOURCE = libXfixes-$(XLIB_LIBXFIXES_VERSION).tar.bz2 -XLIB_LIBXFIXES_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXFIXES_VERSION = 6.0.1 +XLIB_LIBXFIXES_SOURCE = libXfixes-$(XLIB_LIBXFIXES_VERSION).tar.xz +XLIB_LIBXFIXES_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXFIXES_LICENSE = MIT XLIB_LIBXFIXES_LICENSE_FILES = COPYING XLIB_LIBXFIXES_CPE_ID_VENDOR = x diff --git a/package/x11r7/xlib_libXfont/xlib_libXfont.hash b/package/x11r7/xlib_libXfont/xlib_libXfont.hash index 455d99ff3ff..72a58e4d7a4 100644 --- a/package/x11r7/xlib_libXfont/xlib_libXfont.hash +++ b/package/x11r7/xlib_libXfont/xlib_libXfont.hash @@ -1,8 +1,8 @@ # From https://lists.x.org/archives/xorg-announce/2017-November/002825.html md5 16eaf156edd79b68038b6a7c44aa9e9b libXfont-1.5.4.tar.bz2 -sha1 9db050f63b9c4cb19e0dbb40575558ccb95719ca libXfont-1.5.4.tar.bz2 -sha256 1a7f7490774c87f2052d146d1e0e64518d32e6848184a18654e8d0bb57883242 libXfont-1.5.4.tar.bz2 -sha512 864edbaff45c44bd92bc4b06275c73fdf584a9b88bc523a297d4c75c01ca253f438463e929af70d753ddecfa648bb0b9bcf0ec72267db9f2b1704f7afa906cb3 libXfont-1.5.4.tar.bz2 +sha1 9db050f63b9c4cb19e0dbb40575558ccb95719ca libXfont-1.5.4.tar.bz2 +sha256 1a7f7490774c87f2052d146d1e0e64518d32e6848184a18654e8d0bb57883242 libXfont-1.5.4.tar.bz2 +sha512 864edbaff45c44bd92bc4b06275c73fdf584a9b88bc523a297d4c75c01ca253f438463e929af70d753ddecfa648bb0b9bcf0ec72267db9f2b1704f7afa906cb3 libXfont-1.5.4.tar.bz2 # Locally calculated -sha256 97e413bb4962bbb5773085cd5405502bf1d4eadeaf98ff5be015eacacc840462 COPYING +sha256 97e413bb4962bbb5773085cd5405502bf1d4eadeaf98ff5be015eacacc840462 COPYING diff --git a/package/x11r7/xlib_libXfont2/xlib_libXfont2.hash b/package/x11r7/xlib_libXfont2/xlib_libXfont2.hash index 069f2fc616c..f2ae5925f83 100644 --- a/package/x11r7/xlib_libXfont2/xlib_libXfont2.hash +++ b/package/x11r7/xlib_libXfont2/xlib_libXfont2.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2021-August/003103.html -sha256 aa7c6f211cf7215c0ab4819ed893dc98034363d7b930b844bb43603c2e10b53e libXfont2-2.0.5.tar.bz2 -sha512 64d0635d14676bb645d61932afb177eb3808a46525b26e7ee31abc975eca75207743e85523fdd82b08010ce124eb4802338b508ee7b126875d2a3c12f8ac4faa libXfont2-2.0.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-August/003203.html +sha256 74ca20017eb0fb3f56d8d5e60685f560fc85e5ff3d84c61c4cb891e40c27aef4 libXfont2-2.0.6.tar.xz +sha512 24d6baeef8dc2ca2730925c6b790a97f4a3f46ea7b4d908555e7df29cee6e27b63d638b50c88dd30c853cecff7d9b079402cb617f4498f96410c5770b8815cbd libXfont2-2.0.6.tar.xz # Locally calculated sha256 97e413bb4962bbb5773085cd5405502bf1d4eadeaf98ff5be015eacacc840462 COPYING diff --git a/package/x11r7/xlib_libXfont2/xlib_libXfont2.mk b/package/x11r7/xlib_libXfont2/xlib_libXfont2.mk index 6a71761f4ee..7f90f670460 100644 --- a/package/x11r7/xlib_libXfont2/xlib_libXfont2.mk +++ b/package/x11r7/xlib_libXfont2/xlib_libXfont2.mk @@ -4,16 +4,14 @@ # ################################################################################ -XLIB_LIBXFONT2_VERSION = 2.0.5 -XLIB_LIBXFONT2_SOURCE = libXfont2-$(XLIB_LIBXFONT2_VERSION).tar.bz2 +XLIB_LIBXFONT2_VERSION = 2.0.6 +XLIB_LIBXFONT2_SOURCE = libXfont2-$(XLIB_LIBXFONT2_VERSION).tar.xz XLIB_LIBXFONT2_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXFONT2_LICENSE = MIT XLIB_LIBXFONT2_LICENSE_FILES = COPYING XLIB_LIBXFONT2_CPE_ID_VENDOR = x XLIB_LIBXFONT2_CPE_ID_PRODUCT = libxfont XLIB_LIBXFONT2_INSTALL_STAGING = YES -# 0001-configure-define-HAVE_LIBBSD-when-libbsd-was-found.patch -XLIB_LIBXFONT2_AUTORECONF = YES XLIB_LIBXFONT2_DEPENDENCIES = \ freetype \ xlib_libfontenc \ diff --git a/package/x11r7/xlib_libXft/xlib_libXft.hash b/package/x11r7/xlib_libXft/xlib_libXft.hash index 8743a9b7d1c..749aa0ad620 100644 --- a/package/x11r7/xlib_libXft/xlib_libXft.hash +++ b/package/x11r7/xlib_libXft/xlib_libXft.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2021-August/003104.html -sha256 57dedaab20914002146bdae0cb0c769ba3f75214c4c91bd2613d6ef79fc9abdd libXft-2.3.4.tar.bz2 -sha512 5bb019750982ed4643880efd7368bc226ad49cfa8c0c8c6d4614dfeed74f588c65e1ba69adcc12284ec07d841e5b58fc1c27f3fddf83fe1a2837b29dd9ecec51 libXft-2.3.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-April/003384.html +sha256 5e8c3c4bc2d4c0a40aef6b4b38ed2fb74301640da29f6528154b5009b1c6dd49 libXft-2.3.8.tar.xz +sha512 fc385d73e1acb701942c154ffb5a283d17891f21d3ac598c4a3fb375a7d6082734593062368c15cad67c1a94177dd15deed878ec5ea852188393b52e92c372c8 libXft-2.3.8.tar.xz # Locally computed sha256 7cda22286b1379b9b73df695f72cbad36595e65b039a5fbc5c89b69ecc44438c COPYING diff --git a/package/x11r7/xlib_libXft/xlib_libXft.mk b/package/x11r7/xlib_libXft/xlib_libXft.mk index b1640a6613a..154c220aa11 100644 --- a/package/x11r7/xlib_libXft/xlib_libXft.mk +++ b/package/x11r7/xlib_libXft/xlib_libXft.mk @@ -4,8 +4,8 @@ # ################################################################################ -XLIB_LIBXFT_VERSION = 2.3.4 -XLIB_LIBXFT_SOURCE = libXft-$(XLIB_LIBXFT_VERSION).tar.bz2 +XLIB_LIBXFT_VERSION = 2.3.8 +XLIB_LIBXFT_SOURCE = libXft-$(XLIB_LIBXFT_VERSION).tar.xz XLIB_LIBXFT_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXFT_LICENSE = MIT XLIB_LIBXFT_LICENSE_FILES = COPYING diff --git a/package/x11r7/xlib_libXi/xlib_libXi.hash b/package/x11r7/xlib_libXi/xlib_libXi.hash index a86ef13225f..545d4881f6a 100644 --- a/package/x11r7/xlib_libXi/xlib_libXi.hash +++ b/package/x11r7/xlib_libXi/xlib_libXi.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2021-September/003109.html -sha256 2ed181446a61c7337576467870bc5336fc9e222a281122d96c4d39a3298bba00 libXi-1.8.tar.bz2 -sha512 4b2c667a8466eb389f253d77285c3f506c4a2b6c75054c722974a864565d565cc0c5701f8ea773eb929ceb94adfeb737ecd7a0bfc2c240157416a5f343c07aba libXi-1.8.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-May/003390.html +sha256 89bfc0e814f288f784202e6e5f9b362b788ccecdeb078670145eacd8749656a7 libXi-1.8.1.tar.xz +sha512 a30b1a07e6d710f5196e7477415d68074736f89d954e8f2d5ccc9b5f349e7d1d440c90fb512508176b5db5ecad55608cfb540872936b731963fd83343db3a0b9 libXi-1.8.1.tar.xz # Locally computed sha256 9392174bc86e291369fd2f61f3ed325962735a5f5c585ce8d7ebd365e2a5639f COPYING diff --git a/package/x11r7/xlib_libXi/xlib_libXi.mk b/package/x11r7/xlib_libXi/xlib_libXi.mk index b4802cf018c..6ae5ec8be83 100644 --- a/package/x11r7/xlib_libXi/xlib_libXi.mk +++ b/package/x11r7/xlib_libXi/xlib_libXi.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXI_VERSION = 1.8 -XLIB_LIBXI_SOURCE = libXi-$(XLIB_LIBXI_VERSION).tar.bz2 -XLIB_LIBXI_SITE = https://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXI_VERSION = 1.8.1 +XLIB_LIBXI_SOURCE = libXi-$(XLIB_LIBXI_VERSION).tar.xz +XLIB_LIBXI_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXI_LICENSE = MIT XLIB_LIBXI_LICENSE_FILES = COPYING XLIB_LIBXI_CPE_ID_VENDOR = x.org diff --git a/package/x11r7/xlib_libXinerama/xlib_libXinerama.hash b/package/x11r7/xlib_libXinerama/xlib_libXinerama.hash index 995181dd166..e3ac880b39b 100644 --- a/package/x11r7/xlib_libXinerama/xlib_libXinerama.hash +++ b/package/x11r7/xlib_libXinerama/xlib_libXinerama.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-July/002905.html -md5 0d5f826a197dae74da67af4a9ef35885 libXinerama-1.1.4.tar.bz2 -sha1 34a1d9908ffbd46805d2357c6b05f5e341a8dc7c libXinerama-1.1.4.tar.bz2 -sha256 0008dbd7ecf717e1e507eed1856ab0d9cf946d03201b85d5dcf61489bb02d720 libXinerama-1.1.4.tar.bz2 -sha512 cff777ad942614fbf6bc6d8529f399e62debf3ecbf6cc0694a94e38c022bf929ffd5636fb59f55533c394d89b23af3ea51fa5128927f12a85787e16239330f14 libXinerama-1.1.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003244.html +sha256 5094d1f0fcc1828cb1696d0d39d9e866ae32520c54d01f618f1a3c1e30c2085c libXinerama-1.1.5.tar.xz +sha512 735b5320de4782005b379e409bf2f976131c17d496b297d33a0e127ca1443034778586b6b25c077b2ad73a4ab34d440d7510475e0041f38202bb40f15fb08ff7 libXinerama-1.1.5.tar.xz # Locally computed -sha256 f661fd883b6e980b3b118e0fbe230fbf10eef8d4d4a35931355f29ed647ddbe3 COPYING +sha256 f661fd883b6e980b3b118e0fbe230fbf10eef8d4d4a35931355f29ed647ddbe3 COPYING diff --git a/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk b/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk index 48e32d55e29..67e3398c712 100644 --- a/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk +++ b/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXINERAMA_VERSION = 1.1.4 -XLIB_LIBXINERAMA_SOURCE = libXinerama-$(XLIB_LIBXINERAMA_VERSION).tar.bz2 -XLIB_LIBXINERAMA_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXINERAMA_VERSION = 1.1.5 +XLIB_LIBXINERAMA_SOURCE = libXinerama-$(XLIB_LIBXINERAMA_VERSION).tar.xz +XLIB_LIBXINERAMA_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXINERAMA_LICENSE = MIT XLIB_LIBXINERAMA_LICENSE_FILES = COPYING XLIB_LIBXINERAMA_CPE_ID_VENDOR = x diff --git a/package/x11r7/xlib_libXmu/xlib_libXmu.hash b/package/x11r7/xlib_libXmu/xlib_libXmu.hash index 8cad2389bc4..58d35451561 100644 --- a/package/x11r7/xlib_libXmu/xlib_libXmu.hash +++ b/package/x11r7/xlib_libXmu/xlib_libXmu.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-March/002978.html -md5 ac774cff8b493f566088a255dbf91201 libXmu-1.1.3.tar.bz2 -sha1 7ff54ce38379fb795aebed38f6be404ee0dfeec6 libXmu-1.1.3.tar.bz2 -sha256 9c343225e7c3dc0904f2122b562278da5fed639b1b5e880d25111561bac5b731 libXmu-1.1.3.tar.bz2 -sha512 8c6cc65b22aa031ad870dd92736681a068a0878a425a53dbed909943da1136c4a24034d467cfd3785c3a8d78f66850b69f1ebe1eb24aaf9bc176b1d171a5c762 libXmu-1.1.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-October/003224.html +sha256 210de3ab9c3e9382572c25d17c2518a854ce6e2c62c5f8315deac7579e758244 libXmu-1.1.4.tar.xz +sha512 3cf90cb3ff380aafefbb39297bdd95b9e1e6d6618cecb53ff09faf38f9b9c54599d28367f07a9ec77a20214c6c3e661b8d0a12b38082556790a79a59942039c1 libXmu-1.1.4.tar.xz # Locally computed -sha256 e65a4a8bbf8b0dfd2439d6bc6d86df03e2b8e693b757593b25149e099aeb8ec4 COPYING +sha256 8f0f2ca7a05cfd10bf9e307a272182de7cb52d7a603feaf17b9943c2c9a4838e COPYING diff --git a/package/x11r7/xlib_libXmu/xlib_libXmu.mk b/package/x11r7/xlib_libXmu/xlib_libXmu.mk index 3218e0ec39c..051968059b4 100644 --- a/package/x11r7/xlib_libXmu/xlib_libXmu.mk +++ b/package/x11r7/xlib_libXmu/xlib_libXmu.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXMU_VERSION = 1.1.3 -XLIB_LIBXMU_SOURCE = libXmu-$(XLIB_LIBXMU_VERSION).tar.bz2 -XLIB_LIBXMU_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXMU_VERSION = 1.1.4 +XLIB_LIBXMU_SOURCE = libXmu-$(XLIB_LIBXMU_VERSION).tar.xz +XLIB_LIBXMU_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXMU_LICENSE = MIT XLIB_LIBXMU_LICENSE_FILES = COPYING XLIB_LIBXMU_INSTALL_STAGING = YES diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.hash b/package/x11r7/xlib_libXpm/xlib_libXpm.hash index c3aa695c561..a041f0d440d 100644 --- a/package/x11r7/xlib_libXpm/xlib_libXpm.hash +++ b/package/x11r7/xlib_libXpm/xlib_libXpm.hash @@ -1,8 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2019-December/003034.html -md5 6f0ecf8d103d528cfc803aa475137afa libXpm-3.5.13.tar.bz2 -sha1 38b1a2728adb49f4e255aba1530f51789815ffc4 libXpm-3.5.13.tar.bz2 -sha256 9cd1da57588b6cb71450eff2273ef6b657537a9ac4d02d0014228845b935ac25 libXpm-3.5.13.tar.bz2 -sha512 3b8f6e926272f39b1d95135c2274c00f5aaee1f9fb2ef79f71628df5edeb7ba20158819ef6a778101cc4092493a3b5b613c53634fdccadcc0fc85f0605e5e9a5 libXpm-3.5.13.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-April/003385.html +sha256 e6bc5da7a69dbd9bcc67e87c93d4904fe2f5177a0711c56e71fa2f6eff649f51 libXpm-3.5.16.tar.xz +sha512 ee564311f8c1c9c08ed1035d55c287ecf7c20c6fee09ad448acfab59f38fd1ef381d4a24b4af2b581f3033730eebc7c690918e52ba706de689d1ef11085edac2 libXpm-3.5.16.tar.xz # Locally calculated -sha256 ed3b06bb3b75a0954bd6837a96b41a4676f60dfeee647271613aadecc0fd596e COPYING -sha256 cbe4ced0abc8a32bea471204ae01038c202758ce4e772d3d329a341ffa761e71 COPYRIGHT +sha256 a80d706759624a04aa90fd62bc644a360fc3d72e08dcbfb129f167c11ca285de COPYING +sha256 cbe4ced0abc8a32bea471204ae01038c202758ce4e772d3d329a341ffa761e71 COPYRIGHT diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.mk b/package/x11r7/xlib_libXpm/xlib_libXpm.mk index 7b645dc9e66..51f62833701 100644 --- a/package/x11r7/xlib_libXpm/xlib_libXpm.mk +++ b/package/x11r7/xlib_libXpm/xlib_libXpm.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXPM_VERSION = 3.5.13 -XLIB_LIBXPM_SOURCE = libXpm-$(XLIB_LIBXPM_VERSION).tar.bz2 -XLIB_LIBXPM_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXPM_VERSION = 3.5.16 +XLIB_LIBXPM_SOURCE = libXpm-$(XLIB_LIBXPM_VERSION).tar.xz +XLIB_LIBXPM_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXPM_LICENSE = MIT XLIB_LIBXPM_LICENSE_FILES = COPYING COPYRIGHT XLIB_LIBXPM_CPE_ID_VENDOR = libxpm_project @@ -16,6 +16,7 @@ XLIB_LIBXPM_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xorgproto \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) \ $(TARGET_NLS_DEPENDENCIES) XLIB_LIBXPM_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) +XLIB_LIBXPM_CONF_OPTS = --disable-open-zfile ifeq ($(BR2_SYSTEM_ENABLE_NLS),) XLIB_LIBXPM_CONF_ENV += ac_cv_search_gettext=no diff --git a/package/x11r7/xlib_libXrandr/xlib_libXrandr.hash b/package/x11r7/xlib_libXrandr/xlib_libXrandr.hash index ed536695375..3d3bb640edb 100644 --- a/package/x11r7/xlib_libXrandr/xlib_libXrandr.hash +++ b/package/x11r7/xlib_libXrandr/xlib_libXrandr.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-March/002979.html -md5 18f3b20d522f45e4dadd34afb5bea048 libXrandr-1.5.2.tar.bz2 -sha1 7a1f6df239341b76fd59ebbe101d6f180adb43bb libXrandr-1.5.2.tar.bz2 -sha256 8aea0ebe403d62330bb741ed595b53741acf45033d3bda1792f1d4cc3daee023 libXrandr-1.5.2.tar.bz2 -sha512 fcd005f9839e7ef980607128a5d76d7b671cc2f5755949e03c569c500d7e987cb3f6932750ab8bf6e2c1086ec69dde09d5831f0c2098b9f9ad46be4f56db0d87 libXrandr-1.5.2.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-November/003262.html +sha256 897639014a78e1497704d669c5dd5682d721931a4452c89a7ba62676064eb428 libXrandr-1.5.3.tar.xz +sha512 0c385fc304a872048ffca5cfb8789dfe3132e3126894d54b2fe642dff19d286e7ade1d2f6da894e03788df9c5cf31427c674e987143037b7d385b19285590edb libXrandr-1.5.3.tar.xz # Locally computed -sha256 73777e5be1cef2827d843e4b186803f050c66db472cf8076d88e2b5f71696e67 COPYING +sha256 73777e5be1cef2827d843e4b186803f050c66db472cf8076d88e2b5f71696e67 COPYING diff --git a/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk b/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk index aa2761330ad..5e88173ed7b 100644 --- a/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk +++ b/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXRANDR_VERSION = 1.5.2 -XLIB_LIBXRANDR_SOURCE = libXrandr-$(XLIB_LIBXRANDR_VERSION).tar.bz2 -XLIB_LIBXRANDR_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXRANDR_VERSION = 1.5.3 +XLIB_LIBXRANDR_SOURCE = libXrandr-$(XLIB_LIBXRANDR_VERSION).tar.xz +XLIB_LIBXRANDR_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXRANDR_LICENSE = MIT XLIB_LIBXRANDR_LICENSE_FILES = COPYING XLIB_LIBXRANDR_CPE_ID_VENDOR = x.org diff --git a/package/x11r7/xlib_libXrender/xlib_libXrender.hash b/package/x11r7/xlib_libXrender/xlib_libXrender.hash index 96981ad502e..015fa0af21f 100644 --- a/package/x11r7/xlib_libXrender/xlib_libXrender.hash +++ b/package/x11r7/xlib_libXrender/xlib_libXrender.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2016-October/002725.html -sha256 c06d5979f86e64cabbde57c223938db0b939dff49fdb5a793a1d3d0396650949 libXrender-0.9.10.tar.bz2 - +# From https://lists.x.org/archives/xorg-announce/2022-October/003239.html +sha256 bc53759a3a83d1ff702fb59641b3d2f7c56e05051fa0cfa93501166fa782dc24 libXrender-0.9.11.tar.xz +sha512 2327cc1b530382d81df29b8d579f801f1f990202107cc84506986bcf5d15010d414e9418987b200e3f222d188afce46f0d7754febcdca62a5fc1e541b3bb82de libXrender-0.9.11.tar.xz # Locally calculated -sha256 bbe1db89c48816c48248796adac91defd8fbde1141b145f01511781ab87f29a1 COPYING +sha256 bbe1db89c48816c48248796adac91defd8fbde1141b145f01511781ab87f29a1 COPYING diff --git a/package/x11r7/xlib_libXrender/xlib_libXrender.mk b/package/x11r7/xlib_libXrender/xlib_libXrender.mk index 0ef0ec48d92..fd97c83cf6a 100644 --- a/package/x11r7/xlib_libXrender/xlib_libXrender.mk +++ b/package/x11r7/xlib_libXrender/xlib_libXrender.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXRENDER_VERSION = 0.9.10 -XLIB_LIBXRENDER_SOURCE = libXrender-$(XLIB_LIBXRENDER_VERSION).tar.bz2 -XLIB_LIBXRENDER_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXRENDER_VERSION = 0.9.11 +XLIB_LIBXRENDER_SOURCE = libXrender-$(XLIB_LIBXRENDER_VERSION).tar.xz +XLIB_LIBXRENDER_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXRENDER_LICENSE = MIT XLIB_LIBXRENDER_LICENSE_FILES = COPYING XLIB_LIBXRENDER_CPE_ID_VENDOR = x.org diff --git a/package/x11r7/xlib_libXres/xlib_libXres.hash b/package/x11r7/xlib_libXres/xlib_libXres.hash index 700590ad8cb..2e6d3d5c556 100644 --- a/package/x11r7/xlib_libXres/xlib_libXres.hash +++ b/package/x11r7/xlib_libXres/xlib_libXres.hash @@ -1,6 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2021-March/003078.html -sha256 b6e6fb1ebb61610e56017edd928fb89a5f53b3f4f990078309877468663b2b11 libXres-1.2.1.tar.bz2 -sha512 c17d28406e17e305dc4976f095e88059735f5bd8c600adf2e556523c9e0dd7fa01dcbf7a9d28a642e77e49a5b30f54bb9b2fc34bfbedce467ee2a020bba5cdf1 libXres-1.2.1.tar.bz2 - +# From https://lists.x.org/archives/xorg-announce/2022-December/003278.html +sha256 9a7446f3484b9b7538ac5ee30d2c1ce9e5b7fbbaf1440e02f6cca186a1fa745f libXres-1.2.2.tar.xz +sha512 897f2d426ea6f41169a5a52c356d1a1cb2ffb9144ae41b9fedd06455c3d81042930fe55be269ce4b8545ee65fcfe168101192a599053d810e8810f627c94f810 libXres-1.2.2.tar.xz # Locally calculated sha256 0d7300168f85833ea2564835f66a61e036ede90b33e76c06a7b4078096fedbcc COPYING diff --git a/package/x11r7/xlib_libXres/xlib_libXres.mk b/package/x11r7/xlib_libXres/xlib_libXres.mk index de3637a04ae..25498090fec 100644 --- a/package/x11r7/xlib_libXres/xlib_libXres.mk +++ b/package/x11r7/xlib_libXres/xlib_libXres.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXRES_VERSION = 1.2.1 -XLIB_LIBXRES_SOURCE = libXres-$(XLIB_LIBXRES_VERSION).tar.bz2 -XLIB_LIBXRES_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXRES_VERSION = 1.2.2 +XLIB_LIBXRES_SOURCE = libXres-$(XLIB_LIBXRES_VERSION).tar.xz +XLIB_LIBXRES_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXRES_LICENSE = MIT XLIB_LIBXRES_LICENSE_FILES = COPYING XLIB_LIBXRES_CPE_ID_VENDOR = x diff --git a/package/x11r7/xlib_libXt/xlib_libXt.hash b/package/x11r7/xlib_libXt/xlib_libXt.hash index dcd4853d76c..40512f35401 100644 --- a/package/x11r7/xlib_libXt/xlib_libXt.hash +++ b/package/x11r7/xlib_libXt/xlib_libXt.hash @@ -2,4 +2,4 @@ sha256 679cc08f1646dbd27f5e48ffe8dd49406102937109130caab02ca32c083a3d60 libXt-1.2.1.tar.bz2 sha512 6877af61ba91eeed6b6f80471b84f354ad0ec0827249c7ee0a00c13508063fe8d2696dd400a4bdbc6ca2ff67cbe1317ad5ac24522fd96099dc56535e33ca052c libXt-1.2.1.tar.bz2 # Locally calculated -sha256 a2866ccc0b1745149e4a2258d934314d40cbb43bd8318c6fa597f233995b0a81 COPYING +sha256 a2866ccc0b1745149e4a2258d934314d40cbb43bd8318c6fa597f233995b0a81 COPYING diff --git a/package/x11r7/xlib_libXtst/xlib_libXtst.hash b/package/x11r7/xlib_libXtst/xlib_libXtst.hash index f64a0185677..7bdcdb9c171 100644 --- a/package/x11r7/xlib_libXtst/xlib_libXtst.hash +++ b/package/x11r7/xlib_libXtst/xlib_libXtst.hash @@ -1,4 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2016-October/002726.html -sha256 4655498a1b8e844e3d6f21f3b2c4e2b571effb5fd83199d428a6ba7ea4bf5204 libXtst-1.2.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-September/003214.html +sha256 84f5f30b9254b4ffee14b5b0940e2622153b0d3aed8286a3c5b7eeb340ca33c8 libXtst-1.2.4.tar.xz +sha512 f2f4e01239b892b8e26284cede90feb4fe7738beb243bca0f6adb349029f8bf87b5a482911edcd2401733c92ef78eec07fcd455b92e5b8c4828374769e60098d libXtst-1.2.4.tar.xz # Locally computed sha256 940190489c7a0e5ae3d83fc4fcbd79e0cd1b765bf1a4efd408293c1ee0332ceb COPYING diff --git a/package/x11r7/xlib_libXtst/xlib_libXtst.mk b/package/x11r7/xlib_libXtst/xlib_libXtst.mk index c79301e064c..47103377aab 100644 --- a/package/x11r7/xlib_libXtst/xlib_libXtst.mk +++ b/package/x11r7/xlib_libXtst/xlib_libXtst.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXTST_VERSION = 1.2.3 -XLIB_LIBXTST_SOURCE = libXtst-$(XLIB_LIBXTST_VERSION).tar.bz2 -XLIB_LIBXTST_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXTST_VERSION = 1.2.4 +XLIB_LIBXTST_SOURCE = libXtst-$(XLIB_LIBXTST_VERSION).tar.xz +XLIB_LIBXTST_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXTST_LICENSE = MIT XLIB_LIBXTST_LICENSE_FILES = COPYING XLIB_LIBXTST_INSTALL_STAGING = YES diff --git a/package/x11r7/xlib_libXv/xlib_libXv.hash b/package/x11r7/xlib_libXv/xlib_libXv.hash index ccc67270171..0852f27f8b1 100644 --- a/package/x11r7/xlib_libXv/xlib_libXv.hash +++ b/package/x11r7/xlib_libXv/xlib_libXv.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2016-October/002727.html -sha256 d26c13eac99ac4504c532e8e76a1c8e4bd526471eb8a0a4ff2a88db60cb0b088 libXv-1.0.11.tar.bz2 - +# From https://lists.x.org/archives/xorg-announce/2022-December/003280.html +sha256 aaf7fa09f689f7a2000fe493c0d64d1487a1210db154053e9e2336b860c63848 libXv-1.0.12.tar.xz +sha512 bdd00de1ce6a8911056181ab4de32f9e319a68567389162d4bc2e3c9946d5f3c60f87eb6c53f74c9b6a342255e591d5fef4a445a4ac8ca3c1b6fe87d42c51c1e libXv-1.0.12.tar.xz # Locally calculated -sha256 4fac4d581d00f11c459d68b7cb970f3d4e5a5bbfb53784d85f59a90076280301 COPYING +sha256 4fac4d581d00f11c459d68b7cb970f3d4e5a5bbfb53784d85f59a90076280301 COPYING diff --git a/package/x11r7/xlib_libXv/xlib_libXv.mk b/package/x11r7/xlib_libXv/xlib_libXv.mk index 1105b5925d2..808b1e6e7bc 100644 --- a/package/x11r7/xlib_libXv/xlib_libXv.mk +++ b/package/x11r7/xlib_libXv/xlib_libXv.mk @@ -4,8 +4,8 @@ # ################################################################################ -XLIB_LIBXV_VERSION = 1.0.11 -XLIB_LIBXV_SOURCE = libXv-$(XLIB_LIBXV_VERSION).tar.bz2 +XLIB_LIBXV_VERSION = 1.0.12 +XLIB_LIBXV_SOURCE = libXv-$(XLIB_LIBXV_VERSION).tar.xz XLIB_LIBXV_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXV_LICENSE = ISC-like XLIB_LIBXV_LICENSE_FILES = COPYING diff --git a/package/x11r7/xlib_libXvMC/xlib_libXvMC.hash b/package/x11r7/xlib_libXvMC/xlib_libXvMC.hash index be4ba751aad..15221969e32 100644 --- a/package/x11r7/xlib_libXvMC/xlib_libXvMC.hash +++ b/package/x11r7/xlib_libXvMC/xlib_libXvMC.hash @@ -1,8 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-September/003023.html -md5 3569ff7f3e26864d986d6a21147eaa58 libXvMC-1.0.12.tar.bz2 -sha1 4871f92a83faa86aff5c630a2d6016c67bf11b97 libXvMC-1.0.12.tar.bz2 -sha256 6b3da7977b3f7eaf4f0ac6470ab1e562298d82c4e79077765787963ab7966dcd libXvMC-1.0.12.tar.bz2 -sha512 62cb9a72b20af3b081d2d555a253b0e2b8b26b31f4fad10bd3e53bbf96e1663b61bd8df2b78b16f18218cd37cce0c9e6809ae16ded226b37a8b199e41b223955 libXvMC-1.0.12.tar.bz2 - +# From https://lists.x.org/archives/xorg-announce/2022-March/003132.html +sha256 0a9ebe6dea7888a747e5aca1b891d53cd7d3a5f141a9645f77d9b6a12cee657c libXvMC-1.0.13.tar.xz +sha512 c9d0f73884a586efb9ea4f77fc8555f60d940077d7dff8eaa765b86345c8b4e3d80b860f68191d2830c272b9e464c08450fbb51bb64819753a6f4228c71861ac libXvMC-1.0.13.tar.xz # Locally computed -sha256 b7c709df281675a07eb60a71c5fa2599d1ef538eb79ae7ad6e774b10e4a804c4 COPYING +sha256 b7c709df281675a07eb60a71c5fa2599d1ef538eb79ae7ad6e774b10e4a804c4 COPYING diff --git a/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk b/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk index 7980f174931..c1fe31277e1 100644 --- a/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk +++ b/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk @@ -4,8 +4,8 @@ # ################################################################################ -XLIB_LIBXVMC_VERSION = 1.0.12 -XLIB_LIBXVMC_SOURCE = libXvMC-$(XLIB_LIBXVMC_VERSION).tar.bz2 +XLIB_LIBXVMC_VERSION = 1.0.13 +XLIB_LIBXVMC_SOURCE = libXvMC-$(XLIB_LIBXVMC_VERSION).tar.xz XLIB_LIBXVMC_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXVMC_LICENSE = MIT XLIB_LIBXVMC_LICENSE_FILES = COPYING diff --git a/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.hash b/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.hash index f0172c346c4..9057d4e8e25 100644 --- a/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.hash +++ b/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-March/002982.html -md5 0ddeafc13b33086357cfa96fae41ee8e libXxf86dga-1.1.5.tar.bz2 -sha1 332ba80d1b3d06473f7bbfe1612e7c5b58fbdf69 libXxf86dga-1.1.5.tar.bz2 -sha256 2b98bc5f506c6140d4eddd3990842d30f5dae733b64f198a504f07461bdb7203 libXxf86dga-1.1.5.tar.bz2 -sha512 0e77c4003aeba737b10c17d55aeefa935fc57c4ba9e8f79a834f3f8c690d6a1d98f69ad707eded784346c1cf40c41829719d257283b5eae3207147fb4c79ed89 libXxf86dga-1.1.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003281.html +sha256 be44427579808fe3a217d59f51cae756a26913eb6e4c8738ccab65ff56d7980f libXxf86dga-1.1.6.tar.xz +sha512 61f7954471df63840ffb5e82347018e285d30d64d4d0a97770ca031c8554a0f52d1b007ab8342a283cd2f0d534f564fb59f57ec92515714f20a7d145912c65d9 libXxf86dga-1.1.6.tar.xz # Locally computed -sha256 dd27933ebc5c063128b158b085e4c442a36b0e6f704cf753116da119610191da COPYING +sha256 dd27933ebc5c063128b158b085e4c442a36b0e6f704cf753116da119610191da COPYING diff --git a/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk b/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk index a5173fbc7cf..1094e1a1ad1 100644 --- a/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk +++ b/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk @@ -4,8 +4,8 @@ # ################################################################################ -XLIB_LIBXXF86DGA_VERSION = 1.1.5 -XLIB_LIBXXF86DGA_SOURCE = libXxf86dga-$(XLIB_LIBXXF86DGA_VERSION).tar.bz2 +XLIB_LIBXXF86DGA_VERSION = 1.1.6 +XLIB_LIBXXF86DGA_SOURCE = libXxf86dga-$(XLIB_LIBXXF86DGA_VERSION).tar.xz XLIB_LIBXXF86DGA_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXXF86DGA_LICENSE = MIT XLIB_LIBXXF86DGA_LICENSE_FILES = COPYING diff --git a/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.hash b/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.hash index b55c55c84df..d181310c69c 100644 --- a/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.hash +++ b/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.hash @@ -1,6 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2015-February/002539.html -sha1 78ef18ca2be157131899e01c62679e247409a13f libXxf86vm-1.1.4.tar.bz2 -sha256 afee27f93c5f31c0ad582852c0fb36d50e4de7cd585fcf655e278a633d85cd57 libXxf86vm-1.1.4.tar.bz2 - +# From https://lists.x.org/archives/xorg-announce/2022-September/003213.html +sha256 247fef48b3e0e7e67129e41f1e789e8d006ba47dba1c0cdce684b9b703f888e7 libXxf86vm-1.1.5.tar.xz +sha512 68226fcb9773a583ea417ab413146203dd7db6ff8a4d388285da972353355e11e179861a77c9fa284aefac025bb3bbf5a9537fa0bf246c782e0116a667c9d9b6 libXxf86vm-1.1.5.tar.xz # Locally calculated -sha256 f3da8eaed19e27e4f67e6f076d4ebdb8d649e15a8ad33a415fb65a23de1b6689 COPYING +sha256 f3da8eaed19e27e4f67e6f076d4ebdb8d649e15a8ad33a415fb65a23de1b6689 COPYING diff --git a/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk b/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk index 8871bd507ef..0f3decb04e1 100644 --- a/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk +++ b/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXXF86VM_VERSION = 1.1.4 -XLIB_LIBXXF86VM_SOURCE = libXxf86vm-$(XLIB_LIBXXF86VM_VERSION).tar.bz2 -XLIB_LIBXXF86VM_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXXF86VM_VERSION = 1.1.5 +XLIB_LIBXXF86VM_SOURCE = libXxf86vm-$(XLIB_LIBXXF86VM_VERSION).tar.xz +XLIB_LIBXXF86VM_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXXF86VM_LICENSE = MIT XLIB_LIBXXF86VM_LICENSE_FILES = COPYING XLIB_LIBXXF86VM_CPE_ID_VENDOR = x diff --git a/package/x11r7/xlib_libdmx/xlib_libdmx.hash b/package/x11r7/xlib_libdmx/xlib_libdmx.hash index 1090e3c2d59..e9d8616ba45 100644 --- a/package/x11r7/xlib_libdmx/xlib_libdmx.hash +++ b/package/x11r7/xlib_libdmx/xlib_libdmx.hash @@ -1,7 +1,7 @@ # From https://lists.x.org/archives/xorg-announce/2018-May/002894.html -md5 d2f1f0ec68ac3932dd7f1d9aa0a7a11c libdmx-1.1.4.tar.bz2 -sha1 499e2540ca0e94ca858037865243c3c60908fd94 libdmx-1.1.4.tar.bz2 -sha256 253f90005d134fa7a209fbcbc5a3024335367c930adf0f3203e754cf32747243 libdmx-1.1.4.tar.bz2 -sha512 77aba6cadfd17db0cc7e1bc26f14d908223a0fdb135d46f86c3be34e3bc7e2f843f08d4d0ef773357e83b17122bffe56a0442d12908378c05a22177b10ae10e9 libdmx-1.1.4.tar.bz2 +md5 d2f1f0ec68ac3932dd7f1d9aa0a7a11c libdmx-1.1.4.tar.bz2 +sha1 499e2540ca0e94ca858037865243c3c60908fd94 libdmx-1.1.4.tar.bz2 +sha256 253f90005d134fa7a209fbcbc5a3024335367c930adf0f3203e754cf32747243 libdmx-1.1.4.tar.bz2 +sha512 77aba6cadfd17db0cc7e1bc26f14d908223a0fdb135d46f86c3be34e3bc7e2f843f08d4d0ef773357e83b17122bffe56a0442d12908378c05a22177b10ae10e9 libdmx-1.1.4.tar.bz2 # Locally computed -sha256 819e8dcd3dd2a44850c350331aa492230f86bccb0983dd739dec5ba36d7d2b8e COPYING +sha256 819e8dcd3dd2a44850c350331aa492230f86bccb0983dd739dec5ba36d7d2b8e COPYING diff --git a/package/x11r7/xlib_libfontenc/xlib_libfontenc.hash b/package/x11r7/xlib_libfontenc/xlib_libfontenc.hash index de05fd27dda..a061ca4a4bd 100644 --- a/package/x11r7/xlib_libfontenc/xlib_libfontenc.hash +++ b/package/x11r7/xlib_libfontenc/xlib_libfontenc.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-February/002956.html -md5 6447db6a689fb530c218f0f8328c3abc libfontenc-1.1.4.tar.bz2 -sha1 d4f232b0b07487b984e13422ce4130b61a8b9edb libfontenc-1.1.4.tar.bz2 -sha256 2cfcce810ddd48f2e5dc658d28c1808e86dcf303eaff16728b9aa3dbc0092079 libfontenc-1.1.4.tar.bz2 -sha512 76fa851d00113241f15fdd5b5bb7e927b8d8b9a82ce3fcb0678b8c7e32cb5e8d898c4bda1d60dafb7748145049d3240627ac34a2360c64e98a7a912ea7c30582 libfontenc-1.1.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003285.html +sha256 c0d36991faee06551ddbaf5d99266e97becdc05edfae87a833c3ff7bf73cfec2 libfontenc-1.1.7.tar.xz +sha512 fd8578a81090fa938dd75ad9081ab62c6c54fa2535d1c6291afd799ac8dc7c344a43f07cea5cd4433af16df0d926c22e7c169877bc8b13d92584e7dec173d701 libfontenc-1.1.7.tar.xz # Locally computed -sha256 a4dda7a643b517794bfa23dc9605da030055df38ac8a5b9e1905e690975a59c4 COPYING +sha256 a4dda7a643b517794bfa23dc9605da030055df38ac8a5b9e1905e690975a59c4 COPYING diff --git a/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk b/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk index a55b90d680e..e12086b1250 100644 --- a/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk +++ b/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk @@ -4,8 +4,8 @@ # ################################################################################ -XLIB_LIBFONTENC_VERSION = 1.1.4 -XLIB_LIBFONTENC_SOURCE = libfontenc-$(XLIB_LIBFONTENC_VERSION).tar.bz2 +XLIB_LIBFONTENC_VERSION = 1.1.7 +XLIB_LIBFONTENC_SOURCE = libfontenc-$(XLIB_LIBFONTENC_VERSION).tar.xz XLIB_LIBFONTENC_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBFONTENC_LICENSE = MIT XLIB_LIBFONTENC_LICENSE_FILES = COPYING diff --git a/package/x11r7/xlib_libxcvt/xlib_libxcvt.hash b/package/x11r7/xlib_libxcvt/xlib_libxcvt.hash index 71ae9170acd..f635c90fdc8 100644 --- a/package/x11r7/xlib_libxcvt/xlib_libxcvt.hash +++ b/package/x11r7/xlib_libxcvt/xlib_libxcvt.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2021-October/003114.html -sha256 27ebce180d355f94c1992930bedb40a36f6d7312ee50bf7f0acbcd22f33e8c29 libxcvt-0.1.1.tar.xz -sha512 50e9cd0283858823d4cfde75f06e23ffc42983272cb1f75408052fb5b76a4bb6f9de7d42d8ff9ec0dae6e95eefebc6273e03c919a92f237585db55eaf1a57005 libxcvt-0.1.1.tar.xz +# From https://lists.x.org/archives/xorg-announce/2022-July/003195.html +sha256 0561690544796e25cfbd71806ba1b0d797ffe464e9796411123e79450f71db38 libxcvt-0.1.2.tar.xz +sha512 3f6b2baca712a4608780686932f8881255c07bb74b1a788f9b07d4e22975c038d75111cd6b452257882a0b2bad57eebb2002f80a3e435d2e2d16936597f039b0 libxcvt-0.1.2.tar.xz # Locally calculated sha256 4849851554bdeda9a2a85ce93946b786605e009685941b8b907a9a36b02ae068 COPYING diff --git a/package/x11r7/xlib_libxcvt/xlib_libxcvt.mk b/package/x11r7/xlib_libxcvt/xlib_libxcvt.mk index 33a55dfa20c..7f61054dbee 100644 --- a/package/x11r7/xlib_libxcvt/xlib_libxcvt.mk +++ b/package/x11r7/xlib_libxcvt/xlib_libxcvt.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXCVT_VERSION = 0.1.1 +XLIB_LIBXCVT_VERSION = 0.1.2 XLIB_LIBXCVT_SOURCE = libxcvt-$(XLIB_LIBXCVT_VERSION).tar.xz XLIB_LIBXCVT_SITE = https://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXCVT_LICENSE = MIT diff --git a/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.hash b/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.hash index 03e61bdc5ee..7e6199f16b8 100644 --- a/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.hash +++ b/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-March/002977.html -md5 dd7e1e946def674e78c0efbc5c7d5b3b libxkbfile-1.1.0.tar.bz2 -sha1 487f314b6dbc17e93d0fe1e3741392156a9ca895 libxkbfile-1.1.0.tar.bz2 -sha256 758dbdaa20add2db4902df0b1b7c936564b7376c02a0acd1f2a331bd334b38c7 libxkbfile-1.1.0.tar.bz2 -sha512 1c6a57564e916ccdc3df3c49b9f3589f701df0cec55112c12ddc35ac3ed556608c28fe98e5ba0ac1962e9a65ed1e90eb7e6169b564951bf55a7cf3499b745826 libxkbfile-1.1.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003286.html +sha256 b8a3784fac420b201718047cfb6c2d5ee7e8b9481564c2667b4215f6616644b1 libxkbfile-1.1.2.tar.xz +sha512 0639fad7b64b36a85f8d24cdd40085e0ec18d7a671793b8b5c26449e9cc5a84c37117e7757fb1238ac353044935dd00013e42166de5af9dec428e873a47e598d libxkbfile-1.1.2.tar.xz # Locally computed -sha256 e1b3fdad8037ab3f986ef9caaa7c8da47d8d55875e680c7d6011f6c07363ea7c COPYING +sha256 e1b3fdad8037ab3f986ef9caaa7c8da47d8d55875e680c7d6011f6c07363ea7c COPYING diff --git a/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk b/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk index 6b684966503..2e7f82922f4 100644 --- a/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk +++ b/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk @@ -4,8 +4,8 @@ # ################################################################################ -XLIB_LIBXKBFILE_VERSION = 1.1.0 -XLIB_LIBXKBFILE_SOURCE = libxkbfile-$(XLIB_LIBXKBFILE_VERSION).tar.bz2 +XLIB_LIBXKBFILE_VERSION = 1.1.2 +XLIB_LIBXKBFILE_SOURCE = libxkbfile-$(XLIB_LIBXKBFILE_VERSION).tar.xz XLIB_LIBXKBFILE_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXKBFILE_LICENSE = MIT XLIB_LIBXKBFILE_LICENSE_FILES = COPYING diff --git a/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.hash b/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.hash index afdffb827f0..e8f83d427fe 100644 --- a/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.hash +++ b/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-February/002840.html -md5 42dda8016943dc12aff2c03a036e0937 libxshmfence-1.3.tar.bz2 -sha1 3472218fc0e8ee8183533d22dbcd4bbe90bf3ab8 libxshmfence-1.3.tar.bz2 -sha256 b884300d26a14961a076fbebc762a39831cb75f92bed5ccf9836345b459220c7 libxshmfence-1.3.tar.bz2 -sha512 c446e055f8fac62b9aa266132289a4cfc030282147974c45ce96d1768a98d1afb997470e58e4a68513174c404cbf373bdde2f0cd4b34abdbce1d89dd0b6fe2b7 libxshmfence-1.3.tar.bz2 +# 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 # Locally computed -sha256 64a579d1a0b3347301d87c94698a58ea7933d0ae6ca7e8fdd702fde2ea376301 COPYING +sha256 64a579d1a0b3347301d87c94698a58ea7933d0ae6ca7e8fdd702fde2ea376301 COPYING diff --git a/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.mk b/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.mk index 605408fff79..42411028559 100644 --- a/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.mk +++ b/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.mk @@ -4,8 +4,8 @@ # ################################################################################ -XLIB_LIBXSHMFENCE_VERSION = 1.3 -XLIB_LIBXSHMFENCE_SOURCE = libxshmfence-$(XLIB_LIBXSHMFENCE_VERSION).tar.bz2 +XLIB_LIBXSHMFENCE_VERSION = 1.3.2 +XLIB_LIBXSHMFENCE_SOURCE = libxshmfence-$(XLIB_LIBXSHMFENCE_VERSION).tar.xz XLIB_LIBXSHMFENCE_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXSHMFENCE_LICENSE = MIT XLIB_LIBXSHMFENCE_LICENSE_FILES = COPYING diff --git a/package/x11r7/xlib_xtrans/xlib_xtrans.hash b/package/x11r7/xlib_xtrans/xlib_xtrans.hash index 4e212c0f98d..1bab37244eb 100644 --- a/package/x11r7/xlib_xtrans/xlib_xtrans.hash +++ b/package/x11r7/xlib_xtrans/xlib_xtrans.hash @@ -1,7 +1,7 @@ # From https://lists.x.org/archives/xorg-announce/2019-March/002980.html -md5 ce2fb8100c6647ee81451ebe388b17ad xtrans-1.4.0.tar.bz2 -sha1 7c490026efb450798e02b040c05eba5212291c08 xtrans-1.4.0.tar.bz2 -sha256 377c4491593c417946efcd2c7600d1e62639f7a8bbca391887e2c4679807d773 xtrans-1.4.0.tar.bz2 -sha512 4fea89a3455c0e13321cbefa43340016dbb59bdd0dbdb5b796c1a6d2a6b1fd63cf1327b769ab426286b9c54b32ec764a50cd2b46228e4e43b841bda6b94de214 xtrans-1.4.0.tar.bz2 +md5 ce2fb8100c6647ee81451ebe388b17ad xtrans-1.4.0.tar.bz2 +sha1 7c490026efb450798e02b040c05eba5212291c08 xtrans-1.4.0.tar.bz2 +sha256 377c4491593c417946efcd2c7600d1e62639f7a8bbca391887e2c4679807d773 xtrans-1.4.0.tar.bz2 +sha512 4fea89a3455c0e13321cbefa43340016dbb59bdd0dbdb5b796c1a6d2a6b1fd63cf1327b769ab426286b9c54b32ec764a50cd2b46228e4e43b841bda6b94de214 xtrans-1.4.0.tar.bz2 # Locally computed -sha256 a9c96c832e00774266b492d4d41556f12a64f039ba3ef645c4b8c6010fcb8f2a COPYING +sha256 a9c96c832e00774266b492d4d41556f12a64f039ba3ef645c4b8c6010fcb8f2a COPYING diff --git a/package/x11r7/xorgproto/xorgproto.hash b/package/x11r7/xorgproto/xorgproto.hash index 802217ce77c..cc52013e118 100644 --- a/package/x11r7/xorgproto/xorgproto.hash +++ b/package/x11r7/xorgproto/xorgproto.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2021-September/date.html -sha256 aa2f663b8dbd632960b24f7477aa07d901210057f6ab1a1db5158732569ca015 xorgproto-2021.5.tar.bz2 -sha512 0f5c4ee4fd56cd46f4d5850bcf3e04c92d2e98de54d0113987cb49fc83cf1f4d0e50e976333179c72fe2178cfa15ec6c1bfc4e76fc3bc2a4be80616ce079da87 xorgproto-2021.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-August/003197.html +sha256 5d13dbf2be08f95323985de53352c4f352713860457b95ccaf894a647ac06b9e xorgproto-2022.2.tar.xz +sha512 8e6108110600d076a94cc6d0e465b2e9adfbbe8d7e6b75fae9c5262d99dc6074ab1ed561a74d6d451f00f5b7af9f507a6317be9c0770efeed9e60b64beb7a1c9 xorgproto-2022.2.tar.xz # Locally computed sha256 aacd931f191b610902aee1e526090c2858aabc07969441fa2537ffd3e7049555 COPYING-applewmproto diff --git a/package/x11r7/xorgproto/xorgproto.mk b/package/x11r7/xorgproto/xorgproto.mk index 1d5cd4caa87..c707bdafc0e 100644 --- a/package/x11r7/xorgproto/xorgproto.mk +++ b/package/x11r7/xorgproto/xorgproto.mk @@ -4,8 +4,8 @@ # ################################################################################ -XORGPROTO_VERSION = 2021.5 -XORGPROTO_SOURCE = xorgproto-$(XORGPROTO_VERSION).tar.bz2 +XORGPROTO_VERSION = 2022.2 +XORGPROTO_SOURCE = xorgproto-$(XORGPROTO_VERSION).tar.xz XORGPROTO_SITE = https://xorg.freedesktop.org/archive/individual/proto XORGPROTO_LICENSE = MIT XORGPROTO_LICENSE_FILES = \ diff --git a/package/x11r7/xserver_xorg-server/0002-Fix-compilation-error-when-built-without-logind-plat.patch b/package/x11r7/xserver_xorg-server/0002-Fix-compilation-error-when-built-without-logind-plat.patch deleted file mode 100644 index 164c0039bd7..00000000000 --- a/package/x11r7/xserver_xorg-server/0002-Fix-compilation-error-when-built-without-logind-plat.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 17b6ab4d8cecf55a3784dbefbef9bfcf84ee3b1b Mon Sep 17 00:00:00 2001 -From: Jocelyn Falempe -Date: Thu, 16 Dec 2021 15:46:43 +0100 -Subject: [PATCH] Fix compilation error when built without logind/platform bus - -This was introduced by commit 8eb1396d - -Signed-off-by: Jocelyn Falempe -[Peter: from https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/827] -Signed-off-by: Peter Korsgaard ---- - hw/xfree86/common/xf86Events.c | 9 +-------- - hw/xfree86/os-support/linux/systemd-logind.c | 16 +++++++++++----- - include/systemd-logind.h | 4 ++-- - 3 files changed, 14 insertions(+), 15 deletions(-) - -diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c -index 6076efa80..395bbc7b3 100644 ---- a/hw/xfree86/common/xf86Events.c -+++ b/hw/xfree86/common/xf86Events.c -@@ -383,14 +383,7 @@ xf86VTLeave(void) - xf86GPUScreens[i]->LeaveVT(xf86GPUScreens[i]); - - if (systemd_logind_controls_session()) { -- for (i = 0; i < xf86_num_platform_devices; i++) { -- if (xf86_platform_devices[i].flags & XF86_PDEV_SERVER_FD) { -- int major, minor; -- major = xf86_platform_odev_attributes(i)->major; -- minor = xf86_platform_odev_attributes(i)->minor; -- systemd_logind_drop_master(major, minor); -- } -- } -+ systemd_logind_drop_master(); - } - - if (!xf86VTSwitchAway()) -diff --git a/hw/xfree86/os-support/linux/systemd-logind.c b/hw/xfree86/os-support/linux/systemd-logind.c -index 35d5cc75b..f6a223a55 100644 ---- a/hw/xfree86/os-support/linux/systemd-logind.c -+++ b/hw/xfree86/os-support/linux/systemd-logind.c -@@ -308,13 +308,19 @@ cleanup: - * and ensure the drm_drop_master is done before - * VT_RELDISP when switching VT - */ --void systemd_logind_drop_master(int _major, int _minor) -+void systemd_logind_drop_master(void) - { -- struct systemd_logind_info *info = &logind_info; -- dbus_int32_t major = _major; -- dbus_int32_t minor = _minor; -+ int i; -+ for (i = 0; i < xf86_num_platform_devices; i++) { -+ if (xf86_platform_devices[i].flags & XF86_PDEV_SERVER_FD) { -+ dbus_int32_t major, minor; -+ struct systemd_logind_info *info = &logind_info; - -- systemd_logind_ack_pause(info, minor, major); -+ major = xf86_platform_odev_attributes(i)->major; -+ minor = xf86_platform_odev_attributes(i)->minor; -+ systemd_logind_ack_pause(info, minor, major); -+ } -+ } - } - - static DBusHandlerResult -diff --git a/include/systemd-logind.h b/include/systemd-logind.h -index a8af2b96d..5c04d0130 100644 ---- a/include/systemd-logind.h -+++ b/include/systemd-logind.h -@@ -33,7 +33,7 @@ int systemd_logind_take_fd(int major, int minor, const char *path, Bool *paus); - void systemd_logind_release_fd(int major, int minor, int fd); - int systemd_logind_controls_session(void); - void systemd_logind_vtenter(void); --void systemd_logind_drop_master(int major, int minor); -+void systemd_logind_drop_master(void); - #else - #define systemd_logind_init() - #define systemd_logind_fini() -@@ -41,7 +41,7 @@ void systemd_logind_drop_master(int major, int minor); - #define systemd_logind_release_fd(major, minor, fd) close(fd) - #define systemd_logind_controls_session() 0 - #define systemd_logind_vtenter() --#define systemd_logind_drop_master(major, minor) -+#define systemd_logind_drop_master() - #endif - - #endif --- -2.20.1 - diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in index 4fb03051ddc..b933bd0285f 100644 --- a/package/x11r7/xserver_xorg-server/Config.in +++ b/package/x11r7/xserver_xorg-server/Config.in @@ -1,20 +1,15 @@ -comment "xorg-server needs a glibc or uClibc toolchain" - depends on BR2_arm && BR2_TOOLCHAIN_USES_MUSL - config BR2_PACKAGE_XSERVER_XORG_SERVER bool "xorg-server" depends on BR2_USE_MMU # fork() - # xserver uses inb/outb on arm, which aren't available with musl - depends on !(BR2_arm && BR2_TOOLCHAIN_USES_MUSL) # We need a SHA1 implementation. If either openssl or # libgcrypt are already part of the build, we'll use one of # them, otherwise, use the small libsha1 library. select BR2_PACKAGE_LIBSHA1 if (!BR2_PACKAGE_OPENSSL && !BR2_PACKAGE_LIBGCRYPT) select BR2_PACKAGE_MCOOKIE select BR2_PACKAGE_PIXMAN - select BR2_PACKAGE_XFONT_FONT_ALIAS if !BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS - select BR2_PACKAGE_XFONT_FONT_MISC_MISC if !BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS - select BR2_PACKAGE_XFONT_FONT_CURSOR_MISC if !BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS + select BR2_PACKAGE_XFONT_FONT_ALIAS + select BR2_PACKAGE_XFONT_FONT_MISC_MISC + select BR2_PACKAGE_XFONT_FONT_CURSOR_MISC select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXAU select BR2_PACKAGE_XLIB_LIBXCURSOR @@ -85,6 +80,10 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER_XVFB config BR2_PACKAGE_XSERVER_XORG_SERVER_XEPHYR bool "Xephyr server" + select BR2_PACKAGE_XCB_UTIL_IMAGE if BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE + select BR2_PACKAGE_XCB_UTIL_KEYSYMS if BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE + select BR2_PACKAGE_XCB_UTIL_RENDERUTIL if BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE + select BR2_PACKAGE_XCB_UTIL_WM if BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE help Xephyr nested X server; successor to Xnest. diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash index 6008661db1e..092a640f04e 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash @@ -1,6 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2021-December/003125.html -sha256 c20bf46a9fe8e74bf4e75430637e58d49a02d806609dc161462bceb1ef7e8db0 xorg-server-21.1.2.tar.xz -sha512 6d7a0d29d5be09f80ed505c4d6ae964795127525a0ab73a4eab4f601788ab3627033143e5aeb4c2565c6683dd3402084d13acab5554606fbd519c4aec0a79def xorg-server-21.1.2.tar.xz - +# From https://lists.x.org/archives/xorg-announce/2023-March/003377.html +sha256 38aadb735650c8024ee25211c190bf8aad844c5f59632761ab1ef4c4d5aeb152 xorg-server-21.1.8.tar.xz +sha512 6104b3620ed2e1e27d9a8e963388bbe8785a764585b1bc03dbf5d719a92894773dda580d377ca18ceeab353e65a5d23cc947bab84a4012f9dd1eca31cac36937 xorg-server-21.1.8.tar.xz # Locally calculated sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 0cadba92a31..ede03d024c8 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -4,13 +4,14 @@ # ################################################################################ -XSERVER_XORG_SERVER_VERSION = 21.1.2 +XSERVER_XORG_SERVER_VERSION = 21.1.8 XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.xz 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_SELINUX_MODULES = xdg xserver XSERVER_XORG_SERVER_INSTALL_STAGING = YES + XSERVER_XORG_SERVER_DEPENDENCIES = \ xutil_util-macros \ xlib_libX11 \ @@ -45,7 +46,6 @@ XSERVER_XORG_SERVER_CONF_OPTS = \ --disable-config-hal \ --enable-record \ --disable-xnest \ - --disable-dmx \ --disable-unit-tests \ --with-builder-addr=buildroot@buildroot.org \ CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/pixman-1 -O2" \ @@ -84,6 +84,13 @@ XSERVER_XORG_SERVER_CONF_OPTS += \ --disable-glx \ --disable-dri +ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_XEPHYR),y) +XSERVER_XORG_SERVER_DEPENDENCIES += \ + xcb-util-image \ + xcb-util-keysyms \ + xcb-util-renderutil \ + xcb-util-wm +endif else # modular XSERVER_XORG_SERVER_CONF_OPTS += --disable-kdrive endif @@ -158,10 +165,6 @@ else XSERVER_XORG_SERVER_CONF_OPTS += --disable-screensaver endif -ifneq ($(BR2_PACKAGE_XLIB_LIBDMX),y) -XSERVER_XORG_SERVER_CONF_OPTS += --disable-dmx -endif - ifeq ($(BR2_PACKAGE_OPENSSL),y) XSERVER_XORG_SERVER_CONF_OPTS += --with-sha1=libcrypto XSERVER_XORG_SERVER_DEPENDENCIES += openssl @@ -173,13 +176,18 @@ XSERVER_XORG_SERVER_CONF_OPTS += --with-sha1=libsha1 XSERVER_XORG_SERVER_DEPENDENCIES += libsha1 endif +# Install the systemd unit only when nodm nor xdm aren't enabled, as +# they would be responsible for starting the server. +ifeq ($(BR2_PACKAGE_NODM)$(BR2_PACKAGE_XAPP_XDM),) define XSERVER_XORG_SERVER_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 package/x11r7/xserver_xorg-server/xorg.service \ $(TARGET_DIR)/usr/lib/systemd/system/xorg.service endef +endif -# init script conflicts with S90nodm -ifneq ($(BR2_PACKAGE_NODM),y) +# Install the init script only when neither nodm nor xdm are enabled, as +# they would be responsible for starting the server. +ifeq ($(BR2_PACKAGE_NODM)$(BR2_PACKAGE_XAPP_XDM),) define XSERVER_XORG_SERVER_INSTALL_INIT_SYSV $(INSTALL) -D -m 755 package/x11r7/xserver_xorg-server/S40xorg \ $(TARGET_DIR)/etc/init.d/S40xorg diff --git a/package/x11r7/xutil_makedepend/xutil_makedepend.hash b/package/x11r7/xutil_makedepend/xutil_makedepend.hash index 1798606163a..e2fe117f103 100644 --- a/package/x11r7/xutil_makedepend/xutil_makedepend.hash +++ b/package/x11r7/xutil_makedepend/xutil_makedepend.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-March/002985.html -md5 b2ca7f2f21f1c04a88b6a254c19c9b68 makedepend-1.0.6.tar.bz2 -sha1 3f321f7b570ec98f1fabc441267d29347a2e1456 makedepend-1.0.6.tar.bz2 -sha256 d558a52e8017d984ee59596a9582c8d699a1962391b632bec3bb6804bf4d501c makedepend-1.0.6.tar.bz2 -sha512 eb0e8ee8ab7515806d7d98a060cdcd392ec38e4225e5e05db26daa6651f185d0b764aab403edeea904d4d23211b1f7db20daeee6eafce8abe65225784ed0aa42 makedepend-1.0.6.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2022-December/003300.html +sha256 bfb26f8025189b2a01286ce6daacc2af8fe647440b40bb741dd5c397572cba5b makedepend-1.0.8.tar.xz +sha512 6707b1107c07d4ffbcf008181e877d18a0bcc4aea03860ee1158f5630c7fdce4cf9ad7bee3b38ee420c3a44819ed4b56a6f2428a5b695c0dbd17fb3e60825a6d makedepend-1.0.8.tar.xz # Locally computed -sha256 0530078db78c47ae978dc2bd77f4f427e6cd97df868672c95b1ef284113c8cb7 COPYING +sha256 0530078db78c47ae978dc2bd77f4f427e6cd97df868672c95b1ef284113c8cb7 COPYING diff --git a/package/x11r7/xutil_makedepend/xutil_makedepend.mk b/package/x11r7/xutil_makedepend/xutil_makedepend.mk index 18f8eb1f6a1..0c4a32c006a 100644 --- a/package/x11r7/xutil_makedepend/xutil_makedepend.mk +++ b/package/x11r7/xutil_makedepend/xutil_makedepend.mk @@ -4,9 +4,9 @@ # ################################################################################ -XUTIL_MAKEDEPEND_VERSION = 1.0.6 -XUTIL_MAKEDEPEND_SOURCE = makedepend-$(XUTIL_MAKEDEPEND_VERSION).tar.bz2 -XUTIL_MAKEDEPEND_SITE = http://xorg.freedesktop.org/releases/individual/util +XUTIL_MAKEDEPEND_VERSION = 1.0.8 +XUTIL_MAKEDEPEND_SOURCE = makedepend-$(XUTIL_MAKEDEPEND_VERSION).tar.xz +XUTIL_MAKEDEPEND_SITE = https://xorg.freedesktop.org/archive/individual/util XUTIL_MAKEDEPEND_LICENSE = MIT XUTIL_MAKEDEPEND_LICENSE_FILES = COPYING diff --git a/package/x11r7/xwayland/Config.in b/package/x11r7/xwayland/Config.in new file mode 100644 index 00000000000..241ab73ad3f --- /dev/null +++ b/package/x11r7/xwayland/Config.in @@ -0,0 +1,31 @@ +config BR2_PACKAGE_XWAYLAND + bool "xwayland server" + depends on BR2_USE_MMU # fork() + depends on !BR2_STATIC_LIBS # wayland + depends on BR2_TOOLCHAIN_HAS_THREADS # wayland + # We need a SHA1 implementation. If either openssl or + # libgcrypt are already part of the build, we'll use one of + # them, otherwise, use the small libsha1 library. + depends on !BR2_RISCV_32 # xlib_libxshmfence + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # xlib_libxshmfence + select BR2_PACKAGE_LIBSHA1 if (!BR2_PACKAGE_OPENSSL && !BR2_PACKAGE_LIBGCRYPT) + select BR2_PACKAGE_PIXMAN + select BR2_PACKAGE_WAYLAND + select BR2_PACKAGE_WAYLAND_PROTOCOLS + select BR2_PACKAGE_XLIB_LIBXCVT + select BR2_PACKAGE_XLIB_LIBXFONT2 + select BR2_PACKAGE_XLIB_LIBXKBFILE + select BR2_PACKAGE_XLIB_LIBXRANDR + select BR2_PACKAGE_XLIB_LIBXSHMFENCE + select BR2_PACKAGE_XLIB_XTRANS + select BR2_PACKAGE_XORGPROTO + help + X.Org X server to run X clients under wayland + + http://xorg.freedesktop.org + +comment "xwayland needs a toolchain w/ threads, dynamic library" + depends on BR2_USE_MMU + depends on !BR2_RISCV_32 + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package/x11r7/xwayland/xwayland.hash b/package/x11r7/xwayland/xwayland.hash new file mode 100644 index 00000000000..0c476f31837 --- /dev/null +++ b/package/x11r7/xwayland/xwayland.hash @@ -0,0 +1,6 @@ +# From https://lists.x.org/archives/xorg-announce/2023-February/003322.html +sha256 d11eeee73290b88ea8da42a7d9350dedfaba856ce4ae44e58c045ad9ecaa2f73 xwayland-22.1.8.tar.xz +sha512 f52c6f99d8ef7605bc1c651d5ee5e306c12af30649a2d712b1c4c3cf4c7c80246ae24bd9ac39461d47aafc78f5d659446a459cd6259e05ef3128b204981d114a xwayland-22.1.8.tar.xz + +# Locally calculated +sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING diff --git a/package/x11r7/xwayland/xwayland.mk b/package/x11r7/xwayland/xwayland.mk new file mode 100644 index 00000000000..7aef1156d35 --- /dev/null +++ b/package/x11r7/xwayland/xwayland.mk @@ -0,0 +1,95 @@ +################################################################################ +# +# xwayland +# +################################################################################ + +XWAYLAND_VERSION = 22.1.8 +XWAYLAND_SOURCE = xwayland-$(XWAYLAND_VERSION).tar.xz +XWAYLAND_SITE = https://xorg.freedesktop.org/archive/individual/xserver +XWAYLAND_LICENSE = MIT +XWAYLAND_LICENSE_FILES = COPYING +XWAYLAND_INSTALL_STAGING = YES +XWAYLAND_DEPENDENCIES = \ + pixman \ + wayland \ + wayland-protocols \ + xlib_libxcvt \ + xlib_libXfont2 \ + xlib_libxkbfile \ + xlib_libXrandr \ + xlib_libxshmfence \ + xlib_xtrans \ + xorgproto +XWAYLAND_CONF_OPTS = \ + -Dxwayland_eglstream=false \ + -Dxvfb=false \ + -Ddefault_font_path=/usr/share/fonts/X11/ \ + -Ddtrace=false \ + -Ddocs=false + +ifeq ($(BR2_PACKAGE_LIBDRM)$(BR2_PACKAGE_LIBEPOXY),yy) +XWAYLAND_CONF_OPTS += -Dglamor=true +XWAYLAND_DEPENDENCIES += libdrm libepoxy +else +XWAYLAND_CONF_OPTS += -Dglamor=false +endif + +ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) +XWAYLAND_CONF_OPTS += -Dglx=true +XWAYLAND_DEPENDENCIES += libgl +else +XWAYLAND_CONF_OPTS += -Dglx=false +endif + +ifeq ($(BR2_PACKAGE_XLIB_LIBXDMCP),y) +XWAYLAND_CONF_OPTS += \ + -Dxdmcp=true \ + -Dxdm-auth-1=true +XWAYLAND_DEPENDENCIES += xlib_libXdmcp +else +XWAYLAND_CONF_OPTS += \ + -Dxdmcp=false \ + -Dxdm-auth-1=false +endif + +ifeq ($(BR2_PACKAGE_LIBTIRPC),y) +XWAYLAND_CONF_OPTS += -Dsecure-rpc=true +XWAYLAND_DEPENDENCIES += libtirpc +else +XWAYLAND_CONF_OPTS += -Dsecure-rpc=false +endif + +ifeq ($(BR2_PACKAGE_LIBSELINUX)$(BR2_PACKAGE_AUDIT),yy) +XWAYLAND_CONF_OPTS += -Dxselinux=true +XWAYLAND_DEPENDENCIES += libselinux audit +else +XWAYLAND_CONF_OPTS += -Dxselinux=false +endif + +ifeq ($(BR2_PACKAGE_OPENSSL),y) +XWAYLAND_CONF_OPTS += -Dsha1=libcrypto +XWAYLAND_DEPENDENCIES += openssl +else ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) +XWAYLAND_CONF_OPTS += -Dsha1=libgcrypt +XWAYLAND_DEPENDENCIES += libgcrypt +else +XWAYLAND_CONF_OPTS += -Dsha1=libsha1 +XWAYLAND_DEPENDENCIES += libsha1 +endif + +ifeq ($(BR2_PACKAGE_LIBDRM),y) +XWAYLAND_CONF_OPTS += -Ddri3=true +XWAYLAND_DEPENDENCIES += libdrm +else +XWAYLAND_CONF_OPTS += -Ddri3=false +endif + +ifeq ($(BR2_PACKAGE_LIBUNWIND),y) +XWAYLAND_CONF_OPTS += -Dlibunwind=true +XWAYLAND_DEPENDENCIES += libunwind +else +XWAYLAND_CONF_OPTS += -Dlibunwind=false +endif + +$(eval $(meson-package)) diff --git a/package/x264/x264.hash b/package/x264/x264.hash index f1396279f86..f8b26b69108 100644 --- a/package/x264/x264.hash +++ b/package/x264/x264.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 58f39bf23a4e38ac3dd841a3f9ccf2aa16d2b0c35df9aecd9f3b5062780e5d74 x264-35417dcd65a57321fbadf98c9a4cff1cb741db4b-br1.tar.gz +sha256 e83cda2a69e72bc45bcb14aa7ca5e689cf0f67dc29fc6f1dce63abe2a428fc01 x264-baee400fa9ced6f5481a728138fed6e867b0ff7f-br1.tar.gz sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/x264/x264.mk b/package/x264/x264.mk index 9de618eb5e0..97caf194663 100644 --- a/package/x264/x264.mk +++ b/package/x264/x264.mk @@ -4,7 +4,7 @@ # ################################################################################ -X264_VERSION = 35417dcd65a57321fbadf98c9a4cff1cb741db4b +X264_VERSION = baee400fa9ced6f5481a728138fed6e867b0ff7f X264_SITE = https://code.videolan.org/videolan/x264.git X264_SITE_METHOD = git X264_LICENSE = GPL-2.0+ diff --git a/package/xavante/xavante.hash b/package/xavante/xavante.hash index b2e8633bc61..842e2e32ea7 100644 --- a/package/xavante/xavante.hash +++ b/package/xavante/xavante.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 67c738f981e7d65d18c717f3acac59a37f95d5139c00fb0de5d3167262025273 xavante-2.4.0-1.src.rock -sha256 57b2c50f08bf500c969fe13500f217adb36582e4d8e75c9e2ed04191cb4a045c xavante-2.4.0/doc/us/license.html +sha256 67c738f981e7d65d18c717f3acac59a37f95d5139c00fb0de5d3167262025273 xavante-2.4.0-1.src.rock +sha256 57b2c50f08bf500c969fe13500f217adb36582e4d8e75c9e2ed04191cb4a045c xavante-2.4.0/doc/us/license.html diff --git a/package/xdg-dbus-proxy/xdg-dbus-proxy.hash b/package/xdg-dbus-proxy/xdg-dbus-proxy.hash index b7aa9ac7018..7bbea72b03e 100644 --- a/package/xdg-dbus-proxy/xdg-dbus-proxy.hash +++ b/package/xdg-dbus-proxy/xdg-dbus-proxy.hash @@ -1,5 +1,5 @@ -# From https://github.com/flatpak/xdg-dbus-proxy/releases/tag/0.1.3 -sha256 03b5d28ca879253ddbbce31098909becca1495ea811a6377a492e28f16c09b9b xdg-dbus-proxy-0.1.3.tar.xz +# From https://github.com/flatpak/xdg-dbus-proxy/releases/tag/0.1.4 +sha256 1ec0eab53d1e49966d722352bcfd51ac402dce5190baedc749a8541e761670ab xdg-dbus-proxy-0.1.4.tar.xz # Hash for license files: sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/xdg-dbus-proxy/xdg-dbus-proxy.mk b/package/xdg-dbus-proxy/xdg-dbus-proxy.mk index 9c4449c7bbb..48f49dba2ac 100644 --- a/package/xdg-dbus-proxy/xdg-dbus-proxy.mk +++ b/package/xdg-dbus-proxy/xdg-dbus-proxy.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDG_DBUS_PROXY_VERSION = 0.1.3 +XDG_DBUS_PROXY_VERSION = 0.1.4 XDG_DBUS_PROXY_SITE = https://github.com/flatpak/xdg-dbus-proxy/releases/download/$(XDG_DBUS_PROXY_VERSION) XDG_DBUS_PROXY_SOURCE = xdg-dbus-proxy-$(XDG_DBUS_PROXY_VERSION).tar.xz XDG_DBUS_PROXY_DEPENDENCIES = host-pkgconf libglib2 @@ -12,6 +12,6 @@ XDG_DBUS_PROXY_DEPENDENCIES = host-pkgconf libglib2 XDG_DBUS_PROXY_LICENSE = LGPL-2.1+ XDG_DBUS_PROXY_LICENSE_FILES = COPYING -XDG_DBUS_PROXY_CONF_OPTS = --disable-man +XDG_DBUS_PROXY_CONF_OPTS = -Dman=disabled -Dtests=false -$(eval $(autotools-package)) +$(eval $(meson-package)) diff --git a/package/xdotool/xdotool.hash b/package/xdotool/xdotool.hash index b0d5a7582a2..549e807ccc1 100644 --- a/package/xdotool/xdotool.hash +++ b/package/xdotool/xdotool.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 ddafca1239075c203769c17a5a184587731e56fbe0438c09d08f8af1704e117a xdotool-3.20160805.1.tar.gz -sha256 129d156c35b1cb19350f3716129173c8c89e019c0497d9df073db5b801becef2 COPYRIGHT +sha256 96f0facfde6d78eacad35b91b0f46fecd0b35e474c03e00e30da3fdd345f9ada xdotool-3.20211022.1.tar.gz +sha256 129d156c35b1cb19350f3716129173c8c89e019c0497d9df073db5b801becef2 COPYRIGHT diff --git a/package/xdotool/xdotool.mk b/package/xdotool/xdotool.mk index 5c5603bd625..c430a49d06c 100644 --- a/package/xdotool/xdotool.mk +++ b/package/xdotool/xdotool.mk @@ -4,8 +4,8 @@ # ################################################################################ -XDOTOOL_VERSION = 3.20160805.1 -XDOTOOL_SITE = $(call github,jordansissel,xdotool,v$(XDOTOOL_VERSION)) +XDOTOOL_VERSION = 3.20211022.1 +XDOTOOL_SITE = https://github.com/jordansissel/xdotool/releases/download/v$(XDOTOOL_VERSION) XDOTOOL_LICENSE = BSD-3-Clause XDOTOOL_LICENSE_FILES = COPYRIGHT XDOTOOL_DEPENDENCIES = xlib_libXtst xlib_libXinerama libxkbcommon xlib_libX11 diff --git a/package/xen/xen.hash b/package/xen/xen.hash index a81d05e3f7e..5637f0e8d9b 100644 --- a/package/xen/xen.hash +++ b/package/xen/xen.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e76d56dfcdabf5d80aa06819f44472de49526a518dbb483eb08e7ff9aec2c669 xen-4.14.4.tar.gz +sha256 a1a24092ad14658eed420b7d56b67d0d9d5b314e96c30a799b45f3a721f98bf0 xen-4.14.5.tar.gz sha256 ecca9538e9d3f7e3c2bff827502f4495e2ef9e22c451298696ea08886b176c2c COPYING diff --git a/package/xen/xen.mk b/package/xen/xen.mk index 03341d4275a..169753e89f7 100644 --- a/package/xen/xen.mk +++ b/package/xen/xen.mk @@ -4,7 +4,7 @@ # ################################################################################ -XEN_VERSION = 4.14.4 +XEN_VERSION = 4.14.5 XEN_SITE = https://downloads.xenproject.org/release/xen/$(XEN_VERSION) XEN_LICENSE = GPL-2.0 XEN_LICENSE_FILES = COPYING diff --git a/package/xenomai/Config.in b/package/xenomai/Config.in index ec6d9e5d299..d4983b084d1 100644 --- a/package/xenomai/Config.in +++ b/package/xenomai/Config.in @@ -64,17 +64,29 @@ config BR2_PACKAGE_XENOMAI_CUSTOM_GIT endchoice +config BR2_PACKAGE_XENOMAI_CUSTOM_VERSION_VALUE + string "Xenomai version" + depends on BR2_PACKAGE_XENOMAI_CUSTOM_VERSION + config BR2_PACKAGE_XENOMAI_REPOSITORY string "URL of custom repository" - default "https://gitlab.denx.de/Xenomai/xenomai.git" depends on BR2_PACKAGE_XENOMAI_CUSTOM_GIT +config BR2_PACKAGE_XENOMAI_REPOSITORY_VERSION + string "Custom repository version" + depends on BR2_PACKAGE_XENOMAI_CUSTOM_GIT + help + Revision to use in the typical format used by Git, i.e a + SHA1 or a tag. + config BR2_PACKAGE_XENOMAI_VERSION - string "Custom Xenomai version" if \ - !BR2_PACKAGE_XENOMAI_LATEST_VERSION && \ - !BR2_PACKAGE_XENOMAI_CUSTOM_TARBALL + string default "3.0.10" if BR2_PACKAGE_XENOMAI_LATEST_VERSION + default BR2_PACKAGE_XENOMAI_CUSTOM_VERSION_VALUE \ + if BR2_PACKAGE_XENOMAI_CUSTOM_VERSION default "custom" if BR2_PACKAGE_XENOMAI_CUSTOM_TARBALL + default BR2_PACKAGE_XENOMAI_REPOSITORY_VERSION \ + if BR2_PACKAGE_XENOMAI_CUSTOM_GIT config BR2_PACKAGE_XENOMAI_CUSTOM_TARBALL_URL string "URL of custom tarball" diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk index c1ad0c5df62..9356919259b 100644 --- a/package/xenomai/xenomai.mk +++ b/package/xenomai/xenomai.mk @@ -41,7 +41,6 @@ XENOMAI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) install-user XENOMAI_CONF_OPTS += \ --disable-demo \ - --disable-testsuite \ --includedir=/usr/include/xenomai/ ifeq ($(BR2_PACKAGE_XENOMAI_MERCURY),y) @@ -87,17 +86,10 @@ endef XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_UNNEEDED_FILES -ifeq ($(BR2_PACKAGE_XENOMAI_TESTSUITE),) -define XENOMAI_REMOVE_TESTSUITE - rm -rf $(TARGET_DIR)/usr/share/xenomai/ - for i in clocktest gpiotest latency smokey spitest switchtest \ - xeno-test-run-wrapper dohell xeno-test-run xeno-test ; do \ - rm -f $(TARGET_DIR)/usr/bin/$$i ; \ - done - rm -rf $(TARGET_DIR)/usr/demo/ -endef - -XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_TESTSUITE +ifeq ($(BR2_PACKAGE_XENOMAI_TESTSUITE),y) +XENOMAI_CONF_OPTS += --enable-testsuite +else +XENOMAI_CONF_OPTS += --disable-testsuite endif ifeq ($(BR2_PACKAGE_XENOMAI_RTCAN),) diff --git a/package/xerces/0001-fix-static-linking-with-curl.patch b/package/xerces/0001-fix-static-linking-with-curl.patch deleted file mode 100644 index db38de79fcb..00000000000 --- a/package/xerces/0001-fix-static-linking-with-curl.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 26e3f1440bbc75c704fc93ff43a2abbfbe4c0203 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 11 Oct 2018 22:56:50 +0200 -Subject: [PATCH] fix static linking with curl - -When curl is statically built with openssl support, xerces needs to -link with openssl libraries so use pkg_check_modules to get any -needed dependencies - -Fixes: - - http://autobuild.buildroot.org/results/29ca90fff2c8e38f2edf7240eca3aa3fe7397c45 - -Signed-off-by: Fabrice Fontaine ---- - cmake/XercesNetAccessorSelection.cmake | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/cmake/XercesNetAccessorSelection.cmake b/cmake/XercesNetAccessorSelection.cmake -index 7a63f1f6b..e90fcf034 100644 ---- a/cmake/XercesNetAccessorSelection.cmake -+++ b/cmake/XercesNetAccessorSelection.cmake -@@ -31,7 +31,13 @@ if(network) - - # Requires select() which is UNIX only - if(UNIX) -- find_package(CURL) -+ find_package(PkgConfig) -+ if (PkgConfig_FOUND) -+ pkg_check_modules(CURL libcurl) -+ if (NOT CURL_FOUND) -+ find_package(CURL) -+ endif() -+ endif() - if(CURL_FOUND) - list(APPEND netaccessors curl) - endif() --- -2.17.1 - diff --git a/package/xerces/0002-InMemMsgLoader-loadMsg-fix-memory-leak-when-transcod.patch b/package/xerces/0002-InMemMsgLoader-loadMsg-fix-memory-leak-when-transcod.patch deleted file mode 100644 index 76b37c63d90..00000000000 --- a/package/xerces/0002-InMemMsgLoader-loadMsg-fix-memory-leak-when-transcod.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 1bdf6d8ba878c1fe1d779824be70001fc0bebd2c Mon Sep 17 00:00:00 2001 -From: Even Rouault -Date: Fri, 27 Aug 2021 01:33:27 +0200 -Subject: [PATCH] InMemMsgLoader::loadMsg(): fix memory leak when transcoding - fails. - -Seen with the IconvGNU transcoder when parsing " - ---- - .../MsgLoaders/InMemory/InMemMsgLoader.cpp | 31 ++++++++++++++----- - 1 file changed, 23 insertions(+), 8 deletions(-) - -diff --git a/src/xercesc/util/MsgLoaders/InMemory/InMemMsgLoader.cpp b/src/xercesc/util/MsgLoaders/InMemory/InMemMsgLoader.cpp -index cda103226..6971fde96 100644 ---- a/src/xercesc/util/MsgLoaders/InMemory/InMemMsgLoader.cpp -+++ b/src/xercesc/util/MsgLoaders/InMemory/InMemMsgLoader.cpp -@@ -25,6 +25,7 @@ - // --------------------------------------------------------------------------- - #include - #include -+#include - #include - #include - #include -@@ -153,14 +154,28 @@ bool InMemMsgLoader::loadMsg(const XMLMsgLoader::XMLMsgId msgToLoad - XMLCh* tmp4 = 0; - - bool bRet = false; -- if (repText1) -- tmp1 = XMLString::transcode(repText1, manager); -- if (repText2) -- tmp2 = XMLString::transcode(repText2, manager); -- if (repText3) -- tmp3 = XMLString::transcode(repText3, manager); -- if (repText4) -- tmp4 = XMLString::transcode(repText4, manager); -+ try -+ { -+ if (repText1) -+ tmp1 = XMLString::transcode(repText1, manager); -+ if (repText2) -+ tmp2 = XMLString::transcode(repText2, manager); -+ if (repText3) -+ tmp3 = XMLString::transcode(repText3, manager); -+ if (repText4) -+ tmp4 = XMLString::transcode(repText4, manager); -+ } -+ catch( const TranscodingException& ) -+ { -+ if (tmp1) -+ manager->deallocate(tmp1); -+ if (tmp2) -+ manager->deallocate(tmp2); -+ if (tmp3) -+ manager->deallocate(tmp3); -+ // Note: tmp4 cannot leak -+ throw; -+ } - - bRet = loadMsg(msgToLoad, toFill, maxChars, tmp1, tmp2, tmp3, tmp4, manager); - --- -2.17.1 - diff --git a/package/xerces/xerces.hash b/package/xerces/xerces.hash index c75ce860e86..e6b5b922d27 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.3.tar.xz.sha256 -sha256 12fc99a9fc1d1a79bd0e927b8b5637a576d6656f45b0d5e70ee3694d379cc149 xerces-c-3.2.3.tar.xz +# 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 # Hash for license file sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/xerces/xerces.mk b/package/xerces/xerces.mk index a3e5361b2eb..08efa6fb5c9 100644 --- a/package/xerces/xerces.mk +++ b/package/xerces/xerces.mk @@ -4,7 +4,7 @@ # ################################################################################ -XERCES_VERSION = 3.2.3 +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_LICENSE = Apache-2.0 diff --git a/package/xfsprogs/0003-libxfs-stop-overriding-MAP_SYNC-in-publicly-exported.patch b/package/xfsprogs/0003-libxfs-stop-overriding-MAP_SYNC-in-publicly-exported.patch new file mode 100644 index 00000000000..510ed5b6423 --- /dev/null +++ b/package/xfsprogs/0003-libxfs-stop-overriding-MAP_SYNC-in-publicly-exported.patch @@ -0,0 +1,187 @@ +From b82bd75c80aadcc2890b23f63eec9ba2c560b2e5 Mon Sep 17 00:00:00 2001 +From: "Darrick J. Wong" +Date: Thu, 4 Aug 2022 21:26:43 -0500 +Subject: [PATCH] libxfs: stop overriding MAP_SYNC in publicly exported header + files + +Florian Fainelli most recently reported that xfsprogs doesn't build with +musl on mips: + +"MIPS platforms building with recent kernel headers and the musl-libc +toolchain will expose the following build failure: + +mmap.c: In function 'mmap_f': +mmap.c:196:12: error: 'MAP_SYNC' undeclared (first use in this function); did you mean 'MS_SYNC'? + 196 | flags = MAP_SYNC | MAP_SHARED_VALIDATE; + | ^~~~~~~~ + | MS_SYNC +mmap.c:196:12: note: each undeclared identifier is reported only once for each function it appears in +make[4]: *** [../include/buildrules:81: mmap.o] Error 1" + +At first glance, the build failure here is caused by the fact that: + +1. The configure script doesn't detect MAP_SYNC support +2. The build system doesn't set HAVE_MAP_SYNC +2. io/mmap.c includes input.h -> projects.h -> xfs.h and later sys/mman.h +3. include/linux.h #define's MAP_SYNC to 0 if HAVE_MAP_SYNC is not set +4. musl's sys/mman.h #undef MAP_SYNC on platforms that don't support it +5. io/mmap.c tries to use MAP_SYNC, not realizing that libc undefined it + +Normally, xfs_io only exports functionality that is defined by the libc +and/or kernel headers on the build system. We often make exceptions for +new functionality so that we have a way to test them before the header +file packages catch up, hence this '#ifndef HAVE_FOO #define FOO' +paradigm. + +MAP_SYNC is a gross and horribly broken example of this. These support +crutches are supposed to be *private* to xfsprogs for benefit of early +testing, but they were instead added to include/linux.h, which we +provide to user programs in the xfslibs-dev package. IOWs, we've been + +Worst yet, gcc 11.3 doesn't even warn about overriding a #define to 0: + +int main(int argc, char *argv[]) { + printf("MAP_SYNC 0x%x\n", MAP_SYNC); +} + +$ gcc -o a a.c -Wall +$ ./a +MAP_SYNC 0x80000 +$ gcc -DSTUPID -o a a.c -Wall +$ ./a +MAP_SYNC 0x0 + +Four years have gone by since the introduction of MAP_SYNC, so let's get +rid of the override code entirely -- any platform that supports MAP_SYNC +has had plenty of chances to ensure their header files have the right +bits. While we're at it, fix AC_HAVE_MAP_SYNC to look for MAP_SYNC in +the same header file that the one user (io/mmap.c) uses -- sys/mman.h. + +Annoyingly, I had to test this by hand because the sole fstest that +exercises MAP_SYNC (generic/470) requires dm-logwrites and dm-thinp, +neither of which support fsdax on current kernels. + +Reported-by: info@mobile-stream.com +Reported-by: Fabrice Fontaine +Reported-by: Florian Fainelli +Signed-off-by: Darrick J. Wong +Tested-by: Florian Fainelli +Reviewed-by: Carlos Maiolino +Signed-off-by: Eric Sandeen +--- + include/linux.h | 8 -------- + io/io.h | 2 +- + io/mmap.c | 25 +++++++++++++------------ + m4/package_libcdev.m4 | 3 +-- + 4 files changed, 15 insertions(+), 23 deletions(-) + +diff --git a/include/linux.h b/include/linux.h +index de8a71221146..052facc15db5 100644 +--- a/include/linux.h ++++ b/include/linux.h +@@ -356,14 +356,6 @@ fsmap_advance( + #define HAVE_GETFSMAP + #endif /* HAVE_GETFSMAP */ + +-#ifndef HAVE_MAP_SYNC +-#define MAP_SYNC 0 +-#define MAP_SHARED_VALIDATE 0 +-#else +-#include +-#include +-#endif /* HAVE_MAP_SYNC */ +- + /* + * Reminder: anything added to this file will be compiled into downstream + * userspace projects! +diff --git a/io/io.h b/io/io.h +index 49db902fc44f..64b7a663a8cf 100644 +--- a/io/io.h ++++ b/io/io.h +@@ -55,7 +55,7 @@ typedef struct mmap_region { + size_t length; /* length of mapping */ + off64_t offset; /* start offset into backing file */ + int prot; /* protection mode of the mapping */ +- bool map_sync; /* is this a MAP_SYNC mapping? */ ++ int flags; /* MAP_* flags passed to mmap() */ + char *name; /* name of backing file */ + } mmap_region_t; + +diff --git a/io/mmap.c b/io/mmap.c +index 8c048a0ab6d0..425957d4b487 100644 +--- a/io/mmap.c ++++ b/io/mmap.c +@@ -46,8 +46,11 @@ print_mapping( + for (i = 0, p = pflags; p->prot != PROT_NONE; i++, p++) + buffer[i] = (map->prot & p->prot) ? p->mode : '-'; + +- if (map->map_sync) ++#ifdef HAVE_MAP_SYNC ++ if ((map->flags & (MAP_SYNC | MAP_SHARED_VALIDATE)) == ++ (MAP_SYNC | MAP_SHARED_VALIDATE)) + sprintf(&buffer[i], " S"); ++#endif + + printf("%c%03d%c 0x%lx - 0x%lx %s %14s (%lld : %ld)\n", + braces? '[' : ' ', index, braces? ']' : ' ', +@@ -139,7 +142,9 @@ mmap_help(void) + " -r -- map with PROT_READ protection\n" + " -w -- map with PROT_WRITE protection\n" + " -x -- map with PROT_EXEC protection\n" ++#ifdef HAVE_MAP_SYNC + " -S -- map with MAP_SYNC and MAP_SHARED_VALIDATE flags\n" ++#endif + " -s -- first do mmap(size)/munmap(size), try to reserve some free space\n" + " If no protection mode is specified, all are used by default.\n" + "\n")); +@@ -193,18 +198,14 @@ mmap_f( + prot |= PROT_EXEC; + break; + case 'S': ++#ifdef HAVE_MAP_SYNC + flags = MAP_SYNC | MAP_SHARED_VALIDATE; +- +- /* +- * If MAP_SYNC and MAP_SHARED_VALIDATE aren't defined +- * in the system headers we will have defined them +- * both as 0. +- */ +- if (!flags) { +- printf("MAP_SYNC not supported\n"); +- return 0; +- } + break; ++#else ++ printf("MAP_SYNC not supported\n"); ++ exitcode = 1; ++ return command_usage(&mmap_cmd); ++#endif + case 's': + length2 = cvtnum(blocksize, sectsize, optarg); + break; +@@ -281,7 +282,7 @@ mmap_f( + mapping->offset = offset; + mapping->name = filename; + mapping->prot = prot; +- mapping->map_sync = (flags == (MAP_SYNC | MAP_SHARED_VALIDATE)); ++ mapping->flags = flags; + return 0; + } + +diff --git a/m4/package_libcdev.m4 b/m4/package_libcdev.m4 +index adab9bb9773a..3a0c23453176 100644 +--- a/m4/package_libcdev.m4 ++++ b/m4/package_libcdev.m4 +@@ -339,8 +339,7 @@ AC_DEFUN([AC_HAVE_STATFS_FLAGS], + AC_DEFUN([AC_HAVE_MAP_SYNC], + [ AC_MSG_CHECKING([for MAP_SYNC]) + AC_TRY_COMPILE([ +-#include +-#include ++#include + ], [ + int flags = MAP_SYNC | MAP_SHARED_VALIDATE; + ], have_map_sync=yes +-- +2.25.1 + diff --git a/package/xfsprogs/xfsprogs.mk b/package/xfsprogs/xfsprogs.mk index 695471bddcc..09f59a76f4d 100644 --- a/package/xfsprogs/xfsprogs.mk +++ b/package/xfsprogs/xfsprogs.mk @@ -27,6 +27,10 @@ else XFSPROGS_CONF_OPTS += --disable-libicu endif +ifeq ($(BR2_OPTIMIZE_0),y) +XFSPROGS_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -O1" +endif + XFSPROGS_INSTALL_TARGET_OPTS = DIST_ROOT=$(TARGET_DIR) install $(eval $(autotools-package)) diff --git a/package/xl2tp/xl2tp.hash b/package/xl2tp/xl2tp.hash index eca918bc832..64db273a711 100644 --- a/package/xl2tp/xl2tp.hash +++ b/package/xl2tp/xl2tp.hash @@ -1,3 +1,3 @@ # locally computed -sha256 898d9b6a374c78dea5f20d80fd50fac13428ad746fefb16ff5f6bec449affe67 xl2tp-1.3.17.tar.gz +sha256 47f52b9c56cabe77766533bca3736a8198581ff38443eb4b4c8971c885ac9329 xl2tp-1.3.18.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/xl2tp/xl2tp.mk b/package/xl2tp/xl2tp.mk index e42eeb17091..e0205d4ecce 100644 --- a/package/xl2tp/xl2tp.mk +++ b/package/xl2tp/xl2tp.mk @@ -4,7 +4,7 @@ # ################################################################################ -XL2TP_VERSION = 1.3.17 +XL2TP_VERSION = 1.3.18 XL2TP_SITE = $(call github,xelerance,xl2tpd,v$(XL2TP_VERSION)) XL2TP_DEPENDENCIES = libpcap XL2TP_LICENSE = GPL-2.0 diff --git a/package/xml-security-c/0001-fix-build-with-libressl-3.5.0.patch b/package/xml-security-c/0001-fix-build-with-libressl-3.5.0.patch new file mode 100644 index 00000000000..1b2591aa368 --- /dev/null +++ b/package/xml-security-c/0001-fix-build-with-libressl-3.5.0.patch @@ -0,0 +1,91 @@ +From 66d1d626cf1405119d89c6fd0fb7e9019bd67f6c Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 6 Jun 2022 10:24:58 +0200 +Subject: [PATCH] fix build with libressl >= 3.5.0 + +Fix the following build failure with libressl >= 3.5.0: + +In file included from ../xsec/enc/OpenSSL/OpenSSLCryptoBase64.hpp:36:0, + from enc/OpenSSL/OpenSSLCryptoKeyRSA.cpp:35: +../xsec/enc/OpenSSL/OpenSSLSupport.hpp:92:20: error: field 'mp_ctx_store' has incomplete type 'EVP_ENCODE_CTX {aka evp_Encode_Ctx_st}' + EVP_ENCODE_CTX mp_ctx_store; + ^~~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/e908e59ec5b8e1ac505c44900dcb39527f0ec1d3 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://issues.apache.org/jira/browse/SANTUARIO-588] +--- + xsec/enc/OpenSSL/OpenSSLCryptoBase64.cpp | 3 ++- + xsec/enc/OpenSSL/OpenSSLCryptoBase64.hpp | 3 ++- + xsec/enc/OpenSSL/OpenSSLSupport.cpp | 5 +++-- + xsec/enc/OpenSSL/OpenSSLSupport.hpp | 3 ++- + 4 files changed, 9 insertions(+), 5 deletions(-) + +diff --git a/xsec/enc/OpenSSL/OpenSSLCryptoBase64.cpp b/xsec/enc/OpenSSL/OpenSSLCryptoBase64.cpp +index a8ea9f1d..a9a84e3f 100644 +--- a/xsec/enc/OpenSSL/OpenSSLCryptoBase64.cpp ++++ b/xsec/enc/OpenSSL/OpenSSLCryptoBase64.cpp +@@ -48,7 +48,8 @@ XERCES_CPP_NAMESPACE_USE + // Construction/Destruction + // -------------------------------------------------------------------------------- + +-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \ ++ ((defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L)) + OpenSSLCryptoBase64::OpenSSLCryptoBase64() : mp_ectx(&m_ectx_store), mp_dctx(&m_dctx_store) { } + OpenSSLCryptoBase64::~OpenSSLCryptoBase64() { } + #else +diff --git a/xsec/enc/OpenSSL/OpenSSLCryptoBase64.hpp b/xsec/enc/OpenSSL/OpenSSLCryptoBase64.hpp +index 82aeb0a1..7c947d50 100644 +--- a/xsec/enc/OpenSSL/OpenSSLCryptoBase64.hpp ++++ b/xsec/enc/OpenSSL/OpenSSLCryptoBase64.hpp +@@ -205,7 +205,8 @@ private : + EVP_ENCODE_CTX *mp_ectx; // Encode context + EVP_ENCODE_CTX *mp_dctx; // Decode context + +-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \ ++ ((defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L)) + EVP_ENCODE_CTX m_ectx_store; + EVP_ENCODE_CTX m_dctx_store; + #endif +diff --git a/xsec/enc/OpenSSL/OpenSSLSupport.cpp b/xsec/enc/OpenSSL/OpenSSLSupport.cpp +index cf874f82..c4453004 100644 +--- a/xsec/enc/OpenSSL/OpenSSLSupport.cpp ++++ b/xsec/enc/OpenSSL/OpenSSLSupport.cpp +@@ -273,7 +273,8 @@ int ECDSA_SIG_set0(ECDSA_SIG *sig, BIGNUM *r, BIGNUM *s) + + #endif + +-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \ ++ ((defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L)) + EvpEncodeCtxRAII::EvpEncodeCtxRAII() : mp_ctx(&mp_ctx_store) { }; + EvpEncodeCtxRAII::~EvpEncodeCtxRAII() { } + #else +@@ -289,4 +290,4 @@ EVP_ENCODE_CTX + return mp_ctx; + } + +-#endif +\ No newline at end of file ++#endif +diff --git a/xsec/enc/OpenSSL/OpenSSLSupport.hpp b/xsec/enc/OpenSSL/OpenSSLSupport.hpp +index b5f67f26..09d50899 100644 +--- a/xsec/enc/OpenSSL/OpenSSLSupport.hpp ++++ b/xsec/enc/OpenSSL/OpenSSLSupport.hpp +@@ -88,7 +88,8 @@ public: + + private: + EVP_ENCODE_CTX *mp_ctx; +-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \ ++ ((defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L)) + EVP_ENCODE_CTX mp_ctx_store; + #endif + }; +-- +2.35.1 + diff --git a/package/xmlstarlet/xmlstarlet.hash b/package/xmlstarlet/xmlstarlet.hash index 7191150957a..4b696bb2a43 100644 --- a/package/xmlstarlet/xmlstarlet.hash +++ b/package/xmlstarlet/xmlstarlet.hash @@ -1,5 +1,5 @@ # From https://sourceforge.net/projects/xmlstar/files/xmlstarlet/1.6.1/ -sha1 87bb104f546caca71b9540807c5b2738944cb219 xmlstarlet-1.6.1.tar.gz -md5 f3c5dfa3b1a2ee06cd57c255cc8b70a0 xmlstarlet-1.6.1.tar.gz +sha1 87bb104f546caca71b9540807c5b2738944cb219 xmlstarlet-1.6.1.tar.gz +md5 f3c5dfa3b1a2ee06cd57c255cc8b70a0 xmlstarlet-1.6.1.tar.gz # Locally computed sha256 6641cc5b00c1651fa22175f34efd01695e64a348b1ba07048538276f44866862 COPYING diff --git a/package/xmrig/Config.in b/package/xmrig/Config.in index 70242410175..4dd16fa2b05 100644 --- a/package/xmrig/Config.in +++ b/package/xmrig/Config.in @@ -1,22 +1,31 @@ +# archs officially supported by upstream +config BR2_PACKAGE_XMRIG_ARCH_SUPPORTS + bool + default y if BR2_ARM_CPU_ARMV7A + default y if BR2_aarch64 + default y if BR2_x86_64 + default y if BR2_i386 + config BR2_PACKAGE_XMRIG bool "xmrig" - # archs officially supported by upstream - depends on BR2_aarch64 || BR2_x86_64 || BR2_i386 + depends on BR2_PACKAGE_XMRIG_ARCH_SUPPORTS depends on BR2_USE_MMU # libuv depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv # xmrig needs fenv.h which is not provided by uclibc depends on !BR2_TOOLCHAIN_USES_UCLIBC depends on !BR2_STATIC_LIBS # libuv + depends on BR2_INSTALL_LIBSTDCPP select BR2_PACKAGE_LIBUV help RandomX, CryptoNight, AstroBWT and Argon2 CPU/GPU miner. https://xmrig.com -comment "xmrig needs a glibc or musl toolchain w/ NPTL, dynamic library" - depends on BR2_aarch64 || BR2_x86_64 || BR2_i386 +comment "xmrig needs a glibc or musl toolchain w/ NPTL, dynamic library, C++" + depends on BR2_PACKAGE_XMRIG_ARCH_SUPPORTS depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ - BR2_TOOLCHAIN_USES_UCLIBC || BR2_STATIC_LIBS + BR2_TOOLCHAIN_USES_UCLIBC || BR2_STATIC_LIBS || \ + !BR2_INSTALL_LIBSTDCPP diff --git a/package/xmrig/xmrig.hash b/package/xmrig/xmrig.hash index 36b0c8c8a1c..781e089de89 100644 --- a/package/xmrig/xmrig.hash +++ b/package/xmrig/xmrig.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d413b6a20a0ce30410388d330e1056715333e0863165369668dda596766e9d5b xmrig-6.16.3.tar.gz +sha256 772f947058e5b89ca9bf34128487def47796870b547439a9b0524ddd1899420c xmrig-6.19.0.tar.gz sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE diff --git a/package/xmrig/xmrig.mk b/package/xmrig/xmrig.mk index 7fa638a54cd..f345ba9cf9f 100644 --- a/package/xmrig/xmrig.mk +++ b/package/xmrig/xmrig.mk @@ -4,7 +4,7 @@ # ################################################################################ -XMRIG_VERSION = 6.16.3 +XMRIG_VERSION = 6.19.0 XMRIG_SITE = $(call github,xmrig,xmrig,v$(XMRIG_VERSION)) XMRIG_LICENSE = GPL-3.0+ XMRIG_LICENSE_FILES = LICENSE diff --git a/package/xr819-xradio/Config.in b/package/xr819-xradio/Config.in index 9d7fa4b0f11..b8acd71bfcf 100644 --- a/package/xr819-xradio/Config.in +++ b/package/xr819-xradio/Config.in @@ -1,6 +1,8 @@ config BR2_PACKAGE_XR819_XRADIO bool "xr819-xradio" depends on BR2_LINUX_KERNEL + depends on BR2_arm || BR2_armeb || BR2_aarch64 || \ + BR2_aarch64_be || BR2_riscv help Wireless driver for SDIO WiFi chip XR819 diff --git a/package/xr819-xradio/xr819-xradio.hash b/package/xr819-xradio/xr819-xradio.hash index 4a77db0d1a9..8676f065f82 100644 --- a/package/xr819-xradio/xr819-xradio.hash +++ b/package/xr819-xradio/xr819-xradio.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 06b91b1fcf98a261125b4d599ffcce2458fb9d0c1f38a4bd432a622b446f0f51 xr819-xradio-16180b6308e3c5dc42a92a663adf669028087ff7.tar.gz +sha256 93388424f1f136db541ce056be017f2f0f6688278ac15a88bef34da8f12ffea6 xr819-xradio-119cad7d07aef6973dd44e4dae74d4c9defd06a2.tar.gz # Locally computed sha256 db296f2f7f35bca3a174efb0eb392b3b17bd94b341851429a3dff411b1c2fc73 LICENSE diff --git a/package/xr819-xradio/xr819-xradio.mk b/package/xr819-xradio/xr819-xradio.mk index 5f60be887c8..66c08e79215 100644 --- a/package/xr819-xradio/xr819-xradio.mk +++ b/package/xr819-xradio/xr819-xradio.mk @@ -4,10 +4,18 @@ # ################################################################################ -XR819_XRADIO_VERSION = 16180b6308e3c5dc42a92a663adf669028087ff7 +XR819_XRADIO_VERSION = 119cad7d07aef6973dd44e4dae74d4c9defd06a2 XR819_XRADIO_SITE = $(call github,fifteenhex,xradio,$(XR819_XRADIO_VERSION)) XR819_XRADIO_LICENSE = GPL-2.0 XR819_XRADIO_LICENSE_FILES = LICENSE +define XR819_XRADIO_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_WIRELESS) + $(call KCONFIG_ENABLE_OPT,CONFIG_CFG80211) + $(call KCONFIG_ENABLE_OPT,CONFIG_MAC80211) + $(call KCONFIG_ENABLE_OPT,CONFIG_MMC) + $(call KCONFIG_ENABLE_OPT,CONFIG_PM) +endef + $(eval $(kernel-module)) $(eval $(generic-package)) diff --git a/package/xscreensaver/Config.in b/package/xscreensaver/Config.in index 10b2b7012cf..ba259274d12 100644 --- a/package/xscreensaver/Config.in +++ b/package/xscreensaver/Config.in @@ -1,6 +1,7 @@ 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 @@ -9,11 +10,13 @@ config BR2_PACKAGE_XSCREENSAVER depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libgtk2 -> pango -> harfbuzz select BR2_PACKAGE_GDK_PIXBUF select BR2_PACKAGE_GDK_PIXBUF_XLIB - select BR2_PACKAGE_LIBGLU if BR2_PACKAGE_HAS_LIBGL + select BR2_PACKAGE_LIBGLU select BR2_PACKAGE_LIBGTK2 select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_JPEG select BR2_PACKAGE_XLIB_LIBX11 + select BR2_PACKAGE_XLIB_LIBXFT + select BR2_PACKAGE_XLIB_LIBXI select BR2_PACKAGE_XLIB_LIBXT help XScreenSaver is the standard screen saver collection shipped @@ -26,10 +29,10 @@ config BR2_PACKAGE_XSCREENSAVER http://www.jwz.org/xscreensaver/ -comment "xscreensaver needs a toolchain w/ wchar, C++, threads, gcc >= 4.9" +comment "xscreensaver needs a toolchain w/ wchar, C++, threads, gcc >= 4.9, OpenGL backend" depends on BR2_PACKAGE_XORG7 depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ - !BR2_USE_WCHAR + !BR2_USE_WCHAR || !BR2_PACKAGE_HAS_LIBGL diff --git a/package/xscreensaver/xscreensaver.hash b/package/xscreensaver/xscreensaver.hash index 26ecd8bbbfe..27ef7d8f001 100644 --- a/package/xscreensaver/xscreensaver.hash +++ b/package/xscreensaver/xscreensaver.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 7016df6736ba0126a68c1f35abcf411a695fe93bc01a18ebd9df46c9a9f4d50d xscreensaver-5.45.tar.gz +sha256 328d51797352acf58ca5bab49e76fbf26034e7cad785f651ea11ce7b43fba25a xscreensaver-6.03.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 46dedc3211c..6cc7e8febea 100644 --- a/package/xscreensaver/xscreensaver.mk +++ b/package/xscreensaver/xscreensaver.mk @@ -4,7 +4,7 @@ # ################################################################################ -XSCREENSAVER_VERSION = 5.45 +XSCREENSAVER_VERSION = 6.03 XSCREENSAVER_SITE = https://www.jwz.org/xscreensaver # N.B. GPL-2.0+ code (in the hacks/glx subdirectory) is not currently built. @@ -17,9 +17,13 @@ XSCREENSAVER_DEPENDENCIES = \ gdk-pixbuf \ gdk-pixbuf-xlib \ jpeg \ + libgl \ + libglu \ libgtk2 \ libxml2 \ xlib_libX11 \ + xlib_libXft \ + xlib_libXi \ xlib_libXt \ $(TARGET_NLS_DEPENDENCIES) \ host-intltool @@ -28,14 +32,8 @@ XSCREENSAVER_DEPENDENCIES = \ # compiler/linker XSCREENSAVER_CONF_OPTS = \ --includedir=$(STAGING_DIR)/usr/include \ - --libdir=$(STAGING_DIR)/usr/lib - -ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) -XSCREENSAVER_CONF_OPTS += --with-gl=yes -XSCREENSAVER_DEPENDENCIES += libgl libglu -else -XSCREENSAVER_CONF_OPTS += --with-gl=no -endif + --libdir=$(STAGING_DIR)/usr/lib \ + --with-gl=yes ifeq ($(BR2_PACKAGE_LIBPNG),y) XSCREENSAVER_CONF_OPTS += --with-png=yes @@ -51,20 +49,6 @@ else XSCREENSAVER_CONF_OPTS += --with-systemd=no endif -ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y) -XSCREENSAVER_CONF_OPTS += --with-xft=yes -XSCREENSAVER_DEPENDENCIES += xlib_libXft -else -XSCREENSAVER_CONF_OPTS += --with-xft=no -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXI),y) -XSCREENSAVER_CONF_OPTS += --with-xinput-ext=yes -XSCREENSAVER_DEPENDENCIES += xlib_libXi -else -XSCREENSAVER_CONF_OPTS += --with-xinput-ext=no -endif - ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y) XSCREENSAVER_CONF_OPTS += --with-xinerama-ext=yes XSCREENSAVER_DEPENDENCIES += xlib_libXinerama diff --git a/package/xtables-addons/xtables-addons.hash b/package/xtables-addons/xtables-addons.hash index a103fa3b523..840a31f9478 100644 --- a/package/xtables-addons/xtables-addons.hash +++ b/package/xtables-addons/xtables-addons.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2a640535f209ec59467b8c8b4343b446801a21a112a3fc189818d6e2697f5cf1 xtables-addons-3.17.tar.xz +sha256 faa16a27166275afbfe8df605f55c3a81ac693bf19da674d45ceded4137ae217 xtables-addons-3.22.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE diff --git a/package/xtables-addons/xtables-addons.mk b/package/xtables-addons/xtables-addons.mk index b3d1bf2d448..e794538956c 100644 --- a/package/xtables-addons/xtables-addons.mk +++ b/package/xtables-addons/xtables-addons.mk @@ -4,7 +4,7 @@ # ################################################################################ -XTABLES_ADDONS_VERSION = 3.17 +XTABLES_ADDONS_VERSION = 3.22 XTABLES_ADDONS_SOURCE = xtables-addons-$(XTABLES_ADDONS_VERSION).tar.xz XTABLES_ADDONS_SITE = https://inai.de/files/xtables-addons XTABLES_ADDONS_DEPENDENCIES = iptables linux host-pkgconf @@ -16,12 +16,6 @@ XTABLES_ADDONS_CONF_OPTS = \ --with-xtables="$(STAGING_DIR)/usr" \ --with-xtlibdir="/usr/lib/xtables" -# geoip helpers need perl with modules and unzip so disable -define XTABLES_ADDONS_DISABLE_GEOIP_HELPERS - $(SED) 's/ geoip//' $(@D)/Makefile.in -endef -XTABLES_ADDONS_POST_PATCH_HOOKS += XTABLES_ADDONS_DISABLE_GEOIP_HELPERS - define XTABLES_ADDONS_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) endef @@ -30,6 +24,15 @@ define XTABLES_ADDONS_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) DESTDIR="$(TARGET_DIR)" install endef +# geoip helpers need perl with modules and unzip so remove them +define XTABLES_ADDONS_REMOVE_GEOIP_HELPERS + $(RM) $(TARGET_DIR)/usr/bin/xt_geoip* + $(RM) $(TARGET_DIR)/usr/libexec/xtables-addons/xt_asn* + $(RM) $(TARGET_DIR)/usr/libexec/xtables-addons/xt_geoip* +endef + +XTABLES_ADDONS_POST_INSTALL_TARGET_HOOKS += XTABLES_ADDONS_REMOVE_GEOIP_HELPERS + define XTABLES_ADDONS_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_ADVANCED) $(call KCONFIG_ENABLE_OPT,CONFIG_NF_CONNTRACK) diff --git a/package/xterm/xterm.hash b/package/xterm/xterm.hash index 3f6ec765ced..1a2ad8fea0f 100644 --- a/package/xterm/xterm.hash +++ b/package/xterm/xterm.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 32f888277b19e28ebc0a3112bff000607c07bed0679caa0beebb36f9cad484f5 xterm-371.tgz +sha256 31ef870740ceae020c3c4b4a9601c7f47bfd46672c1aaf2d213a565d64cbc373 xterm-384.tgz # Locally calculated -sha256 9521ef761474cd31ea406f56a751646a7b42a9287cdc6f2f8e52ed4c4d2a73e7 COPYING +sha256 98d02d0b7f7b8aabb742b05e6960caaa9ae20e26d2f0d0dc57808362f2ac79bc COPYING diff --git a/package/xterm/xterm.mk b/package/xterm/xterm.mk index 95984f1cf93..2fc2f734c82 100644 --- a/package/xterm/xterm.mk +++ b/package/xterm/xterm.mk @@ -4,7 +4,7 @@ # ################################################################################ -XTERM_VERSION = 371 +XTERM_VERSION = 384 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/xutil_util-macros/xutil_util-macros.hash b/package/xutil_util-macros/xutil_util-macros.hash index 3f28743e64c..4fcddb7a859 100644 --- a/package/xutil_util-macros/xutil_util-macros.hash +++ b/package/xutil_util-macros/xutil_util-macros.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2021-January/003069.html -sha256 0f812e6e9d2786ba8f54b960ee563c0663ddbe2434bf24ff193f5feab1f31971 util-macros-1.19.3.tar.bz2 -sha512 b9c7398a912c688a782eab5b1e0f6da2df11a430775c5c98fc3269f73a665de6eeb60d300a849e38d345714a6e51f74e9334cb6039767304cca4b93d823a53a2 util-macros-1.19.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-February/003324.html +sha256 0b86b262dbe971edb4ff233bc370dfad9f241d09f078a3f6d5b7f4b8ea4430db util-macros-1.20.0.tar.xz +sha512 76caefb118bf1675d7b2b96e1bbb04eb9a320b02e120839e55a22ef98538ecf00d0e686a67186fc8fdc8492d277ffe3125ae8b7ac61ce4739edc0de3f468d2eb util-macros-1.20.0.tar.xz # Locally computed -sha256 489b630a75e3255485732eae3d50ff4d29d3feb66760bb3acb04f897e4d9e375 COPYING +sha256 7db0516389152a90c20ea910e8839d10204ebc25ccbc71fc7f5809dfb98e80ac COPYING diff --git a/package/xutil_util-macros/xutil_util-macros.mk b/package/xutil_util-macros/xutil_util-macros.mk index b0ce14ee5a2..e2e40eb84e1 100644 --- a/package/xutil_util-macros/xutil_util-macros.mk +++ b/package/xutil_util-macros/xutil_util-macros.mk @@ -4,9 +4,9 @@ # ################################################################################ -XUTIL_UTIL_MACROS_VERSION = 1.19.3 -XUTIL_UTIL_MACROS_SOURCE = util-macros-$(XUTIL_UTIL_MACROS_VERSION).tar.bz2 -XUTIL_UTIL_MACROS_SITE = http://xorg.freedesktop.org/releases/individual/util +XUTIL_UTIL_MACROS_VERSION = 1.20.0 +XUTIL_UTIL_MACROS_SOURCE = util-macros-$(XUTIL_UTIL_MACROS_VERSION).tar.xz +XUTIL_UTIL_MACROS_SITE = https://xorg.freedesktop.org/archive/individual/util XUTIL_UTIL_MACROS_LICENSE = MIT XUTIL_UTIL_MACROS_LICENSE_FILES = COPYING diff --git a/package/xxhash/0004-Makefile-add-install_libxxhash.includes-target.patch b/package/xxhash/0004-Makefile-add-install_libxxhash.includes-target.patch new file mode 100644 index 00000000000..22c8cdaadff --- /dev/null +++ b/package/xxhash/0004-Makefile-add-install_libxxhash.includes-target.patch @@ -0,0 +1,39 @@ +From b7c91f761b6d0b79398d0a064d2d6e34de3dfa47 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 27 Dec 2022 23:12:37 +0100 +Subject: [PATCH] Makefile: add install_libxxhash.includes target + +Add install_libxxhash.includes to be able to install headers when +building and installing the static library + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/Cyan4973/xxHash/pull/776] +--- + Makefile | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index cfa5779..2276282 100644 +--- a/Makefile ++++ b/Makefile +@@ -557,6 +557,8 @@ install_libxxhash: libxxhash + $(Q)$(INSTALL_PROGRAM) $(LIBXXH) $(DESTDIR)$(LIBDIR) + $(Q)ln -sf $(LIBXXH) $(DESTDIR)$(LIBDIR)/libxxhash.$(SHARED_EXT_MAJOR) + $(Q)ln -sf $(LIBXXH) $(DESTDIR)$(LIBDIR)/libxxhash.$(SHARED_EXT) ++ ++install_libxxhash.includes: + $(Q)$(INSTALL) -d -m 755 $(DESTDIR)$(INCLUDEDIR) # includes + $(Q)$(INSTALL_DATA) xxhash.h $(DESTDIR)$(INCLUDEDIR) + $(Q)$(INSTALL_DATA) xxh3.h $(DESTDIR)$(INCLUDEDIR) # for compatibility, will be removed in v0.9.0 +@@ -586,7 +588,7 @@ install_man: + $(Q)ln -sf xxhsum.1 $(DESTDIR)$(MANDIR)/xxh128sum.1 + + .PHONY: install +-install: install_libxxhash.a install_libxxhash install_libxxhash.pc install_xxhsum install_man ## install libraries, CLI, links and man page ++install: install_libxxhash.a install_libxxhash install_libxxhash.includes install_libxxhash.pc install_xxhsum install_man ## install libraries, CLI, links and man page + @echo xxhash installation completed + + .PHONY: uninstall +-- +2.35.1 + diff --git a/package/xxhash/xxhash.mk b/package/xxhash/xxhash.mk index a8f8d1d179f..75d375a2fa1 100644 --- a/package/xxhash/xxhash.mk +++ b/package/xxhash/xxhash.mk @@ -10,24 +10,25 @@ XXHASH_LICENSE = BSD-2-Clause (library), GPL-2.0+ (xxhsum) XXHASH_LICENSE_FILES = LICENSE cli/COPYING XXHASH_INSTALL_STAGING = YES -XXHASH_TARGETS = xxhsum -XXHASH_INSTALL_TARGETS = install_xxhsum - -ifeq ($(BR2_STATIC_LIBS),y) -XXHASH_TARGETS += libxxhash.a libxxhash.pc -XXHASH_INSTALL_TARGETS += install_libxxhash.a install_libxxhash.pc -else ifeq ($(BR2_SHARED_LIBS),y) -XXHASH_TARGETS += libxxhash libxxhash.pc -XXHASH_INSTALL_TARGETS += install_libxxhash install_libxxhash.pc -else ifeq ($(BR2_SHARED_STATIC_LIBS),y) -XXHASH_TARGETS += libxxhash.a libxxhash libxxhash.pc -XXHASH_INSTALL_TARGETS += \ - install_libxxhash.a install_libxxhash install_libxxhash.pc +XXHASH_TARGETS = xxhsum libxxhash.pc +XXHASH_INSTALL_TARGETS = \ + install_libxxhash.includes \ + install_libxxhash.pc \ + install_xxhsum + +ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),y) +XXHASH_TARGETS += libxxhash.a +XXHASH_INSTALL_TARGETS += install_libxxhash.a +endif + +ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y) +XXHASH_TARGETS += libxxhash +XXHASH_INSTALL_TARGETS += install_libxxhash endif define XXHASH_BUILD_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ - $(XXHASH_TARGETS) + MOREFLAGS=-DXXH_NO_INLINE_HINTS $(XXHASH_TARGETS) endef define XXHASH_INSTALL_STAGING_CMDS diff --git a/package/xz/0001-Detect-symver-attribute-support.patch b/package/xz/0001-Detect-symver-attribute-support.patch new file mode 100644 index 00000000000..462fa9d86ba --- /dev/null +++ b/package/xz/0001-Detect-symver-attribute-support.patch @@ -0,0 +1,70 @@ +From f0e0e8bd08b4d4e7c89a5a3b7d9a3c083f7e5432 Mon Sep 17 00:00:00 2001 +From: Vincent Fazio +Date: Wed, 8 Feb 2023 12:58:37 +0000 +Subject: [PATCH] Detect symver attribute support + +On Microblaze, builds will fail when trying to add symver information +because __attribute__((symver ..)) is not supported even though +__has_attribute(__symver__) returns true. + +Support for symver needs to be detected via a compile test since +__has_attribute can report false positives [0]. + +Add a configure compile check for __attribute__((symver ..)) to ensure +it is supported and define a variable to advertise support. + +[0] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101766#c1 + +Upstream: https://github.com/tukaani-project/xz/pull/32 +Signed-off-by: Thomas Petazzoni +Signed-off-by: Vincent Fazio +[Peter: patch configure instead of configure.ac so autoreconf isn't +triggered at build time] +Signed-off-by: Peter Korsgaard +--- + configure | 15 +++++++++++++++ + src/liblzma/common/common.h | 2 +- + 2 files changed, 16 insertions(+), 1 deletion(-) + +diff --git a/src/liblzma/common/common.h b/src/liblzma/common/common.h +index 671d3bc..27b56ee 100644 +--- a/src/liblzma/common/common.h ++++ b/src/liblzma/common/common.h +@@ -76,7 +76,7 @@ + // too (which doesn't support __symver__) so use it to detect if __symver__ + // is available. This should be far more reliable than looking at compiler + // version macros as nowadays especially __GNUC__ is defined by many compilers. +-# if lzma_has_attribute(__symver__) ++# if defined(HAVE_SYMVER_ATTRIBUTE) + # define LZMA_SYMVER_API(extnamever, type, intname) \ + extern __attribute__((__symver__(extnamever))) \ + LZMA_API(type) intname +diff --git a/configure b/configure +index ff0eed5..e685b30 100755 +--- a/configure ++++ b/configure +@@ -16687,6 +16687,21 @@ printf "%s\n" "" >&6; } + + printf "%s\n" "#define HAVE_SYMBOL_VERSIONS_LINUX $have_symbol_versions_linux" >>confdefs.h + ++ OLD_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS -Werror" # we need -Werror to make sure the attribute is not ignored ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++__attribute__ ((symver ("test@TEST"))) void foo(void) { } ++ ++_ACEOF ++if ac_fn_c_try_compile "$LINENO" ++then : ++ ++printf "%s\n" "#define HAVE_SYMVER_ATTRIBUTE 1" >>confdefs.h ++ ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ++ CFLAGS="$OLD_CFLAGS" + ;; + *) + enable_symbol_versions=generic +-- +2.34.1 + diff --git a/package/xz/xz.hash b/package/xz/xz.hash index 3dd0cbe4594..1153e02b4d4 100644 --- a/package/xz/xz.hash +++ b/package/xz/xz.hash @@ -1,5 +1,6 @@ # Locally calculated after checking pgp signature -sha256 5117f930900b341493827d63aa910ff5e011e0b994197c3b71c08a20228a42df xz-5.2.5.tar.bz2 +# https://tukaani.org/xz/xz-5.2.10.tar.bz2.sig +sha256 01b71df61521d9da698ce3c33148bff06a131628ff037398c09482f3a26e5408 xz-5.2.10.tar.bz2 # Hash for license files sha256 bcb02973ef6e87ea73d331b3a80df7748407f17efdb784b61b47e0e610d3bb5c COPYING diff --git a/package/xz/xz.mk b/package/xz/xz.mk index af611975a02..0120d23b85e 100644 --- a/package/xz/xz.mk +++ b/package/xz/xz.mk @@ -4,7 +4,7 @@ # ################################################################################ -XZ_VERSION = 5.2.5 +XZ_VERSION = 5.2.10 XZ_SOURCE = xz-$(XZ_VERSION).tar.bz2 XZ_SITE = https://tukaani.org/xz XZ_INSTALL_STAGING = YES diff --git a/package/yad/yad.hash b/package/yad/yad.hash index 1eee499c736..ec0edc522d4 100644 --- a/package/yad/yad.hash +++ b/package/yad/yad.hash @@ -1,6 +1,6 @@ # From http://sourceforge.net/projects/yad-dialog/files/ -md5 82d458a2e1695dd0709f71ad26109812 yad-0.40.0.tar.xz -sha1 4376eb42f8e38972124dc81e534cbdc9088109fb yad-0.40.0.tar.xz +md5 82d458a2e1695dd0709f71ad26109812 yad-0.40.0.tar.xz +sha1 4376eb42f8e38972124dc81e534cbdc9088109fb yad-0.40.0.tar.xz # Hash for license file -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/yajl/yajl.mk b/package/yajl/yajl.mk index 1fb16f50e95..cd23c8728da 100644 --- a/package/yajl/yajl.mk +++ b/package/yajl/yajl.mk @@ -5,9 +5,10 @@ ################################################################################ YAJL_VERSION = 2.1.0 -YAJL_SITE = $(call github,lloyd,yajl,$(YAJL_VERSION)) +YAJL_SITE = $(call github,lloyd,yajl,refs/tags/$(YAJL_VERSION)) YAJL_INSTALL_STAGING = YES YAJL_LICENSE = ISC YAJL_LICENSE_FILES = COPYING +YAJL_CPE_ID_VENDOR = yajl_project $(eval $(cmake-package)) diff --git a/package/yaml-cpp/yaml-cpp.hash b/package/yaml-cpp/yaml-cpp.hash index 2f7a6fc639d..9ad90414398 100644 --- a/package/yaml-cpp/yaml-cpp.hash +++ b/package/yaml-cpp/yaml-cpp.hash @@ -1,3 +1,3 @@ # locally computed -sha256 77ea1b90b3718aa0c324207cb29418f5bced2354c2e483a9523d98c3460af1ed yaml-cpp-0.6.3.tar.gz +sha256 43e6a9fcb146ad871515f0d0873947e5d497a1c9c60c58cb102a97b47208b7c3 yaml-cpp-0.7.0.tar.gz sha256 aa6fcc27be034e41e21dd832f9175bfe694a48491d9e14ff0fa278e19ad14f1b LICENSE diff --git a/package/yaml-cpp/yaml-cpp.mk b/package/yaml-cpp/yaml-cpp.mk index 895072ec45a..367df27ff19 100644 --- a/package/yaml-cpp/yaml-cpp.mk +++ b/package/yaml-cpp/yaml-cpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -YAML_CPP_VERSION = 0.6.3 +YAML_CPP_VERSION = 0.7.0 YAML_CPP_SITE = $(call github,jbeder,yaml-cpp,yaml-cpp-$(YAML_CPP_VERSION)) YAML_CPP_INSTALL_STAGING = YES YAML_CPP_LICENSE = MIT @@ -13,13 +13,8 @@ YAML_CPP_CPE_ID_VENDOR = yaml-cpp_project # Disable testing and parse tools YAML_CPP_CONF_OPTS += \ + -DCMAKE_DEBUG_POSTFIX="" \ -DYAML_CPP_BUILD_TESTS=OFF \ -DYAML_CPP_BUILD_TOOLS=OFF -ifeq ($(BR2_STATIC_LIBS),y) -YAML_CPP_CONF_OPTS += -DYAML_BUILD_SHARED_LIBS=OFF -else -YAML_CPP_CONF_OPTS += -DYAML_BUILD_SHARED_LIBS=ON -endif - $(eval $(cmake-package)) diff --git a/package/yavta/yavta.mk b/package/yavta/yavta.mk index d16bee69b11..db481b77b95 100644 --- a/package/yavta/yavta.mk +++ b/package/yavta/yavta.mk @@ -5,7 +5,7 @@ ################################################################################ YAVTA_VERSION = 583bedefc2a247d2cfd32d1b4a0abbe3e2015c70 -YAVTA_SITE = https://git.ideasonboard.org/git/yavta.git +YAVTA_SITE = https://git.ideasonboard.org/yavta.git YAVTA_SITE_METHOD = git YAVTA_LICENSE = GPL-2.0+ YAVTA_LICENSE_FILES = COPYING.GPL diff --git a/package/z3/Config.in b/package/z3/Config.in new file mode 100644 index 00000000000..8cd31286879 --- /dev/null +++ b/package/z3/Config.in @@ -0,0 +1,45 @@ +# z3 supports arch for which libc fenv.h provides all four macros: +# FE_DOWNWARD, FE_TONEAREST, FE_TOWARDZERO, FE_UPWARD +# See for example in glibc https://sourceware.org/git/glibc.git +# git grep -E '^[[:space:]]*#[[:space:]]*define[[:space:]]+FE_(TONEAREST|UPWARD|DOWNWARD|TOWARDZERO)' sysdeps/ +config BR2_PACKAGE_Z3_ARCH_SUPPORTS + bool + default y if BR2_aarch64 || BR2_aarch64_be + default y if BR2_arceb || BR2_arcle + default y if BR2_arm || BR2_armeb + default y if BR2_i386 + 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 + default y if BR2_s390x + # BR2_sh has only FE_{TONEAREST,TOWARDZERO} + default y if BR2_sparc || BR2_sparc64 + default y if BR2_x86_64 + # BR2_xtensa supports only uclibc which does not have fenv.h + +config BR2_PACKAGE_Z3 + bool "z3" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # c++17 + # z3 needs fenv.h which is not provided by uclibc + depends on !BR2_TOOLCHAIN_USES_UCLIBC + depends on BR2_PACKAGE_Z3_ARCH_SUPPORTS + help + Z3, also known as the Z3 Theorem Prover, is a cross-platform + satisfiability modulo theories (SMT) solver. + + https://github.com/Z3Prover/z3 + +if BR2_PACKAGE_Z3 + +config BR2_PACKAGE_Z3_PYTHON + bool "Python bindings" + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime + select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime + +endif diff --git a/package/z3/z3.hash b/package/z3/z3.hash new file mode 100644 index 00000000000..8a511c3fe5d --- /dev/null +++ b/package/z3/z3.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 a3735fabf00e1341adcc70394993c05fd3e2ae167a3e9bb46045e33084eb64a3 z3-4.12.1.tar.gz +sha256 e617cad2ab9347e3129c2b171e87909332174e17961c5c3412d0799469111337 LICENSE.txt diff --git a/package/z3/z3.mk b/package/z3/z3.mk new file mode 100644 index 00000000000..45c412ad126 --- /dev/null +++ b/package/z3/z3.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# z3 +# +################################################################################ + +Z3_VERSION = 4.12.1 +Z3_SITE = $(call github,Z3Prover,z3,z3-$(Z3_VERSION)) +Z3_LICENSE = MIT +Z3_LICENSE_FILES = LICENSE.txt +Z3_INSTALL_STAGING = YES +Z3_SUPPORTS_IN_SOURCE_BUILD = NO + +ifeq ($(BR2_PACKAGE_Z3_PYTHON),y) +Z3_CONF_OPTS += \ + -DCMAKE_INSTALL_PYTHON_PKG_DIR=/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ + -DZ3_BUILD_PYTHON_BINDINGS=ON +else +Z3_CONF_OPTS += -DZ3_BUILD_PYTHON_BINDINGS=OFF +endif + +$(eval $(cmake-package)) diff --git a/package/zabbix/0001-m4-netsnmp.m4-fix-shared-netsnmp-build.patch b/package/zabbix/0001-m4-netsnmp.m4-fix-shared-netsnmp-build.patch new file mode 100644 index 00000000000..ffb1f54ba23 --- /dev/null +++ b/package/zabbix/0001-m4-netsnmp.m4-fix-shared-netsnmp-build.patch @@ -0,0 +1,44 @@ +From 3e810c0804ec40ad6e111a9791cdb2033ecdad71 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 25 Feb 2022 23:30:19 +0100 +Subject: [PATCH] m4/netsnmp.m4: fix shared netsnmp build + +Since commit fe391e8689c523d3c7ea6b173d25aa5dba3a6902, the build fails +with the following error if the user provides the path of +net-snmp-config through the --with-net-snmp option: + +configure: error: "libnetsnmp.a static library was not found in /home/buildroot/autobuild/instance-0/output-1/host/powerpc64le-buildroot-linux-gnu/sysroot/usr/bin/../../usr/lib" + +However, the assumption that a static library will be provided by the +system is just plain wrong so replace AC_MSG_ERROR by AC_MSG_WARN + +Fixes: + - http://autobuild.buildroot.org/results/0f541e45d1fa27b3302968683bf64949131ec1c9 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/zabbix/zabbix/pull/61] +--- + m4/netsnmp.m4 | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/m4/netsnmp.m4 b/m4/netsnmp.m4 +index 5e84d84303..87e21a67e6 100644 +--- a/m4/netsnmp.m4 ++++ b/m4/netsnmp.m4 +@@ -140,8 +140,11 @@ AC_HELP_STRING([--with-net-snmp@<:@=ARG@:>@], + test [ "x$static_linking_support" = "xno" -o -z "$static_linking_support" ] -a -z "$_libsnmp_dir_lib" && AC_MSG_ERROR(["Compiler not support statically linked libs from default folders"]) + + if test "x$static_linking_support" = "xno" -o -z "$static_linking_support"; then +- test -f $_libsnmp_dir_lib/libnetsnmp.a || AC_MSG_ERROR(["libnetsnmp.a static library was not found in $_libsnmp_dir_lib"]) +- SNMP_LIBS=`echo "$SNMP_LIBS"|sed "s|-lnetsnmp|$_libsnmp_dir_lib/libnetsnmp.a|g"` ++ if test -f $_libsnmp_dir_lib/libnetsnmp.a; then ++ SNMP_LIBS=`echo "$SNMP_LIBS"|sed "s|-lnetsnmp|$_libsnmp_dir_lib/libnetsnmp.a|g"` ++ else ++ AC_MSG_WARN(["libnetsnmp.a static library was not found in $_libsnmp_dir_lib"]) ++ fi + else + SNMP_LIBS=`echo "$SNMP_LIBS"|sed "s/-lnetsnmp/${static_linking_support}static -lnetsnmp ${static_linking_support}dynamic/g"` + fi +-- +2.34.1 + diff --git a/package/zabbix/0002-fix-build-with-libressl-3.5.0.patch b/package/zabbix/0002-fix-build-with-libressl-3.5.0.patch new file mode 100644 index 00000000000..acb5cfc9a67 --- /dev/null +++ b/package/zabbix/0002-fix-build-with-libressl-3.5.0.patch @@ -0,0 +1,71 @@ +From 5c8511384f1d41f9c2a131604d5cb2dbc1c0aec9 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 24 Feb 2023 12:23:56 +0100 +Subject: [PATCH] fix build with libressl >= 3.5.0 + +Fix the following build failure with libressl >= 3.5.0: + +tls.c:113:17: error: static declaration of 'OPENSSL_cleanup' follows non-static declaration + 113 | static void OPENSSL_cleanup(void) + | ^~~~~~~~~~~~~~~ +In file included from /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/bio.h:69, + from /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/evp.h:67, + from /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/hmac.h:67, + from /home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/ssl.h:150, + from ../../../include/zbxcomms.h:65, + from tls.c:20: +/home/thomas/autobuild/instance-3/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/openssl/crypto.h:565:6: note: previous declaration of 'OPENSSL_cleanup' with type 'void(void)' + 565 | void OPENSSL_cleanup(void); + | ^~~~~~~~~~~~~~~ +In file included from tls.c:20: +tls.c: In function 'zbx_log_ciphersuites': +../../../include/zbxcomms.h:222:75: error: invalid use of incomplete typedef 'SSL_CTX' {aka 'struct ssl_ctx_st'} + 222 | # define SSL_CTX_get_ciphers(ciphers) ((ciphers)->cipher_list) + | ^~ +tls.c:1415:31: note: in expansion of macro 'SSL_CTX_get_ciphers' + 1415 | cipher_list = SSL_CTX_get_ciphers(ciphers); + | ^~~~~~~~~~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/acdfcb17b39d438ccf5e4621707a10f60577d233 + +Signed-off-by: Fabrice Fontaine +[Upstream status: not sent (no feedback on first patch)] +--- + include/zbxcomms.h | 3 ++- + src/libs/zbxcomms/tls.c | 5 +++-- + 2 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/include/zbxcomms.h b/include/zbxcomms.h +index e7d74dbd0f..d6efa358fe 100644 +--- a/include/zbxcomms.h ++++ b/include/zbxcomms.h +@@ -253,7 +253,8 @@ int zbx_telnet_execute(ZBX_SOCKET socket_fd, const char *command, AGENT_RESULT * + /* TLS BLOCK */ + #if defined(HAVE_GNUTLS) || defined(HAVE_OPENSSL) + +-#if defined(HAVE_OPENSSL) && OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER) ++#if defined(HAVE_OPENSSL) && OPENSSL_VERSION_NUMBER < 0x1010000fL || \ ++ defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x3050000fL + # if !defined(LIBRESSL_VERSION_NUMBER) + # define OPENSSL_INIT_LOAD_SSL_STRINGS 0 + # define OPENSSL_INIT_LOAD_CRYPTO_STRINGS 0 +diff --git a/src/libs/zbxcomms/tls.c b/src/libs/zbxcomms/tls.c +index 54ab0a6ef4..bd4075b3e4 100644 +--- a/src/libs/zbxcomms/tls.c ++++ b/src/libs/zbxcomms/tls.c +@@ -30,8 +30,9 @@ + #include "zbxstr.h" + #include "zbxtime.h" + +-#if defined(HAVE_OPENSSL) && OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER) +-/* for OpenSSL 1.0.1/1.0.2 (before 1.1.0) or LibreSSL */ ++#if defined(HAVE_OPENSSL) && OPENSSL_VERSION_NUMBER < 0x1010000fL || \ ++ defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x3050000fL ++/* for OpenSSL 1.0.1/1.0.2 (before 1.1.0) or LibreSSL (before 3.5.0) */ + + /* mutexes for multi-threaded OpenSSL (see "man 3ssl threads" and example in crypto/threads/mttest.c) */ + +-- +2.39.1 + diff --git a/package/zabbix/Config.in b/package/zabbix/Config.in index 6f8a952936b..377c0ff692c 100644 --- a/package/zabbix/Config.in +++ b/package/zabbix/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_ZABBIX bool "zabbix" depends on BR2_TOOLCHAIN_USES_GLIBC - select BR2_PACKAGE_PCRE + select BR2_PACKAGE_PCRE2 help Zabbix is an enterprise-class open source distributed monitoring solution. Zabbix is free of cost. Zabbix is @@ -45,6 +45,7 @@ config BR2_PACKAGE_ZABBIX_SERVER_POSTGRESQL bool "postgresql" depends on BR2_USE_WCHAR # postgresql depends on !BR2_STATIC_LIBS # postgresql + depends on !BR2_OPTIMIZE_FAST # postgresql select BR2_PACKAGE_POSTGRESQL endchoice diff --git a/package/zabbix/zabbix.hash b/package/zabbix/zabbix.hash index 42cc0bda579..bb6127e5ecf 100644 --- a/package/zabbix/zabbix.hash +++ b/package/zabbix/zabbix.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 19686628df76e8d5ef7c2ed2975b258c7ca3ec7d151b1bb59d7e132f9fc7c941 zabbix-5.4.9.tar.gz -sha256 10d68ec3abacc29222c07748fc5e5cb9474fd7cd9ccdde1b92ff941ded946b78 README +sha256 6d423810667b948ed22052d9aa84a035e2d4b92cbe8efdb669cac529806b722d zabbix-6.2.7.tar.gz +sha256 f8fc3fd12521b60d53d8c5d48a883eb3c9c5ddec9de986a273e1b77f69d811db README sha256 444fe54aecc95ac0f3314289c300afc73b3946a4dc9fbd7e022709b3e0924dd0 COPYING diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk index e6564e68fd0..0d6c579f4c7 100644 --- a/package/zabbix/zabbix.mk +++ b/package/zabbix/zabbix.mk @@ -4,16 +4,18 @@ # ################################################################################ -ZABBIX_VERSION_MAJOR = 5.4 -ZABBIX_VERSION = $(ZABBIX_VERSION_MAJOR).9 +ZABBIX_VERSION_MAJOR = 6.2 +ZABBIX_VERSION = $(ZABBIX_VERSION_MAJOR).7 ZABBIX_SITE = https://cdn.zabbix.com/zabbix/sources/stable/$(ZABBIX_VERSION_MAJOR) ZABBIX_LICENSE = GPL-2.0+ ZABBIX_LICENSE_FILES = README COPYING ZABBIX_CPE_ID_VENDOR = zabbix +# We're patching m4/netsnmp.m4 +ZABBIX_AUTORECONF = YES -ZABBIX_DEPENDENCIES = pcre +ZABBIX_DEPENDENCIES = host-pkgconf pcre2 ZABBIX_CONF_OPTS = \ - --with-libpcre=$(STAGING_DIR)/usr/bin/ \ + --with-libpcre2 \ --without-sqlite3 \ --enable-agent \ --disable-agent2 \ @@ -53,7 +55,7 @@ else ZABBIX_CONF_OPTS += --without-libxml2 endif -ifeq ($(BR2_PACKAGE_NETSNMP),y) +ifeq ($(BR2_PACKAGE_NETSNMP_ENABLE_MIBS),y) ZABBIX_CONF_OPTS += --with-net-snmp=$(STAGING_DIR)/usr/bin/net-snmp-config ZABBIX_DEPENDENCIES += netsnmp else @@ -123,6 +125,13 @@ endif endif # BR2_PACKAGE_ZABBIX_SERVER +# zabbix uses custom --enable-{static,shared} options, instead of +# standard libtool directives resulting in a build failure with libcurl +# or openssl. +ifeq ($(BR2_SHARED_STATIC_LIBS),y) +ZABBIX_CONF_OPTS += --disable-static +endif + define ZABBIX_INSTALL_INIT_SYSTEMD $(foreach unit,$(ZABBIX_SYSTEMD_UNITS),\ $(INSTALL) -D -m 0644 $(ZABBIX_PKGDIR)/$(unit) $(TARGET_DIR)/usr/lib/systemd/system/$(unit) && \ diff --git a/package/zbar/0001-python-enum-fix-build-for-Python-3.11.patch b/package/zbar/0001-python-enum-fix-build-for-Python-3.11.patch new file mode 100644 index 00000000000..f525b62184f --- /dev/null +++ b/package/zbar/0001-python-enum-fix-build-for-Python-3.11.patch @@ -0,0 +1,62 @@ +From fbaec4b4e6fe735efe6916fe5b92805a0d96bf8a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= + +Date: Wed, 21 Sep 2022 10:32:11 +0700 +Subject: [PATCH] python: enum: fix build for Python 3.11 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Python 3.9 introduced Py_SET_SIZE function to set size instead of +relying on Py_SIZE() as a macro [3.9]. + +Python 3.10 started to encourage to use Py_SET_SIZE instead of +assigning into return value of Py_SIZE [3.10]. + +Python 3.11 flips the switch, turn Py_SIZE into a function [3.11], +thus Py_SIZE(obj) will be a rvalue. We need to use Py_SET_SIZE +to set size now. + +[3.9]: https://docs.python.org/3.9/c-api/structures.html#c.Py_SET_SIZE +[3.10]: https://docs.python.org/3.10/c-api/structures.html#c.Py_SIZE +[3.11]: https://docs.python.org/3.11/c-api/structures.html#c.Py_SIZE + +Signed-off-by: Đoàn Trần Công Danh +Signed-off-by: James Hilliard +[Upstream status: +https://github.com/mchehab/zbar/pull/231] +--- + python/enum.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/python/enum.c b/python/enum.c +index dfe1b1e..946344f 100644 +--- a/python/enum.c ++++ b/python/enum.c +@@ -52,7 +52,11 @@ enumitem_new (PyTypeObject *type, + + /* we assume the "fast path" for a single-digit ints (see longobject.c) */ + /* this also holds if we get a small_int preallocated long */ ++#if PY_VERSION_HEX >= 0x03090000 ++ Py_SET_SIZE(&self->val, Py_SIZE(longval)); ++#else + Py_SIZE(&self->val) = Py_SIZE(longval); ++#endif + self->val.ob_digit[0] = longval->ob_digit[0]; + Py_DECREF(longval); + #else +@@ -143,7 +147,11 @@ zbarEnumItem_New (PyObject *byname, + + /* we assume the "fast path" for a single-digit ints (see longobject.c) */ + /* this also holds if we get a small_int preallocated long */ ++#if PY_VERSION_HEX >= 0x03090000 ++ Py_SET_SIZE(&self->val, Py_SIZE(longval)); ++#else + Py_SIZE(&self->val) = Py_SIZE(longval); ++#endif + self->val.ob_digit[0] = longval->ob_digit[0]; + Py_DECREF(longval); + +-- +2.34.1 + diff --git a/package/zbar/zbar.mk b/package/zbar/zbar.mk index fb83fa01d5f..2c933929cf1 100644 --- a/package/zbar/zbar.mk +++ b/package/zbar/zbar.mk @@ -9,6 +9,7 @@ ZBAR_SOURCE = zbar-$(ZBAR_VERSION).tar.bz2 ZBAR_SITE = https://www.linuxtv.org/downloads/zbar ZBAR_LICENSE = LGPL-2.1+ ZBAR_LICENSE_FILES = LICENSE.md +ZBAR_CPE_ID_VENDOR = zbar_project ZBAR_INSTALL_STAGING = YES ZBAR_DEPENDENCIES = libv4l jpeg $(TARGET_NLS_DEPENDENCIES) # uses C99 features diff --git a/package/zchunk/0001-meson-fix-argp-standalone-wrap-and-find_library.patch b/package/zchunk/0001-meson-fix-argp-standalone-wrap-and-find_library.patch new file mode 100644 index 00000000000..6c9cdba3adc --- /dev/null +++ b/package/zchunk/0001-meson-fix-argp-standalone-wrap-and-find_library.patch @@ -0,0 +1,106 @@ +From 473c97cda44b95f5cea08a0cdd566e602df564db Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Thu, 21 Apr 2022 14:24:01 -0600 +Subject: [PATCH] meson: fix argp-standalone wrap and find_library + +Signed-off-by: James Hilliard +[james.hilliard1@gmail.com: backport from upstream commit +473c97cda44b95f5cea08a0cdd566e602df564db] +--- + .github/workflows/main.yml | 27 --------------------------- + meson.build | 6 +++--- + subprojects/argp-standalone.wrap | 7 +++++++ + 3 files changed, 10 insertions(+), 30 deletions(-) + create mode 100644 subprojects/argp-standalone.wrap + +diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml +index c49806f..35667af 100644 +--- a/.github/workflows/main.yml ++++ b/.github/workflows/main.yml +@@ -35,25 +35,11 @@ jobs: + steps: + - uses: actions/checkout@v2 + +- - uses: actions/checkout@v2 +- with: +- repository: wolfv/argp-standalone +- path: argp-standalone +- + - name: Install mamba + uses: mamba-org/provision-with-micromamba@main + with: + environment-file: .github/environment.yml + +- - name: Compile argp-standalone +- shell: cmd /C CALL {0} +- run: | +- CALL micromamba activate zchunk_test_env +- cd argp-standalone +- meson setup builddir +- meson compile -C builddir --prefix=%CONDA_PREFIX%\Library +- meson install -C builddir +- + - name: Compile zchunk + shell: cmd /C CALL {0} + run: | +@@ -75,11 +61,6 @@ jobs: + steps: + - uses: actions/checkout@v2 + +- - uses: actions/checkout@v2 +- with: +- repository: wolfv/argp-standalone +- path: argp-standalone +- + - uses: actions/setup-python@v1 + with: + python-version: '3.x' +@@ -87,14 +68,6 @@ jobs: + - name: Install meson and ninja + run: pip install meson ninja + +- - name: Compile argp-standalone +- shell: cmd /C CALL {0} +- run: | +- cd argp-standalone +- meson setup builddir +- meson compile -C builddir +- meson install -C builddir +- + - name: Compile zchunk + shell: cmd /C CALL {0} + run: | +diff --git a/meson.build b/meson.build +index 1c6b32d..aa7dd25 100644 +--- a/meson.build ++++ b/meson.build +@@ -58,10 +58,10 @@ endif + + # argp-standalone dependency (if required) + if build_machine.system() == 'windows' or build_machine.system() == 'darwin' or build_machine.system() == 'freebsd' or not cc.links('#include \nstatic error_t parse_opt (int key, char *arg, struct argp_state *state) { argp_usage(state); return 0; }; void main() {}') +- if fs.is_dir(join_paths([get_option('prefix'), 'include'])) +- inc += include_directories(join_paths([get_option('prefix'), 'include'])) ++ argplib = cc.find_library('argp', has_headers : ['argp.h'], required: false) ++ if not argplib.found() ++ argplib = dependency('argp-standalone') + endif +- argplib = cc.find_library('argp', dirs : join_paths([get_option('prefix'), 'lib'])) + else + argplib = dependency('', required : false) + endif +diff --git a/subprojects/argp-standalone.wrap b/subprojects/argp-standalone.wrap +new file mode 100644 +index 0000000..14c0b63 +--- /dev/null ++++ b/subprojects/argp-standalone.wrap +@@ -0,0 +1,7 @@ ++[wrap-git] ++directory = argp-standalone-1.4.1 ++url = https://github.com/argp-standalone/argp-standalone.git ++revision = 21855f34ec9997c37e1a08cd69497336513a5800 ++ ++[provide] ++dependency_names = argp-standalone +-- +2.25.1 + diff --git a/package/zchunk/0002-zck-declare-write_data-as-static.patch b/package/zchunk/0002-zck-declare-write_data-as-static.patch new file mode 100644 index 00000000000..3c48ab3d509 --- /dev/null +++ b/package/zchunk/0002-zck-declare-write_data-as-static.patch @@ -0,0 +1,34 @@ +From 477c4e891bd4d9e41fcbaa07cd1a37c0975df5cc Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Wed, 4 May 2022 16:32:48 -0600 +Subject: [PATCH] zck: declare write_data as static + +This needs to be declared static to avoid a symbol conflict: +io.c:(.text+0xe8): multiple definition of `write_data'; src/zck.p/zck.c.o:zck.c:(.text+0x1f4): first defined here + +Fixes: + - http://autobuild.buildroot.net/results/225/22590a7038a40da3700d56c1f82f7dc74225702a + +Signed-off-by: James Hilliard +[james.hilliard1@gmail.com: backport from upstream commit +477c4e891bd4d9e41fcbaa07cd1a37c0975df5cc] +--- + src/zck.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/zck.c b/src/zck.c +index 7727479..83b2630 100644 +--- a/src/zck.c ++++ b/src/zck.c +@@ -159,7 +159,7 @@ static error_t parse_opt (int key, char *arg, struct argp_state *state) { + + static struct argp argp = {options, parse_opt, args_doc, doc}; + +-void write_data(zckCtx *zck, char *data, ssize_t in_size) { ++static void write_data(zckCtx *zck, char *data, ssize_t in_size) { + if(zck_write(zck, data, in_size) < 0) { + LOG_ERROR("%s", zck_get_error(zck)); + exit(1); +-- +2.25.1 + diff --git a/package/zchunk/Config.in b/package/zchunk/Config.in index 2d2a78a210e..11463dd4bd8 100644 --- a/package/zchunk/Config.in +++ b/package/zchunk/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_ZCHUNK bool "zchunk" depends on BR2_USE_MMU # fork() select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL - select BR2_PACKAGE_LIBCURL help A file format designed for highly efficient deltas while maintaining good compression. diff --git a/package/zchunk/zchunk.hash b/package/zchunk/zchunk.hash index d6b425dc702..fa097d4ae0a 100644 --- a/package/zchunk/zchunk.hash +++ b/package/zchunk/zchunk.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 33934adecddc50c64615dd8cdfe52a79df674a5bb1d5e83a9c09e1d1e6e9b92c zchunk-1.1.16.tar.gz +sha256 bc36f13b1bcb2ab52d046bfc3ec04a9bd1f89b070b4e8fca52eded235a583526 zchunk-1.2.2.tar.gz sha256 3c6a4fd5a93cacec6bf694d0537246bc15a95a274f5c5301749754e56d27b797 LICENSE diff --git a/package/zchunk/zchunk.mk b/package/zchunk/zchunk.mk index 6f7ac799a0c..fc91f90431c 100644 --- a/package/zchunk/zchunk.mk +++ b/package/zchunk/zchunk.mk @@ -4,14 +4,23 @@ # ################################################################################ -ZCHUNK_VERSION = 1.1.16 +ZCHUNK_VERSION = 1.2.2 ZCHUNK_SITE = $(call github,zchunk,zchunk,$(ZCHUNK_VERSION)) ZCHUNK_LICENSE = BSD-2-Clause ZCHUNK_LICENSE_FILES = LICENSE ZCHUNK_INSTALL_STAGING = YES -ZCHUNK_DEPENDENCIES = \ - libcurl \ - $(if $(BR2_PACKAGE_ARGP_STANDALONE),argp-standalone) + +ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y) +ZCHUNK_DEPENDENCIES += argp-standalone $(TARGET_NLS_DEPENDENCIES) +ZCHUNK_LDFLAGS += $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) +endif + +ifeq ($(BR2_PACKAGE_LIBCURL),y) +ZCHUNK_DEPENDENCIES += libcurl +ZCHUNK_CONF_OPTS += -Dwith-curl=enabled +else +ZCHUNK_CONF_OPTS += -Dwith-curl=disabled +endif ifeq ($(BR2_PACKAGE_OPENSSL),y) ZCHUNK_DEPENDENCIES += openssl diff --git a/package/zeek/Config.in b/package/zeek/Config.in new file mode 100644 index 00000000000..730388ded75 --- /dev/null +++ b/package/zeek/Config.in @@ -0,0 +1,44 @@ +config BR2_PACKAGE_ZEEK + bool "zeek" + depends on BR2_USE_MMU # fork() + depends on BR2_INSTALL_LIBSTDCPP + depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 + depends on BR2_HOST_GCC_AT_LEAST_7 # host-zeek + select BR2_PACKAGE_LIBPCAP + select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL + select BR2_PACKAGE_ZLIB + help + The Zeek Network Security Monitor + + Zeek is a powerful network analysis framework that is much + different from the typical IDS you may know. (Zeek is the new + name for the long-established Bro system.) + + https://www.zeek.org + +if BR2_PACKAGE_ZEEK + +config BR2_PACKAGE_ZEEK_ZEEKCTL + bool "zeekctl" + select BR2_PACKAGE_BASH # runtime + select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # bash + select BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON3_CURSES + select BR2_PACKAGE_PYTHON3_SQLITE + select BR2_PACKAGE_PYTHON3_ZLIB + help + Tool for managing Zeek deployments + +endif + +comment "zeek needs a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 7, host gcc >= 7" + depends on BR2_USE_MMU + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ + !BR2_HOST_GCC_AT_LEAST_7 diff --git a/package/zeek/zeek.hash b/package/zeek/zeek.hash new file mode 100644 index 00000000000..05e57b50246 --- /dev/null +++ b/package/zeek/zeek.hash @@ -0,0 +1,6 @@ +# Locally computed: +sha256 8c0afc999a8dd1c1f677a5cf818479b99c2d527e679e1ef99fb1b03f989c0373 zeek-4.1.1.tar.gz + +# Hash for license files: +sha256 b2817e2fb935805ec9fc0e90c6b971efd810d9aedfc646bc5fcb535221e0266a COPYING +sha256 1a451eca7b3826a7df62991ba90dd6d23ff03d28c2eefb7f8c4f8b1eac97a61b COPYING.3rdparty diff --git a/package/zeek/zeek.mk b/package/zeek/zeek.mk new file mode 100644 index 00000000000..584bfb0778d --- /dev/null +++ b/package/zeek/zeek.mk @@ -0,0 +1,92 @@ +################################################################################ +# +# zeek +# +################################################################################ + +ZEEK_VERSION = 4.1.1 +ZEEK_SITE = https://download.zeek.org +ZEEK_LICENSE = \ + BSD-3-Clause (zeek, C++ Actor Framework, ConvertUTF.c, CardinalityCounter.cc, pybind11), \ + Public Domain (sqlite), \ + MIT (doctest, libkqueue, RapidJSON, tsl-ordered-map, bro_inet_ntop.c), \ + LGPL-3.0+ (Multifast Project), \ + BSD-2-Clause (event.h), \ + BSD-3-Clause (in_cksum.cc) \ + BSD-4-Clause (Patricia.c, strsep.c, bsd-getopt-long.c), \ + Apache-2.0 (highwayhash, folly), \ + MPL-2.0 (mozilla-ca-list.zeek) +ZEEK_LICENSE_FILES = COPYING COPYING.3rdparty +ZEEK_CPE_ID_VENDOR = zeek +ZEEK_SUPPORTS_IN_SOURCE_BUILD = NO +ZEEK_DEPENDENCIES = \ + host-bison \ + host-flex \ + host-pkgconf \ + host-python3 \ + host-zeek \ + $(if $(BR2_PACKAGE_LIBKRB5),libkrb5) \ + $(if $(BR2_PACKAGE_LIBMAXMINDDB),libmaxminddb) \ + libpcap \ + openssl \ + $(if $(BR2_PACKAGE_ROCKSDB),rocksdb) \ + zlib +HOST_ZEEK_DEPENDENCIES = \ + host-bison \ + host-flex \ + host-pkgconf \ + host-python3 \ + host-libpcap \ + host-openssl \ + host-zlib + +ZEEK_CONF_OPTS = \ + -DBIFCL_EXE_PATH=$(HOST_DIR)/bin/bifcl \ + -DBINPAC_EXE_PATH=$(HOST_DIR)/bin/binpac \ + -DBROKER_DISABLE_DOCS=ON \ + -DBROKER_DISABLE_TESTS=ON \ + -DINSTALL_AUX_TOOLS=ON \ + -DZEEK_ETC_INSTALL_DIR=/etc + +define ZEEK_FIX_PYTHON_PATH + $(SED) 's,@PYTHON_EXECUTABLE@,/usr/bin/python,' \ + $(@D)/auxil/zeekctl/ZeekControl/ssh_runner.py +endef +ZEEK_POST_PATCH_HOOKS += ZEEK_FIX_PYTHON_PATH + +ifeq ($(BR2_PACKAGE_JEMALLOC),y) +ZEEK_DEPENDENCIES += jemalloc +ZEEK_CONF_OPTS += -DENABLE_JEMALLOC=ON +else +ZEEK_CONF_OPTS += -DENABLE_JEMALLOC=OFF +endif + +ifeq ($(BR2_PACKAGE_ZEEK_ZEEKCTL),y) +ZEEK_DEPENDENCIES += host-swig python3 +ZEEK_CONF_OPTS += \ + -DDISABLE_PYTHON_BINDINGS=OFF \ + -DINSTALL_ZEEKCTL=ON \ + -DPY_MOD_INSTALL_DIR=/usr/lib/zeekctl \ + -DZEEK_PYTHON_PREFIX=/usr +else +ZEEK_CONF_OPTS += \ + -DDISABLE_PYTHON_BINDINGS=ON \ + -DINSTALL_ZEEKCTL=OFF +endif + +ifneq ($(BR2_TOOLCHAIN_USES_GLIBC),y) +ZEEK_DEPENDENCIES += musl-fts +ZEEK_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-lfts +endif + +HOST_ZEEK_MAKE_OPTS = binpac bifcl + +define HOST_ZEEK_INSTALL_CMDS + $(INSTALL) -D -m 0755 $(HOST_ZEEK_BUILDDIR)/auxil/bifcl/bifcl \ + $(HOST_DIR)/bin/bifcl + $(INSTALL) -D -m 0755 $(HOST_ZEEK_BUILDDIR)/auxil/binpac/src/binpac \ + $(HOST_DIR)/bin/binpac +endef + +$(eval $(cmake-package)) +$(eval $(host-cmake-package)) diff --git a/package/zerofree/Config.in b/package/zerofree/Config.in new file mode 100644 index 00000000000..e7007819d87 --- /dev/null +++ b/package/zerofree/Config.in @@ -0,0 +1,14 @@ +config BR2_PACKAGE_ZEROFREE + bool "zerofree" + depends on BR2_USE_MMU # e2fsprogs + depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_E2FSPROGS + help + zerofree is a utility which scans the free blocks in an ext2 + filesystem and fills any non-zero blocks with zeroes. + + https://frippery.org/uml/ + +comment "zerofree needs a toolchain w/ dynamic library" + depends on BR2_USE_MMU + depends on BR2_STATIC_LIBS diff --git a/package/zerofree/zerofree.hash b/package/zerofree/zerofree.hash new file mode 100644 index 00000000000..33996117878 --- /dev/null +++ b/package/zerofree/zerofree.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 956bc861b55ba0a2b7593c58d32339dab1a0e7da6ea2b813d27c80f08b723867 zerofree-1.1.1.tgz +sha256 90daae00475a992a367da5b0658469a5d1c4449dbbe964c5b7246e1aec92f491 COPYING diff --git a/package/zerofree/zerofree.mk b/package/zerofree/zerofree.mk new file mode 100644 index 00000000000..3a9c16ee78d --- /dev/null +++ b/package/zerofree/zerofree.mk @@ -0,0 +1,28 @@ +################################################################################ +# +# zerofree +# +################################################################################ + +ZEROFREE_VERSION = 1.1.1 +ZEROFREE_SOURCE = zerofree-$(ZEROFREE_VERSION).tgz +ZEROFREE_SITE = https://frippery.org/uml +ZEROFREE_LICENSE = GPL-2.0 +ZEROFREE_LICENSE_FILES = COPYING +ZEROFREE_DEPENDENCIES = e2fsprogs + +# We use the same workaround as in https://bugs.gentoo.org/716136 +# to build with musl. +ZEROFREE_CFLAGS = \ + $(TARGET_CFLAGS) \ + $(if $(BR2_TOOLCHAIN_USES_MUSL),-DHAVE_SYS_TYPES_H) + +define ZEROFREE_BUILD_CMDS + $(MAKE) $(TARGET_CONFIGURE_OPTS) CFLAGS="$(ZEROFREE_CFLAGS)" -C $(@D) +endef + +define ZEROFREE_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/zerofree $(TARGET_DIR)/usr/bin/zerofree +endef + +$(eval $(generic-package)) diff --git a/package/zeromq/Config.in b/package/zeromq/Config.in index cf5c644c39b..209acf1a57b 100644 --- a/package/zeromq/Config.in +++ b/package/zeromq/Config.in @@ -5,8 +5,6 @@ config BR2_PACKAGE_ZEROMQ bool "zeromq" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_UTIL_LINUX - select BR2_PACKAGE_UTIL_LINUX_LIBUUID help ØMQ (ZeroMQ, 0MQ, zmq) looks like an embeddable networking library but acts like a concurrency framework. It gives you diff --git a/package/zeromq/zeromq.mk b/package/zeromq/zeromq.mk index 182699403cb..452c5f42917 100644 --- a/package/zeromq/zeromq.mk +++ b/package/zeromq/zeromq.mk @@ -7,7 +7,6 @@ ZEROMQ_VERSION = 4.3.4 ZEROMQ_SITE = https://github.com/zeromq/libzmq/releases/download/v$(ZEROMQ_VERSION) ZEROMQ_INSTALL_STAGING = YES -ZEROMQ_DEPENDENCIES = util-linux ZEROMQ_CONF_OPTS = --disable-Werror --without-documentation ZEROMQ_LICENSE = LGPL-3.0+ with exceptions ZEROMQ_LICENSE_FILES = COPYING COPYING.LESSER @@ -18,7 +17,10 @@ ZEROMQ_CPE_ID_PRODUCT = libzmq # SOCK_CLOEXEC, since linux v2.6.27. # Note: the flag TCP_KEEPALIVE is NOT available so we do not include it. ZEROMQ_CONF_ENV = libzmq_cv_sock_cloexec=yes \ + libzmq_cv_o_cloexec=yes \ libzmq_cv_so_keepalive=yes \ + libzmq_cv_so_priority=yes \ + libzmq_cv_so_bindtodevice=yes \ libzmq_cv_tcp_keepcnt=yes \ libzmq_cv_tcp_keepidle=yes \ libzmq_cv_tcp_keepintvl=yes diff --git a/package/zfs/0001-Correct-a-flaw-in-the-Python-3-version-checking.patch b/package/zfs/0001-Correct-a-flaw-in-the-Python-3-version-checking.patch deleted file mode 100644 index 70978f9f4d3..00000000000 --- a/package/zfs/0001-Correct-a-flaw-in-the-Python-3-version-checking.patch +++ /dev/null @@ -1,106 +0,0 @@ -From 4dc82e9d503518a00e54972be7c0cb5f342f985e Mon Sep 17 00:00:00 2001 -From: Rich Ercolani <214141+rincebrain@users.noreply.github.com> -Date: Tue, 8 Jun 2021 20:20:16 -0400 -Subject: [PATCH] Correct a flaw in the Python 3 version checking - -It turns out the ax_python_devel.m4 version check assumes that -("3.X+1.0" >= "3.X.0") is True in Python, which is not when X+1 -is 10 or above and X is not. (Also presumably X+1=100 and ...) - -So let's remake the check to behave consistently, using the -"packaging" or (if absent) the "distlib" modules. - -(Also, update the Github workflows to use the new packages.) - -Reviewed-by: Brian Behlendorf -Reviewed-by: John Kennedy -Signed-off-by: Rich Ercolani -Closes: #12073 -(cherry picked from commit 08cd0717359b1a18693e3c8e6d6e5a2819b35a48) -[Romain: drop rpm spec and github workflows changes] -Signed-off-by: Romain Naour ---- - config/always-pyzfs.m4 | 15 +++++++++++++++ - config/ax_python_devel.m4 | 33 +++++++++++++++++++++++++++------ - 2 files changed, 42 insertions(+), 6 deletions(-) - -diff --git a/config/always-pyzfs.m4 b/config/always-pyzfs.m4 -index 76e07b593..fa39fd885 100644 ---- a/config/always-pyzfs.m4 -+++ b/config/always-pyzfs.m4 -@@ -46,6 +46,21 @@ AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_PYZFS], [ - ]) - AC_SUBST(DEFINE_PYZFS) - -+ dnl # -+ dnl # Python "packaging" (or, failing that, "distlib") module is required to build and install pyzfs -+ dnl # -+ AS_IF([test "x$enable_pyzfs" = xcheck -o "x$enable_pyzfs" = xyes], [ -+ ZFS_AC_PYTHON_MODULE([packaging], [], [ -+ ZFS_AC_PYTHON_MODULE([distlib], [], [ -+ AS_IF([test "x$enable_pyzfs" = xyes], [ -+ AC_MSG_ERROR("Python $PYTHON_VERSION packaging and distlib modules are not installed") -+ ], [test "x$enable_pyzfs" != xno], [ -+ enable_pyzfs=no -+ ]) -+ ]) -+ ]) -+ ]) -+ - dnl # - dnl # Require python-devel libraries - dnl # -diff --git a/config/ax_python_devel.m4 b/config/ax_python_devel.m4 -index c51b45b7d..cdfbbf81f 100644 ---- a/config/ax_python_devel.m4 -+++ b/config/ax_python_devel.m4 -@@ -97,9 +97,18 @@ AC_DEFUN([AX_PYTHON_DEVEL],[ - # Check for a version of Python >= 2.1.0 - # - AC_MSG_CHECKING([for a version of Python >= '2.1.0']) -- ac_supports_python_ver=`$PYTHON -c "import sys; \ -- ver = sys.version.split ()[[0]]; \ -- print (ver >= '2.1.0')"` -+ ac_supports_python_ver=`cat<= '3.11.0' -+ ac_supports_python_ver=`cat< +Date: Thu, 5 Jan 2023 11:04:24 -0800 +Subject: [PATCH] removal of LegacyVersion broke ax_python_dev.m4 + +The 22.0 release of the python `packaging` package removed the +`LegacyVersion` trait, causing ZFS to no longer compile. + +This commit replaces the sections of `ax_python_dev.m4` that rely on +`LegacyVersion` with updated implementations from the upstream +`autoconf-archive`. + +Reviewed-by: Brian Behlendorf +Signed-off-by: Matthew Ahrens +Closes #14297 +Upstream: https://github.com/openzfs/zfs/commit/b72efb751147ab57afd1588a15910f547cb22600 +[Romain: backport to 2.1.7] +Signed-off-by: Romain Naour +--- + config/ax_python_devel.m4 | 71 +++++++++++++++++++-------------------- + 1 file changed, 35 insertions(+), 36 deletions(-) + +diff --git a/config/ax_python_devel.m4 b/config/ax_python_devel.m4 +index 7adcf01a0..9eef45065 100644 +--- a/config/ax_python_devel.m4 ++++ b/config/ax_python_devel.m4 +@@ -97,23 +97,13 @@ AC_DEFUN([AX_PYTHON_DEVEL],[ + # Check for a version of Python >= 2.1.0 + # + AC_MSG_CHECKING([for a version of Python >= '2.1.0']) +- ac_supports_python_ver=`cat<= '2.1.0')"` + if test "$ac_supports_python_ver" != "True"; then + if test -z "$PYTHON_NOVERSIONCHECK"; then + AC_MSG_RESULT([no]) +- m4_ifvaln([$2],[$2],[ +- AC_MSG_FAILURE([ ++ AC_MSG_FAILURE([ + This version of the AC@&t@_PYTHON_DEVEL macro + doesn't work properly with versions of Python before + 2.1.0. You may need to re-run configure, setting the +@@ -122,7 +112,6 @@ PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand. + Moreover, to disable this check, set PYTHON_NOVERSIONCHECK + to something else than an empty string. + ]) +- ]) + else + AC_MSG_RESULT([skip at user request]) + fi +@@ -131,37 +120,47 @@ to something else than an empty string. + fi + + # +- # if the macro parameter ``version'' is set, honour it ++ # If the macro parameter ``version'' is set, honour it. ++ # A Python shim class, VPy, is used to implement correct version comparisons via ++ # string expressions, since e.g. a naive textual ">= 2.7.3" won't work for ++ # Python 2.7.10 (the ".1" being evaluated as less than ".3"). + # + if test -n "$1"; then + AC_MSG_CHECKING([for a version of Python $1]) +- # Why the strip ()? Because if we don't, version.parse +- # will, for example, report 3.10.0 >= '3.11.0' +- ac_supports_python_ver=`cat< ax_python_devel_vpy.py ++class VPy: ++ def vtup(self, s): ++ return tuple(map(int, s.strip().replace("rc", ".").split("."))) ++ def __init__(self): ++ import sys ++ self.vpy = tuple(sys.version_info) ++ def __eq__(self, s): ++ return self.vpy == self.vtup(s) ++ def __ne__(self, s): ++ return self.vpy != self.vtup(s) ++ def __lt__(self, s): ++ return self.vpy < self.vtup(s) ++ def __gt__(self, s): ++ return self.vpy > self.vtup(s) ++ def __le__(self, s): ++ return self.vpy <= self.vtup(s) ++ def __ge__(self, s): ++ return self.vpy >= self.vtup(s) ++EOF ++ ac_supports_python_ver=`$PYTHON -c "import ax_python_devel_vpy; \ ++ ver = ax_python_devel_vpy.VPy(); \ ++ print (ver $1)"` ++ rm -rf ax_python_devel_vpy*.py* __pycache__/ax_python_devel_vpy*.py* + if test "$ac_supports_python_ver" = "True"; then +- AC_MSG_RESULT([yes]) ++ AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) +- m4_ifvaln([$2],[$2],[ +- AC_MSG_ERROR([this package requires Python $1. ++ AC_MSG_ERROR([this package requires Python $1. + If you have it installed, but it isn't the default Python + interpreter in your system path, please pass the PYTHON_VERSION + variable to configure. See ``configure --help'' for reference. + ]) +- PYTHON_VERSION="" +- ]) ++ PYTHON_VERSION="" + fi + fi + +-- +2.34.3 + diff --git a/package/zfs/Config.in b/package/zfs/Config.in index c766c370e4e..6209c5865b7 100644 --- a/package/zfs/Config.in +++ b/package/zfs/Config.in @@ -18,6 +18,7 @@ config BR2_PACKAGE_ZFS select BR2_PACKAGE_LIBAIO select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_ZLIB + select BR2_PACKAGE_LIBCURL help OpenZFS on Linux and FreeBSD diff --git a/package/zfs/zfs.hash b/package/zfs/zfs.hash index 7f4f5a59f84..0bce3817fee 100644 --- a/package/zfs/zfs.hash +++ b/package/zfs/zfs.hash @@ -1,5 +1,6 @@ -# From https://github.com/openzfs/zfs/releases/download/zfs-2.0.5/zfs-2.0.5.sha256.asc -sha256 3a17498d704ebf4c5d7231660f6fb44ae07a1545519f567452a4270851a86ec9 zfs-2.0.5.tar.gz +# From https://github.com/openzfs/zfs/releases/download/zfs-2.1.7/zfs-2.1.7.sha256.asc +sha256 6462e63e185de6ff10c64ffa6ed773201a082f9dd13e603d7e8136fcb4aca71b zfs-2.1.7.tar.gz +sha256 96a27353fe717ff2c8b95deb8b009c4eb750303c6400e2d8a2582ab1ec12b25a bc3f12bfac152a0c28951cec92340ba14f9ccee9.patch # Hash for license files: sha256 1ffb70c33c4f79f04e947facc5c7851f289609256aacb47fc115f700427d9520 LICENSE diff --git a/package/zfs/zfs.mk b/package/zfs/zfs.mk index dbda8aceb42..97e9442cf87 100644 --- a/package/zfs/zfs.mk +++ b/package/zfs/zfs.mk @@ -4,17 +4,18 @@ # ################################################################################ -ZFS_VERSION = 2.0.5 +ZFS_VERSION = 2.1.7 ZFS_SITE = https://github.com/openzfs/zfs/releases/download/zfs-$(ZFS_VERSION) +ZFS_PATCH = https://github.com/openzfs/zfs/commit/bc3f12bfac152a0c28951cec92340ba14f9ccee9.patch ZFS_LICENSE = CDDL ZFS_LICENSE_FILES = LICENSE COPYRIGHT ZFS_CPE_ID_VENDOR = openzfs ZFS_CPE_ID_PRODUCT = openzfs -# 0001-Correct-a-flaw-in-the-Python-3-version-checking.patch +# 0001-removal-of-LegacyVersion-broke-ax_python_dev.m4.patch ZFS_AUTORECONF = YES -ZFS_DEPENDENCIES = libaio openssl udev util-linux zlib +ZFS_DEPENDENCIES = libaio openssl udev util-linux zlib libcurl # sysvinit installs only a commented-out modules-load.d/ config file ZFS_CONF_OPTS = \ @@ -40,7 +41,7 @@ endif ifeq ($(BR2_PACKAGE_PYTHON3),y) ZFS_DEPENDENCIES += python3 python-setuptools host-python-cffi host-python-packaging ZFS_CONF_ENV += \ - PYTHON=$(HOST_DIR)/usr/bin/python3 \ + PYTHON=$(HOST_DIR)/bin/python3 \ PYTHON_CPPFLAGS="`$(STAGING_DIR)/usr/bin/python3-config --includes`" \ PYTHON_LIBS="`$(STAGING_DIR)/usr/bin/python3-config --ldflags`" \ PYTHON_EXTRA_LIBS="`$(STAGING_DIR)/usr/bin/python3-config --libs --embed`" \ @@ -52,7 +53,7 @@ endif ifeq ($(BR2_PACKAGE_LINUX_PAM),y) ZFS_DEPENDENCIES += linux-pam -ZFS_CONF_ENV += --enable-pam=yes +ZFS_CONF_OPTS += --enable-pam else ZFS_CONF_OPTS += --disable-pam endif 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 62adc59c839..cba7ed679e0 100644 --- a/package/zic/0001-remove-dependency-check-on-version-file.patch +++ b/package/zic/0001-remove-dependency-check-on-version-file.patch @@ -18,7 +18,7 @@ diff --git a/Makefile b/Makefile index 1b714a8..00d2c09 100644 --- a/Makefile +++ b/Makefile -@@ -593,7 +593,7 @@ INSTALL: ALL install date.1 +@@ -615,7 +615,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". diff --git a/package/zic/zic.hash b/package/zic/zic.hash index 9e17621de86..a2720a27baa 100644 --- a/package/zic/zic.hash +++ b/package/zic/zic.hash @@ -1,4 +1,4 @@ -# From https://mm.icann.org/pipermail/tz-announce/2021-October/000069.html -sha512 87b0335129ea41c5f42f687f548712e5da892baa8494cecf5d34851beceecf6ae52f22104696ed187713cf9e502570eb2041e277dfd3c043c11d0253bfde685a tzcode2021e.tar.gz +# From https://mm.icann.org/pipermail/tz-announce/2023-March/000079.html +sha512 fa18bae9c0e7c061bc9d5f5f2eb9967f0e4ddb2baafdee9887fa30cd0c60f4aa6f21eacffb17df0d59d26ff54d08c5dcefa98159309eba497e86443624913a82 tzcode2023c.tar.gz # Locally computed: sha256 0613408568889f5739e5ae252b722a2659c02002839ad970a63dc5e9174b27cf LICENSE diff --git a/package/zic/zic.mk b/package/zic/zic.mk index 13f3a83bce6..a915f6d2565 100644 --- a/package/zic/zic.mk +++ b/package/zic/zic.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZIC_VERSION = 2021e +ZIC_VERSION = 2023c 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/zip.hash b/package/zip/zip.hash index 5e1b3353a70..eb4bbf3b033 100644 --- a/package/zip/zip.hash +++ b/package/zip/zip.hash @@ -1,3 +1,3 @@ # Locally calculated from download (no sig, hash) -sha256 f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369 zip30.tgz -sha256 8ecd6c1bab449127eb665cef1561e73a8bce52e217375f6f466939e137b1e110 LICENSE +sha256 f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369 zip30.tgz +sha256 8ecd6c1bab449127eb665cef1561e73a8bce52e217375f6f466939e137b1e110 LICENSE diff --git a/package/zip/zip.mk b/package/zip/zip.mk index 2d11e1c7636..67958a4a664 100644 --- a/package/zip/zip.mk +++ b/package/zip/zip.mk @@ -11,7 +11,6 @@ ZIP_SITE = ftp://ftp.info-zip.org/pub/infozip/src ZIP_LICENSE = Info-ZIP ZIP_LICENSE_FILES = LICENSE ZIP_CPE_ID_VENDOR = info-zip_project -ZIP_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_BZIP2),y) ZIP_DEPENDENCIES += bzip2 @@ -41,11 +40,6 @@ define ZIP_INSTALL_TARGET_CMDS prefix=$(TARGET_DIR)/usr endef -define ZIP_INSTALLING_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -f unix/Makefile install \ - prefix=$(STAGING_DIR)/usr -endef - define HOST_ZIP_BUILD_CMDS $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) \ CFLAGS="$(HOST_CFLAGS) $(ZIP_CFLAGS)" \ diff --git a/package/zlib-ng/0001-Use-static-keyword-for-vec_sumsu-to-prevent-undefine.patch b/package/zlib-ng/0001-Use-static-keyword-for-vec_sumsu-to-prevent-undefine.patch new file mode 100644 index 00000000000..cc103215de3 --- /dev/null +++ b/package/zlib-ng/0001-Use-static-keyword-for-vec_sumsu-to-prevent-undefine.patch @@ -0,0 +1,27 @@ +From 677f56825f7080403e18e57ffe8177f3df290f20 Mon Sep 17 00:00:00 2001 +From: Nathan Moinvaziri +Date: Sun, 23 Jan 2022 12:59:01 -0800 +Subject: [PATCH] Use static keyword for vec_sumsu to prevent undefined + reference error when g++ linking. + +Signed-off-by: Joel Stanley +--- + arch/power/adler32_power8.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/power/adler32_power8.c b/arch/power/adler32_power8.c +index 029aa3a84c57..fc4086322efc 100644 +--- a/arch/power/adler32_power8.c ++++ b/arch/power/adler32_power8.c +@@ -44,7 +44,7 @@ + #include "adler32_p.h" + + /* Vector across sum unsigned int (saturate). */ +-inline vector unsigned int vec_sumsu(vector unsigned int __a, vector unsigned int __b) { ++static inline vector unsigned int vec_sumsu(vector unsigned int __a, vector unsigned int __b) { + __b = vec_sld(__a, __a, 8); + __b = vec_add(__b, __a); + __a = vec_sld(__b, __b, 4); +-- +2.35.1 + diff --git a/package/zlib-ng/0002-CMakeLists.txt-fix-version-in-zlib.pc-when-building-.patch b/package/zlib-ng/0002-CMakeLists.txt-fix-version-in-zlib.pc-when-building-.patch new file mode 100644 index 00000000000..749c45ddcad --- /dev/null +++ b/package/zlib-ng/0002-CMakeLists.txt-fix-version-in-zlib.pc-when-building-.patch @@ -0,0 +1,53 @@ +From 9fcc446306f27eb253545540ce28403874b899fa Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 27 May 2022 23:25:21 +0200 +Subject: [PATCH] CMakeLists.txt: fix version in zlib.pc when building + statically + +When building statically (i.e. with BUILD_SHARED_LIBS=OFF), +ZLIB_FULL_VERSION is not set resulting in an empty version in zlib.pc +and the following build failure with transmission: + +checking for ZLIB... configure: error: Package requirements (zlib >= 1.2.3) were not met: + +Package dependency requirement 'zlib >= 1.2.3' could not be satisfied. +Package 'zlib' has version '', required version is '>= 1.2.3' + +Fixes: + - http://autobuild.buildroot.org/results/b3b882482f517726e5c780ba4c37818bd379df82 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/zlib-ng/zlib-ng/pull/1278] +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a62a95e..6a26d59 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -150,8 +150,10 @@ if(ZLIB_COMPAT) + add_definitions(-DZLIB_COMPAT) + set(WITH_GZFILEOP ON) + set(SUFFIX "") ++ set(ZLIB_FULL_VERSION ${ZLIB_HEADER_VERSION}.zlib-ng) + else() + set(SUFFIX "-ng") ++ set(ZLIB_FULL_VERSION ${ZLIBNG_HEADER_VERSION}) + endif() + + if(WITH_GZFILEOP) +@@ -1068,10 +1070,8 @@ if(NOT DEFINED BUILD_SHARED_LIBS OR BUILD_SHARED_LIBS) + set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL) + + if(ZLIB_COMPAT) +- set(ZLIB_FULL_VERSION ${ZLIB_HEADER_VERSION}.zlib-ng) + set_target_properties(zlib PROPERTIES SOVERSION 1) + else() +- set(ZLIB_FULL_VERSION ${ZLIBNG_HEADER_VERSION}) + set_target_properties(zlib PROPERTIES SOVERSION 2) + endif() + +-- +2.35.1 + diff --git a/package/zlib-ng/0003-zlib-ng-check-that-sys-auxv.h-exists-at-configure-time.patch b/package/zlib-ng/0003-zlib-ng-check-that-sys-auxv.h-exists-at-configure-time.patch new file mode 100644 index 00000000000..ba8297cda7b --- /dev/null +++ b/package/zlib-ng/0003-zlib-ng-check-that-sys-auxv.h-exists-at-configure-time.patch @@ -0,0 +1,90 @@ +From e1baa6b439c06f3d0e6be3e381cc746ffb55aee1 Mon Sep 17 00:00:00 2001 +From: Mika Lindqvist +Date: Wed, 13 Apr 2022 01:22:29 +0300 +Subject: [PATCH] Check that sys/auxv.h exists at configure time and add + preprocessor define for it. * Protect including sys/auxv.h in all relevant + files with the new preprocessor define * Test for both existence of both + sys/auxv.h and getauxval() with both cmake and configure + +[Ben Hutchings: Backport to 2.0.6: + - Drop the s390 changes + - Change some filenames] + +Backported from: e1baa6b439c06f3d0e6be3e381cc746ffb55aee1 +Signed-off-by: Ben Hutchings +--- + CMakeLists.txt | 4 ++++ + arch/arm/armfeature.c | 2 +- + arch/power/power.c | 5 ++++- + configure | 13 +++++++++++++ + 4 files changed, 22 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0dd196130..e4e4b7332 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -338,6 +338,10 @@ endif() + # + # Check for standard/system includes + # ++check_include_file(sys/auxv.h HAVE_SYS_AUXV_H) ++if(HAVE_SYS_AUXV_H) ++ add_definitions(-DHAVE_SYS_AUXV_H) ++endif() + check_include_file(sys/sdt.h HAVE_SYS_SDT_H) + if(HAVE_SYS_SDT_H) + add_definitions(-DHAVE_SYS_SDT_H) +diff --git a/arch/arm/arm_features.c b/arch/arm/arm_features.c +index 195c94992..f6b67687f 100644 +--- a/arch/arm/armfeature.c ++++ b/arch/arm/armfeature.c +@@ -1,6 +1,6 @@ + #include "../../zutil.h" + +-#if defined(__linux__) ++#if defined(__linux__) && defined(HAVE_SYS_AUXV_H) + # include + # ifdef ARM_ASM_HWCAP + # include +diff --git a/arch/power/power_features.c b/arch/power/power_features.c +index 9186b40d8..65599d9a7 100644 +--- a/arch/power/power.c ++++ b/arch/power/power.c +@@ -1,9 +1,12 @@ + /* POWER feature check + * Copyright (C) 2020 Matheus Castanho , IBM ++ * Copyright (C) 2021-2022 Mika T. Lindqvist + * For conditions of distribution and use, see copyright notice in zlib.h + */ + +-#include ++#ifdef HAVE_SYS_AUXV_H ++# include ++#endif + #include "../../zutil.h" + + Z_INTERNAL int power_cpu_has_arch_2_07; +diff --git a/configure b/configure +index aed1909cc..a357e1c8a 100755 +--- a/configure ++++ b/configure +@@ -776,6 +776,19 @@ else + echo "Checking for strerror... No." | tee -a configure.log + fi + ++# check for getauxval() for architecture feature detection at run-time ++cat > $test.c < ++int main() { return getauxval(0); } ++EOF ++if try $CC $CFLAGS -o $test $test.c $LDSHAREDLIBC; then ++ echo "Checking for getauxval() in sys/auxv.h... Yes." | tee -a configure.log ++ CFLAGS="${CFLAGS} -DHAVE_SYS_AUXV_H" ++ SFLAGS="${SFLAGS} -DHAVE_SYS_AUXV_H" ++else ++ echo "Checking for getauxval() in sys/auxv.h... No." | tee -a configure.log ++fi ++ + # We need to remove zconf.h from source directory if building outside of it + if [ "$SRCDIR" != "$BUILDDIR" ]; then + rm -f $SRCDIR/zconf${SUFFIX}.h diff --git a/package/zlib-ng/zlib-ng.mk b/package/zlib-ng/zlib-ng.mk index fb497b8c11d..aa65d8437db 100644 --- a/package/zlib-ng/zlib-ng.mk +++ b/package/zlib-ng/zlib-ng.mk @@ -18,9 +18,21 @@ ZLIB_NG_CONF_OPTS += \ -DZLIB_COMPAT=1 \ -DZLIB_ENABLE_TESTS=OFF -# Enable NEON and ACLE on ARM +# Enable ACLE on ARM ifeq ($(BR2_arm),y) -ZLIB_NG_CONF_OPTS += -DWITH_ACLE=1 -DWITH_NEON=1 +ZLIB_NG_CONF_OPTS += -DWITH_ACLE=1 +endif + +ifeq ($(BR2_ARM_CPU_HAS_NEON)$(BR2_aarch64),y) +ZLIB_NG_CONF_OPTS += -DWITH_NEON=ON +else +ZLIB_NG_CONF_OPTS += -DWITH_NEON=OFF +endif + +ifeq ($(BR2_powerpc_power8),y) +ZLIB_NG_CONF_OPTS += -DWITH_POWER8=ON +else +ZLIB_NG_CONF_OPTS += -DWITH_POWER8=OFF endif $(eval $(cmake-package)) diff --git a/package/zlib/Config.in b/package/zlib/Config.in index d6d94889a7c..3a486376ac9 100644 --- a/package/zlib/Config.in +++ b/package/zlib/Config.in @@ -1,3 +1,6 @@ +config BR2_PACKAGE_ZLIB_FORCE_LIBZLIB + bool + config BR2_PACKAGE_ZLIB_NG_ARCH_SUPPORTS bool default y if BR2_arm @@ -33,6 +36,7 @@ config BR2_PACKAGE_LIBZLIB config BR2_PACKAGE_ZLIB_NG bool "zlib-ng" depends on BR2_PACKAGE_ZLIB_NG_ARCH_SUPPORTS + depends on !BR2_PACKAGE_ZLIB_FORCE_LIBZLIB select BR2_PACKAGE_HAS_ZLIB help Zlib replacement with optimizations for diff --git a/package/zlog/zlog.hash b/package/zlog/zlog.hash index c39505b2c69..3b7c6aa78c5 100644 --- a/package/zlog/zlog.hash +++ b/package/zlog/zlog.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 00037ab8d52772a95d645f1dcfd2c292b7cea326b54e63e219a5b7fdcb7e6508 zlog-1.2.15.tar.gz +sha256 742401902f2134eb272c49631fe5c38d7aeb9a2ad56fa3ec3d15219b371ba655 zlog-1.2.16.tar.gz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/zlog/zlog.mk b/package/zlog/zlog.mk index e2410d3665f..329f2cfe2c3 100644 --- a/package/zlog/zlog.mk +++ b/package/zlog/zlog.mk @@ -4,10 +4,11 @@ # ################################################################################ -ZLOG_VERSION = 1.2.15 +ZLOG_VERSION = 1.2.16 ZLOG_SITE = $(call github,HardySimpson,zlog,$(ZLOG_VERSION)) ZLOG_LICENSE = LGPL-2.1 ZLOG_LICENSE_FILES = COPYING +ZLOG_CPE_ID_VENDOR = zlog_project ZLOG_INSTALL_STAGING = YES define ZLOG_BUILD_CMDS diff --git a/package/zmqpp/zmqpp.hash b/package/zmqpp/zmqpp.hash index c440b2aca27..af5acd53c00 100644 --- a/package/zmqpp/zmqpp.hash +++ b/package/zmqpp/zmqpp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c1d4587df3562f73849d9e5f8c932ca7dcfc7d8bec31f62d7f35073ef81f4d29 zmqpp-4.2.0.tar.gz -sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 LICENSE +sha256 c1d4587df3562f73849d9e5f8c932ca7dcfc7d8bec31f62d7f35073ef81f4d29 zmqpp-4.2.0.tar.gz +sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 LICENSE diff --git a/package/znc/0001-LibreSSL-3.5-opaqued-structures.patch b/package/znc/0001-LibreSSL-3.5-opaqued-structures.patch new file mode 100644 index 00000000000..d0019e21a40 --- /dev/null +++ b/package/znc/0001-LibreSSL-3.5-opaqued-structures.patch @@ -0,0 +1,27 @@ +From 87f3dac8ba8dea5628b05416bdef454b4ef2d236 Mon Sep 17 00:00:00 2001 +From: Charlie Li +Date: Mon, 14 Mar 2022 17:36:36 -0400 +Subject: [PATCH] LibreSSL 3.5 opaqued structures + +Downloaded from upstream commit +https://github.com/znc/Csocket/commit/87f3dac8ba8dea5628b05416bdef454b4ef2d236 + +Signed-off-by: Bernd Kuhls +(rebased for znc) +--- + Csocket.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Csocket.cc b/Csocket.cc +index 46a3bfd..a30da14 100644 +--- a/third_party/Csocket/Csocket.cc ++++ b/third_party/Csocket/Csocket.cc +@@ -61,7 +61,7 @@ + # define OPENSSL_NO_TLS1_1 /* 1.0.1-pre~: openssl/openssl@637f374ad49d5f6d4f81d87d7cdd226428aa470c */ + # define OPENSSL_NO_TLS1_2 /* 1.0.1-pre~: openssl/openssl@7409d7ad517650db332ae528915a570e4e0ab88b */ + # endif +-# ifndef LIBRESSL_VERSION_NUMBER /* forked from OpenSSL 1.0.1g, sets high version "with the idea of discouraging software from relying on magic numbers for detecting features"(!) */ ++# if !defined(LIBRESSL_VERSION_NUMBER) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x03050000fL) + # if OPENSSL_VERSION_NUMBER >= 0x10100000 + # undef HAVE_ERR_REMOVE_THREAD_STATE /* 1.1.0-pre4: openssl/openssl@8509dcc9f319190c565ab6baad7c88d37a951d1c */ + # undef OPENSSL_NO_SSL2 /* 1.1.0-pre4: openssl/openssl@e80381e1a3309f5d4a783bcaa508a90187a48882 */ diff --git a/package/znc/0002-Fix-build-with-libressl.patch b/package/znc/0002-Fix-build-with-libressl.patch new file mode 100644 index 00000000000..b8d22445fb0 --- /dev/null +++ b/package/znc/0002-Fix-build-with-libressl.patch @@ -0,0 +1,68 @@ +From dcb5f3df82fcfec48aab356252067dc897fb98cf Mon Sep 17 00:00:00 2001 +From: Alexey Sokolov +Date: Sun, 14 Nov 2021 00:45:01 +0000 +Subject: [PATCH] Fix build with libressl + +It got another feature of openssl implemented, which broke this + +Downloaded from upstream commit +https://github.com/znc/znc/commit/dcb5f3df82fcfec48aab356252067dc897fb98cf + +Signed-off-by: Bernd Kuhls +--- + CMakeLists.txt | 14 ++++++++++++++ + include/znc/zncconfig.h.cmake.in | 1 + + modules/schat.cpp | 3 +-- + 3 files changed, 16 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0913ff2691..1f77f5632b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -82,6 +82,20 @@ endmacro() + tristate_option(OPENSSL "Support SSL") + if(WANT_OPENSSL) + find_package(OpenSSL ${TRISTATE_OPENSSL_REQUIRED}) ++ ++ if(OPENSSL_FOUND) ++ # SSL_SESSION was made opaque in OpenSSL 1.1.0; ++ # LibreSSL gained that function later too. ++ # TODO: maybe remove this check at some point, and stop supporting old ++ # libssl versions ++ function(check_SSL_SESSION_get0_cipher) ++ set(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_LIBRARIES}) ++ set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR}) ++ check_cxx_symbol_exists(SSL_SESSION_get0_cipher openssl/ssl.h ++ HAVE_SSL_SESSION_get0_cipher) ++ endfunction() ++ check_SSL_SESSION_get0_cipher() ++ endif() + endif() + set(HAVE_LIBSSL "${OPENSSL_FOUND}") + +diff --git a/include/znc/zncconfig.h.cmake.in b/include/znc/zncconfig.h.cmake.in +index 5426b828af..7b07b99aec 100644 +--- a/include/znc/zncconfig.h.cmake.in ++++ b/include/znc/zncconfig.h.cmake.in +@@ -31,6 +31,7 @@ + #define HAVE_PTHREAD 1 + #cmakedefine HAVE_THREADED_DNS 1 + #cmakedefine HAVE_LIBSSL 1 ++#cmakedefine HAVE_SSL_SESSION_get0_cipher 1 + #cmakedefine HAVE_IPV6 1 + #cmakedefine HAVE_ZLIB 1 + #cmakedefine HAVE_I18N 1 +diff --git a/modules/schat.cpp b/modules/schat.cpp +index aa7a338dcd..66e67e695c 100644 +--- a/modules/schat.cpp ++++ b/modules/schat.cpp +@@ -25,8 +25,7 @@ + #include + #include + +-#if !defined(OPENSSL_VERSION_NUMBER) || defined(LIBRESSL_VERSION_NUMBER) || \ +- OPENSSL_VERSION_NUMBER < 0x10100007 ++#ifndef HAVE_SSL_SESSION_get0_cipher + /* SSL_SESSION was made opaque in OpenSSL 1.1.0, cipher accessor was added 2 + weeks before the public release. + See openssl/openssl@e92813234318635639dba0168c7ef5568757449b. */ diff --git a/package/znc/0003-DH_set0_pqg-and-DH_get0_key-have-existed-since-Libre.patch b/package/znc/0003-DH_set0_pqg-and-DH_get0_key-have-existed-since-Libre.patch new file mode 100644 index 00000000000..a2946643fc8 --- /dev/null +++ b/package/znc/0003-DH_set0_pqg-and-DH_get0_key-have-existed-since-Libre.patch @@ -0,0 +1,30 @@ +From 7c8ac8981a8516edaba469641aff4d8ec452ae9e Mon Sep 17 00:00:00 2001 +From: Charlie Li +Date: Mon, 14 Mar 2022 18:32:46 -0400 +Subject: [PATCH] DH_set0_pqg and DH_get0_key have existed since LibreSSL 2.7 + +https://github.com/libressl-portable/openbsd/commit/848e2a019c796b685fc8c5848283b86e48fbe0bf +https://github.com/libressl-portable/openbsd/commit/3789e379353c1d53313a249461b3d735de4ac742 + +Downloaded from upstream commit +https://github.com/znc/znc/commit/7c8ac8981a8516edaba469641aff4d8ec452ae9e + +Signed-off-by: Bernd Kuhls +--- + modules/crypt.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/modules/crypt.cpp b/modules/crypt.cpp +index 7655371b6e..68f7aafcea 100644 +--- a/modules/crypt.cpp ++++ b/modules/crypt.cpp +@@ -68,7 +68,8 @@ class CCryptMod : public CModule { + CString m_sPrivKey; + CString m_sPubKey; + +-#if OPENSSL_VERSION_NUMBER < 0X10100000L || defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0X10100000L || \ ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x02070000fL) + static int DH_set0_pqg(DH* dh, BIGNUM* p, BIGNUM* q, BIGNUM* g) { + /* If the fields p and g in dh are nullptr, the corresponding input + * parameters MUST be non-nullptr. q may remain nullptr. diff --git a/package/znc/0004-Add-support-SWIG-4.1.0-drop-support-for-4.0.1.patch b/package/znc/0004-Add-support-SWIG-4.1.0-drop-support-for-4.0.1.patch new file mode 100644 index 00000000000..cb0988e6314 --- /dev/null +++ b/package/znc/0004-Add-support-SWIG-4.1.0-drop-support-for-4.0.1.patch @@ -0,0 +1,53 @@ +From fecdd9895894b3afe903021b0843a422eb4d3308 Mon Sep 17 00:00:00 2001 +From: Alexey Sokolov +Date: Sat, 5 Nov 2022 12:54:40 +0000 +Subject: [PATCH] Add support SWIG 4.1.0, drop support for < 4.0.1 + +https://bugs.gentoo.org/878587 + +Upstream: https://github.com/znc/znc/commit/fecdd9895894b3afe903021b0843a422eb4d3308 + +Signed-off-by: Bernd Kuhls +--- + CMakeLists.txt | 2 +- + modules/modperl/CMakeLists.txt | 1 - + modules/modpython/CMakeLists.txt | 1 - + 3 files changed, 1 insertion(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9d43578e0e..efab0ee1ee 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -173,7 +173,7 @@ if(WANT_PYTHON AND NOT EXISTS + endif() + endif() + if(search_swig) +- find_package(SWIG 3.0.0) ++ find_package(SWIG 4.0.1) + if(NOT SWIG_FOUND) + message(FATAL_ERROR + "Can't find SWIG, therefore Perl and Python aren't supported. " +diff --git a/modules/modperl/CMakeLists.txt b/modules/modperl/CMakeLists.txt +index e18fe47644..a87f74e478 100644 +--- a/modules/modperl/CMakeLists.txt ++++ b/modules/modperl/CMakeLists.txt +@@ -53,7 +53,6 @@ if(SWIG_FOUND) + "-I${PROJECT_SOURCE_DIR}/include" + "-I${CMAKE_CURRENT_SOURCE_DIR}/.." + "-I${CMAKE_CURRENT_SOURCE_DIR}/include" +- -DZNC_EXPORT_LIB_EXPORT + -outdir "${CMAKE_CURRENT_BINARY_DIR}" + -o "${CMAKE_CURRENT_BINARY_DIR}/modperl_biglib.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/modperl.i" +diff --git a/modules/modpython/CMakeLists.txt b/modules/modpython/CMakeLists.txt +index edbeb41ed5..36a2e649f0 100644 +--- a/modules/modpython/CMakeLists.txt ++++ b/modules/modpython/CMakeLists.txt +@@ -50,7 +50,6 @@ if(SWIG_FOUND) + "-I${PROJECT_BINARY_DIR}/include" + "-I${PROJECT_SOURCE_DIR}/include" + "-I${CMAKE_CURRENT_SOURCE_DIR}/.." +- -DZNC_EXPORT_LIB_EXPORT + -outdir "${CMAKE_CURRENT_BINARY_DIR}" + -o "${CMAKE_CURRENT_BINARY_DIR}/modpython_biglib.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/modpython.i" diff --git a/package/zsh/zsh.hash b/package/zsh/zsh.hash index 5c661ded25f..e04aa388d39 100644 --- a/package/zsh/zsh.hash +++ b/package/zsh/zsh.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b6973520bace600b4779200269b1e5d79e5f505ac4952058c11ad5bbf0dd9919 zsh-5.8.1.tar.xz +sha256 9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5 zsh-5.9.tar.xz sha256 d06fdf3ef9b1ec69d6b9e170b0a9516fbad3523261ff1668bde3bfea6e0ef5f5 LICENCE diff --git a/package/zsh/zsh.mk b/package/zsh/zsh.mk index c5ab7c2faee..e790bf4c5ea 100644 --- a/package/zsh/zsh.mk +++ b/package/zsh/zsh.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZSH_VERSION = 5.8.1 +ZSH_VERSION = 5.9 ZSH_SITE = http://www.zsh.org/pub ZSH_SOURCE = zsh-$(ZSH_VERSION).tar.xz ZSH_DEPENDENCIES = ncurses @@ -14,6 +14,14 @@ ZSH_LICENSE = MIT-like ZSH_LICENSE_FILES = LICENCE ZSH_CPE_ID_VENDOR = zsh +# zsh uses TRY_RUN to determine these +ZSH_CONF_OPTS += \ + zsh_cv_long_is_64_bit=$(if $(BR2_ARCH_IS_64),yes,no) \ + zsh_cv_off_t_is_64_bit=yes \ + zsh_cv_64_bit_type='long long' \ + zsh_cv_64_bit_utype='unsigned long long' \ + zsh_cv_printf_has_lld=yes + ifeq ($(BR2_PACKAGE_GDBM),y) ZSH_CONF_OPTS += --enable-gdbm ZSH_DEPENDENCIES += gdbm @@ -36,6 +44,25 @@ else ZSH_CONF_OPTS += --disable-pcre endif +ifeq ($(BR2_STATIC_LIBS),) +# zsh uses TRY_RUN to determine these +ZSH_CONF_OPTS += \ + zsh_cv_shared_environ=yes \ + zsh_cv_shared_tgetent=yes \ + zsh_cv_shared_tigetstr=yes \ + zsh_cv_sys_dynamic_clash_ok=yes \ + zsh_cv_sys_dynamic_rtld_global=yes \ + zsh_cv_sys_dynamic_execsyms=yes \ + zsh_cv_sys_dynamic_strip_exe=yes \ + zsh_cv_sys_dynamic_strip_lib=yes +endif + +# regex is commonly used by completion scripts, link it statically +define ZSH_USE_STATIC_REGEX_MODULE + $(SED) 's,echo dynamic,echo static,' $(@D)/Src/Modules/regex.mdd +endef +ZSH_POST_PATCH_HOOKS += ZSH_USE_STATIC_REGEX_MODULE + # Add /bin/zsh to /etc/shells otherwise some login tools like dropbear # can reject the user connection. See man shells. define ZSH_ADD_ZSH_TO_SHELLS diff --git a/package/zstd/zstd.mk b/package/zstd/zstd.mk index a4bbada825a..73bb97a793d 100644 --- a/package/zstd/zstd.mk +++ b/package/zstd/zstd.mk @@ -38,14 +38,15 @@ endif # zstd will append -O3 after $(CFLAGS), use MOREFLAGS to override again ZSTD_OPTS += MOREFLAGS="$(TARGET_OPTIMIZATION)" +ZSTD_BUILD_LIBS_BASENAMES = libzstd.pc ifeq ($(BR2_STATIC_LIBS),y) -ZSTD_BUILD_LIBS = libzstd.a +ZSTD_BUILD_LIBS_BASENAMES += libzstd.a ZSTD_INSTALL_LIBS = install-static else ifeq ($(BR2_SHARED_LIBS),y) -ZSTD_BUILD_LIBS = lib +ZSTD_BUILD_LIBS_BASENAMES += lib ZSTD_INSTALL_LIBS = install-shared else -ZSTD_BUILD_LIBS = lib +ZSTD_BUILD_LIBS_BASENAMES += lib ZSTD_INSTALL_LIBS = install-static install-shared endif @@ -63,17 +64,20 @@ endif # purpose. ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) ZSTD_OPTS += HAVE_THREAD=1 -ZSTD_BUILD_LIBS := $(addsuffix -mt,$(ZSTD_BUILD_LIBS)) +ZSTD_BUILD_LIBS_THREAD_SUFFIX = -mt else ZSTD_OPTS += HAVE_THREAD=0 -ZSTD_BUILD_LIBS := $(addsuffix -nomt,$(ZSTD_BUILD_LIBS)) +ZSTD_BUILD_LIBS_THREAD_SUFFIX = -nomt endif # check-package disable OverriddenVariable - override intended -ZSTD_BUILD_LIBS := $(addsuffix -release,$(ZSTD_BUILD_LIBS)) +ZSTD_BUILD_LIBS = \ + $(addsuffix -release, \ + $(addsuffix $(ZSTD_BUILD_LIBS_THREAD_SUFFIX), \ + $(ZSTD_BUILD_LIBS_BASENAMES))) define ZSTD_BUILD_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) $(ZSTD_OPTS) \ - -C $(@D)/lib $(ZSTD_BUILD_LIBS) libzstd.pc + -C $(@D)/lib $(ZSTD_BUILD_LIBS) $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) $(ZSTD_OPTS) \ -C $(@D)/programs $(ZSTD_BUILD_PROG_TARGET) endef @@ -92,14 +96,18 @@ define ZSTD_INSTALL_TARGET_CMDS endef HOST_ZSTD_OPTS += PREFIX=$(HOST_DIR) +HOST_ZSTD_ENV = $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) + +# We are a ccache dependency, so we can't use ccache +HOST_ZSTD_ENV += CC="$(HOSTCC_NOCCACHE)" CXX="$(HOSTCXX_NOCCACHE)" define HOST_ZSTD_BUILD_CMDS - $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) $(HOST_ZSTD_OPTS) \ + $(HOST_ZSTD_ENV) $(MAKE) $(HOST_ZSTD_OPTS) \ -C $(@D) zstd-release lib-release endef define HOST_ZSTD_INSTALL_CMDS - $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) $(HOST_ZSTD_OPTS) \ + $(HOST_ZSTD_ENV) $(MAKE) $(HOST_ZSTD_OPTS) \ -C $(@D) install endef diff --git a/package/zxing-cpp/0001-Link-library-with-OpenCV-make-libs-private-not-exported-to-the-users.patch b/package/zxing-cpp/0001-Link-library-with-OpenCV-make-libs-private-not-exported-to-the-users.patch deleted file mode 100644 index 90b23203842..00000000000 --- a/package/zxing-cpp/0001-Link-library-with-OpenCV-make-libs-private-not-exported-to-the-users.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 9e5dfa57f3b998bc3049bfa893b20e81dea656df Mon Sep 17 00:00:00 2001 -From: Yuri -Date: Sat, 20 Apr 2019 07:28:26 -0700 -Subject: [PATCH] Link library with OpenCV, not only the executable, make libs - PRIVATE. - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/glassechidna/zxing-cpp/pull/86] ---- - CMakeLists.txt | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 738f4e1..efe3aee 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -60,10 +60,12 @@ include_directories(core/src) - add_library(libzxing ${LIBZXING_FILES}) - set_target_properties(libzxing PROPERTIES PREFIX "") - -+set(libzxing_LIBS "") -+ - find_package(Iconv) - if(ICONV_FOUND) - include_directories(${ICONV_INCLUDE_DIR}) -- target_link_libraries(libzxing ${ICONV_LIBRARIES}) -+ set(libzxing_LIBS ${libzxing_LIBS} ${ICONV_LIBRARIES}) - else() - add_definitions(-DNO_ICONV=1) - endif() -@@ -75,9 +77,12 @@ if(OpenCV_FOUND) - "./opencv-cli/src/*.h" - ) - add_executable(zxing-cv ${OPENCV_ZXING_FILES}) -+ set(libzxing_LIBS ${libzxing_LIBS} ${OpenCV_LIBRARIES}) - target_link_libraries(zxing-cv libzxing ${OpenCV_LIBRARIES}) - endif() - -+target_link_libraries(libzxing PRIVATE ${libzxing_LIBS}) -+ - # Add cli executable. - file(GLOB_RECURSE ZXING_FILES - "./cli/src/*.cpp" diff --git a/package/zxing-cpp/0002-CMakeLists-txt-add-BUILD_OPENCV-option.patch b/package/zxing-cpp/0002-CMakeLists-txt-add-BUILD_OPENCV-option.patch deleted file mode 100644 index 31753d7c244..00000000000 --- a/package/zxing-cpp/0002-CMakeLists-txt-add-BUILD_OPENCV-option.patch +++ /dev/null @@ -1,39 +0,0 @@ -From fe740316af970f57ec511cdeafb512510e4842a9 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 9 Nov 2019 17:21:13 +0100 -Subject: [PATCH] CMakeLists.txt: add BUILD_OPENCV option - -Add BUILD_OPENCV option to allow the user to disable OpenCV. It is -especially useful as opencv library can be built without highgui support - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/glassechidna/zxing-cpp/pull/90] ---- - CMakeLists.txt | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 738f4e1..12913cd 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -3,6 +3,7 @@ cmake_minimum_required(VERSION 3.0) - project(zxing) - - option(BUILD_TESTING "Enable generation of test targets" OFF) -+option(BUILD_OPENCV "Enable OpenCV classes and OpenCV cli executable" ON) - - set(CMAKE_LIBRARY_PATH /opt/local/lib ${CMAKE_LIBRARY_PATH}) - -@@ -44,8 +45,10 @@ else() - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") - endif() - --# OpenCV classes --find_package(OpenCV) -+if (BUILD_OPENCV) -+ # OpenCV classes -+ find_package(OpenCV) -+endif() - if(OpenCV_FOUND) - list(APPEND LIBZXING_FILES - opencv/src/zxing/MatSource.cpp diff --git a/package/zxing-cpp/Config.in b/package/zxing-cpp/Config.in index c1109219a0c..0d8b79538d1 100644 --- a/package/zxing-cpp/Config.in +++ b/package/zxing-cpp/Config.in @@ -1,14 +1,18 @@ -comment "zxing-cpp needs a toolchain w/ C++, dynamic library" - depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS +comment "zxing-cpp needs a toolchain w/ C++, wchar, dynamic library" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ + BR2_STATIC_LIBS config BR2_PACKAGE_ZXING_CPP bool "zxing-cpp" depends on !BR2_STATIC_LIBS + depends on BR2_USE_WCHAR depends on BR2_INSTALL_LIBSTDCPP + select BR2_PACKAGE_STB + select BR2_PACKAGE_PYTHON_PYBIND if BR2_PACKAGE_PYTHON3 help ZXing-cpp (pronounced "zebra crossing") is an open-source, multi-format 1D/2D barcode image processing library implemented in Java, with ports to other languages. This compiles the C++ port. - https://github.com/glassechidna/zxing-cpp + https://github.com/zxing-cpp/zxing-cpp diff --git a/package/zxing-cpp/zxing-cpp.hash b/package/zxing-cpp/zxing-cpp.hash index f12349bbd94..5457ede44a6 100644 --- a/package/zxing-cpp/zxing-cpp.hash +++ b/package/zxing-cpp/zxing-cpp.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 4c2b8601d0e3377143c1a0bbab220146af9fa5a5e29e8fbef42862fe3d38f8e6 zxing-cpp-e0e40ddec63f38405aca5c8c1ff60b85ec8b1f10.tar.gz +sha256 126767bb56f8a1f25ae84d233db2e9b9be50d71f5776092d0e170ca0f0ed1862 zxing-cpp-1.4.0.tar.gz # License files -sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 COPYING +sha256 c6596eb7be8581c18be736c846fb9173b69eccf6ef94c5135893ec56bd92ba08 LICENSE diff --git a/package/zxing-cpp/zxing-cpp.mk b/package/zxing-cpp/zxing-cpp.mk index e9c80b44538..85836924b96 100644 --- a/package/zxing-cpp/zxing-cpp.mk +++ b/package/zxing-cpp/zxing-cpp.mk @@ -4,23 +4,54 @@ # ################################################################################ -ZXING_CPP_VERSION = e0e40ddec63f38405aca5c8c1ff60b85ec8b1f10 -ZXING_CPP_SITE = $(call github,glassechidna,zxing-cpp,$(ZXING_CPP_VERSION)) +ZXING_CPP_VERSION = 1.4.0 +ZXING_CPP_SITE = $(call github,zxing-cpp,zxing-cpp,v$(ZXING_CPP_VERSION)) ZXING_CPP_LICENSE = Apache-2.0 -ZXING_CPP_LICENSE_FILES = COPYING +ZXING_CPP_LICENSE_FILES = LICENSE ZXING_CPP_INSTALL_STAGING = YES ZXING_CPP_SUPPORTS_IN_SOURCE_BUILD = NO -ZXING_CPP_CONF_OPTS = -DBUILD_TESTING=OFF +ZXING_CPP_DEPENDENCIES = host-pkgconf stb +ZXING_CPP_CONF_OPTS = \ + -DBUILD_READERS=ON \ + -DBUILD_WRITERS=ON \ + -DBUILD_EXAMPLES=OFF \ + -DBUILD_BLACKBOX_TESTS=OFF \ + -DBUILD_UNIT_TESTS=OFF \ + -DBUILD_DEPENDENCIES=LOCAL -ifeq ($(BR2_PACKAGE_LIBICONV),y) -ZXING_CPP_DEPENDENCIES += libiconv +ifeq ($(BR2_PACKAGE_OPENCV3_LIB_HIGHGUI)$(BR2_PACKAGE_OPENCV4_LIB_HIGHGUI),y) +ifeq ($(BR2_PACKAGE_OPENCV3),y) +ZXING_CPP_DEPENDENCIES += opencv3 +endif +ifeq ($(BR2_PACKAGE_OPENCV4),y) +ZXING_CPP_DEPENDENCIES += opencv4 +endif +ZXING_CPP_CONF_OPTS += -DCMAKE_REQUIRE_FIND_PACKAGE_OpenCV=TRUE +else +ZXING_CPP_CONF_OPTS += -DCMAKE_DISABLE_FIND_PACKAGE_OpenCV=TRUE endif -ifeq ($(BR2_PACKAGE_OPENCV3_LIB_HIGHGUI),y) -ZXING_CPP_DEPENDENCIES += opencv3 -ZXING_CPP_CONF_OPTS += -DBUILD_OPENCV=ON +ifeq ($(BR2_PACKAGE_PYTHON3)$(BR2_PACKAGE_PYTHON_PYBIND),yy) +ZXING_CPP_DEPENDENCIES += python3 python-pybind +ZXING_CPP_CONF_OPTS += \ + -DBUILD_PYTHON_MODULE=ON \ + -DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python3 \ + -DPYTHON_INCLUDE_DIRS=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) +else +ZXING_CPP_CONF_OPTS += -DBUILD_PYTHON_MODULE=OFF +endif + +ifeq ($(BR2_PACKAGE_QT5BASE),y) +ZXING_CPP_DEPENDENCIES += qt5base +ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK)$(BR2_PACKAGE_QT5MULTIMEDIA),yy) +ZXING_CPP_DEPENDENCIES += qt5declarative qt5multimedia +endif +# Only set qt5 as required when all optional qt5 dependencies are present +ifeq ($(BR2_PACKAGE_QT5BASE_GUI)$(BR2_PACKAGE_QT5DECLARATIVE_QUICK)$(BR2_PACKAGE_QT5MULTIMEDIA),yyy) +ZXING_CPP_CONF_OPTS += -DCMAKE_REQUIRE_FIND_PACKAGE_Qt5=TRUE +endif else -ZXING_CPP_CONF_OPTS += -DBUILD_OPENCV=OFF +ZXING_CPP_CONF_OPTS += -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=TRUE endif $(eval $(cmake-package)) diff --git a/package/zynaddsubfx/Config.in b/package/zynaddsubfx/Config.in index 837a469e7c1..f181a23944d 100644 --- a/package/zynaddsubfx/Config.in +++ b/package/zynaddsubfx/Config.in @@ -2,8 +2,7 @@ config BR2_PACKAGE_ZYNADDSUBFX bool "zynaddsubfx" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 - depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib, liblo - select BR2_PACKAGE_ALSA_LIB + depends on BR2_TOOLCHAIN_HAS_THREADS # liblo select BR2_PACKAGE_FFTW select BR2_PACKAGE_FFTW_SINGLE select BR2_PACKAGE_LIBLO diff --git a/package/zynaddsubfx/zynaddsubfx.mk b/package/zynaddsubfx/zynaddsubfx.mk index 158b5b4ede4..aff9ac4bf42 100644 --- a/package/zynaddsubfx/zynaddsubfx.mk +++ b/package/zynaddsubfx/zynaddsubfx.mk @@ -11,17 +11,37 @@ ZYNADDSUBFX_LICENSE = GPL-2.0+ ZYNADDSUBFX_LICENSE_FILES = COPYING # There is no package in buildroot using LV2 plugins: disabling -ZYNADDSUBFX_CONF_OPTS = -DPluginEnable=False +ZYNADDSUBFX_CONF_OPTS = -DCompileTests=OFF -DPluginEnable=OFF ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -ZYNADDSUBFX_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic +ZYNADDSUBFX_CONF_OPTS += -DOS_LIBRARIES=-latomic endif ZYNADDSUBFX_DEPENDENCIES = \ - alsa-lib \ fftw-single \ liblo \ mxml \ zlib +ifeq ($(BR2_PACKAGE_ALSA_LIB_SEQ),y) +ZYNADDSUBFX_DEPENDENCIES += alsa-lib +ZYNADDSUBFX_CONF_OPTS += -DAlsaEnable=ON +else +ZYNADDSUBFX_CONF_OPTS += -DAlsaEnable=OFF +endif + +ifeq ($(BR2_PACKAGE_JACK1)$(BR2_PACKAGE_JACK2),y) +ZYNADDSUBFX_DEPENDENCIES += $(if $(BR2_PACKAGE_JACK1),jack1,jack2) +ZYNADDSUBFX_CONF_OPTS += -DJackEnable=ON +else +ZYNADDSUBFX_CONF_OPTS += -DJackEnable=OFF +endif + +ifeq ($(BR2_PACKAGE_PORTAUDIO),y) +ZYNADDSUBFX_DEPENDENCIES += portaudio +ZYNADDSUBFX_CONF_OPTS += -DPaEnable=ON +else +ZYNADDSUBFX_CONF_OPTS += -DPaEnable=OFF +endif + $(eval $(cmake-package)) diff --git a/package/zziplib/0001-implant-ZZIP_LIBLATEST-for-zzip_lib.patch b/package/zziplib/0001-implant-ZZIP_LIBLATEST-for-zzip_lib.patch new file mode 100644 index 00000000000..780d990ab79 --- /dev/null +++ b/package/zziplib/0001-implant-ZZIP_LIBLATEST-for-zzip_lib.patch @@ -0,0 +1,75 @@ +From 0e8d35f92efb680c81f6ec1fca9f11d173dce389 Mon Sep 17 00:00:00 2001 +From: Guido Draheim +Date: Sat, 22 May 2021 15:13:28 +0200 +Subject: [PATCH] #117 implant ZZIP_LIBLATEST for zzip.lib + +[Andreas: Extract link creation for versioned libraries from commit +0e8d35f92efb680c81f6ec1fca9f11d173dce389.] +Signed-off-by: Andreas Ziegler +--- + zzip/CMakeLists.txt | 57 +++++++++++++++++++++++++++++++++++---------- + 1 file changed, 45 insertions(+), 12 deletions(-) + +diff --git a/zzip/CMakeLists.txt b/zzip/CMakeLists.txt +index a966d5f..ccd08b6 100644 +--- a/zzip/CMakeLists.txt ++++ b/zzip/CMakeLists.txt +@@ -28,6 +28,12 @@ option(ZZIP_LIBTOOL "Ensure binary compatibility with libtool" OFF) + option(ZZIP_PKGCONFIG "Generate pkg-config files for linking" OFF) + endif() + ++if(ZZIP_LIBTOOL OR ZZIP_PKGCONFIG) ++option(ZZIP_LIBLATEST "Ensure libname.lib links to libname-REL.lib" ON) ++else() ++option(ZZIP_LIBLATEST "Ensure libname.lib links to libname-REL.lib" OFF) ++endif() ++ + # used in zzip/_config.h + set(ZZIP_PACKAGE "${PROJECT_NAME}lib") + set(ZZIP_VERSION "${PROJECT_VERSION}") +@@ -346,6 +340,45 @@ if(ZZIP_LIBTOOL) + endif(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG) + endif(ZZIP_LIBTOOL) + ++if(ZZIP_LIBLATEST) ++ if(BUILD_SHARED_LIBS) ++ set(lib ${CMAKE_SHARED_LIBRARY_PREFIX}) ++ set(dll ${CMAKE_SHARED_LIBRARY_SUFFIX}) ++ else() ++ set(lib ${CMAKE_STATIC_LIBRARY_PREFIX}) ++ set(dll ${CMAKE_STATIC_LIBRARY_SUFFIX}) ++ endif() ++ get_target_property(libname libzzip OUTPUT_NAME) ++ get_target_property(librelease libzzip RELEASE_POSTFIX) ++ add_custom_target(libzzip_latest ALL ++ COMMAND ${CMAKE_COMMAND} -E create_symlink $ ${lib}${libname}${dll} ++ ) ++ install(FILES ++ ${outdir}/${lib}${libname}${dll} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ if(ZZIPFSEEKO) ++ get_target_property(libname libzzipfseeko OUTPUT_NAME) ++ get_target_property(librelease libzzipfseeko RELEASE_POSTFIX) ++ add_custom_target(libzzipfseeko_latest ALL ++ COMMAND ${CMAKE_COMMAND} -E create_symlink $ ${lib}${libname}${dll} ++ ) ++ install(FILES ++ ${outdir}/${lib}${libname}${dll} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ endif(ZZIPFSEEKO) ++ if(ZZIPMMAPPED) ++ get_target_property(libname libzzipmmapped OUTPUT_NAME) ++ get_target_property(librelease libzzipmmapped RELEASE_POSTFIX) ++ add_custom_target(libzzipmmaped_latest ALL ++ COMMAND ${CMAKE_COMMAND} -E create_symlink $ ${lib}${libname}${dll} ++ ) ++ install(FILES ++ ${outdir}/${lib}${libname}${dll} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ endif(ZZIPMMAPPED) ++endif(ZZIP_LIBLATEST) ++ ++ + ## messages ############################################## + + message(STATUS "lib zzipfseeko to be compiled: ${ZZIPFSEEKO}") diff --git a/package/zziplib/0002-ZZIP_LIBLATEST-create-symlinks-only-if-target-is-mis.patch b/package/zziplib/0002-ZZIP_LIBLATEST-create-symlinks-only-if-target-is-mis.patch new file mode 100644 index 00000000000..c8ccd48dbad --- /dev/null +++ b/package/zziplib/0002-ZZIP_LIBLATEST-create-symlinks-only-if-target-is-mis.patch @@ -0,0 +1,72 @@ +From 5977725ecea038f32a86938703ca1ed2b080b31c Mon Sep 17 00:00:00 2001 +From: Andreas Ziegler +Date: Fri, 29 Jul 2022 12:32:27 +0200 +Subject: [PATCH] ZZIP_LIBLATEST: create symlinks only if target is missing + +zzip/CMakeList.txt uses custom build targets to create symlinks to the +(normally versioned) build results from unversioned file names. These +targets are executed unconditionally, every time a build is started, +regardless of the existence of the symlink. + +Debug builds, however, generate unversioned libraries. The build targets +therefore overwrite existing files with recursive links. + +Create custom targets depending on the target file plus custom build +commands containing the symlink creation, thereby ensuring that symlinks +are only created if the link target is missing. + +Signed-off-by: Andreas Ziegler +Upstream: https://github.com/gdraheim/zziplib/pull/138 +--- + zzip/CMakeLists.txt | 18 +++++++++++++++--- + 1 file changed, 15 insertions(+), 3 deletions(-) + +diff --git a/zzip/CMakeLists.txt b/zzip/CMakeLists.txt +index 4fa6b9c..dd1e56a 100644 +--- a/zzip/CMakeLists.txt ++++ b/zzip/CMakeLists.txt +@@ -350,8 +350,12 @@ if(ZZIP_LIBLATEST) + endif() + get_target_property(libname libzzip OUTPUT_NAME) + get_target_property(librelease libzzip RELEASE_POSTFIX) ++ set(libzzip_target "${lib}${libname}${dll}") ++ add_custom_command(OUTPUT ${libzzip_target} ++ COMMAND ${CMAKE_COMMAND} -E create_symlink $ ${libzzip_target} ++ ) + add_custom_target(libzzip_latest ALL +- COMMAND ${CMAKE_COMMAND} -E create_symlink $ ${lib}${libname}${dll} ++ DEPENDS ${libzzip_target} + ) + install(FILES + ${outdir}/${lib}${libname}${dll} +@@ -359,8 +363,12 @@ if(ZZIP_LIBLATEST) + if(ZZIPFSEEKO) + get_target_property(libname libzzipfseeko OUTPUT_NAME) + get_target_property(librelease libzzipfseeko RELEASE_POSTFIX) ++ set(libzzipfseeko_target "${lib}${libname}${dll}") ++ add_custom_command(OUTPUT ${libzzipfseeko_target} ++ COMMAND ${CMAKE_COMMAND} -E create_symlink $ ${libzzipfseeko_target} ++ ) + add_custom_target(libzzipfseeko_latest ALL +- COMMAND ${CMAKE_COMMAND} -E create_symlink $ ${lib}${libname}${dll} ++ DEPENDS ${libzzipfseeko_target} + ) + install(FILES + ${outdir}/${lib}${libname}${dll} +@@ -369,8 +377,12 @@ if(ZZIP_LIBLATEST) + if(ZZIPMMAPPED) + get_target_property(libname libzzipmmapped OUTPUT_NAME) + get_target_property(librelease libzzipmmapped RELEASE_POSTFIX) ++ set(libzzipmmapped_target "${lib}${libname}${dll}") ++ add_custom_command(OUTPUT ${libzzipmmapped_target} ++ COMMAND ${CMAKE_COMMAND} -E create_symlink $ ${libzzipmmapped_target} ++ ) + add_custom_target(libzzipmmaped_latest ALL +- COMMAND ${CMAKE_COMMAND} -E create_symlink $ ${lib}${libname}${dll} ++ DEPENDS ${libzzipmmapped_target} + ) + install(FILES + ${outdir}/${lib}${libname}${dll} +-- +2.34.1 + diff --git a/support/config-fragments/autobuild/andes-nds32.config b/support/config-fragments/autobuild/andes-nds32.config deleted file mode 100644 index 541677e002d..00000000000 --- a/support/config-fragments/autobuild/andes-nds32.config +++ /dev/null @@ -1,3 +0,0 @@ -BR2_nds32=y -BR2_TOOLCHAIN_EXTERNAL=y -BR2_TOOLCHAIN_EXTERNAL_ANDES_NDS32=y diff --git a/support/config-fragments/autobuild/bootlin-armv7m-uclibc.config b/support/config-fragments/autobuild/bootlin-armv7m-uclibc.config index 8d054096473..48f2bb3488e 100644 --- a/support/config-fragments/autobuild/bootlin-armv7m-uclibc.config +++ b/support/config-fragments/autobuild/bootlin-armv7m-uclibc.config @@ -1,4 +1,5 @@ BR2_arm=y BR2_cortex_m4=y BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7M_UCLIBC_STABLE=y diff --git a/support/config-fragments/autobuild/bootlin-s390x-z13-glibc.config b/support/config-fragments/autobuild/bootlin-s390x-z13-glibc.config new file mode 100644 index 00000000000..fe3f0380c9f --- /dev/null +++ b/support/config-fragments/autobuild/bootlin-s390x-z13-glibc.config @@ -0,0 +1,5 @@ +BR2_s390x=y +BR2_s390x_z13=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_GLIBC_BLEEDING_EDGE=y diff --git a/support/config-fragments/autobuild/br-arm-internal-glibc.config b/support/config-fragments/autobuild/br-arm-internal-glibc.config index fb930cbef7c..cd148f32e63 100644 --- a/support/config-fragments/autobuild/br-arm-internal-glibc.config +++ b/support/config-fragments/autobuild/br-arm-internal-glibc.config @@ -1,6 +1,6 @@ BR2_arm=y BR2_cortex_a8=y BR2_TOOLCHAIN_BUILDROOT_GLIBC=y -BR2_BINUTILS_VERSION_2_36_X=y -BR2_GCC_VERSION_11_X=y +BR2_BINUTILS_VERSION_2_39_X=y +BR2_GCC_VERSION_12_X=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 f5e9bd8cf9b..a65e9bacc39 100644 --- a/support/config-fragments/autobuild/toolchain-configs.csv +++ b/support/config-fragments/autobuild/toolchain-configs.csv @@ -22,7 +22,6 @@ support/config-fragments/autobuild/br-arm-full-static.config,x86_64 support/config-fragments/autobuild/sourcery-arm.config,x86 # Toolchains used by test-pkg only when the '-a' option is passed: -support/config-fragments/autobuild/andes-nds32.config,x86 support/config-fragments/autobuild/arm-aarch64.config,x86_64 support/config-fragments/autobuild/bootlin-aarch64-glibc.config,x86_64 support/config-fragments/autobuild/bootlin-arcle-hs38-uclibc.config,x86_64 @@ -39,6 +38,7 @@ support/config-fragments/autobuild/bootlin-powerpc-e500mc-uclibc.config,x86_64 support/config-fragments/autobuild/bootlin-riscv32-glibc.config,x86_64 support/config-fragments/autobuild/bootlin-riscv64-glibc.config,x86_64 support/config-fragments/autobuild/bootlin-riscv64-musl.config,x86_64 +support/config-fragments/autobuild/bootlin-s390x-z13-glibc.config,x86_64 support/config-fragments/autobuild/bootlin-sh4-uclibc.config,x86_64 support/config-fragments/autobuild/bootlin-sparc-uclibc.config,x86_64 support/config-fragments/autobuild/bootlin-sparc64-glibc.config,x86_64 diff --git a/support/config-fragments/minimal.config b/support/config-fragments/minimal.config index 71344e2c698..3430fcce115 100644 --- a/support/config-fragments/minimal.config +++ b/support/config-fragments/minimal.config @@ -4,5 +4,4 @@ BR2_INIT_NONE=y BR2_SYSTEM_BIN_SH_NONE=y # BR2_PACKAGE_BUSYBOX is not set # BR2_TARGET_ROOTFS_TAR is not set -BR2_COMPILER_PARANOID_UNSAFE_PATH=y BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y diff --git a/support/dependencies/check-host-cmake.mk b/support/dependencies/check-host-cmake.mk index dfc252e9198..e3676903198 100644 --- a/support/dependencies/check-host-cmake.mk +++ b/support/dependencies/check-host-cmake.mk @@ -1,9 +1,11 @@ -# Set this to either 3.16 or higher, depending on the highest minimum -# version required by any of the packages bundled in Buildroot. If a -# package is bumped or a new one added, and it requires a higher -# version, our cmake infra will catch it and build its own. +# The cmake minimum version is set to either 3.18 or higher, +# depending on the highest minimum version required by any +# of the packages bundled in Buildroot. If a package is +# bumped or a new one added, and it requires a higher +# cmake version than the one provided by the host, our +# cmake infra will catch it and build its own. # -BR2_CMAKE_VERSION_MIN = 3.16 +BR2_CMAKE_VERSION_MIN = $(BR2_HOST_CMAKE_AT_LEAST) BR2_CMAKE_CANDIDATES ?= cmake cmake3 BR2_CMAKE ?= $(call suitable-host-package,cmake,\ diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index c604a9efcc1..58f44c87233 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -46,15 +46,6 @@ case ":${PATH:-unset}:" in ;; esac -if test -n "$PERL_MM_OPT" ; then - echo - echo "You have PERL_MM_OPT defined because Perl local::lib" - echo "is installed on your system. Please unset this variable" - echo "before starting Buildroot, otherwise the compilation of" - echo "Perl related packages will fail" - exit 1 -fi - check_prog_host() { prog="$1" @@ -163,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 ${DL_TOOLS} ; do +for prog in perl tar wget cpio unzip rsync bc cmp find xargs ${DL_TOOLS} ; do if ! which $prog > /dev/null ; then echo "You must install '$prog' on your build machine"; missing_progs="yes" @@ -175,6 +166,22 @@ for prog in perl tar wget cpio unzip rsync bc ${DL_TOOLS} ; do echo " zcat is usually part of the gzip package in your distribution" elif test $prog = "bzcat" ; then echo " bzcat is usually part of the bzip2 package in your distribution" + elif test $prog = "cmp" ; then + echo " cmp is usually part of the diffutils package in your distribution" + elif test $prog = "find" ; then + echo " find is usually part of the findutils package in your distribution" + elif test $prog = "xargs" ; then + echo " xargs is usually part of the findutils package in your distribution" + fi + fi + + # we need git >= 2.0.0 for shallow clones / vendoring + if test $prog = "git" ; then + GIT_VERSION="$(git --version | sed -n 's/^git version \(.*\)/\1/p')" + GIT_MAJOR="$(echo "${GIT_VERSION}" | cut -d . -f 1)" + if [ "${GIT_MAJOR}" -lt 2 ]; then + echo "You have git '${GIT_VERSION}' installed. Git >= 2.0.0 is required" + exit 1 fi fi done @@ -197,7 +204,7 @@ if [ "${PATCH_MAJOR}" -lt 2 ] || [ "${PATCH_MAJOR}" -eq 2 -a "${PATCH_MINOR}" -l exit 1; fi -if grep ^BR2_NEEDS_HOST_UTF8_LOCALE=y $BR2_CONFIG > /dev/null; then +if grep -q ^BR2_NEEDS_HOST_UTF8_LOCALE=y $BR2_CONFIG ; then if ! which locale > /dev/null ; then echo echo "You need locale support on your build machine to build a toolchain supporting locales" @@ -257,7 +264,7 @@ if grep -q ^BR2_HOSTARCH_NEEDS_IA32_COMPILER=y $BR2_CONFIG ; then fi fi -if grep ^BR2_NEEDS_HOST_GCC_PLUGIN_SUPPORT=y $BR2_CONFIG ; then +if grep -q ^BR2_NEEDS_HOST_GCC_PLUGIN_SUPPORT=y $BR2_CONFIG ; then if ! echo "#include " | $HOSTCXX_NOCCACHE -I$($HOSTCXX_NOCCACHE -print-file-name=plugin)/include -x c++ -c - -o /dev/null ; then echo echo "Your Buildroot configuration needs a host compiler capable of building gcc plugins." @@ -269,14 +276,24 @@ fi # Check that the Perl installation is complete enough for Buildroot. required_perl_modules="Data::Dumper" # Needed to build host-autoconf +required_perl_modules="$required_perl_modules English" # Used by host-libxml-parser-perl required_perl_modules="$required_perl_modules ExtUtils::MakeMaker" # Used by host-libxml-parser-perl required_perl_modules="$required_perl_modules Thread::Queue" # Used by host-automake +required_perl_modules="$required_perl_modules FindBin" # Used by (host-)libopenssl + +if grep -q ^BR2_PACKAGE_MOSH=y $BR2_CONFIG ; then + required_perl_modules="$required_perl_modules diagnostics" +fi if grep -q ^BR2_PACKAGE_MPV=y $BR2_CONFIG ; then required_perl_modules="$required_perl_modules Math::BigInt" required_perl_modules="$required_perl_modules Math::BigRat" fi +if grep -q ^BR2_PACKAGE_NETSURF=y $BR2_CONFIG ; then + required_perl_modules="$required_perl_modules Digest::MD5" +fi + if grep -q ^BR2_PACKAGE_WHOIS=y $BR2_CONFIG ; then required_perl_modules="$required_perl_modules autodie" fi @@ -285,9 +302,20 @@ if grep -q -E '^BR2_PACKAGE_(WEBKITGTK|WPEWEBKIT)=y' $BR2_CONFIG ; then required_perl_modules="${required_perl_modules} JSON::PP" fi +if grep -q -E '^BR2_(PACKAGE_ACE|TARGET_SYSLINUX)=y' $BR2_CONFIG ; then + required_perl_modules="$required_perl_modules FileHandle" +fi + # This variable will keep the modules that are missing in your system. missing_perl_modules="" +if grep -q ^BR2_PACKAGE_LIBXCRYPT=y $BR2_CONFIG ; then + # open cannot be used with require + if ! perl -e "use open ':std'" > /dev/null 2>&1 ; then + missing_perl_modules="$missing_perl_modules open" + fi +fi + for pm in $required_perl_modules ; do if ! perl -e "require $pm" > /dev/null 2>&1 ; then missing_perl_modules="$missing_perl_modules $pm" diff --git a/support/docker/Dockerfile b/support/docker/Dockerfile index f54c31b54a5..a16c1e38491 100644 --- a/support/docker/Dockerfile +++ b/support/docker/Dockerfile @@ -6,7 +6,7 @@ # 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-20210902 +FROM debian:bullseye-20230202 LABEL maintainer="Buildroot mailing list " \ vendor="Buildroot" \ @@ -20,8 +20,8 @@ COPY apt-sources.list /etc/apt/sources.list # The container has no package lists, so need to update first RUN dpkg --add-architecture i386 && \ - apt-get update -y -RUN apt-get install -y --no-install-recommends \ + apt-get -o APT::Retries=3 update -y +RUN apt-get -o APT::Retries=3 install -y --no-install-recommends \ bc \ build-essential \ bzr \ @@ -39,6 +39,7 @@ RUN apt-get install -y --no-install-recommends \ openssh-server \ python3 \ python3-flake8 \ + python3-magic \ python3-nose2 \ python3-pexpect \ python3-pytest \ diff --git a/support/docker/apt-sources.list b/support/docker/apt-sources.list index 0f872fd398b..849996d9f76 100644 --- a/support/docker/apt-sources.list +++ b/support/docker/apt-sources.list @@ -1,4 +1,4 @@ -# Latest just before 20210817T000000Z: -deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20210902T205533Z/ bullseye main -deb [check-valid-until=no] http://snapshot.debian.org/archive/debian-security/20210902T193650Z/ bullseye-security main -deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20210902T205533Z/ bullseye-updates main +# 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 diff --git a/support/download/cargo-post-process b/support/download/cargo-post-process index a4a4718a2a4..3f4666c0062 100755 --- a/support/download/cargo-post-process +++ b/support/download/cargo-post-process @@ -22,17 +22,22 @@ post_process_unpack "${base_name}" "${output}" # Do the Cargo vendoring pushd "${base_name}" > /dev/null -cargo vendor --manifest-path ${BR_CARGO_MANIFEST_PATH-Cargo.toml} --locked VENDOR # Create the local .cargo/config with vendor info mkdir -p .cargo/ -cat <.cargo/config -[source.crates-io] -replace-with = "vendored-sources" +mkdir -p "${CARGO_HOME}" +flock "${CARGO_HOME}"/.br-lock \ +cargo vendor \ + --manifest-path ${BR_CARGO_MANIFEST_PATH-Cargo.toml} \ + --locked VENDOR \ + > .cargo/config + +# "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. +# Since we redirect stdout to .cargo/config.toml, the message on stderr +# gets confusing, so instruct the user that it's been handled. +printf '(note: .cargo/config.toml automatically updated by Buildroot)\n\n' -[source.vendored-sources] -directory = "VENDOR" -EOF popd > /dev/null post_process_repack "$(pwd)" "${base_name}" "${output}" diff --git a/support/download/dl-wrapper b/support/download/dl-wrapper index 09a6ac1f1ad..1e8d6058f66 100755 --- a/support/download/dl-wrapper +++ b/support/download/dl-wrapper @@ -138,9 +138,15 @@ main() { fi if [ -n "${post_process}" ] ; then - "${OLDPWD}/support/download/${post_process}-post-process" \ - -o "${tmpf}" \ - -n "${raw_base_name}" + if ! "${OLDPWD}/support/download/${post_process}-post-process" \ + -o "${tmpf}" \ + -n "${raw_base_name}" + then + # cd back to keep path coherence + cd "${OLDPWD}" + rm -rf "${tmpd}" + continue + fi fi # cd back to free the temp-dir, so we can remove it later diff --git a/support/download/git b/support/download/git index 1a1c315f73d..6654d98a008 100755 --- a/support/download/git +++ b/support/download/git @@ -5,8 +5,8 @@ # (e.g. tar options, compression ratio or method)), we MUST update the format # version in the variable BR_FMT_VERSION_git, in package/pkg-download.mk. -# We want to catch any unexpected failure, and exit immediately -set -E +# We want to catch any unexpected failure +set -e # Download helper for git, to be called from the download wrapper script # @@ -21,6 +21,7 @@ set -E # Environment: # GIT : the git command to call +# shellcheck disable=SC1090 # Only provides mk_tar_gz() . "${0%/*}/helpers" # Save our path and options in case we need to call ourselves again @@ -77,17 +78,19 @@ pushd "${git_cache}" >/dev/null # Any error now should try to recover trap _on_error ERR +set -E # Caller needs to single-quote its arguments to prevent them from # being expanded a second time (in case there are spaces in them) _git() { if [ -z "${quiet}" ]; then - printf '%s ' GIT_DIR="${git_cache}/.git" ${GIT} "${@}"; printf '\n' + printf '%s ' GIT_DIR="${git_cache}/.git" "${GIT}" "${@}"; printf '\n' fi _plain_git "$@" } # Note: please keep command below aligned with what is printed above _plain_git() { + # shellcheck disable=SC2086 # We want word-splitting for GIT eval GIT_DIR="${git_cache}/.git" ${GIT} "${@}" } @@ -173,6 +176,7 @@ fi # the working copy as well as the repository, which means submodules # will not be cached for older versions. # +# shellcheck disable=SC2016 # Will be expanded by git-foreach cmd='printf "Deregistering submodule \"%s\"\n" "${path}" && cd .. && rm -rf "${path##*/}"' _git submodule --quiet foreach "'${cmd}'" @@ -199,11 +203,12 @@ if [ ${recurse} -eq 1 ]; then # that the archives are reproducible across a wider range of git # versions. However, we can't do that if git is too old and uses # full repositories for submodules. + # shellcheck disable=SC2016 # Will be expanded by git-foreach cmd='printf "%s\n" "${path}/"' for module_dir in $( _plain_git submodule --quiet foreach "'${cmd}'" ); do [ -f "${module_dir}/.git" ] || continue relative_dir="$( sed -r -e 's,/+,/,g; s,[^/]+/,../,g' <<<"${module_dir}" )" - sed -r -i -e "s:^gitdir\: $(pwd)/:gitdir\: "${relative_dir}":" "${module_dir}/.git" + sed -r -i -e "s:^gitdir\: $(pwd)/:gitdir\: ${relative_dir}:" "${module_dir}/.git" done fi @@ -213,6 +218,7 @@ if [ ${large_file} -eq 1 ]; then _git lfs fetch _git lfs checkout # If there are also submodules, recurse into them, + # shellcheck disable=SC2086 # We want word-splitting for GIT if [ ${recurse} -eq 1 ]; then _git submodule foreach --recursive ${GIT} lfs install --local _git submodule foreach --recursive ${GIT} lfs fetch diff --git a/support/download/helpers b/support/download/helpers index 90a7d6c1ec3..265685eff52 100755 --- a/support/download/helpers +++ b/support/download/helpers @@ -53,6 +53,9 @@ mk_tar_gz() { tmp="$(mktemp --tmpdir="$(pwd)")" pushd "${in_dir}" >/dev/null + # Enforce group/others mode bits + chmod -R go-wx+X . + # Establish list find . -not -type d -and -not \( -false "${find_opts[@]}" \) >"${tmp}.list" # Sort list for reproducibility diff --git a/support/legal-info/buildroot.hash b/support/legal-info/buildroot.hash index 1b62dbeef77..9d9f4c9dc96 100644 --- a/support/legal-info/buildroot.hash +++ b/support/legal-info/buildroot.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 9755181e27175cb3510b4da8629caa406fb355a19aa8e7d55f06bf8ab33323c4 COPYING +sha256 9755181e27175cb3510b4da8629caa406fb355a19aa8e7d55f06bf8ab33323c4 COPYING diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index a5a0e3f41a8..ae060e44254 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2022.02' +RELEASE='2023.02.5' ### Change here for more memory/cores ### VM_MEMORY=2048 diff --git a/support/misc/cross-compilation.conf.in b/support/misc/cross-compilation.conf.in index 18cf258a8e6..7053df472ba 100644 --- a/support/misc/cross-compilation.conf.in +++ b/support/misc/cross-compilation.conf.in @@ -8,6 +8,8 @@ c = '@TARGET_CC@' cpp = '@TARGET_CXX@' ar = '@TARGET_AR@' strip = '@TARGET_STRIP@' +cmake = '@BR2_CMAKE@' +fortran = '@TARGET_FC@' pkgconfig = '@PKGCONF_HOST_BINARY@' g-ir-compiler = '@STAGING_DIR@/usr/bin/g-ir-compiler' g-ir-scanner = '@STAGING_DIR@/usr/bin/g-ir-scanner' @@ -17,13 +19,19 @@ c_args = [@TARGET_CFLAGS@] c_link_args = [@TARGET_LDFLAGS@] cpp_args = [@TARGET_CXXFLAGS@] cpp_link_args = [@TARGET_LDFLAGS@] +fortran_args = [@TARGET_FCFLAGS@] +fortran_link_args = [@TARGET_LDFLAGS@] wrap_mode = 'nodownload' +cmake_prefix_path = '@STAGING_DIR@/usr/lib/cmake' [properties] needs_exe_wrapper = true sys_root = '@STAGING_DIR@' pkg_config_libdir = '@STAGING_DIR@/usr/lib/pkgconfig:@STAGING_DIR@/usr/share/pkgconfig' pkg_config_static = '@STATIC@' +# enable meson build to pass a toolchain file to cmake +cmake_toolchain_file = '@HOST_DIR@/share/buildroot/toolchainfile.cmake' +cmake_defaults = false [host_machine] system = 'linux' diff --git a/support/misc/gitlab-ci.yml.in b/support/misc/gitlab-ci.yml.in index 47e72c32136..656f39d5706 100644 --- a/support/misc/gitlab-ci.yml.in +++ b/support/misc/gitlab-ci.yml.in @@ -1,13 +1,17 @@ +before_script: + - git config --global --add safe.directory ${CI_PROJECT_DIR} + .check-check-package_base: script: - python3 -m pytest -v utils/checkpackagelib/ +.check-check-symbol_base: + script: + - python3 -m pytest -v utils/checksymbolslib/ + .check-DEVELOPERS_base: - # get-developers should print just "No action specified"; if it prints - # anything else, it's a parse error. - # The initial ! is removed by YAML so we need to quote it. script: - - "! utils/get-developers | grep -v 'No action specified'" + - utils/get-developers -v .check-flake8_base: script: @@ -17,10 +21,13 @@ script: - make check-package +.check-symbol_base: + script: + - utils/check-symbols + .defconfig_check: - before_script: - - DEFCONFIG_NAME=$(echo ${CI_JOB_NAME} | sed -e 's,_check$,,g') script: + - DEFCONFIG_NAME=$(echo ${CI_JOB_NAME} | sed -e 's,_check$,,g') - echo "Configure Buildroot for ${DEFCONFIG_NAME}" - make ${DEFCONFIG_NAME} - support/scripts/check-dotconfig.py .config configs/${DEFCONFIG_NAME} @@ -39,10 +46,9 @@ } .defconfig_base: - before_script: + script: - DEFCONFIG_NAME=${CI_JOB_NAME} - OUTPUT_DIR=output - script: - echo "Configure Buildroot for ${DEFCONFIG_NAME}" - make ${DEFCONFIG_NAME} - ./support/scripts/check-dotconfig.py .config ./configs/${DEFCONFIG_NAME} @@ -54,6 +60,11 @@ tail -200 runtime-test.log exit 1 } + retry: + max: 2 + when: + - runner_system_failure + - stuck_or_timeout_failure artifacts: when: always expire_in: 2 weeks @@ -67,15 +78,19 @@ - runtime-test.log .runtime_test_base: - before_script: - - TEST_CASE_NAME=${CI_JOB_NAME} # Keep build directories so the rootfs can be an artifact of the job. The # runner will clean up those files for us. # Multiply every emulator timeout by 10 to avoid sporadic failures in # elastic runners. script: + - TEST_CASE_NAME=${CI_JOB_NAME} - echo "Starting runtime test ${TEST_CASE_NAME}" - ./support/testing/run-tests -o test-output/ -d test-dl/ -k --timeout-multiplier 10 ${TEST_CASE_NAME} + retry: + max: 2 + when: + - runner_system_failure + - stuck_or_timeout_failure artifacts: when: always expire_in: 2 weeks @@ -86,9 +101,8 @@ .test_pkg: stage: build - before_script: - - OUTPUT_DIR=${CI_JOB_NAME} script: + - OUTPUT_DIR=${CI_JOB_NAME} - echo "Configure Buildroot for ${OUTPUT_DIR}" - make O=${OUTPUT_DIR} syncconfig - make O=${OUTPUT_DIR} savedefconfig @@ -97,6 +111,11 @@ needs: - pipeline: $PARENT_PIPELINE_ID job: generate-gitlab-ci-yml + retry: + max: 2 + when: + - runner_system_failure + - stuck_or_timeout_failure artifacts: when: always expire_in: 2 weeks diff --git a/support/misc/toolchainfile.cmake.in b/support/misc/toolchainfile.cmake.in index be575566a4d..5d2b8695b45 100644 --- a/support/misc/toolchainfile.cmake.in +++ b/support/misc/toolchainfile.cmake.in @@ -14,9 +14,15 @@ string(REPLACE "/share/buildroot" "" RELOCATED_HOST_DIR ${CMAKE_CURRENT_LIST_DIR # so that it can find our custom platform description. list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) -set(CMAKE_SYSTEM_NAME Buildroot) -set(CMAKE_SYSTEM_VERSION 1) -set(CMAKE_SYSTEM_PROCESSOR @@CMAKE_SYSTEM_PROCESSOR@@) +if(NOT DEFINED CMAKE_SYSTEM_NAME) + set(CMAKE_SYSTEM_NAME Buildroot) +endif() +if(NOT DEFINED CMAKE_SYSTEM_VERSION) + set(CMAKE_SYSTEM_VERSION 1) +endif() +if(NOT DEFINED CMAKE_SYSTEM_PROCESSOR) + set(CMAKE_SYSTEM_PROCESSOR @@CMAKE_SYSTEM_PROCESSOR@@) +endif() # Set the {C,CXX}FLAGS appended by CMake depending on the build type # defined by Buildroot. CMake defaults these variables with -g and/or @@ -28,11 +34,17 @@ set(CMAKE_SYSTEM_PROCESSOR @@CMAKE_SYSTEM_PROCESSOR@@) # Note: # if the project forces some of these flag variables, Buildroot is # screwed up and there is nothing Buildroot can do about that :( -set(CMAKE_C_FLAGS_DEBUG "" CACHE STRING "Debug CFLAGS") -set(CMAKE_C_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release CFLAGS") +if(NOT DEFINED CMAKE_C_FLAGS_DEBUG) + set(CMAKE_C_FLAGS_DEBUG "" CACHE STRING "Debug CFLAGS") +endif() +if(NOT DEFINED CMAKE_C_FLAGS_RELEASE) + set(CMAKE_C_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release CFLAGS") +endif() # Build type from the Buildroot configuration -set(CMAKE_BUILD_TYPE @@CMAKE_BUILD_TYPE@@ CACHE STRING "Buildroot build configuration") +if(NOT DEFINED CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE @@CMAKE_BUILD_TYPE@@ CACHE STRING "Buildroot build configuration") +endif() # Buildroot defaults flags. # If you are using this toolchainfile.cmake file outside of Buildroot and @@ -41,33 +53,84 @@ set(CMAKE_BUILD_TYPE @@CMAKE_BUILD_TYPE@@ CACHE STRING "Buildroot build configur # cmake -DCMAKE_C_FLAGS="@@TARGET_CFLAGS@@ -Dsome_custom_flag" ... # * and make sure the project's CMake code extends them like this if needed: # set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Dsome_definitions") -set(CMAKE_C_FLAGS "@@TARGET_CFLAGS@@" CACHE STRING "Buildroot CFLAGS") -set(CMAKE_EXE_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS for executables") -set(CMAKE_SHARED_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS for shared libraries") -set(CMAKE_MODULE_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS for module libraries") +if(NOT DEFINED CMAKE_C_FLAGS) + set(CMAKE_C_FLAGS "@@TARGET_CFLAGS@@" CACHE STRING "Buildroot CFLAGS") +endif() +if(NOT DEFINED CMAKE_EXE_LINKER_FLAGS) + set(CMAKE_EXE_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS for executables") +endif() +if(NOT DEFINED CMAKE_SHARED_LINKER_FLAGS) + set(CMAKE_SHARED_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS for shared libraries") +endif() +if(NOT DEFINED CMAKE_MODULE_LINKER_FLAGS) + set(CMAKE_MODULE_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS for module libraries") +endif() -set(CMAKE_INSTALL_SO_NO_EXE 0) +if(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE) + set(CMAKE_INSTALL_SO_NO_EXE 0) +endif() -set(CMAKE_PROGRAM_PATH "${RELOCATED_HOST_DIR}/bin") -set(CMAKE_SYSROOT "${RELOCATED_HOST_DIR}/@@STAGING_SUBDIR@@") -set(CMAKE_FIND_ROOT_PATH "${RELOCATED_HOST_DIR}/@@STAGING_SUBDIR@@") -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) +if(NOT DEFINED CMAKE_PROGRAM_PATH) + set(CMAKE_PROGRAM_PATH "${RELOCATED_HOST_DIR}/bin") +endif() +if(NOT DEFINED CMAKE_SYSROOT) + set(CMAKE_SYSROOT "${RELOCATED_HOST_DIR}/@@STAGING_SUBDIR@@") +endif() +if(NOT DEFINED CMAKE_FIND_ROOT_PATH) + set(CMAKE_FIND_ROOT_PATH "${RELOCATED_HOST_DIR}/@@STAGING_SUBDIR@@") +endif() +if(NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_PROGRAM) + set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) +endif() +if(NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_PACKAGE) + set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) +endif() +if(NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_LIBRARY) + set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) +endif() +if(NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_INCLUDE) + set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) +endif() set(ENV{PKG_CONFIG_SYSROOT_DIR} "${RELOCATED_HOST_DIR}/@@STAGING_SUBDIR@@") # This toolchain file can be used both inside and outside Buildroot. -set(CMAKE_C_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_CC@@") +if(NOT DEFINED CMAKE_C_COMPILER) + set(CMAKE_C_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_CC@@") +endif() if(@@TOOLCHAIN_HAS_CXX@@) - set(CMAKE_CXX_FLAGS_DEBUG "" CACHE STRING "Debug CXXFLAGS") - set(CMAKE_CXX_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release CXXFLAGS") - set(CMAKE_CXX_FLAGS "@@TARGET_CXXFLAGS@@" CACHE STRING "Buildroot CXXFLAGS") - set(CMAKE_CXX_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_CXX@@") + if(NOT DEFINED CMAKE_CXX_FLAGS_DEBUG) + set(CMAKE_CXX_FLAGS_DEBUG "" CACHE STRING "Debug CXXFLAGS") + endif() + if(NOT DEFINED CMAKE_CXX_FLAGS_RELEASE) + set(CMAKE_CXX_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release CXXFLAGS") + endif() + if(NOT DEFINED CMAKE_CXX_FLAGS) + set(CMAKE_CXX_FLAGS "@@TARGET_CXXFLAGS@@" CACHE STRING "Buildroot CXXFLAGS") + endif() + if(NOT DEFINED CMAKE_CXX_COMPILER) + set(CMAKE_CXX_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_CXX@@") + endif() endif() if(@@TOOLCHAIN_HAS_FORTRAN@@) - set(CMAKE_Fortran_FLAGS_DEBUG "" CACHE STRING "Debug Fortran FLAGS") - set(CMAKE_Fortran_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release Fortran FLAGS") - set(CMAKE_Fortran_FLAGS "@@TARGET_FCFLAGS@@" CACHE STRING "Buildroot FCFLAGS") - set(CMAKE_Fortran_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_FC@@") + if(NOT DEFINED CMAKE_Fortran_FLAGS_DEBUG) + set(CMAKE_Fortran_FLAGS_DEBUG "" CACHE STRING "Debug Fortran FLAGS") + endif() + if(NOT DEFINED CMAKE_Fortran_FLAGS_RELEASE) + set(CMAKE_Fortran_FLAGS_RELEASE " -DNDEBUG" CACHE STRING "Release Fortran FLAGS") + endif() + if(NOT DEFINED CMAKE_Fortran_FLAGS) + set(CMAKE_Fortran_FLAGS "@@TARGET_FCFLAGS@@" CACHE STRING "Buildroot FCFLAGS") + endif() + if(NOT DEFINED CMAKE_Fortran_COMPILER) + set(CMAKE_Fortran_COMPILER "${RELOCATED_HOST_DIR}/@@TARGET_FC@@") + endif() +endif() + +# For Qt6 +if(NOT DEFINED QT_HOST_PATH) + set(QT_HOST_PATH "${RELOCATED_HOST_DIR}") +endif() + +if(NOT DEFINED QT_HOST_PATH_CMAKE_DIR) + set(QT_HOST_PATH_CMAKE_DIR "${RELOCATED_HOST_DIR}/lib/cmake") endif() diff --git a/support/scripts/boot-qemu-image.py b/support/scripts/boot-qemu-image.py index fba1533bb7b..ba50ea69ee9 100755 --- a/support/scripts/boot-qemu-image.py +++ b/support/scripts/boot-qemu-image.py @@ -25,7 +25,7 @@ def main(): qemu_start = os.path.join(os.getcwd(), 'output/images/start-qemu.sh') child = pexpect.spawn(qemu_start, ['serial-only'], - timeout=5, encoding='utf-8', + timeout=50, encoding='utf-8', env={"QEMU_AUDIO_DRV": "none"}) # We want only stdout into the log to avoid double echo @@ -36,7 +36,7 @@ def main(): time.sleep(1) try: - child.expect(["buildroot login:"], timeout=60) + child.expect(["buildroot login:"], timeout=600) except pexpect.EOF as e: # Some emulations require a fork of qemu-system, which may be # missing on the system, and is not provided by Buildroot. @@ -58,7 +58,7 @@ def main(): child.sendline("root\r") try: - child.expect(["# "], timeout=60) + child.expect(["# "], timeout=600) except pexpect.EOF: print("Cannot connect to shell") sys.exit(1) @@ -69,7 +69,7 @@ def main(): child.sendline("poweroff\r") try: - child.expect(["System halted"], timeout=60) + child.expect(["System halted"], timeout=600) child.expect(pexpect.EOF) except pexpect.EOF: pass diff --git a/support/scripts/br2-external b/support/scripts/br2-external index 56dc6f53ca1..2c33e6eaccf 100755 --- a/support/scripts/br2-external +++ b/support/scripts/br2-external @@ -163,6 +163,7 @@ do_kconfig() { openssl skeleton init + linux ) for br2 in "${items[@]}"; do @@ -242,6 +243,14 @@ do_kconfig() { else printf '# No init from: %s\n\n' "${br2_desc}" fi >>"${outputdir}/.br2-external.in.init" + + if [ -f "${br2_ext}/linux/Config.ext.in" ]; then + printf 'comment "linux extension from: %s"\n' "${br2_desc}" + printf 'source "%s/linux/Config.ext.in"\n' "${br2_ext}" + printf '\n' + else + printf '# No linux extension from: %s\n\n' "${br2_desc}" + fi >>"${outputdir}/.br2-external.in.linux" done printf 'endmenu\n' >>"${outputdir}/.br2-external.in.menus" diff --git a/support/scripts/check-host-rpath b/support/scripts/check-host-rpath index 9a3866982bf..41aa0aa1ed3 100755 --- a/support/scripts/check-host-rpath +++ b/support/scripts/check-host-rpath @@ -61,7 +61,7 @@ elf_needs_rpath() { while read lib; do [ -e "${hostdir}/lib/${lib}" ] && return 0 - done < <( readelf -d "${file}" \ + done < <( readelf -d "${file}" 2>/dev/null \ |sed -r -e '/^.* \(NEEDED\) .*Shared library: \[(.+)\]$/!d;' \ -e 's//\1/;' \ ) @@ -93,14 +93,14 @@ check_elf_has_rpath() { dir="$( sed -r -e 's:/+:/:g; s:/$::;' <<<"${dir}" )" [ "${dir}" = "${hostdir}/lib" ] && return 0 [ "${dir}" = "\$ORIGIN/../lib" ] && return 0 - # This check is done even for builds where - # BR2_PER_PACKAGE_DIRECTORIES is disabled. In this case, - # PER_PACKAGE_DIR and therefore ${perpackagedir} points to - # a non-existent directory, and this check will always be - # false. - [[ ${dir} =~ ${perpackagedir}/[^/]+/host/lib ]] && return 0 + # This check is done even for builds where + # BR2_PER_PACKAGE_DIRECTORIES is disabled. In this case, + # PER_PACKAGE_DIR and therefore ${perpackagedir} points to + # a non-existent directory, and this check will always be + # false. + [[ ${dir} =~ "${perpackagedir}/"[^/]+/host/lib ]] && return 0 done - done < <( readelf -d "${file}" \ + done < <( readelf -d "${file}" 2>/dev/null \ |sed -r -e '/.* \(R(UN)?PATH\) +Library r(un)?path: \[(.+)\]$/!d' \ -e 's//\3/;' \ ) diff --git a/support/scripts/eclipse-register-toolchain b/support/scripts/eclipse-register-toolchain deleted file mode 100755 index 891d29ee6f3..00000000000 --- a/support/scripts/eclipse-register-toolchain +++ /dev/null @@ -1,76 +0,0 @@ -#!/bin/sh - -# This script registers the toolchain of a Buildroot project into the -# Eclipse plugin. To do so, it adds a new line for the Buildroot -# toolchain into the $HOME/.buildroot-eclipse.toolchains file, which -# the Eclipse Buildroot plugin reads to discover automatically the -# available Buildroot toolchains on the system. -# -# This script should typically not be called manually. Instead, one -# should enable the BR2_ECLIPSE_REGISTER configuration option, which -# will lead Buildroot to automatically call this script with the -# appropriate arguments. -# -# Usage: -# eclipse-register-toolchain project-directory toolchain-prefix architecture -# -# project-directory is the absolute path to the Buildroot project -# output directory (which contains the host/, target/, build/, -# images/, etc. subdirectories). It should be an absolute and -# canonical path. -# -# toolchain-prefix is the prefix of the cross-compilation tools, i.e -# 'arm-linux-' if the cross-compiler executable is 'arm-linux-gcc'. -# -# architecture is the lower-cased name of the architecture targetted -# by the Buildroot project. - -if test $# -ne 3; then - echo "Invalid number of arguments." - echo "Usage: $0 project-directory toolchain-prefix architecture" - exit 1 -fi - -project_directory=$1 -toolchain_prefix=$2 -architecture=$3 - -if test ! -d ${project_directory} ; then - echo "Non-existing project directory ${project_directory}" - exit 1 -fi - -if test ! -d ${project_directory}/host ; then - echo "Your project directory does not look like a Buildroot output" - exit 1 -fi - -if test ! -e ${project_directory}/host/bin/${toolchain_prefix}gcc ; then - echo "Cannot find the cross-compiler in the project directory" - exit 1 -fi - -TOOLCHAIN_ECLIPSE_FILE=${HOME}/.buildroot-eclipse.toolchains - -# First, we remove all lines from the ${TOOLCHAIN_ECLISPE_FILE} that -# correspond to toolchains that no longer exist. -if test -f ${TOOLCHAIN_ECLIPSE_FILE} ; then - mv ${TOOLCHAIN_ECLIPSE_FILE} ${TOOLCHAIN_ECLIPSE_FILE}.tmp - cat ${TOOLCHAIN_ECLIPSE_FILE}.tmp | while read toolchain ; do - path=$(echo ${toolchain} | cut -f1 -d ':') - # Filter lines corresponding to still existing projects - echo "Testing ${path} ..." - if ! test -d ${path} ; then - continue - fi - # .. and the current project - if test ${path} = ${project_directory} ; then - continue - fi - echo ${toolchain} >> ${TOOLCHAIN_ECLIPSE_FILE} - done - rm ${TOOLCHAIN_ECLIPSE_FILE}.tmp -fi - -# Add the toolchain -echo "${project_directory}:${toolchain_prefix}:${architecture}" >> ${TOOLCHAIN_ECLIPSE_FILE} diff --git a/support/scripts/expunge-gconv-modules b/support/scripts/expunge-gconv-modules index 03012c1ce31..e9ac48ca3fb 100755 --- a/support/scripts/expunge-gconv-modules +++ b/support/scripts/expunge-gconv-modules @@ -1,11 +1,17 @@ #!/usr/bin/env bash # This script is used to generate a gconv-modules file that takes into -# account only the gconv modules installed by Buildroot. It receives -# on its standard input the original complete gconv-modules file from -# the toolchain, and as arguments the list of gconv modules that were -# actually installed, and writes on its standard output the new -# gconv-modules file. +# account only the gconv modules installed by Buildroot, and generates +# a stripped-down gconv-moduels file on its stdout. +# It takes two arguments: +# $1: the directory where to look for gconv modules definitions +# $2: a space-separated list of gconv modules that were actually +# installed + +# Starting with glibc-2.34, modules definitions are located in multiple +# files: +# ${1}/gconv-modules +# ${1}/gconv-modules.d/*.conf # The format of gconv-modules is precisely documented in the # file itself. It consists of two different directives: @@ -19,7 +25,11 @@ # we handle each with slightly different code, since the second never has # associated aliases. -gawk -v files="${1}" ' +for f in ${1}/gconv-modules ${1}/gconv-modules.d/*.conf; do + [ -e "${f}" ] || continue + cat "${f}" +done \ +|awk -v files="${2}" ' $1 == "alias" { aliases[$3] = aliases[$3] " " $2; } diff --git a/support/scripts/gen-bootlin-toolchains b/support/scripts/gen-bootlin-toolchains index dc173fa9498..23ebfbdce9f 100755 --- a/support/scripts/gen-bootlin-toolchains +++ b/support/scripts/gen-bootlin-toolchains @@ -4,6 +4,7 @@ import os.path import re import requests import textwrap +import sys BASE_URL = "https://toolchains.bootlin.com/downloads/releases/toolchains" @@ -41,22 +42,27 @@ arches = { 'prefix': 'arc', }, 'armv5-eabi': { - 'conditions': ['BR2_ARM_CPU_ARMV5', 'BR2_ARM_EABI'], + 'conditions': ['BR2_arm', 'BR2_ARM_CPU_ARMV5', 'BR2_ARM_EABI'], 'test_options': ['BR2_arm', 'BR2_arm926t', 'BR2_ARM_EABI'], 'prefix': 'arm', }, 'armv6-eabihf': { - 'conditions': ['BR2_ARM_CPU_ARMV6', 'BR2_ARM_EABIHF'], + 'conditions': ['BR2_arm', 'BR2_ARM_CPU_ARMV6', 'BR2_ARM_EABIHF'], 'test_options': ['BR2_arm', 'BR2_arm1176jzf_s', 'BR2_ARM_EABIHF'], 'prefix': 'arm', }, 'armv7-eabihf': { - 'conditions': ['BR2_ARM_CPU_ARMV7A', 'BR2_ARM_EABIHF'], + 'conditions': ['BR2_arm', 'BR2_ARM_CPU_ARMV7A', 'BR2_ARM_EABIHF'], 'test_options': ['BR2_arm', 'BR2_cortex_a8', 'BR2_ARM_EABIHF'], 'prefix': 'arm', }, + 'armebv7-eabihf': { + 'conditions': ['BR2_armeb', 'BR2_ARM_CPU_ARMV7A', 'BR2_ARM_EABIHF'], + 'test_options': ['BR2_armeb', 'BR2_cortex_a8', 'BR2_ARM_EABIHF'], + 'prefix': 'armeb', + }, 'armv7m': { - 'conditions': ['BR2_ARM_CPU_ARMV7M'], + 'conditions': ['BR2_arm', 'BR2_ARM_CPU_ARMV7M'], 'test_options': ['BR2_arm', 'BR2_cortex_m4'], 'prefix': 'arm', }, @@ -73,10 +79,12 @@ arches = { 'microblazebe': { 'conditions': ['BR2_microblazebe'], 'prefix': 'microblaze', + 'gdbserver': False }, 'microblazeel': { 'conditions': ['BR2_microblazeel'], 'prefix': 'microblazeel', + 'gdbserver': False }, 'mips32': { # Not sure it could be used by other mips32 variants? @@ -96,11 +104,6 @@ arches = { 'conditions': ['BR2_mipsel', 'BR2_mips_32r6', '!BR2_MIPS_SOFT_FLOAT'], 'prefix': 'mipsel', }, - 'mips64': { - # Not sure it could be used by other mips64 variants? - 'conditions': ['BR2_mips64', 'BR2_mips_64', '!BR2_MIPS_SOFT_FLOAT'], - 'prefix': 'mips64', - }, 'mips64-n32': { # Not sure it could be used by other mips64 variants? 'conditions': ['BR2_mips64', 'BR2_mips_64', 'BR2_MIPS_NABI32', '!BR2_MIPS_SOFT_FLOAT'], @@ -122,6 +125,7 @@ arches = { 'openrisc': { 'conditions': ['BR2_or1k'], 'prefix': 'or1k', + 'gdbserver': False, }, 'powerpc-440fp': { # Not sure it could be used by other powerpc variants? @@ -159,9 +163,13 @@ arches = { 'prefix': 'riscv32', }, 'riscv64-lp64d': { - 'conditions': ['BR2_riscv', 'BR2_riscv_g', 'BR2_RISCV_64', 'BR2_RISCV_ABI_LP64D'], + 'conditions': ['BR2_riscv', 'BR2_riscv_g', 'BR2_RISCV_64', 'BR2_RISCV_ABI_LP64D', 'BR2_USE_MMU'], 'prefix': 'riscv64', }, + 's390x-z13': { + 'conditions': ['BR2_s390x', 'BR2_s390x_z13'], + 'prefix': 's390x', + }, 'sh-sh4': { 'conditions': ['BR2_sh', 'BR2_sh4'], 'prefix': 'sh4', @@ -253,7 +261,12 @@ arches = { 'conditions': ['BR2_i386', '!BR2_x86_i486', '!BR2_x86_i586', - '!BR2_x86_x1000'], + '!BR2_x86_x1000', + '!BR2_x86_pentium_mmx', + '!BR2_x86_geode', + '!BR2_x86_c3', + '!BR2_x86_winchip_c6', + '!BR2_x86_winchip2'], 'test_options': ['BR2_i386', 'BR2_x86_i686'], 'prefix': 'i686', @@ -302,19 +315,22 @@ class Toolchain: for c in arches[self.arch]['conditions']: depends.append(c) + if not arches[self.arch].get('gdbserver', True): + selects.append("BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER") + for frag in self.fragment: # libc type if frag.startswith("BR2_TOOLCHAIN_EXTERNAL_CUSTOM_UCLIBC"): selects.append("BR2_TOOLCHAIN_EXTERNAL_UCLIBC") elif frag.startswith("BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC"): # glibc needs mmu support - depends.append("BR2_USE_MMU") - # glibc doesn't support static only configuration - depends.append("!BR2_STATIC_LIBS") + if "BR2_USE_MMU" not in depends: + depends.append("BR2_USE_MMU") selects.append("BR2_TOOLCHAIN_EXTERNAL_GLIBC") elif frag.startswith("BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL"): # musl needs mmu support - depends.append("BR2_USE_MMU") + if "BR2_USE_MMU" not in depends: + depends.append("BR2_USE_MMU") selects.append("BR2_TOOLCHAIN_EXTERNAL_MUSL") # gcc version @@ -466,6 +482,10 @@ def get_toolchains(): version = parts[2][len("bleeding-edge-"):] tmp[(arch, libc, variant)] = version + if len(tmp) == 0: + print("ERROR: no toolchains found for architecture %s" % arch) + sys.exit(1) + toolchains += [Toolchain(k[0], k[1], k[2], v) for k, v in tmp.items()] return toolchains @@ -478,7 +498,8 @@ def gen_config_in_options(toolchains, fpath): f.write("config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCH_SUPPORTS\n") f.write("\tbool\n") for arch, details in arches.items(): - f.write("\tdefault y if %s\n" % " && ".join(details['conditions'])) + conditions = details['conditions'].copy() + f.write("\tdefault y if %s\n" % " && ".join(conditions)) f.write("\n") f.write("if BR2_TOOLCHAIN_EXTERNAL_BOOTLIN\n\n") diff --git a/support/scripts/generate-gitlab-ci-yml b/support/scripts/generate-gitlab-ci-yml index aa43aac0196..e2fb2228b33 100755 --- a/support/scripts/generate-gitlab-ci-yml +++ b/support/scripts/generate-gitlab-ci-yml @@ -26,7 +26,7 @@ gen_tests() { local do_basics do_defconfigs do_runtime do_testpkg local defconfigs_ext cfg tst - basics=( check-package DEVELOPERS flake8 package ) + basics=( check-package check-symbol DEVELOPERS flake8 package symbol ) defconfigs=( $(cd configs; LC_ALL=C ls -1 *_defconfig) ) @@ -91,7 +91,7 @@ gen_tests() { # Retrieve defconfig for test-pkg from the git commit message (if any) if grep -q -E '^test-pkg config:$' <<<"${CI_COMMIT_DESCRIPTION}"; then - sed -r -n -e '/^test-pkg config:$/{:a;n;p;ba;}' \ + sed -r -n -e '/^test-pkg config:$/{:a;n;s/^ +//;p;ba;}' \ <<<"${CI_COMMIT_DESCRIPTION}" \ >defconfig.frag if [ ! -s defconfig.frag ]; then diff --git a/support/scripts/graph-build-time b/support/scripts/graph-build-time index 742c9a7a508..1edc3b3c00e 100755 --- a/support/scripts/graph-build-time +++ b/support/scripts/graph-build-time @@ -241,6 +241,65 @@ def pkg_pie_time_per_step(data, output): plt.savefig(output) +def pkg_timeline(data, output): + start = 0 + end = 0 + + # Find the first timestamp and the last timestamp + for p in data: + for k, v in p.steps_start.items(): + if start == 0 or v < start: + start = v + if end < v: + end = v + + # Readjust all timestamps so that 0 is the start of the build + # instead of being Epoch + for p in data: + for k, v in p.steps_start.items(): + p.steps_start[k] = v - start + for k, v in p.steps_end.items(): + p.steps_end[k] = v - start + + plt.figure() + + i = 0 + labels_names = [] + labels_coords = [] + # put last packages that started to configure last; this does not + # give the proper dependency chain, but still provides a good-enough + # cascade graph. + for p in sorted(data, reverse=True, key=lambda x: x.steps_start['configure']): + durations = [] + facecolors = [] + for step in steps: + if step not in p.steps_start or step not in p.steps_end: + continue + durations.append((p.steps_start[step], + p.steps_end[step] - p.steps_start[step])) + facecolors.append(colors[steps.index(step)]) + plt.broken_barh(durations, (i, 6), facecolors=facecolors) + labels_coords.append(i + 3) + labels_names.append(p.name) + i += 10 + + axes = plt.gcf().gca() + + axes.set_ylim(0, i + 10) + axes.set_xlim(0, end - start) + axes.set_xlabel('seconds since start') + axes.set_yticks(labels_coords) + axes.set_yticklabels(labels_names) + axes.set_axisbelow(True) + axes.grid(True, linewidth=0.2, zorder=-1) + + plt.gcf().subplots_adjust(left=0.2) + + plt.tick_params(axis='y', which='both', labelsize=6) + plt.title('Timeline') + plt.savefig(output, dpi=300) + + # Parses the csv file passed on standard input and returns a list of # Package objects, filed with the duration of each step and the total # duration of the package. @@ -277,7 +336,7 @@ def read_data(input_file): parser = argparse.ArgumentParser(description='Draw build time graphs') parser.add_argument("--type", '-t', metavar="GRAPH_TYPE", - help="Type of graph (histogram, pie-packages, pie-steps)") + help="Type of graph (histogram, pie-packages, pie-steps, timeline)") parser.add_argument("--order", '-O', metavar="GRAPH_ORDER", help="Ordering of packages: build or duration (for histogram only)") parser.add_argument("--alternate-colors", '-c', action="store_true", @@ -307,6 +366,8 @@ elif args.type == "pie-packages": pkg_pie_time_per_package(d, args.output) elif args.type == "pie-steps": pkg_pie_time_per_step(d, args.output) +elif args.type == "timeline": + pkg_timeline(d, args.output) else: sys.stderr.write("Unknown type: %s\n" % args.type) exit(1) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index c235d994077..eea900124cf 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -1,6 +1,7 @@ #!/usr/bin/env python3 # Copyright (C) 2009 by Thomas Petazzoni +# Copyright (C) 2022 by Sen Hastings # # 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 @@ -27,12 +28,16 @@ import re import subprocess import json import sys +import time +import gzip +import xml.etree.ElementTree +import requests brpath = os.path.normpath(os.path.join(os.path.dirname(__file__), "..", "..")) sys.path.append(os.path.join(brpath, "utils")) from getdeveloperlib import parse_developers # noqa: E402 -from cpedb import CPEDB # noqa: E402 +from cpedb import CPEDB_URL # noqa: E402 INFRA_RE = re.compile(r"\$\(eval \$\(([a-z-]*)-package\)\)") URL_RE = re.compile(r"\s*https?://\S*\s*$") @@ -79,7 +84,7 @@ class Package: all_ignored_cves = dict() all_cpeids = dict() # This is the list of all possible checks. Add new checks to this list so - # a tool that post-processeds the json output knows the checks before + # a tool that post-processes the json output knows the checks before # iterating over the packages. status_checks = ['cve', 'developers', 'hash', 'license', 'license-files', 'patches', 'pkg-check', 'url', 'version'] @@ -88,6 +93,11 @@ class Package: self.name = name self.path = path self.pkg_path = os.path.dirname(path) + # Contains a list of tuple (type, infra), such as ("target", + # "autotools"). When pkg-stats is run without -c, it contains + # the list of all infra/type supported by the package. When + # pkg-stats is run with -c, it contains the list of infra/type + # used by the current configuration. self.infras = None self.license = None self.has_license = False @@ -147,10 +157,20 @@ class Package: return False return True - def set_infra(self): + def set_infra(self, show_info_js): """ Fills in the .infras field """ + # If we're running pkg-stats for a given Buildroot + # configuration, keep only the type/infra that applies + if show_info_js: + keep_host = "host-%s" % self.name in show_info_js + keep_target = self.name in show_info_js + # Otherwise, keep all + else: + keep_host = True + keep_target = True + self.infras = list() with open(os.path.join(brpath, self.path), 'r') as f: lines = f.readlines() @@ -159,9 +179,9 @@ class Package: if not match: continue infra = match.group(1) - if infra.startswith("host-"): + if infra.startswith("host-") and keep_host: self.infras.append(("host", infra[5:])) - else: + elif keep_target: self.infras.append(("target", infra)) def set_license(self): @@ -239,7 +259,7 @@ class Package: if var in self.all_cpeids: self.cpeid = self.all_cpeids[var] # Set a preliminary status, it might be overridden by check_package_cpes() - self.status['cpe'] = ("warning", "not checked against CPE dictionnary") + self.status['cpe'] = ("warning", "not checked against CPE dictionary") else: self.status['cpe'] = ("error", "no verified CPE identifier") @@ -368,10 +388,9 @@ def get_pkglist(npackages, package_list): return packages -def get_config_packages(): +def get_show_info_js(): cmd = ["make", "--no-print-directory", "show-info"] - js = json.loads(subprocess.check_output(cmd)) - return set([v["name"] for v in js.values() if 'name' in v]) + return json.loads(subprocess.check_output(cmd)) def package_init_make_info(): @@ -451,7 +470,8 @@ async def check_url_status(session, pkg, npkgs, retry=True): async def check_package_urls(packages): tasks = [] connector = aiohttp.TCPConnector(limit_per_host=5) - async with aiohttp.ClientSession(connector=connector, trust_env=True) as sess: + 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)))) @@ -479,14 +499,19 @@ 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 + url = "https://release-monitoring.org/api/project/Buildroot/%s" % pkg.name try: async with session.get(url) as resp: if resp.status != 200: return False data = await resp.json() - version = data['stable_versions'][0] if 'stable_versions' in data else data['version'] if 'version' in data else None + if 'stable_versions' in data and data['stable_versions']: + version = data['stable_versions'][0] + elif 'version' in data: + version = data['version'] + else: + version = None check_package_latest_version_set_status(pkg, RM_API_STATUS_FOUND_BY_DISTRO, version, @@ -512,12 +537,17 @@ async def check_package_get_latest_version_by_guess(session, pkg, retry=True): projects = [p for p in data['projects'] if p['name'] == pkg.name and 'stable_versions' in p] projects.sort(key=lambda x: x['id']) - if len(projects) > 0: - check_package_latest_version_set_status(pkg, - RM_API_STATUS_FOUND_BY_PATTERN, - projects[0]['stable_versions'][0], - projects[0]['id']) - return True + if len(projects) == 0: + return False + + if len(projects[0]['stable_versions']) == 0: + return False + + check_package_latest_version_set_status(pkg, + RM_API_STATUS_FOUND_BY_PATTERN, + projects[0]['stable_versions'][0], + projects[0]['id']) + return True except (aiohttp.ClientError, asyncio.TimeoutError): if retry: @@ -618,12 +648,41 @@ def check_package_cves(nvd_path, packages): def check_package_cpes(nvd_path, packages): - cpedb = CPEDB(nvd_path) - cpedb.get_xml_dict() + class CpeXmlParser: + cpes = [] + + def start(self, tag, attrib): + if tag == "{http://scap.nist.gov/schema/cpe-extension/2.3}cpe23-item": + self.cpes.append(attrib['name']) + + def close(self): + return self.cpes + + print("CPE: Setting up NIST dictionary") + if not os.path.exists(os.path.join(nvd_path, "cpe")): + os.makedirs(os.path.join(nvd_path, "cpe")) + + cpe_dict_local = os.path.join(nvd_path, "cpe", os.path.basename(CPEDB_URL)) + if not os.path.exists(cpe_dict_local) or os.stat(cpe_dict_local).st_mtime < time.time() - 86400: + print("CPE: Fetching xml manifest from [" + CPEDB_URL + "]") + cpe_dict = requests.get(CPEDB_URL) + open(cpe_dict_local, "wb").write(cpe_dict.content) + + print("CPE: Unzipping xml manifest...") + nist_cpe_file = gzip.GzipFile(fileobj=open(cpe_dict_local, 'rb')) + + parser = xml.etree.ElementTree.XMLParser(target=CpeXmlParser()) + while True: + c = nist_cpe_file.read(1024*1024) + if not c: + break + parser.feed(c) + cpes = parser.close() + for p in packages: if not p.cpeid: continue - if cpedb.find(p.cpeid): + if p.cpeid in cpes: p.status['cpe'] = ("ok", "verified CPE identifier") else: p.status['cpe'] = ("error", "CPE version unknown in CPE database") @@ -679,103 +738,161 @@ def calculate_stats(packages): html_header = """ + + - - + Statistics of Buildroot packages + -Results
+ -

-""" +Results
+ +""" # noqa - tabs and spaces html_footer = """ - """ @@ -802,73 +919,88 @@ def boolean_str(b): def dump_html_pkg(f, pkg): - f.write(" \n") - f.write(" %s\n" % pkg.path) - + pkg_css_class = pkg.path.replace("/", "_")[:-3] + f.write(f'
{pkg.path}
\n') # Patch count - td_class = ["centered"] + data_field_id = f'patch_count__{pkg_css_class}' + div_class = ["centered patch_count data"] + div_class.append(f'_{pkg_css_class}') if pkg.patch_count == 0: - td_class.append("nopatches") + div_class.append("nopatches") elif pkg.patch_count < 5: - td_class.append("somepatches") + div_class.append("somepatches") else: - td_class.append("lotsofpatches") - f.write(" %s\n" % - (" ".join(td_class), str(pkg.patch_count))) + div_class.append("lotsofpatches") + f.write(f'
{str(pkg.patch_count)}
\n') # Infrastructure + data_field_id = f'infrastructure__{pkg_css_class}' infra = infra_str(pkg.infras) - td_class = ["centered"] + div_class = ["centered infrastructure data"] + div_class.append(f'_{pkg_css_class}') if infra == "Unknown": - td_class.append("wrong") + div_class.append("wrong") else: - td_class.append("correct") - f.write(" %s\n" % - (" ".join(td_class), infra_str(pkg.infras))) + div_class.append("correct") + f.write(f'
{infra_str(pkg.infras)}
\n') # License - td_class = ["centered"] + data_field_id = f'license__{pkg_css_class}' + div_class = ["centered license data"] + div_class.append(f'_{pkg_css_class}') if pkg.is_status_ok('license'): - td_class.append("correct") + div_class.append("correct") else: - td_class.append("wrong") - f.write(" %s\n" % - (" ".join(td_class), boolean_str(pkg.is_status_ok('license')))) + div_class.append("wrong") + f.write(f'
{boolean_str(pkg.is_status_ok("license"))}
\n') # License files - td_class = ["centered"] + data_field_id = f'license_files__{pkg_css_class}' + div_class = ["centered license_files data"] + div_class.append(f'_{pkg_css_class}') if pkg.is_status_ok('license-files'): - td_class.append("correct") + div_class.append("correct") else: - td_class.append("wrong") - f.write(" %s\n" % - (" ".join(td_class), boolean_str(pkg.is_status_ok('license-files')))) + div_class.append("wrong") + f.write(f'
{boolean_str(pkg.is_status_ok("license-files"))}
\n') # Hash - td_class = ["centered"] + data_field_id = f'hash_file__{pkg_css_class}' + div_class = ["centered hash_file data"] + div_class.append(f'_{pkg_css_class}') if pkg.is_status_ok('hash'): - td_class.append("correct") + div_class.append("correct") else: - td_class.append("wrong") - f.write(" %s\n" % - (" ".join(td_class), boolean_str(pkg.is_status_ok('hash')))) + div_class.append("wrong") + f.write(f'
{boolean_str(pkg.is_status_ok("hash"))}
\n') # Current version + data_field_id = f'current_version__{pkg_css_class}' if len(pkg.current_version) > 20: current_version = pkg.current_version[:20] + "..." else: current_version = pkg.current_version - f.write(" %s\n" % current_version) + f.write(f'
{current_version}
\n') # Latest version + data_field_id = f'latest_version__{pkg_css_class}' + div_class.append(f'_{pkg_css_class}') + div_class.append("latest_version data") if pkg.latest_version['status'] == RM_API_STATUS_ERROR: - td_class.append("version-error") + div_class.append("version-error") if pkg.latest_version['version'] is None: - td_class.append("version-unknown") + div_class.append("version-unknown") elif pkg.latest_version['version'] != pkg.current_version: - td_class.append("version-needs-update") + div_class.append("version-needs-update") else: - td_class.append("version-good") + div_class.append("version-good") if pkg.latest_version['status'] == RM_API_STATUS_ERROR: latest_version_text = "Error" @@ -878,170 +1010,194 @@ def dump_html_pkg(f, pkg): if pkg.latest_version['version'] is None: latest_version_text = "Found, but no version" else: - latest_version_text = "%s" % \ - (pkg.latest_version['id'], str(pkg.latest_version['version'])) + latest_version_text = f"""""" \ + f"""{str(pkg.latest_version['version'])}""" latest_version_text += "
" if pkg.latest_version['status'] == RM_API_STATUS_FOUND_BY_DISTRO: - latest_version_text += "found by distro" + latest_version_text += 'found by distro' else: latest_version_text += "found by guess" - f.write(" %s\n" % - (" ".join(td_class), latest_version_text)) + f.write(f'
{latest_version_text}
\n') # Warnings - td_class = ["centered"] + data_field_id = f'warnings__{pkg_css_class}' + div_class = ["centered warnings data"] + div_class.append(f'_{pkg_css_class}') if pkg.warnings == 0: - td_class.append("correct") + div_class.append("correct") else: - td_class.append("wrong") - f.write(" %d\n" % - (" ".join(td_class), pkg.warnings)) + div_class.append("wrong") + f.write(f'
{pkg.warnings}
\n') # URL status - td_class = ["centered"] + data_field_id = f'upstream_url__{pkg_css_class}' + div_class = ["centered upstream_url data"] + div_class.append(f'_{pkg_css_class}') url_str = pkg.status['url'][1] if pkg.status['url'][0] in ("error", "warning"): - td_class.append("missing_url") + div_class.append("missing_url") if pkg.status['url'][0] == "error": - td_class.append("invalid_url") - url_str = "%s" % (pkg.url, pkg.status['url'][1]) + div_class.append("invalid_url") + url_str = f"""{pkg.status['url'][1]}""" else: - td_class.append("good_url") - url_str = "Link" % pkg.url - f.write(" %s\n" % - (" ".join(td_class), url_str)) + div_class.append("good_url") + url_str = f'Link' + f.write(f'
{url_str}
\n') # CVEs - td_class = ["centered"] + data_field_id = f'cves__{pkg_css_class}' + div_class = ["centered cves data"] + div_class.append(f'_{pkg_css_class}') + if len(pkg.cves) > 10: + div_class.append("collapse") if pkg.is_status_ok("cve"): - td_class.append("cve-ok") + div_class.append("cve-ok") elif pkg.is_status_error("cve"): - td_class.append("cve-nok") + div_class.append("cve-nok") elif pkg.is_status_na("cve") and not pkg.is_actual_package: - td_class.append("cve-ok") + div_class.append("cve-ok") else: - td_class.append("cve-unknown") - f.write(" \n" % " ".join(td_class)) + div_class.append("cve-unknown") + f.write(f'
\n') + if len(pkg.cves) > 10: + cve_total = len(pkg.cves) + 1 + f.write(f'
see all ({cve_total}) ▾
\n') if pkg.is_status_error("cve"): for cve in pkg.cves: - f.write(" %s
\n" % (cve, cve)) + f.write(f' {cve}
\n') for cve in pkg.unsure_cves: - f.write(" %s (unsure)
\n" % (cve, cve)) + f.write(f' {cve} (unsure)
\n') elif pkg.is_status_na("cve"): - f.write(" %s" % pkg.status['cve'][1]) + f.write(f""" {pkg.status['cve'][1]}""") else: f.write(" N/A\n") - f.write(" \n") + f.write("
\n") # CVEs Ignored - td_class = ["centered"] + data_field_id = f'ignored_cves__{pkg_css_class}' + div_class = ["centered data ignored_cves"] + div_class.append(f'_{pkg_css_class}') if pkg.ignored_cves: - td_class.append("cve_ignored") - f.write(" \n" % " ".join(td_class)) + div_class.append("cve_ignored") + f.write(f'
\n') for ignored_cve in pkg.ignored_cves: - f.write(" %s
\n" % (ignored_cve, ignored_cve)) - f.write(" \n") + f.write(f' {ignored_cve}
\n') + f.write("
\n") # CPE ID - td_class = ["left"] + data_field_id = f'cpe_id__{pkg_css_class}' + div_class = ["left cpe_id data"] + div_class.append(f'_{pkg_css_class}') if pkg.is_status_ok("cpe"): - td_class.append("cpe-ok") + div_class.append("cpe-ok") elif pkg.is_status_error("cpe"): - td_class.append("cpe-nok") + div_class.append("cpe-nok") elif pkg.is_status_na("cpe") and not pkg.is_actual_package: - td_class.append("cpe-ok") + div_class.append("cpe-ok") else: - td_class.append("cpe-unknown") - f.write(" \n" % " ".join(td_class)) + div_class.append("cpe-unknown") + f.write(f'
\n') if pkg.cpeid: - f.write(" %s\n" % pkg.cpeid) + cpeid_begin = ":".join(pkg.cpeid.split(":")[0:4]) + ":" + cpeid_formatted = pkg.cpeid.replace(cpeid_begin, cpeid_begin + "") + f.write(" %s\n" % cpeid_formatted) if not pkg.is_status_ok("cpe"): if pkg.is_actual_package and pkg.current_version: if pkg.cpeid: - f.write("
%s (Search)\n" % # noqa: E501 - (pkg.status['cpe'][1], ":".join(pkg.cpeid.split(":")[0:5]))) + f.write(f"""
{pkg.status['cpe'][1]} (Search)\n""") else: - f.write(" %s (Search)\n" % # noqa: E501 - (pkg.status['cpe'][1], pkg.name)) + f.write(f""" {pkg.status['cpe'][1]} (Search)\n""") else: f.write(" %s\n" % pkg.status['cpe'][1]) - f.write(" \n") - - f.write(" \n") + f.write("
\n") def dump_html_all_pkgs(f, packages): f.write(""" - - - - - - - - - - - - - - - - +
+
Package
+
Patch count
+
Infrastructure
+
License
+
License files
+
Hash file
+
Current version
+
Latest version
+
Warnings
+
Upstream URL
+
CVEs
+
CVEs Ignored
+
CPE ID
""") for pkg in sorted(packages): dump_html_pkg(f, pkg) - f.write("
PackagePatch countInfrastructureLicenseLicense filesHash fileCurrent versionLatest versionWarningsUpstream URLCVEsCVEs IgnoredCPE ID
") + f.write("") def dump_html_stats(f, stats): - f.write("\n") - f.write("\n") + f.write('\n') + f.write('
\n') infras = [infra[6:] for infra in stats.keys() if infra.startswith("infra-")] for infra in infras: - f.write("
\n" % + f.write('
Packages using the %s infrastructure
%s
\n' % (infra, stats["infra-%s" % infra])) - f.write(" \n" % + f.write('
Packages having license information
%s
\n' % stats["license"]) - f.write(" \n" % + f.write('
Packages not having license information
%s
\n' % stats["no-license"]) - f.write(" \n" % + f.write('
Packages having license files information
%s
\n' % stats["license-files"]) - f.write(" \n" % + f.write('
Packages not having license files information
%s
\n' % stats["no-license-files"]) - f.write(" \n" % + f.write('
Packages having a hash file
%s
\n' % stats["hash"]) - f.write(" \n" % + f.write('
Packages not having a hash file
%s
\n' % stats["no-hash"]) - f.write(" \n" % + f.write('
Total number of patches
%s
\n' % stats["patches"]) - f.write("\n" % + f.write('
Packages having a mapping on release-monitoring.org
%s
\n' % stats["rmo-mapping"]) - f.write("\n" % + f.write('
Packages lacking a mapping on release-monitoring.org
%s
\n' % stats["rmo-no-mapping"]) - f.write("\n" % + f.write('
Packages that are up-to-date
%s
\n' % stats["version-uptodate"]) - f.write("\n" % + f.write('
Packages that are not up-to-date
%s
\n' % stats["version-not-uptodate"]) - f.write("\n" % + f.write('
Packages with no known upstream version
%s
\n' % stats["version-unknown"]) - f.write("\n" % + f.write('
Packages affected by CVEs
%s
\n' % stats["pkg-cves"]) - f.write("\n" % + f.write('
Total number of CVEs affecting all packages
%s
\n' % stats["total-cves"]) - f.write("\n" % + f.write('
Packages affected by unsure CVEs
%s
\n' % stats["pkg-unsure-cves"]) - f.write("\n" % + f.write('
Total number of unsure CVEs affecting all packages
%s
\n' % stats["total-unsure-cves"]) - f.write("\n" % + f.write('
Packages with CPE ID
%s
\n' % stats["cpe-id"]) - f.write("\n" % + f.write('
Packages without CPE ID
%s
\n' % stats["no-cpe-id"]) - f.write("
Packages using the %s infrastructure%s
Packages having license information%s
Packages not having license information%s
Packages having license files information%s
Packages not having license files information%s
Packages having a hash file%s
Packages not having a hash file%s
Total number of patches%s
Packages having a mapping on release-monitoring.org%s
Packages lacking a mapping on release-monitoring.org%s
Packages that are up-to-date%s
Packages that are not up-to-date%s
Packages with no known upstream version%s
Packages affected by CVEs%s
Total number of CVEs affecting all packages%s
Packages affected by unsure CVEs%s
Total number of unsure CVEs affecting all packages%s
Packages with CPE ID%s
Packages without CPE ID%s
\n") + f.write('\n') def dump_html_gen_info(f, date, commit): @@ -1120,7 +1276,7 @@ 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)', + help='Features to disable, comma-separated (cve, upstream, url, cpe, warning)', default=[]) args = parser.parse_args() if not args.html and not args.json: @@ -1136,10 +1292,12 @@ def __main__(): if args.nvd_path: import cve as cvecheck + show_info_js = None if args.packages: package_list = args.packages.split(",") elif args.configpackages: - package_list = get_config_packages() + show_info_js = get_show_info_js() + package_list = set([v["name"] for v in show_info_js.values() if 'name' in v]) else: package_list = None date = datetime.datetime.utcnow() @@ -1158,11 +1316,12 @@ def __main__(): package_init_make_info() print("Getting package details ...") for pkg in packages: - pkg.set_infra() + pkg.set_infra(show_info_js) pkg.set_license() pkg.set_hash_info() pkg.set_patch_count() - pkg.set_check_package_warnings() + if "warnings" not in args.disable: + pkg.set_check_package_warnings() pkg.set_current_version() pkg.set_cpeid() pkg.set_url() @@ -1179,6 +1338,8 @@ def __main__(): if "cve" not in args.disable and args.nvd_path: print("Checking packages CVEs") check_package_cves(args.nvd_path, packages) + if "cpe" not in args.disable and args.nvd_path: + print("Checking packages CPEs") check_package_cpes(args.nvd_path, packages) print("Calculate stats") stats = calculate_stats(packages) diff --git a/support/scripts/pycompile.py b/support/scripts/pycompile.py deleted file mode 100644 index 8774144a90b..00000000000 --- a/support/scripts/pycompile.py +++ /dev/null @@ -1,91 +0,0 @@ -#!/usr/bin/env python3 - -""" -Byte compile all .py files from provided directories. This script is an -alternative implementation of compileall.compile_dir written with -cross-compilation in mind. -""" - -import argparse -import os -import py_compile -import re -import sys - - -def compile_one(host_path, strip_root=None, verbose=False): - """ - Compile a .py file into a .pyc file located next to it. - - :arg host_path: - Absolute path to the file to compile on the host running the build. - :arg strip_root: - Prefix to remove from the original source paths encoded in compiled - files. - :arg verbose: - Print compiled file paths. - """ - if os.path.islink(host_path) or not os.path.isfile(host_path): - return # only compile real files - - if not re.match(r"^[_A-Za-z][_A-Za-z0-9]*\.py$", - os.path.basename(host_path)): - return # only compile "importable" python modules - - if strip_root is not None: - # determine the runtime path of the file (i.e.: relative path to root - # dir prepended with "/"). - runtime_path = os.path.join("/", os.path.relpath(host_path, strip_root)) - else: - runtime_path = host_path - - if verbose: - print(" PYC {}".format(runtime_path)) - - # will raise an error if the file cannot be compiled - py_compile.compile(host_path, cfile=host_path + "c", - dfile=runtime_path, doraise=True) - - -def existing_dir_abs(arg): - """ - argparse type callback that checks that argument is a directory and returns - its absolute path. - """ - if not os.path.isdir(arg): - raise argparse.ArgumentTypeError('no such directory: {!r}'.format(arg)) - return os.path.abspath(arg) - - -def main(): - parser = argparse.ArgumentParser(description=__doc__) - parser.add_argument("dirs", metavar="DIR", nargs="+", type=existing_dir_abs, - help="Directory to recursively scan and compile") - parser.add_argument("--strip-root", metavar="ROOT", type=existing_dir_abs, - help=""" - Prefix to remove from the original source paths encoded - in compiled files - """) - parser.add_argument("--verbose", action="store_true", - help="Print compiled files") - - args = parser.parse_args() - - try: - for d in args.dirs: - if args.strip_root and ".." in os.path.relpath(d, args.strip_root): - parser.error("DIR: not inside ROOT dir: {!r}".format(d)) - for parent, _, files in os.walk(d): - for f in files: - compile_one(os.path.join(parent, f), args.strip_root, - args.verbose) - - except Exception as e: - print("error: {}".format(e)) - return 1 - - return 0 - - -if __name__ == "__main__": - sys.exit(main()) diff --git a/support/scripts/pyinstaller.py b/support/scripts/pyinstaller.py new file mode 100644 index 00000000000..9e689eea2d2 --- /dev/null +++ b/support/scripts/pyinstaller.py @@ -0,0 +1,92 @@ +#!/usr/bin/env python3 + +import argparse +import glob +import pathlib + +from importlib.machinery import PathFinder +from importlib.metadata import DistributionFinder + +from installer import install +from installer._core import _process_WHEEL_file +from installer.destinations import SchemeDictionaryDestination +from installer.sources import WheelFile + + +def clean(source, destination): + scheme = _process_WHEEL_file(source) + scheme_path = destination.scheme_dict[scheme] + context = DistributionFinder.Context( + name=source.distribution, + path=[scheme_path], + ) + for path in PathFinder.find_distributions(context=context): + # path.files is either an iterable, or None + if path.files is None: + continue + for file in path.files: + file_path = pathlib.Path(file.locate()) + if file_path.exists(): + file_path.unlink() + + +def main(): + """Entry point for CLI.""" + ap = argparse.ArgumentParser("python pyinstaller.py") + ap.add_argument("wheel_file", help="Path to a .whl file to install") + + ap.add_argument( + "--interpreter", required=True, help="Interpreter path to be used in scripts" + ) + ap.add_argument( + "--script-kind", + required=True, + choices=["posix", "win-ia32", "win-amd64", "win-arm", "win-arm64"], + help="Kind of launcher to create for each script", + ) + + dest_args = ap.add_argument_group("Destination directories") + dest_args.add_argument( + "--purelib", + required=True, + help="Directory for platform-independent Python modules", + ) + dest_args.add_argument( + "--platlib", + help="Directory for platform-dependent Python modules (same as purelib " + "if not specified)", + ) + dest_args.add_argument( + "--headers", required=True, help="Directory for C header files" + ) + dest_args.add_argument( + "--scripts", required=True, help="Directory for executable scripts" + ) + dest_args.add_argument( + "--data", required=True, help="Directory for external data files" + ) + args = ap.parse_args() + + destination = SchemeDictionaryDestination( + { + "purelib": args.purelib, + "platlib": args.platlib if args.platlib is not None else args.purelib, + "headers": args.headers, + "scripts": args.scripts, + "data": args.data, + }, + interpreter=args.interpreter, + script_kind=args.script_kind, + ) + + with WheelFile.open(glob.glob(args.wheel_file)[0]) as source: + clean(source, destination) + install( + source=source, + destination=destination, + additional_metadata={}, + ) + + +if __name__ == "__main__": + main() diff --git a/support/scripts/size-stats b/support/scripts/size-stats index e4389e99b5d..79c0dc571e1 100755 --- a/support/scripts/size-stats +++ b/support/scripts/size-stats @@ -54,6 +54,9 @@ class Config: # pkg: package to which the file belongs # def add_file(filesdict, relpath, abspath, pkg): + if relpath.endswith(".py"): + # also check for compiled .pyc file + add_file(filesdict, relpath + "c", abspath + "c", pkg) if not os.path.exists(abspath): return if os.path.islink(abspath): diff --git a/support/testing/conf/binfmt-misc-kernel-fragment.config b/support/testing/conf/binfmt-misc-kernel-fragment.config deleted file mode 100644 index 7c992ff71b4..00000000000 --- a/support/testing/conf/binfmt-misc-kernel-fragment.config +++ /dev/null @@ -1,2 +0,0 @@ -# Needed for binfmt_misc service: "Arbitrary Executable File Formats File System" -CONFIG_BINFMT_MISC=y diff --git a/support/testing/infra/basetest.py b/support/testing/infra/basetest.py index 96c6848dfcb..670c7213d6e 100644 --- a/support/testing/infra/basetest.py +++ b/support/testing/infra/basetest.py @@ -52,7 +52,7 @@ def show_msg(self, msg): def setUp(self): self.show_msg("Starting") - self.b = Builder(self.config, self.builddir, self.logtofile) + self.b = Builder(self.config, self.builddir, self.logtofile, self.jlevel) if not self.keepbuilds: self.b.delete() @@ -88,7 +88,12 @@ def tearDown(self): super(BRTest, self).tearDown() # Run the given 'cmd' with a 'timeout' on the target and - # assert that the command succeeded + # assert that the command succeeded; on error, print the + # faulty command and its output def assertRunOk(self, cmd, timeout=-1): - _, exit_code = self.emulator.run(cmd, timeout) - self.assertEqual(exit_code, 0) + out, exit_code = self.emulator.run(cmd, timeout) + self.assertEqual( + exit_code, + 0, + "\nFailed to run: {}\noutput was:\n{}".format(cmd, ' '+'\n '.join(out)) + ) diff --git a/support/testing/infra/builder.py b/support/testing/infra/builder.py index 922a707220c..a2abb9ed89e 100644 --- a/support/testing/infra/builder.py +++ b/support/testing/infra/builder.py @@ -6,11 +6,12 @@ class Builder(object): - def __init__(self, config, builddir, logtofile): + def __init__(self, config, builddir, logtofile, jlevel=None): self.config = '\n'.join([line.lstrip() for line in config.splitlines()]) + '\n' self.builddir = builddir self.logfile = infra.open_log_file(builddir, "build", logtofile) + self.jlevel = jlevel def is_defconfig_valid(self, configfile, defconfig): """Check if the .config is contains all lines present in the defconfig.""" @@ -87,6 +88,8 @@ def build(self, make_extra_opts=[], make_extra_env={}): env.update(make_extra_env) cmd = ["make", "-C", self.builddir] + if "BR2_PER_PACKAGE_DIRECTORIES=y" in self.config.splitlines() and self.jlevel: + cmd.append(f"-j{self.jlevel}") cmd += make_extra_opts ret = subprocess.call(cmd, stdout=self.logfile, stderr=self.logfile, diff --git a/support/testing/infra/emulator.py b/support/testing/infra/emulator.py index 53876f828cc..02cf4861280 100644 --- a/support/testing/infra/emulator.py +++ b/support/testing/infra/emulator.py @@ -20,7 +20,7 @@ def __init__(self, builddir, downloaddir, logtofile, timeout_multiplier): # # kernel: path to the kernel image, or the special string # 'builtin'. 'builtin' means a pre-built kernel image will be - # downloaded from ARTEFACTS_URL and suitable options are + # downloaded from ARTIFACTS_URL and suitable options are # automatically passed to qemu and added to the kernel cmdline. So # far only armv5, armv7 and i386 builtin kernels are available. # If None, then no kernel is used, and we assume a bootable device diff --git a/support/testing/run-tests b/support/testing/run-tests index 022209b414a..bf400193627 100755 --- a/support/testing/run-tests +++ b/support/testing/run-tests @@ -87,9 +87,7 @@ def main(): return 1 # same default BR2_JLEVEL as package/Makefile.in br2_jlevel = 1 + multiprocessing.cpu_count() - each_testcase = br2_jlevel / args.testcases - if each_testcase < 1: - each_testcase = 1 + each_testcase = int((br2_jlevel + args.testcases) / args.testcases) BRConfigTest.jlevel = each_testcase if args.jlevel: diff --git a/support/testing/tests/boot/test_grub.py b/support/testing/tests/boot/test_grub.py new file mode 100644 index 00000000000..2c393f730e5 --- /dev/null +++ b/support/testing/tests/boot/test_grub.py @@ -0,0 +1,156 @@ +import os + +import infra.basetest + + +class TestGrubi386BIOS(infra.basetest.BRTest): + config = \ + """ + BR2_x86_core2=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_UCLIBC_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" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.204" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/pc/linux.config" + BR2_LINUX_KERNEL_INSTALL_TARGET=y + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_GRUB2=y + BR2_TARGET_GRUB2_I386_PC=y + BR2_TARGET_GRUB2_INSTALL_TOOLS=y + BR2_PACKAGE_HOST_GENIMAGE=y + """.format(infra.filepath("tests/boot/test_grub/post-build.sh")) + + def test_run(self): + hda = os.path.join(self.builddir, "images", "disk.img") + self.emulator.boot(arch="i386", options=["-hda", hda]) + self.emulator.login() + + +class TestGrubi386EFI(infra.basetest.BRTest): + config = \ + """ + BR2_x86_core2=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_UCLIBC_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 + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.204" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/pc/linux.config" + BR2_LINUX_KERNEL_INSTALL_TARGET=y + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + BR2_PACKAGE_EFIVAR=y + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_EDK2=y + BR2_TARGET_GRUB2=y + BR2_TARGET_GRUB2_I386_EFI=y + BR2_TARGET_GRUB2_INSTALL_TOOLS=y + BR2_PACKAGE_HOST_GENIMAGE=y + BR2_PACKAGE_HOST_MTOOLS=y + BR2_PACKAGE_HOST_DOSFSTOOLS=y + """.format(infra.filepath("tests/boot/test_grub/post-build.sh")) + + def test_run(self): + hda = os.path.join(self.builddir, "images", "disk.img") + bios = os.path.join(self.builddir, "images", "OVMF.fd") + self.emulator.boot(arch="i386", options=["-bios", bios, "-hda", hda]) + self.emulator.login() + + cmd = "modprobe efivarfs" + self.assertRunOk(cmd) + + cmd = "mount -t efivarfs none /sys/firmware/efi/efivars" + self.assertRunOk(cmd) + + cmd = "efivar -l" + self.assertRunOk(cmd) + + +class TestGrubX8664EFI(infra.basetest.BRTest): + config = \ + """ + BR2_x86_64=y + BR2_x86_corei7=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_UCLIBC_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 + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.204" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/pc/linux.config" + BR2_LINUX_KERNEL_INSTALL_TARGET=y + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + BR2_PACKAGE_EFIVAR=y + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_EDK2=y + BR2_TARGET_GRUB2=y + BR2_TARGET_GRUB2_X86_64_EFI=y + BR2_TARGET_GRUB2_INSTALL_TOOLS=y + BR2_PACKAGE_HOST_GENIMAGE=y + BR2_PACKAGE_HOST_MTOOLS=y + BR2_PACKAGE_HOST_DOSFSTOOLS=y + """.format(infra.filepath("tests/boot/test_grub/post-build.sh")) + + def test_run(self): + hda = os.path.join(self.builddir, "images", "disk.img") + bios = os.path.join(self.builddir, "images", "OVMF.fd") + self.emulator.boot(arch="x86_64", options=["-bios", bios, "-hda", hda]) + self.emulator.login() + + cmd = "modprobe efivarfs" + self.assertRunOk(cmd) + + cmd = "mount -t efivarfs none /sys/firmware/efi/efivars" + self.assertRunOk(cmd) + + cmd = "efivar -l" + self.assertRunOk(cmd) + + +class TestGrubAArch64EFI(infra.basetest.BRTest): + config = \ + """ + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_ROOTFS_POST_IMAGE_SCRIPT="{post_image}" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" + 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_EFIVAR=y + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_EDK2=y + BR2_TARGET_GRUB2=y + BR2_PACKAGE_HOST_GENIMAGE=y + BR2_PACKAGE_HOST_MTOOLS=y + BR2_PACKAGE_HOST_DOSFSTOOLS=y + """.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 test_run(self): + hda = os.path.join(self.builddir, "images", "disk.img") + bios = os.path.join(self.builddir, "images", "QEMU_EFI.fd") + self.emulator.boot(arch="aarch64", options=["-M", "virt", "-cpu", "cortex-a53", "-bios", bios, "-hda", hda]) + self.emulator.login() + + cmd = "modprobe efivarfs" + self.assertRunOk(cmd) + + cmd = "mount -t efivarfs none /sys/firmware/efi/efivars" + self.assertRunOk(cmd) + + cmd = "efivar -l" + self.assertRunOk(cmd) diff --git a/support/testing/tests/boot/test_grub/genimage-aarch64-efi.cfg b/support/testing/tests/boot/test_grub/genimage-aarch64-efi.cfg new file mode 100644 index 00000000000..11615c885a0 --- /dev/null +++ b/support/testing/tests/boot/test_grub/genimage-aarch64-efi.cfg @@ -0,0 +1,32 @@ +image efi-part.vfat { + vfat { + file EFI { + image = "efi-part/EFI" + } + + file Image { + image = "Image" + } + } + + size = 16352K # 16MB - 32KB +} + +image disk.img { + hdimage { + partition-table-type = "gpt" + } + + partition boot { + image = "efi-part.vfat" + partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b + offset = 32K + bootable = true + } + + partition root { + partition-type-uuid = 44479540-f297-41b2-9af7-d131d5f0458a + partition-uuid = UUID_TMP + image = "rootfs.ext2" + } +} diff --git a/support/testing/tests/boot/test_grub/grub-aarch64-efi.cfg b/support/testing/tests/boot/test_grub/grub-aarch64-efi.cfg new file mode 100644 index 00000000000..d40af0df241 --- /dev/null +++ b/support/testing/tests/boot/test_grub/grub-aarch64-efi.cfg @@ -0,0 +1,6 @@ +set default="0" +set timeout="5" + +menuentry "Buildroot" { + linux /Image root=PARTUUID=UUID_TMP rootwait console=ttyAMA0 +} diff --git a/support/testing/tests/boot/test_grub/linux-aarch64-efi.config b/support/testing/tests/boot/test_grub/linux-aarch64-efi.config new file mode 100644 index 00000000000..839566bae00 --- /dev/null +++ b/support/testing/tests/boot/test_grub/linux-aarch64-efi.config @@ -0,0 +1 @@ +CONFIG_ACPI=y diff --git a/support/testing/tests/boot/test_grub/post-build.sh b/support/testing/tests/boot/test_grub/post-build.sh new file mode 100755 index 00000000000..8d6f0318dee --- /dev/null +++ b/support/testing/tests/boot/test_grub/post-build.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +if [ -d "$BINARIES_DIR/efi-part/" ]; then + sed -i 's%tty1%ttyS0,115200%' "$BINARIES_DIR/efi-part/EFI/BOOT/grub.cfg" +else + sed -i 's%tty1%ttyS0,115200%' "$TARGET_DIR/boot/grub/grub.cfg" +fi diff --git a/support/testing/tests/boot/test_grub/post-image-aarch64-efi.sh b/support/testing/tests/boot/test_grub/post-image-aarch64-efi.sh new file mode 100755 index 00000000000..2db516ef2d3 --- /dev/null +++ b/support/testing/tests/boot/test_grub/post-image-aarch64-efi.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +set -e + +UUID=$(dumpe2fs "$BINARIES_DIR/rootfs.ext2" 2>/dev/null | sed -n 's/^Filesystem UUID: *\(.*\)/\1/p') +sed "s/UUID_TMP/$UUID/g" support/testing/tests/boot/test_grub/grub-aarch64-efi.cfg > "$BINARIES_DIR/efi-part/EFI/BOOT/grub.cfg" +sed "s/UUID_TMP/$UUID/g" support/testing/tests/boot/test_grub/genimage-aarch64-efi.cfg > "$BINARIES_DIR/genimage-aarch64-efi.cfg" +support/scripts/genimage.sh -c "$BINARIES_DIR/genimage-aarch64-efi.cfg" diff --git a/support/testing/tests/download/br2-external/gitlab/package/gitlab-release/gitlab-release.hash b/support/testing/tests/download/br2-external/gitlab/package/gitlab-release/gitlab-release.hash index 7031d1b34a7..e4dfb6eb0ab 100644 --- a/support/testing/tests/download/br2-external/gitlab/package/gitlab-release/gitlab-release.hash +++ b/support/testing/tests/download/br2-external/gitlab/package/gitlab-release/gitlab-release.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 12b88efa4d0d95af08db05a50b3dcb217c0eb2bfc67b483779e33d498ddb2f95 iucode-tool_2.3.1.tar.xz -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING +sha256 12b88efa4d0d95af08db05a50b3dcb217c0eb2bfc67b483779e33d498ddb2f95 iucode-tool_2.3.1.tar.xz +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/support/testing/tests/fs/test_cpio.py b/support/testing/tests/fs/test_cpio.py new file mode 100644 index 00000000000..172af579bba --- /dev/null +++ b/support/testing/tests/fs/test_cpio.py @@ -0,0 +1,130 @@ +import os +import infra.basetest +import subprocess + +CHECK_FS_CMD = "mount | grep 'rootfs on / type rootfs'" + + +def boot_img(emulator, builddir): + img = os.path.join(builddir, "images", "rootfs.cpio") + emulator.boot(arch="armv7", + kernel="builtin", + options=["-initrd", "{}".format(img)]) + emulator.login() + _, exit_code = emulator.run(CHECK_FS_CMD) + return exit_code + + +class TestCpioFull(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_INIT_BUSYBOX=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + + exit_code = boot_img(self.emulator, + self.builddir) + self.assertEqual(exit_code, 0) + + +class TestCpioDracutBase(infra.basetest.BRTest): + config = \ + """ + BR2_arm=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_INIT_BUSYBOX=y + BR2_PACKAGE_CRAMFS=y + BR2_PACKAGE_PV=y + BR2_TARGET_ROOTFS_CPIO=y + BR2_TARGET_ROOTFS_CPIO_DRACUT=y + BR2_TARGET_ROOTFS_CPIO_DRACUT_MODULES="{}" + BR2_TARGET_ROOTFS_CPIO_DRACUT_CONF_FILES="{}" + # BR2_TARGET_ROOTFS_TAR is not set + """.format("support/testing/tests/fs/test_cpio/modules", + " ".join(["fs/cpio/dracut.conf", + "support/testing/tests/fs/test_cpio/dracut-cramfs.conf"])) + + def check_dracut(self): + out = subprocess.check_output(["cpio", "--list"], + stdin=open(os.path.join(self.builddir, "images/rootfs.cpio")), + stderr=open(os.devnull, "w"), + cwd=self.builddir, + env={"LANG": "C"}, + universal_newlines=True) + # pv should *not* be included in cpio image + self.assertEqual(out.find("bin/pv"), -1) + # libz should be, because of cramfs + self.assertNotEqual(out.find("usr/bin/mkcramfs"), -1) + self.assertNotEqual(out.find("usr/bin/cramfsck"), -1) + self.assertNotEqual(out.find("usr/lib/libz.so"), -1) + + exit_code = boot_img(self.emulator, + self.builddir) + self.assertEqual(exit_code, 0) + + +class TestCpioDracutUclibc(TestCpioDracutBase): + config = TestCpioDracutBase.config + \ + """ + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_UCLIBC_STABLE=y + """ + + def test_run(self): + self.check_dracut() + + +class TestCpioDracutGlibc(TestCpioDracutBase): + config = TestCpioDracutBase.config + \ + """ + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE=y + """ + + def test_run(self): + self.check_dracut() + + +class TestCpioDracutMusl(TestCpioDracutBase): + config = TestCpioDracutBase.config + \ + """ + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_MUSL_STABLE=y + """ + + def test_run(self): + self.check_dracut() + + +class TestCpioDracutUclibcMergedUsr(TestCpioDracutBase): + config = TestCpioDracutBase.config + \ + """ + BR2_ROOTFS_MERGED_USR=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_UCLIBC_STABLE=y + """ + + def test_run(self): + self.check_dracut() + + +class TestCpioDracutGlibcMergedUsr(TestCpioDracutBase): + config = TestCpioDracutBase.config + \ + """ + BR2_ROOTFS_MERGED_USR=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE=y + """ + + def test_run(self): + self.check_dracut() + + +class TestCpioDracutMuslMergedUsr(TestCpioDracutBase): + config = TestCpioDracutBase.config + \ + """ + BR2_ROOTFS_MERGED_USR=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_MUSL_STABLE=y + """ + + def test_run(self): + self.check_dracut() diff --git a/support/testing/tests/fs/test_cpio/dracut-cramfs.conf b/support/testing/tests/fs/test_cpio/dracut-cramfs.conf new file mode 100644 index 00000000000..69e49239fc2 --- /dev/null +++ b/support/testing/tests/fs/test_cpio/dracut-cramfs.conf @@ -0,0 +1,7 @@ +install_items+=" +/usr/bin/mkcramfs +" + +add_dracutmodules+=" +cramfs +" diff --git a/support/testing/tests/fs/test_cpio/modules/99cramfs/module-setup.sh b/support/testing/tests/fs/test_cpio/modules/99cramfs/module-setup.sh new file mode 100755 index 00000000000..60706c8bd91 --- /dev/null +++ b/support/testing/tests/fs/test_cpio/modules/99cramfs/module-setup.sh @@ -0,0 +1,11 @@ +check() { + return 0 +} + +depends() { + return 0 +} + +install() { + inst_multiple /usr/bin/cramfsck +} diff --git a/support/testing/tests/fs/test_f2fs.py b/support/testing/tests/fs/test_f2fs.py index 2d05a864180..425fbe31cac 100644 --- a/support/testing/tests/fs/test_f2fs.py +++ b/support/testing/tests/fs/test_f2fs.py @@ -30,7 +30,7 @@ def test_run(self): img = os.path.join(self.builddir, "images", "rootfs.f2fs") out = infra.run_cmd_on_host(self.builddir, ["host/sbin/dump.f2fs", img]) out = out.splitlines() - prop = dumpf2fs_getprop(out, "Info: total sectors") + prop = dumpf2fs_getprop(out, "Info: total FS sectors") self.assertEqual(prop, "262144 (128 MB)") kernel = os.path.join(self.builddir, "images", "zImage") diff --git a/support/testing/tests/fs/test_oci.py b/support/testing/tests/fs/test_oci.py index 347332f30d3..0ecf58f6267 100644 --- a/support/testing/tests/fs/test_oci.py +++ b/support/testing/tests/fs/test_oci.py @@ -20,7 +20,7 @@ class TestOci(infra.basetest.BRTest): BR2_TARGET_ROOTFS_EXT2_SIZE="600M" BR2_TARGET_ROOTFS_OCI=y BR2_TARGET_ROOTFS_OCI_ENTRYPOINT="df" - BR2_TARGET_ROOTFS_OCI_ENTRYPOINT_ARGS="-h" + BR2_TARGET_ROOTFS_OCI_CMD="-h" BR2_TARGET_ROOTFS_OCI_ARCHIVE=y # BR2_TARGET_ROOTFS_TAR is not set """ diff --git a/support/testing/tests/fs/test_squashfs.py b/support/testing/tests/fs/test_squashfs.py index a914f5aac72..0ceb4cab58d 100644 --- a/support/testing/tests/fs/test_squashfs.py +++ b/support/testing/tests/fs/test_squashfs.py @@ -10,6 +10,7 @@ class TestSquashfs(infra.basetest.BRTest): BR2_TARGET_ROOTFS_SQUASHFS4_LZO=y # BR2_TARGET_ROOTFS_TAR is not set """ + expected_blocksize_in_bytes = 128*1024 def test_run(self): unsquashfs_cmd = ["host/bin/unsquashfs", "-s", "images/rootfs.squashfs"] @@ -18,6 +19,7 @@ def test_run(self): self.assertEqual(out[0], "Found a valid SQUASHFS 4:0 superblock on images/rootfs.squashfs.") self.assertEqual(out[3], "Compression lzo") + self.assertEqual(out[4], "Block size {}".format(self.expected_blocksize_in_bytes)) img = os.path.join(self.builddir, "images", "rootfs.squashfs") infra.img_round_power2(img) @@ -31,3 +33,25 @@ def test_run(self): cmd = "mount | grep '/dev/root on / type squashfs'" self.assertRunOk(cmd) + + +class TestSquashfsMinBlocksize(TestSquashfs): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_TARGET_ROOTFS_SQUASHFS=y + BR2_TARGET_ROOTFS_SQUASHFS_BS_4K=y + BR2_TARGET_ROOTFS_SQUASHFS4_LZO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + expected_blocksize_in_bytes = 4*1024 + + +class TestSquashfsMaxBlocksize(TestSquashfs): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_TARGET_ROOTFS_SQUASHFS=y + BR2_TARGET_ROOTFS_SQUASHFS_BS_1024K=y + BR2_TARGET_ROOTFS_SQUASHFS4_LZO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + expected_blocksize_in_bytes = 1024*1024 diff --git a/support/testing/tests/init/test_systemd.py b/support/testing/tests/init/test_systemd.py index f0cc52bac81..ddc32b08386 100644 --- a/support/testing/tests/init/test_systemd.py +++ b/support/testing/tests/init/test_systemd.py @@ -9,20 +9,16 @@ class InitSystemSystemdBase(InitSystemBase): BR2_cortex_a9=y BR2_ARM_ENABLE_VFP=y BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_INIT_SYSTEMD=y BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" - BR2_LINUX_KERNEL=y - BR2_LINUX_KERNEL_CUSTOM_VERSION=y - BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.204" - BR2_LINUX_KERNEL_DEFCONFIG="vexpress" - BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{}" - BR2_LINUX_KERNEL_DTS_SUPPORT=y - BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" # BR2_TARGET_ROOTFS_TAR is not set - """.format(infra.filepath("conf/binfmt-misc-kernel-fragment.config")) + BR2_PER_PACKAGE_DIRECTORIES=y + """ - def check_init(self): - super(InitSystemSystemdBase, self).check_init("/lib/systemd/systemd") + def check_systemd(self, fs): + self.start_emulator(fs) + self.check_init("/lib/systemd/systemd") # Test all units are OK output, _ = self.emulator.run("systemctl --no-pager --failed --no-legend") @@ -35,6 +31,9 @@ def check_init(self): output, _ = self.emulator.run("journalctl --no-pager --lines 1 --quiet") self.assertEqual(len(output), 1) + # Check the network is up + self.check_network("eth0") + class TestInitSystemSystemdRoNetworkd(InitSystemSystemdBase): config = InitSystemSystemdBase.config + \ @@ -46,9 +45,7 @@ class TestInitSystemSystemdRoNetworkd(InitSystemSystemdBase): """.format(infra.filepath("tests/init/systemd-factory")) def test_run(self): - self.start_emulator("squashfs", "zImage", "vexpress-v2p-ca9") - self.check_init() - self.check_network("eth0") + self.check_systemd("squashfs") # This one must be executed on the target, to check that # the factory feature works as expected @@ -65,9 +62,7 @@ class TestInitSystemSystemdRwNetworkd(InitSystemSystemdBase): """ def test_run(self): - self.start_emulator("ext2", "zImage", "vexpress-v2p-ca9") - self.check_init() - self.check_network("eth0") + self.check_systemd("ext2") class TestInitSystemSystemdRoIfupdown(InitSystemSystemdBase): @@ -80,9 +75,30 @@ class TestInitSystemSystemdRoIfupdown(InitSystemSystemdBase): """ def test_run(self): - self.start_emulator("squashfs", "zImage", "vexpress-v2p-ca9") - self.check_init() - self.check_network("eth0") + self.check_systemd("squashfs") + + +class TestInitSystemSystemdRoIfupdownDbusbroker(TestInitSystemSystemdRoIfupdown): + config = TestInitSystemSystemdRoIfupdown.config + \ + """ + BR2_PACKAGE_DBUS_BROKER=y + """ + + def test_run(self): + # Parent class' test_run() method does exactly that, no more: + self.check_systemd("squashfs") + + # Check that the dbus-broker daemon is running as non-root + cmd = "find /proc/$(pidof dbus-broker) -maxdepth 1 -name exe -user dbus" + out, _ = self.emulator.run(cmd) + self.assertEqual(len(out), 1) + + +class TestInitSystemSystemdRoIfupdownDbusbrokerDbus(TestInitSystemSystemdRoIfupdownDbusbroker): + config = TestInitSystemSystemdRoIfupdownDbusbroker.config + \ + """ + BR2_PACKAGE_DBUS=y + """ class TestInitSystemSystemdRwIfupdown(InitSystemSystemdBase): @@ -94,9 +110,30 @@ class TestInitSystemSystemdRwIfupdown(InitSystemSystemdBase): """ def test_run(self): - self.start_emulator("ext2", "zImage", "vexpress-v2p-ca9") - self.check_init() - self.check_network("eth0") + self.check_systemd("ext2") + + +class TestInitSystemSystemdRwIfupdownDbusbroker(TestInitSystemSystemdRwIfupdown): + config = TestInitSystemSystemdRwIfupdown.config + \ + """ + BR2_PACKAGE_DBUS_BROKER=y + """ + + def test_run(self): + # Parent class' test_run() method does exactly that, no more: + self.check_systemd("ext2") + + # Check that the dbus-broker daemon is running as non-root + cmd = "find /proc/$(pidof dbus-broker) -maxdepth 1 -name exe -user dbus" + out, _ = self.emulator.run(cmd) + self.assertEqual(len(out), 1) + + +class TestInitSystemSystemdRwIfupdownDbusbrokerDbus(TestInitSystemSystemdRwIfupdownDbusbroker): + config = TestInitSystemSystemdRwIfupdownDbusbroker.config + \ + """ + BR2_PACKAGE_DBUS=y + """ class TestInitSystemSystemdRoFull(InitSystemSystemdBase): @@ -125,9 +162,7 @@ class TestInitSystemSystemdRoFull(InitSystemSystemdBase): """ def test_run(self): - self.start_emulator("squashfs", "zImage", "vexpress-v2p-ca9") - self.check_init() - self.check_network("eth0") + self.check_systemd("squashfs") class TestInitSystemSystemdRwFull(InitSystemSystemdBase): @@ -155,6 +190,4 @@ class TestInitSystemSystemdRwFull(InitSystemSystemdBase): """ def test_run(self): - self.start_emulator("ext2", "zImage", "vexpress-v2p-ca9") - self.check_init() - self.check_network("eth0") + self.check_systemd("ext2") diff --git a/support/testing/tests/package/br2-external/clang-compiler-rt/Config.in b/support/testing/tests/package/br2-external/clang-compiler-rt/Config.in new file mode 100644 index 00000000000..e1f9f8c5981 --- /dev/null +++ b/support/testing/tests/package/br2-external/clang-compiler-rt/Config.in @@ -0,0 +1 @@ +source "$BR2_EXTERNAL_CLANG_COMPILER_RT_PATH/package/libfuzzer/Config.in" diff --git a/support/testing/tests/package/br2-external/clang-compiler-rt/external.desc b/support/testing/tests/package/br2-external/clang-compiler-rt/external.desc new file mode 100644 index 00000000000..92df85911db --- /dev/null +++ b/support/testing/tests/package/br2-external/clang-compiler-rt/external.desc @@ -0,0 +1 @@ +name: CLANG_COMPILER_RT diff --git a/support/testing/tests/package/br2-external/clang-compiler-rt/external.mk b/support/testing/tests/package/br2-external/clang-compiler-rt/external.mk new file mode 100644 index 00000000000..6fa55c12113 --- /dev/null +++ b/support/testing/tests/package/br2-external/clang-compiler-rt/external.mk @@ -0,0 +1 @@ +include $(sort $(wildcard $(BR2_EXTERNAL_CLANG_COMPILER_RT_PATH)/package/*/*.mk)) diff --git a/support/testing/tests/package/br2-external/clang-compiler-rt/package/libfuzzer/Config.in b/support/testing/tests/package/br2-external/clang-compiler-rt/package/libfuzzer/Config.in new file mode 100644 index 00000000000..2d335fd3c76 --- /dev/null +++ b/support/testing/tests/package/br2-external/clang-compiler-rt/package/libfuzzer/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_LIBFUZZER + bool "libfuzzer" + help + This project aims at hosting tutorials, + examples, discussions, research proposals, + and other resources related to fuzzing. + + https://github.com/google/fuzzing diff --git a/support/testing/tests/package/br2-external/clang-compiler-rt/package/libfuzzer/libfuzzer.hash b/support/testing/tests/package/br2-external/clang-compiler-rt/package/libfuzzer/libfuzzer.hash new file mode 100644 index 00000000000..0601cc02c66 --- /dev/null +++ b/support/testing/tests/package/br2-external/clang-compiler-rt/package/libfuzzer/libfuzzer.hash @@ -0,0 +1,2 @@ +sha256 c71360c3b1ba1d88b28b0b3cb3a1744d251b87a12f2881224cc53ec26eb7a2db libfuzzer-cec02db916d21baa4db5b8d262d78848b3a35f4b.tar.gz +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/support/testing/tests/package/br2-external/clang-compiler-rt/package/libfuzzer/libfuzzer.mk b/support/testing/tests/package/br2-external/clang-compiler-rt/package/libfuzzer/libfuzzer.mk new file mode 100644 index 00000000000..0515b9da35f --- /dev/null +++ b/support/testing/tests/package/br2-external/clang-compiler-rt/package/libfuzzer/libfuzzer.mk @@ -0,0 +1,24 @@ +################################################################################ +# +# libfuzzer +# +################################################################################ + +LIBFUZZER_VERSION = cec02db916d21baa4db5b8d262d78848b3a35f4b +LIBFUZZER_SITE = $(call github,google,fuzzing,$(LIBFUZZER_VERSION)) +LIBFUZZER_LICENSE = Apache-2.0 +LIBFUZZER_LICENSE_FILES = LICENSE +LIBFUZZER_DEPENDENCIES = compiler-rt + +define LIBFUZZER_BUILD_CMDS + $(HOST_DIR)/bin/clang++ --sysroot=$(STAGING_DIR) \ + -fsanitize=address,fuzzer \ + $(@D)/tutorial/libFuzzer/fuzz_me.cc \ + -o $(@D)/fuzz_me +endef + +define LIBFUZZER_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 755 $(@D)/fuzz_me $(TARGET_DIR)/usr/bin/fuzz_me +endef + +$(eval $(generic-package)) diff --git a/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/python-pybind-example.mk b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/python-pybind-example.mk index a6d7e0daafe..6620e704100 100644 --- a/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/python-pybind-example.mk +++ b/support/testing/tests/package/br2-external/python-pybind/package/python-pybind-example/python-pybind-example.mk @@ -10,7 +10,7 @@ PYTHON_PYBIND_EXAMPLE_DEPENDENCIES = python-pybind PYTHON_PYBIND_EXAMPLE_PYBIND_INCLUDE = \ - $(shell $(HOST_DIR)/usr/bin/python3 -c 'import pybind11; print(pybind11.get_include())') + $(shell $(HOST_DIR)/bin/python3 -c 'import pybind11; print(pybind11.get_include())') PYTHON_PYBIND_EXAMPLE_CXX_FLAGS = \ $(TARGET_CXXFLAGS) \ diff --git a/support/testing/tests/package/sample_nodejs_basic.js b/support/testing/tests/package/sample_nodejs_basic.js new file mode 100644 index 00000000000..7633173c640 --- /dev/null +++ b/support/testing/tests/package/sample_nodejs_basic.js @@ -0,0 +1,3 @@ +var assert = require('assert'); +assert.strictEqual(1, 1); +console.log("Hello World"); diff --git a/support/testing/tests/package/sample_nodejs_module.js b/support/testing/tests/package/sample_nodejs_module.js new file mode 100644 index 00000000000..57aee734084 --- /dev/null +++ b/support/testing/tests/package/sample_nodejs_module.js @@ -0,0 +1,7 @@ +var assert = require('assert'); +var lodash = require('lodash'); +result = lodash.chunk(['a', 'b', 'c', 'd'], 2); +expected = [ [ 'a', 'b' ], [ 'c', 'd' ] ]; +assert.deepStrictEqual(result, expected) + + diff --git a/support/testing/tests/package/sample_python_avro.py b/support/testing/tests/package/sample_python_avro.py index 79d2dcdb22f..46363ad2bff 100644 --- a/support/testing/tests/package/sample_python_avro.py +++ b/support/testing/tests/package/sample_python_avro.py @@ -1,8 +1,8 @@ from io import BytesIO -from avro.schema import Parse +from avro.schema import parse from avro.io import DatumReader, BinaryDecoder -schema = Parse("""{ +schema = parse("""{ "namespace": "org.buildroot.package.python_avro", "type": "record", "name": "Developer", diff --git a/support/testing/tests/package/sample_python_construct.py b/support/testing/tests/package/sample_python_construct.py new file mode 100644 index 00000000000..551b5597614 --- /dev/null +++ b/support/testing/tests/package/sample_python_construct.py @@ -0,0 +1,16 @@ +# Inspired from https://construct.readthedocs.io/en/latest/intro.html#example +import construct + +format = construct.Struct( + "signature" / construct.Const(b"BMP"), + "width" / construct.Int8ub, + "height" / construct.Int8ub, + "pixels" / construct.Array(construct.this.width * construct.this.height, construct.Byte), +) +a = format.build(dict(width=3,height=2,pixels=[7,8,9,11,12,13])) +assert(a == b'BMP\x03\x02\x07\x08\t\x0b\x0c\r') +b = format.parse(b'BMP\x03\x02\x07\x08\t\x0b\x0c\r') +assert(b.signature == b'BMP') +assert(b.width == 3) +assert(b.height == 2) +assert(b.pixels == [7, 8, 9, 11, 12, 13]) diff --git a/support/testing/tests/package/sample_python_crossbar.py b/support/testing/tests/package/sample_python_crossbar.py index 374cccd837e..8160a372198 100644 --- a/support/testing/tests/package/sample_python_crossbar.py +++ b/support/testing/tests/package/sample_python_crossbar.py @@ -1,5 +1,4 @@ import os import crossbar -os.environ["AUTOBAHN_USE_UMSGPACK"] = "1" crossbar.run(["version"]) diff --git a/support/testing/tests/package/sample_python_dbus_fast.py b/support/testing/tests/package/sample_python_dbus_fast.py new file mode 100644 index 00000000000..4157bccfcff --- /dev/null +++ b/support/testing/tests/package/sample_python_dbus_fast.py @@ -0,0 +1,45 @@ +import asyncio +from dbus_fast.aio import MessageBus +from dbus_fast.service import ServiceInterface, method +import dbus_fast.introspection as intr +from dbus_fast import BusType + + +class SampleInterface(ServiceInterface): + def __init__(self): + super().__init__('test.interface') + + @method() + def Ping(self): + pass + + @method() + def ConcatStrings(self, what1: 's', what2: 's') -> 's': # noqa: F821 + return what1 + what2 + + +async def main(): + bus_name = 'dbus.fast.sample' + obj_path = '/test/path' + + bus = await MessageBus(bus_type=BusType.SYSTEM).connect() + bus2 = await MessageBus(bus_type=BusType.SYSTEM).connect() + + await bus.request_name(bus_name) + + service_interface = SampleInterface() + bus.export(obj_path, service_interface) + + introspection = await bus2.introspect(bus_name, obj_path) + assert type(introspection) is intr.Node + obj = bus2.get_proxy_object(bus_name, obj_path, introspection) + interface = obj.get_interface(service_interface.name) + + result = await interface.call_ping() + assert result is None + + result = await interface.call_concat_strings('hello ', 'world') + assert result == 'hello world' + + +asyncio.run(main()) diff --git a/support/testing/tests/package/sample_python_dicttoxml2.py b/support/testing/tests/package/sample_python_dicttoxml2.py new file mode 100644 index 00000000000..788c5e2cd7b --- /dev/null +++ b/support/testing/tests/package/sample_python_dicttoxml2.py @@ -0,0 +1,11 @@ +from dicttoxml2 import dicttoxml + +payload: dict = {'mylist': ['foo', 'bar', 'baz'], 'mydict': {'foo': 'bar', 'baz': 1}, 'ok': True} + +expected: bytes = b'' \ + b'' \ + b'' \ + b'' \ + b'' + +assert dicttoxml(payload, cdata=True) == expected diff --git a/support/testing/tests/package/sample_python_docker.py b/support/testing/tests/package/sample_python_docker.py new file mode 100644 index 00000000000..a69097b4125 --- /dev/null +++ b/support/testing/tests/package/sample_python_docker.py @@ -0,0 +1,12 @@ +import docker + +client = docker.from_env() +info = client.info() +images = client.images.list() + +assert len(images) > 0 + +print('Version:', info['ServerVersion']) +print('Images:') +for i in images: + print(i.tags[0]) diff --git a/support/testing/tests/package/sample_python_dtschema.py b/support/testing/tests/package/sample_python_dtschema.py new file mode 100644 index 00000000000..786c3d5a71f --- /dev/null +++ b/support/testing/tests/package/sample_python_dtschema.py @@ -0,0 +1 @@ +import dtschema diff --git a/support/testing/tests/package/sample_python_hkdf.py b/support/testing/tests/package/sample_python_hkdf.py new file mode 100644 index 00000000000..a730c633e14 --- /dev/null +++ b/support/testing/tests/package/sample_python_hkdf.py @@ -0,0 +1,22 @@ +import hashlib +from binascii import hexlify, unhexlify + +from hkdf import Hkdf, hkdf_expand, hkdf_extract + +salt = b"ThisIsTheSalt." +key_in = b"ThisIsTheSecretKey" +key_info = b"KeyInfo1" +key_len = 16 +expected_key = unhexlify(b"b49d6cc9065b72f3a0859377d8bb7299") + +prk = hkdf_extract(salt, input_key_material=key_in, hash=hashlib.sha512) +key1 = hkdf_expand(prk, info=key_info, length=key_len) + +print("key1:", hexlify(key1)) +assert key1 == expected_key + +kdf = Hkdf(salt, input_key_material=key_in, hash=hashlib.sha512) +key2 = kdf.expand(info=key_info, length=key_len) + +print("key2:", hexlify(key2)) +assert key2 == expected_key diff --git a/support/testing/tests/package/sample_python_jmespath.py b/support/testing/tests/package/sample_python_jmespath.py new file mode 100644 index 00000000000..aefccd4fd8f --- /dev/null +++ b/support/testing/tests/package/sample_python_jmespath.py @@ -0,0 +1,4 @@ +import jmespath +expression = jmespath.compile('foo.bar') +res = expression.search({'foo': {'bar': 'baz'}}) +assert res == "baz", "expression.search failed" diff --git a/support/testing/tests/package/sample_python_munch.py b/support/testing/tests/package/sample_python_munch.py new file mode 100644 index 00000000000..b45bec7b7ed --- /dev/null +++ b/support/testing/tests/package/sample_python_munch.py @@ -0,0 +1,20 @@ +from munch import Munch + +b = Munch() +b.hello = 'world' +assert b.hello == 'world' +b['hello'] += "!" +assert b.hello == 'world!' +b.foo = Munch(lol=True) +assert b.foo.lol is True +assert b.foo is b['foo'] + +assert sorted(b.keys()) == ['foo', 'hello'] + +b.update({'ponies': 'are pretty!'}, hello=42) +assert b == Munch({'ponies': 'are pretty!', 'foo': Munch({'lol': True}), 'hello': 42}) + +assert sorted([(k, b[k]) for k in b]) == [('foo', Munch({'lol': True})), ('hello', 42), ('ponies', 'are pretty!')] + +format_munch = Munch(knights='lolcats', ni='can haz') +assert "The {knights} who say {ni}!".format(**format_munch) == 'The lolcats who say can haz!' diff --git a/support/testing/tests/package/sample_python_paho_mqtt.py b/support/testing/tests/package/sample_python_paho_mqtt.py new file mode 100644 index 00000000000..769ad6250fa --- /dev/null +++ b/support/testing/tests/package/sample_python_paho_mqtt.py @@ -0,0 +1,12 @@ +from paho.mqtt import publish, subscribe + +publish.single( + 'buildroot/test', + payload="Hello, World!", + qos=2, + retain=True, + hostname="localhost", + port=1883) + +message = subscribe.simple('buildroot/test') +print(message.payload.decode()) diff --git a/support/testing/tests/package/sample_python_pyalsa.py b/support/testing/tests/package/sample_python_pyalsa.py new file mode 100644 index 00000000000..e22226e871b --- /dev/null +++ b/support/testing/tests/package/sample_python_pyalsa.py @@ -0,0 +1,12 @@ +#! /usr/bin/env python3 + +from pyalsa import alsacard + +print('asoundlibVersion:', alsacard.asoundlib_version()) +print('cardLoad:', alsacard.card_load(0)) +print('cardList:', alsacard.card_list()) +print('deviceNameHint for all cards:') +print(alsacard.device_name_hint(-1, "pcm")) +for card in alsacard.card_list(): + print('deviceNameHint for card #%i:' % card) + print(alsacard.device_name_hint(card, "pcm")) diff --git a/support/testing/tests/package/sample_python_qrcode.py b/support/testing/tests/package/sample_python_qrcode.py new file mode 100644 index 00000000000..3dcca329da5 --- /dev/null +++ b/support/testing/tests/package/sample_python_qrcode.py @@ -0,0 +1,3 @@ +import qrcode +import qrcode.image.svg +img = qrcode.make('Some data here', image_factory=qrcode.image.svg.SvgImage) diff --git a/support/testing/tests/package/sample_python_rtoml.py b/support/testing/tests/package/sample_python_rtoml.py new file mode 100644 index 00000000000..ba1ce1634cd --- /dev/null +++ b/support/testing/tests/package/sample_python_rtoml.py @@ -0,0 +1,48 @@ +from datetime import datetime, timezone, timedelta +import rtoml + +obj = { + 'title': 'TOML Example', + 'owner': { + 'dob': datetime(1979, 5, 27, 7, 32, tzinfo=timezone(timedelta(hours=-8))), + 'name': 'Tom Preston-Werner', + }, + 'database': { + 'connection_max': 5000, + 'enabled': True, + 'ports': [8001, 8001, 8002], + 'server': '192.168.1.1', + }, +} + +loaded_obj = rtoml.load("""\ +# This is a TOML document. + +title = "TOML Example" + +[owner] +name = "Tom Preston-Werner" +dob = 1979-05-27T07:32:00-08:00 # First class dates + +[database] +server = "192.168.1.1" +ports = [8001, 8001, 8002] +connection_max = 5000 +enabled = true +""") + +assert loaded_obj == obj + +assert rtoml.dumps(obj) == """\ +title = "TOML Example" + +[owner] +dob = 1979-05-27T07:32:00-08:00 +name = "Tom Preston-Werner" + +[database] +connection_max = 5000 +enabled = true +server = "192.168.1.1" +ports = [8001, 8001, 8002] +""" diff --git a/support/testing/tests/package/sample_python_s3transfer.py b/support/testing/tests/package/sample_python_s3transfer.py new file mode 100644 index 00000000000..ff53077c9e5 --- /dev/null +++ b/support/testing/tests/package/sample_python_s3transfer.py @@ -0,0 +1 @@ +import s3transfer diff --git a/support/testing/tests/package/sample_python_scipy.py b/support/testing/tests/package/sample_python_scipy.py new file mode 100644 index 00000000000..d36f2273e74 --- /dev/null +++ b/support/testing/tests/package/sample_python_scipy.py @@ -0,0 +1,16 @@ +import numpy +import scipy.io +import scipy.special +import scipy.integrate + +cb = scipy.special.cbrt([27, 64]) +assert((cb == numpy.array([3., 4.])).all()) + +com = scipy.special.comb(5, 2, exact = False, repetition=True) +assert(com == 15.0) + +t = scipy.integrate.trapezoid([5,8,10]) +assert(t == 15.5) + +mdic = {"t": t, "label": "example"} +scipy.io.savemat("example.mat", mdic) diff --git a/support/testing/tests/package/sample_python_spake2.py b/support/testing/tests/package/sample_python_spake2.py new file mode 100644 index 00000000000..49dd914ca89 --- /dev/null +++ b/support/testing/tests/package/sample_python_spake2.py @@ -0,0 +1,22 @@ +from binascii import hexlify + +from spake2 import SPAKE2_A, SPAKE2_B + + +shared_password = b"This Is The Password!" + +alice = SPAKE2_A(shared_password) +alice_msg = alice.start() + +bob = SPAKE2_B(shared_password) +bob_msg = bob.start() + +# Alice and Bob exchange their messages... + +alice_key = alice.finish(bob_msg) +bob_key = bob.finish(alice_msg) + +print("alice_key:", hexlify(alice_key)) +print(" bob_key:", hexlify(bob_key)) + +assert alice_key == bob_key diff --git a/support/testing/tests/package/test_avocado.py b/support/testing/tests/package/test_avocado.py new file mode 100644 index 00000000000..7e83c864646 --- /dev/null +++ b/support/testing/tests/package/test_avocado.py @@ -0,0 +1,23 @@ +import os + +import infra.basetest + + +class TestAvocado(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_AVOCADO=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + img = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", img]) + self.emulator.login() + cmd = "avocado run /bin/true" + self.assertRunOk(cmd, timeout=30) + cmd = "avocado plugins" + self.assertRunOk(cmd, timeout=30) diff --git a/support/testing/tests/package/test_bash.py b/support/testing/tests/package/test_bash.py new file mode 100644 index 00000000000..f0ee8cadc12 --- /dev/null +++ b/support/testing/tests/package/test_bash.py @@ -0,0 +1,47 @@ +import os + +import infra.basetest + + +class TestBash(infra.basetest.BRTest): + config = \ + """ + BR2_arm=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_ENABLE_LOCALE_WHITELIST="" + BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y + BR2_PACKAGE_BASH=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 that we are indeed not (yet) running bash + out, _ = self.emulator.run('echo "${BASH}"') + self.assertEqual(out[0], "", "Already running bash instead of busybox' sh") + + self.assertRunOk("bash -il") + # Twist! The above command is still runing, it's just that + # bash did display the prompt we expect. Check we are indeed + # actually bash + out, _ = self.emulator.run('echo "${BASH}"') + self.assertEqual(out[0], "/bin/bash", "Not running bash") + # Exit bash, back to busybox' shell + self.emulator.run("exit 0") + + # Check that we are indeed no longer running bash + out, _ = self.emulator.run('echo "${BASH}"') + self.assertEqual(out[0], "", "Still running bash instead of busybox' sh") + + # Try to run with a non-available locale + self.assertRunOk("LC_ALL=en_US bash -il") + out, _ = self.emulator.run('echo "${BASH}"') + self.assertEqual(out[0], "/bin/bash", "Not running bash") + self.emulator.run("exit 0") diff --git a/support/testing/tests/package/test_clang.py b/support/testing/tests/package/test_clang.py new file mode 100644 index 00000000000..f36faa059a5 --- /dev/null +++ b/support/testing/tests/package/test_clang.py @@ -0,0 +1,46 @@ +import os + +import infra.basetest + +FUZZ_TIMEOUT = 120 + + +class TestClangCompilerRT(infra.basetest.BRTest): + br2_external = [infra.filepath("tests/package/br2-external/clang-compiler-rt")] + config = \ + """ + 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="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_NEEDS_HOST_OPENSSL=y + BR2_PACKAGE_COMPILER_RT=y + BR2_PACKAGE_LLVM=y + BR2_TARGET_ROOTFS_CPIO=y + BR2_TARGET_ROOTFS_CPIO_GZIP=y + # BR2_TARGET_ROOTFS_TAR is not set + BR2_PACKAGE_LIBFUZZER=y + """ + + def login(self): + img = os.path.join(self.builddir, "images", "rootfs.cpio.gz") + kern = os.path.join(self.builddir, "images", "Image") + # Sanitizers overallocate memory and the minimum that seemed to work was 512MB + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=["console=ttyAMA0"], + options=["-M", "virt", "-cpu", "cortex-a53", "-m", "512", "-initrd", img]) + self.emulator.login() + + def test_run(self): + self.login() + + # The test case verifies the application executes and that + # the symbolizer is working to decode the stack trace. + cmd = "fuzz_me 2>&1 | grep heap-buffer-overflow" + _, exit_code = self.emulator.run(cmd, FUZZ_TIMEOUT) + self.assertEqual(exit_code, 0) diff --git a/support/testing/tests/package/test_docker_compose.py b/support/testing/tests/package/test_docker_compose.py index 1ce132c2426..16027c9c3ad 100644 --- a/support/testing/tests/package/test_docker_compose.py +++ b/support/testing/tests/package/test_docker_compose.py @@ -4,6 +4,8 @@ class TestDockerCompose(infra.basetest.BRTest): + scripts = ["conf/docker-compose.yml", + "tests/package/sample_python_docker.py"] config = \ """ BR2_x86_64=y @@ -15,9 +17,11 @@ 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.204" + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.262" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="{}" + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_DOCKER=y BR2_PACKAGE_CA_CERTIFICATES=y BR2_PACKAGE_DOCKER_CLI=y BR2_PACKAGE_DOCKER_COMPOSE=y @@ -27,7 +31,7 @@ class TestDockerCompose(infra.basetest.BRTest): # BR2_TARGET_ROOTFS_TAR is not set """.format( infra.filepath("tests/package/copy-sample-script-to-target.sh"), - infra.filepath("conf/docker-compose.yml"), + " ".join([infra.filepath(i) for i in scripts]), infra.filepath("conf/docker-compose-kernel.config")) def wait_for_dockerd(self): @@ -40,12 +44,15 @@ def docker_test(self): def docker_compose_test(self): # will download container if not available, which may take some time - self.assertRunOk('docker-compose up -d', 120) + self.assertRunOk('docker compose up -d --quiet-pull', 120) # container may take some time to start - self.assertRunOk('while ! docker inspect root_busybox_1 2>&1 >/dev/null; do sleep 1; done', 120) - self.assertRunOk('wget -O /tmp/busybox http://127.0.0.1/busybox', 120) + self.assertRunOk('while ! docker inspect root-busybox-1 2>&1 >/dev/null; do sleep 1; done', 120) + self.assertRunOk('wget -q -O /tmp/busybox http://127.0.0.1/busybox', 120) self.assertRunOk('cmp /bin/busybox /tmp/busybox', 120) + def python_docker_test(self): + self.assertRunOk('python3 ./sample_python_docker.py', 120) + def test_run(self): kernel = os.path.join(self.builddir, "images", "bzImage") rootfs = os.path.join(self.builddir, "images", "rootfs.ext2") @@ -62,3 +69,4 @@ def test_run(self): self.wait_for_dockerd() self.docker_test() self.docker_compose_test() + self.python_docker_test() diff --git a/support/testing/tests/package/test_gdb.py b/support/testing/tests/package/test_gdb.py index a7b08706441..47121623499 100644 --- a/support/testing/tests/package/test_gdb.py +++ b/support/testing/tests/package/test_gdb.py @@ -91,114 +91,6 @@ def test_run(self): self.verify_gdb() -class TestGdbHostOnly9x(BaseGdb): - config = \ - infra.basetest.MINIMAL_CONFIG + \ - """ - BR2_arm=y - BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y - BR2_PACKAGE_HOST_GDB=y - BR2_GDB_VERSION_9_2=y - """ - - def test_run(self): - self.verify_host_gdb() - - -class TestGdbHostGdbserver9x(BaseGdb): - config = \ - """ - BR2_arm=y - BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y - BR2_PACKAGE_HOST_GDB=y - BR2_GDB_VERSION_9_2=y - BR2_PACKAGE_GDB=y - BR2_TARGET_ROOTFS_CPIO=y - # BR2_TARGET_ROOTFS_TAR is not set - """ - - def test_run(self): - self.verify_host_gdb() - self.boot() - self.verify_gdbserver() - - -class TestGdbHostGdbTarget9x(BaseGdb): - config = \ - """ - BR2_arm=y - BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y - BR2_PACKAGE_HOST_GDB=y - BR2_GDB_VERSION_9_2=y - BR2_PACKAGE_GDB=y - BR2_PACKAGE_GDB_DEBUGGER=y - BR2_TARGET_ROOTFS_CPIO=y - # BR2_TARGET_ROOTFS_TAR is not set - """ - - def test_run(self): - self.verify_host_gdb() - self.boot() - self.verify_gdb() - - -class TestGdbHostOnly11x(BaseGdb): - config = \ - infra.basetest.MINIMAL_CONFIG + \ - """ - BR2_arm=y - BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y - BR2_PACKAGE_HOST_GDB=y - BR2_GDB_VERSION_11=y - """ - - def test_run(self): - self.verify_host_gdb() - - -class TestGdbHostGdbserver11x(BaseGdb): - config = \ - """ - BR2_arm=y - BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y - BR2_PACKAGE_HOST_GDB=y - BR2_GDB_VERSION_11=y - BR2_PACKAGE_GDB=y - BR2_TARGET_ROOTFS_CPIO=y - # BR2_TARGET_ROOTFS_TAR is not set - """ - - def test_run(self): - self.verify_host_gdb() - self.boot() - self.verify_gdbserver() - - -class TestGdbHostGdbTarget11x(BaseGdb): - config = \ - """ - BR2_arm=y - BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y - BR2_PACKAGE_HOST_GDB=y - BR2_GDB_VERSION_11=y - BR2_PACKAGE_GDB=y - BR2_PACKAGE_GDB_DEBUGGER=y - BR2_TARGET_ROOTFS_CPIO=y - # BR2_TARGET_ROOTFS_TAR is not set - """ - - def test_run(self): - self.verify_host_gdb() - self.boot() - self.verify_gdb() - - class TestGdbArc(BaseGdb): config = \ """ diff --git a/support/testing/tests/package/test_gnupg2.py b/support/testing/tests/package/test_gnupg2.py new file mode 100644 index 00000000000..4505e1c3391 --- /dev/null +++ b/support/testing/tests/package/test_gnupg2.py @@ -0,0 +1,114 @@ +import os + +import infra.basetest + + +class TestGnupg2(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_GNUPG2=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() + + # Some common data for all the tests + plain_data = "Some plain text data" + plain_file = "file.txt" + gpg_file = plain_file + ".gpg" + asc_file = plain_file + ".asc" + sig_file = plain_file + ".sig" + good_passphrase = "Good Passphrase" + gpg_userid = "br-test@buildroot" + + # Test the program can execute + self.assertRunOk("gpg --version") + + # Generate plain text data + cmd = "echo '{}' > {}".format(plain_data, plain_file) + self.assertRunOk(cmd) + + # Test symmetric encrypt + cmd = "gpg --batch --symmetric" + cmd += " --passphrase '{}' {}".format(good_passphrase, plain_file) + self.assertRunOk(cmd) + + # Test symmetric decrypt + cmd = "gpg --batch --decrypt" + cmd += " --passphrase '{}' {}".format(good_passphrase, gpg_file) + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertIn(plain_data, output) + + # Test a failed decrypt with a bad password + cmd = "gpg --batch --decrypt" + cmd += " --passphrase 'A-Bad-Password' {}".format(gpg_file) + _, exit_code = self.emulator.run(cmd) + self.assertNotEqual(exit_code, 0) + + # Test the generation of an asymmetric key + cmd = "gpg --batch --passphrase ''" + cmd += " --quick-generate-key {} default default".format(gpg_userid) + self.assertRunOk(cmd) + + # Test asymmetric encrypt+sign + cmd = "gpg --batch --yes --encrypt --sign" + cmd += " --recipient {} {}".format(gpg_userid, plain_file) + self.assertRunOk(cmd) + + # Test asymmetric decrypt+verify + cmd = "gpg --decrypt {}".format(gpg_file) + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertIn(plain_data, output) + self.assertRegex("\n".join(output), r'gpg: Good signature') + + # Test asymmetric armored encrypt+sign + cmd = "gpg --batch --yes --armor --encrypt --sign" + cmd += " --recipient {} {}".format(gpg_userid, plain_file) + self.assertRunOk(cmd) + + # Test asymmetric armored decrypt+verify + cmd = "gpg --armor --decrypt {}".format(asc_file) + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertIn(plain_data, output) + self.assertRegex("\n".join(output), r'gpg: Good signature') + + # Test detached signature + cmd = "gpg --batch --yes --detach-sign {}".format(plain_file) + self.assertRunOk(cmd) + + # Test detached signature verification + cmd = "gpg --verify {}".format(sig_file) + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertRegex("\n".join(output), r'gpg: Good signature') + + # Test detached armored signature + cmd = "gpg --batch --yes --armor --detach-sign {}".format(plain_file) + self.assertRunOk(cmd) + + # Test detached armored signature verification + cmd = "gpg --armor --verify {}".format(asc_file) + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertRegex("\n".join(output), r'gpg: Good signature') + + # Test the signature verification of a corrupted file actually fails + cmd = "echo 'CORRUPTED' >> {}".format(plain_file) + self.assertRunOk(cmd) + + cmd = "gpg --verify {}".format(sig_file) + _, exit_code = self.emulator.run(cmd) + self.assertNotEqual(exit_code, 0) + + cmd = "gpg --armor --verify {}".format(asc_file) + _, exit_code = self.emulator.run(cmd) + self.assertNotEqual(exit_code, 0) diff --git a/support/testing/tests/package/test_highway.py b/support/testing/tests/package/test_highway.py new file mode 100644 index 00000000000..f32363e26f1 --- /dev/null +++ b/support/testing/tests/package/test_highway.py @@ -0,0 +1,22 @@ +import os + +import infra.basetest + + +class TestHighway(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_HIGHWAY=y + BR2_PACKAGE_HIGHWAY_EXAMPLES=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("hwy_benchmark", timeout=20) diff --git a/support/testing/tests/package/test_hwloc.py b/support/testing/tests/package/test_hwloc.py new file mode 100644 index 00000000000..2a776c40381 --- /dev/null +++ b/support/testing/tests/package/test_hwloc.py @@ -0,0 +1,22 @@ +import os + +import infra.basetest + + +class TestHWLoc(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_HWLOC=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("hwloc-info") + self.assertRunOk("hwloc-ls") diff --git a/support/testing/tests/package/test_libjxl.py b/support/testing/tests/package/test_libjxl.py new file mode 100644 index 00000000000..b6d5ffc9ce8 --- /dev/null +++ b/support/testing/tests/package/test_libjxl.py @@ -0,0 +1,53 @@ +import os + +import infra.basetest + + +class TestLibJXL(infra.basetest.BRTest): + # infra.basetest.BASIC_TOOLCHAIN_CONFIG is not used as it is armv5 + # and the image encoding would take too long (several minutes). + # We also add GraphicsMagick to generate and compare images for + # the test. + config = \ + """ + 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="5.15.79" + 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 + BR2_TARGET_ROOTFS_CPIO=y + BR2_TARGET_ROOTFS_CPIO_GZIP=y + # BR2_TARGET_ROOTFS_TAR is not set + BR2_PACKAGE_GRAPHICSMAGICK=y + BR2_PACKAGE_LIBJXL=y + """ + + def test_run(self): + img = os.path.join(self.builddir, "images", "rootfs.cpio.gz") + kern = os.path.join(self.builddir, "images", "Image") + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=["console=ttyAMA0"], + options=["-M", "virt", "-cpu", "cortex-a57", "-m", "256M", "-initrd", img]) + self.emulator.login() + + ref = "/var/tmp/reference.ppm" + jxl = "/var/tmp/encoded.jxl" + dec = "/var/tmp/decoded.ppm" + + cmd = "gm convert IMAGE:LOGO {}".format(ref) + self.assertRunOk(cmd) + + cmd = "cjxl {} {}".format(ref, jxl) + self.assertRunOk(cmd, timeout=30) + + cmd = "djxl {} {}".format(jxl, dec) + self.assertRunOk(cmd) + + cmd = "gm compare -metric mse -maximum-error 1e-3 {} {}".format( + ref, dec) + self.assertRunOk(cmd) diff --git a/support/testing/tests/package/test_lxc.py b/support/testing/tests/package/test_lxc.py index d98bed87611..f66b31f3bac 100644 --- a/support/testing/tests/package/test_lxc.py +++ b/support/testing/tests/package/test_lxc.py @@ -12,7 +12,7 @@ class TestLxc(infra.basetest.BRTest): BR2_TOOLCHAIN_EXTERNAL=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y - BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.204" + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.38" BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" diff --git a/support/testing/tests/package/test_msr_tools.py b/support/testing/tests/package/test_msr_tools.py new file mode 100644 index 00000000000..4d62742a5ff --- /dev/null +++ b/support/testing/tests/package/test_msr_tools.py @@ -0,0 +1,50 @@ +import os + +import infra.basetest + + +class TestMsrTools(infra.basetest.BRTest): + config = \ + """ + BR2_x86_64=y + BR2_x86_corei7=y + 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_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux.config" + BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{}" + BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y + BR2_PACKAGE_MSR_TOOLS=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """.format( + infra.filepath("tests/package/test_msr_tools/linux.config")) + + def test_run(self): + kernel = os.path.join(self.builddir, "images", "bzImage") + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot( + arch="x86_64", + kernel=kernel, kernel_cmdline=["console=ttyS0"], + options=["-cpu", "Nehalem", "-m", "320", "-initrd", cpio_file] + ) + self.emulator.login() + + # CPU ID. + cmd = "cpuid" + self.assertRunOk(cmd) + + # Write MSR. + # We write to TSC_AUX. + cmd = "wrmsr 0xc0000103 0x1234567812345678" + self.assertRunOk(cmd) + + # Read MSR. + # We read back the TSC_AUX and we verify that we read back the correct + # value. + cmd = "rdmsr 0xc0000103" + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertEqual(output[0], "1234567812345678") diff --git a/support/testing/tests/package/test_msr_tools/linux.config b/support/testing/tests/package/test_msr_tools/linux.config new file mode 100644 index 00000000000..8fe09db87ba --- /dev/null +++ b/support/testing/tests/package/test_msr_tools/linux.config @@ -0,0 +1,2 @@ +CONFIG_X86_CPUID=y +CONFIG_X86_MSR=y diff --git a/support/testing/tests/package/test_ncdu.py b/support/testing/tests/package/test_ncdu.py new file mode 100644 index 00000000000..cbbb27f751b --- /dev/null +++ b/support/testing/tests/package/test_ncdu.py @@ -0,0 +1,23 @@ +import os + +import infra.basetest + + +class TestNcdu(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_NCDU=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("ncdu --version") + self.assertRunOk("ncdu -x -o /tmp/ncdu.list /") + self.assertRunOk("grep -F '\"name\":\"ncdu\"' /tmp/ncdu.list") diff --git a/support/testing/tests/package/test_nodejs.py b/support/testing/tests/package/test_nodejs.py new file mode 100644 index 00000000000..9463c76b724 --- /dev/null +++ b/support/testing/tests/package/test_nodejs.py @@ -0,0 +1,52 @@ +import os + +import infra.basetest + + +class TestNodeJSBasic(infra.basetest.BRTest): + config = \ + """ + BR2_arm=y + BR2_cortex_a9=y + BR2_ARM_ENABLE_VFP=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_PACKAGE_NODEJS=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + BR2_ROOTFS_POST_BUILD_SCRIPT="{}" + BR2_ROOTFS_POST_SCRIPT_ARGS="{}" + """.format(infra.filepath("tests/package/copy-sample-script-to-target.sh"), + infra.filepath("tests/package/sample_nodejs_basic.js")) + + 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("node sample_nodejs_basic.js") + + +class TestNodeJSModule(infra.basetest.BRTest): + config = \ + """ + BR2_arm=y + BR2_cortex_a9=y + BR2_ARM_ENABLE_VFP=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_PACKAGE_NODEJS=y + BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL="lodash" + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + BR2_ROOTFS_POST_BUILD_SCRIPT="{}" + BR2_ROOTFS_POST_SCRIPT_ARGS="{}" + """.format(infra.filepath("tests/package/copy-sample-script-to-target.sh"), + infra.filepath("tests/package/sample_nodejs_module.js")) + + 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("node sample_nodejs_module.js") diff --git a/support/testing/tests/package/test_octave.py b/support/testing/tests/package/test_octave.py new file mode 100644 index 00000000000..cdbe2688df6 --- /dev/null +++ b/support/testing/tests/package/test_octave.py @@ -0,0 +1,79 @@ +import os + +import infra.basetest + + +class TestOctave(infra.basetest.BRTest): + # infra.basetest.BASIC_TOOLCHAIN_CONFIG cannot be used as it does + # not include gfortran. + config = \ + """ + 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="5.15.26" + 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 + BR2_TARGET_ROOTFS_CPIO=y + BR2_TARGET_ROOTFS_CPIO_GZIP=y + # BR2_TARGET_ROOTFS_TAR is not set + BR2_PACKAGE_OCTAVE=y + """ + timeout = 60 + + def octave_cmd(self, octave_expr): + return "octave --quiet --eval '{}'".format(octave_expr) + + def test_run(self): + img = os.path.join(self.builddir, "images", "rootfs.cpio.gz") + kern = os.path.join(self.builddir, "images", "Image") + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=["console=ttyAMA0"], + options=["-M", "virt", "-cpu", "cortex-a57", "-m", "512M", "-initrd", img]) + self.emulator.login() + + # Check Euler identity + cmd = self.octave_cmd("assert (exp(i*pi)+1, 0, 1e-10)") + self.assertRunOk(cmd) + + # Solve equation system example from Octave homepage + octave_expr = "b = [4; 9; 2]; " + octave_expr += "A = [ 3 4 5; 1 3 1; 3 5 9 ]; " + octave_expr += "x = A \\ b; " + octave_expr += "assert(x, [-1.5; 4; -1.5], 1e-10)" + cmd = self.octave_cmd(octave_expr) + self.assertRunOk(cmd) + + # Check octave can fail + cmd = self.octave_cmd("assert(false)") + _, exit_code = self.emulator.run(cmd) + self.assertNotEqual(exit_code, 0) + + # Check string output + string = "Hello World" + cmd = self.octave_cmd("printf(\"{}\\n\")".format(string)) + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertEqual(output, [string]) + + # Run some octave self tests + octave_modules = [ + "elfun/atan2d", + "elfun/sind", + "general/gradient", + "general/num2str", + "polynomial/poly", + "signal/fftconv", + "special-matrix/magic", + "specfun/isprime", + "statistics/corr", + "strings/str2num" + ] + + for mod in octave_modules: + cmd = self.octave_cmd('assert(test(\"{}\"),true)'.format(mod)) + self.assertRunOk(cmd, timeout=10) diff --git a/support/testing/tests/package/test_ola.py b/support/testing/tests/package/test_ola.py new file mode 100644 index 00000000000..017d6f7e3bd --- /dev/null +++ b/support/testing/tests/package/test_ola.py @@ -0,0 +1,95 @@ +import os + +import infra.basetest + + +class TestOla(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_OLA=y + BR2_PACKAGE_OLA_EXAMPLES=y + BR2_PACKAGE_OLA_PLUGIN_DUMMY=y + BR2_PACKAGE_OLA_PYTHON_BINDINGS=y + BR2_PACKAGE_OLA_WEB=y + BR2_PACKAGE_PYTHON3=y + BR2_ROOTFS_OVERLAY="{}" + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """.format( + # overlay to add a script to test ola python bindings + infra.filepath("tests/package/test_ola/rootfs-overlay")) + + 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 program executes + cmd = "olad --version" + self.assertRunOk(cmd) + + # Start the daemon and wait a bit for it to settle + cmd = "olad --daemon && sleep 2" + self.assertRunOk(cmd) + + # Check dummy plugin is loaded + cmd = "ola_plugin_info | grep -Fi dummy" + self.assertRunOk(cmd) + + # Check dummy device and port are listed + cmd = "ola_dev_info" + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertIn("Device 1: Dummy Device", output[0]) + self.assertIn("port 0, OUT Dummy Port", output[1]) + + # Create Universe 0 + cmd = "ola_patch --device 1 --port 0 --universe 0" + self.assertRunOk(cmd) + + # Check Universe 0 is created + cmd = "ola_dev_info" + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertIn("patched to universe 0", output[1]) + + # Discover Dummy device RDM UID + cmd = "ola_rdm_discover --universe 0 | head -1" + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + rdm_uid = output[0] + + # Get RDM manufacturer_label PID + cmd = "ola_rdm_get --universe 0 --uid {} manufacturer_label".format(rdm_uid) + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertEqual(output[0], "Open Lighting Project") + + # Get RDM dmx_start_address PID, checks default value is 1 + cmd = "ola_rdm_get --universe 0 --uid {} dmx_start_address".format(rdm_uid) + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertEqual(output[0], "DMX Address: 1") + + # Set RDM dmx_start_address PID to 2 + cmd = "ola_rdm_set --universe 0 --uid {} dmx_start_address 2".format(rdm_uid) + self.assertRunOk(cmd) + + # Get the new RDM dmx_start_address PID, checks value is now 2 + cmd = "ola_rdm_get --universe 0 --uid {} dmx_start_address".format(rdm_uid) + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertEqual(output[0], "DMX Address: 2") + + # Perform a full RDM discovery using python bindings. The test + # expect to find the same UID detected with the C client. + cmd = "sample_ola_rdm_discovery.py | head -1" + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertEqual(output[0], rdm_uid) + + # Test olad web interface + cmd = "wget -q -O - http://127.0.0.1:9090/ola.html | grep -F 'OLA Admin'" + self.assertRunOk(cmd) diff --git a/support/testing/tests/package/test_ola/rootfs-overlay/usr/bin/sample_ola_rdm_discovery.py b/support/testing/tests/package/test_ola/rootfs-overlay/usr/bin/sample_ola_rdm_discovery.py new file mode 100755 index 00000000000..c2aa0733bbf --- /dev/null +++ b/support/testing/tests/package/test_ola/rootfs-overlay/usr/bin/sample_ola_rdm_discovery.py @@ -0,0 +1,24 @@ +#! /usr/bin/env python3 + +import sys + +from ola.ClientWrapper import ClientWrapper + + +def show_uids(state, uids): + if state.Succeeded(): + for uid in uids: + print(str(uid)) + else: + print('Error: %s' % state.message, file=sys.stderr) + wrapper.Stop() + + +wrapper = ClientWrapper() +client = wrapper.Client() +universe = 0 +full_discovery = True + +client.RunRDMDiscovery(universe, full_discovery, show_uids) + +wrapper.Run() diff --git a/support/testing/tests/package/test_perftest.py b/support/testing/tests/package/test_perftest.py new file mode 100644 index 00000000000..680b70d7841 --- /dev/null +++ b/support/testing/tests/package/test_perftest.py @@ -0,0 +1,48 @@ +import os + +import infra.basetest + + +class TestPerftest(infra.basetest.BRTest): + + config = \ + """ + 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="5.15.91" + 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="{}" + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + BR2_TARGET_ROOTFS_CPIO=y + BR2_TARGET_ROOTFS_CPIO_GZIP=y + # BR2_TARGET_ROOTFS_TAR is not set + BR2_PACKAGE_IPROUTE2=y + BR2_PACKAGE_LIBMNL=y + BR2_PACKAGE_RDMA_CORE=y + BR2_PACKAGE_PERFTEST=y + """.format( + infra.filepath("tests/package/test_rdma_core/linux-rdma.fragment") + ) + + def test_run(self): + img = os.path.join(self.builddir, "images", "rootfs.cpio.gz") + kern = os.path.join(self.builddir, "images", "Image") + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=["console=ttyAMA0"], + options=["-M", "virt", "-cpu", "cortex-a57", "-m", "512M", "-initrd", img]) + self.emulator.login() + + # Add the rxe0 interface + self.assertRunOk("ip link set dev eth0 up") + self.assertRunOk("rdma link add rxe0 type rxe netdev eth0") + + # start a server + self.assertRunOk("ib_read_bw > /dev/null 2>&1 &") + + # start a client + self.assertRunOk("sleep 1 && ib_read_bw 127.0.0.1") diff --git a/support/testing/tests/package/test_pixz.py b/support/testing/tests/package/test_pixz.py new file mode 100644 index 00000000000..eeff10eaa1b --- /dev/null +++ b/support/testing/tests/package/test_pixz.py @@ -0,0 +1,40 @@ +import os + +import infra.basetest + + +class TestPixz(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_PIXZ=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() + + # Prepare input file with random data and zeroes. + # We keep the size small (4 MB) for the sake of test time. + cmd = "dd if=/dev/urandom of=orig bs=1M count=2 && " \ + "dd if=/dev/zero of=orig bs=1M count=2 seek=2" + self.assertRunOk(cmd) + + # Compress. + # We ask for 3 threads for good measure but with a very small file on a + # uniprocessor qemu this is only a light validation. + cmd = "cp -v orig compressed && pixz -p 3 compressed" + self.assertRunOk(cmd, timeout=60) + + # Uncompress. + cmd = "cp -v compressed.xz uncompressed.xz && pixz -d uncompressed.xz" + self.assertRunOk(cmd) + + # Verify. + # The ls is there for debugging. + cmd = "ls -l && cmp orig uncompressed" + self.assertRunOk(cmd) diff --git a/support/testing/tests/package/test_polkit.py b/support/testing/tests/package/test_polkit.py index 502d38d13ed..3da63c437b4 100644 --- a/support/testing/tests/package/test_polkit.py +++ b/support/testing/tests/package/test_polkit.py @@ -15,6 +15,10 @@ class TestPolkitInfra(infra.basetest.BRTest): BR2_PACKAGE_POLKIT=y BR2_PACKAGE_POLKIT_RULES_TEST=y """ + rule_paths = [ + "/etc/polkit-1/rules.d", + "/usr/share/polkit-1/rules.d" + ] def base_test_run(self): cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") @@ -36,17 +40,23 @@ class TestPolkitSystemd(TestPolkitInfra): def test_run(self): TestPolkitInfra.base_test_run(self) - cmd = "su brtest -c '/bin/systemctl restart systemd-timesyncd.service'" - _, exit_code = self.emulator.run(cmd, 10) - self.assertEqual(exit_code, 1) + rule_file = "systemd-timesyncd-restart.rules" + for rule_path in TestPolkitInfra.rule_paths: + cmd = "su brtest -c '/bin/systemctl restart systemd-timesyncd.service'" + _, exit_code = self.emulator.run(cmd, 10) + self.assertEqual(exit_code, 1) - cmd = "mv /root/systemd-timesyncd-restart.rules /etc/polkit-1/rules.d" - _, exit_code = self.emulator.run(cmd, 10) - self.assertEqual(exit_code, 0) + cmd = "cp /root/{file} {path}".format(file=rule_file, path=rule_path) + _, exit_code = self.emulator.run(cmd, 10) + self.assertEqual(exit_code, 0) - cmd = "su brtest -c '/bin/systemctl restart systemd-timesyncd.service'" - _, exit_code = self.emulator.run(cmd, 10) - self.assertEqual(exit_code, 0) + cmd = "su brtest -c '/bin/systemctl restart systemd-timesyncd.service'" + _, exit_code = self.emulator.run(cmd, 10) + self.assertEqual(exit_code, 0) + + cmd = "rm {path}/{file}".format(file=rule_file, path=rule_path) + _, exit_code = self.emulator.run(cmd, 10) + self.assertEqual(exit_code, 0) class TestPolkitInitd(TestPolkitInfra): @@ -55,16 +65,22 @@ class TestPolkitInitd(TestPolkitInfra): def test_run(self): TestPolkitInfra.base_test_run(self) - cmd = "su brtest -c 'pkexec hello-polkit'" - output, exit_code = self.emulator.run(cmd, 10) - self.assertEqual(exit_code, 127) - self.assertEqual(output[0], "Error executing command as another user: Not authorized") + rule_file = "hello-polkit.rules" + for rule_path in TestPolkitInfra.rule_paths: + cmd = "su brtest -c 'pkexec hello-polkit'" + output, exit_code = self.emulator.run(cmd, 10) + self.assertEqual(exit_code, 127) + self.assertEqual(output[0], "Error executing command as another user: Not authorized") + + cmd = "cp /root/{file} {path}/{file}".format(file=rule_file, path=rule_path) + _, exit_code = self.emulator.run(cmd, 10) + self.assertEqual(exit_code, 0) - cmd = "mv /root/hello-polkit.rules /etc/polkit-1/rules.d/hello-polkit.rules" - _, exit_code = self.emulator.run(cmd, 10) - self.assertEqual(exit_code, 0) + cmd = "su brtest -c 'pkexec hello-polkit'" + output, exit_code = self.emulator.run(cmd, 10) + self.assertEqual(exit_code, 0) + self.assertEqual(output[0], "Hello polkit!") - cmd = "su brtest -c 'pkexec hello-polkit'" - output, exit_code = self.emulator.run(cmd, 10) - self.assertEqual(exit_code, 0) - self.assertEqual(output[0], "Hello polkit!") + cmd = "rm {path}/{file}".format(file=rule_file, path=rule_path) + _, exit_code = self.emulator.run(cmd, 10) + self.assertEqual(exit_code, 0) diff --git a/support/testing/tests/package/test_python.py b/support/testing/tests/package/test_python.py index f29aff6624a..d6f69a83c76 100644 --- a/support/testing/tests/package/test_python.py +++ b/support/testing/tests/package/test_python.py @@ -27,7 +27,7 @@ def math_floor_test(self, timeout=-1): self.assertRunOk(cmd, timeout) def libc_time_test(self, timeout=-1): - cmd = self.interpreter + " -c 'from __future__ import print_function;" + cmd = self.interpreter + " -c '" cmd += "import ctypes;" cmd += "libc = ctypes.cdll.LoadLibrary(\"libc.so.1\");" cmd += "print(libc.time(None))'" @@ -39,7 +39,7 @@ def zlib_test(self, timeout=-1): self.assertEqual(exit_code, 1) -class TestPython3(TestPythonBase): +class TestPython3Pyc(TestPythonBase): config = TestPythonBase.config + \ """ BR2_PACKAGE_PYTHON3=y @@ -53,6 +53,36 @@ def test_run(self): self.zlib_test() +class TestPython3Py(TestPythonBase): + config = TestPythonBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON3_PY_ONLY=y + """ + + def test_run(self): + self.login() + self.version_test("Python 3") + self.math_floor_test() + self.libc_time_test() + self.zlib_test() + + +class TestPython3PyPyc(TestPythonBase): + config = TestPythonBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON3_PY_PYC=y + """ + + def test_run(self): + self.login() + self.version_test("Python 3") + self.math_floor_test() + self.libc_time_test() + self.zlib_test() + + class TestPythonPackageBase(TestPythonBase): """Common class to test a python package. diff --git a/support/testing/tests/package/test_python_boto3.py b/support/testing/tests/package/test_python_boto3.py index 756495fec95..126ddae63a9 100644 --- a/support/testing/tests/package/test_python_boto3.py +++ b/support/testing/tests/package/test_python_boto3.py @@ -1,4 +1,5 @@ from tests.package.test_python import TestPythonPackageBase +import os class TestPythonPy3Boto3(TestPythonPackageBase): @@ -7,6 +8,16 @@ class TestPythonPy3Boto3(TestPythonPackageBase): """ BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_BOTO3=y + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_ROOTFS_EXT2_SIZE="120M" """ sample_scripts = ["tests/package/sample_python_boto3.py"] timeout = 10 + + def login(self): + ext2_file = os.path.join(self.builddir, "images", "rootfs.ext2") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-drive", "file=%s,if=scsi,format=raw" % ext2_file], + kernel_cmdline=["rootwait", "root=/dev/sda"]) + self.emulator.login() diff --git a/support/testing/tests/package/test_python_botocore.py b/support/testing/tests/package/test_python_botocore.py index 6336c5658f9..48c2f3cc025 100644 --- a/support/testing/tests/package/test_python_botocore.py +++ b/support/testing/tests/package/test_python_botocore.py @@ -1,4 +1,5 @@ from tests.package.test_python import TestPythonPackageBase +import os class TestPythonPy3Botocore(TestPythonPackageBase): @@ -7,6 +8,16 @@ class TestPythonPy3Botocore(TestPythonPackageBase): """ BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_BOTOCORE=y + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_ROOTFS_EXT2_SIZE="120M" """ sample_scripts = ["tests/package/sample_python_botocore.py"] timeout = 10 + + def login(self): + ext2_file = os.path.join(self.builddir, "images", "rootfs.ext2") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-drive", "file=%s,if=scsi,format=raw" % ext2_file], + kernel_cmdline=["rootwait", "root=/dev/sda"]) + self.emulator.login() diff --git a/support/testing/tests/package/test_python_construct.py b/support/testing/tests/package/test_python_construct.py new file mode 100644 index 00000000000..3c51dc31bbe --- /dev/null +++ b/support/testing/tests/package/test_python_construct.py @@ -0,0 +1,12 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3Construct(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_CONSTRUCT=y + """ + sample_scripts = ["tests/package/sample_python_construct.py"] + timeout = 10 diff --git a/support/testing/tests/package/test_python_crossbar.py b/support/testing/tests/package/test_python_crossbar.py index 83649aeec2a..178b16be829 100644 --- a/support/testing/tests/package/test_python_crossbar.py +++ b/support/testing/tests/package/test_python_crossbar.py @@ -1,4 +1,5 @@ from tests.package.test_python import TestPythonPackageBase +import os class TestPythonPy3Crossbar(TestPythonPackageBase): @@ -13,8 +14,16 @@ class TestPythonPy3Crossbar(TestPythonPackageBase): BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE=y BR2_PACKAGE_PYTHON3=y BR2_PACKAGE_PYTHON_CROSSBAR=y - BR2_TARGET_ROOTFS_CPIO=y - # BR2_TARGET_ROOTFS_TAR is not set + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_ROOTFS_EXT2_SIZE="120M" """ sample_scripts = ["tests/package/sample_python_crossbar.py"] timeout = 60 + + def login(self): + ext2_file = os.path.join(self.builddir, "images", "rootfs.ext2") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-drive", "file=%s,if=scsi,format=raw" % ext2_file], + kernel_cmdline=["rootwait", "root=/dev/sda"]) + self.emulator.login() diff --git a/support/testing/tests/package/test_python_dbus_fast.py b/support/testing/tests/package/test_python_dbus_fast.py new file mode 100644 index 00000000000..5f67cfd8cc3 --- /dev/null +++ b/support/testing/tests/package/test_python_dbus_fast.py @@ -0,0 +1,40 @@ +import textwrap + + +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3DBusFast(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_DBUS=y + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_DBUS_FAST=y + """ + sample_scripts = ["tests/package/sample_python_dbus_fast.py"] + + def run_sample_scripts(self): + config = \ + """ + + + + + + + + """ + config = textwrap.dedent(config) + config_dir = "/etc/dbus-1/system.d" + config_fn = "dbus.fast.sample.conf" + + # Setup and reload D-Bus configuration + self.emulator.run("mkdir -p " + config_dir) + self.emulator.run("cat > " + config_dir + "/" + config_fn + + " < /tmp/urandom.sha256", - # Check ZFS - "zpool export pool", - "zpool import pool -d /tmp/container1.raw -d /tmp/container2.raw", - "dd conv=notrunc bs=1M count=32 seek=16 if=/dev/urandom of=/tmp/container1.raw", - "zpool scrub -w pool", - "sha256sum -c /tmp/urandom.sha256", - "zpool status -v", - # Check PyZFS - "arc_summary", - ] - for cmd in cmds: - self.assertRunOk(cmd) + +class TestZfsMusl(TestZfsBase): + config = TestZfsBase.config + \ + """ + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_MUSL_STABLE=y + """ + + def test_run(self): + TestZfsBase.base_test_run(self) diff --git a/support/testing/tests/toolchain/test_aarch64_64k.py b/support/testing/tests/toolchain/test_aarch64_64k.py new file mode 100644 index 00000000000..c038e9960f6 --- /dev/null +++ b/support/testing/tests/toolchain/test_aarch64_64k.py @@ -0,0 +1,66 @@ +import os +import re + +import infra.basetest + + +class TestAarch64Pages64kBase(infra.basetest.BRTest): + __test__ = False + config = \ + """ + BR2_aarch64=y + BR2_ARM64_PAGE_SIZE_64K=y + BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.18" + 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 + BR2_TARGET_ROOTFS_CPIO=y + BR2_TARGET_ROOTFS_CPIO_GZIP=y + """ + + def login(self): + img = os.path.join(self.builddir, "images", "rootfs.cpio.gz") + kern = os.path.join(self.builddir, "images", "Image") + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=["console=ttyAMA0"], + options=["-M", "virt", "-cpu", "cortex-a57", "-m", "512M", "-initrd", img]) + self.emulator.login() + + def test_run(self): + self.login() + + cmd = "dmesg | grep 'Dentry cache'" + output, exit_code = self.emulator.run(cmd, 120) + r = re.match(r".*Dentry cache hash table entries: [0-9]* \(order: ([0-9]*), ([0-9]*) bytes.*", output[0]) + order = int(r.group(1)) + size = int(r.group(2)) + self.assertEqual(2 ** order * 64 * 1024, size) + + +class TestAarch64Pages64kGlibc(TestAarch64Pages64kBase): + __test__ = True + config = TestAarch64Pages64kBase.config + \ + """ + BR2_TOOLCHAIN_BUILDROOT_GLIBC=y + """ + + +class TestAarch64Pages64kuClibc(TestAarch64Pages64kBase): + __test__ = True + config = TestAarch64Pages64kBase.config + \ + """ + BR2_TOOLCHAIN_BUILDROOT_UCLIBC=y + """ + + +class TestAarch64Pages64kMusl(TestAarch64Pages64kBase): + __test__ = True + config = TestAarch64Pages64kBase.config + \ + """ + BR2_TOOLCHAIN_BUILDROOT_MUSL=y + """ diff --git a/support/testing/tests/toolchain/test_external_bootlin.py b/support/testing/tests/toolchain/test_external_bootlin.py index cf6174303e9..96a8780d361 100644 --- a/support/testing/tests/toolchain/test_external_bootlin.py +++ b/support/testing/tests/toolchain/test_external_bootlin.py @@ -521,6 +521,102 @@ def test_run(self): TestExternalToolchain.common_check(self) +class TestExternalToolchainBootlinArmebv7eabihfGlibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_armeb=y + BR2_cortex_a8=y + BR2_ARM_EABIHF=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_GLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "armeb-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinArmebv7eabihfGlibcStable(TestExternalToolchain): + config = """ + BR2_armeb=y + BR2_cortex_a8=y + BR2_ARM_EABIHF=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_GLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "armeb-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinArmebv7eabihfMuslBleedingEdge(TestExternalToolchain): + config = """ + BR2_armeb=y + BR2_cortex_a8=y + BR2_ARM_EABIHF=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_MUSL_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "armeb-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinArmebv7eabihfMuslStable(TestExternalToolchain): + config = """ + BR2_armeb=y + BR2_cortex_a8=y + BR2_ARM_EABIHF=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_MUSL_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "armeb-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinArmebv7eabihfUclibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_armeb=y + BR2_cortex_a8=y + BR2_ARM_EABIHF=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_UCLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "armeb-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinArmebv7eabihfUclibcStable(TestExternalToolchain): + config = """ + BR2_armeb=y + BR2_cortex_a8=y + BR2_ARM_EABIHF=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_UCLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "armeb-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + class TestExternalToolchainBootlinArmv7mUclibcBleedingEdge(TestExternalToolchain): config = """ BR2_arm=y @@ -1497,6 +1593,34 @@ def test_run(self): TestExternalToolchain.common_check(self) +class TestExternalToolchainBootlinOpenriscGlibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_or1k=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_GLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "or1k-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinOpenriscGlibcStable(TestExternalToolchain): + config = """ + BR2_or1k=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_GLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "or1k-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + class TestExternalToolchainBootlinOpenriscMuslBleedingEdge(TestExternalToolchain): config = """ BR2_or1k=y @@ -2056,6 +2180,7 @@ class TestExternalToolchainBootlinRiscv64lp64dGlibcBleedingEdge(TestExternalTool BR2_riscv_g=y BR2_RISCV_64=y BR2_RISCV_ABI_LP64D=y + BR2_USE_MMU=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_GLIBC_BLEEDING_EDGE=y @@ -2073,6 +2198,7 @@ class TestExternalToolchainBootlinRiscv64lp64dGlibcStable(TestExternalToolchain) BR2_riscv_g=y BR2_RISCV_64=y BR2_RISCV_ABI_LP64D=y + BR2_USE_MMU=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_GLIBC_STABLE=y @@ -2090,6 +2216,7 @@ class TestExternalToolchainBootlinRiscv64lp64dMuslBleedingEdge(TestExternalToolc BR2_riscv_g=y BR2_RISCV_64=y BR2_RISCV_ABI_LP64D=y + BR2_USE_MMU=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_MUSL_BLEEDING_EDGE=y @@ -2107,6 +2234,7 @@ class TestExternalToolchainBootlinRiscv64lp64dMuslStable(TestExternalToolchain): BR2_riscv_g=y BR2_RISCV_64=y BR2_RISCV_ABI_LP64D=y + BR2_USE_MMU=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_MUSL_STABLE=y @@ -2124,6 +2252,7 @@ class TestExternalToolchainBootlinRiscv64lp64dUclibcBleedingEdge(TestExternalToo BR2_riscv_g=y BR2_RISCV_64=y BR2_RISCV_ABI_LP64D=y + BR2_USE_MMU=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_UCLIBC_BLEEDING_EDGE=y @@ -2141,6 +2270,7 @@ class TestExternalToolchainBootlinRiscv64lp64dUclibcStable(TestExternalToolchain BR2_riscv_g=y BR2_RISCV_64=y BR2_RISCV_ABI_LP64D=y + BR2_USE_MMU=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_UCLIBC_STABLE=y @@ -2152,6 +2282,36 @@ def test_run(self): TestExternalToolchain.common_check(self) +class TestExternalToolchainBootlinS390xz13GlibcBleedingEdge(TestExternalToolchain): + config = """ + BR2_s390x=y + BR2_s390x_z13=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_GLIBC_BLEEDING_EDGE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "s390x-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + +class TestExternalToolchainBootlinS390xz13GlibcStable(TestExternalToolchain): + config = """ + BR2_s390x=y + BR2_s390x_z13=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_GLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "s390x-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + class TestExternalToolchainBootlinShsh4GlibcBleedingEdge(TestExternalToolchain): config = """ BR2_sh=y @@ -2467,6 +2627,21 @@ def test_run(self): TestExternalToolchain.common_check(self) +class TestExternalToolchainBootlinX8664v2GlibcStable(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64_v2=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_GLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + class TestExternalToolchainBootlinX8664v2MuslBleedingEdge(TestExternalToolchain): config = """ BR2_x86_64=y @@ -2482,6 +2657,21 @@ def test_run(self): TestExternalToolchain.common_check(self) +class TestExternalToolchainBootlinX8664v2MuslStable(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64_v2=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_MUSL_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + class TestExternalToolchainBootlinX8664v2UclibcBleedingEdge(TestExternalToolchain): config = """ BR2_x86_64=y @@ -2497,6 +2687,21 @@ def test_run(self): TestExternalToolchain.common_check(self) +class TestExternalToolchainBootlinX8664v2UclibcStable(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64_v2=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_UCLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + class TestExternalToolchainBootlinX8664v3GlibcBleedingEdge(TestExternalToolchain): config = """ BR2_x86_64=y @@ -2512,6 +2717,21 @@ def test_run(self): TestExternalToolchain.common_check(self) +class TestExternalToolchainBootlinX8664v3GlibcStable(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64_v3=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_GLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + class TestExternalToolchainBootlinX8664v3MuslBleedingEdge(TestExternalToolchain): config = """ BR2_x86_64=y @@ -2527,6 +2747,21 @@ def test_run(self): TestExternalToolchain.common_check(self) +class TestExternalToolchainBootlinX8664v3MuslStable(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64_v3=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_MUSL_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + class TestExternalToolchainBootlinX8664v3UclibcBleedingEdge(TestExternalToolchain): config = """ BR2_x86_64=y @@ -2542,6 +2777,21 @@ def test_run(self): TestExternalToolchain.common_check(self) +class TestExternalToolchainBootlinX8664v3UclibcStable(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64_v3=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_UCLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + class TestExternalToolchainBootlinX8664v4GlibcBleedingEdge(TestExternalToolchain): config = """ BR2_x86_64=y @@ -2557,6 +2807,21 @@ def test_run(self): TestExternalToolchain.common_check(self) +class TestExternalToolchainBootlinX8664v4GlibcStable(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64_v4=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_GLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + class TestExternalToolchainBootlinX8664v4MuslBleedingEdge(TestExternalToolchain): config = """ BR2_x86_64=y @@ -2572,6 +2837,21 @@ def test_run(self): TestExternalToolchain.common_check(self) +class TestExternalToolchainBootlinX8664v4MuslStable(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64_v4=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_MUSL_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + class TestExternalToolchainBootlinX8664v4UclibcBleedingEdge(TestExternalToolchain): config = """ BR2_x86_64=y @@ -2587,6 +2867,21 @@ def test_run(self): TestExternalToolchain.common_check(self) +class TestExternalToolchainBootlinX8664v4UclibcStable(TestExternalToolchain): + config = """ + BR2_x86_64=y + BR2_x86_x86_64_v4=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_UCLIBC_STABLE=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + toolchain_prefix = "x86_64-linux" + + def test_run(self): + TestExternalToolchain.common_check(self) + + class TestExternalToolchainBootlinX8664corei7GlibcBleedingEdge(TestExternalToolchain): config = """ BR2_x86_64=y diff --git a/support/testing/tests/utils/br2-external/.checkpackageignore b/support/testing/tests/utils/br2-external/.checkpackageignore new file mode 100644 index 00000000000..efb76801738 --- /dev/null +++ b/support/testing/tests/utils/br2-external/.checkpackageignore @@ -0,0 +1 @@ +package/external/external.mk PackageHeader diff --git a/support/testing/tests/utils/br2-external/package/.checkpackageignore b/support/testing/tests/utils/br2-external/package/.checkpackageignore new file mode 100644 index 00000000000..5f4a5e11876 --- /dev/null +++ b/support/testing/tests/utils/br2-external/package/.checkpackageignore @@ -0,0 +1 @@ +external/external.mk PackageHeader diff --git a/support/testing/tests/utils/br2-external/package/.checkpackageignore_outdated b/support/testing/tests/utils/br2-external/package/.checkpackageignore_outdated new file mode 100644 index 00000000000..1df59f3bed3 --- /dev/null +++ b/support/testing/tests/utils/br2-external/package/.checkpackageignore_outdated @@ -0,0 +1 @@ +external/external.mk Indent NewlineAtEof PackageHeader diff --git a/support/testing/tests/utils/br2-external/utils/x-shellscript b/support/testing/tests/utils/br2-external/utils/x-shellscript new file mode 100755 index 00000000000..a7de4124bd1 --- /dev/null +++ b/support/testing/tests/utils/br2-external/utils/x-shellscript @@ -0,0 +1,2 @@ +#!/bin/bash +unused="text" diff --git a/support/testing/tests/utils/test_check_package.py b/support/testing/tests/utils/test_check_package.py index c70ba02324a..146c4521512 100644 --- a/support/testing/tests/utils/test_check_package.py +++ b/support/testing/tests/utils/test_check_package.py @@ -75,6 +75,12 @@ def assert_warnings_generated_for_file(self, stderr): generated = int(stderr[1].split()[0]) self.assertGreater(generated, 0) + def assert_no_warnings_generated_for_file(self, stderr): + """Infer from check-package stderr if no warning was generated and fail otherwise.""" + self.assertIn("warnings generated", stderr[1], stderr) + generated = int(stderr[1].split()[0]) + self.assertEqual(generated, 0) + def test_run(self): """Test the various ways the script can be called in a simple top to bottom sequence.""" @@ -201,3 +207,46 @@ def test_run(self): self.assert_file_was_processed(m) self.assert_warnings_generated_for_file(m) self.assertIn("{}:1: should be 80 hashes (http://nightly.buildroot.org/#writing-rules-mk)".format(abs_file), w) + + # br2-external with ignore list + topdir_path = infra.filepath("tests/utils/br2-external") + topdir_file = os.path.join(topdir_path, "package/external/external.mk") + subdir_path = infra.filepath("tests/utils/br2-external/package") + subdir_file = os.path.join(subdir_path, "external/external.mk") + + w, m = call_script(["check-package", "--ignore-list=.checkpackageignore", "-b", topdir_file], + self.WITH_UTILS_IN_PATH, topdir_path) + self.assert_file_was_processed(m) + self.assert_no_warnings_generated_for_file(m) + + w, m = call_script(["check-package", "--ignore-list=.checkpackageignore", "-b", subdir_file], + self.WITH_UTILS_IN_PATH, subdir_path) + self.assert_file_was_processed(m) + self.assert_no_warnings_generated_for_file(m) + + w, m = call_script(["check-package", "--ignore-list=.checkpackageignore_outdated", "-b", subdir_file], + self.WITH_UTILS_IN_PATH, subdir_path) + self.assert_file_was_processed(m) + self.assert_warnings_generated_for_file(m) + self.assertIn("{}:0: Indent was expected to fail, did you fix the file and forget to update .checkpackageignore_outdated?" + .format(subdir_file), w) + self.assertIn("{}:0: NewlineAtEof was expected to fail, did you fix the file and forget to update " + ".checkpackageignore_outdated?" + .format(subdir_file), w) + + # shell scripts are tested using shellcheck + rel_file = "utils/x-shellscript" + abs_path = infra.filepath("tests/utils/br2-external") + abs_file = os.path.join(abs_path, rel_file) + + w, m = call_script(["check-package", "-b", rel_file], + self.WITH_UTILS_IN_PATH, abs_path) + self.assert_file_was_processed(m) + self.assert_warnings_generated_for_file(m) + self.assertIn("{}:0: run 'shellcheck' and fix the warnings".format(rel_file), w) + + w, m = call_script(["check-package", "-b", abs_file], + self.WITH_UTILS_IN_PATH, infra.basepath()) + self.assert_file_was_processed(m) + self.assert_warnings_generated_for_file(m) + self.assertIn("{}:0: run 'shellcheck' and fix the warnings".format(abs_file), w) diff --git a/support/testing/tests/utils/test_get_developers.py b/support/testing/tests/utils/test_get_developers.py new file mode 100644 index 00000000000..ffc01f6ce73 --- /dev/null +++ b/support/testing/tests/utils/test_get_developers.py @@ -0,0 +1,170 @@ +"""Test cases for utils/get-developers. + +It does not inherit from infra.basetest.BRTest and therefore does not generate +a logfile. Only when the tests fail there will be output to the console. + +The file syntax is already tested by the GitLab-CI job check-DEVELOPERS. +""" +import os +import subprocess +import tempfile +import unittest + +import infra + + +def call_script(args, env, cwd): + """Call a script and return stdout and stderr as lists and the exit code.""" + proc = subprocess.Popen(args, cwd=cwd, stdout=subprocess.PIPE, + stderr=subprocess.PIPE, env=env, + universal_newlines=True) + out, err = proc.communicate() + return out.splitlines(), err.splitlines(), proc.returncode + + +def call_get_developers(cmd, args, env, cwd, developers_content): + """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) + + +class TestGetDevelopers(unittest.TestCase): + """Test the various ways the script can be called in a simple top to bottom sequence.""" + + WITH_EMPTY_PATH = {} + WITH_UTILS_IN_PATH = {"PATH": infra.basepath("utils") + ":" + os.environ["PATH"]} + + def test_run(self): + topdir = infra.basepath() + + # 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) + + # -v generating error, called from the main dir + developers = b'text1\n' + out, err, rc = call_get_developers("./utils/get-developers", ["-v"], self.WITH_EMPTY_PATH, topdir, developers) + self.assertIn("Syntax error in DEVELOPERS file, line 1: 'text1'", err) + self.assertEqual(rc, 1) + self.assertEqual(len(out), 0) + self.assertEqual(len(err), 1) + + # -v generating error, called from path + developers = b'text2\n' + out, err, rc = call_get_developers("get-developers", ["-v"], self.WITH_UTILS_IN_PATH, topdir, developers) + self.assertIn("Syntax error in DEVELOPERS file, line 1: 'text2'", err) + self.assertEqual(rc, 1) + self.assertEqual(len(out), 0) + self.assertEqual(len(err), 1) + + # -v generating error for file entry with no developer entry + developers = b'# comment\n' \ + b'\n' \ + b'F:\tutils/get-developers\n' \ + b'\n' \ + b'N:\tAuthor2 \n' \ + b'F:\tutils/get-developers\n' + out, err, rc = call_get_developers("get-developers", ["-v"], self.WITH_UTILS_IN_PATH, topdir, developers) + self.assertIn("Syntax error in DEVELOPERS file, line 4", err) + self.assertEqual(rc, 1) + self.assertEqual(len(out), 0) + self.assertEqual(len(err), 1) + + # -v generating error for developer entry with no file entries, stopping on first error + developers = b'# comment\n' \ + b'# comment\n' \ + b'\n' \ + b'N:\tAuthor1 \n' \ + b'N:\tAuthor2 \n' \ + b'N:\tAuthor3 \n' \ + b'F:\tutils/get-developers\n' + out, err, rc = call_get_developers("get-developers", ["-v"], self.WITH_UTILS_IN_PATH, topdir, developers) + self.assertIn("Syntax error in DEVELOPERS file, line 4", err) + self.assertEqual(rc, 1) + self.assertEqual(len(out), 0) + self.assertEqual(len(err), 1) + + # -v not generating error for developer entry with empty list of file entries + developers = b'# comment\n' \ + b'# comment\n' \ + b'\n' \ + b'N:\tAuthor1 \n' \ + b'\n' \ + b'N:\tAuthor2 \n' \ + b'\n' \ + b'N:\tAuthor3 \n' \ + b'F:\tutils/get-developers\n' + out, err, rc = call_get_developers("get-developers", ["-v"], self.WITH_UTILS_IN_PATH, topdir, developers) + self.assertEqual(rc, 0) + self.assertEqual(len(out), 0) + self.assertEqual(len(err), 0) + + # -v generating warning for old file entry + developers = b'N:\tAuthor \n' \ + b'F:\tpath/that/does/not/exists/1\n' \ + b'F:\tpath/that/does/not/exists/2\n' + out, err, rc = call_get_developers("get-developers", ["-v"], self.WITH_UTILS_IN_PATH, topdir, developers) + self.assertIn("WARNING: 'path/that/does/not/exists/1' doesn't match any file, line 2", err) + self.assertIn("WARNING: 'path/that/does/not/exists/2' doesn't match any file, line 3", err) + self.assertEqual(rc, 0) + self.assertEqual(len(out), 0) + self.assertEqual(len(err), 2) + + # -c generating warning and printing lots of files with no developer + developers = b'N:\tAuthor \n' \ + b'F:\tpath/that/does/not/exists/1\n' \ + b'F:\tpath/that/does/not/exists/2\n' + out, err, rc = call_get_developers("./utils/get-developers", ["-c"], self.WITH_EMPTY_PATH, topdir, developers) + self.assertIn("WARNING: 'path/that/does/not/exists/1' doesn't match any file, line 2", err) + self.assertIn("WARNING: 'path/that/does/not/exists/2' doesn't match any file, line 3", err) + self.assertEqual(rc, 0) + self.assertGreater(len(out), 1000) + self.assertEqual(len(err), 2) + + # -c printing lots of files with no developer + developers = b'# comment\n' \ + b'\n' \ + b'N:\tAuthor \n' \ + b'F:\tutils/get-developers\n' + out, err, rc = call_get_developers("./utils/get-developers", ["-c"], self.WITH_EMPTY_PATH, topdir, developers) + self.assertEqual(rc, 0) + self.assertGreater(len(out), 1000) + self.assertEqual(len(err), 0) + + # -p lists more than one developer + developers = b'N:\tdev1\n' \ + b'F:\ttoolchain/\n' \ + b'\n' \ + b'N:\tdev2\n' \ + b'F:\ttoolchain/\n' + out, err, rc = call_get_developers("./utils/get-developers", ["-p", "toolchain"], self.WITH_EMPTY_PATH, topdir, developers) + self.assertIn("dev1", out) + self.assertIn("dev2", out) + self.assertEqual(rc, 0) + self.assertEqual(len(err), 0) + + # 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) + + # patchfile from topdir and from elsewhere + abs_path = infra.filepath("tests/utils/test_get_developers/") + rel_file = "0001-package-binutils-change-.mk.patch" + abs_file = os.path.join(abs_path, rel_file) + developers = b'N:\tdev1\n' \ + b'F:\tpackage/binutils/\n' + out, err, rc = call_get_developers("./utils/get-developers", [abs_file], self.WITH_EMPTY_PATH, topdir, developers) + self.assertIn('git send-email --to buildroot@buildroot.org --cc "dev1"', out) + self.assertEqual(rc, 0) + self.assertEqual(len(err), 0) + out, err, rc = call_get_developers("get-developers", [rel_file], self.WITH_UTILS_IN_PATH, abs_path, developers) + self.assertIn('git send-email --to buildroot@buildroot.org --cc "dev1"', out) + self.assertEqual(rc, 0) + self.assertEqual(len(err), 0) diff --git a/support/testing/tests/utils/test_get_developers/0001-package-binutils-change-.mk.patch b/support/testing/tests/utils/test_get_developers/0001-package-binutils-change-.mk.patch new file mode 100644 index 00000000000..46ebeaa8f13 --- /dev/null +++ b/support/testing/tests/utils/test_get_developers/0001-package-binutils-change-.mk.patch @@ -0,0 +1,23 @@ +From f213fd29c1015a3afee9a3fde0dd7ce6c6325802 Mon Sep 17 00:00:00 2001 +From: Ricardo Martincoski +Date: Fri, 27 May 2022 20:15:00 -0300 +Subject: [PATCH 1/1] package/binutils: change .mk + +Signed-off-by: Ricardo Martincoski +--- + package/binutils/binutils.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk +index 8c4a1371ca..3f143d9d76 100644 +--- a/package/binutils/binutils.mk ++++ b/package/binutils/binutils.mk +@@ -1,6 +1,6 @@ + ################################################################################ + # +-# binutils ++# Binutils + # + ################################################################################ +-- +2.25.1 diff --git a/system/Config.in b/system/Config.in index a4ffbfa18c8..1ca7690ea3b 100644 --- a/system/Config.in +++ b/system/Config.in @@ -78,7 +78,6 @@ endchoice # Passwd encoding config BR2_TARGET_GENERIC_PASSWD_METHOD string - default "md5" if BR2_TARGET_GENERIC_PASSWD_MD5 default "sha-256" if BR2_TARGET_GENERIC_PASSWD_SHA256 default "sha-512" if BR2_TARGET_GENERIC_PASSWD_SHA512 @@ -125,22 +124,26 @@ config BR2_INIT_SYSTEMD depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_TOOLCHAIN_HAS_SSP depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13 + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 depends on BR2_HOST_GCC_AT_LEAST_5 select BR2_ROOTFS_MERGED_USR select BR2_PACKAGE_SYSTEMD select BR2_PACKAGE_SKELETON_INIT_SYSTEMD if BR2_ROOTFS_SKELETON_DEFAULT -comment "systemd needs a glibc toolchain w/ SSP, headers >= 3.10, host and target gcc >= 5" +comment "systemd needs a glibc toolchain w/ SSP, headers >= 3.15, host and target gcc >= 5" depends on BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_USES_GLIBC || \ !BR2_TOOLCHAIN_HAS_SSP || \ - !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || \ !BR2_HOST_GCC_AT_LEAST_5 +comment "systemd highly recommends Linux >= 4.15" + depends on BR2_INIT_SYSTEMD + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15 + config BR2_INIT_NONE bool "None" select BR2_PACKAGE_SKELETON_INIT_NONE if BR2_ROOTFS_SKELETON_DEFAULT @@ -154,6 +157,57 @@ source "$BR2_BASE_DIR/.br2-external.in.init" endchoice +if BR2_INIT_SYSTEMD + +config BR2_INIT_SYSTEMD_VAR_FACTORY + bool "build a factory to populate a tmpfs on /var" + default y # legacy + depends on !BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW + help + Build a factory of the content of /var as installed by + packages, mount a tmpfs on /var at runtime, so that + systemd-tmpfiles can populate it from the factory. + + This may help on a read-only rootfs. + + It probably does not play very well with triggering a call + to systemd-tmpfiles at build time (below). + + Note: Buildroot mounts a tmpfs on /var to at least make the + system bootable out of the box; mounting a filesystem from + actual storage is left to the integration, as it is too + specific and may need preparatory work like partitionning a + device and/or formatting a filesystem first, so that falls + out of the scope of Buildroot. + + To use persistent storage, provide a systemd dropin for the + var.mount unit, that overrides the What and Type, and possibly + the Options and After, fields. + +config BR2_INIT_SYSTEMD_POPULATE_TMPFILES + bool "trigger systemd-tmpfiles during build" + default y # legacy + help + Act on the systemd-tmpfiles.d database at build time, when + assembling the root filesystems. + + This may help on a read-only filesystem. + + It probably does not play very well with the /var factory + (above). + +config BR2_PACKAGE_SYSTEMD_DEFAULT_TARGET + string "The default unit systemd starts at bootup" + default "multi-user.target" + help + Specify the name of the unit configuration file to be started + at bootup by systemd. Should end in ".target". + ex: multi-user.target + + https://www.freedesktop.org/software/systemd/man/systemd.special.html#default.target + +endif # BR2_INIT_SYSTEMD + choice prompt "/dev management" if !BR2_INIT_SYSTEMD default BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS @@ -432,7 +486,7 @@ config BR2_ENABLE_LOCALE_WHITELIST default "C en_US" depends on BR2_ENABLE_LOCALE_PURGE help - Whitespace seperated list of locales to allow on target. + Whitespace separated list of locales to allow on target. Locales not listed here will be removed from the target. See 'locale -a' on your host for a list of locales available on your build host, or have a look in /usr/share/locale in diff --git a/toolchain/Config.in b/toolchain/Config.in index d2c81217c84..b3cbec83773 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -109,15 +109,13 @@ config BR2_TOOLCHAIN_SUPPORTS_VARIADIC_MI_THUNK depends on !BR2_or1k depends on !BR2_xtensa -# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=43744. This bug no +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=43744. This bug # reappeared on gcc 9.x and is still not fixed on gcc 11.x config BR2_TOOLCHAIN_HAS_GCC_BUG_43744 bool - default y if BR2_sh4 - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_8 || \ - BR2_TOOLCHAIN_GCC_AT_LEAST_9 || \ - BR2_TOOLCHAIN_GCC_AT_LEAST_10 || \ - BR2_TOOLCHAIN_GCC_AT_LEAST_11 + default y if !BR2_TOOLCHAIN_GCC_AT_LEAST_8 + default y if BR2_TOOLCHAIN_GCC_AT_LEAST_9 + depends on BR2_sh # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63261. This bug no # longer exists in gcc 8.x. @@ -138,19 +136,25 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_64735 !BR2_TOOLCHAIN_GCC_AT_LEAST_7 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68485. This bug still -# exists in gcc 9.x +# exists in gcc 12.x config BR2_TOOLCHAIN_HAS_GCC_BUG_68485 bool default y if BR2_microblaze +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81426 +config BR2_TOOLCHAIN_HAS_GCC_BUG_81426 + bool + default y if BR2_sh + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=83143 # Error: invalid operands (*UND* and .text sections) for `-' on sh4. # This bug no longer exists in gcc 10.x but reappeared on gcc 11.x and # it still not been fixed yet. config BR2_TOOLCHAIN_HAS_GCC_BUG_83143 bool - default y if BR2_sh - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_10 || BR2_TOOLCHAIN_GCC_AT_LEAST_11 + default y if !BR2_TOOLCHAIN_GCC_AT_LEAST_10 + default y if BR2_TOOLCHAIN_GCC_AT_LEAST_11 + depends on BR2_sh # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85180. This bug no # longer exists in gcc 8.x. @@ -169,11 +173,12 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_85862 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90620 # ICE: in do_output_reload, at reload1.c:7978 on microblaze. -# This bug no longer exists in gcc 10.x +# This bug no longer exists in gcc 10.x but reappeared in gcc 11.x config BR2_TOOLCHAIN_HAS_GCC_BUG_90620 bool default y if BR2_microblaze - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_10 + 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 @@ -184,12 +189,12 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_93847 # 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 has been -# fixed on gcc 11.x. -config BR2_TOOLCHAIN_HAS_GCC_BUG_99140 +# 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 && !BR2_TOOLCHAIN_GCC_AT_LEAST_11 + default y if BR2_TOOLCHAIN_GCC_AT_LEAST_9 depends on BR2_nios2 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101737 @@ -197,11 +202,11 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_99140 # still exists in gcc = 11.1.0 config BR2_TOOLCHAIN_HAS_GCC_BUG_101737 bool - default y if BR2_sh4 + default y if BR2_sh # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101915 # ICE: in extract_insn, at recog.c:2294 on microblaze. -# This bug still exists in gcc = 11.1.0 +# This bug still exists in gcc = 12.1.0 config BR2_TOOLCHAIN_HAS_GCC_BUG_101915 bool default y if BR2_microblaze @@ -220,6 +225,32 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_101952 bool default y if BR2_sh4 +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104028 +# ICE: on M68K: Error: value -16034 out of range +# This bug still exists in gcc = 11.1.0 +config BR2_TOOLCHAIN_HAS_GCC_BUG_104028 + bool + default y if BR2_m68k + +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=107728 +# https://sourceware.org/bugzilla/show_bug.cgi?id=29621 +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 + depends on BR2_OPTIMIZE_0 + +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110934 +# ICE: on M68K: in change_address_1, at emit-rtl.cc:2287 +# This bug exists in gcc = 12.3.0 and gcc = 13.2.0 +config BR2_TOOLCHAIN_HAS_GCC_BUG_110934 + bool + default y if BR2_m68k + config BR2_TOOLCHAIN_HAS_NATIVE_RPC bool @@ -306,13 +337,6 @@ config BR2_TOOLCHAIN_EXTRA_LIBS config BR2_TOOLCHAIN_HAS_FULL_GETTEXT bool -config BR2_USE_MMU - bool "Enable MMU support" if BR2_ARCH_HAS_MMU_OPTIONAL - default y if BR2_ARCH_HAS_MMU_OPTIONAL || BR2_ARCH_HAS_MMU_MANDATORY - help - If your target has a MMU, you should say Y here. If you - are unsure, just say Y. - config BR2_TARGET_OPTIMIZATION string "Target Optimizations" default "" @@ -329,13 +353,6 @@ config BR2_TARGET_LDFLAGS Note that options with a '$' sign (eg. -Wl,-rpath='$ORIGIN/../lib') are not supported. -config BR2_ECLIPSE_REGISTER - bool "Register toolchain within Eclipse Buildroot plug-in" - help - This options tells Buildroot to generate the necessary - configuration files to make your toolchain appear within - Eclipse, through the Eclipse Buildroot plugin. - # Options for packages to depend on, if they require at least a # specific version of the kernel headers. # Toolchains should choose the adequate option (ie. the highest @@ -570,6 +587,26 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_16 bool select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_17 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_16 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_18 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_17 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_19 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_18 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_19 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 select BR2_TOOLCHAIN_HEADERS_LATEST # This should be selected by the latest version, above, to indicate that @@ -583,6 +620,11 @@ config BR2_TOOLCHAIN_HEADERS_LATEST # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_HEADERS_AT_LEAST string + default "6.1" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 + default "6.0" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 + default "5.19" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_19 + default "5.18" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_18 + default "5.17" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_17 default "5.16" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_16 default "5.15" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 default "5.14" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_14 @@ -698,10 +740,15 @@ config BR2_TOOLCHAIN_GCC_AT_LEAST_11 bool select BR2_TOOLCHAIN_GCC_AT_LEAST_10 +config BR2_TOOLCHAIN_GCC_AT_LEAST_12 + bool + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + # 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 "12" if BR2_TOOLCHAIN_GCC_AT_LEAST_12 default "11" if BR2_TOOLCHAIN_GCC_AT_LEAST_11 default "10" if BR2_TOOLCHAIN_GCC_AT_LEAST_10 default "9" if BR2_TOOLCHAIN_GCC_AT_LEAST_9 @@ -822,9 +869,11 @@ config BR2_TOOLCHAIN_HAS_ATOMIC # - At least, libquadmath is available on: # - i*86 # - x86_64 +# - PowerPC with vector scalar (VSX) instruction set # - When available, libquadmath requires wchar support. config BR2_TOOLCHAIN_HAS_LIBQUADMATH bool default y if BR2_i386 || BR2_x86_64 + default y if BR2_POWERPC_CPU_HAS_VSX endmenu diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk index ef8e9a5f647..08ee6060b0f 100644 --- a/toolchain/helpers.mk +++ b/toolchain/helpers.mk @@ -19,7 +19,12 @@ copy_toolchain_lib_root = \ rm -fr $(TARGET_DIR)/$${DESTDIR}/$${LIBNAME}; \ if test -h $${LIBPATH} ; then \ cp -d $${LIBPATH} $(TARGET_DIR)/$${DESTDIR}/$${LIBNAME}; \ + OLD_LIBPATH="$${LIBPATH}"; \ LIBPATH="`readlink -f $${LIBPATH}`"; \ + if [ "$${LIBPATH}" = "" ]; then \ + echo "LIBPATH empty after trying to resolve symlink $${OLD_LIBPATH}" 1>&2; \ + exit 1; \ + fi; \ elif test -f $${LIBPATH}; then \ $(INSTALL) -D -m0755 $${LIBPATH} $(TARGET_DIR)/$${DESTDIR}/$${LIBNAME}; \ break ; \ @@ -150,7 +155,7 @@ copy_toolchain_sysroot = \ if test -n "$${SUPPORT_LIB_DIR}" ; then \ cp -a $${SUPPORT_LIB_DIR}/* $(STAGING_DIR)/lib/ ; \ fi ; \ - find $(STAGING_DIR) -type d | xargs chmod 755 + find $(STAGING_DIR) -type d -print0 | xargs -0 chmod 755 # # Check the specified kernel headers version actually matches the @@ -302,7 +307,7 @@ check_uclibc = \ $(call check_uclibc_feature,__UCLIBC_HAS_LFS__,,$${UCLIBC_CONFIG_FILE},Large file support) ;\ $(call check_uclibc_feature,__UCLIBC_HAS_IPV6__,,$${UCLIBC_CONFIG_FILE},IPv6 support) ;\ $(call check_uclibc_feature,__UCLIBC_HAS_RPC__,BR2_TOOLCHAIN_HAS_NATIVE_RPC,$${UCLIBC_CONFIG_FILE},RPC support) ;\ - $(call check_uclibc_feature,__UCLIBC_HAS_LOCALE__,BR2_ENABLE_LOCALE,$${UCLIBC_CONFIG_FILE},Locale support) ;\ + $(call check_uclibc_feature,__UCLIBC_HAS_XLOCALE__,BR2_ENABLE_LOCALE,$${UCLIBC_CONFIG_FILE},Locale support) ;\ $(call check_uclibc_feature,__UCLIBC_HAS_WCHAR__,BR2_USE_WCHAR,$${UCLIBC_CONFIG_FILE},Wide char support) ;\ $(call check_uclibc_feature,__UCLIBC_HAS_THREADS__,BR2_TOOLCHAIN_HAS_THREADS,$${UCLIBC_CONFIG_FILE},Thread support) ;\ $(call check_uclibc_feature,__PTHREADS_DEBUG_SUPPORT__,BR2_TOOLCHAIN_HAS_THREADS_DEBUG,$${UCLIBC_CONFIG_FILE},Thread debugging support) ;\ @@ -417,12 +422,16 @@ check_cross_compiler_exists = \ # the host tuple. # - Exclude distro-class toolchains which are not relocatable. # - Exclude broken toolchains which return "libc.a" with -print-file-name. +# - Exclude toolchains used with wrong toolchain cflags or broken toolchains +# which return "libc.a" with -print-file-name and toolchain cflags. # - Exclude toolchains which doesn't support --sysroot option. # # $1: cross-gcc path +# $1: toolchain cflags # check_unusable_toolchain = \ __CROSS_CC=$(strip $1) ; \ + __TOOLCHAIN_CFLAGS=$(strip $2) ; \ vendor=`$${__CROSS_CC} -dumpmachine | cut -f2 -d'-'` ; \ if test "$${vendor}" = "angstrom" ; then \ echo "Angstrom toolchains are not pure toolchains: they contain" ; \ @@ -444,6 +453,13 @@ check_unusable_toolchain = \ echo "Unable to detect the toolchain sysroot, Buildroot cannot use this toolchain." ; \ exit 1 ; \ fi ; \ + libc_a_archsysroot_path=`$${__CROSS_CC} $${__TOOLCHAIN_CFLAGS} -print-file-name=libc.a` ; \ + if test "$${libc_a_archsysroot_path}" = "libc.a" ; then \ + echo "Unable to detect the toolchain architecture sysroot." ; \ + echo "Please check the Target Architecture Variant selected, the toolchains may not support it." ; \ + echo "Buildroot cannot use this toolchain." ; \ + exit 1 ; \ + fi; \ sysroot_dir="$(call toolchain_find_sysroot,$${__CROSS_CC})" ; \ if test -z "$${sysroot_dir}" ; then \ echo "External toolchain doesn't support --sysroot. Cannot use." ; \ diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in index 4004c0edf85..64f7892f98b 100644 --- a/toolchain/toolchain-buildroot/Config.in +++ b/toolchain/toolchain-buildroot/Config.in @@ -22,18 +22,11 @@ config BR2_TOOLCHAIN_BUILDROOT_VENDOR choice prompt "C library" - default BR2_TOOLCHAIN_BUILDROOT_UCLIBC - default BR2_TOOLCHAIN_BUILDROOT_GLIBC if BR2_powerpc64 + default BR2_TOOLCHAIN_BUILDROOT_GLIBC config BR2_TOOLCHAIN_BUILDROOT_UCLIBC bool "uClibc-ng" - depends on BR2_aarch64 || BR2_aarch64_be || BR2_arcle || BR2_arceb || \ - BR2_arm || BR2_armeb || \ - BR2_i386 || BR2_m68k || BR2_microblaze || \ - BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el || \ - BR2_or1k || BR2_powerpc || BR2_RISCV_64 || BR2_sh2a || \ - BR2_sh4 || BR2_sh4eb || BR2_sparc || BR2_xtensa || \ - BR2_x86_64 + depends on BR2_PACKAGE_UCLIBC_SUPPORTS select BR2_TOOLCHAIN_USES_UCLIBC help This option selects uClibc-ng as the C library for the @@ -43,22 +36,7 @@ config BR2_TOOLCHAIN_BUILDROOT_UCLIBC config BR2_TOOLCHAIN_BUILDROOT_GLIBC bool "glibc" - depends on BR2_arm || BR2_armeb || BR2_aarch64 || \ - BR2_aarch64_be || BR2_i386 || BR2_mips || \ - BR2_mipsel || BR2_mips64 || BR2_mips64el|| \ - BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le || \ - BR2_riscv || BR2_s390x || BR2_sh || \ - BR2_sparc64 || BR2_x86_64 || BR2_microblaze || \ - BR2_nios2 || (BR2_arc && BR2_ARC_ATOMIC_EXT) || BR2_csky - depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - 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_4_5 || !BR2_MIPS_NAN_2008 - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 || !BR2_RISCV_64 - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1 || !BR2_arc - depends on !BR2_powerpc_SPE - depends on BR2_RISCV_ISA_RVA || !BR2_riscv + depends on BR2_PACKAGE_GLIBC_SUPPORTS select BR2_TOOLCHAIN_USES_GLIBC help This option selects glibc as the C library for the @@ -66,9 +44,9 @@ config BR2_TOOLCHAIN_BUILDROOT_GLIBC http://www.gnu.org/software/libc/ -comment "glibc needs a toolchain w/ dynamic library, kernel headers >= 3.2" - depends on BR2_USE_MMU - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2 +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 # glibc >= 2.26 require kernel headers >= 3.10 on powerpc64le. comment "glibc on powerpc64le needs a toolchain w/ headers >= 3.10" @@ -80,17 +58,25 @@ comment "glibc on MIPS w/ NAN2008 needs a toolchain w/ headers >= 4.5" depends on BR2_MIPS_NAN_2008 depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_5 +comment "glibc on RISC-V 64-bit needs a toolchain w/ headers >= 5.0" + depends on BR2_RISCV_64 + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 + +comment "glibc on RISC-V 32-bit needs a toolchain w/ headers >= 5.4" + depends on BR2_RISCV_32 + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + +comment "glibc on ARC needs a toolchain w/ headers >= 5.1" + depends on BR2_arc + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1 + +comment "glibc on or1k needs a toolchain w/ headers >= 5.4" + depends on BR2_or1k + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + config BR2_TOOLCHAIN_BUILDROOT_MUSL bool "musl" - depends on BR2_aarch64 || BR2_arm || BR2_armeb || BR2_i386 || \ - BR2_microblaze || BR2_mips || BR2_mipsel || BR2_mips64 || \ - BR2_mips64el || BR2_or1k || BR2_powerpc || BR2_powerpc64 || \ - BR2_powerpc64le || BR2_RISCV_64 || BR2_sh || BR2_x86_64 - depends on !BR2_powerpc_SPE # not supported, build breaks - depends on !(BR2_powerpc64 || BR2_powerpc64le) || BR2_POWERPC_CPU_HAS_ALTIVEC - # sh2 nommu is supported by musl, but we don't have support - # for it in Buildroot. - depends on BR2_USE_MMU + depends on BR2_PACKAGE_MUSL_SUPPORTS select BR2_TOOLCHAIN_USES_MUSL help This option selects musl as the C library for the @@ -98,6 +84,18 @@ config BR2_TOOLCHAIN_BUILDROOT_MUSL https://www.musl-libc.org/ +config BR2_TOOLCHAIN_BUILDROOT_NONE + bool "none" + depends on !BR2_PACKAGE_UCLIBC_SUPPORTS && \ + !BR2_PACKAGE_GLIBC_SUPPORTS && \ + !BR2_PACKAGE_MUSL_SUPPORTS + help + This option is visible if no C library is available for the + currently selected configuration. If you select this option, + the build will refuse to start as Buildroot needs a C + library to build a toolchain. Change your configuration + settings to make sure one of the C libraries is selected. + endchoice config BR2_TOOLCHAIN_BUILDROOT_LIBC @@ -113,5 +111,4 @@ source "package/uclibc/Config.in" source "package/glibc/Config.in" source "package/binutils/Config.in.host" source "package/gcc/Config.in.host" -source "package/elf2flt/Config.in.host" endif diff --git a/toolchain/toolchain-buildroot/toolchain-buildroot.mk b/toolchain/toolchain-buildroot/toolchain-buildroot.mk index b30cc332d2b..6da64b7c77c 100644 --- a/toolchain/toolchain-buildroot/toolchain-buildroot.mk +++ b/toolchain/toolchain-buildroot/toolchain-buildroot.mk @@ -14,4 +14,7 @@ TOOLCHAIN_BUILDROOT_DEPENDENCIES = host-gcc-final TOOLCHAIN_BUILDROOT_ADD_TOOLCHAIN_DEPENDENCY = NO +# Not really a virtual package, but we use the virtual package infra here so +# both the build log and build directory look nicer (toolchain-buildroot-virtual +# instead of toolchain-buildroot-undefined) $(eval $(virtual-package)) diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index 2177e6a6784..c1c159cb8eb 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -5,9 +5,6 @@ comment "Toolchain External Options" choice prompt "Toolchain" -comment "glibc toolchains only available with shared lib support" - depends on BR2_STATIC_LIBS - # Kept toolchains sorted by architecture in order to use some toolchain # as default choice @@ -23,9 +20,6 @@ source "toolchain/toolchain-external/toolchain-external-linaro-aarch64-be/Config # ARC source "toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in" -# Andes -source "toolchain/toolchain-external/toolchain-external-andes-nds32/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" @@ -130,9 +124,6 @@ source "toolchain/toolchain-external/toolchain-external-linaro-aarch64-be/Config # ARC source "toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in.options" -# Andes -source "toolchain/toolchain-external/toolchain-external-andes-nds32/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" @@ -155,9 +146,13 @@ source "toolchain/toolchain-external/toolchain-external-bootlin/Config.in.option # Custom toolchains source "toolchain/toolchain-external/toolchain-external-custom/Config.in.options" +config BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER + bool + config BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY bool "Copy gdb server to the Target" depends on BR2_TOOLCHAIN_EXTERNAL + depends on !BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER help Copy the gdbserver provided by the external toolchain to the target. diff --git a/toolchain/toolchain-external/pkg-toolchain-external.mk b/toolchain/toolchain-external/pkg-toolchain-external.mk index 299b6008aa1..c37f3500d9b 100644 --- a/toolchain/toolchain-external/pkg-toolchain-external.mk +++ b/toolchain/toolchain-external/pkg-toolchain-external.mk @@ -563,7 +563,7 @@ endif # kernel headers version, type of C library and all C library features. define $(2)_CONFIGURE_CMDS $$(Q)$$(call check_cross_compiler_exists,$$(TOOLCHAIN_EXTERNAL_CC)) - $$(Q)$$(call check_unusable_toolchain,$$(TOOLCHAIN_EXTERNAL_CC)) + $$(Q)$$(call check_unusable_toolchain,$$(TOOLCHAIN_EXTERNAL_CC),"$$(TOOLCHAIN_EXTERNAL_CFLAGS)") $$(Q)SYSROOT_DIR="$$(call toolchain_find_sysroot,$$(TOOLCHAIN_EXTERNAL_CC))" ; \ $$(call check_kernel_headers_version,\ $$(BUILD_DIR),\ diff --git a/toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in b/toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in deleted file mode 100644 index 9c937b8c444..00000000000 --- a/toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_TOOLCHAIN_EXTERNAL_ANDES_NDS32 - bool "Andes nds32" - depends on BR2_nds32 - depends on !BR2_STATIC_LIBS - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - select BR2_HOSTARCH_NEEDS_IA32_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_8 - select BR2_TOOLCHAIN_EXTERNAL_GLIBC - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_17 - select BR2_TOOLCHAIN_HAS_NATIVE_RPC - select BR2_TOOLCHAIN_HAS_SSP - help - nds32 toolchain for the nds32 architecture. It uses GCC - 8.2.1, GDB 8.1.1, glibc 2.28, Binutils 2.30. It generates - code that runs on ae3xx platform diff --git a/toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in.options b/toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in.options deleted file mode 100644 index 7d11ae2098f..00000000000 --- a/toolchain/toolchain-external/toolchain-external-andes-nds32/Config.in.options +++ /dev/null @@ -1,9 +0,0 @@ -if BR2_TOOLCHAIN_EXTERNAL_ANDES_NDS32 - -config BR2_TOOLCHAIN_EXTERNAL_PREFIX - default "nds32le-linux" - -config BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL - default "toolchain-external-andes-nds32" - -endif diff --git a/toolchain/toolchain-external/toolchain-external-andes-nds32/toolchain-external-andes-nds32.hash b/toolchain/toolchain-external/toolchain-external-andes-nds32/toolchain-external-andes-nds32.hash deleted file mode 100644 index 4314bb1f556..00000000000 --- a/toolchain/toolchain-external/toolchain-external-andes-nds32/toolchain-external-andes-nds32.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://github.com/vincentzwc/prebuilt-nds32-toolchain/releases/download/20180521/nds32le-linux-glibc-v3-upstream.tar.gz -sha256 6050601df85ad93a4c211c1d57ed3773edb62aa505f7e07d7d555652e83af2cc nds32le-linux-glibc-v3-upstream.tar.gz diff --git a/toolchain/toolchain-external/toolchain-external-andes-nds32/toolchain-external-andes-nds32.mk b/toolchain/toolchain-external/toolchain-external-andes-nds32/toolchain-external-andes-nds32.mk deleted file mode 100644 index fa29490b4f2..00000000000 --- a/toolchain/toolchain-external/toolchain-external-andes-nds32/toolchain-external-andes-nds32.mk +++ /dev/null @@ -1,10 +0,0 @@ -################################################################################ -# -# toolchain-external-andes-nds32 -# -################################################################################ - -TOOLCHAIN_EXTERNAL_ANDES_NDS32_SITE = https://github.com/vincentzwc/prebuilt-nds32-toolchain/releases/download/20180521 -TOOLCHAIN_EXTERNAL_ANDES_NDS32_SOURCE = nds32le-linux-glibc-v3-upstream.tar.gz - -$(eval $(toolchain-external-package)) 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 783ed353145..eeb88579feb 100644 --- a/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/Config.in +++ b/toolchain/toolchain-external/toolchain-external-arm-aarch64-be/Config.in @@ -2,7 +2,6 @@ config BR2_TOOLCHAIN_EXTERNAL_ARM_AARCH64_BE bool "Arm AArch64 BE 2021.07" depends on BR2_aarch64_be depends on BR2_HOSTARCH = "x86_64" - depends on !BR2_STATIC_LIBS select BR2_TOOLCHAIN_EXTERNAL_GLIBC select BR2_TOOLCHAIN_HAS_SSP select BR2_INSTALL_LIBSTDCPP diff --git a/toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in b/toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in index 4557debe5da..9eb5d64a9d1 100644 --- a/toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in +++ b/toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in @@ -2,7 +2,6 @@ config BR2_TOOLCHAIN_EXTERNAL_ARM_AARCH64 bool "Arm AArch64 2021.07" depends on BR2_aarch64 depends on BR2_HOSTARCH = "x86_64" - depends on !BR2_STATIC_LIBS select BR2_TOOLCHAIN_EXTERNAL_GLIBC select BR2_TOOLCHAIN_HAS_SSP select BR2_INSTALL_LIBSTDCPP diff --git a/toolchain/toolchain-external/toolchain-external-arm-arm/Config.in b/toolchain/toolchain-external/toolchain-external-arm-arm/Config.in index 0fbeba6aae4..28c6541406e 100644 --- a/toolchain/toolchain-external/toolchain-external-arm-arm/Config.in +++ b/toolchain/toolchain-external/toolchain-external-arm-arm/Config.in @@ -1,16 +1,14 @@ comment "Arm toolchains available for Cortex-A with NEON + EABIhf" depends on BR2_arm depends on !BR2_ARM_CPU_ARMV7A || !BR2_ARM_EABIHF || !BR2_ARM_CPU_HAS_NEON - depends on !BR2_STATIC_LIBS config BR2_TOOLCHAIN_EXTERNAL_ARM_ARM bool "Arm ARM 2021.07" 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" + depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "aarch64" depends on BR2_ARM_EABIHF - depends on !BR2_STATIC_LIBS select BR2_TOOLCHAIN_EXTERNAL_GLIBC select BR2_TOOLCHAIN_HAS_SSP select BR2_INSTALL_LIBSTDCPP 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 d58692de536..1fc2c5de57d 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,7 @@ # From https://developer.arm.com/-/media/Files/downloads/gnu-a/10.3-2021.07/binrel/gcc-arm-10.3-2021.07-x86_64-arm-none-linux-gnueabihf.tar.xz.asc md5 87ec580b290df2febc7c476f59484635 gcc-arm-10.3-2021.07-x86_64-arm-none-linux-gnueabihf.tar.xz +# From https://developer.arm.com/-/media/Files/downloads/gnu-a/10.3-2021.07/binrel/gcc-arm-10.3-2021.07-aarch64-arm-none-linux-gnueabihf.tar.xz.asc +md5 0f1c5c90f5c62e1d1066f75fb3e51e21 gcc-arm-10.3-2021.07-aarch64-arm-none-linux-gnueabihf.tar.xz # locally calculated sha256 aa074fa8371a4f73fecbd16bd62c8b1945f23289e26414794f130d6ccdf8e39c gcc-arm-10.3-2021.07-x86_64-arm-none-linux-gnueabihf.tar.xz +sha256 fccd7af76988da2b077f939eb2a78baa9935810918d2bf3f837bc74f52efa825 gcc-arm-10.3-2021.07-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 43922051057..8731a4f0e5d 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 @@ -7,6 +7,6 @@ TOOLCHAIN_EXTERNAL_ARM_ARM_VERSION = 2021.07 TOOLCHAIN_EXTERNAL_ARM_ARM_SITE = https://developer.arm.com/-/media/Files/downloads/gnu-a/10.3-$(TOOLCHAIN_EXTERNAL_ARM_ARM_VERSION)/binrel -TOOLCHAIN_EXTERNAL_ARM_ARM_SOURCE = gcc-arm-10.3-$(TOOLCHAIN_EXTERNAL_ARM_ARM_VERSION)-x86_64-arm-none-linux-gnueabihf.tar.xz +TOOLCHAIN_EXTERNAL_ARM_ARM_SOURCE = gcc-arm-10.3-$(TOOLCHAIN_EXTERNAL_ARM_ARM_VERSION)-$(HOSTARCH)-arm-none-linux-gnueabihf.tar.xz $(eval $(toolchain-external-package)) diff --git a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options index 4b4404620c2..d90137af091 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options @@ -6,10 +6,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCH_SUPPORTS default y if BR2_aarch64_be default y if BR2_arcle && BR2_arc750d default y if BR2_arcle && BR2_archs38 - default y if BR2_ARM_CPU_ARMV5 && BR2_ARM_EABI - default y if BR2_ARM_CPU_ARMV6 && BR2_ARM_EABIHF - default y if BR2_ARM_CPU_ARMV7A && BR2_ARM_EABIHF - default y if BR2_ARM_CPU_ARMV7M + 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_ARMV7M default y if BR2_m68k_m68k default y if BR2_m68k_cf default y if BR2_microblazebe @@ -18,7 +19,6 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCH_SUPPORTS default y if BR2_mipsel && BR2_mips_32 && !BR2_MIPS_SOFT_FLOAT default y if BR2_mipsel && BR2_mips_32r5 && !BR2_MIPS_SOFT_FLOAT default y if BR2_mipsel && BR2_mips_32r6 && !BR2_MIPS_SOFT_FLOAT - default y if BR2_mips64 && BR2_mips_64 && !BR2_MIPS_SOFT_FLOAT 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 @@ -32,7 +32,8 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCH_SUPPORTS default y if BR2_powerpc64 && BR2_powerpc_power8 default y if BR2_powerpc64le && BR2_powerpc_power8 default y if BR2_riscv && BR2_riscv_g && BR2_RISCV_32 && BR2_RISCV_ABI_ILP32D - default y if BR2_riscv && BR2_riscv_g && BR2_RISCV_64 && BR2_RISCV_ABI_LP64D + default y if BR2_riscv && BR2_riscv_g && BR2_RISCV_64 && BR2_RISCV_ABI_LP64D && BR2_USE_MMU + default y if BR2_s390x && BR2_s390x_z13 default y if BR2_sh && BR2_sh4 default y if BR2_sh && BR2_sh4aeb default y if BR2_sparc64 && BR2_sparc_v9 @@ -43,7 +44,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARCH_SUPPORTS default y if BR2_x86_64 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 && BR2_X86_CPU_HAS_SSE3 && BR2_X86_CPU_HAS_SSSE3 && BR2_X86_CPU_HAS_SSE4 && BR2_X86_CPU_HAS_SSE42 && BR2_X86_CPU_HAS_AVX && BR2_X86_CPU_HAS_AVX2 && BR2_X86_CPU_HAS_AVX512 default y if BR2_x86_64 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 && BR2_X86_CPU_HAS_SSE3 && BR2_X86_CPU_HAS_SSSE3 && BR2_X86_CPU_HAS_SSE4 && BR2_X86_CPU_HAS_SSE42 default y if BR2_i386 && BR2_X86_CPU_HAS_MMX && BR2_X86_CPU_HAS_SSE && BR2_X86_CPU_HAS_SSE2 && BR2_X86_CPU_HAS_SSE3 && BR2_X86_CPU_HAS_SSSE3 - default y if BR2_i386 && !BR2_x86_i486 && !BR2_x86_i586 && !BR2_x86_x1000 + default y if BR2_i386 && !BR2_x86_i486 && !BR2_x86_i586 && !BR2_x86_x1000 && !BR2_x86_pentium_mmx && !BR2_x86_geode && !BR2_x86_c3 && !BR2_x86_winchip_c6 && !BR2_x86_winchip2 default y if BR2_xtensa && BR2_XTENSA_CUSTOM && BR2_XTENSA_LITTLE_ENDIAN if BR2_TOOLCHAIN_EXTERNAL_BOOTLIN @@ -57,14 +58,14 @@ 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 2021.11-1" + bool "aarch64 glibc bleeding-edge 2022.08-1" depends on BR2_aarch64 depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 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 @@ -81,14 +82,14 @@ 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 2021.11-1" + bool "aarch64 glibc stable 2022.08-1" depends on BR2_aarch64 depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 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 @@ -105,13 +106,14 @@ 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 2021.11-1" + bool "aarch64 musl bleeding-edge 2022.08-1" depends on BR2_aarch64 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 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 @@ -128,13 +130,14 @@ 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 2021.11-1" + bool "aarch64 musl stable 2022.08-2" depends on BR2_aarch64 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 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 @@ -150,14 +153,15 @@ 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 2021.11-1" + bool "aarch64 uclibc bleeding-edge 2022.08-1" depends on BR2_aarch64 - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -173,14 +177,15 @@ 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 2021.11-1" + bool "aarch64 uclibc stable 2022.08-1" depends on BR2_aarch64 - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -196,14 +201,14 @@ 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 2021.11-1" + bool "aarch64be glibc bleeding-edge 2022.08-1" depends on BR2_aarch64_be depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 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 @@ -220,14 +225,14 @@ 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 2021.11-1" + bool "aarch64be glibc stable 2022.08-1" depends on BR2_aarch64_be depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 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 @@ -244,14 +249,15 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_GLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_UCLIBC_BLEEDING_EDGE - bool "aarch64be uclibc bleeding-edge 2021.11-1" + bool "aarch64be uclibc bleeding-edge 2022.08-1" depends on BR2_aarch64_be - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -267,14 +273,15 @@ 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 2021.11-1" + bool "aarch64be uclibc stable 2022.08-1" depends on BR2_aarch64_be - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -290,10 +297,10 @@ 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 2021.11-1" + bool "arcle-750d uclibc bleeding-edge 2022.08-1" depends on BR2_arcle depends on BR2_arc750d - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -314,7 +321,7 @@ 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 2021.11-1" + bool "arcle-750d uclibc stable 2022.08-1" depends on BR2_arcle depends on BR2_arc750d select BR2_TOOLCHAIN_GCC_AT_LEAST_10 @@ -338,12 +345,11 @@ 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 2021.11-1" + bool "arcle-hs38 glibc bleeding-edge 2022.08-1" depends on BR2_arcle depends on BR2_archs38 depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -363,11 +369,10 @@ 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 2021.11-3" + bool "arcle-hs38 glibc stable 2022.08-1" depends on BR2_arcle depends on BR2_archs38 depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS select BR2_TOOLCHAIN_GCC_AT_LEAST_10 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP @@ -388,10 +393,10 @@ 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 2021.11-1" + bool "arcle-hs38 uclibc bleeding-edge 2022.08-1" depends on BR2_arcle depends on BR2_archs38 - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -412,7 +417,7 @@ 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 2021.11-1" + bool "arcle-hs38 uclibc stable 2022.08-1" depends on BR2_arcle depends on BR2_archs38 select BR2_TOOLCHAIN_GCC_AT_LEAST_10 @@ -436,15 +441,16 @@ 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 2021.11-1" + bool "armv5-eabi glibc bleeding-edge 2022.08-1" + depends on BR2_arm depends on BR2_ARM_CPU_ARMV5 depends on BR2_ARM_EABI depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 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 @@ -461,15 +467,16 @@ 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 2021.11-1" + bool "armv5-eabi glibc stable 2022.08-1" + depends on BR2_arm depends on BR2_ARM_CPU_ARMV5 depends on BR2_ARM_EABI depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 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 @@ -486,14 +493,16 @@ 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 2021.11-1" + bool "armv5-eabi musl bleeding-edge 2022.08-1" + depends on BR2_arm depends on BR2_ARM_CPU_ARMV5 depends on BR2_ARM_EABI depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 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 @@ -510,14 +519,16 @@ 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 2021.11-1" + bool "armv5-eabi musl stable 2022.08-1" + depends on BR2_arm depends on BR2_ARM_CPU_ARMV5 depends on BR2_ARM_EABI depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 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 @@ -534,15 +545,17 @@ 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 2021.11-1" + bool "armv5-eabi uclibc bleeding-edge 2022.08-1" + depends on BR2_arm depends on BR2_ARM_CPU_ARMV5 depends on BR2_ARM_EABI - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -558,15 +571,17 @@ 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 2021.11-1" + bool "armv5-eabi uclibc stable 2022.08-1" + depends on BR2_arm depends on BR2_ARM_CPU_ARMV5 depends on BR2_ARM_EABI - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -582,15 +597,16 @@ 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 2021.11-1" + bool "armv6-eabihf glibc bleeding-edge 2022.08-1" + depends on BR2_arm depends on BR2_ARM_CPU_ARMV6 depends on BR2_ARM_EABIHF depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 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 @@ -607,15 +623,16 @@ 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 2021.11-1" + bool "armv6-eabihf glibc stable 2022.08-1" + depends on BR2_arm depends on BR2_ARM_CPU_ARMV6 depends on BR2_ARM_EABIHF depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 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 @@ -632,14 +649,16 @@ 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 2021.11-1" + bool "armv6-eabihf musl bleeding-edge 2022.08-1" + depends on BR2_arm depends on BR2_ARM_CPU_ARMV6 depends on BR2_ARM_EABIHF depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 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 @@ -656,14 +675,16 @@ 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 2021.11-1" + bool "armv6-eabihf musl stable 2022.08-1" + depends on BR2_arm depends on BR2_ARM_CPU_ARMV6 depends on BR2_ARM_EABIHF depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 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 @@ -680,15 +701,17 @@ 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 2021.11-1" + bool "armv6-eabihf uclibc bleeding-edge 2022.08-1" + depends on BR2_arm depends on BR2_ARM_CPU_ARMV6 depends on BR2_ARM_EABIHF - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -704,15 +727,17 @@ 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 2021.11-1" + bool "armv6-eabihf uclibc stable 2022.08-1" + depends on BR2_arm depends on BR2_ARM_CPU_ARMV6 depends on BR2_ARM_EABIHF - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -728,15 +753,16 @@ 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 2021.11-1" + bool "armv7-eabihf glibc bleeding-edge 2022.08-1" + depends on BR2_arm depends on BR2_ARM_CPU_ARMV7A depends on BR2_ARM_EABIHF depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 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 @@ -753,15 +779,16 @@ 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 2021.11-1" + bool "armv7-eabihf glibc stable 2022.08-1" + depends on BR2_arm depends on BR2_ARM_CPU_ARMV7A depends on BR2_ARM_EABIHF depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 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 @@ -778,14 +805,16 @@ 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 2021.11-1" + bool "armv7-eabihf musl bleeding-edge 2022.08-1" + depends on BR2_arm depends on BR2_ARM_CPU_ARMV7A depends on BR2_ARM_EABIHF depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 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 @@ -802,14 +831,16 @@ 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 2021.11-1" + bool "armv7-eabihf musl stable 2022.08-1" + depends on BR2_arm depends on BR2_ARM_CPU_ARMV7A depends on BR2_ARM_EABIHF depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 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 @@ -826,15 +857,17 @@ 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 2021.11-1" + bool "armv7-eabihf uclibc bleeding-edge 2022.08-1" + depends on BR2_arm depends on BR2_ARM_CPU_ARMV7A depends on BR2_ARM_EABIHF - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -850,15 +883,17 @@ 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 2021.11-1" + bool "armv7-eabihf uclibc stable 2022.08-1" + depends on BR2_arm depends on BR2_ARM_CPU_ARMV7A depends on BR2_ARM_EABIHF - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -873,15 +908,173 @@ 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 2022.08-1" + depends on BR2_armeb + depends on BR2_ARM_CPU_ARMV7A + depends on BR2_ARM_EABIHF + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + 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 armebv7-eabihf 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_ARMEBV7_EABIHF_GLIBC_STABLE + bool "armebv7-eabihf glibc stable 2022.08-1" + depends on BR2_armeb + depends on BR2_ARM_CPU_ARMV7A + depends on BR2_ARM_EABIHF + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + 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 armebv7-eabihf 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_ARMEBV7_EABIHF_MUSL_BLEEDING_EDGE + bool "armebv7-eabihf musl bleeding-edge 2022.08-1" + depends on BR2_armeb + depends on BR2_ARM_CPU_ARMV7A + depends on BR2_ARM_EABIHF + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + 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_MUSL + help + Bootlin toolchain for the armebv7-eabihf architecture, + using the musl 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_ARMEBV7_EABIHF_MUSL_STABLE + bool "armebv7-eabihf musl stable 2022.08-1" + depends on BR2_armeb + depends on BR2_ARM_CPU_ARMV7A + depends on BR2_ARM_EABIHF + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + 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_MUSL + help + Bootlin toolchain for the armebv7-eabihf architecture, + using the musl 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_ARMEBV7_EABIHF_UCLIBC_BLEEDING_EDGE + bool "armebv7-eabihf uclibc bleeding-edge 2022.08-1" + depends on BR2_armeb + depends on BR2_ARM_CPU_ARMV7A + depends on BR2_ARM_EABIHF + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP + 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_UCLIBC + help + Bootlin toolchain for the armebv7-eabihf architecture, + using the uclibc 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_ARMEBV7_EABIHF_UCLIBC_STABLE + bool "armebv7-eabihf uclibc stable 2022.08-1" + depends on BR2_armeb + depends on BR2_ARM_CPU_ARMV7A + depends on BR2_ARM_EABIHF + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP + 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_UCLIBC + help + Bootlin toolchain for the armebv7-eabihf architecture, + using the uclibc 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_ARMV7M_UCLIBC_BLEEDING_EDGE - bool "armv7m uclibc bleeding-edge 2021.11-1" + bool "armv7m uclibc bleeding-edge 2022.08-1" + depends on BR2_arm depends on BR2_ARM_CPU_ARMV7M - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -895,14 +1088,16 @@ 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 2021.11-1" + bool "armv7m uclibc stable 2022.08-1" + depends on BR2_arm depends on BR2_ARM_CPU_ARMV7M - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -916,14 +1111,15 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7M_UCLIBC_STABLE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_UCLIBC_BLEEDING_EDGE - bool "m68k-68xxx uclibc bleeding-edge 2021.11-1" + bool "m68k-68xxx uclibc bleeding-edge 2022.08-1" depends on BR2_m68k_m68k - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -939,14 +1135,15 @@ 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 2021.11-1" + bool "m68k-68xxx uclibc stable 2022.08-1" depends on BR2_m68k_m68k - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -1004,11 +1201,11 @@ 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 2021.11-1" + bool "microblazebe glibc bleeding-edge 2022.08-1" depends on BR2_microblazebe depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -1027,11 +1224,11 @@ 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 2021.11-1" + bool "microblazebe glibc stable 2022.08-1" depends on BR2_microblazebe depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -1050,10 +1247,11 @@ 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 2021.11-1" + bool "microblazebe musl bleeding-edge 2022.08-1" depends on BR2_microblazebe depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -1072,10 +1270,11 @@ 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 2021.11-1" + bool "microblazebe musl stable 2022.08-1" depends on BR2_microblazebe depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -1094,9 +1293,10 @@ 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 2021.11-1" + bool "microblazebe uclibc bleeding-edge 2022.08-1" depends on BR2_microblazebe - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -1117,9 +1317,10 @@ 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 2021.11-1" + bool "microblazebe uclibc stable 2022.08-1" depends on BR2_microblazebe - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -1140,11 +1341,11 @@ 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 2021.11-1" + bool "microblazeel glibc bleeding-edge 2022.08-1" depends on BR2_microblazeel depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -1163,11 +1364,11 @@ 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 2021.11-1" + bool "microblazeel glibc stable 2022.08-1" depends on BR2_microblazeel depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -1186,10 +1387,11 @@ 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 2021.11-1" + bool "microblazeel musl bleeding-edge 2022.08-1" depends on BR2_microblazeel depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -1208,10 +1410,11 @@ 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 2021.11-1" + bool "microblazeel musl stable 2022.08-1" depends on BR2_microblazeel depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN @@ -1230,9 +1433,10 @@ 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 2021.11-1" + bool "microblazeel uclibc bleeding-edge 2022.08-1" depends on BR2_microblazeel - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -1253,9 +1457,10 @@ 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 2021.11-1" + bool "microblazeel uclibc stable 2022.08-1" depends on BR2_microblazeel - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE @@ -1276,16 +1481,16 @@ 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 2021.11-1" + bool "mips32 glibc bleeding-edge 2022.08-1" depends on BR2_mips depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 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 @@ -1302,16 +1507,16 @@ 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 2021.11-1" + bool "mips32 glibc stable 2022.08-1" depends on BR2_mips depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 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 @@ -1328,15 +1533,16 @@ 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 2021.11-1" + bool "mips32 musl bleeding-edge 2022.08-1" depends on BR2_mips depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 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 @@ -1353,15 +1559,16 @@ 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 2021.11-1" + bool "mips32 musl stable 2022.08-1" depends on BR2_mips depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 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 @@ -1377,16 +1584,17 @@ 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 2021.11-1" + bool "mips32 uclibc bleeding-edge 2022.08-1" depends on BR2_mips depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -1402,16 +1610,17 @@ 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 2021.11-1" + bool "mips32 uclibc stable 2022.08-1" depends on BR2_mips depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -1427,16 +1636,16 @@ 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 2021.11-1" + bool "mips32el glibc bleeding-edge 2022.08-1" depends on BR2_mipsel depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 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 @@ -1453,16 +1662,16 @@ 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 2021.11-1" + bool "mips32el glibc stable 2022.08-1" depends on BR2_mipsel depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 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 @@ -1479,15 +1688,16 @@ 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 2021.11-1" + bool "mips32el musl bleeding-edge 2022.08-1" depends on BR2_mipsel depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 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 @@ -1504,15 +1714,16 @@ 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 2021.11-1" + bool "mips32el musl stable 2022.08-1" depends on BR2_mipsel depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 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 @@ -1528,16 +1739,17 @@ 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 2021.11-1" + bool "mips32el uclibc bleeding-edge 2022.08-1" depends on BR2_mipsel depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -1553,16 +1765,17 @@ 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 2021.11-1" + bool "mips32el uclibc stable 2022.08-1" depends on BR2_mipsel depends on BR2_mips_32 depends on !BR2_MIPS_SOFT_FLOAT - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -1578,16 +1791,16 @@ 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 2021.11-1" + bool "mips32r5el glibc bleeding-edge 2022.08-1" depends on BR2_mipsel depends on BR2_mips_32r5 depends on !BR2_MIPS_SOFT_FLOAT depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 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 @@ -1604,16 +1817,16 @@ 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 2021.11-1" + bool "mips32r5el glibc stable 2022.08-1" depends on BR2_mipsel depends on BR2_mips_32r5 depends on !BR2_MIPS_SOFT_FLOAT depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 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 @@ -1630,15 +1843,16 @@ 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 2021.11-1" + bool "mips32r5el musl bleeding-edge 2022.08-1" depends on BR2_mipsel depends on BR2_mips_32r5 depends on !BR2_MIPS_SOFT_FLOAT depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 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 @@ -1655,15 +1869,16 @@ 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 2021.11-1" + bool "mips32r5el musl stable 2022.08-1" depends on BR2_mipsel depends on BR2_mips_32r5 depends on !BR2_MIPS_SOFT_FLOAT depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 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 @@ -1680,16 +1895,17 @@ 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 2021.11-1" + bool "mips32r5el uclibc bleeding-edge 2022.08-1" depends on BR2_mipsel depends on BR2_mips_32r5 depends on !BR2_MIPS_SOFT_FLOAT - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -1705,16 +1921,17 @@ 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 2021.11-1" + bool "mips32r5el uclibc stable 2022.08-1" depends on BR2_mipsel depends on BR2_mips_32r5 depends on !BR2_MIPS_SOFT_FLOAT - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -1730,16 +1947,16 @@ 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 2021.11-1" + bool "mips32r6el glibc bleeding-edge 2022.08-1" depends on BR2_mipsel depends on BR2_mips_32r6 depends on !BR2_MIPS_SOFT_FLOAT depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 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 @@ -1756,16 +1973,16 @@ 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 2021.11-1" + bool "mips32r6el glibc stable 2022.08-1" depends on BR2_mipsel depends on BR2_mips_32r6 depends on !BR2_MIPS_SOFT_FLOAT depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 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 @@ -1782,15 +1999,16 @@ 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 2021.11-1" + bool "mips32r6el musl bleeding-edge 2022.08-1" depends on BR2_mipsel depends on BR2_mips_32r6 depends on !BR2_MIPS_SOFT_FLOAT depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 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 @@ -1807,15 +2025,16 @@ 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 2021.11-1" + bool "mips32r6el musl stable 2022.08-1" depends on BR2_mipsel depends on BR2_mips_32r6 depends on !BR2_MIPS_SOFT_FLOAT depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 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 @@ -1832,16 +2051,17 @@ 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 2021.11-1" + bool "mips32r6el uclibc bleeding-edge 2022.08-1" depends on BR2_mipsel depends on BR2_mips_32r6 depends on !BR2_MIPS_SOFT_FLOAT - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -1857,16 +2077,17 @@ 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 2021.11-1" + bool "mips32r6el uclibc stable 2022.08-1" depends on BR2_mipsel depends on BR2_mips_32r6 depends on !BR2_MIPS_SOFT_FLOAT - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -1882,17 +2103,17 @@ 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 2021.11-1" + bool "mips64-n32 glibc bleeding-edge 2022.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_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 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 @@ -1909,17 +2130,17 @@ 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 2021.11-1" + bool "mips64-n32 glibc stable 2022.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_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 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 @@ -1936,16 +2157,17 @@ 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 2021.11-1" + bool "mips64-n32 musl bleeding-edge 2022.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_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 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 @@ -1962,16 +2184,17 @@ 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 2021.11-1" + bool "mips64-n32 musl stable 2022.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_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 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 @@ -1988,17 +2211,18 @@ 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 2021.11-1" + bool "mips64-n32 uclibc bleeding-edge 2022.08-1" depends on BR2_mips64 depends on BR2_mips_64 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -2014,17 +2238,18 @@ 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 2021.11-1" + bool "mips64-n32 uclibc stable 2022.08-1" depends on BR2_mips64 depends on BR2_mips_64 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -2040,17 +2265,17 @@ 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 2021.11-1" + bool "mips64el-n32 glibc bleeding-edge 2022.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_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 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 @@ -2067,17 +2292,17 @@ 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 2021.11-1" + bool "mips64el-n32 glibc stable 2022.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_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 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 @@ -2094,16 +2319,17 @@ 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 2021.11-1" + bool "mips64el-n32 musl bleeding-edge 2022.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_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 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 @@ -2120,16 +2346,17 @@ 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 2021.11-1" + bool "mips64el-n32 musl stable 2022.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_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 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 @@ -2146,17 +2373,18 @@ 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 2021.11-1" + bool "mips64el-n32 uclibc bleeding-edge 2022.08-1" depends on BR2_mips64el depends on BR2_mips_64 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -2172,17 +2400,18 @@ 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 2021.11-1" + bool "mips64el-n32 uclibc stable 2022.08-1" depends on BR2_mips64el depends on BR2_mips_64 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -2198,17 +2427,17 @@ 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 2021.11-1" + bool "mips64r6el-n32 glibc bleeding-edge 2022.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_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 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 @@ -2225,17 +2454,17 @@ 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 2021.11-1" + bool "mips64r6el-n32 glibc stable 2022.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_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 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 @@ -2252,16 +2481,17 @@ 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 2021.11-1" + bool "mips64r6el-n32 musl bleeding-edge 2022.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_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 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 @@ -2278,16 +2508,17 @@ 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 2021.11-1" + bool "mips64r6el-n32 musl stable 2022.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_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 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 @@ -2304,17 +2535,18 @@ 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 2021.11-1" + bool "mips64r6el-n32 uclibc bleeding-edge 2022.08-1" depends on BR2_mips64el depends on BR2_mips_64r6 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -2330,17 +2562,18 @@ 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 2021.11-1" + bool "mips64r6el-n32 uclibc stable 2022.08-1" depends on BR2_mips64el depends on BR2_mips_64r6 depends on BR2_MIPS_NABI32 depends on !BR2_MIPS_SOFT_FLOAT - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -2356,14 +2589,14 @@ 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 2021.11-1" + bool "nios2 glibc bleeding-edge 2022.08-1" depends on BR2_nios2 depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 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 @@ -2380,14 +2613,14 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_STABLE - bool "nios2 glibc stable 2021.11-1" + bool "nios2 glibc stable 2022.08-1" depends on BR2_nios2 depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 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 @@ -2403,14 +2636,66 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_STABLE https://toolchains.bootlin.com/ -config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_BLEEDING_EDGE - bool "openrisc musl bleeding-edge 2021.11-5" +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_GLIBC_BLEEDING_EDGE + bool "openrisc glibc bleeding-edge 2022.08-1" + depends on BR2_or1k + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + 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 openrisc 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_OPENRISC_GLIBC_STABLE + bool "openrisc glibc stable 2022.08-1" depends on BR2_or1k depends on BR2_USE_MMU + select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 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 openrisc 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_MUSL_BLEEDING_EDGE + bool "openrisc musl bleeding-edge 2022.08-1" + depends on BR2_or1k + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + 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 @@ -2427,13 +2712,15 @@ 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 2021.11-5" + bool "openrisc musl stable 2022.08-1" depends on BR2_or1k depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 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 @@ -2449,14 +2736,16 @@ 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 2021.11-5" + bool "openrisc uclibc bleeding-edge 2022.08-1" depends on BR2_or1k - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -2472,14 +2761,16 @@ 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 2021.11-5" + bool "openrisc uclibc stable 2022.08-1" depends on BR2_or1k - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -2495,15 +2786,15 @@ 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 2021.11-1" + bool "powerpc-440fp glibc bleeding-edge 2022.08-1" depends on BR2_powerpc depends on BR2_powerpc_440fp depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 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 @@ -2520,15 +2811,15 @@ 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 2021.11-1" + bool "powerpc-440fp glibc stable 2022.08-1" depends on BR2_powerpc depends on BR2_powerpc_440fp depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 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 @@ -2545,14 +2836,15 @@ 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 2021.11-1" + bool "powerpc-440fp musl bleeding-edge 2022.08-1" depends on BR2_powerpc depends on BR2_powerpc_440fp depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -2568,14 +2860,15 @@ 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 2021.11-1" + bool "powerpc-440fp musl stable 2022.08-1" depends on BR2_powerpc depends on BR2_powerpc_440fp depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -2591,15 +2884,16 @@ 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 2021.11-1" + bool "powerpc-440fp uclibc bleeding-edge 2022.08-1" depends on BR2_powerpc depends on BR2_powerpc_440fp - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -2615,15 +2909,16 @@ 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 2021.11-1" + bool "powerpc-440fp uclibc stable 2022.08-1" depends on BR2_powerpc depends on BR2_powerpc_440fp - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -2639,15 +2934,15 @@ 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 2021.11-1" + bool "powerpc-e300c3 glibc bleeding-edge 2022.08-1" depends on BR2_powerpc depends on BR2_powerpc_e300c3 depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 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 @@ -2664,15 +2959,15 @@ 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 2021.11-1" + bool "powerpc-e300c3 glibc stable 2022.08-1" depends on BR2_powerpc depends on BR2_powerpc_e300c3 depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 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 @@ -2689,14 +2984,15 @@ 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 2021.11-1" + bool "powerpc-e300c3 musl bleeding-edge 2022.08-1" depends on BR2_powerpc depends on BR2_powerpc_e300c3 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -2712,14 +3008,15 @@ 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 2021.11-1" + bool "powerpc-e300c3 musl stable 2022.08-1" depends on BR2_powerpc depends on BR2_powerpc_e300c3 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -2735,15 +3032,16 @@ 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 2021.11-1" + bool "powerpc-e300c3 uclibc bleeding-edge 2022.08-1" depends on BR2_powerpc depends on BR2_powerpc_e300c3 - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -2759,15 +3057,16 @@ 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 2021.11-1" + bool "powerpc-e300c3 uclibc stable 2022.08-1" depends on BR2_powerpc depends on BR2_powerpc_e300c3 - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -2783,15 +3082,15 @@ 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 2021.11-1" + bool "powerpc-e500mc glibc bleeding-edge 2022.08-1" depends on BR2_powerpc depends on BR2_powerpc_e500mc depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 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 @@ -2808,15 +3107,15 @@ 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 2021.11-1" + bool "powerpc-e500mc glibc stable 2022.08-1" depends on BR2_powerpc depends on BR2_powerpc_e500mc depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 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 @@ -2833,14 +3132,15 @@ 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 2021.11-1" + bool "powerpc-e500mc musl bleeding-edge 2022.08-1" depends on BR2_powerpc depends on BR2_powerpc_e500mc depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -2856,14 +3156,15 @@ 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 2021.11-1" + bool "powerpc-e500mc musl stable 2022.08-1" depends on BR2_powerpc depends on BR2_powerpc_e500mc depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -2879,15 +3180,16 @@ 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 2021.11-1" + bool "powerpc-e500mc uclibc bleeding-edge 2022.08-1" depends on BR2_powerpc depends on BR2_powerpc_e500mc - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -2903,15 +3205,16 @@ 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 2021.11-1" + bool "powerpc-e500mc uclibc stable 2022.08-1" depends on BR2_powerpc depends on BR2_powerpc_e500mc - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -2927,15 +3230,15 @@ 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 2021.11-1" + bool "powerpc64-e5500 glibc bleeding-edge 2022.08-1" depends on BR2_powerpc64 depends on BR2_powerpc_e5500 depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 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 @@ -2952,15 +3255,15 @@ 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 2021.11-1" + bool "powerpc64-e5500 glibc stable 2022.08-1" depends on BR2_powerpc64 depends on BR2_powerpc_e5500 depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 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 @@ -2977,15 +3280,15 @@ 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 2021.11-1" + bool "powerpc64-e6500 glibc bleeding-edge 2022.08-1" depends on BR2_powerpc64 depends on BR2_powerpc_e6500 depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 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 @@ -3002,15 +3305,15 @@ 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 2021.11-1" + bool "powerpc64-e6500 glibc stable 2022.08-1" depends on BR2_powerpc64 depends on BR2_powerpc_e6500 depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 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 @@ -3027,14 +3330,15 @@ 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 2021.11-1" + bool "powerpc64-e6500 musl bleeding-edge 2022.08-1" depends on BR2_powerpc64 depends on BR2_powerpc_e6500 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 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 @@ -3051,14 +3355,15 @@ 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 2021.11-1" + bool "powerpc64-e6500 musl stable 2022.08-1" depends on BR2_powerpc64 depends on BR2_powerpc_e6500 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 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 @@ -3075,15 +3380,15 @@ 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 2021.11-2" + bool "powerpc64-power8 glibc bleeding-edge 2022.08-1" depends on BR2_powerpc64 depends on BR2_powerpc_power8 depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 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 @@ -3100,15 +3405,15 @@ 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 2021.11-1" + bool "powerpc64-power8 glibc stable 2022.08-1" depends on BR2_powerpc64 depends on BR2_powerpc_power8 depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 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 @@ -3125,14 +3430,15 @@ 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 2021.11-2" + bool "powerpc64-power8 musl bleeding-edge 2022.08-1" depends on BR2_powerpc64 depends on BR2_powerpc_power8 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 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 @@ -3149,14 +3455,15 @@ 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 2021.11-1" + bool "powerpc64-power8 musl stable 2022.08-1" depends on BR2_powerpc64 depends on BR2_powerpc_power8 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 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 @@ -3173,15 +3480,15 @@ 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 2021.11-2" + bool "powerpc64le-power8 glibc bleeding-edge 2022.08-1" depends on BR2_powerpc64le depends on BR2_powerpc_power8 depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 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 @@ -3198,15 +3505,15 @@ 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 2021.11-1" + bool "powerpc64le-power8 glibc stable 2022.08-1" depends on BR2_powerpc64le depends on BR2_powerpc_power8 depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 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 @@ -3223,14 +3530,15 @@ 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 2021.11-2" + bool "powerpc64le-power8 musl bleeding-edge 2022.08-1" depends on BR2_powerpc64le depends on BR2_powerpc_power8 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 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 @@ -3247,14 +3555,15 @@ 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 2021.11-1" + bool "powerpc64le-power8 musl stable 2022.08-1" depends on BR2_powerpc64le depends on BR2_powerpc_power8 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 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 @@ -3271,17 +3580,17 @@ 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 2021.11-1" + bool "riscv32-ilp32d glibc bleeding-edge 2022.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_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 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 @@ -3298,17 +3607,17 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV32_ILP32D_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_GLIBC_BLEEDING_EDGE - bool "riscv64-lp64d glibc bleeding-edge 2021.11-1" + bool "riscv64-lp64d glibc bleeding-edge 2022.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_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 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 @@ -3325,17 +3634,17 @@ 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 2021.11-1" + bool "riscv64-lp64d glibc stable 2022.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_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 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 @@ -3352,16 +3661,17 @@ 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 2021.11-1" + bool "riscv64-lp64d musl bleeding-edge 2022.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 - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 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 @@ -3378,16 +3688,17 @@ 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 2021.11-1" + bool "riscv64-lp64d musl stable 2022.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 - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 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 @@ -3404,17 +3715,19 @@ 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 2021.11-1" + bool "riscv64-lp64d uclibc bleeding-edge 2022.08-1" depends on BR2_riscv depends on BR2_riscv_g depends on BR2_RISCV_64 depends on BR2_RISCV_ABI_LP64D - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -3430,17 +3743,19 @@ 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 2021.11-1" + bool "riscv64-lp64d uclibc stable 2022.08-1" depends on BR2_riscv depends on BR2_riscv_g depends on BR2_RISCV_64 depends on BR2_RISCV_ABI_LP64D - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -3455,16 +3770,66 @@ 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 2022.08-1" + depends on BR2_s390x + depends on BR2_s390x_z13 + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + 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 s390x-z13 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_S390X_Z13_GLIBC_STABLE + bool "s390x-z13 glibc stable 2022.08-1" + depends on BR2_s390x + depends on BR2_s390x_z13 + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + 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 s390x-z13 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_SH_SH4_GLIBC_BLEEDING_EDGE - bool "sh-sh4 glibc bleeding-edge 2021.11-1" + bool "sh-sh4 glibc bleeding-edge 2022.08-1" depends on BR2_sh depends on BR2_sh4 depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 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 @@ -3481,15 +3846,15 @@ 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 2021.11-1" + bool "sh-sh4 glibc stable 2022.08-1" depends on BR2_sh depends on BR2_sh4 depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 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 @@ -3506,14 +3871,15 @@ 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 2021.11-1" + bool "sh-sh4 musl bleeding-edge 2022.08-1" depends on BR2_sh depends on BR2_sh4 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 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 @@ -3530,14 +3896,15 @@ 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 2021.11-1" + bool "sh-sh4 musl stable 2022.08-1" depends on BR2_sh depends on BR2_sh4 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 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 @@ -3553,15 +3920,16 @@ 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 2021.11-1" + bool "sh-sh4 uclibc bleeding-edge 2022.08-1" depends on BR2_sh depends on BR2_sh4 - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -3577,15 +3945,16 @@ 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 2021.11-1" + bool "sh-sh4 uclibc stable 2022.08-1" depends on BR2_sh depends on BR2_sh4 - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -3601,15 +3970,15 @@ 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 2021.11-1" + bool "sh-sh4aeb glibc bleeding-edge 2022.08-1" depends on BR2_sh depends on BR2_sh4aeb depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 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 @@ -3626,15 +3995,15 @@ 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 2021.11-1" + bool "sh-sh4aeb glibc stable 2022.08-1" depends on BR2_sh depends on BR2_sh4aeb depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 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 @@ -3651,14 +4020,15 @@ 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 2021.11-1" + bool "sh-sh4aeb musl bleeding-edge 2022.08-1" depends on BR2_sh depends on BR2_sh4aeb depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 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 @@ -3675,14 +4045,15 @@ 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 2021.11-1" + bool "sh-sh4aeb musl stable 2022.08-1" depends on BR2_sh depends on BR2_sh4aeb depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 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 @@ -3698,15 +4069,15 @@ 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 2021.11-1" + bool "sparc64 glibc bleeding-edge 2022.08-1" depends on BR2_sparc64 depends on BR2_sparc_v9 depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 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 @@ -3723,15 +4094,15 @@ 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 2021.11-1" + bool "sparc64 glibc stable 2022.08-1" depends on BR2_sparc64 depends on BR2_sparc_v9 depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 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 @@ -3748,15 +4119,16 @@ 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 2021.11-3" + bool "sparcv8 uclibc bleeding-edge 2022.08-2" depends on BR2_sparc depends on BR2_sparc_v8 - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -3772,7 +4144,7 @@ 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 2021.11-1" + bool "sparcv8 uclibc stable 2022.08-1" depends on BR2_sparc depends on BR2_sparc_v8 select BR2_TOOLCHAIN_GCC_AT_LEAST_10 @@ -3781,6 +4153,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARCV8_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -3796,17 +4169,17 @@ 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 2021.11-5" + bool "x86-64 glibc bleeding-edge 2022.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_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 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 @@ -3823,17 +4196,17 @@ 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 2021.11-5" + bool "x86-64 glibc stable 2022.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_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 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 @@ -3850,16 +4223,17 @@ 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 2021.11-5" + bool "x86-64 musl bleeding-edge 2022.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_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 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 @@ -3876,16 +4250,17 @@ 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 2021.11-5" + bool "x86-64 musl stable 2022.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_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 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 @@ -3901,17 +4276,18 @@ 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 2021.11-5" + bool "x86-64 uclibc bleeding-edge 2022.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 - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -3927,17 +4303,18 @@ 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 2021.11-5" + bool "x86-64 uclibc stable 2022.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 - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -3953,7 +4330,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 2021.11-5" + bool "x86-64-v2 glibc bleeding-edge 2022.08-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -3963,11 +4340,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_GLIBC_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_SSE4 depends on BR2_X86_CPU_HAS_SSE42 depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 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 @@ -3983,8 +4360,8 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ -config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_MUSL_BLEEDING_EDGE - bool "x86-64-v2 musl bleeding-edge 2021.11-5" +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_GLIBC_STABLE + bool "x86-64-v2 glibc stable 2022.08-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -3995,9 +4372,41 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_MUSL_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_SSE42 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + 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 x86-64-v2 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_X86_64_V2_MUSL_BLEEDING_EDGE + bool "x86-64-v2 musl bleeding-edge 2022.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_X86_CPU_HAS_SSE3 + depends on BR2_X86_CPU_HAS_SSSE3 + depends on BR2_X86_CPU_HAS_SSE4 + depends on BR2_X86_CPU_HAS_SSE42 + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 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 @@ -4013,8 +4422,8 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ -config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_UCLIBC_BLEEDING_EDGE - bool "x86-64-v2 uclibc bleeding-edge 2021.11-5" +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_MUSL_STABLE + bool "x86-64-v2 musl stable 2022.08-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4023,12 +4432,43 @@ 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_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + 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_MUSL + help + Bootlin toolchain for the x86-64-v2 architecture, using the + musl 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_X86_64_V2_UCLIBC_BLEEDING_EDGE + bool "x86-64-v2 uclibc bleeding-edge 2022.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_X86_CPU_HAS_SSE3 + depends on BR2_X86_CPU_HAS_SSSE3 + depends on BR2_X86_CPU_HAS_SSE4 + depends on BR2_X86_CPU_HAS_SSE42 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -4043,8 +4483,39 @@ 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 2022.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_X86_CPU_HAS_SSE3 + depends on BR2_X86_CPU_HAS_SSSE3 + depends on BR2_X86_CPU_HAS_SSE4 + depends on BR2_X86_CPU_HAS_SSE42 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP + 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_UCLIBC + help + Bootlin toolchain for the x86-64-v2 architecture, using the + uclibc 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_X86_64_V3_GLIBC_BLEEDING_EDGE - bool "x86-64-v3 glibc bleeding-edge 2021.11-5" + bool "x86-64-v3 glibc bleeding-edge 2022.08-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4056,11 +4527,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_GLIBC_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_AVX depends on BR2_X86_CPU_HAS_AVX2 depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 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 @@ -4076,8 +4547,8 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ -config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_MUSL_BLEEDING_EDGE - bool "x86-64-v3 musl bleeding-edge 2021.11-5" +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_GLIBC_STABLE + bool "x86-64-v3 glibc stable 2022.08-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4090,9 +4561,43 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_MUSL_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_AVX2 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + 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 x86-64-v3 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_X86_64_V3_MUSL_BLEEDING_EDGE + bool "x86-64-v3 musl bleeding-edge 2022.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_X86_CPU_HAS_SSE3 + depends on BR2_X86_CPU_HAS_SSSE3 + depends on BR2_X86_CPU_HAS_SSE4 + depends on BR2_X86_CPU_HAS_SSE42 + depends on BR2_X86_CPU_HAS_AVX + depends on BR2_X86_CPU_HAS_AVX2 + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 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 @@ -4108,8 +4613,8 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ -config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_UCLIBC_BLEEDING_EDGE - bool "x86-64-v3 uclibc bleeding-edge 2021.11-5" +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_MUSL_STABLE + bool "x86-64-v3 musl stable 2022.08-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4120,12 +4625,45 @@ 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_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + 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_MUSL + help + Bootlin toolchain for the x86-64-v3 architecture, using the + musl 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_X86_64_V3_UCLIBC_BLEEDING_EDGE + bool "x86-64-v3 uclibc bleeding-edge 2022.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_X86_CPU_HAS_SSE3 + depends on BR2_X86_CPU_HAS_SSSE3 + depends on BR2_X86_CPU_HAS_SSE4 + depends on BR2_X86_CPU_HAS_SSE42 + depends on BR2_X86_CPU_HAS_AVX + depends on BR2_X86_CPU_HAS_AVX2 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -4140,8 +4678,41 @@ 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 2022.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_X86_CPU_HAS_SSE3 + depends on BR2_X86_CPU_HAS_SSSE3 + depends on BR2_X86_CPU_HAS_SSE4 + depends on BR2_X86_CPU_HAS_SSE42 + depends on BR2_X86_CPU_HAS_AVX + depends on BR2_X86_CPU_HAS_AVX2 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP + 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_UCLIBC + help + Bootlin toolchain for the x86-64-v3 architecture, using the + uclibc 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_X86_64_V4_GLIBC_BLEEDING_EDGE - bool "x86-64-v4 glibc bleeding-edge 2021.11-5" + bool "x86-64-v4 glibc bleeding-edge 2022.08-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4154,11 +4725,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_GLIBC_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_AVX2 depends on BR2_X86_CPU_HAS_AVX512 depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 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 @@ -4174,8 +4745,8 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_GLIBC_BLEEDING_EDGE https://toolchains.bootlin.com/ -config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_MUSL_BLEEDING_EDGE - bool "x86-64-v4 musl bleeding-edge 2021.11-5" +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_GLIBC_STABLE + bool "x86-64-v4 glibc stable 2022.08-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4189,9 +4760,44 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_MUSL_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_AVX512 depends on BR2_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + 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 x86-64-v4 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_X86_64_V4_MUSL_BLEEDING_EDGE + bool "x86-64-v4 musl bleeding-edge 2022.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_X86_CPU_HAS_SSE3 + depends on BR2_X86_CPU_HAS_SSSE3 + depends on BR2_X86_CPU_HAS_SSE4 + depends on BR2_X86_CPU_HAS_SSE42 + depends on BR2_X86_CPU_HAS_AVX + depends on BR2_X86_CPU_HAS_AVX2 + depends on BR2_X86_CPU_HAS_AVX512 + depends on BR2_USE_MMU + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 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 @@ -4207,8 +4813,8 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_MUSL_BLEEDING_EDGE https://toolchains.bootlin.com/ -config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_UCLIBC_BLEEDING_EDGE - bool "x86-64-v4 uclibc bleeding-edge 2021.11-5" +config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_MUSL_STABLE + bool "x86-64-v4 musl stable 2022.08-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4220,12 +4826,46 @@ 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_USE_MMU select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + 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_MUSL + help + Bootlin toolchain for the x86-64-v4 architecture, using the + musl 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_X86_64_V4_UCLIBC_BLEEDING_EDGE + bool "x86-64-v4 uclibc bleeding-edge 2022.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_X86_CPU_HAS_SSE3 + depends on BR2_X86_CPU_HAS_SSSE3 + depends on BR2_X86_CPU_HAS_SSE4 + depends on BR2_X86_CPU_HAS_SSE42 + depends on BR2_X86_CPU_HAS_AVX + depends on BR2_X86_CPU_HAS_AVX2 + depends on BR2_X86_CPU_HAS_AVX512 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -4240,8 +4880,42 @@ 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 2022.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_X86_CPU_HAS_SSE3 + depends on BR2_X86_CPU_HAS_SSSE3 + depends on BR2_X86_CPU_HAS_SSE4 + depends on BR2_X86_CPU_HAS_SSE42 + depends on BR2_X86_CPU_HAS_AVX + depends on BR2_X86_CPU_HAS_AVX2 + depends on BR2_X86_CPU_HAS_AVX512 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 + select BR2_USE_WCHAR + select BR2_ENABLE_LOCALE + select BR2_INSTALL_LIBSTDCPP + select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP + 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_UCLIBC + help + Bootlin toolchain for the x86-64-v4 architecture, using the + uclibc 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_X86_64_CORE_I7_GLIBC_BLEEDING_EDGE - bool "x86-64-core-i7 glibc bleeding-edge 2021.11-1" + bool "x86-64-core-i7 glibc bleeding-edge 2022.08-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4251,11 +4925,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_SSE4 depends on BR2_X86_CPU_HAS_SSE42 depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 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 @@ -4272,7 +4946,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 2021.11-1" + bool "x86-64-core-i7 glibc stable 2022.08-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4282,11 +4956,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_STABLE depends on BR2_X86_CPU_HAS_SSE4 depends on BR2_X86_CPU_HAS_SSE42 depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 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 @@ -4303,7 +4977,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 2021.11-1" + bool "x86-64-core-i7 musl bleeding-edge 2022.08-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4313,10 +4987,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_MUSL_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_SSE4 depends on BR2_X86_CPU_HAS_SSE42 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 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 @@ -4333,7 +5008,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 2021.11-1" + bool "x86-64-core-i7 musl stable 2022.08-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4343,10 +5018,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_MUSL_STABLE depends on BR2_X86_CPU_HAS_SSE4 depends on BR2_X86_CPU_HAS_SSE42 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 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 @@ -4363,7 +5039,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 2021.11-1" + bool "x86-64-core-i7 uclibc bleeding-edge 2022.08-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4372,12 +5048,13 @@ 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 - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -4393,7 +5070,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 2021.11-1" + bool "x86-64-core-i7 uclibc stable 2022.08-1" depends on BR2_x86_64 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4402,12 +5079,13 @@ 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 - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -4423,7 +5101,7 @@ 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 2021.11-1" + bool "x86-core2 glibc bleeding-edge 2022.08-1" depends on BR2_i386 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4431,11 +5109,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_GLIBC_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_SSE3 depends on BR2_X86_CPU_HAS_SSSE3 depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 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 @@ -4452,7 +5130,7 @@ 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 2021.11-1" + bool "x86-core2 glibc stable 2022.08-1" depends on BR2_i386 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4460,11 +5138,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_GLIBC_STABLE depends on BR2_X86_CPU_HAS_SSE3 depends on BR2_X86_CPU_HAS_SSSE3 depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 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 @@ -4481,7 +5159,7 @@ 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 2021.11-1" + bool "x86-core2 musl bleeding-edge 2022.08-1" depends on BR2_i386 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4489,10 +5167,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_MUSL_BLEEDING_EDGE depends on BR2_X86_CPU_HAS_SSE3 depends on BR2_X86_CPU_HAS_SSSE3 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -4508,7 +5187,7 @@ 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 2021.11-1" + bool "x86-core2 musl stable 2022.08-1" depends on BR2_i386 depends on BR2_X86_CPU_HAS_MMX depends on BR2_X86_CPU_HAS_SSE @@ -4516,10 +5195,11 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_MUSL_STABLE depends on BR2_X86_CPU_HAS_SSE3 depends on BR2_X86_CPU_HAS_SSSE3 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -4534,19 +5214,20 @@ 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 2021.11-1" + bool "x86-core2 uclibc bleeding-edge 2022.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 - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -4562,19 +5243,20 @@ 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 2021.11-1" + bool "x86-core2 uclibc stable 2022.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 - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -4590,17 +5272,22 @@ 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 2021.11-1" + bool "x86-i686 glibc bleeding-edge 2022.08-1" depends on BR2_i386 depends on !BR2_x86_i486 depends on !BR2_x86_i586 depends on !BR2_x86_x1000 + depends on !BR2_x86_pentium_mmx + depends on !BR2_x86_geode + depends on !BR2_x86_c3 + depends on !BR2_x86_winchip_c6 + depends on !BR2_x86_winchip2 depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 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 @@ -4617,17 +5304,22 @@ 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 2021.11-1" + bool "x86-i686 glibc stable 2022.08-1" depends on BR2_i386 depends on !BR2_x86_i486 depends on !BR2_x86_i586 depends on !BR2_x86_x1000 + depends on !BR2_x86_pentium_mmx + depends on !BR2_x86_geode + depends on !BR2_x86_c3 + depends on !BR2_x86_winchip_c6 + depends on !BR2_x86_winchip2 depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 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 @@ -4644,16 +5336,22 @@ 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 2021.11-1" + bool "x86-i686 musl bleeding-edge 2022.08-1" depends on BR2_i386 depends on !BR2_x86_i486 depends on !BR2_x86_i586 depends on !BR2_x86_x1000 + depends on !BR2_x86_pentium_mmx + depends on !BR2_x86_geode + depends on !BR2_x86_c3 + depends on !BR2_x86_winchip_c6 + depends on !BR2_x86_winchip2 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -4669,16 +5367,22 @@ 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 2021.11-1" + bool "x86-i686 musl stable 2022.08-1" depends on BR2_i386 depends on !BR2_x86_i486 depends on !BR2_x86_i586 depends on !BR2_x86_x1000 + depends on !BR2_x86_pentium_mmx + depends on !BR2_x86_geode + depends on !BR2_x86_c3 + depends on !BR2_x86_winchip_c6 + depends on !BR2_x86_winchip2 depends on BR2_USE_MMU - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -4693,17 +5397,23 @@ 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 2021.11-1" + bool "x86-i686 uclibc bleeding-edge 2022.08-1" depends on BR2_i386 depends on !BR2_x86_i486 depends on !BR2_x86_i586 depends on !BR2_x86_x1000 - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + depends on !BR2_x86_pentium_mmx + depends on !BR2_x86_geode + depends on !BR2_x86_c3 + depends on !BR2_x86_winchip_c6 + depends on !BR2_x86_winchip2 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -4719,17 +5429,23 @@ 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 2021.11-1" + bool "x86-i686 uclibc stable 2022.08-1" depends on BR2_i386 depends on !BR2_x86_i486 depends on !BR2_x86_i586 depends on !BR2_x86_x1000 - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + depends on !BR2_x86_pentium_mmx + depends on !BR2_x86_geode + depends on !BR2_x86_c3 + depends on !BR2_x86_winchip_c6 + depends on !BR2_x86_winchip2 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -4745,16 +5461,17 @@ 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 2021.11-1" + bool "xtensa-lx60 uclibc bleeding-edge 2022.08-1" depends on BR2_xtensa depends on BR2_XTENSA_CUSTOM depends on BR2_XTENSA_LITTLE_ENDIAN - select BR2_TOOLCHAIN_GCC_AT_LEAST_11 + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -4770,16 +5487,17 @@ 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 2021.11-1" + bool "xtensa-lx60 uclibc stable 2022.08-1" depends on BR2_xtensa depends on BR2_XTENSA_CUSTOM depends on BR2_XTENSA_LITTLE_ENDIAN - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_11 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_USE_WCHAR select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS 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 65426940335..9565ab1c1ee 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash +++ b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash @@ -1,378 +1,416 @@ # 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-2021.11-1.sha256 -sha256 55b90e0e844ac02a7fc3352be42b7cb9bb3ec582c23649dbb77e05c60eb84434 aarch64--glibc--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--glibc--stable-2021.11-1.sha256 -sha256 dec070196608124fa14c3f192364c5b5b057d7f34651ad58ebb8fc87959c97f7 aarch64--glibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--musl--bleeding-edge-2021.11-1.sha256 -sha256 c56f51c518eca9e614cc639ffb99719531c1022275045a43dfcdf79a142ba4dc aarch64--musl--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--musl--stable-2021.11-1.sha256 -sha256 6919b4cf04b8c5628a2a93bcf4b05e1143ab15dfb4bc2acde02a2e3c075bf041 aarch64--musl--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--uclibc--bleeding-edge-2021.11-1.sha256 -sha256 9ba30538bb38a3ee4db5289469fd0a539ba248b00da4e1b1b6f5c3724c20deef aarch64--uclibc--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--uclibc--stable-2021.11-1.sha256 -sha256 ec629adb0acd80d56b00f35e9fe823571bdcdb72072c7fc2d50607b3882c1f98 aarch64--uclibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--glibc--bleeding-edge-2021.11-1.sha256 -sha256 8d610107f7bea8957d71dca45bb84368c74e01da786a113d1089b72ee79ca095 aarch64be--glibc--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--glibc--stable-2021.11-1.sha256 -sha256 6327121b67799ea967882cba746d25cf6a274a061f283d5c1b2818a651da0c9a aarch64be--glibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--uclibc--bleeding-edge-2021.11-1.sha256 -sha256 809d448f3f54fd9a4b01440acc697c022f3f0107e1bf0e9de3ee454a57be99e4 aarch64be--uclibc--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--uclibc--stable-2021.11-1.sha256 -sha256 08898011a5f12bf3fa0646a794bb63422fa24d20eb79d01665b2f91aa65f75aa aarch64be--uclibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-750d/tarballs/arcle-750d--uclibc--bleeding-edge-2021.11-1.sha256 -sha256 088b03942306b572db93025eae703086ddbfe9886e14544cf68ecd9dfa0ad4b4 arcle-750d--uclibc--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-750d/tarballs/arcle-750d--uclibc--stable-2021.11-1.sha256 -sha256 6a7454aa1559ef304dfa55361763167848eb6d47539be31b24c7cf6723f581fd arcle-750d--uclibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs/arcle-hs38--glibc--bleeding-edge-2021.11-1.sha256 -sha256 e2a35602cf3a518e16681184c5ac095693dbc1d3edd1ae219da2dfff0cce7d67 arcle-hs38--glibc--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs/arcle-hs38--glibc--stable-2021.11-3.sha256 -sha256 c7c00e3dcdb5123098cea365cfcf261e36adcf816bdd62e4e1ad661e1145f084 arcle-hs38--glibc--stable-2021.11-3.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs/arcle-hs38--uclibc--bleeding-edge-2021.11-1.sha256 -sha256 552b2387ed8129fd205d3387ca508f816d1a67b90dd1d5ea16ff4872c5129fd9 arcle-hs38--uclibc--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs/arcle-hs38--uclibc--stable-2021.11-1.sha256 -sha256 85ea258031a8c304dce0a660c18e67ec415a032f0d9f2c4080f04a47efb44c48 arcle-hs38--uclibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--glibc--bleeding-edge-2021.11-1.sha256 -sha256 72a1964f1ba61d730b6be3b178bb4bc24de191a2ad8ada36e067d57011aae1a4 armv5-eabi--glibc--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--glibc--stable-2021.11-1.sha256 -sha256 22de590c491057d2f974b315055b357511319227c6084cccb1532e30c829687c armv5-eabi--glibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--musl--bleeding-edge-2021.11-1.sha256 -sha256 4906e6b454c1f9b2041d617df7e253f96288050f9760859868d60857e6bab924 armv5-eabi--musl--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--musl--stable-2021.11-1.sha256 -sha256 2201fa9ce6d1226dafaf060cc568029d853af158b2ab182dcb8c7956bd993408 armv5-eabi--musl--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--uclibc--bleeding-edge-2021.11-1.sha256 -sha256 0187e76a377a096f7228b243637224cbe0dca12f5736202f813473723c566ea3 armv5-eabi--uclibc--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--uclibc--stable-2021.11-1.sha256 -sha256 888e65c2a75d125422ef4d2c144e3fed37d9a00169a78b4613fac34e7f9349ce armv5-eabi--uclibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--glibc--bleeding-edge-2021.11-1.sha256 -sha256 c585b4129f60d3ae45c7b77fc6baf87f1c6a3d6d66b06059e1bf9f6e2fcf2899 armv6-eabihf--glibc--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--glibc--stable-2021.11-1.sha256 -sha256 c40177a063aa7db47747cbf4f26254d63abee9e20d8d88210261b50f03b51b22 armv6-eabihf--glibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--musl--bleeding-edge-2021.11-1.sha256 -sha256 d6114bbde0a308cf7057aa9c4f5641432c1e785d3decc650f64f5cb261370078 armv6-eabihf--musl--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--musl--stable-2021.11-1.sha256 -sha256 41c463f2cd2984a2d53e5dee2e9a81b09c6cac2ba7b306766bdfc8f4865977bf armv6-eabihf--musl--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--uclibc--bleeding-edge-2021.11-1.sha256 -sha256 aca019db7e6167d5cf8d8ff68b10bad7d9dd7ae8784f991960754e8d027f424e armv6-eabihf--uclibc--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--uclibc--stable-2021.11-1.sha256 -sha256 e7e19796a2f0b0d839508a721506e148cb4383ed82dcc2ff4b3c0c496a4229f3 armv6-eabihf--uclibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--glibc--bleeding-edge-2021.11-1.sha256 -sha256 1d2b488d047d1a1694305613adb918167a36bf0857cd6bda3ce87a0e4c2b7f28 armv7-eabihf--glibc--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--glibc--stable-2021.11-1.sha256 -sha256 6d10f356811429f1bddc23a174932c35127ab6c6f3b738b768f0c29c3bf92f10 armv7-eabihf--glibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--musl--bleeding-edge-2021.11-1.sha256 -sha256 31a373fded82805ac4ddac7608c5075b2086999dcd46ce6ba33c432b24faffaf armv7-eabihf--musl--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--musl--stable-2021.11-1.sha256 -sha256 767c99155f74d5620cfd59d0224df2f82dec7ce58be24d702081dca9793408a9 armv7-eabihf--musl--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--uclibc--bleeding-edge-2021.11-1.sha256 -sha256 8d6cea2dfec2205ead2e6476f664d81442228d3b1e3fb9b320a54c68706ab9a2 armv7-eabihf--uclibc--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--uclibc--stable-2021.11-1.sha256 -sha256 3f8b1101a7318e2a6260a6b1c916b9b3bc69e8fd866d9e88eb85d3a496ad5064 armv7-eabihf--uclibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7m/tarballs/armv7m--uclibc--bleeding-edge-2021.11-1.sha256 -sha256 392215b53d8c03ca501481f6cfaa720676cf5a67ad1f25647f5a096398f57b28 armv7m--uclibc--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7m/tarballs/armv7m--uclibc--stable-2021.11-1.sha256 -sha256 2fca1ac4e767f8ce182a92c74f7b1e4866e7b74b447a2e4c62176379421bedbe armv7m--uclibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs/m68k-68xxx--uclibc--bleeding-edge-2021.11-1.sha256 -sha256 2b694fb4397421504e805a71db182efd55b25fa6403ecf225cddd4a8212903b0 m68k-68xxx--uclibc--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs/m68k-68xxx--uclibc--stable-2021.11-1.sha256 -sha256 9b3afcd370cbe4912f730696d89ca5f8d26581992c80bdff027b2dd6a8910899 m68k-68xxx--uclibc--stable-2021.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--glibc--bleeding-edge-2022.08-1.sha256 +sha256 d11a94113dc92fe1c141096dbeb1c3fe2adb0552b495bb9e3e41fad96b4b429a aarch64--glibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--glibc--stable-2022.08-1.sha256 +sha256 844df3c99508030ee9cb1152cb182500bb9816ff01968f2e18591d51d766c9e7 aarch64--glibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--musl--bleeding-edge-2022.08-1.sha256 +sha256 20d9b6cca203d18355a57cc8014ebf701e548922149aeec0d6109399bcc37b42 aarch64--musl--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--musl--stable-2022.08-2.sha256 +sha256 06f5e1d63be86dfbe3c8f7508164464116d43a044b9bef20fe97277f34400bc2 aarch64--musl--stable-2022.08-2.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--uclibc--bleeding-edge-2022.08-1.sha256 +sha256 24d3c9c294ef15669fa6182dff951f3850320e590b869587cc1650633f6c9b7f aarch64--uclibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--uclibc--stable-2022.08-1.sha256 +sha256 b448a1752a58d6bb118c030028cd26f070cedccc0edc95ce8d684cced1bd1c0d aarch64--uclibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--glibc--bleeding-edge-2022.08-1.sha256 +sha256 456b684924d581749fc6c2889320170b1bb5e3227324922109432e2a1dd54d91 aarch64be--glibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--glibc--stable-2022.08-1.sha256 +sha256 6cbc48f30cc0e8178cf083eeb48123c519f6e5e0a628a531a415d8907027b2d3 aarch64be--glibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--uclibc--bleeding-edge-2022.08-1.sha256 +sha256 923441910c0d132e94a0f0681c403feea78d84a47b593f7946640c2e687771b0 aarch64be--uclibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64be/tarballs/aarch64be--uclibc--stable-2022.08-1.sha256 +sha256 b29fc8d852f531aaa094cda9ab08d0f28817f7404990f3b3a20b2ce180091566 aarch64be--uclibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-750d/tarballs/arcle-750d--uclibc--bleeding-edge-2022.08-1.sha256 +sha256 bea37db5d3f229318c44d59efa444f5c2012bc773dbf23f1914669110c931f9b arcle-750d--uclibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-750d/tarballs/arcle-750d--uclibc--stable-2022.08-1.sha256 +sha256 b333bfbb6b664f7f38a36a5648bac3567cec3f3672c12eadb368b3fc773e5570 arcle-750d--uclibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs/arcle-hs38--glibc--bleeding-edge-2022.08-1.sha256 +sha256 2c5fd77f67f2126412fcc7b163e492452f8bb0a2c7fa943cb7350387d00e2a46 arcle-hs38--glibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs/arcle-hs38--glibc--stable-2022.08-1.sha256 +sha256 af8295901ad4bd359dc3e5da442ad9e6d0474e96cd38f31479d8c714bf4315e2 arcle-hs38--glibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs/arcle-hs38--uclibc--bleeding-edge-2022.08-1.sha256 +sha256 c6a00bae6d5e1bb343c339a942466f5f0de7d736671a6ba2d3f76890d9b0d486 arcle-hs38--uclibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/arcle-hs38/tarballs/arcle-hs38--uclibc--stable-2022.08-1.sha256 +sha256 8fbe4086d5dafb1e0cd69f3762cb4d8c1273ee8b6bbbd8850fce54a5a8dad374 arcle-hs38--uclibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--glibc--bleeding-edge-2022.08-1.sha256 +sha256 4c015e4fcee7eab2782f6be04acdb15c55986b98f6e1f4c0e23458461f76c84f armv5-eabi--glibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--glibc--stable-2022.08-1.sha256 +sha256 6230d9835894347f5c2b84e81d6d4825bb5315908a4ab50edd6270c8ba4477bf armv5-eabi--glibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--musl--bleeding-edge-2022.08-1.sha256 +sha256 fbc0db4138768433fc1704e2d7a82c7f527c82549c1562d09e12c154037a4f2c armv5-eabi--musl--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--musl--stable-2022.08-1.sha256 +sha256 74c4d7969e8c92b3ce848e957fc0aae3238eb826e0707692adf4993de5323a72 armv5-eabi--musl--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--uclibc--bleeding-edge-2022.08-1.sha256 +sha256 5072d99dc06123d197fc171d3dcfc15d7c1767dbcba0f0b95ed3b8de7fb78d2d armv5-eabi--uclibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv5-eabi/tarballs/armv5-eabi--uclibc--stable-2022.08-1.sha256 +sha256 6a39098391ecaab84c090fb7aba02e595ea07d4916b687bc1e2a6731a4c60506 armv5-eabi--uclibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--glibc--bleeding-edge-2022.08-1.sha256 +sha256 123e69824b789c752c980f36fb3923bb88baa23c05beff138c8fe119d3a2d1f3 armv6-eabihf--glibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--glibc--stable-2022.08-1.sha256 +sha256 474167bc7f97af44a73a1f96ed088d201a42645af2e99f7c9c57bf0d45966407 armv6-eabihf--glibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--musl--bleeding-edge-2022.08-1.sha256 +sha256 f971220c45074a93ec52298917a30a93f541599c545c389618984e2b603ee34b armv6-eabihf--musl--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--musl--stable-2022.08-1.sha256 +sha256 91cc2a45cccd9eb89b2737fbd4461c73bb589882d1a377408d0e3cefc24ca59a armv6-eabihf--musl--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--uclibc--bleeding-edge-2022.08-1.sha256 +sha256 320df86444cced5d346f7bd5baa9b3cab04ffe5004feab16286ee7b25b14e2cf armv6-eabihf--uclibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv6-eabihf/tarballs/armv6-eabihf--uclibc--stable-2022.08-1.sha256 +sha256 80a3ca5009440e2a0924eea60f915c75f10067427fb0312591b0936a8146cec0 armv6-eabihf--uclibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--glibc--bleeding-edge-2022.08-1.sha256 +sha256 7a3ceba0e5ed7ccb16da16e630a905c76c2ea58f66d161d6d45dce33321e70f6 armv7-eabihf--glibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--glibc--stable-2022.08-1.sha256 +sha256 64329b3e72350ceda65997368395a945ef83769013d82414dc5f2021c33f2d44 armv7-eabihf--glibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--musl--bleeding-edge-2022.08-1.sha256 +sha256 9f9837426dc798d8bd70458b6eb1f7c8f278a5bba5a212462bd8672d61177d83 armv7-eabihf--musl--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--musl--stable-2022.08-1.sha256 +sha256 71f156ab45a9d9790d3b36ff970d9ce2e476e96b2ea94eb17aac632777e14eca armv7-eabihf--musl--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--uclibc--bleeding-edge-2022.08-1.sha256 +sha256 01182a4fcdfcffe53bb2ade152e0bca40b36c1817c78cfb155306ae5250e0e7b armv7-eabihf--uclibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--uclibc--stable-2022.08-1.sha256 +sha256 9e4191ab996fdf5f4e8de7e4617c67cbf46127ca2754fca0ad45d60e393ace05 armv7-eabihf--uclibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs/armebv7-eabihf--glibc--bleeding-edge-2022.08-1.sha256 +sha256 d5dff34e074b56a6132361415e8416c0efec583b2a001005d51ff54f2eaed4d4 armebv7-eabihf--glibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs/armebv7-eabihf--glibc--stable-2022.08-1.sha256 +sha256 ba6916b3045cdbaa251673acf1585254b929b2ee641282ce0c4d694211489fb4 armebv7-eabihf--glibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs/armebv7-eabihf--musl--bleeding-edge-2022.08-1.sha256 +sha256 f33c5cdedb914e11f2c7c0095c476f410e0d1d231848b2efbac1cb53f0262625 armebv7-eabihf--musl--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs/armebv7-eabihf--musl--stable-2022.08-1.sha256 +sha256 7cec24dbf74fed46d461cc92aae0147069f13f1fa55ec76b317c2d3fa8398570 armebv7-eabihf--musl--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs/armebv7-eabihf--uclibc--bleeding-edge-2022.08-1.sha256 +sha256 e469ec0b72464c8722cf51c2ed09fc435815b72a4e82011843ecba75d99c30f7 armebv7-eabihf--uclibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armebv7-eabihf/tarballs/armebv7-eabihf--uclibc--stable-2022.08-1.sha256 +sha256 7f95f52d5a56f824269effc28cfbd9c8722de6d612899e888b5651c762a4d800 armebv7-eabihf--uclibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7m/tarballs/armv7m--uclibc--bleeding-edge-2022.08-1.sha256 +sha256 8eb72d7d9585b7305112d9c2ad3e6156b148f88acdf933381a414cb2c77ff797 armv7m--uclibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/armv7m/tarballs/armv7m--uclibc--stable-2022.08-1.sha256 +sha256 f6ae943fe56fbda046b27015e5b1bab6fc647b29f65d2d1720afc43ab36e876e armv7m--uclibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs/m68k-68xxx--uclibc--bleeding-edge-2022.08-1.sha256 +sha256 cf4a2e56a0f325db586f80cef6bb252eff70d34981445e1bb77336fd03617df4 m68k-68xxx--uclibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs/m68k-68xxx--uclibc--stable-2022.08-1.sha256 +sha256 885983f2c4273934018ade58b33863b43bf69d05a95342526b4ef4da7bdd7ab0 m68k-68xxx--uclibc--stable-2022.08-1.tar.bz2 # From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-coldfire/tarballs/m68k-coldfire--uclibc--bleeding-edge-2021.11-1.sha256 sha256 0e6743d8679cfe197223e011a2e1e064a213f6032d2f4b0d922b9124fe981d84 m68k-coldfire--uclibc--bleeding-edge-2021.11-1.tar.bz2 # From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-coldfire/tarballs/m68k-coldfire--uclibc--stable-2021.11-1.sha256 sha256 27ed1e76826a8824d72ef702d3a770544757a0d297c9992eb623012f1d9b387c m68k-coldfire--uclibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--glibc--bleeding-edge-2021.11-1.sha256 -sha256 1512dde9d646c4c34e5a637d5d6b3be777e199e3f16340ed26e8f0b085cdbdf0 microblazebe--glibc--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--glibc--stable-2021.11-1.sha256 -sha256 c853fe33b9454d3e31951ef99c53b6a6ad09f2458cf79ad4b1680c125a011899 microblazebe--glibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--musl--bleeding-edge-2021.11-1.sha256 -sha256 65d6486dd8fd8c6a0aad44346d77a8d4f2473230b967ac7fa12e639603e9f007 microblazebe--musl--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--musl--stable-2021.11-1.sha256 -sha256 5195575b4bd178dbdc8080e728fa485df13ede62ae684cdda131c1d55e655b11 microblazebe--musl--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--uclibc--bleeding-edge-2021.11-1.sha256 -sha256 c0d8bf9ce99eada90be299e7d448b9cc578005d26b80205788a639c587071a36 microblazebe--uclibc--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--uclibc--stable-2021.11-1.sha256 -sha256 2de12511a0a9b8369f769ccd0ecf32939948b95079e0fd57d3ea390ad4c4ff43 microblazebe--uclibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--glibc--bleeding-edge-2021.11-1.sha256 -sha256 fa871c5a4fc700f5a7d9e04ddda271d69395066afea98df2de2bba78826b461e microblazeel--glibc--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--glibc--stable-2021.11-1.sha256 -sha256 f7c64f142f970cd084ffa0e14bc3ac957db921e559eb036cb0f098d2f187328b microblazeel--glibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--musl--bleeding-edge-2021.11-1.sha256 -sha256 6978582d587f89fd02d11e89f1b0eee320ad45c42a51ec4fca8fc24b69f65c46 microblazeel--musl--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--musl--stable-2021.11-1.sha256 -sha256 4bd56f3fa100b71174888fc4da1f710ed2f56433edc570ba435f2ffdfc3bcc49 microblazeel--musl--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--uclibc--bleeding-edge-2021.11-1.sha256 -sha256 ee3cf68bb5680b44087aa8e805f74397fb34283ce9ad4d7a303f777e2242b796 microblazeel--uclibc--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--uclibc--stable-2021.11-1.sha256 -sha256 61a33972e3a282c5334717eef0922a3617c881dd3c28a0aed7dfaf69df8493c8 microblazeel--uclibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--glibc--bleeding-edge-2021.11-1.sha256 -sha256 b4b28cc187dbcd6d55e3c00a1b4a08cf68797946c284a48f30be2f659756b2d7 mips32--glibc--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--glibc--stable-2021.11-1.sha256 -sha256 42c6d72edd35249cda113796aa776556f8e8aa285fa8e511d2784a65c4df71d6 mips32--glibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--musl--bleeding-edge-2021.11-1.sha256 -sha256 7609a3d3601e9aaf8c08f68f1d70539858f17229ca4985842d290e8c35e1b7e3 mips32--musl--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--musl--stable-2021.11-1.sha256 -sha256 999faca83c3490662ba5ae855935dd9bde270d11d234294cd6c9cc9ca0bfe17c mips32--musl--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--uclibc--bleeding-edge-2021.11-1.sha256 -sha256 58240ac30e5bbec4cb07d92ad4250693cd4f4c9761e6e9602e3cbe0d9077ea4e mips32--uclibc--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--uclibc--stable-2021.11-1.sha256 -sha256 e010dd9fca694f658af457e473831ec9a22da7262ed9f460fee1bf30081d4a1a mips32--uclibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--glibc--bleeding-edge-2021.11-1.sha256 -sha256 6167ef7286741551ccb53ffb62e45611fc258e62cd1880418a2cf94051a51e05 mips32el--glibc--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--glibc--stable-2021.11-1.sha256 -sha256 018e3393e1ba50444ae0a05db05a295553b3af224afdf20b52f9d271f1ec91a4 mips32el--glibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--musl--bleeding-edge-2021.11-1.sha256 -sha256 66f7991de789d4a9ea0206e4f1c7e380521778b771295315af8e98984a1a2b1d mips32el--musl--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--musl--stable-2021.11-1.sha256 -sha256 381ec343ffde3c905addfe27e5ae737b4709142d5949c327f783c26d0acd05d1 mips32el--musl--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--uclibc--bleeding-edge-2021.11-1.sha256 -sha256 ce6e49762e54ba4a2a6477d14dd6f37b3d6d116905150a80cd4ed2afeaec2633 mips32el--uclibc--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--uclibc--stable-2021.11-1.sha256 -sha256 18baf32f742acd9c9eab78eca040f265194bb10589d6e8bccb964ccd8a22307a mips32el--uclibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--glibc--bleeding-edge-2021.11-1.sha256 -sha256 5524925d82e1c28cbc272d94e8b9f40603d623875d09989a862fda7b88e5f163 mips32r5el--glibc--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--glibc--stable-2021.11-1.sha256 -sha256 5911d789152f922adbf99d231f3267c0e7aec8942b73a759a44d1410ed6d6493 mips32r5el--glibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--musl--bleeding-edge-2021.11-1.sha256 -sha256 a599b59ab19aa10d841fbf50f58fdf2a09263a3cdcb01499225f259ef5615be1 mips32r5el--musl--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--musl--stable-2021.11-1.sha256 -sha256 5ea65771ca522b77f3cc39f12ef09eda59d9e4743dc7057067f73e86983107c2 mips32r5el--musl--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--uclibc--bleeding-edge-2021.11-1.sha256 -sha256 84bef9c460f2abf00fa5c18f850a9d9e4fdf9e7d593a1ad5f7b6efe34dfcf037 mips32r5el--uclibc--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--uclibc--stable-2021.11-1.sha256 -sha256 48b058d3057a611eb3d09b3a206bc38e449f0ea0cd7c8ebf2ee99da9182d0707 mips32r5el--uclibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--glibc--bleeding-edge-2021.11-1.sha256 -sha256 161ec4ca6dad1b5d3e79880e30c7f618e24fc1c8dbfcbaec50db02ac73c111af mips32r6el--glibc--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--glibc--stable-2021.11-1.sha256 -sha256 c50ba26a9fad62180dc4816cfa6451f82ba3ea9c9f069899874c012a5472fa77 mips32r6el--glibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--musl--bleeding-edge-2021.11-1.sha256 -sha256 81637b0ddfda0ed02bd549fda70efddbcabe6ad943156311d034f3b8a8bce086 mips32r6el--musl--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--musl--stable-2021.11-1.sha256 -sha256 d858e9b2a7d826f23cd6432e5c1cad2f4f98447682cdcf7df1430daabfbf49c0 mips32r6el--musl--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--uclibc--bleeding-edge-2021.11-1.sha256 -sha256 40b78cbfb757b328f5b0a861c6ed1e4f716784bdc2d5e6eba9d2dcad5057002c mips32r6el--uclibc--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--uclibc--stable-2021.11-1.sha256 -sha256 e39de078f5f713ab385e5f008e181062265e6a3979904263d283f90304146014 mips32r6el--uclibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--glibc--bleeding-edge-2021.11-1.sha256 -sha256 d8543128dc7a115fdee418dfee954d65cb0fb60aae161222fc03177a190bfef1 mips64-n32--glibc--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--glibc--stable-2021.11-1.sha256 -sha256 8d5c891bb2eecccf1f9c51095d266c899dae4dd7e75ef19ff6c66c8e4602919c mips64-n32--glibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--musl--bleeding-edge-2021.11-1.sha256 -sha256 7cf2177c2e41651a25676a9d1c96bbe8c254f94db920a1b3a7aa5708b17b1ef1 mips64-n32--musl--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--musl--stable-2021.11-1.sha256 -sha256 ac997df9a0f82f0ce60ac904ce75245741fa432c4d85c8e8ae88c35296dfaa99 mips64-n32--musl--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--uclibc--bleeding-edge-2021.11-1.sha256 -sha256 e5119b684b078fd0c3bf7f7eb09ab31dff666cbbbc3d91118ae912e197ca3852 mips64-n32--uclibc--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--uclibc--stable-2021.11-1.sha256 -sha256 8f5c1293e789eb04ab3f0bcb415c6ee0ef5ae26cd77354374984752548ac4e2c mips64-n32--uclibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--glibc--bleeding-edge-2021.11-1.sha256 -sha256 d1063f99d389f0065b8db5331597969450f1f813265ddf9205215fec5500997c mips64el-n32--glibc--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--glibc--stable-2021.11-1.sha256 -sha256 73bbd84905e1fd094f7426f64e01f6058f21409218306b80e94bd2ad0aaa8ad3 mips64el-n32--glibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--musl--bleeding-edge-2021.11-1.sha256 -sha256 a0a48faf217468e9eb1dd820d16ced1caa8f00706e9f48cb1e64899963f3bcba mips64el-n32--musl--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--musl--stable-2021.11-1.sha256 -sha256 c9c895ea09900ec5c63931af0716cf12f48f7c9826629ac48c4cee4e596af5ee mips64el-n32--musl--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--uclibc--bleeding-edge-2021.11-1.sha256 -sha256 5d3573faab6757efd4e2a78e2c1361d3e8e7b821fd385d016fbe71c56d9cc1d2 mips64el-n32--uclibc--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--uclibc--stable-2021.11-1.sha256 -sha256 cd95e539cbb343c3e57c9f2d7d786ea2b0b58009f1b87a4b48eb9d4bb73a205a mips64el-n32--uclibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--glibc--bleeding-edge-2021.11-1.sha256 -sha256 7b551725f9e6f5eefc56ad67b5daa10812d4895842ec5986eeb93a79455e4762 mips64r6el-n32--glibc--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--glibc--stable-2021.11-1.sha256 -sha256 c575274871f30d019c121947e0f65973475e16baf621f235c54bfc292353d5d0 mips64r6el-n32--glibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--musl--bleeding-edge-2021.11-1.sha256 -sha256 2b85466873cf847b62b5c66198cc01002890a7a41e5cc9262b4906dcef640ead mips64r6el-n32--musl--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--musl--stable-2021.11-1.sha256 -sha256 4210ca4ded17fdeb7cc7a5cf0d7d4676161d711f70708ca50be62ce397687672 mips64r6el-n32--musl--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--uclibc--bleeding-edge-2021.11-1.sha256 -sha256 de1a1cff7c02d804aa949b813d92c3d55a33e47602bd538bac6deaa155c93c6d mips64r6el-n32--uclibc--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--uclibc--stable-2021.11-1.sha256 -sha256 30d82c7ca41a0df9931a29a46ed881f21a889e9e59baf04e820c6679be87a7fb mips64r6el-n32--uclibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/nios2/tarballs/nios2--glibc--bleeding-edge-2021.11-1.sha256 -sha256 5c2dc11062f4817e81a328b12ab30be486b7e68c7c876eb45fffca72332a8804 nios2--glibc--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/nios2/tarballs/nios2--glibc--stable-2021.11-1.sha256 -sha256 f6f37f1e551edda0251ece8d906ed720bd8ec45da9d4b3e1d13721bdc9ef2882 nios2--glibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--musl--bleeding-edge-2021.11-5.sha256 -sha256 03f46c8fdded0002a2a04749bcf86136ec26a841654bf9fdc14575cc510739c6 openrisc--musl--bleeding-edge-2021.11-5.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--musl--stable-2021.11-5.sha256 -sha256 409e4a7473125e7de7c8b0e6bc1cb971d53e63ac057e9a19102e4ce1467f442a openrisc--musl--stable-2021.11-5.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--uclibc--bleeding-edge-2021.11-5.sha256 -sha256 9028d4e526f9e805b021791443805541a179eaf2e47a2af4dfbefb2021e44e9f openrisc--uclibc--bleeding-edge-2021.11-5.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--uclibc--stable-2021.11-5.sha256 -sha256 f07d8e465f7e94e55330cfb55bbaf9fc27e4bb7b688271ead60a15aec3dbbf76 openrisc--uclibc--stable-2021.11-5.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--glibc--bleeding-edge-2021.11-1.sha256 -sha256 53afdbe1e48d0c60d560db8d17042a99288661fe10eebbfcfec4e56a6c2ca594 powerpc-440fp--glibc--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--glibc--stable-2021.11-1.sha256 -sha256 d7fc756c954184cfc4e6118e0e0ac33613916973f6af4aafaa162959662aea96 powerpc-440fp--glibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--musl--bleeding-edge-2021.11-1.sha256 -sha256 094bad002682608cfc7b095a35c3d495cad793ec0f15a7c035a11eae69d0211e powerpc-440fp--musl--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--musl--stable-2021.11-1.sha256 -sha256 187226d9c427e91bae57058060950cfbd61fb89993edf42386a2c4281ca681ba powerpc-440fp--musl--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--uclibc--bleeding-edge-2021.11-1.sha256 -sha256 6c5d3ef56effad9bea791ee814f108929e967eb88a992d21b7d9f9d8d51a048a powerpc-440fp--uclibc--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--uclibc--stable-2021.11-1.sha256 -sha256 9a9663674fc2af69b403bfacc5c9d6c0d7ea7c7aa4b93c928bfd79bfb634b828 powerpc-440fp--uclibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--glibc--bleeding-edge-2021.11-1.sha256 -sha256 89164ef2be5f5eb5f0de9d8d821d76a1e69c963529bc450a1caf61944665f929 powerpc-e300c3--glibc--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--glibc--stable-2021.11-1.sha256 -sha256 1665004c81e0dfe1c8aa15a691232537c27a4343d80f8c035f83623b65d99ae3 powerpc-e300c3--glibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--musl--bleeding-edge-2021.11-1.sha256 -sha256 6bbb7d8416708754debc216f122366d7cc25b9372b59e16590f2d942fc727cee powerpc-e300c3--musl--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--musl--stable-2021.11-1.sha256 -sha256 e97a52ed0d2f617f869e055d076c62e0698cdffd17e8b5945d0285f98cb57de2 powerpc-e300c3--musl--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--uclibc--bleeding-edge-2021.11-1.sha256 -sha256 9b886501833b6785bdbfff90e3d7b191eca4e59fea0c039c772c43825032fb86 powerpc-e300c3--uclibc--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--uclibc--stable-2021.11-1.sha256 -sha256 31fc2c3b1f2878eb71766c7c0d8b88cdd4c1b2b66e34237917557df818e1c4e0 powerpc-e300c3--uclibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--glibc--bleeding-edge-2021.11-1.sha256 -sha256 a2505f7d2968c5324747653da2b367fde7c86c68fcfcb2051c07b27fc0726988 powerpc-e500mc--glibc--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--glibc--stable-2021.11-1.sha256 -sha256 f9a86eee7817042d26aeda8473c23d7da22920ace233e7ad8714cc87409767ca powerpc-e500mc--glibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--musl--bleeding-edge-2021.11-1.sha256 -sha256 0f58c7a792de85703c715100dc8fde2575acd4f41523dbcf2ca920611f8e38f3 powerpc-e500mc--musl--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--musl--stable-2021.11-1.sha256 -sha256 367219213274c0b291855354f5cf2f59a915cf0d9538db9236d7829423a79c92 powerpc-e500mc--musl--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--uclibc--bleeding-edge-2021.11-1.sha256 -sha256 0c9616694108bcc879fdbd804b6ec42b17101bddea2a9426f023f625c3def39b powerpc-e500mc--uclibc--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--uclibc--stable-2021.11-1.sha256 -sha256 5a6e8489e39ddd73d413926c1d00b7cb214e5a083bdea6bf7fbcd5b4a3b82d47 powerpc-e500mc--uclibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e5500/tarballs/powerpc64-e5500--glibc--bleeding-edge-2021.11-1.sha256 -sha256 62c53dd85d6172a1d13833d2303561a6e943d73836faa3be0eb5c8d937ae3bf1 powerpc64-e5500--glibc--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e5500/tarballs/powerpc64-e5500--glibc--stable-2021.11-1.sha256 -sha256 4c8c2884ed5f42155508ffb5c62343312427904f469ce003bfb6b547075cd4aa powerpc64-e5500--glibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs/powerpc64-e6500--glibc--bleeding-edge-2021.11-1.sha256 -sha256 62845f66f9b29c001e85b86557b953b2275fd1ecbf681500521b8386d8df1ed6 powerpc64-e6500--glibc--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs/powerpc64-e6500--glibc--stable-2021.11-1.sha256 -sha256 054d3793f1c8c42ff9310163d4eb45ce09be7654f01221ff28914bc28950f832 powerpc64-e6500--glibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs/powerpc64-e6500--musl--bleeding-edge-2021.11-1.sha256 -sha256 21452d9a1e4a5fe980054c0367f00f640ff0f6af4f0443469c340106f902c9c6 powerpc64-e6500--musl--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs/powerpc64-e6500--musl--stable-2021.11-1.sha256 -sha256 015285c7313ffd6c25984db3df003a703868758919f59e8d0b9b45cd494e54cd powerpc64-e6500--musl--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs/powerpc64-power8--glibc--bleeding-edge-2021.11-2.sha256 -sha256 19618e538bd170e3ed458a1ff9593ca169078eb9a990cbab0af635aed622429e powerpc64-power8--glibc--bleeding-edge-2021.11-2.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs/powerpc64-power8--glibc--stable-2021.11-1.sha256 -sha256 7b35b694e79b4829e5f2fdb2bd1570035619f665be2a73d0568e4c1f4b6ce56d powerpc64-power8--glibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs/powerpc64-power8--musl--bleeding-edge-2021.11-2.sha256 -sha256 6f5a6674bbe028bcf2cb6820a57b53e06b06ab4b7359397b77fada3ef06635b5 powerpc64-power8--musl--bleeding-edge-2021.11-2.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs/powerpc64-power8--musl--stable-2021.11-1.sha256 -sha256 9dff16b6af51f0492093f08e4d7571b787afa37e059ea1105ded18a7fa7baa88 powerpc64-power8--musl--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs/powerpc64le-power8--glibc--bleeding-edge-2021.11-2.sha256 -sha256 624b2bb3763e3bd085b69c39cb9a1574d60dbb29780469c2b171bba564c3d1d3 powerpc64le-power8--glibc--bleeding-edge-2021.11-2.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs/powerpc64le-power8--glibc--stable-2021.11-1.sha256 -sha256 04473768185c3a1848f4f323380dc7caffa13d1e1bcb49317cebf090917fee2a powerpc64le-power8--glibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs/powerpc64le-power8--musl--bleeding-edge-2021.11-2.sha256 -sha256 e81d0b3c9128cd0069dc8bcfbf512e395175e4c4f0a9ed500a3d7b15a76f8e65 powerpc64le-power8--musl--bleeding-edge-2021.11-2.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs/powerpc64le-power8--musl--stable-2021.11-1.sha256 -sha256 09dafac6313ad49731de6d93ef2f1c2806a6a78127d0441adcee76a7a256f4e3 powerpc64le-power8--musl--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv32-ilp32d/tarballs/riscv32-ilp32d--glibc--bleeding-edge-2021.11-1.sha256 -sha256 63defd144fdb1d40712316e2c3acd37275d6407b52d70efcd36e7f7129b4a0d0 riscv32-ilp32d--glibc--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--glibc--bleeding-edge-2021.11-1.sha256 -sha256 13984509df102d452f64fbe576e9240920bc677838c2380e57fad8236fca70bc riscv64-lp64d--glibc--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--glibc--stable-2021.11-1.sha256 -sha256 70fe7d9fc74220b08b2ae0d3527641f4b938a1e4eb6bb305b2ac68fa76f2d6a4 riscv64-lp64d--glibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--musl--bleeding-edge-2021.11-1.sha256 -sha256 0ba18be42bc1aac9992384c86efeb83cb55215eab565f71cef340f61a1fec420 riscv64-lp64d--musl--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--musl--stable-2021.11-1.sha256 -sha256 42ca8024547e51e6126e3c9e711d80815aa4b2997900dfc8af4b9514105e8b78 riscv64-lp64d--musl--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--uclibc--bleeding-edge-2021.11-1.sha256 -sha256 02dd9fe4a024f84c7f73b7155640066017c7d18dd90c4da6efe6f0e66d24f75c riscv64-lp64d--uclibc--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--uclibc--stable-2021.11-1.sha256 -sha256 01f061e1b3d106d25614ae5bd64df3a3588bc960caa3bbad14b50f718a558f41 riscv64-lp64d--uclibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--glibc--bleeding-edge-2021.11-1.sha256 -sha256 64c14617fb95b1eeb50564d1e0ccbf73fa73e5e58aea6b192549fc7127e4bd5c sh-sh4--glibc--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--glibc--stable-2021.11-1.sha256 -sha256 702125cce2aaee4025cc4eb07614fe51a4e56498e8d0b2b8a5863d31840829e0 sh-sh4--glibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--musl--bleeding-edge-2021.11-1.sha256 -sha256 37fefd46ded9067cb836f067073c4df501265e86d887ff91015087747a5613d4 sh-sh4--musl--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--musl--stable-2021.11-1.sha256 -sha256 7f77aefe39c1dc9bfe1fe637c7c957fba19898d0b04db4ba7a0b76bb97ed72e9 sh-sh4--musl--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--uclibc--bleeding-edge-2021.11-1.sha256 -sha256 3285ac52a681a951d7d080d6645f3d02451de644582928d71469813e95bd928f sh-sh4--uclibc--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--uclibc--stable-2021.11-1.sha256 -sha256 841c400d303021311895bf61fa7d16292ef19cf021ea06c091a424f43294f6a5 sh-sh4--uclibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs/sh-sh4aeb--glibc--bleeding-edge-2021.11-1.sha256 -sha256 b1ebde33ada33d1006046c589891d96af902eefcea1d9e103ae738c9fe26c36f sh-sh4aeb--glibc--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs/sh-sh4aeb--glibc--stable-2021.11-1.sha256 -sha256 3afebc93a72af85a31c6d096b5939c60bb87939b051c6cddc52e1e540714267a sh-sh4aeb--glibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs/sh-sh4aeb--musl--bleeding-edge-2021.11-1.sha256 -sha256 c9216bd579ac3f0fa7d0efb9e1892f5d34eba10ee183d03fc87ca17c4b8eb6d4 sh-sh4aeb--musl--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs/sh-sh4aeb--musl--stable-2021.11-1.sha256 -sha256 1e58aaab9d77019df71777a3c9a2457f691355a6a7aed6b9897921e38571117a sh-sh4aeb--musl--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sparc64/tarballs/sparc64--glibc--bleeding-edge-2021.11-1.sha256 -sha256 0b83bb7f3ce7b67a5c359c95c695398054d13903259014147d4c99e2884e1377 sparc64--glibc--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sparc64/tarballs/sparc64--glibc--stable-2021.11-1.sha256 -sha256 0ef307f6c91733ee82ce65801768013f7e6220b605f4e152158cb55b4f983582 sparc64--glibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sparcv8/tarballs/sparcv8--uclibc--bleeding-edge-2021.11-3.sha256 -sha256 3c85420becb7caa84a9a229483f3f2d7158eb66817acdfa5d5700c3a05436cba sparcv8--uclibc--bleeding-edge-2021.11-3.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/sparcv8/tarballs/sparcv8--uclibc--stable-2021.11-1.sha256 -sha256 f6d35e33338b26e71403b4c6d3944ab561f2a6e9b801ab33fbb401b4722044dd sparcv8--uclibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--glibc--bleeding-edge-2021.11-5.sha256 -sha256 024fd8edc91b9bfd643f8cf94e3f3ff2a6457aea654d10ef3516db8c3d94d5f5 x86-64--glibc--bleeding-edge-2021.11-5.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--glibc--stable-2021.11-5.sha256 -sha256 6fe812add925493ea0841365f1fb7ca17fd9224bab61a731063f7f12f3a621b0 x86-64--glibc--stable-2021.11-5.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--musl--bleeding-edge-2021.11-5.sha256 -sha256 468e6b73146595923fe87980a30adb54cd78f4c1e2f228e1a2c9bb705ea4243d x86-64--musl--bleeding-edge-2021.11-5.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--musl--stable-2021.11-5.sha256 -sha256 2943617f6537ca195a66fb9db4a801a5dd1c108741c400d530d558d06908dd75 x86-64--musl--stable-2021.11-5.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--uclibc--bleeding-edge-2021.11-5.sha256 -sha256 4aa8b8e2806d6fc87ba64ccec0a59b8a2fb5d157cda006d893e3f2264b7f0f10 x86-64--uclibc--bleeding-edge-2021.11-5.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--uclibc--stable-2021.11-5.sha256 -sha256 e68fd1b23f4a5c5132f2122e4012c17eb24e5179b2ff45bb793a27ac30dd454f x86-64--uclibc--stable-2021.11-5.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--glibc--bleeding-edge-2021.11-5.sha256 -sha256 af20cf98ce937f298e0958e16793bb4c7b08236bc69ab11574a4266cccc3823d x86-64-v2--glibc--bleeding-edge-2021.11-5.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--musl--bleeding-edge-2021.11-5.sha256 -sha256 17add21a0337d2f7d0d79d1f21db88098c3474920d71f902be46e8995eb86d35 x86-64-v2--musl--bleeding-edge-2021.11-5.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--uclibc--bleeding-edge-2021.11-5.sha256 -sha256 b3ef49012af9fc9c2c8a44b0a20722be69b518cec5db06e48480291fc28aefe0 x86-64-v2--uclibc--bleeding-edge-2021.11-5.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--glibc--bleeding-edge-2021.11-5.sha256 -sha256 244d4afab02b9c54c76385657d26798515331d7d4fa90928315366f31b9cc39e x86-64-v3--glibc--bleeding-edge-2021.11-5.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--musl--bleeding-edge-2021.11-5.sha256 -sha256 551cff1b6425e2a6ced7b7ad032fba49b43ed095faae38d1842260ac0b5d6dbf x86-64-v3--musl--bleeding-edge-2021.11-5.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--uclibc--bleeding-edge-2021.11-5.sha256 -sha256 30188f50adef711b55ac1d5be7218e0d6ee4200ddb8660e4d4971a9cefe22f91 x86-64-v3--uclibc--bleeding-edge-2021.11-5.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--glibc--bleeding-edge-2021.11-5.sha256 -sha256 0cd2de7c4103aa8cf47b72dc71146eb3bf7742a18d56c93128340ab3f4175804 x86-64-v4--glibc--bleeding-edge-2021.11-5.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--musl--bleeding-edge-2021.11-5.sha256 -sha256 e159da16459e0f0d06a9a7467d5121202ab95e2fa6bf8abffdc0008c72fe9b07 x86-64-v4--musl--bleeding-edge-2021.11-5.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--uclibc--bleeding-edge-2021.11-5.sha256 -sha256 984f011d170d3e46322ae4a110c86ebf995598d877f410201b3fb3d86e25dac2 x86-64-v4--uclibc--bleeding-edge-2021.11-5.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--glibc--bleeding-edge-2021.11-1.sha256 -sha256 a3dbfcd3347a72ca344ae77882f929615776ea9b1b058eeea0a0915e7db89b69 x86-64-core-i7--glibc--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--glibc--stable-2021.11-1.sha256 -sha256 3d443bb0bc6d16982824952a02dcb8b7d10c258b4e0debb47708fb9a02573951 x86-64-core-i7--glibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--musl--bleeding-edge-2021.11-1.sha256 -sha256 c724f0a8338c57e65479844eeb1725ffce2157a195067601e8893c0f781d2a86 x86-64-core-i7--musl--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--musl--stable-2021.11-1.sha256 -sha256 008aa485ad85deda4af41f6ab162ee33be96c2f479e93a03dd9ee360fbf461b1 x86-64-core-i7--musl--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--uclibc--bleeding-edge-2021.11-1.sha256 -sha256 99ac2c1fb6bd819222578d4d3c2d3043d3f08f48a988fe7a56ecb2dc44950ebb x86-64-core-i7--uclibc--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--uclibc--stable-2021.11-1.sha256 -sha256 f7224ebf557f96b3854c4760f0d561f33f02e71586e6c5b958fdb686ecf5a058 x86-64-core-i7--uclibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--glibc--bleeding-edge-2021.11-1.sha256 -sha256 51a7aa03b16fca52a6ac88c7272a727a56a120fb1a03edaff7da741471dffa63 x86-core2--glibc--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--glibc--stable-2021.11-1.sha256 -sha256 6afb13f10694756f2c7b69e0e5fdd416d3c446d2d630ed9a707797613c38fb15 x86-core2--glibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--musl--bleeding-edge-2021.11-1.sha256 -sha256 b779acc67eff7ae349a1ecb6d092576131537ce4d92530447d6483e3b7320186 x86-core2--musl--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--musl--stable-2021.11-1.sha256 -sha256 9f79cd4443386b9611d917506bcb6fd9d844e7934905a7368827441644ae7821 x86-core2--musl--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--uclibc--bleeding-edge-2021.11-1.sha256 -sha256 1a3803d19a6d65a943dab7c4cfb29f37e1c96b1155bdd6c04e5fc609c135b970 x86-core2--uclibc--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--uclibc--stable-2021.11-1.sha256 -sha256 235be5851ccdbf579163a0d57b4caba48c63c808f7a08e6476f56c3537636520 x86-core2--uclibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--glibc--bleeding-edge-2021.11-1.sha256 -sha256 bb21d6fdb83ef1603346c27572a0622a890633d4fc1ab28bf0aa387a44c8dfee x86-i686--glibc--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--glibc--stable-2021.11-1.sha256 -sha256 9deb1c61a3196114ba1996c0cbe4c4135af9e82f1a0f9111084c86badee3ff30 x86-i686--glibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--musl--bleeding-edge-2021.11-1.sha256 -sha256 313e4bbd8a19fc927b2d9d059cfacdb89cb41213d34158cac2ba00b071468273 x86-i686--musl--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--musl--stable-2021.11-1.sha256 -sha256 fa6cd3e2aa25287e03070eba526983a902d8622ad148b57027acf85d690eaf27 x86-i686--musl--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--uclibc--bleeding-edge-2021.11-1.sha256 -sha256 4ee09d8c4524e6e6f19db07ed49f8e43a60e806bc57134f9ac2477d41c98340e x86-i686--uclibc--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--uclibc--stable-2021.11-1.sha256 -sha256 d15cfe391474ea19e6a468c011955027581c6a16953380baf3c5718ad42fc45d x86-i686--uclibc--stable-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/xtensa-lx60/tarballs/xtensa-lx60--uclibc--bleeding-edge-2021.11-1.sha256 -sha256 469450c734051b9dfb7021532a5ec6fb35b3cf79a95613836e654c3e666b4150 xtensa-lx60--uclibc--bleeding-edge-2021.11-1.tar.bz2 -# From https://toolchains.bootlin.com/downloads/releases/toolchains/xtensa-lx60/tarballs/xtensa-lx60--uclibc--stable-2021.11-1.sha256 -sha256 2fd9dc2d1ec8a167ae3c353682bc4d166f25a7db1c1b889e3058bc644bd3f92c xtensa-lx60--uclibc--stable-2021.11-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--glibc--bleeding-edge-2022.08-1.sha256 +sha256 e0af9e5a647b432c22693c6a7e7114ecd5475007b2b17d10075d61509246d81d microblazebe--glibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--glibc--stable-2022.08-1.sha256 +sha256 1b73e8ef541ab0a43314ec8354368adfb333657f3ae3e2ef4cb966721db2d068 microblazebe--glibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--musl--bleeding-edge-2022.08-1.sha256 +sha256 8a2570a5f490249a7a02afef62c00140e2eb3fa2cdf41e5897f484e41f5c55a1 microblazebe--musl--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--musl--stable-2022.08-1.sha256 +sha256 90c26fedc85eba703e37e85036e284bb73475bb07d004ceedc27a4e64110ecad microblazebe--musl--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--uclibc--bleeding-edge-2022.08-1.sha256 +sha256 44b04fb51396e84b51f395bf1f08176b759cc8a85080980c45653ff0bd8b3602 microblazebe--uclibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--uclibc--stable-2022.08-1.sha256 +sha256 23189d4f0ec2a1de15d7e30e7d12327fe7c620b395b6e402b6be42c3ad148656 microblazebe--uclibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--glibc--bleeding-edge-2022.08-1.sha256 +sha256 2371b597fad7ec6092e1417c21343cd78f59c0b68c189d77a306bfcebd1dda31 microblazeel--glibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--glibc--stable-2022.08-1.sha256 +sha256 9507f13355a37ab0401c3225251d9760a0e40475243744b2e9bd5f11113ca8a0 microblazeel--glibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--musl--bleeding-edge-2022.08-1.sha256 +sha256 b67eef1613e960df351a4600c845d6ac24c60a3b2362f195c4b69bf21f7874e0 microblazeel--musl--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--musl--stable-2022.08-1.sha256 +sha256 44b767649a3d8a9546dd27c1b53aea8a3f106e99d9ae650e1746551c78f7cf8c microblazeel--musl--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--uclibc--bleeding-edge-2022.08-1.sha256 +sha256 08e0a44f0beb4675745d25a1f98afa31a672caec5150da73a8b23038e931426e microblazeel--uclibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--uclibc--stable-2022.08-1.sha256 +sha256 70883813924f9a1756e08258d8c41e06bb6d4e9571fdb020b2097dd4823ffb9f microblazeel--uclibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--glibc--bleeding-edge-2022.08-1.sha256 +sha256 69f8608d78e295bc9c78a57f47d3f2aa1d74a8ee69307e1f112588dc08c29adc mips32--glibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--glibc--stable-2022.08-1.sha256 +sha256 27fdea806e3d02441ed034f500843b9137b34ec144cab9d2aeb991644f32af5b mips32--glibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--musl--bleeding-edge-2022.08-1.sha256 +sha256 190023be69fdedbcc758184cbd02e0e64df99c5d1d2f9330c239c97cdca4928e mips32--musl--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--musl--stable-2022.08-1.sha256 +sha256 5e971b1420f29c5c694a93591f7eda5048d7dc792bff6d2117b6f2866970fd5a mips32--musl--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--uclibc--bleeding-edge-2022.08-1.sha256 +sha256 c937259732031ca4c640257774e80b0d6b42cc3e90e6677d6b3a014b0e3fd155 mips32--uclibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--uclibc--stable-2022.08-1.sha256 +sha256 e670cf475c47dabac6e8fb4ffc0df5bb9c4ffeb55aeff55099ffd0b969e919ce mips32--uclibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--glibc--bleeding-edge-2022.08-1.sha256 +sha256 0984a478a526e943e22fbe979bd083acf34bcd99e1366c8aca11d4ed43af8b66 mips32el--glibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--glibc--stable-2022.08-1.sha256 +sha256 8e5d9b8ba0b4f7add2001143ffd92718c037c27aa2cef64d79aa577e6b0bf2e1 mips32el--glibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--musl--bleeding-edge-2022.08-1.sha256 +sha256 89b6b64b9839c506e38e5c57d01de0a15018a6d82c41cc3b001708725032ecba mips32el--musl--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--musl--stable-2022.08-1.sha256 +sha256 ca6ddc1ec4b053116f854767c04c49ebd3442e15ad6529eaeafa4fd0272021ff mips32el--musl--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--uclibc--bleeding-edge-2022.08-1.sha256 +sha256 dd0d1144113a79aa32457d008302e11e354d949a63718f0984a5dbe185099275 mips32el--uclibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32el/tarballs/mips32el--uclibc--stable-2022.08-1.sha256 +sha256 f20f373afdec0e36afefd0b1eec7dfb9609e110ef19feb40df7e37196a23ccbf mips32el--uclibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--glibc--bleeding-edge-2022.08-1.sha256 +sha256 dc6cee7db89c2263c8de0a8c902dabfed02186ccb9b6f643bf2b3fcaa6f694d3 mips32r5el--glibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--glibc--stable-2022.08-1.sha256 +sha256 d7e14faebf10897799426c8579b9e01c3479a290bb6b30ef37a2b4e1fbe4e440 mips32r5el--glibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--musl--bleeding-edge-2022.08-1.sha256 +sha256 d6aa828f18fddb4a4bdb78720ac1ecca76f0a0941d2fc3854a75a10ffe5069f3 mips32r5el--musl--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--musl--stable-2022.08-1.sha256 +sha256 c29003698f82de6a6c5a3b4b4029e1a6f563d4417296941d84882f9e3cf4c573 mips32r5el--musl--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--uclibc--bleeding-edge-2022.08-1.sha256 +sha256 38fbc1b77e010723ef939ee52e6fc42adc0042139fe61f018c4b67767966e36f mips32r5el--uclibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r5el/tarballs/mips32r5el--uclibc--stable-2022.08-1.sha256 +sha256 f04408f2903b0488392cc097062d0295d6d2d02000f09edfe63a33237a09695c mips32r5el--uclibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--glibc--bleeding-edge-2022.08-1.sha256 +sha256 be3eb28eff19cfe7471e92716cfce112eddb13a27322f7abd0987b3864b33776 mips32r6el--glibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--glibc--stable-2022.08-1.sha256 +sha256 4c89db5c2548d1fda32c61f86399d5c53749becfb260e22776866b3b0343deed mips32r6el--glibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--musl--bleeding-edge-2022.08-1.sha256 +sha256 4f3312d85183c8ac83e793ec4f8788053215381edca1904b1286bc0eca0dab36 mips32r6el--musl--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--musl--stable-2022.08-1.sha256 +sha256 46b7d074f395cf1264109b78053c944b54c580812999b017fee60ecf196efda6 mips32r6el--musl--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--uclibc--bleeding-edge-2022.08-1.sha256 +sha256 5adc9fffcca0e6ea08edccfc72ff5330ffd7949c0f236ff198f93afba29d308e mips32r6el--uclibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32r6el/tarballs/mips32r6el--uclibc--stable-2022.08-1.sha256 +sha256 03d90d509f745f29ad04ebc9ef29e38b8d015c25c5bb0d5e0ddd214a1d28b26d mips32r6el--uclibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--glibc--bleeding-edge-2022.08-1.sha256 +sha256 764aef21ef143613595595ed0ff81491636b2381b77ef082dbb4a2e2f17542a8 mips64-n32--glibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--glibc--stable-2022.08-1.sha256 +sha256 4bc1a70194be6d87502f403ab59d95bfeacbdc3903f8b45464734f7447301cd3 mips64-n32--glibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--musl--bleeding-edge-2022.08-1.sha256 +sha256 f50358647c98c6b4eb373e732187e3b405402487b5e55d2ef63481d4a4ed017b mips64-n32--musl--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--musl--stable-2022.08-1.sha256 +sha256 fa77ef0623b92baf20405cee90d52c6d91e2daddfed0a89a28b781fd36a4279c mips64-n32--musl--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--uclibc--bleeding-edge-2022.08-1.sha256 +sha256 f03f7070063921143cc01d9591b10abfa185617c71008adc2c7e059202d42c43 mips64-n32--uclibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64-n32/tarballs/mips64-n32--uclibc--stable-2022.08-1.sha256 +sha256 892f2e5912c48901e2c40df7eac1109d7fd02c6b2aa9b6c13d8659dae50e781f mips64-n32--uclibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--glibc--bleeding-edge-2022.08-1.sha256 +sha256 5c9e79402471f35401ac8737fdee39156f1db1e72f5c9c4c2b4fea988fbc0c72 mips64el-n32--glibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--glibc--stable-2022.08-1.sha256 +sha256 59e2fe9b268fdbd8b4bcba14574c1293171675249a0e6913e1525adee66a7b36 mips64el-n32--glibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--musl--bleeding-edge-2022.08-1.sha256 +sha256 c6c76749c40d41a020bf0943bb5f3d67ad0a9a9994a4883c73c7302944f87814 mips64el-n32--musl--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--musl--stable-2022.08-1.sha256 +sha256 6e0cd1b77c9333807fa575aff24a7274817840442f9cd32c653a70a07d3b5b55 mips64el-n32--musl--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--uclibc--bleeding-edge-2022.08-1.sha256 +sha256 b9c573bfbda5ba60bb80652879664cb0d515b179c9d06ca1321f506d26f7a7af mips64el-n32--uclibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64el-n32/tarballs/mips64el-n32--uclibc--stable-2022.08-1.sha256 +sha256 850817e5d1f99c11dae52abdd35518b855382587ffd4345c44131d26b04d6dcd mips64el-n32--uclibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--glibc--bleeding-edge-2022.08-1.sha256 +sha256 a665beeacd598da7de8f4ae44b938fb374d4a301daeae99de14e67d3fd5696c0 mips64r6el-n32--glibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--glibc--stable-2022.08-1.sha256 +sha256 8a0f0a4fc4e1a09f20ec45005dcf6f074be416fa26838eb19831a47f00da6391 mips64r6el-n32--glibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--musl--bleeding-edge-2022.08-1.sha256 +sha256 ed9b42fb60074f31664626796b1a47f9ec4b46a25dee78904dbda93613b50bae mips64r6el-n32--musl--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--musl--stable-2022.08-1.sha256 +sha256 03e4d97084f8f5cc7bb1452a862e1e3856b2a63b903779be0cda0577195603c0 mips64r6el-n32--musl--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--uclibc--bleeding-edge-2022.08-1.sha256 +sha256 e5aeb7b0bd9bbc5c283eeb28545f35f3fcec43e72ed9c7d0e8fa9fd112ec20eb mips64r6el-n32--uclibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/mips64r6el-n32/tarballs/mips64r6el-n32--uclibc--stable-2022.08-1.sha256 +sha256 7d523cea26e84487860de83556c10d790876c98f27d9e7987c1b1ecdcc4a43e7 mips64r6el-n32--uclibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/nios2/tarballs/nios2--glibc--bleeding-edge-2022.08-1.sha256 +sha256 bbb95de0b45d06429b9212682df0392f1c8255aaae9febeef586ed556c0cb537 nios2--glibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/nios2/tarballs/nios2--glibc--stable-2022.08-1.sha256 +sha256 bcc84bf3a37c1d19e4de21d0eee6848d9917b5cc6cba7e734ce2fffa4aefc2bd nios2--glibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--glibc--bleeding-edge-2022.08-1.sha256 +sha256 69461f231e4d994a6b0fa6dc2e71610037f277d7bccb7b43acef43a3245bff7f openrisc--glibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--glibc--stable-2022.08-1.sha256 +sha256 e8122c2b52ed2ebf7b65384f9fe0782b95cb541702341ea73046165acc80cf4b openrisc--glibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--musl--bleeding-edge-2022.08-1.sha256 +sha256 562582da8b5a386624a7c18cbe0511f8f4bed206f2de7009e66b75214f56dd32 openrisc--musl--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--musl--stable-2022.08-1.sha256 +sha256 cf2b57067d9621f0eb74622412e8ca3eaa85e98a2044e5974cfc573eeb6cc8f0 openrisc--musl--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--uclibc--bleeding-edge-2022.08-1.sha256 +sha256 b9125cb9d238100a4ab88795f55d5e92e5cd43e302d7f306dbad0e1900976892 openrisc--uclibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/openrisc/tarballs/openrisc--uclibc--stable-2022.08-1.sha256 +sha256 cdb6df4a341d8d30b005f8175fb79fdbb3fff08b363d83d2bf39bf216f22410f openrisc--uclibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--glibc--bleeding-edge-2022.08-1.sha256 +sha256 d21b08f39f6f6b038fb37e3c71130c8db86c76a060b4b9980efd083bcb9c2b21 powerpc-440fp--glibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--glibc--stable-2022.08-1.sha256 +sha256 5d891f8fae87fcd0736e3250864bec3199a03bbce66c21a3b145e34de80c4c7a powerpc-440fp--glibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--musl--bleeding-edge-2022.08-1.sha256 +sha256 322acf83e10c951ac8fa1b7826d4d0ae041c1a9ad2c1df45ea9cadf5cbb76922 powerpc-440fp--musl--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--musl--stable-2022.08-1.sha256 +sha256 60298c1c675467ccfef3d7021c7d16beff59c4bc10ff86b07b07ed9bc9342903 powerpc-440fp--musl--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--uclibc--bleeding-edge-2022.08-1.sha256 +sha256 dd3a795f3079d8f559bd81c5ea35b20355c0b2188a5d75c493f7a75da83fde6d powerpc-440fp--uclibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-440fp/tarballs/powerpc-440fp--uclibc--stable-2022.08-1.sha256 +sha256 61be67b9dc19e764791190d0cae4b23a620ccf9b1715e3e4700983a15ebdca49 powerpc-440fp--uclibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--glibc--bleeding-edge-2022.08-1.sha256 +sha256 2b4feb8fe946c4571639590ad7972fccd860b153aa192826861f6a40ba46531f powerpc-e300c3--glibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--glibc--stable-2022.08-1.sha256 +sha256 f4fcbefcf0748198b0fed7b27a7f45023067b8550d1b29857e3de8b3e394d44e powerpc-e300c3--glibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--musl--bleeding-edge-2022.08-1.sha256 +sha256 6e8e152d4bc58891c9b93b98e2d4a15ab26f9ceee00725092c0f9c2aff4ed503 powerpc-e300c3--musl--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--musl--stable-2022.08-1.sha256 +sha256 0c2418120d9b32faddb59570e18d700c5d17396e6287a368263b59eea1895f08 powerpc-e300c3--musl--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--uclibc--bleeding-edge-2022.08-1.sha256 +sha256 07a8e609ee1ab8b5aa4c8a2fa07a6c7a2ba47f387ef180e33f8b3972a976a138 powerpc-e300c3--uclibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e300c3/tarballs/powerpc-e300c3--uclibc--stable-2022.08-1.sha256 +sha256 a755ab1c79099e089aa238ff5dc012fea756076fb60f39fbf53d151985825eb1 powerpc-e300c3--uclibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--glibc--bleeding-edge-2022.08-1.sha256 +sha256 e932a8f76e00140b246ea3a925f6eafc4921cb974b527336ec737be9f1b7ff31 powerpc-e500mc--glibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--glibc--stable-2022.08-1.sha256 +sha256 fce8332a339732350350d06340003d450a7ba315cf8c03655be5377b953a843e powerpc-e500mc--glibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--musl--bleeding-edge-2022.08-1.sha256 +sha256 33600548051fae6e44fbf34fcf2116ab0c8dc8db79e51d2ed8ffe23baac04447 powerpc-e500mc--musl--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--musl--stable-2022.08-1.sha256 +sha256 1c2fea3db1c5fb058b56739b2e716f8ce8e1e4a605e5a46c45abfcb1a36103ea powerpc-e500mc--musl--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--uclibc--bleeding-edge-2022.08-1.sha256 +sha256 6d622a86574d29b1e84aadad1a1a58737c9b0068fcb8093739684ceea949b089 powerpc-e500mc--uclibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc-e500mc/tarballs/powerpc-e500mc--uclibc--stable-2022.08-1.sha256 +sha256 cd3c1a34d7825b268cf1a2aaa906aabcb6ea9a1cb3764efe5efad7d6d56567a4 powerpc-e500mc--uclibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e5500/tarballs/powerpc64-e5500--glibc--bleeding-edge-2022.08-1.sha256 +sha256 d05d7d247d53b552fa3656384a4c4252a09aa3b58004854f315f2e576c833fe9 powerpc64-e5500--glibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e5500/tarballs/powerpc64-e5500--glibc--stable-2022.08-1.sha256 +sha256 d754ce34ea8d028abed71672c92530a4d1839e4108323f2ff7d6e71d60e4f23a powerpc64-e5500--glibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs/powerpc64-e6500--glibc--bleeding-edge-2022.08-1.sha256 +sha256 f601c50d1d1eb6fc9d8162270c5fc631f86cc622d7d732100d2764a31a3a2c41 powerpc64-e6500--glibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs/powerpc64-e6500--glibc--stable-2022.08-1.sha256 +sha256 3327d4b9c27a51efa6f5128d2f582c8685df1a5a095a7fd316ab78573d9d13ec powerpc64-e6500--glibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs/powerpc64-e6500--musl--bleeding-edge-2022.08-1.sha256 +sha256 ee6f75dfde53782763a9d39f8293f93b44e2e1685db967530c3b6011771337e3 powerpc64-e6500--musl--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-e6500/tarballs/powerpc64-e6500--musl--stable-2022.08-1.sha256 +sha256 66e358b0a46593f32aab0aa942f327787f3d99a55c3ff063001cabcc04deb85c powerpc64-e6500--musl--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs/powerpc64-power8--glibc--bleeding-edge-2022.08-1.sha256 +sha256 0cf79c59189f1c9e5b058986b5535b845c53d787a9879923b20ccd4b6561cc3c powerpc64-power8--glibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs/powerpc64-power8--glibc--stable-2022.08-1.sha256 +sha256 ece83b6b7ad026eb769d555264dc7565cb7c04f9742355a171882a1817e98b73 powerpc64-power8--glibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs/powerpc64-power8--musl--bleeding-edge-2022.08-1.sha256 +sha256 3eade3adc05e3b09f7b65d31e724d37ceac7c81d78afecf3394a7ad0c84972b5 powerpc64-power8--musl--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64-power8/tarballs/powerpc64-power8--musl--stable-2022.08-1.sha256 +sha256 5196955f9f4b46d12d8e0211ae64902a73bc491cfced31e2d85865bda5ed3443 powerpc64-power8--musl--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs/powerpc64le-power8--glibc--bleeding-edge-2022.08-1.sha256 +sha256 9882709003776bf8da785a30bbd1b75b64d9752ef70bface22ff6434be136682 powerpc64le-power8--glibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs/powerpc64le-power8--glibc--stable-2022.08-1.sha256 +sha256 37e404425c3d8176b3a19b5a2ae8b57460871f9aec4e6491ded638f5115f5081 powerpc64le-power8--glibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs/powerpc64le-power8--musl--bleeding-edge-2022.08-1.sha256 +sha256 9eb4ca911853d259228229490af9ae6eaf30d79b8d41a29f807cc27979cd9104 powerpc64le-power8--musl--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/powerpc64le-power8/tarballs/powerpc64le-power8--musl--stable-2022.08-1.sha256 +sha256 c1bce8d56c1b667a382eccc4a061d35add21a68d7479e9c62f8c35271d8c5f32 powerpc64le-power8--musl--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv32-ilp32d/tarballs/riscv32-ilp32d--glibc--bleeding-edge-2022.08-1.sha256 +sha256 47a4b8365d5d772de4b4b1100a221421c5a3cb8ff09d366d4578df2c0cdf23bb riscv32-ilp32d--glibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--glibc--bleeding-edge-2022.08-1.sha256 +sha256 a5ceafc2d1dbe2598ed9c8018f8f7108b7d5cb4847303842e924976a4cfe14be riscv64-lp64d--glibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--glibc--stable-2022.08-1.sha256 +sha256 556c860783c69f21d77be8b2856e7dd24f66b115775bb5ef6c8de5f4a6b1b861 riscv64-lp64d--glibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--musl--bleeding-edge-2022.08-1.sha256 +sha256 3e8d0ac53b9188d46630fe8ade2794e05ae9a2636a45c60b89b62ac1a3f6e6c5 riscv64-lp64d--musl--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--musl--stable-2022.08-1.sha256 +sha256 fd2d6b2ac2b2e02caabd9fa43b506dcc87eb1afbe475999180891a5e0208c436 riscv64-lp64d--musl--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--uclibc--bleeding-edge-2022.08-1.sha256 +sha256 8469a9c7ec50a401fc6466e81dc0d7032648c4e7f1b602afcf5ddab2ffabaac4 riscv64-lp64d--uclibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/riscv64-lp64d/tarballs/riscv64-lp64d--uclibc--stable-2022.08-1.sha256 +sha256 002e98d438519f62a2b2de42acac226051b1887a98523f02d54322275c3ffd25 riscv64-lp64d--uclibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/s390x-z13/tarballs/s390x-z13--glibc--bleeding-edge-2022.08-1.sha256 +sha256 295e281935dd22433d1a819a7a010356fdf6e19cea27631fdc884d3251c344a0 s390x-z13--glibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/s390x-z13/tarballs/s390x-z13--glibc--stable-2022.08-1.sha256 +sha256 965c7ab533e7e4812fc515badc595f0e4f79ab7986eef992889f6a1a225d4c19 s390x-z13--glibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--glibc--bleeding-edge-2022.08-1.sha256 +sha256 413703c54af9fdceb955a311f5db4f3fa34b4170dc5f12b99da3c464915bcbfa sh-sh4--glibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--glibc--stable-2022.08-1.sha256 +sha256 5084c4545a60bdec153bcef7dd52a824c3937c85686b223a6e92667d71850963 sh-sh4--glibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--musl--bleeding-edge-2022.08-1.sha256 +sha256 243079028e9155c7dfcb1c67ae9bd42bfcb9d5a23f9e9078c9ca53613c5d607b sh-sh4--musl--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--musl--stable-2022.08-1.sha256 +sha256 46ad264d4074ca4ac0ab4acd244145e4820aef315a14bdd9a6e54e888c04b630 sh-sh4--musl--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--uclibc--bleeding-edge-2022.08-1.sha256 +sha256 7c7a009e0335396839ab1be8b7817084414792ef04aa25df4c178c9d2ec0aa13 sh-sh4--uclibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4/tarballs/sh-sh4--uclibc--stable-2022.08-1.sha256 +sha256 1b1c22ebf92664df828151eaec3c7fe9a6bb1c48fa177c85a62418ec627b2756 sh-sh4--uclibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs/sh-sh4aeb--glibc--bleeding-edge-2022.08-1.sha256 +sha256 5765af1f25bcc34e31561b7cf955dabae5a3fb1650148a60915cbb4ccd87e49a sh-sh4aeb--glibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs/sh-sh4aeb--glibc--stable-2022.08-1.sha256 +sha256 47f9694a263af6e943acf59d8da9af34b6f9a562d67883f4298b4cc4469fdcff sh-sh4aeb--glibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs/sh-sh4aeb--musl--bleeding-edge-2022.08-1.sha256 +sha256 fa519ec4e29701de84af63943c51c0f740620ce3577ae689d89c2a578ed425de sh-sh4aeb--musl--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sh-sh4aeb/tarballs/sh-sh4aeb--musl--stable-2022.08-1.sha256 +sha256 f3ca7d35bd5ce1b99dd1395b8f2a7c162b23a60eed6ae938cfa2fbd20d25a470 sh-sh4aeb--musl--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sparc64/tarballs/sparc64--glibc--bleeding-edge-2022.08-1.sha256 +sha256 bb08735ffbb2c0e60bd5b1fa1d65fe44f7781a4c57872ede0797a9a495ed575e sparc64--glibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sparc64/tarballs/sparc64--glibc--stable-2022.08-1.sha256 +sha256 9c14934230a73f4ca99d4452dd0f24a033e3843fe2be28cb723f0d66635d4a4f sparc64--glibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sparcv8/tarballs/sparcv8--uclibc--bleeding-edge-2022.08-2.sha256 +sha256 ccd4110fa574d2323f038394c0603245384002fbe906204db36fe200c9c8f886 sparcv8--uclibc--bleeding-edge-2022.08-2.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/sparcv8/tarballs/sparcv8--uclibc--stable-2022.08-1.sha256 +sha256 da3b9f0a936401cbd3cc305b86d3611531391354cc0226a0eeb3ce4ddcc7b7dc sparcv8--uclibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--glibc--bleeding-edge-2022.08-1.sha256 +sha256 9a09ac03001ef2a6cab391cc658fc2a32730b6a8f25614e97a91b9a79537fe33 x86-64--glibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--glibc--stable-2022.08-1.sha256 +sha256 861c1e8ad0a66e4c28e7a1f8319d68080ab0ff8d16a765e65540f1957203a190 x86-64--glibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--musl--bleeding-edge-2022.08-1.sha256 +sha256 18149a2d69d1cd392536a97f53d6a02b90887c7e8b86db871b80396d46b9142d x86-64--musl--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--musl--stable-2022.08-1.sha256 +sha256 6a47708f72d2c01721e31907ceb524b7980764d3546b9aca4a6804f6d8db2676 x86-64--musl--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--uclibc--bleeding-edge-2022.08-1.sha256 +sha256 ef40c02af986bb3e4d14c76a3bc60285f5249d0676fb01400081f87b2414438b x86-64--uclibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64/tarballs/x86-64--uclibc--stable-2022.08-1.sha256 +sha256 d4fbec618e17a70521c0b6339c9889f298b9806ee342e29ffe05ac76ee87c83c x86-64--uclibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--glibc--bleeding-edge-2022.08-1.sha256 +sha256 7ac996b2ca1acdcdaddce38a3fd19bc30b864f6b73f8e6d0537243e912b5d36f x86-64-v2--glibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--glibc--stable-2022.08-1.sha256 +sha256 4313a04996173bd79935ffaec48b97ba7c32332880774ec61b40ab76804b8fbb x86-64-v2--glibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--musl--bleeding-edge-2022.08-1.sha256 +sha256 83c57b50ba00555c4e2d7fdfa700b69032f06bfe743b5022a69036b0f18fbfdf x86-64-v2--musl--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--musl--stable-2022.08-1.sha256 +sha256 a76ebe570be5e74875d8f0b82aba3ad055679e734af5c6bdac036ef5f7c7b6fd x86-64-v2--musl--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--uclibc--bleeding-edge-2022.08-1.sha256 +sha256 ab395da0c3d64a8a7121f640d16c8e79d4c187dbd866b42e4456f8c26eeadf4a x86-64-v2--uclibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v2/tarballs/x86-64-v2--uclibc--stable-2022.08-1.sha256 +sha256 f64742f3c5cfdde7e068c3694e86d9df1b5a5ad8e4b0c9542c1e7de55951459a x86-64-v2--uclibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--glibc--bleeding-edge-2022.08-1.sha256 +sha256 40196066dcd7b6d52b956de823f7840fcae76207030d885bb4d07b692505f71f x86-64-v3--glibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--glibc--stable-2022.08-1.sha256 +sha256 97e43a5e7059a6262278795a102c6b0a2895731ba6aba8125ccd8a354cc68216 x86-64-v3--glibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--musl--bleeding-edge-2022.08-1.sha256 +sha256 6a26d96022edde94de3b2ec9b414b2865cb99430b0eef4b3f263b0f0713875ac x86-64-v3--musl--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--musl--stable-2022.08-1.sha256 +sha256 082b698fdf995806a4b94c30c7a3c90755747a5cbd73e5f89423052063c7b562 x86-64-v3--musl--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--uclibc--bleeding-edge-2022.08-1.sha256 +sha256 1102391f5c03c335f7a27d2bf67818f67b675768c9e4fb1beb826624cc468033 x86-64-v3--uclibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v3/tarballs/x86-64-v3--uclibc--stable-2022.08-1.sha256 +sha256 c9f0fb4ea32d5d878ef8b719b750904ad4779a01c54a186a05f0e15f5257a653 x86-64-v3--uclibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--glibc--bleeding-edge-2022.08-1.sha256 +sha256 95d25e92e4b4d1b93da6667e61615457d2086efa2ea9f1fbd73404bcad1f3456 x86-64-v4--glibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--glibc--stable-2022.08-1.sha256 +sha256 93b31a24c7ec8b1d4fc8343edf506b78e2b15d017e7436bf28be4e888af183a1 x86-64-v4--glibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--musl--bleeding-edge-2022.08-1.sha256 +sha256 e67339ac587bc8815a2ee7fa2e74240ffacae75c26a785d4f3404766c550e15a x86-64-v4--musl--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--musl--stable-2022.08-1.sha256 +sha256 d20b1866f77a9ea4789404610859ea08e76803bbfca3d92627c9a7ae036eb13f x86-64-v4--musl--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--uclibc--bleeding-edge-2022.08-1.sha256 +sha256 4c0ae459a70134fe61b0cb32bfb94e61504efd3e8860cc265dfb3043ec140929 x86-64-v4--uclibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-v4/tarballs/x86-64-v4--uclibc--stable-2022.08-1.sha256 +sha256 bec5542fe02be69e4ef8d0722d3c920b64a06206adc580434f2d0088eaa9effa x86-64-v4--uclibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--glibc--bleeding-edge-2022.08-1.sha256 +sha256 995dcaf678cf37b193be86ce6733c0402129fc22eee6a45f76acb86deb8c481d x86-64-core-i7--glibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--glibc--stable-2022.08-1.sha256 +sha256 7a31f72e6dc378eac8a97b0915b3619ba95c79f73046d052539c44f91bee9a02 x86-64-core-i7--glibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--musl--bleeding-edge-2022.08-1.sha256 +sha256 2ff43343f39f99a238502293b6ce20b0324f850c1b606ad4772d7d54f2b73206 x86-64-core-i7--musl--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--musl--stable-2022.08-1.sha256 +sha256 fbfdf31724e24a19af4f83e3a9bc766f8fc455f4c4e912401aec1e81f2e71b4c x86-64-core-i7--musl--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--uclibc--bleeding-edge-2022.08-1.sha256 +sha256 86e9c65eebf909f7deae7d75ef3af4fc6bcee51ef21c92f0ed6fa1ae7206ae50 x86-64-core-i7--uclibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--uclibc--stable-2022.08-1.sha256 +sha256 cc06ac611d1930a4a87016adfabade8b3bba5ce6ed743a60059fee9d70634de5 x86-64-core-i7--uclibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--glibc--bleeding-edge-2022.08-1.sha256 +sha256 3c828987dcd4be469dce355d44e0c42166ab9d939a99b8f1d1463b769f6ecbea x86-core2--glibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--glibc--stable-2022.08-1.sha256 +sha256 5bff24ea3e83207e91cae12ca5929da823f3caf2a035ed4995658a5b7b571ecb x86-core2--glibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--musl--bleeding-edge-2022.08-1.sha256 +sha256 75b83133ba59c87bd060cd8f516df9685eaa70a7bda544447630c2c0b94dd1fb x86-core2--musl--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--musl--stable-2022.08-1.sha256 +sha256 61ee5639fa9fb5b454bd675061b539c51615b4e95c7939ca5ef4d46f4e9d8b31 x86-core2--musl--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--uclibc--bleeding-edge-2022.08-1.sha256 +sha256 5107c9a89a2162393c95d9aa63ea1c85892ea9cb1393556110af844f147f8bad x86-core2--uclibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-core2/tarballs/x86-core2--uclibc--stable-2022.08-1.sha256 +sha256 ce9bed3cc5d21f3b12b7780783b32498beae186e0693f57884d0cffff13d445f x86-core2--uclibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--glibc--bleeding-edge-2022.08-1.sha256 +sha256 6eda31bf8c4504f322e1e2689beb7172f831400061168a03c0c16956a777a806 x86-i686--glibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--glibc--stable-2022.08-1.sha256 +sha256 6364eb674e5594947cc658bd7ff4928624eb03a20469395a0be93761a804723b x86-i686--glibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--musl--bleeding-edge-2022.08-1.sha256 +sha256 fd94a3905991bab90e5474e7407e6b593222e44947e70e9d0061f393ab420b0d x86-i686--musl--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--musl--stable-2022.08-1.sha256 +sha256 7cc2a015e12ac0ae1bd2050e9078fbe87241de2e30ecd4b789ba494b08b3382a x86-i686--musl--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--uclibc--bleeding-edge-2022.08-1.sha256 +sha256 c61f6090e96813417880150b8c89ad34502c74e5b69b640701e98378441d9cfc x86-i686--uclibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--uclibc--stable-2022.08-1.sha256 +sha256 a35b1f2d4ef5ce829d2211efb4735196c0c7dcb451d5d40089c126e8b8e6c02e x86-i686--uclibc--stable-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/xtensa-lx60/tarballs/xtensa-lx60--uclibc--bleeding-edge-2022.08-1.sha256 +sha256 a822972e8865b4bc9ad1a077c38fbe095c89ea018364411240da1183fcf7c2ad xtensa-lx60--uclibc--bleeding-edge-2022.08-1.tar.bz2 +# From https://toolchains.bootlin.com/downloads/releases/toolchains/xtensa-lx60/tarballs/xtensa-lx60--uclibc--stable-2022.08-1.sha256 +sha256 35df9b38a5b424cc7d18dd7d382a7962c813dcd19b0c6e9887e3fbb4e3a6d44d xtensa-lx60--uclibc--stable-2022.08-1.tar.bz2 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 fb19ef29097..230552af710 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk +++ b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk @@ -7,229 +7,265 @@ # 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-2 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64be--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64be--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64be--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = aarch64be--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = arcle-750d--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = arcle-750d--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = arcle-hs38--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-3 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = arcle-hs38--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = arcle-hs38--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = arcle-hs38--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv5-eabi--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv5-eabi--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv5-eabi--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv5-eabi--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv5-eabi--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv5-eabi--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv6-eabihf--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv6-eabihf--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv6-eabihf--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv6-eabihf--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv6-eabihf--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv6-eabihf--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv7-eabihf--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv7-eabihf--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv7-eabihf--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv7-eabihf--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv7-eabihf--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv7-eabihf--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2022.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armebv7-eabihf--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +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 = 2022.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armebv7-eabihf--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +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 = 2022.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armebv7-eabihf--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +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 = 2022.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armebv7-eabihf--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +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 = 2022.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armebv7-eabihf--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +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 = 2022.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armebv7-eabihf--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv7m--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = armv7m--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/armv7m/tarballs endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = m68k-68xxx--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = m68k-68xxx--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-68xxx/tarballs endif @@ -247,889 +283,967 @@ TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/relea endif ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazebe--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazebe--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazebe--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazebe--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazebe--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazebe--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazeel--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazeel--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazeel--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazeel--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazeel--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazeel--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32el--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32el--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32el--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32el--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32el--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32el--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r5el--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r5el--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r5el--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r5el--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r5el--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r5el--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r6el--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r6el--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r6el--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r6el--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r6el--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips32r6el--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64-n32--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64-n32--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64-n32--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64-n32--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64-n32--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64-n32--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64el-n32--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64el-n32--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64el-n32--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64el-n32--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64el-n32--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64el-n32--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64r6el-n32--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64r6el-n32--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64r6el-n32--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64r6el-n32--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64r6el-n32--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = mips64r6el-n32--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = nios2--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = nios2--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2022.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +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 = 2022.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +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 = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = openrisc--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-440fp--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-440fp--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-440fp--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-440fp--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-440fp--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-440fp--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e300c3--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e300c3--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e300c3--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e300c3--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e300c3--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e300c3--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e500mc--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e500mc--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e500mc--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e500mc--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e500mc--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc-e500mc--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-e5500--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-e5500--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-e6500--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-e6500--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-e6500--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-e6500--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-power8--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-power8--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-power8--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64-power8--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64le-power8--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64le-power8--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-2 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64le-power8--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = powerpc64le-power8--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv32-ilp32d--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv64-lp64d--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv64-lp64d--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv64-lp64d--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv64-lp64d--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv64-lp64d--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = riscv64-lp64d--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2022.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = s390x-z13--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +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 = 2022.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = s390x-z13--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4aeb--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4aeb--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4aeb--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sh-sh4aeb--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sparc64--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sparc64--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-3 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-2 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sparcv8--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = sparcv8--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v2--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2022.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v2--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +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 = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v2--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2022.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v2--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +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 = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v2--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2022.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v2--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +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 = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v3--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2022.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v3--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +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 = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v3--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2022.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v3--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +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 = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v3--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2022.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v3--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +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 = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v4--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2022.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v4--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +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 = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v4--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2022.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v4--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +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 = 2021.11-5 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v4--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2022.08-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-v4--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 +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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-core-i7--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-core-i7--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-core-i7--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-core-i7--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-core-i7--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-64-core-i7--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-core2--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-core2--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-core2--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-core2--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-core2--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-core2--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-i686--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-i686--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-i686--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-i686--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-i686--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = x86-i686--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = xtensa-lx60--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 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 = 2021.11-1 +TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2022.08-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = xtensa-lx60--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.bz2 TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/xtensa-lx60/tarballs endif diff --git a/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in b/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in index 2341d088325..d49c6102375 100644 --- a/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in +++ b/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in @@ -5,6 +5,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" depends on BR2_MIPS_CPU_MIPS32R6 || (BR2_MIPS_CPU_MIPS64R6 && !BR2_MIPS_SOFT_FLOAT) select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7 select BR2_TOOLCHAIN_GCC_AT_LEAST_6 diff --git a/toolchain/toolchain-external/toolchain-external-codescape-img-mips/toolchain-external-codescape-img-mips.hash b/toolchain/toolchain-external/toolchain-external-codescape-img-mips/toolchain-external-codescape-img-mips.hash index b540164a299..65e1861f127 100644 --- a/toolchain/toolchain-external/toolchain-external-codescape-img-mips/toolchain-external-codescape-img-mips.hash +++ b/toolchain/toolchain-external/toolchain-external-codescape-img-mips/toolchain-external-codescape-img-mips.hash @@ -1,4 +1,4 @@ # Codescape toolchains from MIPS Tech LLC # From: https://codescape.mips.com/components/toolchain/nanomips/2018.09-02/downloads.html -sha256 ac035f3b6a8767522977963d8e1490520d58bccca7956f4503a1eefff6492b71 Codescape.GNU.Tools.Package.2018.09-02.for.MIPS.IMG.Linux.CentOS-6.x86.tar.gz -sha256 09280f4fcbb993607905bf9a43bf5f3db2beed85726f0675b8453e19a9ddc429 Codescape.GNU.Tools.Package.2018.09-02.for.MIPS.IMG.Linux.CentOS-6.x86_64.tar.gz +sha256 ac035f3b6a8767522977963d8e1490520d58bccca7956f4503a1eefff6492b71 Codescape.GNU.Tools.Package.2018.09-02.for.MIPS.IMG.Linux.CentOS-6.x86.tar.gz +sha256 09280f4fcbb993607905bf9a43bf5f3db2beed85726f0675b8453e19a9ddc429 Codescape.GNU.Tools.Package.2018.09-02.for.MIPS.IMG.Linux.CentOS-6.x86_64.tar.gz diff --git a/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in b/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in index c58c55119a7..720d705d14b 100644 --- a/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in +++ b/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in @@ -3,9 +3,9 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_7 depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - depends on BR2_MIPS_CPU_MIPS32R2 || (BR2_MIPS_CPU_MIPS64R2 && !BR2_MIPS_SOFT_FLOAT) || \ - BR2_MIPS_CPU_MIPS32R5 || (BR2_MIPS_CPU_MIPS64R5 && !BR2_MIPS_SOFT_FLOAT) + depends on BR2_MIPS_CPU_MIPS32R2 || (BR2_MIPS_CPU_MIPS64R2 && !BR2_MIPS_SOFT_FLOAT) select BR2_TOOLCHAIN_EXTERNAL_GLIBC + select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7 select BR2_TOOLCHAIN_GCC_AT_LEAST_6 diff --git a/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/toolchain-external-codescape-mti-mips.hash b/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/toolchain-external-codescape-mti-mips.hash index 8e70af501fd..b07281de488 100644 --- a/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/toolchain-external-codescape-mti-mips.hash +++ b/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/toolchain-external-codescape-mti-mips.hash @@ -1,4 +1,4 @@ # Codescape toolchains from MIPS Tech LLC # From: https://codescape.mips.com/components/toolchain/nanomips/2018.09-02/downloads.html -sha256 c883a404fd7ea5718e2249a530802e223381f2be52265f88e9b1ce7035c232f3 Codescape.GNU.Tools.Package.2018.09-02.for.MIPS.MTI.Linux.CentOS-6.x86.tar.gz -sha256 d6310a970b0a8a19ad8e0a2b3ead8c38ee90d0e284a9b2511200ce447f460d2c Codescape.GNU.Tools.Package.2018.09-02.for.MIPS.MTI.Linux.CentOS-6.x86_64.tar.gz +sha256 c883a404fd7ea5718e2249a530802e223381f2be52265f88e9b1ce7035c232f3 Codescape.GNU.Tools.Package.2018.09-02.for.MIPS.MTI.Linux.CentOS-6.x86.tar.gz +sha256 d6310a970b0a8a19ad8e0a2b3ead8c38ee90d0e284a9b2511200ce447f460d2c Codescape.GNU.Tools.Package.2018.09-02.for.MIPS.MTI.Linux.CentOS-6.x86_64.tar.gz diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in b/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in index 24cbcffa298..8c0f985c5bf 100644 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in +++ b/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in @@ -5,7 +5,6 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64 # a57/a53 and a72/a53 appeared in gcc-6 or were broken before depends on !BR2_cortex_a57_a53 && !BR2_cortex_a72_a53 depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - depends on !BR2_STATIC_LIBS select BR2_TOOLCHAIN_EXTERNAL_GLIBC select BR2_TOOLCHAIN_HAS_SSP select BR2_INSTALL_LIBSTDCPP diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/toolchain-external-codesourcery-aarch64.hash b/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/toolchain-external-codesourcery-aarch64.hash index f7d3f29fdc4..8f8fca0d0c3 100644 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/toolchain-external-codesourcery-aarch64.hash +++ b/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/toolchain-external-codesourcery-aarch64.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 405aada821146755c5f2df566375c2a682456d6b8451ee47b88cf1a52b093676 aarch64-amd-2014.11-95-aarch64-amd-linux-gnu-i686-pc-linux-gnu.tar.bz2 -sha256 3f50dd6ee433eb5b6992a1071b988e50379a738f54f58722bc60081613764716 aarch64-amd-2014.11-95-aarch64-amd-linux-gnu.src.tar.bz2 +sha256 405aada821146755c5f2df566375c2a682456d6b8451ee47b88cf1a52b093676 aarch64-amd-2014.11-95-aarch64-amd-linux-gnu-i686-pc-linux-gnu.tar.bz2 +sha256 3f50dd6ee433eb5b6992a1071b988e50379a738f54f58722bc60081613764716 aarch64-amd-2014.11-95-aarch64-amd-linux-gnu.src.tar.bz2 diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in b/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in index bdbe2acaeaf..aea2ba34f25 100644 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in +++ b/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in @@ -6,7 +6,6 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM depends on BR2_ARM_EABI # Unsupported ARM cores depends on !BR2_cortex_a12 && !BR2_cortex_a17 && !BR2_ARM_CPU_ARMV8A - depends on !BR2_STATIC_LIBS select BR2_TOOLCHAIN_EXTERNAL_GLIBC select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_NATIVE_RPC @@ -34,4 +33,3 @@ comment "Sourcery CodeBench toolchains available for the EABI ABI" depends on BR2_arm depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 depends on !BR2_ARM_EABI - depends on !BR2_STATIC_LIBS diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-arm/toolchain-external-codesourcery-arm.hash b/toolchain/toolchain-external/toolchain-external-codesourcery-arm/toolchain-external-codesourcery-arm.hash index 535f4aaf995..c01a7b17c59 100644 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-arm/toolchain-external-codesourcery-arm.hash +++ b/toolchain/toolchain-external/toolchain-external-codesourcery-arm/toolchain-external-codesourcery-arm.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 39ee0e789034334ecc89af94e838e3a4815400ac5ff980f808f466b04778532e arm-2014.05-29-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2 -sha256 e16a5b1e41d7ff1e74161f9405182001bc8d1360d89564e73911032e6966cc0d arm-2014.05-29-arm-none-linux-gnueabi.src.tar.bz2 +sha256 39ee0e789034334ecc89af94e838e3a4815400ac5ff980f808f466b04778532e arm-2014.05-29-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2 +sha256 e16a5b1e41d7ff1e74161f9405182001bc8d1360d89564e73911032e6966cc0d arm-2014.05-29-arm-none-linux-gnueabi.src.tar.bz2 diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-mips/Config.in b/toolchain/toolchain-external/toolchain-external-codesourcery-mips/Config.in index 1a3bdc93938..8e067c8ffb3 100644 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-mips/Config.in +++ b/toolchain/toolchain-external/toolchain-external-codesourcery-mips/Config.in @@ -7,7 +7,6 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS depends on !BR2_mips_interaptiv depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" depends on !BR2_MIPS_NABI32 - depends on !BR2_STATIC_LIBS select BR2_TOOLCHAIN_EXTERNAL_GLIBC select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_NATIVE_RPC @@ -93,4 +92,3 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS comment "Sourcery CodeBench toolchains are only available for MIPS/MIPS64 o32 and n64" depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_6 depends on BR2_MIPS_NABI32 - depends on !BR2_STATIC_LIBS diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-mips/toolchain-external-codesourcery-mips.hash b/toolchain/toolchain-external/toolchain-external-codesourcery-mips/toolchain-external-codesourcery-mips.hash index 2d80338e7b2..c2429d85de0 100644 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-mips/toolchain-external-codesourcery-mips.hash +++ b/toolchain/toolchain-external/toolchain-external-codesourcery-mips/toolchain-external-codesourcery-mips.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d354447c4c5160439dafd5464fa3a0266dd41e79f973477238e4f0215a6b5397 mips-2016.05-8-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2 -sha256 2658e55d5b71bba25d6f77e868e18b200ea5f75c8add7ed3a9266e716d9adfff mips-2016.05-8-mips-linux-gnu.src.tar.bz2 +sha256 d354447c4c5160439dafd5464fa3a0266dd41e79f973477238e4f0215a6b5397 mips-2016.05-8-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2 +sha256 2658e55d5b71bba25d6f77e868e18b200ea5f75c8add7ed3a9266e716d9adfff mips-2016.05-8-mips-linux-gnu.src.tar.bz2 diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in b/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in index 9d785a4b6b5..cf3ce69a68b 100644 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in +++ b/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in @@ -3,7 +3,6 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII depends on BR2_nios2 depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_8 depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - depends on !BR2_STATIC_LIBS select BR2_TOOLCHAIN_EXTERNAL_GLIBC select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_NATIVE_RPC diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.hash b/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.hash index 518e677f311..47893ab7e2b 100644 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.hash +++ b/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.hash @@ -1,6 +1,6 @@ # From https://sourcery.mentor.com/GNUToolchain/release3374 -md5 4f536b3b9b4e00f483e82e304c0a27ae sourceryg++-2018.05-5-nios2-linux-gnu-i686-pc-linux-gnu.tar.bz2 -md5 be42ab83da2e8db7b73dc890c2549570 sourceryg++-2018.05-5-nios2-linux-gnu.src.tar.bz2 +md5 4f536b3b9b4e00f483e82e304c0a27ae sourceryg++-2018.05-5-nios2-linux-gnu-i686-pc-linux-gnu.tar.bz2 +md5 be42ab83da2e8db7b73dc890c2549570 sourceryg++-2018.05-5-nios2-linux-gnu.src.tar.bz2 # Locally calculated -sha256 c19afb432b5b23f8d5d639831d3a423a3ea3c9cc62e0015020d20ea2eb36dd1b sourceryg++-2018.05-5-nios2-linux-gnu-i686-pc-linux-gnu.tar.bz2 -sha256 d73a6364106dd62352711f932d3be8e97fdaaa548995678b5d38d9f21e22437a sourceryg++-2018.05-5-nios2-linux-gnu.src.tar.bz2 +sha256 c19afb432b5b23f8d5d639831d3a423a3ea3c9cc62e0015020d20ea2eb36dd1b sourceryg++-2018.05-5-nios2-linux-gnu-i686-pc-linux-gnu.tar.bz2 +sha256 d73a6364106dd62352711f932d3be8e97fdaaa548995678b5d38d9f21e22437a sourceryg++-2018.05-5-nios2-linux-gnu.src.tar.bz2 diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index 9346fa3feb7..e9a9c1c2a17 100644 --- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -24,6 +24,21 @@ config BR2_TOOLCHAIN_EXTERNAL_REL_BIN_PATH config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX string "Toolchain prefix" default "$(ARCH)-linux" + help + Component name prefix used by your external toolchain. + + Typically, this is the target tuple, e.g. something that + looks like: $(ARCH)-unknown-linux-gnu. + + If unsure, look at the "bin" directory of your toolchain and + note the part of component name before the last dash, i.e. if + you call the toolchain's gcc as $(ARCH)-unknown-linux-gnu-gcc, + the prefix is $(ARCH)-unknown-linux-gnu. + + Note that Buildroot toolchains have shorter aliases that look + like $(ARCH)-linux, as symlinks to the full-tuple components, + so you can leave this option at default value if you use them + as external toolchain. choice bool "External toolchain gcc version" @@ -31,6 +46,10 @@ choice Set to the gcc version that is used by your external toolchain. +config BR2_TOOLCHAIN_EXTERNAL_GCC_12 + bool "12.x" + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + config BR2_TOOLCHAIN_EXTERNAL_GCC_11 bool "11.x" select BR2_TOOLCHAIN_GCC_AT_LEAST_11 @@ -123,8 +142,28 @@ 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_1 + bool "6.1.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1 + +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_0 + bool "6.0.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_0 + +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_19 + bool "5.19.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_19 + +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_18 + bool "5.18.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_18 + +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_17 + bool "5.17.x" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_17 + config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_16 - bool "5.16.x or later" + bool "5.16.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_16 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_15 @@ -377,21 +416,11 @@ config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_UCLIBC C library. config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC - bool "glibc/eglibc" - depends on !BR2_STATIC_LIBS + bool "glibc" select BR2_TOOLCHAIN_EXTERNAL_GLIBC help Select this option if your external toolchain uses the GNU C - library (available from https://www.gnu.org/software/libc/) - or its variant the eglibc library (http://www.eglibc.org/). - - Note: eglibc is a variant of glibc that (among other things) - can be configured to exclude some of its features. Using a - toolchain with eglibc configured to exclude key features may - cause build failures to some packages. - -comment "(e)glibc only available with shared lib support" - depends on BR2_STATIC_LIBS + library (available from https://www.gnu.org/software/libc/). config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL bool "musl (experimental)" diff --git a/toolchain/toolchain-external/toolchain-external-custom/toolchain-external-custom.mk b/toolchain/toolchain-external/toolchain-external-custom/toolchain-external-custom.mk index c4ae6125ef7..f2ec01f88c0 100644 --- a/toolchain/toolchain-external/toolchain-external-custom/toolchain-external-custom.mk +++ b/toolchain/toolchain-external/toolchain-external-custom/toolchain-external-custom.mk @@ -10,6 +10,11 @@ TOOLCHAIN_EXTERNAL_CUSTOM_SOURCE = $(notdir $(call qstrip,$(BR2_TOOLCHAIN_EXTERN ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CUSTOM),y) # We can't check hashes for custom downloaded toolchains BR_NO_CHECK_HASH_FOR += $(TOOLCHAIN_EXTERNAL_SOURCE) +ifeq ($(BR_BUILDING)$(BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD),yy) +ifeq ($(TOOLCHAIN_EXTERNAL_CUSTOM_SOURCE),) +$(error No external toolchain url set, check your BR2_TOOLCHAIN_EXTERNAL_URL setting) +endif +endif endif $(eval $(toolchain-external-package)) diff --git a/toolchain/toolchain-external/toolchain-external-linaro-aarch64-be/Config.in b/toolchain/toolchain-external/toolchain-external-linaro-aarch64-be/Config.in index bac90374cf9..53d5dfd8f2e 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-aarch64-be/Config.in +++ b/toolchain/toolchain-external/toolchain-external-linaro-aarch64-be/Config.in @@ -2,7 +2,6 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_BE bool "Linaro AArch64 BE 2018.05" depends on BR2_aarch64_be depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - depends on !BR2_STATIC_LIBS select BR2_TOOLCHAIN_EXTERNAL_GLIBC select BR2_TOOLCHAIN_HAS_SSP select BR2_INSTALL_LIBSTDCPP diff --git a/toolchain/toolchain-external/toolchain-external-linaro-aarch64-be/toolchain-external-linaro-aarch64-be.hash b/toolchain/toolchain-external/toolchain-external-linaro-aarch64-be/toolchain-external-linaro-aarch64-be.hash index f93642ecaa2..53b6966e7bb 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-aarch64-be/toolchain-external-linaro-aarch64-be.hash +++ b/toolchain/toolchain-external/toolchain-external-linaro-aarch64-be/toolchain-external-linaro-aarch64-be.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 412da19c1d1bff0f3172bc19fd2c024207d8d716dbe7a8dad4bf9e3d6b71d149 gcc-linaro-7.3.1-2018.05-i686_aarch64_be-linux-gnu.tar.xz -sha256 277c1483f8dbd6007c945ffeb706fa1ba1da8ec1c397cf5cf1e29c25081426e5 gcc-linaro-7.3.1-2018.05-x86_64_aarch64_be-linux-gnu.tar.xz +sha256 412da19c1d1bff0f3172bc19fd2c024207d8d716dbe7a8dad4bf9e3d6b71d149 gcc-linaro-7.3.1-2018.05-i686_aarch64_be-linux-gnu.tar.xz +sha256 277c1483f8dbd6007c945ffeb706fa1ba1da8ec1c397cf5cf1e29c25081426e5 gcc-linaro-7.3.1-2018.05-x86_64_aarch64_be-linux-gnu.tar.xz diff --git a/toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in b/toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in index 824eb76c726..c9b84b1d30e 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in +++ b/toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in @@ -2,7 +2,6 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64 bool "Linaro AArch64 2018.05" depends on BR2_aarch64 depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - depends on !BR2_STATIC_LIBS select BR2_TOOLCHAIN_EXTERNAL_GLIBC select BR2_TOOLCHAIN_HAS_SSP select BR2_INSTALL_LIBSTDCPP diff --git a/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.hash b/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.hash index 938e37c7795..70841a4fa2b 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.hash +++ b/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 466b801a60491ae1e2ce9952e0615cf04cf611596c6ffd5bfe8a89ef5be47e03 gcc-linaro-7.3.1-2018.05-i686_aarch64-linux-gnu.tar.xz -sha256 73eed74e593e2267504efbcf3678918bb22409ab7afa3dc7c135d2c6790c2345 gcc-linaro-7.3.1-2018.05-x86_64_aarch64-linux-gnu.tar.xz +sha256 466b801a60491ae1e2ce9952e0615cf04cf611596c6ffd5bfe8a89ef5be47e03 gcc-linaro-7.3.1-2018.05-i686_aarch64-linux-gnu.tar.xz +sha256 73eed74e593e2267504efbcf3678918bb22409ab7afa3dc7c135d2c6790c2345 gcc-linaro-7.3.1-2018.05-x86_64_aarch64-linux-gnu.tar.xz diff --git a/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in b/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in index beb38609c3b..015e92f17cd 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in +++ b/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in @@ -1,7 +1,6 @@ comment "Linaro toolchains available for Cortex-A + EABIhf" depends on BR2_arm depends on !BR2_ARM_CPU_ARMV7A || !BR2_ARM_EABIHF - depends on !BR2_STATIC_LIBS config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARM bool "Linaro ARM 2018.05" @@ -9,7 +8,6 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARM depends on BR2_ARM_CPU_ARMV7A || BR2_ARM_CPU_ARMV8A depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" depends on BR2_ARM_EABIHF - depends on !BR2_STATIC_LIBS select BR2_TOOLCHAIN_EXTERNAL_GLIBC select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_NATIVE_RPC diff --git a/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.hash b/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.hash index bd09cb5a899..7169e0b9362 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.hash +++ b/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 0613b5be14eb7d50a772bbd72069c428558e6e53fa5fce7201d75a13a475ffff gcc-linaro-7.3.1-2018.05-i686_arm-linux-gnueabihf.tar.xz -sha256 7248bf105d0d468887a9b8a7120bb281ac8ad0223d9cb3d00dc7c2d498485d91 gcc-linaro-7.3.1-2018.05-x86_64_arm-linux-gnueabihf.tar.xz +sha256 0613b5be14eb7d50a772bbd72069c428558e6e53fa5fce7201d75a13a475ffff gcc-linaro-7.3.1-2018.05-i686_arm-linux-gnueabihf.tar.xz +sha256 7248bf105d0d468887a9b8a7120bb281ac8ad0223d9cb3d00dc7c2d498485d91 gcc-linaro-7.3.1-2018.05-x86_64_arm-linux-gnueabihf.tar.xz diff --git a/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in b/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in index aa21e448604..b338a72bffd 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in +++ b/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in @@ -1,7 +1,6 @@ comment "Linaro toolchains available for Cortex-A + EABIhf" depends on BR2_armeb depends on !BR2_ARM_CPU_ARMV7A || !BR2_ARM_EABIHF - depends on !BR2_STATIC_LIBS config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB bool "Linaro armeb 2018.05" @@ -9,7 +8,6 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB depends on BR2_ARM_CPU_ARMV7A || BR2_ARM_CPU_ARMV8A depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" depends on BR2_ARM_EABIHF - depends on !BR2_STATIC_LIBS select BR2_TOOLCHAIN_EXTERNAL_GLIBC select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_NATIVE_RPC diff --git a/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.hash b/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.hash index a3b6b88b7e4..2b80f396d16 100644 --- a/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.hash +++ b/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 60bf9924a0c039c94deb85cb9b129d0f28b28eadbb1fb3f7e2e227679cc43fc9 gcc-linaro-7.3.1-2018.05-i686_armeb-linux-gnueabihf.tar.xz -sha256 c1bbd598b78458d6b7ea1c971fddf736c00d57890c7131fdafd4e789289c42f9 gcc-linaro-7.3.1-2018.05-x86_64_armeb-linux-gnueabihf.tar.xz +sha256 60bf9924a0c039c94deb85cb9b129d0f28b28eadbb1fb3f7e2e227679cc43fc9 gcc-linaro-7.3.1-2018.05-i686_armeb-linux-gnueabihf.tar.xz +sha256 c1bbd598b78458d6b7ea1c971fddf736c00d57890c7131fdafd4e789289c42f9 gcc-linaro-7.3.1-2018.05-x86_64_armeb-linux-gnueabihf.tar.xz diff --git a/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in b/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in index c3483f331c7..37c7b826440 100644 --- a/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in +++ b/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in @@ -4,7 +4,6 @@ config BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC depends on BR2_HOSTARCH = "x86_64" select BR2_TOOLCHAIN_EXTERNAL_UCLIBC select BR2_INSTALL_LIBSTDCPP - select BR2_ENABLE_LOCALE select BR2_USE_WCHAR select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_NPTL diff --git a/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.hash b/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.hash index 3ce6bbcb12e..3c227238338 100644 --- a/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.hash +++ b/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.hash @@ -1,5 +1,5 @@ # From https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases/tag/arc-2019.09-release -sha256 f7cbf68ef251943db7baf63535e0ec98dafbdf5d925017b4e1d4fc64d9b38a26 arc_gnu_2019.09_prebuilt_uclibc_le_arc700_linux_install.tar.gz -sha256 ac09f0a21f9d50146a5e542f4a6abc93e5a1dcb0a1372cb5c3ba86bbefaaec7d arc_gnu_2019.09_prebuilt_uclibc_be_arc700_linux_install.tar.gz -sha256 245ca49fe8ea2456617541b18bb96e52e6c0dc619f00e293fcaad519fc436c35 arc_gnu_2019.09_prebuilt_uclibc_le_archs_linux_install.tar.gz -sha256 6f039a0158c03af398ada31fae96009e47f0d7b7f7d52e12eb419492fc3f27e7 arc_gnu_2019.09_prebuilt_uclibc_be_archs_linux_install.tar.gz +sha256 f7cbf68ef251943db7baf63535e0ec98dafbdf5d925017b4e1d4fc64d9b38a26 arc_gnu_2019.09_prebuilt_uclibc_le_arc700_linux_install.tar.gz +sha256 ac09f0a21f9d50146a5e542f4a6abc93e5a1dcb0a1372cb5c3ba86bbefaaec7d arc_gnu_2019.09_prebuilt_uclibc_be_arc700_linux_install.tar.gz +sha256 245ca49fe8ea2456617541b18bb96e52e6c0dc619f00e293fcaad519fc436c35 arc_gnu_2019.09_prebuilt_uclibc_le_archs_linux_install.tar.gz +sha256 6f039a0158c03af398ada31fae96009e47f0d7b7f7d52e12eb419492fc3f27e7 arc_gnu_2019.09_prebuilt_uclibc_be_archs_linux_install.tar.gz diff --git a/toolchain/toolchain-wrapper.c b/toolchain/toolchain-wrapper.c index 0fb6064b1ca..f66e588bfd1 100644 --- a/toolchain/toolchain-wrapper.c +++ b/toolchain/toolchain-wrapper.c @@ -154,12 +154,9 @@ static const struct str_len_s unsafe_opts[] = { * or separated (e.g. -I /foo/bar). In the first case, we need only print * the argument as it already contains the path (arg_has_path), while in * the second case we need to print both (!arg_has_path). - * - * If paranoid, exit in error instead of just printing a warning. */ static void check_unsafe_path(const char *arg, const char *path, - int paranoid, int arg_has_path) { const struct str_len_s *p; @@ -168,14 +165,12 @@ static void check_unsafe_path(const char *arg, if (strncmp(path, p->str, p->len)) continue; fprintf(stderr, - "%s: %s: unsafe header/library path used in cross-compilation: '%s%s%s'\n", + "%s: ERROR: unsafe header/library path used in cross-compilation: '%s%s%s'\n", program_invocation_short_name, - paranoid ? "ERROR" : "WARNING", arg, arg_has_path ? "" : "' '", /* close single-quote, space, open single-quote */ arg_has_path ? "" : path); /* so that arg and path are properly quoted. */ - if (paranoid) - exit(1); + exit(1); } } @@ -250,8 +245,6 @@ int main(int argc, char **argv) char *progpath = argv[0]; char *basename; char *env_debug; - char *paranoid_wrapper; - int paranoid; int ret, i, count = 0, debug = 0, found_shared = 0; /* Debug the wrapper to see arguments it was called with. @@ -470,12 +463,6 @@ int main(int argc, char **argv) #endif } - paranoid_wrapper = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH"); - if (paranoid_wrapper && strlen(paranoid_wrapper) > 0) - paranoid = 1; - else - paranoid = 0; - /* Check for unsafe library and header paths */ for (i = 1; i < argc; i++) { const struct str_len_s *opt; @@ -492,9 +479,9 @@ int main(int argc, char **argv) i++; if (i == argc) break; - check_unsafe_path(argv[i-1], argv[i], paranoid, 0); + check_unsafe_path(argv[i-1], argv[i], 0); } else - check_unsafe_path(argv[i], argv[i] + opt->len, paranoid, 1); + check_unsafe_path(argv[i], argv[i] + opt->len, 1); } } @@ -507,8 +494,28 @@ int main(int argc, char **argv) exec_args = args; #ifdef BR_CCACHE - if (getenv("BR_NO_CCACHE")) - /* Skip the ccache call */ + /* If BR2_USE_CCACHE is set and its value is 1, enable ccache + * usage */ + char *br_use_ccache = getenv("BR2_USE_CCACHE"); + bool ccache_enabled = br_use_ccache && !strncmp(br_use_ccache, "1", strlen("1")); + + if (ccache_enabled) { +#ifdef BR_CCACHE_HASH + /* Allow compilercheck to be overridden through the environment */ + if (setenv("CCACHE_COMPILERCHECK", "string:" BR_CCACHE_HASH, 0)) { + perror(__FILE__ ": Failed to set CCACHE_COMPILERCHECK"); + return 3; + } +#endif +#ifdef BR_CCACHE_BASEDIR + /* Allow compilercheck to be overridden through the environment */ + if (setenv("CCACHE_BASEDIR", BR_CCACHE_BASEDIR, 0)) { + perror(__FILE__ ": Failed to set CCACHE_BASEDIR"); + return 3; + } +#endif + } else + /* ccache is disabled, skip it */ exec_args++; #endif @@ -516,12 +523,14 @@ int main(int argc, char **argv) if (debug > 0) { fprintf(stderr, "Toolchain wrapper executing:"); #ifdef BR_CCACHE_HASH - fprintf(stderr, "%sCCACHE_COMPILERCHECK='string:" BR_CCACHE_HASH "'", - (debug == 2) ? "\n " : " "); + if (ccache_enabled) + fprintf(stderr, "%sCCACHE_COMPILERCHECK='string:" BR_CCACHE_HASH "'", + (debug == 2) ? "\n " : " "); #endif #ifdef BR_CCACHE_BASEDIR - fprintf(stderr, "%sCCACHE_BASEDIR='" BR_CCACHE_BASEDIR "'", - (debug == 2) ? "\n " : " "); + if (ccache_enabled) + fprintf(stderr, "%sCCACHE_BASEDIR='" BR_CCACHE_BASEDIR "'", + (debug == 2) ? "\n " : " "); #endif for (i = 0; exec_args[i]; i++) fprintf(stderr, "%s'%s'", @@ -529,21 +538,6 @@ int main(int argc, char **argv) fprintf(stderr, "\n"); } -#ifdef BR_CCACHE_HASH - /* Allow compilercheck to be overridden through the environment */ - if (setenv("CCACHE_COMPILERCHECK", "string:" BR_CCACHE_HASH, 0)) { - perror(__FILE__ ": Failed to set CCACHE_COMPILERCHECK"); - return 3; - } -#endif -#ifdef BR_CCACHE_BASEDIR - /* Allow compilercheck to be overridden through the environment */ - if (setenv("CCACHE_BASEDIR", BR_CCACHE_BASEDIR, 0)) { - perror(__FILE__ ": Failed to set CCACHE_BASEDIR"); - return 3; - } -#endif - if (execv(exec_args[0], exec_args)) perror(path); diff --git a/toolchain/toolchain.mk b/toolchain/toolchain.mk index 08d1649603d..fe87a72ed4d 100644 --- a/toolchain/toolchain.mk +++ b/toolchain/toolchain.mk @@ -27,6 +27,10 @@ define TOOLCHAIN_GLIBC_COPY_GCONV_LIBS $(INSTALL) -m 0644 $(STAGING_DIR)/usr/lib/$${d}/gconv/*.so \ $(TARGET_DIR)/usr/lib/gconv \ || exit 1; \ + if [ -d $(STAGING_DIR)/usr/lib/$${d}/gconv/gconv-modules.d ]; then \ + cp -a $(STAGING_DIR)/usr/lib/$${d}/gconv/gconv-modules.d \ + $(TARGET_DIR)/usr/lib/gconv/ || exit 1; \ + fi; \ else \ for l in $(TOOLCHAIN_GLIBC_GCONV_LIBS); do \ $(INSTALL) -m 0644 -D $(STAGING_DIR)/usr/lib/$${d}/gconv/$${l}.so \ @@ -41,8 +45,9 @@ define TOOLCHAIN_GLIBC_COPY_GCONV_LIBS || exit 1; \ done; \ done; \ - ./support/scripts/expunge-gconv-modules "$(TOOLCHAIN_GLIBC_GCONV_LIBS)" \ - <$(STAGING_DIR)/usr/lib/$${d}/gconv/gconv-modules \ + ./support/scripts/expunge-gconv-modules \ + $(STAGING_DIR)/usr/lib/$${d}/gconv \ + "$(TOOLCHAIN_GLIBC_GCONV_LIBS)" \ >$(TARGET_DIR)/usr/lib/gconv/gconv-modules; \ fi endef diff --git a/toolchain/toolchain/toolchain.mk b/toolchain/toolchain/toolchain.mk index 18f1dbea1a1..ac60a7b2483 100644 --- a/toolchain/toolchain/toolchain.mk +++ b/toolchain/toolchain/toolchain.mk @@ -47,4 +47,7 @@ endef TOOLCHAIN_POST_INSTALL_TARGET_HOOKS += TOOLCHAIN_GLIBC_COPY_NSSWITCH_FILE endif +# Not really a virtual package, but we use the virtual package infra here so +# both the build log and build directory look nicer (toolchain-virtual instead +# of toolchain-undefined) $(eval $(virtual-package)) diff --git a/utils/brmake b/utils/brmake index e30119dd10b..70dfb6cdc8f 100755 --- a/utils/brmake +++ b/utils/brmake @@ -3,7 +3,7 @@ # License: WTFPL, https://spdx.org/licenses/WTFPL.html main() { - local found ret start d h m mf + 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 @@ -13,7 +13,7 @@ main() { start=${SECONDS} ( exec 2>&1; unbuffer make "${@}"; ) \ - > >( while read line; do + > >( while read -r line; do printf "%(%Y-%m-%dT%H:%M:%S)T %s\n" -1 "${line}" done \ |tee -a br.log \ diff --git a/utils/check-package b/utils/check-package index f64daed84c4..00121b32961 100755 --- a/utils/check-package +++ b/utils/check-package @@ -3,21 +3,56 @@ import argparse import inspect +import magic import os import re -import six import sys import checkpackagelib.base import checkpackagelib.lib_config import checkpackagelib.lib_hash +import checkpackagelib.lib_ignore import checkpackagelib.lib_mk import checkpackagelib.lib_patch +import checkpackagelib.lib_shellscript import checkpackagelib.lib_sysv VERBOSE_LEVEL_TO_SHOW_IGNORED_FILES = 3 flags = None # Command line arguments. +# There are two Python packages called 'magic': +# https://pypi.org/project/file-magic/ +# https://pypi.org/project/python-magic/ +# Both allow to return a MIME file type, but with a slightly different +# interface. Detect which one of the two we have based on one of the +# attributes. +if hasattr(magic, 'FileMagic'): + # https://pypi.org/project/file-magic/ + def get_filetype(fname): + return magic.detect_from_filename(fname).mime_type +else: + # https://pypi.org/project/python-magic/ + def get_filetype(fname): + return magic.from_file(fname, mime=True) + + +def get_ignored_parsers_per_file(intree_only, ignore_filename): + ignored = dict() + entry_base_dir = '' + + if not ignore_filename: + return ignored + + filename = os.path.abspath(ignore_filename) + entry_base_dir = os.path.join(os.path.dirname(filename)) + + with open(filename, "r") as f: + for line in f.readlines(): + filename, warnings_str = line.split(' ', 1) + warnings = warnings_str.split() + ignored[os.path.join(entry_base_dir, filename)] = warnings + return ignored + def parse_args(): parser = argparse.ArgumentParser() @@ -29,6 +64,8 @@ def parse_args(): parser.add_argument("--br2-external", "-b", dest='intree_only', action="store_false", help="do not apply the pathname filters used for intree files") + parser.add_argument("--ignore-list", dest='ignore_filename', action="store", + help='override the default list of ignored warnings') parser.add_argument("--manual-url", action="store", default="http://nightly.buildroot.org/", @@ -43,12 +80,32 @@ def parse_args(): help="do not run the specified functions (debug)") parser.add_argument("--dry-run", action="store_true", help="print the " "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)") + + flags = parser.parse_args() + + flags.ignore_list = get_ignored_parsers_per_file(flags.intree_only, flags.ignore_filename) + + if flags.failed_only: + flags.dry_run = False + flags.verbose = -1 - return parser.parse_args() + return flags + + +def get_lib_from_filetype(fname): + if not os.path.isfile(fname): + return None + filetype = get_filetype(fname) + if filetype == "text/x-shellscript": + return checkpackagelib.lib_shellscript + return None CONFIG_IN_FILENAME = re.compile(r"Config\.\S*$") DO_CHECK_INTREE = re.compile(r"|".join([ + r".checkpackageignore", r"Config.in", r"arch/", r"boot/", @@ -57,6 +114,7 @@ DO_CHECK_INTREE = re.compile(r"|".join([ r"package/", r"system/", r"toolchain/", + r"utils/", ])) DO_NOT_CHECK_INTREE = re.compile(r"|".join([ r"boot/barebox/barebox\.mk$", @@ -80,6 +138,8 @@ def get_lib_from_filename(fname): if os.path.basename(fname) == "external.mk" and \ os.path.exists(fname[:-2] + "desc"): return None + if fname == ".checkpackageignore": + return checkpackagelib.lib_ignore if CONFIG_IN_FILENAME.search(fname): return checkpackagelib.lib_config if fname.endswith(".hash"): @@ -90,7 +150,7 @@ def get_lib_from_filename(fname): return checkpackagelib.lib_patch if SYSV_INIT_SCRIPT_FILENAME.search(fname): return checkpackagelib.lib_sysv - return None + return get_lib_from_filetype(fname) def common_inspect_rules(m): @@ -120,21 +180,25 @@ def is_external_tool(m): return common_inspect_rules(m) -def print_warnings(warnings): +def print_warnings(warnings, xfail): # Avoid the need to use 'return []' at the end of every check function. if warnings is None: - return 0 # No warning generated. + return 0, 0 # No warning generated. + if xfail: + return 0, 1 # Warning not generated, fail expected for this file. for level, message in enumerate(warnings): if flags.verbose >= level: print(message.replace("\t", "< tab >").rstrip()) - return 1 # One more warning to count. + return 1, 1 # One more warning to count. def check_file_using_lib(fname): # Count number of warnings generated and lines processed. nwarnings = 0 nlines = 0 + xfail = flags.ignore_list.get(os.path.abspath(fname), []) + failed = set() lib = get_lib_from_filename(fname) if not lib: @@ -150,30 +214,50 @@ def check_file_using_lib(fname): print("{}: would run: {}".format(fname, functions_to_run)) return nwarnings, nlines - objects = [c[1](fname, flags.manual_url) for c in internal_functions] + objects = [[c[0], c[1](fname, flags.manual_url)] for c in internal_functions] + + for name, cf in objects: + warn, fail = print_warnings(cf.before(), name in xfail) + if fail > 0: + failed.add(name) + nwarnings += warn - for cf in objects: - nwarnings += print_warnings(cf.before()) - if six.PY3: - f = open(fname, "r", errors="surrogateescape") - else: - f = open(fname, "r") lastline = "" - for lineno, text in enumerate(f.readlines()): + for lineno, text in enumerate(open(fname, "r", errors="surrogateescape").readlines()): nlines += 1 - for cf in objects: + for name, cf in objects: if cf.disable.search(lastline): continue - nwarnings += print_warnings(cf.check_line(lineno + 1, text)) + warn, fail = print_warnings(cf.check_line(lineno + 1, text), name in xfail) + if fail > 0: + failed.add(name) + nwarnings += warn lastline = text - f.close() - for cf in objects: - nwarnings += print_warnings(cf.after()) - tools = [c[1](fname) for c in external_tools] + for name, cf in objects: + warn, fail = print_warnings(cf.after(), name in xfail) + if fail > 0: + failed.add(name) + nwarnings += warn + + tools = [[c[0], c[1](fname)] for c in external_tools] + + for name, tool in tools: + warn, fail = print_warnings(tool.run(), name in xfail) + if fail > 0: + failed.add(name) + nwarnings += warn + + for should_fail in xfail: + if should_fail not in failed: + print("{}:0: {} was expected to fail, did you fix the file and forget to update {}?" + .format(fname, should_fail, flags.ignore_filename)) + nwarnings += 1 - for tool in tools: - nwarnings += print_warnings(tool.run()) + if flags.failed_only: + if len(failed) > 0: + f = " ".join(sorted(failed)) + print("{} {}".format(fname, f)) return nwarnings, nlines @@ -213,7 +297,7 @@ def __main__(): print("{} lines processed".format(total_lines), file=sys.stderr) print("{} warnings generated".format(total_warnings), file=sys.stderr) - if total_warnings > 0: + if total_warnings > 0 and not flags.failed_only: sys.exit(1) diff --git a/utils/check-symbols b/utils/check-symbols new file mode 100755 index 00000000000..bb787909941 --- /dev/null +++ b/utils/check-symbols @@ -0,0 +1,78 @@ +#!/usr/bin/env python3 + +import argparse +import os +import sys + +import checksymbolslib.file as file +from checksymbolslib.db import DB + + +def parse_args(): + parser = argparse.ArgumentParser() + parser.add_argument('--search', action='store', default=None, + help='print all symbols matching a given regular expression') + return parser.parse_args() + + +def change_to_top_dir(): + base_dir = os.path.dirname(os.path.dirname(os.path.realpath(__file__))) + os.chdir(base_dir) + + +def get_full_db(files_to_process): + db = DB() + for f in files_to_process: + file.populate_db_from_file(db, f) + return db + + +def print_filenames_with_pattern(all_files, files_to_process, pattern): + ignored_filenames = file.get_list_of_filenames_with_pattern(all_files, files_to_process, pattern) + processed_filenames = file.get_list_of_filenames_with_pattern(files_to_process, [], pattern) + print('========== filenames found with pattern "{}": {}'.format(pattern, len(processed_filenames))) + for f in processed_filenames: + print(f) + print('========== ignored filenames with pattern "{}": {}'.format(pattern, len(ignored_filenames))) + for f in ignored_filenames: + print(f) + + +def print_symbols_with_pattern(db, pattern): + symbols = db.get_symbols_with_pattern(pattern) + print('========== symbols with pattern "{}": {}'.format(pattern, len(symbols))) + for s in symbols: + print(s, str(symbols[s])) + + +def __main__(): + flags = parse_args() + + change_to_top_dir() + all_files = file.get_list_of_files_in_the_repo() + files_to_process = file.get_list_of_files_to_process(all_files) + db = get_full_db(files_to_process) + + if flags.search: + print_filenames_with_pattern(all_files, files_to_process, flags.search) + print_symbols_with_pattern(db, flags.search) + print('========== warnings:') + + warnings = [] + warnings += db.get_warnings_for_choices_selected() + warnings += db.get_warnings_for_legacy_symbols_being_defined() + warnings += db.get_warnings_for_legacy_symbols_being_used() + warnings += db.get_warnings_for_symbols_with_legacy_note_and_no_comment_on_usage() + warnings += db.get_warnings_for_symbols_with_legacy_note_and_no_usage() + warnings += db.get_warnings_for_symbols_without_definition() + warnings += db.get_warnings_for_symbols_without_usage() + + for filename, lineno, msg in sorted(warnings): + print('{}:{}: {}'.format(filename, lineno, msg), file=sys.stderr) + + if len(warnings) > 0: + sys.exit(1) + + +if __name__ == '__main__': + __main__() diff --git a/utils/checkpackagelib/lib_config.py b/utils/checkpackagelib/lib_config.py index b05831f2c37..f26ca0d8980 100644 --- a/utils/checkpackagelib/lib_config.py +++ b/utils/checkpackagelib/lib_config.py @@ -233,3 +233,41 @@ def check_line(self, lineno, text): return ["{}:{}: should not be indented" .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") + ENDIF = re.compile(r"^\s*endif\b") + + def before(self): + self.configs = {} + self.conditional = [] + + def check_line(self, lineno, text): + if _empty_or_comment(text) or _part_of_help_text(text): + return + + m = self.IF.search(text) + if m is not None: + condition = m.group(1) + self.conditional.append(condition) + return + + m = self.ENDIF.search(text) + if m is not None: + self.conditional.pop() + return + + m = self.CONFIG.search(text) + if m is None: + return + config = m.group(2) + + key = (config, ' AND '.join(self.conditional)) + if key in self.configs.keys(): + previous_line = self.configs[key] + return ["{}:{}: config {} redeclared (previous line: {})" + .format(self.filename, lineno, config, previous_line), + text] + self.configs[key] = lineno diff --git a/utils/checkpackagelib/lib_ignore.py b/utils/checkpackagelib/lib_ignore.py new file mode 100644 index 00000000000..f3698fc3b4d --- /dev/null +++ b/utils/checkpackagelib/lib_ignore.py @@ -0,0 +1,14 @@ +# See utils/checkpackagelib/readme.txt before editing this file. + +import os + +from checkpackagelib.base import _CheckFunction + + +class IgnoreMissingFile(_CheckFunction): + def check_line(self, lineno, text): + fields = text.split() + if not os.path.exists(fields[0]): + return ["{}:{}: ignored file {} is missing" + .format(self.filename, lineno, fields[0]), + text] diff --git a/utils/checkpackagelib/lib_mk.py b/utils/checkpackagelib/lib_mk.py index b50a19ac628..8adf844e9a1 100644 --- a/utils/checkpackagelib/lib_mk.py +++ b/utils/checkpackagelib/lib_mk.py @@ -21,6 +21,24 @@ end_conditional = ["endif"] +class Ifdef(_CheckFunction): + IFDEF = re.compile(r"^\s*(else\s+|)(ifdef|ifndef)\s") + + def check_line(self, lineno, text): + m = self.IFDEF.search(text) + if m is None: + return + word = m.group(2) + if word == 'ifdef': + return ["{}:{}: use ifeq ($(SYMBOL),y) instead of ifdef SYMBOL" + .format(self.filename, lineno), + text] + else: + return ["{}:{}: use ifneq ($(SYMBOL),y) instead of ifndef SYMBOL" + .format(self.filename, lineno), + text] + + class Indent(_CheckFunction): COMMENT = re.compile(r"^\s*#") CONDITIONAL = re.compile(r"^\s*({})\s".format("|".join(start_conditional + end_conditional + continue_conditional))) diff --git a/utils/checkpackagelib/lib_shellscript.py b/utils/checkpackagelib/lib_shellscript.py new file mode 100644 index 00000000000..9b4f4aed584 --- /dev/null +++ b/utils/checkpackagelib/lib_shellscript.py @@ -0,0 +1,5 @@ +from checkpackagelib.lib import ConsecutiveEmptyLines # noqa: F401 +from checkpackagelib.lib import EmptyLastLine # noqa: F401 +from checkpackagelib.lib import NewlineAtEof # noqa: F401 +from checkpackagelib.lib import TrailingSpace # noqa: F401 +from checkpackagelib.tool import Shellcheck # noqa: F401 diff --git a/utils/checkpackagelib/test_lib_config.py b/utils/checkpackagelib/test_lib_config.py index 91a549adf2e..474d17105ee 100644 --- a/utils/checkpackagelib/test_lib_config.py +++ b/utils/checkpackagelib/test_lib_config.py @@ -385,3 +385,81 @@ def test_HelpText(testname, filename, string, expected): def test_Indent(testname, filename, string, expected): warnings = util.check_file(m.Indent, filename, string) assert warnings == expected + + +RedefinedConfig = [ + ('no redefinition', + 'any', + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'config BR2_PACKAGE_FOO_BAR\n' + 'bool "foo"\n', + []), + ('no conditional', + 'any', + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'config BR2_PACKAGE_BAR\n' + 'bool "bar"\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n', + [['any:5: config BR2_PACKAGE_FOO redeclared (previous line: 1)', + 'config BR2_PACKAGE_FOO\n']]), + ('three times', + 'any', + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n', + [['any:3: config BR2_PACKAGE_FOO redeclared (previous line: 1)', + 'config BR2_PACKAGE_FOO\n'], + ['any:5: config BR2_PACKAGE_FOO redeclared (previous line: 1)', + 'config BR2_PACKAGE_FOO\n']]), + ('same conditional', + 'any', + 'if BR2_PACKAGE_BAZ\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'config BR2_PACKAGE_BAR\n' + 'bool "bar"\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'endif\n', + [['any:6: config BR2_PACKAGE_FOO redeclared (previous line: 2)', + 'config BR2_PACKAGE_FOO\n']]), + ('equivalent conditional', + 'any', + 'if BR2_PACKAGE_BAZ\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'endif\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'if BR2_PACKAGE_BAZ\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'endif\n', + [['any:8: config BR2_PACKAGE_FOO redeclared (previous line: 2)', + 'config BR2_PACKAGE_FOO\n']]), + ('not equivalent conditional', + 'any', + 'if BR2_PACKAGE_BAZ\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'endif\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'if !BR2_PACKAGE_BAZ\n' + 'config BR2_PACKAGE_FOO\n' + 'bool "foo"\n' + 'endif\n', + []), + ] + + +@pytest.mark.parametrize('testname,filename,string,expected', RedefinedConfig) +def test_RedefinedConfig(testname, filename, string, expected): + warnings = util.check_file(m.RedefinedConfig, filename, string) + assert warnings == expected diff --git a/utils/checkpackagelib/test_lib_ignore.py b/utils/checkpackagelib/test_lib_ignore.py new file mode 100644 index 00000000000..6cd856d6694 --- /dev/null +++ b/utils/checkpackagelib/test_lib_ignore.py @@ -0,0 +1,18 @@ +import pytest +import checkpackagelib.test_util as util +import checkpackagelib.lib_ignore as m + + +IgnoreMissingFile = [ + ('missing ignored file', + '.checkpackageignore', + 'this-file-does-not-exist SomeTest', + [['.checkpackageignore:1: ignored file this-file-does-not-exist is missing', + 'this-file-does-not-exist SomeTest']]), + ] + + +@pytest.mark.parametrize('testname,filename,string,expected', IgnoreMissingFile) +def test_IgnoreMissingFile(testname, filename, string, expected): + warnings = util.check_file(m.IgnoreMissingFile, filename, string) + assert warnings == expected diff --git a/utils/checkpackagelib/test_lib_mk.py b/utils/checkpackagelib/test_lib_mk.py index 49fa216fcdf..80a1736b4e6 100644 --- a/utils/checkpackagelib/test_lib_mk.py +++ b/utils/checkpackagelib/test_lib_mk.py @@ -3,6 +3,54 @@ import checkpackagelib.lib_mk as m +Ifdef = [ + ('ignore commented line', + 'any', + '# ifdef\n', + []), + ('simple', + 'any', + '\n' + 'ifdef BR2_PACKAGE_FWTS_EFI_RUNTIME_MODULE\n' + 'endif\n', + [['any:2: use ifeq ($(SYMBOL),y) instead of ifdef SYMBOL', + 'ifdef BR2_PACKAGE_FWTS_EFI_RUNTIME_MODULE\n']]), + ('ignore indentation', + 'any', + ' ifdef FOO\n' + ' endif\n' + '\tifdef BAR\n' + 'endif\n', + [['any:1: use ifeq ($(SYMBOL),y) instead of ifdef SYMBOL', + ' ifdef FOO\n'], + ['any:3: use ifeq ($(SYMBOL),y) instead of ifdef SYMBOL', + '\tifdef BAR\n']]), + ('typo', + 'any', + '\n' + 'ifndef ($(BR2_ENABLE_LOCALE),y)\n' + 'endif\n', + [['any:2: use ifneq ($(SYMBOL),y) instead of ifndef SYMBOL', + 'ifndef ($(BR2_ENABLE_LOCALE),y)\n']]), + ('else ifdef', + 'any', + 'else ifdef SYMBOL # comment\n', + [['any:1: use ifeq ($(SYMBOL),y) instead of ifdef SYMBOL', + 'else ifdef SYMBOL # comment\n']]), + ('else ifndef', + 'any', + '\t else ifndef\t($(SYMBOL),y) # comment\n', + [['any:1: use ifneq ($(SYMBOL),y) instead of ifndef SYMBOL', + '\t else ifndef\t($(SYMBOL),y) # comment\n']]), + ] + + +@pytest.mark.parametrize('testname,filename,string,expected', Ifdef) +def test_Ifdef(testname, filename, string, expected): + warnings = util.check_file(m.Ifdef, filename, string) + assert warnings == expected + + Indent = [ ('ignore comment at beginning of line', 'any', diff --git a/utils/checksymbolslib/__init__.py b/utils/checksymbolslib/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/utils/checksymbolslib/br.py b/utils/checksymbolslib/br.py new file mode 100644 index 00000000000..846a609829d --- /dev/null +++ b/utils/checksymbolslib/br.py @@ -0,0 +1,140 @@ +import os +import re + + +ignored_directories = [ + 'support/testing/', +] +# Makefile +symbols_used_only_in_source_code = [ + 'BR2_USE_CCACHE', +] +# package/skeleton/Config.in +symbols_used_only_for_host_variant = [ + 'BR2_PACKAGE_SKELETON', +] +# Makefile +# package/pkg-generic.mk +symbols_defined_only_at_command_line = [ + 'BR2_GRAPH_ALT', + 'BR2_GRAPH_DEPS_OPTS', + 'BR2_GRAPH_DOT_OPTS', + 'BR2_GRAPH_OUT', + 'BR2_GRAPH_SIZE_OPTS', + 'BR2_INSTRUMENTATION_SCRIPTS', +] +# Makefile +symbols_defined_only_when_using_br2_external = [ + 'BR2_EXTERNAL', + 'BR2_EXTERNAL_DIRS', + 'BR2_EXTERNAL_MKS', + 'BR2_EXTERNAL_NAMES', +] +# boot/barebox/barebox.mk +symbols_defined_only_for_barebox_variant = [ + 'BR2_TARGET_BAREBOX_AUX_BAREBOXENV', +] +# toolchain/toolchain/toolchain.mk +# toolchain/toolchain-buildroot/toolchain-buildroot.mk +symbols_not_defined_for_fake_virtual_packages = [ + 'BR2_PACKAGE_HAS_TOOLCHAIN', + 'BR2_PACKAGE_HAS_TOOLCHAIN_BUILDROOT', + 'BR2_PACKAGE_PROVIDES_TOOLCHAIN', + 'BR2_PACKAGE_PROVIDES_TOOLCHAIN_BUILDROOT', +] +# fs/common.mk +suffixes_not_defined_for_all_rootfs_types = [ + '_BZIP2', + '_GZIP', + '_LZ4', + '_LZMA', + '_LZO', + '_XZ', + '_ZSTD', +] +# fs/common.mk +rootfs_prefix = 'BR2_TARGET_ROOTFS_' +# package/pkg-generic.mk +package_prefix = 'BR2_PACKAGE_' +# package/pkg-generic.mk +boot_prefix = 'BR2_TARGET_' +# package/pkg-generic.mk +toolchain_prefix = 'BR2_' +# boot/barebox/barebox.mk +barebox_infra_suffixes = [ + '', + '_BAREBOXENV', + '_BOARD_DEFCONFIG', + '_CONFIG_FRAGMENT_FILES', + '_CUSTOM_CONFIG_FILE', + '_CUSTOM_EMBEDDED_ENV_PATH', + '_CUSTOM_ENV', + '_CUSTOM_ENV_PATH', + '_IMAGE_FILE', + '_USE_CUSTOM_CONFIG', + '_USE_DEFCONFIG', +] +re_kconfig_symbol = re.compile(r'\b(BR2_\w+)\b') +# Example lines to be handled: +# config BR2_TOOLCHAIN_EXTERNAL_PREFIX +# menuconfig BR2_PACKAGE_GST1_PLUGINS_BASE +re_kconfig_config = re.compile(r'^\s*(menu|)config\s+(BR2_\w+)') +# Example lines to be handled: +# default "uclibc" if BR2_TOOLCHAIN_BUILDROOT_UCLIBC +# default BR2_TARGET_GRUB2_BUILTIN_MODULES if BR2_TARGET_GRUB2_BUILTIN_MODULES != "" +# default y if BR2_HOSTARCH = "powerpc" +re_kconfig_default = re.compile(r'^\s*default\s') +re_kconfig_default_before_conditional = re.compile(r'^.*\bif\b') +re_kconfig_default_legacy_comment = re.compile(r'#\s*legacy') +# Example lines to be handled: +# depends on !(BR2_TOOLCHAIN_USES_GLIBC && BR2_TOOLCHAIN_USES_MUSL) +# depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" +re_kconfig_depends = re.compile(r'^\s*depends on\s') +# Example lines to be handled: +# select BR2_PACKAGE_HOST_NODEJS if BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL != "" +# select BR2_PACKAGE_LIBDRM if !(BR2_arm && BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_FB) +# select BR2_PACKAGE_OPENSSL if !(BR2_PACKAGE_GNUTLS || BR2_PACKAGE_MBEDTLS) +re_kconfig_select = re.compile(r'^\s*select\s') +re_kconfig_select_conditional = re.compile(r'\bif\s.*') +# Example lines to be handled: +# if !BR2_SKIP_LEGACY +# if (BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX51 || BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX53) +# if BR2_PACKAGE_HAS_LUAINTERPRETER && !BR2_STATIC_LIBS +# if BR2_PACKAGE_QEMU_CUSTOM_TARGETS = "" +re_kconfig_if = re.compile(r'^\s*if\s') +# Example lines to be handled: +# source "$BR2_BASE_DIR/.br2-external.in.jpeg" +re_kconfig_source = re.compile(r'^\s*source\b') + +re_kconfig_choice = re.compile(r'^\s*choice\b') +re_kconfig_endchoice = re.compile(r'^\s*endchoice\b') +re_makefile_eval = re.compile(r'^\s*\$\(eval\b') +re_menu = re.compile(r'^\s*menu\b') +re_endmenu = re.compile(r'^\s*endmenu\b') +re_comments = re.compile(r'#.*$') +re_legacy_special_comment = re.compile(r'#.*(BR2_\w+)\s.*still referenced') +re_host_symbol = re.compile(r'(BR2_PACKAGE_HOST_\w+|BR2_PACKAGE_HAS_HOST_\w+)') +re_makefile_symbol_usage = re.compile(r'\$\((BR2_\w+)\)') +re_makefile_symbol_export = re.compile(r'export\s*(BR2_\w+)') +re_makefile_symbol_attribution = re.compile(r'^\s*(BR2_\w+)\s*[?:=]') + + +def get_package_from_filename(filename): + package = os.path.basename(filename)[:-3].upper().replace('-', '_') + return package + + +def is_an_optional_symbol_for_a_roofts(symbol): + if not symbol.startswith(rootfs_prefix): + return False + for sufix in suffixes_not_defined_for_all_rootfs_types: + if symbol.endswith(sufix): + return True + return False + + +def file_belongs_to_an_ignored_diretory(filename): + for d in ignored_directories: + if filename.startswith(d): + return True + return False diff --git a/utils/checksymbolslib/db.py b/utils/checksymbolslib/db.py new file mode 100644 index 00000000000..71b1e9e8165 --- /dev/null +++ b/utils/checksymbolslib/db.py @@ -0,0 +1,205 @@ +import re + +import checksymbolslib.br as br + + +choice = 'part of a choice' +definition = 'definition' +helper = 'possible config helper' +legacy_definition = 'legacy definition' +legacy_note = 'legacy note' +legacy_usage = 'legacy usage' +select = 'selected' +usage = 'normal usage' +usage_in_legacy = 'usage inside legacy' +virtual = 'virtual' + + +class DB: + def __init__(self): + self.all_symbols = {} + + def __str__(self): + return str(self.all_symbols) + + def add_symbol_entry(self, symbol, filename, lineno, entry_type): + if symbol not in self.all_symbols: + self.all_symbols[symbol] = {} + if entry_type not in self.all_symbols[symbol]: + self.all_symbols[symbol][entry_type] = {} + if filename not in self.all_symbols[symbol][entry_type]: + self.all_symbols[symbol][entry_type][filename] = [] + self.all_symbols[symbol][entry_type][filename].append(lineno) + + def add_symbol_choice(self, symbol, filename, lineno): + self.add_symbol_entry(symbol, filename, lineno, choice) + + def add_symbol_definition(self, symbol, filename, lineno): + self.add_symbol_entry(symbol, filename, lineno, definition) + + def add_symbol_helper(self, symbol, filename, lineno): + self.add_symbol_entry(symbol, filename, lineno, helper) + + def add_symbol_legacy_definition(self, symbol, filename, lineno): + self.add_symbol_entry(symbol, filename, lineno, legacy_definition) + + def add_symbol_legacy_note(self, symbol, filename, lineno): + self.add_symbol_entry(symbol, filename, lineno, legacy_note) + + def add_symbol_legacy_usage(self, symbol, filename, lineno): + self.add_symbol_entry(symbol, filename, lineno, legacy_usage) + + def add_symbol_select(self, symbol, filename, lineno): + self.add_symbol_entry(symbol, filename, lineno, select) + + def add_symbol_usage(self, symbol, filename, lineno): + self.add_symbol_entry(symbol, filename, lineno, usage) + + def add_symbol_usage_in_legacy(self, symbol, filename, lineno): + self.add_symbol_entry(symbol, filename, lineno, usage_in_legacy) + + def add_symbol_virtual(self, symbol, filename, lineno): + self.add_symbol_entry(symbol, filename, lineno, virtual) + + def get_symbols_with_pattern(self, pattern): + re_pattern = re.compile(r'{}'.format(pattern)) + found_symbols = {} + for symbol, entries in self.all_symbols.items(): + if not re_pattern.search(symbol): + continue + found_symbols[symbol] = entries + return found_symbols + + def get_warnings_for_choices_selected(self): + warnings = [] + for symbol, entries in self.all_symbols.items(): + if choice not in entries: + continue + if select not in entries: + continue + all_items = [] + all_items += entries.get(select, {}).items() + for filename, linenos in all_items: + for lineno in linenos: + msg = '{} is part of a "choice" and should not be "select"ed'.format(symbol) + warnings.append((filename, lineno, msg)) + return warnings + + def get_warnings_for_legacy_symbols_being_used(self): + warnings = [] + for symbol, entries in self.all_symbols.items(): + if legacy_definition not in entries: + continue + if usage not in entries: + continue + all_items = [] + all_items += entries.get(usage, {}).items() + for filename, linenos in all_items: + for lineno in linenos: + msg = '{} is a legacy symbol and should not be referenced'.format(symbol) + warnings.append((filename, lineno, msg)) + return warnings + + def get_warnings_for_legacy_symbols_being_defined(self): + warnings = [] + for symbol, entries in self.all_symbols.items(): + if legacy_definition not in entries: + continue + if definition not in entries: + continue + all_items = [] + all_items += entries.get(definition, {}).items() + for filename, linenos in all_items: + for lineno in linenos: + msg = '{} is a legacy symbol and should not be redefined'.format(symbol) + warnings.append((filename, lineno, msg)) + return warnings + + def get_warnings_for_symbols_without_definition(self): + warnings = [] + for symbol, entries in self.all_symbols.items(): + if definition in entries: + continue + if legacy_definition in entries: + continue + if br.re_host_symbol.search(symbol): + continue + if br.is_an_optional_symbol_for_a_roofts(symbol): + continue + if symbol in br.symbols_defined_only_at_command_line: + continue + if symbol in br.symbols_defined_only_when_using_br2_external: + continue + if symbol in br.symbols_defined_only_for_barebox_variant: + continue + if symbol in br.symbols_not_defined_for_fake_virtual_packages: + continue + if virtual in entries: + continue + all_items = [] + all_items += entries.get(usage, {}).items() + all_items += entries.get(legacy_usage, {}).items() + all_items += entries.get(usage_in_legacy, {}).items() + for filename, linenos in all_items: + for lineno in linenos: + msg = '{} referenced but not defined'.format(symbol) + warnings.append((filename, lineno, msg)) + return warnings + + def get_warnings_for_symbols_without_usage(self): + warnings = [] + for symbol, entries in self.all_symbols.items(): + if usage in entries: + continue + if usage_in_legacy in entries: + continue + if legacy_usage in entries: + continue + if symbol in br.symbols_used_only_in_source_code: + continue + if symbol in br.symbols_used_only_for_host_variant: + continue + if helper in entries: + continue + if choice in entries: + continue + all_items = [] + all_items += entries.get(definition, {}).items() + all_items += entries.get(legacy_definition, {}).items() + for filename, linenos in all_items: + for lineno in linenos: + msg = '{} defined but not referenced'.format(symbol) + warnings.append((filename, lineno, msg)) + return warnings + + def get_warnings_for_symbols_with_legacy_note_and_no_comment_on_usage(self): + warnings = [] + for symbol, entries in self.all_symbols.items(): + if legacy_note not in entries: + continue + if legacy_usage in entries: + continue + all_items = [] + all_items += entries.get(usage, {}).items() + for filename, linenos in all_items: + for lineno in linenos: + msg = '{} missing "# legacy"'.format(symbol) + warnings.append((filename, lineno, msg)) + return warnings + + def get_warnings_for_symbols_with_legacy_note_and_no_usage(self): + warnings = [] + for symbol, entries in self.all_symbols.items(): + if legacy_note not in entries: + continue + if legacy_usage in entries: + continue + if usage in entries: + continue + all_items = [] + all_items += entries.get(legacy_note, {}).items() + for filename, linenos in all_items: + for lineno in linenos: + msg = '{} not referenced but has a comment stating it is'.format(symbol) + warnings.append((filename, lineno, msg)) + return warnings diff --git a/utils/checksymbolslib/file.py b/utils/checksymbolslib/file.py new file mode 100644 index 00000000000..0d3315bdc73 --- /dev/null +++ b/utils/checksymbolslib/file.py @@ -0,0 +1,83 @@ +import re +import subprocess + +import checksymbolslib.br as br +import checksymbolslib.kconfig as kconfig +import checksymbolslib.makefile as makefile + + +file_types = [ + kconfig, + makefile, +] + + +def get_list_of_files_in_the_repo(): + cmd = ['git', 'ls-files'] + p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + stdout = p.communicate()[0] + processed_output = [str(line.decode().rstrip()) for line in stdout.splitlines() if line] + return processed_output + + +def get_list_of_files_to_process(all_files): + files_to_process = [] + for f in all_files: + if br.file_belongs_to_an_ignored_diretory(f): + continue + for t in file_types: + if t.check_filename(f): + files_to_process.append(f) + break + return files_to_process + + +def get_list_of_filenames_with_pattern(all_files, exclude_list, pattern): + re_pattern = re.compile(r'{}'.format(pattern)) + matching_filenames = [] + for filename in all_files: + if re_pattern.search(filename): + if filename not in exclude_list: + matching_filenames.append(filename) + return matching_filenames + + +def read_file(filename): + file_content_raw = [] + with open(filename, 'r', errors='surrogateescape') as f: + for lineno, text in enumerate(f.readlines()): + file_content_raw.append([lineno + 1, text]) + return file_content_raw + + +def cleanup_file_content(file_content_raw): + cleaned_up_content = [] + continuation = False + last_line = None + first_lineno = None + for cur_lineno, cur_line in file_content_raw: + if continuation: + line = last_line + cur_line + lineno = first_lineno + else: + line = cur_line + lineno = cur_lineno + continuation = False + last_line = None + first_lineno = None + clean_line = line.rstrip('\n') + if clean_line.endswith('\\'): + continuation = True + last_line = clean_line.rstrip('\\') + first_lineno = lineno + continue + cleaned_up_content.append([lineno, clean_line]) + return cleaned_up_content + + +def populate_db_from_file(db, filename): + file_content_raw = read_file(filename) + file_content_to_process = cleanup_file_content(file_content_raw) + for t in file_types: + if t.check_filename(filename): + t.populate_db(db, filename, file_content_to_process) diff --git a/utils/checksymbolslib/kconfig.py b/utils/checksymbolslib/kconfig.py new file mode 100644 index 00000000000..9ad60303051 --- /dev/null +++ b/utils/checksymbolslib/kconfig.py @@ -0,0 +1,139 @@ +import os + +import checksymbolslib.br as br + + +def all_symbols_from(line): + clean_line = br.re_comments.sub('', line) + symbols = br.re_kconfig_symbol.findall(clean_line) + return symbols + + +def handle_definition(db, filename, lineno, line, legacy): + for symbol in all_symbols_from(line): + if legacy: + db.add_symbol_legacy_definition(symbol, filename, lineno) + else: + db.add_symbol_definition(symbol, filename, lineno) + + +def handle_usage(db, filename, lineno, line, legacy): + for symbol in all_symbols_from(line): + if legacy: + db.add_symbol_usage_in_legacy(symbol, filename, lineno) + else: + db.add_symbol_usage(symbol, filename, lineno) + + +def handle_default(db, filename, lineno, line, legacy): + if legacy: + handle_usage(db, filename, lineno, line, legacy) + return + if not br.re_kconfig_default_legacy_comment.search(line): + handle_usage(db, filename, lineno, line, legacy) + return + after = br.re_kconfig_default_before_conditional.sub('', line) + for symbol in all_symbols_from(after): + db.add_symbol_legacy_usage(symbol, filename, lineno) + + +def handle_select(db, filename, lineno, line, legacy): + handle_usage(db, filename, lineno, line, legacy) + before = br.re_kconfig_select_conditional.sub('', line) + for symbol in all_symbols_from(before): + db.add_symbol_select(symbol, filename, lineno) + + +line_type_handlers = { + br.re_kconfig_config: handle_definition, + br.re_kconfig_default: handle_default, + br.re_kconfig_depends: handle_usage, + br.re_kconfig_if: handle_usage, + br.re_kconfig_select: handle_select, + br.re_kconfig_source: handle_usage, +} + + +def handle_line(db, filename, lineno, line, legacy): + if not br.re_kconfig_symbol.search(line): + return + + for regexp, line_type_handler in line_type_handlers.items(): + if regexp.search(line): + line_type_handler(db, filename, lineno, line, legacy) + + +def handle_config_helper(db, filename, file_content): + symbol = None + lineno = None + state = 'none' + for cur_lineno, line in file_content: + if state == 'none': + m = br.re_kconfig_config.search(line) + if m is not None: + symbol = m.group(2) + lineno = cur_lineno + state = 'config' + continue + if state == 'config': + if br.re_kconfig_select.search(line): + db.add_symbol_helper(symbol, filename, lineno) + state = 'none' + continue + m = br.re_kconfig_config.search(line) + if m is not None: + symbol = m.group(2) + lineno = cur_lineno + continue + + +def handle_config_choice(db, filename, file_content): + state = 'none' + for lineno, line in file_content: + if state == 'none': + if br.re_kconfig_choice.search(line): + state = 'choice' + continue + if state == 'choice': + if br.re_kconfig_endchoice.search(line): + state = 'none' + continue + m = br.re_kconfig_config.search(line) + if m is not None: + symbol = m.group(2) + db.add_symbol_choice(symbol, filename, lineno) + continue + + +def handle_note(db, filename, file_content): + state = 'none' + for lineno, line in file_content: + if state == 'none': + if br.re_menu.search(line): + state = 'menu' + continue + if state == 'menu': + if br.re_endmenu.search(line): + state = 'none' + continue + m = br.re_legacy_special_comment.search(line) + if m is not None: + symbol = m.group(1) + db.add_symbol_legacy_note(symbol, filename, lineno) + continue + + +def populate_db(db, filename, file_content): + legacy = filename.endswith('.legacy') + for lineno, line in file_content: + handle_line(db, filename, lineno, line, legacy) + handle_config_helper(db, filename, file_content) + handle_config_choice(db, filename, file_content) + if legacy: + handle_note(db, filename, file_content) + + +def check_filename(filename): + if os.path.basename(filename).startswith('Config.'): + return True + return False diff --git a/utils/checksymbolslib/makefile.py b/utils/checksymbolslib/makefile.py new file mode 100644 index 00000000000..e3894dd1f9c --- /dev/null +++ b/utils/checksymbolslib/makefile.py @@ -0,0 +1,100 @@ +import checksymbolslib.br as br + + +def handle_eval(db, filename, lineno, line): + def add_multiple_symbol_usages(package, prefixes=None, suffixes=None): + for prefix in prefixes or ['']: + for sufix in suffixes or ['']: + symbol = prefix + package + sufix + db.add_symbol_usage(symbol, filename, lineno) + + package = br.get_package_from_filename(filename) + if '$(rootfs)' in line: + suffixes = [''] + br.suffixes_not_defined_for_all_rootfs_types + add_multiple_symbol_usages(package, prefixes=[br.rootfs_prefix], suffixes=suffixes) + return + if '$(kernel-module)' in line: + add_multiple_symbol_usages(package, prefixes=[br.package_prefix]) + return + if '$(barebox-package)' in line: + add_multiple_symbol_usages(package, prefixes=[br.boot_prefix], suffixes=br.barebox_infra_suffixes) + return + + if '-package)' not in line: + return + if package == 'LINUX': + # very special case at package/pkg-generic.mk + add_multiple_symbol_usages('BR2_LINUX_KERNEL') + return + + # mimic package/pkg-generic.mk and package/pkg-virtual.mk + if '$(virtual-' in line: + prefixes = ['BR2_PACKAGE_PROVIDES_', 'BR2_PACKAGE_HAS_'] + if filename.startswith('toolchain/'): + prefix = br.toolchain_prefix + else: + prefix = br.package_prefix + symbol = prefix + package + db.add_symbol_virtual(symbol, filename, lineno) + prefixes.append(prefix) + elif '$(host-virtual-' in line: + prefixes = ['BR2_PACKAGE_HOST_', 'BR2_PACKAGE_PROVIDES_HOST_', 'BR2_PACKAGE_HAS_HOST_'] + elif '$(host-' in line: + prefixes = ['BR2_PACKAGE_HOST_'] + elif filename.startswith('boot/'): + prefixes = [br.boot_prefix] + elif filename.startswith('toolchain/'): + prefixes = [br.toolchain_prefix] + elif '$(toolchain-' in line: + prefixes = [br.toolchain_prefix] + else: + prefixes = [br.package_prefix] + + add_multiple_symbol_usages(package, prefixes=prefixes) + + +def handle_definition(db, filename, lineno, line, legacy): + symbols = br.re_makefile_symbol_attribution.findall(line) + symbols += br.re_makefile_symbol_export.findall(line) + for symbol in symbols: + if legacy: + db.add_symbol_legacy_definition(symbol, filename, lineno) + else: + db.add_symbol_definition(symbol, filename, lineno) + + +def handle_usage(db, filename, lineno, line, legacy): + if br.re_makefile_eval.search(line): + handle_eval(db, filename, lineno, line) + return + + symbols = br.re_makefile_symbol_usage.findall(line) + for symbol in symbols: + if legacy: + db.add_symbol_usage_in_legacy(symbol, filename, lineno) + else: + db.add_symbol_usage(symbol, filename, lineno) + + +def populate_db(db, filename, file_content): + legacy = filename.endswith('.legacy') + for lineno, raw_line in file_content: + line = br.re_comments.sub('', raw_line) + handle_definition(db, filename, lineno, line, legacy) + handle_usage(db, filename, lineno, line, legacy) + + +def check_filename(filename): + if filename.endswith('.mk'): + return True + if filename.endswith('.mk.in'): + return True + if filename.startswith('arch/arch.mk.'): + return True + if filename in [ + 'Makefile', + 'Makefile.legacy', + 'package/Makefile.in' + ]: + return True + return False diff --git a/utils/checksymbolslib/test_db.py b/utils/checksymbolslib/test_db.py new file mode 100644 index 00000000000..15576fa8970 --- /dev/null +++ b/utils/checksymbolslib/test_db.py @@ -0,0 +1,286 @@ +import checksymbolslib.db as m + + +def test_empty_db(): + db = m.DB() + assert str(db) == '{}' + + +def test_one_definition(): + db = m.DB() + db.add_symbol_definition('BR2_foo', 'foo/Config.in', 7) + assert str(db) == str({ + 'BR2_foo': {'definition': {'foo/Config.in': [7]}}, + }) + + +def test_three_definitions(): + db = m.DB() + db.add_symbol_definition('BR2_foo', 'foo/Config.in', 7) + db.add_symbol_definition('BR2_foo', 'foo/Config.in', 9) + db.add_symbol_definition('BR2_bar', 'bar/Config.in', 5) + assert str(db) == str({ + 'BR2_foo': {'definition': {'foo/Config.in': [7, 9]}}, + 'BR2_bar': {'definition': {'bar/Config.in': [5]}}, + }) + + +def test_definition_and_usage(): + db = m.DB() + db.add_symbol_definition('BR2_foo', 'foo/Config.in', 7) + db.add_symbol_usage('BR2_foo', 'foo/Config.in', 9) + assert str(db) == str({ + 'BR2_foo': {'definition': {'foo/Config.in': [7]}, 'normal usage': {'foo/Config.in': [9]}}, + }) + + +def test_all_entry_types(): + db = m.DB() + db.add_symbol_choice('BR2_foo', 'foo/Config.in', 7) + db.add_symbol_definition('BR2_foo', 'foo/Config.in', 7) + db.add_symbol_definition('BR2_bar', 'bar/Config.in', 700) + db.add_symbol_helper('BR2_bar', 'bar/Config.in', 700) + db.add_symbol_legacy_definition('BR2_baz', 'Config.in.legacy', 7000) + db.add_symbol_legacy_note('BR2_baz', 'Config.in.legacy', 7001) + db.add_symbol_legacy_usage('BR2_bar', 'Config.in.legacy', 7001) + db.add_symbol_select('BR2_bar', 'Config.in.legacy', 7001) + db.add_symbol_usage('BR2_foo', 'foo/Config.in', 9) + db.add_symbol_usage_in_legacy('BR2_bar', 'Config.in.legacy', 9) + db.add_symbol_virtual('BR2_foo', 'foo/Config.in', 7) + assert str(db) == str({ + 'BR2_foo': { + 'part of a choice': {'foo/Config.in': [7]}, + 'definition': {'foo/Config.in': [7]}, + 'normal usage': {'foo/Config.in': [9]}, + 'virtual': {'foo/Config.in': [7]}}, + 'BR2_bar': { + 'definition': {'bar/Config.in': [700]}, + 'possible config helper': {'bar/Config.in': [700]}, + 'legacy usage': {'Config.in.legacy': [7001]}, + 'selected': {'Config.in.legacy': [7001]}, + 'usage inside legacy': {'Config.in.legacy': [9]}}, + 'BR2_baz': { + 'legacy definition': {'Config.in.legacy': [7000]}, + 'legacy note': {'Config.in.legacy': [7001]}}, + }) + + +def test_get_symbols_with_pattern(): + db = m.DB() + db.add_symbol_definition('BR2_foo', 'foo/Config.in', 7) + db.add_symbol_usage('BR2_foo', 'foo/Config.in', 9) + db.add_symbol_definition('BR2_bar', 'bar/Config.in', 5) + assert str(db) == str({ + 'BR2_foo': {'definition': {'foo/Config.in': [7]}, 'normal usage': {'foo/Config.in': [9]}}, + 'BR2_bar': {'definition': {'bar/Config.in': [5]}}, + }) + symbols = db.get_symbols_with_pattern('foo') + assert str(symbols) == str({ + 'BR2_foo': {'definition': {'foo/Config.in': [7]}, 'normal usage': {'foo/Config.in': [9]}}, + }) + symbols = db.get_symbols_with_pattern('FOO') + assert str(symbols) == str({ + }) + symbols = db.get_symbols_with_pattern('foo|FOO') + assert str(symbols) == str({ + 'BR2_foo': {'definition': {'foo/Config.in': [7]}, 'normal usage': {'foo/Config.in': [9]}}, + }) + symbols = db.get_symbols_with_pattern('^foo') + assert str(symbols) == str({ + }) + symbols = db.get_symbols_with_pattern('foo|bar') + assert str(symbols) == str({ + 'BR2_foo': {'definition': {'foo/Config.in': [7]}, 'normal usage': {'foo/Config.in': [9]}}, + 'BR2_bar': {'definition': {'bar/Config.in': [5]}}, + }) + + +def test_get_warnings_for_choices_selected(): + db = m.DB() + db.add_symbol_choice('BR2_foo', 'foo/Config.in', 1) + db.add_symbol_choice('BR2_bar', 'bar/Config.in', 1) + db.add_symbol_select('BR2_foo', 'bar/Config.in', 2) + assert str(db) == str({ + 'BR2_foo': {'part of a choice': {'foo/Config.in': [1]}, 'selected': {'bar/Config.in': [2]}}, + 'BR2_bar': {'part of a choice': {'bar/Config.in': [1]}}, + }) + warnings = db.get_warnings_for_choices_selected() + assert warnings == [ + ('bar/Config.in', 2, 'BR2_foo is part of a "choice" and should not be "select"ed'), + ] + + +def test_get_warnings_for_legacy_symbols_being_used(): + db = m.DB() + db.add_symbol_legacy_definition('BR2_foo', 'Config.in.legacy', 1) + db.add_symbol_usage('BR2_foo', 'bar/Config.in', 2) + db.add_symbol_legacy_definition('BR2_bar', 'Config.in.legacy', 10) + db.add_symbol_usage_in_legacy('BR2_bar', 'Config.in.legacy', 11) + assert str(db) == str({ + 'BR2_foo': {'legacy definition': {'Config.in.legacy': [1]}, 'normal usage': {'bar/Config.in': [2]}}, + 'BR2_bar': {'legacy definition': {'Config.in.legacy': [10]}, 'usage inside legacy': {'Config.in.legacy': [11]}}, + }) + warnings = db.get_warnings_for_legacy_symbols_being_used() + assert warnings == [ + ('bar/Config.in', 2, 'BR2_foo is a legacy symbol and should not be referenced'), + ] + + +def test_get_warnings_for_legacy_symbols_being_defined(): + db = m.DB() + db.add_symbol_legacy_definition('BR2_foo', 'Config.in.legacy', 1) + db.add_symbol_legacy_definition('BR2_bar', 'Config.in.legacy', 10) + db.add_symbol_definition('BR2_foo', 'foo/Config.in', 7) + db.add_symbol_definition('BR2_foo', 'foo/Config.in', 8) + assert str(db) == str({ + 'BR2_foo': {'legacy definition': {'Config.in.legacy': [1]}, 'definition': {'foo/Config.in': [7, 8]}}, + 'BR2_bar': {'legacy definition': {'Config.in.legacy': [10]}}, + }) + warnings = db.get_warnings_for_legacy_symbols_being_defined() + assert warnings == [ + ('foo/Config.in', 7, 'BR2_foo is a legacy symbol and should not be redefined'), + ('foo/Config.in', 8, 'BR2_foo is a legacy symbol and should not be redefined'), + ] + + +def test_get_warnings_for_symbols_without_definition(): + db = m.DB() + db.add_symbol_definition('BR2_foo', 'foo/Config.in', 7) + db.add_symbol_legacy_definition('BR2_bar', 'Config.in.legacy', 10) + db.add_symbol_virtual('BR2_baz', 'baz/Config.in', 7) + db.add_symbol_usage('BR2_foo', 'file', 1) + db.add_symbol_usage('BR2_bar', 'file', 1) + db.add_symbol_usage('BR2_baz', 'file', 1) + db.add_symbol_usage('BR2_undef1', 'file', 1) + db.add_symbol_legacy_usage('BR2_undef2', 'file', 2) + db.add_symbol_usage_in_legacy('BR2_undef3', 'file', 3) + db.add_symbol_usage('BR2_undef3', 'another', 1) + db.add_symbol_legacy_usage('BR2_undef3', 'another', 2) + db.add_symbol_usage('BR2_PACKAGE_HOST_undef', 'file', 1) + db.add_symbol_usage('BR2_PACKAGE_HAS_HOST_undef', 'file', 1) + db.add_symbol_usage('BR2_TARGET_ROOTFS_undef_XZ', 'file', 1) + db.add_symbol_usage('BR2_GRAPH_ALT', 'file', 1) + db.add_symbol_usage('BR2_EXTERNAL', 'file', 1) + db.add_symbol_usage('BR2_TARGET_BAREBOX_AUX_BAREBOXENV', 'file', 1) + db.add_symbol_usage('BR2_PACKAGE_HAS_TOOLCHAIN_BUILDROOT', 'file', 1) + assert str(db) == str({ + 'BR2_foo': {'definition': {'foo/Config.in': [7]}, 'normal usage': {'file': [1]}}, + 'BR2_bar': {'legacy definition': {'Config.in.legacy': [10]}, 'normal usage': {'file': [1]}}, + 'BR2_baz': {'virtual': {'baz/Config.in': [7]}, 'normal usage': {'file': [1]}}, + 'BR2_undef1': {'normal usage': {'file': [1]}}, + 'BR2_undef2': {'legacy usage': {'file': [2]}}, + 'BR2_undef3': {'usage inside legacy': {'file': [3]}, 'normal usage': {'another': [1]}, 'legacy usage': {'another': [2]}}, + 'BR2_PACKAGE_HOST_undef': {'normal usage': {'file': [1]}}, + 'BR2_PACKAGE_HAS_HOST_undef': {'normal usage': {'file': [1]}}, + 'BR2_TARGET_ROOTFS_undef_XZ': {'normal usage': {'file': [1]}}, + 'BR2_GRAPH_ALT': {'normal usage': {'file': [1]}}, + 'BR2_EXTERNAL': {'normal usage': {'file': [1]}}, + 'BR2_TARGET_BAREBOX_AUX_BAREBOXENV': {'normal usage': {'file': [1]}}, + 'BR2_PACKAGE_HAS_TOOLCHAIN_BUILDROOT': {'normal usage': {'file': [1]}}, + }) + warnings = db.get_warnings_for_symbols_without_definition() + assert warnings == [ + ('file', 1, 'BR2_undef1 referenced but not defined'), + ('file', 2, 'BR2_undef2 referenced but not defined'), + ('another', 1, 'BR2_undef3 referenced but not defined'), + ('another', 2, 'BR2_undef3 referenced but not defined'), + ('file', 3, 'BR2_undef3 referenced but not defined'), + ] + + +def test_get_warnings_for_symbols_without_usage(): + db = m.DB() + db.add_symbol_definition('BR2_a', 'a/Config.in', 1) + db.add_symbol_definition('BR2_a', 'a/Config.in', 2) + db.add_symbol_usage('BR2_a', 'file', 1) + db.add_symbol_usage('BR2_a', 'file', 2) + db.add_symbol_definition('BR2_b', 'b/Config.in', 2) + db.add_symbol_usage_in_legacy('BR2_b', 'file', 1) + db.add_symbol_definition('BR2_c', 'c/Config.in', 2) + db.add_symbol_legacy_usage('BR2_c', 'file', 1) + db.add_symbol_definition('BR2_USE_CCACHE', 'file', 1) + db.add_symbol_definition('BR2_PACKAGE_SKELETON', 'file', 1) + db.add_symbol_definition('BR2_d', 'd/Config.in', 2) + db.add_symbol_helper('BR2_d', 'd/Config.in', 2) + db.add_symbol_definition('BR2_e', 'e/Config.in', 2) + db.add_symbol_choice('BR2_e', 'e/Config.in', 2) + db.add_symbol_definition('BR2_f', 'f/Config.in', 2) + db.add_symbol_definition('BR2_g', 'g/Config.in', 2) + db.add_symbol_definition('BR2_g', 'g/Config.in', 3) + db.add_symbol_legacy_definition('BR2_h', 'Config.in.legacy', 1) + db.add_symbol_usage('BR2_h', 'file', 2) + db.add_symbol_usage('BR2_h', 'file', 3) + db.add_symbol_legacy_definition('BR2_i', 'Config.in.legacy', 2) + db.add_symbol_usage_in_legacy('BR2_i', 'file', 2) + db.add_symbol_legacy_definition('BR2_j', 'Config.in.legacy', 2) + db.add_symbol_legacy_usage('BR2_j', 'file', 2) + db.add_symbol_legacy_definition('BR2_k', 'Config.in.legacy', 2) + db.add_symbol_usage('BR2_k', 'file', 5) + db.add_symbol_usage_in_legacy('BR2_k', 'file', 6) + db.add_symbol_legacy_usage('BR2_k', 'file', 7) + db.add_symbol_legacy_definition('BR2_l', 'Config.in.legacy', 2) + assert str(db) == str({ + 'BR2_a': {'definition': {'a/Config.in': [1, 2]}, 'normal usage': {'file': [1, 2]}}, + 'BR2_b': {'definition': {'b/Config.in': [2]}, 'usage inside legacy': {'file': [1]}}, + 'BR2_c': {'definition': {'c/Config.in': [2]}, 'legacy usage': {'file': [1]}}, + 'BR2_USE_CCACHE': {'definition': {'file': [1]}}, + 'BR2_PACKAGE_SKELETON': {'definition': {'file': [1]}}, + 'BR2_d': {'definition': {'d/Config.in': [2]}, 'possible config helper': {'d/Config.in': [2]}}, + 'BR2_e': {'definition': {'e/Config.in': [2]}, 'part of a choice': {'e/Config.in': [2]}}, + 'BR2_f': {'definition': {'f/Config.in': [2]}}, + 'BR2_g': {'definition': {'g/Config.in': [2, 3]}}, + 'BR2_h': {'legacy definition': {'Config.in.legacy': [1]}, 'normal usage': {'file': [2, 3]}}, + 'BR2_i': {'legacy definition': {'Config.in.legacy': [2]}, 'usage inside legacy': {'file': [2]}}, + 'BR2_j': {'legacy definition': {'Config.in.legacy': [2]}, 'legacy usage': {'file': [2]}}, + 'BR2_k': { + 'legacy definition': {'Config.in.legacy': [2]}, + 'normal usage': {'file': [5]}, + 'usage inside legacy': {'file': [6]}, + 'legacy usage': {'file': [7]}}, + 'BR2_l': {'legacy definition': {'Config.in.legacy': [2]}}, + }) + warnings = db.get_warnings_for_symbols_without_usage() + assert warnings == [ + ('f/Config.in', 2, 'BR2_f defined but not referenced'), + ('g/Config.in', 2, 'BR2_g defined but not referenced'), + ('g/Config.in', 3, 'BR2_g defined but not referenced'), + ('Config.in.legacy', 2, 'BR2_l defined but not referenced'), + ] + + +def test_get_warnings_for_symbols_with_legacy_note_and_no_comment_on_usage(): + db = m.DB() + db.add_symbol_legacy_note('BR2_foo', 'Config.in.legacy', 1) + db.add_symbol_legacy_usage('BR2_foo', 'package/bar/Config.in', 2) + db.add_symbol_legacy_note('BR2_baz', 'Config.in.legacy', 7001) + db.add_symbol_usage('BR2_baz', 'package/foo/Config.in', 1) + assert str(db) == str({ + 'BR2_foo': {'legacy note': {'Config.in.legacy': [1]}, 'legacy usage': {'package/bar/Config.in': [2]}}, + 'BR2_baz': {'legacy note': {'Config.in.legacy': [7001]}, 'normal usage': {'package/foo/Config.in': [1]}}, + }) + warnings = db.get_warnings_for_symbols_with_legacy_note_and_no_comment_on_usage() + assert warnings == [ + ('package/foo/Config.in', 1, 'BR2_baz missing "# legacy"'), + ] + + +def test_get_warnings_for_symbols_with_legacy_note_and_no_usage(): + db = m.DB() + db.add_symbol_legacy_note('BR2_foo', 'Config.in.legacy', 1) + db.add_symbol_legacy_usage('BR2_foo', 'package/bar/Config.in', 2) + db.add_symbol_legacy_note('BR2_bar', 'Config.in.legacy', 1) + db.add_symbol_usage_in_legacy('BR2_bar', 'Config.in.legacy', 7001) + db.add_symbol_legacy_note('BR2_baz', 'Config.in.legacy', 7001) + db.add_symbol_legacy_note('BR2_no_comment', 'Config.in.legacy', 1) + db.add_symbol_usage('BR2_no_comment', 'package/bar/Config.in', 2) + assert str(db) == str({ + 'BR2_foo': {'legacy note': {'Config.in.legacy': [1]}, 'legacy usage': {'package/bar/Config.in': [2]}}, + 'BR2_bar': {'legacy note': {'Config.in.legacy': [1]}, 'usage inside legacy': {'Config.in.legacy': [7001]}}, + 'BR2_baz': {'legacy note': {'Config.in.legacy': [7001]}}, + 'BR2_no_comment': {'legacy note': {'Config.in.legacy': [1]}, 'normal usage': {'package/bar/Config.in': [2]}}, + }) + warnings = db.get_warnings_for_symbols_with_legacy_note_and_no_usage() + assert warnings == [ + ('Config.in.legacy', 1, 'BR2_bar not referenced but has a comment stating it is'), + ('Config.in.legacy', 7001, 'BR2_baz not referenced but has a comment stating it is'), + ] diff --git a/utils/checksymbolslib/test_file.py b/utils/checksymbolslib/test_file.py new file mode 100644 index 00000000000..3b4ee108d1b --- /dev/null +++ b/utils/checksymbolslib/test_file.py @@ -0,0 +1,152 @@ +import os +import pytest +import tempfile +import checksymbolslib.file as m + + +def test_get_list_of_files_in_the_repo(): + all_files = m.get_list_of_files_in_the_repo() + assert 'Makefile' in all_files + assert 'package/Config.in' in all_files + assert len(all_files) > 1000 + + +get_list_of_files_to_process = [ + ('unknown file type', + ['a/file/Config.in', + 'another/file.mk', + 'unknown/file/type'], + ['a/file/Config.in', + 'another/file.mk']), + ('runtime test infra fixtures', + ['a/file/Config.in', + 'support/testing/a/broken/Config.in', + 'another/file.mk'], + ['a/file/Config.in', + 'another/file.mk']), + ] + + +@pytest.mark.parametrize('testname,all_files,expected', get_list_of_files_to_process) +def test_get_list_of_files_to_process(testname, all_files, expected): + files_to_process = m.get_list_of_files_to_process(all_files) + assert files_to_process == expected + + +get_list_of_filenames_with_pattern = [ + ('ignored directories', + ['a/file/Config.in', + 'support/testing/a/broken/file/Config.in', + 'not/found.mk', + 'another/file.mk'], + ['a/file/Config.in', + 'not/found.mk', + 'another/file.mk'], + 'file', + ['support/testing/a/broken/file/Config.in']), + ('processed files', + ['a/file/Config.in', + 'not/found.mk', + 'another/file.mk'], + [], + 'file', + ['a/file/Config.in', + 'another/file.mk']), + ('case sensitive', + ['a/file/Config.in', + 'not/found.mk', + 'another/file.mk'], + [], + 'FILE', + []), + ('or', + ['a/file/Config.in', + 'not/found.mk', + 'another/file.mk'], + [], + 'file|FILE', + ['a/file/Config.in', + 'another/file.mk']), + ('complex regexp', + ['a/file/Config.in', + 'not/found.mk', + 'another/file.mk'], + [], + '^n[oO]+t.*mk$', + ['not/found.mk']), + ] + + +@pytest.mark.parametrize('testname,all_files,files_to_process,pattern,expected', get_list_of_filenames_with_pattern) +def test_get_list_of_filenames_with_pattern(testname, all_files, files_to_process, pattern, expected): + files_to_process = m.get_list_of_filenames_with_pattern(all_files, files_to_process, pattern) + assert files_to_process == expected + + +read_file = [ + ('indent', + 'file1', + ' content1\n' + '\t# comment1', + [[1, ' content1\n'], + [2, '\t# comment1']]), + ('trailing space', + 'file2', + 'content2 \n' + '# comment2\t\n', + [[1, 'content2 \n'], + [2, '# comment2\t\n']]), + ('empty line', + 'file3', + '\n' + '\n', + [[1, '\n'], + [2, '\n']]), + ('missing newline at EOF', + 'file4', + '\n' + ' text\t', + [[1, '\n'], + [2, ' text\t']]), + ] + + +@pytest.mark.parametrize('testname,filename,content,,expected', read_file) +def test_read_file(testname, filename, content, expected): + with tempfile.TemporaryDirectory(suffix='-checksymbolslib-test-file') as workdir: + full_filename = os.path.join(workdir, filename) + with open(full_filename, 'wb') as f: + f.write(content.encode()) + read_file_content = m.read_file(full_filename) + assert read_file_content == expected + + +cleanup_file_content = [ + ('empty file', + [], + []), + ('empty line', + [[5, '\n']], + [[5, '']]), + ('trailing space', + [[3, ' \n']], + [[3, ' ']]), + ('trailing tab', + [[3, '\t\n']], + [[3, '\t']]), + ('1 continuation', + [[1, 'foo \\\n'], + [2, 'bar\n']], + [[1, 'foo bar']]), + ('2 continuations', + [[1, 'foo \\\n'], + [2, 'bar \\\n'], + [3, 'baz\n']], + [[1, 'foo bar baz']]), + ] + + +@pytest.mark.parametrize('testname,file_content_raw,expected', cleanup_file_content) +def test_cleanup_file_content(testname, file_content_raw, expected): + cleaned_up_content = m.cleanup_file_content(file_content_raw) + assert cleaned_up_content == expected diff --git a/utils/checksymbolslib/test_kconfig.py b/utils/checksymbolslib/test_kconfig.py new file mode 100644 index 00000000000..ab2008df6ca --- /dev/null +++ b/utils/checksymbolslib/test_kconfig.py @@ -0,0 +1,438 @@ +import pytest +from unittest.mock import Mock +from unittest.mock import call +from checksymbolslib.test_util import assert_db_calls +import checksymbolslib.kconfig as m + + +all_symbols_from = [ + ('no prefix', + 'config PACKAGE_FOO', + []), + ('simple', + 'config BR2_PACKAGE_FOO', + ['BR2_PACKAGE_FOO']), + ('ignore comment', + 'config BR2_PACKAGE_FOO # BR2_PACKAGE_BAR', + ['BR2_PACKAGE_FOO']), + ('ignore whitespace', + '\tconfig BR2_PACKAGE_FOO\t # BR2_PACKAGE_BAR', + ['BR2_PACKAGE_FOO']), + ('2 occurrences', + '\tdefault BR2_PACKAGE_FOO_BAR if BR2_PACKAGE_FOO_BAR != ""', + ['BR2_PACKAGE_FOO_BAR', 'BR2_PACKAGE_FOO_BAR']), + ] + + +@pytest.mark.parametrize('testname,line,expected', all_symbols_from) +def test_all_symbols_from(testname, line, expected): + symbols = m.all_symbols_from(line) + assert symbols == expected + + +handle_definition = [ + ('config', + 'package/foo/Config.in', + 5, + 'config BR2_PACKAGE_FOO', + False, + {'add_symbol_definition': [call('BR2_PACKAGE_FOO', 'package/foo/Config.in', 5)]}), + ('ignore comment', + 'package/foo/Config.in', + 5, + 'config BR2_PACKAGE_FOO # BR2_PACKAGE_BAR', + False, + {'add_symbol_definition': [call('BR2_PACKAGE_FOO', 'package/foo/Config.in', 5)]}), + ('ignore whitespace', + 'package/foo/Config.in', + 5, + '\tconfig BR2_PACKAGE_FOO\t # BR2_PACKAGE_BAR', + False, + {'add_symbol_definition': [call('BR2_PACKAGE_FOO', 'package/foo/Config.in', 5)]}), + ('menuconfig', + 'package/gd/Config.in', + 1, + 'menuconfig BR2_PACKAGE_GD', + False, + {'add_symbol_definition': [call('BR2_PACKAGE_GD', 'package/gd/Config.in', 1)]}), + ('menu', + 'package/Config.in', + 100, + 'menu "Database"', + False, + {}), + ('legacy config', + 'Config.in.legacy', + 50, + 'config BR2_PACKAGE_FOO', + True, + {'add_symbol_legacy_definition': [call('BR2_PACKAGE_FOO', 'Config.in.legacy', 50)]}), + ] + + +@pytest.mark.parametrize('testname,filename,lineno,line,legacy,expected_calls', handle_definition) +def test_handle_definition(testname, filename, lineno, line, legacy, expected_calls): + db = Mock() + m.handle_definition(db, filename, lineno, line, legacy) + assert_db_calls(db, expected_calls) + + +handle_usage = [ + ('default with comparison', + 'package/openblas/Config.in', + 60, + '\tdefault y if BR2_PACKAGE_OPENBLAS_DEFAULT_TARGET != ""', + False, + {'add_symbol_usage': [call('BR2_PACKAGE_OPENBLAS_DEFAULT_TARGET', 'package/openblas/Config.in', 60)]}), + ('default with logical operators', + 'toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options', + 47, + '\tdefault y if BR2_i386 && !BR2_x86_i486 && !BR2_x86_i586 && !BR2_x86_x1000 && !BR2_x86_pentium_mmx && !BR2_x86_geode ' + '&& !BR2_x86_c3 && !BR2_x86_winchip_c6 && !BR2_x86_winchip2', + False, + {'add_symbol_usage': [ + call('BR2_i386', 'toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options', 47), + call('BR2_x86_c3', 'toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options', 47), + call('BR2_x86_geode', 'toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options', 47), + call('BR2_x86_i486', 'toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options', 47), + call('BR2_x86_i586', 'toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options', 47), + call('BR2_x86_pentium_mmx', 'toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options', 47), + call('BR2_x86_winchip2', 'toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options', 47), + call('BR2_x86_winchip_c6', 'toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options', 47), + call('BR2_x86_x1000', 'toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options', 47)]}), + ('legacy depends on', + 'Config.in.legacy', + 3000, + '\tdepends on BR2_LINUX_KERNEL', + True, + {'add_symbol_usage_in_legacy': [call('BR2_LINUX_KERNEL', 'Config.in.legacy', 3000)]}), + ('legacy if', + 'Config.in.legacy', + 97, + 'if !BR2_SKIP_LEGACY', + True, + {'add_symbol_usage_in_legacy': [call('BR2_SKIP_LEGACY', 'Config.in.legacy', 97)]}), + ('source', + 'system/Config.in', + 152, + 'source "$BR2_BASE_DIR/.br2-external.in.init"', + False, + {'add_symbol_usage': [call('BR2_BASE_DIR', 'system/Config.in', 152)]}), + ] + + +@pytest.mark.parametrize('testname,filename,lineno,line,legacy,expected_calls', handle_usage) +def test_handle_usage(testname, filename, lineno, line, legacy, expected_calls): + db = Mock() + m.handle_usage(db, filename, lineno, line, legacy) + assert_db_calls(db, expected_calls) + + +handle_default = [ + ('default with comparison', + 'package/openblas/Config.in', + 60, + '\tdefault y if BR2_PACKAGE_OPENBLAS_DEFAULT_TARGET != ""', + False, + {'add_symbol_usage': [call('BR2_PACKAGE_OPENBLAS_DEFAULT_TARGET', 'package/openblas/Config.in', 60)]}), + ('default with logical operators', + 'toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options', + 47, + '\tdefault y if BR2_i386 && !BR2_x86_i486 && !BR2_x86_i586 && !BR2_x86_x1000 && !BR2_x86_pentium_mmx && !BR2_x86_geode ' + '&& !BR2_x86_c3 && !BR2_x86_winchip_c6 && !BR2_x86_winchip2', + False, + {'add_symbol_usage': [ + call('BR2_i386', 'toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options', 47), + call('BR2_x86_c3', 'toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options', 47), + call('BR2_x86_geode', 'toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options', 47), + call('BR2_x86_i486', 'toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options', 47), + call('BR2_x86_i586', 'toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options', 47), + call('BR2_x86_pentium_mmx', 'toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options', 47), + call('BR2_x86_winchip2', 'toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options', 47), + call('BR2_x86_winchip_c6', 'toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options', 47), + call('BR2_x86_x1000', 'toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options', 47)]}), + ('legacy default', + 'Config.in.legacy', + 3000, + 'default y if BR2_PACKAGE_REFPOLICY_POLICY_VERSION != ""', + True, + {'add_symbol_usage_in_legacy': [call('BR2_PACKAGE_REFPOLICY_POLICY_VERSION', 'Config.in.legacy', 3000)]}), + ('legacy handling on package', + 'package/uboot-tools/Config.in.host', + 105, + '\tdefault BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE if BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE != "" # legacy', + False, + {'add_symbol_legacy_usage': [call('BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE', 'package/uboot-tools/Config.in.host', 105)]}), + ('default on package', + 'package/uboot-tools/Config.in.host', + 105, + '\tdefault BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE if BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE != ""', + False, + {'add_symbol_usage': [ + call('BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE', 'package/uboot-tools/Config.in.host', 105), + call('BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE', 'package/uboot-tools/Config.in.host', 105)]}), + ] + + +@pytest.mark.parametrize('testname,filename,lineno,line,legacy,expected_calls', handle_default) +def test_handle_default(testname, filename, lineno, line, legacy, expected_calls): + db = Mock() + m.handle_default(db, filename, lineno, line, legacy) + assert_db_calls(db, expected_calls) + + +handle_select = [ + ('select with comparison', + 'package/bcusdk/Config.in', + 6, + '\tselect BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL', + False, + {'add_symbol_select': [call('BR2_PACKAGE_ARGP_STANDALONE', 'package/bcusdk/Config.in', 6)], + 'add_symbol_usage': [ + call('BR2_PACKAGE_ARGP_STANDALONE', 'package/bcusdk/Config.in', 6), + call('BR2_TOOLCHAIN_USES_UCLIBC', 'package/bcusdk/Config.in', 6), + call('BR2_TOOLCHAIN_USES_MUSL', 'package/bcusdk/Config.in', 6)]}), + ('legacy select', + 'Config.in.legacy', + 100, + '\tselect BR2_PACKAGE_WPA_SUPPLICANT_DBUS if BR2_TOOLCHAIN_HAS_THREADS', + True, + {'add_symbol_select': [call('BR2_PACKAGE_WPA_SUPPLICANT_DBUS', 'Config.in.legacy', 100)], + 'add_symbol_usage_in_legacy': [ + call('BR2_PACKAGE_WPA_SUPPLICANT_DBUS', 'Config.in.legacy', 100), + call('BR2_TOOLCHAIN_HAS_THREADS', 'Config.in.legacy', 100)]}), + ] + + +@pytest.mark.parametrize('testname,filename,lineno,line,legacy,expected_calls', handle_select) +def test_handle_select(testname, filename, lineno, line, legacy, expected_calls): + db = Mock() + m.handle_select(db, filename, lineno, line, legacy) + assert_db_calls(db, expected_calls) + + +handle_line = [ + ('select with comparison', + 'package/bcusdk/Config.in', + 6, + '\tselect BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL', + False, + {'add_symbol_select': [call('BR2_PACKAGE_ARGP_STANDALONE', 'package/bcusdk/Config.in', 6)], + 'add_symbol_usage': [ + call('BR2_PACKAGE_ARGP_STANDALONE', 'package/bcusdk/Config.in', 6), + call('BR2_TOOLCHAIN_USES_UCLIBC', 'package/bcusdk/Config.in', 6), + call('BR2_TOOLCHAIN_USES_MUSL', 'package/bcusdk/Config.in', 6)]}), + ('legacy select', + 'Config.in.legacy', + 100, + '\tselect BR2_PACKAGE_WPA_SUPPLICANT_DBUS if BR2_TOOLCHAIN_HAS_THREADS', + True, + {'add_symbol_select': [call('BR2_PACKAGE_WPA_SUPPLICANT_DBUS', 'Config.in.legacy', 100)], + 'add_symbol_usage_in_legacy': [ + call('BR2_PACKAGE_WPA_SUPPLICANT_DBUS', 'Config.in.legacy', 100), + call('BR2_TOOLCHAIN_HAS_THREADS', 'Config.in.legacy', 100)]}), + ('comment with symbol', + 'Config.in', + 6, + '\tselect # BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL', + False, + {}), + ('comment', + 'Config.in', + 6, + '# just a comment', + False, + {}), + ] + + +@pytest.mark.parametrize('testname,filename,lineno,line,legacy,expected_calls', handle_line) +def test_handle_line(testname, filename, lineno, line, legacy, expected_calls): + db = Mock() + m.handle_line(db, filename, lineno, line, legacy) + assert_db_calls(db, expected_calls) + + +handle_config_helper = [ + ('no select', + 'package/foo/Config.in', + [[5, 'config BR2_PACKAGE_FOO']], + {}), + ('select', + 'package/foo/Config.in', + [[5, 'config BR2_PACKAGE_FOO'], + [6, '\tselect BR2_PACKAGE_BAR']], + {'add_symbol_helper': [call('BR2_PACKAGE_FOO', 'package/foo/Config.in', 5)]}), + ('ignore comment', + 'package/foo/Config.in', + [[5, 'config BR2_PACKAGE_FOO # BR2_PACKAGE_BAR'], + [6, '\tselect BR2_PACKAGE_BAR # BR2_PACKAGE_FOO']], + {'add_symbol_helper': [call('BR2_PACKAGE_FOO', 'package/foo/Config.in', 5)]}), + ('correct symbol', + 'package/foo/Config.in', + [[5, 'config BR2_PACKAGE_FOO'], + [6, 'config BR2_PACKAGE_BAR'], + [7, '\tselect BR2_PACKAGE_BAZ']], + {'add_symbol_helper': [call('BR2_PACKAGE_BAR', 'package/foo/Config.in', 6)]}), + ('2 selects', + 'package/foo/Config.in', + [[5, 'config BR2_PACKAGE_FOO'], + [6, '\tselect BR2_PACKAGE_BAR'], + [7, ' select BR2_PACKAGE_BAR']], + {'add_symbol_helper': [call('BR2_PACKAGE_FOO', 'package/foo/Config.in', 5)]}), + ] + + +@pytest.mark.parametrize('testname,filename,file_content,expected_calls', handle_config_helper) +def test_handle_config_helper(testname, filename, file_content, expected_calls): + db = Mock() + m.handle_config_helper(db, filename, file_content) + assert_db_calls(db, expected_calls) + + +handle_config_choice = [ + ('no choice', + 'package/foo/Config.in', + [[5, 'config BR2_PACKAGE_FOO']], + {}), + ('after', + 'package/foo/Config.in', + [[3, 'choice'], + [4, '\tprompt "your choice"'], + [5, 'config BR2_PACKAGE_FOO'], + [6, 'config BR2_PACKAGE_BAR'], + [10, 'endchoice'], + [19, 'config BR2_PACKAGE_BAZ']], + {'add_symbol_choice': [ + call('BR2_PACKAGE_FOO', 'package/foo/Config.in', 5), + call('BR2_PACKAGE_BAR', 'package/foo/Config.in', 6)]}), + ('before', + 'package/foo/Config.in', + [[1, 'config BR2_PACKAGE_BAZ'], + [3, 'choice'], + [4, '\tprompt "your choice"'], + [5, 'config BR2_PACKAGE_FOO'], + [6, 'config BR2_PACKAGE_BAR'], + [10, 'endchoice']], + {'add_symbol_choice': [ + call('BR2_PACKAGE_FOO', 'package/foo/Config.in', 5), + call('BR2_PACKAGE_BAR', 'package/foo/Config.in', 6)]}), + ] + + +@pytest.mark.parametrize('testname,filename,file_content,expected_calls', handle_config_choice) +def test_handle_config_choice(testname, filename, file_content, expected_calls): + db = Mock() + m.handle_config_choice(db, filename, file_content) + assert_db_calls(db, expected_calls) + + +handle_note = [ + ('example', + 'Config.in.legacy', + [[51, '# # Note: BR2_FOO_1 is still referenced from package/foo/Config.in']], + {}), + ('ok', + 'Config.in.legacy', + [[112, 'menu "Legacy config options"'], + [2132, '# Note: BR2_PACKAGE_FOO is still referenced from package/foo/Config.in'], + [4958, 'endmenu']], + {'add_symbol_legacy_note': [call('BR2_PACKAGE_FOO', 'Config.in.legacy', 2132)]}), + ('before and after', + 'Config.in.legacy', + [[100, '# Note: BR2_PACKAGE_BAR is still referenced from package/foo/Config.in'], + [112, 'menu "Legacy config options"'], + [2132, '# Note: BR2_PACKAGE_FOO is still referenced from package/foo/Config.in'], + [4958, 'endmenu'], + [5000, '# Note: BR2_PACKAGE_BAR is still referenced from package/foo/Config.in']], + {'add_symbol_legacy_note': [call('BR2_PACKAGE_FOO', 'Config.in.legacy', 2132)]}), + ] + + +@pytest.mark.parametrize('testname,filename,file_content,expected_calls', handle_note) +def test_handle_note(testname, filename, file_content, expected_calls): + db = Mock() + m.handle_note(db, filename, file_content) + assert_db_calls(db, expected_calls) + + +populate_db = [ + ('legacy', + 'Config.in.legacy', + [[112, 'menu "Legacy config options"'], + [2100, 'config BR2_PACKAGE_FOO'], + [2101, '\tselect BR2_PACKAGE_BAR'], + [2132, '# Note: BR2_PACKAGE_FOO is still referenced from package/foo/Config.in'], + [4958, 'endmenu']], + {'add_symbol_legacy_note': [call('BR2_PACKAGE_FOO', 'Config.in.legacy', 2132)], + 'add_symbol_helper': [call('BR2_PACKAGE_FOO', 'Config.in.legacy', 2100)], + 'add_symbol_legacy_definition': [call('BR2_PACKAGE_FOO', 'Config.in.legacy', 2100)], + 'add_symbol_usage_in_legacy': [call('BR2_PACKAGE_BAR', 'Config.in.legacy', 2101)], + 'add_symbol_select': [call('BR2_PACKAGE_BAR', 'Config.in.legacy', 2101)]}), + ('normal', + 'package/foo/Config.in', + [[1, 'config BR2_PACKAGE_BAZ'], + [3, 'choice'], + [4, '\tprompt "your choice"'], + [5, 'config BR2_PACKAGE_FOO'], + [6, 'config BR2_PACKAGE_BAR'], + [7, '\t select BR2_PACKAGE_FOO_BAR'], + [10, 'endchoice']], + {'add_symbol_choice': [ + call('BR2_PACKAGE_FOO', 'package/foo/Config.in', 5), + call('BR2_PACKAGE_BAR', 'package/foo/Config.in', 6)], + 'add_symbol_usage': [ + call('BR2_PACKAGE_FOO_BAR', 'package/foo/Config.in', 7)], + 'add_symbol_select': [ + call('BR2_PACKAGE_FOO_BAR', 'package/foo/Config.in', 7)], + 'add_symbol_definition': [ + call('BR2_PACKAGE_BAZ', 'package/foo/Config.in', 1), + call('BR2_PACKAGE_FOO', 'package/foo/Config.in', 5), + call('BR2_PACKAGE_BAR', 'package/foo/Config.in', 6)], + 'add_symbol_helper': [ + call('BR2_PACKAGE_BAR', 'package/foo/Config.in', 6)]}), + ] + + +@pytest.mark.parametrize('testname,filename,file_content,expected_calls', populate_db) +def test_populate_db(testname, filename, file_content, expected_calls): + db = Mock() + m.populate_db(db, filename, file_content) + assert_db_calls(db, expected_calls) + + +check_filename = [ + ('Config.in', + 'Config.in', + True), + ('Config.in.legacy', + 'Config.in.legacy', + True), + ('arch/Config.in.microblaze', + 'arch/Config.in.microblaze', + True), + ('package/php/Config.ext', + 'package/php/Config.ext', + True), + ('package/pru-software-support/Config.in.host', + 'package/pru-software-support/Config.in.host', + True), + ('toolchain/toolchain-external/toolchain-external-custom/Config.in.options', + 'toolchain/toolchain-external/toolchain-external-custom/Config.in.options', + True), + ('package/foo/0001-Config.patch', + 'package/foo/0001-Config.patch', + False), + ('package/pkg-generic.mk', + 'package/pkg-generic.mk', + False), + ('Makefile', + 'Makefile', + False), + ] + + +@pytest.mark.parametrize('testname,filename,expected', check_filename) +def test_check_filename(testname, filename, expected): + symbols = m.check_filename(filename) + assert symbols == expected diff --git a/utils/checksymbolslib/test_makefile.py b/utils/checksymbolslib/test_makefile.py new file mode 100644 index 00000000000..14d07eaa450 --- /dev/null +++ b/utils/checksymbolslib/test_makefile.py @@ -0,0 +1,304 @@ +import pytest +from unittest.mock import Mock +from unittest.mock import call +from checksymbolslib.test_util import assert_db_calls +import checksymbolslib.makefile as m + + +handle_eval = [ + ('generic', + 'package/foo/foo.mk', + 5, + '$(eval $(generic-package))', + {'add_symbol_usage': [call('BR2_PACKAGE_FOO', 'package/foo/foo.mk', 5)]}), + ('ignore trailing whitespace', + 'package/foo/foo.mk', + 5, + '$(eval $(generic-package)) ', + {'add_symbol_usage': [call('BR2_PACKAGE_FOO', 'package/foo/foo.mk', 5)]}), + ('ignore indent', + 'package/foo/foo.mk', + 5, + '\t$(eval $(generic-package))', + {'add_symbol_usage': [call('BR2_PACKAGE_FOO', 'package/foo/foo.mk', 5)]}), + ('rootfs', + 'fs/foo/foo.mk', + 5, + '$(eval $(rootfs))', + {'add_symbol_usage': [ + call('BR2_TARGET_ROOTFS_FOO', 'fs/foo/foo.mk', 5), + call('BR2_TARGET_ROOTFS_FOO_BZIP2', 'fs/foo/foo.mk', 5), + call('BR2_TARGET_ROOTFS_FOO_GZIP', 'fs/foo/foo.mk', 5), + call('BR2_TARGET_ROOTFS_FOO_LZ4', 'fs/foo/foo.mk', 5), + call('BR2_TARGET_ROOTFS_FOO_LZMA', 'fs/foo/foo.mk', 5), + call('BR2_TARGET_ROOTFS_FOO_LZO', 'fs/foo/foo.mk', 5), + call('BR2_TARGET_ROOTFS_FOO_XZ', 'fs/foo/foo.mk', 5), + call('BR2_TARGET_ROOTFS_FOO_ZSTD', 'fs/foo/foo.mk', 5)]}), + ('kernel module', + 'package/foo/foo.mk', + 6, + '$(eval $(kernel-module))', + {'add_symbol_usage': [call('BR2_PACKAGE_FOO', 'package/foo/foo.mk', 6)]}), + ('not an eval for package infra', + 'docs/manual/manual.mk', + 10, + '$(eval $(call asciidoc-document))', + {}), + ('linux', + 'linux/linux.mk', + 617, + '$(eval $(kconfig-package))', + {'add_symbol_usage': [call('BR2_LINUX_KERNEL', 'linux/linux.mk', 617)]}), + ('virtual toolchain', + 'toolchain/toolchain-external/toolchain-external.mk', + 18, + '$(eval $(virtual-package))', + {'add_symbol_usage': [ + call('BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL', 'toolchain/toolchain-external/toolchain-external.mk', 18), + call('BR2_PACKAGE_HAS_TOOLCHAIN_EXTERNAL', 'toolchain/toolchain-external/toolchain-external.mk', 18), + call('BR2_TOOLCHAIN_EXTERNAL', 'toolchain/toolchain-external/toolchain-external.mk', 18)], + 'add_symbol_virtual': [call('BR2_TOOLCHAIN_EXTERNAL', 'toolchain/toolchain-external/toolchain-external.mk', 18)]}), + ('virtual package', + 'package/foo/foo.mk', + 18, + '$(eval $(virtual-package))', + {'add_symbol_usage': [ + call('BR2_PACKAGE_PROVIDES_FOO', 'package/foo/foo.mk', 18), + call('BR2_PACKAGE_HAS_FOO', 'package/foo/foo.mk', 18), + call('BR2_PACKAGE_FOO', 'package/foo/foo.mk', 18)], + 'add_symbol_virtual': [call('BR2_PACKAGE_FOO', 'package/foo/foo.mk', 18)]}), + ('host virtual package', + 'package/foo/foo.mk', + 18, + '$(eval $(host-virtual-package))', + {'add_symbol_usage': [ + call('BR2_PACKAGE_PROVIDES_HOST_FOO', 'package/foo/foo.mk', 18), + call('BR2_PACKAGE_HAS_HOST_FOO', 'package/foo/foo.mk', 18), + call('BR2_PACKAGE_HOST_FOO', 'package/foo/foo.mk', 18)]}), + ('host generic package', + 'package/foo/foo.mk', + 18, + '$(eval $(host-package))', + {'add_symbol_usage': [call('BR2_PACKAGE_HOST_FOO', 'package/foo/foo.mk', 18)]}), + ('boot package', + 'boot/foo/foo.mk', + 18, + '$(eval $(generic-package))', + {'add_symbol_usage': [call('BR2_TARGET_FOO', 'boot/foo/foo.mk', 18)]}), + ('toolchain package', + 'toolchain/foo/foo.mk', + 18, + '$(eval $(generic-package))', + {'add_symbol_usage': [call('BR2_FOO', 'toolchain/foo/foo.mk', 18)]}), + ('generic package', + 'package/foo/foo.mk', + 18, + '$(eval $(generic-package))', + {'add_symbol_usage': [call('BR2_PACKAGE_FOO', 'package/foo/foo.mk', 18)]}), + ('cmake package', + 'package/foo/foo.mk', + 18, + '$(eval $(cmake-package))', + {'add_symbol_usage': [call('BR2_PACKAGE_FOO', 'package/foo/foo.mk', 18)]}), + ] + + +@pytest.mark.parametrize('testname,filename,lineno,line,expected_calls', handle_eval) +def test_handle_eval(testname, filename, lineno, line, expected_calls): + db = Mock() + m.handle_eval(db, filename, lineno, line) + assert_db_calls(db, expected_calls) + + +handle_definition = [ + ('legacy attribution', + 'Makefile.legacy', + 9, + 'BR2_LEGACY_FOO := foo', + True, + {'add_symbol_legacy_definition': [call('BR2_LEGACY_FOO', 'Makefile.legacy', 9)]}), + ('attribution 1', + 'Makefile', + 9, + 'BR2_FOO ?= foo', + False, + {'add_symbol_definition': [call('BR2_FOO', 'Makefile', 9)]}), + ('attribution 2', + 'Makefile', + 9, + 'BR2_FOO = $(BR2_BAR)', + False, + {'add_symbol_definition': [call('BR2_FOO', 'Makefile', 9)]}), + ('attribution 3', + 'Makefile', + 9, + 'BR2_FOO := foo', + False, + {'add_symbol_definition': [call('BR2_FOO', 'Makefile', 9)]}), + ('normal export', + 'Makefile', + 90, + 'export BR2_FOO', + False, + {'add_symbol_definition': [call('BR2_FOO', 'Makefile', 90)]}), + ('legacy export', + 'Makefile.legacy', + 90, + 'export BR2_FOO', + True, + {'add_symbol_legacy_definition': [call('BR2_FOO', 'Makefile.legacy', 90)]}), + ] + + +@pytest.mark.parametrize('testname,filename,lineno,line,legacy,expected_calls', handle_definition) +def test_handle_definition(testname, filename, lineno, line, legacy, expected_calls): + db = Mock() + m.handle_definition(db, filename, lineno, line, legacy) + assert_db_calls(db, expected_calls) + + +handle_usage = [ + ('legacy', + 'Makefile.legacy', + 8, + 'ifeq ($(BR2_LEGACY),y)', + True, + {'add_symbol_usage_in_legacy': [call('BR2_LEGACY', 'Makefile.legacy', 8)]}), + ('attribution', + 'Makefile', + 9, + 'BR2_FOO = $(BR2_BAR)', + False, + {'add_symbol_usage': [call('BR2_BAR', 'Makefile', 9)]}), + ('host virtual package', + 'package/foo/foo.mk', + 18, + '$(eval $(host-virtual-package))', + False, + {'add_symbol_usage': [ + call('BR2_PACKAGE_PROVIDES_HOST_FOO', 'package/foo/foo.mk', 18), + call('BR2_PACKAGE_HAS_HOST_FOO', 'package/foo/foo.mk', 18), + call('BR2_PACKAGE_HOST_FOO', 'package/foo/foo.mk', 18)]}), + ] + + +@pytest.mark.parametrize('testname,filename,lineno,line,legacy,expected_calls', handle_usage) +def test_handle_usage(testname, filename, lineno, line, legacy, expected_calls): + db = Mock() + m.handle_usage(db, filename, lineno, line, legacy) + assert_db_calls(db, expected_calls) + + +populate_db = [ + ('legacy', + 'Makefile.legacy', + [[8, 'ifeq ($(BR2_LEGACY),y)'], + [9, 'BR2_LEGACY_FOO := foo'], + [34, 'ifneq ($(BUILDROOT_CONFIG),$(BR2_CONFIG))']], + {'add_symbol_usage_in_legacy': [ + call('BR2_LEGACY', 'Makefile.legacy', 8), + call('BR2_CONFIG', 'Makefile.legacy', 34)], + 'add_symbol_legacy_definition': [call('BR2_LEGACY_FOO', 'Makefile.legacy', 9)]}), + ('attribution', + 'Makefile', + [[9, 'BR2_FOO = $(BR2_BAR)']], + {'add_symbol_definition': [call('BR2_FOO', 'Makefile', 9)], + 'add_symbol_usage': [call('BR2_BAR', 'Makefile', 9)]}), + ('legacy attribution', + 'Makefile.legacy', + [[9, 'BR2_FOO = $(BR2_BAR)']], + {'add_symbol_legacy_definition': [call('BR2_FOO', 'Makefile.legacy', 9)], + 'add_symbol_usage_in_legacy': [call('BR2_BAR', 'Makefile.legacy', 9)]}), + ('generic', + 'package/foo/foo.mk', + [[3, 'ifeq ($(BR2_PACKAGE_FOO_BAR):$(BR2_BAR),y:)'], + [4, 'export BR2_PACKAGE_FOO_BAZ'], + [5, '$(eval $(generic-package))']], + {'add_symbol_usage': [ + call('BR2_PACKAGE_FOO_BAR', 'package/foo/foo.mk', 3), + call('BR2_BAR', 'package/foo/foo.mk', 3), + call('BR2_PACKAGE_FOO', 'package/foo/foo.mk', 5)], + 'add_symbol_definition': [call('BR2_PACKAGE_FOO_BAZ', 'package/foo/foo.mk', 4)]}), + ('rootfs', + 'fs/foo/foo.mk', + [[4, 'ifeq ($(BR2_TARGET_ROOTFS_FOO_LZ4),y)'], + [5, '$(eval $(rootfs))']], + {'add_symbol_usage': [ + call('BR2_TARGET_ROOTFS_FOO', 'fs/foo/foo.mk', 5), + call('BR2_TARGET_ROOTFS_FOO_BZIP2', 'fs/foo/foo.mk', 5), + call('BR2_TARGET_ROOTFS_FOO_GZIP', 'fs/foo/foo.mk', 5), + call('BR2_TARGET_ROOTFS_FOO_LZ4', 'fs/foo/foo.mk', 4), + call('BR2_TARGET_ROOTFS_FOO_LZ4', 'fs/foo/foo.mk', 5), + call('BR2_TARGET_ROOTFS_FOO_LZMA', 'fs/foo/foo.mk', 5), + call('BR2_TARGET_ROOTFS_FOO_LZO', 'fs/foo/foo.mk', 5), + call('BR2_TARGET_ROOTFS_FOO_XZ', 'fs/foo/foo.mk', 5), + call('BR2_TARGET_ROOTFS_FOO_ZSTD', 'fs/foo/foo.mk', 5)]}), + ] + + +@pytest.mark.parametrize('testname,filename,file_content,expected_calls', populate_db) +def test_populate_db(testname, filename, file_content, expected_calls): + db = Mock() + m.populate_db(db, filename, file_content) + assert_db_calls(db, expected_calls) + + +check_filename = [ + ('arch/arch.mk.riscv', + 'arch/arch.mk.riscv', + True), + ('boot/lpc32xxcdl/lpc32xxcdl.mk', + 'boot/lpc32xxcdl/lpc32xxcdl.mk', + True), + ('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), + ('package/linux-tools/linux-tool-hv.mk.in', + 'package/linux-tools/linux-tool-hv.mk.in', + True), + ('package/pkg-generic.mk', + 'package/pkg-generic.mk', + True), + ('package/x11r7/xlib_libXt/xlib_libXt.mk', + 'package/x11r7/xlib_libXt/xlib_libXt.mk', + True), + ('support/dependencies/check-host-make.mk', + 'support/dependencies/check-host-make.mk', + True), + ('toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.mk', + 'toolchain/toolchain-external/toolchain-external-arm-aarch64-be/toolchain-external-arm-aarch64-be.mk', + True), + ('Makefile.legacy', + 'Makefile.legacy', + True), + ('boot/common.mk', + 'boot/common.mk', + True), + ('fs/common.mk', + 'fs/common.mk', + True), + ('Makefile', + 'Makefile', + True), + ('package/Makefile.in', + 'package/Makefile.in', + True), + ('Config.in', + 'Config.in', + False), + ('package/foo/0001-Makefile.patch', + 'package/foo/0001-Makefile.patch', + False), + ] + + +@pytest.mark.parametrize('testname,filename,expected', check_filename) +def test_check_filename(testname, filename, expected): + symbols = m.check_filename(filename) + assert symbols == expected diff --git a/utils/checksymbolslib/test_util.py b/utils/checksymbolslib/test_util.py new file mode 100644 index 00000000000..166785ba1d1 --- /dev/null +++ b/utils/checksymbolslib/test_util.py @@ -0,0 +1,15 @@ +def assert_calls(method, expected_calls): + method.assert_has_calls(expected_calls, any_order=True) + assert method.call_count == len(expected_calls) + + +def assert_db_calls(db, expected_calls): + assert_calls(db.add_symbol_legacy_definition, expected_calls.get('add_symbol_legacy_definition', [])) + assert_calls(db.add_symbol_definition, expected_calls.get('add_symbol_definition', [])) + assert_calls(db.add_symbol_usage_in_legacy, expected_calls.get('add_symbol_usage_in_legacy', [])) + assert_calls(db.add_symbol_usage, expected_calls.get('add_symbol_usage', [])) + assert_calls(db.add_symbol_legacy_usage, expected_calls.get('add_symbol_legacy_usage', [])) + assert_calls(db.add_symbol_select, expected_calls.get('add_symbol_select', [])) + assert_calls(db.add_symbol_helper, expected_calls.get('add_symbol_helper', [])) + assert_calls(db.add_symbol_legacy_note, expected_calls.get('add_symbol_legacy_note', [])) + assert_calls(db.add_symbol_virtual, expected_calls.get('add_symbol_virtual', [])) diff --git a/utils/config b/utils/config index c5e2d723ea9..5f5e4362e5b 100755 --- a/utils/config +++ b/utils/config @@ -51,7 +51,7 @@ checkarg() { usage fi if [ "$MUNGE_CASE" = "yes" ] ; then - ARG="`echo $ARG | tr a-z- A-Z_`" + ARG="$(echo "$ARG" | tr a-z- A-Z_)" fi case "$ARG" in ${BR2_PREFIX}*) @@ -64,7 +64,6 @@ txt_append() { local anchor="$1" local insert="$2" local infile="$3" - local tmpfile="$infile.swp" # sed append cmd: 'a\' + newline + text + newline cmd="$(printf "a\\%b$insert" "\n")" @@ -76,7 +75,6 @@ txt_subst() { local before="$1" local after="$2" local infile="$3" - local tmpfile="$infile.swp" sed -i -e "s:$before:$after:" "$infile" } @@ -84,7 +82,6 @@ txt_subst() { txt_delete() { local text="$1" local infile="$2" - local tmpfile="$infile.swp" sed -i -e "/$text/d" "$infile" } @@ -178,15 +175,14 @@ while [ "$1" != "" ] ; do if grep -q "# ${BR2_PREFIX}$ARG is not set" $FN ; then echo n else - V="$(grep "^${BR2_PREFIX}$ARG=" $FN)" - if [ $? != 0 ] ; then - echo undef - else + if V="$(grep "^${BR2_PREFIX}$ARG=" $FN)"; then V="${V/#${BR2_PREFIX}$ARG=/}" V="${V/#\"/}" V="${V/%\"/}" V="${V//\\\"/\"}" echo "${V}" + else + echo undef fi fi ;; diff --git a/utils/docker-run b/utils/docker-run index 56537642545..ab95e61e846 100755 --- a/utils/docker-run +++ b/utils/docker-run @@ -2,12 +2,40 @@ set -o errexit -o pipefail DIR=$(dirname "${0}") MAIN_DIR=$(readlink -f "${DIR}/..") +if [ -L "${MAIN_DIR}/.git/config" ]; then + # Support git-new-workdir + GIT_DIR="$(dirname "$(realpath "${MAIN_DIR}/.git/config")")" +else + # Support git-worktree + GIT_DIR="$(cd "${MAIN_DIR}" && git rev-parse --no-flags --git-common-dir)" +fi # shellcheck disable=SC2016 IMAGE=$(grep ^image: "${MAIN_DIR}/.gitlab-ci.yml" | \ sed -e 's,^image: ,,g' | sed -e 's,\$CI_REGISTRY,registry.gitlab.com,g') -exec docker run -it --rm \ - --user $(id -u):$(id -g) \ - --mount "type=bind,src=${MAIN_DIR},dst=${MAIN_DIR}" \ - --workdir "${MAIN_DIR}" \ - "${IMAGE}" "${@}" +declare -a docker_opts=( + -i + --rm + --user "$(id -u):$(id -g)" + --mount "type=bind,src=${MAIN_DIR},dst=${MAIN_DIR}" + --workdir "${MAIN_DIR}" +) + +# Empty GIT_DIR means that we are not in a workdir, *and* git is too old +# to know about worktrees, so we're not in a worktree either. So it means +# we're in the main git working copy, and thus we don't need to mount the +# .git directory. +if [ "${GIT_DIR}" ]; then + # GIT_DIR in the main working copy (when git supports worktrees) will + # be just '.git', but 'docker run' needs an absolute path. If it is + # not absolute, GIT_DIR is relative to MAIN_DIR. If it's an absolute + # path already (in a wordir), then that's a noop. + GIT_DIR="$(cd "${MAIN_DIR}"; readlink -e "${GIT_DIR}")" + docker_opts+=( --mount "type=bind,src=${GIT_DIR},dst=${GIT_DIR}" ) +fi + +if tty -s; then + docker_opts+=( -t ) +fi + +exec docker run "${docker_opts[@]}" "${IMAGE}" "${@}" diff --git a/utils/genrandconfig b/utils/genrandconfig index 3483d55c14a..846cf1aa9f1 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -18,23 +18,20 @@ # This script generates a random configuration for testing Buildroot. -import contextlib +from binascii import hexlify +import asyncio import csv import os from random import randint -import subprocess import sys +import traceback from distutils.version import StrictVersion import platform -if sys.hexversion >= 0x3000000: - import urllib.request as _urllib +if sys.version_info < (3, 8): + from asyncio import coroutine else: - import urllib2 as _urllib - - -def urlopen_closing(uri): - return contextlib.closing(_urllib.urlopen(uri)) + from types import coroutine class SystemInfo: @@ -63,6 +60,7 @@ class SystemInfo: # -- return None + @coroutine def has(self, prog): """Checks whether a program is available. Lazily evaluates missing entries. @@ -78,11 +76,13 @@ class SystemInfo: have_it = self.find_prog(prog) # java[c] needs special care if have_it and prog in ('java', 'javac'): - with open(os.devnull, "w") as devnull: - if subprocess.call("%s -version | grep gcj" % prog, - shell=True, - stdout=devnull, stderr=devnull) != 1: - have_it = False + proc = yield from asyncio.create_subprocess_shell( + "%s -version | grep gcj" % prog, + stdout=asyncio.subprocess.DEVNULL, + stderr=asyncio.subprocess.DEVNULL) + ret = yield from proc.wait() + if ret != 1: + have_it = False # -- self.progs[prog] = have_it return have_it @@ -159,6 +159,7 @@ def get_toolchain_configs(toolchains_csv, buildrootdir): return configs +@coroutine def is_toolchain_usable(configfile, config): """Check if the toolchain is actually usable.""" @@ -179,8 +180,12 @@ def is_toolchain_usable(configfile, config): 'BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64=y\n' in configlines or \ 'BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_BE=y\n' in configlines or \ 'BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB=y\n' in configlines: - ldd_version_output = subprocess.check_output(['ldd', '--version']) - glibc_version = ldd_version_output.splitlines()[0].split()[-1] + proc = yield from asyncio.create_subprocess_exec( + 'ldd', '--version', stdout=asyncio.subprocess.PIPE) + ldd_version_output, _ = yield from proc.communicate() + if proc.returncode: + return False + glibc_version = ldd_version_output.decode().splitlines()[0].split()[-1] if StrictVersion('2.14') > StrictVersion(glibc_version): print("WARN: ignoring the Linaro ARM toolchains because too old host glibc", file=sys.stderr) return False @@ -188,6 +193,7 @@ def is_toolchain_usable(configfile, config): return True +@coroutine def fixup_config(sysinfo, configfile): """Finalize the configuration and reject any problematic combinations @@ -200,9 +206,12 @@ def fixup_config(sysinfo, configfile): with open(configfile) as configf: configlines = configf.readlines() + ROOTFS_SIZE = '5G' + BR2_TOOLCHAIN_EXTERNAL_URL = 'BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/' - if "BR2_NEEDS_HOST_JAVA=y\n" in configlines and not sysinfo.has("java"): + has_java = yield from sysinfo.has("java") + if "BR2_NEEDS_HOST_JAVA=y\n" in configlines and not has_java: return False # The ctng toolchain is affected by PR58854 if 'BR2_PACKAGE_LTTNG_TOOLS=y\n' in configlines and \ @@ -237,17 +246,16 @@ def fixup_config(sysinfo, configfile): if 'BR2_PACKAGE_PYTHON3=y\n' in configlines and \ BR2_TOOLCHAIN_EXTERNAL_URL + 'mips64el-ctng_n64-linux-gnu.tar.xz"\n' in configlines: return False - # libffi not available on sh2a and ARMv7-M, but propagating libffi - # arch dependencies in Buildroot is really too much work, so we - # handle this here. - if 'BR2_sh2a=y\n' in configlines and \ - 'BR2_PACKAGE_LIBFFI=y\n' in configlines: - return False + # libffi not available on ARMv7-M, but propagating libffi arch + # dependencies in Buildroot is really too much work, so we handle + # this here. if 'BR2_ARM_CPU_ARMV7M=y\n' in configlines and \ 'BR2_PACKAGE_LIBFFI=y\n' in configlines: return False - if 'BR2_nds32=y\n' in configlines and \ - 'BR2_PACKAGE_LIBFFI=y\n' in configlines: + # libopenssl needs atomic, but propagating this dependency in + # Buildroot is really too much work, so we handle this here. + if 'BR2_PACKAGE_LIBOPENSSL=y\n' in configlines and \ + 'BR2_TOOLCHAIN_HAS_ATOMIC=y\n' not in configlines: return False if 'BR2_PACKAGE_SUNXI_BOARDS=y\n' in configlines: configlines.remove('BR2_PACKAGE_SUNXI_BOARDS_FEX_FILE=""\n') @@ -298,8 +306,24 @@ def fixup_config(sysinfo, configfile): if 'BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII=y\n' in configlines and \ 'BR2_PACKAGE_FLANN=y\n' in configlines: return False + # No C library for internal toolchain + if 'BR2_TOOLCHAIN_BUILDROOT_NONE=y' in configlines: + return False + # Xtensa custom cores require an overlay file with internal + # toolchains + if 'BR2_XTENSA_CUSTOM=y' in configlines and \ + 'BR2_TOOLCHAIN_BUILDROOT=y' in configlines: + return False + + 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 - if 'BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE=y\n' in configlines: + if 'BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE=y\n' in configlines and \ + 'BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SOURCE=""\n' in configlines and \ + 'BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SIZE=""\n' in configlines: bootenv = os.path.join(args.outputdir, "boot_env.txt") with open(bootenv, "w+") as bootenvf: bootenvf.write("prop=value") @@ -308,19 +332,356 @@ def fixup_config(sysinfo, configfile): configlines.remove('BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SIZE=""\n') configlines.append('BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SIZE="0x1000"\n') - if 'BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y\n' in configlines: + if 'BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y\n' in configlines and \ + 'BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE=""\n' in configlines: bootscr = os.path.join(args.outputdir, "boot_script.txt") with open(bootscr, "w+") as bootscrf: bootscrf.write("prop=value") configlines.remove('BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE=""\n') configlines.append('BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="%s"\n' % bootscr) + if 'BR2_ROOTFS_SKELETON_CUSTOM=y\n' in configlines and \ + 'BR2_ROOTFS_SKELETON_CUSTOM_PATH=""\n' in configlines: + configlines.remove('BR2_ROOTFS_SKELETON_CUSTOM=y\n') + configlines.remove('BR2_ROOTFS_SKELETON_CUSTOM_PATH=""\n') + + if 'BR2_LINUX_KERNEL=y\n' in configlines and \ + 'BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y\n' in configlines and \ + 'BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE=""\n' in configlines: + configlines.remove('BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y\n') + configlines.append('BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y\n') + configlines.remove('BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE=""\n') + + if 'BR2_LINUX_KERNEL=y\n' in configlines and \ + 'BR2_LINUX_KERNEL_USE_DEFCONFIG=y\n' in configlines and \ + 'BR2_LINUX_KERNEL_DEFCONFIG=""\n' in configlines: + configlines.remove('BR2_LINUX_KERNEL_USE_DEFCONFIG=y\n') + configlines.append('BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y\n') + configlines.remove('BR2_LINUX_KERNEL_DEFCONFIG=""\n') + + if 'BR2_LINUX_KERNEL=y\n' in configlines and \ + 'BR2_LINUX_KERNEL_CUSTOM_GIT=y\n' in configlines and \ + 'BR2_LINUX_KERNEL_CUSTOM_REPO_URL=""\n' in configlines: + configlines.remove('BR2_LINUX_KERNEL_CUSTOM_GIT=y\n') + configlines.append('BR2_LINUX_KERNEL_LATEST_VERSION=y\n') + configlines.remove('BR2_LINUX_KERNEL_CUSTOM_REPO_URL=""\n') + + if 'BR2_LINUX_KERNEL=y\n' in configlines and \ + 'BR2_LINUX_KERNEL_CUSTOM_HG=y\n' in configlines and \ + 'BR2_LINUX_KERNEL_CUSTOM_REPO_URL=""\n' in configlines: + configlines.remove('BR2_LINUX_KERNEL_CUSTOM_HG=y\n') + configlines.append('BR2_LINUX_KERNEL_LATEST_VERSION=y\n') + configlines.remove('BR2_LINUX_KERNEL_CUSTOM_REPO_URL=""\n') + + if 'BR2_LINUX_KERNEL=y\n' in configlines and \ + 'BR2_LINUX_KERNEL_CUSTOM_SVN=y\n' in configlines and \ + 'BR2_LINUX_KERNEL_CUSTOM_REPO_URL=""\n' in configlines: + configlines.remove('BR2_LINUX_KERNEL_CUSTOM_SVN=y\n') + configlines.append('BR2_LINUX_KERNEL_LATEST_VERSION=y\n') + configlines.remove('BR2_LINUX_KERNEL_CUSTOM_REPO_URL=""\n') + + if 'BR2_LINUX_KERNEL=y\n' in configlines and \ + 'BR2_LINUX_KERNEL_CUSTOM_TARBALL=y\n' in configlines and \ + 'BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION=""\n' in configlines: + configlines.remove('BR2_LINUX_KERNEL_CUSTOM_TARBALL=y\n') + configlines.append('BR2_LINUX_KERNEL_LATEST_VERSION=y\n') + configlines.remove('BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION=""\n') + + if 'BR2_LINUX_KERNEL=y\n' in configlines and \ + 'BR2_LINUX_KERNEL_CUSTOM_VERSION=y\n' in configlines and \ + 'BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE=""\n' in configlines: + configlines.remove('BR2_LINUX_KERNEL_CUSTOM_VERSION=y\n') + configlines.append('BR2_LINUX_KERNEL_LATEST_VERSION=y\n') + configlines.remove('BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE=""\n') + + if 'BR2_LINUX_KERNEL=y\n' in configlines and \ + 'BR2_LINUX_KERNEL_DTS_SUPPORT=y\n' in configlines and \ + 'BR2_LINUX_KERNEL_INTREE_DTS_NAME=""\n' in configlines and \ + 'BR2_LINUX_KERNEL_CUSTOM_DTS_PATH=""\n' in configlines: + configlines.remove('BR2_LINUX_KERNEL_DTS_SUPPORT=y\n') + configlines.remove('BR2_LINUX_KERNEL_INTREE_DTS_NAME=""\n') + configlines.remove('BR2_LINUX_KERNEL_CUSTOM_DTS_PATH=""\n') + if 'BR2_LINUX_KERNEL_APPENDED_UIMAGE=y\n' in configlines: + configlines.remove('BR2_LINUX_KERNEL_APPENDED_UIMAGE=y\n') + configlines.append('BR2_LINUX_KERNEL_UIMAGE=y\n') + if 'BR2_LINUX_KERNEL_APPENDED_ZIMAGE=y\n' in configlines: + configlines.remove('BR2_LINUX_KERNEL_APPENDED_ZIMAGE=y\n') + configlines.append('BR2_LINUX_KERNEL_ZIMAGE=y\n') + if 'BR2_LINUX_KERNEL_CUIMAGE=y\n' in configlines: + configlines.remove('BR2_LINUX_KERNEL_CUIMAGE=y\n') + configlines.append('BR2_LINUX_KERNEL_UIMAGE=y\n') + if 'BR2_LINUX_KERNEL_SIMPLEIMAGE=y\n' in configlines: + configlines.remove('BR2_LINUX_KERNEL_SIMPLEIMAGE=y\n') + configlines.append('BR2_LINUX_KERNEL_VMLINUX=y\n') + + 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: + configlines.remove('BR2_PACKAGE_LINUX_BACKPORTS=y\n') + configlines.remove('BR2_PACKAGE_LINUX_BACKPORTS_USE_CUSTOM_CONFIG=y\n') + configlines.remove('BR2_PACKAGE_LINUX_BACKPORTS_CUSTOM_CONFIG_FILE=""\n') + + if 'BR2_PACKAGE_LINUX_BACKPORTS=y\n' in configlines and \ + 'BR2_PACKAGE_LINUX_BACKPORTS_USE_DEFCONFIG=y\n' in configlines and \ + 'BR2_PACKAGE_LINUX_BACKPORTS_DEFCONFIG=""\n' in configlines: + configlines.remove('BR2_PACKAGE_LINUX_BACKPORTS=y\n') + configlines.remove('BR2_PACKAGE_LINUX_BACKPORTS_USE_DEFCONFIG=y\n') + configlines.remove('BR2_PACKAGE_LINUX_BACKPORTS_DEFCONFIG=""\n') + + if 'BR2_KERNEL_HEADERS_VERSION=y\n' in configlines and \ + 'BR2_DEFAULT_KERNEL_VERSION=""\n' in configlines: + configlines.remove('BR2_KERNEL_HEADERS_VERSION=y\n') + configlines.remove('BR2_DEFAULT_KERNEL_VERSION=""\n') + + if 'BR2_KERNEL_HEADERS_CUSTOM_GIT=y\n' in configlines and \ + 'BR2_KERNEL_HEADERS_CUSTOM_REPO_URL=""\n': + configlines.remove('BR2_KERNEL_HEADERS_CUSTOM_GIT=y\n') + configlines.remove('BR2_KERNEL_HEADERS_CUSTOM_REPO_URL=""\n') + + if 'BR2_KERNEL_HEADERS_CUSTOM_TARBALL=y\n' in configlines and \ + 'BR2_KERNEL_HEADERS_CUSTOM_TARBALL_LOCATION=""\n' in configlines: + configlines.remove('BR2_KERNEL_HEADERS_CUSTOM_TARBALL=y\n') + configlines.remove('BR2_KERNEL_HEADERS_CUSTOM_TARBALL_LOCATION=""\n') + + if 'BR2_TARGET_ARM_TRUSTED_FIRMWARE=y\n' in configlines and \ + 'BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM=""\n' in configlines: + return False + + if 'BR2_TARGET_ARM_TRUSTED_FIRMWARE=y\n' in configlines and \ + 'BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y\n' in configlines and \ + 'BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE=""\n' in configlines: + configlines.remove('BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y\n') + configlines.append('BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION=y\n') + configlines.remove('BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE=""\n') + + if 'BR2_TARGET_ARM_TRUSTED_FIRMWARE=y\n' in configlines and \ + 'BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y\n' in configlines and \ + 'BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION=""\n' in configlines: + configlines.remove('BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y\n') + configlines.append('BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION=y\n') + configlines.remove('BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION=""\n') + + if 'BR2_TARGET_ARM_TRUSTED_FIRMWARE=y\n' in configlines and \ + 'BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y\n' in configlines and \ + 'BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL=""\n' in configlines: + configlines.remove('BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y\n') + configlines.append('BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION=y\n') + configlines.remove('BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL=""\n') + + if 'BR2_TARGET_AT91BOOTSTRAP3=y\n' in configlines and \ + 'BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG=""\n' in configlines: + configlines.remove('BR2_TARGET_AT91BOOTSTRAP3=y\n') + configlines.remove('BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG=""\n') + + if 'BR2_TARGET_BAREBOX=y\n' in configlines and \ + 'BR2_TARGET_BAREBOX_USE_CUSTOM_CONFIG=y\n' in configlines and \ + 'BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE=""\n' in configlines: + configlines.remove('BR2_TARGET_BAREBOX=y\n') + configlines.remove('BR2_TARGET_BAREBOX_USE_CUSTOM_CONFIG=y\n') + configlines.remove('BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE=""\n') + + if 'BR2_TARGET_BAREBOX=y\n' in configlines and \ + 'BR2_TARGET_BAREBOX_USE_DEFCONFIG=y\n' in configlines and \ + 'BR2_TARGET_BAREBOX_BOARD_DEFCONFIG=""\n' in configlines: + configlines.remove('BR2_TARGET_BAREBOX=y\n') + configlines.remove('BR2_TARGET_BAREBOX_USE_DEFCONFIG=y\n') + configlines.remove('BR2_TARGET_BAREBOX_BOARD_DEFCONFIG=""\n') + + if 'BR2_TARGET_BOOT_WRAPPER_AARCH64=y\n' in configlines and \ + 'BR2_TARGET_BOOT_WRAPPER_AARCH64_DTS=""\n' in configlines: + return False + + if 'BR2_TARGET_LPC32XXCDL=y\n' in configlines and \ + 'BR2_TARGET_LPC32XXCDL_BOARDNAME=""\n' in configlines: + return False + + if 'BR2_TARGET_OPTEE_OS=y\n' in configlines and \ + 'BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL=y\n' in configlines and \ + 'BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL_LOCATION=""\n' in configlines: + configlines.remove('BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL=y\n') + configlines.append('BR2_TARGET_OPTEE_OS_LATEST=y\n') + configlines.remove('BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL_LOCATION=""\n') + + if 'BR2_TARGET_OPTEE_OS=y\n' in configlines and \ + 'BR2_TARGET_OPTEE_OS_PLATFORM=""\n' in configlines: + configlines.remove('BR2_TARGET_OPTEE_OS=y\n') + configlines.remove('BR2_TARGET_OPTEE_OS_PLATFORM=""\n') + + if 'BR2_TARGET_ROOTFS_CRAMFS=y\n' in configlines: + configlines.remove('BR2_TARGET_ROOTFS_CRAMFS=y\n') + + if 'BR2_TARGET_ROOTFS_EXT2=y\n' in configlines and \ + 'BR2_TARGET_ROOTFS_EXT2_SIZE="60M"\n' in configlines: + configlines.remove('BR2_TARGET_ROOTFS_EXT2_SIZE="60M"\n') + configlines.append('BR2_TARGET_ROOTFS_EXT2_SIZE="%s"\n' % ROOTFS_SIZE) + + if 'BR2_TARGET_ROOTFS_F2FS=y\n' in configlines and \ + 'BR2_TARGET_ROOTFS_F2FS_SIZE="100M"\n' in configlines: + configlines.remove('BR2_TARGET_ROOTFS_F2FS_SIZE="100M"\n') + configlines.append('BR2_TARGET_ROOTFS_F2FS_SIZE="%s"\n' % ROOTFS_SIZE) + + if 'BR2_TARGET_ROOTFS_UBIFS=y\n' in configlines and \ + 'BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2048\n' in configlines: + configlines.remove('BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2048\n') + configlines.append('BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=41610\n') + + if 'BR2_TARGET_ROOTFS_UBI=y\n' in configlines and \ + 'BR2_TARGET_ROOTFS_UBI_USE_CUSTOM_CONFIG=y\n' in configlines and \ + 'BR2_TARGET_ROOTFS_UBI_CUSTOM_CONFIG_FILE=""\n' in configlines: + configlines.remove('BR2_TARGET_ROOTFS_UBI_USE_CUSTOM_CONFIG=y\n') + configlines.remove('BR2_TARGET_ROOTFS_UBI_CUSTOM_CONFIG_FILE=""\n') + + if 'BR2_TARGET_S500_BOOTLOADER=y\n' in configlines and \ + 'BR2_TARGET_S500_BOOTLOADER_BOARD=""\n' in configlines: + configlines.remove('BR2_TARGET_S500_BOOTLOADER=y\n') + configlines.remove('BR2_TARGET_S500_BOOTLOADER_BOARD=""\n') + + if 'BR2_TARGET_TI_K3_R5_LOADER=y\n' in configlines and \ + 'BR2_TARGET_TI_K3_R5_LOADER_USE_DEFCONFIG=y\n' in configlines and \ + 'BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG=""\n' in configlines: + return False + + if 'BR2_TARGET_UBOOT=y\n' in configlines and \ + 'BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y\n' in configlines and \ + 'BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y\n' in configlines and \ + 'BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE=""\n' in configlines: + configlines.remove('BR2_TARGET_UBOOT=y\n') + configlines.remove('BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y\n') + configlines.remove('BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y\n') + configlines.remove('BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE=""\n') + + if 'BR2_TARGET_UBOOT=y\n' in configlines and \ + 'BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y\n' in configlines and \ + 'BR2_TARGET_UBOOT_USE_DEFCONFIG=y\n' in configlines and \ + 'BR2_TARGET_UBOOT_BOARD_DEFCONFIG=""\n' in configlines: + configlines.remove('BR2_TARGET_UBOOT=y\n') + configlines.remove('BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y\n') + configlines.remove('BR2_TARGET_UBOOT_USE_DEFCONFIG=y\n') + configlines.remove('BR2_TARGET_UBOOT_BOARD_DEFCONFIG=""\n') + + if 'BR2_TARGET_UBOOT=y\n' in configlines and \ + 'BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY=y\n' in configlines and \ + 'BR2_TARGET_UBOOT_BOARDNAME=""\n' in configlines: + configlines.remove('BR2_TARGET_UBOOT=y\n') + configlines.remove('BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY=y\n') + configlines.remove('BR2_TARGET_UBOOT_BOARDNAME=""\n') + + if 'BR2_TOOLCHAIN_EXTERNAL=y\n' in configlines and \ + 'BR2_TOOLCHAIN_EXTERNAL_PREINSTALLED=y\n' in configlines and \ + 'BR2_TOOLCHAIN_EXTERNAL_PATH=""\n' in configlines: + configlines.remove('BR2_TOOLCHAIN_EXTERNAL=y\n') + configlines.remove('BR2_TOOLCHAIN_EXTERNAL_PREINSTALLED=y\n') + configlines.remove('BR2_TOOLCHAIN_EXTERNAL_PATH=""\n') + if 'BR2_ARCH_HAS_NO_TOOLCHAIN_BUILDROOT=y\n' in configlines: + return False + + if 'BR2_TOOLCHAIN_EXTERNAL=y\n' in configlines and \ + 'BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y\n' in configlines and \ + 'BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y\n' in configlines and \ + 'BR2_TOOLCHAIN_EXTERNAL_URL=""\n' in configlines: + configlines.remove('BR2_TOOLCHAIN_EXTERNAL=y\n') + configlines.remove('BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y\n') + configlines.remove('BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y\n') + configlines.remove('BR2_TOOLCHAIN_EXTERNAL_URL=""\n') + if 'BR2_ARCH_HAS_NO_TOOLCHAIN_BUILDROOT=y\n' in configlines: + return False + + if 'BR2_TARGET_MXS_BOOTLETS=y\n' in configlines and \ + 'BR2_TARGET_MXS_BOOTLETS_CUSTOM_BOARD=y\n' in configlines and \ + 'BR2_TARGET_MXS_BOOTLETS_CUSTOM_BOARD_NAME=""\n' in configlines: + configlines.remove('BR2_TARGET_MXS_BOOTLETS_CUSTOM_BOARD=y\n') + configlines.append('BR2_TARGET_MXS_BOOTLETS_STMP37xx=y\n') + configlines.remove('BR2_TARGET_MXS_BOOTLETS_CUSTOM_BOARD_NAME=""\n') + + if 'BR2_TARGET_MXS_BOOTLETS=y\n' in configlines and \ + 'BR2_TARGET_MXS_BOOTLETS_CUSTOM_GIT=y\n' in configlines and \ + 'BR2_TARGET_MXS_BOOTLETS_CUSTOM_GIT_URL=""\n' in configlines: + configlines.remove('BR2_TARGET_MXS_BOOTLETS_CUSTOM_GIT=y\n') + configlines.append('BR2_TARGET_MXS_BOOTLETS_FREESCALE=y\n') + configlines.remove('BR2_TARGET_MXS_BOOTLETS_CUSTOM_GIT_URL=""\n') + + if 'BR2_TARGET_MXS_BOOTLETS=y\n' in configlines and \ + 'BR2_TARGET_MXS_BOOTLETS_CUSTOM_TARBALL=y\n' in configlines and \ + 'BR2_TARGET_MXS_BOOTLETS_CUSTOM_TARBALL_URL=""\n' in configlines: + configlines.remove('BR2_TARGET_MXS_BOOTLETS_CUSTOM_TARBALL=y\n') + configlines.append('BR2_TARGET_MXS_BOOTLETS_FREESCALE=y\n') + configlines.remove('BR2_TARGET_MXS_BOOTLETS_CUSTOM_TARBALL_URL=""\n') + + if 'BR2_TARGET_OPENSBI=y\n' in configlines and \ + 'BR2_TARGET_OPENSBI_CUSTOM_GIT=y\n' in configlines and \ + 'BR2_TARGET_OPENSBI_CUSTOM_REPO_URL=""\n' in configlines: + configlines.remove('BR2_TARGET_OPENSBI_CUSTOM_GIT=y\n') + configlines.append('BR2_TARGET_OPENSBI_LATEST_VERSION=y\n') + configlines.remove('BR2_TARGET_OPENSBI_CUSTOM_REPO_URL=""\n') + + if 'BR2_TARGET_OPENSBI=y\n' in configlines and \ + 'BR2_TARGET_OPENSBI_CUSTOM_TARBALL=y\n' in configlines and \ + 'BR2_TARGET_OPENSBI_CUSTOM_TARBALL_LOCATION=""\n' in configlines: + configlines.remove('BR2_TARGET_OPENSBI_CUSTOM_TARBALL=y\n') + configlines.append('BR2_TARGET_OPENSBI_LATEST_VERSION=y\n') + configlines.remove('BR2_TARGET_OPENSBI_CUSTOM_TARBALL_LOCATION=""\n') + + if 'BR2_TARGET_OPENSBI=y\n' in configlines and \ + 'BR2_TARGET_OPENSBI_CUSTOM_VERSION=y\n' in configlines and \ + 'BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE=""\n' in configlines: + configlines.remove('BR2_TARGET_OPENSBI_CUSTOM_VERSION=y\n') + configlines.append('BR2_TARGET_OPENSBI_LATEST_VERSION=y\n') + configlines.remove('BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE=""\n') + + if 'BR2_PACKAGE_REFPOLICY=y\n' in configlines and \ + 'BR2_PACKAGE_REFPOLICY_CUSTOM_GIT=y\n' in configlines and \ + 'BR2_PACKAGE_REFPOLICY_CUSTOM_REPO_URL=""\n' in configlines: + configlines.remove('BR2_PACKAGE_REFPOLICY_CUSTOM_GIT=y\n') + configlines.append('BR2_PACKAGE_REFPOLICY_UPSTREAM_VERSION=y\n') + configlines.remove('BR2_PACKAGE_REFPOLICY_CUSTOM_REPO_URL=""\n') + + if 'BR2_PACKAGE_XENOMAI=y\n' in configlines and \ + 'BR2_PACKAGE_XENOMAI_CUSTOM_GIT=y\n' in configlines and \ + 'BR2_PACKAGE_XENOMAI_REPOSITORY=""\n' in configlines: + configlines.remove('BR2_PACKAGE_XENOMAI_CUSTOM_GIT=y\n') + configlines.append('BR2_PACKAGE_XENOMAI_LATEST_VERSION=y\n') + configlines.remove('BR2_PACKAGE_XENOMAI_REPOSITORY=""\n') + + if 'BR2_PACKAGE_XENOMAI=y\n' in configlines and \ + 'BR2_PACKAGE_XENOMAI_CUSTOM_TARBALL=y\n' in configlines and \ + 'BR2_PACKAGE_XENOMAI_CUSTOM_TARBALL_URL=""\n' in configlines: + configlines.remove('BR2_PACKAGE_XENOMAI_CUSTOM_TARBALL=y\n') + configlines.append('BR2_PACKAGE_XENOMAI_LATEST_VERSION=y\n') + configlines.remove('BR2_PACKAGE_XENOMAI_CUSTOM_TARBALL_URL=""\n') + + if 'BR2_PACKAGE_XENOMAI=y\n' in configlines and \ + 'BR2_PACKAGE_XENOMAI_CUSTOM_VERSION=y\n' in configlines and \ + 'BR2_PACKAGE_XENOMAI_CUSTOM_VERSION_VALUE=""\n' in configlines: + configlines.remove('BR2_PACKAGE_XENOMAI_CUSTOM_VERSION=y\n') + configlines.append('BR2_PACKAGE_XENOMAI_LATEST_VERSION=y\n') + configlines.remove('BR2_PACKAGE_XENOMAI_CUSTOM_VERSION_VALUE=""\n') + + if 'BR2_PACKAGE_XVISOR=y\n' in configlines and \ + 'BR2_PACKAGE_XVISOR_USE_CUSTOM_CONFIG=y\n' in configlines and \ + 'BR2_PACKAGE_XVISOR_CUSTOM_CONFIG_FILE=""\n' in configlines: + configlines.remove('BR2_PACKAGE_XVISOR_USE_CUSTOM_CONFIG=y\n') + configlines.append('BR2_PACKAGE_XVISOR_USE_DEFCONFIG=y\n') + configlines.remove('BR2_PACKAGE_XVISOR_CUSTOM_CONFIG_FILE=""\n') + + # Don't build igh-ethercat driver as they are highly + # kernel-version specific + for opt in ['8139TOO', 'E100', 'E1000', 'E1000E', 'R8169']: + optstr = 'BR2_PACKAGE_IGH_ETHERCAT_%s=y\n' % opt + if optstr in configlines: + configlines.remove(optstr) + with open(configfile, "w+") as configf: configf.writelines(configlines) return True +@coroutine def gen_config(args): """Generate a new random configuration @@ -331,11 +692,14 @@ def gen_config(args): sysinfo = SystemInfo() - # Select a random toolchain configuration - configs = get_toolchain_configs(args.toolchains_csv, args.buildrootdir) + if args.toolchains_csv: + # Select a random toolchain configuration + configs = get_toolchain_configs(args.toolchains_csv, args.buildrootdir) - i = randint(0, len(configs) - 1) - toolchainconfig = configs[i] + i = randint(0, len(configs) - 1) + toolchainconfig = configs[i] + else: + toolchainconfig = [] configlines = list(toolchainconfig) @@ -376,7 +740,8 @@ def gen_config(args): # Randomly enable BR2_REPRODUCIBLE 10% of times # also enable tar filesystem images for testing - if sysinfo.has("diffoscope") and randint(0, 10) == 0: + has_diffoscope = yield from sysinfo.has("diffoscope") + if has_diffoscope and randint(0, 10) == 0: configlines.append("BR2_REPRODUCIBLE=y\n") configlines.append("BR2_TARGET_ROOTFS_TAR=y\n") @@ -390,10 +755,14 @@ def gen_config(args): with open(configfile, "w+") as configf: configf.writelines(configlines) - subprocess.check_call(["make", "O=%s" % args.outputdir, "-C", args.buildrootdir, - "olddefconfig"]) + proc = yield from asyncio.create_subprocess_exec( + "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "olddefconfig") + ret = yield from proc.wait() + if ret: + return ret - if not is_toolchain_usable(configfile, toolchainconfig): + toolchain_usable = yield from is_toolchain_usable(configfile, toolchainconfig) + if not toolchain_usable: return 2 # Now, generate the random selection of packages, and fixup @@ -407,21 +776,37 @@ def gen_config(args): file=sys.stderr) return 1 bounded_loop -= 1 - subprocess.check_call(["make", "O=%s" % args.outputdir, "-C", args.buildrootdir, - "KCONFIG_PROBABILITY=%d" % randint(1, 20), - "randpackageconfig"]) - - if fixup_config(sysinfo, configfile): + make_rand = [ + "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, + "KCONFIG_SEED=0x%s" % hexlify(os.urandom(4)).decode("ascii").upper(), + "KCONFIG_PROBABILITY=%d" % randint(1, 20), + "randpackageconfig" if args.toolchains_csv else "randconfig" + ] + proc = yield from asyncio.create_subprocess_exec(*make_rand) + ret = yield from proc.wait() + if ret: + return ret + + ret = yield from fixup_config(sysinfo, configfile) + if ret: break - subprocess.check_call(["make", "O=%s" % args.outputdir, "-C", args.buildrootdir, - "olddefconfig"]) + proc = yield from asyncio.create_subprocess_exec( + "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "olddefconfig") + ret = yield from proc.wait() + if ret: + return ret - subprocess.check_call(["make", "O=%s" % args.outputdir, "-C", args.buildrootdir, - "savedefconfig"]) + proc = yield from asyncio.create_subprocess_exec( + "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "savedefconfig") + ret = yield from proc.wait() + if ret: + return ret - return subprocess.call(["make", "O=%s" % args.outputdir, "-C", args.buildrootdir, - "dependencies"]) + proc = yield from asyncio.create_subprocess_exec( + "make", "O=%s" % args.outputdir, "-C", args.buildrootdir, "dependencies") + ret = yield from proc.wait() + return ret if __name__ == '__main__': @@ -433,10 +818,18 @@ if __name__ == '__main__': parser.add_argument("--buildrootdir", "-b", help="Buildroot directory (relative to current directory)", type=str, default='.') - parser.add_argument("--toolchains-csv", - help="Path of the toolchain configuration file", - type=str, - default="support/config-fragments/autobuild/toolchain-configs.csv") + + toolchains_csv = parser.add_mutually_exclusive_group(required=False) + toolchains_csv.add_argument("--toolchains-csv", + dest="toolchains_csv", + help="Path of the toolchain configuration file", + type=str) + toolchains_csv.add_argument("--no-toolchains-csv", + dest="toolchains_csv", + help="Generate random toolchain configuration", + action='store_false') + parser.set_defaults(toolchains_csv="support/config-fragments/autobuild/toolchain-configs.csv") + args = parser.parse_args() # We need the absolute path to use with O=, because the relative @@ -445,8 +838,12 @@ if __name__ == '__main__': args.outputdir = os.path.abspath(args.outputdir) try: - ret = gen_config(args) - except Exception as e: - print(str(e), file=sys.stderr) + if sys.version_info < (3, 7): + loop = asyncio.get_event_loop() + ret = loop.run_until_complete(gen_config(args)) + else: + ret = asyncio.run(gen_config(args)) + except Exception: + traceback.print_exc() parser.exit(1) parser.exit(ret) diff --git a/utils/get-developers b/utils/get-developers index 22accaf1818..9ab5c4503f1 100755 --- a/utils/get-developers +++ b/utils/get-developers @@ -19,6 +19,10 @@ def parse_args(): const=True, help='list files not handled by any developer') 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() @@ -35,6 +39,8 @@ def __main__(): action += 1 if args.check: action += 1 + if args.validate: + action += 1 if len(args.patches) != 0: action += 1 if action > 1: @@ -44,10 +50,16 @@ def __main__(): print("No action specified") return - devs = getdeveloperlib.parse_developers() + devs = getdeveloperlib.parse_developers(args.filename) if devs is None: sys.exit(1) + # Validation is done by parse_developers() above and we error out + # if the validation didn't work, so if we reach here, it means + # validation passed, so we can simply bail out in success. + if args.validate: + return + # Handle the check action if args.check: files = getdeveloperlib.check_developers(devs) diff --git a/utils/getdeveloperlib.py b/utils/getdeveloperlib.py index c05e1f888b8..469360b801c 100644 --- a/utils/getdeveloperlib.py +++ b/utils/getdeveloperlib.py @@ -25,7 +25,7 @@ def analyze_patch(patch): m = FIND_INFRA_IN_PATCH.match(line) if m: infras.add(m.group(2)) - if not line.startswith("+++ "): + if not line.startswith("+++ ") and not line.startswith("--- "): continue line.strip() fname = line[line.find("/") + 1:].strip() @@ -225,30 +225,32 @@ def parse_developer_runtime_tests(fnames): return runtimes -def parse_developers(): +def parse_developers(filename=None): """Parse the DEVELOPERS file and return a list of Developer objects.""" developers = [] linen = 0 global unittests unittests = list_unittests() - developers_fname = os.path.join(brpath, 'DEVELOPERS') + developers_fname = filename or os.path.join(brpath, 'DEVELOPERS') with open(developers_fname, mode='r', encoding='utf_8') as f: files = [] name = None for line in f: + linen += 1 line = line.strip() if line.startswith("#"): continue elif line.startswith("N:"): if name is not None or len(files) != 0: - print("Syntax error in DEVELOPERS file, line %d" % linen, + print("Syntax error in DEVELOPERS file, line %d" % (linen - 1), file=sys.stderr) + return None name = line[2:].strip() elif line.startswith("F:"): fname = line[2:].strip() dev_files = glob.glob(os.path.join(brpath, fname)) if len(dev_files) == 0: - print("WARNING: '%s' doesn't match any file" % fname, + print("WARNING: '%s' doesn't match any file, line %d" % (fname, linen), file=sys.stderr) for f in dev_files: dev_file = os.path.relpath(f, brpath) @@ -266,7 +268,6 @@ def parse_developers(): print("Syntax error in DEVELOPERS file, line %d: '%s'" % (linen, line), file=sys.stderr) return None - linen += 1 # handle last developer if name is not None: developers.append(Developer(name, files)) diff --git a/utils/readme.txt b/utils/readme.txt index 3064ecec323..3e8833c4ea2 100644 --- a/utils/readme.txt +++ b/utils/readme.txt @@ -20,7 +20,7 @@ genrandconfig (http://autobuild.buildroot.org). It selects a random toolchain from support/config-fragments/autobuild and randomly selects packages to build. -get-developpers +get-developers a script to return the list of people interested in a specific part of Buildroot, so they can be Cc:ed on a mail. Accepts a patch as input, a package name or and architecture name. diff --git a/utils/scancpan b/utils/scancpan index 075f1935632..e7739a8ad16 100755 --- a/utils/scancpan +++ b/utils/scancpan @@ -31,7 +31,7 @@ $fatpacked{"MetaCPAN/API/Tiny.pm"} = <<'METACPAN_API_TINY'; if $params{ua_args} && ref($params{ua_args}) ne 'ARRAY'; my $self = +{ - base_url => $params{base_url} || 'http://api.metacpan.org/v0', + base_url => $params{base_url} || 'https://api.metacpan.org/v0', ua => $params{ua} || HTTP::Tiny->new( $params{ua_args} ? @{$params{ua_args}} @@ -488,9 +488,9 @@ use Digest::SHA qw(sha256_hex); use Text::Wrap; $Text::Wrap::columns = 62; -# Below, 5.032 should be aligned with the version of perl actually +# Below, 5.036 should be aligned with the version of perl actually # bundled in Buildroot: -die <<"MSG" if $] < 5.032; +die <<"MSG" if $] < 5.036; This script needs a host perl with the same major version as Buildroot target perl. Your current host perl is: @@ -498,7 +498,7 @@ Your current host perl is: version $] You may install a local one by running: - perlbrew install perl-5.32.0 + perlbrew install perl-5.36.0 MSG my ($help, $man, $quiet, $force, $recommend, $test, $host); @@ -525,8 +525,8 @@ my %deps_build; # name -> list of host dependencies my %deps_runtime; # name -> list of target dependencies my %license_files; # name -> hash of license files my %checksum; # author -> list of checksum -my $mirror = 'http://cpan.metacpan.org'; # a CPAN mirror -my $mcpan = MetaCPAN::API::Tiny->new(base_url => 'http://fastapi.metacpan.org/v1'); +my $mirror = 'https://cpan.metacpan.org'; # a CPAN mirror +my $mcpan = MetaCPAN::API::Tiny->new(base_url => 'https://fastapi.metacpan.org/v1'); my $ua = HTTP::Tiny->new(); my $new_pkgs; @@ -698,7 +698,7 @@ sub brname { return uc $name; } -# Buildroot requires license name as in http://spdx.org/licenses/ +# Buildroot requires license name as in https://spdx.org/licenses/ sub brlicense { my $license = shift; $license =~ s|apache_1_1|Apache-1.1|; @@ -967,7 +967,7 @@ in order to work with the right CoreList data. =head1 LICENSE -Copyright (C) 2013-2020 by Francois Perrad +Copyright (C) 2013-2023 by Francois Perrad 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 diff --git a/utils/scanpypi b/utils/scanpypi index 17d8a0017aa..3c98bb4bcce 100755 --- a/utils/scanpypi +++ b/utils/scanpypi @@ -296,23 +296,25 @@ class BuildrootPackage(): current_dir = os.getcwd() os.chdir(self.tmp_extract) sys.path.insert(0, self.tmp_extract) - s_file, s_path, s_desc = imp.find_module('setup', [self.tmp_extract]) - imp.load_module('__main__', s_file, s_path, s_desc) - if self.metadata_name in self.setup_args: - pass - elif self.metadata_name.replace('_', '-') in self.setup_args: - self.metadata_name = self.metadata_name.replace('_', '-') - elif self.metadata_name.replace('-', '_') in self.setup_args: - self.metadata_name = self.metadata_name.replace('-', '_') try: - self.setup_metadata = self.setup_args[self.metadata_name] - except KeyError: - # This means setup was not called - print('ERROR: Could not determine package metadata for {pkg}.\n' - .format(pkg=self.real_name)) - raise - os.chdir(current_dir) - sys.path.remove(self.tmp_extract) + s_file, s_path, s_desc = imp.find_module('setup', [self.tmp_extract]) + imp.load_module('__main__', s_file, s_path, s_desc) + if self.metadata_name in self.setup_args: + pass + elif self.metadata_name.replace('_', '-') in self.setup_args: + self.metadata_name = self.metadata_name.replace('_', '-') + elif self.metadata_name.replace('-', '_') in self.setup_args: + self.metadata_name = self.metadata_name.replace('-', '_') + try: + self.setup_metadata = self.setup_args[self.metadata_name] + except KeyError: + # This means setup was not called + print('ERROR: Could not determine package metadata for {pkg}.\n' + .format(pkg=self.real_name)) + raise + finally: + os.chdir(current_dir) + sys.path.remove(self.tmp_extract) def get_requirements(self, pkg_folder): """ @@ -485,7 +487,7 @@ class BuildrootPackage(): lines = [] filenames = ['LICENCE', 'LICENSE', 'LICENSE.MD', 'LICENSE.RST', - 'LICENSE.TXT', 'COPYING', 'COPYING.TXT'] + 'LICENCE.TXT', 'LICENSE.TXT', 'COPYING', 'COPYING.TXT'] self.license_files = list(find_file_upper_case(filenames, self.tmp_extract)) lines.append(self.__get_license_names(self.license_files)) @@ -609,7 +611,8 @@ class BuildrootPackage(): lines.append('\thelp\n') - help_lines = textwrap.wrap(self.metadata['info']['summary'], 62, + md_info = self.metadata['info'] + help_lines = textwrap.wrap(md_info['summary'], 62, initial_indent='\t ', subsequent_indent='\t ') @@ -617,11 +620,15 @@ class BuildrootPackage(): if help_lines[-1][-1] != '.': help_lines[-1] += '.' - # \t + two spaces is 3 char long - help_lines.append('') - help_lines.append('\t ' + self.metadata['info']['home_page']) - help_lines = [x + '\n' for x in help_lines] - lines += help_lines + home_page = md_info.get('home_page', None) or \ + md_info.get('project_urls', {}).get('Homepage', None) # noqa: E127 + + if home_page: + # \t + two spaces is 3 char long + help_lines.append('') + help_lines.append('\t ' + home_page) + help_lines = [x + '\n' for x in help_lines] + lines += help_lines with open(path_to_config, 'w') as config_file: config_file.writelines(lines) diff --git a/utils/test-pkg b/utils/test-pkg index ce6e43b965e..19d8713d6a3 100755 --- a/utils/test-pkg +++ b/utils/test-pkg @@ -5,7 +5,7 @@ TOOLCHAINS_CSV='support/config-fragments/autobuild/toolchain-configs.csv' TEMP_CONF="" do_clean() { - if [ ! -z "${TEMP_CONF}" ]; then + if [ -n "${TEMP_CONF}" ]; then rm -f "${TEMP_CONF}" fi } @@ -72,8 +72,8 @@ main() { if [ -z "${cfg}" ]; then pkg_br_name="${pkg//-/_}" pkg_br_name="BR2_PACKAGE_${pkg_br_name^^}" - TEMP_CONF=$(mktemp /tmp/test-${pkg}-config.XXXXXX) - echo "${pkg_br_name}=y" > ${TEMP_CONF} + TEMP_CONF="$(mktemp /tmp/test-"${pkg}"-config.XXXXXX)" + echo "${pkg_br_name}=y" > "${TEMP_CONF}" cfg="${TEMP_CONF}" fi if [ ! -e "${cfg}" ]; then @@ -83,15 +83,15 @@ main() { dir="${HOME}/br-test-pkg" fi - if [ ${random} -gt 0 ]; then + if [ "${random}" -gt 0 ]; then mode=$((mode+1)) fi - if [ ${number} -gt 0 ]; then + if [ "${number}" -gt 0 ]; then mode=$((mode+1)) fi - if [ ${all} -eq 1 ]; then + if [ "${all}" -eq 1 ]; then mode=$((mode+1)) fi @@ -106,19 +106,18 @@ main() { # Extract the URLs of the toolchains; drop internal toolchains # E.g.: http://server/path/to/name.config,arch,libc # --> http://server/path/to/name.config - toolchains=($(sed -r -e 's/,.*//; /internal/d; /^#/d; /^$/d;' "${toolchains_csv}" \ - |if [ ${random} -gt 0 ]; then \ - sort -R |head -n ${random} - elif [ ${number} -gt 0 ]; then \ - head -n ${number} - else - sort - fi - ) - ) + mapfile -t toolchains < <(sed -r -e 's/,.*//; /internal/d; /^#/d; /^$/d;' "${toolchains_csv}" \ + | if [ "${random}" -gt 0 ]; then \ + sort -R | head -n "${random}" + elif [ "${number}" -gt 0 ]; then \ + head -n "${number}" + else + sort + fi + ) nb_tc="${#toolchains[@]}" - if [ ${nb_tc} -eq 0 ]; then + if [ "${nb_tc}" -eq 0 ]; then printf "error: no toolchain found (networking issue?)\n" >&2; exit 1 fi @@ -131,7 +130,7 @@ main() { : $((nb++)) toolchain="$(basename "${toolchainconfig}" .config)" build_dir="${dir}/${toolchain}" - printf "%40s [%*d/%d]: " "${toolchain}" ${#nb_tc} ${nb} ${nb_tc} + printf "%40s [%*d/%d]: " "${toolchain}" ${#nb_tc} "${nb}" "${nb_tc}" build_one "${build_dir}" "${toolchainconfig}" "${cfg}" "${pkg}" "${prepare_only}" && ret=0 || ret=${?} case ${ret} in (0) printf "OK\n";; @@ -143,7 +142,7 @@ main() { done printf "%d builds, %d skipped, %d build failed, %d legal-info failed, %d show-info failed\n" \ - ${nb} ${nb_skip} ${nb_fail} ${nb_legal} ${nb_show} + "${nb}" "${nb_skip}" "${nb_fail}" "${nb_legal}" "${nb_show}" return $((nb_fail + nb_legal)) } @@ -157,7 +156,7 @@ build_one() { mkdir -p "${dir}" - CONFIG_= support/kconfig/merge_config.sh -O "${dir}" \ + CONFIG_="" support/kconfig/merge_config.sh -O "${dir}" \ "${toolchainconfig}" "support/config-fragments/minimal.config" "${cfg}" \ >> "${dir}/logfile" 2>&1 # We want all the options from the snippet to be present as-is (set @@ -178,7 +177,7 @@ build_one() { rm -f "${dir}/missing.config" # Defer building the job to the caller (e.g. a gitlab pipeline) - if [ ${prepare_only} -eq 1 ]; then + if [ "${prepare_only}" -eq 1 ]; then return 0 fi @@ -201,7 +200,7 @@ build_one() { # Validate that we generate proper json as show-info { tput smso; printf '>>> Running show-info\n'; tput rmso; } >> "${dir}/logfile" 2> /dev/null; - JQ="$(which jq)" + JQ="$(which jq 2> /dev/null)" if [ -z "${JQ}" ]; then make O="${dir}" host-jq >> "${dir}/logfile" 2>&1 JQ="${dir}/host/bin/jq" @@ -257,6 +256,7 @@ Options: -d DIR, --build-dir DIR Do the builds in directory DIR, one sub-dir per toolchain. + If not specified, defaults to \${HOME}/br-test-pkg -p PKG, --package PKG Test-build the package PKG, by running 'make PKG'; if not specified,